From a674415045b07210459b4092512728330fecf4d5 Mon Sep 17 00:00:00 2001 From: Gabe Evans Date: Wed, 25 Jan 2017 20:42:30 -0800 Subject: [PATCH 001/146] rcm: 1.3.0 -> 1.3.1 --- pkgs/tools/misc/rcm/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/rcm/default.nix b/pkgs/tools/misc/rcm/default.nix index 82b831207a9..db68fab75ab 100644 --- a/pkgs/tools/misc/rcm/default.nix +++ b/pkgs/tools/misc/rcm/default.nix @@ -1,13 +1,14 @@ { stdenv, fetchurl }: -stdenv.mkDerivation { - name = "rcm-1.3.0"; +stdenv.mkDerivation rec { + name = "rcm-${version}"; + version = "1.3.1"; src = fetchurl { - url = https://thoughtbot.github.io/rcm/dist/rcm-1.3.0.tar.gz; - sha256 = "ddcf638b367b0361d8e063c29fd573dbe1712d1b83e8d5b3a868e4aa45ffc847"; + url = "https://thoughtbot.github.io/rcm/dist/rcm-${version}.tar.gz"; + sha256 = "9c8f92dba63ab9cb8a6b3d0ccf7ed8edf3f0fb388b044584d74778145fae7f8f"; }; - + patches = [ ./fix-rcmlib-path.patch ]; postPatch = '' From 2aaa39a2499debf7df3241cdd8275812ebfc67b8 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Fri, 27 Jan 2017 11:32:28 +0100 Subject: [PATCH 002/146] pythonPackages.docker: 1.10.6 -> 2.0.2 --- pkgs/development/python-modules/docker.nix | 34 +++++++++++++++++++++ pkgs/top-level/python-packages.nix | 35 +--------------------- 2 files changed, 35 insertions(+), 34 deletions(-) create mode 100644 pkgs/development/python-modules/docker.nix diff --git a/pkgs/development/python-modules/docker.nix b/pkgs/development/python-modules/docker.nix new file mode 100644 index 00000000000..12c9aac4c23 --- /dev/null +++ b/pkgs/development/python-modules/docker.nix @@ -0,0 +1,34 @@ +{ stdenv, buildPythonPackage, fetchurl +, six, requests2, websocket_client +, ipaddress, backports_ssl_match_hostname, docker_pycreds +}: +buildPythonPackage rec { + name = "docker-${version}"; + version = "2.0.2"; + + src = fetchurl { + url = "mirror://pypi/d/docker/${name}.tar.gz"; + sha256 = "1m16n2r8is1gxwmyr6163na2jdyzsnhhk2qj12l7rzm1sr9nhx7z"; + }; + + propagatedBuildInputs = [ + six + requests2 + websocket_client + ipaddress + backports_ssl_match_hostname + docker_pycreds + ]; + + # Flake8 version conflict + doCheck = false; + + meta = with stdenv.lib; { + description = "An API client for docker written in Python"; + homepage = https://github.com/docker/docker-py; + license = licenses.asl20; + maintainers = with maintainers; [ + jgeerds + ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8d54eef393a..538ebfbeac4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6164,40 +6164,7 @@ in { }; }; - docker = buildPythonPackage rec { - name = "docker-py-${version}"; - version = "1.10.6"; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/docker-py/${name}.tar.gz"; - sha256 = "05f49f6hnl7npmi7kigg0ibqk8s3fhzx1ivvz1kqvlv4ay3paajc"; - }; - - buildInputs = [ pkgs.glibcLocales ]; - - LC_ALL="en_US.UTF-8"; - - propagatedBuildInputs = with self; [ - six - requests2 - websocket_client - ipaddress - backports_ssl_match_hostname - docker_pycreds - ]; - - # Flake8 version conflict - doCheck = false; - - meta = { - description = "An API client for docker written in Python"; - homepage = https://github.com/docker/docker-py; - license = licenses.asl20; - maintainers = with maintainers; [ - jgeerds - ]; - }; - }; + docker = callPackage ../development/python-modules/docker.nix {}; dockerpty = buildPythonPackage rec { name = "dockerpty-0.4.1"; From bf23aaf8933934a66d1f733f3b28a52b54df752b Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Fri, 27 Jan 2017 12:26:29 +0100 Subject: [PATCH 003/146] docker_compose: 1.9.0 -> 1.10.0 --- .../python-modules/docker_compose.nix | 46 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + pkgs/top-level/python-packages.nix | 38 +-------------- 3 files changed, 49 insertions(+), 37 deletions(-) create mode 100644 pkgs/development/python-modules/docker_compose.nix diff --git a/pkgs/development/python-modules/docker_compose.nix b/pkgs/development/python-modules/docker_compose.nix new file mode 100644 index 00000000000..e6f309155c2 --- /dev/null +++ b/pkgs/development/python-modules/docker_compose.nix @@ -0,0 +1,46 @@ +{ stdenv, buildPythonApplication, fetchurl, pythonOlder +, mock, pytest, nose +, pyyaml, backports_ssl_match_hostname, colorama, docopt +, dockerpty, docker, ipaddress, jsonschema, requests2 +, six, texttable, websocket_client, cached-property +, enum34, functools32 +}: +buildPythonApplication rec { + version = "1.10.0"; + name = "docker-compose-${version}"; + + src = fetchurl { + url = "mirror://pypi/d/docker-compose/${name}.tar.gz"; + sha256 = "023y2yhkvglaq07d78i89g2p8h040d71il8nfbyg2f9fkffigx9z"; + }; + + # lots of networking and other fails + doCheck = false; + buildInputs = [ mock pytest nose ]; + propagatedBuildInputs = [ + pyyaml backports_ssl_match_hostname colorama dockerpty docker + ipaddress jsonschema requests2 six texttable websocket_client + docopt cached-property + ] ++ + stdenv.lib.optional (pythonOlder "3.4") enum34 ++ + stdenv.lib.optional (pythonOlder "3.2") functools32; + + patchPhase = '' + sed -i "s/'requests >= 2.6.1, < 2.8'/'requests'/" setup.py + ''; + + postInstall = '' + mkdir -p $out/share/bash-completion/completions/ + cp contrib/completion/bash/docker-compose $out/share/bash-completion/completions/docker-compose + ''; + + meta = with stdenv.lib; { + homepage = "https://docs.docker.com/compose/"; + description = "Multi-container orchestration for Docker"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ + jgeerds + ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e53a30b81d9..ae380afca17 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -93,6 +93,8 @@ with pkgs; dockerTools = callPackage ../build-support/docker { }; + docker_compose = pythonPackages.docker_compose; + dotnetenv = callPackage ../build-support/dotnetenv { dotnetfx = dotnetfx40; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 538ebfbeac4..d2a1f9dee7b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11000,43 +11000,7 @@ in { }; }; - docker_compose = buildPythonPackage rec { - version = "1.9.0"; - name = "docker-compose-${version}"; - namePrefix = ""; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/docker-compose/${name}.tar.gz"; - sha256 = "0zz2jqpxz69q34bp97pbwxda1ik3m8zbhh15mxvhfsn0g566dywq"; - }; - - # lots of networking and other fails - doCheck = false; - buildInputs = with self; [ mock pytest nose ]; - propagatedBuildInputs = with self; [ - requests2 six pyyaml texttable docopt docker dockerpty websocket_client - enum34 jsonschema cached-property - ]; - - patchPhase = '' - sed -i "s/'requests >= 2.6.1, < 2.8'/'requests'/" setup.py - ''; - - postInstall = '' - mkdir -p $out/share/bash-completion/completions/ - cp contrib/completion/bash/docker-compose $out/share/bash-completion/completions/docker-compose - ''; - - meta = { - homepage = "https://docs.docker.com/compose/"; - description = "Multi-container orchestration for Docker"; - license = licenses.asl20; - platforms = platforms.linux; - maintainers = with maintainers; [ - jgeerds - ]; - }; - }; + docker_compose = callPackage ../development/python-modules/docker_compose.nix {}; fdroidserver = buildPythonPackage rec { version = "2016-05-31"; From c1c7d2894d2da7b38e9a09e0bdaea46c66a0b7e5 Mon Sep 17 00:00:00 2001 From: Christopher League Date: Fri, 27 Jan 2017 11:47:06 -0500 Subject: [PATCH 004/146] vokoscreen: init at 2.5.0 vokoscreen is an easy to use screencast creator to record educational videos, live recordings of browser, installation, videoconferences, etc. It uses Qt5 and ffmpeg. --- .../applications/video/vokoscreen/default.nix | 48 +++++++++++++++++++ .../video/vokoscreen/ffmpeg-out-of-box.patch | 31 ++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 81 insertions(+) create mode 100644 pkgs/applications/video/vokoscreen/default.nix create mode 100644 pkgs/applications/video/vokoscreen/ffmpeg-out-of-box.patch diff --git a/pkgs/applications/video/vokoscreen/default.nix b/pkgs/applications/video/vokoscreen/default.nix new file mode 100644 index 00000000000..7a9ea5f9095 --- /dev/null +++ b/pkgs/applications/video/vokoscreen/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchgit +, pkgconfig, qt5, alsaLib, libv4l, xorg +, ffmpeg +}: + +stdenv.mkDerivation { + name = "vokoscreen-2.5.0"; + src = fetchgit { + url = "https://github.com/vkohaupt/vokoscreen.git"; + rev = "8325c8658d6e777d34d2e6b8c8bc03f8da9b3d2f"; + sha256 = "1hvw7xz1mj16ishbaip73wddbmgibsz0pad4y586zbarpynss25z"; + }; + + buildInputs = [ + alsaLib.dev + libv4l.dev + pkgconfig + qt5.full + qt5.qmakeHook + qt5.qtx11extras + xorg.libXrandr.dev + ]; + + patches = [ + ./ffmpeg-out-of-box.patch + ]; + + preConfigure = '' + sed -i 's/lrelease-qt5/lrelease/g' vokoscreen.pro + ''; + + postConfigure = '' + substituteInPlace settings/QvkSettings.cpp --subst-var-by ffmpeg ${ffmpeg} + ''; + + meta = with stdenv.lib; { + description = "Simple GUI screencast recorder, using ffmpeg"; + homepage = "http://linuxecke.volkoh.de/vokoscreen/vokoscreen.html"; + longDescription = '' + vokoscreen is an easy to use screencast creator to record + educational videos, live recordings of browser, installation, + videoconferences, etc. + ''; + license = licenses.gpl2Plus; + maintainers = [maintainers.league]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/video/vokoscreen/ffmpeg-out-of-box.patch b/pkgs/applications/video/vokoscreen/ffmpeg-out-of-box.patch new file mode 100644 index 00000000000..8f696f26301 --- /dev/null +++ b/pkgs/applications/video/vokoscreen/ffmpeg-out-of-box.patch @@ -0,0 +1,31 @@ +diff --git a/settings/QvkSettings.cpp b/settings/QvkSettings.cpp +index bbf2abf..187efad 100644 +--- a/settings/QvkSettings.cpp ++++ b/settings/QvkSettings.cpp +@@ -56,17 +56,8 @@ void QvkSettings::readAll() + GIFPlayer = settings.value( "GIFplayer" ).toString(); + Minimized = settings.value( "Minimized", 0 ).toUInt(); + Countdown = settings.value( "Countdown", 0 ).toUInt(); +- QFile file; +- if ( file.exists( qApp->applicationDirPath().append( "/bin/ffmpeg" ) ) == true ) +- { +- vokoscreenWithLibs = true; +- Recorder = qApp->applicationDirPath().append( "/bin/ffmpeg" ); +- } +- else +- { +- vokoscreenWithLibs = false; +- Recorder = settings.value( "Recorder", "ffmpeg" ).toString(); +- } ++ vokoscreenWithLibs = true; ++ Recorder = settings.value( "Recorder", "@ffmpeg@/bin/ffmpeg" ).toString(); + settings.endGroup(); + + settings.beginGroup( "Videooptions" ); +@@ -398,4 +389,4 @@ double QvkSettings::getShowClickTime() + int QvkSettings::getShowKeyOnOff() + { + return showKeyOnOff; +-} +\ No newline at end of file ++} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0786e21737b..8d5932c438f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17821,6 +17821,8 @@ with pkgs; vips = callPackage ../tools/graphics/vips { }; nip2 = callPackage ../tools/graphics/nip2 { }; + vokoscreen = callPackage ../applications/video/vokoscreen { }; + wavegain = callPackage ../applications/audio/wavegain { }; wcalc = callPackage ../applications/misc/wcalc { }; From 9290751ab41562e28c678839b329f6915980014e Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Sat, 28 Jan 2017 13:34:36 +0100 Subject: [PATCH 005/146] glpk: 4.56 -> 4.61 See https://lists.gnu.org/archive/html/info-gnu/2017-01/msg00011.html for release announcement --- pkgs/development/libraries/glpk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glpk/default.nix b/pkgs/development/libraries/glpk/default.nix index d4ff7d9603f..03f8ff3bc76 100644 --- a/pkgs/development/libraries/glpk/default.nix +++ b/pkgs/development/libraries/glpk/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv }: stdenv.mkDerivation rec { - name = "glpk-4.56"; + name = "glpk-4.61"; src = fetchurl { url = "mirror://gnu/glpk/${name}.tar.gz"; - sha256 = "0syzix6qvpn0fzp08c84c8snansf1cam5vd0dk2w91mz2c85d18h"; + sha256 = "1adbvwiaqrv9pql9ry3lhn2vfsxnff2vh4fs477d90kpfx0xwrlq"; }; doCheck = true; From eda5bca00ac9c0e52c91d3fa6f801a5c4fef05ca Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 28 Jan 2017 17:33:20 +0100 Subject: [PATCH 006/146] geogebra: 5.0.271.0 -> 5-0-320-0 --- pkgs/applications/science/math/geogebra/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix index 0e16e1fb305..8c02af752e7 100644 --- a/pkgs/applications/science/math/geogebra/default.nix +++ b/pkgs/applications/science/math/geogebra/default.nix @@ -2,18 +2,18 @@ stdenv.mkDerivation rec { name = "geogebra-${version}"; - version = "5.0.271.0"; + version = "5-0-320-0"; preferLocalBuild = true; src = fetchurl { url = "http://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2"; - sha256 = "5dd5be1cde27c9b567f79c38048045864064b69c0d2b469ae93e1fca5f543475"; + sha256 = "039mrjwgkj3z51zq4xpchzr4msz5xgscgmp36dr1wms1kl42vibk"; }; srcIcon = fetchurl { url = "http://static.geogebra.org/images/geogebra-logo.svg"; - sha256 = "55ded6b5ec9ad382494f858d8ab5def0ed6c7d529481cd212863b2edde3b5e07"; + sha256 = "01sy7ggfvck350hwv0cla9ynrvghvssqm3c59x4q5lwsxjsxdpjm"; }; desktopItem = makeDesktopItem { From 7bd49cded42b2675833ff66ed8f6784c54c636cd Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Mon, 30 Jan 2017 22:43:54 +0100 Subject: [PATCH 007/146] khd: 1.1.4 -> 2.0.0 --- pkgs/os-specific/darwin/khd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/khd/default.nix b/pkgs/os-specific/darwin/khd/default.nix index f08073a8901..0e5d466e16a 100644 --- a/pkgs/os-specific/darwin/khd/default.nix +++ b/pkgs/os-specific/darwin/khd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "khd-${version}"; - version = "1.1.4"; + version = "2.0.0"; src = fetchFromGitHub { owner = "koekeishiya"; repo = "khd"; rev = "v${version}"; - sha256 = "1klia3fywl0c88zbp5wdn6kxhdwdry1jwmkj27vpv8vzvdfzwfmy"; + sha256 = "02v2bq095h1ylx700kayakg7f9p43vrz6p9ry3g7lq37s6apgm8h"; }; buildInputs = [ Carbon Cocoa ]; From eb92d10e1dc76f26f9e327934b121ef0d96f8217 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 31 Jan 2017 18:38:20 +0800 Subject: [PATCH 008/146] rockbox_utility: use qt5 instead of qt4 --- pkgs/tools/misc/rockbox-utility/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/rockbox-utility/default.nix b/pkgs/tools/misc/rockbox-utility/default.nix index 3bf704ca68e..7ef6d2ce7ed 100644 --- a/pkgs/tools/misc/rockbox-utility/default.nix +++ b/pkgs/tools/misc/rockbox-utility/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libusb1, qt4, qmake4Hook }: +{ stdenv, fetchurl, libusb1, qt5 }: stdenv.mkDerivation rec { name = "rockbox-utility-${version}"; @@ -9,16 +9,15 @@ stdenv.mkDerivation rec { sha256 = "0k3ycga3b0jnj13whwiip2l0gx32l50pnbh7kfima87nq65aaa5w"; }; - buildInputs = [ libusb1 qt4 ]; - nativeBuildInputs = [ qmake4Hook ]; + buildInputs = [ libusb1 ] ++ (with qt5; [ qtbase qttools ]); + nativeBuildInputs = [ qt5.qmakeHook ]; preConfigure = '' cd rbutil/rbutilqt ''; installPhase = '' - mkdir -p $out/bin - cp RockboxUtility $out/bin + install -Dm755 RockboxUtility $out/bin/RockboxUtility ''; meta = with stdenv.lib; { From c1250e96f3cc889201b2493fd56ba772b5b5e929 Mon Sep 17 00:00:00 2001 From: Rongcui Dong Date: Tue, 31 Jan 2017 10:12:15 -0800 Subject: [PATCH 009/146] kmix: init at 16.12.1 Signed-off-by: Rongcui Dong --- lib/maintainers.nix | 1 + pkgs/desktops/kde-5/applications/default.nix | 1 + pkgs/desktops/kde-5/applications/kmix.nix | 30 ++++++++++++++++++++ 3 files changed, 32 insertions(+) create mode 100644 pkgs/desktops/kde-5/applications/kmix.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index cd9ced5832f..f270ab059bb 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -414,6 +414,7 @@ roblabla = "Robin Lambertz "; roconnor = "Russell O'Connor "; romildo = "José Romildo Malaquias "; + rongcuid = "Rongcui Dong "; ronny = "Ronny Pfannschmidt "; rszibele = "Richard Szibele "; rushmorem = "Rushmore Mushambi "; diff --git a/pkgs/desktops/kde-5/applications/default.nix b/pkgs/desktops/kde-5/applications/default.nix index db255a1d5b7..25e1534609e 100644 --- a/pkgs/desktops/kde-5/applications/default.nix +++ b/pkgs/desktops/kde-5/applications/default.nix @@ -56,6 +56,7 @@ let khelpcenter = callPackage ./khelpcenter.nix {}; kio-extras = callPackage ./kio-extras.nix {}; kmime = callPackage ./kmime.nix {}; + kmix = callPackage ./kmix.nix {}; kompare = callPackage ./kompare.nix {}; konsole = callPackage ./konsole.nix {}; kwalletmanager = callPackage ./kwalletmanager.nix {}; diff --git a/pkgs/desktops/kde-5/applications/kmix.nix b/pkgs/desktops/kde-5/applications/kmix.nix new file mode 100644 index 00000000000..46a67e06ee0 --- /dev/null +++ b/pkgs/desktops/kde-5/applications/kmix.nix @@ -0,0 +1,30 @@ +{ + kdeApp, lib, kdeWrapper, + ecm, kdoctools, + kglobalaccel, kxmlgui, kcoreaddons, kdelibs4support, + plasma-framework, libpulseaudio, alsaLib, libcanberra_kde +}: + +let + unwrapped = + kdeApp { + name = "kmix"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = [ lib.maintainers.rongcuid ]; + }; + nativeBuildInputs = [ ecm kdoctools ]; + buildInputs = [ libpulseaudio alsaLib libcanberra_kde ]; + propagatedBuildInputs = [ + kglobalaccel kxmlgui kcoreaddons kdelibs4support + plasma-framework + ]; + cmakeFlags = [ + "-DKMIX_KF5_BUILD=1" + ]; + }; +in +kdeWrapper { + inherit unwrapped; + targets = [ "bin/kmix" ]; +} From d1ca0ade538e2f1cf33d902a9e2df2c2de6df998 Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Wed, 1 Feb 2017 11:00:20 +0100 Subject: [PATCH 010/146] docker-machine: 0.8.1 -> 0.9.0 Signed-off-by: Vincent Demeester --- .../networking/cluster/docker-machine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/docker-machine/default.nix b/pkgs/applications/networking/cluster/docker-machine/default.nix index d714033e412..0985c86949a 100644 --- a/pkgs/applications/networking/cluster/docker-machine/default.nix +++ b/pkgs/applications/networking/cluster/docker-machine/default.nix @@ -3,7 +3,7 @@ buildGoPackage rec { name = "machine-${version}"; - version = "0.8.1"; + version = "0.9.0"; goPackagePath = "github.com/docker/machine"; @@ -11,7 +11,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "docker"; repo = "machine"; - sha256 = "0l4a5bqfw8i8wrl5yzkqy848r7vdx6hw8p5m3z3vzabvsmsjjwy7"; + sha256 = "1kl30ylgdsyr9vkdms6caypnixxjv9a322wx416x6266c8lal6k4"; }; postInstall = '' From fda3edda4b538ee5fc7d9b5c392c9863fa0d5ab5 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 1 Feb 2017 18:39:43 +0800 Subject: [PATCH 011/146] heroku: 3.43.12 -> 3.43.16 This is the last version of the deprecated client but using the latest CLI. --- pkgs/development/tools/heroku/default.nix | 106 +++++++++------------- 1 file changed, 44 insertions(+), 62 deletions(-) diff --git a/pkgs/development/tools/heroku/default.nix b/pkgs/development/tools/heroku/default.nix index e78c7a7ff9a..f9c43ee841b 100644 --- a/pkgs/development/tools/heroku/default.nix +++ b/pkgs/development/tools/heroku/default.nix @@ -1,74 +1,56 @@ -{ stdenv, fetchurl, bash, buildFHSUserEnv, makeWrapper, writeTextFile +{ stdenv, lib, fetchurl, makeWrapper, buildGoPackage, fetchFromGitHub , nodejs-6_x, postgresql, ruby }: with stdenv.lib; let - version = "3.43.12"; - bin_ver = "5.4.7-8dc2c80"; + cli = buildGoPackage rec { + name = "cli-${version}"; + version = "5.6.14"; - arch = { - "x86_64-linux" = "linux-amd64"; - }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); + goPackagePath = "github.com/heroku/cli"; - sha256 = { - "x86_64-linux" = "0iqjxkdw53dvy54ahmr9yijlxrp5nbikh9z7iss93z753cgxdl06"; - }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); - - fhsEnv = buildFHSUserEnv { - name = "heroku-fhs-env"; + src = fetchFromGitHub { + owner = "heroku"; + repo = "cli"; + rev = "v${version}"; + sha256 = "11jccham1vkmh5284l6i30na4a4y7b1jhi2ci2z2wwx8m3gkypq9"; + }; }; - heroku = stdenv.mkDerivation rec { - inherit version; - name = "heroku"; - - meta = { - homepage = "https://toolbelt.heroku.com"; - description = "Everything you need to get started using Heroku"; - maintainers = with maintainers; [ aflatter mirdhyn ]; - license = licenses.mit; - platforms = with platforms; unix; - }; - - src = fetchurl { - url = "https://s3.amazonaws.com/assets.heroku.com/heroku-client/heroku-client-${version}.tgz"; - sha256 = "1z7z8sl2hkrc8rdvx3h00fbcrxs827xlfp6fji0ap97a6jc0v9x4"; - }; - - bin = fetchurl { - url = "https://cli-assets.heroku.com/branches/stable/${bin_ver}/heroku-v${bin_ver}-${arch}.tar.gz"; - inherit sha256; - }; - - installPhase = '' - cli=$out/share/heroku/cli - mkdir -p $cli - - tar xzf $src -C $out --strip-components=1 - tar xzf $bin -C $cli --strip-components=1 - - wrapProgram $out/bin/heroku \ - --set HEROKU_NODE_PATH ${nodejs-6_x}/bin/node \ - --set XDG_DATA_HOME $out/share \ - --set XDG_DATA_DIRS $out/share - - # When https://github.com/NixOS/patchelf/issues/66 is fixed, reinstate this and dump the fhsuserenv - #patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - # $cli/bin/heroku - ''; - - buildInputs = [ fhsEnv ruby postgresql makeWrapper ]; - - doUnpack = false; - }; - -in writeTextFile { +in stdenv.mkDerivation rec { name = "heroku-${version}"; - destination = "/bin/heroku"; - executable = true; - text = '' - #!${bash}/bin/bash -e - ${fhsEnv}/bin/heroku-fhs-env ${heroku}/bin/heroku + version = "3.43.16"; + + meta = { + homepage = "https://toolbelt.heroku.com"; + description = "Everything you need to get started using Heroku"; + maintainers = with maintainers; [ aflatter mirdhyn peterhoeg ]; + license = licenses.mit; + platforms = with platforms; unix; + }; + + binPath = lib.makeBinPath [ postgresql ruby ]; + + buildInputs = [ makeWrapper ]; + + doUnpack = false; + + src = fetchurl { + url = "https://s3.amazonaws.com/assets.heroku.com/heroku-client/heroku-client-${version}.tgz"; + sha256 = "08pai3cjaj7wshhyjcmkvyr1qxv5ab980whcm406798ng8f91hn7"; + }; + + installPhase = '' + mkdir -p $out + + tar xzf $src -C $out --strip-components=1 + install -Dm755 ${cli}/bin/cli $out/share/heroku/cli/bin/heroku + + wrapProgram $out/bin/heroku \ + --set HEROKU_NODE_PATH ${nodejs-6_x}/bin/node \ + --set XDG_DATA_HOME $out/share \ + --set XDG_DATA_DIRS $out/share \ + --prefix PATH : ${binPath} ''; } From 39344a36d318553001f9d738732c9785e8ce054b Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 31 Jan 2017 01:59:20 +0300 Subject: [PATCH 012/146] dbus service: use /etc/dbus-1 for configuration Also use upstream systemd units. --- nixos/modules/services/system/dbus.nix | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix index bc91d1284a9..6e050fd174e 100644 --- a/nixos/modules/services/system/dbus.nix +++ b/nixos/modules/services/system/dbus.nix @@ -20,8 +20,6 @@ let "${d}/etc/dbus-1/session.d" ])); - daemonArgs = "--address=systemd: --nofork --nopidfile --systemd-activation"; - configDir = pkgs.runCommand "dbus-conf" { preferLocalBuild = true; allowSubstitutes = false; @@ -31,6 +29,9 @@ let cp ${pkgs.dbus.out}/share/dbus-1/{system,session}.conf $out + # avoid circular includes + sed -ri 's@(/etc/dbus-1/(system|session)\.conf)@@g' $out/{system,session}.conf + # include by full path sed -ri "s@/etc/dbus-1/(system|session)-@$out/\1-@" $out/{system,session}.conf @@ -95,6 +96,11 @@ in environment.systemPackages = [ pkgs.dbus.daemon pkgs.dbus ]; + environment.etc = singleton + { source = configDir; + target = "dbus-1"; + }; + users.extraUsers.messagebus = { uid = config.ids.uids.messagebus; description = "D-Bus system message bus daemon user"; @@ -125,10 +131,6 @@ in # Don't restart dbus-daemon. Bad things tend to happen if we do. reloadIfChanged = true; restartTriggers = [ configDir ]; - serviceConfig.ExecStart = [ - "" # Default dbus.service has two entries, we need to override both. - "${lib.getBin pkgs.dbus}/bin/dbus-daemon --config-file=/run/current-system/dbus/system.conf ${daemonArgs}" - ]; }; systemd.user = { @@ -136,18 +138,10 @@ in # Don't restart dbus-daemon. Bad things tend to happen if we do. reloadIfChanged = true; restartTriggers = [ configDir ]; - serviceConfig.ExecStart = [ - "" # Default dbus.service has two entries, we need to override both. - "${lib.getBin pkgs.dbus}/bin/dbus-daemon --config-file=/run/current-system/dbus/session.conf ${daemonArgs}" - ]; }; sockets.dbus.wantedBy = mkIf cfg.socketActivated [ "sockets.target" ]; }; environment.pathsToLink = [ "/etc/dbus-1" "/share/dbus-1" ]; - - system.extraSystemBuilderCmds = '' - ln -s ${configDir} $out/dbus - ''; }; } From 72b37462668e3a7568d94632994a9df5d7fd37eb Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 1 Feb 2017 15:37:20 +0300 Subject: [PATCH 013/146] dbus service: remove {system,session}.conf from config dir They are already included by dbus from /run/current-system/sw/share/dbus-1. --- nixos/modules/services/system/dbus.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix index 6e050fd174e..aeb5bf9c7a3 100644 --- a/nixos/modules/services/system/dbus.nix +++ b/nixos/modules/services/system/dbus.nix @@ -27,14 +27,6 @@ let '' mkdir -p $out - cp ${pkgs.dbus.out}/share/dbus-1/{system,session}.conf $out - - # avoid circular includes - sed -ri 's@(/etc/dbus-1/(system|session)\.conf)@@g' $out/{system,session}.conf - - # include by full path - sed -ri "s@/etc/dbus-1/(system|session)-@$out/\1-@" $out/{system,session}.conf - sed '${./dbus-system-local.conf.in}' \ -e 's,@servicehelper@,${config.security.wrapperDir}/dbus-daemon-launch-helper,g' \ -e 's,@extra@,${systemExtraxml},' \ From 7b6b7f6b78fbb47812eef116b85e58f4c4ceb70a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 1 Feb 2017 14:26:27 +0100 Subject: [PATCH 014/146] Python Flit: run tests by default --- .../python/build-python-package-flit.nix | 13 ++++++++----- .../interpreters/python/build-python-package.nix | 4 ++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/development/interpreters/python/build-python-package-flit.nix b/pkgs/development/interpreters/python/build-python-package-flit.nix index 8628c3df769..1beff0ebd83 100644 --- a/pkgs/development/interpreters/python/build-python-package-flit.nix +++ b/pkgs/development/interpreters/python/build-python-package-flit.nix @@ -1,6 +1,7 @@ # This function provides specific bits for building a flit-based Python package. -{ flit +{ python +, flit }: { ... } @ attrs: @@ -13,7 +14,9 @@ attrs // { runHook postBuild ''; - # Flit packages do not come with tests. - installCheckPhase = attrs.checkPhase or ":"; - doCheck = attrs.doCheck or false; -} \ No newline at end of file + # Flit packages, like setuptools packages, might have tests. + installCheckPhase = attrs.checkPhase or '' + ${python.interpreter} -m unittest discover + ''; + doCheck = attrs.doCheck or true; +} diff --git a/pkgs/development/interpreters/python/build-python-package.nix b/pkgs/development/interpreters/python/build-python-package.nix index e15405e2981..b26bf1539cd 100644 --- a/pkgs/development/interpreters/python/build-python-package.nix +++ b/pkgs/development/interpreters/python/build-python-package.nix @@ -12,7 +12,7 @@ let setuptools-specific = import ./build-python-package-setuptools.nix { inherit lib python bootstrapped-pip; }; - flit-specific = import ./build-python-package-flit.nix { inherit flit; }; + flit-specific = import ./build-python-package-flit.nix { inherit python flit; }; wheel-specific = import ./build-python-package-wheel.nix { }; common = import ./build-python-package-common.nix { inherit python bootstrapped-pip; }; in @@ -34,4 +34,4 @@ let else if format == "other" then {} else throw "Unsupported format ${format}"; -in mkPythonDerivation ( attrs // formatspecific ) \ No newline at end of file +in mkPythonDerivation ( attrs // formatspecific ) From 695ff0dc09b304f2e0575081c52189893c2f38bc Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 1 Feb 2017 14:38:58 +0100 Subject: [PATCH 015/146] pythonPackages: new fetchers Inspired by https://github.com/NixOS/nixpkgs/pull/22257. It is recommend to use fetchpypi and, when fetching a wheel, to pass `format = "wheel"` (typically you can just `inherit format;`). The hash type is fixed (for now) because this is the hash type PyPI uses. --- pkgs/top-level/python-packages.nix | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 60d9a1334dc..471323c179a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -37,9 +37,30 @@ let graphiteVersion = "0.9.15"; + fetchwheel = {pname, version, sha256, python ? "py2.py3", abi ? "none", platform ? "any"}: + # Fetch a wheel. By default we fetch an universal wheel. + # See https://www.python.org/dev/peps/pep-0427/#file-name-convention for details regarding the optional arguments. + let + url = "https://files.pythonhosted.org/packages/${python}/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}-${python}-${abi}-${platform}.whl"; + in pkgs.fetchurl {inherit url sha256;}; + + fetchtarball = {pname, version, sha256}: + # Fetch a tarball. + let + url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}.tar.gz"; + in pkgs.fetchurl {inherit url sha256;}; + + fetchpypi = {format ? "setuptools", ... } @attrs: + let + fetcher = (if format == "wheel" then fetchwheel + else if format == "setuptools" then fetchtarball + else throw "Unsupported kind ${kind}"); + in fetcher (builtins.removeAttrs attrs ["format"]); + in { inherit python bootstrapped-pip pythonAtLeast pythonOlder isPy26 isPy27 isPy33 isPy34 isPy35 isPy36 isPyPy isPy3k mkPythonDerivation buildPythonPackage buildPythonApplication; + inherit fetchwheel fetchtarball fetchpypi; # helpers From 4d57cd49c2a20da4095b67f4dce1775211c21c8b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 1 Feb 2017 14:39:57 +0100 Subject: [PATCH 016/146] pythonPackages.configparser: 3.3.0r2 -> 3.5.0 --- pkgs/top-level/python-packages.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 471323c179a..c1feea1b6a9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4103,7 +4103,7 @@ in { # Backported version of the ConfigParser library of Python 3.3 configparser = if isPy3k then null else buildPythonPackage rec { name = "configparser-${version}"; - version = "3.3.0r2"; + version = "3.5.0"; # running install_egg_info # error: [Errno 9] Bad file descriptor: '' @@ -4111,9 +4111,12 @@ in { src = pkgs.fetchurl { url = "mirror://pypi/c/configparser/${name}.tar.gz"; - sha256 = "6a2318590dfc4013fc5bf53c2bec14a8cb455a232295eb282a13f94786c4b0b2"; + sha256 = "5308b47021bc2340965c371f0f058cc6971a04502638d4244225c49d80db273a"; }; + # No tests available + doCheck = false; + meta = { maintainers = [ ]; platforms = platforms.all; From 1658e7a80cb8aaf1e3cf4efacc2b028ee98ccfcb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 1 Feb 2017 14:40:11 +0100 Subject: [PATCH 017/146] pythonPackages.cytoolz: 0.8.0 -> 0.8.2 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c1feea1b6a9..62c0733e4f3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4410,11 +4410,11 @@ in { cytoolz = buildPythonPackage rec { name = "cytoolz-${version}"; - version = "0.8.0"; + version = "0.8.2"; src = pkgs.fetchurl{ url = "mirror://pypi/c/cytoolz/cytoolz-${version}.tar.gz"; - sha256 = "2239890c8fe2da3eba82947c6a68cfa406e5a5045911c9ab3de8113462372629"; + sha256 = "476a2ad176de5eaef80499b7b43d4f72ba6d23df33d349088dae315e9b31c552"; }; # Extension types From 9e4271551ed368eb70b295cc14d89c23946d82f0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 1 Feb 2017 14:40:31 +0100 Subject: [PATCH 018/146] pythonPackages.entrypoints: 0.2.1 -> 0.2.2 --- pkgs/top-level/python-packages.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 62c0733e4f3..8f928332de3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6655,13 +6655,14 @@ in { }); entrypoints = buildPythonPackage rec { - name = "entrypoints"; - version = "0.2.1"; + pname = "entrypoints"; + version = "0.2.2"; + name = "${pname}-${version}"; format = "wheel"; - src = pkgs.fetchurl { - url = "https://pypi.python.org/packages/a5/2d/26548d66d58f7775cb332fcf3f864987c05f5e3f800b0b22b9919dacf653/entrypoints-0.2.1-py2.py3-none-any.whl"; - sha256 = "112n36dllmls19j5k6bwcnsm6y2789lxzkjl1n9yir7gkm0dmzzw"; + src = fetchpypi { + inherit pname version format; + sha256 = "0a0685962ee5ac303f470acbb659f0f97aef5b9deb6b85d059691c706ef6e45e"; }; propagatedBuildInputs = with self; [ configparser ]; From 27d4cd47e3565f4ff11f0067bd0ebb8b5a3fba61 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 1 Feb 2017 14:40:49 +0100 Subject: [PATCH 019/146] pythonPackages.ipykernel: 4.5.1 -> 4.5.2 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8f928332de3..3437798cf0e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12966,12 +12966,12 @@ in { }; ipykernel = buildPythonPackage rec { - version = "4.5.1"; + version = "4.5.2"; name = "ipykernel-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/i/ipykernel/${name}.tar.gz"; - sha256 = "520c855c6652651c6796a3dd8bc89d533023ac65c5ccf812908187d6f0e461da"; + sha256 = "5a54f25f0e6c8ee74c362c23f9a95e10e74c6b7f5ef42059c861ff6f26d89462"; }; buildInputs = with self; [ nose ] ++ optionals isPy27 [mock]; From f677eb6bae5955963e78b555ca964b83838024cf Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 1 Feb 2017 14:41:57 +0100 Subject: [PATCH 020/146] pythonPackages.ipyparallel: 5.2.0 -> 6.0.0 --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3437798cf0e..d2b3cb83f38 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12996,17 +12996,17 @@ in { }; ipyparallel = buildPythonPackage rec { - version = "5.2.0"; + version = "6.0.0"; name = "ipyparallel-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/i/ipyparallel/${name}.tar.gz"; - sha256 = "d99e760f1a136b1c402755a4ab51a8d7cb87c892cccadf641948a5e886c8a455"; + sha256 = "9bb5032e98a8c73ddb3da5fb8eecd93c676a5278b68799ab19257b348a0a27f6"; }; buildInputs = with self; [ nose ]; - propagatedBuildInputs = with self; [ipython_genutils decorator pyzmq ipython jupyter_client ipykernel tornado + propagatedBuildInputs = with self; [ dateutil ipython_genutils decorator pyzmq ipython jupyter_client ipykernel tornado ] ++ optionals (!isPy3k) [ futures ]; # Requires access to cluster From 2a6901dc28d36454b3b124cc85f5c3166b823368 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 1 Feb 2017 14:42:10 +0100 Subject: [PATCH 021/146] pythonPackages.ipython: 5.2.0 -> 5.2.1 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d2b3cb83f38..e8ac9dfebf6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13022,12 +13022,12 @@ in { }; ipython = buildPythonPackage rec { - version = "5.1.0"; + version = "5.2.1"; name = "ipython-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/i/ipython/${name}.tar.gz"; - sha256 = "7ef4694e1345913182126b219aaa4a0047e191af414256da6772cf249571b961"; + sha256 = "04dafc37c8876e10e797264302e4333dbcd2854ef6d16bb57cc12ce26515bfdb"; }; prePatch = stdenv.lib.optionalString stdenv.isDarwin '' From f3d91ee84ae6a37cc180ea5bafaa4894c8971002 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 1 Feb 2017 14:42:31 +0100 Subject: [PATCH 022/146] pythonPackages.jinja2: 2.8 -> 2.9.5 --- pkgs/top-level/python-packages.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e8ac9dfebf6..94226cf310e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13298,11 +13298,13 @@ in { }; jinja2 = buildPythonPackage rec { - name = "Jinja2-2.8"; + pname = "Jinja2"; + version = "2.9.5"; + name = "${pname}-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/J/Jinja2/${name}.tar.gz"; - sha256 = "1x0v41lp5m1pjix3l46zx02b7lqp2hflgpnxwkywxynvi3zz47xw"; + sha256 = "702a24d992f856fa8d5a7a36db6128198d0c21e1da34448ca236c42e92384825"; }; propagatedBuildInputs = with self; [ markupsafe ]; From c39c463e7aae54eee1ac64398866e1182157f87a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 1 Feb 2017 14:42:46 +0100 Subject: [PATCH 023/146] pythonPackages.jupyter_core: 4.2.0 -> 4.2.1 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 94226cf310e..355c0bff84a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13416,12 +13416,12 @@ in { }; jupyter_core = buildPythonPackage rec { - version = "4.2.0"; + version = "4.2.1"; name = "jupyter_core-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/j/jupyter_core/${name}.tar.gz"; - sha256 = "44ec837a53bebf4e937112d3f9ccf31fee4f8db3e406dd0dd4f0378a354bed9c"; + sha256 = "89c55399c8437f777197c2c82c1ff5639c7f71d4eb2f172a81afa120b68dc7b3"; }; buildInputs = with self; [ pytest mock ]; From 8fa286ecc1e8f4aefcd354b77c59966333510e47 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 1 Feb 2017 14:43:03 +0100 Subject: [PATCH 024/146] pythonPackages.multipledispatch: 0.4.8 -> 0.4.9 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 355c0bff84a..8561d8d0b4b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15021,11 +15021,11 @@ in { multipledispatch = buildPythonPackage rec { name = "multipledispatch-${version}"; - version = "0.4.8"; + version = "0.4.9"; src = pkgs.fetchurl { url = "mirror://pypi/m/multipledispatch/${name}.tar.gz"; - sha256 = "07d41fb3ed25e8424536e48a8566f88a0f9926ca4b6174bff6aa16c98251b92e"; + sha256 = "bda6abb8188d9abb429bd17ed15bc7433f77f1b05a78cfff761711ed81daa7a2"; }; meta = { From 286a7eb59b4a9b8557bcf5e258d80cd75bd5bfc2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 1 Feb 2017 14:43:20 +0100 Subject: [PATCH 025/146] pythonPackages.nbconvert: 4.2.0 -> 5.1.1 --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8561d8d0b4b..892ddf17c57 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15481,17 +15481,17 @@ in { }; nbconvert = buildPythonPackage rec { - version = "4.2.0"; + version = "5.1.1"; name = "nbconvert-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/n/nbconvert/${name}.tar.gz"; - sha256 = "1ik3k1s8dnqcc6hcrzi1wwy6f5kxfz8rnyahvpy984kl49snv52m"; + sha256 = "847731bc39829d0eb1e15a450ac98c71730e3598e53683d4d76a3f3b3fc5017d"; }; buildInputs = with self; [nose ipykernel ]; - propagatedBuildInputs = with self; [ entrypoints mistune jinja2 pygments traitlets jupyter_core nbformat ipykernel tornado jupyter_client]; + propagatedBuildInputs = with self; [ entrypoints bleach mistune jinja2 pygments traitlets testpath jupyter_core nbformat ipykernel pandocfilters tornado jupyter_client]; checkPhase = '' nosetests -v From ac5df23fcf4af6c52c5dd24a37488f9b1cf00023 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 1 Feb 2017 14:43:36 +0100 Subject: [PATCH 026/146] pythonPackages.nbformat: 4.0.1 -> 4.2.0 --- pkgs/top-level/python-packages.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 892ddf17c57..e031b90f67c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15509,16 +15509,19 @@ in { }; nbformat = buildPythonPackage rec { - version = "4.0.1"; + version = "4.2.0"; name = "nbformat-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/n/nbformat/${name}.tar.gz"; - sha256 = "5261c957589b9dfcd387c338d59375162ba9ca82c69e378961a1f4e641285db5"; + sha256 = "389a5b630a30539074f238a48fb9864592f63d611baccfa2ffaf14ffe239de06"; }; + LC_ALL="en_US.UTF-8"; + buildInputs = with self; [ pytest pkgs.glibcLocales ]; + propagatedBuildInputs = with self; [ipython_genutils traitlets testpath jsonschema jupyter_core]; - buildInputs = with self; [ nose ]; - propagatedBuildInputs = with self; [ipython_genutils traitlets jsonschema jupyter_core]; + # Failing tests and permission issues + doCheck = false; meta = { description = "The Jupyter Notebook format"; From 68bb54a89b71a378f940f8a12a1ee22cd219078e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 1 Feb 2017 14:43:49 +0100 Subject: [PATCH 027/146] pythonPackages.nose-exclude: 0.4.1 -> 0.5.0 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e031b90f67c..69df6665051 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15837,11 +15837,11 @@ in { nose-exclude = buildPythonPackage rec { name = "nose-exclude-${version}"; - version = "0.4.1"; + version = "0.5.0"; src = pkgs.fetchurl { url = "mirror://pypi/n/nose-exclude/${name}.tar.gz"; - sha256 = "44466a9bcb56d2e568750f91504d1278c74eabb259a305b06e975b87b51635da"; + sha256 = "f78fa8b41eeb815f0486414f710f1eea0949e346cfb11d59ba6295ed69e84304"; }; propagatedBuildInputs = with self; [ nose ]; From 4677b6cf84011ca8e61455d6099dfcb6228ead1c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 1 Feb 2017 14:44:05 +0100 Subject: [PATCH 028/146] pythonPackages.notebook: 4.2.3 -> 4.3.2 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 69df6665051..551cc044125 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15957,12 +15957,12 @@ in { }; notebook = buildPythonPackage rec { - version = "4.2.3"; + version = "4.3.2"; name = "notebook-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/n/notebook/${name}.tar.gz"; - sha256 = "39a9603d3fe88b60de2903680c965cf643acf2c16fb2c6bac1d905e1042b5851"; + sha256 = "fc77edf4ec295542172aa66a3e9d527e75038fcaadd3ed20afbf8596e5629aa9"; }; LC_ALL = "en_US.UTF-8"; From a75aa2cddb662c1c66c06ea7572ca6d450dd4ff5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 1 Feb 2017 14:44:20 +0100 Subject: [PATCH 029/146] pythonPackages.bottleneck: 1.0.0 -> 1.2.0 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 551cc044125..09c87ea9185 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18021,10 +18021,10 @@ in { bottleneck = buildPythonPackage rec { name = "Bottleneck-${version}"; - version = "1.0.0"; + version = "1.2.0"; src = pkgs.fetchurl { url = "mirror://pypi/B/Bottleneck/Bottleneck-${version}.tar.gz"; - sha256 = "15dl0ll5xmfzj2fsvajzwxsb9dbw5i9fx9i4r6n4i5nzzba7m6wd"; + sha256 = "3bec84564a4adbe97c24e875749b949a19cfba4e4588be495cc441db7c6b05e8"; }; buildInputs = with self; [ nose ]; From 400da715514dea526527b1317e1f62d61f6f8256 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 1 Feb 2017 14:44:37 +0100 Subject: [PATCH 030/146] pythonPackages.pexpect: 3.3 -> 4.2.1 --- pkgs/top-level/python-packages.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 09c87ea9185..845ae6500c0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18542,17 +18542,19 @@ in { pexpect = buildPythonPackage rec { - version = "3.3"; + version = "4.2.1"; name = "pexpect-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/p/pexpect/${name}.tar.gz"; - sha256 = "dfea618d43e83cfff21504f18f98019ba520f330e4142e5185ef7c73527de5ba"; + sha256 = "3d132465a75b57aa818341c6521392a06cc660feb3988d7f1074f39bd23c9a92"; }; - # Wants to run python in a subprocess + # Wants to run pythonin a subprocess doCheck = false; + propagatedBuildInputs = with self; [ ptyprocess ]; + meta = { homepage = http://www.noah.org/wiki/Pexpect; description = "Automate interactive console applications such as ssh, ftp, etc"; From cd7e95ac9a1a0b6013930a65db595f899e2e3bce Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 1 Feb 2017 14:44:54 +0100 Subject: [PATCH 031/146] pythonPackages.requests2: 2.11.1 -> 2.13.0 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 845ae6500c0..41a33fdb9df 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -22112,11 +22112,11 @@ in { requests2 = buildPythonPackage rec { name = "requests-${version}"; - version = "2.11.1"; + version = "2.13.0"; src = pkgs.fetchurl { url = "mirror://pypi/r/requests/${name}.tar.gz"; - sha256 = "5acf980358283faba0b897c73959cecf8b841205bb4b2ad3ef545f46eae1a133"; + sha256 = "5722cd09762faa01276230270ff16af7acf7c5c45d623868d9ba116f15791ce8"; }; nativeBuildInputs = [ self.pytest ]; From 4188e6cbf6c63d1612203898a24bbff02f6b52e6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 1 Feb 2017 14:45:08 +0100 Subject: [PATCH 032/146] pythonPackages.tabulate: 0.7.5 -> 0.7.7 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 41a33fdb9df..0f79045c007 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -25267,12 +25267,12 @@ in { }; tabulate = buildPythonPackage rec { - version = "0.7.5"; + version = "0.7.7"; name = "tabulate-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/t/tabulate/${name}.tar.gz"; - sha256 = "9071aacbd97a9a915096c1aaf0dc684ac2672904cd876db5904085d6dac9810e"; + sha256 = "83a0b8e17c09f012090a50e1e97ae897300a72b35e0c86c0b53d3bd2ae86d8c6"; }; buildInputs = with self; [ nose ]; From 93392fb6663218b1359d040fd6e63c991baa8681 Mon Sep 17 00:00:00 2001 From: Pradeep Chhetri Date: Wed, 1 Feb 2017 08:32:29 +0530 Subject: [PATCH 033/146] nomad: 0.5.3 -> 0.5.4 --- pkgs/applications/networking/cluster/nomad/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index b5137c47845..ae3415adef9 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "nomad-${version}"; - version = "0.5.3"; + version = "0.5.4"; rev = "v${version}"; goPackagePath = "github.com/hashicorp/nomad"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = "nomad"; inherit rev; - sha256 = "06s4irjz7k5qp895hvwv68xmr6mdq8bv91vhgh6rmx58my8jb68b"; + sha256 = "0x7bi6wq7kpqv3wfhk5mqikj4hsb0f6lx867xz5l9cq3i39b5gj3"; }; meta = with stdenv.lib; { @@ -20,6 +20,6 @@ buildGoPackage rec { description = "A Distributed, Highly Available, Datacenter-Aware Scheduler"; platforms = platforms.linux; license = licenses.mpl20; - maintainers = with maintainers; [ rushmorem ]; + maintainers = with maintainers; [ rushmorem pradeepchhetri ]; }; } From 86fe7a40acc0e68e60905798b2d692c2e9a6c33e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 31 Jan 2017 15:20:28 +0100 Subject: [PATCH 034/146] Only read overlays ending in .nix For example, this prevents Nix from barfing on editor backup files in ~/.nixpkgs/overlays. --- pkgs/top-level/impure.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/impure.nix b/pkgs/top-level/impure.nix index 60a55c657c0..d8201a3569f 100644 --- a/pkgs/top-level/impure.nix +++ b/pkgs/top-level/impure.nix @@ -29,7 +29,9 @@ dirCheck = dir: dir != "" && pathExists (dir + "/."); overlays = dir: let content = readDir dir; in - map (n: import "${dir}/${n}") (sort lessThan (attrNames content)); + map (n: import "${dir}/${n}") + (builtins.filter (n: builtins.match ".*\.nix" n != null) + (sort lessThan (attrNames content))); in if dirEnv != "" then if dirCheck dirEnv then overlays dirEnv From 7dacca324d9e86fe7f7fad450ec833c746f21415 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 1 Feb 2017 15:56:02 +0100 Subject: [PATCH 035/146] $NIXPKGS_OVERLAYS -> The Nix search path is the established mechanism for specifying the location of Nix expressions, so let's use it instead of adding another environment variable. --- doc/overlays.xml | 4 ++-- pkgs/top-level/impure.nix | 27 ++++++++++++++++----------- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/doc/overlays.xml b/doc/overlays.xml index cb54c33cf65..540c83e0a39 100644 --- a/doc/overlays.xml +++ b/doc/overlays.xml @@ -28,8 +28,8 @@ first one present is considered, and all the rest are ignored: - In the directory pointed by the environment variable - NIXPKGS_OVERLAYS. + In the directory pointed to by the Nix search path entry + <nixpkgs-overlays>. diff --git a/pkgs/top-level/impure.nix b/pkgs/top-level/impure.nix index d8201a3569f..d1a28b9b15e 100644 --- a/pkgs/top-level/impure.nix +++ b/pkgs/top-level/impure.nix @@ -1,6 +1,17 @@ /* Impure default args for `pkgs/top-level/default.nix`. See that file for the meaning of each argument. */ +with builtins; + +let + + homeDir = builtins.getEnv "HOME"; + + # Return ‘x’ if it evaluates, or ‘def’ if it throws an exception. + try = x: def: let res = tryEval x; in if res.success then res.value else def; + +in + { # Fallback: Assume we are building packages for the current (host, in GNU # Autotools parlance) system. system ? builtins.currentSystem @@ -8,10 +19,7 @@ , # Fallback: The contents of the configuration file found at $NIXPKGS_CONFIG or # $HOME/.nixpkgs/config.nix. config ? let - inherit (builtins) getEnv pathExists; - configFile = getEnv "NIXPKGS_CONFIG"; - homeDir = getEnv "HOME"; configFile2 = homeDir + "/.nixpkgs/config.nix"; in if configFile != "" && pathExists configFile then import configFile @@ -22,20 +30,17 @@ # collections of packages. These collection of packages are part of the # fix-point made by Nixpkgs. overlays ? let - inherit (builtins) getEnv pathExists readDir attrNames map sort - lessThan; - dirEnv = getEnv "NIXPKGS_OVERLAYS"; - dirHome = (getEnv "HOME") + "/.nixpkgs/overlays"; + dirPath = try (if pathExists then else "") ""; + dirHome = homeDir + "/.nixpkgs/overlays"; dirCheck = dir: dir != "" && pathExists (dir + "/."); overlays = dir: let content = readDir dir; in - map (n: import "${dir}/${n}") + map (n: import (dir + ("/" + n))) (builtins.filter (n: builtins.match ".*\.nix" n != null) (sort lessThan (attrNames content))); in - if dirEnv != "" then - if dirCheck dirEnv then overlays dirEnv - else throw "The environment variable NIXPKGS_OVERLAYS does not name a valid directory." + if dirPath != "" then + overlays dirPath else if dirCheck dirHome then overlays dirHome else [] From 9d6a55aefd771f047d2aa3085c9a3f8a2f452333 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 1 Feb 2017 16:03:42 +0100 Subject: [PATCH 036/146] ~/.nixpkgs -> ~/.config/nixpkgs The former is still respected as a fallback for config.nix for backwards compatibility (but not for overlays because they're a new feature). --- doc/configuration.xml | 6 +++--- doc/functions.xml | 2 +- doc/languages-frameworks/haskell.md | 8 ++++---- doc/package-notes.xml | 2 +- lib/customisation.nix | 8 ++++---- nixos/modules/services/editors/emacs.xml | 4 ++-- pkgs/development/r-modules/README.md | 2 +- pkgs/games/planetaryannihilation/default.nix | 2 +- pkgs/stdenv/adapters.nix | 2 +- pkgs/stdenv/generic/default.nix | 2 +- pkgs/top-level/impure.nix | 8 +++++--- 11 files changed, 24 insertions(+), 22 deletions(-) diff --git a/doc/configuration.xml b/doc/configuration.xml index caff1e510cd..12e3b8ae851 100644 --- a/doc/configuration.xml +++ b/doc/configuration.xml @@ -2,12 +2,12 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="chap-packageconfig"> -<filename>~/.nixpkgs/config.nix</filename>: global configuration +Global configuration Nix packages can be configured to allow or deny certain options. To apply the configuration edit -~/.nixpkgs/config.nix and set it like +~/.config/nixpkgs/config.nix and set it like { @@ -89,7 +89,7 @@ packages via packageOverrides You can define a function called packageOverrides in your local -~/.nixpkgs/config.nix to overide nix packages. It +~/.config/nixpkgs/config.nix to overide nix packages. It must be a function that takes pkgs as an argument and return modified set of packages. diff --git a/doc/functions.xml b/doc/functions.xml index 6374c15ddf2..5c654ffb956 100644 --- a/doc/functions.xml +++ b/doc/functions.xml @@ -119,7 +119,7 @@ evaluation-per-function application incurs a performance penalty, which can become a problem if many overrides are used. It is only intended for ad-hoc customisation, such as in - ~/.nixpkgs/config.nix. + ~/.config/nixpkgs/config.nix. diff --git a/doc/languages-frameworks/haskell.md b/doc/languages-frameworks/haskell.md index 6728f4abba0..f16077cced4 100644 --- a/doc/languages-frameworks/haskell.md +++ b/doc/languages-frameworks/haskell.md @@ -195,7 +195,7 @@ its normal core packages: mtl-2.2.1 This function allows users to define their own development environment by means -of an override. After adding the following snippet to `~/.nixpkgs/config.nix`, +of an override. After adding the following snippet to `~/.config/nixpkgs/config.nix`, { packageOverrides = super: let self = super.pkgs; in @@ -522,7 +522,7 @@ file with `cabal2nix`: $ cd ~/src/foo && cabal2nix . >default.nix $ cd ~/src/bar && cabal2nix . >default.nix -Then edit your `~/.nixpkgs/config.nix` file to register those builds in the +Then edit your `~/.config/nixpkgs/config.nix` file to register those builds in the default Haskell package set: { @@ -554,7 +554,7 @@ Every Haskell package set takes a function called `overrides` that you can use to manipulate the package as much as you please. One useful application of this feature is to replace the default `mkDerivation` function with one that enables library profiling for all packages. To accomplish that, add configure the -following snippet in your `~/.nixpkgs/config.nix` file: +following snippet in your `~/.config/nixpkgs/config.nix` file: { packageOverrides = super: let self = super.pkgs; in @@ -583,7 +583,7 @@ The first step is to generate Nix build instructions with `cabal2nix`: $ cabal2nix cabal://ghc-events-0.4.3.0 >~/.nixpkgs/ghc-events-0.4.3.0.nix -Then add the override in `~/.nixpkgs/config.nix`: +Then add the override in `~/.config/nixpkgs/config.nix`: { packageOverrides = super: let self = super.pkgs; in diff --git a/doc/package-notes.xml b/doc/package-notes.xml index 0ba7ec4c44d..0f148f5c898 100644 --- a/doc/package-notes.xml +++ b/doc/package-notes.xml @@ -278,7 +278,7 @@ packageOverrides = pkgs: { to your Nixpkgs configuration - (~/.nixpkgs/config.nix) and install it by + (~/.config/nixpkgs/config.nix) and install it by running nix-env -f '<nixpkgs>' -iA myEclipse and afterward run Eclipse as usual. It is possible to find out which plugins are available for installation diff --git a/lib/customisation.nix b/lib/customisation.nix index 3e6e279824b..41fe07fbd0a 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -15,10 +15,10 @@ rec { the original derivation attributes. `overrideDerivation' allows certain "ad-hoc" customisation - scenarios (e.g. in ~/.nixpkgs/config.nix). For instance, if you - want to "patch" the derivation returned by a package function in - Nixpkgs to build another version than what the function itself - provides, you can do something like this: + scenarios (e.g. in ~/.config/nixpkgs/config.nix). For instance, + if you want to "patch" the derivation returned by a package + function in Nixpkgs to build another version than what the + function itself provides, you can do something like this: mySed = overrideDerivation pkgs.gnused (oldAttrs: { name = "sed-4.2.2-pre"; diff --git a/nixos/modules/services/editors/emacs.xml b/nixos/modules/services/editors/emacs.xml index e03f6046de8..89f09ed0844 100644 --- a/nixos/modules/services/editors/emacs.xml +++ b/nixos/modules/services/editors/emacs.xml @@ -316,10 +316,10 @@ https://nixos.org/nixpkgs/manual/#sec-modify-via-packageOverrides If you are not on NixOS or want to install this particular Emacs only for yourself, you can do so by adding it to your - ~/.nixpkgs/config.nix + ~/.config/nixpkgs/config.nix (see Nixpkgs manual): - Custom Emacs in <filename>~/.nixpkgs/system.nix</filename> + Custom Emacs in <filename>~/.config/nixpkgs/config.nix</filename> then else "") ""; - dirHome = homeDir + "/.nixpkgs/overlays"; + dirHome = homeDir + "/.config/nixpkgs/overlays"; dirCheck = dir: dir != "" && pathExists (dir + "/."); overlays = dir: let content = readDir dir; in From 6ba35336f03381284e49b6a025e6008a01f7e77f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 1 Feb 2017 17:59:23 +0100 Subject: [PATCH 037/146] youtube-dl: update to version 2017.02.01 --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 6ea9baf216b..c6da169a583 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -15,11 +15,11 @@ with stdenv.lib; buildPythonApplication rec { name = "youtube-dl-${version}"; - version = "2017.01.29"; + version = "2017.02.01"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "0visxc4rb6kw4hjcgcv5llis08z0syhian1m5hr1fdbz4w73hx9l"; + sha256 = "1jkra0kgqg9ks76hwfcfsdaiknr9w8vavja0rc81ia644085axzz"; }; buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc; From 9f740122502d5ac9e01c1cf7a9a70ddc8c13b808 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 1 Feb 2017 14:45:44 +0100 Subject: [PATCH 038/146] pythonPackages.testpath: init at 0.3 --- pkgs/top-level/python-packages.nix | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0f79045c007..81f2bd4b019 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -25505,6 +25505,35 @@ in { }; }; + testpath = buildPythonPackage rec { + pname = "testpath"; + version = "0.3"; + name = "${pname}-${version}"; + + #format = "flit"; + #src = pkgs.fetchFromGitHub { + # owner = "jupyter"; + # repo = pname; + # rev = "${version}"; + # sha256 = "1ghzmkrsrk9xrj42pjsq5gl7v3g2v0ji0xy0xzzxp5aizd3wrvl9"; + #}; + #doCheck = true; + #checkPhase = '' + # ${python.interpreter} -m unittest discover + #''; + format = "wheel"; + src = fetchpypi { + inherit pname version format; + sha256 = "f16b2cb3b03e1ada4fb0200b265a4446f92f3ba4b9d88ace34f51c54ab6d294e"; + }; + + meta = { + description = "Test utilities for code working with files and commands"; + license = with lib.licenses; [ mit ]; + homepage = https://github.com/jupyter/testpath; + }; + }; + testrepository = buildPythonPackage rec { name = "testrepository-${version}"; version = "0.0.20"; From 2d062241eaff167935ce149021f774b9becf5fe1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 1 Feb 2017 14:46:00 +0100 Subject: [PATCH 039/146] pythonPackages.xarray: 0.8.2 -> 0.9.1 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 81f2bd4b019..9db1ffc0d7f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -27055,11 +27055,11 @@ EOF xarray = buildPythonPackage rec { name = "xarray-${version}"; - version = "0.8.2"; + version = "0.9.1"; src = pkgs.fetchurl { url = "mirror://pypi/x/xarray/${name}.tar.gz"; - sha256 = "4da06e38baea65c51347ba0770db416ebf003dbad5637215d2b25b191f2be1fb"; + sha256 = "89772ed0e23f0e71c3fb8323746374999ecbe79c113e3fadc7ae6374e6dc0525"; }; buildInputs = with self; [ pytest ]; From 5cd9e1c8f2ca5497e24379b74497efcdd1a6414c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 1 Feb 2017 14:46:26 +0100 Subject: [PATCH 040/146] pythonPackages.pandocfilters: 1.3.0 -> 1.4.1 --- pkgs/top-level/python-packages.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9db1ffc0d7f..912f65c55b0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -30898,18 +30898,16 @@ EOF }; }; pandocfilters = buildPythonPackage rec{ - version = "1.3.0"; + version = "1.4.1"; pname = "pandocfilters"; name = pname + "-${version}"; - src = pkgs.fetchFromGitHub { - owner = "jgm"; - repo = pname; - rev = version; - sha256 = "0ky9k800ixwiwvra0na6d6qaqcyps83mycgd8qvkrn5r80hddkzz"; + src = fetchpypi{ + inherit pname version; + sha256 = "ec8bcd100d081db092c57f93462b1861bcfa1286ef126f34da5cb1d969538acd"; }; - - propagatedBuildInputs = with self; [ ]; + # No tests available + doCheck = false; meta = { description = "A python module for writing pandoc filters, with a collection of examples"; From 3eadbb746c7b94b74cdf70e84d2a951458b6d17f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 1 Feb 2017 14:47:15 +0100 Subject: [PATCH 041/146] pythonPackages.numexpr: 2.6.1 -> 2.6.2 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 912f65c55b0..6e17ec53649 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16097,12 +16097,12 @@ in { numba = callPackage ../development/python-modules/numba { }; numexpr = buildPythonPackage rec { - version = "2.6.1"; + version = "2.6.2"; name = "numexpr-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/n/numexpr/${name}.tar.gz"; - sha256 = "db2ee72f277b23c82d204189290ea4b792f9bd5b9d67744b045f8c2a8e929a06"; + sha256 = "6ab8ff5c19e7f452966bf5a3220b845cf3244fe0b96544f7f9acedcc2db5c705"; }; propagatedBuildInputs = with self; [ numpy ]; From fae20e6c2938d2225ca7542ec40278780e5dc93e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 1 Feb 2017 14:47:38 +0100 Subject: [PATCH 042/146] pythonPackages.ipywidgets: disable tests --- pkgs/top-level/python-packages.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6e17ec53649..4980a29dd2a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13090,6 +13090,9 @@ in { sha256 = "baf6098f054dd5eacc2934b8ea3bef908b81ca8660d839f1f940255a72c660d2"; }; + # Tests are not distributed + doCheck = false; + buildInputs = with self; [ nose pytest ]; propagatedBuildInputs = with self; [ipython ipykernel traitlets notebook widgetsnbextension ]; From ea5c83daa207148b5eba8d395a673f4b56da7ed4 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 1 Feb 2017 18:57:11 +0100 Subject: [PATCH 043/146] mupdf: 1.9a -> 1.10a --- pkgs/applications/misc/mupdf/default.nix | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index e1926ce386f..ba2313fc7b5 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -3,31 +3,20 @@ , libX11, libXcursor, libXrandr, libXinerama, libXext, harfbuzz, mesa }: stdenv.mkDerivation rec { - version = "1.9a"; + version = "1.10a"; name = "mupdf-${version}"; src = fetchurl { url = "http://mupdf.com/downloads/archive/${name}-source.tar.gz"; - sha256 = "1k64pdapyj8a336jw3j61fhn0rp4q6az7d0dqp9r5n3d9rgwa5c0"; + sha256 = "0dm8wcs8i29aibzkqkrn8kcnk4q0kd1v66pg48h5c3qqp4v1zk5a"; }; patches = [ - # http://www.openwall.com/lists/oss-security/2016/08/03/2 - (fetchpatch { - name = "mupdf-fix-CVE-2016-6525.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=commitdiff_plain;h=39b0f07dd960f34e7e6bf230ffc3d87c41ef0f2e;hp=fa1936405b6a84e5c9bb440912c23d532772f958"; - sha256 = "1g9fkd1f5rx1z043vr9dj4934qf7i4nkvbwjc61my9azjrrc3jv7"; - }) - (fetchpatch { - name = "mupdf-696941-fix-use-after-free.patch"; - url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=fa1936405b6a84e5c9bb440912c23d532772f958"; - sha256 = "02j9b6my1h3rb0sz9yp6gi7c4ldi3mz0z9s5i8g9cl0arxyzys5h"; - }) # Compatibility with new openjpeg (fetchpatch { name = "mupdf-1.9a-openjpeg-2.1.1.patch"; - url = "https://git.archlinux.org/svntogit/community.git/plain/mupdf/trunk/0001-mupdf-openjpeg.patch?id=9083dac2a398bfe694d31a0c6a0a839c5a756e53"; - sha256 = "14ndgy3w1sl25km9bcc2zfcxrcihqjw1sdzkpcw5g1mi7gcgxp3g"; + url = "https://git.archlinux.org/svntogit/community.git/plain/mupdf/trunk/0001-mupdf-openjpeg.patch?id=5a28ad0a8999a9234aa7848096041992cc988099"; + sha256 = "1i24qr4xagyapx4bijjfksj4g3bxz8vs5c2mn61nkm29c63knp75"; }) ]; From 68995874be1c79cf6b30c888fc05494bfc57f716 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 1 Feb 2017 19:03:56 +0100 Subject: [PATCH 044/146] asdf: 3.1.7 -> 3.2.0 --- pkgs/development/lisp-modules/asdf/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/lisp-modules/asdf/default.nix b/pkgs/development/lisp-modules/asdf/default.nix index 278690f3a1c..7e05dfa585a 100644 --- a/pkgs/development/lisp-modules/asdf/default.nix +++ b/pkgs/development/lisp-modules/asdf/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="asdf"; - version="3.1.7"; + version="3.2.0"; name="${baseName}-${version}"; - hash="16x065q6adidbdr77axsxz4f8c818szfz0b9sw1a4c89y82ylsnn"; - url="http://common-lisp.net/project/asdf/archives/asdf-3.1.7.tar.gz"; - sha256="16x065q6adidbdr77axsxz4f8c818szfz0b9sw1a4c89y82ylsnn"; + hash="0ns4hh5f0anfgvy4q68wsylgwfin82kb1k2p53h29cf8jiil0p9a"; + url="http://common-lisp.net/project/asdf/archives/asdf-3.2.0.tar.gz"; + sha256="0ns4hh5f0anfgvy4q68wsylgwfin82kb1k2p53h29cf8jiil0p9a"; }; buildInputs = [ texinfo texLive perl @@ -19,7 +19,7 @@ stdenv.mkDerivation { src = fetchurl { inherit (s) url sha256; }; - sourceRoot = "."; + buildPhase = '' make build/asdf.lisp make -C doc asdf.info asdf.html From 1567d3c44a62578fce87a3e8e715c398960afa7d Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 1 Feb 2017 19:04:19 +0100 Subject: [PATCH 045/146] sbcl: 1.3.13 -> 1.3.14 --- pkgs/development/compilers/sbcl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 85c558c92e8..c713d819661 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.3.13"; + version = "1.3.14"; src = fetchurl { url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; - sha256 = "1k3nij1pchkard02p51mbbsn4rrj116v1apjjpd3f9h2m7j3asac"; + sha256 = "1jnwsv8bdkrrg1w0gkjx9nb8sw3if38sna40davrx0rxadc3v5mz"; }; patchPhase = '' From 1561dcdc26d22a0552444295c699c276ee69e92c Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 1 Feb 2017 19:15:22 +0100 Subject: [PATCH 046/146] getmail: 4.52.0 -> 4.53.0 --- pkgs/tools/networking/getmail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix index c3fe609f4cd..5eac65a009a 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 = "4.52.0"; + version = "4.53.0"; name = "getmail-${version}"; namePrefix = ""; src = fetchurl { url = "http://pyropus.ca/software/getmail/old-versions/${name}.tar.gz"; - sha256 = "0pzplrlxwbxydvfw4kkwn60l40hk1h5sxawaa6pi0k75c220k4ni"; + sha256 = "1awjdxiq3d25h10h32a7h2wxbkgvgvsnicp5xwx4p8mm6gz9c998"; }; doCheck = false; From 846007b8db338d8293c1bf208ba42f10c78e14aa Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 1 Feb 2017 19:20:54 +0100 Subject: [PATCH 047/146] nginx: 1.10.2 -> 1.10.3 --- pkgs/servers/http/nginx/stable.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/stable.nix b/pkgs/servers/http/nginx/stable.nix index 8d91f4e4b9b..efbcada6230 100644 --- a/pkgs/servers/http/nginx/stable.nix +++ b/pkgs/servers/http/nginx/stable.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "1.10.2"; - sha256 = "1hk5szkwns6s0xsvd0aiy392sqbvk3wdl480bpxf55m3hx4sqi8h"; + version = "1.10.3"; + sha256 = "146xd566l1wkhzxqhmd01vj7c0yhsap1qkiwfg5mki6ach9hy0km"; }) From c1f6eeb822654d74d10125fa7c4b146579bb97ad Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 1 Feb 2017 19:23:04 +0100 Subject: [PATCH 048/146] botan: 1.10.14 -> 1.10.14 --- pkgs/development/libraries/botan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/botan/default.nix b/pkgs/development/libraries/botan/default.nix index f66e7befeb0..f2971cc47be 100644 --- a/pkgs/development/libraries/botan/default.nix +++ b/pkgs/development/libraries/botan/default.nix @@ -2,8 +2,8 @@ callPackage ./generic.nix (args // { baseVersion = "1.10"; - revision = "14"; - sha256 = "072czy26vfjcqjww4qccsd29fzkb6mb8czamr4x76rdi9lwhpv8h"; + revision = "15"; + sha256 = "1zkhmggzxjla2iwaiyrx5161yxckrzszmy9yghjlpnhg8zyqzk60"; extraConfigureFlags = "--with-gnump"; postPatch = '' sed -e 's@lang_flags "@&--std=c++11 @' -i src/build-data/cc/{gcc,clang}.txt From a9e55a2a8e2849fa8e991ecac4d8eeafe9187c63 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 1 Feb 2017 19:24:35 +0100 Subject: [PATCH 049/146] firejail: 0.9.44.4 -> 0.9.44.8 --- pkgs/os-specific/linux/firejail/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix index 74486843b92..27acc8f1c28 100644 --- a/pkgs/os-specific/linux/firejail/default.nix +++ b/pkgs/os-specific/linux/firejail/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="firejail"; - version="0.9.44.4"; + version="0.9.44.8"; name="${baseName}-${version}"; - hash="03y1xc70w5xr6jynmj305fmgniz2cq21q85s5q7dnda8ap6s4w1d"; - url="https://netcologne.dl.sourceforge.net/project/firejail/firejail/firejail-0.9.44.4.tar.xz"; - sha256="03y1xc70w5xr6jynmj305fmgniz2cq21q85s5q7dnda8ap6s4w1d"; + hash="0w87n5qzvylbjipaf45sw65gg4rpqcbi32zw9cs1jbfvf4bikzmr"; + url="https://netix.dl.sourceforge.net/project/firejail/firejail/firejail-0.9.44.8.tar.xz"; + sha256="0w87n5qzvylbjipaf45sw65gg4rpqcbi32zw9cs1jbfvf4bikzmr"; }; buildInputs = [ which From ac10c19746ceaec1459548cf2ba9585b4c905f2f Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Wed, 1 Feb 2017 19:43:02 +0100 Subject: [PATCH 050/146] veriT: 201506 -> 2016 --- pkgs/applications/science/logic/verit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/logic/verit/default.nix b/pkgs/applications/science/logic/verit/default.nix index 53ab084321d..ca3673d7bf9 100644 --- a/pkgs/applications/science/logic/verit/default.nix +++ b/pkgs/applications/science/logic/verit/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "veriT-${version}"; - version = "201506"; + version = "2016"; src = fetchurl { - url = "http://www.verit-solver.org/distrib/${name}.tar.gz"; - sha256 = "1cc9gcspw3namkdfypkians2j5dn224dsw6xx95qicad6033bsgk"; + url = "http://www.verit-solver.org/distrib/veriT-stable2016.tar.gz"; + sha256 = "0gvp4diz0qjg0y5ry0p1z7dkdkxw8l7jb8cdhvcnhl06jx977v4b"; }; nativeBuildInputs = [ autoreconfHook flex bison ]; From b70a979c6932b9cdda58c691988b37a62a90e716 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 1 Feb 2017 20:25:58 +0100 Subject: [PATCH 051/146] Remove unnecessary "sort" call attrNames already returns names in sorted order. --- pkgs/top-level/impure.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/impure.nix b/pkgs/top-level/impure.nix index 63112034d29..6999b7428ba 100644 --- a/pkgs/top-level/impure.nix +++ b/pkgs/top-level/impure.nix @@ -39,7 +39,7 @@ in let content = readDir dir; in map (n: import (dir + ("/" + n))) (builtins.filter (n: builtins.match ".*\.nix" n != null) - (sort lessThan (attrNames content))); + (attrNames content)); in if dirPath != "" then overlays dirPath From 3d10d5ffdca0670d05cf5213b1bac68bd9208002 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 1 Feb 2017 19:34:42 +0000 Subject: [PATCH 052/146] omake: 0.10.1 -> 0.10.2 --- pkgs/development/tools/ocaml/omake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ocaml/omake/default.nix b/pkgs/development/tools/ocaml/omake/default.nix index 53152898fd6..93d96005d35 100644 --- a/pkgs/development/tools/ocaml/omake/default.nix +++ b/pkgs/development/tools/ocaml/omake/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "omake-${version}"; - version = "0.10.1"; + version = "0.10.2"; src = fetchurl { url = "http://download.camlcity.org/download/${name}.tar.gz"; - sha256 = "093ansbppms90hiqvzar2a46fj8gm9iwnf8gn38s6piyp70lrbsj"; + sha256 = "1znnlkpz89hk44byvnl1pr92ym6hwfyyw2qm9clq446r6l2z4m64"; }; buildInputs = [ ocaml ncurses ]; From 2bf0fd0f294e0c1e52e36b9c2aba257f5fe4d468 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 21 Jan 2017 14:25:19 +0100 Subject: [PATCH 053/146] Revert "nmap: use python infra's .withPackages" This reverts commit 278d3050ae85e959e4c6485b5ad43bbba96eb829 because it breaks zenmap: $ zenmap Could not import the zenmapGUI.App module: 'No module named zenmapGUI.App'. I checked in these directories: /nix/store/2hiz11plgjdrk2mziwc2jcxqalqh9hii-nmap-graphical-7.12/bin /home/bfo/forks/nixpkgs /nix/store/0l4lriqf07qah8c0kh9kcyc8l5iyij16-python-2.7.12/lib/python27.zip /nix/store/0l4lriqf07qah8c0kh9kcyc8l5iyij16-python-2.7.12/lib/python2.7 /nix/store/0l4lriqf07qah8c0kh9kcyc8l5iyij16-python-2.7.12/lib/python2.7/plat-linux2 /nix/store/0l4lriqf07qah8c0kh9kcyc8l5iyij16-python-2.7.12/lib/python2.7/lib-tk /nix/store/0l4lriqf07qah8c0kh9kcyc8l5iyij16-python-2.7.12/lib/python2.7/lib-old /nix/store/0l4lriqf07qah8c0kh9kcyc8l5iyij16-python-2.7.12/lib/python2.7/lib-dynload /nix/store/0l4lriqf07qah8c0kh9kcyc8l5iyij16-python-2.7.12/lib/python2.7/site-packages If you installed Zenmap in another directory, you may have to add the modules directory to the PYTHONPATH environment variable. --- pkgs/tools/security/nmap/default.nix | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index 9413f992086..71d93d44322 100644 --- a/pkgs/tools/security/nmap/default.nix +++ b/pkgs/tools/security/nmap/default.nix @@ -1,12 +1,13 @@ { stdenv, fetchurl, libpcap, pkgconfig, openssl , graphicalSupport ? false -, gtk2 ? null , libX11 ? null +, gtk2 ? null , withPython ? false # required for the `ndiff` binary -, python2 ? null +, python2Packages ? null +, makeWrapper ? null }: -assert withPython -> python2 != null; +assert withPython -> python2Packages != null; with stdenv.lib; @@ -16,10 +17,6 @@ let # so automatically enable pythonSupport if graphicalSupport is requested. pythonSupport = withPython || graphicalSupport; - pythonEnv = python2.withPackages(ps: with ps; [] - ++ optionals graphicalSupport [ pycairo pygobject2 pygtk pysqlite ] - ); - in stdenv.mkDerivation rec { name = "nmap${optionalString graphicalSupport "-graphical"}-${version}"; version = "7.31"; @@ -36,10 +33,17 @@ in stdenv.mkDerivation rec { ++ optional (!graphicalSupport) "--without-zenmap" ; - buildInputs = [ libpcap pkgconfig openssl ] - ++ optional pythonSupport pythonEnv - ++ optionals graphicalSupport [ gtk2 libX11 ] - ; + postInstall = optionalString pythonSupport '' + wrapProgram $out/bin/ndiff --prefix PYTHONPATH : "$(toPythonPath $out)" --prefix PYTHONPATH : "$PYTHONPATH" + '' + optionalString graphicalSupport '' + wrapProgram $out/bin/zenmap --prefix PYTHONPATH : "$(toPythonPath $out)" --prefix PYTHONPATH : "$PYTHONPATH" --prefix PYTHONPATH : $(toPythonPath $pygtk)/gtk-2.0 --prefix PYTHONPATH : $(toPythonPath $pygobject)/gtk-2.0 --prefix PYTHONPATH : $(toPythonPath $pycairo)/gtk-2.0 + ''; + + buildInputs = with python2Packages; [ libpcap pkgconfig openssl ] + ++ optionals pythonSupport [ makeWrapper python ] + ++ optionals graphicalSupport [ + libX11 gtk2 pygtk pysqlite pygobject2 pycairo + ]; meta = { description = "A free and open source utility for network discovery and security auditing"; From 32a6a4df774f208fbcc8d5d4098b7d175dcc780a Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Wed, 1 Feb 2017 21:12:02 +0100 Subject: [PATCH 054/146] gitlab-runner: 1.10.0 -> 1.10.4 Patch release fixes some crashes and race conditions --- .../continuous-integration/gitlab-runner/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index c2e105d469e..7c8c71b2969 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 = "1.10.0"; + version = "1.10.4"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz"; - sha256 = "1fv4sv92ng4gx53pbpagb6kv2hdab04lf2chsflf10xgzqw5l521"; + sha256 = "0csaacghcdnkrpxiwsg8166nmdpnddf77c619i558vj0wdglq45k"; }; docker_arm = fetchurl { url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz"; - sha256 = "153dbgk6fvl73d5qhainqr9hzicsryc6ynlryi9si40ld82flrsr"; + sha256 = "1lsdp4v92v406qiwr435ym4f3zbc1vq6ipwrp7li640frhr2jqpk"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-ci-multi-runner"; rev = "v${version}"; - sha256 = "0ma6b6624c8218cz4gg5pr077li7nbs0v3mpgr1hxq7v465spa7j"; + sha256 = "0r8f1m9f544ikcknvq1500kfjxbikgqlv7wdayfpazvj6s1zlswg"; }; buildInputs = [ go-bindata ]; From 3e5022c787c2581aa3fc5685a3c0e08a2a0314a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Wed, 1 Feb 2017 21:03:02 +0100 Subject: [PATCH 055/146] hardinfo: init at 0.5.1 Display information about your hardware and operating system. --- pkgs/tools/system/hardinfo/default.nix | 45 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 47 insertions(+) create mode 100644 pkgs/tools/system/hardinfo/default.nix diff --git a/pkgs/tools/system/hardinfo/default.nix b/pkgs/tools/system/hardinfo/default.nix new file mode 100644 index 00000000000..11236b7a9d1 --- /dev/null +++ b/pkgs/tools/system/hardinfo/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchurl, which, pkgconfig, gtk2, pcre, glib, libxml2 +, libsoup ? null +}: + +stdenv.mkDerivation rec { + name = "hardinfo-${version}"; + version = "0.5.1"; + + src = fetchurl { + url = "mirror://sourceforge/project/hardinfo.berlios/hardinfo-${version}.tar.bz2"; + sha256 = "0yhvfc5icam3i4mphlz0m9d9d2irjw8mbsxq203x59wjgh6nrpx0"; + }; + + # Not adding 'hostname' command, the build shouldn't depend on what the build + # host is called. + buildInputs = [ which pkgconfig gtk2 pcre glib libxml2 libsoup ]; + + # Fixes '#error You must compile this program without "-O"' + hardeningDisable = [ "all" ]; + + preConfigure = '' + patchShebangs configure + + # -std=gnu89 fixes build error, copied from + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=757525 + sed -i -e "s/^CFLAGS = \(.*\)/CFLAGS = \1 -std=gnu89/" Makefile.in + + substituteInPlace ./arch/linux/common/modules.h --replace /sbin/modinfo modinfo + ''; + + # Makefile supports DESTDIR but not PREFIX (it hardcodes $DESTDIR/usr/). + installFlags = [ "DESTDIR=$(out)" ]; + postInstall = '' + mv "$out/usr/"* "$out" + rmdir "$out/usr" + ''; + + meta = with stdenv.lib; { + homepage = http://hardinfo.org/; + description = "Display information about your hardware and operating system"; + license = licenses.gpl2; + maintainers = with maintainers; [ bjornfor ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 90e44c9819a..a2c08d2eea8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2150,6 +2150,8 @@ with pkgs; halibut = callPackage ../tools/typesetting/halibut { }; + hardinfo = callPackage ../tools/system/hardinfo { }; + hdapsd = callPackage ../os-specific/linux/hdapsd { }; hddtemp = callPackage ../tools/misc/hddtemp { }; From 220adbb0393e8acff35d137998a133df38bc8198 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 1 Feb 2017 21:31:53 +0100 Subject: [PATCH 056/146] docs: fix link for python --- doc/languages-frameworks/python.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md index 3f5d500620b..83d47b6f43a 100644 --- a/doc/languages-frameworks/python.md +++ b/doc/languages-frameworks/python.md @@ -781,7 +781,7 @@ If you get the following error: could not create '/nix/store/6l1bvljpy8gazlsw2aw9skwwp4pmvyxw-python-2.7.8/etc': Permission denied -This is a [known bug](https://bitbucket.org/pypa/setuptools/issue/130/install_data-doesnt-respect-prefix) in setuptools. +This is a [known bug](https://github.com/pypa/setuptools/issues/130) in setuptools. Setuptools `install_data` does not respect `--prefix`. An example of such package using the feature is `pkgs/tools/X11/xpra/default.nix`. As workaround install it as an extra `preInstall` step: From de172ae0613092a0efb2fd7654943a06463b90ac Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 1 Feb 2017 22:18:36 +0100 Subject: [PATCH 057/146] copyright-update: init at 2016.1018 --- pkgs/tools/text/copyright-update/default.nix | 26 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/tools/text/copyright-update/default.nix diff --git a/pkgs/tools/text/copyright-update/default.nix b/pkgs/tools/text/copyright-update/default.nix new file mode 100644 index 00000000000..604097fbe77 --- /dev/null +++ b/pkgs/tools/text/copyright-update/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, perl }: + +stdenv.mkDerivation rec { + name = "copyright-update-${version}"; + version = "2016.1018"; + + src = fetchFromGitHub { + name = "${name}-src"; + owner = "jaalto"; + repo = "project--copyright-update"; + rev = "release/${version}"; + sha256 = "1kj6jlgyxrgvrpv7fcgbibfqqa83xljp17v6sas42dlb105h6sgd"; + }; + + buildInputs = [ perl ]; + + installFlags = [ "INSTALL=install" "prefix=$(out)" ]; + + meta = with stdenv.lib; { + homepage = https://github.com/jaalto/project--copyright-update; + description = "Updates the copyright information in a set of files"; + license = licenses.gpl2Plus; + platforms = platforms.all; + maintainers = [ maintainers.rycee ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a2c08d2eea8..4cd17dfea3c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -743,6 +743,8 @@ with pkgs; consul-template = callPackage ../tools/system/consul-template { }; + copyright-update = callPackage ../tools/text/copyright-update { }; + corebird = callPackage ../applications/networking/corebird { }; corosync = callPackage ../servers/corosync { }; From 24f3abdafbf0a4840d63baa91e60ba34fad00d4d Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Mon, 30 Jan 2017 14:03:42 +0100 Subject: [PATCH 058/146] Revert "Make services.xserver.xkbDir conflict free when overriden." This reverts commit 82bcfef109ecf58ac1503e4cab15ae53dd524f4b. cc @nbp Fixes #22290, #22352. Signed-off-by: Franz Pletz --- .../x11/desktop-managers/enlightenment.nix | 5 +++- .../services/x11/desktop-managers/kde4.nix | 5 +++- .../services/x11/desktop-managers/kde5.nix | 5 +++- nixos/modules/services/x11/xserver.nix | 24 ++++++++++++------- 4 files changed, 28 insertions(+), 11 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix index 615504bab15..7ea8b30d23d 100644 --- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix +++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix @@ -64,7 +64,10 @@ in security.setuidPrograms = [ "e_freqset" ]; - services.xserver.exportConfiguration = true; + environment.etc = singleton + { source = "${pkgs.xkeyboard_config}/etc/X11/xkb"; + target = "X11/xkb"; + }; fonts.fonts = [ pkgs.dejavu_fonts pkgs.ubuntu_font_family ]; diff --git a/nixos/modules/services/x11/desktop-managers/kde4.nix b/nixos/modules/services/x11/desktop-managers/kde4.nix index b551432bc27..3aa4821a052 100644 --- a/nixos/modules/services/x11/desktop-managers/kde4.nix +++ b/nixos/modules/services/x11/desktop-managers/kde4.nix @@ -183,7 +183,10 @@ in GST_PLUGIN_SYSTEM_PATH = [ "/lib/gstreamer-0.10" ]; }; - services.xserver.exportConfiguration = true; + environment.etc = singleton + { source = "${pkgs.xkeyboard_config}/etc/X11/xkb"; + target = "X11/xkb"; + }; # Enable helpful DBus services. services.udisks2.enable = true; diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index ec85cf1d0bd..8f081a1e9d2 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -199,7 +199,10 @@ in environment.pathsToLink = [ "/share" ]; - services.xserver.exportConfiguration = true; + environment.etc = singleton { + source = "${pkgs.xkeyboard_config}/etc/X11/xkb"; + target = "X11/xkb"; + }; environment.variables = { diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 8617a5fab03..f5ed5233818 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -465,15 +465,23 @@ in } ]; - environment.etc = mkMerge [ - (mkIf cfg.exportConfiguration { - "X11/xorg.conf".source = configFile; - "X11/xkb".source = cfg.xkbDir; - }) + environment.etc = + (optionals cfg.exportConfiguration + [ { source = "${configFile}"; + target = "X11/xorg.conf"; + } + # -xkbdir command line option does not seems to be passed to xkbcomp. + { source = "${cfg.xkbDir}"; + target = "X11/xkb"; + } + ]) # Needed since 1.18; see https://bugs.freedesktop.org/show_bug.cgi?id=89023#c5 - (let cfgPath = "X11/xorg.conf.d/10-evdev.conf"; in - { "${cfgPath}".source = xorg.xf86inputevdev.out + "/share" + cfgPath; }) - ]; + ++ (let cfgPath = "/X11/xorg.conf.d/10-evdev.conf"; in + [{ + source = xorg.xf86inputevdev.out + "/share" + cfgPath; + target = cfgPath; + }] + ); environment.systemPackages = [ xorg.xorgserver.out From c3badbb3664f43612998927f8cfaba945b1d418c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 1 Feb 2017 22:44:10 +0100 Subject: [PATCH 059/146] knot-resolver: 1.2.0 -> 1.2.1 It mainly fixes a single issue that perhaps has a minor security impact. https://lists.nic.cz/pipermail/knot-dns-users/2017-February/001045.html --- pkgs/servers/dns/knot-resolver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 1e7dbaf8e2f..6b4f1522e21 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -10,11 +10,11 @@ let in stdenv.mkDerivation rec { name = "knot-resolver-${version}"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { url = "http://secure.nic.cz/files/knot-resolver/${name}.tar.xz"; - sha256 = "b8828197dbd563e4b502571538c6d44ef2bb07dede1df884b785921f8aec77fd"; + sha256 = "1b6f55ea1dfec90f45c437f23e1ab440e478570498161d0f8a8f94a439305f8c"; }; outputs = [ "out" "dev" ]; From 1095d2cc076dcab627c97cb272fc2bcf5814aca3 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 1 Feb 2017 22:59:01 +0100 Subject: [PATCH 060/146] jenkins: 2.33 -> 2.44 for multiple CVEs Fixes: * CVE-2017-2598 * CVE-2017-2599 * CVE-2017-2600 * CVE-2011-4969 * CVE-2017-2601 * CVE-2015-0886 * CVE-2017-2602 * CVE-2017-2603 * CVE-2017-2604 * CVE-2017-2605 * CVE-2017-2606 * CVE-2017-2607 * CVE-2017-2608 * CVE-2017-2609 * CVE-2017-2610 * CVE-2017-2611 * CVE-2017-2612 * CVE-2017-2613 See https://wiki.jenkins-ci.org/display/SECURITY/Jenkins+Security+Advisory+2017-02-01. --- .../tools/continuous-integration/jenkins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 6a752d08cff..3196b6728e0 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jenkins-${version}"; - version = "2.33"; + version = "2.44"; src = fetchurl { url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war"; - sha256 = "1x1m4d7r128v6i0gpa4z07db6vdw1x9ik0p4a8gsnj6g15fzkdzy"; + sha256 = "01v9p0p27czwsk7ljv1879b5qcrhgy7zan6dj8klr9rci1id8x0d"; }; buildCommand = '' From 5cbcd3af69d859a6d919ad26261c57649e9c888f Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 14 Jan 2017 04:14:01 +0300 Subject: [PATCH 061/146] types library: add coercedTo --- lib/types.nix | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/lib/types.nix b/lib/types.nix index 9366d394da7..0d1a88a00f2 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -352,6 +352,28 @@ rec { functor = (defaultFunctor name) // { wrapped = [ t1 t2 ]; }; }; + coercedTo = coercedType: coerceFunc: finalType: + assert coercedType.getSubModules == null; + mkOptionType rec { + name = "coercedTo"; + description = "${finalType.description} or ${coercedType.description}"; + check = x: finalType.check x || coercedType.check x; + merge = loc: defs: + let + coerceVal = val: + if finalType.check val then val + else let + coerced = coerceFunc val; + in assert finalType.check coerced; coerced; + + in finalType.merge loc (map (def: def // { value = coerceVal def.value; }) defs); + getSubOptions = finalType.getSubOptions; + getSubModules = finalType.getSubModules; + substSubModules = m: coercedTo coercedType coerceFunc (finalType.substSubModules m); + typeMerge = t1: t2: null; + functor = (defaultFunctor name) // { wrapped = finalType; }; + }; + # Obsolete alternative to configOf. It takes its option # declarations from the ‘options’ attribute of containing option # declaration. From fcb20b9feecb33c60d15a98766f7fd1bfbeae13e Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 2 Feb 2017 01:52:40 +0300 Subject: [PATCH 062/146] module tests: add tests for coercedTo --- lib/tests/modules.sh | 5 +++++ lib/tests/modules/declare-coerced-value.nix | 10 ++++++++++ lib/tests/modules/define-value-list.nix | 3 +++ lib/tests/modules/define-value-string.nix | 3 +++ 4 files changed, 21 insertions(+) create mode 100644 lib/tests/modules/declare-coerced-value.nix create mode 100644 lib/tests/modules/define-value-list.nix create mode 100644 lib/tests/modules/define-value-string.nix diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index 65de8e378c7..e0774383720 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -115,6 +115,11 @@ set -- config.enable ./declare-enable.nix ./define-enable.nix ./define-loaOfSub- checkConfigError 'The option .* defined in .* does not exist.' "$@" checkConfigOutput "true" "$@" ./define-module-check.nix +# Check coerced value. +checkConfigOutput "\"42\"" config.value ./declare-coerced-value.nix +checkConfigOutput "\"24\"" config.value ./declare-coerced-value.nix ./define-value-string.nix +checkConfigError 'The option value .* in .* is not a coercedTo.' config.value ./declare-coerced-value.nix ./define-value-list.nix + cat < Date: Sat, 14 Jan 2017 04:14:16 +0300 Subject: [PATCH 063/146] network-interfaces service: add defaultGateway{,6}.interface --- .../tasks/network-interfaces-scripted.nix | 16 ++++--- .../tasks/network-interfaces-systemd.nix | 6 +++ nixos/modules/tasks/network-interfaces.nix | 42 ++++++++++++++++--- 3 files changed, 52 insertions(+), 12 deletions(-) diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix index c50ea5c7964..aa86fc85feb 100644 --- a/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/nixos/modules/tasks/network-interfaces-scripted.nix @@ -102,17 +102,21 @@ in EOF # Set the default gateway. - ${optionalString (cfg.defaultGateway != null && cfg.defaultGateway != "") '' + ${optionalString (cfg.defaultGateway != null && cfg.defaultGateway.address != "") '' # FIXME: get rid of "|| true" (necessary to make it idempotent). - ip route add default via "${cfg.defaultGateway}" ${ + ip route add default via "${cfg.defaultGateway.address}" ${ optionalString (cfg.defaultGatewayWindowSize != null) - "window ${toString cfg.defaultGatewayWindowSize}"} || true + "window ${toString cfg.defaultGatewayWindowSize}"} ${ + optionalString (cfg.defaultGateway.interface != null) + "dev ${cfg.defaultGateway.interface}"}|| true ''} - ${optionalString (cfg.defaultGateway6 != null && cfg.defaultGateway6 != "") '' + ${optionalString (cfg.defaultGateway6 != null && cfg.defaultGateway6.address != "") '' # FIXME: get rid of "|| true" (necessary to make it idempotent). - ip -6 route add ::/0 via "${cfg.defaultGateway6}" ${ + ip -6 route add ::/0 via "${cfg.defaultGateway6.address}" ${ optionalString (cfg.defaultGatewayWindowSize != null) - "window ${toString cfg.defaultGatewayWindowSize}"} || true + "window ${toString cfg.defaultGatewayWindowSize}"} ${ + optionalString (cfg.defaultGateway6.interface != null) + "dev ${cfg.defaultGateway6.interface}"} || true ''} ''; }; diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix index 974041d7e1a..a1212c90556 100644 --- a/nixos/modules/tasks/network-interfaces-systemd.nix +++ b/nixos/modules/tasks/network-interfaces-systemd.nix @@ -38,6 +38,12 @@ in } { assertion = cfg.vswitches == {}; message = "networking.vswichtes are not supported by networkd."; + } { + assertion = cfg.defaultGateway == null || cfg.defaultGateway.interface == null; + message = "networking.defaultGateway.interface is not supported by networkd."; + } { + assertion = cfg.defaultGateway6 == null || cfg.defaultGateway6.interface == null; + message = "networking.defaultGateway6.interface is not supported by networkd."; } ] ++ flip mapAttrsToList cfg.bridges (n: { rstp, ... }: { assertion = !rstp; message = "networking.bridges.${n}.rstp is not supported by networkd."; diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 83d9854d351..3f56419d2a6 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -116,6 +116,28 @@ let }; }; + gatewayCoerce = address: { inherit address; }; + + gatewayOpts = { ... }: { + + options = { + + address = mkOption { + type = types.str; + description = "The default gateway address."; + }; + + interface = mkOption { + type = types.nullOr types.str; + default = null; + example = "enp0s3"; + description = "The default gateway interface."; + }; + + }; + + }; + interfaceOpts = { name, ... }: { options = { @@ -327,19 +349,27 @@ in networking.defaultGateway = mkOption { default = null; - example = "131.211.84.1"; - type = types.nullOr types.str; + example = { + address = "131.211.84.1"; + device = "enp3s0"; + }; + type = types.nullOr (types.coercedTo types.str gatewayCoerce (types.submodule gatewayOpts)); description = '' - The default gateway. It can be left empty if it is auto-detected through DHCP. + The default gateway. It can be left empty if it is auto-detected through DHCP. + It can be specified as a string or an option set along with a network interface. ''; }; networking.defaultGateway6 = mkOption { default = null; - example = "2001:4d0:1e04:895::1"; - type = types.nullOr types.str; + example = { + address = "2001:4d0:1e04:895::1"; + device = "enp3s0"; + }; + type = types.nullOr (types.coercedTo types.str gatewayCoerce (types.submodule gatewayOpts)); description = '' - The default ipv6 gateway. It can be left empty if it is auto-detected through DHCP. + The default ipv6 gateway. It can be left empty if it is auto-detected through DHCP. + It can be specified as a string or an option set along with a network interface. ''; }; From 4feb0a998adc60c1ff8a3e31b7a79455fe27f6d5 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 14 Jan 2017 13:49:03 +0300 Subject: [PATCH 064/146] manual: mention needed options for IPv6 --- .../doc/manual/configuration/ipv6-config.xml | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/nixos/doc/manual/configuration/ipv6-config.xml b/nixos/doc/manual/configuration/ipv6-config.xml index bf86926f9bf..6d9e0a164e9 100644 --- a/nixos/doc/manual/configuration/ipv6-config.xml +++ b/nixos/doc/manual/configuration/ipv6-config.xml @@ -22,5 +22,25 @@ boot.kernel.sysctl."net.ipv6.conf.eth0.disable_ipv6" = true; +As with IPv4 networking interfaces are automatically configured via +DHCPv6. You can configure an interface manually: + + +networking.interfaces.eth0.ip6 = [ { address = "fe00:aa:bb:cc::2"; prefixLength = 64; } ]; + + + +For configuring a gateway, optionally with explicitly specified interface: + + +networking.defaultGateway6 = { + address = "fe00::1"; + interface = "enp0s3"; +} + + + +See for similar examples and additional information. + From 0b19f2f7429db35a2e089978313dc8e2899d10f1 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 2 Feb 2017 00:25:51 +0100 Subject: [PATCH 065/146] libressl_2_4: 2.4.4 -> 2.4.5 security update, no CVE assigned AFAICS /cc @grahamc --- pkgs/development/libraries/libressl/2.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libressl/2.4.nix b/pkgs/development/libraries/libressl/2.4.nix index a0d8511e2b8..c5642635b0f 100644 --- a/pkgs/development/libraries/libressl/2.4.nix +++ b/pkgs/development/libraries/libressl/2.4.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libressl-${version}"; - version = "2.4.4"; + version = "2.4.5"; src = fetchurl { url = "mirror://openbsd/LibreSSL/${name}.tar.gz"; - sha256 = "1ldzxqc0bds9mwnirrckhx42y3k0v5cx997nnbfa2gkk6ilszkvg"; + sha256 = "0is3zqjcxxncycq44m3if6s5hiq31kpq85pxdnpm3sdfb3iw806k"; }; enableParallelBuilding = true; From 2110d59fa1dffbe006ad96422e862bbc55c5caff Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 2 Feb 2017 00:26:47 +0100 Subject: [PATCH 066/146] libressl_2_5: 2.5.0 -> 2.5.1 security update, no CVE assigned AFAICS /cc @grahamc --- pkgs/development/libraries/libressl/2.5.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libressl/2.5.nix b/pkgs/development/libraries/libressl/2.5.nix index 51925ee108e..0a3e0d97f84 100644 --- a/pkgs/development/libraries/libressl/2.5.nix +++ b/pkgs/development/libraries/libressl/2.5.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libressl-${version}"; - version = "2.5.0"; + version = "2.5.1"; src = fetchurl { url = "mirror://openbsd/LibreSSL/${name}.tar.gz"; - sha256 = "1bkfvapi4z826slycmicvs7hwgk4l82gd8w6nqvznldbammvyll6"; + sha256 = "1kc709scgd76vk7fld4jnb4wb5lxdv1cj8zsgyjb33xp4jlf06pp"; }; enableParallelBuilding = true; From b4f36746941a1bcc51e6e3abef2fd0165227b9be Mon Sep 17 00:00:00 2001 From: Antoine Racine Date: Wed, 1 Feb 2017 20:05:22 -0500 Subject: [PATCH 067/146] Add vim-elixir to vim plugins --- pkgs/misc/vim-plugins/default.nix | 10 ++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 11 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 560aa3ff079..46f6d1f8b37 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -2049,6 +2049,16 @@ rec { }; + vim-elixir = buildVimPluginFrom2Nix { + name = "vim-elixir-2017-02-01"; + src = fetchgit { + url = "https://github.com/elixir-lang/vim-elixir"; + rev = "9cbb3ee3865c594ed017f8118a80b355cd7e238f"; + sha256 = "14mlnjpmgfal4vai2k8jjmhszwgyhnf3v75rssj05n47qnzlddk4"; + }; + dependencies = []; + }; + vim-gista = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-gista-2016-09-21"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index cd22f63d562..d6418e5da4e 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -40,6 +40,7 @@ "github:dracula/vim" "github:eagletmt/neco-ghc" "github:eikenb/acp" +"github:elixir-lang/vim-elixir" "github:elmcast/elm-vim" "github:embear/vim-localvimrc" "github:enomsg/vim-haskellConcealPlus" From 58a5d0783e0d640ca9fb510ce5d53140ba00299e Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 2 Feb 2017 09:13:54 +0800 Subject: [PATCH 068/146] speedcrunch: 0.11 -> 0.12.0 Also: - build against qt5 instead of qt4 --- .../science/math/speedcrunch/default.nix | 20 +++++++++++-------- pkgs/top-level/all-packages.nix | 6 +----- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/science/math/speedcrunch/default.nix b/pkgs/applications/science/math/speedcrunch/default.nix index 56ae454831b..334423660a0 100644 --- a/pkgs/applications/science/math/speedcrunch/default.nix +++ b/pkgs/applications/science/math/speedcrunch/default.nix @@ -1,19 +1,23 @@ -{ stdenv, fetchurl, qt, cmake }: +{ stdenv, fetchgit, cmake, qtbase, qttools }: stdenv.mkDerivation rec { name = "speedcrunch-${version}"; - version = "0.11"; + version = "0.12.0"; - src = fetchurl { - url = "https://bitbucket.org/heldercorreia/speedcrunch/get/${version}.tar.gz"; - sha256 = "0phba14z9jmbmax99klbxnffwzv3awlzyhpcwr1c9lmyqnbcsnkd"; + src = fetchgit { + # the tagging is not standard, so you probably need to check this when updating + rev = "refs/tags/release-${version}"; + url = "https://bitbucket.org/heldercorreia/speedcrunch"; + sha256 = "0vh7cd1915bjqzkdp3sk25ngy8cq624mkh8c53c5bnzk357kb0fk"; }; - buildInputs = [cmake qt]; + buildInputs = [ qtbase qttools ]; - dontUseCmakeBuildDir = true; + nativeBuildInputs = [ cmake ]; - cmakeDir = "src"; + preConfigure = '' + cd src + ''; meta = with stdenv.lib; { homepage = http://speedcrunch.org; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 28668e0fc1c..4fe4d1b07fe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17254,11 +17254,7 @@ with pkgs; yacas = callPackage ../applications/science/math/yacas { }; - speedcrunch = callPackage ../applications/science/math/speedcrunch { - qt = qt4; - cmake = cmakeCurses; - }; - + speedcrunch = qt5.callPackage ../applications/science/math/speedcrunch { }; ### SCIENCE / MISC From d34ee526a814a6231ec2d400d86fea6d26d450bd Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Thu, 2 Feb 2017 02:18:26 +0100 Subject: [PATCH 069/146] aws-sdk-cpp: fix on darwin The LD_LIBRARY_PATH variable does nothing on Darwin, but DYLD_LIBRARY_PATH does the same thing, so splice in the right variable based on which system we're working on. --- pkgs/development/libraries/aws-sdk-cpp/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 54d490b77af..6a18ff3ed24 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -5,7 +5,14 @@ customMemoryManagement ? true }: -stdenv.mkDerivation rec { +let + loaderVar = + if stdenv.isLinux + then "LD_LIBRARY_PATH" + else if stdenv.isDarwin + then "DYLD_LIBRARY_PATH" + else throw "Unsupported system!"; +in stdenv.mkDerivation rec { name = "aws-sdk-cpp-${version}"; version = "1.0.48"; @@ -29,11 +36,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + # Behold the escaping nightmare below on loaderVar o.O preBuild = '' # Ensure that the unit tests can find the *.so files. for i in testing-resources aws-cpp-sdk-*; do - export LD_LIBRARY_PATH=$(pwd)/$i:$LD_LIBRARY_PATH + export ${loaderVar}=$(pwd)/$i:''${${loaderVar}} done ''; From 47f392d3c7a55e357f9da706211a0777ba53d2b5 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Thu, 2 Feb 2017 02:52:26 +0100 Subject: [PATCH 070/146] mbedtls: 1.3.17 -> 1.3.18 See https://tls.mbed.org/tech-updates/releases/mbedtls-2.4.0-2.1.6-and-1.3.18-released. --- pkgs/development/libraries/mbedtls/1.3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mbedtls/1.3.nix b/pkgs/development/libraries/mbedtls/1.3.nix index 9bb7a5fa003..41c0e0a9d16 100644 --- a/pkgs/development/libraries/mbedtls/1.3.nix +++ b/pkgs/development/libraries/mbedtls/1.3.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - name = "mbedtls-1.3.17"; + name = "mbedtls-1.3.18"; src = fetchurl { url = "https://tls.mbed.org/download/${name}-gpl.tgz"; - sha256 = "10nviv3d8w6sp3kn3yzdpssvzqxdbr4kg38g7rg930q2hlzb9gpm"; + sha256 = "188fjm0zzggxrjxnqc7zv7zz8pvys6yp1jx3xdyq8970h9qj2ad2"; }; nativeBuildInputs = [ perl ]; From 3d16d69b4093b523e8d0583d44140d6ba77696e5 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 2 Feb 2017 09:55:47 +0800 Subject: [PATCH 071/146] qgit: 2.5 -> 2.6 (#22360) Also: - build the qt5 version by default instead of qt4 - use cmake --- .../git-and-tools/default.nix | 2 +- .../git-and-tools/qgit/default.nix | 27 ++++++++----------- 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index e8c7c3bfbfd..975c83c6e97 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -80,7 +80,7 @@ rec { inherit (darwin) Security; }; - qgit = callPackage ./qgit { }; + qgit = qt5.callPackage ./qgit { }; stgit = callPackage ./stgit { }; diff --git a/pkgs/applications/version-management/git-and-tools/qgit/default.nix b/pkgs/applications/version-management/git-and-tools/qgit/default.nix index b8d001ee97c..5e3532b5643 100644 --- a/pkgs/applications/version-management/git-and-tools/qgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/qgit/default.nix @@ -1,27 +1,22 @@ -{ stdenv, fetchurl, qt4, qmake4Hook, libXext, libX11 }: +{ stdenv, fetchurl, cmake, qtbase }: stdenv.mkDerivation rec { - name = "qgit-2.5"; + name = "qgit-2.6"; src = fetchurl { - url = "http://libre.tibirna.org/attachments/download/9/${name}.tar.gz"; - sha256 = "25f1ca2860d840d87b9919d34fc3a1b05d4163671ed87d29c3e4a8a09e0b2499"; + url = "http://libre.tibirna.org/attachments/download/12/${name}.tar.gz"; + sha256 = "1brrhac6s6jrw3djhgailg5d5s0vgrfvr0sczqgzpp3i6pxf8qzl"; }; - hardeningDisable = [ "format" ]; + buildInputs = [ qtbase ]; - buildInputs = [ qt4 libXext libX11 ]; + nativeBuildInputs = [ cmake ]; - nativeBuildInputs = [ qmake4Hook ]; - - installPhase = '' - install -s -D -m 755 bin/qgit "$out/bin/qgit" - ''; - - meta = { - license = stdenv.lib.licenses.gpl2; - homepage = "http://libre.tibirna.org/projects/qgit/wiki/QGit"; + meta = with stdenv.lib; { + license = licenses.gpl2; + homepage = http://libre.tibirna.org/projects/qgit/wiki/QGit; description = "Graphical front-end to Git"; - inherit (qt4.meta) platforms; + maintainer = with maintainers; [ peterhoeg ]; + inherit (qtbase.meta) platforms; }; } From 15bc80f3b9c7f3626735755927748bf6ba6c1ce5 Mon Sep 17 00:00:00 2001 From: Drakonis Date: Wed, 1 Feb 2017 21:21:34 -0500 Subject: [PATCH 072/146] keepassx-community: init at 2.1.0 - deprecating keepassx-reboot (was at 2.0.3) --- .../misc/keepassx/{reboot.nix => community.nix} | 12 ++++++------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) rename pkgs/applications/misc/keepassx/{reboot.nix => community.nix} (72%) diff --git a/pkgs/applications/misc/keepassx/reboot.nix b/pkgs/applications/misc/keepassx/community.nix similarity index 72% rename from pkgs/applications/misc/keepassx/reboot.nix rename to pkgs/applications/misc/keepassx/community.nix index f6ed251601a..075de4dcb65 100644 --- a/pkgs/applications/misc/keepassx/reboot.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -1,21 +1,21 @@ { stdenv, fetchFromGitHub, cmake, libgcrypt, qt5, zlib, libmicrohttpd, libXtst }: stdenv.mkDerivation rec { - name = "keepassx-reboot-${version}"; - version = "2.0.3"; + name = "keepassx-community-${version}"; + version = "2.1.0"; src = fetchFromGitHub { owner = "keepassxreboot"; - repo = "keepassx"; - rev = "${version}-http"; - sha256 = "0pj3mirhw87hk9nlls9hgfx08xrr8ln7d1fqi3fcm519qjr72lmv"; + repo = "keepassxc"; + rev = "${version}"; + sha256 = "0qwmi9f8ik3vkwl1kx7g3079h5ia4wl87y42nr5dal3ic1jc941p"; }; buildInputs = [ cmake libgcrypt zlib qt5.full libXtst libmicrohttpd ]; meta = { description = "Fork of the keepassX password-manager with additional http-interface to allow browser-integration an use with plugins such as PasslFox (https://github.com/pfn/passifox). See also keepassX2."; - homepage = https://github.com/keepassxreboot/keepassx; + homepage = https://github.com/keepassxreboot/keepassxc; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ s1lvester jonafato ]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6123c418123..57242e2a742 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -59,6 +59,7 @@ doNotDisplayTwice rec { joseki = apache-jena-fuseki; # added 2016-02-28 jquery_ui = jquery-ui; # added 2014-09-07 keepassx2-http = keepassx-reboot; # added 2016-10-17 + keepassx-reboot = keepassx-community; # added 2017-02-01 keybase-go = keybase; # added 2016-08-24 letsencrypt = certbot; # added 2016-05-16 libdbusmenu_qt5 = qt5.libdbusmenu; # added 2015-12-19 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 734644ae998..38d7e317124 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13142,7 +13142,7 @@ with pkgs; keepassx = callPackage ../applications/misc/keepassx { }; keepassx2 = callPackage ../applications/misc/keepassx/2.0.nix { }; - keepassx-reboot = callPackage ../applications/misc/keepassx/reboot.nix { }; + keepassx-community = callPackage ../applications/misc/keepassx/community.nix { }; inherit (gnome3) evince; evolution_data_server = gnome3.evolution_data_server; From 9fa9339a1386e816baee62ca26435d86146c9f90 Mon Sep 17 00:00:00 2001 From: Antoine Racine Date: Wed, 1 Feb 2017 23:13:28 -0500 Subject: [PATCH 073/146] vimPlugins.alchemist-vim: init at rev c22d4883b7 --- pkgs/misc/vim-plugins/default.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 46f6d1f8b37..1b6369d87d9 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -281,6 +281,17 @@ rec { sourceRoot = "."; }; + alchemist-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "alchemist.vim-2017-01-02"; + src = fetchgit { + url = "git://github.com/slashmili/alchemist.vim"; + rev = "c22d4883b7e2bfed78b70b557d816bf0491d7dd4"; + sha256 = "0iv91mfj3lxc41xb8sxhl9mby5dllzyvw8508igrj5lvyrd1ikkf"; + }; + dependencies = []; + + }; + commentary = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "commentary-2016-03-10"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index d6418e5da4e..4be4c0a9722 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -97,6 +97,7 @@ "github:shougo/vimproc.vim" "github:shougo/vimshell.vim" "github:sjl/gundo.vim" +"github:slashmili/alchemist.vim" "github:takac/vim-hardtime" "github:terryma/vim-expand-region" "github:tex/vimpreviewpandoc" From 7ea20c9e2752d5164e5a37f44a5dae9955d5d03f Mon Sep 17 00:00:00 2001 From: Rongcui Dong Date: Wed, 1 Feb 2017 14:13:35 -0800 Subject: [PATCH 074/146] ngspice: 25 -> 26 --- pkgs/applications/science/electronics/ngspice/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/electronics/ngspice/default.nix b/pkgs/applications/science/electronics/ngspice/default.nix index f4870d7bfbb..7a493e14bca 100644 --- a/pkgs/applications/science/electronics/ngspice/default.nix +++ b/pkgs/applications/science/electronics/ngspice/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, readline, bison, libX11, libICE, libXaw, libXext}: stdenv.mkDerivation { - name = "ngspice-25"; + name = "ngspice-26"; src = fetchurl { - url = "mirror://sourceforge/ngspice/ngspice-25.tar.gz"; - sha256 = "03hlxwvl2j1wlb5yg4swvmph9gja37c2gqvwvzv6z16vg2wvn06h"; + url = "mirror://sourceforge/ngspice/ngspice-26.tar.gz"; + sha256 = "51e230c8b720802d93747bc580c0a29d1fb530f3dd06f213b6a700ca9a4d0108"; }; buildInputs = [ readline libX11 bison libICE libXaw libXext ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation { description = "The Next Generation Spice (Electronic Circuit Simulator)"; homepage = "http://ngspice.sourceforge.net"; license = with licenses; [ "BSD" gpl2 ]; - maintainers = with maintainers; [ viric ]; + maintainers = with maintainers; [ viric rongcuid ]; platforms = platforms.linux; }; } From c64934529e5cd1cc3c50f0a417ce19be9d0bd201 Mon Sep 17 00:00:00 2001 From: Mica Semrick Date: Wed, 1 Feb 2017 22:50:35 -0800 Subject: [PATCH 075/146] darktable 2.2.1 -> 2.2.3 --- pkgs/applications/graphics/darktable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 7213ddcc366..1a80c1466d4 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -11,12 +11,12 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { - version = "2.2.1"; + version = "2.2.3"; name = "darktable-${version}"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - sha256 = "da843190f08e02df19ccbc02b9d1bef6bd242b81499494c7da2cccdc520e24fc"; + sha256 = "1b33859585bf283577680c61e3c0ea4e48214371453b9c17a86664d2fbda48a0"; }; buildInputs = From 8389060731e758708093722bf3e5099e51b0932b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle?= Date: Thu, 2 Feb 2017 09:50:53 +0100 Subject: [PATCH 076/146] Updating shotcut to 17.02. --- pkgs/applications/video/shotcut/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index 03d597cac58..140c8e5863d 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -5,11 +5,11 @@ qmakeHook, makeQtWrapper }: stdenv.mkDerivation rec { name = "shotcut-${version}"; - version = "17.01"; + version = "17.02"; src = fetchurl { url = "https://github.com/mltframework/shotcut/archive/v${version}.tar.gz"; - sha256 = "1f3276q58rvw1brxfnm9z3v99fx63wml6j02sgmpzazw3172lnpg"; + sha256 = "09nygz1x9fvqf33gqpc6jnr1j7ny0yny3w2ngwqqfkf3f8n83qhr"; }; buildInputs = [ SDL frei0r gettext mlt pkgconfig qtbase qtmultimedia qtwebkit From 2be4214c68384456924e4e91d10292a9b6dfad29 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 1 Feb 2017 18:23:42 +0100 Subject: [PATCH 077/146] hackage2nix: update list of broken packages --- .../haskell-modules/configuration-hackage2nix.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index f5967f5a281..41814d382e0 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2042,8 +2042,8 @@ extra-packages: package-maintainers: peti: - - cabal2nix - cabal-install + - cabal2nix - funcmp - git-annex - hackage-db @@ -2062,6 +2062,8 @@ package-maintainers: - pandoc - stack - streamproc + - structured-haskell-mode + - titlecase gebner: - hledger-diff gridaphobe: @@ -7111,7 +7113,6 @@ dont-distribute-packages: stripe: [ i686-linux, x86_64-linux, x86_64-darwin ] structs: [ i686-linux, x86_64-linux, x86_64-darwin ] structural-induction: [ i686-linux, x86_64-linux, x86_64-darwin ] - structured-haskell-mode: [ i686-linux, x86_64-linux, x86_64-darwin ] structured-mongoDB: [ i686-linux, x86_64-linux, x86_64-darwin ] structures: [ i686-linux, x86_64-linux, x86_64-darwin ] stunts: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7358,7 +7359,6 @@ dont-distribute-packages: tip-haskell-frontend: [ i686-linux, x86_64-linux, x86_64-darwin ] tip-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] Titim: [ i686-linux, x86_64-linux, x86_64-darwin ] - titlecase: [ i686-linux, x86_64-linux, x86_64-darwin ] tkhs: [ i686-linux, x86_64-linux, x86_64-darwin ] tkyprof: [ i686-linux, x86_64-linux, x86_64-darwin ] tld: [ i686-linux, x86_64-linux, x86_64-darwin ] From 30bdcd9a8e5cb90cea9221f04072c823016e6c7c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 30 Jan 2017 12:34:50 +0100 Subject: [PATCH 078/146] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.0.4-8-g0d49e12 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/45587c11140ea1e9c8ff0ea4d60f4d14f48c9988. --- .../haskell-modules/hackage-packages.nix | 1158 ++++++++++++----- 1 file changed, 853 insertions(+), 305 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 45924e6a541..b5b9954244a 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -739,8 +739,8 @@ self: { pname = "Agda"; version = "2.5.2"; sha256 = "d812cec3bf7f03c4b27248572475c7e060154102771a8434cc11ba89f5691439"; - revision = "1"; - editedCabalFile = "44f0f96c5d26202f964c575e5f94fe52686f4b889078ddfdafef0c6fd2571b47"; + revision = "2"; + editedCabalFile = "4db0b12bc07e72fe1b180acad2a0d59ac11d9a1d45698b46cede7b634fb6bfff"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -7823,32 +7823,34 @@ self: { }) {}; "HROOT" = callPackage - ({ mkDerivation, base, fficxx-runtime, HROOT-core, HROOT-graf - , HROOT-hist, HROOT-io, HROOT-math + ({ mkDerivation, base, fficxx, fficxx-runtime, HROOT-core + , HROOT-graf, HROOT-hist, HROOT-io, HROOT-math, HROOT-tree + , template-haskell }: mkDerivation { pname = "HROOT"; - version = "0.8"; - sha256 = "0e6fa9e42e8843bbd7cb0af48e3f86ba8412a2fb12c70f94990ed10f832cd660"; - revision = "1"; - editedCabalFile = "43058ba39e0517740c45b1087a39e4f84912c1a3c500504850395d4f2fda0917"; + version = "0.9"; + sha256 = "5a8e948e0970d901feafdc184270f1631314512b4bd967f0f16c83a640d1b975"; libraryHaskellDepends = [ - base fficxx-runtime HROOT-core HROOT-graf HROOT-hist HROOT-io - HROOT-math + base fficxx fficxx-runtime HROOT-core HROOT-graf HROOT-hist + HROOT-io HROOT-math HROOT-tree template-haskell ]; homepage = "http://ianwookim.org/HROOT"; - description = "Haskell binding to ROOT RooFit modules"; + description = "Haskell binding to the ROOT data analysis framework"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + broken = true; + }) {HROOT-tree = null;}; "HROOT-core" = callPackage - ({ mkDerivation, base, fficxx-runtime }: + ({ mkDerivation, base, fficxx, fficxx-runtime, template-haskell }: mkDerivation { pname = "HROOT-core"; - version = "0.8"; - sha256 = "161807e042e440c6b00d87dda1bb1a945ec9aee53375f2c66d80984c84b080b8"; - libraryHaskellDepends = [ base fficxx-runtime ]; + version = "0.9"; + sha256 = "af2678d6fcd87531b2866b753e65b0c455216dd27c87fdfabb694201748bea83"; + libraryHaskellDepends = [ + base fficxx fficxx-runtime template-haskell + ]; homepage = "http://ianwookim.org/HROOT"; description = "Haskell binding to ROOT Core modules"; license = stdenv.lib.licenses.lgpl21; @@ -7856,13 +7858,15 @@ self: { }) {}; "HROOT-graf" = callPackage - ({ mkDerivation, base, fficxx-runtime, HROOT-core, HROOT-hist }: + ({ mkDerivation, base, fficxx, fficxx-runtime, HROOT-core + , HROOT-hist, template-haskell + }: mkDerivation { pname = "HROOT-graf"; - version = "0.8"; - sha256 = "7c817f7c174a2ad026dd494391427719da23addcda9dc3e7fa59aa9fb96102ca"; + version = "0.9"; + sha256 = "1e80209799bdceea7ef65e1dd6ca7d4e0d182209442ff3489d7fe5cd47fda552"; libraryHaskellDepends = [ - base fficxx-runtime HROOT-core HROOT-hist + base fficxx fficxx-runtime HROOT-core HROOT-hist template-haskell ]; homepage = "http://ianwookim.org/HROOT"; description = "Haskell binding to ROOT Graf modules"; @@ -7871,12 +7875,16 @@ self: { }) {}; "HROOT-hist" = callPackage - ({ mkDerivation, base, fficxx-runtime, HROOT-core }: + ({ mkDerivation, base, fficxx, fficxx-runtime, HROOT-core + , template-haskell + }: mkDerivation { pname = "HROOT-hist"; - version = "0.8"; - sha256 = "01ce1810bcdd1dbf53d2b7f7c5923f7409d1388ceaa328549046f06fc5c3f47b"; - libraryHaskellDepends = [ base fficxx-runtime HROOT-core ]; + version = "0.9"; + sha256 = "18baee9511c105f92d11a9523f0b212e13d0975b733daf22733357cc56e04c5e"; + libraryHaskellDepends = [ + base fficxx fficxx-runtime HROOT-core template-haskell + ]; homepage = "http://ianwookim.org/HROOT"; description = "Haskell binding to ROOT Hist modules"; license = stdenv.lib.licenses.lgpl21; @@ -7884,12 +7892,16 @@ self: { }) {}; "HROOT-io" = callPackage - ({ mkDerivation, base, fficxx-runtime, HROOT-core }: + ({ mkDerivation, base, fficxx, fficxx-runtime, HROOT-core + , template-haskell + }: mkDerivation { pname = "HROOT-io"; - version = "0.8"; - sha256 = "621adb74a41241cb7678e4a28ba3aff3bb21b132c2890ae0be627722be347069"; - libraryHaskellDepends = [ base fficxx-runtime HROOT-core ]; + version = "0.9"; + sha256 = "222bab39e503aa61775beb5904c72aa2e9018a46f4c4b2a9d0e68a5cd4c837ef"; + libraryHaskellDepends = [ + base fficxx fficxx-runtime HROOT-core template-haskell + ]; homepage = "http://ianwookim.org/HROOT"; description = "Haskell binding to ROOT IO modules"; license = stdenv.lib.licenses.lgpl21; @@ -7897,12 +7909,16 @@ self: { }) {}; "HROOT-math" = callPackage - ({ mkDerivation, base, fficxx-runtime, HROOT-core }: + ({ mkDerivation, base, fficxx, fficxx-runtime, HROOT-core + , template-haskell + }: mkDerivation { pname = "HROOT-math"; - version = "0.8"; - sha256 = "95ff6a0125141818f4bdb3946dcfa9dd8cbeb4a00674c429b082b7df61deba62"; - libraryHaskellDepends = [ base fficxx-runtime HROOT-core ]; + version = "0.9"; + sha256 = "f203711dac9891f394e9193f9bdf861edff163ec923b48f9c086961f6e1f6644"; + libraryHaskellDepends = [ + base fficxx fficxx-runtime HROOT-core template-haskell + ]; homepage = "http://ianwookim.org/HROOT"; description = "Haskell binding to ROOT Math modules"; license = stdenv.lib.licenses.lgpl21; @@ -11263,8 +11279,8 @@ self: { }: mkDerivation { pname = "MagicHaskeller"; - version = "0.9.6.5"; - sha256 = "5289340f0ec721e35f66e13a871f8fe65d55ed8af9c63ebec2a2cc99db699fb8"; + version = "0.9.6.6.1"; + sha256 = "5f477822961bfdf7d3af73903877c1eb448ddbf323afc73f2f5da18f633a9e6e"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -15158,6 +15174,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "STMonadTrans_0_4" = callPackage + ({ mkDerivation, array, base, Cabal, mtl }: + mkDerivation { + pname = "STMonadTrans"; + version = "0.4"; + sha256 = "518667c253184c8c5cf707564d117f67bb0fabf5f6ebe8b25400359d4a8a6200"; + libraryHaskellDepends = [ array base mtl ]; + testHaskellDepends = [ array base Cabal mtl ]; + description = "A monad transformer version of the ST monad"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "SVG2Q" = callPackage ({ mkDerivation, base, haskell98, language-c, pretty, svgutils, syb , xml @@ -25610,8 +25639,8 @@ self: { pname = "ansi-pretty"; version = "0.1.2.1"; sha256 = "708819f93f1759919a19dcfccddf3ddc8d9fba930cb73fab3ec9f6f5691394c6"; - revision = "1"; - editedCabalFile = "266eb754d15de06de1d488c82564bbf6c359e4e94e5210a58f2c18917a19d78d"; + revision = "2"; + editedCabalFile = "7d10d2f8605d932394138b76880eb08db72606730394c7f6a895f923e608ba65"; libraryHaskellDepends = [ aeson ansi-wl-pprint array base bytestring containers generics-sop nats scientific semigroups tagged text time unordered-containers @@ -28494,6 +28523,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "attoparsec-time" = callPackage + ({ mkDerivation, attoparsec, base, base-prelude, directory, doctest + , filepath, text, time + }: + mkDerivation { + pname = "attoparsec-time"; + version = "0.1.1"; + sha256 = "9789759199654f3767823b62bb48182b5f83226ebde3ec74e31863309a77a362"; + libraryHaskellDepends = [ attoparsec base-prelude text time ]; + testHaskellDepends = [ + base base-prelude directory doctest filepath + ]; + homepage = "https://github.com/sannsyn/attoparsec-time"; + description = "Attoparsec parsers of time"; + license = stdenv.lib.licenses.mit; + }) {}; + "attoparsec-trans" = callPackage ({ mkDerivation, attoparsec, base, transformers }: mkDerivation { @@ -32070,8 +32116,8 @@ self: { pname = "binary-tagged"; version = "0.1.4.2"; sha256 = "311fab8c2bac00cb6785cb144e25ed58b2efce85e5dc64e30e2b5a2a16cdc784"; - revision = "2"; - editedCabalFile = "7abacbe953b33132ec4cd7f4765e58918404e22c8b05eb6411f6bd62b05a828c"; + revision = "3"; + editedCabalFile = "6fd4d363bd8a64deacea2726daa15b67b4331f7d6b47de9980c11435564a3de1"; libraryHaskellDepends = [ aeson array base base16-bytestring binary bytestring containers generics-sop hashable nats scientific semigroups SHA tagged text @@ -33383,36 +33429,34 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "bitcoin-payment-channel_1_0_0_0" = callPackage + "bitcoin-payment-channel_1_0_1_0" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, base64-bytestring - , bytestring, cereal, errors, haskell-rbpcp-api, haskoin-core - , hexstring, hspec, monad-time, mtl, QuickCheck, random, scientific + , bytestring, cereal, deepseq, errors, haskoin-core, hexstring + , hspec, monad-time, mtl, QuickCheck, random, rbpcp-api, scientific , semigroups, string-conversions, tagged, test-framework , test-framework-quickcheck2, text, tf-random, time }: mkDerivation { pname = "bitcoin-payment-channel"; - version = "1.0.0.0"; - sha256 = "3858a212258099aed8361bbaeef5a251c5d12d7b222c027290d963571e1f7698"; + version = "1.0.1.0"; + sha256 = "b723c4f808fd3e517bdacd27e59f08410a600a05ebea2ca6baf5cafa64490fa2"; libraryHaskellDepends = [ - aeson base base16-bytestring bytestring cereal errors - haskell-rbpcp-api haskoin-core hexstring hspec monad-time - QuickCheck scientific semigroups string-conversions tagged text - time + aeson base base16-bytestring bytestring cereal deepseq errors + haskoin-core hexstring hspec monad-time QuickCheck rbpcp-api + scientific semigroups string-conversions tagged text time ]; testHaskellDepends = [ aeson base base16-bytestring base64-bytestring bytestring cereal - errors haskell-rbpcp-api haskoin-core hexstring hspec monad-time - mtl QuickCheck random scientific semigroups string-conversions - tagged test-framework test-framework-quickcheck2 text tf-random - time + deepseq errors haskoin-core hexstring hspec monad-time mtl + QuickCheck random rbpcp-api scientific semigroups + string-conversions tagged test-framework test-framework-quickcheck2 + text tf-random time ]; homepage = "https://github.com/runeksvendsen/bitcoin-payment-channel"; description = "Instant, two-party Bitcoin payments"; - license = stdenv.lib.licenses.publicDomain; + license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {haskell-rbpcp-api = null;}; + }) {}; "bitcoin-rpc" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, cereal @@ -34167,6 +34211,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "blaze-html_0_9_0_1" = callPackage + ({ mkDerivation, base, blaze-builder, blaze-markup, bytestring + , containers, HUnit, QuickCheck, test-framework + , test-framework-hunit, test-framework-quickcheck2, text + }: + mkDerivation { + pname = "blaze-html"; + version = "0.9.0.1"; + sha256 = "aeceaab3fbccbf7f01a241819e6c16c0a1cf19dccecb795c5de5407bc8660a64"; + libraryHaskellDepends = [ + base blaze-builder blaze-markup bytestring text + ]; + testHaskellDepends = [ + base blaze-builder blaze-markup bytestring containers HUnit + QuickCheck test-framework test-framework-hunit + test-framework-quickcheck2 text + ]; + homepage = "http://jaspervdj.be/blaze"; + description = "A blazingly fast HTML combinator library for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "blaze-html-contrib" = callPackage ({ mkDerivation, base, blaze-html, cgi, data-default, network, safe , text @@ -34255,6 +34322,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "blaze-markup_0_8_0_0" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit + , QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2, text + }: + mkDerivation { + pname = "blaze-markup"; + version = "0.8.0.0"; + sha256 = "19e1cbb9303803273ed7f9fcf3b8b6938578afbed2bfafe5ea9fcc6d743f540f"; + libraryHaskellDepends = [ base blaze-builder bytestring text ]; + testHaskellDepends = [ + base blaze-builder bytestring containers HUnit QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 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 { @@ -35150,6 +35237,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "bootstrap-types" = callPackage + ({ mkDerivation, base, text }: + mkDerivation { + pname = "bootstrap-types"; + version = "0.3"; + sha256 = "84b0c14c4d7c12beadef4b2950b888065e6e94dd0a08bcdfa5f43db4111db5a5"; + libraryHaskellDepends = [ base text ]; + description = "Bootstrap CSS Framework type-safe interface"; + license = stdenv.lib.licenses.mit; + }) {}; + "borel" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bimap, cassava , ceilometer-common, chevalier-common, configurator, containers @@ -37059,6 +37157,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cabal-doctest" = callPackage + ({ mkDerivation, base, Cabal, directory, filepath }: + mkDerivation { + pname = "cabal-doctest"; + version = "1"; + sha256 = "7c769d62029d10f8861d88f48080a64f875346b74028ed2fd808d674accc6147"; + libraryHaskellDepends = [ base Cabal directory filepath ]; + homepage = "https://github.com/phadej/cabal-doctests"; + description = "A Setup.hs helper for doctests running"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cabal-file-th" = callPackage ({ mkDerivation, base, Cabal, directory, pretty, template-haskell }: @@ -39533,15 +39643,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "cayley-client_0_3_3" = callPackage + "cayley-client_0_4_0" = 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.3.3"; - sha256 = "0c94c59e68b148b1bbae85ea89a8676e8b108b8f51accf84295bf40bf5f2e5e3"; + version = "0.4.0"; + sha256 = "bdd21a245b6db5102d11096746edd85545d150ee835c0324e554d8b812ee6571"; libraryHaskellDepends = [ aeson attoparsec base binary bytestring exceptions http-client http-conduit lens lens-aeson mtl text transformers @@ -40815,10 +40925,8 @@ self: { }: mkDerivation { pname = "chronos"; - version = "0.3"; - sha256 = "97e9bcdb2a65bb5034d2d6af2e0ac23dd91e797d7d4b914bad0110e9740486b5"; - revision = "1"; - editedCabalFile = "61e89d96d116d28efa59ca1583ce5e1a9dd6bbc8a644000f182233aa5fb480a0"; + version = "0.4"; + sha256 = "547910db795b52bc6aea1202fc2db32324697cad4cba6677edba043fc3c28751"; libraryHaskellDepends = [ aeson attoparsec base bytestring hashable primitive text vector ]; @@ -42864,6 +42972,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cmark_0_5_5" = callPackage + ({ mkDerivation, base, bytestring, HUnit, text }: + mkDerivation { + pname = "cmark"; + version = "0.5.5"; + sha256 = "03bd6fc962bb92127f64a9c597a904492a16fb3f34587775a741d22311fe53e2"; + libraryHaskellDepends = [ base bytestring text ]; + testHaskellDepends = [ base HUnit text ]; + homepage = "https://github.com/jgm/cmark-hs"; + description = "Fast, accurate CommonMark (Markdown) parser and renderer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cmark-highlight" = callPackage ({ mkDerivation, base, blaze-html, cmark, highlighting-kate, text }: @@ -42897,8 +43019,8 @@ self: { }: mkDerivation { pname = "cmark-sections"; - version = "0.1.0.2"; - sha256 = "3617bb05d899ead54e1f58faa97fd30f6a9ec152112b6b962e26cdd02c34da57"; + version = "0.1.0.3"; + sha256 = "08cf3bb1bf87e7e9685fb24f3204df7023b0c5f0bfd6d16c950cba3507651441"; libraryHaskellDepends = [ base base-prelude cmark containers microlens split text ]; @@ -43603,8 +43725,8 @@ self: { }: mkDerivation { pname = "colonnade"; - version = "0.4.7"; - sha256 = "45bdd0a8d67e483f52d3212149d3dda99813aef4c00a6d4118b425d7d7e49457"; + version = "0.5"; + sha256 = "ed16c4510b89ec592fe3f96eef3a3725173aa6184fb89efef604b19aef1d6fb3"; libraryHaskellDepends = [ base bytestring contravariant text vector ]; @@ -43644,8 +43766,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "colorful-monoids"; - version = "0.2.0.1"; - sha256 = "0becada75e006e88563631bf0a33a241e40772d04b15220d660f16c02cf4b331"; + version = "0.2.1.0"; + sha256 = "426e36c9219ebc19108f0968aee8900bad7642937b5800d6045c5085c2b06532"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; homepage = "https://github.com/minad/colorful-monoids#readme"; @@ -48763,6 +48885,8 @@ self: { pname = "cryptol"; version = "2.4.0"; sha256 = "d34471f734429c25b52ca71ce63270ec3157a8413eeaf7f65dd7abe3cb27014d"; + revision = "1"; + editedCabalFile = "2bee5fb1a197ddde354e17c2b8b4f3081f005a133efe1eb2a021cedfd3b154f1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -56536,6 +56660,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "distributive_0_5_2" = callPackage + ({ mkDerivation, base, base-orphans, Cabal, cabal-doctest + , directory, doctest, filepath, generic-deriving, hspec, tagged + , transformers, transformers-compat + }: + mkDerivation { + pname = "distributive"; + version = "0.5.2"; + sha256 = "ade2be6a5e81950ab2918d938037dde0ce09d04dc399cefbf191ce6cb5f76cd9"; + revision = "1"; + editedCabalFile = "b8e7dbc541e69b9f8e79faefd636e50d42eb38354ffbe5512af6f2bc98c3e257"; + setupHaskellDepends = [ + base Cabal cabal-doctest directory filepath + ]; + libraryHaskellDepends = [ + base base-orphans tagged transformers transformers-compat + ]; + testHaskellDepends = [ base doctest generic-deriving hspec ]; + homepage = "http://github.com/ekmett/distributive/"; + description = "Distributive functors -- Dual to Traversable"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "diversity" = callPackage ({ mkDerivation, base, containers, data-ordlist, fasta , math-functions, MonadRandom, optparse-applicative, parsec, pipes @@ -58981,8 +59129,8 @@ self: { ({ mkDerivation, base, process }: mkDerivation { pname = "echo"; - version = "0.1.2"; - sha256 = "819afc6655c4973f5ff3e65bb604cc871d2a1b17faf2a9840224e27b51a9f030"; + version = "0.1.3"; + sha256 = "704f07310f8272d170f8ab7fb2a2c13f15d8501ef8310801e36964c8eff485ef"; libraryHaskellDepends = [ base process ]; homepage = "https://github.com/RyanGlScott/echo"; description = "A cross-platform, cross-console way to handle echoing terminal input"; @@ -60027,8 +60175,8 @@ self: { }: mkDerivation { pname = "elm-export"; - version = "0.6.0.0"; - sha256 = "ad6342e25a5f71b7eb8abbfb894802d3d72f75b05d588c76eee780d0528dc00f"; + version = "0.6.0.1"; + sha256 = "bf9862015918c72b54b421efcd9d858969dcd94ef0a3d0cb92d9bc0c4363f9d5"; libraryHaskellDepends = [ base bytestring containers directory formatting mtl text time wl-pprint-text @@ -61043,10 +61191,8 @@ self: { }: mkDerivation { pname = "envy"; - version = "1.0.0.0"; - sha256 = "0505d8883f796b86f362048b7897bab3cad382f325aa423f743a7cab48064bf4"; - revision = "2"; - editedCabalFile = "4557dbc843b8c588b30d3124f3261fb7ffa2ff705e53ad0d0042c3c4e13ebed3"; + version = "1.3.0.0"; + sha256 = "ed2906c08163045e8b2ba22d591d79954e2b070b7643632e4e860ad09a7968bd"; libraryHaskellDepends = [ base bytestring containers mtl text time transformers ]; @@ -63521,14 +63667,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "fast-logger_2_4_9" = callPackage + "fast-logger_2_4_10" = callPackage ({ mkDerivation, array, auto-update, base, bytestring, directory , easy-file, filepath, hspec, text, unix, unix-time }: mkDerivation { pname = "fast-logger"; - version = "2.4.9"; - sha256 = "0c75847259d79221fd710b546b19fca1d4270721ba8fd78ac98285878324704a"; + version = "2.4.10"; + sha256 = "dec4a5d1a88f822d08d334ee870a08a8bb63b2b226d145cd24a7f08676ce678d"; libraryHaskellDepends = [ array auto-update base bytestring directory easy-file filepath text unix unix-time @@ -64520,18 +64666,19 @@ self: { "fficxx" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, data-default - , directory, either, errors, filepath, hashable, HStringTemplate - , lens, mtl, process, pureMD5, split, template-haskell - , transformers, unordered-containers + , directory, either, errors, filepath, hashable, haskell-src-exts + , lens, mtl, process, pureMD5, split, template, template-haskell + , text, transformers, unordered-containers }: mkDerivation { pname = "fficxx"; - version = "0.2.1"; - sha256 = "0d2808a81f75db856bb392a9a3968b86abdbc00b74eec3b93047e83cc1e553ee"; + version = "0.3"; + sha256 = "bdf56fb5f2226ef17c525c3f83fc8c85e7f0c2238da3f06280a7d40748b746a6"; libraryHaskellDepends = [ base bytestring Cabal containers data-default directory either - errors filepath hashable HStringTemplate lens mtl process pureMD5 - split template-haskell transformers unordered-containers + errors filepath hashable haskell-src-exts lens mtl process pureMD5 + split template template-haskell text transformers + unordered-containers ]; description = "automatic C++ binding generation"; license = stdenv.lib.licenses.bsd3; @@ -64539,12 +64686,12 @@ self: { }) {}; "fficxx-runtime" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, bytestring, template-haskell }: mkDerivation { pname = "fficxx-runtime"; - version = "0.2.1"; - sha256 = "b3dfb29aff05dba4b0f8f70e93370ead11b012a674aeef51f70356b21a609741"; - libraryHaskellDepends = [ base ]; + version = "0.3"; + sha256 = "ab4563421558a4bf6a91e459cf700ca3eb58fe74ac72df073a4e648d1d94ffa2"; + libraryHaskellDepends = [ base bytestring template-haskell ]; description = "Runtime for fficxx-generated library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -66681,6 +66828,8 @@ self: { pname = "folds"; version = "0.7.1"; sha256 = "e07adf0c9834b5f78180250d7fec6a56ba84c752cbe4c991d52efc6c60b7d25a"; + revision = "1"; + editedCabalFile = "1ef82fedd12e9e46055436c3bfa5992f595c08ca986012dc301fd76f0bcaf05f"; configureFlags = [ "-f-test-hlint" ]; libraryHaskellDepends = [ adjunctions base bifunctors comonad constraints contravariant @@ -78054,8 +78203,8 @@ self: { }: mkDerivation { pname = "graflog"; - version = "6.1.0"; - sha256 = "60575c60b20dc7d52f4297f2d979b3074fd093dae2bbb700ba132f45e50dc3c3"; + version = "6.1.3"; + sha256 = "b0af2e3becca91475a1ec8737d3bf27a3f68bc106ac46cce0f4264408b0a8bda"; libraryHaskellDepends = [ aeson base bytestring containers mtl text text-conversions ]; @@ -78595,6 +78744,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "graphql-api" = callPackage + ({ mkDerivation, aeson, attoparsec, base, containers, directory + , doctest, exceptions, hspec, protolude, QuickCheck, raw-strings-qq + , scientific, tasty, tasty-hspec, text, transformers + }: + mkDerivation { + pname = "graphql-api"; + version = "0.1.1"; + sha256 = "e8d19197ff982e111ec199b411faf78e2800778b82c3c0147f1ef35615522a7d"; + revision = "1"; + editedCabalFile = "593742fa27cf4b14bcb88ced31b9af3a0567a5fab700e18e2f47f49a6c5fd1a9"; + libraryHaskellDepends = [ + aeson attoparsec base containers exceptions protolude QuickCheck + scientific text transformers + ]; + testHaskellDepends = [ + aeson attoparsec base containers directory doctest exceptions hspec + protolude QuickCheck raw-strings-qq tasty tasty-hspec transformers + ]; + homepage = "https://github.com/jml/graphql-api#readme"; + description = "Write type-safe GraphQL services in Haskell"; + license = stdenv.lib.licenses.asl20; + }) {}; + "graphs" = callPackage ({ mkDerivation, array, base, containers, transformers , transformers-compat, void @@ -83748,8 +83921,8 @@ self: { }: mkDerivation { pname = "hasbolt"; - version = "0.1.0.5"; - sha256 = "f0ec1be21cb5560fa575c414c691bcf48f14e6dfb8f53ae5feae013a105639fa"; + version = "0.1.0.8"; + sha256 = "ab3fde6c246636bf06d6a1a3a64261469d3f146a862a15db83fca86b02ade250"; libraryHaskellDepends = [ base binary bytestring containers data-binary-ieee754 data-default hex network network-simple text transformers @@ -85514,8 +85687,8 @@ self: { }: mkDerivation { pname = "haskell-tools-ast"; - version = "0.4.1.3"; - sha256 = "f456e74ada1c5ce4386a2b0e6a844c893b75dcdaaccac4dabc49977da8ae3405"; + version = "0.5.0.0"; + sha256 = "69f8feebf6ffbb942f7e0ca9b0e6a258a83f4acda13977e99b4568d36e9dee77"; libraryHaskellDepends = [ base ghc mtl references template-haskell uniplate ]; @@ -85586,8 +85759,8 @@ self: { }: mkDerivation { pname = "haskell-tools-backend-ghc"; - version = "0.4.1.3"; - sha256 = "590147059de94fc0224e86fd1cba144b32737dd9e9e3efa91d6389e99265642e"; + version = "0.5.0.0"; + sha256 = "eb8d8b2367020d851f83a2a9fccda813da6537a38c7065e92237f769e7bd2fe8"; libraryHaskellDepends = [ base bytestring containers ghc haskell-tools-ast mtl references safe split template-haskell transformers uniplate @@ -85601,13 +85774,13 @@ self: { "haskell-tools-cli" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , ghc, ghc-paths, haskell-tools-ast, haskell-tools-prettyprint - , haskell-tools-refactor, knob, mtl, references, split, tasty - , tasty-hunit + , haskell-tools-refactor, knob, mtl, process, references, split + , tasty, tasty-hunit }: mkDerivation { pname = "haskell-tools-cli"; - version = "0.4.1.3"; - sha256 = "e37721ca8bcbdc0e5eb2977a956b1e97c858a13f7d8c236c3a04e948e4ebe699"; + version = "0.5.0.0"; + sha256 = "08796a6d02d06c9cd68936436a452e82c90468e1420d3f02b3ed040f117d2c14"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -85615,7 +85788,7 @@ self: { haskell-tools-prettyprint haskell-tools-refactor mtl references split ]; - executableHaskellDepends = [ base ]; + executableHaskellDepends = [ base directory process split ]; testHaskellDepends = [ base bytestring directory filepath knob tasty tasty-hunit ]; @@ -85633,8 +85806,8 @@ self: { }: mkDerivation { pname = "haskell-tools-daemon"; - version = "0.4.1.3"; - sha256 = "0a10d80c3ed2bdc65010ef73b7d090544a086e4eba09b613f3045b23a141814a"; + version = "0.5.0.0"; + sha256 = "588ef66d492b16d6d76a34111dc43fc3243c4bff48d6f5aa2281c72ae365925a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -85644,7 +85817,7 @@ self: { ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - aeson base bytestring directory filepath HUnit network process + aeson base bytestring directory filepath ghc HUnit network process tasty tasty-hunit ]; homepage = "https://github.com/haskell-tools/haskell-tools"; @@ -85660,8 +85833,8 @@ self: { }: mkDerivation { pname = "haskell-tools-debug"; - version = "0.4.1.3"; - sha256 = "2e89fee8acdd91b92b6ce9f079e1f3c445c19f37ac0092310ed20ba51a8a677e"; + version = "0.5.0.0"; + sha256 = "b70796a99599cb051d2bbad5b02863245c8eae9732aa96ff3bc038e7b114dc27"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -85685,8 +85858,8 @@ self: { }: mkDerivation { pname = "haskell-tools-demo"; - version = "0.4.1.3"; - sha256 = "d8ab6534f3f04cd2bfb3c636d88f008501b23cee15171a435f8aea464398ed20"; + version = "0.5.0.0"; + sha256 = "4b5dd31ee4a5342a49e07c8c48daccc98f7dd16afab819e370b944f45ec2618c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -85712,8 +85885,8 @@ self: { }: mkDerivation { pname = "haskell-tools-prettyprint"; - version = "0.4.1.3"; - sha256 = "77fc5cab4b93e3e58022a23282776a667d0e90f357341f41ff72771919530490"; + version = "0.5.0.0"; + sha256 = "4690b95cd4e2d53547dd854d792dd1731c85470e97c1e0d6ed1df951b951367c"; libraryHaskellDepends = [ base containers ghc haskell-tools-ast mtl references split uniplate ]; @@ -85727,13 +85900,14 @@ self: { ({ mkDerivation, base, Cabal, containers, directory, either , filepath, ghc, ghc-paths, haskell-tools-ast , haskell-tools-backend-ghc, haskell-tools-prettyprint - , haskell-tools-rewrite, mtl, references, split, tasty, tasty-hunit - , template-haskell, time, transformers, uniplate + , haskell-tools-rewrite, mtl, old-time, polyparse, references + , split, tasty, tasty-hunit, template-haskell, time, transformers + , uniplate }: mkDerivation { pname = "haskell-tools-refactor"; - version = "0.4.1.3"; - sha256 = "d732fb853cf0e066cec00f126030edd2e43abbde423affc3c8f2ceacab18cb82"; + version = "0.5.0.0"; + sha256 = "41dcc1a933623fd172776800473596d7d5fa84b68a96042361d474c76db35df8"; libraryHaskellDepends = [ base Cabal containers directory filepath ghc ghc-paths haskell-tools-ast haskell-tools-backend-ghc @@ -85743,8 +85917,9 @@ self: { testHaskellDepends = [ base Cabal containers directory either filepath ghc ghc-paths haskell-tools-ast haskell-tools-backend-ghc - haskell-tools-prettyprint haskell-tools-rewrite mtl references - split tasty tasty-hunit template-haskell time transformers uniplate + haskell-tools-prettyprint haskell-tools-rewrite mtl old-time + polyparse references split tasty tasty-hunit template-haskell time + transformers uniplate ]; homepage = "https://github.com/haskell-tools/haskell-tools"; description = "Refactoring Tool for Haskell"; @@ -85759,8 +85934,8 @@ self: { }: mkDerivation { pname = "haskell-tools-rewrite"; - version = "0.4.1.3"; - sha256 = "a92dafd6fd3511517edfc6517ba040130caaf0d24608270af69ae75bd84ff59b"; + version = "0.5.0.0"; + sha256 = "abbd76e8709b6fff25c6da010447ab5ad06381169fbf191470178eb8412dbc94"; libraryHaskellDepends = [ base containers ghc haskell-tools-ast haskell-tools-prettyprint mtl references @@ -87002,6 +87177,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hasql_0_19_16" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring + , bytestring-tree-builder, contravariant, contravariant-extras + , data-default-class, dlist, either, hashable, hashtables, loch-th + , mtl, placeholders, postgresql-binary, postgresql-libpq + , profunctors, QuickCheck, quickcheck-instances, rebase, rerebase + , scientific, semigroups, tasty, tasty-hunit, tasty-quickcheck + , tasty-smallcheck, text, time, transformers, uuid, vector + }: + mkDerivation { + pname = "hasql"; + version = "0.19.16"; + sha256 = "b207195a7de0798f325b338b72059b9ef43546796401604b4a7a04a32be011c0"; + libraryHaskellDepends = [ + aeson attoparsec base base-prelude bytestring + bytestring-tree-builder contravariant contravariant-extras + data-default-class dlist either hashable hashtables loch-th mtl + placeholders postgresql-binary postgresql-libpq profunctors + scientific semigroups text time transformers uuid vector + ]; + testHaskellDepends = [ + data-default-class QuickCheck quickcheck-instances rebase rerebase + tasty tasty-hunit tasty-quickcheck tasty-smallcheck + ]; + homepage = "https://github.com/nikita-volkov/hasql"; + description = "An efficient PostgreSQL driver and a flexible mapping API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hasql-backend" = callPackage ({ mkDerivation, base, base-prelude, bytestring, either, free , list-t, text, transformers, vector @@ -89693,8 +89898,8 @@ self: { }: mkDerivation { pname = "heterocephalus"; - version = "1.0.3.0"; - sha256 = "df5bece7cd4a03df21e82a195b030b59608b991b16b1d7771569d542bbb7ee0b"; + version = "1.0.3.1"; + sha256 = "9be3bf3945b4a937cb7c34e040ba5ebc220551a4e4685258a9ad3da7280575c4"; libraryHaskellDepends = [ base blaze-html blaze-markup containers dlist parsec shakespeare template-haskell text @@ -90893,6 +91098,29 @@ self: { license = "GPL"; }) {}; + "highlighting-kate_0_6_4" = callPackage + ({ mkDerivation, base, blaze-html, bytestring, containers, Diff + , directory, filepath, mtl, parsec, pcre-light, process + , utf8-string + }: + mkDerivation { + pname = "highlighting-kate"; + version = "0.6.4"; + sha256 = "d8b83385f5da2ea7aa59f28eb860fd7eba0d35a4c36192a5044ee7ea1e001baf"; + configureFlags = [ "-fpcre-light" ]; + libraryHaskellDepends = [ + base blaze-html bytestring containers mtl parsec pcre-light + utf8-string + ]; + testHaskellDepends = [ + base blaze-html containers Diff directory filepath process + ]; + homepage = "http://github.com/jgm/highlighting-kate"; + description = "Syntax highlighting"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hills" = callPackage ({ mkDerivation, array, base, bytestring, directory, filepath , optparse-applicative, text, transformers @@ -103465,6 +103693,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ieee754_0_8_0" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "ieee754"; + version = "0.8.0"; + sha256 = "0e2dff9c37f59acf5c64f978ec320005e9830f276f9f314e4bfed3f482289ad1"; + libraryHaskellDepends = [ base ]; + homepage = "http://github.com/patperry/hs-ieee754"; + description = "Utilities for dealing with IEEE floating point numbers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ieee754-parser" = callPackage ({ mkDerivation, base, binary, bytestring }: mkDerivation { @@ -106259,6 +106500,8 @@ self: { pname = "ip"; version = "0.8.7"; sha256 = "f33f12745defa0ac5aa72f8bfd1b48d905c6ece9a228c9a2209b2943c2f2c690"; + revision = "1"; + editedCabalFile = "53d0cca59537fcb2f837d6afcb3d9b0ac3df15a7cdbc4a06f97d696931698ebd"; libraryHaskellDepends = [ aeson attoparsec base bytestring hashable primitive text vector ]; @@ -111367,6 +111610,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "lackey_0_4_2" = callPackage + ({ mkDerivation, base, servant, servant-foreign, tasty, tasty-hspec + , text + }: + mkDerivation { + pname = "lackey"; + version = "0.4.2"; + sha256 = "3a7f28b66e015a8aafe7af45cfe2da0fec32bdd2ff4f4634def64cce033878c9"; + libraryHaskellDepends = [ base servant servant-foreign text ]; + testHaskellDepends = [ base servant tasty tasty-hspec text ]; + 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 ({ mkDerivation, ad, base, hmatrix, HUnit, nonlinear-optimization , test-framework, test-framework-hunit, test-framework-quickcheck2 @@ -112834,7 +113093,7 @@ self: { hydraPlatforms = [ "x86_64-linux" ]; }) {}; - "language-puppet_1_3_4_1" = callPackage + "language-puppet_1_3_5" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base , base16-bytestring, bytestring, case-insensitive, containers , cryptonite, directory, either, exceptions, filecache, formatting @@ -112848,8 +113107,8 @@ self: { }: mkDerivation { pname = "language-puppet"; - version = "1.3.4.1"; - sha256 = "41cfb18f96af7d30f4477c78b559d78b3bfa3fa385c1a06dd9177f221f0cce71"; + version = "1.3.5"; + sha256 = "23c86afa89085f33bfcce1c7290b1f3b302f675578c0625237773211d76d8590"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -114390,6 +114649,8 @@ self: { pname = "lenz"; version = "0.1"; sha256 = "98b3aef14ca16218ecd6643812e9df5dde5c60af6e2f56f98ec523ecc0917397"; + revision = "1"; + editedCabalFile = "48a9254ce289eedf5db423844732c4b5a42798d94b3c2e82b4b9770f87c97f07"; libraryHaskellDepends = [ base base-unicode-symbols transformers ]; description = "Van Laarhoven lenses"; license = "unknown"; @@ -117774,15 +118035,15 @@ self: { "log-warper" = callPackage ({ mkDerivation, aeson, ansi-terminal, async, base, bytestring , data-default, directory, dlist, errors, exceptions, extra - , filepath, formatting, hashable, hslogger, hspec, lens + , filepath, formatting, hashable, hslogger, hspec, HUnit, lens , monad-control, mtl, QuickCheck, safecopy, text, text-format, time , transformers, transformers-base, universum, unordered-containers , yaml }: mkDerivation { pname = "log-warper"; - version = "0.2.5"; - sha256 = "db8894f9cbc932ad04e0cd29449d18df0803e4ffe0a10bf5cfc0b94332b39585"; + version = "0.3.1"; + sha256 = "ff1c2e2fac08b44e180f8d9359eac8ad3df1967dea53b9f29aa78da12d5c7678"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -117793,7 +118054,7 @@ self: { ]; executableHaskellDepends = [ base exceptions hslogger text ]; testHaskellDepends = [ - async base data-default directory filepath hspec QuickCheck + async base data-default directory filepath hspec HUnit QuickCheck universum unordered-containers ]; homepage = "https://github.com/serokell/log-warper"; @@ -120346,10 +120607,8 @@ self: { }: mkDerivation { pname = "map-syntax"; - version = "0.2.0.1"; - sha256 = "f45f0e09da98dc749eae15f403e30674e874c57f81c4bdd8db818028a25b5c55"; - revision = "1"; - editedCabalFile = "98d6cd8739a862600633098d811286237e263dcb7edbc99557aaeea4cd108076"; + version = "0.2.0.2"; + sha256 = "b18f95a6369a600fda189c6f475606cbf5f5f1827f96ca3384f33ae76bda4d8a"; libraryHaskellDepends = [ base containers mtl ]; testHaskellDepends = [ base containers deepseq hspec HUnit mtl QuickCheck transformers @@ -121553,17 +121812,15 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; - "megaparsec_5_1_2" = callPackage + "megaparsec_5_2_0" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, exceptions , hspec, hspec-expectations, mtl, QuickCheck, scientific, text , transformers }: mkDerivation { pname = "megaparsec"; - version = "5.1.2"; - sha256 = "ecb943979f8078a0f6e3bf8db2232d91cb1224768aa8ea0b8fc577af24b36ccd"; - revision = "1"; - editedCabalFile = "5286fd0b0f2edd01ca06e4cc1f814eedf81365c8b7b36cf3023128f75fadbc54"; + version = "5.2.0"; + sha256 = "c250a7ae2365e96df8f1061d28c7d04e5a1695395ea87055f36e3f3a57e90408"; libraryHaskellDepends = [ base bytestring containers deepseq exceptions mtl QuickCheck scientific text transformers @@ -123244,6 +123501,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "mintty" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "mintty"; + version = "0.1"; + sha256 = "956b346c89b12e683b957bf45eb0d09cae121fd247916de0386687f713ca0865"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/RyanGlScott/mintty"; + description = "A reliable way to detect the presence of a MinTTY console on Windows"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "mios" = callPackage ({ mkDerivation, base, bytestring, ghc-prim, vector }: mkDerivation { @@ -124106,8 +124375,8 @@ self: { pname = "monad-http"; version = "0.1.0.0"; sha256 = "a333b087835aa4902d0814e76fe4f32a523092fd7b13526aad415160a8317192"; - revision = "3"; - editedCabalFile = "7d244f8a4ef132e7af6de7d70223548c34b99805e8e45edad6ab091a1e664ff6"; + revision = "4"; + editedCabalFile = "14c2dd1a2de592a520efe1b743d98b6ecdaf71cd56fde036628f8c8f759fbf03"; libraryHaskellDepends = [ base base-compat bytestring exceptions http-client http-client-tls http-types monad-logger monadcryptorandom MonadRandom mtl text @@ -126749,6 +127018,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "multivariant" = callPackage + ({ mkDerivation, base, containers, free, HUnit, invertible + , MonadRandom, profunctors, QuickCheck, semigroupoids, tasty + , tasty-hunit, tasty-quickcheck, text, transformers + }: + mkDerivation { + pname = "multivariant"; + version = "0.1.0.1"; + sha256 = "57278b97a88ecc9d8e2a4c58aee902393cf4a9dbaa500683568053ba60e06408"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers free HUnit invertible MonadRandom profunctors + QuickCheck semigroupoids tasty tasty-hunit tasty-quickcheck text + transformers + ]; + executableHaskellDepends = [ + base containers free HUnit invertible MonadRandom profunctors + QuickCheck semigroupoids tasty tasty-hunit tasty-quickcheck text + transformers + ]; + testHaskellDepends = [ + base containers free HUnit invertible MonadRandom profunctors + QuickCheck semigroupoids tasty tasty-hunit tasty-quickcheck text + transformers + ]; + homepage = "https://bitbucket.org/gltronred/multivariant#readme"; + description = "Multivariant assignments generation language"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "muon" = callPackage ({ mkDerivation, base, blaze-html, ConfigFile, directory, Glob , happstack-server, HStringTemplate, markdown, MissingH, process @@ -128063,6 +128363,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "nat-sized-numbers" = callPackage + ({ mkDerivation, base, doctest, QuickCheck, smallcheck }: + mkDerivation { + pname = "nat-sized-numbers"; + version = "0.1.0.0"; + sha256 = "64b862c8e64ccd3d71dc62723dc84817f9b1aeea45818d535cca60575de34144"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest QuickCheck smallcheck ]; + homepage = "https://github.com/oisdk/nat-sized-numbers#readme"; + description = "Variable-sized numbers from type-level nats"; + license = stdenv.lib.licenses.mit; + }) {}; + "nationstates" = callPackage ({ mkDerivation, base, bytestring, clock, containers, http-client , http-client-tls, http-types, multiset, tls, transformers, xml @@ -134504,7 +134817,7 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; - "pandoc_1_19_2" = callPackage + "pandoc_1_19_2_1" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, base , base64-bytestring, binary, blaze-html, blaze-markup, bytestring , cmark, containers, data-default, deepseq, Diff, directory @@ -134519,8 +134832,8 @@ self: { }: mkDerivation { pname = "pandoc"; - version = "1.19.2"; - sha256 = "8a87110f60e6412a4cae68b27e1647d029b73bb7f1794a62a3477a0df1bbbbbc"; + version = "1.19.2.1"; + sha256 = "08692f3d77bf95bb9ba3407f7af26de7c23134e7efcdafad0bdaf9050e2c7801"; configureFlags = [ "-fhttps" "-f-trypandoc" ]; isLibrary = true; isExecutable = true; @@ -134604,31 +134917,28 @@ self: { }) {}; "pandoc-crossref" = callPackage - ({ mkDerivation, base, bytestring, containers, data-accessor + ({ mkDerivation, base, containers, data-accessor , data-accessor-template, data-accessor-transformers, data-default - , directory, filepath, hspec, mtl, pandoc, pandoc-types, process - , roman-numerals, syb, template-haskell, utility-ht, yaml + , directory, filepath, hspec, mtl, pandoc, pandoc-types + , roman-numerals, syb, template-haskell, utility-ht }: mkDerivation { pname = "pandoc-crossref"; - version = "0.2.4.1"; - sha256 = "2aa2266ac3916677c18bd9a88b99f32622c22c983abaed3598020913ca3912ed"; + version = "0.2.4.2"; + sha256 = "fe1121698b9b9804f8ccc43cbbb2e77e40948caa543b42e129bf4ce872a7cd3f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring containers data-accessor data-accessor-template + base containers data-accessor data-accessor-template data-accessor-transformers data-default mtl pandoc pandoc-types - roman-numerals syb template-haskell utility-ht yaml - ]; - executableHaskellDepends = [ - base bytestring containers data-default mtl pandoc pandoc-types - yaml + roman-numerals syb template-haskell utility-ht ]; + executableHaskellDepends = [ base pandoc pandoc-types ]; testHaskellDepends = [ - base bytestring containers data-accessor data-accessor-template + base containers data-accessor data-accessor-template data-accessor-transformers data-default directory filepath hspec - mtl pandoc pandoc-types process roman-numerals syb template-haskell - utility-ht yaml + mtl pandoc pandoc-types roman-numerals syb template-haskell + utility-ht ]; description = "Pandoc filter for cross-references"; license = stdenv.lib.licenses.gpl2; @@ -139430,8 +139740,8 @@ self: { }: mkDerivation { pname = "pipes-misc"; - version = "0.2.0.1"; - sha256 = "ef48d83421e90d2f13d8d90e1b7fcd34130eec0bbbefe635c0efa5a6c46b6a04"; + version = "0.2.2.1"; + sha256 = "9ff15e0ebcae6732eeff413a2fe9dfb33b07073eda54cfa1513a0ee0e2603c5f"; libraryHaskellDepends = [ base lens mtl pipes pipes-category pipes-concurrency semigroups stm transformers @@ -141606,6 +141916,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "postgresql-binary_0_9_2" = callPackage + ({ mkDerivation, aeson, base, base-prelude, binary-parser + , bytestring, conversion, conversion-bytestring, conversion-text + , foldl, json-ast, loch-th, placeholders, postgresql-libpq + , QuickCheck, quickcheck-instances, rerebase, scientific, tasty + , tasty-hunit, tasty-quickcheck, tasty-smallcheck, text, time + , transformers, uuid, vector + }: + mkDerivation { + pname = "postgresql-binary"; + version = "0.9.2"; + sha256 = "ba9df352bbfc0ee3dff91ef1462f1a3d676e5bac3a45ff3af5d765b7365b1d47"; + libraryHaskellDepends = [ + aeson base base-prelude binary-parser bytestring foldl loch-th + placeholders scientific text time transformers uuid vector + ]; + testHaskellDepends = [ + aeson conversion conversion-bytestring conversion-text json-ast + loch-th placeholders postgresql-libpq QuickCheck + quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck + tasty-smallcheck + ]; + homepage = "https://github.com/nikita-volkov/postgresql-binary"; + description = "Encoders and decoders for the PostgreSQL's binary format"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "postgresql-config" = callPackage ({ mkDerivation, aeson, base, bytestring, monad-control, mtl , postgresql-simple, resource-pool, time @@ -143656,19 +143994,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "profiteur_0_4_1_0" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, filepath - , js-jquery, text, unordered-containers, vector + "profiteur_0_4_2_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, filepath + , ghc-prof, js-jquery, scientific, text, unordered-containers + , vector }: mkDerivation { pname = "profiteur"; - version = "0.4.1.0"; - sha256 = "c9e67c15761d06df8088cdbdfaf56a31f3b7b4c169e5c50418c8cd3a29fd8ef7"; + version = "0.4.2.0"; + sha256 = "eb1936c5b9db53695530ba6302fe6950dd8dc275628112b05b7902996f414b91"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - aeson attoparsec base bytestring filepath js-jquery text - unordered-containers vector + aeson base bytestring containers filepath ghc-prof js-jquery + scientific text unordered-containers vector ]; homepage = "http://github.com/jaspervdj/profiteur"; description = "Treemap visualiser for GHC prof files"; @@ -145744,8 +146083,8 @@ self: { }: mkDerivation { pname = "qif"; - version = "1.1.0"; - sha256 = "c0e432203b4b9bb3c225670e58aeee0cd75a83914f518e9b092e9980d3579f9a"; + version = "1.1.1"; + sha256 = "f7fea15fbf6c290e44d75bb60ca2187009febcda88da87c931abb136f5f4d22d"; libraryHaskellDepends = [ attoparsec base microlens microlens-th text time ]; @@ -146440,13 +146779,15 @@ self: { }) {}; "quickcheck-special" = callPackage - ({ mkDerivation, base, bytestring, QuickCheck, scientific, text }: + ({ mkDerivation, base, bytestring, ieee754, QuickCheck, scientific + , text + }: mkDerivation { pname = "quickcheck-special"; - version = "0.1.0.2"; - sha256 = "3938d6992d9c269f0318cf247db4a9f472eb6f1e69d2e249fa8841ba92a19977"; + version = "0.1.0.3"; + sha256 = "8dbe5c2cdefb35880433902402110c1d9927b96d2363df8382fb6ee7e8d3e2f7"; libraryHaskellDepends = [ - base bytestring QuickCheck scientific text + base bytestring ieee754 QuickCheck scientific text ]; homepage = "https://github.com/minad/quickcheck-special#readme"; description = "Edge cases and special values for QuickCheck Arbitrary instances"; @@ -148958,6 +149299,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "rebase_1_0_8" = callPackage + ({ mkDerivation, base, base-prelude, bifunctors, bytestring + , containers, contravariant, contravariant-extras, deepseq, dlist + , either, fail, hashable, mtl, profunctors, scientific + , semigroupoids, semigroups, stm, text, time, transformers + , unordered-containers, uuid, vector, void + }: + mkDerivation { + pname = "rebase"; + version = "1.0.8"; + sha256 = "84d3a1f8e0663fa1f19f963b1a385ef12b0dcb41f8400b0fdda55e7cd7cfb8bd"; + libraryHaskellDepends = [ + base base-prelude bifunctors bytestring containers contravariant + contravariant-extras deepseq dlist either fail hashable mtl + profunctors scientific semigroupoids semigroups stm text time + transformers unordered-containers uuid vector void + ]; + homepage = "https://github.com/nikita-volkov/rebase"; + description = "A more progressive alternative to the \"base\" package"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rebindable" = callPackage ({ mkDerivation, base, data-default-class, indexed }: mkDerivation { @@ -149925,28 +150289,31 @@ self: { "regex" = callPackage ({ mkDerivation, array, base, bytestring, containers, directory - , hashable, heredoc, hsyslog, regex-base, regex-pcre-builtin - , regex-tdfa, regex-tdfa-text, shelly, smallcheck, tasty - , tasty-hunit, tasty-smallcheck, template-haskell, text, time - , transformers, unordered-containers + , hashable, heredoc, regex-base, regex-pcre-builtin, regex-tdfa + , regex-tdfa-text, shelly, smallcheck, tasty, tasty-hunit + , tasty-smallcheck, template-haskell, text, time, transformers + , unordered-containers }: mkDerivation { pname = "regex"; - version = "0.0.0.1"; - sha256 = "16068310c4d27651f270bb8221d03860407fa2c13e128bd34dd561315362d183"; + version = "0.0.0.2"; + sha256 = "200695e102f2a698939833c35c6862bfa93803a5f4e22fa7ad40e76999ed2396"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array base bytestring containers hashable heredoc hsyslog - regex-base regex-pcre-builtin regex-tdfa regex-tdfa-text smallcheck - tasty tasty-hunit tasty-smallcheck template-haskell text time + array base bytestring containers hashable heredoc regex-base + regex-pcre-builtin regex-tdfa regex-tdfa-text smallcheck tasty + tasty-hunit tasty-smallcheck template-haskell text time transformers unordered-containers ]; executableHaskellDepends = [ - array base bytestring directory regex-base regex-tdfa shelly text + array base bytestring containers directory hashable heredoc + regex-base regex-pcre-builtin regex-tdfa regex-tdfa-text shelly + smallcheck tasty tasty-hunit tasty-smallcheck template-haskell text + time transformers unordered-containers ]; testHaskellDepends = [ - array base bytestring containers directory hashable heredoc hsyslog + array base bytestring containers directory hashable heredoc regex-base regex-pcre-builtin regex-tdfa regex-tdfa-text shelly smallcheck tasty tasty-hunit tasty-smallcheck template-haskell text time transformers unordered-containers @@ -151746,8 +152113,8 @@ self: { ({ mkDerivation, rebase }: mkDerivation { pname = "rerebase"; - version = "1.0.1.1"; - sha256 = "44b023de5749713d04d43342dc94ca6562fc0e827e53ac3a8f1e62500b60463b"; + version = "1.0.3"; + sha256 = "63532e72cd0febdff280930658ad345e28f38c736a5391d5a313015e9942ffbe"; libraryHaskellDepends = [ rebase ]; homepage = "https://github.com/nikita-volkov/rerebase"; description = "Reexports from \"base\" with a bunch of other standard libraries"; @@ -154874,14 +155241,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "sampling_0_3_1" = callPackage + "sampling_0_3_2" = callPackage ({ mkDerivation, base, containers, foldl, mwc-random, primitive , vector }: mkDerivation { pname = "sampling"; - version = "0.3.1"; - sha256 = "0bc2557dd64e4a933c9c6abab083e57b52508236c94d2151fd6890acc54e691b"; + version = "0.3.2"; + sha256 = "a66156e4600ffb15bde127a841251d49f2d0ff67a85e05961b91839b4769824e"; libraryHaskellDepends = [ base containers foldl mwc-random primitive vector ]; @@ -155299,15 +155666,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "sbv_5_14" = callPackage + "sbv_5_15" = callPackage ({ mkDerivation, array, async, base, base-compat, containers , crackNum, data-binary-ieee754, deepseq, directory, filepath, ghc , HUnit, mtl, old-time, pretty, process, QuickCheck, random, syb }: mkDerivation { pname = "sbv"; - version = "5.14"; - sha256 = "92dc71b96071162a47383c5f4833e8b78c2874009e671e2a6bc8de9707328e7e"; + version = "5.15"; + sha256 = "2364c29cb4cd20c8489e76689aa885072bf51faf2f60b208ec58be3d5ae5d719"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -156495,6 +156862,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) SDL2;}; + "sdl2_2_1_3_1" = callPackage + ({ mkDerivation, base, bytestring, exceptions, linear, SDL2 + , StateVar, text, transformers, vector + }: + mkDerivation { + pname = "sdl2"; + version = "2.1.3.1"; + sha256 = "788a7f1e2bb08e393b806d9f700f62234703ec85b772e0e25ff740b4aafaae14"; + libraryHaskellDepends = [ + base bytestring exceptions linear StateVar text transformers vector + ]; + librarySystemDepends = [ SDL2 ]; + libraryPkgconfigDepends = [ SDL2 ]; + description = "Both high- and low-level bindings to the SDL library (version 2.0.2+)."; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) SDL2;}; + "sdl2-cairo" = callPackage ({ mkDerivation, base, cairo, linear, mtl, random, sdl2, time }: mkDerivation { @@ -156685,6 +157070,47 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "seakale" = callPackage + ({ mkDerivation, base, bytestring, free, mtl, text }: + mkDerivation { + pname = "seakale"; + version = "0.1.0.0"; + sha256 = "c1aebae23aaa611db361eb2327fba0d90b3559d5ab8702417696e80c6e6254ea"; + libraryHaskellDepends = [ base bytestring free mtl text ]; + description = "Pure SQL layer on top of other libraries"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "seakale-postgresql" = callPackage + ({ mkDerivation, base, bytestring, free, mtl, postgresql-libpq + , seakale, time + }: + mkDerivation { + pname = "seakale-postgresql"; + version = "0.1.0.0"; + sha256 = "b8557deb006934cd605eabcf1a00c0c9ab4492490f140df22eef3e38a8d21752"; + libraryHaskellDepends = [ + base bytestring free mtl postgresql-libpq seakale time + ]; + description = "PostgreSQL backend for Seakale"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "seakale-tests" = callPackage + ({ mkDerivation, base, bytestring, free, mtl, recursion-schemes + , seakale + }: + mkDerivation { + pname = "seakale-tests"; + version = "0.1.0.0"; + sha256 = "bbd5c83a6335dca7f06bf8b7943e80bd3186530ff621d25b00b3a8a3950cec52"; + libraryHaskellDepends = [ + base bytestring free mtl recursion-schemes seakale + ]; + description = "Helpers to test code using Seakale"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "seal-module" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -157791,27 +158217,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant_0_9_1_1" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring - , case-insensitive, directory, doctest, filemanip, filepath, hspec - , http-api-data, http-media, http-types, mmorph, mtl, network-uri - , QuickCheck, quickcheck-instances, string-conversions, text, url - , vault + "servant_0_10" = callPackage + ({ mkDerivation, aeson, aeson-compat, attoparsec, base, base-compat + , bytestring, Cabal, case-insensitive, directory, doctest + , filemanip, filepath, hspec, http-api-data, http-media, http-types + , mmorph, mtl, natural-transformation, network-uri, QuickCheck + , quickcheck-instances, string-conversions, text, url, vault }: mkDerivation { pname = "servant"; - version = "0.9.1.1"; - sha256 = "fb3372f676ab07dfab1695ccd0e23d98c948318f4b4d5ae827a6fa5284c4e5fa"; - revision = "1"; - editedCabalFile = "a9be93ef6e6464dc76f4572fe372095b9e77fdbaf92966569b5a50ee4829de4d"; + version = "0.10"; + sha256 = "e1daa9ba2b759615341345a17a95833729ae3200af12dacec07507a95a4b331e"; + setupHaskellDepends = [ base Cabal directory filepath ]; libraryHaskellDepends = [ aeson attoparsec base base-compat bytestring case-insensitive - http-api-data http-media http-types mmorph mtl network-uri - string-conversions text vault + http-api-data http-media http-types mmorph mtl + natural-transformation network-uri string-conversions text vault ]; testHaskellDepends = [ - aeson attoparsec base base-compat bytestring directory doctest - filemanip filepath hspec QuickCheck quickcheck-instances + aeson aeson-compat attoparsec base base-compat bytestring directory + doctest filemanip filepath hspec QuickCheck quickcheck-instances string-conversions text url ]; homepage = "http://haskell-servant.readthedocs.org/"; @@ -157909,26 +158334,23 @@ self: { }) {}; "servant-auth-cookie" = callPackage - ({ mkDerivation, base, base-compat, base64-bytestring - , blaze-builder, blaze-html, blaze-markup, bytestring, cereal - , cookie, cryptonite, data-default, deepseq, exceptions, hspec - , http-api-data, http-media, http-types, memory, mtl, QuickCheck - , servant, servant-blaze, servant-server, tagged, text, time - , transformers, wai, warp + ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring + , cereal, cookie, cryptonite, data-default, deepseq, exceptions + , hspec, http-api-data, http-types, memory, mtl, QuickCheck + , servant, servant-server, tagged, time, transformers, wai }: mkDerivation { pname = "servant-auth-cookie"; - version = "0.4.2.1"; - sha256 = "830df7c6d14345b6ff8e869354388f6242b75abe371265e5f1e414427a88fed3"; + version = "0.4.3.1"; + sha256 = "c4ea750d6f7ab768e16f212ae7b0f76b98db43021d62736ebd2996b4d92809c1"; libraryHaskellDepends = [ base base64-bytestring blaze-builder bytestring cereal cookie cryptonite data-default exceptions http-api-data http-types memory mtl servant servant-server tagged time transformers wai ]; testHaskellDepends = [ - base base-compat blaze-html blaze-markup bytestring cereal - cryptonite data-default deepseq hspec http-api-data http-media mtl - QuickCheck servant servant-blaze servant-server text time wai warp + base bytestring cereal cryptonite data-default deepseq hspec + QuickCheck servant-server time ]; description = "Authentication via encrypted cookies"; license = stdenv.lib.licenses.bsd3; @@ -158001,8 +158423,8 @@ self: { }: mkDerivation { pname = "servant-auth-server"; - version = "0.2.1.0"; - sha256 = "0f9e848300a916de0892c55a8b530a02d3fc8bcbc7983012780355a88e266c84"; + version = "0.2.2.0"; + sha256 = "ffec3373f25cabc2b182ea7226fff9e43a151c02e603780e5848a5ea03ee48b4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -158077,8 +158499,8 @@ self: { pname = "servant-blaze"; version = "0.7.1"; sha256 = "90ed1c7a22b83bee344ef3896203f3699b7633bf986ffa064752c3596c072646"; - revision = "3"; - editedCabalFile = "9f4f41889ae9722c92c87cf84de89c3c00d48a37749797fa04a74fba7db5a5ef"; + revision = "4"; + editedCabalFile = "cae733c4dbe8faa35b4f8fdfc5984ef6c01c653c056c799f7fd225a54c9b9b9f"; libraryHaskellDepends = [ base blaze-html http-media servant ]; homepage = "http://haskell-servant.readthedocs.org/"; description = "Blaze-html support for servant"; @@ -158091,8 +158513,8 @@ self: { pname = "servant-cassava"; version = "0.8"; sha256 = "5d9b85f7dc2fc42c7fe47bf92e4502e4ff5dde03724a6ee6ab20887524dce4fb"; - revision = "1"; - editedCabalFile = "56c74c61929917f3f9a662638f9759f92fed2ce0ef49b8fcc8090651f7f854b0"; + revision = "2"; + editedCabalFile = "4b6443d2de0087bed78cd5a0238b7483c5ef75dc72ecac43a45d47522134857a"; libraryHaskellDepends = [ base cassava http-media servant vector ]; homepage = "http://haskell-servant.readthedocs.org/"; description = "Servant CSV content-type for cassava"; @@ -158127,30 +158549,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-client_0_9_1_1" = callPackage + "servant-client_0_10" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat - , base64-bytestring, bytestring, deepseq, exceptions, hspec - , http-api-data, http-client, http-client-tls, http-media - , http-types, HUnit, mtl, network, network-uri, QuickCheck, safe - , servant, servant-server, string-conversions, text, transformers + , base64-bytestring, bytestring, deepseq, exceptions, generics-sop + , hspec, http-api-data, http-client, http-client-tls, http-media + , http-types, HUnit, monad-control, mtl, network, network-uri + , QuickCheck, safe, semigroupoids, servant, servant-server + , string-conversions, text, transformers, transformers-base , transformers-compat, wai, warp }: mkDerivation { pname = "servant-client"; - version = "0.9.1.1"; - sha256 = "6e085faa1a8ecab076ffdec61b97b6e7c8fff7eb18a9a4cf3538c26b7b99c724"; - revision = "1"; - editedCabalFile = "d3ac72d1b11dd6ebf86076237d8ffab3b87e8b6f04d2af1b28a2c5506faa82c5"; + version = "0.10"; + sha256 = "55e411ac7e38a5c1b77d8d3c2320369be36a7b7181e27bb5ac4fba308ef93eaa"; libraryHaskellDepends = [ aeson attoparsec base base-compat base64-bytestring bytestring - exceptions http-api-data http-client http-client-tls http-media - http-types mtl network-uri safe servant string-conversions text - transformers transformers-compat + exceptions generics-sop http-api-data http-client http-client-tls + http-media http-types monad-control mtl network-uri safe + semigroupoids servant string-conversions text transformers + transformers-base transformers-compat ]; testHaskellDepends = [ - aeson base base-compat bytestring deepseq hspec http-api-data - http-client http-media http-types HUnit network QuickCheck servant - servant-server text transformers transformers-compat wai warp + aeson base base-compat bytestring deepseq generics-sop hspec + http-api-data http-client http-media http-types HUnit mtl network + QuickCheck servant servant-server text transformers + transformers-compat wai warp ]; homepage = "http://haskell-servant.readthedocs.org/"; description = "automatical derivation of querying functions for servant webservices"; @@ -158244,20 +158667,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "servant-docs_0_9_1_1" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring + "servant-docs_0_10" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring , case-insensitive, control-monad-omega, hashable, hspec , http-media, http-types, lens, servant, string-conversions, text , unordered-containers }: mkDerivation { pname = "servant-docs"; - version = "0.9.1.1"; - sha256 = "7c4205d25caa926355221e62842c3e58337d05022b1e4341045ac385e568bc79"; + version = "0.10"; + sha256 = "0a471acc5a292ed48be2c7f1a22e15c5685c1a1049f99834a56619d7c836603b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson aeson-pretty base bytestring case-insensitive + aeson aeson-pretty base base-compat bytestring case-insensitive control-monad-omega hashable http-media http-types lens servant string-conversions text unordered-containers ]; @@ -158297,6 +158720,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-ekg" = callPackage + ({ mkDerivation, aeson, base, ekg, ekg-core, hspec, http-client + , http-types, process, servant, servant-client, servant-server + , text, time, transformers, unordered-containers, wai, warp + }: + mkDerivation { + pname = "servant-ekg"; + version = "0.2.0.0"; + sha256 = "02b54e60e87e5a6c9879fdd1f9a7924b1d16c667b81464d8f3b9ec1c7d693ab3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base ekg-core http-types servant text time unordered-containers wai + ]; + executableHaskellDepends = [ + aeson base ekg ekg-core process servant-server text wai warp + ]; + testHaskellDepends = [ + aeson base ekg ekg-core hspec http-client servant servant-client + servant-server text transformers unordered-containers wai warp + ]; + description = "Helpers for using ekg with servant"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-elm" = callPackage ({ mkDerivation, aeson, base, Diff, elm-export, hspec, HUnit, lens , servant, servant-foreign, text, wl-pprint-text @@ -158508,8 +158956,8 @@ self: { pname = "servant-lucid"; version = "0.7.1"; sha256 = "ec26ba7d159b09be10beacf6242f6ae1bd111e9c738bfbf3cf2f560f48e0fe40"; - revision = "3"; - editedCabalFile = "4bb81e61336f3e3a91d3c920937beeee49a178c53d391172c07bb847a68cdbe5"; + revision = "4"; + editedCabalFile = "ea04cd0d0f11bbe4ea55608a7a38013d9da6373f25b2cad1e03dfb2c5c83fe18"; libraryHaskellDepends = [ base http-media lucid servant ]; homepage = "http://haskell-servant.readthedocs.org/"; description = "Servant support for lucid"; @@ -158566,6 +159014,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-mock_0_8_1_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, bytestring-conversion + , hspec, hspec-wai, http-types, QuickCheck, servant, servant-server + , transformers, wai, warp + }: + mkDerivation { + pname = "servant-mock"; + version = "0.8.1.2"; + sha256 = "2a65e62112551633d7d9b1372129b043b0cc35e13960b8222f122d206931d117"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring http-types QuickCheck servant servant-server + transformers wai + ]; + executableHaskellDepends = [ + aeson base QuickCheck servant-server warp + ]; + testHaskellDepends = [ + aeson base bytestring-conversion hspec hspec-wai QuickCheck servant + servant-server wai + ]; + homepage = "http://haskell-servant.readthedocs.org/"; + description = "Derive a mock server for free from your servant API types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-pandoc" = callPackage ({ mkDerivation, base, bytestring, http-media, lens, pandoc-types , servant-docs, text, unordered-containers @@ -158783,36 +159259,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-server_0_9_1_1" = callPackage + "servant-server_0_10" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat - , base64-bytestring, bytestring, containers, directory, doctest - , exceptions, filemanip, filepath, hspec, hspec-wai, http-api-data - , http-types, mtl, network, network-uri, parsec, QuickCheck, safe - , servant, should-not-typecheck, split, string-conversions - , system-filepath, temporary, text, transformers + , base64-bytestring, bytestring, Cabal, containers, directory + , doctest, exceptions, filemanip, filepath, hspec, hspec-wai + , http-api-data, http-types, monad-control, mtl, network + , network-uri, parsec, QuickCheck, resourcet, safe, servant + , should-not-typecheck, split, string-conversions, system-filepath + , temporary, text, transformers, transformers-base , transformers-compat, wai, wai-app-static, wai-extra, warp, word8 }: mkDerivation { pname = "servant-server"; - version = "0.9.1.1"; - sha256 = "1e0683557ece1f7a8a7b11e5c7cd1fd042783777157d95a67e28a0518c91bdd1"; - revision = "1"; - editedCabalFile = "0fd5137ad4ab43f5a6fde1a944eb23ce6d75c42fb909e4a82b579ab1c3739771"; + version = "0.10"; + sha256 = "99d14d23ea67832401b4bca7e5cb75b8c557e6dc7a8f38870c3b9d701179073d"; isLibrary = true; isExecutable = true; + setupHaskellDepends = [ base Cabal directory filepath ]; libraryHaskellDepends = [ aeson attoparsec base base-compat base64-bytestring bytestring - containers filepath http-api-data http-types mtl network - network-uri safe servant split string-conversions system-filepath - text transformers transformers-compat wai wai-app-static warp word8 + containers exceptions filepath http-api-data http-types + monad-control mtl network network-uri resourcet safe servant split + string-conversions system-filepath text transformers + transformers-base transformers-compat wai wai-app-static warp word8 ]; executableHaskellDepends = [ aeson base servant text wai warp ]; testHaskellDepends = [ aeson base base-compat base64-bytestring bytestring directory doctest exceptions filemanip filepath hspec hspec-wai http-types - mtl network parsec QuickCheck safe servant should-not-typecheck - string-conversions temporary text transformers transformers-compat - wai wai-extra warp + mtl network parsec QuickCheck resourcet safe servant + should-not-typecheck string-conversions temporary text transformers + transformers-compat wai wai-extra warp ]; homepage = "http://haskell-servant.readthedocs.org/"; description = "A family of combinators for defining webservices APIs and serving them"; @@ -158937,6 +159414,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "servant-swagger_1_1_2_1" = callPackage + ({ mkDerivation, aeson, aeson-qq, base, bytestring, Cabal + , cabal-doctest, directory, doctest, filepath, hspec, http-media + , insert-ordered-containers, lens, QuickCheck, servant, swagger2 + , text, time, unordered-containers + }: + mkDerivation { + pname = "servant-swagger"; + version = "1.1.2.1"; + sha256 = "302ab03af773ddb3b0a4949b62ca79b81c206a3838864c9ed35cb4e40360f961"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + aeson base bytestring hspec http-media insert-ordered-containers + lens QuickCheck servant swagger2 text unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-qq base directory doctest filepath hspec lens + QuickCheck servant swagger2 text time + ]; + homepage = "https://github.com/haskell-servant/servant-swagger"; + description = "Generate Swagger specification for your servant API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-swagger-ui" = callPackage ({ mkDerivation, aeson, base, base-compat, blaze-markup, bytestring , directory, file-embed, filepath, http-media, lens, servant @@ -158976,8 +159478,8 @@ self: { pname = "servant-yaml"; version = "0.1.0.0"; sha256 = "c917d9b046b06a9c4386f743a78142c27cf7f0ec1ad8562770ab9828f2ee3204"; - revision = "12"; - editedCabalFile = "a8bcb29afce01078d5f6b71503ad0d7d03356a9ebeffb4ec09719a324c314519"; + revision = "13"; + editedCabalFile = "dba651f8c89c721a27427895340c9cf6e118ad0f752ca3cd275295a601e58573"; libraryHaskellDepends = [ base bytestring http-media servant yaml ]; @@ -162163,8 +162665,8 @@ self: { }: mkDerivation { pname = "skylighting"; - version = "0.1.1.2"; - sha256 = "fb4ae79689b64d0749c6de9e16bcd9a31d8195b8ff4945b8e5bfa54140cfb0cf"; + version = "0.1.1.4"; + sha256 = "59323288062233fcd38fb6409b3565dd6ee1b2f676d21d56695bca5b35f3b2db"; libraryHaskellDepends = [ aeson base blaze-html bytestring case-insensitive containers directory filepath hxt mtl regex-pcre-builtin safe text utf8-string @@ -166018,8 +166520,8 @@ self: { }: mkDerivation { pname = "sproxy2"; - version = "1.93.0"; - sha256 = "162c72464a0e4d77201db79ed332d14832a8a145c19246aa64b7156360aadcc9"; + version = "1.94.0"; + sha256 = "3affef81be078269b7acbfa761d2e1fde761ee7b4e4fe6182a67e7278ae4a2cb"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -176379,8 +176881,8 @@ self: { }: mkDerivation { pname = "threepenny-gui"; - version = "0.7.0.0"; - sha256 = "287704d0943895b653381d2546acd3076b477d1ab4be78baaa88cbe816c7156e"; + version = "0.7.0.1"; + sha256 = "b5802dbb6c43304d613373f464d6fd16a4f219a5d289be003a28c2c46cae44c8"; libraryHaskellDepends = [ aeson async base bytestring containers data-default deepseq filepath hashable network-uri safe snap-core snap-server stm @@ -176409,20 +176911,22 @@ self: { }) {}; "thrift" = callPackage - ({ mkDerivation, attoparsec, base, binary, bytestring, containers - , ghc-prim, hashable, HTTP, network, network-uri, QuickCheck, split - , text, unordered-containers, vector + ({ mkDerivation, attoparsec, base, base64-bytestring, binary + , bytestring, containers, ghc-prim, hashable, hspec, HTTP, network + , network-uri, QuickCheck, split, text, unordered-containers + , vector }: mkDerivation { pname = "thrift"; - version = "0.9.3"; - sha256 = "dd2cfeec5f6a7142407ccc5d361afc6c45e5c50813e4246ed91137efc5cfbe9f"; - revision = "1"; - editedCabalFile = "13842801b74f89050d801a7a9b3b535b27046d3ae5bde986456aeeb46c236777"; + version = "0.10.0"; + sha256 = "6706e64419eee8579b9e9330d8c210211c87c86e02c19a3ca856db47cc8c7d07"; libraryHaskellDepends = [ - attoparsec base binary bytestring containers ghc-prim hashable HTTP - network network-uri QuickCheck split text unordered-containers - vector + attoparsec base base64-bytestring binary bytestring containers + ghc-prim hashable HTTP network network-uri QuickCheck split text + unordered-containers vector + ]; + testHaskellDepends = [ + base bytestring hspec QuickCheck unordered-containers ]; homepage = "http://thrift.apache.org"; description = "Haskell bindings for the Apache Thrift RPC system"; @@ -179192,6 +179696,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "trifecta_1_6_2_1" = callPackage + ({ mkDerivation, ansi-terminal, ansi-wl-pprint, array, base + , blaze-builder, blaze-html, blaze-markup, bytestring, charset + , comonad, containers, deepseq, directory, doctest, filepath + , fingertree, ghc-prim, hashable, lens, mtl, parsers, profunctors + , QuickCheck, reducers, semigroups, transformers + , unordered-containers, utf8-string + }: + mkDerivation { + pname = "trifecta"; + version = "1.6.2.1"; + sha256 = "bab3724de8ed4f5283deb99013debf2e223e9e2c3c975e7d9b9bd44a9b30fbe5"; + libraryHaskellDepends = [ + ansi-terminal ansi-wl-pprint array base blaze-builder blaze-html + blaze-markup bytestring charset comonad containers deepseq + fingertree ghc-prim hashable lens mtl parsers profunctors reducers + semigroups transformers unordered-containers utf8-string + ]; + testHaskellDepends = [ + base directory doctest filepath parsers QuickCheck + ]; + homepage = "http://github.com/ekmett/trifecta/"; + description = "A modern parser combinator library with convenient diagnostics"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "trimpolya" = callPackage ({ mkDerivation, base, bio, bytestring, simpleargs }: mkDerivation { @@ -181338,8 +181869,8 @@ self: { }: mkDerivation { pname = "tz"; - version = "0.1.2.0"; - sha256 = "b501251a446d4fe544617eaa41e2442f283f8843dd57d52820d88a9e2ce04d70"; + version = "0.1.2.1"; + sha256 = "d187f59e0c1bb452a70cf734de09e0beefb86a6bcbb48f36fc5b32f11727c492"; libraryHaskellDepends = [ base binary bytestring containers data-default deepseq template-haskell time tzdata vector @@ -181375,6 +181906,28 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "tzdata_0_1_20161123_0" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, HUnit + , test-framework, test-framework-hunit, test-framework-th, unix + , vector + }: + mkDerivation { + pname = "tzdata"; + version = "0.1.20161123.0"; + sha256 = "cb99701d6b3ef7a286a9b15dd4fa3ed023917afeaebf4e90be7d9934464dccb6"; + libraryHaskellDepends = [ + base bytestring containers deepseq vector + ]; + testHaskellDepends = [ + base bytestring HUnit test-framework test-framework-hunit + test-framework-th unix + ]; + homepage = "https://github.com/nilcons/haskell-tzdata"; + description = "Time zone database (as files and as a module)"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "u2f" = callPackage ({ mkDerivation, aeson, asn1-encoding, asn1-types, base , base64-bytestring, binary, bytestring, cryptohash, cryptonite @@ -185173,8 +185726,8 @@ self: { ({ mkDerivation, base, deepseq, finite-typelits, vector }: mkDerivation { pname = "vector-sized"; - version = "0.5.0.0"; - sha256 = "55bb88f7201571b19b55f7ac1d1b2a880ad77b9178593bac84cad58c2dbce22b"; + version = "0.5.1.0"; + sha256 = "2116bd082413e6b3ceb2290ac7d3aa2affcbfc76c7bebe22fbbf58e562369ae5"; libraryHaskellDepends = [ base deepseq finite-typelits vector ]; homepage = "http://github.com/expipiplus1/vector-sized#readme"; description = "Size tagged vectors"; @@ -185240,15 +185793,15 @@ self: { }: mkDerivation { pname = "vector-split"; - version = "1.0.0.0"; - sha256 = "fda8504ecf87abddaec1fee84d746ed6925e5076ea8f02bcea296a78821b2bdc"; + version = "1.0.0.2"; + sha256 = "b4aeeea50fec52e594b2d3c05aca3a112b2095d1e5238ced065cecf2d89bbd16"; libraryHaskellDepends = [ base vector ]; testHaskellDepends = [ base QuickCheck split tasty tasty-quickcheck vector ]; - homepage = "https://github.com/fhaust/vector-split#readme"; - description = "Initial project template from stack"; - license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/fhaust/vector-split"; + description = "Combinator library for splitting vectors"; + license = stdenv.lib.licenses.mit; }) {}; "vector-static" = callPackage @@ -192223,18 +192776,17 @@ self: { }) {}; "xmonad-vanessa" = callPackage - ({ mkDerivation, base, containers, process, tibetan-utils, X11 - , xmonad, xmonad-contrib, xmonad-extras + ({ mkDerivation, base, containers, process, X11, xmonad + , xmonad-contrib, xmonad-extras }: mkDerivation { pname = "xmonad-vanessa"; - version = "0.1.0.1"; - sha256 = "795192ea6b9510512dd0e7cb1959b6d070089e0fd5c6896218f17af893447290"; + version = "0.1.0.2"; + sha256 = "40c23ebf4725488ef6548df811f7fe435d43860d6722cbb8bd59a4ea12f7c647"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers process tibetan-utils X11 xmonad xmonad-contrib - xmonad-extras + base containers process X11 xmonad xmonad-contrib xmonad-extras ]; executableHaskellDepends = [ base ]; homepage = "https://github.com/vmchale/xmonad-vanessa#readme"; @@ -193747,22 +194299,18 @@ self: { }) {}; "yesod-bootstrap" = callPackage - ({ mkDerivation, base, blaze-html, blaze-markup, conduit - , conduit-extra, containers, either, email-validate - , lens-family-core, lens-family-th, MonadRandom, mtl, persistent - , shakespeare, text, time, transformers, yaml, yesod-core - , yesod-form, yesod-markdown + ({ mkDerivation, base, blaze-html, blaze-markup, bootstrap-types + , shakespeare, text, transformers, yesod-core, yesod-elements }: mkDerivation { pname = "yesod-bootstrap"; - version = "0.3"; - sha256 = "e40a9276089146ebfdf2a95b2bc3372b1dca7fb29d9d269b39dd3f4528d3ed01"; + version = "0.4"; + sha256 = "8c5dbaa3aff6b2ab67fa98654daf4a885e03e4f8a380b461f5f3333871a92a91"; libraryHaskellDepends = [ - base blaze-html blaze-markup conduit conduit-extra containers - either email-validate lens-family-core lens-family-th MonadRandom - mtl persistent shakespeare text time transformers yaml yesod-core - yesod-form yesod-markdown + base blaze-html blaze-markup bootstrap-types shakespeare text + transformers yesod-core yesod-elements ]; + homepage = "https://github.com/andrewthad/haskell-bootstrap"; description = "Bootstrap widgets for yesod"; license = stdenv.lib.licenses.mit; }) {}; @@ -193771,8 +194319,8 @@ self: { ({ mkDerivation, base, colonnade, text, yesod-core }: mkDerivation { pname = "yesod-colonnade"; - version = "0.1"; - sha256 = "5e98908136715fadc3f46153bcc99c559affef85ed64bcde4bd2314e962dca79"; + version = "0.2"; + sha256 = "92a36ab103779aa8a541910456899fae8e8df6f4da27524200b54134c4b26a21"; libraryHaskellDepends = [ base colonnade text yesod-core ]; homepage = "https://github.com/andrewthad/colonnade#readme"; description = "Helper functions for using yesod with colonnade"; From b5a1783be79d2763c9e161b4e119e186bc6d1d26 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 1 Feb 2017 14:57:16 +0100 Subject: [PATCH 079/146] haskell-servant: update overrides for version 0.10 --- pkgs/development/haskell-modules/configuration-common.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5b8df262877..0266cbe5a37 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1097,13 +1097,13 @@ self: super: { http-api-data_0_3_5 = dontCheck super.http-api-data_0_3_5; # Fix build for latest versions of servant and servant-client. - servant_0_9_1_1 = super.servant_0_9_1_1.overrideScope (self: super: { + servant_0_10 = super.servant_0_10.overrideScope (self: super: { http-api-data = self.http-api-data_0_3_5; }); - servant-client_0_9_1_1 = super.servant-client_0_9_1_1.overrideScope (self: super: { + servant-client_0_10 = super.servant-client_0_10.overrideScope (self: super: { http-api-data = self.http-api-data_0_3_5; - servant-server = self.servant-server_0_9_1_1; - servant = self.servant_0_9_1_1; + servant-server = self.servant-server_0_10; + servant = self.servant_0_10; }); # build servant docs from the repository From 0a756a421623c2eefa35aab735850632ee463ae5 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 2 Feb 2017 11:04:49 +0100 Subject: [PATCH 080/146] asymptote: 2.38 -> 2.39 --- pkgs/tools/graphics/asymptote/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index 2d73a268038..b090ceca02b 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -8,11 +8,11 @@ let s = # Generated upstream information rec { baseName="asymptote"; - version="2.38"; + version="2.39"; name="${baseName}-${version}"; - hash="1dxwvq0xighqckkjkjva8s0igxfgy1j25z81pbwvlz6jzsrxpip9"; - url="mirror://sourceforge/project/asymptote/2.38/asymptote-2.38.src.tgz"; - sha256="1dxwvq0xighqckkjkjva8s0igxfgy1j25z81pbwvlz6jzsrxpip9"; + hash="187q81yw06x4gv2spfn0hcs1064ym3a8l6mdgawymfhqd60yhrs3"; + url="https://netcologne.dl.sourceforge.net/project/asymptote/2.39/asymptote-2.39.src.tgz"; + sha256="187q81yw06x4gv2spfn0hcs1064ym3a8l6mdgawymfhqd60yhrs3"; }; buildInputs = [ ghostscriptX imagemagick fftw From c726f790234e41ff64e4e7664cdb0521917b0125 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 2 Feb 2017 11:05:04 +0100 Subject: [PATCH 081/146] glusterfs: 3.9.0 -> 3.9.1 --- pkgs/tools/filesystems/glusterfs/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index 5f56b52ea26..e81c3768b25 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -6,11 +6,11 @@ let s = # Generated upstream information rec { baseName="glusterfs"; - version="3.9.0"; + version="3.9.1"; name="${baseName}-${version}"; - hash="057vq4f93f1g9sh1sfbqhccsprxrbhwwm898322x25sb8mscc5xl"; - url="http://download.gluster.org/pub/gluster/glusterfs/3.9/3.9.0/glusterfs-3.9.0.tar.gz"; - sha256="057vq4f93f1g9sh1sfbqhccsprxrbhwwm898322x25sb8mscc5xl"; + hash="02p3i1zr0i2fhjhz64wvhdn0z7b6b3hkiqz1bkyhracncspxnvw9"; + url="http://download.gluster.org/pub/gluster/glusterfs/3.9/3.9.1/glusterfs-3.9.1.tar.gz"; + sha256="02p3i1zr0i2fhjhz64wvhdn0z7b6b3hkiqz1bkyhracncspxnvw9"; }; buildInputs = [ fuse bison flex_2_5_35 openssl python2 ncurses readline From 2973d35b9acf8aafd90dce489c2a15b3a1527fec Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 2 Feb 2017 11:05:21 +0100 Subject: [PATCH 082/146] sysdig: 0.13.0 -> 0.14.0 --- pkgs/os-specific/linux/sysdig/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index abe1388e9a5..343e4e80955 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -2,14 +2,14 @@ let inherit (stdenv.lib) optional optionalString; baseName = "sysdig"; - version = "0.13.0"; + version = "0.14.0"; in stdenv.mkDerivation { name = "${baseName}-${version}"; src = fetchurl { url = "https://github.com/draios/sysdig/archive/${version}.tar.gz"; - sha256 = "0ghxj473v471nnry8h9accxpwwjp8nbzkgw8dniqld0ixx678pia"; + sha256 = "14wy4p1q8rk3q4s8vczfhkk20z3kz8wvyxpi8qx0xc7px7z5da76"; }; buildInputs = [ @@ -19,12 +19,6 @@ stdenv.mkDerivation { hardeningDisable = [ "pic" ]; patches = [ - # patch for linux >= 4.9.1 - # is included in the next release - (fetchpatch { - url = "https://github.com/draios/sysdig/commit/68823ffd3a76f88ad34c3d0d9f6fdf1ada0eae43.patch"; - sha256 = "02vgyd70mwrk6mcdkacaahk49irm6vxzqb7dfickk6k32lh3m44k"; - }) ]; postPatch = '' From c7ad684ab55f0aece1aeba8d850b6f207deeb71c Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 2 Feb 2017 11:10:05 +0100 Subject: [PATCH 083/146] mcabber: 1.0.4 -> 1.0.5 --- .../networking/instant-messengers/mcabber/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/pkgs/applications/networking/instant-messengers/mcabber/default.nix index ca752ccf826..2bb0d957942 100644 --- a/pkgs/applications/networking/instant-messengers/mcabber/default.nix +++ b/pkgs/applications/networking/instant-messengers/mcabber/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "mcabber-${version}"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { url = "http://mcabber.com/files/mcabber-${version}.tar.bz2"; - sha256 = "02nfn5r7cjpnacym95l6bvczii232v3x2gi79gfa9syc7w0brdk3"; + sha256 = "0ixdzk5b3s31a4bdfqgqrsiq7vbgdzhqr49p9pz9cq9bgn0h1wm0"; }; buildInputs = [ openssl ncurses pkgconfig glib loudmouth libotr gpgme ]; From 57e7f8ff66d77859db117bcdd8a3ff5eca529545 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 2 Feb 2017 11:10:54 +0100 Subject: [PATCH 084/146] libgphoto2: 2.5.11 -> 2.5.12 --- pkgs/development/libraries/libgphoto2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix index 6a7b747f7f9..c498871956a 100644 --- a/pkgs/development/libraries/libgphoto2/default.nix +++ b/pkgs/development/libraries/libgphoto2/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { owner = "gphoto"; repo = "libgphoto2"; rev = "${meta.tag}"; - sha256 = "01nirw0xb8fjjv0jz88bmddv26bgg82w1wg65q51iblmy9z8azfh"; + sha256 = "0chwnw3d2d1k8g4xidzkpy9f3ci30yz7yvxq1mipp2rbndl1y2am"; }; patches = []; @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { MTP, and other vendor specific protocols for controlling and transferring data from digital cameras. ''; - version = "2.5.11"; - tag = "libgphoto2-2_5_11-release"; + version = "2.5.12"; + tag = "libgphoto2-2_5_12-release"; # XXX: the homepage claims LGPL, but several src files are lgpl21Plus license = stdenv.lib.licenses.lgpl21Plus; platforms = with stdenv.lib.platforms; unix; From 5e753c1a65e106ffaeb71ad3fa66a13b2dfaf5d5 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 2 Feb 2017 11:09:40 +0100 Subject: [PATCH 085/146] imagemagick: 6.9.7-0 -> 6.9.7-6 for multiple CVEs Fixes at least: * CVE-2016-10144 * CVE-2016-10145 * CVE-2016-10146 * CVE-2017-5506 * CVE-2017-5507 * CVE-2017-5508 * CVE-2017-5510 * CVE-2017-5511 --- pkgs/applications/graphics/ImageMagick/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 3364a661e0c..58a88e89681 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -12,8 +12,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "6.9.7-0"; - sha256 = "0c6ff1am2mhc0dc26h50l78yx6acwqymwpwgkxgx69cb6jfpwrdx"; + version = "6.9.7-6"; + sha256 = "17pc3xz8srb9g5a5gkk6q9sjiss77fgm0wxxfmb5qya4rqivjpzn"; patches = []; } # Freeze version on mingw so we don't need to port the patch too often. From 4dae4f86faed8150a922dd9ee618d7d937b155ac Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 2 Feb 2017 11:10:56 +0100 Subject: [PATCH 086/146] imagemagick: 7.0.4-0 -> 7.0.4-6 for multiple CVEs Fixes at least: * CVE-2016-10144 * CVE-2016-10145 * CVE-2016-10146 * CVE-2017-5506 * CVE-2017-5507 * CVE-2017-5508 * CVE-2017-5510 * CVE-2017-5511 --- pkgs/applications/graphics/ImageMagick/7.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index f5c475ef93a..2ee7f3bb160 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -12,8 +12,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "7.0.4-0"; - sha256 = "0hfkdvfl60f9ksh07c06cpq8ib05apczl767yyvc671gd90n11ds"; + version = "7.0.4-6"; + sha256 = "1nm0hjijwhcp6rzcn7zksp2820dxvj4lmblj7kzpzd3s1ds09q0y"; patches = []; }; in From 2a63aae2996aca338e9a8491a794a010e6608b79 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 2 Feb 2017 11:13:04 +0100 Subject: [PATCH 087/146] nlohmann_json: 2.0.7 -> 2.1.0 --- pkgs/development/libraries/nlohmann_json/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nlohmann_json/default.nix b/pkgs/development/libraries/nlohmann_json/default.nix index 15ddbdaedef..a5a808c1f61 100644 --- a/pkgs/development/libraries/nlohmann_json/default.nix +++ b/pkgs/development/libraries/nlohmann_json/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "nlohmann_json-${version}"; - version = "2.0.7"; + version = "2.1.0"; src = fetchFromGitHub { owner = "nlohmann"; repo = "json"; rev = "v${version}"; - sha256 = "03jklvlcsms09p79qz9piqrdy2vhn4rkwidwfgq6cpxm6anqyqjh"; + sha256 = "116309lx77m31x4krln0g7mra900g0knk9lbkxbpxnmamkagjyl9"; }; nativeBuildInputs = [ cmake ]; @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { doCheck = true; checkTarget = "test"; + enableParallelBuilding = true; + crossAttrs = { cmakeFlags = "-DBuildTests=OFF"; doCheck = false; From 4d5c39611c57ea028d0869c084fe5df08cc688d2 Mon Sep 17 00:00:00 2001 From: Pradeep Chhetri Date: Wed, 1 Feb 2017 09:08:01 +0530 Subject: [PATCH 088/146] consul-template: 0.14.0 -> 0.18.0 --- pkgs/tools/system/consul-template/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/consul-template/default.nix b/pkgs/tools/system/consul-template/default.nix index 772c7e6d34b..ad7222a67e5 100644 --- a/pkgs/tools/system/consul-template/default.nix +++ b/pkgs/tools/system/consul-template/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "consul-template-${version}"; - version = "0.14.0"; + version = "0.18.0"; rev = "v${version}"; goPackagePath = "github.com/hashicorp/consul-template"; @@ -11,6 +11,14 @@ buildGoPackage rec { inherit rev; owner = "hashicorp"; repo = "consul-template"; - sha256 = "15zsax44g3dwjmmm4fpb54mvsjvjf3b6g3ijskgipvhcy0d3j938"; + sha256 = "1a1r7jwv0d4l8bcjal9chvr871hmw0ljbihgjqasp6gvjg0hfbx6"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/hashicorp/consul-template/; + description = "Generic template rendering and notifications with Consul"; + platforms = platforms.linux ++ platforms.darwin; + license = licenses.mpl20; + maintainers = with maintainers; [ pradeepchhetri ]; }; } From b3e6bdbae5376d99e82a4dab673fba9bb0ba2e32 Mon Sep 17 00:00:00 2001 From: Matthew Maurer Date: Wed, 1 Feb 2017 02:26:26 -0500 Subject: [PATCH 089/146] chromium: 55.0.2883.87 -> 56.0.2924.76 --- .../browsers/chromium/upstream-info.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 2337cd51cbb..a7e9c0312da 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 = "00mq90h5kjj3x7asclp97x5mqy6pvcj0vqxcf77djlyjmsy1q10i"; - sha256bin64 = "1prmj546sp627crnjfj2sxprr6ahb59ajgqp8jwy4wiy1x5c3j88"; - version = "56.0.2924.28"; + sha256 = "0f1w9cba99s9hy6fdqkr39yhkay4kid72vdrgs4as5lwdci8xc6g"; + sha256bin64 = "13hfkkgqywjapz01q3cy0i3ick1s24qhpl40by21c38nwbqplivw"; + version = "56.0.2924.76"; }; dev = { - sha256 = "1dnqqlhdxawwy4zdk2p8zn6vg0cpi3hqpl9rf3j0xylvm3knr9a1"; - sha256bin64 = "1hnmca8jqvammsb3y847p2n9hm93129li5zfi5pacqizqlakmv3z"; - version = "57.0.2950.4"; + sha256 = "0vw9l66412b9zd8v5l0i518mvfwf313gvh1ywxkf48lpjpi03qwh"; + sha256bin64 = "1iagza9qjlr61149g6cmiak82898xrrhvk516xrssap2qkb6kyzp"; + version = "57.0.2987.19"; }; stable = { - sha256 = "0n0sp3f3cmac2lblzn3mjkkhm8p6vy34dafr0kpdz14w1lad66z8"; - sha256bin64 = "1cvp9fvdpd8qrl48lzs7f6k43bqd43gp0sbzz6h7yrpzw1c49r0m"; - version = "55.0.2883.87"; + sha256 = "0f1w9cba99s9hy6fdqkr39yhkay4kid72vdrgs4as5lwdci8xc6g"; + sha256bin64 = "1zy11y649nxs03xldcq8jcpwj0nb3sklmyh3cxw7fajzi739p2y3"; + version = "56.0.2924.76"; }; } From 1a5cdaf85a02729a25fb05635cf5a5a932b4a9a7 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 2 Feb 2017 11:28:12 +0100 Subject: [PATCH 090/146] fix evaluation --- pkgs/servers/inginious/default.nix | 4 ++-- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/inginious/default.nix b/pkgs/servers/inginious/default.nix index 113b297787b..ae3347c9671 100644 --- a/pkgs/servers/inginious/default.nix +++ b/pkgs/servers/inginious/default.nix @@ -4,14 +4,14 @@ with lib; let pythonPackages = python2Packages; - docker_1_7_2 = pythonPackages.docker.override rec { + docker_1_7_2 = pythonPackages.docker.overrideAttrs (oldAttrs: rec { name = "docker-py-1.7.2"; src = pkgs.fetchurl { url = "mirror://pypi/d/docker-py/${name}.tar.gz"; sha256 = "0k6hm3vmqh1d3wr9rryyif5n4rzvcffdlb1k4jvzp7g4996d3ccm"; }; - }; + }); webpy-custom = pythonPackages.web.override { name = "web.py-INGI"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7a17feccfe7..ecae4906ad1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -25431,7 +25431,7 @@ in { meta = { description = "Test utilities for code working with files and commands"; - license = with lib.licenses; [ mit ]; + license = licenses.mit; homepage = https://github.com/jupyter/testpath; }; }; From c1e29e237b9d25ef3826053749890fe949fcc59a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 2 Feb 2017 11:49:14 +0100 Subject: [PATCH 091/146] pythonPackages: rename fetchers - fetchpypi -> fetchPypi - fetchWheel and fetchTarball are no longer public https://github.com/NixOS/nixpkgs/commit/695ff0dc09b304f2e0575081c52189893c2f38bc#commitcomment-20711584 --- pkgs/top-level/python-packages.nix | 37 +++++++++++++++--------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ecae4906ad1..1880471bb58 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -37,30 +37,29 @@ let graphiteVersion = "0.9.15"; - fetchwheel = {pname, version, sha256, python ? "py2.py3", abi ? "none", platform ? "any"}: - # Fetch a wheel. By default we fetch an universal wheel. - # See https://www.python.org/dev/peps/pep-0427/#file-name-convention for details regarding the optional arguments. + fetchPypi = {format ? "setuptools", ... } @attrs: let - url = "https://files.pythonhosted.org/packages/${python}/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}-${python}-${abi}-${platform}.whl"; - in pkgs.fetchurl {inherit url sha256;}; + fetchWheel = {pname, version, sha256, python ? "py2.py3", abi ? "none", platform ? "any"}: + # Fetch a wheel. By default we fetch an universal wheel. + # See https://www.python.org/dev/peps/pep-0427/#file-name-convention for details regarding the optional arguments. + let + url = "https://files.pythonhosted.org/packages/${python}/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}-${python}-${abi}-${platform}.whl"; + in pkgs.fetchurl {inherit url sha256;}; - fetchtarball = {pname, version, sha256}: - # Fetch a tarball. - let - url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}.tar.gz"; - in pkgs.fetchurl {inherit url sha256;}; - - fetchpypi = {format ? "setuptools", ... } @attrs: - let - fetcher = (if format == "wheel" then fetchwheel - else if format == "setuptools" then fetchtarball + fetchSource = {pname, version, sha256}: + # Fetch a source tarball. + let + url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}.tar.gz"; + in pkgs.fetchurl {inherit url sha256;}; + fetcher = (if format == "wheel" then fetchWheel + else if format == "setuptools" then fetchSource else throw "Unsupported kind ${kind}"); in fetcher (builtins.removeAttrs attrs ["format"]); in { inherit python bootstrapped-pip pythonAtLeast pythonOlder isPy26 isPy27 isPy33 isPy34 isPy35 isPy36 isPyPy isPy3k mkPythonDerivation buildPythonPackage buildPythonApplication; - inherit fetchwheel fetchtarball fetchpypi; + inherit fetchPypi; # helpers @@ -6631,7 +6630,7 @@ in { name = "${pname}-${version}"; format = "wheel"; - src = fetchpypi { + src = fetchPypi { inherit pname version format; sha256 = "0a0685962ee5ac303f470acbb659f0f97aef5b9deb6b85d059691c706ef6e45e"; }; @@ -25424,7 +25423,7 @@ in { # ${python.interpreter} -m unittest discover #''; format = "wheel"; - src = fetchpypi { + src = fetchPypi { inherit pname version format; sha256 = "f16b2cb3b03e1ada4fb0200b265a4446f92f3ba4b9d88ace34f51c54ab6d294e"; }; @@ -30804,7 +30803,7 @@ EOF pname = "pandocfilters"; name = pname + "-${version}"; - src = fetchpypi{ + src = fetchPypi{ inherit pname version; sha256 = "ec8bcd100d081db092c57f93462b1861bcfa1286ef126f34da5cb1d969538acd"; }; From f08bbb90c0e55a7e36751d0d139fd16bd47af58f Mon Sep 17 00:00:00 2001 From: Pierre Radermecker Date: Thu, 2 Feb 2017 13:17:52 +0100 Subject: [PATCH 092/146] haskell-swagger2: don't haddock to fix haddock build error --- pkgs/development/haskell-modules/configuration-common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 0266cbe5a37..37d3373103a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -162,6 +162,7 @@ self: super: { shakespeare-js = dontHaddock super.shakespeare-js; shakespeare-text = dontHaddock super.shakespeare-text; swagger = dontHaddock super.swagger; # http://hydra.cryp.to/build/2035868/nixlog/1/raw + swagger2 = dontHaddock super.swagger2; wai-test = dontHaddock super.wai-test; zlib-conduit = dontHaddock super.zlib-conduit; From 98f8cd601709cbec17fd0a07409b19658869e62b Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Thu, 2 Feb 2017 08:00:49 -0500 Subject: [PATCH 093/146] elpa-packages: 2017-02-01 --- .../editors/emacs-modes/elpa-generated.nix | 25 ++++++++++++++----- 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index 9aa66d12fdc..817d7f62924 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -1021,10 +1021,10 @@ }) {}; let-alist = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "let-alist"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/let-alist-1.0.4.el"; - sha256 = "07312bvvyz86lf64vdkxg2l1wgfjl25ljdjwlf1bdzj01c4hm88x"; + url = "https://elpa.gnu.org/packages/let-alist-1.0.5.el"; + sha256 = "0r7b9jni50la1m79kklml11syg8d2fmdlr83pv005sv1wh02jszw"; }; packageRequires = [ emacs ]; meta = { @@ -1377,10 +1377,10 @@ }) {}; org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org"; - version = "20161224"; + version = "20170124"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-20161224.tar"; - sha256 = "0b10bjypn0w5ja776f8sxl1qpvb61iyz1n3c74jx6fqwypv7dmgi"; + url = "https://elpa.gnu.org/packages/org-20170124.tar"; + sha256 = "0mcnjwvily0xv1xl11dj18lg38llvrxja2j9mwn6vql8n5y1srxi"; }; packageRequires = []; meta = { @@ -1468,6 +1468,19 @@ license = lib.licenses.free; }; }) {}; + psgml = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + pname = "psgml"; + version = "1.3.4"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/psgml-1.3.4.tar"; + sha256 = "1pgg9g040zsnvilvmwa73wyrvv9xh7gf6w1rkcx57qzg7yq4yaaj"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/psgml.html"; + license = lib.licenses.free; + }; + }) {}; python = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "python"; From 89cbe137c333ea06eae48141b3a72d70e637e970 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Thu, 2 Feb 2017 08:01:16 -0500 Subject: [PATCH 094/146] melpa-stable-packages: 2017-02-01 Removals: ttrss - removed from melpa --- .../emacs-modes/melpa-stable-generated.nix | 346 +++++++++++------- 1 file changed, 205 insertions(+), 141 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index 125b53b2e08..2e546092c6b 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix @@ -1795,12 +1795,12 @@ auto-compile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, packed }: melpaBuild { pname = "auto-compile"; - version = "1.3.2"; + version = "1.4.0"; src = fetchFromGitHub { owner = "tarsius"; repo = "auto-compile"; - rev = "1526e59ea8aaa1738c53b24673d62605dbbb5c96"; - sha256 = "05bzknh0fhl22r2klqqrgs7wpx18p5kzwxmg916smbvyk1fzfgva"; + rev = "0cbebd8fd22c88a57a834797e4841900ea1bae1c"; + sha256 = "1sngafab6sssidz6w1zsxw8i6k4j13m0073lbmp7gq3ixsqdxbr7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e00dcd4f8c59c748cc3c85af1607dd19b85d7813/recipes/auto-compile"; @@ -4731,12 +4731,12 @@ company-ngram = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-ngram"; - version = "0.7.9"; + version = "0.8.0"; src = fetchFromGitHub { owner = "kshramt"; repo = "company-ngram"; - rev = "98491c830d0867c211b773818610ace51f243640"; - sha256 = "196c870n7d46n4yhppq5np8mn9i0i74aykkbfk33kr4mgilss4cw"; + rev = "d15182df3eac72b29772802759b77c9eafef5066"; + sha256 = "05108s2a3c857n9j3c34hdni3fyq149pva4m3f51lis4wqrm4zv7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/937e6a23782450525c4a90392c414173481e101b/recipes/company-ngram"; @@ -4842,12 +4842,12 @@ company-sourcekit = callPackage ({ company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sourcekit }: melpaBuild { pname = "company-sourcekit"; - version = "0.1.7"; + version = "0.2.0"; src = fetchFromGitHub { owner = "nathankot"; repo = "company-sourcekit"; - rev = "14d503d96fe595a688a3f162ae5739e4b08da24b"; - sha256 = "1ynyxrpl9qd2l60dpn9kb04zxgq748fffb0yj8pxvm9q3abblf3m"; + rev = "8ba62ac25bf533b7f148f333bcb5c1db799f749b"; + sha256 = "01dh0wdaydiai4v13r8g05rpiwqr5qqi34wif8vbk2mrr25wc7i9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/45969cd5cd936ea61fbef4722843b0b0092d7b72/recipes/company-sourcekit"; @@ -4965,22 +4965,22 @@ license = lib.licenses.free; }; }) {}; - composer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }: + composer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s, seq }: melpaBuild { pname = "composer"; - version = "0.0.7"; + version = "0.0.8"; src = fetchFromGitHub { owner = "zonuexe"; repo = "composer.el"; - rev = "47d840e03412da5db13ae2b962576f0166517581"; - sha256 = "1vw1im39c4jvsaw3ghvwvya9l5h7jiysfhry3p22gdng0l2n4008"; + rev = "2d16d3bb65c53e9e26f4b7b22ad38590a4a48ee1"; + sha256 = "1zxqqd12p1db75icbwbdj51fvp8zzhivi8ssnxda1r5y5crbiqdv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/39c5002f0688397a51b1b0c6c15f6ac07c3681bc/recipes/composer"; sha256 = "1gwgfbb0fqn87s7jscr9xy47h239wy74n3hgpk4i16p2g6qinpza"; name = "composer"; }; - packageRequires = [ emacs f request s ]; + packageRequires = [ emacs f request s seq ]; meta = { homepage = "https://melpa.org/#/composer"; license = lib.licenses.free; @@ -7847,12 +7847,12 @@ elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elfeed"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "a3b2acd760385a800f04652f15dfd0e7f825dfef"; - sha256 = "0a9xvfnp3pwh0q1k05q8xnray53a1aihqbxnnrfdfxx0s8rah90i"; + rev = "ac258aa1956a5ce29c1a50d7ce8b1da55cd23192"; + sha256 = "04y0l4rjsn21a5li43ixw4y9v9cxh26q1ix4zsy41l8wjzbn1hlz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed"; @@ -7868,12 +7868,12 @@ elfeed-web = callPackage ({ elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, simple-httpd }: melpaBuild { pname = "elfeed-web"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "a3b2acd760385a800f04652f15dfd0e7f825dfef"; - sha256 = "0a9xvfnp3pwh0q1k05q8xnray53a1aihqbxnnrfdfxx0s8rah90i"; + rev = "ac258aa1956a5ce29c1a50d7ce8b1da55cd23192"; + sha256 = "04y0l4rjsn21a5li43ixw4y9v9cxh26q1ix4zsy41l8wjzbn1hlz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web"; @@ -8096,15 +8096,15 @@ license = lib.licenses.free; }; }) {}; - elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, yasnippet }: + elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }: melpaBuild { pname = "elpy"; - version = "1.13.0"; + version = "1.14.1"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "elpy"; - rev = "5c900ff6b5524e216247f52ed4085734d815dacb"; - sha256 = "1h0k3nvxy84wjsiiwpxd8xnwnvbiqld26ndv6wmxqpwsjav186ik"; + rev = "9afc370f7044d4e5c5a47e7080b43468ff2a4e28"; + sha256 = "1ynranqi0lv9nhap4ydqns3znpqpc0q69qyb22i93pkd505ryyf8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy"; @@ -8116,6 +8116,7 @@ find-file-in-project highlight-indentation pyvenv + s yasnippet ]; meta = { @@ -8772,12 +8773,12 @@ eopengrok = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, s }: melpaBuild { pname = "eopengrok"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "youngker"; repo = "eopengrok.el"; - rev = "0bf07c636f8d29a98e9776243ec9496875ddff51"; - sha256 = "0pmawjfyihqygqz7y0nvyrs6jcvckqzkq9k6z6yanpvkd2x5g13x"; + rev = "11c99f7e1e2c1c7d70cbda496cb5b6c7f6e4082a"; + sha256 = "1c5kzq3h7gr0459z364dyq5m8vq0ydclw5wphqj9fyg28mxjj6ns"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2b87ea158a6fdbc6b4e40fd7c0f6814d135f8545/recipes/eopengrok"; @@ -8814,12 +8815,12 @@ epkg = callPackage ({ closql, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "epkg"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "emacscollective"; repo = "epkg"; - rev = "6e1d989fbfa357a7c268ea30fe8b3e3cefafc36d"; - sha256 = "0avlmqcbm07692ir5z04gy4klhyan3h25ni4l4k4p0dszjsqmdi0"; + rev = "f2daeceb98766914548bf9a3c8206ae64850e395"; + sha256 = "06j07j0gfg4ahjklxlk7m7w53arpl42ynf1diphqn02jy7ycdlh6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg"; @@ -9044,12 +9045,12 @@ erlang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erlang"; - version = "19.2.1"; + version = "19.2.2"; src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "bca5bf5a2d68a0e9ca681363a8943809c4751950"; - sha256 = "1bxksxp2ggzskmrzh4k66w27ckh77jjjriq85xfz52n963al9crr"; + rev = "51faafa9a20c4afa7944b8089b26f22c774bed19"; + sha256 = "0shy3ckxw9scsg3j8brzk5r3p0rdpfbr9ys7akmdp2pq88d867i9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -10303,12 +10304,12 @@ eziam-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eziam-theme"; - version = "0.1.1"; + version = "0.3"; src = fetchFromGitHub { owner = "thblt"; repo = "eziam-theme-emacs"; - rev = "794ff00f27c31c7b43b7dc62da6295cd9db36ad4"; - sha256 = "0j94k3bhynhrigk127b40ljqcdqsqa5gix5ds3b0hb38wfcq8byk"; + rev = "e0ca54afdec6eeaf275fa5130a90ed77b0b72277"; + sha256 = "1m64clhwcwwry76imqcwbsz1bm8blpqynzmpqwcsmhsjqp0yb620"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0411583bd4fdbe425eb07de98851136fa1eeb0/recipes/eziam-theme"; @@ -12353,12 +12354,12 @@ fxrd-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "fxrd-mode"; - version = "0.7"; + version = "0.8"; src = fetchFromGitHub { owner = "msherry"; repo = "fxrd-mode"; - rev = "f53240c92f80760fbfb2e0dcf2e68064145cec33"; - sha256 = "0yx4p081960zwgjlw9yiq4jkc7czfvwbsc8z20pg394lx9nkrgr5"; + rev = "8a1a0d5a08527ec8dee9bbe135803ed7ad297d9d"; + sha256 = "1yzw0fnlqilpx4xl84hpr75l86y9iiqyh13r1hskmwb79s2niw1m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/796eb6b2126ec616c0de6af6abb7598900557c12/recipes/fxrd-mode"; @@ -12605,12 +12606,12 @@ ghc = callPackage ({ fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "ghc"; - version = "5.6.0.0"; + version = "5.7.0.0"; src = fetchFromGitHub { owner = "DanielG"; repo = "ghc-mod"; - rev = "deef7036d06072fbccb6c17369ac7e28ad341482"; - sha256 = "1kq3ynnjs57pgs99a2m4hh6nc692lf8j9ydmn5wync75r2pyh0jc"; + rev = "c3d0a681a19261817cf928685f7b96878fe51e91"; + sha256 = "1d2hsfmshh29g5bvd701py9n421hmz49hk0zjx5m09s8znjkvgx3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ghc"; @@ -12794,12 +12795,12 @@ git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: melpaBuild { pname = "git-commit"; - version = "2.10.0"; + version = "2.10.1"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "9cc74bfc9804918d1b296424bc0fb0aca6d65a59"; - sha256 = "1dr4c0vv6mb1jmqg6s8yml58sg9yx3da1kqbsv97gv4vasd0s0dn"; + rev = "acba806a823977108bae60438466da71f773a7c8"; + sha256 = "1b1z700ngd2mchaw7w3h4bmywg5inrcsl2b0r8lcrz2di1hkxk6n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -13508,12 +13509,12 @@ go-impl = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: melpaBuild { pname = "go-impl"; - version = "0.13"; + version = "0.14"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-go-impl"; - rev = "1827d2efe1f6023cf3954c0056aaa531124c41c1"; - sha256 = "1rcqrsvw74lrzs03bg9zslmkf5ka4a3h06b5hhdgiv4iimapz5sq"; + rev = "69f0d0ef05771487e15abec500cd06befd171abf"; + sha256 = "1rmik6g3l9q1bqavmqx1fhcadz4pwswgfnkbaxl6c5b6g2sl26iq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aa1a0845cc1a6970018b397d13394aaa8147e5d0/recipes/go-impl"; @@ -13550,12 +13551,12 @@ go-playground = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, gotest, lib, melpaBuild }: melpaBuild { pname = "go-playground"; - version = "1.2"; + version = "1.3"; src = fetchFromGitHub { owner = "grafov"; repo = "go-playground"; - rev = "97be0b3a19d7b8476663c9b16148c4dfd9783cfe"; - sha256 = "0wz79iwcfql8kfq5q9b0fccj9590giqlzd2kzjaj0fl89n0sx9gq"; + rev = "eebb1fec2177bc85b746b948beac873a77bea4a2"; + sha256 = "0ixpcms4f0q8327jyp2k48x03vjxwmzdsq76vg4j0kmjs9dfad1v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/900aabb7bc2350698f8740d72a5fad69c9219c33/recipes/go-playground"; @@ -14333,6 +14334,27 @@ license = lib.licenses.free; }; }) {}; + hacker-typer = callPackage ({ async, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "hacker-typer"; + version = "1.0.1"; + src = fetchFromGitHub { + owner = "therockmandolinist"; + repo = "emacs-hacker-typer"; + rev = "de208bb6d69f6f45eca8522d41012c7f729b8c9f"; + sha256 = "0lhsj9j17sd43w96zk84ssfvk5q518znbp1zkb5znl2q7ky8cwrg"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/561661965a7a500f24671454b3b680816457e180/recipes/hacker-typer"; + sha256 = "0i9kkxcz0fz4yviksl3f0ggh9kpwr9sidg7945r46bmblni3f0j9"; + name = "hacker-typer"; + }; + packageRequires = [ async ]; + meta = { + homepage = "https://melpa.org/#/hacker-typer"; + license = lib.licenses.free; + }; + }) {}; hackernews = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "hackernews"; @@ -14671,12 +14693,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "bbdf2c18edc75478e2c7e8ee39b5c30dbb7bf42e"; - sha256 = "1qqyrqhsy7xacckg5faj45pvs0vpg242sp2073i5grvgb3l9lvqj"; + rev = "b54d937634986dbebe97c0283137bcde07ed2275"; + sha256 = "0cq4pcx0rn9kzf55pbad1lcn1xq58vcdng9sx50485wdxqr0bxzc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -14920,6 +14942,27 @@ license = lib.licenses.free; }; }) {}; + helm-codesearch = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: + melpaBuild { + pname = "helm-codesearch"; + version = "0.4.0"; + src = fetchFromGitHub { + owner = "youngker"; + repo = "helm-codesearch.el"; + rev = "e80e76e492f626659b88dbe362b11aa0a3b0a116"; + sha256 = "16njr3xcvpzg4x6qq2pwk80pca9pxhc6vjvfy3dzy4hi9nxryrs6"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0a992824e46a4170e2f0915f7a507fcb8a9ef0a6/recipes/helm-codesearch"; + sha256 = "1v21zwcyx73bc1lcfk60v8xim31bwdk4p06g9i4qag3cijdlli9q"; + name = "helm-codesearch"; + }; + packageRequires = [ cl-lib dash helm s ]; + meta = { + homepage = "https://melpa.org/#/helm-codesearch"; + license = lib.licenses.free; + }; + }) {}; helm-commandlinefu = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, json ? null, let-alist, lib, melpaBuild }: melpaBuild { pname = "helm-commandlinefu"; @@ -14944,12 +14987,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "bbdf2c18edc75478e2c7e8ee39b5c30dbb7bf42e"; - sha256 = "1qqyrqhsy7xacckg5faj45pvs0vpg242sp2073i5grvgb3l9lvqj"; + rev = "b54d937634986dbebe97c0283137bcde07ed2275"; + sha256 = "0cq4pcx0rn9kzf55pbad1lcn1xq58vcdng9sx50485wdxqr0bxzc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -19484,12 +19527,12 @@ live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "live-py-mode"; - version = "2.13.0"; + version = "2.14.0"; src = fetchFromGitHub { owner = "donkirkby"; repo = "live-py-plugin"; - rev = "469ed0ccf146deab8c2ebbb162be7be31709da0a"; - sha256 = "1qv6v27fjfq0h3i7d2nry752r9fwqf5llilngy5l3yimqddm2k4d"; + rev = "51b1e177f115ab527cc47baf98abe09d43d9a95f"; + sha256 = "0rcxrq3r4vbr9zb844andy1zj246gs8s1ksqp1f092fiiyqpllnx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode"; @@ -19778,12 +19821,12 @@ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "2.10.0"; + version = "2.10.1"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "9cc74bfc9804918d1b296424bc0fb0aca6d65a59"; - sha256 = "1dr4c0vv6mb1jmqg6s8yml58sg9yx3da1kqbsv97gv4vasd0s0dn"; + rev = "acba806a823977108bae60438466da71f773a7c8"; + sha256 = "1b1z700ngd2mchaw7w3h4bmywg5inrcsl2b0r8lcrz2di1hkxk6n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit"; @@ -19932,12 +19975,12 @@ magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "magit-popup"; - version = "2.10.0"; + version = "2.10.1"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "9cc74bfc9804918d1b296424bc0fb0aca6d65a59"; - sha256 = "1dr4c0vv6mb1jmqg6s8yml58sg9yx3da1kqbsv97gv4vasd0s0dn"; + rev = "acba806a823977108bae60438466da71f773a7c8"; + sha256 = "1b1z700ngd2mchaw7w3h4bmywg5inrcsl2b0r8lcrz2di1hkxk6n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup"; @@ -20538,22 +20581,22 @@ license = lib.licenses.free; }; }) {}; - meghanada = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }: + meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }: melpaBuild { pname = "meghanada"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "mopemope"; repo = "meghanada-emacs"; - rev = "04112dc5db30a98d2ec1dae41d8c6ed1c7aff0be"; - sha256 = "0f14b1h6zv0v8hn99bqmidndh36mrsckmcirrrffm591ksf4l0zd"; + rev = "6b1b514ca3424c08301325f99608510130365cd1"; + sha256 = "1pl65186k696mx6lm6lnn2jm86kwky780rph97cqb1dy506qpqxf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada"; sha256 = "10f1fxma3lqcyv78i0p9mjpi79jfjd5lq5q60ylpxqp18nrql1s4"; name = "meghanada"; }; - packageRequires = [ cl-lib company emacs flycheck yasnippet ]; + packageRequires = [ company emacs flycheck yasnippet ]; meta = { homepage = "https://melpa.org/#/meghanada"; license = lib.licenses.free; @@ -21968,12 +22011,12 @@ no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "no-littering"; - version = "0.5.3"; + version = "0.5.4"; src = fetchFromGitHub { owner = "tarsius"; repo = "no-littering"; - rev = "e161c328d248f861bb56991492182f20e60b6b41"; - sha256 = "0ka7gbiarhc1r8rynxq2vf0k5p4044bm1jc92ca1hav34mqfg2xp"; + rev = "87fffa1973376bd1837fcf84277cd16db9c96957"; + sha256 = "1nfllm98d0893wk49fkijc071pg3v3qmpy4apyppj88k6m58y573"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering"; @@ -23065,12 +23108,12 @@ org-journal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-journal"; - version = "1.11.2"; + version = "1.12.0"; src = fetchFromGitHub { owner = "bastibe"; repo = "org-journal"; - rev = "5f1445e9bafa252c8708b3bc223f30032f5ae82b"; - sha256 = "0aip4krrl5cyaa2agmmzipqw139zar3j6594vba93axalfdx9i9z"; + rev = "24313870fa682a53e7f3f916b0e853a731868886"; + sha256 = "0nc3jl7sgqc8swi89rdk1yapmqxp8vaxm7390iqxy7a1sng4jydh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/org-journal"; @@ -24214,12 +24257,12 @@ packed = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "packed"; - version = "1.0.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "tarsius"; repo = "packed"; - rev = "765cd52712f0daf40c45d169cc062b6bc94aa807"; - sha256 = "1kjcb6z08bj5ysxrykgz3x6bz2122yycpjhbv875ppc5ihls88xl"; + rev = "d2f01bffc987b226f618dda0663a1e233161518d"; + sha256 = "16xwgi0zkbbvkbxf0ld6g4xlfd95j45sca57h162wld6l27jrv4f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1ee9e95c00f791010f77720068a7f3cd76133a1c/recipes/packed"; @@ -25047,22 +25090,22 @@ license = lib.licenses.free; }; }) {}; - php-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "php-mode"; - version = "1.17.0"; + version = "1.18.1"; src = fetchFromGitHub { owner = "ejmr"; repo = "php-mode"; - rev = "f3201eebfebf1757cf6a636fe3c7a3b810ab6612"; - sha256 = "0pwhw59ki19f9rkgvvnjzhby67s0y9hpsrg6cwqxakjlm66w96q3"; + rev = "349b85c1a9c79505d218b43940470c862dcdff32"; + sha256 = "15mlzk7mvv3wfz73k30a7syb274myls6d44nibwg00r794drr57g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode"; sha256 = "1lc4d3fgxhanqr3b8zr99z0la6cpzs2rksj806lnsfw38klvi89y"; name = "php-mode"; }; - packageRequires = []; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/php-mode"; license = lib.licenses.free; @@ -26034,12 +26077,12 @@ protobuf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "protobuf-mode"; - version = "3.2.0pre2"; + version = "3.2.0"; src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "6eeb5c7d0fc84c9c5d562ae54b3bdc088ec62129"; - sha256 = "15mb2ybam1pnyig60zlspw0cn9wl5iwywp35fx67qvg9nadln11d"; + rev = "593e917c176b5bc5aafa57bf9f6030d749d91cd5"; + sha256 = "120g0bg7ichry74allgmqnh7k0z2sdnrrfklb58b7szzn4zcdz14"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -26622,12 +26665,12 @@ railscasts-reloaded-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "railscasts-reloaded-theme"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "thegeorgeous"; repo = "railscasts-reloaded-theme"; - rev = "de3fea4fdd32db6cbea124dfeb2fa4f213d79063"; - sha256 = "1kl3wn35pcyslggy5wxm81bjjsj3smzjsf54iy4y844iyf4mgp5j"; + rev = "318c9a812d53884da1a9d67206fcfd9ded4d320f"; + sha256 = "1al62r2fys6z1ja8zbh6yskprp1iq03l2jbnwbx8i3gd2w0ib7qk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9817851bd06cbae30fb8f429401f1bbc0dc7be09/recipes/railscasts-reloaded-theme"; @@ -27249,22 +27292,22 @@ license = lib.licenses.free; }; }) {}; - request = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + request = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "request"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "tkf"; repo = "emacs-request"; - rev = "efbe231346f368a3079bf185ce25997ac6104d9c"; - sha256 = "0rpw9is8sx2gmbc7l6mv5qdd0jrh497lyj5f0zx0lqwjl8imw401"; + rev = "a3d080e57eb8be606fbf39d1baff94e1b16e1fb8"; + sha256 = "0wyxqbb35yqf6ci47531lk32d6fppamx9d8826kdz983vm87him7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8d113615dde757a60ce91e156f0714a1394c4bfc/recipes/request"; sha256 = "0h4jqg98px9dqqvjp08vi2z1lhmk0ca59lnrcl96bi7gkkj3jiji"; name = "request"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/request"; license = lib.licenses.free; @@ -27273,12 +27316,12 @@ request-deferred = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "request-deferred"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "tkf"; repo = "emacs-request"; - rev = "efbe231346f368a3079bf185ce25997ac6104d9c"; - sha256 = "0rpw9is8sx2gmbc7l6mv5qdd0jrh497lyj5f0zx0lqwjl8imw401"; + rev = "a3d080e57eb8be606fbf39d1baff94e1b16e1fb8"; + sha256 = "0wyxqbb35yqf6ci47531lk32d6fppamx9d8826kdz983vm87him7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8d113615dde757a60ce91e156f0714a1394c4bfc/recipes/request-deferred"; @@ -27312,22 +27355,22 @@ license = lib.licenses.free; }; }) {}; - resize-window = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + resize-window = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "resize-window"; - version = "0.2.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "dpsutton"; repo = "resize-window"; - rev = "dec035ff44fdb743bb2dc82274114dc6ea1851f9"; - sha256 = "1ps9l6q6hgzzaywkig0gjjdlsir9avxghynzx9a3q6h0fpdkpgrj"; + rev = "27364959798de0f019da799975027842c07e7829"; + sha256 = "0x92s4cv9k566rc248zrcmh507df7d19p7b3vcfd0dlfpbqc0qnv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/601a8d8f9046db6c4d50af983a11fa2501304028/recipes/resize-window"; sha256 = "0h1hlj50hc97wxqpnmvg6w3qhdd9nbnb8r8v39ylv87zqjcmlp8l"; name = "resize-window"; }; - packageRequires = [ emacs ]; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/resize-window"; license = lib.licenses.free; @@ -28075,8 +28118,8 @@ src = fetchFromGitHub { owner = "ensime"; repo = "emacs-scala-mode"; - rev = "7e6300231143133252e6ed1f3d5c86ea4e625e33"; - sha256 = "081bw6gkrww7bqi7pwj4sifmqscr5sbpl3zl1rw86npv5fpyjq9j"; + rev = "730e16d254478d6f63f62cb04d47c137c9002f2d"; + sha256 = "1aq1bfv8jz53zp365awqk43ysjwkpj51pcy6fyp87j8bbb02mgq9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/564aa1637485192a97803af46b3a1f8e0d042c9a/recipes/scala-mode"; @@ -29347,6 +29390,27 @@ license = lib.licenses.free; }; }) {}; + socyl = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }: + melpaBuild { + pname = "socyl"; + version = "0.2.0"; + src = fetchFromGitHub { + owner = "nlamirault"; + repo = "socyl"; + rev = "09ea9d1ea02060ccdb17b80ad88f912c08045c5b"; + sha256 = "09zdknrg4ar38nbhvz4407x78i3lngmnrcijr7a4x1ybs5x61zis"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/774b3006f5b6b781594257f1d9819068becbbcc1/recipes/socyl"; + sha256 = "00b7x247cyjh4gci101fq1j6708vbcz1g9ls3845w863wjf6m5sz"; + name = "socyl"; + }; + packageRequires = [ dash pkg-info s ]; + meta = { + homepage = "https://melpa.org/#/socyl"; + license = lib.licenses.free; + }; + }) {}; solarized-theme = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "solarized-theme"; @@ -29452,22 +29516,22 @@ license = lib.licenses.free; }; }) {}; - sourcekit = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + sourcekit = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "sourcekit"; - version = "0.1.7"; + version = "0.2.0"; src = fetchFromGitHub { owner = "nathankot"; repo = "company-sourcekit"; - rev = "14d503d96fe595a688a3f162ae5739e4b08da24b"; - sha256 = "1ynyxrpl9qd2l60dpn9kb04zxgq748fffb0yj8pxvm9q3abblf3m"; + rev = "8ba62ac25bf533b7f148f333bcb5c1db799f749b"; + sha256 = "01dh0wdaydiai4v13r8g05rpiwqr5qqi34wif8vbk2mrr25wc7i9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/45969cd5cd936ea61fbef4722843b0b0092d7b72/recipes/sourcekit"; sha256 = "1lvk3m86awlinivpg89h6zvrwrdqa5ljdp563k3i4h9384w82pks"; name = "sourcekit"; }; - packageRequires = [ dash dash-functional emacs ]; + packageRequires = [ dash dash-functional emacs request ]; meta = { homepage = "https://melpa.org/#/sourcekit"; license = lib.licenses.free; @@ -30313,12 +30377,12 @@ swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "swift-mode"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "swift-mode"; - rev = "6cd2948589771d926e545d8cbe054705eebce18f"; - sha256 = "1zz5jv2qgcnhidyhnw3wbcpqb80jqqbs74kpa66assfigyvivyj6"; + rev = "42669da0b68bba2d12f9d5fc38f30def118bb999"; + sha256 = "0l7f7mm4a7qrw0i6fnakgy7payghjgmamln9ldbdx593hg1jjzr8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode"; @@ -31257,12 +31321,12 @@ toc-org = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "toc-org"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "snosov1"; repo = "toc-org"; - rev = "114dcc9813e2d8784b8c21165c95408c1b26d86e"; - sha256 = "084nqdrpzgg1qpbqgvi893iglmz9dk3r0vwqxjkyxa3z3a0f5v17"; + rev = "a0e8ca05e806e5074b8603985da7f18b92c15856"; + sha256 = "1sv9y5dln4ai9w3mgg8p4a3s05hflfqh0k7k8isjqikydbv85m2k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1305d88eca984a66039444da1ea64f29f1950206/recipes/toc-org"; @@ -31442,27 +31506,6 @@ license = lib.licenses.free; }; }) {}; - ttrss = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "ttrss"; - version = "1.7.5"; - src = fetchFromGitHub { - owner = "pedros"; - repo = "ttrss.el"; - rev = "3b1e34518294a1fa6fa29355fd4e141f3fcaf3b6"; - sha256 = "060jksd9aamqx1n4l0bb9v4icsf7cr8jkyw0mbhgyz32nmxh3v6g"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/d918a5aa26c890fd138323ac6a446c0722e8b4c6/recipes/ttrss"; - sha256 = "08921cssvwpq33w87v08dafi2rz2rl1b3bhbhijn4bwjqgxi9w7z"; - name = "ttrss"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://melpa.org/#/ttrss"; - license = lib.licenses.free; - }; - }) {}; tuareg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tuareg"; @@ -32204,6 +32247,27 @@ license = lib.licenses.free; }; }) {}; + virtualenvwrapper = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + melpaBuild { + pname = "virtualenvwrapper"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "porterjamesj"; + repo = "virtualenvwrapper.el"; + rev = "5649028ea0c049cb7dfa2105285dee9c00d189fb"; + sha256 = "1xcjjs394vlaz94xh52kqaq94gkbmmjqmxlg7wly8vfn9vh34mws"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/virtualenvwrapper"; + sha256 = "0rn5vwncx8z69xp8hspr06nzkf28l9flchpb2936c2nalmhx6m8i"; + name = "virtualenvwrapper"; + }; + packageRequires = [ dash s ]; + meta = { + homepage = "https://melpa.org/#/virtualenvwrapper"; + license = lib.licenses.free; + }; + }) {}; visible-mark = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "visible-mark"; @@ -33046,12 +33110,12 @@ with-editor = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "with-editor"; - version = "2.5.9"; + version = "2.5.10"; src = fetchFromGitHub { owner = "magit"; repo = "with-editor"; - rev = "2248a63f6eb6e7720881b508639d9a00d2db9ea0"; - sha256 = "0g5ch1a5myrmazxcbbak01q4k3x8yp3kbn73d2h26j2jmsqvdy1n"; + rev = "8ae3c7aed92842f5988671c1b3350c65c58857e0"; + sha256 = "1jy5jxkr99a9qp7abmncaphp0xd3y6m3fflvj3fq1wp33i3f7cfn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor"; From 711a22096cfd16582c4556fee7d18a9b38a2dcc6 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Thu, 2 Feb 2017 08:03:15 -0500 Subject: [PATCH 095/146] melpa-packages: 2017-02-01 Removals: meacupla-theme - removed from melpa rustfmt - removed from melpa ttrss - removed from melpa --- .../editors/emacs-modes/melpa-generated.nix | 1475 ++++++++++------- 1 file changed, 864 insertions(+), 611 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index 598143ab15c..49af6c23177 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -23,12 +23,12 @@ _0xc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "_0xc"; - version = "20161027.2140"; + version = "20170125.1953"; src = fetchFromGitHub { owner = "AdamNiederer"; repo = "0xc"; - rev = "1f449d3c08bc87fd82d23a3cab71abfe6debb401"; - sha256 = "0nh06xvngckr6didb1br2c8v15v1a0rrraqhal1xmpl6xg76fxc6"; + rev = "31890af88234e4e098f1c340a5990515b934c7f7"; + sha256 = "1yp3wm0h6rkzxw950fnhw310npn56s9vl294sw8nyij85s2hw5qk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fbb2c86a50a8df9a3967787fc10f33beab2c933/recipes/0xc"; @@ -127,12 +127,12 @@ abl-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "abl-mode"; - version = "20160823.314"; + version = "20170130.105"; src = fetchFromGitHub { owner = "afroisalreadyinu"; repo = "abl-mode"; - rev = "b6d32f5e711929e8a1a2249498a3156d86dcbff6"; - sha256 = "06lbpy75gli15gfabh38hhzr8c761j70igq2rvdvw78gacanblfi"; + rev = "478ad2570f763b63a7369cc9f243b4f952a546bf"; + sha256 = "0xcj8vr9fcxf6cpck5gdb7vddlsk4vswl0wdwmxv6rwv459j5war"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/70a52edb381daa9c4dcc9f7e511175b38fc141be/recipes/abl-mode"; @@ -380,8 +380,8 @@ src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "5b7d58c783f6453442570ae8cedd489a0659a58e"; - sha256 = "16bgzyrj5y4k43hm2hfn2bggiixap3samq69cxw8k376w8yqmsyh"; + rev = "3b5ce79b5ed80f9ce7ca1fa10f0c314516300d6b"; + sha256 = "1gxsixg2rp09myqrcq7plk84bhhd8aaz68a09xfsbdia41q3vaa7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/ac-emacs-eclim"; @@ -1444,12 +1444,12 @@ alda-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "alda-mode"; - version = "20170124.956"; + version = "20170125.1720"; src = fetchFromGitHub { owner = "jgkamat"; repo = "alda-mode"; - rev = "9921298b36de4ed621d370beb0633b322a3b83e4"; - sha256 = "011i3pfgjs9f181l7gp6yfw8z6pdrgw3rv4i8zq8yc7hrm721ffg"; + rev = "deeb659b1b1c6ec57a38875e9daf1f76f9b5c013"; + sha256 = "1z462b2cvfqz1pdrba89ag4v9mvw1dzsrzc219fz06f2xcpyz2v2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2612c494a2b6bd43ffbbaef88ce9ee6327779158/recipes/alda-mode"; @@ -1745,12 +1745,12 @@ android-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "android-mode"; - version = "20160408.523"; + version = "20170131.2347"; src = fetchFromGitHub { owner = "remvee"; repo = "android-mode"; - rev = "da93ff7d92bb5b9fcf52c755eb2389ef4c262829"; - sha256 = "1cg35nb4hhibsk9d6daszs2khadqb3gzyzaxjsykxsgmpfh27ikv"; + rev = "76711e73b459de1ee639a49733e4f3f245b8fb41"; + sha256 = "1z0pw5h5yqpszr07jg7hqlfphhy0g6p2hqjyd9ds68p987v35vz0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77633aa340803a433570327943fbe31b396f4355/recipes/android-mode"; @@ -2081,11 +2081,11 @@ anything = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "anything"; - version = "20170123.1543"; + version = "20170125.1710"; src = fetchgit { url = "http://repo.or.cz/r/anything-config.git"; - rev = "5a3f76a4fdd3a42b26e7d41d3a9738c86bf63b85"; - sha256 = "17yd7r8l3q57w2p156ly8068z247fva14k555fypnc5a884rdafw"; + rev = "9e2259fc779eef1a3e947e74cc7d301d1cea0ca6"; + sha256 = "1rl60k9imk5wma2xnx1s0av7rzgjjbaw7nkb539vwk4pwj1kmqqq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1700e86cb35617178f5d7c61c88718ac7849f9b/recipes/anything"; @@ -3029,12 +3029,12 @@ auto-compile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, packed }: melpaBuild { pname = "auto-compile"; - version = "20160711.1012"; + version = "20170130.1017"; src = fetchFromGitHub { owner = "tarsius"; repo = "auto-compile"; - rev = "1526e59ea8aaa1738c53b24673d62605dbbb5c96"; - sha256 = "05bzknh0fhl22r2klqqrgs7wpx18p5kzwxmg916smbvyk1fzfgva"; + rev = "0cbebd8fd22c88a57a834797e4841900ea1bae1c"; + sha256 = "1sngafab6sssidz6w1zsxw8i6k4j13m0073lbmp7gq3ixsqdxbr7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e00dcd4f8c59c748cc3c85af1607dd19b85d7813/recipes/auto-compile"; @@ -3050,12 +3050,12 @@ auto-complete = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "auto-complete"; - version = "20161029.643"; + version = "20170124.1845"; src = fetchFromGitHub { owner = "auto-complete"; repo = "auto-complete"; - rev = "297e2f77a35dba222c24dd2e3eb0a5d8d0d1ee09"; - sha256 = "0185d1dc0fld06fk5n77q06wrmrphffs9xz3a6c2clyxf8mfx2vy"; + rev = "2e83566ddfa758c69afe50b8a1c62a66f47471e3"; + sha256 = "1rkqjq7wr4aavg08i8mq13w85z14xdhfmpbipj5mhwlpyrrci4bk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/083fb071191bccd6feb3fb84569373a597440fb1/recipes/auto-complete"; @@ -3509,12 +3509,12 @@ auto-virtualenv = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, pyvenv, s }: melpaBuild { pname = "auto-virtualenv"; - version = "20161107.1001"; + version = "20170125.1117"; src = fetchFromGitHub { owner = "marcwebbie"; repo = "auto-virtualenv"; - rev = "d352bc4c9d76cb2e1680846f13bae940931d8380"; - sha256 = "1yb1g8xmh5mgkszcch2z7rzmrywl8zyyy7j8ff1agvz0ic4b9893"; + rev = "3826db66b417788e2b2eb138717255b1f52a55c3"; + sha256 = "12691m4z0zr3prmdhmjlpcx0ajj1ddrbj9gy827xmgr0vaqbr7b2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ccb91515d9a8195061429ed8df3471867d211f9a/recipes/auto-virtualenv"; @@ -4322,11 +4322,11 @@ }) {}; bbdb = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bbdb"; - version = "20161001.2212"; + version = "20170129.2224"; src = fetchgit { url = "git://git.savannah.nongnu.org/bbdb.git"; - rev = "2ee0d69610808f84b958f868c3268b75a24aced0"; - sha256 = "0azkjnspn97y0fx4k37spvmxxy7p3g106prcbkmsaqm8jkkxc0qj"; + rev = "8998b3416b36873f4e49454879f2eed20c31b384"; + sha256 = "086ivc9j7vninb46kzparg7zjmdsv346gqig6ki73889wym1m7xn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6b6801fe29cb6fb6183f0babf528375d14f966b3/recipes/bbdb"; @@ -4510,12 +4510,12 @@ bbyac = callPackage ({ browse-kill-ring, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bbyac"; - version = "20150316.301"; + version = "20170127.516"; src = fetchFromGitHub { owner = "baohaojun"; repo = "bbyac"; - rev = "8dc5a7c0ada7ac729a87343149970ced139bb659"; - sha256 = "1cdm4d6fjf3m495phynq0dzvv0wc0gfsw6fdq4d47iyxs0p4q2dl"; + rev = "4dfb1f7c7f0402a0abf45e00007edc2c7f98a25a"; + sha256 = "0vm83ccr9q93z4cvnrzz0al5rpxm8zh9yysn5lja6g2474nm01wy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4409df77dca17b3f9556666a62ee924cb8794364/recipes/bbyac"; @@ -4693,22 +4693,22 @@ license = lib.licenses.free; }; }) {}; - better-shell = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + better-shell = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "better-shell"; - version = "20160830.1451"; + version = "20170130.2222"; src = fetchFromGitHub { owner = "killdash9"; repo = "better-shell"; - rev = "1c0ddbba888b47fb5f66f5f39f5faee230bf207a"; - sha256 = "1q4dgrqsia3pbggl0yfjx013w2rm7wb4ddclybxqw5v56bvb8ldc"; + rev = "43e43d43f049d8eafb7508b5cd3cccbb2eac4a68"; + sha256 = "1s31rjfq50lh2d2bs7afzwqi2282d9kwl2vpf5r9q10dvc0xb4bp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc553c9fb6de69dafe9fbe44a955b307f4d9507f/recipes/better-shell"; sha256 = "1mr39xz8chnc28zw1rrw5yqf44v44pby7ki22yyz6rp1j5ishp4v"; name = "better-shell"; }; - packageRequires = [ cl-lib ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/better-shell"; license = lib.licenses.free; @@ -5176,12 +5176,12 @@ blog-admin = callPackage ({ cl-lib ? null, ctable, f, fetchFromGitHub, fetchurl, lib, melpaBuild, names, s }: melpaBuild { pname = "blog-admin"; - version = "20170110.751"; + version = "20170126.458"; src = fetchFromGitHub { owner = "CodeFalling"; repo = "blog-admin"; - rev = "f01c9ed030a85800b4ebdce8ec71b195db446ee9"; - sha256 = "1jlbxa9qw56rhqm72sqmz5isjmaidmh7p08vlbr8qsxi0kjaipv9"; + rev = "bcf4302dd158e6a7b9e4a57d739818987e039e76"; + sha256 = "0dc27df1cph67ygvsvjjskc21flsa055hzxc2j00sk5078gp7a9y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/blog-admin"; @@ -5322,7 +5322,7 @@ }) {}; bookmark-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "bookmark-plus"; - version = "20170123.921"; + version = "20170129.1207"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/bookmark+.el"; sha256 = "02akakw7zfjx8bjb3sjlf8rhbh1xzx00h3dz7cp84f7jy9xak5v1"; @@ -5941,12 +5941,12 @@ bui = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bui"; - version = "20170113.124"; + version = "20170125.14"; src = fetchFromGitHub { owner = "alezost"; repo = "bui.el"; - rev = "8d0c5e3dd6bcd11943dd23615be9b89367eabade"; - sha256 = "1h1jzpq1rq9jvvihq9n7agsdr86ppwgs38wmmi8qn6w2p99r6k5p"; + rev = "2742bd1cd9e232cac68d5843e05c043827a2669f"; + sha256 = "00v0v00izzy749h0l22z0g0df96g3s4rbn06dvdara7h01599v00"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/38b7c9345de75a707b4a73e8bb8e2f213e4fd739/recipes/bui"; @@ -6008,8 +6008,8 @@ src = fetchFromGitHub { owner = "EricCrosson"; repo = "bury-successful-compilation"; - rev = "565a6f9cad7f7d5ef161eb9c7f2305bae9971c02"; - sha256 = "0mirb3yvs4aq6n53lx690k06zllyzr29ms0888v5svjirxjazvh8"; + rev = "2b673a6df1513d976836087259e35384d94a9bed"; + sha256 = "11bhpad8h9pmmm84ps95wdnaxn76wz4wm4l04mhcps5fsj7x15by"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f66e2e23c7a1fa0ce6fa8a0e814242b7c46c299c/recipes/bury-successful-compilation"; @@ -6907,8 +6907,8 @@ src = fetchFromGitHub { owner = "cfengine"; repo = "core"; - rev = "f234413322b67688ded1073a9649a292178f1ac2"; - sha256 = "0wv5y3q4iypi9fwvkqmmv8xmlj2227rm6zyhaiq8hcphn0g1r04m"; + rev = "84c81f4701a2e8e8f8f5473377ae858dc9c40597"; + sha256 = "0wkz94al5jnavz5lpq5kr91yb2zqkini69i7zq1x91z6zy3i0wlr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style"; @@ -6944,11 +6944,11 @@ }) {}; cg = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cg"; - version = "20160801.615"; + version = "20170201.347"; src = fetchsvn { url = "http://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs"; - rev = "11953"; - sha256 = "1wbk9aslvcmwj3n28appdhl3p2m6jgrpb5cijij8fk0szzxi1hrl"; + rev = "11991"; + sha256 = "0lv9lsh1dnsmida4hhj04ysq48v4m12nj9yq621xn3i6s2qz7s1k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a275ee794b0aa30b1348bb3a984114eef8dfc808/recipes/cg"; @@ -7069,12 +7069,12 @@ cheatsheet = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cheatsheet"; - version = "20170124.330"; + version = "20170126.1350"; src = fetchFromGitHub { owner = "darksmile"; repo = "cheatsheet"; - rev = "5648341515ed1565aeb89c2dfdb63aa852ac8d08"; - sha256 = "16m7h5bbsaqlsdn27f1ljaqdmxxfnn1pc6dq6k5ggp8h9hwkpb4k"; + rev = "e4f8e0110167ea16a17a74517d1f10cb7ff805b8"; + sha256 = "1vy2qmx9872hfrfcycpsmy0si481rwv4q4gwiy8f2w04zb92szbn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0d2cd657fcadb2dd3fd12864fe94a3465f8c9bd7/recipes/cheatsheet"; @@ -7528,12 +7528,12 @@ cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }: melpaBuild { pname = "cider"; - version = "20170122.2028"; + version = "20170129.1941"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "cider"; - rev = "240c6ed236d98c7e27b8c85bd1fdb9e845882e8b"; - sha256 = "1kvph9f19m1hvkr27bc3n1fm5nwpwfl6kiz08l673pp0qxvgj965"; + rev = "eb1bc430288af6e666e385c634c434a863a4ef8b"; + sha256 = "137rkssq1gkf9djg0x5vwnsf8z64yvjigp05zkkxrdfwcgs2gria"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider"; @@ -7804,8 +7804,8 @@ version = "20170120.137"; src = fetchsvn { url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format"; - rev = "293003"; - sha256 = "1w7jd9qz2qd75jp1r44ynp9bj85cv5wzpqqhpi5rllyxh1i8g6cl"; + rev = "293835"; + sha256 = "13516xv7ypswhlarh4sd97sc17zar10snbmrcn14wd53jgxx440y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69e56114948419a27f06204f6fe5326cc250ae28/recipes/clang-format"; @@ -8007,15 +8007,15 @@ license = lib.licenses.free; }; }) {}; - clj-refactor = callPackage ({ cider, clojure-mode, dash, edn, emacs, fetchFromGitHub, fetchurl, hydra, inflections, lib, melpaBuild, multiple-cursors, paredit, s, yasnippet }: + 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 = "20170124.624"; + version = "20170126.118"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clj-refactor.el"; - rev = "735df406401c735de3448f8879a2b328571f73d2"; - sha256 = "089yfn6r9nlmbvsqbr9gkxg2b6903d1k9qim4jlcki4hip4xqkc2"; + rev = "0fb72efc1cb9a2a688e324e7fdc51f258a86e36d"; + sha256 = "0sibcrsygaxk60f2rrjbmsp7cjfgqkj7a40psal19nf1ygcy634y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3a2db268e55d10f7d1d5a5f02d35b2c27b12b78e/recipes/clj-refactor"; @@ -8025,7 +8025,6 @@ packageRequires = [ cider clojure-mode - dash edn emacs hydra @@ -8033,6 +8032,7 @@ multiple-cursors paredit s + seq yasnippet ]; meta = { @@ -8274,12 +8274,12 @@ clomacs = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "clomacs"; - version = "20161227.131"; + version = "20170128.850"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clomacs"; - rev = "6d8a3eb84f1c65724680f4a0dcef3d1d0a29f4e6"; - sha256 = "082y5acfxbbihfxvzbps9f6k5p08nnrk604yvpi2m8hkyspyy4cb"; + rev = "d35f139dfff1f0a7aafbc8ade36a97f894c29922"; + sha256 = "19zsz8yabs77zk0b2509g7rkgv3a1lkzgqyc7b80rqlpsrlki3d0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/345f9797e87e3f5f957c167a5e3d33d1e31b50a3/recipes/clomacs"; @@ -8421,12 +8421,12 @@ cmake-ide = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, levenshtein, lib, melpaBuild, seq }: melpaBuild { pname = "cmake-ide"; - version = "20161229.138"; + version = "20170130.451"; src = fetchFromGitHub { owner = "atilaneves"; repo = "cmake-ide"; - rev = "393d6e9affa6f9978600b6c0ef8a4fe8bf73d813"; - sha256 = "0lg6ky9h4a96w8mma668kxfv9dffw97h1swjq33cvhv5pp3p9rrr"; + rev = "7cea81b31d73e84084d4eec4134556f501911eaf"; + sha256 = "0q2zxnkr4l9dqf29rgc4877x6wmqx3j5q0ky2b77079mp160ljy4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17e8a8a5205d222950dc8e9245549a48894b864a/recipes/cmake-ide"; @@ -8446,8 +8446,8 @@ src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "3270f763b28195de83c8b762dba5fb366b714b30"; - sha256 = "1gjdidsgg73hciipnirnr6lp5xrx1kb72qkmx4hksvlfq4f6c9kh"; + rev = "2d357ea267a5ab0f54f7b411befbadc583dd41d7"; + sha256 = "08sz807iclkjav2fzrapc5h4m4nc7jb7k64ywar9dpq7944z7zkj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -8504,10 +8504,10 @@ }) {}; cmds-menu = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "cmds-menu"; - version = "20170102.917"; + version = "20170124.1824"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/cmds-menu.el"; - sha256 = "0zkqpv7n4idzqkayildxkgaqsy1rjkmsf5ppkjld3jk1j53kacfc"; + sha256 = "1mcrgfwpckrx0k82waqyd80x72mxzv42jg878rkycf4qpa0wxjh4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/de6366e4b3e72a5e68b960d6bf4bab2683ad6800/recipes/cmds-menu"; @@ -8877,12 +8877,12 @@ color-theme-buffer-local = callPackage ({ color-theme, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "color-theme-buffer-local"; - version = "20151012.1628"; + version = "20170125.2201"; src = fetchFromGitHub { owner = "vic"; repo = "color-theme-buffer-local"; - rev = "ca8470bc34c65a026a6bca1707d95240bfd019af"; - sha256 = "0gvc9jy34a8wvzwjpmqhshbx2kpk6ckmdrdj5v00iya7c4afnckx"; + rev = "faf7415c99e132094f1f09c6b6974ec118a18d87"; + sha256 = "1zk5clvkrq2grmm1bws2l5vbv1ycp41978bb902c563aws2rb8c0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e43060d80b3345ef4e8df9f5a9d66af8a44a9c41/recipes/color-theme-buffer-local"; @@ -9299,22 +9299,22 @@ license = lib.licenses.free; }; }) {}; - company-bibtex = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, regexp-opt }: + company-bibtex = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib }: melpaBuild { pname = "company-bibtex"; - version = "20161210.1223"; + version = "20170125.2135"; src = fetchFromGitHub { owner = "gbgar"; repo = "company-bibtex"; - rev = "9b236cb9527ec69d73101193e6b53ad6080ea333"; - sha256 = "19f6npkd4im9dp48h2kp2kw6d6pvw4i4qn404ca949z77v87ibjj"; + rev = "2cea36c24c35c1e9fafce7526781f119a48b5e82"; + sha256 = "0l4xnqhk3a4szwcfyw90naxasbca8nrnjhnaqiw8zyixhakdbhxz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7c366ac2949eae48766fce70a7b01bbada6fcc27/recipes/company-bibtex"; sha256 = "14s3hxm7avpw59v4sz0d3drjzin745rczp93rcv4s7i3a7kdmn30"; name = "company-bibtex"; }; - packageRequires = [ cl-lib company parsebib regexp-opt ]; + packageRequires = [ cl-lib company parsebib ]; meta = { homepage = "https://melpa.org/#/company-bibtex"; license = lib.licenses.free; @@ -9365,12 +9365,12 @@ company-coq = callPackage ({ cl-lib ? null, company, company-math, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "company-coq"; - version = "20161201.631"; + version = "20170110.1633"; src = fetchFromGitHub { owner = "cpitclaudel"; repo = "company-coq"; - rev = "20f3ede0ca3a90a68b700704bff830ca18598f73"; - sha256 = "0fdpxd2lh3y5iyhwphpcdv29bm5v8pcwhbj4xhbky7dn28kbl9c4"; + rev = "84eae262728392ae1d077e0435ebbd2e75c3bdeb"; + sha256 = "0cxvrlal884pmk7hf0c5dn0b93jd6wchag1a9vwh9x458hm9h4gy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f89e3097c654774981953ef125679fec0b5b7c9/recipes/company-coq"; @@ -9481,8 +9481,8 @@ src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "5b7d58c783f6453442570ae8cedd489a0659a58e"; - sha256 = "16bgzyrj5y4k43hm2hfn2bggiixap3samq69cxw8k376w8yqmsyh"; + rev = "3b5ce79b5ed80f9ce7ca1fa10f0c314516300d6b"; + sha256 = "1gxsixg2rp09myqrcq7plk84bhhd8aaz68a09xfsbdia41q3vaa7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/company-emacs-eclim"; @@ -9792,12 +9792,12 @@ company-ngram = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-ngram"; - version = "20161013.805"; + version = "20170129.1113"; src = fetchFromGitHub { owner = "kshramt"; repo = "company-ngram"; - rev = "98491c830d0867c211b773818610ace51f243640"; - sha256 = "196c870n7d46n4yhppq5np8mn9i0i74aykkbfk33kr4mgilss4cw"; + rev = "d15182df3eac72b29772802759b77c9eafef5066"; + sha256 = "05108s2a3c857n9j3c34hdni3fyq149pva4m3f51lis4wqrm4zv7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/937e6a23782450525c4a90392c414173481e101b/recipes/company-ngram"; @@ -9817,8 +9817,8 @@ src = fetchFromGitHub { owner = "travisbhartwell"; repo = "nix-emacs"; - rev = "89b9356d32b16e0dc0794c323a4661a01c3b83de"; - sha256 = "11pcp09z0vy6k81wghqq4rxlkfsc5bpgyacpl7bmxanj3qaa7ga5"; + rev = "ace629f7645d12778c96ff7b5cf4b1e41a98af29"; + sha256 = "11infdrdjc30kxvfg5rh1zn4idvkhf9s0c6v60qn441m1d5bnavq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6846c7d86e70a9dd8300b89b61435aa7e146be96/recipes/company-nixos-options"; @@ -9984,30 +9984,22 @@ license = lib.licenses.free; }; }) {}; - company-sourcekit = callPackage ({ company, dash, dash-functional, deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred, sourcekit }: + company-sourcekit = callPackage ({ company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sourcekit }: melpaBuild { pname = "company-sourcekit"; - version = "20170122.636"; + version = "20170126.353"; src = fetchFromGitHub { owner = "nathankot"; repo = "company-sourcekit"; - rev = "3286a0dceea6f68b155dd4608db3ccf555f00938"; - sha256 = "0xxwy5nahaafk5w3ybr1g898fiz6r7hjwr445z64v5pg862r8lkl"; + rev = "8ba62ac25bf533b7f148f333bcb5c1db799f749b"; + sha256 = "01dh0wdaydiai4v13r8g05rpiwqr5qqi34wif8vbk2mrr25wc7i9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/45969cd5cd936ea61fbef4722843b0b0092d7b72/recipes/company-sourcekit"; sha256 = "0hr5j1ginf43h4qf3fvsh3z53z0c7w5a9lhrvdwmlzj396qhqmzs"; name = "company-sourcekit"; }; - packageRequires = [ - company - dash - dash-functional - deferred - emacs - request-deferred - sourcekit - ]; + packageRequires = [ company dash dash-functional emacs sourcekit ]; meta = { homepage = "https://melpa.org/#/company-sourcekit"; license = lib.licenses.free; @@ -10163,12 +10155,12 @@ composer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s, seq }: melpaBuild { pname = "composer"; - version = "20161115.1102"; + version = "20170127.1745"; src = fetchFromGitHub { owner = "zonuexe"; repo = "composer.el"; - rev = "2ea50be23557ce50de2c5a517fcd4abc980969b1"; - sha256 = "0ir0a3i7bvnf80als7bwjvr604jvhpk0gwln88kqgksvy1bh1nky"; + rev = "2d16d3bb65c53e9e26f4b7b22ad38590a4a48ee1"; + sha256 = "1zxqqd12p1db75icbwbdj51fvp8zzhivi8ssnxda1r5y5crbiqdv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/39c5002f0688397a51b1b0c6c15f6ac07c3681bc/recipes/composer"; @@ -10477,12 +10469,12 @@ counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "counsel"; - version = "20170119.859"; + version = "20170201.726"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "75f9cebc6a44cc5aff51f403bae4774736ea52bd"; - sha256 = "09xdlgwl40cb9kf622nnadh0g14g78p78yqmxfgy1wm3vbp0id99"; + rev = "dbcee946f462e0fe2aa26f2a9e7ff4784c9e0e70"; + sha256 = "199wg32ai117zkww4nzanksvdvzhmnnrn4cmp7l74z8i18cn2j2p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; @@ -11021,12 +11013,12 @@ csharp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "csharp-mode"; - version = "20170111.1133"; + version = "20170127.1100"; src = fetchFromGitHub { owner = "josteink"; repo = "csharp-mode"; - rev = "bc6a4190194f27cba46aa019d62d5e602b6d891e"; - sha256 = "1xx9nls695gf6fd4dxqxgvcwvwvkwzw3gm5vnc74h3hcfk05msij"; + rev = "8ab3cc8d0143c878cab0f3424916cd9c0edc3217"; + sha256 = "1p1q56399bfmdmzm453y18wkvxva5i1glkd4s5173dswgw9kh2gg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/736716bbcfd9c9fb1d10ce290cb4f66fe1c68f44/recipes/csharp-mode"; @@ -11618,12 +11610,12 @@ dante = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "dante"; - version = "20170119.1319"; + version = "20170201.1425"; src = fetchFromGitHub { owner = "jyp"; repo = "dante"; - rev = "1220ad91d78abc57e191215d5985729f14c66c84"; - sha256 = "05ms8j4vm2qghq0w7w6vw9v74xb8i04fqzm35ndhp0fq1phrh47h"; + rev = "385dd8114bb9eaba44943f00f9f7aea71af7bf34"; + sha256 = "1jkdq9li3vqzdmmznpaxak7mf9y9vlk0abdb7ffzvvlry19dvgs8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante"; @@ -11828,12 +11820,12 @@ dart-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "dart-mode"; - version = "20161218.1548"; + version = "20170127.1652"; src = fetchFromGitHub { owner = "nex3"; repo = "dart-mode"; - rev = "e6635b390235cf16a8081763768cf925ca2d9133"; - sha256 = "1cwwwxmv7d1blv88c6nlm0z94gjfdgw2ri1libzyfzirincyicdx"; + rev = "b3808189cf6c5165499d3f67540f550e49b26aa2"; + sha256 = "1bs3p72gxlcviz0l2dl1h92708j0c3ly0kwpdbr370i2hdv0l8ys"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7d9cb763cb8e929d9442be8d06e9af02de90714a/recipes/dart-mode"; @@ -12393,12 +12385,12 @@ demo-it = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "demo-it"; - version = "20161103.1337"; + version = "20170126.739"; src = fetchFromGitHub { owner = "howardabrams"; repo = "demo-it"; - rev = "830a1f10982abe586c9d13685007d191eda6fbdc"; - sha256 = "0fkwzx681df0p4a8f2z6lh5j94vln0i6cvrfzym5v8cdhyhd0p80"; + rev = "f61f336c8c291208d9feef2ce495e8c659052f77"; + sha256 = "1wb7n4k2qwl3m7y22zag6rdzi1gqb8a5lj7crpkkn5ryycbxbbpi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1dec5877db00c29d81d76be0ee2504399bad9cc4/recipes/demo-it"; @@ -13079,12 +13071,12 @@ dired-launch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-launch"; - version = "20160914.756"; + version = "20170131.1740"; src = fetchFromGitHub { owner = "thomp"; repo = "dired-launch"; - rev = "8766ab5ed59b7b5105ca5818fa85004447ced1cb"; - sha256 = "13q1xd2ycs1c6ybizykzhb42x3j3mx2g9dxy8h1nr7bb7393hs64"; + rev = "acf8a3dec14e68934d7d7ef0b867e347ce5d81e9"; + sha256 = "0wsas576mk5n13wmb2rpazgys3sxgl3ds936gr8yy1sb43mv21r4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31c9a4945d65aa6afc371c447a572284d38d4d71/recipes/dired-launch"; @@ -13755,12 +13747,12 @@ dix = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dix"; - version = "20170123.523"; + version = "20170201.316"; src = fetchFromGitHub { owner = "unhammer"; repo = "dix"; - rev = "86880826a0cc878e2e5d50bc835eed5c8e2f001a"; - sha256 = "00qyzpqdw4im7c4bqqpiayv4kr9iqlm6mhsziazjvrjsvvi0p9ij"; + rev = "43a2d386b6c6c314db2a1ab8e772ee68d8256806"; + sha256 = "0qkh35widg3b6cfyv651xx9xyq35r7zjfygcp9wv3w3wcvxdaznk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/149eeba213b82aa0bcda1073aaf1aa02c2593f91/recipes/dix"; @@ -13780,8 +13772,8 @@ src = fetchFromGitHub { owner = "unhammer"; repo = "dix"; - rev = "86880826a0cc878e2e5d50bc835eed5c8e2f001a"; - sha256 = "00qyzpqdw4im7c4bqqpiayv4kr9iqlm6mhsziazjvrjsvvi0p9ij"; + rev = "43a2d386b6c6c314db2a1ab8e772ee68d8256806"; + sha256 = "0qkh35widg3b6cfyv651xx9xyq35r7zjfygcp9wv3w3wcvxdaznk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9dcceb57231bf2082154cab394064a59d84d3a5/recipes/dix-evil"; @@ -14225,12 +14217,12 @@ doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "doom-themes"; - version = "20170111.2138"; + version = "20170131.2109"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-doom-theme"; - rev = "bb1e7d7ad7bb8cfe3dccf6499076941a08169e9d"; - sha256 = "024am5z7ihibkr5pbavdybxdq9q1pnsxhnfppwlzl8kaijqmmzs4"; + rev = "2c843fd80d91bb7bd9de9a6bd820998689854fac"; + sha256 = "0dcln2z63j7wpz6yczpsfmhb68gvak7y66g56373fsv2i3n4ydz0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/73fd9f3c2352ea1af49166c2fe586d0410614081/recipes/doom-themes"; @@ -14673,7 +14665,7 @@ version = "20130120.1257"; src = fetchsvn { url = "http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/"; - rev = "1780132"; + rev = "1781330"; sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq"; }; recipeFile = fetchurl { @@ -15362,8 +15354,8 @@ src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "5b7d58c783f6453442570ae8cedd489a0659a58e"; - sha256 = "16bgzyrj5y4k43hm2hfn2bggiixap3samq69cxw8k376w8yqmsyh"; + rev = "3b5ce79b5ed80f9ce7ca1fa10f0c314516300d6b"; + sha256 = "1gxsixg2rp09myqrcq7plk84bhhd8aaz68a09xfsbdia41q3vaa7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/eclim"; @@ -15974,12 +15966,12 @@ ein = callPackage ({ cl-generic, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }: melpaBuild { pname = "ein"; - version = "20170119.927"; + version = "20170201.751"; src = fetchFromGitHub { owner = "millejoh"; repo = "emacs-ipython-notebook"; - rev = "3412470b61998613f0a2c724d6be6aa4604cb14e"; - sha256 = "12qm5x6kkaxgsf7y9i8zwak14bn33w2s4sla1hjpzs0mjhds5x8q"; + rev = "0ede9e7ef64017039748b8f47de4df834b0443ed"; + sha256 = "03fm7lhfzrhn4dddlhqx6v1dqfgz6rj352y0znnfdaskzychw1sa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein"; @@ -16037,12 +16029,12 @@ ejc-sql = callPackage ({ auto-complete, cider, clomacs, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spinner }: melpaBuild { pname = "ejc-sql"; - version = "20170120.901"; + version = "20170201.734"; src = fetchFromGitHub { owner = "kostafey"; repo = "ejc-sql"; - rev = "a7515139b396bffe9c329b6b69c8d0658ef4a564"; - sha256 = "19mqi20gyxmadlycizg6wpzxf7jbvsfnnisazf11m9nf5bc97avb"; + rev = "f9bb4917058a71f92f4a22703d90eecc17354d97"; + sha256 = "14s40q1jf73dql09a1mzpk2q14kl5m4x7y7j4iazh2lca9kf61lz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f2cd74717269ef7f10362077a91546723a72104/recipes/ejc-sql"; @@ -16083,8 +16075,8 @@ src = fetchFromGitHub { owner = "dimitri"; repo = "el-get"; - rev = "a6510f13c15d9811b51ccb1a96293bbe05162dbb"; - sha256 = "03i8ma0npxfixlbn4g5ffycpk1fagfjgsl4qg4hkrj9l0dmnm7qq"; + rev = "71717d7d3ac575045f215ab27dd8a86e80b44c9d"; + sha256 = "1k95szxx0f8ksa8lr8hs3rcyrg86whnv0x5pd8d3wnf1vxyhgcqs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get"; @@ -16163,12 +16155,12 @@ el-patch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "el-patch"; - version = "20170123.1735"; + version = "20170129.2111"; src = fetchFromGitHub { owner = "raxod502"; repo = "el-patch"; - rev = "6dc16442ef309b04624c0cc0c64bf22c3d03d903"; - sha256 = "1zrngnc3rnwjr6hl16ilcy99sia702qawsv4b4n4vp5ybqqjcrnm"; + rev = "787b320080043de457a953f05915ed8e83334492"; + sha256 = "1ki15pl2snf3qvdcdjgfpsa48frksx3j5ygckaylfyrfs1yikp8q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2f4f57e0edbae35597aa4a7744d22d2f971d5de5/recipes/el-patch"; @@ -16514,12 +16506,12 @@ elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elfeed"; - version = "20170116.1128"; + version = "20170125.1905"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "3be3ff04438eec593f058d0f948dfc9f85a0ad47"; - sha256 = "1siviasw7863prsyxw7ggb0n71b32kzq647f60jnx75y69s05zds"; + rev = "caa3679a4af386c73d01cabf7c114a5abb40ea3d"; + sha256 = "0af65imbh2lp4i7n4k44pr5sl4035rh61zngn4fznwcgs6kjk7d4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed"; @@ -16584,12 +16576,12 @@ elfeed-web = callPackage ({ elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, simple-httpd }: melpaBuild { pname = "elfeed-web"; - version = "20161030.1731"; + version = "20170125.1846"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "3be3ff04438eec593f058d0f948dfc9f85a0ad47"; - sha256 = "1siviasw7863prsyxw7ggb0n71b32kzq647f60jnx75y69s05zds"; + rev = "caa3679a4af386c73d01cabf7c114a5abb40ea3d"; + sha256 = "0af65imbh2lp4i7n4k44pr5sl4035rh61zngn4fznwcgs6kjk7d4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web"; @@ -17025,12 +17017,12 @@ elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }: melpaBuild { pname = "elpy"; - version = "20161229.1103"; + version = "20170201.629"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "elpy"; - rev = "d93ad53fb55c1ff2cbbafcc8c85bddc30484bc80"; - sha256 = "1ii3p81hn84f155mywz906pnjkp5qca501qrplh96c5d0xkzz14l"; + rev = "ff0277013bf1319c72759d3f6eb001f2317cb52b"; + sha256 = "13wdw9y78gwdlz83zgbbhkmk2q3wvf569pgnlcpy330fxmalbj6v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy"; @@ -18092,12 +18084,12 @@ ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }: melpaBuild { pname = "ensime"; - version = "20170121.1214"; + version = "20170128.359"; src = fetchFromGitHub { owner = "ensime"; repo = "ensime-emacs"; - rev = "524d11e490094fa03d5c3a9dcdf0efa81f3d05c2"; - sha256 = "11br1hy1f4z9x674argdqb8sz1g0q9wzvi5hjh248w3v7lmvjzyh"; + rev = "ee16c7a91b9ac1585be287ecf94e4b20aaaea3f5"; + sha256 = "15ldbviaxd9nlb11c3aw7dnp8xxyldm67dmbnsv6f3rpafy1gmzv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime"; @@ -18205,12 +18197,12 @@ epkg = callPackage ({ closql, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "epkg"; - version = "20161231.850"; + version = "20170131.627"; src = fetchFromGitHub { owner = "emacscollective"; repo = "epkg"; - rev = "6e1d989fbfa357a7c268ea30fe8b3e3cefafc36d"; - sha256 = "0avlmqcbm07692ir5z04gy4klhyan3h25ni4l4k4p0dszjsqmdi0"; + rev = "f2daeceb98766914548bf9a3c8206ae64850e395"; + sha256 = "06j07j0gfg4ahjklxlk7m7w53arpl42ynf1diphqn02jy7ycdlh6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg"; @@ -18733,8 +18725,8 @@ src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "7400b93124572af795c8d7356e22e3bf1f1f2a09"; - sha256 = "1c494xrn26j0m9wx69pb1zqdhv4mnwjffp42y0irxf061jy3z1jp"; + rev = "2896c966d9456721a0b9c11dbd8a14c474a3ace0"; + sha256 = "0pk5847m8mxlsmhysd482wlr0lzbrs2svr9nkv6lghr4a4rg0l2p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -19418,12 +19410,12 @@ esup = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "esup"; - version = "20160818.2130"; + version = "20170125.43"; src = fetchFromGitHub { owner = "jschaf"; repo = "esup"; - rev = "7ab0f4cb39398528e7dee5200a7ccf7eb8f0a3db"; - sha256 = "1lcmim8vv04dgmmq8fznb9brvqsk78a4dclk5gkrxk63nli68d9m"; + rev = "a63ab0cd57a37317256b15a3f5f30c2b11d92c25"; + sha256 = "07bpcihmzaf7av2sbzs0pr0cw21xqr3nnalj3cwxv7d6yhc8g4qf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9d2948a42da5d4864404d2d11a924a4f235fc3b/recipes/esup"; @@ -20210,12 +20202,12 @@ evil-mc = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-mc"; - version = "20170113.19"; + version = "20170131.2119"; src = fetchFromGitHub { owner = "gabesoft"; repo = "evil-mc"; - rev = "d5b50be73b4288400d418abe86f92504081ea32d"; - sha256 = "13wvjif6479c1l6hvyhm7jhf41kdh4c56n4rmnncc9cw5z9z7fcb"; + rev = "3ab7942cec9bd8afbc64349ab24f9558934810d5"; + sha256 = "1nyak4vp0h2cjls12sqcgvk07iap6m88zrrlq65702jpcqp9hycj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96770d778a03ab012fb82a3a0122983db6f9b0c4/recipes/evil-mc"; @@ -20588,12 +20580,12 @@ evil-swap-keys = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-swap-keys"; - version = "20160909.1407"; + version = "20170125.452"; src = fetchFromGitHub { owner = "wbolster"; repo = "evil-swap-keys"; - rev = "54aed57b464905d18bfcf52e3d0e7e5f939aa133"; - sha256 = "03ii6hj226aq6qbhias41miyv59aij24byw8637dbhb68gpff8v1"; + rev = "1f137e85fc092cf5a1bd8abbd8e8fda0f4cd024b"; + sha256 = "0vx4gsyhcb050q8bh6d016ybjkji1mfpp9m000s4kq1k04nm4cwb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2abff8e3d54ac13c4fe90692a56437844accca25/recipes/evil-swap-keys"; @@ -21132,12 +21124,12 @@ eziam-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eziam-theme"; - version = "20170124.340"; + version = "20170130.834"; src = fetchFromGitHub { owner = "thblt"; repo = "eziam-theme-emacs"; - rev = "e30ce488c6e2f9899af584bf637f436fc3fa4ec2"; - sha256 = "1nqdnzn5qc6i5bnnd0raxilnpggfgmskz120nhs7y5j0zhipvrgk"; + rev = "97e2b9d551e92d47a5baf78d6b5399e45eea2ae8"; + sha256 = "0pxxzb2szp0bw7ayj65yfzy5h59dci541k7fs5m7xkzakyyx0b8i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0411583bd4fdbe425eb07de98851136fa1eeb0/recipes/eziam-theme"; @@ -21270,12 +21262,12 @@ faceup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "faceup"; - version = "20150215.1348"; + version = "20170126.1305"; src = fetchFromGitHub { owner = "Lindydancer"; repo = "faceup"; - rev = "70fa6be83768adf78f20425d0d76fe809dc44d79"; - sha256 = "0sjmjydapfnv979dx8dwiz67wffamiaf41s4skkwa0wn2h4p6wja"; + rev = "688b487ad0a78c8707c5aded50e1d85551270034"; + sha256 = "1wmmj69wgzgac5y7gnrz84dvwjzd45h3rr434vv4dxnam0j0lj40"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a10bf2928b93c3908e89ca8ad9649bb468ebca05/recipes/faceup"; @@ -21786,10 +21778,10 @@ }) {}; find-dired-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "find-dired-plus"; - version = "20170101.938"; + version = "20170127.943"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/find-dired+.el"; - sha256 = "1ll1qr9kkx3fy0j7s5zz95gwsfj0j925cgkcs5ic5rds474881q0"; + sha256 = "1d0h5bcvk6x20apkvi8ywq961y9zvs4qj8p4n9n8yhm5sznrksyc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c8f884334b7eb83647146e7e8be028935ba12ce/recipes/find-dired+"; @@ -22846,6 +22838,27 @@ license = lib.licenses.free; }; }) {}; + flycheck-dialyxir = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + melpaBuild { + pname = "flycheck-dialyxir"; + version = "20170124.2319"; + src = fetchFromGitHub { + owner = "aaronjensen"; + repo = "flycheck-dialyxir"; + rev = "7e79dc33a12b8aded7a86d64d302072eed522cb4"; + sha256 = "1ylg8v1khh2bph6hscib7diw039z0nxfh28b9mhgyi6s33jyq618"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/fa49551b8f726c235e03ea377bb09a8be37b9f32/recipes/flycheck-dialyxir"; + sha256 = "0pacxidpgwp7wij17c5r0fm5w3nga3lp4mcim365k3y5r4ralc0c"; + name = "flycheck-dialyxir"; + }; + packageRequires = [ flycheck ]; + meta = { + homepage = "https://melpa.org/#/flycheck-dialyxir"; + license = lib.licenses.free; + }; + }) {}; flycheck-dialyzer = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-dialyzer"; @@ -22888,6 +22901,27 @@ license = lib.licenses.free; }; }) {}; + flycheck-dogma = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + melpaBuild { + pname = "flycheck-dogma"; + version = "20170124.2321"; + src = fetchFromGitHub { + owner = "aaronjensen"; + repo = "flycheck-dogma"; + rev = "7e14207a7da67dc5524a8949cb37a3d11de1db6e"; + sha256 = "1f3wn48am7920s6pm7ds1npfbj1w2pb8k790rl79rvc398g1pyyr"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1dd7601c55206fd0b9b59f98e861c52b9d640278/recipes/flycheck-dogma"; + sha256 = "0mpmmz0ssdd3a4fnqzy5kf9r3ddcs9kcl0chhilkw5k8480j3dcy"; + name = "flycheck-dogma"; + }; + packageRequires = [ flycheck ]; + meta = { + homepage = "https://melpa.org/#/flycheck-dogma"; + license = lib.licenses.free; + }; + }) {}; flycheck-elixir = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-elixir"; @@ -22951,22 +22985,22 @@ license = lib.licenses.free; }; }) {}; - flycheck-flow = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + flycheck-flow = callPackage ({ fetchFromGitHub, fetchurl, flycheck, json ? null, lib, melpaBuild }: melpaBuild { pname = "flycheck-flow"; - version = "20161123.136"; + version = "20170126.1007"; src = fetchFromGitHub { owner = "lbolla"; repo = "emacs-flycheck-flow"; - rev = "0748aa26a03437d36bf7083e6fc1af8f382dd1a3"; - sha256 = "1mmgahrq0v77i9w95jcg2n3aqqrvzd2s4w3b2mr70i23wq5y5wqy"; + rev = "da2d0834e1d7b2f1157f579e3ee157db325caae7"; + sha256 = "0nsi5km1f0p6l25i4kylvnzfxz4wi9108k2zsspfshw3b6bbk7mf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4d18fb21d8ef9b33aa84bc26f5918e636c5771e5/recipes/flycheck-flow"; sha256 = "0p4vvk09vjgk98dwzr2qzldvij3v6af56pradssi6sm3shbqhkk3"; name = "flycheck-flow"; }; - packageRequires = [ flycheck ]; + packageRequires = [ flycheck json ]; meta = { homepage = "https://melpa.org/#/flycheck-flow"; license = lib.licenses.free; @@ -23308,22 +23342,22 @@ license = lib.licenses.free; }; }) {}; - flycheck-pkg-config = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + flycheck-pkg-config = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "flycheck-pkg-config"; - version = "20160610.1335"; + version = "20170129.1315"; src = fetchFromGitHub { owner = "Wilfred"; repo = "flycheck-pkg-config"; - rev = "6884b0636f4bfe5648d5f4e3db288b7643d91111"; - sha256 = "1b3b240hlr5jkfzbj814hiblp32r6bahqs1zjcj045pb7cg2cxxm"; + rev = "c85f543a682cdda1f8c9a2e255c8230257715cb4"; + sha256 = "02xv8w5pgsara2wf6zp6992n52a363kw2xiqdv5kcz8y1bxcliz1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b2e88f2f126c9ff8b4261d6adb4c0d8d3049f33/recipes/flycheck-pkg-config"; sha256 = "0w7h4fa4mv8377sdbkilqcw4b9qda98c1k01nxic7a8i3iyq02d6"; name = "flycheck-pkg-config"; }; - packageRequires = [ cl-lib dash s ]; + packageRequires = [ dash s ]; meta = { homepage = "https://melpa.org/#/flycheck-pkg-config"; license = lib.licenses.free; @@ -23542,12 +23576,12 @@ flycheck-swift = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-swift"; - version = "20160921.1921"; + version = "20170128.2149"; src = fetchFromGitHub { owner = "swift-emacs"; repo = "flycheck-swift"; - rev = "822d1415eabfd464adc52063f9c44da1c87f0ff9"; - sha256 = "0gf7cxrsrf62kamm4xy1fi4v264szm6qk607ifg4bi5dmdc10b0k"; + rev = "c6c416a1b7a7d346e5c040e4e4065abc68d3a844"; + sha256 = "0wa60i99jh0dsks30jssg7l17bcmr6jzkwmkjg8brl756p593zp5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fd99bea06079c4231363c37e3361bd9e5b1ba490/recipes/flycheck-swift"; @@ -23983,16 +24017,16 @@ flymake-lua = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flymake-lua"; - version = "20140310.230"; + version = "20170128.1754"; src = fetchFromGitHub { owner = "sroccaserra"; - repo = "emacs"; - rev = "ee23c427a8eb01773c87e215d0e61cd8b5b5fe76"; - sha256 = "1fz7kywp1y2nhp50b2v961wz604sw1gzqcid4k8igz9aii3ygxcv"; + repo = "flymake-lua"; + rev = "84589f20066921a5b79cf3a1f914a223a2552d2a"; + sha256 = "1f4nigl65g1g5w15ddf33ypk2b07xph964pkdq1bw81451vmvzhn"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/eece02633c870db4aacd7b0cd2b7f2424fa3f192/recipes/flymake-lua"; - sha256 = "0pa66ymhazcfgd9jmxizq5w2sgj008hph42wsa9ljr2rina1gai6"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/63889df90a8cd4a39871cc43ccc559eff7b8dd5f/recipes/flymake-lua"; + sha256 = "05q6bifr1ywirk6sdn0pr812nlrzsi79bpbgn6ay4jyzmhhfi9z0"; name = "flymake-lua"; }; packageRequires = []; @@ -24463,6 +24497,27 @@ license = lib.licenses.free; }; }) {}; + fn = callPackage ({ cl-lib ? null, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "fn"; + version = "20170130.1745"; + src = fetchFromGitHub { + owner = "troyp"; + repo = "fn.el"; + rev = "463cd9b82aec7c90a529a98c4fcad636069fd978"; + sha256 = "0pwic988mp4x0x1icklsvkxy8nw72ljz93j8s3cimmic7dslnmza"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6d2929604b6dd21d6cf425643927a9c216801dc1/recipes/fn"; + sha256 = "0cb98rxdb6sd0kws6bc4pa536kiyw3yk0hlfqcm3ps81hcgqjhhn"; + name = "fn"; + }; + packageRequires = [ cl-lib dash dash-functional emacs ]; + meta = { + homepage = "https://melpa.org/#/fn"; + license = lib.licenses.free; + }; + }) {}; focus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "focus"; @@ -24631,12 +24686,12 @@ font-lock-studio = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "font-lock-studio"; - version = "20141201.1658"; + version = "20170127.1251"; src = fetchFromGitHub { owner = "Lindydancer"; repo = "font-lock-studio"; - rev = "35d510e4b16939621d7200bf67021f773cdb4ae5"; - sha256 = "04n32rgdz7m24jji8p0j42zmf2r60sdbbr4mkr6435fqyvmdd20k"; + rev = "12c35967b31233e06946c70627aa3152dacfe261"; + sha256 = "0q0s6f5vi3sfifj7vq2nnsmgyyivp1sd3idk32858md5ri71qif0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8046fef1ac09cac1113dd5d0a6e1bf8e0c77bb1/recipes/font-lock-studio"; @@ -24998,6 +25053,27 @@ license = lib.licenses.free; }; }) {}; + frames-only-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: + melpaBuild { + pname = "frames-only-mode"; + version = "20170129.120"; + src = fetchFromGitHub { + owner = "davidshepherd7"; + repo = "frames-only-mode"; + rev = "5a2947d797a5d6f74d3a9c97f8c0ab6cff115b28"; + sha256 = "0y0sdjixaxvywrlp2sw51wnczhk51q1svl5aghbk9rkxpwv9ys9v"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1e628416ad9420b3ac5bbfacf930a86d98958ac8/recipes/frames-only-mode"; + sha256 = "17p04l16ghz9kk096xk37yjpi4rmla86gp7c8ysjf6q6nyh0608h"; + name = "frames-only-mode"; + }; + packageRequires = [ emacs seq ]; + meta = { + homepage = "https://melpa.org/#/frames-only-mode"; + license = lib.licenses.free; + }; + }) {}; framesize = callPackage ({ fetchFromGitHub, fetchurl, key-chord, lib, melpaBuild }: melpaBuild { pname = "framesize"; @@ -25159,8 +25235,8 @@ version = "20170107.626"; src = fetchgit { url = "git://factorcode.org/git/factor.git"; - rev = "1613bdfed2a35f97a49cb2a46dc100ececf8803e"; - sha256 = "02zlc9fcf2kb0k5c7v7s9nj2hnfjcmc1zk91i8l61fnn9ywmi076"; + rev = "39811fc7e745a7081b6e03b3743d36148f849f76"; + sha256 = "15ppa89x78wpbq5d8rnz0by74p82vfq2bwxxiwy3nxbmcdygzlf7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel"; @@ -25173,6 +25249,27 @@ license = lib.licenses.free; }; }) {}; + fuff = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: + melpaBuild { + pname = "fuff"; + version = "20170201.1515"; + src = fetchFromGitHub { + owner = "joelmo"; + repo = "fuff"; + rev = "d25e084f1f870046dd98b38de00d6ad468a91ebc"; + sha256 = "0xnjk59572m3hqbjfi8za59gw24hfhdss9pxapp764q81656dv36"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4d0fc6d19559a9ea1bb7fce0c26a2dd65fc71603/recipes/fuff"; + sha256 = "080a2lz6mv629c68z44qrrww080gy2iggfzajdq54rr8i23y14vf"; + name = "fuff"; + }; + packageRequires = [ seq ]; + meta = { + homepage = "https://melpa.org/#/fuff"; + license = lib.licenses.free; + }; + }) {}; full-ack = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "full-ack"; @@ -25359,12 +25456,12 @@ fxrd-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "fxrd-mode"; - version = "20170124.1428"; + version = "20170125.228"; src = fetchFromGitHub { owner = "msherry"; repo = "fxrd-mode"; - rev = "f53240c92f80760fbfb2e0dcf2e68064145cec33"; - sha256 = "0yx4p081960zwgjlw9yiq4jkc7czfvwbsc8z20pg394lx9nkrgr5"; + rev = "8a1a0d5a08527ec8dee9bbe135803ed7ad297d9d"; + sha256 = "1yzw0fnlqilpx4xl84hpr75l86y9iiqyh13r1hskmwb79s2niw1m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/796eb6b2126ec616c0de6af6abb7598900557c12/recipes/fxrd-mode"; @@ -25504,12 +25601,12 @@ geben = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "geben"; - version = "20170119.400"; + version = "20170125.1937"; src = fetchFromGitHub { owner = "ahungry"; repo = "geben"; - rev = "006e101f458a218891606e7b43bb69aa9fb2d4e1"; - sha256 = "0vc09k1mndd904yjijqpf38i06jkxwhrrhrq6lv75s66a3v2r52p"; + rev = "cf0a28c1f43c2d01f4b4a408de4f7a915b11076e"; + sha256 = "1hkdch2pj6vbj3j4hfazn2dvfhsgilqqn5r8m7ipj8sw1598rv0r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f8648609e160f7dcefe4a963e8b00475f2fff78/recipes/geben"; @@ -25567,12 +25664,12 @@ geiser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "geiser"; - version = "20170116.1834"; + version = "20170201.1455"; src = fetchFromGitHub { owner = "jaor"; repo = "geiser"; - rev = "46b4c82278029d7193176b72ed3f0d3b1fa8899a"; - sha256 = "16hvw10xg3nd8scybn95szppa1p5v30hdawxl1wzvafnfz83yf2r"; + rev = "166593c68b66276e36c7d91a9653bb1c44650afc"; + sha256 = "0r7m1blswgkm8zkb703ksa74jy296i1vj4rfq5lw2f4ixdvkyq2h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0fe32d24cedd5307b4cccfb08a7095d81d639a0/recipes/geiser"; @@ -26033,8 +26130,8 @@ src = fetchFromGitHub { owner = "10sr"; repo = "git-command-el"; - rev = "a2c192aa779f81a99a10f0eb6dd018f13b2ff949"; - sha256 = "1irqmypgc4l1jlzj4g65ihpic3ffnnkcg1hlysj7qpip5nbflqgl"; + rev = "dce465ca1cd80e16df0f8dce8e427a76e9edc3b7"; + sha256 = "0nnh5y0px7aa9yai9f149v7pjcjp7i3f35cfihs9n3r6bnrmgp4h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8a55d697bc95a7026c7788c13e4765e1b71075e3/recipes/git-command"; @@ -26050,12 +26147,12 @@ git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: melpaBuild { pname = "git-commit"; - version = "20170112.334"; + version = "20170128.745"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "85db4aeebd2c66604c031c91d3f6bf4ce72f3449"; - sha256 = "19b5fgwnb4m9v285jwdc72m9zgphkb3hassx4ks3zg6yij7g98hq"; + rev = "e34f4e8eb00f292e8c475489fa7caa286857a421"; + sha256 = "02kk093bg1vjnqfl3qy9h8zs50xzxbkay78qizav0h5myv4mjy10"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -26092,12 +26189,12 @@ git-dwim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-dwim"; - version = "20100718.1436"; + version = "20170126.414"; src = fetchFromGitHub { owner = "rubikitch"; repo = "emacs-git-dwim"; - rev = "ad488a48551f57fd2b36fdf59fe2c27c73aca2d9"; - sha256 = "12k0bh0mrwlkrsfhc0pm9b1xvdks20smarsmvzg4zi5060ds1pzg"; + rev = "485c732130686c2f28a026e385366006435394b9"; + sha256 = "0rcrsjx4ifa9y3rd5l4498kvqkh58zx21gl7mqp053jdsqqq1yrx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8e4328cae9b4759a75da0b26ea8b68821bc71af/recipes/git-dwim"; @@ -26327,8 +26424,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "git-modes"; - rev = "af4ff3222f38daa0d352afdf3d20741b4fab2e79"; - sha256 = "0nn5mj29airjacckzxkh4q12wnk2pq6mp1wlzxzxdwijmkk52dbr"; + rev = "0be857ef001adb9b58770bd4e70d3103d2557277"; + sha256 = "0b7c0dkrm7szvk83945ribdj5k9mxs7pmbillgh2b51rsrkk16rz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b4e2ddd2a80875afc0fc654052e6cbff2f3777f/recipes/gitattributes-mode"; @@ -26369,8 +26466,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "git-modes"; - rev = "af4ff3222f38daa0d352afdf3d20741b4fab2e79"; - sha256 = "0nn5mj29airjacckzxkh4q12wnk2pq6mp1wlzxzxdwijmkk52dbr"; + rev = "0be857ef001adb9b58770bd4e70d3103d2557277"; + sha256 = "0b7c0dkrm7szvk83945ribdj5k9mxs7pmbillgh2b51rsrkk16rz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/44a37f59b87f59a587f6681e7aadfabf137c98d7/recipes/gitconfig-mode"; @@ -26558,8 +26655,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "git-modes"; - rev = "af4ff3222f38daa0d352afdf3d20741b4fab2e79"; - sha256 = "0nn5mj29airjacckzxkh4q12wnk2pq6mp1wlzxzxdwijmkk52dbr"; + rev = "0be857ef001adb9b58770bd4e70d3103d2557277"; + sha256 = "0b7c0dkrm7szvk83945ribdj5k9mxs7pmbillgh2b51rsrkk16rz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/44a37f59b87f59a587f6681e7aadfabf137c98d7/recipes/gitignore-mode"; @@ -26890,12 +26987,12 @@ gnus-desktop-notify = callPackage ({ fetchFromGitHub, fetchurl, gnus ? null, lib, melpaBuild }: melpaBuild { pname = "gnus-desktop-notify"; - version = "20170104.1240"; + version = "20170130.543"; src = fetchFromGitHub { owner = "wavexx"; repo = "gnus-desktop-notify.el"; - rev = "6eea368514eb38bc36aee0bc5d948a214784a90c"; - sha256 = "1bakg8maf626r9q8b8j022s63gip90qpz97iz4x7h3s9055i1dxr"; + rev = "66bfa697c49973f3bbc47bcde2304b1f16d30309"; + sha256 = "1xa9bqr1pbdx8zan81d6phyv473ihlvm8lif594m630hn68b5yw9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/gnus-desktop-notify"; @@ -27181,12 +27278,12 @@ go-impl = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: melpaBuild { pname = "go-impl"; - version = "20170124.801"; + version = "20170125.752"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-go-impl"; - rev = "e5f8fd794282db7dfe5f740efd0764a5b5207035"; - sha256 = "0l7bh1a6vr3v2ii2v94b0ddqzj4wpg9jh8rf69zmablzv6ggcg4z"; + rev = "69f0d0ef05771487e15abec500cd06befd171abf"; + sha256 = "1rmik6g3l9q1bqavmqx1fhcadz4pwswgfnkbaxl6c5b6g2sl26iq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aa1a0845cc1a6970018b397d13394aaa8147e5d0/recipes/go-impl"; @@ -27223,12 +27320,12 @@ go-playground = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, gotest, lib, melpaBuild }: melpaBuild { pname = "go-playground"; - version = "20161227.1105"; + version = "20170126.1240"; src = fetchFromGitHub { owner = "grafov"; repo = "go-playground"; - rev = "8365cac2f5bc2a71c454fe60856da0f97745ef65"; - sha256 = "1pb5k05x02ccfk52rj97wbf5q2wrcrs60h7ds9j5ri4r1v6baflq"; + rev = "eebb1fec2177bc85b746b948beac873a77bea4a2"; + sha256 = "0ixpcms4f0q8327jyp2k48x03vjxwmzdsq76vg4j0kmjs9dfad1v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/900aabb7bc2350698f8740d72a5fad69c9219c33/recipes/go-playground"; @@ -27661,6 +27758,27 @@ license = lib.licenses.free; }; }) {}; + goose-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "goose-theme"; + version = "20160828.545"; + src = fetchFromGitHub { + owner = "thwg"; + repo = "goose-theme"; + rev = "acd017b50ab25a75fd1331eb3de66467e2042e9c"; + sha256 = "1mmdvjsgnwgs6akhyj96fgj30mz53djdq85dl5q4cmiznlbma7hy"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/818b526f3e633cf9922c011f3db5d3db7e17ee5d/recipes/goose-theme"; + sha256 = "18kfz61mhf8pvp3z5cdvjklla9p840p1dazylrgjb1g5hdwqw0n9"; + name = "goose-theme"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/goose-theme"; + license = lib.licenses.free; + }; + }) {}; gore-mode = callPackage ({ fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: melpaBuild { pname = "gore-mode"; @@ -27812,8 +27930,8 @@ src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "ba9e3f4422c2b82e0ce601ff43be4f419f06ac9a"; - sha256 = "07ajraqpkd9v5g2h84dqq6xa5384hywagwivl6b64bxjf3a3pp3l"; + rev = "0a28e595c8e9e99879e8d2f796e82c5a68202ff0"; + sha256 = "1raknv2iv4hxdv8c8vxwrf1q90b9q4b5vgkbhmcfv08ii6s5dxn5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -27850,12 +27968,12 @@ grab-mac-link = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "grab-mac-link"; - version = "20160625.2258"; + version = "20170131.254"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "grab-mac-link.el"; - rev = "e5a720d6aa173939c35cab836a31651b184c11e6"; - sha256 = "0pas60sib23vv1gkprp10jzksgchl5caqj565akg358a0iay7ax4"; + rev = "d428ce46eaf4243510955f05f0890250b74b1837"; + sha256 = "0zmvd6j21fynmyjzmychpghy23r800zmaj4naqz4jcand8skd79z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e4cc8a72a9f161f024ed9415ad281dbea5f07a18/recipes/grab-mac-link"; @@ -28465,12 +28583,12 @@ guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }: melpaBuild { pname = "guix"; - version = "20170119.311"; + version = "20170131.1037"; src = fetchFromGitHub { owner = "alezost"; repo = "guix.el"; - rev = "9cb08e77e840495786860ece37006d302ee79926"; - sha256 = "1z6cafmzfz8rlpwi9wgcvjb5wsq7ikdhr8jn4ykdkbqfkk1fp33f"; + rev = "fbb16f39951dbcb1f185cd24b07063e166a1cc2d"; + sha256 = "1pwq9yipycgn3v32yiz8r59g02z5l9hsab8ng3zbgrv42ivddd2j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix"; @@ -28588,6 +28706,27 @@ license = lib.licenses.free; }; }) {}; + hacker-typer = callPackage ({ async, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "hacker-typer"; + version = "20170131.822"; + src = fetchFromGitHub { + owner = "therockmandolinist"; + repo = "emacs-hacker-typer"; + rev = "809987b4da8b7350e42abf3783eaabd06c2ce559"; + sha256 = "137hkjfyx0nw7lql3snm8vfx35464g9jn901wc75p61777a7x970"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/561661965a7a500f24671454b3b680816457e180/recipes/hacker-typer"; + sha256 = "0i9kkxcz0fz4yviksl3f0ggh9kpwr9sidg7945r46bmblni3f0j9"; + name = "hacker-typer"; + }; + packageRequires = [ async ]; + meta = { + homepage = "https://melpa.org/#/hacker-typer"; + license = lib.licenses.free; + }; + }) {}; hackernews = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "hackernews"; @@ -29195,12 +29334,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "20170123.2253"; + version = "20170131.2356"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "6363905a78f101dd214d00bd9c0ca09d5b600d3e"; - sha256 = "1dvaypwxgkp98i5g95m1nzvj9wzr2w8gxdpibpalj05i9lrhi73i"; + rev = "74a0c4d17a970ebd2271453681d5633e55c3b00b"; + sha256 = "0id3zn627j7lfv0fqynvdr72r59ngbwrhg2sw8pq0jza4yhg9n4n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -29279,12 +29418,12 @@ helm-ag = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-ag"; - version = "20161203.523"; + version = "20170127.2155"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-helm-ag"; - rev = "997107a53abd3bda06d52e7021c87527c5747389"; - sha256 = "1fj2s5jfbaw948kww64k8ksxa6pxfpb30fx93x182bq6sl8fqlwg"; + rev = "c925ab0d3e50c100c7a1ffa54c724f39df1ae526"; + sha256 = "0m5cap2ssp2yklvxlrfp3p5admaz3qhhakh81743r4klgkxv0kdk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-ag"; @@ -29531,12 +29670,12 @@ helm-c-yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, yasnippet }: melpaBuild { pname = "helm-c-yasnippet"; - version = "20160823.611"; + version = "20170128.742"; src = fetchFromGitHub { owner = "emacs-jp"; repo = "helm-c-yasnippet"; - rev = "5bf2c2adc0afe38c17c7cbf8c5d8a0604c4ee51f"; - sha256 = "1yb4swbx1i90fbfhkcvbvqvnbbfing7cgxz1dcyfbnazkdlfryhh"; + rev = "65ca732b510bfc31636708aebcfe4d2d845b59b0"; + sha256 = "1cbafjqlzxbg19xfdqsinsh7afq58gkf44rsg1qxfgm8g6zhr7f8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2fc20598a2cd22efb212ba43159c6728f0249e5e/recipes/helm-c-yasnippet"; @@ -29594,12 +29733,12 @@ helm-cider = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, seq }: melpaBuild { pname = "helm-cider"; - version = "20170120.1913"; + version = "20170125.2048"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "helm-cider"; - rev = "a24ef274e382c1a158a76eae2570f1f007031cb8"; - sha256 = "062abfb4sfpcc6fx3nrf3j0bisglrhyrg7rxwhhcqm9jhalksmdl"; + rev = "9544babe63a14557594c5effc0b55db381776506"; + sha256 = "0g6z3xy6hf2xy68qqa03ai4rl6aa6hd1wd62jrpx1iimyxbxjfdw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31d3cd618f2ac88860d0b11335ff81b6e2973982/recipes/helm-cider"; @@ -29678,12 +29817,12 @@ helm-cmd-t = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-cmd-t"; - version = "20150823.1157"; + version = "20170125.659"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-cmd-t"; - rev = "684dfb764e0e3660c053cb465f115e21c5ee4f80"; - sha256 = "18d2fgxyij31rffh9qbgbaf42par9nami4pi1yfvbw9a5z5w2yxi"; + rev = "7fa3d4a9f7271512e54c5de999079b27c9eec6bf"; + sha256 = "06jdvkgnmwrgsdh9y2bwzdng7hy4331v3lh11jvdy4704w4khmak"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/helm-cmd-t"; @@ -29762,12 +29901,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "20170122.250"; + version = "20170131.754"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "6363905a78f101dd214d00bd9c0ca09d5b600d3e"; - sha256 = "1dvaypwxgkp98i5g95m1nzvj9wzr2w8gxdpibpalj05i9lrhi73i"; + rev = "74a0c4d17a970ebd2271453681d5633e55c3b00b"; + sha256 = "0id3zn627j7lfv0fqynvdr72r59ngbwrhg2sw8pq0jza4yhg9n4n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -30941,8 +31080,8 @@ src = fetchFromGitHub { owner = "travisbhartwell"; repo = "nix-emacs"; - rev = "89b9356d32b16e0dc0794c323a4661a01c3b83de"; - sha256 = "11pcp09z0vy6k81wghqq4rxlkfsc5bpgyacpl7bmxanj3qaa7ga5"; + rev = "ace629f7645d12778c96ff7b5cf4b1e41a98af29"; + sha256 = "11infdrdjc30kxvfg5rh1zn4idvkhf9s0c6v60qn441m1d5bnavq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6846c7d86e70a9dd8300b89b61435aa7e146be96/recipes/helm-nixos-options"; @@ -31189,12 +31328,12 @@ helm-projectile = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }: melpaBuild { pname = "helm-projectile"; - version = "20170113.209"; + version = "20170125.1815"; src = fetchFromGitHub { owner = "bbatsov"; repo = "helm-projectile"; - rev = "6d750dee69befb97bda1e8b6045973e5a5eca233"; - sha256 = "0dsc8k7qk24qvk8msxla9z3r4299rrcwmm4k5fslplh66h0b8z85"; + rev = "afb825b1eee559e11b0d950d4f3918d3a5663862"; + sha256 = "0nlmhzgcyv3xqzfgbj1fzkg8by5lsy0rq3wdr5m5riqh4nza5ahr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc4e3a5af7ba86d277c73a1966a91c87d3d855a/recipes/helm-projectile"; @@ -32947,12 +33086,12 @@ hledger-mode = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, popup }: melpaBuild { pname = "hledger-mode"; - version = "20170101.650"; + version = "20170201.858"; src = fetchFromGitHub { owner = "narendraj9"; repo = "hledger-mode"; - rev = "a9d6377b15999718462e96c079503594940507ef"; - sha256 = "163k8crlyvgzag9mwb8q5cx40jlislxz533yr7nkh3ks6ricsj31"; + rev = "95e07b837706d86792649299fc13790248248139"; + sha256 = "1gcq6cr3b502z1gjx57qkf65i74xklgbi7hxvgvywv2bzimwigxp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c656975c61396d8d4ded0f13ab52b17ccc238408/recipes/hledger-mode"; @@ -33737,7 +33876,7 @@ }) {}; icicles = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "icicles"; - version = "20170118.2321"; + version = "20170201.1015"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/icicles.el"; sha256 = "072pxihvwpj6zkzrgw8bq9z71mcx5f6xsjr95bm42xqh4ag2qq0x"; @@ -35250,6 +35389,27 @@ license = lib.licenses.free; }; }) {}; + inline-docs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "inline-docs"; + version = "20170130.1434"; + src = fetchFromGitHub { + owner = "stardiviner"; + repo = "inline-docs.el"; + rev = "4e94a62f6b02c37c1497f34b36fe36f04cc23405"; + sha256 = "0851jgh5v36d7lq9pwlmigqpqrfbrqqssib4id7s4c8j4sh4c03g"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/48f0262ec568a3dd53dcc48f11e473b30c7e6ab1/recipes/inline-docs"; + sha256 = "1a45a5bxm719fr4xvn26mraph3a19d53c2l74y1jrxhaksgl3n1j"; + name = "inline-docs"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/inline-docs"; + license = lib.licenses.free; + }; + }) {}; inlineR = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inlineR"; @@ -35961,8 +36121,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "75f9cebc6a44cc5aff51f403bae4774736ea52bd"; - sha256 = "09xdlgwl40cb9kf622nnadh0g14g78p78yqmxfgy1wm3vbp0id99"; + rev = "dbcee946f462e0fe2aa26f2a9e7ff4784c9e0e70"; + sha256 = "199wg32ai117zkww4nzanksvdvzhmnnrn4cmp7l74z8i18cn2j2p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; @@ -36045,8 +36205,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "75f9cebc6a44cc5aff51f403bae4774736ea52bd"; - sha256 = "09xdlgwl40cb9kf622nnadh0g14g78p78yqmxfgy1wm3vbp0id99"; + rev = "dbcee946f462e0fe2aa26f2a9e7ff4784c9e0e70"; + sha256 = "199wg32ai117zkww4nzanksvdvzhmnnrn4cmp7l74z8i18cn2j2p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra"; @@ -38196,8 +38356,8 @@ src = fetchFromGitHub { owner = "kivy"; repo = "kivy"; - rev = "a9d5d75609524597142b62a35640ecf8f2766d9b"; - sha256 = "07w2azv3yyxs32b7d2cgwschqw47nvz83hjhhzmi6rvl9yr8ia4d"; + rev = "309ac127558f13f3c1c0d1aa8713392f56d2246c"; + sha256 = "13gmmvx6mc2r96jgpshhb11vwndid2d95ijy2vlrhjfkznkiqimd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode"; @@ -38634,8 +38794,8 @@ src = fetchFromGitHub { owner = "Malabarba"; repo = "latex-extra"; - rev = "d5b759fa61da968c3ca998ba0d2ef4a73647e5fd"; - sha256 = "07aavdr1dlw8hca27l8a0i8cs5ga1wqqdf1v1iyvjz61vygld77a"; + rev = "9e89c5548298394aa47a5087a8e79655105a6f3d"; + sha256 = "1gz2zay2wah56s0gkkfnhfmm0wr1w4gjz51pb1q72br0n4r01xq9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/latex-extra"; @@ -39070,12 +39230,12 @@ leuven-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "leuven-theme"; - version = "20170114.617"; + version = "20170129.1131"; src = fetchFromGitHub { owner = "fniessen"; repo = "emacs-leuven-theme"; - rev = "fa5f6105a18d08727172e6b9200cd0dec737d4ba"; - sha256 = "0pmhg22rx6yd431lfcvyai1cahiljs1dr670i9i6m5ckdakcl1f4"; + rev = "98c8e660f24d9e4873aa5cee00f47437ac301084"; + sha256 = "10fwz2zlyvvlwnjb2dxdb8gfvcfb1y0j0qkagbk5lkyb6j65yayl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b09451f4eb2be820e94d3fecbf4ec7cecd2cabdc/recipes/leuven-theme"; @@ -39134,8 +39294,8 @@ src = fetchFromGitHub { owner = "rvirding"; repo = "lfe"; - rev = "ec0ad79e17920ce28e32e2beb9fea872bf80762c"; - sha256 = "047qnnwh46zmj7flkv53wdrq53cil76v0i6hx71xpyiykzm1dnq9"; + rev = "fefa5e03592513d0e435650df52a53f861ce7b04"; + sha256 = "0sxlcy19bds9yjpcsx731h69w8q2xs8gl3vbk33h2qq5imhd0q18"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode"; @@ -39190,12 +39350,12 @@ lice = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lice"; - version = "20151225.1022"; + version = "20170131.1601"; src = fetchFromGitHub { owner = "buzztaiki"; repo = "lice-el"; - rev = "d8572d997f54f4022f245dcf7c38fef6919a474a"; - sha256 = "11c3vmxyddx7zm8fpxmzhq2xygyijbszinfiwllgb4l738bxwljb"; + rev = "e6f7f827bcf5246aff25f52d6185c9bed91beeba"; + sha256 = "1kjai3kvzn0flakjzrarh676ja6x6v0wbjxr69wqw9nvicvww7zx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2508699ebfc846742940c5e4356b095b540e2405/recipes/lice"; @@ -39447,12 +39607,12 @@ lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }: melpaBuild { pname = "lispy"; - version = "20170124.218"; + version = "20170201.1201"; src = fetchFromGitHub { owner = "abo-abo"; repo = "lispy"; - rev = "6e64df1bc9f8d74c052bdf49c6971679170aaebe"; - sha256 = "02fgi9rajsgyjxlmhkl6xi5zidcrrabb1llkjbr9b7qmlaqxhhcg"; + rev = "68a11104caf14054d018043ca1545c189d9e65af"; + sha256 = "12gsbg1v5jbd3bfig9h75sa55vvdg1hfagydrl5sp3n3xkh0jgh1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy"; @@ -39760,12 +39920,12 @@ live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "live-py-mode"; - version = "20170119.2209"; + version = "20170125.2135"; src = fetchFromGitHub { owner = "donkirkby"; repo = "live-py-plugin"; - rev = "884d6b38b41f0ea6749361aab773d950cb6b8d27"; - sha256 = "1g2bv9kaxlpfd3rxh67rp2gs0vcj1k49fhxs4ikqw5a1yfnnpcaq"; + rev = "8c9db327dcd89ff4abf0dd8f0396d7efd66c0aca"; + sha256 = "15h37r3nhcjsx8z963s5ic5gcagnw9apy3hdnri57mvfg8h1k6s6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode"; @@ -39847,8 +40007,8 @@ version = "20150910.644"; src = fetchgit { url = "http://llvm.org/git/llvm"; - rev = "d367f44048534bdb4d2d976c088bbad9fb125c0a"; - sha256 = "1sbi3h6g5p5fc3ly3kyvwsrlzszr38vj54ikqpvqsp022757rf9i"; + rev = "a1d4ee75a4d2e148a47febd36c88f41d5ccb4ca8"; + sha256 = "1i294wmg7p111agmirmgyvirm849qy9kdgsiw7h06vxyy4wdvs4q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode"; @@ -39889,8 +40049,8 @@ src = fetchFromGitHub { owner = "vic"; repo = "color-theme-buffer-local"; - rev = "ca8470bc34c65a026a6bca1707d95240bfd019af"; - sha256 = "0gvc9jy34a8wvzwjpmqhshbx2kpk6ckmdrdj5v00iya7c4afnckx"; + rev = "faf7415c99e132094f1f09c6b6974ec118a18d87"; + sha256 = "1zk5clvkrq2grmm1bws2l5vbv1ycp41978bb902c563aws2rb8c0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/load-theme-buffer-local"; @@ -40073,12 +40233,12 @@ logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "logview"; - version = "20170114.1515"; + version = "20170127.1107"; src = fetchFromGitHub { owner = "doublep"; repo = "logview"; - rev = "c22ac44d14de8aaad532e47ea60c21c24d661a50"; - sha256 = "02842gbxlq6crvd3817aqvj5irshls5km675vmhk0qd4cqg38abv"; + rev = "bbed5a7651042594340de7e15ac96150097f1555"; + sha256 = "0iks3451x6nf2hhhw6nvnh4y9gigjp3rd38sp7m60vsz9ggmninh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview"; @@ -40238,12 +40398,12 @@ lua-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lua-mode"; - version = "20161101.1340"; + version = "20170130.435"; src = fetchFromGitHub { owner = "immerrr"; repo = "lua-mode"; - rev = "d7596990cdd197d3db682c4b2ca5410a4b522574"; - sha256 = "06i2p0b5pcv9c4b6blxxh5sn7fgzglpl2bw2i27vyrh1szapq8mb"; + rev = "652e299cb967fccca827dda381d61a9c144d97de"; + sha256 = "1had9sj3pbbmdb66mw1dxs7i866ck0af7pak3wi6213v5vip7w6b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/lua-mode"; @@ -40421,6 +40581,27 @@ license = lib.licenses.free; }; }) {}; + madhat2r-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "madhat2r-theme"; + version = "20170130.1431"; + src = fetchFromGitHub { + owner = "madhat2r"; + repo = "madhat2r-theme"; + rev = "b7def53611d83cec80be22f8dbf76df49d2d17b1"; + sha256 = "0vralm3a6qbf92zbvv9383rd79i5zwlz41c2p5qvb9qlr6x4bf7r"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/44a382a388821908306c0b8350fba91218515e1b/recipes/madhat2r-theme"; + sha256 = "0y588skd6c2ykyp54d38ibwrqglnaanr15d45d51cvcvp9k7x508"; + name = "madhat2r-theme"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/madhat2r-theme"; + license = lib.licenses.free; + }; + }) {}; mag-menu = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, splitter }: melpaBuild { pname = "mag-menu"; @@ -40487,12 +40668,12 @@ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "20170119.1803"; + version = "20170201.254"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "85db4aeebd2c66604c031c91d3f6bf4ce72f3449"; - sha256 = "19b5fgwnb4m9v285jwdc72m9zgphkb3hassx4ks3zg6yij7g98hq"; + rev = "e34f4e8eb00f292e8c475489fa7caa286857a421"; + sha256 = "02kk093bg1vjnqfl3qy9h8zs50xzxbkay78qizav0h5myv4mjy10"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit"; @@ -40662,12 +40843,12 @@ magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "magit-popup"; - version = "20170104.924"; + version = "20170128.745"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "85db4aeebd2c66604c031c91d3f6bf4ce72f3449"; - sha256 = "19b5fgwnb4m9v285jwdc72m9zgphkb3hassx4ks3zg6yij7g98hq"; + rev = "e34f4e8eb00f292e8c475489fa7caa286857a421"; + sha256 = "02kk093bg1vjnqfl3qy9h8zs50xzxbkay78qizav0h5myv4mjy10"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup"; @@ -40869,6 +41050,27 @@ license = lib.licenses.free; }; }) {}; + major-mode-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "major-mode-icons"; + version = "20170130.108"; + src = fetchFromGitHub { + owner = "stardiviner"; + repo = "major-mode-icons"; + rev = "278e11182c900ea5bed7004e015ef18e383e40bb"; + sha256 = "13dfm08w2l8fxmb77pz33yf410hmb1606fy8avslsflaczdm67kw"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c8f551bec8bdc5dee4b31edea0c2f92b3c77ec56/recipes/major-mode-icons"; + sha256 = "02p5h9q2j7z3wcmvkbqbbzzk3lyfdq43psppy9x9ypic9fij8j95"; + name = "major-mode-icons"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/major-mode-icons"; + license = lib.licenses.free; + }; + }) {}; make-color = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "make-color"; @@ -41103,12 +41305,12 @@ mandoku = callPackage ({ fetchFromGitHub, fetchurl, git, github-clone, lib, magit, melpaBuild, org }: melpaBuild { pname = "mandoku"; - version = "20170122.2132"; + version = "20170131.506"; src = fetchFromGitHub { owner = "mandoku"; repo = "mandoku"; - rev = "12e55ba09155470c43ebb073f2594425949d2745"; - sha256 = "16p9j5dymilmn2qmg9cp0ns28ywfckd72xy9v7bxp8jd0dxj8nwk"; + rev = "bc7cb4b4dcc8b3f176f09345ccbaf843ae9dc41f"; + sha256 = "0n10d6kdaw0cdjyafk5xzmjriig4nqc9gjcdmif38sqrcm5pwrkp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1aac4ae2c908de2c44624fb22a3f5ccf0b7a4912/recipes/mandoku"; @@ -41774,27 +41976,6 @@ license = lib.licenses.free; }; }) {}; - meacupla-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "meacupla-theme"; - version = "20151027.1517"; - src = fetchFromGitLab { - owner = "jtecca"; - repo = "meacupla-theme"; - rev = "f57542222a3a43af9aae665e05a84a61637ab22a"; - sha256 = "136lh39hakwx46rd1gsmsfhsj78mrpamid766v2vjx9rkkprk0zv"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/397ea693de4bdc7499e86af273cbc4152c04035e/recipes/meacupla-theme"; - sha256 = "09q88q2xghj5vn5y3mjrcparfwdzavkgjyg2ay55h7wf5f2zpw2d"; - name = "meacupla-theme"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/meacupla-theme"; - license = lib.licenses.free; - }; - }) {}; mediawiki = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mediawiki"; @@ -41816,22 +41997,22 @@ license = lib.licenses.free; }; }) {}; - meghanada = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }: + meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }: melpaBuild { pname = "meghanada"; - version = "20170124.1559"; + version = "20170131.627"; src = fetchFromGitHub { owner = "mopemope"; repo = "meghanada-emacs"; - rev = "04112dc5db30a98d2ec1dae41d8c6ed1c7aff0be"; - sha256 = "0f14b1h6zv0v8hn99bqmidndh36mrsckmcirrrffm591ksf4l0zd"; + rev = "6b1b514ca3424c08301325f99608510130365cd1"; + sha256 = "1pl65186k696mx6lm6lnn2jm86kwky780rph97cqb1dy506qpqxf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada"; sha256 = "10f1fxma3lqcyv78i0p9mjpi79jfjd5lq5q60ylpxqp18nrql1s4"; name = "meghanada"; }; - packageRequires = [ cl-lib company emacs flycheck yasnippet ]; + packageRequires = [ company emacs flycheck yasnippet ]; meta = { homepage = "https://melpa.org/#/meghanada"; license = lib.licenses.free; @@ -42661,6 +42842,27 @@ license = lib.licenses.free; }; }) {}; + mmm-jinja2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode }: + melpaBuild { + pname = "mmm-jinja2"; + version = "20170128.416"; + src = fetchFromGitHub { + owner = "glynnforrest"; + repo = "mmm-jinja2"; + rev = "f39a9bfe9e3001b0141ed3d6a156fbb60a76e25c"; + sha256 = "0p83i4ikd1bj4r0hahwnlj2gliwcgfql5rzvv7phl3nhjinclj55"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/721b9a6f16fb8efd4d339ac7953cc07d7a234b53/recipes/mmm-jinja2"; + sha256 = "0zg4psrgikb8644x3vmsns0id71ni9fcpm591zn16b4j64llvgsi"; + name = "mmm-jinja2"; + }; + packageRequires = [ mmm-mode ]; + meta = { + homepage = "https://melpa.org/#/mmm-jinja2"; + license = lib.licenses.free; + }; + }) {}; mmm-mako = callPackage ({ fetchhg, fetchurl, lib, melpaBuild, mmm-mode }: melpaBuild { pname = "mmm-mako"; @@ -42873,12 +43075,12 @@ mode-icons = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mode-icons"; - version = "20170116.1230"; + version = "20170131.1751"; src = fetchFromGitHub { owner = "ryuslash"; repo = "mode-icons"; - rev = "60d5b4dbbb07d2515f195f8ffe75f12f0913a3d7"; - sha256 = "0ck7v4pzhzymq0cjwyl0iv721k9m0cx36m8ff7lw0bmgbzdi8izn"; + rev = "da41bb7ba35a4ce0a4e02e1ce2fa7fe4190b1bf9"; + sha256 = "0p4jm7klfh27g1wbsa8qm7vlmpqs57pdk2phxq2qwbim095fsp0l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/mode-icons"; @@ -43140,12 +43342,12 @@ monroe = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monroe"; - version = "20170103.1555"; + version = "20170126.1821"; src = fetchFromGitHub { owner = "sanel"; repo = "monroe"; - rev = "7a72255d1b271ff11ad8e66c26a476aa4542c8f7"; - sha256 = "16laq4q8mc85kc658ni6kflcfinyxl446fdih2llmg7dji0xarpl"; + rev = "03e09ff0c4ae9fb4b0d1d436ca56f36b63e21b7c"; + sha256 = "1cxng7gi2ik57w11li9fl12cp9hiv98ynpm6nr0mw80rvb9qxhak"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/590e5e784c5a1c12a241d90c9a0794d2737a61ef/recipes/monroe"; @@ -43782,11 +43984,11 @@ multi-project = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "multi-project"; - version = "20161204.223"; + version = "20170128.1236"; src = fetchhg { url = "https://bitbucket.com/ellisvelo/multi-project"; - rev = "8c1ef1ca48e0"; - sha256 = "1xfix5184gach3w89c5xcp9ww9cfblm7syx9ibwp5a2pjicw5vql"; + rev = "1b4aa85d1e65"; + sha256 = "0pgj1kkv7ddbg3zk4b6q4d6r4xw8dhsj4wwg9ydxd9ahdlbb6i66"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/multi-project"; @@ -44406,8 +44608,8 @@ src = fetchFromGitHub { owner = "Malabarba"; repo = "names"; - rev = "00862c57ae6363ba86d1e5ce138929a1b6d5c7e6"; - sha256 = "0m82g27gwf9mvicivmcilqghz5b24ijmnw0jf0wl2skfbbg0sydh"; + rev = "65b577b1215c4cfaee1ed5e98b0545e9ef7b9964"; + sha256 = "13r1qmibjikx6hz36m6xf79wap6fci2x7jz7rac5s52hq2hdj2wk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/names"; @@ -44780,8 +44982,8 @@ src = fetchFromGitHub { owner = "rsdn"; repo = "nemerle"; - rev = "ccf1483da01d77185f3df63c6d41be59b9bc6f20"; - sha256 = "02znwh2qg4a31ljg8h9yd8nlk3qmdq5q0vr2c2zfrcrx3z7njamb"; + rev = "2f76c26353062ba6578914113ca26c53f5abcdb7"; + sha256 = "1nn6kfg84g5aplis76q7r6wx74rj6r3n6kcdghvsyih77r4r32jl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8477d0cf950efcfd9a85618a5ca48bff590b22d7/recipes/nemerle"; @@ -44815,22 +45017,22 @@ license = lib.licenses.free; }; }) {}; - neotree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + neotree = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "neotree"; - version = "20170110.321"; + version = "20170201.712"; src = fetchFromGitHub { owner = "jaypei"; repo = "emacs-neotree"; - rev = "d2ae6ac8a919f164f34c589f2f46ddd140a79f81"; - sha256 = "0xqcrxmpk2z4pd9scqn2nannqy0a76mkkqv9bz037a36w8v481nd"; + rev = "b7479d0d96e44983917c7e3546bee2e215bb4a30"; + sha256 = "09cjnybyd9mgvy9vn1hd3r0fzmxla5ijpa83mx5ddjbig10wrva1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9caf2e12762d334563496d2c75fae6c74cfe5c1c/recipes/neotree"; sha256 = "05smm1xsn866lsrak0inn2qw6dvzy24lz6h7rvinlhk5w27xva06"; name = "neotree"; }; - packageRequires = []; + packageRequires = [ cl-lib ]; meta = { homepage = "https://melpa.org/#/neotree"; license = lib.licenses.free; @@ -45116,8 +45318,8 @@ src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "4e6a2fbc561f3e692a5644b3816a205ba769f39e"; - sha256 = "1z0jsckzskx9jgshilfhf0ybqx9lkk61r0ww2hk7pqxd2bhd4caq"; + rev = "7a65b2470eb53a320749d76746fbf65790183d9d"; + sha256 = "0h0x8qxyqg1n9z8p9l66bqlw2b0ihimkic645b1xndiqrv3lxnvm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode"; @@ -45133,12 +45335,12 @@ nix-sandbox = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "nix-sandbox"; - version = "20160914.1324"; + version = "20170131.241"; src = fetchFromGitHub { owner = "travisbhartwell"; repo = "nix-emacs"; - rev = "89b9356d32b16e0dc0794c323a4661a01c3b83de"; - sha256 = "11pcp09z0vy6k81wghqq4rxlkfsc5bpgyacpl7bmxanj3qaa7ga5"; + rev = "ace629f7645d12778c96ff7b5cf4b1e41a98af29"; + sha256 = "11infdrdjc30kxvfg5rh1zn4idvkhf9s0c6v60qn441m1d5bnavq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/66be755a6566e8c0cfb5aafa50de29b434023c7a/recipes/nix-sandbox"; @@ -45158,8 +45360,8 @@ src = fetchFromGitHub { owner = "travisbhartwell"; repo = "nix-emacs"; - rev = "89b9356d32b16e0dc0794c323a4661a01c3b83de"; - sha256 = "11pcp09z0vy6k81wghqq4rxlkfsc5bpgyacpl7bmxanj3qaa7ga5"; + rev = "ace629f7645d12778c96ff7b5cf4b1e41a98af29"; + sha256 = "11infdrdjc30kxvfg5rh1zn4idvkhf9s0c6v60qn441m1d5bnavq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6846c7d86e70a9dd8300b89b61435aa7e146be96/recipes/nixos-options"; @@ -45238,12 +45440,12 @@ no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "no-littering"; - version = "20170122.357"; + version = "20170122.942"; src = fetchFromGitHub { owner = "tarsius"; repo = "no-littering"; - rev = "e161c328d248f861bb56991492182f20e60b6b41"; - sha256 = "0ka7gbiarhc1r8rynxq2vf0k5p4044bm1jc92ca1hav34mqfg2xp"; + rev = "87fffa1973376bd1837fcf84277cd16db9c96957"; + sha256 = "1nfllm98d0893wk49fkijc071pg3v3qmpy4apyppj88k6m58y573"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering"; @@ -45382,11 +45584,11 @@ }) {}; notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "notmuch"; - version = "20161215.457"; + version = "20170127.1808"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "4a2ce7b5706b53cdd30c474d556f18d731c21bb5"; - sha256 = "1hhdaapyj6kg9zys7fw5rh7rqc4540wyh3c5dkhb4b9jlbzslj40"; + rev = "08343d3da03a11e7a575981fac20ab10426f19be"; + sha256 = "0bbfp7mgcp48qvcxwznncaskihxxf99j8mhsiqww4ll1pfpi1w3q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -46091,12 +46293,12 @@ ob-prolog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ob-prolog"; - version = "20170102.953"; + version = "20170126.921"; src = fetchFromGitHub { owner = "ljos"; repo = "ob-prolog"; - rev = "7e94309d3a21d7e265f3a85b41801397f286af00"; - sha256 = "0qxpgnjrx04dl43i949vcwv70sc7i23ivyvfk82hdvl8c2lwfd7w"; + rev = "e70a9f9b96fd0fedcc30de7768c870f4b0ee1ae9"; + sha256 = "0vpxnvvmfxqwq1i6wl1gv76dgavcl4sg3f1ma42sq2bldpdn8am7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fb87868cd74325f0a4a38c5542c264501000951d/recipes/ob-prolog"; @@ -46154,12 +46356,12 @@ ob-sagemath = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, sage-shell-mode }: melpaBuild { pname = "ob-sagemath"; - version = "20170105.516"; + version = "20170130.1833"; src = fetchFromGitHub { owner = "stakemori"; repo = "ob-sagemath"; - rev = "dfa6cf72a0e38d7d4f0f130c6f2f0f367f05a8ea"; - sha256 = "1scyjca5niiv1ccr18ninpb0fmgyqklbn6z9pja84a2wb1w9r6mm"; + rev = "1d99614509624d7bfd457325ca52f3bf1059f4d5"; + sha256 = "11qsh0lfb1kqiz0cfx7acfpyw0a90bh7r86a4h31d4xl1xfq94sx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc074af316a09906a26ad957a56e3dc272cd813b/recipes/ob-sagemath"; @@ -47380,8 +47582,8 @@ src = fetchFromGitHub { owner = "dfeich"; repo = "org-clock-convenience"; - rev = "d4f98e95d75d78822ddfab6b67bc971516f9773c"; - sha256 = "0s69jqadrgsmlv74386i900gr6xr3kgr5x1n75gqf4rsdmhx4s5d"; + rev = "dc8054d0d9ab5ef659c56c27bdd125c8b850b36f"; + sha256 = "0wbij5inn5wy0jhghnba32h537ff3xy8wwy7jaf495hcws4gnag8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a80ed929181cdd28886ca598a0c387a31d239b2e/recipes/org-clock-convenience"; @@ -47394,22 +47596,22 @@ license = lib.licenses.free; }; }) {}; - org-clock-csv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + org-clock-csv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }: melpaBuild { pname = "org-clock-csv"; - version = "20160906.1047"; + version = "20170130.2213"; src = fetchFromGitHub { owner = "atheriel"; repo = "org-clock-csv"; - rev = "62acbb8673cafc9db00fde7ea1804cde6a781cd0"; - sha256 = "16gq2yyjzfyra0gzabcd9pclickqy4hal0kgx2xmdfxpxchfk0gs"; + rev = "59482e800700e66db5381661c1e6b3edb2c03a34"; + sha256 = "099mjbd0n7azv4v3i4a7fw3f85c16ck334sqv2l92k0dpsjdmnrx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e023cb898699f76f6c3d9ffe8162aacfc6a8c34f/recipes/org-clock-csv"; sha256 = "02spjrzdf1kmvyvqkzg7nnmq9kqv75zwxn5ifqmg0f7a1gw28f0l"; name = "org-clock-csv"; }; - packageRequires = []; + packageRequires = [ org s ]; meta = { homepage = "https://melpa.org/#/org-clock-csv"; license = lib.licenses.free; @@ -47900,12 +48102,12 @@ org-journal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-journal"; - version = "20170104.648"; + version = "20170126.234"; src = fetchFromGitHub { owner = "bastibe"; repo = "org-journal"; - rev = "008ef4549135a5daa2382e57a4d04a439d22cdc6"; - sha256 = "1m0fmyj4rzc8hdxjmfzianzna6929p5xfrwj0azybv9cmcwfyw8w"; + rev = "24313870fa682a53e7f3f916b0e853a731868886"; + sha256 = "0nc3jl7sgqc8swi89rdk1yapmqxp8vaxm7390iqxy7a1sng4jydh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/org-journal"; @@ -47966,8 +48168,8 @@ version = "20140107.519"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "2348d1834351b57d5ff9bbdb2c74c3e69ed60cfb"; - sha256 = "1pg47pg3rb4rcf94wj1hgznswc10x5zm8qr47bxw196c4m1imjkb"; + rev = "f157283c127729c681ac363daa3f411b68da7c3c"; + sha256 = "0cqsahn5ghcivfx0qsa29ij5bviykmq4zx32ssckwp8za5pswfl6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal"; @@ -47986,8 +48188,8 @@ version = "20170105.1723"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "2348d1834351b57d5ff9bbdb2c74c3e69ed60cfb"; - sha256 = "1pg47pg3rb4rcf94wj1hgznswc10x5zm8qr47bxw196c4m1imjkb"; + rev = "f157283c127729c681ac363daa3f411b68da7c3c"; + sha256 = "0cqsahn5ghcivfx0qsa29ij5bviykmq4zx32ssckwp8za5pswfl6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link"; @@ -48135,6 +48337,26 @@ license = lib.licenses.free; }; }) {}; + org-parser = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "org-parser"; + version = "20170129.1041"; + src = fetchhg { + url = "https://bitbucket.com/zck/org-parser.el"; + rev = "02aab579be3f"; + sha256 = "0yb8zkq6iizpkp331wg6l9ksvy1z88pq3g12ya7ral992yn5yb8z"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/28d55005cbce276cda21021a8d9368568cb4bcc6/recipes/org-parser"; + sha256 = "06yb78mf486b986dhvqg3avflfyi271vykyars465qpk0v8ahq8h"; + name = "org-parser"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/org-parser"; + license = lib.licenses.free; + }; + }) {}; org-password-manager = callPackage ({ fetchgit, fetchurl, lib, melpaBuild, org, s }: melpaBuild { pname = "org-password-manager"; @@ -48353,12 +48575,12 @@ org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, s }: melpaBuild { pname = "org-ref"; - version = "20170120.630"; + version = "20170130.1818"; src = fetchFromGitHub { owner = "jkitchin"; repo = "org-ref"; - rev = "b94f812ad63cc3e3a12e2cd94aeba7bf959531c4"; - sha256 = "0d2ckbw4qv5vpglhh1bcm866y8ngv7idbchhlch809gvcc2imjns"; + rev = "ad34032f07a8eac49f091824ac80b7752e8bdf74"; + sha256 = "03869nki9c0msmqclm7mgsqnhdbkp0xahnpk8h9d7zldqiqck0x7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref"; @@ -48853,12 +49075,12 @@ organic-green-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "organic-green-theme"; - version = "20161222.232"; + version = "20170125.606"; src = fetchFromGitHub { owner = "kostafey"; repo = "organic-green-theme"; - rev = "dc66586b8581b35a723f68211fb1efeb7f00ffef"; - sha256 = "012s9m3cysnfbr0s2l53inm3k06k7ra8jlp68cdnslhb41az2kp7"; + rev = "5f8ce452d16f1acbd18a6963f2c042851968dd8d"; + sha256 = "0irkcjb6vxb7kf9fr4s4ap6lighhh7h6mwfamcwcacgwfvs4zs7y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9383ef5f0372724b34f4bb9173ef8ccbb773e19e/recipes/organic-green-theme"; @@ -49042,12 +49264,12 @@ origami = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "origami"; - version = "20160924.218"; + version = "20170129.805"; src = fetchFromGitHub { owner = "gregsexton"; repo = "origami.el"; - rev = "a77d7f16345296bbbccc4f3d0fe45587c3907493"; - sha256 = "13w5mcdxvjzbixbg5kszlqrzrd5l51ddx1z65ir8zjp4xnbf9ysn"; + rev = "5630536d04613476e13b413fe05fd0bbff4107ca"; + sha256 = "1w6cyyvjw6x4x0a7mbybw37f70cdnwajv8snvmnrqd73vggm70fd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b816be227dfc7330292a50346c4bb37394d3e998/recipes/origami"; @@ -49466,8 +49688,8 @@ src = fetchFromGitHub { owner = "jkitchin"; repo = "scimax"; - rev = "94713fe129cd723f26b066158ac0e061be77d22e"; - sha256 = "1gqvw2130725sdg1g6binpqb5m73klrczniwkj3dfyd65mcynxy7"; + rev = "e633abf5fc953e88e3629e9a5d7ca9bdf47a29cd"; + sha256 = "0fasg280qza87dsmpsgyclk50nrr5jmm2vf6jxpzkccm7m1ar8w6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/222ccf4480395bda8c582ad5faf8c7902a69370e/recipes/ox-clip"; @@ -49966,12 +50188,12 @@ package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "package-lint"; - version = "20161124.1615"; + version = "20170127.1538"; src = fetchFromGitHub { owner = "purcell"; repo = "package-lint"; - rev = "633fbff47fd4872d55d672029300c043e13e966e"; - sha256 = "0mr0yry397777gmvqj3z7b9zy47k3k3ghr03jyjafra4kjm85x00"; + rev = "f1b0f6237613a680dfdcddc1c096dc870a8efaa5"; + sha256 = "0wrqsjcs3dvbay7z3zw73hys259yz9chblrvcnfqgmjl5n693gnf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint"; @@ -50050,12 +50272,12 @@ packed = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "packed"; - version = "20160523.600"; + version = "20170130.1015"; src = fetchFromGitHub { owner = "tarsius"; repo = "packed"; - rev = "765cd52712f0daf40c45d169cc062b6bc94aa807"; - sha256 = "1kjcb6z08bj5ysxrykgz3x6bz2122yycpjhbv875ppc5ihls88xl"; + rev = "d2f01bffc987b226f618dda0663a1e233161518d"; + sha256 = "16xwgi0zkbbvkbxf0ld6g4xlfd95j45sca57h162wld6l27jrv4f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1ee9e95c00f791010f77720068a7f3cd76133a1c/recipes/packed"; @@ -50465,12 +50687,12 @@ parinfer = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "parinfer"; - version = "20170113.956"; + version = "20170126.2111"; src = fetchFromGitHub { owner = "DogLooksGood"; repo = "parinfer-mode"; - rev = "a91b1ee5392c6a98c102ddba2f0c15ab67f8ad1b"; - sha256 = "09337fpv492rzd2ah7d8kxyv5spcgwf58xr943ya09sgi2invkbx"; + rev = "12f54f661180f894be9bc0fd956b30a69b3f39e0"; + sha256 = "0w44w2qgvbv1m5dwyqa7863r1r32fva5rgc0w14srpak41nn3bj2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/470ab2b5cceef23692523b4668b15a0775a0a5ba/recipes/parinfer"; @@ -51072,12 +51294,12 @@ pdf-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, tablist }: melpaBuild { pname = "pdf-tools"; - version = "20170119.1442"; + version = "20170130.300"; src = fetchFromGitHub { owner = "politza"; repo = "pdf-tools"; - rev = "9dafe31ce233eb549f402ccd7abed495c81ab152"; - sha256 = "1kwnac2v0pr3iirq7bhbzb61z3pficybv23i6bcsrxjp3vfahpfx"; + rev = "3a32d2420cc40ed864215f75aae4f6d868dc1cd2"; + sha256 = "15j8ll2rna5f0a4zq2bflbn888c6yp852i405qlcxcjvs3jalxcy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8e3d53913f4e8a618e125fa9c1efb3787fbf002d/recipes/pdf-tools"; @@ -51785,12 +52007,12 @@ php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "php-mode"; - version = "20161217.537"; + version = "20170131.1741"; src = fetchFromGitHub { owner = "ejmr"; repo = "php-mode"; - rev = "a6c998937341f49138f07c15050efe7e5809be23"; - sha256 = "1g0m9vsx0n2rzph4ipyab8fl6bv26y2dmyrgkici545k2mhhhiqp"; + rev = "349b85c1a9c79505d218b43940470c862dcdff32"; + sha256 = "15mlzk7mvv3wfz73k30a7syb274myls6d44nibwg00r794drr57g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode"; @@ -52247,12 +52469,12 @@ plan9-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "plan9-theme"; - version = "20161102.1954"; + version = "20170129.553"; src = fetchFromGitHub { owner = "john2x"; repo = "plan9-theme.el"; - rev = "6f1aaa35f57fc451e4c06164e74f61e17ce1cacf"; - sha256 = "0cfs7qxz16aiz43pk4dcg3nvhs5r64fgy3476wpy0fac0fm275rl"; + rev = "db36861907144674a2526fed3ff733c53489b7f5"; + sha256 = "1sxx749xwxxab3k98wb4gpvy723kw5lcm7zhvvbjbgxr43lk6d05"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cdc4c2bafaa09e38edd485a9091db689fbda2fe6/recipes/plan9-theme"; @@ -53716,12 +53938,12 @@ projectile-speedbar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, sr-speedbar }: melpaBuild { pname = "projectile-speedbar"; - version = "20160630.947"; + version = "20170127.810"; src = fetchFromGitHub { owner = "anshulverma"; repo = "projectile-speedbar"; - rev = "a00c6c0e52acd2223997b1a7a996cd786e68f6f2"; - sha256 = "0bsk1336ak5bq9v26m2ql61yvhv15gyh8wrc6j4c655lxysbq9gs"; + rev = "1b9b3ae7624ca58a41ca7e0d0eb37556d3105c44"; + sha256 = "0src453yf63j5dhndrqjx6gh6nfm5c83y2xj2ibk3sj61x9daxj2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eda8cb5a175258404c347ffa30fca002504467a0/recipes/projectile-speedbar"; @@ -53951,8 +54173,8 @@ src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "0aa5af3e68940325a1c4ef9a8cacb3d072ba4baa"; - sha256 = "03wk1hqm7xzxq20a8klc630219sja6z26lzgzhcf6af1s1cn9x8p"; + rev = "39756643df2f88805649595e651b719c8f5a4dea"; + sha256 = "012d27q0b9cw1jahi47k0473w96l1wp6sr4rcm5ywa29nxrirgg0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -53965,22 +54187,32 @@ license = lib.licenses.free; }; }) {}; - psc-ide = callPackage ({ cl-lib ? null, company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + 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 = "20170122.333"; + version = "20170131.23"; src = fetchFromGitHub { owner = "epost"; repo = "psc-ide-emacs"; - rev = "5224da8df475fbd374ebc0e0690cee4a53a42477"; - sha256 = "01xjmqb2mc4q1pf9gc9jf7gasn46b5ny5jg0w4mkl9llh2p3p8fw"; + rev = "4a78aac90d84ea7aef6219497bd75c3ead988806"; + sha256 = "04qckg29wgzcr4z696s5wm4w8lrq3m799p447l87z5i23gk4hw7j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8189f4e7d6742d72fb22acf61a9d7eb0bffb2d93/recipes/psc-ide"; sha256 = "1f8bphrbksz7si9flyhz54brb7w1lcz19pmn92hjwx7kd4nl18i9"; name = "psc-ide"; }; - packageRequires = [ cl-lib company dash dash-functional emacs s ]; + packageRequires = [ + cl-lib + company + dash + dash-functional + emacs + flycheck + let-alist + s + seq + ]; meta = { homepage = "https://melpa.org/#/psc-ide"; license = lib.licenses.free; @@ -54094,12 +54326,12 @@ pug-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pug-mode"; - version = "20161221.1154"; + version = "20170127.1949"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-pug-mode"; - rev = "8967d57715ad303b9c987f4390a18c51c2f30cb3"; - sha256 = "0kk5i7dynxg53g7wx5k6lkk1015pqphxzanqw0m6nhvv1p56w84x"; + rev = "83599129c0de6f9f5082d019373c3d9347150191"; + sha256 = "17fwl967kw0kykakvga9vk7i294y5iysff263ir4y6vsnca3syn8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3710aac9f3df3a23238af1f969c462b3692f260/recipes/pug-mode"; @@ -54684,8 +54916,8 @@ src = fetchFromGitHub { owner = "PyCQA"; repo = "pylint"; - rev = "5b1b24a4b40f2a885cca2c4550d326fe40839600"; - sha256 = "0jy0avk7x7r8ljjiyv5hbsamjsnl7vkr6w5ksbyf2nfgb7f3fjlq"; + rev = "7daed7b8982480c868b0f642a5251f00ffb253c6"; + sha256 = "1sa21sylx5hvp1m28vx823hmk1lnp1ygg9pl22jjv318iks6f2vj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint"; @@ -55142,12 +55374,12 @@ quickrun = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "quickrun"; - version = "20170114.645"; + version = "20170129.650"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-quickrun"; - rev = "70e93e06778f44113f405aedec6187b925311d57"; - sha256 = "0swbgsidq11w7vyjhf06dn8vsj06j9scj8n2dm9m7fasj0yh3ghw"; + rev = "572869b70f8987306f4d938badf37bbf5c08b518"; + sha256 = "0zw3hyydqs616r96snns5mwxcn2il5hldiy8jpbyqh32mlam8w8f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/quickrun"; @@ -55226,12 +55458,12 @@ racket-mode = callPackage ({ emacs, faceup, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "racket-mode"; - version = "20170104.754"; + version = "20170129.1015"; src = fetchFromGitHub { owner = "greghendershott"; repo = "racket-mode"; - rev = "351aa58d75491c789280a3703786f35c8be28bec"; - sha256 = "1dfmjfw0sz0mfqry65nq7811fv4lydqvl8v47k9jw7prw4g29hhr"; + rev = "bb61c8d3026c598fc6c52f742ca7898a9f7c22c7"; + sha256 = "0gxdclp8mg90v30wb30ksx6xr1r1kjyrqnr9r16cplqvkac1lz0x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ad88d92cf02e718c9318d197dd458a2ecfc0f46/recipes/racket-mode"; @@ -55310,12 +55542,12 @@ railscasts-reloaded-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "railscasts-reloaded-theme"; - version = "20170120.434"; + version = "20170124.1912"; src = fetchFromGitHub { owner = "thegeorgeous"; repo = "railscasts-reloaded-theme"; - rev = "9ff7a3223213637c77622a695f98b9b0ac0ff91a"; - sha256 = "08yg5g6d9a971zq71mxci3228mayr6k7s1b0b78nx55qmkzh6409"; + rev = "318c9a812d53884da1a9d67206fcfd9ded4d320f"; + sha256 = "1al62r2fys6z1ja8zbh6yskprp1iq03l2jbnwbx8i3gd2w0ib7qk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9817851bd06cbae30fb8f429401f1bbc0dc7be09/recipes/railscasts-reloaded-theme"; @@ -55898,12 +56130,12 @@ realgud = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, load-relative, loc-changes, melpaBuild, test-simple }: melpaBuild { pname = "realgud"; - version = "20170117.415"; + version = "20170128.727"; src = fetchFromGitHub { owner = "rocky"; repo = "emacs-dbgr"; - rev = "20b8d5dd7bd96f4e8d143596a6435d84fb8d4125"; - sha256 = "0ckd7jya4368qin90x20dqf5kh3300n03f9g2qb54s93d430n0yi"; + rev = "df6921b587f2e14876ee7bf106b5c1fad81da2dc"; + sha256 = "1sssq5q89qn4jcsl6hmmbq008b23hpaa7jga88wlc867dd5f66d8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud"; @@ -56275,12 +56507,12 @@ redtick = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "redtick"; - version = "20161103.1157"; + version = "20170129.1428"; src = fetchFromGitHub { owner = "ferfebles"; repo = "redtick"; - rev = "ac8b213cf3dbd43a86910a152426b14576fbece0"; - sha256 = "1c1hllznnrypbh0cp162kbdcm0vrcsws5nx5l32c6h89n9dm397g"; + rev = "618255aa1100948af29d76d54aca7554fd66aede"; + sha256 = "0zbx9g91xrh7ppaa8lq9mh1ax6k9yv3xsyjiyan9zsji3qzh59qv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3187bd436541e2a5c2b28de67c62f5d5165af737/recipes/redtick"; @@ -56730,22 +56962,22 @@ license = lib.licenses.free; }; }) {}; - request = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + request = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "request"; - version = "20170120.414"; + version = "20170131.1747"; src = fetchFromGitHub { owner = "tkf"; repo = "emacs-request"; - rev = "2d9b4cd49a4b0196f23ce07dc0a4af7b0b724d3b"; - sha256 = "060mz0jzpyd741pi9ynk7pmfz85gkkjbk7jngc8h4ksj27pi3ia2"; + rev = "a3d080e57eb8be606fbf39d1baff94e1b16e1fb8"; + sha256 = "0wyxqbb35yqf6ci47531lk32d6fppamx9d8826kdz983vm87him7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8d113615dde757a60ce91e156f0714a1394c4bfc/recipes/request"; sha256 = "0h4jqg98px9dqqvjp08vi2z1lhmk0ca59lnrcl96bi7gkkj3jiji"; name = "request"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/request"; license = lib.licenses.free; @@ -56758,8 +56990,8 @@ src = fetchFromGitHub { owner = "tkf"; repo = "emacs-request"; - rev = "2d9b4cd49a4b0196f23ce07dc0a4af7b0b724d3b"; - sha256 = "060mz0jzpyd741pi9ynk7pmfz85gkkjbk7jngc8h4ksj27pi3ia2"; + rev = "a3d080e57eb8be606fbf39d1baff94e1b16e1fb8"; + sha256 = "0wyxqbb35yqf6ci47531lk32d6fppamx9d8826kdz983vm87him7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8d113615dde757a60ce91e156f0714a1394c4bfc/recipes/request-deferred"; @@ -56814,22 +57046,22 @@ license = lib.licenses.free; }; }) {}; - resize-window = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + resize-window = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "resize-window"; - version = "20160511.2005"; + version = "20170130.1926"; src = fetchFromGitHub { owner = "dpsutton"; repo = "resize-window"; - rev = "dec035ff44fdb743bb2dc82274114dc6ea1851f9"; - sha256 = "1ps9l6q6hgzzaywkig0gjjdlsir9avxghynzx9a3q6h0fpdkpgrj"; + rev = "27364959798de0f019da799975027842c07e7829"; + sha256 = "0x92s4cv9k566rc248zrcmh507df7d19p7b3vcfd0dlfpbqc0qnv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/601a8d8f9046db6c4d50af983a11fa2501304028/recipes/resize-window"; sha256 = "0h1hlj50hc97wxqpnmvg6w3qhdd9nbnb8r8v39ylv87zqjcmlp8l"; name = "resize-window"; }; - packageRequires = [ emacs ]; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/resize-window"; license = lib.licenses.free; @@ -57336,12 +57568,12 @@ rope-read-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rope-read-mode"; - version = "20161003.610"; + version = "20170131.217"; src = fetchFromGitHub { owner = "marcowahl"; repo = "rope-read-mode"; - rev = "442886655166e9c9472d6aebad27aaf2fed3f3e0"; - sha256 = "1f4wp85j691sgc1yx3l73bdm5lvqgvgms2ic9yg3g0v5n8drgn1k"; + rev = "a3810cf223c92353338418058153a466657a2dca"; + sha256 = "1i6dk80h6f4crw55iwbi5qxj15pr46j8cbd3b5nxcsvhl32900by"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14a674559aa485e92357a8b941304ae8167b9c3e/recipes/rope-read-mode"; @@ -57462,12 +57694,12 @@ rspec-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, ruby-mode ? null }: melpaBuild { pname = "rspec-mode"; - version = "20161129.1525"; + version = "20170125.732"; src = fetchFromGitHub { owner = "pezra"; repo = "rspec-mode"; - rev = "8e05e95548da58c63d8b805d4516eb892621f8e3"; - sha256 = "1n93vjzjmbs7yna74rpn57ckps903fdam2ljh6jm5a9ivsxnc2mn"; + rev = "2096d8c7c98aeb19eeb028082d4c9374168971d1"; + sha256 = "1xlxpnhs9k2pch6abkgblr18j8k41wbzyn1k86jl3ka72vmv4wlm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cd83e61b10da20198de990aa081b47d3b0b44d43/recipes/rspec-mode"; @@ -57487,8 +57719,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "14e5d3acf3f5c50fb81ed0fc0b69d290263c3c97"; - sha256 = "1ryyf9kpv6rmsz1j4d1mlsgp10yj1cinxp6xd8qc558a2v4mnar4"; + rev = "a979685278d465b5426ae952e3b502b987ac1ae4"; + sha256 = "11db2kiwg8y3x6wjyziqy74mzq60jw2r11v20zwxkj2za0q3q60k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac3b84fe84a7f57d09f1a303d8947ef19aaf02fb/recipes/rtags"; @@ -57549,7 +57781,7 @@ version = "20161115.2259"; src = fetchsvn { url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "57415"; + rev = "57494"; sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf"; }; recipeFile = fetchurl { @@ -57629,7 +57861,7 @@ version = "20150424.752"; src = fetchsvn { url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "57415"; + rev = "57494"; sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf"; }; recipeFile = fetchurl { @@ -57916,27 +58148,6 @@ license = lib.licenses.free; }; }) {}; - rustfmt = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "rustfmt"; - version = "20160217.542"; - src = fetchFromGitHub { - owner = "fbergroth"; - repo = "emacs-rustfmt"; - rev = "45efd68ee602d9ed7a07ff0ef045d78cacd57e89"; - sha256 = "0c22cxa4f6plz67vxmp1zgaylkfrky313cj0zybn9akrbcxpbc34"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/9fffa9bf34c161f28187b1296dfc98287817abcc/recipes/rustfmt"; - sha256 = "1znav2pbax0rsvdl85mmbgbmxy7gnrm4nx54ij1ff6yd831r5jyl"; - name = "rustfmt"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://melpa.org/#/rustfmt"; - license = lib.licenses.free; - }; - }) {}; rvm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rvm"; @@ -58084,6 +58295,27 @@ license = lib.licenses.free; }; }) {}; + salt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-jinja2, mmm-mode, yaml-mode }: + melpaBuild { + pname = "salt-mode"; + version = "20170128.424"; + src = fetchFromGitHub { + owner = "glynnforrest"; + repo = "salt-mode"; + rev = "28e72f05f2159f94d7fa3270eb35bfc1f06965df"; + sha256 = "1dksmfvvza277dm245s9l8ydnbdqvl054hxsybynx05yb5c3sfgh"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9dcf1a93a06fc42581521c88cfd988b03bedc000/recipes/salt-mode"; + sha256 = "1n7i9d6qpjsdcgbzmbf63y4c7ggxh5wsim8fd0casnrq9bl7ssym"; + name = "salt-mode"; + }; + packageRequires = [ mmm-jinja2 mmm-mode yaml-mode ]; + meta = { + homepage = "https://melpa.org/#/salt-mode"; + license = lib.licenses.free; + }; + }) {}; sane-term = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sane-term"; @@ -58234,12 +58466,12 @@ sbt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sbt-mode"; - version = "20161202.227"; + version = "20170201.246"; src = fetchFromGitHub { owner = "ensime"; repo = "emacs-sbt-mode"; - rev = "6caabd4e68fb878e743a29d16356a2c2c3bd7637"; - sha256 = "0fq70lwwv5q0mzxli9x1m244i30nkc457mib07qypax9n51vfqyv"; + rev = "c8fb801958e7c628ae618e8e1e4e04434ca41110"; + sha256 = "0acbsf5srdpk7gl27wyqkqg56akbg0xff3wzi07yw4hwaspcbm0s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/364abdc3829fc12e19f00b534565227dbc30baad/recipes/sbt-mode"; @@ -58259,8 +58491,8 @@ src = fetchFromGitHub { owner = "openscad"; repo = "openscad"; - rev = "53bc30ca76b4650373df80953fe81ffdc58eaf90"; - sha256 = "1xbbfizd5i3fd05q7paxp383i53ahgny7yc32zrp8wjnmxzk1lsp"; + rev = "ea53e85c7983592c600ecd4a9cb08ae2760cf41e"; + sha256 = "135is6zqca3ca1vkzpicqnf4jbxal2z5a93bflgbiha16i6485nn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode"; @@ -58297,12 +58529,12 @@ scala-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "scala-mode"; - version = "20170118.558"; + version = "20170131.2121"; src = fetchFromGitHub { owner = "ensime"; repo = "emacs-scala-mode"; - rev = "7e6300231143133252e6ed1f3d5c86ea4e625e33"; - sha256 = "081bw6gkrww7bqi7pwj4sifmqscr5sbpl3zl1rw86npv5fpyjq9j"; + rev = "730e16d254478d6f63f62cb04d47c137c9002f2d"; + sha256 = "1aq1bfv8jz53zp365awqk43ysjwkpj51pcy6fyp87j8bbb02mgq9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/564aa1637485192a97803af46b3a1f8e0d042c9a/recipes/scala-mode"; @@ -59272,12 +59504,12 @@ shackle = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shackle"; - version = "20160830.2343"; + version = "20170201.1322"; src = fetchFromGitHub { owner = "wasamasa"; repo = "shackle"; - rev = "fcd9f53cd044ad169a240e3d12a2cf2d65485db6"; - sha256 = "10lgafsck2r9x7997gdl3v1wn4sig0pm6jarip9496ka58z95mjb"; + rev = "4ccacf92d0bfd7729388a3e698c1ded55e7f2b92"; + sha256 = "0lmclwhv3wic0b5dxnjggi7191r63iv2gwn2k50c7ldm526qld0c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/806e7d00f763f3fc4e3b8ebd483070ac6c5d0f21/recipes/shackle"; @@ -59314,12 +59546,12 @@ shader-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shader-mode"; - version = "20151030.704"; + version = "20170130.623"; src = fetchFromGitHub { owner = "midnightSuyama"; repo = "shader-mode"; - rev = "5d5fcbc614f8d7e9226730dd587faf14115b0e6f"; - sha256 = "0l094nrrvan8v6j1xdgb51cbjvwicvxih29b7iyga13adb9dy9j4"; + rev = "76539359418d3d3cd4d2714a189b1bb777c2c15c"; + sha256 = "0mq2073cwmxlvn222dzjpi3hhskfm5f39g60zf6xx1q3l0n4hhwd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4396f3c10a38f91d5f98684efbeb02812e479209/recipes/shader-mode"; @@ -59644,11 +59876,11 @@ shm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shm"; - version = "20170119.135"; + version = "20170126.420"; src = fetchFromGitHub { owner = "chrisdone"; repo = "structured-haskell-mode"; - rev = "65910d24db7eb85890cce76baca419efc7d8fb5a"; + rev = "074c8696f52253af24a74e4b3a99edf9c0993aa9"; sha256 = "1cn2kh5ccp09mg6y743vh2y9m96m0zbnh9w5infl9nj9xbidza72"; }; recipeFile = fetchurl { @@ -59936,8 +60168,8 @@ src = fetchFromGitHub { owner = "mswift42"; repo = "silkworm-theme"; - rev = "53e0614660d653d146a4d36ceab169f6e4bb3554"; - sha256 = "0vzkgrc54j4a3g90jxc7vxkqwqi3047gnn7gng65pfar0i76lzlb"; + rev = "7951b53e5caf9daf6a5a15a57ae3a668cb78bd7b"; + sha256 = "1q21886qsam8y3s60zlfh48w0jl67q14qg9pzda7j2jcbj1q6r91"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9451d247693c3e991f79315868c73808c0a664d4/recipes/silkworm-theme"; @@ -60016,12 +60248,12 @@ simple-httpd = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "simple-httpd"; - version = "20160902.1800"; + version = "20170125.1910"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacs-web-server"; - rev = "ff1c0b661d1b5b8abdb4bea2efec5efe8485dd1f"; - sha256 = "054mi7plsyk79kc2iqmgp1w8frvlyg1pywm3fzcyg8qa461d35dw"; + rev = "348483efea6ec2752bc5aa4028a16087d19b2809"; + sha256 = "191aq4zhg5a8g6ypkbh20rnqyk76lhxfhnq5ww0g5hzpig8srxaa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/simple-httpd"; @@ -60938,8 +61170,8 @@ src = fetchFromGitHub { owner = "ainame"; repo = "smart-newline.el"; - rev = "f5f5ff033645aea0652aa375b034746754a38b1e"; - sha256 = "1q74b0mbhly84g252a0arbyxc720rgs9a3yqf8b8s2fpfkzb95sg"; + rev = "0553a9e4be7188352de1a28f2eddfd28e7436f94"; + sha256 = "0w0v3gzfg3cphz701g30sf7l92v3npsd7028pjp5g7rgv3pwkgsd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3f729926f82d6b61f07f5c8a5e19d46afdcad568/recipes/smart-newline"; @@ -61060,12 +61292,12 @@ smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smartparens"; - version = "20170104.410"; + version = "20170129.956"; src = fetchFromGitHub { owner = "Fuco1"; repo = "smartparens"; - rev = "199006a0a8ae23ee6a8ee9948bf2512f2bcf1151"; - sha256 = "0m4n5nhr8dqa14syy5907fyjsc3lnrpchdg2ai26jz4cw97v67ig"; + rev = "add86ac3eeef160787728cad3e58b035dc540dba"; + sha256 = "0d7rgj3b858w79g3nwimqaiqza2400y6c0v17ncsa7x1kvxrxk1f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens"; @@ -61497,6 +61729,27 @@ license = lib.licenses.free; }; }) {}; + socyl = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }: + melpaBuild { + pname = "socyl"; + version = "20170129.144"; + src = fetchFromGitHub { + owner = "nlamirault"; + repo = "socyl"; + rev = "38157e3bb0d7afa8b90b744648f63c85b4edb230"; + sha256 = "1ha0827zcdkl1ih8c7018cpbiw2k1b8ik4h7p6asw7pg0n5xf1c6"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/774b3006f5b6b781594257f1d9819068becbbcc1/recipes/socyl"; + sha256 = "00b7x247cyjh4gci101fq1j6708vbcz1g9ls3845w863wjf6m5sz"; + name = "socyl"; + }; + packageRequires = [ cl-lib dash pkg-info s ]; + meta = { + homepage = "https://melpa.org/#/socyl"; + license = lib.licenses.free; + }; + }) {}; soft-charcoal-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "soft-charcoal-theme"; @@ -61798,22 +62051,22 @@ license = lib.licenses.free; }; }) {}; - sourcekit = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + sourcekit = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "sourcekit"; - version = "20160510.2017"; + version = "20170126.353"; src = fetchFromGitHub { owner = "nathankot"; repo = "company-sourcekit"; - rev = "3286a0dceea6f68b155dd4608db3ccf555f00938"; - sha256 = "0xxwy5nahaafk5w3ybr1g898fiz6r7hjwr445z64v5pg862r8lkl"; + rev = "8ba62ac25bf533b7f148f333bcb5c1db799f749b"; + sha256 = "01dh0wdaydiai4v13r8g05rpiwqr5qqi34wif8vbk2mrr25wc7i9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/45969cd5cd936ea61fbef4722843b0b0092d7b72/recipes/sourcekit"; sha256 = "1lvk3m86awlinivpg89h6zvrwrdqa5ljdp563k3i4h9384w82pks"; name = "sourcekit"; }; - packageRequires = [ dash dash-functional emacs ]; + packageRequires = [ dash dash-functional emacs request ]; meta = { homepage = "https://melpa.org/#/sourcekit"; license = lib.licenses.free; @@ -61927,12 +62180,12 @@ spacemacs-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "spacemacs-theme"; - version = "20170106.539"; + version = "20170127.457"; src = fetchFromGitHub { owner = "nashamri"; repo = "spacemacs-theme"; - rev = "4342800a4a12d7d67f2a58792ab6a18542e7fc3e"; - sha256 = "0bzdc8d3q5gxwfkgk31368vpw06i4y2qji0wi4c2d3vwg02b4ihl"; + rev = "863e447f1b37d40c74b836b5132033430c6e8a7b"; + sha256 = "14jcw75jvrqarg04bdk28c5bi0456d5xi4xyy53wd7knkm2zval5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8ac39214856c1598beca0bd609e011b562346f/recipes/spacemacs-theme"; @@ -63395,12 +63648,12 @@ sudo-edit = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sudo-edit"; - version = "20160908.2310"; + version = "20170201.916"; src = fetchFromGitHub { owner = "nflath"; repo = "sudo-edit"; - rev = "beb584ca418dcd061641026662d9796f66a5a5a2"; - sha256 = "1gprc192igny4vsk4d72xqf76ig79wq73fn757ghb8yrg8zzw1zc"; + rev = "615f6c073e42d433e79ae5a63210e2e04357a4c8"; + sha256 = "0k3ldywy1g6672hhasqmj1rvzrs0cmd3nzxkb688vw6mhzxfzld4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3b08d4bbdb23b988db5ed7cb5a2a925b7c2e242e/recipes/sudo-edit"; @@ -63416,12 +63669,12 @@ sudo-ext = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sudo-ext"; - version = "20110116.2310"; + version = "20170126.414"; src = fetchFromGitHub { owner = "rubikitch"; repo = "sudo-ext"; - rev = "a1f742f90d1187834e24790b620f100e83e8aa74"; - sha256 = "1ym3j9mxc8k9akk9z1m6i0gqsfcgr8k8xzz5gniw8jfarf7f4isq"; + rev = "9d4580f304121ce7b8104bd4bd3b64e4dfa3c9b3"; + sha256 = "1m9srlxavqg6yxmz6rz61saz1lj5hh029314dic8kh6g3bqdnh2w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8e4328cae9b4759a75da0b26ea8b68821bc71af/recipes/sudo-ext"; @@ -63788,12 +64041,12 @@ swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "swift-mode"; - version = "20170114.521"; + version = "20170128.2303"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "swift-mode"; - rev = "6cd2948589771d926e545d8cbe054705eebce18f"; - sha256 = "1zz5jv2qgcnhidyhnw3wbcpqb80jqqbs74kpa66assfigyvivyj6"; + rev = "42669da0b68bba2d12f9d5fc38f30def118bb999"; + sha256 = "0l7f7mm4a7qrw0i6fnakgy7payghjgmamln9ldbdx593hg1jjzr8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode"; @@ -63834,8 +64087,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "75f9cebc6a44cc5aff51f403bae4774736ea52bd"; - sha256 = "09xdlgwl40cb9kf622nnadh0g14g78p78yqmxfgy1wm3vbp0id99"; + rev = "dbcee946f462e0fe2aa26f2a9e7ff4784c9e0e70"; + sha256 = "199wg32ai117zkww4nzanksvdvzhmnnrn4cmp7l74z8i18cn2j2p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; @@ -64560,12 +64813,12 @@ tao-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tao-theme"; - version = "20170121.111"; + version = "20170126.1021"; src = fetchFromGitHub { owner = "11111000000"; repo = "tao-theme-emacs"; - rev = "228fd8573f526141e502609ac1b7c34ab97a68d1"; - sha256 = "0nw8akvhkhw8hs9hrg4081bdyp8h3kz39y8nzp62r9m46sza0fn0"; + rev = "a808ce58441de6256e670d39b27079d8630b031a"; + sha256 = "0yf0hqm20mgiks9098231ry5sdv702agfj5pasgyyb19inawk13z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/94b70f11655944080507744fd06464607727ecef/recipes/tao-theme"; @@ -64585,8 +64838,8 @@ src = fetchFromGitHub { owner = "phillord"; repo = "tawny-owl"; - rev = "d5b75f52d9ffdbc5cc391fedc3f81d86091839b3"; - sha256 = "12nnyqg1lqa858c35b8z44wrbrznga8bwsnhm0hqcazy9bjin84v"; + rev = "944c523029a40a68ce8896ca69ebccfe8db8b0ec"; + sha256 = "1c1vmvg007vrbxhrq41ylfckppkkijgf3n2bij3x5db86ylfd9qs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ea9a114ff739f7d6f5d4c3167f5635ddf79bf60c/recipes/tawny-mode"; @@ -65005,8 +65258,8 @@ src = fetchFromGitHub { owner = "ternjs"; repo = "tern"; - rev = "4a88712c7fedfc63f079ae389f247dcd0349d960"; - sha256 = "1vnpwkcf17i6akx2wgwj9g6spvdih3xp56gf8705bkfknisykxrz"; + rev = "21b4f4b7f1f36724a18d2f70c50b2e5b634cf6b1"; + sha256 = "0kq56iiqpclf6yl9g1fhhi9pk4icv5k1f0nyips88nhsq41j395c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern"; @@ -65026,8 +65279,8 @@ src = fetchFromGitHub { owner = "ternjs"; repo = "tern"; - rev = "4a88712c7fedfc63f079ae389f247dcd0349d960"; - sha256 = "1vnpwkcf17i6akx2wgwj9g6spvdih3xp56gf8705bkfknisykxrz"; + rev = "21b4f4b7f1f36724a18d2f70c50b2e5b634cf6b1"; + sha256 = "0kq56iiqpclf6yl9g1fhhi9pk4icv5k1f0nyips88nhsq41j395c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern-auto-complete"; @@ -65103,6 +65356,27 @@ license = lib.licenses.free; }; }) {}; + test-c = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "test-c"; + version = "20170123.950"; + src = fetchFromGitHub { + owner = "aaptel"; + repo = "test-c"; + rev = "94e9f76659c45100a9b0e2a9fecf6482427cbbac"; + sha256 = "0lnx9fidpfpmwi7xa2ik5mc72lcfc9g8cm9r25s5x7sfy9vr3q8c"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ef915dc2d3bc09ef79eb8edde02101c89733c0b2/recipes/test-c"; + sha256 = "1gy5dxkd4fpzzm2sq9g7bmi1ylwvsgh6hlvjmc1c064wjkha9j9z"; + name = "test-c"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/test-c"; + license = lib.licenses.free; + }; + }) {}; test-case-mode = callPackage ({ fetchFromGitHub, fetchurl, fringe-helper, lib, melpaBuild }: melpaBuild { pname = "test-case-mode"; @@ -65477,8 +65751,8 @@ src = fetchFromGitHub { owner = "apache"; repo = "thrift"; - rev = "b62247e0ea23139a9922a1de965357907319e937"; - sha256 = "0fcdwvjfhbyy5vm9f1q1c9g63zvpdmxgl94f459rgbvlxr2qhq1f"; + rev = "de9c330b24c9190078eefb68c864d2a41a4dee07"; + sha256 = "0y16xm0pkyyancg646ni1zz190rzdlsypdbkk0jslnz1l9zq445j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift"; @@ -65534,12 +65808,12 @@ tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }: melpaBuild { pname = "tide"; - version = "20170119.122"; + version = "20170128.2207"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "tide"; - rev = "bd89d93d9803319ba86eff0173821deb978ae2ac"; - sha256 = "1a736r1igq66hn6ig4l7c5xaxcyk2kxvj26laphakk1xg8j5x52k"; + rev = "13f6f64cb4e1236ba51d05b8acd70f36968851bd"; + sha256 = "1xisk3s1sygb38gcr73m4iqpssbp6vms3162dn090g2sf0g4sssv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide"; @@ -65594,12 +65868,12 @@ time-ext = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "time-ext"; - version = "20100515.1740"; + version = "20170126.415"; src = fetchFromGitHub { owner = "rubikitch"; repo = "time-ext"; - rev = "1e886eed26fb3049b0abc5c1241f823d44cab22f"; - sha256 = "1iz3723sirazlrr9d5rpk4v0s1s9ajbx5j4i8jf1p54z8h7asjw5"; + rev = "d128becf660fe3f30178eb1b05cd266741f4784a"; + sha256 = "0ynxmik33hh0znmznrf7lkmsh5xggbrvbdhiqa61r0b7gs3jk5fd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8e4328cae9b4759a75da0b26ea8b68821bc71af/recipes/time-ext"; @@ -65846,12 +66120,12 @@ toc-org = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "toc-org"; - version = "20161004.320"; + version = "20170131.558"; src = fetchFromGitHub { owner = "snosov1"; repo = "toc-org"; - rev = "a0e8ca05e806e5074b8603985da7f18b92c15856"; - sha256 = "1sv9y5dln4ai9w3mgg8p4a3s05hflfqh0k7k8isjqikydbv85m2k"; + rev = "cda8f73640ae26c476990eae421e42627445f9d0"; + sha256 = "1qkm70ay10blhji8z6c64f18288r1gswzmmkvg7b2z2rz9w475fm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1305d88eca984a66039444da1ea64f29f1950206/recipes/toc-org"; @@ -66650,36 +66924,15 @@ license = lib.licenses.free; }; }) {}; - ttrss = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "ttrss"; - version = "20130409.1049"; - src = fetchFromGitHub { - owner = "pedros"; - repo = "ttrss.el"; - rev = "e90d8f7ccaf235053057bd91d3a2113582604e24"; - sha256 = "0a8f9p1im6k7mnp2bq733rfx2x246gfwpvi5ccym1y5lakx37fil"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/d918a5aa26c890fd138323ac6a446c0722e8b4c6/recipes/ttrss"; - sha256 = "08921cssvwpq33w87v08dafi2rz2rl1b3bhbhijn4bwjqgxi9w7z"; - name = "ttrss"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://melpa.org/#/ttrss"; - license = lib.licenses.free; - }; - }) {}; tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tuareg"; - version = "20170124.551"; + version = "20170130.1530"; src = fetchFromGitHub { owner = "ocaml"; repo = "tuareg"; - rev = "96b6ed94b1cbf4c4dd61abc928ea95f6645abfe1"; - sha256 = "0v95za3d2xnk34lkqkkzbllwc1bc3hgza3dh84np5cfbgn7davsq"; + rev = "4bdc7e15262a533aa7ea8aca48d615a49ad9e2c9"; + sha256 = "1b1i0s8z6grvfa7lkbv4fgjg0dzi61gidz2ygwjwsqhqgw269ym1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg"; @@ -67028,12 +67281,12 @@ typoscript-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, use-package }: melpaBuild { pname = "typoscript-mode"; - version = "20160719.212"; + version = "20170126.112"; src = fetchFromGitHub { owner = "ksjogo"; repo = "typoscript-mode"; - rev = "478070b6946cbc6b73249bb6e5f35366aabe9f99"; - sha256 = "13lawwhn2asr20213h1ijy827kfxs9qzhizkwzsa2sm2s0262rja"; + rev = "44e7567e921573c4f33c537b827f71fb1f565c32"; + sha256 = "0i7l9s3lhxnld32mqyrvasiv1hilhwnp2fwvpdv2cx9r902q6kc8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/701de09cb97cbfa49a3a81aaeb9577817566efa2/recipes/typoscript-mode"; @@ -67130,12 +67383,12 @@ ujelly-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ujelly-theme"; - version = "20170116.1121"; + version = "20170201.217"; src = fetchFromGitHub { owner = "marktran"; repo = "color-theme-ujelly"; - rev = "1837cfbf3d0b09d7e1da678e5dfb3b560a759734"; - sha256 = "0jjr5798nqm5lwjv1j4r21vhbqy10qy3gn977g0ysb31wp2209r4"; + rev = "2d886a64f84b3a27a53d2f29cd22528a8e3c7be2"; + sha256 = "1w8v3a9hm15q0yih9vcby2y4g01kf64axfd368w1jchx01ql6n2p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/ujelly-theme"; @@ -68100,12 +68353,12 @@ vdiff = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }: melpaBuild { pname = "vdiff"; - version = "20170116.1154"; + version = "20170201.1043"; src = fetchFromGitHub { owner = "justbur"; repo = "emacs-vdiff"; - rev = "f4332f26f7a88c6339e357d19f56354d2a2489fa"; - sha256 = "1jbhv430g2vsq0jhjypg9wdyax57m0r6hppqm2rqf0hlgn38v8d5"; + rev = "bc5a9a8c5e78835a7311d0fcfcc4619a92ffaa3a"; + sha256 = "112xrpznada8br8xcc7ln69k4w9da6h4c658gcjpj5a7mgqlbc4d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e90f19c8fa4b0d267d269b76f117995e812e899c/recipes/vdiff"; @@ -68995,12 +69248,12 @@ wc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wc-mode"; - version = "20161031.648"; + version = "20170126.2029"; src = fetchFromGitHub { owner = "bnbeckwith"; repo = "wc-mode"; - rev = "122f90bd1d422a84cc50acabd350d44d39ddeb69"; - sha256 = "0pjlxv46zzqdq6q131jb306vqlg4sfqls1x8vag7mmfw462hafqp"; + rev = "f218f42709a651b34d6c1ddd98856f44648ef707"; + sha256 = "0h79kf37pns92w4zsgazwhg087vkjvnhk9p1npll5ka87zbknndm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/wc-mode"; @@ -69121,12 +69374,12 @@ web-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "web-mode"; - version = "20170118.1211"; + version = "20170131.1400"; src = fetchFromGitHub { owner = "fxbois"; repo = "web-mode"; - rev = "5c626c98128724482336a1352e1e2af89d17a0c3"; - sha256 = "0yzriypf19s1x9rqrvbal5986d3prhd72nh81w1fhvszci2nn2kd"; + rev = "2d05692634766cfa647d9441aaf7f8d95d2d5206"; + sha256 = "1q7vpw56fqjgyiq21xjnhclhbz9hdynapp53hsdsd361nghdg9d0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode"; @@ -69668,8 +69921,8 @@ src = fetchFromGitHub { owner = "foretagsplatsen"; repo = "emacs-js"; - rev = "5e9b37cfbec400b51a8d9d1bc6603595e1a0aefd"; - sha256 = "1w4drcqix3wwk15m1kkfss2mmip1q8j4hglyz4spaffkkqmmz438"; + rev = "7bf3be6afab3c902c17b923cd4cdd12f4a2559c9"; + sha256 = "1whq3cbk0z70pn8alrcp5m53ap278rkm7hzcbkg5yrjvjfxw38dz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/78d7a15152f45a193384741fa00d0649c4bba91e/recipes/widgetjs"; @@ -70494,12 +70747,12 @@ www-synonyms = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "www-synonyms"; - version = "20160812.1329"; + version = "20170128.1451"; src = fetchFromGitHub { owner = "spebern"; repo = "www-synonyms"; - rev = "e0ee69f98309a5f3f540683ddc35af46502343b2"; - sha256 = "11iwwybanlwm4qkigk4w6zjh9rk7q7pf79hbcbyz9lll69hlmyj0"; + rev = "7e37ea35064ff31c9945f0198a653647d408c936"; + sha256 = "0l4fvq5zdzqvlwxqgqbfx9x0aimvk4x3la9yz9gw3vvj1rwf340i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2fe69ac09c3e24af9c4e24308e57d7c3c3425096/recipes/www-synonyms"; @@ -70599,12 +70852,12 @@ xah-elisp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-elisp-mode"; - version = "20170116.1037"; + version = "20170127.1616"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-elisp-mode"; - rev = "d49a743fede497d102d4dc2b739dbe35b41163ca"; - sha256 = "00v20p99njhh2wgk8jfccpigss2y6vd40wl1cs0ra67a4bjwn8di"; + rev = "c32bae59a8d8daf97769b1c57b70ef9fb8b2570c"; + sha256 = "1gs6h8csy8yz3f6gvqn3lx3i6xdqrddfhg54m4g8c5yxz0202yyg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2e996dd5b0061371662490e0b21d3c5bb506550/recipes/xah-elisp-mode"; @@ -70641,12 +70894,12 @@ xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-fly-keys"; - version = "20170122.1730"; + version = "20170129.304"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-fly-keys"; - rev = "268681a0964f1b54908cac52b65a4209923dbf32"; - sha256 = "14dkx2x2wk5fhdjyr8f3lsnknpm086scncbd6r1vsk6d6k7d9qyf"; + rev = "fd63ec17a77d82c565f7ec181dbd928af3da8c9a"; + sha256 = "0lgxw7vjy7kvh7lhp6a0yxgk0m77a5wpj7x45s1c33vcblwzsgdy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc1683be70d1388efa3ce00adc40510e595aef2b/recipes/xah-fly-keys"; @@ -71541,12 +71794,12 @@ yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yasnippet"; - version = "20170108.1830"; + version = "20170127.2128"; src = fetchFromGitHub { owner = "joaotavora"; repo = "yasnippet"; - rev = "0041efedf9f06bfe427d36547f7c4a73ab7405ba"; - sha256 = "12fkjy6i004vmc0vsxiyd3iwvlkqv2v5b0hypzkzwcjkxq426m88"; + rev = "e74f00e70324101130c00b10af15f1f23e150654"; + sha256 = "0b33mb10k5mvkg9v79kq1yx45swckz9pc1kn52h76rifcl83pif2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet"; From 344227bfb9dc77e18d1789336313959df8e3e9af Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Thu, 2 Feb 2017 14:29:55 +0100 Subject: [PATCH 096/146] haddock-api: fix build on GHC-8.0.2 --- pkgs/development/haskell-modules/configuration-common.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 0266cbe5a37..c6c78f49507 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -621,6 +621,14 @@ self: super: { # https://github.com/haskell/haddock/issues/378 haddock-library = dontCheck super.haddock-library; + # https://github.com/haskell/haddock/issues/571 + haddock-api = appendPatch (doJailbreak super.haddock-api) (pkgs.fetchpatch { + url = "https://github.com/basvandijk/haddock/commit/f4c5e46ded05a4b8884f5ad6f3102f79ff3bb127.patch"; + sha256 = "01dawvikzw6y43557sbp9q7z9vw2g3wnzvv5ny0f0ks6ccc0vj0m"; + stripLen = 2; + addPrefixes = true; + }); + # https://github.com/anton-k/csound-expression-dynamic/issues/1 csound-expression-dynamic = dontHaddock super.csound-expression-dynamic; From 16f8f0d31329b0f6335bfb34348c1b778765403e Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Thu, 2 Feb 2017 08:47:01 -0500 Subject: [PATCH 097/146] ffmpeg_3: 3.1.4 -> 3.1.6 --- pkgs/development/libraries/ffmpeg-full/default.nix | 12 ++++++------ pkgs/development/libraries/ffmpeg/3.1.nix | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index eb985f4c3f3..090881107ce 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -408,7 +408,7 @@ stdenv.mkDerivation rec { ++ optional ((isLinux || isFreeBSD) && libva != null) libva ++ optionals isLinux [ alsaLib libraw1394 libv4l ] ++ optionals nvenc [ nvidia-video-sdk ] - ++ optionals stdenv.isDarwin [ Cocoa CoreServices CoreAudio AVFoundation + ++ optionals stdenv.isDarwin [ Cocoa CoreServices CoreAudio AVFoundation MediaToolbox VideoDecodeAcceleration ]; # Build qt-faststart executable @@ -463,11 +463,11 @@ stdenv.mkDerivation rec { description = "A complete, cross-platform solution to record, convert and stream audio and video"; homepage = https://www.ffmpeg.org/; longDescription = '' - FFmpeg is the leading multimedia framework, able to decode, encode, transcode, - mux, demux, stream, filter and play pretty much anything that humans and machines - have created. It supports the most obscure ancient formats up to the cutting edge. - No matter if they were designed by some standards committee, the community or - a corporation. + FFmpeg is the leading multimedia framework, able to decode, encode, transcode, + mux, demux, stream, filter and play pretty much anything that humans and machines + have created. It supports the most obscure ancient formats up to the cutting edge. + No matter if they were designed by some standards committee, the community or + a corporation. ''; license = ( if nonfreeLicensing then diff --git a/pkgs/development/libraries/ffmpeg/3.1.nix b/pkgs/development/libraries/ffmpeg/3.1.nix index fb14ca47598..a3504bf897c 100644 --- a/pkgs/development/libraries/ffmpeg/3.1.nix +++ b/pkgs/development/libraries/ffmpeg/3.1.nix @@ -5,9 +5,9 @@ }@args: callPackage ./generic.nix (args // rec { - version = "${branch}.4"; + version = "${branch}.6"; branch = "3.1"; - sha256 = "1ynb1f0py5jb6hs78ypynpwc3jlqrw51vl8y1wnd44nwlisxz6bw"; + sha256 = "0c9g9zhrnvbfwwcca35jis7f7njskhzrwa7n7wpd1618cms2kjvx"; darwinFrameworks = [ Cocoa CoreMedia ]; patches = stdenv.lib.optional stdenv.isDarwin ./sdk_detection.patch; }) From e051e882133a052c5deb3ccec34060e2cace7e9b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 2 Feb 2017 15:01:55 +0100 Subject: [PATCH 098/146] heimdall: update to latest git revision Probably makes no difference because there have been no significant changes. Anyway, let's live on the bleeding edge. --- pkgs/tools/misc/heimdall/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/heimdall/default.nix b/pkgs/tools/misc/heimdall/default.nix index 1d75db59289..1f24679fc96 100644 --- a/pkgs/tools/misc/heimdall/default.nix +++ b/pkgs/tools/misc/heimdall/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, zlib, libusb1, cmake, qt5, enableGUI ? false }: -let version = "1.4.1-34-g7ebee1e"; in +let version = "1.4.1-37-gb6fe7f8"; in stdenv.mkDerivation { name = "heimdall-${version}"; From 529853b5e16e97744b4fea544700583a24307e56 Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Thu, 2 Feb 2017 15:11:54 +0100 Subject: [PATCH 099/146] asterisk: add lts version, fix impurity --- pkgs/servers/asterisk/default.nix | 165 ++++++++++++------- pkgs/servers/asterisk/disable-download.patch | 12 -- pkgs/top-level/all-packages.nix | 5 +- 3 files changed, 105 insertions(+), 77 deletions(-) delete mode 100644 pkgs/servers/asterisk/disable-download.patch diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix index 2433750ce45..30e137205c2 100644 --- a/pkgs/servers/asterisk/default.nix +++ b/pkgs/servers/asterisk/default.nix @@ -1,76 +1,113 @@ -{ stdenv, pkgs, fetchurl, fetchgit, +{ stdenv, pkgs, lib, fetchurl, fetchgit, jansson, libxml2, libxslt, ncurses, openssl, sqlite, utillinux, dmidecode, libuuid, binutils, newt, lua, srtp, wget, curl, subversionClient }: -stdenv.mkDerivation rec { - name = "asterisk-${version}"; - version = "14.1.2"; - src = fetchurl { - url = "http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/asterisk-${version}.tar.gz"; +let + common = {version, sha256, externals}: stdenv.mkDerivation rec { + inherit version; + name = "asterisk-${version}"; + + buildInputs = [ jansson libxml2 libxslt ncurses openssl sqlite utillinux dmidecode libuuid binutils newt lua srtp wget curl subversionClient ]; + + patches = [ + # We want the Makefile to install the default /var skeleton + # under ${out}/var but we also want to use /var at runtime. + # This patch changes the runtime behavior to look for state + # directories in /var rather than ${out}/var. + ./runtime-vardirs.patch + ]; + + src = fetchurl { + url = "http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/asterisk-${version}.tar.gz"; + inherit sha256; + }; + + # The default libdir is $PREFIX/usr/lib, which causes problems when paths + # compiled into Asterisk expect ${out}/usr/lib rather than ${out}/lib. + + # Copy in externals to avoid them being downloaded; + # they have to be copied, because the modification date is checked. + # If you are getting a permission denied error on this dir, + # you're likely missing an automatically downloaded dependency + preConfigure = '' + mkdir externals_cache + '' + lib.concatStringsSep "\n" + (lib.mapAttrsToList (dst: src: "cp ${src} ${dst}") externals) + '' + + chmod -w externals_cache + ''; + configureFlags = [ + "--libdir=\${out}/lib" + "--with-lua=${lua}/lib" + "--with-pjproject-bundled" + "--with-externals-cache=$(PWD)/externals_cache" + ]; + + preBuild = '' + make menuselect.makeopts + substituteInPlace menuselect.makeopts --replace 'format_mp3 ' "" + ./contrib/scripts/get_mp3_source.sh + ''; + + postInstall = '' + # Install sample configuration files for this version of Asterisk + make samples + ''; + + meta = with stdenv.lib; { + description = "Software implementation of a telephone private branch exchange (PBX)"; + homepage = http://www.asterisk.org/; + license = licenses.gpl2; + maintainers = with maintainers; [ auntie DerTim1 ]; + }; + }; + + pjproject-255 = fetchurl { + url = http://www.pjsip.org/release/2.5.5/pjproject-2.5.5.tar.bz2; + sha256 = "1wq8lpfcd4dfrbl7bgy2yzgp3ldjzq5430fqkhcqad0xfrxj0fdb"; + }; + +in +{ + + asterisk-lts = common { + version = "13.13.1"; + sha256 = "0yh097rrp1i681qclvwyh7l1gg2i5wx5pjrcvwpbj6g949mc98vd"; + externals = { + "externals_cache/pjproject-2.5.5.tar.bz2" = pjproject-255; + }; + }; + + asterisk-stable = common { + version = "14.1.2"; sha256 = "0w9s4334rwvpyxm169grmnb4k9yq0l2al73dyh4cb8769qcs0ij8"; + externals = { + "externals_cache/pjproject-2.5.5.tar.bz2" = pjproject-255; + }; }; - # Note that these sounds are included with the release tarball. They are - # provided here verbatim for the convenience of anyone wanting to build - # Asterisk from other sources. - coreSounds = fetchurl { - url = http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-1.5.tar.gz; - sha256 = "01xzbg7xy0c5zg7sixjw5025pvr4z64kfzi9zvx19im0w331h4cd"; - }; - mohSounds = fetchurl { - url = http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-wav-2.03.tar.gz; - sha256 = "449fb810d16502c3052fedf02f7e77b36206ac5a145f3dacf4177843a2fcb538"; - }; - # TODO: Sounds for other languages could be added here + # asterisk-git = common { + # version = "15-pre"; + # sha256 = "..."; + # externals = { + # "externals_cache/pjproject-2.5.5.tar.bz2" = pjproject-255; + # Note that these sounds are included with the release tarball. They are + # provided here verbatim for the convenience of anyone wanting to build + # Asterisk from other sources. Include in externals. + # "sounds/asterisk-core-sounds-en-gsm-1.5.tar.gz" = fetchurl { + # url = http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-1.5.tar.gz; + # sha256 = "01xzbg7xy0c5zg7sixjw5025pvr4z64kfzi9zvx19im0w331h4cd"; + # }; + # "sounds/asterisk-moh-opsound-wav-2.03.tar.gz" = fetchurl { + # url = http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-wav-2.03.tar.gz; + # sha256 = "449fb810d16502c3052fedf02f7e77b36206ac5a145f3dacf4177843a2fcb538"; + # }; + # TODO: Sounds for other languages could be added here + # } + # }.overrideDerivation (_: {src = fetchgit {...}}) - buildInputs = [ jansson libxml2 libxslt ncurses openssl sqlite utillinux dmidecode libuuid binutils newt lua srtp wget curl subversionClient ]; - - patches = [ - # Disable downloading of sound files (we will fetch them - # ourselves if needed). - ./disable-download.patch - - # We want the Makefile to install the default /var skeleton - # under ${out}/var but we also want to use /var at runtime. - # This patch changes the runtime behavior to look for state - # directories in /var rather than ${out}/var. - ./runtime-vardirs.patch - ]; - - # Use the following preConfigure section when building Asterisk from sources - # other than the release tarball. - # preConfigure = '' - # ln -s ${coreSounds} sounds/asterisk-core-sounds-en-gsm-1.5.tar.gz - # ln -s ${mohSounds} sounds/asterisk-moh-opsound-wav-2.03.tar.gz - #''; - - # The default libdir is $PREFIX/usr/lib, which causes problems when paths - # compiled into Asterisk expect ${out}/usr/lib rather than ${out}/lib. - configureFlags = [ - "--libdir=\${out}/lib" - "--with-lua=${lua}/lib" - "--with-pjproject-bundled" - ]; - - preBuild = '' - make menuselect.makeopts - substituteInPlace menuselect.makeopts --replace 'format_mp3 ' "" - ./contrib/scripts/get_mp3_source.sh - ''; - - postInstall = '' - # Install sample configuration files for this version of Asterisk - make samples - ''; - - meta = with stdenv.lib; { - description = "Software implementation of a telephone private branch exchange (PBX)"; - homepage = http://www.asterisk.org/; - license = licenses.gpl2; - maintainers = with maintainers; [ auntie DerTim1 ]; - }; } diff --git a/pkgs/servers/asterisk/disable-download.patch b/pkgs/servers/asterisk/disable-download.patch deleted file mode 100644 index 670886bfe3c..00000000000 --- a/pkgs/servers/asterisk/disable-download.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN asterisk-14.1.2/sounds/Makefile asterisk-14.1.2-patched/sounds/Makefile ---- asterisk-14.1.2/sounds/Makefile 2016-11-10 20:43:02.000000000 +0100 -+++ asterisk-14.1.2-patched/sounds/Makefile 2016-11-16 10:08:46.591615147 +0100 -@@ -90,7 +90,7 @@ - ) && touch "$(1)$(if $(3),/$(3),)/$$@"; \ - fi - --asterisk-$(2)$(if $(3),-$(3),)-%.tar.gz: have_download -+asterisk-$(2)$(if $(3),-$(3),)-%.tar.gz: - ifneq ($(SOUNDS_CACHE_DIR),) - $(CMD_PREFIX) \ - if test ! -f "$(1)$(if $(3),/$(3),)/.$$(subst .tar.gz,,$$@)"; then \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 734644ae998..a1ae9687d61 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10219,7 +10219,10 @@ with pkgs; apcupsd = callPackage ../servers/apcupsd { }; - asterisk = callPackage ../servers/asterisk { }; + asterisk = asterisk-stable; + + inherit (callPackages ../servers/asterisk { }) + asterisk-stable asterisk-lts; sabnzbd = callPackage ../servers/sabnzbd { }; From 59fd1c802ea1f45c83f186f6517ed319229cce18 Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Thu, 2 Feb 2017 15:12:33 +0100 Subject: [PATCH 100/146] asterisk: add maintainer --- lib/maintainers.nix | 1 + pkgs/servers/asterisk/default.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index fdf57f92f0e..4672dc59d43 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -519,6 +519,7 @@ wyvie = "Elijah Rum "; yarr = "Dmitry V. "; yochai = "Yochai "; + yorickvp = "Yorick van Pelt "; yurrriq = "Eric Bailey "; z77z = "Marco Maggesi "; zagy = "Christian Zagrodnick "; diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix index 30e137205c2..ff64e83820f 100644 --- a/pkgs/servers/asterisk/default.nix +++ b/pkgs/servers/asterisk/default.nix @@ -62,7 +62,7 @@ let description = "Software implementation of a telephone private branch exchange (PBX)"; homepage = http://www.asterisk.org/; license = licenses.gpl2; - maintainers = with maintainers; [ auntie DerTim1 ]; + maintainers = with maintainers; [ auntie DerTim1 yorickvp ]; }; }; From 1b47bc94771c42c61561199b7199e60165da2fed Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Thu, 2 Feb 2017 15:13:02 +0100 Subject: [PATCH 101/146] service.asterisk: add package option --- .../modules/services/networking/asterisk.nix | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/networking/asterisk.nix b/nixos/modules/services/networking/asterisk.nix index 5c71a1d8dda..514204db33f 100644 --- a/nixos/modules/services/networking/asterisk.nix +++ b/nixos/modules/services/networking/asterisk.nix @@ -17,7 +17,7 @@ let allConfFiles = cfg.confFiles // builtins.listToAttrs (map (x: { name = x; - value = builtins.readFile (pkgs.asterisk + "/etc/asterisk/" + x); }) + value = builtins.readFile (cfg.package + "/etc/asterisk/" + x); }) defaultConfFiles); asteriskEtc = pkgs.stdenv.mkDerivation @@ -38,7 +38,7 @@ let asteriskConf = '' [directories] astetcdir => /etc/asterisk - astmoddir => ${pkgs.asterisk}/lib/asterisk/modules + astmoddir => ${cfg.package}/lib/asterisk/modules astvarlibdir => /var/lib/asterisk astdbdir => /var/lib/asterisk astkeydir => /var/lib/asterisk @@ -47,7 +47,7 @@ let astspooldir => /var/spool/asterisk astrundir => /var/run/asterisk astlogdir => /var/log/asterisk - astsbindir => ${pkgs.asterisk}/sbin + astsbindir => ${cfg.package}/sbin ''; extraConf = cfg.extraConfig; @@ -197,11 +197,17 @@ in Additional command line arguments to pass to Asterisk. ''; }; + package = mkOption { + type = types.package; + default = pkgs.asterisk; + defaultText = "pkgs.asterisk"; + description = "The Asterisk package to use."; + }; }; }; config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.asterisk ]; + environment.systemPackages = [ cfg.package ]; environment.etc.asterisk.source = asteriskEtc; @@ -234,7 +240,7 @@ in # TODO: Make exceptions for /var directories that likely should be updated if [ ! -e "$d" ]; then mkdir -p "$d" - cp --recursive ${pkgs.asterisk}/"$d"/* "$d"/ + cp --recursive ${cfg.package}/"$d"/* "$d"/ chown --recursive ${asteriskUser}:${asteriskGroup} "$d" find "$d" -type d | xargs chmod 0755 fi @@ -247,8 +253,8 @@ in # FIXME: This doesn't account for arguments with spaces argString = concatStringsSep " " cfg.extraArguments; in - "${pkgs.asterisk}/bin/asterisk -U ${asteriskUser} -C /etc/asterisk/asterisk.conf ${argString} -F"; - ExecReload = ''${pkgs.asterisk}/bin/asterisk -x "core reload" + "${cfg.package}/bin/asterisk -U ${asteriskUser} -C /etc/asterisk/asterisk.conf ${argString} -F"; + ExecReload = ''${cfg.package}/bin/asterisk -x "core reload" ''; Type = "forking"; PIDFile = "/var/run/asterisk/asterisk.pid"; From 9438cc264f876e3d2b46f35f6f0a0cec6bc69145 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Thu, 2 Feb 2017 15:18:28 +0100 Subject: [PATCH 102/146] shelly: fix build on GHC-8.0.2 --- .../haskell-modules/configuration-common.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4d74f453859..a09d4c4a3cd 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -874,7 +874,17 @@ self: super: { # https://github.com/yesodweb/Shelly.hs/issues/106 # https://github.com/yesodweb/Shelly.hs/issues/108 - shelly = dontCheck super.shelly; + # https://github.com/yesodweb/Shelly.hs/issues/130 + shelly = + let drv = appendPatch (dontCheck (doJailbreak super.shelly)) (pkgs.fetchpatch { + url = "https://github.com/k0001/Shelly.hs/commit/32a1e290961755e7b2379f59faa49b13d03dfef6.patch"; + sha256 = "0ccq0qly8bxxv64dk97a44ng6hb01j6ajs0sp3f2nn0hf5j3xv69"; + }); + in overrideCabal drv (drv : { + # doJailbreak doesn't seem to work for build-depends inside an + # if-then-else block so we have to do it manually. + postPatch = "sed -i 's/base >=4\.6 \&\& <4\.9\.1/base -any/' shelly.cabal"; + }); # https://github.com/bos/configurator/issues/22 configurator = dontCheck super.configurator; From 6dca78e1ae08a9e89678f1c1aef3d358475e8657 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 2 Feb 2017 15:20:16 +0100 Subject: [PATCH 103/146] heimdall: clean up the build expression - Make sure the front-end-less build does not depend on QT. - Don't override patchPhase because that will lead to unexpected results for people who try to defined a "patches = [...]" attribute. --- pkgs/tools/misc/heimdall/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/heimdall/default.nix b/pkgs/tools/misc/heimdall/default.nix index 1f24679fc96..4fb71b688c3 100644 --- a/pkgs/tools/misc/heimdall/default.nix +++ b/pkgs/tools/misc/heimdall/default.nix @@ -13,20 +13,22 @@ stdenv.mkDerivation { }; buildInputs = [ zlib libusb1 cmake ]; - patchPhase = stdenv.lib.optional (!enableGUI) '' - sed -i '/heimdall-frontend/d' CMakeLists.txt - ''; - enableParallelBuilding = true; + cmakeFlags = [ + "-DBUILD_TYPE=Release" + "-DDISABLE_FRONTEND=${if enableGUI then "OFF" else "ON"}" + ] ++ stdenv.lib.optionals enableGUI [ "-DQt5Widgets_DIR=${qt5.qtbase.dev}/lib/cmake/Qt5Widgets" "-DQt5Gui_DIR=${qt5.qtbase.dev}/lib/cmake/Qt5Gui" "-DQt5Core_DIR=${qt5.qtbase.dev}/lib/cmake/Qt5Core" - "-DBUILD_TYPE=Release" ]; preConfigure = '' # Give ownership of the Galaxy S USB device to the logged in user. substituteInPlace heimdall/60-heimdall.rules --replace 'MODE="0666"' 'TAG+="uaccess"' + + # Fix version string reported by the executable. + sed -i -e 's/version = "v.*"/version = "v${version}"/' heimdall/source/Interface.cpp ''; installPhase = '' @@ -36,6 +38,8 @@ stdenv.mkDerivation { cp ../heimdall/60-heimdall.rules $out/lib/udev/rules.d ''; + enableParallelBuilding = true; + meta = { homepage = "http://www.glassechidna.com.au/products/heimdall/"; description = "A cross-platform tool suite to flash firmware onto Samsung Galaxy S devices"; From 364f089fe734be41d00f9c283e63976b280ef59a Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 2 Feb 2017 15:23:56 +0100 Subject: [PATCH 104/146] mpd: 0.20 -> 0.20.4 Fixes bugs at least one crash. Fixes #22368. --- pkgs/servers/mpd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index c07ca6a8342..09d72a12cf0 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -30,13 +30,13 @@ let opt = stdenv.lib.optional; mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}"; major = "0.20"; - minor = ""; + minor = "4"; in stdenv.mkDerivation rec { name = "mpd-${major}${if minor == "" then "" else "." + minor}"; src = fetchurl { url = "http://www.musicpd.org/download/mpd/${major}/${name}.tar.xz"; - sha256 = "068nxsfkp2ppcjh3fmcbapkiwnjpvkii73bfydpw4bf2yphdvsa8"; + sha256 = "0a4psqsf71vc6hfgyv55jclsx8yb7lf4w840qlq6cq8j3hsjaavi"; }; buildInputs = [ pkgconfig glib boost ] @@ -111,7 +111,7 @@ in stdenv.mkDerivation rec { description = "A flexible, powerful daemon for playing music"; homepage = http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki; license = licenses.gpl2; - maintainers = with maintainers; [ astsmtl fuuzetsu ehmry ]; + maintainers = with maintainers; [ astsmtl fuuzetsu ehmry fpletz ]; platforms = platforms.unix; longDescription = '' From 7bc17013f83934de37d2c2eaf0b61a388d312aa4 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Thu, 2 Feb 2017 16:28:32 +0100 Subject: [PATCH 105/146] aws-sdk-cpp: 1.0.48 -> 1.0.60 --- pkgs/development/libraries/aws-sdk-cpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 6a18ff3ed24..a47e740be95 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -14,13 +14,13 @@ let else throw "Unsupported system!"; in stdenv.mkDerivation rec { name = "aws-sdk-cpp-${version}"; - version = "1.0.48"; + version = "1.0.60"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-sdk-cpp"; rev = version; - sha256 = "1k73ir1w6457y9mdv2xnk8cr1y1xxhzzd4095rzvn2y7fr3zgz01"; + sha256 = "0k6jv70l4xhkf2rna6zaxkxgd7xh7cc1ghzska637h5d2v6h8nzk"; }; # FIXME: might be nice to put different APIs in different outputs From 5cc75352f8b9705e35ed7e1a6a7d1e3f012ba9b8 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Thu, 2 Feb 2017 16:34:41 +0100 Subject: [PATCH 106/146] wordpress: 4.7.1 -> 4.7.2 See: https://make.wordpress.org/core/2017/02/01/disclosure-of-additional-security-fix-in-wordpress-4-7-2/ --- nixos/modules/services/web-servers/apache-httpd/wordpress.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix index 26f0bdec655..a5b6548d3c5 100644 --- a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix +++ b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix @@ -6,7 +6,7 @@ with lib; let # Upgrading? We have a test! nix-build ./nixos/tests/wordpress.nix - version = "4.7.1"; + version = "4.7.2"; fullversion = "${version}"; # Our bare-bones wp-config.php file using the above settings @@ -75,7 +75,7 @@ let owner = "WordPress"; repo = "WordPress"; rev = "${fullversion}"; - sha256 = "1wb4f4zn55d23qi0whsfpbpcd4sjvzswgmni6f5rzrmlawq9ssgr"; + sha256 = "0vph12708drf8ww0xd05hpdvbyy7n5gj9ca598lhdhy2i1j6wy32"; }; installPhase = '' mkdir -p $out From 1d85e0bbab6a9f1b5a0d0a66c0ed927f6198f63b Mon Sep 17 00:00:00 2001 From: Fernando J Pando Date: Wed, 1 Feb 2017 11:26:55 -0500 Subject: [PATCH 107/146] hologram: 8d86e3f -> d20d1c3 - Updates dependencies - Adds configuration module - Tested on Nixos Unstable --- nixos/modules/module-list.nix | 3 +- .../services/security/hologram-agent.nix | 57 +++++++++++++++++++ .../{hologram.nix => hologram-server.nix} | 0 pkgs/tools/security/hologram/default.nix | 18 ++++-- pkgs/tools/security/hologram/deps.nix | 9 +++ 5 files changed, 81 insertions(+), 6 deletions(-) create mode 100644 nixos/modules/services/security/hologram-agent.nix rename nixos/modules/services/security/{hologram.nix => hologram-server.nix} (100%) diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 23acc11db23..fed75053e56 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -498,7 +498,8 @@ ./services/security/frandom.nix ./services/security/haka.nix ./services/security/haveged.nix - ./services/security/hologram.nix + ./services/security/hologram-server.nix + ./services/security/hologram-agent.nix ./services/security/munge.nix ./services/security/oauth2_proxy.nix ./services/security/physlock.nix diff --git a/nixos/modules/services/security/hologram-agent.nix b/nixos/modules/services/security/hologram-agent.nix new file mode 100644 index 00000000000..49b5c935267 --- /dev/null +++ b/nixos/modules/services/security/hologram-agent.nix @@ -0,0 +1,57 @@ +{pkgs, config, lib, ...}: + +with lib; + +let + cfg = config.services.hologram-agent; + + cfgFile = pkgs.writeText "hologram-agent.json" (builtins.toJSON { + host = cfg.dialAddress; + }); +in { + options = { + services.hologram-agent = { + enable = mkOption { + type = types.bool; + default = false; + description = "Whether to enable the Hologram agent for AWS instance credentials"; + }; + + dialAddress = mkOption { + type = types.str; + default = "localhost:3100"; + description = "Hologram server and port."; + }; + + httpPort = mkOption { + type = types.str; + default = "80"; + description = "Port for metadata service to listen on."; + }; + + }; + }; + + config = mkIf cfg.enable { + networking.interfaces.dummy0 = { + ipAddress = "169.254.169.254"; + prefixLength = 32; + }; + + systemd.services.hologram-agent = { + description = "Provide EC2 instance credentials to machines outside of EC2"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + requires = [ "network-link-dummy0.service" "network-addresses-dummy0.service" ]; + preStart = '' + /run/current-system/sw/bin/rm -fv /var/run/hologram.sock + ''; + serviceConfig = { + ExecStart = "${pkgs.hologram.bin}/bin/hologram-agent -debug -conf ${cfgFile} -port ${cfg.httpPort}"; + }; + }; + + }; + + meta.maintainers = with lib.maintainers; [ nand0p ]; +} diff --git a/nixos/modules/services/security/hologram.nix b/nixos/modules/services/security/hologram-server.nix similarity index 100% rename from nixos/modules/services/security/hologram.nix rename to nixos/modules/services/security/hologram-server.nix diff --git a/pkgs/tools/security/hologram/default.nix b/pkgs/tools/security/hologram/default.nix index e7673cf5842..abdcd5d2d3e 100644 --- a/pkgs/tools/security/hologram/default.nix +++ b/pkgs/tools/security/hologram/default.nix @@ -2,16 +2,24 @@ buildGoPackage rec { name = "hologram-${version}"; - version = "20160209-${stdenv.lib.strings.substring 0 7 rev}"; - rev = "8d86e3fdcbfd967ba58d8de02f5e8173c101212e"; - - goPackagePath = "github.com/AdRoll/hologram"; + version = "20170130-${stdenv.lib.strings.substring 0 7 rev}"; + rev = "d20d1c30379e7010e8f9c428a5b9e82f54d390e1"; src = fetchgit { inherit rev; url = "https://github.com/AdRoll/hologram"; - sha256 = "0i0p170brdsczfz079mqbc5y7x7mdph04p3wgqsd7xcrddvlkkaf"; + sha256 = "0dg5kfs16kf2gzhpmzsg83qzi2pxgnc9g81lw5zpa6fmzpa9kgsn"; }; + goPackagePath = "github.com/AdRoll/hologram"; + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + homepage = https://github.com/AdRoll/hologram/; + description = "Easy, painless AWS credentials on developer laptops."; + maintainers = with maintainers; [ nand0p ]; + platforms = platforms.all; + license = licenses.asl20; + }; } diff --git a/pkgs/tools/security/hologram/deps.nix b/pkgs/tools/security/hologram/deps.nix index 2c4cdbe84f0..a9b66da2a9c 100644 --- a/pkgs/tools/security/hologram/deps.nix +++ b/pkgs/tools/security/hologram/deps.nix @@ -98,4 +98,13 @@ sha256 = "179lwaf0hvczl8g4xzkpcpzq25p1b23f7399bx5zl55iin62d8yz"; }; } + { + goPackagePath = "github.com/aws/aws-sdk-go"; + fetch = { + type = "git"; + url = "https://github.com/aws/aws-sdk-go"; + rev = "3f8f870ec9939e32b3372abf74d24e468bcd285d"; + sha256 = "0a4hycs3d87s50z4prf5h6918r0fa2rvrrwlbffs430ilc4y8ghv"; + }; + } ] From 28a324b01d059bc0bebce5c31eb8091c2ff38696 Mon Sep 17 00:00:00 2001 From: Pierre Radermecker Date: Thu, 2 Feb 2017 17:28:20 +0100 Subject: [PATCH 108/146] hackage2nix: remove swagger2 from the list of broken packages --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 41814d382e0..75b59ced71c 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -7140,7 +7140,6 @@ dont-distribute-packages: svgutils: [ i686-linux, x86_64-linux, x86_64-darwin ] svm-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] svndump: [ i686-linux, x86_64-linux, x86_64-darwin ] - swagger2: [ i686-linux, x86_64-linux, x86_64-darwin ] swagger: [ i686-linux, x86_64-linux, x86_64-darwin ] swapper: [ i686-linux, x86_64-linux, x86_64-darwin ] swearjure: [ i686-linux, x86_64-linux, x86_64-darwin ] From 008a6a571bc61891f629b427b4ea3ef1af94b153 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 2 Feb 2017 18:43:10 +0100 Subject: [PATCH 109/146] strace: 4.14 -> 4.15 --- pkgs/development/tools/misc/strace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index 5152067efa1..d0e05dd35f8 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.14"; + version = "4.15"; src = fetchurl { url = "mirror://sourceforge/strace/${name}.tar.xz"; - sha256 = "0bvicjkqk3c09zyxgkakymiqr3618sa2dfpd9f3fdp23n8853vav"; + sha256 = "1a9wb2nzfqgwazd0yrlbk48awlfn898n1bdayvdxj7qlssac1kf0"; }; nativeBuildInputs = [ perl ]; From 2a825540dbec6a7b018446671d4ae07cd9ca7f69 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Thu, 2 Feb 2017 18:49:23 +0100 Subject: [PATCH 110/146] parallel: 20161222 -> 20170122 --- pkgs/tools/misc/parallel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 99a933b3243..842616793a3 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl, makeWrapper, procps }: stdenv.mkDerivation rec { - name = "parallel-20161222"; + name = "parallel-20170122"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "1chgr3csyc7hbq2wq4jnwnbsr3ix8rzsk2lf4vdnvkjpd6dvw517"; + sha256 = "19maf889vj1c4zakqwap58f44hgypyb5mzzwfsliir9gvvcq6zj1"; }; nativeBuildInputs = [ makeWrapper ]; From 269b8a32ed1d4ca9e3294de53d00e5a55e297c9b Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 2 Feb 2017 18:45:19 +0100 Subject: [PATCH 111/146] lr: 0.2 -> 0.3.2 --- pkgs/tools/system/lr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/lr/default.nix b/pkgs/tools/system/lr/default.nix index 47233532df3..36b84c21154 100644 --- a/pkgs/tools/system/lr/default.nix +++ b/pkgs/tools/system/lr/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: let - version = "0.2"; + version = "0.3.2"; in stdenv.mkDerivation { name = "lr-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { owner = "chneukirchen"; repo = "lr"; rev = "v${version}"; - sha256 = "1wn1j0cf84r4nli92myf3waackh2p6r2hkavgx6533x15kdyfnf7"; + sha256 = "1bbgzshayk0kzmlyw44jqskgmxz5c4jh2h0bqg3n5zi89588ng2k"; }; makeFlags = "PREFIX=$(out)"; @@ -21,6 +21,6 @@ stdenv.mkDerivation { description = "List files recursively"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; - maintainers = [stdenv.lib.maintainers.globin]; + maintainers = [ stdenv.lib.maintainers.globin ]; }; } From a0aacdd199224df43aafc6f8f7e495b26c147f7b Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 2 Feb 2017 18:53:45 +0100 Subject: [PATCH 112/146] lxc: 2.0.6 -> 2.0.7 --- pkgs/os-specific/linux/lxc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index 3c413ca2426..ccee2a18a90 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -12,11 +12,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "lxc-${version}"; - version = "2.0.6"; + version = "2.0.7"; src = fetchurl { url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz"; - sha256 = "0ynddnfirh9pmy7ijg300jrgzdhjzm07fsmvdw71mb2x0p82qabw"; + sha256 = "0paz0lgb9dzpgahysad1cr6gz54l6xyhqdx6dzw2kh3fy1sw028w"; }; nativeBuildInputs = [ From 8821ef9dc5b558da7a4385c17c4676f0e861ccfe Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 2 Feb 2017 18:54:10 +0100 Subject: [PATCH 113/146] redir: 2.2.1 -> 3.1 --- pkgs/tools/networking/redir/default.nix | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/networking/redir/default.nix b/pkgs/tools/networking/redir/default.nix index 1fcb73e00dc..620e8d3dbba 100644 --- a/pkgs/tools/networking/redir/default.nix +++ b/pkgs/tools/networking/redir/default.nix @@ -1,21 +1,21 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - name = "redir-2.2.1"; + name = "redir-${version}"; + version = "3.1"; - src = fetchurl { - url = "http://sammy.net/~sammy/hacks/${name}.tar.gz"; - sha256 = "0v0f14br00rrmd1ss644adsby4gm29sn7a2ccy7l93ik6pw099by"; + src = fetchFromGitHub { + owner = "troglobit"; + repo = "redir"; + rev = "v${version}"; + sha256 = "1m05dchi15bzz9zfdb7jg59624sx4khp5zq0wf4pzr31s64f69cx"; }; - installPhase = '' - mkdir -p $out/bin - cp redir $out/bin - ''; + nativeBuildInputs = [ autoreconfHook ]; meta = { - description = "A port redirector"; - homepage = http://sammy.net/~sammy/hacks/; + description = "A TCP port redirector for UNIX"; + homepage = "https://github.com/troglobit/redir"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ globin ]; platforms = stdenv.lib.platforms.linux; From 51f4e1829cffdf1068ad811137dd78a2260ddfaf Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 2 Feb 2017 18:57:17 +0100 Subject: [PATCH 114/146] sslscan: 1.11.7 -> 1.11.8 --- pkgs/tools/security/sslscan/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/security/sslscan/default.nix b/pkgs/tools/security/sslscan/default.nix index 6b205d84534..90034b641a0 100644 --- a/pkgs/tools/security/sslscan/default.nix +++ b/pkgs/tools/security/sslscan/default.nix @@ -2,20 +2,18 @@ stdenv.mkDerivation rec { name = "sslscan-${version}"; - version = "1.11.7"; + version = "1.11.8"; src = fetchFromGitHub { owner = "rbsec"; repo = "sslscan"; rev = "${version}-rbsec"; - sha256 = "007lf3rxcn9nz6jrki3mavgd9sd2hmm9nzp2g13h0ri51yc3bkp0"; + sha256 = "0vm9r0hmpb6ifix2biqbr7za1rld9yx8hi8vf7j69vcm647z7aas"; }; buildInputs = [ openssl ]; - installFlags = [ - "PREFIX=$(out)" - ]; + installFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { description = "Tests SSL/TLS services and discover supported cipher suites"; From 756bcc3d959b61da60e5586afa389ba257e49b82 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 2 Feb 2017 19:04:01 +0100 Subject: [PATCH 115/146] moonlight-embedded: 2.2.1 -> 2.2.3 --- pkgs/applications/misc/moonlight-embedded/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/moonlight-embedded/default.nix b/pkgs/applications/misc/moonlight-embedded/default.nix index 9171e012807..391440f8622 100644 --- a/pkgs/applications/misc/moonlight-embedded/default.nix +++ b/pkgs/applications/misc/moonlight-embedded/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "moonlight-embedded-${version}"; - version = "2.2.1"; + version = "2.2.3"; # fetchgit used to ensure submodules are available src = fetchgit { From 944403a3fd3332efb03c83462776bb2643b28064 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 2 Feb 2017 19:10:15 +0100 Subject: [PATCH 116/146] babeld: 1.7.1 -> 1.8.0 --- pkgs/tools/networking/babeld/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/babeld/default.nix b/pkgs/tools/networking/babeld/default.nix index 1f5b5a7c638..d3b99a9381e 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.7.1"; + name = "babeld-1.8.0"; src = fetchurl { url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/${name}.tar.gz"; - sha256 = "1dl7s2lb40kiysrqhr7zd0s90yfxy6xfsp0fhqgdlwfr99ymx59c"; + sha256 = "0v2jkav2sb0rpx3fmi5chhii08lc92pxf306nyha2amq9wib3a0i"; }; preBuild = '' From bd3ac6938bb4e1d1d24fc7c2add6a8e1918aac7e Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 2 Feb 2017 19:15:10 +0100 Subject: [PATCH 117/146] claws-mail: 3.14.0 -> 3.14.1 --- .../mailreaders/claws-mail/default.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index 346dba3acd5..7186917269d 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -32,19 +32,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "claws-mail-${version}"; - version = "3.14.0"; - - meta = { - description = "The user-friendly, lightweight, and fast email client"; - homepage = http://www.claws-mail.org/; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ khumba fpletz ]; - }; + version = "3.14.1"; src = fetchurl { url = "http://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz"; - sha256 = "0nfchgga3ir91s8rky0a0vnz8cgj2f6h716wh3cmb466a01xfss6"; + sha256 = "0df34gj4r5cbb92834hph19gnh7ih9rgmmw47rliyg8b9z01v6mp"; }; patches = [ ./mime.patch ]; @@ -99,4 +91,12 @@ stdenv.mkDerivation rec { mkdir -p $out/share/applications cp claws-mail.desktop $out/share/applications ''; + + meta = { + description = "The user-friendly, lightweight, and fast email client"; + homepage = http://www.claws-mail.org/; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ khumba fpletz globin ]; + }; } From 209d453bfb4f7e7ebc53e13f97f40e2859fd1456 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 2 Feb 2017 19:17:57 +0100 Subject: [PATCH 118/146] fail2ban: 0.9.4 -> 0.9.6 --- pkgs/tools/security/fail2ban/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix index 695bfcce3a5..e7a052c90f1 100644 --- a/pkgs/tools/security/fail2ban/default.nix +++ b/pkgs/tools/security/fail2ban/default.nix @@ -1,16 +1,15 @@ { stdenv, fetchFromGitHub, python, pythonPackages, gamin }: -let version = "0.9.4"; in +let version = "0.9.6"; in pythonPackages.buildPythonApplication { name = "fail2ban-${version}"; - namePrefix = ""; src = fetchFromGitHub { owner = "fail2ban"; repo = "fail2ban"; rev = version; - sha256 = "1m8gqj35kwrn30rqwd488sgakaisz22xa5v9llvz6gwf4f7ps0a9"; + sha256 = "1a75xjjqhn98zd9i51k15vjvcy0ql0gmcv9xf8pbd0bpvblgdah8"; }; propagatedBuildInputs = [ gamin ] From 1393d7158a61bec64d3fb8074470bcf7bbba5d22 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 2 Feb 2017 19:18:57 +0100 Subject: [PATCH 119/146] whois: 5.2.12 -> 5.2.14 --- pkgs/tools/networking/whois/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix index f7c94c1e72b..1a8104c2ee1 100644 --- a/pkgs/tools/networking/whois/default.nix +++ b/pkgs/tools/networking/whois/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, perl, gettext }: stdenv.mkDerivation rec { - version = "5.2.12"; + version = "5.2.14"; name = "whois-${version}"; src = fetchFromGitHub { owner = "rfc1036"; repo = "whois"; rev = "v${version}"; - sha256 = "1cis7zwh0r1hqbl2wa3i2x1446nrhfqfd52b2lknfml64l08rnk5"; + sha256 = "06nx295g03z7vzrrc3mhxikpw870zvkilrlxghd2rpcbm939iin5"; }; buildInputs = [ perl gettext ]; From 72e2de3a078e15692c255fd451fc33dc974f4361 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 2 Feb 2017 19:24:03 +0100 Subject: [PATCH 120/146] rspamd: 1.4.1 -> 1.4.3 --- pkgs/servers/mail/rspamd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix index 692227b5094..6283bed96c3 100644 --- a/pkgs/servers/mail/rspamd/default.nix +++ b/pkgs/servers/mail/rspamd/default.nix @@ -6,13 +6,13 @@ in stdenv.mkDerivation rec { name = "rspamd-${version}"; - version = "1.4.1"; + version = "1.4.3"; src = fetchFromGitHub { owner = "vstakhov"; repo = "rspamd"; rev = version; - sha256 = "19hy9qr9lv17br2algig95d64zzdyly7n6c3z8fanwcpk35sgrhr"; + sha256 = "1wrqi8vsd61rc48x2gyhc0xrir9pr372lpkyhwgx1rpxzdxsdwh9"; }; nativeBuildInputs = [ cmake pkgconfig perl ]; From 0e0f0d0478dcfd2c7a97e37ef83df9dc7841873f Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 2 Feb 2017 19:27:12 +0100 Subject: [PATCH 121/146] radvd: 2.15 -> 2.16 --- pkgs/tools/networking/radvd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/radvd/default.nix b/pkgs/tools/networking/radvd/default.nix index 6c74b52b45f..a5008e91423 100644 --- a/pkgs/tools/networking/radvd/default.nix +++ b/pkgs/tools/networking/radvd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "radvd-${version}"; - version = "2.15"; + version = "2.16"; src = fetchurl { url = "http://www.litech.org/radvd/dist/${name}.tar.xz"; - sha256 = "09spyj4f05rjx21v8vmyqmmj0fz1wx810s63md1vf05hyzd0v8dk"; + sha256 = "1s3aqgn3db0wb4920b0mrvwb5isgijlb6izb1wliqhhashwffz1i"; }; nativeBuildInputs = [ pkgconfig bison flex check ]; From e3d9f438c357377d524036f88c45e9245c3809fc Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 2 Feb 2017 19:32:46 +0100 Subject: [PATCH 122/146] nmap: 7.31 -> 7.40 --- pkgs/tools/security/nmap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index 71d93d44322..aefa82128ac 100644 --- a/pkgs/tools/security/nmap/default.nix +++ b/pkgs/tools/security/nmap/default.nix @@ -19,11 +19,11 @@ let in stdenv.mkDerivation rec { name = "nmap${optionalString graphicalSupport "-graphical"}-${version}"; - version = "7.31"; + version = "7.40"; src = fetchurl { url = "https://nmap.org/dist/nmap-${version}.tar.bz2"; - sha256 = "0hiqb28950kn4bjsmw0ksfyss7j2qdmgrj3xsjf7073pq01lx7yb"; + sha256 = "121i9mgyc28ra2825akd0ix5qyssv4xc2qlx296mam6hzxgnc54y"; }; patches = ./zenmap.patch; From d1738c19bb5fe487087386160c3f134413a10b9a Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Wed, 1 Feb 2017 21:25:29 +0100 Subject: [PATCH 123/146] kernel: 4.9.6 -> 4.9.7 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index ce041ecf0e9..02a86f0a196 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.9.6"; + version = "4.9.7"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "16yfrydxcdlbm8vmfqirc0gshsbka6mjgfwc2wqs422v19vsz4zl"; + sha256 = "1p1k1swmpky6iafb6snixhvq3prwbn29fd5cnnv7qff7f4xjhq8b"; }; kernelPatches = args.kernelPatches; From 599df5e1082c246a995ca91fc052021b89724be0 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Thu, 2 Feb 2017 19:31:14 +0100 Subject: [PATCH 124/146] virtualbox: 5.1.10 -> 5.1.14 --- pkgs/applications/virtualization/virtualbox/default.nix | 8 ++++---- .../virtualization/virtualbox/guest-additions/default.nix | 2 +- .../virtualization/virtualbox/upstream-info.json | 8 ++++++++ 3 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 pkgs/applications/virtualization/virtualbox/upstream-info.json diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index d0c98911387..7512ddb6b0f 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -18,10 +18,10 @@ let python = python2; buildType = "release"; - extpack = "3982657fd4853bcbc79b9162e618545a479b65aca08e9ced43a904aeeba3ffa5"; - extpackRev = 112026; - main = "98073b1b2adee4e6553df73cb5bb6ea8ed7c3a41a475757716fd9400393bea40"; - version = "5.1.10"; + extpack = "baddb7cc49224ecc1147f82d77fce2685ac39941ac9b0aac83c270dd6570ea85"; + extpackRev = 112924; + main = "8267bb026717c6e55237eb798210767d9c703cfcdf01224d9bc26f7dac9f228a"; + version = "5.1.14"; # See https://github.com/NixOS/nixpkgs/issues/672 for details extensionPack = requireFile rec { diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index fe362616bc5..d73c18badb1 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "29fa0af66a3dd273b0c383c4adee31a52061d52f57d176b67f444698300b8c41"; + sha256 = "1b206b76050dccd3ed979307230f9ddea79551e1c0aba93faee77416733cdc8a"; }; KERN_DIR = "${kernel.dev}/lib/modules/*/build"; diff --git a/pkgs/applications/virtualization/virtualbox/upstream-info.json b/pkgs/applications/virtualization/virtualbox/upstream-info.json new file mode 100644 index 00000000000..8628751f2a1 --- /dev/null +++ b/pkgs/applications/virtualization/virtualbox/upstream-info.json @@ -0,0 +1,8 @@ +{ + "__NOTE": "Generated using update.py from the same directory.", + "extpack": "baddb7cc49224ecc1147f82d77fce2685ac39941ac9b0aac83c270dd6570ea85", + "extpackRev": "112924", + "guest": "1b206b76050dccd3ed979307230f9ddea79551e1c0aba93faee77416733cdc8a", + "main": "8267bb026717c6e55237eb798210767d9c703cfcdf01224d9bc26f7dac9f228a", + "version": "5.1.14" +} From 5ca3a7e56f8b508e513b381b4d62a0682ae94bfa Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Thu, 2 Feb 2017 21:11:08 +0100 Subject: [PATCH 125/146] virtualbox: remove upstream-info.json as it is no longer used We keep the script as it might be useful in the future. --- .../virtualization/virtualbox/upstream-info.json | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 pkgs/applications/virtualization/virtualbox/upstream-info.json diff --git a/pkgs/applications/virtualization/virtualbox/upstream-info.json b/pkgs/applications/virtualization/virtualbox/upstream-info.json deleted file mode 100644 index 8628751f2a1..00000000000 --- a/pkgs/applications/virtualization/virtualbox/upstream-info.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "__NOTE": "Generated using update.py from the same directory.", - "extpack": "baddb7cc49224ecc1147f82d77fce2685ac39941ac9b0aac83c270dd6570ea85", - "extpackRev": "112924", - "guest": "1b206b76050dccd3ed979307230f9ddea79551e1c0aba93faee77416733cdc8a", - "main": "8267bb026717c6e55237eb798210767d9c703cfcdf01224d9bc26f7dac9f228a", - "version": "5.1.14" -} From a70b4f7b3896b082c8547797f7e676de49d72ea3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Sat, 8 Oct 2016 18:07:15 +0200 Subject: [PATCH 126/146] kodi: 16.1 -> 17.0 --- pkgs/applications/video/kodi/default.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index dccb8412733..ee0be6419aa 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, makeWrapper , pkgconfig, cmake, gnumake, yasm, python2 -, boost, avahi, libdvdcss, lame, autoreconfHook +, boost, avahi, libdvdcss, libdvdnav, libdvdread, lame, autoreconfHook , gettext, pcre-cpp, yajl, fribidi, which , openssl, gperf, tinyxml2, taglib, libssh, swig, jre , libX11, xproto, inputproto, libxml2 @@ -38,18 +38,18 @@ assert pulseSupport -> libpulseaudio != null; assert rtmpSupport -> rtmpdump != null; let - rel = "Jarvis"; - ffmpeg_2_8_6 = fetchurl { - url = "https://github.com/xbmc/FFmpeg/archive/2.8.6-${rel}-16.1.tar.gz"; - sha256 = "1qp8b97298l2pnhhcp7xczdfwr7q7ibxlk4vp8pfmxli2h272wan"; + rel = "Krypton"; + ffmpeg_3_1_6 = fetchurl { + url = "https://github.com/xbmc/FFmpeg/archive/3.1.6-${rel}.tar.gz"; + sha256 = "14jicb26s20nr3qmfpazszpc892yjwjn81zbsb8szy3a5xs19y81"; }; in stdenv.mkDerivation rec { name = "kodi-" + version; - version = "16.1"; + version = "17.0"; src = fetchurl { url = "https://github.com/xbmc/xbmc/archive/${version}-${rel}.tar.gz"; - sha256 = "047xpmz78k3d6nhk1x9s8z0bw1b1w9kca46zxkg86p3iyapwi0kx"; + sha256 = "0ib59x733yf8ivsw82qlsq43jn5214n668nrn5df2flpjcjgmzsb"; }; buildInputs = [ @@ -90,7 +90,10 @@ in stdenv.mkDerivation rec { --replace 'usr/share/zoneinfo' 'etc/zoneinfo' substituteInPlace tools/depends/target/ffmpeg/autobuild.sh \ --replace "/bin/bash" "${bash}/bin/bash -ex" - cp ${ffmpeg_2_8_6} tools/depends/target/ffmpeg/ffmpeg-2.8.6-${rel}-16.0.tar.gz + cp ${ffmpeg_3_1_6} tools/depends/target/ffmpeg/ffmpeg-3.1.6-${rel}.tar.gz + ln -s ${libdvdcss.src} tools/depends/target/libdvdcss/libdvdcss-master.tar.gz + ln -s ${libdvdnav.src} tools/depends/target/libdvdnav/libdvdnav-master.tar.gz + ln -s ${libdvdread.src} tools/depends/target/libdvdread/libdvdread-master.tar.gz ''; preConfigure = '' From d211d7c44009df5fd57b231cac183250b56a6cf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carles=20Pag=C3=A8s?= Date: Wed, 19 Oct 2016 00:08:27 +0200 Subject: [PATCH 127/146] kodiPlugins.pvr-hts: update to 3.4.4 for kodi17 Updated pvr-hts plugin to latest version to work with kodi 17. Had to update libcec as well, to pick the name change. --- pkgs/applications/video/kodi/plugins.nix | 12 ++++++------ pkgs/development/libraries/libcec/default.nix | 4 ++-- pkgs/development/libraries/libcec/platform.nix | 10 +++++----- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix index 6abb47b81c3..b56f461ee2a 100644 --- a/pkgs/applications/video/kodi/plugins.nix +++ b/pkgs/applications/video/kodi/plugins.nix @@ -6,14 +6,14 @@ let kodi-platform = stdenv.mkDerivation rec { project = "kodi-platform"; - version = "15.2"; + version = "17.1"; name = "${project}-${version}"; src = fetchFromGitHub { owner = "xbmc"; repo = project; - rev = "45d6ad1984fdb1dc855076ff18484dbec33939d1"; - sha256 = "1fai33mwyv5ab47b16i692g7a3vcnmxavx13xin2gh16y0qm62hi"; + rev = "c8188d82678fec6b784597db69a68e74ff4986b5"; + sha256 = "1r3gs3c6zczmm66qcxh9mr306clwb3p7ykzb70r3jv5jqggiz199"; }; buildInputs = [ cmake kodi libcec_platform tinyxml ]; @@ -219,13 +219,13 @@ in pvr-hts = (mkKodiPlugin rec { plugin = "pvr-hts"; namespace = "pvr.hts"; - version = "2.2.13"; + version = "3.4.4"; src = fetchFromGitHub { owner = "kodi-pvr"; repo = "pvr.hts"; - rev = "3274354511e970e2101c2aa437001b2f245f80da"; - sha256 = "0i7cb61pjv6vbj3x96cm1n4w91mvc8z6lxa8ykjasrrbi95ph7ld"; + rev = "343ca980982d87c778696e42e52eff763cadee4a"; + sha256 = "03jk45nk1c5j7zwj6l8s8jyf6ijhisp1r16xg6n5561bm3cfk0b9"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libcec/default.nix b/pkgs/development/libraries/libcec/default.nix index 94b483e1f5d..7811eff6fe2 100644 --- a/pkgs/development/libraries/libcec/default.nix +++ b/pkgs/development/libraries/libcec/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, cmake, pkgconfig, udev, libcec_platform }: -let version = "3.0.1"; in +let version = "3.1.0"; in stdenv.mkDerivation { name = "libcec-${version}"; src = fetchurl { url = "https://github.com/Pulse-Eight/libcec/archive/libcec-${version}.tar.gz"; - sha256 = "0gi5gq8pz6vfdx80pimx23d5g243zzgmc7s8wpb686csjk470dky"; + sha256 = "08gr4rhx7qh8ajkry9j0sqw11i74y802dla1wg4l4gxhl4hrs409"; }; buildInputs = [ cmake pkgconfig udev libcec_platform ]; diff --git a/pkgs/development/libraries/libcec/platform.nix b/pkgs/development/libraries/libcec/platform.nix index 6db2656c9f4..d21f1b1404e 100644 --- a/pkgs/development/libraries/libcec/platform.nix +++ b/pkgs/development/libraries/libcec/platform.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, cmake }: -let version = "1.0.10"; in +let version = "2.0.1"; in stdenv.mkDerivation { - name = "libcec-${version}"; + name = "p8-platform-${version}"; src = fetchurl { - url = "https://github.com/Pulse-Eight/platform/archive/${version}.tar.gz"; - sha256 = "1kdmi9b62nky4jrb5519ddnw5n7s7m6qyj7rzhg399f0n6f278vb"; + url = "https://github.com/Pulse-Eight/platform/archive/p8-platform-${version}.tar.gz"; + sha256 = "1kslq24p2zams92kc247qcczbxb2n89ykk9jfyiilmwh7qklazp9"; }; nativeBuildInputs = [ cmake ]; @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Platform library for libcec and Kodi addons"; homepage = "https://github.com/Pulse-Eight/platform"; - repositories.git = "https://github.com/Pulse-Eight/libcec.git"; + repositories.git = "https://github.com/Pulse-Eight/platform.git"; license = stdenv.lib.licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.titanous ]; From 62dc6830967ceb2d18630503ae9fecbabfc5ffa0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Sun, 6 Nov 2016 12:00:28 +0100 Subject: [PATCH 128/146] kodiPlugins: updates * Added exodus in favour of genesis, same developer and old plugin is dead * Added gamepad(controllers) inputs as enableControllers * Updated SVTPlay, HyperLauncher * Removed SALTS, doesn't work without a FHS --- pkgs/applications/video/kodi/plugins.nix | 143 +++++++++-------------- pkgs/top-level/all-packages.nix | 6 +- 2 files changed, 62 insertions(+), 87 deletions(-) diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix index b56f461ee2a..463003239d0 100644 --- a/pkgs/applications/video/kodi/plugins.nix +++ b/pkgs/applications/video/kodi/plugins.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, cmake, kodi, steam, libcec_platform, tinyxml, unzip }: +{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, lib +, unzip, cmake, kodi, steam, libcec_platform, tinyxml }: let @@ -19,9 +20,9 @@ let buildInputs = [ cmake kodi libcec_platform tinyxml ]; }; - mkKodiPlugin = { plugin, namespace, version, src, meta, ... }: + mkKodiPlugin = { plugin, namespace, version, src, meta, sourceDir ? null, ... }: stdenv.lib.makeOverridable stdenv.mkDerivation rec { - inherit src meta; + inherit src meta sourceDir; name = "kodi-plugin-${plugin}-${version}"; passthru = { kodiPlugin = pluginDir; @@ -29,6 +30,7 @@ let }; dontStrip = true; installPhase = '' + ${if isNull sourceDir then "" else "cd $src/$sourceDir"} d=$out${pluginDir}/${namespace} mkdir -p $d sauce="." @@ -70,34 +72,69 @@ in }; - genesis = (mkKodiPlugin rec { + controllers = let + pname = "game-controller"; + version = "1.0.3"; - plugin = "genesis"; - namespace = "plugin.video.genesis"; - version = "5.1.4"; - - src = fetchurl { - url = "https://offshoregit.com/lambda81/lambda-repo/${namespace}/${namespace}-${version}.zip"; - sha256 = "0b0pdzgg42mgxgkb6sb83rldh4k19c3l9z7g2wnvxm3s2p6rjy3v"; + src = fetchFromGitHub { + owner = "kodi-game"; + repo = "kodi-game-controllers"; + rev = "01acb5b6e8b85392b3cb298b034aadb1b24ccf18"; + sha256 = "0sbc0w0fwbp7rbmbgb6a1kglhnn5g85hijcbbvf5x6jdq9v3f1qb"; }; meta = with stdenv.lib; { - homepage = "http://forums.tvaddons.ag/forums/148-lambda-s-kodi-addons"; - description = "The origins of streaming"; + description = "Add support for different gaming controllers."; platforms = platforms.all; maintainers = with maintainers; [ edwtjo ]; }; + + mkController = controller: { + "${controller}" = mkKodiPlugin rec { + plugin = pname + "-" + controller; + namespace = "game.controller." + controller; + sourceDir = "addons/" + namespace; + inherit version src meta; + }; + }; + in (mkController "default") + // (mkController "dreamcast") + // (mkController "gba") + // (mkController "genesis") + // (mkController "mouse") + // (mkController "n64") + // (mkController "nes") + // (mkController "ps") + // (mkController "snes"); + + exodus = (mkKodiPlugin rec { + + plugin = "exodus"; + namespace = "plugin.video.exodus"; + version = "2.0.12"; + + src = fetchurl { + url = "https://offshoregit.com/${plugin}/${namespace}/${namespace}-${version}.zip"; + sha256 = "02cdyvyxay6jiw9xj8hqnkp5w6drqj67pkh243znrsc06f26qkql"; + }; + + meta = with stdenv.lib; { + description = "A streaming plugin for Kodi"; + platforms = platforms.all; + maintainers = with maintainers; [ edwtjo ]; + }; + }).override { buildInputs = [ unzip ]; }; hyper-launcher = let pname = "hyper-launcher"; - version = "1.2.0"; + version = "1.5.2"; src = fetchFromGitHub rec { name = pname + "-" + version + ".tar.gz"; owner = "teeedubb"; repo = owner + "-xbmc-repo"; - rev = "9bd170407436e736d2d709f8af9968238594669c"; - sha256 = "019nqf7kixicnrzkg671x4yq723igjkhfl8hz5bifi9gx2qcy8hy"; + rev = "f958ba93fe85b9c9025b1745d89c2db2e7dd9bf6"; + sha256 = "1dvff24fbas25k5kvca4ssks9l1g5rfa3hl8lqxczkaqi3pp41j5"; }; meta = with stdenv.lib; { homepage = http://forum.kodi.tv/showthread.php?tid=258159; @@ -107,8 +144,9 @@ in in { service = mkKodiPlugin { plugin = pname + "-service"; + version = "1.2.1"; namespace = "service.hyper.launcher"; - inherit version src meta; + inherit src meta; }; plugin = mkKodiPlugin { plugin = pname; @@ -117,39 +155,18 @@ in }; }; - salts = mkKodiPlugin rec { - - plugin = "salts"; - namespace = "plugin.video.salts"; - version = "2.0.19"; - - src = fetchFromGitHub { - name = plugin + "-" + version + ".tar.gz"; - owner = "tknorris"; - repo = plugin; - rev = "9c1882bad35cab9e62687847e097c37a576b900d"; - sha256 = "0saq578xsxvyg1v8jg2m3131hfrr95gv74b2npxr7g715yyx5bjq"; - }; - - meta = with stdenv.lib; { - homepage = "https://github.com/tknorris/salts"; - description = "Stream All The Sources"; - maintainers = with maintainers; [ edwtjo ]; - }; - }; - svtplay = mkKodiPlugin rec { plugin = "svtplay"; namespace = "plugin.video.svtplay"; - version = "4.0.24"; + version = "4.0.42"; src = fetchFromGitHub { name = plugin + "-" + version + ".tar.gz"; owner = "nilzen"; repo = "xbmc-" + plugin; - rev = "e66e2af6529e3ffd030ad486c849894a9ffdeb45"; - sha256 = "01nq6gac83q6ayhqcj1whvk58pzrm1haw801s321f4vc8gswag56"; + rev = "83cb52b949930a1b6d2e51a7a0faf9bd69c7fb7d"; + sha256 = "0ync2ya4lwmfn6ngg8v0z6bng45whwg280irsn4bam5ca88383iy"; }; meta = with stdenv.lib; { @@ -248,48 +265,4 @@ in ln -s $out/lib/addons/pvr.hts/pvr.hts.so* $out/share/kodi/addons/pvr.hts ''; }; - - t0mm0-common = mkKodiPlugin rec { - - plugin = "t0mm0-common"; - namespace = "script.module.t0mm0.common"; - version = "0.0.1"; - - src = fetchFromGitHub { - name = plugin + "-" + version + ".tar.gz"; - owner = "t0mm0"; - repo = "xbmc-urlresolver"; - rev = "ab16933a996a9e77b572953c45e70900c723d6e1"; - sha256 = "1yd00md8iirizzaiqy6fv1n2snydcpqvp2f9irzfzxxi3i9asb93"; - }; - - meta = with stdenv.lib; { - homepage = "https://github.com/t0mm0/xbmc-urlresolver/"; - description = "t0mm0's common stuff"; - maintainers = with maintainers; [ edwtjo ]; - }; - }; - - urlresolver = (mkKodiPlugin rec { - - plugin = "urlresolver"; - namespace = "script.module.urlresolver"; - version = "2.10.0"; - - src = fetchFromGitHub { - name = plugin + "-" + version + ".tar.gz"; - owner = "Eldorados"; - repo = namespace; - rev = "72b9d978d90d54bb7a0224a1fd2407143e592984"; - sha256 = "0r5glfvgy9ri3ar9zdkvix8lalr1kfp22fap2pqp739b6k2iqir6"; - }; - - meta = with stdenv.lib; { - homepage = "https://github.com/Eldorados/urlresolver"; - description = "Resolve common video host URL's to be playable in XBMC/Kodi"; - maintainers = with maintainers; [ edwtjo ]; - }; - }).override { - postPatch = "sed -i -e 's,settings_file = os.path.join(addon_path,settings_file = os.path.join(profile_path,g' lib/urlresolver/common.py"; - }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a43132ce096..04ce743e2a7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15593,10 +15593,12 @@ with pkgs; plugins = let inherit (lib) optional optionals; in with kodiPlugins; ([] ++ optional (config.kodi.enableAdvancedLauncher or false) advanced-launcher - ++ optional (config.kodi.enableGenesis or false) genesis + ++ optionals (config.kodi.enableControllers or false) + (with controllers; + [ default dreamcast gba genesis mouse n64 nes ps snes ]) + ++ optional (config.kodi.enableExodus or false) exodus ++ optionals (config.kodi.enableHyperLauncher or false) (with hyper-launcher; [ plugin service pdfreader ]) - ++ optionals (config.kodi.enableSALTS or false) [salts urlresolver t0mm0-common] ++ optional (config.kodi.enableSVTPlay or false) svtplay ++ optional (config.kodi.enableSteamLauncher or false) steam-launcher ++ optional (config.kodi.enablePVRHTS or false) pvr-hts From db73e446b4d929f262dbde35e7063d1e5e9cfb92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Thu, 2 Feb 2017 21:23:16 +0100 Subject: [PATCH 129/146] catch: 1.5.0 -> 1.7.0 --- pkgs/development/libraries/catch/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/catch/default.nix b/pkgs/development/libraries/catch/default.nix index 090d03a1d14..9a3b9d8e8aa 100644 --- a/pkgs/development/libraries/catch/default.nix +++ b/pkgs/development/libraries/catch/default.nix @@ -3,20 +3,20 @@ stdenv.mkDerivation rec { name = "catch-${version}"; - version = "1.5.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "philsquared"; repo = "Catch"; - rev = "v" + version; - sha256 = "1ag8siafg7fmb50qdqznryrg3lvv56f09nvqwqqn2rlk83zjnaw0"; + rev = "v." + version; + sha256 = "0harki6irc4mqipjc24zyy0jimidr5ng3ss29bnpzbbwhrnkyrgm"; }; buildInputs = [ cmake ]; dontUseCmakeConfigure = true; buildPhase = '' - cmake -Hprojects/CMake -BBuild -DCMAKE_BUILD_TYPE=Release -DUSE_CPP11=ON + cmake . -BBuild -DCMAKE_BUILD_TYPE=Release -DUSE_CPP11=ON cd Build make cd .. From 78960abfc7bdc502d8b4a7312f3dcddad8c1e888 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 2 Feb 2017 20:15:34 +0000 Subject: [PATCH 130/146] ocamlPackages.vg: add ocamlbuild as dependency --- pkgs/development/ocaml-modules/vg/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/vg/default.nix b/pkgs/development/ocaml-modules/vg/default.nix index aa6047c7901..cb7878ac731 100644 --- a/pkgs/development/ocaml-modules/vg/default.nix +++ b/pkgs/development/ocaml-modules/vg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, opam, topkg +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg , uchar, result, gg, uutf, otfm, js_of_ocaml, pdfBackend ? true, # depends on uutf and otfm htmlcBackend ? true # depends on js_of_ocaml @@ -17,14 +17,14 @@ assert versionAtLeast ocaml.version "4.02.0"; stdenv.mkDerivation rec { - name = "ocaml-${pname}-${version}"; + name = "ocaml${ocaml.version}-${pname}-${version}"; src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; sha256 = "1czd2fq85hy24w5pllarsq4pvbx9rda5zdikxfxdng8s9kff2h3f"; }; - buildInputs = [ ocaml findlib opam topkg ]; + buildInputs = [ ocaml findlib ocamlbuild opam topkg ]; propagatedBuildInputs = [ uchar result gg ] ++ optionals pdfBackend [ uutf otfm ] From 9f334c2732e4d8606ccb09b14893aad5c37bb9da Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 2 Feb 2017 20:16:07 +0000 Subject: [PATCH 131/146] ocamlPackages.ppx_tools: init at unstable-20161114 (for OCaml 4.04) --- pkgs/development/ocaml-modules/ppx_tools/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/ppx_tools/default.nix b/pkgs/development/ocaml-modules/ppx_tools/default.nix index b6a6039a4fa..62aa97de5fa 100644 --- a/pkgs/development/ocaml-modules/ppx_tools/default.nix +++ b/pkgs/development/ocaml-modules/ppx_tools/default.nix @@ -7,6 +7,10 @@ let param = { "4.03.0" = { version = "5.0+4.03.0"; sha256 = "061v1fl5z7z3ywi4ppryrlcywnvnqbsw83ppq72qmkc7ma4603jg"; }; + "4.04.0" = { + version = "unstable-20161114"; + rev = "49c08e2e4ea8fef88692cd1dcc1b38a9133f17ac"; + sha256 = "0ywzfkf5brj33nwh49k9if8x8v433ral25f3nbklfc9vqr06zrfl"; }; }."${ocaml.version}"; in stdenv.mkDerivation { @@ -14,7 +18,7 @@ in src = fetchFromGitHub { owner = "alainfrisch"; repo = "ppx_tools"; - rev = param.version; + rev = if param ? rev then param.rev else param.version; inherit (param) sha256; }; From dbda1c433186b60d63f68a360edd8b52d94043be Mon Sep 17 00:00:00 2001 From: David Terry Date: Thu, 2 Feb 2017 21:31:28 +0100 Subject: [PATCH 132/146] vscode: 1.8.1 -> 1.9.0 --- pkgs/applications/editors/vscode/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index 97fc30c237c..f0f44bfe62f 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -2,21 +2,21 @@ makeWrapper, libXScrnSaver }: let - version = "1.8.1"; - rev = "ee428b0eead68bf0fb99ab5fdc4439be227b6281"; + version = "1.9.0"; + rev = "38746938a4ab94f2f57d9e1309c51fd6fb37553d"; channel = "stable"; - sha256 = if stdenv.system == "i686-linux" then "f48c2eb302de0742612f6c5e4ec4842fa474a85c1bcf421456526c9472d4641f" - else if stdenv.system == "x86_64-linux" then "99bd463707f3a21bc949eec3e857c80aafef8f66e06a295148c1c23875244760" - else if stdenv.system == "x86_64-darwin" then "9202c85669853b07d1cbac9e6bcb01e7c08e13fd2a2b759dd53994e0fa51e7a1" + sha256 = if stdenv.system == "i686-linux" then "05f1sk2lq2skp8fxq6q229kf89vi2sq3zz6lywq7nk81pwvp8jap" + else if stdenv.system == "x86_64-linux" then "0wj17lwq8f88xvfa6wfbqm580kp0470ib2yxn15j9mv0iw7nzqry" + else if stdenv.system == "x86_64-darwin" then "1k067h099j6fv820nn6h4i8ax35yvd1h8f4h5216dm66cpikv7nd" else throw "Unsupported system: ${stdenv.system}"; urlBase = "https://az764295.vo.msecnd.net/${channel}/${rev}/"; urlStr = if stdenv.system == "i686-linux" then - urlBase + "code-${channel}-code_${version}-1482159060_i386.tar.gz" + urlBase + "code-${channel}-code_${version}-1486024310_i386.tar.gz" else if stdenv.system == "x86_64-linux" then - urlBase + "code-${channel}-code_${version}-1482158209_amd64.tar.gz" + urlBase + "code-${channel}-code_${version}-1486023356_amd64.tar.gz" else if stdenv.system == "x86_64-darwin" then urlBase + "VSCode-darwin-${channel}.zip" else throw "Unsupported system: ${stdenv.system}"; From e2b74824d75c763e49fe3ef555a18dfe797e0a56 Mon Sep 17 00:00:00 2001 From: Ruben Maher Date: Thu, 2 Feb 2017 23:31:36 +1030 Subject: [PATCH 133/146] gnome-tweak-tool: trick autoconf into using python2 --- .../gnome-3/3.22/misc/gnome-tweak-tool/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/default.nix index e6c4b8c8202..f75cdd0e83e 100644 --- a/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/default.nix +++ b/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/default.nix @@ -12,6 +12,15 @@ in stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + # Make sure that Python 2 is first in $PATH because gnome3.gnome_shell + # propagates python3Packages.python. If we do not do this, autoconf will use + # Python 3 instead which gnome-tweak-tool does not support at this time. See: + # https://github.com/NixOS/nixpkgs/issues/21851 + # https://github.com/NixOS/nixpkgs/pull/22370 + preConfigure = '' + PATH="${python}/bin:$PATH" + ''; + makeFlags = [ "DESTDIR=/" ]; buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 From 6251b314e796505ceedc964dd981de34ca4212e0 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Fri, 3 Feb 2017 01:00:05 +0200 Subject: [PATCH 134/146] zathura-pdf-mupdf: 0.3.0 -> 0.3.2 (version compatible with mupdf 1.10a) --- pkgs/applications/misc/zathura/pdf-mupdf/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix index a78c94173e4..23a654b4d51 100644 --- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix +++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix @@ -2,24 +2,18 @@ , libjpeg, jbig2dec, openjpeg, fetchpatch }: stdenv.mkDerivation rec { - version = "0.3.0"; + version = "0.3.1"; name = "zathura-pdf-mupdf-${version}"; src = fetchurl { url = "https://pwmt.org/projects/zathura-pdf-mupdf/download/${name}.tar.gz"; - sha256 = "1j3j3wbp49walb19f0966qsnlqbd26wnsjpcxfbf021dav8vk327"; + sha256 = "06zqn8z6a0hfsx3s1kzqvqzb73afgcl6z5r062sxv7kv570fvffr"; }; buildInputs = [ pkgconfig zathura_core gtk girara openssl mupdf libjpeg jbig2dec openjpeg ]; makeFlags = [ "PREFIX=$(out)" "PLUGINDIR=$(out)/lib" ]; - patches = [(fetchpatch { - name = "mupdf-1.9.patch"; - url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/mupdf-1.9.patch?h=packages/zathura-pdf-mupdf&id=385ad96261b7297fdebbee6f4b22ec20dda8d65e"; - sha256 = "185wgg0z4b0z5aybcnnyvbs50h43imn5xz3nqmya4rk4v5bwy49y"; - })]; - meta = with lib; { homepage = http://pwmt.org/projects/zathura/; description = "A zathura PDF plugin (mupdf)"; From 3acd52d91721014464c32b5497c0f1d1bac43147 Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Sun, 29 Jan 2017 22:05:55 -0800 Subject: [PATCH 135/146] mgba: 0.5.1 -> 0.5.2 --- pkgs/misc/emulators/mgba/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/mgba/default.nix b/pkgs/misc/emulators/mgba/default.nix index 7724d3d8d1b..e4e84220812 100644 --- a/pkgs/misc/emulators/mgba/default.nix +++ b/pkgs/misc/emulators/mgba/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "mgba-${version}"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "mgba-emu"; repo = "mgba"; rev = version; - sha256 = "1ysxyy888qdwjbgsh3xdzsx8f3a5yd1gqx54xvndpv9v3zqgr2jf"; + sha256 = "1cpxiwzbywnjs3lrqa3bc9bj68plypx0br3lssd6p68c4wh01fyp"; }; nativeBuildInputs = [ pkgconfig cmake ]; From 6b44f3523a2598b1303e0f7b26e4439b79d00380 Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Tue, 31 Jan 2017 23:11:03 -0800 Subject: [PATCH 136/146] doomseeker: fix invalid substitution via sed --- pkgs/applications/misc/doomseeker/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/doomseeker/default.nix b/pkgs/applications/misc/doomseeker/default.nix index 33adacefb9d..a8d35680dbd 100644 --- a/pkgs/applications/misc/doomseeker/default.nix +++ b/pkgs/applications/misc/doomseeker/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; patchPhase = '' - sed -e 's#/usr/share/applications#$out/share/applications#' -i src/core/CMakeLists.txt + substituteInPlace src/core/CMakeLists.txt --replace /usr/share/applications "$out"/share/applications ''; meta = { From d62d26251d5f5369cb35e07459934fcdaf451e29 Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Sun, 29 Jan 2017 23:36:01 -0800 Subject: [PATCH 137/146] SDL2: 2.0.4 -> 2.0.5 --- pkgs/development/libraries/SDL2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index c25b0642637..5d818cb315c 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -24,11 +24,11 @@ let in stdenv.mkDerivation rec { name = "SDL2-${version}"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { url = "http://www.libsdl.org/release/${name}.tar.gz"; - sha256 = "0jqp46mxxbh9lhpx1ih6sp93k752j2smhpc0ad0q4cb3px0famfs"; + sha256 = "11c75qj1qxmx67iwkvf9z4x69phk301pdn86zzr6jncnap7kh824"; }; outputs = [ "out" "dev" ]; From 45f51f05b817777a30881801fcd133d16d4cb09d Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Sun, 29 Jan 2017 23:46:27 -0800 Subject: [PATCH 138/146] dhewm3: 20130113 -> 1.4.1 --- pkgs/games/dhewm3/default.nix | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/pkgs/games/dhewm3/default.nix b/pkgs/games/dhewm3/default.nix index e3efd84f0fb..4bae8e1d58a 100644 --- a/pkgs/games/dhewm3/default.nix +++ b/pkgs/games/dhewm3/default.nix @@ -1,33 +1,38 @@ -{stdenv, fetchurl, unzip, cmake, SDL, mesa, zlib, libjpeg, libogg, libvorbis +{ stdenv, fetchFromGitHub, cmake, SDL2, mesa, zlib, libjpeg, libogg, libvorbis , openal, curl }: stdenv.mkDerivation rec { - hash = "92a41322f4aa8bd45395d8088721c9a2bf43c79b"; - name = "dhewm3-20130113-${hash}"; - src = fetchurl { - url = "https://github.com/dhewm/dhewm3/zipball/${hash}"; - sha256 = "0c17k60xhimpqi1xi9s1l7jbc97pqjnk4lgwyjb0agc3dkr73zwd"; + name = "dhewm3-${version}"; + version = "1.4.1"; + + src = fetchFromGitHub { + owner = "dhewm"; + repo = "dhewm3"; + rev = version; + sha256 = "1s64xr1ir4d2z01fhldy577b0x80nd1k6my7y1hxp57lggr8dy5y"; }; # Add mesa linking patchPhase = '' - sed -i 's/\ Date: Mon, 30 Jan 2017 00:22:50 -0800 Subject: [PATCH 139/146] urbanterror: 4.2.023 -> 4.3.1 --- pkgs/games/urbanterror/default.nix | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/pkgs/games/urbanterror/default.nix b/pkgs/games/urbanterror/default.nix index 9224d5872c2..50b127fa9dc 100644 --- a/pkgs/games/urbanterror/default.nix +++ b/pkgs/games/urbanterror/default.nix @@ -1,25 +1,30 @@ { stdenv, fetchurl, unzip, SDL, mesa, openal, curl, libXxf86vm }: + stdenv.mkDerivation rec { name = "urbanterror-${version}"; - version = "4.2.023"; + version = "4.3.1"; + srcs = [ (fetchurl { - url = "http://mirror.urtstats.net/urbanterror/UrbanTerror42_full023.zip"; - sha256 = "e287e2a17432b81551f5c16e431d752484ce9be10508e756542f653757a29090"; + url = "http://cdn.fs1.urbanterror.info/urt/43/releases/zips/UrbanTerror431_full.zip"; + sha256 = "1dfnyb2grf2fxxphwj7p2ff721j2l0gwrj76jzympr32sim5a6cw"; }) (fetchurl { - url = "https://github.com/Barbatos/ioq3-for-UrbanTerror-4/archive/release-4.2.023.tar.gz"; - sha256 = "03zrrx5b96c1srf2p24ca7zygq84byvrmcgh42d8bh5ds579ziqp"; + url = "https://github.com/Barbatos/ioq3-for-UrbanTerror-4/archive/release-4.3.1.zip"; + sha256 = "1rbiqa1ki73649np3af96cilavkgv66a0b6p0a5x26cxvpgg128k"; }) ]; - buildInputs = [ unzip SDL mesa openal curl libXxf86vm]; - sourceRoot = "ioq3-for-UrbanTerror-4-release-4.2.023"; + + buildInputs = [ unzip SDL mesa openal curl libXxf86vm ]; + sourceRoot = "ioq3-for-UrbanTerror-4-release-4.3.1"; + configurePhase = '' echo "USE_OPENAL = 1" > Makefile.local echo "USE_OPENAL_DLOPEN = 0" >> Makefile.local echo "USE_CURL = 1" >> Makefile.local echo "USE_CURL_DLOPEN = 0" >> Makefile.local ''; + installPhase = '' destDir="$out/opt/urbanterror" mkdir -p "$destDir" @@ -28,7 +33,7 @@ stdenv.mkDerivation rec { "$destDir/Quake3-UrT" cp -v build/release-linux-*/Quake3-UrT-Ded.* \ "$destDir/Quake3-UrT-Ded" - cp -rv ../UrbanTerror42/q3ut4 "$destDir" + cp -rv ../UrbanTerror43/q3ut4 "$destDir" cat << EOF > "$out/bin/urbanterror" #! ${stdenv.shell} cd "$destDir" @@ -42,11 +47,15 @@ stdenv.mkDerivation rec { EOF chmod +x "$out/bin/urbanterror-ded" ''; + postFixup = '' p=$out/opt/urbanterror/Quake3-UrT cur_rpath=$(patchelf --print-rpath $p) patchelf --set-rpath $cur_rpath:${mesa}/lib $p ''; + + hardeningDisable = [ "format" ]; + meta = with stdenv.lib; { description = "A multiplayer tactical FPS on top of Quake 3 engine"; longDescription = '' From ef77fba573f97e0e85df67dfb5b27e2caaef8f4a Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Mon, 30 Jan 2017 00:38:13 -0800 Subject: [PATCH 140/146] gzdoom: 2.2.0 -> 2.3.2 --- pkgs/games/gzdoom/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix index 9e6cc48b435..b485c806352 100644 --- a/pkgs/games/gzdoom/default.nix +++ b/pkgs/games/gzdoom/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchFromGitHub, cmake, zdoom +{ stdenv, fetchFromGitHub, cmake, zdoom, makeWrapper , openal, fluidsynth, soundfont-fluid, mesa_noglu, SDL2 , bzip2, zlib, libjpeg, libsndfile, mpg123, game-music-emu }: stdenv.mkDerivation rec { name = "gzdoom-${version}"; - version = "2.2.0"; + version = "2.3.2"; src = fetchFromGitHub { owner = "coelckers"; repo = "gzdoom"; rev = "g${version}"; - sha256 = "0xxgd8fa29pcdir1xah5cvx41bfy76p4dydpp13mf44p9pr29hrb"; + sha256 = "1ys7wl4ygvm2lm49qjpql6c5i8gydmbg4f436bcpkywf5srr6xrd"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake makeWrapper ]; buildInputs = [ SDL2 mesa_noglu openal fluidsynth bzip2 zlib libjpeg libsndfile mpg123 game-music-emu @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { install -Dm644 "$i" "$out/lib/gzdoom/$i" done mkdir $out/bin - ln -s $out/lib/gzdoom/gzdoom $out/bin/gzdoom + makeWrapper $out/lib/gzdoom/gzdoom $out/bin/gzdoom ''; meta = with stdenv.lib; { From 9fcb9035df0de0f355175462b76f27de948c98a4 Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Mon, 30 Jan 2017 01:37:48 -0800 Subject: [PATCH 141/146] pulseaudio: 9.0 -> 10.0 dropped json_c as a dependency as it is no longer needed! patches are still needed for the caps fix and proper testing for TLS --- pkgs/servers/pulseaudio/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 09be8c7c587..680c9dfcb60 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchpatch, pkgconfig, intltool, autoreconfHook -, json_c, libsndfile, libtool +, libsndfile, libtool , xorg, libcap, alsaLib, glib , avahi, libjack2, libasyncns, lirc, dbus , sbc, bluez5, udev, openssl, fftwFloat @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { name = "${if libOnly then "lib" else ""}pulseaudio-${version}"; - version = "9.0"; + version = "10.0"; src = fetchurl { url = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-${version}.tar.xz"; - sha256 = "11j682g2mn723sz3bh4i44ggq29z053zcggy0glzn63zh9mxdly3"; + sha256 = "0mrg8qvpwm4ifarzphl3749p7p050kdx1l6mvsaj03czvqj6h653"; }; patches = [ ./caps-fix.patch ] @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { lib.optionals stdenv.isLinux [ libcap ]; buildInputs = - [ json_c libsndfile speexdsp fftwFloat ] + [ libsndfile speexdsp fftwFloat ] ++ lib.optionals stdenv.isLinux [ glib dbus ] ++ lib.optionals stdenv.isDarwin [ CoreServices AudioUnit Cocoa ] ++ lib.optionals (!libOnly) ( From 201a0fe403395de4dcceac0c9bececc0d38ed3a5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 3 Feb 2017 09:54:07 +0100 Subject: [PATCH 142/146] pythonPackages.ansible_2_1: use jinja2 2.8.1 --- pkgs/development/python-modules/ansible/2.1.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/ansible/2.1.nix b/pkgs/development/python-modules/ansible/2.1.nix index 8d7598a90c9..5af0837387d 100644 --- a/pkgs/development/python-modules/ansible/2.1.nix +++ b/pkgs/development/python-modules/ansible/2.1.nix @@ -13,7 +13,18 @@ , pywinrm }: -buildPythonPackage rec { +let + jinja = jinja2.override rec { + pname = "Jinja2"; + version = "2.8.1"; + name = "${pname}-${version}"; + src = fetchurl { + url = "mirror://pypi/J/Jinja2/${name}.tar.gz"; + sha256 = "35341f3a97b46327b3ef1eb624aadea87a535b8f50863036e085e7c426ac5891"; + }; + }; + +in buildPythonPackage rec { pname = "ansible"; version = "2.1.4.0"; name = "${pname}-${version}"; @@ -34,7 +45,7 @@ buildPythonPackage rec { dontPatchShebangs = false; windowsSupport = true; - propagatedBuildInputs = [ pycrypto paramiko jinja2 pyyaml httplib2 + propagatedBuildInputs = [ pycrypto paramiko jinja pyyaml httplib2 boto six netaddr dns ] ++ lib.optional windowsSupport pywinrm; meta = { @@ -47,4 +58,4 @@ buildPythonPackage rec { ]; platforms = with lib.platforms; linux ++ darwin; }; -} \ No newline at end of file +} From 8b3db9a0dd4ebfe693083a764d3c0812abf448a3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 3 Feb 2017 09:54:12 +0100 Subject: [PATCH 143/146] pythonPackages.ansible_2_2: use jinja2 2.8.1 --- .../development/python-modules/ansible/2.2.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/ansible/2.2.nix b/pkgs/development/python-modules/ansible/2.2.nix index 22af2c01265..48a325fec33 100644 --- a/pkgs/development/python-modules/ansible/2.2.nix +++ b/pkgs/development/python-modules/ansible/2.2.nix @@ -13,7 +13,19 @@ , pywinrm }: -buildPythonPackage rec { +let + # Shouldn't be needed anymore in next version + # https://github.com/NixOS/nixpkgs/pull/22345#commitcomment-20718521 + jinja = (jinja2.override rec { + pname = "Jinja2"; + version = "2.8.1"; + name = "${pname}-${version}"; + src = fetchurl { + url = "mirror://pypi/J/Jinja2/${name}.tar.gz"; + sha256 = "35341f3a97b46327b3ef1eb624aadea87a535b8f50863036e085e7c426ac5891"; + }; + }); +in buildPythonPackage rec { pname = "ansible"; version = "2.2.1.0"; name = "${pname}-${version}"; @@ -34,7 +46,7 @@ buildPythonPackage rec { dontPatchShebangs = false; windowsSupport = true; - propagatedBuildInputs = [ pycrypto paramiko jinja2 pyyaml httplib2 + propagatedBuildInputs = [ pycrypto paramiko jinja pyyaml httplib2 boto six netaddr dns ] ++ lib.optional windowsSupport pywinrm; meta = { @@ -47,4 +59,4 @@ buildPythonPackage rec { ]; platforms = with lib.platforms; linux ++ darwin; }; -} \ No newline at end of file +} From 1652a136e48825023b2a7e3989d7dfabba6ef4d2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 3 Feb 2017 10:04:35 +0100 Subject: [PATCH 144/146] pythonPackages.cytoolz: disable failing test --- pkgs/top-level/python-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1880471bb58..477914e3836 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4422,8 +4422,9 @@ in { buildInputs = with self; [ nose ]; propagatedBuildInputs = with self; [ toolz ]; + # Disable failing test https://github.com/pytoolz/cytoolz/issues/97 checkPhase = '' - nosetests -v $out/${python.sitePackages} + NOSE_EXCLUDE=test_curried_exceptions nosetests -v $out/${python.sitePackages} ''; meta = { From 0772e27bfd1ab3da5ab8199f27ce5a9c9fe83db0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 3 Feb 2017 10:06:49 +0100 Subject: [PATCH 145/146] haskell.lib.buildStackProject: fix #22386 --- pkgs/development/haskell-modules/generic-stack-builder.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/generic-stack-builder.nix b/pkgs/development/haskell-modules/generic-stack-builder.nix index cf1e189a38d..1a16cf3683f 100644 --- a/pkgs/development/haskell-modules/generic-stack-builder.nix +++ b/pkgs/development/haskell-modules/generic-stack-builder.nix @@ -1,4 +1,4 @@ -{ stdenv, ghc, pkgconfig, glibcLocales }: +{ stdenv, ghc, pkgconfig, glibcLocales, cacert }: with stdenv.lib; From 5b759293e09a062373d4b2843c5bad89d5a47165 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Fri, 3 Feb 2017 03:15:56 +0300 Subject: [PATCH 146/146] modules lib: type description in type error message --- lib/modules.nix | 2 +- lib/tests/modules.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/modules.nix b/lib/modules.nix index 256d49ba27d..4eee41306cd 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -326,7 +326,7 @@ rec { # Type-check the remaining definitions, and merge them. mergedValue = foldl' (res: def: if type.check def.value then res - else throw "The option value `${showOption loc}' in `${def.file}' is not a ${type.name}.") + else throw "The option value `${showOption loc}' in `${def.file}' is not a ${type.description}.") (type.merge loc defsFinal) defsFinal; isDefined = defsFinal != []; diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index e0774383720..8b476a5d3dc 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -118,7 +118,7 @@ checkConfigOutput "true" "$@" ./define-module-check.nix # Check coerced value. checkConfigOutput "\"42\"" config.value ./declare-coerced-value.nix checkConfigOutput "\"24\"" config.value ./declare-coerced-value.nix ./define-value-string.nix -checkConfigError 'The option value .* in .* is not a coercedTo.' config.value ./declare-coerced-value.nix ./define-value-list.nix +checkConfigError 'The option value .* in .* is not a string or integer.' config.value ./declare-coerced-value.nix ./define-value-list.nix cat <