diff options
Diffstat (limited to 'pkgs/applications')
86 files changed, 2604 insertions, 1308 deletions
diff --git a/pkgs/applications/altcoins/stellar-core.nix b/pkgs/applications/altcoins/stellar-core.nix index 8d365590147b..9942f0898a2f 100644 --- a/pkgs/applications/altcoins/stellar-core.nix +++ b/pkgs/applications/altcoins/stellar-core.nix @@ -39,7 +39,7 @@ in stdenv.mkDerivation { store historical records of the ledger and participate in consensus. ''; homepage = https://www.stellar.org/; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ chris-martin ]; license = licenses.asl20; }; diff --git a/pkgs/applications/audio/ardour/ardour3.nix b/pkgs/applications/audio/ardour/ardour3.nix deleted file mode 100644 index 0db951049703..000000000000 --- a/pkgs/applications/audio/ardour/ardour3.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ stdenv, fetchgit, alsaLib, aubio, boost, cairomm, curl, doxygen, dbus, fftw -, fftwSinglePrec, flac, glibc, glibmm, graphviz, gtkmm2, libjack2 -, libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf -, librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile -, libusb, libuuid, libxml2, libxslt, lilv, lv2, makeWrapper, pango -, perl, pkgconfig, python2, rubberband, serd, sord, sratom, suil, taglib, vampSDK }: - -let - - # Ardour git repo uses a mix of annotated and lightweight tags. Annotated - # tags are used for MAJOR.MINOR versioning, and lightweight tags are used - # in-between; MAJOR.MINOR.REV where REV is the number of commits since the - # last annotated tag. A slightly different version string format is needed - # for the 'revision' info that is built into the binary; it is the format of - # "git describe" when _not_ on an annotated tag(!): MAJOR.MINOR-REV-HASH. - - # Version to build. - #tag = "3.5.403"; - - # Version info that is built into the binary. Keep in sync with 'tag'. The - # last 8 digits is a (fake) commit id. - revision = "3.5-4539-g7024232"; - - # temporarily use a non tagged version, because 3.5.403 has a bug that - # causes loss of audio-files, and it was decided that there won't be a - # hotfix release, and we should use 4.0 when it comes out. - # more info: http://comments.gmane.org/gmane.comp.audio.ardour.user/13665 - - version = "2015-02-20"; -in - -stdenv.mkDerivation rec { - name = "ardour3-git-${version}"; - - src = fetchgit { - url = git://git.ardour.org/ardour/ardour.git; - rev = "7024232855d268633760674d34c096ce447b7240"; - sha256 = "0pnnx22asizin5rvf352nfv6003zarw3jd64magp10310wrfiwbq"; - }; - - buildInputs = - [ alsaLib aubio boost cairomm curl doxygen dbus fftw fftwSinglePrec flac glibc - glibmm graphviz gtkmm2 libjack2 libgnomecanvas libgnomecanvasmm liblo - libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate - libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv lv2 - makeWrapper pango perl pkgconfig python2 rubberband serd sord sratom suil taglib vampSDK - ]; - - patchPhase = '' - printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${revision}\"; }\n' > libs/ardour/revision.cc - sed 's|/usr/include/libintl.h|${glibc.dev}/include/libintl.h|' -i wscript - patchShebangs ./tools/ - ''; - - configurePhase = "${python2.interpreter} waf configure --optimize --docs --with-backends=jack,alsa --prefix=$out"; - - buildPhase = "${python2.interpreter} waf"; - - installPhase = '' - ${python2.interpreter} waf install - - # Install desktop file - mkdir -p "$out/share/applications" - cat > "$out/share/applications/ardour.desktop" << EOF - [Desktop Entry] - Name=Ardour 3 - GenericName=Digital Audio Workstation - Comment=Multitrack harddisk recorder - Exec=$out/bin/ardour3 - Icon=$out/share/ardour3/icons/ardour_icon_256px.png - Terminal=false - Type=Application - X-MultipleArgs=false - Categories=GTK;Audio;AudioVideoEditing;AudioVideo;Video; - EOF - ''; - - meta = with stdenv.lib; { - description = "Multi-track hard disk recording software"; - longDescription = '' - Ardour is a digital audio workstation (DAW), You can use it to - record, edit and mix multi-track audio and midi. Produce your - own CDs. Mix video soundtracks. Experiment with new ideas about - music and sound. - - Please consider supporting the ardour project financially: - https://community.ardour.org/node/8288 - ''; - homepage = http://ardour.org/; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = [ maintainers.goibhniu ]; - }; -} diff --git a/pkgs/applications/audio/ardour/ardour4.nix b/pkgs/applications/audio/ardour/ardour4.nix deleted file mode 100644 index e6a0ff66b3ca..000000000000 --- a/pkgs/applications/audio/ardour/ardour4.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ stdenv, fetchFromGitHub, alsaLib, aubio, boost, cairomm, curl, doxygen, dbus, fftw -, fftwSinglePrec, flac, glibc, glibmm, graphviz, gtkmm2, libjack2 -, libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf -, librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile -, libusb, libuuid, libxml2, libxslt, lilv, lv2, makeWrapper, pango -, perl, pkgconfig, python2, rubberband, serd, sord, sratom, suil, taglib, vampSDK }: - -let - - # Ardour git repo uses a mix of annotated and lightweight tags. Annotated - # tags are used for MAJOR.MINOR versioning, and lightweight tags are used - # in-between; MAJOR.MINOR.REV where REV is the number of commits since the - # last annotated tag. A slightly different version string format is needed - # for the 'revision' info that is built into the binary; it is the format of - # "git describe" when _not_ on an annotated tag(!): MAJOR.MINOR-REV-HASH. - - # Version to build. - tag = "4.7"; - -in - -stdenv.mkDerivation rec { - name = "ardour-${tag}"; - - src = fetchFromGitHub { - owner = "Ardour"; - repo = "ardour"; - rev = "d84a8222f2b6dab5028b2586f798535a8766670e"; - sha256 = "149gswphz77m3pkzsn2nqbm6yvcfa3fva560bcvjzlgb73f64q5l"; - }; - - buildInputs = - [ alsaLib aubio boost cairomm curl doxygen dbus fftw fftwSinglePrec flac glibc - glibmm graphviz gtkmm2 libjack2 libgnomecanvas libgnomecanvasmm liblo - libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate - libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv lv2 - makeWrapper pango perl pkgconfig python2 rubberband serd sord sratom suil taglib vampSDK - ]; - - # ardour's wscript has a "tarball" target but that required the git revision - # be available. Since this is an unzipped tarball fetched from github we - # have to do that ourself. - patchPhase = '' - printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${tag}-${builtins.substring 0 8 src.rev}\"; }\n' > libs/ardour/revision.cc - sed 's|/usr/include/libintl.h|${glibc.dev}/include/libintl.h|' -i wscript - patchShebangs ./tools/ - ''; - - configurePhase = "${python2.interpreter} waf configure --optimize --docs --with-backends=jack,alsa --prefix=$out"; - - buildPhase = "${python2.interpreter} waf"; - - installPhase = '' - ${python2.interpreter} waf install - # Install desktop file - mkdir -p "$out/share/applications" - cat > "$out/share/applications/ardour.desktop" << EOF - [Desktop Entry] - Name=Ardour 4 - GenericName=Digital Audio Workstation - Comment=Multitrack harddisk recorder - Exec=$out/bin/ardour4 - Icon=$out/share/ardour4/icons/ardour_icon_256px.png - Terminal=false - Type=Application - X-MultipleArgs=false - Categories=GTK;Audio;AudioVideoEditing;AudioVideo;Video; - EOF - ''; - - meta = with stdenv.lib; { - description = "Multi-track hard disk recording software"; - longDescription = '' - Ardour is a digital audio workstation (DAW), You can use it to - record, edit and mix multi-track audio and midi. Produce your - own CDs. Mix video soundtracks. Experiment with new ideas about - music and sound. - Please consider supporting the ardour project financially: - https://community.ardour.org/node/8288 - ''; - homepage = http://ardour.org/; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = [ maintainers.goibhniu maintainers.fps ]; - }; -} diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index 5e9e71f42cb5..6745109d7d04 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -16,7 +16,7 @@ let # "git describe" when _not_ on an annotated tag(!): MAJOR.MINOR-REV-HASH. # Version to build. - tag = "5.4"; + tag = "5.5"; in diff --git a/pkgs/applications/audio/clerk/default.nix b/pkgs/applications/audio/clerk/default.nix index 3599991551ce..babbcc51e402 100644 --- a/pkgs/applications/audio/clerk/default.nix +++ b/pkgs/applications/audio/clerk/default.nix @@ -2,7 +2,7 @@ utillinux, pythonPackages, libnotify }: stdenv.mkDerivation { - name = "clerk-unstable-2016-10-14"; + name = "clerk-2016-10-14"; src = fetchFromGitHub { owner = "carnager"; diff --git a/pkgs/applications/audio/gmu/default.nix b/pkgs/applications/audio/gmu/default.nix index f23ba66a3b51..8446855d190c 100644 --- a/pkgs/applications/audio/gmu/default.nix +++ b/pkgs/applications/audio/gmu/default.nix @@ -1,24 +1,20 @@ {stdenv, fetchurl, SDL, SDL_gfx, SDL_image, tremor, flac, mpg123, libmikmod -, speex -, keymap ? "newdefault" +, speex, ncurses +, keymap ? "default" , conf ? "unknown" }: stdenv.mkDerivation rec { - name = "gmu-0.7.2"; - + name = "gmu-0.10.1"; + src = fetchurl { - url = http://wejp.k.vu/files/gmu-0.7.2.tar.gz; - sha256 = "0gvhwhhlj64lc425wqch4g6v59ldd5i3rxll3zdcrdgk2vkh8nys"; + url = "http://wejp.k.vu/files/${name}.tar.gz"; + sha256 = "03x0mc0xw2if0bpf0a15yprcyx1xccki039zvl2099dagwk6xskv"; }; - buildInputs = [ SDL SDL_gfx SDL_image tremor flac mpg123 libmikmod speex ]; - - NIX_LDFLAGS = "-lgcc_s"; + buildInputs = [ SDL SDL_gfx SDL_image tremor flac mpg123 libmikmod speex ncurses ]; - preBuild = '' - makeFlags="$makeFlags PREFIX=$out" - ''; + makeFlags = [ "PREFIX=$(out)" ]; postInstall = '' cp ${keymap}.keymap $out/share/gmu/default.keymap diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index eb9ddf164d48..569326ec375f 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, pythonPackages, mygpoclient, intltool +{ stdenv, fetchurl, python2Packages, mygpoclient, intltool , ipodSupport ? true, libgpod , gnome3 }: -pythonPackages.buildPythonApplication rec { +python2Packages.buildPythonApplication rec { name = "gpodder-${version}"; version = "3.9.1"; @@ -24,12 +24,12 @@ pythonPackages.buildPythonApplication rec { ''; buildInputs = [ - intltool pythonPackages.coverage pythonPackages.minimock + intltool python2Packages.coverage python2Packages.minimock gnome3.gnome_themes_standard gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas ]; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = with python2Packages; [ feedparser dbus-python mygpoclient pygtk eyeD3 ] ++ stdenv.lib.optional ipodSupport libgpod; diff --git a/pkgs/applications/audio/linuxband/default.nix b/pkgs/applications/audio/linuxband/default.nix index 5c127a289c07..ba1d88373fff 100644 --- a/pkgs/applications/audio/linuxband/default.nix +++ b/pkgs/applications/audio/linuxband/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, makeWrapper, pkgconfig, MMA, libjack2, libsmf, pythonPackages }: +{ stdenv, fetchurl, makeWrapper, pkgconfig, MMA, libjack2, libsmf, python2Packages }: let - inherit (pythonPackages) pyGtkGlade pygtksourceview python; + inherit (python2Packages) pyGtkGlade pygtksourceview python; in stdenv.mkDerivation rec { version = "12.02.1"; name = "linuxband-${version}"; diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 1f8924cd03ee..9e310d6e4e41 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -6,7 +6,7 @@ assert stdenv.system == "x86_64-linux"; let # Please update the stable branch! - version = "1.0.45.186.g3b5036d6-95"; + version = "1.0.47.13.gd8e05b1f-47"; deps = [ alsaLib @@ -51,7 +51,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb"; - sha256 = "0fpvz1mzyva1sypg4gjmrv0clckb0c3xwjfcxnb8gvkxx9vm56p1"; + sha256 = "0079vq2nw07795jyqrjv68sc0vqjy6abjh6jjd5cg3hqlxdf4ckz"; }; buildInputs = [ dpkg makeWrapper ]; diff --git a/pkgs/applications/editors/bluefish/default.nix b/pkgs/applications/editors/bluefish/default.nix index 25538df0384d..59e8076c787b 100644 --- a/pkgs/applications/editors/bluefish/default.nix +++ b/pkgs/applications/editors/bluefish/default.nix @@ -1,16 +1,17 @@ -{ stdenv, fetchurl, intltool, pkgconfig , gtk, libxml2 -, enchant, gucharmap, python +{ stdenv, fetchurl, intltool, wrapGAppsHook, pkgconfig , gtk, libxml2 +, enchant, gucharmap, python, gnome3 }: stdenv.mkDerivation rec { - name = "bluefish-2.2.7"; + name = "bluefish-2.2.9"; src = fetchurl { url = "mirror://sourceforge/bluefish/${name}.tar.bz2"; - sha256 = "1psqx3ljz13ylqs4zkaxv9lv1hgzld6904kdp0alwx99p5rlnlr3"; + sha256 = "1l7pg6h485yj84i34jr09y8qzc1yr4ih6w5jdhmnrg156db7nwav"; }; - buildInputs = [ intltool pkgconfig gtk libxml2 + nativeBuildInputs = [ intltool pkgconfig wrapGAppsHook ]; + buildInputs = [ gnome3.defaultIconTheme gtk libxml2 enchant gucharmap python ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix index 9cb644cc9315..ec56667a4ba6 100644 --- a/pkgs/applications/editors/ed/default.nix +++ b/pkgs/applications/editors/ed/default.nix @@ -1,7 +1,8 @@ { fetchurl, stdenv }: stdenv.mkDerivation rec { - name = "ed-1.13"; + name = "ed-${version}"; + version = "1.14.1"; src = fetchurl { # gnu only provides *.lz tarball, which is unfriendly for stdenv bootstrapping @@ -9,13 +10,13 @@ stdenv.mkDerivation rec { # When updating, please make sure the sources pulled match those upstream by # Unpacking both tarballs and running `find . -type f -exec sha256sum \{\} \; | sha256sum` # in the resulting directory - urls = let file_md5 = "fb8ffc8d8072e13dd5799131e889bfa5"; # for fedora mirror + urls = let file_sha512 = "84396fe4e4f0bf0b591037277ff8679a08b2883207628aaa387644ad83ca5fbdaa74a581f33310e28222d2fea32a0b8ba37e579597cc7d6145df6eb956ea75db"; in [ ("http://pkgs.fedoraproject.org/repo/extras/ed" - + "/${name}.tar.bz2/${file_md5}/${name}.tar.bz2") + + "/${name}.tar.bz2/sha512/${file_sha512}/${name}.tar.bz2") "http://fossies.org/linux/privat/${name}.tar.bz2" ]; - sha256 = "1iym2fsamxr886l3sz8lqzgf00bip5cr0aly8jp04f89kf5mvl0j"; + sha256 = "1pk6qa4sr7qc6vgm34hjx44hsh8x2bwaxhdi78jhsacnn4zwi7bw"; }; /* FIXME: Tests currently fail on Darwin: diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index e2ae9e1df0dd..9aa66d12fdcd 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -306,6 +306,19 @@ license = lib.licenses.free; }; }) {}; + cobol-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + pname = "cobol-mode"; + version = "1.0.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/cobol-mode-1.0.0.el"; + sha256 = "1zmcfpl7v787yacc7gxm8mkp53fmrznp5mnad628phf3vj4kwnxi"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/cobol-mode.html"; + license = lib.licenses.free; + }; + }) {}; coffee-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "coffee-mode"; version = "0.4.1.1"; @@ -809,10 +822,10 @@ gnugo = callPackage ({ ascii-art-to-unicode, cl-lib ? null, elpaBuild, fetchurl, lib, xpm }: elpaBuild { pname = "gnugo"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gnugo-3.0.0.tar"; - sha256 = "0b94kbqxir023wkmqn9kpjjj2v0gcz856mqipz30gxjbjj42w27x"; + url = "https://elpa.gnu.org/packages/gnugo-3.0.1.tar"; + sha256 = "08z2hg9mvsxdznq027cmwhkb5i7n7s9r2kvd4jha9xskrcnzj3pp"; }; packageRequires = [ ascii-art-to-unicode cl-lib xpm ]; meta = { @@ -956,10 +969,10 @@ js2-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "js2-mode"; - version = "20160623"; + version = "20170116"; src = fetchurl { - url = "https://elpa.gnu.org/packages/js2-mode-20160623.tar"; - sha256 = "057djy6amda8kyprkb3v733d21nlmq5fgfazi65fywlfwyq1adxs"; + url = "https://elpa.gnu.org/packages/js2-mode-20170116.tar"; + sha256 = "1z4k7710yz1fbm2w8m17q81yyp8sxllld0zmgfnc336iqrc07hmk"; }; packageRequires = [ cl-lib emacs ]; meta = { diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index 14d6131f44fd..4920dfa3f534 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -380,8 +380,8 @@ src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "7dc87324f4d8c935ad70508707755d89522007ac"; - sha256 = "0lyhyi50dg165bpm6apq417b5mbyg0wk24d29cw10zzm0y8rxdzh"; + rev = "5b7d58c783f6453442570ae8cedd489a0659a58e"; + sha256 = "16bgzyrj5y4k43hm2hfn2bggiixap3samq69cxw8k376w8yqmsyh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/ac-emacs-eclim"; @@ -737,8 +737,8 @@ src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "c3e3a64e8b4ab48a35c2bcaddac6ebb0e1c693f7"; - sha256 = "1i2x0bl4w9zj7hd1ij2dbmnrbj62yni0na2y0wlb3154inj7ygq8"; + rev = "cb15be9d7a7c6aa2aa20188069b07521bfe3cb5f"; + sha256 = "02fvdkz7a3ql4r1vap2yl3m3cb29f9psk4qy4qp1kqrxbcmcrafm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php"; @@ -758,8 +758,8 @@ src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "c3e3a64e8b4ab48a35c2bcaddac6ebb0e1c693f7"; - sha256 = "1i2x0bl4w9zj7hd1ij2dbmnrbj62yni0na2y0wlb3154inj7ygq8"; + rev = "cb15be9d7a7c6aa2aa20188069b07521bfe3cb5f"; + sha256 = "02fvdkz7a3ql4r1vap2yl3m3cb29f9psk4qy4qp1kqrxbcmcrafm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core"; @@ -772,22 +772,22 @@ license = lib.licenses.free; }; }) {}; - ac-racer = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, racer }: + ac-racer = callPackage ({ auto-complete, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, racer }: melpaBuild { pname = "ac-racer"; - version = "20160517.2220"; + version = "20170114.9"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-ac-racer"; - rev = "eef0de84bd61136d2ed46da08537c9a89da8bd57"; - sha256 = "0p0220axf7c0ga4bkd8d2lcwdgwz08xqglw56lnwzdlksgqhsgyf"; + rev = "4408c2d652dec0432e20c05e001db8222d778c6b"; + sha256 = "01154kqzh3pjy57vxhv27nm69p85a1fwl7r95c7pzmzxgxigfz1p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e4318daf4dbb6864ee41f41287c89010fb811641/recipes/ac-racer"; sha256 = "1vkvh8y3ckvzvqxj4i2k6jqri94121wbfjziybli74qba8dca4yp"; name = "ac-racer"; }; - packageRequires = [ auto-complete cl-lib racer ]; + packageRequires = [ auto-complete emacs racer ]; meta = { homepage = "https://melpa.org/#/ac-racer"; license = lib.licenses.free; @@ -1465,12 +1465,12 @@ alect-themes = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "alect-themes"; - version = "20161218.1121"; + version = "20170117.217"; src = fetchFromGitHub { owner = "alezost"; repo = "alect-themes"; - rev = "e01abf039a39de2fdc00a1b7f36842c5f68ff97d"; - sha256 = "1nbr25003b0jlchy26l4pm1r4gxa2zprnqr8k0qvkhyrszjy78qg"; + rev = "714516d3f3695d0673f07721d4cff0043a287495"; + sha256 = "1cxc27579ik7yrjvahdk5ciji1gfwzlzbjrwzx55v67v13y9kz6r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/84c25a290ae4bcc4674434c83c66ae128e4c4282/recipes/alect-themes"; @@ -1528,12 +1528,12 @@ all-ext = callPackage ({ all, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "all-ext"; - version = "20170109.2113"; + version = "20170114.1805"; src = fetchFromGitHub { owner = "rubikitch"; repo = "all-ext"; - rev = "6068946d67dd084c912e75eb64b499d15c41aba1"; - sha256 = "12d2lxxqs2xr8anx5jhrhzbx9gjwhlswbg4hh4724i4v8bl5d9yb"; + rev = "9f4ef84a147cf4e0af6ef45826d6cb3558db6b88"; + sha256 = "0gdrsi9n9i1ibijkgk5kyjdjdmnsccfbpifpv679371glap9f68b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8e4328cae9b4759a75da0b26ea8b68821bc71af/recipes/all-ext"; @@ -2801,12 +2801,12 @@ atom-one-dark-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "atom-one-dark-theme"; - version = "20161101.1955"; + version = "20170113.743"; src = fetchFromGitHub { owner = "jonathanchu"; repo = "atom-one-dark-theme"; - rev = "ff2990e56f5ff7abf6c20dac7d4d96fa9090221b"; - sha256 = "1mph3sr9mb2hizx02xn4yaag5h6yanhg5zabrpg5cqz2w6ifagaq"; + rev = "ab59b076afe892a0dafe56f943533dafb4594369"; + sha256 = "05k4x5gg0gga2nks0jnk0c4vwv383irm60q1b2z45yqykj9cn1f9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3ba1c4625c9603372746a6c2edb69d65f0ef79f5/recipes/atom-one-dark-theme"; @@ -2906,12 +2906,12 @@ aurel = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "aurel"; - version = "20170106.1028"; + version = "20170114.137"; src = fetchFromGitHub { owner = "alezost"; repo = "aurel"; - rev = "e264f9d6fa5209d377b9cfd851a166d3d7147814"; - sha256 = "19fx0x4fnpcfngdkmj8s36vk07f4yjky02p5nc3c5dwm50k17zs5"; + rev = "fc7ad208f43f8525f84a18941c9b55f956df8961"; + sha256 = "0mcbw8p4wrnnr39wzkfz9kc899w0k1jb00q1926mchf202cmnz94"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d1612acd2cf1fea739739608113923ec51d307e9/recipes/aurel"; @@ -3054,8 +3054,8 @@ src = fetchFromGitHub { owner = "auto-complete"; repo = "auto-complete"; - rev = "ed1abca79bf476287bdf55ed8f7e0af53e5fdbae"; - sha256 = "0478sfs8gsn3x9q4ld2lrm1qgf6yfv34nqljh202n6fh982iqdxn"; + rev = "297e2f77a35dba222c24dd2e3eb0a5d8d0d1ee09"; + sha256 = "0185d1dc0fld06fk5n77q06wrmrphffs9xz3a6c2clyxf8mfx2vy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/083fb071191bccd6feb3fb84569373a597440fb1/recipes/auto-complete"; @@ -3717,12 +3717,12 @@ autothemer = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "autothemer"; - version = "20161221.1331"; + version = "20170112.1324"; src = fetchFromGitHub { owner = "sebastiansturm"; repo = "autothemer"; - rev = "add7d430e0be2f4cd7ccc622f8fbc8bc44be762f"; - sha256 = "0av6r2frjsbfxxl7lh9r7ccmsrc9yxmllqq8r1y52dzpc18iihpx"; + rev = "8c467f57571c154129d660dfccebd151c998f2d9"; + sha256 = "0cd2pqh6k32sjidkcd8682y4l6mx52xw4a05f38kk8nsrk28m74k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3d7d7beed6ba10d7aa6a36328a696ba2d0d21dc2/recipes/autothemer"; @@ -4889,8 +4889,8 @@ src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "5954ad37cf2d3c9237f4d2037e8619be15681cd1"; - sha256 = "0scn6wrs6040j4z1gfmn9akzknjhaj2kr07kfzx1v42ibm42ihcd"; + rev = "38034854ac21bd5ddc1a1129fd6c8ff86d939f8a"; + sha256 = "0s20z5njwmk591674mb2lyv50agg6496hkr5b11904jq5ca3xagz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key"; @@ -5134,12 +5134,12 @@ bln-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bln-mode"; - version = "20161210.610"; + version = "20170112.527"; src = fetchFromGitHub { owner = "mgrachten"; repo = "bln-mode"; - rev = "74563279cb98e42d8649bff53229d5f89a5fb5e0"; - sha256 = "0mjlbih1dnfmqy41jgs37b8yi39mqwppw7yn5pgdyh8lzr1qh9vw"; + rev = "1de92cec97a4693b8b932713e333730118db9183"; + sha256 = "0dlcxh3acaiw3q9sa74jw4bpz7fv9lvpws68gw1qhs39f1plyzfx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ee12ef97df241b7405feee69c1e66b3c1a67204b/recipes/bln-mode"; @@ -5322,7 +5322,7 @@ }) {}; bookmark-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "bookmark-plus"; - version = "20170110.1606"; + version = "20170113.1310"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/bookmark+.el"; sha256 = "02akakw7zfjx8bjb3sjlf8rhbh1xzx00h3dz7cp84f7jy9xak5v1"; @@ -5774,6 +5774,27 @@ license = lib.licenses.free; }; }) {}; + buffer-manage = callPackage ({ choice-program, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "buffer-manage"; + version = "20170109.1220"; + src = fetchFromGitHub { + owner = "plandes"; + repo = "buffer-manage"; + rev = "e320ae7e05803551d8b534aaee84cae6e53155e2"; + sha256 = "1dns2ngvmyyyr2a0ww9af0s8yzhbgm1gqqlc6686b04wnj8gdphf"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/28f8f376df810e6ebebba9fb2c93eabbe3526cc9/recipes/buffer-manage"; + sha256 = "0fwri332faybv2apjh8zajqpryi0g4kk3and8djibpvci40l42jb"; + name = "buffer-manage"; + }; + packageRequires = [ choice-program emacs ]; + meta = { + homepage = "https://melpa.org/#/buffer-manage"; + license = lib.licenses.free; + }; + }) {}; buffer-move = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buffer-move"; @@ -5795,19 +5816,18 @@ license = lib.licenses.free; }; }) {}; - buffer-sets = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + buffer-sets = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buffer-sets"; - version = "20160811.1911"; - src = fetchFromGitHub { - owner = "swflint"; - repo = "buffer-sets"; - rev = "9f266fb9b6325286ea312c9997071b74b5bb45cc"; - sha256 = "0pxykjnq892k93i1yil1f51gv9286gpwlnddq82jhq20hzh79r9c"; + version = "20161231.1331"; + src = fetchgit { + url = "https://git.flintfam.org/swf-projects/buffer-sets.git"; + rev = "f29c30f7cef4e29837c1e6e1282cf99a37c4210c"; + sha256 = "0kdi330p5xk67nzhj7mrz8arsblbx39lj1z4zy863294fn3ark7g"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/dc99dde16a23ba5f07848bd4a8483cbe384e7a6d/recipes/buffer-sets"; - sha256 = "1011x76h8sqk4lp85gddwc9hagmcsykywn0h7qpv0z9bmwqj1s43"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/2e12638554a13ef49ab24da08fe20ed2a53dbd11/recipes/buffer-sets"; + sha256 = "0r8mr53bd5cml5gsvq1hbl9894xsq0wwv4p1pp2q4zlcyxlwf4fl"; name = "buffer-sets"; }; packageRequires = [ cl-lib ]; @@ -5900,12 +5920,12 @@ bui = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bui"; - version = "20170106.956"; + version = "20170113.124"; src = fetchFromGitHub { owner = "alezost"; repo = "bui.el"; - rev = "3bf8af2f339d2483203eda2c97a61b8771c3269d"; - sha256 = "1qx7cdm7jd15rf1silwj1yh0mg5fhldfi001k1msi50nyni90c82"; + rev = "8d0c5e3dd6bcd11943dd23615be9b89367eabade"; + sha256 = "1h1jzpq1rq9jvvihq9n7agsdr86ppwgs38wmmi8qn6w2p99r6k5p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/38b7c9345de75a707b4a73e8bb8e2f213e4fd739/recipes/bui"; @@ -6906,7 +6926,7 @@ version = "20160801.615"; src = fetchsvn { url = "http://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs"; - rev = "11937"; + rev = "11945"; sha256 = "1wbk9aslvcmwj3n28appdhl3p2m6jgrpb5cijij8fk0szzxi1hrl"; }; recipeFile = fetchurl { @@ -6983,25 +7003,6 @@ license = lib.licenses.free; }; }) {}; - character-fold-plus = callPackage ({ fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "character-fold-plus"; - version = "20170102.916"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/character-fold+.el"; - sha256 = "0z6fc46sqdhnkpfichq9cnnnjmlcni0rxaj30rabpzkzmpsza79h"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0bb32513eaaafded547058e3de84fc87710d2cf0/recipes/character-fold+"; - sha256 = "01ibdwd7vap9m64w0bhyknxa3iank3wfss49gsgg4xbbxibyrjh3"; - name = "character-fold-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/character-fold+"; - license = lib.licenses.free; - }; - }) {}; charmap = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "charmap"; @@ -7047,12 +7048,12 @@ cheatsheet = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cheatsheet"; - version = "20161106.1219"; + version = "20170114.2251"; src = fetchFromGitHub { owner = "darksmile"; repo = "cheatsheet"; - rev = "329ac84def1af01c19761bd745ee4f275003161f"; - sha256 = "0981dkn8vkjyw50cbsx1zsa2nmyhsbz6kmrprj5jd828m49c1kc5"; + rev = "00f8f3cdf6131d1eafe1107e5c82ef69661e1318"; + sha256 = "0ba2j3g12mf1rckbpfcpb0j0fv7wwxln8jcw7mn8a05c5pcikjp6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0d2cd657fcadb2dd3fd12864fe94a3465f8c9bd7/recipes/cheatsheet"; @@ -7506,12 +7507,12 @@ cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }: melpaBuild { pname = "cider"; - version = "20170111.138"; + version = "20170112.26"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "cider"; - rev = "3a1bc62b94b233fa42d318e2a5f033a4badd8bd9"; - sha256 = "1sszr92rlrxj73vwy0kihzvr0s75zc85r6b209bc5d249vd6ilhq"; + rev = "460a1dc948ea8994eb8b379d132448d26cf7572c"; + sha256 = "0j9f6gi8zhws12vcwzng2a4bg4hdyvqsb08ha70as7xm9ym8vv6p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider"; @@ -7782,8 +7783,8 @@ version = "20161004.253"; src = fetchsvn { url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format"; - rev = "291717"; - sha256 = "1vbngm8xf7i8f3140y0dk704vagcws6is9waj9qsy6yg0vxmqp0y"; + rev = "292208"; + sha256 = "0li360592lv9hw3a73lva1bjj5qx518ky0yy1sqsb0mw1y7l5rip"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69e56114948419a27f06204f6fe5326cc250ae28/recipes/clang-format"; @@ -7904,12 +7905,12 @@ cliphist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "cliphist"; - version = "20160916.513"; + version = "20170116.1431"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "cliphist"; - rev = "5cddd9c0b3aacc9941214a749edd19ceb2cde7f4"; - sha256 = "0hifxb3r54yinlal6bwhycwaspbz1kwkybvrcppkpdfg9jd88nfd"; + rev = "72a8a92f69b280c347afe2f8b5f5eb57606a9aec"; + sha256 = "0arilk9msbrx4kwg6nk0faw1yi2ss225wdlz6ycdgqc1531h6jkm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82d86dae4ad8efc8ef342883c164c56e43079171/recipes/cliphist"; @@ -7988,12 +7989,12 @@ clj-refactor = callPackage ({ cider, clojure-mode, dash, edn, emacs, fetchFromGitHub, fetchurl, hydra, inflections, lib, melpaBuild, multiple-cursors, paredit, s, yasnippet }: melpaBuild { pname = "clj-refactor"; - version = "20161223.1457"; + version = "20170114.1148"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clj-refactor.el"; - rev = "46a925305ad9cf3fce09921ce201e7f527d76e77"; - sha256 = "1dxy1y02x2447ig0cfvjfhkiv8sih5d75hbdy6s9qhy2ljbmnjw3"; + rev = "7941d906d603a650d836e3a2ba25554772adb236"; + sha256 = "0gjmhwx4ibyr7fm2lssah9xbqfwm0174w5zv2hm27v37a8ncvzhv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3a2db268e55d10f7d1d5a5f02d35b2c27b12b78e/recipes/clj-refactor"; @@ -8357,12 +8358,12 @@ cm-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cm-mode"; - version = "20160914.148"; + version = "20170112.614"; src = fetchFromGitHub { owner = "joostkremers"; repo = "criticmarkup-emacs"; - rev = "12b7460691dc502d27329d6ac11c51cc83cd098e"; - sha256 = "018limfwcb396yr2kn6jixxdmpmiif3l7gp0p1pmwbg07fldllha"; + rev = "64913b0107a5ccf3ba4a3569ee03c020c45a3566"; + sha256 = "1smj4iig5x3va3jl91aassk0smcg67naknk81fshigshif1vs273"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42dda804ec0c7338c39c57eec6ba479609a38555/recipes/cm-mode"; @@ -8424,8 +8425,8 @@ src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "e0cc40ed58a16f63a26cf25c56f6e8471401fbfe"; - sha256 = "0vz1lxw7kp76glfz2kdkbbb6xnp1pnxgj30m2z2nzpf22kz4nac9"; + rev = "020cba316bb3a4d33da5108ab10d2c06b4712427"; + sha256 = "1c2hsy6b6b7vwg7fdjliz3f0yy7j7f8cj3627w5alhp5k6r6mnv1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -9167,12 +9168,12 @@ company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company"; - version = "20170109.333"; + version = "20170112.2005"; src = fetchFromGitHub { owner = "company-mode"; repo = "company-mode"; - rev = "7bd93b8e3180eea8e8b1c8e1174e7eb73628e847"; - sha256 = "0yznjz9wvjl6axswqykddnmcp9q6i868qxdwdg4pjnnw5qavpc5g"; + rev = "c494fc65d35f7f00c2da17206e6550385ae9b300"; + sha256 = "07ys3rbsdvhi60lan2gsk7rccikf9gsl2ddmm0sz2g8qal7d2a2a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company"; @@ -9459,8 +9460,8 @@ src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "7dc87324f4d8c935ad70508707755d89522007ac"; - sha256 = "0lyhyi50dg165bpm6apq417b5mbyg0wk24d29cw10zzm0y8rxdzh"; + rev = "5b7d58c783f6453442570ae8cedd489a0659a58e"; + sha256 = "16bgzyrj5y4k43hm2hfn2bggiixap3samq69cxw8k376w8yqmsyh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/company-emacs-eclim"; @@ -9812,12 +9813,12 @@ company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-php"; - version = "20170110.2036"; + version = "20170111.2112"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "c3e3a64e8b4ab48a35c2bcaddac6ebb0e1c693f7"; - sha256 = "1i2x0bl4w9zj7hd1ij2dbmnrbj62yni0na2y0wlb3154inj7ygq8"; + rev = "cb15be9d7a7c6aa2aa20188069b07521bfe3cb5f"; + sha256 = "02fvdkz7a3ql4r1vap2yl3m3cb29f9psk4qy4qp1kqrxbcmcrafm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php"; @@ -9965,12 +9966,12 @@ company-sourcekit = callPackage ({ company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sourcekit }: melpaBuild { pname = "company-sourcekit"; - version = "20170106.1437"; + version = "20170115.1551"; src = fetchFromGitHub { owner = "nathankot"; repo = "company-sourcekit"; - rev = "71d9e7002a9892308d64af62d21ac73f8d9d4ad5"; - sha256 = "0fz7pf95zsh597g6az29khjmj3jz4ml3285p98zbkl75vh6h5p0f"; + rev = "a28ac4811fac929686aca6aa6976845c02d6efd3"; + sha256 = "09vv6bhiahazjwzg5083b23z3xz5f4b3d4jra61m5xffkmjnbs9s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/45969cd5cd936ea61fbef4722843b0b0092d7b72/recipes/company-sourcekit"; @@ -10095,8 +10096,8 @@ src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "ca51cbce87f671f2bb133d1df9f327bb8f1bb729"; - sha256 = "0riz0jj8c80x6p9fcxyni7q3b0dgxjwss8qbihndq8h2jypdhcgd"; + rev = "386f6101fec6975000ad724f117816c01ab55f16"; + sha256 = "12m3fh2xipb6sxf44vinx12pv4mh9yd98v4xr7drim2c95mqx2y4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1138c8cc239183a2435ce8c1a6df5163e5fed2ea/recipes/company-ycmd"; @@ -11135,12 +11136,12 @@ ctags-update = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ctags-update"; - version = "20170110.2142"; + version = "20170111.2150"; src = fetchFromGitHub { owner = "jixiuf"; repo = "ctags-update"; - rev = "fba14ab3f8077683f63c143f13b37c8a41129a2a"; - sha256 = "17d301mdrynazyn81klbdck0c0xs47hqsr6v0r9cp1d3k2yfzi21"; + rev = "b0b5f88bb8a617871692429cf099c4203eff610c"; + sha256 = "0wdxqkhflwnaic3ydr8an23z2cwsm1sj3di2qj5svs84y0nvyw7s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e5d0c347ff8cf6e0ade80853775fd6b84f387fa5/recipes/ctags-update"; @@ -11466,8 +11467,8 @@ src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "3d4f7a1978f4c03a941a2dcff8136b10638476cd"; - sha256 = "0vnn3gk19f6qff1xvldi4zprz0wzspdrxy7hw09a0ncvkmf1qysp"; + rev = "d02cc4c5d831da27cd871cbb3feaf8bea72ec0c0"; + sha256 = "055wjr2kgvqji9ifwjchi8m4f095sq8df3vfxcv2n6ifgdwlmzkf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -13111,10 +13112,10 @@ }) {}; dired-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-plus"; - version = "20170101.840"; + version = "20170112.1427"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/dired+.el"; - sha256 = "1vblbkflszci8x415am68fy9if02gnnphz2sz3h3c0368kixf6w7"; + sha256 = "136nacjnnfd8j771k90zszbjq96fsvm944l1zb06gqlm7x94psll"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/dired+"; @@ -13582,12 +13583,12 @@ discover-my-major = callPackage ({ fetchFromGitHub, fetchurl, lib, makey, melpaBuild }: melpaBuild { pname = "discover-my-major"; - version = "20160108.1041"; + version = "20170113.2306"; src = fetchFromGitHub { owner = "steckerhalter"; repo = "discover-my-major"; - rev = "af36998444ac6844ba85f72abbc8575040cb4cc2"; - sha256 = "0b73nc4jkf9bggnlp0l34jfcgx91vxbpavz6bpnf5rjvm0v1bil9"; + rev = "ac83b24b5130eb0944f820736012df0924cce528"; + sha256 = "1hkz2sg8wnjqmsqm0di1h9cf9hb1j6qbw30hda3w8z3m0apzr5fr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/274185fa94a3442c56593f3c8b99bdc6b9bd4994/recipes/discover-my-major"; @@ -14040,12 +14041,12 @@ docker = callPackage ({ dash, docker-tramp, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s, tablist }: melpaBuild { pname = "docker"; - version = "20161221.49"; + version = "20170114.440"; src = fetchFromGitHub { owner = "Silex"; repo = "docker.el"; - rev = "9da6013f24fb00ffc1f2f15c3aeb05181df5d36f"; - sha256 = "1im6aqc26vjw9sc4x2gj16jdz3hh0mz64p81d7gvmfhjysinyfhn"; + rev = "2c2f3c68f8136caeef67c4e74cc84d52a7664535"; + sha256 = "0qyksf5svcpz263ah197bcmpnfn2rfq8x049wbalxi638bmbvzfg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker"; @@ -14195,12 +14196,12 @@ doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "doom-themes"; - version = "20170111.203"; + version = "20170111.2138"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-doom-theme"; - rev = "3ec0853af7745554e88f587512e1d95d9ed638d5"; - sha256 = "0r43k3dlijws4z6dkkw3wbsmnmjh5776qgayhxrlmvav5a6hkwvg"; + rev = "bb1e7d7ad7bb8cfe3dccf6499076941a08169e9d"; + sha256 = "024am5z7ihibkr5pbavdybxdq9q1pnsxhnfppwlzl8kaijqmmzs4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/73fd9f3c2352ea1af49166c2fe586d0410614081/recipes/doom-themes"; @@ -14599,12 +14600,12 @@ drupal-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode }: melpaBuild { pname = "drupal-mode"; - version = "20161215.414"; + version = "20170112.1136"; src = fetchFromGitHub { owner = "arnested"; repo = "drupal-mode"; - rev = "dea5a8da789e5c707fa6c63cd400282ea7205a14"; - sha256 = "1zxsa6fapbxa5yfpawivjmav9i80j9752bc6gmpq7ilzsnd67h0v"; + rev = "6f40ad04b760d2266b8c07283df266471d85a9b2"; + sha256 = "13wlgy1g1nl3xxkibh0cj983lq3snw4xxmq4nsphq92pjd2lggs7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/13e16af340868048eb1f51f9865dfc707e57abe8/recipes/drupal-mode"; @@ -14643,7 +14644,7 @@ version = "20130120.1257"; src = fetchsvn { url = "http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/"; - rev = "1778356"; + rev = "1779173"; sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq"; }; recipeFile = fetchurl { @@ -15247,12 +15248,12 @@ ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }: melpaBuild { pname = "ebib"; - version = "20170109.1442"; + version = "20170112.443"; src = fetchFromGitHub { owner = "joostkremers"; repo = "ebib"; - rev = "a34f046c1981e881811d54f43ea3ad3ce9a99c84"; - sha256 = "05l4gd1179gfxpc1jlmpwjb1w221clkg3nyb3z7l30hghnbhjvj4"; + rev = "4c2581ad17a636909e7ed0f46bd813cd6d9c45d3"; + sha256 = "1ic55fml4ll7pvakcf32ahps4za8mf4q10jgdyi8xj5bccvi3n3r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib"; @@ -15328,12 +15329,12 @@ eclim = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, popup, s, yasnippet }: melpaBuild { pname = "eclim"; - version = "20170107.2050"; + version = "20170116.1335"; src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "7dc87324f4d8c935ad70508707755d89522007ac"; - sha256 = "0lyhyi50dg165bpm6apq417b5mbyg0wk24d29cw10zzm0y8rxdzh"; + rev = "5b7d58c783f6453442570ae8cedd489a0659a58e"; + sha256 = "16bgzyrj5y4k43hm2hfn2bggiixap3samq69cxw8k376w8yqmsyh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/eclim"; @@ -15710,8 +15711,8 @@ src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-emacs"; - rev = "a4d10d12d40e8611383e67619ed2d2a5f39cb934"; - sha256 = "17i5gnx3vb2n0ni5lws8d0g4gj9gldrvrrqjnc2i2k9995d48r1r"; + rev = "99011d5780dd726ec46b7936e2cbbade66b725db"; + sha256 = "1757lgjbycbf5368s908xbj6dwn3xm9a9zix6ixwxd7j4gyhy16n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig"; @@ -15883,12 +15884,12 @@ ego = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }: melpaBuild { pname = "ego"; - version = "20161219.528"; + version = "20170112.2043"; src = fetchFromGitHub { owner = "emacs-china"; repo = "EGO"; - rev = "334a1ea3869818ac40e84f9832b8996564286ca1"; - sha256 = "1fi71fkfl95alkamam1z51ksn2pqchcy2gvnkn0smfs9wcy038s1"; + rev = "d81561d39524a5f78d5f94216b0ca5fef4b5700b"; + sha256 = "0scnhpj4naaicxp62hd0b5g3kf05gpldbi1z1sfnq4mqi84fnfgx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0090a628a5d566a887cac0d24b080ee6bafe4612/recipes/ego"; @@ -16049,12 +16050,12 @@ el-get = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "el-get"; - version = "20161022.614"; + version = "20170112.2204"; src = fetchFromGitHub { owner = "dimitri"; repo = "el-get"; - rev = "4a76c7e99edf7b3660fb8360261db1eba953958b"; - sha256 = "0s5gklk1my6awc9rlqfpjgxqgp3y4i34rahza4gw1y2wb4n81240"; + rev = "a6510f13c15d9811b51ccb1a96293bbe05162dbb"; + sha256 = "03i8ma0npxfixlbn4g5ffycpk1fagfjgsl4qg4hkrj9l0dmnm7qq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get"; @@ -16112,12 +16113,12 @@ el-mock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "el-mock"; - version = "20160923.1157"; + version = "20170114.2257"; src = fetchFromGitHub { owner = "rejeep"; repo = "el-mock.el"; - rev = "e3cff9f127ab62dc177b043ce319c7866f6fe2f0"; - sha256 = "1qclqb5g50m208hwyalc6gc0y04lbai8fplxs0nadas3478x5344"; + rev = "5fb2867d2e0350dda047a903ce60d264f78ef424"; + sha256 = "0fdnvsdnkc9xlxch3zavq7ya463g7m7xsc60ymx7a4350zl2vwyn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1989beb927657c0ff7e79fe448f62ac58c11be7/recipes/el-mock"; @@ -16334,6 +16335,27 @@ license = lib.licenses.free; }; }) {}; + eldoc-overlay-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "eldoc-overlay-mode"; + version = "20170114.2125"; + src = fetchFromGitHub { + owner = "stardiviner"; + repo = "eldoc-overlay-mode"; + rev = "794c2b959611d1352cdda9e930f2ddd866b4118a"; + sha256 = "04lndhm1jb0kvv0npr5wmgj8v18537fgp62c6m4gzgcjyfxihmr7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/de4d7c143f24d34eed093cfcdf481e98a6d2f839/recipes/eldoc-overlay-mode"; + sha256 = "158w2ffayqlcbgka3894p3zbq45kw9mijf421yzf55y1f1ipzqqs"; + name = "eldoc-overlay-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/eldoc-overlay-mode"; + license = lib.licenses.free; + }; + }) {}; electric-case = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "electric-case"; @@ -16442,12 +16464,12 @@ elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elfeed"; - version = "20161231.735"; + version = "20170116.1128"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "c6c24403193caa907dbab0d00d6f4ccd9e02d82e"; - sha256 = "046kz2v650ln39l57cabmk17r8vqp8kic86hp91bxxrlmq6znc60"; + rev = "3be3ff04438eec593f058d0f948dfc9f85a0ad47"; + sha256 = "1siviasw7863prsyxw7ggb0n71b32kzq647f60jnx75y69s05zds"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed"; @@ -16516,8 +16538,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "c6c24403193caa907dbab0d00d6f4ccd9e02d82e"; - sha256 = "046kz2v650ln39l57cabmk17r8vqp8kic86hp91bxxrlmq6znc60"; + rev = "3be3ff04438eec593f058d0f948dfc9f85a0ad47"; + sha256 = "1siviasw7863prsyxw7ggb0n71b32kzq647f60jnx75y69s05zds"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web"; @@ -18615,12 +18637,12 @@ ergoemacs-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, undo-tree }: melpaBuild { pname = "ergoemacs-mode"; - version = "20161206.1258"; + version = "20170112.1108"; src = fetchFromGitHub { owner = "ergoemacs"; repo = "ergoemacs-mode"; - rev = "d5d7e5b6a5537cdcfcc79efd43bbde138fc7863c"; - sha256 = "1jj7pgcbspallki9in4dn2d0wzis873r89y5kniycnydqfzadpjs"; + rev = "b4b5241e679cc1a7bd7b1f3703f1a7ce602cd1f6"; + sha256 = "1zmwzpp410hxgwycys7ij4xjmzz8piykx4scclvvyl63hhqlrrfh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/02920517987c7fc698de9952cbb09dfd41517c40/recipes/ergoemacs-mode"; @@ -18661,8 +18683,8 @@ src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "ad8229b57c8dcd8ff129398b53e3b81849daecc7"; - sha256 = "1rxxx83r5jim8ll54f80yhjnq53gabm42za828s5gygpxsz35359"; + rev = "eadc98327e3fb173d80a92e6ae2e7d7e85f92d67"; + sha256 = "1bn43p122ld3269klzcpfwacswnlpj2hdz9kx6n5691zv0w3qi5b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -19094,12 +19116,12 @@ eshell-z = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eshell-z"; - version = "20170110.2301"; + version = "20170116.2038"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "eshell-z"; - rev = "96ec3f5f8a801c893d2c6a6b140e333ef2bfd8b5"; - sha256 = "1aac4m814jgxwpz7lbyx5r4z5dmawp4sk7pwbx0zqpnbcsaq5wwc"; + rev = "c9334cbc1552234df3437f35d98e32f4d18446b8"; + sha256 = "1zja4hb2lj4m5w4j9mpc7xyqgg2ivpslllffjsg8x1w8xsxpj8fh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8079cecaa59ad2ef22812960838123effc46a9b3/recipes/eshell-z"; @@ -19220,12 +19242,12 @@ ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }: melpaBuild { pname = "ess"; - version = "20170110.58"; + version = "20170116.214"; src = fetchFromGitHub { owner = "emacs-ess"; repo = "ESS"; - rev = "d673c53bd6718e39153bba6a8ed6a7b44e5853a5"; - sha256 = "0s8qif73lab9kls320rp3c7pklclggwsi69ifc4aizh3qbgrl8bv"; + rev = "8ba2d5c5a5d9abb5fa907e2e27e6ccb9a130158e"; + sha256 = "12kx8wbr4wzvrlcbk48qbpfp4pdfsxxgx19qvl127c91ajbxksxa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess"; @@ -19843,12 +19865,12 @@ evil-escape = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-escape"; - version = "20160607.1015"; + version = "20170115.1343"; src = fetchFromGitHub { owner = "syl20bnr"; repo = "evil-escape"; - rev = "09e0622e167c89cd4dfa4e2037aaff0aceee52ad"; - sha256 = "0lk1wsv7k53774mn6ggrm28i9mxzg0xqv8hj372ka66v6ahlb34f"; + rev = "b4d44fc5015341e484495fc86b73d09b2ac062ec"; + sha256 = "0s8lmmm25qabicwaj9jybpbd8mkc62yl7jnhk1lpablydjkv3w2i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/770fc6dd82c4d30f98e973958044e4d47b8fd127/recipes/evil-escape"; @@ -20137,12 +20159,12 @@ evil-mc = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-mc"; - version = "20161229.1224"; + version = "20170113.19"; src = fetchFromGitHub { owner = "gabesoft"; repo = "evil-mc"; - rev = "c1b886acffa804c39b85909bbcb699fc1dbd03fe"; - sha256 = "0jj45m6s2hm36h5v2bwlxhnayrfwbs99zc1xvfd0kxkx9jz10fz6"; + rev = "d5b50be73b4288400d418abe86f92504081ea32d"; + sha256 = "13wvjif6479c1l6hvyhm7jhf41kdh4c56n4rmnncc9cw5z9z7fcb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96770d778a03ab012fb82a3a0122983db6f9b0c4/recipes/evil-mc"; @@ -20494,12 +20516,12 @@ evil-surround = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-surround"; - version = "20161029.606"; + version = "20170115.1604"; src = fetchFromGitHub { owner = "timcharper"; repo = "evil-surround"; - rev = "5c07befaf7930bbd61c24f3e251f8ce41026cfc2"; - sha256 = "0gd9dh1k0ydgc8nz575613bry240jb3qymzakkrq8pvcpl57nx7y"; + rev = "27dc66d5d8ee64917bf5077a4d408f41099622ed"; + sha256 = "1s0ffrk1avn008ns6qvj4mnjb476bvgsg74b22piq3s3fl8yycr4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/da8b46729f3bd9aa74c4f0ee2a9dc60804aa661c/recipes/evil-surround"; @@ -22419,12 +22441,12 @@ flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }: melpaBuild { pname = "flycheck"; - version = "20170110.304"; + version = "20170112.1646"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck"; - rev = "820cdf6e8ee93c467896b03e217f8cfd48db768b"; - sha256 = "078fh3an9c1b21ggk344bdify7nfsypk8c013gq1cm1557ns0ijs"; + rev = "d0b058ecbfbf7f1d130aa46580cb77ac67a1fc9d"; + sha256 = "17x8na9wbclznr4rvvznpljizx6vaw4a8cvpk45c2mijwbh1bz2d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck"; @@ -22839,12 +22861,12 @@ flycheck-flawfinder = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-flawfinder"; - version = "20161222.1516"; + version = "20170115.1927"; src = fetchFromGitHub { owner = "alexmurray"; repo = "flycheck-flawfinder"; - rev = "1cd5303c206732faaaab5abbda08bb9a9eb269b9"; - sha256 = "1577xjqlcyi46jcy0xfb04vbil0cczc0b7z0xwxl5sc5ydrhbgx6"; + rev = "7d964d38023b088adf3ffc2fddeead81f4491a45"; + sha256 = "0y023brz8adwa6gdaaixk6dnrq4kj2i5h56rj54cxrjkagyklfxl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e67a84d1a8c890ea56bd842549d70d9841d1e7a7/recipes/flycheck-flawfinder"; @@ -23536,8 +23558,8 @@ src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "ca51cbce87f671f2bb133d1df9f327bb8f1bb729"; - sha256 = "0riz0jj8c80x6p9fcxyni7q3b0dgxjwss8qbihndq8h2jypdhcgd"; + rev = "386f6101fec6975000ad724f117816c01ab55f16"; + sha256 = "12m3fh2xipb6sxf44vinx12pv4mh9yd98v4xr7drim2c95mqx2y4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/332e5585963c04112a55894fe7151c380930b17c/recipes/flycheck-ycmd"; @@ -25041,12 +25063,12 @@ fstar-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fstar-mode"; - version = "20170111.1014"; + version = "20170112.1727"; src = fetchFromGitHub { owner = "FStarLang"; repo = "fstar-mode.el"; - rev = "39c373e2aa07f8b6e7d71843086d9a1b6275bbf2"; - sha256 = "0fdsxmlrxlaj0pzibmm6ln6ff6waq3hxfj0k7jsxbihkxbn465yr"; + rev = "3a9be64827bbed8e34d38803b5c44d8d4f6cd688"; + sha256 = "0manmkd66355g1fw2q1q96ispd0vxf842i8dcr6g592abrz5lhi7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1198ee309675c391c479ce39efcdca23f548d2a/recipes/fstar-mode"; @@ -25065,8 +25087,8 @@ version = "20170107.626"; src = fetchgit { url = "git://factorcode.org/git/factor.git"; - rev = "5743ed204c255191df3dcf42089116e0cbf4f49a"; - sha256 = "1wc0amz87ai2m837jgypq081l32fxbmdgah182qkqsplzcbwwp1k"; + rev = "0701902122308f376dab4f2a4371600ddc05ae3e"; + sha256 = "0ahjhr7bmmpkvqxmr0m8c3agaiffqg8p6h5xnbjv93ar6ajk2pz9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel"; @@ -25473,12 +25495,12 @@ geiser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "geiser"; - version = "20161202.1657"; + version = "20170116.1834"; src = fetchFromGitHub { owner = "jaor"; repo = "geiser"; - rev = "6893f692259c0241049bf614147160c44dd4ba3e"; - sha256 = "12gimg3qhnl2r2hx00q602k1rnjcj49hc1v7a23d58c0gmqr4yb6"; + rev = "46b4c82278029d7193176b72ed3f0d3b1fa8899a"; + sha256 = "16hvw10xg3nd8scybn95szppa1p5v30hdawxl1wzvafnfz83yf2r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0fe32d24cedd5307b4cccfb08a7095d81d639a0/recipes/geiser"; @@ -25666,8 +25688,8 @@ src = fetchFromGitHub { owner = "DanielG"; repo = "ghc-mod"; - rev = "85d38f5bc175cb33586522b094f55288c9f5706a"; - sha256 = "073qbqzdxbsblcwffkmdmni0rmm43nnh3hawrhpbbcsb47pk5lzs"; + rev = "e20bb704f61776926ce1d7d3852b54b76dd43644"; + sha256 = "085ym61ll1ixk7lp3kxcp7aryf6ih9nqkx1nbm93i5asb4h8v996"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ghc"; @@ -25956,12 +25978,12 @@ git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: melpaBuild { pname = "git-commit"; - version = "20170109.1253"; + version = "20170112.334"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "c6624d143aa3c3e210a04d15e56f42c156226198"; - sha256 = "0lv4rxs23njyry8akkjrpim1x0w8a172ww599as1ckcgrsnb420k"; + rev = "875f913b8edfdd85dfdaba9403a9d5ae2b952afc"; + sha256 = "04cdbv8xqhbzqx1lzcm0n2s80b25mp9s6izzflv88qzpcc0z6wv2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -26040,12 +26062,12 @@ git-gutter-fringe = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, fringe-helper, git-gutter, lib, melpaBuild }: melpaBuild { pname = "git-gutter-fringe"; - version = "20161221.1712"; + version = "20170112.2133"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-git-gutter-fringe"; - rev = "0b28a5f2a575cc710473884d6d2bbda5975c11e0"; - sha256 = "0474y0qxdq9srhc279dndx4338wrjxq4cq4ngx5ig7sj6v12dqn4"; + rev = "16226caab44174301f1659f7bf8cc67a76153445"; + sha256 = "1y77gjl0yznamdj0f55d418zb75k22izisjg7ikvrfsl2yfqf3pm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/git-gutter-fringe"; @@ -26394,6 +26416,27 @@ license = lib.licenses.free; }; }) {}; + github-pullrequest = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, request }: + melpaBuild { + pname = "github-pullrequest"; + version = "20170115.2216"; + src = fetchFromGitHub { + owner = "jakoblind"; + repo = "github-pullrequest"; + rev = "9ccdeea36b2cb78f0bd2907cb45d1ab287a6af90"; + sha256 = "12j81h095rsfqbways4hm9wdr91wwc31b8hr1my55m91r204b9r4"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3dca88ef598d676661abea79cdbc41bad6dd28be/recipes/github-pullrequest"; + sha256 = "1icyxvkqy2vyx4b6f7ln0h3hfg0a4lkyajd596fch81irl8cjl34"; + name = "github-pullrequest"; + }; + packageRequires = [ dash emacs magit request ]; + meta = { + homepage = "https://melpa.org/#/github-pullrequest"; + license = lib.licenses.free; + }; + }) {}; github-search = callPackage ({ fetchFromGitHub, fetchurl, gh, lib, magit, melpaBuild }: melpaBuild { pname = "github-search"; @@ -26418,12 +26461,12 @@ github-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "github-theme"; - version = "20170111.1029"; + version = "20170112.2207"; src = fetchFromGitHub { owner = "philiparvidsson"; repo = "emacs-github-theme"; - rev = "d0461f84c0bd9eb68a1a90ca9543d66bec37f2e4"; - sha256 = "1achc9ppvsjbw89mf9nbxjmcpjr1916r6jhkjhh93cw3ambz360q"; + rev = "cf9a167e8940ee8f678f2c72495f4ffff9e88509"; + sha256 = "01wxs4vywfnzb0j2inxmm37glqz004laay711scrizwvqs3bhjd6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4ace4a150faa312ef531182f328a3e039045bd7/recipes/github-theme"; @@ -27465,12 +27508,12 @@ google-contacts = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2 }: melpaBuild { pname = "google-contacts"; - version = "20160111.211"; + version = "20170112.1022"; src = fetchFromGitHub { owner = "jd"; repo = "google-contacts.el"; - rev = "bb1a149bbcc5627250be8267481e884795b448cb"; - sha256 = "1h7nj570drp2l9x6475gwzcjrp75ms8dkixa7qsgszjdk58qyhnb"; + rev = "cf654c59b197a028eb8bf432d52776c2e0ad4135"; + sha256 = "1qrn9zqn25wpsrqbacamn3ixf90xmgxa8ifkday6cxn5ks0kgyj4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/671afe0ff3889ae8c4b2d7b8617a3a25c16f3f0f/recipes/google-contacts"; @@ -28350,12 +28393,12 @@ guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }: melpaBuild { pname = "guix"; - version = "20170109.1205"; + version = "20170114.133"; src = fetchFromGitHub { owner = "alezost"; repo = "guix.el"; - rev = "b832ff6c417b83652b7aa6d9ecfa75803fabe23c"; - sha256 = "153fr29lvhfkfmfhpinaffc2dpll2r3dlsk1hpxkw4j2cac5visl"; + rev = "2794ab96de95fae8aad12c33ff1726d5348cae7b"; + sha256 = "0cj5mlshh76m3fmnzxjyrq8kw0y22qvcd9wjqwkg392jw9s5kaqc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix"; @@ -28812,12 +28855,12 @@ haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "haskell-mode"; - version = "20170105.1516"; + version = "20170116.407"; src = fetchFromGitHub { owner = "haskell"; repo = "haskell-mode"; - rev = "695c4d73fc1e21291659b56c6b9a0583b6fc90fd"; - sha256 = "1dsxf33ppbr29jghq364gj86895sh5li3jxmy71ydapa5fivcicp"; + rev = "6f729159ea21997f629473652266dcd32dcba523"; + sha256 = "0hmynqg4qv10w2s4wlh3k1ignzxspqfr67860xy9g7vyyifyrhqj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode"; @@ -29080,12 +29123,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "20170111.105"; + version = "20170116.2331"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "c1e9cc8b14ef3d9693438311120ba5b881cd1cf1"; - sha256 = "1l074vh1xdljymjl4n0kr2qwh664bmqhcxwbd7k54bbd7qakx115"; + rev = "bc2bfb3017f327a5307e7c46be27d1b614b3e90d"; + sha256 = "1jfdbbzv6prxkiz9hxvyjfgdbzb9yzf8g71nny0xcfm76r18vrwi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -29479,12 +29522,12 @@ helm-cider = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, seq }: melpaBuild { pname = "helm-cider"; - version = "20160912.1935"; + version = "20170115.1740"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "helm-cider"; - rev = "9481f84bfbc6538e1cbe1a4cb01255088bfe1491"; - sha256 = "00zciia468svzhk4f7w9bwj20ixb280gwd7vfrxr1iw60p23x237"; + rev = "d678f1346331f12bdb6fe95536608fb3e94b2f70"; + sha256 = "0gmi23yx8l85923y0arm7v0v9zgspbp6gkb8a8jmnl5z2akqpzgh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31d3cd618f2ac88860d0b11335ff81b6e2973982/recipes/helm-cider"; @@ -29647,12 +29690,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "20170110.252"; + version = "20170116.2331"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "c1e9cc8b14ef3d9693438311120ba5b881cd1cf1"; - sha256 = "1l074vh1xdljymjl4n0kr2qwh664bmqhcxwbd7k54bbd7qakx115"; + rev = "bc2bfb3017f327a5307e7c46be27d1b614b3e90d"; + sha256 = "1jfdbbzv6prxkiz9hxvyjfgdbzb9yzf8g71nny0xcfm76r18vrwi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -29920,12 +29963,12 @@ helm-etags-plus = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-etags-plus"; - version = "20170108.848"; + version = "20170113.614"; src = fetchFromGitHub { owner = "jixiuf"; repo = "helm-etags-plus"; - rev = "0c9f6d704de71e3a7136b23d5b2876194c88d534"; - sha256 = "17hdwgjyx2akgcx9rpsk1jfl1irn2sk2nw6sivl56cm5gw08qwl6"; + rev = "704f0991ee4a2298b01c33aafc224eef322e15e3"; + sha256 = "03n7c9jlpqkz5z1gygx2s3yf46caav2l11d9xnmqhyhbvyimjqf9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e5d0c347ff8cf6e0ade80853775fd6b84f387fa5/recipes/helm-etags-plus"; @@ -29966,8 +30009,8 @@ src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-firefox"; - rev = "294850c4ce16ae25f2214f863cee0118add60974"; - sha256 = "1kaa58xlnr82qsvdzn8sxk5kkd2lxqnvfciyw7kfi2fdrl6nr4pf"; + rev = "0ad34b7b5abc485a86cae6920c14de861cbeb085"; + sha256 = "08mjsi2f9s29fkk35cj1rrparjnkm836qmbfdwdz7y51f9varjbs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/257e452d37768d2f3a6e0a5ccd062d128b2bc867/recipes/helm-firefox"; @@ -30361,12 +30404,12 @@ helm-gtags = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-gtags"; - version = "20160917.2238"; + version = "20170115.2129"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-helm-gtags"; - rev = "76c573d2c0bd277041d917c9968b180d48a0fdce"; - sha256 = "1dxm1r5qfriv33kaqf9gzwdrlmsww08lzvmxvfg9505qsjma4b5c"; + rev = "108e93d0d099ebb7b98847388f368311cf177033"; + sha256 = "0hfshcnzrrvf08yw4xz5c93g9pw6bvjp2bmv0s6acrsjqgwhx158"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-gtags"; @@ -31074,12 +31117,12 @@ helm-projectile = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }: melpaBuild { pname = "helm-projectile"; - version = "20161213.2311"; + version = "20170113.209"; src = fetchFromGitHub { owner = "bbatsov"; repo = "helm-projectile"; - rev = "10531b2634559ea2179f2530423beaac815e9a38"; - sha256 = "1bh9cvkp5gr8ykmy8fr94appkhpqx9hicqyj6ahvi2ykgb50ib4c"; + rev = "6d750dee69befb97bda1e8b6045973e5a5eca233"; + sha256 = "0dsc8k7qk24qvk8msxla9z3r4299rrcwmm4k5fslplh66h0b8z85"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc4e3a5af7ba86d277c73a1966a91c87d3d855a/recipes/helm-projectile"; @@ -31137,12 +31180,12 @@ helm-purpose = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, window-purpose }: melpaBuild { pname = "helm-purpose"; - version = "20160218.1009"; + version = "20170114.836"; src = fetchFromGitHub { owner = "bmag"; repo = "helm-purpose"; - rev = "de9e38c55b114cadeed60e70fc406f5181ff30d8"; - sha256 = "1lxknzjfhl6irrspynlkc1dp02s0byp94y4qp69gcl9sla9262ip"; + rev = "9ff4c21c1e9ebc7afb851b738f815df7343bb287"; + sha256 = "1xh6v5xlf1prgk6mrvkc6qa0r0bz74s5f4z3dl7d00chsi7i2m5v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/931471b9df5e722d579aab378887890bf6e854a5/recipes/helm-purpose"; @@ -32006,10 +32049,10 @@ }) {}; hide-comnt = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "hide-comnt"; - version = "20170101.1008"; + version = "20170116.1012"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/hide-comnt.el"; - sha256 = "1gjca7796bg6skyqry90l5ywpw72zl6zkhzbq9fy8bi8q7a76g06"; + sha256 = "1g58gvbh5qrfc5r1af2plxdc1ygd6rxspmhhdz9z8hbf172b8j62"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05a695ab2bc358690c54611d21ef80cb51812739/recipes/hide-comnt"; @@ -33475,6 +33518,25 @@ license = lib.licenses.free; }; }) {}; + i3wm = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { + pname = "i3wm"; + version = "20170116.1825"; + src = fetchgit { + url = "https://git.flintfam.org/swf-projects/emacs-i3.git"; + rev = "7daad9bcbb545ed5cd75706eef56172cef1498cf"; + sha256 = "1y69hh9gaz8q3kljgjarqkxmc70qpf83rzwsb1rzsglf4aqlr2rq"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2e12638554a13ef49ab24da08fe20ed2a53dbd11/recipes/i3wm"; + sha256 = "11246d71g82iv9zrd44013zwkmnf32m1x8zbrbb656dnzx7ps4rl"; + name = "i3wm"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/i3wm"; + license = lib.licenses.free; + }; + }) {}; iasm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "iasm-mode"; @@ -33603,7 +33665,7 @@ }) {}; icicles = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "icicles"; - version = "20170101.1027"; + version = "20170115.1431"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/icicles.el"; sha256 = "072pxihvwpj6zkzrgw8bq9z71mcx5f6xsjr95bm42xqh4ag2qq0x"; @@ -34514,12 +34576,12 @@ imenus = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "imenus"; - version = "20160220.1332"; + version = "20170115.1226"; src = fetchFromGitHub { owner = "alezost"; repo = "imenus.el"; - rev = "c24bc3a5b3bb942afcdf2dfb568968cf836ddafc"; - sha256 = "1p6b7wvzf63dca446gpxm90pmbh9f7r097hbhwj2jmm2i9j5d0lg"; + rev = "5449180574f52a3a9f8de7408594ccf45c92d5d5"; + sha256 = "1xd9ymqmxdfnw6l6bz2bvpn764h3y9abgymm3c66403cq3dx8rz3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cc571105a8d7e2ea85391812f1fa639787fa7563/recipes/imenus"; @@ -34849,12 +34911,12 @@ inf-ruby = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inf-ruby"; - version = "20161218.1754"; + version = "20170115.1602"; src = fetchFromGitHub { owner = "nonsequitur"; repo = "inf-ruby"; - rev = "1dd007201a6f1465791edaea7e80e3adbeda5a45"; - sha256 = "07hgzwydvg56f9kpg7ch5g1i429s6c8fssn3zzk58rxnc620jv83"; + rev = "bf380c13e50c18b6bac6651b22b6fc6ba349062f"; + sha256 = "1in57d8q33x68ccxng13yp8l4frdgab3nx74p4n4lxa183qcs2n5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/inf-ruby"; @@ -34912,12 +34974,12 @@ info-buffer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "info-buffer"; - version = "20161230.1442"; + version = "20170112.622"; src = fetchFromGitHub { owner = "llvilanova"; repo = "info-buffer"; - rev = "24b22e181d41dcec6b280d88fa2882310c3dad9a"; - sha256 = "0ml5jxb7xs72mivg7p37kwnxvn0a0k9p32hhrasghn8d0ymxflih"; + rev = "d35dad6e766c6e2ddb8dc6acb4ce5b6e10fbcaa7"; + sha256 = "0czkp7cf7qmdm1jdn67gxyxz8b4qj2kby8if50d450xqwbx0da7x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3c44a1d69725b687444329d8af43c9799112b407/recipes/info-buffer"; @@ -35865,12 +35927,12 @@ ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-erlang-complete"; - version = "20170107.133"; + version = "20170113.247"; src = fetchFromGitHub { owner = "s-kostyaev"; repo = "ivy-erlang-complete"; - rev = "d2596eb8d6317767a642dee9f0a450eff4930a6f"; - sha256 = "18i1xwaqh0py2rfc8dq7jagsynh170p8smwmwb02p9xcij15fq1q"; + rev = "65d80ff0052be9aa65e9a1cd8f6b1f5fb112ee36"; + sha256 = "05qjpv95xrhwpg1g0znsp33a8827w4p7vl6iflrrmi15kij5imb4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete"; @@ -36472,12 +36534,12 @@ jazz-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jazz-theme"; - version = "20170109.353"; + version = "20170115.723"; src = fetchFromGitHub { owner = "donderom"; repo = "jazz-theme"; - rev = "03adcb7a161d84d19b9e1ef700c999cf996e23e9"; - sha256 = "0kq3l96mmdsgxi1d5q971lc95ag441shlh9wvh9y24d736mr6nha"; + rev = "0ae13bd12ddc339b8ef6f112c59b916a2da6922e"; + sha256 = "12iz3hvxha9mya2629azvmrwgkxk6b4fgmgpx1n30wlaw8ap69gj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/da25345df9d8d567541ed6b0ec832310cde67115/recipes/jazz-theme"; @@ -36952,12 +37014,12 @@ js-import = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "js-import"; - version = "20161027.2259"; + version = "20170115.853"; src = fetchFromGitHub { owner = "jakoblind"; repo = "js-import"; - rev = "e57a8dc4a61d2b33add3da7ac44ea28979b792f9"; - sha256 = "1prcifdih35nnbbgz04dd4prfmi25fdxjwajp4wms2hm0q8z4mkr"; + rev = "7b1b7c963e3df9c76ed6cfb66c908c80775c6cfb"; + sha256 = "03a13bcipk32hdvh5bm2z8kxs4b2xp3r1phwxmvb49lxx6417bs9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69613bafcb5ca5d5436a4b27be6863f37a7d2fab/recipes/js-import"; @@ -37015,12 +37077,12 @@ js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js2-mode"; - version = "20161230.1612"; + version = "20170116.733"; src = fetchFromGitHub { owner = "mooz"; repo = "js2-mode"; - rev = "8569ba6734184b869b4ac42e79231d195ea4dba2"; - sha256 = "14j9qaqls403i5w5046w6qhw23gva7yfhmbw9mrdmwffl53nxfng"; + rev = "03c679eb9914d58d7d9b7afc2036c482a9a01236"; + sha256 = "1kgmljgh71f2sljdsr134jrj1i6kgj9bwyh4pl1lrz0v4ahwgd6g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode"; @@ -37537,11 +37599,11 @@ }) {}; kanban = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kanban"; - version = "20150930.917"; + version = "20170117.316"; src = fetchhg { url = "https://bitbucket.com/ArneBab/kanban.el"; - rev = "54d855426372"; - sha256 = "14g0f51jig8b1y6zfaw7b1cp692lddqzkc0ngf4y89sw9gbmsh3w"; + rev = "713e6c7d8e07"; + sha256 = "1m1rgkdwb9zm3k131l6xh2pz4750arvflly7fbmsik3y1pr5f60r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/kanban"; @@ -38062,8 +38124,8 @@ src = fetchFromGitHub { owner = "kivy"; repo = "kivy"; - rev = "67b9bebd3016000f3773d63b1736ac4e47751a2f"; - sha256 = "1c7dcxvg1yfp16n46ssc53g51qr2gk3ilcz378aqdjix9mrsm11q"; + rev = "80f1f82759d5e4f2537da7620e2c0d3ea88aa7da"; + sha256 = "0bk7ixm4dvblmal8xi0n061xqb13ipdgxpl9gx7aihzi18429i8n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode"; @@ -38079,12 +38141,12 @@ kiwix = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kiwix"; - version = "20161230.2008"; + version = "20170116.503"; src = fetchFromGitHub { owner = "stardiviner"; repo = "kiwix.el"; - rev = "d43238ffbbf9863c36a0064f3291dac2013a46c8"; - sha256 = "1mbw82w0l1lazm6k9hchvcdqrrs2q9zpj7fxb0kyvfd5nkk99p0m"; + rev = "edea2234a7a5267c1888dbe2271e9100bdc3f5a8"; + sha256 = "0b9bwcgxm2gachh2g5cn4fih2n5mzqzvl591ahq0rylgajxmxvhp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/673b4ecec96562bb860caf5c08d016d6c4b89d8c/recipes/kiwix"; @@ -38936,12 +38998,12 @@ leuven-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "leuven-theme"; - version = "20170108.1242"; + version = "20170114.617"; src = fetchFromGitHub { owner = "fniessen"; repo = "emacs-leuven-theme"; - rev = "7e6ac87406c8c2d361bb55b3dff6342e61c09d87"; - sha256 = "18sylih1a3qf07fs66a4crzfbxpw46jr29rkj4xbvgd4cn1fhy4w"; + rev = "fa5f6105a18d08727172e6b9200cd0dec737d4ba"; + sha256 = "0pmhg22rx6yd431lfcvyai1cahiljs1dr670i9i6m5ckdakcl1f4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b09451f4eb2be820e94d3fecbf4ec7cecd2cabdc/recipes/leuven-theme"; @@ -39000,8 +39062,8 @@ src = fetchFromGitHub { owner = "rvirding"; repo = "lfe"; - rev = "46c683df95331a267073d34a0c4f37e9cc66044c"; - sha256 = "1zshzklwcjpw8b9d5zbb0xy6hyhxmbdb1g43v5hwi5a4mi8xwj23"; + rev = "0d412fc713efb893c7f44f1bd8dd66eb01693f30"; + sha256 = "1hsr21fzd3kkavznjcgd9jv6galkx3aky73fs91plr5l7gdvqz38"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode"; @@ -39313,12 +39375,12 @@ lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }: melpaBuild { pname = "lispy"; - version = "20170109.535"; + version = "20170112.236"; src = fetchFromGitHub { owner = "abo-abo"; repo = "lispy"; - rev = "23b5719e92f4f95ea17499bb97143199c2acaff3"; - sha256 = "1ffmgfavg37hcgfp2kh7s46bnck680bp7j6nwnf142djnzcgw6ka"; + rev = "f66433837a4ccabcfc7f05d74d7ee8217691d943"; + sha256 = "154kwk1h1grcjbimaglsir5i5j72bak1lxw69bjm5d5yf3qg60p5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy"; @@ -39355,12 +39417,12 @@ lispyville = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, lispy, melpaBuild }: melpaBuild { pname = "lispyville"; - version = "20160816.1536"; + version = "20170116.1335"; src = fetchFromGitHub { owner = "noctuid"; repo = "lispyville"; - rev = "a5648a611c7d538176b86dd1b3dcb6477c136f12"; - sha256 = "1h9a8jx0jajpi1kfw9n10q9zq842psh89z60ka3pvma5kwn8njyd"; + rev = "c951f65a2300d884eff7afdd941fea275550c9fe"; + sha256 = "0hhllm6b0gkllpbfkc6ifcax1vmfplll9vbrfa8wqi0lghmy4npm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b5d96d3603dc328467fcce29d3ac1b0a02833d51/recipes/lispyville"; @@ -39626,12 +39688,12 @@ live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "live-py-mode"; - version = "20170105.1854"; + version = "20170116.1607"; src = fetchFromGitHub { owner = "donkirkby"; repo = "live-py-plugin"; - rev = "d602ed6a3009d27dfb9732e313ff02e2d7f78af8"; - sha256 = "1xf5bp45az2nr24ilzkcc4yd0g7mh1kx4c2q2bqfshk9vcf9k8kj"; + rev = "f702dd8475b48526d1701b11776800388f6d8c70"; + sha256 = "0zdxz5zyy8xgrsbl3kpnzxifgbr670qnrq02sbc208al9jn8blk9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode"; @@ -39713,8 +39775,8 @@ version = "20150910.644"; src = fetchgit { url = "http://llvm.org/git/llvm"; - rev = "7371eca308fdb139271e75a0e82180a479f6f4c3"; - sha256 = "0qfpcbap9la15kcarmiyya7d4bvniv5g68kii2fmfam0s6dsdm60"; + rev = "fca725c1928670ccc48510f431d96f19751dbc1b"; + sha256 = "1ag3h8jcrfdbhs1zil6xra5abngkl35yw6av769x0vp6wldxklrv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode"; @@ -39939,12 +40001,12 @@ logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "logview"; - version = "20161108.1149"; + version = "20170114.1515"; src = fetchFromGitHub { owner = "doublep"; repo = "logview"; - rev = "4f1db3f2081e819dd35545497529a03466bd0397"; - sha256 = "0f96wxijls743qyqfgkdqil3p5nn0sm02rlz1nqkm6bd8k28rcg1"; + rev = "c22ac44d14de8aaad532e47ea60c21c24d661a50"; + sha256 = "02842gbxlq6crvd3817aqvj5irshls5km675vmhk0qd4cqg38abv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview"; @@ -40353,12 +40415,12 @@ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "20170106.1903"; + version = "20170114.1211"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "c6624d143aa3c3e210a04d15e56f42c156226198"; - sha256 = "0lv4rxs23njyry8akkjrpim1x0w8a172ww599as1ckcgrsnb420k"; + rev = "875f913b8edfdd85dfdaba9403a9d5ae2b952afc"; + sha256 = "04cdbv8xqhbzqx1lzcm0n2s80b25mp9s6izzflv88qzpcc0z6wv2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit"; @@ -40532,8 +40594,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "c6624d143aa3c3e210a04d15e56f42c156226198"; - sha256 = "0lv4rxs23njyry8akkjrpim1x0w8a172ww599as1ckcgrsnb420k"; + rev = "875f913b8edfdd85dfdaba9403a9d5ae2b952afc"; + sha256 = "04cdbv8xqhbzqx1lzcm0n2s80b25mp9s6izzflv88qzpcc0z6wv2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup"; @@ -40633,12 +40695,12 @@ magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit, melpaBuild, s, with-editor }: melpaBuild { pname = "magithub"; - version = "20161129.934"; + version = "20170115.1723"; src = fetchFromGitHub { owner = "vermiculus"; repo = "magithub"; - rev = "c9bff9889650bee96c6d4f5cd46ac469ac1c3dbb"; - sha256 = "0vzln1b6cf90nnv7a28n2w781qrc17sss1s8h6i7fmnaldr0913j"; + rev = "dc03f31edb5f45a1c9ada8ae00c1c9baf0126213"; + sha256 = "1sv7h3gnqxm6vw4ygqm28grckxzvcfr39fgd4qhrzj0d6sss9gr5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4605012c9d43403e968609710375e34f1b010235/recipes/magithub"; @@ -40969,12 +41031,12 @@ mandoku = callPackage ({ fetchFromGitHub, fetchurl, git, github-clone, lib, magit, melpaBuild, org }: melpaBuild { pname = "mandoku"; - version = "20161228.39"; + version = "20170115.2357"; src = fetchFromGitHub { owner = "mandoku"; repo = "mandoku"; - rev = "d225283f221d718ef858784d6db30fd31191ba78"; - sha256 = "1pqx65jrbg1ki2widnxm8s7vp1q69j1zr6ph28q70jhy5nkmzcmz"; + rev = "c58481b5dacc62dcc53a9886e032ccaf4a41a627"; + sha256 = "023kpmj01ixpb2yfsfxym7zvbldhj8486ndanma0srzf1p9lmqq6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1aac4ae2c908de2c44624fb22a3f5ccf0b7a4912/recipes/mandoku"; @@ -41643,12 +41705,12 @@ mediawiki = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mediawiki"; - version = "20160902.827"; + version = "20170113.1308"; src = fetchFromGitHub { owner = "hexmode"; repo = "mediawiki-el"; - rev = "7cc465af1d95a814387d241ff8a4c89d03b1e86e"; - sha256 = "1bhp0cx8kdr7mnmwg5q59qv019aalk4z7ic625qaa03gd6xr2ym4"; + rev = "03c5ca4e884782950d2bcc784ecc2167e43e4aa9"; + sha256 = "1d2dxpgbccd0p818xpj2wghfhvngyf4mad1ds84v2lbzyxphp6qa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/865e0ba1dbace58784181d214000d090478173bd/recipes/mediawiki"; @@ -41668,8 +41730,8 @@ src = fetchFromGitHub { owner = "mopemope"; repo = "meghanada-emacs"; - rev = "8eab3fc08bbf9929b6d169bf6fa45e5701b1f8f8"; - sha256 = "1s6fiwvj3w7q01qnl3ww8jzczy93apl6pxw30k87j1dl2bsclqzm"; + rev = "fe384624b5e382b331ff80bc74a17becb5b01c7c"; + sha256 = "1l2wqjdmsh77vcxfmm8437z7rlx1avdk2bvq8w1wmps32gi52lhg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada"; @@ -42451,10 +42513,10 @@ }) {}; misc-cmds = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "misc-cmds"; - version = "20170101.1049"; + version = "20170113.904"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/misc-cmds.el"; - sha256 = "191362k5mx0phzq4sc0x7n341dswgq9hkani6icwjhj5dsgvr6wy"; + sha256 = "05ymqzikn16538iqjiwyhwhqzshx9kx9v8amarb8ybr96l1ci4bz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/misc-cmds"; @@ -42718,12 +42780,12 @@ mode-icons = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mode-icons"; - version = "20170110.720"; + version = "20170116.1230"; src = fetchFromGitHub { owner = "ryuslash"; repo = "mode-icons"; - rev = "7d864662b9e866543fdee5a6cf02888502b5c9b7"; - sha256 = "10q9cy508p6a3664vrwrx31zikh0s0xvyn2qxvk9agv9fhafjgwa"; + rev = "60d5b4dbbb07d2515f195f8ffe75f12f0913a3d7"; + sha256 = "0ck7v4pzhzymq0cjwyl0iv721k9m0cx36m8ff7lw0bmgbzdi8izn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/mode-icons"; @@ -42777,10 +42839,10 @@ }) {}; modeline-posn = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "modeline-posn"; - version = "20170108.717"; + version = "20170114.1554"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/modeline-posn.el"; - sha256 = "198x9h6ma8ds95akf1f4wdqzaw41zplam01adxaqwxsfixb01398"; + sha256 = "068kdgzzv76ls5hyxs77vzm5ai7x8zcsmhjk78pmfirfrjrxcjgf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c62008950ea27b5a47363810f57063c1915b7c39/recipes/modeline-posn"; @@ -42838,12 +42900,12 @@ moe-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "moe-theme"; - version = "20161129.115"; + version = "20170111.1838"; src = fetchFromGitHub { owner = "kuanyui"; repo = "moe-theme.el"; - rev = "1a77b2ee52f5077ef3a31c794ecf13b37b3b4fd3"; - sha256 = "1gimdcrkbanzl1zxxw2955k7a4ygyqgls12g31g8nvjjp46hgjhr"; + rev = "70e71ef7404cc5c38254771695eee221090d5110"; + sha256 = "1dpcffb6pyggg2lj7n9lnxyg2clwm4q7hnxvgc87r6b61vjr3a20"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4efefd7edacf90620436ad4ef9ceb470618a8018/recipes/moe-theme"; @@ -44604,8 +44666,8 @@ src = fetchFromGitHub { owner = "rsdn"; repo = "nemerle"; - rev = "e6662886178abd17078d714e128f090108dfe7ad"; - sha256 = "0k3b5sxwgr4fg2zibh4mr3my84rqamhlkb20bx1qi4b86gsvkqad"; + rev = "95a09d97fdc86a570a9276a05fe42dc3c90dcbc5"; + sha256 = "1lydpljxf0air78qrc04x9g71ixmh5g5q6ln77acnivq9gn3xha5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8477d0cf950efcfd9a85618a5ca48bff590b22d7/recipes/nemerle"; @@ -44898,8 +44960,8 @@ src = fetchFromGitHub { owner = "martine"; repo = "ninja"; - rev = "95ddaa14eac8b241a33c6665e55e0de13fb94cc9"; - sha256 = "1s08mfndgqfg5pkvqysvcs7zy53svnhm6rd5qc748zl4nz7gclr4"; + rev = "9e71431e6f8323be8ced8997409cfe7a389c6583"; + sha256 = "0lnahkq47x9w8gi89bm91mjvap4dvwpn88pjysmp4ciw04v2h8s2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aed2f32a02cb38c49163d90b1b503362e2e4a480/recipes/ninja-mode"; @@ -44940,8 +45002,8 @@ src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "451c223deea17918454ae083dcfc0ea2b6103cab"; - sha256 = "003cq5lzp8l2qqa7jx7xx2nxhakk4if18cxf1cngx9jjx2mk5awi"; + rev = "c0d55f918379f46b87e43457745895439a85555c"; + sha256 = "05kmk92f7zzincs84z6zphmwsli6jhb81hha1ili9xibqpg5983w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode"; @@ -45209,8 +45271,8 @@ version = "20161215.457"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "32065e79090ce27c609db6a2fc07e134f1d3d4df"; - sha256 = "0dd5m1ifmcxmba0pfq6hijcbinpg4bg3d7bgx6f5pcz8kvzbpmdk"; + rev = "4a2ce7b5706b53cdd30c474d556f18d731c21bb5"; + sha256 = "1hhdaapyj6kg9zys7fw5rh7rqc4540wyh3c5dkhb4b9jlbzslj40"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -47703,12 +47765,12 @@ org-jira = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "org-jira"; - version = "20170106.2046"; + version = "20170111.2044"; src = fetchFromGitHub { owner = "ahungry"; repo = "org-jira"; - rev = "878af483c8ecb9e40808ca201460d2738b4f4494"; - sha256 = "15q1h66y4p3zzhcfjcdnfvsw9rxh9lzmbjbdn4ainmkq0bp18nxi"; + rev = "af4115f4e8b4e77de5642fb28ce6d5e0d7cb0b70"; + sha256 = "1g775f9gpl0nqq3vn6h9cnjazimn9bjwk31dc7fdylz3nf7f3h03"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/730a585e5c9216a2428a134c09abcc20bc7c631d/recipes/org-jira"; @@ -47790,8 +47852,8 @@ version = "20140107.519"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "a51c6ffa532a3f40a1d5c9a77788926397fedf78"; - sha256 = "17w060dww4fyz9gaxnyxhwk124ppnzfzsfbqgpdmwvbwqwfyphas"; + rev = "4d0609f8af0db7248fa5f8eb2b69ee02665e8cbd"; + sha256 = "1kv13imxw6k4mv8hi2ns80p78zc0r8y91mcv01nvpzvh28qnkwa2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal"; @@ -47810,8 +47872,8 @@ version = "20170105.1723"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "a51c6ffa532a3f40a1d5c9a77788926397fedf78"; - sha256 = "17w060dww4fyz9gaxnyxhwk124ppnzfzsfbqgpdmwvbwqwfyphas"; + rev = "4d0609f8af0db7248fa5f8eb2b69ee02665e8cbd"; + sha256 = "1kv13imxw6k4mv8hi2ns80p78zc0r8y91mcv01nvpzvh28qnkwa2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link"; @@ -47824,6 +47886,27 @@ license = lib.licenses.free; }; }) {}; + org-mime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "org-mime"; + version = "20170110.2011"; + src = fetchFromGitHub { + owner = "org-mime"; + repo = "org-mime"; + rev = "e554d8821d8513d4e8c33ca6efb147e3dfce2a5b"; + sha256 = "000zgp2palvn12rahbjg8vrl4r3x2gjzbxxw2fkaqc2bx4rkjiv7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/521678fa13884dae69c2b4b7a2af718b2eea4b28/recipes/org-mime"; + sha256 = "14154pajl2bbawdd8iqfwgc67pcjp2lxl6f92c62nwq12wkcnny6"; + name = "org-mime"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/org-mime"; + license = lib.licenses.free; + }; + }) {}; org-mobile-sync = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-mobile-sync"; @@ -49370,12 +49453,12 @@ ox-jira = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-jira"; - version = "20170110.1024"; + version = "20170112.1537"; src = fetchFromGitHub { owner = "stig"; repo = "ox-jira.el"; - rev = "8b28523c2c78a772443c3723514b688dfc880cad"; - sha256 = "12f1npslidbaq3a5lg9l0p67jny5h3qzrr7jb7qh0i8qsclr9kmi"; + rev = "3a2467d4050637a0551e1fac957f85644147d280"; + sha256 = "1c09rfwx5ywcdbjsmkb4a6ixmqn1f289986dx96pvh26jnh2k2vp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e8a77d9c903acd6d7fdcb53f63384144e85589c9/recipes/ox-jira"; @@ -50268,12 +50351,12 @@ parinfer = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "parinfer"; - version = "20161231.924"; + version = "20170113.956"; src = fetchFromGitHub { owner = "DogLooksGood"; repo = "parinfer-mode"; - rev = "3d5b8d4a3f7e73f15f816f7555abed09c5516338"; - sha256 = "1w3j0dzi19h1k94gnj1zxx4s1aji91wq4sjwkf813zs7q769mfsp"; + rev = "a91b1ee5392c6a98c102ddba2f0c15ab67f8ad1b"; + sha256 = "09337fpv492rzd2ah7d8kxyv5spcgwf58xr943ya09sgi2invkbx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/470ab2b5cceef23692523b4668b15a0775a0a5ba/recipes/parinfer"; @@ -50370,6 +50453,27 @@ license = lib.licenses.free; }; }) {}; + passmm = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "passmm"; + version = "20170113.837"; + src = fetchFromGitHub { + owner = "pjones"; + repo = "passmm"; + rev = "076df7221f9450b96855c36684ae4a7481e0bb71"; + sha256 = "0nap42jhjh3nq57a5hpv6wd8gli6i9g6n5rbjza685sifqn27dbf"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8ae2a1e10375f9cd55d19502c9740b2737eba209/recipes/passmm"; + sha256 = "0p6qps9ww7s6w5x7p6ha26xj540pk4bjkr629lcicrvnfr5jsg4b"; + name = "passmm"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/passmm"; + license = lib.licenses.free; + }; + }) {}; passthword = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "passthword"; @@ -51126,12 +51230,12 @@ persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "persp-mode"; - version = "20161226.518"; + version = "20170115.651"; src = fetchFromGitHub { owner = "Bad-ptr"; repo = "persp-mode.el"; - rev = "1116ead88123a11efef346db0045ee8389250bd2"; - sha256 = "11xncsvzy13xc939qfvlzplsz2izvf16hy45k500h44g2dxcvq3m"; + rev = "06d56333d738c57fa543e47e7eb1c4962bd14344"; + sha256 = "0khzfh7qqfqpmjqb0kaz3s5kpf1a8inxln5awap5xh2z6fv6wysy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode"; @@ -51189,12 +51293,12 @@ perspeen = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }: melpaBuild { pname = "perspeen"; - version = "20170110.2022"; + version = "20170117.417"; src = fetchFromGitHub { owner = "seudut"; repo = "perspeen"; - rev = "be0fa7a5d7a9d972b0957a79ff36b34bc0b9cac3"; - sha256 = "0hri5lrxg0f9rlvh4ca49n25ixxi4f1ngrdnbwl6wg90bzaszyq2"; + rev = "057f145f88fdfc021c574b7c263269e381494f4b"; + sha256 = "1a5cjvc21ga2j2y7rxcfxwkc0x9v5mrwla9prm021q4sg07gvld7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19bead132fbc4c179bfe8720c28424028c9c1323/recipes/perspeen"; @@ -51207,6 +51311,27 @@ license = lib.licenses.free; }; }) {}; + pg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "pg"; + version = "20130731.1442"; + src = fetchFromGitHub { + owner = "cbbrowne"; + repo = "pg.el"; + rev = "4f6516ec3946d95dcef49abb6703cc89ecb5183d"; + sha256 = "1zh7v4nnpzvbi8yj1ynlqlawk5bmlxi6s80b5f2y7hkdqb5q26k0"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5c4d1bb21948da2b283a3a9d89d9e3aed11afa13/recipes/pg"; + sha256 = "0n0187ndvwza1nis9a12h584qdqkwqfzhdw21kz5d1i6c43g7gji"; + name = "pg"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/pg"; + license = lib.licenses.free; + }; + }) {}; pgdevenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pgdevenv"; @@ -51550,8 +51675,8 @@ src = fetchFromGitHub { owner = "ejmr"; repo = "php-mode"; - rev = "3287de50464e908d421e9ad191fe31b8fae89ed3"; - sha256 = "0m3z96n0nnsjisb1cpxcx17z2q1994qvrisnd47fv7sjj3r9g5vi"; + rev = "a6c998937341f49138f07c15050efe7e5809be23"; + sha256 = "1g0m9vsx0n2rzph4ipyab8fl6bv26y2dmyrgkici545k2mhhhiqp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode"; @@ -51987,12 +52112,12 @@ plain-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "plain-theme"; - version = "20160903.1029"; + version = "20170114.1146"; src = fetchFromGitHub { owner = "yegortimoshenko"; repo = "plain-theme"; - rev = "4210122812df9b5fe375ad35a3b933bf040460a3"; - sha256 = "184rw6pri55mkab8wv2n483zp0cvd6j911abq290pcqw1pgswcgh"; + rev = "43fc59d487d39e6110230a073f1376ab877aa739"; + sha256 = "0g44qdpn3ni291awjklia4r26qyiavpjib04k761hfacrdkvsdys"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d7ad3737f081f101500317f7e183be6b1e7e8122/recipes/plain-theme"; @@ -53414,12 +53539,12 @@ projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }: melpaBuild { pname = "projectile-rails"; - version = "20161130.1025"; + version = "20170115.731"; src = fetchFromGitHub { owner = "asok"; repo = "projectile-rails"; - rev = "fe0cb5597d9e87ceebfadd1815beadfc04a194f1"; - sha256 = "0yg7xbv0mnrcc6kgh8ci6pxzfjiq1qkrw6hx2zs5m4ryfrrfclz2"; + rev = "8c41f3c92cd7f5eb5a983f6f3d42cb67dff04366"; + sha256 = "1rial7py4n451d6ylymf5q4cb57ala4rvvi7619r1c5y1m493qi7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails"; @@ -53439,8 +53564,8 @@ src = fetchFromGitHub { owner = "nlamirault"; repo = "ripgrep.el"; - rev = "ddb7dcadf8980b9f458343aa853e4b6c3febaee0"; - sha256 = "0ln81fgvp8sk7f01icrjz8nyicd71kp7fg2rsh9hxjr948jx5ncd"; + rev = "876d9b410f9a183ab6bbba8fa2b9e1eb79f3f7d2"; + sha256 = "0s2vg3c2hvlbsgbs83hvgcbg63salj7scizc52ry5m0abx6dl298"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/195f340855b403128645b59c8adce1b45e90cd18/recipes/projectile-ripgrep"; @@ -53691,8 +53816,8 @@ src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "228d242c583fb4e0dde17f0a52899f995d85c200"; - sha256 = "04r9vdpfbd7hq6rb8br5lcv5i3j7ljfx69vsqlig2v2av05rvipa"; + rev = "c9cd6acd71e928164db10602b9d0837216ee367e"; + sha256 = "0rm2476gvsqsyhblw0bwa4qacpdckp6r44d2qrznysdq9086lyjj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -54020,19 +54145,18 @@ license = lib.licenses.free; }; }) {}; - pushover = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + pushover = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pushover"; version = "20160718.857"; - src = fetchFromGitHub { - owner = "swflint"; - repo = "pushover.el"; - rev = "c43f149eaef832f6af399723a5a59424aa093aaa"; - sha256 = "0vrx8m7jcxavbfsyh35mf289vfyal0yrfl6h2m2yfx81whbinb5j"; + src = fetchgit { + url = "https://git.flintfam.org/swf-projects/emacs-pushover.git"; + rev = "0d821fc23818918bf136e47449bce53d4e51e404"; + sha256 = "0v0dkhymh81z1wcd3nm5vrs5scz9466brr8xng0254bi3yn0yi57"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/c9f2e3a155266e7534b4e77138fdfba4fafe9bac/recipes/pushover"; - sha256 = "1ja3xp8nxzyhzg85791s4rb9rm938fyvgkdjxhyyy36wmda1djwr"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/2e12638554a13ef49ab24da08fe20ed2a53dbd11/recipes/pushover"; + sha256 = "0im5bf2r69s2jb6scm8xdk63y1xi5zm4kg9ghfixlvyvipfli4kl"; name = "pushover"; }; packageRequires = [ cl-lib ]; @@ -54379,12 +54503,12 @@ pyimport = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "pyimport"; - version = "20170104.342"; + version = "20170117.402"; src = fetchFromGitHub { owner = "Wilfred"; repo = "pyimport"; - rev = "adcdb8a20b020d26b69da916e16402e62a3cc0a0"; - sha256 = "1di07lr5i9qi22p11rlrpav7qfdgqd4ms2qa7sigh9g40c9d3xqi"; + rev = "e2f6d2cf5a6772a8de698e67768ae2f82a43419e"; + sha256 = "0lkkycflmkzziwr90njx8d68903m1bpb71awlb23dslw92qvl3fj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/71bc39b06cee37814960ef31c6a2056261b802fb/recipes/pyimport"; @@ -54568,12 +54692,12 @@ python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "python-mode"; - version = "20170108.2329"; + version = "20170117.130"; src = fetchFromGitLab { owner = "python-mode-devs"; repo = "python-mode"; - rev = "470843aa11910edb46efbfa250ff4c899afc6b7c"; - sha256 = "1dca1s1frf3ghgsfdrg8y4ljsxk9n6xsy5ydkyldm5mgrjxp4p6b"; + rev = "d20b482c2c10f086174c6bf7d5aa86867d9a9b8a"; + sha256 = "01jhzrm4w4lpslivkc1d9f00qmnnrfai5agl7pv6fjfhd7njwzg1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode"; @@ -54880,22 +55004,22 @@ license = lib.licenses.free; }; }) {}; - quickrun = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + quickrun = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "quickrun"; - version = "20160808.1753"; + version = "20170114.645"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-quickrun"; - rev = "487a74c7db513ceba86e849c8f42f834234c1f7b"; - sha256 = "04n6y5ymn29saaikzfg8ak57kqysh8915bvvzkiijmzbqr6ndsgj"; + rev = "70e93e06778f44113f405aedec6187b925311d57"; + sha256 = "0swbgsidq11w7vyjhf06dn8vsj06j9scj8n2dm9m7fasj0yh3ghw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/quickrun"; sha256 = "0f989d6niw6ghf9mq454kqyp0gy7gj34vx5l6krwc52agckyfacy"; name = "quickrun"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/quickrun"; license = lib.licenses.free; @@ -54950,8 +55074,8 @@ src = fetchFromGitHub { owner = "racer-rust"; repo = "emacs-racer"; - rev = "dc6c62e45a6e565b56e76162e7130ff102678bf7"; - sha256 = "0afa5kppq3m8mln2f5ypi7dym1cdlx8ldbj87xfdcs258zhbjbiy"; + rev = "d83091ff6b55b4663fed49de63ec2c751cdb2603"; + sha256 = "1fj2zq9cjlnf45z1xqcfir3y739jpiv08sqlgv807i6dgbr0vxls"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/97b97037c19655a3ddffee9a86359961f26c155c/recipes/racer"; @@ -55492,12 +55616,12 @@ rdf-prefix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rdf-prefix"; - version = "20160813.829"; + version = "20161221.1216"; src = fetchFromGitHub { owner = "simenheg"; repo = "rdf-prefix"; - rev = "07f1b914f0bf0ca154831e13202eacecf27cf4c4"; - sha256 = "0cis7lcsjpr2gbh59v4sj1irkdkzx893rl3z3q35pq2yklrmx9nv"; + rev = "12fdb54d6e7b1e00dba566448280ec878bf9057c"; + sha256 = "1gfhvq2cdvq72jppiajig6khql7f7f9n8q3akb12pipbzak1xw1g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5f083bd629697038ea6391c7a4eeedc909a5231/recipes/rdf-prefix"; @@ -55639,12 +55763,12 @@ realgud = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, load-relative, loc-changes, melpaBuild, test-simple }: melpaBuild { pname = "realgud"; - version = "20161227.1536"; + version = "20170117.415"; src = fetchFromGitHub { owner = "rocky"; repo = "emacs-dbgr"; - rev = "4a5fe992f2b4a68f7b3840bbb24b496738760573"; - sha256 = "0448qvl33rvnwlwmsmm297w6ghb0gk0s1bkny3q3wagrwsi9zf2f"; + rev = "20b8d5dd7bd96f4e8d143596a6435d84fb8d4125"; + sha256 = "0ckd7jya4368qin90x20dqf5kh3300n03f9g2qb54s93d430n0yi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud"; @@ -56474,12 +56598,12 @@ request = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "request"; - version = "20161221.1711"; + version = "20170113.423"; src = fetchFromGitHub { owner = "tkf"; repo = "emacs-request"; - rev = "5b6fde7af45b589c167b79971ecab07c42e51465"; - sha256 = "0r2rpv63ns2sv555w61lkdlif92zk64ngqmfscg0mqww041462g5"; + rev = "e2b031a4e7655ce7513b8e7d7f83c024cb2a9f35"; + sha256 = "0r6wf3h7rwjid818aqrvf2r6dwq02mwn3y4lj7lrkl7vyf5g3va5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8d113615dde757a60ce91e156f0714a1394c4bfc/recipes/request"; @@ -56499,8 +56623,8 @@ src = fetchFromGitHub { owner = "tkf"; repo = "emacs-request"; - rev = "5b6fde7af45b589c167b79971ecab07c42e51465"; - sha256 = "0r2rpv63ns2sv555w61lkdlif92zk64ngqmfscg0mqww041462g5"; + rev = "e2b031a4e7655ce7513b8e7d7f83c024cb2a9f35"; + sha256 = "0r6wf3h7rwjid818aqrvf2r6dwq02mwn3y4lj7lrkl7vyf5g3va5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8d113615dde757a60ce91e156f0714a1394c4bfc/recipes/request-deferred"; @@ -56822,6 +56946,27 @@ license = lib.licenses.free; }; }) {}; + rg = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "rg"; + version = "20170115.45"; + src = fetchFromGitHub { + owner = "dajva"; + repo = "rg.el"; + rev = "96114ceeea83db703f41bed18f03d87e217c1c67"; + sha256 = "00k9lyzy11igk0j1raq3qgymfc872rf85fj42244lpmbnij4hgjd"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg"; + sha256 = "0i78qvqdznh1z3b0mnzihv07j8b9r86dc1lsa1qlzacv6a2i9sbm"; + name = "rg"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/rg"; + license = lib.licenses.free; + }; + }) {}; rhtml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rhtml-mode"; @@ -56930,12 +57075,12 @@ ripgrep = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ripgrep"; - version = "20161116.211"; + version = "20170116.47"; src = fetchFromGitHub { owner = "nlamirault"; repo = "ripgrep.el"; - rev = "ddb7dcadf8980b9f458343aa853e4b6c3febaee0"; - sha256 = "0ln81fgvp8sk7f01icrjz8nyicd71kp7fg2rsh9hxjr948jx5ncd"; + rev = "876d9b410f9a183ab6bbba8fa2b9e1eb79f3f7d2"; + sha256 = "0s2vg3c2hvlbsgbs83hvgcbg63salj7scizc52ry5m0abx6dl298"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e8d789818876e959a1a59690f1dd7d4efa6d608b/recipes/ripgrep"; @@ -57203,12 +57348,12 @@ rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rtags"; - version = "20170109.1657"; + version = "20170111.2258"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "7b5424ec38518aa2bed1ff9f3853adfd6c67a988"; - sha256 = "012amc3sn0bncb5wxbvaq7j3hwrs7l8ddn3zi9psbzcgknb9vcmh"; + rev = "6e60bce8ae998e61c9cea6ceff3564a73a9efe73"; + sha256 = "1y9m1dh946qzpad2fp2dlyjsaj9hqhwf8gvg8zffxvchd5clhnls"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac3b84fe84a7f57d09f1a303d8947ef19aaf02fb/recipes/rtags"; @@ -57269,7 +57414,7 @@ version = "20161115.2259"; src = fetchsvn { url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "57310"; + rev = "57357"; sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf"; }; recipeFile = fetchurl { @@ -57349,7 +57494,7 @@ version = "20150424.752"; src = fetchsvn { url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "57310"; + rev = "57357"; sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf"; }; recipeFile = fetchurl { @@ -57765,12 +57910,12 @@ sage-shell-mode = callPackage ({ cl-lib ? null, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "sage-shell-mode"; - version = "20170107.1708"; + version = "20170113.631"; src = fetchFromGitHub { owner = "sagemath"; repo = "sage-shell-mode"; - rev = "1586bfff1aeff04ae80fc6a8cac078ca9c961b2a"; - sha256 = "07r151x6abjmn3ryg3h4b0siq9mizpp69pn6fgyn124wx4hjs0ln"; + rev = "80f2f7b06e48c2a771411c39f7d0067c9d145050"; + sha256 = "0ljd2v60f9i5pkqw2j8yylv1ya994hymrblx8dks38mx9br8m7b0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb875c50c2f97919fd0027869c5d9970e1eaf373/recipes/sage-shell-mode"; @@ -58618,12 +58763,12 @@ sekka = callPackage ({ cl-lib ? null, concurrent, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "sekka"; - version = "20150708.459"; + version = "20170115.237"; src = fetchFromGitHub { owner = "kiyoka"; repo = "sekka"; - rev = "8f256be87564653aeef702b3c09f235f0bcb6ae8"; - sha256 = "031aiypx1n8hq613zq4j6gh61ajzja2j60df9mwy50a0qma34awr"; + rev = "001e205b37ae0dded430b9a809425dc7ed730366"; + sha256 = "113i8i705qkd3nccspacnmk9ysy5kwavg8h9z9djdgki611q700q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/350bbb5761b5ba69aeb4acf6d7cdf2256dba95a6/recipes/sekka"; @@ -60406,12 +60551,12 @@ sly-quicklisp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, sly }: melpaBuild { pname = "sly-quicklisp"; - version = "20160204.815"; + version = "20170112.135"; src = fetchFromGitHub { owner = "capitaomorte"; repo = "sly-quicklisp"; - rev = "fccc00b2e9c123c4fb88131ce471191c3ad289ea"; - sha256 = "1mb78cdkmik9rwccvzl8slv4dfy8sdq69dkys7q11jyn8lfm476y"; + rev = "8a9e3c0c07c6861ec33b338cc46ac12e7ce6a477"; + sha256 = "17xx79s2nx8prmg0xhfs9i8sdprbysaajc8k4131lnahj65v159l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/330d04e4e79eee221bcffb8be3e46e097306b175/recipes/sly-quicklisp"; @@ -61525,8 +61670,8 @@ src = fetchFromGitHub { owner = "nathankot"; repo = "company-sourcekit"; - rev = "71d9e7002a9892308d64af62d21ac73f8d9d4ad5"; - sha256 = "0fz7pf95zsh597g6az29khjmj3jz4ml3285p98zbkl75vh6h5p0f"; + rev = "a28ac4811fac929686aca6aa6976845c02d6efd3"; + sha256 = "09vv6bhiahazjwzg5083b23z3xz5f4b3d4jra61m5xffkmjnbs9s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/45969cd5cd936ea61fbef4722843b0b0092d7b72/recipes/sourcekit"; @@ -62168,12 +62313,12 @@ sql-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sql-indent"; - version = "20150424.1716"; + version = "20170112.1507"; src = fetchFromGitHub { owner = "bsvingen"; repo = "sql-indent"; - rev = "f85bc91535b64b5d538e5aec2ce4c5e2312ec862"; - sha256 = "17nbcaqx58fq4rz501xcqqcjhmibdlkaavmmzwcfwra7jv8hqljy"; + rev = "761a5724d181b75f30e64040408b8836d41f9db9"; + sha256 = "13xspvqn3y3hikacv6w6jf2x1gb33gxkva6chrz0fd8bkhwdf335"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/500ec53f14b8b0dca8ff80e8a2b1b60f4266562c/recipes/sql-indent"; @@ -62621,6 +62766,27 @@ license = lib.licenses.free; }; }) {}; + stem-english = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "stem-english"; + version = "20170113.24"; + src = fetchFromGitHub { + owner = "kawabata"; + repo = "stem-english"; + rev = "c8d9ccf1ea38ea403ba360b79b1042b0fd449a70"; + sha256 = "15bwbqapr3kfazpxagpzy6fpkgc669mb8n8psz7gaqhlpxsliwiz"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5c8e97e70e7a86b9f5e55bdd2db492994e8abdd5/recipes/stem-english"; + sha256 = "15d13palwdwrki9p804cdls08ph7sxxzd44nl4bhfm3dxic4sw7x"; + name = "stem-english"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/stem-english"; + license = lib.licenses.free; + }; + }) {}; stgit = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "stgit"; version = "20140213.348"; @@ -63487,12 +63653,12 @@ swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "swift-mode"; - version = "20161016.709"; + version = "20170114.521"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "swift-mode"; - rev = "58f31cc50ee8fac236f5aa3936152e6e70ee3ce5"; - sha256 = "0ncz4bcnbh64p3iqbr65g6b1p8lfpqviszpz80909izi8awjgbgf"; + rev = "6cd2948589771d926e545d8cbe054705eebce18f"; + sha256 = "1zz5jv2qgcnhidyhnw3wbcpqb80jqqbs74kpa66assfigyvivyj6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode"; @@ -64259,12 +64425,12 @@ tao-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tao-theme"; - version = "20170110.50"; + version = "20170116.2155"; src = fetchFromGitHub { owner = "11111000000"; repo = "tao-theme-emacs"; - rev = "54d1a08feb856a984333b420530f42cf1a524043"; - sha256 = "10490h25igp0vwaplxcz2cbj008q05wz44vik1hv4apkysh31vgh"; + rev = "69b816277c334c8f4ec7da8f283d52df951d5584"; + sha256 = "0fz59291wwrm5jdrq3qzkbihh2wvypp23hxcy24d0pp3nmav5g0a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/94b70f11655944080507744fd06464607727ecef/recipes/tao-theme"; @@ -64704,8 +64870,8 @@ src = fetchFromGitHub { owner = "ternjs"; repo = "tern"; - rev = "b26e513f7bb8c7bb3509b7ce7066212673cef285"; - sha256 = "0w8m30c6da5ahlziwnig2pprqx6w5wrp1mm341fhibfj3gd4qmxp"; + rev = "2489fd3177a670ad6fdb864d0abf6e79355b2b7a"; + sha256 = "0m4bj93i42705hqnjzd6b1ahh2ibbg05wxggnxanmqssfv7hmq18"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern"; @@ -64725,8 +64891,8 @@ src = fetchFromGitHub { owner = "ternjs"; repo = "tern"; - rev = "b26e513f7bb8c7bb3509b7ce7066212673cef285"; - sha256 = "0w8m30c6da5ahlziwnig2pprqx6w5wrp1mm341fhibfj3gd4qmxp"; + rev = "2489fd3177a670ad6fdb864d0abf6e79355b2b7a"; + sha256 = "0m4bj93i42705hqnjzd6b1ahh2ibbg05wxggnxanmqssfv7hmq18"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern-auto-complete"; @@ -64784,12 +64950,12 @@ terraform-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, hcl-mode, lib, melpaBuild }: melpaBuild { pname = "terraform-mode"; - version = "20170101.456"; + version = "20170111.2117"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-terraform-mode"; - rev = "dfd111ea892ab7c3a041d5097207d351df5af7f8"; - sha256 = "0wxwiy08y89n1qr7wzbpsax05ivppvdcgcnamzx4br0x8lqxab63"; + rev = "6973d1acaba2835dfdf174f5a5e27de6366002e1"; + sha256 = "12ww36g7mz4p4nslajcsdcm8xk6blwjwqjwhyp0n10ym6ssbh820"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/93e06adf34bc613edf95feaca64c69a0a2a4b567/recipes/terraform-mode"; @@ -64847,12 +65013,12 @@ test-simple = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "test-simple"; - version = "20160303.36"; + version = "20170117.411"; src = fetchFromGitHub { owner = "rocky"; repo = "emacs-test-simple"; - rev = "e199434a2ba2e19f9854504bfb0cee22fcd03975"; - sha256 = "0i38pzqi2ih3ckfjz323d3bc3p8y9syfjr96im16wxrs1c77h814"; + rev = "604942d36021a8b14877a0a640234a09c79e0927"; + sha256 = "1ydbhd1xkwhd5zmas06rw7v5vzcmvri8gla3pyf2rcf2li5sz247"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a4b76e053faee299f5b770a0e41aa615bf5fbf10/recipes/test-simple"; @@ -66829,12 +66995,12 @@ ujelly-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ujelly-theme"; - version = "20161222.534"; + version = "20170116.1121"; src = fetchFromGitHub { owner = "marktran"; repo = "color-theme-ujelly"; - rev = "b62d64b8221c4209fb2d25bd49c85e3bfea19a90"; - sha256 = "1qzpv3lh51q8f4bvyr0wykvsm1jyf78wf8xvawjspp8vz76r8h7l"; + rev = "1837cfbf3d0b09d7e1da678e5dfb3b560a759734"; + sha256 = "0jjr5798nqm5lwjv1j4r21vhbqy10qy3gn977g0ysb31wp2209r4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/ujelly-theme"; @@ -67400,12 +67566,12 @@ use-package = callPackage ({ bind-key, diminish, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "use-package"; - version = "20161222.903"; + version = "20170116.1309"; src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "5954ad37cf2d3c9237f4d2037e8619be15681cd1"; - sha256 = "0scn6wrs6040j4z1gfmn9akzknjhaj2kr07kfzx1v42ibm42ihcd"; + rev = "38034854ac21bd5ddc1a1129fd6c8ff86d939f8a"; + sha256 = "0s20z5njwmk591674mb2lyv50agg6496hkr5b11904jq5ca3xagz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3f9b52790e2a0bd579c24004873df5384e2ba549/recipes/use-package"; @@ -67799,12 +67965,12 @@ vdiff = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }: melpaBuild { pname = "vdiff"; - version = "20161221.450"; + version = "20170116.1154"; src = fetchFromGitHub { owner = "justbur"; repo = "emacs-vdiff"; - rev = "cfad650c53b4fcaad8f24bbb7d44623678d2edff"; - sha256 = "06ajkby1762i3pnsq0k9048qvxldk0ajrqvq4wwcqgc1xpbcdq7l"; + rev = "f4332f26f7a88c6339e357d19f56354d2a2489fa"; + sha256 = "1jbhv430g2vsq0jhjypg9wdyax57m0r6hppqm2rqf0hlgn38v8d5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e90f19c8fa4b0d267d269b76f117995e812e899c/recipes/vdiff"; @@ -68544,22 +68710,22 @@ license = lib.licenses.free; }; }) {}; - wand = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: + wand = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "wand"; - version = "20141104.1645"; + version = "20170116.223"; src = fetchFromGitHub { owner = "cmpitg"; repo = "wand"; - rev = "da6284ab75c3afa1275420faa9934037052e2967"; - sha256 = "09gqsssc2sk0vwfg0h4zxq9a779sdjdgvxsw7p6n2k0g4wk0phri"; + rev = "08c9511cd0f07ba65ef5a07ad93851549391333f"; + sha256 = "16zd914kwnnhp6zc81z9acq69prrgiwi25ggbpn4lcx7xm8h5hv3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/38be840bbb32094b753ec169b717a70817006655/recipes/wand"; sha256 = "052zq5dp800hynd9fb6c645kjb9rp3bpkz41ifazjnx4h4864r0l"; name = "wand"; }; - packageRequires = [ dash ]; + packageRequires = [ dash s ]; meta = { homepage = "https://melpa.org/#/wand"; license = lib.licenses.free; @@ -68820,12 +68986,12 @@ web-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "web-mode"; - version = "20161230.1026"; + version = "20170114.906"; src = fetchFromGitHub { owner = "fxbois"; repo = "web-mode"; - rev = "abd9c738feb0d6069cf8de07fa7d109441a5ca54"; - sha256 = "049q9n3881f27lpsmjsxdfw6zkizqhrh3wwyxfibnzsq9c1631hi"; + rev = "3e74b741abf8d3113a67ab6b48fba7fdd404e712"; + sha256 = "0lagq9gzm8wrypks2zc5qjz1pqjhhlg4dxji9c1zdji5kq3bhqz5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode"; @@ -69715,8 +69881,8 @@ src = fetchFromGitHub { owner = "deb0ch"; repo = "emacs-winum"; - rev = "e89791b90e45f588f9e8c11884ea1daf3dc98518"; - sha256 = "1gd0byijl5cyn6gkf5pkadzqvczshgizfrr3ddg6czvgblf1vgl9"; + rev = "25fbb9524ac7cde601b07cecd81fd1446e571282"; + sha256 = "1aibzgb9np9ik27jzaxg1gl1n15q1chxr5lhjvvpp05rr70ykll0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c1caa7a54a910a44322fdee300e8cce6ddcde071/recipes/winum"; @@ -69735,8 +69901,8 @@ version = "20160419.1232"; src = fetchhg { url = "https://bitbucket.com/ArneBab/wisp"; - rev = "ab6afca9ee2e"; - sha256 = "19yy6z12pqaz9l0gj4hm73m7z2gcyivwymf6732vk8im77i8agyl"; + rev = "280ab84bf8ad"; + sha256 = "088khr4ha37nvxzg620a6gyq7pc40rb13bbi9vgqhgjgggpq61d9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode"; @@ -70071,8 +70237,8 @@ src = fetchFromGitHub { owner = "bnbeckwith"; repo = "writegood-mode"; - rev = "253710702282c2a789b9a6cd64d53a5fcfe08638"; - sha256 = "1kppxgq2hcra1a978r5m589y7cya07hpqlhg19qa3i6m92wz6jcj"; + rev = "a99896531a260db11acb931b68dbdc45030832d7"; + sha256 = "15g133ql8mgjchm6h255q77b6rks843lzva44kgjmfgwmgbfmc1b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/75c5a4304999fc3f5a02235a1c2c904238d2ce4f/recipes/writegood-mode"; @@ -70113,8 +70279,8 @@ src = fetchFromGitHub { owner = "lewang"; repo = "ws-butler"; - rev = "323b651dd70ee40a25accc940b8f80c3a3185205"; - sha256 = "1a4b0lsmwq84qfx51c5xy4fryhb1ysld4fhgw2vr37izf53379sb"; + rev = "80dabd5d158929e8433e46207bb521282b21e4f3"; + sha256 = "0s4kfg2ga3qa6gb2ji1jv73fv66d9vn054cl0mif7n16kic4bkr4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1645a51d487c8902eb6e59fb1884f85f48cec6f/recipes/ws-butler"; @@ -70277,12 +70443,12 @@ xah-css-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-css-mode"; - version = "20161218.2250"; + version = "20170116.919"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-css-mode"; - rev = "80f46b8699aff1ee83ba43d636d765a852df0b4a"; - sha256 = "1zhzh1vih468zlycr3pmnjk1f2jr8qqg61n1jbjw58daxh4jj6jd"; + rev = "ed4539971dd9c32752c7ff5a1d280150446bc769"; + sha256 = "1nw7mwbiaq4i28his4l7hx1qrgqykr59sw1909s1l165ygl85jb2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57c2e2112c4eb50ee6ebddef9c3d219cc5ced804/recipes/xah-css-mode"; @@ -70298,12 +70464,12 @@ xah-elisp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-elisp-mode"; - version = "20170111.654"; + version = "20170116.1037"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-elisp-mode"; - rev = "b880127e243681796cefc81125953751da15930b"; - sha256 = "16mcbrmnh5s4982s5jxx8iwnp7l4zczr9d7xvhlx3dnr916nmkf2"; + rev = "d49a743fede497d102d4dc2b739dbe35b41163ca"; + sha256 = "00v20p99njhh2wgk8jfccpigss2y6vd40wl1cs0ra67a4bjwn8di"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2e996dd5b0061371662490e0b21d3c5bb506550/recipes/xah-elisp-mode"; @@ -70340,12 +70506,12 @@ xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-fly-keys"; - version = "20170111.1606"; + version = "20170116.2003"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-fly-keys"; - rev = "55b7ca9765886f8a750c54882cf07f6e953e60e7"; - sha256 = "1kpvsd2kbp97pvlya80980znprc6b8h3mr87g16pjqzaayr2nk50"; + rev = "9c8d51eb4441351c71854612eb990246ff23b8b5"; + sha256 = "11l2jhn82r6aavc4wkcn0w5f2g2hilaz3a3v2fv70gd1x7spw0w7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc1683be70d1388efa3ce00adc40510e595aef2b/recipes/xah-fly-keys"; @@ -70634,12 +70800,12 @@ xmlgen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xmlgen"; - version = "20170108.1614"; + version = "20170116.833"; src = fetchFromGitHub { owner = "philjackson"; repo = "xmlgen"; - rev = "f5eb6988efd36e05ace27799dc64dd8c55600f5e"; - sha256 = "1vwvs6dnvds0svvzbjjxrm6l4fzjw9nh33jc6yfgibavr3zww40j"; + rev = "331dbe01037873c209fbca2aeeaf42da446f1d79"; + sha256 = "03hksc2ng5dl4rq9yprj65d1x8kp0ccyb913hc6byz1n6gp0jkll"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cd19fded2de4e7549121485e81f7405c0176e203/recipes/xmlgen"; @@ -71096,12 +71262,12 @@ yankpad = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yankpad"; - version = "20160903.1935"; + version = "20170116.1451"; src = fetchFromGitHub { owner = "Kungsgeten"; repo = "yankpad"; - rev = "76ecf21a8b59f35087716ac713eb072fd3d98f00"; - sha256 = "1h0gnnsqfb6q88002pjzmhmq9is1f3knwh24nw2rbsg3mpfg378x"; + rev = "ff1064bbc4189f93433c3eebb9d0dde72a27e6c6"; + sha256 = "1spriw8c4qv7c349p8m29j5x6b72ysbpffcc444rdd9s1yypizzf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64746d10f9e0158621a7c4dc41dc2eca6ad573c/recipes/yankpad"; @@ -71343,12 +71509,12 @@ ycmd = callPackage ({ cl-lib ? null, dash, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, request, request-deferred, s }: melpaBuild { pname = "ycmd"; - version = "20161222.1039"; + version = "20170114.445"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "ca51cbce87f671f2bb133d1df9f327bb8f1bb729"; - sha256 = "0riz0jj8c80x6p9fcxyni7q3b0dgxjwss8qbihndq8h2jypdhcgd"; + rev = "386f6101fec6975000ad724f117816c01ab55f16"; + sha256 = "12m3fh2xipb6sxf44vinx12pv4mh9yd98v4xr7drim2c95mqx2y4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd"; @@ -71371,6 +71537,27 @@ license = lib.licenses.free; }; }) {}; + ydk-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ydk-mode"; + version = "20170113.121"; + src = fetchFromGitHub { + owner = "jacksonrayhamilton"; + repo = "ydk-mode"; + rev = "f3f125b29408e0b0a34fec27dcb7c02c5dbfd04e"; + sha256 = "0ndmbswrv8vyw18zhbmjr11400l546zqaj7dzfvwb5rhdv2d0abi"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/865b9ee86ca28fc1cedc0a432a292400184711ae/recipes/ydk-mode"; + sha256 = "1z9digf39d7dd736svp0cy6773l3nklzc263q23gwfcg0jswbdyg"; + name = "ydk-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/ydk-mode"; + license = lib.licenses.free; + }; + }) {}; yesql-ghosts = callPackage ({ cider, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "yesql-ghosts"; @@ -71829,12 +72016,12 @@ zoom-window = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zoom-window"; - version = "20161123.405"; + version = "20170115.120"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-zoom-window"; - rev = "759517e1116c9162181db3aa74438d448b5e1233"; - sha256 = "04m9mhsmmi40n8qx1axfvg490j4afkj694jjq6r954dz2f4h2h98"; + rev = "5d1ea2a67ca4c74557183d62ebd90bae5a81cfc6"; + sha256 = "11qj8mqqmcxc7c14mzf84k7mpgzarpv1y2mgsky2a7hnb0si14fx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8a55cc66cc0deb1c24023f638b8e920c9d975859/recipes/zoom-window"; @@ -71913,12 +72100,12 @@ zotxt = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild, request-deferred }: melpaBuild { pname = "zotxt"; - version = "20170108.1046"; + version = "20170109.2040"; src = fetchFromGitLab { owner = "egh"; repo = "zotxt-emacs"; - rev = "fae693a2a1c0701cd534103dddfed46335e38f6e"; - sha256 = "0pjjjx1gvnjs4x467dr4lnpk3s790vsmjp8ifawc36sfz8vwm5wi"; + rev = "1a010ea5db617269adc132e4cc028a44d9b629bd"; + sha256 = "10i5hq0mkb0b88n9lb40ad4d98fwv5inbdfiyxyrflvl4qj0q60r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b633453e77a719f6b6b6564e66c1c1260db38aa6/recipes/zotxt"; @@ -71973,6 +72160,27 @@ license = lib.licenses.free; }; }) {}; + zweilight-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "zweilight-theme"; + version = "20170112.2205"; + src = fetchFromGitHub { + owner = "philiparvidsson"; + repo = "emacs-zweilight-theme"; + rev = "7f45ab9e23164d65538edb2beb9692ecdc24c31e"; + sha256 = "142ixk47a1x6xz8ibavzq7jxppjc2qvfwbly4sdyiwfpznbi4l3a"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/37422e259ada59122e1b4a31a4ae4dc00be797b9/recipes/zweilight-theme"; + sha256 = "1ykhnyiv5jvn34178mzg2cy6ynvc7jild6zwdqwr3qay87zffmjf"; + name = "zweilight-theme"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/zweilight-theme"; + license = lib.licenses.free; + }; + }) {}; zygospore = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zygospore"; diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index 66123749c586..9d945859ffea 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix @@ -230,6 +230,27 @@ license = lib.licenses.free; }; }) {}; + ac-emacs-eclim = callPackage ({ auto-complete, eclim, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ac-emacs-eclim"; + version = "0.4"; + src = fetchFromGitHub { + owner = "emacs-eclim"; + repo = "emacs-eclim"; + rev = "8203fbf8544e65324a948a67718f7a16ba2d52e6"; + sha256 = "10bbbxhvlwm526g1wib1f87grnayirlg8jbsvmpzxr9nmdjgikz3"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/ac-emacs-eclim"; + sha256 = "0bkh7x6zj5drdvm9ji4vwqdxv7limd9a1idy8lsg0lcca3rjq3s5"; + name = "ac-emacs-eclim"; + }; + packageRequires = [ auto-complete eclim ]; + meta = { + homepage = "https://melpa.org/#/ac-emacs-eclim"; + license = lib.licenses.free; + }; + }) {}; ac-emoji = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ac-emoji"; @@ -524,22 +545,22 @@ license = lib.licenses.free; }; }) {}; - ac-racer = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, racer }: + ac-racer = callPackage ({ auto-complete, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, racer }: melpaBuild { pname = "ac-racer"; - version = "0.1"; + version = "0.2"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-ac-racer"; - rev = "2708b0a49afc89fb99a6d74a016cff6b94138ed0"; - sha256 = "0g7xbfsfqpmcay56y8xbmif52ccz430s3rjxf5bgl9ahkk7zgkzl"; + rev = "4408c2d652dec0432e20c05e001db8222d778c6b"; + sha256 = "01154kqzh3pjy57vxhv27nm69p85a1fwl7r95c7pzmzxgxigfz1p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e4318daf4dbb6864ee41f41287c89010fb811641/recipes/ac-racer"; sha256 = "1vkvh8y3ckvzvqxj4i2k6jqri94121wbfjziybli74qba8dca4yp"; name = "ac-racer"; }; - packageRequires = [ auto-complete cl-lib racer ]; + packageRequires = [ auto-complete emacs racer ]; meta = { homepage = "https://melpa.org/#/ac-racer"; license = lib.licenses.free; @@ -1687,22 +1708,22 @@ license = lib.licenses.free; }; }) {}; - aurel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + aurel = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "aurel"; - version = "0.8"; + version = "0.9"; src = fetchFromGitHub { owner = "alezost"; repo = "aurel"; - rev = "2b462d08c0e21f7fee0039457a02fa766fc6181c"; - sha256 = "0dqr1yrzf7a8655dsbcch4622rc75j9yjbn9zhkyikqjicddnlda"; + rev = "fc7ad208f43f8525f84a18941c9b55f956df8961"; + sha256 = "0mcbw8p4wrnnr39wzkfz9kc899w0k1jb00q1926mchf202cmnz94"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d1612acd2cf1fea739739608113923ec51d307e9/recipes/aurel"; sha256 = "13zyi55ksv426pcksbm3l9s6bmp102w7j1xbry46bc48al6i2nnl"; name = "aurel"; }; - packageRequires = [ emacs ]; + packageRequires = [ bui dash emacs ]; meta = { homepage = "https://melpa.org/#/aurel"; license = lib.licenses.free; @@ -2065,6 +2086,27 @@ license = lib.licenses.free; }; }) {}; + autothemer = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "autothemer"; + version = "0.2.2"; + src = fetchFromGitHub { + owner = "sebastiansturm"; + repo = "autothemer"; + rev = "8c467f57571c154129d660dfccebd151c998f2d9"; + sha256 = "0cd2pqh6k32sjidkcd8682y4l6mx52xw4a05f38kk8nsrk28m74k"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3d7d7beed6ba10d7aa6a36328a696ba2d0d21dc2/recipes/autothemer"; + sha256 = "1lcyqfzx7qpkr3ajk0zi0mn32yvcwn06f61vhghn9c66xambsr7f"; + name = "autothemer"; + }; + packageRequires = [ cl-lib dash emacs ]; + meta = { + homepage = "https://melpa.org/#/autothemer"; + license = lib.licenses.free; + }; + }) {}; avy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "avy"; @@ -2743,6 +2785,27 @@ license = lib.licenses.free; }; }) {}; + buffer-manage = callPackage ({ choice-program, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "buffer-manage"; + version = "0.1"; + src = fetchFromGitHub { + owner = "plandes"; + repo = "buffer-manage"; + rev = "09c7e652010ce84ea43c0ac20a943e7733bea0af"; + sha256 = "0dhqx4zlqznl4kn8cqp2a4a7c8nsw58pxss2852pfaz11pyv22ma"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/28f8f376df810e6ebebba9fb2c93eabbe3526cc9/recipes/buffer-manage"; + sha256 = "0fwri332faybv2apjh8zajqpryi0g4kk3and8djibpvci40l42jb"; + name = "buffer-manage"; + }; + packageRequires = [ choice-program emacs ]; + meta = { + homepage = "https://melpa.org/#/buffer-manage"; + license = lib.licenses.free; + }; + }) {}; buffer-move = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buffer-move"; @@ -3733,12 +3796,12 @@ cliphist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "cliphist"; - version = "0.4.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "cliphist"; - rev = "5cddd9c0b3aacc9941214a749edd19ceb2cde7f4"; - sha256 = "0hifxb3r54yinlal6bwhycwaspbz1kwkybvrcppkpdfg9jd88nfd"; + rev = "72a8a92f69b280c347afe2f8b5f5eb57606a9aec"; + sha256 = "0arilk9msbrx4kwg6nk0faw1yi2ss225wdlz6ycdgqc1531h6jkm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82d86dae4ad8efc8ef342883c164c56e43079171/recipes/cliphist"; @@ -4038,12 +4101,12 @@ cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cmake-mode"; - version = "3.7.1"; + version = "3.7.2"; src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "db3499df5d06ab2cacc61e9f7720a33456aeafe4"; - sha256 = "17ab5xln94z2ybvn8s9pivyd6xvi9h448fxjc8yk7605zsjmr9i0"; + rev = "35413bf2c1b33980afd418030af27f184872af6b"; + sha256 = "1kk0xri88h4lla8r8y5gksiwpyxb468h8qn0f61sfa1kni73z09s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -4434,22 +4497,22 @@ license = lib.licenses.free; }; }) {}; - company-emacs-eclim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + company-emacs-eclim = callPackage ({ cl-lib ? null, company, eclim, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-emacs-eclim"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "c5c7272ae30e5017ebd08d4e03508abc6b23bf4c"; - sha256 = "0b9hr3xg53nap6sik9d2cwqi8vfwzv8yqjcin4hab6rg2fkr5mra"; + rev = "8203fbf8544e65324a948a67718f7a16ba2d52e6"; + sha256 = "10bbbxhvlwm526g1wib1f87grnayirlg8jbsvmpzxr9nmdjgikz3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/company-emacs-eclim"; sha256 = "1l56hcy0y3cr38z1pjf0ilsdqdzvj3zwd40markm6si2xhdr8xig"; name = "company-emacs-eclim"; }; - packageRequires = []; + packageRequires = [ cl-lib company eclim ]; meta = { homepage = "https://melpa.org/#/company-emacs-eclim"; license = lib.licenses.free; @@ -4881,22 +4944,22 @@ license = lib.licenses.free; }; }) {}; - concurrent = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild }: + concurrent = callPackage ({ deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "concurrent"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-deferred"; - rev = "8827106c83f0fc773bc406d381ea25a29a5965e1"; - sha256 = "1br4yys803x3ng4vzhhvblhkqabs46lx8a3ajycqy555q20zqzrf"; + rev = "9668749635472a63e7a9282e2124325405199b79"; + sha256 = "1ch5br9alvwcpijl9g8w5ypjrah29alpfpk4hjw23rwzyq5p4izq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc29a8d518ce7a584277089bd4654f52ac0f358/recipes/concurrent"; sha256 = "09wjw69bqrr3424h0mpb2kr5ixh96syjjsqrcyd7z2lsas5ldpnf"; name = "concurrent"; }; - packageRequires = [ deferred ]; + packageRequires = [ deferred emacs ]; meta = { homepage = "https://melpa.org/#/concurrent"; license = lib.licenses.free; @@ -5406,6 +5469,27 @@ license = lib.licenses.free; }; }) {}; + ctags-update = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ctags-update"; + version = "1.0"; + src = fetchFromGitHub { + owner = "jixiuf"; + repo = "ctags-update"; + rev = "ff4f211e42df94fdeba376e62b65dc67f0388589"; + sha256 = "09vdfmm846zhn5nxnndi7qg7rdsf5xd4zhynbx0mnm00cfw1vf0y"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e5d0c347ff8cf6e0ade80853775fd6b84f387fa5/recipes/ctags-update"; + sha256 = "07548jjpx4var2817y47i6br8iicjlj66n1b33h0av6r1h514nci"; + name = "ctags-update"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/ctags-update"; + license = lib.licenses.free; + }; + }) {}; ctxmenu = callPackage ({ fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, popup, yaxception }: melpaBuild { pname = "ctxmenu"; @@ -5805,22 +5889,22 @@ license = lib.licenses.free; }; }) {}; - deferred = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + deferred = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "deferred"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-deferred"; - rev = "8827106c83f0fc773bc406d381ea25a29a5965e1"; - sha256 = "1br4yys803x3ng4vzhhvblhkqabs46lx8a3ajycqy555q20zqzrf"; + rev = "9668749635472a63e7a9282e2124325405199b79"; + sha256 = "1ch5br9alvwcpijl9g8w5ypjrah29alpfpk4hjw23rwzyq5p4izq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0e9a114d85f630648d05a7b552370fa8413da0c2/recipes/deferred"; sha256 = "0axbvxrdjgxk4d1bd9ar4r5nnacsi8r0d6649x7mnhqk12940mnr"; name = "deferred"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/deferred"; license = lib.licenses.free; @@ -7114,12 +7198,12 @@ ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }: melpaBuild { pname = "ebib"; - version = "2.9"; + version = "2.10"; src = fetchFromGitHub { owner = "joostkremers"; repo = "ebib"; - rev = "a34f046c1981e881811d54f43ea3ad3ce9a99c84"; - sha256 = "05l4gd1179gfxpc1jlmpwjb1w221clkg3nyb3z7l30hghnbhjvj4"; + rev = "4c2581ad17a636909e7ed0f46bd813cd6d9c45d3"; + sha256 = "1ic55fml4ll7pvakcf32ahps4za8mf4q10jgdyi8xj5bccvi3n3r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib"; @@ -7132,22 +7216,22 @@ license = lib.licenses.free; }; }) {}; - eclim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + eclim = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, popup, s, yasnippet }: melpaBuild { pname = "eclim"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "c5c7272ae30e5017ebd08d4e03508abc6b23bf4c"; - sha256 = "0b9hr3xg53nap6sik9d2cwqi8vfwzv8yqjcin4hab6rg2fkr5mra"; + rev = "8203fbf8544e65324a948a67718f7a16ba2d52e6"; + sha256 = "10bbbxhvlwm526g1wib1f87grnayirlg8jbsvmpzxr9nmdjgikz3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/eclim"; sha256 = "1n60ci6kjmzy2khr3gs7s8gf21j1f9zjaj5a1yy2dyygsarbxw7b"; name = "eclim"; }; - packageRequires = []; + packageRequires = [ cl-lib dash json popup s yasnippet ]; meta = { homepage = "https://melpa.org/#/eclim"; license = lib.licenses.free; @@ -8897,12 +8981,12 @@ erlang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erlang"; - version = "19.2"; + version = "19.2.1"; src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "3473ecd83a7bbe7e0bebb865f25dddb93e3bf10f"; - sha256 = "06pr4ydrqpp1skx85zjb1an4kvzv6vacb771vy71k54j7w6lh9hk"; + rev = "bca5bf5a2d68a0e9ca681363a8943809c4751950"; + sha256 = "1bxksxp2ggzskmrzh4k66w27ckh77jjjriq85xfz52n963al9crr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -9504,12 +9588,12 @@ evil-escape = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-escape"; - version = "3.12"; + version = "3.14"; src = fetchFromGitHub { owner = "syl20bnr"; repo = "evil-escape"; - rev = "befb07d03c0c06ff5c40eb9cdd436c97fc49f394"; - sha256 = "0cj17gk7cxia2p9xzqnlnmqqbw2afd3x61gfw9fpf65j9wik5hbz"; + rev = "b4d44fc5015341e484495fc86b73d09b2ac062ec"; + sha256 = "0s8lmmm25qabicwaj9jybpbd8mkc62yl7jnhk1lpablydjkv3w2i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/770fc6dd82c4d30f98e973958044e4d47b8fd127/recipes/evil-escape"; @@ -14460,12 +14544,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "2.3.4"; + version = "2.4.0"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "26415fdb3ebc66fa721b94aa1eaeba1693eae624"; - sha256 = "12jy8448gj8a1mw2njzxyvrrc2q059xrq65my1zqx1k1lcrknhp8"; + rev = "a1bc339cbdaad200cb947e1e6264e9013322b434"; + sha256 = "1pjp629xwya55ld6hkys4gmgn0mvnd7qzpzz1qraaympsnymrh3w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -14712,12 +14796,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "2.3.4"; + version = "2.4.0"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "26415fdb3ebc66fa721b94aa1eaeba1693eae624"; - sha256 = "12jy8448gj8a1mw2njzxyvrrc2q059xrq65my1zqx1k1lcrknhp8"; + rev = "a1bc339cbdaad200cb947e1e6264e9013322b434"; + sha256 = "1pjp629xwya55ld6hkys4gmgn0mvnd7qzpzz1qraaympsnymrh3w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -17208,6 +17292,27 @@ license = lib.licenses.free; }; }) {}; + info-buffer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "info-buffer"; + version = "0.2"; + src = fetchFromGitHub { + owner = "llvilanova"; + repo = "info-buffer"; + rev = "d35dad6e766c6e2ddb8dc6acb4ce5b6e10fbcaa7"; + sha256 = "0czkp7cf7qmdm1jdn67gxyxz8b4qj2kby8if50d450xqwbx0da7x"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3c44a1d69725b687444329d8af43c9799112b407/recipes/info-buffer"; + sha256 = "1vkgkwgwym0j5xip7mai11anlpa2h7vd5m9i1xga1b23hcs9r1w4"; + name = "info-buffer"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/info-buffer"; + license = lib.licenses.free; + }; + }) {}; inherit-local = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inherit-local"; @@ -17567,12 +17672,12 @@ ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-erlang-complete"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitHub { owner = "s-kostyaev"; repo = "ivy-erlang-complete"; - rev = "7bb7dd161889dc74f4a1ec34cd9cd8469843eab9"; - sha256 = "03gvavrprim1n1av7dam1kgw4m82nrcb8lffp5nk64yz0lcrca6g"; + rev = "65d80ff0052be9aa65e9a1cd8f6b1f5fb112ee36"; + sha256 = "05qjpv95xrhwpg1g0znsp33a8827w4p7vl6iflrrmi15kij5imb4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete"; @@ -18048,12 +18153,12 @@ js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js2-mode"; - version = "20160623"; + version = "20170116"; src = fetchFromGitHub { owner = "mooz"; repo = "js2-mode"; - rev = "0cda39255827f283e7578cd469ae42daad9556a2"; - sha256 = "1k91nckxg6d9q9pmn2ikcw85yrmj4yrw20i8v0pq8499wz8i15gs"; + rev = "03c679eb9914d58d7d9b7afc2036c482a9a01236"; + sha256 = "1kgmljgh71f2sljdsr134jrj1i6kgj9bwyh4pl1lrz0v4ahwgd6g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode"; @@ -19357,12 +19462,12 @@ logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "logview"; - version = "0.5.3"; + version = "0.5.4"; src = fetchFromGitHub { owner = "doublep"; repo = "logview"; - rev = "4f1db3f2081e819dd35545497529a03466bd0397"; - sha256 = "0f96wxijls743qyqfgkdqil3p5nn0sm02rlz1nqkm6bd8k28rcg1"; + rev = "c22ac44d14de8aaad532e47ea60c21c24d661a50"; + sha256 = "02842gbxlq6crvd3817aqvj5irshls5km675vmhk0qd4cqg38abv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview"; @@ -21568,12 +21673,12 @@ neotree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "neotree"; - version = "0.5"; + version = "0.5.1"; src = fetchFromGitHub { owner = "jaypei"; repo = "emacs-neotree"; - rev = "ba1f4bacd97c99d55ad37e5940bd7567d2ae50d4"; - sha256 = "1a8riwz37sws2g2992zj6y8q4ypr76gxfwril6vnfig367anv4js"; + rev = "d2ae6ac8a919f164f34c589f2f46ddd140a79f81"; + sha256 = "0xqcrxmpk2z4pd9scqn2nannqy0a76mkkqv9bz037a36w8v481nd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9caf2e12762d334563496d2c75fae6c74cfe5c1c/recipes/neotree"; @@ -21673,12 +21778,12 @@ nix-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nix-mode"; - version = "1.11.5"; + version = "1.11.6"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "d39f51fa3472ccc30f1b2896f5538d0b2dbce916"; - sha256 = "0ms42pmnmzhn0b74s3b441m0nqbckgm64bc00qdlvb1s644j32i6"; + rev = "1fa2c86db50af806916d72e76f10bef39dd65e7d"; + sha256 = "1l4xfv38famawrxs6lg9k7gxghgmlgbpp2dbchnqln21d32b6a8h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode"; @@ -22770,12 +22875,12 @@ org-jira = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "org-jira"; - version = "2.5.1"; + version = "2.5.2"; src = fetchFromGitHub { owner = "ahungry"; repo = "org-jira"; - rev = "f441421a5182e356f55bda317a7b3e2d981fdd68"; - sha256 = "0kzia2l11lj6ddp1rsc71d3nb8cim7i3b5g8yfyfc2zms4mqyzkn"; + rev = "af4115f4e8b4e77de5642fb28ce6d5e0d7cb0b70"; + sha256 = "1g775f9gpl0nqq3vn6h9cnjazimn9bjwk31dc7fdylz3nf7f3h03"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/730a585e5c9216a2428a134c09abcc20bc7c631d/recipes/org-jira"; @@ -22871,6 +22976,27 @@ license = lib.licenses.free; }; }) {}; + org-mime = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "org-mime"; + version = "0.0.4"; + src = fetchFromGitHub { + owner = "org-mime"; + repo = "org-mime"; + rev = "3c4f24c8d43c24332c4f2f4bf763459b11ead956"; + sha256 = "04xs06sgdigi9hpciqb0d12rsgzg5b5vyf08rlvkjiddkqclp5pw"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/521678fa13884dae69c2b4b7a2af718b2eea4b28/recipes/org-mime"; + sha256 = "14154pajl2bbawdd8iqfwgc67pcjp2lxl6f92c62nwq12wkcnny6"; + name = "org-mime"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/org-mime"; + license = lib.licenses.free; + }; + }) {}; org-multiple-keymap = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-multiple-keymap"; @@ -24169,12 +24295,12 @@ parinfer = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "parinfer"; - version = "0.4.6"; + version = "0.4.7"; src = fetchFromGitHub { owner = "DogLooksGood"; repo = "parinfer-mode"; - rev = "3d5b8d4a3f7e73f15f816f7555abed09c5516338"; - sha256 = "1w3j0dzi19h1k94gnj1zxx4s1aji91wq4sjwkf813zs7q769mfsp"; + rev = "a91b1ee5392c6a98c102ddba2f0c15ab67f8ad1b"; + sha256 = "09337fpv492rzd2ah7d8kxyv5spcgwf58xr943ya09sgi2invkbx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/470ab2b5cceef23692523b4668b15a0775a0a5ba/recipes/parinfer"; @@ -24250,6 +24376,27 @@ license = lib.licenses.free; }; }) {}; + passmm = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "passmm"; + version = "0.2.0"; + src = fetchFromGitHub { + owner = "pjones"; + repo = "passmm"; + rev = "983fc8e3e6d24bb8088e2e89254ecd5e03db787d"; + sha256 = "1mcxfk3yqhxslsjl3j25n87di5i2a3v9rk1cj1vnf46695s2fk38"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8ae2a1e10375f9cd55d19502c9740b2737eba209/recipes/passmm"; + sha256 = "0p6qps9ww7s6w5x7p6ha26xj540pk4bjkr629lcicrvnfr5jsg4b"; + name = "passmm"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/passmm"; + license = lib.licenses.free; + }; + }) {}; passthword = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "passthword"; @@ -24566,12 +24713,12 @@ persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "persp-mode"; - version = "2.9.4"; + version = "2.9.5"; src = fetchFromGitHub { owner = "Bad-ptr"; repo = "persp-mode.el"; - rev = "8200c8753513b14ebc1a8b40b917d7c0a6f5ac6a"; - sha256 = "13pcdy18pqanjhkacl5rbfmyw3y52d9ll0b6w0w4ffc2lhqpi7nd"; + rev = "1116ead88123a11efef346db0045ee8389250bd2"; + sha256 = "11xncsvzy13xc939qfvlzplsz2izvf16hy45k500h44g2dxcvq3m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode"; @@ -24944,12 +25091,12 @@ plain-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "plain-theme"; - version = "1"; + version = "2"; src = fetchFromGitHub { owner = "yegortimoshenko"; repo = "plain-theme"; - rev = "4210122812df9b5fe375ad35a3b933bf040460a3"; - sha256 = "184rw6pri55mkab8wv2n483zp0cvd6j911abq290pcqw1pgswcgh"; + rev = "43fc59d487d39e6110230a073f1376ab877aa739"; + sha256 = "0g44qdpn3ni291awjklia4r26qyiavpjib04k761hfacrdkvsdys"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d7ad3737f081f101500317f7e183be6b1e7e8122/recipes/plain-theme"; @@ -25571,12 +25718,12 @@ projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }: melpaBuild { pname = "projectile-rails"; - version = "0.12.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "asok"; repo = "projectile-rails"; - rev = "fe0cb5597d9e87ceebfadd1815beadfc04a194f1"; - sha256 = "0yg7xbv0mnrcc6kgh8ci6pxzfjiq1qkrw6hx2zs5m4ryfrrfclz2"; + rev = "8c41f3c92cd7f5eb5a983f6f3d42cb67dff04366"; + sha256 = "1rial7py4n451d6ylymf5q4cb57ala4rvvi7619r1c5y1m493qi7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails"; @@ -26240,22 +26387,22 @@ license = lib.licenses.free; }; }) {}; - quickrun = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + quickrun = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "quickrun"; - version = "2.2.7"; + version = "2.2.8"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-quickrun"; - rev = "fe23f324b0198f8827cc0768e8507a02194eec68"; - sha256 = "1iypwvdgdh30c9br7jnibgwbdca2mqjy95x2ppsc51sik2mz2db1"; + rev = "70e93e06778f44113f405aedec6187b925311d57"; + sha256 = "0swbgsidq11w7vyjhf06dn8vsj06j9scj8n2dm9m7fasj0yh3ghw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/quickrun"; sha256 = "0f989d6niw6ghf9mq454kqyp0gy7gj34vx5l6krwc52agckyfacy"; name = "quickrun"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/quickrun"; license = lib.licenses.free; @@ -27858,12 +28005,12 @@ sekka = callPackage ({ cl-lib ? null, concurrent, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "sekka"; - version = "1.6.4"; + version = "1.6.5"; src = fetchFromGitHub { owner = "kiyoka"; repo = "sekka"; - rev = "2b0facc87e743e21534672aadac6db3164e38daf"; - sha256 = "0nsm7z056rh32sq7abgdwyaz4dbz8v9pgbha5jvpk7y0zmnabrgs"; + rev = "001e205b37ae0dded430b9a809425dc7ed730366"; + sha256 = "113i8i705qkd3nccspacnmk9ysy5kwavg8h9z9djdgki611q700q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/350bbb5761b5ba69aeb4acf6d7cdf2256dba95a6/recipes/sekka"; @@ -29976,12 +30123,12 @@ swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "swift-mode"; - version = "2.2"; + version = "2.2.1"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "swift-mode"; - rev = "a07be7a34d4f677a28878f4b72a2095addc628fd"; - sha256 = "14l8cm82fx0p1xcbf48a303llx2p9p0i17ly1vx8y5ff3a0i0l0h"; + rev = "6cd2948589771d926e545d8cbe054705eebce18f"; + sha256 = "1zz5jv2qgcnhidyhnw3wbcpqb80jqqbs74kpa66assfigyvivyj6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode"; @@ -32671,8 +32818,8 @@ version = "0.9.1"; src = fetchhg { url = "https://bitbucket.com/ArneBab/wisp"; - rev = "ab6afca9ee2e"; - sha256 = "19yy6z12pqaz9l0gj4hm73m7z2gcyivwymf6732vk8im77i8agyl"; + rev = "280ab84bf8ad"; + sha256 = "088khr4ha37nvxzg620a6gyq7pc40rb13bbi9vgqhgjgggpq61d9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode"; @@ -33299,8 +33446,8 @@ version = "1.78"; src = fetchhg { url = "https://www.yatex.org/hgrepos/yatex/"; - rev = "59459111e042"; - sha256 = "072aminyiw7pwm74sq3xqqyd1f2l2ilcwg98r094xjvw4fz3yjq5"; + rev = "c2c547e147c7"; + sha256 = "1khsvzg7ma98ijpj21xmdlnp18wwxf2n9jr2y1xia4a6qgkmlchb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex"; @@ -33365,6 +33512,27 @@ license = lib.licenses.free; }; }) {}; + ydk-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ydk-mode"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "jacksonrayhamilton"; + repo = "ydk-mode"; + rev = "f3f125b29408e0b0a34fec27dcb7c02c5dbfd04e"; + sha256 = "0ndmbswrv8vyw18zhbmjr11400l546zqaj7dzfvwb5rhdv2d0abi"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/865b9ee86ca28fc1cedc0a432a292400184711ae/recipes/ydk-mode"; + sha256 = "1z9digf39d7dd736svp0cy6773l3nklzc263q23gwfcg0jswbdyg"; + name = "ydk-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/ydk-mode"; + license = lib.licenses.free; + }; + }) {}; yesql-ghosts = callPackage ({ cider, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "yesql-ghosts"; diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index cef1ab8e19bf..204fd60d2bc3 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -340,12 +340,12 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2016.3"; + version = "2016.3.2"; description = "Your Swiss Army Knife for Databases and SQL"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "10nah7v330qrrczzz5jldnr0k7w2xzljiny32gm9pqmjbl0i70il"; + sha256 = "19njb6i7nl6szql7cy99jmig59b304c6im3988p1dd8dj2j6csv3"; }; wmClass = "jetbrains-datagrip"; }; diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index 0b45f9502fad..9814e697d22b 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ stdenv, fetchurl, fetchFromGitHub , ncurses , texinfo , gettext ? null @@ -10,7 +10,14 @@ assert enableNls -> (gettext != null); with stdenv.lib; -stdenv.mkDerivation rec { +let + nixSyntaxHighlight = fetchFromGitHub { + owner = "seitz"; + repo = "nanonix"; + rev = "17e0de65e1cbba3d6baa82deaefa853b41f5c161"; + sha256 = "1g51h65i31andfs2fbp1v3vih9405iknqn11fzywjxji00kjqv5s"; + }; +in stdenv.mkDerivation rec { name = "nano-${version}"; version = "2.7.3"; src = fetchurl { @@ -30,6 +37,10 @@ stdenv.mkDerivation rec { substituteInPlace src/text.c --replace "__time_t" "time_t" ''; + postInstall = '' + cp ${nixSyntaxHighlight}/nix.nanorc $out/share/nano/ + ''; + meta = { homepage = http://www.nano-editor.org/; description = "A small, user-friendly console text editor"; diff --git a/pkgs/applications/editors/nvi/default.nix b/pkgs/applications/editors/nvi/default.nix index 89762d5bc333..82c89ebdca6e 100644 --- a/pkgs/applications/editors/nvi/default.nix +++ b/pkgs/applications/editors/nvi/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { patchPhase = '' sed -i build/configure \ -e s@vi_cv_path_preserve=no@vi_cv_path_preserve=/tmp/vi.recover@ \ - -e s@/var/tmp@@ + -e s@/var/tmp@@ \ + -e s@-lcurses@-lncurses@ ''; configurePhase = '' diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index 689a1537b691..97fc30c237c7 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -2,22 +2,23 @@ makeWrapper, libXScrnSaver }: let - version = "1.8.0"; - rev = "38746938a4ab94f2f57d9e1309c51fd6fb37553d"; + version = "1.8.1"; + rev = "ee428b0eead68bf0fb99ab5fdc4439be227b6281"; + channel = "stable"; - sha256 = if stdenv.system == "i686-linux" then "0p7r1i71v2ab4dzlwh43hqih958a31cqskf64ds4vgc35x2mfjcq" - else if stdenv.system == "x86_64-linux" then "1k15701jskk7w5kwzlzfri96vvw7fcinyfqqafls8nms8h5csv76" - else if stdenv.system == "x86_64-darwin" then "12fqz62gs2wcg2wwx1k6gv2gqil9c54yq254vk3rqdf82q9zyapk" + 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" else throw "Unsupported system: ${stdenv.system}"; - urlBase = "https://az764295.vo.msecnd.net/stable/${rev}/"; + urlBase = "https://az764295.vo.msecnd.net/${channel}/${rev}/"; urlStr = if stdenv.system == "i686-linux" then - urlBase + "code-stable-code_${version}-1481650382_i386.tar.gz" + urlBase + "code-${channel}-code_${version}-1482159060_i386.tar.gz" else if stdenv.system == "x86_64-linux" then - urlBase + "code-stable-code_${version}-1481651903_amd64.tar.gz" + urlBase + "code-${channel}-code_${version}-1482158209_amd64.tar.gz" else if stdenv.system == "x86_64-darwin" then - urlBase + "VSCode-darwin-stable.zip" + urlBase + "VSCode-darwin-${channel}.zip" else throw "Unsupported system: ${stdenv.system}"; in stdenv.mkDerivation rec { @@ -33,10 +34,7 @@ in name = "code"; exec = "code"; icon = "code"; - comment = '' - Code editor redefined and optimized for building and debugging modern - web and cloud applications - ''; + comment = "Code editor redefined and optimized for building and debugging modern web and cloud applications"; desktopName = "Visual Studio Code"; genericName = "Text Editor"; categories = "GNOME;GTK;Utility;TextEditor;Development;"; diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index 7d2828115f77..790997e328b4 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation { postInstall = '' wrapProgram $out/bin/grass70 \ --set PYTHONPATH $PYTHONPATH \ - --set GRASS_PYTHON ${python2Packages.python}/bin/${python2Packages.python.executable} + --set GRASS_PYTHON ${python2Packages.python}/bin/${python2Packages.python.executable} \ --suffix LD_LIBRARY_PATH ':' '${gdal}/lib' ln -s $out/grass-*/lib $out/lib ''; diff --git a/pkgs/applications/graphics/freepv/default.nix b/pkgs/applications/graphics/freepv/default.nix index e042b15855c8..6d82db4bac1a 100644 --- a/pkgs/applications/graphics/freepv/default.nix +++ b/pkgs/applications/graphics/freepv/default.nix @@ -1,25 +1,35 @@ { stdenv, fetchurl, libjpeg, mesa, freeglut, zlib, cmake, libX11, libxml2, libpng, - libXxf86vm }: + libXxf86vm, gcc6 }: stdenv.mkDerivation { - name = "freepv-0.3.0_beta1"; + name = "freepv-0.3.0"; src = fetchurl { - url = mirror://sourceforge/freepv/freepv-0.3.0_beta1.tar.gz; - sha256 = "084qqa361np73anvqrv78ngw8hjxglmdm3akkpszbwnzniw89qla"; + url = mirror://sourceforge/freepv/freepv-0.3.0.tar.gz; + sha256 = "1w19abqjn64w47m35alg7bcdl1p97nf11zn64cp4p0dydihmhv56"; }; buildInputs = [ libjpeg mesa freeglut zlib cmake libX11 libxml2 libpng - libXxf86vm ]; + libXxf86vm gcc6 ]; - patchPhase = '' + postPatch = '' sed -i -e '/GECKO/d' CMakeLists.txt sed -i -e '/mozilla/d' src/CMakeLists.txt + sed -i -e '1i \ + #include <cstdio>' src/libfreepv/OpenGLRenderer.cpp + sed -i -e '1i \ + #include <cstring>' src/libfreepv/Image.cpp + substituteInPlace src/libfreepv/Action.h \ + --replace NULL nullptr + substituteInPlace src/libfreepv/pngReader.cpp \ + --replace png_set_gray_1_2_4_to_8 png_set_expand_gray_1_2_4_to_8 ''; + NIX_CFLAGS_COMPILE = "-fpermissive -Wno-narrowing"; + meta = { description = "Open source panorama viewer using GL"; homepage = http://freepv.sourceforge.net/; - license = "LGPL"; + license = [ stdenv.lib.licenses.lgpl21 ]; }; } diff --git a/pkgs/applications/graphics/xournal/default.nix b/pkgs/applications/graphics/xournal/default.nix index 97b418f08c10..38573989266d 100644 --- a/pkgs/applications/graphics/xournal/default.nix +++ b/pkgs/applications/graphics/xournal/default.nix @@ -3,6 +3,11 @@ , libgnomecanvas, libgnomeprint, libgnomeprintui , pango, libX11, xproto, zlib, poppler , autoconf, automake, libtool, pkgconfig}: + +let + isGdkQuartzBackend = (gtk2.gdktarget == "quartz"); +in + stdenv.mkDerivation rec { version = "0.4.8"; name = "xournal-" + version; @@ -21,7 +26,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake libtool pkgconfig ]; - NIX_LDFLAGS = [ "-lX11" "-lz" ]; + patches = stdenv.lib.optionals isGdkQuartzBackend [ + ./gdk-quartz-backend.patch + ]; + + NIX_LDFLAGS = [ "-lz" ] + ++ stdenv.lib.optionals (!isGdkQuartzBackend) [ "-lX11" ]; desktopItem = makeDesktopItem { name = name; diff --git a/pkgs/applications/graphics/xournal/gdk-quartz-backend.patch b/pkgs/applications/graphics/xournal/gdk-quartz-backend.patch new file mode 100644 index 000000000000..d1a42443a88b --- /dev/null +++ b/pkgs/applications/graphics/xournal/gdk-quartz-backend.patch @@ -0,0 +1,90 @@ +diff -rup xournal-0.4.8-orig/src/Makefile.am xournal-0.4.8/src/Makefile.am +--- xournal-0.4.8-orig/src/Makefile.am 2012-07-04 23:12:47.000000000 +0200 ++++ xournal-0.4.8/src/Makefile.am 2016-12-25 03:04:00.000000000 +0100 +@@ -31,6 +31,5 @@ if WIN32 + xournal_LDFLAGS = -mwindows + xournal_LDADD = win32/xournal.res ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS) -lz + else +- xournal_LDADD = ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS) -lX11 -lz -lm ++ xournal_LDADD = ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS) -lz -lm + endif +- +diff -rup xournal-0.4.8-orig/src/xo-file.c xournal-0.4.8/src/xo-file.c +--- xournal-0.4.8-orig/src/xo-file.c 2014-06-28 21:52:25.000000000 +0200 ++++ xournal-0.4.8/src/xo-file.c 2016-12-25 03:07:19.000000000 +0100 +@@ -31,11 +31,6 @@ + #include <glib/gstdio.h> + #include <poppler/glib/poppler.h> + +-#ifndef WIN32 +- #include <gdk/gdkx.h> +- #include <X11/Xlib.h> +-#endif +- + #include "xournal.h" + #include "xo-interface.h" + #include "xo-support.h" +@@ -1275,50 +1270,8 @@ GList *attempt_load_gv_bg(char *filename + + struct Background *attempt_screenshot_bg(void) + { +-#ifndef WIN32 +- struct Background *bg; +- GdkPixbuf *pix; +- XEvent x_event; +- GdkWindow *window; +- GdkColormap *cmap; +- int x,y,w,h; +- Window x_root, x_win; +- +- x_root = gdk_x11_get_default_root_xwindow(); +- +- if (!XGrabButton(GDK_DISPLAY(), AnyButton, AnyModifier, x_root, +- False, ButtonReleaseMask, GrabModeAsync, GrabModeSync, None, None)) +- return NULL; +- +- XWindowEvent (GDK_DISPLAY(), x_root, ButtonReleaseMask, &x_event); +- XUngrabButton(GDK_DISPLAY(), AnyButton, AnyModifier, x_root); +- +- x_win = x_event.xbutton.subwindow; +- if (x_win == None) x_win = x_root; +- +- window = gdk_window_foreign_new_for_display(gdk_display_get_default(), x_win); +- +- gdk_window_get_geometry(window, &x, &y, &w, &h, NULL); +- cmap = gdk_drawable_get_colormap(window); +- if (cmap == NULL) cmap = gdk_colormap_get_system(); +- +- pix = gdk_pixbuf_get_from_drawable(NULL, window, +- cmap, 0, 0, 0, 0, w, h); +- +- if (pix == NULL) return NULL; +- +- bg = g_new(struct Background, 1); +- bg->type = BG_PIXMAP; +- bg->canvas_item = NULL; +- bg->pixbuf = pix; +- bg->pixbuf_scale = DEFAULT_ZOOM; +- bg->filename = new_refstring(NULL); +- bg->file_domain = DOMAIN_ATTACH; +- return bg; +-#else + // not implemented under WIN32 + return FALSE; +-#endif + } + + /************** pdf annotation ***************/ +diff -rup xournal-0.4.8-orig/src/xo-misc.c xournal-0.4.8/src/xo-misc.c +--- xournal-0.4.8-orig/src/xo-misc.c 2014-06-28 15:17:44.000000000 +0200 ++++ xournal-0.4.8/src/xo-misc.c 2016-12-25 03:05:50.000000000 +0100 +@@ -2288,9 +2288,7 @@ void hide_unimplemented(void) + } + + /* screenshot feature doesn't work yet in Win32 */ +-#ifdef WIN32 + gtk_widget_hide(GET_COMPONENT("journalScreenshot")); +-#endif + } + + // toggle fullscreen mode diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix index 5a149657931f..68c9246c24b1 100644 --- a/pkgs/applications/misc/golden-cheetah/default.nix +++ b/pkgs/applications/misc/golden-cheetah/default.nix @@ -1,34 +1,30 @@ -{ stdenv, fetchurl, qtbase, qtsvg, qtserialport, qtwebkit, qtmultimedia -, qttools, yacc, flex, zlib, config, qmakeHook, makeQtWrapper }: +{ stdenv, fetchurl +, qtbase, qtsvg, qtserialport, qtwebkit, qtmultimedia, qttools, qtconnectivity +, yacc, flex, zlib, config, qmakeHook, makeQtWrapper +}: stdenv.mkDerivation rec { name = "golden-cheetah-${version}"; - version = "4.0-DEV1603"; + version = "3.4"; src = fetchurl { name = "${name}.tar.gz"; url = "https://github.com/GoldenCheetah/GoldenCheetah/archive/V${version}.tar.gz"; - sha256 = "12knlzqmq8b3nyl3kvcsnzrbjksgd83mzwzj97wccyfiffjl4wah"; + sha256 = "0fiz2pj155cd357kph50lc6rjyzwp045glfv4y68qls9j7m9ayaf"; }; - buildInputs = [ + qtInputs = [ qtbase qtsvg qtserialport qtwebkit qtmultimedia qttools yacc flex zlib + qtconnectivity ]; - nativeBuildInputs = [ makeQtWrapper qmakeHook ]; + nativeBuildInputs = [ makeQtWrapper qmakeHook ] ++ qtInputs; preConfigure = '' cp src/gcconfig.pri.in src/gcconfig.pri cp qwt/qwtconfig.pri.in qwt/qwtconfig.pri echo 'QMAKE_LRELEASE = ${qttools.dev}/bin/lrelease' >> src/gcconfig.pri sed -i -e '21,23d' qwt/qwtconfig.pri # Removed forced installation to /usr/local ''; - #postConfigure = - # + ( - # with (config.golden-cheetah); - # stdenv.lib.optionalString (dropbox-client-id != null && dropbox-client-secret != null) '' - # echo 'DEFINES += GC_DROPBOX_CLIENT_ID=\\\"${config.golden-cheetah.dropbox-client-id}\\\"' >> src/gcconfig.pri - # echo 'DEFINES += GC_DROPBOX_CLIENT_SECRET=\\\"${config.golden-cheetah.dropbox-client-secret}\\\"' >> src/gcconfig.pri - # ''); installPhase = '' mkdir -p $out/bin cp src/GoldenCheetah $out/bin - wrapQtProgram $out/bin/GoldenCheetah --set LD_LIBRARY_PATH "${zlib.out}/lib" # patchelf doesn't seem to work + wrapQtProgram $out/bin/GoldenCheetah --set LD_LIBRARY_PATH "${zlib.out}/lib" ''; meta = { description = "Performance software for cyclists, runners and triathletes"; diff --git a/pkgs/applications/misc/gollum/default.nix b/pkgs/applications/misc/gollum/default.nix index 1c58aec02332..1f3cc9e27c0c 100644 --- a/pkgs/applications/misc/gollum/default.nix +++ b/pkgs/applications/misc/gollum/default.nix @@ -5,9 +5,7 @@ bundlerEnv rec { version = "4.0.1"; ruby = ruby_2_2; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; + gemdir = ./.; meta = with lib; { description = "A simple, Git-powered wiki"; diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index 71418732a48a..bce5b6cf5897 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -23,7 +23,7 @@ assert mercurialSupport -> (mercurial != null); let name = "ikiwiki"; - version = "3.20160905"; + version = "3.20170111"; lib = stdenv.lib; in @@ -31,8 +31,8 @@ stdenv.mkDerivation { name = "${name}-${version}"; src = fetchurl { - url = "mirror://debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz"; - sha256 = "1xbjj5qpxh7f05b69z9vvajg05zv63fj8js77c47yx01xifgd3vn"; + url = "mirror://debian/pool/main/i/ikiwiki/${name}_${version}.tar.xz"; + sha256 = "00d7yzv426fvqbhvzyafddv7fa6b4j2647b0wi371wd5yjj9j3sz"; }; buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate diff --git a/pkgs/applications/misc/jekyll/default.nix b/pkgs/applications/misc/jekyll/default.nix index e9536055ca3b..b06a28513b82 100644 --- a/pkgs/applications/misc/jekyll/default.nix +++ b/pkgs/applications/misc/jekyll/default.nix @@ -5,9 +5,7 @@ bundlerEnv rec { version = "3.0.1"; ruby = ruby_2_2; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; + gemdir = ./.; meta = with lib; { description = "Simple, blog aware, static site generator"; diff --git a/pkgs/applications/misc/monero/default.nix b/pkgs/applications/misc/monero/default.nix index 7f4311c2f490..a8bde39a2783 100644 --- a/pkgs/applications/misc/monero/default.nix +++ b/pkgs/applications/misc/monero/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchFromGitHub, cmake, boost, miniupnpc, pkgconfig, unbound }: let - version = "0.9.4"; + version = "0.10.1"; in stdenv.mkDerivation { name = "monero-${version}"; src = fetchFromGitHub { owner = "monero-project"; - repo = "bitmonero"; + repo = "monero"; rev = "v${version}"; - sha256 = "1qzpy1mxz0ky6hfk1gf67ybbr9xy6p6irh6zwri35h1gb97sbc3c"; + sha256 = "1zngskpgxz3vqq348h0mab2kv95z6g9ckvqkr77mx15m5z3qi6aw"; }; nativeBuildInputs = [ cmake pkgconfig ]; @@ -27,19 +27,17 @@ stdenv.mkDerivation { installPhase = '' install -Dt "$out/bin/" \ - bin/bitmonerod \ - bin/blockchain_converter \ - bin/blockchain_dump \ - bin/blockchain_export \ - bin/blockchain_import \ - bin/cn_deserialize \ - bin/simpleminer \ - bin/simplewallet + bin/monerod \ + bin/monero-blockchain-export \ + bin/monero-blockchain-import \ + bin/monero-utils-deserialize \ + bin/monero-wallet-cli \ + bin/monero-wallet-rpc ''; meta = with stdenv.lib; { description = "Private, secure, untraceable currency"; - homepage = http://monero.cc/; + homepage = https://getmonero.org/; license = licenses.bsd3; maintainers = [ maintainers.ehmry ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index fbb10bc9ceb6..b9fcd1a7f15e 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -12,12 +12,12 @@ let inherit (pythonPackages) pexpect pycrypto python paramiko; in stdenv.mkDerivation rec { pname = "mysql-workbench"; - version = "6.3.7"; + version = "6.3.8"; name = "${pname}-${version}"; src = fetchurl { url = "http://dev.mysql.com/get/Downloads/MySQLGUITools/mysql-workbench-community-${version}-src.tar.gz"; - sha256 = "1v4k04facdn2qzflf0clf3ir5hghqlabq89ssm2s4x1nqdniz544"; + sha256 = "1bxd828nrawmym6d8awh1vrni8dsbwh1k5am1lrq5ihp5c3kw9ka"; }; buildInputs = [ cmake pkgconfig glibc gnome_keyring gtk gtk.dev gtkmm pcre swig python sudo diff --git a/pkgs/applications/misc/pt/default.nix b/pkgs/applications/misc/pt/default.nix index d85a3266bdf8..a400bb04da43 100644 --- a/pkgs/applications/misc/pt/default.nix +++ b/pkgs/applications/misc/pt/default.nix @@ -4,9 +4,7 @@ bundlerEnv { name = "pt-0.7.3"; inherit ruby; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; + gemdir = ./.; meta = with lib; { description = "Minimalist command-line Pivotal Tracker client"; diff --git a/pkgs/applications/misc/styx/default.nix b/pkgs/applications/misc/styx/default.nix index 15e8453de515..23761feb0ec2 100644 --- a/pkgs/applications/misc/styx/default.nix +++ b/pkgs/applications/misc/styx/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "styx-${version}"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "styx-static"; repo = "styx"; rev = "v${version}"; - sha256 = "1s4465absxqwlwhn5rf51h0s1rw25ls581yjg0fy9kbyhy979qvs"; + sha256 = "0v36i40cwrajsd02xjfdldih5g493m28lhzgjg1gd3pwk2yd6rm1"; }; setSourceRoot = "cd styx-*/src; export sourceRoot=`pwd`"; @@ -26,20 +26,27 @@ stdenv.mkDerivation rec { multimarkdown ]; + outputs = [ "out" "lib" ]; + installPhase = '' mkdir $out install -D -m 777 styx.sh $out/bin/styx mkdir -p $out/share/styx - cp -r lib $out/share/styx cp -r scaffold $out/share/styx cp builder.nix $out/share/styx mkdir -p $out/share/doc/styx - asciidoctor doc/manual.adoc -o $out/share/doc/styx/index.html + asciidoctor doc/index.adoc -o $out/share/doc/styx/index.html + asciidoctor doc/styx-themes.adoc -o $out/share/doc/styx/styx-themes.html + cp -r doc/imgs $out/share/doc/styx/ substituteAllInPlace $out/bin/styx substituteAllInPlace $out/share/doc/styx/index.html + substituteAllInPlace $out/share/doc/styx/styx-themes.html + + mkdir $lib + cp -r lib/* $lib ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/styx/themes.nix b/pkgs/applications/misc/styx/themes.nix index 2b3570608afb..86904a73584d 100644 --- a/pkgs/applications/misc/styx/themes.nix +++ b/pkgs/applications/misc/styx/themes.nix @@ -7,7 +7,7 @@ let src = fetchFromGitHub ({ owner = "styx-static"; - repo = "styx-theme-${args.themeName}"; + repo = "styx-theme-${args.themeName}"; } // args.src); installPhase = '' @@ -28,10 +28,10 @@ in { agency = mkThemeDrv { themeName = "agency"; - version = "2016-12-03"; + version = "2017-01-17"; src = { - rev = "3604239cc5d940eee9c14ad2540d68a53cfebd7e"; - sha256 = "1kk8d5a3lb7fx1avivjd49gv0ffq7ppiswmwqlcsq87h2dbrqf61"; + rev = "3201f65841c9e7f97cc0ab0264cafb01b1620ed7"; + sha256 = "1b3547lzmhs1lmr9gln1yvh5xrsg92m8ngrjwf0ny91y81x04da6"; }; meta = { license = stdenv.lib.licenses.asl20; @@ -44,28 +44,40 @@ in }; }; + generic-templates = mkThemeDrv { + themeName = "generic-templates"; + version = "2017-01-18"; + src = { + rev = "af7cd527584322d8731a306a137a1794b18ad71a"; + sha256 = "18zk4qihi8iw5dxkm9sf6cjai1mf22l6q1ykkrgaxjd5709is0li"; + }; + meta = { + license = stdenv.lib.licenses.mit; + }; + }; + hyde = mkThemeDrv { themeName = "hyde"; - version = "2016-12-03"; + version = "2017-01-17"; src = { - rev = "b6b9b77839959fbf3c9ca3a4488617fa1831cd28"; - sha256 = "0d1k03mjn08s3rpc5rdivb8ahr345kblhqyihxnfgd1501ih9pg6"; + rev = "22caf4edc738f399bb1013d8e968d111c7fa2a59"; + sha256 = "1a2j3m941vc2pyb1dz341ww5l3xblg527szfrfqh588lmsrkdqb6"; }; meta = { license = stdenv.lib.licenses.mit; longDescription = '' - Hyde is a brazen two-column Jekyll theme that pairs a prominent sidebar - with uncomplicated content. + Port of the Jekyll Hyde theme to styx; Hyde is a brazen two-column + Styx theme that pairs a prominent sidebar with uncomplicated content. ''; }; }; orbit = mkThemeDrv { themeName = "orbit"; - version = "2016-12-03"; + version = "2017-01-17"; src = { - rev = "1d41745c689c4336d4e2bfbb2483b80e67ec96e4"; - sha256 = "19pp9dykqxmrixn3cvqpdpcqy547y9n5izqhz0c4a11mmm0v3v64"; + rev = "b5896e25561f05e026b34d04ad95a647ddfc3d03"; + sha256 = "11p11f2d0swgjil5hfx153yw13p7pcp6fwx1bnvxrlfmmx9x2yj5"; }; meta = { license = stdenv.lib.licenses.cc-by-30; @@ -77,10 +89,10 @@ in showcase = mkThemeDrv { themeName = "showcase"; - version = "2016-12-04"; + version = "2017-01-17"; src = { - rev = "33feb0a09183e88d3580e9444ea36a255dffef60"; - sha256 = "01ighlnrja442ip5fhllydl77bfdz8yig80spmizivdfxdrdiyyf"; + rev = "1b4b9d4af29c05aaadfd58233f0e3f61fac726af"; + sha256 = "0mwd1ycwvlv15y431336wwlv8mdv0ikz1aymh3yxhjyxqllc2snk"; }; meta = { license = stdenv.lib.licenses.mit; diff --git a/pkgs/applications/misc/taskjuggler/3.x/default.nix b/pkgs/applications/misc/taskjuggler/3.x/default.nix index eaca537356b3..23252d0c4807 100644 --- a/pkgs/applications/misc/taskjuggler/3.x/default.nix +++ b/pkgs/applications/misc/taskjuggler/3.x/default.nix @@ -4,9 +4,7 @@ bundlerEnv { name = "taskjuggler-3.5.0"; inherit ruby; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; + gemdir = ./.; meta = { description = "A modern and powerful project management tool"; diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/misc/termite/default.nix index 837d736d10dd..850512a837d0 100644 --- a/pkgs/applications/misc/termite/default.nix +++ b/pkgs/applications/misc/termite/default.nix @@ -35,6 +35,7 @@ let homepage = https://github.com/thestinger/termite/; maintainers = with maintainers; [ koral garbas ]; platforms = platforms.all; + broken = true; }; }; in if configFile == null then termite else symlinkJoin { diff --git a/pkgs/applications/misc/yubioath-desktop/default.nix b/pkgs/applications/misc/yubioath-desktop/default.nix new file mode 100644 index 000000000000..3d12fc037107 --- /dev/null +++ b/pkgs/applications/misc/yubioath-desktop/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, python27Packages, swig, gettext, pcsclite, qt48Full, yubikey-personalization }: + +python27Packages.buildPythonApplication rec { + namePrefix = ""; + name = "yubioath-desktop-${version}"; + version = "3.1.0"; + + src = fetchurl { + url = "http://developers.yubico.com/yubioath-desktop/Releases/yubioath-desktop-${version}.tar.gz"; + sha256 = "0jfvllgh88g2vwd8sg6willlnn2hq05nd9d3xmv98lhl7gyy1akw"; + }; + + doCheck = false; + + buildInputs = [ stdenv ]; + + propagatedBuildInputs = [ python27Packages.pycrypto python27Packages.click python27Packages.pyscard python27Packages.pyside ]; + + # Need LD_PRELOAD for libykpers as the Nix cpython disables ctypes.cdll.LoadLibrary + # support that the yubicommon library uses to load libykpers + makeWrapperArgs = ''--prefix LD_LIBRARY_PATH : "${pcsclite}/lib:${yubikey-personalization}/lib" --prefix LD_PRELOAD : "${yubikey-personalization}/lib/libykpers-1.so"''; + + postInstall = '' + mkdir -p $out/share/applications + cp resources/yubioath.desktop $out/share/applications/yubioath.desktop + mkdir -p $out/share/yubioath/icons + cp resources/yubioath*.{icns,ico,png,xpm} $out/share/yubioath/icons + substituteInPlace $out/share/applications/yubioath.desktop \ + --replace 'Exec=yubioath-gui' "Exec=$out/bin/yubioath-gui" \ + --replace 'Icon=yubioath' "Icon=$out/share/yubioath/icons" + + ''; + + meta = { + description = "Yubikey Desktop Authenticator"; + + homepage = https://www.yubico.com/support/knowledge-base/categories/articles/yubico-authenticator-download/; + + license = stdenv.lib.licenses.gpl3; + }; +} diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix index 3e89fb731d32..461db272b12e 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix @@ -51,18 +51,18 @@ stdenv.mkDerivation rec { # You can get the upstream version and SHA-1 hash from the following URLs: # curl -s http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-amd64/Packages | grep -E 'Version|SHA1' # curl -s http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-i386/Packages | grep -E 'Version|SHA1' - version = "5.41.0.0"; + version = "5.41.3.0"; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "${baseURL}/google-talkplugin_${version}-1_amd64.deb"; - sha1 = "1c3cc0411444587b56178de4868eb5d0ff742ec0"; + sha1 = "0bbc3d6997ba22ce712d93e5bc336c894b54fc81"; } else if stdenv.system == "i686-linux" then fetchurl { url = "${baseURL}/google-talkplugin_${version}-1_i386.deb"; - sha1 = "0d31d726c5e9a49917e2749e73386b1c0fdcb376"; + sha1 = "6eae0544858f85c68b0cc46d7786e990bd94f139"; } else throw "Google Talk does not support your platform."; diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix new file mode 100644 index 000000000000..de21c37bc79e --- /dev/null +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -0,0 +1,94 @@ +{ stdenv, fetchFromGitHub, makeDesktopItem +, pkgconfig, autoconf213, alsaLib, bzip2, cairo +, dbus, dbus_glib, file, fontconfig, freetype +, gstreamer, gst_plugins_base, gst_all_1 +, gtk2, hunspell, icu, libevent, libjpeg, libnotify +, libstartup_notification, libvpx, makeWrapper, mesa +, nspr, nss, pango, perl, python, libpulseaudio, sqlite +, unzip, xlibs, which, yasm, zip, zlib +}: + +stdenv.mkDerivation rec { + name = "palemoon-${version}"; + version = "27.0.3"; + + src = fetchFromGitHub { + name = "palemoon-src"; + owner = "MoonchildProductions"; + repo = "Pale-Moon"; + rev = "c09119484da17c682a66e32bacbffb8cff411608"; + sha256 = "1i4hp1lz0xaryy4zpncr67gbqg8v7a2cnyqjwvs2an86rk1vg913"; + }; + + desktopItem = makeDesktopItem { + name = "palemoon"; + exec = "palemoon %U"; + desktopName = "Pale Moon"; + genericName = "Web Browser"; + categories = "Application;Network;WebBrowser;"; + mimeType = stdenv.lib.concatStringsSep ";" [ + "text/html" + "text/xml" + "application/xhtml+xml" + "application/vnd.mozilla.xul+xml" + "x-scheme-handler/http" + "x-scheme-handler/https" + "x-scheme-handler/ftp" + ]; + }; + + buildInputs = [ + alsaLib bzip2 cairo dbus dbus_glib file fontconfig freetype + gst_plugins_base gstreamer gst_all_1.gst-plugins-base gtk2 + hunspell icu libevent libjpeg libnotify libstartup_notification + libvpx makeWrapper mesa nspr nss pango perl pkgconfig python + libpulseaudio sqlite unzip which yasm zip zlib + ] ++ (with xlibs; [ + libX11 libXext libXft libXi libXrender libXScrnSaver + libXt pixman scrnsaverproto xextproto + ]); + + enableParallelBuilding = true; + + configurePhase = '' + export AUTOCONF=${autoconf213}/bin/autoconf + export MOZBUILD_STATE_PATH=$(pwd)/.mozbuild + export MOZ_CONFIG=$(pwd)/.mozconfig + export builddir=$(pwd)/build + mkdir -p $MOZBUILD_STATE_PATH $builddir + echo > $MOZ_CONFIG " + . $src/build/mozconfig.common + ac_add_options --prefix=$out + ac_add_options --enable-application=browser + ac_add_options --enable-official-branding + ac_add_options --enable-optimize="-O2" + ac_add_options --enable-jemalloc + ac_add_options --enable-shared-js + ac_add_options --disable-tests + " + ''; + + patchPhase = '' + chmod u+w . + sed -i /status4evar/d browser/installer/package-manifest.in + ''; + + buildPhase = '' + cd $builddir + $src/mach build + ''; + + installPhase = '' + cd $builddir + $src/mach install + ''; + + meta = with stdenv.lib; { + description = "A web browser"; + homepage = https://www.palemoon.org/; + license = licenses.mpl20; + maintainers = with maintainers; [ rnhmjoj ]; + platforms = platforms.linux; + }; + +} diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix index f07668756adf..637041379dbd 100644 --- a/pkgs/applications/networking/browsers/w3m/default.nix +++ b/pkgs/applications/networking/browsers/w3m/default.nix @@ -15,7 +15,7 @@ assert mouseSupport -> gpm-ncurses != null; with stdenv.lib; stdenv.mkDerivation rec { - name = "w3m-v0.5.3+git20161120"; + name = "w3m-0.5.3+git20161120"; src = fetchFromGitHub { owner = "tats"; diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index a258a8024770..f54964571575 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -4,12 +4,12 @@ let then "linux-amd64" else "darwin-amd64"; checksum = if stdenv.isLinux - then "1797ab74720f122432eace591fb415e5e5f5db97f4b6608ca8dbe59bae988374" - else "2b522dcfe27e987138f7826c79fb26a187075dd9be5c5a4c76fd6846bf109014"; + then "8bb6f9d336ca7913556e463c5b65eb8d69778c518df2fab0d20be943fbf0efc1" + else "94c9f2d511aec3d4b7dcc5f0ce6f846506169b4eb7235e1dc137d08edf408098"; in stdenv.mkDerivation rec { pname = "helm"; - version = "2.1.2"; + version = "2.1.3"; name = "${pname}-${version}"; src = fetchurl { diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index da5d426a0c5d..2b2cca6a6095 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -17,13 +17,13 @@ with lib; stdenv.mkDerivation rec { name = "kubernetes-${version}"; - version = "1.4.6"; + version = "1.5.2"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "1n5ppzr9hnn7ljfdgx40rnkn6n6a9ya0qyrhjhpnbfwz5mdp8ws3"; + sha256 = "1ps9bn5gqknyjv0b9jvp7xg3cyd4anq11j785p22347al0b8w81v"; }; buildInputs = [ makeWrapper which go rsync go-bindata ]; @@ -33,8 +33,9 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace "hack/lib/golang.sh" --replace "_cgo" "" substituteInPlace "hack/generate-docs.sh" --replace "make" "make SHELL=${stdenv.shell}" - substituteInPlace "hack/update-munge-docs.sh" --replace "make" "make SHELL=${stdenv.shell}" - substituteInPlace "hack/update-munge-docs.sh" --replace "kube::util::git_upstream_remote_name" "echo origin" + # hack/update-munge-docs.sh only performs some tests on the documentation. + # They broke building k8s; disabled for now. + echo "true" > "hack/update-munge-docs.sh" patchShebangs ./hack ''; diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index 2fe9db267655..cd1ace993d6b 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -4,12 +4,12 @@ let then "linux-amd64" else "darwin-amd64"; checksum = if stdenv.isLinux - then "17r8w4lvj7fhh7qppi9z5i2fpqqry4s61zjr9zmsbybc5flnsw2j" - else "0jf0kd1mm35qcf0ydr5yyzfq6qi8ifxchvpjsydb1gm1kikp5g3p"; + then "1g6k3va84nm2h9z2ywbbkc8jabgkarqlf8wv1sp2p6s6hw7hi5h3" + else "0jpwyvgpl34n07chcyd7ldvk3jq3rx72cp8yf0bh7gnzr5lcnxnc"; in stdenv.mkDerivation rec { pname = "minikube"; - version = "0.13.1"; + version = "0.15.0"; name = "${pname}-${version}"; src = fetchurl { @@ -30,9 +30,6 @@ stdenv.mkDerivation rec { installPhase = '' cp $src $out/bin/${pname} chmod +x $out/bin/${pname} - - mkdir -p $out/share/bash-completion/completions/ - HOME=$(pwd) $out/bin/minikube completion bash > $out/share/bash-completion/completions/minikube ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/cluster/panamax/api/default.nix b/pkgs/applications/networking/cluster/panamax/api/default.nix index 2b801ec1acf3..3347af83585f 100644 --- a/pkgs/applications/networking/cluster/panamax/api/default.nix +++ b/pkgs/applications/networking/cluster/panamax/api/default.nix @@ -11,9 +11,7 @@ stdenv.mkDerivation rec { env = bundlerEnv { name = "panamax-api-gems-${version}"; inherit ruby; - gemset = ./gemset.nix; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; + gemdir = ./.; }; bundler = args.bundler.override { inherit ruby; }; diff --git a/pkgs/applications/networking/cluster/panamax/ui/default.nix b/pkgs/applications/networking/cluster/panamax/ui/default.nix index fbeb3de810f3..4a6481e3e5ee 100644 --- a/pkgs/applications/networking/cluster/panamax/ui/default.nix +++ b/pkgs/applications/networking/cluster/panamax/ui/default.nix @@ -10,9 +10,7 @@ stdenv.mkDerivation rec { env = bundlerEnv { name = "panamax-ui-gems-${version}"; inherit ruby; - gemset = ./gemset.nix; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; + gemdir = ./.; }; bundler = args.bundler.override { inherit ruby; }; diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index e4a267ec1b5f..4362d7cff90d 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,16 +2,15 @@ buildGoPackage rec { name = "terragrunt-${version}"; - version = "0.8.0"; - rev = "v${version}"; + version = "0.9.1"; goPackagePath = "github.com/gruntwork-io/terragrunt"; src = fetchFromGitHub { - inherit rev; + rev = "v${version}"; owner = "gruntwork-io"; repo = "terragrunt"; - sha256 = "1d035p2r6d8c1crxvpi5ayb9jx6f2pdgzw2197zhllavyi8n8dw1"; + sha256 = "19im4sazw09854lnzalljwx22qswly8ffyys3yrjkd2l9vfxfly3"; }; goDeps = ./deps.nix; @@ -20,7 +19,7 @@ buildGoPackage rec { postInstall = '' wrapProgram $bin/bin/terragrunt \ - --suffix PATH : ${lib.makeBinPath [ terraform ]} + --set TERRAGRUNT_TFPATH ${lib.getBin terraform}/bin/terraform ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/cluster/terragrunt/deps.nix b/pkgs/applications/networking/cluster/terragrunt/deps.nix index ba1ac2b6a1ef..d903863118cc 100644 --- a/pkgs/applications/networking/cluster/terragrunt/deps.nix +++ b/pkgs/applications/networking/cluster/terragrunt/deps.nix @@ -5,8 +5,8 @@ fetch = { type = "git"; url = "https://github.com/aws/aws-sdk-go"; - rev = "8649d278323ebf6bd20c9cd56ecb152b1c617375"; - sha256 = "0m2nxdlvi90vw68ds9qby291skc5d0dgqi3pkalr8ma3kd9r9khv"; + rev = "5e1afe1c0a077fb2da9b5f74232b790d99397ce8"; + sha256 = "073yx5acqybw0h2zshg209wmldm0g5h5x9bhbn6h08ak0r4i80al"; }; } { @@ -32,8 +32,8 @@ fetch = { type = "git"; url = "https://github.com/mattn/go-zglob"; - rev = "0b24567ec079616e9897f635f542e3bf56abb3d0"; - sha256 = "0380dqsy0qdjranl5qfmmcr6a4g7sw4z26g1bld9y1s66madl03l"; + rev = "1783ae1a9f7ff3a79240e8c249d8b575d70a6528"; + sha256 = "0g4ih6swqpq0bqwsv5mv8ymicgr92xh9i6sm1793lqwb63x8ga1x"; }; } { diff --git a/pkgs/applications/networking/feedreaders/newsbeuter/default.nix b/pkgs/applications/networking/feedreaders/newsbeuter/default.nix index d2c1a2aeb073..e570a6e7c10e 100644 --- a/pkgs/applications/networking/feedreaders/newsbeuter/default.nix +++ b/pkgs/applications/networking/feedreaders/newsbeuter/default.nix @@ -27,11 +27,15 @@ stdenv.mkDerivation rec { url = "https://github.com/akrennmair/newsbeuter/commit/cdacfbde9fe3ae2489fc96d35dfb7d263ab03f50.patch"; sha256 = "1lhvn63cqjpikwsr6zzndb1p5y140vvphlg85fazwx4xpzd856d9"; }) + (fetchpatch { + url = "https://github.com/akrennmair/newsbeuter/commit/33577f842d9b74c119f3cebda95ef8652304db81.patch"; + sha256 = "1kwhp6k14gk1hclgsr9w47qg7hs60p23zsl6f6vw13mczp2naqlb"; + }) ]; installFlags = [ "DESTDIR=$(out)" "prefix=" ]; - installPhase = stdenv.lib.optionalString stdenv.isDarwin '' + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' for prog in $out/bin/*; do wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${stfl}/lib" done @@ -42,6 +46,6 @@ stdenv.mkDerivation rec { description = "An open-source RSS/Atom feed reader for text terminals"; maintainers = with stdenv.lib.maintainers; [ lovek323 ]; license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix index 89ee38a7380f..8b0dda1694da 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix @@ -2,15 +2,16 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "bitlbee-3.4.2"; + name = "bitlbee-3.5"; src = fetchurl { url = "mirror://bitlbee/src/${name}.tar.gz"; - sha256 = "0mza8lnfwibmklz8hdzg4f7p83hblf4h6fbf7d732kzpvra5bj39"; + sha256 = "06c371bjly38yrkvfwdh5rjfx9xfl7bszyhrlbldy0xk38c057al"; }; - buildInputs = [ gnutls glib pkgconfig libotr python ] - ++ optional doCheck check; + nativeBuildInputs = [ pkgconfig ] ++ optional doCheck check; + + buildInputs = [ gnutls glib libotr python ]; configureFlags = [ "--gcov=1" diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 8e568798df81..16e3c61bcc1f 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -1,14 +1,20 @@ { stdenv, lib, fetchFromGitHub, go, pkgs }: +let + removeExpr = ref: '' + sed -i "s,${ref},$(echo "${ref}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" \ + ''; + +in stdenv.mkDerivation rec { - version = "0.14.18"; + version = "0.14.19"; name = "syncthing-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "099r1n9awznv17ac1fm4ff6az40bvk6xxwaw8x8fx7ikqi1wv8vp"; + sha256 = "16wpw9ndx3x37mfnymp2fx9n2az9ibyr61zgq3mh2mszzzl7bkcg"; }; buildInputs = [ go ]; @@ -42,6 +48,10 @@ stdenv.mkDerivation rec { --replace /usr/bin/syncthing $out/bin/syncthing ''; + preFixup = '' + find $out/bin -type f -exec ${removeExpr go} '{}' '+' + ''; + meta = with stdenv.lib; { homepage = https://www.syncthing.net/; description = "Open Source Continuous File Synchronization"; diff --git a/pkgs/applications/networking/yafc/default.nix b/pkgs/applications/networking/yafc/default.nix deleted file mode 100644 index 45bb5518f9c1..000000000000 --- a/pkgs/applications/networking/yafc/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{stdenv, fetchurl, readline, libssh, intltool, libbsd, pkgconfig}: - -stdenv.mkDerivation rec { - name = "yafc-1.3.6"; - src = fetchurl { - url = "http://www.yafc-ftp.com/downloads/${name}.tar.xz"; - sha256 = "0wvrljihliggysfnzczc0s74i3ab2c1kzjjs99iqk98nxmb2b8v3"; - }; - - buildInputs = [ readline libssh intltool libbsd pkgconfig ]; - - meta = { - description = "ftp/sftp client with readline, autocompletion and bookmarks"; - homepage = http://www.yafc-ftp.com; - maintainers = [ stdenv.lib.maintainers.page ]; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/applications/office/jabref/default.nix b/pkgs/applications/office/jabref/default.nix index 6904d1873aa8..ef21b37b59e8 100644 --- a/pkgs/applications/office/jabref/default.nix +++ b/pkgs/applications/office/jabref/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, makeDesktopItem, ant, jdk, jre }: stdenv.mkDerivation rec { - version = "3.6"; + version = "3.8.1"; name = "jabref-${version}"; src = fetchurl { url = "https://github.com/JabRef/jabref/releases/download/v${version}/JabRef-${version}.jar"; - sha256 = "140fixwffw463dprgg6kcccsp833dnclzjzvwmqs7dq0f9y2nyc5"; + sha256 = "11asfym74zdq46i217z5n6vc79gylcx8xn7nvwacfqmym0bz79cg"; }; desktopItem = makeDesktopItem { diff --git a/pkgs/applications/office/ledger-web/default.nix b/pkgs/applications/office/ledger-web/default.nix index 6be5ad525db4..6f571bd2a1b0 100644 --- a/pkgs/applications/office/ledger-web/default.nix +++ b/pkgs/applications/office/ledger-web/default.nix @@ -6,11 +6,9 @@ bundlerEnv rec { name = "ledger-web-${version}"; - version = (import gemset).ledger_web.version; + version = (import ./gemset.nix).ledger_web.version; inherit ruby; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; + gemdir = ./.; buildInputs = lib.optional withPostgresql postgresql ++ lib.optional withSqlite sqlite; diff --git a/pkgs/applications/office/ppl-address-book/default.nix b/pkgs/applications/office/ppl-address-book/default.nix index 1c48fc50842d..f15affaa8d67 100644 --- a/pkgs/applications/office/ppl-address-book/default.nix +++ b/pkgs/applications/office/ppl-address-book/default.nix @@ -8,9 +8,7 @@ let env = bundlerEnv rec { name = "${pname}-env-${version}"; inherit ruby; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; + gemdir = ./.; gemConfig.rugged = attrs: { buildInputs = [ which ]; }; }; diff --git a/pkgs/applications/office/timetrap/default.nix b/pkgs/applications/office/timetrap/default.nix index f6a408d03842..e68c753750f5 100644 --- a/pkgs/applications/office/timetrap/default.nix +++ b/pkgs/applications/office/timetrap/default.nix @@ -4,9 +4,7 @@ bundlerEnv { name = "timetrap-1.10.0"; inherit ruby; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; + gemdir = ./.; meta = { description = "A simple command line time tracker written in ruby"; diff --git a/pkgs/applications/office/tryton/default.nix b/pkgs/applications/office/tryton/default.nix new file mode 100644 index 000000000000..31774b6b55c1 --- /dev/null +++ b/pkgs/applications/office/tryton/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, python2Packages, librsvg }: + +with stdenv.lib; + +python2Packages.buildPythonApplication rec { + name = "tryton-${version}"; + version = "4.2.1"; + src = fetchurl { + url = "mirror://pypi/t/tryton/${name}.tar.gz"; + sha256 = "1ry3kvbk769m8rwqa90pplfvmmgsv4jj9w1aqhv892smia8f0ybm"; + }; + propagatedBuildInputs = with python2Packages; [ + chardet + dateutil + pygtk + librsvg + ]; + makeWrapperArgs = [ + ''--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"'' + ]; + meta = { + description = "The client of the Tryton application platform"; + longDescription = '' + The client for Tryton, a three-tier high-level general purpose + application platform under the license GPL-3 written in Python and using + PostgreSQL as database engine. + + It is the core base of a complete business solution providing + modularity, scalability and security. + ''; + homepage = http://www.tryton.org/; + license = licenses.gpl3Plus; + maintainers = [ maintainers.johbo ]; + }; +} diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix index 313239581a1a..227b982689e1 100644 --- a/pkgs/applications/office/zim/default.nix +++ b/pkgs/applications/office/zim/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pythonPackages }: +{ stdenv, lib, fetchurl, python2Packages }: # # TODO: Declare configuration options for the following optional dependencies: @@ -7,17 +7,16 @@ # - pyxdg: Need to make it work first (see setupPyInstallFlags). # -pythonPackages.buildPythonApplication rec { +python2Packages.buildPythonApplication rec { name = "zim-${version}"; version = "0.65"; - namePrefix = ""; src = fetchurl { url = "http://zim-wiki.org/downloads/${name}.tar.gz"; sha256 = "15pdq4fxag85qjsrdmmssiq85qsk5vnbp8mrqnpvx8lm8crz6hjl"; }; - propagatedBuildInputs = with pythonPackages; [ pyGtkGlade pyxdg pygobject2 ]; + propagatedBuildInputs = with python2Packages; [ pyGtkGlade pyxdg pygobject2 ]; preBuild = '' export HOME=$TMP diff --git a/pkgs/applications/science/logic/alt-ergo/default.nix b/pkgs/applications/science/logic/alt-ergo/default.nix index 45e6674439e7..7cf0aeb203de 100644 --- a/pkgs/applications/science/logic/alt-ergo/default.nix +++ b/pkgs/applications/science/logic/alt-ergo/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { name = "alt-ergo-${version}"; - version = "0.99.1"; + version = "1.30"; src = fetchurl { url = "http://alt-ergo.ocamlpro.com/download_manager.php?target=${name}.tar.gz"; name = "${name}.tar.gz"; - sha256 = "0lnlf56ysisa45dxvbwzhl4fgyxyfz35psals2kv9x8gyq54zwpm"; + sha256 = "025pacb4ax864fn5x8k78mw6hiig4jcazblj18gzxspg4f1l5n1g"; }; buildInputs = with ocamlPackages; - [ ocaml findlib ocamlgraph zarith lablgtk ]; + [ ocaml findlib camlzip ocamlgraph zarith lablgtk ocplib-simplex ]; meta = { description = "High-performance theorem prover and SMT solver"; diff --git a/pkgs/applications/science/logic/isabelle/default.nix b/pkgs/applications/science/logic/isabelle/default.nix index 7f128340bf37..2409936ab694 100644 --- a/pkgs/applications/science/logic/isabelle/default.nix +++ b/pkgs/applications/science/logic/isabelle/default.nix @@ -1,26 +1,25 @@ -{ stdenv, fetchurl, perl, nettools, java, polyml }: +{ stdenv, fetchurl, perl, nettools, java, polyml, z3 }: # nettools needed for hostname let - dirname = "Isabelle2016"; - theories = ["HOL" "FOL" "ZF"]; + dirname = "Isabelle2016-1"; in stdenv.mkDerivation { - name = "isabelle-2016"; - inherit dirname theories; + name = "isabelle-2016-1"; + inherit dirname; src = if stdenv.isDarwin then fetchurl { url = "http://isabelle.in.tum.de/website-${dirname}/dist/${dirname}.dmg"; - sha256 = "0wawf0cjc52h8hif1867p33qhlh6qz0fy5i2kr1gbf7psickd6iw"; + sha256 = "0553l7m2z32ajmiv6sgg11rh16n490w8i4q9hr7vx4zzggr9nrlr"; } else fetchurl { url = "http://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_linux.tar.gz"; - sha256 = "0jh1qrsyib13fycymwvw7dq7xfy4iyplwq0s65ash842cdzkbxb4"; + sha256 = "1w1cgfmmi1sr43z6hczyc29lxlnlz7dd8fa88ai44wkc13y05b5r"; }; - buildInputs = [ perl polyml ] + buildInputs = [ perl polyml z3 ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ nettools java ]; sourceRoot = dirname; @@ -42,7 +41,14 @@ stdenv.mkDerivation { --replace '$POLYML_HOME/$PLATFORM/polyml' ${polyml}/bin/poly substituteInPlace lib/scripts/run-polyml* lib/scripts/polyml-version \ --replace '$ML_HOME/poly' ${polyml}/bin/poly - ''; + substituteInPlace contrib/z3*/etc/settings \ + --replace '$Z3_HOME/z3' '${z3}/bin/z3' + '' + (if ! stdenv.isLinux then "" else '' + arch=${if stdenv.system == "x86_64-linux" then "x86_64-linux" else "x86-linux"} + for f in contrib/*/$arch/{bash_process,epclextract,eprover,nunchaku,SPASS}; do + patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" + done + ''); installPhase = '' mkdir -p $out/bin diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index ece867de2a0a..b6de57951cae 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "lean-${version}"; - version = "2017-01-06"; + version = "3.0.0"; src = fetchFromGitHub { owner = "leanprover"; repo = "lean"; - rev = "6f8ccb5873b6f72d735e700e25044e99c6ebb7b6"; - sha256 = "1nxbqdc6faxivbrifb7b9j5zl5kml9w5pa63afh93z2ng7mn0jyg"; + rev = "v${version}"; + sha256 = "1ds25213vir8llans7na3laqs8rgr06clgp9xzq8akiwfy87b74i"; }; buildInputs = [ gmp mpfr cmake gperftools ]; diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix index 3891f3ca6d17..6363afb7a668 100644 --- a/pkgs/applications/science/logic/why3/default.nix +++ b/pkgs/applications/science/logic/why3/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "why3-${version}"; - version = "0.87.1"; + version = "0.87.3"; src = fetchurl { - url = https://gforge.inria.fr/frs/download.php/file/35893/why3-0.87.1.tar.gz; - sha256 = "1ssik2f6fkpvwpdmxz8hrm3p62qas3sjlqya0r57s60ilpkgiwwb"; + url = https://gforge.inria.fr/frs/download.php/file/36398/why3-0.87.3.tar.gz; + sha256 = "1fn9v6w1ilkrm2n4rz31w8qvjnchyvwxiqs67z3f59b5k99wb2ka"; }; buildInputs = (with ocamlPackages; [ diff --git a/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/default.nix b/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/default.nix index a3cf434360b9..341b50f0ef22 100644 --- a/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/default.nix +++ b/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/default.nix @@ -3,11 +3,9 @@ bundlerEnv rec { name = "bitbucket-server-cli-${version}"; - version = (import gemset).atlassian-stash.version; + version = (import ./gemset.nix).atlassian-stash.version; inherit ruby; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; + gemdir = ./.; pname = "atlassian-stash"; diff --git a/pkgs/applications/version-management/git-crecord/default.nix b/pkgs/applications/version-management/git-crecord/default.nix new file mode 100644 index 000000000000..fd999dc17d4d --- /dev/null +++ b/pkgs/applications/version-management/git-crecord/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchFromGitHub, pythonPackages }: + +pythonPackages.buildPythonApplication rec { + name = "git-crecord-${version}"; + version = "20161216.0"; + + src = fetchFromGitHub { + owner = "andrewshadura"; + repo = "git-crecord"; + rev = version; + sha256 = "0v3y90zi43myyi4k7q3892dcrbyi9dn2q6xgk12nw9db9zil269i"; + }; + + propagatedBuildInputs = with pythonPackages; [ docutils ]; + + meta = { + homepage = https://github.com/andrewshadura/git-crecord; + description = "Git subcommand to interactively select changes to commit or stage"; + license = stdenv.lib.licenses.gpl2Plus; + }; +} diff --git a/pkgs/applications/version-management/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab-shell/default.nix index 3bcf8cd4e1b2..a67ca4acfb67 100644 --- a/pkgs/applications/version-management/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab-shell/default.nix @@ -1,14 +1,14 @@ { stdenv, ruby, bundler, fetchFromGitLab }: stdenv.mkDerivation rec { - version = "3.6.6"; + version = "4.1.1"; name = "gitlab-shell-${version}"; srcs = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "1dg9ldsyly2r3amkl0d96m084az360b7nz9rhhf61x06d4z09xif"; + sha256 = "1i7dqs0csqcjwkvg8csz5f1zxy1inrzxzz3g9j618aldqxzjfgnr"; }; buildInputs = [ diff --git a/pkgs/applications/version-management/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab-workhorse/default.nix index 54be33beff5a..4cbec62b2f9b 100644 --- a/pkgs/applications/version-management/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab-workhorse/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitLab, git, go }: stdenv.mkDerivation rec { - version = "0.8.5"; + version = "1.2.1"; name = "gitlab-workhorse-${version}"; srcs = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-workhorse"; rev = "v${version}"; - sha256 = "0q6kd59sb5wm63r8zdvbkn4j6fk2n743pjhkbmg4rzngvjivxqzr"; + sha256 = "1z4iyymld3pssf1dwar0hy6c5hii79gk4k59mqj0mgy2k73405y0"; }; buildInputs = [ git go ]; diff --git a/pkgs/applications/version-management/gitlab/Gemfile b/pkgs/applications/version-management/gitlab/Gemfile index ef131cb719aa..8edb08638dda 100644 --- a/pkgs/applications/version-management/gitlab/Gemfile +++ b/pkgs/applications/version-management/gitlab/Gemfile @@ -22,17 +22,17 @@ gem 'doorkeeper', '~> 4.2.0' gem 'omniauth', '~> 1.3.1' gem 'omniauth-auth0', '~> 1.4.1' gem 'omniauth-azure-oauth2', '~> 0.0.6' -gem 'omniauth-bitbucket', '~> 0.0.2' gem 'omniauth-cas3', '~> 1.1.2' gem 'omniauth-facebook', '~> 4.0.0' gem 'omniauth-github', '~> 1.1.1' -gem 'omniauth-gitlab', '~> 1.0.0' +gem 'omniauth-gitlab', '~> 1.0.2' gem 'omniauth-google-oauth2', '~> 0.4.1' gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos gem 'omniauth-saml', '~> 1.7.0' gem 'omniauth-shibboleth', '~> 1.2.0' gem 'omniauth-twitter', '~> 1.2.0' gem 'omniauth_crowd', '~> 2.2.0' +gem 'omniauth-authentiq', '~> 0.2.0' gem 'rack-oauth2', '~> 1.2.1' gem 'jwt' @@ -67,8 +67,8 @@ gem 'gollum-rugged_adapter', '~> 0.4.2', require: false gem 'github-linguist', '~> 4.7.0', require: 'linguist' # API -gem 'grape', '~> 0.15.0' -gem 'grape-entity', '~> 0.4.2' +gem 'grape', '~> 0.18.0' +gem 'grape-entity', '~> 0.6.0' gem 'rack-cors', '~> 0.4.0', require: 'rack/cors' # Pagination @@ -85,13 +85,15 @@ gem 'dropzonejs-rails', '~> 0.7.1' # for backups gem 'fog-aws', '~> 0.9' -gem 'fog-azure', '~> 0.0' gem 'fog-core', '~> 1.40' +gem 'fog-google', '~> 0.5' gem 'fog-local', '~> 0.3' -gem 'fog-google', '~> 0.3' gem 'fog-openstack', '~> 0.1' gem 'fog-rackspace', '~> 0.1.1' +# for Google storage +gem 'google-api-client', '~> 0.8.6' + # for aws storage gem 'unf', '~> 0.1.4' @@ -100,11 +102,11 @@ gem 'seed-fu', '~> 2.3.5' # Markdown and HTML processing gem 'html-pipeline', '~> 1.11.0' -gem 'deckar01-task_list', '1.0.5', require: 'task_list/railtie' -gem 'gitlab-markup', '~> 1.5.0' +gem 'deckar01-task_list', '1.0.6', require: 'task_list/railtie' +gem 'gitlab-markup', '~> 1.5.1' gem 'redcarpet', '~> 3.3.3' gem 'RedCloth', '~> 4.3.2' -gem 'rdoc', '~>3.6' +gem 'rdoc', '~> 4.2' gem 'org-ruby', '~> 0.9.12' gem 'creole', '~> 0.5.0' gem 'wikicloth', '0.8.1' @@ -117,7 +119,7 @@ gem 'truncato', '~> 0.7.8' gem 'nokogiri', '~> 1.6.7', '>= 1.6.7.2', '< 1.6.8' # Diffs -gem 'diffy', '~> 3.0.3' +gem 'diffy', '~> 3.1.0' # Application server group :unicorn do @@ -134,9 +136,10 @@ gem 'after_commit_queue', '~> 1.3.0' gem 'acts-as-taggable-on', '~> 4.0' # Background jobs -gem 'sidekiq', '~> 4.2' -gem 'sidekiq-cron', '~> 0.4.0' +gem 'sidekiq', '~> 4.2.7' +gem 'sidekiq-cron', '~> 0.4.4' gem 'redis-namespace', '~> 1.5.2' +gem 'sidekiq-limit_fetch', '~> 3.4' # HTTP requests gem 'httparty', '~> 0.13.3' @@ -152,7 +155,7 @@ gem 'settingslogic', '~> 2.0.9' gem 'version_sorter', '~> 2.1.0' # Cache -gem 'redis-rails', '~> 4.0.0' +gem 'redis-rails', '~> 5.0.1' # Redis gem 'redis', '~> 3.2' @@ -161,6 +164,9 @@ gem 'connection_pool', '~> 2.0' # HipChat integration gem 'hipchat', '~> 1.5.0' +# JIRA integration +gem 'jira-ruby', '~> 1.1.2' + # Flowdock integration gem 'gitlab-flowdock-git-hook', '~> 1.0.1' @@ -168,7 +174,7 @@ gem 'gitlab-flowdock-git-hook', '~> 1.0.1' gem 'gemnasium-gitlab-service', '~> 0.2' # Slack integration -gem 'slack-notifier', '~> 1.2.0' +gem 'slack-notifier', '~> 1.5.1' # Asana integration gem 'asana', '~> 0.4.0' @@ -176,6 +182,9 @@ gem 'asana', '~> 0.4.0' # FogBugz integration gem 'ruby-fogbugz', '~> 0.2.1' +# Kubernetes integration +gem 'kubeclient', '~> 2.2.0' + # d3 gem 'd3_rails', '~> 3.5.0' @@ -193,7 +202,7 @@ gem 'loofah', '~> 2.0.3' gem 'licensee', '~> 8.0.0' # Protect against bruteforcing -gem 'rack-attack', '~> 4.3.1' +gem 'rack-attack', '~> 4.4.1' # Ace editor gem 'ace-rails-ap', '~> 4.1.0' @@ -214,8 +223,7 @@ gem 'chronic_duration', '~> 0.10.6' gem 'sass-rails', '~> 5.0.6' gem 'coffee-rails', '~> 4.1.0' gem 'uglifier', '~> 2.7.2' -gem 'turbolinks', '~> 2.5.0' -gem 'jquery-turbolinks', '~> 2.1.0' +gem 'gitlab-turbolinks-classic', '~> 2.5', '>= 2.5.6' gem 'addressable', '~> 2.3.8' gem 'bootstrap-sass', '~> 3.3.0' @@ -257,22 +265,19 @@ group :development do gem 'better_errors', '~> 1.0.1' gem 'binding_of_caller', '~> 0.7.2' - # Docs generator - gem 'sdoc', '~> 0.3.20' - # thin instead webrick gem 'thin', '~> 1.7.0' end group :development, :test do - gem 'byebug', '~> 8.2.1', platform: :mri + gem 'pry-byebug', '~> 3.4.1', platform: :mri gem 'pry-rails', '~> 0.3.4' gem 'awesome_print', '~> 1.2.0', require: false gem 'fuubar', '~> 2.0.0' gem 'database_cleaner', '~> 1.5.0' - gem 'factory_girl_rails', '~> 4.6.0' + gem 'factory_girl_rails', '~> 4.7.0' gem 'rspec-rails', '~> 3.5.0' gem 'rspec-retry', '~> 0.4.5' gem 'spinach-rails', '~> 0.2.1' @@ -310,6 +315,8 @@ group :development, :test do gem 'knapsack', '~> 1.11.0' gem 'activerecord_sane_schema_dumper', '0.2' + + gem 'stackprof', '~> 0.2.10' end group :test do @@ -326,21 +333,18 @@ gem 'newrelic_rpm', '~> 3.16' gem 'octokit', '~> 4.3.0' -gem 'mail_room', '~> 0.8.1' +gem 'mail_room', '~> 0.9.0' gem 'email_reply_parser', '~> 0.5.8' +gem 'html2text' gem 'ruby-prof', '~> 0.16.2' -## CI -gem 'activerecord-session_store', '~> 1.0.0' -gem 'nested_form', '~> 0.3.2' - # OAuth gem 'oauth2', '~> 1.2.0' # Soft deletion -gem 'paranoia', '~> 2.0' +gem 'paranoia', '~> 2.2' # Health check gem 'health_check', '~> 2.2.0' diff --git a/pkgs/applications/version-management/gitlab/Gemfile.lock b/pkgs/applications/version-management/gitlab/Gemfile.lock index b9501e68aae8..211bdd20fd10 100644 --- a/pkgs/applications/version-management/gitlab/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/Gemfile.lock @@ -34,12 +34,6 @@ GEM arel (~> 6.0) activerecord-nulldb-adapter (0.3.3) activerecord (>= 2.0.0) - activerecord-session_store (1.0.0) - actionpack (>= 4.0, < 5.1) - activerecord (>= 4.0, < 5.1) - multi_json (~> 1.11, >= 1.11.2) - rack (>= 1.5.2, < 3) - railties (>= 4.0, < 5.1) activerecord_sane_schema_dumper (0.2) rails (>= 4, < 5) activesupport (4.2.7.1) @@ -66,6 +60,10 @@ GEM attr_encrypted (3.0.3) encryptor (~> 3.0.0) attr_required (1.0.0) + autoparse (0.3.3) + addressable (>= 2.3.1) + extlib (>= 0.9.15) + multi_json (>= 1.0.0) autoprefixer-rails (6.2.3) execjs json @@ -74,21 +72,6 @@ GEM descendants_tracker (~> 0.0.4) ice_nine (~> 0.11.0) thread_safe (~> 0.3, >= 0.3.1) - azure (0.7.5) - addressable (~> 2.3) - azure-core (~> 0.1) - faraday (~> 0.9) - faraday_middleware (~> 0.10) - json (~> 1.8) - mime-types (>= 1, < 3.0) - nokogiri (~> 1.6) - systemu (~> 2.6) - thor (~> 0.19) - uuid (~> 2.0) - azure-core (0.1.2) - faraday (~> 0.9) - faraday_middleware (~> 0.10) - nokogiri (~> 1.6) babel-source (5.8.35) babel-transpiler (0.7.0) babel-source (>= 4.0, < 6) @@ -114,7 +97,7 @@ GEM bundler-audit (0.5.0) bundler (~> 1.2) thor (~> 0.18) - byebug (8.2.1) + byebug (9.0.6) capybara (2.6.2) addressable mime-types (>= 1.16) @@ -149,7 +132,7 @@ GEM coffee-script-source (1.10.0) colorize (0.7.7) concurrent-ruby (1.0.2) - connection_pool (2.2.0) + connection_pool (2.2.1) crack (0.4.3) safe_yaml (~> 1.0.0) creole (0.5.0) @@ -161,7 +144,7 @@ GEM database_cleaner (1.5.3) debug_inspector (0.0.2) debugger-ruby_core_source (1.3.8) - deckar01-task_list (1.0.5) + deckar01-task_list (1.0.6) activesupport (~> 4.0) html-pipeline rack (~> 1.0) @@ -182,8 +165,10 @@ GEM railties rotp (~> 2.0) diff-lcs (1.2.5) - diffy (3.0.7) + diffy (3.1.0) docile (1.1.5) + domain_name (0.5.20161021) + unf (>= 0.0.5, < 1.0.0) doorkeeper (4.2.0) railties (>= 4.2) dropzonejs-rails (0.7.2) @@ -200,10 +185,11 @@ GEM excon (0.52.0) execjs (2.6.0) expression_parser (0.9.0) - factory_girl (4.5.0) + extlib (0.9.16) + factory_girl (4.7.0) activesupport (>= 3.0.0) - factory_girl_rails (4.6.0) - factory_girl (~> 4.5.0) + factory_girl_rails (4.7.0) + factory_girl (~> 4.7.0) railties (>= 3.0.0) faraday (0.9.2) multipart-post (>= 1.2, < 3) @@ -225,16 +211,11 @@ GEM fog-json (~> 1.0) fog-xml (~> 0.1) ipaddress (~> 0.8) - fog-azure (0.0.2) - azure (~> 0.6) - fog-core (~> 1.27) - fog-json (~> 1.0) - fog-xml (~> 0.1) fog-core (1.42.0) builder excon (~> 0.49) formatador (~> 0.2) - fog-google (0.3.2) + fog-google (0.5.0) fog-core fog-json fog-xml @@ -284,7 +265,9 @@ GEM diff-lcs (~> 1.1) mime-types (>= 1.16, < 3) posix-spawn (~> 0.3) - gitlab-markup (1.5.0) + gitlab-markup (1.5.1) + gitlab-turbolinks-classic (2.5.6) + coffee-rails gitlab_git (10.7.0) activesupport (~> 4.0) charlock_holmes (~> 0.7.3) @@ -314,17 +297,36 @@ GEM json multi_json request_store (>= 1.0) - grape (0.15.0) + google-api-client (0.8.7) + activesupport (>= 3.2, < 5.0) + addressable (~> 2.3) + autoparse (~> 0.3) + extlib (~> 0.9) + faraday (~> 0.9) + googleauth (~> 0.3) + launchy (~> 2.4) + multi_json (~> 1.10) + retriable (~> 1.4) + signet (~> 0.6) + googleauth (0.5.1) + faraday (~> 0.9) + jwt (~> 1.4) + logging (~> 2.0) + memoist (~> 0.12) + multi_json (~> 1.11) + os (~> 0.9) + signet (~> 0.7) + grape (0.18.0) activesupport builder hashie (>= 2.1.0) multi_json (>= 1.3.2) multi_xml (>= 0.5.2) + mustermann-grape (~> 0.4.0) rack (>= 1.3.0) rack-accept - rack-mount virtus (>= 1.0.0) - grape-entity (0.4.8) + grape-entity (0.6.0) activesupport multi_json (>= 1.3.2) haml (4.0.7) @@ -347,7 +349,18 @@ GEM html-pipeline (1.11.0) activesupport (>= 2) nokogiri (~> 1.4) + html2text (0.2.0) + nokogiri (~> 1.6) htmlentities (4.3.4) + http (0.9.8) + addressable (~> 2.3) + http-cookie (~> 1.0) + http-form_data (~> 1.0.1) + http_parser.rb (~> 0.6.0) + http-cookie (1.0.3) + domain_name (~> 0.5) + http-form_data (1.0.1) + http_parser.rb (0.6.0) httparty (0.13.7) json (~> 1.8) multi_xml (>= 0.5.2) @@ -358,14 +371,14 @@ GEM cause json ipaddress (0.8.3) + jira-ruby (1.1.2) + activesupport + oauth (~> 0.5, >= 0.5.0) jquery-atwho-rails (1.3.2) jquery-rails (4.1.1) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - jquery-turbolinks (2.1.0) - railties (>= 3.1.0) - turbolinks jquery-ui-rails (5.0.5) railties (>= 3.2.16) json (1.8.3) @@ -379,6 +392,10 @@ GEM knapsack (1.11.0) rake timecop (>= 0.1.0) + kubeclient (2.2.0) + http (= 0.9.8) + recursive-open-struct (= 1.0.0) + rest-client launchy (2.4.3) addressable (~> 2.3) letter_opener (1.4.1) @@ -398,13 +415,16 @@ GEM listen (3.0.5) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) + little-plugger (1.1.4) + logging (2.1.0) + little-plugger (~> 1.1) + multi_json (~> 1.10) loofah (2.0.3) nokogiri (>= 1.5.9) - macaddr (1.7.1) - systemu (~> 2.6.2) mail (2.6.4) mime-types (>= 1.16, < 4) - mail_room (0.8.1) + mail_room (0.9.0) + memoist (0.15.0) method_source (0.8.2) mime-types (2.99.3) mimemagic (0.3.0) @@ -414,16 +434,20 @@ GEM multi_json (1.12.1) multi_xml (0.5.5) multipart-post (2.0.0) + mustermann (0.4.0) + tool (~> 0.2) + mustermann-grape (0.4.0) + mustermann (= 0.4.0) mysql2 (0.3.20) - nested_form (0.3.2) net-ldap (0.12.1) net-ssh (3.0.1) + netrc (0.11.0) newrelic_rpm (3.16.0.318) nokogiri (1.6.7.2) mini_portile2 (~> 2.1.0) pkg-config (~> 1.1.7) numerizer (0.1.1) - oauth (0.4.7) + oauth (0.5.1) oauth2 (1.2.0) faraday (>= 0.8, < 0.10) jwt (~> 1.0) @@ -438,14 +462,12 @@ GEM rack (>= 1.0, < 3) omniauth-auth0 (1.4.1) omniauth-oauth2 (~> 1.1) + omniauth-authentiq (0.2.2) + omniauth-oauth2 (~> 1.3, >= 1.3.1) omniauth-azure-oauth2 (0.0.6) jwt (~> 1.0) omniauth (~> 1.0) omniauth-oauth2 (~> 1.1) - omniauth-bitbucket (0.0.2) - multi_json (~> 1.7) - omniauth (~> 1.1) - omniauth-oauth (~> 1.0) omniauth-cas3 (1.1.3) addressable (~> 2.3) nokogiri (~> 1.6.6) @@ -455,7 +477,7 @@ GEM omniauth-github (1.1.2) omniauth (~> 1.0) omniauth-oauth2 (~> 1.1) - omniauth-gitlab (1.0.1) + omniauth-gitlab (1.0.2) omniauth (~> 1.0) omniauth-oauth2 (~> 1.0) omniauth-google-oauth2 (0.4.1) @@ -490,8 +512,9 @@ GEM org-ruby (0.9.12) rubypants (~> 0.2) orm_adapter (0.5.0) - paranoia (2.1.4) - activerecord (~> 4.0) + os (0.9.6) + paranoia (2.2.0) + activerecord (>= 4.0, < 5.1) parser (2.3.1.4) ast (~> 2.2) pg (0.18.4) @@ -513,17 +536,18 @@ GEM coderay (~> 1.1.0) method_source (~> 0.8.1) slop (~> 3.4) + pry-byebug (3.4.1) + byebug (~> 9.0) + pry (~> 0.10) pry-rails (0.3.4) pry (>= 0.9.10) pyu-ruby-sasl (0.0.3.3) - rack (1.6.4) + rack (1.6.5) rack-accept (0.4.5) rack (>= 0.4) - rack-attack (4.3.1) + rack-attack (4.4.1) rack rack-cors (0.4.0) - rack-mount (0.8.3) - rack (>= 1.0.0) rack-oauth2 (1.2.3) activesupport (>= 2.3) attr_required (>= 0.0.5) @@ -566,38 +590,44 @@ GEM ffi (>= 0.5.0) rblineprof (0.3.6) debugger-ruby_core_source (~> 1.3) - rdoc (3.12.2) + rdoc (4.2.2) json (~> 1.4) recaptcha (3.0.0) json + recursive-open-struct (1.0.0) redcarpet (3.3.3) redis (3.2.2) - redis-actionpack (4.0.1) - actionpack (~> 4) - redis-rack (~> 1.5.0) - redis-store (~> 1.1.0) - redis-activesupport (4.1.5) - activesupport (>= 3, < 5) - redis-store (~> 1.1.0) + redis-actionpack (5.0.1) + actionpack (>= 4.0, < 6) + redis-rack (>= 1, < 3) + redis-store (>= 1.1.0, < 1.4.0) + redis-activesupport (5.0.1) + activesupport (>= 3, < 6) + redis-store (~> 1.2.0) redis-namespace (1.5.2) redis (~> 3.0, >= 3.0.4) - redis-rack (1.5.0) + redis-rack (1.6.0) rack (~> 1.5) - redis-store (~> 1.1.0) - redis-rails (4.0.0) - redis-actionpack (~> 4) - redis-activesupport (~> 4) - redis-store (~> 1.1.0) - redis-store (1.1.7) + redis-store (~> 1.2.0) + redis-rails (5.0.1) + redis-actionpack (~> 5.0.0) + redis-activesupport (~> 5.0.0) + redis-store (~> 1.2.0) + redis-store (1.2.0) redis (>= 2.2) request_store (1.3.1) rerun (0.11.0) listen (~> 3.0) responders (2.3.0) railties (>= 4.2.0, < 5.1) + rest-client (2.0.0) + http-cookie (>= 1.0.2, < 2.0) + mime-types (>= 1.16, < 4.0) + netrc (~> 0.8) + retriable (1.4.1) rinku (2.0.0) rotp (2.1.2) - rouge (2.0.6) + rouge (2.0.7) rqrcode (0.7.0) chunky_png rqrcode-rails3 (0.1.7) @@ -662,9 +692,6 @@ GEM scss_lint (0.47.1) rake (>= 0.9, < 11) sass (~> 3.4.15) - sdoc (0.3.20) - json (>= 1.1.3) - rdoc (~> 3.10) seed-fu (2.3.6) activerecord (>= 3.1) activesupport (>= 3.1) @@ -678,21 +705,28 @@ GEM rack shoulda-matchers (2.8.0) activesupport (>= 3.0.0) - sidekiq (4.2.1) + sidekiq (4.2.7) concurrent-ruby (~> 1.0) connection_pool (~> 2.2, >= 2.2.0) - rack-protection (~> 1.5) + rack-protection (>= 1.5.0) redis (~> 3.2, >= 3.2.1) - sidekiq-cron (0.4.0) + sidekiq-cron (0.4.4) redis-namespace (>= 1.5.2) rufus-scheduler (>= 2.0.24) - sidekiq (>= 4.0.0) + sidekiq (>= 4.2.1) + sidekiq-limit_fetch (3.4.0) + sidekiq (>= 4) + signet (0.7.3) + addressable (~> 2.3) + faraday (~> 0.9) + jwt (~> 1.5) + multi_json (~> 1.10) simplecov (0.12.0) docile (~> 1.1.0) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.0) - slack-notifier (1.2.1) + slack-notifier (1.5.1) slop (3.6.0) spinach (0.8.10) colorize @@ -722,6 +756,7 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) + stackprof (0.2.10) state_machines (0.4.0) state_machines-activemodel (0.4.0) activemodel (>= 4.1, < 5.1) @@ -733,7 +768,6 @@ GEM sys-filesystem (1.1.6) ffi sysexits (1.2.0) - systemu (2.6.5) teaspoon (1.1.5) railties (>= 3.2.5, < 6) teaspoon-jasmine (2.2.0) @@ -750,11 +784,10 @@ GEM tilt (2.0.5) timecop (0.8.1) timfel-krb5-auth (0.8.3) + tool (0.2.3) truncato (0.7.8) htmlentities (~> 4.3.1) nokogiri (~> 1.6.1) - turbolinks (2.5.3) - coffee-rails tzinfo (1.2.2) thread_safe (~> 0.1) u2f (0.2.1) @@ -773,8 +806,6 @@ GEM get_process_mem (~> 0) unicorn (>= 4, < 6) uniform_notifier (1.10.0) - uuid (2.3.8) - macaddr (~> 1.0) version_sorter (2.1.0) virtus (1.0.5) axiom-types (~> 0.1) @@ -810,7 +841,6 @@ DEPENDENCIES RedCloth (~> 4.3.2) ace-rails-ap (~> 4.1.0) activerecord-nulldb-adapter - activerecord-session_store (~> 1.0.0) activerecord_sane_schema_dumper (= 0.2) acts-as-taggable-on (~> 4.0) addressable (~> 2.3.8) @@ -831,7 +861,6 @@ DEPENDENCIES browser (~> 2.2) bullet (~> 5.2.0) bundler-audit (~> 0.5.0) - byebug (~> 8.2.1) capybara (~> 2.6.2) capybara-screenshot (~> 1.0.0) carrierwave (~> 0.10.0) @@ -843,22 +872,21 @@ DEPENDENCIES creole (~> 0.5.0) d3_rails (~> 3.5.0) database_cleaner (~> 1.5.0) - deckar01-task_list (= 1.0.5) + deckar01-task_list (= 1.0.6) default_value_for (~> 3.0.0) devise (~> 4.2) devise-two-factor (~> 3.0.0) - diffy (~> 3.0.3) + diffy (~> 3.1.0) doorkeeper (~> 4.2.0) dropzonejs-rails (~> 0.7.1) email_reply_parser (~> 0.5.8) email_spec (~> 1.6.0) - factory_girl_rails (~> 4.6.0) + factory_girl_rails (~> 4.7.0) ffaker (~> 2.0.0) flay (~> 2.6.1) fog-aws (~> 0.9) - fog-azure (~> 0.0) fog-core (~> 1.40) - fog-google (~> 0.3) + fog-google (~> 0.5) fog-local (~> 0.3) fog-openstack (~> 0.1) fog-rackspace (~> 0.1.1) @@ -869,39 +897,42 @@ DEPENDENCIES gemojione (~> 3.0) github-linguist (~> 4.7.0) gitlab-flowdock-git-hook (~> 1.0.1) - gitlab-markup (~> 1.5.0) + gitlab-markup (~> 1.5.1) + gitlab-turbolinks-classic (~> 2.5, >= 2.5.6) gitlab_git (~> 10.7.0) gitlab_omniauth-ldap (~> 1.2.1) gollum-lib (~> 4.2) gollum-rugged_adapter (~> 0.4.2) gon (~> 6.1.0) - grape (~> 0.15.0) - grape-entity (~> 0.4.2) + google-api-client (~> 0.8.6) + grape (~> 0.18.0) + grape-entity (~> 0.6.0) haml_lint (~> 0.18.2) hamlit (~> 2.6.1) health_check (~> 2.2.0) hipchat (~> 1.5.0) html-pipeline (~> 1.11.0) + html2text httparty (~> 0.13.3) influxdb (~> 0.2) + jira-ruby (~> 1.1.2) jquery-atwho-rails (~> 1.3.2) jquery-rails (~> 4.1.0) - jquery-turbolinks (~> 2.1.0) jquery-ui-rails (~> 5.0.0) json-schema (~> 2.6.2) jwt kaminari (~> 0.17.0) knapsack (~> 1.11.0) + kubeclient (~> 2.2.0) letter_opener_web (~> 1.3.0) license_finder (~> 2.1.0) licensee (~> 8.0.0) loofah (~> 2.0.3) - mail_room (~> 0.8.1) + mail_room (~> 0.9.0) method_source (~> 0.8) minitest (~> 5.7.0) mousetrap-rails (~> 1.4.6) mysql2 (~> 0.3.16) - nested_form (~> 0.3.2) net-ssh (~> 3.0.1) newrelic_rpm (~> 3.16) nokogiri (~> 1.6.7, >= 1.6.7.2) @@ -910,12 +941,12 @@ DEPENDENCIES oj (~> 2.17.4) omniauth (~> 1.3.1) omniauth-auth0 (~> 1.4.1) + omniauth-authentiq (~> 0.2.0) omniauth-azure-oauth2 (~> 0.0.6) - omniauth-bitbucket (~> 0.0.2) omniauth-cas3 (~> 1.1.2) omniauth-facebook (~> 4.0.0) omniauth-github (~> 1.1.1) - omniauth-gitlab (~> 1.0.0) + omniauth-gitlab (~> 1.0.2) omniauth-google-oauth2 (~> 0.4.1) omniauth-kerberos (~> 0.3.0) omniauth-saml (~> 1.7.0) @@ -923,24 +954,25 @@ DEPENDENCIES omniauth-twitter (~> 1.2.0) omniauth_crowd (~> 2.2.0) org-ruby (~> 0.9.12) - paranoia (~> 2.0) + paranoia (~> 2.2) pg (~> 0.18.2) poltergeist (~> 1.9.0) premailer-rails (~> 1.9.0) + pry-byebug (~> 3.4.1) pry-rails (~> 0.3.4) - rack-attack (~> 4.3.1) + rack-attack (~> 4.4.1) rack-cors (~> 0.4.0) rack-oauth2 (~> 1.2.1) rails (= 4.2.7.1) rails-deprecated_sanitizer (~> 1.0.3) rainbow (~> 2.1.0) rblineprof (~> 0.3.6) - rdoc (~> 3.6) + rdoc (~> 4.2) recaptcha (~> 3.0) redcarpet (~> 3.3.3) redis (~> 3.2) redis-namespace (~> 1.5.2) - redis-rails (~> 4.0.0) + redis-rails (~> 5.0.1) request_store (~> 1.3) rerun (~> 0.11.0) responders (~> 2.0) @@ -955,17 +987,17 @@ DEPENDENCIES sanitize (~> 2.0) sass-rails (~> 5.0.6) scss_lint (~> 0.47.0) - sdoc (~> 0.3.20) seed-fu (~> 2.3.5) select2-rails (~> 3.5.9) sentry-raven (~> 2.0.0) settingslogic (~> 2.0.9) sham_rack (~> 1.3.6) shoulda-matchers (~> 2.8.0) - sidekiq (~> 4.2) - sidekiq-cron (~> 0.4.0) + sidekiq (~> 4.2.7) + sidekiq-cron (~> 0.4.4) + sidekiq-limit_fetch (~> 3.4) simplecov (= 0.12.0) - slack-notifier (~> 1.2.0) + slack-notifier (~> 1.5.1) spinach-rails (~> 0.2.1) spinach-rerun-reporter (~> 0.0.2) spring (~> 1.7.0) @@ -974,6 +1006,7 @@ DEPENDENCIES spring-commands-teaspoon (~> 0.0.2) sprockets (~> 3.7.0) sprockets-es6 (~> 0.9.2) + stackprof (~> 0.2.10) state_machines-activerecord (~> 0.4.0) sys-filesystem (~> 1.1.6) teaspoon (~> 1.1.0) @@ -982,7 +1015,6 @@ DEPENDENCIES thin (~> 1.7.0) timecop (~> 0.8.0) truncato (~> 0.7.8) - turbolinks (~> 2.5.0) u2f (~> 0.2.1) uglifier (~> 2.7.2) underscore-rails (~> 1.8.0) @@ -997,4 +1029,4 @@ DEPENDENCIES wikicloth (= 0.8.1) BUNDLED WITH - 1.13.5 + 1.13.7 diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 9e03135e89cb..659e002dfb6e 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -9,9 +9,7 @@ let env = bundlerEnv { name = "gitlab"; inherit ruby; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; + gemdir = ./.; meta = with lib; { homepage = http://www.gitlab.com/; platforms = platforms.linux; @@ -24,7 +22,7 @@ in stdenv.mkDerivation rec { name = "gitlab-${version}"; - version = "8.13.5"; + version = "8.15.4"; buildInputs = [ env ruby bundler tzdata git nodejs procps ]; @@ -32,7 +30,7 @@ stdenv.mkDerivation rec { owner = "gitlabhq"; repo = "gitlabhq"; rev = "v${version}"; - sha256 = "1ir52fdg81jawkfk03xj6c2j4lmw8sy4mwc25p024l0zpsg2gpz3"; + sha256 = "1cd6dl8niy1xxifxdrm1kwm8qhy4x4zyvwdsb722kr136rwnxm84"; }; patches = [ diff --git a/pkgs/applications/version-management/gitlab/gemset.nix b/pkgs/applications/version-management/gitlab/gemset.nix index fc36db0d6038..64ebf34e477d 100644 --- a/pkgs/applications/version-management/gitlab/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gemset.nix @@ -63,14 +63,6 @@ }; version = "0.3.3"; }; - activerecord-session_store = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1b8q5p7wl0xpmlcjig2im1yryzj4aipvw7zq3z1ig8fdg4m2m943"; - type = "gem"; - }; - version = "1.0.0"; - }; activerecord_sane_schema_dumper = { source = { remotes = ["https://rubygems.org"]; @@ -175,6 +167,14 @@ }; version = "1.0.0"; }; + autoparse = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1q5wkd8gc2ckmgry9fba4b8vxb5kr8k8gqq2wycbirgq06mbllb6"; + type = "gem"; + }; + version = "0.3.3"; + }; autoprefixer-rails = { source = { remotes = ["https://rubygems.org"]; @@ -199,22 +199,6 @@ }; version = "0.1.1"; }; - azure = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1vfnx47ihizg1d6szdyf48xfdghjfk66k4r39z6b0gl5i40vcm8v"; - type = "gem"; - }; - version = "0.7.5"; - }; - azure-core = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "016krlc7wfg27zgg5i6j0pys32ra8jszgls8wz4dz64h2zf1kd7a"; - type = "gem"; - }; - version = "0.1.2"; - }; babel-source = { source = { remotes = ["https://rubygems.org"]; @@ -330,10 +314,10 @@ byebug = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1yx89b7vh5mbvxyi8n7zl25ia1bqdj71995m4daj6d41rnkmrpnc"; + sha256 = "1kbfcn65rgdhi72n8x9l393b89rvi5z542459k7d1ggchpb0idb0"; type = "gem"; }; - version = "8.2.1"; + version = "9.0.6"; }; capybara = { source = { @@ -466,10 +450,10 @@ connection_pool = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1b2bb3k39ni5mzcnqlv9y4yjkbin20s7dkwzp0jw2jf1rmzcgrmy"; + sha256 = "17vpaj6kyf2i8bimaxz7rg1kyadf4d10642ja67qiqlhwgczl2w7"; type = "gem"; }; - version = "2.2.0"; + version = "2.2.1"; }; crack = { source = { @@ -538,10 +522,10 @@ deckar01-task_list = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1x2va9b7p2x82ind3cbk9dr4pk97c4g7vqccwzb20xdwdq0q4j91"; + sha256 = "0nfbja4br77ad79snq2a7wg38vvvf5brchv12vfk9vpbzzyfdnrq"; type = "gem"; }; - version = "1.0.5"; + version = "1.0.6"; }; default_value_for = { source = { @@ -586,10 +570,10 @@ diffy = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0il0ri511g9rm88qbvncbzgwc6wk6265hmnf7grcczmrs1z49vl0"; + sha256 = "1azibizfv91sjbzhjqj1pg2xcv8z9b8a7z6kb3wpl4hpj5hil5kj"; type = "gem"; }; - version = "3.0.7"; + version = "3.1.0"; }; docile = { source = { @@ -599,6 +583,14 @@ }; version = "1.1.5"; }; + domain_name = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1y5c96gzyh6z4nrnkisljqngfvljdba36dww657ka0x7khzvx7jl"; + type = "gem"; + }; + version = "0.5.20161021"; + }; doorkeeper = { source = { remotes = ["https://rubygems.org"]; @@ -695,21 +687,29 @@ }; version = "0.9.0"; }; + extlib = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1cbw3vgb189z3vfc1arijmsd604m3w5y5xvdfkrblc9qh7sbk2rh"; + type = "gem"; + }; + version = "0.9.16"; + }; factory_girl = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0qn34ba1midnzms1854yzx0g16sgy7bd9wcsvs66rxd65idsay20"; + sha256 = "1xzl4z9z390fsnyxp10c9if2n46zan3n6zwwpfnwc33crv4s410i"; type = "gem"; }; - version = "4.5.0"; + version = "4.7.0"; }; factory_girl_rails = { source = { remotes = ["https://rubygems.org"]; - sha256 = "00vngc59bww75hqkr1hbnvnqm5763w0jlv3lsq3js1r1wxdzix2r"; + sha256 = "0hzpirb33xdqaz44i1mbcfv0icjrghhgaz747llcfsflljd4pa4r"; type = "gem"; }; - version = "4.6.0"; + version = "4.7.0"; }; faraday = { source = { @@ -775,14 +775,6 @@ }; version = "0.11.0"; }; - fog-azure = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1bdgzn1a1z79drfvashs6gzpg98dijvxm168cq0czzkx3wvbrfcl"; - type = "gem"; - }; - version = "0.0.2"; - }; fog-core = { source = { remotes = ["https://rubygems.org"]; @@ -794,10 +786,10 @@ fog-google = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0vzwid3s4c39fqixg1zb0dr5g3q6lafm9pan6bk3csys62v6fnm9"; + sha256 = "06irf9gcg5v8iwaa5qilhwir6gl82rrp7jyyw87ad15v8p3xa59f"; type = "gem"; }; - version = "0.3.2"; + version = "0.5.0"; }; fog-json = { source = { @@ -939,10 +931,18 @@ gitlab-markup = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0yxwp4q0dwiykxv24x2yhvnn59wmw1jv0vz3d8hjw44nn9jxn25a"; + sha256 = "1aam7zvvbai5nv7vf0c0640pvik6s71f276lip4yb4slbg0pfpn2"; type = "gem"; }; - version = "1.5.0"; + version = "1.5.1"; + }; + gitlab-turbolinks-classic = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zfqwa1pahhcz1yxvwigg94bck2zsqk2jsrc0wdcybhr0iwi5jra"; + type = "gem"; + }; + version = "2.5.6"; }; gitlab_git = { source = { @@ -1000,21 +1000,37 @@ }; version = "6.1.0"; }; + google-api-client = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "11wr57j9fp6x6fym4k1a7jqp72qgc8l24mfwb4y55bbvdmkv1b2d"; + type = "gem"; + }; + version = "0.8.7"; + }; + googleauth = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nzkg63s161c6jsia92c1jfwpayzbpwn588smd286idn07y0az2m"; + type = "gem"; + }; + version = "0.5.1"; + }; grape = { source = { remotes = ["https://rubygems.org"]; - sha256 = "13rbm0whhirpzn2n58kjyvqn9989vvipynlxsj1ihmwp8xsmcj1i"; + sha256 = "17spanyj7kpvqm4ap82vq4s1hlrad5mcv8rj4q1mva40zg1f8cgj"; type = "gem"; }; - version = "0.15.0"; + version = "0.18.0"; }; grape-entity = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0hxghs2p9ncvdwhp6dwr1a74g552c49dd0jzy0szp4pg2xjbgjk8"; + sha256 = "18jhjn1164z68xrjz23wf3qha3x9az086dr7p6405jv6rszyxihq"; type = "gem"; }; - version = "0.4.8"; + version = "0.6.0"; }; haml = { source = { @@ -1072,6 +1088,14 @@ }; version = "1.11.0"; }; + html2text = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0kxdj8pf9pss9xgs8aac0alj5g1fi225yzdhh33lzampkazg1hii"; + type = "gem"; + }; + version = "0.2.0"; + }; htmlentities = { source = { remotes = ["https://rubygems.org"]; @@ -1080,6 +1104,38 @@ }; version = "4.3.4"; }; + http = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ll9x8qjp97l8gj0jx23nj7xvm0rsxj5pb3d19f7bhmdb70r0xsi"; + type = "gem"; + }; + version = "0.9.8"; + }; + http-cookie = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g"; + type = "gem"; + }; + version = "1.0.3"; + }; + http-form_data = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10r6hy8wcf8n4nbdmdz9hrm8mg45lncfc7anaycpzrhfp3949xh9"; + type = "gem"; + }; + version = "1.0.1"; + }; + "http_parser.rb" = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi"; + type = "gem"; + }; + version = "0.6.0"; + }; httparty = { source = { remotes = ["https://rubygems.org"]; @@ -1128,6 +1184,14 @@ }; version = "0.8.3"; }; + jira-ruby = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03n76a8m2d352q29j3yna1f9g3xg9dc9p3fvvx77w67h19ks7zrf"; + type = "gem"; + }; + version = "1.1.2"; + }; jquery-atwho-rails = { source = { remotes = ["https://rubygems.org"]; @@ -1144,14 +1208,6 @@ }; version = "4.1.1"; }; - jquery-turbolinks = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1d23mnl3lgamk9ziw4yyv2ixck6d8s8xp4f9pmwimk0by0jq7xhc"; - type = "gem"; - }; - version = "2.1.0"; - }; jquery-ui-rails = { source = { remotes = ["https://rubygems.org"]; @@ -1208,6 +1264,14 @@ }; version = "1.11.0"; }; + kubeclient = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09hr5cb6rzf9876wa0c8pv3kxjj4s8hcjpf7jjdg2n9prb7hhmgi"; + type = "gem"; + }; + version = "2.2.0"; + }; launchy = { source = { remotes = ["https://rubygems.org"]; @@ -1256,21 +1320,29 @@ }; version = "3.0.5"; }; - loofah = { + little-plugger = { source = { remotes = ["https://rubygems.org"]; - sha256 = "109ps521p0sr3kgc460d58b4pr1z4mqggan2jbsf0aajy9s6xis8"; + sha256 = "1frilv82dyxnlg8k1jhrvyd73l6k17mxc5vwxx080r4x1p04gwym"; type = "gem"; }; - version = "2.0.3"; + version = "1.1.4"; }; - macaddr = { + logging = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1clii8mvhmh5lmnm95ljnjygyiyhdpja85c5vy487rhxn52scn0b"; + sha256 = "1agk0dv5lxn0qpnxadi6dvg36pc0x5fsrmzhw4sc91x52mjc381l"; type = "gem"; }; - version = "1.7.1"; + version = "2.1.0"; + }; + loofah = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "109ps521p0sr3kgc460d58b4pr1z4mqggan2jbsf0aajy9s6xis8"; + type = "gem"; + }; + version = "2.0.3"; }; mail = { source = { @@ -1283,10 +1355,18 @@ mail_room = { source = { remotes = ["https://rubygems.org"]; - sha256 = "15zjqscdzm4rv8qpz8y8334nc5kvlqp0xk4wiics98hbjs8cd59i"; + sha256 = "17q8km4n9jzjb5vj3hhyv4bwr1gxdh84yghvcdrmq88jh5ki8p8k"; type = "gem"; }; - version = "0.8.1"; + version = "0.9.0"; + }; + memoist = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yd3rd7bnbhn9n47qlhcii5z89liabdjhy3is3h6gq77gyfk4f5q"; + type = "gem"; + }; + version = "0.15.0"; }; method_source = { source = { @@ -1360,21 +1440,29 @@ }; version = "2.0.0"; }; - mysql2 = { + mustermann = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0n075x14n9kziv0qdxqlzhf3j1abi1w6smpakfpsg4jbr8hnn5ip"; + sha256 = "0km27zp3mnlmh157nmj3pyd2g7n2da4dh4mr0psq53a9r0d4gli8"; type = "gem"; }; - version = "0.3.20"; + version = "0.4.0"; }; - nested_form = { + mustermann-grape = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0f053j4zfagxyym28msxj56hrpvmyv4lzxy2c5c270f7xbbnii5i"; + sha256 = "1g6kf753v0kf8zfz0z46kyb7cbpinpc3qqh02qm4s9n49s1v2fva"; type = "gem"; }; - version = "0.3.2"; + version = "0.4.0"; + }; + mysql2 = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0n075x14n9kziv0qdxqlzhf3j1abi1w6smpakfpsg4jbr8hnn5ip"; + type = "gem"; + }; + version = "0.3.20"; }; net-ldap = { source = { @@ -1392,6 +1480,14 @@ }; version = "3.0.1"; }; + netrc = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gzfmcywp1da8nzfqsql2zqi648mfnx6qwkig3cv36n9m0yy676y"; + type = "gem"; + }; + version = "0.11.0"; + }; newrelic_rpm = { source = { remotes = ["https://rubygems.org"]; @@ -1419,10 +1515,10 @@ oauth = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1k5j09p3al3clpjl6lax62qmhy43f3j3g7i6f9l4dbs6r5vpv95w"; + sha256 = "1awhy8ddhixch44y68lail3h1d214rnl3y1yzk0msq5g4z2l62ky"; type = "gem"; }; - version = "0.4.7"; + version = "0.5.1"; }; oauth2 = { source = { @@ -1464,21 +1560,21 @@ }; version = "1.4.1"; }; - omniauth-azure-oauth2 = { + omniauth-authentiq = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0qay454zvyas8xfnfkycqpjkafaq5pw4gaji176cdfw0blhviz0s"; + sha256 = "01br0snvbxbx1zgs857alfs0ay3xhgdjgk4hc2vjzf3jn6bwizvk"; type = "gem"; }; - version = "0.0.6"; + version = "0.2.2"; }; - omniauth-bitbucket = { + omniauth-azure-oauth2 = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1lals2z1yixffrc97zh7zn1jpz9l6vpb3alcp13im42dq9q0g845"; + sha256 = "0qay454zvyas8xfnfkycqpjkafaq5pw4gaji176cdfw0blhviz0s"; type = "gem"; }; - version = "0.0.2"; + version = "0.0.6"; }; omniauth-cas3 = { source = { @@ -1507,10 +1603,10 @@ omniauth-gitlab = { source = { remotes = ["https://rubygems.org"]; - sha256 = "083yyc8612kq8ygd8y7s8lxg2d51jcsakbs4pa19aww67gcm72iz"; + sha256 = "0hv672p372jq7p9p6dw8i7qyisbny3lq0si077yys1fy4bjw127x"; type = "gem"; }; - version = "1.0.1"; + version = "1.0.2"; }; omniauth-google-oauth2 = { source = { @@ -1600,13 +1696,21 @@ }; version = "0.5.0"; }; + os = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1llv8w3g2jwggdxr5a5cjkrnbbfnvai3vxacxxc0fy84xmz3hymz"; + type = "gem"; + }; + version = "0.9.6"; + }; paranoia = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0z2smnnghjhcs4l5fkz9scs1kj0bvj2n8xmzcvw4rg9yprdnlxr0"; + sha256 = "1kfznq6lba1xb3nskvn8kdb08ljh4a0lvbm3lv91xvj6n9hm15k0"; type = "gem"; }; - version = "2.1.4"; + version = "2.2.0"; }; parser = { source = { @@ -1680,6 +1784,14 @@ }; version = "0.10.3"; }; + pry-byebug = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "147kiwnggdzz7jvlplfi0baffng808rb5lk263qxp648k8x03vgc"; + type = "gem"; + }; + version = "3.4.1"; + }; pry-rails = { source = { remotes = ["https://rubygems.org"]; @@ -1699,10 +1811,10 @@ rack = { source = { remotes = ["https://rubygems.org"]; - sha256 = "09bs295yq6csjnkzj7ncj50i6chfxrhmzg1pk6p0vd2lb9ac8pj5"; + sha256 = "1374xyh8nnqb8sy6g9gcvchw8gifckn5v3bhl6dzbwwsx34qz7gz"; type = "gem"; }; - version = "1.6.4"; + version = "1.6.5"; }; rack-accept = { source = { @@ -1715,10 +1827,10 @@ rack-attack = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0ihic8ar2ddfv15p5gia8nqzsl3y7iayg5v4rmg72jlvikgsabls"; + sha256 = "1czx68p70x98y21dkdndsb64lrxf9qrv09wl1dbcxrypcjnpsdl1"; type = "gem"; }; - version = "4.3.1"; + version = "4.4.1"; }; rack-cors = { source = { @@ -1728,14 +1840,6 @@ }; version = "0.4.0"; }; - rack-mount = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "09a1qfaxxsll1kbgz7z0q0nr48sfmfm7akzaviis5bjpa5r00ld2"; - type = "gem"; - }; - version = "0.8.3"; - }; rack-oauth2 = { source = { remotes = ["https://rubygems.org"]; @@ -1851,10 +1955,10 @@ rdoc = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1v9k4sp5yzj2bshngckdvivj6bszciskk1nd2r3wri2ygs7vgqm8"; + sha256 = "027dvwz1g1h4bm40v3kxqbim4p7ww4fcmxa2l1mvwiqm5cjiqd7k"; type = "gem"; }; - version = "3.12.2"; + version = "4.2.2"; }; recaptcha = { source = { @@ -1864,6 +1968,14 @@ }; version = "3.0.0"; }; + recursive-open-struct = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "102bgpfkjsaghpb1qs1ah5s89100dchpimzah2wxdy9rv9318rqw"; + type = "gem"; + }; + version = "1.0.0"; + }; redcarpet = { source = { remotes = ["https://rubygems.org"]; @@ -1891,18 +2003,18 @@ redis-actionpack = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1jjl6dhhpdapdaywq5iqz7z36mwbw0cn0m30wcc5wcbv7xmiiygw"; + sha256 = "0gnkqi7cji2q5yfwm8b752k71pqrb3dqksv983yrf23virqnjfjr"; type = "gem"; }; - version = "4.0.1"; + version = "5.0.1"; }; redis-activesupport = { source = { remotes = ["https://rubygems.org"]; - sha256 = "10y3kybz21n2z11478sf0cp4xzclvxf0b428787brmgpc6i7p7zg"; + sha256 = "0i0r23rv32k25jqwbr4cb73alyaxwvz9crdaw3gv26h1zjrdjisd"; type = "gem"; }; - version = "4.1.5"; + version = "5.0.1"; }; redis-namespace = { source = { @@ -1915,26 +2027,26 @@ redis-rack = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1y1mxx8gn0krdrpwllv7fqsbvki1qjnb2dz8b4q9gwc326829gk8"; + sha256 = "0fbxl5gv8krjf6n88gvn44xbzhfnsysnzawz7zili298ak98lsb3"; type = "gem"; }; - version = "1.5.0"; + version = "1.6.0"; }; redis-rails = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0igww7hb58aq74mh50dli3zjg78b54y8nhd0h1h9vz4vgjd4q8m7"; + sha256 = "04l2y26k4v30p3dx0pqf9gz257q73qzgrfqf3qv6bxwyv8z9f5hm"; type = "gem"; }; - version = "4.0.0"; + version = "5.0.1"; }; redis-store = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0gf462p0wx4hn7m1m8ghs701n6xx0ijzm5cff9xfagd2s6va145m"; + sha256 = "1da15wr3wc1d4hqy7h7smdc2k2jpfac3waa9d65si6f4dmqymkkq"; type = "gem"; }; - version = "1.1.7"; + version = "1.2.0"; }; request_store = { source = { @@ -1960,6 +2072,22 @@ }; version = "2.3.0"; }; + rest-client = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1v2jp2ilpb2rm97yknxcnay9lfagcm4k82pfsmmcm9v290xm1ib7"; + type = "gem"; + }; + version = "2.0.0"; + }; + retriable = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1cmhwgv5r4vn7iqy4bfbnbb73pzl8ik69zrwq9vdim45v8b13gsj"; + type = "gem"; + }; + version = "1.4.1"; + }; rinku = { source = { remotes = ["https://rubygems.org"]; @@ -1979,10 +2107,10 @@ rouge = { source = { remotes = ["https://rubygems.org"]; - sha256 = "182hp2fh6gd3p5c862i36k6jxkc02mhi08qd94gsyfj3v34ngza0"; + sha256 = "0sfikq1q8xyqqx690iiz7ybhzx87am4w50w8f2nq36l3asw4x89d"; type = "gem"; }; - version = "2.0.6"; + version = "2.0.7"; }; rqrcode = { source = { @@ -2200,14 +2328,6 @@ }; version = "0.47.1"; }; - sdoc = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "17l8qk0ld47z4h5avcnylvds8nc6dp25zc64w23z8li2hs341xf2"; - type = "gem"; - }; - version = "0.3.20"; - }; seed-fu = { source = { remotes = ["https://rubygems.org"]; @@ -2267,18 +2387,34 @@ sidekiq = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1l9ji9lmgvgc9p45js3hrbpv6fj0kvrvx5lkrjd751g8r3h98z0l"; + sha256 = "0d711y4s5clh5xx9k12c8c3x84xxqk61qwykya2xw39fqcxgzx04"; type = "gem"; }; - version = "4.2.1"; + version = "4.2.7"; }; sidekiq-cron = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0xnbvh8kjv6954vsiwfcpp7bn8sgpwvnyapnq7b94w8h7kj3ykqy"; + sha256 = "1bsi80hyfh0lgpcdphxn2aw7av3d8xd87bmx6jz6lj7lw49gzkda"; type = "gem"; }; - version = "0.4.0"; + version = "0.4.4"; + }; + sidekiq-limit_fetch = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ykpqw2nc9fs4v0slk5n4m42n3ihwwkk5mcyw3rz51blrdzj92kr"; + type = "gem"; + }; + version = "3.4.0"; + }; + signet = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "149668991xqibvm8kvl10kzy891yd6f994b4gwlx6c3vl24v5jq6"; + type = "gem"; + }; + version = "0.7.3"; }; simplecov = { source = { @@ -2299,10 +2435,10 @@ slack-notifier = { source = { remotes = ["https://rubygems.org"]; - sha256 = "08z6fv186yw1nrpl6zwp3lwqksin145aa1jv6jf00bnv3sicliiz"; + sha256 = "0xavibxh00gy62mm79l6id9l2fldjmdqifk8alqfqy5z38ffwah6"; type = "gem"; }; - version = "1.2.1"; + version = "1.5.1"; }; slop = { source = { @@ -2392,6 +2528,14 @@ }; version = "3.1.1"; }; + stackprof = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1c88j2d6ipjw5s3hgdgfww37gysgrkicawagj33hv3knijjc9ski"; + type = "gem"; + }; + version = "0.2.10"; + }; state_machines = { source = { remotes = ["https://rubygems.org"]; @@ -2440,14 +2584,6 @@ }; version = "1.2.0"; }; - systemu = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0gmkbakhfci5wnmbfx5i54f25j9zsvbw858yg3jjhfs5n4ad1xq1"; - type = "gem"; - }; - version = "2.6.5"; - }; teaspoon = { source = { remotes = ["https://rubygems.org"]; @@ -2528,21 +2664,21 @@ }; version = "0.8.3"; }; - truncato = { + tool = { source = { remotes = ["https://rubygems.org"]; - sha256 = "09ngwz2mpfsi1ms94j7nmms4kbd5sgcqv5dshrbwaqf585ja7cm5"; + sha256 = "1iymkxi4lv2b2k905s9pl4d9k9k4455ksk3a98ssfn7y94h34np0"; type = "gem"; }; - version = "0.7.8"; + version = "0.2.3"; }; - turbolinks = { + truncato = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1ddrx25vvvqxlz4h59lrmjhc2bfwxf4bpicvyhgbpjd48ckj81jn"; + sha256 = "09ngwz2mpfsi1ms94j7nmms4kbd5sgcqv5dshrbwaqf585ja7cm5"; type = "gem"; }; - version = "2.5.3"; + version = "0.7.8"; }; tzinfo = { source = { @@ -2624,14 +2760,6 @@ }; version = "1.10.0"; }; - uuid = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0gr2mxg27l380wpiy66mgv9wq02myj6m4gmp6c4g1vsbzkh0213v"; - type = "gem"; - }; - version = "2.3.8"; - }; version_sorter = { source = { remotes = ["https://rubygems.org"]; diff --git a/pkgs/applications/version-management/gitlab/nulladapter.patch b/pkgs/applications/version-management/gitlab/nulladapter.patch index 2ee416dbb8e5..1bb2718acebd 100644 --- a/pkgs/applications/version-management/gitlab/nulladapter.patch +++ b/pkgs/applications/version-management/gitlab/nulladapter.patch @@ -27,9 +27,9 @@ index 5511d71..38d357e 100644 arel (~> 6.0) + activerecord-nulldb-adapter (0.3.3) + activerecord (>= 2.0.0) - activerecord-session_store (1.0.0) - actionpack (>= 4.0, < 5.1) - activerecord (>= 4.0, < 5.1) + activerecord_sane_schema_dumper (0.2) + rails (>= 4, < 5) + activesupport (4.2.7.1) @@ -396,7 +398,7 @@ GEM method_source (0.8.2) mime-types (2.99.2) @@ -55,6 +55,6 @@ index 5511d71..38d357e 100644 RedCloth (~> 4.3.2) ace-rails-ap (~> 4.1.0) + activerecord-nulldb-adapter - activerecord-session_store (~> 1.0.0) - acts-as-taggable-on (~> 3.4) + activerecord_sane_schema_dumper (= 0.2) + acts-as-taggable-on (~> 4.0) addressable (~> 2.3.8) diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix new file mode 100644 index 000000000000..b9a1f2e7a843 --- /dev/null +++ b/pkgs/applications/version-management/gogs/default.nix @@ -0,0 +1,48 @@ +{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper +, git, coreutils, bash, gzip, openssh +, sqliteSupport ? true +}: + +buildGoPackage rec { + name = "gogs-${version}"; + version = "0.9.113"; + + src = fetchFromGitHub { + owner = "gogits"; + repo = "gogs"; + rev = "v${version}"; + sha256 = "1zk83c9jiazfw3221yi2sidp7917q3dxb2xb7wrjg4an18gj46j7"; + }; + + patchPhase = '' + substituteInPlace models/repo.go \ + --replace '#!/usr/bin/env' '#!${coreutils}/bin/env' + ''; + + buildInputs = [ makeWrapper ]; + + buildFlags = stdenv.lib.optionalString sqliteSupport "-tags sqlite"; + + outputs = [ "bin" "out" "data" ]; + + postInstall = '' + mkdir $data + cp -R $src/{public,templates} $data + + wrapProgram $bin/bin/gogs \ + --prefix PATH : ${stdenv.lib.makeBinPath [ bash git gzip openssh ]} \ + --run 'export GOGS_WORK_DIR=''${GOGS_WORK_DIR:-$PWD}' \ + --run 'mkdir -p "$GOGS_WORK_DIR" && cd "$GOGS_WORK_DIR"' \ + --run "ln -fs $data/{public,templates} ." + ''; + + goPackagePath = "github.com/gogits/gogs"; + goDeps = ./deps.nix; + + meta = { + description = "A painless self-hosted Git service"; + homepage = "https://gogs.io"; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ schneefux ]; + }; +} diff --git a/pkgs/applications/version-management/gogs/deps.nix b/pkgs/applications/version-management/gogs/deps.nix new file mode 100644 index 000000000000..4596eb1d2437 --- /dev/null +++ b/pkgs/applications/version-management/gogs/deps.nix @@ -0,0 +1,443 @@ +[ + { + goPackagePath = "github.com/Unknwon/cae"; + fetch = { + type = "git"; + url = "https://github.com/Unknwon/cae"; + rev = "c6aac99ea2cae2ebaf23f26f76b04fe3fcfc9f8c"; + sha256 = "0j6l1fcs6gp4qw6b9w3pg9fgah18lh1hanfz5y64r6ks244v3l7s"; + }; + } + { + goPackagePath = "github.com/Unknwon/com"; + fetch = { + type = "git"; + url = "https://github.com/Unknwon/com"; + rev = "28b053d5a2923b87ce8c5a08f3af779894a72758"; + sha256 = "09i9slj4zbsqmwkkx9bqi7cgpv6hqby6r98l6qx1wag89qijybz2"; + }; + } + { + goPackagePath = "github.com/Unknwon/i18n"; + fetch = { + type = "git"; + url = "https://github.com/Unknwon/i18n"; + rev = "39d6f2727e0698b1021ceb6a77c1801aa92e7d5d"; + sha256 = "1f4s9srdaqw2yqgc3d76vww3glbwka2f5q4zrwn8bb66kcazbfb7"; + }; + } + { + goPackagePath = "github.com/Unknwon/paginater"; + fetch = { + type = "git"; + url = "https://github.com/Unknwon/paginater"; + rev = "701c23f468663c34d1b1768c3ae1bcc57e11c5b3"; + sha256 = "09h3gyd9wyzgbkny5g5ihd4ckmv0bams8g5y2xfkd55gizlmx07p"; + }; + } + { + goPackagePath = "github.com/bradfitz/gomemcache"; + fetch = { + type = "git"; + url = "https://github.com/bradfitz/gomemcache"; + rev = "2fafb84a66c4911e11a8f50955b01e74fe3ab9c5"; + sha256 = "1k3vqmq008gad1cq1gaqa35k5ldn0z8fcx07c15x9v8p9xjbhkc9"; + }; + } + { + goPackagePath = "github.com/go-macaron/binding"; + fetch = { + type = "git"; + url = "https://github.com/go-macaron/binding"; + rev = "48920167fa152d02f228cfbece7e0f1e452d200a"; + sha256 = "00h4mdyhqkh75vgafyyyn54kdpwj82ifg9l6lxv9gnkw6frxhkan"; + }; + } + { + goPackagePath = "github.com/go-macaron/cache"; + fetch = { + type = "git"; + url = "https://github.com/go-macaron/cache"; + rev = "56173531277692bc2925924d51fda1cd0a6b8178"; + sha256 = "1116a22wm43q2l54nnycgli90kix787j20mpgya9qb6xnglcck59"; + }; + } + { + goPackagePath = "github.com/go-macaron/captcha"; + fetch = { + type = "git"; + url = "https://github.com/go-macaron/captcha"; + rev = "8aa5919789ab301e865595eb4b1114d6b9847deb"; + sha256 = "0wdihxbl7yw4wg2x0wb09kv9swfpr5j06wsj4hxn3xcbpqi9viwm"; + }; + } + { + goPackagePath = "github.com/go-macaron/csrf"; + fetch = { + type = "git"; + url = "https://github.com/go-macaron/csrf"; + rev = "6a9a7df172cc1fcd81e4585f44b09200b6087cc0"; + sha256 = "173da2hl9fcfgkn0nv1ws3pr0gyyp88amhj2bfk4414k5a3r0nsa"; + }; + } + { + goPackagePath = "github.com/go-macaron/gzip"; + fetch = { + type = "git"; + url = "https://github.com/go-macaron/gzip"; + rev = "cad1c6580a07c56f5f6bc52d66002a05985c5854"; + sha256 = "12mq3dd1vd0jbi80fxab4ysmipbz9zhbm9nw6y6a6bw3byc8w4jf"; + }; + } + { + goPackagePath = "github.com/go-macaron/i18n"; + fetch = { + type = "git"; + url = "https://github.com/go-macaron/i18n"; + rev = "ef57533c3b0fc2d8581deda14937e52f11a203ab"; + sha256 = "1nkrcnpjl3x6fhjss2vp29mnvam20vpvxvxpfg1zspi1rjmpyhqy"; + }; + } + { + goPackagePath = "github.com/go-macaron/inject"; + fetch = { + type = "git"; + url = "https://github.com/go-macaron/inject"; + rev = "d8a0b8677191f4380287cfebd08e462217bac7ad"; + sha256 = "0p47pz699xhmi8yxhahvrpai9r49rqap5ckwmz1dlkrnh3zwhrhh"; + }; + } + { + goPackagePath = "github.com/go-macaron/session"; + fetch = { + type = "git"; + url = "https://github.com/go-macaron/session"; + rev = "b8a2b5ef7fb4c91c1c8ca23e2a52e29a4bcbb22f"; + sha256 = "1nz823fn23wp87pzzhpxlbr6j7q4khywa9n0h1kpdikiy87z5k5m"; + }; + } + { + goPackagePath = "github.com/go-macaron/toolbox"; + fetch = { + type = "git"; + url = "https://github.com/go-macaron/toolbox"; + rev = "99a42f20e9e88daec5c0d7beb4e7eac134680ab0"; + sha256 = "0r6ksiqzrii7b9vv8daz68044pyifsxmpz48m6h8m6l3h9ygz8cx"; + }; + } + { + goPackagePath = "github.com/go-sql-driver/mysql"; + fetch = { + type = "git"; + url = "https://github.com/go-sql-driver/mysql"; + rev = "2e00b5cd70399450106cec6431c2e2ce3cae5034"; + sha256 = "085g48jq9hzmlcxg122n0c4pi41sc1nn2qpx1vrl2jfa8crsppa5"; + }; + } + { + goPackagePath = "github.com/go-xorm/builder"; + fetch = { + type = "git"; + url = "https://github.com/go-xorm/builder"; + rev = "db75972580de4a7c6c20fff5b16a924c3de3fa12"; + sha256 = "0qgrvjfghkgfhbrm989yhrwgs36d6wxcap012glpmd2ddp5klw46"; + }; + } + { + goPackagePath = "github.com/go-xorm/core"; + fetch = { + type = "git"; + url = "https://github.com/go-xorm/core"; + rev = "2fbe2c76c6781d9e1c0398fc25386426e611f975"; + sha256 = "1rfry5md6g8b6d6vyqpqys3wl2mxf6v55d2aapxlx3hqn6lz0lax"; + }; + } + { + goPackagePath = "github.com/go-xorm/xorm"; + fetch = { + type = "git"; + url = "https://github.com/go-xorm/xorm"; + rev = "2189b36884a485d1d609fc5690bfc71a8a7de8c3"; + sha256 = "02z140xbwqins6ql8hwdr6ar3d67jqrkm22bamqbj2rmfl7z0846"; + }; + } + { + goPackagePath = "github.com/gogits/chardet"; + fetch = { + type = "git"; + url = "https://github.com/gogits/chardet"; + rev = "2404f777256163ea3eadb273dada5dcb037993c0"; + sha256 = "1dki2pqhnzcmzlqrq4d4jwknnjxm82xqnmizjjdblb6h98ans1cd"; + }; + } + { + goPackagePath = "github.com/gogits/cron"; + fetch = { + type = "git"; + url = "https://github.com/gogits/cron"; + rev = "2fc07a4c4f1e3c4d2301c5ed578d5e2c31c70421"; + sha256 = "0a153pspisnhjpxjsryqdb29y6b8ics0203icbq5lps2g5jyaiw0"; + }; + } + { + goPackagePath = "github.com/gogits/git-module"; + fetch = { + type = "git"; + url = "https://github.com/gogits/git-module"; + rev = "df1013f8eb4dc70de90bc5597bf560a4b7da802e"; + sha256 = "1vnfiwdwp210hn7z7fgi5i80mggk76blbhykqg8wvx8bi0wxlrs8"; + }; + } + { + goPackagePath = "github.com/gogits/go-gogs-client"; + fetch = { + type = "git"; + url = "https://github.com/gogits/go-gogs-client"; + rev = "98046bb98061fc6baa5bb86359af0b7c300d384a"; + sha256 = "1wsg70irk4lwyak4kn2ml64j1fglqkyzs2lgc2mk4n4j5kn9hs1k"; + }; + } + { + goPackagePath = "github.com/gogits/go-libravatar"; + fetch = { + type = "git"; + url = "https://github.com/gogits/go-libravatar"; + rev = "cd1abbd55d09b793672732a7a1dfdaa12a40dfd0"; + sha256 = "00xvnddfh1m5g17mrnvp505i4sgwpk1r0wqz6a15bp6lvadwwlnj"; + }; + } + { + goPackagePath = "github.com/issue9/identicon"; + fetch = { + type = "git"; + url = "https://github.com/issue9/identicon"; + rev = "d36b54562f4cf70c83653e13dc95c220c79ef521"; + sha256 = "0y82b3gq8rpqglvf3lsqhgp5djfdammwd1w24k3i97iqls0rch7l"; + }; + } + { + goPackagePath = "github.com/jaytaylor/html2text"; + fetch = { + type = "git"; + url = "https://github.com/jaytaylor/html2text"; + rev = "4b9124c9b0a2279e2092c4a9aaf1c83bbd2dcffc"; + sha256 = "1yp0rawzziia9diffxs6k5g85acq3a62yb5ajbvy04r2p04dv85h"; + }; + } + { + goPackagePath = "github.com/klauspost/compress"; + fetch = { + type = "git"; + url = "https://github.com/klauspost/compress"; + rev = "e3b7981a12dd3cab49afa1d3a50e715846f23732"; + sha256 = "0hxciiaqrbf7rr112r7rwk7jcwhvjpbhnp8ikszp56zwqd64k9vn"; + }; + } + { + goPackagePath = "github.com/klauspost/cpuid"; + fetch = { + type = "git"; + url = "https://github.com/klauspost/cpuid"; + rev = "09cded8978dc9e80714c4d85b0322337b0a1e5e0"; + sha256 = "05l8pfch0gvxh0khapwxhsk4xajn40vbjr360n49vh2z5531v2xq"; + }; + } + { + goPackagePath = "github.com/klauspost/crc32"; + fetch = { + type = "git"; + url = "https://github.com/klauspost/crc32"; + rev = "cb6bfca970f6908083f26f39a79009d608efd5cd"; + sha256 = "0q4yr4isgmph1yf1vq527lpmid7vqv56q7vxh3gkp5679fb90q6n"; + }; + } + { + goPackagePath = "github.com/lib/pq"; + fetch = { + type = "git"; + url = "https://github.com/lib/pq"; + rev = "8df6253d1317616f36b0c3740eb30c239a7372cb"; + sha256 = "0djs6k6rdh06v8bz0msn0lv532hk2vrljj1pz4kgmbqcmd17y31k"; + }; + } + { + goPackagePath = "github.com/mcuadros/go-version"; + fetch = { + type = "git"; + url = "https://github.com/mcuadros/go-version"; + rev = "257f7b9a7d87427c8d7f89469a5958d57f8abd7c"; + sha256 = "0mpbcc698503hbrlc74l3nqd6hdr0n6vybfzw10pg7qx3cpmn512"; + }; + } + { + goPackagePath = "github.com/microcosm-cc/bluemonday"; + fetch = { + type = "git"; + url = "https://github.com/microcosm-cc/bluemonday"; + rev = "e79763773ab6222ca1d5a7cbd9d62d83c1f77081"; + sha256 = "04rd8jzy8kzzm0j0k7wy90pykl8ws43yhhwl2gkyz6rak10jhqpz"; + }; + } + { + goPackagePath = "github.com/nfnt/resize"; + fetch = { + type = "git"; + url = "https://github.com/nfnt/resize"; + rev = "891127d8d1b52734debe1b3c3d7e747502b6c366"; + sha256 = "08lg2v4s1iyzqja7xb69d57gpz1y43yqfwv7i4fa7a06m595r9iw"; + }; + } + { + goPackagePath = "github.com/russross/blackfriday"; + fetch = { + type = "git"; + url = "https://github.com/russross/blackfriday"; + rev = "5f33e7b7878355cd2b7e6b8eefc48a5472c69f70"; + sha256 = "0d7faqxrxvh8hwc1r8gbasgmr8x5blxvzciwspir2yafjfbqy87k"; + }; + } + { + goPackagePath = "github.com/satori/go.uuid"; + fetch = { + type = "git"; + url = "https://github.com/satori/go.uuid"; + rev = "b061729afc07e77a8aa4fad0a2fd840958f1942a"; + sha256 = "0q87n5an7ha2d8kl6gn9wi41rq0whsxq68w5x3nxz7w9vgkfnq1k"; + }; + } + { + goPackagePath = "github.com/sergi/go-diff"; + fetch = { + type = "git"; + url = "https://github.com/sergi/go-diff"; + rev = "83532ca1c1caa393179c677b6facf48e61f4ca5d"; + sha256 = "08niiivkn9a1hdl738w2sq4vq6csqhw91an8wq83dk40q62f4sq8"; + }; + } + { + goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; + fetch = { + type = "git"; + url = "https://github.com/shurcooL/sanitized_anchor_name"; + rev = "1dba4b3954bc059efc3991ec364f9f9a35f597d2"; + sha256 = "0pwap8lp79pldd95a1qi3xhlsa17m8zddpgc5jzvk6d1cjpsm6qg"; + }; + } + { + goPackagePath = "github.com/urfave/cli"; + fetch = { + type = "git"; + url = "https://github.com/urfave/cli"; + rev = "0bdeddeeb0f650497d603c4ad7b20cfe685682f6"; + sha256 = "1ny63c7bfwfrsp7vfkvb4i0xhq4v7yxqnwxa52y4xlfxs4r6v6fg"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "cb497ae8f18e3c55f81bc9f3876c8f4c3d8a2813"; + sha256 = "0zah08y0a9rqk1ggp0ylkpycr3amrc22ncsppyrymry44g56xyfj"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "ae05321a78c1401cec22ba7bc203b597ea372496"; + sha256 = "1fzbijklrmhwj4mlwrnrxbbrhlzpgrsbv05zldbkvhic14g0ii2c"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "44f4f658a783b0cee41fe0a23b8fc91d9c120558"; + sha256 = "1hgwc2p5azfyzvl7i47my3wnbp2g7814a2sshqw63dvggs9mszcx"; + }; + } + { + goPackagePath = "gopkg.in/asn1-ber.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/asn1-ber.v1"; + rev = "4e86f4367175e39f69d9358a5f17b4dda270378d"; + sha256 = "13p8s74kzklb5lklfpxwxb78rknihawv1civ4s9bfqx565010fwk"; + }; + } + { + goPackagePath = "gopkg.in/bufio.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/bufio.v1"; + rev = "567b2bfa514e796916c4747494d6ff5132a1dfce"; + sha256 = "1z5pj778hdianlfj14p0d67g69v4gc2kvn6jg27z5jf75a88l19b"; + }; + } + { + goPackagePath = "gopkg.in/editorconfig/editorconfig-core-go.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/editorconfig/editorconfig-core-go.v1"; + rev = "a872f05c2e34b37b567401384d202aff11ba06d4"; + sha256 = "17mc7rm0fl5vi7ky95c2bd7c8ck0ms5bghzmgx9qk7x1zrw91335"; + }; + } + { + goPackagePath = "gopkg.in/gomail.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/gomail.v2"; + rev = "81ebce5c23dfd25c6c67194b37d3dd3f338c98b1"; + sha256 = "0zdykrv5s19lnq0g49p6njldy4cpk4g161vyjafiw7f84h8r28mc"; + }; + } + { + goPackagePath = "gopkg.in/ini.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/ini.v1"; + rev = "6f66b0e091edb3c7b380f7c4f0f884274d550b67"; + sha256 = "1n09b7ypbayhk6x7qi3g3hrqjlmj5yszwl5d8jykjd5azp6h8sb8"; + }; + } + { + goPackagePath = "gopkg.in/ldap.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/ldap.v2"; + rev = "8168ee085ee43257585e50c6441aadf54ecb2c9f"; + sha256 = "1w0993i8bl8sap01gwm1v6hjp0rsanj2mbpyabwcwnns2g79n895"; + }; + } + { + goPackagePath = "gopkg.in/macaron.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/macaron.v1"; + rev = "ddb19a9f3e8cedd44696b9dd5854dc8a43f3dd6c"; + sha256 = "0riggdq8zxy5x6zhks66slvsg22b9i4399f7ns2l6daj79myqyvy"; + }; + } + { + goPackagePath = "gopkg.in/redis.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/redis.v2"; + rev = "e6179049628164864e6e84e973cfb56335748dea"; + sha256 = "02hifpgak39y39lbn7v2ybbpk3rmb8nvmb3h3490frr8s4pfkb8h"; + }; + } + { + goPackagePath = "github.com/mattn/go-sqlite3"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-sqlite3"; + rev = "b4142c444a8941d0d92b0b7103a24df9cd815e42"; + sha256 = "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla"; + }; + } +] diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix index fd61e4904025..c4eed94017ca 100644 --- a/pkgs/applications/version-management/tortoisehg/default.nix +++ b/pkgs/applications/version-management/tortoisehg/default.nix @@ -26,6 +26,6 @@ python2Packages.buildPythonApplication rec { homepage = http://tortoisehg.bitbucket.org/; license = lib.licenses.gpl2; platforms = lib.platforms.linux; - maintainers = [ "abcz2.uprola@gmail.com" ]; + maintainers = with lib.maintainers; [ danbst ]; }; } diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix index f179325e0a22..6abb47b81c30 100644 --- a/pkgs/applications/video/kodi/plugins.nix +++ b/pkgs/applications/video/kodi/plugins.nix @@ -232,7 +232,7 @@ in homepage = https://github.com/kodi-pvr/pvr.hts; description = "Kodi's Tvheadend HTSP client addon"; platforms = platforms.all; - maintainers = with maintainers; [ page ]; + maintainers = with maintainers; [ cpages ]; }; }).override { buildInputs = [ cmake kodi libcec_platform kodi-platform ]; diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index 6a13bcc015a9..c156c5d607ff 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -4,17 +4,17 @@ stdenv.mkDerivation rec { name = "makemkv-${ver}"; - ver = "1.9.10"; + ver = "1.10.4"; builder = ./builder.sh; src_bin = fetchurl { url = "http://www.makemkv.com/download/makemkv-bin-${ver}.tar.gz"; - sha256 = "1i5nqk5gyin6rgvc0fy96pdzq0wsmfvsm6w9mfsibj0yrfqnhi6r"; + sha256 = "bc6f66897c09b0b756b352cc02a092c5b3a9547e4c129b3472ae4c605eff94aa"; }; src_oss = fetchurl { url = "http://www.makemkv.com/download/makemkv-oss-${ver}.tar.gz"; - sha256 = "1ypc2hisx71kpmjwxnlq6zh4q6r2i1p32gapb0ampjflcjyvx5dk"; + sha256 = "bacbd6a27ebd67f2e6f6c4356cafb92918d54a8bb15872f694232043039f63c4"; }; buildInputs = [openssl qt4 mesa zlib pkgconfig libav]; diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index 3a270da21e97..60625412617a 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -199,6 +199,6 @@ stdenv.mkDerivation rec { homepage = "http://mplayerhq.hu"; license = "GPL"; maintainers = [ stdenv.lib.maintainers.eelco stdenv.lib.maintainers.urkud ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/applications/video/qarte/default.nix b/pkgs/applications/video/qarte/default.nix index 40011e11b2d4..8bfe3c0b91fa 100644 --- a/pkgs/applications/video/qarte/default.nix +++ b/pkgs/applications/video/qarte/default.nix @@ -3,11 +3,11 @@ let pythonEnv = python3.withPackages (ps: with ps; [ pyqt5 sip ]); in stdenv.mkDerivation { - name = "qarte-3.2.0"; + name = "qarte-3.2.0+158"; src = fetchbzr { url = http://bazaar.launchpad.net/~vincent-vandevyvre/qarte/qarte-3; - rev = "146"; - sha256 = "0dvl38dknmnj2p4yr25p88kw3mh502c6qdp2bd43bhd2sqc3b0v0"; + rev = "158"; + sha256 = "0nj9yxylz1nz0hdjm0jzrq2l3dgfdqkafwxnzydp6qv6261w564n"; }; buildInputs = [ makeWrapper pythonEnv ]; diff --git a/pkgs/applications/video/smplayer/basegui.cpp.patch b/pkgs/applications/video/smplayer/basegui.cpp.patch deleted file mode 100644 index 05664ee96e62..000000000000 --- a/pkgs/applications/video/smplayer/basegui.cpp.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/basegui.cpp 2014-08-20 01:04:51.000000000 +0100 -+++ b/src/basegui.cpp 2014-10-11 10:25:57.561983556 +0100 -@@ -5235,7 +5235,7 @@ - #ifdef YOUTUBE_SUPPORT - void BaseGui::showTubeBrowser() { - qDebug("BaseGui::showTubeBrowser"); -- QString exec = Paths::appPath() + "/smtube"; -+ QString exec = "smtube"; - qDebug("BaseGui::showTubeBrowser: '%s'", exec.toUtf8().constData()); - if (!QProcess::startDetached(exec, QStringList())) { - QMessageBox::warning(this, "SMPlayer", diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix index 15b178fc8e6e..0801dc8573d0 100644 --- a/pkgs/applications/video/smplayer/default.nix +++ b/pkgs/applications/video/smplayer/default.nix @@ -1,16 +1,15 @@ { stdenv, fetchurl, qmakeHook, qtscript }: stdenv.mkDerivation rec { - name = "smplayer-16.1.0"; + name = "smplayer-17.1.0"; src = fetchurl { url = "mirror://sourceforge/smplayer/${name}.tar.bz2"; - sha256 = "1jfqpmbbjrs9lna44dp10zblj7b0cras9sb0nczycpkcsdi9np6j"; + sha256 = "0wgw940gxf3gqh6xzxvz037ipvr1xcw86gf0myvpb4lkwqh5jds0"; }; - patches = [ ./basegui.cpp.patch ]; - - buildInputs = [ qmakeHook qtscript ]; + buildInputs = [ qtscript ]; + nativeBuildInputs = [ qmakeHook ]; dontUseQmakeConfigure = true; diff --git a/pkgs/applications/video/smtube/default.nix b/pkgs/applications/video/smtube/default.nix index 729c90d052c6..5026e6c48313 100644 --- a/pkgs/applications/video/smtube/default.nix +++ b/pkgs/applications/video/smtube/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, qmakeHook, qtscript, qtwebkit }: stdenv.mkDerivation rec { - version = "16.1.0"; + version = "16.7.2"; name = "smtube-${version}"; src = fetchurl { url = "mirror://sourceforge/smtube/SMTube/${version}/${name}.tar.bz2"; - sha256 = "1yjn7gj5pfw8835gfazk29mhcvfh1dhfjqmbqln1ajxr89imjj4r"; + sha256 = "0k64hc6grn4nlp739b0w5fznh0k9xx9qdwx6s7w3fb5m5pfkdrmm"; }; makeFlags = [ diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index ba21a23f8ad8..2391775af42a 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, pkgconfig, go-md2man -, go, containerd, runc +, go, containerd, runc, docker-proxy, tini , sqlite, iproute, bridge-utils, devicemapper, systemd , btrfs-progs, iptables, e2fsprogs, xz, utillinux, xfsprogs , procps @@ -11,15 +11,53 @@ with lib; stdenv.mkDerivation rec { name = "docker-${version}"; - version = "1.12.6"; + version = "1.13.0"; src = fetchFromGitHub { owner = "docker"; repo = "docker"; rev = "v${version}"; - sha256 = "10jhjas07xxlxjsxby8865rr0d0zsc5azy16rsz1idmy7f7lk6jh"; + sha256 = "03b181xiqgnwanc567w9p6rbdgdvrfv0lk4r7b604ksm0fr4cz23"; }; + docker-runc = runc.overrideAttrs (oldAttrs: rec { + name = "docker-runc"; + src = fetchFromGitHub { + owner = "docker"; + repo = "runc"; + rev = "2f7393a47307a16f8cee44a37b262e8b81021e3e"; + sha256 = "1s5nfnbinzmcnm8avhvsniz0ihxyva4w5qz1hzzyqdyr0w2scnbj"; + }; + # docker/runc already include these patches / are not applicable + patches = []; + }); + docker-containerd = containerd.overrideAttrs (oldAttrs: rec { + name = "docker-containerd"; + src = fetchFromGitHub { + owner = "docker"; + repo = "containerd"; + rev = "03e5862ec0d8d3b3f750e19fca3ee367e13c090e"; + sha256 = "184sd9dwkcba3zhxnz9grw8p81x05977p36cif2dgkhjdhv12map"; + }; + }); + docker-tini = tini.overrideAttrs (oldAttrs: rec { + name = "docker-init"; + src = fetchFromGitHub { + owner = "krallin"; + repo = "tini"; + rev = "949e6facb77383876aeff8a6944dde66b3089574"; + sha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw"; + }; + + # Do not remove static from make files as we want a static binary + patchPhase = '' + ''; + + NIX_CFLAGS_COMPILE = [ + "-DMINIMAL=ON" + ]; + }); + buildInputs = [ makeWrapper pkgconfig go-md2man go sqlite devicemapper btrfs-progs systemd @@ -52,16 +90,17 @@ stdenv.mkDerivation rec { installPhase = '' install -Dm755 ./bundles/${version}/dynbinary-client/docker-${version} $out/libexec/docker/docker install -Dm755 ./bundles/${version}/dynbinary-daemon/dockerd-${version} $out/libexec/docker/dockerd - install -Dm755 ./bundles/${version}/dynbinary-daemon/docker-proxy-${version} $out/libexec/docker/docker-proxy makeWrapper $out/libexec/docker/docker $out/bin/docker \ --prefix PATH : "$out/libexec/docker:$extraPath" makeWrapper $out/libexec/docker/dockerd $out/bin/dockerd \ --prefix PATH : "$out/libexec/docker:$extraPath" # docker uses containerd now - ln -s ${containerd}/bin/containerd $out/libexec/docker/docker-containerd - ln -s ${containerd}/bin/containerd-shim $out/libexec/docker/docker-containerd-shim - ln -s ${runc}/bin/runc $out/libexec/docker/docker-runc + ln -s ${docker-containerd}/bin/containerd $out/libexec/docker/docker-containerd + ln -s ${docker-containerd}/bin/containerd-shim $out/libexec/docker/docker-containerd-shim + ln -s ${docker-runc}/bin/runc $out/libexec/docker/docker-runc + ln -s ${docker-proxy}/bin/docker-proxy $out/libexec/docker/docker-proxy + ln -s ${docker-tini}/bin/tini-static $out/libexec/docker/docker-init # systemd install -Dm644 ./contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service diff --git a/pkgs/applications/virtualization/docker/proxy.nix b/pkgs/applications/virtualization/docker/proxy.nix new file mode 100644 index 000000000000..a9f278c4d2a8 --- /dev/null +++ b/pkgs/applications/virtualization/docker/proxy.nix @@ -0,0 +1,36 @@ +{ stdenv, lib, fetchFromGitHub, go, docker }: + +with lib; + +stdenv.mkDerivation rec { + name = "docker-proxy-${rev}"; + rev = "0f534354b813003a754606689722fe253101bc4e"; + + src = fetchFromGitHub { + inherit rev; + owner = "docker"; + repo = "libnetwork"; + sha256 = "1ah7h417llcq0xzdbp497pchb9m9qvjhrwajcjb0ybrs8v889m31"; + }; + + buildInputs = [ go ]; + + buildPhase = '' + mkdir -p .gopath/src/github.com/docker + ln -sf $(pwd) .gopath/src/github.com/docker/libnetwork + GOPATH="$(pwd)/.gopath:$(pwd)/Godeps/_workspace" go build -ldflags="$PROXY_LDFLAGS" -o docker-proxy ./cmd/proxy + ''; + + installPhase = '' + mkdir -p $out/bin + cp docker-proxy $out/bin + ''; + + meta = { + description = "Docker proxy binary to forward traffic between host and containers"; + license = licenses.asl20; + homepage = https://github.com/docker/libnetwork; + maintainers = with maintainers; [vdemeester]; + platforms = docker.meta.platforms; + }; +} diff --git a/pkgs/applications/virtualization/lkl/default.nix b/pkgs/applications/virtualization/lkl/default.nix new file mode 100644 index 000000000000..b1b3c3aebeef --- /dev/null +++ b/pkgs/applications/virtualization/lkl/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub, bc, python, fuse, libarchive }: + +stdenv.mkDerivation rec { + name = "lkl-${stdenv.lib.substring 0 7 rev}"; + rev = "d74707304d4e4614081ae2a612a833aeb46622b5"; + + buildInputs = [ bc python fuse libarchive ]; + + src = fetchFromGitHub { + inherit rev; + owner = "lkl"; + repo = "linux"; + sha256 = "0x1hdjsrj6hfk1sgfw11ihm00fmp6g158sr2q3cgjy2b6jnsr4hp"; + }; + + installPhase = '' + mkdir -p $out/{bin,lib} + + # This tool assumes a different directory structure so let's point it at the right location + cp tools/lkl/bin/lkl-hijack.sh $out/bin + substituteInPlace $out/bin/lkl-hijack.sh --replace '/../' '/../lib' + + cp tools/lkl/{cptofs,cpfromfs,fs2tar,lklfuse} $out/bin + cp -r tools/lkl/include $out + cp tools/lkl/liblkl*.{a,so} $out/lib + ''; + + # We turn off format and fortify because of these errors (fortify implies -O2, which breaks the jitter entropy code): + # fs/xfs/xfs_log_recover.c:2575:3: error: format not a string literal and no format arguments [-Werror=format-security] + # crypto/jitterentropy.c:54:3: error: #error "The CPU Jitter random number generator must not be compiled with optimizations. See documentation. Use the compiler switch -O0 for compiling jitterentropy.c." + hardeningDisable = [ "format" "fortify" ]; + + makeFlags = "-C tools/lkl"; + + enableParallelBuilds = true; + + meta = with stdenv.lib; { + description = "LKL (Linux Kernel Library) aims to allow reusing the Linux kernel code as extensively as possible with minimal effort and reduced maintenance overhead"; + platforms = platforms.linux; # Darwin probably works too but I haven't tested it + license = licenses.gpl2; + maintainers = with maintainers; [ copumpkin ]; + }; +} diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index eb1672101263..ae88399f13ab 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -145,8 +145,28 @@ stdenv.mkDerivation rec { }) (fetchpatch { name = "qemu-CVE-2016-9921_9922.patch"; - url = "http://git.qemu.org/?p=qemu.git;a=commit;h=4299b90e9ba9ce5ca9024572804ba751aa1a7e70"; - sha256 = "0mdqa9w1p6cmli6976v4wi0sw9r4p5prkj7lzfd1877wk11c9c73"; + url = "http://git.qemu.org/?p=qemu.git;a=patch;h=4299b90e9ba9ce5ca9024572804ba751aa1a7e70"; + sha256 = "125xlysdgpp59m4rp1mb59i3ipmf3yjk8x01gzvxcg1hnpgm4j4c"; + }) + (fetchpatch { + name = "qemu-CVE-2016-9845.patch"; + url = "http://git.qemu.org/?p=qemu.git;a=patch;h=42a8dadc74f8982fc269e54e3c5627b54d9f83d8"; + sha256 = "0qivj585pp1g6xfzknzgi5d2p6can3ihfgpxz3wi12h5jl5q6677"; + }) + (fetchpatch { + name = "qemu-CVE-2016-9846.patch"; + url = "http://git.qemu.org/?p=qemu.git;a=patch;h=2d1cd6c7a91a4beb99a0c3a21be529222a708545"; + sha256 = "1pa8wwxaz4k4sw1zfa4w0zlxkw6qpsrny1z8c8i8di91aswspq3i"; + }) + (fetchpatch { + name = "qemu-CVE-2016-9907.patch"; + url = "http://git.qemu.org/?p=qemu.git;a=patch;h=07b026fd82d6cf11baf7d7c603c4f5f6070b35bf"; + sha256 = "0phsk2x6mfsd6gabmfk4pr5nc4aymcqsfd88zihlm9d20gg9pbv3"; + }) + (fetchpatch { + name = "qemu-CVE-2016-9912.patch"; + url = "http://git.qemu.org/?p=qemu.git;a=patch;h=b8e23926c568f2e963af39028b71c472e3023793"; + sha256 = "1b711s63pg6rzqkqyx0mrlb4x6jv3dscc90qg8w6lflwlhwa73iv"; }) ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch; hardeningDisable = [ "stackprotector" ]; diff --git a/pkgs/applications/virtualization/tini/default.nix b/pkgs/applications/virtualization/tini/default.nix index 535ca551785f..2a7b4810a24f 100644 --- a/pkgs/applications/virtualization/tini/default.nix +++ b/pkgs/applications/virtualization/tini/default.nix @@ -1,18 +1,20 @@ -{ stdenv, fetchurl, cmake }: +{ stdenv, fetchFromGitHub, cmake, glibc }: stdenv.mkDerivation rec { - version = "0.8.3"; + version = "0.13.1"; name = "tini-${version}"; - src = fetchurl { - url = "https://github.com/krallin/tini/archive/v0.8.3.tar.gz"; - sha256 ="1w7rj4crrcyv25idmh4asbp2sxzwyihy5mbpw384bzxjzaxn9xpa"; + src = fetchFromGitHub { + owner = "krallin"; + repo = "tini"; + rev = "v${version}"; + sha256 ="1g4n8v5d197zcb41fcpbhip2x342383zw1d2zkv57w73vkqgv6z6"; }; patchPhase = "sed -i /tini-static/d CMakeLists.txt"; NIX_CFLAGS_COMPILE = [ "-DPR_SET_CHILD_SUBREAPER=36" "-DPR_GET_CHILD_SUBREAPER=37" ]; - buildInputs = [ cmake ]; + buildInputs = [ cmake glibc glibc.static ]; meta = with stdenv.lib; { description = "A tiny but valid init for containers"; homepage = https://github.com/krallin/tini; diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 0964e1b4814b..bd003df57f85 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, pythonPackages, intltool, libxml2Python, curl -, wrapGAppsHook, virtinst, gnome_python, gtkvnc, vte +{ stdenv, fetchurl, python2Packages, intltool, curl +, wrapGAppsHook, virtinst, gtkvnc, vte , gtk3, gobjectIntrospection, libvirt-glib, gsettings_desktop_schemas, glib , avahi, dconf, spiceSupport ? true, spice_gtk, libosinfo, gnome3, system-libvirt }: with stdenv.lib; -with pythonPackages; +with python2Packages; buildPythonApplication rec { name = "virt-manager-${version}"; @@ -21,8 +21,8 @@ buildPythonApplication rec { [ eventlet greenlet gflags netaddr carrot routes PasteDeploy m2crypto ipy twisted distutils_extra simplejson glanceclient cheetah lockfile httplib2 - urlgrabber virtinst pyGtkGlade dbus-python gnome_python pygobject3 - libvirt libxml2Python ipaddr vte libosinfo gobjectIntrospection gtk3 mox + urlgrabber virtinst pyGtkGlade dbus-python /*gnome_python FIXME*/ pygobject3 + libvirt libxml2 ipaddr vte libosinfo gobjectIntrospection gtk3 mox gtkvnc libvirt-glib glib gsettings_desktop_schemas gnome3.defaultIconTheme wrapGAppsHook ] ++ optional spiceSupport spice_gtk; diff --git a/pkgs/applications/window-managers/i3/blocks-gaps.nix b/pkgs/applications/window-managers/i3/blocks-gaps.nix index a80dbd38ec8c..d32e82f100e2 100644 --- a/pkgs/applications/window-managers/i3/blocks-gaps.nix +++ b/pkgs/applications/window-managers/i3/blocks-gaps.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { description = "A flexible scheduler for your i3bar blocks -- this is a fork to use with i3-gaps"; homepage = https://github.com/Airblader/i3blocks-gaps; license = licenses.gpl3; - maintainers = [ "carlsverre" ]; + maintainers = with maintainers; [ carlsverre ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/window-managers/i3/blocks.nix b/pkgs/applications/window-managers/i3/blocks.nix index c3880b92bdf8..60f13ce440c3 100644 --- a/pkgs/applications/window-managers/i3/blocks.nix +++ b/pkgs/applications/window-managers/i3/blocks.nix @@ -9,14 +9,13 @@ stdenv.mkDerivation rec { sha256 = "c64720057e22cc7cac5e8fcd58fd37e75be3a7d5a3cb8995841a7f18d30c0536"; }; - makeFlags = "all"; + buildFlags = "SYSCONFDIR=/etc all"; installFlags = "PREFIX=\${out} VERSION=${version}"; meta = with stdenv.lib; { description = "A flexible scheduler for your i3bar blocks"; homepage = https://github.com/vivien/i3blocks; license = licenses.gpl3; - maintainers = [ "MindTooth" ]; - platforms = platforms.all; + platforms = with platforms; freebsd ++ linux; }; } diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/applications/window-managers/stumpwm/default.nix index ac577385ad47..6d5e53b70880 100644 --- a/pkgs/applications/window-managers/stumpwm/default.nix +++ b/pkgs/applications/window-managers/stumpwm/default.nix @@ -11,6 +11,12 @@ let }); versionSpec = { "latest" = { + name = "1.0.0"; + rev = "refs/tags/1.0.0"; + sha256 = "16r0lwhxl8g71masmfbjr7s7m7fah4ii4smi1g8zpbpiqjz48ryb"; + patches = []; + }; + "0.9.9" = { name = "0.9.9"; rev = "refs/tags/0.9.9"; sha256 = "0hmvbdk2yr5wrkiwn9dfzf65s4xc2qifj0sn6w2mghzp96cph79k"; @@ -19,8 +25,8 @@ let "git" = { name = "git-20160617"; rev = "7d5b5eb76aa656baf5a8713f514937765f66b10a"; - sha256 = "1jpj978r54086hypjxqxi0r3zacqpkr61dp6dbi0lykgx7m5bjfb"; - patches = []; + sha256 = "1jpj978r54086hypjxqxi0r3zacqpkr61dp6dbi0lykgx7m5bjfb"; + patches = []; }; }.${version}; in |