diff options
701 files changed, 12947 insertions, 15146 deletions
diff --git a/doc/coding-conventions.xml b/doc/coding-conventions.xml index e7166a64919b..8105611f2bac 100644 --- a/doc/coding-conventions.xml +++ b/doc/coding-conventions.xml @@ -251,16 +251,13 @@ bound to the variable name <varname>e2fsprogs</varname> in <listitem><para>The version part of the <literal>name</literal> attribute <emphasis>must</emphasis> start with a digit (following a - dash) — e.g., <literal>"hello-0.3-pre-r3910"</literal> instead of - <literal>"hello-svn-r3910"</literal>, as the latter would be seen as - a package named <literal>hello-svn</literal> by - <command>nix-env</command>.</para></listitem> + dash) — e.g., <literal>"hello-0.3.1rc2"</literal>.</para></listitem> - <listitem><para>If package is fetched from git's commit then + <listitem><para>If a package is not a release but a commit from a repository, then the version part of the name <emphasis>must</emphasis> be the date of that (fetched) commit. The date must be in <literal>"YYYY-MM-DD"</literal> format. - Also add <literal>"git"</literal> to the name - e.g., - <literal>"pkgname-git-2014-09-23"</literal>.</para></listitem> + Also append <literal>"unstable"</literal> to the name - e.g., + <literal>"pkgname-unstable-2014-09-23"</literal>.</para></listitem> <listitem><para>Dashes in the package name should be preserved in new variable names, rather than converted to underscores diff --git a/lib/licenses.nix b/lib/licenses.nix index f01712500e74..4071fcfd70d2 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -195,6 +195,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "Unspecified free software license"; }; + g4sl = { + fullName = "Geant4 Software License"; + url = https://geant4.web.cern.ch/geant4/license/LICENSE.html; + }; + gpl1 = spdx { spdxId = "GPL-1.0"; fullName = "GNU General Public License v1.0 only"; diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 3c367b7d30df..4fc3dbf06e93 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -338,6 +338,7 @@ robberer = "Longrin Wischnewski <robberer@freakmail.de>"; robbinch = "Robbin C. <robbinch33@gmail.com>"; robgssp = "Rob Glossop <robgssp@gmail.com>"; + roblabla = "Robin Lambertz <robinlambertz+dev@gmail.com>"; roconnor = "Russell O'Connor <roconnor@theorem.ca>"; romildo = "José Romildo Malaquias <malaquias@gmail.com>"; rszibele = "Richard Szibele <richard_szibele@hotmail.com>"; diff --git a/lib/sources.nix b/lib/sources.nix index 8e58e4b6a9dd..535b04523b57 100644 --- a/lib/sources.nix +++ b/lib/sources.nix @@ -55,10 +55,11 @@ rec { # packed-refs file, so we have to grep through it: else if lib.pathExists packedRefsName then - let packedRefs = lib.splitString "\n" (readFile packedRefsName); - matchRule = match ("^(.*) " + file + "$"); - matchedRefs = lib.flatten (lib.filter (m: ! (isNull m)) (map matchRule packedRefs)); - in lib.head matchedRefs + let fileContent = readFile packedRefsName; + matchRef = match ".*\n([^\n ]*) " + file + "\n.*" fileContent; + in if isNull matchRef + then throw ("Could not find " + file + " in " + packedRefsName) + else lib.head matchRef else throw ("Not a .git directory: " + path); in lib.flip readCommitFromFile "HEAD"; } diff --git a/maintainers/scripts/generate-kde-plasma.sh b/maintainers/scripts/generate-kde-plasma.sh index 1d93a05512c1..2e2373be36d9 100755 --- a/maintainers/scripts/generate-kde-plasma.sh +++ b/maintainers/scripts/generate-kde-plasma.sh @@ -1,5 +1,5 @@ #!/bin/sh ./maintainers/scripts/fetch-kde-qt.sh \ - http://download.kde.org/stable/plasma/5.7.1/ -A '*.tar.xz' \ + http://download.kde.org/stable/plasma/5.7.2/ -A '*.tar.xz' \ >pkgs/desktops/kde-5/plasma/srcs.nix diff --git a/maintainers/scripts/generate-qt.sh b/maintainers/scripts/generate-qt.sh index 61691520696f..a4d79c1aac58 100755 --- a/maintainers/scripts/generate-qt.sh +++ b/maintainers/scripts/generate-qt.sh @@ -1,3 +1,6 @@ #!/bin/sh -./fetch-kde-qt.sh http://download.qt.io/official_releases/qt/5.6/5.6.1/submodules/ -A '*.tar.xz' +./maintainers/scripts/fetch-kde-qt.sh \ + http://download.qt.io/official_releases/qt/5.7/5.7.0/submodules/ \ + -A '*.tar.xz' \ + >pkgs/development/libraries/qt-5/5.7/srcs.nix diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index 50b1bb9c7354..83dad5fd8dc7 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -1,27 +1,27 @@ { pkgs, options, version, revision, extraSources ? [] }: with pkgs; -with pkgs.lib; let + lib = pkgs.lib; # Remove invisible and internal options. - optionsList = filter (opt: opt.visible && !opt.internal) (optionAttrSetToDocList options); + optionsList = lib.filter (opt: opt.visible && !opt.internal) (lib.optionAttrSetToDocList options); # Replace functions by the string <function> substFunction = x: - if builtins.isAttrs x then mapAttrs (name: substFunction) x + if builtins.isAttrs x then lib.mapAttrs (name: substFunction) x else if builtins.isList x then map substFunction x else if builtins.isFunction x then "<function>" else x; # Clean up declaration sites to not refer to the NixOS source tree. - optionsList' = flip map optionsList (opt: opt // { + optionsList' = lib.flip map optionsList (opt: opt // { declarations = map stripAnyPrefixes opt.declarations; } - // optionalAttrs (opt ? example) { example = substFunction opt.example; } - // optionalAttrs (opt ? default) { default = substFunction opt.default; } - // optionalAttrs (opt ? type) { type = substFunction opt.type; }); + // lib.optionalAttrs (opt ? example) { example = substFunction opt.example; } + // lib.optionalAttrs (opt ? default) { default = substFunction opt.default; } + // lib.optionalAttrs (opt ? type) { type = substFunction opt.type; }); # We need to strip references to /nix/store/* from options, # including any `extraSources` if some modules came from elsewhere, @@ -30,7 +30,7 @@ let # E.g. if some `options` came from modules in ${pkgs.customModules}/nix, # you'd need to include `extraSources = [ pkgs.customModules ]` prefixesToStrip = map (p: "${toString p}/") ([ ../../.. ] ++ extraSources); - stripAnyPrefixes = flip (fold removePrefix) prefixesToStrip; + stripAnyPrefixes = lib.flip (lib.fold lib.removePrefix) prefixesToStrip; # Convert the list of options into an XML file. optionsXML = builtins.toFile "options.xml" (builtins.toXML optionsList'); @@ -49,7 +49,7 @@ let -o $out ${./options-to-docbook.xsl} $optionsXML ''; - sources = sourceFilesBySuffices ./. [".xml"]; + sources = lib.sourceFilesBySuffices ./. [".xml"]; copySources = '' @@ -143,7 +143,7 @@ in rec { mkdir -p $dst cp ${builtins.toFile "options.json" (builtins.unsafeDiscardStringContext (builtins.toJSON - (listToAttrs (map (o: { name = o.name; value = removeAttrs o ["name" "visible" "internal"]; }) optionsList')))) + (builtins.listToAttrs (map (o: { name = o.name; value = removeAttrs o ["name" "visible" "internal"]; }) optionsList')))) } $dst/options.json mkdir -p $out/nix-support @@ -193,6 +193,43 @@ in rec { allowedReferences = ["out"]; }; + + manualEpub = stdenv.mkDerivation { + name = "nixos-manual-epub"; + + inherit sources; + + buildInputs = [ libxml2 libxslt zip ]; + + buildCommand = '' + ${copySources} + + # Check the validity of the manual sources. + xmllint --noout --nonet --xinclude --noxincludenode \ + --relaxng ${docbook5}/xml/rng/docbook/docbook.rng \ + manual.xml + + # Generate the epub manual. + dst=$out/share/doc/nixos + + xsltproc \ + ${manualXsltprocOptions} \ + --stringparam target.database.document "${olinkDB}/olinkdb.xml" \ + --nonet --xinclude --output $dst/epub/ \ + ${docbook5_xsl}/xml/xsl/docbook/epub/docbook.xsl ./manual.xml + + mkdir -p $dst/epub/OEBPS/images/callouts + cp -r ${docbook5_xsl}/xml/xsl/docbook/images/callouts/*.gif $dst/epub/OEBPS/images/callouts + echo "application/epub+zip" > mimetype + zip -0Xq "$dst/NixOS Manual - NixOS community.epub" mimetype + zip -Xr9D "$dst/NixOS Manual - NixOS community.epub" $dst/epub/* + + mkdir -p $out/nix-support + echo "doc-epub manual $dst/NixOS Manual - NixOS community.epub" >> $out/nix-support/hydra-build-products + ''; + }; + + manualPDF = stdenv.mkDerivation { name = "nixos-manual-pdf"; diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index 7acf050a9a40..71ac3f9a72c4 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -9,11 +9,36 @@ let systemWide = cfg.enable && cfg.systemWide; nonSystemWide = cfg.enable && !cfg.systemWide; + hasZeroconf = let z = cfg.zeroconf; in z.publish.enable || z.discovery.enable; + + overriddenPackage = cfg.package.override + (optionalAttrs hasZeroconf { zeroconfSupport = true; }); + binary = "${getBin overriddenPackage}/bin/pulseaudio"; + binaryNoDaemon = "${binary} --daemonize=no"; # Forces 32bit pulseaudio and alsaPlugins to be built/supported for apps # using 32bit alsa on 64bit linux. enable32BitAlsaPlugins = cfg.support32Bit && stdenv.isx86_64 && (pkgs_i686.alsaLib != null && pkgs_i686.libpulseaudio != null); + + myConfigFile = + let + addModuleIf = cond: mod: optionalString cond "load-module ${mod}"; + allAnon = optional cfg.tcp.anonymousClients.allowAll "auth-anonymous=1"; + ipAnon = let a = cfg.tcp.anonymousClients.allowedIpRanges; + in optional (a != []) ''auth-ip-acl=${concatStringsSep ";" a}''; + in writeTextFile { + name = "default.pa"; + text = '' + .include ${cfg.configFile} + ${addModuleIf cfg.zeroconf.publish.enable "module-zeroconf-publish"} + ${addModuleIf cfg.zeroconf.discovery.enable "module-zeroconf-discover"} + ${addModuleIf cfg.tcp.enable (concatStringsSep " " + ([ "load-module module-native-protocol-tcp" ] ++ allAnon ++ ipAnon))} + ${cfg.extraConfig} + ''; + }; + ids = config.ids; uid = ids.uids.pulseaudio; @@ -26,7 +51,7 @@ let # are built with PulseAudio support (like KDE). clientConf = writeText "client.conf" '' autospawn=${if nonSystemWide then "yes" else "no"} - ${optionalString nonSystemWide "daemon-binary=${cfg.package.out}/bin/pulseaudio"} + ${optionalString nonSystemWide "daemon-binary=${binary}"} ${cfg.extraClientConf} ''; @@ -44,7 +69,7 @@ let hint.description "Default Audio Device (via PulseAudio)" } ctl_type.pulse { - libs.native = ${alsaPlugins}/lib/alsa-lib/libasound_module_ctl_pulse.so ; + libs.native = ${pkgs.alsaPlugins}/lib/alsa-lib/libasound_module_ctl_pulse.so ; ${lib.optionalString enable32BitAlsaPlugins "libs.32Bit = ${pkgs_i686.alsaPlugins}/lib/alsa-lib/libasound_module_ctl_pulse.so ;"} } @@ -89,16 +114,25 @@ in { }; configFile = mkOption { - type = types.path; + type = types.nullOr types.path; description = '' - The path to the configuration the PulseAudio server + The path to the default configuration options the PulseAudio server should use. By default, the "default.pa" configuration from the PulseAudio distribution is used. ''; }; + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Literal string to append to <literal>configFile</literal> + and the config file generated by the pulseaudio module. + ''; + }; + extraClientConf = mkOption { - type = types.str; + type = types.lines; default = ""; description = '' Extra configuration appended to pulse/client.conf file. @@ -127,6 +161,31 @@ in { ''; }; }; + + zeroconf = { + discovery.enable = + mkEnableOption "discovery of pulseaudio sinks in the local network"; + publish.enable = + mkEnableOption "publishing the pulseaudio sink in the local network"; + }; + + # TODO: enable by default? + tcp = { + enable = mkEnableOption "tcp streaming support"; + + anonymousClients = { + allowAll = mkEnableOption "all anonymous clients to stream to the server"; + allowedIpRanges = mkOption { + type = types.listOf types.str; + default = []; + example = literalExample ''[ "127.0.0.1" "192.168.1.0/24" ]''; + description = '' + A list of IP subnets that are allowed to stream to the server. + ''; + }; + }; + }; + }; }; @@ -139,11 +198,11 @@ in { source = clientConf; }; - hardware.pulseaudio.configFile = mkDefault "${getBin cfg.package}/etc/pulse/default.pa"; + hardware.pulseaudio.configFile = mkDefault "${getBin overriddenPackage}/etc/pulse/default.pa"; } (mkIf cfg.enable { - environment.systemPackages = [ cfg.package ]; + environment.systemPackages = [ overriddenPackage ]; environment.etc = singleton { target = "asound.conf"; @@ -152,12 +211,21 @@ in { # Allow PulseAudio to get realtime priority using rtkit. security.rtkit.enable = true; + + }) + + (mkIf hasZeroconf { + services.avahi.enable = true; + }) + (mkIf cfg.zeroconf.publish.enable { + services.avahi.publish.enable = true; + services.avahi.publish.userServices = true; }) (mkIf nonSystemWide { environment.etc = singleton { target = "pulse/default.pa"; - source = cfg.configFile; + source = myConfigFile; }; systemd.user = { @@ -167,10 +235,12 @@ in { wantedBy = [ "default.target" ]; serviceConfig = { Type = "notify"; - ExecStart = "${getBin cfg.package}/bin/pulseaudio --daemonize=no"; + ExecStart = binaryNoDaemon; Restart = "on-failure"; + RestartSec = "500ms"; }; environment = { DISPLAY = ":${toString config.services.xserver.display}"; }; + restartIfChanged = true; }; sockets.pulseaudio = { @@ -205,8 +275,9 @@ in { environment.PULSE_RUNTIME_PATH = stateDir; serviceConfig = { Type = "notify"; - ExecStart = "${getBin cfg.package}/bin/pulseaudio --daemonize=no --log-level=${cfg.daemon.logLevel} --system -n --file=${cfg.configFile}"; + ExecStart = "${binaryNoDaemon} --log-level=${cfg.daemon.logLevel} --system -n --file=${myConfigFile}"; Restart = "on-failure"; + RestartSec = "500ms"; }; }; }) diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 6c696987f89e..9f1ca0f69232 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -473,7 +473,7 @@ ./services/web-servers/lighttpd/gitweb.nix ./services/web-servers/lighttpd/inginious.nix ./services/web-servers/nginx/default.nix - ./services/web-servers/phpfpm/default.nix + ./services/web-servers/phpfpm.nix ./services/web-servers/shellinabox.nix ./services/web-servers/tomcat.nix ./services/web-servers/uwsgi.nix diff --git a/nixos/modules/programs/ssmtp.nix b/nixos/modules/programs/ssmtp.nix index 7b00efbb4686..f5d1873cc5c8 100644 --- a/nixos/modules/programs/ssmtp.nix +++ b/nixos/modules/programs/ssmtp.nix @@ -100,6 +100,12 @@ in Password used for SMTP auth. (STORED PLAIN TEXT, WORLD-READABLE IN NIX STORE) ''; }; + + setSendmail = mkOption { + type = types.bool; + default = true; + description = "Whether to set the system sendmail to ssmtp's."; + }; }; @@ -122,6 +128,13 @@ in ''; environment.systemPackages = [pkgs.ssmtp]; + + services.mail.sendmailSetuidWrapper = mkIf cfg.setSendmail { + program = "sendmail"; + source = "${pkgs.ssmtp}/bin/sendmail"; + setuid = false; + setgid = false; + }; }; diff --git a/nixos/modules/programs/tmux.nix b/nixos/modules/programs/tmux.nix index cadf8d4ae105..f0f8d03505ac 100644 --- a/nixos/modules/programs/tmux.nix +++ b/nixos/modules/programs/tmux.nix @@ -27,7 +27,7 @@ let set -g status-keys ${cfg.keyMode} set -g mode-keys ${cfg.keyMode} - ${if cfg.keyMode == "vi" then '' + ${if cfg.keyMode == "vi" && cfg.customPaneNavigationAndResize then '' bind h select-pane -L bind j select-pane -D bind k select-pane -U @@ -86,6 +86,13 @@ in { description = "Use 24 hour clock."; }; + customPaneNavigationAndResize = mkOption { + default = false; + example = true; + type = types.bool; + description = "Override the hjkl and HJKL bindings for pane navigation and resizing in VI mode."; + }; + escapeTime = mkOption { default = 500; example = 0; diff --git a/nixos/modules/services/audio/mopidy.nix b/nixos/modules/services/audio/mopidy.nix index 9981b065f28d..029b14ab4726 100644 --- a/nixos/modules/services/audio/mopidy.nix +++ b/nixos/modules/services/audio/mopidy.nix @@ -47,6 +47,7 @@ in { }; configuration = mkOption { + default = ""; type = types.lines; description = '' The configuration that Mopidy should use. diff --git a/nixos/modules/services/continuous-integration/gocd-server/default.nix b/nixos/modules/services/continuous-integration/gocd-server/default.nix index f0d9d6f53c83..2d1986301216 100644 --- a/nixos/modules/services/continuous-integration/gocd-server/default.nix +++ b/nixos/modules/services/continuous-integration/gocd-server/default.nix @@ -67,33 +67,33 @@ in { }; packages = mkOption { - default = [ pkgs.stdenv pkgs.jre config.programs.ssh.package pkgs.nix ]; + default = [ pkgs.stdenv pkgs.jre pkgs.git config.programs.ssh.package pkgs.nix ]; type = types.listOf types.package; description = '' Packages to add to PATH for the Go.CD server's process. ''; }; - heapSize = mkOption { + initialJavaHeapSize = mkOption { default = "512m"; type = types.str; description = '' - Specifies the java heap memory size for the Go.CD server's java process. + Specifies the initial java heap memory size for the Go.CD server's java process. ''; }; - maxMemory = mkOption { + maxJavaHeapMemory = mkOption { default = "1024m"; type = types.str; description = '' - Specifies the java maximum memory size for the Go.CD server's java process. + Specifies the java maximum heap memory size for the Go.CD server's java process. ''; }; extraOptions = mkOption { default = [ - "-Xms${cfg.heapSize}" - "-Xmx${cfg.maxMemory}" + "-Xms${cfg.initialJavaHeapSize}" + "-Xmx${cfg.maxJavaHeapMemory}" "-Dcruise.listen.host=${cfg.listenAddress}" "-Duser.language=en" "-Djruby.rack.request.size.threshold.bytes=30000000" diff --git a/nixos/modules/services/logging/logstash.nix b/nixos/modules/services/logging/logstash.nix index 2c3016d27df8..62f6e187ea07 100644 --- a/nixos/modules/services/logging/logstash.nix +++ b/nixos/modules/services/logging/logstash.nix @@ -51,12 +51,6 @@ in description = "Logging verbosity level."; }; - watchdogTimeout = mkOption { - type = types.int; - default = 10; - description = "Set watchdog timeout value in seconds."; - }; - filterWorkers = mkOption { type = types.int; default = 1; @@ -140,7 +134,6 @@ in "-w ${toString cfg.filterWorkers} " + ops havePluginPath "--pluginpath ${pluginPath} " + "${verbosityFlag} " + - "--watchdog-timeout ${toString cfg.watchdogTimeout} " + "-f ${writeText "logstash.conf" '' input { ${cfg.inputConfig} diff --git a/nixos/modules/services/mail/rmilter.nix b/nixos/modules/services/mail/rmilter.nix index d1f7cd2e173e..e27b38bc0e2e 100644 --- a/nixos/modules/services/mail/rmilter.nix +++ b/nixos/modules/services/mail/rmilter.nix @@ -75,7 +75,7 @@ in bindUnixSockets = mkOption { type = types.listOf types.str; - default = ["/run/rmilter.sock"]; + default = ["/run/rmilter/rmilter.sock"]; description = '' Unix domain sockets to listen for MTA requests. ''; @@ -114,7 +114,7 @@ in servers = mkOption { type = types.listOf types.str; - default = ["r:/run/rspamd.sock"]; + default = ["r:/run/rspamd/rspamd.sock"]; description = '' Spamd socket definitions. Is server name is prefixed with r: it is rspamd server. @@ -197,7 +197,7 @@ milter_default_action = accept serviceConfig = { ExecStart = "${pkgs.rmilter}/bin/rmilter ${optionalString cfg.debug "-d"} -n -c ${rmilterConfigFile}"; - ExecReload = "/bin/kill -USR1 $MAINPID"; + ExecReload = "${pkgs.coreutils}/bin/kill -USR1 $MAINPID"; User = cfg.user; Group = cfg.group; PermissionsStartOnly = true; @@ -212,10 +212,10 @@ milter_default_action = accept description = "Rmilter service socket"; wantedBy = [ "sockets.target" ]; socketConfig = { - ListenStream = cfg.bindUnixSockets ++ cfg.bindInetSockets; - SocketUser = cfg.user; - SocketGroup = cfg.group; - SocketMode = "0660"; + ListenStream = cfg.bindUnixSockets ++ cfg.bindInetSockets; + SocketUser = cfg.user; + SocketGroup = cfg.group; + SocketMode = "0666"; }; }; diff --git a/nixos/modules/services/mail/rspamd.nix b/nixos/modules/services/mail/rspamd.nix index 412b99ccc570..98489df78517 100644 --- a/nixos/modules/services/mail/rspamd.nix +++ b/nixos/modules/services/mail/rspamd.nix @@ -8,7 +8,7 @@ let mkBindSockets = socks: concatStringsSep "\n" (map (each: " bind_socket = \"${each}\"") socks); - rspamdConf = + rspamdConfFile = pkgs.writeText "rspamd.conf" '' .include "$CONFDIR/common.conf" @@ -18,8 +18,7 @@ let } logging { - type = "file"; - filename = "$LOGDIR/rspamd.log"; + type = "syslog"; .include "$CONFDIR/logging.inc" } @@ -33,7 +32,6 @@ let .include "$CONFDIR/worker-controller.inc" } ''; - rspamdConfFile = pkgs.writeText "rspamd.conf" rspamdConf; in @@ -45,10 +43,7 @@ in services.rspamd = { - enable = mkOption { - default = false; - description = "Whether to run the rspamd daemon."; - }; + enable = mkEnableOption "Whether to run the rspamd daemon."; debug = mkOption { default = false; @@ -58,7 +53,7 @@ in bindSocket = mkOption { type = types.listOf types.str; default = [ - "/run/rspamd.sock mode=0666 owner=${cfg.user}" + "/run/rspamd/rspamd.sock mode=0666 owner=${cfg.user}" ]; description = '' List of sockets to listen, in format acceptable by rspamd @@ -97,7 +92,6 @@ in ''; }; }; - }; @@ -128,18 +122,15 @@ in serviceConfig = { ExecStart = "${pkgs.rspamd}/bin/rspamd ${optionalString cfg.debug "-d"} --user=${cfg.user} --group=${cfg.group} --pid=/run/rspamd.pid -c ${rspamdConfFile} -f"; - RuntimeDirectory = "/var/lib/rspamd"; - PermissionsStartOnly = true; Restart = "always"; + RuntimeDirectory = "rspamd"; + PrivateTmp = true; }; preStart = '' - ${pkgs.coreutils}/bin/mkdir -p /var/{lib,log}/rspamd + ${pkgs.coreutils}/bin/mkdir -p /var/lib/rspamd ${pkgs.coreutils}/bin/chown ${cfg.user}:${cfg.group} /var/lib/rspamd ''; - }; - }; - } diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix index 1a95e2d9367d..bb8dc640f981 100644 --- a/nixos/modules/services/misc/matrix-synapse.nix +++ b/nixos/modules/services/misc/matrix-synapse.nix @@ -522,10 +522,12 @@ in { after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; preStart = '' - mkdir -p /var/lib/matrix-synapse - chmod 700 /var/lib/matrix-synapse - chown -R matrix-synapse:matrix-synapse /var/lib/matrix-synapse - ${cfg.package}/bin/homeserver --config-path ${configFile} --keys-directory /var/lib/matrix-synapse/ --generate-keys + if ! test -e /var/lib/matrix-synapse; then + mkdir -p /var/lib/matrix-synapse + chmod 700 /var/lib/matrix-synapse + chown -R matrix-synapse:matrix-synapse /var/lib/matrix-synapse + ${cfg.package}/bin/homeserver --config-path ${configFile} --keys-directory /var/lib/matrix-synapse/ --generate-keys + fi ''; serviceConfig = { Type = "simple"; diff --git a/nixos/modules/services/monitoring/dd-agent.nix b/nixos/modules/services/monitoring/dd-agent.nix index bd8d9950f77c..a98b0f2f0f85 100644 --- a/nixos/modules/services/monitoring/dd-agent.nix +++ b/nixos/modules/services/monitoring/dd-agent.nix @@ -72,6 +72,7 @@ let postgresqlConfig = pkgs.writeText "postgres.yaml" cfg.postgresqlConfig; nginxConfig = pkgs.writeText "nginx.yaml" cfg.nginxConfig; mongoConfig = pkgs.writeText "mongo.yaml" cfg.mongoConfig; + jmxConfig = pkgs.writeText "jmx.yaml" cfg.jmxConfig; etcfiles = [ { source = ddConf; @@ -94,6 +95,10 @@ let (optional (cfg.mongoConfig != null) { source = mongoConfig; target = "dd-agent/conf.d/mongo.yaml"; + }) ++ + (optional (cfg.jmxConfig != null) + { source = jmxConfig; + target = "dd-agent/conf.d/jmx.yaml"; }); in { @@ -141,6 +146,13 @@ in { default = null; type = types.uniq (types.nullOr types.string); }; + + jmxConfig = mkOption { + description = "JMX integration configuration"; + default = null; + type = types.uniq (types.nullOr types.string); + }; + }; config = mkIf cfg.enable { @@ -167,7 +179,7 @@ in { Restart = "always"; RestartSec = 2; }; - restartTriggers = [ pkgs.dd-agent ddConf diskConfig networkConfig postgresqlConfig nginxConfig mongoConfig ]; + restartTriggers = [ pkgs.dd-agent ddConf diskConfig networkConfig postgresqlConfig nginxConfig mongoConfig jmxConfig ]; }; systemd.services.dogstatsd = { @@ -183,7 +195,21 @@ in { Restart = "always"; RestartSec = 2; }; - restartTriggers = [ pkgs.dd-agent ddConf diskConfig networkConfig postgresqlConfig nginxConfig mongoConfig ]; + restartTriggers = [ pkgs.dd-agent ddConf diskConfig networkConfig postgresqlConfig nginxConfig mongoConfig jmxConfig ]; + }; + + systemd.services.dd-jmxfetch = lib.mkIf (cfg.jmxConfig != null) { + description = "Datadog JMX Fetcher"; + path = [ pkgs."dd-agent" pkgs.python pkgs.sysstat pkgs.procps pkgs.jdk ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = "${pkgs.dd-agent}/bin/dd-jmxfetch"; + User = "datadog"; + Group = "datadog"; + Restart = "always"; + RestartSec = 2; + }; + restartTriggers = [ pkgs.dd-agent ddConf diskConfig networkConfig postgresqlConfig nginxConfig mongoConfig jmxConfig ]; }; environment.etc = etcfiles; diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix index 9221fe155777..138153306dd8 100644 --- a/nixos/modules/services/networking/firewall.nix +++ b/nixos/modules/services/networking/firewall.nix @@ -101,9 +101,22 @@ let # Perform a reverse-path test to refuse spoofers # For now, we just drop, as the raw table doesn't have a log-refuse yet ${optionalString (kernelHasRPFilter && cfg.checkReversePath) '' - if ! ip46tables -A PREROUTING -t raw -m rpfilter --invert -j DROP; then - echo "<2>failed to initialise rpfilter support" >&2 - fi + # Clean up rpfilter rules + ip46tables -t raw -D PREROUTING -j nixos-fw-rpfilter 2> /dev/null || true + ip46tables -t raw -F nixos-fw-rpfilter 2> /dev/null || true + ip46tables -t raw -N nixos-fw-rpfilter 2> /dev/null || true + + ip46tables -t raw -A nixos-fw-rpfilter -m rpfilter -j RETURN + + # Allows this host to act as a DHCPv4 server + iptables -t raw -A nixos-fw-rpfilter -s 0.0.0.0 -d 255.255.255.255 -p udp --sport 68 --dport 67 -j RETURN + + ${optionalString cfg.logReversePathDrops '' + ip46tables -t raw -A nixos-fw-rpfilter -j LOG --log-level info --log-prefix "rpfilter drop: " + ''} + ip46tables -t raw -A nixos-fw-rpfilter -j DROP + + ip46tables -t raw -A PREROUTING -j nixos-fw-rpfilter ''} # Accept all traffic on the trusted interfaces. @@ -188,9 +201,7 @@ let ip46tables -D INPUT -j nixos-fw 2>/dev/null || true ${optionalString (kernelHasRPFilter && cfg.checkReversePath) '' - if ! ip46tables -D PREROUTING -t raw -m rpfilter --invert -j DROP; then - echo "<2>failed to stop rpfilter support" >&2 - fi + ip46tables -t raw -D PREROUTING -j nixos-fw-rpfilter 2>/dev/null || true ''} ${cfg.extraStopCommands} @@ -376,6 +387,16 @@ in ''; }; + networking.firewall.logReversePathDrops = mkOption { + default = false; + type = types.bool; + description = + '' + Logs dropped packets failing the reverse path filter test if + the option networking.firewall.checkReversePath is enabled. + ''; + }; + networking.firewall.connectionTrackingModules = mkOption { default = [ "ftp" ]; example = [ "ftp" "irc" "sane" "sip" "tftp" "amanda" "h323" "netbios_sn" "pptp" "snmp" ]; diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix index 98f4faabba26..b44b03dc0bf3 100644 --- a/nixos/modules/services/networking/syncthing.nix +++ b/nixos/modules/services/networking/syncthing.nix @@ -114,8 +114,8 @@ in environment.systemPackages = [ cfg.package ]; - systemd.services.syncthing = mkIf cfg.systemService - header // { + systemd.services = mkIf cfg.systemService { + syncthing = header // { wantedBy = [ "multi-user.target" ]; serviceConfig = service // { User = cfg.user; @@ -124,6 +124,7 @@ in ExecStart = "${cfg.package}/bin/syncthing -no-browser -home=${cfg.dataDir}"; }; }; + }; systemd.user.services.syncthing = header // { diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix index 9330e6c92ba8..8da0f817ae2a 100644 --- a/nixos/modules/services/networking/tinc.nix +++ b/nixos/modules/services/networking/tinc.nix @@ -157,6 +157,7 @@ in serviceConfig = { Type = "simple"; PIDFile = "/run/tinc.${network}.pid"; + Restart = "on-failure"; }; preStart = '' mkdir -p /etc/tinc/${network}/hosts diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index 541aac1d0ef1..b08070f1e366 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -17,6 +17,7 @@ let else cfg.database.port; poolName = "tt-rss"; + phpfpmSocketName = "/var/run/phpfpm/${poolName}.sock"; virtualHostName = "tt-rss"; tt-rss-config = pkgs.writeText "config.php" '' @@ -448,23 +449,21 @@ let root = "/var/lib/tt-rss"; in mkIf cfg.enable { - services.phpfpm.pools = if cfg.pool == "${poolName}" then { - "${poolName}" = { - listen = "/var/run/phpfpm/${poolName}.sock"; - extraConfig = '' - listen.owner = nginx - listen.group = nginx - listen.mode = 0600 - user = nginx - pm = dynamic - pm.max_children = 75 - pm.start_servers = 10 - pm.min_spare_servers = 5 - pm.max_spare_servers = 20 - pm.max_requests = 500 - catch_workers_output = 1 - ''; - }; + services.phpfpm.poolConfigs = if cfg.pool == "${poolName}" then { + "${poolName}" = '' + listen = "${phpfpmSocketName}"; + listen.owner = nginx + listen.group = nginx + listen.mode = 0600 + user = nginx + pm = dynamic + pm.max_children = 75 + pm.start_servers = 10 + pm.min_spare_servers = 5 + pm.max_spare_servers = 20 + pm.max_requests = 500 + catch_workers_output = 1 + ''; } else {}; # TODO: Re-enable after https://github.com/NixOS/nixpkgs/pull/15862 is merged @@ -486,7 +485,7 @@ let # locations."~ \.php$" = { # extraConfig = '' # fastcgi_split_path_info ^(.+\.php)(/.+)$; - # fastcgi_pass unix:${config.services.phpfpm.pools."${cfg.pool}".listen}; + # fastcgi_pass unix:${phpfpmSocketName}; # fastcgi_index index.php; # fastcgi_param SCRIPT_FILENAME ${root}/$fastcgi_script_name; diff --git a/nixos/modules/services/web-servers/lighttpd/cgit.nix b/nixos/modules/services/web-servers/lighttpd/cgit.nix index c8590e6a54e1..710fecc0c05c 100644 --- a/nixos/modules/services/web-servers/lighttpd/cgit.nix +++ b/nixos/modules/services/web-servers/lighttpd/cgit.nix @@ -63,6 +63,11 @@ in } ''; + systemd.services.lighttpd.preStart = '' + mkdir -p /var/cache/cgit + chown lighttpd:lighttpd /var/cache/cgit + ''; + }; } diff --git a/nixos/modules/services/web-servers/lighttpd/default.nix b/nixos/modules/services/web-servers/lighttpd/default.nix index 171503db4eec..84cd0a4095d9 100644 --- a/nixos/modules/services/web-servers/lighttpd/default.nix +++ b/nixos/modules/services/web-servers/lighttpd/default.nix @@ -224,12 +224,6 @@ in description = "Lighttpd Web Server"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - preStart = '' - ${if cfg.cgit.enable then '' - mkdir -p /var/cache/cgit - chown lighttpd:lighttpd /var/cache/cgit - '' else ""} - ''; serviceConfig.ExecStart = "${pkgs.lighttpd}/sbin/lighttpd -D -f ${configFile}"; # SIGINT => graceful shutdown serviceConfig.KillSignal = "SIGINT"; diff --git a/nixos/modules/services/web-servers/phpfpm/default.nix b/nixos/modules/services/web-servers/phpfpm.nix index 6befddf9f522..2658d7117e37 100644 --- a/nixos/modules/services/web-servers/phpfpm/default.nix +++ b/nixos/modules/services/web-servers/phpfpm.nix @@ -9,12 +9,6 @@ let pidFile = "${stateDir}/phpfpm.pid"; - mkPool = n: p: '' - [${n}] - listen = ${p.listen} - ${p.extraConfig} - ''; - cfgFile = pkgs.writeText "phpfpm.conf" '' [global] pid = ${pidFile} @@ -22,7 +16,7 @@ let daemonize = yes ${cfg.extraConfig} - ${concatStringsSep "\n" (mapAttrsToList mkPool cfg.pools)} + ${concatStringsSep "\n" (mapAttrsToList (n: v: "[${n}]\n${v}") cfg.poolConfigs)} ''; phpIni = pkgs.writeText "php.ini" '' @@ -67,19 +61,33 @@ in { "Options appended to the PHP configuration file <filename>php.ini</filename>."; }; - pools = mkOption { - type = types.attrsOf (types.submodule (import ./pool-options.nix { - inherit lib; - })); + poolConfigs = mkOption { + type = types.attrsOf types.lines; default = {}; + example = literalExample '' + { mypool = ''' + listen = /run/phpfpm/mypool + user = nobody + pm = dynamic + pm.max_children = 75 + pm.start_servers = 10 + pm.min_spare_servers = 5 + pm.max_spare_servers = 20 + pm.max_requests = 500 + '''; + } + ''; description = '' - If no pools are defined, the phpfpm service is disabled. + A mapping between PHP FPM pool names and their configurations. + See the documentation on <literal>php-fpm.conf</literal> for + details on configuration directives. If no pools are defined, + the phpfpm service is disabled. ''; }; }; }; - config = mkIf (cfg.pools != {}) { + config = mkIf (cfg.poolConfigs != {}) { systemd.services.phpfpm = { wantedBy = [ "multi-user.target" ]; diff --git a/nixos/modules/services/web-servers/phpfpm/pool-options.nix b/nixos/modules/services/web-servers/phpfpm/pool-options.nix deleted file mode 100644 index cc688c2c48a2..000000000000 --- a/nixos/modules/services/web-servers/phpfpm/pool-options.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib }: - -with lib; { - - options = { - - listen = mkOption { - type = types.str; - example = "/path/to/unix/socket"; - description = '' - The address on which to accept FastCGI requests. - ''; - }; - - extraConfig = mkOption { - type = types.lines; - example = '' - user = nobody - pm = dynamic - pm.max_children = 75 - pm.start_servers = 10 - pm.min_spare_servers = 5 - pm.max_spare_servers = 20 - pm.max_requests = 500 - ''; - - description = '' - Extra lines that go into the pool configuration. - See the documentation on <literal>php-fpm.conf</literal> for - details on configuration directives. - ''; - }; - }; -} - diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 44c87c0760cb..b3da25448029 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -84,7 +84,7 @@ in { environment.gnome3.packageSet = mkOption { default = null; - example = literalExample "pkgs.gnome3_18"; + example = literalExample "pkgs.gnome3_20"; description = "Which GNOME 3 package set to use."; apply = p: if p == null then pkgs.gnome3 else p; }; diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index 9f9bbe246234..86b98c2b6601 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -148,7 +148,7 @@ in kde5.kde-gtk-config pkgs.phonon-backend-gstreamer - pkgs.kde5.phonon-backend-gstreamer + pkgs.qt5.phonon-backend-gstreamer ] # Plasma 5.5 and later has a Breeze GTK theme. @@ -214,7 +214,7 @@ in services.xserver.displayManager.sddm = { theme = "breeze"; themes = [ - kde5.extra-cmake-modules # for the setup-hook + kde5.ecm # for the setup-hook kde5.plasma-workspace kde5.breeze-icons (kde5.oxygen-icons or kde5.oxygen-icons5) diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix index 94f1aa3add7e..f005decfa33c 100644 --- a/nixos/modules/services/x11/window-managers/default.nix +++ b/nixos/modules/services/x11/window-managers/default.nix @@ -18,6 +18,7 @@ in ./i3.nix ./jwm.nix ./metacity.nix + ./mwm.nix ./openbox.nix ./pekwm.nix ./notion.nix diff --git a/nixos/modules/services/x11/window-managers/mwm.nix b/nixos/modules/services/x11/window-managers/mwm.nix new file mode 100644 index 000000000000..31f7b725f747 --- /dev/null +++ b/nixos/modules/services/x11/window-managers/mwm.nix @@ -0,0 +1,25 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.xserver.windowManager.mwm; +in +{ + ###### interface + options = { + services.xserver.windowManager.mwm.enable = mkEnableOption "mwm"; + }; + + ###### implementation + config = mkIf cfg.enable { + services.xserver.windowManager.session = singleton { + name = "mwm"; + start = '' + ${pkgs.motif}/bin/mwm & + waitPID=$! + ''; + }; + environment.systemPackages = [ pkgs.motif ]; + }; +} diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 35816c3a16dd..e7df2e6b4690 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -14,9 +14,6 @@ let # Map video driver names to driver packages. FIXME: move into card-specific modules. knownVideoDrivers = { virtualbox = { modules = [ kernelPackages.virtualboxGuestAdditions ]; driverName = "vboxvideo"; }; - ati = { modules = with pkgs.xorg; [ xf86videoati glamoregl ]; }; - intel = { modules = with pkgs.xorg; [ xf86videointel glamoregl ]; }; - modesetting = { modules = []; }; }; fontsForXServer = @@ -512,7 +509,7 @@ in XKB_BINDIR = "${xorg.xkbcomp}/bin"; # Needed for the Xkb extension. XORG_DRI_DRIVER_PATH = "/run/opengl-driver/lib/dri"; # !!! Depends on the driver selected at runtime. LD_LIBRARY_PATH = concatStringsSep ":" ( - [ "${xorg.libX11.out}/lib" "${xorg.libXext.out}/lib" ] + [ "${xorg.libX11.out}/lib" "${xorg.libXext.out}/lib" "/run/opengl-driver/lib" ] ++ concatLists (catAttrs "libPath" cfg.drivers)); } // cfg.displayManager.job.environment; diff --git a/nixos/modules/system/etc/setup-etc.pl b/nixos/modules/system/etc/setup-etc.pl index 89a49b972ff9..efda74161ff8 100644 --- a/nixos/modules/system/etc/setup-etc.pl +++ b/nixos/modules/system/etc/setup-etc.pl @@ -22,6 +22,33 @@ sub atomicSymlink { # current configuration. atomicSymlink $etc, $static or die; +# Returns 1 if the argument points to the files in /etc/static. That +# means either argument is a symlink to a file in /etc/static or a +# directory with all children being static. +sub isStatic { + my $path = shift; + + if (-l $path) { + my $target = readlink $path; + return substr($target, 0, length "/etc/static/") eq "/etc/static/"; + } + + if (-d $path) { + opendir DIR, "$path" or return 0; + my @names = readdir DIR or die; + closedir DIR; + + foreach my $name (@names) { + next if $name eq "." || $name eq ".."; + unless (isStatic("$path/$name")) { + return 0; + } + } + return 1; + } + + return 0; +} # Remove dangling symlinks that point to /etc/static. These are # configuration files that existed in a previous configuration but not @@ -63,6 +90,16 @@ sub link { my $target = "/etc/$fn"; File::Path::make_path(dirname $target); $created{$fn} = 1; + + # Rename doesn't work if target is directory. + if (-l $_ && -d $target) { + if (isStatic $target) { + rmtree $target or warn; + } else { + warn "$target directory contains user files. Symlinking may fail."; + } + } + if (-e "$_.mode") { my $mode = read_file("$_.mode"); chomp $mode; if ($mode eq "direct-symlink") { diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index b3870caece0c..d83841452f95 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -6,37 +6,212 @@ let # The container's init script, a small wrapper around the regular # NixOS stage-2 init script. - containerInit = pkgs.writeScript "container-init" - '' - #! ${pkgs.stdenv.shell} -e + containerInit = (cfg: + let + renderExtraVeth = (name: cfg: + '' + echo "Bringing ${name} up" + ip link set dev ${name} up + ${optionalString (cfg . "localAddress" or null != null) '' + echo "Setting ip for ${name}" + ip addr add ${cfg . "localAddress"} dev ${name} + ''} + ${optionalString (cfg . "localAddress6" or null != null) '' + echo "Setting ip6 for ${name}" + ip -6 addr add ${cfg . "localAddress6"} dev ${name} + ''} + ${optionalString (cfg . "hostAddress" or null != null) '' + echo "Setting route to host for ${name}" + ip route add ${cfg . "hostAddress"} dev ${name} + ''} + ${optionalString (cfg . "hostAddress6" or null != null) '' + echo "Setting route6 to host for ${name}" + ip -6 route add ${cfg . "hostAddress6"} dev ${name} + ''} + '' + ); + in + pkgs.writeScript "container-init" + '' + #! ${pkgs.stdenv.shell} -e - # Initialise the container side of the veth pair. - if [ "$PRIVATE_NETWORK" = 1 ]; then + # Initialise the container side of the veth pair. + if [ "$PRIVATE_NETWORK" = 1 ]; then - ip link set host0 name eth0 - ip link set dev eth0 up + ip link set host0 name eth0 + ip link set dev eth0 up - if [ -n "$LOCAL_ADDRESS" ]; then - ip addr add $LOCAL_ADDRESS dev eth0 - fi - if [ -n "$LOCAL_ADDRESS6" ]; then - ip -6 addr add $LOCAL_ADDRESS6 dev eth0 + if [ -n "$LOCAL_ADDRESS" ]; then + ip addr add $LOCAL_ADDRESS dev eth0 + fi + if [ -n "$LOCAL_ADDRESS6" ]; then + ip -6 addr add $LOCAL_ADDRESS6 dev eth0 + fi + if [ -n "$HOST_ADDRESS" ]; then + ip route add $HOST_ADDRESS dev eth0 + ip route add default via $HOST_ADDRESS + fi + if [ -n "$HOST_ADDRESS6" ]; then + ip -6 route add $HOST_ADDRESS6 dev eth0 + ip -6 route add default via $HOST_ADDRESS6 + fi + + ${concatStringsSep "\n" (mapAttrsToList renderExtraVeth cfg . "extraVeths" or {})} + ip a + ip r fi - if [ -n "$HOST_ADDRESS" ]; then - ip route add $HOST_ADDRESS dev eth0 - ip route add default via $HOST_ADDRESS + + # Start the regular stage 1 script. + exec "$1" + '' + ); + + nspawnExtraVethArgs = (name: cfg: "--network-veth-extra=${name}"); + startScript = (cfg: + '' + mkdir -p -m 0755 "$root/etc" "$root/var/lib" + mkdir -p -m 0700 "$root/var/lib/private" "$root/root" /run/containers + if ! [ -e "$root/etc/os-release" ]; then + touch "$root/etc/os-release" + fi + + if ! [ -e "$root/etc/machine-id" ]; then + touch "$root/etc/machine-id" + fi + + mkdir -p -m 0755 \ + "/nix/var/nix/profiles/per-container/$INSTANCE" \ + "/nix/var/nix/gcroots/per-container/$INSTANCE" + + cp --remove-destination /etc/resolv.conf "$root/etc/resolv.conf" + + if [ "$PRIVATE_NETWORK" = 1 ]; then + extraFlags+=" --network-veth" + if [ -n "$HOST_BRIDGE" ]; then + extraFlags+=" --network-bridge=$HOST_BRIDGE" fi - if [ -n "$HOST_ADDRESS6" ]; then - ip -6 route add $HOST_ADDRESS6 dev eth0 - ip -6 route add default via $HOST_ADDRESS6 + fi + + ${if cfg . "extraVeths" or null != null then + ''extraFlags+=" ${concatStringsSep " " (mapAttrsToList nspawnExtraVethArgs cfg . "extraVeths" or {})}"'' + else + ''# No extra veth pairs to create'' + } + + for iface in $INTERFACES; do + extraFlags+=" --network-interface=$iface" + done + + for iface in $MACVLANS; do + extraFlags+=" --network-macvlan=$iface" + done + + # If the host is 64-bit and the container is 32-bit, add a + # --personality flag. + ${optionalString (config.nixpkgs.system == "x86_64-linux") '' + if [ "$(< ''${SYSTEM_PATH:-/nix/var/nix/profiles/per-container/$INSTANCE/system}/system)" = i686-linux ]; then + extraFlags+=" --personality=x86" fi + ''} + + # Run systemd-nspawn without startup notification (we'll + # wait for the container systemd to signal readiness). + EXIT_ON_REBOOT=1 \ + exec ${config.systemd.package}/bin/systemd-nspawn \ + --keep-unit \ + -M "$INSTANCE" -D "$root" $extraFlags \ + $EXTRA_NSPAWN_FLAGS \ + --notify-ready=yes \ + --bind-ro=/nix/store \ + --bind-ro=/nix/var/nix/db \ + --bind-ro=/nix/var/nix/daemon-socket \ + --bind="/nix/var/nix/profiles/per-container/$INSTANCE:/nix/var/nix/profiles" \ + --bind="/nix/var/nix/gcroots/per-container/$INSTANCE:/nix/var/nix/gcroots" \ + --setenv PRIVATE_NETWORK="$PRIVATE_NETWORK" \ + --setenv HOST_BRIDGE="$HOST_BRIDGE" \ + --setenv HOST_ADDRESS="$HOST_ADDRESS" \ + --setenv LOCAL_ADDRESS="$LOCAL_ADDRESS" \ + --setenv HOST_ADDRESS6="$HOST_ADDRESS6" \ + --setenv LOCAL_ADDRESS6="$LOCAL_ADDRESS6" \ + --setenv PATH="$PATH" \ + ${containerInit cfg} "''${SYSTEM_PATH:-/nix/var/nix/profiles/system}/init" + '' + ); + + preStartScript = (cfg: + '' + # Clean up existing machined registration and interfaces. + machinectl terminate "$INSTANCE" 2> /dev/null || true + + if [ "$PRIVATE_NETWORK" = 1 ]; then + ip link del dev "ve-$INSTANCE" 2> /dev/null || true + ip link del dev "vb-$INSTANCE" 2> /dev/null || true fi - # Start the regular stage 1 script, passing the bind-mounted - # notification socket from the host to allow the container - # systemd to signal readiness to the host systemd. - NOTIFY_SOCKET=/var/lib/private/host-notify exec "$1" - ''; + ${concatStringsSep "\n" ( + mapAttrsToList (name: cfg: + ''ip link del dev ${name} 2> /dev/null || true '' + ) cfg . "extraVeths" or {} + )} + '' + ); + postStartScript = (cfg: + let + ipcall = (cfg: ipcmd: variable: attribute: + if cfg . attribute or null == null then + '' + if [ -n "${variable}" ]; then + ${ipcmd} add ${variable} dev $ifaceHost + fi + '' + else + ''${ipcmd} add ${cfg . attribute} dev $ifaceHost'' + ); + renderExtraVeth = (name: cfg: + if cfg . "hostBridge" or null != null then + '' + # Add ${name} to bridge ${cfg.hostBridge} + ip link set dev ${name} master ${cfg.hostBridge} up + '' + else + '' + # Set IPs and routes for ${name} + ${optionalString (cfg . "hostAddress" or null != null) '' + ip addr add ${cfg . "hostAddress"} dev ${name} + ''} + ${optionalString (cfg . "hostAddress6" or null != null) '' + ip -6 addr add ${cfg . "hostAddress6"} dev ${name} + ''} + ${optionalString (cfg . "localAddress" or null != null) '' + ip route add ${cfg . "localAddress"} dev ${name} + ''} + ${optionalString (cfg . "localAddress6" or null != null) '' + ip -6 route add ${cfg . "localAddress6"} dev ${name} + ''} + '' + ); + in + '' + if [ "$PRIVATE_NETWORK" = 1 ]; then + if [ -z "$HOST_BRIDGE" ]; then + ifaceHost=ve-$INSTANCE + ip link set dev $ifaceHost up + + ${ipcall cfg "ip addr" "$HOST_ADDRESS" "hostAddress"} + ${ipcall cfg "ip -6 addr" "$HOST_ADDRESS6" "hostAddress6"} + ${ipcall cfg "ip route" "$LOCAL_ADDRESS" "localAddress"} + ${ipcall cfg "ip -6 route" "$LOCAL_ADDRESS6" "localAddress6"} + fi + ${concatStringsSep "\n" (mapAttrsToList renderExtraVeth cfg . "extraVeths" or {})} + fi + + # Get the leader PID so that we can signal it in + # preStop. We can't use machinectl there because D-Bus + # might be shutting down. FIXME: in systemd 219 we can + # just signal systemd-nspawn to do a clean shutdown. + machinectl show "$INSTANCE" | sed 's/Leader=\(.*\)/\1/;t;d' > "/run/containers/$INSTANCE.pid" + '' + ); system = config.nixpkgs.system; @@ -75,6 +250,63 @@ let mkBindFlags = bs: concatMapStrings mkBindFlag (lib.attrValues bs); + networkOptions = { + hostBridge = mkOption { + type = types.nullOr types.string; + default = null; + example = "br0"; + description = '' + Put the host-side of the veth-pair into the named bridge. + Only one of hostAddress* or hostBridge can be given. + ''; + }; + + hostAddress = mkOption { + type = types.nullOr types.str; + default = null; + example = "10.231.136.1"; + description = '' + The IPv4 address assigned to the host interface. + (Not used when hostBridge is set.) + ''; + }; + + hostAddress6 = mkOption { + type = types.nullOr types.string; + default = null; + example = "fc00::1"; + description = '' + The IPv6 address assigned to the host interface. + (Not used when hostBridge is set.) + ''; + }; + + localAddress = mkOption { + type = types.nullOr types.str; + default = null; + example = "10.231.136.2"; + description = '' + The IPv4 address assigned to the interface in the container. + If a hostBridge is used, this should be given with netmask to access + the whole network. Otherwise the default netmask is /32 and routing is + set up from localAddress to hostAddress and back. + ''; + }; + + localAddress6 = mkOption { + type = types.nullOr types.string; + default = null; + example = "fc00::2"; + description = '' + The IPv6 address assigned to the interface in the container. + If a hostBridge is used, this should be given with netmask to access + the whole network. Otherwise the default netmask is /128 and routing is + set up from localAddress6 to hostAddress6 and back. + ''; + }; + + }; + in { @@ -135,56 +367,6 @@ in ''; }; - hostBridge = mkOption { - type = types.nullOr types.string; - default = null; - example = "br0"; - description = '' - Put the host-side of the veth-pair into the named bridge. - Only one of hostAddress* or hostBridge can be given. - ''; - }; - - hostAddress = mkOption { - type = types.nullOr types.str; - default = null; - example = "10.231.136.1"; - description = '' - The IPv4 address assigned to the host interface. - (Not used when hostBridge is set.) - ''; - }; - - hostAddress6 = mkOption { - type = types.nullOr types.string; - default = null; - example = "fc00::1"; - description = '' - The IPv6 address assigned to the host interface. - (Not used when hostBridge is set.) - ''; - }; - - localAddress = mkOption { - type = types.nullOr types.str; - default = null; - example = "10.231.136.2"; - description = '' - The IPv4 address assigned to <literal>eth0</literal> - in the container. - ''; - }; - - localAddress6 = mkOption { - type = types.nullOr types.string; - default = null; - example = "fc00::2"; - description = '' - The IPv6 address assigned to <literal>eth0</literal> - in the container. - ''; - }; - interfaces = mkOption { type = types.listOf types.string; default = []; @@ -194,6 +376,15 @@ in ''; }; + extraVeths = mkOption { + type = types.attrsOf types.optionSet; + default = {}; + options = networkOptions; + description = '' + Extra veth-pairs to be created for the container + ''; + }; + autoStart = mkOption { type = types.bool; default = false; @@ -216,7 +407,7 @@ in ''; }; - }; + } // networkOptions; config = mkMerge [ (mkIf options.config.isDefined { @@ -274,110 +465,11 @@ in environment.INSTANCE = "%i"; environment.root = "/var/lib/containers/%i"; - preStart = - '' - # Clean up existing machined registration and interfaces. - machinectl terminate "$INSTANCE" 2> /dev/null || true - - if [ "$PRIVATE_NETWORK" = 1 ]; then - ip link del dev "ve-$INSTANCE" 2> /dev/null || true - ip link del dev "vb-$INSTANCE" 2> /dev/null || true - fi - ''; - - script = - '' - mkdir -p -m 0755 "$root/etc" "$root/var/lib" - mkdir -p -m 0700 "$root/var/lib/private" "$root/root" /run/containers - if ! [ -e "$root/etc/os-release" ]; then - touch "$root/etc/os-release" - fi - - if ! [ -e "$root/etc/machine-id" ]; then - touch "$root/etc/machine-id" - fi - - mkdir -p -m 0755 \ - "/nix/var/nix/profiles/per-container/$INSTANCE" \ - "/nix/var/nix/gcroots/per-container/$INSTANCE" - - cp --remove-destination /etc/resolv.conf "$root/etc/resolv.conf" - - if [ "$PRIVATE_NETWORK" = 1 ]; then - extraFlags+=" --network-veth" - if [ -n "$HOST_BRIDGE" ]; then - extraFlags+=" --network-bridge=$HOST_BRIDGE" - fi - fi + preStart = preStartScript {}; - for iface in $INTERFACES; do - extraFlags+=" --network-interface=$iface" - done + script = startScript {}; - for iface in $MACVLANS; do - extraFlags+=" --network-macvlan=$iface" - done - - # If the host is 64-bit and the container is 32-bit, add a - # --personality flag. - ${optionalString (config.nixpkgs.system == "x86_64-linux") '' - if [ "$(< ''${SYSTEM_PATH:-/nix/var/nix/profiles/per-container/$INSTANCE/system}/system)" = i686-linux ]; then - extraFlags+=" --personality=x86" - fi - ''} - - rm -f $root/var/lib/private/host-notify - - # Run systemd-nspawn without startup notification (we'll - # wait for the container systemd to signal readiness). - EXIT_ON_REBOOT=1 NOTIFY_SOCKET= \ - exec ${config.systemd.package}/bin/systemd-nspawn \ - --keep-unit \ - -M "$INSTANCE" -D "$root" $extraFlags \ - $EXTRA_NSPAWN_FLAGS \ - --bind-ro=/nix/store \ - --bind-ro=/nix/var/nix/db \ - --bind-ro=/nix/var/nix/daemon-socket \ - --bind=/run/systemd/notify:/var/lib/private/host-notify \ - --bind="/nix/var/nix/profiles/per-container/$INSTANCE:/nix/var/nix/profiles" \ - --bind="/nix/var/nix/gcroots/per-container/$INSTANCE:/nix/var/nix/gcroots" \ - --setenv PRIVATE_NETWORK="$PRIVATE_NETWORK" \ - --setenv HOST_BRIDGE="$HOST_BRIDGE" \ - --setenv HOST_ADDRESS="$HOST_ADDRESS" \ - --setenv LOCAL_ADDRESS="$LOCAL_ADDRESS" \ - --setenv HOST_ADDRESS6="$HOST_ADDRESS6" \ - --setenv LOCAL_ADDRESS6="$LOCAL_ADDRESS6" \ - --setenv PATH="$PATH" \ - ${containerInit} "''${SYSTEM_PATH:-/nix/var/nix/profiles/system}/init" - ''; - - postStart = - '' - if [ "$PRIVATE_NETWORK" = 1 ]; then - if [ -z "$HOST_BRIDGE" ]; then - ifaceHost=ve-$INSTANCE - ip link set dev $ifaceHost up - if [ -n "$HOST_ADDRESS" ]; then - ip addr add $HOST_ADDRESS dev $ifaceHost - fi - if [ -n "$HOST_ADDRESS6" ]; then - ip -6 addr add $HOST_ADDRESS6 dev $ifaceHost - fi - if [ -n "$LOCAL_ADDRESS" ]; then - ip route add $LOCAL_ADDRESS dev $ifaceHost - fi - if [ -n "$LOCAL_ADDRESS6" ]; then - ip -6 route add $LOCAL_ADDRESS6 dev $ifaceHost - fi - fi - fi - - # Get the leader PID so that we can signal it in - # preStop. We can't use machinectl there because D-Bus - # might be shutting down. FIXME: in systemd 219 we can - # just signal systemd-nspawn to do a clean shutdown. - machinectl show "$INSTANCE" | sed 's/Leader=\(.*\)/\1/;t;d' > "/run/containers/$INSTANCE.pid" - ''; + postStart = postStartScript {}; preStop = '' @@ -404,8 +496,6 @@ in Type = "notify"; - NotifyAccess = "all"; - # Note that on reboot, systemd-nspawn returns 133, so this # unit will be restarted. On poweroff, it returns 0, so the # unit won't be restarted. @@ -421,6 +511,8 @@ in # after the timeout). So send an ignored signal. KillMode = "mixed"; KillSignal = "WINCH"; + + DevicePolicy = "closed"; }; }; in { @@ -429,15 +521,20 @@ in [{ name = "container@"; value = unit; }] # declarative containers ++ (mapAttrsToList (name: cfg: nameValuePair "container@${name}" ( + unit // { + preStart = preStartScript cfg; + script = startScript cfg; + postStart = postStartScript cfg; + } // ( if cfg.autoStart then - unit // { + { wantedBy = [ "multi-user.target" ]; wants = [ "network.target" ]; after = [ "network.target" ]; restartTriggers = [ cfg.path ]; reloadIfChanged = true; } - else null + else {}) )) config.containers) )); @@ -466,11 +563,11 @@ in LOCAL_ADDRESS6=${cfg.localAddress6} ''} ''} - INTERFACES="${toString cfg.interfaces}" - ${optionalString cfg.autoStart '' - AUTO_START=1 - ''} - EXTRA_NSPAWN_FLAGS="${mkBindFlags cfg.bindMounts}" + INTERFACES="${toString cfg.interfaces}" + ${optionalString cfg.autoStart '' + AUTO_START=1 + ''} + EXTRA_NSPAWN_FLAGS="${mkBindFlags cfg.bindMounts}" ''; }) config.containers; diff --git a/nixos/release.nix b/nixos/release.nix index 273c3e21a10d..68f06a832980 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -95,6 +95,7 @@ in rec { channel = import lib/make-channel.nix { inherit pkgs nixpkgs version versionSuffix; }; manual = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.manual); + manualEpub = (buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.manualEpub)); manualPDF = (buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.manualPDF)).x86_64-linux; manpages = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.manpages); options = (buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.optionsJSON)).x86_64-linux; @@ -217,6 +218,7 @@ in rec { tests.containers-ipv6 = callTest tests/containers-ipv6.nix {}; tests.containers-bridge = callTest tests/containers-bridge.nix {}; tests.containers-imperative = callTest tests/containers-imperative.nix {}; + tests.containers-extra_veth = callTest tests/containers-extra_veth.nix {}; tests.docker = hydraJob (import tests/docker.nix { system = "x86_64-linux"; }); tests.dockerRegistry = hydraJob (import tests/docker-registry.nix { system = "x86_64-linux"; }); tests.dnscrypt-proxy = callTest tests/dnscrypt-proxy.nix { system = "x86_64-linux"; }; diff --git a/nixos/tests/containers-bridge.nix b/nixos/tests/containers-bridge.nix index 8c3340b60a7c..bb32d852a6f5 100644 --- a/nixos/tests/containers-bridge.nix +++ b/nixos/tests/containers-bridge.nix @@ -10,7 +10,7 @@ in import ./make-test.nix ({ pkgs, ...} : { name = "containers-bridge"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ aristid aszlig eelco chaoflow ]; + maintainers = [ aristid aszlig eelco chaoflow kampfschlaefer ]; }; machine = diff --git a/nixos/tests/containers-extra_veth.nix b/nixos/tests/containers-extra_veth.nix new file mode 100644 index 000000000000..2a54b1d961c8 --- /dev/null +++ b/nixos/tests/containers-extra_veth.nix @@ -0,0 +1,103 @@ +# Test for NixOS' container support. + +import ./make-test.nix ({ pkgs, ...} : { + name = "containers-bridge"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ kampfschlaefer ]; + }; + + machine = + { config, pkgs, ... }: + { imports = [ ../modules/installer/cd-dvd/channel.nix ]; + virtualisation.writableStore = true; + virtualisation.memorySize = 768; + virtualisation.vlans = []; + + networking.bridges = { + br0 = { + interfaces = []; + }; + br1 = { interfaces = []; }; + }; + networking.interfaces = { + br0 = { + ip4 = [{ address = "192.168.0.1"; prefixLength = 24; }]; + ip6 = [{ address = "fc00::1"; prefixLength = 7; }]; + }; + br1 = { + ip4 = [{ address = "192.168.1.1"; prefixLength = 24; }]; + }; + }; + + containers.webserver = + { + autoStart = true; + privateNetwork = true; + hostBridge = "br0"; + localAddress = "192.168.0.100/24"; + localAddress6 = "fc00::2/7"; + extraVeths = { + veth1 = { hostBridge = "br1"; localAddress = "192.168.1.100/24"; }; + veth2 = { hostAddress = "192.168.2.1"; localAddress = "192.168.2.100"; }; + }; + config = + { + networking.firewall.allowedTCPPorts = [ 80 ]; + networking.firewall.allowPing = true; + }; + }; + + virtualisation.pathsInNixDB = [ pkgs.stdenv ]; + }; + + testScript = + '' + $machine->waitForUnit("default.target"); + $machine->succeed("nixos-container list") =~ /webserver/ or die; + + # Status of the webserver container. + $machine->succeed("nixos-container status webserver") =~ /up/ or die; + + # Debug + #$machine->succeed("nixos-container run webserver -- ip link >&2"); + + # Ensure that the veths are inside the container + $machine->succeed("nixos-container run webserver -- ip link show veth1") =~ /state UP/ or die; + $machine->succeed("nixos-container run webserver -- ip link show veth2") =~ /state UP/ or die; + + # Debug + #$machine->succeed("ip link >&2"); + + # Ensure the presence of the extra veths + $machine->succeed("ip link show veth1") =~ /state UP/ or die; + $machine->succeed("ip link show veth2") =~ /state UP/ or die; + + # Ensure the veth1 is part of br1 on the host + $machine->succeed("ip link show veth1") =~ /master br1/ or die; + + # Debug + #$machine->succeed("ip -4 a >&2"); + #$machine->succeed("ip -4 r >&2"); + #$machine->succeed("nixos-container run webserver -- ip link >&2"); + #$machine->succeed("nixos-container run webserver -- ip -4 a >&2"); + #$machine->succeed("nixos-container run webserver -- ip -4 r >&2"); + + # Ping on main veth + $machine->succeed("ping -n -c 1 192.168.0.100"); + $machine->succeed("ping6 -n -c 1 fc00::2"); + + # Ping on the first extra veth + $machine->succeed("ping -n -c 1 192.168.1.100 >&2"); + + # Ping on the second extra veth + $machine->succeed("ping -n -c 1 192.168.2.100 >&2"); + + # Stop the container. + $machine->succeed("nixos-container stop webserver"); + $machine->fail("ping -n -c 1 192.168.1.100 >&2"); + $machine->fail("ping -n -c 1 192.168.2.100 >&2"); + + # Destroying a declarative container should fail. + $machine->fail("nixos-container destroy webserver"); + ''; +}) diff --git a/nixos/tests/containers-imperative.nix b/nixos/tests/containers-imperative.nix index 89babdcc4761..7e2a54976387 100644 --- a/nixos/tests/containers-imperative.nix +++ b/nixos/tests/containers-imperative.nix @@ -3,7 +3,7 @@ import ./make-test.nix ({ pkgs, ...} : { name = "containers-imperative"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ aristid aszlig eelco chaoflow ]; + maintainers = [ aristid aszlig eelco chaoflow kampfschlaefer ]; }; machine = diff --git a/nixos/tests/containers-ipv4.nix b/nixos/tests/containers-ipv4.nix index 8f1ab40221a8..31d05990a679 100644 --- a/nixos/tests/containers-ipv4.nix +++ b/nixos/tests/containers-ipv4.nix @@ -3,7 +3,7 @@ import ./make-test.nix ({ pkgs, ...} : { name = "containers-ipv4"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ aristid aszlig eelco chaoflow ]; + maintainers = [ aristid aszlig eelco chaoflow kampfschlaefer ]; }; machine = diff --git a/nixos/tests/containers-ipv6.nix b/nixos/tests/containers-ipv6.nix index 0c1b8e88564d..320465ebb95b 100644 --- a/nixos/tests/containers-ipv6.nix +++ b/nixos/tests/containers-ipv6.nix @@ -8,7 +8,7 @@ in import ./make-test.nix ({ pkgs, ...} : { name = "containers-ipv6"; meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ aristid aszlig eelco chaoflow ]; + maintainers = [ aristid aszlig eelco chaoflow kampfschlaefer ]; }; machine = diff --git a/nixos/tests/gnome3_18-gdm.nix b/nixos/tests/gnome3_18-gdm.nix deleted file mode 100644 index 8b1e9afedfb9..000000000000 --- a/nixos/tests/gnome3_18-gdm.nix +++ /dev/null @@ -1,41 +0,0 @@ -import ./make-test.nix ({ pkgs, ...} : { - name = "gnome3-gdm"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ lethalman ]; - }; - - machine = - { config, pkgs, ... }: - - { imports = [ ./common/user-account.nix ]; - - services.xserver.enable = true; - - services.xserver.displayManager.gdm = { - enable = true; - autoLogin = { - enable = true; - user = "alice"; - }; - }; - services.xserver.desktopManager.gnome3.enable = true; - environment.gnome3.packageSet = pkgs.gnome3_20; - - virtualisation.memorySize = 512; - }; - - testScript = - '' - $machine->waitForX; - $machine->sleep(15); - - # Check that logging in has given the user ownership of devices. - $machine->succeed("getfacl /dev/snd/timer | grep -q alice"); - - $machine->succeed("su - alice -c 'DISPLAY=:0.0 gnome-terminal &'"); - $machine->succeed("xauth merge ~alice/.Xauthority"); - $machine->waitForWindow(qr/Terminal/); - $machine->sleep(20); - $machine->screenshot("screen"); - ''; -}) diff --git a/nixos/tests/gnome3_18.nix b/nixos/tests/gnome3_18.nix deleted file mode 100644 index 2c88e6abe890..000000000000 --- a/nixos/tests/gnome3_18.nix +++ /dev/null @@ -1,38 +0,0 @@ -import ./make-test.nix ({ pkgs, ...} : { - name = "gnome3"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ domenkozar eelco chaoflow lethalman ]; - }; - - machine = - { config, pkgs, ... }: - - { imports = [ ./common/user-account.nix ]; - - services.xserver.enable = true; - - services.xserver.displayManager.auto.enable = true; - services.xserver.displayManager.auto.user = "alice"; - services.xserver.desktopManager.gnome3.enable = true; - - environment.gnome3.packageSet = pkgs.gnome3_18; - - virtualisation.memorySize = 512; - }; - - testScript = - '' - $machine->waitForX; - $machine->sleep(15); - - # Check that logging in has given the user ownership of devices. - $machine->succeed("getfacl /dev/snd/timer | grep -q alice"); - - $machine->succeed("su - alice -c 'DISPLAY=:0.0 gnome-terminal &'"); - $machine->succeed("xauth merge ~alice/.Xauthority"); - $machine->waitForWindow(qr/Terminal/); - $machine->mustSucceed("timeout 900 bash -c 'journalctl -f|grep -m 1 \"GNOME Shell started\"'"); - $machine->sleep(10); - $machine->screenshot("screen"); - ''; -}) diff --git a/pkgs/applications/audio/CharacterCompressor/default.nix b/pkgs/applications/audio/CharacterCompressor/default.nix index 5c28de3c60a7..8e50a6f1744d 100644 --- a/pkgs/applications/audio/CharacterCompressor/default.nix +++ b/pkgs/applications/audio/CharacterCompressor/default.nix @@ -1,27 +1,31 @@ { stdenv, fetchFromGitHub, faust2jaqt, faust2lv2gui }: stdenv.mkDerivation rec { name = "CharacterCompressor-${version}"; - version = "0.2"; + version = "0.3.1"; src = fetchFromGitHub { owner = "magnetophon"; repo = "CharacterCompressor"; - rev = "v${version}"; - sha256 = "0fvi8m4nshcxypn4jgxhnh7pxp68wshhav3k8wn3il7qpw71pdxi"; + rev = "V${version}"; + sha256 = "0ci27v5k10prsmcd0g6q5vhr31mz8hsmrsdk436vfbcv3s108rcc"; }; buildInputs = [ faust2jaqt faust2lv2gui ]; buildPhase = '' - faust2jaqt -t 99999 CharacterCompressor.dsp - faust2lv2 -gui -t 99999 CharacterCompressor.dsp + faust2jaqt -vec -time -t 99999 CharacterCompressor.dsp + faust2lv2 -vec -time -gui -t 99999 CharacterCompressor.dsp + faust2jaqt -vec -time -t 99999 CharacterCompressorMono.dsp + faust2lv2 -vec -time -gui -t 99999 CharacterCompressorMono.dsp ''; installPhase = '' mkdir -p $out/bin cp CharacterCompressor $out/bin/ + cp CharacterCompressorMono $out/bin/ mkdir -p $out/lib/lv2 cp -r CharacterCompressor.lv2/ $out/lib/lv2 + cp -r CharacterCompressorMono.lv2/ $out/lib/lv2 ''; meta = { diff --git a/pkgs/applications/audio/faust/faust1.nix b/pkgs/applications/audio/faust/faust1.nix index 20ba1c14745a..8749497c8baf 100644 --- a/pkgs/applications/audio/faust/faust1.nix +++ b/pkgs/applications/audio/faust/faust1.nix @@ -170,8 +170,8 @@ let --set FAUST_LIB_PATH "${faust}/lib/faust" \ --prefix PATH : "$PATH" \ --prefix PKG_CONFIG_PATH : "$PKG_CONFIG_PATH" \ - --set NIX_CFLAGS_COMPILE "\"$NIX_CFLAGS_COMPILE\"" \ - --set NIX_LDFLAGS "\"$NIX_LDFLAGS\"" + --set NIX_CFLAGS_COMPILE "$NIX_CFLAGS_COMPILE" \ + --set NIX_LDFLAGS "$NIX_LDFLAGS" done ''; }); diff --git a/pkgs/applications/audio/faust/faust1git.nix b/pkgs/applications/audio/faust/faust1git.nix index 21c8a9a34c56..94e58f224283 100644 --- a/pkgs/applications/audio/faust/faust1git.nix +++ b/pkgs/applications/audio/faust/faust1git.nix @@ -9,12 +9,12 @@ with stdenv.lib.strings; let - version = "2016-04-27"; + version = "2016-07-19"; src = fetchgit { url = "git://git.code.sf.net/p/faudiostream/code"; - rev = "931fca3e649f99ef09025d37bd6a7dc70a03e6f6"; - sha256 = "1h2qfwxqf9406v0w6kqyxlzn88zw3xmwgxg9f01n4jvd72zxll78"; + rev = "16c22dc0193c10521b1dc16f98443d9c206bb5dd"; + sha256 = "01rbcjfhpd5casi72ffi1j95f65ji60l629sgav93pvs0kpdacz5"; }; meta = with stdenv.lib; { @@ -175,8 +175,8 @@ let --set FAUSTINC "${faust}/include/faust" \ --prefix PATH : "$PATH" \ --prefix PKG_CONFIG_PATH : "$PKG_CONFIG_PATH" \ - --set NIX_CFLAGS_COMPILE "\"$NIX_CFLAGS_COMPILE\"" \ - --set NIX_LDFLAGS "\"$NIX_LDFLAGS\"" + --set NIX_CFLAGS_COMPILE "$NIX_CFLAGS_COMPILE" \ + --set NIX_LDFLAGS "$NIX_LDFLAGS" done ''; }); diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index 3953eb2b7e05..24cab4cdbcd1 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/applications/audio/faust/faust2.nix @@ -196,8 +196,8 @@ let --set FAUST_LIB_PATH "${faust}/lib/faust" \ --prefix PATH : "$PATH" \ --prefix PKG_CONFIG_PATH : "$PKG_CONFIG_PATH" \ - --set NIX_CFLAGS_COMPILE "\"$NIX_CFLAGS_COMPILE\"" \ - --set NIX_LDFLAGS "\"$NIX_LDFLAGS\"" + --set NIX_CFLAGS_COMPILE "$NIX_CFLAGS_COMPILE" \ + --set NIX_LDFLAGS "$NIX_LDFLAGS" done ''; }); diff --git a/pkgs/applications/audio/mopidy-musicbox-webclient/default.nix b/pkgs/applications/audio/mopidy-musicbox-webclient/default.nix index 53fb4d6c2f77..d2f525bffd1d 100644 --- a/pkgs/applications/audio/mopidy-musicbox-webclient/default.nix +++ b/pkgs/applications/audio/mopidy-musicbox-webclient/default.nix @@ -3,13 +3,13 @@ pythonPackages.buildPythonApplication rec { name = "mopidy-musicbox-webclient-${version}"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "pimusicbox"; repo = "mopidy-musicbox-webclient"; rev = "v${version}"; - sha256 = "0v09wy40ipl0b0dpgmcdl15c5g732c9jl7zipm4sy4pr8xiy6baa"; + sha256 = "1jcfrwsi7axiph3jplqzmcqia9pc46xb2yf13d8h6lnh3h49rwvz"; }; propagatedBuildInputs = [ mopidy ]; diff --git a/pkgs/applications/audio/plugin-torture/default.nix b/pkgs/applications/audio/plugin-torture/default.nix index e4fb83439e0d..556582c34f79 100644 --- a/pkgs/applications/audio/plugin-torture/default.nix +++ b/pkgs/applications/audio/plugin-torture/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "plugin-torture-${version}"; - version = "5"; + version = "2016-07-25"; src = fetchFromGitHub { owner = "cth103"; repo = "plugin-torture"; - rev = "v${version}"; - sha256 = "1mlgxjsyaz86wm4k32ll2w5nghjffnsdqlm6kjv02a4dpb2bfrih"; + rev = "8b9c43197dca372da6b9c8212224ec86b5f16b4a"; + sha256 = "1xyhvhm85d9z0kw716cjllrrzksn4s4bw34layg8hf4m5m31sp2p"; }; buildInputs = [ boost ladspaH lilv lv2 pkgconfig serd sord sratom ]; diff --git a/pkgs/applications/audio/rhythmbox/default.nix b/pkgs/applications/audio/rhythmbox/default.nix new file mode 100644 index 000000000000..e8bea3ec71c0 --- /dev/null +++ b/pkgs/applications/audio/rhythmbox/default.nix @@ -0,0 +1,62 @@ +{ stdenv, fetchurl, pkgconfig +, python3 +, perl +, perlPackages +, gtk3 +, intltool +, libsoup +, gnome3 +, tdb +, json_glib +, itstool +, wrapGAppsHook +, gst_all_1 +, gst_plugins ? with gst_all_1; [ gst-plugins-good gst-plugins-ugly ] +}: +let + version = "${major}.${minor}"; + major = "3.2"; + minor = "1"; + +in stdenv.mkDerivation rec { + name = "rhythmbox-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/rhythmbox/${major}/${name}.tar.xz"; + sha256 = "0f3radhlji7rxl760yl2vm49fvfslympxrpm8497acbmbd7wlhxz"; + }; + + buildInputs = [ + pkgconfig + + python3 + perl + perlPackages.XMLParser + + intltool + libsoup + tdb + json_glib + itstool + + gtk3 + gnome3.libpeas + gnome3.totem-pl-parser + gnome3.defaultIconTheme + + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + + wrapGAppsHook + ] ++ gst_plugins; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Rhythmbox; + description = "A music playing application for GNOME"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.rasendubi ]; + }; +} diff --git a/pkgs/applications/backup/crashplan/default.nix b/pkgs/applications/backup/crashplan/default.nix index 0ba09c5a4f59..b6c658636bb2 100644 --- a/pkgs/applications/backup/crashplan/default.nix +++ b/pkgs/applications/backup/crashplan/default.nix @@ -2,14 +2,14 @@ let version = "4.7.0"; - rev = "1"; #tracks unversioned changes that occur on download.code42.com from time to time + rev = "2"; #tracks unversioned changes that occur on download.code42.com from time to time in stdenv.mkDerivation rec { name = "crashplan-${version}-r${rev}"; crashPlanArchive = fetchurl { url = "https://download.code42.com/installs/linux/install/CrashPlan/CrashPlan_${version}_Linux.tgz"; - sha256 = "1r50fyswvqjxsdslbyibbxwz2fs8iim15hxr0k05jrzmkhjm4g5v"; + sha256 = "1vi6dqf8kc90axrgdcf6rwnhynxgxkc0qn6pbdp2gvkxdqxrprn8"; }; srcs = [ crashPlanArchive ]; diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index 1f250280b100..c871e6d6e8b8 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -171,12 +171,12 @@ rec { checkstyle = buildEclipseUpdateSite rec { name = "checkstyle-${version}"; - version = "6.19.0.201606092149"; + version = "6.19.1.201607051943"; src = fetchzip { stripRoot = false; - url = "mirror://sourceforge/project/eclipse-cs/Eclipse%20Checkstyle%20Plug-in/6.19.0/net.sf.eclipsecs-updatesite_${version}.zip"; - sha256 = "0d066fihvdkisic0lsdvh947yd2v20xc8h4aknfcyg2mq3xzi0x7"; + url = "mirror://sourceforge/project/eclipse-cs/Eclipse%20Checkstyle%20Plug-in/6.19.1/net.sf.eclipsecs-updatesite_${version}.zip"; + sha256 = "03aah57g0cgxym95p1wcj2h69xy3r9c0vv7js3gpmw1hx8w9sjsf"; }; meta = with stdenv.lib; { @@ -341,12 +341,12 @@ rec { jdt = buildEclipseUpdateSite rec { name = "jdt-${version}"; - version = "4.5.2"; + version = "4.6"; src = fetchzip { stripRoot = false; - url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5.2-201602121500/org.eclipse.jdt-4.5.2.zip"; - sha256 = "0v4cfq4z62k60l8l014wqgbjnd6a93dwcp6qvr5y7q1v9jr2na5g"; + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.6-201606061100/org.eclipse.jdt-4.6.zip"; + sha256 = "0raz8d09fnnx19l012l5frca97qavfivvygn3mvsllcyskhqc5hg"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/emacs-25/default.nix b/pkgs/applications/editors/emacs-25/default.nix index 9d97146cd2af..073bdf55c636 100644 --- a/pkgs/applications/editors/emacs-25/default.nix +++ b/pkgs/applications/editors/emacs-25/default.nix @@ -25,13 +25,13 @@ let in stdenv.mkDerivation rec { - name = "emacs-25.0.95"; + name = "emacs-25.1-rc1"; builder = ./builder.sh; src = fetchurl { url = "ftp://alpha.gnu.org/gnu/emacs/pretest/${name}.tar.xz"; - sha256 = "0bmvg7cbrwfa9rbryjrqv2qcllgwja92sx9ikirl80r5d09caf0l"; + sha256 = "0cv1hars9zxlv040h7f3zz50fhn67dqa18ms4hg9sdblckk50360"; }; patches = lib.optionals stdenv.isDarwin [ diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index 8f829b8fdf77..736826fcc9d8 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -95,10 +95,10 @@ ahungry-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "ahungry-theme"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ahungry-theme-1.2.0.tar"; - sha256 = "04z9d8xszgsl6p02gf3yixgj8kwwb6rfc6bq1b3sz95n3v9wmg9d"; + url = "https://elpa.gnu.org/packages/ahungry-theme-1.3.0.tar"; + sha256 = "1p2zaq0s4bbl5cx6wyab24wamw7m0mysb0v47dqjmnvfc25z84rq"; }; packageRequires = [ emacs ]; meta = { @@ -175,10 +175,10 @@ }) {}; auctex = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "auctex"; - version = "11.89.3"; + version = "11.89.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/auctex-11.89.3.tar"; - sha256 = "16yjalh8qf1m3zgwxf1h3dkjq7hkb9895g2lb6ajwjfn02yiav80"; + url = "https://elpa.gnu.org/packages/auctex-11.89.4.tar"; + sha256 = "06dxj9wflwgzy88vk47pdk6xln4f63cab7s73ynwp2bdqjs99f5b"; }; packageRequires = []; meta = { @@ -228,10 +228,10 @@ }) {}; beacon = callPackage ({ elpaBuild, fetchurl, lib, seq }: elpaBuild { pname = "beacon"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/beacon-1.3.0.el"; - sha256 = "00hab8w01p43iscpr0hh1s2w80ara2y8d5ccz37i2nl54gj8lpw3"; + url = "https://elpa.gnu.org/packages/beacon-1.3.1.el"; + sha256 = "19dw9650kk4rch2qpp42wdq9687m3svj1addbp3yz4dijy7lx2mj"; }; packageRequires = [ seq ]; meta = { @@ -282,10 +282,10 @@ }) {}; cl-generic = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "cl-generic"; - version = "0.2"; + version = "0.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/cl-generic-0.2.el"; - sha256 = "0b2y114f14fdlk5hkb0fvdbv6pqm9ifw0vwzri1vqp1xq1l1f9p3"; + url = "https://elpa.gnu.org/packages/cl-generic-0.3.el"; + sha256 = "0vb338bhjpsnrf60qgxny4z5rjrnifahnrv9axd4shay89d894zq"; }; packageRequires = []; meta = { @@ -319,13 +319,26 @@ license = lib.licenses.free; }; }) {}; + compact-docstrings = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + pname = "compact-docstrings"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/compact-docstrings-0.1.el"; + sha256 = "1qmxn1i07nnzfckl06lg3xpvccx2hjgpypgc9v4pdihjfdwnifm5"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/compact-docstrings.html"; + license = lib.licenses.free; + }; + }) {}; company = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "company"; - version = "0.8.12"; + version = "0.9.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/company-0.8.12.tar"; - sha256 = "1r7q813rjs4dgknsfqi354ahsvk8k4ld4xh1fkp8lbxb13da6gqx"; + url = "https://elpa.gnu.org/packages/company-0.9.0.tar"; + sha256 = "1d090j1xv97nbxzz0iq4gmzjijggm8wsd0y1zfsa8syrq8qa0ajs"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -361,15 +374,15 @@ license = lib.licenses.free; }; }) {}; - context-coloring = callPackage ({ elpaBuild, emacs, fetchurl, js2-mode, lib }: + context-coloring = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "context-coloring"; - version = "7.2.1"; + version = "8.0.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/context-coloring-7.2.1.el"; - sha256 = "1lh2p3fsym73h0dcj1gqg1xsw3lcikmcskbx8y3j0ds30l4xs13d"; + url = "https://elpa.gnu.org/packages/context-coloring-8.0.1.tar"; + sha256 = "0c7sb8dzx6f40hz2l6zicc0shpxj3vzsmvdxzx65c4vgvr462js2"; }; - packageRequires = [ emacs js2-mode ]; + packageRequires = [ emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/context-coloring.html"; license = lib.licenses.free; @@ -401,6 +414,19 @@ license = lib.licenses.free; }; }) {}; + cycle-quotes = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + pname = "cycle-quotes"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/cycle-quotes-0.1.tar"; + sha256 = "0aa6ykblgb6anqmi4qxakbvyrq9v02skgayhfb2qddffiww404ka"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/cycle-quotes.html"; + license = lib.licenses.free; + }; + }) {}; darkroom = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "darkroom"; @@ -445,10 +471,10 @@ debbugs = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, soap-client }: elpaBuild { pname = "debbugs"; - version = "0.9.5"; + version = "0.9.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/debbugs-0.9.5.tar"; - sha256 = "1m23rghdykx1fvji6in0xp0bxhjcf7ynm14nl4fhiki2nhhwczxh"; + url = "https://elpa.gnu.org/packages/debbugs-0.9.7.tar"; + sha256 = "07w73if4lmh23ih2v3p0197f781002dywd5fzdbmr4hcqvvi97qq"; }; packageRequires = [ cl-lib soap-client ]; meta = { @@ -456,6 +482,19 @@ license = lib.licenses.free; }; }) {}; + delight = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + pname = "delight"; + version = "1.5"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/delight-1.5.el"; + sha256 = "0kzlvzwmn6zj0874086q2xw0pclyi7wlkq48zh2lkd2796xm8vw7"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/delight.html"; + license = lib.licenses.free; + }; + }) {}; dict-tree = callPackage ({ elpaBuild, fetchurl, heap, lib, tNFA, trie }: elpaBuild { pname = "dict-tree"; @@ -473,10 +512,10 @@ diff-hl = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "diff-hl"; - version = "1.8.3"; + version = "1.8.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/diff-hl-1.8.3.tar"; - sha256 = "1i3ngx5gmjl1a15y6d0xmcgdimn7ghrqkbzqisz4ra3dgwbbb3f9"; + url = "https://elpa.gnu.org/packages/diff-hl-1.8.4.tar"; + sha256 = "0axhidc3cym7a2x4rpxf4745qss9s9ajyg4s9h5b4zn7v7fyp71n"; }; packageRequires = [ cl-lib ]; meta = { @@ -566,10 +605,10 @@ }) {}; el-search = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "el-search"; - version = "0.2"; + version = "0.2.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/el-search-0.2.el"; - sha256 = "1ps4p79xrvsdys9yh1wyk4zdly6c55agbqa6f8q3xkwc9sva9lw9"; + url = "https://elpa.gnu.org/packages/el-search-0.2.1.el"; + sha256 = "1ralag6a4752mqbsz92prd1f75380q5f7j4k3ajhv66krhd1w0k6"; }; packageRequires = [ emacs ]; meta = { @@ -646,10 +685,10 @@ excorporate = callPackage ({ elpaBuild, emacs, fetchurl, fsm, lib, soap-client, url-http-ntlm }: elpaBuild { pname = "excorporate"; - version = "0.7.3"; + version = "0.7.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/excorporate-0.7.3.tar"; - sha256 = "053pcqv5gcwnl57kcxsm3v60nmi5sm4myjca2xqraldp27k6qd1q"; + url = "https://elpa.gnu.org/packages/excorporate-0.7.5.tar"; + sha256 = "0w828zv8968ryphhi1zaizrs6fnxkgxdwjlhpriyc9129qnwx0cg"; }; packageRequires = [ emacs fsm soap-client url-http-ntlm ]; meta = { @@ -659,10 +698,10 @@ }) {}; exwm = callPackage ({ elpaBuild, fetchurl, lib, xelb }: elpaBuild { pname = "exwm"; - version = "0.4"; + version = "0.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/exwm-0.4.tar"; - sha256 = "1qlplx88mk8c5sahlymxxh46bzf6bxnsqk92wliv5ji4ai5373fb"; + url = "https://elpa.gnu.org/packages/exwm-0.6.tar"; + sha256 = "0fxkhpc87wd7crzwwj9r5r3s07pznsphk4hi8jinx91641szi1px"; }; packageRequires = [ xelb ]; meta = { @@ -701,10 +740,10 @@ fsm = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "fsm"; - version = "0.2"; + version = "0.2.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/fsm-0.2.el"; - sha256 = "1kh1r5by1q2x8bbg0z2jzmb5i6blvlf105mavrnbcxa6ghbiz6iy"; + url = "https://elpa.gnu.org/packages/fsm-0.2.1.el"; + sha256 = "1jyxyqdbfl8nv7c50q0sg3w5p7whp1sqgi7w921k5hfar4d11qqp"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -876,10 +915,10 @@ js2-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "js2-mode"; - version = "20150909"; + version = "20160623"; src = fetchurl { - url = "https://elpa.gnu.org/packages/js2-mode-20150909.tar"; - sha256 = "1ha696jl9k1325r3xlr11rx6lmd545p42f8biw4hb0q1zsr2306h"; + url = "https://elpa.gnu.org/packages/js2-mode-20160623.tar"; + sha256 = "057djy6amda8kyprkb3v733d21nlmq5fgfazi65fywlfwyq1adxs"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -1123,6 +1162,19 @@ license = lib.licenses.free; }; }) {}; + myers = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { + pname = "myers"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/myers-0.1.el"; + sha256 = "0yrxklkksj16cfbvwmdxjj43vngjd6q0fivib1xim3c9g3c9b670"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/myers.html"; + license = lib.licenses.free; + }; + }) {}; nameless = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "nameless"; version = "1.0.1"; @@ -1217,10 +1269,10 @@ }) {}; oauth2 = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "oauth2"; - version = "0.10"; + version = "0.11"; src = fetchurl { - url = "https://elpa.gnu.org/packages/oauth2-0.10.el"; - sha256 = "0rlxmbb88dp0yqw9d5mdx0nxv5l5618scmg5872scbnc735f2yna"; + url = "https://elpa.gnu.org/packages/oauth2-0.11.el"; + sha256 = "0ydkc9jazsnbbvfhd47mql52y7k06n3z7r0naqxkwb99j9blqsmp"; }; packageRequires = []; meta = { @@ -1257,10 +1309,10 @@ }) {}; org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org"; - version = "20160516"; + version = "20160725"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-20160516.tar"; - sha256 = "164v1zddgyfy9v1qhl1fqz2vcgm5w4dhfmra5ngpgnjh1402l0pm"; + url = "https://elpa.gnu.org/packages/org-20160725.tar"; + sha256 = "05ky7hlsjqlml14ss9hcj2756clvsi1f26gv7a01d923m3drkqjc"; }; packageRequires = []; meta = { @@ -1337,10 +1389,10 @@ python = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "python"; - version = "0.25.1"; + version = "0.25.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/python-0.25.1.el"; - sha256 = "16r1sjq5fagrvlnrnbxmf6h2yxrcbhqlaa3ppqsa14vqrj09gisd"; + url = "https://elpa.gnu.org/packages/python-0.25.2.el"; + sha256 = "1ac2ipyg49sb0lz3n0ykj2s6592abd38l5d1cpbmv73j13l8zq5i"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -1427,14 +1479,15 @@ license = lib.licenses.free; }; }) {}; - rudel = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + rudel = callPackage ({ cl-generic, cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: + elpaBuild { pname = "rudel"; version = "0.3"; src = fetchurl { url = "https://elpa.gnu.org/packages/rudel-0.3.tar"; sha256 = "041yac9a7hbz1fpmjlmc31ggcgg90fmw08z6bkzly2141yky8yh1"; }; - packageRequires = []; + packageRequires = [ cl-generic cl-lib emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/rudel.html"; license = lib.licenses.free; @@ -1468,10 +1521,10 @@ }) {}; seq = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "seq"; - version = "2.15"; + version = "2.16"; src = fetchurl { - url = "https://elpa.gnu.org/packages/seq-2.15.tar"; - sha256 = "09wi1765bmn7i8fg6ajjfaxgs4ipc42d58zx2fdqpidrdg9c7q73"; + url = "https://elpa.gnu.org/packages/seq-2.16.tar"; + sha256 = "1fc1cjbb3lrxgkhzvg4bkpxr408hhg8kqa07n0jfalrdzaa3bika"; }; packageRequires = []; meta = { @@ -1918,10 +1971,10 @@ xelb = callPackage ({ cl-generic, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "xelb"; - version = "0.7"; + version = "0.9"; src = fetchurl { - url = "https://elpa.gnu.org/packages/xelb-0.7.tar"; - sha256 = "0i4336a8xns6zp82dj77w5gjgv3mfngcjsw7ghyf7bb7flh8ipw1"; + url = "https://elpa.gnu.org/packages/xelb-0.9.tar"; + sha256 = "19gv08wxs2s337y1wv2i19a0vk8w6733l9mryn334yy2m5031vxh"; }; packageRequires = [ cl-generic emacs ]; meta = { @@ -1945,10 +1998,10 @@ yasnippet = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "yasnippet"; - version = "0.9.1"; + version = "0.10.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/yasnippet-0.9.1.tar"; - sha256 = "0b88q10dxa13afjzpkwgjlrzzvwiiqsi9jr73pxnsy4q1n1n2vml"; + url = "https://elpa.gnu.org/packages/yasnippet-0.10.0.tar"; + sha256 = "0vh70i73rknaxzglr4nragassgpjy2lj5mca2x6wqiqmv7mc8xdv"; }; packageRequires = [ cl-lib ]; meta = { diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index 2cb892c3646e..d2a0c4fb276c 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -2,7 +2,7 @@ _0blayout = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "_0blayout"; - version = "20151021.549"; + version = "20151021.349"; src = fetchFromGitHub { owner = "etu"; repo = "0blayout-mode"; @@ -23,7 +23,7 @@ _2048-game = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "_2048-game"; - version = "20151026.1433"; + version = "20151026.1233"; src = fetchhg { url = "https://bitbucket.com/zck/2048.el"; rev = "ea6c3bce8ac1"; @@ -43,7 +43,7 @@ _4clojure = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, request }: melpaBuild { pname = "_4clojure"; - version = "20131014.1707"; + version = "20131014.1507"; src = fetchFromGitHub { owner = "losingkeys"; repo = "4clojure.el"; @@ -64,7 +64,7 @@ aa-edit-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, navi2ch }: melpaBuild { pname = "aa-edit-mode"; - version = "20160228.17"; + version = "20160227.2217"; src = fetchFromGitHub { owner = "zonuexe"; repo = "aa-edit-mode"; @@ -85,7 +85,7 @@ abc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "abc-mode"; - version = "20140225.1144"; + version = "20140225.944"; src = fetchFromGitHub { owner = "mkjunker"; repo = "abc-mode"; @@ -106,7 +106,7 @@ abl-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "abl-mode"; - version = "20160129.431"; + version = "20160129.231"; src = fetchFromGitHub { owner = "afroisalreadyinu"; repo = "abl-mode"; @@ -127,7 +127,7 @@ abyss-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "abyss-theme"; - version = "20160420.712"; + version = "20160420.512"; src = fetchFromGitHub { owner = "mgrbyte"; repo = "emacs-abyss-theme"; @@ -148,7 +148,7 @@ ac-alchemist = callPackage ({ alchemist, auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ac-alchemist"; - version = "20150908.156"; + version = "20150907.2356"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-ac-alchemist"; @@ -169,7 +169,7 @@ ac-anaconda = callPackage ({ anaconda-mode, auto-complete, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ac-anaconda"; - version = "20160221.1323"; + version = "20160221.1123"; src = fetchFromGitHub { owner = "proofit404"; repo = "ac-anaconda"; @@ -190,7 +190,7 @@ ac-c-headers = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ac-c-headers"; - version = "20151021.334"; + version = "20151021.134"; src = fetchFromGitHub { owner = "zk-phi"; repo = "ac-c-headers"; @@ -211,7 +211,7 @@ ac-cake = callPackage ({ auto-complete, cake, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ac-cake"; - version = "20140315.1129"; + version = "20140315.929"; src = fetchFromGitHub { owner = "k1LoW"; repo = "emacs-ac-cake"; @@ -232,7 +232,7 @@ ac-cake2 = callPackage ({ auto-complete, cake2, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ac-cake2"; - version = "20140320.208"; + version = "20140320.8"; src = fetchFromGitHub { owner = "k1LoW"; repo = "emacs-ac-cake2"; @@ -253,7 +253,7 @@ ac-capf = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ac-capf"; - version = "20151031.2117"; + version = "20151031.1917"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-ac-capf"; @@ -274,7 +274,7 @@ ac-cider = callPackage ({ auto-complete, cider, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ac-cider"; - version = "20160611.504"; + version = "20160611.304"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "ac-cider"; @@ -295,7 +295,7 @@ ac-clang = callPackage ({ auto-complete, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip, yasnippet }: melpaBuild { pname = "ac-clang"; - version = "20150906.1208"; + version = "20150906.1008"; src = fetchFromGitHub { owner = "yaruopooner"; repo = "ac-clang"; @@ -315,7 +315,7 @@ }) {}; ac-dabbrev = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "ac-dabbrev"; - version = "20130906.18"; + version = "20130905.2218"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/ac-dabbrev.el"; sha256 = "0q0lbhdng5s5hqa342yyvg02hf2bfbwq513lj1rlaqz4ykvpd7fh"; @@ -334,7 +334,7 @@ ac-dcd = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, flycheck-dmd-dub, lib, melpaBuild }: melpaBuild { pname = "ac-dcd"; - version = "20160311.817"; + version = "20160311.617"; src = fetchFromGitHub { owner = "atilaneves"; repo = "ac-dcd"; @@ -355,7 +355,7 @@ ac-emmet = callPackage ({ auto-complete, emmet-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ac-emmet"; - version = "20131015.1058"; + version = "20131015.858"; src = fetchFromGitHub { owner = "yasuyk"; repo = "ac-emmet"; @@ -376,7 +376,7 @@ ac-emoji = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ac-emoji"; - version = "20150823.211"; + version = "20150823.11"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-ac-emoji"; @@ -397,7 +397,7 @@ ac-etags = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ac-etags"; - version = "20151031.2121"; + version = "20151031.1921"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-ac-etags"; @@ -418,7 +418,7 @@ ac-geiser = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, geiser, lib, melpaBuild }: melpaBuild { pname = "ac-geiser"; - version = "20130929.147"; + version = "20130928.2347"; src = fetchFromGitHub { owner = "xiaohanyu"; repo = "ac-geiser"; @@ -439,7 +439,7 @@ ac-haskell-process = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "ac-haskell-process"; - version = "20150423.902"; + version = "20150423.702"; src = fetchFromGitHub { owner = "purcell"; repo = "ac-haskell-process"; @@ -460,7 +460,7 @@ ac-helm = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, popup }: melpaBuild { pname = "ac-helm"; - version = "20160318.2133"; + version = "20160318.1933"; src = fetchFromGitHub { owner = "yasuyk"; repo = "ac-helm"; @@ -481,7 +481,7 @@ ac-html = callPackage ({ auto-complete, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ac-html"; - version = "20151005.231"; + version = "20151005.31"; src = fetchFromGitHub { owner = "cheunghy"; repo = "ac-html"; @@ -502,7 +502,7 @@ ac-html-angular = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, web-completion-data }: melpaBuild { pname = "ac-html-angular"; - version = "20151225.119"; + version = "20151224.2319"; src = fetchFromGitHub { owner = "osv"; repo = "ac-html-angular"; @@ -523,7 +523,7 @@ ac-html-bootstrap = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, web-completion-data }: melpaBuild { pname = "ac-html-bootstrap"; - version = "20160302.1101"; + version = "20160302.901"; src = fetchFromGitHub { owner = "osv"; repo = "ac-html-bootstrap"; @@ -544,7 +544,7 @@ ac-html-csswatcher = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, web-completion-data }: melpaBuild { pname = "ac-html-csswatcher"; - version = "20151208.1513"; + version = "20151208.1313"; src = fetchFromGitHub { owner = "osv"; repo = "ac-html-csswatcher"; @@ -565,7 +565,7 @@ ac-inf-ruby = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }: melpaBuild { pname = "ac-inf-ruby"; - version = "20131115.550"; + version = "20131115.350"; src = fetchFromGitHub { owner = "purcell"; repo = "ac-inf-ruby"; @@ -586,7 +586,7 @@ ac-ispell = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ac-ispell"; - version = "20151031.2126"; + version = "20151031.1926"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-ac-ispell"; @@ -607,7 +607,7 @@ ac-js2 = callPackage ({ fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, skewer-mode }: melpaBuild { pname = "ac-js2"; - version = "20140906.642"; + version = "20140906.442"; src = fetchFromGitHub { owner = "ScottyB"; repo = "ac-js2"; @@ -628,7 +628,7 @@ ac-math = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, math-symbol-lists, melpaBuild }: melpaBuild { pname = "ac-math"; - version = "20141116.1527"; + version = "20141116.1327"; src = fetchFromGitHub { owner = "vspinu"; repo = "ac-math"; @@ -649,7 +649,7 @@ ac-mozc = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, mozc }: melpaBuild { pname = "ac-mozc"; - version = "20150227.1019"; + version = "20150227.819"; src = fetchFromGitHub { owner = "igjit"; repo = "ac-mozc"; @@ -670,7 +670,7 @@ ac-octave = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ac-octave"; - version = "20150111.1908"; + version = "20150111.1708"; src = fetchFromGitHub { owner = "coldnew"; repo = "ac-octave"; @@ -691,12 +691,12 @@ ac-php = callPackage ({ ac-php-core, auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "ac-php"; - version = "20160628.622"; + version = "20160628.422"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "eacdc1b1c97322c786c0fb330b0dde3f7b40682e"; - sha256 = "1kh5h55kf1lypysq585jd56jqcsga27658fnm1jwxylcgh8pi5sw"; + rev = "ff6f268fe6f9dd7cd67dde7c52e1fe9b8a145f14"; + sha256 = "0dxhcm6cfk0sgv2nbdscjf791js9g3qkxcapjh1zwyqsgmcrk9hs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php"; @@ -712,12 +712,12 @@ ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }: melpaBuild { pname = "ac-php-core"; - version = "20160630.2248"; + version = "20160722.2111"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "eacdc1b1c97322c786c0fb330b0dde3f7b40682e"; - sha256 = "1kh5h55kf1lypysq585jd56jqcsga27658fnm1jwxylcgh8pi5sw"; + rev = "ff6f268fe6f9dd7cd67dde7c52e1fe9b8a145f14"; + sha256 = "0dxhcm6cfk0sgv2nbdscjf791js9g3qkxcapjh1zwyqsgmcrk9hs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core"; @@ -733,7 +733,7 @@ ac-racer = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, racer }: melpaBuild { pname = "ac-racer"; - version = "20160518.20"; + version = "20160517.2220"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-ac-racer"; @@ -754,7 +754,7 @@ ac-skk = callPackage ({ auto-complete, cl-lib ? null, ddskk, fetchFromGitHub, fetchurl, lib, melpaBuild, tinysegmenter }: melpaBuild { pname = "ac-skk"; - version = "20141229.1919"; + version = "20141229.1719"; src = fetchFromGitHub { owner = "myuhe"; repo = "ac-skk.el"; @@ -775,7 +775,7 @@ ac-slime = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, slime }: melpaBuild { pname = "ac-slime"; - version = "20150729.2235"; + version = "20150729.2035"; src = fetchFromGitHub { owner = "purcell"; repo = "ac-slime"; @@ -796,7 +796,7 @@ ac-sly = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, sly }: melpaBuild { pname = "ac-sly"; - version = "20150421.1522"; + version = "20150421.1322"; src = fetchFromGitHub { owner = "qoocku"; repo = "ac-sly"; @@ -817,7 +817,7 @@ ace-flyspell = callPackage ({ ace-jump-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ace-flyspell"; - version = "20150523.1315"; + version = "20150523.1115"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "ace-flyspell"; @@ -838,7 +838,7 @@ ace-isearch = callPackage ({ ace-jump-mode, avy, emacs, fetchFromGitHub, fetchurl, helm-swoop, lib, melpaBuild }: melpaBuild { pname = "ace-isearch"; - version = "20150808.756"; + version = "20150808.556"; src = fetchFromGitHub { owner = "tam17aki"; repo = "ace-isearch"; @@ -859,7 +859,7 @@ ace-jump-buffer = callPackage ({ avy, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ace-jump-buffer"; - version = "20160229.1658"; + version = "20160229.1458"; src = fetchFromGitHub { owner = "waymondo"; repo = "ace-jump-buffer"; @@ -880,7 +880,7 @@ ace-jump-helm-line = callPackage ({ avy, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "ace-jump-helm-line"; - version = "20160329.1418"; + version = "20160329.1218"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "ace-jump-helm-line"; @@ -901,7 +901,7 @@ ace-jump-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ace-jump-mode"; - version = "20140616.315"; + version = "20140616.115"; src = fetchFromGitHub { owner = "winterTTr"; repo = "ace-jump-mode"; @@ -922,7 +922,7 @@ ace-jump-zap = callPackage ({ ace-jump-mode, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ace-jump-zap"; - version = "20150330.1542"; + version = "20150330.1342"; src = fetchFromGitHub { owner = "waymondo"; repo = "ace-jump-zap"; @@ -943,7 +943,7 @@ ace-link = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ace-link"; - version = "20160530.150"; + version = "20160529.2350"; src = fetchFromGitHub { owner = "abo-abo"; repo = "ace-link"; @@ -964,7 +964,7 @@ ace-mc = callPackage ({ ace-jump-mode, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }: melpaBuild { pname = "ace-mc"; - version = "20160408.1937"; + version = "20160408.1737"; src = fetchFromGitHub { owner = "mm--"; repo = "ace-mc"; @@ -985,7 +985,7 @@ ace-pinyin = callPackage ({ ace-jump-mode, avy, fetchFromGitHub, fetchurl, lib, melpaBuild, pinyinlib }: melpaBuild { pname = "ace-pinyin"; - version = "20160611.1955"; + version = "20160611.1755"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "ace-pinyin"; @@ -1006,7 +1006,7 @@ ace-popup-menu = callPackage ({ avy-menu, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ace-popup-menu"; - version = "20160522.719"; + version = "20160522.519"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "ace-popup-menu"; @@ -1027,7 +1027,7 @@ ace-window = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ace-window"; - version = "20160225.1019"; + version = "20160225.819"; src = fetchFromGitHub { owner = "abo-abo"; repo = "ace-window"; @@ -1048,7 +1048,7 @@ achievements = callPackage ({ fetchhg, fetchurl, keyfreq, lib, melpaBuild }: melpaBuild { pname = "achievements"; - version = "20150530.1326"; + version = "20150530.1126"; src = fetchhg { url = "https://bitbucket.com/gvol/emacs-achievements"; rev = "5b4b7b6816aa"; @@ -1068,7 +1068,7 @@ ack-menu = callPackage ({ fetchFromGitHub, fetchurl, lib, mag-menu, melpaBuild }: melpaBuild { pname = "ack-menu"; - version = "20150504.1522"; + version = "20150504.1322"; src = fetchFromGitHub { owner = "chumpage"; repo = "ack-menu"; @@ -1089,7 +1089,7 @@ actionscript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "actionscript-mode"; - version = "20140605.1328"; + version = "20140605.1128"; src = fetchFromGitHub { owner = "austinhaas"; repo = "actionscript-mode"; @@ -1110,7 +1110,7 @@ addressbook-bookmark = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "addressbook-bookmark"; - version = "20160317.103"; + version = "20160316.2303"; src = fetchFromGitHub { owner = "thierryvolpiatto"; repo = "addressbook-bookmark"; @@ -1131,7 +1131,7 @@ adoc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, markup-faces, melpaBuild }: melpaBuild { pname = "adoc-mode"; - version = "20160314.1630"; + version = "20160314.1430"; src = fetchFromGitHub { owner = "sensorflo"; repo = "adoc-mode"; @@ -1152,7 +1152,7 @@ aes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "aes"; - version = "20160121.1437"; + version = "20160121.1237"; src = fetchFromGitHub { owner = "Sauermann"; repo = "emacs-aes"; @@ -1173,7 +1173,7 @@ afternoon-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "afternoon-theme"; - version = "20140104.1259"; + version = "20140104.1059"; src = fetchFromGitHub { owner = "osener"; repo = "emacs-afternoon-theme"; @@ -1194,7 +1194,7 @@ ag = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ag"; - version = "20160702.1328"; + version = "20160702.1128"; src = fetchFromGitHub { owner = "Wilfred"; repo = "ag.el"; @@ -1215,7 +1215,7 @@ aggressive-fill-paragraph = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "aggressive-fill-paragraph"; - version = "20160301.1614"; + version = "20160301.1414"; src = fetchFromGitHub { owner = "davidshepherd7"; repo = "aggressive-fill-paragraph-mode"; @@ -1236,7 +1236,7 @@ aggressive-indent = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "aggressive-indent"; - version = "20160608.1825"; + version = "20160608.1625"; src = fetchFromGitHub { owner = "Malabarba"; repo = "aggressive-indent-mode"; @@ -1256,7 +1256,7 @@ }) {}; ahg = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ahg"; - version = "20160513.336"; + version = "20160513.136"; src = fetchhg { url = "https://bitbucket.com/agriggio/ahg"; rev = "8779fec342a4"; @@ -1276,7 +1276,7 @@ ahk-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ahk-mode"; - version = "20160320.1721"; + version = "20160320.1521"; src = fetchFromGitHub { owner = "ralesi"; repo = "ahk-mode"; @@ -1297,12 +1297,12 @@ ahungry-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ahungry-theme"; - version = "20160516.2258"; + version = "20160721.2122"; src = fetchFromGitHub { owner = "ahungry"; repo = "color-theme-ahungry"; - rev = "f4163526c6f603b9dea1d8a3253d31c135fd8876"; - sha256 = "0y17ilvpqivzrd1hvdwi6w0j5bb2d87v54c54ibnf92aryndvyqy"; + rev = "3ce72cf77cf5958d91b65bc4867cbacff968da74"; + sha256 = "0wiwxh6k2s48gpklhd9abbsr0ll73jzggwgq1lvm7gha203ji5v4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/520295978fd7de3f4266dd69cc30d0b4fdf09db0/recipes/ahungry-theme"; @@ -1318,12 +1318,12 @@ airline-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }: melpaBuild { pname = "airline-themes"; - version = "20160203.1710"; + version = "20160715.1027"; src = fetchFromGitHub { owner = "AnthonyDiGirolamo"; repo = "airline-themes"; - rev = "3c5f127daf1cf8a74e3c9956e11e56eedf5f3e76"; - sha256 = "0blrpqn8wy9pwzikgzb0v6x4hk7axv93j4byfci62fh1905zfkkb"; + rev = "2813df844218d48553684c9fc7e41513eabadbb9"; + sha256 = "1mdclcnmwyw193y9vmyqzviirwhq7l4x7yzvpmn0cwimwrww38xx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/addeb923176132a52807308fa5e71d41c9511802/recipes/airline-themes"; @@ -1339,7 +1339,7 @@ airplay = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, simple-httpd }: melpaBuild { pname = "airplay"; - version = "20130212.626"; + version = "20130212.426"; src = fetchFromGitHub { owner = "gongo"; repo = "airplay-el"; @@ -1360,7 +1360,7 @@ alchemist = callPackage ({ company, dash, elixir-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "alchemist"; - version = "20160603.141"; + version = "20160602.2341"; src = fetchFromGitHub { owner = "tonini"; repo = "alchemist.el"; @@ -1381,7 +1381,7 @@ alda-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "alda-mode"; - version = "20160322.200"; + version = "20160322.0"; src = fetchFromGitHub { owner = "jgkamat"; repo = "alda-mode"; @@ -1402,7 +1402,7 @@ alect-themes = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "alect-themes"; - version = "20160414.314"; + version = "20160414.114"; src = fetchFromGitHub { owner = "alezost"; repo = "alect-themes"; @@ -1423,7 +1423,7 @@ alert = callPackage ({ fetchFromGitHub, fetchurl, gntp, lib, log4e, melpaBuild }: melpaBuild { pname = "alert"; - version = "20160506.2021"; + version = "20160506.1821"; src = fetchFromGitHub { owner = "jwiegley"; repo = "alert"; @@ -1444,7 +1444,7 @@ align-cljlet = callPackage ({ clojure-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "align-cljlet"; - version = "20160112.1501"; + version = "20160112.1301"; src = fetchFromGitHub { owner = "gstamp"; repo = "align-cljlet"; @@ -1465,7 +1465,7 @@ all-ext = callPackage ({ all, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "all-ext"; - version = "20160604.1701"; + version = "20160604.1501"; src = fetchFromGitHub { owner = "rubikitch"; repo = "all-ext"; @@ -1486,12 +1486,12 @@ amd-mode = callPackage ({ ag, dash, f, fetchFromGitHub, fetchurl, js2-mode, js2-refactor, lib, makey, melpaBuild, projectile, s }: melpaBuild { pname = "amd-mode"; - version = "20160603.1201"; + version = "20160726.1005"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "amd-mode.el"; - rev = "1b9e5c3a18722bd65692a2069eea0e88fcddda71"; - sha256 = "1q49gfs98djwjxw2sr8q08jf5glf9d3ks9014gjjwa1dpf98mpy3"; + rev = "5aa1cd77a42a491cf2d534a99657645d04255771"; + sha256 = "00d096waxx8xkgq5yz8z027z03jhyj1q3i4ayhwk87px3c72skzv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e4d6e9935e4935c9de769c7bf1c1b6dd256e10da/recipes/amd-mode"; @@ -1516,7 +1516,7 @@ ample-regexps = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ample-regexps"; - version = "20151023.500"; + version = "20151023.300"; src = fetchFromGitHub { owner = "immerrr"; repo = "ample-regexps.el"; @@ -1537,7 +1537,7 @@ ample-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ample-theme"; - version = "20150814.1301"; + version = "20150814.1101"; src = fetchFromGitHub { owner = "jordonbiondo"; repo = "ample-theme"; @@ -1558,7 +1558,7 @@ ample-zen-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ample-zen-theme"; - version = "20150119.1554"; + version = "20150119.1354"; src = fetchFromGitHub { owner = "mjwall"; repo = "ample-zen"; @@ -1579,12 +1579,12 @@ anaconda-mode = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }: melpaBuild { pname = "anaconda-mode"; - version = "20160527.712"; + version = "20160717.1034"; src = fetchFromGitHub { owner = "proofit404"; repo = "anaconda-mode"; - rev = "f44862d8d43f124acab349ecb207529622a363fa"; - sha256 = "0931yd46dfmaagmgvjx8f4a584a4faaw7krwmhnmhdbc3cqjvy39"; + rev = "488e292e0214715f754dfa8246ba235057025005"; + sha256 = "0adykms8s72dplnph283j43sklv92idzr0s1fg6n9zf0ci8ycimz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode"; @@ -1600,7 +1600,7 @@ anaphora = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "anaphora"; - version = "20140728.1736"; + version = "20140728.1536"; src = fetchFromGitHub { owner = "rolandwalker"; repo = "anaphora"; @@ -1621,7 +1621,7 @@ anchored-transpose = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "anchored-transpose"; - version = "20080905.54"; + version = "20080904.2254"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/anchored-transpose.el"; sha256 = "1hklypbp79pgaf1yklbm3qx4skm3xlml0cm1r9b9js3dbqyha651"; @@ -1640,7 +1640,7 @@ android-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "android-mode"; - version = "20160408.723"; + version = "20160408.523"; src = fetchFromGitHub { owner = "remvee"; repo = "android-mode"; @@ -1661,7 +1661,7 @@ angry-police-captain = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "angry-police-captain"; - version = "20120829.752"; + version = "20120829.552"; src = fetchFromGitHub { owner = "rolpereira"; repo = "angry-police-captain-el"; @@ -1682,7 +1682,7 @@ angular-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "angular-mode"; - version = "20151201.1527"; + version = "20151201.1327"; src = fetchFromGitHub { owner = "omouse"; repo = "angularjs-mode"; @@ -1703,7 +1703,7 @@ angular-snippets = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "angular-snippets"; - version = "20140514.23"; + version = "20140513.2223"; src = fetchFromGitHub { owner = "magnars"; repo = "angular-snippets.el"; @@ -1724,7 +1724,7 @@ annotate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "annotate"; - version = "20151227.1022"; + version = "20151227.822"; src = fetchFromGitHub { owner = "bastibe"; repo = "annotate.el"; @@ -1745,7 +1745,7 @@ annotate-depth = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "annotate-depth"; - version = "20160520.1540"; + version = "20160520.1340"; src = fetchFromGitHub { owner = "netromdk"; repo = "annotate-depth"; @@ -1766,7 +1766,7 @@ annoying-arrows-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "annoying-arrows-mode"; - version = "20151113.1102"; + version = "20151113.902"; src = fetchFromGitHub { owner = "magnars"; repo = "annoying-arrows-mode.el"; @@ -1787,7 +1787,7 @@ ansi = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ansi"; - version = "20150703.326"; + version = "20150703.126"; src = fetchFromGitHub { owner = "rejeep"; repo = "ansi.el"; @@ -1808,7 +1808,7 @@ ansible = callPackage ({ f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ansible"; - version = "20160326.1031"; + version = "20160326.831"; src = fetchFromGitHub { owner = "k1LoW"; repo = "emacs-ansible"; @@ -1829,7 +1829,7 @@ ansible-doc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ansible-doc"; - version = "20150524.1205"; + version = "20150524.1005"; src = fetchFromGitHub { owner = "lunaryorn"; repo = "ansible-doc.el"; @@ -1850,7 +1850,7 @@ ant = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ant"; - version = "20160211.943"; + version = "20160211.743"; src = fetchFromGitHub { owner = "apg"; repo = "ant-el"; @@ -1871,12 +1871,12 @@ anti-zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "anti-zenburn-theme"; - version = "20160501.1850"; + version = "20160725.1559"; src = fetchFromGitHub { owner = "m00natic"; repo = "anti-zenburn-theme"; - rev = "cb88783ec49eabec3d3687f9d71b92679329abe7"; - sha256 = "06xa29hq2qgg8hx1igj5hq7c16yj674mlnd3sgj40pwk88j5jp88"; + rev = "164122ebb7a39c41b953e90fe05cf440c5335d9e"; + sha256 = "1l3z6wi2im7cax08ml3gsaik5hvpf0nzxcl4zlchskmgjbzav704"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f6f803dc99a1b1fdb5b4e79f1c9cf72b702d091/recipes/anti-zenburn-theme"; @@ -1892,7 +1892,7 @@ anx-api = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "anx-api"; - version = "20140208.914"; + version = "20140208.714"; src = fetchFromGitHub { owner = "rmloveland"; repo = "emacs-appnexus-api"; @@ -1913,7 +1913,7 @@ anybar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "anybar"; - version = "20160112.1002"; + version = "20160112.802"; src = fetchFromGitHub { owner = "tie-rack"; repo = "anybar-el"; @@ -1934,7 +1934,7 @@ anyins = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "anyins"; - version = "20131229.441"; + version = "20131229.241"; src = fetchFromGitHub { owner = "antham"; repo = "anyins"; @@ -1955,7 +1955,7 @@ anything = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "anything"; - version = "20151018.2103"; + version = "20151018.1903"; src = fetchgit { url = "http://repo.or.cz/r/anything-config.git"; rev = "2d7e0450e13ab04b20f4dff08f32936e78677e58"; @@ -1975,7 +1975,7 @@ anything-exuberant-ctags = callPackage ({ anything, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "anything-exuberant-ctags"; - version = "20140316.1837"; + version = "20140316.1637"; src = fetchFromGitHub { owner = "k1LoW"; repo = "anything-exuberant-ctags"; @@ -1996,7 +1996,7 @@ anything-git-files = callPackage ({ anything, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "anything-git-files"; - version = "20130609.443"; + version = "20130609.243"; src = fetchFromGitHub { owner = "tarao"; repo = "anything-git-files-el"; @@ -2017,7 +2017,7 @@ anything-git-grep = callPackage ({ anything, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "anything-git-grep"; - version = "20130608.2140"; + version = "20130608.1940"; src = fetchFromGitHub { owner = "mechairoi"; repo = "anything-git-grep"; @@ -2038,7 +2038,7 @@ anything-milkode = callPackage ({ anything, fetchFromGitHub, fetchurl, lib, melpaBuild, milkode }: melpaBuild { pname = "anything-milkode"; - version = "20140518.943"; + version = "20140518.743"; src = fetchFromGitHub { owner = "ongaeshi"; repo = "anything-milkode"; @@ -2059,7 +2059,7 @@ anything-project = callPackage ({ anything, fetchFromGitHub, fetchurl, imakado, lib, melpaBuild }: melpaBuild { pname = "anything-project"; - version = "20141024.427"; + version = "20141024.227"; src = fetchFromGitHub { owner = "imakado"; repo = "anything-project"; @@ -2080,7 +2080,7 @@ anything-prosjekt = callPackage ({ anything, fetchFromGitHub, fetchurl, lib, melpaBuild, prosjekt }: melpaBuild { pname = "anything-prosjekt"; - version = "20140129.204"; + version = "20140129.4"; src = fetchFromGitHub { owner = "abingham"; repo = "prosjekt"; @@ -2101,7 +2101,7 @@ anything-replace-string = callPackage ({ anything, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "anything-replace-string"; - version = "20140317.536"; + version = "20140317.336"; src = fetchFromGitHub { owner = "k1LoW"; repo = "anything-replace-string"; @@ -2122,7 +2122,7 @@ anything-sage = callPackage ({ anything, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, sage-shell-mode }: melpaBuild { pname = "anything-sage"; - version = "20141005.613"; + version = "20141005.413"; src = fetchFromGitHub { owner = "stakemori"; repo = "anything-sage"; @@ -2143,12 +2143,12 @@ anzu = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "anzu"; - version = "20160628.2009"; + version = "20160726.840"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-anzu"; - rev = "9574e8140f7ec35c148d440f850d0303f76fd377"; - sha256 = "04n52yy7s397c9g30m8s7llnz42kq22v0h8r2mi12n9780i7pah6"; + rev = "3845ead349e004ff8616b11eb167051584b98e97"; + sha256 = "0735ssqp79h8r39q3f7ynd48wanhlp3xa33fdsgrpyqibpxf022v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04ac359d02d91725c8fc451b17bc2f06a7fe57a5/recipes/anzu"; @@ -2163,7 +2163,7 @@ }) {}; aok = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "aok"; - version = "20130824.627"; + version = "20130824.427"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/aok.el"; sha256 = "10vdmxzifxx3fkpyg76ngnj79k3d2pq0f322rd8ssc66alxhkz3g"; @@ -2182,7 +2182,7 @@ aozora-view = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "aozora-view"; - version = "20140310.817"; + version = "20140310.617"; src = fetchFromGitHub { owner = "kawabata"; repo = "aozora-view"; @@ -2202,7 +2202,7 @@ }) {}; apache-mode = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "apache-mode"; - version = "20150828.914"; + version = "20150828.714"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/apache-mode.el"; sha256 = "1jndhcjvj6s1clmyyphl5ss5267c7b5a58fz8gbp1ffk1d9ylfik"; @@ -2221,7 +2221,7 @@ apel = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "apel"; - version = "20160427.352"; + version = "20160427.152"; src = fetchFromGitHub { owner = "wanderlust"; repo = "apel"; @@ -2242,7 +2242,7 @@ apples-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "apples-mode"; - version = "20110120.2218"; + version = "20110120.2018"; src = fetchFromGitHub { owner = "tequilasunset"; repo = "apples-mode"; @@ -2263,7 +2263,7 @@ applescript-mode = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild }: melpaBuild { pname = "applescript-mode"; - version = "20120205.507"; + version = "20120205.307"; src = fetchsvn { url = "http://svn.osdn.jp/svnroot/macemacsjp/applescript-mode/trunk"; rev = "584"; @@ -2283,7 +2283,7 @@ aproject = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "aproject"; - version = "20150605.406"; + version = "20150605.206"; src = fetchFromGitHub { owner = "vietor"; repo = "aproject"; @@ -2304,7 +2304,7 @@ apropos-fn-plus-var = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "apropos-fn-plus-var"; - version = "20151231.1405"; + version = "20151231.1205"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/apropos-fn+var.el"; sha256 = "0wc9zg30a48cj2ssfj9wc7ga0ip9igcxcdbn1wr0qmndzxxa7x5k"; @@ -2323,12 +2323,12 @@ apropospriate-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "apropospriate-theme"; - version = "20160615.1010"; + version = "20160724.1010"; src = fetchFromGitHub { owner = "waymondo"; repo = "apropospriate-theme"; - rev = "e91522784480185a9a38e34b91174fb64225f4c6"; - sha256 = "1gqhf2hf1mgj54k4kd61r9jvmgdl0mwg7wa8q0n20l0ygq9wnlwv"; + rev = "cddb2a40688b1dac8e0c62595bdffc0c6b5d40a3"; + sha256 = "0h8rrh34mqms27c2nq5f7k93kjvcv9qj0z9f1jjibvxrcw9lpp4y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1da33013f15825ab656260ce7453b8127e0286f4/recipes/apropospriate-theme"; @@ -2343,7 +2343,7 @@ }) {}; apu = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "apu"; - version = "20151231.1408"; + version = "20151231.1208"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/apu.el"; sha256 = "1xbvky0mspmbi8ghqhqhgbjn70acipwf0qwn6s5zdarwch10nljj"; @@ -2362,7 +2362,7 @@ archive-region = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "archive-region"; - version = "20140201.1742"; + version = "20140201.1542"; src = fetchFromGitHub { owner = "rubikitch"; repo = "archive-region"; @@ -2383,7 +2383,7 @@ arduino-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "arduino-mode"; - version = "20151018.135"; + version = "20151017.2335"; src = fetchFromGitHub { owner = "bookest"; repo = "arduino-mode"; @@ -2404,7 +2404,7 @@ aria2 = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "aria2"; - version = "20141107.1717"; + version = "20141107.1517"; src = fetchgit { url = "https://bitbucket.org/ukaszg/aria2.git"; rev = "3c54254e424c6c8b4eb0d8e7c4907b094c27a3f0"; @@ -2424,7 +2424,7 @@ ariadne = callPackage ({ bert, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ariadne"; - version = "20131117.1111"; + version = "20131117.911"; src = fetchFromGitHub { owner = "manzyuk"; repo = "ariadne-el"; @@ -2445,7 +2445,7 @@ arjen-grey-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "arjen-grey-theme"; - version = "20160403.1415"; + version = "20160403.1215"; src = fetchFromGitHub { owner = "credmp"; repo = "arjen-grey-theme"; @@ -2466,7 +2466,7 @@ artbollocks-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "artbollocks-mode"; - version = "20160603.1920"; + version = "20160603.1720"; src = fetchFromGitHub { owner = "sachac"; repo = "artbollocks-mode"; @@ -2487,7 +2487,7 @@ arview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "arview"; - version = "20160419.1609"; + version = "20160419.1409"; src = fetchFromGitHub { owner = "afainer"; repo = "arview"; @@ -2507,7 +2507,7 @@ }) {}; ascii = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "ascii"; - version = "20130824.700"; + version = "20130824.500"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/ascii.el"; sha256 = "05fjsj5nmc05cmsi0qj914dqdwk8rll1d4dwhn0crw36p2ivql75"; @@ -2526,7 +2526,7 @@ asilea = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "asilea"; - version = "20150105.925"; + version = "20150105.725"; src = fetchFromGitHub { owner = "Fanael"; repo = "asilea"; @@ -2547,7 +2547,7 @@ asn1-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "asn1-mode"; - version = "20160627.40"; + version = "20160626.2240"; src = fetchFromGitHub { owner = "kawabata"; repo = "asn1-mode"; @@ -2568,7 +2568,7 @@ assess = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, m-buffer, melpaBuild }: melpaBuild { pname = "assess"; - version = "20160628.1739"; + version = "20160628.1539"; src = fetchFromGitHub { owner = "phillord"; repo = "assess"; @@ -2589,12 +2589,12 @@ async = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "async"; - version = "20160513.328"; + version = "20160711.2235"; src = fetchFromGitHub { owner = "jwiegley"; repo = "emacs-async"; - rev = "0e327f72bdffc5bc4a1fbc34a8da1b7066e819b3"; - sha256 = "0w1cf78074is9n7wyfnyf1xjyydpyrbppf2xbvs9f1knmdajsph3"; + rev = "8bc0678ebca97e7b1c6e78e75e03f8dfd502d63a"; + sha256 = "1b56qfggajh2a3aanq3q40wa88nj5adpj6v85x2v4y5bi01r5nib"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6a0fe448e82f42cad0fdaa40c964032892fedd83/recipes/async"; @@ -2610,7 +2610,7 @@ at = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, queue }: melpaBuild { pname = "at"; - version = "20140707.720"; + version = "20140707.520"; src = fetchFromGitHub { owner = "skeeto"; repo = "at-el"; @@ -2631,7 +2631,7 @@ atom-dark-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "atom-dark-theme"; - version = "20151120.135"; + version = "20151119.2335"; src = fetchFromGitHub { owner = "whitlockjc"; repo = "atom-dark-theme-emacs"; @@ -2652,7 +2652,7 @@ atom-one-dark-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "atom-one-dark-theme"; - version = "20160521.1406"; + version = "20160521.1206"; src = fetchFromGitHub { owner = "jonathanchu"; repo = "atom-one-dark-theme"; @@ -2673,12 +2673,12 @@ auctex-latexmk = callPackage ({ auctex, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "auctex-latexmk"; - version = "20160522.1250"; + version = "20160706.503"; src = fetchFromGitHub { owner = "tom-tan"; repo = "auctex-latexmk"; - rev = "9b2e63c1de74a838375aae8de0858cefb9558de1"; - sha256 = "0myf7y4ayz79875vaqmms7ps9wk8p5sj4bd4vgxmzgfwi3vqdql4"; + rev = "bda696babcf4f4df435415e2d6a9c54fa99b230c"; + sha256 = "0zq4am4jgb1rnr2gvi9156y7zi6vfkrasjfj5ar1pw4k0cba7pf6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3f48af615c56f093dff417a5d3b705f9993c518f/recipes/auctex-latexmk"; @@ -2694,7 +2694,7 @@ auctex-lua = callPackage ({ auctex, fetchFromGitHub, fetchurl, lib, lua-mode, melpaBuild }: melpaBuild { pname = "auctex-lua"; - version = "20151121.1010"; + version = "20151121.810"; src = fetchFromGitHub { owner = "vermiculus"; repo = "auctex-lua"; @@ -2715,7 +2715,7 @@ audio-notes-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "audio-notes-mode"; - version = "20140204.1354"; + version = "20140204.1154"; src = fetchFromGitHub { owner = "Malabarba"; repo = "audio-notes-mode"; @@ -2736,7 +2736,7 @@ aurel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "aurel"; - version = "20160309.236"; + version = "20160309.36"; src = fetchFromGitHub { owner = "alezost"; repo = "aurel"; @@ -2757,7 +2757,7 @@ aurora-config-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "aurora-config-mode"; - version = "20140520.403"; + version = "20140520.203"; src = fetchFromGitHub { owner = "bdd"; repo = "aurora-config-mode.el"; @@ -2778,7 +2778,7 @@ aurora-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "aurora-theme"; - version = "20151015.1302"; + version = "20151015.1102"; src = fetchFromGitHub { owner = "xzerocode"; repo = "aurora-theme"; @@ -2799,7 +2799,7 @@ auth-password-store = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, seq }: melpaBuild { pname = "auth-password-store"; - version = "20160228.823"; + version = "20160228.623"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "auth-password-store"; @@ -2820,7 +2820,7 @@ auto-async-byte-compile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "auto-async-byte-compile"; - version = "20120322.1641"; + version = "20120322.1441"; src = fetchFromGitHub { owner = "rubikitch"; repo = "auto-async-byte-compile"; @@ -2841,7 +2841,7 @@ auto-auto-indent = callPackage ({ cl-lib ? null, es-lib, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "auto-auto-indent"; - version = "20131106.1303"; + version = "20131106.1103"; src = fetchFromGitHub { owner = "sabof"; repo = "auto-auto-indent"; @@ -2861,7 +2861,7 @@ }) {}; auto-capitalize = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "auto-capitalize"; - version = "20160415.1603"; + version = "20160415.1403"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/auto-capitalize.el"; sha256 = "0xywyfpsi64g9lihm5ncmjrj06iq9s6pp9fmsgj1hdf9y0z65lg0"; @@ -2880,7 +2880,7 @@ auto-compile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, packed }: melpaBuild { pname = "auto-compile"; - version = "20160424.618"; + version = "20160424.418"; src = fetchFromGitHub { owner = "tarsius"; repo = "auto-compile"; @@ -2901,12 +2901,12 @@ auto-complete = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "auto-complete"; - version = "20160416.804"; + version = "20160710.1544"; src = fetchFromGitHub { owner = "auto-complete"; repo = "auto-complete"; - rev = "08af29236e686c876ac7a45670562f3487ff02e0"; - sha256 = "19sdjwnjryzaq1rpjkvr3mjz9mg7cqzrrx5mqzic3aklgg71d53j"; + rev = "a9cb072fbad2f4c2c337e91e6ce257ff58c23ffa"; + sha256 = "19whmy8yigpsz21nxa64dlyvi1hczyw36iyiv8vl1906x0dxzma2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/083fb071191bccd6feb3fb84569373a597440fb1/recipes/auto-complete"; @@ -2922,7 +2922,7 @@ auto-complete-auctex = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "auto-complete-auctex"; - version = "20140223.1158"; + version = "20140223.958"; src = fetchFromGitHub { owner = "monsanto"; repo = "auto-complete-auctex"; @@ -2943,7 +2943,7 @@ auto-complete-c-headers = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "auto-complete-c-headers"; - version = "20150911.2223"; + version = "20150911.2023"; src = fetchFromGitHub { owner = "mooz"; repo = "auto-complete-c-headers"; @@ -2964,7 +2964,7 @@ auto-complete-chunk = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "auto-complete-chunk"; - version = "20140225.346"; + version = "20140225.146"; src = fetchFromGitHub { owner = "tkf"; repo = "auto-complete-chunk"; @@ -2985,7 +2985,7 @@ auto-complete-clang = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "auto-complete-clang"; - version = "20140409.252"; + version = "20140409.52"; src = fetchFromGitHub { owner = "brianjcj"; repo = "auto-complete-clang"; @@ -3006,7 +3006,7 @@ auto-complete-clang-async = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "auto-complete-clang-async"; - version = "20130526.1014"; + version = "20130526.814"; src = fetchFromGitHub { owner = "Golevka"; repo = "emacs-clang-complete-async"; @@ -3027,7 +3027,7 @@ auto-complete-exuberant-ctags = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "auto-complete-exuberant-ctags"; - version = "20140320.224"; + version = "20140320.24"; src = fetchFromGitHub { owner = "k1LoW"; repo = "auto-complete-exuberant-ctags"; @@ -3048,7 +3048,7 @@ auto-complete-nxml = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "auto-complete-nxml"; - version = "20140220.2258"; + version = "20140220.2058"; src = fetchFromGitHub { owner = "aki2o"; repo = "auto-complete-nxml"; @@ -3069,7 +3069,7 @@ auto-complete-pcmp = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }: melpaBuild { pname = "auto-complete-pcmp"; - version = "20140227.51"; + version = "20140226.2251"; src = fetchFromGitHub { owner = "aki2o"; repo = "auto-complete-pcmp"; @@ -3090,7 +3090,7 @@ auto-complete-rst = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "auto-complete-rst"; - version = "20140225.344"; + version = "20140225.144"; src = fetchFromGitHub { owner = "tkf"; repo = "auto-complete-rst"; @@ -3111,7 +3111,7 @@ auto-complete-sage = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, sage-shell-mode }: melpaBuild { pname = "auto-complete-sage"; - version = "20160514.251"; + version = "20160514.51"; src = fetchFromGitHub { owner = "stakemori"; repo = "auto-complete-sage"; @@ -3132,7 +3132,7 @@ auto-dictionary = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "auto-dictionary"; - version = "20150410.1110"; + version = "20150410.910"; src = fetchFromGitHub { owner = "nschum"; repo = "auto-dictionary-mode"; @@ -3153,7 +3153,7 @@ auto-dim-other-buffers = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "auto-dim-other-buffers"; - version = "20160128.1146"; + version = "20160128.946"; src = fetchFromGitHub { owner = "mina86"; repo = "auto-dim-other-buffers.el"; @@ -3174,7 +3174,7 @@ auto-highlight-symbol = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "auto-highlight-symbol"; - version = "20130313.443"; + version = "20130313.243"; src = fetchFromGitHub { owner = "gennad"; repo = "auto-highlight-symbol"; @@ -3195,7 +3195,7 @@ auto-indent-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "auto-indent-mode"; - version = "20160426.2222"; + version = "20160426.2022"; src = fetchFromGitHub { owner = "mattfidler"; repo = "auto-indent-mode.el"; @@ -3215,7 +3215,7 @@ }) {}; auto-install = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "auto-install"; - version = "20150418.1902"; + version = "20150418.1702"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/auto-install.el"; sha256 = "043pb2wk7jh0jgxphdl4848rjyabna26gj0vlhpiyd8zc361pg9d"; @@ -3234,7 +3234,7 @@ auto-package-update = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "auto-package-update"; - version = "20151026.111"; + version = "20151025.2311"; src = fetchFromGitHub { owner = "rranelli"; repo = "auto-package-update.el"; @@ -3255,7 +3255,7 @@ auto-pause = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "auto-pause"; - version = "20160426.716"; + version = "20160426.516"; src = fetchFromGitHub { owner = "lujun9972"; repo = "auto-pause"; @@ -3276,7 +3276,7 @@ auto-save-buffers-enhanced = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "auto-save-buffers-enhanced"; - version = "20130607.2149"; + version = "20130607.1949"; src = fetchFromGitHub { owner = "kentaro"; repo = "auto-save-buffers-enhanced"; @@ -3297,7 +3297,7 @@ auto-shell-command = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, popwin }: melpaBuild { pname = "auto-shell-command"; - version = "20160603.2138"; + version = "20160603.1938"; src = fetchFromGitHub { owner = "ongaeshi"; repo = "auto-shell-command"; @@ -3318,7 +3318,7 @@ auto-virtualenv = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, pyvenv, s }: melpaBuild { pname = "auto-virtualenv"; - version = "20160220.836"; + version = "20160220.636"; src = fetchFromGitHub { owner = "marcwebbie"; repo = "auto-virtualenv"; @@ -3339,7 +3339,7 @@ auto-yasnippet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "auto-yasnippet"; - version = "20160524.818"; + version = "20160524.618"; src = fetchFromGitHub { owner = "abo-abo"; repo = "auto-yasnippet"; @@ -3360,7 +3360,7 @@ autobookmarks = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "autobookmarks"; - version = "20160430.1421"; + version = "20160430.1221"; src = fetchFromGitHub { owner = "Fuco1"; repo = "autobookmarks"; @@ -3381,7 +3381,7 @@ autodisass-java-bytecode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "autodisass-java-bytecode"; - version = "20151005.1112"; + version = "20151005.912"; src = fetchFromGitHub { owner = "gbalats"; repo = "autodisass-java-bytecode"; @@ -3402,7 +3402,7 @@ autodisass-llvm-bitcode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "autodisass-llvm-bitcode"; - version = "20150410.2025"; + version = "20150410.1825"; src = fetchFromGitHub { owner = "gbalats"; repo = "autodisass-llvm-bitcode"; @@ -3423,7 +3423,7 @@ autofit-frame = callPackage ({ fetchurl, fit-frame, lib, melpaBuild }: melpaBuild { pname = "autofit-frame"; - version = "20151231.1409"; + version = "20151231.1209"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/autofit-frame.el"; sha256 = "1af45z1w69dkdk4mzjphwn420m9rrkc3djv5kpp6lzbxxnmswbqw"; @@ -3442,7 +3442,7 @@ automargin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "automargin"; - version = "20131112.214"; + version = "20131112.14"; src = fetchFromGitHub { owner = "zk-phi"; repo = "automargin"; @@ -3463,7 +3463,7 @@ autopair = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "autopair"; - version = "20160304.637"; + version = "20160304.437"; src = fetchFromGitHub { owner = "capitaomorte"; repo = "autopair"; @@ -3484,7 +3484,7 @@ autotest = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "autotest"; - version = "20150130.425"; + version = "20150130.225"; src = fetchFromGitHub { owner = "zenspider"; repo = "elisp"; @@ -3505,7 +3505,7 @@ autotetris-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "autotetris-mode"; - version = "20141114.1046"; + version = "20141114.846"; src = fetchFromGitHub { owner = "skeeto"; repo = "autotetris-mode"; @@ -3526,7 +3526,7 @@ autumn-light-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "autumn-light-theme"; - version = "20150515.947"; + version = "20150515.747"; src = fetchFromGitHub { owner = "aalpern"; repo = "emacs-color-theme-autumn-light"; @@ -3547,7 +3547,7 @@ avandu = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "avandu"; - version = "20140412.1626"; + version = "20140412.1426"; src = fetchFromGitHub { owner = "dk87"; repo = "avandu"; @@ -3568,12 +3568,12 @@ avy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "avy"; - version = "20160703.117"; + version = "20160722.512"; src = fetchFromGitHub { owner = "abo-abo"; repo = "avy"; - rev = "20ecb9bed63abcef28e1f36c72515380306c49c3"; - sha256 = "1483833hlv1w3bdmb6z43imrkgrkfvkx8sii9s7pk0pbniy3cfmd"; + rev = "a5fb9369e7b68c9786f2d620f064b4b93f2ae902"; + sha256 = "1glghza6x0n55hjhf7gn88z9s8a2ggs5d7rqjvc4n6c3p617ssrh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77fac7a702d4086fb860514e377037acedc60412/recipes/avy"; @@ -3589,12 +3589,12 @@ avy-flycheck = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, seq }: melpaBuild { pname = "avy-flycheck"; - version = "20160702.916"; + version = "20160720.800"; src = fetchFromGitHub { owner = "magicdirac"; repo = "avy-flycheck"; - rev = "9c01e7573254d925ac40c95e14ce56af4d223212"; - sha256 = "09xc7w0c8hrppxmnkcij4wqrmqbf6y2jqzzjicf1863rv2f8xcm9"; + rev = "5522f3bbbed1801d9278ed696ec0cbba38352985"; + sha256 = "1nwc8xid0k6bnnpgsrrlwx71a04llkiapjsbchp9jgcf11l5mghw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05755bed49219072d2ec98f0be5ecba4deda7cd1/recipes/avy-flycheck"; @@ -3610,7 +3610,7 @@ avy-menu = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "avy-menu"; - version = "20160126.625"; + version = "20160126.425"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "avy-menu"; @@ -3631,7 +3631,7 @@ avy-migemo = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, migemo }: melpaBuild { pname = "avy-migemo"; - version = "20160620.1020"; + version = "20160620.820"; src = fetchFromGitHub { owner = "momomo5717"; repo = "avy-migemo"; @@ -3652,7 +3652,7 @@ avy-zap = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "avy-zap"; - version = "20160330.1330"; + version = "20160330.1130"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "avy-zap"; @@ -3672,7 +3672,7 @@ }) {}; awk-it = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "awk-it"; - version = "20130917.1348"; + version = "20130917.1148"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/awk-it.el"; sha256 = "1r1vbi1r3rdbkyb2naciqwja7hxigjhqfxsfcinnygabsi7fw9aw"; @@ -3691,12 +3691,12 @@ aws-ec2 = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild, tablist }: melpaBuild { pname = "aws-ec2"; - version = "20160623.2321"; + version = "20160710.2110"; src = fetchFromGitHub { owner = "Yuki-Inoue"; repo = "aws.el"; - rev = "aab56335b2e70ca9599f238cd8f406632a1dca8d"; - sha256 = "05ah99b8mhd62mz5808qdgjn4rg9j5bf4vr6z78i70xzkxsg1dis"; + rev = "408c4e7973d5cf148c5379237d18326e99fdfca2"; + sha256 = "0k97xwyi1img990ynkq5lqh9g651azmb49p9400fs9m5z64q9hn8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/90ac00160cbf692baa1f3953122ac828356944e0/recipes/aws-ec2"; @@ -3712,7 +3712,7 @@ axiom-environment = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "axiom-environment"; - version = "20160325.1715"; + version = "20160325.1515"; src = fetchhg { url = "https://bitbucket.com/pdo/axiom-environment"; rev = "bc294e47f51c"; @@ -3732,7 +3732,7 @@ babel = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "babel"; - version = "20160629.1351"; + version = "20160629.1151"; src = fetchFromGitHub { owner = "juergenhoetzel"; repo = "babel"; @@ -3753,7 +3753,7 @@ babel-repl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "babel-repl"; - version = "20160504.1701"; + version = "20160504.1501"; src = fetchFromGitHub { owner = "hung-phan"; repo = "babel-repl"; @@ -3774,7 +3774,7 @@ back-button = callPackage ({ fetchFromGitHub, fetchurl, lib, list-utils, melpaBuild, nav-flash, pcache, persistent-soft, smartrep, ucs-utils }: melpaBuild { pname = "back-button"; - version = "20150804.1504"; + version = "20150804.1304"; src = fetchFromGitHub { owner = "rolandwalker"; repo = "back-button"; @@ -3801,7 +3801,7 @@ }) {}; backup-each-save = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "backup-each-save"; - version = "20130704.932"; + version = "20130704.732"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/backup-each-save.el"; sha256 = "0b9vvi2m0fdv36wj8mvawl951gjmg3pypg08a8n6rzn3rwg0fwz7"; @@ -3820,7 +3820,7 @@ backup-walker = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "backup-walker"; - version = "20130720.1016"; + version = "20130720.816"; src = fetchFromGitHub { owner = "lewang"; repo = "backup-walker"; @@ -3841,7 +3841,7 @@ badger-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "badger-theme"; - version = "20140716.2132"; + version = "20140716.1932"; src = fetchFromGitHub { owner = "ccann"; repo = "badger-theme"; @@ -3862,12 +3862,12 @@ badwolf-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "badwolf-theme"; - version = "20160521.655"; + version = "20160726.343"; src = fetchFromGitHub { owner = "bkruczyk"; repo = "badwolf-emacs"; - rev = "44c2994a5a7574d5bfa882f0bbe3f6080f9d0fc3"; - sha256 = "06l5b1dnz8gggqf1lsmw8x4mlra9pvpxzykjw06qaassfjjhaql2"; + rev = "a753ba4a7e5c432764bc8fea6d9596ab34e6b383"; + sha256 = "0lbzh2117y7pm7brnbffyvil2c6phwfbpy8153p72s974vffxjzf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/01f3deade0759830ed2e70e00e596915be5f5c11/recipes/badwolf-theme"; @@ -3883,7 +3883,7 @@ baidu-life = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "baidu-life"; - version = "20160426.719"; + version = "20160426.519"; src = fetchFromGitHub { owner = "lujun9972"; repo = "el-baidu-life"; @@ -3904,7 +3904,7 @@ base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "base16-theme"; - version = "20151019.911"; + version = "20151019.711"; src = fetchFromGitHub { owner = "mkaito"; repo = "base16-emacs"; @@ -3925,7 +3925,7 @@ bash-completion = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bash-completion"; - version = "20150514.928"; + version = "20150514.728"; src = fetchFromGitHub { owner = "szermatt"; repo = "emacs-bash-completion"; @@ -3946,12 +3946,12 @@ basic-c-compile = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "basic-c-compile"; - version = "20160627.2241"; + version = "20160719.2015"; src = fetchFromGitHub { owner = "nick96"; repo = "basic-c-compile"; - rev = "c76ca7763f61079b588ed61487e95da56fd0417e"; - sha256 = "1qsgh74af51shc30s71rrww9pffj7akm6zqvw63rwia8v1nbkqhp"; + rev = "57c9e08ed44f4daa7279f0cdc3176226e04d44ac"; + sha256 = "1mlmcpsxp90kgp4yqd7wxd3pxvfxgk76m2fjfnhd6frhksjg17jv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bdf8a23771774f630baa41b24375cb57f90fbb2e/recipes/basic-c-compile"; @@ -3967,7 +3967,7 @@ basic-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "basic-theme"; - version = "20151010.307"; + version = "20151010.107"; src = fetchFromGitHub { owner = "fgeller"; repo = "basic-theme.el"; @@ -3987,7 +3987,7 @@ }) {}; batch-mode = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "batch-mode"; - version = "20140807.1550"; + version = "20140807.1350"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/batch-mode.el"; sha256 = "1aa611jrzw4svmxvw1ghgh53x4nry0sl7mxmp4kxiaybqqvz6a1p"; @@ -4006,7 +4006,7 @@ bats-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bats-mode"; - version = "20160514.115"; + version = "20160513.2315"; src = fetchFromGitHub { owner = "dougm"; repo = "bats-mode"; @@ -4027,7 +4027,7 @@ bbcode-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bbcode-mode"; - version = "20141103.1541"; + version = "20141103.1341"; src = fetchFromGitHub { owner = "ejmr"; repo = "bbcode-mode"; @@ -4047,11 +4047,11 @@ }) {}; bbdb = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bbdb"; - version = "20151114.1741"; + version = "20160720.2318"; src = fetchgit { url = "git://git.savannah.nongnu.org/bbdb.git"; - rev = "8fce6df3ab09250d545a2ed373ae64e68d12ff4c"; - sha256 = "1nglakzpcy2pizg80ny1w972vq74v5jgzdvgqp69jkb7312cqzvd"; + rev = "2ea2846d5f34a843dcaf666ad0fc8f603d949b16"; + sha256 = "1xhxnw2svxnb0g3wj86ffcjcsx9jf29s0cpxj2nqgab9r5pyqh1k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6b6801fe29cb6fb6183f0babf528375d14f966b3/recipes/bbdb"; @@ -4067,7 +4067,7 @@ bbdb- = callPackage ({ bbdb, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }: melpaBuild { pname = "bbdb-"; - version = "20140221.1754"; + version = "20140221.1554"; src = fetchFromGitHub { owner = "aki2o"; repo = "bbdb-"; @@ -4088,7 +4088,7 @@ bbdb-android = callPackage ({ bbdb-vcard, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bbdb-android"; - version = "20150706.24"; + version = "20150705.2224"; src = fetchFromGitHub { owner = "tumashu"; repo = "bbdb-android"; @@ -4109,7 +4109,7 @@ bbdb-china = callPackage ({ bbdb-vcard, chinese-pyim, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bbdb-china"; - version = "20150615.2056"; + version = "20150615.1856"; src = fetchFromGitHub { owner = "tumashu"; repo = "bbdb-china"; @@ -4130,7 +4130,7 @@ bbdb-csv-import = callPackage ({ bbdb, dash, fetchFromGitLab, fetchurl, lib, melpaBuild, pcsv }: melpaBuild { pname = "bbdb-csv-import"; - version = "20140802.642"; + version = "20140802.442"; src = fetchFromGitLab { owner = "iankelling"; repo = "bbdb-csv-import"; @@ -4151,7 +4151,7 @@ bbdb-ext = callPackage ({ bbdb, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bbdb-ext"; - version = "20151220.1413"; + version = "20151220.1213"; src = fetchFromGitHub { owner = "vapniks"; repo = "bbdb-ext"; @@ -4172,7 +4172,7 @@ bbdb-handy = callPackage ({ bbdb, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bbdb-handy"; - version = "20150707.1952"; + version = "20150707.1752"; src = fetchFromGitHub { owner = "tumashu"; repo = "bbdb-handy"; @@ -4193,7 +4193,7 @@ bbdb-vcard = callPackage ({ bbdb, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bbdb-vcard"; - version = "20150713.1550"; + version = "20150713.1350"; src = fetchFromGitHub { owner = "tohojo"; repo = "bbdb-vcard"; @@ -4214,7 +4214,7 @@ bbdb2erc = callPackage ({ bbdb, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bbdb2erc"; - version = "20130607.129"; + version = "20130606.2329"; src = fetchFromGitHub { owner = "unhammer"; repo = "bbdb2erc"; @@ -4235,7 +4235,7 @@ bbyac = callPackage ({ browse-kill-ring, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bbyac"; - version = "20150316.501"; + version = "20150316.301"; src = fetchFromGitHub { owner = "baohaojun"; repo = "bbyac"; @@ -4256,7 +4256,7 @@ bdo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bdo"; - version = "20140126.301"; + version = "20140126.101"; src = fetchFromGitHub { owner = "chrisdone"; repo = "bdo"; @@ -4277,12 +4277,12 @@ beacon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "beacon"; - version = "20160526.1950"; + version = "20160708.2012"; src = fetchFromGitHub { owner = "Malabarba"; repo = "beacon"; - rev = "aaeb619f1ff57e666925bcef22bb3195c22d589e"; - sha256 = "0hjzh5dgwzr4sq9pj22g0cfkqdcd01aq5dcpg96c8xq8b8ga81g6"; + rev = "c9cc62d42ef0c14079c97890bdd402c8efa4e52b"; + sha256 = "0j9l2j22nj1dddqa9ykdcv4an3xipn1zwp8kaw84ac18fql0br7x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d09cfab21be800831644218e9c8c4433087951c0/recipes/beacon"; @@ -4298,7 +4298,7 @@ beeminder = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "beeminder"; - version = "20160209.2103"; + version = "20160209.1903"; src = fetchFromGitHub { owner = "Sodaware"; repo = "beeminder.el"; @@ -4319,7 +4319,7 @@ beginend = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "beginend"; - version = "20150607.1201"; + version = "20150607.1001"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "beginend"; @@ -4340,7 +4340,7 @@ benchmark-init = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "benchmark-init"; - version = "20150905.438"; + version = "20150905.238"; src = fetchFromGitHub { owner = "dholm"; repo = "benchmark-init-el"; @@ -4361,7 +4361,7 @@ bert = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bert"; - version = "20131117.414"; + version = "20131117.214"; src = fetchFromGitHub { owner = "manzyuk"; repo = "bert-el"; @@ -4382,7 +4382,7 @@ better-defaults = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "better-defaults"; - version = "20160620.108"; + version = "20160619.2308"; src = fetchFromGitHub { owner = "technomancy"; repo = "better-defaults"; @@ -4402,7 +4402,7 @@ }) {}; better-registers = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "better-registers"; - version = "20140813.319"; + version = "20140813.119"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/better-registers.el"; sha256 = "05dlhhvd1m9q642gqqj6klif13shbinqi6bi72fldidi1z6wcqlh"; @@ -4421,7 +4421,7 @@ bf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bf-mode"; - version = "20130403.942"; + version = "20130403.742"; src = fetchFromGitHub { owner = "emacs-jp"; repo = "bf-mode"; @@ -4442,7 +4442,7 @@ bfbuilder = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bfbuilder"; - version = "20150924.1150"; + version = "20150924.950"; src = fetchFromGitHub { owner = "zk-phi"; repo = "bfbuilder"; @@ -4463,7 +4463,7 @@ biblio = callPackage ({ biblio-core, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "biblio"; - version = "20160625.1123"; + version = "20160625.923"; src = fetchFromGitHub { owner = "cpitclaudel"; repo = "biblio.el"; @@ -4484,7 +4484,7 @@ biblio-core = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, seq }: melpaBuild { pname = "biblio-core"; - version = "20160625.1123"; + version = "20160625.923"; src = fetchFromGitHub { owner = "cpitclaudel"; repo = "biblio.el"; @@ -4505,7 +4505,7 @@ bibretrieve = callPackage ({ auctex, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bibretrieve"; - version = "20131013.1332"; + version = "20131013.1132"; src = fetchFromGitHub { owner = "pzorin"; repo = "bibretrieve"; @@ -4526,7 +4526,7 @@ bibslurp = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "bibslurp"; - version = "20151202.1746"; + version = "20151202.1546"; src = fetchFromGitHub { owner = "mkmcc"; repo = "bibslurp"; @@ -4547,7 +4547,7 @@ bibtex-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bibtex-utils"; - version = "20150924.847"; + version = "20150924.647"; src = fetchFromGitHub { owner = "plantarum"; repo = "bibtex-utils"; @@ -4568,7 +4568,7 @@ bind-chord = callPackage ({ bind-key, fetchFromGitHub, fetchurl, key-chord, lib, melpaBuild }: melpaBuild { pname = "bind-chord"; - version = "20160530.1242"; + version = "20160530.1042"; src = fetchFromGitHub { owner = "waymondo"; repo = "use-package-chords"; @@ -4589,12 +4589,12 @@ bind-key = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bind-key"; - version = "20160227.248"; + version = "20160227.48"; src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "56687f58c499db608167065b8d94a371902f3ed4"; - sha256 = "0dr8zkx6nr4n7i02l7v5k36cckiwjrrxafh72pi2qzk3b7n1yvrm"; + rev = "c191614a009bf02d7af63e306bab6d296e1849e3"; + sha256 = "1v9s01g03sgy42pqaslcchwza3zw14d18qfidiggcic7ffl6sy0j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key"; @@ -4610,7 +4610,7 @@ bind-map = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bind-map"; - version = "20160606.1543"; + version = "20160606.1343"; src = fetchFromGitHub { owner = "justbur"; repo = "emacs-bind-map"; @@ -4631,7 +4631,7 @@ bing-dict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bing-dict"; - version = "20160616.2020"; + version = "20160616.1820"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "bing-dict.el"; @@ -4652,7 +4652,7 @@ birds-of-paradise-plus-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "birds-of-paradise-plus-theme"; - version = "20130419.1629"; + version = "20130419.1429"; src = fetchFromGitHub { owner = "jimeh"; repo = "birds-of-paradise-plus-theme.el"; @@ -4673,7 +4673,7 @@ bison-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bison-mode"; - version = "20160617.52"; + version = "20160616.2252"; src = fetchFromGitHub { owner = "Wilfred"; repo = "bison-mode"; @@ -4694,7 +4694,7 @@ bitbake = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode, s }: melpaBuild { pname = "bitbake"; - version = "20160613.356"; + version = "20160613.156"; src = fetchFromGitHub { owner = "canatella"; repo = "bitbake-el"; @@ -4715,7 +4715,7 @@ bitlbee = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bitlbee"; - version = "20151202.1800"; + version = "20151202.1600"; src = fetchFromGitHub { owner = "pjones"; repo = "bitlbee-el"; @@ -4736,7 +4736,7 @@ bitly = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bitly"; - version = "20151125.1048"; + version = "20151125.848"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "bitly-el"; @@ -4756,7 +4756,7 @@ }) {}; blank-mode = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "blank-mode"; - version = "20130824.659"; + version = "20130824.459"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/blank-mode.el"; sha256 = "1wdplnmdllbydwr9gyyq4fbkxl5xjh7220vd4iajyv74pg2jkkkv"; @@ -4775,7 +4775,7 @@ blgrep = callPackage ({ clmemo, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "blgrep"; - version = "20150401.916"; + version = "20150401.716"; src = fetchFromGitHub { owner = "ataka"; repo = "blgrep"; @@ -4796,7 +4796,7 @@ bliss-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bliss-theme"; - version = "20141116.101"; + version = "20141115.2301"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-bliss-theme"; @@ -4817,7 +4817,7 @@ blockdiag-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "blockdiag-mode"; - version = "20160427.24"; + version = "20160426.2224"; src = fetchFromGitHub { owner = "xcezx"; repo = "blockdiag-mode"; @@ -4838,7 +4838,7 @@ blog-admin = callPackage ({ ctable, f, fetchFromGitHub, fetchurl, lib, melpaBuild, names, s }: melpaBuild { pname = "blog-admin"; - version = "20160609.2135"; + version = "20160609.1935"; src = fetchFromGitHub { owner = "CodeFalling"; repo = "blog-admin"; @@ -4859,7 +4859,7 @@ bm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bm"; - version = "20151222.1803"; + version = "20151222.1603"; src = fetchFromGitHub { owner = "joodland"; repo = "bm"; @@ -4880,7 +4880,7 @@ bnfc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bnfc"; - version = "20160605.1427"; + version = "20160605.1227"; src = fetchFromGitHub { owner = "jmitchell"; repo = "bnfc-mode"; @@ -4901,12 +4901,12 @@ bog = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bog"; - version = "20160613.2305"; + version = "20160725.1801"; src = fetchFromGitHub { owner = "kyleam"; repo = "bog"; - rev = "32ab80807923682b6cdaa897b0ee02c1defa86c5"; - sha256 = "1nzfjfm0vxc3hlpsd8fz1q1y3hvbl3i2qlmrgdhjlkp6g70s4r75"; + rev = "fc71c376546ed01060200de91d007f2a179bc601"; + sha256 = "13z0zpy9ggam0v16kzqn5gncvmil3magrvrvhm304gvsqqglyiqi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19fd0bf2f8e52c79120c492a6dcabdd51b465d35/recipes/bog"; @@ -4922,7 +4922,7 @@ bongo = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bongo"; - version = "20160623.1258"; + version = "20160623.1058"; src = fetchFromGitHub { owner = "dbrock"; repo = "bongo"; @@ -4943,7 +4943,7 @@ bonjourmadame = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bonjourmadame"; - version = "20160112.356"; + version = "20160112.156"; src = fetchFromGitHub { owner = "pierre-lecocq"; repo = "bonjourmadame"; @@ -4964,7 +4964,7 @@ boogie-friends = callPackage ({ cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }: melpaBuild { pname = "boogie-friends"; - version = "20160629.1830"; + version = "20160629.1630"; src = fetchFromGitHub { owner = "boogie-org"; repo = "boogie-friends"; @@ -4984,7 +4984,7 @@ }) {}; bookmark-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "bookmark-plus"; - version = "20160624.934"; + version = "20160624.948"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/bookmark+.el"; sha256 = "06621js3bvslfmzmkphzzcrd8hbixin2nx30ammcqaa6572y14ad"; @@ -5003,12 +5003,12 @@ boon = callPackage ({ emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }: melpaBuild { pname = "boon"; - version = "20160502.806"; + version = "20160725.1059"; src = fetchFromGitHub { owner = "jyp"; repo = "boon"; - rev = "47e04abf608cc16f52ed87fa69f64a3f7ac62706"; - sha256 = "16mlhc00wd1vakzfwda4zhp5q9xvd34xyb9ibwy6fayd06brfaad"; + rev = "199d30229e26a98c11516d78ef10483d540c42c4"; + sha256 = "052ybgvw7n11x75lhwn9758pdnjmal03wpzlsmcj145fzklxxjvr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/boon"; @@ -5024,7 +5024,7 @@ borland-blue-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "borland-blue-theme"; - version = "20160117.721"; + version = "20160117.521"; src = fetchFromGitHub { owner = "fourier"; repo = "borland-blue-theme"; @@ -5045,7 +5045,7 @@ boron-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "boron-theme"; - version = "20150117.1152"; + version = "20150117.952"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-boron-theme"; @@ -5066,7 +5066,7 @@ boxquote = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "boxquote"; - version = "20081011.1526"; + version = "20081011.1326"; src = fetchFromGitHub { owner = "davep"; repo = "boxquote.el"; @@ -5087,7 +5087,7 @@ bpe = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bpe"; - version = "20141228.1605"; + version = "20141228.1405"; src = fetchFromGitHub { owner = "yuutayamada"; repo = "bpe"; @@ -5108,7 +5108,7 @@ bpr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bpr"; - version = "20160514.658"; + version = "20160514.458"; src = fetchFromGitHub { owner = "ilya-babanov"; repo = "emacs-bpr"; @@ -5129,7 +5129,7 @@ bracketed-paste = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bracketed-paste"; - version = "20160407.1848"; + version = "20160407.1648"; src = fetchFromGitHub { owner = "hchbaw"; repo = "bracketed-paste.el"; @@ -5150,7 +5150,7 @@ brainfuck-mode = callPackage ({ fetchFromGitHub, fetchurl, langdoc, lib, melpaBuild }: melpaBuild { pname = "brainfuck-mode"; - version = "20150113.242"; + version = "20150113.42"; src = fetchFromGitHub { owner = "tom-tan"; repo = "brainfuck-mode"; @@ -5171,7 +5171,7 @@ broadcast = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "broadcast"; - version = "20151204.2012"; + version = "20151204.1812"; src = fetchFromGitHub { owner = "killdash9"; repo = "broadcast.el"; @@ -5192,7 +5192,7 @@ browse-at-remote = callPackage ({ cl-lib ? null, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "browse-at-remote"; - version = "20160618.305"; + version = "20160618.105"; src = fetchFromGitHub { owner = "rmuslimov"; repo = "browse-at-remote"; @@ -5213,7 +5213,7 @@ browse-kill-ring = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "browse-kill-ring"; - version = "20160125.209"; + version = "20160125.9"; src = fetchFromGitHub { owner = "browse-kill-ring"; repo = "browse-kill-ring"; @@ -5234,7 +5234,7 @@ browse-kill-ring-plus = callPackage ({ browse-kill-ring, fetchurl, lib, melpaBuild }: melpaBuild { pname = "browse-kill-ring-plus"; - version = "20151231.1421"; + version = "20151231.1221"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/browse-kill-ring+.el"; sha256 = "1z6pix1ml3s97jh34fwjj008ihlrz4hkipdh5yzcvc6nhrimjw2f"; @@ -5253,7 +5253,7 @@ browse-url-dwim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, string-utils }: melpaBuild { pname = "browse-url-dwim"; - version = "20140731.1422"; + version = "20140731.1222"; src = fetchFromGitHub { owner = "rolandwalker"; repo = "browse-url-dwim"; @@ -5273,7 +5273,7 @@ }) {}; bs-ext = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "bs-ext"; - version = "20130824.659"; + version = "20130824.459"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/bs-ext.el"; sha256 = "1yslzlx54n17330sf6b2pynz01y6ifnkhipz4hggn1i55bz8hvrw"; @@ -5292,7 +5292,7 @@ btc-ticker = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, request }: melpaBuild { pname = "btc-ticker"; - version = "20151113.859"; + version = "20151113.659"; src = fetchFromGitHub { owner = "niedbalski"; repo = "emacs-btc-ticker"; @@ -5313,7 +5313,7 @@ bts = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, pos-tip, s, widget-mvc, yaxception }: melpaBuild { pname = "bts"; - version = "20151109.733"; + version = "20151109.533"; src = fetchFromGitHub { owner = "aki2o"; repo = "emacs-bts"; @@ -5334,7 +5334,7 @@ bts-github = callPackage ({ bts, fetchFromGitHub, fetchurl, gh, lib, melpaBuild }: melpaBuild { pname = "bts-github"; - version = "20150108.227"; + version = "20150108.27"; src = fetchFromGitHub { owner = "aki2o"; repo = "emacs-bts-github"; @@ -5355,7 +5355,7 @@ bubbleberry-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bubbleberry-theme"; - version = "20141017.444"; + version = "20141017.244"; src = fetchFromGitHub { owner = "jasonm23"; repo = "emacs-bubbleberry-theme"; @@ -5376,7 +5376,7 @@ buffer-buttons = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buffer-buttons"; - version = "20150106.839"; + version = "20150106.639"; src = fetchFromGitHub { owner = "rpav"; repo = "buffer-buttons"; @@ -5397,7 +5397,7 @@ buffer-flip = callPackage ({ fetchFromGitHub, fetchurl, key-chord, lib, melpaBuild }: melpaBuild { pname = "buffer-flip"; - version = "20160109.2054"; + version = "20160109.1854"; src = fetchFromGitHub { owner = "killdash9"; repo = "buffer-flip.el"; @@ -5415,31 +5415,10 @@ license = lib.licenses.free; }; }) {}; - buffer-layers = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "buffer-layers"; - version = "20160615.1657"; - src = fetchFromGitHub { - owner = "swflint"; - repo = "buffer-layers"; - rev = "2e0302c79273b8e7ba04932abc55ca5da66d6eaa"; - sha256 = "1ynxb5zvr4kh49z79k4bxksm1syjzk2167nswraiikq2g7b3z88c"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/40e29173cacaf734a002648fa92a075908cd1ba3/recipes/buffer-layers"; - sha256 = "1k78h9caw8hi6l0znba47fxzh16y90nm5bn4c5x9xpc4g0z5ah0g"; - name = "buffer-layers"; - }; - packageRequires = [ cl-lib ]; - meta = { - homepage = "https://melpa.org/#/buffer-layers"; - license = lib.licenses.free; - }; - }) {}; buffer-move = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buffer-move"; - version = "20160615.1303"; + version = "20160615.1103"; src = fetchFromGitHub { owner = "lukhas"; repo = "buffer-move"; @@ -5457,9 +5436,30 @@ license = lib.licenses.free; }; }) {}; + buffer-sets = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "buffer-sets"; + version = "20160723.1903"; + src = fetchFromGitHub { + owner = "swflint"; + repo = "buffer-sets"; + rev = "3739e04b6778738cf2db757eac519f4626d94e02"; + sha256 = "14v7m3i9j10vxad2vq7gd3lwdkzy33b4i2cf5m6l0pbsq8ndzkry"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/dc99dde16a23ba5f07848bd4a8483cbe384e7a6d/recipes/buffer-sets"; + sha256 = "1011x76h8sqk4lp85gddwc9hagmcsykywn0h7qpv0z9bmwqj1s43"; + name = "buffer-sets"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/buffer-sets"; + license = lib.licenses.free; + }; + }) {}; buffer-stack = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "buffer-stack"; - version = "20101223.420"; + version = "20101223.220"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/buffer-stack.el"; sha256 = "0d87cl7a4rcd6plbjyf26vaar7imwd18z24xdi4dz734m9zbkg6r"; @@ -5478,7 +5478,7 @@ buffer-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buffer-utils"; - version = "20140512.900"; + version = "20140512.700"; src = fetchFromGitHub { owner = "rolandwalker"; repo = "buffer-utils"; @@ -5499,7 +5499,7 @@ bufshow = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bufshow"; - version = "20130711.1239"; + version = "20130711.1039"; src = fetchFromGitHub { owner = "pjones"; repo = "bufshow"; @@ -5520,7 +5520,7 @@ bug-reference-github = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bug-reference-github"; - version = "20131202.1503"; + version = "20131202.1303"; src = fetchFromGitHub { owner = "arnested"; repo = "bug-reference-github"; @@ -5541,7 +5541,7 @@ bundler = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }: melpaBuild { pname = "bundler"; - version = "20160121.524"; + version = "20160121.324"; src = fetchFromGitHub { owner = "tobiassvn"; repo = "bundler.el"; @@ -5562,7 +5562,7 @@ bury-successful-compilation = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bury-successful-compilation"; - version = "20150328.1928"; + version = "20150328.1728"; src = fetchFromGitHub { owner = "EricCrosson"; repo = "bury-successful-compilation"; @@ -5583,7 +5583,7 @@ buster-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buster-mode"; - version = "20140928.713"; + version = "20140928.513"; src = fetchFromGitHub { owner = "magnars"; repo = "buster-mode"; @@ -5604,7 +5604,7 @@ buster-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "buster-snippets"; - version = "20151125.410"; + version = "20151125.210"; src = fetchFromGitHub { owner = "magnars"; repo = "buster-snippets.el"; @@ -5625,7 +5625,7 @@ busybee-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "busybee-theme"; - version = "20130920.1142"; + version = "20130920.942"; src = fetchFromGitHub { owner = "mswift42"; repo = "busybee-theme"; @@ -5646,7 +5646,7 @@ butler = callPackage ({ deferred, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "butler"; - version = "20150811.1908"; + version = "20150811.1708"; src = fetchFromGitHub { owner = "AshtonKem"; repo = "Butler"; @@ -5667,12 +5667,12 @@ buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buttercup"; - version = "20160514.234"; + version = "20160514.34"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "emacs-buttercup"; - rev = "cef998879676fa118af486fb3e9b79c5958dcc77"; - sha256 = "16r3qfva20blfxh54l4p85m2x4fq7hwj71rlblp5ipicna7zs4dn"; + rev = "5db07c940e3acbd20111391c72edfa847e7a5409"; + sha256 = "1928m4368rrcsg242nk3i06fdd6r03aiwh8iz589j00w4761y4kq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b187cb5b3cc5b546bfa6b94b6792e6363242d1/recipes/buttercup"; @@ -5688,7 +5688,7 @@ button-lock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "button-lock"; - version = "20150223.754"; + version = "20150223.554"; src = fetchFromGitHub { owner = "rolandwalker"; repo = "button-lock"; @@ -5709,7 +5709,7 @@ c-c-combo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "c-c-combo"; - version = "20151223.2055"; + version = "20151223.1855"; src = fetchFromGitHub { owner = "CestDiego"; repo = "c-c-combo.el"; @@ -5730,12 +5730,12 @@ c-eldoc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "c-eldoc"; - version = "20150904.332"; + version = "20160704.957"; src = fetchFromGitHub { owner = "nflath"; repo = "c-eldoc"; - rev = "3baef9b6300370bd8db3ea7636084afcdebc6e85"; - sha256 = "0mlm5f66541namqn04vx6csf14mxhsiknbm36yqdnp1lxb7knv7a"; + rev = "008a2e70cd690ff5689145e01086316002b237fb"; + sha256 = "1rzx185d1qqb9rirw97vl9449ax4n72ak6k0q7mscrxz9k8vd00p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/c-eldoc"; @@ -5751,7 +5751,7 @@ c0-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "c0-mode"; - version = "20151110.1252"; + version = "20151110.1052"; src = fetchFromGitHub { owner = "catern"; repo = "c0-mode"; @@ -5772,7 +5772,7 @@ cabledolphin = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "cabledolphin"; - version = "20160204.338"; + version = "20160204.138"; src = fetchFromGitHub { owner = "legoscia"; repo = "cabledolphin"; @@ -5793,7 +5793,7 @@ cache = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cache"; - version = "20111019.1800"; + version = "20111019.1600"; src = fetchFromGitHub { owner = "nflath"; repo = "cache"; @@ -5814,7 +5814,7 @@ cacoo = callPackage ({ concurrent, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cacoo"; - version = "20120319.1859"; + version = "20120319.1659"; src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-cacoo"; @@ -5835,7 +5835,7 @@ cake = callPackage ({ anything, cake-inflector, fetchFromGitHub, fetchurl, historyf, lib, melpaBuild }: melpaBuild { pname = "cake"; - version = "20140603.2331"; + version = "20140603.2131"; src = fetchFromGitHub { owner = "k1LoW"; repo = "emacs-cake"; @@ -5856,7 +5856,7 @@ cake-inflector = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "cake-inflector"; - version = "20140415.358"; + version = "20140415.158"; src = fetchFromGitHub { owner = "k1LoW"; repo = "emacs-cake-inflector"; @@ -5877,7 +5877,7 @@ cake2 = callPackage ({ anything, cake-inflector, dash, f, fetchFromGitHub, fetchurl, historyf, ht, json ? null, lib, melpaBuild, s }: melpaBuild { pname = "cake2"; - version = "20140626.742"; + version = "20140626.542"; src = fetchFromGitHub { owner = "k1LoW"; repo = "emacs-cake2"; @@ -5898,7 +5898,7 @@ cal-china-x = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cal-china-x"; - version = "20160102.324"; + version = "20160102.124"; src = fetchFromGitHub { owner = "xwl"; repo = "cal-china-x"; @@ -5919,7 +5919,7 @@ calfw = callPackage ({ fetchFromGitHub, fetchurl, google-maps, lib, melpaBuild }: melpaBuild { pname = "calfw"; - version = "20160302.2058"; + version = "20160302.1858"; src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-calfw"; @@ -5940,7 +5940,7 @@ calfw-gcal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "calfw-gcal"; - version = "20120111.400"; + version = "20120111.200"; src = fetchFromGitHub { owner = "myuhe"; repo = "calfw-gcal.el"; @@ -5961,7 +5961,7 @@ calmer-forest-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "calmer-forest-theme"; - version = "20130926.10"; + version = "20130925.2210"; src = fetchFromGitHub { owner = "caldwell"; repo = "calmer-forest-theme"; @@ -5982,7 +5982,7 @@ camcorder = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }: melpaBuild { pname = "camcorder"; - version = "20160404.2334"; + version = "20160404.2134"; src = fetchFromGitHub { owner = "Malabarba"; repo = "camcorder.el"; @@ -6002,7 +6002,7 @@ }) {}; caml = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild }: melpaBuild { pname = "caml"; - version = "20151009.1045"; + version = "20151009.845"; src = fetchsvn { url = "http://caml.inria.fr/svn/ocaml/trunk/emacs/"; rev = "16551"; @@ -6022,7 +6022,7 @@ capture = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "capture"; - version = "20130828.1144"; + version = "20130828.944"; src = fetchFromGitHub { owner = "pashinin"; repo = "capture.el"; @@ -6043,7 +6043,7 @@ cargo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }: melpaBuild { pname = "cargo"; - version = "20160525.719"; + version = "20160525.519"; src = fetchFromGitHub { owner = "kwrooijen"; repo = "cargo.el"; @@ -6064,7 +6064,7 @@ caroline-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "caroline-theme"; - version = "20160318.20"; + version = "20160317.2220"; src = fetchFromGitHub { owner = "xjackk"; repo = "caroline-theme"; @@ -6085,7 +6085,7 @@ caseformat = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "caseformat"; - version = "20160115.1015"; + version = "20160115.815"; src = fetchFromGitHub { owner = "HKey"; repo = "caseformat"; @@ -6106,12 +6106,12 @@ cask = callPackage ({ cl-lib ? null, dash, epl, f, fetchFromGitHub, fetchurl, lib, melpaBuild, package-build, s, shut-up }: melpaBuild { pname = "cask"; - version = "20151123.728"; + version = "20160708.519"; src = fetchFromGitHub { owner = "cask"; repo = "cask"; - rev = "f9e804ea96d14e24ae49eeb72d95d44e358b38f2"; - sha256 = "1xhnh9zjlsycwx4fa83pn70zvrv538a7lmlgmq9vmn8i6jrwj63g"; + rev = "885ee04ff83639b0a08eea1b65e091b139d43656"; + sha256 = "1jsgnaqwaql893rnchn6y3272kigfdykiplxgi2jknfqdb9kpjn1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/cask"; @@ -6127,7 +6127,7 @@ cask-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cask-mode"; - version = "20160410.949"; + version = "20160410.749"; src = fetchFromGitHub { owner = "Wilfred"; repo = "cask-mode"; @@ -6148,7 +6148,7 @@ cask-package-toolset = callPackage ({ ansi, cl-lib ? null, commander, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }: melpaBuild { pname = "cask-package-toolset"; - version = "20160102.337"; + version = "20160102.137"; src = fetchFromGitHub { owner = "AdrieanKhisbe"; repo = "cask-package-toolset.el"; @@ -6169,7 +6169,7 @@ caskxy = callPackage ({ fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }: melpaBuild { pname = "caskxy"; - version = "20140513.1039"; + version = "20140513.839"; src = fetchFromGitHub { owner = "aki2o"; repo = "caskxy"; @@ -6190,7 +6190,7 @@ cbm = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cbm"; - version = "20160628.1548"; + version = "20160628.1348"; src = fetchFromGitHub { owner = "akermu"; repo = "cbm.el"; @@ -6211,7 +6211,7 @@ ccc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ccc"; - version = "20151205.743"; + version = "20151205.543"; src = fetchFromGitHub { owner = "skk-dev"; repo = "ddskk"; @@ -6232,7 +6232,7 @@ cd-compile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cd-compile"; - version = "20141108.1357"; + version = "20141108.1157"; src = fetchFromGitHub { owner = "jamienicol"; repo = "emacs-cd-compile"; @@ -6253,7 +6253,7 @@ cdb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cdb"; - version = "20151205.743"; + version = "20151205.543"; src = fetchFromGitHub { owner = "skk-dev"; repo = "ddskk"; @@ -6274,7 +6274,7 @@ cdlatex = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cdlatex"; - version = "20140707.626"; + version = "20140707.426"; src = fetchFromGitHub { owner = "cdominik"; repo = "cdlatex"; @@ -6295,7 +6295,7 @@ cdnjs = callPackage ({ cl-lib ? null, dash, deferred, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "cdnjs"; - version = "20140217.1512"; + version = "20140217.1312"; src = fetchFromGitHub { owner = "yasuyk"; repo = "cdnjs.el"; @@ -6316,7 +6316,7 @@ cedit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cedit"; - version = "20141231.1014"; + version = "20141231.814"; src = fetchFromGitHub { owner = "zk-phi"; repo = "cedit"; @@ -6337,7 +6337,7 @@ celery = callPackage ({ dash-functional, deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "celery"; - version = "20150812.347"; + version = "20150812.147"; src = fetchFromGitHub { owner = "ardumont"; repo = "emacs-celery"; @@ -6358,7 +6358,7 @@ centered-cursor-mode = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "centered-cursor-mode"; - version = "20151001.834"; + version = "20151001.634"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/centered-cursor-mode.el"; sha256 = "15psyizjz8wf9wfxwwcdmg1bxf8jbv0qy40rskz7si7vxin8hhxl"; @@ -6377,7 +6377,7 @@ centered-window-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "centered-window-mode"; - version = "20160210.447"; + version = "20160210.247"; src = fetchFromGitHub { owner = "anler"; repo = "centered-window-mode"; @@ -6398,7 +6398,7 @@ centimacro = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "centimacro"; - version = "20140306.827"; + version = "20140306.627"; src = fetchFromGitHub { owner = "abo-abo"; repo = "centimacro"; @@ -6419,7 +6419,7 @@ cerbere = callPackage ({ f, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }: melpaBuild { pname = "cerbere"; - version = "20140418.915"; + version = "20140418.715"; src = fetchFromGitHub { owner = "nlamirault"; repo = "cerbere"; @@ -6440,12 +6440,12 @@ cfengine-code-style = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cfengine-code-style"; - version = "20131209.611"; + version = "20131209.411"; src = fetchFromGitHub { owner = "cfengine"; repo = "core"; - rev = "7187b1f7e5f89ad14fc87f1172953f9121cf6d63"; - sha256 = "13zfjzxzhxqbz5zy5dnbd3l2nii9p5qwj9g2phmagsq80ygqmsgj"; + rev = "439d194be4eb3405848af952fdbb9725195b3be4"; + sha256 = "1xsnv8qhfh9cgq39xawsqjjj00jxbnhxhhpvq5q916k10v33yqpw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style"; @@ -6461,7 +6461,7 @@ cff = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cff"; - version = "20160118.1418"; + version = "20160118.1218"; src = fetchFromGitHub { owner = "fourier"; repo = "cff"; @@ -6481,11 +6481,11 @@ }) {}; cg = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cg"; - version = "20160414.909"; + version = "20160713.59"; src = fetchsvn { url = "http://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs"; - rev = "11670"; - sha256 = "1ninfjra12s9agrzb115wrcphkb38flacnjgw1czw6sdqjjxcnp4"; + rev = "11696"; + sha256 = "09iwd8xx29z2p2dnpzckqap8a50sbcr3p6yh4zyxcdn7w6jq02hr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a275ee794b0aa30b1348bb3a984114eef8dfc808/recipes/cg"; @@ -6501,7 +6501,7 @@ change-inner = callPackage ({ expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "change-inner"; - version = "20150707.1044"; + version = "20150707.844"; src = fetchFromGitHub { owner = "magnars"; repo = "change-inner.el"; @@ -6522,7 +6522,7 @@ chapel-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "chapel-mode"; - version = "20160504.308"; + version = "20160504.108"; src = fetchFromGitHub { owner = "russel"; repo = "Emacs-Chapel-Mode"; @@ -6543,12 +6543,12 @@ char-menu = callPackage ({ avy-menu, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "char-menu"; - version = "20160204.15"; + version = "20160203.2215"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "char-menu"; - rev = "b19b1abed6bcf582e0f21c401bc5ae86fd9d7524"; - sha256 = "0jdjf8mg0as90hb01kgwgcbng4cqaq4h9gd2v5pfl250c1mdq13g"; + rev = "da1524f37453086d2c5178b62c5173fb66b2ca8e"; + sha256 = "00jf4nv7i1ppsag5p91ldqa47i92ikxkfr7fzzp5kkp9swx1zvyb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f6676747e853045b3b19e7fc9524c793c6a08303/recipes/char-menu"; @@ -6564,7 +6564,7 @@ character-fold-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "character-fold-plus"; - version = "20160227.1703"; + version = "20160227.1503"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/character-fold+.el"; sha256 = "0xvgxjyl6s6hds7m9brzly6vxj06m47hxkw5h2riscq6l4nwc9vz"; @@ -6583,7 +6583,7 @@ charmap = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "charmap"; - version = "20160309.346"; + version = "20160309.146"; src = fetchFromGitHub { owner = "lateau"; repo = "charmap"; @@ -6604,7 +6604,7 @@ chatwork = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "chatwork"; - version = "20150807.2148"; + version = "20150807.1948"; src = fetchFromGitHub { owner = "ataka"; repo = "chatwork"; @@ -6625,7 +6625,7 @@ cheatsheet = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cheatsheet"; - version = "20151203.351"; + version = "20151203.151"; src = fetchFromGitHub { owner = "darksmile"; repo = "cheatsheet"; @@ -6646,7 +6646,7 @@ checkbox = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "checkbox"; - version = "20141116.1858"; + version = "20141116.1658"; src = fetchFromGitHub { owner = "camdez"; repo = "checkbox.el"; @@ -6667,12 +6667,12 @@ chee = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "chee"; - version = "20160611.1915"; + version = "20160720.1318"; src = fetchFromGitHub { owner = "eikek"; repo = "chee"; - rev = "697833178bb5f19a74d42df8ca50436e22dd0cec"; - sha256 = "1hnwrzhq17yw38njngmb1jv3yrx9j83a3xcagzm3dsnbpw833yiw"; + rev = "be183aeb6157c0aad552cc5bf5eda3914b496419"; + sha256 = "07bmbl835smck78azcr5xmvdgb8igcyd883xfwq2ivm12v55vhrq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9f4a3775720924e5a292819511a8ea42efe1a7dc/recipes/chee"; @@ -6688,7 +6688,7 @@ cheerilee = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xelb }: melpaBuild { pname = "cheerilee"; - version = "20160313.1335"; + version = "20160313.1135"; src = fetchFromGitHub { owner = "Vannil"; repo = "cheerilee.el"; @@ -6709,7 +6709,7 @@ chef-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "chef-mode"; - version = "20111121.900"; + version = "20111121.700"; src = fetchFromGitHub { owner = "mpasternacki"; repo = "chef-mode"; @@ -6730,7 +6730,7 @@ cherry-blossom-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cherry-blossom-theme"; - version = "20150621.2242"; + version = "20150621.2042"; src = fetchFromGitHub { owner = "inlinestyle"; repo = "emacs-cherry-blossom-theme"; @@ -6751,7 +6751,7 @@ chicken-scheme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "chicken-scheme"; - version = "20141116.1339"; + version = "20141116.1139"; src = fetchFromGitHub { owner = "dleslie"; repo = "chicken-scheme.el"; @@ -6772,7 +6772,7 @@ chinese-conv = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "chinese-conv"; - version = "20160218.1515"; + version = "20160218.1315"; src = fetchFromGitHub { owner = "gucong"; repo = "emacs-chinese-conv"; @@ -6793,12 +6793,12 @@ chinese-fonts-setup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "chinese-fonts-setup"; - version = "20160602.106"; + version = "20160708.1722"; src = fetchFromGitHub { owner = "tumashu"; repo = "chinese-fonts-setup"; - rev = "9926412a91be504e95abba5e9bdcf9f0f901f6b6"; - sha256 = "0hsyjlfvpj7hv08fwq41gp636sng3k5fi6gmxwi3wzxqxfhq7h4y"; + rev = "431aa98f645dbd299de815293e140d4de85a4adb"; + sha256 = "0y07w2hvc1fysh0a063lincv8l8ygqdl5zpv66lfk83rzgc00q6d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c536882e613e83a4a2baf86479bfb3efb86d916a/recipes/chinese-fonts-setup"; @@ -6814,12 +6814,12 @@ chinese-pyim = callPackage ({ async, chinese-pyim-basedict, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip }: melpaBuild { pname = "chinese-pyim"; - version = "20160629.648"; + version = "20160723.436"; src = fetchFromGitHub { owner = "tumashu"; repo = "chinese-pyim"; - rev = "915f77912f0f8cfe064c6872cae5c0709e4e094e"; - sha256 = "004xnn6j4jc607h5qcl9jr0dqvhvqvgm77wrbdmdxpwd6hwp2sf4"; + rev = "2e51081b84ad31dc05f6a12e4c6b9cc2b5fa9ba4"; + sha256 = "1sl8kgbfsxxp7ib5ymgk1mqhsqr1p7pggcnzx7la45mm77s7pr4n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/157a264533124ba05c161aa93a32c7209f002fba/recipes/chinese-pyim"; @@ -6835,12 +6835,12 @@ chinese-pyim-basedict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "chinese-pyim-basedict"; - version = "20160627.658"; + version = "20160723.438"; src = fetchFromGitHub { owner = "tumashu"; repo = "chinese-pyim-basedict"; - rev = "f13b6d20629a0b691ead626cca249b227622fa83"; - sha256 = "1ddld5jkhqarm31p6qjdvdha36k6yqaz3jzg3lyzd0nkavcmdq57"; + rev = "59ea301585ef832022f92e2d75dec7e000611301"; + sha256 = "0zbdb8snwxwyhm7inynsnx0rrr6dm9mh5lslzy29c6837jzgg2f6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e2315ffe7d13928eddaf217a5f67a3e0dd5e62a1/recipes/chinese-pyim-basedict"; @@ -6856,7 +6856,7 @@ chinese-pyim-greatdict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "chinese-pyim-greatdict"; - version = "20160619.2309"; + version = "20160619.2109"; src = fetchFromGitHub { owner = "tumashu"; repo = "chinese-pyim-greatdict"; @@ -6877,7 +6877,7 @@ chinese-remote-input = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "chinese-remote-input"; - version = "20150110.2303"; + version = "20150110.2103"; src = fetchFromGitHub { owner = "tumashu"; repo = "chinese-remote-input"; @@ -6898,7 +6898,7 @@ chinese-wbim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "chinese-wbim"; - version = "20150623.2250"; + version = "20150623.2050"; src = fetchFromGitHub { owner = "zilongshanren"; repo = "chinese-wbim"; @@ -6919,7 +6919,7 @@ chinese-word-at-point = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "chinese-word-at-point"; - version = "20150618.2038"; + version = "20150618.1838"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "chinese-word-at-point.el"; @@ -6940,7 +6940,7 @@ chinese-yasdcv = callPackage ({ chinese-pyim, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "chinese-yasdcv"; - version = "20150702.816"; + version = "20150702.616"; src = fetchFromGitHub { owner = "tumashu"; repo = "chinese-yasdcv"; @@ -6960,7 +6960,7 @@ }) {}; chm-view = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "chm-view"; - version = "20110616.1219"; + version = "20110616.1019"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/chm-view.el"; sha256 = "1r274pf0xrcdml4sy2nhhp3v5pr3y3s4lvk45hd3pmw1i4pw2fd8"; @@ -6979,7 +6979,7 @@ chronos = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "chronos"; - version = "20150602.1029"; + version = "20150602.829"; src = fetchFromGitHub { owner = "dxknight"; repo = "chronos"; @@ -7000,7 +7000,7 @@ chruby = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "chruby"; - version = "20151204.630"; + version = "20151204.430"; src = fetchFromGitHub { owner = "plexus"; repo = "chruby.el"; @@ -7021,12 +7021,12 @@ cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }: melpaBuild { pname = "cider"; - version = "20160629.1146"; + version = "20160725.136"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "cider"; - rev = "ce55e3648baf64db63f7113c4fc6c5ef349cf84c"; - sha256 = "01d9f6wiznc929297dvny4w23fris0ym0149pwl0yk7fn9cgl4zb"; + rev = "b8932a37b936a34b923ce4e356379ea76108ec6d"; + sha256 = "07xb09csppk2rbffbyiy22mx4s7cd5h48nx428dag7q13fvarc31"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider"; @@ -7042,7 +7042,7 @@ cider-decompile = callPackage ({ cider, fetchFromGitHub, fetchurl, javap-mode, lib, melpaBuild }: melpaBuild { pname = "cider-decompile"; - version = "20151121.2337"; + version = "20151121.2137"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "cider-decompile"; @@ -7063,7 +7063,7 @@ cider-eval-sexp-fu = callPackage ({ emacs, eval-sexp-fu, fetchFromGitHub, fetchurl, highlight, lib, melpaBuild }: melpaBuild { pname = "cider-eval-sexp-fu"; - version = "20160412.128"; + version = "20160411.2328"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "cider-eval-sexp-fu"; @@ -7084,7 +7084,7 @@ cider-profile = callPackage ({ cider, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cider-profile"; - version = "20141120.825"; + version = "20141120.625"; src = fetchFromGitHub { owner = "thunknyc"; repo = "nrepl-profile"; @@ -7105,7 +7105,7 @@ cider-spy = callPackage ({ cider, cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, noflet }: melpaBuild { pname = "cider-spy"; - version = "20160313.940"; + version = "20160313.740"; src = fetchFromGitHub { owner = "jonpither"; repo = "cider-spy"; @@ -7126,7 +7126,7 @@ cil-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cil-mode"; - version = "20160622.930"; + version = "20160622.730"; src = fetchFromGitHub { owner = "ForNeVeR"; repo = "cil-mode"; @@ -7147,7 +7147,7 @@ cinspect = callPackage ({ cl-lib ? null, deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, python-environment }: melpaBuild { pname = "cinspect"; - version = "20150715.2133"; + version = "20150715.1933"; src = fetchFromGitHub { owner = "inlinestyle"; repo = "cinspect-mode"; @@ -7168,7 +7168,7 @@ circe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "circe"; - version = "20160608.1515"; + version = "20160608.1315"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; @@ -7189,7 +7189,7 @@ circe-notifications = callPackage ({ alert, circe, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "circe-notifications"; - version = "20160605.1004"; + version = "20160605.804"; src = fetchFromGitHub { owner = "eqyiel"; repo = "circe-notifications"; @@ -7210,7 +7210,7 @@ cl-format = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cl-format"; - version = "20160412.1945"; + version = "20160412.1745"; src = fetchFromGitHub { owner = "alvinfrancis"; repo = "cl-format"; @@ -7231,7 +7231,7 @@ cl-lib-highlight = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cl-lib-highlight"; - version = "20140127.1512"; + version = "20140127.1312"; src = fetchFromGitHub { owner = "skeeto"; repo = "cl-lib-highlight"; @@ -7252,11 +7252,11 @@ clang-format = callPackage ({ cl-lib ? null, fetchsvn, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clang-format"; - version = "20151116.638"; + version = "20151116.438"; src = fetchsvn { url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format"; - rev = "274468"; - sha256 = "1nx3lbjl2kykxdjry36hq4mc7kbh3dp0i1dc6pr3lgpc0w8hg55z"; + rev = "276856"; + sha256 = "10vsflngqd1q4wrggm867n0j5hzchxc731bjz59vd9qvljddmzbb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69e56114948419a27f06204f6fe5326cc250ae28/recipes/clang-format"; @@ -7272,7 +7272,7 @@ clean-aindent-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clean-aindent-mode"; - version = "20150816.2229"; + version = "20150816.2029"; src = fetchFromGitHub { owner = "pmarinov"; repo = "clean-aindent-mode"; @@ -7293,7 +7293,7 @@ clean-buffers = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clean-buffers"; - version = "20160529.1759"; + version = "20160529.1559"; src = fetchFromGitHub { owner = "lujun9972"; repo = "clean-buffers"; @@ -7314,7 +7314,7 @@ clear-text = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clear-text"; - version = "20160406.1543"; + version = "20160406.1343"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "clear-text.el"; @@ -7335,7 +7335,7 @@ clevercss = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clevercss"; - version = "20131228.1955"; + version = "20131228.1755"; src = fetchFromGitHub { owner = "jschaf"; repo = "CleverCSS-Mode"; @@ -7356,7 +7356,7 @@ click-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "click-mode"; - version = "20160331.1648"; + version = "20160331.1448"; src = fetchFromGitHub { owner = "bmalehorn"; repo = "click-mode"; @@ -7377,7 +7377,7 @@ cliphist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "cliphist"; - version = "20160502.2112"; + version = "20160502.1912"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "cliphist"; @@ -7398,7 +7398,7 @@ clipmon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clipmon"; - version = "20160128.1204"; + version = "20160128.1004"; src = fetchFromGitHub { owner = "bburns"; repo = "clipmon"; @@ -7419,7 +7419,7 @@ clippy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip }: melpaBuild { pname = "clippy"; - version = "20140417.614"; + version = "20140417.414"; src = fetchFromGitHub { owner = "Fuco1"; repo = "clippy.el"; @@ -7440,7 +7440,7 @@ clips-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clips-mode"; - version = "20131012.1601"; + version = "20131012.1401"; src = fetchFromGitHub { owner = "grettke"; repo = "clips-mode"; @@ -7461,7 +7461,7 @@ 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 = "20160621.1102"; + version = "20160621.902"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clj-refactor.el"; @@ -7494,7 +7494,7 @@ cljr-helm = callPackage ({ clj-refactor, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "cljr-helm"; - version = "20150425.1507"; + version = "20150425.1307"; src = fetchFromGitHub { owner = "philjackson"; repo = "cljr-helm"; @@ -7515,7 +7515,7 @@ cljsbuild-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cljsbuild-mode"; - version = "20160402.1200"; + version = "20160402.1000"; src = fetchFromGitHub { owner = "kototama"; repo = "cljsbuild-mode"; @@ -7536,7 +7536,7 @@ clmemo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clmemo"; - version = "20160326.1123"; + version = "20160326.923"; src = fetchFromGitHub { owner = "ataka"; repo = "clmemo"; @@ -7557,7 +7557,7 @@ cloc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cloc"; - version = "20151007.401"; + version = "20151007.201"; src = fetchFromGitHub { owner = "cosmicexplorer"; repo = "cloc-emacs"; @@ -7578,7 +7578,7 @@ clocker = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "clocker"; - version = "20160125.1705"; + version = "20160125.1505"; src = fetchFromGitHub { owner = "roman"; repo = "clocker.el"; @@ -7599,7 +7599,7 @@ clojars = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred }: melpaBuild { pname = "clojars"; - version = "20160518.2335"; + version = "20160518.2135"; src = fetchFromGitHub { owner = "joshuamiller"; repo = "clojars.el"; @@ -7620,12 +7620,12 @@ clojure-cheatsheet = callPackage ({ cider, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "clojure-cheatsheet"; - version = "20160320.515"; + version = "20160707.118"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-cheatsheet"; - rev = "d277b4eea6bb91886f10f57a46d1c7e950a547b0"; - sha256 = "0943fh8309mvg73paf97i2mfkrnl04x11gy8iz73c9622bkkmpcb"; + rev = "11544e07d788df0fe82a2cf6c496f73fbda4955c"; + sha256 = "1gzfgzykyj9nsi970j9v2fpdlll8by7dg308yh8q3ahq5jk09p92"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0569da79bd8145df334965c5d4364a50b6b548fa/recipes/clojure-cheatsheet"; @@ -7641,12 +7641,12 @@ clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clojure-mode"; - version = "20160627.120"; + version = "20160725.652"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "f24c5369341a71ace3a2fd85fbbdaafd9c5d3c43"; - sha256 = "1w8igclqgy2z9298q0jg2a2h8xcgwgdr00fmwz1yxhwwd3qy68jj"; + rev = "a5492a08017faa837d506666a82649b50fd23511"; + sha256 = "02ws4q7dygv7gjb6cg6mccx43ahi49bqx7f9k0c9jr6raq1qqm22"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode"; @@ -7662,12 +7662,12 @@ clojure-mode-extra-font-locking = callPackage ({ clojure-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clojure-mode-extra-font-locking"; - version = "20160307.614"; + version = "20160307.414"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "f24c5369341a71ace3a2fd85fbbdaafd9c5d3c43"; - sha256 = "1w8igclqgy2z9298q0jg2a2h8xcgwgdr00fmwz1yxhwwd3qy68jj"; + rev = "a5492a08017faa837d506666a82649b50fd23511"; + sha256 = "02ws4q7dygv7gjb6cg6mccx43ahi49bqx7f9k0c9jr6raq1qqm22"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking"; @@ -7683,7 +7683,7 @@ clojure-quick-repls = callPackage ({ cider, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clojure-quick-repls"; - version = "20150814.236"; + version = "20150814.36"; src = fetchFromGitHub { owner = "symfrog"; repo = "clojure-quick-repls"; @@ -7704,7 +7704,7 @@ clojure-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "clojure-snippets"; - version = "20160305.802"; + version = "20160305.602"; src = fetchFromGitHub { owner = "mpenet"; repo = "clojure-snippets"; @@ -7725,12 +7725,12 @@ clomacs = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clomacs"; - version = "20160513.353"; + version = "20160720.845"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clomacs"; - rev = "42f19bc9517a2a512fe4955872c58b44e746cb0a"; - sha256 = "0wc2zv4xirw3whpgrdhw156mz0m6had3nwk1xm1zswzblkgv754w"; + rev = "7f1de411a25fbdb490b2d8050111e6408c087550"; + sha256 = "18scwjfa5k9xd3d9dynsp9jaqm59arn8zzayi203yjbr7nkfzdr2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/345f9797e87e3f5f957c167a5e3d33d1e31b50a3/recipes/clomacs"; @@ -7746,7 +7746,7 @@ closql = callPackage ({ emacs, emacsql-sqlite, fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "closql"; - version = "20160415.2116"; + version = "20160415.1916"; src = fetchFromGitLab { owner = "tarsius"; repo = "closql"; @@ -7767,7 +7767,7 @@ closure-lint-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "closure-lint-mode"; - version = "20101118.1524"; + version = "20101118.1324"; src = fetchFromGitHub { owner = "r0man"; repo = "closure-lint-mode"; @@ -7788,7 +7788,7 @@ cloud-to-butt-erc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cloud-to-butt-erc"; - version = "20130627.1808"; + version = "20130627.1608"; src = fetchFromGitHub { owner = "leathekd"; repo = "cloud-to-butt-erc"; @@ -7809,7 +7809,7 @@ clues-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clues-theme"; - version = "20140922.2256"; + version = "20140922.2056"; src = fetchFromGitHub { owner = "jasonm23"; repo = "emacs-clues-theme"; @@ -7830,7 +7830,7 @@ cm-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cm-mode"; - version = "20160310.1029"; + version = "20160310.829"; src = fetchFromGitHub { owner = "joostkremers"; repo = "criticmarkup-emacs"; @@ -7851,7 +7851,7 @@ cmake-font-lock = callPackage ({ cmake-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cmake-font-lock"; - version = "20150828.1527"; + version = "20150828.1327"; src = fetchFromGitHub { owner = "Lindydancer"; repo = "cmake-font-lock"; @@ -7872,12 +7872,12 @@ cmake-ide = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, levenshtein, lib, melpaBuild, seq }: melpaBuild { pname = "cmake-ide"; - version = "20160701.1337"; + version = "20160719.853"; src = fetchFromGitHub { owner = "atilaneves"; repo = "cmake-ide"; - rev = "a2e476ad42e61075cae9beb35fb83e3c1bf8619e"; - sha256 = "0n169i4y2c450bk5r284bakjk3hsg74pply5fqxvdm6p5p1z2vr1"; + rev = "f69b6ee2153b13008285b65ce7cb30f66b89e9bd"; + sha256 = "1bm5m35yd760k5g9yr7krqcaxr1vckfphnb8lc7s14znbqf69vac"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17e8a8a5205d222950dc8e9245549a48894b864a/recipes/cmake-ide"; @@ -7893,12 +7893,12 @@ cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cmake-mode"; - version = "20160510.1340"; + version = "20160510.1140"; src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "a24cd6525ad656901b663f4d7bc0990db4c8c8ec"; - sha256 = "105jax6crchfclf5ys5smccia0rzvwy5bsyb9ldv7x6y1lwlhv1n"; + rev = "73c618be7036c693cbff764b3765de1bf4626cfb"; + sha256 = "1xjz2zspal9ycp5mds0jvc3agbn91qzy92w37j6yg3j6hyglv3wc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -7914,7 +7914,7 @@ cmake-project = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cmake-project"; - version = "20150720.1559"; + version = "20150720.1359"; src = fetchFromGitHub { owner = "alamaison"; repo = "emacs-cmake-project"; @@ -7934,7 +7934,7 @@ }) {}; cmds-menu = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "cmds-menu"; - version = "20151231.1430"; + version = "20151231.1230"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/cmds-menu.el"; sha256 = "13r8pjxknsfd6ywzlgcy4bm7fvr768ba34k6b7y365y3c1asz6y3"; @@ -7953,7 +7953,7 @@ cmm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cmm-mode"; - version = "20150225.146"; + version = "20150224.2346"; src = fetchFromGitHub { owner = "bgamari"; repo = "cmm-mode"; @@ -7974,7 +7974,7 @@ cn-outline = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cn-outline"; - version = "20100321.1114"; + version = "20100321.914"; src = fetchFromGitHub { owner = "mori-dev"; repo = "cn-outline"; @@ -7995,7 +7995,7 @@ cobra-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cobra-mode"; - version = "20140116.1516"; + version = "20140116.1316"; src = fetchFromGitHub { owner = "Nekroze"; repo = "cobra-mode"; @@ -8016,7 +8016,7 @@ code-library = callPackage ({ fetchFromGitHub, fetchurl, gist, lib, melpaBuild }: melpaBuild { pname = "code-library"; - version = "20160426.718"; + version = "20160426.518"; src = fetchFromGitHub { owner = "lujun9972"; repo = "code-library"; @@ -8037,7 +8037,7 @@ codebug = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "codebug"; - version = "20140929.1637"; + version = "20140929.1437"; src = fetchFromGitHub { owner = "shano"; repo = "emacs-codebug"; @@ -8058,7 +8058,7 @@ codesearch = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "codesearch"; - version = "20160111.855"; + version = "20160111.655"; src = fetchFromGitHub { owner = "abingham"; repo = "codesearch.el"; @@ -8079,7 +8079,7 @@ codic = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "codic"; - version = "20150926.627"; + version = "20150926.427"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-codic"; @@ -8100,7 +8100,7 @@ coffee-fof = callPackage ({ coffee-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "coffee-fof"; - version = "20131012.730"; + version = "20131012.530"; src = fetchFromGitHub { owner = "yasuyk"; repo = "coffee-fof"; @@ -8121,7 +8121,7 @@ coffee-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "coffee-mode"; - version = "20160520.346"; + version = "20160520.146"; src = fetchFromGitHub { owner = "defunkt"; repo = "coffee-mode"; @@ -8142,7 +8142,7 @@ col-highlight = callPackage ({ fetchurl, lib, melpaBuild, vline }: melpaBuild { pname = "col-highlight"; - version = "20151231.1433"; + version = "20151231.1233"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/col-highlight.el"; sha256 = "1fpkymmgv58b734d2rr7cfj2j2if1qkwgrpk3yp2ibw2n2567y0s"; @@ -8161,12 +8161,12 @@ colemak-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "colemak-evil"; - version = "20140508.1812"; + version = "20140508.1612"; src = fetchFromGitHub { owner = "patbl"; repo = "colemak-evil"; - rev = "cd2c75848ab0ad1aec42ca421d03a923166fa228"; - sha256 = "0jjj1miwc7hw2fbb1fnmfnydim81djswla8iy4waam9014yraqci"; + rev = "624985835a9e8192c687b99f7d59e7d01713c453"; + sha256 = "1bwbqb9j5cn9b42n4w8nr6sqyk40xcp06mnxn9f28w4hnjd12pqj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0f0750a3f9537782ee61d6e56c51ce7b86def12e/recipes/colemak-evil"; @@ -8182,7 +8182,7 @@ colonoscopy-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "colonoscopy-theme"; - version = "20141116.101"; + version = "20141115.2301"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-colonoscopy-theme"; @@ -8203,7 +8203,7 @@ color-identifiers-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "color-identifiers-mode"; - version = "20160519.1346"; + version = "20160519.1146"; src = fetchFromGitHub { owner = "ankurdave"; repo = "color-identifiers-mode"; @@ -8224,7 +8224,7 @@ color-moccur = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "color-moccur"; - version = "20141222.1835"; + version = "20141222.1635"; src = fetchFromGitHub { owner = "myuhe"; repo = "color-moccur.el"; @@ -8245,7 +8245,7 @@ color-theme = callPackage ({ fetchbzr, fetchurl, lib, melpaBuild }: melpaBuild { pname = "color-theme"; - version = "20080305.234"; + version = "20080305.34"; src = fetchbzr { url = "http://bzr.savannah.gnu.org/r/color-theme/trunk"; rev = "57"; @@ -8265,7 +8265,7 @@ color-theme-approximate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "color-theme-approximate"; - version = "20140227.2236"; + version = "20140227.2036"; src = fetchFromGitHub { owner = "tungd"; repo = "color-theme-approximate"; @@ -8286,7 +8286,7 @@ color-theme-buffer-local = callPackage ({ color-theme, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "color-theme-buffer-local"; - version = "20151012.1828"; + version = "20151012.1628"; src = fetchFromGitHub { owner = "vic"; repo = "color-theme-buffer-local"; @@ -8307,7 +8307,7 @@ color-theme-modern = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "color-theme-modern"; - version = "20160411.2046"; + version = "20160411.1846"; src = fetchFromGitHub { owner = "emacs-jp"; repo = "replace-colorthemes"; @@ -8328,7 +8328,7 @@ color-theme-sanityinc-solarized = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "color-theme-sanityinc-solarized"; - version = "20160429.2103"; + version = "20160429.1903"; src = fetchFromGitHub { owner = "purcell"; repo = "color-theme-sanityinc-solarized"; @@ -8349,12 +8349,12 @@ color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "color-theme-sanityinc-tomorrow"; - version = "20160601.614"; + version = "20160710.1625"; src = fetchFromGitHub { owner = "purcell"; repo = "color-theme-sanityinc-tomorrow"; - rev = "67efc9c4363a171498bd9fc44361c4f8e23031b1"; - sha256 = "1cnr8rkyibba1y3lf4fhldh429nnfx14s5qnx839ybzffk666mgq"; + rev = "c0fcc63ede0727c6de66bafb8d7ba0e6f5e33b83"; + sha256 = "03qxwpvhfs7iwpwykm53d3z30yqyfrr0j4wsdla2pjz9c04668yz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-tomorrow"; @@ -8370,7 +8370,7 @@ color-theme-solarized = callPackage ({ color-theme, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "color-theme-solarized"; - version = "20160626.943"; + version = "20160626.743"; src = fetchFromGitHub { owner = "sellout"; repo = "emacs-color-theme-solarized"; @@ -8391,7 +8391,7 @@ colorsarenice-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "colorsarenice-theme"; - version = "20150421.1536"; + version = "20150421.1336"; src = fetchFromGitHub { owner = "Fanael"; repo = "colorsarenice-theme"; @@ -8412,7 +8412,7 @@ column-enforce-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "column-enforce-mode"; - version = "20140902.1149"; + version = "20140902.949"; src = fetchFromGitHub { owner = "jordonbiondo"; repo = "column-enforce-mode"; @@ -8432,7 +8432,7 @@ }) {}; column-marker = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "column-marker"; - version = "20121128.243"; + version = "20121128.43"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/column-marker.el"; sha256 = "05bv198zhqw5hqq6cr11mhz02dpca74hhp1ycwq369m0yb2naxy9"; @@ -8451,7 +8451,7 @@ command-log-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "command-log-mode"; - version = "20160412.2347"; + version = "20160412.2147"; src = fetchFromGitHub { owner = "lewang"; repo = "command-log-mode"; @@ -8472,7 +8472,7 @@ command-queue = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "command-queue"; - version = "20160328.1225"; + version = "20160328.1025"; src = fetchFromGitHub { owner = "Yuki-Inoue"; repo = "command-queue"; @@ -8493,7 +8493,7 @@ commander = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "commander"; - version = "20140120.1252"; + version = "20140120.1052"; src = fetchFromGitHub { owner = "rejeep"; repo = "commander.el"; @@ -8514,7 +8514,7 @@ comment-dwim-2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "comment-dwim-2"; - version = "20150825.1749"; + version = "20150825.1549"; src = fetchFromGitHub { owner = "remyferre"; repo = "comment-dwim-2"; @@ -8535,7 +8535,7 @@ commenter = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "commenter"; - version = "20160219.1027"; + version = "20160219.827"; src = fetchFromGitHub { owner = "yuutayamada"; repo = "commenter"; @@ -8556,12 +8556,12 @@ commify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "commify"; - version = "20151110.338"; + version = "20160724.2032"; src = fetchFromGitHub { owner = "ddoherty03"; repo = "commify"; - rev = "921467f666c05ccec9cf3bc0a8168eade20bcb6a"; - sha256 = "04bma9sdn7h8fjz62wlcwayzhr7lvzhidh48wc5rk195zlbgagwa"; + rev = "61db2dd77fc68a82767ae71a81a7059a97bcf115"; + sha256 = "0z6zpxrv0c21vv3k4kzahfl32db33h7v1x4ip1adskjdj4pa013g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fec4b048e1dc78a07acce7d2e6527b9f417d06d5/recipes/commify"; @@ -8577,7 +8577,7 @@ common-lisp-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "common-lisp-snippets"; - version = "20160531.1103"; + version = "20160531.903"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "common-lisp-snippets"; @@ -8598,12 +8598,12 @@ company = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company"; - version = "20160626.2103"; + version = "20160720.1548"; src = fetchFromGitHub { owner = "company-mode"; repo = "company-mode"; - rev = "d3032e237e7b4f732ccc351908d2e5280919af67"; - sha256 = "1fykd5gmi4h81pkm8faavfli2h0k627qqjs0c1i0056cchhivgi5"; + rev = "3d369e1a7e011efa9b5afeec5fc930b85f898903"; + sha256 = "0rpcr3gpdq7nhjxj3nrv6knnscg415xz9aldg11k6xn6iljcs86x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company"; @@ -8619,7 +8619,7 @@ company-anaconda = callPackage ({ anaconda-mode, cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "company-anaconda"; - version = "20160509.617"; + version = "20160509.417"; src = fetchFromGitHub { owner = "proofit404"; repo = "company-anaconda"; @@ -8640,7 +8640,7 @@ company-ansible = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-ansible"; - version = "20150901.450"; + version = "20150901.250"; src = fetchFromGitHub { owner = "krzysztof-magosa"; repo = "company-ansible"; @@ -8661,7 +8661,7 @@ company-arduino = callPackage ({ arduino-mode, cl-lib ? null, company, company-c-headers, company-irony, emacs, fetchFromGitHub, fetchurl, irony, lib, melpaBuild }: melpaBuild { pname = "company-arduino"; - version = "20160306.1139"; + version = "20160306.939"; src = fetchFromGitHub { owner = "yuutayamada"; repo = "company-arduino"; @@ -8690,7 +8690,7 @@ company-auctex = callPackage ({ auctex, company, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "company-auctex"; - version = "20151102.843"; + version = "20151102.643"; src = fetchFromGitHub { owner = "alexeyr"; repo = "company-auctex"; @@ -8711,7 +8711,7 @@ company-c-headers = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-c-headers"; - version = "20150801.1101"; + version = "20150801.901"; src = fetchFromGitHub { owner = "randomphrase"; repo = "company-c-headers"; @@ -8732,7 +8732,7 @@ company-cabal = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-cabal"; - version = "20151216.920"; + version = "20151216.720"; src = fetchFromGitHub { owner = "iquiw"; repo = "company-cabal"; @@ -8753,12 +8753,12 @@ company-coq = callPackage ({ cl-lib ? null, company, company-math, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "company-coq"; - version = "20160623.1811"; + version = "20160715.344"; src = fetchFromGitHub { owner = "cpitclaudel"; repo = "company-coq"; - rev = "851ceb63957d88ea8ecd517526c512cab79f8160"; - sha256 = "0cqdhvxwy1dg26fgx5xvwalbl79sxmmmaic9ycqwwwsi5fihx7r9"; + rev = "38674bb993874a40c7a7b96f7a3f326d29d34e46"; + sha256 = "06197qn3739bcjzlgr45a3c11xgq151f40g39am5998dj3156524"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f89e3097c654774981953ef125679fec0b5b7c9/recipes/company-coq"; @@ -8771,29 +8771,22 @@ license = lib.licenses.free; }; }) {}; - company-dcd = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, flycheck-dmd-dub, helm, lib, melpaBuild, popwin, yasnippet }: + company-dcd = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, flycheck-dmd-dub, lib, melpaBuild, popwin, yasnippet }: melpaBuild { pname = "company-dcd"; - version = "20160617.746"; + version = "20160712.1857"; src = fetchFromGitHub { owner = "tsukimizake"; repo = "company-dcd"; - rev = "37b2f7d32b8f580890ff508067eb1bac921bf40b"; - sha256 = "1c0amrabq7czd3rs4gpgas0lb3i4mjz6j6lfxz63lmlsjwh43j4m"; + rev = "13cbbba01af0339391ee2f4c16c3a6f39b787cca"; + sha256 = "0p0k97j01ibrfxcnk36sfm3kns17x9845fqgjhb2lx9lg6i9k44r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ad5be8c53911271fba03a88da7e9d518c6508ffe/recipes/company-dcd"; sha256 = "03849k4jzs23iglk9ghcq6283c9asffcq4dznypcjax7y4x113vd"; name = "company-dcd"; }; - packageRequires = [ - cl-lib - company - flycheck-dmd-dub - helm - popwin - yasnippet - ]; + packageRequires = [ cl-lib company flycheck-dmd-dub popwin yasnippet ]; meta = { homepage = "https://melpa.org/#/company-dcd"; license = lib.licenses.free; @@ -8802,7 +8795,7 @@ company-dict = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parent-mode }: melpaBuild { pname = "company-dict"; - version = "20160528.253"; + version = "20160528.53"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-company-dict"; @@ -8823,7 +8816,7 @@ company-edbi = callPackage ({ cl-lib ? null, company, edbi, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "company-edbi"; - version = "20160221.1323"; + version = "20160221.1123"; src = fetchFromGitHub { owner = "proofit404"; repo = "company-edbi"; @@ -8844,7 +8837,7 @@ company-emoji = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-emoji"; - version = "20160331.1841"; + version = "20160331.1641"; src = fetchFromGitHub { owner = "dunn"; repo = "company-emoji"; @@ -8865,7 +8858,7 @@ company-flx = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flx, lib, melpaBuild }: melpaBuild { pname = "company-flx"; - version = "20160423.1913"; + version = "20160423.1713"; src = fetchFromGitHub { owner = "PythonNut"; repo = "company-flx"; @@ -8886,7 +8879,7 @@ company-ghc = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, ghc, lib, melpaBuild }: melpaBuild { pname = "company-ghc"; - version = "20160315.910"; + version = "20160315.710"; src = fetchFromGitHub { owner = "iquiw"; repo = "company-ghc"; @@ -8907,7 +8900,7 @@ company-ghci = callPackage ({ company, fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "company-ghci"; - version = "20160310.2000"; + version = "20160310.1800"; src = fetchFromGitHub { owner = "juiko"; repo = "company-ghci"; @@ -8928,12 +8921,12 @@ company-go = callPackage ({ company, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: melpaBuild { pname = "company-go"; - version = "20160306.1555"; + version = "20160306.1355"; src = fetchFromGitHub { owner = "nsf"; repo = "gocode"; - rev = "f535dc686130fcc7b942c504ce5903222a205ca3"; - sha256 = "0d9xxrzd9vlfx6wpi48sypqi1czld0nc2bd39ac7zv115qv23nfh"; + rev = "3e1f8b46c1200ebec1336008838c6140586d059e"; + sha256 = "1c51ym21m2mrs8zhj7nzbbc7cckqj63jf1xx2a6x6zjh0g5bq8zj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/company-go"; @@ -8949,7 +8942,7 @@ company-inf-ruby = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }: melpaBuild { pname = "company-inf-ruby"; - version = "20140805.1554"; + version = "20140805.1354"; src = fetchFromGitHub { owner = "company-mode"; repo = "company-inf-ruby"; @@ -8970,7 +8963,7 @@ company-irony = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, irony, lib, melpaBuild }: melpaBuild { pname = "company-irony"; - version = "20160613.1320"; + version = "20160613.1120"; src = fetchFromGitHub { owner = "Sarcasm"; repo = "company-irony"; @@ -8991,7 +8984,7 @@ company-irony-c-headers = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, irony, lib, melpaBuild }: melpaBuild { pname = "company-irony-c-headers"; - version = "20151018.409"; + version = "20151018.209"; src = fetchFromGitHub { owner = "hotpxl"; repo = "company-irony-c-headers"; @@ -9012,7 +9005,7 @@ company-jedi = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, jedi-core, lib, melpaBuild }: melpaBuild { pname = "company-jedi"; - version = "20151216.2121"; + version = "20151216.1921"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-company-jedi"; @@ -9033,7 +9026,7 @@ company-lua = callPackage ({ company, f, fetchFromGitHub, fetchurl, lib, lua-mode, melpaBuild, s }: melpaBuild { pname = "company-lua"; - version = "20160514.1620"; + version = "20160514.1420"; src = fetchFromGitHub { owner = "ptrv"; repo = "company-lua"; @@ -9054,7 +9047,7 @@ company-math = callPackage ({ company, fetchFromGitHub, fetchurl, lib, math-symbol-lists, melpaBuild }: melpaBuild { pname = "company-math"; - version = "20160229.932"; + version = "20160229.732"; src = fetchFromGitHub { owner = "vspinu"; repo = "company-math"; @@ -9075,7 +9068,7 @@ company-nand2tetris = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild, names, nand2tetris }: melpaBuild { pname = "company-nand2tetris"; - version = "20151027.1636"; + version = "20151027.1436"; src = fetchFromGitHub { owner = "CestDiego"; repo = "nand2tetris.el"; @@ -9096,12 +9089,12 @@ company-ngram = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-ngram"; - version = "20160702.1133"; + version = "20160725.616"; src = fetchFromGitHub { owner = "kshramt"; repo = "company-ngram"; - rev = "664da0e1f8a3c0eaff325a2a5856710984d73b4d"; - sha256 = "0rj7vgjyibllnf3416lcqjy6zggphslghaz4c8jmqmjdkgl57529"; + rev = "44a5a90047a71efb083e58ff685117b11eadd23e"; + sha256 = "0zkirwj9yarqlam5hsdnysanx1x06cmgzx9lnjrs1skypl4q096y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/937e6a23782450525c4a90392c414173481e101b/recipes/company-ngram"; @@ -9117,7 +9110,7 @@ company-nixos-options = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild, nixos-options }: melpaBuild { pname = "company-nixos-options"; - version = "20160215.257"; + version = "20160215.57"; src = fetchFromGitHub { owner = "travisbhartwell"; repo = "nix-emacs"; @@ -9138,12 +9131,12 @@ company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-php"; - version = "20160628.622"; + version = "20160706.3"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "eacdc1b1c97322c786c0fb330b0dde3f7b40682e"; - sha256 = "1kh5h55kf1lypysq585jd56jqcsga27658fnm1jwxylcgh8pi5sw"; + rev = "ff6f268fe6f9dd7cd67dde7c52e1fe9b8a145f14"; + sha256 = "0dxhcm6cfk0sgv2nbdscjf791js9g3qkxcapjh1zwyqsgmcrk9hs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php"; @@ -9159,12 +9152,12 @@ company-qml = callPackage ({ company, fetchFromGitHub, fetchurl, lib, melpaBuild, qml-mode }: melpaBuild { pname = "company-qml"; - version = "20160212.1712"; + version = "20160707.1705"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "company-qml"; - rev = "92ee2d46197698a428af049a95eb66cc00eebf3f"; - sha256 = "0sl59b9wwnpz6p2kxsc87b3q28vvfxg7pwk67c51q8qyrl0c1klv"; + rev = "2027907611cd8a484289340506c63fa3a2c891a8"; + sha256 = "13nxvn0rvz9nfyi0w7iczq28afvln1q6djhn4drfm3ipmrx0cfgg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b53477eaba4ef62f8317c9454e15ac015442fed/recipes/company-qml"; @@ -9180,7 +9173,7 @@ company-quickhelp = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip }: melpaBuild { pname = "company-quickhelp"; - version = "20160211.918"; + version = "20160211.718"; src = fetchFromGitHub { owner = "expez"; repo = "company-quickhelp"; @@ -9201,12 +9194,12 @@ company-racer = callPackage ({ cl-lib ? null, company, dash, deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-racer"; - version = "20160613.1357"; + version = "20160722.1658"; src = fetchFromGitHub { owner = "emacs-pe"; repo = "company-racer"; - rev = "a81ac30dfc6beb6384994f366fcbc0dcb43fde01"; - sha256 = "0yaaic78hq94hy8zrwm1l4dhmj1rn0n9p4a0fdp3mp46vwa8jz52"; + rev = "c2afd3d989ec2bca7dac094b684063a1922905f6"; + sha256 = "0339p8ymyx8yjgv9lp8lrfzc5mp1mh71rg4m325ia084n81p773a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c4671a674dbc1620a41e0ff99508892a25eec2ad/recipes/company-racer"; @@ -9222,7 +9215,7 @@ company-restclient = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, know-your-http-well, lib, melpaBuild, restclient }: melpaBuild { pname = "company-restclient"; - version = "20151202.601"; + version = "20151202.401"; src = fetchFromGitHub { owner = "iquiw"; repo = "company-restclient"; @@ -9249,7 +9242,7 @@ company-shell = callPackage ({ cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-shell"; - version = "20160528.707"; + version = "20160528.507"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "company-shell"; @@ -9270,7 +9263,7 @@ company-sourcekit = callPackage ({ company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sourcekit }: melpaBuild { pname = "company-sourcekit"; - version = "20160605.131"; + version = "20160604.2331"; src = fetchFromGitHub { owner = "nathankot"; repo = "company-sourcekit"; @@ -9291,12 +9284,12 @@ company-tern = callPackage ({ cl-lib ? null, company, dash, dash-functional, fetchFromGitHub, fetchurl, lib, melpaBuild, s, tern }: melpaBuild { pname = "company-tern"; - version = "20160510.851"; + version = "20160713.541"; src = fetchFromGitHub { owner = "proofit404"; repo = "company-tern"; - rev = "d0b7e9ad8d78790372f65d2c41e93a885553bceb"; - sha256 = "0pdzr7sqpja3cr2mydx9b4813r1g9jilpin7n13sjbqyk8108xc6"; + rev = "d285b4d3ff96493cb7d7ff129e6dd9ff0ac7be88"; + sha256 = "1v43cp8x6w73i2c3lsm6xryqzf23k3rbyga4rrv2nf5n5cxdb6x6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/company-tern"; @@ -9312,7 +9305,7 @@ company-try-hard = callPackage ({ company, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-try-hard"; - version = "20150902.1706"; + version = "20150902.1506"; src = fetchFromGitHub { owner = "Wilfred"; repo = "company-try-hard"; @@ -9333,7 +9326,7 @@ company-web = callPackage ({ cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, web-completion-data }: melpaBuild { pname = "company-web"; - version = "20160502.858"; + version = "20160502.658"; src = fetchFromGitHub { owner = "osv"; repo = "company-web"; @@ -9354,7 +9347,7 @@ company-ycm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, ycm }: melpaBuild { pname = "company-ycm"; - version = "20140904.1317"; + version = "20140904.1117"; src = fetchFromGitHub { owner = "neuromage"; repo = "ycm.el"; @@ -9375,12 +9368,12 @@ company-ycmd = callPackage ({ company, dash, deferred, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s, ycmd }: melpaBuild { pname = "company-ycmd"; - version = "20160624.1023"; + version = "20160720.359"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "a9cb3a6893cff7059058f25f06e75d38584084f1"; - sha256 = "03vfg56qmj68y702c94p914fqrx68szykj8nm12d26p0rjnky2b8"; + rev = "5342f1def925e59477880c1bf5c10778c50678fe"; + sha256 = "1nn312z7bfjya570gbs7gcwf9zh3b7jhwg52gfp7digdwqrary42"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1138c8cc239183a2435ce8c1a6df5163e5fed2ea/recipes/company-ycmd"; @@ -9396,7 +9389,7 @@ composable = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "composable"; - version = "20160519.1257"; + version = "20160519.1057"; src = fetchFromGitHub { owner = "paldepind"; repo = "composable.el"; @@ -9417,12 +9410,12 @@ concurrent = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "concurrent"; - version = "20160109.2246"; + version = "20160109.2046"; src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-deferred"; - rev = "8827106c83f0fc773bc406d381ea25a29a5965e1"; - sha256 = "1br4yys803x3ng4vzhhvblhkqabs46lx8a3ajycqy555q20zqzrf"; + rev = "0a795feeae901e736fc43b1c75a6e3f92f811f08"; + sha256 = "0wnzq2clhbvx0ipwsh0n1w8ssf97l0k8cwmss4l032adz72f6pbn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc29a8d518ce7a584277089bd4654f52ac0f358/recipes/concurrent"; @@ -9438,7 +9431,7 @@ config-parser = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "config-parser"; - version = "20160426.719"; + version = "20160426.519"; src = fetchFromGitHub { owner = "lujun9972"; repo = "el-config-parser"; @@ -9459,7 +9452,7 @@ confluence = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild, xml-rpc }: melpaBuild { pname = "confluence"; - version = "20151020.2028"; + version = "20151020.1828"; src = fetchsvn { url = "https://svn.code.sf.net/p/confluence-el/code/trunk/"; rev = "173"; @@ -9479,7 +9472,7 @@ conkeror-minor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "conkeror-minor-mode"; - version = "20150114.1004"; + version = "20150114.804"; src = fetchFromGitHub { owner = "Malabarba"; repo = "conkeror-minor-mode"; @@ -9500,7 +9493,7 @@ connection = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "connection"; - version = "20140717.2229"; + version = "20140717.2029"; src = fetchFromGitHub { owner = "myrkr"; repo = "dictionary-el"; @@ -9521,7 +9514,7 @@ contextual = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "contextual"; - version = "20160131.1237"; + version = "20160131.1037"; src = fetchFromGitHub { owner = "lshift-de"; repo = "contextual"; @@ -9539,10 +9532,31 @@ license = lib.licenses.free; }; }) {}; + contrast-color = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "contrast-color"; + version = "20160713.1211"; + src = fetchFromGitHub { + owner = "yuutayamada"; + repo = "contrast-color-el"; + rev = "5b8d1fc50ddce88b1d139a8832c10026470811be"; + sha256 = "18hd7w70hgif6j02is8kx2b2w6sksnp1nsk92wkv090z7r36nsns"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7a13602e10a5fa889d0e094eff5b74a39023a477/recipes/contrast-color"; + sha256 = "0pa88mfla7g7wpia0q1lkv2dncw63ivvh83hf73f75a22rvl8jcx"; + name = "contrast-color"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/contrast-color"; + license = lib.licenses.free; + }; + }) {}; control-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "control-mode"; - version = "20160624.1210"; + version = "20160624.1010"; src = fetchFromGitHub { owner = "stephendavidmarsh"; repo = "control-mode"; @@ -9563,7 +9577,7 @@ copyit = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "copyit"; - version = "20160607.1205"; + version = "20160607.1005"; src = fetchFromGitHub { owner = "zonuexe"; repo = "emacs-copyit"; @@ -9584,7 +9598,7 @@ copyit-pandoc = callPackage ({ copyit, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pandoc }: melpaBuild { pname = "copyit-pandoc"; - version = "20160624.1528"; + version = "20160624.1328"; src = fetchFromGitHub { owner = "zonuexe"; repo = "emacs-copyit"; @@ -9605,7 +9619,7 @@ corral = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "corral"; - version = "20160502.201"; + version = "20160502.1"; src = fetchFromGitHub { owner = "nivekuil"; repo = "corral"; @@ -9626,12 +9640,12 @@ counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "counsel"; - version = "20160703.1055"; + version = "20160722.1137"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "aaad35472a5b74dfaeca93aa0de2327cf06ffe3d"; - sha256 = "1f570vxp5gp28wpxq92050n6vx0lvz8288x4sp8pfpizz9dyxd9p"; + rev = "17b59b2244473ba32cff3408e41e451de7fcc69f"; + sha256 = "1srzmlgd4wbwdickgxq4kjxbw5rprkh7dwfi7rz82zsahk1jkzr8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; @@ -9647,7 +9661,7 @@ counsel-dash = callPackage ({ counsel, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, helm-dash, lib, melpaBuild }: melpaBuild { pname = "counsel-dash"; - version = "20160524.152"; + version = "20160523.2352"; src = fetchFromGitHub { owner = "nathankot"; repo = "counsel-dash"; @@ -9668,7 +9682,7 @@ counsel-osx-app = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "counsel-osx-app"; - version = "20160525.505"; + version = "20160525.305"; src = fetchFromGitHub { owner = "d12frosted"; repo = "counsel-osx-app"; @@ -9689,7 +9703,7 @@ counsel-projectile = callPackage ({ counsel, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "counsel-projectile"; - version = "20160507.1222"; + version = "20160507.1022"; src = fetchFromGitHub { owner = "ericdanan"; repo = "counsel-projectile"; @@ -9710,7 +9724,7 @@ coverage = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, ov }: melpaBuild { pname = "coverage"; - version = "20160222.314"; + version = "20160222.114"; src = fetchFromGitHub { owner = "trezona-lecomte"; repo = "coverage"; @@ -9731,7 +9745,7 @@ coverlay = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "coverlay"; - version = "20160507.1155"; + version = "20160507.955"; src = fetchFromGitHub { owner = "twada"; repo = "coverlay.el"; @@ -9752,7 +9766,7 @@ cp5022x = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cp5022x"; - version = "20120323.1835"; + version = "20120323.1635"; src = fetchFromGitHub { owner = "awasira"; repo = "cp5022x.el"; @@ -9773,7 +9787,7 @@ cpputils-cmake = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cpputils-cmake"; - version = "20160515.303"; + version = "20160515.103"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "cpputils-cmake"; @@ -9794,12 +9808,12 @@ cql-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cql-mode"; - version = "20160413.1943"; + version = "20160720.2039"; src = fetchFromGitHub { owner = "Yuki-Inoue"; repo = "cql-mode"; - rev = "060610c5570a26838b1502fd7576777ff713ea25"; - sha256 = "18nxsd1axd3m70p7cw4ifcj33z9v5w25v6g09q38maixymlad962"; + rev = "2529ade55c125a89d8215f096a74733a90611c5d"; + sha256 = "1ikmz037bv7h0bjrr8qia5g127a0vd223y04ndbyd950gqc1lx4h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1084dd0ec0f2e8fe6fa8e97b322833c14e8e59d1/recipes/cql-mode"; @@ -9815,7 +9829,7 @@ crab = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, websocket }: melpaBuild { pname = "crab"; - version = "20150126.2337"; + version = "20150126.2137"; src = fetchFromGitHub { owner = "puffnfresh"; repo = "crab-emacs"; @@ -9836,7 +9850,7 @@ crappy-jsp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "crappy-jsp-mode"; - version = "20140311.431"; + version = "20140311.231"; src = fetchFromGitHub { owner = "magnars"; repo = "crappy-jsp-mode"; @@ -9857,7 +9871,7 @@ creds = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "creds"; - version = "20140510.1206"; + version = "20140510.1006"; src = fetchFromGitHub { owner = "ardumont"; repo = "emacs-creds"; @@ -9878,7 +9892,7 @@ creole = callPackage ({ fetchFromGitHub, fetchurl, kv, lib, melpaBuild, noflet }: melpaBuild { pname = "creole"; - version = "20140924.1000"; + version = "20140924.800"; src = fetchFromGitHub { owner = "nicferrier"; repo = "elwikicreole"; @@ -9899,7 +9913,7 @@ creole-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "creole-mode"; - version = "20130721.1950"; + version = "20130721.1750"; src = fetchFromGitHub { owner = "nicferrier"; repo = "creole-mode"; @@ -9920,7 +9934,7 @@ cricbuzz = callPackage ({ enlive, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cricbuzz"; - version = "20160703.358"; + version = "20160703.158"; src = fetchFromGitHub { owner = "lepisma"; repo = "cricbuzz.el"; @@ -9941,7 +9955,7 @@ crm-custom = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "crm-custom"; - version = "20160116.1806"; + version = "20160116.1606"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "crm-custom"; @@ -9962,7 +9976,7 @@ crontab-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "crontab-mode"; - version = "20090510.1555"; + version = "20090510.1355"; src = fetchFromGitHub { owner = "emacsorphanage"; repo = "crontab-mode"; @@ -9983,7 +9997,7 @@ crosshairs = callPackage ({ col-highlight, fetchurl, hl-line-plus, lib, melpaBuild, vline }: melpaBuild { pname = "crosshairs"; - version = "20151231.1438"; + version = "20151231.1238"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/crosshairs.el"; sha256 = "120hxk82i0r4qan4hfk9ldmw5a8bzv7p683lrnlcx9gyxgkia3am"; @@ -10002,12 +10016,12 @@ crux = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "crux"; - version = "20160530.2354"; + version = "20160725.59"; src = fetchFromGitHub { owner = "bbatsov"; repo = "crux"; - rev = "5b3c8155a9e9fe6f189645d175976026a2dc7b8d"; - sha256 = "0809pb8626i6z1dics3i1cs30p4qd8bzqcgr20lx9k3yq2abq2k7"; + rev = "3e03d7272f99939eb669c59f5b8843912e1e49cf"; + sha256 = "0s4b2qljac3d7lilmfxk3j385g95fm4jsg64kn21n7dqqwqljpiv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/575e3442a925500a5806e0b900208c1e6bfd11ae/recipes/crux"; @@ -10023,7 +10037,7 @@ cryptol-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cryptol-mode"; - version = "20140426.1204"; + version = "20140426.1004"; src = fetchFromGitHub { owner = "thoughtpolice"; repo = "cryptol-mode"; @@ -10044,7 +10058,7 @@ cryptsy-public-api = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "cryptsy-public-api"; - version = "20141008.728"; + version = "20141008.528"; src = fetchFromGitHub { owner = "Sodaware"; repo = "cryptsy-public-api.el"; @@ -10065,7 +10079,7 @@ csharp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "csharp-mode"; - version = "20160615.1319"; + version = "20160615.1119"; src = fetchFromGitHub { owner = "josteink"; repo = "csharp-mode"; @@ -10086,7 +10100,7 @@ css-comb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "css-comb"; - version = "20160416.59"; + version = "20160415.2259"; src = fetchFromGitHub { owner = "channikhabra"; repo = "css-comb.el"; @@ -10107,7 +10121,7 @@ css-eldoc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "css-eldoc"; - version = "20150124.2123"; + version = "20150124.1923"; src = fetchFromGitHub { owner = "zenozeng"; repo = "css-eldoc"; @@ -10128,7 +10142,7 @@ cssfmt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cssfmt"; - version = "20150818.2328"; + version = "20150818.2128"; src = fetchFromGitHub { owner = "KeenS"; repo = "cssfmt.el"; @@ -10149,7 +10163,7 @@ cssh = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cssh"; - version = "20150810.1209"; + version = "20150810.1009"; src = fetchFromGitHub { owner = "dimitri"; repo = "cssh"; @@ -10169,7 +10183,7 @@ }) {}; csv-nav = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "csv-nav"; - version = "20130407.1320"; + version = "20130407.1120"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/csv-nav.el"; sha256 = "15rfg3326xcs3zj3siy9rn7yff101vfch1srskdi2650c3l3krva"; @@ -10188,7 +10202,7 @@ ctable = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ctable"; - version = "20140304.1859"; + version = "20140304.1659"; src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-ctable"; @@ -10208,7 +10222,7 @@ }) {}; ctags = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ctags"; - version = "20110911.504"; + version = "20110911.304"; src = fetchhg { url = "https://bitbucket.com/semente/ctags.el"; rev = "afb16c5b2530"; @@ -10228,7 +10242,7 @@ ctags-update = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ctags-update"; - version = "20150427.2214"; + version = "20150427.2014"; src = fetchFromGitHub { owner = "jixiuf"; repo = "helm-etags-plus"; @@ -10249,7 +10263,7 @@ ctl-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ctl-mode"; - version = "20151202.406"; + version = "20151202.206"; src = fetchFromGitHub { owner = "yyr"; repo = "emacs-grads"; @@ -10270,7 +10284,7 @@ ctxmenu = callPackage ({ fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, popup, yaxception }: melpaBuild { pname = "ctxmenu"; - version = "20140303.1542"; + version = "20140303.1342"; src = fetchFromGitHub { owner = "aki2o"; repo = "emacs-ctxmenu"; @@ -10291,7 +10305,7 @@ cucumber-goto-step = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pcre2el }: melpaBuild { pname = "cucumber-goto-step"; - version = "20131209.2319"; + version = "20131209.2119"; src = fetchFromGitHub { owner = "gstamp"; repo = "cucumber-goto-step"; @@ -10312,7 +10326,7 @@ cuda-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cuda-mode"; - version = "20151213.2121"; + version = "20151213.1921"; src = fetchFromGitHub { owner = "chachi"; repo = "cuda-mode"; @@ -10332,7 +10346,7 @@ }) {}; cursor-chg = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "cursor-chg"; - version = "20151231.1440"; + version = "20151231.1240"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/cursor-chg.el"; sha256 = "1w0msh4mfhwglkwgb8ksqfdzbd1bvspllydnjzhc0yl3s7qrifbd"; @@ -10351,7 +10365,7 @@ cursor-in-brackets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cursor-in-brackets"; - version = "20160603.616"; + version = "20160603.416"; src = fetchFromGitHub { owner = "yascentur"; repo = "cursor-in-brackets-el"; @@ -10372,7 +10386,7 @@ cursor-test = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cursor-test"; - version = "20131207.1132"; + version = "20131207.932"; src = fetchFromGitHub { owner = "ainame"; repo = "cursor-test.el"; @@ -10392,7 +10406,7 @@ }) {}; cus-edit-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "cus-edit-plus"; - version = "20160529.1637"; + version = "20160529.1437"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/cus-edit+.el"; sha256 = "0d62nv8i208ysi5cg906p9ribpnrn2jvzdcwm35km4i0q0bp6yg7"; @@ -10411,7 +10425,7 @@ cyberpunk-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cyberpunk-theme"; - version = "20160121.1912"; + version = "20160121.1712"; src = fetchFromGitHub { owner = "n3mo"; repo = "cyberpunk-theme.el"; @@ -10432,7 +10446,7 @@ cycbuf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cycbuf"; - version = "20131203.1437"; + version = "20131203.1237"; src = fetchFromGitHub { owner = "martinp26"; repo = "cycbuf"; @@ -10453,7 +10467,7 @@ cycle-resize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cycle-resize"; - version = "20160521.1057"; + version = "20160521.857"; src = fetchFromGitHub { owner = "pierre-lecocq"; repo = "cycle-resize"; @@ -10474,7 +10488,7 @@ cycle-themes = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cycle-themes"; - version = "20150402.2209"; + version = "20150402.2009"; src = fetchFromGitHub { owner = "toroidal-code"; repo = "cycle-themes.el"; @@ -10494,7 +10508,7 @@ }) {}; cygwin-mount = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "cygwin-mount"; - version = "20131111.1546"; + version = "20131111.1346"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/cygwin-mount.el"; sha256 = "09my4gj3qm9rdpk8lg6n6ki8ywj7kwzwd4hhgwascfnfi1hzwdvw"; @@ -10513,7 +10527,7 @@ cyphejor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cyphejor"; - version = "20160531.1105"; + version = "20160531.905"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "cyphejor"; @@ -10534,7 +10548,7 @@ cypher-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cypher-mode"; - version = "20151110.542"; + version = "20151110.342"; src = fetchFromGitHub { owner = "fxbois"; repo = "cypher-mode"; @@ -10555,12 +10569,12 @@ cython-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cython-mode"; - version = "20140705.1429"; + version = "20140705.1229"; src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "6d7ddbcd790df6ab15036740c33f26b2d1ecb5d8"; - sha256 = "1mz4fn9iirjfp8y0daaxskz3a6d0hzkm9lk3jqw8cin5gsal5zp8"; + rev = "ac4cbf0265735979ea17cedf051652f8603b7034"; + sha256 = "16s62khj4p38hpk6h82gp4lz4n665pfk81fklf92fhb9lln38ca4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -10576,7 +10590,7 @@ czech-holidays = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "czech-holidays"; - version = "20160113.1152"; + version = "20160113.952"; src = fetchFromGitHub { owner = "hydandata"; repo = "czech-holidays"; @@ -10597,7 +10611,7 @@ d-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "d-mode"; - version = "20160504.1155"; + version = "20160504.955"; src = fetchFromGitHub { owner = "Emacs-D-Mode-Maintainers"; repo = "Emacs-D-Mode"; @@ -10618,7 +10632,7 @@ dactyl-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dactyl-mode"; - version = "20140906.1225"; + version = "20140906.1025"; src = fetchFromGitHub { owner = "luxbock"; repo = "dactyl-mode"; @@ -10639,7 +10653,7 @@ dakrone-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dakrone-theme"; - version = "20140211.2245"; + version = "20140211.2045"; src = fetchFromGitHub { owner = "dakrone"; repo = "dakrone-theme"; @@ -10660,7 +10674,7 @@ danneskjold-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "danneskjold-theme"; - version = "20160611.1327"; + version = "20160611.1127"; src = fetchFromGitHub { owner = "rails-to-cosmos"; repo = "danneskjold-theme"; @@ -10681,7 +10695,7 @@ darcula-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "darcula-theme"; - version = "20160305.421"; + version = "20160305.221"; src = fetchFromGitLab { owner = "fommil"; repo = "emacs-darcula-theme"; @@ -10702,7 +10716,7 @@ dark-krystal-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dark-krystal-theme"; - version = "20141116.101"; + version = "20141115.2301"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-dark-krystal-theme"; @@ -10723,7 +10737,7 @@ dark-mint-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dark-mint-theme"; - version = "20160302.42"; + version = "20160301.2242"; src = fetchFromGitHub { owner = "shaunvxc"; repo = "dark-mint-theme"; @@ -10744,7 +10758,7 @@ dark-souls = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dark-souls"; - version = "20140314.628"; + version = "20140314.428"; src = fetchFromGitHub { owner = "tomjakubowski"; repo = "dark-souls.el"; @@ -10765,7 +10779,7 @@ darkburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "darkburn-theme"; - version = "20151003.300"; + version = "20151003.100"; src = fetchFromGitHub { owner = "gorauskas"; repo = "darkburn-theme"; @@ -10786,7 +10800,7 @@ darkmine-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "darkmine-theme"; - version = "20160406.124"; + version = "20160405.2324"; src = fetchFromGitHub { owner = "pierre-lecocq"; repo = "darkmine-theme"; @@ -10807,7 +10821,7 @@ darkokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "darkokai-theme"; - version = "20160512.1016"; + version = "20160512.816"; src = fetchFromGitHub { owner = "sjrmanning"; repo = "darkokai"; @@ -10828,7 +10842,7 @@ darktooth-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "darktooth-theme"; - version = "20160525.50"; + version = "20160524.2250"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-theme-darktooth"; @@ -10849,7 +10863,7 @@ dart-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "dart-mode"; - version = "20160212.1321"; + version = "20160212.1121"; src = fetchFromGitHub { owner = "nex3"; repo = "dart-mode"; @@ -10870,7 +10884,7 @@ dash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dash"; - version = "20160619.811"; + version = "20160619.611"; src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; @@ -10891,7 +10905,7 @@ dash-at-point = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dash-at-point"; - version = "20140626.235"; + version = "20140626.35"; src = fetchFromGitHub { owner = "stanaka"; repo = "dash-at-point"; @@ -10912,7 +10926,7 @@ dash-functional = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dash-functional"; - version = "20160615.1551"; + version = "20160615.1351"; src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; @@ -10933,7 +10947,7 @@ date-at-point = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "date-at-point"; - version = "20150108.618"; + version = "20150108.418"; src = fetchFromGitHub { owner = "alezost"; repo = "date-at-point.el"; @@ -10954,7 +10968,7 @@ date-field = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }: melpaBuild { pname = "date-field"; - version = "20141128.1905"; + version = "20141128.1705"; src = fetchFromGitHub { owner = "aki2o"; repo = "emacs-date-field"; @@ -10975,7 +10989,7 @@ datetime = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "datetime"; - version = "20160521.1503"; + version = "20160521.1303"; src = fetchFromGitHub { owner = "doublep"; repo = "datetime"; @@ -10996,7 +11010,7 @@ datetime-format = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "datetime-format"; - version = "20160612.1215"; + version = "20160612.1015"; src = fetchFromGitHub { owner = "zonuexe"; repo = "emacs-datetime"; @@ -11017,7 +11031,7 @@ datomic-snippets = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s, yasnippet }: melpaBuild { pname = "datomic-snippets"; - version = "20130707.1515"; + version = "20130707.1315"; src = fetchFromGitHub { owner = "magnars"; repo = "datomic-snippets"; @@ -11038,7 +11052,7 @@ dayone = callPackage ({ fetchFromGitHub, fetchurl, ht, lib, melpaBuild, mustache, uuid }: melpaBuild { pname = "dayone"; - version = "20160105.640"; + version = "20160105.440"; src = fetchFromGitHub { owner = "mori-dev"; repo = "emacs-dayone"; @@ -11059,7 +11073,7 @@ db = callPackage ({ fetchFromGitHub, fetchurl, kv, lib, melpaBuild }: melpaBuild { pname = "db"; - version = "20140421.1611"; + version = "20140421.1411"; src = fetchFromGitHub { owner = "nicferrier"; repo = "emacs-db"; @@ -11080,7 +11094,7 @@ db-pg = callPackage ({ db, fetchFromGitHub, fetchurl, lib, melpaBuild, pg }: melpaBuild { pname = "db-pg"; - version = "20130131.1302"; + version = "20130131.1102"; src = fetchFromGitHub { owner = "nicferrier"; repo = "emacs-db-pg"; @@ -11101,7 +11115,7 @@ ddskk = callPackage ({ ccc, cdb, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ddskk"; - version = "20160315.908"; + version = "20160315.708"; src = fetchFromGitHub { owner = "skk-dev"; repo = "ddskk"; @@ -11122,7 +11136,7 @@ debpaste = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }: melpaBuild { pname = "debpaste"; - version = "20160113.1747"; + version = "20160113.1547"; src = fetchFromGitHub { owner = "alezost"; repo = "debpaste.el"; @@ -11143,7 +11157,7 @@ debug-print = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "debug-print"; - version = "20140125.1819"; + version = "20140125.1619"; src = fetchFromGitHub { owner = "kenoss"; repo = "debug-print"; @@ -11164,7 +11178,7 @@ decide = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "decide"; - version = "20160314.1448"; + version = "20160314.1248"; src = fetchFromGitHub { owner = "lifelike"; repo = "decide-mode"; @@ -11185,7 +11199,7 @@ decl = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "decl"; - version = "20160609.147"; + version = "20160608.2347"; src = fetchFromGitHub { owner = "preetpalS"; repo = "decl.el"; @@ -11206,7 +11220,7 @@ dedicated = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dedicated"; - version = "20090428.1431"; + version = "20090428.1231"; src = fetchFromGitHub { owner = "emacsorphanage"; repo = "dedicated"; @@ -11227,7 +11241,7 @@ dedukti-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dedukti-mode"; - version = "20160329.1202"; + version = "20160329.1002"; src = fetchFromGitHub { owner = "rafoo"; repo = "dedukti-mode"; @@ -11248,7 +11262,7 @@ default-text-scale = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "default-text-scale"; - version = "20150227.1156"; + version = "20150227.956"; src = fetchFromGitHub { owner = "purcell"; repo = "default-text-scale"; @@ -11269,12 +11283,12 @@ deferred = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "deferred"; - version = "20160109.2246"; + version = "20160109.2046"; src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-deferred"; - rev = "8827106c83f0fc773bc406d381ea25a29a5965e1"; - sha256 = "1br4yys803x3ng4vzhhvblhkqabs46lx8a3ajycqy555q20zqzrf"; + rev = "0a795feeae901e736fc43b1c75a6e3f92f811f08"; + sha256 = "0wnzq2clhbvx0ipwsh0n1w8ssf97l0k8cwmss4l032adz72f6pbn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0e9a114d85f630648d05a7b552370fa8413da0c2/recipes/deferred"; @@ -11290,7 +11304,7 @@ define-word = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "define-word"; - version = "20150709.1423"; + version = "20150709.1223"; src = fetchFromGitHub { owner = "abo-abo"; repo = "define-word"; @@ -11311,7 +11325,7 @@ defproject = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "defproject"; - version = "20151201.1619"; + version = "20151201.1419"; src = fetchFromGitHub { owner = "kotfic"; repo = "defproject"; @@ -11331,7 +11345,7 @@ }) {}; deft = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "deft"; - version = "20160610.1939"; + version = "20160610.1739"; src = fetchgit { url = "git://jblevins.org/git/deft.git"; rev = "59173ba0c048ead287dd1171a5a52ce53fd9a0cb"; @@ -11348,28 +11362,10 @@ license = lib.licenses.free; }; }) {}; - delight = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "delight"; - version = "20160305.1751"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/delight.el"; - sha256 = "0lqg23mpzcbcfkn84wm8i1bma73wpyh3m5f0zjrrzbwpgsmw8fqd"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/d8de1d5d7a862b32cc29bfa92fa4563b24704c64/recipes/delight"; - sha256 = "1d9m5k18k73vhidwd50mcbq7mlvwdn4sb9ih8r5gri9a9whi2nkj"; - name = "delight"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/delight"; - license = lib.licenses.free; - }; - }) {}; delim-kill = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "delim-kill"; - version = "20100517.120"; + version = "20100516.2320"; src = fetchFromGitHub { owner = "thomas11"; repo = "delim-kill"; @@ -11390,7 +11386,7 @@ demangle-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "demangle-mode"; - version = "20151109.1453"; + version = "20151109.1253"; src = fetchFromGitHub { owner = "liblit"; repo = "demangle-mode"; @@ -11411,7 +11407,7 @@ demo-it = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "demo-it"; - version = "20160525.846"; + version = "20160525.646"; src = fetchFromGitHub { owner = "howardabrams"; repo = "demo-it"; @@ -11432,7 +11428,7 @@ describe-number = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yabin }: melpaBuild { pname = "describe-number"; - version = "20151031.1955"; + version = "20151031.1755"; src = fetchFromGitHub { owner = "netromdk"; repo = "describe-number"; @@ -11453,7 +11449,7 @@ desktop-plus = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "desktop-plus"; - version = "20160330.812"; + version = "20160330.612"; src = fetchFromGitHub { owner = "ffevotte"; repo = "desktop-plus"; @@ -11474,7 +11470,7 @@ desktop-registry = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "desktop-registry"; - version = "20140119.1543"; + version = "20140119.1343"; src = fetchFromGitHub { owner = "ryuslash"; repo = "desktop-registry"; @@ -11495,7 +11491,7 @@ devdocs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "devdocs"; - version = "20160607.740"; + version = "20160607.540"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "devdocs.el"; @@ -11516,11 +11512,11 @@ dic-lookup-w3m = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild, stem, w3m }: melpaBuild { pname = "dic-lookup-w3m"; - version = "20160607.150"; + version = "20160722.2319"; src = fetchsvn { url = "http://svn.osdn.jp/svnroot/dic-lookup-w3m/"; - rev = "86"; - sha256 = "1lks8wxwbri177p8ybkz5nakqpy24wqzpb3smqz04gr9ny07iagv"; + rev = "95"; + sha256 = "1lr236vz38mlzgqdcfx3adrnbfv55f1a6r2xgfkla0m2vq09v3bn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6627b66fff02513ee467ed0f4436fb5cd400a81d/recipes/dic-lookup-w3m"; @@ -11536,7 +11532,7 @@ dictcc = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "dictcc"; - version = "20151221.557"; + version = "20151221.357"; src = fetchFromGitHub { owner = "cqql"; repo = "dictcc.el"; @@ -11557,7 +11553,7 @@ dictionary = callPackage ({ connection, fetchFromGitHub, fetchurl, lib, link, melpaBuild }: melpaBuild { pname = "dictionary"; - version = "20140717.2229"; + version = "20140717.2029"; src = fetchFromGitHub { owner = "myrkr"; repo = "dictionary-el"; @@ -11578,7 +11574,7 @@ diff-hl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "diff-hl"; - version = "20160622.2016"; + version = "20160622.1816"; src = fetchFromGitHub { owner = "dgutov"; repo = "diff-hl"; @@ -11599,7 +11595,7 @@ diffscuss-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "diffscuss-mode"; - version = "20141014.1857"; + version = "20141014.1657"; src = fetchFromGitHub { owner = "hut8labs"; repo = "diffscuss"; @@ -11620,7 +11616,7 @@ diffview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "diffview"; - version = "20150929.11"; + version = "20150928.2211"; src = fetchFromGitHub { owner = "mgalgs"; repo = "diffview-mode"; @@ -11641,7 +11637,7 @@ digistar-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "digistar-mode"; - version = "20160218.1355"; + version = "20160218.1155"; src = fetchFromGitHub { owner = "retroj"; repo = "digistar-mode"; @@ -11662,7 +11658,7 @@ dim = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dim"; - version = "20151226.315"; + version = "20151226.115"; src = fetchFromGitHub { owner = "alezost"; repo = "dim.el"; @@ -11683,7 +11679,7 @@ dim-autoload = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dim-autoload"; - version = "20160521.928"; + version = "20160521.728"; src = fetchFromGitHub { owner = "tarsius"; repo = "dim-autoload"; @@ -11704,7 +11700,7 @@ diminish = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "diminish"; - version = "20151215.1115"; + version = "20151215.915"; src = fetchFromGitHub { owner = "myrjola"; repo = "diminish.el"; @@ -11725,7 +11721,7 @@ dionysos = callPackage ({ alert, cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, libmpdee, melpaBuild, pkg-info, s }: melpaBuild { pname = "dionysos"; - version = "20151013.303"; + version = "20151013.103"; src = fetchFromGitHub { owner = "nlamirault"; repo = "dionysos"; @@ -11746,7 +11742,7 @@ dircmp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dircmp"; - version = "20141204.1156"; + version = "20141204.956"; src = fetchFromGitHub { owner = "matthewlmcclure"; repo = "dircmp-mode"; @@ -11767,7 +11763,7 @@ dired-atool = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-atool"; - version = "20160208.633"; + version = "20160208.433"; src = fetchFromGitHub { owner = "HKey"; repo = "dired-atool"; @@ -11788,7 +11784,7 @@ dired-avfs = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-avfs"; - version = "20160526.1536"; + version = "20160526.1336"; src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; @@ -11808,7 +11804,7 @@ }) {}; dired-details = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-details"; - version = "20130824.658"; + version = "20130824.458"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/dired-details.el"; sha256 = "1ddrhj1kw0wl7jbs9jn067vfffsvqhz4izfw9f7ihxz34fdl2iza"; @@ -11827,7 +11823,7 @@ dired-details-plus = callPackage ({ dired-details, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-details-plus"; - version = "20151231.1450"; + version = "20151231.1250"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/dired-details+.el"; sha256 = "07z4h5l8763ks6b6m8dcmq78jiyq4xvan1mb0z8fbasmi1bsrya4"; @@ -11846,7 +11842,7 @@ dired-dups = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-dups"; - version = "20130527.1625"; + version = "20130527.1425"; src = fetchFromGitHub { owner = "vapniks"; repo = "dired-dups"; @@ -11867,7 +11863,7 @@ dired-efap = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-efap"; - version = "20140122.1056"; + version = "20140122.856"; src = fetchFromGitHub { owner = "juan-leon"; repo = "dired-efap"; @@ -11888,7 +11884,7 @@ dired-fdclone = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-fdclone"; - version = "20150417.332"; + version = "20150417.132"; src = fetchFromGitHub { owner = "knu"; repo = "dired-fdclone.el"; @@ -11909,7 +11905,7 @@ dired-filetype-face = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-filetype-face"; - version = "20160217.247"; + version = "20160217.47"; src = fetchFromGitHub { owner = "jixiuf"; repo = "dired-filetype-face"; @@ -11930,7 +11926,7 @@ dired-filter = callPackage ({ cl-lib ? null, dash, dired-hacks-utils, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-filter"; - version = "20160526.1536"; + version = "20160526.1336"; src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; @@ -11951,7 +11947,7 @@ dired-hacks-utils = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-hacks-utils"; - version = "20160527.1636"; + version = "20160527.1436"; src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; @@ -11972,7 +11968,7 @@ dired-imenu = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-imenu"; - version = "20140109.1010"; + version = "20140109.810"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "dired-imenu"; @@ -11993,12 +11989,12 @@ dired-k = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-k"; - version = "20160330.2113"; + version = "20160330.1913"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-dired-k"; - rev = "b12ea34303862d3fd05a9cedbc436f5a533437d0"; - sha256 = "1bg7msz672rp2l490l3wm99i18b30r6033yfkrq6ia742nagn040"; + rev = "3ec3881dc9c491ba80ffb4c8401fe7018cc9534f"; + sha256 = "0adqiqaqdcbcrmifz4zd9h08rgml6ghwkwid7qncrk2gxschkikz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f8a828b2fbfa11c4b74192d9d0cfa0ad34b3da7/recipes/dired-k"; @@ -12014,7 +12010,7 @@ dired-narrow = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-narrow"; - version = "20160130.1045"; + version = "20160130.845"; src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; @@ -12035,7 +12031,7 @@ dired-open = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-open"; - version = "20160205.1413"; + version = "20160205.1213"; src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; @@ -12055,7 +12051,7 @@ }) {}; dired-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-plus"; - version = "20160528.948"; + version = "20160528.748"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/dired+.el"; sha256 = "0wi2ph2ixsk6cjw81yxlqxl9ar0wh3k0yfwijr254yn9rl4vibxc"; @@ -12074,7 +12070,7 @@ dired-quick-sort = callPackage ({ fetchFromGitLab, fetchurl, hydra, lib, melpaBuild }: melpaBuild { pname = "dired-quick-sort"; - version = "20160524.538"; + version = "20160524.338"; src = fetchFromGitLab { owner = "xuhdev"; repo = "dired-quick-sort"; @@ -12095,7 +12091,7 @@ dired-rainbow = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-rainbow"; - version = "20141214.743"; + version = "20141214.543"; src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; @@ -12116,7 +12112,7 @@ dired-ranger = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-ranger"; - version = "20160528.1231"; + version = "20160528.1031"; src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; @@ -12137,7 +12133,7 @@ dired-single = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-single"; - version = "20151230.1958"; + version = "20151230.1758"; src = fetchFromGitHub { owner = "crocket"; repo = "dired-single"; @@ -12157,7 +12153,7 @@ }) {}; dired-sort = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-sort"; - version = "20090208.2238"; + version = "20090208.2038"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/dired-sort.el"; sha256 = "1dpxkxxfs14sdm3hwxv0j26lq0qzx4gryw42vrcdi680aj24962z"; @@ -12175,7 +12171,7 @@ }) {}; dired-sort-menu = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-sort-menu"; - version = "20130824.707"; + version = "20130824.507"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/dired-sort-menu.el"; sha256 = "1i42r7j1c8677qf79ig33bia24d2yvcj26y92migfvrlbi03w4qi"; @@ -12194,7 +12190,7 @@ dired-sort-menu-plus = callPackage ({ dired-sort-menu, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-sort-menu-plus"; - version = "20151231.1451"; + version = "20151231.1251"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/dired-sort-menu+.el"; sha256 = "1hjci4zfzig04ji1jravxg9n67rdr4wyhmxmahbrzq9kjnql510i"; @@ -12213,7 +12209,7 @@ dired-subtree = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-subtree"; - version = "20150908.1233"; + version = "20150908.1033"; src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; @@ -12234,7 +12230,7 @@ dired-toggle = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-toggle"; - version = "20140907.1549"; + version = "20140907.1349"; src = fetchFromGitHub { owner = "fasheng"; repo = "dired-toggle"; @@ -12255,7 +12251,7 @@ dired-toggle-sudo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-toggle-sudo"; - version = "20151109.406"; + version = "20151109.206"; src = fetchFromGitHub { owner = "renard"; repo = "dired-toggle-sudo"; @@ -12276,7 +12272,7 @@ diredful = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "diredful"; - version = "20160529.1517"; + version = "20160529.1317"; src = fetchFromGitHub { owner = "thamer"; repo = "diredful"; @@ -12297,7 +12293,7 @@ direx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "direx"; - version = "20151023.1806"; + version = "20151023.1606"; src = fetchFromGitHub { owner = "m2ym"; repo = "direx-el"; @@ -12318,7 +12314,7 @@ direx-grep = callPackage ({ direx, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "direx-grep"; - version = "20140515.1006"; + version = "20140515.806"; src = fetchFromGitHub { owner = "aki2o"; repo = "direx-grep"; @@ -12339,7 +12335,7 @@ dirtree = callPackage ({ fetchurl, lib, melpaBuild, tree-mode, windata }: melpaBuild { pname = "dirtree"; - version = "20140129.232"; + version = "20140129.32"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/dirtree.el"; sha256 = "1q03q4j0wkbg9p2nzf1kb7l517b21mskp2v52i95jbxh09igbjjx"; @@ -12358,7 +12354,7 @@ dirtree-prosjekt = callPackage ({ dirtree, fetchFromGitHub, fetchurl, lib, melpaBuild, prosjekt }: melpaBuild { pname = "dirtree-prosjekt"; - version = "20140129.304"; + version = "20140129.104"; src = fetchFromGitHub { owner = "abingham"; repo = "prosjekt"; @@ -12379,7 +12375,7 @@ disable-mouse = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "disable-mouse"; - version = "20160630.2103"; + version = "20160630.1903"; src = fetchFromGitHub { owner = "purcell"; repo = "disable-mouse"; @@ -12400,7 +12396,7 @@ disaster = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "disaster"; - version = "20130509.1255"; + version = "20130509.1055"; src = fetchFromGitHub { owner = "jart"; repo = "disaster"; @@ -12421,7 +12417,7 @@ discover = callPackage ({ fetchFromGitHub, fetchurl, lib, makey, melpaBuild }: melpaBuild { pname = "discover"; - version = "20140103.1539"; + version = "20140103.1339"; src = fetchFromGitHub { owner = "mickeynp"; repo = "discover.el"; @@ -12442,7 +12438,7 @@ discover-clj-refactor = callPackage ({ clj-refactor, discover, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "discover-clj-refactor"; - version = "20150328.959"; + version = "20150328.759"; src = fetchFromGitHub { owner = "maio"; repo = "discover-clj-refactor.el"; @@ -12463,7 +12459,7 @@ discover-js2-refactor = callPackage ({ discover, fetchFromGitHub, fetchurl, js2-refactor, lib, melpaBuild }: melpaBuild { pname = "discover-js2-refactor"; - version = "20140129.952"; + version = "20140129.752"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "discover-js2-refactor"; @@ -12484,7 +12480,7 @@ discover-my-major = callPackage ({ fetchFromGitHub, fetchurl, lib, makey, melpaBuild }: melpaBuild { pname = "discover-my-major"; - version = "20160108.1241"; + version = "20160108.1041"; src = fetchFromGitHub { owner = "steckerhalter"; repo = "discover-my-major"; @@ -12504,7 +12500,7 @@ }) {}; disk = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "disk"; - version = "20081128.906"; + version = "20081128.706"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/disk.el"; sha256 = "1c0pgqvl1z2f5hprszln53pn2v2pqy110r3wx3g84v71w6378bbv"; @@ -12523,7 +12519,7 @@ dispass = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dispass"; - version = "20140202.931"; + version = "20140202.731"; src = fetchFromGitHub { owner = "ryuslash"; repo = "dispass.el"; @@ -12544,7 +12540,7 @@ display-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "display-theme"; - version = "20140115.956"; + version = "20140115.756"; src = fetchFromGitHub { owner = "kawabata"; repo = "emacs-display-theme"; @@ -12565,7 +12561,7 @@ distinguished-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "distinguished-theme"; - version = "20151216.1415"; + version = "20151216.1215"; src = fetchFromGitHub { owner = "Lokaltog"; repo = "distinguished-theme"; @@ -12586,12 +12582,12 @@ dix = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dix"; - version = "20160602.1526"; + version = "20160713.225"; src = fetchFromGitHub { owner = "unhammer"; repo = "dix"; - rev = "15c23a350c88abfdec6a14e7d85c78938e487307"; - sha256 = "1pvd4gf4w4jb0j6n84ak844i6dk064y2pvnm5x0z5q70c2fn9170"; + rev = "e7256998912bc9263091b8486e73029206dcc169"; + sha256 = "0rx1j38dgl8ccqi5hwshwwp3w4xshfjxpfd87cj661wcrigyf6jc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/149eeba213b82aa0bcda1073aaf1aa02c2593f91/recipes/dix"; @@ -12607,12 +12603,12 @@ dix-evil = callPackage ({ dix, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dix-evil"; - version = "20160601.624"; + version = "20160603.1517"; src = fetchFromGitHub { owner = "unhammer"; repo = "dix"; - rev = "15c23a350c88abfdec6a14e7d85c78938e487307"; - sha256 = "1pvd4gf4w4jb0j6n84ak844i6dk064y2pvnm5x0z5q70c2fn9170"; + rev = "e7256998912bc9263091b8486e73029206dcc169"; + sha256 = "0rx1j38dgl8ccqi5hwshwwp3w4xshfjxpfd87cj661wcrigyf6jc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9dcceb57231bf2082154cab394064a59d84d3a5/recipes/dix-evil"; @@ -12628,7 +12624,7 @@ dizzee = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dizzee"; - version = "20111009.816"; + version = "20111009.616"; src = fetchFromGitHub { owner = "davidmiller"; repo = "dizzee"; @@ -12649,7 +12645,7 @@ django-manage = callPackage ({ fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }: melpaBuild { pname = "django-manage"; - version = "20151025.130"; + version = "20151024.2330"; src = fetchFromGitHub { owner = "gopar"; repo = "django-manage"; @@ -12670,7 +12666,7 @@ django-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "django-mode"; - version = "20150207.717"; + version = "20150207.517"; src = fetchFromGitHub { owner = "myfreeweb"; repo = "django-mode"; @@ -12691,7 +12687,7 @@ django-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "django-snippets"; - version = "20131229.1011"; + version = "20131229.811"; src = fetchFromGitHub { owner = "myfreeweb"; repo = "django-mode"; @@ -12712,7 +12708,7 @@ django-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "django-theme"; - version = "20131022.402"; + version = "20131022.202"; src = fetchFromGitHub { owner = "andrzejsliwa"; repo = "django-theme.el"; @@ -12733,7 +12729,7 @@ dkdo = callPackage ({ dkmisc, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dkdo"; - version = "20131110.519"; + version = "20131110.319"; src = fetchFromGitHub { owner = "davidkeegan"; repo = "dkdo"; @@ -12754,7 +12750,7 @@ dklrt = callPackage ({ dkmisc, emacs, fetchFromGitHub, fetchurl, ledger-mode, lib, melpaBuild }: melpaBuild { pname = "dklrt"; - version = "20131110.741"; + version = "20131110.541"; src = fetchFromGitHub { owner = "davidkeegan"; repo = "dklrt"; @@ -12775,7 +12771,7 @@ dkmisc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dkmisc"; - version = "20131110.515"; + version = "20131110.315"; src = fetchFromGitHub { owner = "davidkeegan"; repo = "dkmisc"; @@ -12796,7 +12792,7 @@ dmenu = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dmenu"; - version = "20160228.827"; + version = "20160228.627"; src = fetchFromGitHub { owner = "lujun9972"; repo = "el-dmenu"; @@ -12817,7 +12813,7 @@ dna-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dna-mode"; - version = "20130821.1305"; + version = "20130821.1105"; src = fetchFromGitHub { owner = "jhgorrell"; repo = "dna-mode-el"; @@ -12838,7 +12834,7 @@ docbook-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "docbook-snippets"; - version = "20150714.1125"; + version = "20150714.925"; src = fetchFromGitHub { owner = "jhradilek"; repo = "emacs-docbook-snippets"; @@ -12859,7 +12855,7 @@ docean = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "docean"; - version = "20150927.1318"; + version = "20150927.1118"; src = fetchFromGitHub { owner = "emacs-pe"; repo = "docean.el"; @@ -12880,12 +12876,12 @@ docker = callPackage ({ dash, docker-tramp, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild, s, tablist }: melpaBuild { pname = "docker"; - version = "20160630.517"; + version = "20160708.512"; src = fetchFromGitHub { owner = "Silex"; repo = "docker.el"; - rev = "0a37066fb020400c47a5d344a09b3f6288c284d1"; - sha256 = "1dk5y2wq05p70snvqsd5hx3r3bcy64n4bk1swpj2axwpi6j0a06s"; + rev = "5585b8dd9a2a8e5c5d98b1a3a47dc25c5d25b312"; + sha256 = "1wg1d895y0hhq4abz0c1a69sxg1427fp5kdy7v7ab0q841xfkdgs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker"; @@ -12901,7 +12897,7 @@ docker-api = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }: melpaBuild { pname = "docker-api"; - version = "20160525.220"; + version = "20160525.20"; src = fetchFromGitHub { owner = "Silex"; repo = "docker-api.el"; @@ -12922,7 +12918,7 @@ docker-tramp = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "docker-tramp"; - version = "20160113.2152"; + version = "20160113.1952"; src = fetchFromGitHub { owner = "emacs-pe"; repo = "docker-tramp.el"; @@ -12943,7 +12939,7 @@ dockerfile-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dockerfile-mode"; - version = "20160128.1151"; + version = "20160128.951"; src = fetchFromGitHub { owner = "spotify"; repo = "dockerfile-mode"; @@ -12964,7 +12960,7 @@ dokuwiki-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dokuwiki-mode"; - version = "20160129.207"; + version = "20160129.7"; src = fetchFromGitHub { owner = "kai2nenobu"; repo = "emacs-dokuwiki-mode"; @@ -12985,7 +12981,7 @@ dollaro = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "dollaro"; - version = "20151123.702"; + version = "20151123.502"; src = fetchFromGitHub { owner = "laynor"; repo = "dollaro"; @@ -13006,7 +13002,7 @@ doom = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "doom"; - version = "20160121.922"; + version = "20160121.722"; src = fetchFromGitHub { owner = "emacsorphanage"; repo = "doom"; @@ -13026,7 +13022,7 @@ }) {}; doremi = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "doremi"; - version = "20151231.1455"; + version = "20151231.1255"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/doremi.el"; sha256 = "0201clwq9nbl8336lddcbwah8d6xipr7q8135yq79szfxq2bdg6v"; @@ -13045,7 +13041,7 @@ doremi-cmd = callPackage ({ doremi, fetchurl, lib, melpaBuild }: melpaBuild { pname = "doremi-cmd"; - version = "20160512.1912"; + version = "20160512.1712"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/doremi-cmd.el"; sha256 = "1ay8rkcyydjqi1081vphb8iw3w2zc73m5bg1dz2mkxhksqwchqvj"; @@ -13064,7 +13060,7 @@ doremi-frm = callPackage ({ doremi, faces-plus, fetchurl, frame-fns, hexrgb, lib, melpaBuild }: melpaBuild { pname = "doremi-frm"; - version = "20151231.1453"; + version = "20151231.1253"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/doremi-frm.el"; sha256 = "0v7ycmddh1ds64m1y5yai5nh34bd32q3wcm5y2pdzhj6jk7nj5wz"; @@ -13082,7 +13078,7 @@ }) {}; doremi-mac = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "doremi-mac"; - version = "20151231.1454"; + version = "20151231.1254"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/doremi-mac.el"; sha256 = "157kvlb4dqiyk1h7b4p0dhrr6crdakwnrxydyl6yh51w2hdnnigw"; @@ -13100,7 +13096,7 @@ }) {}; dos = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "dos"; - version = "20140808.1635"; + version = "20140808.1435"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/dos.el"; sha256 = "0sfmcd1rq6wih9q7d9vkcfrw6gf7309mm7491jx091ij8m4p8ypp"; @@ -13118,7 +13114,7 @@ }) {}; dot-mode = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "dot-mode"; - version = "20151029.855"; + version = "20151029.655"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/dot-mode.el"; sha256 = "0xhbzq3yvfvvvl6mfihrzkd3pn5p5yxvbcyf2jhsppk7lscifsgk"; @@ -13137,7 +13133,7 @@ download-region = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "download-region"; - version = "20160430.1316"; + version = "20160430.1116"; src = fetchFromGitHub { owner = "zk-phi"; repo = "download-region"; @@ -13158,7 +13154,7 @@ downplay-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "downplay-mode"; - version = "20151125.1409"; + version = "20151125.1209"; src = fetchFromGitHub { owner = "tobias"; repo = "downplay-mode"; @@ -13179,7 +13175,7 @@ dpaste = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dpaste"; - version = "20160303.1512"; + version = "20160303.1312"; src = fetchFromGitHub { owner = "gregnewman"; repo = "dpaste.el"; @@ -13200,7 +13196,7 @@ dpaste_de = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, web }: melpaBuild { pname = "dpaste_de"; - version = "20131015.725"; + version = "20131015.525"; src = fetchFromGitHub { owner = "theju"; repo = "dpaste_de.el"; @@ -13221,12 +13217,12 @@ dracula-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dracula-theme"; - version = "20160623.219"; + version = "20160710.1322"; src = fetchFromGitHub { owner = "dracula"; repo = "emacs"; - rev = "366fb365ded1c84f3712d4ba0b32dbdf9650921d"; - sha256 = "05z0nsz0ddabh1ij33jwk4x1hahh38l733xagh9ayls4yx2r7paf"; + rev = "af1febe83ed682c7015c5e208836b1e03a5519f9"; + sha256 = "0p4kiych8r3aa957is3pgav2lsdkrjkawb874sqq398xmwqfh0wx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d63cb8906726f106e65f7d9895b49a38ffebf8d5/recipes/dracula-theme"; @@ -13242,7 +13238,7 @@ draft-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "draft-mode"; - version = "20140609.956"; + version = "20140609.756"; src = fetchFromGitHub { owner = "gaudecker"; repo = "draft-mode"; @@ -13263,7 +13259,7 @@ drag-stuff = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "drag-stuff"; - version = "20160520.1359"; + version = "20160520.1159"; src = fetchFromGitHub { owner = "rejeep"; repo = "drag-stuff.el"; @@ -13284,7 +13280,7 @@ drawille = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "drawille"; - version = "20160418.1338"; + version = "20160418.1138"; src = fetchFromGitHub { owner = "sshbio"; repo = "drawille"; @@ -13305,7 +13301,7 @@ drill-instructor-AZIK-force = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "drill-instructor-AZIK-force"; - version = "20151122.2314"; + version = "20151122.2114"; src = fetchFromGitHub { owner = "myuhe"; repo = "drill-instructor-AZIK-force.el"; @@ -13326,7 +13322,7 @@ dropbox = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, oauth }: melpaBuild { pname = "dropbox"; - version = "20130513.1737"; + version = "20130513.1537"; src = fetchFromGitHub { owner = "pavpanchekha"; repo = "dropbox.el"; @@ -13346,7 +13342,7 @@ }) {}; dropdown-list = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "dropdown-list"; - version = "20120329.1136"; + version = "20120329.936"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/dropdown-list.el"; sha256 = "1szy46sk3nvlbb3yzk1s983281kkf507xr3fkclkki3d3x31n08a"; @@ -13365,7 +13361,7 @@ drupal-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode }: melpaBuild { pname = "drupal-mode"; - version = "20160420.1458"; + version = "20160420.1258"; src = fetchFromGitHub { owner = "arnested"; repo = "drupal-mode"; @@ -13386,7 +13382,7 @@ drupal-spell = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "drupal-spell"; - version = "20130520.1155"; + version = "20130520.955"; src = fetchFromGitHub { owner = "arnested"; repo = "drupal-spell"; @@ -13406,10 +13402,10 @@ }) {}; dsvn = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dsvn"; - version = "20130120.1457"; + version = "20130120.1257"; src = fetchsvn { url = "http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/"; - rev = "1751166"; + rev = "1754245"; sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq"; }; recipeFile = fetchurl { @@ -13426,7 +13422,7 @@ dtrace-script-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dtrace-script-mode"; - version = "20150214.23"; + version = "20150213.2223"; src = fetchFromGitHub { owner = "dotemacs"; repo = "dtrace-script-mode"; @@ -13447,7 +13443,7 @@ dtrt-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dtrt-indent"; - version = "20160620.529"; + version = "20160620.329"; src = fetchFromGitHub { owner = "jscheid"; repo = "dtrt-indent"; @@ -13468,7 +13464,7 @@ dts-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dts-mode"; - version = "20150403.1804"; + version = "20150403.1604"; src = fetchFromGitHub { owner = "bgamari"; repo = "dts-mode"; @@ -13489,7 +13485,7 @@ ducpel = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ducpel"; - version = "20140419.16"; + version = "20140418.2216"; src = fetchFromGitHub { owner = "alezost"; repo = "ducpel"; @@ -13510,12 +13506,12 @@ dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }: melpaBuild { pname = "dumb-jump"; - version = "20160610.47"; + version = "20160715.1740"; src = fetchFromGitHub { owner = "jacktasia"; repo = "dumb-jump"; - rev = "7e256808d82d22532030e4c53197426d3e082593"; - sha256 = "1rqhb3xysb1n0q3gzsfwf2m5bishbaz2gvzx5a30dnxcxk7x5y8z"; + rev = "cddb48646c330fd949801f2dadf51d93a37c5625"; + sha256 = "1zvin0qp3jr3s6m88zl2xdi0zrrw6j7hjp9vhhksjbf675w9ibqz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2a60e7c166c2d68e4f719d293014a22139593dde/recipes/dumb-jump"; @@ -13531,7 +13527,7 @@ dummy-h-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dummy-h-mode"; - version = "20160603.617"; + version = "20160603.417"; src = fetchFromGitHub { owner = "yascentur"; repo = "dummy-h-mode-el"; @@ -13552,7 +13548,7 @@ dummyparens = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dummyparens"; - version = "20141009.524"; + version = "20141009.324"; src = fetchFromGitHub { owner = "snosov1"; repo = "dummyparens"; @@ -13573,7 +13569,7 @@ duplicate-thing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "duplicate-thing"; - version = "20120515.1148"; + version = "20120515.948"; src = fetchFromGitHub { owner = "ongaeshi"; repo = "duplicate-thing"; @@ -13594,11 +13590,11 @@ dyalog-mode = callPackage ({ cl-lib ? null, fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dyalog-mode"; - version = "20160315.1049"; + version = "20160723.524"; src = fetchhg { url = "https://bitbucket.com/harsman/dyalog-mode"; - rev = "4dac440334f0"; - sha256 = "19aid1rqpqj0fvln98db5imfk1griqld55xsr9plm6kwrr174syq"; + rev = "a3fdf75d634a"; + sha256 = "0yqsrqqzhril9crdgc3ddjz0jggmy29djksqrlihffk9p8zs341d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode"; @@ -13614,7 +13610,7 @@ dylan-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dylan-mode"; - version = "20160405.1714"; + version = "20160405.1514"; src = fetchFromGitHub { owner = "dylan-lang"; repo = "dylan-mode"; @@ -13635,7 +13631,7 @@ dynamic-fonts = callPackage ({ fetchFromGitHub, fetchurl, font-utils, lib, melpaBuild, pcache, persistent-soft }: melpaBuild { pname = "dynamic-fonts"; - version = "20140731.726"; + version = "20140731.526"; src = fetchFromGitHub { owner = "rolandwalker"; repo = "dynamic-fonts"; @@ -13656,7 +13652,7 @@ dynamic-ruler = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dynamic-ruler"; - version = "20160602.308"; + version = "20160602.108"; src = fetchFromGitHub { owner = "rocher"; repo = "dynamic-ruler"; @@ -13677,7 +13673,7 @@ e2ansi = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "e2ansi"; - version = "20150220.1713"; + version = "20150220.1513"; src = fetchFromGitHub { owner = "Lindydancer"; repo = "e2ansi"; @@ -13698,7 +13694,7 @@ e2wm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, window-layout }: melpaBuild { pname = "e2wm"; - version = "20150608.1923"; + version = "20150608.1723"; src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-window-manager"; @@ -13719,7 +13715,7 @@ e2wm-R = callPackage ({ e2wm, ess, fetchFromGitHub, fetchurl, inlineR, lib, melpaBuild }: melpaBuild { pname = "e2wm-R"; - version = "20151230.326"; + version = "20151230.126"; src = fetchFromGitHub { owner = "myuhe"; repo = "e2wm-R.el"; @@ -13740,7 +13736,7 @@ e2wm-bookmark = callPackage ({ e2wm, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "e2wm-bookmark"; - version = "20151122.2321"; + version = "20151122.2121"; src = fetchFromGitHub { owner = "myuhe"; repo = "e2wm-bookmark.el"; @@ -13761,7 +13757,7 @@ e2wm-direx = callPackage ({ direx, e2wm, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "e2wm-direx"; - version = "20140815.1813"; + version = "20140815.1613"; src = fetchFromGitHub { owner = "aki2o"; repo = "e2wm-direx"; @@ -13782,7 +13778,7 @@ e2wm-pkgex4pl = callPackage ({ e2wm, fetchFromGitHub, fetchurl, lib, melpaBuild, plsense-direx }: melpaBuild { pname = "e2wm-pkgex4pl"; - version = "20140525.547"; + version = "20140525.347"; src = fetchFromGitHub { owner = "aki2o"; repo = "e2wm-pkgex4pl"; @@ -13803,7 +13799,7 @@ e2wm-svg-clock = callPackage ({ e2wm, fetchFromGitHub, fetchurl, lib, melpaBuild, svg-clock }: melpaBuild { pname = "e2wm-svg-clock"; - version = "20150106.706"; + version = "20150106.506"; src = fetchFromGitHub { owner = "myuhe"; repo = "e2wm-svg-clock.el"; @@ -13824,7 +13820,7 @@ e2wm-sww = callPackage ({ e2wm, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "e2wm-sww"; - version = "20140524.358"; + version = "20140524.158"; src = fetchFromGitHub { owner = "aki2o"; repo = "e2wm-sww"; @@ -13845,7 +13841,7 @@ e2wm-term = callPackage ({ e2wm, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }: melpaBuild { pname = "e2wm-term"; - version = "20141009.808"; + version = "20141009.608"; src = fetchFromGitHub { owner = "aki2o"; repo = "e2wm-term"; @@ -13866,7 +13862,7 @@ easy-after-load = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-after-load"; - version = "20121224.2049"; + version = "20121224.1849"; src = fetchFromGitHub { owner = "pd"; repo = "easy-after-load"; @@ -13887,7 +13883,7 @@ easy-escape = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-escape"; - version = "20150718.2133"; + version = "20150718.1933"; src = fetchFromGitHub { owner = "cpitclaudel"; repo = "easy-escape"; @@ -13908,7 +13904,7 @@ easy-kill = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-kill"; - version = "20151031.29"; + version = "20151030.2229"; src = fetchFromGitHub { owner = "leoliu"; repo = "easy-kill"; @@ -13929,7 +13925,7 @@ easy-kill-extras = callPackage ({ easy-kill, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-kill-extras"; - version = "20160418.2119"; + version = "20160418.1919"; src = fetchFromGitHub { owner = "knu"; repo = "easy-kill-extras.el"; @@ -13950,7 +13946,7 @@ easy-lentic = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lentic, lib, melpaBuild }: melpaBuild { pname = "easy-lentic"; - version = "20160530.130"; + version = "20160529.2330"; src = fetchFromGitHub { owner = "tumashu"; repo = "easy-lentic"; @@ -13971,7 +13967,7 @@ easy-repeat = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-repeat"; - version = "20150516.348"; + version = "20150516.148"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "easy-repeat.el"; @@ -13992,7 +13988,7 @@ ebal = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }: melpaBuild { pname = "ebal"; - version = "20160531.1106"; + version = "20160531.906"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "ebal"; @@ -14013,7 +14009,7 @@ ebf = callPackage ({ cl-lib ? null, dash, dash-functional, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ebf"; - version = "20160211.1158"; + version = "20160211.958"; src = fetchFromGitHub { owner = "rexim"; repo = "ebf"; @@ -14034,12 +14030,12 @@ ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib }: melpaBuild { pname = "ebib"; - version = "20160627.1406"; + version = "20160706.220"; src = fetchFromGitHub { owner = "joostkremers"; repo = "ebib"; - rev = "e785008f9fe778685f657c28e10c48e7de5f7fd3"; - sha256 = "0g7j3mr1jyjzlllbb6flvqrfkxflhkhh8hla3chp0kiz5csvrk4w"; + rev = "28e4ee990d0e1c685632a737c764425037f7d5c4"; + sha256 = "114k7gr9z7wisz5h6jic1fqn7481xidi89fjhljhbak602iq6zjc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib"; @@ -14055,7 +14051,7 @@ ebib-handy = callPackage ({ chinese-pyim, ebib, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ebib-handy"; - version = "20160509.1756"; + version = "20160509.1556"; src = fetchFromGitHub { owner = "tumashu"; repo = "ebib-handy"; @@ -14076,7 +14072,7 @@ ecb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ecb"; - version = "20140215.314"; + version = "20140215.114"; src = fetchFromGitHub { owner = "alexott"; repo = "ecb"; @@ -14096,7 +14092,7 @@ }) {}; echo-bell = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "echo-bell"; - version = "20151231.1456"; + version = "20151231.1256"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/echo-bell.el"; sha256 = "0jk7pb2sr4qbxwcn4ipcjc9phl9zjmgg8sf91qj113112xx7vvxa"; @@ -14115,7 +14111,7 @@ eclipse-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eclipse-theme"; - version = "20160430.522"; + version = "20160430.322"; src = fetchFromGitHub { owner = "abo-abo"; repo = "eclipse-theme"; @@ -14136,7 +14132,7 @@ ecukes = callPackage ({ ansi, commander, dash, espuds, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ecukes"; - version = "20150717.848"; + version = "20150717.648"; src = fetchFromGitHub { owner = "ecukes"; repo = "ecukes"; @@ -14157,7 +14153,7 @@ edbi = callPackage ({ concurrent, ctable, epc, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "edbi"; - version = "20160224.1941"; + version = "20160224.1741"; src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-edbi"; @@ -14178,7 +14174,7 @@ edbi-database-url = callPackage ({ edbi, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "edbi-database-url"; - version = "20160221.1323"; + version = "20160221.1123"; src = fetchFromGitHub { owner = "proofit404"; repo = "edbi-database-url"; @@ -14199,7 +14195,7 @@ edbi-django = callPackage ({ edbi, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "edbi-django"; - version = "20160221.1323"; + version = "20160221.1123"; src = fetchFromGitHub { owner = "proofit404"; repo = "edbi-django"; @@ -14220,12 +14216,12 @@ edbi-minor-mode = callPackage ({ edbi, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "edbi-minor-mode"; - version = "20160221.1323"; + version = "20160706.747"; src = fetchFromGitHub { owner = "proofit404"; repo = "edbi-minor-mode"; - rev = "cce1cd0953866b2989ecbfd4321de71f308d6e9d"; - sha256 = "176954d4agk4by5w8a5ky65iwjky1dqxxvz8vdf8fxj82r5k9fhh"; + rev = "566a2141a6eb9d9d5d7e1bd7c251d1c5e8f0d2ec"; + sha256 = "1g6mlmrwl8p5ffj9q298vymd9xi2kpp7mhbmz4by4f6a3g831c88"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5fb878b60c7ecbb1e3a47aef1d9765061c510644/recipes/edbi-minor-mode"; @@ -14241,7 +14237,7 @@ edbi-sqlite = callPackage ({ edbi, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "edbi-sqlite"; - version = "20160221.1323"; + version = "20160221.1123"; src = fetchFromGitHub { owner = "proofit404"; repo = "edbi-sqlite"; @@ -14262,7 +14258,7 @@ ede-compdb = callPackage ({ cl-lib ? null, ede ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, semantic ? null }: melpaBuild { pname = "ede-compdb"; - version = "20150920.1533"; + version = "20150920.1333"; src = fetchFromGitHub { owner = "randomphrase"; repo = "ede-compdb"; @@ -14283,7 +14279,7 @@ edebug-x = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "edebug-x"; - version = "20130616.125"; + version = "20130615.2325"; src = fetchFromGitHub { owner = "ScottyB"; repo = "edebug-x"; @@ -14304,7 +14300,7 @@ edit-at-point = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "edit-at-point"; - version = "20150716.824"; + version = "20150716.624"; src = fetchFromGitHub { owner = "enoson"; repo = "edit-at-point.el"; @@ -14325,7 +14321,7 @@ edit-color-stamp = callPackage ({ cl-lib ? null, es-lib, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "edit-color-stamp"; - version = "20130529.1233"; + version = "20130529.1033"; src = fetchFromGitHub { owner = "sabof"; repo = "edit-color-stamp"; @@ -14346,7 +14342,7 @@ edit-indirect = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "edit-indirect"; - version = "20160528.851"; + version = "20160528.651"; src = fetchFromGitHub { owner = "Fanael"; repo = "edit-indirect"; @@ -14367,7 +14363,7 @@ edit-list = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "edit-list"; - version = "20100930.943"; + version = "20100930.743"; src = fetchFromGitHub { owner = "emacsmirror"; repo = "edit-list"; @@ -14388,7 +14384,7 @@ edit-server = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "edit-server"; - version = "20141231.1558"; + version = "20141231.1358"; src = fetchFromGitHub { owner = "stsquad"; repo = "emacs_chrome"; @@ -14409,7 +14405,7 @@ edit-server-htmlize = callPackage ({ edit-server, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "edit-server-htmlize"; - version = "20130329.1748"; + version = "20130329.1548"; src = fetchFromGitHub { owner = "frobtech"; repo = "edit-server-htmlize"; @@ -14430,12 +14426,12 @@ editorconfig = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "editorconfig"; - version = "20160623.2245"; + version = "20160719.559"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-emacs"; - rev = "a32fd81182be981a558ff9d0db46e3ca30050b59"; - sha256 = "0bhadyxv34ywiyjx69vf1pgc04fiyarsrvhci559fyy2b6lql6k5"; + rev = "e316e6ebe2bfed0806dd21583e7c904e6d4c182f"; + sha256 = "1mnx2b2qyv3d8chj9l2l7icvajdiry2n5d3c8byvibs8wav9jzh6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig"; @@ -14451,12 +14447,12 @@ editorconfig-custom-majormode = callPackage ({ editorconfig, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "editorconfig-custom-majormode"; - version = "20160623.643"; + version = "20160706.2035"; src = fetchFromGitHub { owner = "10sr"; repo = "editorconfig-custom-majormode-el"; - rev = "2e3cbaff36f072a4b32064c2db0c7b999b87b535"; - sha256 = "0pmafnpzzgzpsxjzi57l59sss9pjpvmblpd6qrl1dzgp096idki0"; + rev = "72df25c2d4a1fb8ab56f71919799897b826bf044"; + sha256 = "1hmfvqyl6nyyk122vn74wfscpw7869rwi28hs5cy3n8nvn220d3c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fcd47bf4630442ad1a941ad432cef64c7746aa71/recipes/editorconfig-custom-majormode"; @@ -14469,10 +14465,31 @@ license = lib.licenses.free; }; }) {}; + editorconfig-domain-specific = callPackage ({ cl-lib ? null, editorconfig, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "editorconfig-domain-specific"; + version = "20160705.802"; + src = fetchFromGitHub { + owner = "lassik"; + repo = "editorconfig-emacs-domain-specific"; + rev = "0142ddff7b3293c82b0a83ad2c3edd6ee1a84ddd"; + sha256 = "08pjm719jxanqzrs2blhaqhm4wvzqyg9y56mkgwdlpdg722gn175"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/831a7dd7ef853ca44709eabfd48ee97113705319/recipes/editorconfig-domain-specific"; + sha256 = "1rkan6q7z0qfq28zg114iik71nghd7fbs4g8qppzhgr3pwbpn73q"; + name = "editorconfig-domain-specific"; + }; + packageRequires = [ cl-lib editorconfig ]; + meta = { + homepage = "https://melpa.org/#/editorconfig-domain-specific"; + license = lib.licenses.free; + }; + }) {}; edn = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, peg }: melpaBuild { pname = "edn"; - version = "20160215.619"; + version = "20160215.419"; src = fetchFromGitHub { owner = "expez"; repo = "edn.el"; @@ -14493,7 +14510,7 @@ edts = callPackage ({ auto-complete, auto-highlight-symbol, dash, eproject, erlang, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }: melpaBuild { pname = "edts"; - version = "20160430.831"; + version = "20160430.631"; src = fetchFromGitHub { owner = "tjarvstrand"; repo = "edts"; @@ -14523,7 +14540,7 @@ efire = callPackage ({ circe, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "efire"; - version = "20151009.1531"; + version = "20151009.1331"; src = fetchFromGitHub { owner = "capitaomorte"; repo = "efire"; @@ -14544,7 +14561,7 @@ egg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "egg"; - version = "20160330.2247"; + version = "20160330.2047"; src = fetchFromGitHub { owner = "byplayer"; repo = "egg"; @@ -14565,12 +14582,12 @@ egison-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "egison-mode"; - version = "20160603.303"; + version = "20160603.103"; src = fetchFromGitHub { owner = "egisatoshi"; repo = "egison3"; - rev = "930d067a212046ad2d9d374f31196b6ffe2ec2a9"; - sha256 = "0lnxp2ffzkcrxvj4y1mpqq6qqxgikg5hah49x16r6n75s35sfidk"; + rev = "f270ba4b1fe0003fa3e1e054f1a743d14a318ad5"; + sha256 = "1gh6cf7913hrzb83dzgr2fhgi6h762ggh0chypmbp1d6sf5h2y89"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode"; @@ -14586,12 +14603,12 @@ ego = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }: melpaBuild { pname = "ego"; - version = "20160602.33"; + version = "20160720.326"; src = fetchFromGitHub { owner = "emacs-china"; repo = "EGO"; - rev = "31e2bfd0f7cc3ce0ef01184f55ac389ce7595a8c"; - sha256 = "1m53zv74lqzdy78jix0a33ih2pqkmrfriwlgsgvb12lb281bfnsa"; + rev = "69aeac85148b5a5789272c9445aa85b25e5a2a1b"; + sha256 = "06d2caxmg7k2z0v3hv41b8ybdjajw05m73m29afw8vadghcghixz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0090a628a5d566a887cac0d24b080ee6bafe4612/recipes/ego"; @@ -14606,7 +14623,7 @@ }) {}; eide = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eide"; - version = "20160210.1438"; + version = "20160210.1238"; src = fetchgit { url = "git://git.tuxfamily.org/gitroot/eide/emacs-ide.git"; rev = "9d7fb8c50568ece04bb0382caca42d3ab68fbb01"; @@ -14626,7 +14643,7 @@ eimp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eimp"; - version = "20120826.1539"; + version = "20120826.1339"; src = fetchFromGitHub { owner = "nicferrier"; repo = "eimp"; @@ -14647,12 +14664,12 @@ ein = callPackage ({ cl-generic, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }: melpaBuild { pname = "ein"; - version = "20160422.829"; + version = "20160725.621"; src = fetchFromGitHub { owner = "millejoh"; repo = "emacs-ipython-notebook"; - rev = "b26c972ec89842ac21d4076b9d5719d26e7d5745"; - sha256 = "1b20cz9grxyjpbmc91csfygkg6rnclj39cc6pnlxxy6ikcn5xywn"; + rev = "a9736311c86d6b8b1fe4ecd695cecaeff968db8c"; + sha256 = "08wyqnmm775dk88ijyjqw8fv4393kd9zm05pvzi6vr3svb2fmhrm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3201516c0158c47d0226ef9c5d324d29ac7b088b/recipes/ein"; @@ -14668,7 +14685,7 @@ ein-mumamo = callPackage ({ ein, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ein-mumamo"; - version = "20150301.1828"; + version = "20150301.1628"; src = fetchFromGitHub { owner = "millejoh"; repo = "ein-mumamo"; @@ -14689,7 +14706,7 @@ eink-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eink-theme"; - version = "20160522.103"; + version = "20160521.2303"; src = fetchFromGitHub { owner = "maio"; repo = "eink-emacs"; @@ -14710,7 +14727,7 @@ ejc-sql = callPackage ({ auto-complete, clomacs, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ejc-sql"; - version = "20160603.942"; + version = "20160603.742"; src = fetchFromGitHub { owner = "kostafey"; repo = "ejc-sql"; @@ -14731,7 +14748,7 @@ el-autoyas = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "el-autoyas"; - version = "20120918.817"; + version = "20120918.617"; src = fetchFromGitHub { owner = "mattfidler"; repo = "el-autoyas.el"; @@ -14752,12 +14769,12 @@ el-get = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "el-get"; - version = "20160628.1819"; + version = "20160628.1619"; src = fetchFromGitHub { owner = "dimitri"; repo = "el-get"; - rev = "78e8d27fc2b556e53451e64291f4a1c5fe5bcce0"; - sha256 = "0p8np1girlvs1w1jnab49s94220q1863j6xbpbsx9ndlybbnamza"; + rev = "b59cada0c5a95809dbd084542f5b90395180ac39"; + sha256 = "1i1k9hii7xj3r31mfx7kqw6161hdkk7xy4plw268aa98j50d4ysz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get"; @@ -14773,7 +14790,7 @@ el-init = callPackage ({ anaphora, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "el-init"; - version = "20150728.420"; + version = "20150728.220"; src = fetchFromGitHub { owner = "HKey"; repo = "el-init"; @@ -14794,7 +14811,7 @@ el-init-viewer = callPackage ({ anaphora, cl-lib ? null, ctable, dash, el-init, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "el-init-viewer"; - version = "20150303.228"; + version = "20150303.28"; src = fetchFromGitHub { owner = "HKey"; repo = "el-init-viewer"; @@ -14815,7 +14832,7 @@ el-mock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "el-mock"; - version = "20150906.521"; + version = "20150906.321"; src = fetchFromGitHub { owner = "rejeep"; repo = "el-mock.el"; @@ -14836,7 +14853,7 @@ el-pocket = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, web }: melpaBuild { pname = "el-pocket"; - version = "20160528.1151"; + version = "20160528.951"; src = fetchFromGitHub { owner = "pterygota"; repo = "el-pocket"; @@ -14857,7 +14874,7 @@ el-spec = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "el-spec"; - version = "20121018.204"; + version = "20121018.4"; src = fetchFromGitHub { owner = "uk-ar"; repo = "el-spec"; @@ -14878,7 +14895,7 @@ el-spice = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, thingatpt-plus }: melpaBuild { pname = "el-spice"; - version = "20140805.1338"; + version = "20140805.1138"; src = fetchFromGitHub { owner = "vedang"; repo = "el-spice"; @@ -14899,7 +14916,7 @@ el-sprunge = callPackage ({ emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, web-server }: melpaBuild { pname = "el-sprunge"; - version = "20140106.1939"; + version = "20140106.1739"; src = fetchFromGitHub { owner = "eschulte"; repo = "el-sprunge"; @@ -14920,7 +14937,7 @@ el-spy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "el-spy"; - version = "20131226.1408"; + version = "20131226.1208"; src = fetchFromGitHub { owner = "uk-ar"; repo = "el-spy"; @@ -14940,7 +14957,7 @@ }) {}; el-swank-fuzzy = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "el-swank-fuzzy"; - version = "20130824.657"; + version = "20130824.457"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/el-swank-fuzzy.el"; sha256 = "1g2jhm9m5qcj6a231n5ch6b8bqwzq3kj275nd4s89p89v1252qhn"; @@ -14959,7 +14976,7 @@ el-x = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "el-x"; - version = "20140111.1601"; + version = "20140111.1401"; src = fetchFromGitHub { owner = "sigma"; repo = "el-x"; @@ -14980,7 +14997,7 @@ el2markdown = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "el2markdown"; - version = "20150516.1538"; + version = "20150516.1338"; src = fetchFromGitHub { owner = "Lindydancer"; repo = "el2markdown"; @@ -15001,7 +15018,7 @@ elang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, names }: melpaBuild { pname = "elang"; - version = "20160104.856"; + version = "20160104.656"; src = fetchFromGitHub { owner = "vkazanov"; repo = "elang"; @@ -15022,7 +15039,7 @@ eldoc-eval = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eldoc-eval"; - version = "20150512.706"; + version = "20150512.506"; src = fetchFromGitHub { owner = "thierryvolpiatto"; repo = "eldoc-eval"; @@ -15042,7 +15059,7 @@ }) {}; eldoc-extension = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "eldoc-extension"; - version = "20140306.845"; + version = "20140306.645"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/eldoc-extension.el"; sha256 = "13ncpp3hrwk0h030c5nnm2zfiingilr5b876jsf2wxmylg57nbch"; @@ -15061,7 +15078,7 @@ electric-case = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "electric-case"; - version = "20150417.612"; + version = "20150417.412"; src = fetchFromGitHub { owner = "zk-phi"; repo = "electric-case"; @@ -15082,7 +15099,7 @@ electric-operator = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }: melpaBuild { pname = "electric-operator"; - version = "20160511.131"; + version = "20160510.2331"; src = fetchFromGitHub { owner = "davidshepherd7"; repo = "electric-operator"; @@ -15103,7 +15120,7 @@ electric-spacing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "electric-spacing"; - version = "20151209.936"; + version = "20151209.736"; src = fetchFromGitHub { owner = "xwl"; repo = "electric-spacing"; @@ -15124,7 +15141,7 @@ elein = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elein"; - version = "20120120.516"; + version = "20120120.316"; src = fetchFromGitHub { owner = "remvee"; repo = "elein"; @@ -15145,12 +15162,12 @@ elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elfeed"; - version = "20160703.1210"; + version = "20160703.2019"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "32183b7ad53df863133531df1230aa26a35db5f4"; - sha256 = "1qrfiycnll4d2f5gxla8v635jdqw96dbdnzqfsdb25lmdm0lha6p"; + rev = "f1050c93803688293f0f6988625183863972f4ec"; + sha256 = "1bwvsbxnx68vz9vmdbxybl66qn8s54zhlbjswjb9vdir16w9ww4s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed"; @@ -15166,7 +15183,7 @@ elfeed-goodies = callPackage ({ ace-jump-mode, cl-lib ? null, elfeed, fetchFromGitHub, fetchurl, lib, melpaBuild, noflet, popwin, powerline }: melpaBuild { pname = "elfeed-goodies"; - version = "20160317.624"; + version = "20160317.424"; src = fetchFromGitHub { owner = "algernon"; repo = "elfeed-goodies"; @@ -15194,7 +15211,7 @@ elfeed-org = callPackage ({ dash, elfeed, fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }: melpaBuild { pname = "elfeed-org"; - version = "20151003.531"; + version = "20151003.331"; src = fetchFromGitHub { owner = "remyhonig"; repo = "elfeed-org"; @@ -15215,12 +15232,12 @@ elfeed-web = callPackage ({ elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, simple-httpd }: melpaBuild { pname = "elfeed-web"; - version = "20160525.716"; + version = "20160525.516"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "32183b7ad53df863133531df1230aa26a35db5f4"; - sha256 = "1qrfiycnll4d2f5gxla8v635jdqw96dbdnzqfsdb25lmdm0lha6p"; + rev = "f1050c93803688293f0f6988625183863972f4ec"; + sha256 = "1bwvsbxnx68vz9vmdbxybl66qn8s54zhlbjswjb9vdir16w9ww4s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web"; @@ -15236,7 +15253,7 @@ elhome = callPackage ({ fetchFromGitHub, fetchurl, initsplit, lib, melpaBuild }: melpaBuild { pname = "elhome"; - version = "20131202.1308"; + version = "20131202.1108"; src = fetchFromGitHub { owner = "demyanrogozhin"; repo = "elhome"; @@ -15257,7 +15274,7 @@ elisp-depend = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elisp-depend"; - version = "20120428.1504"; + version = "20120428.1304"; src = fetchFromGitHub { owner = "tehom"; repo = "elisp-depend"; @@ -15278,7 +15295,7 @@ elisp-format = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elisp-format"; - version = "20160508.452"; + version = "20160508.252"; src = fetchFromGitHub { owner = "Yuki-Inoue"; repo = "elisp-format"; @@ -15299,7 +15316,7 @@ elisp-lint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elisp-lint"; - version = "20150430.1758"; + version = "20150430.1558"; src = fetchFromGitHub { owner = "nschum"; repo = "elisp-lint"; @@ -15317,10 +15334,31 @@ license = lib.licenses.free; }; }) {}; + elisp-sandbox = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "elisp-sandbox"; + version = "20131116.1042"; + src = fetchFromGitHub { + owner = "joelmccracken"; + repo = "elisp-sandbox"; + rev = "d894d68934ef09c42f72ac4e1173a0bedc23f139"; + sha256 = "0r70axda1piwxznksygby9vid49q4lzjwcrhx7gl5midjs961531"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4b0e7c52ff8034a1c0d1e5d7bc0c58f166986b28/recipes/elisp-sandbox"; + sha256 = "1bazm1cf9ghh9b7jzqqgyfcalnrfg7vmxqbn4fiy2c76gbzlr2bp"; + name = "elisp-sandbox"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/elisp-sandbox"; + license = lib.licenses.free; + }; + }) {}; elisp-slime-nav = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elisp-slime-nav"; - version = "20160128.1309"; + version = "20160128.1109"; src = fetchFromGitHub { owner = "purcell"; repo = "elisp-slime-nav"; @@ -15341,12 +15379,12 @@ elixir-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "elixir-mode"; - version = "20160607.259"; + version = "20160718.2245"; src = fetchFromGitHub { owner = "elixir-lang"; repo = "emacs-elixir"; - rev = "8e77a8410cb0d7e05530d46d17569ad20baf8e49"; - sha256 = "02a4i20vz9bc65d4m63pvpc2y5lkvjg1q8rd9g3l3mlkdqkf34bg"; + rev = "1d0404494c1543b0d1e4d410b77c7d5e3ecc8dac"; + sha256 = "0yhrmr4am949vsjq7jxc60vl0986p2wyklmhcjd4had4z1vzgz3i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6374ced0de38d83bf99147f702f30706615480ed/recipes/elixir-mode"; @@ -15362,7 +15400,7 @@ elixir-yasnippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "elixir-yasnippets"; - version = "20150417.739"; + version = "20150417.539"; src = fetchFromGitHub { owner = "hisea"; repo = "elixir-yasnippets"; @@ -15383,7 +15421,7 @@ elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }: melpaBuild { pname = "elm-mode"; - version = "20160605.401"; + version = "20160605.201"; src = fetchFromGitHub { owner = "jcollard"; repo = "elm-mode"; @@ -15404,7 +15442,7 @@ elm-yasnippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "elm-yasnippets"; - version = "20160401.24"; + version = "20160331.2224"; src = fetchFromGitHub { owner = "abingham"; repo = "elm-yasnippets"; @@ -15425,7 +15463,7 @@ elmacro = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "elmacro"; - version = "20160224.1131"; + version = "20160224.931"; src = fetchFromGitHub { owner = "Silex"; repo = "elmacro"; @@ -15446,7 +15484,7 @@ elmine = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "elmine"; - version = "20151121.623"; + version = "20151121.423"; src = fetchFromGitHub { owner = "leoc"; repo = "elmine"; @@ -15467,7 +15505,7 @@ elnode = callPackage ({ creole, dash, db, fakir, fetchFromGitHub, fetchurl, kv, lib, melpaBuild, noflet, s, web }: melpaBuild { pname = "elnode"; - version = "20140203.1706"; + version = "20140203.1506"; src = fetchFromGitHub { owner = "nicferrier"; repo = "elnode"; @@ -15488,12 +15526,12 @@ elog = callPackage ({ eieio ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elog"; - version = "20160426.722"; + version = "20160724.1555"; src = fetchFromGitHub { owner = "lujun9972"; repo = "elog"; - rev = "f13aaf326ab01c95e089dda08ea3c488cd4831c5"; - sha256 = "0z3g7jddsjf4hmhwvi8mhd90255ylaix0ysljscqsixacknzcjm9"; + rev = "a67237d9813c7591614d95e2ef31cc5e5ed3f31b"; + sha256 = "0alg5nbmq56zsc032pvah92h5fw155fbfjc275k9vbh915hs6y0w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4f3d560bf56b1b4e7540dc5ae16258895c106f1f/recipes/elog"; @@ -15509,7 +15547,7 @@ elogcat = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "elogcat"; - version = "20151120.1841"; + version = "20151120.1641"; src = fetchFromGitHub { owner = "youngker"; repo = "elogcat.el"; @@ -15530,7 +15568,7 @@ elpa-audit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elpa-audit"; - version = "20141023.831"; + version = "20141023.631"; src = fetchFromGitHub { owner = "purcell"; repo = "elpa-audit"; @@ -15551,12 +15589,12 @@ elpa-clone = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elpa-clone"; - version = "20160701.1129"; + version = "20160724.719"; src = fetchFromGitHub { owner = "dochang"; repo = "elpa-clone"; - rev = "ee3249cb47658caa170d6a6ef14ef74f0d97bc10"; - sha256 = "0fvadc5fdnpph163w67bn4pc8k856lyhlr1pnmjhpnnmzrrs36ch"; + rev = "77e45f3ac7de504ff65e17dfd52bfde7bdfc78f2"; + sha256 = "09q54j0n52493smhdrngn2isnifvy0x3s6vlicllkm8qykr06z9v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/11861edd9c7f9deebd44fd1f8ef648e7a04caf2b/recipes/elpa-clone"; @@ -15572,7 +15610,7 @@ elpa-mirror = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elpa-mirror"; - version = "20160512.4"; + version = "20160511.2204"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "elpa-mirror"; @@ -15593,7 +15631,7 @@ elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, yasnippet }: melpaBuild { pname = "elpy"; - version = "20160613.1205"; + version = "20160613.1005"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "elpy"; @@ -15620,7 +15658,7 @@ elscreen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elscreen"; - version = "20160613.451"; + version = "20160613.251"; src = fetchFromGitHub { owner = "knu"; repo = "elscreen"; @@ -15641,7 +15679,7 @@ elscreen-buffer-group = callPackage ({ cl-lib ? null, elscreen, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elscreen-buffer-group"; - version = "20160105.1003"; + version = "20160105.803"; src = fetchFromGitHub { owner = "jeffgran"; repo = "elscreen-buffer-group"; @@ -15662,7 +15700,7 @@ elscreen-mew = callPackage ({ elscreen, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elscreen-mew"; - version = "20160504.1335"; + version = "20160504.1135"; src = fetchFromGitHub { owner = "masutaka"; repo = "elscreen-mew"; @@ -15683,7 +15721,7 @@ elscreen-multi-term = callPackage ({ elscreen, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, multi-term }: melpaBuild { pname = "elscreen-multi-term"; - version = "20151021.2133"; + version = "20151021.1933"; src = fetchFromGitHub { owner = "wamei"; repo = "elscreen-multi-term"; @@ -15704,7 +15742,7 @@ elscreen-persist = callPackage ({ elscreen, fetchFromGitHub, fetchurl, lib, melpaBuild, revive }: melpaBuild { pname = "elscreen-persist"; - version = "20160505.2029"; + version = "20160505.1829"; src = fetchFromGitHub { owner = "robario"; repo = "elscreen-persist"; @@ -15725,7 +15763,7 @@ elscreen-separate-buffer-list = callPackage ({ elscreen, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elscreen-separate-buffer-list"; - version = "20150522.145"; + version = "20150521.2345"; src = fetchFromGitHub { owner = "wamei"; repo = "elscreen-separate-buffer-list"; @@ -15746,7 +15784,7 @@ elwm = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elwm"; - version = "20150817.507"; + version = "20150817.307"; src = fetchFromGitHub { owner = "Fuco1"; repo = "elwm"; @@ -15767,7 +15805,7 @@ elx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elx"; - version = "20160523.728"; + version = "20160523.528"; src = fetchFromGitHub { owner = "tarsius"; repo = "elx"; @@ -15788,7 +15826,7 @@ emacs-eclim = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, popup, s }: melpaBuild { pname = "emacs-eclim"; - version = "20160617.112"; + version = "20160616.2312"; src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; @@ -15809,7 +15847,7 @@ emacs-setup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emacs-setup"; - version = "20120727.926"; + version = "20120727.726"; src = fetchFromGitHub { owner = "echosa"; repo = "emacs-setup"; @@ -15830,7 +15868,7 @@ emacsagist = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emacsagist"; - version = "20140331.1330"; + version = "20140331.1130"; src = fetchFromGitHub { owner = "echosa"; repo = "emacsagist"; @@ -15851,7 +15889,7 @@ emacsc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emacsc"; - version = "20150807.457"; + version = "20150807.257"; src = fetchFromGitHub { owner = "knu"; repo = "emacsc"; @@ -15872,7 +15910,7 @@ emacsist-view = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emacsist-view"; - version = "20160426.723"; + version = "20160426.523"; src = fetchFromGitHub { owner = "lujun9972"; repo = "emacsist-view"; @@ -15893,7 +15931,7 @@ emacsql = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, finalize, lib, melpaBuild }: melpaBuild { pname = "emacsql"; - version = "20160424.947"; + version = "20160424.747"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; @@ -15914,7 +15952,7 @@ emacsql-mysql = callPackage ({ cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emacsql-mysql"; - version = "20151004.915"; + version = "20151004.715"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; @@ -15935,7 +15973,7 @@ emacsql-psql = callPackage ({ cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild, pg }: melpaBuild { pname = "emacsql-psql"; - version = "20151004.915"; + version = "20151004.715"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; @@ -15956,7 +15994,7 @@ emacsql-sqlite = callPackage ({ cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emacsql-sqlite"; - version = "20160311.1438"; + version = "20160311.1238"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; @@ -15977,12 +16015,12 @@ emacsshot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emacsshot"; - version = "20160504.332"; + version = "20160713.942"; src = fetchFromGitHub { owner = "marcowahl"; repo = "emacsshot"; - rev = "7372eb7296e111af89ac61781b9ad66f91afb0af"; - sha256 = "08j10c699r8r8xynvlkm0vwlfza1fqz11zcfk2dsrakq3y9vb4ly"; + rev = "e813bbec4c9677ed2fc4496d64277b074aadee4c"; + sha256 = "1wv1crfq1lqjm0nf6fgi127x5fd6qlgjnrfqq4inzxhfcnizb52d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/efdd85accc6053f92efcbfdb7ddc37b23a07a3b0/recipes/emacsshot"; @@ -15998,7 +16036,7 @@ emagician-fix-spell-memory = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emagician-fix-spell-memory"; - version = "20141229.1634"; + version = "20141229.1434"; src = fetchFromGitHub { owner = "jonnay"; repo = "emagicians-starter-kit"; @@ -16019,12 +16057,12 @@ emamux = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emamux"; - version = "20160602.853"; + version = "20160602.653"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-emamux"; - rev = "ff5f701b9d844681879756f7980c75361aba1a96"; - sha256 = "0y6f759vh1v7pficjsf3n5ks52x36y2khk123a7ppi0vp826z52r"; + rev = "4e75121767001a587d01a71e61688d147a7c50c1"; + sha256 = "0jpyrh2qmhgp6wdf5jp3lr9shpj0mvsnfric8hqp0b5qda9hi2v8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6de1ed3dfccb9f7e7b8586e8334af472a4988840/recipes/emamux"; @@ -16040,7 +16078,7 @@ emamux-ruby-test = callPackage ({ emamux, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "emamux-ruby-test"; - version = "20130812.1139"; + version = "20130812.939"; src = fetchFromGitHub { owner = "syohex"; repo = "emamux-ruby-test"; @@ -16061,7 +16099,7 @@ ember-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ember-mode"; - version = "20160609.739"; + version = "20160609.539"; src = fetchFromGitHub { owner = "madnificent"; repo = "ember-mode"; @@ -16082,7 +16120,7 @@ ember-yasnippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "ember-yasnippets"; - version = "20160526.1158"; + version = "20160526.958"; src = fetchFromGitHub { owner = "ronco"; repo = "ember-yasnippets.el"; @@ -16103,7 +16141,7 @@ embrace = callPackage ({ cl-lib ? null, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "embrace"; - version = "20160513.2113"; + version = "20160513.1913"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "embrace.el"; @@ -16124,7 +16162,7 @@ emmet-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emmet-mode"; - version = "20160501.1351"; + version = "20160501.1151"; src = fetchFromGitHub { owner = "smihica"; repo = "emmet-mode"; @@ -16144,11 +16182,11 @@ }) {}; emms = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emms"; - version = "20160624.1553"; + version = "20160624.1353"; src = fetchgit { url = "git://git.sv.gnu.org/emms.git"; - rev = "56373a1752582edbd0cb9881cf843d9f87cfcf56"; - sha256 = "0qvxhhpfz69rfb12ipkisxd444cdjhql6d3g398jj6s0mrfxnszd"; + rev = "bec63d3ea62dafc4158c35abdf7e9180419a3f78"; + sha256 = "0qbkjqi3d3y432mg3k0gxivndvq7kpghcx4kkypli2mr24qqf33j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/205eeed002b0848809a4c5f8ad99d925b48799ec/recipes/emms"; @@ -16164,7 +16202,7 @@ emms-info-mediainfo = callPackage ({ emms, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emms-info-mediainfo"; - version = "20131223.700"; + version = "20131223.500"; src = fetchFromGitHub { owner = "fgallina"; repo = "emms-info-mediainfo"; @@ -16185,7 +16223,7 @@ emms-mark-ext = callPackage ({ emms, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emms-mark-ext"; - version = "20130528.2227"; + version = "20130528.2027"; src = fetchFromGitHub { owner = "vapniks"; repo = "emms-mark-ext"; @@ -16206,7 +16244,7 @@ emms-mode-line-cycle = callPackage ({ emacs, emms, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emms-mode-line-cycle"; - version = "20160221.520"; + version = "20160221.320"; src = fetchFromGitHub { owner = "momomo5717"; repo = "emms-mode-line-cycle"; @@ -16227,12 +16265,12 @@ emms-player-mpv = callPackage ({ emms, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emms-player-mpv"; - version = "20160621.1300"; + version = "20160724.729"; src = fetchFromGitHub { owner = "dochang"; repo = "emms-player-mpv"; - rev = "d8535614f340cd9f0ff7db3404439b58f028ca9e"; - sha256 = "1k3jmmg3jy691b3vraaxv9qncfa3698g9kalb7fyrpmdvy1p2cc6"; + rev = "d3e3bace6b648f5b60d833a72a50603545102934"; + sha256 = "1kmkza1x1xajdswdmvxasglpr8fl9vr1pi3yhi7a9cqqa5s1y2ah"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9679cb8d4b3b9dce1e0bff16647ea3f3e02c4189/recipes/emms-player-mpv"; @@ -16248,12 +16286,12 @@ emms-player-mpv-jp-radios = callPackage ({ cl-lib ? null, emacs, emms, emms-player-simple-mpv, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emms-player-mpv-jp-radios"; - version = "20160501.833"; + version = "20160717.638"; src = fetchFromGitHub { owner = "momomo5717"; repo = "emms-player-mpv-jp-radios"; - rev = "81def6cb278179ac0d2be2da07920242cd21fc47"; - sha256 = "1phjrisr9m6rpd40y6f8iiagrr7vpqc8ksgwymi8w11b1kmxhdja"; + rev = "61657c2dd79136f8787b45a0416a64459dae1b7e"; + sha256 = "04plvyy2ahjdd9q22fr8jhwfz0g55ccn67flnwfms3p05xc5vvzg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/09ba6da5057061f055d4a3212d167f9666618d4f/recipes/emms-player-mpv-jp-radios"; @@ -16269,7 +16307,7 @@ emms-player-simple-mpv = callPackage ({ cl-lib ? null, emacs, emms, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emms-player-simple-mpv"; - version = "20151020.801"; + version = "20151020.601"; src = fetchFromGitHub { owner = "momomo5717"; repo = "emms-player-simple-mpv"; @@ -16290,7 +16328,7 @@ emms-soundcloud = callPackage ({ emms, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "emms-soundcloud"; - version = "20131221.545"; + version = "20131221.345"; src = fetchFromGitHub { owner = "osener"; repo = "emms-soundcloud"; @@ -16311,7 +16349,7 @@ emms-state = callPackage ({ emms, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emms-state"; - version = "20160504.305"; + version = "20160504.105"; src = fetchFromGitHub { owner = "alezost"; repo = "emms-state.el"; @@ -16332,7 +16370,7 @@ emoji-cheat-sheet-plus = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "emoji-cheat-sheet-plus"; - version = "20150617.831"; + version = "20150617.631"; src = fetchFromGitHub { owner = "syl20bnr"; repo = "emacs-emoji-cheat-sheet-plus"; @@ -16353,7 +16391,7 @@ emoji-display = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emoji-display"; - version = "20140117.413"; + version = "20140117.213"; src = fetchFromGitHub { owner = "ikazuhiro"; repo = "emoji-display"; @@ -16374,12 +16412,12 @@ emoji-fontset = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emoji-fontset"; - version = "20151107.2247"; + version = "20160726.1224"; src = fetchFromGitHub { owner = "zonuexe"; repo = "emoji-fontset.el"; - rev = "3b8c2204284b95934383836b5b36efeefb65663b"; - sha256 = "0qi7p1grann3mhaq8kc0yc27cp9fm983g2gaqddljchn7lmgagrr"; + rev = "e460c9a08e48ec4103e38a7a04acae20880149a9"; + sha256 = "0xdlqsrwdf0smi5z9rjj46nwrrfpl0gzanf0jmdg8zzn62l6ldck"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/60df435eb82fcc9a8a02a0a271bb6a2d5a161bc4/recipes/emoji-fontset"; @@ -16392,15 +16430,36 @@ license = lib.licenses.free; }; }) {}; + emoji-recall = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "emoji-recall"; + version = "20160723.1508"; + src = fetchFromGitHub { + owner = "lujun9972"; + repo = "emoji-recall.el"; + rev = "d9122f8fb1467309260109a1985cd14f18fdf631"; + sha256 = "13ajzafm9wmddch8ipjjkv2p13fmyd0ghdr479lll5c7xff2051x"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8f03b34d3e8e5edf9888c71b6e4bd2e1a5aec016/recipes/emoji-recall"; + sha256 = "06cahk2h6q3vlw2p4jmjrpzycxpm884p31yhbp77lagkqhs2fzbk"; + name = "emoji-recall"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/emoji-recall"; + license = lib.licenses.free; + }; + }) {}; emojify = callPackage ({ emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, seq }: melpaBuild { pname = "emojify"; - version = "20160610.311"; + version = "20160715.2321"; src = fetchFromGitHub { owner = "iqbalansari"; repo = "emacs-emojify"; - rev = "f33dcffb2cc9748710b6793331104ba5a8bb9db8"; - sha256 = "11h8502f3nkl8gpl64kk5ixfxcmifi6bx8c99lg0l6z8yf2fpmwx"; + rev = "7c6c9126d7c6ef1ea3a823f75d456476c44bbcf9"; + sha256 = "0fgdjrankzq95k662vwcx78rfsy6lk360f7dssfagg4ilpixcjpj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/488d2751b5fd3bf00f5a6f0545530f44563b86d7/recipes/emojify"; @@ -16416,7 +16475,7 @@ empos = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "empos"; - version = "20151011.1416"; + version = "20151011.1216"; src = fetchFromGitHub { owner = "dimalik"; repo = "empos"; @@ -16437,7 +16496,7 @@ emr = callPackage ({ cl-lib ? null, clang-format, dash, emacs, fetchFromGitHub, fetchurl, iedit, lib, list-utils, melpaBuild, paredit, popup, projectile, redshank, s }: melpaBuild { pname = "emr"; - version = "20160613.1630"; + version = "20160613.1430"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "emacs-refactor"; @@ -16470,7 +16529,7 @@ enclose = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "enclose"; - version = "20121008.1114"; + version = "20121008.914"; src = fetchFromGitHub { owner = "rejeep"; repo = "enclose.el"; @@ -16491,7 +16550,7 @@ encourage-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "encourage-mode"; - version = "20151128.305"; + version = "20151128.105"; src = fetchFromGitHub { owner = "halbtuerke"; repo = "encourage-mode.el"; @@ -16512,7 +16571,7 @@ engine-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "engine-mode"; - version = "20150902.1235"; + version = "20150902.1035"; src = fetchFromGitHub { owner = "hrs"; repo = "engine-mode"; @@ -16533,7 +16592,7 @@ enh-ruby-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "enh-ruby-mode"; - version = "20151123.341"; + version = "20151123.141"; src = fetchFromGitHub { owner = "zenspider"; repo = "enhanced-ruby-mode"; @@ -16554,7 +16613,7 @@ enlive = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "enlive"; - version = "20150824.749"; + version = "20150824.549"; src = fetchFromGitHub { owner = "zweifisch"; repo = "enlive"; @@ -16575,7 +16634,7 @@ eno = callPackage ({ dash, edit-at-point, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eno"; - version = "20160110.434"; + version = "20160110.234"; src = fetchFromGitHub { owner = "enoson"; repo = "eno.el"; @@ -16596,7 +16655,7 @@ enotify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "enotify"; - version = "20130407.848"; + version = "20130407.648"; src = fetchFromGitHub { owner = "laynor"; repo = "enotify"; @@ -16617,12 +16676,12 @@ ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }: melpaBuild { pname = "ensime"; - version = "20160702.1452"; + version = "20160710.951"; src = fetchFromGitHub { owner = "ensime"; repo = "ensime-emacs"; - rev = "d4d2a25a32e26e43f001c98a02a44982264b9f06"; - sha256 = "09kllav07j3r24xf5k5dd342v6kyqfd3y55r6v0asc6hihrj4rri"; + rev = "08c93aad53809eebf14fc8da5f9362f423d13d46"; + sha256 = "05ai02fpk3dmfpd9h7w1xwzx2w5mnbmd5hqnhw03zsnjxyqcsp0f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime"; @@ -16646,7 +16705,7 @@ envdir = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "envdir"; - version = "20160221.1323"; + version = "20160221.1123"; src = fetchFromGitHub { owner = "proofit404"; repo = "envdir-mode"; @@ -16667,7 +16726,7 @@ eopengrok = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, s }: melpaBuild { pname = "eopengrok"; - version = "20160214.147"; + version = "20160213.2347"; src = fetchFromGitHub { owner = "youngker"; repo = "eopengrok.el"; @@ -16688,7 +16747,7 @@ epc = callPackage ({ concurrent, ctable, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "epc"; - version = "20140610.34"; + version = "20140609.2234"; src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-epc"; @@ -16709,7 +16768,7 @@ epic = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild }: melpaBuild { pname = "epic"; - version = "20150503.237"; + version = "20150503.37"; src = fetchFromGitHub { owner = "yoshinari-nomura"; repo = "epic"; @@ -16730,7 +16789,7 @@ epkg = callPackage ({ closql, dash, emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "epkg"; - version = "20160515.1009"; + version = "20160515.809"; src = fetchFromGitLab { owner = "tarsius"; repo = "epkg"; @@ -16751,7 +16810,7 @@ epl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "epl"; - version = "20150517.633"; + version = "20150517.433"; src = fetchFromGitHub { owner = "cask"; repo = "epl"; @@ -16772,7 +16831,7 @@ epm = callPackage ({ emacs, epl, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "epm"; - version = "20160628.204"; + version = "20160628.4"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "epm"; @@ -16793,7 +16852,7 @@ epresent = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "epresent"; - version = "20160410.2101"; + version = "20160410.1901"; src = fetchFromGitHub { owner = "dakrone"; repo = "epresent"; @@ -16814,7 +16873,7 @@ eprime-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eprime-mode"; - version = "20140513.1316"; + version = "20140513.1116"; src = fetchFromGitHub { owner = "AndrewHynes"; repo = "eprime-mode"; @@ -16835,7 +16894,7 @@ eproject = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "eproject"; - version = "20151205.2330"; + version = "20151205.2130"; src = fetchFromGitHub { owner = "jrockway"; repo = "eproject"; @@ -16856,7 +16915,7 @@ erc-colorize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erc-colorize"; - version = "20160108.420"; + version = "20160108.220"; src = fetchFromGitHub { owner = "thisirs"; repo = "erc-colorize"; @@ -16877,7 +16936,7 @@ erc-crypt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erc-crypt"; - version = "20160323.2039"; + version = "20160323.1839"; src = fetchFromGitHub { owner = "atomontage"; repo = "erc-crypt"; @@ -16898,7 +16957,7 @@ erc-hipchatify = callPackage ({ alert, emacs, fetchhg, fetchurl, lib, melpaBuild, request, s }: melpaBuild { pname = "erc-hipchatify"; - version = "20160504.1345"; + version = "20160504.1145"; src = fetchhg { url = "https://bitbucket.com/seanfarley/erc-hipchatify"; rev = "b237cf8118fd"; @@ -16918,7 +16977,7 @@ erc-hl-nicks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erc-hl-nicks"; - version = "20160202.1350"; + version = "20160202.1150"; src = fetchFromGitHub { owner = "leathekd"; repo = "erc-hl-nicks"; @@ -16939,7 +16998,7 @@ erc-image = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erc-image"; - version = "20150914.514"; + version = "20150914.314"; src = fetchFromGitHub { owner = "kidd"; repo = "erc-image.el"; @@ -16960,7 +17019,7 @@ erc-social-graph = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erc-social-graph"; - version = "20150508.704"; + version = "20150508.504"; src = fetchFromGitHub { owner = "vibhavp"; repo = "erc-social-graph"; @@ -16981,7 +17040,7 @@ erc-terminal-notifier = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erc-terminal-notifier"; - version = "20140115.424"; + version = "20140115.224"; src = fetchFromGitHub { owner = "julienXX"; repo = "erc-terminal-notifier.el"; @@ -17002,7 +17061,7 @@ erc-track-score = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erc-track-score"; - version = "20130328.715"; + version = "20130328.515"; src = fetchFromGitHub { owner = "jd"; repo = "erc-track-score.el"; @@ -17023,7 +17082,7 @@ erc-tweet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erc-tweet"; - version = "20150920.758"; + version = "20150920.558"; src = fetchFromGitHub { owner = "kidd"; repo = "erc-tweet.el"; @@ -17044,7 +17103,7 @@ erc-twitch = callPackage ({ erc ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "erc-twitch"; - version = "20160522.1059"; + version = "20160522.859"; src = fetchFromGitHub { owner = "vibhavp"; repo = "erc-twitch"; @@ -17065,7 +17124,7 @@ erc-view-log = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erc-view-log"; - version = "20140227.1439"; + version = "20140227.1239"; src = fetchFromGitHub { owner = "Niluge-KiWi"; repo = "erc-view-log"; @@ -17086,7 +17145,7 @@ erc-youtube = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erc-youtube"; - version = "20150603.1636"; + version = "20150603.1436"; src = fetchFromGitHub { owner = "kidd"; repo = "erc-youtube.el"; @@ -17107,7 +17166,7 @@ erc-yt = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erc-yt"; - version = "20150426.749"; + version = "20150426.549"; src = fetchFromGitHub { owner = "yhvh"; repo = "erc-yt"; @@ -17128,7 +17187,7 @@ ercn = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ercn"; - version = "20150523.1003"; + version = "20150523.803"; src = fetchFromGitHub { owner = "leathekd"; repo = "ercn"; @@ -17149,12 +17208,12 @@ eredis = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eredis"; - version = "20120808.2207"; + version = "20120808.2007"; src = fetchFromGitHub { owner = "justinhj"; repo = "eredis"; - rev = "f6d4697620212b5ce77d5b4ff4e0cd6d7caf74e6"; - sha256 = "0cdyhklmsv0xfcq97c3wqh8scs6910jzvvp04w0jxlayd1dbzx49"; + rev = "3a8d552fa25f651614c0256dc9f45181c74f8475"; + sha256 = "0kc44r4qljmfj4xnz0w4q0arjafppdn5jgrkngjmp4g7dcvs1ilv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63f06713d06911f836fe2a4bf199b0794ac89cf0/recipes/eredis"; @@ -17170,7 +17229,7 @@ erefactor = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erefactor"; - version = "20160121.359"; + version = "20160121.159"; src = fetchFromGitHub { owner = "mhayashi1120"; repo = "Emacs-erefactor"; @@ -17191,12 +17250,12 @@ ergoemacs-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ergoemacs-mode"; - version = "20160628.805"; + version = "20160720.1613"; src = fetchFromGitHub { owner = "ergoemacs"; repo = "ergoemacs-mode"; - rev = "7c9379256eaaf4a463071562586ea3739de4f84a"; - sha256 = "0j4w3wgky601bl0dadl505fbyxa32v48jv3q63rl3ws6h8xh2611"; + rev = "6bb3eb24c8a7e881024d6d0becb01c84c37c95f0"; + sha256 = "0pnv4q30aab18c65vqrd16dbvl9mfkni13zfcm4sgabpmhgh7r8h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/02920517987c7fc698de9952cbb09dfd41517c40/recipes/ergoemacs-mode"; @@ -17212,7 +17271,7 @@ ergoemacs-status = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mode-icons, powerline }: melpaBuild { pname = "ergoemacs-status"; - version = "20160318.38"; + version = "20160317.2238"; src = fetchFromGitHub { owner = "ergoemacs"; repo = "ergoemacs-status"; @@ -17233,12 +17292,12 @@ erlang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erlang"; - version = "20160615.833"; + version = "20160719.535"; src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "1697cdea341e7d54e754e5f85e091c8bb68fb6c7"; - sha256 = "0v44iz2bl1rndvgrqmfj8yd9xxdpg0irg8shqhdbbjdjkmbmw876"; + rev = "18d328f9e2275d13a1d469016916f7261a612951"; + sha256 = "1gmdb1hvhjgz05qpv2l6cjnhvvg8ccmiw5qvqylib911ckycjp8a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/erlang"; @@ -17254,7 +17313,7 @@ ert-async = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ert-async"; - version = "20151011.859"; + version = "20151011.659"; src = fetchFromGitHub { owner = "rejeep"; repo = "ert-async.el"; @@ -17274,7 +17333,7 @@ }) {}; ert-expectations = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "ert-expectations"; - version = "20130824.700"; + version = "20130824.500"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/ert-expectations.el"; sha256 = "0cwy3ilsid90abzzjb7ha2blq9kmv3gfp3icwwfcz6qczgirq6g7"; @@ -17293,7 +17352,7 @@ ert-junit = callPackage ({ ert ? null, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ert-junit"; - version = "20140830.1721"; + version = "20140830.1521"; src = fetchgit { url = "https://bitbucket.org/olanilsson/ert-junit"; rev = "aaffe0bba23fe7271741779ff642b7b0deadf22f"; @@ -17313,7 +17372,7 @@ ert-modeline = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, s }: melpaBuild { pname = "ert-modeline"; - version = "20140115.415"; + version = "20140115.215"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "ert-modeline"; @@ -17334,7 +17393,7 @@ ert-runner = callPackage ({ ansi, commander, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }: melpaBuild { pname = "ert-runner"; - version = "20160330.106"; + version = "20160329.2306"; src = fetchFromGitHub { owner = "rejeep"; repo = "ert-runner.el"; @@ -17355,7 +17414,7 @@ es-lib = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "es-lib"; - version = "20141111.1230"; + version = "20141111.1030"; src = fetchFromGitHub { owner = "sabof"; repo = "es-lib"; @@ -17376,7 +17435,7 @@ es-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, spark }: melpaBuild { pname = "es-mode"; - version = "20160516.1450"; + version = "20160516.1250"; src = fetchFromGitHub { owner = "dakrone"; repo = "es-mode"; @@ -17397,7 +17456,7 @@ es-windows = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "es-windows"; - version = "20140211.304"; + version = "20140211.104"; src = fetchFromGitHub { owner = "sabof"; repo = "es-windows"; @@ -17418,7 +17477,7 @@ esa = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "esa"; - version = "20160501.140"; + version = "20160430.2340"; src = fetchFromGitHub { owner = "nabinno"; repo = "esa.el"; @@ -17439,7 +17498,7 @@ escreen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "escreen"; - version = "20091203.1213"; + version = "20091203.1013"; src = fetchFromGitHub { owner = "emacsmirror"; repo = "escreen"; @@ -17460,7 +17519,7 @@ esh-buf-stack = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "esh-buf-stack"; - version = "20140107.418"; + version = "20140107.218"; src = fetchFromGitHub { owner = "tom-tan"; repo = "esh-buf-stack"; @@ -17481,7 +17540,7 @@ esh-help = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "esh-help"; - version = "20140107.422"; + version = "20140107.222"; src = fetchFromGitHub { owner = "tom-tan"; repo = "esh-help"; @@ -17502,7 +17561,7 @@ eshell-autojump = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eshell-autojump"; - version = "20150927.224"; + version = "20150927.24"; src = fetchFromGitHub { owner = "coldnew"; repo = "eshell-autojump"; @@ -17523,7 +17582,7 @@ eshell-did-you-mean = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eshell-did-you-mean"; - version = "20150915.1452"; + version = "20150915.1252"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "eshell-did-you-mean"; @@ -17544,7 +17603,7 @@ eshell-fringe-status = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eshell-fringe-status"; - version = "20160224.616"; + version = "20160224.416"; src = fetchFromGitHub { owner = "ryuslash"; repo = "eshell-fringe-status"; @@ -17565,7 +17624,7 @@ eshell-git-prompt = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "eshell-git-prompt"; - version = "20160509.338"; + version = "20160509.138"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "eshell-git-prompt"; @@ -17586,7 +17645,7 @@ eshell-prompt-extras = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eshell-prompt-extras"; - version = "20160418.1030"; + version = "20160418.830"; src = fetchFromGitHub { owner = "hiddenlotus"; repo = "eshell-prompt-extras"; @@ -17607,7 +17666,7 @@ eshell-z = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eshell-z"; - version = "20151110.2246"; + version = "20151110.2046"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "eshell-z"; @@ -17628,7 +17687,7 @@ espresso-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "espresso-theme"; - version = "20130301.148"; + version = "20130228.2348"; src = fetchFromGitHub { owner = "dgutov"; repo = "espresso-theme"; @@ -17649,7 +17708,7 @@ espuds = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "espuds"; - version = "20151114.959"; + version = "20151114.759"; src = fetchFromGitHub { owner = "ecukes"; repo = "espuds"; @@ -17670,7 +17729,7 @@ esqlite = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pcsv }: melpaBuild { pname = "esqlite"; - version = "20151206.606"; + version = "20151206.406"; src = fetchFromGitHub { owner = "mhayashi1120"; repo = "Emacs-esqlite"; @@ -17691,7 +17750,7 @@ esqlite-helm = callPackage ({ esqlite, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "esqlite-helm"; - version = "20151116.250"; + version = "20151116.50"; src = fetchFromGitHub { owner = "mhayashi1120"; repo = "Emacs-esqlite"; @@ -17712,12 +17771,12 @@ ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }: melpaBuild { pname = "ess"; - version = "20160703.931"; + version = "20160723.1359"; src = fetchFromGitHub { owner = "emacs-ess"; repo = "ESS"; - rev = "eae9e8fc9d8aa02c5831eb357969e66caa8c1e39"; - sha256 = "1zrpsd1h4fhdk714i3dm0sk7aj9m227xkkyrx4whqajisv19azal"; + rev = "5141f425e60cb202e5f6d42b7eb260288da66071"; + sha256 = "0a4xdn6g3nr6c0ni6b44vp1kqyzbkain4jnd2lxyb2rq07p6700b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess"; @@ -17733,7 +17792,7 @@ ess-R-data-view = callPackage ({ ctable, ess, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "ess-R-data-view"; - version = "20130509.658"; + version = "20130509.458"; src = fetchFromGitHub { owner = "myuhe"; repo = "ess-R-data-view.el"; @@ -17754,7 +17813,7 @@ ess-R-object-popup = callPackage ({ ess, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "ess-R-object-popup"; - version = "20130302.536"; + version = "20130302.336"; src = fetchFromGitHub { owner = "myuhe"; repo = "ess-R-object-popup.el"; @@ -17775,7 +17834,7 @@ ess-smart-equals = callPackage ({ emacs, ess, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ess-smart-equals"; - version = "20150202.1"; + version = "20150201.2201"; src = fetchFromGitHub { owner = "genovese"; repo = "ess-smart-equals"; @@ -17796,12 +17855,12 @@ ess-smart-underscore = callPackage ({ ess, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ess-smart-underscore"; - version = "20131229.2051"; + version = "20160711.748"; src = fetchFromGitHub { owner = "mattfidler"; repo = "ess-smart-underscore.el"; - rev = "f3bbee01754888452232b337173b57c6c266de49"; - sha256 = "01xa98q0pqsf4gyl6ixlpjjdqazqsxg1sf7a3j2wbh7196ps61v5"; + rev = "bd219dc9af764e6c255299fe77ced4ed78df0cbb"; + sha256 = "1wnnswfpqcgspcij55i7z6cx41j3bbmqgvpgxhzzw3g47vsa1dkz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4d6166f5c80cf37c79256402fa633ad2274d065/recipes/ess-smart-underscore"; @@ -17817,7 +17876,7 @@ ess-view = callPackage ({ ess, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ess-view"; - version = "20160309.1515"; + version = "20160309.1315"; src = fetchFromGitHub { owner = "GioBo"; repo = "ess-view"; @@ -17838,12 +17897,12 @@ esup = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "esup"; - version = "20151227.1150"; + version = "20160716.23"; src = fetchFromGitHub { owner = "jschaf"; repo = "esup"; - rev = "fc061f30c5c68a4104333b65a55c51589a89f231"; - sha256 = "034rs6mmc5f6y8ply2a90b5s4pi4qx9m49wsxc9v0zwa9i5skmx1"; + rev = "08cb1796578b2aea19dda18518c9857c0a721187"; + sha256 = "0wl89iss5kjpb216pzd9wmw6l3lzkag0fhdicl28r5addj8izwk9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9d2948a42da5d4864404d2d11a924a4f235fc3b/recipes/esup"; @@ -17856,22 +17915,22 @@ license = lib.licenses.free; }; }) {}; - esxml = callPackage ({ fetchFromGitHub, fetchurl, kv, lib, melpaBuild }: + esxml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "esxml"; - version = "20151013.1328"; + version = "20160703.1417"; src = fetchFromGitHub { owner = "tali713"; repo = "esxml"; - rev = "ca09423c3172820ba97dcc68204911d06f55f851"; - sha256 = "0mrfkq3jcsjfccqir02yijl24hllc347b02y7gk3b2yn0b676dv3"; + rev = "fd0f0185cd579b00c3d76d2c383cd33fe642bb93"; + sha256 = "0azwfxzxghxhzwal4al0lngm0w3q035jyvm3wj2aaml2dibsi3pb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fd4381bbb725cb4a17d741f604698b38c95da475/recipes/esxml"; sha256 = "0nn074abkxz7p4w59l1za586p5ya392xhl3sx92yys8a3194n6hz"; name = "esxml"; }; - packageRequires = [ kv ]; + packageRequires = []; meta = { homepage = "https://melpa.org/#/esxml"; license = lib.licenses.free; @@ -17880,7 +17939,7 @@ etable = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, interval-list, lib, melpaBuild }: melpaBuild { pname = "etable"; - version = "20150327.1216"; + version = "20150327.1016"; src = fetchFromGitHub { owner = "Fuco1"; repo = "ETable"; @@ -17900,7 +17959,7 @@ }) {}; etags-select = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "etags-select"; - version = "20130824.700"; + version = "20130824.500"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/etags-select.el"; sha256 = "0gmlmxlwfsfk5axn3x5cfvqy9bx26ynpbg50mdxiljk7wzqs5dyb"; @@ -17918,7 +17977,7 @@ }) {}; etags-table = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "etags-table"; - version = "20130824.657"; + version = "20130824.457"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/etags-table.el"; sha256 = "0apm8as606bbkpa7i1hkwcbajzsmsyxn6cwfk9dkkll5bh4vglqf"; @@ -17937,7 +17996,7 @@ ethan-wspace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ethan-wspace"; - version = "20160317.1120"; + version = "20160317.920"; src = fetchFromGitHub { owner = "glasserc"; repo = "ethan-wspace"; @@ -17958,7 +18017,7 @@ euslisp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "euslisp-mode"; - version = "20160524.947"; + version = "20160524.747"; src = fetchFromGitHub { owner = "iory"; repo = "euslisp-mode"; @@ -17979,7 +18038,7 @@ eval-in-repl = callPackage ({ ace-window, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }: melpaBuild { pname = "eval-in-repl"; - version = "20160418.2043"; + version = "20160418.1843"; src = fetchFromGitHub { owner = "kaz-yos"; repo = "eval-in-repl"; @@ -18000,7 +18059,7 @@ eval-sexp-fu = callPackage ({ fetchFromGitHub, fetchurl, highlight, lib, melpaBuild }: melpaBuild { pname = "eval-sexp-fu"; - version = "20131230.1551"; + version = "20131230.1351"; src = fetchFromGitHub { owner = "hchbaw"; repo = "eval-sexp-fu.el"; @@ -18021,7 +18080,7 @@ evalator = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: melpaBuild { pname = "evalator"; - version = "20160212.1928"; + version = "20160212.1728"; src = fetchFromGitHub { owner = "seanirby"; repo = "evalator"; @@ -18042,7 +18101,7 @@ evalator-clojure = callPackage ({ cider, evalator, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evalator-clojure"; - version = "20160208.1548"; + version = "20160208.1348"; src = fetchFromGitHub { owner = "seanirby"; repo = "evalator-clojure"; @@ -18063,7 +18122,7 @@ evil = callPackage ({ fetchhg, fetchurl, goto-chg, lib, melpaBuild, undo-tree }: melpaBuild { pname = "evil"; - version = "20160620.53"; + version = "20160619.2253"; src = fetchhg { url = "https://bitbucket.com/lyro/evil"; rev = "3f1515976813"; @@ -18083,7 +18142,7 @@ evil-anzu = callPackage ({ anzu, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-anzu"; - version = "20150124.1809"; + version = "20150124.1609"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-evil-anzu"; @@ -18104,7 +18163,7 @@ evil-args = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-args"; - version = "20140329.1629"; + version = "20140329.1429"; src = fetchFromGitHub { owner = "wcsmith"; repo = "evil-args"; @@ -18125,7 +18184,7 @@ evil-avy = callPackage ({ avy, cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-avy"; - version = "20150908.248"; + version = "20150908.48"; src = fetchFromGitHub { owner = "louy2"; repo = "evil-avy"; @@ -18146,7 +18205,7 @@ evil-cleverparens = callPackage ({ dash, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, paredit, smartparens }: melpaBuild { pname = "evil-cleverparens"; - version = "20160611.1104"; + version = "20160611.904"; src = fetchFromGitHub { owner = "luxbock"; repo = "evil-cleverparens"; @@ -18167,7 +18226,7 @@ evil-colemak-basics = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-colemak-basics"; - version = "20160625.1159"; + version = "20160625.959"; src = fetchFromGitHub { owner = "wbolster"; repo = "evil-colemak-basics"; @@ -18188,7 +18247,7 @@ evil-commentary = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-commentary"; - version = "20160221.1430"; + version = "20160221.1230"; src = fetchFromGitHub { owner = "linktohack"; repo = "evil-commentary"; @@ -18209,7 +18268,7 @@ evil-dvorak = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-dvorak"; - version = "20160416.1341"; + version = "20160416.1141"; src = fetchFromGitHub { owner = "jbranso"; repo = "evil-dvorak"; @@ -18230,7 +18289,7 @@ evil-easymotion = callPackage ({ avy, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-easymotion"; - version = "20160617.2040"; + version = "20160617.1840"; src = fetchFromGitHub { owner = "PythonNut"; repo = "evil-easymotion"; @@ -18251,7 +18310,7 @@ evil-ediff = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-ediff"; - version = "20160202.1441"; + version = "20160202.1241"; src = fetchFromGitHub { owner = "justbur"; repo = "evil-ediff"; @@ -18272,7 +18331,7 @@ evil-embrace = callPackage ({ emacs, embrace, evil-surround, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-embrace"; - version = "20160519.1329"; + version = "20160519.1129"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "evil-embrace.el"; @@ -18293,7 +18352,7 @@ evil-escape = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-escape"; - version = "20160607.1215"; + version = "20160607.1015"; src = fetchFromGitHub { owner = "syl20bnr"; repo = "evil-escape"; @@ -18314,7 +18373,7 @@ evil-exchange = callPackage ({ cl-lib ? null, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-exchange"; - version = "20160407.2318"; + version = "20160407.2118"; src = fetchFromGitHub { owner = "Dewdrops"; repo = "evil-exchange"; @@ -18335,7 +18394,7 @@ evil-extra-operator = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-extra-operator"; - version = "20160407.122"; + version = "20160406.2322"; src = fetchFromGitHub { owner = "Dewdrops"; repo = "evil-extra-operator"; @@ -18356,7 +18415,7 @@ evil-find-char-pinyin = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, pinyinlib }: melpaBuild { pname = "evil-find-char-pinyin"; - version = "20160514.1541"; + version = "20160514.1341"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "evil-find-char-pinyin"; @@ -18377,7 +18436,7 @@ evil-god-state = callPackage ({ evil, fetchFromGitHub, fetchurl, god-mode, lib, melpaBuild }: melpaBuild { pname = "evil-god-state"; - version = "20141116.2055"; + version = "20141116.1855"; src = fetchFromGitHub { owner = "gridaphobe"; repo = "evil-god-state"; @@ -18398,7 +18457,7 @@ evil-iedit-state = callPackage ({ evil, fetchFromGitHub, fetchurl, iedit, lib, melpaBuild }: melpaBuild { pname = "evil-iedit-state"; - version = "20160313.1356"; + version = "20160313.1156"; src = fetchFromGitHub { owner = "syl20bnr"; repo = "evil-iedit-state"; @@ -18419,7 +18478,7 @@ evil-indent-plus = callPackage ({ cl-lib ? null, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-indent-plus"; - version = "20151109.1306"; + version = "20151109.1106"; src = fetchFromGitHub { owner = "TheBB"; repo = "evil-indent-plus"; @@ -18440,7 +18499,7 @@ evil-indent-textobject = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-indent-textobject"; - version = "20130831.1719"; + version = "20130831.1519"; src = fetchFromGitHub { owner = "cofi"; repo = "evil-indent-textobject"; @@ -18461,7 +18520,7 @@ evil-leader = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-leader"; - version = "20140606.743"; + version = "20140606.543"; src = fetchFromGitHub { owner = "cofi"; repo = "evil-leader"; @@ -18482,7 +18541,7 @@ evil-lisp-state = callPackage ({ bind-map, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, smartparens }: melpaBuild { pname = "evil-lisp-state"; - version = "20160403.2148"; + version = "20160403.1948"; src = fetchFromGitHub { owner = "syl20bnr"; repo = "evil-lisp-state"; @@ -18503,7 +18562,7 @@ evil-lispy = callPackage ({ evil, fetchFromGitHub, fetchurl, hydra, lib, lispy, melpaBuild }: melpaBuild { pname = "evil-lispy"; - version = "20160522.1306"; + version = "20160522.1106"; src = fetchFromGitHub { owner = "sp3ctum"; repo = "evil-lispy"; @@ -18524,12 +18583,12 @@ evil-magit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "evil-magit"; - version = "20160420.615"; + version = "20160714.1142"; src = fetchFromGitHub { owner = "justbur"; repo = "evil-magit"; - rev = "acc6af408ca08181103b2d4b5d37b207b5d56624"; - sha256 = "17dc48qc8sicmqngy8kpw7r0qm1gnzsal1106d4lx4z7d8lyhpvz"; + rev = "4a375ea3045671a0bdef7cdaed28efc84c9681a5"; + sha256 = "1qqn51aqn0pgadg70zaiwjph1z7xwrv21xasxc9jy7syimyqv96g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cfc6cc3581323c81d5f347895aaddfdc71001f22/recipes/evil-magit"; @@ -18545,7 +18604,7 @@ evil-mark-replace = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-mark-replace"; - version = "20150424.218"; + version = "20150424.18"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "evil-mark-replace"; @@ -18566,7 +18625,7 @@ evil-matchit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-matchit"; - version = "20160627.1951"; + version = "20160627.1751"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "evil-matchit"; @@ -18587,12 +18646,12 @@ evil-mc = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-mc"; - version = "20160630.38"; + version = "20160724.1412"; src = fetchFromGitHub { owner = "gabesoft"; repo = "evil-mc"; - rev = "d700b1a5b4278af730048fb30641411ca20fdd0c"; - sha256 = "0z8yk5d3xw4i2lzd9kd9i5f7190k6x5vnicz310gcp9alhakfhwx"; + rev = "7b80d66c9d4ba552dea6686b003d04d75a93c83d"; + sha256 = "1322gkz0zm5b1p39v3vakyf323l0rdd162h881gh9iv55gjfygav"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96770d778a03ab012fb82a3a0122983db6f9b0c4/recipes/evil-mc"; @@ -18605,10 +18664,31 @@ license = lib.licenses.free; }; }) {}; + evil-mc-extras = callPackage ({ cl-lib ? null, emacs, evil, evil-mc, evil-numbers, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "evil-mc-extras"; + version = "20160723.2250"; + src = fetchFromGitHub { + owner = "gabesoft"; + repo = "evil-mc-extras"; + rev = "803529d0c99a52aee4ef3deb5c7bf31290d9e750"; + sha256 = "1cxqik2haj23nww6saqcaxxwx6bmf1p4dwrl998y4plzqnn1f2ak"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/cd7c9aa0f4c17e7f27836e75a0b83c44a68ad744/recipes/evil-mc-extras"; + sha256 = "1px4akqaddqgfd03932d03d3rrvjr5lv5nc94xc448kqcbfn7yjk"; + name = "evil-mc-extras"; + }; + packageRequires = [ cl-lib emacs evil evil-mc evil-numbers ]; + meta = { + homepage = "https://melpa.org/#/evil-mc-extras"; + license = lib.licenses.free; + }; + }) {}; evil-mu4e = callPackage ({ dash, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-mu4e"; - version = "20160611.1358"; + version = "20160611.1158"; src = fetchFromGitHub { owner = "JorisE"; repo = "evil-mu4e"; @@ -18629,7 +18709,7 @@ evil-multiedit = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, iedit, lib, melpaBuild }: melpaBuild { pname = "evil-multiedit"; - version = "20160602.1413"; + version = "20160602.1213"; src = fetchFromGitHub { owner = "hlissner"; repo = "evil-multiedit"; @@ -18650,7 +18730,7 @@ evil-nerd-commenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-nerd-commenter"; - version = "20160524.600"; + version = "20160524.400"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "evil-nerd-commenter"; @@ -18671,7 +18751,7 @@ evil-numbers = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-numbers"; - version = "20140606.751"; + version = "20140606.551"; src = fetchFromGitHub { owner = "cofi"; repo = "evil-numbers"; @@ -18692,7 +18772,7 @@ evil-org = callPackage ({ evil, evil-leader, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "evil-org"; - version = "20151203.147"; + version = "20151202.2347"; src = fetchFromGitHub { owner = "edwtjo"; repo = "evil-org-mode"; @@ -18713,7 +18793,7 @@ evil-paredit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }: melpaBuild { pname = "evil-paredit"; - version = "20150413.1548"; + version = "20150413.1348"; src = fetchFromGitHub { owner = "roman"; repo = "evil-paredit"; @@ -18734,7 +18814,7 @@ evil-quickscope = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-quickscope"; - version = "20160202.1324"; + version = "20160202.1124"; src = fetchFromGitHub { owner = "blorbx"; repo = "evil-quickscope"; @@ -18755,7 +18835,7 @@ evil-rails = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile-rails }: melpaBuild { pname = "evil-rails"; - version = "20160621.1758"; + version = "20160621.1558"; src = fetchFromGitHub { owner = "antono"; repo = "evil-rails"; @@ -18776,7 +18856,7 @@ evil-rsi = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-rsi"; - version = "20160221.1504"; + version = "20160221.1304"; src = fetchFromGitHub { owner = "linktohack"; repo = "evil-rsi"; @@ -18797,7 +18877,7 @@ evil-search-highlight-persist = callPackage ({ fetchFromGitHub, fetchurl, highlight, lib, melpaBuild }: melpaBuild { pname = "evil-search-highlight-persist"; - version = "20151215.438"; + version = "20151215.238"; src = fetchFromGitHub { owner = "juanjux"; repo = "evil-search-highlight-persist"; @@ -18818,7 +18898,7 @@ evil-smartparens = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, smartparens }: melpaBuild { pname = "evil-smartparens"; - version = "20160502.355"; + version = "20160502.155"; src = fetchFromGitHub { owner = "expez"; repo = "evil-smartparens"; @@ -18839,7 +18919,7 @@ evil-snipe = callPackage ({ cl-lib ? null, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-snipe"; - version = "20160413.1249"; + version = "20160413.1049"; src = fetchFromGitHub { owner = "hlissner"; repo = "evil-snipe"; @@ -18860,7 +18940,7 @@ evil-space = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-space"; - version = "20151208.628"; + version = "20151208.428"; src = fetchFromGitHub { owner = "linktohack"; repo = "evil-space"; @@ -18881,7 +18961,7 @@ evil-surround = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-surround"; - version = "20160501.1904"; + version = "20160501.1704"; src = fetchFromGitHub { owner = "timcharper"; repo = "evil-surround"; @@ -18902,7 +18982,7 @@ evil-tabs = callPackage ({ elscreen, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-tabs"; - version = "20160217.920"; + version = "20160217.720"; src = fetchFromGitHub { owner = "krisajenkins"; repo = "evil-tabs"; @@ -18923,7 +19003,7 @@ evil-terminal-cursor-changer = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-terminal-cursor-changer"; - version = "20150827.2151"; + version = "20150827.1951"; src = fetchFromGitHub { owner = "7696122"; repo = "evil-terminal-cursor-changer"; @@ -18944,7 +19024,7 @@ evil-textobj-anyblock = callPackage ({ cl-lib ? null, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-textobj-anyblock"; - version = "20151017.1617"; + version = "20151017.1417"; src = fetchFromGitHub { owner = "noctuid"; repo = "evil-textobj-anyblock"; @@ -18965,7 +19045,7 @@ evil-textobj-column = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, names }: melpaBuild { pname = "evil-textobj-column"; - version = "20151228.1544"; + version = "20151228.1344"; src = fetchFromGitHub { owner = "noctuid"; repo = "evil-textobj-column"; @@ -18986,7 +19066,7 @@ evil-tutor = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-tutor"; - version = "20150103.50"; + version = "20150102.2250"; src = fetchFromGitHub { owner = "syl20bnr"; repo = "evil-tutor"; @@ -19007,7 +19087,7 @@ evil-vimish-fold = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, vimish-fold }: melpaBuild { pname = "evil-vimish-fold"; - version = "20160430.640"; + version = "20160430.440"; src = fetchFromGitHub { owner = "alexmurray"; repo = "evil-vimish-fold"; @@ -19028,7 +19108,7 @@ evil-visual-mark-mode = callPackage ({ dash, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-visual-mark-mode"; - version = "20150202.1200"; + version = "20150202.1000"; src = fetchFromGitHub { owner = "roman"; repo = "evil-visual-mark-mode"; @@ -19049,7 +19129,7 @@ evil-visualstar = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-visualstar"; - version = "20160222.1848"; + version = "20160222.1648"; src = fetchFromGitHub { owner = "bling"; repo = "evil-visualstar"; @@ -19070,7 +19150,7 @@ evm = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evm"; - version = "20141007.656"; + version = "20141007.456"; src = fetchFromGitHub { owner = "rejeep"; repo = "evm.el"; @@ -19091,7 +19171,7 @@ ewmctrl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ewmctrl"; - version = "20150630.338"; + version = "20150630.138"; src = fetchFromGitHub { owner = "flexibeast"; repo = "ewmctrl"; @@ -19112,7 +19192,7 @@ eww-lnum = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eww-lnum"; - version = "20150102.912"; + version = "20150102.712"; src = fetchFromGitHub { owner = "m00natic"; repo = "eww-lnum"; @@ -19133,7 +19213,7 @@ exec-path-from-shell = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "exec-path-from-shell"; - version = "20160113.46"; + version = "20160112.2246"; src = fetchFromGitHub { owner = "purcell"; repo = "exec-path-from-shell"; @@ -19154,7 +19234,7 @@ expand-line = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "expand-line"; - version = "20151005.2107"; + version = "20151005.1907"; src = fetchFromGitHub { owner = "cheunghy"; repo = "expand-line"; @@ -19175,7 +19255,7 @@ expand-region = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "expand-region"; - version = "20150902.758"; + version = "20150902.558"; src = fetchFromGitHub { owner = "magnars"; repo = "expand-region.el"; @@ -19196,7 +19276,7 @@ express = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, string-utils }: melpaBuild { pname = "express"; - version = "20140508.1541"; + version = "20140508.1341"; src = fetchFromGitHub { owner = "rolandwalker"; repo = "express"; @@ -19217,7 +19297,7 @@ extempore-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "extempore-mode"; - version = "20160620.2013"; + version = "20160620.1813"; src = fetchFromGitHub { owner = "extemporelang"; repo = "extempore-emacs-mode"; @@ -19238,7 +19318,7 @@ extend-dnd = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "extend-dnd"; - version = "20151122.1250"; + version = "20151122.1050"; src = fetchFromGitHub { owner = "mattfidler"; repo = "extend-dnd"; @@ -19259,7 +19339,7 @@ exwm-x = callPackage ({ cl-lib ? null, dmenu, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild, start-menu, switch-window }: melpaBuild { pname = "exwm-x"; - version = "20160307.255"; + version = "20160307.55"; src = fetchFromGitHub { owner = "tumashu"; repo = "exwm-x"; @@ -19280,12 +19360,12 @@ eyebrowse = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eyebrowse"; - version = "20160625.401"; + version = "20160625.201"; src = fetchFromGitHub { owner = "wasamasa"; repo = "eyebrowse"; - rev = "375b80cdf48ae2d8336d4693e9b3f7a21c1ff162"; - sha256 = "098brigngz8w267q6z2lby7gpwzdz5m5554f3xbmkx6apny7wiax"; + rev = "90b6b364bb372354deb32463a9a259ac9a16da7f"; + sha256 = "1fl26ix15bd8qgf8q9p68n92y6zmgkydrswhrwzxp8znnirkps3i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/90d052bfc0b94cf177e33b2ffc01a45d254fc1b1/recipes/eyebrowse"; @@ -19301,7 +19381,7 @@ eyedropper = callPackage ({ fetchurl, hexrgb, lib, melpaBuild }: melpaBuild { pname = "eyedropper"; - version = "20151231.1501"; + version = "20151231.1301"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/eyedropper.el"; sha256 = "1fg3j0jlww2rqc6k2nq95hcg6i26nqdp043h7kyjcwrgqbjfsigl"; @@ -19320,7 +19400,7 @@ eyuml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }: melpaBuild { pname = "eyuml"; - version = "20141028.1727"; + version = "20141028.1527"; src = fetchFromGitHub { owner = "antham"; repo = "eyuml"; @@ -19341,7 +19421,7 @@ ez-query-replace = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ez-query-replace"; - version = "20140810.717"; + version = "20140810.517"; src = fetchFromGitHub { owner = "Wilfred"; repo = "ez-query-replace.el"; @@ -19362,7 +19442,7 @@ f = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "f"; - version = "20160426.727"; + version = "20160426.527"; src = fetchFromGitHub { owner = "rejeep"; repo = "f.el"; @@ -19383,7 +19463,7 @@ f3 = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "f3"; - version = "20160628.1801"; + version = "20160628.1601"; src = fetchFromGitHub { owner = "cosmicexplorer"; repo = "f3"; @@ -19404,7 +19484,7 @@ fabric = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fabric"; - version = "20141024.522"; + version = "20141024.322"; src = fetchFromGitHub { owner = "nlamirault"; repo = "fabric.el"; @@ -19424,7 +19504,7 @@ }) {}; face-remap-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "face-remap-plus"; - version = "20151231.1502"; + version = "20151231.1302"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/face-remap+.el"; sha256 = "0yr3fqpn9pj6y8bsb6g7hkg75sl703pzngn8gp0sgs3v90c180l5"; @@ -19442,7 +19522,7 @@ }) {}; facemenu-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "facemenu-plus"; - version = "20151231.1505"; + version = "20151231.1305"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/facemenu+.el"; sha256 = "1kayc4hsalvqnn577y3f97w9kz94c53vcxwx01s0k34ffav919c2"; @@ -19460,7 +19540,7 @@ }) {}; faces-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "faces-plus"; - version = "20151231.1505"; + version = "20151231.1305"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/faces+.el"; sha256 = "0sqrymmr583cgqmv4bs6rjms5ij5cm8vvxjrfc9alacwyz5f7w8m"; @@ -19479,7 +19559,7 @@ faceup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "faceup"; - version = "20150215.1548"; + version = "20150215.1348"; src = fetchFromGitHub { owner = "Lindydancer"; repo = "faceup"; @@ -19500,7 +19580,7 @@ factlog = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "factlog"; - version = "20130209.1940"; + version = "20130209.1740"; src = fetchFromGitHub { owner = "tkf"; repo = "factlog"; @@ -19521,7 +19601,7 @@ faff-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "faff-theme"; - version = "20160424.1052"; + version = "20160424.852"; src = fetchFromGitHub { owner = "WJCFerguson"; repo = "emacs-faff-theme"; @@ -19542,7 +19622,7 @@ fakespace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fakespace"; - version = "20120817.1906"; + version = "20120817.1706"; src = fetchFromGitHub { owner = "skeeto"; repo = "elisp-fakespace"; @@ -19563,7 +19643,7 @@ fakir = callPackage ({ dash, fetchFromGitHub, fetchurl, kv, lib, melpaBuild, noflet }: melpaBuild { pname = "fakir"; - version = "20140729.1152"; + version = "20140729.952"; src = fetchFromGitHub { owner = "nicferrier"; repo = "emacs-fakir"; @@ -19584,7 +19664,7 @@ fancy-battery = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fancy-battery"; - version = "20150101.604"; + version = "20150101.404"; src = fetchFromGitHub { owner = "lunaryorn"; repo = "fancy-battery.el"; @@ -19605,7 +19685,7 @@ fancy-narrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fancy-narrow"; - version = "20160124.603"; + version = "20160124.403"; src = fetchFromGitHub { owner = "Malabarba"; repo = "fancy-narrow"; @@ -19626,12 +19706,12 @@ farmhouse-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "farmhouse-theme"; - version = "20150506.2327"; + version = "20160713.1544"; src = fetchFromGitHub { owner = "mattly"; repo = "emacs-farmhouse-theme"; - rev = "a09e7cd5b12542d27474aad7e118c8ede3edbea1"; - sha256 = "08lgfa2k42qpcs4999b77ycsg76zb56qbcxbsvmg0pcwjwa1ambz"; + rev = "7ddc1ff13b4a3d5466bd0d33ecb86100352e83a7"; + sha256 = "09k6agh205kr2lif354m38l3967b0jajm14rgpl7l1vlajh8wzfd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3b0d427db8ab66d2fe323366b0837595b3b59afa/recipes/farmhouse-theme"; @@ -19647,7 +19727,7 @@ fasd = callPackage ({ fetchFromGitHub, fetchurl, grizzl, lib, melpaBuild }: melpaBuild { pname = "fasd"; - version = "20151208.116"; + version = "20151207.2316"; src = fetchFromGitHub { owner = "steckerhalter"; repo = "emacs-fasd"; @@ -19668,12 +19748,12 @@ fastdef = callPackage ({ fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, w3m }: melpaBuild { pname = "fastdef"; - version = "20160623.1833"; + version = "20160713.629"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "fastdef"; - rev = "cb57bfdfbecfcadb513fd0c4490b74a709e1d22e"; - sha256 = "0gbsjan8hc5mca5xzdf4ycv83cjkk920nxqad4vhb24fpmbckinb"; + rev = "0696f41dc150d35ce31fe8d2ea74f4173818bb55"; + sha256 = "1p5vmbx7zdzxnyjzcp2vxscd3dwf7xk82wk9dfiv99svwqv2ki3w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f6effb2fbccc71e8a44c53138e3c21f10dc55fbc/recipes/fastdef"; @@ -19689,7 +19769,7 @@ fastnav = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fastnav"; - version = "20120211.857"; + version = "20120211.657"; src = fetchFromGitHub { owner = "gleber"; repo = "fastnav.el"; @@ -19710,7 +19790,7 @@ faust-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "faust-mode"; - version = "20160119.1120"; + version = "20160119.920"; src = fetchFromGitHub { owner = "magnetophon"; repo = "emacs-faust-mode"; @@ -19731,7 +19811,7 @@ fcitx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fcitx"; - version = "20160608.1319"; + version = "20160608.1119"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "fcitx.el"; @@ -19752,7 +19832,7 @@ fcopy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fcopy"; - version = "20150304.803"; + version = "20150304.603"; src = fetchFromGitHub { owner = "ataka"; repo = "fcopy"; @@ -19773,7 +19853,7 @@ feature-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "feature-mode"; - version = "20141121.1230"; + version = "20141121.1030"; src = fetchFromGitHub { owner = "michaelklishin"; repo = "cucumber.el"; @@ -19794,7 +19874,7 @@ fetch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fetch"; - version = "20131201.130"; + version = "20131130.2330"; src = fetchFromGitHub { owner = "crshd"; repo = "fetch.el"; @@ -19815,7 +19895,7 @@ fic-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fic-mode"; - version = "20160209.1211"; + version = "20160209.1011"; src = fetchFromGitHub { owner = "lewang"; repo = "fic-mode"; @@ -19836,7 +19916,7 @@ fifo-class = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fifo-class"; - version = "20160425.58"; + version = "20160424.2258"; src = fetchFromGitHub { owner = "mola-T"; repo = "fifo-class"; @@ -19856,7 +19936,7 @@ }) {}; figlet = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "figlet"; - version = "20160218.1637"; + version = "20160218.1437"; src = fetchhg { url = "https://bitbucket.com/jpkotta/figlet"; rev = "70ca269d706e"; @@ -19875,7 +19955,7 @@ }) {}; files-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "files-plus"; - version = "20151231.1507"; + version = "20151231.1307"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/files+.el"; sha256 = "0s79b5jj3jfl3aih6r3fa0zix40arysk6mz4fijapd8ybaflz25n"; @@ -19893,7 +19973,7 @@ }) {}; filesets-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "filesets-plus"; - version = "20151231.1508"; + version = "20151231.1308"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/filesets+.el"; sha256 = "020rpjrjp2gh4w6mrphrvk27kdizfqbjsw2sxraf8jz0dibg9gfg"; @@ -19912,7 +19992,7 @@ fill-column-indicator = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fill-column-indicator"; - version = "20151030.1433"; + version = "20151030.1233"; src = fetchFromGitHub { owner = "alpaker"; repo = "Fill-Column-Indicator"; @@ -19933,7 +20013,7 @@ fillcode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fillcode"; - version = "20150812.1141"; + version = "20150812.941"; src = fetchFromGitHub { owner = "snarfed"; repo = "fillcode"; @@ -19954,7 +20034,7 @@ finalize = callPackage ({ cl-lib ? null, eieio ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "finalize"; - version = "20140127.1246"; + version = "20140127.1046"; src = fetchFromGitHub { owner = "skeeto"; repo = "elisp-finalize"; @@ -19975,7 +20055,7 @@ find-by-pinyin-dired = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "find-by-pinyin-dired"; - version = "20150202.416"; + version = "20150202.216"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "find-by-pinyin-dired"; @@ -19995,7 +20075,7 @@ }) {}; find-dired-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "find-dired-plus"; - version = "20160515.1150"; + version = "20160515.950"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/find-dired+.el"; sha256 = "0a2wgdrj6yxvpmzqiqpgzj3gbf04fvbhrfa3213hiah1k9l066m5"; @@ -20014,12 +20094,12 @@ find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "find-file-in-project"; - version = "20160625.819"; + version = "20160719.2048"; src = fetchFromGitHub { owner = "technomancy"; repo = "find-file-in-project"; - rev = "c6e19de997c51f4b0463961702101287ac4510b9"; - sha256 = "1gci8q5s9ry9rh555bm9aq3sqkgr1l7ln1ksqf7ipsmgbnip40x9"; + rev = "b69411d15902d9d1cbb0184885f726270de0b98c"; + sha256 = "1jlggfk9qx6gi8ifzvjn9hpbqgs8dc7hmss8aflnzf3gn4202svp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project"; @@ -20035,7 +20115,7 @@ find-file-in-repository = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "find-file-in-repository"; - version = "20151113.719"; + version = "20151113.519"; src = fetchFromGitHub { owner = "hoffstaetter"; repo = "find-file-in-repository"; @@ -20056,7 +20136,7 @@ find-temp-file = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "find-temp-file"; - version = "20160108.413"; + version = "20160108.213"; src = fetchFromGitHub { owner = "thisirs"; repo = "find-temp-file"; @@ -20077,7 +20157,7 @@ find-things-fast = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "find-things-fast"; - version = "20150519.1726"; + version = "20150519.1526"; src = fetchFromGitHub { owner = "eglaysher"; repo = "find-things-fast"; @@ -20097,7 +20177,7 @@ }) {}; finder-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "finder-plus"; - version = "20151231.1513"; + version = "20151231.1313"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/finder+.el"; sha256 = "0x3f9qygp26c4yw32cgyy35bb4f1fq0fg7q8s9vs777skyl3rvp4"; @@ -20115,7 +20195,7 @@ }) {}; findr = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "findr"; - version = "20130824.707"; + version = "20130824.507"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/findr.el"; sha256 = "0a04mgya59w468jv2bmkqlayzgh0r8sdz0qg3n70wn9rhdcwnl9q"; @@ -20134,7 +20214,7 @@ fingers = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fingers"; - version = "20150809.1916"; + version = "20150809.1716"; src = fetchFromGitHub { owner = "fgeller"; repo = "fingers.el"; @@ -20155,7 +20235,7 @@ fiplr = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, grizzl, lib, melpaBuild }: melpaBuild { pname = "fiplr"; - version = "20140724.145"; + version = "20140723.2345"; src = fetchFromGitHub { owner = "grizzl"; repo = "fiplr"; @@ -20176,7 +20256,7 @@ firebelly-theme = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "firebelly-theme"; - version = "20140410.355"; + version = "20140410.155"; src = fetchFromGitHub { owner = "startling"; repo = "firebelly"; @@ -20197,7 +20277,7 @@ firecode-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "firecode-theme"; - version = "20141116.102"; + version = "20141115.2302"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-firecode-theme"; @@ -20218,7 +20298,7 @@ firefox-controller = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, moz, popwin }: melpaBuild { pname = "firefox-controller"; - version = "20160320.1347"; + version = "20160320.1147"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "emacs-firefox-controller"; @@ -20239,7 +20319,7 @@ fireplace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fireplace"; - version = "20160101.1247"; + version = "20160101.1047"; src = fetchFromGitHub { owner = "johanvts"; repo = "emacs-fireplace"; @@ -20260,7 +20340,7 @@ firestarter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "firestarter"; - version = "20160318.1542"; + version = "20160318.1342"; src = fetchFromGitHub { owner = "wasamasa"; repo = "firestarter"; @@ -20281,7 +20361,7 @@ fish-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fish-mode"; - version = "20160429.2257"; + version = "20160429.2057"; src = fetchFromGitHub { owner = "wwwjfy"; repo = "emacs-fish"; @@ -20301,7 +20381,7 @@ }) {}; fit-frame = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "fit-frame"; - version = "20151231.1514"; + version = "20151231.1314"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/fit-frame.el"; sha256 = "082c6yyb1269va6k602hxpdf7ylfxz8gq8swqzwf07qaas0b5qxd"; @@ -20320,7 +20400,7 @@ fix-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fix-input"; - version = "20160122.2319"; + version = "20160122.2119"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "fix-input"; @@ -20341,7 +20421,7 @@ fix-word = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fix-word"; - version = "20150716.802"; + version = "20150716.602"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "fix-word"; @@ -20362,7 +20442,7 @@ fixmee = callPackage ({ back-button, button-lock, fetchFromGitHub, fetchurl, lib, melpaBuild, nav-flash, smartrep, string-utils, tabulated-list ? null }: melpaBuild { pname = "fixmee"; - version = "20150223.755"; + version = "20150223.555"; src = fetchFromGitHub { owner = "rolandwalker"; repo = "fixmee"; @@ -20390,7 +20470,7 @@ flappymacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flappymacs"; - version = "20140715.1101"; + version = "20140715.901"; src = fetchFromGitHub { owner = "taksatou"; repo = "flappymacs"; @@ -20411,7 +20491,7 @@ flash-region = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flash-region"; - version = "20130923.1317"; + version = "20130923.1117"; src = fetchFromGitHub { owner = "Fuco1"; repo = "flash-region"; @@ -20432,7 +20512,7 @@ flatland-black-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flatland-black-theme"; - version = "20141116.30"; + version = "20141115.2230"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-flatland-black-theme"; @@ -20453,7 +20533,7 @@ flatland-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flatland-theme"; - version = "20140805.505"; + version = "20140805.305"; src = fetchFromGitHub { owner = "gchp"; repo = "flatland-emacs"; @@ -20474,7 +20554,7 @@ flatui-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flatui-theme"; - version = "20160618.2027"; + version = "20160618.1827"; src = fetchFromGitHub { owner = "john2x"; repo = "flatui-theme.el"; @@ -20495,7 +20575,7 @@ flex-autopair = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flex-autopair"; - version = "20120809.718"; + version = "20120809.518"; src = fetchFromGitHub { owner = "uk-ar"; repo = "flex-autopair"; @@ -20516,7 +20596,7 @@ flex-isearch = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flex-isearch"; - version = "20130508.1703"; + version = "20130508.1503"; src = fetchhg { url = "https://bitbucket.com/jpkotta/flex-isearch"; rev = "bb9c3502057d"; @@ -20536,7 +20616,7 @@ flim = callPackage ({ apel, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flim"; - version = "20160311.1737"; + version = "20160311.1537"; src = fetchFromGitHub { owner = "wanderlust"; repo = "flim"; @@ -20556,7 +20636,7 @@ }) {}; fliptext = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "fliptext"; - version = "20131113.2018"; + version = "20131113.1818"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/fliptext.el"; sha256 = "1viigj04kla20dk46xm913jzqrmx05rpjrpghnc0ylbqppqdwzpw"; @@ -20575,7 +20655,7 @@ floobits = callPackage ({ fetchFromGitHub, fetchurl, highlight, json ? null, lib, melpaBuild }: melpaBuild { pname = "floobits"; - version = "20160621.1522"; + version = "20160621.1322"; src = fetchFromGitHub { owner = "Floobits"; repo = "floobits-emacs"; @@ -20596,7 +20676,7 @@ flx = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flx"; - version = "20151030.1312"; + version = "20151030.1112"; src = fetchFromGitHub { owner = "lewang"; repo = "flx"; @@ -20617,7 +20697,7 @@ flx-ido = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, flx, lib, melpaBuild }: melpaBuild { pname = "flx-ido"; - version = "20151030.1312"; + version = "20151030.1112"; src = fetchFromGitHub { owner = "lewang"; repo = "flx"; @@ -20638,7 +20718,7 @@ flx-isearch = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, flx, lib, melpaBuild }: melpaBuild { pname = "flx-isearch"; - version = "20160105.1417"; + version = "20160105.1217"; src = fetchFromGitHub { owner = "PythonNut"; repo = "flx-isearch"; @@ -20659,12 +20739,12 @@ flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }: melpaBuild { pname = "flycheck"; - version = "20160622.1152"; + version = "20160726.134"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck"; - rev = "d6864b7478c355fdd11f56688b7cc98539206e29"; - sha256 = "1i8cngnfgmkk6xw9d1nh89zpnhwi0577ayaiynv4r0bw5g7r48mk"; + rev = "c31379661e30b4aa398cc53ad092d477edc2665e"; + sha256 = "1qh6r2iiqvfay8f9shxd35c3x5jf9j34ri22m7ghajf0q4gkfaj4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck"; @@ -20680,7 +20760,7 @@ flycheck-apertium = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-apertium"; - version = "20160406.818"; + version = "20160406.618"; src = fetchFromGitHub { owner = "unhammer"; repo = "flycheck-apertium"; @@ -20701,7 +20781,7 @@ flycheck-ats2 = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-ats2"; - version = "20151130.807"; + version = "20151130.607"; src = fetchFromGitHub { owner = "drvink"; repo = "flycheck-ats2"; @@ -20722,7 +20802,7 @@ flycheck-bashate = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-bashate"; - version = "20160629.2340"; + version = "20160629.2140"; src = fetchFromGitHub { owner = "alexmurray"; repo = "flycheck-bashate"; @@ -20743,7 +20823,7 @@ flycheck-cask = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-cask"; - version = "20150920.653"; + version = "20150920.453"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck-cask"; @@ -20764,7 +20844,7 @@ flycheck-checkbashisms = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-checkbashisms"; - version = "20160224.1106"; + version = "20160224.906"; src = fetchFromGitHub { owner = "Gnouc"; repo = "flycheck-checkbashisms"; @@ -20785,7 +20865,7 @@ flycheck-clangcheck = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, seq }: melpaBuild { pname = "flycheck-clangcheck"; - version = "20150712.210"; + version = "20150712.10"; src = fetchFromGitHub { owner = "kumar8600"; repo = "flycheck-clangcheck"; @@ -20806,12 +20886,12 @@ flycheck-clojure = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }: melpaBuild { pname = "flycheck-clojure"; - version = "20160319.958"; + version = "20160704.1221"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "squiggly-clojure"; - rev = "fc0f1473c85b5287c8a62c1eee86894c98fbb84c"; - sha256 = "0dqnv7l82h09janakq2b3ncz3jj99418pb91w0gabvfylww3pm21"; + rev = "7d5e714339509108f9dd3f32ded4b678744a809a"; + sha256 = "0nxw62mn03jhcx71rg5xlp2s0kwcppahjl8drh9jvhqw3lfx9yjr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c9c642a234f93ed4cf5edcf27a552a8916984946/recipes/flycheck-clojure"; @@ -20827,7 +20907,7 @@ flycheck-color-mode-line = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-color-mode-line"; - version = "20131125.2338"; + version = "20131125.2138"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck-color-mode-line"; @@ -20848,7 +20928,7 @@ flycheck-css-colorguard = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-css-colorguard"; - version = "20151122.347"; + version = "20151122.147"; src = fetchFromGitHub { owner = "Simplify"; repo = "flycheck-css-colorguard"; @@ -20869,7 +20949,7 @@ flycheck-cstyle = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-cstyle"; - version = "20160320.1808"; + version = "20160320.1608"; src = fetchFromGitHub { owner = "alexmurray"; repo = "flycheck-cstyle"; @@ -20890,7 +20970,7 @@ flycheck-cython = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-cython"; - version = "20160327.1428"; + version = "20160327.1228"; src = fetchFromGitHub { owner = "lbolla"; repo = "emacs-flycheck-cython"; @@ -20911,7 +20991,7 @@ flycheck-d-unittest = callPackage ({ dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-d-unittest"; - version = "20160521.2317"; + version = "20160521.2117"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck-d-unittest"; @@ -20932,7 +21012,7 @@ flycheck-dedukti = callPackage ({ dedukti-mode, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-dedukti"; - version = "20150106.851"; + version = "20150106.651"; src = fetchFromGitHub { owner = "rafoo"; repo = "flycheck-dedukti"; @@ -20953,7 +21033,7 @@ flycheck-dialyzer = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-dialyzer"; - version = "20160326.930"; + version = "20160326.730"; src = fetchFromGitHub { owner = "lbolla"; repo = "emacs-flycheck-dialyzer"; @@ -20974,7 +21054,7 @@ flycheck-dmd-dub = callPackage ({ f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-dmd-dub"; - version = "20160609.214"; + version = "20160609.14"; src = fetchFromGitHub { owner = "atilaneves"; repo = "flycheck-dmd-dub"; @@ -20995,7 +21075,7 @@ flycheck-elixir = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-elixir"; - version = "20160629.259"; + version = "20160629.59"; src = fetchFromGitHub { owner = "lbolla"; repo = "emacs-flycheck-elixir"; @@ -21016,12 +21096,12 @@ flycheck-elm = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-elm"; - version = "20160612.1006"; + version = "20160717.257"; src = fetchFromGitHub { owner = "bsermons"; repo = "flycheck-elm"; - rev = "21e777036afb6b8c61e53eef8241ef0367614b0d"; - sha256 = "1qblbcx9lfi77i9zd8q7qpqcpkv11zvf146j3r41b20scpqnxvh9"; + rev = "b401873ebd2176190a0a6fb4d61c2cca97d3b9fb"; + sha256 = "18apypk32dyg8zwvrcsza2j10z4zbpff04cz3xzhjskmkzw6210i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/78bdcdaa660beda29acecb51761b95d8664d28ac/recipes/flycheck-elm"; @@ -21037,7 +21117,7 @@ flycheck-flow = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-flow"; - version = "20160627.258"; + version = "20160627.58"; src = fetchFromGitHub { owner = "lbolla"; repo = "emacs-flycheck-flow"; @@ -21058,7 +21138,7 @@ flycheck-ghcmod = callPackage ({ dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-ghcmod"; - version = "20150114.32"; + version = "20150113.2232"; src = fetchFromGitHub { owner = "scturtle"; repo = "flycheck-ghcmod"; @@ -21079,12 +21159,12 @@ flycheck-gometalinter = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-gometalinter"; - version = "20160301.2105"; + version = "20160714.2232"; src = fetchFromGitHub { owner = "favadi"; repo = "flycheck-gometalinter"; - rev = "6da19fbf8f750f56891c5b57bfb37997af09de77"; - sha256 = "0frgyj57mrggq5ib6xi71696m97ch0bw6cc208d2qbnb55sf4fgb"; + rev = "2e863429cc953cf4c14783e249df56d1ae669868"; + sha256 = "07r2csy2psflvg0pl6n9scfwhnp9mv7hs02hz861v5kbkfx0ajzw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bfe9f2d030c04fb292297eb9226072bfea2ac64/recipes/flycheck-gometalinter"; @@ -21100,7 +21180,7 @@ flycheck-google-cpplint = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-google-cpplint"; - version = "20140806.1125"; + version = "20140806.925"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck-google-cpplint"; @@ -21121,7 +21201,7 @@ flycheck-haskell = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, let-alist, lib, melpaBuild, seq }: melpaBuild { pname = "flycheck-haskell"; - version = "20160524.317"; + version = "20160524.117"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck-haskell"; @@ -21142,7 +21222,7 @@ flycheck-hdevtools = callPackage ({ dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-hdevtools"; - version = "20160109.2014"; + version = "20160109.1814"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck-hdevtools"; @@ -21163,7 +21243,7 @@ flycheck-irony = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, irony, lib, melpaBuild }: melpaBuild { pname = "flycheck-irony"; - version = "20160317.1736"; + version = "20160317.1536"; src = fetchFromGitHub { owner = "Sarcasm"; repo = "flycheck-irony"; @@ -21184,7 +21264,7 @@ flycheck-ledger = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-ledger"; - version = "20140605.1346"; + version = "20140605.1146"; src = fetchFromGitHub { owner = "purcell"; repo = "flycheck-ledger"; @@ -21205,7 +21285,7 @@ flycheck-mercury = callPackage ({ dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s }: melpaBuild { pname = "flycheck-mercury"; - version = "20151123.134"; + version = "20151122.2334"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck-mercury"; @@ -21226,7 +21306,7 @@ flycheck-mix = callPackage ({ elixir-mode, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-mix"; - version = "20160606.1529"; + version = "20160606.1329"; src = fetchFromGitHub { owner = "tomekowal"; repo = "flycheck-mix"; @@ -21247,7 +21327,7 @@ flycheck-mypy = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-mypy"; - version = "20160220.1632"; + version = "20160220.1432"; src = fetchFromGitHub { owner = "lbolla"; repo = "emacs-flycheck-mypy"; @@ -21268,12 +21348,12 @@ flycheck-nim = callPackage ({ dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-nim"; - version = "20150911.1847"; + version = "20160714.2128"; src = fetchFromGitHub { owner = "ALSchwalm"; repo = "flycheck-nim"; - rev = "4cf6a70864e594c24b33c1032e2692ad1b310d6c"; - sha256 = "06hs41l41hm08dv93wldd98hmnd3jqbg58pj5ymn15kgdsy1rirg"; + rev = "6d27349b66e44578851e6148299709d64d2bde41"; + sha256 = "08rjrh7rjx71fsxf931hhfcga7m6a8sd6bvvr4qbsmhldnzd1aa7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68747db46761f28aa2fdf13494d7cecc334cb604/recipes/flycheck-nim"; @@ -21289,7 +21369,7 @@ flycheck-ocaml = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, merlin }: melpaBuild { pname = "flycheck-ocaml"; - version = "20151103.412"; + version = "20151103.212"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck-ocaml"; @@ -21310,7 +21390,7 @@ flycheck-package = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-package"; - version = "20160502.335"; + version = "20160502.135"; src = fetchFromGitHub { owner = "purcell"; repo = "flycheck-package"; @@ -21331,7 +21411,7 @@ flycheck-perl6 = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-perl6"; - version = "20150414.2032"; + version = "20150414.1832"; src = fetchFromGitHub { owner = "hinrik"; repo = "flycheck-perl6"; @@ -21352,7 +21432,7 @@ flycheck-pkg-config = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "flycheck-pkg-config"; - version = "20160610.1535"; + version = "20160610.1335"; src = fetchFromGitHub { owner = "Wilfred"; repo = "flycheck-pkg-config"; @@ -21373,7 +21453,7 @@ flycheck-pony = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-pony"; - version = "20160501.1617"; + version = "20160501.1417"; src = fetchFromGitHub { owner = "SeanTAllen"; repo = "flycheck-pony"; @@ -21394,7 +21474,7 @@ flycheck-pos-tip = callPackage ({ dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, pos-tip }: melpaBuild { pname = "flycheck-pos-tip"; - version = "20160323.329"; + version = "20160323.129"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck-pos-tip"; @@ -21415,7 +21495,7 @@ flycheck-protobuf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, protobuf-mode }: melpaBuild { pname = "flycheck-protobuf"; - version = "20160211.900"; + version = "20160211.700"; src = fetchFromGitHub { owner = "edvorg"; repo = "flycheck-protobuf"; @@ -21436,7 +21516,7 @@ flycheck-purescript = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, seq }: melpaBuild { pname = "flycheck-purescript"; - version = "20160613.1515"; + version = "20160613.1315"; src = fetchFromGitHub { owner = "emacs-pe"; repo = "flycheck-purescript"; @@ -21457,7 +21537,7 @@ flycheck-pyflakes = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-pyflakes"; - version = "20140630.1721"; + version = "20140630.1521"; src = fetchFromGitHub { owner = "Wilfred"; repo = "flycheck-pyflakes"; @@ -21478,7 +21558,7 @@ flycheck-rust = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, seq }: melpaBuild { pname = "flycheck-rust"; - version = "20160614.1330"; + version = "20160614.1130"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck-rust"; @@ -21499,7 +21579,7 @@ flycheck-stack = callPackage ({ fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "flycheck-stack"; - version = "20160520.444"; + version = "20160520.244"; src = fetchFromGitHub { owner = "chrisdone"; repo = "flycheck-stack"; @@ -21520,7 +21600,7 @@ flycheck-status-emoji = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }: melpaBuild { pname = "flycheck-status-emoji"; - version = "20160207.1651"; + version = "20160207.1451"; src = fetchFromGitHub { owner = "liblit"; repo = "flycheck-status-emoji"; @@ -21541,7 +21621,7 @@ flycheck-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup }: melpaBuild { pname = "flycheck-tip"; - version = "20160622.2106"; + version = "20160622.1906"; src = fetchFromGitHub { owner = "yuutayamada"; repo = "flycheck-tip"; @@ -21562,12 +21642,12 @@ flycheck-ycmd = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, ycmd }: melpaBuild { pname = "flycheck-ycmd"; - version = "20160320.624"; + version = "20160320.424"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "a9cb3a6893cff7059058f25f06e75d38584084f1"; - sha256 = "03vfg56qmj68y702c94p914fqrx68szykj8nm12d26p0rjnky2b8"; + rev = "5342f1def925e59477880c1bf5c10778c50678fe"; + sha256 = "1nn312z7bfjya570gbs7gcwf9zh3b7jhwg52gfp7digdwqrary42"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/332e5585963c04112a55894fe7151c380930b17c/recipes/flycheck-ycmd"; @@ -21583,7 +21663,7 @@ flymake-coffee = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: melpaBuild { pname = "flymake-coffee"; - version = "20140809.524"; + version = "20140809.324"; src = fetchFromGitHub { owner = "purcell"; repo = "flymake-coffee"; @@ -21604,7 +21684,7 @@ flymake-cppcheck = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: melpaBuild { pname = "flymake-cppcheck"; - version = "20140415.757"; + version = "20140415.557"; src = fetchFromGitHub { owner = "senda-akiha"; repo = "flymake-cppcheck"; @@ -21625,7 +21705,7 @@ flymake-css = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: melpaBuild { pname = "flymake-css"; - version = "20121104.1304"; + version = "20121104.1104"; src = fetchFromGitHub { owner = "purcell"; repo = "flymake-css"; @@ -21645,7 +21725,7 @@ }) {}; flymake-cursor = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "flymake-cursor"; - version = "20130822.532"; + version = "20130822.332"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/flymake-cursor.el"; sha256 = "10cpzrd588ya52blghxss5zkn6x8hc7bx1h0qbcdlybbmkjgpkxr"; @@ -21664,7 +21744,7 @@ flymake-easy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flymake-easy"; - version = "20140818.255"; + version = "20140818.55"; src = fetchFromGitHub { owner = "purcell"; repo = "flymake-easy"; @@ -21685,7 +21765,7 @@ flymake-elixir = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flymake-elixir"; - version = "20130810.917"; + version = "20130810.717"; src = fetchFromGitHub { owner = "syl20bnr"; repo = "flymake-elixir"; @@ -21706,7 +21786,7 @@ flymake-gjshint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flymake-gjshint"; - version = "20130327.732"; + version = "20130327.532"; src = fetchFromGitHub { owner = "yasuyk"; repo = "flymake-gjshint-el"; @@ -21727,7 +21807,7 @@ flymake-go = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flymake-go"; - version = "20150714.233"; + version = "20150714.33"; src = fetchFromGitHub { owner = "robert-zaremba"; repo = "flymake-go"; @@ -21748,7 +21828,7 @@ flymake-google-cpplint = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: melpaBuild { pname = "flymake-google-cpplint"; - version = "20140205.725"; + version = "20140205.525"; src = fetchFromGitHub { owner = "senda-akiha"; repo = "flymake-google-cpplint"; @@ -21769,7 +21849,7 @@ flymake-haml = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: melpaBuild { pname = "flymake-haml"; - version = "20130324.551"; + version = "20130324.351"; src = fetchFromGitHub { owner = "purcell"; repo = "flymake-haml"; @@ -21790,7 +21870,7 @@ flymake-haskell-multi = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: melpaBuild { pname = "flymake-haskell-multi"; - version = "20130620.622"; + version = "20130620.422"; src = fetchFromGitHub { owner = "purcell"; repo = "flymake-haskell-multi"; @@ -21811,7 +21891,7 @@ flymake-hlint = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: melpaBuild { pname = "flymake-hlint"; - version = "20130309.345"; + version = "20130309.145"; src = fetchFromGitHub { owner = "purcell"; repo = "flymake-hlint"; @@ -21832,7 +21912,7 @@ flymake-jshint = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: melpaBuild { pname = "flymake-jshint"; - version = "20140319.1700"; + version = "20140319.1500"; src = fetchFromGitHub { owner = "Wilfred"; repo = "flymake-jshint.el"; @@ -21853,7 +21933,7 @@ flymake-jslint = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: melpaBuild { pname = "flymake-jslint"; - version = "20130613.402"; + version = "20130613.202"; src = fetchFromGitHub { owner = "purcell"; repo = "flymake-jslint"; @@ -21874,7 +21954,7 @@ flymake-json = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: melpaBuild { pname = "flymake-json"; - version = "20130424.157"; + version = "20130423.2357"; src = fetchFromGitHub { owner = "purcell"; repo = "flymake-json"; @@ -21895,7 +21975,7 @@ flymake-less = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, less-css-mode, lib, melpaBuild }: melpaBuild { pname = "flymake-less"; - version = "20151111.138"; + version = "20151110.2338"; src = fetchFromGitHub { owner = "purcell"; repo = "flymake-less"; @@ -21916,7 +21996,7 @@ flymake-lua = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flymake-lua"; - version = "20140310.430"; + version = "20140310.230"; src = fetchFromGitHub { owner = "sroccaserra"; repo = "emacs"; @@ -21937,7 +22017,7 @@ flymake-perlcritic = callPackage ({ fetchFromGitHub, fetchurl, flymake ? null, lib, melpaBuild }: melpaBuild { pname = "flymake-perlcritic"; - version = "20120328.314"; + version = "20120328.114"; src = fetchFromGitHub { owner = "illusori"; repo = "emacs-flymake-perlcritic"; @@ -21958,7 +22038,7 @@ flymake-php = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: melpaBuild { pname = "flymake-php"; - version = "20121104.1302"; + version = "20121104.1102"; src = fetchFromGitHub { owner = "purcell"; repo = "flymake-php"; @@ -21979,7 +22059,7 @@ flymake-phpcs = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: melpaBuild { pname = "flymake-phpcs"; - version = "20140713.131"; + version = "20140712.2331"; src = fetchFromGitHub { owner = "senda-akiha"; repo = "flymake-phpcs"; @@ -22000,7 +22080,7 @@ flymake-puppet = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: melpaBuild { pname = "flymake-puppet"; - version = "20141006.2055"; + version = "20141006.1855"; src = fetchFromGitHub { owner = "benprew"; repo = "flymake-puppet"; @@ -22021,7 +22101,7 @@ flymake-python-pyflakes = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: melpaBuild { pname = "flymake-python-pyflakes"; - version = "20131127.206"; + version = "20131127.6"; src = fetchFromGitHub { owner = "purcell"; repo = "flymake-python-pyflakes"; @@ -22042,7 +22122,7 @@ flymake-ruby = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: melpaBuild { pname = "flymake-ruby"; - version = "20121104.1259"; + version = "20121104.1059"; src = fetchFromGitHub { owner = "purcell"; repo = "flymake-ruby"; @@ -22063,7 +22143,7 @@ flymake-rust = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: melpaBuild { pname = "flymake-rust"; - version = "20141004.1752"; + version = "20141004.1552"; src = fetchFromGitHub { owner = "jxs"; repo = "flymake-rust"; @@ -22084,7 +22164,7 @@ flymake-sass = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: melpaBuild { pname = "flymake-sass"; - version = "20140308.525"; + version = "20140308.325"; src = fetchFromGitHub { owner = "purcell"; repo = "flymake-sass"; @@ -22105,7 +22185,7 @@ flymake-shell = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: melpaBuild { pname = "flymake-shell"; - version = "20121104.1300"; + version = "20121104.1100"; src = fetchFromGitHub { owner = "purcell"; repo = "flymake-shell"; @@ -22126,7 +22206,7 @@ flymake-solidity = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: melpaBuild { pname = "flymake-solidity"; - version = "20160424.920"; + version = "20160424.720"; src = fetchFromGitHub { owner = "kootenpv"; repo = "flymake-solidity"; @@ -22147,7 +22227,7 @@ flymake-vala = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: melpaBuild { pname = "flymake-vala"; - version = "20150326.31"; + version = "20150325.2231"; src = fetchFromGitHub { owner = "daniellawrence"; repo = "flymake-vala"; @@ -22168,7 +22248,7 @@ flymake-yaml = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }: melpaBuild { pname = "flymake-yaml"; - version = "20130423.1048"; + version = "20130423.848"; src = fetchFromGitHub { owner = "yasuyk"; repo = "flymake-yaml"; @@ -22189,7 +22269,7 @@ flymd = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flymd"; - version = "20160617.714"; + version = "20160617.514"; src = fetchFromGitHub { owner = "mola-T"; repo = "flymd"; @@ -22210,7 +22290,7 @@ flyparens = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flyparens"; - version = "20140723.1346"; + version = "20140723.1146"; src = fetchFromGitHub { owner = "jiyoo"; repo = "flyparens"; @@ -22231,12 +22311,12 @@ flyspell-correct = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flyspell-correct"; - version = "20160612.2345"; + version = "20160713.2316"; src = fetchFromGitHub { owner = "d12frosted"; repo = "flyspell-correct"; - rev = "a48256bcb016d4c8d6b964a4a86ce7f0c0f342d9"; - sha256 = "0872kbgh6m7fc562w0yiragrh2zyb3pz3mdghyq7fc2vaa0a75kx"; + rev = "03dcc4abfe4658d1bfe4ffa7e3ca200e285728ac"; + sha256 = "13qg3wh0p61j1qfxr62q9b3qka3qvdfl1n7vfwaa1xfj144ng7s8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct"; @@ -22252,12 +22332,12 @@ flyspell-correct-helm = callPackage ({ fetchFromGitHub, fetchurl, flyspell-correct, helm, lib, melpaBuild }: melpaBuild { pname = "flyspell-correct-helm"; - version = "20160610.1051"; + version = "20160610.851"; src = fetchFromGitHub { owner = "d12frosted"; repo = "flyspell-correct"; - rev = "a48256bcb016d4c8d6b964a4a86ce7f0c0f342d9"; - sha256 = "0872kbgh6m7fc562w0yiragrh2zyb3pz3mdghyq7fc2vaa0a75kx"; + rev = "03dcc4abfe4658d1bfe4ffa7e3ca200e285728ac"; + sha256 = "13qg3wh0p61j1qfxr62q9b3qka3qvdfl1n7vfwaa1xfj144ng7s8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-helm"; @@ -22273,12 +22353,12 @@ flyspell-correct-ivy = callPackage ({ fetchFromGitHub, fetchurl, flyspell-correct, ivy, lib, melpaBuild }: melpaBuild { pname = "flyspell-correct-ivy"; - version = "20160610.1051"; + version = "20160610.851"; src = fetchFromGitHub { owner = "d12frosted"; repo = "flyspell-correct"; - rev = "a48256bcb016d4c8d6b964a4a86ce7f0c0f342d9"; - sha256 = "0872kbgh6m7fc562w0yiragrh2zyb3pz3mdghyq7fc2vaa0a75kx"; + rev = "03dcc4abfe4658d1bfe4ffa7e3ca200e285728ac"; + sha256 = "13qg3wh0p61j1qfxr62q9b3qka3qvdfl1n7vfwaa1xfj144ng7s8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-ivy"; @@ -22294,12 +22374,12 @@ flyspell-correct-popup = callPackage ({ fetchFromGitHub, fetchurl, flyspell-correct, lib, melpaBuild, popup }: melpaBuild { pname = "flyspell-correct-popup"; - version = "20160610.1051"; + version = "20160610.851"; src = fetchFromGitHub { owner = "d12frosted"; repo = "flyspell-correct"; - rev = "a48256bcb016d4c8d6b964a4a86ce7f0c0f342d9"; - sha256 = "0872kbgh6m7fc562w0yiragrh2zyb3pz3mdghyq7fc2vaa0a75kx"; + rev = "03dcc4abfe4658d1bfe4ffa7e3ca200e285728ac"; + sha256 = "13qg3wh0p61j1qfxr62q9b3qka3qvdfl1n7vfwaa1xfj144ng7s8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-popup"; @@ -22315,7 +22395,7 @@ flyspell-lazy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flyspell-lazy"; - version = "20141222.852"; + version = "20141222.652"; src = fetchFromGitHub { owner = "rolandwalker"; repo = "flyspell-lazy"; @@ -22336,7 +22416,7 @@ flyspell-popup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "flyspell-popup"; - version = "20150926.1003"; + version = "20150926.803"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "flyspell-popup"; @@ -22357,7 +22437,7 @@ fm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fm"; - version = "20130126.1818"; + version = "20130126.1618"; src = fetchFromGitHub { owner = "emacsmirror"; repo = "fm"; @@ -22378,7 +22458,7 @@ fm-bookmarks = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fm-bookmarks"; - version = "20151203.803"; + version = "20151203.603"; src = fetchFromGitHub { owner = "kuanyui"; repo = "fm-bookmarks.el"; @@ -22399,7 +22479,7 @@ focus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "focus"; - version = "20160131.1618"; + version = "20160131.1418"; src = fetchFromGitHub { owner = "larstvei"; repo = "Focus"; @@ -22420,7 +22500,7 @@ focus-autosave-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "focus-autosave-mode"; - version = "20160519.1616"; + version = "20160519.1416"; src = fetchFromGitHub { owner = "Vifon"; repo = "focus-autosave-mode.el"; @@ -22441,7 +22521,7 @@ foggy-night-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "foggy-night-theme"; - version = "20160209.908"; + version = "20160209.708"; src = fetchFromGitHub { owner = "mswift42"; repo = "foggy-night-theme"; @@ -22462,7 +22542,7 @@ fold-dwim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fold-dwim"; - version = "20140208.1037"; + version = "20140208.837"; src = fetchFromGitHub { owner = "emacsmirror"; repo = "fold-dwim"; @@ -22483,7 +22563,7 @@ fold-dwim-org = callPackage ({ fetchFromGitHub, fetchurl, fold-dwim, lib, melpaBuild }: melpaBuild { pname = "fold-dwim-org"; - version = "20131203.751"; + version = "20131203.551"; src = fetchFromGitHub { owner = "mattfidler"; repo = "fold-dwim-org"; @@ -22504,7 +22584,7 @@ fold-this = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fold-this"; - version = "20150601.542"; + version = "20150601.342"; src = fetchFromGitHub { owner = "magnars"; repo = "fold-this.el"; @@ -22525,7 +22605,7 @@ folding = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "folding"; - version = "20140401.203"; + version = "20140401.3"; src = fetchFromGitHub { owner = "jaalto"; repo = "project-emacs--folding-mode"; @@ -22545,7 +22625,7 @@ }) {}; font-lock-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "font-lock-plus"; - version = "20151231.1519"; + version = "20151231.1319"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/font-lock+.el"; sha256 = "04j9xybn9an3bm2p2aqmqnswxxg3gwq2mc96brkgxkr88h316d4q"; @@ -22564,7 +22644,7 @@ font-lock-studio = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "font-lock-studio"; - version = "20141201.1858"; + version = "20141201.1658"; src = fetchFromGitHub { owner = "Lindydancer"; repo = "font-lock-studio"; @@ -22585,7 +22665,7 @@ font-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, persistent-soft }: melpaBuild { pname = "font-utils"; - version = "20150806.1251"; + version = "20150806.1051"; src = fetchFromGitHub { owner = "rolandwalker"; repo = "font-utils"; @@ -22606,7 +22686,7 @@ fontawesome = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: melpaBuild { pname = "fontawesome"; - version = "20151202.830"; + version = "20151202.630"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-fontawesome"; @@ -22627,7 +22707,7 @@ forecast = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "forecast"; - version = "20160513.1359"; + version = "20160513.1159"; src = fetchFromGitHub { owner = "cadadr"; repo = "forecast.el"; @@ -22648,7 +22728,7 @@ foreign-regexp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "foreign-regexp"; - version = "20160318.1107"; + version = "20160318.907"; src = fetchFromGitHub { owner = "k-talo"; repo = "foreign-regexp.el"; @@ -22669,7 +22749,7 @@ foreman-mode = callPackage ({ dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "foreman-mode"; - version = "20160520.937"; + version = "20160520.737"; src = fetchFromGitHub { owner = "zweifisch"; repo = "foreman-mode"; @@ -22690,7 +22770,7 @@ forest-blue-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "forest-blue-theme"; - version = "20160627.342"; + version = "20160627.142"; src = fetchFromGitHub { owner = "olkinn"; repo = "forest-blue-emacs"; @@ -22711,7 +22791,7 @@ form-feed = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "form-feed"; - version = "20160102.1653"; + version = "20160102.1453"; src = fetchFromGitHub { owner = "wasamasa"; repo = "form-feed"; @@ -22732,7 +22812,7 @@ format-sql = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "format-sql"; - version = "20150422.833"; + version = "20150422.633"; src = fetchFromGitHub { owner = "paetzke"; repo = "format-sql.el"; @@ -22753,7 +22833,7 @@ fortpy = callPackage ({ auto-complete, epc, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip, python-environment }: melpaBuild { pname = "fortpy"; - version = "20150715.1532"; + version = "20150715.1332"; src = fetchFromGitHub { owner = "rosenbrockc"; repo = "fortpy-el"; @@ -22774,7 +22854,7 @@ fortune-cookie = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fortune-cookie"; - version = "20151111.35"; + version = "20151110.2235"; src = fetchFromGitHub { owner = "andschwa"; repo = "fortune-cookie"; @@ -22792,22 +22872,22 @@ license = lib.licenses.free; }; }) {}; - fountain-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + fountain-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fountain-mode"; - version = "20160703.504"; + version = "20160720.2346"; src = fetchFromGitHub { owner = "rnkn"; repo = "fountain-mode"; - rev = "12f61706711c18ccdbc7fbbc061fd29f702003f1"; - sha256 = "1kfv7wn50yzrfg3sn65xfy069g7kvbihhdjl8yspwdryvh9b3bnq"; + rev = "0707b4753fabdc07cbe04030b1559671d87c57f2"; + sha256 = "0r5zrcn0am7d2085v4f1s9a6xl8d0z3ckyy2sy9qmp8csz3s36md"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/913386ac8d5049d37154da3ab32bde408a226511/recipes/fountain-mode"; sha256 = "1i55gcjy8ycr1ww2fh1a2j0bchx1bsfs0zd6v4cv5zdgy7vw6840"; name = "fountain-mode"; }; - packageRequires = [ emacs s ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/fountain-mode"; license = lib.licenses.free; @@ -22816,7 +22896,7 @@ frame-cmds = callPackage ({ fetchurl, frame-fns, lib, melpaBuild }: melpaBuild { pname = "frame-cmds"; - version = "20160124.1026"; + version = "20160124.826"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/frame-cmds.el"; sha256 = "1867zmm3pyqz8p9ig44jf598z9jkyvbp04mfg6j6ys3hyqfkw942"; @@ -22834,7 +22914,7 @@ }) {}; frame-fns = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "frame-fns"; - version = "20151231.1522"; + version = "20151231.1322"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/frame-fns.el"; sha256 = "0lvlyxb62sgrm37hc21dn7qzlrq2yagiwpspa926q6dpzcsbam15"; @@ -22853,7 +22933,7 @@ frame-restore = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "frame-restore"; - version = "20140811.1609"; + version = "20140811.1409"; src = fetchFromGitHub { owner = "lunaryorn"; repo = "frame-restore.el"; @@ -22874,7 +22954,7 @@ frame-tag = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "frame-tag"; - version = "20151121.118"; + version = "20151120.2318"; src = fetchFromGitHub { owner = "liangzan"; repo = "frame-tag.el"; @@ -22894,7 +22974,7 @@ }) {}; framemove = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "framemove"; - version = "20130328.633"; + version = "20130328.433"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/framemove.el"; sha256 = "03ll68d0j0b55rfxymzcirdigkmxcy8556d0i67ghdzmcqfwily7"; @@ -22913,7 +22993,7 @@ framesize = callPackage ({ fetchFromGitHub, fetchurl, key-chord, lib, melpaBuild }: melpaBuild { pname = "framesize"; - version = "20131017.1632"; + version = "20131017.1432"; src = fetchFromGitHub { owner = "nicferrier"; repo = "emacs-framesize"; @@ -22934,12 +23014,12 @@ free-keys = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "free-keys"; - version = "20151202.522"; + version = "20160726.1350"; src = fetchFromGitHub { owner = "Fuco1"; repo = "free-keys"; - rev = "368820cb361161f10a2ae7a839ab758146fd222c"; - sha256 = "12rmwf7gm9ib2c99jangygh2yswy41vxlp90rg0hvlhdfmbqa8p0"; + rev = "edfd69dc369b2647447b7c28c7c1163b1ddf45b4"; + sha256 = "0xgifa7s9n882f9ymyyz9gc11xfbj3vfpnxiq1fqfm5hmwx9pwbc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55067e899ba618d4394ad9657322c92a667a0774/recipes/free-keys"; @@ -22955,7 +23035,7 @@ fringe-current-line = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fringe-current-line"; - version = "20140110.2211"; + version = "20140110.2011"; src = fetchFromGitHub { owner = "kyanagi"; repo = "fringe-current-line"; @@ -22976,7 +23056,7 @@ fringe-helper = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fringe-helper"; - version = "20140620.1609"; + version = "20140620.1409"; src = fetchFromGitHub { owner = "nschum"; repo = "fringe-helper.el"; @@ -22994,22 +23074,30 @@ license = lib.licenses.free; }; }) {}; - fsharp-mode = callPackage ({ company, company-quickhelp, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, s }: + fsharp-mode = callPackage ({ company, company-quickhelp, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, pos-tip, s }: melpaBuild { pname = "fsharp-mode"; - version = "20160427.1048"; + version = "20160719.315"; src = fetchFromGitHub { owner = "rneatherway"; repo = "emacs-fsharp-mode-bin"; - rev = "a557fbd55c51b66a6a6bcf7a1ea2afac8371f45d"; - sha256 = "1d28kdh96izj05mfknhgyd8954kl2abjgjlinmx1bsa9flb9vgpb"; + rev = "3ab9f2ec3d0b70545f3834d26dbdadf760648f6d"; + sha256 = "06znv94bbx97j50226b5x2q7vnjb6j57ljmaygj0cvy8linr5j8n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc45611e2b629d8bc5f74555368f964420b79541/recipes/fsharp-mode"; sha256 = "07pkj30cawh0diqhrp3jkshgsd0i3y34rdnjb4af8mr7dsbsxb6z"; name = "fsharp-mode"; }; - packageRequires = [ company company-quickhelp dash popup pos-tip s ]; + packageRequires = [ + company + company-quickhelp + dash + flycheck + popup + pos-tip + s + ]; meta = { homepage = "https://melpa.org/#/fsharp-mode"; license = lib.licenses.free; @@ -23018,12 +23106,12 @@ fstar-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fstar-mode"; - version = "20160701.509"; + version = "20160721.654"; src = fetchFromGitHub { owner = "FStarLang"; repo = "fstar-mode.el"; - rev = "3f7c9b5caa4c137b24d7c9b899890738ab4093eb"; - sha256 = "0pi7aim7spsdwa9spyncyl7wcf1bbpz3sr9z2cszywpiqjn2s2k5"; + rev = "096eb96f0873dc5f9c95e32f563c7d0ef2a2c426"; + sha256 = "0iwyys01d4sp1r62rfpwhnv7h3k6gyk7zp8qikfbnicxz5lxaf86"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1198ee309675c391c479ce39efcdca23f548d2a/recipes/fstar-mode"; @@ -23039,11 +23127,11 @@ fuel = callPackage ({ cl-lib ? null, emacs, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fuel"; - version = "20160702.851"; + version = "20160713.834"; src = fetchgit { url = "git://factorcode.org/git/factor.git"; - rev = "5345e32b84ed1f84af0475c6ff2d693658e8029d"; - sha256 = "12wvx6m00xgmw8xjildnk3c6nm1pw978czdhws8lqwc1ls7kcwp1"; + rev = "4f74f5bd698b253a63fa0ce626f4b86405a9714e"; + sha256 = "02wis1hv3rk1a8f8bbz317j7ip7yprr364nfdjbqzx9fa3rvv0qh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel"; @@ -23059,7 +23147,7 @@ full-ack = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "full-ack"; - version = "20140223.1132"; + version = "20140223.932"; src = fetchFromGitHub { owner = "nschum"; repo = "full-ack"; @@ -23080,7 +23168,7 @@ fullframe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fullframe"; - version = "20160504.949"; + version = "20160504.749"; src = fetchFromGitHub { owner = "tomterl"; repo = "fullframe"; @@ -23101,7 +23189,7 @@ function-args = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "function-args"; - version = "20160628.858"; + version = "20160628.658"; src = fetchFromGitHub { owner = "abo-abo"; repo = "function-args"; @@ -23122,7 +23210,7 @@ furl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "furl"; - version = "20150508.2216"; + version = "20150508.2016"; src = fetchFromGitHub { owner = "nex3"; repo = "furl-el"; @@ -23143,7 +23231,7 @@ fuzzy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fuzzy"; - version = "20150729.2237"; + version = "20150729.2037"; src = fetchFromGitHub { owner = "auto-complete"; repo = "fuzzy-el"; @@ -23163,7 +23251,7 @@ }) {}; fuzzy-format = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "fuzzy-format"; - version = "20130824.700"; + version = "20130824.500"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/fuzzy-format.el"; sha256 = "1iv0x1cb12kknnxyq2gca7m3c3rg9s4cxz397sazkh1csrn0b2i7"; @@ -23181,7 +23269,7 @@ }) {}; fuzzy-match = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "fuzzy-match"; - version = "20151231.1523"; + version = "20151231.1323"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/fuzzy-match.el"; sha256 = "1q3gbv9xp2jxrf9vfarjqk9k805xc9z72zbaw7aqdxrj1bafxwnz"; @@ -23200,7 +23288,7 @@ fvwm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fvwm-mode"; - version = "20160411.638"; + version = "20160411.438"; src = fetchFromGitHub { owner = "theBlackDragon"; repo = "fvwm-mode"; @@ -23221,7 +23309,7 @@ fwb-cmds = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fwb-cmds"; - version = "20160523.735"; + version = "20160523.535"; src = fetchFromGitHub { owner = "tarsius"; repo = "fwb-cmds"; @@ -23242,7 +23330,7 @@ fxrd-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "fxrd-mode"; - version = "20160503.1545"; + version = "20160503.1345"; src = fetchFromGitHub { owner = "msherry"; repo = "fxrd-mode"; @@ -23263,7 +23351,7 @@ fyure = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fyure"; - version = "20130216.714"; + version = "20130216.514"; src = fetchFromGitHub { owner = "mooz"; repo = "fyure"; @@ -23284,12 +23372,12 @@ fzf = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fzf"; - version = "20160614.2027"; + version = "20160714.557"; src = fetchFromGitHub { owner = "bling"; repo = "fzf.el"; - rev = "e1322aa9e8980f0c6f69933cbb61678f0e7ac4f9"; - sha256 = "0zrb3qscdyxxgz458f9pj1rl1hi8k0adc8c2s2nlxv6a11p5l53w"; + rev = "022798e6ed0d03fcb896635d7322f0b79f6463ff"; + sha256 = "1vc0lh6cr3d7fyg7w400750glk3jfas0y58qxh2wdsnfj8qvarc3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1671e17c99ef1932c6a2e83fc4fa2e4eb6674bc8/recipes/fzf"; @@ -23305,7 +23393,7 @@ gams-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gams-mode"; - version = "20160320.428"; + version = "20160320.228"; src = fetchFromGitHub { owner = "ShiroTakeda"; repo = "gams-mode"; @@ -23326,7 +23414,7 @@ gandalf-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gandalf-theme"; - version = "20130809.447"; + version = "20130809.247"; src = fetchFromGitHub { owner = "ptrv"; repo = "gandalf-theme-emacs"; @@ -23346,7 +23434,7 @@ }) {}; gap-mode = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gap-mode"; - version = "20160204.936"; + version = "20160204.736"; src = fetchhg { url = "https://bitbucket.com/gvol/gap-mode"; rev = "1de32f2ff384"; @@ -23366,7 +23454,7 @@ gather = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gather"; - version = "20141230.738"; + version = "20141230.538"; src = fetchFromGitHub { owner = "mhayashi1120"; repo = "Emacs-gather"; @@ -23387,12 +23475,12 @@ geben = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "geben"; - version = "20160620.134"; + version = "20160725.634"; src = fetchFromGitHub { owner = "ahungry"; repo = "geben"; - rev = "75d15e7d6dfbe4583bc2c4a3c363b2b9f2534242"; - sha256 = "1ql28cpnlakpnysb8nlphyiz46ahx7w9bs2fghnfvhaz33wjcr9y"; + rev = "90e00f87125bd09b20f7f9bc285e9895f7094f1b"; + sha256 = "1ycn1khpf44bmrv2ka0vvsybcfsa43vbq8g5r58qflfsmyr42mwz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f8648609e160f7dcefe4a963e8b00475f2fff78/recipes/geben"; @@ -23408,7 +23496,7 @@ geben-helm-projectile = callPackage ({ emacs, fetchFromGitHub, fetchurl, geben, helm-projectile, lib, melpaBuild }: melpaBuild { pname = "geben-helm-projectile"; - version = "20160610.1959"; + version = "20160610.1759"; src = fetchFromGitHub { owner = "ahungry"; repo = "geben-helm-projectile"; @@ -23429,12 +23517,12 @@ geeknote = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "geeknote"; - version = "20150223.1015"; + version = "20160717.549"; src = fetchFromGitHub { owner = "avendael"; repo = "emacs-geeknote"; - rev = "e0d25cddc35e9a0f5986a04df2c3d11f78dd3ad9"; - sha256 = "14v5gm931dcsfflhsvijr4ihx7cs6jymvnjzph3arvhvqwyqhwgq"; + rev = "8ed607c76864afcc9c338972ab093caf4501cbf8"; + sha256 = "1dadsyvkzf0rg6immjdjkb0k7iaqh3hm1w9qhap94j54j7v75w2q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/65c120f52e900b393b5ceefeca21b0670ca4a4cc/recipes/geeknote"; @@ -23450,12 +23538,12 @@ geiser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "geiser"; - version = "20160617.1154"; + version = "20160617.954"; src = fetchFromGitHub { owner = "jaor"; repo = "geiser"; - rev = "8c8583991007aa3a1831310be5d637104a918a43"; - sha256 = "189j5hzh3ydp31bnazmj0flvx03c3h20gb18scin71j8rkaim0mk"; + rev = "208056444fe8a16947f0f641a3a72459fdf24eef"; + sha256 = "0g4r1anxkmihzkkbc1ss3rlqzqiwgqz8zl966zfikzhk79d6v7im"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0fe32d24cedd5307b4cccfb08a7095d81d639a0/recipes/geiser"; @@ -23471,7 +23559,7 @@ general = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "general"; - version = "20160621.1458"; + version = "20160621.1258"; src = fetchFromGitHub { owner = "noctuid"; repo = "general.el"; @@ -23492,12 +23580,12 @@ general-close = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "general-close"; - version = "20160617.1301"; + version = "20160721.1208"; src = fetchFromGitHub { owner = "emacs-berlin"; repo = "general-close"; - rev = "6d146e524db9bd4cfe5182595b94bc0b4c79e73b"; - sha256 = "115basil5bwlqvdrvz2s43slzhdnq3v8b3rqs1wx4czv4wl6ha2b"; + rev = "a8c14815e828d5efb110a1b49dea646c5ceeccf5"; + sha256 = "17c27vc52rd69sxwlc35ap2mphp13mb3wg096pvn8rwijdyiph2a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/641a48f5148df2a19476c9b3302934a604f5c283/recipes/general-close"; @@ -23513,7 +23601,7 @@ genrnc = callPackage ({ concurrent, deferred, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }: melpaBuild { pname = "genrnc"; - version = "20140612.737"; + version = "20140612.537"; src = fetchFromGitHub { owner = "aki2o"; repo = "emacs-genrnc"; @@ -23534,7 +23622,7 @@ german-holidays = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "german-holidays"; - version = "20151102.943"; + version = "20151102.743"; src = fetchFromGitHub { owner = "rudolfochrist"; repo = "german-holidays"; @@ -23555,7 +23643,7 @@ gerrit-download = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "gerrit-download"; - version = "20150714.908"; + version = "20150714.708"; src = fetchFromGitHub { owner = "chmouel"; repo = "gerrit-download.el"; @@ -23576,7 +23664,7 @@ ggo-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ggo-mode"; - version = "20130524.643"; + version = "20130524.443"; src = fetchFromGitHub { owner = "mkjunker"; repo = "ggo-mode"; @@ -23597,7 +23685,7 @@ ggtags = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ggtags"; - version = "20160617.2040"; + version = "20160617.1840"; src = fetchFromGitHub { owner = "leoliu"; repo = "ggtags"; @@ -23615,22 +23703,22 @@ license = lib.licenses.free; }; }) {}; - gh = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, logito, melpaBuild, pcache }: + gh = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, logito, marshal, melpaBuild, pcache, s }: melpaBuild { pname = "gh"; - version = "20160626.1549"; + version = "20160725.1853"; src = fetchFromGitHub { owner = "sigma"; repo = "gh.el"; - rev = "20eb3a57bc32e277eb37652f7bc8da600a007154"; - sha256 = "1h9b7b3zi9c34fd6612sh1a328wvscf88368j8yy4hc7w1nwsbb0"; + rev = "5ceeaa23ee14e31715c780e784afd0e3e5672790"; + sha256 = "049fpnz5jz0ajxzlwqdwh3xcwj51c3saj114wl9dxvi890spzrm4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/gh"; sha256 = "1141l8pas3m755yzby4zsan7p81nbnlch3kj1zh69qzjpgqp30c0"; name = "gh"; }; - packageRequires = [ emacs logito pcache ]; + packageRequires = [ dash emacs logito marshal pcache s ]; meta = { homepage = "https://melpa.org/#/gh"; license = lib.licenses.free; @@ -23639,7 +23727,7 @@ gh-md = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gh-md"; - version = "20151207.1140"; + version = "20151207.940"; src = fetchFromGitHub { owner = "emacs-pe"; repo = "gh-md.el"; @@ -23660,12 +23748,12 @@ ghc = callPackage ({ fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "ghc"; - version = "20160108.901"; + version = "20160710.1443"; src = fetchFromGitHub { owner = "DanielG"; repo = "ghc-mod"; - rev = "e495c55a8db0b0940df98e9fea03c33b25de0e26"; - sha256 = "0zm8x7bclh5sdfgkj6jv6id2mjfvb8bb4iy1kmk83am076bj5ysh"; + rev = "c0732ad9cb546d7811f18d8df8fe917d32c9f951"; + sha256 = "16lf72bmdk9wgai67rn5ca6ncszx6p6pnzbrn2k7yd2b3q7kilhi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ghc"; @@ -23681,7 +23769,7 @@ ghc-imported-from = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ghc-imported-from"; - version = "20141124.1332"; + version = "20141124.1132"; src = fetchFromGitHub { owner = "david-christiansen"; repo = "ghc-imported-from-el"; @@ -23702,7 +23790,7 @@ ghci-completion = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ghci-completion"; - version = "20151125.657"; + version = "20151125.457"; src = fetchFromGitHub { owner = "manzyuk"; repo = "ghci-completion"; @@ -23723,7 +23811,7 @@ gherkin-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gherkin-mode"; - version = "20140107.1004"; + version = "20140107.804"; src = fetchFromGitHub { owner = "candera"; repo = "gherkin-mode"; @@ -23744,7 +23832,7 @@ ghost-blog = callPackage ({ fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }: melpaBuild { pname = "ghost-blog"; - version = "20160526.457"; + version = "20160526.257"; src = fetchFromGitHub { owner = "javaguirre"; repo = "ghost-blog-emacs"; @@ -23765,7 +23853,7 @@ ghq = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ghq"; - version = "20151130.318"; + version = "20151130.118"; src = fetchFromGitHub { owner = "rcoedo"; repo = "emacs-ghq"; @@ -23786,7 +23874,7 @@ gildas-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, polymode }: melpaBuild { pname = "gildas-mode"; - version = "20150919.1701"; + version = "20150919.1501"; src = fetchFromGitHub { owner = "smaret"; repo = "gildas-mode"; @@ -23807,12 +23895,12 @@ gist = callPackage ({ emacs, fetchFromGitHub, fetchurl, gh, lib, melpaBuild }: melpaBuild { pname = "gist"; - version = "20160118.1856"; + version = "20160118.1656"; src = fetchFromGitHub { owner = "defunkt"; repo = "gist.el"; - rev = "88d0e5be77fefad9fe1413505a80bdac7a9e7361"; - sha256 = "18433gjhra0gqrwnxssd3njpxbvqhh64bds9rym1vq9l7w09z024"; + rev = "9a5c382327eb9f1e11e04a1bdeeebd215ea5fd54"; + sha256 = "0gawx1fcfzvwql6awxy6vslvmmxlmggg3vlby8lqka9ywh7dbf4b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/gist"; @@ -23828,7 +23916,7 @@ git = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "git"; - version = "20140128.441"; + version = "20140128.241"; src = fetchFromGitHub { owner = "rejeep"; repo = "git.el"; @@ -23849,7 +23937,7 @@ git-annex = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-annex"; - version = "20160215.1311"; + version = "20160215.1111"; src = fetchFromGitHub { owner = "jwiegley"; repo = "git-annex-el"; @@ -23870,7 +23958,7 @@ git-auto-commit-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-auto-commit-mode"; - version = "20150404.951"; + version = "20150404.751"; src = fetchFromGitHub { owner = "ryuslash"; repo = "git-auto-commit-mode"; @@ -23891,7 +23979,7 @@ git-blame = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-blame"; - version = "20110509.1126"; + version = "20110509.926"; src = fetchFromGitHub { owner = "tsgates"; repo = "git-emacs"; @@ -23912,7 +24000,7 @@ git-command = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, term-run, with-editor }: melpaBuild { pname = "git-command"; - version = "20160111.703"; + version = "20160111.503"; src = fetchFromGitHub { owner = "10sr"; repo = "git-command-el"; @@ -23933,12 +24021,12 @@ git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: melpaBuild { pname = "git-commit"; - version = "20160519.1150"; + version = "20160519.950"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "5f57495f65fea169282b23233f87c4af07a60e4c"; - sha256 = "0x5k1q4vajpb9658jl0ikjm94pq5gnk9y55px72kdmh9hm8nx5iq"; + rev = "5834d0dbd471af0ce6537b4fc020fac05701267b"; + sha256 = "0nmpkh9nw3zzaw6ya6inr9zljdx5qjkkivmh2dlyird6sppdsqxy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -23954,7 +24042,7 @@ git-commit-insert-issue = callPackage ({ fetchFromGitLab, fetchurl, github-issues, helm, lib, melpaBuild, projectile, s }: melpaBuild { pname = "git-commit-insert-issue"; - version = "20160122.949"; + version = "20160122.749"; src = fetchFromGitLab { owner = "emacs-stuff"; repo = "git-commit-insert-issue"; @@ -23975,7 +24063,7 @@ git-dwim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-dwim"; - version = "20100718.1636"; + version = "20100718.1436"; src = fetchFromGitHub { owner = "rubikitch"; repo = "emacs-git-dwim"; @@ -23996,12 +24084,12 @@ git-gutter = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-gutter"; - version = "20160702.554"; + version = "20160702.354"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-git-gutter"; - rev = "1a4ee2c1971b2f17ede0298326a49593c4a35d27"; - sha256 = "0k70afd98qsw0wm75gw584y1nm9hfpflqb85dg8s40isjxcrmbil"; + rev = "46785711d9be4ea718bcf738e49e6b6bea805342"; + sha256 = "084l0p6pny7s6p1z9i4w9zfr7f6lfwgs4vlfyd58rws4dvzzwx6x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/git-gutter"; @@ -24017,7 +24105,7 @@ git-gutter-fringe = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, fringe-helper, git-gutter, lib, melpaBuild }: melpaBuild { pname = "git-gutter-fringe"; - version = "20160520.1856"; + version = "20160520.1656"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-git-gutter-fringe"; @@ -24038,7 +24126,7 @@ git-gutter-fringe-plus = callPackage ({ fetchFromGitHub, fetchurl, fringe-helper, git-gutter-plus, lib, melpaBuild }: melpaBuild { pname = "git-gutter-fringe-plus"; - version = "20140729.603"; + version = "20140729.403"; src = fetchFromGitHub { owner = "nonsequitur"; repo = "git-gutter-fringe-plus"; @@ -24059,7 +24147,7 @@ git-gutter-plus = callPackage ({ dash, fetchFromGitHub, fetchurl, git-commit, lib, melpaBuild }: melpaBuild { pname = "git-gutter-plus"; - version = "20151204.1123"; + version = "20151204.923"; src = fetchFromGitHub { owner = "nonsequitur"; repo = "git-gutter-plus"; @@ -24080,7 +24168,7 @@ git-lens = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-lens"; - version = "20160204.37"; + version = "20160203.2237"; src = fetchFromGitHub { owner = "pidu"; repo = "git-lens"; @@ -24101,7 +24189,7 @@ git-link = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-link"; - version = "20160401.2050"; + version = "20160401.1850"; src = fetchFromGitHub { owner = "sshaw"; repo = "git-link"; @@ -24122,7 +24210,7 @@ git-messenger = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "git-messenger"; - version = "20160602.910"; + version = "20160602.710"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-git-messenger"; @@ -24143,7 +24231,7 @@ git-ps1-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-ps1-mode"; - version = "20151228.302"; + version = "20151228.102"; src = fetchFromGitHub { owner = "10sr"; repo = "git-ps1-mode-el"; @@ -24164,7 +24252,7 @@ git-timemachine = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-timemachine"; - version = "20160607.1428"; + version = "20160607.1228"; src = fetchFromGitHub { owner = "pidu"; repo = "git-timemachine"; @@ -24185,7 +24273,7 @@ git-wip-timemachine = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "git-wip-timemachine"; - version = "20150408.506"; + version = "20150408.306"; src = fetchFromGitHub { owner = "itsjeyd"; repo = "git-wip-timemachine"; @@ -24206,12 +24294,12 @@ gitattributes-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gitattributes-mode"; - version = "20160319.502"; + version = "20160319.302"; src = fetchFromGitHub { owner = "magit"; repo = "git-modes"; - rev = "7ccc5de55fc370c328d7ec08de559e351b1ac94c"; - sha256 = "0ksqfr0l415ynhxpqpcb84bk2bapvczwnpikp45kmfqq91p61xfc"; + rev = "9da8cac8ea6cc07626565b5ede9aedae133b4d6a"; + sha256 = "0jzl1bpnf8rsjwcp8aiwsi8bbs1fd2sp5mzzydvi7hzjvyahvyd0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b4e2ddd2a80875afc0fc654052e6cbff2f3777f/recipes/gitattributes-mode"; @@ -24227,7 +24315,7 @@ gitconfig = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gitconfig"; - version = "20130718.435"; + version = "20130718.235"; src = fetchFromGitHub { owner = "tonini"; repo = "gitconfig.el"; @@ -24248,12 +24336,12 @@ gitconfig-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gitconfig-mode"; - version = "20160319.502"; + version = "20160710.1913"; src = fetchFromGitHub { owner = "magit"; repo = "git-modes"; - rev = "7ccc5de55fc370c328d7ec08de559e351b1ac94c"; - sha256 = "0ksqfr0l415ynhxpqpcb84bk2bapvczwnpikp45kmfqq91p61xfc"; + rev = "9da8cac8ea6cc07626565b5ede9aedae133b4d6a"; + sha256 = "0jzl1bpnf8rsjwcp8aiwsi8bbs1fd2sp5mzzydvi7hzjvyahvyd0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/44a37f59b87f59a587f6681e7aadfabf137c98d7/recipes/gitconfig-mode"; @@ -24269,7 +24357,7 @@ github-browse-file = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "github-browse-file"; - version = "20160205.827"; + version = "20160205.627"; src = fetchFromGitHub { owner = "osener"; repo = "github-browse-file"; @@ -24290,7 +24378,7 @@ github-clone = callPackage ({ emacs, fetchFromGitHub, fetchurl, gh, lib, magit, melpaBuild }: melpaBuild { pname = "github-clone"; - version = "20160622.2210"; + version = "20160622.2010"; src = fetchFromGitHub { owner = "dgtized"; repo = "github-clone.el"; @@ -24311,7 +24399,7 @@ github-issues = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "github-issues"; - version = "20160616.1341"; + version = "20160616.1141"; src = fetchFromGitHub { owner = "inkel"; repo = "github-issues.el"; @@ -24332,7 +24420,7 @@ github-notifier = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "github-notifier"; - version = "20160702.2312"; + version = "20160702.2112"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "github-notifier.el"; @@ -24353,12 +24441,12 @@ github-search = callPackage ({ fetchFromGitHub, fetchurl, gh, lib, magit, melpaBuild }: melpaBuild { pname = "github-search"; - version = "20160621.1856"; + version = "20160706.1903"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "github-search"; - rev = "67b1ae88af4d061334e63a9336ca2ced322e172a"; - sha256 = "1zx4hb88yf3j1h75j35qs69nmw58jvbiqz9k5kkgwrnadj1qkjvd"; + rev = "d26fa59988211a17e612c8bd8223f067ee19fdc5"; + sha256 = "0cz2g40l88d5m5hcb14mq2qy66sk37xj9j7c6baqzzv1l62vn26g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/733a808400858513137e0e3d7d38b5b25e8ddc5a/recipes/github-search"; @@ -24374,12 +24462,12 @@ gitignore-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gitignore-mode"; - version = "20160319.502"; + version = "20160319.302"; src = fetchFromGitHub { owner = "magit"; repo = "git-modes"; - rev = "7ccc5de55fc370c328d7ec08de559e351b1ac94c"; - sha256 = "0ksqfr0l415ynhxpqpcb84bk2bapvczwnpikp45kmfqq91p61xfc"; + rev = "9da8cac8ea6cc07626565b5ede9aedae133b4d6a"; + sha256 = "0jzl1bpnf8rsjwcp8aiwsi8bbs1fd2sp5mzzydvi7hzjvyahvyd0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/44a37f59b87f59a587f6681e7aadfabf137c98d7/recipes/gitignore-mode"; @@ -24395,7 +24483,7 @@ gitlab = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, request, s }: melpaBuild { pname = "gitlab"; - version = "20160519.503"; + version = "20160519.303"; src = fetchFromGitHub { owner = "nlamirault"; repo = "emacs-gitlab"; @@ -24416,7 +24504,7 @@ gitolite-clone = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, s }: melpaBuild { pname = "gitolite-clone"; - version = "20160609.1855"; + version = "20160609.1655"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "gitolite-clone"; @@ -24437,7 +24525,7 @@ gitty = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gitty"; - version = "20151121.148"; + version = "20151120.2348"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "gitty"; @@ -24458,7 +24546,7 @@ glsl-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "glsl-mode"; - version = "20160209.1033"; + version = "20160209.833"; src = fetchFromGitHub { owner = "jimhourihan"; repo = "glsl-mode"; @@ -24479,7 +24567,7 @@ gmail-message-mode = callPackage ({ fetchFromGitHub, fetchurl, ham-mode, lib, melpaBuild }: melpaBuild { pname = "gmail-message-mode"; - version = "20160627.1347"; + version = "20160627.1147"; src = fetchFromGitHub { owner = "Malabarba"; repo = "gmail-mode"; @@ -24500,7 +24588,7 @@ gmail2bbdb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gmail2bbdb"; - version = "20150909.2039"; + version = "20150909.1839"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "gmail2bbdb"; @@ -24521,7 +24609,7 @@ gmpl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gmpl-mode"; - version = "20151116.1349"; + version = "20151116.1149"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "gmpl-mode"; @@ -24542,7 +24630,7 @@ gnome-calendar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gnome-calendar"; - version = "20140112.559"; + version = "20140112.359"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "gnome-calendar.el"; @@ -24563,7 +24651,7 @@ gnomenm = callPackage ({ dash, fetchFromGitHub, fetchurl, kv, lib, melpaBuild, s }: melpaBuild { pname = "gnomenm"; - version = "20150316.1418"; + version = "20150316.1218"; src = fetchFromGitHub { owner = "nicferrier"; repo = "emacs-nm"; @@ -24584,7 +24672,7 @@ gntp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gntp"; - version = "20141024.2150"; + version = "20141024.1950"; src = fetchFromGitHub { owner = "tekai"; repo = "gntp.el"; @@ -24605,7 +24693,7 @@ gnu-apl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gnu-apl-mode"; - version = "20160621.2308"; + version = "20160621.2108"; src = fetchFromGitHub { owner = "lokedhs"; repo = "gnu-apl-mode"; @@ -24626,7 +24714,7 @@ gnuplot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gnuplot"; - version = "20141231.1537"; + version = "20141231.1337"; src = fetchFromGitHub { owner = "bruceravel"; repo = "gnuplot-mode"; @@ -24647,7 +24735,7 @@ gnuplot-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gnuplot-mode"; - version = "20151123.139"; + version = "20151122.2339"; src = fetchFromGitHub { owner = "mkmcc"; repo = "gnuplot-mode"; @@ -24668,7 +24756,7 @@ gnus-alias = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gnus-alias"; - version = "20150315.1942"; + version = "20150315.1742"; src = fetchFromGitHub { owner = "hexmode"; repo = "gnus-alias"; @@ -24689,7 +24777,7 @@ gnus-desktop-notify = callPackage ({ fetchFromGitHub, fetchurl, gnus ? null, lib, melpaBuild }: melpaBuild { pname = "gnus-desktop-notify"; - version = "20160210.447"; + version = "20160210.247"; src = fetchFromGitHub { owner = "wavexx"; repo = "gnus-desktop-notify.el"; @@ -24709,7 +24797,7 @@ }) {}; gnus-spotlight = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "gnus-spotlight"; - version = "20130901.935"; + version = "20130901.735"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/gnus-spotlight.el"; sha256 = "1r6bck1hsvk39ccri1h128jj8zd0fh9bsrlp8ijb0v9f6x3cysw4"; @@ -24728,12 +24816,12 @@ gnus-summary-ext = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gnus-summary-ext"; - version = "20160606.619"; + version = "20160704.1120"; src = fetchFromGitHub { owner = "vapniks"; repo = "gnus-summary-ext"; - rev = "39acdfbab230196a84250243c3a346abfdf62fe6"; - sha256 = "0ajbj7zc9b5wamsb8bp8lmphz7xv95ix0vrr06viakf8j1kndgy9"; + rev = "2298b0eca887a9df1e2d7c61d92176bb175ea482"; + sha256 = "1df85xwrr9wciwa83m2qfkfcbi1p623pdhqxm56005x4rmxg0rqr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5ca4a905b5f81991074c7d3e41d4422c7e6713d5/recipes/gnus-summary-ext"; @@ -24749,7 +24837,7 @@ gnus-x-gm-raw = callPackage ({ fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }: melpaBuild { pname = "gnus-x-gm-raw"; - version = "20140610.231"; + version = "20140610.31"; src = fetchFromGitHub { owner = "aki2o"; repo = "gnus-x-gm-raw"; @@ -24770,7 +24858,7 @@ go = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "go"; - version = "20160430.1939"; + version = "20160430.1739"; src = fetchFromGitHub { owner = "eschulte"; repo = "el-go"; @@ -24791,12 +24879,12 @@ go-autocomplete = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "go-autocomplete"; - version = "20150903.2140"; + version = "20150903.1940"; src = fetchFromGitHub { owner = "nsf"; repo = "gocode"; - rev = "f535dc686130fcc7b942c504ce5903222a205ca3"; - sha256 = "0d9xxrzd9vlfx6wpi48sypqi1czld0nc2bd39ac7zv115qv23nfh"; + rev = "3e1f8b46c1200ebec1336008838c6140586d059e"; + sha256 = "1c51ym21m2mrs8zhj7nzbbc7cckqj63jf1xx2a6x6zjh0g5bq8zj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/go-autocomplete"; @@ -24812,7 +24900,7 @@ go-complete = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: melpaBuild { pname = "go-complete"; - version = "20151015.428"; + version = "20151015.228"; src = fetchFromGitHub { owner = "vibhavp"; repo = "go-complete"; @@ -24833,7 +24921,7 @@ go-direx = callPackage ({ cl-lib ? null, direx, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "go-direx"; - version = "20150315.2043"; + version = "20150315.1843"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-go-direx"; @@ -24854,7 +24942,7 @@ go-dlv = callPackage ({ fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: melpaBuild { pname = "go-dlv"; - version = "20160517.1546"; + version = "20160517.1346"; src = fetchFromGitHub { owner = "benma"; repo = "go-dlv.el"; @@ -24875,12 +24963,12 @@ go-eldoc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: melpaBuild { pname = "go-eldoc"; - version = "20160307.816"; + version = "20160307.616"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-go-eldoc"; - rev = "ebf17e486bb64af494278f851f674303c954432c"; - sha256 = "1n5fnlfq9cy9rbn2hizqqsy0iryw5g2blaa7nd75ya03gxm10p8j"; + rev = "6b28222429158f11988358f143da3eac7d0d48fb"; + sha256 = "13r0m5ghqvpgkq6yxsqdx4g64s29qv9hn2cfcxk7wza7bxz1p9nk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6ce1190db06cc214746215dd27648eded5fe5140/recipes/go-eldoc"; @@ -24896,12 +24984,12 @@ go-errcheck = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "go-errcheck"; - version = "20150828.1335"; + version = "20160722.1743"; src = fetchFromGitHub { owner = "dominikh"; repo = "go-errcheck.el"; - rev = "1b0cd6af048a8b2074ace14ab51fb6c987beb430"; - sha256 = "1fm6xd3vsi8mqh0idddjpfxlsmz1ljmjppw3qkxl1vr0qz3598k3"; + rev = "9db21eccecedc2490793f176246094167164af31"; + sha256 = "1ngzgkmcbk6qa3p97hch75k446h15515arsdfv7mqb4m5va6429h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c874f608a55cafcc6e57ca2c80bdae6b1c2e47e9/recipes/go-errcheck"; @@ -24917,12 +25005,12 @@ go-gopath = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "go-gopath"; - version = "20160311.248"; + version = "20160705.334"; src = fetchFromGitHub { owner = "iced"; repo = "go-gopath"; - rev = "573bcad96a8c13ed996196a395b4da1e84ed0337"; - sha256 = "1hfyxf07m73jf8zca8dna3w828ypvx8a3p70f8nfr5mijy4q3i4c"; + rev = "5172fc53f21edbf9347d5ee7d1d745da1ec88a15"; + sha256 = "0gqb3k33y42gchc89rw3k1pvb7ai9ka50ljfd4avk31fdpr4dln5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1ca8d10b10b015c5bdafe1dbc8e53eb4c0d26d9c/recipes/go-gopath"; @@ -24938,11 +25026,11 @@ go-guru = callPackage ({ cl-lib ? null, fetchgit, fetchurl, go-mode, lib, melpaBuild }: melpaBuild { pname = "go-guru"; - version = "20160428.921"; + version = "20160715.854"; src = fetchgit { url = "https://go.googlesource.com/tools"; - rev = "527b253f588776e5f72a0a0d1e93195cd3f82707"; - sha256 = "0qjiwqksf31rxwpibm6a3644yln5gbzfqhdyky41r5bh7fv9wrlq"; + rev = "053ddb97bfa3b2e3021b6eb07f873233a62b2abb"; + sha256 = "103x3qfv4djcxn9nwzic9d5bx0cildjcpsl633xkara1khxjjmfi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/816a2511c54e451313c7ac9433d0860f95e68da6/recipes/go-guru"; @@ -24958,12 +25046,12 @@ go-impl = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: melpaBuild { pname = "go-impl"; - version = "20160626.356"; + version = "20160626.156"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-go-impl"; - rev = "d4cd57e5d1769ffe3a8078572f0be73737184099"; - sha256 = "059y2gkvvjhjbaw31zlylr0zmbafcjif01zjq13hvvghjqd6r89b"; + rev = "55c6215c009458c8bc36e344c2b3ae48536e8de4"; + sha256 = "168kcz1f0m6dxi0hj2jwl1299469zy7mrri5i5ym2hzc85rhgazp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aa1a0845cc1a6970018b397d13394aaa8147e5d0/recipes/go-impl"; @@ -24979,12 +25067,12 @@ go-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "go-mode"; - version = "20160512.310"; + version = "20160715.205"; src = fetchFromGitHub { owner = "dominikh"; repo = "go-mode.el"; - rev = "9d94107fae1b1137fb46f8cd7efc7e28f3abf2cb"; - sha256 = "0g0vjm125wmw5nd38r3d7gc2h4pg3a9yskcbk1mzg9vf6gbhr0hx"; + rev = "737611ee2f8ffd6ae573e37cc04c4ad4abe7697d"; + sha256 = "0wljlakm6gjgjrvinpi7vgs1n08xj87cvqq149gzzjwa9dq2gk15"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8a9d94efc1a0cedaaa0a1acd1227b2530efefca2/recipes/go-mode"; @@ -25000,7 +25088,7 @@ go-playground = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, gotest, lib, melpaBuild }: melpaBuild { pname = "go-playground"; - version = "20160426.1428"; + version = "20160426.1228"; src = fetchFromGitHub { owner = "grafov"; repo = "go-playground"; @@ -25021,7 +25109,7 @@ go-playground-cli = callPackage ({ cl-lib ? null, deferred, emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, names, request, s }: melpaBuild { pname = "go-playground-cli"; - version = "20160503.414"; + version = "20160503.214"; src = fetchFromGitHub { owner = "kosh04"; repo = "emacs-go-playground"; @@ -25042,7 +25130,7 @@ go-projectile = callPackage ({ fetchFromGitHub, fetchurl, go-eldoc, go-guru, go-mode, go-rename, lib, melpaBuild, projectile }: melpaBuild { pname = "go-projectile"; - version = "20160418.1817"; + version = "20160418.1617"; src = fetchFromGitHub { owner = "dougm"; repo = "go-projectile"; @@ -25063,11 +25151,11 @@ go-rename = callPackage ({ fetchgit, fetchurl, go-mode, lib, melpaBuild }: melpaBuild { pname = "go-rename"; - version = "20160307.944"; + version = "20160307.744"; src = fetchgit { url = "https://go.googlesource.com/tools"; - rev = "527b253f588776e5f72a0a0d1e93195cd3f82707"; - sha256 = "0qjiwqksf31rxwpibm6a3644yln5gbzfqhdyky41r5bh7fv9wrlq"; + rev = "053ddb97bfa3b2e3021b6eb07f873233a62b2abb"; + sha256 = "103x3qfv4djcxn9nwzic9d5bx0cildjcpsl633xkara1khxjjmfi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/421911dd75eec0f857295b76d310b8282053b57f/recipes/go-rename"; @@ -25083,7 +25171,7 @@ go-scratch = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: melpaBuild { pname = "go-scratch"; - version = "20150809.2340"; + version = "20150809.2140"; src = fetchFromGitHub { owner = "shosti"; repo = "go-scratch.el"; @@ -25104,7 +25192,7 @@ go-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "go-snippets"; - version = "20151122.57"; + version = "20151121.2257"; src = fetchFromGitHub { owner = "toumorokoshi"; repo = "go-snippets"; @@ -25125,7 +25213,7 @@ go-stacktracer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "go-stacktracer"; - version = "20150430.1642"; + version = "20150430.1442"; src = fetchFromGitHub { owner = "samertm"; repo = "go-stacktracer.el"; @@ -25146,7 +25234,7 @@ god-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "god-mode"; - version = "20151005.1125"; + version = "20151005.925"; src = fetchFromGitHub { owner = "chrisdone"; repo = "god-mode"; @@ -25167,7 +25255,7 @@ gold-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, sws-mode }: melpaBuild { pname = "gold-mode"; - version = "20140606.2106"; + version = "20140606.1906"; src = fetchFromGitHub { owner = "yuutayamada"; repo = "gold-mode-el"; @@ -25188,7 +25276,7 @@ golden-ratio = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "golden-ratio"; - version = "20150819.620"; + version = "20150819.420"; src = fetchFromGitHub { owner = "roman"; repo = "golden-ratio.el"; @@ -25209,7 +25297,7 @@ golden-ratio-scroll-screen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "golden-ratio-scroll-screen"; - version = "20151211.430"; + version = "20151211.230"; src = fetchFromGitHub { owner = "jixiuf"; repo = "golden-ratio-scroll-screen"; @@ -25230,7 +25318,7 @@ golint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "golint"; - version = "20150414.1930"; + version = "20150414.1730"; src = fetchFromGitHub { owner = "golang"; repo = "lint"; @@ -25251,7 +25339,7 @@ gom-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gom-mode"; - version = "20131007.2153"; + version = "20131007.1953"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-gom-mode"; @@ -25272,7 +25360,7 @@ google = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "google"; - version = "20140416.1248"; + version = "20140416.1048"; src = fetchFromGitHub { owner = "hober"; repo = "google-el"; @@ -25293,12 +25381,12 @@ google-c-style = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "google-c-style"; - version = "20140929.1318"; + version = "20140929.1118"; src = fetchFromGitHub { owner = "google"; repo = "styleguide"; - rev = "01f0f704f7ff052f601a7fa39e7194f885176701"; - sha256 = "15bglg6d8nlpdmmxa87ypq9i296z2f3w85md6yy7kys6ajz5x5bq"; + rev = "6d3a7d8a229e189f7a5bb7c3923363356625ece5"; + sha256 = "1yzx5zk91cyl3j0xf6a8nq6m9yx76x9icyzy8x226sch1y8k9jy9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/google-c-style"; @@ -25314,7 +25402,7 @@ google-contacts = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2 }: melpaBuild { pname = "google-contacts"; - version = "20160111.411"; + version = "20160111.211"; src = fetchFromGitHub { owner = "jd"; repo = "google-contacts.el"; @@ -25335,7 +25423,7 @@ google-maps = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "google-maps"; - version = "20130412.430"; + version = "20130412.230"; src = fetchFromGitHub { owner = "jd"; repo = "google-maps.el"; @@ -25356,12 +25444,12 @@ google-this = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "google-this"; - version = "20160513.1212"; + version = "20160710.1720"; src = fetchFromGitHub { owner = "Malabarba"; repo = "emacs-google-this"; - rev = "22cff810e7ed3b3c9dae066588508864c25c6d99"; - sha256 = "14dz9wjp8ym86a03pw5y1sd51zw83d6485hpq8mh8zm0j1fba0y0"; + rev = "6af9dcee88b9637b3bdd1900a907f7ac83113988"; + sha256 = "1l3aklpzzn407ww2k4ncjin3n869hg4lyf050p00nig3qfgvjnbz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/google-this"; @@ -25377,7 +25465,7 @@ google-translate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "google-translate"; - version = "20160513.1725"; + version = "20160513.1525"; src = fetchFromGitHub { owner = "atykhonov"; repo = "google-translate"; @@ -25398,7 +25486,7 @@ goose-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "goose-theme"; - version = "20160401.33"; + version = "20160331.2233"; src = fetchFromGitHub { owner = "thwg"; repo = "goose-theme"; @@ -25419,7 +25507,7 @@ gore-mode = callPackage ({ fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: melpaBuild { pname = "gore-mode"; - version = "20151123.1327"; + version = "20151123.1127"; src = fetchFromGitHub { owner = "sergey-pashaev"; repo = "gore-mode"; @@ -25440,7 +25528,7 @@ gorepl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gorepl-mode"; - version = "20151121.622"; + version = "20151121.422"; src = fetchFromGitHub { owner = "manute"; repo = "gorepl-mode"; @@ -25461,7 +25549,7 @@ gotest = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild, s }: melpaBuild { pname = "gotest"; - version = "20160627.221"; + version = "20160627.21"; src = fetchFromGitHub { owner = "nlamirault"; repo = "gotest.el"; @@ -25482,7 +25570,7 @@ gotham-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gotham-theme"; - version = "20160517.755"; + version = "20160517.555"; src = fetchFromGitHub { owner = "wasamasa"; repo = "gotham-theme"; @@ -25502,7 +25590,7 @@ }) {}; goto-chg = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "goto-chg"; - version = "20131228.859"; + version = "20131228.659"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/goto-chg.el"; sha256 = "078d6p4br5vips7b9x4v6cy0wxf6m5ij9gpqd4g33bryn22gnpij"; @@ -25521,7 +25609,7 @@ goto-gem = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "goto-gem"; - version = "20140729.1345"; + version = "20140729.1145"; src = fetchFromGitHub { owner = "pidu"; repo = "goto-gem"; @@ -25542,7 +25630,7 @@ goto-last-change = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "goto-last-change"; - version = "20150109.1223"; + version = "20150109.1023"; src = fetchFromGitHub { owner = "camdez"; repo = "goto-last-change.el"; @@ -25563,12 +25651,12 @@ govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }: melpaBuild { pname = "govc"; - version = "20160201.1146"; + version = "20160201.946"; src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "c0c7ce63df7edd78e713257b924c89d9a2dac119"; - sha256 = "1yj4iimwfv3d4m24ifmncc2z09dlmxjr1dhryh4afkpgj48x4lcv"; + rev = "3de168d71c170aa71193183da59356da57f97c6d"; + sha256 = "0g5ps9j76d9ggvnsx9qv0vayq35pjnzq12nsq5qj38vkd292p9fn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -25584,7 +25672,7 @@ govet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "govet"; - version = "20150428.1359"; + version = "20150428.1159"; src = fetchFromGitHub { owner = "meshelton"; repo = "govet"; @@ -25605,7 +25693,7 @@ gplusify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gplusify"; - version = "20150312.1444"; + version = "20150312.1244"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "gplusify"; @@ -25626,7 +25714,7 @@ grab-mac-link = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "grab-mac-link"; - version = "20160626.58"; + version = "20160625.2258"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "grab-mac-link.el"; @@ -25647,7 +25735,7 @@ gradle-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "gradle-mode"; - version = "20150313.1405"; + version = "20150313.1205"; src = fetchFromGitHub { owner = "jacobono"; repo = "emacs-gradle-mode"; @@ -25668,7 +25756,7 @@ grails = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "grails"; - version = "20160417.136"; + version = "20160416.2336"; src = fetchFromGitHub { owner = "lifeisfoo"; repo = "emacs-grails"; @@ -25689,7 +25777,7 @@ grails-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "grails-mode"; - version = "20160504.411"; + version = "20160504.211"; src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; @@ -25710,7 +25798,7 @@ grails-projectile-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "grails-projectile-mode"; - version = "20160327.824"; + version = "20160327.624"; src = fetchFromGitHub { owner = "yveszoundi"; repo = "grails-projectile-mode"; @@ -25731,7 +25819,7 @@ grandshell-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "grandshell-theme"; - version = "20150404.701"; + version = "20150404.501"; src = fetchFromGitHub { owner = "steckerhalter"; repo = "grandshell-theme"; @@ -25752,7 +25840,7 @@ graphene = callPackage ({ company, dash, exec-path-from-shell, fetchFromGitHub, fetchurl, flycheck, graphene-meta-theme, ido-ubiquitous, lib, melpaBuild, ppd-sr-speedbar, smartparens, smex, sr-speedbar, web-mode }: melpaBuild { pname = "graphene"; - version = "20151109.140"; + version = "20151108.2340"; src = fetchFromGitHub { owner = "rdallasgray"; repo = "graphene"; @@ -25785,12 +25873,12 @@ graphene-meta-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "graphene-meta-theme"; - version = "20160629.1411"; + version = "20160724.454"; src = fetchFromGitHub { owner = "rdallasgray"; repo = "graphene-meta-theme"; - rev = "f76011f212cd4e932e3fca6e84588ac294e812a4"; - sha256 = "0b8yvbcj904ziwx2a6dr6225jspxycgyphab4iwpbmvkv1fnicf6"; + rev = "ba3c197b6331668c4fcee4053594ba1bd34929b6"; + sha256 = "0qbk53r97h234f2vj8ndf57kardaz2g2dgf35i08j9b416aw6ck5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/44af719ede73c9fe7787272d7868587ce8966e3d/recipes/graphene-meta-theme"; @@ -25806,7 +25894,7 @@ graphviz-dot-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "graphviz-dot-mode"; - version = "20151127.821"; + version = "20151127.621"; src = fetchFromGitHub { owner = "ppareit"; repo = "graphviz-dot-mode"; @@ -25827,7 +25915,7 @@ grapnel = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "grapnel"; - version = "20131001.1034"; + version = "20131001.834"; src = fetchFromGitHub { owner = "leathekd"; repo = "grapnel"; @@ -25848,7 +25936,7 @@ grass-mode = callPackage ({ cl-lib ? null, dash, fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "grass-mode"; - version = "20160317.814"; + version = "20160317.614"; src = fetchhg { url = "https://bitbucket.com/tws/grass-mode.el"; rev = "25414dff1fc5"; @@ -25868,7 +25956,7 @@ green-phosphor-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "green-phosphor-theme"; - version = "20150515.947"; + version = "20150515.747"; src = fetchFromGitHub { owner = "aalpern"; repo = "emacs-color-theme-green-phosphor"; @@ -25889,7 +25977,7 @@ gregorio-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gregorio-mode"; - version = "20151026.920"; + version = "20151026.720"; src = fetchFromGitHub { owner = "cajetanus"; repo = "gregorio-mode.el"; @@ -25910,7 +25998,7 @@ grep-a-lot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "grep-a-lot"; - version = "20131006.847"; + version = "20131006.647"; src = fetchFromGitHub { owner = "ZungBang"; repo = "emacs-grep-a-lot"; @@ -25930,7 +26018,7 @@ }) {}; grep-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "grep-plus"; - version = "20160212.825"; + version = "20160212.625"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/grep+.el"; sha256 = "08jl4xhh25znyc6cm7288x4b55pykrpcsyym78fdlrw3xxr77cxs"; @@ -25949,7 +26037,7 @@ greymatters-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "greymatters-theme"; - version = "20150621.623"; + version = "20150621.423"; src = fetchFromGitHub { owner = "mswift42"; repo = "greymatters-theme"; @@ -25969,7 +26057,7 @@ }) {}; grin = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "grin"; - version = "20110806.158"; + version = "20110805.2358"; src = fetchhg { url = "https://bitbucket.com/dariusp686/emacs-grin"; rev = "f541aa22da52"; @@ -25989,7 +26077,7 @@ grizzl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "grizzl"; - version = "20160131.151"; + version = "20160130.2351"; src = fetchFromGitHub { owner = "grizzl"; repo = "grizzl"; @@ -26010,7 +26098,7 @@ groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "groovy-mode"; - version = "20160504.411"; + version = "20160504.211"; src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; @@ -26031,7 +26119,7 @@ gruber-darker-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gruber-darker-theme"; - version = "20160417.630"; + version = "20160417.430"; src = fetchFromGitHub { owner = "rexim"; repo = "gruber-darker-theme"; @@ -26052,7 +26140,7 @@ grunt = callPackage ({ ansi-color ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "grunt"; - version = "20160316.1028"; + version = "20160316.828"; src = fetchFromGitHub { owner = "gempesaw"; repo = "grunt.el"; @@ -26073,7 +26161,7 @@ gruvbox-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gruvbox-theme"; - version = "20160514.858"; + version = "20160514.658"; src = fetchFromGitHub { owner = "Greduan"; repo = "emacs-theme-gruvbox"; @@ -26094,7 +26182,7 @@ gs-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gs-mode"; - version = "20151202.406"; + version = "20151202.206"; src = fetchFromGitHub { owner = "yyr"; repo = "emacs-grads"; @@ -26115,7 +26203,7 @@ gscholar-bibtex = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gscholar-bibtex"; - version = "20160701.1827"; + version = "20160701.1627"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "gscholar-bibtex"; @@ -26136,7 +26224,7 @@ guide-key = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popwin, s }: melpaBuild { pname = "guide-key"; - version = "20150108.35"; + version = "20150107.2235"; src = fetchFromGitHub { owner = "kai2nenobu"; repo = "guide-key"; @@ -26157,7 +26245,7 @@ guide-key-tip = callPackage ({ fetchFromGitHub, fetchurl, guide-key, lib, melpaBuild, pos-tip }: melpaBuild { pname = "guide-key-tip"; - version = "20140406.2020"; + version = "20140406.1820"; src = fetchFromGitHub { owner = "aki2o"; repo = "guide-key-tip"; @@ -26178,7 +26266,7 @@ guru-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "guru-mode"; - version = "20160415.2121"; + version = "20160415.1921"; src = fetchFromGitHub { owner = "bbatsov"; repo = "guru-mode"; @@ -26199,7 +26287,7 @@ gvpr-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gvpr-mode"; - version = "20131208.1118"; + version = "20131208.918"; src = fetchFromGitHub { owner = "rodw"; repo = "gvpr-lib"; @@ -26220,7 +26308,7 @@ hackernews = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "hackernews"; - version = "20160627.1851"; + version = "20160627.1651"; src = fetchFromGitHub { owner = "clarete"; repo = "hackernews.el"; @@ -26238,10 +26326,31 @@ license = lib.licenses.free; }; }) {}; + hal-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "hal-mode"; + version = "20160704.1046"; + src = fetchFromGitHub { + owner = "strahlex"; + repo = "hal-mode"; + rev = "cd2f66f219ee520198d4586fb6b169cef7ad3f21"; + sha256 = "0xibwmngijq0wv9hkahs5nh02qj3ma0bkczl07hx8wnl6j27f0nj"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/955a4d94110bb2048d899a3d7671937e69d5ac79/recipes/hal-mode"; + sha256 = "1b1hvlm80awbyjjs5d51v46hw8a2jfz8dv9r61h7vvwh9a8wpgk2"; + name = "hal-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/hal-mode"; + license = lib.licenses.free; + }; + }) {}; ham-mode = callPackage ({ fetchFromGitHub, fetchurl, html-to-markdown, lib, markdown-mode, melpaBuild }: melpaBuild { pname = "ham-mode"; - version = "20150811.806"; + version = "20150811.606"; src = fetchFromGitHub { owner = "Malabarba"; repo = "ham-mode"; @@ -26262,7 +26371,7 @@ hamburg-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hamburg-theme"; - version = "20160123.140"; + version = "20160122.2340"; src = fetchFromGitHub { owner = "mswift42"; repo = "hamburg-theme"; @@ -26283,7 +26392,7 @@ haml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, ruby-mode ? null }: melpaBuild { pname = "haml-mode"; - version = "20150508.2211"; + version = "20150508.2011"; src = fetchFromGitHub { owner = "nex3"; repo = "haml-mode"; @@ -26304,7 +26413,7 @@ hamlet-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "hamlet-mode"; - version = "20131208.124"; + version = "20131207.2324"; src = fetchFromGitHub { owner = "lightquake"; repo = "hamlet-mode"; @@ -26325,7 +26434,7 @@ handlebars-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "handlebars-mode"; - version = "20150211.1149"; + version = "20150211.949"; src = fetchFromGitHub { owner = "danielevans"; repo = "handlebars-mode"; @@ -26346,7 +26455,7 @@ handlebars-sgml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "handlebars-sgml-mode"; - version = "20130623.1833"; + version = "20130623.1633"; src = fetchFromGitHub { owner = "jacott"; repo = "handlebars-sgml-mode"; @@ -26367,7 +26476,7 @@ handoff = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "handoff"; - version = "20150917.100"; + version = "20150916.2300"; src = fetchFromGitHub { owner = "rejeep"; repo = "handoff.el"; @@ -26388,7 +26497,7 @@ hardcore-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hardcore-mode"; - version = "20151114.101"; + version = "20151113.2301"; src = fetchFromGitHub { owner = "magnars"; repo = "hardcore-mode.el"; @@ -26409,7 +26518,7 @@ hardhat = callPackage ({ fetchFromGitHub, fetchurl, ignoramus, lib, melpaBuild }: melpaBuild { pname = "hardhat"; - version = "20160414.913"; + version = "20160414.713"; src = fetchFromGitHub { owner = "rolandwalker"; repo = "hardhat"; @@ -26430,7 +26539,7 @@ harvest = callPackage ({ fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, s, swiper }: melpaBuild { pname = "harvest"; - version = "20160405.1143"; + version = "20160405.943"; src = fetchFromGitHub { owner = "kostajh"; repo = "harvest.el"; @@ -26451,12 +26560,12 @@ haskell-emacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "haskell-emacs"; - version = "20160223.550"; + version = "20160704.1120"; src = fetchFromGitHub { owner = "knupfer"; repo = "haskell-emacs"; - rev = "382d72a14a15c88d6b1d61db8262ce7a0db236fb"; - sha256 = "114qg91mb53ib7alnn1i9wjcr4psqps6ncpyqyklllmbdm0q660n"; + rev = "7b840af4af0b03cbf8dad1b8ac6ca1dcd4b5ccd9"; + sha256 = "1d2b35qmsx3ayq8b6rh08dkmx2845nhswqqwpzg81zsna6d607mh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5daff329a96a6d10bca11d838bbc95d1c8bcfbd9/recipes/haskell-emacs"; @@ -26472,12 +26581,12 @@ haskell-emacs-base = callPackage ({ fetchFromGitHub, fetchurl, haskell-emacs, lib, melpaBuild }: melpaBuild { pname = "haskell-emacs-base"; - version = "20150714.1059"; + version = "20150714.859"; src = fetchFromGitHub { owner = "knupfer"; repo = "haskell-emacs"; - rev = "382d72a14a15c88d6b1d61db8262ce7a0db236fb"; - sha256 = "114qg91mb53ib7alnn1i9wjcr4psqps6ncpyqyklllmbdm0q660n"; + rev = "7b840af4af0b03cbf8dad1b8ac6ca1dcd4b5ccd9"; + sha256 = "1d2b35qmsx3ayq8b6rh08dkmx2845nhswqqwpzg81zsna6d607mh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5daff329a96a6d10bca11d838bbc95d1c8bcfbd9/recipes/haskell-emacs-base"; @@ -26493,12 +26602,12 @@ haskell-emacs-text = callPackage ({ fetchFromGitHub, fetchurl, haskell-emacs, lib, melpaBuild }: melpaBuild { pname = "haskell-emacs-text"; - version = "20150713.916"; + version = "20150713.716"; src = fetchFromGitHub { owner = "knupfer"; repo = "haskell-emacs"; - rev = "382d72a14a15c88d6b1d61db8262ce7a0db236fb"; - sha256 = "114qg91mb53ib7alnn1i9wjcr4psqps6ncpyqyklllmbdm0q660n"; + rev = "7b840af4af0b03cbf8dad1b8ac6ca1dcd4b5ccd9"; + sha256 = "1d2b35qmsx3ayq8b6rh08dkmx2845nhswqqwpzg81zsna6d607mh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5daff329a96a6d10bca11d838bbc95d1c8bcfbd9/recipes/haskell-emacs-text"; @@ -26514,12 +26623,12 @@ haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "haskell-mode"; - version = "20160622.1633"; + version = "20160726.1027"; src = fetchFromGitHub { owner = "haskell"; repo = "haskell-mode"; - rev = "e7452b435def8fe411aecb08d7130f92bda2bb13"; - sha256 = "1z9mgdk976hqpayc7zsnx53wqz23lkrc0avh5ljjkg9nlwyqbk6c"; + rev = "26b25373fe0ae565f87ca5552465b973951af206"; + sha256 = "0h4hgg1jd8i7nishb356wk0pkm1qklccb65wk8zif6v8nr1wqb7q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode"; @@ -26535,7 +26644,7 @@ haskell-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "haskell-snippets"; - version = "20160121.1658"; + version = "20160121.1458"; src = fetchFromGitHub { owner = "haskell"; repo = "haskell-snippets"; @@ -26556,7 +26665,7 @@ haskell-tab-indent = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "haskell-tab-indent"; - version = "20151205.1359"; + version = "20151205.1159"; src = fetchgit { url = "https://git.spwhitton.name/haskell-tab-indent"; rev = "150f52176242ba3bc4f58179cd2dbee4d89580f4"; @@ -26576,7 +26685,7 @@ haste = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "haste"; - version = "20141030.1534"; + version = "20141030.1334"; src = fetchFromGitHub { owner = "rlister"; repo = "emacs-haste-client"; @@ -26597,7 +26706,7 @@ haxe-mode = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "haxe-mode"; - version = "20131004.342"; + version = "20131004.142"; src = fetchhg { url = "https://bitbucket.com/jpsecher/haxe-mode"; rev = "850f29d9f70e"; @@ -26617,7 +26726,7 @@ haxor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "haxor-mode"; - version = "20160618.629"; + version = "20160618.429"; src = fetchFromGitHub { owner = "krzysztof-magosa"; repo = "haxor-mode"; @@ -26638,7 +26747,7 @@ hayoo = callPackage ({ emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "hayoo"; - version = "20140831.721"; + version = "20140831.521"; src = fetchFromGitHub { owner = "benma"; repo = "hayoo.el"; @@ -26659,7 +26768,7 @@ hc-zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hc-zenburn-theme"; - version = "20150928.1133"; + version = "20150928.933"; src = fetchFromGitHub { owner = "edran"; repo = "hc-zenburn-emacs"; @@ -26680,12 +26789,12 @@ hcl-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hcl-mode"; - version = "20160502.1900"; + version = "20160502.1700"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-hcl-mode"; - rev = "cc13180e3af748d53c4a1d433ce2edf99bf68a7d"; - sha256 = "0hiw226gv73jh7s3jg4p1c15p4km4rs7i9ab4wgpkl5lg4vrz5i6"; + rev = "2e3fa6fbc793a3bcf260fc269c5218cb09ca45aa"; + sha256 = "1qlrkd10vszzqps86pzr6mv9ykffyhhpcp65y9nq3ds4aviv6jay"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/66b441525dc300b364d9be0358ae1e0fa2a8b4fe/recipes/hcl-mode"; @@ -26700,7 +26809,7 @@ }) {}; header2 = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "header2"; - version = "20151231.1526"; + version = "20151231.1326"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/header2.el"; sha256 = "00j74cqdnaf5rl7w4wabm4z88cm20s152y0yxnv73z9pvqbknrmm"; @@ -26719,7 +26828,7 @@ headlong = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "headlong"; - version = "20150417.1026"; + version = "20150417.826"; src = fetchFromGitHub { owner = "abo-abo"; repo = "headlong"; @@ -26740,12 +26849,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "20160703.17"; + version = "20160723.2238"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "151ae12d7048934b58cf3ff0afe2262208dbd07d"; - sha256 = "0flqigd4bh5pfnzrr3v69w64n8b8qvhfx3lfclmgdb2qy15srwsi"; + rev = "8acee62ffc19e57f152df313faba1afb7698c2b9"; + sha256 = "1qriwyr2c6adif770jk6rl7d9w6q4f268gzzpr5q25ll7d2i8n02"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/90ab37af6b0c85eac11c423bc8f0d93d6d8a9fd4/recipes/helm"; @@ -26761,7 +26870,7 @@ helm-R = callPackage ({ ess, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-R"; - version = "20120819.1914"; + version = "20120819.1714"; src = fetchFromGitHub { owner = "myuhe"; repo = "helm-R.el"; @@ -26782,7 +26891,7 @@ helm-ack = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-ack"; - version = "20141030.726"; + version = "20141030.526"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-helm-ack"; @@ -26803,7 +26912,7 @@ helm-ad = callPackage ({ dash, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-ad"; - version = "20151209.415"; + version = "20151209.215"; src = fetchFromGitHub { owner = "tnoda"; repo = "helm-ad"; @@ -26824,12 +26933,12 @@ helm-ag = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-ag"; - version = "20160702.524"; + version = "20160717.2013"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-helm-ag"; - rev = "51de5568ca65baa9f1a3e22c8cad9d7dda4fb6c5"; - sha256 = "04m9l63rzdg40c7x8rkrdxw1pcw4bqxf9npx6kx7rdy02393zb80"; + rev = "39f02a29f0ad1b2d0afd847d59782b269a65b13e"; + sha256 = "0szkyyywfqndfxnik41czyzz4cs8xwjlx6y03zzfm6m2va8sb9pd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-ag"; @@ -26845,7 +26954,7 @@ helm-ag-r = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-ag-r"; - version = "20131123.931"; + version = "20131123.731"; src = fetchFromGitHub { owner = "yuutayamada"; repo = "helm-ag-r"; @@ -26866,7 +26975,7 @@ helm-anything = callPackage ({ anything, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-anything"; - version = "20141126.431"; + version = "20141126.231"; src = fetchFromGitHub { owner = "rubikitch"; repo = "helm-anything"; @@ -26887,7 +26996,7 @@ helm-aws = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "helm-aws"; - version = "20151124.333"; + version = "20151124.133"; src = fetchFromGitHub { owner = "istib"; repo = "helm-aws"; @@ -26908,7 +27017,7 @@ helm-backup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "helm-backup"; - version = "20151213.1247"; + version = "20151213.1047"; src = fetchFromGitHub { owner = "antham"; repo = "helm-backup"; @@ -26929,12 +27038,12 @@ helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }: melpaBuild { pname = "helm-bibtex"; - version = "20160422.1800"; + version = "20160721.1617"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "62593c6289a3d17566edb1aa8ef4700bc83e9df7"; - sha256 = "1zrs1gk95mna1kipgrq8mfhk0gqimvsb4b583f900fh86019nn1l"; + rev = "d6a98ac6f28d2a6a05e203115211c98333d40aca"; + sha256 = "0arhy051945lxjqg77b275ny9nsv60cqj0qfpmvd8xkc07lqfn23"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex"; @@ -26950,7 +27059,7 @@ helm-bibtexkey = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-bibtexkey"; - version = "20140214.904"; + version = "20140214.704"; src = fetchFromGitHub { owner = "kenbeese"; repo = "helm-bibtexkey"; @@ -26971,7 +27080,7 @@ helm-bind-key = callPackage ({ bind-key, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-bind-key"; - version = "20141108.2315"; + version = "20141108.2115"; src = fetchFromGitHub { owner = "myuhe"; repo = "helm-bind-key.el"; @@ -26992,7 +27101,7 @@ helm-bm = callPackage ({ bm, cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "helm-bm"; - version = "20160321.831"; + version = "20160321.631"; src = fetchFromGitHub { owner = "yasuyk"; repo = "helm-bm"; @@ -27013,7 +27122,7 @@ helm-bundle-show = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-bundle-show"; - version = "20151221.630"; + version = "20151221.430"; src = fetchFromGitHub { owner = "masutaka"; repo = "emacs-helm-bundle-show"; @@ -27034,7 +27143,7 @@ helm-c-moccur = callPackage ({ color-moccur, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-c-moccur"; - version = "20151230.324"; + version = "20151230.124"; src = fetchFromGitHub { owner = "myuhe"; repo = "helm-c-moccur.el"; @@ -27055,7 +27164,7 @@ helm-c-yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, yasnippet }: melpaBuild { pname = "helm-c-yasnippet"; - version = "20151231.210"; + version = "20151231.10"; src = fetchFromGitHub { owner = "emacs-jp"; repo = "helm-c-yasnippet"; @@ -27076,12 +27185,12 @@ helm-chrome = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-chrome"; - version = "20160623.1806"; + version = "20160718.2220"; src = fetchFromGitHub { owner = "kawabata"; repo = "helm-chrome"; - rev = "6fa8bf1a263b12d5dc65e24376341e5989d8055d"; - sha256 = "0lbqxsdd2fl1pfji71a4r812wpr2sb5bm0skyn4gym00m7qia2rr"; + rev = "fd630ace4b4b4f33355a973743bbfe0c90ce4830"; + sha256 = "0r8s85fs5lnwdn377z5zgi3d090k2n1mgiyxwgy49i8yirssgz51"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f6ca33fe8ec8a0af8fb166451050f5502838deb/recipes/helm-chrome"; @@ -27097,7 +27206,7 @@ helm-chronos = callPackage ({ chronos, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-chronos"; - version = "20150528.1536"; + version = "20150528.1336"; src = fetchFromGitHub { owner = "dxknight"; repo = "helm-chronos"; @@ -27118,12 +27227,12 @@ helm-cider = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, seq }: melpaBuild { pname = "helm-cider"; - version = "20160609.2205"; + version = "20160719.1937"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "helm-cider"; - rev = "509260b26b6c55c32895b63084479df89f76e1ed"; - sha256 = "0jvlfmzsj1c8hgmaznyxki2812k4ghralvbjkfs9vwvqjjhcp8ls"; + rev = "5799fd0001e0d5398745fbd03f60da1aac9c1479"; + sha256 = "1hpr1w9v855fxqwrqfdcj5acxd3bkp1gc8h5whyl91d1f93zyy55"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31d3cd618f2ac88860d0b11335ff81b6e2973982/recipes/helm-cider"; @@ -27139,7 +27248,7 @@ helm-cider-history = callPackage ({ cider, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-cider-history"; - version = "20150719.1620"; + version = "20150719.1420"; src = fetchFromGitHub { owner = "Kungi"; repo = "helm-cider-history"; @@ -27160,7 +27269,7 @@ helm-circe = callPackage ({ circe, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-circe"; - version = "20160207.52"; + version = "20160206.2252"; src = fetchFromGitHub { owner = "lesharris"; repo = "helm-circe"; @@ -27181,7 +27290,7 @@ helm-clojuredocs = callPackage ({ edn, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-clojuredocs"; - version = "20160405.223"; + version = "20160405.23"; src = fetchFromGitHub { owner = "mbuczko"; repo = "helm-clojuredocs"; @@ -27202,7 +27311,7 @@ helm-cmd-t = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-cmd-t"; - version = "20150823.1357"; + version = "20150823.1157"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-cmd-t"; @@ -27223,7 +27332,7 @@ helm-codesearch = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "helm-codesearch"; - version = "20160123.513"; + version = "20160123.313"; src = fetchFromGitHub { owner = "youngker"; repo = "helm-codesearch.el"; @@ -27244,7 +27353,7 @@ helm-commandlinefu = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, json ? null, let-alist, lib, melpaBuild }: melpaBuild { pname = "helm-commandlinefu"; - version = "20150611.45"; + version = "20150610.2245"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "helm-commandlinefu"; @@ -27265,7 +27374,7 @@ helm-company = callPackage ({ company, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-company"; - version = "20160517.58"; + version = "20160516.2258"; src = fetchFromGitHub { owner = "manuel-uberti"; repo = "helm-company"; @@ -27286,12 +27395,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "20160702.119"; + version = "20160723.944"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "151ae12d7048934b58cf3ff0afe2262208dbd07d"; - sha256 = "0flqigd4bh5pfnzrr3v69w64n8b8qvhfx3lfclmgdb2qy15srwsi"; + rev = "8acee62ffc19e57f152df313faba1afb7698c2b9"; + sha256 = "1qriwyr2c6adif770jk6rl7d9w6q4f268gzzpr5q25ll7d2i8n02"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -27307,7 +27416,7 @@ helm-cscope = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, xcscope }: melpaBuild { pname = "helm-cscope"; - version = "20150609.849"; + version = "20150609.649"; src = fetchFromGitHub { owner = "alpha22jp"; repo = "helm-cscope.el"; @@ -27328,7 +27437,7 @@ helm-css-scss = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-css-scss"; - version = "20140626.1925"; + version = "20140626.1725"; src = fetchFromGitHub { owner = "ShingoFukuyama"; repo = "helm-css-scss"; @@ -27349,7 +27458,7 @@ helm-ctest = callPackage ({ dash, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, s }: melpaBuild { pname = "helm-ctest"; - version = "20150823.608"; + version = "20150823.408"; src = fetchFromGitHub { owner = "danlamanna"; repo = "helm-ctest"; @@ -27370,12 +27479,12 @@ helm-dash = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-dash"; - version = "20160613.338"; + version = "20160716.917"; src = fetchFromGitHub { owner = "areina"; repo = "helm-dash"; - rev = "fa6c0a68bfc0e14451adee391d96e785e950adfe"; - sha256 = "0ds4kqxac1hhja06klwxjsn9xg1klj1svp8z5m7chvw8zl9x9hfj"; + rev = "3f997ef2d1bac4882dea4c8da44ef9ab5834627c"; + sha256 = "1084papl32c1nn98wzv7vprlcabgkin6c1z4s0hbx0jj3rkhdzmz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/39c3ea21430473ef22d5ea9c8b2cf7ec9689883a/recipes/helm-dash"; @@ -27391,7 +27500,7 @@ helm-descbinds = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-descbinds"; - version = "20160609.1112"; + version = "20160609.912"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-descbinds"; @@ -27412,7 +27521,7 @@ helm-describe-modes = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-describe-modes"; - version = "20160211.2318"; + version = "20160211.2118"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-describe-modes"; @@ -27433,7 +27542,7 @@ helm-dictionary = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-dictionary"; - version = "20160601.1048"; + version = "20160601.848"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-dictionary"; @@ -27454,7 +27563,7 @@ helm-dired-recent-dirs = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-dired-recent-dirs"; - version = "20131228.814"; + version = "20131228.614"; src = fetchFromGitHub { owner = "akisute3"; repo = "helm-dired-recent-dirs"; @@ -27475,7 +27584,7 @@ helm-dirset = callPackage ({ cl-lib ? null, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "helm-dirset"; - version = "20151208.1812"; + version = "20151208.1612"; src = fetchFromGitHub { owner = "k1LoW"; repo = "helm-dirset"; @@ -27496,12 +27605,12 @@ helm-emmet = callPackage ({ emmet-mode, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-emmet"; - version = "20131014.129"; + version = "20160713.531"; src = fetchFromGitHub { owner = "yasuyk"; repo = "helm-emmet"; - rev = "b4e0618773d9fdfbf0ed03d24a53d26285c51b91"; - sha256 = "0c3mn5w98phsv7gsljyp5vxxmr2w6n3nczh5zm4hcpwsra3wh1v9"; + rev = "f0364e736b10cf44232053a78de04133a88185ae"; + sha256 = "1zl6vhzbf29864q97q5v7c318x36y1a4cjm0i7kgj3hc6qla5j88"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/acbc5e9fab159ad2d63b10c0fa6ac18636bb2379/recipes/helm-emmet"; @@ -27517,7 +27626,7 @@ helm-emms = callPackage ({ cl-lib ? null, emacs, emms, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-emms"; - version = "20151001.1528"; + version = "20151001.1328"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-emms"; @@ -27538,7 +27647,7 @@ helm-filesets = callPackage ({ fetchFromGitHub, fetchurl, filesets-plus, helm, lib, melpaBuild }: melpaBuild { pname = "helm-filesets"; - version = "20140929.1335"; + version = "20140929.1135"; src = fetchFromGitHub { owner = "gcla"; repo = "helm-filesets"; @@ -27559,7 +27668,7 @@ helm-firefox = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-firefox"; - version = "20160604.252"; + version = "20160604.52"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-firefox"; @@ -27580,7 +27689,7 @@ helm-flx = callPackage ({ emacs, fetchFromGitHub, fetchurl, flx, helm, lib, melpaBuild }: melpaBuild { pname = "helm-flx"; - version = "20160227.1852"; + version = "20160227.1652"; src = fetchFromGitHub { owner = "PythonNut"; repo = "helm-flx"; @@ -27598,22 +27707,22 @@ license = lib.licenses.free; }; }) {}; - helm-flycheck = callPackage ({ dash, fetchFromGitHub, fetchurl, flycheck, helm, lib, melpaBuild }: + helm-flycheck = callPackage ({ dash, fetchFromGitHub, fetchurl, flycheck, helm-core, lib, melpaBuild }: melpaBuild { pname = "helm-flycheck"; - version = "20160319.117"; + version = "20160710.129"; src = fetchFromGitHub { owner = "yasuyk"; repo = "helm-flycheck"; - rev = "83c069abd896b481407234cd0132649245d81194"; - sha256 = "062s08k8v657fpkqvdspv32awvj7dq929ks27w29k3kbzlqlrihp"; + rev = "3cf7d3bb194acacc6395f88360588013d92675d6"; + sha256 = "1a2yfxhz04klwhcandqvfzysxp6b7bxyxx1xk1x3kds5hif5fkl4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cce1662d4ca7b7d868685084294d22ebf6c39e9/recipes/helm-flycheck"; sha256 = "038f9294qc0jnkzrrjxm97hyhwa4sca3wdsjbaya50cf0g4cmk7b"; name = "helm-flycheck"; }; - packageRequires = [ dash flycheck helm ]; + packageRequires = [ dash flycheck helm-core ]; meta = { homepage = "https://melpa.org/#/helm-flycheck"; license = lib.licenses.free; @@ -27622,7 +27731,7 @@ helm-flymake = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-flymake"; - version = "20160609.1902"; + version = "20160609.1702"; src = fetchFromGitHub { owner = "tam17aki"; repo = "helm-flymake"; @@ -27643,7 +27752,7 @@ helm-flyspell = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-flyspell"; - version = "20160612.1840"; + version = "20160612.1640"; src = fetchFromGitHub { owner = "pronobis"; repo = "helm-flyspell"; @@ -27664,7 +27773,7 @@ helm-fuzzier = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-fuzzier"; - version = "20160605.1645"; + version = "20160605.1445"; src = fetchFromGitHub { owner = "EphramPerdition"; repo = "helm-fuzzier"; @@ -27685,7 +27794,7 @@ helm-fuzzy-find = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-fuzzy-find"; - version = "20150613.549"; + version = "20150613.349"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "helm-fuzzy-find"; @@ -27706,7 +27815,7 @@ helm-ghc = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, ghc, helm, lib, melpaBuild }: melpaBuild { pname = "helm-ghc"; - version = "20141105.859"; + version = "20141105.659"; src = fetchFromGitHub { owner = "david-christiansen"; repo = "helm-ghc"; @@ -27727,7 +27836,7 @@ helm-ghq = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-ghq"; - version = "20160203.927"; + version = "20160203.727"; src = fetchFromGitHub { owner = "masutaka"; repo = "emacs-helm-ghq"; @@ -27748,7 +27857,7 @@ helm-git = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-git"; - version = "20120630.1603"; + version = "20120630.1403"; src = fetchFromGitHub { owner = "maio"; repo = "helm-git"; @@ -27769,7 +27878,7 @@ helm-git-files = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-git-files"; - version = "20141212.717"; + version = "20141212.517"; src = fetchFromGitHub { owner = "kenbeese"; repo = "helm-git-files"; @@ -27790,12 +27899,12 @@ helm-git-grep = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-git-grep"; - version = "20160529.623"; + version = "20160713.521"; src = fetchFromGitHub { owner = "yasuyk"; repo = "helm-git-grep"; - rev = "cc032974118f8d633db5a1233657651afc318ba9"; - sha256 = "0c11300hlj62jkcx5j56rx6ppkckr0zlngmi4pf5wxpgj1wfsbfy"; + rev = "456ea8324eb811f099dad993ae94c8837368b23a"; + sha256 = "13p8dbfln8kcvi6iwj9mlb7vy6bda4285gagsng01j3nfrw0ck9x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/338d28c3fe201a7b2f15793be6d540f44819f4d8/recipes/helm-git-grep"; @@ -27811,7 +27920,7 @@ helm-github-stars = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-github-stars"; - version = "20150625.1723"; + version = "20150625.1523"; src = fetchFromGitHub { owner = "Sliim"; repo = "helm-github-stars"; @@ -27832,7 +27941,7 @@ helm-gitignore = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, gitignore-mode, helm, lib, melpaBuild, request }: melpaBuild { pname = "helm-gitignore"; - version = "20150517.2256"; + version = "20150517.2056"; src = fetchFromGitHub { owner = "jupl"; repo = "helm-gitignore"; @@ -27853,7 +27962,7 @@ helm-gitlab = callPackage ({ dash, fetchFromGitHub, fetchurl, gitlab, helm, lib, melpaBuild, s }: melpaBuild { pname = "helm-gitlab"; - version = "20160519.503"; + version = "20160519.303"; src = fetchFromGitHub { owner = "nlamirault"; repo = "emacs-gitlab"; @@ -27874,7 +27983,7 @@ helm-go-package = callPackage ({ deferred, fetchFromGitHub, fetchurl, go-mode, helm, lib, melpaBuild }: melpaBuild { pname = "helm-go-package"; - version = "20160321.315"; + version = "20160321.115"; src = fetchFromGitHub { owner = "yasuyk"; repo = "helm-go-package"; @@ -27895,7 +28004,7 @@ helm-google = callPackage ({ fetchFromGitHub, fetchurl, google, helm, lib, melpaBuild }: melpaBuild { pname = "helm-google"; - version = "20160620.1349"; + version = "20160620.1149"; src = fetchFromGitHub { owner = "steckerhalter"; repo = "helm-google"; @@ -27916,7 +28025,7 @@ helm-grepint = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-grepint"; - version = "20160303.1426"; + version = "20160303.1226"; src = fetchFromGitHub { owner = "kopoli"; repo = "helm-grepint"; @@ -27937,7 +28046,7 @@ helm-growthforecast = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-growthforecast"; - version = "20140119.2144"; + version = "20140119.1944"; src = fetchFromGitHub { owner = "daic-h"; repo = "helm-growthforecast"; @@ -27958,12 +28067,12 @@ helm-gtags = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-gtags"; - version = "20160417.755"; + version = "20160726.844"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-helm-gtags"; - rev = "dbe0d2d9d08058d469ad2d729bd782515b5b3b62"; - sha256 = "0zyspn9rqfs3hkq8qx0q1w5qiv30ignbmycyv0vn3a6q7a5fsnhx"; + rev = "4b98c1281bb8e5f91f8d4fef4bbfcfc00ef8d676"; + sha256 = "0yhhncz00arxzlv4j9wjn22g5gxglk40rpj6zd19zr7igyqy246b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-gtags"; @@ -27979,7 +28088,7 @@ helm-hatena-bookmark = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-hatena-bookmark"; - version = "20160528.814"; + version = "20160528.614"; src = fetchFromGitHub { owner = "masutaka"; repo = "emacs-helm-hatena-bookmark"; @@ -28000,7 +28109,7 @@ helm-hayoo = callPackage ({ fetchFromGitHub, fetchurl, haskell-mode, helm, json ? null, lib, melpaBuild }: melpaBuild { pname = "helm-hayoo"; - version = "20151014.151"; + version = "20151013.2351"; src = fetchFromGitHub { owner = "markus1189"; repo = "helm-hayoo"; @@ -28021,7 +28130,7 @@ helm-helm-commands = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-helm-commands"; - version = "20130902.1248"; + version = "20130902.1048"; src = fetchFromGitHub { owner = "vapniks"; repo = "helm-helm-commands"; @@ -28042,7 +28151,7 @@ helm-hoogle = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-hoogle"; - version = "20150919.232"; + version = "20150919.32"; src = fetchFromGitHub { owner = "jwiegley"; repo = "helm-hoogle"; @@ -28060,10 +28169,31 @@ license = lib.licenses.free; }; }) {}; + helm-hunks = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: + melpaBuild { + pname = "helm-hunks"; + version = "20160720.24"; + src = fetchFromGitHub { + owner = "torgeir"; + repo = "helm-hunks.el"; + rev = "3c5ba9c3945db9f2aa88a47661d3597b09559062"; + sha256 = "0ww183bi2d989carii4c4hh1ir5d1imj4j0lfxh9qdirap0wpchz"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d61cbe53ad42f2405a66de9f551f5b870a60709f/recipes/helm-hunks"; + sha256 = "1fhb9sf7fpz3f3ylc906w5xa4zzfr0gix6m7zc4c8qmz33zbhbp5"; + name = "helm-hunks"; + }; + packageRequires = [ emacs helm ]; + meta = { + homepage = "https://melpa.org/#/helm-hunks"; + license = lib.licenses.free; + }; + }) {}; helm-idris = callPackage ({ fetchFromGitHub, fetchurl, helm, idris-mode, lib, melpaBuild }: melpaBuild { pname = "helm-idris"; - version = "20141202.1157"; + version = "20141202.957"; src = fetchFromGitHub { owner = "david-christiansen"; repo = "helm-idris"; @@ -28084,7 +28214,7 @@ helm-img = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-img"; - version = "20151224.1721"; + version = "20151224.1521"; src = fetchFromGitHub { owner = "l3msh0"; repo = "helm-img"; @@ -28105,7 +28235,7 @@ helm-img-tiqav = callPackage ({ fetchFromGitHub, fetchurl, helm-img, lib, melpaBuild }: melpaBuild { pname = "helm-img-tiqav"; - version = "20151224.1722"; + version = "20151224.1522"; src = fetchFromGitHub { owner = "l3msh0"; repo = "helm-img-tiqav"; @@ -28126,7 +28256,7 @@ helm-ispell = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: melpaBuild { pname = "helm-ispell"; - version = "20151231.253"; + version = "20151231.53"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-helm-ispell"; @@ -28147,7 +28277,7 @@ helm-itunes = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-itunes"; - version = "20151013.148"; + version = "20151012.2348"; src = fetchFromGitHub { owner = "anschwa"; repo = "helm-itunes"; @@ -28168,7 +28298,7 @@ helm-j-cheatsheet = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-j-cheatsheet"; - version = "20131228.641"; + version = "20131228.441"; src = fetchFromGitHub { owner = "abo-abo"; repo = "helm-j-cheatsheet"; @@ -28189,7 +28319,7 @@ helm-jstack = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-jstack"; - version = "20150602.2322"; + version = "20150602.2122"; src = fetchFromGitHub { owner = "raghavgautam"; repo = "helm-jstack"; @@ -28210,7 +28340,7 @@ helm-lobsters = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-lobsters"; - version = "20150213.946"; + version = "20150213.746"; src = fetchFromGitHub { owner = "julienXX"; repo = "helm-lobste.rs"; @@ -28231,7 +28361,7 @@ helm-ls-git = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-ls-git"; - version = "20160407.2340"; + version = "20160407.2140"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-ls-git"; @@ -28252,7 +28382,7 @@ helm-ls-hg = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-ls-hg"; - version = "20150909.43"; + version = "20150908.2243"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-ls-hg"; @@ -28273,10 +28403,10 @@ helm-ls-svn = callPackage ({ cl-lib ? null, emacs, fetchsvn, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-ls-svn"; - version = "20150717.239"; + version = "20150717.39"; src = fetchsvn { url = "https://svn.macports.org/repository/macports/users/chunyang/helm-ls-svn.el"; - rev = "149847"; + rev = "150710"; sha256 = "0b7gah21rkfd43mb89lrwaqrrwq646abh7wi4q74sx796gmpz4dz"; }; recipeFile = fetchurl { @@ -28293,7 +28423,7 @@ helm-make = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }: melpaBuild { pname = "helm-make"; - version = "20160331.954"; + version = "20160331.754"; src = fetchFromGitHub { owner = "abo-abo"; repo = "helm-make"; @@ -28314,7 +28444,7 @@ helm-migemo = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, migemo }: melpaBuild { pname = "helm-migemo"; - version = "20151009.2256"; + version = "20151009.2056"; src = fetchFromGitHub { owner = "emacs-jp"; repo = "helm-migemo"; @@ -28335,7 +28465,7 @@ helm-mode-manager = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-mode-manager"; - version = "20151124.338"; + version = "20151124.138"; src = fetchFromGitHub { owner = "istib"; repo = "helm-mode-manager"; @@ -28356,7 +28486,7 @@ helm-mt = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, multi-term }: melpaBuild { pname = "helm-mt"; - version = "20151104.2320"; + version = "20151104.2120"; src = fetchFromGitHub { owner = "dfdeshom"; repo = "helm-mt"; @@ -28377,7 +28507,7 @@ helm-mu = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-mu"; - version = "20160531.1231"; + version = "20160531.1031"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-mu"; @@ -28398,7 +28528,7 @@ helm-nixos-options = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, nixos-options }: melpaBuild { pname = "helm-nixos-options"; - version = "20151013.1809"; + version = "20151013.1609"; src = fetchFromGitHub { owner = "travisbhartwell"; repo = "nix-emacs"; @@ -28419,7 +28549,7 @@ helm-notmuch = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, notmuch }: melpaBuild { pname = "helm-notmuch"; - version = "20160412.1406"; + version = "20160412.1206"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "helm-notmuch"; @@ -28440,7 +28570,7 @@ helm-open-github = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, gh, helm-core, lib, melpaBuild }: melpaBuild { pname = "helm-open-github"; - version = "20151226.842"; + version = "20151226.642"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-helm-open-github"; @@ -28461,12 +28591,12 @@ helm-org-rifle = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "helm-org-rifle"; - version = "20160420.1018"; + version = "20160420.818"; src = fetchFromGitHub { owner = "alphapapa"; repo = "helm-org-rifle"; - rev = "66b85c6ff1c73186ee9248c00f9221e023f18aa8"; - sha256 = "0glrbln15wang9n1h76dk19ykcgmc8hwphg1qcmc4fbbcgmh1a1p"; + rev = "598e88f0c0dcb37a0af8ee890be71d8522bd2748"; + sha256 = "0ab083b5n2jxqxbcvrriyw896j3gsb86k3ngwmjvvfk4bdyzgabp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle"; @@ -28482,7 +28612,7 @@ helm-orgcard = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: melpaBuild { pname = "helm-orgcard"; - version = "20151001.1024"; + version = "20151001.824"; src = fetchFromGitHub { owner = "emacs-jp"; repo = "helm-orgcard"; @@ -28503,7 +28633,7 @@ helm-package = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-package"; - version = "20151210.248"; + version = "20151210.48"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-helm-package"; @@ -28524,7 +28654,7 @@ helm-pages = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-pages"; - version = "20160321.2113"; + version = "20160321.1913"; src = fetchFromGitHub { owner = "david-christiansen"; repo = "helm-pages"; @@ -28545,12 +28675,12 @@ helm-perldoc = callPackage ({ cl-lib ? null, deferred, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: melpaBuild { pname = "helm-perldoc"; - version = "20151031.2227"; + version = "20160712.2137"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-helm-perldoc"; - rev = "a7347e0a4f1a1832060b3a7a1a3f3d2ed4f92f33"; - sha256 = "13wnagmgicl2mi4iksqckrjbaiz05j9ykbmvj26jy8zcbll5imfs"; + rev = "90a0ce4d2f4c77c486869ed3ecdbcb3f2014005e"; + sha256 = "0xkxl07y9z6zdh41m3dg9q35df2lsgbp298svlfygdm6rl5i2z0v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-perldoc"; @@ -28566,7 +28696,7 @@ helm-phpunit = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, phpunit }: melpaBuild { pname = "helm-phpunit"; - version = "20160513.353"; + version = "20160513.153"; src = fetchFromGitHub { owner = "eric-hansen"; repo = "helm-phpunit"; @@ -28587,7 +28717,7 @@ helm-proc = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-proc"; - version = "20160514.918"; + version = "20160514.718"; src = fetchFromGitHub { owner = "markus1189"; repo = "helm-proc"; @@ -28608,7 +28738,7 @@ helm-project-persist = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, project-persist }: melpaBuild { pname = "helm-project-persist"; - version = "20151210.943"; + version = "20151210.743"; src = fetchFromGitHub { owner = "Sliim"; repo = "helm-project-persist"; @@ -28629,12 +28759,12 @@ helm-projectile = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }: melpaBuild { pname = "helm-projectile"; - version = "20160614.1032"; + version = "20160709.2315"; src = fetchFromGitHub { owner = "bbatsov"; repo = "helm-projectile"; - rev = "f41141a93aa6c03ffb9fdb294b3caa19803b1d72"; - sha256 = "0z7vhidjb3fzy28kjg6v73sxd7fgdhxcmqx5qypv3czdjcl5911x"; + rev = "fc20f2c25ba9d357d122b8c78a272f98b9bc4a6f"; + sha256 = "0j69iryi9gmcybkhh6z8smzljn924hxdacj66i1r7d6741fa9bij"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc4e3a5af7ba86d277c73a1966a91c87d3d855a/recipes/helm-projectile"; @@ -28650,7 +28780,7 @@ helm-prosjekt = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, prosjekt }: melpaBuild { pname = "helm-prosjekt"; - version = "20140129.117"; + version = "20140128.2317"; src = fetchFromGitHub { owner = "abingham"; repo = "prosjekt"; @@ -28671,7 +28801,7 @@ helm-pt = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-pt"; - version = "20160214.1742"; + version = "20160214.1542"; src = fetchFromGitHub { owner = "ralesi"; repo = "helm-pt"; @@ -28692,7 +28822,7 @@ helm-purpose = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, window-purpose }: melpaBuild { pname = "helm-purpose"; - version = "20160218.1209"; + version = "20160218.1009"; src = fetchFromGitHub { owner = "bmag"; repo = "helm-purpose"; @@ -28713,7 +28843,7 @@ helm-pydoc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: melpaBuild { pname = "helm-pydoc"; - version = "20151008.924"; + version = "20151008.724"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-helm-pydoc"; @@ -28734,7 +28864,7 @@ helm-qiita = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-qiita"; - version = "20160528.811"; + version = "20160528.611"; src = fetchFromGitHub { owner = "masutaka"; repo = "emacs-helm-qiita"; @@ -28755,7 +28885,7 @@ helm-rails = callPackage ({ fetchFromGitHub, fetchurl, helm, inflections, lib, melpaBuild }: melpaBuild { pname = "helm-rails"; - version = "20130424.1019"; + version = "20130424.819"; src = fetchFromGitHub { owner = "asok"; repo = "helm-rails"; @@ -28776,7 +28906,7 @@ helm-rb = callPackage ({ fetchFromGitHub, fetchurl, helm, helm-ag-r, lib, melpaBuild }: melpaBuild { pname = "helm-rb"; - version = "20131123.1039"; + version = "20131123.839"; src = fetchFromGitHub { owner = "yuutayamada"; repo = "helm-rb"; @@ -28797,7 +28927,7 @@ helm-recoll = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-recoll"; - version = "20160605.1623"; + version = "20160605.1423"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-recoll"; @@ -28818,7 +28948,7 @@ helm-rhythmbox = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-rhythmbox"; - version = "20160524.658"; + version = "20160524.458"; src = fetchFromGitHub { owner = "mrBliss"; repo = "helm-rhythmbox"; @@ -28839,7 +28969,7 @@ helm-robe = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-robe"; - version = "20151208.2155"; + version = "20151208.1955"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-helm-robe"; @@ -28860,7 +28990,7 @@ helm-rubygems-local = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-rubygems-local"; - version = "20130711.2011"; + version = "20130711.1811"; src = fetchFromGitHub { owner = "hadashiA"; repo = "helm-rubygems-local"; @@ -28881,7 +29011,7 @@ helm-rubygems-org = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-rubygems-org"; - version = "20140826.656"; + version = "20140826.456"; src = fetchFromGitHub { owner = "neomantic"; repo = "helm-rubygems-org"; @@ -28902,7 +29032,7 @@ helm-safari = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-safari"; - version = "20160403.2224"; + version = "20160403.2024"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "helm-safari"; @@ -28923,7 +29053,7 @@ helm-sage = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, sage-shell-mode }: melpaBuild { pname = "helm-sage"; - version = "20160514.245"; + version = "20160514.45"; src = fetchFromGitHub { owner = "stakemori"; repo = "helm-sage"; @@ -28944,7 +29074,7 @@ helm-sheet = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-sheet"; - version = "20130630.739"; + version = "20130630.539"; src = fetchFromGitHub { owner = "yasuyk"; repo = "helm-sheet"; @@ -28965,7 +29095,7 @@ helm-smex = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, smex }: melpaBuild { pname = "helm-smex"; - version = "20160530.1436"; + version = "20160530.1236"; src = fetchFromGitHub { owner = "ptrv"; repo = "helm-smex"; @@ -28986,7 +29116,7 @@ helm-spaces = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, spaces }: melpaBuild { pname = "helm-spaces"; - version = "20160319.954"; + version = "20160319.754"; src = fetchFromGitHub { owner = "yasuyk"; repo = "helm-spaces"; @@ -29007,7 +29137,7 @@ helm-spotify = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, multi }: melpaBuild { pname = "helm-spotify"; - version = "20131014.1621"; + version = "20131014.1421"; src = fetchFromGitHub { owner = "krisajenkins"; repo = "helm-spotify"; @@ -29028,7 +29158,7 @@ helm-swoop = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-swoop"; - version = "20160619.1153"; + version = "20160619.953"; src = fetchFromGitHub { owner = "ShingoFukuyama"; repo = "helm-swoop"; @@ -29049,7 +29179,7 @@ helm-systemd = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, with-editor }: melpaBuild { pname = "helm-systemd"; - version = "20160518.133"; + version = "20160517.2333"; src = fetchFromGitHub { owner = "lompik"; repo = "helm-systemd"; @@ -29070,7 +29200,7 @@ helm-themes = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: melpaBuild { pname = "helm-themes"; - version = "20151009.121"; + version = "20151008.2321"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-helm-themes"; @@ -29091,16 +29221,16 @@ helm-unicode = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-unicode"; - version = "20150428.1354"; + version = "20160715.533"; src = fetchFromGitHub { - owner = "shosti"; + owner = "bomgar"; repo = "helm-unicode"; - rev = "cf08fea1235fdc9f900efc0742b021ca33ef65aa"; - sha256 = "1ypnsbx623gg3q07gxrbkn82jzy38sj4p52hj1wcb54qjqzyznkg"; + rev = "2193512aa1a46939a38a35189e307b9add68b58a"; + sha256 = "1cxhwcbbnsdi00pmjzy0f8rrgfnzyl0ar4kwqmnbsl6r8hmf29ly"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/2c35c6f876372c440bcf6133d5dfce7256f0743c/recipes/helm-unicode"; - sha256 = "052xqzvcfzpsbl75ylqb1khqndvc2dqdymqlwivs0darlds0w8y4"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/f720b9f9b667bf9ff3080938beab36aa0036dc92/recipes/helm-unicode"; + sha256 = "1j95qy2zwdb46dl30ankfx7013l0akc61m14s473j93w320j5224"; name = "helm-unicode"; }; packageRequires = [ emacs helm ]; @@ -29112,7 +29242,7 @@ helm-w32-launcher = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-w32-launcher"; - version = "20141223.1414"; + version = "20141223.1214"; src = fetchFromGitHub { owner = "Fanael"; repo = "helm-w32-launcher"; @@ -29133,7 +29263,7 @@ helm-w3m = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, w3m }: melpaBuild { pname = "helm-w3m"; - version = "20150722.1024"; + version = "20150722.824"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-w3m"; @@ -29154,7 +29284,7 @@ helm-wordnet = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-wordnet"; - version = "20160128.907"; + version = "20160128.707"; src = fetchFromGitHub { owner = "raghavgautam"; repo = "helm-wordnet"; @@ -29175,7 +29305,7 @@ helm-words = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-words"; - version = "20150413.1518"; + version = "20150413.1318"; src = fetchFromGitHub { owner = "pronobis"; repo = "helm-words"; @@ -29196,7 +29326,7 @@ helm-xcdoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-xcdoc"; - version = "20160116.418"; + version = "20160116.218"; src = fetchFromGitHub { owner = "fujimisakari"; repo = "emacs-helm-xcdoc"; @@ -29217,7 +29347,7 @@ helm-zhihu-daily = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-zhihu-daily"; - version = "20160625.645"; + version = "20160625.445"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "helm-zhihu-daily"; @@ -29237,7 +29367,7 @@ }) {}; help-fns-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "help-fns-plus"; - version = "20151215.837"; + version = "20151215.637"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/help-fns+.el"; sha256 = "00x3ln7x4d6r422x845smf3h0x1z85l5jqyjkrllqcs7qijcrk5w"; @@ -29255,7 +29385,7 @@ }) {}; help-mode-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "help-mode-plus"; - version = "20151231.1531"; + version = "20151231.1331"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/help-mode+.el"; sha256 = "0qmf81maq6yvs68b8vlbxwkjk72qldamq75znrma9mhvlv8igrgx"; @@ -29273,7 +29403,7 @@ }) {}; help-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "help-plus"; - version = "20151231.1528"; + version = "20151231.1328"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/help+.el"; sha256 = "1r7kf9plnsjx87bhflsdh47wybvhis7gb10izqa1p6w0aqsg178s"; @@ -29292,7 +29422,7 @@ hemisu-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hemisu-theme"; - version = "20130508.1344"; + version = "20130508.1144"; src = fetchFromGitHub { owner = "andrzejsliwa"; repo = "hemisu-theme"; @@ -29313,7 +29443,7 @@ heroku = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "heroku"; - version = "20120629.1313"; + version = "20120629.1113"; src = fetchFromGitHub { owner = "technomancy"; repo = "heroku.el"; @@ -29334,7 +29464,7 @@ heroku-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "heroku-theme"; - version = "20150522.2119"; + version = "20150522.1919"; src = fetchFromGitHub { owner = "jonathanchu"; repo = "heroku-theme"; @@ -29355,7 +29485,7 @@ hexo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hexo"; - version = "20160423.1017"; + version = "20160423.817"; src = fetchFromGitHub { owner = "kuanyui"; repo = "hexo.el"; @@ -29375,7 +29505,7 @@ }) {}; hexrgb = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "hexrgb"; - version = "20151231.1532"; + version = "20151231.1332"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/hexrgb.el"; sha256 = "0rqjidjxa5j6rjknklfks743lczbq3qsyiranrf2z3ghzi0gf7fd"; @@ -29394,12 +29524,12 @@ hfst-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hfst-mode"; - version = "20160524.653"; + version = "20160708.502"; src = fetchFromGitHub { owner = "unhammer"; repo = "hfst-mode"; - rev = "11a42889a3cac488d3293e011f8ebc189ca71658"; - sha256 = "1yi01qsgbmhmdgxdjfvgi2s9ijnq9x1y3j9yc1jwz89p0pc5dm1y"; + rev = "ac1bb9dd92545d3e7fdc05c83996c227cc15c6b8"; + sha256 = "0zsz8542kh51clzy8j7g29bwm8zcnfxm9sjzh3xjpqk2ziqf4ii6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e324bb114997f9cc57d76d8a66fec4ff4d1d71fe/recipes/hfst-mode"; @@ -29415,7 +29545,7 @@ hgignore-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hgignore-mode"; - version = "20160430.1907"; + version = "20160430.1707"; src = fetchFromGitHub { owner = "omajid"; repo = "hgignore-mode"; @@ -29436,7 +29566,7 @@ hgrc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hgrc-mode"; - version = "20150409.1543"; + version = "20150409.1343"; src = fetchFromGitHub { owner = "omajid"; repo = "hgrc-mode"; @@ -29457,7 +29587,7 @@ hi2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hi2"; - version = "20141005.1431"; + version = "20141005.1231"; src = fetchFromGitHub { owner = "nilcons"; repo = "hi2"; @@ -29477,7 +29607,7 @@ }) {}; hide-comnt = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "hide-comnt"; - version = "20151231.1533"; + version = "20151231.1333"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/hide-comnt.el"; sha256 = "1l5jvgjgd0kzv1sn6h467fbnl487hma4h4pkwq4x1dhbc26yvfpz"; @@ -29495,7 +29625,7 @@ }) {}; hide-lines = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "hide-lines"; - version = "20151127.1240"; + version = "20151127.1040"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/hide-lines.el"; sha256 = "1q87yp1pr62cza3pqimqd09a39yyij4c7pncdww84zz7cii9qrn2"; @@ -29513,7 +29643,7 @@ }) {}; hide-region = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "hide-region"; - version = "20140201.514"; + version = "20140201.314"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/hide-region.el"; sha256 = "1zxrygpf47bzj6p808r3qhj3dfr3m8brp1xgxs33c7f88rinfval"; @@ -29532,7 +29662,7 @@ hideshow-org = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hideshow-org"; - version = "20120223.1650"; + version = "20120223.1450"; src = fetchFromGitHub { owner = "shanecelis"; repo = "hideshow-org"; @@ -29552,7 +29682,7 @@ }) {}; hideshowvis = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "hideshowvis"; - version = "20130824.700"; + version = "20130824.500"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/hideshowvis.el"; sha256 = "15ax1j3j7kylyc8a91ja825sp4mhbdgx0j4i5kqxwhvmwvpmyrv6"; @@ -29570,7 +29700,7 @@ }) {}; highlight = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight"; - version = "20160617.817"; + version = "20160617.617"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/highlight.el"; sha256 = "1g0csgabcaxfvv92bmqkmyqp2jlal8gj6c6ghz83a2r185ba0jji"; @@ -29589,7 +29719,7 @@ highlight-blocks = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight-blocks"; - version = "20151201.1015"; + version = "20151201.815"; src = fetchFromGitHub { owner = "Fanael"; repo = "highlight-blocks"; @@ -29609,7 +29739,7 @@ }) {}; highlight-chars = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight-chars"; - version = "20151231.1535"; + version = "20151231.1335"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/highlight-chars.el"; sha256 = "18y6cw43mhizccvwfydv6g2kz8w7vff0n3k9sq5ghwq3rb3z14b2"; @@ -29627,7 +29757,7 @@ }) {}; highlight-cl = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight-cl"; - version = "20091012.1230"; + version = "20091012.1030"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/highlight-cl.el"; sha256 = "0r3kzs2fsi3kl5gqmsv75dc7lgfl4imrrqhg09ij6kq1ri8gjxjw"; @@ -29646,7 +29776,7 @@ highlight-current-line = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight-current-line"; - version = "20051013.1256"; + version = "20051013.1056"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/highlight-current-line.el"; sha256 = "1aki7a7nnj9n7vh19k4fr0v7cqbwkrpc6b3f3yv95vcqj8a4y34c"; @@ -29665,7 +29795,7 @@ highlight-defined = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight-defined"; - version = "20141225.930"; + version = "20141225.730"; src = fetchFromGitHub { owner = "Fanael"; repo = "highlight-defined"; @@ -29686,7 +29816,7 @@ highlight-escape-sequences = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight-escape-sequences"; - version = "20151231.612"; + version = "20151231.412"; src = fetchFromGitHub { owner = "dgutov"; repo = "highlight-escape-sequences"; @@ -29707,12 +29837,12 @@ highlight-indent-guides = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight-indent-guides"; - version = "20160622.1438"; + version = "20160708.1329"; src = fetchFromGitHub { owner = "DarthFennec"; repo = "highlight-indent-guides"; - rev = "2371a0884afb318e03c236bb4f2b700aa6fd4cf2"; - sha256 = "1gnyf90rnglz9djhcl1gfilwvdynfigg591529mv762b2sy8rkcv"; + rev = "81a21cf1099cbbed89b321b9ec38682df6e33b4a"; + sha256 = "04vmb0596cvmv0g882nazjv2cylja6wb3k1if5d9ylg2ykqr3z2l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c8acca65a5c134d4405900a43b422c4f4e18b586/recipes/highlight-indent-guides"; @@ -29728,7 +29858,7 @@ highlight-indentation = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight-indentation"; - version = "20150307.408"; + version = "20150307.208"; src = fetchFromGitHub { owner = "antonj"; repo = "Highlight-Indentation-for-Emacs"; @@ -29749,7 +29879,7 @@ highlight-leading-spaces = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight-leading-spaces"; - version = "20151216.622"; + version = "20151216.422"; src = fetchFromGitHub { owner = "mrBliss"; repo = "highlight-leading-spaces"; @@ -29770,12 +29900,12 @@ highlight-numbers = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parent-mode }: melpaBuild { pname = "highlight-numbers"; - version = "20160516.459"; + version = "20160717.1228"; src = fetchFromGitHub { owner = "Fanael"; repo = "highlight-numbers"; - rev = "c5e7a5d71dd6c78c52ec8edbe025c7261c8e5d30"; - sha256 = "083jmw9jaxj5d5f0b0gxxb0gjdi4dv1sm66559105slbkl2nsa3f"; + rev = "b7adef0286aaa5bca8e98a12d0ffed3a880e25aa"; + sha256 = "1r07mpyr7rhd7bkg778hx6vbhb4n9ixgzkpszhgks7ri6ia38pj8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/882e3a4877ddd22cc52f56f0ce3d55b6e4831c7a/recipes/highlight-numbers"; @@ -29791,7 +29921,7 @@ highlight-operators = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight-operators"; - version = "20160517.1549"; + version = "20160517.1349"; src = fetchhg { url = "https://bitbucket.com/jpkotta/highlight-operators"; rev = "c06a29726f3e"; @@ -29811,7 +29941,7 @@ highlight-parentheses = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight-parentheses"; - version = "20151108.116"; + version = "20151107.2316"; src = fetchFromGitHub { owner = "tsdh"; repo = "highlight-parentheses.el"; @@ -29832,7 +29962,7 @@ highlight-quoted = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight-quoted"; - version = "20140916.1322"; + version = "20140916.1122"; src = fetchFromGitHub { owner = "Fanael"; repo = "highlight-quoted"; @@ -29853,7 +29983,7 @@ highlight-stages = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight-stages"; - version = "20150421.2257"; + version = "20150421.2057"; src = fetchFromGitHub { owner = "zk-phi"; repo = "highlight-stages"; @@ -29874,7 +30004,7 @@ highlight-symbol = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight-symbol"; - version = "20160102.1409"; + version = "20160102.1209"; src = fetchFromGitHub { owner = "nschum"; repo = "highlight-symbol.el"; @@ -29894,7 +30024,7 @@ }) {}; highlight-tail = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight-tail"; - version = "20140415.2041"; + version = "20140415.1841"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/highlight-tail.el"; sha256 = "1bbiyqddqkrp3c7xsg1m4143611bhg1kkakrwscqjb4cfmx29qqg"; @@ -29913,7 +30043,7 @@ highlight-thing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight-thing"; - version = "20160220.1842"; + version = "20160220.1642"; src = fetchFromGitHub { owner = "fgeller"; repo = "highlight-thing.el"; @@ -29934,7 +30064,7 @@ highlight-unique-symbol = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight-unique-symbol"; - version = "20130612.42"; + version = "20130611.2242"; src = fetchFromGitHub { owner = "hitode909"; repo = "emacs-highlight-unique-symbol"; @@ -29955,7 +30085,7 @@ highlight2clipboard = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild }: melpaBuild { pname = "highlight2clipboard"; - version = "20151020.1340"; + version = "20151020.1140"; src = fetchFromGitHub { owner = "Lindydancer"; repo = "highlight2clipboard"; @@ -29976,12 +30106,12 @@ hindent = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hindent"; - version = "20151113.224"; + version = "20151113.24"; src = fetchFromGitHub { owner = "chrisdone"; repo = "hindent"; - rev = "8158089e71b5fa3792e5349cff70fe9fdeb7a46b"; - sha256 = "1y52fpqc85ihfbwcb2zy91dgg40jrjj8mmrf8h8s693442rj6ip3"; + rev = "99f30377cc74672ec2c4195b564a777ce64b0816"; + sha256 = "15kqfn93nrfxsqdj0ycq300ki254sms0c4pdnl0lpwnmm7gd392f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent"; @@ -29997,7 +30127,7 @@ hippie-exp-ext = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hippie-exp-ext"; - version = "20160502.1826"; + version = "20160502.1626"; src = fetchFromGitHub { owner = "rubikitch"; repo = "hippie-exp-ext"; @@ -30018,7 +30148,7 @@ hippie-expand-slime = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hippie-expand-slime"; - version = "20130907.332"; + version = "20130907.132"; src = fetchFromGitHub { owner = "purcell"; repo = "hippie-expand-slime"; @@ -30039,7 +30169,7 @@ hippie-namespace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hippie-namespace"; - version = "20140508.1541"; + version = "20140508.1341"; src = fetchFromGitHub { owner = "rolandwalker"; repo = "hippie-namespace"; @@ -30060,7 +30190,7 @@ hipster-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hipster-theme"; - version = "20141205.2205"; + version = "20141205.2005"; src = fetchFromGitHub { owner = "xzerocode"; repo = "hipster-theme"; @@ -30081,7 +30211,7 @@ history = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "history"; - version = "20150409.1934"; + version = "20150409.1734"; src = fetchFromGitHub { owner = "boyw165"; repo = "history"; @@ -30102,7 +30232,7 @@ historyf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "historyf"; - version = "20151123.1959"; + version = "20151123.1759"; src = fetchFromGitHub { owner = "k1LoW"; repo = "emacs-historyf"; @@ -30123,7 +30253,7 @@ hive = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, sql ? null }: melpaBuild { pname = "hive"; - version = "20131217.912"; + version = "20131217.712"; src = fetchFromGitHub { owner = "r0man"; repo = "hive-el"; @@ -30144,7 +30274,7 @@ hiwin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hiwin"; - version = "20150825.327"; + version = "20150825.127"; src = fetchFromGitHub { owner = "yoshida-mediba"; repo = "hiwin-mode"; @@ -30165,7 +30295,7 @@ hl-anything = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hl-anything"; - version = "20160422.1208"; + version = "20160422.1008"; src = fetchFromGitHub { owner = "hl-anything"; repo = "hl-anything-emacs"; @@ -30185,7 +30315,7 @@ }) {}; hl-defined = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "hl-defined"; - version = "20151231.1538"; + version = "20151231.1338"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/hl-defined.el"; sha256 = "170sz6hjd85cw1x0y2g81ks3x3niib4f7y2xz6k8x0dpw357ggv3"; @@ -30204,7 +30334,7 @@ hl-indent = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hl-indent"; - version = "20141227.1530"; + version = "20141227.1330"; src = fetchFromGitHub { owner = "ikirill"; repo = "hl-indent"; @@ -30224,7 +30354,7 @@ }) {}; hl-line-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "hl-line-plus"; - version = "20151231.1539"; + version = "20151231.1339"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/hl-line+.el"; sha256 = "1kxq79pfs83gp12p2g093m6shsf25q88mi29bvhapxx77ahmxpkn"; @@ -30243,7 +30373,7 @@ hl-sentence = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hl-sentence"; - version = "20140802.1120"; + version = "20140802.920"; src = fetchFromGitHub { owner = "milkypostman"; repo = "hl-sentence"; @@ -30264,7 +30394,7 @@ hl-sexp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hl-sexp"; - version = "20101130.643"; + version = "20101130.443"; src = fetchFromGitHub { owner = "emacsmirror"; repo = "hl-sexp"; @@ -30284,7 +30414,7 @@ }) {}; hl-spotlight = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "hl-spotlight"; - version = "20151231.1540"; + version = "20151231.1340"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/hl-spotlight.el"; sha256 = "0m84d1rdsp9r5ip79jlrp69pf1daw0ch8c378q3kc328606i3p2d"; @@ -30303,7 +30433,7 @@ hl-todo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hl-todo"; - version = "20160606.915"; + version = "20160606.715"; src = fetchFromGitHub { owner = "tarsius"; repo = "hl-todo"; @@ -30324,7 +30454,7 @@ hlint-refactor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hlint-refactor"; - version = "20151124.1441"; + version = "20151124.1241"; src = fetchFromGitHub { owner = "mpickering"; repo = "hlint-refactor-mode"; @@ -30345,7 +30475,7 @@ hlinum = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hlinum"; - version = "20160521.2312"; + version = "20160521.2112"; src = fetchFromGitHub { owner = "tom-tan"; repo = "hlinum-mode"; @@ -30366,7 +30496,7 @@ hoa-mode = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hoa-mode"; - version = "20151203.1050"; + version = "20151203.850"; src = fetchgit { url = "https://gitlab.lrde.epita.fr/spot/emacs-modes.git"; rev = "3c608e15b655d2375c5f81323ac561c7848dc029"; @@ -30386,7 +30516,7 @@ hoa-pp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }: melpaBuild { pname = "hoa-pp-mode"; - version = "20151027.236"; + version = "20151027.36"; src = fetchFromGitHub { owner = "hoaproject"; repo = "Contributions-Emacs-Pp"; @@ -30407,7 +30537,7 @@ homebrew-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }: melpaBuild { pname = "homebrew-mode"; - version = "20160615.820"; + version = "20160615.620"; src = fetchFromGitHub { owner = "dunn"; repo = "homebrew-mode"; @@ -30428,7 +30558,7 @@ hookify = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "hookify"; - version = "20141216.1609"; + version = "20141216.1409"; src = fetchFromGitHub { owner = "Silex"; repo = "hookify"; @@ -30449,7 +30579,7 @@ hound = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, web }: melpaBuild { pname = "hound"; - version = "20150217.1149"; + version = "20150217.949"; src = fetchFromGitHub { owner = "ryoung786"; repo = "hound.el"; @@ -30470,7 +30600,7 @@ how-many-lines-in-project = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "how-many-lines-in-project"; - version = "20140806.2342"; + version = "20140806.2142"; src = fetchFromGitHub { owner = "hiddenlotus"; repo = "how-many-lines-in-project"; @@ -30491,7 +30621,7 @@ howdoi = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "howdoi"; - version = "20150203.1843"; + version = "20150203.1643"; src = fetchFromGitHub { owner = "atykhonov"; repo = "emacs-howdoi"; @@ -30512,7 +30642,7 @@ howm = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "howm"; - version = "20160405.718"; + version = "20160405.518"; src = fetchgit { url = "git://git.osdn.jp/gitroot/howm/howm.git"; rev = "6d6b4ca60e5c164a3e284ba82156b8ae33e83b7a"; @@ -30532,7 +30662,7 @@ ht = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ht"; - version = "20150830.1315"; + version = "20150830.1115"; src = fetchFromGitHub { owner = "Wilfred"; repo = "ht.el"; @@ -30553,7 +30683,7 @@ html-check-frag = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "html-check-frag"; - version = "20160130.2335"; + version = "20160130.2135"; src = fetchFromGitHub { owner = "TobiasZawada"; repo = "html-check-frag"; @@ -30574,7 +30704,7 @@ html-script-src = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "html-script-src"; - version = "20120403.1315"; + version = "20120403.1115"; src = fetchFromGitHub { owner = "rejeep"; repo = "html-script-src.el"; @@ -30595,7 +30725,7 @@ html-to-markdown = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "html-to-markdown"; - version = "20151105.240"; + version = "20151105.40"; src = fetchFromGitHub { owner = "Malabarba"; repo = "html-to-markdown"; @@ -30615,7 +30745,7 @@ }) {}; htmlize = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "htmlize"; - version = "20130207.1402"; + version = "20130207.1202"; src = fetchgit { url = "http://fly.srk.fer.hr/~hniksic/emacs/htmlize.git"; rev = "aa6e2f6dba6fdfa200c7c55efe29ff63380eac8f"; @@ -30635,7 +30765,7 @@ http = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "http"; - version = "20160701.2225"; + version = "20160701.2025"; src = fetchFromGitHub { owner = "emacs-pe"; repo = "http.el"; @@ -30655,7 +30785,7 @@ }) {}; http-post-simple = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "http-post-simple"; - version = "20131010.2258"; + version = "20131010.2058"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/http-post-simple.el"; sha256 = "1wp2rwc1hgd5c3yr6b96yzzakd1qmy5d95mhc6q4f6lx279nx0my"; @@ -30674,7 +30804,7 @@ http-twiddle = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "http-twiddle"; - version = "20151121.744"; + version = "20151121.544"; src = fetchFromGitHub { owner = "hassy"; repo = "http-twiddle"; @@ -30695,7 +30825,7 @@ httpcode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "httpcode"; - version = "20121001.2245"; + version = "20121001.2045"; src = fetchFromGitHub { owner = "rspivak"; repo = "httpcode.el"; @@ -30716,7 +30846,7 @@ httprepl = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "httprepl"; - version = "20141101.1234"; + version = "20141101.1034"; src = fetchFromGitHub { owner = "gregsexton"; repo = "httprepl.el"; @@ -30737,7 +30867,7 @@ hungry-delete = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hungry-delete"; - version = "20151203.1514"; + version = "20151203.1314"; src = fetchFromGitHub { owner = "nflath"; repo = "hungry-delete"; @@ -30758,7 +30888,7 @@ hy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hy-mode"; - version = "20151025.743"; + version = "20151025.543"; src = fetchFromGitHub { owner = "hylang"; repo = "hy-mode"; @@ -30779,7 +30909,7 @@ hyai = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hyai"; - version = "20160319.2035"; + version = "20160319.1835"; src = fetchFromGitHub { owner = "iquiw"; repo = "hyai"; @@ -30800,7 +30930,7 @@ hydandata-light-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hydandata-light-theme"; - version = "20160122.1953"; + version = "20160122.1753"; src = fetchFromGitHub { owner = "hydandata"; repo = "hydandata-light-theme"; @@ -30821,7 +30951,7 @@ hyde = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hyde"; - version = "20160507.2208"; + version = "20160507.2008"; src = fetchFromGitHub { owner = "nibrahim"; repo = "Hyde"; @@ -30842,7 +30972,7 @@ hydra = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hydra"; - version = "20160702.229"; + version = "20160702.29"; src = fetchFromGitHub { owner = "abo-abo"; repo = "hydra"; @@ -30863,7 +30993,7 @@ i2b2-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "i2b2-mode"; - version = "20140709.2004"; + version = "20140709.1804"; src = fetchFromGitHub { owner = "danlamanna"; repo = "i2b2-mode"; @@ -30884,7 +31014,7 @@ iasm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "iasm-mode"; - version = "20131004.1844"; + version = "20131004.1644"; src = fetchFromGitHub { owner = "RAttab"; repo = "iasm-mode"; @@ -30905,7 +31035,7 @@ ibuffer-git = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ibuffer-git"; - version = "20110508.231"; + version = "20110508.31"; src = fetchFromGitHub { owner = "jrockway"; repo = "ibuffer-git"; @@ -30926,7 +31056,7 @@ ibuffer-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "ibuffer-projectile"; - version = "20150121.1037"; + version = "20150121.837"; src = fetchFromGitHub { owner = "purcell"; repo = "ibuffer-projectile"; @@ -30947,7 +31077,7 @@ ibuffer-rcirc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ibuffer-rcirc"; - version = "20150215.1518"; + version = "20150215.1318"; src = fetchFromGitHub { owner = "fgallina"; repo = "ibuffer-rcirc"; @@ -30968,7 +31098,7 @@ ibuffer-tramp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ibuffer-tramp"; - version = "20151118.1139"; + version = "20151118.939"; src = fetchFromGitHub { owner = "svend"; repo = "ibuffer-tramp"; @@ -30989,7 +31119,7 @@ ibuffer-vc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ibuffer-vc"; - version = "20150714.1520"; + version = "20150714.1320"; src = fetchFromGitHub { owner = "purcell"; repo = "ibuffer-vc"; @@ -31009,7 +31139,7 @@ }) {}; icicles = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "icicles"; - version = "20160701.1122"; + version = "20160701.922"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/icicles.el"; sha256 = "0x082kilmzq26f9pwwbq2bid98s9mjyfwljcwz2qlj8fbihwjn6l"; @@ -31027,10 +31157,10 @@ }) {}; icomplete-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "icomplete-plus"; - version = "20151231.1600"; + version = "20160704.1959"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/icomplete+.el"; - sha256 = "0z7v4pj0m6pwrjzyzz2xmwf6a53kmka9hxlzd1dxcpzx47pyvz3w"; + sha256 = "1rncxvai45akrg1qp0rzf3f821r52bp47mf2bpfnba86bnsl396c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fade28733f33e52a8622479de201f451c9a31c11/recipes/icomplete+"; @@ -31046,7 +31176,7 @@ id-manager = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "id-manager"; - version = "20160425.416"; + version = "20160425.216"; src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-id-manager"; @@ -31067,7 +31197,7 @@ idea-darkula-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "idea-darkula-theme"; - version = "20160416.1803"; + version = "20160416.1603"; src = fetchFromGitHub { owner = "fourier"; repo = "idea-darkula-theme"; @@ -31088,7 +31218,7 @@ identica-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "identica-mode"; - version = "20130204.1653"; + version = "20130204.1453"; src = fetchFromGitHub { owner = "gabrielsaldana"; repo = "Emacs-Identica-mode"; @@ -31109,7 +31239,7 @@ idle-highlight-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "idle-highlight-mode"; - version = "20120920.1148"; + version = "20120920.948"; src = fetchFromGitHub { owner = "nonsequitur"; repo = "idle-highlight-mode"; @@ -31130,7 +31260,7 @@ idle-require = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "idle-require"; - version = "20090715.1703"; + version = "20090715.1503"; src = fetchFromGitHub { owner = "nschum"; repo = "idle-require.el"; @@ -31151,7 +31281,7 @@ ido-at-point = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ido-at-point"; - version = "20151021.257"; + version = "20151021.57"; src = fetchFromGitHub { owner = "katspaugh"; repo = "ido-at-point"; @@ -31172,7 +31302,7 @@ ido-clever-match = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ido-clever-match"; - version = "20151011.1226"; + version = "20151011.1026"; src = fetchFromGitHub { owner = "Bogdanp"; repo = "ido-clever-match"; @@ -31193,7 +31323,7 @@ ido-complete-space-or-hyphen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ido-complete-space-or-hyphen"; - version = "20130228.408"; + version = "20130228.208"; src = fetchFromGitHub { owner = "doitian"; repo = "ido-complete-space-or-hyphen"; @@ -31214,7 +31344,7 @@ ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ido-completing-read-plus"; - version = "20160623.1015"; + version = "20160623.815"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "ido-ubiquitous"; @@ -31235,7 +31365,7 @@ ido-describe-bindings = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ido-describe-bindings"; - version = "20160105.253"; + version = "20160105.53"; src = fetchFromGitHub { owner = "danil"; repo = "ido-describe-bindings"; @@ -31256,7 +31386,7 @@ ido-exit-target = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ido-exit-target"; - version = "20150904.937"; + version = "20150904.737"; src = fetchFromGitHub { owner = "waymondo"; repo = "ido-exit-target"; @@ -31277,7 +31407,7 @@ ido-gnus = callPackage ({ fetchFromGitHub, fetchurl, gnus ? null, lib, melpaBuild }: melpaBuild { pname = "ido-gnus"; - version = "20140216.1046"; + version = "20140216.846"; src = fetchFromGitHub { owner = "vapniks"; repo = "ido-gnus"; @@ -31298,7 +31428,7 @@ ido-grid-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ido-grid-mode"; - version = "20160122.539"; + version = "20160122.339"; src = fetchFromGitHub { owner = "larkery"; repo = "ido-grid-mode.el"; @@ -31319,7 +31449,7 @@ ido-hacks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ido-hacks"; - version = "20150331.1409"; + version = "20150331.1209"; src = fetchFromGitHub { owner = "scottjad"; repo = "ido-hacks"; @@ -31340,7 +31470,7 @@ ido-load-library = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, persistent-soft }: melpaBuild { pname = "ido-load-library"; - version = "20140611.1100"; + version = "20140611.900"; src = fetchFromGitHub { owner = "rolandwalker"; repo = "ido-load-library"; @@ -31361,7 +31491,7 @@ ido-migemo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, migemo }: melpaBuild { pname = "ido-migemo"; - version = "20150921.1744"; + version = "20150921.1544"; src = fetchFromGitHub { owner = "myuhe"; repo = "ido-migemo.el"; @@ -31382,7 +31512,7 @@ ido-occasional = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ido-occasional"; - version = "20150214.648"; + version = "20150214.448"; src = fetchFromGitHub { owner = "abo-abo"; repo = "ido-occasional"; @@ -31403,7 +31533,7 @@ ido-occur = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ido-occur"; - version = "20160527.609"; + version = "20160527.409"; src = fetchFromGitHub { owner = "danil"; repo = "ido-occur"; @@ -31424,7 +31554,7 @@ ido-select-window = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ido-select-window"; - version = "20131220.1447"; + version = "20131220.1247"; src = fetchFromGitHub { owner = "pjones"; repo = "ido-select-window"; @@ -31445,7 +31575,7 @@ ido-skk = callPackage ({ ddskk, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ido-skk"; - version = "20151111.350"; + version = "20151111.150"; src = fetchFromGitHub { owner = "tsukimizake"; repo = "ido-skk"; @@ -31466,7 +31596,7 @@ ido-sort-mtime = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ido-sort-mtime"; - version = "20131117.730"; + version = "20131117.530"; src = fetchFromGitHub { owner = "pkkm"; repo = "ido-sort-mtime"; @@ -31487,7 +31617,7 @@ ido-springboard = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ido-springboard"; - version = "20150505.1211"; + version = "20150505.1011"; src = fetchFromGitHub { owner = "jwiegley"; repo = "springboard"; @@ -31508,7 +31638,7 @@ ido-ubiquitous = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }: melpaBuild { pname = "ido-ubiquitous"; - version = "20160623.1015"; + version = "20160623.815"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "ido-ubiquitous"; @@ -31529,7 +31659,7 @@ ido-vertical-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ido-vertical-mode"; - version = "20160429.1237"; + version = "20160429.1037"; src = fetchFromGitHub { owner = "creichert"; repo = "ido-vertical-mode.el"; @@ -31550,7 +31680,7 @@ ido-yes-or-no = callPackage ({ fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }: melpaBuild { pname = "ido-yes-or-no"; - version = "20160217.1817"; + version = "20160217.1617"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "ido-yes-or-no"; @@ -31571,7 +31701,7 @@ idomenu = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "idomenu"; - version = "20141123.1520"; + version = "20141123.1320"; src = fetchFromGitHub { owner = "birkenfeld"; repo = "idomenu"; @@ -31592,7 +31722,7 @@ idris-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, prop-menu }: melpaBuild { pname = "idris-mode"; - version = "20160302.835"; + version = "20160302.635"; src = fetchFromGitHub { owner = "idris-hackers"; repo = "idris-mode"; @@ -31613,7 +31743,7 @@ ids-edit = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ids-edit"; - version = "20160324.1722"; + version = "20160324.1522"; src = fetchFromGitHub { owner = "kawabata"; repo = "ids-edit"; @@ -31634,7 +31764,7 @@ iedit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "iedit"; - version = "20160624.1056"; + version = "20160624.856"; src = fetchFromGitHub { owner = "victorhge"; repo = "iedit"; @@ -31655,7 +31785,7 @@ ietf-docs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ietf-docs"; - version = "20150928.457"; + version = "20150928.257"; src = fetchFromGitHub { owner = "choppsv1"; repo = "ietf-docs"; @@ -31676,7 +31806,7 @@ iflipb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "iflipb"; - version = "20141123.1516"; + version = "20141123.1316"; src = fetchFromGitHub { owner = "jrosdahl"; repo = "iflipb"; @@ -31697,7 +31827,7 @@ ignoramus = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ignoramus"; - version = "20160414.909"; + version = "20160414.709"; src = fetchFromGitHub { owner = "rolandwalker"; repo = "ignoramus"; @@ -31717,7 +31847,7 @@ }) {}; igrep = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "igrep"; - version = "20130824.707"; + version = "20130824.507"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/igrep.el"; sha256 = "0qiv69v7ig38iizif7zg8aljdmpa1jk8bsfa0iyhqqqrkvsmhc29"; @@ -31735,7 +31865,7 @@ }) {}; igv = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "igv"; - version = "20141210.627"; + version = "20141210.427"; src = fetchgit { url = "https://bitbucket.org/sbarbit/eigv"; rev = "47ac6ceede252f451348a2c696398c0cb5279555"; @@ -31755,7 +31885,7 @@ image-archive = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "image-archive"; - version = "20150620.2032"; + version = "20150620.1832"; src = fetchFromGitHub { owner = "mhayashi1120"; repo = "Emacs-image-archive"; @@ -31776,7 +31906,7 @@ image-dired-plus = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "image-dired-plus"; - version = "20150430.44"; + version = "20150429.2244"; src = fetchFromGitHub { owner = "mhayashi1120"; repo = "Emacs-image-diredx"; @@ -31797,7 +31927,7 @@ image-plus = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "image-plus"; - version = "20150707.1116"; + version = "20150707.916"; src = fetchFromGitHub { owner = "mhayashi1120"; repo = "Emacs-imagex"; @@ -31818,7 +31948,7 @@ imakado = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "imakado"; - version = "20141024.423"; + version = "20141024.223"; src = fetchFromGitHub { owner = "imakado"; repo = "emacs-imakado"; @@ -31839,7 +31969,7 @@ imapfilter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "imapfilter"; - version = "20160419.446"; + version = "20160419.246"; src = fetchFromGitHub { owner = "tarsius"; repo = "imapfilter"; @@ -31860,12 +31990,12 @@ imenu-anywhere = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "imenu-anywhere"; - version = "20160629.1753"; + version = "20160722.1440"; src = fetchFromGitHub { owner = "vspinu"; repo = "imenu-anywhere"; - rev = "7588aff2e1ca9303e67c9fafb5346123b4bf7684"; - sha256 = "1471r94lwvfz5maap2qbwhfbva9d0fgfv1w0fyrs7bfcf8zzbdlb"; + rev = "03fa805fe9104fec8e9eda5f58be583eb9bd28e6"; + sha256 = "1bfishspj2szc3qr1i22wryjshfhbdvfxwb41pi108bm5fmyxjam"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/imenu-anywhere"; @@ -31881,7 +32011,7 @@ imenu-list = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "imenu-list"; - version = "20160211.541"; + version = "20160211.341"; src = fetchFromGitHub { owner = "bmag"; repo = "imenu-list"; @@ -31901,7 +32031,7 @@ }) {}; imenu-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "imenu-plus"; - version = "20151231.1601"; + version = "20151231.1401"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/imenu+.el"; sha256 = "00w88d37mg2hdrzpw5cxrgqz5jbf7rylmir95hs8j1cm8fk787bb"; @@ -31920,7 +32050,7 @@ imenus = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "imenus"; - version = "20160220.1532"; + version = "20160220.1332"; src = fetchFromGitHub { owner = "alezost"; repo = "imenus.el"; @@ -31941,7 +32071,7 @@ imgix = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, ht, json ? null, lib, melpaBuild, s }: melpaBuild { pname = "imgix"; - version = "20141226.1532"; + version = "20141226.1332"; src = fetchFromGitHub { owner = "imgix"; repo = "imgix-emacs"; @@ -31962,7 +32092,7 @@ imgur = callPackage ({ anything, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "imgur"; - version = "20120307.425"; + version = "20120307.225"; src = fetchFromGitHub { owner = "myuhe"; repo = "imgur.el"; @@ -31983,7 +32113,7 @@ immortal-scratch = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "immortal-scratch"; - version = "20160517.1618"; + version = "20160517.1418"; src = fetchhg { url = "https://bitbucket.com/jpkotta/immortal-scratch"; rev = "b354aba33d91"; @@ -32003,7 +32133,7 @@ immutant-server = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "immutant-server"; - version = "20140311.1708"; + version = "20140311.1508"; src = fetchFromGitHub { owner = "leathekd"; repo = "immutant-server.el"; @@ -32024,7 +32154,7 @@ impatient-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, simple-httpd }: melpaBuild { pname = "impatient-mode"; - version = "20150501.447"; + version = "20150501.247"; src = fetchFromGitHub { owner = "netguy204"; repo = "imp.el"; @@ -32045,7 +32175,7 @@ import-js = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "import-js"; - version = "20160505.10"; + version = "20160504.2210"; src = fetchFromGitHub { owner = "galooshi"; repo = "emacs-import-js"; @@ -32066,7 +32196,7 @@ import-popwin = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popwin }: melpaBuild { pname = "import-popwin"; - version = "20150716.433"; + version = "20150716.233"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-import-popwin"; @@ -32087,7 +32217,7 @@ indent-guide = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "indent-guide"; - version = "20160607.118"; + version = "20160606.2318"; src = fetchFromGitHub { owner = "zk-phi"; repo = "indent-guide"; @@ -32108,7 +32238,7 @@ indicators = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "indicators"; - version = "20130217.1605"; + version = "20130217.1405"; src = fetchFromGitHub { owner = "Fuco1"; repo = "indicators.el"; @@ -32129,7 +32259,7 @@ indy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "indy"; - version = "20150610.1206"; + version = "20150610.1006"; src = fetchFromGitHub { owner = "kwrooijen"; repo = "indy"; @@ -32150,7 +32280,7 @@ inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inf-clojure"; - version = "20160404.2338"; + version = "20160404.2138"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "inf-clojure"; @@ -32171,7 +32301,7 @@ inf-mongo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inf-mongo"; - version = "20131216.428"; + version = "20131216.228"; src = fetchFromGitHub { owner = "tobiassvn"; repo = "inf-mongo"; @@ -32192,7 +32322,7 @@ inf-php = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode }: melpaBuild { pname = "inf-php"; - version = "20130414.221"; + version = "20130414.21"; src = fetchFromGitHub { owner = "taksatou"; repo = "inf-php"; @@ -32213,7 +32343,7 @@ inf-ruby = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inf-ruby"; - version = "20160617.751"; + version = "20160617.551"; src = fetchFromGitHub { owner = "nonsequitur"; repo = "inf-ruby"; @@ -32234,7 +32364,7 @@ inflections = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inflections"; - version = "20121016.357"; + version = "20121016.157"; src = fetchFromGitHub { owner = "eschulte"; repo = "jump.el"; @@ -32254,7 +32384,7 @@ }) {}; info-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "info-plus"; - version = "20160702.1543"; + version = "20160702.1343"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/info+.el"; sha256 = "0rpkfzsas76qp7a77hf60gkdlisbgcf1apwkkzj2lp1dbkncbx30"; @@ -32273,7 +32403,7 @@ inform7-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, sws-mode }: melpaBuild { pname = "inform7-mode"; - version = "20131010.154"; + version = "20131009.2354"; src = fetchFromGitHub { owner = "fred-o"; repo = "inform7-mode"; @@ -32294,7 +32424,7 @@ init-loader = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "init-loader"; - version = "20160528.815"; + version = "20160528.615"; src = fetchFromGitHub { owner = "emacs-jp"; repo = "init-loader"; @@ -32315,7 +32445,7 @@ init-open-recentf = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "init-open-recentf"; - version = "20160601.2200"; + version = "20160601.2000"; src = fetchFromGitHub { owner = "zonuexe"; repo = "init-open-recentf.el"; @@ -32336,7 +32466,7 @@ initsplit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "initsplit"; - version = "20160113.853"; + version = "20160113.653"; src = fetchFromGitHub { owner = "dabrahams"; repo = "initsplit"; @@ -32357,7 +32487,7 @@ inkpot-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inkpot-theme"; - version = "20120505.908"; + version = "20120505.708"; src = fetchFromGitHub { owner = "siovan"; repo = "emacs24-inkpot"; @@ -32378,7 +32508,7 @@ inline-crypt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inline-crypt"; - version = "20130409.707"; + version = "20130409.507"; src = fetchFromGitHub { owner = "Sodel-the-Vociferous"; repo = "inline-crypt-el"; @@ -32399,7 +32529,7 @@ inlineR = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inlineR"; - version = "20120520.932"; + version = "20120520.732"; src = fetchFromGitHub { owner = "myuhe"; repo = "inlineR.el"; @@ -32420,12 +32550,12 @@ insert-shebang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "insert-shebang"; - version = "20160626.609"; + version = "20160626.409"; src = fetchFromGitHub { owner = "psachin"; repo = "insert-shebang"; - rev = "e53f893d400fcf6f2870ba0ba957b0dee0692fdd"; - sha256 = "18kdbm9bd1mx6gf66axzzs3z5ln0xgf0f4v1iizhcx0n1xinizpq"; + rev = "52928a0259cd5081e2b92cc2826cf1a79f231296"; + sha256 = "043kn7iwr1489rszicsg9c1lbr1my4r0aycnr3aspvsh8jv0280s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c257f4f5011cd7d0b2a5ef3adf13f9871bf0be92/recipes/insert-shebang"; @@ -32441,7 +32571,7 @@ insfactor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "insfactor"; - version = "20141116.1802"; + version = "20141116.1602"; src = fetchFromGitHub { owner = "duelinmarkers"; repo = "insfactor.el"; @@ -32462,7 +32592,7 @@ instapaper = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "instapaper"; - version = "20130104.821"; + version = "20130104.621"; src = fetchhg { url = "https://bitbucket.com/jfm/emacs-instapaper"; rev = "8daa0058ede7"; @@ -32482,12 +32612,12 @@ interaction-log = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "interaction-log"; - version = "20160305.701"; + version = "20160305.501"; src = fetchFromGitHub { owner = "michael-heerdegen"; repo = "interaction-log.el"; - rev = "0f2d773269d1f7b93c9281226719113f5410cbd0"; - sha256 = "0mvhydb4lfm2kazmb7fab8zh7sd8l9casghn8wl42mqji3v7lfwh"; + rev = "a49a06746d4df6bcfceec3c48dece065d635f9f9"; + sha256 = "1vmaj14k5idx1ykkp1yl0b9qr4fimwagz7p6c00xi9klvjsx566y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b72951c339c601350a7f10aee05a7fb94bac37ea/recipes/interaction-log"; @@ -32503,7 +32633,7 @@ interleave = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "interleave"; - version = "20160701.254"; + version = "20160701.54"; src = fetchFromGitHub { owner = "rudolfochrist"; repo = "interleave"; @@ -32524,12 +32654,12 @@ intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "intero"; - version = "20160630.516"; + version = "20160725.19"; src = fetchFromGitHub { owner = "commercialhaskell"; repo = "intero"; - rev = "f41ad5fbf7da4f9e1a698cabefa514d1e1dc16f4"; - sha256 = "02j4k585jcdbpz4zy8a0bxnxyrgkwaqhwnlzai3izk8k74vmbmbx"; + rev = "337144280ccb3933277ab7f416a8acdb2bc08090"; + sha256 = "0hafg68yrw3njsfblghna81jqam7y8l9dqxzcr3qwn9nz3ppiw5m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero"; @@ -32545,7 +32675,7 @@ interval-list = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "interval-list"; - version = "20150327.1218"; + version = "20150327.1018"; src = fetchFromGitHub { owner = "Fuco1"; repo = "interval-list"; @@ -32566,7 +32696,7 @@ interval-tree = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "interval-tree"; - version = "20130325.907"; + version = "20130325.707"; src = fetchFromGitHub { owner = "Fuco1"; repo = "interval-tree"; @@ -32587,7 +32717,7 @@ io-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "io-mode"; - version = "20140814.521"; + version = "20140814.321"; src = fetchFromGitHub { owner = "superbobry"; repo = "io-mode"; @@ -32608,7 +32738,7 @@ io-mode-inf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "io-mode-inf"; - version = "20140128.1334"; + version = "20140128.1134"; src = fetchFromGitHub { owner = "slackorama"; repo = "io-emacs"; @@ -32629,7 +32759,7 @@ ioccur = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ioccur"; - version = "20130822.48"; + version = "20130821.2248"; src = fetchFromGitHub { owner = "thierryvolpiatto"; repo = "ioccur"; @@ -32650,7 +32780,7 @@ iodine-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "iodine-theme"; - version = "20151031.1139"; + version = "20151031.939"; src = fetchFromGitHub { owner = "srdja"; repo = "iodine-theme"; @@ -32671,7 +32801,7 @@ iplayer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "iplayer"; - version = "20150101.455"; + version = "20150101.255"; src = fetchFromGitHub { owner = "csrhodes"; repo = "iplayer-el"; @@ -32692,7 +32822,7 @@ ipretty = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ipretty"; - version = "20140407.20"; + version = "20140406.2220"; src = fetchFromGitHub { owner = "steckerhalter"; repo = "ipretty"; @@ -32713,7 +32843,7 @@ ir-black-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ir-black-theme"; - version = "20130303.155"; + version = "20130302.2355"; src = fetchFromGitHub { owner = "jmdeldin"; repo = "ir-black-theme.el"; @@ -32734,7 +32864,7 @@ iregister = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "iregister"; - version = "20150515.1607"; + version = "20150515.1407"; src = fetchFromGitHub { owner = "atykhonov"; repo = "iregister.el"; @@ -32754,7 +32884,7 @@ }) {}; irfc = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "irfc"; - version = "20130824.707"; + version = "20130824.507"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/irfc.el"; sha256 = "197ybqwbj8qjh2p9pkf5mvqnrkpcgmv8c5s2gvl6msyrabk0mnca"; @@ -32773,12 +32903,12 @@ irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "irony"; - version = "20160628.1529"; + version = "20160713.1245"; src = fetchFromGitHub { owner = "Sarcasm"; repo = "irony-mode"; - rev = "00b0b58456bd4adf69992b4148c59b1c73f3997b"; - sha256 = "0k3q7sb12zbzdhz94h5ywx0n2pgkvb4qjwnczlgafilxsrxx3whw"; + rev = "6e0a3f0df9306bda32dfe6097ffa014a23c05af6"; + sha256 = "0xky99rc0p8zdjw0x3hfc28jh8p1ajh205cywd59xbjyr86fc51c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony"; @@ -32794,7 +32924,7 @@ irony-eldoc = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, irony, lib, melpaBuild }: melpaBuild { pname = "irony-eldoc"; - version = "20141227.19"; + version = "20141226.2219"; src = fetchFromGitHub { owner = "ikirill"; repo = "irony-eldoc"; @@ -32815,7 +32945,7 @@ isearch-dabbrev = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "isearch-dabbrev"; - version = "20141224.22"; + version = "20141223.2222"; src = fetchFromGitHub { owner = "Dewdrops"; repo = "isearch-dabbrev"; @@ -32835,10 +32965,10 @@ }) {}; isearch-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "isearch-plus"; - version = "20160227.1617"; + version = "20160704.805"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/isearch+.el"; - sha256 = "00m4kh2j4a2rqlagz4b5wdhnrk266whbncwkjbxx0rlxzvsi5skh"; + sha256 = "047fqfqn4i2vbamp0zj7f2v4wq7vah6cczi4mkvlxcnd0f8llr6l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8a847ee5f4c4206b48cb164c49e9e82a266a0730/recipes/isearch+"; @@ -32853,7 +32983,7 @@ }) {}; isearch-prop = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "isearch-prop"; - version = "20151231.1607"; + version = "20151231.1407"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/isearch-prop.el"; sha256 = "1i1ypganr2ivwgi0vgjihgk1s4yglwj8nbqnqjiiwdywf8g5hcmr"; @@ -32872,7 +33002,7 @@ isearch-symbol-at-point = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "isearch-symbol-at-point"; - version = "20130728.1721"; + version = "20130728.1521"; src = fetchFromGitHub { owner = "re5et"; repo = "isearch-symbol-at-point"; @@ -32893,7 +33023,7 @@ isend-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "isend-mode"; - version = "20130419.458"; + version = "20130419.258"; src = fetchFromGitHub { owner = "ffevotte"; repo = "isend-mode.el"; @@ -32914,7 +33044,7 @@ isgd = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "isgd"; - version = "20150414.436"; + version = "20150414.236"; src = fetchFromGitHub { owner = "chmouel"; repo = "isgd.el"; @@ -32935,7 +33065,7 @@ iss-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "iss-mode"; - version = "20141001.1413"; + version = "20141001.1213"; src = fetchFromGitHub { owner = "rasmus-toftdahl-olesen"; repo = "iss-mode"; @@ -32956,7 +33086,7 @@ itail = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "itail"; - version = "20151113.1035"; + version = "20151113.835"; src = fetchFromGitHub { owner = "re5et"; repo = "itail"; @@ -32977,7 +33107,7 @@ itasca = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "itasca"; - version = "20160406.742"; + version = "20160406.542"; src = fetchFromGitHub { owner = "jkfurtney"; repo = "itasca-emacs"; @@ -32998,7 +33128,7 @@ iterator = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "iterator"; - version = "20160406.1406"; + version = "20160406.1206"; src = fetchFromGitHub { owner = "thierryvolpiatto"; repo = "iterator"; @@ -33019,7 +33149,7 @@ ivariants = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivs-edit, lib, melpaBuild }: melpaBuild { pname = "ivariants"; - version = "20140720.2327"; + version = "20140720.2127"; src = fetchFromGitHub { owner = "kawabata"; repo = "emacs-ivariants"; @@ -33040,7 +33170,7 @@ ivs-edit = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ivs-edit"; - version = "20140720.546"; + version = "20140720.346"; src = fetchFromGitHub { owner = "kawabata"; repo = "ivs-edit"; @@ -33061,12 +33191,12 @@ ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ivy"; - version = "20160703.1015"; + version = "20160726.1937"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "aaad35472a5b74dfaeca93aa0de2327cf06ffe3d"; - sha256 = "1f570vxp5gp28wpxq92050n6vx0lvz8288x4sp8pfpizz9dyxd9p"; + rev = "17b59b2244473ba32cff3408e41e451de7fcc69f"; + sha256 = "1srzmlgd4wbwdickgxq4kjxbw5rprkh7dwfi7rz82zsahk1jkzr8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; @@ -33082,12 +33212,12 @@ ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }: melpaBuild { pname = "ivy-bibtex"; - version = "20160422.1800"; + version = "20160714.1000"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "62593c6289a3d17566edb1aa8ef4700bc83e9df7"; - sha256 = "1zrs1gk95mna1kipgrq8mfhk0gqimvsb4b583f900fh86019nn1l"; + rev = "d6a98ac6f28d2a6a05e203115211c98333d40aca"; + sha256 = "0arhy051945lxjqg77b275ny9nsv60cqj0qfpmvd8xkc07lqfn23"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex"; @@ -33103,12 +33233,12 @@ ivy-erlang-complete = callPackage ({ dash, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, s }: melpaBuild { pname = "ivy-erlang-complete"; - version = "20160622.121"; + version = "20160726.146"; src = fetchFromGitHub { owner = "s-kostyaev"; repo = "ivy-erlang-complete"; - rev = "a9c91b008f155b3fde7e50e6b7845fe11fdb1168"; - sha256 = "0ghib5sldy29057gwk5pf39ppx7s33kcs0mw2w2rasfvpv7i440f"; + rev = "dc2ee7c8534454a3ec31dd951ace78a8a06ce84c"; + sha256 = "1vaxp2xjcc1mj73r67z69ghi9mw9ayg98jlpljmmiz840gi70zx0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d0ec649f7adc4c82c4d67656891f06c9bc50ba9c/recipes/ivy-erlang-complete"; @@ -33124,7 +33254,7 @@ ivy-gitlab = callPackage ({ dash, fetchFromGitHub, fetchurl, gitlab, ivy, lib, melpaBuild, s }: melpaBuild { pname = "ivy-gitlab"; - version = "20160519.512"; + version = "20160519.312"; src = fetchFromGitHub { owner = "nlamirault"; repo = "emacs-gitlab"; @@ -33145,12 +33275,12 @@ ivy-hydra = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-hydra"; - version = "20160517.1549"; + version = "20160517.1349"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "aaad35472a5b74dfaeca93aa0de2327cf06ffe3d"; - sha256 = "1f570vxp5gp28wpxq92050n6vx0lvz8288x4sp8pfpizz9dyxd9p"; + rev = "17b59b2244473ba32cff3408e41e451de7fcc69f"; + sha256 = "1srzmlgd4wbwdickgxq4kjxbw5rprkh7dwfi7rz82zsahk1jkzr8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra"; @@ -33163,10 +33293,31 @@ license = lib.licenses.free; }; }) {}; + ivy-purpose = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, window-purpose }: + melpaBuild { + pname = "ivy-purpose"; + version = "20160724.303"; + src = fetchFromGitHub { + owner = "bmag"; + repo = "ivy-purpose"; + rev = "0495f2f3aed64d7e0028125e76a9a68f8fc4107e"; + sha256 = "1hiw7mnrr0cnnp0a2mh837pzdaknadwv0sk82vya6blx0a7m691g"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1fa2a37a1a6492eddf638216acec4b9d54d3498d/recipes/ivy-purpose"; + sha256 = "0c5n7x3sa57wslwnldvc0i315xhyi1zndyhr07rzka1rhj8v1c4v"; + name = "ivy-purpose"; + }; + packageRequires = [ emacs ivy window-purpose ]; + meta = { + homepage = "https://melpa.org/#/ivy-purpose"; + license = lib.licenses.free; + }; + }) {}; ix = callPackage ({ fetchFromGitHub, fetchurl, grapnel, lib, melpaBuild }: melpaBuild { pname = "ix"; - version = "20131027.1129"; + version = "20131027.929"; src = fetchFromGitHub { owner = "theanalyst"; repo = "ix.el"; @@ -33187,7 +33338,7 @@ iy-go-to-char = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "iy-go-to-char"; - version = "20141029.1046"; + version = "20141029.846"; src = fetchFromGitHub { owner = "doitian"; repo = "iy-go-to-char"; @@ -33208,7 +33359,7 @@ j-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "j-mode"; - version = "20140702.1009"; + version = "20140702.809"; src = fetchFromGitHub { owner = "zellio"; repo = "j-mode"; @@ -33229,7 +33380,7 @@ jabber = callPackage ({ fetchgit, fetchurl, fsm, lib, melpaBuild }: melpaBuild { pname = "jabber"; - version = "20160124.752"; + version = "20160124.552"; src = fetchgit { url = "git://git.code.sf.net/p/emacs-jabber/git"; rev = "98dc8e429ba6f79065f1c9fc3878d92314d4b510"; @@ -33249,7 +33400,7 @@ jabber-otr = callPackage ({ emacs, fetchFromGitHub, fetchurl, jabber, lib, melpaBuild }: melpaBuild { pname = "jabber-otr"; - version = "20150918.644"; + version = "20150918.444"; src = fetchFromGitHub { owner = "legoscia"; repo = "emacs-jabber-otr"; @@ -33270,7 +33421,7 @@ jack-connect = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jack-connect"; - version = "20141207.607"; + version = "20141207.407"; src = fetchgit { url = "https://bitbucket.org/sbarbit/jack-connect"; rev = "b00658dfe3d5d67431c18ffa693d5a3705067ba0"; @@ -33290,7 +33441,7 @@ jade-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jade-mode"; - version = "20160525.941"; + version = "20160525.741"; src = fetchFromGitHub { owner = "brianc"; repo = "jade-mode"; @@ -33311,7 +33462,7 @@ jammer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jammer"; - version = "20160310.259"; + version = "20160310.59"; src = fetchFromGitHub { owner = "wasamasa"; repo = "jammer"; @@ -33332,7 +33483,7 @@ japanese-holidays = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "japanese-holidays"; - version = "20150208.1937"; + version = "20150208.1737"; src = fetchFromGitHub { owner = "emacs-jp"; repo = "japanese-holidays"; @@ -33353,7 +33504,7 @@ japanlaw = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "japanlaw"; - version = "20160129.220"; + version = "20160129.20"; src = fetchFromGitHub { owner = "mhayashi1120"; repo = "japanlaw.el"; @@ -33374,7 +33525,7 @@ jape-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jape-mode"; - version = "20140903.1006"; + version = "20140903.806"; src = fetchFromGitHub { owner = "tanzoniteblack"; repo = "jape-mode"; @@ -33395,7 +33546,7 @@ jar-manifest-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jar-manifest-mode"; - version = "20160430.1926"; + version = "20160430.1726"; src = fetchFromGitHub { owner = "omajid"; repo = "jar-manifest-mode"; @@ -33416,7 +33567,7 @@ jasminejs-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jasminejs-mode"; - version = "20150526.1905"; + version = "20150526.1705"; src = fetchFromGitHub { owner = "stoltene2"; repo = "jasminejs-mode"; @@ -33437,7 +33588,7 @@ jaunte = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jaunte"; - version = "20130413.419"; + version = "20130413.219"; src = fetchFromGitHub { owner = "kawaguchi"; repo = "jaunte.el"; @@ -33458,7 +33609,7 @@ java-imports = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, s }: melpaBuild { pname = "java-imports"; - version = "20160311.1715"; + version = "20160311.1515"; src = fetchFromGitHub { owner = "dakrone"; repo = "emacs-java-imports"; @@ -33479,7 +33630,7 @@ java-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "java-snippets"; - version = "20160626.2152"; + version = "20160626.1952"; src = fetchFromGitHub { owner = "nekop"; repo = "yasnippet-java-mode"; @@ -33500,7 +33651,7 @@ javadoc-lookup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "javadoc-lookup"; - version = "20160213.1831"; + version = "20160213.1631"; src = fetchFromGitHub { owner = "skeeto"; repo = "javadoc-lookup"; @@ -33521,7 +33672,7 @@ javap-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "javap-mode"; - version = "20120223.1608"; + version = "20120223.1408"; src = fetchFromGitHub { owner = "hiredman"; repo = "javap-mode"; @@ -33542,7 +33693,7 @@ jaword = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, tinysegmenter }: melpaBuild { pname = "jaword"; - version = "20150325.918"; + version = "20150325.718"; src = fetchFromGitHub { owner = "zk-phi"; repo = "jaword"; @@ -33563,12 +33714,12 @@ jazz-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jazz-theme"; - version = "20160629.1055"; + version = "20160715.829"; src = fetchFromGitHub { owner = "donderom"; repo = "jazz-theme"; - rev = "496ab006474f34db4abcdc41d36bc8369d7cc50b"; - sha256 = "0dsvmzhd0m4lni11ay95wz6jrnpv9p5admxr77p83mkw9vv46km9"; + rev = "17f6dd1625e32567ccde4848aa660501032963d6"; + sha256 = "1wpq3aclamk2rk8dh2l4yhafcghqrl5dwmz7gc83ag7zyb77np32"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/da25345df9d8d567541ed6b0ec832310cde67115/recipes/jazz-theme"; @@ -33584,7 +33735,7 @@ jbeans-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jbeans-theme"; - version = "20160406.1457"; + version = "20160406.1257"; src = fetchFromGitHub { owner = "synic"; repo = "jbeans-emacs"; @@ -33605,7 +33756,7 @@ jdee = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jdee"; - version = "20160624.843"; + version = "20160624.643"; src = fetchFromGitHub { owner = "jdee-emacs"; repo = "jdee"; @@ -33626,12 +33777,12 @@ jedi = callPackage ({ auto-complete, emacs, fetchFromGitHub, fetchurl, jedi-core, lib, melpaBuild }: melpaBuild { pname = "jedi"; - version = "20160425.2356"; + version = "20160425.2156"; src = fetchFromGitHub { owner = "tkf"; repo = "emacs-jedi"; - rev = "aa2cff0b4aa9fbae23c054f185769d7661666c97"; - sha256 = "1xkzf7p3ws5s5i8aymz60c4vhifchj68595878nc3yrk5zzlhyjr"; + rev = "b6972af030416c57de6d045761d0ad6bccfdf07b"; + sha256 = "07011v1qx70saqffj0698sdi3v996v105jvf7h7lc0ddlddgk05w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bded1840a39fbf1e014c01276eb2f9c5a4fc218f/recipes/jedi"; @@ -33647,12 +33798,12 @@ jedi-core = callPackage ({ cl-lib ? null, emacs, epc, fetchFromGitHub, fetchurl, lib, melpaBuild, python-environment }: melpaBuild { pname = "jedi-core"; - version = "20160501.2243"; + version = "20160709.722"; src = fetchFromGitHub { owner = "tkf"; repo = "emacs-jedi"; - rev = "aa2cff0b4aa9fbae23c054f185769d7661666c97"; - sha256 = "1xkzf7p3ws5s5i8aymz60c4vhifchj68595878nc3yrk5zzlhyjr"; + rev = "b6972af030416c57de6d045761d0ad6bccfdf07b"; + sha256 = "07011v1qx70saqffj0698sdi3v996v105jvf7h7lc0ddlddgk05w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bded1840a39fbf1e014c01276eb2f9c5a4fc218f/recipes/jedi-core"; @@ -33668,7 +33819,7 @@ jedi-direx = callPackage ({ direx, fetchFromGitHub, fetchurl, jedi, lib, melpaBuild }: melpaBuild { pname = "jedi-direx"; - version = "20140310.436"; + version = "20140310.236"; src = fetchFromGitHub { owner = "tkf"; repo = "emacs-jedi-direx"; @@ -33689,7 +33840,7 @@ jekyll-modes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, polymode }: melpaBuild { pname = "jekyll-modes"; - version = "20141117.714"; + version = "20141117.514"; src = fetchFromGitHub { owner = "fred-o"; repo = "jekyll-modes"; @@ -33710,7 +33861,7 @@ jenkins = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "jenkins"; - version = "20151114.2108"; + version = "20151114.1908"; src = fetchFromGitHub { owner = "rmuslimov"; repo = "jenkins.el"; @@ -33731,7 +33882,7 @@ jenkins-watch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jenkins-watch"; - version = "20121004.1826"; + version = "20121004.1626"; src = fetchFromGitHub { owner = "ataylor284"; repo = "jenkins-watch"; @@ -33752,7 +33903,7 @@ jg-quicknav = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "jg-quicknav"; - version = "20160216.2235"; + version = "20160216.2035"; src = fetchFromGitHub { owner = "jeffgran"; repo = "jg-quicknav"; @@ -33773,7 +33924,7 @@ jinja2-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jinja2-mode"; - version = "20141128.407"; + version = "20141128.207"; src = fetchFromGitHub { owner = "paradoxxxzero"; repo = "jinja2-mode"; @@ -33793,7 +33944,7 @@ }) {}; jira = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "jira"; - version = "20131210.1222"; + version = "20131210.1022"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/jira.el"; sha256 = "18b6hdqk59gnqh4ibq8lj59kbsg5gbyfb7vfcvpgmxjikpl3cgkz"; @@ -33812,7 +33963,7 @@ jira-markup-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jira-markup-mode"; - version = "20150601.1609"; + version = "20150601.1409"; src = fetchFromGitHub { owner = "mnuessler"; repo = "jira-markup-mode"; @@ -33833,12 +33984,12 @@ jist = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, magit, melpaBuild, pkg-info, request }: melpaBuild { pname = "jist"; - version = "20151228.1750"; + version = "20160708.759"; src = fetchFromGitHub { owner = "emacs-pe"; repo = "jist.el"; - rev = "b9889524e70c1124e091ef83128211637d57b569"; - sha256 = "0mh7990zqrprsa1g9jzpqm666pynlqd2nh9z236zyzykf8d8il8c"; + rev = "a9dd29d34d420bed75f298cc6111886a89d63b63"; + sha256 = "0hibkmn9s4iaddzz3ga7xjlllkaav7i2x355c1vr0vn7s34zwp5m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/898bfa0b315240ef9335fde24ff0386a4c6c6595/recipes/jist"; @@ -33854,7 +34005,7 @@ jknav = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jknav"; - version = "20121006.1525"; + version = "20121006.1325"; src = fetchFromGitHub { owner = "aculich"; repo = "jknav.el"; @@ -33875,7 +34026,7 @@ jonprl-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "jonprl-mode"; - version = "20151203.342"; + version = "20151203.142"; src = fetchFromGitHub { owner = "david-christiansen"; repo = "jonprl-mode"; @@ -33896,7 +34047,7 @@ jq-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jq-mode"; - version = "20160222.640"; + version = "20160222.440"; src = fetchFromGitHub { owner = "ljos"; repo = "jq-mode"; @@ -33917,7 +34068,7 @@ jquery-doc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jquery-doc"; - version = "20150812.258"; + version = "20150812.58"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "jquery-doc.el"; @@ -33938,7 +34089,7 @@ js-comint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, nvm }: melpaBuild { pname = "js-comint"; - version = "20160623.116"; + version = "20160622.2316"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "js-comint"; @@ -33959,12 +34110,12 @@ js-doc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js-doc"; - version = "20160208.1907"; + version = "20160714.2134"; src = fetchFromGitHub { owner = "mooz"; repo = "js-doc"; - rev = "c844eb75e3acff0aea035ba41727e036d81ccd29"; - sha256 = "12kwjkhw5x6jb79m49gbypb6br482bpi73788h71lgl5i3g95s5q"; + rev = "f0606e89d5aa89146f96edb38cf69af0068a9d1e"; + sha256 = "1ffayl6hca9zanbznh6rkql7fbr53id1lyrj2vllx8zakfac4dyv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5621f60b3f580db652c347719d004d7168944caa/recipes/js-doc"; @@ -33980,12 +34131,12 @@ js2-closure = callPackage ({ fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: melpaBuild { pname = "js2-closure"; - version = "20160605.1239"; + version = "20160715.1536"; src = fetchFromGitHub { owner = "jart"; repo = "js2-closure"; - rev = "37409e4ad1925e48b633c1d424caa2fe94eb9d49"; - sha256 = "1yjgi0glh4fb4k7z5n216sbfzmxrxnnspmq2r5j6ag7b59qamyym"; + rev = "2b99540f43ddae123014d0fe20c66f5b536312cd"; + sha256 = "0f280vk7mhslra793183jmi72hlhiq5mgjd0f0b6hr0gyj3iszb0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/61bf3e70ae38a78184f0b373ff6f0db234f51cb2/recipes/js2-closure"; @@ -34001,7 +34152,7 @@ js2-highlight-vars = callPackage ({ fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: melpaBuild { pname = "js2-highlight-vars"; - version = "20150914.308"; + version = "20150914.108"; src = fetchFromGitHub { owner = "unhammer"; repo = "js2-highlight-vars.el"; @@ -34022,12 +34173,12 @@ js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js2-mode"; - version = "20160703.1221"; + version = "20160707.723"; src = fetchFromGitHub { owner = "mooz"; repo = "js2-mode"; - rev = "49f9761af75f8df2f73bef61a7742acd8c50d7fb"; - sha256 = "0czy8022qj930k091z7zrpmiq0drff96b16523s8kdfkm6j6yx5g"; + rev = "1f1251713830a2c3300e1b007ca6a5ca56d94e01"; + sha256 = "18ypa1g6m7gh0zh36dzk356mwcbs50fz309bkxq6asp2lvlcfbv5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode"; @@ -34043,7 +34194,7 @@ js2-refactor = callPackage ({ dash, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, multiple-cursors, s, yasnippet }: melpaBuild { pname = "js2-refactor"; - version = "20160525.313"; + version = "20160525.113"; src = fetchFromGitHub { owner = "magnars"; repo = "js2-refactor.el"; @@ -34064,7 +34215,7 @@ js3-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js3-mode"; - version = "20160515.1050"; + version = "20160515.850"; src = fetchFromGitHub { owner = "thomblake"; repo = "js3-mode"; @@ -34085,7 +34236,7 @@ jscs = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jscs"; - version = "20151015.1249"; + version = "20151015.1049"; src = fetchFromGitHub { owner = "papaeye"; repo = "emacs-jscs"; @@ -34106,7 +34257,7 @@ jsfmt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jsfmt"; - version = "20150727.1725"; + version = "20150727.1525"; src = fetchFromGitHub { owner = "brettlangdon"; repo = "jsfmt.el"; @@ -34127,12 +34278,12 @@ json-mode = callPackage ({ fetchFromGitHub, fetchurl, json-reformat, json-snatcher, lib, melpaBuild }: melpaBuild { pname = "json-mode"; - version = "20160601.556"; + version = "20160710.1637"; src = fetchFromGitHub { owner = "joshwnj"; repo = "json-mode"; - rev = "250c622922d301bc1435ffe26e429fe2297f2681"; - sha256 = "10wx67lap7zhyzk9xd2cs8kcm0didyc9gccdi1q6sw1axs25i98i"; + rev = "9ba01b868a6b138feeff82b9eb0abd331d29325f"; + sha256 = "0i79lqzdg59vkqwjd3q092xxn9vhxspb1vn4pkis0vfvn46g01jy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/03d0ff6c8d724cf39446fa27f52aa5cc1a3cefb6/recipes/json-mode"; @@ -34148,7 +34299,7 @@ json-reformat = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "json-reformat"; - version = "20160212.253"; + version = "20160212.53"; src = fetchFromGitHub { owner = "gongo"; repo = "json-reformat"; @@ -34169,7 +34320,7 @@ json-rpc = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "json-rpc"; - version = "20160427.1007"; + version = "20160427.807"; src = fetchFromGitHub { owner = "skeeto"; repo = "elisp-json-rpc"; @@ -34190,7 +34341,7 @@ json-snatcher = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "json-snatcher"; - version = "20150511.2247"; + version = "20150511.2047"; src = fetchFromGitHub { owner = "Sterlingg"; repo = "json-snatcher"; @@ -34211,7 +34362,7 @@ jss = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, websocket }: melpaBuild { pname = "jss"; - version = "20130508.923"; + version = "20130508.723"; src = fetchFromGitHub { owner = "segv"; repo = "jss"; @@ -34232,7 +34383,7 @@ jst = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, s }: melpaBuild { pname = "jst"; - version = "20150604.638"; + version = "20150604.438"; src = fetchFromGitHub { owner = "cheunghy"; repo = "jst-mode"; @@ -34253,7 +34404,7 @@ jsx-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jsx-mode"; - version = "20130908.1224"; + version = "20130908.1024"; src = fetchFromGitHub { owner = "jsx"; repo = "jsx-mode.el"; @@ -34273,7 +34424,7 @@ }) {}; jtags = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jtags"; - version = "20160211.1429"; + version = "20160211.1229"; src = fetchgit { url = "git://git.code.sf.net/p/jtags/code"; rev = "b50daa48510f71e74ce0ec2eb85030896a79cf96"; @@ -34293,7 +34444,7 @@ judge-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "judge-indent"; - version = "20160609.822"; + version = "20160609.622"; src = fetchFromGitHub { owner = "yascentur"; repo = "judge-indent-el"; @@ -34314,7 +34465,7 @@ julia-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "julia-mode"; - version = "20160517.1243"; + version = "20160517.1043"; src = fetchFromGitHub { owner = "JuliaLang"; repo = "julia-emacs"; @@ -34335,7 +34486,7 @@ julia-shell = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }: melpaBuild { pname = "julia-shell"; - version = "20160514.928"; + version = "20160514.728"; src = fetchFromGitHub { owner = "dennisog"; repo = "julia-shell-mode"; @@ -34356,7 +34507,7 @@ jumblr = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "jumblr"; - version = "20140908.1552"; + version = "20140908.1352"; src = fetchFromGitHub { owner = "mkmcc"; repo = "jumblr"; @@ -34377,7 +34528,7 @@ jump = callPackage ({ fetchFromGitHub, fetchurl, findr, inflections, lib, melpaBuild }: melpaBuild { pname = "jump"; - version = "20151009.329"; + version = "20151009.129"; src = fetchFromGitHub { owner = "eschulte"; repo = "jump.el"; @@ -34398,7 +34549,7 @@ jump-char = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jump-char"; - version = "20160505.1051"; + version = "20160505.851"; src = fetchFromGitHub { owner = "lewang"; repo = "jump-char"; @@ -34419,7 +34570,7 @@ jump-to-line = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jump-to-line"; - version = "20130122.1053"; + version = "20130122.853"; src = fetchFromGitHub { owner = "ongaeshi"; repo = "jump-to-line"; @@ -34440,7 +34591,7 @@ jumplist = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jumplist"; - version = "20151119.2145"; + version = "20151119.1945"; src = fetchFromGitHub { owner = "ganmacs"; repo = "jumplist"; @@ -34461,7 +34612,7 @@ jvm-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jvm-mode"; - version = "20150422.208"; + version = "20150422.8"; src = fetchFromGitHub { owner = "martintrojer"; repo = "jvm-mode.el"; @@ -34482,7 +34633,7 @@ kaesar = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kaesar"; - version = "20160128.408"; + version = "20160128.208"; src = fetchFromGitHub { owner = "mhayashi1120"; repo = "Emacs-kaesar"; @@ -34503,7 +34654,7 @@ kaesar-file = callPackage ({ fetchFromGitHub, fetchurl, kaesar, lib, melpaBuild }: melpaBuild { pname = "kaesar-file"; - version = "20160128.408"; + version = "20160128.208"; src = fetchFromGitHub { owner = "mhayashi1120"; repo = "Emacs-kaesar"; @@ -34524,7 +34675,7 @@ kaesar-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, kaesar, lib, melpaBuild }: melpaBuild { pname = "kaesar-mode"; - version = "20160128.408"; + version = "20160128.208"; src = fetchFromGitHub { owner = "mhayashi1120"; repo = "Emacs-kaesar"; @@ -34545,7 +34696,7 @@ kakapo-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kakapo-mode"; - version = "20150906.2352"; + version = "20150906.2152"; src = fetchFromGitHub { owner = "listx"; repo = "kakapo-mode"; @@ -34565,7 +34716,7 @@ }) {}; kanban = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kanban"; - version = "20150930.1117"; + version = "20150930.917"; src = fetchhg { url = "https://bitbucket.com/ArneBab/kanban.el"; rev = "54d855426372"; @@ -34585,7 +34736,7 @@ kanji-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kanji-mode"; - version = "20150202.225"; + version = "20150202.25"; src = fetchFromGitHub { owner = "wsgac"; repo = "kanji-mode"; @@ -34606,7 +34757,7 @@ kaomoji = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: melpaBuild { pname = "kaomoji"; - version = "20160218.220"; + version = "20160218.20"; src = fetchFromGitHub { owner = "kuanyui"; repo = "kaomoji.el"; @@ -34627,7 +34778,7 @@ karma = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "karma"; - version = "20160220.645"; + version = "20160220.445"; src = fetchFromGitHub { owner = "tonini"; repo = "karma.el"; @@ -34648,7 +34799,7 @@ kerl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kerl"; - version = "20150424.1505"; + version = "20150424.1305"; src = fetchFromGitHub { owner = "correl"; repo = "kerl.el"; @@ -34668,7 +34819,7 @@ }) {}; key-chord = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "key-chord"; - version = "20160227.638"; + version = "20160227.438"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/key-chord.el"; sha256 = "03m44pqggfrd53nh9dvpdjgm0rvca34qxmd30hr33hzprzjambxg"; @@ -34687,12 +34838,12 @@ key-combo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "key-combo"; - version = "20150324.939"; + version = "20150324.739"; src = fetchFromGitHub { owner = "uk-ar"; repo = "key-combo"; - rev = "2e220fe3a91c944ce30c4c0297f99d0053b95754"; - sha256 = "1is7s50lgn77lxxwgakiaywx6jqdfg8045d18m4zn3ilxg6k8ljf"; + rev = "2fb5c65bc82d5bd2964e2b163822429ab45d90a1"; + sha256 = "1d445784mar1jrmrlswwxh3w52l3aym8kx3k4lgqwqa1p0i0pjqz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/99b422ef5f7b9dda894207e3133791fb9963a092/recipes/key-combo"; @@ -34708,7 +34859,7 @@ key-intercept = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "key-intercept"; - version = "20140211.149"; + version = "20140210.2349"; src = fetchFromGitHub { owner = "tarao"; repo = "key-intercept-el"; @@ -34729,7 +34880,7 @@ key-leap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "key-leap"; - version = "20160610.503"; + version = "20160610.303"; src = fetchFromGitHub { owner = "MartinRykfors"; repo = "key-leap"; @@ -34750,7 +34901,7 @@ key-seq = callPackage ({ fetchFromGitHub, fetchurl, key-chord, lib, melpaBuild }: melpaBuild { pname = "key-seq"; - version = "20150907.256"; + version = "20150907.56"; src = fetchFromGitHub { owner = "vlevit"; repo = "key-seq.el"; @@ -34771,7 +34922,7 @@ keychain-environment = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "keychain-environment"; - version = "20160424.646"; + version = "20160424.446"; src = fetchFromGitHub { owner = "tarsius"; repo = "keychain-environment"; @@ -34792,7 +34943,7 @@ keydef = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "keydef"; - version = "20090428.1431"; + version = "20090428.1231"; src = fetchFromGitHub { owner = "emacsorphanage"; repo = "keydef"; @@ -34813,7 +34964,7 @@ keyfreq = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "keyfreq"; - version = "20160516.916"; + version = "20160516.716"; src = fetchFromGitHub { owner = "dacap"; repo = "keyfreq"; @@ -34834,7 +34985,7 @@ keymap-utils = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "keymap-utils"; - version = "20160523.745"; + version = "20160523.545"; src = fetchFromGitHub { owner = "tarsius"; repo = "keymap-utils"; @@ -34855,7 +35006,7 @@ keyset = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "keyset"; - version = "20150219.2330"; + version = "20150219.2130"; src = fetchFromGitHub { owner = "HKey"; repo = "keyset"; @@ -34873,10 +35024,31 @@ license = lib.licenses.free; }; }) {}; + keyswap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "keyswap"; + version = "20160726.43"; + src = fetchFromGitHub { + owner = "hardenedapple"; + repo = "keyswap.el"; + rev = "d6fad6f0e46d4f92d314bf52244b0be239c647a2"; + sha256 = "0qanh8jdjchrcn66p661haza1cj8m6afqlg52bs344dd84zkj6z9"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ed8303f5009604ae3d83769063d38749e37fc5d8/recipes/keyswap"; + sha256 = "0ck9w2jr4vdk3yjlcdzblsbgw5w5x1cxbx7h1am5vkr6fhxh2hdi"; + name = "keyswap"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/keyswap"; + license = lib.licenses.free; + }; + }) {}; keyword-search = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "keyword-search"; - version = "20160608.38"; + version = "20160607.2238"; src = fetchFromGitHub { owner = "keyword-search"; repo = "keyword-search"; @@ -34897,7 +35069,7 @@ kfg = callPackage ({ f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kfg"; - version = "20140909.38"; + version = "20140908.2238"; src = fetchFromGitHub { owner = "abingham"; repo = "kfg"; @@ -34918,7 +35090,7 @@ kibit-helper = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "kibit-helper"; - version = "20150508.1033"; + version = "20150508.833"; src = fetchFromGitHub { owner = "brunchboy"; repo = "kibit-helper"; @@ -34939,7 +35111,7 @@ kill-or-bury-alive = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kill-or-bury-alive"; - version = "20160531.1108"; + version = "20160531.908"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "kill-or-bury-alive"; @@ -34960,7 +35132,7 @@ kill-ring-search = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kill-ring-search"; - version = "20140422.1055"; + version = "20140422.855"; src = fetchFromGitHub { owner = "nschum"; repo = "kill-ring-search.el"; @@ -34981,7 +35153,7 @@ killer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "killer"; - version = "20120808.622"; + version = "20120808.422"; src = fetchFromGitHub { owner = "tarsius"; repo = "killer"; @@ -35002,7 +35174,7 @@ kite = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, websocket }: melpaBuild { pname = "kite"; - version = "20130201.1338"; + version = "20130201.1138"; src = fetchFromGitHub { owner = "jscheid"; repo = "kite"; @@ -35023,7 +35195,7 @@ kite-mini = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, websocket }: melpaBuild { pname = "kite-mini"; - version = "20160508.606"; + version = "20160508.406"; src = fetchFromGitHub { owner = "tungd"; repo = "kite-mini.el"; @@ -35044,12 +35216,12 @@ kivy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kivy-mode"; - version = "20160623.1410"; + version = "20160623.1210"; src = fetchFromGitHub { owner = "kivy"; repo = "kivy"; - rev = "379893812d10dcd7934ab4311254b8e73435b27e"; - sha256 = "0zc4cchfyhl4ahgynw9xifg52021w397sf8nd1z4cgrljwmvg6i5"; + rev = "24da01467801e9573eee4bf4ee42528968349ece"; + sha256 = "05qaslwg78d5xc9cphp36j2rf3gcdjsxzkhx9yk5n5flb3rs567h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode"; @@ -35062,10 +35234,31 @@ license = lib.licenses.free; }; }) {}; + kiwix = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "kiwix"; + version = "20160727.333"; + src = fetchFromGitHub { + owner = "stardiviner"; + repo = "kiwix.el"; + rev = "90658b742e09b0daae5aacb9e246a085ec224abd"; + sha256 = "0zrwqqcd3n320lifyyxhc20n9cl69089m6i9v50jcxbfpv6vyyl1"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/673b4ecec96562bb860caf5c08d016d6c4b89d8c/recipes/kiwix"; + sha256 = "1z5gns3y7iv3lmczgxdbvg3wigkch4ljwcx7dc5f92q3ykm0zwhf"; + name = "kiwix"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/kiwix"; + license = lib.licenses.free; + }; + }) {}; kixtart-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kixtart-mode"; - version = "20150611.1104"; + version = "20150611.904"; src = fetchFromGitHub { owner = "ryrun"; repo = "kixtart-mode"; @@ -35086,7 +35279,7 @@ know-your-http-well = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "know-your-http-well"; - version = "20160208.1704"; + version = "20160208.1504"; src = fetchFromGitHub { owner = "for-GET"; repo = "know-your-http-well"; @@ -35104,10 +35297,31 @@ license = lib.licenses.free; }; }) {}; + kodi-remote = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request }: + melpaBuild { + pname = "kodi-remote"; + version = "20160712.1652"; + src = fetchFromGitHub { + owner = "spiderbit"; + repo = "kodi-remote.el"; + rev = "cb0c81e2907529ca8db7387588869a14044a3822"; + sha256 = "14vi1l7nmcy4i5490fvh2crv9ngbd1gf68nibzq6rc396d98f4aa"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/08f06dd824e67250afafdecc25128ba794ca971f/recipes/kodi-remote"; + sha256 = "0f3n7b3plsw28xpz07lf5pv71b6s2xjhq2h23gpyg0r69v99chh5"; + name = "kodi-remote"; + }; + packageRequires = [ request ]; + meta = { + homepage = "https://melpa.org/#/kodi-remote"; + license = lib.licenses.free; + }; + }) {}; kolon-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kolon-mode"; - version = "20140122.534"; + version = "20140122.334"; src = fetchFromGitHub { owner = "samvtran"; repo = "kolon-mode"; @@ -35128,7 +35342,7 @@ kooten-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kooten-theme"; - version = "20160214.651"; + version = "20160214.451"; src = fetchFromGitHub { owner = "kootenpv"; repo = "emacs-kooten-theme"; @@ -35149,12 +35363,12 @@ kotlin-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kotlin-mode"; - version = "20160620.1023"; + version = "20160720.1339"; src = fetchFromGitHub { owner = "Emacs-Kotlin-Mode-Maintainers"; repo = "kotlin-mode"; - rev = "f54da34b3f6b2bfae622fffcd0ade20e98e63458"; - sha256 = "0nk17mj5nilvnc90zp119zfax1qqxm896r97qvmrx21m99n9359b"; + rev = "9e2e4c11fe3a9e8f63ce351762a2b1ac5dbe8a75"; + sha256 = "0yzhizxb8g0zlnx97vnaqvv0pm2mx4jg7qc2hnfvc5ya02yxhc6p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9f2560e913b215821221c96069a1385fe4e19c3e/recipes/kotlin-mode"; @@ -35170,7 +35384,7 @@ kpm-list = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kpm-list"; - version = "20160310.1250"; + version = "20160310.1050"; src = fetchFromGitHub { owner = "KMahoney"; repo = "kpm-list"; @@ -35191,7 +35405,7 @@ kroman = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kroman"; - version = "20150827.1840"; + version = "20150827.1640"; src = fetchFromGitHub { owner = "cheunghy"; repo = "kroman-el"; @@ -35212,7 +35426,7 @@ ksp-cfg-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ksp-cfg-mode"; - version = "20160521.1533"; + version = "20160521.1333"; src = fetchFromGitHub { owner = "lashtear"; repo = "ksp-cfg-mode"; @@ -35233,7 +35447,7 @@ kurecolor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "kurecolor"; - version = "20150423.2322"; + version = "20150423.2122"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "kurecolor"; @@ -35254,7 +35468,7 @@ kv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kv"; - version = "20140108.934"; + version = "20140108.734"; src = fetchFromGitHub { owner = "nicferrier"; repo = "emacs-kv"; @@ -35275,7 +35489,7 @@ kwin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kwin"; - version = "20150308.1312"; + version = "20150308.1112"; src = fetchFromGitHub { owner = "reactormonk"; repo = "kwin-minor-mode"; @@ -35296,12 +35510,12 @@ labburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "labburn-theme"; - version = "20160616.852"; + version = "20160725.219"; src = fetchFromGitHub { owner = "ksjogo"; repo = "labburn-theme"; - rev = "afe7a3f7daf6ea4c102004cca9a7d675d9903709"; - sha256 = "167msw709z32b9b916gq7cagbk4j21fmrg5p2nq4gs0gvbx666rq"; + rev = "9dab3f9b81844db1f7b73b78bc0195bda461012b"; + sha256 = "1ff7mqx9y45fxxzihxna0niikrq3ygh4bww6k184jl5iw942yyrh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1bfc9870fbe61f58f107b72fd7f16efba22c902/recipes/labburn-theme"; @@ -35316,7 +35530,7 @@ }) {}; lacarte = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "lacarte"; - version = "20151231.1609"; + version = "20151231.1409"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/lacarte.el"; sha256 = "01vs0v17l76zwyrblf9c6x0xg5fagd4qv8pr1fwfw7kl64hb9aa2"; @@ -35335,7 +35549,7 @@ lang-refactor-perl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lang-refactor-perl"; - version = "20131122.1527"; + version = "20131122.1327"; src = fetchFromGitHub { owner = "jplindstrom"; repo = "emacs-lang-refactor-perl"; @@ -35356,7 +35570,7 @@ langdoc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "langdoc"; - version = "20150218.45"; + version = "20150217.2245"; src = fetchFromGitHub { owner = "tom-tan"; repo = "langdoc"; @@ -35377,7 +35591,7 @@ langtool = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "langtool"; - version = "20160116.1854"; + version = "20160116.1654"; src = fetchFromGitHub { owner = "mhayashi1120"; repo = "Emacs-langtool"; @@ -35398,7 +35612,7 @@ latest-clojure-libraries = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "latest-clojure-libraries"; - version = "20140314.817"; + version = "20140314.617"; src = fetchFromGitHub { owner = "AdamClements"; repo = "latest-clojure-libraries"; @@ -35419,7 +35633,7 @@ latex-extra = callPackage ({ auctex, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "latex-extra"; - version = "20160328.1921"; + version = "20160328.1721"; src = fetchFromGitHub { owner = "Malabarba"; repo = "latex-extra"; @@ -35440,7 +35654,7 @@ latex-math-preview = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "latex-math-preview"; - version = "20160321.2359"; + version = "20160321.2159"; src = fetchFromGitLab { owner = "latex-math-preview"; repo = "latex-math-preview"; @@ -35461,7 +35675,7 @@ latex-pretty-symbols = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "latex-pretty-symbols"; - version = "20151112.444"; + version = "20151112.244"; src = fetchhg { url = "https://bitbucket.com/mortiferus/latex-pretty-symbols.el"; rev = "ef4ea64c09ea"; @@ -35481,7 +35695,7 @@ latex-preview-pane = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "latex-preview-pane"; - version = "20151023.1503"; + version = "20151023.1303"; src = fetchFromGitHub { owner = "jsinglet"; repo = "latex-preview-pane"; @@ -35502,12 +35716,12 @@ latex-unicode-math-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "latex-unicode-math-mode"; - version = "20160411.730"; + version = "20160708.902"; src = fetchFromGitHub { owner = "Christoph-D"; repo = "latex-unicode-math-mode"; - rev = "79edf60793eb6928a5b4831268bf09694fd092ec"; - sha256 = "10i4r81pm95990d4yrabzdm49gp47mqpv15h4r4sih10p1kbn83h"; + rev = "54ddb8742c50a338639625183f7315278fa7369c"; + sha256 = "1yp6nicz0zzd28hfpi94shgj76l1h68mbw875c7x9abyhfz06sfm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c021dfad8928c1a352e0ef5526eefa6c0a9cb37/recipes/latex-unicode-math-mode"; @@ -35523,7 +35737,7 @@ launch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "launch"; - version = "20130619.1704"; + version = "20130619.1504"; src = fetchFromGitHub { owner = "sfllaw"; repo = "emacs-launch"; @@ -35544,7 +35758,7 @@ launchctl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "launchctl"; - version = "20150518.809"; + version = "20150518.609"; src = fetchFromGitHub { owner = "pekingduck"; repo = "launchctl-el"; @@ -35565,7 +35779,7 @@ lavender-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lavender-theme"; - version = "20141116.102"; + version = "20141115.2302"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-lavender-theme"; @@ -35586,7 +35800,7 @@ ldap-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ldap-mode"; - version = "20091203.1215"; + version = "20091203.1015"; src = fetchFromGitHub { owner = "emacsmirror"; repo = "ldap-mode"; @@ -35607,12 +35821,12 @@ ledger-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ledger-mode"; - version = "20160504.2043"; + version = "20160716.1259"; src = fetchFromGitHub { owner = "ledger"; repo = "ledger"; - rev = "6dcb1444ea8ab2dcf074c3477b74f0482e0d097d"; - sha256 = "1n06wzghhmxx7acahzmwmny0nx1wfahrylpfq0fwhk50mr29a866"; + rev = "67d21ed4b083424831e51a649060fbde7c2f735b"; + sha256 = "0jkalp1sggdj0nsms7jlyll9fzq3xxjf110jqwk9ydid0farbyzi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/93c54a327f226bf7e6a0ab4a3368a0e1ca169e62/recipes/ledger-mode"; @@ -35628,7 +35842,7 @@ leerzeichen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "leerzeichen"; - version = "20151106.28"; + version = "20151105.2228"; src = fetchFromGitHub { owner = "fgeller"; repo = "leerzeichen.el"; @@ -35649,7 +35863,7 @@ legalese = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "legalese"; - version = "20150820.1224"; + version = "20150820.1024"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "legalese"; @@ -35670,7 +35884,7 @@ lemon-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lemon-mode"; - version = "20130216.704"; + version = "20130216.504"; src = fetchFromGitHub { owner = "mooz"; repo = "lemon-mode"; @@ -35691,7 +35905,7 @@ lenlen-theme = callPackage ({ color-theme-solarized, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lenlen-theme"; - version = "20150307.211"; + version = "20150307.11"; src = fetchFromGitHub { owner = "zk-phi"; repo = "lenlen-theme"; @@ -35712,12 +35926,12 @@ lentic = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, m-buffer, melpaBuild, s }: melpaBuild { pname = "lentic"; - version = "20160701.1749"; + version = "20160721.1552"; src = fetchFromGitHub { owner = "phillord"; repo = "lentic"; - rev = "97c01a0a02fc462a30fdd1644d4ead2b884ffc0e"; - sha256 = "1i7ns7fa946b5ifldhajpdic3q8hdxx5fh3dvbyc852r2xmsa4c1"; + rev = "90a05765ebe890c0da88fe5177171473fe729574"; + sha256 = "1s82s5d7www2blz4zbyjdxwiqg9xb24gk5scxd8b8xqr7wd20sqj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cbb6f9cc3c1040b80fbf3f2df2ac2c3c8d18b6b1/recipes/lentic"; @@ -35733,12 +35947,12 @@ lentic-server = callPackage ({ fetchFromGitHub, fetchurl, lentic, lib, melpaBuild, web-server }: melpaBuild { pname = "lentic-server"; - version = "20150320.826"; + version = "20160717.1352"; src = fetchFromGitHub { owner = "phillord"; repo = "lentic-server"; - rev = "533e0eadb2dd79c50da7de8fc1d6e6f1e99bd6ff"; - sha256 = "0c6wkfz6sdcs4aglvx6h3slhma2vbj7idckwzvp8ji6s7p1mavlv"; + rev = "8e809fafbb27a98f815b544d9d9ee15843eb6a36"; + sha256 = "1wc1c6hqhbb5x4fi7lp30bsrfww9g12c41lphswy92qzlij4zbww"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/10b8cc0b4612d7d02be3a74c21b762cbf7613bd6/recipes/lentic-server"; @@ -35754,7 +35968,7 @@ less-css-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "less-css-mode"; - version = "20150511.519"; + version = "20150511.319"; src = fetchFromGitHub { owner = "purcell"; repo = "less-css-mode"; @@ -35775,7 +35989,7 @@ letcheck = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "letcheck"; - version = "20160202.1348"; + version = "20160202.1148"; src = fetchFromGitHub { owner = "Fuco1"; repo = "letcheck"; @@ -35796,12 +36010,12 @@ leuven-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "leuven-theme"; - version = "20160702.1713"; + version = "20160725.428"; src = fetchFromGitHub { owner = "fniessen"; repo = "emacs-leuven-theme"; - rev = "564756c240d812d023050e2e3df472b9d205cde6"; - sha256 = "1vjrs0m71p0asl1gs8bxq10mb0ff666c0aknmg84ibn7ch8i4r4b"; + rev = "b0f212ebe09ce47bce3a7e852d8c574acfd4fa61"; + sha256 = "1kvayvjh7c199h72ri8sbi3glanxsg6dxp0r1sa65cb6vp7p988v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b09451f4eb2be820e94d3fecbf4ec7cecd2cabdc/recipes/leuven-theme"; @@ -35816,7 +36030,7 @@ }) {}; levenshtein = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "levenshtein"; - version = "20051013.1256"; + version = "20051013.1056"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/levenshtein.el"; sha256 = "0m94z18i1428bispxi285flvjf22kjm33s4sm0ad11m0w0jizir6"; @@ -35835,7 +36049,7 @@ lexbind-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lexbind-mode"; - version = "20141027.929"; + version = "20141027.729"; src = fetchFromGitHub { owner = "spacebat"; repo = "lexbind-mode"; @@ -35856,12 +36070,12 @@ lfe-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lfe-mode"; - version = "20160630.2039"; + version = "20160630.1839"; src = fetchFromGitHub { owner = "rvirding"; repo = "lfe"; - rev = "218fc12dec75af53707913c520a86eeb5c18eabf"; - sha256 = "11hfvq2aq3ryhsryd5rd2bdz4mjmsn03v6wm6pnijyzp0n39m43p"; + rev = "5fb22077167a725a5291c194a468e6f5dc5656dc"; + sha256 = "0q22yazhxlss6nk5qpk4n25blgq4w54xngzbng6319jz97ks9s2k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode"; @@ -35876,7 +36090,7 @@ }) {}; lib-requires = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "lib-requires"; - version = "20151231.1610"; + version = "20151231.1410"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/lib-requires.el"; sha256 = "077cy2clllrvabw44wb1pzcqz97r3y92j7cb9lnhd9pix0wpcq6g"; @@ -35895,7 +36109,7 @@ libmpdee = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "libmpdee"; - version = "20160117.1701"; + version = "20160117.1501"; src = fetchFromGitHub { owner = "andyetitmoves"; repo = "libmpdee"; @@ -35916,7 +36130,7 @@ lice = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lice"; - version = "20151225.1222"; + version = "20151225.1022"; src = fetchFromGitHub { owner = "buzztaiki"; repo = "lice-el"; @@ -35937,7 +36151,7 @@ light-soap-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "light-soap-theme"; - version = "20150607.945"; + version = "20150607.745"; src = fetchFromGitHub { owner = "mswift42"; repo = "light-soap-theme"; @@ -35958,7 +36172,7 @@ lingr = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lingr"; - version = "20100807.1231"; + version = "20100807.1031"; src = fetchFromGitHub { owner = "lugecy"; repo = "lingr-el"; @@ -35979,7 +36193,7 @@ link = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "link"; - version = "20140717.2229"; + version = "20140717.2029"; src = fetchFromGitHub { owner = "myrkr"; repo = "dictionary-el"; @@ -36000,7 +36214,7 @@ link-hint = callPackage ({ avy, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "link-hint"; - version = "20160413.18"; + version = "20160412.2218"; src = fetchFromGitHub { owner = "noctuid"; repo = "link-hint.el"; @@ -36021,7 +36235,7 @@ linphone = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "linphone"; - version = "20130524.609"; + version = "20130524.409"; src = fetchFromGitHub { owner = "zabbal"; repo = "emacs-linphone"; @@ -36042,7 +36256,7 @@ linum-off = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "linum-off"; - version = "20160217.1537"; + version = "20160217.1337"; src = fetchFromGitHub { owner = "mattfidler"; repo = "linum-off"; @@ -36063,7 +36277,7 @@ linum-relative = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "linum-relative"; - version = "20160510.318"; + version = "20160510.118"; src = fetchFromGitHub { owner = "coldnew"; repo = "linum-relative"; @@ -36084,7 +36298,7 @@ liso-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "liso-theme"; - version = "20160410.1529"; + version = "20160410.1329"; src = fetchFromGitHub { owner = "caisah"; repo = "liso-theme"; @@ -36105,7 +36319,7 @@ lisp-extra-font-lock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lisp-extra-font-lock"; - version = "20160507.1702"; + version = "20160507.1502"; src = fetchFromGitHub { owner = "Lindydancer"; repo = "lisp-extra-font-lock"; @@ -36125,7 +36339,7 @@ }) {}; lispxmp = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "lispxmp"; - version = "20130824.707"; + version = "20130824.507"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/lispxmp.el"; sha256 = "1m07gb3v1a7al0h4nj3914y8lqrwzi8fwb1ih66nxzn6kb0qj3mf"; @@ -36144,12 +36358,12 @@ lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper }: melpaBuild { pname = "lispy"; - version = "20160628.307"; + version = "20160725.513"; src = fetchFromGitHub { owner = "abo-abo"; repo = "lispy"; - rev = "79a6db0874ef589665fab5bf61004cd4f7fe2d8a"; - sha256 = "1y5lpxap6wn3flsfri92blrc6mr5ycah0i6w36ca47m3y8gli6m8"; + rev = "e8d98fbd4bf0dcc93127fde9cfe2bdec08df3de2"; + sha256 = "0n88snmblprj4iz78f9lwnpqz4r2f46ss05lh38fmamzlqky2rs0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy"; @@ -36165,7 +36379,7 @@ lispyscript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lispyscript-mode"; - version = "20130828.919"; + version = "20130828.719"; src = fetchFromGitHub { owner = "krisajenkins"; repo = "lispyscript-mode"; @@ -36186,7 +36400,7 @@ lispyville = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, lispy, melpaBuild }: melpaBuild { pname = "lispyville"; - version = "20160630.2035"; + version = "20160630.1835"; src = fetchFromGitHub { owner = "noctuid"; repo = "lispyville"; @@ -36207,7 +36421,7 @@ list-environment = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "list-environment"; - version = "20151226.2056"; + version = "20151226.1856"; src = fetchFromGitHub { owner = "dgtized"; repo = "list-environment.el"; @@ -36228,7 +36442,7 @@ list-packages-ext = callPackage ({ fetchFromGitHub, fetchurl, ht, lib, melpaBuild, persistent-soft, s }: melpaBuild { pname = "list-packages-ext"; - version = "20151115.1116"; + version = "20151115.916"; src = fetchFromGitHub { owner = "laynor"; repo = "list-packages-ext"; @@ -36249,7 +36463,7 @@ list-processes-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "list-processes-plus"; - version = "20131117.1335"; + version = "20131117.1135"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/list-processes+.el"; sha256 = "1bssvyjgk1h1wiaxxdi2m5gjy6a790a9rwvi0r22hin7iskg300a"; @@ -36268,7 +36482,7 @@ list-register = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "list-register"; - version = "20091203.1215"; + version = "20091203.1015"; src = fetchFromGitHub { owner = "emacsmirror"; repo = "list-register"; @@ -36289,7 +36503,7 @@ list-unicode-display = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "list-unicode-display"; - version = "20150219.301"; + version = "20150219.101"; src = fetchFromGitHub { owner = "purcell"; repo = "list-unicode-display"; @@ -36310,7 +36524,7 @@ list-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "list-utils"; - version = "20160414.902"; + version = "20160414.702"; src = fetchFromGitHub { owner = "rolandwalker"; repo = "list-utils"; @@ -36331,7 +36545,7 @@ lit-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lit-mode"; - version = "20141123.1136"; + version = "20141123.936"; src = fetchFromGitHub { owner = "HectorAE"; repo = "lit-mode"; @@ -36352,7 +36566,7 @@ litable = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "litable"; - version = "20150908.909"; + version = "20150908.709"; src = fetchFromGitHub { owner = "Fuco1"; repo = "litable"; @@ -36373,7 +36587,7 @@ litecoin-ticker = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "litecoin-ticker"; - version = "20160611.1911"; + version = "20160611.1711"; src = fetchFromGitHub { owner = "llcc"; repo = "btcbox-ticker"; @@ -36394,7 +36608,7 @@ literate-coffee-mode = callPackage ({ coffee-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "literate-coffee-mode"; - version = "20160114.634"; + version = "20160114.434"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-literate-coffee-mode"; @@ -36415,7 +36629,7 @@ literate-starter-kit = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "literate-starter-kit"; - version = "20150730.1354"; + version = "20150730.1154"; src = fetchFromGitHub { owner = "eschulte"; repo = "emacs24-starter-kit"; @@ -36436,7 +36650,7 @@ live-code-talks = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, narrowed-page-navigation }: melpaBuild { pname = "live-code-talks"; - version = "20150115.1623"; + version = "20150115.1423"; src = fetchFromGitHub { owner = "david-christiansen"; repo = "live-code-talks"; @@ -36457,12 +36671,12 @@ live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "live-py-mode"; - version = "20160521.1330"; + version = "20160521.1130"; src = fetchFromGitHub { owner = "donkirkby"; repo = "live-py-plugin"; - rev = "060f9e2f948d72ac14a2d92bc4599b937683aae2"; - sha256 = "147k3d8hj6wgjmdfv3cnnpwsz0bs7j167zdv74qpx6nq03qrwpv1"; + rev = "2670089597e586c82402767727c278e9c8edfca1"; + sha256 = "00bran2qvxqlp5081qqnwn48i48v95m3g5jgrxq0nvcgblxdv2ga"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode"; @@ -36478,7 +36692,7 @@ lively = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lively"; - version = "20160208.1235"; + version = "20160208.1035"; src = fetchFromGitHub { owner = "emacsorphanage"; repo = "lively"; @@ -36499,7 +36713,7 @@ livescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "livescript-mode"; - version = "20140612.2321"; + version = "20140612.2121"; src = fetchFromGitHub { owner = "yhisamatsu"; repo = "livescript-mode"; @@ -36520,7 +36734,7 @@ livid-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s, skewer-mode }: melpaBuild { pname = "livid-mode"; - version = "20131116.744"; + version = "20131116.544"; src = fetchFromGitHub { owner = "pandeiro"; repo = "livid-mode"; @@ -36541,11 +36755,11 @@ llvm-mode = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "llvm-mode"; - version = "20150910.844"; + version = "20150910.644"; src = fetchgit { url = "http://llvm.org/git/llvm"; - rev = "4ad0017d61f7b3444147fd5a47b18a527adb9fa8"; - sha256 = "0bq2p677bl6gzfnrhhd3ysc9rpykq5nvzy0qn1k4r0s26fbw9fgz"; + rev = "5682750bf9fc3a02c57e08527780a43854695460"; + sha256 = "0wh2jy8jwh23381y334qyz6gdpff1fy1zhsavwg9pfgb118dqiw2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode"; @@ -36561,12 +36775,12 @@ load-relative = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "load-relative"; - version = "20160505.219"; + version = "20160716.438"; src = fetchFromGitHub { owner = "rocky"; repo = "emacs-load-relative"; - rev = "2aa165fba4a663fdaeda7f7e2cec38bad617ccd8"; - sha256 = "0izrli7f20iq1pz1r1l0kshzpz7vl4p1gyn2n5mdjv5lbpq7cykb"; + rev = "49919120c93a05beede58ce7cc261e1f47721fdd"; + sha256 = "0n44sva0rhaxp7g1s9jkwji0f0x5h021mgplbs9arvrjc46sw4bb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f052f201f7c308325c27cc2423e85cf6b9b67b4e/recipes/load-relative"; @@ -36582,7 +36796,7 @@ load-theme-buffer-local = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "load-theme-buffer-local"; - version = "20120702.1536"; + version = "20120702.1336"; src = fetchFromGitHub { owner = "vic"; repo = "color-theme-buffer-local"; @@ -36603,12 +36817,12 @@ loc-changes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "loc-changes"; - version = "20150302.1048"; + version = "20160716.458"; src = fetchFromGitHub { owner = "rocky"; repo = "emacs-loc-changes"; - rev = "58000738accf2f80ea2bf210f7dea5914adb14ee"; - sha256 = "0i0ainawjvfl3qix329hx01x7rxyfin2xgpjk7y5dgmh4p3xhv94"; + rev = "d0ef370c773c04e6533e6725f76c69f3e4eccbe5"; + sha256 = "1w8n2md44w65rrvlyn5vw8a1mqzbm8ymc6k6215kd9fmjjkc2y86"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5ce68d573d19f26ecfd190f8e6cd1f384ca3e8a/recipes/loc-changes"; @@ -36624,7 +36838,7 @@ loccur = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "loccur"; - version = "20160129.1422"; + version = "20160129.1222"; src = fetchFromGitHub { owner = "fourier"; repo = "loccur"; @@ -36645,7 +36859,7 @@ lodgeit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lodgeit"; - version = "20150312.849"; + version = "20150312.649"; src = fetchFromGitHub { owner = "ionrock"; repo = "lodgeit-el"; @@ -36666,7 +36880,7 @@ log4e = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "log4e"; - version = "20150105.705"; + version = "20150105.505"; src = fetchFromGitHub { owner = "aki2o"; repo = "log4e"; @@ -36687,7 +36901,7 @@ log4j-mode = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "log4j-mode"; - version = "20160108.1318"; + version = "20160108.1118"; src = fetchgit { url = "git://git.code.sf.net/p/log4j-mode/code"; rev = "26171b1e723502055e085393b0ecdcb6db406010"; @@ -36707,7 +36921,7 @@ logalimacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup, popwin, stem }: melpaBuild { pname = "logalimacs"; - version = "20131021.1329"; + version = "20131021.1129"; src = fetchFromGitHub { owner = "logaling"; repo = "logalimacs"; @@ -36728,7 +36942,7 @@ logito = callPackage ({ eieio ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "logito"; - version = "20120225.1455"; + version = "20120225.1255"; src = fetchFromGitHub { owner = "sigma"; repo = "logito"; @@ -36749,7 +36963,7 @@ logstash-conf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "logstash-conf"; - version = "20150308.718"; + version = "20150308.518"; src = fetchFromGitHub { owner = "Wilfred"; repo = "logstash-conf.el"; @@ -36770,12 +36984,12 @@ logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "logview"; - version = "20160520.1541"; + version = "20160720.1501"; src = fetchFromGitHub { owner = "doublep"; repo = "logview"; - rev = "0d1c20c9e5b7b61a2e40e95180a10c2d29ca97f7"; - sha256 = "0xjfm39pk1z2wj6rr9v9jzsxy5p2vdi4rinzfpl719lcknpvzkw3"; + rev = "2a949309b6397ea88cc1560bddb0ef3634a1af1e"; + sha256 = "1bpnglr7k9wsx95g9h5hsvxdm9fk9l04mmsbh8fngybdsawy64q6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview"; @@ -36791,7 +37005,7 @@ lolcode-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lolcode-mode"; - version = "20111002.347"; + version = "20111002.147"; src = fetchFromGitHub { owner = "bodil"; repo = "lolcode-mode"; @@ -36812,7 +37026,7 @@ look-dired = callPackage ({ fetchFromGitHub, fetchurl, lib, look-mode, melpaBuild }: melpaBuild { pname = "look-dired"; - version = "20160529.1601"; + version = "20160529.1401"; src = fetchFromGitHub { owner = "vapniks"; repo = "look-dired"; @@ -36832,7 +37046,7 @@ }) {}; look-mode = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "look-mode"; - version = "20151211.1226"; + version = "20151211.1026"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/look-mode.el"; sha256 = "0sl6hqggi6qn2qp9khw11qp5hamngwxrrwx98k3pwpj9kgicdpgp"; @@ -36851,12 +37065,12 @@ loop = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "loop"; - version = "20160627.1727"; + version = "20160725.2005"; src = fetchFromGitHub { owner = "Wilfred"; repo = "loop.el"; - rev = "5e27a25ca836dceaaf81c1cc83a6cea606b26e0e"; - sha256 = "0fsq1156srfv5hihyyy7bsvz40cch8l6zbrs36vf022ly9nv0qmb"; + rev = "48bcf97cd6ea37d70ad8b4afb3b0770ab70b43d3"; + sha256 = "1bapsndcymcs0d9sksh426r7r6x9qgdif2yrhmf5z869kz234syn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ba481ca96469b3bd518e4fd8f24947338c8af014/recipes/loop"; @@ -36872,7 +37086,7 @@ lorem-ipsum = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lorem-ipsum"; - version = "20140911.1608"; + version = "20140911.1408"; src = fetchFromGitHub { owner = "jschaf"; repo = "emacs-lorem-ipsum"; @@ -36893,7 +37107,7 @@ love-minor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, lua-mode, melpaBuild }: melpaBuild { pname = "love-minor-mode"; - version = "20130429.1659"; + version = "20130429.1459"; src = fetchFromGitHub { owner = "ejmr"; repo = "love-minor-mode"; @@ -36914,7 +37128,7 @@ lua-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lua-mode"; - version = "20160502.1341"; + version = "20160502.1141"; src = fetchFromGitHub { owner = "immerrr"; repo = "lua-mode"; @@ -36935,7 +37149,7 @@ lush-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lush-theme"; - version = "20141107.1006"; + version = "20141107.806"; src = fetchFromGitHub { owner = "andre-richter"; repo = "emacs-lush-theme"; @@ -36956,7 +37170,7 @@ lusty-explorer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lusty-explorer"; - version = "20150508.1757"; + version = "20150508.1557"; src = fetchFromGitHub { owner = "sjbach"; repo = "lusty-emacs"; @@ -36977,7 +37191,7 @@ lxc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lxc"; - version = "20140410.1522"; + version = "20140410.1322"; src = fetchFromGitHub { owner = "nicferrier"; repo = "emacs-lxc"; @@ -36995,22 +37209,43 @@ license = lib.licenses.free; }; }) {}; - m-buffer = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + lyrics = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: + melpaBuild { + pname = "lyrics"; + version = "20160722.1540"; + src = fetchFromGitHub { + owner = "emacs-pe"; + repo = "lyrics.el"; + rev = "72b1b36fe05eabc5ae7b97c0b982a2a2654bfad7"; + sha256 = "0bgq39ai2bsw7k6zkjj0ilvs3gfjd30y4zw6lc6ywf2zbnia8jjn"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b04c8f3dfa9fc07cc0ff3df5c4069f864b6db92e/recipes/lyrics"; + sha256 = "0kj8v8cg4yqnz0v1nhq41jxjgd4ivqd6lsr1v5cqhg4m0r7f2nzc"; + name = "lyrics"; + }; + packageRequires = [ emacs seq ]; + meta = { + homepage = "https://melpa.org/#/lyrics"; + license = lib.licenses.free; + }; + }) {}; + m-buffer = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "m-buffer"; - version = "20160125.1503"; + version = "20160721.1539"; src = fetchFromGitHub { owner = "phillord"; repo = "m-buffer-el"; - rev = "cf99d4209a3422cabe13420dd9b2cbfbb63f7bea"; - sha256 = "1rrfvshl6zbsrswg5hrvq1p0rd9vacqwbr4s44kln7vg4ybcgr24"; + rev = "9c45387989bd7d813f15e56ac5d3210f5e44b1c6"; + sha256 = "1hiasrn3irxg7s413c34zxknml6fsy3yyykkv2lidk19npy6fslh"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0cc1991d4f36b8d53d6cbeb6c83417c5e6b9453f/recipes/m-buffer"; - sha256 = "0l2rayglv48pcwnr1ggmn8c0az0mffgv02ivnzr9jcfs55ki07fc"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/c34d02682e87c9978a3583bd903dcac5da5b41d5/recipes/m-buffer"; + sha256 = "17smq7wlidsls870hla5b94xq2pwk24b88jvrbbcqw6f5z3ypf94"; name = "m-buffer"; }; - packageRequires = [ dash emacs ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/m-buffer"; license = lib.licenses.free; @@ -37019,7 +37254,7 @@ macro-math = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "macro-math"; - version = "20130328.1104"; + version = "20130328.904"; src = fetchFromGitHub { owner = "nschum"; repo = "macro-math.el"; @@ -37039,7 +37274,7 @@ }) {}; macros-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "macros-plus"; - version = "20151231.1619"; + version = "20151231.1419"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/macros+.el"; sha256 = "07iw9iarz6z9n6vnhqqljfjpvq6vb97ca2hwj9v0k5k8mafdqg7d"; @@ -37058,7 +37293,7 @@ macrostep = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "macrostep"; - version = "20151213.345"; + version = "20151213.145"; src = fetchFromGitHub { owner = "joddie"; repo = "macrostep"; @@ -37079,7 +37314,7 @@ mag-menu = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, splitter }: melpaBuild { pname = "mag-menu"; - version = "20150505.1350"; + version = "20150505.1150"; src = fetchFromGitHub { owner = "chumpage"; repo = "mag-menu"; @@ -37100,7 +37335,7 @@ magic-filetype = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "magic-filetype"; - version = "20160522.929"; + version = "20160522.729"; src = fetchFromGitHub { owner = "zonuexe"; repo = "magic-filetype.el"; @@ -37121,7 +37356,7 @@ magic-latex-buffer = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "magic-latex-buffer"; - version = "20160212.803"; + version = "20160212.603"; src = fetchFromGitHub { owner = "zk-phi"; repo = "magic-latex-buffer"; @@ -37142,12 +37377,12 @@ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "20160629.1356"; + version = "20160724.858"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "5f57495f65fea169282b23233f87c4af07a60e4c"; - sha256 = "0x5k1q4vajpb9658jl0ikjm94pq5gnk9y55px72kdmh9hm8nx5iq"; + rev = "5834d0dbd471af0ce6537b4fc020fac05701267b"; + sha256 = "0nmpkh9nw3zzaw6ya6inr9zljdx5qjkkivmh2dlyird6sppdsqxy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit"; @@ -37170,7 +37405,7 @@ magit-annex = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "magit-annex"; - version = "20160625.54"; + version = "20160624.2254"; src = fetchFromGitHub { owner = "magit"; repo = "magit-annex"; @@ -37191,7 +37426,7 @@ magit-filenotify = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "magit-filenotify"; - version = "20151116.1740"; + version = "20151116.1540"; src = fetchFromGitHub { owner = "magit"; repo = "magit-filenotify"; @@ -37212,7 +37447,7 @@ magit-find-file = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "magit-find-file"; - version = "20150702.330"; + version = "20150702.130"; src = fetchFromGitHub { owner = "bradwright"; repo = "magit-find-file.el"; @@ -37233,7 +37468,7 @@ magit-gerrit = callPackage ({ fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "magit-gerrit"; - version = "20160226.330"; + version = "20160226.130"; src = fetchFromGitHub { owner = "terranpro"; repo = "magit-gerrit"; @@ -37254,7 +37489,7 @@ magit-gh-pulls = callPackage ({ emacs, fetchFromGitHub, fetchurl, gh, lib, magit, melpaBuild, pcache, s }: melpaBuild { pname = "magit-gh-pulls"; - version = "20160513.510"; + version = "20160513.310"; src = fetchFromGitHub { owner = "sigma"; repo = "magit-gh-pulls"; @@ -37275,7 +37510,7 @@ magit-gitflow = callPackage ({ fetchFromGitHub, fetchurl, lib, magit, magit-popup, melpaBuild }: melpaBuild { pname = "magit-gitflow"; - version = "20160629.1432"; + version = "20160629.1232"; src = fetchFromGitHub { owner = "jtatarik"; repo = "magit-gitflow"; @@ -37296,7 +37531,7 @@ magit-p4 = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, magit, magit-popup, melpaBuild, p4 }: melpaBuild { pname = "magit-p4"; - version = "20160627.647"; + version = "20160627.447"; src = fetchFromGitHub { owner = "qoocku"; repo = "magit-p4"; @@ -37317,12 +37552,12 @@ magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "magit-popup"; - version = "20160606.1241"; + version = "20160725.1907"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "5f57495f65fea169282b23233f87c4af07a60e4c"; - sha256 = "0x5k1q4vajpb9658jl0ikjm94pq5gnk9y55px72kdmh9hm8nx5iq"; + rev = "5834d0dbd471af0ce6537b4fc020fac05701267b"; + sha256 = "0nmpkh9nw3zzaw6ya6inr9zljdx5qjkkivmh2dlyird6sppdsqxy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup"; @@ -37338,7 +37573,7 @@ magit-rockstar = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "magit-rockstar"; - version = "20160517.851"; + version = "20160517.651"; src = fetchFromGitHub { owner = "tarsius"; repo = "magit-rockstar"; @@ -37359,7 +37594,7 @@ magit-stgit = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "magit-stgit"; - version = "20160224.903"; + version = "20160224.703"; src = fetchFromGitHub { owner = "magit"; repo = "magit-stgit"; @@ -37380,7 +37615,7 @@ magit-svn = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "magit-svn"; - version = "20151219.747"; + version = "20151219.547"; src = fetchFromGitHub { owner = "magit"; repo = "magit-svn"; @@ -37401,7 +37636,7 @@ magit-topgit = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "magit-topgit"; - version = "20160313.1454"; + version = "20160313.1254"; src = fetchFromGitHub { owner = "magit"; repo = "magit-topgit"; @@ -37422,7 +37657,7 @@ magma-mode = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "magma-mode"; - version = "20160304.608"; + version = "20160304.408"; src = fetchFromGitHub { owner = "ThibautVerron"; repo = "magma-mode"; @@ -37443,7 +37678,7 @@ magnatune = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "magnatune"; - version = "20151030.1435"; + version = "20151030.1235"; src = fetchFromGitHub { owner = "eikek"; repo = "magnatune.el"; @@ -37464,7 +37699,7 @@ main-line = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "main-line"; - version = "20151120.2006"; + version = "20151120.1806"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-mainline"; @@ -37485,7 +37720,7 @@ majapahit-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "majapahit-theme"; - version = "20160412.632"; + version = "20160412.432"; src = fetchFromGitLab { owner = "franksn"; repo = "majapahit-theme"; @@ -37506,7 +37741,7 @@ make-color = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "make-color"; - version = "20140625.650"; + version = "20140625.450"; src = fetchFromGitHub { owner = "alezost"; repo = "make-color.el"; @@ -37524,22 +37759,22 @@ license = lib.licenses.free; }; }) {}; - make-it-so = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: + make-it-so = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "make-it-so"; - version = "20150319.1407"; + version = "20160705.111"; src = fetchFromGitHub { owner = "abo-abo"; repo = "make-it-so"; - rev = "ed83b8b9787441cc6be4994d571529852a8cce4a"; - sha256 = "00j5n9pil1qik4mrzvam4rp6213w8jm4qw7c4z8sxpq57xa0b679"; + rev = "4fea635f47f4c1d235c6b7535f420c0f7643fa87"; + sha256 = "0fng4v949nxm64fhiy0bnl9zf4p1av1wcd23hqjg4wfabxhvx5by"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aad592089ed2200e2f8c5191e8adeac1db4bce54/recipes/make-it-so"; sha256 = "0a8abz54mb60mfr0bl9ry8yawq99vx9hjl4fm2sivns58qjgfy73"; name = "make-it-so"; }; - packageRequires = [ emacs helm ]; + packageRequires = [ emacs swiper ]; meta = { homepage = "https://melpa.org/#/make-it-so"; license = lib.licenses.free; @@ -37548,7 +37783,7 @@ maker-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "maker-mode"; - version = "20150116.554"; + version = "20150116.354"; src = fetchFromGitHub { owner = "fommil"; repo = "maker-mode"; @@ -37569,7 +37804,7 @@ makey = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "makey"; - version = "20131231.830"; + version = "20131231.630"; src = fetchFromGitHub { owner = "mickeynp"; repo = "makey"; @@ -37590,7 +37825,7 @@ malabar-mode = callPackage ({ fetchFromGitHub, fetchurl, fringe-helper, groovy-mode, lib, melpaBuild }: melpaBuild { pname = "malabar-mode"; - version = "20150720.1255"; + version = "20150720.1055"; src = fetchFromGitHub { owner = "m0smith"; repo = "malabar-mode"; @@ -37611,7 +37846,7 @@ malinka = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, rtags, s }: melpaBuild { pname = "malinka"; - version = "20160615.1548"; + version = "20160615.1348"; src = fetchFromGitHub { owner = "LefterisJP"; repo = "malinka"; @@ -37632,7 +37867,7 @@ mallard-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mallard-mode"; - version = "20131203.2225"; + version = "20131203.2025"; src = fetchFromGitHub { owner = "jhradilek"; repo = "emacs-mallard-mode"; @@ -37653,7 +37888,7 @@ mallard-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, mallard-mode, melpaBuild, yasnippet }: melpaBuild { pname = "mallard-snippets"; - version = "20131023.1351"; + version = "20131023.1151"; src = fetchFromGitHub { owner = "jhradilek"; repo = "emacs-mallard-snippets"; @@ -37674,7 +37909,7 @@ man-commands = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "man-commands"; - version = "20151221.1621"; + version = "20151221.1421"; src = fetchFromGitHub { owner = "nflath"; repo = "man-commands"; @@ -37695,7 +37930,7 @@ manage-minor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "manage-minor-mode"; - version = "20140310.1100"; + version = "20140310.900"; src = fetchFromGitHub { owner = "ShingoFukuyama"; repo = "manage-minor-mode"; @@ -37716,7 +37951,7 @@ mandoku = callPackage ({ fetchFromGitHub, fetchurl, git, github-clone, lib, magit, melpaBuild, org }: melpaBuild { pname = "mandoku"; - version = "20160626.2124"; + version = "20160626.1924"; src = fetchFromGitHub { owner = "mandoku"; repo = "mandoku"; @@ -37737,7 +37972,7 @@ map-progress = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "map-progress"; - version = "20140310.1632"; + version = "20140310.1432"; src = fetchFromGitHub { owner = "tarsius"; repo = "map-progress"; @@ -37758,7 +37993,7 @@ map-regexp = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "map-regexp"; - version = "20130522.1603"; + version = "20130522.1403"; src = fetchFromGitHub { owner = "tarsius"; repo = "map-regexp"; @@ -37779,7 +38014,7 @@ marcopolo = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, request, s }: melpaBuild { pname = "marcopolo"; - version = "20160421.504"; + version = "20160421.304"; src = fetchFromGitHub { owner = "nlamirault"; repo = "marcopolo"; @@ -37800,7 +38035,7 @@ mark-multiple = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mark-multiple"; - version = "20121118.954"; + version = "20121118.754"; src = fetchFromGitHub { owner = "magnars"; repo = "mark-multiple.el"; @@ -37821,7 +38056,7 @@ mark-tools = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mark-tools"; - version = "20130614.525"; + version = "20130614.325"; src = fetchFromGitHub { owner = "stsquad"; repo = "emacs-mark-tools"; @@ -37842,12 +38077,12 @@ markdown-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "markdown-mode"; - version = "20160629.659"; + version = "20160722.445"; src = fetchFromGitHub { owner = "jrblevin"; repo = "markdown-mode"; - rev = "c5f9265edf698017e64c69e32fb1d137a7bfc39e"; - sha256 = "1mq317gy31lapnzqhk1fc28qvdmbv72kxv8nnz3b0hg2987mqxzb"; + rev = "3ba1851ccc9338501ccf1e1c24085420d95f18f7"; + sha256 = "0d2mhy7npfh5vv1i0b61dvc7avgp0bkv2fqczsfb9vnq320zj06l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/74610ec93d4478e835f8b3b446279efc0c71d644/recipes/markdown-mode"; @@ -37863,7 +38098,7 @@ markdown-mode-plus = callPackage ({ fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }: melpaBuild { pname = "markdown-mode-plus"; - version = "20120829.710"; + version = "20120829.510"; src = fetchFromGitHub { owner = "milkypostman"; repo = "markdown-mode-plus"; @@ -37884,7 +38119,7 @@ markdown-preview-eww = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "markdown-preview-eww"; - version = "20160111.902"; + version = "20160111.702"; src = fetchFromGitHub { owner = "niku"; repo = "markdown-preview-eww"; @@ -37905,7 +38140,7 @@ markdown-preview-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, websocket }: melpaBuild { pname = "markdown-preview-mode"; - version = "20160604.1059"; + version = "20160604.859"; src = fetchFromGitHub { owner = "ancane"; repo = "markdown-preview-mode"; @@ -37926,12 +38161,12 @@ markdown-toc = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, s }: melpaBuild { pname = "markdown-toc"; - version = "20160227.508"; + version = "20160725.504"; src = fetchFromGitHub { owner = "ardumont"; repo = "markdown-toc"; - rev = "c5d44470f8fb0f61bc96e58dec998010edcc0e95"; - sha256 = "0l687bna8rrc49y1fyn1ldjcwh290qgvi3p86c63yj4xy24fmdm6"; + rev = "15587c76bec43dd778a2034035f98a79ad29e96a"; + sha256 = "00rvpbfcdy1npddxa7yynqpzwrx1h2bm69x9yh42dv6ss3vk1sjs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4db1e90be8e34d5ad0c898be10dfa5cd95ccb921/recipes/markdown-toc"; @@ -37947,7 +38182,7 @@ markdownfmt = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "markdownfmt"; - version = "20160609.741"; + version = "20160609.541"; src = fetchFromGitHub { owner = "nlamirault"; repo = "emacs-markdownfmt"; @@ -37968,7 +38203,7 @@ markup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "markup"; - version = "20130207.1509"; + version = "20130207.1309"; src = fetchFromGitHub { owner = "leoc"; repo = "markup.el"; @@ -37989,7 +38224,7 @@ markup-faces = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "markup-faces"; - version = "20141110.217"; + version = "20141110.17"; src = fetchFromGitHub { owner = "sensorflo"; repo = "markup-faces"; @@ -38010,7 +38245,7 @@ marmalade = callPackage ({ fetchFromGitHub, fetchurl, furl, lib, melpaBuild }: melpaBuild { pname = "marmalade"; - version = "20110602.1822"; + version = "20110602.1622"; src = fetchFromGitHub { owner = "nex3"; repo = "marmalade"; @@ -38031,7 +38266,7 @@ marmalade-client = callPackage ({ fetchFromGitHub, fetchurl, gh, kv, lib, melpaBuild, web }: melpaBuild { pname = "marmalade-client"; - version = "20141231.1407"; + version = "20141231.1207"; src = fetchFromGitHub { owner = "nicferrier"; repo = "emacs-marmalade-upload"; @@ -38052,12 +38287,12 @@ marshal = callPackage ({ eieio ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "marshal"; - version = "20160623.58"; + version = "20160725.1851"; src = fetchFromGitHub { owner = "sigma"; repo = "marshal.el"; - rev = "64c428aa2d645501955e8a091c6bb027c08623a2"; - sha256 = "11zlqrvm8c2xmjf8k8ibc0mzgy7q5jdn2imvrfgdf5pb7ygigy8j"; + rev = "d62a406abb9e8c3dfb8513452402845c55ade6ae"; + sha256 = "164nx0bk8h0p38j8gprcz2zwdqwbjxfcj3idlc5ryqm165h5cwmy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/203f2061c5c7d4aefab3175de5e0538f12158ee3/recipes/marshal"; @@ -38073,7 +38308,7 @@ maruo-macro-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "maruo-macro-mode"; - version = "20160616.849"; + version = "20160616.649"; src = fetchFromGitHub { owner = "zonuexe"; repo = "maruo-macro-mode.el"; @@ -38094,7 +38329,7 @@ material-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "material-theme"; - version = "20160516.1044"; + version = "20160516.844"; src = fetchFromGitHub { owner = "cpaulik"; repo = "emacs-material-theme"; @@ -38115,7 +38350,7 @@ math-symbol-lists = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "math-symbol-lists"; - version = "20160302.1631"; + version = "20160302.1431"; src = fetchFromGitHub { owner = "vspinu"; repo = "math-symbol-lists"; @@ -38136,7 +38371,7 @@ math-symbols = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "math-symbols"; - version = "20151121.1842"; + version = "20151121.1642"; src = fetchFromGitHub { owner = "kawabata"; repo = "math-symbols"; @@ -38157,7 +38392,7 @@ matlab-mode = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "matlab-mode"; - version = "20160527.1552"; + version = "20160527.1352"; src = fetchgit { url = "git://git.code.sf.net/p/matlab-emacs/src"; rev = "64f2a5635fb3c690ed22d40779ea930ed5130b5c"; @@ -38174,10 +38409,30 @@ license = lib.licenses.free; }; }) {}; + matrix-client = callPackage ({ fetchgit, fetchurl, json ? null, lib, melpaBuild, request }: + melpaBuild { + pname = "matrix-client"; + version = "20160718.915"; + src = fetchgit { + url = "http://fort.kickass.systems/git/rrix/matrix-client.git"; + rev = "7b4159f3f594bdfd6c592a8fa3fbeece2f66ae19"; + sha256 = "1m8ws0w7lk51s2yh4jphzn4l9as2qgw8gcjpg63p641ccs5s4pvd"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/152969c540b57c0a9532e698c24eac0de5e0269c/recipes/matrix-client"; + sha256 = "0znm8b1hd7iyb84qzxs25y850cbxxmydyzr7kx094rji55685c68"; + name = "matrix-client"; + }; + packageRequires = [ json request ]; + meta = { + homepage = "https://melpa.org/#/matrix-client"; + license = lib.licenses.free; + }; + }) {}; maude-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "maude-mode"; - version = "20160222.1007"; + version = "20160222.807"; src = fetchFromGitHub { owner = "rudi"; repo = "maude-mode"; @@ -38198,7 +38453,7 @@ maven-test-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "maven-test-mode"; - version = "20141219.2357"; + version = "20141219.2157"; src = fetchFromGitHub { owner = "rranelli"; repo = "maven-test-mode"; @@ -38219,7 +38474,7 @@ maxframe = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "maxframe"; - version = "20140916.954"; + version = "20140916.754"; src = fetchFromGitHub { owner = "rmm5t"; repo = "maxframe.el"; @@ -38239,7 +38494,7 @@ }) {}; mb-depth-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "mb-depth-plus"; - version = "20151231.1621"; + version = "20151231.1421"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/mb-depth+.el"; sha256 = "0w8clp96jblsc9v87404zpc280ms0d644in34jdgjc5r33f4i0g3"; @@ -38258,12 +38513,12 @@ mb-url = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mb-url"; - version = "20160701.1131"; + version = "20160724.725"; src = fetchFromGitHub { owner = "dochang"; repo = "mb-url"; - rev = "e6ff9a88a4eb2de542e2fb053f4981ac8fa0a529"; - sha256 = "073yqx5gjiglbb50633mjq5dkl5h54rk4qzp0kn9zqmi2mxa3i7p"; + rev = "178b03d2cbc31e889c095a6c25426c297e5fe6fc"; + sha256 = "0y22bn4zvyw2qivjrvwkhx96mwvfpx74901r0m4l31nvyh559aq0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dd9a8ff6e094b061a7b9d790df1fd4086c5d0a9d/recipes/mb-url"; @@ -38279,7 +38534,7 @@ mbe = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mbe"; - version = "20151126.534"; + version = "20151126.334"; src = fetchFromGitHub { owner = "ijp"; repo = "mbe.el"; @@ -38300,7 +38555,7 @@ mbo70s-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mbo70s-theme"; - version = "20141122.842"; + version = "20141122.642"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-mbo70s-theme"; @@ -38321,7 +38576,7 @@ mc-extras = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }: melpaBuild { pname = "mc-extras"; - version = "20150218.434"; + version = "20150218.234"; src = fetchFromGitHub { owner = "knu"; repo = "mc-extras.el"; @@ -38342,7 +38597,7 @@ md-readme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "md-readme"; - version = "20150506.159"; + version = "20150505.2359"; src = fetchFromGitHub { owner = "thomas11"; repo = "md-readme"; @@ -38363,7 +38618,7 @@ meacupla-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "meacupla-theme"; - version = "20151027.1717"; + version = "20151027.1517"; src = fetchFromGitLab { owner = "jtecca"; repo = "meacupla-theme"; @@ -38384,7 +38639,7 @@ mediawiki = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mediawiki"; - version = "20160425.902"; + version = "20160425.702"; src = fetchFromGitHub { owner = "hexmode"; repo = "mediawiki-el"; @@ -38405,7 +38660,7 @@ mellow-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mellow-theme"; - version = "20141116.102"; + version = "20141115.2302"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-mellow-theme"; @@ -38426,7 +38681,7 @@ melpa-upstream-visit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "melpa-upstream-visit"; - version = "20130720.533"; + version = "20130720.333"; src = fetchFromGitHub { owner = "laynor"; repo = "melpa-upstream-visit"; @@ -38447,7 +38702,7 @@ memento = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "memento"; - version = "20150823.539"; + version = "20150823.339"; src = fetchFromGitHub { owner = "ehartc"; repo = "memento"; @@ -38468,7 +38723,7 @@ memoize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "memoize"; - version = "20130421.1434"; + version = "20130421.1234"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacs-memoize"; @@ -38489,7 +38744,7 @@ memolist = callPackage ({ ag, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }: melpaBuild { pname = "memolist"; - version = "20150804.1221"; + version = "20150804.1021"; src = fetchFromGitHub { owner = "mikanfactory"; repo = "memolist.el"; @@ -38510,7 +38765,7 @@ mentor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }: melpaBuild { pname = "mentor"; - version = "20140904.1910"; + version = "20140904.1710"; src = fetchFromGitHub { owner = "skangas"; repo = "mentor"; @@ -38530,7 +38785,7 @@ }) {}; menu-bar-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "menu-bar-plus"; - version = "20160512.1914"; + version = "20160512.1714"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/menu-bar+.el"; sha256 = "0v3n0227fmdk6hshnc1x1sxqci0pi3954nqy5ym4k9bmvw3cyxlg"; @@ -38549,12 +38804,12 @@ merlin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "merlin"; - version = "20160229.828"; + version = "20160627.1923"; src = fetchFromGitHub { owner = "the-lambda-church"; repo = "merlin"; - rev = "343dce57e7824b8fb213eba08ee9142ad635ddad"; - sha256 = "0vk1b9gjhjq47jhjhwh6h2x2cl2w7pz4018s6c444paw46gmgkln"; + rev = "b2926cf6235827c0242797775188b8f0420386c5"; + sha256 = "0xfmvicagqccscxf45n04c25c7fqsnfk8mp8s90rnzlyr66gdck1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1b9bfd3164e62758dc0a3362d85c6627ed7cbf8/recipes/merlin"; @@ -38569,7 +38824,7 @@ }) {}; message-x = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "message-x"; - version = "20151029.918"; + version = "20151029.718"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/message-x.el"; sha256 = "05ic97plsysh4nqwdrsl5m9f24m11w24bahj8bxzfdawfima2bkf"; @@ -38588,7 +38843,7 @@ meta-presenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "meta-presenter"; - version = "20150501.610"; + version = "20150501.410"; src = fetchFromGitHub { owner = "myTerminal"; repo = "meta-presenter"; @@ -38609,7 +38864,7 @@ metafmt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "metafmt"; - version = "20160221.1055"; + version = "20160221.855"; src = fetchFromGitHub { owner = "lvillani"; repo = "metafmt"; @@ -38627,10 +38882,31 @@ license = lib.licenses.free; }; }) {}; + metalheart-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "metalheart-theme"; + version = "20160709.2341"; + src = fetchFromGitHub { + owner = "mswift42"; + repo = "MetalHeart-Emacs"; + rev = "ec98ea2c11dc1213dae8cbe1fe0cee73ca138bb2"; + sha256 = "0pc86qh74i6vr0ap2j2sn4nl2c0vv15m4m1myyjmggfxx2f27nnc"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/204dd67b24bf4f2305a14efb925c8fe004026694/recipes/metalheart-theme"; + sha256 = "1xqql1mcwp52plm1gp6q4m9zij2w360y15lnjsz9xgjqvslr7gy5"; + name = "metalheart-theme"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/metalheart-theme"; + license = lib.licenses.free; + }; + }) {}; metascript-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "metascript-mode"; - version = "20150708.1957"; + version = "20150708.1757"; src = fetchFromGitHub { owner = "metascript"; repo = "metascript-mode"; @@ -38651,7 +38927,7 @@ metaweblog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }: melpaBuild { pname = "metaweblog"; - version = "20141130.805"; + version = "20141130.605"; src = fetchFromGitHub { owner = "punchagan"; repo = "metaweblog"; @@ -38672,7 +38948,7 @@ mew = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mew"; - version = "20150814.154"; + version = "20150813.2354"; src = fetchFromGitHub { owner = "kazu-yamamoto"; repo = "Mew"; @@ -38693,7 +38969,7 @@ mexican-holidays = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mexican-holidays"; - version = "20160109.1542"; + version = "20160109.1342"; src = fetchFromGitHub { owner = "shopClerk"; repo = "mexican-holidays"; @@ -38714,7 +38990,7 @@ mhc = callPackage ({ calfw, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mhc"; - version = "20160526.218"; + version = "20160526.18"; src = fetchFromGitHub { owner = "yoshinari-nomura"; repo = "mhc"; @@ -38735,7 +39011,7 @@ mic-paren = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mic-paren"; - version = "20150110.2016"; + version = "20150110.1816"; src = fetchFromGitHub { owner = "emacsmirror"; repo = "mic-paren"; @@ -38756,7 +39032,7 @@ micgoline = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }: melpaBuild { pname = "micgoline"; - version = "20160414.2226"; + version = "20160414.2026"; src = fetchFromGitHub { owner = "yzprofile"; repo = "micgoline"; @@ -38777,7 +39053,7 @@ midje-mode = callPackage ({ cider, clojure-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "midje-mode"; - version = "20150921.1950"; + version = "20150921.1750"; src = fetchFromGitHub { owner = "dnaumov"; repo = "midje-mode"; @@ -38798,7 +39074,7 @@ migemo = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "migemo"; - version = "20150412.941"; + version = "20150412.741"; src = fetchFromGitHub { owner = "emacs-jp"; repo = "migemo"; @@ -38819,7 +39095,7 @@ milkode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "milkode"; - version = "20140927.29"; + version = "20140926.2229"; src = fetchFromGitHub { owner = "ongaeshi"; repo = "emacs-milkode"; @@ -38840,7 +39116,7 @@ minesweeper = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "minesweeper"; - version = "20150414.22"; + version = "20150413.2222"; src = fetchhg { url = "https://bitbucket.com/zck/minesweeper.el"; rev = "d29af12fc611"; @@ -38860,7 +39136,7 @@ mingus = callPackage ({ fetchFromGitHub, fetchurl, lib, libmpdee, melpaBuild }: melpaBuild { pname = "mingus"; - version = "20160321.1117"; + version = "20160321.917"; src = fetchFromGitHub { owner = "pft"; repo = "mingus"; @@ -38881,7 +39157,7 @@ mini-header-line = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mini-header-line"; - version = "20160616.527"; + version = "20160616.327"; src = fetchFromGitHub { owner = "ksjogo"; repo = "mini-header-line"; @@ -38902,7 +39178,7 @@ minibuf-isearch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "minibuf-isearch"; - version = "20151226.1343"; + version = "20151226.1143"; src = fetchFromGitHub { owner = "knagano"; repo = "minibuf-isearch"; @@ -38923,7 +39199,7 @@ minibuffer-complete-cycle = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "minibuffer-complete-cycle"; - version = "20130813.1145"; + version = "20130813.945"; src = fetchFromGitHub { owner = "knu"; repo = "minibuffer-complete-cycle"; @@ -38944,7 +39220,7 @@ minibuffer-cua = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "minibuffer-cua"; - version = "20130906.634"; + version = "20130906.434"; src = fetchFromGitHub { owner = "knu"; repo = "minibuffer-cua.el"; @@ -38965,7 +39241,7 @@ miniedit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "miniedit"; - version = "20100419.1245"; + version = "20100419.1045"; src = fetchFromGitHub { owner = "emacsorphanage"; repo = "miniedit"; @@ -38986,7 +39262,7 @@ minimal-session-saver = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "minimal-session-saver"; - version = "20140508.1541"; + version = "20140508.1341"; src = fetchFromGitHub { owner = "rolandwalker"; repo = "minimal-session-saver"; @@ -39007,7 +39283,7 @@ minimal-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "minimal-theme"; - version = "20160608.522"; + version = "20160608.322"; src = fetchFromGitHub { owner = "ikame"; repo = "minimal-theme"; @@ -39028,7 +39304,7 @@ minitest = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "minitest"; - version = "20160628.1320"; + version = "20160628.1120"; src = fetchFromGitHub { owner = "arthurnn"; repo = "minitest-emacs"; @@ -39049,7 +39325,7 @@ minizinc-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "minizinc-mode"; - version = "20151214.758"; + version = "20151214.558"; src = fetchFromGitHub { owner = "m00nlight"; repo = "minizinc-mode"; @@ -39069,7 +39345,7 @@ }) {}; minor-mode-hack = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "minor-mode-hack"; - version = "20141226.1420"; + version = "20141226.1220"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/minor-mode-hack.el"; sha256 = "0vwvvhzqiad82qvfwygb2arq1mdvh1lj6q2as0a92fg1vc95qcb0"; @@ -39088,7 +39364,7 @@ mip-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mip-mode"; - version = "20151127.17"; + version = "20151126.2217"; src = fetchFromGitHub { owner = "gaudecker"; repo = "mip-mode"; @@ -39108,10 +39384,10 @@ }) {}; misc-cmds = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "misc-cmds"; - version = "20151231.1623"; + version = "20160719.1606"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/misc-cmds.el"; - sha256 = "0sc4l0prwmakxmdq22xd5mj8ddwhzrs034zmx2swi2k3s07x15id"; + sha256 = "195dqyjgxv51lj1779w98l7p8qhr8aa87w0k4dqawzfap2mms85h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/misc-cmds"; @@ -39126,7 +39402,7 @@ }) {}; misc-fns = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "misc-fns"; - version = "20160529.1652"; + version = "20160529.1452"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/misc-fns.el"; sha256 = "1549qcz5c4l6zjl09j1573i00qdgdl41nvnl5hhqg39gi4nz4c9b"; @@ -39145,7 +39421,7 @@ mkdown = callPackage ({ fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }: melpaBuild { pname = "mkdown"; - version = "20140517.918"; + version = "20140517.718"; src = fetchFromGitHub { owner = "ajtulloch"; repo = "mkdown.el"; @@ -39166,7 +39442,7 @@ mmm-jinja2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode }: melpaBuild { pname = "mmm-jinja2"; - version = "20150904.1334"; + version = "20150904.1134"; src = fetchFromGitHub { owner = "beardedprojamz"; repo = "mmm-jinja2"; @@ -39187,7 +39463,7 @@ mmm-mako = callPackage ({ fetchhg, fetchurl, lib, melpaBuild, mmm-mode }: melpaBuild { pname = "mmm-mako"; - version = "20121020.151"; + version = "20121019.2351"; src = fetchhg { url = "https://bitbucket.com/pjenvey/mmm-mako"; rev = "5c9ff92137b5"; @@ -39207,7 +39483,7 @@ mmm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mmm-mode"; - version = "20150828.1916"; + version = "20150828.1716"; src = fetchFromGitHub { owner = "purcell"; repo = "mmm-mode"; @@ -39228,7 +39504,7 @@ mmt = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mmt"; - version = "20150906.1159"; + version = "20150906.959"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "mmt"; @@ -39249,7 +39525,7 @@ mo-git-blame = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mo-git-blame"; - version = "20160129.1159"; + version = "20160129.959"; src = fetchFromGitHub { owner = "mbunkus"; repo = "mo-git-blame"; @@ -39270,7 +39546,7 @@ mo-vi-ment-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mo-vi-ment-mode"; - version = "20131029.133"; + version = "20131028.2333"; src = fetchFromGitHub { owner = "AjayMT"; repo = "mo-vi-ment"; @@ -39291,7 +39567,7 @@ mobdebug-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lua-mode, melpaBuild }: melpaBuild { pname = "mobdebug-mode"; - version = "20140109.2146"; + version = "20140109.1946"; src = fetchFromGitHub { owner = "deftsp"; repo = "mobdebug-mode"; @@ -39312,12 +39588,12 @@ mocha = callPackage ({ f, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: melpaBuild { pname = "mocha"; - version = "20160524.923"; + version = "20160524.723"; src = fetchFromGitHub { owner = "scottaj"; repo = "mocha.el"; - rev = "1f1828e834ac24201823db108ecb02f27a28d4de"; - sha256 = "12i4na064z9cxhxgs9mh056j5r1rxpmmis9jfllcpsx4nhs9i9hp"; + rev = "f9e27d8c3f22571da2249352c88720e6e50d7d45"; + sha256 = "0wchypjjmsyb8wsnfh49nw93af5y4fa2r4ksxmfxc53d04sgzya9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/39c26134ba95f277a4e9400e506433d96a695aa4/recipes/mocha"; @@ -39333,7 +39609,7 @@ mocha-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "mocha-snippets"; - version = "20160211.1032"; + version = "20160211.832"; src = fetchFromGitHub { owner = "cowboyd"; repo = "mocha-snippets.el"; @@ -39354,7 +39630,7 @@ mocker = callPackage ({ eieio ? null, el-x, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mocker"; - version = "20150916.2054"; + version = "20150916.1854"; src = fetchFromGitHub { owner = "sigma"; repo = "mocker.el"; @@ -39375,7 +39651,7 @@ modalka = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "modalka"; - version = "20160531.1112"; + version = "20160531.912"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "modalka"; @@ -39396,7 +39672,7 @@ mode-icons = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mode-icons"; - version = "20160531.1908"; + version = "20160531.1708"; src = fetchFromGitHub { owner = "ryuslash"; repo = "mode-icons"; @@ -39417,7 +39693,7 @@ mode-line-debug = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mode-line-debug"; - version = "20150307.712"; + version = "20150307.512"; src = fetchFromGitHub { owner = "tarsius"; repo = "mode-line-debug"; @@ -39437,7 +39713,7 @@ }) {}; modeline-char = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "modeline-char"; - version = "20160523.1720"; + version = "20160523.1520"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/modeline-char.el"; sha256 = "0qikw44mj209xycchxqifbn9vwyd4zd2d25w8m134cnkhbbjmf5q"; @@ -39455,7 +39731,7 @@ }) {}; modeline-posn = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "modeline-posn"; - version = "20160112.849"; + version = "20160112.649"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/modeline-posn.el"; sha256 = "1r4zq355h570hk7qq0ik121bwsr4hjnhacal4d4h119d11gq2p8d"; @@ -39474,7 +39750,7 @@ modern-cpp-font-lock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "modern-cpp-font-lock"; - version = "20160622.1521"; + version = "20160622.1321"; src = fetchFromGitHub { owner = "ludwigpacifici"; repo = "modern-cpp-font-lock"; @@ -39495,7 +39771,7 @@ modtime-skip-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "modtime-skip-mode"; - version = "20140128.1601"; + version = "20140128.1401"; src = fetchFromGitHub { owner = "jordonbiondo"; repo = "modtime-skip-mode"; @@ -39516,12 +39792,12 @@ moe-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "moe-theme"; - version = "20160607.36"; + version = "20160713.1146"; src = fetchFromGitHub { owner = "kuanyui"; repo = "moe-theme.el"; - rev = "36445fafc1dc1fb30d30eacf11329019f29e7199"; - sha256 = "1pbvi7g2f196w9cmzr389k1zs8s2wzxqskdjxilfpzilrzcb7zyb"; + rev = "8545478b57f356d87d49c462091e39414b50b258"; + sha256 = "0bij509xypqihlqp8ydymg7i61q9hj46ah1qqaa613d3x29vc2n6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4efefd7edacf90620436ad4ef9ceb470618a8018/recipes/moe-theme"; @@ -39537,7 +39813,7 @@ molokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "molokai-theme"; - version = "20151016.1045"; + version = "20151016.845"; src = fetchFromGitHub { owner = "alloy-d"; repo = "color-theme-molokai"; @@ -39558,7 +39834,7 @@ mongo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mongo"; - version = "20150315.719"; + version = "20150315.519"; src = fetchFromGitHub { owner = "m2ym"; repo = "mongo-el"; @@ -39579,7 +39855,7 @@ monky = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monky"; - version = "20160315.2251"; + version = "20160315.2051"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "monky"; @@ -39600,7 +39876,7 @@ monochrome-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monochrome-theme"; - version = "20140326.550"; + version = "20140326.350"; src = fetchFromGitHub { owner = "fxn"; repo = "monochrome-theme.el"; @@ -39621,12 +39897,12 @@ monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monokai-theme"; - version = "20160628.551"; + version = "20160706.1552"; src = fetchFromGitHub { owner = "oneKelvinSmith"; repo = "monokai-emacs"; - rev = "01d08b19b33daec2e3e2e754a41cf0a9bdeb1e80"; - sha256 = "0sab40mwrad7cjaa6cr8j3x3kln4zbgdcnn0w064bvvvi6x086h4"; + rev = "02c5f5d5a5d3ee93a1daa16117471197817f3bc8"; + sha256 = "0w18lwp3vn1f9rq9l8s434l2f16rgrp9i1x0c2vbzd5c9xzaq2fi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme"; @@ -39642,7 +39918,7 @@ monroe = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monroe"; - version = "20160615.805"; + version = "20160615.605"; src = fetchFromGitHub { owner = "sanel"; repo = "monroe"; @@ -39663,7 +39939,7 @@ moonscript = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "moonscript"; - version = "20160503.831"; + version = "20160503.631"; src = fetchFromGitHub { owner = "k2052"; repo = "moonscript-mode"; @@ -39684,7 +39960,7 @@ morlock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "morlock"; - version = "20160521.930"; + version = "20160521.730"; src = fetchFromGitHub { owner = "tarsius"; repo = "morlock"; @@ -39705,7 +39981,7 @@ mote-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, ruby-mode ? null }: melpaBuild { pname = "mote-mode"; - version = "20160122.1829"; + version = "20160122.1629"; src = fetchFromGitHub { owner = "inkel"; repo = "mote-mode"; @@ -39726,7 +40002,7 @@ motion-mode = callPackage ({ fetchFromGitHub, fetchurl, flymake-cursor, flymake-easy, lib, melpaBuild }: melpaBuild { pname = "motion-mode"; - version = "20140919.2056"; + version = "20140919.1856"; src = fetchFromGitHub { owner = "ainame"; repo = "motion-mode"; @@ -39746,7 +40022,7 @@ }) {}; mouse-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "mouse-plus"; - version = "20151231.1725"; + version = "20151231.1525"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/mouse+.el"; sha256 = "0rakxcpqdx175hic3ykwbd5if53dvvf0sxhq0gplpsybpqvkimyv"; @@ -39765,7 +40041,7 @@ mouse-slider-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mouse-slider-mode"; - version = "20150910.1600"; + version = "20150910.1400"; src = fetchFromGitHub { owner = "skeeto"; repo = "mouse-slider-mode"; @@ -39785,7 +40061,7 @@ }) {}; mouse3 = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "mouse3"; - version = "20151231.1726"; + version = "20151231.1526"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/mouse3.el"; sha256 = "1831jpi06hi5v2jdjgs83jma7fp8xiqdmvvwxfyp2zpbfwi1lkb6"; @@ -39804,7 +40080,7 @@ move-dup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "move-dup"; - version = "20140925.1008"; + version = "20140925.808"; src = fetchFromGitHub { owner = "wyuenho"; repo = "move-dup"; @@ -39825,7 +40101,7 @@ move-text = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "move-text"; - version = "20160430.1930"; + version = "20160430.1730"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "move-text"; @@ -39846,7 +40122,7 @@ mowedline = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mowedline"; - version = "20150601.1209"; + version = "20150601.1009"; src = fetchFromGitHub { owner = "retroj"; repo = "mowedline"; @@ -39867,7 +40143,7 @@ moz = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "moz"; - version = "20150805.1206"; + version = "20150805.1006"; src = fetchFromGitHub { owner = "bard"; repo = "mozrepl"; @@ -39888,7 +40164,7 @@ moz-controller = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, moz }: melpaBuild { pname = "moz-controller"; - version = "20151208.2006"; + version = "20151208.1806"; src = fetchFromGitHub { owner = "RenWenshan"; repo = "emacs-moz-controller"; @@ -39909,12 +40185,12 @@ mozc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mozc"; - version = "20160102.1706"; + version = "20160102.1506"; src = fetchFromGitHub { owner = "google"; repo = "mozc"; - rev = "0ccaad35074f21caeb3732348b71b60af6b2a461"; - sha256 = "1l1qds7mzn7cx0ijdwcdihqbmidwh16a96v4la9ris07k5fxqiph"; + rev = "73a8154b79b0b8db6cf8e11d6f1e750709c17518"; + sha256 = "1vn4i0cj60izng4zvpjgbdrlv3v6wilpkzxvb9mz5a8adf3myv5h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30fef77e1d7194ee3c3c1d4775c349a4a9f6af2c/recipes/mozc"; @@ -39930,7 +40206,7 @@ mozc-im = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mozc }: melpaBuild { pname = "mozc-im"; - version = "20160411.1922"; + version = "20160411.1722"; src = fetchFromGitHub { owner = "d5884"; repo = "mozc-im"; @@ -39951,7 +40227,7 @@ mozc-popup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mozc, popup }: melpaBuild { pname = "mozc-popup"; - version = "20150223.1834"; + version = "20150223.1634"; src = fetchFromGitHub { owner = "d5884"; repo = "mozc-popup"; @@ -39972,7 +40248,7 @@ mozc-temp = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, mozc }: melpaBuild { pname = "mozc-temp"; - version = "20160228.240"; + version = "20160228.40"; src = fetchFromGitHub { owner = "HKey"; repo = "mozc-temp"; @@ -39993,7 +40269,7 @@ mpages = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mpages"; - version = "20150710.904"; + version = "20150710.704"; src = fetchFromGitHub { owner = "slevin"; repo = "mpages"; @@ -40014,7 +40290,7 @@ mpg123 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mpg123"; - version = "20151214.1350"; + version = "20151214.1150"; src = fetchFromGitHub { owner = "emacsmirror"; repo = "mpg123"; @@ -40035,7 +40311,7 @@ mpv = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, names, org }: melpaBuild { pname = "mpv"; - version = "20150218.318"; + version = "20150218.118"; src = fetchFromGitHub { owner = "kljohann"; repo = "mpv.el"; @@ -40056,7 +40332,7 @@ msvc = callPackage ({ ac-clang, cedet ? null, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "msvc"; - version = "20150530.351"; + version = "20150530.151"; src = fetchFromGitHub { owner = "yaruopooner"; repo = "msvc"; @@ -40077,7 +40353,7 @@ mu-cite = callPackage ({ fetchFromGitHub, fetchurl, flim, lib, melpaBuild }: melpaBuild { pname = "mu-cite"; - version = "20160130.500"; + version = "20160130.300"; src = fetchFromGitHub { owner = "ksato9700"; repo = "mu-cite"; @@ -40098,12 +40374,12 @@ mu4e-alert = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }: melpaBuild { pname = "mu4e-alert"; - version = "20160601.13"; + version = "20160725.1102"; src = fetchFromGitHub { owner = "iqbalansari"; repo = "mu4e-alert"; - rev = "c03577d95b3b5e9e5db113d7ee38838c54472c83"; - sha256 = "0ndxf39w1ndqys455ydhy1f1d12pfza62wrqja8xxh5s7s2x67h9"; + rev = "3af4808b2c8bfac7882a727f32d0fc4bc20cb821"; + sha256 = "198mgzcdpiyk2vid9rhdgy9109za7nnhp0mr51adpb74vdd37v3i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5a48e8cb571e91b582ff0dea18e8dc75601edc35/recipes/mu4e-alert"; @@ -40119,7 +40395,7 @@ mu4e-maildirs-extension = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mu4e-maildirs-extension"; - version = "20160604.443"; + version = "20160604.243"; src = fetchFromGitHub { owner = "agpchil"; repo = "mu4e-maildirs-extension"; @@ -40140,7 +40416,7 @@ multi = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "multi"; - version = "20131013.1044"; + version = "20131013.844"; src = fetchFromGitHub { owner = "kurisuwhyte"; repo = "emacs-multi"; @@ -40161,7 +40437,7 @@ multi-compile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "multi-compile"; - version = "20160306.1623"; + version = "20160306.1423"; src = fetchFromGitHub { owner = "ReanGD"; repo = "emacs-multi-compile"; @@ -40181,7 +40457,7 @@ }) {}; multi-eshell = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "multi-eshell"; - version = "20120608.1335"; + version = "20120608.1135"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/multi-eshell.el"; sha256 = "1w1jwfznpl214a1xx46zlgqbx9c5yjzpyqqrkn3xqjgnj485yhkl"; @@ -40200,7 +40476,7 @@ multi-line = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "multi-line"; - version = "20160601.1645"; + version = "20160601.1445"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "multi-line"; @@ -40221,7 +40497,7 @@ multi-project = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "multi-project"; - version = "20150314.944"; + version = "20150314.744"; src = fetchhg { url = "https://bitbucket.com/ellisvelo/multi-project"; rev = "f7fd0ae6819e"; @@ -40240,7 +40516,7 @@ }) {}; multi-term = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "multi-term"; - version = "20160619.433"; + version = "20160619.233"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/multi-term.el"; sha256 = "0i7gixcyqhd8ajbslfmb58rvdihzfprydwiqr730q9q0yfja36j8"; @@ -40259,7 +40535,7 @@ multi-web-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "multi-web-mode"; - version = "20130823.2254"; + version = "20130823.2054"; src = fetchFromGitHub { owner = "fgallina"; repo = "multi-web-mode"; @@ -40280,7 +40556,7 @@ multicolumn = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "multicolumn"; - version = "20150202.1651"; + version = "20150202.1451"; src = fetchFromGitHub { owner = "Lindydancer"; repo = "multicolumn"; @@ -40301,7 +40577,7 @@ multifiles = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "multifiles"; - version = "20130615.1633"; + version = "20130615.1433"; src = fetchFromGitHub { owner = "magnars"; repo = "multifiles.el"; @@ -40322,12 +40598,12 @@ multiple-cursors = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "multiple-cursors"; - version = "20160616.1604"; + version = "20160719.216"; src = fetchFromGitHub { owner = "magnars"; repo = "multiple-cursors.el"; - rev = "8413969a97343d1270a3c70252e4ca2eb4e79c36"; - sha256 = "12afr46f4kqfpal2xdnydwwilzhk1503sgkvbbff9qnkg9h64bnh"; + rev = "95f2e41fabdeb464efb11d32df30a4a1d532625a"; + sha256 = "1pinw3n4pfkkwi99jgb57qzqdbkmr7l5zd4qr4jwanl1xbknz5pf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5f015e6b88be2a5ded363bd882a558e94d1f391/recipes/multiple-cursors"; @@ -40343,7 +40619,7 @@ mustache = callPackage ({ dash, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }: melpaBuild { pname = "mustache"; - version = "20131117.1607"; + version = "20131117.1407"; src = fetchFromGitHub { owner = "Wilfred"; repo = "mustache.el"; @@ -40364,7 +40640,7 @@ mustache-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mustache-mode"; - version = "20141024.932"; + version = "20141024.732"; src = fetchFromGitHub { owner = "mustache"; repo = "emacs"; @@ -40385,7 +40661,7 @@ mustang-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mustang-theme"; - version = "20141017.1823"; + version = "20141017.1623"; src = fetchFromGitHub { owner = "mswift42"; repo = "mustang-theme"; @@ -40406,7 +40682,7 @@ mustard-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mustard-theme"; - version = "20141116.102"; + version = "20141115.2302"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-mustard-theme"; @@ -40427,7 +40703,7 @@ mutant = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mutant"; - version = "20160124.753"; + version = "20160124.553"; src = fetchFromGitHub { owner = "p-lambert"; repo = "mutant.el"; @@ -40447,7 +40723,7 @@ }) {}; muttrc-mode = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "muttrc-mode"; - version = "20090804.1752"; + version = "20090804.1552"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/muttrc-mode.el"; sha256 = "1xihp3zdqs9054j3bfrd9wnahsvvxjk1ags1iy50ncv5850ppjis"; @@ -40466,7 +40742,7 @@ mvn = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mvn"; - version = "20160211.943"; + version = "20160211.743"; src = fetchFromGitHub { owner = "apg"; repo = "mvn-el"; @@ -40487,7 +40763,7 @@ mwe-log-commands = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mwe-log-commands"; - version = "20100703.741"; + version = "20100703.541"; src = fetchFromGitHub { owner = "emacsmirror"; repo = "mwe-log-commands"; @@ -40508,12 +40784,12 @@ mwim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mwim"; - version = "20150822.1436"; + version = "20160720.1210"; src = fetchFromGitHub { owner = "alezost"; repo = "mwim.el"; - rev = "dc1b5c358e0bfe607527f1b7c082188105fe6c75"; - sha256 = "0hvq6z754niqjyv79jzb833wrwbspc7npfg85scwdv8vzwassjx4"; + rev = "d7885c32ad54f5b5698b48abea392a8eae2567a8"; + sha256 = "1kssmryl44m4cq05ff98blwdvqafb9x7v3bvb1z70rrvdvw3l024"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b7e1aa2fa1294b27ed7b6c5bdd5844fa5c37df72/recipes/mwim"; @@ -40529,7 +40805,7 @@ myanmar-input-methods = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "myanmar-input-methods"; - version = "20160106.937"; + version = "20160106.737"; src = fetchFromGitHub { owner = "yelinkyaw"; repo = "emacs-myanmar-input-methods"; @@ -40550,7 +40826,7 @@ mykie = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mykie"; - version = "20150808.1705"; + version = "20150808.1505"; src = fetchFromGitHub { owner = "yuutayamada"; repo = "mykie-el"; @@ -40571,7 +40847,7 @@ mynt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, virtualenvwrapper }: melpaBuild { pname = "mynt-mode"; - version = "20150512.1549"; + version = "20150512.1349"; src = fetchFromGitHub { owner = "crshd"; repo = "mynt-mode"; @@ -40592,7 +40868,7 @@ mysql2sqlite = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mysql2sqlite"; - version = "20151123.1539"; + version = "20151123.1339"; src = fetchFromGitHub { owner = "echosa"; repo = "emacs-mysql2sqlite"; @@ -40613,7 +40889,7 @@ myterminal-controls = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "myterminal-controls"; - version = "20160119.2230"; + version = "20160119.2030"; src = fetchFromGitHub { owner = "myTerminal"; repo = "myterminal-controls"; @@ -40634,7 +40910,7 @@ n3-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "n3-mode"; - version = "20141027.1257"; + version = "20141027.1057"; src = fetchFromGitHub { owner = "doriantaylor"; repo = "n3-mode-for-emacs"; @@ -40655,7 +40931,7 @@ n4js = callPackage ({ cypher-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "n4js"; - version = "20150713.2131"; + version = "20150713.1931"; src = fetchFromGitHub { owner = "tmtxt"; repo = "n4js.el"; @@ -40675,7 +40951,7 @@ }) {}; naked = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "naked"; - version = "20151231.1727"; + version = "20151231.1527"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/naked.el"; sha256 = "0zq13qjqfpxjba1bhdqqxkvgxq1dxyb7hd1bpnk6cbhsxr6mr50i"; @@ -40694,7 +40970,7 @@ name-this-color = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "name-this-color"; - version = "20151014.1530"; + version = "20151014.1330"; src = fetchFromGitHub { owner = "knl"; repo = "name-this-color.el"; @@ -40715,7 +40991,7 @@ nameframe = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nameframe"; - version = "20151017.2319"; + version = "20151017.2119"; src = fetchFromGitHub { owner = "john2x"; repo = "nameframe"; @@ -40736,7 +41012,7 @@ nameframe-perspective = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, nameframe, perspective }: melpaBuild { pname = "nameframe-perspective"; - version = "20151018.407"; + version = "20151018.207"; src = fetchFromGitHub { owner = "john2x"; repo = "nameframe"; @@ -40757,7 +41033,7 @@ nameframe-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, nameframe, projectile }: melpaBuild { pname = "nameframe-projectile"; - version = "20151018.407"; + version = "20151018.207"; src = fetchFromGitHub { owner = "john2x"; repo = "nameframe"; @@ -40778,7 +41054,7 @@ nameless = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nameless"; - version = "20160403.1313"; + version = "20160403.1113"; src = fetchFromGitHub { owner = "Malabarba"; repo = "Nameless"; @@ -40799,7 +41075,7 @@ names = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "names"; - version = "20151201.604"; + version = "20151201.404"; src = fetchFromGitHub { owner = "Malabarba"; repo = "names"; @@ -40820,7 +41096,7 @@ namespaces = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "namespaces"; - version = "20130326.1750"; + version = "20130326.1550"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "elisp-namespaces"; @@ -40841,7 +41117,7 @@ nand2tetris = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, names }: melpaBuild { pname = "nand2tetris"; - version = "20151027.1651"; + version = "20151027.1451"; src = fetchFromGitHub { owner = "CestDiego"; repo = "nand2tetris.el"; @@ -40862,7 +41138,7 @@ nand2tetris-assembler = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, names, nand2tetris }: melpaBuild { pname = "nand2tetris-assembler"; - version = "20151027.1636"; + version = "20151027.1436"; src = fetchFromGitHub { owner = "CestDiego"; repo = "nand2tetris.el"; @@ -40883,7 +41159,7 @@ nanowrimo = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nanowrimo"; - version = "20151104.2028"; + version = "20151104.1828"; src = fetchhg { url = "https://bitbucket.com/gvol/nanowrimo.el"; rev = "25e2ca20ed34"; @@ -40903,7 +41179,7 @@ naquadah-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "naquadah-theme"; - version = "20150923.341"; + version = "20150923.141"; src = fetchFromGitHub { owner = "jd"; repo = "naquadah-theme"; @@ -40923,7 +41199,7 @@ }) {}; narrow-indirect = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "narrow-indirect"; - version = "20151231.1739"; + version = "20151231.1539"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/narrow-indirect.el"; sha256 = "1lyszm94pd3jxs73v7k0aaazm0sd2rpz2pphcdag7lk7k6vppd9n"; @@ -40942,7 +41218,7 @@ narrow-reindent = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "narrow-reindent"; - version = "20150722.1406"; + version = "20150722.1206"; src = fetchFromGitHub { owner = "emallson"; repo = "narrow-reindent.el"; @@ -40963,7 +41239,7 @@ narrowed-page-navigation = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "narrowed-page-navigation"; - version = "20150108.2319"; + version = "20150108.2119"; src = fetchFromGitHub { owner = "david-christiansen"; repo = "narrowed-page-navigation"; @@ -40981,10 +41257,31 @@ license = lib.licenses.free; }; }) {}; + nash-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "nash-mode"; + version = "20160710.1753"; + src = fetchFromGitHub { + owner = "tiago4orion"; + repo = "nash-mode.el"; + rev = "5d83ce21069b10ae7d1fb42607a9667f641b21a4"; + sha256 = "19a79ih0rprbvc9knxplmr8s8c9kpsqyz1s0gvbbs0w23jh92fb6"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c8bd080c81b163a6ddcfffc710316b9711935b4a/recipes/nash-mode"; + sha256 = "1d6nfxn7fc2qv78bf5277sdwfqflag2gihgic8vxrbjlpnizxn1p"; + name = "nash-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/nash-mode"; + license = lib.licenses.free; + }; + }) {}; nasm-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nasm-mode"; - version = "20160525.2026"; + version = "20160525.1826"; src = fetchFromGitHub { owner = "skeeto"; repo = "nasm-mode"; @@ -41005,7 +41302,7 @@ nav = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nav"; - version = "20120507.207"; + version = "20120507.7"; src = fetchFromGitHub { owner = "ijt"; repo = "emacs-nav"; @@ -41026,7 +41323,7 @@ nav-flash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nav-flash"; - version = "20140508.1541"; + version = "20140508.1341"; src = fetchFromGitHub { owner = "rolandwalker"; repo = "nav-flash"; @@ -41047,7 +41344,7 @@ navi-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, outorg, outshine }: melpaBuild { pname = "navi-mode"; - version = "20160327.334"; + version = "20160327.134"; src = fetchFromGitHub { owner = "tj64"; repo = "navi"; @@ -41068,7 +41365,7 @@ navi2ch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "navi2ch"; - version = "20150329.2116"; + version = "20150329.1916"; src = fetchFromGitHub { owner = "naota"; repo = "navi2ch"; @@ -41089,7 +41386,7 @@ navorski = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, multi-term, s }: melpaBuild { pname = "navorski"; - version = "20141203.1224"; + version = "20141203.1024"; src = fetchFromGitHub { owner = "roman"; repo = "navorski.el"; @@ -41110,7 +41407,7 @@ ncl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ncl-mode"; - version = "20150525.1129"; + version = "20150525.929"; src = fetchFromGitHub { owner = "yyr"; repo = "ncl-mode"; @@ -41131,7 +41428,7 @@ nclip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nclip"; - version = "20130617.1515"; + version = "20130617.1315"; src = fetchFromGitHub { owner = "maio"; repo = "nclip.el"; @@ -41152,12 +41449,12 @@ nemerle = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nemerle"; - version = "20130328.946"; + version = "20130328.746"; src = fetchFromGitHub { owner = "rsdn"; repo = "nemerle"; - rev = "a3000868469dacc44893207e8eec3c836e78b9ea"; - sha256 = "0xij6gqa6xmjz041vmi4k1xfp7bsp51vk4x6mdy4rv7556sznrrb"; + rev = "b1ec55459bda21463483d32401803d246abf045b"; + sha256 = "1iv7k127wsrhl9hvanlzmi8ycz3ynwfwxgh5zw9617zhiw8f7004"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8477d0cf950efcfd9a85618a5ca48bff590b22d7/recipes/nemerle"; @@ -41173,12 +41470,12 @@ neotree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "neotree"; - version = "20160701.153"; + version = "20160727.41"; src = fetchFromGitHub { owner = "jaypei"; repo = "emacs-neotree"; - rev = "940681d923b1160714d57b0c3137336b118a7c58"; - sha256 = "1kbkxkxykmyhmz5xw5w18n5ggdbzvazhzs4qrx126xb0c5mr3fdn"; + rev = "ddf21ac355032b40a27b203d6698772144193b67"; + sha256 = "0npawzxx22bi8f8wcg46ggypdm5s88xdzwzfi4ijw4j0qpjrgrrp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9caf2e12762d334563496d2c75fae6c74cfe5c1c/recipes/neotree"; @@ -41194,7 +41491,7 @@ netherlands-holidays = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "netherlands-holidays"; - version = "20150202.1017"; + version = "20150202.817"; src = fetchFromGitHub { owner = "abo-abo"; repo = "netherlands-holidays"; @@ -41215,7 +41512,7 @@ netrunner = callPackage ({ company, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, popup }: melpaBuild { pname = "netrunner"; - version = "20160622.842"; + version = "20160622.642"; src = fetchFromGitHub { owner = "Kungsgeten"; repo = "netrunner"; @@ -41236,7 +41533,7 @@ never-comment = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "never-comment"; - version = "20140104.1607"; + version = "20140104.1407"; src = fetchFromGitHub { owner = "To1ne"; repo = "never-comment"; @@ -41257,7 +41554,7 @@ newlisp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "newlisp-mode"; - version = "20160226.945"; + version = "20160226.745"; src = fetchFromGitHub { owner = "kosh04"; repo = "newlisp-mode"; @@ -41278,7 +41575,7 @@ nexus = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nexus"; - version = "20140114.705"; + version = "20140114.505"; src = fetchFromGitHub { owner = "juergenhoetzel"; repo = "emacs-nexus"; @@ -41299,7 +41596,7 @@ nginx-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nginx-mode"; - version = "20150824.1611"; + version = "20150824.1411"; src = fetchFromGitHub { owner = "ajc"; repo = "nginx-mode"; @@ -41320,7 +41617,7 @@ niceify-info = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "niceify-info"; - version = "20160416.744"; + version = "20160416.544"; src = fetchFromGitHub { owner = "aaron-em"; repo = "niceify-info.el"; @@ -41341,7 +41638,7 @@ niconama = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "niconama"; - version = "20160703.1002"; + version = "20160703.802"; src = fetchFromGitHub { owner = "NOBUTOKA"; repo = "niconama.el"; @@ -41362,7 +41659,7 @@ niflheim-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "niflheim-theme"; - version = "20150630.1021"; + version = "20150630.821"; src = fetchFromGitHub { owner = "niflheim-theme"; repo = "emacs"; @@ -41383,12 +41680,12 @@ nim-mode = callPackage ({ commenter, company, emacs, epc, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }: melpaBuild { pname = "nim-mode"; - version = "20160620.1541"; + version = "20160727.30"; src = fetchFromGitHub { owner = "nim-lang"; repo = "nim-mode"; - rev = "9e4ffffce2208165868341347b3118f4117ba63c"; - sha256 = "06jl8hszkx57h0d9vjx3f69hysh8kc2wjlp7xvfc72384r6riwm9"; + rev = "edf245f6c49072e030f8e8c3ede67859fb8eaf50"; + sha256 = "0hrgr2pijwh1zxg9wv0cwg1hpb5pgs2d7zswbr01fkamfbdajlyc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc2ccb5f24b9d55c77eaa7952a9e6a2e0ed7be24/recipes/nim-mode"; @@ -41404,7 +41701,7 @@ ninja-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ninja-mode"; - version = "20141203.2359"; + version = "20141203.2159"; src = fetchFromGitHub { owner = "martine"; repo = "ninja"; @@ -41425,12 +41722,12 @@ nix-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nix-mode"; - version = "20160502.837"; + version = "20160502.637"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "74dd603495273fe8b81d8635676861792cf420e8"; - sha256 = "12k9wa9d595426h58d2mkczmkv327wymsx9dbfifwbyvllkqiwm6"; + rev = "ee22a91ab847f63a22466f3bf63e33ca29da9cfe"; + sha256 = "0dpmhsxjckz0hsg6dsbmgycv1adi08ymz29x9m2biap73l2zm8yp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode"; @@ -41446,7 +41743,7 @@ nix-sandbox = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "nix-sandbox"; - version = "20160223.753"; + version = "20160223.553"; src = fetchFromGitHub { owner = "travisbhartwell"; repo = "nix-emacs"; @@ -41467,7 +41764,7 @@ nixos-options = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nixos-options"; - version = "20160209.1241"; + version = "20160209.1041"; src = fetchFromGitHub { owner = "travisbhartwell"; repo = "nix-emacs"; @@ -41488,7 +41785,7 @@ nlinum-relative = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, nlinum }: melpaBuild { pname = "nlinum-relative"; - version = "20160526.208"; + version = "20160526.8"; src = fetchFromGitHub { owner = "CodeFalling"; repo = "nlinum-relative"; @@ -41509,7 +41806,7 @@ nm = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, notmuch, peg }: melpaBuild { pname = "nm"; - version = "20151110.1310"; + version = "20151110.1110"; src = fetchFromGitHub { owner = "tjim"; repo = "nevermore"; @@ -41530,7 +41827,7 @@ nnir-est = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nnir-est"; - version = "20140301.802"; + version = "20140301.602"; src = fetchFromGitHub { owner = "kawabata"; repo = "nnir-est"; @@ -41551,7 +41848,7 @@ no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "no-littering"; - version = "20160620.744"; + version = "20160620.544"; src = fetchFromGitHub { owner = "tarsius"; repo = "no-littering"; @@ -41572,7 +41869,7 @@ noccur = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "noccur"; - version = "20150514.1620"; + version = "20150514.1420"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "noccur.el"; @@ -41593,7 +41890,7 @@ noctilux-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "noctilux-theme"; - version = "20150723.947"; + version = "20150723.747"; src = fetchFromGitHub { owner = "sjrmanning"; repo = "noctilux-theme"; @@ -41614,7 +41911,7 @@ node-resolver = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "node-resolver"; - version = "20140930.1223"; + version = "20140930.1023"; src = fetchFromGitHub { owner = "meandavejustice"; repo = "node-resolver.el"; @@ -41635,7 +41932,7 @@ nodejs-repl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nodejs-repl"; - version = "20151229.803"; + version = "20151229.603"; src = fetchFromGitHub { owner = "abicky"; repo = "nodejs-repl.el"; @@ -41656,7 +41953,7 @@ noflet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "noflet"; - version = "20141102.854"; + version = "20141102.654"; src = fetchFromGitHub { owner = "nicferrier"; repo = "emacs-noflet"; @@ -41676,7 +41973,7 @@ }) {}; nose = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nose"; - version = "20140520.1148"; + version = "20140520.948"; src = fetchhg { url = "https://bitbucket.com/durin42/nosemacs"; rev = "194d7789bf79"; @@ -41695,11 +41992,11 @@ }) {}; notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "notmuch"; - version = "20160628.220"; + version = "20160628.20"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "3a45d29ed4d753bcf72f2fa0bb37fefd4d18f96a"; - sha256 = "1mzrhwjhprrcsp7yka3z6scmnnkxqwi2i36dgvl5f76fgka9kllx"; + rev = "92d8eae8f182e4eebc87d76f8d4f37e6c018883a"; + sha256 = "00qf4n7v44rl5ax7bpadqnpprqvilfbm733mya6bd3afribcxdd3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -41715,7 +42012,7 @@ notmuch-labeler = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, notmuch }: melpaBuild { pname = "notmuch-labeler"; - version = "20131230.1119"; + version = "20131230.919"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "notmuch-labeler"; @@ -41735,7 +42032,7 @@ }) {}; novice-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "novice-plus"; - version = "20151231.1740"; + version = "20151231.1540"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/novice+.el"; sha256 = "0mmdf3z9299hbs3wr8hqgpmg74sb2xm0rxyh38sjcqmk8f310rqh"; @@ -41754,12 +42051,12 @@ noxml-fold = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "noxml-fold"; - version = "20151216.1021"; + version = "20160707.847"; src = fetchFromGitHub { owner = "paddymcall"; repo = "noXML-fold"; - rev = "feecc06b1136c1ddbabcdc37287f1ef26f1282fc"; - sha256 = "0jahr1380919p272srym1pp16ifdz69fn1m45ppglm54q4a741d8"; + rev = "4cf3628004ad872fb44943aab5274a45e22ea430"; + sha256 = "0i4fyxkwp2yksz8d4x309q8imab8gz59vcw64k9y1kzylcnxci0i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/13d2af88b292293cb5ab50819c63acfe936630c8/recipes/noxml-fold"; @@ -41772,10 +42069,31 @@ license = lib.licenses.free; }; }) {}; + npm-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "npm-mode"; + version = "20160706.1129"; + src = fetchFromGitHub { + owner = "mojochao"; + repo = "npm-mode"; + rev = "63a5c306f6e8d53f043471eb8ea734f00ca998c4"; + sha256 = "1ph680i24sga02r2w2r2rial4mi0czv0abz2jif3pypzxz3h1f15"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/22dd6b2f8a94f56a61f4b70bd7e44b1bcf96eb18/recipes/npm-mode"; + sha256 = "1aym4jfr6im6hdc5d7995q6myhgig286fk9hpaxdf418h1s17rqr"; + name = "npm-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/npm-mode"; + license = lib.licenses.free; + }; + }) {}; nrepl-eval-sexp-fu = callPackage ({ fetchFromGitHub, fetchurl, highlight, lib, melpaBuild, smartparens, thingatpt ? null }: melpaBuild { pname = "nrepl-eval-sexp-fu"; - version = "20140311.541"; + version = "20140311.341"; src = fetchFromGitHub { owner = "samaaron"; repo = "nrepl-eval-sexp-fu"; @@ -41796,7 +42114,7 @@ nrepl-sync = callPackage ({ cider, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nrepl-sync"; - version = "20140807.1054"; + version = "20140807.854"; src = fetchFromGitHub { owner = "phillord"; repo = "lein-sync"; @@ -41817,7 +42135,7 @@ nsis-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nsis-mode"; - version = "20150914.746"; + version = "20150914.546"; src = fetchFromGitHub { owner = "mattfidler"; repo = "nsis-mode"; @@ -41838,7 +42156,7 @@ nu-mode = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, transpose-frame, undo-tree }: melpaBuild { pname = "nu-mode"; - version = "20160520.814"; + version = "20160520.614"; src = fetchFromGitHub { owner = "pyluyten"; repo = "emacs-nu"; @@ -41859,7 +42177,7 @@ number = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "number"; - version = "20141127.1204"; + version = "20141127.1004"; src = fetchFromGitHub { owner = "chrisdone"; repo = "number"; @@ -41880,7 +42198,7 @@ nummm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nummm-mode"; - version = "20131117.414"; + version = "20131117.214"; src = fetchFromGitHub { owner = "agpchil"; repo = "nummm-mode"; @@ -41901,7 +42219,7 @@ nvm = callPackage ({ dash, dash-functional, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "nvm"; - version = "20151113.255"; + version = "20151113.55"; src = fetchFromGitHub { owner = "rejeep"; repo = "nvm.el"; @@ -41922,7 +42240,7 @@ nyan-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nyan-mode"; - version = "20160429.1523"; + version = "20160429.1323"; src = fetchFromGitHub { owner = "TeMPOraL"; repo = "nyan-mode"; @@ -41943,7 +42261,7 @@ nyan-prompt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nyan-prompt"; - version = "20140810.8"; + version = "20140809.2208"; src = fetchFromGitHub { owner = "PuercoPop"; repo = "nyan-prompt"; @@ -41964,7 +42282,7 @@ o-blog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "o-blog"; - version = "20151202.1739"; + version = "20151202.1539"; src = fetchFromGitHub { owner = "renard"; repo = "o-blog"; @@ -41985,7 +42303,7 @@ oauth = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "oauth"; - version = "20130127.1951"; + version = "20130127.1751"; src = fetchFromGitHub { owner = "psanford"; repo = "emacs-oauth"; @@ -42006,7 +42324,7 @@ ob-axiom = callPackage ({ axiom-environment, emacs, fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ob-axiom"; - version = "20160310.1553"; + version = "20160310.1353"; src = fetchhg { url = "https://bitbucket.com/pdo/axiom-environment"; rev = "bc294e47f51c"; @@ -42026,7 +42344,7 @@ ob-browser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ob-browser"; - version = "20150101.910"; + version = "20150101.710"; src = fetchFromGitHub { owner = "krisajenkins"; repo = "ob-browser"; @@ -42047,7 +42365,7 @@ ob-coffee = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ob-coffee"; - version = "20160415.2236"; + version = "20160415.2036"; src = fetchFromGitHub { owner = "zweifisch"; repo = "ob-coffee"; @@ -42068,7 +42386,7 @@ ob-cypher = callPackage ({ cypher-mode, dash, dash-functional, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ob-cypher"; - version = "20150224.2037"; + version = "20150224.1837"; src = fetchFromGitHub { owner = "zweifisch"; repo = "ob-cypher"; @@ -42089,7 +42407,7 @@ ob-diagrams = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ob-diagrams"; - version = "20160407.737"; + version = "20160407.537"; src = fetchFromGitHub { owner = "bergey"; repo = "org-babel-diagrams"; @@ -42110,7 +42428,7 @@ ob-elixir = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ob-elixir"; - version = "20151021.647"; + version = "20151021.447"; src = fetchFromGitHub { owner = "zweifisch"; repo = "ob-elixir"; @@ -42131,12 +42449,12 @@ ob-go = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ob-go"; - version = "20160318.1452"; + version = "20160711.1606"; src = fetchFromGitHub { owner = "pope"; repo = "ob-go"; - rev = "b1f32f888cda6c7e9601ff74d08e653a1c03868c"; - sha256 = "1pa7zclci87rd4fx731z37pdbdjabmknbr0xmdk1g92g0hjhk2rb"; + rev = "8240e61e859323e097694af22bada2983a5f2727"; + sha256 = "10yngyyrv1q1arwdlj7wvjl2487vsx5hpqsji8wjs72yl0qd86rr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3afb687d6d3d1e52336ca9a7343278a9f37c3d54/recipes/ob-go"; @@ -42152,12 +42470,12 @@ ob-http = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ob-http"; - version = "20160415.2332"; + version = "20160709.224"; src = fetchFromGitHub { owner = "zweifisch"; repo = "ob-http"; - rev = "358dded7372a250b316b5e4690933231dc0fcde2"; - sha256 = "00mnpnlsd774z87ziqmaq9h4rbxmf197cm2kk4v6s15rs3np617m"; + rev = "47a7b367314f6051715882e46a0e40477bda20a2"; + sha256 = "1y5izm9yxa556536mnpc8dp0nzm8wzr778qycpk4l9xfyp4xybaw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/950b02f76a04f453992b8720032e8c4cec9a039a/recipes/ob-http"; @@ -42173,7 +42491,7 @@ ob-ipython = callPackage ({ dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ob-ipython"; - version = "20160703.839"; + version = "20160703.639"; src = fetchFromGitHub { owner = "gregsexton"; repo = "ob-ipython"; @@ -42194,7 +42512,7 @@ ob-kotlin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ob-kotlin"; - version = "20150312.814"; + version = "20150312.614"; src = fetchFromGitHub { owner = "zweifisch"; repo = "ob-kotlin"; @@ -42215,7 +42533,7 @@ ob-lfe = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ob-lfe"; - version = "20150701.855"; + version = "20150701.655"; src = fetchFromGitHub { owner = "zweifisch"; repo = "ob-lfe"; @@ -42236,7 +42554,7 @@ ob-lua = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ob-lua"; - version = "20160411.2224"; + version = "20160411.2024"; src = fetchFromGitHub { owner = "stardiviner"; repo = "ob-lua"; @@ -42257,7 +42575,7 @@ ob-ml-marklogic = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ob-ml-marklogic"; - version = "20160508.1132"; + version = "20160508.932"; src = fetchFromGitHub { owner = "ndw"; repo = "ob-ml-marklogic"; @@ -42278,7 +42596,7 @@ ob-mongo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ob-mongo"; - version = "20130718.932"; + version = "20130718.732"; src = fetchFromGitHub { owner = "krisajenkins"; repo = "ob-mongo"; @@ -42299,7 +42617,7 @@ ob-php = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ob-php"; - version = "20160505.419"; + version = "20160505.219"; src = fetchFromGitHub { owner = "stardiviner"; repo = "ob-php"; @@ -42320,7 +42638,7 @@ ob-prolog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ob-prolog"; - version = "20150530.1137"; + version = "20150530.937"; src = fetchFromGitHub { owner = "ljos"; repo = "ob-prolog"; @@ -42341,7 +42659,7 @@ ob-redis = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ob-redis"; - version = "20160411.2213"; + version = "20160411.2013"; src = fetchFromGitHub { owner = "stardiviner"; repo = "ob-redis"; @@ -42362,7 +42680,7 @@ ob-restclient = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, restclient }: melpaBuild { pname = "ob-restclient"; - version = "20160324.105"; + version = "20160323.2305"; src = fetchFromGitHub { owner = "alf"; repo = "ob-restclient.el"; @@ -42383,7 +42701,7 @@ ob-sagemath = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, sage-shell-mode }: melpaBuild { pname = "ob-sagemath"; - version = "20160517.1928"; + version = "20160517.1728"; src = fetchFromGitHub { owner = "stakemori"; repo = "ob-sagemath"; @@ -42401,10 +42719,31 @@ license = lib.licenses.free; }; }) {}; + ob-smiles = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, smiles-mode }: + melpaBuild { + pname = "ob-smiles"; + version = "20160717.421"; + src = fetchFromGitHub { + owner = "stardiviner"; + repo = "ob-smiles"; + rev = "c23c318bf8bbe2e266967388221893fbecdd2fd5"; + sha256 = "1iz8dli9i027wcg39rfabr6fx2b45waplx9mzkk1ri787rmapkpn"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e377955c0c36459698aae429df0a78e84793798f/recipes/ob-smiles"; + sha256 = "0d07ph6mlbcwmw0rd18yfd35bx9w3f5mb3nifczjg7xwlm8gd7jb"; + name = "ob-smiles"; + }; + packageRequires = [ org smiles-mode ]; + meta = { + homepage = "https://melpa.org/#/ob-smiles"; + license = lib.licenses.free; + }; + }) {}; ob-sml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, sml-mode }: melpaBuild { pname = "ob-sml"; - version = "20130829.1343"; + version = "20130829.1143"; src = fetchFromGitHub { owner = "swannodette"; repo = "ob-sml"; @@ -42425,7 +42764,7 @@ ob-swift = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ob-swift"; - version = "20151205.111"; + version = "20151204.2311"; src = fetchFromGitHub { owner = "zweifisch"; repo = "ob-swift"; @@ -42446,7 +42785,7 @@ ob-translate = callPackage ({ fetchFromGitHub, fetchurl, google-translate, lib, melpaBuild, org }: melpaBuild { pname = "ob-translate"; - version = "20160411.324"; + version = "20160411.124"; src = fetchFromGitHub { owner = "krisajenkins"; repo = "ob-translate"; @@ -42467,7 +42806,7 @@ ob-typescript = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ob-typescript"; - version = "20150804.730"; + version = "20150804.530"; src = fetchFromGitHub { owner = "lurdan"; repo = "ob-typescript"; @@ -42488,7 +42827,7 @@ oberon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "oberon"; - version = "20120715.409"; + version = "20120715.209"; src = fetchFromGitHub { owner = "emacsorphanage"; repo = "oberon"; @@ -42509,7 +42848,7 @@ objc-font-lock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "objc-font-lock"; - version = "20141021.1322"; + version = "20141021.1122"; src = fetchFromGitHub { owner = "Lindydancer"; repo = "objc-font-lock"; @@ -42530,7 +42869,7 @@ obsidian-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "obsidian-theme"; - version = "20140420.1143"; + version = "20140420.943"; src = fetchFromGitHub { owner = "mswift42"; repo = "obsidian-theme"; @@ -42551,7 +42890,7 @@ occidental-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "occidental-theme"; - version = "20130312.1458"; + version = "20130312.1258"; src = fetchFromGitHub { owner = "olcai"; repo = "occidental-theme"; @@ -42572,7 +42911,7 @@ occur-context-resize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "occur-context-resize"; - version = "20151227.2202"; + version = "20151227.2002"; src = fetchFromGitHub { owner = "dgtized"; repo = "occur-context-resize.el"; @@ -42593,7 +42932,7 @@ occur-x = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "occur-x"; - version = "20130610.843"; + version = "20130610.643"; src = fetchFromGitHub { owner = "juan-leon"; repo = "occur-x"; @@ -42614,7 +42953,7 @@ ocodo-svg-modelines = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, svg-mode-line-themes }: melpaBuild { pname = "ocodo-svg-modelines"; - version = "20150516.919"; + version = "20150516.719"; src = fetchFromGitHub { owner = "ocodo"; repo = "ocodo-svg-modelines"; @@ -42635,7 +42974,7 @@ ocp-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ocp-indent"; - version = "20160429.134"; + version = "20160428.2334"; src = fetchFromGitHub { owner = "OCamlPro"; repo = "ocp-indent"; @@ -42656,7 +42995,7 @@ octicons = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "octicons"; - version = "20151031.2240"; + version = "20151031.2040"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-octicons"; @@ -42677,7 +43016,7 @@ octopress = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "octopress"; - version = "20160123.1606"; + version = "20160123.1406"; src = fetchFromGitHub { owner = "aaronbieber"; repo = "octopress.el"; @@ -42698,7 +43037,7 @@ offlineimap = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "offlineimap"; - version = "20150916.658"; + version = "20150916.458"; src = fetchFromGitHub { owner = "jd"; repo = "offlineimap.el"; @@ -42719,7 +43058,7 @@ oldlace-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "oldlace-theme"; - version = "20150705.800"; + version = "20150705.600"; src = fetchFromGitHub { owner = "mswift42"; repo = "oldlace-theme"; @@ -42740,7 +43079,7 @@ olivetti = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "olivetti"; - version = "20160703.902"; + version = "20160703.702"; src = fetchFromGitHub { owner = "rnkn"; repo = "olivetti"; @@ -42761,7 +43100,7 @@ om-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "om-mode"; - version = "20140915.1610"; + version = "20140915.1410"; src = fetchFromGitHub { owner = "danielsz"; repo = "om-mode"; @@ -42782,7 +43121,7 @@ omni-kill = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "omni-kill"; - version = "20150527.149"; + version = "20150526.2349"; src = fetchFromGitHub { owner = "AdrieanKhisbe"; repo = "omni-kill.el"; @@ -42803,7 +43142,7 @@ omni-log = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }: melpaBuild { pname = "omni-log"; - version = "20150604.1238"; + version = "20150604.1038"; src = fetchFromGitHub { owner = "AdrieanKhisbe"; repo = "omni-log.el"; @@ -42824,7 +43163,7 @@ omni-quotes = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, omni-log }: melpaBuild { pname = "omni-quotes"; - version = "20150604.1257"; + version = "20150604.1057"; src = fetchFromGitHub { owner = "AdrieanKhisbe"; repo = "omni-quotes.el"; @@ -42845,7 +43184,7 @@ omni-scratch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "omni-scratch"; - version = "20151211.1059"; + version = "20151211.859"; src = fetchFromGitHub { owner = "AdrieanKhisbe"; repo = "omni-scratch.el"; @@ -42866,7 +43205,7 @@ omni-tags = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, pcre2el }: melpaBuild { pname = "omni-tags"; - version = "20150513.1253"; + version = "20150513.1053"; src = fetchFromGitHub { owner = "AdrieanKhisbe"; repo = "omni-tags.el"; @@ -42887,7 +43226,7 @@ omniref = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "omniref"; - version = "20160225.1624"; + version = "20160225.1424"; src = fetchFromGitHub { owner = "dotemacs"; repo = "omniref.el"; @@ -42908,7 +43247,7 @@ omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, fetchFromGitHub, fetchurl, flycheck, json ? null, lib, melpaBuild, popup, s }: melpaBuild { pname = "omnisharp"; - version = "20151210.1314"; + version = "20151210.1114"; src = fetchFromGitHub { owner = "OmniSharp"; repo = "omnisharp-emacs"; @@ -42935,22 +43274,22 @@ license = lib.licenses.free; }; }) {}; - omtose-phellack-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + omtose-phellack-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "omtose-phellack-theme"; - version = "20160412.628"; + version = "20160712.1314"; src = fetchFromGitHub { owner = "franksn"; repo = "omtose-phellack-theme"; - rev = "ebd13c54ea6f417bada5f5734c66e351ea431f03"; - sha256 = "01cssk6dxinfy1h431cx1yq5nbk0pc5j0h3iir2anzz1kfzbzilz"; + rev = "86ad2a63c62c3ca99c5426b697493d60a580b2a0"; + sha256 = "14anks7jif9jp1j5b7qcvm4934m4xcaicghwxa1w5s2j0rmjnycf"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/9353129eb2df7d1153739cdf44bdf1fc1412ef78/recipes/omtose-phellack-theme"; - sha256 = "09nyc7sdhzy4vmngzdj6r7cv2nbbwqlcyyi2mcg5a8lml4f6fj5i"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/478b1e07ed9010408c12598640ec8d154f9eb18d/recipes/omtose-phellack-theme"; + sha256 = "0aj0sw611w13xryn762ws63dfalczxixa5rv3skglmfy9axg3v3b"; name = "omtose-phellack-theme"; }; - packageRequires = [ emacs ]; + packageRequires = []; meta = { homepage = "https://melpa.org/#/omtose-phellack-theme"; license = lib.licenses.free; @@ -42959,7 +43298,7 @@ on-parens = callPackage ({ dash, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, smartparens }: melpaBuild { pname = "on-parens"; - version = "20150702.1706"; + version = "20150702.1506"; src = fetchFromGitHub { owner = "willghatch"; repo = "emacs-on-parens"; @@ -42980,7 +43319,7 @@ on-screen = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "on-screen"; - version = "20160302.350"; + version = "20160302.150"; src = fetchFromGitHub { owner = "michael-heerdegen"; repo = "on-screen.el"; @@ -43001,7 +43340,7 @@ one-time-pad-encrypt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "one-time-pad-encrypt"; - version = "20160329.1013"; + version = "20160329.813"; src = fetchFromGitHub { owner = "garvinguan"; repo = "emacs-one-time-pad"; @@ -43021,7 +43360,7 @@ }) {}; oneonone = callPackage ({ fetchurl, hexrgb, lib, melpaBuild }: melpaBuild { pname = "oneonone"; - version = "20151231.1741"; + version = "20151231.1541"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/oneonone.el"; sha256 = "05njigqi9061d34530d76kwsdzqgk9qxnwhn9xis64w59f5nzf1h"; @@ -43040,7 +43379,7 @@ opam = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "opam"; - version = "20150719.720"; + version = "20150719.520"; src = fetchFromGitHub { owner = "lunaryorn"; repo = "opam.el"; @@ -43061,7 +43400,7 @@ open-junk-file = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "open-junk-file"; - version = "20160514.1725"; + version = "20160514.1525"; src = fetchFromGitHub { owner = "rubikitch"; repo = "open-junk-file"; @@ -43082,7 +43421,7 @@ opencl-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "opencl-mode"; - version = "20160220.1109"; + version = "20160220.909"; src = fetchFromGitHub { owner = "salmanebah"; repo = "opencl-mode"; @@ -43103,7 +43442,7 @@ opensource = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, request, s }: melpaBuild { pname = "opensource"; - version = "20160625.231"; + version = "20160625.31"; src = fetchFromGitHub { owner = "nlamirault"; repo = "opensource.el"; @@ -43124,7 +43463,7 @@ openstack-cgit-browse-file = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "openstack-cgit-browse-file"; - version = "20130819.427"; + version = "20130819.227"; src = fetchFromGitHub { owner = "chmouel"; repo = "openstack-cgit-browse-file"; @@ -43144,7 +43483,7 @@ }) {}; openwith = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "openwith"; - version = "20120531.1636"; + version = "20120531.1436"; src = fetchhg { url = "https://bitbucket.com/jpkotta/openwith"; rev = "aeb78782ec87"; @@ -43164,7 +43503,7 @@ operate-on-number = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "operate-on-number"; - version = "20150707.123"; + version = "20150706.2323"; src = fetchFromGitHub { owner = "knu"; repo = "operate-on-number.el"; @@ -43185,7 +43524,7 @@ org-ac = callPackage ({ auto-complete-pcmp, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }: melpaBuild { pname = "org-ac"; - version = "20140302.613"; + version = "20140302.413"; src = fetchFromGitHub { owner = "aki2o"; repo = "org-ac"; @@ -43206,7 +43545,7 @@ org-agenda-property = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-agenda-property"; - version = "20140626.1616"; + version = "20140626.1416"; src = fetchFromGitHub { owner = "Malabarba"; repo = "org-agenda-property"; @@ -43227,7 +43566,7 @@ org-alert = callPackage ({ alert, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "org-alert"; - version = "20160701.2100"; + version = "20160701.1900"; src = fetchFromGitHub { owner = "groksteve"; repo = "org-alert"; @@ -43248,7 +43587,7 @@ org-attach-screenshot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-attach-screenshot"; - version = "20160529.937"; + version = "20160529.737"; src = fetchFromGitHub { owner = "dfeich"; repo = "org-screenshot"; @@ -43269,7 +43608,7 @@ org-autolist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-autolist"; - version = "20150922.905"; + version = "20150922.705"; src = fetchFromGitHub { owner = "calvinwyoung"; repo = "org-autolist"; @@ -43290,7 +43629,7 @@ org-beautify-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-beautify-theme"; - version = "20150106.1156"; + version = "20150106.956"; src = fetchFromGitHub { owner = "jonnay"; repo = "emagicians-starter-kit"; @@ -43311,12 +43650,12 @@ org-bookmark-heading = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-bookmark-heading"; - version = "20160326.159"; + version = "20160325.2359"; src = fetchFromGitHub { owner = "alphapapa"; repo = "org-bookmark-heading"; - rev = "5d8023c068049d4805e07ed220ae316ee6fbd2e8"; - sha256 = "084ij85pw53pzr220ql97544zkh23xb8gr81397asfdhc5wrzkqw"; + rev = "6283c3459ab2f1afe54548d83e3200c53546c73e"; + sha256 = "00nz9wmz1xhh6qg51mxr1d05j2ndnqc4f5w8hjc4148iiwkk4ymg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaadbd149399c6e3c48ac5cbeedeb29a3f5791f1/recipes/org-bookmark-heading"; @@ -43332,7 +43671,7 @@ org-bullets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-bullets"; - version = "20140918.1337"; + version = "20140918.1137"; src = fetchFromGitHub { owner = "sabof"; repo = "org-bullets"; @@ -43353,7 +43692,7 @@ org-caldav = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-caldav"; - version = "20160614.1542"; + version = "20160614.1342"; src = fetchFromGitHub { owner = "dengste"; repo = "org-caldav"; @@ -43374,7 +43713,7 @@ org-capture-pop-frame = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-capture-pop-frame"; - version = "20160518.508"; + version = "20160518.308"; src = fetchFromGitHub { owner = "tumashu"; repo = "org-capture-pop-frame"; @@ -43395,12 +43734,12 @@ org-chinese-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-chinese-utils"; - version = "20160510.909"; + version = "20160727.300"; src = fetchFromGitHub { owner = "tumashu"; repo = "org-chinese-utils"; - rev = "af821ca56eaf497d0ed28927786cbe51527ef6cb"; - sha256 = "1m6bsjc2l4vx1z2cb0siqs8m1wjvi8fs67aqqx879q5rwlxbhzs5"; + rev = "9e568ea7a999238d475b1e6c7b5c151f7621fae8"; + sha256 = "152r7ak085jvm7ayfi24cj1nimqkhpnxi6drxvwsqjl05biprbqd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a679ebaedcb496f915b9338f9d5c003e1389594d/recipes/org-chinese-utils"; @@ -43416,7 +43755,7 @@ org-cliplink = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-cliplink"; - version = "20160319.700"; + version = "20160319.500"; src = fetchFromGitHub { owner = "rexim"; repo = "org-cliplink"; @@ -43437,7 +43776,7 @@ org-clock-convenience = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-clock-convenience"; - version = "20160529.923"; + version = "20160529.723"; src = fetchFromGitHub { owner = "dfeich"; repo = "org-clock-convenience"; @@ -43458,7 +43797,7 @@ org-context = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-context"; - version = "20160108.414"; + version = "20160108.214"; src = fetchFromGitHub { owner = "thisirs"; repo = "org-context"; @@ -43479,7 +43818,7 @@ org-cua-dwim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-cua-dwim"; - version = "20120202.2334"; + version = "20120202.2134"; src = fetchFromGitHub { owner = "mattfidler"; repo = "org-cua-dwim.el"; @@ -43500,7 +43839,7 @@ org-dashboard = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-dashboard"; - version = "20150812.502"; + version = "20150812.302"; src = fetchFromGitHub { owner = "bard"; repo = "org-dashboard"; @@ -43521,12 +43860,12 @@ org-doing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-doing"; - version = "20150824.901"; + version = "20160705.851"; src = fetchFromGitHub { owner = "omouse"; repo = "org-doing"; - rev = "7d0a8ef5dcd18ee375da6298d96e6858508fb919"; - sha256 = "1wrgqdrfdxc1vrcr6dsa8dcxrwj6zgjr9h1fzilwnxlzfvdilnsm"; + rev = "e099514cfc162f8fe3d383456a7964743b0455d5"; + sha256 = "1hvnrw0y3chlfv6zxsczmm8zybrnakn3x13ykv2zblw96am9kd2s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c497b87e14ab614c963f4b2f041bc0111b6e936/recipes/org-doing"; @@ -43542,7 +43881,7 @@ org-dotemacs = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-dotemacs"; - version = "20151119.1222"; + version = "20151119.1022"; src = fetchFromGitHub { owner = "vapniks"; repo = "org-dotemacs"; @@ -43563,7 +43902,7 @@ org-download = callPackage ({ async, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-download"; - version = "20160620.807"; + version = "20160620.607"; src = fetchFromGitHub { owner = "abo-abo"; repo = "org-download"; @@ -43584,7 +43923,7 @@ org-dp = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-dp"; - version = "20160326.803"; + version = "20160326.603"; src = fetchFromGitHub { owner = "tj64"; repo = "org-dp"; @@ -43605,7 +43944,7 @@ org-drill-table = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org-plus-contrib, s }: melpaBuild { pname = "org-drill-table"; - version = "20140117.337"; + version = "20140117.137"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "org-drill-table"; @@ -43626,7 +43965,7 @@ org-dropbox = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }: melpaBuild { pname = "org-dropbox"; - version = "20150113.2309"; + version = "20150113.2109"; src = fetchFromGitHub { owner = "heikkil"; repo = "org-dropbox"; @@ -43647,7 +43986,7 @@ org-ehtml = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, web-server }: melpaBuild { pname = "org-ehtml"; - version = "20150506.1858"; + version = "20150506.1658"; src = fetchFromGitHub { owner = "eschulte"; repo = "org-ehtml"; @@ -43668,7 +44007,7 @@ org-elisp-help = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-elisp-help"; - version = "20130423.1745"; + version = "20130423.1545"; src = fetchFromGitHub { owner = "tarsius"; repo = "org-elisp-help"; @@ -43689,7 +44028,7 @@ org-eww = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-eww"; - version = "20160521.1658"; + version = "20160521.1458"; src = fetchFromGitHub { owner = "lujun9972"; repo = "org-eww"; @@ -43710,7 +44049,7 @@ org-fstree = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-fstree"; - version = "20090723.1019"; + version = "20090723.819"; src = fetchgit { url = "http://repo.or.cz/r/org-fstree.git"; rev = "24e305c6443be9f45198185772eecfddc390a9ce"; @@ -43730,7 +44069,7 @@ org-gcal = callPackage ({ alert, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org, request-deferred }: melpaBuild { pname = "org-gcal"; - version = "20160307.1406"; + version = "20160307.1206"; src = fetchFromGitHub { owner = "myuhe"; repo = "org-gcal.el"; @@ -43751,7 +44090,7 @@ org-gnome = callPackage ({ alert, fetchFromGitHub, fetchurl, gnome-calendar, lib, melpaBuild, telepathy }: melpaBuild { pname = "org-gnome"; - version = "20150614.957"; + version = "20150614.757"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "org-gnome.el"; @@ -43772,7 +44111,7 @@ org-grep = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-grep"; - version = "20151202.629"; + version = "20151202.429"; src = fetchFromGitHub { owner = "emacsorphanage"; repo = "org-grep"; @@ -43793,7 +44132,7 @@ org-if = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-if"; - version = "20150920.1013"; + version = "20150920.813"; src = fetchFromGitLab { owner = "elzair"; repo = "org-if"; @@ -43814,7 +44153,7 @@ org-iv = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, impatient-mode, lib, melpaBuild, org }: melpaBuild { pname = "org-iv"; - version = "20160609.2054"; + version = "20160609.1854"; src = fetchFromGitHub { owner = "kuangdash"; repo = "org-iv"; @@ -43835,7 +44174,7 @@ org-jekyll = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-jekyll"; - version = "20130508.439"; + version = "20130508.239"; src = fetchFromGitHub { owner = "juanre"; repo = "org-jekyll"; @@ -43856,7 +44195,7 @@ org-jira = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-jira"; - version = "20150911.758"; + version = "20150911.558"; src = fetchFromGitHub { owner = "baohaojun"; repo = "org-jira"; @@ -43877,7 +44216,7 @@ org-journal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-journal"; - version = "20160624.223"; + version = "20160624.23"; src = fetchFromGitHub { owner = "bastibe"; repo = "org-journal"; @@ -43898,7 +44237,7 @@ org-link-travis = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-link-travis"; - version = "20140405.1827"; + version = "20140405.1627"; src = fetchFromGitHub { owner = "aki2o"; repo = "org-link-travis"; @@ -43919,7 +44258,7 @@ org-linkany = callPackage ({ fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }: melpaBuild { pname = "org-linkany"; - version = "20160206.2211"; + version = "20160206.2011"; src = fetchFromGitHub { owner = "aki2o"; repo = "org-linkany"; @@ -43940,11 +44279,11 @@ org-mac-iCal = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-mac-iCal"; - version = "20140107.719"; + version = "20140107.519"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "ea94c14d924a0aa2cb4ead79d8772268fb933e48"; - sha256 = "0bjzfr0wzjd0f915isvp0bzc5iwgpwqdnk600ib71kplvqb5lvyg"; + rev = "fb517fabc0c1790b6b0dd3630f40919a5e7a87ef"; + sha256 = "1l1s2qhykpzn1fil5qsvpw8iabf07lbbymn48lgbqd96fvx0lls6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal"; @@ -43960,11 +44299,11 @@ org-mac-link = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-mac-link"; - version = "20160109.1643"; + version = "20160109.1443"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "ea94c14d924a0aa2cb4ead79d8772268fb933e48"; - sha256 = "0bjzfr0wzjd0f915isvp0bzc5iwgpwqdnk600ib71kplvqb5lvyg"; + rev = "fb517fabc0c1790b6b0dd3630f40919a5e7a87ef"; + sha256 = "1l1s2qhykpzn1fil5qsvpw8iabf07lbbymn48lgbqd96fvx0lls6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link"; @@ -43980,7 +44319,7 @@ org-mobile-sync = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-mobile-sync"; - version = "20160629.1507"; + version = "20160629.1307"; src = fetchFromGitHub { owner = "steckerhalter"; repo = "org-mobile-sync"; @@ -44001,7 +44340,7 @@ org-multiple-keymap = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-multiple-keymap"; - version = "20150328.2006"; + version = "20150328.1806"; src = fetchFromGitHub { owner = "myuhe"; repo = "org-multiple-keymap.el"; @@ -44022,7 +44361,7 @@ org-octopress = callPackage ({ ctable, fetchFromGitHub, fetchurl, lib, melpaBuild, org, orglue }: melpaBuild { pname = "org-octopress"; - version = "20150826.616"; + version = "20150826.416"; src = fetchFromGitHub { owner = "yoshinari-nomura"; repo = "org-octopress"; @@ -44043,12 +44382,12 @@ org-outlook = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-outlook"; - version = "20150914.747"; + version = "20160705.638"; src = fetchFromGitHub { owner = "mattfidler"; repo = "org-outlook.el"; - rev = "b7978fedb0d50c1a3e499bf7e98b5cc526028cd4"; - sha256 = "10dddbs9jppqqzwwv5y6pj2szdkw3223gvzzd4pzn9biv5d9kzsb"; + rev = "ec32d8d9d8ffd17e6de4de0b52fc3f5ad9b4cc0d"; + sha256 = "1la7g9qzn8wbfzc2zd6gddi1zl145b35311l66sjyffidmhgfw8d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/804a4b6802d2cf53e5415d956f0b4772853f4c69/recipes/org-outlook"; @@ -44064,7 +44403,7 @@ org-page = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, git, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }: melpaBuild { pname = "org-page"; - version = "20160626.308"; + version = "20160626.108"; src = fetchFromGitHub { owner = "kelvinh"; repo = "org-page"; @@ -44094,7 +44433,7 @@ org-pandoc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-pandoc"; - version = "20130729.2050"; + version = "20130729.1850"; src = fetchFromGitHub { owner = "robtillotson"; repo = "org-pandoc"; @@ -44115,7 +44454,7 @@ org-password-manager = callPackage ({ fetchgit, fetchurl, lib, melpaBuild, org, s }: melpaBuild { pname = "org-password-manager"; - version = "20160430.2051"; + version = "20160430.1851"; src = fetchgit { url = "https://git.leafac.com/leafac/org-password-manager"; rev = "5dffcd5f7d7f1852fdd31a193bea5c70ea130082"; @@ -44135,7 +44474,7 @@ org-pdfview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, pdf-tools }: melpaBuild { pname = "org-pdfview"; - version = "20160125.1454"; + version = "20160125.1254"; src = fetchFromGitHub { owner = "markus1189"; repo = "org-pdfview"; @@ -44156,12 +44495,12 @@ org-pomodoro = callPackage ({ alert, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-pomodoro"; - version = "20151217.753"; + version = "20160725.349"; src = fetchFromGitHub { owner = "lolownia"; repo = "org-pomodoro"; - rev = "95e2b1f555359a6096a19634814e1d93b2072f25"; - sha256 = "015idpk66835jdg1sbvpksyr07xk4vn17z8cng2qw87fss688ihb"; + rev = "a6d867865f1a033fb5a09cca6643045d7ebac49c"; + sha256 = "0r5shgikm34d66i2hblyknbblpg92lb2zc9x4bcb28xkh7m9d0xv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e54e77c5619b56e9b488b3fe8761188b6b3b4198/recipes/org-pomodoro"; @@ -44177,7 +44516,7 @@ org-present = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-present"; - version = "20141109.1956"; + version = "20141109.1756"; src = fetchFromGitHub { owner = "rlister"; repo = "org-present"; @@ -44198,12 +44537,12 @@ org-projectile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "org-projectile"; - version = "20160617.1406"; + version = "20160617.1206"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "org-projectile"; - rev = "9e7453874e472ade60b95af44167d5a6d4e24317"; - sha256 = "0nccb2w3zjgx2w2x207w3100c7c4d1ii22j1qaz3v623d7azn0qq"; + rev = "0a5977b0de68d26ec93ffad4c5099b7e64b5b361"; + sha256 = "0nhf1hwirwmznrqsf0lfjc9l37z206wdmbsz55a8wz36rhvrjv3y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dde8c06c968d4375926d269150a16b31c3a840e/recipes/org-projectile"; @@ -44219,7 +44558,7 @@ org-protocol-jekyll = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-protocol-jekyll"; - version = "20151119.1038"; + version = "20151119.838"; src = fetchFromGitHub { owner = "vonavi"; repo = "org-protocol-jekyll"; @@ -44240,7 +44579,7 @@ org-random-todo = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-random-todo"; - version = "20160208.626"; + version = "20160208.426"; src = fetchFromGitHub { owner = "unhammer"; repo = "org-random-todo"; @@ -44261,7 +44600,7 @@ org-readme = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, header2, http-post-simple, lib, lib-requires, melpaBuild, yaoddmuse }: melpaBuild { pname = "org-readme"; - version = "20151204.617"; + version = "20151204.417"; src = fetchFromGitHub { owner = "mattfidler"; repo = "org-readme"; @@ -44288,12 +44627,12 @@ org-redmine = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-redmine"; - version = "20160205.544"; + version = "20160711.414"; src = fetchFromGitHub { owner = "gongo"; repo = "org-redmine"; - rev = "836d9a4c4dc3a05064667be687cd8f587017cb44"; - sha256 = "0q26knckq213r885i5947970qagjmb7ybs4ag0ignls4dzbqlbmz"; + rev = "4cdf9a2aea8420befd2d667d98f63c386f3e44f7"; + sha256 = "0fvzrc8k67di5qyzh13ly5wx6m34rg980yl2rqp5d3vvw8mbbsqw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/017a9dd8029d083ca0c1307f2b83be187c7615e5/recipes/org-redmine"; @@ -44309,12 +44648,12 @@ org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, s }: melpaBuild { pname = "org-ref"; - version = "20160702.1107"; + version = "20160723.754"; src = fetchFromGitHub { owner = "jkitchin"; repo = "org-ref"; - rev = "e817fd7961dd457d9d9b1d6a4390e65257d040e6"; - sha256 = "1hp978v64sr08l2g7zcx7rcbjamz3k3bni07lhv78mj94jd0banc"; + rev = "0f4cdc1f47ce358247ca205a2ce8738fac84a06a"; + sha256 = "06ls7hv72pj3fm62cca7ck1zb61rbwsbpimcrfhk18xc4l6cj4lp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref"; @@ -44340,7 +44679,7 @@ org-repo-todo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-repo-todo"; - version = "20160307.1229"; + version = "20160307.1029"; src = fetchFromGitHub { owner = "waymondo"; repo = "org-repo-todo"; @@ -44361,7 +44700,7 @@ org-rtm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, rtm }: melpaBuild { pname = "org-rtm"; - version = "20160214.636"; + version = "20160214.436"; src = fetchFromGitHub { owner = "pmiddend"; repo = "org-rtm"; @@ -44382,7 +44721,7 @@ org-sync = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-sync"; - version = "20150817.954"; + version = "20150817.754"; src = fetchFromGitHub { owner = "arbox"; repo = "org-sync"; @@ -44403,7 +44742,7 @@ org-table-comment = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-table-comment"; - version = "20120209.1251"; + version = "20120209.1051"; src = fetchFromGitHub { owner = "mattfidler"; repo = "org-table-comment.el"; @@ -44424,7 +44763,7 @@ org-tfl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-tfl"; - version = "20160407.1640"; + version = "20160407.1440"; src = fetchFromGitHub { owner = "storax"; repo = "org-tfl"; @@ -44445,7 +44784,7 @@ org-themis = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-themis"; - version = "20160121.2204"; + version = "20160121.2004"; src = fetchFromGitHub { owner = "zellio"; repo = "org-themis"; @@ -44466,7 +44805,7 @@ org-time-budgets = callPackage ({ alert, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-time-budgets"; - version = "20151111.201"; + version = "20151111.1"; src = fetchFromGitHub { owner = "leoc"; repo = "org-time-budgets"; @@ -44487,7 +44826,7 @@ org-toodledo = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred }: melpaBuild { pname = "org-toodledo"; - version = "20150301.513"; + version = "20150301.313"; src = fetchFromGitHub { owner = "myuhe"; repo = "org-toodledo"; @@ -44508,7 +44847,7 @@ org-tracktable = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-tracktable"; - version = "20160621.1327"; + version = "20160621.1127"; src = fetchFromGitHub { owner = "tty-tourist"; repo = "org-tracktable"; @@ -44529,7 +44868,7 @@ org-transform-tree-table = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "org-transform-tree-table"; - version = "20150110.833"; + version = "20150110.633"; src = fetchFromGitHub { owner = "jplindstrom"; repo = "emacs-org-transform-tree-table"; @@ -44550,7 +44889,7 @@ org-tree-slide = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-tree-slide"; - version = "20160514.125"; + version = "20160513.2325"; src = fetchFromGitHub { owner = "takaxp"; repo = "org-tree-slide"; @@ -44571,7 +44910,7 @@ org-trello = callPackage ({ dash, dash-functional, deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred, s }: melpaBuild { pname = "org-trello"; - version = "20160604.845"; + version = "20160604.645"; src = fetchFromGitHub { owner = "org-trello"; repo = "org-trello"; @@ -44599,7 +44938,7 @@ org-vcard = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-vcard"; - version = "20151214.22"; + version = "20151213.2222"; src = fetchFromGitHub { owner = "flexibeast"; repo = "org-vcard"; @@ -44620,7 +44959,7 @@ org-wc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-wc"; - version = "20160204.1915"; + version = "20160204.1715"; src = fetchFromGitHub { owner = "dato"; repo = "org-wc"; @@ -44641,7 +44980,7 @@ org-webpage = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, web-server }: melpaBuild { pname = "org-webpage"; - version = "20160307.226"; + version = "20160307.26"; src = fetchFromGitHub { owner = "tumashu"; repo = "org-webpage"; @@ -44662,7 +45001,7 @@ org-wunderlist = callPackage ({ alert, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org, request-deferred, s }: melpaBuild { pname = "org-wunderlist"; - version = "20150817.2113"; + version = "20150817.1913"; src = fetchFromGitHub { owner = "myuhe"; repo = "org-wunderlist.el"; @@ -44683,7 +45022,7 @@ org2blog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, metaweblog, org, xml-rpc }: melpaBuild { pname = "org2blog"; - version = "20160502.2021"; + version = "20160502.1821"; src = fetchFromGitHub { owner = "punchagan"; repo = "org2blog"; @@ -44701,10 +45040,31 @@ license = lib.licenses.free; }; }) {}; + org2elcomment = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: + melpaBuild { + pname = "org2elcomment"; + version = "20160712.2026"; + src = fetchFromGitHub { + owner = "cute-jumper"; + repo = "org2elcomment"; + rev = "0e2733f2eede71abc4586909aaf49e4deaf2df1e"; + sha256 = "0jjqj34k1q37mrqn9l34zdy5xchc3q3lid24xsj754bs7an6s3fg"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8af13650de8b4a814832638d4182bf8ce576244c/recipes/org2elcomment"; + sha256 = "0jv8sskw55rzxw578l6nm4arsycrw1si80ds7gr8i0x352fdydyp"; + name = "org2elcomment"; + }; + packageRequires = [ org ]; + meta = { + homepage = "https://melpa.org/#/org2elcomment"; + license = lib.licenses.free; + }; + }) {}; org2issue = callPackage ({ emacs, fetchFromGitHub, fetchurl, gh, lib, melpaBuild, org, ox-gfm, s }: melpaBuild { pname = "org2issue"; - version = "20160426.2018"; + version = "20160426.1818"; src = fetchFromGitHub { owner = "lujun9972"; repo = "org2issue"; @@ -44725,7 +45085,7 @@ org2jekyll = callPackage ({ dash-functional, deferred, fetchFromGitHub, fetchurl, kv, lib, melpaBuild, s }: melpaBuild { pname = "org2jekyll"; - version = "20160519.1204"; + version = "20160519.1004"; src = fetchFromGitHub { owner = "ardumont"; repo = "org2jekyll"; @@ -44746,12 +45106,12 @@ organic-green-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "organic-green-theme"; - version = "20160610.634"; + version = "20160712.153"; src = fetchFromGitHub { owner = "kostafey"; repo = "organic-green-theme"; - rev = "57b86a32245f948497e64a4f32f6c62b96396b94"; - sha256 = "0jplnbc5hhv1bd2w8dvwny00hwl5n5idyq0zri9vfavmabm7lm5k"; + rev = "9955ef16b129cf5613ea25f71c522cb323395ccf"; + sha256 = "0ny3kzan2jdq8h2264kvd0lbglnz7jmgl59rf3d265i9bbhnxqdx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9383ef5f0372724b34f4bb9173ef8ccbb773e19e/recipes/organic-green-theme"; @@ -44767,7 +45127,7 @@ orgbox = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "orgbox"; - version = "20140528.2026"; + version = "20140528.1826"; src = fetchFromGitHub { owner = "yasuhito"; repo = "orgbox"; @@ -44788,7 +45148,7 @@ orgit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, org }: melpaBuild { pname = "orgit"; - version = "20160119.1624"; + version = "20160119.1424"; src = fetchFromGitHub { owner = "magit"; repo = "orgit"; @@ -44809,7 +45169,7 @@ orglink = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "orglink"; - version = "20160606.607"; + version = "20160606.407"; src = fetchFromGitHub { owner = "tarsius"; repo = "orglink"; @@ -44830,7 +45190,7 @@ orglue = callPackage ({ epic, fetchFromGitHub, fetchurl, lib, melpaBuild, org, org-mac-link }: melpaBuild { pname = "orglue"; - version = "20150430.713"; + version = "20150430.513"; src = fetchFromGitHub { owner = "yoshinari-nomura"; repo = "orglue"; @@ -44851,7 +45211,7 @@ orgtbl-aggregate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "orgtbl-aggregate"; - version = "20160421.926"; + version = "20160421.726"; src = fetchFromGitHub { owner = "tbanel"; repo = "orgaggregate"; @@ -44872,7 +45232,7 @@ orgtbl-ascii-plot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "orgtbl-ascii-plot"; - version = "20151215.1551"; + version = "20151215.1351"; src = fetchFromGitHub { owner = "tbanel"; repo = "orgtblasciiplot"; @@ -44893,7 +45253,7 @@ orgtbl-join = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "orgtbl-join"; - version = "20150121.1646"; + version = "20150121.1446"; src = fetchFromGitHub { owner = "tbanel"; repo = "orgtbljoin"; @@ -44914,7 +45274,7 @@ orgtbl-show-header = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "orgtbl-show-header"; - version = "20141023.337"; + version = "20141023.137"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "orgtbl-show-header"; @@ -44935,12 +45295,12 @@ origami = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "origami"; - version = "20160703.1028"; + version = "20160710.958"; src = fetchFromGitHub { owner = "gregsexton"; repo = "origami.el"; - rev = "714fba2a9cf65658b73fbac6b8526b4dbba18c56"; - sha256 = "0dmw59vfbm8a04xvrq1gbfaj5z7wad83zi4g7bnixazbfcc9xpwr"; + rev = "b571187d68dbfbbc797ac0869c0b3650ad421d00"; + sha256 = "1mranmf55rifh16vb89dfmvknfpilbqr7dvg1w6j373lh22jl2j7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b816be227dfc7330292a50346c4bb37394d3e998/recipes/origami"; @@ -44956,7 +45316,7 @@ osx-browse = callPackage ({ browse-url-dwim, fetchFromGitHub, fetchurl, lib, melpaBuild, string-utils }: melpaBuild { pname = "osx-browse"; - version = "20140508.1541"; + version = "20140508.1341"; src = fetchFromGitHub { owner = "rolandwalker"; repo = "osx-browse"; @@ -44977,7 +45337,7 @@ osx-clipboard = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "osx-clipboard"; - version = "20141012.217"; + version = "20141012.17"; src = fetchFromGitHub { owner = "joddie"; repo = "osx-clipboard-mode"; @@ -44998,7 +45358,7 @@ osx-dictionary = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "osx-dictionary"; - version = "20160628.311"; + version = "20160628.111"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "osx-dictionary.el"; @@ -45019,12 +45379,12 @@ osx-lib = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "osx-lib"; - version = "20160622.1621"; + version = "20160719.1259"; src = fetchFromGitHub { owner = "raghavgautam"; repo = "osx-lib"; - rev = "e353b27bd7504d20094b6656e898c8312f750f29"; - sha256 = "178328s5rfbypr6xriwww0f84bxxjd98vcm74zl6yyy7cfggjzmx"; + rev = "530ecdaa501b4bd8a6c75564719ab04f7caa3dca"; + sha256 = "1kvh3ks3y69nr63k899bfrnzysk3hfjx8x3hxkq233gphpf6xs6v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b42ae666e3511752f5138927e7bf7965bd9f7ee5/recipes/osx-lib"; @@ -45040,7 +45400,7 @@ osx-location = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "osx-location"; - version = "20150613.417"; + version = "20150613.217"; src = fetchFromGitHub { owner = "purcell"; repo = "osx-location"; @@ -45061,7 +45421,7 @@ osx-org-clock-menubar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "osx-org-clock-menubar"; - version = "20150205.1511"; + version = "20150205.1311"; src = fetchFromGitHub { owner = "jordonbiondo"; repo = "osx-org-clock-menubar"; @@ -45082,7 +45442,7 @@ osx-plist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "osx-plist"; - version = "20101130.648"; + version = "20101130.448"; src = fetchFromGitHub { owner = "emacsmirror"; repo = "osx-plist"; @@ -45103,7 +45463,7 @@ osx-pseudo-daemon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "osx-pseudo-daemon"; - version = "20131026.1930"; + version = "20131026.1730"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "osx-pseudo-daemon"; @@ -45124,7 +45484,7 @@ osx-trash = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "osx-trash"; - version = "20160520.800"; + version = "20160520.600"; src = fetchFromGitHub { owner = "lunaryorn"; repo = "osx-trash.el"; @@ -45145,7 +45505,7 @@ otama = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "otama"; - version = "20160404.532"; + version = "20160404.332"; src = fetchFromGitHub { owner = "yoshinari-nomura"; repo = "otama"; @@ -45166,7 +45526,7 @@ outline-magic = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "outline-magic"; - version = "20150209.1626"; + version = "20150209.1426"; src = fetchFromGitHub { owner = "tj64"; repo = "outline-magic"; @@ -45187,7 +45547,7 @@ outlined-elisp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "outlined-elisp-mode"; - version = "20131108.527"; + version = "20131108.327"; src = fetchFromGitHub { owner = "zk-phi"; repo = "outlined-elisp-mode"; @@ -45208,7 +45568,7 @@ outorg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "outorg"; - version = "20160327.332"; + version = "20160327.132"; src = fetchFromGitHub { owner = "tj64"; repo = "outorg"; @@ -45229,7 +45589,7 @@ outshine = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, outorg }: melpaBuild { pname = "outshine"; - version = "20160416.1046"; + version = "20160416.846"; src = fetchFromGitHub { owner = "tj64"; repo = "outshine"; @@ -45250,7 +45610,7 @@ ov = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ov"; - version = "20150312.28"; + version = "20150311.2228"; src = fetchFromGitHub { owner = "ShingoFukuyama"; repo = "ov.el"; @@ -45271,7 +45631,7 @@ overseer = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "overseer"; - version = "20160518.143"; + version = "20160517.2343"; src = fetchFromGitHub { owner = "tonini"; repo = "overseer.el"; @@ -45292,7 +45652,7 @@ owdriver = callPackage ({ fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, smartrep, yaxception }: melpaBuild { pname = "owdriver"; - version = "20141011.938"; + version = "20141011.738"; src = fetchFromGitHub { owner = "aki2o"; repo = "owdriver"; @@ -45313,7 +45673,7 @@ ox-asciidoc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-asciidoc"; - version = "20160120.723"; + version = "20160120.523"; src = fetchFromGitHub { owner = "yashi"; repo = "org-asciidoc"; @@ -45334,7 +45694,7 @@ ox-bibtex-chinese = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ox-bibtex-chinese"; - version = "20160510.706"; + version = "20160510.506"; src = fetchFromGitHub { owner = "tumashu"; repo = "ox-bibtex-chinese"; @@ -45352,22 +45712,22 @@ license = lib.licenses.free; }; }) {}; - ox-clip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + ox-clip = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, org }: melpaBuild { pname = "ox-clip"; - version = "20160630.941"; + version = "20160705.458"; src = fetchFromGitHub { owner = "jkitchin"; repo = "scimax"; - rev = "42758a3fe8b2e128a47fabba4a4a27a534eeea03"; - sha256 = "1sknf5rxri4ayh3lv1j7c9c1zbpf26vsqd5airijivicwpsxqyyr"; + rev = "5c38ef3f600daa652938d8933b97aa3b6e077891"; + sha256 = "13k1llsfqwk65zws5zvxq7a61f0n7qbi8gjbndwzrrr225nkx6qn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/222ccf4480395bda8c582ad5faf8c7902a69370e/recipes/ox-clip"; sha256 = "0vkw8r34wnax08kkdgwzm62srp9avvza1jaj582l8nn0a75284yg"; name = "ox-clip"; }; - packageRequires = []; + packageRequires = [ htmlize org ]; meta = { homepage = "https://melpa.org/#/ox-clip"; license = lib.licenses.free; @@ -45376,7 +45736,7 @@ ox-gfm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ox-gfm"; - version = "20160520.1642"; + version = "20160520.1442"; src = fetchFromGitHub { owner = "larstvei"; repo = "ox-gfm"; @@ -45397,7 +45757,7 @@ ox-html5slide = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-html5slide"; - version = "20131228.6"; + version = "20131227.2206"; src = fetchFromGitHub { owner = "coldnew"; repo = "org-html5slide"; @@ -45418,7 +45778,7 @@ ox-impress-js = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-impress-js"; - version = "20150412.1216"; + version = "20150412.1016"; src = fetchFromGitHub { owner = "kinjo"; repo = "org-impress-js.el"; @@ -45439,7 +45799,7 @@ ox-ioslide = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, makey, melpaBuild, org }: melpaBuild { pname = "ox-ioslide"; - version = "20160120.1005"; + version = "20160120.805"; src = fetchFromGitHub { owner = "coldnew"; repo = "org-ioslide"; @@ -45460,7 +45820,7 @@ ox-jira = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-jira"; - version = "20160426.753"; + version = "20160426.553"; src = fetchFromGitHub { owner = "stig"; repo = "ox-jira.el"; @@ -45481,7 +45841,7 @@ ox-latex-chinese = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ox-latex-chinese"; - version = "20160513.1928"; + version = "20160513.1728"; src = fetchFromGitHub { owner = "tumashu"; repo = "ox-latex-chinese"; @@ -45502,7 +45862,7 @@ ox-mediawiki = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ox-mediawiki"; - version = "20150923.1102"; + version = "20150923.902"; src = fetchFromGitHub { owner = "tomalexander"; repo = "orgmode-mediawiki"; @@ -45523,7 +45883,7 @@ ox-nikola = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org, ox-rst }: melpaBuild { pname = "ox-nikola"; - version = "20151114.516"; + version = "20151114.316"; src = fetchFromGitHub { owner = "masayuko"; repo = "ox-nikola"; @@ -45544,7 +45904,7 @@ ox-pandoc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, org }: melpaBuild { pname = "ox-pandoc"; - version = "20160702.345"; + version = "20160702.145"; src = fetchFromGitHub { owner = "kawabata"; repo = "ox-pandoc"; @@ -45565,7 +45925,7 @@ ox-pukiwiki = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-pukiwiki"; - version = "20150124.1116"; + version = "20150124.916"; src = fetchFromGitHub { owner = "yashi"; repo = "org-pukiwiki"; @@ -45586,7 +45946,7 @@ ox-qmd = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-qmd"; - version = "20160606.704"; + version = "20160606.504"; src = fetchFromGitHub { owner = "0x60df"; repo = "ox-qmd"; @@ -45607,12 +45967,12 @@ ox-reveal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-reveal"; - version = "20160504.2208"; + version = "20160719.28"; src = fetchFromGitHub { owner = "yjwen"; repo = "org-reveal"; - rev = "45f1e3b58632ce1aefba6aa8612e51b7122ed2f2"; - sha256 = "0pmshd58945h843c5hgzcz169kfzrwmkdzh7rv1cci783z3cxxdc"; + rev = "6ee0e547ddf1596496e558d1b7ab78f315f980ec"; + sha256 = "0p71pvsgyri2pgvv208pp7fizqx40asy6m60si9mhlk8smdris72"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bb4024eef5dc4cc3674bbbed9d92f074d533f35/recipes/ox-reveal"; @@ -45628,7 +45988,7 @@ ox-rst = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-rst"; - version = "20160607.1217"; + version = "20160607.1017"; src = fetchFromGitHub { owner = "masayuko"; repo = "ox-rst"; @@ -45649,7 +46009,7 @@ ox-textile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-textile"; - version = "20151114.2225"; + version = "20151114.2025"; src = fetchFromGitHub { owner = "yashi"; repo = "org-textile"; @@ -45670,7 +46030,7 @@ ox-tiddly = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-tiddly"; - version = "20151206.440"; + version = "20151206.240"; src = fetchFromGitHub { owner = "dfeich"; repo = "org8-wikiexporters"; @@ -45691,7 +46051,7 @@ ox-trac = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-trac"; - version = "20151102.1155"; + version = "20151102.955"; src = fetchFromGitHub { owner = "JalapenoGremlin"; repo = "ox-trac"; @@ -45712,7 +46072,7 @@ ox-twbs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ox-twbs"; - version = "20160307.58"; + version = "20160306.2258"; src = fetchFromGitHub { owner = "marsmining"; repo = "ox-twbs"; @@ -45733,7 +46093,7 @@ ox-twiki = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-twiki"; - version = "20160306.1115"; + version = "20160306.915"; src = fetchFromGitHub { owner = "dfeich"; repo = "org8-wikiexporters"; @@ -45754,7 +46114,7 @@ p4 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "p4"; - version = "20150721.1437"; + version = "20150721.1237"; src = fetchFromGitHub { owner = "gareth-rees"; repo = "p4.el"; @@ -45775,7 +46135,7 @@ pabbrev = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pabbrev"; - version = "20160320.1601"; + version = "20160320.1401"; src = fetchFromGitHub { owner = "phillord"; repo = "pabbrev"; @@ -45796,16 +46156,16 @@ package-build = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "package-build"; - version = "20160619.1517"; + version = "20160721.155"; src = fetchFromGitHub { owner = "melpa"; repo = "melpa"; - rev = "05755bed49219072d2ec98f0be5ecba4deda7cd1"; - sha256 = "0sdwd6b1h0k2wm7xfk7q9nx266bc67dphj99zwrnxnc60pq2k3r7"; + rev = "ed8303f5009604ae3d83769063d38749e37fc5d8"; + sha256 = "1a9qjggf4y6yrbf0icj13ahzv4jhz6x7m4xvkg524lm9l4k6n39m"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/1edd038d9df8b9b7cb6a0e02896a1a23e88e8a5b/recipes/package-build"; - sha256 = "0618z43j6628jjj448hcigvsfwcs7p0n4bbcmqscrb6p59b7n4wx"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/3fb67ca7f003cff8ba7b7fdc3a6de899ea0a130a/recipes/package-build"; + sha256 = "15c37hmsh9h5bybaxvsbdnn6xczrzl7dsvkgaqyla5n6gs8d866r"; name = "package-build"; }; packageRequires = [ cl-lib ]; @@ -45817,7 +46177,7 @@ package-filter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "package-filter"; - version = "20140105.1626"; + version = "20140105.1426"; src = fetchFromGitHub { owner = "milkypostman"; repo = "package-filter"; @@ -45838,7 +46198,7 @@ package-plus = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "package-plus"; - version = "20150319.1655"; + version = "20150319.1455"; src = fetchFromGitHub { owner = "zenspider"; repo = "package"; @@ -45859,7 +46219,7 @@ package-safe-delete = callPackage ({ emacs, epl, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "package-safe-delete"; - version = "20150116.1007"; + version = "20150116.807"; src = fetchFromGitHub { owner = "Fanael"; repo = "package-safe-delete"; @@ -45880,7 +46240,7 @@ package-utils = callPackage ({ async, epl, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "package-utils"; - version = "20160627.1109"; + version = "20160627.909"; src = fetchFromGitHub { owner = "Silex"; repo = "package-utils"; @@ -45901,7 +46261,7 @@ packed = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "packed"; - version = "20160523.800"; + version = "20160523.600"; src = fetchFromGitHub { owner = "tarsius"; repo = "packed"; @@ -45922,7 +46282,7 @@ pacmacs = callPackage ({ cl-lib ? null, dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pacmacs"; - version = "20160131.232"; + version = "20160131.32"; src = fetchFromGitHub { owner = "codingteam"; repo = "pacmacs.el"; @@ -45943,7 +46303,7 @@ paganini-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "paganini-theme"; - version = "20160612.537"; + version = "20160612.337"; src = fetchFromGitHub { owner = "onurtemizkan"; repo = "paganini"; @@ -45964,7 +46324,7 @@ page-break-lines = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "page-break-lines"; - version = "20160617.2300"; + version = "20160617.2100"; src = fetchFromGitHub { owner = "purcell"; repo = "page-break-lines"; @@ -45985,7 +46345,7 @@ pager = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pager"; - version = "20100330.1331"; + version = "20100330.1131"; src = fetchFromGitHub { owner = "emacsorphanage"; repo = "pager"; @@ -46006,7 +46366,7 @@ pager-default-keybindings = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pager }: melpaBuild { pname = "pager-default-keybindings"; - version = "20130719.1557"; + version = "20130719.1357"; src = fetchFromGitHub { owner = "nflath"; repo = "pager-default-keybindings"; @@ -46026,7 +46386,7 @@ }) {}; palette = callPackage ({ fetchurl, hexrgb, lib, melpaBuild }: melpaBuild { pname = "palette"; - version = "20151231.1745"; + version = "20151231.1545"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/palette.el"; sha256 = "1qnv84y0s437xcsjxh0gs9rb36pydba3qfrihvz5pqs9g9w7m94k"; @@ -46045,7 +46405,7 @@ palimpsest = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "palimpsest"; - version = "20130731.1021"; + version = "20130731.821"; src = fetchFromGitHub { owner = "danielsz"; repo = "Palimpsest"; @@ -46066,7 +46426,7 @@ pallet = callPackage ({ cask, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "pallet"; - version = "20150512.202"; + version = "20150512.2"; src = fetchFromGitHub { owner = "rdallasgray"; repo = "pallet"; @@ -46087,7 +46447,7 @@ pandoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pandoc"; - version = "20160607.1210"; + version = "20160607.1010"; src = fetchFromGitHub { owner = "zonuexe"; repo = "pandoc.el"; @@ -46108,7 +46468,7 @@ pandoc-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }: melpaBuild { pname = "pandoc-mode"; - version = "20160519.1053"; + version = "20160519.853"; src = fetchFromGitHub { owner = "joostkremers"; repo = "pandoc-mode"; @@ -46129,7 +46489,7 @@ pangu-spacing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pangu-spacing"; - version = "20150927.224"; + version = "20150927.24"; src = fetchFromGitHub { owner = "coldnew"; repo = "pangu-spacing"; @@ -46150,7 +46510,7 @@ paper-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, hexrgb, lib, melpaBuild }: melpaBuild { pname = "paper-theme"; - version = "20151231.1132"; + version = "20151231.932"; src = fetchFromGitHub { owner = "cadadr"; repo = "paper-theme"; @@ -46171,7 +46531,7 @@ paradox = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, let-alist, lib, melpaBuild, seq, spinner }: melpaBuild { pname = "paradox"; - version = "20160525.936"; + version = "20160525.736"; src = fetchFromGitHub { owner = "Malabarba"; repo = "paradox"; @@ -46191,7 +46551,7 @@ }) {}; paredit = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "paredit"; - version = "20160615.1525"; + version = "20160615.1325"; src = fetchgit { url = "http://mumble.net/~campbell/git/paredit.git"; rev = "7c27746a8eb259ae24b5dce9380801c4846258f0"; @@ -46211,7 +46571,7 @@ paredit-everywhere = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }: melpaBuild { pname = "paredit-everywhere"; - version = "20150821.2344"; + version = "20150821.2144"; src = fetchFromGitHub { owner = "purcell"; repo = "paredit-everywhere"; @@ -46232,7 +46592,7 @@ paredit-menu = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }: melpaBuild { pname = "paredit-menu"; - version = "20160128.1133"; + version = "20160128.933"; src = fetchFromGitHub { owner = "phillord"; repo = "paredit-menu"; @@ -46253,7 +46613,7 @@ paren-completer = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "paren-completer"; - version = "20160501.552"; + version = "20160501.352"; src = fetchFromGitHub { owner = "MatthewBregg"; repo = "paren-completer"; @@ -46274,7 +46634,7 @@ paren-face = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "paren-face"; - version = "20160521.955"; + version = "20160521.755"; src = fetchFromGitHub { owner = "tarsius"; repo = "paren-face"; @@ -46295,7 +46655,7 @@ parent-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "parent-mode"; - version = "20150824.1800"; + version = "20150824.1600"; src = fetchFromGitHub { owner = "Fanael"; repo = "parent-mode"; @@ -46316,7 +46676,7 @@ parse-csv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "parse-csv"; - version = "20160512.1223"; + version = "20160512.1023"; src = fetchFromGitHub { owner = "mrc"; repo = "el-csv"; @@ -46337,7 +46697,7 @@ parsebib = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "parsebib"; - version = "20151006.432"; + version = "20151006.232"; src = fetchFromGitHub { owner = "joostkremers"; repo = "parsebib"; @@ -46355,10 +46715,31 @@ license = lib.licenses.free; }; }) {}; + parsec = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "parsec"; + version = "20160714.1524"; + src = fetchFromGitHub { + owner = "cute-jumper"; + repo = "parsec.el"; + rev = "311a5cab7dc43c34e415922d74ccdf333edef95b"; + sha256 = "1ccp1gq6z42hfyia5yw3wy5laqi3cd86pw0lnql3j6l9gvc81gw9"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/248aaf5ff9c98cd3e439d0a26611cdefe6b6c32a/recipes/parsec"; + sha256 = "1p3364sv5r868xjj1411xqj4acxqmbzcdl900sd03585ql5wbypj"; + name = "parsec"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/parsec"; + license = lib.licenses.free; + }; + }) {}; pass = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store }: melpaBuild { pname = "pass"; - version = "20160214.435"; + version = "20160214.235"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "pass"; @@ -46379,7 +46760,7 @@ passthword = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "passthword"; - version = "20141201.323"; + version = "20141201.123"; src = fetchFromGitHub { owner = "pidu"; repo = "passthword"; @@ -46400,7 +46781,7 @@ password-generator = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "password-generator"; - version = "20150222.1440"; + version = "20150222.1240"; src = fetchFromGitHub { owner = "zargener"; repo = "emacs-password-genarator"; @@ -46421,7 +46802,7 @@ password-store = callPackage ({ f, fetchgit, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "password-store"; - version = "20151027.1649"; + version = "20151027.1449"; src = fetchgit { url = "http://git.zx2c4.com/password-store"; rev = "0b2f803fe61992af02b8820c400984b1f615a299"; @@ -46441,7 +46822,7 @@ password-vault = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "password-vault"; - version = "20160126.1220"; + version = "20160126.1020"; src = fetchFromGitHub { owner = "PuercoPop"; repo = "password-vault"; @@ -46462,7 +46843,7 @@ pastebin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pastebin"; - version = "20101125.1402"; + version = "20101125.1202"; src = fetchFromGitHub { owner = "nicferrier"; repo = "elpastebin"; @@ -46483,7 +46864,7 @@ pastehub = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pastehub"; - version = "20140615.120"; + version = "20140614.2320"; src = fetchFromGitHub { owner = "kiyoka"; repo = "pastehub"; @@ -46504,7 +46885,7 @@ pastelmac-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pastelmac-theme"; - version = "20151030.2136"; + version = "20151030.1936"; src = fetchFromGitHub { owner = "bmastenbrook"; repo = "pastelmac-theme-el"; @@ -46525,7 +46906,7 @@ pastels-on-dark-theme = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pastels-on-dark-theme"; - version = "20120304.1222"; + version = "20120304.1022"; src = fetchgit { url = "https://gist.github.com/1974259.git"; rev = "854839a0b4bf8c3f6a7d947926bf41d690547002"; @@ -46545,7 +46926,7 @@ path-headerline-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "path-headerline-mode"; - version = "20140423.832"; + version = "20140423.632"; src = fetchFromGitHub { owner = "7696122"; repo = "path-headerline-mode"; @@ -46566,7 +46947,7 @@ pathify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pathify"; - version = "20160423.346"; + version = "20160423.146"; src = fetchFromGitHub { owner = "alezost"; repo = "pathify.el"; @@ -46587,7 +46968,7 @@ paxedit = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }: melpaBuild { pname = "paxedit"; - version = "20160702.1733"; + version = "20160702.1533"; src = fetchFromGitHub { owner = "promethial"; repo = "paxedit"; @@ -46608,7 +46989,7 @@ pbcopy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pbcopy"; - version = "20150224.2259"; + version = "20150224.2059"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "pbcopy.el"; @@ -46629,7 +47010,7 @@ pc-bufsw = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pc-bufsw"; - version = "20150923.213"; + version = "20150923.13"; src = fetchFromGitHub { owner = "ibukanov"; repo = "pc-bufsw"; @@ -46650,12 +47031,12 @@ pcache = callPackage ({ eieio ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pcache"; - version = "20160624.936"; + version = "20160724.1929"; src = fetchFromGitHub { owner = "sigma"; repo = "pcache"; - rev = "c86d94c6153cec6fde84fed387daeca2bb156d0a"; - sha256 = "0pw5922fcqxppcal4ks9w83jxinh0xhlbss532cdsiwfl5icgdqp"; + rev = "7f441f69bd5ed6cb6c2a86f59f48f4960174c71f"; + sha256 = "0j1p2jr475jkkxcsqm1xpjxq5qrnl1xj1kdxyzhjkwr2dy3bqvas"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/pcache"; @@ -46671,7 +47052,7 @@ pcmpl-args = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pcmpl-args"; - version = "20120912.24"; + version = "20120911.2224"; src = fetchFromGitHub { owner = "JonWaltman"; repo = "pcmpl-args.el"; @@ -46692,7 +47073,7 @@ pcmpl-git = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pcmpl-git"; - version = "20160111.55"; + version = "20160110.2255"; src = fetchFromGitHub { owner = "leoliu"; repo = "pcmpl-git-el"; @@ -46713,12 +47094,12 @@ pcmpl-homebrew = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pcmpl-homebrew"; - version = "20160627.106"; + version = "20160725.1939"; src = fetchFromGitHub { owner = "hiddenlotus"; repo = "pcmpl-homebrew"; - rev = "de11211bdb75455da88d912f450da28eba89bb9c"; - sha256 = "0kb5c04xqwdgjczicik6zd739jv5r65ylizn4d04rqkwkki7nlrr"; + rev = "c202e7ba1e17661b659292f5382831c9ce40939e"; + sha256 = "00mj94jmp5izh6fqnp2g35ksjcr0r7fzjf9xnhglk1yfllg668rj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/pcmpl-homebrew"; @@ -46734,7 +47115,7 @@ pcmpl-pip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pcmpl-pip"; - version = "20141024.348"; + version = "20141024.148"; src = fetchFromGitHub { owner = "hiddenlotus"; repo = "pcmpl-pip"; @@ -46755,7 +47136,7 @@ pcomplete-extension = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pcomplete-extension"; - version = "20140604.1147"; + version = "20140604.947"; src = fetchFromGitHub { owner = "thierryvolpiatto"; repo = "pcomplete-extension"; @@ -46776,7 +47157,7 @@ pcre2el = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pcre2el"; - version = "20151213.434"; + version = "20151213.234"; src = fetchFromGitHub { owner = "joddie"; repo = "pcre2el"; @@ -46797,7 +47178,7 @@ pcsv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pcsv"; - version = "20150220.531"; + version = "20150220.331"; src = fetchFromGitHub { owner = "mhayashi1120"; repo = "Emacs-pcsv"; @@ -46818,7 +47199,7 @@ pdb-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pdb-mode"; - version = "20150128.1151"; + version = "20150128.951"; src = fetchFromGitHub { owner = "sixpi"; repo = "pdb-mode"; @@ -46839,7 +47220,7 @@ pdf-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, tablist }: melpaBuild { pname = "pdf-tools"; - version = "20160525.1120"; + version = "20160525.920"; src = fetchFromGitHub { owner = "politza"; repo = "pdf-tools"; @@ -46860,7 +47241,7 @@ peacock-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "peacock-theme"; - version = "20141116.102"; + version = "20141115.2302"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-peacock-theme"; @@ -46881,7 +47262,7 @@ peek-mode = callPackage ({ elnode, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "peek-mode"; - version = "20130620.1446"; + version = "20130620.1246"; src = fetchFromGitHub { owner = "erikriverson"; repo = "peek-mode"; @@ -46902,7 +47283,7 @@ peep-dired = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "peep-dired"; - version = "20160321.1737"; + version = "20160321.1537"; src = fetchFromGitHub { owner = "asok"; repo = "peep-dired"; @@ -46923,7 +47304,7 @@ peg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "peg"; - version = "20150708.141"; + version = "20150707.2341"; src = fetchFromGitHub { owner = "ellerh"; repo = "peg.el"; @@ -46944,7 +47325,7 @@ per-buffer-theme = callPackage ({ cl-lib ? null, fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "per-buffer-theme"; - version = "20160318.1701"; + version = "20160318.1501"; src = fetchhg { url = "https://bitbucket.com/inigoserna/per-buffer-theme.el"; rev = "9e6200da91b3"; @@ -46964,7 +47345,7 @@ perl-completion = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "perl-completion"; - version = "20090528.136"; + version = "20090527.2336"; src = fetchFromGitHub { owner = "imakado"; repo = "perl-completion"; @@ -46985,7 +47366,7 @@ perl6-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "perl6-mode"; - version = "20160616.908"; + version = "20160616.708"; src = fetchFromGitHub { owner = "hinrik"; repo = "perl6-mode"; @@ -47006,7 +47387,7 @@ perlbrew = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "perlbrew"; - version = "20130127.524"; + version = "20130127.324"; src = fetchFromGitHub { owner = "kentaro"; repo = "perlbrew.el"; @@ -47027,7 +47408,7 @@ persistent-overlays = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "persistent-overlays"; - version = "20160426.1421"; + version = "20160426.1221"; src = fetchFromGitHub { owner = "mneilly"; repo = "Emacs-Persistent-Overlays"; @@ -47048,7 +47429,7 @@ persistent-scratch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "persistent-scratch"; - version = "20160404.1115"; + version = "20160404.915"; src = fetchFromGitHub { owner = "Fanael"; repo = "persistent-scratch"; @@ -47069,7 +47450,7 @@ persistent-soft = callPackage ({ fetchFromGitHub, fetchurl, lib, list-utils, melpaBuild, pcache }: melpaBuild { pname = "persistent-soft"; - version = "20150223.1253"; + version = "20150223.1053"; src = fetchFromGitHub { owner = "rolandwalker"; repo = "persistent-soft"; @@ -47090,12 +47471,12 @@ persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "persp-mode"; - version = "20160630.331"; + version = "20160724.1220"; src = fetchFromGitHub { owner = "Bad-ptr"; repo = "persp-mode.el"; - rev = "d14ed14a40cac21477c1617834ab23b27ed182ab"; - sha256 = "1330nfvx48mlyysaq6xad3pycv6qsry6hnnacyc5b3q0l73m8jrp"; + rev = "2346982e2d181977a9cf189a7f446eddf07a6397"; + sha256 = "0a27kxfwamcvi0vn8hjr1qaq2cihbb7hmpla9p84y73g1mki1zr8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode"; @@ -47111,12 +47492,12 @@ persp-projectile = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, perspective, projectile }: melpaBuild { pname = "persp-projectile"; - version = "20151220.630"; + version = "20160709.2317"; src = fetchFromGitHub { owner = "bbatsov"; repo = "persp-projectile"; - rev = "83e03b1284ea36f37a24571abd6442a267408360"; - sha256 = "0b9hz253m6d58dwsjsk9d1fw0ql33m9wfvyx10ncsqbr0j0s98k5"; + rev = "7686633acf44402fa90429759cca6a155e4df2b9"; + sha256 = "0rqyzsmg32sdr4k9i2lf3jfyr9bskkl7gfb5ndl16iip9py7403z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc4e3a5af7ba86d277c73a1966a91c87d3d855a/recipes/persp-projectile"; @@ -47132,7 +47513,7 @@ perspective = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "perspective"; - version = "20160609.1644"; + version = "20160609.1444"; src = fetchFromGitHub { owner = "nex3"; repo = "perspective-el"; @@ -47153,7 +47534,7 @@ pg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pg"; - version = "20130731.1642"; + version = "20130731.1442"; src = fetchFromGitHub { owner = "cbbrowne"; repo = "pg.el"; @@ -47174,7 +47555,7 @@ pgdevenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pgdevenv"; - version = "20150105.1636"; + version = "20150105.1436"; src = fetchFromGitHub { owner = "dimitri"; repo = "pgdevenv-el"; @@ -47195,7 +47576,7 @@ ph = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ph"; - version = "20130312.1337"; + version = "20130312.1137"; src = fetchFromGitHub { owner = "gromnitsky"; repo = "ph"; @@ -47216,7 +47597,7 @@ phabricator = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, s }: melpaBuild { pname = "phabricator"; - version = "20160510.925"; + version = "20160510.725"; src = fetchFromGitHub { owner = "ajtulloch"; repo = "phabricator.el"; @@ -47237,7 +47618,7 @@ phi-autopair = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }: melpaBuild { pname = "phi-autopair"; - version = "20150527.423"; + version = "20150527.223"; src = fetchFromGitHub { owner = "zk-phi"; repo = "phi-autopair"; @@ -47258,7 +47639,7 @@ phi-grep = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "phi-grep"; - version = "20150212.924"; + version = "20150212.724"; src = fetchFromGitHub { owner = "zk-phi"; repo = "phi-grep"; @@ -47279,7 +47660,7 @@ phi-rectangle = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "phi-rectangle"; - version = "20151208.54"; + version = "20151207.2254"; src = fetchFromGitHub { owner = "zk-phi"; repo = "phi-rectangle"; @@ -47300,7 +47681,7 @@ phi-search = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "phi-search"; - version = "20150807.312"; + version = "20150807.112"; src = fetchFromGitHub { owner = "zk-phi"; repo = "phi-search"; @@ -47321,7 +47702,7 @@ phi-search-dired = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, phi-search }: melpaBuild { pname = "phi-search-dired"; - version = "20150405.214"; + version = "20150405.14"; src = fetchFromGitHub { owner = "zk-phi"; repo = "phi-search-dired"; @@ -47342,7 +47723,7 @@ phi-search-mc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors, phi-search }: melpaBuild { pname = "phi-search-mc"; - version = "20160324.1003"; + version = "20160324.803"; src = fetchFromGitHub { owner = "knu"; repo = "phi-search-mc.el"; @@ -47363,7 +47744,7 @@ phi-search-migemo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, migemo, phi-search }: melpaBuild { pname = "phi-search-migemo"; - version = "20150116.706"; + version = "20150116.506"; src = fetchFromGitHub { owner = "zk-phi"; repo = "phi-search-migemo"; @@ -47384,7 +47765,7 @@ phoenix-dark-mono-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "phoenix-dark-mono-theme"; - version = "20130306.1415"; + version = "20130306.1215"; src = fetchFromGitHub { owner = "j0ni"; repo = "phoenix-dark-mono"; @@ -47405,7 +47786,7 @@ phoenix-dark-pink-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "phoenix-dark-pink-theme"; - version = "20150406.2202"; + version = "20150406.2002"; src = fetchFromGitHub { owner = "j0ni"; repo = "phoenix-dark-pink"; @@ -47426,7 +47807,7 @@ php-auto-yasnippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, yasnippet }: melpaBuild { pname = "php-auto-yasnippets"; - version = "20141128.1611"; + version = "20141128.1411"; src = fetchFromGitHub { owner = "ejmr"; repo = "php-auto-yasnippets"; @@ -47447,7 +47828,7 @@ php-boris = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "php-boris"; - version = "20130527.321"; + version = "20130527.121"; src = fetchFromGitHub { owner = "tomterl"; repo = "php-boris"; @@ -47468,7 +47849,7 @@ php-boris-minor-mode = callPackage ({ fetchFromGitHub, fetchurl, highlight, lib, melpaBuild, php-boris }: melpaBuild { pname = "php-boris-minor-mode"; - version = "20140209.1235"; + version = "20140209.1035"; src = fetchFromGitHub { owner = "steckerhalter"; repo = "php-boris-minor-mode"; @@ -47489,7 +47870,7 @@ php-eldoc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "php-eldoc"; - version = "20140202.1341"; + version = "20140202.1141"; src = fetchFromGitHub { owner = "sabof"; repo = "php-eldoc"; @@ -47510,12 +47891,12 @@ php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "php-mode"; - version = "20160605.1733"; + version = "20160605.1533"; src = fetchFromGitHub { owner = "ejmr"; repo = "php-mode"; - rev = "f7b00745ee8a88babdeb06aa8b9c8e7e966de1dc"; - sha256 = "1nzdanxnlm6yapi77x9iq4xpyvpw78cybzl6i1sf215p8lnm95rs"; + rev = "fd2db3c259dce7ca3d0dad35ff2863e73b5e720b"; + sha256 = "0kqlcgmdii81x6d1ya9q5dipbmrbnbnjjgrlcfc918w5bnpmaiqp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode"; @@ -47531,7 +47912,7 @@ php-plus--mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "php-plus--mode"; - version = "20121129.1452"; + version = "20121129.1252"; src = fetchFromGitHub { owner = "echosa"; repo = "phpplus-mode"; @@ -47552,7 +47933,7 @@ php-refactor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "php-refactor-mode"; - version = "20160417.1646"; + version = "20160417.1446"; src = fetchFromGitHub { owner = "keelerm84"; repo = "php-refactor-mode.el"; @@ -47570,10 +47951,31 @@ license = lib.licenses.free; }; }) {}; + php-scratch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, s }: + melpaBuild { + pname = "php-scratch"; + version = "20160724.200"; + src = fetchFromGitHub { + owner = "mallt"; + repo = "php-scratch"; + rev = "581e9421f35ca6871372dbd5aa70c901b9b24b38"; + sha256 = "01lg779q3shmsxc1y6r56m42rmygjsqn5qsxqciphyx45wwnc5n3"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/68336364f6956325a2e03194d7db30747ab7f80c/recipes/php-scratch"; + sha256 = "1qlfrmva58jf6c04whn9dshz15wv53pyq60wxv9f3c9bl88ws0nv"; + name = "php-scratch"; + }; + packageRequires = [ emacs php-mode s ]; + meta = { + homepage = "https://melpa.org/#/php-scratch"; + license = lib.licenses.free; + }; + }) {}; phpcbf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "phpcbf"; - version = "20150302.728"; + version = "20150302.528"; src = fetchFromGitHub { owner = "nishimaki10"; repo = "emacs-phpcbf"; @@ -47594,7 +47996,7 @@ phpunit = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }: melpaBuild { pname = "phpunit"; - version = "20160531.927"; + version = "20160531.727"; src = fetchFromGitHub { owner = "nlamirault"; repo = "phpunit.el"; @@ -47615,7 +48017,7 @@ pianobar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pianobar"; - version = "20120128.1501"; + version = "20120128.1301"; src = fetchFromGitHub { owner = "agrif"; repo = "pianobar.el"; @@ -47636,7 +48038,7 @@ picolisp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "picolisp-mode"; - version = "20150516.355"; + version = "20150516.155"; src = fetchFromGitHub { owner = "flexibeast"; repo = "picolisp-mode"; @@ -47657,7 +48059,7 @@ pig-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pig-mode"; - version = "20140617.1258"; + version = "20140617.1058"; src = fetchFromGitHub { owner = "motus"; repo = "pig-mode"; @@ -47678,7 +48080,7 @@ pig-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "pig-snippets"; - version = "20130913.124"; + version = "20130912.2324"; src = fetchFromGitHub { owner = "motus"; repo = "pig-mode"; @@ -47699,7 +48101,7 @@ pillar = callPackage ({ fetchFromGitHub, fetchurl, lib, makey, melpaBuild }: melpaBuild { pname = "pillar"; - version = "20141112.1211"; + version = "20141112.1011"; src = fetchFromGitHub { owner = "pillar-markup"; repo = "pillar-mode"; @@ -47720,7 +48122,7 @@ pinboard-api = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pinboard-api"; - version = "20140324.648"; + version = "20140324.448"; src = fetchFromGitHub { owner = "danieroux"; repo = "pinboard-api-el"; @@ -47741,7 +48143,7 @@ pinot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pinot"; - version = "20140211.1426"; + version = "20140211.1226"; src = fetchFromGitHub { owner = "tkf"; repo = "emacs-pinot-search"; @@ -47762,7 +48164,7 @@ pinyin-search = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pinyinlib }: melpaBuild { pname = "pinyin-search"; - version = "20160514.2258"; + version = "20160514.2058"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "pinyin-search.el"; @@ -47783,7 +48185,7 @@ pinyinlib = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pinyinlib"; - version = "20160505.1448"; + version = "20160505.1248"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "pinyinlib.el"; @@ -47804,7 +48206,7 @@ pip-requirements = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pip-requirements"; - version = "20160131.1126"; + version = "20160131.926"; src = fetchFromGitHub { owner = "Wilfred"; repo = "pip-requirements.el"; @@ -47825,7 +48227,7 @@ pivotal-tracker = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pivotal-tracker"; - version = "20151203.1350"; + version = "20151203.1150"; src = fetchFromGitHub { owner = "jxa"; repo = "pivotal-tracker"; @@ -47846,7 +48248,7 @@ pixie-mode = callPackage ({ clojure-mode, fetchFromGitHub, fetchurl, inf-clojure, lib, melpaBuild }: melpaBuild { pname = "pixie-mode"; - version = "20150121.2324"; + version = "20150121.2124"; src = fetchFromGitHub { owner = "johnwalker"; repo = "pixie-mode"; @@ -47867,7 +48269,7 @@ pixiv-novel-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pixiv-novel-mode"; - version = "20160220.821"; + version = "20160220.621"; src = fetchFromGitHub { owner = "zonuexe"; repo = "pixiv-novel-mode.el"; @@ -47888,7 +48290,7 @@ pkg-info = callPackage ({ epl, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pkg-info"; - version = "20150517.643"; + version = "20150517.443"; src = fetchFromGitHub { owner = "lunaryorn"; repo = "pkg-info.el"; @@ -47909,7 +48311,7 @@ pkgbuild-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pkgbuild-mode"; - version = "20151010.936"; + version = "20151010.736"; src = fetchFromGitHub { owner = "juergenhoetzel"; repo = "pkgbuild-mode"; @@ -47930,7 +48332,7 @@ plan9-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "plan9-theme"; - version = "20160620.309"; + version = "20160620.109"; src = fetchFromGitHub { owner = "john2x"; repo = "plan9-theme.el"; @@ -47951,7 +48353,7 @@ planet-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "planet-theme"; - version = "20160425.2258"; + version = "20160425.2058"; src = fetchFromGitHub { owner = "cmack"; repo = "emacs-planet-theme"; @@ -47972,7 +48374,7 @@ plantuml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "plantuml-mode"; - version = "20150601.131"; + version = "20150531.2331"; src = fetchFromGitHub { owner = "zwz"; repo = "plantuml-mode"; @@ -47993,7 +48395,7 @@ platformio-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "platformio-mode"; - version = "20160327.2020"; + version = "20160327.1820"; src = fetchFromGitHub { owner = "ZachMassia"; repo = "PlatformIO-Mode"; @@ -48014,7 +48416,7 @@ play-routes-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "play-routes-mode"; - version = "20160615.2253"; + version = "20160615.2053"; src = fetchFromGitHub { owner = "brocode"; repo = "play-routes-mode"; @@ -48035,7 +48437,7 @@ plenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "plenv"; - version = "20130707.116"; + version = "20130706.2316"; src = fetchFromGitHub { owner = "karupanerura"; repo = "plenv.el"; @@ -48056,7 +48458,7 @@ plim-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "plim-mode"; - version = "20140812.1913"; + version = "20140812.1713"; src = fetchFromGitHub { owner = "dongweiming"; repo = "plim-mode"; @@ -48077,7 +48479,7 @@ plsense = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }: melpaBuild { pname = "plsense"; - version = "20151104.845"; + version = "20151104.645"; src = fetchFromGitHub { owner = "aki2o"; repo = "emacs-plsense"; @@ -48098,7 +48500,7 @@ plsense-direx = callPackage ({ direx, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, plsense, yaxception }: melpaBuild { pname = "plsense-direx"; - version = "20140520.1508"; + version = "20140520.1308"; src = fetchFromGitHub { owner = "aki2o"; repo = "plsense-direx"; @@ -48118,7 +48520,7 @@ }) {}; plsql = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "plsql"; - version = "20121115.443"; + version = "20121115.243"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/plsql.el"; sha256 = "1v0wvy9fd1qq3aq83x5jv3953n0n51x7y2r2ql11j0h8xasy42p1"; @@ -48137,7 +48539,7 @@ plur = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "plur"; - version = "20160504.424"; + version = "20160504.224"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "plur"; @@ -48157,7 +48559,7 @@ }) {}; pmdm = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pmdm"; - version = "20151109.1236"; + version = "20151109.1036"; src = fetchhg { url = "https://bitbucket.com/inigoserna/pmdm.el"; rev = "f50a54774156"; @@ -48177,7 +48579,7 @@ pocket-api = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "pocket-api"; - version = "20160530.938"; + version = "20160530.738"; src = fetchFromGitHub { owner = "lujun9972"; repo = "pocket-api.el"; @@ -48198,7 +48600,7 @@ point-stack = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "point-stack"; - version = "20141225.2310"; + version = "20141225.2110"; src = fetchFromGitHub { owner = "dgutov"; repo = "point-stack"; @@ -48218,7 +48620,7 @@ }) {}; point-undo = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "point-undo"; - version = "20100504.329"; + version = "20100504.129"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/point-undo.el"; sha256 = "13c1iw77ccvrfrv4lyljg8fpm7xqhnv29yzvig8wr8b5j2vsd8bz"; @@ -48237,7 +48639,7 @@ pointback = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pointback"; - version = "20100210.952"; + version = "20100210.752"; src = fetchFromGitHub { owner = "emacsorphanage"; repo = "pointback"; @@ -48258,7 +48660,7 @@ polymode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "polymode"; - version = "20160625.957"; + version = "20160625.757"; src = fetchFromGitHub { owner = "vspinu"; repo = "polymode"; @@ -48279,7 +48681,7 @@ pomodoro = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pomodoro"; - version = "20150716.1246"; + version = "20150716.1046"; src = fetchFromGitHub { owner = "baudtack"; repo = "pomodoro.el"; @@ -48300,7 +48702,7 @@ pony-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pony-mode"; - version = "20151028.502"; + version = "20151028.302"; src = fetchFromGitHub { owner = "davidmiller"; repo = "pony-mode"; @@ -48321,7 +48723,7 @@ pony-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "pony-snippets"; - version = "20160204.2211"; + version = "20160204.2011"; src = fetchFromGitHub { owner = "SeanTAllen"; repo = "pony-snippets"; @@ -48342,7 +48744,7 @@ ponylang-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ponylang-mode"; - version = "20160527.741"; + version = "20160527.541"; src = fetchFromGitHub { owner = "SeanTAllen"; repo = "ponylang-mode"; @@ -48363,7 +48765,7 @@ pophint = callPackage ({ fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, popup, yaxception }: melpaBuild { pname = "pophint"; - version = "20150930.1234"; + version = "20150930.1034"; src = fetchFromGitHub { owner = "aki2o"; repo = "emacs-pophint"; @@ -48384,7 +48786,7 @@ poporg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "poporg"; - version = "20150603.2047"; + version = "20150603.1847"; src = fetchFromGitHub { owner = "QBobWatson"; repo = "poporg"; @@ -48405,12 +48807,12 @@ popup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "popup"; - version = "20160531.625"; + version = "20160709.729"; src = fetchFromGitHub { owner = "auto-complete"; repo = "popup-el"; - rev = "441ee40515038de3680768930157fce667ba872a"; - sha256 = "1h1l0wh3i1ih30455l5b73w8d3pvd0p1ib0mn5i671iwk2hyxc12"; + rev = "80829dd46381754639fb764da11c67235fe63282"; + sha256 = "05j7m6mqp6hr6225blsipnp2qcncwl09f52niya5334ibqzbvvlk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/083fb071191bccd6feb3fb84569373a597440fb1/recipes/popup"; @@ -48426,7 +48828,7 @@ popup-complete = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "popup-complete"; - version = "20141108.2108"; + version = "20141108.1908"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-popup-complete"; @@ -48447,7 +48849,7 @@ popup-imenu = callPackage ({ dash, fetchFromGitHub, fetchurl, flx-ido, lib, melpaBuild, popup }: melpaBuild { pname = "popup-imenu"; - version = "20160409.710"; + version = "20160409.510"; src = fetchFromGitHub { owner = "ancane"; repo = "popup-imenu"; @@ -48468,7 +48870,7 @@ popup-kill-ring = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip }: melpaBuild { pname = "popup-kill-ring"; - version = "20131020.1354"; + version = "20131020.1154"; src = fetchFromGitHub { owner = "waymondo"; repo = "popup-kill-ring"; @@ -48489,7 +48891,7 @@ popup-switcher = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "popup-switcher"; - version = "20160622.1224"; + version = "20160622.1024"; src = fetchFromGitHub { owner = "kostafey"; repo = "popup-switcher"; @@ -48510,7 +48912,7 @@ popwin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "popwin"; - version = "20150315.800"; + version = "20150315.600"; src = fetchFromGitHub { owner = "m2ym"; repo = "popwin-el"; @@ -48531,7 +48933,7 @@ portage-navi = callPackage ({ concurrent, ctable, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "portage-navi"; - version = "20141208.755"; + version = "20141208.555"; src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-portage-navi"; @@ -48552,7 +48954,7 @@ pos-tip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pos-tip"; - version = "20150318.1013"; + version = "20150318.813"; src = fetchFromGitHub { owner = "pitkali"; repo = "pos-tip"; @@ -48573,7 +48975,7 @@ pov-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pov-mode"; - version = "20120825.916"; + version = "20120825.716"; src = fetchFromGitHub { owner = "melmothx"; repo = "pov-mode"; @@ -48594,7 +48996,7 @@ pow = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pow"; - version = "20140420.306"; + version = "20140420.106"; src = fetchFromGitHub { owner = "yukihr"; repo = "emacs-pow"; @@ -48615,7 +49017,7 @@ powerline = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "powerline"; - version = "20160702.2131"; + version = "20160702.1931"; src = fetchFromGitHub { owner = "milkypostman"; repo = "powerline"; @@ -48636,7 +49038,7 @@ powerline-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }: melpaBuild { pname = "powerline-evil"; - version = "20151112.910"; + version = "20151112.710"; src = fetchFromGitHub { owner = "raugturi"; repo = "powerline-evil"; @@ -48657,7 +49059,7 @@ powershell = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "powershell"; - version = "20160210.2058"; + version = "20160210.1858"; src = fetchFromGitHub { owner = "jschaf"; repo = "powershell.el"; @@ -48677,7 +49079,7 @@ }) {}; pp-c-l = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "pp-c-l"; - version = "20151231.1747"; + version = "20151231.1547"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/pp-c-l.el"; sha256 = "10gsdjdr8qngimqh57qxcljjnypbf38asxqb3zlfwc2ls52fc19q"; @@ -48695,7 +49097,7 @@ }) {}; pp-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "pp-plus"; - version = "20160523.1639"; + version = "20160523.1439"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/pp+.el"; sha256 = "0yvls8sw5rvka20xlqazl46crpkw91cy9qmj6p6y53sps1rj5wzp"; @@ -48714,7 +49116,7 @@ ppd-sr-speedbar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, project-persist-drawer, sr-speedbar }: melpaBuild { pname = "ppd-sr-speedbar"; - version = "20151108.624"; + version = "20151108.424"; src = fetchFromGitHub { owner = "rdallasgray"; repo = "ppd-sr-speedbar"; @@ -48735,7 +49137,7 @@ preproc-font-lock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "preproc-font-lock"; - version = "20151107.1418"; + version = "20151107.1218"; src = fetchFromGitHub { owner = "Lindydancer"; repo = "preproc-font-lock"; @@ -48756,7 +49158,7 @@ preseed-generic-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "preseed-generic-mode"; - version = "20150119.1441"; + version = "20150119.1241"; src = fetchFromGitHub { owner = "suntong"; repo = "preseed-generic-mode"; @@ -48777,7 +49179,7 @@ prettify-greek = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "prettify-greek"; - version = "20160603.408"; + version = "20160603.208"; src = fetchFromGitLab { owner = "fommil"; repo = "emacs-prettify-greek"; @@ -48797,7 +49199,7 @@ }) {}; pretty-lambdada = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "pretty-lambdada"; - version = "20151231.1748"; + version = "20151231.1548"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/pretty-lambdada.el"; sha256 = "1fn24399wsn12453py0hw2vbbkrkakiwi06cjvjzsdk7g3326ma4"; @@ -48816,7 +49218,7 @@ pretty-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pretty-mode"; - version = "20160614.1346"; + version = "20160614.1146"; src = fetchFromGitHub { owner = "akatov"; repo = "pretty-mode"; @@ -48837,7 +49239,7 @@ pretty-sha-path = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pretty-sha-path"; - version = "20141105.1226"; + version = "20141105.1026"; src = fetchFromGitHub { owner = "alezost"; repo = "pretty-sha-path.el"; @@ -48858,7 +49260,7 @@ pretty-symbols = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pretty-symbols"; - version = "20140814.459"; + version = "20140814.259"; src = fetchFromGitHub { owner = "drothlis"; repo = "pretty-symbols"; @@ -48879,7 +49281,7 @@ private = callPackage ({ aes, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "private"; - version = "20150121.1957"; + version = "20150121.1757"; src = fetchFromGitHub { owner = "cheunghy"; repo = "private"; @@ -48900,7 +49302,7 @@ private-diary = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "private-diary"; - version = "20151216.1057"; + version = "20151216.857"; src = fetchFromGitHub { owner = "cacology"; repo = "private-diary"; @@ -48921,7 +49323,7 @@ proc-net = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "proc-net"; - version = "20130321.1912"; + version = "20130321.1712"; src = fetchFromGitHub { owner = "nicferrier"; repo = "emacs-proc-net"; @@ -48942,7 +49344,7 @@ processing-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "processing-mode"; - version = "20150217.632"; + version = "20150217.432"; src = fetchFromGitHub { owner = "ptrv"; repo = "processing2-emacs"; @@ -48963,7 +49365,7 @@ processing-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "processing-snippets"; - version = "20140426.928"; + version = "20140426.728"; src = fetchFromGitHub { owner = "ptrv"; repo = "processing2-emacs"; @@ -48984,7 +49386,7 @@ prodigy = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "prodigy"; - version = "20160429.154"; + version = "20160428.2354"; src = fetchFromGitHub { owner = "rejeep"; repo = "prodigy.el"; @@ -49005,7 +49407,7 @@ professional-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "professional-theme"; - version = "20150315.600"; + version = "20150315.400"; src = fetchFromGitHub { owner = "juanjux"; repo = "emacs-professional-theme"; @@ -49026,7 +49428,7 @@ prognth = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "prognth"; - version = "20130920.1259"; + version = "20130920.1059"; src = fetchFromGitHub { owner = "Fuco1"; repo = "prognth"; @@ -49047,7 +49449,7 @@ programmer-dvorak = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "programmer-dvorak"; - version = "20150426.2037"; + version = "20150426.1837"; src = fetchFromGitHub { owner = "yangchenyun"; repo = "programmer-dvorak"; @@ -49068,7 +49470,7 @@ project-explorer = callPackage ({ cl-lib ? null, emacs, es-lib, es-windows, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "project-explorer"; - version = "20150503.1914"; + version = "20150503.1714"; src = fetchFromGitHub { owner = "sabof"; repo = "project-explorer"; @@ -49089,7 +49491,7 @@ project-local-variables = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "project-local-variables"; - version = "20080502.1152"; + version = "20080502.952"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/project-local-variables.el"; sha256 = "1bb5b6hxg3gvwf0sqwkd97nnipsmr60py0rnsfhgvizn4cj3khhw"; @@ -49108,7 +49510,7 @@ project-persist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "project-persist"; - version = "20150519.1524"; + version = "20150519.1324"; src = fetchFromGitHub { owner = "rdallasgray"; repo = "project-persist"; @@ -49129,7 +49531,7 @@ project-persist-drawer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, project-persist }: melpaBuild { pname = "project-persist-drawer"; - version = "20151108.622"; + version = "20151108.422"; src = fetchFromGitHub { owner = "rdallasgray"; repo = "project-persist-drawer"; @@ -49150,7 +49552,7 @@ project-root = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "project-root"; - version = "20110206.1430"; + version = "20110206.1230"; src = fetchhg { url = "https://bitbucket.com/piranha/project-root"; rev = "fcd9df2eadca"; @@ -49170,12 +49572,12 @@ projectile = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "projectile"; - version = "20160630.159"; + version = "20160723.622"; src = fetchFromGitHub { owner = "bbatsov"; repo = "projectile"; - rev = "bcc7b3c4728c868fce7282023156ac413cde15b0"; - sha256 = "03vx6333yzyk4ix3xd8qy6b7lyjj91g710q4m72v1vx1qadq7b4m"; + rev = "b01c5b97d895f942e104057322f912744799b440"; + sha256 = "02x5qa8n537g87lwwwi80p8y2mzgff3mhzd2brzcj7s905awxi9j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile"; @@ -49191,7 +49593,7 @@ projectile-codesearch = callPackage ({ codesearch, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "projectile-codesearch"; - version = "20151228.220"; + version = "20151228.20"; src = fetchFromGitHub { owner = "abingham"; repo = "codesearch.el"; @@ -49212,7 +49614,7 @@ projectile-direnv = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, s }: melpaBuild { pname = "projectile-direnv"; - version = "20160305.1938"; + version = "20160305.1738"; src = fetchFromGitHub { owner = "christianromney"; repo = "projectile-direnv"; @@ -49233,7 +49635,7 @@ projectile-hanami = callPackage ({ emacs, fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild, projectile, rake }: melpaBuild { pname = "projectile-hanami"; - version = "20160505.811"; + version = "20160505.611"; src = fetchFromGitHub { owner = "avdgaag"; repo = "projectile-hanami"; @@ -49254,7 +49656,7 @@ projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }: melpaBuild { pname = "projectile-rails"; - version = "20160627.1529"; + version = "20160627.1329"; src = fetchFromGitHub { owner = "asok"; repo = "projectile-rails"; @@ -49275,7 +49677,7 @@ projectile-sift = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, sift }: melpaBuild { pname = "projectile-sift"; - version = "20160107.415"; + version = "20160107.215"; src = fetchFromGitHub { owner = "nlamirault"; repo = "sift.el"; @@ -49296,7 +49698,7 @@ projectile-speedbar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, sr-speedbar }: melpaBuild { pname = "projectile-speedbar"; - version = "20160630.1147"; + version = "20160630.947"; src = fetchFromGitHub { owner = "anshulverma"; repo = "projectile-speedbar"; @@ -49317,7 +49719,7 @@ projector = callPackage ({ alert, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "projector"; - version = "20160617.1514"; + version = "20160617.1314"; src = fetchFromGitHub { owner = "waymondo"; repo = "projector.el"; @@ -49338,7 +49740,7 @@ projekt = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "projekt"; - version = "20150324.348"; + version = "20150324.148"; src = fetchFromGitHub { owner = "tekai"; repo = "projekt"; @@ -49359,7 +49761,7 @@ projmake-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, indicators, lib, melpaBuild }: melpaBuild { pname = "projmake-mode"; - version = "20150619.1620"; + version = "20150619.1420"; src = fetchFromGitHub { owner = "ericbmerritt"; repo = "projmake-mode"; @@ -49380,7 +49782,7 @@ prompt-text = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "prompt-text"; - version = "20160106.809"; + version = "20160106.609"; src = fetchFromGitHub { owner = "10sr"; repo = "prompt-text-el"; @@ -49401,7 +49803,7 @@ prop-menu = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "prop-menu"; - version = "20150728.618"; + version = "20150728.418"; src = fetchFromGitHub { owner = "david-christiansen"; repo = "prop-menu-el"; @@ -49422,7 +49824,7 @@ propfont-mixed = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "propfont-mixed"; - version = "20150113.1611"; + version = "20150113.1411"; src = fetchFromGitHub { owner = "ikirill"; repo = "propfont-mixed"; @@ -49443,7 +49845,7 @@ prosjekt = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "prosjekt"; - version = "20151127.816"; + version = "20151127.616"; src = fetchFromGitHub { owner = "abingham"; repo = "prosjekt"; @@ -49464,12 +49866,12 @@ protobuf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "protobuf-mode"; - version = "20150521.2211"; + version = "20150521.2011"; src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "cae3b0cbb689d0ed1e5da73942a5a9705f3411b0"; - sha256 = "14rdyqn7hlznwjg7dcdirs3gb2i0xf19rzak98gvbifxb2s0w6m1"; + rev = "ba52f2b6780fa5e6bee86cf7e8ee6f6ba617862c"; + sha256 = "1ffgnfa44kgsncd7sz63kgqanj07yrcg2p38imwb7yczqlxf4siy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -49485,12 +49887,12 @@ psc-ide = callPackage ({ cl-lib ? null, company, dash, dash-functional, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "psc-ide"; - version = "20160624.1358"; + version = "20160720.1502"; src = fetchFromGitHub { owner = "epost"; repo = "psc-ide-emacs"; - rev = "6c61403ab1731e544690ebaed1d05b79df02ed8d"; - sha256 = "0ql1v1lmqzzgjlzwkvpg48kfi38sc8d9na6pd24pixiplkzpdwx8"; + rev = "78df84316807f0efc0f39450172cc2e2f17c9acd"; + sha256 = "0z725mmwkb9b9py65vfs3pkn8pqd39ayc84v56y49gsqd0krdqhf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8189f4e7d6742d72fb22acf61a9d7eb0bffb2d93/recipes/psc-ide"; @@ -49503,22 +49905,22 @@ license = lib.licenses.free; }; }) {}; - psci = callPackage ({ dash, deferred, f, fetchFromGitHub, fetchurl, lib, melpaBuild, purescript-mode, s }: + psci = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, purescript-mode, s }: melpaBuild { pname = "psci"; - version = "20150328.1401"; + version = "20160717.1125"; src = fetchFromGitHub { owner = "ardumont"; repo = "emacs-psci"; - rev = "64dc931b4fe2a7507b8ac81423b12f7dcda2067a"; - sha256 = "08j31bg5vwgirv5n5fsw7w6gncrkpwpjlj2m00dhj8wbvhp503sn"; + rev = "d773b407f772e6ab3c40406c22824889e0fd14fe"; + sha256 = "1kvw5qj975s7r58858aiql9861rglz1xgj9n69g5li9mcdxk0v2f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a0f45269895b8e061c972da46f932c96eb0f5279/recipes/psci"; sha256 = "0sgrz8byz2pcsad2pydinp4hh2xb48pdb03r93wg2vvyy8p15j9g"; name = "psci"; }; - packageRequires = [ dash deferred f purescript-mode s ]; + packageRequires = [ dash f purescript-mode s ]; meta = { homepage = "https://melpa.org/#/psci"; license = lib.licenses.free; @@ -49527,7 +49929,7 @@ psession = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "psession"; - version = "20160515.159"; + version = "20160514.2359"; src = fetchFromGitHub { owner = "thierryvolpiatto"; repo = "psession"; @@ -49548,7 +49950,7 @@ psvn = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "psvn"; - version = "20151103.1242"; + version = "20151103.1042"; src = fetchFromGitHub { owner = "emacsmirror"; repo = "psvn"; @@ -49569,12 +49971,12 @@ psysh = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "psysh"; - version = "20160610.1611"; + version = "20160711.1048"; src = fetchFromGitHub { owner = "zonuexe"; repo = "psysh.el"; - rev = "3a4479a0ca30524332dbb136d03acad713deaabc"; - sha256 = "1vx7psvqchrd3zyxrji8y0fpkrw0q2fc74g66jki5s46xvid0nai"; + rev = "6932f03447c3d821e4c03e99f1630928f0979452"; + sha256 = "00dssrdsdvwdg6a6fwl3wv0y94axcd4jb3b3ndd1p3bcr56fxq49"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b3131d9a0ad359f15bc3550868a12f02476449a/recipes/psysh"; @@ -49590,7 +49992,7 @@ pt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pt"; - version = "20160119.1017"; + version = "20160119.817"; src = fetchFromGitHub { owner = "bling"; repo = "pt.el"; @@ -49611,7 +50013,7 @@ pug-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pug-mode"; - version = "20160531.338"; + version = "20160531.138"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-pug-mode"; @@ -49629,22 +50031,22 @@ license = lib.licenses.free; }; }) {}; - puml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + puml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "puml-mode"; - version = "20160606.116"; + version = "20160719.36"; src = fetchFromGitHub { owner = "skuro"; repo = "puml-mode"; - rev = "f5ff58bb4f995f353899c878bb519349a7b4a08a"; - sha256 = "06gc27hgvc3n93ljv8bmblh305jghwg4afxc49rsgds4krrd2rl6"; + rev = "ae1cd8eb21d3af33bc60d4bfa39a90b8f49b7011"; + sha256 = "12csnmas5n0r356hwrqgx4lb72ns4mdbfkh5dw5jss377akv12gr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c0c28ccef208035fd0bdd648771825c1d10f42ff/recipes/puml-mode"; sha256 = "131ghjq6lsbhbx5hdg36swnkqijdb9bx6zg73hg0nw8qk0z742vn"; name = "puml-mode"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/puml-mode"; license = lib.licenses.free; @@ -49653,7 +50055,7 @@ punctuality-logger = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "punctuality-logger"; - version = "20141120.1431"; + version = "20141120.1231"; src = fetchFromGitLab { owner = "elzair"; repo = "punctuality-logger"; @@ -49674,7 +50076,7 @@ pungi = callPackage ({ fetchFromGitHub, fetchurl, jedi, lib, melpaBuild, pyvenv }: melpaBuild { pname = "pungi"; - version = "20150222.646"; + version = "20150222.446"; src = fetchFromGitHub { owner = "mgrbyte"; repo = "pungi"; @@ -49695,7 +50097,7 @@ punpun-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "punpun-theme"; - version = "20160527.430"; + version = "20160527.230"; src = fetchFromGitHub { owner = "wasamasa"; repo = "punpun-theme"; @@ -49716,7 +50118,7 @@ puppet-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "puppet-mode"; - version = "20160416.1136"; + version = "20160416.936"; src = fetchFromGitHub { owner = "lunaryorn"; repo = "puppet-mode"; @@ -49737,7 +50139,7 @@ purescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "purescript-mode"; - version = "20150316.2028"; + version = "20150316.1828"; src = fetchFromGitHub { owner = "dysinger"; repo = "purescript-mode"; @@ -49758,7 +50160,7 @@ purple-haze-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "purple-haze-theme"; - version = "20141014.2129"; + version = "20141014.1929"; src = fetchFromGitHub { owner = "jasonm23"; repo = "emacs-purple-haze-theme"; @@ -49779,7 +50181,7 @@ purty-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "purty-mode"; - version = "20131004.1759"; + version = "20131004.1559"; src = fetchFromGitHub { owner = "jcatw"; repo = "purty-mode"; @@ -49800,7 +50202,7 @@ pushbullet = callPackage ({ fetchFromGitHub, fetchurl, grapnel, json ? null, lib, melpaBuild }: melpaBuild { pname = "pushbullet"; - version = "20140809.732"; + version = "20140809.532"; src = fetchFromGitHub { owner = "theanalyst"; repo = "revolver"; @@ -49818,10 +50220,31 @@ license = lib.licenses.free; }; }) {}; + pushover = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "pushover"; + version = "20160718.857"; + src = fetchFromGitHub { + owner = "swflint"; + repo = "pushover.el"; + rev = "c43f149eaef832f6af399723a5a59424aa093aaa"; + sha256 = "0vrx8m7jcxavbfsyh35mf289vfyal0yrfl6h2m2yfx81whbinb5j"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c9f2e3a155266e7534b4e77138fdfba4fafe9bac/recipes/pushover"; + sha256 = "1ja3xp8nxzyhzg85791s4rb9rm938fyvgkdjxhyyy36wmda1djwr"; + name = "pushover"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/pushover"; + license = lib.licenses.free; + }; + }) {}; px = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "px"; - version = "20141006.748"; + version = "20141006.548"; src = fetchFromGitHub { owner = "aaptel"; repo = "preview-latex"; @@ -49842,7 +50265,7 @@ py-autopep8 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "py-autopep8"; - version = "20151231.814"; + version = "20151231.614"; src = fetchFromGitHub { owner = "paetzke"; repo = "py-autopep8.el"; @@ -49863,7 +50286,7 @@ py-gnitset = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "py-gnitset"; - version = "20140224.2210"; + version = "20140224.2010"; src = fetchFromGitHub { owner = "quodlibetor"; repo = "py-gnitset"; @@ -49884,7 +50307,7 @@ py-import-check = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "py-import-check"; - version = "20130802.611"; + version = "20130802.411"; src = fetchFromGitHub { owner = "psibi"; repo = "emacs-py-import-check"; @@ -49905,7 +50328,7 @@ py-isort = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "py-isort"; - version = "20150422.1039"; + version = "20150422.839"; src = fetchFromGitHub { owner = "paetzke"; repo = "py-isort.el"; @@ -49926,7 +50349,7 @@ py-smart-operator = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "py-smart-operator"; - version = "20150824.2110"; + version = "20150824.1910"; src = fetchFromGitHub { owner = "rmuslimov"; repo = "py-smart-operator"; @@ -49947,7 +50370,7 @@ py-test = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "py-test"; - version = "20151117.22"; + version = "20151116.2222"; src = fetchFromGitHub { owner = "Bogdanp"; repo = "py-test.el"; @@ -49968,7 +50391,7 @@ py-yapf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "py-yapf"; - version = "20160101.612"; + version = "20160101.412"; src = fetchFromGitHub { owner = "paetzke"; repo = "py-yapf.el"; @@ -49989,7 +50412,7 @@ pycarddavel = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "pycarddavel"; - version = "20150831.716"; + version = "20150831.516"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "pycarddavel"; @@ -50010,7 +50433,7 @@ pycoverage = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pycoverage"; - version = "20160324.2012"; + version = "20160324.1812"; src = fetchFromGitHub { owner = "mattharrison"; repo = "pycoverage.el"; @@ -50031,7 +50454,7 @@ pydoc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pydoc"; - version = "20160529.1839"; + version = "20160529.1639"; src = fetchFromGitHub { owner = "statmobile"; repo = "pydoc"; @@ -50052,7 +50475,7 @@ pydoc-info = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pydoc-info"; - version = "20110301.234"; + version = "20110301.34"; src = fetchhg { url = "https://bitbucket.com/jonwaltman/pydoc-info"; rev = "151d877c8fb8"; @@ -50072,7 +50495,7 @@ pyenv-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic }: melpaBuild { pname = "pyenv-mode"; - version = "20160221.1323"; + version = "20160221.1123"; src = fetchFromGitHub { owner = "proofit404"; repo = "pyenv-mode"; @@ -50093,7 +50516,7 @@ pyenv-mode-auto = callPackage ({ f, fetchFromGitHub, fetchurl, lib, melpaBuild, pyenv-mode, s }: melpaBuild { pname = "pyenv-mode-auto"; - version = "20160123.141"; + version = "20160122.2341"; src = fetchFromGitHub { owner = "ssbb"; repo = "pyenv-mode-auto"; @@ -50114,7 +50537,7 @@ pyfmt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pyfmt"; - version = "20150521.1556"; + version = "20150521.1356"; src = fetchFromGitHub { owner = "aheaume"; repo = "pyfmt.el"; @@ -50135,12 +50558,12 @@ pyimport = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "pyimport"; - version = "20160629.1310"; + version = "20160705.1444"; src = fetchFromGitHub { owner = "Wilfred"; repo = "pyimport"; - rev = "364a13289c3a2467711f57de27c8a36cc012196c"; - sha256 = "1q5rrpwd285m767al54q0aqbncb2p6c5kq4j344sfr1m8wk064mn"; + rev = "8b4c6ef8a79da35c847ad5581367012f6c4493ca"; + sha256 = "01gdzs2x2kdi7nwdcnp2iw8cbvzzqrsi9wqwc9wb4ny8ly4q75w6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/71bc39b06cee37814960ef31c6a2056261b802fb/recipes/pyimport"; @@ -50156,7 +50579,7 @@ pyimpsort = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pyimpsort"; - version = "20160129.2253"; + version = "20160129.2053"; src = fetchFromGitHub { owner = "emacs-pe"; repo = "pyimpsort.el"; @@ -50177,12 +50600,12 @@ pylint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pylint"; - version = "20160505.444"; + version = "20160715.211"; src = fetchFromGitHub { owner = "PyCQA"; repo = "pylint"; - rev = "e80778ae9c59efdd2e3421afba06df9cf4aa4cf4"; - sha256 = "0cj2lzcrp8i8dvwrb0aps3cmpppxy1vayy4481sppqm5wfl6nndd"; + rev = "67be95a25da3c720e449864ea61db4cb1dd91a81"; + sha256 = "0p0byb5wpbnli684wzvwz99mqdfxyg0r5fgi5zjcqj31hvavq1yi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint"; @@ -50198,7 +50621,7 @@ pytest = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "pytest"; - version = "20160330.847"; + version = "20160330.647"; src = fetchFromGitHub { owner = "ionrock"; repo = "pytest-el"; @@ -50219,7 +50642,7 @@ python-cell = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "python-cell"; - version = "20131029.1816"; + version = "20131029.1616"; src = fetchFromGitHub { owner = "thisch"; repo = "python-cell.el"; @@ -50240,7 +50663,7 @@ python-django = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "python-django"; - version = "20150821.2304"; + version = "20150821.2104"; src = fetchFromGitHub { owner = "fgallina"; repo = "python-django.el"; @@ -50261,7 +50684,7 @@ python-docstring = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "python-docstring"; - version = "20160509.515"; + version = "20160509.315"; src = fetchFromGitHub { owner = "glyph"; repo = "python-docstring-mode"; @@ -50282,7 +50705,7 @@ python-environment = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "python-environment"; - version = "20150310.353"; + version = "20150310.153"; src = fetchFromGitHub { owner = "tkf"; repo = "emacs-python-environment"; @@ -50303,7 +50726,7 @@ python-info = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "python-info"; - version = "20151228.1252"; + version = "20151228.1052"; src = fetchFromGitHub { owner = "Wilfred"; repo = "python-info"; @@ -50324,7 +50747,7 @@ python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "python-mode"; - version = "20160620.530"; + version = "20160620.330"; src = fetchFromGitLab { owner = "python-mode-devs"; repo = "python-mode"; @@ -50345,7 +50768,7 @@ python-test = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "python-test"; - version = "20160625.1620"; + version = "20160625.1420"; src = fetchFromGitHub { owner = "emacs-pe"; repo = "python-test.el"; @@ -50366,7 +50789,7 @@ python-x = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, folding, lib, melpaBuild, python ? null }: melpaBuild { pname = "python-x"; - version = "20160313.836"; + version = "20160313.636"; src = fetchFromGitHub { owner = "wavexx"; repo = "python-x.el"; @@ -50387,7 +50810,7 @@ pythonic = callPackage ({ cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "pythonic"; - version = "20160221.1323"; + version = "20160221.1123"; src = fetchFromGitHub { owner = "proofit404"; repo = "pythonic"; @@ -50408,7 +50831,7 @@ pyvenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pyvenv"; - version = "20160527.642"; + version = "20160527.442"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "pyvenv"; @@ -50429,7 +50852,7 @@ qiita = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, markdown-mode, melpaBuild }: melpaBuild { pname = "qiita"; - version = "20140118.244"; + version = "20140118.44"; src = fetchFromGitHub { owner = "gongo"; repo = "qiita-el"; @@ -50450,7 +50873,7 @@ qml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "qml-mode"; - version = "20160108.904"; + version = "20160108.704"; src = fetchFromGitHub { owner = "coldnew"; repo = "qml-mode"; @@ -50471,7 +50894,7 @@ quack = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "quack"; - version = "20160410.407"; + version = "20160410.207"; src = fetchFromGitHub { owner = "emacsmirror"; repo = "quack"; @@ -50492,7 +50915,7 @@ quasi-monochrome-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "quasi-monochrome-theme"; - version = "20150801.1525"; + version = "20150801.1325"; src = fetchFromGitHub { owner = "lbolla"; repo = "emacs-quasi-monochrome"; @@ -50513,12 +50936,12 @@ quelpa = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, package-build }: melpaBuild { pname = "quelpa"; - version = "20160325.829"; + version = "20160325.629"; src = fetchFromGitHub { owner = "quelpa"; repo = "quelpa"; - rev = "7ec5c129ec28649701eac2988230e40d26be3f42"; - sha256 = "1kkzy7p0y9iakcl2nciby9x6jll53h56h3kimqc3q9riswihyncq"; + rev = "f58878188d54e21db110cecb67d01f2c3d23d997"; + sha256 = "0xh7djgzz2gcvbl6w0ajkinay5h4fz00yafmvhhrb6hdkqsgh2br"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7dc3ba4f3efbf66142bf946d9cd31ff0c7a0b60e/recipes/quelpa"; @@ -50534,7 +50957,7 @@ quelpa-use-package = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, quelpa, use-package }: melpaBuild { pname = "quelpa-use-package"; - version = "20150805.528"; + version = "20150805.328"; src = fetchFromGitHub { owner = "quelpa"; repo = "quelpa-use-package"; @@ -50555,7 +50978,7 @@ quick-buffer-switch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "quick-buffer-switch"; - version = "20151007.1708"; + version = "20151007.1508"; src = fetchFromGitHub { owner = "renard"; repo = "quick-buffer-switch"; @@ -50576,7 +50999,7 @@ quick-preview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "quick-preview"; - version = "20150828.2339"; + version = "20150828.2139"; src = fetchFromGitHub { owner = "myuhe"; repo = "quick-preview.el"; @@ -50597,7 +51020,7 @@ quickref = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "quickref"; - version = "20160326.1136"; + version = "20160326.936"; src = fetchFromGitHub { owner = "pd"; repo = "quickref.el"; @@ -50618,12 +51041,12 @@ quickrun = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "quickrun"; - version = "20160611.834"; + version = "20160611.634"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-quickrun"; - rev = "b38ef226edbf7cfc22c4463bd8526d140e6439c3"; - sha256 = "1cwly4s7xcdr73hqqxbzpfjbpndpfnlhy3awpv7d31a1k1qr5r40"; + rev = "69a7094160358de3b74a820161c389dc3e9f2cae"; + sha256 = "0jnd9z8hv7gyvy0sawqajxl891j54n7f477w67fqzppvgfqy4spi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/quickrun"; @@ -50639,7 +51062,7 @@ quiet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "quiet"; - version = "20160508.756"; + version = "20160508.556"; src = fetchFromGitHub { owner = "zzkt"; repo = "quiet"; @@ -50660,7 +51083,7 @@ r-autoyas = callPackage ({ ess, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "r-autoyas"; - version = "20140101.910"; + version = "20140101.710"; src = fetchFromGitHub { owner = "mattfidler"; repo = "r-autoyas.el"; @@ -50681,12 +51104,12 @@ racer = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode, s }: melpaBuild { pname = "racer"; - version = "20160419.1625"; + version = "20160720.1416"; src = fetchFromGitHub { owner = "racer-rust"; repo = "emacs-racer"; - rev = "49743e6d840261cd1985d9eef2dbf9451c6e8638"; - sha256 = "1d128mamvwpjnk2dazhcxvfjw3lf0ix56l85gwsb377v05pn3wzf"; + rev = "78d523d00e7c27381ab0fa6e7cf749c6ebe1621d"; + sha256 = "0k9v1wmh07kzarphkc7l5i7v79abj8ncy8mqhz5dq3rywjf70vm1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/97b97037c19655a3ddffee9a86359961f26c155c/recipes/racer"; @@ -50702,12 +51125,12 @@ racket-mode = callPackage ({ emacs, faceup, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "racket-mode"; - version = "20160610.2134"; + version = "20160724.1851"; src = fetchFromGitHub { owner = "greghendershott"; repo = "racket-mode"; - rev = "0d646a54ccfb50620d47708a175ec8d7d08e27c9"; - sha256 = "1psgc3x82ac6dxjqr3wb1nzkhrb2hfr69h7q29xmik3libixrrjk"; + rev = "6370213864ec08568c3c56aa9fabac840eee01b3"; + sha256 = "0mnlhy29p5nl6c0h4l0j0g430ra85h8r6mzwbfca98ny7wslijfi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ad88d92cf02e718c9318d197dd458a2ecfc0f46/recipes/racket-mode"; @@ -50723,7 +51146,7 @@ railgun = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "railgun"; - version = "20121017.57"; + version = "20121016.2257"; src = fetchFromGitHub { owner = "mbriggs"; repo = "railgun.el"; @@ -50744,7 +51167,7 @@ rails-log-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rails-log-mode"; - version = "20140407.2325"; + version = "20140407.2125"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "rails-log-mode"; @@ -50765,7 +51188,7 @@ rails-new = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rails-new"; - version = "20141221.249"; + version = "20141221.49"; src = fetchFromGitHub { owner = "cheunghy"; repo = "rails-new"; @@ -50786,7 +51209,7 @@ railscasts-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "railscasts-theme"; - version = "20150219.925"; + version = "20150219.725"; src = fetchFromGitHub { owner = "mikenichols"; repo = "railscasts-theme"; @@ -50807,7 +51230,7 @@ rainbow-blocks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rainbow-blocks"; - version = "20140306.1233"; + version = "20140306.1033"; src = fetchFromGitHub { owner = "istib"; repo = "rainbow-blocks"; @@ -50828,7 +51251,7 @@ rainbow-delimiters = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rainbow-delimiters"; - version = "20160501.158"; + version = "20160430.2358"; src = fetchFromGitHub { owner = "Fanael"; repo = "rainbow-delimiters"; @@ -50849,7 +51272,7 @@ rainbow-identifiers = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rainbow-identifiers"; - version = "20141102.926"; + version = "20141102.726"; src = fetchFromGitHub { owner = "Fanael"; repo = "rainbow-identifiers"; @@ -50870,7 +51293,7 @@ rake = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rake"; - version = "20150831.358"; + version = "20150831.158"; src = fetchFromGitHub { owner = "asok"; repo = "rake"; @@ -50891,7 +51314,7 @@ rally-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popwin }: melpaBuild { pname = "rally-mode"; - version = "20160326.1102"; + version = "20160326.902"; src = fetchFromGitHub { owner = "seanleblanc"; repo = "rally-mode"; @@ -50912,7 +51335,7 @@ rand-theme = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rand-theme"; - version = "20151219.1735"; + version = "20151219.1535"; src = fetchFromGitHub { owner = "gopar"; repo = "rand-theme"; @@ -50933,7 +51356,7 @@ random-splash-image = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "random-splash-image"; - version = "20151002.2030"; + version = "20151002.1830"; src = fetchFromGitHub { owner = "kakakaya"; repo = "random-splash-image"; @@ -50954,7 +51377,7 @@ ranger = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ranger"; - version = "20160622.330"; + version = "20160622.130"; src = fetchFromGitHub { owner = "ralesi"; repo = "ranger.el"; @@ -50975,7 +51398,7 @@ rase = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rase"; - version = "20120928.1545"; + version = "20120928.1345"; src = fetchFromGitHub { owner = "m00natic"; repo = "rase"; @@ -50996,7 +51419,7 @@ rats = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild, s }: melpaBuild { pname = "rats"; - version = "20160315.1345"; + version = "20160315.1145"; src = fetchFromGitHub { owner = "ane"; repo = "rats.el"; @@ -51017,7 +51440,7 @@ rbenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rbenv"; - version = "20141120.149"; + version = "20141119.2349"; src = fetchFromGitHub { owner = "senny"; repo = "rbenv.el"; @@ -51038,7 +51461,7 @@ rbt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rbt"; - version = "20160129.1251"; + version = "20160129.1051"; src = fetchFromGitHub { owner = "joeheyming"; repo = "rbt.el"; @@ -51059,7 +51482,7 @@ rcirc-alert = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rcirc-alert"; - version = "20141127.447"; + version = "20141127.247"; src = fetchFromGitHub { owner = "csantosb"; repo = "rcirc-alert"; @@ -51080,7 +51503,7 @@ rcirc-alertify = callPackage ({ alert, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rcirc-alertify"; - version = "20140406.2019"; + version = "20140406.1819"; src = fetchFromGitHub { owner = "fgallina"; repo = "rcirc-alertify"; @@ -51101,7 +51524,7 @@ rcirc-color = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rcirc-color"; - version = "20151130.958"; + version = "20151130.758"; src = fetchFromGitHub { owner = "kensanata"; repo = "rcirc-color"; @@ -51122,7 +51545,7 @@ rcirc-groups = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rcirc-groups"; - version = "20160115.631"; + version = "20160115.431"; src = fetchFromGitHub { owner = "dimitri"; repo = "rcirc-groups"; @@ -51143,7 +51566,7 @@ rcirc-notify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rcirc-notify"; - version = "20150219.1604"; + version = "20150219.1404"; src = fetchFromGitHub { owner = "nicferrier"; repo = "rcirc-notify"; @@ -51164,7 +51587,7 @@ rcirc-styles = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rcirc-styles"; - version = "20160206.2050"; + version = "20160206.1850"; src = fetchFromGitHub { owner = "aaron-em"; repo = "rcirc-styles.el"; @@ -51185,7 +51608,7 @@ rdf-prefix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rdf-prefix"; - version = "20160517.1323"; + version = "20160517.1123"; src = fetchFromGitHub { owner = "simenheg"; repo = "rdf-prefix"; @@ -51206,7 +51629,7 @@ rdp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rdp"; - version = "20120928.2054"; + version = "20120928.1854"; src = fetchFromGitHub { owner = "skeeto"; repo = "rdp"; @@ -51227,12 +51650,12 @@ react-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "react-snippets"; - version = "20151104.1740"; + version = "20160712.1521"; src = fetchFromGitHub { owner = "johnmastro"; repo = "react-snippets.el"; - rev = "1b56f99e1f26c6dea4315c14fa58a851caa9d84f"; - sha256 = "00j0iqa37yzd7xrgd8xcgpgmjcarhn0yx4zpbnr7z7kzmg24ywa7"; + rev = "3216134ee98b0ac39454d11d19b1508d3e7ca709"; + sha256 = "1j89pzx5karfh37gp0s9mnsq72h9628fihjqhra5h4qpj1irmkld"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3720192fdfa45f9b83259ab39356f469c5ac85b4/recipes/react-snippets"; @@ -51248,7 +51671,7 @@ readability = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth, ov }: melpaBuild { pname = "readability"; - version = "20140715.1927"; + version = "20140715.1727"; src = fetchFromGitHub { owner = "ShingoFukuyama"; repo = "emacs-readability"; @@ -51269,7 +51692,7 @@ readline-complete = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "readline-complete"; - version = "20150708.937"; + version = "20150708.737"; src = fetchFromGitHub { owner = "monsanto"; repo = "readline-complete.el"; @@ -51290,7 +51713,7 @@ real-auto-save = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "real-auto-save"; - version = "20150701.1015"; + version = "20150701.815"; src = fetchFromGitHub { owner = "chillaranand"; repo = "real-auto-save"; @@ -51311,12 +51734,12 @@ realgud = callPackage ({ fetchFromGitHub, fetchurl, lib, list-utils, load-relative, loc-changes, melpaBuild, test-simple }: melpaBuild { pname = "realgud"; - version = "20160628.854"; + version = "20160712.849"; src = fetchFromGitHub { owner = "rocky"; repo = "emacs-dbgr"; - rev = "e4c05b2f0e4b2420b67974f9b747b16a49ce8570"; - sha256 = "0x0vjcvbi96z9hlnqd08vvlg3zb1l4vzcxb83s9wj59qy5fl4az3"; + rev = "1e257cf3fa2df3d5c972d8569f02718a34a4828c"; + sha256 = "0kba72mdwq2875gch7g4ab8sxy9b8p3vm1xcjj38d0qj8xcs7qhm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud"; @@ -51332,12 +51755,12 @@ realgud-byebug = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, realgud }: melpaBuild { pname = "realgud-byebug"; - version = "20160703.1134"; + version = "20160713.604"; src = fetchFromGitHub { owner = "rocky"; repo = "realgud-byebug"; - rev = "14f2907323c317bd75036c3ae8879e193715aa1f"; - sha256 = "175nfpbbim77kagfqg2n11kxnkv7311zrbapmx56ny9p4hqwc1ix"; + rev = "93bc1129ce9b03a3d08c0e68c34bcb8a997020e4"; + sha256 = "1142bi4wygkby6qkman6w102rds5lhvxci12x991759fq3g2w5i7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud-byebug"; @@ -51353,7 +51776,7 @@ realgud-old-debuggers = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, realgud }: melpaBuild { pname = "realgud-old-debuggers"; - version = "20160303.254"; + version = "20160303.54"; src = fetchFromGitHub { owner = "rocky"; repo = "realgud-old-debuggers"; @@ -51374,7 +51797,7 @@ realgud-pry = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, realgud }: melpaBuild { pname = "realgud-pry"; - version = "20160625.1934"; + version = "20160625.1734"; src = fetchFromGitHub { owner = "rocky"; repo = "realgud-pry"; @@ -51395,7 +51818,7 @@ realgud-rdb2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, realgud }: melpaBuild { pname = "realgud-rdb2"; - version = "20160303.243"; + version = "20160303.43"; src = fetchFromGitHub { owner = "rocky"; repo = "realgud-ruby-debugger2"; @@ -51416,7 +51839,7 @@ rebox2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rebox2"; - version = "20121113.700"; + version = "20121113.500"; src = fetchFromGitHub { owner = "lewang"; repo = "rebox2"; @@ -51436,7 +51859,7 @@ }) {}; recentf-ext = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "recentf-ext"; - version = "20130130.1550"; + version = "20130130.1350"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/recentf-ext.el"; sha256 = "15kwkphrlxq6nbmqm95sxv4rykl1d35sjm59ncy07ncqm706h33l"; @@ -51455,7 +51878,7 @@ recompile-on-save = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "recompile-on-save"; - version = "20151126.846"; + version = "20151126.646"; src = fetchFromGitHub { owner = "maio"; repo = "recompile-on-save.el"; @@ -51476,7 +51899,7 @@ recover-buffers = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "recover-buffers"; - version = "20150812.205"; + version = "20150812.5"; src = fetchFromGitHub { owner = "tripleee"; repo = "recover-buffers"; @@ -51497,7 +51920,7 @@ rect-plus = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rect-plus"; - version = "20150620.1944"; + version = "20150620.1744"; src = fetchFromGitHub { owner = "mhayashi1120"; repo = "Emacs-rectplus"; @@ -51518,7 +51941,7 @@ rectangle-utils = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rectangle-utils"; - version = "20160427.1224"; + version = "20160427.1024"; src = fetchFromGitHub { owner = "thierryvolpiatto"; repo = "rectangle-utils"; @@ -51539,7 +51962,7 @@ recursive-narrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "recursive-narrow"; - version = "20140902.1227"; + version = "20140902.1027"; src = fetchFromGitHub { owner = "nflath"; repo = "recursive-narrow"; @@ -51560,7 +51983,7 @@ redis = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "redis"; - version = "20150531.1448"; + version = "20150531.1248"; src = fetchFromGitHub { owner = "emacs-pe"; repo = "redis.el"; @@ -51580,7 +52003,7 @@ }) {}; redo-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "redo-plus"; - version = "20131117.551"; + version = "20131117.351"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/redo+.el"; sha256 = "1jc4n60spzssa57i3jwrqwy20f741hb271vmmx49riycx1ybx3d3"; @@ -51599,7 +52022,7 @@ redpen-paragraph = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "redpen-paragraph"; - version = "20160625.550"; + version = "20160625.350"; src = fetchFromGitHub { owner = "karronoli"; repo = "redpen-paragraph.el"; @@ -51620,7 +52043,7 @@ redshank = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "redshank"; - version = "20120510.1430"; + version = "20120510.1230"; src = fetchgit { url = "http://www.foldr.org/~michaelw/projects/redshank.git"; rev = "f98e68f532e622bcd464292ca4a9cf5fbea14ebb"; @@ -51640,7 +52063,7 @@ redtick = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "redtick"; - version = "20160516.1616"; + version = "20160516.1416"; src = fetchFromGitHub { owner = "ferfebles"; repo = "redtick"; @@ -51661,7 +52084,7 @@ refheap = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "refheap"; - version = "20140902.1602"; + version = "20140902.1402"; src = fetchFromGitHub { owner = "Raynes"; repo = "refheap.el"; @@ -51679,10 +52102,31 @@ license = lib.licenses.free; }; }) {}; + refine = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }: + melpaBuild { + pname = "refine"; + version = "20160726.2025"; + src = fetchFromGitHub { + owner = "Wilfred"; + repo = "refine"; + rev = "22aa21717c71189a264151a382cf713d78b4375d"; + sha256 = "0wxfhxr23s8qwha18h04852lfrglamzdainjijywikwkmrw4i905"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b111879ea0685cda88c758b270304d9e913c1391/recipes/refine"; + sha256 = "1sk6rsd92pix7k8snnqm3hsimjzaihzjgac0g5h3a2zm9dabf4py"; + name = "refine"; + }; + packageRequires = [ dash emacs list-utils loop s ]; + meta = { + homepage = "https://melpa.org/#/refine"; + license = lib.licenses.free; + }; + }) {}; regex-dsl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "regex-dsl"; - version = "20100124.428"; + version = "20100124.228"; src = fetchFromGitHub { owner = "alk"; repo = "elisp-regex-dsl"; @@ -51703,7 +52147,7 @@ regex-tool = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "regex-tool"; - version = "20131104.1634"; + version = "20131104.1434"; src = fetchFromGitHub { owner = "jwiegley"; repo = "regex-tool"; @@ -51724,7 +52168,7 @@ region-bindings-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "region-bindings-mode"; - version = "20140407.1714"; + version = "20140407.1514"; src = fetchFromGitHub { owner = "fgallina"; repo = "region-bindings-mode"; @@ -51745,7 +52189,7 @@ region-state = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "region-state"; - version = "20151128.438"; + version = "20151128.238"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "region-state.el"; @@ -51766,7 +52210,7 @@ register-channel = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "register-channel"; - version = "20150513.2259"; + version = "20150513.2059"; src = fetchFromGitHub { owner = "YangZhao11"; repo = "register-channel"; @@ -51787,7 +52231,7 @@ related = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "related"; - version = "20160602.54"; + version = "20160601.2254"; src = fetchgit { url = "https://bitbucket.org/lyude/related"; rev = "dbdcbc1f3c8b02debeaec4073ea71e598e3373d9"; @@ -51807,7 +52251,7 @@ relative-buffers = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "relative-buffers"; - version = "20160221.1323"; + version = "20160221.1123"; src = fetchFromGitHub { owner = "proofit404"; repo = "relative-buffers"; @@ -51828,7 +52272,7 @@ relative-line-numbers = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "relative-line-numbers"; - version = "20151006.1646"; + version = "20151006.1446"; src = fetchFromGitHub { owner = "Fanael"; repo = "relative-line-numbers"; @@ -51849,7 +52293,7 @@ relax = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "relax"; - version = "20131029.1634"; + version = "20131029.1434"; src = fetchFromGitHub { owner = "technomancy"; repo = "relax.el"; @@ -51870,7 +52314,7 @@ remark-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }: melpaBuild { pname = "remark-mode"; - version = "20151004.1155"; + version = "20151004.955"; src = fetchFromGitHub { owner = "torgeir"; repo = "remark-mode.el"; @@ -51891,7 +52335,7 @@ repeatable-motion = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "repeatable-motion"; - version = "20150629.1312"; + version = "20150629.1112"; src = fetchFromGitHub { owner = "willghatch"; repo = "emacs-repeatable-motion"; @@ -51912,7 +52356,7 @@ repl-toggle = callPackage ({ fetchFromGitHub, fetchurl, fullframe, lib, melpaBuild }: melpaBuild { pname = "repl-toggle"; - version = "20160119.621"; + version = "20160119.421"; src = fetchFromGitHub { owner = "tomterl"; repo = "repl-toggle"; @@ -51933,7 +52377,7 @@ replace-from-region = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "replace-from-region"; - version = "20150406.1929"; + version = "20150406.1729"; src = fetchFromGitHub { owner = "rubikitch"; repo = "replace-from-region"; @@ -51954,7 +52398,7 @@ replace-pairs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "replace-pairs"; - version = "20160207.651"; + version = "20160207.451"; src = fetchFromGitHub { owner = "davidshepherd7"; repo = "replace-pairs"; @@ -51974,7 +52418,7 @@ }) {}; replace-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "replace-plus"; - version = "20160508.1043"; + version = "20160508.843"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/replace+.el"; sha256 = "1a59nqrs62xzdpi7as00byf3jamr1zsz8jmf0w4mqag4bp79cd40"; @@ -51993,7 +52437,7 @@ replace-symbol = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "replace-symbol"; - version = "20160517.1912"; + version = "20160517.1712"; src = fetchFromGitHub { owner = "bmastenbrook"; repo = "replace-symbol-el"; @@ -52014,7 +52458,7 @@ repo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "repo"; - version = "20160114.1314"; + version = "20160114.1114"; src = fetchFromGitHub { owner = "canatella"; repo = "repo-el"; @@ -52035,7 +52479,7 @@ req-package = callPackage ({ dash, fetchFromGitHub, fetchurl, ht, lib, log4e, melpaBuild, use-package }: melpaBuild { pname = "req-package"; - version = "20160603.601"; + version = "20160603.401"; src = fetchFromGitHub { owner = "edvorg"; repo = "req-package"; @@ -52056,12 +52500,12 @@ request = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "request"; - version = "20160623.2138"; + version = "20160623.1938"; src = fetchFromGitHub { owner = "tkf"; repo = "emacs-request"; - rev = "ee1a1b67f0dcdff7f206937dd266b9a9bf31e22b"; - sha256 = "0x2ifj8clqyl8p1j6iv1x2n8vln2zk2zivbd4h550nhn65xljb6h"; + rev = "40ac53c5f6179aab80ee5e5ea6744331ef1d3b64"; + sha256 = "165nz8ivw585scalrm3b68869jmqnhd4yqc8ykaf206ssz0znicx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8d113615dde757a60ce91e156f0714a1394c4bfc/recipes/request"; @@ -52077,12 +52521,12 @@ request-deferred = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "request-deferred"; - version = "20160419.1805"; + version = "20160419.1605"; src = fetchFromGitHub { owner = "tkf"; repo = "emacs-request"; - rev = "ee1a1b67f0dcdff7f206937dd266b9a9bf31e22b"; - sha256 = "0x2ifj8clqyl8p1j6iv1x2n8vln2zk2zivbd4h550nhn65xljb6h"; + rev = "40ac53c5f6179aab80ee5e5ea6744331ef1d3b64"; + sha256 = "165nz8ivw585scalrm3b68869jmqnhd4yqc8ykaf206ssz0znicx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8d113615dde757a60ce91e156f0714a1394c4bfc/recipes/request-deferred"; @@ -52098,7 +52542,7 @@ requirejs = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, popup, s, yasnippet }: melpaBuild { pname = "requirejs"; - version = "20151204.119"; + version = "20151203.2319"; src = fetchFromGitHub { owner = "joeheyming"; repo = "requirejs-emacs"; @@ -52119,7 +52563,7 @@ requirejs-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "requirejs-mode"; - version = "20130215.1504"; + version = "20130215.1304"; src = fetchFromGitHub { owner = "moricard"; repo = "requirejs-mode"; @@ -52140,7 +52584,7 @@ resize-window = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "resize-window"; - version = "20160511.2205"; + version = "20160511.2005"; src = fetchFromGitHub { owner = "dpsutton"; repo = "resize-window"; @@ -52161,7 +52605,7 @@ restart-emacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "restart-emacs"; - version = "20160530.822"; + version = "20160530.622"; src = fetchFromGitHub { owner = "iqbalansari"; repo = "restart-emacs"; @@ -52182,12 +52626,12 @@ restclient = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "restclient"; - version = "20160630.503"; + version = "20160725.702"; src = fetchFromGitHub { owner = "pashky"; repo = "restclient.el"; - rev = "07a934df9a928de9602f2b6b6c6ab441f3d0713c"; - sha256 = "0iq50brvkwschq21wvncgy9xdxrbm9md5s0ri2hf9p093hr2s84z"; + rev = "6f6af40c4a95d1976b3b4e740b5cabf608bf5634"; + sha256 = "02akkjy94qx4j1yxc80qarsjgn4s4ig0syhjc3z1kcb2fjw0dmwl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/59303304fe1f724596245556dd90f6afffba425d/recipes/restclient"; @@ -52203,12 +52647,12 @@ restclient-helm = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, restclient }: melpaBuild { pname = "restclient-helm"; - version = "20160407.449"; + version = "20160407.249"; src = fetchFromGitHub { owner = "pashky"; repo = "restclient.el"; - rev = "07a934df9a928de9602f2b6b6c6ab441f3d0713c"; - sha256 = "0iq50brvkwschq21wvncgy9xdxrbm9md5s0ri2hf9p093hr2s84z"; + rev = "6f6af40c4a95d1976b3b4e740b5cabf608bf5634"; + sha256 = "02akkjy94qx4j1yxc80qarsjgn4s4ig0syhjc3z1kcb2fjw0dmwl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/59303304fe1f724596245556dd90f6afffba425d/recipes/restclient-helm"; @@ -52224,7 +52668,7 @@ restclient-test = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, restclient }: melpaBuild { pname = "restclient-test"; - version = "20160618.515"; + version = "20160618.315"; src = fetchFromGitHub { owner = "simenheg"; repo = "restclient-test.el"; @@ -52245,7 +52689,7 @@ reveal-in-osx-finder = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "reveal-in-osx-finder"; - version = "20150802.1157"; + version = "20150802.957"; src = fetchFromGitHub { owner = "kaz-yos"; repo = "reveal-in-osx-finder"; @@ -52265,7 +52709,7 @@ }) {}; reveal-next = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "reveal-next"; - version = "20151231.1750"; + version = "20151231.1550"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/reveal-next.el"; sha256 = "1h27kg2k8f6smbqxandmvg859qk66jydbbbiwwjmk7316k66w8qa"; @@ -52284,7 +52728,7 @@ reverse-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "reverse-theme"; - version = "20141204.1945"; + version = "20141204.1745"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-reverse-theme"; @@ -52305,7 +52749,7 @@ review-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "review-mode"; - version = "20150110.812"; + version = "20150110.612"; src = fetchFromGitHub { owner = "kmuto"; repo = "review-el"; @@ -52326,7 +52770,7 @@ revive = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "revive"; - version = "20150417.1755"; + version = "20150417.1555"; src = fetchFromGitHub { owner = "emacsmirror"; repo = "revive"; @@ -52347,7 +52791,7 @@ reykjavik-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "reykjavik-theme"; - version = "20160109.200"; + version = "20160109.0"; src = fetchFromGitHub { owner = "mswift42"; repo = "reykjavik-theme"; @@ -52367,7 +52811,7 @@ }) {}; rfringe = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "rfringe"; - version = "20110405.1020"; + version = "20110405.820"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/rfringe.el"; sha256 = "02i5znln0aphvmvaia3sz75bvjhqwyjq1blf5qkcbprnn95lm3yh"; @@ -52386,7 +52830,7 @@ rhtml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rhtml-mode"; - version = "20130422.811"; + version = "20130422.611"; src = fetchFromGitHub { owner = "eschulte"; repo = "rhtml"; @@ -52407,12 +52851,12 @@ rich-minority = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rich-minority"; - version = "20160701.1344"; + version = "20160725.1255"; src = fetchFromGitHub { owner = "Malabarba"; repo = "rich-minority"; - rev = "f8541d9ed4791cc23c7163e1690e51ec08f3caf9"; - sha256 = "02xx2gcf8gncl4w2wdk7gzrkfck9p6cygccx9slwlnwn5i8kicyd"; + rev = "478f0fbc0dbba6619a96a471b9b295f2f436475f"; + sha256 = "1n07bvjaz468zbd7am3rmw98a97clz8p4x6ryhbd4riqmfh845wi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/rich-minority"; @@ -52428,7 +52872,7 @@ rigid-tabs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rigid-tabs"; - version = "20150807.1056"; + version = "20150807.856"; src = fetchFromGitHub { owner = "wavexx"; repo = "rigid-tabs.el"; @@ -52449,7 +52893,7 @@ rinari = callPackage ({ fetchFromGitHub, fetchurl, inf-ruby, jump, lib, melpaBuild, ruby-compilation, ruby-mode ? null }: melpaBuild { pname = "rinari"; - version = "20150709.140"; + version = "20150708.2340"; src = fetchFromGitHub { owner = "eschulte"; repo = "rinari"; @@ -52470,7 +52914,7 @@ rings = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rings"; - version = "20160531.1527"; + version = "20160531.1327"; src = fetchFromGitHub { owner = "konr"; repo = "rings"; @@ -52491,7 +52935,7 @@ rnc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rnc-mode"; - version = "20121227.1702"; + version = "20121227.1502"; src = fetchFromGitHub { owner = "TreeRex"; repo = "rnc-mode"; @@ -52512,7 +52956,7 @@ robe = callPackage ({ fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }: melpaBuild { pname = "robe"; - version = "20160518.459"; + version = "20160518.259"; src = fetchFromGitHub { owner = "dgutov"; repo = "robe"; @@ -52533,7 +52977,7 @@ robots-txt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "robots-txt-mode"; - version = "20160312.951"; + version = "20160312.751"; src = fetchFromGitHub { owner = "zonuexe"; repo = "robots-txt-mode"; @@ -52554,7 +52998,7 @@ roguel-ike = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "roguel-ike"; - version = "20160119.2102"; + version = "20160119.1902"; src = fetchFromGitHub { owner = "stevenremot"; repo = "roguel-ike"; @@ -52575,7 +53019,7 @@ rope-read-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rope-read-mode"; - version = "20160603.209"; + version = "20160603.9"; src = fetchFromGitHub { owner = "marcowahl"; repo = "rope-read-mode"; @@ -52596,7 +53040,7 @@ rotate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rotate"; - version = "20160215.118"; + version = "20160214.2318"; src = fetchFromGitHub { owner = "daic-h"; repo = "emacs-rotate"; @@ -52617,7 +53061,7 @@ roy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "roy-mode"; - version = "20121208.558"; + version = "20121208.358"; src = fetchFromGitHub { owner = "folone"; repo = "roy-mode"; @@ -52638,12 +53082,12 @@ rpm-spec-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rpm-spec-mode"; - version = "20150411.1055"; + version = "20160710.436"; src = fetchFromGitHub { owner = "bjorlykke"; repo = "rpm-spec-mode"; - rev = "7d06d19a31e888b932da6c8202ff2c73f42703a1"; - sha256 = "01rb6qfsk4f33nkfdzvvjkw96ip1dv0py8i30l8ix9cqbk07svsv"; + rev = "c1c38050c48ea330c7cea632b8785d66daeefb2b"; + sha256 = "0427kcvf2ljhzwxskn3jzk0ncrl3f9zcz2sm83d9pmhh5jax2gch"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1ce736b8db53fea4935d195a0d07dc8141125a8/recipes/rpm-spec-mode"; @@ -52659,7 +53103,7 @@ rpn-calc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "rpn-calc"; - version = "20150302.734"; + version = "20150302.534"; src = fetchFromGitHub { owner = "zk-phi"; repo = "rpn-calc"; @@ -52680,7 +53124,7 @@ rsense = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rsense"; - version = "20100510.2305"; + version = "20100510.2105"; src = fetchFromGitHub { owner = "m2ym"; repo = "rsense"; @@ -52701,12 +53145,12 @@ rspec-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, ruby-mode ? null }: melpaBuild { pname = "rspec-mode"; - version = "20160425.1657"; + version = "20160715.509"; src = fetchFromGitHub { owner = "pezra"; repo = "rspec-mode"; - rev = "87a89718839d96796da10fd91f7a6f08fb775f71"; - sha256 = "1mlcr4br831cbxd90z61kynvir704mafv4avas44bzk8m1m188kw"; + rev = "80c5578a4778ab0fe19be14293d683de16dbb457"; + sha256 = "1d3f7if926zd8ynm5sixpc86imhwpgm4l824pr8glh5wk23z2805"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cd83e61b10da20198de990aa081b47d3b0b44d43/recipes/rspec-mode"; @@ -52722,12 +53166,12 @@ rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rtags"; - version = "20160701.1404"; + version = "20160715.1019"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "364bc7a8f9dfb2d6b8f325f486e5c86525530cc7"; - sha256 = "05wvl0ifslr0sm3178nzvris695701hxiv4bw72jlxg9w7ar5d5x"; + rev = "2e676e1a0dada6a49fc454b5b29710bc30b28b70"; + sha256 = "1zfc5r8d8lj3y7sdz29drxp7kmwb5lxhm2rr7nszy525n8ab2w0g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac3b84fe84a7f57d09f1a303d8947ef19aaf02fb/recipes/rtags"; @@ -52743,7 +53187,7 @@ rtm = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rtm"; - version = "20160116.1127"; + version = "20160116.927"; src = fetchFromGitHub { owner = "pmiddend"; repo = "emacs-rtm"; @@ -52764,7 +53208,7 @@ rubocop = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rubocop"; - version = "20151123.2337"; + version = "20151123.2137"; src = fetchFromGitHub { owner = "bbatsov"; repo = "rubocop-emacs"; @@ -52785,10 +53229,10 @@ ruby-additional = callPackage ({ emacs, fetchsvn, fetchurl, lib, melpaBuild, ruby-mode ? null }: melpaBuild { pname = "ruby-additional"; - version = "20160607.357"; + version = "20160607.157"; src = fetchsvn { url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "55568"; + rev = "55763"; sha256 = "0lcd5p5rkga6yfaaa5smy2pl1y1xv69ap33kyjmq58ajd78gql2m"; }; recipeFile = fetchurl { @@ -52804,7 +53248,7 @@ }) {}; ruby-block = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "ruby-block"; - version = "20131210.2131"; + version = "20131210.1931"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/ruby-block.el"; sha256 = "0c4vy9xsw44g6q9nc8aaav5avgp34h24mvgcnww468afiimivdcq"; @@ -52823,7 +53267,7 @@ ruby-compilation = callPackage ({ fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }: melpaBuild { pname = "ruby-compilation"; - version = "20150709.140"; + version = "20150708.2340"; src = fetchFromGitHub { owner = "eschulte"; repo = "rinari"; @@ -52844,7 +53288,7 @@ ruby-dev = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ruby-dev"; - version = "20130811.351"; + version = "20130811.151"; src = fetchFromGitHub { owner = "Mon-Ouie"; repo = "ruby-dev.el"; @@ -52865,10 +53309,10 @@ ruby-electric = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ruby-electric"; - version = "20150424.952"; + version = "20150424.752"; src = fetchsvn { url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "55568"; + rev = "55763"; sha256 = "0lcd5p5rkga6yfaaa5smy2pl1y1xv69ap33kyjmq58ajd78gql2m"; }; recipeFile = fetchurl { @@ -52885,7 +53329,7 @@ ruby-end = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ruby-end"; - version = "20141215.623"; + version = "20141215.423"; src = fetchFromGitHub { owner = "rejeep"; repo = "ruby-end.el"; @@ -52906,7 +53350,7 @@ ruby-factory = callPackage ({ fetchFromGitHub, fetchurl, inflections, lib, melpaBuild }: melpaBuild { pname = "ruby-factory"; - version = "20160102.121"; + version = "20160101.2321"; src = fetchFromGitHub { owner = "sshaw"; repo = "ruby-factory-mode"; @@ -52927,7 +53371,7 @@ ruby-guard = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ruby-guard"; - version = "20160131.1952"; + version = "20160131.1752"; src = fetchFromGitHub { owner = "cheunghy"; repo = "ruby-guard"; @@ -52948,7 +53392,7 @@ ruby-hash-syntax = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ruby-hash-syntax"; - version = "20141010.1039"; + version = "20141010.839"; src = fetchFromGitHub { owner = "purcell"; repo = "ruby-hash-syntax"; @@ -52969,7 +53413,7 @@ ruby-interpolation = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ruby-interpolation"; - version = "20131112.1052"; + version = "20131112.852"; src = fetchFromGitHub { owner = "leoc"; repo = "ruby-interpolation.el"; @@ -52990,7 +53434,7 @@ ruby-refactor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, ruby-mode ? null }: melpaBuild { pname = "ruby-refactor"; - version = "20160214.1050"; + version = "20160214.850"; src = fetchFromGitHub { owner = "ajvargo"; repo = "ruby-refactor"; @@ -53011,12 +53455,12 @@ ruby-test-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pcre2el, ruby-mode ? null }: melpaBuild { pname = "ruby-test-mode"; - version = "20160509.1250"; + version = "20160711.335"; src = fetchFromGitHub { owner = "r0man"; repo = "ruby-test-mode"; - rev = "ce960ca0ad47e482362165a4486026b701b587a1"; - sha256 = "0ajqqkf43k7kgsnzi9m8il1l48n2slqd7csya8varnlm8g4p79gy"; + rev = "78f80e5ed4ddd09b617a2574c68f575ebc81fce2"; + sha256 = "195i85nz0c738bagmcyh3h7zzr85zlpz30bj0mlv36mqcig152xi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/746e0e49a24f16baa5f1cc7f11220766ecf9f1fe/recipes/ruby-test-mode"; @@ -53032,7 +53476,7 @@ ruby-tools = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ruby-tools"; - version = "20151209.1015"; + version = "20151209.815"; src = fetchFromGitHub { owner = "rejeep"; repo = "ruby-tools.el"; @@ -53053,7 +53497,7 @@ runner = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "runner"; - version = "20160524.243"; + version = "20160524.43"; src = fetchFromGitHub { owner = "thamer"; repo = "runner"; @@ -53074,7 +53518,7 @@ runtests = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "runtests"; - version = "20150807.331"; + version = "20150807.131"; src = fetchFromGitHub { owner = "sunesimonsen"; repo = "emacs-runtests"; @@ -53095,12 +53539,12 @@ rust-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rust-mode"; - version = "20160517.546"; + version = "20160726.720"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-mode"; - rev = "0cf2bc30ec29ad215242b617748c9fa1aa91c407"; - sha256 = "1yamcsqshxzniaq8hn6a2hmfp9x84g5k6n04fgpfs3wxmrh8cqx8"; + rev = "ba5ff9058546df593ff7d8737fb52b5e92ad1913"; + sha256 = "1c06fc14lfy0245syci0nfmy2r06z45kkaqyikika3bapqbfg87v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f6e5d990d699d571dccbdeb13327b33389bb113/recipes/rust-mode"; @@ -53116,7 +53560,7 @@ rustfmt = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rustfmt"; - version = "20160217.742"; + version = "20160217.542"; src = fetchFromGitHub { owner = "fbergroth"; repo = "emacs-rustfmt"; @@ -53137,7 +53581,7 @@ rvm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rvm"; - version = "20150402.942"; + version = "20150402.742"; src = fetchFromGitHub { owner = "senny"; repo = "rvm.el"; @@ -53158,12 +53602,12 @@ s = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "s"; - version = "20160509.157"; + version = "20160711.525"; src = fetchFromGitHub { owner = "magnars"; repo = "s.el"; - rev = "2184337a132944f669144d0078d1fa1220012840"; - sha256 = "1bq402bhxqc9ph2da2nmd80s28dzd406gbawxr3kgrv0sll167bx"; + rev = "a767c1c04c3accef0bdd5e7e785f6dbee6dd85b8"; + sha256 = "1qwxynzsv7f9hn3np5jnqalp5xm88hcilpzp39fs3b2irpa0s3i4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d6e5137dac9f8f95579994601cb1e24614f965f2/recipes/s"; @@ -53179,7 +53623,7 @@ s-buffer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, noflet, s }: melpaBuild { pname = "s-buffer"; - version = "20130605.1624"; + version = "20130605.1424"; src = fetchFromGitHub { owner = "nicferrier"; repo = "emacs-s-buffer"; @@ -53200,7 +53644,7 @@ sackspace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sackspace"; - version = "20130719.456"; + version = "20130719.256"; src = fetchFromGitHub { owner = "cofi"; repo = "sackspace.el"; @@ -53221,7 +53665,7 @@ sage-shell-mode = callPackage ({ cl-lib ? null, deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sage-shell-mode"; - version = "20160527.48"; + version = "20160526.2248"; src = fetchFromGitHub { owner = "stakemori"; repo = "sage-shell-mode"; @@ -53242,7 +53686,7 @@ salt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-jinja2, mmm-mode, yaml-mode }: melpaBuild { pname = "salt-mode"; - version = "20150904.1313"; + version = "20150904.1113"; src = fetchFromGitHub { owner = "beardedprojamz"; repo = "salt-mode"; @@ -53263,7 +53707,7 @@ sane-term = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sane-term"; - version = "20160620.847"; + version = "20160620.647"; src = fetchFromGitHub { owner = "adamrt"; repo = "sane-term"; @@ -53284,7 +53728,7 @@ sass-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, haml-mode, lib, melpaBuild }: melpaBuild { pname = "sass-mode"; - version = "20160506.2245"; + version = "20160506.2045"; src = fetchFromGitHub { owner = "nex3"; repo = "sass-mode"; @@ -53305,7 +53749,7 @@ sauron = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sauron"; - version = "20160501.1245"; + version = "20160501.1045"; src = fetchFromGitHub { owner = "djcb"; repo = "sauron"; @@ -53326,7 +53770,7 @@ save-load-path = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "save-load-path"; - version = "20140206.614"; + version = "20140206.414"; src = fetchFromGitHub { owner = "rubikitch"; repo = "save-load-path"; @@ -53347,7 +53791,7 @@ save-visited-files = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "save-visited-files"; - version = "20151021.1243"; + version = "20151021.1043"; src = fetchFromGitHub { owner = "nflath"; repo = "save-visited-files"; @@ -53368,7 +53812,7 @@ savekill = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "savekill"; - version = "20140417.2129"; + version = "20140417.1929"; src = fetchFromGitHub { owner = "rubikitch"; repo = "savekill"; @@ -53389,12 +53833,12 @@ say-what-im-doing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "say-what-im-doing"; - version = "20160512.1355"; + version = "20160706.1231"; src = fetchFromGitHub { owner = "benaiah"; repo = "say-what-im-doing"; - rev = "4acc16360a29646040b51db158ba7fdeb711449d"; - sha256 = "1gkzgcnh5ib4j5206mx8gbwj5ykay19vqlfg9070m2r09d1a55qf"; + rev = "5b2ce6783b02805bcac1107a149bfba3852cd9d5"; + sha256 = "0wy4hrc44ajl88krp6qy40szl2kl2wc3xjz3y4n250d1v81k25xi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4d22ddcd4ad9514fe0c36f299e7463a4b7e771d7/recipes/say-what-im-doing"; @@ -53410,12 +53854,12 @@ sbt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sbt-mode"; - version = "20160606.1159"; + version = "20160727.406"; src = fetchFromGitHub { owner = "ensime"; repo = "emacs-sbt-mode"; - rev = "972c22a0c5f80fec5b42c63152da4a63e43da214"; - sha256 = "00ai9fl3xnkp5i5yri6fdy4anvv0pxj0f5lybl6niymzg6dy3bcj"; + rev = "5c3424b3f2b14e3c03321ae0e257301af1bef880"; + sha256 = "115ddxbpca23xcfcz6a4a7cbsqv0jagkh0jrgidim4gfzsxy9pid"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/364abdc3829fc12e19f00b534565227dbc30baad/recipes/sbt-mode"; @@ -53431,12 +53875,12 @@ scad-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "scad-mode"; - version = "20160205.1243"; + version = "20160205.1043"; src = fetchFromGitHub { owner = "openscad"; repo = "openscad"; - rev = "fee7a7292439e563809e1ae0b6b02947739b1d30"; - sha256 = "1fp3ra77ncihqfyvw27wwab871rx7b6rnrwi5l9qnsk601lw6wha"; + rev = "1c4c93149b6a656ab99f901c15271edf1a1ae0a3"; + sha256 = "1pd2k7z4ixnbnyya09kh6z5v4m7n2i92rfjr0r3yzb8hk3sx6fvs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode"; @@ -53452,7 +53896,7 @@ scad-preview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, scad-mode }: melpaBuild { pname = "scad-preview"; - version = "20160206.736"; + version = "20160206.536"; src = fetchFromGitHub { owner = "zk-phi"; repo = "scad-preview"; @@ -53473,7 +53917,7 @@ scala-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "scala-mode"; - version = "20160519.931"; + version = "20160519.731"; src = fetchFromGitHub { owner = "ensime"; repo = "emacs-scala-mode"; @@ -53494,7 +53938,7 @@ scf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "scf-mode"; - version = "20151121.2048"; + version = "20151121.1848"; src = fetchFromGitHub { owner = "lewang"; repo = "scf-mode"; @@ -53515,7 +53959,7 @@ scheme-complete = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "scheme-complete"; - version = "20160604.733"; + version = "20160604.533"; src = fetchFromGitHub { owner = "ashinn"; repo = "scheme-complete"; @@ -53536,7 +53980,7 @@ scheme-here = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "scheme-here"; - version = "20141028.218"; + version = "20141028.18"; src = fetchFromGitHub { owner = "hiddenlotus"; repo = "scheme-here"; @@ -53557,7 +54001,7 @@ scion = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "scion"; - version = "20130315.755"; + version = "20130315.555"; src = fetchFromGitHub { owner = "nominolo"; repo = "scion"; @@ -53578,7 +54022,7 @@ sclang-extensions = callPackage ({ auto-complete, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "sclang-extensions"; - version = "20160508.2238"; + version = "20160508.2038"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "sclang-extensions"; @@ -53599,7 +54043,7 @@ sclang-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "sclang-snippets"; - version = "20130513.251"; + version = "20130513.51"; src = fetchFromGitHub { owner = "ptrv"; repo = "sclang-snippets"; @@ -53620,7 +54064,7 @@ scpaste = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild }: melpaBuild { pname = "scpaste"; - version = "20160613.2143"; + version = "20160613.1943"; src = fetchFromGitHub { owner = "technomancy"; repo = "scpaste"; @@ -53641,7 +54085,7 @@ scratch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "scratch"; - version = "20120830.1228"; + version = "20120830.1028"; src = fetchFromGitHub { owner = "ieure"; repo = "scratch-el"; @@ -53662,7 +54106,7 @@ scratch-ext = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "scratch-ext"; - version = "20140103.2316"; + version = "20140103.2116"; src = fetchFromGitHub { owner = "kyanagi"; repo = "scratch-ext-el"; @@ -53683,7 +54127,7 @@ scratch-log = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "scratch-log"; - version = "20141115.143"; + version = "20141114.2343"; src = fetchFromGitHub { owner = "mori-dev"; repo = "scratch-log"; @@ -53704,12 +54148,12 @@ scratch-message = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "scratch-message"; - version = "20160526.509"; + version = "20160718.935"; src = fetchFromGitHub { owner = "thisirs"; repo = "scratch-message"; - rev = "0d867600ccedeb571e5ba11dcedb8b6f614e0eb0"; - sha256 = "0dq5hqx452vgxi5rsbagm2ckfdzxvc4aw5y1053vhky4i9x6yc72"; + rev = "70f417878144b4a701b0b28dbc47b03d84c07fd1"; + sha256 = "1v9qlizlp394ym5l58g31kgr8xwsix6y36vccjlin84ygz9pgps7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/24c5ff6b643de9fb79334eff57b702281b20bc10/recipes/scratch-message"; @@ -53725,7 +54169,7 @@ scratch-palette = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popwin }: melpaBuild { pname = "scratch-palette"; - version = "20150225.242"; + version = "20150225.42"; src = fetchFromGitHub { owner = "zk-phi"; repo = "scratch-palette"; @@ -53746,7 +54190,7 @@ scratch-pop = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popwin }: melpaBuild { pname = "scratch-pop"; - version = "20150820.339"; + version = "20150820.139"; src = fetchFromGitHub { owner = "zk-phi"; repo = "scratch-pop"; @@ -53767,7 +54211,7 @@ scratches = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "scratches"; - version = "20151005.2316"; + version = "20151005.2116"; src = fetchFromGitHub { owner = "cheunghy"; repo = "scratches"; @@ -53787,7 +54231,7 @@ }) {}; screenshot = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "screenshot"; - version = "20120509.605"; + version = "20120509.405"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/screenshot.el"; sha256 = "0q7yxaaa0fic4d2xwr0qk28clkinwz4xvw3wf8dv1g322s0xx2cw"; @@ -53806,12 +54250,12 @@ scrooge = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, thrift }: melpaBuild { pname = "scrooge"; - version = "20160529.2120"; + version = "20160718.1735"; src = fetchFromGitHub { owner = "cosmicexplorer"; repo = "emacs-scrooge"; - rev = "acffc6c9b0044f366eb4c36dff2dc1a97003f561"; - sha256 = "0zv1xjjn7pklkla7g26mxmv3148plx8ilw4yqjmc2ghi4br8p0bk"; + rev = "5e8a301919ec88a7aa48a9c66cafb1bddd9f6100"; + sha256 = "0ndv9j7n9z53f7q0w7cgb4wsh7vyb8f4bga723cm7j0gipx8fjnf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e3623181fa771dc94a7026eb58ac81fe9d9fc68/recipes/scrooge"; @@ -53827,7 +54271,7 @@ scss-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "scss-mode"; - version = "20150107.1600"; + version = "20150107.1400"; src = fetchFromGitHub { owner = "antonj"; repo = "scss-mode"; @@ -53848,7 +54292,7 @@ search-web = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "search-web"; - version = "20150312.603"; + version = "20150312.403"; src = fetchFromGitHub { owner = "tomoya"; repo = "search-web.el"; @@ -53869,7 +54313,7 @@ searchq = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "searchq"; - version = "20150829.711"; + version = "20150829.511"; src = fetchFromGitHub { owner = "boyw165"; repo = "searchq"; @@ -53890,7 +54334,7 @@ seclusion-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "seclusion-mode"; - version = "20121118.1753"; + version = "20121118.1553"; src = fetchFromGitHub { owner = "dleslie"; repo = "seclusion-mode"; @@ -53910,7 +54354,7 @@ }) {}; second-sel = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "second-sel"; - version = "20151231.1753"; + version = "20151231.1553"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/second-sel.el"; sha256 = "143vg6z3aa0znmsx88r675vv5g2c13giz25dcbzazsp4wcr46wvq"; @@ -53929,7 +54373,7 @@ seeing-is-believing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "seeing-is-believing"; - version = "20160602.918"; + version = "20160602.718"; src = fetchFromGitHub { owner = "jcinnamond"; repo = "seeing-is-believing"; @@ -53950,7 +54394,7 @@ seethru = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, shadchen }: melpaBuild { pname = "seethru"; - version = "20150218.1229"; + version = "20150218.1029"; src = fetchFromGitHub { owner = "Benaiah"; repo = "seethru"; @@ -53971,7 +54415,7 @@ sekka = callPackage ({ cl-lib ? null, concurrent, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "sekka"; - version = "20150708.659"; + version = "20150708.459"; src = fetchFromGitHub { owner = "kiyoka"; repo = "sekka"; @@ -53992,7 +54436,7 @@ select-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "select-themes"; - version = "20160220.1906"; + version = "20160220.1706"; src = fetchFromGitHub { owner = "jasonm23"; repo = "emacs-select-themes"; @@ -54013,7 +54457,7 @@ selected = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "selected"; - version = "20160428.237"; + version = "20160428.37"; src = fetchFromGitHub { owner = "Kungsgeten"; repo = "selected.el"; @@ -54034,7 +54478,7 @@ selectric-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "selectric-mode"; - version = "20151201.918"; + version = "20151201.718"; src = fetchFromGitHub { owner = "rbanffy"; repo = "selectric-mode"; @@ -54055,7 +54499,7 @@ semi = callPackage ({ fetchFromGitHub, fetchurl, flim, lib, melpaBuild }: melpaBuild { pname = "semi"; - version = "20160701.640"; + version = "20160701.440"; src = fetchFromGitHub { owner = "wanderlust"; repo = "semi"; @@ -54076,7 +54520,7 @@ sendto = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sendto"; - version = "20160425.750"; + version = "20160425.550"; src = fetchFromGitHub { owner = "lujun9972"; repo = "sendto.el"; @@ -54097,7 +54541,7 @@ sensitive = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sequences }: melpaBuild { pname = "sensitive"; - version = "20131015.835"; + version = "20131015.635"; src = fetchFromGitHub { owner = "timvisher"; repo = "sensitive.el"; @@ -54118,7 +54562,7 @@ sentence-highlight = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "sentence-highlight"; - version = "20121026.950"; + version = "20121026.750"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/sentence-highlight.el"; sha256 = "01qj57zpqpr4rxk9bsx828c7baac1xaa58cz22fncirdx00svn2k"; @@ -54137,7 +54581,7 @@ sentence-navigation = callPackage ({ ample-regexps, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sentence-navigation"; - version = "20150914.2346"; + version = "20150914.2146"; src = fetchFromGitHub { owner = "noctuid"; repo = "emacs-sentence-navigation"; @@ -54158,7 +54602,7 @@ seoul256-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "seoul256-theme"; - version = "20150714.1735"; + version = "20150714.1535"; src = fetchFromGitHub { owner = "ChrisDavison"; repo = "seoul256.el"; @@ -54179,7 +54623,7 @@ sequences = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sequences"; - version = "20130908.1322"; + version = "20130908.1122"; src = fetchFromGitHub { owner = "timvisher"; repo = "sequences.el"; @@ -54200,7 +54644,7 @@ sequential-command = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "sequential-command"; - version = "20151207.1603"; + version = "20151207.1403"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/sequential-command.el"; sha256 = "0vg8rqzzi29swznhra2mnf45czr2vb77dpcxn3j0fi7gynx3wcwk"; @@ -54219,7 +54663,7 @@ servant = callPackage ({ ansi, commander, dash, epl, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up, web-server }: melpaBuild { pname = "servant"; - version = "20140216.619"; + version = "20140216.419"; src = fetchFromGitHub { owner = "cask"; repo = "servant"; @@ -54240,7 +54684,7 @@ serverspec = callPackage ({ dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "serverspec"; - version = "20150623.655"; + version = "20150623.455"; src = fetchFromGitHub { owner = "k1LoW"; repo = "emacs-serverspec"; @@ -54261,7 +54705,7 @@ session = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "session"; - version = "20120510.1900"; + version = "20120510.1700"; src = fetchFromGitHub { owner = "emacsorphanage"; repo = "session"; @@ -54282,7 +54726,7 @@ seti-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "seti-theme"; - version = "20150314.322"; + version = "20150314.122"; src = fetchFromGitHub { owner = "caisah"; repo = "seti-theme"; @@ -54303,7 +54747,7 @@ sexp-move = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sexp-move"; - version = "20150915.1230"; + version = "20150915.1030"; src = fetchFromGitLab { owner = "elzair"; repo = "sexp-move"; @@ -54324,7 +54768,7 @@ shackle = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shackle"; - version = "20160516.619"; + version = "20160516.419"; src = fetchFromGitHub { owner = "wasamasa"; repo = "shackle"; @@ -54345,7 +54789,7 @@ shadchen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shadchen"; - version = "20141102.1239"; + version = "20141102.1039"; src = fetchFromGitHub { owner = "VincentToups"; repo = "shadchen-el"; @@ -54366,7 +54810,7 @@ shader-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shader-mode"; - version = "20151030.904"; + version = "20151030.704"; src = fetchFromGitHub { owner = "midnightSuyama"; repo = "shader-mode"; @@ -54387,7 +54831,7 @@ shakespeare-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shakespeare-mode"; - version = "20160609.1228"; + version = "20160609.1028"; src = fetchFromGitHub { owner = "CodyReichert"; repo = "shakespeare-mode"; @@ -54408,7 +54852,7 @@ shampoo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shampoo"; - version = "20131230.419"; + version = "20131230.219"; src = fetchFromGitHub { owner = "dmatveev"; repo = "shampoo-emacs"; @@ -54428,7 +54872,7 @@ }) {}; shell-command = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "shell-command"; - version = "20090621.832"; + version = "20090621.632"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/shell-command.el"; sha256 = "0jr5sbmg4zrx2dfdrajh2didm6dxx9ri5ib9qnwhc1jlppinyi7l"; @@ -54447,7 +54891,7 @@ shell-current-directory = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shell-current-directory"; - version = "20140101.1754"; + version = "20140101.1554"; src = fetchFromGitHub { owner = "metaperl"; repo = "shell-current-directory"; @@ -54468,7 +54912,7 @@ shell-here = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shell-here"; - version = "20150728.1204"; + version = "20150728.1004"; src = fetchFromGitHub { owner = "ieure"; repo = "shell-here"; @@ -54488,7 +54932,7 @@ }) {}; shell-history = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "shell-history"; - version = "20100504.350"; + version = "20100504.150"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/shell-history.el"; sha256 = "0biqjm0fpd7c7jilgkcwp6c32car05r5akimbcdii3clllavma7r"; @@ -54507,7 +54951,7 @@ shell-pop = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shell-pop"; - version = "20160611.740"; + version = "20160611.540"; src = fetchFromGitHub { owner = "kyagi"; repo = "shell-pop-el"; @@ -54528,7 +54972,7 @@ shell-split-string = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shell-split-string"; - version = "20151224.408"; + version = "20151224.208"; src = fetchFromGitHub { owner = "10sr"; repo = "shell-split-string-el"; @@ -54549,7 +54993,7 @@ shell-switcher = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shell-switcher"; - version = "20160112.135"; + version = "20160111.2335"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "shell-switcher"; @@ -54570,7 +55014,7 @@ shell-toggle = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shell-toggle"; - version = "20150226.811"; + version = "20150226.611"; src = fetchFromGitHub { owner = "knu"; repo = "shell-toggle.el"; @@ -54591,7 +55035,7 @@ shelldoc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "shelldoc"; - version = "20151114.2125"; + version = "20151114.1925"; src = fetchFromGitHub { owner = "mhayashi1120"; repo = "Emacs-shelldoc"; @@ -54612,7 +55056,7 @@ shelltest-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shelltest-mode"; - version = "20141227.448"; + version = "20141227.248"; src = fetchFromGitHub { owner = "rtrn"; repo = "shelltest-mode"; @@ -54633,7 +55077,7 @@ shen-elisp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shen-elisp"; - version = "20160624.540"; + version = "20160624.340"; src = fetchFromGitHub { owner = "deech"; repo = "shen-elisp"; @@ -54654,7 +55098,7 @@ shift-number = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shift-number"; - version = "20160419.1457"; + version = "20160419.1257"; src = fetchFromGitHub { owner = "alezost"; repo = "shift-number.el"; @@ -54675,7 +55119,7 @@ shift-text = callPackage ({ cl-lib ? null, es-lib, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shift-text"; - version = "20130831.1155"; + version = "20130831.955"; src = fetchFromGitHub { owner = "sabof"; repo = "shift-text"; @@ -54693,29 +55137,10 @@ license = lib.licenses.free; }; }) {}; - shimbun = callPackage ({ fetchcvs, fetchurl, lib, melpaBuild }: melpaBuild { - pname = "shimbun"; - version = "20160422.354"; - src = fetchcvs { - cvsRoot = ":pserver:anonymous@cvs.namazu.org:/storage/cvsroot"; - module = "emacs-w3m"; - sha256 = "52e1e998a3bf83fe7bca1d70de5845fdfca04d09467adc3b691987f17a98ff5e"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/8bbb18b0db057b9cca78ae7280674fd1beb56443/recipes/shimbun"; - sha256 = "05dxdyh8xvbpjmc19q733jmjd6kgv8rdahjd3bw5wwsb3smqig4x"; - name = "shimbun"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/shimbun"; - license = lib.licenses.free; - }; - }) {}; shm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shm"; - version = "20160615.231"; + version = "20160615.31"; src = fetchFromGitHub { owner = "chrisdone"; repo = "structured-haskell-mode"; @@ -54736,7 +55161,7 @@ shoulda = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shoulda"; - version = "20140616.1333"; + version = "20140616.1133"; src = fetchFromGitHub { owner = "marcwebbie"; repo = "shoulda.el"; @@ -54757,7 +55182,7 @@ show-css = callPackage ({ doom, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "show-css"; - version = "20160210.808"; + version = "20160210.608"; src = fetchFromGitHub { owner = "8cylinder"; repo = "showcss-mode"; @@ -54778,7 +55203,7 @@ show-marks = callPackage ({ fetchFromGitHub, fetchurl, fm, lib, melpaBuild }: melpaBuild { pname = "show-marks"; - version = "20130805.949"; + version = "20130805.749"; src = fetchFromGitHub { owner = "vapniks"; repo = "show-marks"; @@ -54798,10 +55223,10 @@ }) {}; showkey = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "showkey"; - version = "20151231.1759"; + version = "20160704.1421"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/showkey.el"; - sha256 = "0pq88kz5h0hzgfk8fyf3lppxalmadg5czbik824bpykp9l9gnf1m"; + sha256 = "0bsc6lg4hh3h5fskyzdz9pix90q5r6nhg1zxjividd57gibmkbq2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e2b5576d501aee95c8f62d721a69077a1f3df424/recipes/showkey"; @@ -54816,7 +55241,7 @@ }) {}; showtip = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "showtip"; - version = "20080329.2159"; + version = "20080329.1959"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/showtip.el"; sha256 = "01ibg36lvmdk7ac1k0f0r6wyds4rq0wb7gzw26nkiwykn14gxaql"; @@ -54835,7 +55260,7 @@ shpec-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shpec-mode"; - version = "20150530.422"; + version = "20150530.222"; src = fetchFromGitHub { owner = "shpec"; repo = "shpec-mode"; @@ -54856,7 +55281,7 @@ shrink-whitespace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shrink-whitespace"; - version = "20150916.1415"; + version = "20150916.1215"; src = fetchFromGitHub { owner = "jcpetkovich"; repo = "shrink-whitespace.el"; @@ -54877,7 +55302,7 @@ shut-up = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shut-up"; - version = "20150423.722"; + version = "20150423.522"; src = fetchFromGitHub { owner = "cask"; repo = "shut-up"; @@ -54898,7 +55323,7 @@ sibilant-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sibilant-mode"; - version = "20151119.1545"; + version = "20151119.1345"; src = fetchFromGitHub { owner = "jbr"; repo = "sibilant-mode"; @@ -54919,7 +55344,7 @@ sicp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sicp"; - version = "20151130.957"; + version = "20151130.757"; src = fetchFromGitHub { owner = "webframp"; repo = "sicp-info"; @@ -54940,7 +55365,7 @@ sift = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sift"; - version = "20160107.415"; + version = "20160107.215"; src = fetchFromGitHub { owner = "nlamirault"; repo = "sift.el"; @@ -54961,7 +55386,7 @@ signal = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "signal"; - version = "20160424.210"; + version = "20160424.10"; src = fetchFromGitHub { owner = "Mola-T"; repo = "signal"; @@ -54982,7 +55407,7 @@ signature = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "signature"; - version = "20140730.1449"; + version = "20140730.1249"; src = fetchFromGitHub { owner = "pidu"; repo = "signature"; @@ -55003,7 +55428,7 @@ silkworm-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "silkworm-theme"; - version = "20160217.709"; + version = "20160217.509"; src = fetchFromGitHub { owner = "mswift42"; repo = "silkworm-theme"; @@ -55024,7 +55449,7 @@ simp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "simp"; - version = "20160315.1124"; + version = "20160315.924"; src = fetchFromGitHub { owner = "re5et"; repo = "simp"; @@ -55045,7 +55470,7 @@ simple-bookmarks = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "simple-bookmarks"; - version = "20160627.540"; + version = "20160627.340"; src = fetchFromGitHub { owner = "jtkDvlp"; repo = "simple-bookmarks"; @@ -55066,7 +55491,7 @@ simple-call-tree = callPackage ({ anaphora, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "simple-call-tree"; - version = "20160609.1308"; + version = "20160609.1108"; src = fetchFromGitHub { owner = "vapniks"; repo = "simple-call-tree"; @@ -55087,7 +55512,7 @@ simple-httpd = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "simple-httpd"; - version = "20150430.1955"; + version = "20150430.1755"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacs-web-server"; @@ -55105,22 +55530,22 @@ license = lib.licenses.free; }; }) {}; - simple-mpc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + simple-mpc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "simple-mpc"; - version = "20160605.1208"; + version = "20160716.343"; src = fetchFromGitHub { owner = "jorenvo"; repo = "simple-mpc"; - rev = "e5af3cf2035edfc56b423cd573e4254f388be753"; - sha256 = "0vdns2flm13rlqgij4mlvd3zagv9j4jv43x5d2f09ka7cdd27a9f"; + rev = "0802c385ff17b4226314e0ac396ea7e425e35092"; + sha256 = "1xwna7s32baz0aix5d1q52f5lvh045904fvydhchxv9y1fs46jzl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62d762308c1ec0c1d8f7b4755b7deb285cbac018/recipes/simple-mpc"; sha256 = "05x2xyys5mf6k7ndh0l6ykyiygaznb4f8bx3npbhvihrsz9ilf8r"; name = "simple-mpc"; }; - packageRequires = []; + packageRequires = [ s ]; meta = { homepage = "https://melpa.org/#/simple-mpc"; license = lib.licenses.free; @@ -55129,7 +55554,7 @@ simple-plus = callPackage ({ fetchurl, lib, melpaBuild, strings }: melpaBuild { pname = "simple-plus"; - version = "20151231.1800"; + version = "20151231.1600"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/simple+.el"; sha256 = "01fdk790jlpxy95y67yv6944ws4zjh7gs6ymnj1yflf19ccsdsnn"; @@ -55148,7 +55573,7 @@ simple-rtm = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, rtm }: melpaBuild { pname = "simple-rtm"; - version = "20160222.934"; + version = "20160222.734"; src = fetchFromGitHub { owner = "mbunkus"; repo = "simple-rtm"; @@ -55169,7 +55594,7 @@ simple-screen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "simple-screen"; - version = "20141023.958"; + version = "20141023.758"; src = fetchFromGitHub { owner = "wachikun"; repo = "simple-screen"; @@ -55190,7 +55615,7 @@ simpleclip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "simpleclip"; - version = "20150804.1210"; + version = "20150804.1010"; src = fetchFromGitHub { owner = "rolandwalker"; repo = "simpleclip"; @@ -55211,7 +55636,7 @@ simplenote = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "simplenote"; - version = "20141118.840"; + version = "20141118.640"; src = fetchFromGitHub { owner = "dotemacs"; repo = "simplenote.el"; @@ -55232,7 +55657,7 @@ simplenote2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred }: melpaBuild { pname = "simplenote2"; - version = "20160318.803"; + version = "20160318.603"; src = fetchFromGitHub { owner = "alpha22jp"; repo = "simplenote2.el"; @@ -55253,7 +55678,7 @@ simplezen = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "simplezen"; - version = "20130421.500"; + version = "20130421.300"; src = fetchFromGitHub { owner = "magnars"; repo = "simplezen.el"; @@ -55274,7 +55699,7 @@ skeletor = callPackage ({ cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }: melpaBuild { pname = "skeletor"; - version = "20151220.2254"; + version = "20151220.2054"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "skeletor.el"; @@ -55295,7 +55720,7 @@ skewer-less = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, skewer-mode }: melpaBuild { pname = "skewer-less"; - version = "20131015.822"; + version = "20131015.622"; src = fetchFromGitHub { owner = "purcell"; repo = "skewer-less"; @@ -55316,7 +55741,7 @@ skewer-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, simple-httpd }: melpaBuild { pname = "skewer-mode"; - version = "20150914.1504"; + version = "20150914.1304"; src = fetchFromGitHub { owner = "skeeto"; repo = "skewer-mode"; @@ -55337,12 +55762,12 @@ skewer-reload-stylesheets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, skewer-mode }: melpaBuild { pname = "skewer-reload-stylesheets"; - version = "20160702.2113"; + version = "20160725.520"; src = fetchFromGitHub { owner = "NateEag"; repo = "skewer-reload-stylesheets"; - rev = "df2090cc01d3bea963fd7687e0eccf8f52780431"; - sha256 = "1nxpl8vv1ybb159838czzjxbk81saz0i0m8k0ddaxf5zgvcr87qh"; + rev = "3207abca9551660407a6b009cb40fb32bbb550da"; + sha256 = "0fgxil70yrf6annrbvza4lqaagrn65c7pmayg6pr16hy5w8wcgsk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7a00894cb1398757b90f670a0beb7b7f640b8b8/recipes/skewer-reload-stylesheets"; @@ -55358,12 +55783,12 @@ skype = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "skype"; - version = "20131001.2318"; + version = "20160711.124"; src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-skype"; - rev = "c10f96d1d105acee8a9a9804652bf6a813591da4"; - sha256 = "0gzj7cf42nhp3ac1a2gxcfbmn80z1z46zxsfr2f5xil2gjag39fx"; + rev = "8e3b33e620ed355522aa36434ff41e3ced080629"; + sha256 = "078gjgknsrm1n2f0diian9l056kqh1fj2w0y6ildsvzjipygdz1y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d3448698a35c9d5d25639f62024f89cac03d5830/recipes/skype"; @@ -55379,12 +55804,12 @@ slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }: melpaBuild { pname = "slack"; - version = "20160623.820"; + version = "20160710.551"; src = fetchFromGitHub { owner = "yuya373"; repo = "emacs-slack"; - rev = "f93c6123a9acf53dc222ff98154300d3b8001648"; - sha256 = "0ncfgn7xs0hz724myfyw8n6fs4hy50q0p6l7yx0yflivgha2a29l"; + rev = "8e82c006d98d0a8607de2849cf178c3df1498b72"; + sha256 = "0cyvggij1h5hvdp68cz0ag2g8i7zb5ivrjplj4knyrm2bzd4fd03"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack"; @@ -55400,7 +55825,7 @@ slamhound = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "slamhound"; - version = "20140506.1818"; + version = "20140506.1618"; src = fetchFromGitHub { owner = "technomancy"; repo = "slamhound"; @@ -55421,7 +55846,7 @@ slideview = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "slideview"; - version = "20150324.1740"; + version = "20150324.1540"; src = fetchFromGitHub { owner = "mhayashi1120"; repo = "Emacs-slideview"; @@ -55442,7 +55867,7 @@ slim-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "slim-mode"; - version = "20140611.1150"; + version = "20140611.950"; src = fetchFromGitHub { owner = "slim-template"; repo = "emacs-slim"; @@ -55463,12 +55888,12 @@ slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }: melpaBuild { pname = "slime"; - version = "20160624.1051"; + version = "20160704.1500"; src = fetchFromGitHub { owner = "slime"; repo = "slime"; - rev = "3fa0c6901121036113f2277a9d8f20eda3c19e1c"; - sha256 = "04cdllay37qb67fyh1q93wcqmd1c67rrps31bxwj64f70h33ighb"; + rev = "a8a3dd887141a6a64cd9646a95a56c48e1a2f5e1"; + sha256 = "1z7ib1m9syhhn41kchipgbz9cx6dv4hfl96pjlmzprdjx8di1849"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime"; @@ -55484,7 +55909,7 @@ slime-annot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, slime }: melpaBuild { pname = "slime-annot"; - version = "20131230.2108"; + version = "20131230.1908"; src = fetchFromGitHub { owner = "arielnetworks"; repo = "cl-annot"; @@ -55505,7 +55930,7 @@ slime-company = callPackage ({ company, fetchFromGitHub, fetchurl, lib, melpaBuild, slime }: melpaBuild { pname = "slime-company"; - version = "20151210.814"; + version = "20151210.614"; src = fetchFromGitHub { owner = "anwyn"; repo = "slime-company"; @@ -55526,12 +55951,12 @@ slime-docker = callPackage ({ cl-lib ? null, docker-tramp, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, slime }: melpaBuild { pname = "slime-docker"; - version = "20160506.1608"; + version = "20160723.1326"; src = fetchFromGitHub { owner = "daewok"; repo = "slime-docker"; - rev = "114992086054abb298af7c6e24f2ef19794e2de4"; - sha256 = "0swd9rbsag8k18njp741ljg6lmlz949i4bbz5w7bl0spcpc26fs9"; + rev = "a84b26082c5989f148753c275ffe103f801a83f3"; + sha256 = "0qjpj7n0pnqb5113fhqfl2qj8h4f9bfd7wkbi4gp2ksp9wh7ivh0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/15ec3f7208287161571c8fc3b29369ceabb44e5f/recipes/slime-docker"; @@ -55547,7 +55972,7 @@ slime-ritz = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "slime-ritz"; - version = "20130218.1737"; + version = "20130218.1537"; src = fetchFromGitHub { owner = "pallet"; repo = "ritz"; @@ -55568,7 +55993,7 @@ slime-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "slime-theme"; - version = "20141116.102"; + version = "20141115.2302"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-slime-theme"; @@ -55589,7 +56014,7 @@ slime-volleyball = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "slime-volleyball"; - version = "20140717.2341"; + version = "20140717.2141"; src = fetchFromGitHub { owner = "fitzsim"; repo = "slime-volleyball"; @@ -55610,7 +56035,7 @@ slirm = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "slirm"; - version = "20160201.825"; + version = "20160201.625"; src = fetchFromGitHub { owner = "fbie"; repo = "slirm"; @@ -55631,7 +56056,7 @@ slovak-holidays = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "slovak-holidays"; - version = "20150418.355"; + version = "20150418.155"; src = fetchFromGitHub { owner = "Fuco1"; repo = "slovak-holidays"; @@ -55652,7 +56077,7 @@ sly = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sly"; - version = "20160629.1251"; + version = "20160629.1051"; src = fetchFromGitHub { owner = "capitaomorte"; repo = "sly"; @@ -55673,7 +56098,7 @@ sly-company = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sly }: melpaBuild { pname = "sly-company"; - version = "20160308.757"; + version = "20160308.557"; src = fetchFromGitHub { owner = "capitaomorte"; repo = "sly-company"; @@ -55694,7 +56119,7 @@ sly-hello-world = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, sly }: melpaBuild { pname = "sly-hello-world"; - version = "20160119.836"; + version = "20160119.636"; src = fetchFromGitHub { owner = "capitaomorte"; repo = "sly-hello-world"; @@ -55715,7 +56140,7 @@ sly-macrostep = callPackage ({ fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild, sly }: melpaBuild { pname = "sly-macrostep"; - version = "20160119.634"; + version = "20160119.434"; src = fetchFromGitHub { owner = "capitaomorte"; repo = "sly-macrostep"; @@ -55736,7 +56161,7 @@ sly-named-readtables = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, sly }: melpaBuild { pname = "sly-named-readtables"; - version = "20150817.1016"; + version = "20150817.816"; src = fetchFromGitHub { owner = "capitaomorte"; repo = "sly-named-readtables"; @@ -55757,7 +56182,7 @@ sly-quicklisp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, sly }: melpaBuild { pname = "sly-quicklisp"; - version = "20160204.1015"; + version = "20160204.815"; src = fetchFromGitHub { owner = "capitaomorte"; repo = "sly-quicklisp"; @@ -55778,7 +56203,7 @@ sly-repl-ansi-color = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, sly }: melpaBuild { pname = "sly-repl-ansi-color"; - version = "20160214.218"; + version = "20160214.18"; src = fetchFromGitHub { owner = "PuercoPop"; repo = "sly-repl-ansi-color"; @@ -55799,7 +56224,7 @@ smart-comment = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smart-comment"; - version = "20160322.1339"; + version = "20160322.1139"; src = fetchFromGitHub { owner = "paldepind"; repo = "smart-comment"; @@ -55819,7 +56244,7 @@ }) {}; smart-compile = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "smart-compile"; - version = "20150519.1147"; + version = "20150519.947"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/smart-compile.el"; sha256 = "0sm4nxynwhwypzw008fz56axai9lrphjczwzfdy7da3akan18rbd"; @@ -55838,7 +56263,7 @@ smart-cursor-color = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smart-cursor-color"; - version = "20141124.1119"; + version = "20141124.919"; src = fetchFromGitHub { owner = "7696122"; repo = "smart-cursor-color"; @@ -55859,7 +56284,7 @@ smart-forward = callPackage ({ expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smart-forward"; - version = "20140430.213"; + version = "20140430.13"; src = fetchFromGitHub { owner = "magnars"; repo = "smart-forward.el"; @@ -55880,7 +56305,7 @@ smart-indent-rigidly = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smart-indent-rigidly"; - version = "20141205.1815"; + version = "20141205.1615"; src = fetchFromGitHub { owner = "re5et"; repo = "smart-indent-rigidly"; @@ -55901,7 +56326,7 @@ smart-mark = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smart-mark"; - version = "20150911.2110"; + version = "20150911.1910"; src = fetchFromGitHub { owner = "cheunghy"; repo = "smart-mark"; @@ -55922,12 +56347,12 @@ smart-mode-line = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rich-minority }: melpaBuild { pname = "smart-mode-line"; - version = "20160618.1712"; + version = "20160618.1512"; src = fetchFromGitHub { owner = "Malabarba"; repo = "smart-mode-line"; - rev = "7dec98dde24dec2bb92c7a68e2539f96e550a0f3"; - sha256 = "065mzjdg8dzaxnzf5r9lwx9bn0fzd6bjp8c9iz8hb4372hx19ff8"; + rev = "558251e200cc555df137e60326295f2bd640fd6a"; + sha256 = "1xh1qcxw0r3j8hx8k8hsx0cl82wps5x755j4kbn01m7srzv6v167"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/smart-mode-line"; @@ -55943,12 +56368,12 @@ smart-mode-line-powerline-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline, smart-mode-line }: melpaBuild { pname = "smart-mode-line-powerline-theme"; - version = "20160520.1054"; + version = "20160705.1738"; src = fetchFromGitHub { owner = "Malabarba"; repo = "smart-mode-line"; - rev = "7dec98dde24dec2bb92c7a68e2539f96e550a0f3"; - sha256 = "065mzjdg8dzaxnzf5r9lwx9bn0fzd6bjp8c9iz8hb4372hx19ff8"; + rev = "558251e200cc555df137e60326295f2bd640fd6a"; + sha256 = "1xh1qcxw0r3j8hx8k8hsx0cl82wps5x755j4kbn01m7srzv6v167"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/60072b183151e519d141ec559b4902d20c87904c/recipes/smart-mode-line-powerline-theme"; @@ -55964,7 +56389,7 @@ smart-newline = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smart-newline"; - version = "20131207.2140"; + version = "20131207.1940"; src = fetchFromGitHub { owner = "ainame"; repo = "smart-newline.el"; @@ -55985,7 +56410,7 @@ smart-region = callPackage ({ cl-lib ? null, emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }: melpaBuild { pname = "smart-region"; - version = "20150903.903"; + version = "20150903.703"; src = fetchFromGitHub { owner = "uk-ar"; repo = "smart-region"; @@ -56006,7 +56431,7 @@ smart-shift = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smart-shift"; - version = "20150203.125"; + version = "20150202.2325"; src = fetchFromGitHub { owner = "hbin"; repo = "smart-shift"; @@ -56027,7 +56452,7 @@ smart-tab = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smart-tab"; - version = "20150703.1117"; + version = "20150703.917"; src = fetchFromGitHub { owner = "genehack"; repo = "smart-tab"; @@ -56048,7 +56473,7 @@ smart-tabs-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smart-tabs-mode"; - version = "20160629.952"; + version = "20160629.752"; src = fetchFromGitHub { owner = "jcsalomon"; repo = "smarttabs"; @@ -56066,22 +56491,22 @@ license = lib.licenses.free; }; }) {}; - smart-window = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + smart-window = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smart-window"; - version = "20130214.1342"; + version = "20160716.1830"; src = fetchFromGitHub { owner = "dryman"; repo = "smart-window.el"; - rev = "a87e0d2007de40033deee39496f791f4b047f138"; - sha256 = "15834lnh7dq9kz31k06ifpnc0vz86rycz0ryildi5qd2nb7s3lw9"; + rev = "5996461b7cbc5ab4509ac48537916eb29a8e4c16"; + sha256 = "0p1cqpdsp2vdx85i22shyzfhz22zwf1k1dxkqcmlgh3y7f4qq8ir"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/627e46a75bb25cf6e71785b5dda6b037f2adbb71/recipes/smart-window"; sha256 = "1x1ncldl9njil9hhvzj5ac1l5aiyfm0f7j0d7lw8ady7xx2cy26m"; name = "smart-window"; }; - packageRequires = []; + packageRequires = [ cl-lib ]; meta = { homepage = "https://melpa.org/#/smart-window"; license = lib.licenses.free; @@ -56090,12 +56515,12 @@ smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smartparens"; - version = "20160619.522"; + version = "20160721.1448"; src = fetchFromGitHub { owner = "Fuco1"; repo = "smartparens"; - rev = "89e9833827f02880a2a0ae8a50b9c73ad654b879"; - sha256 = "1h9qggbxcnk05yd37wi702gayhhna6hwykbfzrpjqwwva498sgdk"; + rev = "453687e9572a0a0e8fb0c4b8f411f4d90f2d0820"; + sha256 = "0yk5k32sk9c8nsbz1al4qsg0qwbamka5jk2x0v3jy2c30bqigpqc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens"; @@ -56111,7 +56536,7 @@ smartrep = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smartrep"; - version = "20150508.2130"; + version = "20150508.1930"; src = fetchFromGitHub { owner = "myuhe"; repo = "smartrep.el"; @@ -56132,12 +56557,12 @@ smartscan = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smartscan"; - version = "20131230.939"; + version = "20160705.138"; src = fetchFromGitHub { owner = "mickeynp"; repo = "smart-scan"; - rev = "5fd584d29ff8e5cd7a9e689369756868ab2922d3"; - sha256 = "193cxfnh263yw628ipf9gssvyq3j7mffrdmnjhvzzcsnhd1k145p"; + rev = "2aea1a1ac3c4b12032e5599c4eb6df5b8f68a01b"; + sha256 = "0szx1w2zkxi74xfzcfw7sgdyd34fbv3pcgl7vhjcl0zp0ch473rl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/26c73e1d15186ebf300c6397fda61a8a885a130f/recipes/smartscan"; @@ -56153,7 +56578,7 @@ smartwin = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smartwin"; - version = "20160513.256"; + version = "20160513.56"; src = fetchFromGitHub { owner = "jerryxgh"; repo = "smartwin"; @@ -56174,7 +56599,7 @@ smarty-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smarty-mode"; - version = "20100703.658"; + version = "20100703.458"; src = fetchFromGitHub { owner = "emacsorphanage"; repo = "smarty-mode"; @@ -56195,12 +56620,12 @@ smbc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smbc"; - version = "20160610.1814"; + version = "20160706.1522"; src = fetchFromGitHub { owner = "sakshamsharma"; repo = "emacs-smbc"; - rev = "d2ac4558f72bd26b175eec74e1b96b1f1cda9a6b"; - sha256 = "1r0igbpcr0hkfljsqis6zjw5ci3xr5m0r4ixmzv08w0ri0g74ad4"; + rev = "c377b806118d82140197d9cb1095548477e00497"; + sha256 = "16cj6jsy1psmcjshxb46i44sf1zb9s4mfiagl5cr22njy01ajq1h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05b4f16cd8028edc758ada842432df11c8276fd3/recipes/smbc"; @@ -56216,7 +56641,7 @@ smblog = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smblog"; - version = "20160317.630"; + version = "20160317.430"; src = fetchFromGitHub { owner = "aaptel"; repo = "smblog-mode"; @@ -56237,7 +56662,7 @@ smeargle = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smeargle"; - version = "20151014.42"; + version = "20151013.2242"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-smeargle"; @@ -56258,7 +56683,7 @@ smex = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smex"; - version = "20151212.1609"; + version = "20151212.1409"; src = fetchFromGitHub { owner = "nonsequitur"; repo = "smex"; @@ -56276,10 +56701,31 @@ license = lib.licenses.free; }; }) {}; + smiles-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "smiles-mode"; + version = "20160717.420"; + src = fetchFromGitHub { + owner = "stardiviner"; + repo = "smiles-mode"; + rev = "fbb381758adcb000a0c304be1b797f985f00e2de"; + sha256 = "07lzr1p58v95a4n6zad8y0dpj7chbxlcmb6s144pvcxx8kjwd4dr"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e377955c0c36459698aae429df0a78e84793798f/recipes/smiles-mode"; + sha256 = "0bg2kw7hfb8iqzbf3pgyyj384xmnfz4fj31ijlcrgl71fwb3gc9z"; + name = "smiles-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/smiles-mode"; + license = lib.licenses.free; + }; + }) {}; sml-modeline = callPackage ({ fetchbzr, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sml-modeline"; - version = "20120110.1440"; + version = "20120110.1240"; src = fetchbzr { url = "lp:~nxhtml/nxhtml/main"; rev = "835"; @@ -56299,7 +56745,7 @@ smooth-scroll = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smooth-scroll"; - version = "20130321.2314"; + version = "20130321.2114"; src = fetchFromGitHub { owner = "k-talo"; repo = "smooth-scroll.el"; @@ -56320,7 +56766,7 @@ smooth-scrolling = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smooth-scrolling"; - version = "20160612.341"; + version = "20160612.141"; src = fetchFromGitHub { owner = "aspiers"; repo = "smooth-scrolling"; @@ -56341,7 +56787,7 @@ smotitah = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smotitah"; - version = "20150218.430"; + version = "20150218.230"; src = fetchFromGitHub { owner = "laynor"; repo = "smotitah"; @@ -56362,7 +56808,7 @@ smtpmail-multi = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smtpmail-multi"; - version = "20160218.1749"; + version = "20160218.1549"; src = fetchFromGitHub { owner = "vapniks"; repo = "smtpmail-multi"; @@ -56383,7 +56829,7 @@ smyx-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smyx-theme"; - version = "20141127.228"; + version = "20141127.28"; src = fetchFromGitHub { owner = "tacit7"; repo = "smyx"; @@ -56404,7 +56850,7 @@ snakemake-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }: melpaBuild { pname = "snakemake-mode"; - version = "20160612.2326"; + version = "20160612.2126"; src = fetchFromGitHub { owner = "kyleam"; repo = "snakemake-mode"; @@ -56425,7 +56871,7 @@ snapshot-timemachine = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "snapshot-timemachine"; - version = "20160222.332"; + version = "20160222.132"; src = fetchFromGitHub { owner = "mrBliss"; repo = "snapshot-timemachine"; @@ -56446,7 +56892,7 @@ snippet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "snippet"; - version = "20130210.1715"; + version = "20130210.1515"; src = fetchFromGitHub { owner = "pkazmier"; repo = "snippet.el"; @@ -56467,7 +56913,7 @@ soft-charcoal-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "soft-charcoal-theme"; - version = "20140420.1143"; + version = "20140420.943"; src = fetchFromGitHub { owner = "mswift42"; repo = "soft-charcoal-theme"; @@ -56488,7 +56934,7 @@ soft-morning-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "soft-morning-theme"; - version = "20150918.1541"; + version = "20150918.1341"; src = fetchFromGitHub { owner = "mswift42"; repo = "soft-morning-theme"; @@ -56509,7 +56955,7 @@ soft-stone-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "soft-stone-theme"; - version = "20140614.335"; + version = "20140614.135"; src = fetchFromGitHub { owner = "mswift42"; repo = "soft-stone-theme"; @@ -56530,7 +56976,7 @@ solarized-theme = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "solarized-theme"; - version = "20160515.642"; + version = "20160515.442"; src = fetchFromGitHub { owner = "bbatsov"; repo = "solarized-emacs"; @@ -56551,7 +56997,7 @@ solidity-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "solidity-mode"; - version = "20160505.403"; + version = "20160505.203"; src = fetchFromGitHub { owner = "ethereum"; repo = "emacs-solidity"; @@ -56572,7 +57018,7 @@ sonic-pi = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, osc }: melpaBuild { pname = "sonic-pi"; - version = "20150919.530"; + version = "20150919.330"; src = fetchFromGitHub { owner = "repl-electric"; repo = "sonic-pi.el"; @@ -56593,7 +57039,7 @@ soothe-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "soothe-theme"; - version = "20141027.941"; + version = "20141027.741"; src = fetchFromGitHub { owner = "jasonm23"; repo = "emacs-soothe-theme"; @@ -56614,7 +57060,7 @@ sos = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "sos"; - version = "20141214.2203"; + version = "20141214.2003"; src = fetchFromGitHub { owner = "omouse"; repo = "emacs-sos"; @@ -56635,7 +57081,7 @@ sotclojure = callPackage ({ cider, clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sotlisp }: melpaBuild { pname = "sotclojure"; - version = "20160421.2011"; + version = "20160421.1811"; src = fetchFromGitHub { owner = "Malabarba"; repo = "speed-of-thought-clojure"; @@ -56656,7 +57102,7 @@ sotlisp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sotlisp"; - version = "20160509.1704"; + version = "20160509.1504"; src = fetchFromGitHub { owner = "Malabarba"; repo = "speed-of-thought-lisp"; @@ -56677,12 +57123,12 @@ sound-wav = callPackage ({ cl-lib ? null, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sound-wav"; - version = "20160629.2126"; + version = "20160725.724"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-sound-wav"; - rev = "2a8c8a9bd797dfbf4a0aa1c023a464b803227ff8"; - sha256 = "1ba1r359cb1dms24ajn0xfrqn8c9y08m6m7dwgxpylyyjwh1096y"; + rev = "406868043761524118c27b1207be0f8bbda8798e"; + sha256 = "1vwszcxknkjq4q32vb4dab4rlyd7w0l3pl5rpl08haczmr2frl4d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8333470e3d84d5433be489a23e065c876bed2ab2/recipes/sound-wav"; @@ -56698,7 +57144,7 @@ soundcloud = callPackage ({ deferred, emms, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, request, request-deferred, string-utils }: melpaBuild { pname = "soundcloud"; - version = "20150501.2226"; + version = "20150501.2026"; src = fetchFromGitHub { owner = "thieman"; repo = "soundcloud.el"; @@ -56726,7 +57172,7 @@ soundklaus = callPackage ({ cl-lib ? null, dash, emacs, emms, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, request, s }: melpaBuild { pname = "soundklaus"; - version = "20160314.731"; + version = "20160314.531"; src = fetchFromGitHub { owner = "r0man"; repo = "soundklaus.el"; @@ -56747,7 +57193,7 @@ sourcekit = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sourcekit"; - version = "20160510.2217"; + version = "20160510.2017"; src = fetchFromGitHub { owner = "nathankot"; repo = "company-sourcekit"; @@ -56768,12 +57214,12 @@ sourcemap = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sourcemap"; - version = "20160511.2337"; + version = "20160511.2137"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-sourcemap"; - rev = "5587d7a0e16ef1ef8c38844e206e9406ffa34cdf"; - sha256 = "0jbny1vrv3qnam3f69yrwd6n5zngnqirc5fsa3py4bdqvlqsg2rc"; + rev = "c29f0f1fba16622b2349593d420bcc4e3c0f5195"; + sha256 = "1n33d8pjvmsjq38qw1v405jkmrb2sffhp68w4h2jfsgl4y5w1mdg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/557d18259543263932fccdbaf44c4e7986bd277b/recipes/sourcemap"; @@ -56789,7 +57235,7 @@ sourcetalk = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "sourcetalk"; - version = "20140823.939"; + version = "20140823.739"; src = fetchFromGitHub { owner = "malroc"; repo = "sourcetalk_emacs"; @@ -56810,7 +57256,7 @@ spacegray-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "spacegray-theme"; - version = "20150719.1431"; + version = "20150719.1231"; src = fetchFromGitHub { owner = "bruce"; repo = "emacs-spacegray-theme"; @@ -56831,12 +57277,12 @@ spaceline = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline, s }: melpaBuild { pname = "spaceline"; - version = "20160614.826"; + version = "20160720.1034"; src = fetchFromGitHub { owner = "TheBB"; repo = "spaceline"; - rev = "2b45f973b70c00cfc4d70eef4b5cb5ce3016aa14"; - sha256 = "14634nhayhfw752xhz53r0di8rbbh59zpsz24dx2x2qr2sjdv9yv"; + rev = "c79ded7f3e81164077fd43f31c3807e51c250243"; + sha256 = "0dfm5n50xrkchz4cxl00zjq8nxdryqjm55ys86hm54g9cwsh5fs1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/46e4c876aeeb0bb0d0e81dcbb8363a5db9c3ff61/recipes/spaceline"; @@ -56852,12 +57298,12 @@ spacemacs-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "spacemacs-theme"; - version = "20160625.1047"; + version = "20160716.1303"; src = fetchFromGitHub { owner = "nashamri"; repo = "spacemacs-theme"; - rev = "12aaaf3bb66e0316480660a551a636b6e67726f4"; - sha256 = "1zsrbgmv4rrm7sbqncilaqnbfpazfxrckh68f98fmc2k1m6d0na6"; + rev = "3e8f0d8fabf9f52f8f1e725f5f3b066077a4626b"; + sha256 = "0nik79apwcxvldbjvrwiqh88da5w1fjyzli49hkjmlv9nw6skhfv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8ac39214856c1598beca0bd609e011b562346f/recipes/spacemacs-theme"; @@ -56873,7 +57319,7 @@ spaces = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "spaces"; - version = "20130610.249"; + version = "20130610.49"; src = fetchFromGitHub { owner = "chumpage"; repo = "chumpy-windows"; @@ -56894,7 +57340,7 @@ spark = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "spark"; - version = "20160414.2101"; + version = "20160414.1901"; src = fetchFromGitHub { owner = "alvinfrancis"; repo = "spark"; @@ -56915,7 +57361,7 @@ sparkline = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sparkline"; - version = "20150101.719"; + version = "20150101.519"; src = fetchFromGitHub { owner = "woudshoo"; repo = "sparkline"; @@ -56936,7 +57382,7 @@ sparql-mode = callPackage ({ async, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sparql-mode"; - version = "20160316.1004"; + version = "20160316.804"; src = fetchFromGitHub { owner = "ljos"; repo = "sparql-mode"; @@ -56956,10 +57402,10 @@ }) {}; speck = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "speck"; - version = "20140901.1335"; + version = "20160717.951"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/speck.el"; - sha256 = "1i2z57aasljia6xd2xn1mryklc2gc9c2q1fad8wn7982sl277d10"; + sha256 = "0zn7gjrga1ly1za04jd4s61m1dwkyy960x7g3x9hn4szqvpcsvfa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cac36b71f3690f65bd0ff78bf4a2fecf2dd5ea2/recipes/speck"; @@ -56975,7 +57421,7 @@ speech-tagger = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "speech-tagger"; - version = "20160224.202"; + version = "20160224.2"; src = fetchFromGitHub { owner = "cosmicexplorer"; repo = "speech-tagger"; @@ -56996,11 +57442,11 @@ speechd-el = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "speechd-el"; - version = "20141025.1112"; + version = "20160710.359"; src = fetchgit { url = "git://git.freebsoft.org/git/speechd-el"; - rev = "3d729817296b2ed8ad414a6aa044a8aa762259eb"; - sha256 = "044fmr2053vkd8s7kzd2v9qlz6lr8k88kfnxpiwpcbn7pb198iir"; + rev = "ec344edd498f95e3c945958475b31bae6505c34c"; + sha256 = "1ycq2ncixkm6imnhp2iqdray5f1mngnzfb3f2i3f0pi9k6xgavkb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d28c4550ae3b0f7e5fc032754d698cccda6ac0c/recipes/speechd-el"; @@ -57016,7 +57462,7 @@ speed-type = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "speed-type"; - version = "20150120.2234"; + version = "20150120.2034"; src = fetchFromGitHub { owner = "hagleitn"; repo = "speed-type"; @@ -57037,7 +57483,7 @@ sphinx-doc = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "sphinx-doc"; - version = "20160116.517"; + version = "20160116.317"; src = fetchFromGitHub { owner = "naiquevin"; repo = "sphinx-doc.el"; @@ -57058,7 +57504,7 @@ sphinx-frontend = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sphinx-frontend"; - version = "20160606.1020"; + version = "20160606.820"; src = fetchFromGitHub { owner = "kostafey"; repo = "sphinx-frontend"; @@ -57079,7 +57525,7 @@ spike-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "spike-theme"; - version = "20160530.933"; + version = "20160530.733"; src = fetchFromGitHub { owner = "m31271n"; repo = "spike-theme"; @@ -57100,7 +57546,7 @@ splitjoin = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "splitjoin"; - version = "20150505.932"; + version = "20150505.732"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-splitjoin"; @@ -57121,7 +57567,7 @@ splitter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "splitter"; - version = "20130705.250"; + version = "20130705.50"; src = fetchFromGitHub { owner = "chumpage"; repo = "chumpy-windows"; @@ -57142,7 +57588,7 @@ spotify = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "spotify"; - version = "20160128.306"; + version = "20160128.106"; src = fetchFromGitHub { owner = "remvee"; repo = "spotify-el"; @@ -57163,7 +57609,7 @@ spotlight = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "spotlight"; - version = "20150929.255"; + version = "20150929.55"; src = fetchFromGitHub { owner = "benmaughan"; repo = "spotlight.el"; @@ -57184,7 +57630,7 @@ spray = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "spray"; - version = "20160304.1620"; + version = "20160304.1420"; src = fetchFromGitHub { owner = "ian-kelling"; repo = "spray"; @@ -57205,7 +57651,7 @@ springboard = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "springboard"; - version = "20160329.1309"; + version = "20160329.1109"; src = fetchFromGitHub { owner = "jwiegley"; repo = "springboard"; @@ -57226,7 +57672,7 @@ sprintly-mode = callPackage ({ fetchFromGitHub, fetchurl, furl, lib, melpaBuild }: melpaBuild { pname = "sprintly-mode"; - version = "20121006.34"; + version = "20121005.2234"; src = fetchFromGitHub { owner = "sprintly"; repo = "sprintly-mode"; @@ -57247,7 +57693,7 @@ sproto-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sproto-mode"; - version = "20151115.1205"; + version = "20151115.1005"; src = fetchFromGitHub { owner = "m2q1n9"; repo = "sproto-mode"; @@ -57268,7 +57714,7 @@ sprunge = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "sprunge"; - version = "20160229.2043"; + version = "20160229.1843"; src = fetchFromGitHub { owner = "tomjakubowski"; repo = "sprunge.el"; @@ -57289,7 +57735,7 @@ spu = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, signal, timp }: melpaBuild { pname = "spu"; - version = "20160515.357"; + version = "20160515.157"; src = fetchFromGitHub { owner = "mola-T"; repo = "SPU"; @@ -57310,7 +57756,7 @@ sql-impala = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sql-impala"; - version = "20160427.1858"; + version = "20160427.1658"; src = fetchFromGitHub { owner = "jterk"; repo = "sql-impala"; @@ -57331,7 +57777,7 @@ sql-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sql-indent"; - version = "20150424.1916"; + version = "20150424.1716"; src = fetchFromGitHub { owner = "bsvingen"; repo = "sql-indent"; @@ -57352,7 +57798,7 @@ sql-mssql = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sql-mssql"; - version = "20160512.337"; + version = "20160512.137"; src = fetchFromGitHub { owner = "tumashu"; repo = "sql-mssql"; @@ -57373,7 +57819,7 @@ sqlite = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sqlite"; - version = "20150417.15"; + version = "20150416.2215"; src = fetchFromGitHub { owner = "cnngimenez"; repo = "sqlite.el"; @@ -57393,7 +57839,7 @@ }) {}; sqlplus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "sqlplus"; - version = "20141009.939"; + version = "20141009.739"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/sqlplus.el"; sha256 = "0xixdddcrzx6k0s8w9rp6q7b9qjpdb4l888gmcis42yvawb1i53d"; @@ -57412,7 +57858,7 @@ sqlup-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sqlup-mode"; - version = "20160624.1307"; + version = "20160624.1107"; src = fetchFromGitHub { owner = "Trevoke"; repo = "sqlup-mode.el"; @@ -57432,7 +57878,7 @@ }) {}; sr-speedbar = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "sr-speedbar"; - version = "20150804.1151"; + version = "20150804.951"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/sr-speedbar.el"; sha256 = "1ffnm2kfh8cg5rdhrkqmh4krggbxvqg3s6lc1nssv88av1c5cs3i"; @@ -57451,7 +57897,7 @@ srefactor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "srefactor"; - version = "20160420.233"; + version = "20160420.33"; src = fetchFromGitHub { owner = "tuhdo"; repo = "semantic-refactor"; @@ -57472,7 +57918,7 @@ ssh = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh"; - version = "20120904.1542"; + version = "20120904.1342"; src = fetchFromGitHub { owner = "ieure"; repo = "ssh-el"; @@ -57493,7 +57939,7 @@ ssh-agency = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh-agency"; - version = "20160101.1635"; + version = "20160101.1435"; src = fetchFromGitHub { owner = "magit"; repo = "ssh-agency"; @@ -57514,7 +57960,7 @@ ssh-config-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh-config-mode"; - version = "20160326.752"; + version = "20160326.552"; src = fetchFromGitHub { owner = "jhgorrell"; repo = "ssh-config-mode-el"; @@ -57532,10 +57978,31 @@ license = lib.licenses.free; }; }) {}; + ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ssh-deploy"; + version = "20160721.144"; + src = fetchFromGitHub { + owner = "cjohansson"; + repo = "emacs-ssh-deploy"; + rev = "952abf0366f3216a515bb707c61705f8398f2fe7"; + sha256 = "18c0xnv2af8nh11pby3la4hk93pzz377jhlba148lsj4i0q4v9v2"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4547f86e9a022468524b0d3818b24e1457797e/recipes/ssh-deploy"; + sha256 = "07kryxspjy8lr1a2m0bppa3xgbzwk180z4a8har37ygm3hdpj50x"; + name = "ssh-deploy"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/ssh-deploy"; + license = lib.licenses.free; + }; + }) {}; ssh-tunnels = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh-tunnels"; - version = "20141219.518"; + version = "20141219.318"; src = fetchFromGitHub { owner = "death"; repo = "ssh-tunnels"; @@ -57556,7 +58023,7 @@ stack-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "stack-mode"; - version = "20150923.1023"; + version = "20150923.823"; src = fetchFromGitHub { owner = "commercialhaskell"; repo = "stack-ide"; @@ -57577,7 +58044,7 @@ stan-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "stan-mode"; - version = "20160626.1718"; + version = "20160626.1518"; src = fetchFromGitHub { owner = "stan-dev"; repo = "stan-mode"; @@ -57598,7 +58065,7 @@ stan-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, stan-mode, yasnippet }: melpaBuild { pname = "stan-snippets"; - version = "20160626.1718"; + version = "20160626.1518"; src = fetchFromGitHub { owner = "stan-dev"; repo = "stan-mode"; @@ -57619,7 +58086,7 @@ standoff-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "standoff-mode"; - version = "20150628.1842"; + version = "20150628.1642"; src = fetchFromGitHub { owner = "lueck"; repo = "standoff-mode"; @@ -57640,7 +58107,7 @@ start-menu = callPackage ({ cl-lib ? null, config-parser, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "start-menu"; - version = "20160426.725"; + version = "20160426.525"; src = fetchFromGitHub { owner = "lujun9972"; repo = "el-start-menu"; @@ -57661,7 +58128,7 @@ stash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "stash"; - version = "20151117.827"; + version = "20151117.627"; src = fetchFromGitHub { owner = "vermiculus"; repo = "stash.el"; @@ -57682,7 +58149,7 @@ state = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "state"; - version = "20160422.750"; + version = "20160422.550"; src = fetchFromGitHub { owner = "thisirs"; repo = "state"; @@ -57703,7 +58170,7 @@ status = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "status"; - version = "20151230.808"; + version = "20151230.608"; src = fetchFromGitHub { owner = "tromey"; repo = "emacs-status"; @@ -57724,7 +58191,7 @@ steam = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "steam"; - version = "20160427.431"; + version = "20160427.231"; src = fetchFromGitHub { owner = "Kungsgeten"; repo = "steam.el"; @@ -57745,7 +58212,7 @@ stekene-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "stekene-theme"; - version = "20141108.1411"; + version = "20141108.1211"; src = fetchFromGitHub { owner = "Fanael"; repo = "stekene-theme"; @@ -57766,7 +58233,7 @@ stem = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "stem"; - version = "20131102.609"; + version = "20131102.409"; src = fetchFromGitHub { owner = "yuutayamada"; repo = "stem"; @@ -57786,7 +58253,7 @@ }) {}; stgit = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "stgit"; - version = "20140213.548"; + version = "20140213.348"; src = fetchgit { url = "git://repo.or.cz/stgit.git"; rev = "e4e04764009f749665636c4d11e0cafd9c4971e1"; @@ -57805,7 +58272,7 @@ }) {}; sticky = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "sticky"; - version = "20101129.2052"; + version = "20101129.1852"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/sticky.el"; sha256 = "18izyia1j3w2c07qhkp9h6rnvw35m5k1brrrjhm51fpdv2xj65fy"; @@ -57824,7 +58291,7 @@ stickyfunc-enhance = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "stickyfunc-enhance"; - version = "20150429.1314"; + version = "20150429.1114"; src = fetchFromGitHub { owner = "tuhdo"; repo = "semantic-stickyfunc-enhance"; @@ -57845,7 +58312,7 @@ stock-ticker = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }: melpaBuild { pname = "stock-ticker"; - version = "20150204.452"; + version = "20150204.252"; src = fetchFromGitHub { owner = "hagleitn"; repo = "stock-ticker"; @@ -57863,10 +58330,31 @@ license = lib.licenses.free; }; }) {}; + strace-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "strace-mode"; + version = "20160710.2134"; + src = fetchFromGitHub { + owner = "pkmoore"; + repo = "strace-mode"; + rev = "6a69b4b06db6797af56f33eda5cb28af94e59f11"; + sha256 = "1lbk2kzdznf2bkfazizfbimaxxzfzv00lrz1ran9dc2zqbc0bj9f"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9b2003bee9992d9e79124d95d30b573c8a6bdbfe/recipes/strace-mode"; + sha256 = "16v350nqdxmmk1r4z25bssm436xcm4cvnaxm7f3wxwvmg9z0gx8d"; + name = "strace-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/strace-mode"; + license = lib.licenses.free; + }; + }) {}; strie = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "strie"; - version = "20160211.1622"; + version = "20160211.1422"; src = fetchFromGitHub { owner = "jcatw"; repo = "strie.el"; @@ -57887,7 +58375,7 @@ string-edit = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "string-edit"; - version = "20160411.156"; + version = "20160410.2356"; src = fetchFromGitHub { owner = "magnars"; repo = "string-edit.el"; @@ -57908,7 +58396,7 @@ string-inflection = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "string-inflection"; - version = "20150805.456"; + version = "20150805.256"; src = fetchFromGitHub { owner = "akicho8"; repo = "string-inflection"; @@ -57929,7 +58417,7 @@ string-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, list-utils, melpaBuild }: melpaBuild { pname = "string-utils"; - version = "20140508.1541"; + version = "20140508.1341"; src = fetchFromGitHub { owner = "rolandwalker"; repo = "string-utils"; @@ -57949,7 +58437,7 @@ }) {}; strings = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "strings"; - version = "20151231.1807"; + version = "20151231.1607"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/strings.el"; sha256 = "1sa6wd2z2qkcnjprkkm9b945qz8d0l702sv9w15wl0lngbhw84na"; @@ -57968,7 +58456,7 @@ stripe-buffer = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "stripe-buffer"; - version = "20141208.908"; + version = "20141208.708"; src = fetchFromGitHub { owner = "sabof"; repo = "stripe-buffer"; @@ -57989,7 +58477,7 @@ stumpwm-mode = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "stumpwm-mode"; - version = "20140130.2016"; + version = "20140130.1816"; src = fetchgit { url = "git://git.savannah.nongnu.org/stumpwm.git"; rev = "61a7cf27e49e0779a53c018b2342f5f1c5cc70b4"; @@ -58009,7 +58497,7 @@ stupid-indent-mode = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "stupid-indent-mode"; - version = "20130816.1554"; + version = "20130816.1354"; src = fetchgit { url = "https://gist.github.com/5487564.git"; rev = "e26ff5a2c4a582c6c1940bbcd204cfeed8e65222"; @@ -58029,7 +58517,7 @@ stylus-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, sws-mode }: melpaBuild { pname = "stylus-mode"; - version = "20150313.1012"; + version = "20150313.812"; src = fetchFromGitHub { owner = "brianc"; repo = "jade-mode"; @@ -58050,7 +58538,7 @@ subatomic-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "subatomic-theme"; - version = "20160126.938"; + version = "20160126.738"; src = fetchFromGitHub { owner = "cryon"; repo = "subatomic"; @@ -58071,7 +58559,7 @@ subatomic256-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "subatomic256-theme"; - version = "20130620.2110"; + version = "20130620.1910"; src = fetchFromGitHub { owner = "d11wtq"; repo = "subatomic256"; @@ -58092,7 +58580,7 @@ subemacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "subemacs"; - version = "20160105.559"; + version = "20160105.359"; src = fetchFromGitHub { owner = "kbauer"; repo = "subemacs"; @@ -58113,7 +58601,7 @@ sublime-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sublime-themes"; - version = "20160111.322"; + version = "20160111.122"; src = fetchFromGitHub { owner = "owainlewis"; repo = "emacs-color-themes"; @@ -58134,7 +58622,7 @@ sublimity = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sublimity"; - version = "20151230.927"; + version = "20151230.727"; src = fetchFromGitHub { owner = "zk-phi"; repo = "sublimity"; @@ -58154,7 +58642,7 @@ }) {}; subr-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "subr-plus"; - version = "20151231.1807"; + version = "20151231.1607"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/subr+.el"; sha256 = "1xxf8kgxzcwwjm96isj4zg31vw63ahivr6xch5dw8wsvk0mjks9y"; @@ -58173,7 +58661,7 @@ subshell-proc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "subshell-proc"; - version = "20130122.1522"; + version = "20130122.1322"; src = fetchFromGitHub { owner = "andrewmains12"; repo = "subshell-proc"; @@ -58194,7 +58682,7 @@ sudden-death = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sudden-death"; - version = "20140829.738"; + version = "20140829.538"; src = fetchFromGitHub { owner = "yewton"; repo = "sudden-death.el"; @@ -58215,7 +58703,7 @@ sudo-edit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sudo-edit"; - version = "20160627.1403"; + version = "20160627.1203"; src = fetchFromGitHub { owner = "nflath"; repo = "sudo-edit"; @@ -58236,7 +58724,7 @@ sudo-ext = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sudo-ext"; - version = "20110117.110"; + version = "20110116.2310"; src = fetchFromGitHub { owner = "rubikitch"; repo = "sudo-ext"; @@ -58256,7 +58744,7 @@ }) {}; summarye = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "summarye"; - version = "20130328.527"; + version = "20130328.327"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/summarye.el"; sha256 = "0q5m8d6p9aqbfx17zgznkqw2jgh027xix4894wrdz91670zxd3py"; @@ -58275,7 +58763,7 @@ sunny-day-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sunny-day-theme"; - version = "20140413.1625"; + version = "20140413.1425"; src = fetchFromGitHub { owner = "mswift42"; repo = "sunny-day-theme"; @@ -58296,7 +58784,7 @@ sunshine = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sunshine"; - version = "20160410.1517"; + version = "20160410.1317"; src = fetchFromGitHub { owner = "aaronbieber"; repo = "sunshine.el"; @@ -58317,7 +58805,7 @@ suomalainen-kalenteri = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "suomalainen-kalenteri"; - version = "20151129.504"; + version = "20151129.304"; src = fetchFromGitHub { owner = "tlikonen"; repo = "suomalainen-kalenteri"; @@ -58338,7 +58826,7 @@ super-save = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "super-save"; - version = "20160426.929"; + version = "20160426.729"; src = fetchFromGitHub { owner = "bbatsov"; repo = "super-save"; @@ -58359,7 +58847,7 @@ supergenpass = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "supergenpass"; - version = "20130329.48"; + version = "20130328.2248"; src = fetchFromGitHub { owner = "ober"; repo = "sgpass"; @@ -58380,7 +58868,7 @@ suscolors-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "suscolors-theme"; - version = "20160605.406"; + version = "20160605.206"; src = fetchFromGitHub { owner = "TheSuspiciousWombat"; repo = "suscolors-emacs"; @@ -58401,7 +58889,7 @@ svg-mode-line-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xmlgen }: melpaBuild { pname = "svg-mode-line-themes"; - version = "20150425.1506"; + version = "20150425.1306"; src = fetchFromGitHub { owner = "sabof"; repo = "svg-mode-line-themes"; @@ -58422,7 +58910,7 @@ swagger-to-org = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "swagger-to-org"; - version = "20160610.1956"; + version = "20160610.1756"; src = fetchFromGitHub { owner = "ahungry"; repo = "swagger-to-org"; @@ -58443,7 +58931,7 @@ swap-buffers = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "swap-buffers"; - version = "20150506.1639"; + version = "20150506.1439"; src = fetchFromGitHub { owner = "ekazakov"; repo = "swap-buffers"; @@ -58464,7 +58952,7 @@ swap-regions = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "swap-regions"; - version = "20160413.1223"; + version = "20160413.1023"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "swap-regions.el"; @@ -58484,7 +58972,7 @@ }) {}; swbuff-x = callPackage ({ fetchurl, lib, melpaBuild, swbuff }: melpaBuild { pname = "swbuff-x"; - version = "20130607.514"; + version = "20130607.314"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/swbuff-x.el"; sha256 = "1fkicyjvanh8yk2y27sq075sarcyqhsdz0r4xhillpnv34ji98r5"; @@ -58503,7 +58991,7 @@ sweetgreen = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, request }: melpaBuild { pname = "sweetgreen"; - version = "20151207.1116"; + version = "20151207.916"; src = fetchFromGitHub { owner = "CestDiego"; repo = "sweetgreen.el"; @@ -58524,7 +59012,7 @@ swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "swift-mode"; - version = "20160124.436"; + version = "20160124.236"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "swift-mode"; @@ -58545,12 +59033,12 @@ swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "swiper"; - version = "20160630.1502"; + version = "20160720.426"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "aaad35472a5b74dfaeca93aa0de2327cf06ffe3d"; - sha256 = "1f570vxp5gp28wpxq92050n6vx0lvz8288x4sp8pfpizz9dyxd9p"; + rev = "17b59b2244473ba32cff3408e41e451de7fcc69f"; + sha256 = "1srzmlgd4wbwdickgxq4kjxbw5rprkh7dwfi7rz82zsahk1jkzr8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; @@ -58566,7 +59054,7 @@ swiper-helm = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, swiper }: melpaBuild { pname = "swiper-helm"; - version = "20151116.530"; + version = "20151116.330"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper-helm"; @@ -58584,10 +59072,31 @@ license = lib.licenses.free; }; }) {}; + switch-buffer-functions = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "switch-buffer-functions"; + version = "20160702.2157"; + src = fetchFromGitHub { + owner = "10sr"; + repo = "switch-buffer-functions-el"; + rev = "4778a2bc9ecfb71bb2b6a65c7108260ec8f30a37"; + sha256 = "0xv57imh6w6kbh1i1ib9k9x2h01l4vdxs2i667a76ym6dmsjbx2x"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d37ebd28f4a2f770958bd9a2669cce86cc76cbe7/recipes/switch-buffer-functions"; + sha256 = "1b93p8q07zncqq3nw829gddc615rwaan1ds5vgfhdb1l7bh9f37l"; + name = "switch-buffer-functions"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/switch-buffer-functions"; + license = lib.licenses.free; + }; + }) {}; switch-window = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "switch-window"; - version = "20160229.534"; + version = "20160229.334"; src = fetchFromGitHub { owner = "dimitri"; repo = "switch-window"; @@ -58608,7 +59117,7 @@ swoop = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, pcre2el }: melpaBuild { pname = "swoop"; - version = "20160120.1115"; + version = "20160120.915"; src = fetchFromGitHub { owner = "ShingoFukuyama"; repo = "emacs-swoop"; @@ -58629,7 +59138,7 @@ sws-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sws-mode"; - version = "20150317.1445"; + version = "20150317.1245"; src = fetchFromGitHub { owner = "brianc"; repo = "jade-mode"; @@ -58650,7 +59159,7 @@ sx = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, let-alist, lib, markdown-mode, melpaBuild }: melpaBuild { pname = "sx"; - version = "20160125.1801"; + version = "20160125.1601"; src = fetchFromGitHub { owner = "vermiculus"; repo = "sx.el"; @@ -58671,7 +59180,7 @@ symon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "symon"; - version = "20160514.2104"; + version = "20160514.1904"; src = fetchFromGitHub { owner = "zk-phi"; repo = "symon"; @@ -58692,7 +59201,7 @@ symon-lingr = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, symon }: melpaBuild { pname = "symon-lingr"; - version = "20150719.842"; + version = "20150719.642"; src = fetchFromGitHub { owner = "zk-phi"; repo = "symon-lingr"; @@ -58713,7 +59222,7 @@ sync-recentf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sync-recentf"; - version = "20160326.1501"; + version = "20160326.1301"; src = fetchFromGitHub { owner = "ffevotte"; repo = "sync-recentf"; @@ -58734,7 +59243,7 @@ syndicate = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "syndicate"; - version = "20160603.1023"; + version = "20160603.823"; src = fetchFromGitHub { owner = "KNX32542"; repo = "syndicate"; @@ -58755,12 +59264,12 @@ synonymous = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "synonymous"; - version = "20150909.1034"; + version = "20160721.2255"; src = fetchFromGitHub { owner = "toroidal-code"; repo = "synonymous.el"; - rev = "9abd08c57f4a35902cd6b3eb5aad8dbb352141f4"; - sha256 = "02xnfkmpvjicckmp9is42fnavy9pd95s99zmf1wylxdji2hhpjxw"; + rev = "1cbdc016c70ed3834c514621f9a33adc93707024"; + sha256 = "1lsn2x6mk36pl0j3z419jq2g6sxxl0hylpz0xl8aiqzsbmwnc6r1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ecf2c44c63e9f41f1733849bdef0d0c301485580/recipes/synonymous"; @@ -58775,7 +59284,7 @@ }) {}; synonyms = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "synonyms"; - version = "20160328.854"; + version = "20160328.654"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/synonyms.el"; sha256 = "1zkrh1krhjmhb924dlihfnmjf4gigk9lqkai8aal67h90g2q2dsz"; @@ -58794,7 +59303,7 @@ synosaurus = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "synosaurus"; - version = "20151119.1249"; + version = "20151119.1049"; src = fetchFromGitHub { owner = "hpdeifel"; repo = "synosaurus"; @@ -58815,7 +59324,7 @@ synquid = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "synquid"; - version = "20160617.2356"; + version = "20160617.2156"; src = fetchFromGitHub { owner = "cpitclaudel"; repo = "synquid-emacs"; @@ -58836,7 +59345,7 @@ syntactic-sugar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "syntactic-sugar"; - version = "20140508.1541"; + version = "20140508.1341"; src = fetchFromGitHub { owner = "rolandwalker"; repo = "syntactic-sugar"; @@ -58857,7 +59366,7 @@ syntax-subword = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "syntax-subword"; - version = "20160519.1405"; + version = "20160519.1205"; src = fetchhg { url = "https://bitbucket.com/jpkotta/syntax-subword"; rev = "ad0db0fcb464"; @@ -58877,7 +59386,7 @@ syslog-mode = callPackage ({ fetchFromGitHub, fetchurl, hide-lines, lib, melpaBuild }: melpaBuild { pname = "syslog-mode"; - version = "20160525.2114"; + version = "20160525.1914"; src = fetchFromGitHub { owner = "vapniks"; repo = "syslog-mode"; @@ -58895,10 +59404,31 @@ license = lib.licenses.free; }; }) {}; + system-packages = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "system-packages"; + version = "20160726.1344"; + src = fetchFromGitHub { + owner = "jabranham"; + repo = "system-packages"; + rev = "19ab3e959c04dc084f0c679228ab675e5a559c30"; + sha256 = "1slycdacara1y4zqw0vvn3rixx3r33lk9y7ls99bb87a8k2zxlll"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8c423d8c1ff251bd34df20bdb8b425c2f55ae1b1/recipes/system-packages"; + sha256 = "0cq1vb4m8phdmv3c0dj6m76fss5vp1a0hikn7a1q5l2mmns40wj1"; + name = "system-packages"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/system-packages"; + license = lib.licenses.free; + }; + }) {}; system-specific-settings = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "system-specific-settings"; - version = "20140818.957"; + version = "20140818.757"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "emacs-system-specific-settings"; @@ -58919,7 +59449,7 @@ systemd = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "systemd"; - version = "20160628.2248"; + version = "20160628.2048"; src = fetchFromGitHub { owner = "holomorph"; repo = "systemd-mode"; @@ -58940,7 +59470,7 @@ systemtap-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "systemtap-mode"; - version = "20151122.1340"; + version = "20151122.1140"; src = fetchFromGitHub { owner = "ruediger"; repo = "systemtap-mode"; @@ -58961,7 +59491,7 @@ ta = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ta"; - version = "20160619.1145"; + version = "20160619.945"; src = fetchFromGitHub { owner = "kuanyui"; repo = "ta.el"; @@ -58982,7 +59512,7 @@ tab-group = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tab-group"; - version = "20140306.850"; + version = "20140306.650"; src = fetchFromGitHub { owner = "tarao"; repo = "tab-group-el"; @@ -59003,7 +59533,7 @@ tab-jump-out = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tab-jump-out"; - version = "20151005.2030"; + version = "20151005.1830"; src = fetchFromGitHub { owner = "cheunghy"; repo = "tab-jump-out"; @@ -59024,7 +59554,7 @@ tabbar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tabbar"; - version = "20160524.1601"; + version = "20160524.1401"; src = fetchFromGitHub { owner = "dholm"; repo = "tabbar"; @@ -59045,7 +59575,7 @@ tabbar-ruler = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, mode-icons, powerline, tabbar }: melpaBuild { pname = "tabbar-ruler"; - version = "20160526.2348"; + version = "20160526.2148"; src = fetchFromGitHub { owner = "mattfidler"; repo = "tabbar-ruler.el"; @@ -59066,7 +59596,7 @@ tablist = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tablist"; - version = "20160424.435"; + version = "20160424.235"; src = fetchFromGitHub { owner = "politza"; repo = "tablist"; @@ -59087,7 +59617,7 @@ tabula-rasa = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tabula-rasa"; - version = "20141215.2347"; + version = "20141215.2147"; src = fetchFromGitHub { owner = "idomagal"; repo = "Tabula-Rasa"; @@ -59108,7 +59638,7 @@ tagedit = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "tagedit"; - version = "20160516.954"; + version = "20160516.754"; src = fetchFromGitHub { owner = "magnars"; repo = "tagedit"; @@ -59129,7 +59659,7 @@ take-off = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, web-server }: melpaBuild { pname = "take-off"; - version = "20140531.417"; + version = "20140531.217"; src = fetchFromGitHub { owner = "tburette"; repo = "take-off"; @@ -59150,7 +59680,7 @@ tango-2-theme = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tango-2-theme"; - version = "20120312.1525"; + version = "20120312.1325"; src = fetchgit { url = "https://gist.github.com/2024464.git"; rev = "64e44c98e41ebbe3b827d54280e3b9615787daaa"; @@ -59170,7 +59700,7 @@ tango-plus-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tango-plus-theme"; - version = "20140425.1711"; + version = "20140425.1511"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "tango-plus-theme"; @@ -59191,7 +59721,7 @@ tangotango-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tangotango-theme"; - version = "20150702.304"; + version = "20150702.104"; src = fetchFromGitHub { owner = "juba"; repo = "color-theme-tangotango"; @@ -59212,7 +59742,7 @@ tao-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tao-theme"; - version = "20160608.415"; + version = "20160608.215"; src = fetchFromGitHub { owner = "11111000000"; repo = "tao-theme-emacs"; @@ -59233,7 +59763,7 @@ tawny-mode = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tawny-mode"; - version = "20160504.1246"; + version = "20160504.1046"; src = fetchFromGitHub { owner = "phillord"; repo = "tawny-owl"; @@ -59254,7 +59784,7 @@ tbx2org = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "tbx2org"; - version = "20140224.959"; + version = "20140224.759"; src = fetchFromGitHub { owner = "istib"; repo = "tbx2org"; @@ -59275,7 +59805,7 @@ tc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tc"; - version = "20150113.2126"; + version = "20150113.1926"; src = fetchFromGitHub { owner = "kozo2"; repo = "tc"; @@ -59296,7 +59826,7 @@ tco = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tco"; - version = "20140412.812"; + version = "20140412.612"; src = fetchFromGitHub { owner = "Wilfred"; repo = "tco.el"; @@ -59317,7 +59847,7 @@ tdd-status-mode-line = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tdd-status-mode-line"; - version = "20131123.1116"; + version = "20131123.916"; src = fetchFromGitHub { owner = "algernon"; repo = "tdd-status-mode-line"; @@ -59338,7 +59868,7 @@ tea-time = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tea-time"; - version = "20120331.320"; + version = "20120331.120"; src = fetchFromGitHub { owner = "konzeptual"; repo = "tea-time"; @@ -59359,7 +59889,7 @@ telepathy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "telepathy"; - version = "20131209.658"; + version = "20131209.458"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "telepathy.el"; @@ -59380,12 +59910,12 @@ telephone-line = callPackage ({ cl-generic, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "telephone-line"; - version = "20160302.1715"; + version = "20160302.1515"; src = fetchFromGitHub { owner = "dbordak"; repo = "telephone-line"; - rev = "32245b5e301c408354cb34cd22c7b25b7ab390d8"; - sha256 = "1m5224k1chb788mgj7j6cbma2xh5p7avvb1ax0jdafv5lfgikka4"; + rev = "5c0af25f193b72dbb8dd2f9c9cbadf7f541e0c77"; + sha256 = "0c5h3i2viw9iryx2hfmmi0k30y96kqn7vhkbv76fzkhzby5r25fy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c998b70365fb0a210c3b9639db84034c7d45097/recipes/telephone-line"; @@ -59401,7 +59931,7 @@ ten-hundred-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ten-hundred-mode"; - version = "20160409.751"; + version = "20160409.551"; src = fetchFromGitHub { owner = "aaron-em"; repo = "ten-hundred-mode.el"; @@ -59422,7 +59952,7 @@ term-alert = callPackage ({ alert, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, term-cmd }: melpaBuild { pname = "term-alert"; - version = "20160517.548"; + version = "20160517.348"; src = fetchFromGitHub { owner = "CallumCameron"; repo = "term-alert"; @@ -59443,7 +59973,7 @@ term-cmd = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "term-cmd"; - version = "20160517.545"; + version = "20160517.345"; src = fetchFromGitHub { owner = "CallumCameron"; repo = "term-cmd"; @@ -59464,7 +59994,7 @@ term-manager = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "term-manager"; - version = "20160605.2309"; + version = "20160605.2109"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "term-manager"; @@ -59485,7 +60015,7 @@ term-plus = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "term-plus"; - version = "20160404.555"; + version = "20160404.355"; src = fetchFromGitHub { owner = "tarao"; repo = "term-plus-el"; @@ -59506,7 +60036,7 @@ term-plus-key-intercept = callPackage ({ fetchFromGitHub, fetchurl, key-intercept, lib, melpaBuild, term-plus }: melpaBuild { pname = "term-plus-key-intercept"; - version = "20140211.150"; + version = "20140210.2350"; src = fetchFromGitHub { owner = "tarao"; repo = "term-plus-ki-el"; @@ -59527,7 +60057,7 @@ term-plus-mux = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, tab-group, term-plus }: melpaBuild { pname = "term-plus-mux"; - version = "20140211.149"; + version = "20140210.2349"; src = fetchFromGitHub { owner = "tarao"; repo = "term-plus-mux-el"; @@ -59548,7 +60078,7 @@ term-projectile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, term-manager }: melpaBuild { pname = "term-projectile"; - version = "20160620.504"; + version = "20160620.304"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "term-manager"; @@ -59569,7 +60099,7 @@ term-run = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "term-run"; - version = "20151228.305"; + version = "20151228.105"; src = fetchFromGitHub { owner = "10sr"; repo = "term-run-el"; @@ -59590,7 +60120,7 @@ termbright-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "termbright-theme"; - version = "20151030.2135"; + version = "20151030.1935"; src = fetchFromGitHub { owner = "bmastenbrook"; repo = "termbright-theme-el"; @@ -59611,12 +60141,12 @@ tern = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "tern"; - version = "20160607.544"; + version = "20160718.57"; src = fetchFromGitHub { owner = "ternjs"; repo = "tern"; - rev = "ae87257ae7ddbef2dfef70b0bfd2818b5d9f6bb6"; - sha256 = "1z5q3nnyb9an2w9184ig4186jvawpsz3bynar3izkc9z7ppvvwya"; + rev = "18932c449b6ba1aff606e04c711242bad48426af"; + sha256 = "1x7gx7krgw7s5l0k8k3cxrqd85bhpvzimqa68m85wqch01cpcwaw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern"; @@ -59632,12 +60162,12 @@ tern-auto-complete = callPackage ({ auto-complete, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, tern }: melpaBuild { pname = "tern-auto-complete"; - version = "20151123.853"; + version = "20151123.653"; src = fetchFromGitHub { owner = "ternjs"; repo = "tern"; - rev = "ae87257ae7ddbef2dfef70b0bfd2818b5d9f6bb6"; - sha256 = "1z5q3nnyb9an2w9184ig4186jvawpsz3bynar3izkc9z7ppvvwya"; + rev = "18932c449b6ba1aff606e04c711242bad48426af"; + sha256 = "1x7gx7krgw7s5l0k8k3cxrqd85bhpvzimqa68m85wqch01cpcwaw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern-auto-complete"; @@ -59650,10 +60180,31 @@ license = lib.licenses.free; }; }) {}; + tern-context-coloring = callPackage ({ context-coloring, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, tern }: + melpaBuild { + pname = "tern-context-coloring"; + version = "20160709.837"; + src = fetchFromGitHub { + owner = "jacksonrayhamilton"; + repo = "tern-context-coloring"; + rev = "42e2f0177e8d3017c07826361cc981b2883d34dc"; + sha256 = "0jdm1s8pqs40xligbhmqgk4vaxkqyb2i5wkx1zgjazq8fhcql9jv"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/db2119d2c2d167d771ee02c2735b435d59991b93/recipes/tern-context-coloring"; + sha256 = "0wkb7gn2ma6mz495bgphcjs5p0c6a869zk4a8mnm0spq41xbw4gi"; + name = "tern-context-coloring"; + }; + packageRequires = [ context-coloring emacs tern ]; + meta = { + homepage = "https://melpa.org/#/tern-context-coloring"; + license = lib.licenses.free; + }; + }) {}; tern-django = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, tern }: melpaBuild { pname = "tern-django"; - version = "20160221.1323"; + version = "20160221.1123"; src = fetchFromGitHub { owner = "proofit404"; repo = "tern-django"; @@ -59674,12 +60225,12 @@ terraform-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, hcl-mode, lib, melpaBuild }: melpaBuild { pname = "terraform-mode"; - version = "20160621.609"; + version = "20160621.409"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-terraform-mode"; - rev = "a3c76a45456140b54a7f14896472e19b2cfffa00"; - sha256 = "0m3lbm43x05sb097wcdbzmys9m1hnzikb6x5yycz456qpjy6xxd5"; + rev = "5b796450bd60ab9fb184a0b4ecc08c15de1cbc22"; + sha256 = "1ab59q016ffzfwms7f2d6mnzcbf68f35jg72mlj2g52bns9khanr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/93e06adf34bc613edf95feaca64c69a0a2a4b567/recipes/terraform-mode"; @@ -59695,7 +60246,7 @@ test-case-mode = callPackage ({ fetchFromGitHub, fetchurl, fringe-helper, lib, melpaBuild }: melpaBuild { pname = "test-case-mode"; - version = "20130525.934"; + version = "20130525.734"; src = fetchFromGitHub { owner = "ieure"; repo = "test-case-mode"; @@ -59716,7 +60267,7 @@ test-kitchen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "test-kitchen"; - version = "20160516.1548"; + version = "20160516.1348"; src = fetchFromGitHub { owner = "jjasghar"; repo = "test-kitchen-el"; @@ -59737,7 +60288,7 @@ test-simple = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "test-simple"; - version = "20160303.236"; + version = "20160303.36"; src = fetchFromGitHub { owner = "rocky"; repo = "emacs-test-simple"; @@ -59758,7 +60309,7 @@ textile-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "textile-mode"; - version = "20151203.253"; + version = "20151203.53"; src = fetchFromGitHub { owner = "juba"; repo = "textile-mode"; @@ -59779,7 +60330,7 @@ textmate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "textmate"; - version = "20110816.1646"; + version = "20110816.1446"; src = fetchFromGitHub { owner = "defunkt"; repo = "textmate.el"; @@ -59800,7 +60351,7 @@ textmate-to-yas = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "textmate-to-yas"; - version = "20160409.1208"; + version = "20160409.1008"; src = fetchFromGitHub { owner = "mattfidler"; repo = "textmate-to-yas.el"; @@ -59820,7 +60371,7 @@ }) {}; tfs = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "tfs"; - version = "20120508.1320"; + version = "20120508.1120"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/tfs.el"; sha256 = "16byw8ix7bjh5ldr8rymisq2bhc5sh7db6rhpf0x28yd6mmzn73v"; @@ -59839,7 +60390,7 @@ theme-changer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "theme-changer"; - version = "20130725.2119"; + version = "20130725.1919"; src = fetchFromGitHub { owner = "hadronzoo"; repo = "theme-changer"; @@ -59860,7 +60411,7 @@ theme-looper = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "theme-looper"; - version = "20150723.1304"; + version = "20150723.1104"; src = fetchFromGitHub { owner = "myTerminal"; repo = "theme-looper"; @@ -59881,7 +60432,7 @@ therapy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "therapy"; - version = "20151113.1353"; + version = "20151113.1153"; src = fetchFromGitHub { owner = "abingham"; repo = "therapy"; @@ -59901,7 +60452,7 @@ }) {}; thesaurus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "thesaurus"; - version = "20121125.1337"; + version = "20121125.1137"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/thesaurus.el"; sha256 = "0zcyasdzb7dvmld8418cy2mg8mpdx01bv44cm0sp5950scrypsaq"; @@ -59920,7 +60471,7 @@ thing-cmds = callPackage ({ fetchurl, hide-comnt, lib, melpaBuild }: melpaBuild { pname = "thing-cmds"; - version = "20151231.1809"; + version = "20151231.1609"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/thing-cmds.el"; sha256 = "1nclwxb63ffbc4wsga9ngkfcxsw88za0c4663fh9x64rl4db4hn8"; @@ -59938,7 +60489,7 @@ }) {}; thingatpt-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "thingatpt-plus"; - version = "20160620.1153"; + version = "20160620.953"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/thingatpt+.el"; sha256 = "1j6p089b2zdzf2mps642my24aa79ldpfa79rxpz1za8ixrk4333l"; @@ -59957,7 +60508,7 @@ thingopt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "thingopt"; - version = "20160520.1818"; + version = "20160520.1618"; src = fetchFromGitHub { owner = "m2ym"; repo = "thingopt-el"; @@ -59978,7 +60529,7 @@ thread-dump = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "thread-dump"; - version = "20130323.1225"; + version = "20130323.1025"; src = fetchFromGitHub { owner = "nd"; repo = "thread-dump.el"; @@ -59999,12 +60550,12 @@ thrift = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "thrift"; - version = "20140312.1548"; + version = "20140312.1348"; src = fetchFromGitHub { owner = "apache"; repo = "thrift"; - rev = "0e9fed1e12ed066865e46c6903782b2ef95f4650"; - sha256 = "19a1477638cdq5si418qy07i1q1hvdbrxd0q0lfvlxa6rikxx6lz"; + rev = "bcad91771b7f0bff28a1cac1981d7ef2b9bcef3c"; + sha256 = "1zz8lb8jvd9iza65hs3nn9n3il50q36zpi6v6w020xlr6shakjjn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift"; @@ -60020,7 +60571,7 @@ thumb-frm = callPackage ({ fetchurl, frame-cmds, frame-fns, lib, melpaBuild }: melpaBuild { pname = "thumb-frm"; - version = "20151231.1812"; + version = "20151231.1612"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/thumb-frm.el"; sha256 = "0nyp1sp55l3mlhlxw8kyp6hxan3rbgwc4fmfs174n6hlj3zr5vg8"; @@ -60039,7 +60590,7 @@ thumb-through = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "thumb-through"; - version = "20120118.2334"; + version = "20120118.2134"; src = fetchFromGitHub { owner = "apg"; repo = "thumb-through"; @@ -60060,12 +60611,12 @@ tide = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }: melpaBuild { pname = "tide"; - version = "20160625.7"; + version = "20160722.534"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "tide"; - rev = "9ffcab13f5c8d82945fcd47e553b1b4d99cb9dcf"; - sha256 = "1qbi1snaa1pa54c4drg0cp2ap5mmm5laqj6nfcfwd086nyrr036d"; + rev = "1e070790da1be11a330ec2484531e9a58a5201a9"; + sha256 = "1chh4pvq6szjz3s2lr6c7k8ckfv5g2mkyd5c14275slq0c6kf9wi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide"; @@ -60080,7 +60631,7 @@ }) {}; tidy = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "tidy"; - version = "20111222.1156"; + version = "20111222.956"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/tidy.el"; sha256 = "0psci55a3angwv45z9i8wz8jw634rxg1xawkrb57m878zcxxddwa"; @@ -60099,7 +60650,7 @@ time-ext = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "time-ext"; - version = "20100515.1940"; + version = "20100515.1740"; src = fetchFromGitHub { owner = "rubikitch"; repo = "time-ext"; @@ -60120,7 +60671,7 @@ timecop = callPackage ({ cl-lib ? null, datetime-format, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "timecop"; - version = "20160520.552"; + version = "20160520.352"; src = fetchFromGitHub { owner = "zonuexe"; repo = "emacs-datetime"; @@ -60141,7 +60692,7 @@ timer-revert = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "timer-revert"; - version = "20150122.1432"; + version = "20150122.1232"; src = fetchFromGitHub { owner = "yyr"; repo = "timer-revert"; @@ -60162,7 +60713,7 @@ timesheet = callPackage ({ auctex, fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }: melpaBuild { pname = "timesheet"; - version = "20160530.1645"; + version = "20160530.1445"; src = fetchFromGitHub { owner = "tmarble"; repo = "timesheet.el"; @@ -60183,7 +60734,7 @@ timp = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, fifo-class, lib, melpaBuild, signal }: melpaBuild { pname = "timp"; - version = "20160618.303"; + version = "20160618.103"; src = fetchFromGitHub { owner = "mola-T"; repo = "timp"; @@ -60204,7 +60755,7 @@ tinkerer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "tinkerer"; - version = "20150220.49"; + version = "20150219.2249"; src = fetchFromGitHub { owner = "yyr"; repo = "tinkerer.el"; @@ -60225,7 +60776,7 @@ tiny = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tiny"; - version = "20151208.405"; + version = "20151208.205"; src = fetchFromGitHub { owner = "abo-abo"; repo = "tiny"; @@ -60246,7 +60797,7 @@ tiny-menu = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tiny-menu"; - version = "20160606.1911"; + version = "20160606.1711"; src = fetchFromGitHub { owner = "aaronbieber"; repo = "tiny-menu.el"; @@ -60267,7 +60818,7 @@ tinysegmenter = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tinysegmenter"; - version = "20141124.413"; + version = "20141124.213"; src = fetchFromGitHub { owner = "myuhe"; repo = "tinysegmenter.el"; @@ -60288,7 +60839,7 @@ tj-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, tern }: melpaBuild { pname = "tj-mode"; - version = "20150826.1051"; + version = "20150826.851"; src = fetchFromGitHub { owner = "katspaugh"; repo = "tj-mode"; @@ -60309,7 +60860,7 @@ tldr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tldr"; - version = "20160312.808"; + version = "20160312.608"; src = fetchFromGitHub { owner = "kuanyui"; repo = "tldr.el"; @@ -60330,7 +60881,7 @@ tmmofl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tmmofl"; - version = "20121025.601"; + version = "20121025.401"; src = fetchFromGitHub { owner = "phillord"; repo = "tmmofl"; @@ -60351,12 +60902,12 @@ toc-org = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "toc-org"; - version = "20160630.913"; + version = "20160711.25"; src = fetchFromGitHub { owner = "snosov1"; repo = "toc-org"; - rev = "7c54f809d64183124a865aa32fd8f90f49318cbf"; - sha256 = "1iblb4rxbhh0v7bf1qy1xj0xr4s8q96wfzmqvihc839wfw0gj76b"; + rev = "08ed3f0883b0937bb17b7373c84ac7b8744aa8ae"; + sha256 = "0zr5j0n3xr6310zwd3wss34g77k0dfmmq7mm1a5pa8b7llvm1qbq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1305d88eca984a66039444da1ea64f29f1950206/recipes/toc-org"; @@ -60371,7 +60922,7 @@ }) {}; todochiku = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "todochiku"; - version = "20150112.1454"; + version = "20150112.1254"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/todochiku.el"; sha256 = "0fhlyjl0a3fd25as185j6dmch0wsrf1zc59q29lhjximg9lk3hr5"; @@ -60390,7 +60941,7 @@ todotxt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "todotxt"; - version = "20150513.2129"; + version = "20150513.1929"; src = fetchFromGitHub { owner = "rpdillon"; repo = "todotxt.el"; @@ -60411,7 +60962,7 @@ todotxt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "todotxt-mode"; - version = "20150424.904"; + version = "20150424.704"; src = fetchFromGitHub { owner = "avillafiorita"; repo = "todotxt-mode"; @@ -60432,7 +60983,7 @@ togetherly = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "togetherly"; - version = "20150820.338"; + version = "20150820.138"; src = fetchFromGitHub { owner = "zk-phi"; repo = "togetherly"; @@ -60453,7 +61004,7 @@ toggle = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "toggle"; - version = "20160331.300"; + version = "20160331.100"; src = fetchFromGitHub { owner = "zenspider"; repo = "elisp"; @@ -60474,7 +61025,7 @@ toggle-quotes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "toggle-quotes"; - version = "20140710.426"; + version = "20140710.226"; src = fetchFromGitHub { owner = "toctan"; repo = "toggle-quotes.el"; @@ -60495,7 +61046,7 @@ toggle-test = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "toggle-test"; - version = "20140723.37"; + version = "20140722.2237"; src = fetchFromGitHub { owner = "rags"; repo = "toggle-test"; @@ -60516,7 +61067,7 @@ toggle-window = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "toggle-window"; - version = "20141207.948"; + version = "20141207.748"; src = fetchFromGitHub { owner = "deadghost"; repo = "toggle-window"; @@ -60537,7 +61088,7 @@ tomatinho = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tomatinho"; - version = "20160531.1528"; + version = "20160531.1328"; src = fetchFromGitHub { owner = "konr"; repo = "tomatinho"; @@ -60558,7 +61109,7 @@ toml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "toml"; - version = "20130903.755"; + version = "20130903.555"; src = fetchFromGitHub { owner = "gongo"; repo = "emacs-toml"; @@ -60579,12 +61130,12 @@ toml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "toml-mode"; - version = "20150818.320"; + version = "20160718.2217"; src = fetchFromGitHub { owner = "dryman"; repo = "toml-mode.el"; - rev = "afd98423773c2b9578fc5b2b46a43b5f5ecf7e6b"; - sha256 = "1w9vkh6c4g80zykcy77k3r0bdc99mq8yh58bqkyd6gsr7pnp16gj"; + rev = "609d7101cc50b2ce350dad0d6adbd476d20fc811"; + sha256 = "068jcxadwpxk4rk4kix2y5g5dm7g3pd3d1v6dj5jimjkp9zvy1h9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8157d7d11f1e1848f0ba384249b4b8c6354830b/recipes/toml-mode"; @@ -60600,7 +61151,7 @@ tommyh-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tommyh-theme"; - version = "20131004.1830"; + version = "20131004.1630"; src = fetchFromGitHub { owner = "wglass"; repo = "tommyh-theme"; @@ -60620,7 +61171,7 @@ }) {}; tool-bar-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "tool-bar-plus"; - version = "20151231.1815"; + version = "20151231.1615"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/tool-bar+.el"; sha256 = "1sqflxj3hzxdlwn5qmpqm4dwik5vsyp7lypkvshcghdplxymb38a"; @@ -60638,7 +61189,7 @@ }) {}; top-mode = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "top-mode"; - version = "20130605.1239"; + version = "20130605.1039"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/top-mode.el"; sha256 = "0a5rl1cgznycqwx4r48mh69lgm8ixbnlfzbqdyvclgm8fldbannn"; @@ -60657,7 +61208,7 @@ tornado-template-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tornado-template-mode"; - version = "20141128.408"; + version = "20141128.208"; src = fetchFromGitHub { owner = "paradoxxxzero"; repo = "tornado-template-mode"; @@ -60678,7 +61229,7 @@ totd = callPackage ({ cl-lib ? null, fetchFromGitLab, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "totd"; - version = "20150519.940"; + version = "20150519.740"; src = fetchFromGitLab { owner = "egh"; repo = "emacs-totd"; @@ -60699,7 +61250,7 @@ tox = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tox"; - version = "20141004.1603"; + version = "20141004.1403"; src = fetchFromGitHub { owner = "chmouel"; repo = "tox.el"; @@ -60720,7 +61271,7 @@ toxi-theme = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "toxi-theme"; - version = "20160424.1626"; + version = "20160424.1426"; src = fetchhg { url = "https://bitbucket.com/postspectacular/toxi-theme"; rev = "b322fc7497a5"; @@ -60740,7 +61291,7 @@ traad = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, python-environment, request, request-deferred }: melpaBuild { pname = "traad"; - version = "20151226.134"; + version = "20151225.2334"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-traad"; @@ -60767,7 +61318,7 @@ tracking = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tracking"; - version = "20151129.519"; + version = "20151129.319"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; @@ -60788,7 +61339,7 @@ tracwiki-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }: melpaBuild { pname = "tracwiki-mode"; - version = "20150119.1021"; + version = "20150119.821"; src = fetchFromGitHub { owner = "merickson"; repo = "tracwiki-mode"; @@ -60809,7 +61360,7 @@ tramp-hdfs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tramp-hdfs"; - version = "20151028.2236"; + version = "20151028.2036"; src = fetchFromGitHub { owner = "raghavgautam"; repo = "tramp-hdfs"; @@ -60830,7 +61381,7 @@ tramp-term = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tramp-term"; - version = "20141104.1545"; + version = "20141104.1345"; src = fetchFromGitHub { owner = "randymorris"; repo = "tramp-term.el"; @@ -60851,12 +61402,12 @@ transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "transmission"; - version = "20160626.2241"; + version = "20160719.2219"; src = fetchFromGitHub { owner = "holomorph"; repo = "transmission"; - rev = "6f9b1d80b6e690550232ee95196a4044df48143c"; - sha256 = "0nri1limkshqq5xqd5gbf07xzywmk471kr8k55c83iig5qc3x1mh"; + rev = "0f051e62443a5fa6803945a32e997cff66fef4b7"; + sha256 = "0gsvym0af2ja8xw79sb2fs0qa37571iqk3jp93j5bv9vvy6y1482"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission"; @@ -60871,7 +61422,7 @@ }) {}; transpose-frame = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "transpose-frame"; - version = "20151126.826"; + version = "20151126.626"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/transpose-frame.el"; sha256 = "1f67yksgw9s6j0033hmqzaxx2a93jm11sd5ys7cc3li5gfh680m4"; @@ -60890,7 +61441,7 @@ transpose-mark = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "transpose-mark"; - version = "20150405.216"; + version = "20150405.16"; src = fetchFromGitHub { owner = "kwrooijen"; repo = "transpose-mark"; @@ -60911,7 +61462,7 @@ travis = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, request, s }: melpaBuild { pname = "travis"; - version = "20150825.638"; + version = "20150825.438"; src = fetchFromGitHub { owner = "nlamirault"; repo = "emacs-travis"; @@ -60931,7 +61482,7 @@ }) {}; tree-mode = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "tree-mode"; - version = "20151104.731"; + version = "20151104.531"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/tree-mode.el"; sha256 = "0hffnzvzbvmzf23z9z7n7y53l5i7kza9hgfl39qqcnw4njg48llx"; @@ -60950,7 +61501,7 @@ trident-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, skewer-mode, slime }: melpaBuild { pname = "trident-mode"; - version = "20130726.1407"; + version = "20130726.1207"; src = fetchFromGitHub { owner = "johnmastro"; repo = "trident-mode.el"; @@ -60971,7 +61522,7 @@ tronesque-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tronesque-theme"; - version = "20150125.441"; + version = "20150125.241"; src = fetchFromGitHub { owner = "aurelienbottazini"; repo = "tronesque"; @@ -60992,7 +61543,7 @@ trr = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "trr"; - version = "20160620.1705"; + version = "20160620.1505"; src = fetchFromGitHub { owner = "kawabata"; repo = "emacs-trr"; @@ -61013,7 +61564,7 @@ truthy = callPackage ({ fetchFromGitHub, fetchurl, lib, list-utils, melpaBuild }: melpaBuild { pname = "truthy"; - version = "20140508.1541"; + version = "20140508.1341"; src = fetchFromGitHub { owner = "rolandwalker"; repo = "truthy"; @@ -61034,7 +61585,7 @@ try = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "try"; - version = "20160226.930"; + version = "20160226.730"; src = fetchFromGitHub { owner = "larstvei"; repo = "Try"; @@ -61055,7 +61606,7 @@ tss = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, json-mode, lib, log4e, melpaBuild, yaxception }: melpaBuild { pname = "tss"; - version = "20150913.908"; + version = "20150913.708"; src = fetchFromGitHub { owner = "aki2o"; repo = "emacs-tss"; @@ -61076,7 +61627,7 @@ tt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tt-mode"; - version = "20130804.610"; + version = "20130804.410"; src = fetchFromGitHub { owner = "davorg"; repo = "tt-mode"; @@ -61096,7 +61647,7 @@ }) {}; ttl-mode = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ttl-mode"; - version = "20160505.332"; + version = "20160505.132"; src = fetchhg { url = "https://bitbucket.com/nxg/ttl-mode"; rev = "d790eb85ef4d"; @@ -61116,7 +61667,7 @@ ttrss = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ttrss"; - version = "20130409.1249"; + version = "20130409.1049"; src = fetchFromGitHub { owner = "pedros"; repo = "ttrss.el"; @@ -61134,22 +61685,22 @@ license = lib.licenses.free; }; }) {}; - tuareg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tuareg"; - version = "20160607.1817"; + version = "20160710.1045"; src = fetchFromGitHub { owner = "ocaml"; repo = "tuareg"; - rev = "93b9c6cdba3a8f333cc817c3822fc76b71ff4dcd"; - sha256 = "14l0y7gahbz1l4ag5nvswj7cl4skchvzr6r7zc1a5k000skdmv69"; + rev = "1e68a0addca6165b8f1cadfcd15c0b7ef5184e9a"; + sha256 = "11g1gimcp4w59pd316my8zmi4y78zf9avxhck829f817a97kf5fn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg"; sha256 = "0wx723dmjlpm86xdabl9n8p22zbbxpapyfn6ifz0b0pvhh49ip7q"; name = "tuareg"; }; - packageRequires = []; + packageRequires = [ caml ]; meta = { homepage = "https://melpa.org/#/tuareg"; license = lib.licenses.free; @@ -61158,7 +61709,7 @@ tumble = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, http-post-simple, lib, melpaBuild }: melpaBuild { pname = "tumble"; - version = "20160112.129"; + version = "20160111.2329"; src = fetchFromGitHub { owner = "febuiles"; repo = "tumble"; @@ -61179,7 +61730,7 @@ tumblesocks = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, markdown-mode, melpaBuild, oauth }: melpaBuild { pname = "tumblesocks"; - version = "20140215.1447"; + version = "20140215.1247"; src = fetchFromGitHub { owner = "gcr"; repo = "tumblesocks"; @@ -61200,7 +61751,7 @@ tup-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tup-mode"; - version = "20140410.1114"; + version = "20140410.914"; src = fetchFromGitHub { owner = "ejmr"; repo = "tup-mode"; @@ -61221,7 +61772,7 @@ turkish = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "turkish"; - version = "20160324.523"; + version = "20160324.323"; src = fetchFromGitHub { owner = "emres"; repo = "turkish-mode"; @@ -61242,7 +61793,7 @@ turnip = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "turnip"; - version = "20150309.129"; + version = "20150308.2329"; src = fetchFromGitHub { owner = "kljohann"; repo = "turnip.el"; @@ -61263,7 +61814,7 @@ twig-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "twig-mode"; - version = "20130220.1250"; + version = "20130220.1050"; src = fetchFromGitHub { owner = "moljac024"; repo = "twig-mode"; @@ -61284,7 +61835,7 @@ twilight-anti-bright-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "twilight-anti-bright-theme"; - version = "20160622.348"; + version = "20160622.148"; src = fetchFromGitHub { owner = "jimeh"; repo = "twilight-anti-bright-theme"; @@ -61305,7 +61856,7 @@ twilight-bright-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "twilight-bright-theme"; - version = "20130605.343"; + version = "20130605.143"; src = fetchFromGitHub { owner = "jimeh"; repo = "twilight-bright-theme.el"; @@ -61326,7 +61877,7 @@ twilight-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "twilight-theme"; - version = "20120412.803"; + version = "20120412.603"; src = fetchFromGitHub { owner = "developernotes"; repo = "twilight-theme"; @@ -61347,12 +61898,12 @@ twittering-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "twittering-mode"; - version = "20160703.1014"; + version = "20160710.1017"; src = fetchFromGitHub { owner = "hayamiz"; repo = "twittering-mode"; - rev = "4dc7b7513a0024f88743ea5e5cc1cb24b98a3307"; - sha256 = "1789lbai6w3miy5536148469p02wc252r2rmfyg9y7ibs7mnp4np"; + rev = "97ed4410dd994c09081a7a12570adb34f356d87c"; + sha256 = "16wk15hn1lgxphvb6kmihahbxi4vkks2knr6r5k3iay6gq7bvpbh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/twittering-mode"; @@ -61368,7 +61919,7 @@ typed-clojure-mode = callPackage ({ cider, clojure-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "typed-clojure-mode"; - version = "20151003.1322"; + version = "20151003.1122"; src = fetchFromGitHub { owner = "typedclojure"; repo = "typed-clojure-mode"; @@ -61389,12 +61940,12 @@ typescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "typescript-mode"; - version = "20160616.2207"; + version = "20160719.2353"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "typescript.el"; - rev = "b6e993513c4f00d05041f707cbd6f0c0c835b785"; - sha256 = "0zpn1agnblvvji8s9lpkxiziwliv9isymdfq7h74iap3w1iwnqky"; + rev = "aae70b59e64e1d7b3cfaee41e9134bfa19ac7363"; + sha256 = "10i2wkqq3bdrxxwx9nw8zbfx7jmvpwp5mpw9765zlppg46zkqkac"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d3f534a1e2cee4ad2e32e32802c5080207417b3d/recipes/typescript-mode"; @@ -61409,7 +61960,7 @@ }) {}; typing = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "typing"; - version = "20121026.1618"; + version = "20121026.1418"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/typing.el"; sha256 = "0mgvpdp3vlvjy32d163h2mzsf9j2ij2f542sdr3rsy8l80n6nx31"; @@ -61428,7 +61979,7 @@ typing-game = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "typing-game"; - version = "20160426.720"; + version = "20160426.520"; src = fetchFromGitHub { owner = "lujun9972"; repo = "el-typing-game"; @@ -61449,7 +62000,7 @@ typit = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, mmt }: melpaBuild { pname = "typit"; - version = "20160531.1131"; + version = "20160531.931"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "typit"; @@ -61470,7 +62021,7 @@ typo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "typo"; - version = "20160121.530"; + version = "20160121.330"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "typoel"; @@ -61488,22 +62039,22 @@ license = lib.licenses.free; }; }) {}; - typoscript-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + typoscript-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, use-package }: melpaBuild { pname = "typoscript-mode"; - version = "20160621.406"; + version = "20160719.212"; src = fetchFromGitHub { owner = "ksjogo"; repo = "typoscript-mode"; - rev = "afbf94464080d6084f52cc51efcb908ecfbd2278"; - sha256 = "0z3p1yf1fy9ic00gr1xp8i68azd0v4zn2sp5k1cchqj3hbazlwcv"; + rev = "0d414e15c8217b5ed42080c84f1c4cc39fdb18ab"; + sha256 = "1i6667dn8avk2lm37lq2ga3d716d34yqz5zqd8j1lq4xyjaq3qj6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/701de09cb97cbfa49a3a81aaeb9577817566efa2/recipes/typoscript-mode"; sha256 = "18i2wwbn8vj5dbgxp2ds29n12v8ldvxjd1zb6h1g9lfh8iyrnjmx"; name = "typoscript-mode"; }; - packageRequires = [ emacs ]; + packageRequires = [ emacs use-package ]; meta = { homepage = "https://melpa.org/#/typoscript-mode"; license = lib.licenses.free; @@ -61512,7 +62063,7 @@ ubuntu-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ubuntu-theme"; - version = "20150805.1006"; + version = "20150805.806"; src = fetchFromGitHub { owner = "rocher"; repo = "ubuntu-theme"; @@ -61532,7 +62083,7 @@ }) {}; ucs-cmds = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "ucs-cmds"; - version = "20151231.1816"; + version = "20151231.1616"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/ucs-cmds.el"; sha256 = "0qy211rxrmzhwl9qfrcmfnwayysvb5rghjginbvx3wf2s6hrbpya"; @@ -61551,7 +62102,7 @@ ucs-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, list-utils, melpaBuild, pcache, persistent-soft }: melpaBuild { pname = "ucs-utils"; - version = "20150826.914"; + version = "20150826.714"; src = fetchFromGitHub { owner = "rolandwalker"; repo = "ucs-utils"; @@ -61572,12 +62123,12 @@ uimage = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "uimage"; - version = "20160426.726"; + version = "20160716.130"; src = fetchFromGitHub { owner = "lujun9972"; repo = "uimage"; - rev = "0fdcf6622bcb6c683f1910a73c4fdf071e627d21"; - sha256 = "13zznakgqyy3hw385f6w40rz4agxz6fmgaxzgmrz3kjpn19bc2fa"; + rev = "e63b06416d4fcfc50a65ba6dfdf7e4d9b969750c"; + sha256 = "0l03c72y219ilfm685g3c8jziayjdvbb911qzhs6hcbysy0b3v6x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/346cb25abdfdd539d121a9f34bce75b2fc5a16be/recipes/uimage"; @@ -61593,12 +62144,12 @@ ujelly-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ujelly-theme"; - version = "20160620.2008"; + version = "20160722.1850"; src = fetchFromGitHub { owner = "marktran"; repo = "color-theme-ujelly"; - rev = "1f1043199d979c4aacd72795addb761873b33cdf"; - sha256 = "087zaglf03ikdssdmqkp8vlipqbcs5m52bncdyc0v3p75s6v4cdc"; + rev = "c0082c1b5ab9ff1c04a334a25566ccb40929a71e"; + sha256 = "1gayz9y2i0h2v62gczrzd81cw5w8wnj2bgscc3j05v12piamjggb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/ujelly-theme"; @@ -61614,7 +62165,7 @@ ukrainian-holidays = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ukrainian-holidays"; - version = "20130720.849"; + version = "20130720.649"; src = fetchFromGitHub { owner = "abo-abo"; repo = "ukrainian-holidays"; @@ -61634,7 +62185,7 @@ }) {}; unbound = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "unbound"; - version = "20160506.155"; + version = "20160505.2355"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/unbound.el"; sha256 = "0awmzz9cfr17ggpzsgxqqhz5946l7705vvkfaiz7qx9wg0pbch18"; @@ -61653,7 +62204,7 @@ uncrustify-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "uncrustify-mode"; - version = "20130707.859"; + version = "20130707.659"; src = fetchFromGitHub { owner = "koko1000ban"; repo = "emacs-uncrustify-mode"; @@ -61674,7 +62225,7 @@ undercover = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, shut-up }: melpaBuild { pname = "undercover"; - version = "20160329.937"; + version = "20160329.737"; src = fetchFromGitHub { owner = "sviridov"; repo = "undercover.el"; @@ -61695,7 +62246,7 @@ underwater-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "underwater-theme"; - version = "20131117.1802"; + version = "20131117.1602"; src = fetchFromGitHub { owner = "jmdeldin"; repo = "underwater-theme.el"; @@ -61716,7 +62267,7 @@ undo-tree = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "undo-tree"; - version = "20140509.722"; + version = "20140509.522"; src = fetchgit { url = "http://www.dr-qubit.org/git/undo-tree.git"; rev = "a3e81b682053a81e082139300ef0a913a7a610a2"; @@ -61736,7 +62287,7 @@ undohist = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "undohist"; - version = "20150315.742"; + version = "20150315.542"; src = fetchFromGitHub { owner = "m2ym"; repo = "undohist-el"; @@ -61757,7 +62308,7 @@ unfill = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "unfill"; - version = "20131103.413"; + version = "20131103.213"; src = fetchFromGitHub { owner = "purcell"; repo = "unfill"; @@ -61778,7 +62329,7 @@ unicode-emoticons = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "unicode-emoticons"; - version = "20150204.508"; + version = "20150204.308"; src = fetchFromGitHub { owner = "hagleitn"; repo = "unicode-emoticons"; @@ -61799,7 +62350,7 @@ unicode-enbox = callPackage ({ fetchFromGitHub, fetchurl, lib, list-utils, melpaBuild, pcache, persistent-soft, string-utils, ucs-utils }: melpaBuild { pname = "unicode-enbox"; - version = "20140508.1541"; + version = "20140508.1341"; src = fetchFromGitHub { owner = "rolandwalker"; repo = "unicode-enbox"; @@ -61826,7 +62377,7 @@ unicode-escape = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }: melpaBuild { pname = "unicode-escape"; - version = "20160614.734"; + version = "20160614.534"; src = fetchFromGitHub { owner = "kosh04"; repo = "unicode-escape.el"; @@ -61847,7 +62398,7 @@ unicode-fonts = callPackage ({ fetchFromGitHub, fetchurl, font-utils, lib, list-utils, melpaBuild, pcache, persistent-soft, ucs-utils }: melpaBuild { pname = "unicode-fonts"; - version = "20150826.1732"; + version = "20150826.1532"; src = fetchFromGitHub { owner = "rolandwalker"; repo = "unicode-fonts"; @@ -61874,7 +62425,7 @@ unicode-input = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "unicode-input"; - version = "20141219.120"; + version = "20141218.2320"; src = fetchhg { url = "https://bitbucket.com/m00nlight/unicode-input"; rev = "e76ccb549e6a"; @@ -61894,7 +62445,7 @@ unicode-progress-reporter = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, list-utils, melpaBuild, pcache, persistent-soft, ucs-utils }: melpaBuild { pname = "unicode-progress-reporter"; - version = "20140508.1541"; + version = "20140508.1341"; src = fetchFromGitHub { owner = "rolandwalker"; repo = "unicode-progress-reporter"; @@ -61915,7 +62466,7 @@ unicode-troll-stopper = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "unicode-troll-stopper"; - version = "20151023.2031"; + version = "20151023.1831"; src = fetchFromGitHub { owner = "camsaul"; repo = "emacs-unicode-troll-stopper"; @@ -61936,7 +62487,7 @@ unicode-whitespace = callPackage ({ fetchFromGitHub, fetchurl, lib, list-utils, melpaBuild, pcache, persistent-soft, ucs-utils }: melpaBuild { pname = "unicode-whitespace"; - version = "20140508.1541"; + version = "20140508.1341"; src = fetchFromGitHub { owner = "rolandwalker"; repo = "unicode-whitespace"; @@ -61957,7 +62508,7 @@ unidecode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "unidecode"; - version = "20140317.2318"; + version = "20140317.2118"; src = fetchFromGitHub { owner = "sindikat"; repo = "unidecode"; @@ -61978,7 +62529,7 @@ unify-opening = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "unify-opening"; - version = "20151116.1848"; + version = "20151116.1648"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "unify-opening"; @@ -61999,7 +62550,7 @@ unipoint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "unipoint"; - version = "20140113.1624"; + version = "20140113.1424"; src = fetchFromGitHub { owner = "apg"; repo = "unipoint"; @@ -62020,12 +62571,12 @@ unison = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "unison"; - version = "20160701.1317"; + version = "20160704.40"; src = fetchFromGitHub { owner = "unhammer"; repo = "unison.el"; - rev = "0f45daef84207bf4d12966991bb838830866090d"; - sha256 = "0ihwa6vjcbjx47vawv0p8wcl001vn2cyfrpj68sclh6il75dg58i"; + rev = "a78a04c0d1398d00f75a1bd4799622a65bcb0f28"; + sha256 = "1jn23wlhpka5pv0caipxi8bg3cc6wj1fg09abibhydy4p3mb3bi5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ee7ee1a68486f822c1627fb0bf066c4ae8bc0776/recipes/unison"; @@ -62041,7 +62592,7 @@ unison-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "unison-mode"; - version = "20160513.1001"; + version = "20160513.801"; src = fetchFromGitHub { owner = "impaktor"; repo = "unison-mode"; @@ -62062,7 +62613,7 @@ unkillable-scratch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "unkillable-scratch"; - version = "20160504.2103"; + version = "20160504.1903"; src = fetchFromGitHub { owner = "EricCrosson"; repo = "unkillable-scratch"; @@ -62083,7 +62634,7 @@ url-shortener = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "url-shortener"; - version = "20160404.2159"; + version = "20160404.1959"; src = fetchFromGitHub { owner = "yuyang0"; repo = "url-shortener"; @@ -62104,7 +62655,7 @@ urlenc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "urlenc"; - version = "20140116.856"; + version = "20140116.656"; src = fetchFromGitHub { owner = "buzztaiki"; repo = "urlenc-el"; @@ -62124,7 +62675,7 @@ }) {}; usage-memo = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "usage-memo"; - version = "20110722.1051"; + version = "20110722.851"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/usage-memo.el"; sha256 = "00g1zj5fjykdi6gh2wkswpwx132xa6jmwfnrgfg5r96zwb8pib4i"; @@ -62143,12 +62694,12 @@ use-package = callPackage ({ bind-key, diminish, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "use-package"; - version = "20160614.1003"; + version = "20160722.1123"; src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "56687f58c499db608167065b8d94a371902f3ed4"; - sha256 = "0dr8zkx6nr4n7i02l7v5k36cckiwjrrxafh72pi2qzk3b7n1yvrm"; + rev = "c191614a009bf02d7af63e306bab6d296e1849e3"; + sha256 = "1v9s01g03sgy42pqaslcchwza3zw14d18qfidiggcic7ffl6sy0j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3f9b52790e2a0bd579c24004873df5384e2ba549/recipes/use-package"; @@ -62164,7 +62715,7 @@ use-package-chords = callPackage ({ bind-chord, bind-key, fetchFromGitHub, fetchurl, lib, melpaBuild, use-package }: melpaBuild { pname = "use-package-chords"; - version = "20160530.1242"; + version = "20160530.1042"; src = fetchFromGitHub { owner = "waymondo"; repo = "use-package-chords"; @@ -62185,12 +62736,12 @@ utop = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "utop"; - version = "20151105.447"; + version = "20151105.247"; src = fetchFromGitHub { owner = "diml"; repo = "utop"; - rev = "9e9ebbfa4a1023eb4823fc8361282593790a54c8"; - sha256 = "1vacc4l5jsyxdfcinxja3r1qyc4cskmd9xvxp6zxkjfw4x6nr71c"; + rev = "f84b9b10ae0b9b58f2d41d4d5216891da4d49d55"; + sha256 = "0nxj6k1j8cpargl1qv4p2dhnlmn8fb5qy941jx03613igaya2f6z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30489fe52b4031184e54f994770aa3291257bc9d/recipes/utop"; @@ -62206,7 +62757,7 @@ uuid = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "uuid"; - version = "20120910.351"; + version = "20120910.151"; src = fetchFromGitHub { owner = "nicferrier"; repo = "emacs-uuid"; @@ -62227,7 +62778,7 @@ uuidgen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "uuidgen"; - version = "20140918.1801"; + version = "20140918.1601"; src = fetchFromGitHub { owner = "kanru"; repo = "uuidgen-el"; @@ -62248,7 +62799,7 @@ uzumaki = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "uzumaki"; - version = "20150119.1906"; + version = "20150119.1706"; src = fetchFromGitHub { owner = "geyslan"; repo = "uzumaki"; @@ -62269,12 +62820,12 @@ v2ex-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, request }: melpaBuild { pname = "v2ex-mode"; - version = "20160628.2054"; + version = "20160719.2045"; src = fetchFromGitHub { owner = "aborn"; repo = "v2ex-mode"; - rev = "24288b04ca239b51ef7988605fc25d00b13d492b"; - sha256 = "04jd8fgzndcq835crk7jk22qyq4q9aqnf9z07ixpxzxmc3fr6arj"; + rev = "b7d19bb594b43ea3824a6f215dd1e5d1d4c0e8ad"; + sha256 = "0hhj5xfm7mp3ajrbj9ai5p2d9akaqkj89rmqmg1vpyfp3x2f4h2k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b27b7d777415aa350c8c30822e239b9a4c02e77d/recipes/v2ex-mode"; @@ -62290,7 +62841,7 @@ vagrant = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vagrant"; - version = "20160505.330"; + version = "20160505.130"; src = fetchFromGitHub { owner = "ottbot"; repo = "vagrant.el"; @@ -62311,7 +62862,7 @@ vagrant-tramp = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vagrant-tramp"; - version = "20160427.1832"; + version = "20160427.1632"; src = fetchFromGitHub { owner = "dougm"; repo = "vagrant-tramp"; @@ -62332,7 +62883,7 @@ vala-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vala-mode"; - version = "20150324.1725"; + version = "20150324.1525"; src = fetchFromGitHub { owner = "emacsorphanage"; repo = "vala-mode"; @@ -62353,7 +62904,7 @@ vala-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "vala-snippets"; - version = "20150428.2252"; + version = "20150428.2052"; src = fetchFromGitHub { owner = "gopar"; repo = "vala-snippets"; @@ -62374,7 +62925,7 @@ vbasense = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }: melpaBuild { pname = "vbasense"; - version = "20140221.1753"; + version = "20140221.1553"; src = fetchFromGitHub { owner = "aki2o"; repo = "emacs-vbasense"; @@ -62395,7 +62946,7 @@ vc-auto-commit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vc-auto-commit"; - version = "20160108.415"; + version = "20160108.215"; src = fetchFromGitHub { owner = "thisirs"; repo = "vc-auto-commit"; @@ -62416,7 +62967,7 @@ vc-check-status = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vc-check-status"; - version = "20160108.416"; + version = "20160108.216"; src = fetchFromGitHub { owner = "thisirs"; repo = "vc-check-status"; @@ -62437,7 +62988,7 @@ vc-darcs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vc-darcs"; - version = "20151225.1428"; + version = "20151225.1228"; src = fetchFromGitHub { owner = "velkyel"; repo = "vc-darcs"; @@ -62458,7 +63009,7 @@ vc-osc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vc-osc"; - version = "20120910.411"; + version = "20120910.211"; src = fetchFromGitHub { owner = "aspiers"; repo = "vc-osc"; @@ -62479,7 +63030,7 @@ vcl-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vcl-mode"; - version = "20160613.946"; + version = "20160613.746"; src = fetchFromGitHub { owner = "ssm"; repo = "vcl-mode"; @@ -62500,7 +63051,7 @@ vcomp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vcomp"; - version = "20140906.1708"; + version = "20140906.1508"; src = fetchFromGitHub { owner = "tarsius"; repo = "vcomp"; @@ -62518,10 +63069,31 @@ license = lib.licenses.free; }; }) {}; + vdiff = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }: + melpaBuild { + pname = "vdiff"; + version = "20160726.1519"; + src = fetchFromGitHub { + owner = "justbur"; + repo = "emacs-vdiff"; + rev = "945405330ffb3e397505738efb33cc1f2c1aff14"; + sha256 = "0nx0c5h0mvkqbr2qbn3w5qxnhg65hw8lmy5mnh9q2a6gd154aqdm"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e90f19c8fa4b0d267d269b76f117995e812e899c/recipes/vdiff"; + sha256 = "11gw0l63fssbiyhngqb7ykrp7m1vy55wlf27ybhh2dkwh1cpkr4l"; + name = "vdiff"; + }; + packageRequires = [ emacs hydra ]; + meta = { + homepage = "https://melpa.org/#/vdiff"; + license = lib.licenses.free; + }; + }) {}; vdirel = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, org-vcard, seq }: melpaBuild { pname = "vdirel"; - version = "20151216.55"; + version = "20151215.2255"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "vdirel"; @@ -62542,7 +63114,7 @@ vector-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vector-utils"; - version = "20140508.1541"; + version = "20140508.1341"; src = fetchFromGitHub { owner = "rolandwalker"; repo = "vector-utils"; @@ -62563,7 +63135,7 @@ verify-url = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "verify-url"; - version = "20160426.728"; + version = "20160426.528"; src = fetchFromGitHub { owner = "lujun9972"; repo = "verify-url"; @@ -62584,7 +63156,7 @@ vertica = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, sql ? null }: melpaBuild { pname = "vertica"; - version = "20131217.911"; + version = "20131217.711"; src = fetchFromGitHub { owner = "r0man"; repo = "vertica-el"; @@ -62605,7 +63177,7 @@ vertigo = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vertigo"; - version = "20160429.2305"; + version = "20160429.2105"; src = fetchFromGitHub { owner = "noctuid"; repo = "vertigo.el"; @@ -62626,7 +63198,7 @@ vhdl-capf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vhdl-capf"; - version = "20160221.1134"; + version = "20160221.934"; src = fetchFromGitHub { owner = "sh-ow"; repo = "vhdl-capf"; @@ -62647,12 +63219,12 @@ vhdl-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, ggtags, helm, lib, melpaBuild, outshine, projectile }: melpaBuild { pname = "vhdl-tools"; - version = "20160629.835"; + version = "20160709.230"; src = fetchFromGitHub { owner = "csantosb"; repo = "vhdl-tools"; - rev = "c0d03f45cd2c394aeeff10473a38edf1c4126440"; - sha256 = "1yg9hjn8y3m2y7xcfkd06nr8zz45alfy18q9d01fyhndjx87zvaa"; + rev = "6d8b03d588b612f82395d4fdf9d1d5c5adbd471f"; + sha256 = "13bazr7cgsypam4yhk491wlkm688rkp44nc83rbl7qyyf3zb24pa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69fe2f8fb98ac1af1d3185f62ae1c89e646cfebf/recipes/vhdl-tools"; @@ -62668,7 +63240,7 @@ vi-tilde-fringe = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vi-tilde-fringe"; - version = "20141027.2142"; + version = "20141027.1942"; src = fetchFromGitHub { owner = "syl20bnr"; repo = "vi-tilde-fringe"; @@ -62689,7 +63261,7 @@ viewer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "viewer"; - version = "20141021.1336"; + version = "20141021.1136"; src = fetchFromGitHub { owner = "rubikitch"; repo = "viewer"; @@ -62710,12 +63282,12 @@ viking-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "viking-mode"; - version = "20160529.537"; + version = "20160705.1327"; src = fetchFromGitHub { owner = "tlinden"; repo = "viking-mode"; - rev = "658198ece26dc9e5d94cad95f749d08a259ac682"; - sha256 = "1fmjcm33hvm7d9ppf8lnbdqcqda8xj332hqdm50pvl0qfj90mp94"; + rev = "c76aa265d13ad91d6890d242e142d05e31f0340b"; + sha256 = "1944p3kbskzj4d9w9prbi7z59lrn087v3gphbhwjplz6mvwbl8g6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5805575f353c14a62d00543a23eb4c638d9d52dc/recipes/viking-mode"; @@ -62731,7 +63303,7 @@ vim-empty-lines-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vim-empty-lines-mode"; - version = "20150110.2226"; + version = "20150110.2026"; src = fetchFromGitHub { owner = "jmickelin"; repo = "vim-empty-lines-mode"; @@ -62752,7 +63324,7 @@ vim-region = callPackage ({ expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vim-region"; - version = "20140329.1124"; + version = "20140329.924"; src = fetchFromGitHub { owner = "ongaeshi"; repo = "emacs-vim-region"; @@ -62773,7 +63345,7 @@ vimgolf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vimgolf"; - version = "20140814.1648"; + version = "20140814.1448"; src = fetchFromGitHub { owner = "timvisher"; repo = "vimgolf"; @@ -62794,12 +63366,12 @@ vimish-fold = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vimish-fold"; - version = "20160531.1132"; + version = "20160718.126"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "vimish-fold"; - rev = "a55cd8118ef540b57ea5ae84d34fa245f5c83d27"; - sha256 = "1n8aw5g0a38irx2m93fgqll99n6w59h6nzkrmzb9747bvar4mpsg"; + rev = "2ba97302f76d83df3ec8dd1a2d76b02e1a0aadd6"; + sha256 = "0mfrydhndr4a77231kwnh1zljsfpn6sczw51li1kbdbkg8xbps33"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4862b0a3d43f073e645803cbbf11d973a4b51d5/recipes/vimish-fold"; @@ -62815,7 +63387,7 @@ vimrc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vimrc-mode"; - version = "20150607.1113"; + version = "20150607.913"; src = fetchFromGitHub { owner = "mcandre"; repo = "vimrc-mode"; @@ -62836,7 +63408,7 @@ virtualenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "virtualenv"; - version = "20140220.1701"; + version = "20140220.1501"; src = fetchFromGitHub { owner = "aculich"; repo = "virtualenv.el"; @@ -62857,7 +63429,7 @@ virtualenvwrapper = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "virtualenvwrapper"; - version = "20151127.821"; + version = "20151127.621"; src = fetchFromGitHub { owner = "porterjamesj"; repo = "virtualenvwrapper.el"; @@ -62878,7 +63450,7 @@ visible-mark = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "visible-mark"; - version = "20150623.2350"; + version = "20150623.2150"; src = fetchFromGitLab { owner = "iankelling"; repo = "visible-mark"; @@ -62899,7 +63471,7 @@ visual-ascii-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "visual-ascii-mode"; - version = "20150129.446"; + version = "20150129.246"; src = fetchFromGitHub { owner = "Dewdrops"; repo = "visual-ascii-mode"; @@ -62920,7 +63492,7 @@ visual-fill-column = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "visual-fill-column"; - version = "20160411.720"; + version = "20160411.520"; src = fetchFromGitHub { owner = "joostkremers"; repo = "visual-fill-column"; @@ -62941,7 +63513,7 @@ visual-regexp = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "visual-regexp"; - version = "20160624.520"; + version = "20160624.320"; src = fetchFromGitHub { owner = "benma"; repo = "visual-regexp.el"; @@ -62962,7 +63534,7 @@ visual-regexp-steroids = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, visual-regexp }: melpaBuild { pname = "visual-regexp-steroids"; - version = "20160516.1438"; + version = "20160516.1238"; src = fetchFromGitHub { owner = "benma"; repo = "visual-regexp-steroids.el"; @@ -62983,7 +63555,7 @@ vkill = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vkill"; - version = "20091203.1222"; + version = "20091203.1022"; src = fetchFromGitHub { owner = "emacsmirror"; repo = "vkill"; @@ -63004,7 +63576,7 @@ vlf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vlf"; - version = "20150101.918"; + version = "20150101.718"; src = fetchFromGitHub { owner = "m00natic"; repo = "vlfi"; @@ -63024,7 +63596,7 @@ }) {}; vline = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "vline"; - version = "20120108.645"; + version = "20120108.445"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/vline.el"; sha256 = "1ys6928fgk8mswa4gv10cxggir8acck27g78cw1z3pdz5gakbgnj"; @@ -63043,7 +63615,7 @@ vmd-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vmd-mode"; - version = "20160531.1919"; + version = "20160531.1719"; src = fetchFromGitHub { owner = "blak3mill3r"; repo = "vmd-mode"; @@ -63064,7 +63636,7 @@ voca-builder = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "voca-builder"; - version = "20150625.1333"; + version = "20150625.1133"; src = fetchFromGitHub { owner = "yitang"; repo = "voca-builder"; @@ -63085,7 +63657,7 @@ volatile-highlights = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "volatile-highlights"; - version = "20160611.2055"; + version = "20160611.1855"; src = fetchFromGitHub { owner = "k-talo"; repo = "volatile-highlights.el"; @@ -63106,7 +63678,7 @@ volume = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "volume"; - version = "20150718.1509"; + version = "20150718.1309"; src = fetchFromGitHub { owner = "dbrock"; repo = "volume-el"; @@ -63127,7 +63699,7 @@ vue-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode }: melpaBuild { pname = "vue-mode"; - version = "20160411.2254"; + version = "20160411.2054"; src = fetchFromGitHub { owner = "CodeFalling"; repo = "vue-mode"; @@ -63147,7 +63719,7 @@ }) {}; w32-browser = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "w32-browser"; - version = "20151231.1820"; + version = "20151231.1620"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/w32-browser.el"; sha256 = "0vb5ss30mz0kqq8cscjckw647vqn6xprp2sfjcbpg2fx59z4agma"; @@ -63166,7 +63738,7 @@ w32browser-dlgopen = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "w32browser-dlgopen"; - version = "20151231.1821"; + version = "20151231.1621"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/w32browser-dlgopen.el"; sha256 = "0nyara81bnd0rvgyljqrrbvjvndkngdc7qzf6scl5iz3vlglfgy7"; @@ -63182,29 +63754,10 @@ license = lib.licenses.free; }; }) {}; - w3m = callPackage ({ fetchcvs, fetchurl, lib, melpaBuild }: melpaBuild { - pname = "w3m"; - version = "20160422.354"; - src = fetchcvs { - cvsRoot = ":pserver:anonymous@cvs.namazu.org:/storage/cvsroot"; - module = "emacs-w3m"; - sha256 = "52e1e998a3bf83fe7bca1d70de5845fdfca04d09467adc3b691987f17a98ff5e"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/8bbb18b0db057b9cca78ae7280674fd1beb56443/recipes/w3m"; - sha256 = "17mzs126fvlnsvxgfpbil9wmka0i87psblq49phky7dywcwz27lc"; - name = "w3m"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/w3m"; - license = lib.licenses.free; - }; - }) {}; wacspace = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wacspace"; - version = "20140827.32"; + version = "20140826.2232"; src = fetchFromGitHub { owner = "shosti"; repo = "wacspace.el"; @@ -63225,7 +63778,7 @@ waher-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "waher-theme"; - version = "20141115.630"; + version = "20141115.430"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-waher-theme"; @@ -63246,7 +63799,7 @@ wakatime-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wakatime-mode"; - version = "20160417.309"; + version = "20160417.109"; src = fetchFromGitHub { owner = "wakatime"; repo = "wakatime-mode"; @@ -63267,7 +63820,7 @@ wand = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wand"; - version = "20141104.1845"; + version = "20141104.1645"; src = fetchFromGitHub { owner = "cmpitg"; repo = "wand"; @@ -63288,7 +63841,7 @@ wandbox = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }: melpaBuild { pname = "wandbox"; - version = "20160418.1314"; + version = "20160418.1114"; src = fetchFromGitHub { owner = "kosh04"; repo = "emacs-wandbox"; @@ -63309,12 +63862,12 @@ wanderlust = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, semi }: melpaBuild { pname = "wanderlust"; - version = "20160429.1838"; + version = "20160704.313"; src = fetchFromGitHub { owner = "wanderlust"; repo = "wanderlust"; - rev = "3e29a10cddbae350aea5aefd69ba1cded5071a35"; - sha256 = "01zwk4rh18fmgrj75kyhkny1s3r0cmnjjnxa3ljbw1yy6q90acga"; + rev = "d6565e7e8f8423f419c24cd96bc7508241ad2dd7"; + sha256 = "18iqgwq2b162408sza3i5fgzjgy16v376hsbal10403bvzlwp1ir"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/426172b72026d1adeb1bf3fcc6b0407875047333/recipes/wanderlust"; @@ -63330,7 +63883,7 @@ warm-night-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "warm-night-theme"; - version = "20150607.941"; + version = "20150607.741"; src = fetchFromGitHub { owner = "mswift42"; repo = "warm-night-theme"; @@ -63351,7 +63904,7 @@ watch-buffer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "watch-buffer"; - version = "20120331.1544"; + version = "20120331.1344"; src = fetchFromGitHub { owner = "mjsteger"; repo = "watch-buffer"; @@ -63372,7 +63925,7 @@ wavefront-obj-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wavefront-obj-mode"; - version = "20150501.1316"; + version = "20150501.1116"; src = fetchFromGitHub { owner = "abend"; repo = "wavefront-obj-mode"; @@ -63393,7 +63946,7 @@ wc-goal-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wc-goal-mode"; - version = "20140829.859"; + version = "20140829.659"; src = fetchFromGitHub { owner = "bnbeckwith"; repo = "wc-goal-mode"; @@ -63414,7 +63967,7 @@ wc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wc-mode"; - version = "20131121.1026"; + version = "20131121.826"; src = fetchFromGitHub { owner = "bnbeckwith"; repo = "wc-mode"; @@ -63435,12 +63988,12 @@ wcheck-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wcheck-mode"; - version = "20160208.1336"; + version = "20160711.2213"; src = fetchFromGitHub { owner = "tlikonen"; repo = "wcheck-mode"; - rev = "e07dd1d0c3e034360d08c3856471496273a340da"; - sha256 = "0irw76inj3gdmi88hiayplv6fzjjjsvvvmr121ahh3p73mb14cjd"; + rev = "57c41b2f98aabc4fda375df26254a8ae097fe814"; + sha256 = "1yfqvyz76v3ir0fcvmw7f55llmmdpn2n0wij82anxx5sqmjjp8df"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d10b59f568fdedf248c2e8eaa06c4a74032ca56/recipes/wcheck-mode"; @@ -63456,7 +64009,7 @@ weather-metno = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "weather-metno"; - version = "20150831.2007"; + version = "20150831.1807"; src = fetchFromGitHub { owner = "ruediger"; repo = "weather-metno-el"; @@ -63477,7 +64030,7 @@ web = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "web"; - version = "20141231.1401"; + version = "20141231.1201"; src = fetchFromGitHub { owner = "nicferrier"; repo = "emacs-web"; @@ -63498,7 +64051,7 @@ web-beautify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "web-beautify"; - version = "20160410.1205"; + version = "20160410.1005"; src = fetchFromGitHub { owner = "yasuyk"; repo = "web-beautify"; @@ -63519,7 +64072,7 @@ web-completion-data = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "web-completion-data"; - version = "20160318.348"; + version = "20160318.148"; src = fetchFromGitHub { owner = "osv"; repo = "web-completion-data"; @@ -63540,12 +64093,12 @@ web-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "web-mode"; - version = "20160702.918"; + version = "20160717.1201"; src = fetchFromGitHub { owner = "fxbois"; repo = "web-mode"; - rev = "229cdaad141ee0cc7526c2d946abb5aaa6ee7a0d"; - sha256 = "022hjma4lc7jqiddwh9d0kfzsmci8whv83xrhkn6gr4p21c69p45"; + rev = "e170d2720be0758a7ebe001e234231be52c83554"; + sha256 = "0grskbrxcpn4sb55qycp1rm2fxvdd1ijndscqzfmvwi9kp0snx59"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode"; @@ -63561,7 +64114,7 @@ web-server = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "web-server"; - version = "20140905.1906"; + version = "20140905.1706"; src = fetchFromGitHub { owner = "eschulte"; repo = "emacs-web-server"; @@ -63582,7 +64135,7 @@ weblogger = callPackage ({ fetchbzr, fetchurl, lib, melpaBuild, xml-rpc }: melpaBuild { pname = "weblogger"; - version = "20110926.1118"; + version = "20110926.918"; src = fetchbzr { url = "lp:weblogger-el"; rev = "38"; @@ -63602,12 +64155,12 @@ websocket = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "websocket"; - version = "20160510.2201"; + version = "20160720.2051"; src = fetchFromGitHub { owner = "ahyatt"; repo = "emacs-websocket"; - rev = "f18bfea59b843ea67bc0a3381783d6e083d33640"; - sha256 = "0ly12vy93m6jk6r62006ykjcrk966qk0ah0fk0hjxf8fx8shhsig"; + rev = "567555360443f5de0a6426c5e2d88ba037c33855"; + sha256 = "1svgsgyiw16pgk16px0a21gfh6d94sgn01wmq5i7v4gdaf1xqfbc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/websocket"; @@ -63623,7 +64176,7 @@ wedge-ws = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wedge-ws"; - version = "20140714.1649"; + version = "20140714.1449"; src = fetchFromGitHub { owner = "aes"; repo = "wedge-ws"; @@ -63644,7 +64197,7 @@ weechat = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, tracking }: melpaBuild { pname = "weechat"; - version = "20160229.1448"; + version = "20160229.1248"; src = fetchFromGitHub { owner = "the-kenny"; repo = "weechat.el"; @@ -63665,7 +64218,7 @@ weechat-alert = callPackage ({ alert, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, weechat }: melpaBuild { pname = "weechat-alert"; - version = "20160416.748"; + version = "20160416.548"; src = fetchFromGitHub { owner = "Kungi"; repo = "weechat-alert"; @@ -63686,7 +64239,7 @@ weibo = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "weibo"; - version = "20150307.1642"; + version = "20150307.1442"; src = fetchFromGitHub { owner = "austin-----"; repo = "weibo.emacs"; @@ -63707,7 +64260,7 @@ wgrep = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wgrep"; - version = "20141016.1856"; + version = "20141016.1656"; src = fetchFromGitHub { owner = "mhayashi1120"; repo = "Emacs-wgrep"; @@ -63728,7 +64281,7 @@ wgrep-ack = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, wgrep }: melpaBuild { pname = "wgrep-ack"; - version = "20141012.511"; + version = "20141012.311"; src = fetchFromGitHub { owner = "mhayashi1120"; repo = "Emacs-wgrep"; @@ -63749,7 +64302,7 @@ wgrep-ag = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, wgrep }: melpaBuild { pname = "wgrep-ag"; - version = "20141012.511"; + version = "20141012.311"; src = fetchFromGitHub { owner = "mhayashi1120"; repo = "Emacs-wgrep"; @@ -63770,7 +64323,7 @@ wgrep-helm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, wgrep }: melpaBuild { pname = "wgrep-helm"; - version = "20140528.1627"; + version = "20140528.1427"; src = fetchFromGitHub { owner = "mhayashi1120"; repo = "Emacs-wgrep"; @@ -63791,7 +64344,7 @@ wgrep-pt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, wgrep }: melpaBuild { pname = "wgrep-pt"; - version = "20140510.1731"; + version = "20140510.1531"; src = fetchFromGitHub { owner = "mhayashi1120"; repo = "Emacs-wgrep"; @@ -63812,7 +64365,7 @@ what-the-commit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "what-the-commit"; - version = "20150901.816"; + version = "20150901.616"; src = fetchFromGitHub { owner = "danielbarbarito"; repo = "what-the-commit.el"; @@ -63833,12 +64386,12 @@ which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "which-key"; - version = "20160617.742"; + version = "20160709.1225"; src = fetchFromGitHub { owner = "justbur"; repo = "emacs-which-key"; - rev = "9184b1bcbf316e8d619d72ae140efa48c5e6595d"; - sha256 = "1dw3syln6rbbd2f54qlxxs1w66af9yhg0k0jvblkdvf99q1704hi"; + rev = "eb4a6f6e251cf0e34f2d7f988591dea194b4012f"; + sha256 = "0f951k9lsnxbigdgcgrn12ndbl4m64m40qp7whgvndnzhjq3nqpp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key"; @@ -63854,7 +64407,7 @@ whitaker = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "whitaker"; - version = "20150814.622"; + version = "20150814.422"; src = fetchFromGitHub { owner = "Fuco1"; repo = "whitaker"; @@ -63875,7 +64428,7 @@ white-sand-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "white-sand-theme"; - version = "20151117.1048"; + version = "20151117.848"; src = fetchFromGitHub { owner = "mswift42"; repo = "white-sand-theme"; @@ -63896,7 +64449,7 @@ whitespace-cleanup-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "whitespace-cleanup-mode"; - version = "20150603.647"; + version = "20150603.447"; src = fetchFromGitHub { owner = "purcell"; repo = "whitespace-cleanup-mode"; @@ -63917,7 +64470,7 @@ whole-line-or-region = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "whole-line-or-region"; - version = "20110901.330"; + version = "20110901.130"; src = fetchFromGitHub { owner = "purcell"; repo = "whole-line-or-region"; @@ -63937,7 +64490,7 @@ }) {}; wid-edit-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "wid-edit-plus"; - version = "20151231.1822"; + version = "20151231.1622"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/wid-edit+.el"; sha256 = "18bnwwjk8jj4ns08sxhnznj0d8n1bxm2kj43r06nwyibh6ajpl7f"; @@ -63956,7 +64509,7 @@ wide-column = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wide-column"; - version = "20120814.312"; + version = "20120814.112"; src = fetchFromGitHub { owner = "phillord"; repo = "wide-column"; @@ -63977,7 +64530,7 @@ widget-mvc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "widget-mvc"; - version = "20150101.2206"; + version = "20150101.2006"; src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-widget-mvc"; @@ -63995,10 +64548,31 @@ license = lib.licenses.free; }; }) {}; + widgetjs = callPackage ({ fetchFromGitHub, fetchurl, js2-mode, js2-refactor, lib, makey, melpaBuild, s }: + melpaBuild { + pname = "widgetjs"; + version = "20160719.804"; + src = fetchFromGitHub { + owner = "foretagsplatsen"; + repo = "emacs-js"; + rev = "5f7a483cd068573c2c32a73a0b535db38090f2a3"; + sha256 = "06x6m7jm01pmpz1cy6aazyay0hg3kg2as0h3qzrc8lzbq0v7plhd"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/78d7a15152f45a193384741fa00d0649c4bba91e/recipes/widgetjs"; + sha256 = "0y5h1ag2m7w47l4nx4d18yz3fvd411rm1h5w7zz4xh67bnx4zyy1"; + name = "widgetjs"; + }; + packageRequires = [ js2-mode js2-refactor makey s ]; + meta = { + homepage = "https://melpa.org/#/widgetjs"; + license = lib.licenses.free; + }; + }) {}; wiki-nav = callPackage ({ button-lock, fetchFromGitHub, fetchurl, lib, melpaBuild, nav-flash }: melpaBuild { pname = "wiki-nav"; - version = "20150223.754"; + version = "20150223.554"; src = fetchFromGitHub { owner = "rolandwalker"; repo = "button-lock"; @@ -64019,7 +64593,7 @@ wiki-summary = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wiki-summary"; - version = "20150408.1622"; + version = "20150408.1422"; src = fetchFromGitHub { owner = "jozefg"; repo = "wiki-summary.el"; @@ -64040,7 +64614,7 @@ wilt = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "wilt"; - version = "20151105.718"; + version = "20151105.518"; src = fetchFromGitHub { owner = "sixty-north"; repo = "emacs-wilt"; @@ -64060,7 +64634,7 @@ }) {}; wimpy-del = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "wimpy-del"; - version = "20151231.1823"; + version = "20151231.1623"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/wimpy-del.el"; sha256 = "142ql6886h418f73h3wjblhnd16qvbap7mfr4g2yv4xybh88d4x2"; @@ -64079,7 +64653,7 @@ win-switch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "win-switch"; - version = "20150208.2111"; + version = "20150208.1911"; src = fetchFromGitHub { owner = "genovese"; repo = "win-switch"; @@ -64099,7 +64673,7 @@ }) {}; windata = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "windata"; - version = "20080412.955"; + version = "20080412.755"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/windata.el"; sha256 = "0dcbnqcqw7jzwwdn0rxxlixga1zw1x3a2zbpxvd90xp7zig4f0yz"; @@ -64118,7 +64692,7 @@ window-end-visible = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "window-end-visible"; - version = "20140508.1541"; + version = "20140508.1341"; src = fetchFromGitHub { owner = "rolandwalker"; repo = "window-end-visible"; @@ -64139,7 +64713,7 @@ window-jump = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "window-jump"; - version = "20150213.1436"; + version = "20150213.1236"; src = fetchFromGitHub { owner = "chumpage"; repo = "chumpy-windows"; @@ -64160,7 +64734,7 @@ window-layout = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "window-layout"; - version = "20150717.7"; + version = "20150716.2207"; src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-window-layout"; @@ -64181,7 +64755,7 @@ window-number = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "window-number"; - version = "20141106.2029"; + version = "20141106.1829"; src = fetchFromGitHub { owner = "nikolas"; repo = "window-number"; @@ -64202,7 +64776,7 @@ window-numbering = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "window-numbering"; - version = "20150228.1447"; + version = "20150228.1247"; src = fetchFromGitHub { owner = "nschum"; repo = "window-numbering.el"; @@ -64222,7 +64796,7 @@ }) {}; window-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "window-plus"; - version = "20151231.1824"; + version = "20151231.1624"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/window+.el"; sha256 = "0mqdcgk6mdxgl9if7jzgg16zqdwnsp8icrdhnygphw5m9h2dqcnm"; @@ -64241,16 +64815,16 @@ window-purpose = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, imenu-list, let-alist, lib, melpaBuild }: melpaBuild { pname = "window-purpose"; - version = "20160310.628"; + version = "20160722.901"; src = fetchFromGitHub { owner = "bmag"; repo = "emacs-purpose"; - rev = "f00cbc038b900ff79ea64028b8d89562d3c7e334"; - sha256 = "16471dng4iknh5wa3931iz9mm8bgd6lsrnhrjkd5ava2bv484gz6"; + rev = "373c67ce586fe5443f353e1cc9f553708f9482ac"; + sha256 = "0jjm5cfqvqgl507z4i06l85f7b8pldl57zcdyw3bw7lz66xcbgqv"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/cfaba6ff48d5548d5d355b3a1a8f44f541f8a3fc/recipes/window-purpose"; - sha256 = "1ib5ia7armghvmcw8qywcil4nxzwwakmfsp7ybawb0xr53h1w96d"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/5813120ab674f6db7d0a486433d8faa6cfec1727/recipes/window-purpose"; + sha256 = "1y70jrba3gf9fyf2qdihfshbsblzb88yv9fkcswdzrpq5kmgwp84"; name = "window-purpose"; }; packageRequires = [ cl-lib emacs imenu-list let-alist ]; @@ -64262,7 +64836,7 @@ windsize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "windsize"; - version = "20151121.740"; + version = "20151121.540"; src = fetchFromGitHub { owner = "grammati"; repo = "windsize"; @@ -64283,7 +64857,7 @@ winpoint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "winpoint"; - version = "20131023.1213"; + version = "20131023.1013"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "winpoint"; @@ -64304,7 +64878,7 @@ winring = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "winring"; - version = "20150804.1308"; + version = "20150804.1108"; src = fetchFromGitLab { owner = "warsaw"; repo = "winring"; @@ -64322,30 +64896,10 @@ license = lib.licenses.free; }; }) {}; - wisp-mode = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "wisp-mode"; - version = "20160419.1432"; - src = fetchhg { - url = "https://bitbucket.com/ArneBab/wisp"; - rev = "1b716d725f97"; - sha256 = "0ax5carrmrppy9q01ngj8c6bhx5wmsnmpac77da42s3ybglyzg16"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode"; - sha256 = "10zkp1qbvl8dmxij7zz4p1fixs3891xr1nr57vyb3llar9fgzglc"; - name = "wisp-mode"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/wisp-mode"; - license = lib.licenses.free; - }; - }) {}; wispjs-mode = callPackage ({ clojure-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wispjs-mode"; - version = "20140103.1632"; + version = "20140103.1432"; src = fetchFromGitHub { owner = "krisajenkins"; repo = "wispjs-mode"; @@ -64366,7 +64920,7 @@ with-editor = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "with-editor"; - version = "20160408.401"; + version = "20160408.201"; src = fetchFromGitHub { owner = "magit"; repo = "with-editor"; @@ -64387,7 +64941,7 @@ with-namespace = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, loop, melpaBuild }: melpaBuild { pname = "with-namespace"; - version = "20130407.1322"; + version = "20130407.1122"; src = fetchFromGitHub { owner = "Wilfred"; repo = "with-namespace.el"; @@ -64408,7 +64962,7 @@ wn-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wn-mode"; - version = "20151109.2352"; + version = "20151109.2152"; src = fetchFromGitHub { owner = "luismbo"; repo = "wn-mode"; @@ -64429,7 +64983,7 @@ wolfram-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wolfram-mode"; - version = "20140118.957"; + version = "20140118.757"; src = fetchFromGitHub { owner = "kawabata"; repo = "wolfram-mode"; @@ -64450,7 +65004,7 @@ wonderland = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, multi }: melpaBuild { pname = "wonderland"; - version = "20130912.2019"; + version = "20130912.1819"; src = fetchFromGitHub { owner = "kurisuwhyte"; repo = "emacs-wonderland"; @@ -64471,7 +65025,7 @@ wordnut = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wordnut"; - version = "20151002.1657"; + version = "20151002.1457"; src = fetchFromGitHub { owner = "gromnitsky"; repo = "wordnut"; @@ -64492,7 +65046,7 @@ wordsmith-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wordsmith-mode"; - version = "20151117.436"; + version = "20151117.236"; src = fetchFromGitHub { owner = "istib"; repo = "wordsmith-mode"; @@ -64513,12 +65067,12 @@ worf = callPackage ({ ace-link, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, swiper }: melpaBuild { pname = "worf"; - version = "20160703.815"; + version = "20160704.111"; src = fetchFromGitHub { owner = "abo-abo"; repo = "worf"; - rev = "e44ff28122b130091bcccb4bcd4cf68a6593bdeb"; - sha256 = "1kj56zj76s6vci73vwwr3w73pspwvp94fvi9403ykwnb2zgz610f"; + rev = "0b906ae372f27049f309971185e019aabfffa486"; + sha256 = "1gapmnpkky9f9zfwzrmzbv8camx2x5645xhzzk221fvq11sn23k7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f00f8765e35c21dd1a4b5c01c239ed4d15170ab7/recipes/worf"; @@ -64534,7 +65088,7 @@ workgroups = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "workgroups"; - version = "20110726.1141"; + version = "20110726.941"; src = fetchFromGitHub { owner = "tlh"; repo = "workgroups.el"; @@ -64555,7 +65109,7 @@ workgroups2 = callPackage ({ anaphora, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "workgroups2"; - version = "20141102.1322"; + version = "20141102.1122"; src = fetchFromGitHub { owner = "pashinin"; repo = "workgroups2"; @@ -64576,7 +65130,7 @@ world-time-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "world-time-mode"; - version = "20140627.307"; + version = "20140627.107"; src = fetchFromGitHub { owner = "nicferrier"; repo = "emacs-world-time-mode"; @@ -64597,7 +65151,7 @@ wrap-region = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wrap-region"; - version = "20140117.120"; + version = "20140116.2320"; src = fetchFromGitHub { owner = "rejeep"; repo = "wrap-region.el"; @@ -64618,7 +65172,7 @@ writegood-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "writegood-mode"; - version = "20150325.1315"; + version = "20150325.1115"; src = fetchFromGitHub { owner = "bnbeckwith"; repo = "writegood-mode"; @@ -64639,7 +65193,7 @@ writeroom-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, visual-fill-column }: melpaBuild { pname = "writeroom-mode"; - version = "20160613.1811"; + version = "20160613.1611"; src = fetchFromGitHub { owner = "joostkremers"; repo = "writeroom-mode"; @@ -64660,7 +65214,7 @@ ws-butler = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ws-butler"; - version = "20150126.959"; + version = "20150126.759"; src = fetchFromGitHub { owner = "lewang"; repo = "ws-butler"; @@ -64681,7 +65235,7 @@ wsd-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wsd-mode"; - version = "20160511.51"; + version = "20160510.2251"; src = fetchFromGitHub { owner = "josteink"; repo = "wsd-mode"; @@ -64702,7 +65256,7 @@ wttrin = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, xterm-color }: melpaBuild { pname = "wttrin"; - version = "20160414.1037"; + version = "20160414.837"; src = fetchFromGitHub { owner = "bcbcarl"; repo = "emacs-wttrin"; @@ -64723,7 +65277,7 @@ wwtime = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wwtime"; - version = "20151122.1010"; + version = "20151122.810"; src = fetchFromGitHub { owner = "ndw"; repo = "wwtime"; @@ -64744,7 +65298,7 @@ x-dict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "x-dict"; - version = "20091203.1223"; + version = "20091203.1023"; src = fetchFromGitHub { owner = "emacsmirror"; repo = "x-dict"; @@ -64765,7 +65319,7 @@ x86-lookup = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "x86-lookup"; - version = "20160624.1304"; + version = "20160624.1104"; src = fetchFromGitHub { owner = "skeeto"; repo = "x86-lookup"; @@ -64783,22 +65337,43 @@ license = lib.licenses.free; }; }) {}; - xah-elisp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + xah-css-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "xah-css-mode"; + version = "20160714.125"; + src = fetchFromGitHub { + owner = "xahlee"; + repo = "xah-css-mode"; + rev = "baac1e25f9de1b513ce400cb0a7392d94967faab"; + sha256 = "02w863v0mvynms6camqy9kj9r0lbmpqdh5v2hkjfx25f2g8bls4s"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/57c2e2112c4eb50ee6ebddef9c3d219cc5ced804/recipes/xah-css-mode"; + sha256 = "1kkwfyf94v3ni3d4szy28v49p6f3hy8ww9mlris2vvgc726wy6hr"; + name = "xah-css-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/xah-css-mode"; + license = lib.licenses.free; + }; + }) {}; + xah-elisp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-elisp-mode"; - version = "20160630.127"; + version = "20160720.2229"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-elisp-mode"; - rev = "ca4597ad42b0d60583248f2a3a786e49cf6e472f"; - sha256 = "0wsn0nc1yljy0kpwyssv8c84cympiyrbfpq5l2fffr3g0vkl1rxv"; + rev = "c9e361cba389b6c2d7c67597dfb3d69f6ee04f63"; + sha256 = "1d5514gmh0wfi2hvw4shrk0x9bm6hikvlxmn6wpaa2n1i5df2lzl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2e996dd5b0061371662490e0b21d3c5bb506550/recipes/xah-elisp-mode"; sha256 = "0cl07hw1hd3hj7wrzkh20m8vcs7mqsajxjmnlbnk2yg927yyijij"; name = "xah-elisp-mode"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/xah-elisp-mode"; license = lib.licenses.free; @@ -64807,12 +65382,12 @@ xah-find = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-find"; - version = "20160210.2102"; + version = "20160721.2030"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-find"; - rev = "38471ba72684ab80d0fcb62c8fef1a79543738c5"; - sha256 = "00ydkpkdgnj9v6dkf4pw9wj5skbq2v5y71xsr37d1fqmdzsb03g7"; + rev = "fce0404fb46d9ead40f4ba02e684a48310bfb8ea"; + sha256 = "1d4116c1xviljr7qznab865fy8y0rq3pgwwybxq9wybbj14r74ms"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d94ffd9c3380cd56770f253e43d566a95083e37/recipes/xah-find"; @@ -64828,12 +65403,12 @@ xah-fly-keys = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-fly-keys"; - version = "20160619.933"; + version = "20160722.2248"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-fly-keys"; - rev = "fae5278bd08014113d9da1f7bd51b7db7b74a2ea"; - sha256 = "0d5k682760wgfvy2x1b8603gz154ij9viwh1vxnnaripjgkj2cmj"; + rev = "24c7eadeb14eb088ab4ab3c34118770bfeb873a7"; + sha256 = "0al53x90lpcpf2z7x0cnvzmdjc6arfxb3f3ygdp46d5y863b9dk0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc1683be70d1388efa3ce00adc40510e595aef2b/recipes/xah-fly-keys"; @@ -64849,7 +65424,7 @@ xah-get-thing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-get-thing"; - version = "20150712.1630"; + version = "20150712.1430"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-get-thing-or-selection"; @@ -64870,12 +65445,12 @@ xah-lookup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-lookup"; - version = "20150602.1346"; + version = "20160711.1019"; src = fetchFromGitHub { owner = "xahlee"; repo = "lookup-word-on-internet"; - rev = "75590c52af87e635b2f19640095b805fdb3e5d8b"; - sha256 = "1adyww9jbjvcn9p3z9ggs3gijdmnab275a81ch8sir1xp59pfm3s"; + rev = "976e54f76dd9579c29b88c7ef7171df7683920c8"; + sha256 = "156vg0gz6y1rzfv52w45wbf060jzykp4khqs8nn9h3qyz0yk33j4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/38e6609a846a3c7781e0f03730b79bbf8d0355a9/recipes/xah-lookup"; @@ -64891,12 +65466,12 @@ xah-math-input = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-math-input"; - version = "20160127.1608"; + version = "20160711.1326"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-math-input"; - rev = "299a9fc5c1f764ad558e412ca3bff8438f4fabd5"; - sha256 = "1wsdnqpfgk7f1dbz90k6sf13hjh0x3xjjgappfkmhcy36g7sshl7"; + rev = "188b3195344e8204a6d0e3f30c6b439d27b7c024"; + sha256 = "02k95lkmwid1mr2g1vd4wppwpjfik76zm5x9zd5gmj0dzdgihi8g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/95d57e33e6d60dc20d6452b407ea1486604ba23a/recipes/xah-math-input"; @@ -64912,12 +65487,12 @@ xah-replace-pairs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-replace-pairs"; - version = "20150522.533"; + version = "20160713.1858"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-replace-pairs"; - rev = "b80430cd285ba09e2b35d518be0c25ba7db2d0a3"; - sha256 = "18msj947w6msma6zm23slk2v0h92n5ych5j12zbzkzzir49sffql"; + rev = "b427b84923d349174464d7a15b0f86639f046248"; + sha256 = "1l43crr7balay139xvm3mxz22z516mcz84433vfdb8yczdya2sjq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0e7de2fe0e55b1a546f105aa1aac44fde46c8f44/recipes/xah-replace-pairs"; @@ -64933,7 +65508,7 @@ xahk-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xahk-mode"; - version = "20150504.1811"; + version = "20150504.1611"; src = fetchFromGitHub { owner = "xahlee"; repo = "xahk-mode.el"; @@ -64954,7 +65529,7 @@ xbm-life = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xbm-life"; - version = "20160103.417"; + version = "20160103.217"; src = fetchFromGitHub { owner = "wasamasa"; repo = "xbm-life"; @@ -64975,7 +65550,7 @@ xcode-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors, s }: melpaBuild { pname = "xcode-mode"; - version = "20160702.832"; + version = "20160702.632"; src = fetchFromGitHub { owner = "nicklanasa"; repo = "xcode-mode"; @@ -64996,7 +65571,7 @@ xcscope = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xcscope"; - version = "20160629.124"; + version = "20160628.2324"; src = fetchFromGitHub { owner = "dkogan"; repo = "xcscope.el"; @@ -65017,7 +65592,7 @@ xkcd = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "xkcd"; - version = "20160419.630"; + version = "20160419.430"; src = fetchFromGitHub { owner = "vibhavp"; repo = "emacs-xkcd"; @@ -65038,7 +65613,7 @@ xml-plus = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xml-plus"; - version = "20160210.2142"; + version = "20160210.1942"; src = fetchFromGitHub { owner = "bddean"; repo = "xml-plus"; @@ -65059,7 +65634,7 @@ xml-quotes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xml-quotes"; - version = "20151230.1649"; + version = "20151230.1449"; src = fetchFromGitHub { owner = "ndw"; repo = "xml-quotes"; @@ -65080,7 +65655,7 @@ xml-rpc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xml-rpc"; - version = "20160430.1658"; + version = "20160430.1458"; src = fetchFromGitHub { owner = "hexmode"; repo = "xml-rpc-el"; @@ -65101,7 +65676,7 @@ xmlgen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xmlgen"; - version = "20130219.419"; + version = "20130219.219"; src = fetchFromGitHub { owner = "philjackson"; repo = "xmlgen"; @@ -65122,7 +65697,7 @@ xmlunicode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xmlunicode"; - version = "20160319.1112"; + version = "20160319.912"; src = fetchFromGitHub { owner = "ndw"; repo = "xmlunicode"; @@ -65143,7 +65718,7 @@ xo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xo"; - version = "20160403.146"; + version = "20160402.2346"; src = fetchFromGitHub { owner = "j-em"; repo = "xo-emacs"; @@ -65164,7 +65739,7 @@ xquery-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xquery-mode"; - version = "20140121.1143"; + version = "20140121.943"; src = fetchFromGitHub { owner = "mblakele"; repo = "xquery-mode"; @@ -65185,12 +65760,12 @@ xquery-tool = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xquery-tool"; - version = "20160203.1153"; + version = "20160705.356"; src = fetchFromGitHub { owner = "paddymcall"; repo = "xquery-tool.el"; - rev = "126164abeb77bd7932c73590939637895005c48b"; - sha256 = "1yy759qc4njc8bqh8hmgc0mq5vk5spz5syxgflqhjijk8nrvyfgl"; + rev = "68de7a26e589f5eab1929caeaa5dafffde362bef"; + sha256 = "1j11vnkva7c3rwzyfg467m7l437lb1rdfzarsgi33i225ai4c0hb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cc71e5ea4a0ecb006f62617f5b6caadc9b3c77b2/recipes/xquery-tool"; @@ -65206,7 +65781,7 @@ xref-js2 = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: melpaBuild { pname = "xref-js2"; - version = "20160521.648"; + version = "20160521.448"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "xref-js2"; @@ -65227,7 +65802,7 @@ xresources-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xresources-theme"; - version = "20160331.902"; + version = "20160331.702"; src = fetchFromGitHub { owner = "CQQL"; repo = "xresources-theme"; @@ -65248,12 +65823,12 @@ xterm-color = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xterm-color"; - version = "20160703.1046"; + version = "20160707.1653"; src = fetchFromGitHub { owner = "atomontage"; repo = "xterm-color"; - rev = "c4b388469ee84aa825f5d787a89005f86a03cb87"; - sha256 = "0a6sbimnh211i21yvhg5bfh84i9qlmi7fnz7sm69xnfxy4416986"; + rev = "a2bd27070243934b7129702a120ad523848045aa"; + sha256 = "1lxfnjz35gyfqv9pp9kq8lck8q2jd52wsgmf6mnk0f7jw1v8w9lx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b34a42f1bf5641871da8ce2b688325023262b643/recipes/xterm-color"; @@ -65269,7 +65844,7 @@ xterm-frobs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xterm-frobs"; - version = "20091211.1755"; + version = "20091211.1555"; src = fetchFromGitHub { owner = "emacsmirror"; repo = "xterm-frobs"; @@ -65290,7 +65865,7 @@ xterm-keybinder = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "xterm-keybinder"; - version = "20160522.1956"; + version = "20160522.1756"; src = fetchFromGitHub { owner = "yuutayamada"; repo = "xterm-keybinder-el"; @@ -65311,7 +65886,7 @@ xterm-title = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xterm-title"; - version = "20091203.1223"; + version = "20091203.1023"; src = fetchFromGitHub { owner = "emacsmirror"; repo = "xterm-title"; @@ -65332,7 +65907,7 @@ xtest = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xtest"; - version = "20141214.1106"; + version = "20141214.906"; src = fetchFromGitHub { owner = "promethial"; repo = "xtest"; @@ -65350,10 +65925,31 @@ license = lib.licenses.free; }; }) {}; + xwidgete = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "xwidgete"; + version = "20160719.324"; + src = fetchFromGitHub { + owner = "tuhdo"; + repo = "xwidgete"; + rev = "943d715f2caab69f76d0de9bd4387cf60f6c4fe3"; + sha256 = "0wrb8cvm3ap9y212z3fxc6shbzk0xv1jbw47rnbxgl97asq7rcaj"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e4e83b11c3d5b9773a26e2da4d848f645edcea5b/recipes/xwidgete"; + sha256 = "124gb5h3w4xydvx9zyvy60m038hjpz72yis1yv1vdb56lixndh9m"; + name = "xwidgete"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/xwidgete"; + license = lib.licenses.free; + }; + }) {}; yabin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yabin"; - version = "20140205.2151"; + version = "20140205.1951"; src = fetchFromGitHub { owner = "d5884"; repo = "yabin"; @@ -65374,12 +65970,12 @@ yafolding = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yafolding"; - version = "20141202.2256"; + version = "20160723.556"; src = fetchFromGitHub { owner = "zenozeng"; repo = "yafolding.el"; - rev = "0dc48073f429112b51a888e8e9285739435d3c7f"; - sha256 = "0b252m7vb5kg5bjhpgag6nhm32cac8dhlmy4pr0kpa860lh2xlz7"; + rev = "f0cc030ddd7ab53fbdf3cdb8b157d8cbcd6a08bd"; + sha256 = "0xwa490bl59bk0lpga6kag8gif9ln0g4hp42hryhjv5spvgzlsb8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/51bfd6465ee8ee553e8fd466a3bc4e65ab98faed/recipes/yafolding"; @@ -65395,7 +65991,7 @@ yagist = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yagist"; - version = "20160418.8"; + version = "20160417.2208"; src = fetchFromGitHub { owner = "mhayashi1120"; repo = "yagist.el"; @@ -65416,12 +66012,12 @@ yahoo-weather = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yahoo-weather"; - version = "20160426.729"; + version = "20160703.2008"; src = fetchFromGitHub { owner = "lujun9972"; repo = "yahoo-weather-mode"; - rev = "f6dbc133f3d8685dcb7851a182da5cb95b041c07"; - sha256 = "1r29x9gkj5cfcg2ac4j5vw55n1niainhl2316mfq0zpxjjp2bhwq"; + rev = "5154c320400fc20a8deb1b43e21f790709c4af76"; + sha256 = "0f3jh0y14kkbflsdpf4c6qlzdc0jk5p3c6xxs4hd7mb8af32rrvh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ae5ca93d48a2d24787c3d4ed7ab3a65aa8023f4f/recipes/yahoo-weather"; @@ -65437,7 +66033,7 @@ yalinum = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yalinum"; - version = "20130217.443"; + version = "20130217.243"; src = fetchFromGitHub { owner = "tm8st"; repo = "emacs-yalinum"; @@ -65458,7 +66054,7 @@ yaml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yaml-mode"; - version = "20160528.1600"; + version = "20160528.1400"; src = fetchFromGitHub { owner = "yoshiki"; repo = "yaml-mode"; @@ -65479,7 +66075,7 @@ yaml-tomato = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "yaml-tomato"; - version = "20151123.153"; + version = "20151122.2353"; src = fetchFromGitHub { owner = "RadekMolenda"; repo = "yaml-tomato"; @@ -65500,7 +66096,7 @@ yandex-weather = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yandex-weather"; - version = "20160311.1437"; + version = "20160311.1237"; src = fetchFromGitHub { owner = "abstractionlayer"; repo = "yandex-weather.el"; @@ -65521,12 +66117,12 @@ yankpad = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yankpad"; - version = "20160604.1104"; + version = "20160716.1613"; src = fetchFromGitHub { owner = "Kungsgeten"; repo = "yankpad"; - rev = "efbae7893c6170d92f9607d604a7eb289de1ad5e"; - sha256 = "07g19pqx769bwly18flijryv8648k6jdw0bxhrp1dflf86cknyng"; + rev = "3216213b19afb42c35c527ecf5ca266b2bfc0d00"; + sha256 = "1jfyrj544qv8i79zvcxbw43hqrpkw8apas5gs74xbqa0cay14m3l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64746d10f9e0158621a7c4dc41dc2eca6ad573c/recipes/yankpad"; @@ -65541,10 +66137,10 @@ }) {}; yaoddmuse = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "yaoddmuse"; - version = "20150712.621"; + version = "20160717.2212"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/yaoddmuse.el"; - sha256 = "0svy6zp5f22z7mblap4psh7h4i52d1qasi9yk22l39przhsrjar4"; + sha256 = "0j73zkzk1iyxpxca6zvjwq5iig8a6la6hm6i5kwwnbc9c681acqx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e7dcbe43b65944968a882705ff4b3b2c9f40b6d2/recipes/yaoddmuse"; @@ -65560,7 +66156,7 @@ yapfify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yapfify"; - version = "20160616.1540"; + version = "20160616.1340"; src = fetchFromGitHub { owner = "JorisE"; repo = "yapfify"; @@ -65581,7 +66177,7 @@ yard-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yard-mode"; - version = "20160310.1050"; + version = "20160310.850"; src = fetchFromGitHub { owner = "pd"; repo = "yard-mode.el"; @@ -65602,7 +66198,7 @@ yari = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yari"; - version = "20151128.139"; + version = "20151127.2339"; src = fetchFromGitHub { owner = "hron"; repo = "yari.el"; @@ -65623,7 +66219,7 @@ yascroll = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yascroll"; - version = "20150315.805"; + version = "20150315.605"; src = fetchFromGitHub { owner = "m2ym"; repo = "yascroll-el"; @@ -65644,12 +66240,12 @@ yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yasnippet"; - version = "20160629.2122"; + version = "20160723.510"; src = fetchFromGitHub { owner = "capitaomorte"; repo = "yasnippet"; - rev = "4296a86139b204f02fd3765e6b40ff69bd41b2f8"; - sha256 = "030xaw45sglhmxwhgpc8z1frxpgnwb8xi5hcabdgf1m8l6xvs2mp"; + rev = "7e0a0de499e655d94a2e454f6519620d99c92ac6"; + sha256 = "0z3zbx0cs085qghmrs15yxhy0g1grlr22z1jw7b2k3y6xg5mmf9c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/489687c6c41399a3bca8148a62d25581726a847d/recipes/yasnippet"; @@ -65665,12 +66261,12 @@ yatemplate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "yatemplate"; - version = "20160630.1636"; + version = "20160719.1228"; src = fetchFromGitHub { owner = "mineo"; repo = "yatemplate"; - rev = "fa8b3d79e4a619310658ee87da1aa3d301972dab"; - sha256 = "1jw7d21n0wg5nn7cm3jgy3frpdffnhy9hgl9w9jgrsd2g4car0zl"; + rev = "90c14d2e2b8247eeba464a52560af484f8542558"; + sha256 = "00q3803nz89r91v1rwld98j1wgfc7kc6ni5a3h3zjwz1issyv5is"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ba3cdb74f121cbf36b6d9d5a434c363905ce526/recipes/yatemplate"; @@ -65685,7 +66281,7 @@ }) {}; yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yatex"; - version = "20160107.1719"; + version = "20160107.1519"; src = fetchhg { url = "https://www.yatex.org/hgrepos/yatex/"; rev = "e78a87bc2c9e"; @@ -65705,7 +66301,7 @@ yaxception = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yaxception"; - version = "20150105.852"; + version = "20150105.652"; src = fetchFromGitHub { owner = "aki2o"; repo = "yaxception"; @@ -65726,7 +66322,7 @@ ycm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ycm"; - version = "20150822.1336"; + version = "20150822.1136"; src = fetchFromGitHub { owner = "neuromage"; repo = "ycm.el"; @@ -65747,12 +66343,12 @@ ycmd = callPackage ({ cl-lib ? null, dash, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, popup, request, request-deferred, s }: melpaBuild { pname = "ycmd"; - version = "20160625.953"; + version = "20160725.637"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "a9cb3a6893cff7059058f25f06e75d38584084f1"; - sha256 = "03vfg56qmj68y702c94p914fqrx68szykj8nm12d26p0rjnky2b8"; + rev = "5342f1def925e59477880c1bf5c10778c50678fe"; + sha256 = "1nn312z7bfjya570gbs7gcwf9zh3b7jhwg52gfp7digdwqrary42"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd"; @@ -65778,7 +66374,7 @@ yesql-ghosts = callPackage ({ cider, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "yesql-ghosts"; - version = "20150220.637"; + version = "20150220.437"; src = fetchFromGitHub { owner = "magnars"; repo = "yesql-ghosts"; @@ -65799,7 +66395,7 @@ yoshi-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yoshi-theme"; - version = "20160608.1623"; + version = "20160608.1423"; src = fetchFromGitHub { owner = "ryuslash"; repo = "yoshi-theme"; @@ -65820,7 +66416,7 @@ youdao-dictionary = callPackage ({ chinese-word-at-point, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names, popup }: melpaBuild { pname = "youdao-dictionary"; - version = "20150914.144"; + version = "20150913.2344"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "youdao-dictionary.el"; @@ -65841,7 +66437,7 @@ z3-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "z3-mode"; - version = "20151120.1655"; + version = "20151120.1455"; src = fetchFromGitHub { owner = "zv"; repo = "z3-mode"; @@ -65862,12 +66458,12 @@ zeal-at-point = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zeal-at-point"; - version = "20151231.248"; + version = "20160725.2044"; src = fetchFromGitHub { owner = "jinzhu"; repo = "zeal-at-point"; - rev = "ba25ee7b8378545e849be371f3ad4676d73b2e02"; - sha256 = "16k8hha798hrs0qfdwqdr6n7y13ffgm6jj3msrk0zl8117jhaany"; + rev = "675ee27456fb454562b249cad768d4a5207a6b4e"; + sha256 = "131q95x9zvzayfn0slyzjyl87fap9j16bfdlc449khfp0zymcbla"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4bcb472b6b18b75acd9c68e1fc7ecce4c2a40d8f/recipes/zeal-at-point"; @@ -65883,7 +66479,7 @@ zeitgeist = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zeitgeist"; - version = "20131228.1209"; + version = "20131228.1009"; src = fetchgit { url = "git://anongit.freedesktop.org/zeitgeist/zeitgeist-datasources"; rev = "cdd1c219ed3afa9500403c3c499f49583d599034"; @@ -65903,7 +66499,7 @@ zen-and-art-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zen-and-art-theme"; - version = "20120622.937"; + version = "20120622.737"; src = fetchFromGitHub { owner = "developernotes"; repo = "zen-and-art-theme"; @@ -65924,12 +66520,12 @@ zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zenburn-theme"; - version = "20160501.949"; + version = "20160724.2141"; src = fetchFromGitHub { owner = "bbatsov"; repo = "zenburn-emacs"; - rev = "4a4700bd9128c7104cdf3bcd3cb64fc5e2a89afb"; - sha256 = "1bjjmmplzjl17aqyz89s3z44vxpvik5ibv7004kp5678gf1vv5rs"; + rev = "d80c7cb91cce840c533d2261de44222c82c002b8"; + sha256 = "1hm0xlbi98czj7s5hb1f9n0c0kqglz95s45jwrljxxx5nxpnl238"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/zenburn-theme"; @@ -65945,7 +66541,7 @@ zencoding-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zencoding-mode"; - version = "20140213.222"; + version = "20140213.22"; src = fetchFromGitHub { owner = "rooney"; repo = "zencoding"; @@ -65966,7 +66562,7 @@ zenity-color-picker = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zenity-color-picker"; - version = "20160302.554"; + version = "20160302.354"; src = fetchgit { url = "https://bitbucket.org/Soft/zenity-color-picker.el.git"; rev = "4f4f46676a461ebc881487fb70c8c181e323db5e"; @@ -65986,7 +66582,7 @@ zerodark-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zerodark-theme"; - version = "20160518.827"; + version = "20160518.627"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "zerodark-theme"; @@ -66007,7 +66603,7 @@ zlc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zlc"; - version = "20151010.2057"; + version = "20151010.1857"; src = fetchFromGitHub { owner = "mooz"; repo = "emacs-zlc"; @@ -66028,7 +66624,7 @@ znc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "znc"; - version = "20160627.1532"; + version = "20160627.1332"; src = fetchFromGitHub { owner = "sshirokov"; repo = "ZNC.el"; @@ -66049,7 +66645,7 @@ zombie = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zombie"; - version = "20141222.1016"; + version = "20141222.816"; src = fetchFromGitHub { owner = "zk-phi"; repo = "zombie"; @@ -66070,7 +66666,7 @@ zombie-trellys-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "zombie-trellys-mode"; - version = "20150304.848"; + version = "20150304.648"; src = fetchFromGitHub { owner = "david-christiansen"; repo = "zombie-trellys-mode"; @@ -66091,7 +66687,7 @@ zone-nyan = callPackage ({ esxml, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zone-nyan"; - version = "20160102.1656"; + version = "20160102.1456"; src = fetchFromGitHub { owner = "wasamasa"; repo = "zone-nyan"; @@ -66112,7 +66708,7 @@ zone-rainbow = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zone-rainbow"; - version = "20160120.734"; + version = "20160120.534"; src = fetchFromGitHub { owner = "kawabata"; repo = "zone-rainbow"; @@ -66133,7 +66729,7 @@ zone-select = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zone-select"; - version = "20160118.819"; + version = "20160118.619"; src = fetchFromGitHub { owner = "kawabata"; repo = "zone-select"; @@ -66154,7 +66750,7 @@ zone-sl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zone-sl"; - version = "20160201.610"; + version = "20160201.410"; src = fetchFromGitHub { owner = "kawabata"; repo = "zone-sl"; @@ -66174,7 +66770,7 @@ }) {}; zones = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "zones"; - version = "20160209.1120"; + version = "20160209.920"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/zones.el"; sha256 = "1g6dpyihwaz28ppndhkw3jzmph6pmcnfhaff926j0zr1j701sqdd"; @@ -66193,7 +66789,7 @@ zonokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zonokai-theme"; - version = "20160321.2125"; + version = "20160321.1925"; src = fetchFromGitHub { owner = "ZehCnaS34"; repo = "zonokai-emacs"; @@ -66214,7 +66810,7 @@ zoom-frm = callPackage ({ fetchurl, frame-cmds, frame-fns, lib, melpaBuild }: melpaBuild { pname = "zoom-frm"; - version = "20151231.1825"; + version = "20151231.1625"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/zoom-frm.el"; sha256 = "1whpd97yjby5zbcr4fcn0nxhqvn6k3jn8k2d15i6ss579kziwdqn"; @@ -66233,7 +66829,7 @@ zoom-window = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zoom-window"; - version = "20160527.938"; + version = "20160527.738"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-zoom-window"; @@ -66254,7 +66850,7 @@ zop-to-char = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zop-to-char"; - version = "20160212.308"; + version = "20160212.108"; src = fetchFromGitHub { owner = "thierryvolpiatto"; repo = "zop-to-char"; @@ -66275,7 +66871,7 @@ zossima = callPackage ({ fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }: melpaBuild { pname = "zossima"; - version = "20121123.1835"; + version = "20121123.1635"; src = fetchFromGitHub { owner = "technomancy"; repo = "zossima"; @@ -66296,7 +66892,7 @@ zotelo = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zotelo"; - version = "20160602.449"; + version = "20160602.249"; src = fetchFromGitHub { owner = "vspinu"; repo = "zotelo"; @@ -66317,7 +66913,7 @@ zotxt = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild, request-deferred }: melpaBuild { pname = "zotxt"; - version = "20160427.2122"; + version = "20160427.1922"; src = fetchFromGitLab { owner = "egh"; repo = "zotxt-emacs"; @@ -66338,7 +66934,7 @@ ztree = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ztree"; - version = "20160127.1742"; + version = "20160127.1542"; src = fetchFromGitHub { owner = "fourier"; repo = "ztree"; @@ -66359,7 +66955,7 @@ zygospore = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zygospore"; - version = "20140703.352"; + version = "20140703.152"; src = fetchFromGitHub { owner = "LouisKottmann"; repo = "zygospore.el"; @@ -66380,7 +66976,7 @@ zzz-to-char = callPackage ({ avy, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zzz-to-char"; - version = "20160122.640"; + version = "20160122.440"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "zzz-to-char"; diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index 52db37ab592e..40a61ec8cdd5 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix @@ -482,54 +482,43 @@ license = lib.licenses.free; }; }) {}; - ac-php = callPackage ({ auto-complete, company, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope, yasnippet }: + ac-php = callPackage ({ ac-php-core, auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "ac-php"; - version = "1.7.3"; + version = "1.7.4"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "76f0f559905bfb63100aa5d8ddd4d567fff9e5bf"; - sha256 = "0ca4viakvc09mvhk7d01pxnc3v3ydra6413asvdjx555njm9ic0f"; + rev = "fb2a862af77249e538f304e197fc763baea310bc"; + sha256 = "1a1k72py903z76xznnwv15ay8r2hpicb49zh9faw2vqm44672bm1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php"; sha256 = "1wqwwgdln98snlq5msdx94b7985krvqfn264hxs1h94r85kgn1ba"; name = "ac-php"; }; - packageRequires = [ - auto-complete - company - dash - emacs - f - php-mode - popup - s - xcscope - yasnippet - ]; + packageRequires = [ ac-php-core auto-complete yasnippet ]; meta = { homepage = "https://melpa.org/#/ac-php"; license = lib.licenses.free; }; }) {}; - ac-php-core = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }: melpaBuild { pname = "ac-php-core"; - version = "1.7.3"; + version = "1.7.4"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "76f0f559905bfb63100aa5d8ddd4d567fff9e5bf"; - sha256 = "0ca4viakvc09mvhk7d01pxnc3v3ydra6413asvdjx555njm9ic0f"; + rev = "fb2a862af77249e538f304e197fc763baea310bc"; + sha256 = "1a1k72py903z76xznnwv15ay8r2hpicb49zh9faw2vqm44672bm1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core"; sha256 = "0vk3jsxb7dgk5a6pap3bdqkqwpszil0rck1c3y0wyxrlj2y1jcvn"; name = "ac-php-core"; }; - packageRequires = []; + packageRequires = [ dash emacs f php-mode popup s xcscope ]; meta = { homepage = "https://melpa.org/#/ac-php-core"; license = lib.licenses.free; @@ -934,6 +923,27 @@ license = lib.licenses.free; }; }) {}; + ahungry-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ahungry-theme"; + version = "1.3.0"; + src = fetchFromGitHub { + owner = "ahungry"; + repo = "color-theme-ahungry"; + rev = "3ce72cf77cf5958d91b65bc4867cbacff968da74"; + sha256 = "0wiwxh6k2s48gpklhd9abbsr0ll73jzggwgq1lvm7gha203ji5v4"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/520295978fd7de3f4266dd69cc30d0b4fdf09db0/recipes/ahungry-theme"; + sha256 = "0fhim0qscpqx9siprp3ax1azxzmqkzvrjx517d9bnd68z7xxbpqy"; + name = "ahungry-theme"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/ahungry-theme"; + license = lib.licenses.free; + }; + }) {}; airline-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }: melpaBuild { pname = "airline-themes"; @@ -1018,15 +1028,15 @@ license = lib.licenses.free; }; }) {}; - amd-mode = callPackage ({ ag, dash, f, fetchFromGitHub, fetchurl, js2-mode, js2-refactor, lib, makey, melpaBuild, projectile, s }: + amd-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, js2-mode, js2-refactor, lib, makey, melpaBuild, projectile, s, seq }: melpaBuild { pname = "amd-mode"; - version = "1.1"; + version = "2.1"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "amd-mode.el"; - rev = "1b9e5c3a18722bd65692a2069eea0e88fcddda71"; - sha256 = "1q49gfs98djwjxw2sr8q08jf5glf9d3ks9014gjjwa1dpf98mpy3"; + rev = "4d43d280a7ba7fb10d29ebd3a8b919b15bec85f7"; + sha256 = "0jy43ahhpmafjz8pg5y35gvlkwm8mn3rr0si2nk8s3dh59kmf9lp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e4d6e9935e4935c9de769c7bf1c1b6dd256e10da/recipes/amd-mode"; @@ -1034,14 +1044,14 @@ name = "amd-mode"; }; packageRequires = [ - ag - dash + emacs f js2-mode js2-refactor makey projectile s + seq ]; meta = { homepage = "https://melpa.org/#/amd-mode"; @@ -2316,12 +2326,12 @@ bind-key = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bind-key"; - version = "2.1"; + version = "2.2"; src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "2b077f6e485e8c5c167413c03246068022b6bc71"; - sha256 = "07vwg0bg719gb8ln1n5a33103903vvrphnkbvvfn43904pkrf14w"; + rev = "27fdfba5b05fd51345dc2b947ae6342266fdb22b"; + sha256 = "1dzkvinp1h1w48lx44x9bn1b54c83m1wl5v8h99l76fh1y0jw7b4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key"; @@ -3195,6 +3205,27 @@ license = lib.licenses.free; }; }) {}; + chinese-fonts-setup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "chinese-fonts-setup"; + version = "0.1"; + src = fetchFromGitHub { + owner = "tumashu"; + repo = "chinese-fonts-setup"; + rev = "6f4423664e55d5470c4f239d04b88da5d6acb34d"; + sha256 = "0d9xx43ijxrp95j5bnxcsnfwn032ypy2c1lypak15772nk6i7s1w"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c536882e613e83a4a2baf86479bfb3efb86d916a/recipes/chinese-fonts-setup"; + sha256 = "141ri6a6mnxf7fn17gw48kxk8pvl3khdxkb4pw8brxwrr9rx0xd5"; + name = "chinese-fonts-setup"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/chinese-fonts-setup"; + license = lib.licenses.free; + }; + }) {}; chinese-pyim = callPackage ({ async, chinese-pyim-basedict, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip }: melpaBuild { pname = "chinese-pyim"; @@ -3237,6 +3268,27 @@ license = lib.licenses.free; }; }) {}; + chinese-pyim-greatdict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "chinese-pyim-greatdict"; + version = "0.1"; + src = fetchFromGitHub { + owner = "tumashu"; + repo = "chinese-pyim-greatdict"; + rev = "11cf5145710349e9d928eb9197bebb426025fd58"; + sha256 = "1pza690b31ynyj31f1gp7y2d29ri3swcblpzd2pcpj3ynmnbsy3f"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/03234f7a1abe7423c5a9bcb4c100957c8eece351/recipes/chinese-pyim-greatdict"; + sha256 = "1xqr2fcsb45khavqx06ry2sm8db790zlggk61civbdyafvlz8ikc"; + name = "chinese-pyim-greatdict"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/chinese-pyim-greatdict"; + license = lib.licenses.free; + }; + }) {}; chinese-word-at-point = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "chinese-word-at-point"; @@ -3261,12 +3313,12 @@ cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }: melpaBuild { pname = "cider"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "cider"; - rev = "1c45146520a326376d35b8614c26187ed11a02cd"; - sha256 = "0pbgfm9hkryanb4fly74w417h6bw9mnad5k5raj9ypiwgcz2r0n8"; + rev = "b8932a37b936a34b923ce4e356379ea76108ec6d"; + sha256 = "07xb09csppk2rbffbyiy22mx4s7cd5h48nx428dag7q13fvarc31"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider"; @@ -3545,12 +3597,12 @@ clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clojure-mode"; - version = "5.5.0"; + version = "5.5.1"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "3671254fb1ee453706ff8df74235d258c237da24"; - sha256 = "0lxwbsl5cl5jm9jk0plyw2j02l6z14f300jkq6f5194jgr7m6rr3"; + rev = "a5492a08017faa837d506666a82649b50fd23511"; + sha256 = "02ws4q7dygv7gjb6cg6mccx43ahi49bqx7f9k0c9jr6raq1qqm22"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode"; @@ -3566,12 +3618,12 @@ clojure-mode-extra-font-locking = callPackage ({ clojure-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clojure-mode-extra-font-locking"; - version = "5.5.0"; + version = "5.5.1"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "3671254fb1ee453706ff8df74235d258c237da24"; - sha256 = "0lxwbsl5cl5jm9jk0plyw2j02l6z14f300jkq6f5194jgr7m6rr3"; + rev = "a5492a08017faa837d506666a82649b50fd23511"; + sha256 = "02ws4q7dygv7gjb6cg6mccx43ahi49bqx7f9k0c9jr6raq1qqm22"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking"; @@ -3692,12 +3744,12 @@ cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cmake-mode"; - version = "3.6.0pre4"; + version = "3.6.1"; src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "dd71ec2c93fdf34f8bbcaafbc05f000ef6ed6cab"; - sha256 = "11i49slzzc79ikkydw7122gckyikm200yqb5ak9k3i5n720y47db"; + rev = "f59513140bf086eda2029c5b4e950fc58216c06e"; + sha256 = "0x32brljg3rv4nsj75sngzbwkfp908xz0ypmvwm1rb47jgds6aqd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -4088,6 +4140,27 @@ license = lib.licenses.free; }; }) {}; + company-edbi = callPackage ({ cl-lib ? null, company, edbi, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + melpaBuild { + pname = "company-edbi"; + version = "0.1"; + src = fetchFromGitHub { + owner = "proofit404"; + repo = "company-edbi"; + rev = "08dc69ccfbcf10ca83f7075e9b735c6885cd7e11"; + sha256 = "0n2hvrfbybsp57w6m9mm7ywjq30fwwx9bzc2rllfr06d2ms7naai"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5d881ff0927d5bd7f8192f58927ceabb9bad4beb/recipes/company-edbi"; + sha256 = "067ff1xdyqy4qzgk5pmqf4kksfjk1glkrslcj3rk4zmhcalwrfrm"; + name = "company-edbi"; + }; + packageRequires = [ cl-lib company edbi s ]; + meta = { + homepage = "https://melpa.org/#/company-edbi"; + license = lib.licenses.free; + }; + }) {}; company-emoji = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-emoji"; @@ -4172,6 +4245,27 @@ license = lib.licenses.free; }; }) {}; + company-irony-c-headers = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, irony, lib, melpaBuild }: + melpaBuild { + pname = "company-irony-c-headers"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "hotpxl"; + repo = "company-irony-c-headers"; + rev = "ba304fe7eebdff90bbc7dea063b45b82638427fa"; + sha256 = "1x2dfjmy86icyv2g1y5bjlr87w8rixqdcndkwm1sba6ha277wp9i"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9f9f62d8ef438a9ba4872bd7731768eddc5905de/recipes/company-irony-c-headers"; + sha256 = "0kiag5ggmc2f5c3gd8nn40x16i686jpdrfrflgrz2aih8p3g6af8"; + name = "company-irony-c-headers"; + }; + packageRequires = [ cl-lib company irony ]; + meta = { + homepage = "https://melpa.org/#/company-irony-c-headers"; + license = lib.licenses.free; + }; + }) {}; company-jedi = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, jedi-core, lib, melpaBuild }: melpaBuild { pname = "company-jedi"; @@ -4217,12 +4311,12 @@ company-ngram = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-ngram"; - version = "0.7.5"; + version = "0.7.6"; src = fetchFromGitHub { owner = "kshramt"; repo = "company-ngram"; - rev = "966e5e78a3f31f41e6f007a79d9d7594e89835ad"; - sha256 = "1a1lngsyssdjdd3vlb9izf1l8rw86b7al4hkw7fbc3w421kg2399"; + rev = "44a5a90047a71efb083e58ff685117b11eadd23e"; + sha256 = "0zkirwj9yarqlam5hsdnysanx1x06cmgzx9lnjrs1skypl4q096y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/937e6a23782450525c4a90392c414173481e101b/recipes/company-ngram"; @@ -4256,6 +4350,27 @@ license = lib.licenses.free; }; }) {}; + company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "company-php"; + version = "1.7.4"; + src = fetchFromGitHub { + owner = "xcwen"; + repo = "ac-php"; + rev = "fb2a862af77249e538f304e197fc763baea310bc"; + sha256 = "1a1k72py903z76xznnwv15ay8r2hpicb49zh9faw2vqm44672bm1"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php"; + sha256 = "1gnhklfkg17vxfx7fw65lr4nr07jx71y84mhs9zszwcr9p840hh5"; + name = "company-php"; + }; + packageRequires = [ ac-php-core cl-lib company ]; + meta = { + homepage = "https://melpa.org/#/company-php"; + license = lib.licenses.free; + }; + }) {}; company-quickhelp = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip }: melpaBuild { pname = "company-quickhelp"; @@ -6088,12 +6203,12 @@ dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }: melpaBuild { pname = "dumb-jump"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "jacktasia"; repo = "dumb-jump"; - rev = "910e4b2fd870e5e4a701fdd39af04e819cca4ddb"; - sha256 = "0m9m1vfbxhnpayhs34k4q3isyz630gv6vswqv3cj3rjprnzn8ccs"; + rev = "d75ae09fd1640c6855cf2c8c0fcac0604fd2b898"; + sha256 = "0vjsj397i283k86f38ihgq2hsn92kd4iph704fyjkbs6l1187yc2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2a60e7c166c2d68e4f719d293014a22139593dde/recipes/dumb-jump"; @@ -6133,8 +6248,8 @@ version = "0.3"; src = fetchhg { url = "https://bitbucket.com/harsman/dyalog-mode"; - rev = "4dac440334f0"; - sha256 = "19aid1rqpqj0fvln98db5imfk1griqld55xsr9plm6kwrr174syq"; + rev = "a3fdf75d634a"; + sha256 = "0yqsrqqzhril9crdgc3ddjz0jggmy29djksqrlihffk9p8zs341d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode"; @@ -6504,6 +6619,27 @@ license = lib.licenses.free; }; }) {}; + edbi-minor-mode = callPackage ({ edbi, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "edbi-minor-mode"; + version = "0.1"; + src = fetchFromGitHub { + owner = "proofit404"; + repo = "edbi-minor-mode"; + rev = "566a2141a6eb9d9d5d7e1bd7c251d1c5e8f0d2ec"; + sha256 = "1g6mlmrwl8p5ffj9q298vymd9xi2kpp7mhbmz4by4f6a3g831c88"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5fb878b60c7ecbb1e3a47aef1d9765061c510644/recipes/edbi-minor-mode"; + sha256 = "0p7vdf9cp6i7mhjxj82670pfflf1kacalmakb7ssgigs1nsf3spi"; + name = "edbi-minor-mode"; + }; + packageRequires = [ edbi ]; + meta = { + homepage = "https://melpa.org/#/edbi-minor-mode"; + license = lib.licenses.free; + }; + }) {}; edit-indirect = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "edit-indirect"; @@ -6570,12 +6706,12 @@ editorconfig = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "editorconfig"; - version = "0.7.6"; + version = "0.7.7"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-emacs"; - rev = "86ba3a4cf675783739f607220811c388f51eea11"; - sha256 = "1zb8f6gfflwzh1zkhcd1nhan9wxmdm0gpp96fm5gjn639zs88539"; + rev = "e316e6ebe2bfed0806dd21583e7c904e6d4c182f"; + sha256 = "1mnx2b2qyv3d8chj9l2l7icvajdiry2n5d3c8byvibs8wav9jzh6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig"; @@ -7156,12 +7292,12 @@ elpa-clone = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elpa-clone"; - version = "0.0.2"; + version = "0.0.3"; src = fetchFromGitHub { owner = "dochang"; repo = "elpa-clone"; - rev = "ee3249cb47658caa170d6a6ef14ef74f0d97bc10"; - sha256 = "0fvadc5fdnpph163w67bn4pc8k856lyhlr1pnmjhpnnmzrrs36ch"; + rev = "77e45f3ac7de504ff65e17dfd52bfde7bdfc78f2"; + sha256 = "09q54j0n52493smhdrngn2isnifvy0x3s6vlicllkm8qykr06z9v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/11861edd9c7f9deebd44fd1f8ef648e7a04caf2b/recipes/elpa-clone"; @@ -7601,12 +7737,12 @@ emms-player-mpv = callPackage ({ emms, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emms-player-mpv"; - version = "0.0.9"; + version = "0.0.10"; src = fetchFromGitHub { owner = "dochang"; repo = "emms-player-mpv"; - rev = "d8535614f340cd9f0ff7db3404439b58f028ca9e"; - sha256 = "1k3jmmg3jy691b3vraaxv9qncfa3698g9kalb7fyrpmdvy1p2cc6"; + rev = "d3e3bace6b648f5b60d833a72a50603545102934"; + sha256 = "1kmkza1x1xajdswdmvxasglpr8fl9vr1pi3yhi7a9cqqa5s1y2ah"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9679cb8d4b3b9dce1e0bff16647ea3f3e02c4189/recipes/emms-player-mpv"; @@ -7685,12 +7821,12 @@ emoji-fontset = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emoji-fontset"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "zonuexe"; repo = "emoji-fontset.el"; - rev = "3b8c2204284b95934383836b5b36efeefb65663b"; - sha256 = "0qi7p1grann3mhaq8kc0yc27cp9fm983g2gaqddljchn7lmgagrr"; + rev = "e460c9a08e48ec4103e38a7a04acae20880149a9"; + sha256 = "0xdlqsrwdf0smi5z9rjj46nwrrfpl0gzanf0jmdg8zzn62l6ldck"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/60df435eb82fcc9a8a02a0a271bb6a2d5a161bc4/recipes/emoji-fontset"; @@ -7818,6 +7954,35 @@ license = lib.licenses.free; }; }) {}; + ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }: + melpaBuild { + pname = "ensime"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "ensime"; + repo = "ensime-emacs"; + rev = "2621509bc9811c103d7efc999d4722e9d4c788e9"; + sha256 = "1bq634bimd5ng2jc5d0aglsrdi08jihm0qx2za4vfdqvnn82gxiv"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime"; + sha256 = "1d8y72l7bh93x9zdj3d3qjhrrzr804rgi6kjifyrin772dffjwby"; + name = "ensime"; + }; + packageRequires = [ + company + dash + popup + s + sbt-mode + scala-mode + yasnippet + ]; + meta = { + homepage = "https://melpa.org/#/ensime"; + license = lib.licenses.free; + }; + }) {}; eopengrok = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, s }: melpaBuild { pname = "eopengrok"; @@ -7842,12 +8007,12 @@ epc = callPackage ({ concurrent, ctable, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "epc"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-epc"; - rev = "152e6e10a79b56ebc7568054589cf6c3c44595c7"; - sha256 = "05r2m7zghbdrgscg0x78jnhk1g6fq8iylar4cx699zm6pzvlq98z"; + rev = "16e975efad63093a1f1f7b59f8fda5a3cf34f2a0"; + sha256 = "0smk23f23jdnvmrisj5d4isna36sr15bbvh53dq5261y8ddxlkvw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc29a8d518ce7a584277089bd4654f52ac0f358/recipes/epc"; @@ -8093,12 +8258,12 @@ erlang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erlang"; - version = "19.0.1"; + version = "19.0.2"; src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "0573efbc18fc20f8646cf3ff64d2affd06e03cb8"; - sha256 = "12hi5x6lycss83i8pskill1s2c3lyxvj2cljd1hrm0pzd3kjnidd"; + rev = "b490fb8664ec6e5ceaadc1c74350dc666f5406d2"; + sha256 = "1vsykghhzpgmc42jwj48crl11zzzpvrqvh2lk8lxfqbflzflxm6j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/erlang"; @@ -8425,22 +8590,22 @@ license = lib.licenses.free; }; }) {}; - esxml = callPackage ({ fetchFromGitHub, fetchurl, kv, lib, melpaBuild }: + esxml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "esxml"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "tali713"; repo = "esxml"; - rev = "cd096242fadbf878d9428786306e54ed60522b43"; - sha256 = "0k4vqlbk3h2snfiriraxhnjpdxgs49vcaazl191p9s2f799msd8p"; + rev = "fd0f0185cd579b00c3d76d2c383cd33fe642bb93"; + sha256 = "0azwfxzxghxhzwal4al0lngm0w3q035jyvm3wj2aaml2dibsi3pb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fd4381bbb725cb4a17d741f604698b38c95da475/recipes/esxml"; sha256 = "0nn074abkxz7p4w59l1za586p5ya392xhl3sx92yys8a3194n6hz"; name = "esxml"; }; - packageRequires = [ kv ]; + packageRequires = []; meta = { homepage = "https://melpa.org/#/esxml"; license = lib.licenses.free; @@ -8700,12 +8865,12 @@ evil-magit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "evil-magit"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "justbur"; repo = "evil-magit"; - rev = "d01f776475480b712facd764eeb3d76a50a400f6"; - sha256 = "040iam8ayb4q5f2w2cn40y9rgljv2gsa5yf0vky1ayjf1zl57g3n"; + rev = "3aaa6264f2223f707070ab95093352c8c0248367"; + sha256 = "06gs5hs220iyjxhkw6gkrihx0znlmr8yii322khbxqypypji7wk6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cfc6cc3581323c81d5f347895aaddfdc71001f22/recipes/evil-magit"; @@ -9309,12 +9474,12 @@ fastdef = callPackage ({ fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, w3m }: melpaBuild { pname = "fastdef"; - version = "0.1.1"; + version = "0.2.0"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "fastdef"; - rev = "b9e7427d65ca5a14db0d318cb799f6cc34c5c58a"; - sha256 = "196agfqcd943wmd3kq6g0dwrqwrx93zn1r7yqj1wri60vv6b9p8q"; + rev = "0696f41dc150d35ce31fe8d2ea74f4173818bb55"; + sha256 = "1p5vmbx7zdzxnyjzcp2vxscd3dwf7xk82wk9dfiv99svwqv2ki3w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f6effb2fbccc71e8a44c53138e3c21f10dc55fbc/recipes/fastdef"; @@ -9456,12 +9621,12 @@ find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "find-file-in-project"; - version = "5.1.0"; + version = "5.2.4"; src = fetchFromGitHub { owner = "technomancy"; repo = "find-file-in-project"; - rev = "d9ca58db5b0d66287d834965fe4f1710670ff620"; - sha256 = "1f134dslhmi273j355hc6ixs8zbhf9zla49hz6395k8645lzh5bg"; + rev = "b69411d15902d9d1cbb0184885f726270de0b98c"; + sha256 = "1jlggfk9qx6gi8ifzvjn9hpbqgs8dc7hmss8aflnzf3gn4202svp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project"; @@ -9883,12 +10048,12 @@ flycheck-gometalinter = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-gometalinter"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "favadi"; repo = "flycheck-gometalinter"; - rev = "6da19fbf8f750f56891c5b57bfb37997af09de77"; - sha256 = "0frgyj57mrggq5ib6xi71696m97ch0bw6cc208d2qbnb55sf4fgb"; + rev = "2e863429cc953cf4c14783e249df56d1ae669868"; + sha256 = "07r2csy2psflvg0pl6n9scfwhnp9mv7hs02hz861v5kbkfx0ajzw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bfe9f2d030c04fb292297eb9226072bfea2ac64/recipes/flycheck-gometalinter"; @@ -10492,12 +10657,12 @@ flyspell-correct = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flyspell-correct"; - version = "0.1"; + version = "0.2"; src = fetchFromGitHub { owner = "d12frosted"; repo = "flyspell-correct"; - rev = "4993404b971fb0e58082d93d505fa9df29c8507a"; - sha256 = "04f0vfsf4wazq8gzgrb42bkbcwfjbzyzzid8jwsyzf2pqhls0xj4"; + rev = "07aa9a9c67c56837b99f8545a4b37485a1732265"; + sha256 = "0zfyry6ysz77ala8ppy4k9h7ssnzw2brnglalphbqw2lgx3q3f98"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct"; @@ -10513,12 +10678,12 @@ flyspell-correct-helm = callPackage ({ fetchFromGitHub, fetchurl, flyspell-correct, helm, lib, melpaBuild }: melpaBuild { pname = "flyspell-correct-helm"; - version = "0.1"; + version = "0.2"; src = fetchFromGitHub { owner = "d12frosted"; repo = "flyspell-correct"; - rev = "4993404b971fb0e58082d93d505fa9df29c8507a"; - sha256 = "04f0vfsf4wazq8gzgrb42bkbcwfjbzyzzid8jwsyzf2pqhls0xj4"; + rev = "07aa9a9c67c56837b99f8545a4b37485a1732265"; + sha256 = "0zfyry6ysz77ala8ppy4k9h7ssnzw2brnglalphbqw2lgx3q3f98"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-helm"; @@ -10534,12 +10699,12 @@ flyspell-correct-ivy = callPackage ({ fetchFromGitHub, fetchurl, flyspell-correct, ivy, lib, melpaBuild }: melpaBuild { pname = "flyspell-correct-ivy"; - version = "0.1"; + version = "0.2"; src = fetchFromGitHub { owner = "d12frosted"; repo = "flyspell-correct"; - rev = "4993404b971fb0e58082d93d505fa9df29c8507a"; - sha256 = "04f0vfsf4wazq8gzgrb42bkbcwfjbzyzzid8jwsyzf2pqhls0xj4"; + rev = "07aa9a9c67c56837b99f8545a4b37485a1732265"; + sha256 = "0zfyry6ysz77ala8ppy4k9h7ssnzw2brnglalphbqw2lgx3q3f98"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-ivy"; @@ -10555,12 +10720,12 @@ flyspell-correct-popup = callPackage ({ fetchFromGitHub, fetchurl, flyspell-correct, lib, melpaBuild, popup }: melpaBuild { pname = "flyspell-correct-popup"; - version = "0.1"; + version = "0.2"; src = fetchFromGitHub { owner = "d12frosted"; repo = "flyspell-correct"; - rev = "4993404b971fb0e58082d93d505fa9df29c8507a"; - sha256 = "04f0vfsf4wazq8gzgrb42bkbcwfjbzyzzid8jwsyzf2pqhls0xj4"; + rev = "07aa9a9c67c56837b99f8545a4b37485a1732265"; + sha256 = "0zfyry6ysz77ala8ppy4k9h7ssnzw2brnglalphbqw2lgx3q3f98"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-popup"; @@ -10846,22 +11011,22 @@ license = lib.licenses.free; }; }) {}; - fountain-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + fountain-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fountain-mode"; - version = "2.1.0"; + version = "2.1.3"; src = fetchFromGitHub { owner = "rnkn"; repo = "fountain-mode"; - rev = "12f61706711c18ccdbc7fbbc061fd29f702003f1"; - sha256 = "1kfv7wn50yzrfg3sn65xfy069g7kvbihhdjl8yspwdryvh9b3bnq"; + rev = "68e685c561c1fdc25e4fde25dba328fe6840da6e"; + sha256 = "1kp7fb181szjv5mdhd5ij4v5cymynp8ihq1fagxgccggrsm83cp4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/913386ac8d5049d37154da3ab32bde408a226511/recipes/fountain-mode"; sha256 = "1i55gcjy8ycr1ww2fh1a2j0bchx1bsfs0zd6v4cv5zdgy7vw6840"; name = "fountain-mode"; }; - packageRequires = [ emacs s ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/fountain-mode"; license = lib.licenses.free; @@ -11330,12 +11495,12 @@ ghc = callPackage ({ fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "ghc"; - version = "5.5.0.0"; + version = "5.6.0.0"; src = fetchFromGitHub { owner = "DanielG"; repo = "ghc-mod"; - rev = "bd021e42b36e6cf3bc2ca3ef908299ba97ceeee5"; - sha256 = "1m5q2s9nxm0m18njaxzryjly8rl3m598r94nn53xpazd4i5ln8cg"; + rev = "737b1fe5a34ee8307345c8313d3e010b2dab6684"; + sha256 = "0kc42bixzi7886b1zaxcrkmci6rgzm6mkk1kg20ggh1645nc7g9c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ghc"; @@ -12167,6 +12332,27 @@ license = lib.licenses.free; }; }) {}; + google-maps = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "google-maps"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "jd"; + repo = "google-maps.el"; + rev = "90151ab59e693243ca8da660ce7b9ce361ea5126"; + sha256 = "183igr5lp20zcqi7rc01fk76sfxdhksd74i11v16gdsifdkjimd0"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/671afe0ff3889ae8c4b2d7b8617a3a25c16f3f0f/recipes/google-maps"; + sha256 = "0a0wqs3cnlpar2dzdi6h14isw78vgqr2r6psmrzbdl00s4fcyxwx"; + name = "google-maps"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/google-maps"; + license = lib.licenses.free; + }; + }) {}; google-this = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "google-this"; @@ -12497,12 +12683,12 @@ graphene-meta-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "graphene-meta-theme"; - version = "0.0.3"; + version = "0.0.4"; src = fetchFromGitHub { owner = "rdallasgray"; repo = "graphene-meta-theme"; - rev = "f76011f212cd4e932e3fca6e84588ac294e812a4"; - sha256 = "0b8yvbcj904ziwx2a6dr6225jspxycgyphab4iwpbmvkv1fnicf6"; + rev = "ba3c197b6331668c4fcee4053594ba1bd34929b6"; + sha256 = "0qbk53r97h234f2vj8ndf57kardaz2g2dgf35i08j9b416aw6ck5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/44af719ede73c9fe7787272d7868587ce8966e3d/recipes/graphene-meta-theme"; @@ -12893,12 +13079,12 @@ haskell-emacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "haskell-emacs"; - version = "3.1.2"; + version = "4.0.2"; src = fetchFromGitHub { owner = "knupfer"; repo = "haskell-emacs"; - rev = "f242ac4d0312aee5d162be82ae14b7154bb0db19"; - sha256 = "1qgqsy7wnqyzkc3b0wixxb8mapmgpi36dignvf8w2raw9ma3q2n0"; + rev = "7b840af4af0b03cbf8dad1b8ac6ca1dcd4b5ccd9"; + sha256 = "1d2b35qmsx3ayq8b6rh08dkmx2845nhswqqwpzg81zsna6d607mh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5daff329a96a6d10bca11d838bbc95d1c8bcfbd9/recipes/haskell-emacs"; @@ -12914,12 +13100,12 @@ haskell-emacs-base = callPackage ({ fetchFromGitHub, fetchurl, haskell-emacs, lib, melpaBuild }: melpaBuild { pname = "haskell-emacs-base"; - version = "3.1.2"; + version = "4.0.2"; src = fetchFromGitHub { owner = "knupfer"; repo = "haskell-emacs"; - rev = "f242ac4d0312aee5d162be82ae14b7154bb0db19"; - sha256 = "1qgqsy7wnqyzkc3b0wixxb8mapmgpi36dignvf8w2raw9ma3q2n0"; + rev = "7b840af4af0b03cbf8dad1b8ac6ca1dcd4b5ccd9"; + sha256 = "1d2b35qmsx3ayq8b6rh08dkmx2845nhswqqwpzg81zsna6d607mh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5daff329a96a6d10bca11d838bbc95d1c8bcfbd9/recipes/haskell-emacs-base"; @@ -12935,12 +13121,12 @@ haskell-emacs-text = callPackage ({ fetchFromGitHub, fetchurl, haskell-emacs, lib, melpaBuild }: melpaBuild { pname = "haskell-emacs-text"; - version = "3.1.2"; + version = "4.0.2"; src = fetchFromGitHub { owner = "knupfer"; repo = "haskell-emacs"; - rev = "f242ac4d0312aee5d162be82ae14b7154bb0db19"; - sha256 = "1qgqsy7wnqyzkc3b0wixxb8mapmgpi36dignvf8w2raw9ma3q2n0"; + rev = "7b840af4af0b03cbf8dad1b8ac6ca1dcd4b5ccd9"; + sha256 = "1d2b35qmsx3ayq8b6rh08dkmx2845nhswqqwpzg81zsna6d607mh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5daff329a96a6d10bca11d838bbc95d1c8bcfbd9/recipes/haskell-emacs-text"; @@ -12956,12 +13142,12 @@ haskell-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "haskell-mode"; - version = "13.20"; + version = "13.20.1"; src = fetchFromGitHub { owner = "haskell"; repo = "haskell-mode"; - rev = "163f264124cd12d40b16c023c7e5394f42c410af"; - sha256 = "1hxjqr448z7sfk3wb48s1y4q51870gb2zv5bfam30lvwxbl3znkm"; + rev = "9eef80d1a16ac3b41b62b8d79ecbafa62e00c6c9"; + sha256 = "1xckvi2s62hwrrrd6g446gszyqdk6bmd2hcrc6m0qfnyjkvg6jf0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode"; @@ -13060,12 +13246,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "1.9.8"; + version = "1.9.9"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "e679393efc1fcb57c67892025a442ee0b396d8dc"; - sha256 = "1z8hkk0iwl4h5d9w7p435hdk6y2xqxzdicj7va3z7b1p08zf1yzq"; + rev = "6230b8cad44d076b239d721adec2979182813e31"; + sha256 = "06wvqhq4gfhrmk8a8qm2hl0mnh0v5593bdplz5rxyg4w7iz400y8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/90ab37af6b0c85eac11c423bc8f0d93d6d8a9fd4/recipes/helm"; @@ -13270,12 +13456,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "1.9.8"; + version = "1.9.9"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "e679393efc1fcb57c67892025a442ee0b396d8dc"; - sha256 = "1z8hkk0iwl4h5d9w7p435hdk6y2xqxzdicj7va3z7b1p08zf1yzq"; + rev = "6230b8cad44d076b239d721adec2979182813e31"; + sha256 = "06wvqhq4gfhrmk8a8qm2hl0mnh0v5593bdplz5rxyg4w7iz400y8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -13372,22 +13558,22 @@ license = lib.licenses.free; }; }) {}; - helm-flycheck = callPackage ({ dash, fetchFromGitHub, fetchurl, flycheck, helm, lib, melpaBuild }: + helm-flycheck = callPackage ({ dash, fetchFromGitHub, fetchurl, flycheck, helm-core, lib, melpaBuild }: melpaBuild { pname = "helm-flycheck"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "yasuyk"; repo = "helm-flycheck"; - rev = "29f3d050056760e1fb5c1c4b83207c02beb7fd56"; - sha256 = "1fg786m4m6x7brbbchpdf4pwvwma7sn4597p5lzmhvh187z6g525"; + rev = "a15e62a6432c165c4f2c17388686873383400d7d"; + sha256 = "0q9yksx66ry4x3vkcyyj437il225s2ad5h6vkxpyz04p62g3ysnx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cce1662d4ca7b7d868685084294d22ebf6c39e9/recipes/helm-flycheck"; sha256 = "038f9294qc0jnkzrrjxm97hyhwa4sca3wdsjbaya50cf0g4cmk7b"; name = "helm-flycheck"; }; - packageRequires = [ dash flycheck helm ]; + packageRequires = [ dash flycheck helm-core ]; meta = { homepage = "https://melpa.org/#/helm-flycheck"; license = lib.licenses.free; @@ -13438,12 +13624,12 @@ helm-git-grep = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-git-grep"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "yasuyk"; repo = "helm-git-grep"; - rev = "1fde3b3e3da02cdbec27c48bca6a94b0219217e4"; - sha256 = "1hx9m18dfpl97xaskadhqdrd8syk271shxjasn3jnqa8a07m2983"; + rev = "456ea8324eb811f099dad993ae94c8837368b23a"; + sha256 = "13p8dbfln8kcvi6iwj9mlb7vy6bda4285gagsng01j3nfrw0ck9x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/338d28c3fe201a7b2f15793be6d540f44819f4d8/recipes/helm-git-grep"; @@ -13939,6 +14125,27 @@ license = lib.licenses.free; }; }) {}; + helm-projectile = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }: + melpaBuild { + pname = "helm-projectile"; + version = "0.14.0"; + src = fetchFromGitHub { + owner = "bbatsov"; + repo = "helm-projectile"; + rev = "1a90f93732f1a1e8080098d65eadd6a1cd799e31"; + sha256 = "0lph38p112fridighqcizpsyzjbv7qr3d8prbfj6w6q6gfl6cna4"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc4e3a5af7ba86d277c73a1966a91c87d3d855a/recipes/helm-projectile"; + sha256 = "18y7phrvbpdi3cnghwyhh0v1bwm95nwq1lymzf8lrcbmrwcvh36a"; + name = "helm-projectile"; + }; + packageRequires = [ cl-lib dash helm projectile ]; + meta = { + homepage = "https://melpa.org/#/helm-projectile"; + license = lib.licenses.free; + }; + }) {}; helm-pt = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-pt"; @@ -14173,16 +14380,16 @@ helm-unicode = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-unicode"; - version = "0.0.2"; + version = "0.0.3"; src = fetchFromGitHub { - owner = "shosti"; + owner = "bomgar"; repo = "helm-unicode"; - rev = "e68cc60f7efd93b410844f3722bc6681dc65e2fd"; - sha256 = "14lbdvs9xdnipsn3lywbvgsqwqnbm8fxm6d1ilq0cj5z6zkxkya0"; + rev = "3b2a61dd9d4c9e85946567e07d8e70e276c5136b"; + sha256 = "1247ghg1jkslgvwbffzsaxabz5l6qszw14vrwgln9smsc42cxjy2"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/2c35c6f876372c440bcf6133d5dfce7256f0743c/recipes/helm-unicode"; - sha256 = "052xqzvcfzpsbl75ylqb1khqndvc2dqdymqlwivs0darlds0w8y4"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/f720b9f9b667bf9ff3080938beab36aa0036dc92/recipes/helm-unicode"; + sha256 = "1j95qy2zwdb46dl30ankfx7013l0akc61m14s473j93w320j5224"; name = "helm-unicode"; }; packageRequires = [ emacs helm ]; @@ -14236,12 +14443,12 @@ hfst-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hfst-mode"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "unhammer"; repo = "hfst-mode"; - rev = "d145a21e3e175b0fe2b0592981533c9492bd289c"; - sha256 = "1zr59kcnkd9bm5676shmz63n0wpnfr7yl9g4l01ng0xcili1n13i"; + rev = "ac1bb9dd92545d3e7fdc05c83996c227cc15c6b8"; + sha256 = "0zsz8542kh51clzy8j7g29bwm8zcnfxm9sjzh3xjpqk2ziqf4ii6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e324bb114997f9cc57d76d8a66fec4ff4d1d71fe/recipes/hfst-mode"; @@ -14341,12 +14548,12 @@ highlight-numbers = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parent-mode }: melpaBuild { pname = "highlight-numbers"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "Fanael"; repo = "highlight-numbers"; - rev = "c5e7a5d71dd6c78c52ec8edbe025c7261c8e5d30"; - sha256 = "083jmw9jaxj5d5f0b0gxxb0gjdi4dv1sm66559105slbkl2nsa3f"; + rev = "b7adef0286aaa5bca8e98a12d0ffed3a880e25aa"; + sha256 = "1r07mpyr7rhd7bkg778hx6vbhb4n9ixgzkpszhgks7ri6ia38pj8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/882e3a4877ddd22cc52f56f0ce3d55b6e4831c7a/recipes/highlight-numbers"; @@ -14779,6 +14986,27 @@ license = lib.licenses.free; }; }) {}; + hydandata-light-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "hydandata-light-theme"; + version = "0.9.0"; + src = fetchFromGitHub { + owner = "hydandata"; + repo = "hydandata-light-theme"; + rev = "3b9bb5f213029a8331818b1d670194ef26d9505a"; + sha256 = "11vgz64f8vs8vqp4scj9qvrfdshag7bs615ly9zvzzlk68jivdya"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/413c617f15947782891159a240e0c9014f1f7d11/recipes/hydandata-light-theme"; + sha256 = "0jw43m91m10ifqg335y6d52r6ri77hcmxkird8wsyrpsnk3cfb60"; + name = "hydandata-light-theme"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/hydandata-light-theme"; + license = lib.licenses.free; + }; + }) {}; hyde = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hyde"; @@ -15307,12 +15535,12 @@ imenu-anywhere = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "imenu-anywhere"; - version = "1.1"; + version = "1.1.1"; src = fetchFromGitHub { owner = "vspinu"; repo = "imenu-anywhere"; - rev = "7588aff2e1ca9303e67c9fafb5346123b4bf7684"; - sha256 = "1471r94lwvfz5maap2qbwhfbva9d0fgfv1w0fyrs7bfcf8zzbdlb"; + rev = "03fa805fe9104fec8e9eda5f58be583eb9bd28e6"; + sha256 = "1bfishspj2szc3qr1i22wryjshfhbdvfxwb41pi108bm5fmyxjam"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/imenu-anywhere"; @@ -15705,12 +15933,12 @@ intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "intero"; - version = "0.1.15"; + version = "0.1.16"; src = fetchFromGitHub { owner = "commercialhaskell"; repo = "intero"; - rev = "b8d09110977da4537c6dc4f8d58e2cdbe80a531d"; - sha256 = "12lkpdaafc4bdpcfdkf3nw64gmqhb3jsnv9sjhmfx53y4xq4gw7k"; + rev = "e7723039044867101ec80d2b5cdf26560e30b536"; + sha256 = "0wdacic3mp5lkpjbib8nh3rd4z8i3mp5hyhmdrwak9afmq6lv2f7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero"; @@ -15870,6 +16098,27 @@ license = lib.licenses.free; }; }) {}; + ivy-purpose = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, window-purpose }: + melpaBuild { + pname = "ivy-purpose"; + version = "0.1"; + src = fetchFromGitHub { + owner = "bmag"; + repo = "ivy-purpose"; + rev = "0495f2f3aed64d7e0028125e76a9a68f8fc4107e"; + sha256 = "1hiw7mnrr0cnnp0a2mh837pzdaknadwv0sk82vya6blx0a7m691g"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1fa2a37a1a6492eddf638216acec4b9d54d3498d/recipes/ivy-purpose"; + sha256 = "0c5n7x3sa57wslwnldvc0i315xhyi1zndyhr07rzka1rhj8v1c4v"; + name = "ivy-purpose"; + }; + packageRequires = [ emacs ivy window-purpose ]; + meta = { + homepage = "https://melpa.org/#/ivy-purpose"; + license = lib.licenses.free; + }; + }) {}; ix = callPackage ({ fetchFromGitHub, fetchurl, grapnel, lib, melpaBuild }: melpaBuild { pname = "ix"; @@ -16144,12 +16393,12 @@ js2-closure = callPackage ({ fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: melpaBuild { pname = "js2-closure"; - version = "2.0"; + version = "2.1"; src = fetchFromGitHub { owner = "jart"; repo = "js2-closure"; - rev = "37409e4ad1925e48b633c1d424caa2fe94eb9d49"; - sha256 = "1yjgi0glh4fb4k7z5n216sbfzmxrxnnspmq2r5j6ag7b59qamyym"; + rev = "6050abb334c228702c23fcb03bfdf1dfbd1d6b11"; + sha256 = "1b4d13kz7afr5a6wyhq6vmwz8gsabdi86scw3q3v6l56hl2rgy46"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/61bf3e70ae38a78184f0b373ff6f0db234f51cb2/recipes/js2-closure"; @@ -16270,12 +16519,12 @@ json-mode = callPackage ({ fetchFromGitHub, fetchurl, json-reformat, json-snatcher, lib, melpaBuild }: melpaBuild { pname = "json-mode"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "joshwnj"; repo = "json-mode"; - rev = "ce275e004dc7265047a80dec68b24eb058b200f0"; - sha256 = "0sxkp9m68rvff8dbr8jlsx85w5ngifn19lwhcydysm7grbwzrdi3"; + rev = "9ba01b868a6b138feeff82b9eb0abd331d29325f"; + sha256 = "0i79lqzdg59vkqwjd3q092xxn9vhxspb1vn4pkis0vfvn46g01jy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/03d0ff6c8d724cf39446fa27f52aa5cc1a3cefb6/recipes/json-mode"; @@ -16792,6 +17041,27 @@ license = lib.licenses.free; }; }) {}; + kiwix = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "kiwix"; + version = "0.4.0"; + src = fetchFromGitHub { + owner = "stardiviner"; + repo = "kiwix.el"; + rev = "b84a5ff33efdf13dda22ed32ea37a09b15cd1690"; + sha256 = "07nb141hxjabin8vr14hpn80vzrjaq1b3h6p76m0bwxvzbi8765r"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/673b4ecec96562bb860caf5c08d016d6c4b89d8c/recipes/kiwix"; + sha256 = "1z5gns3y7iv3lmczgxdbvg3wigkch4ljwcx7dc5f92q3ykm0zwhf"; + name = "kiwix"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/kiwix"; + license = lib.licenses.free; + }; + }) {}; know-your-http-well = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "know-your-http-well"; @@ -16921,12 +17191,12 @@ latex-unicode-math-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "latex-unicode-math-mode"; - version = "0.2.5"; + version = "0.2.6"; src = fetchFromGitHub { owner = "Christoph-D"; repo = "latex-unicode-math-mode"; - rev = "79edf60793eb6928a5b4831268bf09694fd092ec"; - sha256 = "10i4r81pm95990d4yrabzdm49gp47mqpv15h4r4sih10p1kbn83h"; + rev = "54ddb8742c50a338639625183f7315278fa7369c"; + sha256 = "1yp6nicz0zzd28hfpi94shgj76l1h68mbw875c7x9abyhfz06sfm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c021dfad8928c1a352e0ef5526eefa6c0a9cb37/recipes/latex-unicode-math-mode"; @@ -16946,8 +17216,8 @@ src = fetchFromGitHub { owner = "ledger"; repo = "ledger"; - rev = "6dcb1444ea8ab2dcf074c3477b74f0482e0d097d"; - sha256 = "1n06wzghhmxx7acahzmwmny0nx1wfahrylpfq0fwhk50mr29a866"; + rev = "67d21ed4b083424831e51a649060fbde7c2f735b"; + sha256 = "0jkalp1sggdj0nsms7jlyll9fzq3xxjf110jqwk9ydid0farbyzi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/93c54a327f226bf7e6a0ab4a3368a0e1ca169e62/recipes/ledger-mode"; @@ -17450,22 +17720,22 @@ license = lib.licenses.free; }; }) {}; - logview = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "logview"; - version = "0.4.2"; + version = "0.5"; src = fetchFromGitHub { owner = "doublep"; repo = "logview"; - rev = "f53693b37b46af448d0ac102ebbb152a1cb915aa"; - sha256 = "1yacic778ranlqblrcdhyf5igbrcin8aj30vjdm4klpmqb73hf1s"; + rev = "cd63640f3ab15e9a50f4cf250f6828e428fbb345"; + sha256 = "0a3cx96nv64xxsvvxca966kmwd3hacvday936kd1yfdf2bmgiw6z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview"; sha256 = "0gks3j5avx8k3427a36lv7gr95id3cylaamgn5qwbg14s54y0vsh"; name = "logview"; }; - packageRequires = [ emacs ]; + packageRequires = [ datetime emacs ]; meta = { homepage = "https://melpa.org/#/logview"; license = lib.licenses.free; @@ -17545,8 +17815,8 @@ sha256 = "01847f8xmjfxvvi7hf73l7ypkdazwg8ciinm117zp4jkgnv0apz0"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0cc1991d4f36b8d53d6cbeb6c83417c5e6b9453f/recipes/m-buffer"; - sha256 = "0l2rayglv48pcwnr1ggmn8c0az0mffgv02ivnzr9jcfs55ki07fc"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/c34d02682e87c9978a3583bd903dcac5da5b41d5/recipes/m-buffer"; + sha256 = "17smq7wlidsls870hla5b94xq2pwk24b88jvrbbcqw6f5z3ypf94"; name = "m-buffer"; }; packageRequires = [ dash emacs ]; @@ -18132,12 +18402,12 @@ markdown-toc = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, s }: melpaBuild { pname = "markdown-toc"; - version = "0.1.0"; + version = "0.1.2"; src = fetchFromGitHub { owner = "ardumont"; repo = "markdown-toc"; - rev = "c5d44470f8fb0f61bc96e58dec998010edcc0e95"; - sha256 = "0l687bna8rrc49y1fyn1ldjcwh290qgvi3p86c63yj4xy24fmdm6"; + rev = "15587c76bec43dd778a2034035f98a79ad29e96a"; + sha256 = "00rvpbfcdy1npddxa7yynqpzwrx1h2bm69x9yh42dv6ss3vk1sjs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4db1e90be8e34d5ad0c898be10dfa5cd95ccb921/recipes/markdown-toc"; @@ -18195,12 +18465,12 @@ marshal = callPackage ({ eieio ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "marshal"; - version = "0.6.0"; + version = "0.6.3"; src = fetchFromGitHub { owner = "sigma"; repo = "marshal.el"; - rev = "64c428aa2d645501955e8a091c6bb027c08623a2"; - sha256 = "11zlqrvm8c2xmjf8k8ibc0mzgy7q5jdn2imvrfgdf5pb7ygigy8j"; + rev = "d62a406abb9e8c3dfb8513452402845c55ade6ae"; + sha256 = "164nx0bk8h0p38j8gprcz2zwdqwbjxfcj3idlc5ryqm165h5cwmy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/203f2061c5c7d4aefab3175de5e0538f12158ee3/recipes/marshal"; @@ -18279,12 +18549,12 @@ mb-url = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mb-url"; - version = "0.0.8"; + version = "0.0.9"; src = fetchFromGitHub { owner = "dochang"; repo = "mb-url"; - rev = "e6ff9a88a4eb2de542e2fb053f4981ac8fa0a529"; - sha256 = "073yqx5gjiglbb50633mjq5dkl5h54rk4qzp0kn9zqmi2mxa3i7p"; + rev = "178b03d2cbc31e889c095a6c25426c297e5fe6fc"; + sha256 = "0y22bn4zvyw2qivjrvwkhx96mwvfpx74901r0m4l31nvyh559aq0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dd9a8ff6e094b061a7b9d790df1fd4086c5d0a9d/recipes/mb-url"; @@ -18409,8 +18679,8 @@ src = fetchFromGitHub { owner = "the-lambda-church"; repo = "merlin"; - rev = "343dce57e7824b8fb213eba08ee9142ad635ddad"; - sha256 = "0vk1b9gjhjq47jhjhwh6h2x2cl2w7pz4018s6c444paw46gmgkln"; + rev = "b2926cf6235827c0242797775188b8f0420386c5"; + sha256 = "0xfmvicagqccscxf45n04c25c7fqsnfk8mp8s90rnzlyr66gdck1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1b9bfd3164e62758dc0a3362d85c6627ed7cbf8/recipes/merlin"; @@ -18866,12 +19136,12 @@ monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monokai-theme"; - version = "2.0.1"; + version = "2.0.3"; src = fetchFromGitHub { owner = "oneKelvinSmith"; repo = "monokai-emacs"; - rev = "5fbfaa7683ad9a7bd9d401f8f3be37d3a047f777"; - sha256 = "0pfzzyfknfaj8yil5f55xfa8x5jypc5i95c4lrkb0vykgccczj78"; + rev = "02c5f5d5a5d3ee93a1daa16117471197817f3bc8"; + sha256 = "0w18lwp3vn1f9rq9l8s434l2f16rgrp9i1x0c2vbzd5c9xzaq2fi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme"; @@ -19202,12 +19472,12 @@ mwim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mwim"; - version = "0.2"; + version = "0.3"; src = fetchFromGitHub { owner = "alezost"; repo = "mwim.el"; - rev = "dc1b5c358e0bfe607527f1b7c082188105fe6c75"; - sha256 = "0hvq6z754niqjyv79jzb833wrwbspc7npfg85scwdv8vzwassjx4"; + rev = "d7885c32ad54f5b5698b48abea392a8eae2567a8"; + sha256 = "1kssmryl44m4cq05ff98blwdvqafb9x7v3bvb1z70rrvdvw3l024"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b7e1aa2fa1294b27ed7b6c5bdd5844fa5c37df72/recipes/mwim"; @@ -19661,11 +19931,11 @@ }) {}; notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "notmuch"; - version = "0.22.1pre0"; + version = "0.22.1"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "09b18ae8f459ccdb1e5706818b4bf45ceea65e23"; - sha256 = "0d8q560xrd7m6iw7dvv1xd5m1b6wma9s58p7i6bg5r91acs8pzk3"; + rev = "b824ecc48f1e838ab19e346b0eec17ff02432493"; + sha256 = "08jwa7fg2wnk5nhzd56lyvsgi6icgmzmb30mpvpvm4v2afwlhbvj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -19699,6 +19969,48 @@ license = lib.licenses.free; }; }) {}; + noxml-fold = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "noxml-fold"; + version = "0.0.2"; + src = fetchFromGitHub { + owner = "paddymcall"; + repo = "noXML-fold"; + rev = "56fbc44b25cee9f8719edb3c7f8b1c4327dc1051"; + sha256 = "00h6nwbx2l0rp2i7n0328w6ckp4gkspqk3q91ciixb4lkhh20cz2"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/13d2af88b292293cb5ab50819c63acfe936630c8/recipes/noxml-fold"; + sha256 = "11dninxxwhflf2qrmvwmrryspd9j6m95kdlmyx59ykqvw8j0siqc"; + name = "noxml-fold"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/noxml-fold"; + license = lib.licenses.free; + }; + }) {}; + npm-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "npm-mode"; + version = "0.6.0"; + src = fetchFromGitHub { + owner = "mojochao"; + repo = "npm-mode"; + rev = "84b35211cba4f2d5f03b8dc2b60ae4b03d90bf8a"; + sha256 = "1mh6nbffciw4yhv049kdhh796ysj1x21ndm3fwymhskb3dy0w1ss"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/22dd6b2f8a94f56a61f4b70bd7e44b1bcf96eb18/recipes/npm-mode"; + sha256 = "1aym4jfr6im6hdc5d7995q6myhgig286fk9hpaxdf418h1s17rqr"; + name = "npm-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/npm-mode"; + license = lib.licenses.free; + }; + }) {}; nrepl-sync = callPackage ({ cider, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nrepl-sync"; @@ -20317,6 +20629,27 @@ license = lib.licenses.free; }; }) {}; + org-doing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "org-doing"; + version = "0.1"; + src = fetchFromGitHub { + owner = "omouse"; + repo = "org-doing"; + rev = "e099514cfc162f8fe3d383456a7964743b0455d5"; + sha256 = "1hvnrw0y3chlfv6zxsczmm8zybrnakn3x13ykv2zblw96am9kd2s"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4c497b87e14ab614c963f4b2f041bc0111b6e936/recipes/org-doing"; + sha256 = "17w49z78fvbz182sxv9mnryj124gm9jbdmbybppjqz4rk6wvnm2j"; + name = "org-doing"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/org-doing"; + license = lib.licenses.free; + }; + }) {}; org-dp = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-dp"; @@ -20592,12 +20925,12 @@ org-pomodoro = callPackage ({ alert, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-pomodoro"; - version = "2.0.3"; + version = "2.1.0"; src = fetchFromGitHub { owner = "lolownia"; repo = "org-pomodoro"; - rev = "26452a3d070f4814b191a9de9e3493a54161b910"; - sha256 = "1fjdza723615bhdm5x6gbd03vi7ywzpbjn8p59saimczqngfdpmw"; + rev = "a6d867865f1a033fb5a09cca6643045d7ebac49c"; + sha256 = "0r5shgikm34d66i2hblyknbblpg92lb2zc9x4bcb28xkh7m9d0xv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e54e77c5619b56e9b488b3fe8761188b6b3b4198/recipes/org-pomodoro"; @@ -21908,12 +22241,12 @@ pcache = callPackage ({ eieio ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pcache"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "sigma"; repo = "pcache"; - rev = "c86d94c6153cec6fde84fed387daeca2bb156d0a"; - sha256 = "0pw5922fcqxppcal4ks9w83jxinh0xhlbss532cdsiwfl5icgdqp"; + rev = "7f441f69bd5ed6cb6c2a86f59f48f4960174c71f"; + sha256 = "0j1p2jr475jkkxcsqm1xpjxq5qrnl1xj1kdxyzhjkwr2dy3bqvas"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/pcache"; @@ -22114,6 +22447,27 @@ license = lib.licenses.free; }; }) {}; + persp-projectile = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, perspective, projectile }: + melpaBuild { + pname = "persp-projectile"; + version = "0.2.0"; + src = fetchFromGitHub { + owner = "bbatsov"; + repo = "persp-projectile"; + rev = "7686633acf44402fa90429759cca6a155e4df2b9"; + sha256 = "0rqyzsmg32sdr4k9i2lf3jfyr9bskkl7gfb5ndl16iip9py7403z"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc4e3a5af7ba86d277c73a1966a91c87d3d855a/recipes/persp-projectile"; + sha256 = "10l2kqjyigg98qbbpf3qf4d5bm63kkk4vp7ip8fibgj1p9gqmnxm"; + name = "persp-projectile"; + }; + packageRequires = [ cl-lib perspective projectile ]; + meta = { + homepage = "https://melpa.org/#/persp-projectile"; + license = lib.licenses.free; + }; + }) {}; perspective = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "perspective"; @@ -22891,27 +23245,6 @@ license = lib.licenses.free; }; }) {}; - project-persist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "project-persist"; - version = "0.3.2"; - src = fetchFromGitHub { - owner = "rdallasgray"; - repo = "project-persist"; - rev = "a4e5de1833edb60656d8a04357c527d34e81d27c"; - sha256 = "1x7hwda1w59b8hvzxyk996wdz6phs6rchh3f1ydf0ab6x7m7xvjr"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/bd81d1f8a30ed951ed94b9a4db13a2f7735ea878/recipes/project-persist"; - sha256 = "0csjwj0qaw0hz2qrj8kxgxlixh2hi3aqib98vm19sr3f1b8qab24"; - name = "project-persist"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/project-persist"; - license = lib.licenses.free; - }; - }) {}; project-persist-drawer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, project-persist }: melpaBuild { pname = "project-persist-drawer"; @@ -22956,12 +23289,12 @@ projectile = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "projectile"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "bbatsov"; repo = "projectile"; - rev = "1159110e83490f3b30d4d39e8c48022d3006900a"; - sha256 = "1rl6n6v9f4m7m969frx8b51a4lzfix2bxx6rfcfbh6kzhc00qnxf"; + rev = "19fb9fa6590e1dc49afc3c8c5bd69cff6cf743a7"; + sha256 = "1kp0y81csmjxwyrdbj60f89phw3gkg3hm5xp3k4fvymzsrxrhm9l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile"; @@ -23082,12 +23415,12 @@ protobuf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "protobuf-mode"; - version = "2.6.1"; + version = "3.0.0"; src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "bba83652e1be610bdb7ee1566ad18346d98b843c"; - sha256 = "03df8zvx2sry3jz2x4pi3l32qyfqa7w8kj8jdbz30nzy0h7aa070"; + rev = "e8ae137c96444ea313485ed1118c5e43b2099cf1"; + sha256 = "05qkcl96lkdama848m7q3nzzzdckjc158iiyvgmln0zi232xx7g7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -23145,12 +23478,12 @@ psysh = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "psysh"; - version = "0.0.2"; + version = "0.0.3"; src = fetchFromGitHub { owner = "zonuexe"; repo = "psysh.el"; - rev = "be170b6050bed30c76721e424c8003055de7dbe4"; - sha256 = "0mnxvh5yd8v8a5mfi53isknc88kv2kdjjv0qffblz0sgshkpl30x"; + rev = "6932f03447c3d821e4c03e99f1630928f0979452"; + sha256 = "00dssrdsdvwdg6a6fwl3wv0y94axcd4jb3b3ndd1p3bcr56fxq49"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b3131d9a0ad359f15bc3550868a12f02476449a/recipes/psysh"; @@ -23205,22 +23538,22 @@ license = lib.licenses.free; }; }) {}; - puml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + puml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "puml-mode"; - version = "0.6.5"; + version = "0.6.6"; src = fetchFromGitHub { owner = "skuro"; repo = "puml-mode"; - rev = "56cd3f393d4b5bb268a098c3fda3cf73e7d761ba"; - sha256 = "19bcf3wbmp186yxvrdsm2ax4npvi2x0id94zi13pdnw4cz7zch3v"; + rev = "ae1cd8eb21d3af33bc60d4bfa39a90b8f49b7011"; + sha256 = "12csnmas5n0r356hwrqgx4lb72ns4mdbfkh5dw5jss377akv12gr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c0c28ccef208035fd0bdd648771825c1d10f42ff/recipes/puml-mode"; sha256 = "131ghjq6lsbhbx5hdg36swnkqijdb9bx6zg73hg0nw8qk0z742vn"; name = "puml-mode"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/puml-mode"; license = lib.licenses.free; @@ -24024,6 +24357,27 @@ license = lib.licenses.free; }; }) {}; + refine = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }: + melpaBuild { + pname = "refine"; + version = "0.2"; + src = fetchFromGitHub { + owner = "Wilfred"; + repo = "refine"; + rev = "b59764e181990ddd3ab441cdc290b5fe178860f4"; + sha256 = "1x5r6cb430hfbdqq3samlfkaawy49i1gi6mzai2061r780h7w4fx"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b111879ea0685cda88c758b270304d9e913c1391/recipes/refine"; + sha256 = "1sk6rsd92pix7k8snnqm3hsimjzaihzjgac0g5h3a2zm9dabf4py"; + name = "refine"; + }; + packageRequires = [ dash emacs list-utils loop s ]; + meta = { + homepage = "https://melpa.org/#/refine"; + license = lib.licenses.free; + }; + }) {}; relative-line-numbers = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "relative-line-numbers"; @@ -24699,12 +25053,12 @@ runner = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "runner"; - version = "1.7"; + version = "1.8"; src = fetchFromGitHub { owner = "thamer"; repo = "runner"; - rev = "a08554070a4809a3e9441922550b0145eb628ece"; - sha256 = "1v2qr58n0rfb21dzcw6vlxwpvpmwnmgwrk32mzw32k08yappqjn6"; + rev = "a211d57ddc600410d07a8b534920ba905b093d87"; + sha256 = "1ddf5jydpc43wgvw4a669wifij71b4r8zfazcqfdpyfh1j4m591b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f3a4e051ab45b8036b91aa0c50bd3f93cd85e9d0/recipes/runner"; @@ -27003,6 +27357,27 @@ license = lib.licenses.free; }; }) {}; + switch-buffer-functions = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "switch-buffer-functions"; + version = "0.0.1"; + src = fetchFromGitHub { + owner = "10sr"; + repo = "switch-buffer-functions-el"; + rev = "e1bccfff2d123b6218efab16c486215cedb9a108"; + sha256 = "0pq53b8wrjbrxd5hnrcdi0z7mffp4bax55hn90k9ca3j76lhbn1k"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d37ebd28f4a2f770958bd9a2669cce86cc76cbe7/recipes/switch-buffer-functions"; + sha256 = "1b93p8q07zncqq3nw829gddc615rwaan1ds5vgfhdb1l7bh9f37l"; + name = "switch-buffer-functions"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/switch-buffer-functions"; + license = lib.licenses.free; + }; + }) {}; switch-window = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "switch-window"; @@ -27467,12 +27842,12 @@ tern = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "tern"; - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "ternjs"; repo = "tern"; - rev = "2e8df51181ceda7bc1118cf168da4197b25b8701"; - sha256 = "1kaymyihskmdav56xj85j04iq7a8948b1jgjfrv9s7pc965j9795"; + rev = "95dfbf405802207b5529314b83b6104f9ea9b042"; + sha256 = "067k1cnfywk5bl9qxpn4yxg577x35ndygg4s8nkhxncnl11dq63q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern"; @@ -27488,12 +27863,12 @@ tern-auto-complete = callPackage ({ auto-complete, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, tern }: melpaBuild { pname = "tern-auto-complete"; - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "ternjs"; repo = "tern"; - rev = "2e8df51181ceda7bc1118cf168da4197b25b8701"; - sha256 = "1kaymyihskmdav56xj85j04iq7a8948b1jgjfrv9s7pc965j9795"; + rev = "95dfbf405802207b5529314b83b6104f9ea9b042"; + sha256 = "067k1cnfywk5bl9qxpn4yxg577x35ndygg4s8nkhxncnl11dq63q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern-auto-complete"; @@ -27506,6 +27881,27 @@ license = lib.licenses.free; }; }) {}; + tern-context-coloring = callPackage ({ context-coloring, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, tern }: + melpaBuild { + pname = "tern-context-coloring"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "jacksonrayhamilton"; + repo = "tern-context-coloring"; + rev = "42e2f0177e8d3017c07826361cc981b2883d34dc"; + sha256 = "0jdm1s8pqs40xligbhmqgk4vaxkqyb2i5wkx1zgjazq8fhcql9jv"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/db2119d2c2d167d771ee02c2735b435d59991b93/recipes/tern-context-coloring"; + sha256 = "0wkb7gn2ma6mz495bgphcjs5p0c6a869zk4a8mnm0spq41xbw4gi"; + name = "tern-context-coloring"; + }; + packageRequires = [ context-coloring emacs tern ]; + meta = { + homepage = "https://melpa.org/#/tern-context-coloring"; + license = lib.licenses.free; + }; + }) {}; tern-django = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, tern }: melpaBuild { pname = "tern-django"; @@ -27695,6 +28091,27 @@ license = lib.licenses.free; }; }) {}; + tide = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }: + melpaBuild { + pname = "tide"; + version = "2.0.0beta"; + src = fetchFromGitHub { + owner = "ananthakumaran"; + repo = "tide"; + rev = "fbdef5d7af25786d2eddd691a8d6a00225c4202d"; + sha256 = "09y92kk0abfihyh6my2jsq6gvdczg61a9iy324vyhl8ig0aqf9zd"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide"; + sha256 = "1z2xr25s23sz6nrzzw2xg1l2j8jvjhxi53qh7nvxmmq6n6jjpwg1"; + name = "tide"; + }; + packageRequires = [ cl-lib dash emacs flycheck typescript-mode ]; + meta = { + homepage = "https://melpa.org/#/tide"; + license = lib.licenses.free; + }; + }) {}; timer-revert = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "timer-revert"; @@ -28375,12 +28792,12 @@ use-package = callPackage ({ bind-key, diminish, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "use-package"; - version = "2.1"; + version = "2.2"; src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "2b077f6e485e8c5c167413c03246068022b6bc71"; - sha256 = "07vwg0bg719gb8ln1n5a33103903vvrphnkbvvfn43904pkrf14w"; + rev = "27fdfba5b05fd51345dc2b947ae6342266fdb22b"; + sha256 = "1dzkvinp1h1w48lx44x9bn1b54c83m1wl5v8h99l76fh1y0jw7b4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3f9b52790e2a0bd579c24004873df5384e2ba549/recipes/use-package"; @@ -28435,22 +28852,22 @@ license = lib.licenses.free; }; }) {}; - v2ex-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: + v2ex-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, request }: melpaBuild { pname = "v2ex-mode"; - version = "0.1"; + version = "0.2"; src = fetchFromGitHub { owner = "aborn"; repo = "v2ex-mode"; - rev = "240bbfe637cb456166d516a2af84d5add315c627"; - sha256 = "1myvyjv3xyn9d2gylvyn9r5mq5h6fj7siklj2qb9h9jc7qlbddp5"; + rev = "7a59ac3be2b08d873ec271ec7a3d5ace309c1407"; + sha256 = "0f4y0s0zhqlb3n56yqp2w1krhrar5l4axl7dfn595hmwhhgxvvra"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b27b7d777415aa350c8c30822e239b9a4c02e77d/recipes/v2ex-mode"; sha256 = "04frd6jbnf9g7ak2fdbik9iji7b0903cpbg1hx7rai1853af7gh1"; name = "v2ex-mode"; }; - packageRequires = [ cl-lib request ]; + packageRequires = [ cl-lib let-alist request ]; meta = { homepage = "https://melpa.org/#/v2ex-mode"; license = lib.licenses.free; @@ -28960,26 +29377,6 @@ license = lib.licenses.free; }; }) {}; - weblogger = callPackage ({ fetchbzr, fetchurl, lib, melpaBuild, xml-rpc }: - melpaBuild { - pname = "weblogger"; - version = "1.4.5"; - src = fetchbzr { - url = "lp:weblogger-el"; - rev = "38"; - sha256 = "1z7ld9d0crwdh778fyaapx75vpnlnslsh9nf07ywkylhz4w68yyv"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4e08837a9af8185951df9b44b9b94a799f0de923/recipes/weblogger"; - sha256 = "189zs1321rybgi4zihps7d2jll5z13726jsg5mi7iycg85nkv2fk"; - name = "weblogger"; - }; - packageRequires = [ xml-rpc ]; - meta = { - homepage = "https://melpa.org/#/weblogger"; - license = lib.licenses.free; - }; - }) {}; weechat = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, tracking }: melpaBuild { pname = "weechat"; @@ -29340,16 +29737,16 @@ window-purpose = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, imenu-list, let-alist, lib, melpaBuild }: melpaBuild { pname = "window-purpose"; - version = "1.5"; + version = "1.6"; src = fetchFromGitHub { owner = "bmag"; repo = "emacs-purpose"; - rev = "48943e2fb9886367df013119c323b2adcd57a82e"; - sha256 = "1xjs51wm5ydcqdwvg3c42c5z4j92q75lmk895qkka7ayy5spxxf7"; + rev = "00c253778d8e845bdc17a350c22ea157c5871b41"; + sha256 = "11hv2rrcirswzgx0l52kwav5dilr3yksky9a3vg1pghgqhmm59hv"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/cfaba6ff48d5548d5d355b3a1a8f44f541f8a3fc/recipes/window-purpose"; - sha256 = "1ib5ia7armghvmcw8qywcil4nxzwwakmfsp7ybawb0xr53h1w96d"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/5813120ab674f6db7d0a486433d8faa6cfec1727/recipes/window-purpose"; + sha256 = "1y70jrba3gf9fyf2qdihfshbsblzb88yv9fkcswdzrpq5kmgwp84"; name = "window-purpose"; }; packageRequires = [ cl-lib emacs imenu-list let-alist ]; @@ -29379,26 +29776,6 @@ license = lib.licenses.free; }; }) {}; - wisp-mode = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "wisp-mode"; - version = "0.9.0"; - src = fetchhg { - url = "https://bitbucket.com/ArneBab/wisp"; - rev = "1b716d725f97"; - sha256 = "0ax5carrmrppy9q01ngj8c6bhx5wmsnmpac77da42s3ybglyzg16"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode"; - sha256 = "10zkp1qbvl8dmxij7zz4p1fixs3891xr1nr57vyb3llar9fgzglc"; - name = "wisp-mode"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/wisp-mode"; - license = lib.licenses.free; - }; - }) {}; wispjs-mode = callPackage ({ clojure-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wispjs-mode"; @@ -29759,12 +30136,12 @@ xquery-tool = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xquery-tool"; - version = "0.1.8"; + version = "0.1.9"; src = fetchFromGitHub { owner = "paddymcall"; repo = "xquery-tool.el"; - rev = "126164abeb77bd7932c73590939637895005c48b"; - sha256 = "1yy759qc4njc8bqh8hmgc0mq5vk5spz5syxgflqhjijk8nrvyfgl"; + rev = "68de7a26e589f5eab1929caeaa5dafffde362bef"; + sha256 = "1j11vnkva7c3rwzyfg467m7l437lb1rdfzarsgi33i225ai4c0hb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cc71e5ea4a0ecb006f62617f5b6caadc9b3c77b2/recipes/xquery-tool"; @@ -29843,12 +30220,12 @@ yafolding = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yafolding"; - version = "0.1.4"; + version = "0.3.1"; src = fetchFromGitHub { owner = "zenozeng"; repo = "yafolding.el"; - rev = "9b5a3f1b8dff6ddaf6369681820753afbbd1f388"; - sha256 = "1rplafm6mldsirj7xg66vsx03n263yii3il3fkws69xmv7sx1a6i"; + rev = "f0cc030ddd7ab53fbdf3cdb8b157d8cbcd6a08bd"; + sha256 = "0xwa490bl59bk0lpga6kag8gif9ln0g4hp42hryhjv5spvgzlsb8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/51bfd6465ee8ee553e8fd466a3bc4e65ab98faed/recipes/yafolding"; diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix index 20ac4f4c091d..0e90f7adf279 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix @@ -57,9 +57,6 @@ self: connection = markBroken super.connection; # upstream issue: missing file header - crux = markBroken super.crux; - - # upstream issue: missing file header dictionary = markBroken super.dictionary; easy-kill-extras = super.easy-kill-extras.override { @@ -135,10 +132,6 @@ self: # upstream issue: missing file header qiita = markBroken super.qiita; - spaceline = super.spaceline.override { - inherit (self.melpaPackages) powerline; - }; - # upstream issue: missing file header speech-tagger = markBroken super.speech-tagger; diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix index 253f23dfc51c..feab6f5cc565 100644 --- a/pkgs/applications/editors/emacs-modes/org-generated.nix +++ b/pkgs/applications/editors/emacs-modes/org-generated.nix @@ -1,10 +1,10 @@ { callPackage }: { org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org"; - version = "20160516"; + version = "20160725"; src = fetchurl { - url = "http://orgmode.org/elpa/org-20160516.tar"; - sha256 = "0zr87i55l92n1m8fgzvpdm40gh4fjwzsvgq47cmviqjr38kzdxv0"; + url = "http://orgmode.org/elpa/org-20160725.tar"; + sha256 = "1d2v6w93z543jnmz6a1kmp61rmznjnw6pvd9ia2pm42rzhsgydy5"; }; packageRequires = []; meta = { @@ -14,10 +14,10 @@ }) {}; org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org-plus-contrib"; - version = "20160516"; + version = "20160725"; src = fetchurl { - url = "http://orgmode.org/elpa/org-plus-contrib-20160516.tar"; - sha256 = "1g1a9qsn1i1fh5ppa2jimfqvzkd7rhq5a7xz73lkaw8j3niqy62s"; + url = "http://orgmode.org/elpa/org-plus-contrib-20160725.tar"; + sha256 = "0bxxbcln7npffvd947052sjp59ypxdfwkp2ja7mbs28pzzb25xxi"; }; packageRequires = []; meta = { diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index bc6f7fffeb3f..187480217ebd 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -31,7 +31,7 @@ let buildInputs = x.buildInputs ++ [ makeWrapper ]; installPhase = x.installPhase + '' wrapProgram "$out/bin/android-studio" \ - --set ANDROID_HOME "${androidsdk}/libexec/android-sdk-linux/" \ + --set ANDROID_HOME "${androidsdk}/libexec/" \ --set LD_LIBRARY_PATH "${stdenv.cc.cc.lib}/lib" # Gradle installs libnative-platform.so in ~/.gradle, that requires libstdc++.so.6 ''; }); diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix new file mode 100644 index 000000000000..d45fdc8e12d6 --- /dev/null +++ b/pkgs/applications/editors/kakoune/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, ncurses, boost, asciidoc, docbook_xsl, libxslt }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "kakoune-nightly-${version}"; + version = "2016-07-26"; + src = fetchFromGitHub { + repo = "kakoune"; + owner = "mawww"; + rev = "0d2c5072b083a893843e4fa87f9f702979069e14"; + sha256 = "01qqs5yr9xvvklg3gg45lgnyh6gji28m854mi1snzvjd7fksf50n"; + }; + buildInputs = [ ncurses boost asciidoc docbook_xsl libxslt ]; + + buildPhase = '' + sed -ie 's#--no-xmllint#--no-xmllint --xsltproc-opts="--nonet"#g' src/Makefile + export PREFIX=$out + (cd src && make ) + ''; + + installPhase = '' + (cd src && make install) + ''; + + meta = { + homepage = http://kakoune.org/; + description = "A vim inspired text editor"; + license = licenses.publicDomain; + maintainers = with maintainers; [ vrthra ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index 5e270d03a82f..62da04577f70 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -12,10 +12,10 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "nano-${version}"; - version = "2.6.1"; + version = "2.6.2"; src = fetchurl { url = "https://nano-editor.org/dist/v2.6/${name}.tar.gz"; - sha256 = "56f2ba1c532647bee36abd5f87a714400af0be084cf857a65bc8f41a0dc28fe5"; + sha256 = "11c9iqiah4q7q3ndn7z9192a796vp4fffkg27s6q1dn8avp06dj5"; }; nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; buildInputs = [ ncurses ]; diff --git a/pkgs/applications/editors/nedit/default.nix b/pkgs/applications/editors/nedit/default.nix index 56a8ac62025f..14220956698c 100644 --- a/pkgs/applications/editors/nedit/default.nix +++ b/pkgs/applications/editors/nedit/default.nix @@ -3,11 +3,11 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "nedit-5.6"; + name = "nedit-5.6a"; src = fetchurl { url = "mirror://sourceforge/nedit/nedit-source/${name}-src.tar.gz"; - sha256 = "023hwpqc57mnzvg6p7jda6193afgjzxzajlhwhqvk3jq2kdv6zna"; + sha256 = "1v8y8vwj3kn91crsddqkz843y6csgw7wkjnd3zdcb4bcrf1pjrsk"; }; buildInputs = [ xlibsWrapper motif libXpm ]; diff --git a/pkgs/applications/misc/catclock/default.nix b/pkgs/applications/misc/catclock/default.nix new file mode 100644 index 000000000000..8df06980b471 --- /dev/null +++ b/pkgs/applications/misc/catclock/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, xlibsWrapper, motif }: + +stdenv.mkDerivation rec { + name = "catclock-2015-10-04"; + + src = fetchFromGitHub { + owner = "BarkyTheDog"; + repo = "catclock"; + rev = "d20b8825b38477a144e8a2a4bbd4779adb3620ac"; + sha256 = "0fiv9rj8p8mifv24cxljdrrmh357q70zmzdci9bpbxnhs1gdpr63"; + }; + + preInstall = '' + mkdir -p $out/bin + mkdir -p $out/share/man/man1 + cp xclock.man $out/share/man/man1/xclock.1 + ''; + + makeFlags = [ + "DESTINATION=$(out)/bin/" + ]; + + buildInputs = [ xlibsWrapper motif ]; + + meta = with stdenv.lib; { + homepage = http://codefromabove.com/2014/05/catclock/; + license = with licenses; mit; + maintainers = with maintainers; [ ramkromberg ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix index c6aad7194a2b..2a6329b48d76 100644 --- a/pkgs/applications/misc/khard/default.nix +++ b/pkgs/applications/misc/khard/default.nix @@ -1,16 +1,20 @@ -{ stdenv, fetchurl, pkgs, python2Packages }: +{ stdenv, fetchurl, glibcLocales, python3Packages }: -python2Packages.buildPythonApplication rec { - version = "0.9.0"; +python3Packages.buildPythonApplication rec { + version = "0.11.1"; name = "khard-${version}"; namePrefix = ""; src = fetchurl { url = "https://github.com/scheibler/khard/archive/v${version}.tar.gz"; - sha256 = "1cj6rlvbk05cfjkl1lnyvq12sb847jjwqy5j8906p2b2x4wq72qi"; + sha256 = "0055xx9icmsr6l7v0iqrndmygygdpdv10550w6pyrb96svzhry27"; }; - propagatedBuildInputs = with python2Packages; [ + # setup.py reads the UTF-8 encoded readme. + LC_ALL = "en_US.UTF-8"; + buildInputs = [ glibcLocales ]; + + propagatedBuildInputs = with python3Packages; [ atomicwrites configobj vobject @@ -18,6 +22,9 @@ python2Packages.buildPythonApplication rec { pyyaml ]; + # Fails; but there are no tests anyway. + doCheck = false; + meta = { homepage = https://github.com/scheibler/khard; description = "Console carddav client"; diff --git a/pkgs/applications/misc/lenmus/default.nix b/pkgs/applications/misc/lenmus/default.nix index 976563d11856..b537c378a71f 100644 --- a/pkgs/applications/misc/lenmus/default.nix +++ b/pkgs/applications/misc/lenmus/default.nix @@ -7,20 +7,15 @@ stdenv.mkDerivation rec { name = "lenmus-${version}"; - version = "5.4.1"; + version = "5.4.2"; src = fetchFromGitHub { owner = "lenmus"; repo = "lenmus"; rev = "Release_${version}"; - sha256 = "03xar8x38x20cns2gnv34jp0hw0k16sa62kkfhka9iiiw90wfyrp"; + sha256 = "1n639xr1qxx6rhqs0c6sjxp3bv8cwkmw1vfk1cji7514gj2a9v3p"; }; - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace "DESTINATION \"/usr/share" "DESTINATION \"$out/share" - ''; - cmakeFlags = [ "-DCMAKE_INSALL_PREFIX=$out" ]; diff --git a/pkgs/applications/misc/monero/default.nix b/pkgs/applications/misc/monero/default.nix index 1fa5d1a28d57..7f4311c2f490 100644 --- a/pkgs/applications/misc/monero/default.nix +++ b/pkgs/applications/misc/monero/default.nix @@ -1,17 +1,21 @@ -{ stdenv, fetchurl, cmake, boost }: +{ stdenv, fetchFromGitHub, cmake, boost, miniupnpc, pkgconfig, unbound }: let - version = "0.8.8.4"; + version = "0.9.4"; in stdenv.mkDerivation { name = "monero-${version}"; - src = fetchurl { - url = "https://github.com/monero-project/bitmonero/archive/v${version}.tar.gz"; - sha256 = "0bbhqjjzh922aymjqrnl2hd3r8x6p7x5aa5jidv3l4d77drhlgzy"; + src = fetchFromGitHub { + owner = "monero-project"; + repo = "bitmonero"; + rev = "v${version}"; + sha256 = "1qzpy1mxz0ky6hfk1gf67ybbr9xy6p6irh6zwri35h1gb97sbc3c"; }; - buildInputs = [ cmake boost ]; + nativeBuildInputs = [ cmake pkgconfig ]; + + buildInputs = [ boost miniupnpc unbound ]; # these tests take a long time and don't # always complete in the build environment @@ -20,14 +24,17 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; doCheck = false; - checkTarget = "test-release"; # this would be the target installPhase = '' install -Dt "$out/bin/" \ - src/bitmonerod \ - src/connectivity_tool \ - src/simpleminer \ - src/simplewallet + bin/bitmonerod \ + bin/blockchain_converter \ + bin/blockchain_dump \ + bin/blockchain_export \ + bin/blockchain_import \ + bin/cn_deserialize \ + bin/simpleminer \ + bin/simplewallet ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/qtbitcointrader/default.nix b/pkgs/applications/misc/qtbitcointrader/default.nix index a8613f917ebf..3a2ec62222f0 100644 --- a/pkgs/applications/misc/qtbitcointrader/default.nix +++ b/pkgs/applications/misc/qtbitcointrader/default.nix @@ -16,11 +16,13 @@ stdenv.mkDerivation { postUnpack = "sourceRoot=\${sourceRoot}/src"; configurePhase = '' + runHook preConfigure qmake $qmakeFlags \ PREFIX=$out \ DESKTOPDIR=$out/share/applications \ ICONDIR=$out/share/pixmaps \ QtBitcoinTrader_Desktop.pro + runHook postConfigure ''; meta = with stdenv.lib; diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix index 194535c7314c..399951b6bfe3 100644 --- a/pkgs/applications/misc/rtv/default.nix +++ b/pkgs/applications/misc/rtv/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, pkgs, lib, python, pythonPackages }: pythonPackages.buildPythonApplication rec { - version = "1.9.0"; + version = "1.10.0"; name = "rtv-${version}"; src = fetchFromGitHub { owner = "michael-lazar"; repo = "rtv"; rev = "v${version}"; - sha256 = "18r3i2zlcprj6d4nzhhbd6sm1fs2x28924xsm6lcxa1643gkyb7i"; + sha256 = "1gm5jyqqssf69lfx0svhzsb9m0dffm6zsf9jqnwh6gjihfz25a45"; }; propagatedBuildInputs = with pythonPackages; [ @@ -18,6 +18,7 @@ pythonPackages.buildPythonApplication rec { praw kitchen python.modules.curses + praw ] ++ lib.optional (!pythonPackages.isPy3k) futures; meta = with lib; { diff --git a/pkgs/applications/misc/timewarrior/default.nix b/pkgs/applications/misc/timewarrior/default.nix index f49e6321caed..5864a07fde72 100644 --- a/pkgs/applications/misc/timewarrior/default.nix +++ b/pkgs/applications/misc/timewarrior/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "timewarrior-${version}"; - version = "0.9.5.alpha"; + version = "1.0.0.beta1"; enableParallelBuilding = true; src = fetchurl { url = "https://taskwarrior.org/download/timew-${version}.tar.gz"; - sha256 = "154d5sgxcmz1b7g401c7s6sf7pkk0hh74dx6rss3vkamsjc4wgl8"; + sha256 = "1gkh07mw8hiqslw8ps35r9lp5jbdy93s0sdrcbp34dd5h99qx587"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix index 9cd677f5d8d5..adc0c3c9fb63 100644 --- a/pkgs/applications/misc/xterm/default.nix +++ b/pkgs/applications/misc/xterm/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, xorg, ncurses, freetype, fontconfig, pkgconfig }: +{ stdenv, fetchurl, xorg, ncurses, freetype, fontconfig, pkgconfig +, enableDecLocator ? true +}: stdenv.mkDerivation rec { name = "xterm-325"; @@ -27,9 +29,8 @@ stdenv.mkDerivation rec { "--enable-doublechars" "--enable-luit" "--enable-mini-luit" - "--enable-dec-locator" "--with-tty-group=tty" - ]; + ] ++ stdenv.lib.optional enableDecLocator "--enable-dec-locator"; # Work around broken "plink.sh". NIX_LDFLAGS = "-lXmu -lXt -lICE -lX11 -lfontconfig"; diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix index 23ed0bc2c1ea..476137581cc8 100644 --- a/pkgs/applications/networking/browsers/midori/default.nix +++ b/pkgs/applications/networking/browsers/midori/default.nix @@ -1,20 +1,20 @@ { stdenv, fetchurl, cmake, pkgconfig, intltool, vala, makeWrapper , gtk3, webkitgtk, librsvg, libnotify, sqlite -, glib_networking, gsettings_desktop_schemas, libsoup +, glib_networking, gsettings_desktop_schemas, libsoup, pcre, gnome3 }: let - version = "0.5.8"; + version = "0.5.11"; in stdenv.mkDerivation rec { name = "midori-${version}"; - meta = { + meta = with stdenv.lib; { description = "Lightweight WebKitGTK+ web browser"; homepage = "http://midori-browser.org"; - license = stdenv.lib.licenses.lgpl21Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ raskin ]; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ raskin ramkromberg ]; }; src = fetchurl { @@ -23,21 +23,21 @@ stdenv.mkDerivation rec { "http://mirrors-ru.go-parts.com/blfs/conglomeration/midori/midori_${version}_all_.tar.bz2" ]; name = "midori_${version}_all_.tar.bz2"; - sha256 = "10ckm98rfqfbwr84b8mc1ssgj84wjgkr4dadvx2l7c64sigi66dg"; + sha256 = "0gcwqkcyliqz10i33ww3wl02mmfnl7jzl2d493l4l53ipsb1l6cn"; }; - sourceRoot = "."; - buildInputs = [ cmake pkgconfig intltool vala makeWrapper - webkitgtk librsvg libnotify sqlite gsettings_desktop_schemas - (libsoup.override {gnomeSupport = true;}) + webkitgtk librsvg libnotify sqlite gsettings_desktop_schemas pcre gnome3.gcr + (libsoup.override {gnomeSupport = true; valaSupport = true;}) ]; - cmakeFlags = '' - -DHALF_BRO_INCOM_WEBKIT2=ON - -DUSE_ZEITGEIST=OFF - ''; + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + "-DUSE_ZEITGEIST=OFF" + "-DHALF_BRO_INCOM_WEBKIT2=OFF" + "-DUSE_GTK3=1" + ]; NIX_LDFLAGS="-lX11"; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix index 574fd9efdd42..a2e98fb436ed 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix @@ -17,11 +17,11 @@ in stdenv.mkDerivation rec { name = "bluejeans-${version}"; - version = "2.160.63.8"; + version = "2.160.66.8"; src = fetchurl { url = "https://swdl.bluejeans.com/skinny/bjnplugin_${version}-1_amd64.deb"; - sha256 = "1sfz9xvvrbw7gg7fxxwg9wmgbxgv3fa14p7i4m85mg10l3qxaqfc"; + sha256 = "1wf9jgd2717gfzm2wb0hxj4i76kczhgnwfhhpiy15zkqdcsmczsr"; }; phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 2812be0f1721..cec8acb82ab4 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -2,7 +2,7 @@ , jinja2, pygments, pyyaml, pypeg2, gst-plugins-base, gst-plugins-good , gst-plugins-bad, gst-libav, wrapGAppsHook, glib_networking, makeQtWrapper }: -let version = "0.7.0"; in +let version = "0.8.1"; in buildPythonApplication rec { name = "qutebrowser-${version}"; @@ -10,7 +10,7 @@ buildPythonApplication rec { src = fetchurl { url = "https://github.com/The-Compiler/qutebrowser/releases/download/v${version}/${name}.tar.gz"; - sha256 = "17xvv4h86frcn7zmi0y9gjsz2cazlb59v3dqi9mdc11w00b1cqbn"; + sha256 = "18hj95pgybpavwwnyczh6s94spljfngz684y1jlhqnpbp14pkflh"; }; # Needs tox diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix index 89337901f97c..27c31443f120 100644 --- a/pkgs/applications/networking/cluster/mesos/default.nix +++ b/pkgs/applications/networking/cluster/mesos/default.nix @@ -48,6 +48,9 @@ in stdenv.mkDerivation rec { substituteInPlace 3rdparty/libprocess/3rdparty/stout/include/stout/posix/os.hpp \ --replace '"sh"' '"${bash}/bin/bash"' + substituteInPlace 3rdparty/libprocess/3rdparty/stout/include/stout/os/posix/shell.hpp \ + --replace '"sh"' '"${bash}/bin/bash"' + substituteInPlace 3rdparty/libprocess/3rdparty/stout/include/stout/os/posix/fork.hpp \ --replace '"sh"' '"${bash}/bin/bash"' diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index 5d92f7455d62..7293bae50a7a 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, dbus, gnutls, wxGTK30, libidn, tinyxml, gettext , pkgconfig, xdg_utils, gtk2, sqlite, pugixml, libfilezilla, nettle }: -let version = "3.19.0"; in +let version = "3.20.0"; in stdenv.mkDerivation { name = "filezilla-${version}"; src = fetchurl { url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2"; - sha256 = "0827z1jmn8pkzrcpjgh5yh2r23vgv73yb4rikraxa9i7l118g9l2"; + sha256 = "0clfw266c980w2kjl4xm56d80ixpv8lj675p58hv2bz70ihxpwaa"; }; configureFlags = [ diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index 00d472b11bcb..a714e3752c0d 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -2,14 +2,14 @@ , cyrus_sasl, gdbm, gpgme, kerberos, libidn, notmuch, openssl }: stdenv.mkDerivation rec { - version = "20160611"; + version = "20160723"; name = "neomutt-${version}"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = "neomutt-${version}"; - sha256 = "12487hydn9x1yyxzc0x7hssgjwji3i64glmbi7synjc8arfqc5zs"; + sha256 = "16xjyad435n03qvmqysgsf4k36cfcv2k4irg92ajhm4dbz9d9l3j"; }; buildInputs = diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index bf7c8f752450..32bd9e104677 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -11,7 +11,7 @@ assert withQt -> !withGtk && qt4 != null; with stdenv.lib; let - version = "2.0.4"; + version = "2.0.5"; variant = if withGtk then "gtk" else if withQt then "qt" else "cli"; in @@ -20,7 +20,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.bz2"; - sha256 = "19g11m8m8qd7dkcvcb27lyppklg608d9ap7wr3mr88clm4nwiacy"; + sha256 = "02xi3fz8blcz9cf75rs11g7bijk06wm45vpgnksp72c2609j9q0c"; }; buildInputs = [ diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix index 475d0ae466c3..4cd8c998d419 100644 --- a/pkgs/applications/networking/sync/unison/default.nix +++ b/pkgs/applications/networking/sync/unison/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation (rec { - name = "unison-2.48.3"; + name = "unison-2.48.4"; src = fetchurl { url = "http://www.seas.upenn.edu/~bcpierce/unison/download/releases/stable/${name}.tar.gz"; - sha256 = "10sln52rnnsj213jy3166m0q97qpwnrwl6mm529xfy10x3xkq3gl"; + sha256 = "30aa53cd671d673580104f04be3cf81ac1e20a2e8baaf7274498739d59e99de8"; }; buildInputs = [ ocaml makeWrapper ncurses ]; diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 4529cf3bd78a..2a02e0e657c8 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -1,13 +1,14 @@ -{ stdenv, fetchgit, go }: +{ stdenv, fetchFromGitHub, go }: stdenv.mkDerivation rec { - version = "0.14.0"; + version = "0.14.3"; name = "syncthing-${version}"; - src = fetchgit { - url = https://github.com/syncthing/syncthing; - rev = "refs/tags/v${version}"; - sha256 = "15l3q3r6i3q95i474winswx4y149b5ic7xhpnj52s78fxd4va2q2"; + src = fetchFromGitHub { + owner = "syncthing"; + repo = "syncthing"; + rev = "v${version}"; + sha256 = "114i0911h3q6dn3j9x2qcm5lzpqclvrpf5vk87qpqp9qy62jp3az"; }; buildInputs = [ go ]; @@ -32,7 +33,7 @@ stdenv.mkDerivation rec { homepage = https://www.syncthing.net/; description = "Open Source Continuous File Synchronization"; license = stdenv.lib.licenses.mpl20; - maintainers = with stdenv.lib.maintainers; [pshendry]; + maintainers = with stdenv.lib.maintainers; [ pshendry joko peterhoeg ]; platforms = with stdenv.lib.platforms; linux ++ freebsd ++ openbsd ++ netbsd; }; } diff --git a/pkgs/applications/networking/syncthing/inotify-deps.json b/pkgs/applications/networking/syncthing/inotify-deps.json new file mode 100644 index 000000000000..e0cc9680e228 --- /dev/null +++ b/pkgs/applications/networking/syncthing/inotify-deps.json @@ -0,0 +1,38 @@ +[ + { + "goPackagePath": "github.com/cenkalti/backoff", + "fetch": { + "type": "git", + "url": "https://github.com/cenkalti/backoff", + "rev": "cdf48bbc1eb78d1349cbda326a4a037f7ba565c6", + "sha256": "0dg7hvpv0a1db8qriygz1jqgp16v8k505b197x9902z7z6lldgbh" + } + }, + { + "goPackagePath": "github.com/gobwas/glob", + "fetch": { + "type": "git", + "url": "https://github.com/gobwas/glob", + "rev": "ce6abff51712df5da11095fb41dd4b0353559797", + "sha256": "1gxv4nnn3f9hw1ncdmhsr8fbfdma2h713ima7b4k28gxydfa8i9m" + } + }, + { + "goPackagePath": "github.com/syncthing/syncthing", + "fetch": { + "type": "git", + "url": "https://github.com/syncthing/syncthing", + "rev": "66a506e72b9dcc749d09a03cb120ba86bbf3d7f8", + "sha256": "0is4f1r3im2bbmbca9fafzxffikxaf86vd6f851831fk5wi4pzw9" + } + }, + { + "goPackagePath": "github.com/zillode/notify", + "fetch": { + "type": "git", + "url": "https://github.com/zillode/notify", + "rev": "2da5cc9881e8f16bab76b63129c7781898f97d16", + "sha256": "0qwsj730p5mivp2xw9zr5vq8xr7rr9cxjmi564wgmsn7dcvqnr40" + } + } +] \ No newline at end of file diff --git a/pkgs/applications/networking/syncthing/inotify.nix b/pkgs/applications/networking/syncthing/inotify.nix new file mode 100644 index 000000000000..4f001794e86d --- /dev/null +++ b/pkgs/applications/networking/syncthing/inotify.nix @@ -0,0 +1,26 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "syncthing-inotify-${version}"; + version = "0.8.3"; + + goPackagePath = "github.com/syncthing/syncthing-inotify"; + + src = fetchFromGitHub { + owner = "syncthing"; + repo = "syncthing-inotify"; + rev = "v${version}"; + sha256 = "194pbz9zzxaz0vri93czpbsxl85znlba2gy61mjgyr0dm2h4s6yw"; + }; + + goDeps = ./inotify-deps.json; + + meta = { + homepage = https://github.com/syncthing/syncthing-inotify; + description = "File watcher intended for use with Syncthing"; + license = stdenv.lib.licenses.mpl20; + maintainers = with stdenv.lib.maintainers; [ joko ]; + platforms = with stdenv.lib.platforms; linux ++ freebsd ++ openbsd ++ netbsd; + }; + +} diff --git a/pkgs/applications/science/electronics/alliance/default.nix b/pkgs/applications/science/electronics/alliance/default.nix index ee22c66dfec0..ee01643d85ea 100644 --- a/pkgs/applications/science/electronics/alliance/default.nix +++ b/pkgs/applications/science/electronics/alliance/default.nix @@ -1,23 +1,74 @@ -{stdenv, fetchurl, xproto, motif, libX11, libXt, libXpm, bison, flex}: +{ stdenv, fetchurl +, xproto, motif, libX11, libXt, libXpm, bison +, flex, automake, autoconf, libtool +}: -stdenv.mkDerivation { - name = "alliance-5.0-20070718"; +stdenv.mkDerivation rec { + name = "alliance-${version}"; + version = "5.1.1"; src = fetchurl { - url = http://www-asim.lip6.fr/pub/alliance/distribution/5.0/alliance-5.0-20070718.tar.gz; - sha256 = "4e17c8f9f4d344061166856d47e58527c6ae870fda0c73b5ba0200967d23af9f"; + url = "http://www-asim.lip6.fr/pub/alliance/distribution/5.0/${name}.tar.bz2"; + sha256 = "046c9qwl1vbww0ljm4xyxf5jpz9nq62b2q0wdz9xjimgh4c207w1"; }; - buildInputs = [ xproto motif xproto libX11 libXt libXpm bison flex]; - patchPhase = '' - sed -i -e \ - "s/private: static void operator delete/public: static void operator delete/" \ - nero/src/ADefs.h + nativeBuildInputs = [ libtool automake autoconf flex ]; + buildInputs = [ xproto motif xproto libX11 libXt libXpm bison ]; + + sourceRoot = "alliance/src/"; + + configureFlags = [ + "--prefix=$(out)" + "--disable-static" + ]; + + preConfigure = '' + mkdir -p $out/etc + + #texlive for docs seems extreme + mkdir -p $out/share/alliance + mv ./documentation $out/share/alliance + substituteInPlace autostuff \ + --replace "$newdirs documentation" "$newdirs" \ + --replace documentation Solaris + + substituteInPlace sea/src/DEF_grammar_lex.l \ + --replace "ifndef FLEX_BETA" "if (YY_FLEX_MAJOR_VERSION <= 2) && (YY_FLEX_MINOR_VERSION < 6)" + ./autostuff + ''; + + allianceInstaller = '' + #!${stdenv.shell} + cp -v -r -n --no-preserve=mode $out/etc/* /etc/ > /etc/alliance-install.log + ''; + + allianceUnInstaller = '' + #!${stdenv.shell} + awk '{print \$3}' /etc/alliance-install.log | xargs rm + awk '{print \$3}' /etc/alliance-install.log | xargs rmdir + rm /etc/alliance-install.log + ''; + + postInstall = '' + sed -i "s|ALLIANCE_TOP|$out|" distrib/*.desktop + mkdir -p $out/share/applications + cp -p distrib/*.desktop $out/share/applications/ + mkdir -p $out/icons/hicolor/48x48/apps/ + cp -p distrib/*.png $out/icons/hicolor/48x48/apps/ + + echo "${allianceInstaller}" > $out/bin/alliance-install + chmod +x $out/bin/alliance-install + + echo "${allianceUnInstaller}" > $out/bin/alliance-uninstall + chmod +x $out/bin/alliance-uninstall ''; - meta = { - description = "Complete set of free CAD tools and portable libraries for VLSI design"; - homepage = http://www-asim.lip6.fr/recherche/alliance/; + meta = with stdenv.lib; { + description = "Complete set of free CAD tools and portable libraries for VLSI design"; + homepage = http://www-asim.lip6.fr/recherche/alliance/; + license = with licenses; gpl2Plus; + maintainers = with maintainers; [ ]; + platforms = with platforms; linux; }; } diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix index 26ed355da394..bc391c47b8bc 100644 --- a/pkgs/applications/science/logic/hol_light/default.nix +++ b/pkgs/applications/science/logic/hol_light/default.nix @@ -9,19 +9,17 @@ let in stdenv.mkDerivation { - name = "hol_light-2015-11-02"; + name = "hol_light-2016-07-23"; src = fetchFromGitHub { owner = "jrh13"; repo = "hol-light"; - rev = "10265313397476ddff4ce13e7bbb588025e7272c"; - sha256 = "17b6a7vk9fhppl0h366y7pw6a9sknq1a8gxqg67dzqpb47vda1n0"; + rev = "67cff936dda719f0e0ee57ab9d07c779ff664660"; + sha256 = "0r85ifdvsvk2cdv7s4a0kf9ha6jdznqmz7swvp577f8r182klr28"; }; buildInputs = [ ocaml camlp5 ]; - patches = [ ./Makefile.patch ]; - installPhase = '' mkdir -p "$out/lib/hol_light" "$out/bin" cp -a . $out/lib/hol_light diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index 92c306c40827..3bc1441212ee 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchFromGitHub, cmake, gmp, mpfr, luajit, boost, python +{ stdenv, fetchFromGitHub, cmake, gmp, mpfr, boost, python , gperftools, ninja, makeWrapper }: stdenv.mkDerivation rec { name = "lean-${version}"; - version = "20160117"; + version = "2016-07-05"; src = fetchFromGitHub { owner = "leanprover"; repo = "lean"; - rev = "b2554dcb8f45899ccce84f226cd67b6460442930"; - sha256 = "1gr024bly92kdjky5qvcm96gn86ijakziiyrsz91h643n1iyxhms"; + rev = "cc70845332e63a1f1be21dc1f96d17269fc85909"; + sha256 = "09qz2vjw7whiggvw0cdaa4i2f49wnch2sd4r43glq181ssln27d6"; }; - buildInputs = [ gmp mpfr luajit boost cmake python gperftools ninja makeWrapper ]; + buildInputs = [ gmp mpfr boost cmake python gperftools ninja makeWrapper ]; enableParallelBuilding = true; preConfigure = '' @@ -26,11 +26,11 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/linja --prefix PATH : $out/bin:${ninja}/bin ''; - meta = { + meta = with stdenv.lib; { description = "Automatic and interactive theorem prover"; homepage = "http://leanprover.github.io"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ thoughtpolice gebner ]; }; } diff --git a/pkgs/applications/science/logic/leo2/default.nix b/pkgs/applications/science/logic/leo2/default.nix index da4517cd6b02..e30895346258 100644 --- a/pkgs/applications/science/logic/leo2/default.nix +++ b/pkgs/applications/science/logic/leo2/default.nix @@ -1,64 +1,37 @@ -x@{builderDefsPackage - , ocaml, eprover, zlib - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - ["eprover"]; +{ stdenv, fetchurl, makeWrapper, eprover, ocaml, perl, zlib }: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - baseName="leo2"; - version = "1.6.2"; - name="${baseName}_v${version}"; +stdenv.mkDerivation rec { + name = "leo2-${version}"; + version = "1.6.2"; + + src = fetchurl { url = "http://page.mi.fu-berlin.de/cbenzmueller/leo/leo2_v${version}.tgz"; - hash="d46a94f5991623386eb9061cfb0d748e258359a8c690fded173d35303e0e9e3a"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; sha256 = "1wjpmizb181iygnd18lx7p77fwaci2clgzs5ix5j51cc8f3pazmv"; }; - name = "${sourceInfo.baseName}-${sourceInfo.version}"; - inherit buildInputs; + buildInputs = [ makeWrapper eprover ocaml perl zlib ]; - phaseNames = ["makeInstallationDir" "doUnpack" "doMake" "doFinalize"]; + sourceRoot = "leo2/src"; - makeInstallationDir = a.fullDepEntry ('' - mkdir -p "$out/share/leo2/build-dir" - cd "$out/share/leo2/build-dir" - '') ["minInit" "defEnsureDir"]; + preConfigure = "patchShebangs configure"; - goSrcDir = "cd src/"; + buildFlags = [ "opt" ]; - doFinalize = a.fullDepEntry ('' - mkdir -p "$out/bin" - echo -e "#! /bin/sh\\n$PWD/../bin/leo --atprc $out/etc/leoatprc \"\$@\"\\n" > "$out/bin/leo" - chmod a+x "$out/bin/leo" + preInstall = "mkdir -p $out/bin"; + + postInstall = '' mkdir -p "$out/etc" echo -e "e = ${eprover}/bin/eprover\\nepclextract = ${eprover}/bin/epclextract" > "$out/etc/leoatprc" - '') ["minInit" "doMake" "defEnsureDir"]; - makeFlags = [ - "SHELL=${a.stdenv.shell}" - ]; + wrapProgram $out/bin/leo \ + --add-flags "--atprc $out/etc/leoatprc" + ''; - meta = { + meta = with stdenv.lib; { description = "A high-performance typed higher order prover"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; - license = a.lib.licenses.bsd3; - inherit (sourceInfo) version; - homepage = "http://page.mi.fu-berlin.de/cbenzmueller/leo/"; - downloadPage = "http://page.mi.fu-berlin.de/cbenzmueller/leo/download.html"; + maintainers = [ maintainers.raskin ]; + platforms = platforms.linux; + license = licenses.bsd3; + homepage = http://www.leoprover.org/; }; -}) x - +} diff --git a/pkgs/applications/science/math/scilab-bin/default.nix b/pkgs/applications/science/math/scilab-bin/default.nix new file mode 100644 index 000000000000..f6e255ee46e4 --- /dev/null +++ b/pkgs/applications/science/math/scilab-bin/default.nix @@ -0,0 +1,75 @@ +{ stdenv, fetchurl, lib, xlibs }: + +let + name = "scilab-bin-${ver}"; + + ver = "5.5.2"; + + majorVer = builtins.elemAt (lib.splitString "." ver) 0; + + badArch = throw "${name} requires i686-linux or x86_64-linux"; + + architecture = + if stdenv.system == "i686-linux" then + "i686" + else if stdenv.system == "x86_64-linux" then + "x86_64" + else + badArch; +in +stdenv.mkDerivation rec { + inherit name; + + src = fetchurl { + url = "http://www.scilab.org/download/${ver}/scilab-${ver}.bin.linux-${architecture}.tar.gz"; + sha256 = + if stdenv.system == "i686-linux" then + "6143a95ded40411a35630a89b365875a6526cd4db1e2865ac5612929a7db937a" + else if stdenv.system == "x86_64-linux" then + "c0dd7a5f06ec7a1df7a6b1b8b14407ff7f45e56821dff9b3c46bd09d4df8d350" + else + badArch; + }; + + libPath = lib.makeLibraryPath [ + stdenv.cc.cc + xlibs.libX11 + xlibs.libXext + xlibs.libXi + xlibs.libXrender + xlibs.libXtst + xlibs.libXxf86vm + ]; + + phases = [ "unpackPhase" "fixupPhase" "installPhase" ]; + + fixupPhase = '' + sed -i 's|\$(/bin/|$(|g' bin/scilab + sed -i 's|/usr/bin/||g' bin/scilab + + sci="$out/opt/scilab-${ver}" + fullLibPath="$sci/lib/scilab:$sci/lib/thirdparty:$libPath" + fullLibPath="$fullLibPath:$sci/lib/thirdparty/redist" + + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --set-rpath "$fullLibPath" bin/scilab-bin + find . -name '*.so' -type f | while read file; do + patchelf --set-rpath "$fullLibPath" "$file" 2>/dev/null + done + ''; + + installPhase = '' + mkdir -p "$out/opt/scilab-${ver}" + cp -r . "$out/opt/scilab-${ver}/" + mkdir "$out/bin" + ln -s "$out/opt/scilab-${ver}/bin/scilab" "$out/bin/scilab-${ver}" + ln -s "scilab-${ver}" "$out/bin/scilab-${majorVer}" + ''; + + meta = { + homepage = http://www.scilab.org/; + description = "Scientific software package for numerical computations (Matlab lookalike)"; + # see http://www.scilab.org/legal_notice + license = "Scilab"; + }; +} diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 0ccfbb1e557e..855766cace7c 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -1,16 +1,23 @@ { stdenv, fetchurl, fetchpatch, cmake, pkgconfig, python -, libX11, libXpm, libXft, libXext, zlib, lzma }: +, libX11, libXpm, libXft, libXext, zlib, lzma, gsl }: stdenv.mkDerivation rec { name = "root-${version}"; - version = "6.04.16"; + version = "6.04.18"; src = fetchurl { url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; - sha256 = "0f58dg83aqhggkxmimsfkd1qyni2vhmykq4qa89cz6jr9p73i1vm"; + sha256 = "00f3v3l8nimfkcxpn9qpyh3h23na0mi4wkds2y5gwqh8wh3jryq9"; }; - buildInputs = [ cmake pkgconfig python libX11 libXpm libXft libXext zlib lzma ]; + buildInputs = [ cmake pkgconfig python libX11 libXpm libXft libXext zlib lzma gsl ]; + + patches = [ + (fetchpatch { + url = "https://github.com/root-mirror/root/commit/ee9964210c56e7c1868618a4434c5340fef38fe4.patch"; + sha256 = "186i7ni75yvjydy6lpmaplqxfb5z2019bgpbhff1n6zn2qlrff2r"; + }) + ]; preConfigure = '' patchShebangs build/unix/ @@ -23,6 +30,8 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include"; + enableParallelBuilding = true; + meta = { homepage = "https://root.cern.ch/"; description = "A data analysis framework"; diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 54b51f010f47..9296ad80ca24 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -15,6 +15,7 @@ let perlPackages.MIMEBase64 perlPackages.AuthenSASL perlPackages.DigestHMAC ]; + gitwebPerlLibs = with perlPackages; [ CGI HTMLParser ]; }; in diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 17a5e3b394b9..501922f18146 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -2,7 +2,7 @@ , gnugrep, gzip, openssh , asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45 , libxslt, tcl, tk, makeWrapper, libiconv -, svnSupport, subversionClient, perlLibs, smtpPerlLibs +, svnSupport, subversionClient, perlLibs, smtpPerlLibs, gitwebPerlLibs , guiSupport , withManual ? true , pythonSupport ? true @@ -10,7 +10,7 @@ }: let - version = "2.9.1"; + version = "2.9.2"; svn = subversionClient.override { perlBindings = true; }; in @@ -19,7 +19,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "18l2jb4bkp9ljz6p2aviwzxqyzza9z3v6h1pnkz7kjf1fay61zp8"; + sha256 = "1d9dmhgzcnwc2jbib4q23ypjbnw1gh1w8gif63qldwkpixj4dxgq"; }; hardeningDisable = [ "format" ]; @@ -104,6 +104,11 @@ stdenv.mkDerivation { # gitweb.cgi, need to patch so that it's found sed -i -e "s|'compressor' => \['gzip'|'compressor' => ['${gzip}/bin/gzip'|" \ $out/share/gitweb/gitweb.cgi + # Give access to CGI.pm and friends (was removed from perl core in 5.22) + for p in ${stdenv.lib.concatStringsSep " " gitwebPerlLibs}; do + sed -i -e "/use CGI /i use lib \"$p/lib/perl5/site_perl\";" \ + "$out/share/gitweb/gitweb.cgi" + done # Also put git-http-backend into $PATH, so that we can use smart # HTTP(s) transports for pushing diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index 3da377414d41..99e45438984d 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, itstool, buildPythonApplication, python27, intltool, makeWrapper -, libxml2, pygobject3, gobjectIntrospection, gtk3, gnome3, pycairo, cairo +{ stdenv, fetchurl, itstool, buildPythonApplication, python27, intltool, wrapGAppsHook +, libxml2, pygobject3, gobjectIntrospection, gtk3, gnome3, pycairo, cairo, file }: let minor = "3.16"; - version = "${minor}.1"; + version = "${minor}.2"; in buildPythonApplication rec { @@ -14,13 +14,13 @@ buildPythonApplication rec { src = fetchurl { url = "mirror://gnome/sources/meld/${minor}/meld-${version}.tar.xz"; - sha256 = "1bec697aa1ababa315ca8241ade65dc68ea87f0d316632f590975afcf967cfab"; + sha256 = "2dd3f58b95444bf721e0c912668c29cf8f47a402440b772ea12c4b9a0c94966f"; }; buildInputs = [ - python27 intltool makeWrapper itstool libxml2 + python27 intltool wrapGAppsHook itstool libxml2 gnome3.gtksourceview gnome3.gsettings_desktop_schemas pycairo cairo - gnome3.defaultIconTheme + gnome3.defaultIconTheme gnome3.dconf file ]; propagatedBuildInputs = [ gobjectIntrospection pygobject3 gtk3 ]; @@ -37,13 +37,6 @@ buildPythonApplication rec { mv $out/share/glib-2.0 $out/share/gsettings-schemas/$name/ ''; - preFixup = '' - wrapProgram $out/bin/meld \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share" \ - --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules" - ''; - patchPhase = '' patchShebangs bin/meld ''; diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 69e52065419a..9037e7bd6c8c 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -10,13 +10,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "mkvtoolnix-${version}"; - version = "9.2.0"; + version = "9.3.1"; src = fetchFromGitHub { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "02w3161iqaijs3bz5w2wily9nz55xnhq1bdm2s5qi8v3sbcqd6df"; + sha256 = "1vipznja07nr7gmzdbv93dv2ggmw4x1bh6xxnn13k3fk6ysqh163"; }; nativeBuildInputs = [ pkgconfig autoconf automake gettext ruby ]; diff --git a/pkgs/build-support/fetchpatch/default.nix b/pkgs/build-support/fetchpatch/default.nix index 60785f42b543..a6ddf132cd5b 100644 --- a/pkgs/build-support/fetchpatch/default.nix +++ b/pkgs/build-support/fetchpatch/default.nix @@ -4,8 +4,8 @@ # often change with updating of git or cgit. # stripLen acts as the -p parameter when applying a patch. -{ fetchurl, patchutils }: -{ stripLen ? 0, ... }@args: +{ lib, fetchurl, patchutils }: +{ stripLen ? 0, addPrefixes ? false, ... }@args: fetchurl ({ postFetch = '' @@ -16,8 +16,12 @@ fetchurl ({ "${patchutils}/bin/filterdiff" \ --include={} \ --strip=${toString stripLen} \ + ${lib.optionalString addPrefixes '' + --addoldprefix=a/ \ + --addnewprefix=b/ \ + ''} \ --clean "$out" > "$tmpfile" mv "$tmpfile" "$out" ${args.postFetch or ""} ''; -} // builtins.removeAttrs args ["stripLen"]) +} // builtins.removeAttrs args ["stripLen" "addPrefixes"]) diff --git a/pkgs/build-support/release/ant-build.nix b/pkgs/build-support/release/ant-build.nix index 06875f6b7654..c77db30a81ce 100644 --- a/pkgs/build-support/release/ant-build.nix +++ b/pkgs/build-support/release/ant-build.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation ( postPhases = ["generateWrappersPhase" "finalPhase"]; - prePhases = + prePhases = ["antSetupPhase"]; antSetupPhase = with stdenv.lib; '' @@ -41,8 +41,10 @@ stdenv.mkDerivation ( ''; installPhase = '' + runHook preInstall + mkdir -p $out/share/java - ${ if jars == [] then '' + ${ if jars == [] then '' find . -name "*.jar" | xargs -I{} cp -v {} $out/share/java '' else stdenv.lib.concatMapStrings (j: '' cp -v ${j} $out/share/java @@ -53,13 +55,15 @@ stdenv.mkDerivation ( canonicalizeJar $j echo file jar $j >> $out/nix-support/hydra-build-products done + + runHook postInstall ''; - generateWrappersPhase = - let + generateWrappersPhase = + let cp = w: "-cp '${lib.optionalString (w ? classPath) w.classPath}${lib.optionalString (w ? mainClass) ":$out/share/java/*"}'"; in - '' + '' header "Generating jar wrappers" '' + (stdenv.lib.concatMapStrings (w: '' @@ -75,15 +79,19 @@ stdenv.mkDerivation ( closeNest ''; - buildPhase = if antTargets == [] then '' + buildPhase = '' + runHook preBuild + '' + (if antTargets == [] then '' header "Building default ant target" ant ${antFlags} closeNest '' else stdenv.lib.concatMapStrings (t: '' header "Building '${t}' target" - ant ${antFlags} ${t} + ant ${antFlags} ${t} closeNest - '') antTargets; + '') antTargets) + '' + runHook postBuild + ''; finalPhase = '' @@ -95,11 +103,11 @@ stdenv.mkDerivation ( ''; } - // removeAttrs args ["antProperties" "buildInputs" "pkgs" "jarWrappers"] // + // removeAttrs args ["antProperties" "buildInputs" "pkgs" "jarWrappers"] // { name = name + (if src ? version then "-" + src.version else ""); - + buildInputs = [ant jre zip unzip] ++ stdenv.lib.optional (args ? buildInputs) args.buildInputs ; postHook = '' @@ -109,6 +117,6 @@ stdenv.mkDerivation ( origSrc=$src src=$(findTarball $src) - ''; + ''; } ) diff --git a/pkgs/data/fonts/hasklig/default.nix b/pkgs/data/fonts/hasklig/default.nix index d2de6f63be3a..3b5aff984e42 100644 --- a/pkgs/data/fonts/hasklig/default.nix +++ b/pkgs/data/fonts/hasklig/default.nix @@ -1,11 +1,12 @@ {stdenv, fetchurl, unzip}: -stdenv.mkDerivation { - name = "hasklig-0.4"; +stdenv.mkDerivation rec { + name = "hasklig-${version}"; + version = "0.9"; src = fetchurl { - url = "https://github.com/i-tu/Hasklig/releases/download/0.4/Hasklig-0.4.zip"; - sha256 = "14j0zfapw6s6x5psp1rvx2i59rxdwb1jgwfgfhzhypr22qy40xi8"; + url = "https://github.com/i-tu/Hasklig/releases/download/${version}/Hasklig-${version}.zip"; + sha256 = "0rav55f6j1b8pqjgwvw52b92j2m630ampamlsiiym2xf684wnw2d"; }; buildInputs = [ unzip ]; @@ -24,6 +25,6 @@ stdenv.mkDerivation { description = "A font with ligatures for Haskell code based off Source Code Pro"; license = licenses.ofl; platforms = platforms.all; - maintainers = with maintainers; [ davidrusu ]; + maintainers = with maintainers; [ davidrusu profpatsch ]; }; } diff --git a/pkgs/desktops/gnome-3/3.18/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/3.18/apps/accerciser/default.nix deleted file mode 100644 index a2813e0581b3..000000000000 --- a/pkgs/desktops/gnome-3/3.18/apps/accerciser/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, itstool, libxml2, python3, python3Packages, pyatspi, at_spi2_core -, dbus, intltool, libwnck3 }: - -stdenv.mkDerivation rec { - name = "accerciser-3.14.0"; - - src = fetchurl { - url = "mirror://gnome/sources/accerciser/3.14/${name}.tar.xz"; - sha256 = "0x05gpajpcs01g7m34g6fxz8122cf9kx3k0lchwl34jy8xfr39gm"; - }; - - buildInputs = [ - pkgconfig gtk3 wrapGAppsHook itstool libxml2 python3 pyatspi - python3Packages.pygobject3 python3Packages.ipython - at_spi2_core dbus intltool libwnck3 gnome3.defaultIconTheme - ]; - - wrapPrefixVariables = [ "PYTHONPATH" ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Accerciser; - description = "Interactive Python accessibility explorer"; - maintainers = gnome3.maintainers; - license = licenses.bsd3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/apps/bijiben/default.nix b/pkgs/desktops/gnome-3/3.18/apps/bijiben/default.nix deleted file mode 100644 index 00895f9a2bb2..000000000000 --- a/pkgs/desktops/gnome-3/3.18/apps/bijiben/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig, glib -, evolution_data_server, evolution, sqlite -, makeWrapper, itstool, desktop_file_utils -, clutter_gtk, libuuid, webkitgtk, zeitgeist -, gnome3, librsvg, gdk_pixbuf, libxml2 }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - doCheck = true; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ pkgconfig glib intltool itstool libxml2 - clutter_gtk libuuid webkitgtk gnome3.tracker - gnome3.gnome_online_accounts zeitgeist desktop_file_utils - gnome3.gsettings_desktop_schemas makeWrapper - gdk_pixbuf gnome3.defaultIconTheme librsvg - evolution_data_server evolution sqlite ]; - - enableParallelBuilding = true; - - preFixup = '' - wrapProgram "$out/bin/bijiben" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Bijiben; - description = "Note editor designed to remain simple to use"; - maintainers = gnome3.maintainers; - license = licenses.gpl3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/apps/bijiben/src.nix b/pkgs/desktops/gnome-3/3.18/apps/bijiben/src.nix deleted file mode 100644 index 7c30c037d8c0..000000000000 --- a/pkgs/desktops/gnome-3/3.18/apps/bijiben/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "bijiben-3.18.2"; - - src = fetchurl { - url = mirror://gnome/sources/bijiben/3.18/bijiben-3.18.2.tar.xz; - sha256 = "45fed3242ba092138760b99e725f0a4d3c8d749ef37c607d43c8f010e11a645d"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/apps/cheese/default.nix b/pkgs/desktops/gnome-3/3.18/apps/cheese/default.nix deleted file mode 100644 index b5f70d84e520..000000000000 --- a/pkgs/desktops/gnome-3/3.18/apps/cheese/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, intltool, fetchurl, wrapGAppsHook, gnome-video-effects, libcanberra_gtk3 -, pkgconfig, gtk3, glib, clutter_gtk, clutter-gst, udev, gst_all_1, itstool -, libgudev -, adwaita-icon-theme, librsvg, gdk_pixbuf, gnome3, gnome_desktop, libxml2 }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ pkgconfig gtk3 glib intltool wrapGAppsHook gnome-video-effects itstool - gdk_pixbuf adwaita-icon-theme librsvg udev gst_all_1.gstreamer libxml2 - gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gnome_desktop - gst_all_1.gst-plugins-bad clutter_gtk clutter-gst - libcanberra_gtk3 libgudev ]; - - enableParallelBuilding = true; - - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Cheese; - description = "Take photos and videos with your webcam, with fun graphical effects"; - maintainers = gnome3.maintainers; - license = licenses.gpl3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/apps/cheese/src.nix b/pkgs/desktops/gnome-3/3.18/apps/cheese/src.nix deleted file mode 100644 index 588ccb4e4fb4..000000000000 --- a/pkgs/desktops/gnome-3/3.18/apps/cheese/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "cheese-3.18.1"; - - src = fetchurl { - url = mirror://gnome/sources/cheese/3.18/cheese-3.18.1.tar.xz; - sha256 = "fc9d8798b1f0c6b35731f063869a32c6910bab6d0386b9ea36386ebda0d57177"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/apps/evolution/default.nix b/pkgs/desktops/gnome-3/3.18/apps/evolution/default.nix deleted file mode 100644 index 100dfbf3acec..000000000000 --- a/pkgs/desktops/gnome-3/3.18/apps/evolution/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ stdenv, intltool, fetchurl, libxml2, webkitgtk, highlight -, pkgconfig, gtk3, glib, libnotify, gtkspell3 -, makeWrapper, itstool, shared_mime_info, libical, db, gcr, sqlite -, gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu, libtool -, libcanberra_gtk3, bogofilter, gst_all_1, procps, p11_kit }: - -let - majVer = gnome3.version; -in stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - doCheck = true; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - propagatedBuildInputs = [ gnome3.gtkhtml ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 libtool - gdk_pixbuf gnome3.defaultIconTheme librsvg db icu - gnome3.evolution_data_server libsecret libical gcr - webkitgtk shared_mime_info gnome3.gnome_desktop gtkspell3 - libcanberra_gtk3 bogofilter gnome3.libgdata sqlite - gst_all_1.gstreamer gst_all_1.gst-plugins-base p11_kit - nss nspr libnotify procps highlight gnome3.libgweather - gnome3.gsettings_desktop_schemas makeWrapper ]; - - configureFlags = [ "--disable-spamassassin" "--disable-pst-import" "--disable-autoar" - "--disable-libcryptui" ]; - - NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0"; - - enableParallelBuilding = true; - - preFixup = '' - for f in $out/bin/* $out/libexec/*; do - wrapProgram "$f" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - done - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Evolution; - description = "Personal information management application that provides integrated mail, calendaring and address book functionality"; - maintainers = gnome3.maintainers; - license = licenses.lgpl2Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/apps/evolution/src.nix b/pkgs/desktops/gnome-3/3.18/apps/evolution/src.nix deleted file mode 100644 index 81bbd443e967..000000000000 --- a/pkgs/desktops/gnome-3/3.18/apps/evolution/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "evolution-3.18.4"; - - src = fetchurl { - url = mirror://gnome/sources/evolution/3.18/evolution-3.18.4.tar.xz; - sha256 = "8161a0ebc77e61904dfaca9745595fefbf84d834a07ee1132d1f8d030dabfefb"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/3.18/apps/file-roller/default.nix deleted file mode 100644 index d5b2558cf707..000000000000 --- a/pkgs/desktops/gnome-3/3.18/apps/file-roller/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, glib, pkgconfig, gnome3, intltool, itstool, libxml2, libarchive -, attr, bzip2, acl, wrapGAppsHook, librsvg, libnotify, gdk_pixbuf }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - - buildInputs = [ glib gnome3.gtk intltool itstool libxml2 libarchive libnotify - gnome3.defaultIconTheme attr bzip2 acl gdk_pixbuf librsvg - gnome3.dconf ]; - - installFlags = [ "nautilus_extensiondir=$(out)/lib/nautilus/extensions-3.0" ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/FileRoller; - description = "Archive manager for the GNOME desktop environment"; - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/apps/file-roller/src.nix b/pkgs/desktops/gnome-3/3.18/apps/file-roller/src.nix deleted file mode 100644 index 3e166f996e91..000000000000 --- a/pkgs/desktops/gnome-3/3.18/apps/file-roller/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "file-roller-3.16.4"; - - src = fetchurl { - url = mirror://gnome/sources/file-roller/3.16/file-roller-3.16.4.tar.xz; - sha256 = "5455980b2c9c7eb063d2d65560ae7ab2e7f01b208ea3947e151680231c7a4185"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/apps/gedit/default.nix b/pkgs/desktops/gnome-3/3.18/apps/gedit/default.nix deleted file mode 100644 index 6c852ddae5c8..000000000000 --- a/pkgs/desktops/gnome-3/3.18/apps/gedit/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, intltool, fetchurl, enchant, isocodes -, pkgconfig, gtk3, glib -, bash, wrapGAppsHook, itstool, libsoup, libxml2 -, gnome3, librsvg, gdk_pixbuf, file }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - - buildInputs = [ gtk3 glib intltool itstool enchant isocodes - gdk_pixbuf gnome3.defaultIconTheme librsvg libsoup - gnome3.libpeas gnome3.gtksourceview libxml2 - gnome3.gsettings_desktop_schemas gnome3.dconf file ]; - - enableParallelBuilding = true; - - preFixup = '' - gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${gnome3.libpeas}/lib:${gnome3.gtksourceview}/lib") - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Gedit; - description = "Official text editor of the GNOME desktop environment"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/apps/gedit/src.nix b/pkgs/desktops/gnome-3/3.18/apps/gedit/src.nix deleted file mode 100644 index 167acabee917..000000000000 --- a/pkgs/desktops/gnome-3/3.18/apps/gedit/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gedit-3.18.3"; - - src = fetchurl { - url = mirror://gnome/sources/gedit/3.18/gedit-3.18.3.tar.xz; - sha256 = "6762ac0d793b0f754a2da5f88739d04fa39daa7491c5c46401d24bcef76c32e7"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/apps/glade/default.nix b/pkgs/desktops/gnome-3/3.18/apps/glade/default.nix deleted file mode 100644 index a0f8d9669556..000000000000 --- a/pkgs/desktops/gnome-3/3.18/apps/glade/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, intltool, fetchurl, python -, pkgconfig, gtk3, glib -, makeWrapper, itstool, libxml2, docbook_xsl -, gnome3, librsvg, gdk_pixbuf, libxslt }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 python - gnome3.gsettings_desktop_schemas makeWrapper docbook_xsl - gdk_pixbuf gnome3.defaultIconTheme librsvg libxslt ]; - - enableParallelBuilding = true; - - preFixup = '' - wrapProgram "$out/bin/glade" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Glade; - description = "User interface designer for GTK+ applications"; - maintainers = gnome3.maintainers; - license = licenses.lgpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/apps/glade/src.nix b/pkgs/desktops/gnome-3/3.18/apps/glade/src.nix deleted file mode 100644 index aaa913babea4..000000000000 --- a/pkgs/desktops/gnome-3/3.18/apps/glade/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "glade-3.18.3"; - - src = fetchurl { - url = mirror://gnome/sources/glade/3.18/glade-3.18.3.tar.xz; - sha256 = "ecdbce46e7fbfecd463be840b94fbf54d83723b3ebe075414cfd225ddab66452"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-boxes/default.nix deleted file mode 100644 index 1edea6b888ba..000000000000 --- a/pkgs/desktops/gnome-3/3.18/apps/gnome-boxes/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, pkgconfig, intltool, itstool, libvirt-glib -, glib, gobjectIntrospection, libxml2, gtk3, gtkvnc, libvirt, spice_gtk -, spice_protocol, libuuid, libsoup, libosinfo, systemd, tracker, vala -, libcap_ng, libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg -, desktop_file_utils, mtools, cdrkit, libcdio, numactl, xen -, libusb, libarchive, acl, libgudev, qemu -}: - -# TODO: ovirt (optional) - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - enableParallelBuilding = true; - - doCheck = true; - - buildInputs = [ - makeWrapper pkgconfig intltool itstool libvirt-glib glib - gobjectIntrospection libxml2 gtk3 gtkvnc libvirt spice_gtk spice_protocol - libuuid libsoup libosinfo systemd tracker vala libcap_ng libcap yajl gmp - gdbm cyrus_sasl gnome3.defaultIconTheme libusb libarchive - librsvg desktop_file_utils acl libgudev numactl xen - ]; - - preFixup = '' - for prog in "$out/bin/"*; do - wrapProgram "$prog" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ - --prefix PATH : "${mtools}/bin:${cdrkit}/bin:${libcdio}/bin:${qemu}/bin" - done - ''; - - meta = with stdenv.lib; { - description = "Simple GNOME 3 application to access remote or virtual systems"; - homepage = https://wiki.gnome.org/action/show/Apps/Boxes; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ bjornfor ]; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-boxes/src.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-boxes/src.nix deleted file mode 100644 index cd43d87f826b..000000000000 --- a/pkgs/desktops/gnome-3/3.18/apps/gnome-boxes/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-boxes-3.18.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-boxes/3.18/gnome-boxes-3.18.1.tar.xz; - sha256 = "0235d7f76cf3faa3889b302c743d608759e84506657ed4e374592c39f768fb2b"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-calendar/default.nix deleted file mode 100644 index 5fe6583660cb..000000000000 --- a/pkgs/desktops/gnome-3/3.18/apps/gnome-calendar/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, intltool, evolution_data_server, sqlite, libxml2, libsoup -, glib, gnome_online_accounts }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; - - buildInputs = [ - pkgconfig gtk3 wrapGAppsHook intltool evolution_data_server - sqlite libxml2 libsoup glib gnome3.defaultIconTheme gnome_online_accounts - ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Calendar; - description = "Simple and beautiful calendar application for GNOME"; - maintainers = gnome3.maintainers; - license = licenses.gpl3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-calendar/src.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-calendar/src.nix deleted file mode 100644 index b8a7f5a47619..000000000000 --- a/pkgs/desktops/gnome-3/3.18/apps/gnome-calendar/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-calendar-3.18.2.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-calendar/3.18/gnome-calendar-3.18.2.1.tar.xz; - sha256 = "eedd9b10da837db6e7dc02794a942e9a98b3cdaa975b0d46226aa0cdaf88c0f6"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-characters/default.nix deleted file mode 100644 index 4571a5d50e8b..000000000000 --- a/pkgs/desktops/gnome-3/3.18/apps/gnome-characters/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, intltool, gjs, gdk_pixbuf, librsvg }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ - pkgconfig gtk3 wrapGAppsHook intltool gjs gdk_pixbuf - librsvg gnome3.defaultIconTheme - ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Design/Apps/CharacterMap; - description = "Simple utility application to find and insert unusual characters"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-characters/src.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-characters/src.nix deleted file mode 100644 index 95874e7cfece..000000000000 --- a/pkgs/desktops/gnome-3/3.18/apps/gnome-characters/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-characters-3.18.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-characters/3.18/gnome-characters-3.18.1.tar.xz; - sha256 = "161839bb6c1ffca78b6c11b8d4f3f32b8263705911df0aed3268672c050b9bac"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-clocks/default.nix deleted file mode 100644 index e39614e765d6..000000000000 --- a/pkgs/desktops/gnome-3/3.18/apps/gnome-clocks/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, intltool, fetchurl, libgweather, libnotify -, pkgconfig, gtk3, glib, gsound -, makeWrapper, itstool, libcanberra_gtk3, libtool -, gnome3, librsvg, gdk_pixbuf, geoclue2, wrapGAppsHook }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - doCheck = true; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool libcanberra_gtk3 - gnome3.gsettings_desktop_schemas makeWrapper - gdk_pixbuf gnome3.defaultIconTheme librsvg - gnome3.gnome_desktop gnome3.geocode_glib geoclue2 - libgweather libnotify libtool gsound - wrapGAppsHook ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Clocks; - description = "Clock application designed for GNOME 3"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-clocks/src.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-clocks/src.nix deleted file mode 100644 index 9f0be0ede985..000000000000 --- a/pkgs/desktops/gnome-3/3.18/apps/gnome-clocks/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-clocks-3.18.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-clocks/3.18/gnome-clocks-3.18.0.tar.xz; - sha256 = "ca0818ec89e3539201da6b5388365e3d66df815198beccc90e2be44c7822baa0"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-documents/default.nix deleted file mode 100644 index 5daa7277f7b4..000000000000 --- a/pkgs/desktops/gnome-3/3.18/apps/gnome-documents/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, intltool, fetchurl, evince, gjs -, pkgconfig, gtk3, glib -, makeWrapper, itstool, libxslt, webkitgtk -, gnome3, librsvg, gdk_pixbuf, libsoup, docbook_xsl -, gobjectIntrospection, json_glib, inkscape, poppler_utils -, gmp, desktop_file_utils, wrapGAppsHook }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - doCheck = true; - - configureFlags = [ "--enable-getting-started" ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool libxslt - docbook_xsl desktop_file_utils inkscape poppler_utils - gnome3.gsettings_desktop_schemas makeWrapper gmp - gdk_pixbuf gnome3.defaultIconTheme librsvg evince - libsoup webkitgtk gjs gobjectIntrospection gnome3.rest - gnome3.tracker gnome3.libgdata gnome3.gnome_online_accounts - gnome3.gnome_desktop gnome3.libzapojit json_glib - wrapGAppsHook ]; - - enableParallelBuilding = true; - - preFixup = '' - substituteInPlace $out/bin/gnome-documents --replace gapplication "${glib.dev}/bin/gapplication" - - gappsWrapperArgs+=(--run 'if [ -z "$XDG_CACHE_DIR" ]; then XDG_CACHE_DIR=$HOME/.cache; fi; if [ -w "$XDG_CACHE_DIR/.." ]; then mkdir -p "$XDG_CACHE_DIR/gnome-documents"; fi') - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Documents; - description = "Document manager application designed to work with GNOME 3"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-documents/src.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-documents/src.nix deleted file mode 100644 index 8e2b3d0645d3..000000000000 --- a/pkgs/desktops/gnome-3/3.18/apps/gnome-documents/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-documents-3.18.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-documents/3.18/gnome-documents-3.18.2.tar.xz; - sha256 = "850ddaf3366549bbe0696c2ec3a36faf16438b387b8e9cb7812c7d5266a74cd4"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-getting-started-docs/default.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-getting-started-docs/default.nix deleted file mode 100644 index 0c75ebd7c783..000000000000 --- a/pkgs/desktops/gnome-3/3.18/apps/gnome-getting-started-docs/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ stdenv, fetchurl, gnome3, intltool, itstool, libxml2 }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ intltool itstool libxml2 ]; - - meta = with stdenv.lib; { - homepage = https://live.gnome.org/DocumentationProject; - description = "Help a new user get started in GNOME"; - maintainers = gnome3.maintainers; - license = licenses.cc-by-sa-30; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-getting-started-docs/src.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-getting-started-docs/src.nix deleted file mode 100644 index 83abd9504b93..000000000000 --- a/pkgs/desktops/gnome-3/3.18/apps/gnome-getting-started-docs/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-getting-started-docs-3.18.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-getting-started-docs/3.18/gnome-getting-started-docs-3.18.2.tar.xz; - sha256 = "5f4a39d51aba3669d84ce2cb06619a09a92103f58d4bc6728db448398b1f308b"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-logs/default.nix deleted file mode 100644 index d4135fdb1bae..000000000000 --- a/pkgs/desktops/gnome-3/3.18/apps/gnome-logs/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, intltool, itstool, libxml2, systemd }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - configureFlags = [ "--disable-tests" ]; - - buildInputs = [ - pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2 - systemd gnome3.defaultIconTheme - ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Logs; - description = "A log viewer for the systemd journal"; - maintainers = gnome3.maintainers; - license = licenses.gpl3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-logs/src.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-logs/src.nix deleted file mode 100644 index 754a49651843..000000000000 --- a/pkgs/desktops/gnome-3/3.18/apps/gnome-logs/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-logs-3.18.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-logs/3.18/gnome-logs-3.18.1.tar.xz; - sha256 = "3ccbd74e61af13b9ab4f8a45df9c0ff84b7c06a7baccf2150601a82b6dd662dc"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-maps/default.nix deleted file mode 100644 index caff53dcc1d6..000000000000 --- a/pkgs/desktops/gnome-3/3.18/apps/gnome-maps/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gnome3, gtk3 -, gobjectIntrospection, gdk_pixbuf, librsvg, autoreconfHook -, geoclue2, wrapGAppsHook, folks, libchamplain, gfbgraph, file, libsoup }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - doCheck = true; - - buildInputs = [ pkgconfig intltool gobjectIntrospection wrapGAppsHook - gtk3 geoclue2 gnome3.gjs gnome3.libgee folks gfbgraph - gnome3.geocode_glib libchamplain file libsoup - gdk_pixbuf librsvg autoreconfHook - gnome3.gsettings_desktop_schemas gnome3.evolution_data_server - gnome3.gnome_online_accounts gnome3.defaultIconTheme ]; - - patches = [ ./soup.patch ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Maps; - description = "A map application for GNOME 3"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-maps/soup.patch b/pkgs/desktops/gnome-3/3.18/apps/gnome-maps/soup.patch deleted file mode 100644 index e7e86ba76c75..000000000000 --- a/pkgs/desktops/gnome-3/3.18/apps/gnome-maps/soup.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- gnome-maps-3.18.0/configure.ac.orig 2015-09-24 18:38:31.912498368 +0200 -+++ gnome-maps-3.18.0/configure.ac 2015-09-24 18:38:40.783320413 +0200 -@@ -50,6 +50,7 @@ - folks >= $FOLKS_MIN_VERSION - geocode-glib-1.0 >= $GEOCODE_MIN_VERSION - champlain-0.12 >= $CHAMPLAIN_MIN_VERSION -+ libsoup-2.4 - ]) - AC_SUBST(GNOME_MAPS_LIB_CFLAGS) - AC_SUBST(GNOME_MAPS_LIB_LIBS) diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-maps/src.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-maps/src.nix deleted file mode 100644 index d0373e037b8d..000000000000 --- a/pkgs/desktops/gnome-3/3.18/apps/gnome-maps/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-maps-3.18.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-maps/3.18/gnome-maps-3.18.2.tar.xz; - sha256 = "693ff1559252eabe5d8c9c7354333b5aa1996e870936456d15706a0e0bac9278"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-music/default.nix deleted file mode 100644 index f48feb205790..000000000000 --- a/pkgs/desktops/gnome-3/3.18/apps/gnome-music/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, intltool, fetchurl, gdk_pixbuf, tracker -, python3, libxml2, python3Packages, libnotify, wrapGAppsHook -, pkgconfig, gtk3, glib, cairo -, makeWrapper, itstool, gnome3, librsvg, gst_all_1 }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.libmediaart - gdk_pixbuf gnome3.defaultIconTheme librsvg python3 - gnome3.grilo gnome3.grilo-plugins gnome3.totem-pl-parser libxml2 libnotify - python3Packages.pycairo python3Packages.dbus python3Packages.requests2 - python3Packages.pygobject3 gst_all_1.gstreamer gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad wrapGAppsHook - gnome3.gsettings_desktop_schemas makeWrapper tracker ]; - - wrapPrefixVariables = [ "PYTHONPATH" ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Music; - description = "Music player and management application for the GNOME desktop environment"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-music/src.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-music/src.nix deleted file mode 100644 index f52e5c38de85..000000000000 --- a/pkgs/desktops/gnome-3/3.18/apps/gnome-music/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-music-3.18.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-music/3.18/gnome-music-3.18.2.tar.xz; - sha256 = "81b6ae8b4193774a1dc05e77c59ad8ff5e7debc0aea30ce2ecd13b2ceda10bff"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-nettool/default.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-nettool/default.nix deleted file mode 100644 index 4c152777f2cb..000000000000 --- a/pkgs/desktops/gnome-3/3.18/apps/gnome-nettool/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, libgtop, intltool, itstool, libxml2, nmap, inetutils }: - -stdenv.mkDerivation rec { - name = "gnome-nettool-3.8.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-nettool/3.8/${name}.tar.xz"; - sha256 = "1c9cvzvyqgfwa5zzyvp7118pkclji62fkbb33g4y9sp5kw6m397h"; - }; - - buildInputs = [ - pkgconfig gtk3 wrapGAppsHook libgtop intltool itstool libxml2 - gnome3.defaultIconTheme - ]; - - propagatedUserEnvPkgs = [ nmap inetutils ]; - - meta = with stdenv.lib; { - homepage = http://projects.gnome.org/gnome-network; - description = "A collection of networking tools"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-photos/default.nix deleted file mode 100644 index 0ba1df2f5a5c..000000000000 --- a/pkgs/desktops/gnome-3/3.18/apps/gnome-photos/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, intltool, fetchurl, exempi, libxml2 -, pkgconfig, gtk3, glib -, makeWrapper, itstool, gegl, babl, lcms2 -, desktop_file_utils, gmp, libmediaart, wrapGAppsHook -, gnome3, librsvg, gdk_pixbuf, libexif }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - # doCheck = true; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool gegl babl gnome3.libgdata - gnome3.gsettings_desktop_schemas makeWrapper gmp libmediaart - gdk_pixbuf gnome3.defaultIconTheme librsvg exempi - gnome3.gfbgraph gnome3.grilo-plugins gnome3.grilo - gnome3.gnome_online_accounts gnome3.gnome_desktop - lcms2 libexif gnome3.tracker libxml2 desktop_file_utils - wrapGAppsHook ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Photos; - description = "Photos is an application to access, organize and share your photos with GNOME 3"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-photos/src.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-photos/src.nix deleted file mode 100644 index 28b2ada45bae..000000000000 --- a/pkgs/desktops/gnome-3/3.18/apps/gnome-photos/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-photos-3.18.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-photos/3.18/gnome-photos-3.18.2.tar.xz; - sha256 = "7f6169c663b7a0e1b971d5af4def3d9a633e16a24e7d2c593b51be0053f9a0d8"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-weather/default.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-weather/default.nix deleted file mode 100644 index f4d2c8ad0c19..000000000000 --- a/pkgs/desktops/gnome-3/3.18/apps/gnome-weather/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook, gjs -, libgweather, intltool, itstool }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ - pkgconfig gtk3 wrapGAppsHook gjs intltool itstool - libgweather gnome3.defaultIconTheme - ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Weather; - description = "Access current weather conditions and forecasts"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-weather/src.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-weather/src.nix deleted file mode 100644 index 6062444fa048..000000000000 --- a/pkgs/desktops/gnome-3/3.18/apps/gnome-weather/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-weather-3.18.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-weather/3.18/gnome-weather-3.18.1.tar.xz; - sha256 = "d0cbe0ee6e9f9332e30836d72c9a462ecc908a97402943c33cd6e61d08323fdf"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/apps/nautilus-sendto/default.nix b/pkgs/desktops/gnome-3/3.18/apps/nautilus-sendto/default.nix deleted file mode 100644 index 093900dcb7ab..000000000000 --- a/pkgs/desktops/gnome-3/3.18/apps/nautilus-sendto/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, glib, pkgconfig, gnome3, intltool -, gobjectIntrospection, makeWrapper }: - -stdenv.mkDerivation rec { - name = "nautilus-sendto-${version}"; - - version = "3.8.1"; - - src = fetchurl { - url = "mirror://gnome/sources/nautilus-sendto/3.8/${name}.tar.xz"; - sha256 = "03fa46bff271acdbdedab6243b2a84e5ed3daa19c81b69d087b3e852c8fe5dab"; - }; - - buildInputs = [ glib pkgconfig gobjectIntrospection intltool makeWrapper ]; - - meta = with stdenv.lib; { - description = "Integrates Evolution and Pidgin into the Nautilus file manager"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/apps/polari/default.nix b/pkgs/desktops/gnome-3/3.18/apps/polari/default.nix deleted file mode 100644 index 8efaa4e4aac8..000000000000 --- a/pkgs/desktops/gnome-3/3.18/apps/polari/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, intltool, fetchurl, gdk_pixbuf, adwaita-icon-theme -, telepathy_glib, gjs, itstool, telepathy_idle -, pkgconfig, gtk3, glib, librsvg, gnome3, wrapGAppsHook }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - propagatedUserEnvPkgs = [ telepathy_idle ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool adwaita-icon-theme wrapGAppsHook - telepathy_glib gjs gdk_pixbuf librsvg ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Polari; - description = "IRC chat client designed to integrate with the GNOME desktop"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/apps/polari/src.nix b/pkgs/desktops/gnome-3/3.18/apps/polari/src.nix deleted file mode 100644 index acb570c0a14c..000000000000 --- a/pkgs/desktops/gnome-3/3.18/apps/polari/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "polari-3.18.1"; - - src = fetchurl { - url = mirror://gnome/sources/polari/3.18/polari-3.18.1.tar.xz; - sha256 = "554a089b1edf88d49408ecf6ce79ad6f7114ecf557753c8f39a9af153a76843a"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/3.18/apps/seahorse/default.nix deleted file mode 100644 index 49c48a6b962a..000000000000 --- a/pkgs/desktops/gnome-3/3.18/apps/seahorse/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, intltool, fetchurl, vala -, pkgconfig, gtk3, glib -, makeWrapper, itstool, gnupg, libsoup -, gnome3, librsvg, gdk_pixbuf, gpgme -, libsecret, avahi, p11_kit, openssh }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - doCheck = true; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gcr - gnome3.gsettings_desktop_schemas makeWrapper gnupg - gdk_pixbuf gnome3.defaultIconTheme librsvg gpgme - libsecret avahi libsoup p11_kit vala gnome3.gcr - openssh ]; - - preFixup = '' - wrapProgram "$out/bin/seahorse" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Seahorse; - description = "Application for managing encryption keys and passwords in the GnomeKeyring"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/apps/seahorse/src.nix b/pkgs/desktops/gnome-3/3.18/apps/seahorse/src.nix deleted file mode 100644 index 05c8a9c474c4..000000000000 --- a/pkgs/desktops/gnome-3/3.18/apps/seahorse/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "seahorse-3.18.0"; - - src = fetchurl { - url = mirror://gnome/sources/seahorse/3.18/seahorse-3.18.0.tar.xz; - sha256 = "530c889a01c4cad25df4c9ab58ab95d24747875789bc6116bef529d60fc1b667"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/apps/vinagre/default.nix b/pkgs/desktops/gnome-3/3.18/apps/vinagre/default.nix deleted file mode 100644 index 8b8b6248642c..000000000000 --- a/pkgs/desktops/gnome-3/3.18/apps/vinagre/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, vte, libxml2, gtkvnc, intltool -, libsecret, itstool, makeWrapper, librsvg }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ pkgconfig gtk3 vte libxml2 gtkvnc intltool libsecret - itstool makeWrapper gnome3.defaultIconTheme librsvg ]; - - preFixup = '' - wrapProgram "$out/bin/vinagre" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Vinagre; - description = "Remote desktop viewer for GNOME"; - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/apps/vinagre/src.nix b/pkgs/desktops/gnome-3/3.18/apps/vinagre/src.nix deleted file mode 100644 index 27e5792ea427..000000000000 --- a/pkgs/desktops/gnome-3/3.18/apps/vinagre/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "vinagre-3.18.2"; - - src = fetchurl { - url = mirror://gnome/sources/vinagre/3.18/vinagre-3.18.2.tar.xz; - sha256 = "65b81299de0b75a9433e5654d5314f347895d5efb7acd3b111e5e8c03f48fbc4"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/3.18/core/adwaita-icon-theme/default.nix deleted file mode 100644 index 3c3a05dc3af8..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/adwaita-icon-theme/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gnome3 -, iconnamingutils, gtk, gdk_pixbuf, librsvg, hicolor_icon_theme }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - # For convenience, we can specify adwaita-icon-theme only in packages - propagatedBuildInputs = [ hicolor_icon_theme ]; - - buildInputs = [ gdk_pixbuf librsvg ]; - - nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk ]; - - # remove a tree of dirs with no files within - postInstall = '' rm -rf "$out/locale" ''; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/adwaita-icon-theme/src.nix b/pkgs/desktops/gnome-3/3.18/core/adwaita-icon-theme/src.nix deleted file mode 100644 index 59fc291eb4ef..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/adwaita-icon-theme/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "adwaita-icon-theme-3.18.0"; - - src = fetchurl { - url = mirror://gnome/sources/adwaita-icon-theme/3.18/adwaita-icon-theme-3.18.0.tar.xz; - sha256 = "5e9ce726001fdd8ee93c394fdc3cdb9e1603bbed5b7c62df453ccf521ec50e58"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/baobab/default.nix b/pkgs/desktops/gnome-3/3.18/core/baobab/default.nix deleted file mode 100644 index 874c7280949a..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/baobab/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, intltool, fetchurl, vala, libgtop -, pkgconfig, gtk3, glib -, bash, makeWrapper, itstool, libxml2 -, gnome3, librsvg, gdk_pixbuf, file }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - doCheck = true; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ vala pkgconfig gtk3 glib libgtop intltool itstool libxml2 - gnome3.gsettings_desktop_schemas makeWrapper file - gdk_pixbuf gnome3.defaultIconTheme librsvg ]; - - preFixup = '' - wrapProgram "$out/bin/baobab" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Baobab; - description = "Graphical application to analyse disk usage in any Gnome environment"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/baobab/src.nix b/pkgs/desktops/gnome-3/3.18/core/baobab/src.nix deleted file mode 100644 index b8e5c9af3cf8..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/baobab/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "baobab-3.18.1"; - - src = fetchurl { - url = mirror://gnome/sources/baobab/3.18/baobab-3.18.1.tar.xz; - sha256 = "c2ac90426390e77147446a290c1480c49936c0a224f740b555ddaec2675b44b5"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/caribou/default.nix b/pkgs/desktops/gnome-3/3.18/core/caribou/default.nix deleted file mode 100644 index c2cb6a661abe..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/caribou/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, clutter, dbus, pythonPackages, libxml2, autoconf -, libxklavier, libXtst, gtk2, intltool, libxslt, at_spi2_core, automake114x }: - -let - majorVersion = "0.4"; -in -stdenv.mkDerivation rec { - name = "caribou-${majorVersion}.18.1"; - - src = fetchurl { - url = "mirror://gnome/sources/caribou/${majorVersion}/${name}.tar.xz"; - sha256 = "0l1ikx56ddgayvny3s2xv8hs3p23xsclw4zljs3cczv4b89dzymf"; - }; - - buildInputs = with gnome3; - [ glib pkgconfig gtk clutter at_spi2_core dbus pythonPackages.python automake114x - pythonPackages.pygobject3 libxml2 libXtst gtk2 intltool libxslt autoconf ]; - - propagatedBuildInputs = [ gnome3.libgee libxklavier ]; - - preBuild = '' - patchShebangs . - substituteInPlace libcaribou/Makefile.am --replace "--shared-library=libcaribou.so.0" "--shared-library=$out/lib/libcaribou.so.0" - ''; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.18/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/3.18/core/dconf-editor/default.nix deleted file mode 100644 index bf39965bf779..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/dconf-editor/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus_glib, gnome3 -, libxml2, intltool, docbook_xsl_ns, docbook_xsl, wrapGAppsHook }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - - buildInputs = [ vala libxslt glib dbus_glib gnome3.gtk libxml2 gnome3.defaultIconTheme - intltool docbook_xsl docbook_xsl_ns gnome3.dconf ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/dconf-editor/src.nix b/pkgs/desktops/gnome-3/3.18/core/dconf-editor/src.nix deleted file mode 100644 index aef30cf0820a..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/dconf-editor/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "dconf-editor-3.18.2"; - - src = fetchurl { - url = mirror://gnome/sources/dconf-editor/3.18/dconf-editor-3.18.2.tar.xz; - sha256 = "a7957f5274b5b20c2dfdead5ebf42321c82fae1326465413cbafb61ede89bc75"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/dconf/default.nix b/pkgs/desktops/gnome-3/3.18/core/dconf/default.nix deleted file mode 100644 index 990e2007a23f..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/dconf/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus_glib, gnome3 -, libxml2, intltool, docbook_xsl_ns, docbook_xsl, makeWrapper }: - -let - majorVersion = "0.24"; -in -stdenv.mkDerivation rec { - name = "dconf-${version}"; - version = "${majorVersion}.0"; - - src = fetchurl { - url = "mirror://gnome/sources/dconf/${majorVersion}/${name}.tar.xz"; - sha256 = "4373e0ced1f4d7d68d518038796c073696280e22957babb29feb0267c630fec2"; - }; - - buildInputs = [ vala libxslt pkgconfig glib dbus_glib gnome3.gtk libxml2 - intltool docbook_xsl docbook_xsl_ns makeWrapper ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/empathy/default.nix b/pkgs/desktops/gnome-3/3.18/core/empathy/default.nix deleted file mode 100644 index 48b45f28522e..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/empathy/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib -, file, librsvg, gnome3, gdk_pixbuf -, dbus_glib, dbus_libs, telepathy_glib, telepathy_farstream -, clutter_gtk, clutter-gst, gst_all_1, cogl, gnome_online_accounts -, gcr, libsecret, folks, libpulseaudio, telepathy_mission_control -, telepathy_logger, libnotify, clutter, libsoup, gnutls -, evolution_data_server -, libcanberra_gtk3, p11_kit, farstream, libtool, shared_mime_info -, bash, makeWrapper, itstool, libxml2, libxslt, icu, libgee }: - -# TODO: enable more features - -let - majorVersion = "3.12"; -in -stdenv.mkDerivation rec { - name = "empathy-${majorVersion}.8"; - - src = fetchurl { - url = "mirror://gnome/sources/empathy/${majorVersion}/${name}.tar.xz"; - sha256 = "10z6ksia6yx7vg0wsdbk4w6vjgfg3cg3n04jf9bj2vr7kr5zvs7w"; - }; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard - gnome_online_accounts shared_mime_info ]; - propagatedBuildInputs = [ folks telepathy_logger evolution_data_server - telepathy_mission_control ]; - buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool - libxml2 libxslt icu file makeWrapper - telepathy_glib clutter_gtk clutter-gst cogl - gst_all_1.gstreamer gst_all_1.gst-plugins-base - gcr libsecret libpulseaudio gnome3.yelp_xsl gdk_pixbuf - libnotify clutter libsoup gnutls libgee p11_kit - libcanberra_gtk3 telepathy_farstream farstream - gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas - file libtool librsvg ]; - - NIX_CFLAGS_COMPILE = [ "-I${dbus_glib.dev}/include/dbus-1.0" - "-I${dbus_libs.dev}/include/dbus-1.0" - "-I${dbus_libs.lib}/lib/dbus-1.0/include" ]; - - preFixup = '' - for f in $out/bin/* $out/libexec/*; do - wrapProgram $f \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - done - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Empathy; - description = "Messaging program which supports text, voice, video chat, and file transfers over many different protocols"; - maintainers = gnome3.maintainers; - # TODO: license = [ licenses.gpl2 licenses.lgpl2 ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/eog/default.nix b/pkgs/desktops/gnome-3/3.18/core/eog/default.nix deleted file mode 100644 index 5f36f25e095e..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/eog/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ fetchurl, stdenv, intltool, pkgconfig, itstool, libxml2, libjpeg, gnome3 -, shared_mime_info, wrapGAppsHook, librsvg, libexif }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - - buildInputs = with gnome3; - [ intltool itstool libxml2 libjpeg gtk glib libpeas librsvg - gsettings_desktop_schemas shared_mime_info adwaita-icon-theme - gnome_desktop libexif dconf ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/EyeOfGnome; - platforms = platforms.linux; - description = "GNOME image viewer"; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/eog/src.nix b/pkgs/desktops/gnome-3/3.18/core/eog/src.nix deleted file mode 100644 index 444d66fbb31a..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/eog/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "eog-3.18.2"; - - src = fetchurl { - url = mirror://gnome/sources/eog/3.18/eog-3.18.2.tar.xz; - sha256 = "dc2d16e3754cad12703261fe586e7599c4df2e39282f6c28681a514f749fe636"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/epiphany/default.nix b/pkgs/desktops/gnome-3/3.18/core/epiphany/default.nix deleted file mode 100644 index d50036a597e6..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/epiphany/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig, gtk3, glib, nspr, icu -, bash, wrapGAppsHook, gnome3, libwnck3, libxml2, libxslt, libtool -, webkitgtk, libsoup, glib_networking, libsecret, gnome_desktop, libnotify, p11_kit -, sqlite, gcr, avahi, nss, isocodes, itstool, file, which -, gdk_pixbuf, librsvg, gnome_common }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - # Tests need an X display - configureFlags = [ "--disable-static --disable-tests" ]; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - nativeBuildInputs = [ pkgconfig file wrapGAppsHook ]; - - buildInputs = [ gtk3 glib intltool libwnck3 libxml2 libxslt pkgconfig file - webkitgtk libsoup libsecret gnome_desktop libnotify libtool - sqlite isocodes nss itstool p11_kit nspr icu gnome3.yelp_tools - gdk_pixbuf gnome3.defaultIconTheme librsvg which gnome_common - gcr avahi gnome3.gsettings_desktop_schemas gnome3.dconf ]; - - NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0"; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Epiphany; - description = "WebKit based web browser for GNOME"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/epiphany/src.nix b/pkgs/desktops/gnome-3/3.18/core/epiphany/src.nix deleted file mode 100644 index 2daa8ecc24e1..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/epiphany/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "epiphany-3.18.3"; - - src = fetchurl { - url = mirror://gnome/sources/epiphany/3.18/epiphany-3.18.3.tar.xz; - sha256 = "cd4e9ce588c4c66109547d93999d9740d338c3f9dbfbc2143cf2cbb74260def9"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/evince/default.nix b/pkgs/desktops/gnome-3/3.18/core/evince/default.nix deleted file mode 100644 index 7629e5b56550..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/evince/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, intltool, perl, perlXMLParser, libxml2 -, glib, gtk3, pango, atk, gdk_pixbuf, shared_mime_info, itstool, gnome3 -, poppler, ghostscriptX, djvulibre, libspectre, libsecret , wrapGAppsHook -, librsvg, gobjectIntrospection -, recentListSize ? null # 5 is not enough, allow passing a different number -, supportXPS ? false # Open XML Paper Specification via libgxps -}: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - - buildInputs = [ - intltool perl perlXMLParser libxml2 - glib gtk3 pango atk gdk_pixbuf gobjectIntrospection - itstool gnome3.adwaita-icon-theme - gnome3.libgnome_keyring gnome3.gsettings_desktop_schemas - poppler ghostscriptX djvulibre libspectre - libsecret librsvg gnome3.adwaita-icon-theme gnome3.dconf - ] ++ stdenv.lib.optional supportXPS gnome3.libgxps; - - configureFlags = [ - "--disable-nautilus" # Do not use nautilus - "--enable-introspection" - (if supportXPS then "--enable-xps" else "--disable-xps") - ]; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; - - preConfigure = with stdenv.lib; - optionalString doCheck '' - for file in test/*.py; do - echo "patching $file" - sed '1s,/usr,${python},' -i "$file" - done - '' + optionalString (recentListSize != null) '' - sed -i 's/\(gtk_recent_chooser_set_limit .*\)5)/\1${builtins.toString recentListSize})/' shell/ev-open-recent-action.c - sed -i 's/\(if (++n_items == \)5\(.*\)/\1${builtins.toString recentListSize}\2/' shell/ev-window.c - ''; - - preFixup = '' - gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared_mime_info}/share") - ''; - - doCheck = false; # would need pythonPackages.dogTail, which is missing - - meta = with stdenv.lib; { - homepage = http://www.gnome.org/projects/evince/; - description = "GNOME's document viewer"; - - longDescription = '' - Evince is a document viewer for multiple document formats. It - currently supports PDF, PostScript, DjVu, TIFF and DVI. The goal - of Evince is to replace the multiple document viewers that exist - on the GNOME Desktop with a single simple application. - ''; - - license = stdenv.lib.licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = [ maintainers.vcunat ]; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/evince/src.nix b/pkgs/desktops/gnome-3/3.18/core/evince/src.nix deleted file mode 100644 index 17dca072e777..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/evince/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "evince-3.18.2"; - - src = fetchurl { - url = mirror://gnome/sources/evince/3.18/evince-3.18.2.tar.xz; - sha256 = "42ad6c7354d881a9ecab136ea84ff867acb942605bcfac48b6c12e1c2d8ecb17"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/3.18/core/evolution-data-server/default.nix deleted file mode 100644 index fb3c8bdceab7..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/evolution-data-server/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, python -, intltool, libsoup, libxml2, libsecret, icu, sqlite -, p11_kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true, vala }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = with gnome3; - [ pkgconfig glib python intltool libsoup libxml2 gtk gnome_online_accounts - gcr p11_kit libgweather libgdata gperf makeWrapper icu sqlite gsettings_desktop_schemas ] - ++ stdenv.lib.optional valaSupport vala; - - propagatedBuildInputs = [ libsecret nss nspr libical db ]; - - # uoa irrelevant for now - configureFlags = [ "--disable-uoa" ] - ++ stdenv.lib.optional valaSupport "--enable-vala-bindings"; - - preFixup = '' - for f in "$out/libexec/"*; do - wrapProgram "$f" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - done - ''; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.18/core/evolution-data-server/src.nix b/pkgs/desktops/gnome-3/3.18/core/evolution-data-server/src.nix deleted file mode 100644 index 5b465be415be..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/evolution-data-server/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "evolution-data-server-3.18.4"; - - src = fetchurl { - url = mirror://gnome/sources/evolution-data-server/3.18/evolution-data-server-3.18.4.tar.xz; - sha256 = "0b756f05feae538676832acc122407046a89d4dd32da725789229dc3c416433f"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/folks/default.nix b/pkgs/desktops/gnome-3/3.18/core/folks/default.nix deleted file mode 100644 index 4385c6b6f75b..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/folks/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, glib, gnome3, nspr, intltool -, vala, sqlite, libxml2, dbus_glib, libsoup, nss, dbus_libs -, telepathy_glib, evolution_data_server, libsecret, db }: - -# TODO: enable more folks backends - -let - majorVersion = "0.11"; -in -stdenv.mkDerivation rec { - name = "folks-${majorVersion}.0"; - - src = fetchurl { - url = "mirror://gnome/sources/folks/${majorVersion}/${name}.tar.xz"; - sha256 = "0q9hny6a38zn0gamv0ji0pn3jw6bpn2i0fr6vbzkhm9h9ws0cqvz"; - }; - - propagatedBuildInputs = [ glib gnome3.libgee sqlite ]; - # dbus_daemon needed for tests - buildInputs = [ dbus_glib telepathy_glib evolution_data_server dbus_libs - vala libsecret libxml2 libsoup nspr nss intltool db ]; - nativeBuildInputs = [ pkgconfig ]; - - configureFlags = "--disable-fatal-warnings"; - - NIX_CFLAGS_COMPILE = ["-I${nspr.dev}/include/nspr" "-I${nss.dev}/include/nss" - "-I${dbus_glib.dev}/include/dbus-1.0" "-I${dbus_libs.dev}/include/dbus-1.0"]; - - enableParallelBuilding = true; - - postBuild = "rm -rf $out/share/gtk-doc"; - - meta = { - description = "Folks"; - - homepage = https://wiki.gnome.org/Projects/Folks; - - license = stdenv.lib.licenses.lgpl2Plus; - - maintainers = gnome3.maintainers; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/gconf/default.nix b/pkgs/desktops/gnome-3/3.18/core/gconf/default.nix deleted file mode 100644 index a4cb3e8c1464..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gconf/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, dbus_glib, gnome3 ? null, glib, libxml2 -, intltool, polkit, orbit, withGtk ? false }: - -assert withGtk -> (gnome3 != null); - -stdenv.mkDerivation rec { - - versionMajor = "3.2"; - versionMinor = "6"; - moduleName = "GConf"; - - origName = "${moduleName}-${versionMajor}.${versionMinor}"; - - name = "gconf-${versionMajor}.${versionMinor}"; - - src = fetchurl { - url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${origName}.tar.xz"; - sha256 = "0k3q9nh53yhc9qxf1zaicz4sk8p3kzq4ndjdsgpaa2db0ccbj4hr"; - }; - - buildInputs = [ libxml2 polkit orbit ] ++ stdenv.lib.optional withGtk gnome3.gtk; - propagatedBuildInputs = [ glib dbus_glib ]; - nativeBuildInputs = [ pkgconfig intltool ]; - - # ToDo: ldap reported as not found but afterwards reported as supported - - meta = with stdenv.lib; { - homepage = http://projects.gnome.org/gconf/; - description = "A system for storing application preferences"; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/gcr/default.nix b/pkgs/desktops/gnome-3/3.18/core/gcr/default.nix deleted file mode 100644 index e0e8d1e73382..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gcr/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gnupg, p11_kit, glib -, libgcrypt, libtasn1, dbus_glib, gtk, pango, gdk_pixbuf, atk -, gobjectIntrospection, makeWrapper, libxslt, vala, gnome3 }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ - pkgconfig intltool gnupg glib gobjectIntrospection libxslt - libgcrypt libtasn1 dbus_glib gtk pango gdk_pixbuf atk makeWrapper vala - ]; - - propagatedBuildInputs = [ p11_kit ]; - - #doCheck = true; - - #enableParallelBuilding = true; issues on hydra - - preFixup = '' - wrapProgram "$out/bin/gcr-viewer" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/gcr/src.nix b/pkgs/desktops/gnome-3/3.18/core/gcr/src.nix deleted file mode 100644 index 6f2d0fd29b31..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gcr/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gcr-3.18.0"; - - src = fetchurl { - url = mirror://gnome/sources/gcr/3.18/gcr-3.18.0.tar.xz; - sha256 = "d4d16da5af55148a694055835ccd07ad34daf0ad03bdad929bf7cad15637ce00"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/gdm/3.16-wip/default.nix b/pkgs/desktops/gnome-3/3.18/core/gdm/3.16-wip/default.nix deleted file mode 100644 index 3749be2de27f..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gdm/3.16-wip/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, xorg, dbus -, intltool, accountsservice, libX11, gnome3, systemd, gnome_session -, gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection }: - -stdenv.mkDerivation rec { - name = "gdm-${gnome3.version}.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gdm/${gnome3.version}/${name}.tar.xz"; - sha256 = "0mhv3q8z208qvhz00zrxlqn7w9gi5vy6w8dpjh5s2ka28l3yhbn3"; - }; - - preConfigure = '' - substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver.out}/bin/X" - substituteInPlace daemon/gdm-simple-slave.c --replace 'BINDIR "/gnome-session' '"${gnome_session}/bin/gnome-session' - substituteInPlace daemon/gdm-launch-environment.c --replace 'BINDIR "/dbus-launch' '"${dbus.dbus-launch}' - substituteInPlace data/gdm.conf-custom.in --replace '#WaylandEnable=false' 'WaylandEnable=false' - sed 's/#Enable=true/Enable=true/' -i data/gdm.conf-custom.in - ''; - - configureFlags = [ "--localstatedir=/var" "--with-systemd=yes" "--without-plymouth" - "--with-systemdsystemunitdir=$(out)/etc/systemd/system" - "--with-initial-vt=10" ]; - - buildInputs = [ pkgconfig glib itstool libxml2 intltool - accountsservice gnome3.dconf systemd - gobjectIntrospection libX11 gtk - libcanberra_gtk3 pam libtool ]; - - #enableParallelBuilding = true; # problems compiling - - # Disable Access Control because our X does not support FamilyServerInterpreted yet - patches = [ ./xserver_path.patch ./sessions_dir.patch ./disable_x_access_control.patch ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/GDM; - description = "A program that manages graphical display servers and handles graphical user logins"; - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/gdm/3.16-wip/disable_x_access_control.patch b/pkgs/desktops/gnome-3/3.18/core/gdm/3.16-wip/disable_x_access_control.patch deleted file mode 100644 index 7691a9e86f0f..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gdm/3.16-wip/disable_x_access_control.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- gdm-3.16.0/daemon/gdm-display.c.orig 2015-04-08 13:53:14.370274369 +0200 -+++ gdm-3.16.0/daemon/gdm-display.c 2015-04-08 13:53:36.287520435 +0200 -@@ -1706,9 +1706,10 @@ - - gdm_error_trap_push (); - -- for (i = 0; i < G_N_ELEMENTS (host_entries); i++) { -+ /*for (i = 0; i < G_N_ELEMENTS (host_entries); i++) { - XAddHost (self->priv->x11_display, &host_entries[i]); -- } -+ }*/ -+ XDisableAccessControl(self->priv->x11_display); - - XSync (self->priv->x11_display, False); - if (gdm_error_trap_pop ()) { diff --git a/pkgs/desktops/gnome-3/3.18/core/gdm/3.16-wip/sessions_dir.patch b/pkgs/desktops/gnome-3/3.18/core/gdm/3.16-wip/sessions_dir.patch deleted file mode 100644 index b8fbad4d731d..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gdm/3.16-wip/sessions_dir.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c -index f759d2d..d154716 100644 ---- a/daemon/gdm-session.c -+++ b/daemon/gdm-session.c -@@ -373,9 +373,12 @@ get_system_session_dirs (void) - #ifdef ENABLE_WAYLAND_SUPPORT - DATADIR "/wayland-sessions/", - #endif -+ NULL, - NULL - }; - -+ search_dirs[4] = getenv("GDM_SESSIONS_DIR") != NULL ? getenv("GDM_SESSIONS_DIR") : NULL; -+ - return search_dirs; - } - diff --git a/pkgs/desktops/gnome-3/3.18/core/gdm/3.16-wip/xserver_path.patch b/pkgs/desktops/gnome-3/3.18/core/gdm/3.16-wip/xserver_path.patch deleted file mode 100644 index b451d129391a..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gdm/3.16-wip/xserver_path.patch +++ /dev/null @@ -1,83 +0,0 @@ ---- a/daemon/gdm-server.c 2014-07-30 23:00:17.786841724 +0200 -+++ b/daemon/gdm-server.c 2014-07-30 23:02:10.491239180 +0200 -@@ -322,7 +322,11 @@ - fallback: - #endif - -- server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options); -+ if (g_getenv("GDM_X_SERVER") != NULL) { -+ server->priv->command = g_strdup (g_getenv("GDM_X_SERVER")); -+ } else { -+ server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options); -+ } - } - - static gboolean ---- gdm-3.16.0/daemon/gdm-x-session.c.orig 2015-04-15 18:44:16.875743928 +0200 -+++ gdm-3.16.0/daemon/gdm-x-session.c 2015-04-16 13:34:02.335708638 +0200 -@@ -207,6 +207,8 @@ - char *display_fd_string = NULL; - char *vt_string = NULL; - char *display_number; -+ int nixos_argc = 0; -+ char **nixos_argv = NULL; - gsize display_number_size; - - auth_file = prepare_auth_file (); -@@ -236,7 +238,15 @@ - - display_fd_string = g_strdup_printf ("%d", DISPLAY_FILENO); - -- g_ptr_array_add (arguments, X_SERVER); -+ if (g_getenv("GDM_X_SERVER") != NULL) { -+ int i = 0; -+ g_shell_parse_argv(g_getenv("GDM_X_SERVER"), &nixos_argc, &nixos_argv, NULL); -+ for (i = 0; i < nixos_argc; i++) { -+ g_ptr_array_add (arguments, nixos_argv[i]); -+ } -+ } else { -+ g_ptr_array_add (arguments, X_SERVER); -+ } - - if (vt_string != NULL) { - g_ptr_array_add (arguments, vt_string); -@@ -259,12 +269,12 @@ - g_ptr_array_add (arguments, "-noreset"); - g_ptr_array_add (arguments, "-keeptty"); - -- g_ptr_array_add (arguments, "-verbose"); -+ /*g_ptr_array_add (arguments, "-verbose"); - if (state->debug_enabled) { - g_ptr_array_add (arguments, "7"); - } else { - g_ptr_array_add (arguments, "3"); -- } -+ }*/ - - if (state->debug_enabled) { - g_ptr_array_add (arguments, "-core"); -@@ -275,6 +285,9 @@ - (const char * const *) arguments->pdata, - &error); - g_free (display_fd_string); -+ if (nixos_argv) { -+ g_strfreev (nixos_argv); -+ } - g_clear_object (&launcher); - g_ptr_array_free (arguments, TRUE); - ---- gdm-3.16.0/daemon/gdm-session.c.orig 2015-04-16 14:19:01.392802683 +0200 -+++ gdm-3.16.0/daemon/gdm-session.c 2015-04-16 14:20:36.012296764 +0200 -@@ -2359,6 +2359,12 @@ - gchar *desktop_names; - const char *locale; - -+ if (g_getenv ("GDM_X_SERVER") != NULL) { -+ gdm_session_set_environment_variable (self, -+ "GDM_X_SERVER", -+ g_getenv ("GDM_X_SERVER")); -+ } -+ - gdm_session_set_environment_variable (self, - "GDMSESSION", - get_session_name (self)); diff --git a/pkgs/desktops/gnome-3/3.18/core/gdm/default.nix b/pkgs/desktops/gnome-3/3.18/core/gdm/default.nix deleted file mode 100644 index 588c6bc639b6..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gdm/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, xorg, dbus -, intltool, accountsservice, libX11, gnome3, systemd, gnome_session, autoreconfHook -, gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection, plymouth }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - # Only needed to make it build - preConfigure = '' - substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver.out}/bin/X" - ''; - - configureFlags = [ "--sysconfdir=/etc" - "--localstatedir=/var" - "--with-systemd=yes" - "--with-plymouth=yes" - "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ]; - - buildInputs = [ pkgconfig glib itstool libxml2 intltool autoreconfHook - accountsservice gnome3.dconf systemd - gobjectIntrospection libX11 gtk - libcanberra_gtk3 pam libtool plymouth ]; - - #enableParallelBuilding = true; # problems compiling - - preBuild = '' - substituteInPlace daemon/gdm-simple-slave.c --replace 'BINDIR "/gnome-session' '"${gnome_session}/bin/gnome-session' - ''; - - # Disable Access Control because our X does not support FamilyServerInterpreted yet - patches = [ ./xserver_path.patch ./sessions_dir.patch - ./disable_x_access_control.patch ./no-dbus-launch.patch - ./libsystemd.patch ]; - - installFlags = [ "sysconfdir=$(out)/etc" "dbusconfdir=$(out)/etc/dbus-1/system.d" ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/GDM; - description = "A program that manages graphical display servers and handles graphical user logins"; - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/gdm/disable_x_access_control.patch b/pkgs/desktops/gnome-3/3.18/core/gdm/disable_x_access_control.patch deleted file mode 100644 index e100e013b786..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gdm/disable_x_access_control.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- gdm-3.14.2/daemon/gdm-slave.c.orig 2015-04-16 15:05:27.844353079 +0200 -+++ gdm-3.14.2/daemon/gdm-slave.c 2015-04-16 15:05:40.240417915 +0200 -@@ -369,8 +369,9 @@ - gdm_error_trap_push (); - - for (i = 0; i < G_N_ELEMENTS (host_entries); i++) { -- XAddHost (slave->priv->server_display, &host_entries[i]); -+ //XAddHost (slave->priv->server_display, &host_entries[i]); - } -+ XDisableAccessControl(slave->priv->server_display); - - XSync (slave->priv->server_display, False); - if (gdm_error_trap_pop ()) { diff --git a/pkgs/desktops/gnome-3/3.18/core/gdm/libsystemd.patch b/pkgs/desktops/gnome-3/3.18/core/gdm/libsystemd.patch deleted file mode 100644 index 4556f418cc81..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gdm/libsystemd.patch +++ /dev/null @@ -1,21 +0,0 @@ -https://github.com/GNOME/gdm/commit/eee5bf72c9bb1c1d62eb0e7102088ae3b9a188cd ---- a/configure.ac 2016-05-27 11:10:44.589740789 +0200 -+++ b/configure.ac 2016-05-27 11:11:00.146427723 +0200 -@@ -888,7 +888,7 @@ - dnl --------------------------------------------------------------------------- - - PKG_CHECK_MODULES(SYSTEMD, -- [libsystemd-login >= 186 libsystemd-daemon], -+ [libsystemd], - [have_systemd=yes], [have_systemd=no]) - - if test "x$with_systemd" = "xauto" ; then -@@ -912,7 +912,7 @@ - AC_SUBST(SYSTEMD_LIBS) - - PKG_CHECK_MODULES(JOURNALD, -- [libsystemd-journal], -+ [libsystemd], - [have_journald=yes], [have_journald=no]) - - if test "x$enable_systemd_journal" = "xauto" ; then diff --git a/pkgs/desktops/gnome-3/3.18/core/gdm/no-dbus-launch.patch b/pkgs/desktops/gnome-3/3.18/core/gdm/no-dbus-launch.patch deleted file mode 100644 index c87554078c7c..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gdm/no-dbus-launch.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/daemon/gdm-launch-environment.c 2015-06-22 15:11:07.277474398 +0000 -+++ b/daemon/gdm-launch-environment.c 2015-06-22 15:12:31.301157665 +0000 -@@ -48,8 +48,6 @@ - #include "gdm-session-enum-types.h" - #include "gdm-launch-environment.h" - --#define DBUS_LAUNCH_COMMAND BINDIR "/dbus-launch --exit-with-session" -- - extern char **environ; - - #define GDM_LAUNCH_ENVIRONMENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_LAUNCH_ENVIRONMENT, GdmLaunchEnvironmentPrivate)) -@@ -512,7 +510,7 @@ - gdm_session_select_program (launch_environment->priv->session, launch_environment->priv->command); - } else { - /* wrap it in dbus-launch */ -- char *command = g_strdup_printf ("%s %s", DBUS_LAUNCH_COMMAND, launch_environment->priv->command); -+ char *command = g_strdup (launch_environment->priv->command); - - gdm_session_select_program (launch_environment->priv->session, command); - g_free (command); diff --git a/pkgs/desktops/gnome-3/3.18/core/gdm/sessions_dir.patch b/pkgs/desktops/gnome-3/3.18/core/gdm/sessions_dir.patch deleted file mode 100644 index b8fbad4d731d..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gdm/sessions_dir.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c -index f759d2d..d154716 100644 ---- a/daemon/gdm-session.c -+++ b/daemon/gdm-session.c -@@ -373,9 +373,12 @@ get_system_session_dirs (void) - #ifdef ENABLE_WAYLAND_SUPPORT - DATADIR "/wayland-sessions/", - #endif -+ NULL, - NULL - }; - -+ search_dirs[4] = getenv("GDM_SESSIONS_DIR") != NULL ? getenv("GDM_SESSIONS_DIR") : NULL; -+ - return search_dirs; - } - diff --git a/pkgs/desktops/gnome-3/3.18/core/gdm/src.nix b/pkgs/desktops/gnome-3/3.18/core/gdm/src.nix deleted file mode 100644 index acd46534e14f..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gdm/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gdm-3.14.2"; - - src = fetchurl { - url = mirror://gnome/sources/gdm/3.14/gdm-3.14.2.tar.xz; - sha256 = "e20eb61496161ad95b1058dbf8aea9b7b004df4d0ea6b0fab4401397d9db5930"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/gdm/xserver_path.patch b/pkgs/desktops/gnome-3/3.18/core/gdm/xserver_path.patch deleted file mode 100644 index 412daee9f270..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gdm/xserver_path.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/daemon/gdm-server.c 2014-07-30 23:00:17.786841724 +0200 -+++ b/daemon/gdm-server.c 2014-07-30 23:02:10.491239180 +0200 -@@ -322,7 +322,11 @@ - fallback: - #endif - -- server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options); -+ if (g_getenv("GDM_X_SERVER") != NULL) { -+ server->priv->command = g_strdup (g_getenv("GDM_X_SERVER")); -+ } else { -+ server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options); -+ } - } - - static gboolean diff --git a/pkgs/desktops/gnome-3/3.18/core/geocode-glib/default.nix b/pkgs/desktops/gnome-3/3.18/core/geocode-glib/default.nix deleted file mode 100644 index 4d75bdc49963..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/geocode-glib/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, intltool, libsoup, json_glib }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = with gnome3; - [ intltool pkgconfig glib libsoup json_glib ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.18/core/geocode-glib/src.nix b/pkgs/desktops/gnome-3/3.18/core/geocode-glib/src.nix deleted file mode 100644 index b541834a1c2a..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/geocode-glib/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "geocode-glib-3.18.1"; - - src = fetchurl { - url = mirror://gnome/sources/geocode-glib/3.18/geocode-glib-3.18.1.tar.xz; - sha256 = "75d12bf82575449b8290b7463e8b6cf1b99f2c9942db6391a3d5b0bbb600c365"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/gjs/default.nix b/pkgs/desktops/gnome-3/3.18/core/gjs/default.nix deleted file mode 100644 index ac53726bc537..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gjs/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, gtk3, gobjectIntrospection -, spidermonkey_24, pango, readline, glib, libxml2 }: - -let - majorVersion = "1.43"; -in -stdenv.mkDerivation rec { - name = "gjs-${majorVersion}.3"; - - src = fetchurl { - url = "mirror://gnome/sources/gjs/${majorVersion}/${name}.tar.xz"; - sha256 = "0khwm8l6m6x71rwf3q92d6scbhmrpiw7kqmj34nn588fb7a4vdc2"; - }; - - buildInputs = [ libxml2 gobjectIntrospection pkgconfig gtk3 glib pango readline ]; - - propagatedBuildInputs = [ spidermonkey_24 ]; - - postInstall = '' - sed 's|-lreadline|-L${readline.out}/lib -lreadline|g' -i $out/lib/libgjs.la - ''; - - meta = with stdenv.lib; { - maintainers = gnome3.maintainers; - platforms = platforms.linux; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-backgrounds/default.nix deleted file mode 100644 index 32d6d6e7535a..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-backgrounds/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, intltool }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - nativeBuildInputs = [ pkgconfig intltool ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-backgrounds/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-backgrounds/src.nix deleted file mode 100644 index b191826a2d01..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-backgrounds/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-backgrounds-3.18.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-backgrounds/3.18/gnome-backgrounds-3.18.0.tar.xz; - sha256 = "aa560f0e5f12a308dd36aaac2fff32916abd61d42f47b4bc42c8c7011bf2a7b9"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-bluetooth/default.nix deleted file mode 100644 index 7fae0b5c67f4..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-bluetooth/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, gnome3, pkgconfig, gtk3, intltool, glib -, udev, itstool, libxml2, makeWrapper, libnotify, libcanberra_gtk3 }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ pkgconfig intltool glib gtk3 udev libxml2 gnome3.defaultIconTheme - makeWrapper gnome3.gsettings_desktop_schemas itstool - libnotify libcanberra_gtk3 ]; - - preFixup = '' - wrapProgram "$out/bin/bluetooth-sendto" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://help.gnome.org/users/gnome-bluetooth/stable/index.html.en; - description = "Application that let you manage Bluetooth in the GNOME destkop"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-bluetooth/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-bluetooth/src.nix deleted file mode 100644 index 30edc3ab50ee..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-bluetooth/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-bluetooth-3.18.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-bluetooth/3.18/gnome-bluetooth-3.18.2.tar.xz; - sha256 = "d8df073c331df0f97261869fb77ffcdbf4e3e4eaf460d3c3ed2b16e03d9c5398"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-calculator/default.nix deleted file mode 100644 index b2135535de14..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-calculator/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig, libxml2 -, bash, gtk3, glib, wrapGAppsHook -, itstool, gnome3, librsvg, gdk_pixbuf, mpfr, gmp }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - - buildInputs = [ bash gtk3 glib intltool itstool - libxml2 gnome3.gtksourceview mpfr gmp - gdk_pixbuf gnome3.defaultIconTheme librsvg - gnome3.gsettings_desktop_schemas gnome3.dconf ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/action/show/Apps/Calculator; - description = "Application that solves mathematical equations and is suitable as a default application in a Desktop environment"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-calculator/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-calculator/src.nix deleted file mode 100644 index 41b03825303a..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-calculator/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-calculator-3.18.3"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-calculator/3.18/gnome-calculator-3.18.3.tar.xz; - sha256 = "c376a4a14a3f7946b799b8458ac4cf2694735fc7c20e90cfda29e209439e32ff"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-common/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-common/default.nix deleted file mode 100644 index f9261e183ef1..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-common/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, fetchurl, which, gnome3, autoconf, automake }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - patches = [(fetchurl { - name = "gnome-common-patch"; - url = "https://bug697543.bugzilla-attachments.gnome.org/attachment.cgi?id=240935"; - sha256 = "17abp7czfzirjm7qsn2czd03hdv9kbyhk3lkjxg2xsf5fky7z7jl"; - })]; - - propagatedBuildInputs = [ which autoconf automake ]; # autogen.sh which is using gnome_common tends to require which - - meta = with stdenv.lib; { - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-common/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-common/src.nix deleted file mode 100644 index 8ffe7e20e1a9..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-common/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-common-3.18.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-common/3.18/gnome-common-3.18.0.tar.xz; - sha256 = "22569e370ae755e04527b76328befc4c73b62bfd4a572499fde116b8318af8cf"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-contacts/default.nix deleted file mode 100644 index 6ec3c7871bb9..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-contacts/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ stdenv, intltool, fetchurl, evolution_data_server, db -, pkgconfig, gtk3, glib, libsecret -, libchamplain, clutter_gtk, geocode_glib -, bash, makeWrapper, itstool, folks, libnotify, libxml2 -, gnome3, librsvg, gdk_pixbuf, file, telepathy_glib, nspr, nss -, libsoup, vala, dbus_glib, automake115x, autoconf }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - doCheck = true; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard evolution_data_server ]; - - # force build from vala - preBuild = '' - touch src/*.vala - ''; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool evolution_data_server - gnome3.gsettings_desktop_schemas makeWrapper file libnotify - folks gnome3.gnome_desktop telepathy_glib libsecret dbus_glib - libxml2 libsoup gnome3.gnome_online_accounts nspr nss - gdk_pixbuf gnome3.defaultIconTheme librsvg - libchamplain clutter_gtk geocode_glib - vala automake115x autoconf db ]; - - preFixup = '' - for f in "$out/bin/gnome-contacts" "$out/libexec/gnome-contacts-search-provider"; do - wrapProgram $f \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - done - ''; - - patches = [ ./gio_unix.patch ]; - - patchFlags = "-p0"; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Contacts; - description = "Contacts is GNOME's integrated address book"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-contacts/gio_unix.patch b/pkgs/desktops/gnome-3/3.18/core/gnome-contacts/gio_unix.patch deleted file mode 100644 index f1b3d3c94ac2..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-contacts/gio_unix.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.ac.orig 2015-04-09 18:45:50.581232289 +0200 -+++ configure.ac 2015-04-09 18:45:59.744280137 +0200 -@@ -54,6 +54,7 @@ - champlain-0.12 - clutter-gtk-1.0 - geocode-glib-1.0 >= 3.15.3 -+ gio-unix-2.0 - " - PKG_CHECK_MODULES(CONTACTS, [$pkg_modules]) - diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-contacts/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-contacts/src.nix deleted file mode 100644 index 9a47605b3bc3..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-contacts/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-contacts-3.18.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-contacts/3.18/gnome-contacts-3.18.1.tar.xz; - sha256 = "0418d25e70e73c05f4db58ce843819ef91180a21531549a832eafeaf2700cf26"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-control-center/default.nix deleted file mode 100644 index eab991f90a22..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-control-center/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, makeWrapper -, libcanberra, libcanberra_gtk3, accountsservice, libpwquality, libpulseaudio -, gdk_pixbuf, librsvg, libxkbfile, libnotify, libgudev -, libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk -, cracklib, python, libkrb5, networkmanagerapplet, networkmanager -, libwacom, samba, shared_mime_info, tzdata, icu, libtool, udev -, docbook_xsl, docbook_xsl_ns, modemmanager, clutter, clutter_gtk -, fontconfig, sound-theme-freedesktop }: - -# http://ftp.gnome.org/pub/GNOME/teams/releng/3.10.2/gnome-suites-core-3.10.2.modules -# TODO: bluetooth, wacom, printers - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - propagatedUserEnvPkgs = - [ gnome3.gnome_themes_standard gnome3.libgnomekbd ]; - - # https://bugzilla.gnome.org/show_bug.cgi?id=752596 - enableParallelBuilding = false; - - buildInputs = with gnome3; - [ pkgconfig intltool ibus gtk glib upower libcanberra gsettings_desktop_schemas - libxml2 gnome_desktop gnome_settings_daemon polkit libxslt libgtop gnome-menus - gnome_online_accounts libsoup colord libpulseaudio fontconfig colord-gtk libpwquality - accountsservice libkrb5 networkmanagerapplet libwacom samba libnotify libxkbfile - shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo - gdk_pixbuf gnome3.defaultIconTheme librsvg clutter clutter_gtk - gnome3.vino udev libcanberra_gtk3 libgudev - networkmanager modemmanager makeWrapper gnome3.gnome-bluetooth ]; - - preBuild = '' - substituteInPlace tz.h --replace "/usr/share/zoneinfo/zone.tab" "${tzdata}/share/zoneinfo/zone.tab" - substituteInPlace panels/datetime/tz.h --replace "/usr/share/zoneinfo/zone.tab" "${tzdata}/share/zoneinfo/zone.tab" - - # hack to make test-endianess happy - mkdir -p $out/share/locale - substituteInPlace panels/datetime/test-endianess.c --replace "/usr/share/locale/" "$out/share/locale/" - ''; - - patches = [ ./vpn_plugins_path.patch ]; - - preFixup = with gnome3; '' - wrapProgram $out/bin/gnome-control-center \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:${sound-theme-freedesktop}/share:$out/share:$out/share/gnome-control-center:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - for i in $out/share/applications/*; do - substituteInPlace $i --replace "gnome-control-center" "$out/bin/gnome-control-center" - done - ''; - - meta = with stdenv.lib; { - description = "Utilities to configure the GNOME desktop"; - license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; - platforms = platforms.linux; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-control-center/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-control-center/src.nix deleted file mode 100644 index 87263aef6854..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-control-center/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-control-center-3.18.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-control-center/3.18/gnome-control-center-3.18.2.tar.xz; - sha256 = "36fe6157247d2b7c8a98dbb3dbcde1c3a6f9e5e8fcc9ccf357e2b2417578f8ad"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-control-center/vpn_plugins_path.patch b/pkgs/desktops/gnome-3/3.18/core/gnome-control-center/vpn_plugins_path.patch deleted file mode 100644 index e25105a303f4..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-control-center/vpn_plugins_path.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/panels/network/connection-editor/vpn-helpers.c b/panels/network/connection-editor/vpn-helpers.c -index 7dc23c2..fcb1384 100644 ---- a/panels/network/connection-editor/vpn-helpers.c -+++ b/panels/network/connection-editor/vpn-helpers.c -@@ -95,14 +95,6 @@ vpn_get_plugins (GError **error) - if (!so_path) - goto next; - -- /* Remove any path and extension components, then reconstruct path -- * to the SO in LIBDIR -- */ -- so_name = g_path_get_basename (so_path); -- g_free (so_path); -- so_path = g_build_filename (NM_VPN_MODULE_DIR, so_name, NULL); -- g_free (so_name); -- - module = g_module_open (so_path, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL); - if (!module) { - g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "Cannot load the VPN plugin which provides the " diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-desktop/default.nix deleted file mode 100644 index 7265f09731fd..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-desktop/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, python, libxml2Python, libxslt, which, libX11, gnome3, gtk3, glib -, intltool, gnome_doc_utils, libxkbfile, xkeyboard_config, isocodes, itstool, wayland -, gobjectIntrospection }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - # this should probably be setuphook for glib - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - - enableParallelBuilding = true; - - buildInputs = [ pkgconfig python libxml2Python libxslt which libX11 - xkeyboard_config isocodes itstool wayland - gtk3 glib intltool gnome_doc_utils libxkbfile - gobjectIntrospection ]; - - propagatedBuildInputs = [ gnome3.gsettings_desktop_schemas ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-desktop/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-desktop/src.nix deleted file mode 100644 index 3a864781f927..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-desktop/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-desktop-3.18.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-desktop/3.18/gnome-desktop-3.18.2.tar.xz; - sha256 = "ddd46d022de137543a71f50c7392b32f9b98d5d3f2b53040b35f5802de2e7b56"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-dictionary/default.nix deleted file mode 100644 index c94c178558da..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-dictionary/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, intltool, fetchurl -, pkgconfig, gtk3, glib -, bash, makeWrapper, itstool, libxml2 -, gnome3, librsvg, gdk_pixbuf, file }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - doCheck = true; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 file - gnome3.gsettings_desktop_schemas makeWrapper ]; - - preFixup = '' - wrapProgram "$out/bin/gnome-dictionary" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Dictionary; - description = "Dictionary is the GNOME application to look up definitions"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-dictionary/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-dictionary/src.nix deleted file mode 100644 index 07fe6eceb13b..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-dictionary/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-dictionary-3.18.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-dictionary/3.18/gnome-dictionary-3.18.1.tar.xz; - sha256 = "92cf2d519335b125018468c22405499fdb320e4446201c7b0f55f1a441bf05cc"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-disk-utility/default.nix deleted file mode 100644 index 02d49df3411c..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-disk-utility/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig, udisks2, libsecret, libdvdread -, bash, gtk3, glib, wrapGAppsHook, cracklib, libnotify -, itstool, gnome3, librsvg, gdk_pixbuf, libxml2, python -, libcanberra_gtk3, libxslt, libtool, docbook_xsl, libpwquality }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - doCheck = true; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ bash pkgconfig gtk3 glib intltool itstool - libxslt libtool libsecret libpwquality cracklib - libnotify libdvdread libcanberra_gtk3 docbook_xsl - gdk_pixbuf gnome3.defaultIconTheme - librsvg udisks2 gnome3.gnome_settings_daemon - gnome3.gsettings_desktop_schemas wrapGAppsHook libxml2 ]; - - - meta = with stdenv.lib; { - homepage = http://en.wikipedia.org/wiki/GNOME_Disks; - description = "A udisks graphical front-end"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-disk-utility/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-disk-utility/src.nix deleted file mode 100644 index 9014ce2effb6..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-disk-utility/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-disk-utility-3.18.3.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-disk-utility/3.18/gnome-disk-utility-3.18.3.1.tar.xz; - sha256 = "652e6332bcf987b15621ebcefc2c14f360b21b7295f94fded6ecfc40c45ae4e8"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-font-viewer/default.nix deleted file mode 100644 index d0ec2307a852..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-font-viewer/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, intltool, fetchurl -, pkgconfig, gtk3, glib -, bash, makeWrapper, itstool -, gnome3, librsvg, gdk_pixbuf }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - doCheck = true; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gnome_desktop - gdk_pixbuf gnome3.defaultIconTheme librsvg - gnome3.gsettings_desktop_schemas makeWrapper ]; - - preFixup = '' - wrapProgram "$out/bin/gnome-font-viewer" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - description = "Program that can preview fonts and create thumbnails for fonts"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-font-viewer/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-font-viewer/src.nix deleted file mode 100644 index 256890e8079c..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-font-viewer/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-font-viewer-3.16.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-font-viewer/3.16/gnome-font-viewer-3.16.2.tar.xz; - sha256 = "f5367417d926d1dbe175aceb8eb4d2733d723a237428f130edd4b4023c0dc1cf"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-keyring/default.nix deleted file mode 100644 index 22d09c04141d..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-keyring/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python, glib, libxslt -, intltool, pango, gcr, gdk_pixbuf, atk, p11_kit, wrapGAppsHook -, docbook_xsl_ns, docbook_xsl, gnome3 }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = with gnome3; [ - dbus libgcrypt pam python gtk3 gconf libgnome_keyring - pango gcr gdk_pixbuf atk p11_kit wrapGAppsHook - ]; - - propagatedBuildInputs = [ glib libtasn1 libxslt ]; - - nativeBuildInputs = [ pkgconfig intltool docbook_xsl_ns docbook_xsl ]; - - configureFlags = [ - "--with-pkcs11-config=$$out/etc/pkcs11/" # installation directories - "--with-pkcs11-modules=$$out/lib/pkcs11/" - ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-keyring/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-keyring/src.nix deleted file mode 100644 index a9ad02a6217e..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-keyring/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-keyring-3.18.3"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-keyring/3.18/gnome-keyring-3.18.3.tar.xz; - sha256 = "3f670dd61789bdda75b9c9e31e289bf7b1d23ba012433474790081ba7dc0ed98"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-menus/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-menus/default.nix deleted file mode 100644 index 90209634fbf1..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-menus/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, intltool, pkgconfig, glib, gobjectIntrospection }: - -stdenv.mkDerivation rec { - name = "gnome-menus-${version}"; - version = "3.10.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-menus/3.10/${name}.tar.xz"; - sha256 = "0wcacs1vk3pld8wvrwq7fdrm11i56nrajkrp6j1da6jc4yx0m5a6"; - }; - - makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"; - - buildInputs = [ intltool pkgconfig glib gobjectIntrospection ]; - - meta = { - homepage = "http://www.gnome.org"; - description = "Gnome menu specification"; - - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-online-accounts/default.nix deleted file mode 100644 index b7da02868b8b..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-online-accounts/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, libxslt, gtk, makeWrapper -, webkitgtk, json_glib, rest, libsecret, dbus_glib, gnome_common -, telepathy_glib, intltool, dbus_libs, icu, autoreconfHook -, libsoup, docbook_xsl_ns, docbook_xsl, gnome3, wrapGAppsHook -}: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0"; - - enableParallelBuilding = true; - - preAutoreconf = '' - sed '/disable-settings/d' -i configure.ac - sed "/if HAVE_INTROSPECTION/a INTROSPECTION_COMPILER_ARGS = --shared-library=$out/lib/libgoa-1.0.so" -i src/goa/Makefile.am - ''; - - buildInputs = [ pkgconfig glib libxslt gtk webkitgtk json_glib rest gnome_common wrapGAppsHook - libsecret dbus_glib telepathy_glib intltool icu libsoup autoreconfHook - docbook_xsl_ns docbook_xsl gnome3.defaultIconTheme ]; - - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-online-accounts/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-online-accounts/src.nix deleted file mode 100644 index 3dd7f17a42e7..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-online-accounts/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-online-accounts-3.18.3"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-online-accounts/3.18/gnome-online-accounts-3.18.3.tar.xz; - sha256 = "bfb983831af8b1fbd81b70befda7683a38f86ca4cc911f763ae31207306e3827"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-online-miners/default.nix deleted file mode 100644 index 4c879b750980..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-online-miners/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, gnome3, libxml2 -, libsoup, json_glib, gmp, openssl, makeWrapper }: - -let - majVer = "3.14"; -in stdenv.mkDerivation rec { - name = "gnome-online-miners-${majVer}.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-online-miners/${majVer}/${name}.tar.xz"; - sha256 = "0bbak8srcrvnw18s4ls5mqaamx9nqdi93lij6yjs0a3q320k22xl"; - }; - - doCheck = true; - - buildInputs = [ pkgconfig glib gnome3.libgdata libxml2 libsoup gmp openssl - gnome3.grilo gnome3.libzapojit gnome3.grilo-plugins - gnome3.gnome_online_accounts makeWrapper gnome3.libmediaart - gnome3.tracker gnome3.gfbgraph json_glib gnome3.rest ]; - - enableParallelBuilding = true; - - preFixup = '' - for f in $out/libexec/*; do - wrapProgram "$f" \ - --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" - done - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/GnomeOnlineMiners; - description = "A set of crawlers that go through your online content and index them locally in Tracker"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-screenshot/default.nix deleted file mode 100644 index 29ebe8b0ca64..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-screenshot/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig, libcanberra_gtk3 -, bash, gtk3, glib, makeWrapper -, itstool, gnome3, librsvg, gdk_pixbuf }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - doCheck = true; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ]; - - buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libcanberra_gtk3 - gnome3.gsettings_desktop_schemas makeWrapper ]; - - preFixup = '' - wrapProgram "$out/bin/gnome-screenshot" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = http://en.wikipedia.org/wiki/GNOME_Screenshot; - description = "Utility used in the GNOME desktop environment for taking screenshots"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-screenshot/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-screenshot/src.nix deleted file mode 100644 index af6007fa2338..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-screenshot/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-screenshot-3.18.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-screenshot/3.18/gnome-screenshot-3.18.0.tar.xz; - sha256 = "eba64dbf4acf0ab8222fec549d0a4f2dd7dbd51c255e7978dedf1f5c06a98841"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-session/default.nix deleted file mode 100644 index dedad0729d1b..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-session/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, glib, dbus_glib, json_glib, upower -, libxslt, intltool, makeWrapper, systemd, xorg }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - configureFlags = "--enable-systemd"; - - buildInputs = with gnome3; - [ pkgconfig glib gnome_desktop gtk dbus_glib json_glib libxslt - gnome3.gnome_settings_daemon xorg.xtrans gnome3.defaultIconTheme - gsettings_desktop_schemas upower intltool gconf makeWrapper systemd ]; - - preFixup = '' - wrapProgram "$out/bin/gnome-session" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-session/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-session/src.nix deleted file mode 100644 index 41c48b7f5347..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-session/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-session-3.18.1.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-session/3.18/gnome-session-3.18.1.2.tar.xz; - sha256 = "b37d823d57ff2e3057401a426279954699cfe1e44e59a4cbdd941687ff928a45"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-settings-daemon/default.nix deleted file mode 100644 index 2a93328d8ca0..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-settings-daemon/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, intltool, glib, libnotify, lcms2, libXtst -, libxkbfile, libpulseaudio, libcanberra_gtk3, upower, colord, libgweather, polkit -, geoclue2, librsvg, xf86_input_wacom, udev, libgudev, libwacom, libxslt, libtool, networkmanager -, docbook_xsl, docbook_xsl_ns, makeWrapper, ibus, xkeyboard_config }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - # fatal error: gio/gunixfdlist.h: No such file or directory - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - - buildInputs = with gnome3; - [ intltool pkgconfig ibus gtk glib gsettings_desktop_schemas networkmanager - libnotify gnome_desktop lcms2 libXtst libxkbfile libpulseaudio - libcanberra_gtk3 upower colord libgweather xkeyboard_config - polkit geocode_glib geoclue2 librsvg xf86_input_wacom udev libgudev libwacom libxslt - libtool docbook_xsl docbook_xsl_ns makeWrapper gnome_themes_standard ]; - - preFixup = '' - wrapProgram "$out/libexec/gnome-settings-daemon-localeexec" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix PATH : "${glib}/bin" \ - --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-settings-daemon/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-settings-daemon/src.nix deleted file mode 100644 index fea0cf72cd99..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-settings-daemon/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-settings-daemon-3.18.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-settings-daemon/3.18/gnome-settings-daemon-3.18.2.tar.xz; - sha256 = "3071c7258f22684f7f64b7f735821e4cb25f59fc4665eb08e8d86b560e72fc6f"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-shell-extensions/default.nix deleted file mode 100644 index e9eae87f14e3..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-shell-extensions/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, intltool, fetchurl, libgtop, pkgconfig, gtk3, glib -, bash, makeWrapper, itstool, gnome3, file }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - doCheck = true; - - buildInputs = [ pkgconfig gtk3 glib libgtop intltool itstool - makeWrapper file ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/GnomeShell/Extensions; - description = "Modify and extend GNOME Shell functionality and behavior"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-shell-extensions/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-shell-extensions/src.nix deleted file mode 100644 index 96ad5a9c84b9..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-shell-extensions/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-shell-extensions-3.18.3"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-shell-extensions/3.18/gnome-shell-extensions-3.18.3.tar.xz; - sha256 = "2bb3726decf14a31ae35755c049d8f03425231857c42ed27f01854af755ec035"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-shell/default.nix deleted file mode 100644 index 2c9e54a229b3..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-shell/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, json_glib, libcroco, intltool, libsecret -, python3, python3Packages, libsoup, polkit, clutter, networkmanager -, docbook_xsl , docbook_xsl_ns, at_spi2_core, libstartup_notification -, telepathy_glib, telepathy_logger, libXtst, p11_kit, unzip, sqlite, libgweather -, libcanberra_gtk3 , libpulseaudio, libical, libtool, nss, gobjectIntrospection -, gstreamer, makeWrapper , accountsservice, gdk_pixbuf, gdm, upower, ibus -, networkmanagerapplet, librsvg }: - -# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - # Needed to find /etc/NetworkManager/VPN - configureFlags = [ "--sysconfdir=/etc" ]; - - buildInputs = with gnome3; - [ gsettings_desktop_schemas gnome_keyring gnome-menus glib gcr json_glib accountsservice - libcroco intltool libsecret pkgconfig python3 python3Packages.pygobject3 - libsoup polkit libcanberra gdk_pixbuf librsvg - clutter networkmanager libstartup_notification telepathy_glib docbook_xsl docbook_xsl_ns - libXtst p11_kit networkmanagerapplet gjs mutter libpulseaudio caribou evolution_data_server - libical libtool nss gobjectIntrospection gtk gstreamer makeWrapper gdm - libcanberra_gtk3 gnome_control_center - defaultIconTheme sqlite gnome3.gnome-bluetooth - libgweather # not declared at build time, but typelib is needed at runtime - gnome3.gnome-clocks # schemas needed - at_spi2_core upower ibus gnome_session gnome_desktop telepathy_logger gnome3.gnome_settings_daemon ]; - - installFlags = [ "keysdir=$(out)/share/gnome-control-center/keybindings" ]; - - preBuild = '' - patchShebangs src/data-to-c.pl - substituteInPlace data/Makefile --replace " install-keysDATA" "" - ''; - - preFixup = with gnome3; '' - wrapProgram "$out/bin/gnome-shell" \ - --prefix PATH : "${unzip}/bin" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS" \ - --suffix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - - wrapProgram "$out/bin/gnome-shell-extension-tool" \ - --prefix PYTHONPATH : "${python3Packages.pygobject3}/lib/python3.4/site-packages:$PYTHONPATH" - - wrapProgram "$out/libexec/gnome-shell-calendar-server" \ - --prefix XDG_DATA_DIRS : "${evolution_data_server}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - - echo "${unzip}/bin" > $out/${passthru.mozillaPlugin}/extra-bin-path - ''; - - passthru = { - mozillaPlugin = "/lib/mozilla/plugins"; - }; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-shell/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-shell/src.nix deleted file mode 100644 index 5d0ee821394c..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-shell/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-shell-3.18.3"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-shell/3.18/gnome-shell-3.18.3.tar.xz; - sha256 = "8517baf8606f970ebf38222411eb7563cab2ae5efbfb088954ce23705b67519b"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-system-log/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-system-log/default.nix deleted file mode 100644 index 50ee229cfa49..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-system-log/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig -, bash, gtk3, glib, makeWrapper -, itstool, gnome3, librsvg, gdk_pixbuf, libxml2 }: - -stdenv.mkDerivation rec { - name = "gnome-system-log-3.9.90"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-system-log/3.9/${name}.tar.xz"; - sha256 = "9eeb51982d347aa7b33703031e2c1d8084201374665425cd62199649b29a5411"; - }; - - doCheck = true; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ]; - - buildInputs = [ bash pkgconfig gtk3 glib intltool itstool - gnome3.gsettings_desktop_schemas makeWrapper libxml2 ]; - - preFixup = '' - wrapProgram "$out/bin/gnome-system-log" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://help.gnome.org/users/gnome-system-log/3.9/; - description = "Graphical, menu-driven viewer that you can use to view and monitor your system logs"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-system-monitor/default.nix deleted file mode 100644 index bdbdefecf229..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-system-monitor/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig, gtkmm3, libxml2 -, bash, gtk3, glib, makeWrapper -, itstool, gnome3, librsvg, gdk_pixbuf, libgtop }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - doCheck = true; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libxml2 - gtkmm3 libgtop makeWrapper - gdk_pixbuf gnome3.defaultIconTheme librsvg - gnome3.gsettings_desktop_schemas ]; - - preFixup = '' - wrapProgram "$out/bin/gnome-system-monitor" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - homepage = https://help.gnome.org/users/gnome-system-monitor/3.12/; - description = "System Monitor shows you what programs are running and how much processor time, memory, and disk space are being used"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-system-monitor/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-system-monitor/src.nix deleted file mode 100644 index ab800c1aecc8..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-system-monitor/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-system-monitor-3.18.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-system-monitor/3.18/gnome-system-monitor-3.18.2.tar.xz; - sha256 = "9e4a5d6aefa362448f301907fe07f3889e3dd7824922ceef8c48a7808be3e666"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-terminal/default.nix deleted file mode 100644 index c523d732e03a..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-terminal/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, cairo, libxml2, gnome3, pango -, gnome_doc_utils, intltool, libX11, which, libuuid, vala -, desktop_file_utils, itstool, wrapGAppsHook, appdata-tools }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ gnome3.gtk gnome3.gsettings_desktop_schemas gnome3.vte appdata-tools - gnome3.dconf itstool gnome3.nautilus vala ]; - - nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which libuuid libxml2 - desktop_file_utils wrapGAppsHook ]; - - # Silly ./configure, it looks for dbus file from gnome-shell in the - # installation tree of the package it is configuring. - preConfigure = '' - mkdir -p "$out/share/dbus-1/interfaces" - cp "${gnome3.gnome_shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml" "$out/share/dbus-1/interfaces" - ''; - - # FIXME: enable for gnome3 - configureFlags = [ "--disable-migration" ]; - - meta = with stdenv.lib; { - description = "The GNOME Terminal Emulator"; - homepage = https://wiki.gnome.org/Apps/Terminal/; - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-terminal/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-terminal/src.nix deleted file mode 100644 index 2827ca7c65c1..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-terminal/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-terminal-3.18.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-terminal/3.18/gnome-terminal-3.18.2.tar.xz; - sha256 = "5e35c0fa1395258bab83952cfabe4c1828b8655bcd761f8faed70b452bd89efa"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-themes-standard/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-themes-standard/default.nix deleted file mode 100644 index a33252a934c3..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-themes-standard/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ stdenv, fetchurl, intltool, gtk3, gnome3, librsvg, pkgconfig, pango, atk, gtk2 -, gdk_pixbuf }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ intltool gtk3 librsvg pkgconfig pango atk gtk2 gdk_pixbuf - gnome3.defaultIconTheme ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-themes-standard/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-themes-standard/src.nix deleted file mode 100644 index c352242537a8..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-themes-standard/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-themes-standard-3.18.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-themes-standard/3.18/gnome-themes-standard-3.18.0.tar.xz; - sha256 = "e646eb04c225282b7df7fff65741adaad4cf9ed2c12616b7310e7edd27d2bacb"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-user-docs/default.nix deleted file mode 100644 index 4f02673e036f..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-user-docs/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, file, gnome3, itstool, libxml2, intltool }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ pkgconfig gnome3.yelp itstool libxml2 intltool ]; - - meta = with stdenv.lib; { - homepage = "https://help.gnome.org/users/gnome-help/${gnome3.version}"; - description = "User and system administration help for the GNOME desktop"; - maintainers = gnome3.maintainers; - license = licenses.cc-by-30; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-user-docs/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-user-docs/src.nix deleted file mode 100644 index 61bbcf576cee..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-user-docs/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-user-docs-3.18.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-user-docs/3.18/gnome-user-docs-3.18.1.tar.xz; - sha256 = "83e52528de6afe4412679d7fd8c7f8124b07770b4e291592f24e9e50657efae4"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-user-share/default.nix deleted file mode 100644 index b1fb1eaf3dd4..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-user-share/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ stdenv, intltool, fetchurl, apacheHttpd_2_2, nautilus -, pkgconfig, gtk3, glib, libxml2, gnused -, bash, makeWrapper, itstool, libnotify, libtool, mod_dnssd -, gnome3, librsvg, gdk_pixbuf, file, libcanberra_gtk3 }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - doCheck = true; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; - - preConfigure = '' - sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' -i data/dav_user_2.2.conf - ''; - - configureFlags = [ "--with-httpd=${apacheHttpd_2_2.out}/bin/httpd" - "--with-modules-path=${apacheHttpd_2_2.out}/modules" - "--disable-bluetooth" - "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 libtool - makeWrapper file gdk_pixbuf gnome3.defaultIconTheme librsvg - nautilus libnotify libcanberra_gtk3 ]; - - postInstall = '' - mkdir -p $out/share/gsettings-schemas/$name - mv $out/share/glib-2.0 $out/share/gsettings-schemas/$name - ${glib.dev}/bin/glib-compile-schemas $out/share/gsettings-schemas/$name/glib-2.0/schemas - ''; - - preFixup = '' - wrapProgram "$out/libexec/gnome-user-share-webdav" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://help.gnome.org/users/gnome-user-share/3.8; - description = "Service that exports the contents of the Public folder in your home directory on the local network"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-user-share/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-user-share/src.nix deleted file mode 100644 index e0a283d896dc..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gnome-user-share/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-user-share-3.18.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-user-share/3.18/gnome-user-share-3.18.0.tar.xz; - sha256 = "feb3bed59193eafea31f563ed7eab5f066aa5f86d4a89f067b162653d168d3fc"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/grilo-plugins/default.nix b/pkgs/desktops/gnome-3/3.18/core/grilo-plugins/default.nix deleted file mode 100644 index f08920efa139..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/grilo-plugins/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, file, intltool, glib, sqlite -, gnome3, libxml2, gupnp, gssdp, lua5, liboauth, gupnp_av -, gmime, json_glib, avahi, tracker, itstool }: - -stdenv.mkDerivation rec { - name = "grilo-plugins-0.2.16"; - - src = fetchurl { - url = "mirror://gnome/sources/grilo-plugins/0.2/${name}.tar.xz"; - sha256 = "00sjmkzxc8w4qn4lp5yj65c4y83mwhp0zlvk11ghvpxnklgmgd40"; - }; - - installFlags = [ "GRL_PLUGINS_DIR=$(out)/lib/grilo-0.2" ]; - - buildInputs = [ pkgconfig gnome3.grilo libxml2 gupnp gssdp gnome3.libgdata - lua5 liboauth gupnp_av sqlite gnome3.gnome_online_accounts - gnome3.totem-pl-parser gnome3.rest gmime json_glib - avahi gnome3.libmediaart tracker intltool itstool ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/action/show/Projects/Grilo; - description = "A collection of plugins for the Grilo framework"; - maintainers = gnome3.maintainers; - license = licenses.lgpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/grilo/default.nix b/pkgs/desktops/gnome-3/3.18/core/grilo/default.nix deleted file mode 100644 index f5c9a613f25a..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/grilo/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, file, intltool, glib -, libxml2, gnome3, gobjectIntrospection, libsoup }: - -stdenv.mkDerivation rec { - name = "grilo-0.2.14"; - - src = fetchurl { - url = "mirror://gnome/sources/grilo/0.2/${name}.tar.xz"; - sha256 = "1k8wj8f7xfaw5hxypnmwd34li3fq8h76dacach547rvsfjhjxj3r"; - }; - - setupHook = ./setup-hook.sh; - - configureFlags = [ "--enable-grl-pls" "--enable-grl-net" ]; - - preConfigure = '' - for f in src/Makefile.in libs/pls/Makefile.in libs/net/Makefile.in; do - substituteInPlace $f --replace @INTROSPECTION_GIRDIR@ "$out/share/gir-1.0/" - substituteInPlace $f --replace @INTROSPECTION_TYPELIBDIR@ "$out/lib/girepository-1.0" - done - ''; - - buildInputs = [ pkgconfig file intltool glib libxml2 libsoup - gnome3.totem-pl-parser gobjectIntrospection ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/action/show/Projects/Grilo; - description = "Framework that provides access to various sources of multimedia content, using a pluggable system"; - maintainers = gnome3.maintainers; - license = licenses.lgpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/grilo/setup-hook.sh b/pkgs/desktops/gnome-3/3.18/core/grilo/setup-hook.sh deleted file mode 100644 index bc93dddec386..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/grilo/setup-hook.sh +++ /dev/null @@ -1,7 +0,0 @@ -make_grilo_find_plugins() { - if [ -d "$1"/lib/grilo-0.2 ]; then - addToSearchPath GRL_PLUGIN_PATH "$1/lib/grilo-0.2" - fi -} - -envHooks+=(make_grilo_find_plugins) diff --git a/pkgs/desktops/gnome-3/3.18/core/gsettings-desktop-schemas/default.nix b/pkgs/desktops/gnome-3/3.18/core/gsettings-desktop-schemas/default.nix deleted file mode 100644 index 5123cadbdafd..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gsettings-desktop-schemas/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, gobjectIntrospection - # just for passthru -, gnome3, gtk3, gsettings_desktop_schemas }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - postPatch = '' - for file in "background" "screensaver"; do - substituteInPlace "schemas/org.gnome.desktop.$file.gschema.xml.in" \ - --replace "@datadir@" "${gnome3.gnome-backgrounds}/share/" - done - ''; - - buildInputs = [ glib gobjectIntrospection ]; - - nativeBuildInputs = [ pkgconfig intltool ]; - - meta = with stdenv.lib; { - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/gsettings-desktop-schemas/src.nix b/pkgs/desktops/gnome-3/3.18/core/gsettings-desktop-schemas/src.nix deleted file mode 100644 index a7d5a77a23bd..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gsettings-desktop-schemas/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gsettings-desktop-schemas-3.18.1"; - - src = fetchurl { - url = mirror://gnome/sources/gsettings-desktop-schemas/3.18/gsettings-desktop-schemas-3.18.1.tar.xz; - sha256 = "258713b2a3dc6b6590971bcfc81f98d78ea9827d60e2f55ffbe40d9cd0f99a1a"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/gsound/default.nix b/pkgs/desktops/gnome-3/3.18/core/gsound/default.nix deleted file mode 100644 index 5f255743313e..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gsound/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, libcanberra, gobjectIntrospection, libtool, gnome3 }: - -let - majVer = "1.0"; -in stdenv.mkDerivation rec { - name = "gsound-${majVer}.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gsound/${majVer}/${name}.tar.xz"; - sha256 = "ea0dd94429c0645f2f98824274ef04543fe459dd83a5449a68910acc3ba67f29"; - }; - - buildInputs = [ pkgconfig glib libcanberra gobjectIntrospection libtool ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/GSound; - description = "Small library for playing system sounds"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/gtksourceview/default.nix b/pkgs/desktops/gnome-3/3.18/core/gtksourceview/default.nix deleted file mode 100644 index ea95e39e5b2a..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gtksourceview/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango -, libxml2Python, perl, intltool, gettext, gnome3 }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - propagatedBuildInputs = [ gtk3 ]; - - buildInputs = [ pkgconfig atk cairo glib pango - libxml2Python perl intltool gettext ]; - - preBuild = '' - substituteInPlace gtksourceview/gtksourceview-utils.c --replace "@NIX_SHARE_PATH@" "$out/share" - ''; - - patches = [ ./nix_share_path.patch ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/gtksourceview/nix_share_path.patch b/pkgs/desktops/gnome-3/3.18/core/gtksourceview/nix_share_path.patch deleted file mode 100644 index c87350167c25..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gtksourceview/nix_share_path.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/gtksourceview/gtksourceview-utils.c 2014-07-13 16:13:57.418687726 +0200 -+++ b/gtksourceview/gtksourceview-utils.c 2014-07-13 16:14:20.550847767 +0200 -@@ -68,6 +68,8 @@ - basename, - NULL)); - -+ g_ptr_array_add (dirs, g_build_filename ("@NIX_SHARE_PATH@", SOURCEVIEW_DIR, basename, NULL)); -+ - g_ptr_array_add (dirs, NULL); - - return (gchar**) g_ptr_array_free (dirs, FALSE); diff --git a/pkgs/desktops/gnome-3/3.18/core/gtksourceview/src.nix b/pkgs/desktops/gnome-3/3.18/core/gtksourceview/src.nix deleted file mode 100644 index 6448f9aa99df..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gtksourceview/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gtksourceview-3.18.2"; - - src = fetchurl { - url = mirror://gnome/sources/gtksourceview/3.18/gtksourceview-3.18.2.tar.xz; - sha256 = "60f75a9f0039e13a2281fc595b5ef7344afa06732cc53b57d13234bfb0a5b7b2"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/3.18/core/gucharmap/default.nix deleted file mode 100644 index a43d3c570ce9..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gucharmap/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig, gtk3 -, glib, desktop_file_utils, bash, appdata-tools -, makeWrapper, gnome3, file, itstool, libxml2 }: - -# TODO: icons and theme still does not work -# use packaged gnome3.adwaita-icon-theme - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - doCheck = true; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; - - buildInputs = [ pkgconfig gtk3 intltool itstool glib appdata-tools - gnome3.yelp_tools libxml2 file desktop_file_utils - gnome3.gsettings_desktop_schemas makeWrapper ]; - - preFixup = '' - wrapProgram "$out/bin/gucharmap" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Gucharmap; - description = "GNOME Character Map, based on the Unicode Character Database"; - maintainers = gnome3.maintainers; - license = licenses.gpl3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/gucharmap/src.nix b/pkgs/desktops/gnome-3/3.18/core/gucharmap/src.nix deleted file mode 100644 index 69c0dd600251..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/gucharmap/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gucharmap-3.18.2"; - - src = fetchurl { - url = mirror://gnome/sources/gucharmap/3.18/gucharmap-3.18.2.tar.xz; - sha256 = "80141d3e892c3c4812c1a8fad8f89978559ef19e933843267e6e9a5524c09ec9"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/libcroco/default.nix b/pkgs/desktops/gnome-3/3.18/core/libcroco/default.nix deleted file mode 100644 index 563a18e510f1..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/libcroco/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, glib }: - -stdenv.mkDerivation rec { - name = "libcroco-0.6.11"; - - src = fetchurl { - url = "mirror://gnome/sources/libcroco/0.6/${name}.tar.xz"; - sha256 = "0mm0wldbi40am5qn0nv7psisbg01k42rwzjxl3gv11l5jj554aqk"; - }; - - outputs = [ "dev" "out" ]; - outputBin = "dev"; - - configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic"; - - buildInputs = [ pkgconfig libxml2 glib ]; - - meta = with stdenv.lib; { - platforms = platforms.unix; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/libgdata/default.nix b/pkgs/desktops/gnome-3/3.18/core/libgdata/default.nix deleted file mode 100644 index 8e934e211f80..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/libgdata/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxml2, glib, json_glib -, gobjectIntrospection, liboauth, gnome3, p11_kit, openssl }: - -let - majorVersion = "0.16"; -in -stdenv.mkDerivation rec { - name = "libgdata-${majorVersion}.1"; - - src = fetchurl { - url = "mirror://gnome/sources/libgdata/${majorVersion}/${name}.tar.xz"; - sha256 = "8740e071ecb2ae0d2a4b9f180d2ae5fdf9dc4c41e7ff9dc7e057f62442800827"; - }; - - # TODO: need libuhttpmock - configureFlags = "--disable-tests"; - - NIX_CFLAGS_COMPILE = "-I${gnome3.libsoup.dev}/include/libsoup-gnome-2.4/ -I${gnome3.gcr}/include/gcr-3 -I${gnome3.gcr}/include/gck-1"; - - buildInputs = with gnome3; - [ pkgconfig libsoup intltool libxml2 glib gobjectIntrospection - liboauth gcr gnome_online_accounts p11_kit openssl ]; - - propagatedBuildInputs = [ json_glib ]; - - meta = with stdenv.lib; { - description = "GData API library"; - maintainers = with maintainers; [ raskin lethalman ]; - platforms = platforms.linux; - license = licenses.lgpl21Plus; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.18/core/libgee/default.nix b/pkgs/desktops/gnome-3/3.18/core/libgee/default.nix deleted file mode 100644 index 4ff132950319..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/libgee/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl, autoconf, vala, pkgconfig, glib, gobjectIntrospection, gnome3 }: -let - ver_maj = "0.16"; - ver_min = "1"; -in -stdenv.mkDerivation rec { - name = "libgee-${ver_maj}.${ver_min}"; - - src = fetchurl { - url = "mirror://gnome/sources/libgee/${ver_maj}/${name}.tar.xz"; - sha256 = "d95f8ea8e78f843c71b1958fa2fb445e4a325e4821ec23d0d5108d8170e564a5"; - }; - - doCheck = true; - - patches = [ ./fix_introspection_paths.patch ]; - - buildInputs = [ autoconf vala pkgconfig glib gobjectIntrospection ]; - - meta = with stdenv.lib; { - description = "Utility library providing GObject-based interfaces and classes for commonly used data structures"; - license = licenses.lgpl21Plus; - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/libgee/fix_introspection_paths.patch b/pkgs/desktops/gnome-3/3.18/core/libgee/fix_introspection_paths.patch deleted file mode 100644 index 67003f451645..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/libgee/fix_introspection_paths.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- fix_introspection_paths.patch/configure 2014-01-07 17:43:53.521339338 +0000 -+++ fix_introspection_paths.patch/configure-fix 2014-01-07 17:45:11.068635069 +0000 -@@ -12085,8 +12085,8 @@ - INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` - INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` - INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` -- INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` -- INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" -+ INTROSPECTION_GIRDIR="${datadir}/gir-1.0" -+ INTROSPECTION_TYPELIBDIR="${libdir}/girepository-1.0" - INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` - INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` - INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection diff --git a/pkgs/desktops/gnome-3/3.18/core/libgee/libgee-1.nix b/pkgs/desktops/gnome-3/3.18/core/libgee/libgee-1.nix deleted file mode 100644 index 1715e7eeb856..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/libgee/libgee-1.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl, autoconf, vala, pkgconfig, glib, gobjectIntrospection, gnome3 }: -let - ver_maj = "0.6"; - ver_min = "8"; -in -stdenv.mkDerivation rec { - name = "libgee-${ver_maj}.${ver_min}"; - - src = fetchurl { - url = "mirror://gnome/sources/libgee/${ver_maj}/${name}.tar.xz"; - sha256 = "1lzmxgz1bcs14ghfp8qqzarhn7s64ayx8c508ihizm3kc5wqs7x6"; - }; - - doCheck = true; - - patches = [ ./fix_introspection_paths.patch ]; - - buildInputs = [ autoconf vala pkgconfig glib gobjectIntrospection ]; - - meta = with stdenv.lib; { - description = "Utility library providing GObject-based interfaces and classes for commonly used data structures"; - license = licenses.lgpl21Plus; - platforms = platforms.linux; - maintainers = [ maintainers.spacefrogg ] ++ gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.18/core/libgnome-keyring/default.nix deleted file mode 100644 index c6c9323c010a..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/libgnome-keyring/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig, intltool, gobjectIntrospection }: - -stdenv.mkDerivation rec { - name = "libgnome-keyring-3.12.0"; - - src = fetchurl { - url = "mirror://gnome/sources/libgnome-keyring/3.12/${name}.tar.xz"; - sha256 = "c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783"; - }; - - propagatedBuildInputs = [ glib gobjectIntrospection dbus_libs libgcrypt ]; - nativeBuildInputs = [ pkgconfig intltool ]; - - meta = { - description = "Framework for managing passwords and other secrets"; - homepage = http://live.gnome.org/GnomeKeyring; - license = with stdenv.lib.licenses; [ gpl2Plus lgpl2Plus ]; - inherit (glib.meta) platforms maintainers; - - longDescription = '' - gnome-keyring is a program that keeps password and other secrets for - users. The library libgnome-keyring is used by applications to integrate - with the gnome-keyring system. - ''; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/libgnomekbd/default.nix b/pkgs/desktops/gnome-3/3.18/core/libgnomekbd/default.nix deleted file mode 100644 index 4939a4ff7281..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/libgnomekbd/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, file, intltool, glib, gtk3, libxklavier, makeWrapper, gnome3 }: - -stdenv.mkDerivation rec { - name = "libgnomekbd-3.6.0"; - - src = fetchurl { - url = "mirror://gnome/sources/libgnomekbd/3.6/${name}.tar.xz"; - sha256 = "c41ea5b0f64da470925ba09f9f1b46b26b82d4e433e594b2c71eab3da8856a09"; - }; - - buildInputs = [ pkgconfig file intltool glib gtk3 libxklavier makeWrapper ]; - - preFixup = '' - wrapProgram $out/bin/gkbd-keyboard-display \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - description = "Keyboard management library"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/libgweather/default.nix b/pkgs/desktops/gnome-3/3.18/core/libgweather/default.nix deleted file mode 100644 index 79ede15df8f0..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/libgweather/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, gtk, intltool, libsoup, gconf -, pango, gdk_pixbuf, atk, tzdata, gnome3 }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"; - - configureFlags = [ "--with-zoneinfo-dir=${tzdata}/share/zoneinfo" ]; - propagatedBuildInputs = [ libxml2 gtk libsoup gconf pango gdk_pixbuf atk gnome3.geocode_glib ]; - nativeBuildInputs = [ pkgconfig intltool ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/libgweather/src.nix b/pkgs/desktops/gnome-3/3.18/core/libgweather/src.nix deleted file mode 100644 index e7690af4c2de..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/libgweather/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "libgweather-3.18.1"; - - src = fetchurl { - url = mirror://gnome/sources/libgweather/3.18/libgweather-3.18.1.tar.xz; - sha256 = "94b2292f8f7616e2aa81b1516befd7b27682b20acecbd5d656b6954990ca7ad0"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/libgxps/default.nix b/pkgs/desktops/gnome-3/3.18/core/libgxps/default.nix deleted file mode 100644 index 5168dec203fa..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/libgxps/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, cairo, libarchive, freetype, libjpeg, libtiff -, openssl, bzip2, acl, attr -}: - -stdenv.mkDerivation rec { - name = "libgxps-0.2.2"; - - src = fetchurl { - url = "http://ftp.acc.umu.se/pub/GNOME/core/3.10/3.10.2/sources/${name}.tar.xz"; - sha256 = "1gi0b0x0354jyqc48vspk2hg2q1403cf2p9ibj847nzhkdrh9l9r"; - }; - - buildInputs = [ pkgconfig glib cairo freetype libjpeg libtiff acl openssl bzip2 attr]; - propagatedBuildInputs = [ libarchive ]; - - configureFlags = "--without-liblcms2"; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/libpeas/default.nix b/pkgs/desktops/gnome-3/3.18/core/libpeas/default.nix deleted file mode 100644 index a0b0523524c6..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/libpeas/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gnome3 -, glib, gtk3, gobjectIntrospection, python3, python3Packages, ncurses -}: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - configureFlags = [ "--enable-python3" ]; - - buildInputs = [ - intltool pkgconfig glib gtk3 gobjectIntrospection python3 python3Packages.pygobject3 - gnome3.defaultIconTheme ncurses - ]; - - meta = with stdenv.lib; { - description = "A GObject-based plugins engine"; - homepage = "http://ftp.acc.umu.se/pub/GNOME/sources/libpeas/"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/libpeas/src.nix b/pkgs/desktops/gnome-3/3.18/core/libpeas/src.nix deleted file mode 100644 index 8a24097bbd67..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/libpeas/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "libpeas-1.16.0"; - - src = fetchurl { - url = mirror://gnome/sources/libpeas/1.16/libpeas-1.16.0.tar.xz; - sha256 = "b093008ecd65f7d55c80517589509698ff15ad41f664b11a3eb88ff461b1454e"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/libzapojit/default.nix b/pkgs/desktops/gnome-3/3.18/core/libzapojit/default.nix deleted file mode 100644 index 5a8117528b68..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/libzapojit/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, intltool, json_glib, rest, libsoup, gtk, gnome_online_accounts }: - -stdenv.mkDerivation rec { - name = "libzapojit-0.0.3"; - - src = fetchurl { - url = "mirror://gnome/sources/libzapojit/0.0/${name}.tar.xz"; - sha256 = "0zn3s7ryjc3k1abj4k55dr2na844l451nrg9s6cvnnhh569zj99x"; - }; - - buildInputs = [ pkgconfig glib intltool json_glib rest libsoup gtk gnome_online_accounts ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/mutter/default.nix b/pkgs/desktops/gnome-3/3.18/core/mutter/default.nix deleted file mode 100644 index a128990b4029..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/mutter/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo -, pango, cogl, clutter, libstartup_notification, libcanberra, zenity, libcanberra_gtk3 -, libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - # fatal error: gio/gunixfdlist.h: No such file or directory - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; - - configureFlags = "--with-x --disable-static --enable-shape --enable-sm --enable-startup-notification --enable-xsync --enable-verbose-mode --with-libcanberra"; - - buildInputs = with gnome3; - [ pkgconfig intltool glib gobjectIntrospection gtk gsettings_desktop_schemas upower - gnome_desktop cairo pango cogl clutter zenity libstartup_notification libcanberra - gnome3.geocode_glib - libcanberra_gtk3 zenity libtool makeWrapper xkeyboard_config libxkbfile libxkbcommon ]; - - preFixup = '' - wrapProgram "$out/bin/mutter" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - ''; - - patches = [ ./x86.patch ./math.patch ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; - -} diff --git a/pkgs/desktops/gnome-3/3.18/core/mutter/math.patch b/pkgs/desktops/gnome-3/3.18/core/mutter/math.patch deleted file mode 100644 index dbdfd93f5e1d..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/mutter/math.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- mutter-3.18.0/src/backends/meta-cursor-renderer.c.orig 2015-09-23 13:54:31.297523343 +0200 -+++ mutter-3.18.0/src/backends/meta-cursor-renderer.c 2015-09-23 13:54:43.728271766 +0200 -@@ -31,6 +31,7 @@ - - #include <cogl/cogl.h> - #include <clutter/clutter.h> -+#include <math.h> - - #include "meta-stage.h" - diff --git a/pkgs/desktops/gnome-3/3.18/core/mutter/src.nix b/pkgs/desktops/gnome-3/3.18/core/mutter/src.nix deleted file mode 100644 index 7fbdae378e51..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/mutter/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "mutter-3.18.2"; - - src = fetchurl { - url = mirror://gnome/sources/mutter/3.18/mutter-3.18.2.tar.xz; - sha256 = "8a69326f216c7575ed6cd53938b9cfc49b3b359cde95d3b6a7ed46c837261181"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/mutter/x86.patch b/pkgs/desktops/gnome-3/3.18/core/mutter/x86.patch deleted file mode 100644 index bc8829de42f1..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/mutter/x86.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- mutter-3.16.2/src/core/window.c.orig 2015-05-26 10:52:41.382834963 +0200 -+++ mutter-3.16.2/src/core/window.c 2015-05-26 10:53:03.039948034 +0200 -@@ -3499,7 +3499,7 @@ - - static MetaMonitorInfo * - find_monitor_by_winsys_id (MetaWindow *window, -- guint winsys_id) -+ gint winsys_id) - { - int i; - -@@ -3618,7 +3618,7 @@ - */ - - gboolean did_placement; -- guint old_output_winsys_id; -+ gint old_output_winsys_id; - MetaRectangle unconstrained_rect; - MetaRectangle constrained_rect; - MetaMoveResizeResultFlags result = 0; diff --git a/pkgs/desktops/gnome-3/3.18/core/nautilus/default.nix b/pkgs/desktops/gnome-3/3.18/core/nautilus/default.nix deleted file mode 100644 index e8fc41df9c07..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/nautilus/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, dbus_glib, shared_mime_info, libexif -, gtk, gnome3, libunique, intltool, gobjectIntrospection -, libnotify, wrapGAppsHook, exempi, librsvg, tracker }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - - buildInputs = [ libxml2 dbus_glib shared_mime_info libexif gtk libunique intltool exempi librsvg - gnome3.gnome_desktop gnome3.adwaita-icon-theme - gnome3.gsettings_desktop_schemas gnome3.dconf libnotify tracker ]; - - patches = [ ./extension_dir.patch ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/nautilus/extension_dir.patch b/pkgs/desktops/gnome-3/3.18/core/nautilus/extension_dir.patch deleted file mode 100644 index 317b82579924..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/nautilus/extension_dir.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/libnautilus-private/nautilus-module.c b/libnautilus-private/nautilus-module.c -index 6273a76..4adcc8a 100644 ---- a/libnautilus-private/nautilus-module.c -+++ b/libnautilus-private/nautilus-module.c -@@ -242,11 +242,17 @@ void - nautilus_module_setup (void) - { - static gboolean initialized = FALSE; -+ const gchar* extensiondir = NULL; - - if (!initialized) { - initialized = TRUE; -- -- load_module_dir (NAUTILUS_EXTENSIONDIR); -+ -+ extensiondir = g_getenv ("NAUTILUS_EXTENSION_DIR"); -+ if (extensiondir == NULL) { -+ extensiondir = NAUTILUS_EXTENSIONDIR; -+ } -+ -+ load_module_dir (extensiondir); - - eel_debug_call_at_shutdown (free_module_objects); - } diff --git a/pkgs/desktops/gnome-3/3.18/core/nautilus/src.nix b/pkgs/desktops/gnome-3/3.18/core/nautilus/src.nix deleted file mode 100644 index 9314e202a881..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/nautilus/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "nautilus-3.18.5"; - - src = fetchurl { - url = mirror://gnome/sources/nautilus/3.18/nautilus-3.18.5.tar.xz; - sha256 = "60a927c0522b4cced9d8f62baed2ee5e2fd4305be4523eb5bc44805971a6cc15"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/rest/default.nix b/pkgs/desktops/gnome-3/3.18/core/rest/default.nix deleted file mode 100644 index 344bc00780f9..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/rest/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, libsoup, gobjectIntrospection, gnome3 }: - -stdenv.mkDerivation rec { - name = "rest-0.7.93"; - - src = fetchurl { - url = "mirror://gnome/sources/rest/0.7/${name}.tar.xz"; - sha256 = "05mj10hhiik23ai8w4wkk5vhsp7hcv24bih5q3fl82ilam268467"; - }; - - buildInputs = [ pkgconfig glib libsoup gobjectIntrospection]; - - configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt"; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/sushi/default.nix b/pkgs/desktops/gnome-3/3.18/core/sushi/default.nix deleted file mode 100644 index 17c37e89decc..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/sushi/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, file, intltool, gobjectIntrospection, glib -, clutter_gtk, clutter-gst, gnome3, gtksourceview, libmusicbrainz -, webkitgtk, libmusicbrainz5, icu, makeWrapper, gst_all_1 -, gdk_pixbuf, librsvg, gtk3 }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - propagatedUserEnvPkgs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ]; - - buildInputs = [ pkgconfig file intltool gobjectIntrospection glib gtk3 - clutter_gtk clutter-gst gnome3.gjs gtksourceview gdk_pixbuf - librsvg gnome3.defaultIconTheme libmusicbrainz5 webkitgtk - gnome3.evince icu makeWrapper ]; - - enableParallelBuilding = true; - - preFixup = '' - wrapProgram $out/libexec/sushi-start \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = "http://en.wikipedia.org/wiki/Sushi_(software)"; - description = "A quick previewer for Nautilus"; - maintainers = gnome3.maintainers; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/sushi/src.nix b/pkgs/desktops/gnome-3/3.18/core/sushi/src.nix deleted file mode 100644 index 5c852a0dc47c..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/sushi/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "sushi-3.18.0"; - - src = fetchurl { - url = mirror://gnome/sources/sushi/3.18/sushi-3.18.0.tar.xz; - sha256 = "7f4df92be950bf23aff28da49ce108766dd21a88efc14a9d0807e10225608e9c"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/totem-pl-parser/default.nix b/pkgs/desktops/gnome-3/3.18/core/totem-pl-parser/default.nix deleted file mode 100644 index 63f36004bcd6..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/totem-pl-parser/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, file, intltool, gmime, libxml2, libsoup, gnome3 }: - -stdenv.mkDerivation rec { - name = "totem-pl-parser-3.10.2"; - - src = fetchurl { - url = "mirror://gnome/sources/totem-pl-parser/3.10/${name}.tar.xz"; - sha256 = "38be09bddc46ddecd2b5ed7c82144ef52aafe879a5ec3d8b192b4b64ba995469"; - }; - - buildInputs = [ pkgconfig file intltool gmime libxml2 libsoup ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Videos; - description = "Simple GObject-based library to parse and save a host of playlist formats"; - maintainers = gnome3.maintainers; - license = licenses.lgpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/totem/default.nix b/pkgs/desktops/gnome-3/3.18/core/totem/default.nix deleted file mode 100644 index 5ffdbc68cb71..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/totem/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv, intltool, fetchurl, gst_all_1 -, clutter_gtk, clutter-gst, python3, python3Packages, shared_mime_info -, pkgconfig, gtk3, glib, gobjectIntrospection -, bash, makeWrapper, itstool, libxml2, dbus_glib -, gnome3, librsvg, gdk_pixbuf, file }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - doCheck = true; - - enableParallelBuilding = true; - - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 gnome3.grilo - clutter_gtk clutter-gst gnome3.totem-pl-parser gnome3.grilo-plugins - gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good - gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly gst_all_1.gst-libav - gnome3.libpeas python3Packages.pygobject3 gobjectIntrospection shared_mime_info dbus_glib - gdk_pixbuf gnome3.defaultIconTheme librsvg gnome3.gnome_desktop - gnome3.gsettings_desktop_schemas makeWrapper file ]; - - preFixup = '' - wrapProgram "$out/bin/totem" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix PYTHONPATH : "${python3Packages.pygobject3}/lib/python3.4/site-packages:$PYTHONPATH" \ - --prefix GI_TYPELIB_PATH : "$out/lib/girepository-1.0:$GI_TYPELIB_PATH" \ - --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ - --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Videos; - description = "Movie player for the GNOME desktop based on GStreamer"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/totem/src.nix b/pkgs/desktops/gnome-3/3.18/core/totem/src.nix deleted file mode 100644 index a946fe27a637..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/totem/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "totem-3.18.1"; - - src = fetchurl { - url = mirror://gnome/sources/totem/3.18/totem-3.18.1.tar.xz; - sha256 = "d7816eae9606846c44fd508902eae10bdaed28e6d4f621531990d473184107a2"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/tracker/default.nix b/pkgs/desktops/gnome-3/3.18/core/tracker/default.nix deleted file mode 100644 index 9c7fb9ce844f..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/tracker/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ stdenv, intltool, fetchurl, libxml2, upower -, pkgconfig, gtk3, glib, dconf -, bash, wrapGAppsHook, itstool, vala, sqlite, libxslt -, gnome3, librsvg, gdk_pixbuf, file, libnotify -, evolution_data_server, gst_all_1, poppler -, icu, taglib, libjpeg, libtiff, giflib, libcue -, libvorbis, flac, exempi, networkmanager -, libpng, libexif, libgsf, libuuid, bzip2 }: - -let - majorVersion = "1.8"; -in -stdenv.mkDerivation rec { - name = "tracker-${majorVersion}.0"; - - src = fetchurl { - url = "mirror://gnome/sources/tracker/${majorVersion}/${name}.tar.xz"; - sha256 = "0zchaahk4w7dwanqk1vx0qgnyrlzlp81krwawfx3mv5zffik27x1"; - }; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - - buildInputs = [ vala gtk3 glib dconf intltool itstool libxml2 - bzip2 gnome3.totem-pl-parser libxslt - gnome3.gsettings_desktop_schemas wrapGAppsHook file - gdk_pixbuf gnome3.defaultIconTheme librsvg sqlite - upower libnotify evolution_data_server gnome3.libgee - gst_all_1.gstreamer gst_all_1.gst-plugins-base flac - poppler icu taglib libjpeg libtiff giflib libvorbis - exempi networkmanager libpng libexif libgsf libuuid ]; - - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0 -I${poppler.dev}/include/poppler"; - - enableParallelBuilding = true; - - preConfigure = '' - substituteInPlace src/libtracker-sparql/Makefile.in \ - --replace "--shared-library=libtracker-sparql" "--shared-library=$out/lib/libtracker-sparql" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/Tracker; - description = "Desktop-neutral user information store, search tool and indexer"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/vino/default.nix b/pkgs/desktops/gnome-3/3.18/core/vino/default.nix deleted file mode 100644 index 336178f3729d..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/vino/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, intltool, fetchurl, gtk3, glib, libsoup, pkgconfig, makeWrapper -, gnome3, libnotify, file, telepathy_glib, dbus_glib }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - doCheck = true; - - buildInputs = [ gtk3 intltool glib libsoup pkgconfig libnotify - gnome3.defaultIconTheme dbus_glib telepathy_glib file - makeWrapper ]; - - preFixup = '' - wrapProgram "$out/libexec/vino-server" \ - --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/action/show/Projects/Vino; - description = "GNOME desktop sharing server"; - maintainers = with maintainers; [ lethalman domenkozar ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/vino/src.nix b/pkgs/desktops/gnome-3/3.18/core/vino/src.nix deleted file mode 100644 index e550fda483ed..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/vino/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "vino-3.18.1"; - - src = fetchurl { - url = mirror://gnome/sources/vino/3.18/vino-3.18.1.tar.xz; - sha256 = "07ec6e78bbecd4ee3fce873eb26932fdda9c7642bb09d17ac36483b996fafe5a"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/vte/2.90.nix b/pkgs/desktops/gnome-3/3.18/core/vte/2.90.nix deleted file mode 100644 index cbb52c9aaa12..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/vte/2.90.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gnome3, ncurses, gobjectIntrospection }: - -stdenv.mkDerivation rec { - versionMajor = "0.36"; - versionMinor = "3"; - moduleName = "vte"; - - name = "${moduleName}-${versionMajor}.${versionMinor}"; - - src = fetchurl { - url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; - sha256 = "54e5b07be3c0f7b158302f54ee79d4de1cb002f4259b6642b79b1e0e314a959c"; - }; - - buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib gnome3.gtk3 ncurses ]; - - configureFlags = [ "--enable-introspection" ]; - - enableParallelBuilding = true; - - postInstall = '' - substituteInPlace $out/lib/libvte2_90.la --replace "-lncurses" "-L${ncurses.out}/lib -lncurses" - ''; - - meta = with stdenv.lib; { - homepage = http://www.gnome.org/; - description = "A library implementing a terminal emulator widget for GTK+"; - longDescription = '' - VTE is a library (libvte) implementing a terminal emulator widget for - GTK+, and a minimal sample application (vte) using that. Vte is - mainly used in gnome-terminal, but can also be used to embed a - console/terminal in games, editors, IDEs, etc. VTE supports Unicode and - character set conversion, as well as emulating any terminal known to - the system's terminfo database. - ''; - license = licenses.lgpl2; - maintainers = with maintainers; [ astsmtl antono lethalman ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/vte/default.nix b/pkgs/desktops/gnome-3/3.18/core/vte/default.nix deleted file mode 100644 index 38850f0fe761..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/vte/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ stdenv, fetchurl, intltool, pkgconfig -, gnome3, ncurses, gobjectIntrospection, vala, libxml2, gnutls - -, selectTextPatch ? false -, fetchFromGitHub, autoconf, automake, libtool, gtk_doc, gperf -}: - -let baseAttrs = rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib - gnome3.gtk3 ncurses vala libxml2 ]; - - propagatedBuildInputs = [ gnutls ]; - - preConfigure = "patchShebangs ."; - - configureFlags = [ "--enable-introspection" ]; - - enableParallelBuilding = true; - - postInstall = '' - substituteInPlace $out/lib/libvte2_90.la --replace "-lncurses" "-L${ncurses.out}/lib -lncurses" - ''; - - meta = with stdenv.lib; { - homepage = http://www.gnome.org/; - description = "A library implementing a terminal emulator widget for GTK+"; - longDescription = '' - VTE is a library (libvte) implementing a terminal emulator widget for - GTK+, and a minimal sample application (vte) using that. Vte is - mainly used in gnome-terminal, but can also be used to embed a - console/terminal in games, editors, IDEs, etc. VTE supports Unicode and - character set conversion, as well as emulating any terminal known to - the system's terminfo database. - ''; - license = licenses.lgpl2; - maintainers = with maintainers; [ astsmtl antono lethalman ]; - platforms = platforms.linux; - }; -}; - -in stdenv.mkDerivation ( baseAttrs - // stdenv.lib.optionalAttrs selectTextPatch rec { - name = "vte-ng-${version}"; - version = "0.42.4.a"; - src = fetchFromGitHub { - owner = "thestinger"; - repo = "vte-ng"; - rev = version; - sha256 = "1w91lz30j5lrskp9ds5j3nn27m5mpdpn7nlcvf5y1w63mpmjg8k1"; - }; - # slightly hacky; I couldn't make it work with autoreconfHook - configureScript = "./autogen.sh"; - nativeBuildInputs = (baseAttrs.nativeBuildInputs or []) - ++ [ gtk_doc autoconf automake libtool gperf ]; - } -) - diff --git a/pkgs/desktops/gnome-3/3.18/core/vte/src.nix b/pkgs/desktops/gnome-3/3.18/core/vte/src.nix deleted file mode 100644 index fe67aaf9fe1b..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/vte/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "vte-0.42.1"; - - src = fetchurl { - url = mirror://gnome/sources/vte/0.42/vte-0.42.1.tar.xz; - sha256 = "0d4xzjq6mxrlhnh4i12a1yy90n41m03z8wf8g6wh4hjgx7ly404y"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/yelp-tools/default.nix b/pkgs/desktops/gnome-3/3.18/core/yelp-tools/default.nix deleted file mode 100644 index 9111802eb6a8..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/yelp-tools/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, fetchurl, libxml2, libxslt, itstool, gnome3, pkgconfig }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ libxml2 libxslt itstool gnome3.yelp_xsl pkgconfig ]; - - doCheck = true; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Yelp/Tools; - description = "Small programs that help you create, edit, manage, and publish your Mallard or DocBook documentation"; - maintainers = with maintainers; [ domenkozar ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/yelp-tools/src.nix b/pkgs/desktops/gnome-3/3.18/core/yelp-tools/src.nix deleted file mode 100644 index f03c6d1bc311..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/yelp-tools/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "yelp-tools-3.18.0"; - - src = fetchurl { - url = mirror://gnome/sources/yelp-tools/3.18/yelp-tools-3.18.0.tar.xz; - sha256 = "c6c1d65f802397267cdc47aafd5398c4b60766e0a7ad2190426af6c0d0716932"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/3.18/core/yelp-xsl/default.nix deleted file mode 100644 index 0a3976f35a15..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/yelp-xsl/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig, bash -, itstool, libxml2, libxslt, gnome3 }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - doCheck = true; - - buildInputs = [ pkgconfig intltool itstool libxml2 libxslt ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Yelp; - description = "Yelp's universal stylesheets for Mallard and DocBook"; - maintainers = gnome3.maintainers; - license = [licenses.gpl2 licenses.lgpl2]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/yelp-xsl/src.nix b/pkgs/desktops/gnome-3/3.18/core/yelp-xsl/src.nix deleted file mode 100644 index 54c55eaab5a1..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/yelp-xsl/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "yelp-xsl-3.18.1"; - - src = fetchurl { - url = mirror://gnome/sources/yelp-xsl/3.18/yelp-xsl-3.18.1.tar.xz; - sha256 = "00870fbe59a1bc7797b385fce16386917e2987c404e9b5a7adcf0036f1c1ba62"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/yelp/default.nix b/pkgs/desktops/gnome-3/3.18/core/yelp/default.nix deleted file mode 100644 index 13464137bd8b..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/yelp/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib -, file, librsvg, gnome3, gdk_pixbuf, sqlite -, bash, makeWrapper, itstool, libxml2, libxslt, icu, gst_all_1 -, wrapGAppsHook }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; - - buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool sqlite - libxml2 libxslt icu file makeWrapper gnome3.yelp_xsl - librsvg gdk_pixbuf gnome3.defaultIconTheme - gnome3.gsettings_desktop_schemas wrapGAppsHook - gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Yelp; - description = "The help viewer in Gnome"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/yelp/src.nix b/pkgs/desktops/gnome-3/3.18/core/yelp/src.nix deleted file mode 100644 index a32918a02d06..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/yelp/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "yelp-3.18.1"; - - src = fetchurl { - url = mirror://gnome/sources/yelp/3.18/yelp-3.18.1.tar.xz; - sha256 = "ba3a4eb4717c0ecf4a2e40eff0963fcd12c700c4fb80b83ecaad8b7032256880"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/zenity/default.nix b/pkgs/desktops/gnome-3/3.18/core/zenity/default.nix deleted file mode 100644 index 8f525945a6af..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/zenity/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, gnome3, pango -, gnome_doc_utils, intltool, libX11, which, itstool }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - preBuild = '' - mkdir -p $out/include - ''; - - buildInputs = [ gnome3.gtk libxml2 libxslt libX11 itstool ]; - - nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/core/zenity/src.nix b/pkgs/desktops/gnome-3/3.18/core/zenity/src.nix deleted file mode 100644 index 7fd6d35f4eda..000000000000 --- a/pkgs/desktops/gnome-3/3.18/core/zenity/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "zenity-3.18.1.1"; - - src = fetchurl { - url = mirror://gnome/sources/zenity/3.18/zenity-3.18.1.1.tar.xz; - sha256 = "e6317a03f58b528e2e3330fef5acea39506ec08a7c2aeec5c4f1e7505d43a80a"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/default.nix b/pkgs/desktops/gnome-3/3.18/default.nix deleted file mode 100644 index 78a892ebe3fa..000000000000 --- a/pkgs/desktops/gnome-3/3.18/default.nix +++ /dev/null @@ -1,400 +0,0 @@ -{ pkgs }: - -let - - pkgsFun = overrides: - let - self = self_ // overrides; - self_ = with self; { - - overridePackages = f: - let newself = pkgsFun (f newself self); - in newself; - - callPackage = pkgs.newScope self; - - version = "3.18"; - maintainers = with pkgs.lib.maintainers; [ lethalman jgeerds ]; - - corePackages = with gnome3; [ - pkgs.desktop_file_utils pkgs.ibus - pkgs.shared_mime_info # for update-mime-database - glib # for gsettings - gtk3 # for gtk-update-icon-cache - glib_networking gvfs dconf gnome-backgrounds gnome_control_center - gnome-menus gnome_settings_daemon gnome_shell - gnome_themes_standard defaultIconTheme gnome-shell-extensions - pkgs.hicolor_icon_theme - ]; - - optionalPackages = with gnome3; [ baobab empathy eog epiphany evince - gucharmap nautilus totem vino yelp gnome-bluetooth - gnome-calculator gnome-contacts gnome-font-viewer gnome-screenshot - gnome-system-log gnome-system-monitor - gnome_terminal gnome-user-docs bijiben evolution file-roller gedit - gnome-clocks gnome-music gnome-tweak-tool gnome-photos - nautilus-sendto dconf-editor vinagre gnome-weather gnome-logs - gnome-maps gnome-characters gnome-calendar accerciser gnome-nettool - gnome-getting-started-docs gnome-software gnome-packagekit - ]; - - gamesPackages = with gnome3; [ swell-foop lightsoff iagno - tali quadrapassel gnome-sudoku aisleriot five-or-more - four-in-a-row gnome-chess gnome-klotski gnome-mahjongg - gnome-mines gnome-nibbles gnome-robots gnome-tetravex - hitori gnome-taquin - ]; - - inherit (pkgs) glib gtk2 webkitgtk24x gtk3 gtkmm3 libcanberra; - inherit (pkgs.gnome2) ORBit2; - libsoup = pkgs.libsoup.override { gnomeSupport = true; }; - libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; - orbit = ORBit2; - gnome3 = self // { recurseForDerivations = false; }; - clutter = pkgs.clutter_1_24; - clutter_gtk = pkgs.clutter_gtk_1_6.override { inherit clutter gtk3; }; - clutter-gst_2 = pkgs.clutter-gst; - clutter-gst = pkgs.clutter-gst_3_0.override { inherit clutter cogl; }; - cogl = pkgs.cogl_1_22; - gtk = gtk3; - gtkmm = gtkmm3; - gtkvnc = pkgs.gtkvnc.override { enableGTK3 = true; }; - vala = pkgs.vala_0_26; - gegl_0_3 = pkgs.gegl_0_3.override { inherit gtk; }; - -# Simplify the nixos module and gnome packages - defaultIconTheme = adwaita-icon-theme; - -# ISO installer -# installerIso = callPackage ./installer.nix {}; - -#### Core (http://ftp.acc.umu.se/pub/GNOME/core/) - - adwaita-icon-theme = callPackage ./core/adwaita-icon-theme { }; - - baobab = callPackage ./core/baobab { }; - - caribou = callPackage ./core/caribou { }; - - dconf = callPackage ./core/dconf { }; - dconf-editor = callPackage ./core/dconf-editor { }; - - empathy = callPackage ./core/empathy { - webkitgtk = webkitgtk24x; - clutter-gst = pkgs.clutter-gst; - }; - - epiphany = callPackage ./core/epiphany { }; - - evince = callPackage ./core/evince { }; # ToDo: dbus would prevent compilation, enable tests - - evolution_data_server = callPackage ./core/evolution-data-server { }; - - gconf = callPackage ./core/gconf { }; - - geocode_glib = callPackage ./core/geocode-glib { }; - - gcr = callPackage ./core/gcr { }; # ToDo: tests fail - - gdm = callPackage ./core/gdm { }; - - gjs = callPackage ./core/gjs { }; - - glib_networking = pkgs.glib_networking.override { - inherit gsettings_desktop_schemas; - }; - - gnome-backgrounds = callPackage ./core/gnome-backgrounds { }; - - gnome-bluetooth = callPackage ./core/gnome-bluetooth { }; - - gnome-contacts = callPackage ./core/gnome-contacts { }; - - gnome_control_center = callPackage ./core/gnome-control-center { }; - - gnome-calculator = callPackage ./core/gnome-calculator { }; - - gnome_common = callPackage ./core/gnome-common { }; - - gnome_desktop = callPackage ./core/gnome-desktop { }; - - gnome-dictionary = callPackage ./core/gnome-dictionary { }; - - gnome-disk-utility = callPackage ./core/gnome-disk-utility { }; - - gnome-font-viewer = callPackage ./core/gnome-font-viewer { }; - - gnome-menus = callPackage ./core/gnome-menus { }; - - gnome_keyring = callPackage ./core/gnome-keyring { }; - - libgnome_keyring = callPackage ./core/libgnome-keyring { }; - - libgnomekbd = callPackage ./core/libgnomekbd { }; - - folks = callPackage ./core/folks { }; - - gnome_online_accounts = callPackage ./core/gnome-online-accounts { }; - - gnome-online-miners = callPackage ./core/gnome-online-miners { }; - - gnome_session = callPackage ./core/gnome-session { }; - - gnome_shell = callPackage ./core/gnome-shell { }; - - gnome-shell-extensions = callPackage ./core/gnome-shell-extensions { }; - - gnome-screenshot = callPackage ./core/gnome-screenshot { }; - - gnome_settings_daemon = callPackage ./core/gnome-settings-daemon { }; - - gnome-system-log = callPackage ./core/gnome-system-log { }; - - gnome-system-monitor = callPackage ./core/gnome-system-monitor { }; - - gnome_terminal = callPackage ./core/gnome-terminal { }; - - gnome_themes_standard = callPackage ./core/gnome-themes-standard { }; - - gnome-user-docs = callPackage ./core/gnome-user-docs { }; - - gnome-user-share = callPackage ./core/gnome-user-share { }; - - grilo = callPackage ./core/grilo { }; - - grilo-plugins = callPackage ./core/grilo-plugins { }; - - gsettings_desktop_schemas = callPackage ./core/gsettings-desktop-schemas { }; - - gsound = callPackage ./core/gsound { }; - - gtksourceview = callPackage ./core/gtksourceview { }; - - gucharmap = callPackage ./core/gucharmap { }; - - gvfs = pkgs.gvfs.override { gnome = gnome3; gnomeSupport = true; }; - - eog = callPackage ./core/eog { }; - - libcroco = callPackage ./core/libcroco {}; - - libgee = callPackage ./core/libgee { }; - libgee_1 = callPackage ./core/libgee/libgee-1.nix { }; - - libgdata = callPackage ./core/libgdata { }; - - libgxps = callPackage ./core/libgxps { }; - - libpeas = callPackage ./core/libpeas {}; - - libgweather = callPackage ./core/libgweather { }; - - libzapojit = callPackage ./core/libzapojit { }; - - mutter = callPackage ./core/mutter { }; - - nautilus = callPackage ./core/nautilus { }; - - networkmanager_openvpn = pkgs.networkmanager_openvpn.override { - inherit gnome3; - }; - - networkmanager_pptp = pkgs.networkmanager_pptp.override { - inherit gnome3; - }; - - networkmanager_vpnc = pkgs.networkmanager_vpnc.override { - inherit gnome3; - }; - - networkmanager_openconnect = pkgs.networkmanager_openconnect.override { - inherit gnome3; - }; - - networkmanager_l2tp = pkgs.networkmanager_l2tp.override { - inherit gnome3; - }; - - networkmanagerapplet = pkgs.networkmanagerapplet.override { - inherit gnome3 gsettings_desktop_schemas glib_networking; - }; - - rest = callPackage ./core/rest { }; - - sushi = callPackage ./core/sushi { - clutter-gst = pkgs.clutter-gst; - }; - - totem = callPackage ./core/totem { }; - - totem-pl-parser = callPackage ./core/totem-pl-parser { }; - - tracker = callPackage ./core/tracker { giflib = pkgs.giflib_5_0; }; - - vte = callPackage ./core/vte { }; - - vte_290 = callPackage ./core/vte/2.90.nix { }; - - vte-select-text = vte.override { selectTextPatch = true; }; - - vino = callPackage ./core/vino { }; - - yelp = callPackage ./core/yelp { }; - - yelp_xsl = callPackage ./core/yelp-xsl { }; - - yelp_tools = callPackage ./core/yelp-tools { }; - - zenity = callPackage ./core/zenity { }; - - -#### Apps (http://ftp.acc.umu.se/pub/GNOME/apps/) - - accerciser = callPackage ./apps/accerciser { }; - - bijiben = callPackage ./apps/bijiben { - webkitgtk = webkitgtk24x; - }; - - cheese = callPackage ./apps/cheese { }; - - evolution = callPackage ./apps/evolution { - webkitgtk = webkitgtk24x; - }; - - file-roller = callPackage ./apps/file-roller { }; - - gedit = callPackage ./apps/gedit { }; - - glade = callPackage ./apps/glade { }; - - gnome-boxes = callPackage ./apps/gnome-boxes { - gtkvnc = pkgs.gtkvnc.override { enableGTK3 = true; }; - spice_gtk = pkgs.spice_gtk.override { enableGTK3 = true; }; - }; - - gnome-calendar = callPackage ./apps/gnome-calendar { }; - - gnome-characters = callPackage ./apps/gnome-characters { }; - - gnome-clocks = callPackage ./apps/gnome-clocks { }; - - gnome-documents = callPackage ./apps/gnome-documents { }; - - gnome-getting-started-docs = callPackage ./apps/gnome-getting-started-docs { }; - - gnome-logs = callPackage ./apps/gnome-logs { }; - - gnome-maps = callPackage ./apps/gnome-maps { }; - - gnome-music = callPackage ./apps/gnome-music { }; - - gnome-nettool = callPackage ./apps/gnome-nettool { }; - - gnome-photos = callPackage ./apps/gnome-photos { - gegl = gegl_0_3; - }; - - gnome-weather = callPackage ./apps/gnome-weather { }; - - nautilus-sendto = callPackage ./apps/nautilus-sendto { }; - - polari = callPackage ./apps/polari { }; - - # scrollkeeper replacement - rarian = callPackage ./desktop/rarian { }; - - seahorse = callPackage ./apps/seahorse { }; - - vinagre = callPackage ./apps/vinagre { }; - -#### Dev http://ftp.gnome.org/pub/GNOME/devtools/ - - anjuta = callPackage ./devtools/anjuta { }; - - devhelp = callPackage ./devtools/devhelp { }; - - gdl = callPackage ./devtools/gdl { }; - - gnome-devel-docs = callPackage ./devtools/gnome-devel-docs { }; - -#### Games - - aisleriot = callPackage ./games/aisleriot { }; - - five-or-more = callPackage ./games/five-or-more { }; - - four-in-a-row = callPackage ./games/four-in-a-row { }; - - gnome-chess = callPackage ./games/gnome-chess { }; - - gnome-klotski = callPackage ./games/gnome-klotski { }; - - gnome-mahjongg = callPackage ./games/gnome-mahjongg { }; - - gnome-mines = callPackage ./games/gnome-mines { }; - - gnome-nibbles = callPackage ./games/gnome-nibbles { }; - - gnome-robots = callPackage ./games/gnome-robots { }; - - gnome-sudoku = callPackage ./games/gnome-sudoku { }; - - gnome-taquin = callPackage ./games/gnome-taquin { }; - - gnome-tetravex = callPackage ./games/gnome-tetravex { }; - - hitori = callPackage ./games/hitori { }; - - iagno = callPackage ./games/iagno { }; - - lightsoff = callPackage ./games/lightsoff { }; - - swell-foop = callPackage ./games/swell-foop { }; - - tali = callPackage ./games/tali { }; - - quadrapassel = callPackage ./games/quadrapassel { }; - -#### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/ - - california = callPackage ./misc/california { }; - - geary = callPackage ./misc/geary { - webkitgtk = webkitgtk24x; - }; - - gfbgraph = callPackage ./misc/gfbgraph { }; - - gitg = callPackage ./misc/gitg { - webkitgtk = webkitgtk24x; - }; - - libgda = callPackage ./misc/libgda { }; - - libgit2-glib = callPackage ./misc/libgit2-glib { }; - - libmediaart = callPackage ./misc/libmediaart { }; - - gexiv2 = callPackage ./misc/gexiv2 { }; - - gnome-tweak-tool = callPackage ./misc/gnome-tweak-tool { }; - - gpaste = callPackage ./misc/gpaste { }; - - pidgin-im-gnome-shell-extension = callPackage ./misc/pidgin { }; - - gtkhtml = callPackage ./misc/gtkhtml { }; - - pomodoro = callPackage ./misc/pomodoro { }; - - gnome-video-effects = callPackage ./misc/gnome-video-effects { }; - - gnome-software = callPackage ./misc/gnome-software { }; - - gnome-packagekit = callPackage ./misc/gnome-packagekit { }; - - }; - in self; # pkgsFun - -in pkgsFun {} diff --git a/pkgs/desktops/gnome-3/3.18/desktop/rarian/default.nix b/pkgs/desktops/gnome-3/3.18/desktop/rarian/default.nix deleted file mode 100644 index a1b38b21869a..000000000000 --- a/pkgs/desktops/gnome-3/3.18/desktop/rarian/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libxml2, libxslt, docbook_xml_dtd_42}: - -stdenv.mkDerivation rec { - name = "rarian-0.8.1"; - src = fetchurl { - url = "mirror://gnome/sources/rarian/0.8/${name}.tar.bz2"; - sha256 = "aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577"; - }; - - buildInputs = [pkgconfig perl perlXMLParser libxml2 libxslt]; - configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat"; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/3.18/devtools/anjuta/default.nix deleted file mode 100644 index af74df4ad13b..000000000000 --- a/pkgs/desktops/gnome-3/3.18/devtools/anjuta/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, flex, bison, libxml2, intltool, - itstool, python, makeWrapper }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - enableParallelBuilding = true; - - buildInputs = [ pkgconfig flex bison gtk3 libxml2 gnome3.gjs gnome3.gdl - gnome3.libgda gnome3.gtksourceview intltool itstool python makeWrapper ]; - - preFixup = '' - wrapProgram $out/bin/anjuta \ - --prefix XDG_DATA_DIRS : \ - "$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - description = "Software development studio"; - homepage = http://anjuta.org/; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/devtools/anjuta/src.nix b/pkgs/desktops/gnome-3/3.18/devtools/anjuta/src.nix deleted file mode 100644 index 34394b686d3a..000000000000 --- a/pkgs/desktops/gnome-3/3.18/devtools/anjuta/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "anjuta-3.18.2"; - - src = fetchurl { - url = mirror://gnome/sources/anjuta/3.18/anjuta-3.18.2.tar.xz; - sha256 = "be864f2f1807e1b870697f646294e997d221d5984a135245543b719e501cef8e"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/3.18/devtools/devhelp/default.nix deleted file mode 100644 index 1cfae754cfec..000000000000 --- a/pkgs/desktops/gnome-3/3.18/devtools/devhelp/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, webkitgtk, intltool }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ - pkgconfig gtk3 wrapGAppsHook webkitgtk intltool gnome3.defaultIconTheme - ]; - - meta = with stdenv.lib; { - homepage = https://live.gnome.org/devhelp; - description = "API documentation browser for GNOME"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/devtools/devhelp/src.nix b/pkgs/desktops/gnome-3/3.18/devtools/devhelp/src.nix deleted file mode 100644 index acbcedb60439..000000000000 --- a/pkgs/desktops/gnome-3/3.18/devtools/devhelp/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "devhelp-3.18.1"; - - src = fetchurl { - url = mirror://gnome/sources/devhelp/3.18/devhelp-3.18.1.tar.xz; - sha256 = "303a162ad294dc6f9984898e501a06dc5d2aa9812b06801c2e39b250d8c51aef"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/devtools/gdl/default.nix b/pkgs/desktops/gnome-3/3.18/devtools/gdl/default.nix deleted file mode 100644 index 156d91b3eae7..000000000000 --- a/pkgs/desktops/gnome-3/3.18/devtools/gdl/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, gtk3, gnome3, intltool }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ pkgconfig libxml2 gtk3 intltool ]; - - meta = with stdenv.lib; { - description = "Gnome docking library"; - homepage = https://developer.gnome.org/gdl/; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/devtools/gdl/src.nix b/pkgs/desktops/gnome-3/3.18/devtools/gdl/src.nix deleted file mode 100644 index 3fd391397999..000000000000 --- a/pkgs/desktops/gnome-3/3.18/devtools/gdl/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gdl-3.18.0"; - - src = fetchurl { - url = mirror://gnome/sources/gdl/3.18/gdl-3.18.0.tar.xz; - sha256 = "1499884e4fce375a963cf2b98b90e6724144f9b1f1ac8b84d765f4c85a2140b2"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/devtools/gnome-devel-docs/default.nix b/pkgs/desktops/gnome-3/3.18/devtools/gnome-devel-docs/default.nix deleted file mode 100644 index 50960f41a312..000000000000 --- a/pkgs/desktops/gnome-3/3.18/devtools/gnome-devel-docs/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ stdenv, fetchurl, gnome3, intltool, itstool, libxml2 }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ intltool itstool libxml2 ]; - - meta = with stdenv.lib; { - homepage = https://github.com/GNOME/gnome-devel-docs; - description = "Developer documentation for GNOME"; - maintainers = gnome3.maintainers; - license = licenses.fdl12; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/devtools/gnome-devel-docs/src.nix b/pkgs/desktops/gnome-3/3.18/devtools/gnome-devel-docs/src.nix deleted file mode 100644 index 4926a56fc296..000000000000 --- a/pkgs/desktops/gnome-3/3.18/devtools/gnome-devel-docs/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-devel-docs-3.18.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-devel-docs/3.18/gnome-devel-docs-3.18.1.tar.xz; - sha256 = "33d06a27bd41107fcb0cf6d447e113db081c0d08fb2d041317ad2b8abae7d880"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/games/aisleriot/default.nix b/pkgs/desktops/gnome-3/3.18/games/aisleriot/default.nix deleted file mode 100644 index e149a0b31264..000000000000 --- a/pkgs/desktops/gnome-3/3.18/games/aisleriot/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, intltool, itstool, gtk3 -, wrapGAppsHook, gconf, librsvg, libxml2, desktop_file_utils -, guile, libcanberra_gtk3 }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - configureFlags = [ "--with-card-theme-formats=svg" ]; - - buildInputs = [ pkgconfig intltool itstool gtk3 wrapGAppsHook gconf - librsvg libxml2 desktop_file_utils guile libcanberra_gtk3 ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Aisleriot; - description = "A collection of patience games written in guile scheme"; - maintainers = gnome3.maintainers; - license = licenses.gpl3Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/games/aisleriot/src.nix b/pkgs/desktops/gnome-3/3.18/games/aisleriot/src.nix deleted file mode 100644 index f67c43bc15e7..000000000000 --- a/pkgs/desktops/gnome-3/3.18/games/aisleriot/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "aisleriot-3.18.2"; - - src = fetchurl { - url = mirror://gnome/sources/aisleriot/3.18/aisleriot-3.18.2.tar.xz; - sha256 = "0bac8ba11ce37e4e7beddcd173f55ac1630a425399cfabb57e0e500886642fe3"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/games/five-or-more/default.nix b/pkgs/desktops/gnome-3/3.18/games/five-or-more/default.nix deleted file mode 100644 index 50a7d2906a77..000000000000 --- a/pkgs/desktops/gnome-3/3.18/games/five-or-more/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, intltool, itstool, libxml2 }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ - pkgconfig gtk3 wrapGAppsHook librsvg intltool itstool libxml2 - gnome3.defaultIconTheme - ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Five_or_more; - description = "Remove colored balls from the board by forming lines"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/games/five-or-more/src.nix b/pkgs/desktops/gnome-3/3.18/games/five-or-more/src.nix deleted file mode 100644 index 37d9794dc1b4..000000000000 --- a/pkgs/desktops/gnome-3/3.18/games/five-or-more/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "five-or-more-3.18.0"; - - src = fetchurl { - url = mirror://gnome/sources/five-or-more/3.18/five-or-more-3.18.0.tar.xz; - sha256 = "e1e7cc81b1281382da9a6ab466d97f09561dbaf39031a9b93f0a45221234fe62"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/games/four-in-a-row/default.nix b/pkgs/desktops/gnome-3/3.18/games/four-in-a-row/default.nix deleted file mode 100644 index 68228750cd87..000000000000 --- a/pkgs/desktops/gnome-3/3.18/games/four-in-a-row/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, intltool, itstool, libcanberra_gtk3, librsvg, libxml2 }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ - pkgconfig gtk3 wrapGAppsHook intltool itstool libcanberra_gtk3 librsvg - libxml2 gnome3.defaultIconTheme - ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Four-in-a-row; - description = "Make lines of the same color to win"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/games/four-in-a-row/src.nix b/pkgs/desktops/gnome-3/3.18/games/four-in-a-row/src.nix deleted file mode 100644 index 0b558106edd3..000000000000 --- a/pkgs/desktops/gnome-3/3.18/games/four-in-a-row/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "four-in-a-row-3.18.2"; - - src = fetchurl { - url = mirror://gnome/sources/four-in-a-row/3.18/four-in-a-row-3.18.2.tar.xz; - sha256 = "458fa0ba35a2640248b3b4a2f162ded27bd6056e146c521760e0ef06961b8356"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/games/gnome-chess/default.nix b/pkgs/desktops/gnome-3/3.18/games/gnome-chess/default.nix deleted file mode 100644 index a96dae3c12cb..000000000000 --- a/pkgs/desktops/gnome-3/3.18/games/gnome-chess/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, intltool, itstool, librsvg, libxml2 }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ - pkgconfig gtk3 wrapGAppsHook intltool itstool librsvg libxml2 - gnome3.defaultIconTheme - ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Chess; - description = "Play the classic two-player boardgame of chess"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/games/gnome-chess/src.nix b/pkgs/desktops/gnome-3/3.18/games/gnome-chess/src.nix deleted file mode 100644 index 5cbbb6c9025a..000000000000 --- a/pkgs/desktops/gnome-3/3.18/games/gnome-chess/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-chess-3.18.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-chess/3.18/gnome-chess-3.18.0.tar.xz; - sha256 = "c841198935d807618c3cecbf10ed24643390d504e17961717bac455f4e1b37ad"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/games/gnome-klotski/default.nix b/pkgs/desktops/gnome-3/3.18/games/gnome-klotski/default.nix deleted file mode 100644 index b13bf8afbfae..000000000000 --- a/pkgs/desktops/gnome-3/3.18/games/gnome-klotski/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, libxml2, intltool, itstool }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ - pkgconfig gtk3 wrapGAppsHook intltool itstool librsvg libxml2 - gnome3.defaultIconTheme - ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Klotski; - description = "Slide blocks to solve the puzzle"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/games/gnome-klotski/src.nix b/pkgs/desktops/gnome-3/3.18/games/gnome-klotski/src.nix deleted file mode 100644 index 132fc45c5bdb..000000000000 --- a/pkgs/desktops/gnome-3/3.18/games/gnome-klotski/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-klotski-3.18.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-klotski/3.18/gnome-klotski-3.18.2.tar.xz; - sha256 = "e22b7136c4646b1aa6a9cefa8206bc92aed4ac389e891e48551e1804a2748192"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome-3/3.18/games/gnome-mahjongg/default.nix deleted file mode 100644 index 43db32e88577..000000000000 --- a/pkgs/desktops/gnome-3/3.18/games/gnome-mahjongg/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, intltool, itstool, libxml2 }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ - pkgconfig gtk3 wrapGAppsHook librsvg intltool itstool libxml2 - gnome3.defaultIconTheme - ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Mahjongg; - description = "Disassemble a pile of tiles by removing matching pairs"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/games/gnome-mahjongg/src.nix b/pkgs/desktops/gnome-3/3.18/games/gnome-mahjongg/src.nix deleted file mode 100644 index 214c4a7d6e06..000000000000 --- a/pkgs/desktops/gnome-3/3.18/games/gnome-mahjongg/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-mahjongg-3.18.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-mahjongg/3.18/gnome-mahjongg-3.18.0.tar.xz; - sha256 = "7034428f5ac04bfd90689ee66894a6948a2ff1bfa2d2548f7559d2134b967405"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/3.18/games/gnome-mines/default.nix deleted file mode 100644 index 4d703bb37a79..000000000000 --- a/pkgs/desktops/gnome-3/3.18/games/gnome-mines/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, intltool, itstool, libxml2 }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ - pkgconfig gtk3 wrapGAppsHook librsvg intltool itstool libxml2 - gnome3.defaultIconTheme - ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Mines; - description = "Clear hidden mines from a minefield"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/games/gnome-mines/src.nix b/pkgs/desktops/gnome-3/3.18/games/gnome-mines/src.nix deleted file mode 100644 index c054ef6efd98..000000000000 --- a/pkgs/desktops/gnome-3/3.18/games/gnome-mines/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-mines-3.18.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-mines/3.18/gnome-mines-3.18.2.tar.xz; - sha256 = "7e1e0778eb623bb96063944b0397503f964b898c234d30936c24ca1c9063f347"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/3.18/games/gnome-nibbles/default.nix deleted file mode 100644 index 85ffeb3c50fd..000000000000 --- a/pkgs/desktops/gnome-3/3.18/games/gnome-nibbles/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, libcanberra_gtk3, clutter_gtk, intltool, itstool -, libxml2 }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ - pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2 - librsvg libcanberra_gtk3 clutter_gtk gnome3.defaultIconTheme - ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Nibbles; - description = "Guide a worm around a maze"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/games/gnome-nibbles/src.nix b/pkgs/desktops/gnome-3/3.18/games/gnome-nibbles/src.nix deleted file mode 100644 index d3054b558d2a..000000000000 --- a/pkgs/desktops/gnome-3/3.18/games/gnome-nibbles/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-nibbles-3.18.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-nibbles/3.18/gnome-nibbles-3.18.2.tar.xz; - sha256 = "106cacd8b55aeb6911b4d982071cf599cbec272e01bed6f16f16f9486026e229"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/games/gnome-robots/default.nix b/pkgs/desktops/gnome-3/3.18/games/gnome-robots/default.nix deleted file mode 100644 index 3c318fa847c5..000000000000 --- a/pkgs/desktops/gnome-3/3.18/games/gnome-robots/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, libcanberra_gtk3, intltool, itstool, libxml2 }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ - pkgconfig gtk3 wrapGAppsHook intltool itstool librsvg libcanberra_gtk3 - libxml2 gnome3.defaultIconTheme - ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Robots; - description = "Avoid the robots and make them crash into each other"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/games/gnome-robots/src.nix b/pkgs/desktops/gnome-3/3.18/games/gnome-robots/src.nix deleted file mode 100644 index 130cb2fcef97..000000000000 --- a/pkgs/desktops/gnome-3/3.18/games/gnome-robots/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-robots-3.18.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-robots/3.18/gnome-robots-3.18.1.tar.xz; - sha256 = "2e58ffdc4b243a4a3557ba9c84fa1c0129c5ffadbb5c2a20fede48ccf4618090"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome-3/3.18/games/gnome-sudoku/default.nix deleted file mode 100644 index c8ba82c7246d..000000000000 --- a/pkgs/desktops/gnome-3/3.18/games/gnome-sudoku/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, gnome3, wrapGAppsHook -, json_glib, qqwing, itstool, libxml2 }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ pkgconfig intltool wrapGAppsHook gtk3 gnome3.libgee - json_glib qqwing itstool libxml2 ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Sudoku; - description = "Test your logic skills in this number grid puzzle"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/games/gnome-sudoku/src.nix b/pkgs/desktops/gnome-3/3.18/games/gnome-sudoku/src.nix deleted file mode 100644 index 0699fec31c52..000000000000 --- a/pkgs/desktops/gnome-3/3.18/games/gnome-sudoku/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-sudoku-3.18.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-sudoku/3.18/gnome-sudoku-3.18.2.tar.xz; - sha256 = "4eefde04145d9f4bf30f4327b83929f6bfb8a19b604337c1d75f66e984f8c0ac"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/3.18/games/gnome-taquin/default.nix deleted file mode 100644 index 78eaa23e63bd..000000000000 --- a/pkgs/desktops/gnome-3/3.18/games/gnome-taquin/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, librsvg, libcanberra_gtk3, intltool, itstool, libxml2 }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ - pkgconfig gtk3 wrapGAppsHook librsvg libcanberra_gtk3 - intltool itstool libxml2 gnome3.defaultIconTheme - ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Taquin; - description = "Move tiles so that they reach their places"; - maintainers = gnome3.maintainers; - license = licenses.gpl3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/games/gnome-taquin/src.nix b/pkgs/desktops/gnome-3/3.18/games/gnome-taquin/src.nix deleted file mode 100644 index 7017d94cf990..000000000000 --- a/pkgs/desktops/gnome-3/3.18/games/gnome-taquin/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-taquin-3.18.2"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-taquin/3.18/gnome-taquin-3.18.2.tar.xz; - sha256 = "26154f5fd9f75b6e9e6857d6a31a9d2ce4814ec81afc6ca3e4643058877d1155"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome-3/3.18/games/gnome-tetravex/default.nix deleted file mode 100644 index d6feab93dba1..000000000000 --- a/pkgs/desktops/gnome-3/3.18/games/gnome-tetravex/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, libxml2, intltool, itstool }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ - pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2 gnome3.defaultIconTheme - ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Tetravex; - description = "Complete the puzzle by matching numbered tiles"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/games/gnome-tetravex/src.nix b/pkgs/desktops/gnome-3/3.18/games/gnome-tetravex/src.nix deleted file mode 100644 index d73562835e48..000000000000 --- a/pkgs/desktops/gnome-3/3.18/games/gnome-tetravex/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-tetravex-3.18.0"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-tetravex/3.18/gnome-tetravex-3.18.0.tar.xz; - sha256 = "ea00ff5ea9a3b583c4d755cefa2725dd7b3b0781972af1c56377c7eda48cb579"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/games/hitori/default.nix b/pkgs/desktops/gnome-3/3.18/games/hitori/default.nix deleted file mode 100644 index bd6be7d43c58..000000000000 --- a/pkgs/desktops/gnome-3/3.18/games/hitori/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook -, libxml2, intltool, itstool }: - -stdenv.mkDerivation rec { - name = "hitori-${gnome3.version}.1"; - - src = fetchurl { - url = "mirror://gnome/sources/hitori/${gnome3.version}/${name}.tar.xz"; - sha256 = "07pm3xl05jgb8x151k1j2ap57dmfvk2nkz9dmqnn5iywfigsysd1"; - }; - - buildInputs = [ - pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2 - gnome3.defaultIconTheme - ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Hitori; - description = "GTK+ application to generate and let you play games of Hitori"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/games/iagno/default.nix b/pkgs/desktops/gnome-3/3.18/games/iagno/default.nix deleted file mode 100644 index 1b6f08d1fd65..000000000000 --- a/pkgs/desktops/gnome-3/3.18/games/iagno/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook -, intltool, itstool, libcanberra_gtk3, libxml2, dconf }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg - dconf libxml2 libcanberra_gtk3 wrapGAppsHook itstool intltool ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Iagno; - description = "Computer version of the game Reversi, more popularly called Othello"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/games/iagno/src.nix b/pkgs/desktops/gnome-3/3.18/games/iagno/src.nix deleted file mode 100644 index 77ef9f02dcc0..000000000000 --- a/pkgs/desktops/gnome-3/3.18/games/iagno/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "iagno-3.18.2"; - - src = fetchurl { - url = mirror://gnome/sources/iagno/3.18/iagno-3.18.2.tar.xz; - sha256 = "2ee2954ef459211643fadf74745be79a82592e12750b5cf813e784e2cbbfe1bb"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/games/lightsoff/default.nix b/pkgs/desktops/gnome-3/3.18/games/lightsoff/default.nix deleted file mode 100644 index 8ec54b489721..000000000000 --- a/pkgs/desktops/gnome-3/3.18/games/lightsoff/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook -, intltool, itstool, clutter, clutter_gtk, libxml2, dconf }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg dconf - libxml2 clutter clutter_gtk wrapGAppsHook itstool intltool ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Lightsoff; - description = "Puzzle game, where the objective is to turn off all of the tiles on the board"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/games/lightsoff/src.nix b/pkgs/desktops/gnome-3/3.18/games/lightsoff/src.nix deleted file mode 100644 index 6645182b3a42..000000000000 --- a/pkgs/desktops/gnome-3/3.18/games/lightsoff/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "lightsoff-3.18.0"; - - src = fetchurl { - url = mirror://gnome/sources/lightsoff/3.18/lightsoff-3.18.0.tar.xz; - sha256 = "cd5126dae4506363d9196ce8ba083a769d9f8c287fb0008db53cecf6cdc55d61"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/games/quadrapassel/default.nix b/pkgs/desktops/gnome-3/3.18/games/quadrapassel/default.nix deleted file mode 100644 index f319608764d6..000000000000 --- a/pkgs/desktops/gnome-3/3.18/games/quadrapassel/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf -, librsvg, libcanberra_gtk3 -, intltool, itstool, libxml2, clutter, clutter_gtk, wrapGAppsHook }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg - libcanberra_gtk3 itstool intltool clutter - libxml2 clutter_gtk wrapGAppsHook ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Quadrapassel; - description = "Classic falling-block game, Tetris"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/games/quadrapassel/src.nix b/pkgs/desktops/gnome-3/3.18/games/quadrapassel/src.nix deleted file mode 100644 index 55b70b7ec58a..000000000000 --- a/pkgs/desktops/gnome-3/3.18/games/quadrapassel/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "quadrapassel-3.18.0"; - - src = fetchurl { - url = mirror://gnome/sources/quadrapassel/3.18/quadrapassel-3.18.0.tar.xz; - sha256 = "2cd1d5328ab9e2c7041936e8e7e01157f292aa4428da81175fb1aa15d40ef8e1"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/games/swell-foop/default.nix b/pkgs/desktops/gnome-3/3.18/games/swell-foop/default.nix deleted file mode 100644 index 3d3e424d0da8..000000000000 --- a/pkgs/desktops/gnome-3/3.18/games/swell-foop/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, dconf -, clutter, clutter_gtk, intltool, itstool, libxml2, wrapGAppsHook }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg - dconf wrapGAppsHook itstool intltool clutter clutter_gtk libxml2 ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - homepage = "https://wiki.gnome.org/Apps/Swell%20Foop"; - description = "Puzzle game, previously known as Same GNOME"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/games/swell-foop/src.nix b/pkgs/desktops/gnome-3/3.18/games/swell-foop/src.nix deleted file mode 100644 index 148fe3474742..000000000000 --- a/pkgs/desktops/gnome-3/3.18/games/swell-foop/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "swell-foop-3.18.1"; - - src = fetchurl { - url = mirror://gnome/sources/swell-foop/3.18/swell-foop-3.18.1.tar.xz; - sha256 = "b454fb8ccc1d040a7ae08d632a07feecf88a2bf0c172b75b863f2a05e97179f6"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/games/tali/default.nix b/pkgs/desktops/gnome-3/3.18/games/tali/default.nix deleted file mode 100644 index c2b1f5857124..000000000000 --- a/pkgs/desktops/gnome-3/3.18/games/tali/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf -, librsvg, intltool, itstool, libxml2, wrapGAppsHook }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg - libxml2 itstool intltool wrapGAppsHook ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Tali; - description = "Sort of poker with dice and less money"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/games/tali/src.nix b/pkgs/desktops/gnome-3/3.18/games/tali/src.nix deleted file mode 100644 index 12c8aefcd71c..000000000000 --- a/pkgs/desktops/gnome-3/3.18/games/tali/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "tali-3.18.0"; - - src = fetchurl { - url = mirror://gnome/sources/tali/3.18/tali-3.18.0.tar.xz; - sha256 = "fe785ed2c3eeca8706834a967c0011cfee016008b4e55c1f5e0529b348bc9864"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/installer.nix b/pkgs/desktops/gnome-3/3.18/installer.nix deleted file mode 100644 index e4d64ac9e885..000000000000 --- a/pkgs/desktops/gnome-3/3.18/installer.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ isoBaseName ? "nixos-graphical-gnome", system ? builtins.currentSystem -, extraModules ? [] }: - -let - - module = ../../../../nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix; - - config = (import ../../../../nixos/lib/eval-config.nix { - inherit system; - modules = [ module { isoImage.isoBaseName = isoBaseName; } ] ++ extraModules; - }).config; - -in - config.system.build.isoImage - diff --git a/pkgs/desktops/gnome-3/3.18/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch b/pkgs/desktops/gnome-3/3.18/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch deleted file mode 100644 index c229cc96094f..000000000000 --- a/pkgs/desktops/gnome-3/3.18/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 8a94642..1ca6426 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -27,7 +27,7 @@ AC_SUBST(LDFLAGS) - GLIB_REQUIRED=2.38.0 - GTK_REQUIRED=3.12.2 - GEE_REQUIRED=0.10.5 --ECAL_REQUIRED=3.8.5 -+ECAL_REQUIRED=3.13.90 - LIBSOUP_REQUIRED=2.44 - GDATA_REQUIRED=0.14.0 - GOA_REQUIRED=3.8.3 -diff --git a/src/backing/eds/backing-eds-calendar-source.vala b/src/backing/eds/backing-eds-calendar-source.vala -index ee6a572..5009b5d 100644 ---- a/src/backing/eds/backing-eds-calendar-source.vala -+++ b/src/backing/eds/backing-eds-calendar-source.vala -@@ -256,7 +256,7 @@ internal class EdsCalendarSource : CalendarSource { - - // Invoked by EdsStore prior to making it available outside of unit - internal async void open_async(Cancellable? cancellable) throws Error { -- client = (E.CalClient) yield E.CalClient.connect(eds_source, E.CalClientSourceType.EVENTS, -+ client = (E.CalClient) yield E.CalClient.connect(eds_source, E.CalClientSourceType.EVENTS, 1, - cancellable); - - client.bind_property("readonly", this, PROP_READONLY, BindingFlags.SYNC_CREATE); -diff --git a/vapi/libecal-1.2.vapi b/vapi/libecal-1.2.vapi -index 6ead3ec..46fd711 100644 ---- a/vapi/libecal-1.2.vapi -+++ b/vapi/libecal-1.2.vapi -@@ -23,7 +23,7 @@ namespace E { - public bool check_save_schedules (); - public static bool check_timezones (iCal.icalcomponent comp, GLib.List comps, GLib.Callback tzlookup, void* ecalclient, GLib.Cancellable cancellable) throws GLib.Error; - [CCode (finish_name = "e_cal_client_connect_finish")] -- public static async unowned E.Client connect (E.Source source, E.CalClientSourceType source_type, GLib.Cancellable cancellable) throws GLib.Error; -+ public static async unowned E.Client connect (E.Source source, E.CalClientSourceType source_type, uint32 wait_for_connected_seconds, GLib.Cancellable cancellable) throws GLib.Error; - public static unowned E.Client connect_sync (E.Source source, E.CalClientSourceType source_type, GLib.Cancellable cancellable) throws GLib.Error; - [CCode (finish_name = "e_cal_client_create_object_finish")] - public async void create_object (iCal.icalcomponent icalcomp, GLib.Cancellable? cancellable, out string out_uid) throws GLib.Error; diff --git a/pkgs/desktops/gnome-3/3.18/misc/california/default.nix b/pkgs/desktops/gnome-3/3.18/misc/california/default.nix deleted file mode 100644 index 4bdeeb23a91e..000000000000 --- a/pkgs/desktops/gnome-3/3.18/misc/california/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala, makeWrapper -, gnome3, glib, libsoup, libgdata, sqlite, itstool, xdg_utils }: - -let - majorVersion = "0.4"; -in -stdenv.mkDerivation rec { - name = "california-${majorVersion}.0"; - - src = fetchurl { - url = "mirror://gnome/sources/california/${majorVersion}/${name}.tar.xz"; - sha256 = "1dky2kllv469k8966ilnf4xrr7z35pq8mdvs7kwziy59cdikapxj"; - }; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ makeWrapper intltool pkgconfig vala glib gtk3 gnome3.libgee - libsoup libgdata gnome3.gnome_online_accounts gnome3.evolution_data_server - sqlite itstool xdg_utils gnome3.gsettings_desktop_schemas ]; - - preFixup = '' - wrapProgram "$out/bin/california" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.defaultIconTheme}/share:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH:${gnome3.gsettings_desktop_schemas}/share" - ''; - - enableParallelBuilding = true; - - # Apply fedoras patch to build with evolution-data-server >3.13 - patches = [ ./0002-Build-with-evolution-data-server-3.13.90.patch ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/California; - description = "Calendar application for GNOME 3"; - maintainers = with maintainers; [ pSub ]; - license = licenses.lgpl21; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/misc/geary/default.nix b/pkgs/desktops/gnome-3/3.18/misc/geary/default.nix deleted file mode 100644 index 11655edded00..000000000000 --- a/pkgs/desktops/gnome-3/3.18/misc/geary/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala -, makeWrapper, gdk_pixbuf, cmake, desktop_file_utils -, libnotify, libcanberra, libsecret, gmime -, libpthreadstubs, sqlite -, gnome3, librsvg, gnome_doc_utils, webkitgtk }: - -let - majorVersion = "0.8"; -in -stdenv.mkDerivation rec { - name = "geary-${majorVersion}.2"; - - src = fetchurl { - url = "mirror://gnome/sources/geary/${majorVersion}/${name}.tar.xz"; - sha256 = "3cfa626168935acf49c9415fad54c7849f17fd833026cfd3c224ba0fb892d641"; - }; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - buildInputs = [ intltool pkgconfig gtk3 makeWrapper cmake desktop_file_utils gnome_doc_utils - vala webkitgtk libnotify libcanberra gnome3.libgee libsecret gmime sqlite - libpthreadstubs gnome3.gsettings_desktop_schemas gnome3.gcr - gdk_pixbuf librsvg gnome3.defaultIconTheme ]; - - preConfigure = '' - substituteInPlace src/CMakeLists.txt --replace '`pkg-config --variable=girdir gobject-introspection-1.0`' '${webkitgtk}/share/gir-1.0' - ''; - - postInstall = '' - mkdir -p $out/share/gsettings-schemas/${name}/ - mv $out/share/glib-2.0 $out/share/gsettings-schemas/${name} - ''; - - preFixup = '' - wrapProgram "$out/bin/geary" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - ''; - - enableParallelBuilding = true; - - patches = [ ./disable_valadoc.patch ]; - patchFlags = "-p0"; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Geary; - description = "Mail client for GNOME 3"; - maintainers = gnome3.maintainers; - license = licenses.lgpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/misc/geary/disable_valadoc.patch b/pkgs/desktops/gnome-3/3.18/misc/geary/disable_valadoc.patch deleted file mode 100644 index e65c0dea7472..000000000000 --- a/pkgs/desktops/gnome-3/3.18/misc/geary/disable_valadoc.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- src/CMakeLists.txt.orig 2014-05-23 14:41:20.809160364 +0200 -+++ src/CMakeLists.txt 2014-05-23 14:41:29.240261581 +0200 -@@ -696,21 +696,6 @@ - ${CMAKE_COMMAND} -E copy geary-mailer ${CMAKE_BINARY_DIR}/ - ) - --# Valadoc --################################################# --foreach(pkg ${ENGINE_PACKAGES}) -- list(APPEND valadoc_pkg_opts "--pkg=${pkg}") --endforeach(pkg ${ENGINE_PACKAGES}) -- --include(FindValadoc) --add_custom_target( -- valadoc -- WORKING_DIRECTORY -- ${CMAKE_SOURCE_DIR}/src -- COMMAND -- ${VALADOC_EXECUTABLE} --force --no-protected -b ${CMAKE_CURRENT_SOURCE_DIR} -o ${CMAKE_SOURCE_DIR}/valadoc --package-name=geary --package-version=${VERSION} ${ENGINE_SRC} ${valadoc_pkg_opts} --vapidir=${CMAKE_SOURCE_DIR}/bindings/vapi --) -- - ## Make clean: remove copied files - ################################################## - set_property( diff --git a/pkgs/desktops/gnome-3/3.18/misc/gexiv2/default.nix b/pkgs/desktops/gnome-3/3.18/misc/gexiv2/default.nix deleted file mode 100644 index 7cea9cd8d150..000000000000 --- a/pkgs/desktops/gnome-3/3.18/misc/gexiv2/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, exiv2, glib, libtool, m4, gnome3 }: - -let - majorVersion = "0.10"; -in -stdenv.mkDerivation rec { - name = "gexiv2-${version}"; - version = "${majorVersion}.3"; - - src = fetchurl { - url = "mirror://gnome/sources/gexiv2/${majorVersion}/${name}.tar.xz"; - sha256 = "390cfb966197fa9f3f32200bc578d7c7f3560358c235e6419657206a362d3988"; - }; - - preConfigure = '' - patchShebangs . - ''; - - buildInputs = [ pkgconfig glib libtool m4 ]; - propagatedBuildInputs = [ exiv2 ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/gexiv2; - description = "GObject wrapper around the Exiv2 photo metadata library"; - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/misc/gfbgraph/default.nix b/pkgs/desktops/gnome-3/3.18/misc/gfbgraph/default.nix deleted file mode 100644 index e85b087fa41f..000000000000 --- a/pkgs/desktops/gnome-3/3.18/misc/gfbgraph/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, intltool, fetchurl, pkgconfig, glib -, gnome3, libsoup, json_glib }: - -stdenv.mkDerivation rec { - name = "gfbgraph-0.2.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gfbgraph/0.2/${name}.tar.xz"; - sha256 = "66c7b1c951863565c179d0b4b5207f27b3b36f80afed9f6a9acfc5fc3ae775d4"; - }; - - buildInputs = [ pkgconfig glib gnome3.gnome_online_accounts ]; - propagatedBuildInputs = [ libsoup json_glib gnome3.rest ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - description = "GLib/GObject wrapper for the Facebook Graph API"; - maintainers = gnome3.maintainers; - license = licenses.lgpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/misc/gitg/default.nix b/pkgs/desktops/gnome-3/3.18/misc/gitg/default.nix deleted file mode 100644 index 2c4d37a7edf8..000000000000 --- a/pkgs/desktops/gnome-3/3.18/misc/gitg/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv, fetchurl, fetchgit, vala, intltool, libgit2, pkgconfig, gtk3, glib -, json_glib, webkitgtk, makeWrapper, libpeas, bash, gobjectIntrospection -, gnome3, gtkspell3, shared_mime_info, libgee, libgit2-glib, librsvg, libsecret }: - -# TODO: icons and theme still does not work -# use packaged gnome3.adwaita-icon-theme - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - preCheck = '' - substituteInPlace tests/libgitg/test-commit.c --replace "/bin/bash" "${bash}/bin/bash" - ''; - doCheck = true; - - makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"; - - propagatedUserEnvPkgs = [ shared_mime_info - gnome3.gnome_themes_standard ]; - - buildInputs = [ vala intltool libgit2 pkgconfig gtk3 glib json_glib webkitgtk libgee libpeas - libgit2-glib gtkspell3 gnome3.gsettings_desktop_schemas gnome3.gtksourceview - librsvg libsecret - gobjectIntrospection makeWrapper gnome3.adwaita-icon-theme ]; - - # https://bugzilla.gnome.org/show_bug.cgi?id=758240 - preBuild = ''make -j$NIX_BUILD_CORES Gitg-1.0.gir''; - - preFixup = '' - wrapProgram "$out/bin/gitg" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/action/show/Apps/Gitg; - description = "GNOME GUI client to view git repositories"; - maintainers = with maintainers; [ domenkozar ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/misc/gitg/src.nix b/pkgs/desktops/gnome-3/3.18/misc/gitg/src.nix deleted file mode 100644 index ad05a219b253..000000000000 --- a/pkgs/desktops/gnome-3/3.18/misc/gitg/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gitg-3.20.0"; - - src = fetchurl { - url = mirror://gnome/sources/gitg/3.20/gitg-3.20.0.tar.xz; - sha256 = "1f09f61208349d003f228e51dc9709bd3426960f5585c0e38197bd02b51f3346"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/misc/gnome-packagekit/default.nix b/pkgs/desktops/gnome-3/3.18/misc/gnome-packagekit/default.nix deleted file mode 100644 index 99cf939fb507..000000000000 --- a/pkgs/desktops/gnome-3/3.18/misc/gnome-packagekit/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gnome3, libxslt, packagekit -, fontconfig, libcanberra_gtk3, libnotify, wrapGAppsHook, dbus_glib, dbus_libs }: - -stdenv.mkDerivation rec { - name = "gnome-packagekit-${version}"; - version = "3.18.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-packagekit/3.18/${name}.tar.xz"; - sha256 = "0a7ww807b77yjf6l8s2ycpxx813lyncwaxq227jckphazpq65a50"; - }; - - NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0"; - - nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ]; - buildInputs = [ libxslt gnome3.gtk packagekit fontconfig - libcanberra_gtk3 libnotify dbus_glib dbus_libs ]; - - meta = with stdenv.lib; { - homepage = https://www.freedesktop.org/software/PackageKit/; - platforms = platforms.linux; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - description = "Tools for installing software on the GNOME desktop using PackageKit"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/misc/gnome-software/default.nix b/pkgs/desktops/gnome-3/3.18/misc/gnome-software/default.nix deleted file mode 100644 index 51efc0446ef9..000000000000 --- a/pkgs/desktops/gnome-3/3.18/misc/gnome-software/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gnome3, wrapGAppsHook, packagekit -, appstream-glib, libsoup, polkit, attr, acl, libyaml, isocodes }: - -stdenv.mkDerivation rec { - name = "gnome-software-${version}"; - version = "3.18.3"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-software/3.18/${name}.tar.xz"; - sha256 = "0ywvjmn0cwr4kv2l6ic80ac7js7hpsp3g127cj7h256iaqgsaxnc"; - }; - - nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ]; - buildInputs = [ gnome3.gtk packagekit appstream-glib libsoup - gnome3.gsettings_desktop_schemas gnome3.gnome_desktop - polkit attr acl libyaml ]; - propagatedBuildInputs = [ isocodes ]; - - postInstall = '' - mkdir -p $out/share/xml/ - ln -s ${isocodes}/share/xml/iso-codes $out/share/xml/iso-codes - ''; - - meta = with stdenv.lib; { - homepage = https://www.freedesktop.org/software/PackageKit/; - platforms = platforms.linux; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - description = "GNOME Software lets you install and update applications and system extensions."; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch b/pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch deleted file mode 100644 index 0649d2bc8cc0..000000000000 --- a/pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch +++ /dev/null @@ -1,123 +0,0 @@ -From bdbbe312e6520ce70e91319162e85367a69ce044 Mon Sep 17 00:00:00 2001 -From: Jascha Geerds <jascha@jgeerds.name> -Date: Sat, 1 Aug 2015 21:01:11 +0200 -Subject: [PATCH 1/3] Search for themes and icons in system data dirs - ---- - gtweak/tweaks/tweak_group_interface.py | 17 ++++------------- - gtweak/tweaks/tweak_group_keymouse.py | 7 ++----- - gtweak/utils.py | 17 +++++++++++++++++ - 3 files changed, 23 insertions(+), 18 deletions(-) - -diff --git a/gtweak/tweaks/tweak_group_interface.py b/gtweak/tweaks/tweak_group_interface.py -index ed2ad5f..a319907 100644 ---- a/gtweak/tweaks/tweak_group_interface.py -+++ b/gtweak/tweaks/tweak_group_interface.py -@@ -26,7 +26,7 @@ from gi.repository import Gtk - from gi.repository import GLib - - import gtweak --from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file -+from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file, get_resource_dirs - from gtweak.tweakmodel import Tweak, TWEAK_GROUP_APPEARANCE - from gtweak.gshellwrapper import GnomeShellFactory - from gtweak.gsettings import GSettingsSetting -@@ -46,10 +46,7 @@ class GtkThemeSwitcher(GSettingsComboTweak): - - def _get_valid_themes(self): - """ Only shows themes that have variations for gtk+-3 and gtk+-2 """ -- dirs = ( os.path.join(gtweak.DATA_DIR, "themes"), -- os.path.join(GLib.get_user_data_dir(), "themes"), -- os.path.join(os.path.expanduser("~"), ".themes")) -- valid = walk_directories(dirs, lambda d: -+ valid = walk_directories(get_resource_dirs('themes'), lambda d: - os.path.exists(os.path.join(d, "gtk-2.0")) and \ - os.path.exists(os.path.join(d, "gtk-3.0"))) - return valid -@@ -64,10 +61,7 @@ class IconThemeSwitcher(GSettingsComboTweak): - **options) - - def _get_valid_icon_themes(self): -- dirs = ( os.path.join(gtweak.DATA_DIR, "icons"), -- os.path.join(GLib.get_user_data_dir(), "icons"), -- os.path.join(os.path.expanduser("~"), ".icons")) -- valid = walk_directories(dirs, lambda d: -+ valid = walk_directories(get_resource_dirs("icons"), lambda d: - os.path.isdir(d) and \ - os.path.exists(os.path.join(d, "index.theme"))) - return valid -@@ -82,10 +76,7 @@ class CursorThemeSwitcher(GSettingsComboTweak): - **options) - - def _get_valid_cursor_themes(self): -- dirs = ( os.path.join(gtweak.DATA_DIR, "icons"), -- os.path.join(GLib.get_user_data_dir(), "icons"), -- os.path.join(os.path.expanduser("~"), ".icons")) -- valid = walk_directories(dirs, lambda d: -+ valid = walk_directories(get_resource_dirs("icons"), lambda d: - os.path.isdir(d) and \ - os.path.exists(os.path.join(d, "cursors"))) - return valid -diff --git a/gtweak/tweaks/tweak_group_keymouse.py b/gtweak/tweaks/tweak_group_keymouse.py -index e4cce7b..4ac08b7 100644 ---- a/gtweak/tweaks/tweak_group_keymouse.py -+++ b/gtweak/tweaks/tweak_group_keymouse.py -@@ -20,7 +20,7 @@ import os.path - from gi.repository import GLib - - import gtweak --from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default -+from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default, get_resource_dirs - from gtweak.widgets import ListBoxTweakGroup, GSettingsComboTweak, GSettingsSwitchTweak, GetterSetterSwitchTweak, Title, GSettingsComboEnumTweak - - class PrimaryPasteTweak(GetterSetterSwitchTweak): -@@ -48,10 +48,7 @@ class KeyThemeSwitcher(GSettingsComboTweak): - **options) - - def _get_valid_key_themes(self): -- dirs = ( os.path.join(gtweak.DATA_DIR, "themes"), -- os.path.join(GLib.get_user_data_dir(), "themes"), -- os.path.join(os.path.expanduser("~"), ".themes")) -- valid = walk_directories(dirs, lambda d: -+ valid = walk_directories(get_resource_dirs("themes"), lambda d: - os.path.isfile(os.path.join(d, "gtk-3.0", "gtk-keys.css")) and \ - os.path.isfile(os.path.join(d, "gtk-2.0-key", "gtkrc"))) - return valid -diff --git a/gtweak/utils.py b/gtweak/utils.py -index 6e4d701..535e1f3 100644 ---- a/gtweak/utils.py -+++ b/gtweak/utils.py -@@ -21,6 +21,7 @@ import tempfile - import shutil - import subprocess - import glob -+import itertools - - import gtweak - from gtweak.gsettings import GSettingsSetting -@@ -116,6 +117,22 @@ def execute_subprocess(cmd_then_args, block=True): - stdout, stderr = p.communicate() - return stdout, stderr, p.returncode - -+def get_resource_dirs(resource): -+ """Returns a list of all known resource dirs for a given resource. -+ -+ :param str resource: -+ Name of the resource (e.g. "themes") -+ :return: -+ A list of resource dirs -+ """ -+ dirs = [os.path.join(dir, resource) -+ for dir in itertools.chain(GLib.get_system_data_dirs(), -+ (gtweak.DATA_DIR, -+ GLib.get_user_data_dir()))] -+ dirs += [os.path.join(os.path.expanduser("~"), ".{}".format(resource))] -+ -+ return [dir for dir in dirs if os.path.isdir(dir)] -+ - @singleton - class AutostartManager: - --- -2.7.0 - diff --git a/pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch b/pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch deleted file mode 100644 index 7863941a420a..000000000000 --- a/pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch +++ /dev/null @@ -1,103 +0,0 @@ -From 22b948c39b32fb45066c4f5a9f99082094fea3d1 Mon Sep 17 00:00:00 2001 -From: Jascha Geerds <jascha@jgeerds.name> -Date: Sat, 1 Aug 2015 21:26:57 +0200 -Subject: [PATCH 2/3] Don't show multiple entries for a single theme - ---- - gtweak/tweaks/tweak_group_interface.py | 8 ++++---- - gtweak/tweaks/tweak_group_keymouse.py | 4 ++-- - gtweak/utils.py | 16 ++++++++++++++++ - 3 files changed, 22 insertions(+), 6 deletions(-) - -diff --git a/gtweak/tweaks/tweak_group_interface.py b/gtweak/tweaks/tweak_group_interface.py -index a319907..82c0286 100644 ---- a/gtweak/tweaks/tweak_group_interface.py -+++ b/gtweak/tweaks/tweak_group_interface.py -@@ -26,7 +26,7 @@ from gi.repository import Gtk - from gi.repository import GLib - - import gtweak --from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file, get_resource_dirs -+from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file, get_resource_dirs, get_unique_resources - from gtweak.tweakmodel import Tweak, TWEAK_GROUP_APPEARANCE - from gtweak.gshellwrapper import GnomeShellFactory - from gtweak.gsettings import GSettingsSetting -@@ -49,7 +49,7 @@ class GtkThemeSwitcher(GSettingsComboTweak): - valid = walk_directories(get_resource_dirs('themes'), lambda d: - os.path.exists(os.path.join(d, "gtk-2.0")) and \ - os.path.exists(os.path.join(d, "gtk-3.0"))) -- return valid -+ return get_unique_resources(valid) - - class IconThemeSwitcher(GSettingsComboTweak): - def __init__(self, **options): -@@ -64,7 +64,7 @@ class IconThemeSwitcher(GSettingsComboTweak): - valid = walk_directories(get_resource_dirs("icons"), lambda d: - os.path.isdir(d) and \ - os.path.exists(os.path.join(d, "index.theme"))) -- return valid -+ return get_unique_resources(valid) - - class CursorThemeSwitcher(GSettingsComboTweak): - def __init__(self, **options): -@@ -79,7 +79,7 @@ class CursorThemeSwitcher(GSettingsComboTweak): - valid = walk_directories(get_resource_dirs("icons"), lambda d: - os.path.isdir(d) and \ - os.path.exists(os.path.join(d, "cursors"))) -- return valid -+ return get_unique_resources(valid) - - class ShellThemeTweak(Gtk.Box, Tweak): - -diff --git a/gtweak/tweaks/tweak_group_keymouse.py b/gtweak/tweaks/tweak_group_keymouse.py -index 4ac08b7..ce1d0c1 100644 ---- a/gtweak/tweaks/tweak_group_keymouse.py -+++ b/gtweak/tweaks/tweak_group_keymouse.py -@@ -20,7 +20,7 @@ import os.path - from gi.repository import GLib - - import gtweak --from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default, get_resource_dirs -+from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default, get_resource_dirs, get_unique_resources - from gtweak.widgets import ListBoxTweakGroup, GSettingsComboTweak, GSettingsSwitchTweak, GetterSetterSwitchTweak, Title, GSettingsComboEnumTweak - - class PrimaryPasteTweak(GetterSetterSwitchTweak): -@@ -51,7 +51,7 @@ class KeyThemeSwitcher(GSettingsComboTweak): - valid = walk_directories(get_resource_dirs("themes"), lambda d: - os.path.isfile(os.path.join(d, "gtk-3.0", "gtk-keys.css")) and \ - os.path.isfile(os.path.join(d, "gtk-2.0-key", "gtkrc"))) -- return valid -+ return get_unique_resources(valid) - - TWEAK_GROUPS = [ - ListBoxTweakGroup(_("Keyboard and Mouse"), -diff --git a/gtweak/utils.py b/gtweak/utils.py -index 535e1f3..42f7d96 100644 ---- a/gtweak/utils.py -+++ b/gtweak/utils.py -@@ -133,6 +133,22 @@ def get_resource_dirs(resource): - - return [dir for dir in dirs if os.path.isdir(dir)] - -+def get_unique_resources(dirs): -+ """Filter out duplicated resources. -+ -+ :param list dirs: -+ List of resource dirs (e.g. /usr/share/themes/Adwaita) -+ :return: -+ List of dirs without duplicated resources -+ """ -+ unique_dirs = {} -+ for dir in dirs: -+ basename = os.path.basename(dir) -+ if basename not in unique_dirs: -+ unique_dirs[basename] = dir -+ -+ return unique_dirs -+ - @singleton - class AutostartManager: - --- -2.7.0 - diff --git a/pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch b/pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch deleted file mode 100644 index b25b2d6dc4aa..000000000000 --- a/pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch +++ /dev/null @@ -1,29 +0,0 @@ -From cdafa01dc90da486d0114b423e3e467f7b083d1b Mon Sep 17 00:00:00 2001 -From: Jascha Geerds <jascha@jgeerds.name> -Date: Sun, 2 Aug 2015 12:01:20 +0200 -Subject: [PATCH 3/3] Create config dir if it doesn't exist - -Otherwise gnome-tweak-tool can't enable the dark theme and fails -without a clear error message. ---- - gtweak/gtksettings.py | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/gtweak/gtksettings.py b/gtweak/gtksettings.py -index bcec9f1..f39991b 100644 ---- a/gtweak/gtksettings.py -+++ b/gtweak/gtksettings.py -@@ -35,6 +35,10 @@ class GtkSettingsManager: - def _get_keyfile(self): - keyfile = None - try: -+ config_dir = os.path.dirname(self._path) -+ if not os.path.isdir(config_dir): -+ os.makedirs(config_dir) -+ - keyfile = GLib.KeyFile() - keyfile.load_from_file(self._path, 0) - except MemoryError: --- -2.7.0 - diff --git a/pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/default.nix deleted file mode 100644 index d0c6674ad9bd..000000000000 --- a/pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv, intltool, fetchurl, python, pygobject3, atk -, pkgconfig, gtk3, glib, libsoup -, bash, makeWrapper, itstool, libxml2, python3Packages -, gnome3, librsvg, gdk_pixbuf, file, libnotify }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - doCheck = true; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - - makeFlags = [ "DESTDIR=/" ]; - - buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 - gnome3.gsettings_desktop_schemas makeWrapper file - gdk_pixbuf gnome3.defaultIconTheme librsvg - python pygobject3 libnotify gnome3.gnome_shell - libsoup gnome3.gnome_settings_daemon gnome3.nautilus - gnome3.gnome_desktop ]; - - preFixup = '' - wrapProgram "$out/bin/gnome-tweak-tool" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --suffix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix PYTHONPATH : "$PYTHONPATH:$(toPythonPath $out)" - ''; - - patches = [ - ./find_gsettings.patch - ./0001-Search-for-themes-and-icons-in-system-data-dirs.patch - ./0002-Don-t-show-multiple-entries-for-a-single-theme.patch - ./0003-Create-config-dir-if-it-doesn-t-exist.patch - ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/action/show/Apps/GnomeTweakTool; - description = "A tool to customize advanced GNOME 3 options"; - maintainers = gnome3.maintainers; - license = licenses.gpl3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/find_gsettings.patch b/pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/find_gsettings.patch deleted file mode 100644 index 3e68c04cb3ab..000000000000 --- a/pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/find_gsettings.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/gtweak/gsettings.py b/gtweak/gsettings.py -index a00fe19..dce74b2 100644 ---- a/gtweak/gsettings.py -+++ b/gtweak/gsettings.py -@@ -33,10 +33,15 @@ class GSettingsMissingError(Exception): - - class _GSettingsSchema: - def __init__(self, schema_name, schema_dir=None, schema_filename=None, **options): -- if not schema_dir: -- schema_dir = gtweak.GSETTINGS_SCHEMA_DIR - if not schema_filename: - schema_filename = schema_name + ".gschema.xml" -+ if not schema_dir: -+ schema_dir = gtweak.GSETTINGS_SCHEMA_DIR -+ for xdg_dir in GLib.get_system_data_dirs(): -+ dir = os.path.join(xdg_dir, "glib-2.0", "schemas") -+ if os.path.exists(os.path.join(dir, schema_filename)): -+ schema_dir = dir -+ break - - schema_path = os.path.join(schema_dir, schema_filename) - if not os.path.exists(schema_path): diff --git a/pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/src.nix b/pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/src.nix deleted file mode 100644 index 799087bd9b9b..000000000000 --- a/pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gnome-tweak-tool-3.18.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-tweak-tool/3.18/gnome-tweak-tool-3.18.1.tar.xz; - sha256 = "5c2c1103237648413c2d63a941e06b7057d6b102276b5968517753075de29430"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/misc/gnome-video-effects/default.nix b/pkgs/desktops/gnome-3/3.18/misc/gnome-video-effects/default.nix deleted file mode 100644 index c0bd2fed3f2d..000000000000 --- a/pkgs/desktops/gnome-3/3.18/misc/gnome-video-effects/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gnome3 }: - -stdenv.mkDerivation rec { - name = "gnome-video-effects-${version}"; - version = "0.4.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-video-effects/0.4/${name}.tar.xz"; - sha256 = "0jl4iny2dqpcgi3sgxzpgnbw0752i8ay3rscp2cgdjlp79ql5gil"; - }; - - buildInputs = [ pkgconfig intltool ]; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/GnomeVideoEffects; - platforms = platforms.linux; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/3.18/misc/gpaste/default.nix deleted file mode 100644 index e740d3e7e0e7..000000000000 --- a/pkgs/desktops/gnome-3/3.18/misc/gpaste/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv, fetchurl, intltool, autoreconfHook, pkgconfig, vala, glib -, pango, gtk3, gnome3, dbus, clutter, appstream-glib, makeWrapper }: - -stdenv.mkDerivation rec { - version = "${gnome3.version}.5"; - name = "gpaste-${version}"; - - src = fetchurl { - url = "https://github.com/Keruspe/GPaste/archive/v${version}.tar.gz"; - sha256 = "11sv605c70hgri06ycb74lg1hz1951gqvai1pnax8d6zyrfxdw1c"; - }; - - buildInputs = [ intltool autoreconfHook pkgconfig vala glib - gtk3 gnome3.gnome_control_center dbus - clutter pango appstream-glib makeWrapper ]; - - preConfigure = "intltoolize -f"; - - configureFlags = [ "--with-controlcenterdir=$(out)/gnome-control-center/keybindings" - "--with-dbusservicesdir=$(out)/share/dbus-1/services" ]; - - enableParallelBuilding = true; - - preFixup = - let - libPath = stdenv.lib.makeLibraryPath - [ glib gtk3 clutter pango ]; - in - '' - for i in $out/libexec/gpaste/*; do - wrapProgram $i \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" - done - ''; - - meta = with stdenv.lib; { - homepage = https://github.com/Keruspe/GPaste; - description = "Clipboard management system with GNOME3 integration"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/misc/gtkhtml/default.nix b/pkgs/desktops/gnome-3/3.18/misc/gtkhtml/default.nix deleted file mode 100644 index 89703b61932b..000000000000 --- a/pkgs/desktops/gnome-3/3.18/misc/gtkhtml/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, intltool -, gnome3, enchant, isocodes }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ pkgconfig gtk3 intltool gnome3.adwaita-icon-theme - gnome3.gsettings_desktop_schemas ]; - - propagatedBuildInputs = [ enchant isocodes ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/misc/gtkhtml/src.nix b/pkgs/desktops/gnome-3/3.18/misc/gtkhtml/src.nix deleted file mode 100644 index 21876ec9c399..000000000000 --- a/pkgs/desktops/gnome-3/3.18/misc/gtkhtml/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "gtkhtml-4.10.0"; - - src = fetchurl { - url = mirror://gnome/sources/gtkhtml/4.10/gtkhtml-4.10.0.tar.xz; - sha256 = "ca3b6424fb2c7ac5d9cb8fdafb69318fa2e825c9cf6ed17d1e38d9b29e5606c3"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/misc/libgda/default.nix b/pkgs/desktops/gnome-3/3.18/misc/libgda/default.nix deleted file mode 100644 index a228d12509b0..000000000000 --- a/pkgs/desktops/gnome-3/3.18/misc/libgda/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, openssl }: - -let - major = "5.2"; - minor = "4"; - -in stdenv.mkDerivation rec { - version = "${major}.${minor}"; - name = "libgda-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/libgda/${major}/${name}.tar.xz"; - sha256 = "0pkn9dlb53j73ajkhj8lkf5pa26ci1gwl0bcvxdsmjrwb3fkivic"; - }; - - configureFlags = [ - "--enable-gi-system-install=no" - ]; - - hardeningDisable = [ "format" ]; - - enableParallelBuilding = true; - - buildInputs = [ pkgconfig intltool itstool libxml2 gtk3 openssl ]; - - meta = with stdenv.lib; { - description = "Database access library"; - homepage = http://www.gnome-db.org/; - license = [ licenses.lgpl2 licenses.gpl2 ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/misc/libgit2-glib/default.nix b/pkgs/desktops/gnome-3/3.18/misc/libgit2-glib/default.nix deleted file mode 100644 index d7e89702795f..000000000000 --- a/pkgs/desktops/gnome-3/3.18/misc/libgit2-glib/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ stdenv, fetchurl, gnome3, libtool, pkgconfig, vala, libssh2 -, gtk_doc, gobjectIntrospection, libgit2, glib }: - -stdenv.mkDerivation rec { - inherit (import ./src.nix fetchurl) name src; - - buildInputs = [ gnome3.gnome_common libtool pkgconfig vala libssh2 - gtk_doc gobjectIntrospection libgit2 glib ]; - - meta = with stdenv.lib; { - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/misc/libgit2-glib/src.nix b/pkgs/desktops/gnome-3/3.18/misc/libgit2-glib/src.nix deleted file mode 100644 index 3c8111c0b251..000000000000 --- a/pkgs/desktops/gnome-3/3.18/misc/libgit2-glib/src.nix +++ /dev/null @@ -1,10 +0,0 @@ -# Autogenerated by maintainers/scripts/gnome.sh update - -fetchurl: { - name = "libgit2-glib-0.24.0"; - - src = fetchurl { - url = mirror://gnome/sources/libgit2-glib/0.24/libgit2-glib-0.24.0.tar.xz; - sha256 = "d616c268821c28ff8dc1a6419dbf8555fa48e31dc6509c10f5151be7690f4845"; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/misc/libmediaart/default.nix b/pkgs/desktops/gnome-3/3.18/misc/libmediaart/default.nix deleted file mode 100644 index b86480125730..000000000000 --- a/pkgs/desktops/gnome-3/3.18/misc/libmediaart/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, gobjectIntrospection, gnome3 }: - -let - majorVersion = "1.9"; -in -stdenv.mkDerivation rec { - name = "libmediaart-${majorVersion}.0"; - - src = fetchurl { - url = "mirror://gnome/sources/libmediaart/${majorVersion}/${name}.tar.xz"; - sha256 = "0vshvm3sfwqs365glamvkmgnzjnmxd15j47xn0ak3p6l57dqlrll"; - }; - - buildInputs = [ pkgconfig glib gdk_pixbuf gobjectIntrospection ]; - - meta = with stdenv.lib; { - description = "Library tasked with managing, extracting and handling media art caches"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/misc/pidgin/default.nix b/pkgs/desktops/gnome-3/3.18/misc/pidgin/default.nix deleted file mode 100644 index 64f7920d9afc..000000000000 --- a/pkgs/desktops/gnome-3/3.18/misc/pidgin/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ stdenv, fetchFromGitHub, glib }: - -stdenv.mkDerivation rec { - version = "1.0"; - basename = "pidgin-im-gnome-shell-extension"; - name = "${basename}-${version}"; - - src = fetchFromGitHub { - owner = "muffinmad"; - repo = "${basename}"; - rev = "v${version}"; - sha256 = "0vj4w9qqx9gads24w3f6v6mfh5va28bp8rc4w7lz0vhp7njmy1yy"; - }; - - buildInputs = [ glib ]; - - configurePhase = ""; - buildPhase = ""; - installPhase = '' - share_dir="$prefix/share" - extensions_dir="$share_dir/gnome-shell/extensions/pidgin@muffinmad" - mkdir -p "$extensions_dir" - mv *.js metadata.json dbus.xml gnome-shell-extension-pidgin.pot "$extensions_dir" - - schemas_dir="$share_dir/gsettings-schemas/${name}/glib-2.0/schemas" - mkdir -p "$schemas_dir" - mv schemas/* "$schemas_dir" # fix Emacs syntax highlighting: */ - ${glib.dev}/bin/glib-compile-schemas "$schemas_dir" - - locale_dir="$share_dir/locale" - mkdir -p "$locale_dir" - mv locale/* $locale_dir # fix Emacs syntax highlighting: */ - ''; - - meta = with stdenv.lib; { - homepage = https://github.com/muffinmad/pidgin-im-gnome-shell-extension; - description = "Make Pidgin IM conversations appear in the Gnome Shell message tray"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = with maintainers; [ DamienCassou ]; - }; -} diff --git a/pkgs/desktops/gnome-3/3.18/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/3.18/misc/pomodoro/default.nix deleted file mode 100644 index ec8b6c622289..000000000000 --- a/pkgs/desktops/gnome-3/3.18/misc/pomodoro/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ stdenv, fetchFromGitHub, which, automake113x, intltool, pkgconfig, libtool, makeWrapper, - dbus_glib, libcanberra, gst_all_1, vala, gnome3, gtk3, gst_plugins_base, - glib, gobjectIntrospection, telepathy_glib -}: - -stdenv.mkDerivation rec { - rev = "4844fada548ba4d30e1441e063565f9e46334ffd"; - name = "gnome-shell-pomodoro-${gnome3.version}-${rev}"; - - src = fetchFromGitHub { - owner = "codito"; - repo = "gnome-pomodoro"; - rev = "${rev}"; - sha256 = "11vqlz0gcvrvf87hwwxvpw3lv50ail16nlynlzkqfd2dac028mag"; - }; - - configureScript = ''./autogen.sh''; - - buildInputs = [ - which automake113x intltool glib gobjectIntrospection pkgconfig libtool - makeWrapper dbus_glib libcanberra vala gst_all_1.gstreamer - gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good - gnome3.gsettings_desktop_schemas gnome3.gnome_desktop - gnome3.gnome_common gnome3.gnome_shell gtk3 telepathy_glib - gnome3.defaultIconTheme - ]; - - preBuild = '' - sed -i 's|\$(INTROSPECTION_GIRDIR)|${gnome3.gnome_desktop}/share/gir-1.0|' \ - vapi/Makefile - ''; - - preFixup = '' - wrapProgram $out/bin/gnome-pomodoro \ - --prefix XDG_DATA_DIRS : \ - "$out/share:$GSETTINGS_SCHEMAS_PATH:$XDG_DATA_DIRS" - ''; - - meta = with stdenv.lib; { - homepage = https://github.com/codito/gnome-shell-pomodoro; - description = "A time management utility for GNOME based on the pomodoro technique"; - longDescription = '' - This GNOME utility helps to manage time according to Pomodoro Technique. - It intends to improve productivity and focus by taking short breaks. - ''; - maintainers = with maintainers; [ DamienCassou jgeerds ]; - license = licenses.gpl3; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/3.20/core/libgxps/default.nix b/pkgs/desktops/gnome-3/3.20/core/libgxps/default.nix index 5168dec203fa..b39e1f6fa56c 100644 --- a/pkgs/desktops/gnome-3/3.20/core/libgxps/default.nix +++ b/pkgs/desktops/gnome-3/3.20/core/libgxps/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, glib, cairo, libarchive, freetype, libjpeg, libtiff -, openssl, bzip2, acl, attr +, openssl, bzip2, acl, attr, libxml2 }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1gi0b0x0354jyqc48vspk2hg2q1403cf2p9ibj847nzhkdrh9l9r"; }; - buildInputs = [ pkgconfig glib cairo freetype libjpeg libtiff acl openssl bzip2 attr]; + buildInputs = [ pkgconfig glib cairo freetype libjpeg libtiff acl openssl bzip2 attr libxml2 ]; propagatedBuildInputs = [ libarchive ]; configureFlags = "--without-liblcms2"; diff --git a/pkgs/desktops/kde-5/applications/ark/default.nix b/pkgs/desktops/kde-5/applications/ark/default.nix index 0af13b645e15..249027570663 100644 --- a/pkgs/desktops/kde-5/applications/ark/default.nix +++ b/pkgs/desktops/kde-5/applications/ark/default.nix @@ -1,7 +1,7 @@ { - kdeApp, lib, + kdeApp, lib, kdeWrapper, - extra-cmake-modules, kdoctools, makeQtWrapper, + ecm, kdoctools, makeWrapper, karchive, kconfig, kcrash, kdbusaddons, ki18n, kiconthemes, khtml, kio, kservice, kpty, kwidgetsaddons, libarchive, @@ -10,26 +10,33 @@ p7zip, unrar, unzipNLS, zip }: -kdeApp { - name = "ark"; - nativeBuildInputs = [ - extra-cmake-modules kdoctools makeQtWrapper - ]; - propagatedBuildInputs = [ - khtml ki18n kio karchive kconfig kcrash kdbusaddons kiconthemes kservice - kpty kwidgetsaddons libarchive - ]; - postInstall = - let - PATH = lib.makeBinPath [ - p7zip unrar unzipNLS zip +let + unwrapped = + kdeApp { + name = "ark"; + nativeBuildInputs = [ + ecm kdoctools makeWrapper ]; - in '' - wrapQtProgram "$out/bin/ark" \ - --prefix PATH : "${PATH}" - ''; - meta = { - license = with lib.licenses; [ gpl2 lgpl3 ]; - maintainers = [ lib.maintainers.ttuegel ]; - }; + propagatedBuildInputs = [ + khtml ki18n kio karchive kconfig kcrash kdbusaddons kiconthemes kservice + kpty kwidgetsaddons libarchive + ]; + postInstall = + let + PATH = lib.makeBinPath [ + p7zip unrar unzipNLS zip + ]; + in '' + wrapProgram "$out/bin/ark" \ + --prefix PATH : "${PATH}" + ''; + meta = { + license = with lib.licenses; [ gpl2 lgpl3 ]; + maintainers = [ lib.maintainers.ttuegel ]; + }; + }; +in +kdeWrapper unwrapped +{ + targets = [ "bin/ark" ]; } diff --git a/pkgs/desktops/kde-5/applications/baloo-widgets.nix b/pkgs/desktops/kde-5/applications/baloo-widgets.nix index fc91c92dbe6d..f6f3a7ce14ea 100644 --- a/pkgs/desktops/kde-5/applications/baloo-widgets.nix +++ b/pkgs/desktops/kde-5/applications/baloo-widgets.nix @@ -1,14 +1,7 @@ -{ kdeApp -, lib -, extra-cmake-modules -, kdoctools -, kconfig -, kio -, ki18n -, kservice -, kfilemetadata -, baloo -, kdelibs4support +{ + kdeApp, lib, + ecm, kdoctools, + baloo, kconfig, kdelibs4support, kfilemetadata, ki18n, kio, kservice }: kdeApp { @@ -17,11 +10,8 @@ kdeApp { license = [ lib.licenses.lgpl21 ]; maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; + nativeBuildInputs = [ ecm kdoctools ]; propagatedBuildInputs = [ - baloo kconfig kservice kdelibs4support kfilemetadata ki18n kio + baloo kconfig kdelibs4support kfilemetadata ki18n kio kservice ]; } diff --git a/pkgs/desktops/kde-5/applications/default.nix b/pkgs/desktops/kde-5/applications/default.nix index d3dc48b52823..609901048eee 100644 --- a/pkgs/desktops/kde-5/applications/default.nix +++ b/pkgs/desktops/kde-5/applications/default.nix @@ -21,11 +21,15 @@ let packages = self: with self; { kdeApp = import ./kde-app.nix { - inherit stdenv lib; + inherit lib; inherit debug srcs; + inherit kdeDerivation; }; - kdelibs = callPackage ./kdelibs { inherit (pkgs) attica phonon; }; + kdelibs = callPackage ./kdelibs { + inherit (srcs.kdelibs) src version; + inherit (pkgs) attica phonon; + }; ark = callPackage ./ark/default.nix {}; baloo-widgets = callPackage ./baloo-widgets.nix {}; diff --git a/pkgs/desktops/kde-5/applications/dolphin-plugins.nix b/pkgs/desktops/kde-5/applications/dolphin-plugins.nix index 962dd2ba7205..e9932adc5dca 100644 --- a/pkgs/desktops/kde-5/applications/dolphin-plugins.nix +++ b/pkgs/desktops/kde-5/applications/dolphin-plugins.nix @@ -1,12 +1,7 @@ -{ kdeApp -, lib -, extra-cmake-modules -, kdoctools -, kxmlgui -, ki18n -, kio -, kdelibs4support -, dolphin +{ + kdeApp, lib, + ecm, kdoctools, + dolphin, kdelibs4support, ki18n, kio, kxmlgui }: kdeApp { @@ -15,11 +10,8 @@ kdeApp { license = [ lib.licenses.gpl2 ]; maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; + nativeBuildInputs = [ ecm kdoctools ]; propagatedBuildInputs = [ - kdelibs4support ki18n kio kxmlgui dolphin + dolphin.unwrapped kdelibs4support ki18n kio kxmlgui ]; } diff --git a/pkgs/desktops/kde-5/applications/dolphin.nix b/pkgs/desktops/kde-5/applications/dolphin.nix index 168854383faf..27e4a38741e7 100644 --- a/pkgs/desktops/kde-5/applications/dolphin.nix +++ b/pkgs/desktops/kde-5/applications/dolphin.nix @@ -1,50 +1,31 @@ -{ kdeApp -, lib -, extra-cmake-modules -, kdoctools -, makeQtWrapper -, kinit -, kcmutils -, kcoreaddons -, knewstuff -, ki18n -, kdbusaddons -, kbookmarks -, kconfig -, kio -, kparts -, solid -, kiconthemes -, kcompletion -, ktexteditor -, kwindowsystem -, knotifications -, kactivities -, phonon -, baloo -, baloo-widgets -, kfilemetadata -, kdelibs4support +{ + kdeApp, lib, kdeWrapper, + ecm, kdoctools, makeQtWrapper, + baloo, baloo-widgets, dolphin-plugins, kactivities, kbookmarks, kcmutils, + kcompletion, kconfig, kcoreaddons, kdelibs4support, kdbusaddons, + kfilemetadata, ki18n, kiconthemes, kinit, kio, knewstuff, knotifications, + kparts, ktexteditor, kwindowsystem, phonon, solid }: -kdeApp { - name = "dolphin"; - meta = { - license = with lib.licenses; [ gpl2 fdl12 ]; - maintainers = [ lib.maintainers.ttuegel ]; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - makeQtWrapper - ]; - propagatedBuildInputs = [ - kinit kcmutils kcoreaddons knewstuff kdbusaddons kbookmarks kconfig kparts - solid kiconthemes kcompletion knotifications phonon baloo-widgets baloo - kactivities kdelibs4support kfilemetadata ki18n kio ktexteditor - kwindowsystem - ]; - postInstall = '' - wrapQtProgram "$out/bin/dolphin" - ''; +let + unwrapped = + kdeApp { + name = "dolphin"; + meta = { + license = with lib.licenses; [ gpl2 fdl12 ]; + maintainers = [ lib.maintainers.ttuegel ]; + }; + nativeBuildInputs = [ ecm kdoctools makeQtWrapper ]; + propagatedBuildInputs = [ + baloo baloo-widgets kactivities kbookmarks kcmutils kcompletion kconfig + kcoreaddons kdelibs4support kdbusaddons kfilemetadata ki18n kiconthemes + kinit kio knewstuff knotifications kparts ktexteditor kwindowsystem + phonon solid + ]; + }; +in +kdeWrapper unwrapped +{ + targets = [ "bin/dolphin" ]; + paths = [ dolphin-plugins ]; } diff --git a/pkgs/desktops/kde-5/applications/ffmpegthumbs.nix b/pkgs/desktops/kde-5/applications/ffmpegthumbs.nix index feacf7e437e7..c063b1e6035b 100644 --- a/pkgs/desktops/kde-5/applications/ffmpegthumbs.nix +++ b/pkgs/desktops/kde-5/applications/ffmpegthumbs.nix @@ -1,8 +1,7 @@ -{ kdeApp -, lib -, extra-cmake-modules -, ffmpeg -, kio +{ + kdeApp, lib, + ecm, + ffmpeg, kio }: kdeApp { @@ -11,11 +10,6 @@ kdeApp { license = with lib.licenses; [ gpl2 bsd3 ]; maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ - extra-cmake-modules - ]; - propagatedBuildInputs = [ - ffmpeg - kio - ]; + nativeBuildInputs = [ ecm ]; + propagatedBuildInputs = [ ffmpeg kio ]; } diff --git a/pkgs/desktops/kde-5/applications/filelight.nix b/pkgs/desktops/kde-5/applications/filelight.nix index 5ac101fa5018..acc5808b4a34 100644 --- a/pkgs/desktops/kde-5/applications/filelight.nix +++ b/pkgs/desktops/kde-5/applications/filelight.nix @@ -1,30 +1,21 @@ -{ kdeApp -, lib -, extra-cmake-modules -, kdoctools -, makeQtWrapper -, qtscript -, kio -, solid -, kxmlgui -, kparts +{ + kdeApp, lib, kdeWrapper, + ecm, kdoctools, + kio, kparts, kxmlgui, qtscript, solid }: -kdeApp { - name = "filelight"; - meta = { - license = with lib.licenses; [ gpl2 ]; - maintainers = with lib.maintainers; [ fridh vcunat ]; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - makeQtWrapper - ]; - propagatedBuildInputs = [ - kio kparts qtscript solid kxmlgui - ]; - postInstall = '' - wrapQtProgram "$out/bin/filelight" - ''; -} +let + unwrapped = + kdeApp { + name = "filelight"; + meta = { + license = with lib.licenses; [ gpl2 ]; + maintainers = with lib.maintainers; [ fridh vcunat ]; + }; + nativeBuildInputs = [ ecm kdoctools ]; + propagatedBuildInputs = [ + kio kparts kxmlgui qtscript solid + ]; + }; +in +kdeWrapper unwrapped { targets = [ "bin/filelight" ]; } diff --git a/pkgs/desktops/kde-5/applications/gpgmepp.nix b/pkgs/desktops/kde-5/applications/gpgmepp.nix index 8d6f11879d3b..0e5cb15029c3 100644 --- a/pkgs/desktops/kde-5/applications/gpgmepp.nix +++ b/pkgs/desktops/kde-5/applications/gpgmepp.nix @@ -1,8 +1,7 @@ -{ kdeApp -, lib -, extra-cmake-modules -, boost -, gpgme +{ + kdeApp, lib, + ecm, + boost, gpgme }: kdeApp { @@ -11,10 +10,6 @@ kdeApp { license = with lib.licenses; [ lgpl21 bsd3 ]; maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ - extra-cmake-modules - ]; - propagatedBuildInputs = [ - boost gpgme - ]; + nativeBuildInputs = [ ecm ]; + propagatedBuildInputs = [ boost gpgme ]; } diff --git a/pkgs/desktops/kde-5/applications/gwenview.nix b/pkgs/desktops/kde-5/applications/gwenview.nix index 20fc554d01a3..66df17f2e447 100644 --- a/pkgs/desktops/kde-5/applications/gwenview.nix +++ b/pkgs/desktops/kde-5/applications/gwenview.nix @@ -1,34 +1,23 @@ -{ kdeApp -, lib -, extra-cmake-modules -, kdoctools -, makeQtWrapper -, baloo -, exiv2 -, kactivities -, kdelibs4support -, kio -, lcms2 -, phonon -, qtsvg -, qtx11extras +{ + kdeApp, lib, kdeWrapper, + ecm, kdoctools, + baloo, exiv2, kactivities, kdelibs4support, kio, lcms2, phonon, + qtsvg, qtx11extras }: -kdeApp { - name = "gwenview"; - meta = { - license = with lib.licenses; [ gpl2 fdl12 ]; - maintainers = [ lib.maintainers.ttuegel ]; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - makeQtWrapper - ]; - propagatedBuildInputs = [ - baloo kactivities kdelibs4support kio qtx11extras exiv2 lcms2 phonon qtsvg - ]; - postInstall = '' - wrapQtProgram "$out/bin/gwenview" - ''; -} +let + unwrapped = + kdeApp { + name = "gwenview"; + meta = { + license = with lib.licenses; [ gpl2 fdl12 ]; + maintainers = [ lib.maintainers.ttuegel ]; + }; + nativeBuildInputs = [ ecm kdoctools ]; + propagatedBuildInputs = [ + baloo kactivities kdelibs4support kio qtx11extras exiv2 lcms2 phonon + qtsvg + ]; + }; +in +kdeWrapper unwrapped { targets = [ "bin/gwenview" ]; } diff --git a/pkgs/desktops/kde-5/applications/kate.nix b/pkgs/desktops/kde-5/applications/kate.nix index 94faa0655925..738266e8df7e 100644 --- a/pkgs/desktops/kde-5/applications/kate.nix +++ b/pkgs/desktops/kde-5/applications/kate.nix @@ -1,28 +1,27 @@ { - kdeApp, lib, makeQtWrapper, extra-cmake-modules, kdoctools, + kdeApp, lib, kdeWrapper, + ecm, kdoctools, kactivities, kconfig, kcrash, kguiaddons, kiconthemes, ki18n, kinit, kjobwidgets, kio, kparts, ktexteditor, kwindowsystem, kxmlgui, kdbusaddons, - kwallet, plasma-framework, kitemmodels, knotifications, qtscript, threadweaver, - knewstuff, libgit2 + kwallet, plasma-framework, kitemmodels, knotifications, qtscript, + threadweaver, knewstuff, libgit2 }: -kdeApp { - name = "kate"; - meta = { - license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ]; - maintainers = [ lib.maintainers.ttuegel ]; - }; - nativeBuildInputs = [ - extra-cmake-modules kdoctools makeQtWrapper - ]; - propagatedBuildInputs = [ - kactivities ki18n kio ktexteditor kwindowsystem plasma-framework qtscript - kconfig kcrash kguiaddons kiconthemes kinit kjobwidgets kparts kxmlgui - kdbusaddons kwallet kitemmodels knotifications threadweaver knewstuff - libgit2 - ]; - postInstall = '' - wrapQtProgram "$out/bin/kate" - wrapQtProgram "$out/bin/kwrite" - ''; -} +let + unwrapped = + kdeApp { + name = "kate"; + meta = { + license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ]; + maintainers = [ lib.maintainers.ttuegel ]; + }; + nativeBuildInputs = [ ecm kdoctools ]; + propagatedBuildInputs = [ + kactivities ki18n kio ktexteditor kwindowsystem plasma-framework + qtscript kconfig kcrash kguiaddons kiconthemes kinit kjobwidgets kparts + kxmlgui kdbusaddons kwallet kitemmodels knotifications threadweaver + knewstuff libgit2 + ]; + }; +in +kdeWrapper unwrapped { targets = [ "bin/kate" "bin/kwrite" ]; } diff --git a/pkgs/desktops/kde-5/applications/kcalc.nix b/pkgs/desktops/kde-5/applications/kcalc.nix index dae2b994577c..f6d87e3e6e97 100644 --- a/pkgs/desktops/kde-5/applications/kcalc.nix +++ b/pkgs/desktops/kde-5/applications/kcalc.nix @@ -1,31 +1,21 @@ -{ kdeApp -, lib -, makeQtWrapper -, extra-cmake-modules -, gmp -, kdoctools -, kconfig -, kconfigwidgets -, kguiaddons -, kinit -, knotifications +{ + kdeApp, lib, kdeWrapper, + ecm, kdoctools, + kconfig, kconfigwidgets, kguiaddons, kinit, knotifications, gmp }: -kdeApp { - name = "kcalc"; - meta = { - license = with lib.licenses; [ gpl2 ]; - maintainers = [ lib.maintainers.fridh ]; - }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - makeQtWrapper - ]; - propagatedBuildInputs = [ - gmp kconfig kconfigwidgets kguiaddons kinit knotifications - ]; - postInstall = '' - wrapQtProgram "$out/bin/kcalc" - ''; -} +let + unwrapped = + kdeApp { + name = "kcalc"; + meta = { + license = with lib.licenses; [ gpl2 ]; + maintainers = [ lib.maintainers.fridh ]; + }; + nativeBuildInputs = [ ecm kdoctools ]; + propagatedBuildInputs = [ + gmp kconfig kconfigwidgets kguiaddons kinit knotifications + ]; + }; +in +kdeWrapper unwrapped { targets = [ "bin/kcalc" ]; } diff --git a/pkgs/desktops/kde-5/applications/kcolorchooser.nix b/pkgs/desktops/kde-5/applications/kcolorchooser.nix index 8726f6870ca3..45a72a0bbc1b 100644 --- a/pkgs/desktops/kde-5/applications/kcolorchooser.nix +++ b/pkgs/desktops/kde-5/applications/kcolorchooser.nix @@ -1,14 +1,18 @@ -{ kdeApp, lib -, extra-cmake-modules -, ki18n, kwidgetsaddons, kxmlgui +{ + kdeApp, lib, kdeWrapper, + ecm, ki18n, kwidgetsaddons, kxmlgui }: -kdeApp { - name = "kcolorchooser"; - meta = { - license = with lib.licenses; [ mit ]; - maintainers = [ lib.maintainers.ttuegel ]; - }; - nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ ki18n kwidgetsaddons kxmlgui ]; -} +let + unwrapped = + kdeApp { + name = "kcolorchooser"; + meta = { + license = with lib.licenses; [ mit ]; + maintainers = [ lib.maintainers.ttuegel ]; + }; + nativeBuildInputs = [ ecm ]; + propagatedBuildInputs = [ ki18n kwidgetsaddons kxmlgui ]; + }; +in +kdeWrapper unwrapped { targets = [ "bin/kcolorchooser" ]; } diff --git a/pkgs/desktops/kde-5/applications/kde-app.nix b/pkgs/desktops/kde-5/applications/kde-app.nix index 2f1fdc1d643c..92fdb439330d 100644 --- a/pkgs/desktops/kde-5/applications/kde-app.nix +++ b/pkgs/desktops/kde-5/applications/kde-app.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, debug, srcs }: +{ kdeDerivation, lib, debug, srcs }: args: @@ -7,12 +7,10 @@ let sname = args.sname or name; inherit (srcs."${sname}") src version; in -stdenv.mkDerivation (args // { +kdeDerivation (args // { name = "${name}-${version}"; inherit src; - outputs = args.outputs or [ "dev" "out" ]; - cmakeFlags = (args.cmakeFlags or []) ++ [ "-DBUILD_TESTING=OFF" ] diff --git a/pkgs/desktops/kde-5/applications/kde-locale-5.nix b/pkgs/desktops/kde-5/applications/kde-locale-5.nix index 772ebe37e44f..2b9cc0e35eb0 100644 --- a/pkgs/desktops/kde-5/applications/kde-locale-5.nix +++ b/pkgs/desktops/kde-5/applications/kde-locale-5.nix @@ -1,6 +1,6 @@ name: args: -{ kdeApp, cmake, extra-cmake-modules, gettext, kdoctools }: +{ kdeApp, cmake, ecm, gettext, kdoctools }: kdeApp (args // { sname = "kde-l10n-${name}"; @@ -9,7 +9,7 @@ kdeApp (args // { outputs = [ "out" ]; nativeBuildInputs = - [ cmake extra-cmake-modules gettext kdoctools ] + [ cmake ecm gettext kdoctools ] ++ (args.nativeBuildInputs or []); preConfigure = '' diff --git a/pkgs/desktops/kde-5/applications/kdegraphics-thumbnailers.nix b/pkgs/desktops/kde-5/applications/kdegraphics-thumbnailers.nix index cddf064e47b7..c3947226690f 100644 --- a/pkgs/desktops/kde-5/applications/kdegraphics-thumbnailers.nix +++ b/pkgs/desktops/kde-5/applications/kdegraphics-thumbnailers.nix @@ -1,9 +1,6 @@ -{ kdeApp -, lib -, extra-cmake-modules -, kio -, libkexiv2 -, libkdcraw +{ + kdeApp, lib, + ecm, kio, libkexiv2, libkdcraw }: kdeApp { @@ -12,10 +9,6 @@ kdeApp { license = [ lib.licenses.lgpl21 ]; maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ - extra-cmake-modules - ]; - propagatedBuildInputs = [ - kio libkexiv2 libkdcraw - ]; + nativeBuildInputs = [ ecm ]; + propagatedBuildInputs = [ kio libkexiv2 libkdcraw ]; } diff --git a/pkgs/desktops/kde-5/applications/kdelibs/default.nix b/pkgs/desktops/kde-5/applications/kdelibs/default.nix index 389362deecc6..4ddc25ba6443 100644 --- a/pkgs/desktops/kde-5/applications/kdelibs/default.nix +++ b/pkgs/desktops/kde-5/applications/kdelibs/default.nix @@ -1,9 +1,9 @@ -{ kdeApp, attica, attr, automoc4, avahi, bison, cmake -, docbook_xml_dtd_42, docbook_xsl, flex, giflib, ilmbase -, libdbusmenu_qt, libjpeg, libxml2, libxslt, perl, phonon, pkgconfig -, polkit_qt4, qca2, qt4, shared_desktop_ontologies, shared_mime_info -, soprano, strigi, udev, xz, pcre -, lib +{ + kdeApp, lib, src, version, + automoc4, bison, cmake, flex, libxslt, perl, pkgconfig, shared_mime_info, + attica, attr, avahi, docbook_xml_dtd_42, docbook_xsl, giflib, ilmbase, + libdbusmenu_qt, libjpeg, libxml2, phonon, polkit_qt4, qca2, qt4, + shared_desktop_ontologies, soprano, strigi, udev, xz, pcre }: kdeApp { @@ -11,14 +11,14 @@ kdeApp { outputs = [ "out" ]; + nativeBuildInputs = [ + automoc4 bison cmake flex libxslt perl pkgconfig shared_mime_info + ]; buildInputs = [ attica attr avahi giflib libdbusmenu_qt libjpeg libxml2 polkit_qt4 qca2 shared_desktop_ontologies udev xz pcre ]; propagatedBuildInputs = [ qt4 soprano phonon strigi ]; - nativeBuildInputs = [ - automoc4 bison cmake flex libxslt perl pkgconfig shared_mime_info - ]; patches = [ ./0001-old-kde4-cmake-policies.patch @@ -39,6 +39,8 @@ kdeApp { setupHook = ./setup-hook.sh; meta = { + platforms = lib.platforms.linux; + homepage = "http://www.kde.org"; licenses = with lib.licenses; [ gpl2 fdl12 lgpl21 ]; maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/desktops/kde-5/applications/kdenetwork-filesharing.nix b/pkgs/desktops/kde-5/applications/kdenetwork-filesharing.nix index 2190ab8ea644..4aa119675285 100644 --- a/pkgs/desktops/kde-5/applications/kdenetwork-filesharing.nix +++ b/pkgs/desktops/kde-5/applications/kdenetwork-filesharing.nix @@ -1,12 +1,7 @@ -{ kdeApp -, lib -, extra-cmake-modules -, kdoctools -, kcoreaddons -, ki18n -, kio -, kwidgetsaddons -, samba +{ + kdeApp, lib, + ecm, kdoctools, + kcoreaddons, ki18n, kio, kwidgetsaddons, samba }: kdeApp { @@ -15,11 +10,6 @@ kdeApp { license = [ lib.licenses.gpl2 lib.licenses.lgpl21 ]; maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - propagatedBuildInputs = [ - kcoreaddons ki18n kio kwidgetsaddons samba - ]; + nativeBuildInputs = [ ecm kdoctools ]; + propagatedBuildInputs = [ kcoreaddons ki18n kio kwidgetsaddons samba ]; } diff --git a/pkgs/desktops/kde-5/applications/kgpg.nix b/pkgs/desktops/kde-5/applications/kgpg.nix index 3ee925197189..6717dc1511dc 100644 --- a/pkgs/desktops/kde-5/applications/kgpg.nix +++ b/pkgs/desktops/kde-5/applications/kgpg.nix @@ -1,32 +1,13 @@ -{ kdeApp -, lib -, automoc4 -, cmake -, makeWrapper -, perl -, pkgconfig -, boost -, gpgme -, kdelibs -, kdepimlibs -, gnupg +{ + kdeApp, lib, + automoc4, cmake, makeWrapper, perl, pkgconfig, + boost, gpgme, kdelibs, kdepimlibs, gnupg }: kdeApp { name = "kgpg"; - nativeBuildInputs = [ - automoc4 - cmake - makeWrapper - perl - pkgconfig - ]; - buildInputs = [ - boost - gpgme - kdelibs - kdepimlibs - ]; + nativeBuildInputs = [ automoc4 cmake makeWrapper perl pkgconfig ]; + buildInputs = [ boost gpgme kdelibs kdepimlibs ]; postInstall = '' wrapProgram "$out/bin/kgpg" \ --prefix PATH : "${gnupg}/bin" diff --git a/pkgs/desktops/kde-5/applications/khelpcenter.nix b/pkgs/desktops/kde-5/applications/khelpcenter.nix index 3cdcf22cf754..934f13425e8a 100644 --- a/pkgs/desktops/kde-5/applications/khelpcenter.nix +++ b/pkgs/desktops/kde-5/applications/khelpcenter.nix @@ -1,20 +1,19 @@ -{ kdeApp, extra-cmake-modules, kdoctools, makeQtWrapper -, grantlee, kconfig, kcoreaddons, kdbusaddons, ki18n, kinit, kcmutils -, kdelibs4support, khtml, kservice -, xapian +{ + kdeApp, kdeWrapper, + ecm, kdoctools, + grantlee, kconfig, kcoreaddons, kdbusaddons, ki18n, kinit, kcmutils, + kdelibs4support, khtml, kservice, xapian }: -kdeApp { - name = "khelpcenter"; - nativeBuildInputs = [ - extra-cmake-modules kdoctools makeQtWrapper - ]; - buildInputs = [ - grantlee kdelibs4support khtml ki18n kconfig kcoreaddons kdbusaddons kinit - kcmutils kservice - xapian - ]; - postInstall = '' - wrapQtProgram "$out/bin/khelpcenter" - ''; -} +let + unwrapped = + kdeApp { + name = "khelpcenter"; + nativeBuildInputs = [ ecm kdoctools ]; + buildInputs = [ + grantlee kdelibs4support khtml ki18n kconfig kcoreaddons kdbusaddons + kinit kcmutils kservice xapian + ]; + }; +in +kdeWrapper unwrapped { targets = [ "bin/khelpcenter" ]; } diff --git a/pkgs/desktops/kde-5/applications/kio-extras.nix b/pkgs/desktops/kde-5/applications/kio-extras.nix index 9d28066cae92..d9fe6a61ac34 100644 --- a/pkgs/desktops/kde-5/applications/kio-extras.nix +++ b/pkgs/desktops/kde-5/applications/kio-extras.nix @@ -1,26 +1,9 @@ -{ kdeApp, lib -, extra-cmake-modules, kdoctools -, shared_mime_info -, exiv2 -, kactivities, karchive -, kbookmarks -, kconfig, kconfigwidgets -, kcoreaddons, kdbusaddons, kguiaddons -, kdnssd -, kiconthemes -, ki18n -, kio -, khtml -, kdelibs4support -, kpty -, libmtp -, libssh -, openexr, ilmbase -, openslp -, phonon -, qtsvg -, samba -, solid +{ + kdeApp, lib, ecm, kdoctools, shared_mime_info, + exiv2, kactivities, karchive, kbookmarks, kconfig, kconfigwidgets, + kcoreaddons, kdbusaddons, kguiaddons, kdnssd, kiconthemes, ki18n, kio, khtml, + kdelibs4support, kpty, libmtp, libssh, openexr, ilmbase, openslp, phonon, + qtsvg, samba, solid }: kdeApp { @@ -29,10 +12,7 @@ kdeApp { license = with lib.licenses; [ gpl2 lgpl21 ]; maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ - extra-cmake-modules kdoctools - shared_mime_info - ]; + nativeBuildInputs = [ ecm kdoctools shared_mime_info ]; propagatedBuildInputs = [ exiv2 kactivities karchive kbookmarks kconfig kconfigwidgets kcoreaddons kdbusaddons kguiaddons kdnssd kiconthemes ki18n kio khtml kdelibs4support diff --git a/pkgs/desktops/kde-5/applications/kompare.nix b/pkgs/desktops/kde-5/applications/kompare.nix index 55bbfc448606..3b2143af615c 100644 --- a/pkgs/desktops/kde-5/applications/kompare.nix +++ b/pkgs/desktops/kde-5/applications/kompare.nix @@ -1,34 +1,18 @@ -{ kdeApp -, lib -, extra-cmake-modules -, kdoctools -, makeQtWrapper -, kparts -, ktexteditor -, kwidgetsaddons -, libkomparediff2 +{ + kdeApp, lib, kdeWrapper, + ecm, kdoctools, + kparts, ktexteditor, kwidgetsaddons, libkomparediff2 }: -kdeApp { - name = "kompare"; - meta = { - license = with lib.licenses; [ gpl2 ]; - }; - - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - makeQtWrapper - ]; - - propagatedBuildInputs = [ - kparts - ktexteditor - kwidgetsaddons - libkomparediff2 - ]; - - postInstall = '' - wrapQtProgram "$out/bin/kompare" - ''; -} +let + unwrapped = + kdeApp { + name = "kompare"; + meta = { license = with lib.licenses; [ gpl2 ]; }; + nativeBuildInputs = [ ecm kdoctools ]; + propagatedBuildInputs = [ + kparts ktexteditor kwidgetsaddons libkomparediff2 + ]; + }; +in +kdeWrapper unwrapped { targets = [ "bin/kompare" ]; } diff --git a/pkgs/desktops/kde-5/applications/konsole.nix b/pkgs/desktops/kde-5/applications/konsole.nix index 2042611f61b2..bf3a497fefaa 100644 --- a/pkgs/desktops/kde-5/applications/konsole.nix +++ b/pkgs/desktops/kde-5/applications/konsole.nix @@ -1,46 +1,27 @@ -{ kdeApp -, lib -, extra-cmake-modules -, kdoctools -, makeQtWrapper -, qtscript -, kbookmarks -, kcompletion -, kconfig -, kconfigwidgets -, kcoreaddons -, kguiaddons -, ki18n -, kiconthemes -, kinit -, kdelibs4support -, kio -, knotifications -, knotifyconfig -, kparts -, kpty -, kservice -, ktextwidgets -, kwidgetsaddons -, kwindowsystem -, kxmlgui +{ + kdeApp, lib, kdeWrapper, + ecm, kdoctools, + kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kguiaddons, + ki18n, kiconthemes, kinit, kdelibs4support, kio, knotifications, + knotifyconfig, kparts, kpty, kservice, ktextwidgets, kwidgetsaddons, + kwindowsystem, kxmlgui, qtscript }: -kdeApp { - name = "konsole"; - meta = { - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; - maintainers = [ lib.maintainers.ttuegel ]; - }; - nativeBuildInputs = [ - extra-cmake-modules kdoctools makeQtWrapper - ]; - propagatedBuildInputs = [ - kdelibs4support ki18n kwindowsystem qtscript kbookmarks kcompletion kconfig - kconfigwidgets kcoreaddons kguiaddons kiconthemes kinit kio knotifications - knotifyconfig kparts kpty kservice ktextwidgets kwidgetsaddons kxmlgui - ]; - postInstall = '' - wrapQtProgram "$out/bin/konsole" - ''; -} +let + unwrapped = + kdeApp { + name = "konsole"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = [ lib.maintainers.ttuegel ]; + }; + nativeBuildInputs = [ ecm kdoctools ]; + propagatedBuildInputs = [ + kdelibs4support ki18n kwindowsystem qtscript kbookmarks kcompletion + kconfig kconfigwidgets kcoreaddons kguiaddons kiconthemes kinit kio + knotifications knotifyconfig kparts kpty kservice ktextwidgets + kwidgetsaddons kxmlgui + ]; + }; +in +kdeWrapper unwrapped { targets = [ "bin/konsole" ]; } diff --git a/pkgs/desktops/kde-5/applications/libkdcraw.nix b/pkgs/desktops/kde-5/applications/libkdcraw.nix index 1c1ef7dc9968..421f7dbb4cfe 100644 --- a/pkgs/desktops/kde-5/applications/libkdcraw.nix +++ b/pkgs/desktops/kde-5/applications/libkdcraw.nix @@ -1,8 +1,4 @@ -{ kdeApp -, lib -, extra-cmake-modules -, libraw -}: +{ kdeApp, lib, ecm, libraw }: kdeApp { name = "libkdcraw"; @@ -10,10 +6,6 @@ kdeApp { license = with lib.licenses; [ gpl2 lgpl21 bsd3 ]; maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ - extra-cmake-modules - ]; - propagatedBuildInputs = [ - libraw - ]; + nativeBuildInputs = [ ecm ]; + propagatedBuildInputs = [ libraw ]; } diff --git a/pkgs/desktops/kde-5/applications/libkexiv2.nix b/pkgs/desktops/kde-5/applications/libkexiv2.nix index 5a46912a109e..0fac0759ab6b 100644 --- a/pkgs/desktops/kde-5/applications/libkexiv2.nix +++ b/pkgs/desktops/kde-5/applications/libkexiv2.nix @@ -1,8 +1,4 @@ -{ kdeApp -, lib -, exiv2 -, extra-cmake-modules -}: +{ kdeApp, lib, exiv2, ecm }: kdeApp { name = "libkexiv2"; @@ -10,10 +6,6 @@ kdeApp { license = with lib.licenses; [ gpl2 lgpl21 bsd3 ]; maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ - extra-cmake-modules - ]; - propagatedBuildInputs = [ - exiv2 - ]; + nativeBuildInputs = [ ecm ]; + propagatedBuildInputs = [ exiv2 ]; } diff --git a/pkgs/desktops/kde-5/applications/libkipi.nix b/pkgs/desktops/kde-5/applications/libkipi.nix index 33903463714a..fa9dcc8323d1 100644 --- a/pkgs/desktops/kde-5/applications/libkipi.nix +++ b/pkgs/desktops/kde-5/applications/libkipi.nix @@ -1,11 +1,4 @@ -{ kdeApp -, lib -, extra-cmake-modules -, kconfig -, ki18n -, kservice -, kxmlgui -}: +{ kdeApp, lib, ecm, kconfig, ki18n, kservice, kxmlgui }: kdeApp { name = "libkipi"; @@ -13,10 +6,6 @@ kdeApp { license = with lib.licenses; [ gpl2 lgpl21 bsd3 ]; maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ - extra-cmake-modules - ]; - propagatedBuildInputs = [ - kconfig ki18n kservice kxmlgui - ]; + nativeBuildInputs = [ ecm ]; + propagatedBuildInputs = [ kconfig ki18n kservice kxmlgui ]; } diff --git a/pkgs/desktops/kde-5/applications/libkomparediff2.nix b/pkgs/desktops/kde-5/applications/libkomparediff2.nix index d6a4878ffbdd..91b469fed3c7 100644 --- a/pkgs/desktops/kde-5/applications/libkomparediff2.nix +++ b/pkgs/desktops/kde-5/applications/libkomparediff2.nix @@ -1,23 +1,7 @@ -{ kdeApp -, lib -, extra-cmake-modules -, ki18n -, kxmlgui -, kcodecs -, kio -}: +{ kdeApp, lib, ecm, ki18n, kxmlgui, kcodecs, kio }: kdeApp { name = "libkomparediff2"; - - nativeBuildInputs = [ - extra-cmake-modules - ]; - - propagatedBuildInputs = [ - kcodecs - ki18n - kxmlgui - kio - ]; + nativeBuildInputs = [ ecm ]; + propagatedBuildInputs = [ kcodecs ki18n kxmlgui kio ]; } diff --git a/pkgs/desktops/kde-5/applications/okular.nix b/pkgs/desktops/kde-5/applications/okular.nix index 0691325d7a52..6e6f1407c558 100644 --- a/pkgs/desktops/kde-5/applications/okular.nix +++ b/pkgs/desktops/kde-5/applications/okular.nix @@ -1,40 +1,20 @@ -{ kdeApp -, lib -, automoc4 -, cmake -, perl -, pkgconfig -, kdelibs -, qimageblitz -, poppler_qt4 -, libspectre -, libkexiv2 -, djvulibre -, libtiff -, freetype -, ebook_tools +{ + kdeApp, lib, + automoc4, cmake, perl, pkgconfig, kdelibs, qimageblitz, + poppler_qt4, libspectre, libkexiv2, djvulibre, libtiff, freetype, + ebook_tools }: kdeApp { name = "okular"; - nativeBuildInputs = [ - automoc4 - cmake - perl - pkgconfig - ]; + nativeBuildInputs = [ automoc4 cmake perl pkgconfig ]; buildInputs = [ - kdelibs - qimageblitz - poppler_qt4 - libspectre - libkexiv2 - djvulibre - libtiff - freetype - ebook_tools + kdelibs qimageblitz poppler_qt4 libspectre libkexiv2 djvulibre libtiff + freetype ebook_tools ]; meta = { + platforms = lib.platforms.linux; + homepage = "http://www.kde.org"; license = with lib.licenses; [ gpl2 lgpl21 fdl12 bsd3 ]; maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/desktops/kde-5/applications/print-manager.nix b/pkgs/desktops/kde-5/applications/print-manager.nix index cf0703b7d2c3..c4a82780b448 100644 --- a/pkgs/desktops/kde-5/applications/print-manager.nix +++ b/pkgs/desktops/kde-5/applications/print-manager.nix @@ -1,20 +1,8 @@ -{ kdeApp -, lib -, extra-cmake-modules -, qtdeclarative -, cups -, kconfig -, kconfigwidgets -, kdbusaddons -, kiconthemes -, ki18n -, kcmutils -, kio -, knotifications -, plasma-framework -, kwidgetsaddons -, kwindowsystem -, kitemviews +{ + kdeApp, lib, ecm, + cups, kconfig, kconfigwidgets, kdbusaddons, kiconthemes, ki18n, kcmutils, kio, + knotifications, kwidgetsaddons, kwindowsystem, kitemviews, plasma-framework, + qtdeclarative }: kdeApp { @@ -23,9 +11,7 @@ kdeApp { license = [ lib.licenses.gpl2 ]; maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ - extra-cmake-modules - ]; + nativeBuildInputs = [ ecm ]; propagatedBuildInputs = [ cups kconfig kconfigwidgets kdbusaddons kiconthemes kcmutils knotifications kwidgetsaddons kitemviews ki18n kio kwindowsystem plasma-framework diff --git a/pkgs/desktops/kde-5/applications/spectacle.nix b/pkgs/desktops/kde-5/applications/spectacle.nix index 867c0b53b1e7..26faea2678a9 100644 --- a/pkgs/desktops/kde-5/applications/spectacle.nix +++ b/pkgs/desktops/kde-5/applications/spectacle.nix @@ -1,35 +1,20 @@ -{ kdeApp, lib -, extra-cmake-modules -, kdoctools -, makeQtWrapper -, kconfig -, kcoreaddons -, kdbusaddons -, kdeclarative -, ki18n -, kio -, knotifications -, kscreen -, kwidgetsaddons -, kwindowsystem -, kxmlgui -, libkipi -, xcb-util-cursor +{ + kdeApp, lib, kdeWrapper, + ecm, kdoctools, + kconfig, kcoreaddons, kdbusaddons, kdeclarative, ki18n, kio, knotifications, + kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi, xcb-util-cursor }: -kdeApp { - name = "spectacle"; - meta = with lib; { - maintainers = with maintainers; [ ttuegel ]; - }; - nativeBuildInputs = [ - extra-cmake-modules kdoctools makeQtWrapper - ]; - propagatedBuildInputs = [ - kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications - kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi xcb-util-cursor - ]; - postInstall = '' - wrapQtProgram "$out/bin/spectacle" - ''; -} +let + unwrapped = + kdeApp { + name = "spectacle"; + meta = with lib; { maintainers = with maintainers; [ ttuegel ]; }; + nativeBuildInputs = [ ecm kdoctools ]; + propagatedBuildInputs = [ + kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications + kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi xcb-util-cursor + ]; + }; +in +kdeWrapper unwrapped { targets = [ "bin/spectacle" ]; } diff --git a/pkgs/desktops/kde-5/frameworks/attica.nix b/pkgs/desktops/kde-5/frameworks/attica.nix deleted file mode 100644 index 98721876c120..000000000000 --- a/pkgs/desktops/kde-5/frameworks/attica.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -}: - -kdeFramework { - name = "attica"; - nativeBuildInputs = [ extra-cmake-modules ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/desktops/kde-5/frameworks/breeze-icons.nix b/pkgs/desktops/kde-5/frameworks/breeze-icons.nix deleted file mode 100644 index 773261638c98..000000000000 --- a/pkgs/desktops/kde-5/frameworks/breeze-icons.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kdeFramework -, extra-cmake-modules -, qtsvg -}: - -kdeFramework { - name = "breeze-icons"; - outputs = [ "out" ]; - nativeBuildInputs = [ extra-cmake-modules ]; - propagatedBuildInputs = [ qtsvg ]; -} diff --git a/pkgs/desktops/kde-5/frameworks/extra-cmake-modules/default.nix b/pkgs/desktops/kde-5/frameworks/extra-cmake-modules/default.nix deleted file mode 100644 index 1c2ea70442d3..000000000000 --- a/pkgs/desktops/kde-5/frameworks/extra-cmake-modules/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ kdeFramework, lib, copyPathsToStore, cmake, pkgconfig, qttools }: - -kdeFramework { - name = "extra-cmake-modules"; - - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); - - outputs = [ "out" ]; # this package has no runtime components - setupHook = ./setup-hook.sh; - - # It is OK to propagate these inputs as long as - # extra-cmake-modules is never a propagated input - # of some other derivation. - propagatedNativeBuildInputs = [ cmake pkgconfig qttools ]; - - meta = with lib; { - license = licenses.bsd2; - maintainers = [ maintainers.ttuegel ]; - }; -} diff --git a/pkgs/desktops/kde-5/frameworks/extra-cmake-modules/setup-hook.sh b/pkgs/desktops/kde-5/frameworks/extra-cmake-modules/setup-hook.sh deleted file mode 100644 index 5363f4e30fdc..000000000000 --- a/pkgs/desktops/kde-5/frameworks/extra-cmake-modules/setup-hook.sh +++ /dev/null @@ -1,99 +0,0 @@ -_ecmSetXdgDirs() { - addToSearchPathOnce XDG_DATA_DIRS "$1/share" - addToSearchPathOnce XDG_CONFIG_DIRS "$1/etc/xdg" - addToSearchPathOnce RUNTIME_XDG_CONFIG_DIRS "$1/etc/xdg" -} - -_ecmSharePaths=( \ - "appdata" \ - "applications" \ - "config.cfg" \ - "dbus-1" \ - "desktop-directories" \ - "doc" \ - "icons" \ - "kconf_update" \ - "kservices5" \ - "kservicetypes5" \ - "knotifications5" \ - "kxmlgui5" \ - "locale" \ - "mime" \ - "polkit-1" \ - "sounds" \ - "templates" \ - "wallpapers" \ - ) - -_ecmPropagateNative() { - for dir in ${_ecmSharePaths[@]}; do - if [ -d "$1/share/$dir" ]; then - propagateOnce propagatedNativeBuildInputs "$1" - if [ -z "$crossConfig" ]; then - propagateOnce propagatedUserEnvPkgs "$1" - addToSearchPathOnce RUNTIME_XDG_DATA_DIRS "$1/share" - fi - break - fi - done -} - -envHooks+=(_ecmSetXdgDirs _ecmPropagate) - -_ecmPropagate() { - for dir in ${_ecmSharePaths[@]}; do - if [ -d "$1/share/$dir" ]; then - propagateOnce propagatedBuildInputs "$1" - propagateOnce propagatedUserEnvPkgs "$1" - addToSearchPathOnce RUNTIME_XDG_DATA_DIRS "$1/share" - break - fi - done -} - -crossEnvHooks+=(_ecmPropagate) - -_ecmConfig() { - # Because we need to use absolute paths here, we must set *all* the paths. - cmakeFlags+=" -DKDE_INSTALL_EXECROOTDIR=${!outputBin}" - cmakeFlags+=" -DKDE_INSTALL_BINDIR=${!outputBin}/bin" - cmakeFlags+=" -DKDE_INSTALL_SBINDIR=${!outputBin}/sbin" - cmakeFlags+=" -DKDE_INSTALL_LIBDIR=${!outputLib}/lib" - cmakeFlags+=" -DKDE_INSTALL_LIBEXECDIR=${!outputLib}/lib/libexec" - cmakeFlags+=" -DKDE_INSTALL_CMAKEPACKAGEDIR=${!outputDev}/lib/cmake" - cmakeFlags+=" -DKDE_INSTALL_QTPLUGINDIR=${!outputLib}/lib/qt5/plugins" - cmakeFlags+=" -DKDE_INSTALL_PLUGINDIR=${!outputLib}/lib/qt5/plugins" - cmakeFlags+=" -DKDE_INSTALL_QTQUICKIMPORTSDIR=${!outputLib}/lib/qt5/imports" - cmakeFlags+=" -DKDE_INSTALL_QMLDIR=${!outputLib}/lib/qt5/qml" - cmakeFlags+=" -DKDE_INSTALL_INCLUDEDIR=${!outputInclude}/include" - cmakeFlags+=" -DKDE_INSTALL_LOCALSTATEDIR=/var" - cmakeFlags+=" -DKDE_INSTALL_DATAROOTDIR=${!outputLib}/share" - cmakeFlags+=" -DKDE_INSTALL_DATADIR=${!outputLib}/share" - cmakeFlags+=" -DKDE_INSTALL_DOCBUNDLEDIR=${!outputLib}/share/doc/HTML" - cmakeFlags+=" -DKDE_INSTALL_KCFGDIR=${!outputLib}/share/config.kcfg" - cmakeFlags+=" -DKDE_INSTALL_KCONFUPDATEDIR=${!outputLib}/share/kconf_update" - cmakeFlags+=" -DKDE_INSTALL_KSERVICES5DIR=${!outputLib}/share/kservices5" - cmakeFlags+=" -DKDE_INSTALL_KSERVICETYPES5DIR=${!outputLib}/share/kservicetypes5" - cmakeFlags+=" -DKDE_INSTALL_KXMLGUI5DIR=${!outputLib}/share/kxmlgui5" - cmakeFlags+=" -DKDE_INSTALL_KNOTIFY5RCDIR=${!outputLib}/share/knotifications5" - cmakeFlags+=" -DKDE_INSTALL_ICONDIR=${!outputLib}/share/icons" - cmakeFlags+=" -DKDE_INSTALL_LOCALEDIR=${!outputLib}/share/locale" - cmakeFlags+=" -DKDE_INSTALL_SOUNDDIR=${!outputLib}/share/sounds" - cmakeFlags+=" -DKDE_INSTALL_TEMPLATEDIR=${!outputLib}/share/templates" - cmakeFlags+=" -DKDE_INSTALL_WALLPAPERDIR=${!outputLib}/share/wallpapers" - cmakeFlags+=" -DKDE_INSTALL_APPDIR=${!outputLib}/share/applications" - cmakeFlags+=" -DKDE_INSTALL_DESKTOPDIR=${!outputLib}/share/desktop-directories" - cmakeFlags+=" -DKDE_INSTALL_MIMEDIR=${!outputLib}/share/mime/packages" - cmakeFlags+=" -DKDE_INSTALL_METAINFODIR=${!outputLib}/share/appdata" - cmakeFlags+=" -DKDE_INSTALL_MANDIR=${!outputLib}/share/man" - cmakeFlags+=" -DKDE_INSTALL_INFODIR=${!outputLib}/share/info" - cmakeFlags+=" -DKDE_INSTALL_DBUSDIR=${!outputLib}/share/dbus-1" - cmakeFlags+=" -DKDE_INSTALL_DBUSINTERFACEDIR=${!outputLib}/share/dbus-1/interfaces" - cmakeFlags+=" -DKDE_INSTALL_DBUSSERVICEDIR=${!outputLib}/share/dbus-1/services" - cmakeFlags+=" -DKDE_INSTALL_DBUSSYSTEMSERVICEDIR=${!outputLib}/share/dbus-1/system-services" - cmakeFlags+=" -DKDE_INSTALL_SYSCONFDIR=${!outputLib}/etc" - cmakeFlags+=" -DKDE_INSTALL_CONFDIR=${!outputLib}/etc/xdg" - cmakeFlags+=" -DKDE_INSTALL_AUTOSTARTDIR=${!outputLib}/etc/xdg/autostart" -} - -preConfigureHooks+=(_ecmConfig) diff --git a/pkgs/desktops/kde-5/frameworks/kapidox.nix b/pkgs/desktops/kde-5/frameworks/kapidox.nix deleted file mode 100644 index f78a5ea08a49..000000000000 --- a/pkgs/desktops/kde-5/frameworks/kapidox.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, python -}: - -kdeFramework { - name = "kapidox"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules python ]; -} diff --git a/pkgs/desktops/kde-5/frameworks/kcodecs.nix b/pkgs/desktops/kde-5/frameworks/kcodecs.nix deleted file mode 100644 index 53a69a69b69c..000000000000 --- a/pkgs/desktops/kde-5/frameworks/kcodecs.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -}: - -kdeFramework { - name = "kcodecs"; - nativeBuildInputs = [ extra-cmake-modules ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/desktops/kde-5/frameworks/kconfigwidgets/default.nix b/pkgs/desktops/kde-5/frameworks/kconfigwidgets/default.nix deleted file mode 100644 index f507abe29916..000000000000 --- a/pkgs/desktops/kde-5/frameworks/kconfigwidgets/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, kauth, kcodecs, kconfig -, kdoctools, kguiaddons, ki18n, kwidgetsaddons -}: - -kdeFramework { - name = "kconfigwidgets"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ kauth kconfig kcodecs kguiaddons ki18n kwidgetsaddons ]; - patches = [ ./0001-qdiriterator-follow-symlinks.patch ]; - postInstall = '' - moveToOutput "bin/preparetips5" "$dev" - ''; -} diff --git a/pkgs/desktops/kde-5/frameworks/kded.nix b/pkgs/desktops/kde-5/frameworks/kded.nix deleted file mode 100644 index fd286accb9ff..000000000000 --- a/pkgs/desktops/kde-5/frameworks/kded.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kconfig -, kcoreaddons -, kcrash -, kdbusaddons -, kdoctools -, kinit -, kservice -}: - -kdeFramework { - name = "kded"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - propagatedBuildInputs = [ kconfig kcoreaddons kcrash kdbusaddons kinit kservice ]; -} diff --git a/pkgs/desktops/kde-5/frameworks/ktexteditor/no-qcoreapplication.patch b/pkgs/desktops/kde-5/frameworks/ktexteditor/no-qcoreapplication.patch deleted file mode 100644 index 19ab1e1e5513..000000000000 --- a/pkgs/desktops/kde-5/frameworks/ktexteditor/no-qcoreapplication.patch +++ /dev/null @@ -1,36 +0,0 @@ -Index: ktexteditor-5.18.0/src/syntax/data/katehighlightingindexer.cpp -=================================================================== ---- ktexteditor-5.18.0.orig/src/syntax/data/katehighlightingindexer.cpp -+++ ktexteditor-5.18.0/src/syntax/data/katehighlightingindexer.cpp -@@ -55,19 +55,16 @@ QStringList readListing(const QString &f - - int main(int argc, char *argv[]) - { -- // get app instance -- QCoreApplication app(argc, argv); -- - // ensure enough arguments are passed -- if (app.arguments().size() < 3) -+ if (argc < 3) - return 1; - - // open schema - QXmlSchema schema; -- if (!schema.load(QUrl::fromLocalFile(app.arguments().at(2)))) -+ if (!schema.load(QUrl::fromLocalFile(QString::fromLocal8Bit(argv[2])))) - return 2; - -- const QString hlFilenamesListing = app.arguments().value(3); -+ const QString hlFilenamesListing = QString::fromLocal8Bit(argv[3]); - if (hlFilenamesListing.isEmpty()) { - return 1; - } -@@ -152,7 +149,7 @@ int main(int argc, char *argv[]) - return anyError; - - // create outfile, after all has worked! -- QFile outFile(app.arguments().at(1)); -+ QFile outFile(QString::fromLocal8Bit(argv[1])); - if (!outFile.open(QIODevice::WriteOnly | QIODevice::Truncate)) - return 7; - diff --git a/pkgs/desktops/kde-5/frameworks/ktexteditor/series b/pkgs/desktops/kde-5/frameworks/ktexteditor/series deleted file mode 100644 index 46cd23829a2f..000000000000 --- a/pkgs/desktops/kde-5/frameworks/ktexteditor/series +++ /dev/null @@ -1 +0,0 @@ -no-qcoreapplication.patch diff --git a/pkgs/desktops/kde-5/plasma/bluedevil.nix b/pkgs/desktops/kde-5/plasma/bluedevil.nix index 3bfac828084d..1deef241a62f 100644 --- a/pkgs/desktops/kde-5/plasma/bluedevil.nix +++ b/pkgs/desktops/kde-5/plasma/bluedevil.nix @@ -1,22 +1,18 @@ -{ plasmaPackage, extra-cmake-modules, bluez-qt, kcoreaddons -, kdbusaddons, kded, ki18n, kiconthemes, kio, knotifications -, kwidgetsaddons, kwindowsystem, makeQtWrapper, plasma-framework -, qtdeclarative, shared_mime_info +{ + plasmaPackage, ecm, shared_mime_info, + bluez-qt, kcoreaddons, kdbusaddons, kded, ki18n, kiconthemes, kio, + knotifications, kwidgetsaddons, kwindowsystem, plasma-framework, qtdeclarative }: plasmaPackage { name = "bluedevil"; - nativeBuildInputs = [ - extra-cmake-modules makeQtWrapper shared_mime_info - ]; + nativeBuildInputs = [ ecm shared_mime_info ]; propagatedBuildInputs = [ bluez-qt ki18n kio kwindowsystem plasma-framework qtdeclarative kcoreaddons kdbusaddons kded kiconthemes knotifications kwidgetsaddons ]; - propagatedUserEnvPkgs = [ bluez-qt ]; + propagatedUserEnvPkgs = [ bluez-qt.out ]; postInstall = '' - wrapQtProgram "$out/bin/bluedevil-wizard" - wrapQtProgram "$out/bin/bluedevil-sendfile" # Fix the location of logic.js for the plasmoid ln -s $out/share/plasma/plasmoids/org.kde.plasma.bluetooth/contents/code/logic.js $out/share/plasma/plasmoids/org.kde.plasma.bluetooth/contents/ui/logic.js ''; diff --git a/pkgs/desktops/kde-5/plasma/breeze-gtk.nix b/pkgs/desktops/kde-5/plasma/breeze-gtk.nix index 179f15dc8763..664387de1707 100644 --- a/pkgs/desktops/kde-5/plasma/breeze-gtk.nix +++ b/pkgs/desktops/kde-5/plasma/breeze-gtk.nix @@ -1,8 +1,8 @@ { plasmaPackage -, extra-cmake-modules +, ecm }: plasmaPackage { name = "breeze-gtk"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ ecm ]; } diff --git a/pkgs/desktops/kde-5/plasma/breeze-qt4.nix b/pkgs/desktops/kde-5/plasma/breeze-qt4.nix index f8092bc9d376..ad98a41e81dd 100644 --- a/pkgs/desktops/kde-5/plasma/breeze-qt4.nix +++ b/pkgs/desktops/kde-5/plasma/breeze-qt4.nix @@ -1,27 +1,22 @@ -{ plasmaPackage -, automoc4 -, cmake -, perl -, pkgconfig -, kdelibs -, qt4 -, xproto +{ + stdenv, lib, src, version, + automoc4, cmake, perl, pkgconfig, + kdelibs, qt4, xproto }: -plasmaPackage { - name = "breeze-qt4"; - sname = "breeze"; - buildInputs = [ - kdelibs - qt4 - xproto - ]; - nativeBuildInputs = [ - automoc4 - cmake - perl - pkgconfig - ]; +stdenv.mkDerivation { + name = "breeze-qt4-${version}"; + meta = { + license = with lib.licenses; [ + lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 + ]; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ ttuegel ]; + homepage = "http://www.kde.org"; + }; + inherit src; + buildInputs = [ kdelibs qt4 xproto ]; + nativeBuildInputs = [ automoc4 cmake perl pkgconfig ]; cmakeFlags = [ "-DUSE_KDE4=ON" "-DQT_QMAKE_EXECUTABLE=${qt4}/bin/qmake" diff --git a/pkgs/desktops/kde-5/plasma/breeze-qt5.nix b/pkgs/desktops/kde-5/plasma/breeze-qt5.nix index f641b48c82bc..a909e5067f42 100644 --- a/pkgs/desktops/kde-5/plasma/breeze-qt5.nix +++ b/pkgs/desktops/kde-5/plasma/breeze-qt5.nix @@ -1,4 +1,4 @@ -{ plasmaPackage, extra-cmake-modules, frameworkintegration +{ plasmaPackage, ecm, frameworkintegration , kcmutils, kconfigwidgets, kcoreaddons, kdecoration, kguiaddons , ki18n, kwindowsystem, makeQtWrapper, plasma-framework, qtx11extras }: @@ -7,7 +7,7 @@ plasmaPackage { name = "breeze-qt5"; sname = "breeze"; nativeBuildInputs = [ - extra-cmake-modules + ecm makeQtWrapper ]; propagatedBuildInputs = [ diff --git a/pkgs/desktops/kde-5/plasma/default.nix b/pkgs/desktops/kde-5/plasma/default.nix index f6bbd5c3f51e..7aff229b4c12 100644 --- a/pkgs/desktops/kde-5/plasma/default.nix +++ b/pkgs/desktops/kde-5/plasma/default.nix @@ -13,7 +13,7 @@ let - inherit (pkgs) lib stdenv symlinkJoin; + inherit (pkgs) lib makeSetupHook stdenv symlinkJoin; mirror = "mirror://kde"; srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; }; @@ -24,17 +24,10 @@ let inherit (args) name; sname = args.sname or name; inherit (srcs."${sname}") src version; - in stdenv.mkDerivation (args // { + in kdeDerivation (args // { name = "${name}-${version}"; inherit src; - outputs = args.outputs or [ "dev" "out" ]; - - cmakeFlags = - (args.cmakeFlags or []) - ++ [ "-DBUILD_TESTING=OFF" ] - ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug"; - meta = { license = with lib.licenses; [ lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 @@ -47,7 +40,9 @@ let bluedevil = callPackage ./bluedevil.nix {}; breeze-gtk = callPackage ./breeze-gtk.nix {}; - breeze-qt4 = callPackage ./breeze-qt4.nix {}; + breeze-qt4 = callPackage ./breeze-qt4.nix { + inherit (srcs.breeze) src version; + }; breeze-qt5 = callPackage ./breeze-qt5.nix {}; breeze = let diff --git a/pkgs/desktops/kde-5/plasma/kactivitymanagerd.nix b/pkgs/desktops/kde-5/plasma/kactivitymanagerd.nix index 282e58ecf9e6..bb90fd6d3ab0 100644 --- a/pkgs/desktops/kde-5/plasma/kactivitymanagerd.nix +++ b/pkgs/desktops/kde-5/plasma/kactivitymanagerd.nix @@ -1,12 +1,12 @@ { plasmaPackage -, extra-cmake-modules +, ecm , boost, kconfig, kcoreaddons, kdbusaddons, ki18n, kio, kglobalaccel , kwindowsystem, kxmlgui }: plasmaPackage { name = "kactivitymanagerd"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ ecm ]; propagatedBuildInputs = [ boost kconfig kcoreaddons kdbusaddons kglobalaccel ki18n kio kwindowsystem kxmlgui diff --git a/pkgs/desktops/kde-5/plasma/kde-cli-tools.nix b/pkgs/desktops/kde-5/plasma/kde-cli-tools.nix index d95db120dec4..33a7340cb85f 100644 --- a/pkgs/desktops/kde-5/plasma/kde-cli-tools.nix +++ b/pkgs/desktops/kde-5/plasma/kde-cli-tools.nix @@ -1,25 +1,14 @@ -{ plasmaPackage, extra-cmake-modules, kcmutils, kconfig -, kdelibs4support, kdesu, kdoctools, ki18n, kiconthemes -, kwindowsystem, makeQtWrapper, qtsvg, qtx11extras +{ + plasmaPackage, ecm, + kcmutils, kconfig, kdelibs4support, kdesu, kdoctools, ki18n, kiconthemes, + kwindowsystem, qtsvg, qtx11extras }: plasmaPackage { name = "kde-cli-tools"; - nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; + nativeBuildInputs = [ ecm kdoctools ]; propagatedBuildInputs = [ - kdelibs4support ki18n kwindowsystem qtsvg qtx11extras kcmutils kconfig kdesu - kiconthemes + kcmutils kconfig kdesu kdelibs4support ki18n kiconthemes kwindowsystem qtsvg + qtx11extras ]; - postInstall = '' - wrapQtProgram "$out/bin/kmimetypefinder5" - wrapQtProgram "$out/bin/ksvgtopng5" - wrapQtProgram "$out/bin/ktraderclient5" - wrapQtProgram "$out/bin/kioclient5" - wrapQtProgram "$out/bin/kdecp5" - wrapQtProgram "$out/bin/keditfiletype5" - wrapQtProgram "$out/bin/kcmshell5" - wrapQtProgram "$out/bin/kdemv5" - wrapQtProgram "$out/bin/kstart5" - wrapQtProgram "$out/bin/kde-open5" - ''; } diff --git a/pkgs/desktops/kde-5/plasma/kde-gtk-config/default.nix b/pkgs/desktops/kde-5/plasma/kde-gtk-config/default.nix index f482f2a6a3f3..10e55f0d6980 100644 --- a/pkgs/desktops/kde-5/plasma/kde-gtk-config/default.nix +++ b/pkgs/desktops/kde-5/plasma/kde-gtk-config/default.nix @@ -1,5 +1,5 @@ { plasmaPackage -, extra-cmake-modules +, ecm , glib , gtk2 , gtk3 @@ -15,7 +15,7 @@ plasmaPackage { name = "kde-gtk-config"; patches = [ ./0001-follow-symlinks.patch ]; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ ecm ]; propagatedBuildInputs = [ ki18n kio glib gtk2 gtk3 karchive kcmutils kconfigwidgets kiconthemes knewstuff diff --git a/pkgs/desktops/kde-5/plasma/kdecoration.nix b/pkgs/desktops/kde-5/plasma/kdecoration.nix index eb65f7f90afb..a0f9d93e60b0 100644 --- a/pkgs/desktops/kde-5/plasma/kdecoration.nix +++ b/pkgs/desktops/kde-5/plasma/kdecoration.nix @@ -1,6 +1,6 @@ -{ plasmaPackage, extra-cmake-modules }: +{ plasmaPackage, ecm }: plasmaPackage { name = "kdecoration"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ ecm ]; } diff --git a/pkgs/desktops/kde-5/plasma/kdeplasma-addons.nix b/pkgs/desktops/kde-5/plasma/kdeplasma-addons.nix index 3371e17beaf8..a2805f5d804b 100644 --- a/pkgs/desktops/kde-5/plasma/kdeplasma-addons.nix +++ b/pkgs/desktops/kde-5/plasma/kdeplasma-addons.nix @@ -1,4 +1,4 @@ -{ plasmaPackage, extra-cmake-modules, kdoctools +{ plasmaPackage, ecm, kdoctools , kconfig, kconfigwidgets, kcoreaddons, kcmutils, kdelibs4support, ki18n , kio, knewstuff, kross, krunner, kservice, ksysguard, kunitconversion , plasma-framework, plasma-workspace, qtdeclarative, qtx11extras @@ -8,7 +8,7 @@ plasmaPackage { name = "kdeplasma-addons"; nativeBuildInputs = [ - extra-cmake-modules + ecm kdoctools ]; propagatedBuildInputs = [ diff --git a/pkgs/desktops/kde-5/plasma/kgamma5.nix b/pkgs/desktops/kde-5/plasma/kgamma5.nix index 965c33e6eef8..70d7cc17a1ca 100644 --- a/pkgs/desktops/kde-5/plasma/kgamma5.nix +++ b/pkgs/desktops/kde-5/plasma/kgamma5.nix @@ -1,9 +1,9 @@ -{ plasmaPackage, extra-cmake-modules, kdoctools, kdelibs4support +{ plasmaPackage, ecm, kdoctools, kdelibs4support , qtx11extras }: plasmaPackage { name = "kgamma5"; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + nativeBuildInputs = [ ecm kdoctools ]; propagatedBuildInputs = [ kdelibs4support qtx11extras ]; } diff --git a/pkgs/desktops/kde-5/plasma/khotkeys.nix b/pkgs/desktops/kde-5/plasma/khotkeys.nix index 1666692c928b..760a2a4ee375 100644 --- a/pkgs/desktops/kde-5/plasma/khotkeys.nix +++ b/pkgs/desktops/kde-5/plasma/khotkeys.nix @@ -1,11 +1,11 @@ -{ plasmaPackage, extra-cmake-modules, kdoctools, kcmutils +{ plasmaPackage, ecm, kdoctools, kcmutils , kdbusaddons, kdelibs4support, kglobalaccel, ki18n, kio, kxmlgui , plasma-framework, plasma-workspace, qtx11extras }: plasmaPackage { name = "khotkeys"; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + nativeBuildInputs = [ ecm kdoctools ]; propagatedBuildInputs = [ kdelibs4support kglobalaccel ki18n kio plasma-framework plasma-workspace qtx11extras kcmutils kdbusaddons kxmlgui diff --git a/pkgs/desktops/kde-5/plasma/kinfocenter.nix b/pkgs/desktops/kde-5/plasma/kinfocenter.nix index c6a86fc05f63..dd9bdbd31bdf 100644 --- a/pkgs/desktops/kde-5/plasma/kinfocenter.nix +++ b/pkgs/desktops/kde-5/plasma/kinfocenter.nix @@ -1,23 +1,16 @@ -{ plasmaPackage, extra-cmake-modules, kdoctools, kcmutils +{ plasmaPackage, ecm, kdoctools, kcmutils , kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons , kdeclarative, kdelibs4support, ki18n, kiconthemes, kio, kpackage -, kservice, kwidgetsaddons, kxmlgui, libraw1394, makeQtWrapper +, kservice, kwidgetsaddons, kxmlgui, libraw1394 , pciutils, solid }: plasmaPackage { name = "kinfocenter"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - makeQtWrapper - ]; + nativeBuildInputs = [ ecm kdoctools ]; propagatedBuildInputs = [ kdeclarative kdelibs4support ki18n kio kcmutils kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons kiconthemes kpackage kservice kwidgetsaddons kxmlgui libraw1394 pciutils solid ]; - postInstall = '' - wrapQtProgram "$out/bin/kinfocenter" - ''; } diff --git a/pkgs/desktops/kde-5/plasma/kmenuedit.nix b/pkgs/desktops/kde-5/plasma/kmenuedit.nix index 09224a487167..3adb77a00517 100644 --- a/pkgs/desktops/kde-5/plasma/kmenuedit.nix +++ b/pkgs/desktops/kde-5/plasma/kmenuedit.nix @@ -1,18 +1,11 @@ -{ plasmaPackage, extra-cmake-modules, kdoctools, ki18n, kxmlgui -, kdbusaddons, kiconthemes, kio, sonnet, kdelibs4support, makeQtWrapper +{ plasmaPackage, ecm, kdoctools, ki18n, kxmlgui +, kdbusaddons, kiconthemes, kio, sonnet, kdelibs4support }: plasmaPackage { name = "kmenuedit"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - makeQtWrapper - ]; + nativeBuildInputs = [ ecm kdoctools ]; propagatedBuildInputs = [ kdelibs4support ki18n kio sonnet kxmlgui kdbusaddons kiconthemes ]; - postInstall = '' - wrapQtProgram "$out/bin/kmenuedit" - ''; } diff --git a/pkgs/desktops/kde-5/plasma/kscreen.nix b/pkgs/desktops/kde-5/plasma/kscreen.nix index 117a39c3be32..ecbd88c2146d 100644 --- a/pkgs/desktops/kde-5/plasma/kscreen.nix +++ b/pkgs/desktops/kde-5/plasma/kscreen.nix @@ -1,19 +1,13 @@ -{ plasmaPackage, extra-cmake-modules, kconfig, kconfigwidgets +{ plasmaPackage, ecm, kconfig, kconfigwidgets , kdbusaddons, kglobalaccel, ki18n, kwidgetsaddons, kxmlgui -, libkscreen, makeQtWrapper, qtdeclarative, qtgraphicaleffects +, libkscreen, qtdeclarative, qtgraphicaleffects }: plasmaPackage { name = "kscreen"; - nativeBuildInputs = [ - extra-cmake-modules - makeQtWrapper - ]; + nativeBuildInputs = [ ecm ]; propagatedBuildInputs = [ kglobalaccel ki18n libkscreen qtdeclarative qtgraphicaleffects kconfig kconfigwidgets kdbusaddons kwidgetsaddons kxmlgui ]; - postInstall = '' - wrapQtProgram "$out/bin/kscreen-console" - ''; } diff --git a/pkgs/desktops/kde-5/plasma/kscreenlocker.nix b/pkgs/desktops/kde-5/plasma/kscreenlocker.nix index 2cb3aac0f559..8fb5d9e708bc 100644 --- a/pkgs/desktops/kde-5/plasma/kscreenlocker.nix +++ b/pkgs/desktops/kde-5/plasma/kscreenlocker.nix @@ -1,14 +1,11 @@ -{ plasmaPackage, extra-cmake-modules, kcmutils, kcrash, kdeclarative +{ plasmaPackage, ecm, kcmutils, kcrash, kdeclarative , kdelibs4support, kdoctools, kglobalaccel, kidletime, kwayland , libXcursor, pam, plasma-framework, qtdeclarative, wayland }: plasmaPackage { name = "kscreenlocker"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; + nativeBuildInputs = [ ecm kdoctools ]; propagatedBuildInputs = [ kdeclarative plasma-framework qtdeclarative kcmutils kcrash kdelibs4support kglobalaccel kidletime kwayland libXcursor pam wayland diff --git a/pkgs/desktops/kde-5/plasma/ksshaskpass.nix b/pkgs/desktops/kde-5/plasma/ksshaskpass.nix index 8fe7cecd5a80..80b529a66685 100644 --- a/pkgs/desktops/kde-5/plasma/ksshaskpass.nix +++ b/pkgs/desktops/kde-5/plasma/ksshaskpass.nix @@ -1,12 +1,9 @@ -{ plasmaPackage, extra-cmake-modules, kdoctools, kcoreaddons -, ki18n, kwallet, kwidgetsaddons, makeQtWrapper +{ plasmaPackage, ecm, kdoctools, kcoreaddons +, ki18n, kwallet, kwidgetsaddons }: plasmaPackage { name = "ksshaskpass"; - nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; + nativeBuildInputs = [ ecm kdoctools ]; propagatedBuildInputs = [ kcoreaddons ki18n kwallet kwidgetsaddons ]; - postInstall = '' - wrapQtProgram "$out/bin/ksshaskpass" - ''; } diff --git a/pkgs/desktops/kde-5/plasma/ksysguard.nix b/pkgs/desktops/kde-5/plasma/ksysguard.nix index 637d539189d5..b0e94c6a5958 100644 --- a/pkgs/desktops/kde-5/plasma/ksysguard.nix +++ b/pkgs/desktops/kde-5/plasma/ksysguard.nix @@ -1,20 +1,13 @@ -{ plasmaPackage, extra-cmake-modules, kdoctools, kconfig +{ plasmaPackage, ecm, kdoctools, kconfig , kcoreaddons, kdelibs4support, ki18n, kitemviews, knewstuff -, kiconthemes, libksysguard, makeQtWrapper +, kiconthemes, libksysguard }: plasmaPackage { name = "ksysguard"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - makeQtWrapper - ]; + nativeBuildInputs = [ ecm kdoctools ]; propagatedBuildInputs = [ kconfig kcoreaddons kitemviews knewstuff kiconthemes libksysguard kdelibs4support ki18n ]; - postInstall = '' - wrapQtProgram "$out/bin/ksysguardd" - ''; } diff --git a/pkgs/desktops/kde-5/plasma/kwayland-integration.nix b/pkgs/desktops/kde-5/plasma/kwayland-integration.nix index 9045227a51a9..376e8ed7cbda 100644 --- a/pkgs/desktops/kde-5/plasma/kwayland-integration.nix +++ b/pkgs/desktops/kde-5/plasma/kwayland-integration.nix @@ -1,5 +1,5 @@ { plasmaPackage -, extra-cmake-modules +, ecm , kidletime , kwayland , kwindowsystem @@ -8,7 +8,7 @@ plasmaPackage { name = "kwayland-integration"; nativeBuildInputs = [ - extra-cmake-modules + ecm ]; propagatedBuildInputs = [ kidletime kwindowsystem kwayland diff --git a/pkgs/desktops/kde-5/plasma/kwin/default.nix b/pkgs/desktops/kde-5/plasma/kwin/default.nix index 8c85981de7e8..d121ba84dd00 100644 --- a/pkgs/desktops/kde-5/plasma/kwin/default.nix +++ b/pkgs/desktops/kde-5/plasma/kwin/default.nix @@ -1,4 +1,4 @@ -{ plasmaPackage, extra-cmake-modules, kdoctools, epoxy +{ plasmaPackage, ecm, kdoctools, epoxy , kactivities, kcompletion, kcmutils, kconfig, kconfigwidgets , kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel , ki18n, kiconthemes, kidletime, kinit, kio, knewstuff, knotifications @@ -11,9 +11,8 @@ plasmaPackage { name = "kwin"; nativeBuildInputs = [ - extra-cmake-modules + ecm kdoctools - makeQtWrapper ]; propagatedBuildInputs = [ kactivities kdeclarative kglobalaccel ki18n kio kscreenlocker kwindowsystem @@ -25,8 +24,4 @@ plasmaPackage { ]; patches = [ ./0001-qdiriterator-follow-symlinks.patch ]; cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" ]; - postInstall = '' - wrapQtProgram "$out/bin/kwin_x11" - wrapQtProgram "$out/bin/kwin_wayland" - ''; } diff --git a/pkgs/desktops/kde-5/plasma/kwrited.nix b/pkgs/desktops/kde-5/plasma/kwrited.nix index 29498e93404d..8dd814f783d0 100644 --- a/pkgs/desktops/kde-5/plasma/kwrited.nix +++ b/pkgs/desktops/kde-5/plasma/kwrited.nix @@ -1,9 +1,9 @@ -{ plasmaPackage, extra-cmake-modules, kcoreaddons, ki18n, kpty +{ plasmaPackage, ecm, kcoreaddons, ki18n, kpty , knotifications, kdbusaddons }: plasmaPackage { name = "kwrited"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ ecm ]; propagatedBuildInputs = [ kcoreaddons ki18n kpty knotifications kdbusaddons ]; } diff --git a/pkgs/desktops/kde-5/plasma/libkscreen.nix b/pkgs/desktops/kde-5/plasma/libkscreen.nix index 4e04fd5ed1d9..838ab6ef0e5c 100644 --- a/pkgs/desktops/kde-5/plasma/libkscreen.nix +++ b/pkgs/desktops/kde-5/plasma/libkscreen.nix @@ -1,5 +1,5 @@ { plasmaPackage -, extra-cmake-modules +, ecm , kwayland, libXrandr , qtx11extras }: @@ -7,7 +7,7 @@ plasmaPackage { name = "libkscreen"; nativeBuildInputs = [ - extra-cmake-modules + ecm ]; propagatedBuildInputs = [ kwayland libXrandr qtx11extras diff --git a/pkgs/desktops/kde-5/plasma/libksysguard/default.nix b/pkgs/desktops/kde-5/plasma/libksysguard/default.nix index 2a92d6e0af0b..b6ca3dfa26d6 100644 --- a/pkgs/desktops/kde-5/plasma/libksysguard/default.nix +++ b/pkgs/desktops/kde-5/plasma/libksysguard/default.nix @@ -1,4 +1,4 @@ -{ fetchpatch, plasmaPackage, extra-cmake-modules, kauth, kcompletion +{ fetchpatch, plasmaPackage, ecm, kauth, kcompletion , kconfigwidgets, kcoreaddons, kservice, kwidgetsaddons , kwindowsystem, plasma-framework, qtscript, qtx11extras , kconfig, ki18n, kiconthemes @@ -10,7 +10,7 @@ plasmaPackage { ./0001-qdiriterator-follow-symlinks.patch ]; nativeBuildInputs = [ - extra-cmake-modules + ecm ]; propagatedBuildInputs = [ kauth kconfig ki18n kiconthemes kwindowsystem plasma-framework qtx11extras diff --git a/pkgs/desktops/kde-5/plasma/milou.nix b/pkgs/desktops/kde-5/plasma/milou.nix index 43f78d9e2a97..dbf9d0b9e537 100644 --- a/pkgs/desktops/kde-5/plasma/milou.nix +++ b/pkgs/desktops/kde-5/plasma/milou.nix @@ -1,4 +1,4 @@ -{ plasmaPackage, extra-cmake-modules, qtscript, qtdeclarative +{ plasmaPackage, ecm, qtscript, qtdeclarative , kcoreaddons, ki18n, kdeclarative, kservice, plasma-framework , krunner }: @@ -6,7 +6,7 @@ plasmaPackage { name = "milou"; nativeBuildInputs = [ - extra-cmake-modules + ecm ]; propagatedBuildInputs = [ kdeclarative ki18n krunner plasma-framework qtdeclarative qtscript diff --git a/pkgs/desktops/kde-5/plasma/oxygen.nix b/pkgs/desktops/kde-5/plasma/oxygen.nix index 5a783ca65027..3c54055a6336 100644 --- a/pkgs/desktops/kde-5/plasma/oxygen.nix +++ b/pkgs/desktops/kde-5/plasma/oxygen.nix @@ -1,4 +1,4 @@ -{ plasmaPackage, extra-cmake-modules, ki18n, kcmutils, kconfig +{ plasmaPackage, ecm, ki18n, kcmutils, kconfig , kdecoration, kguiaddons, kwidgetsaddons, kservice, kcompletion , frameworkintegration, kwindowsystem, makeQtWrapper, qtx11extras }: @@ -6,7 +6,7 @@ plasmaPackage { name = "oxygen"; nativeBuildInputs = [ - extra-cmake-modules makeQtWrapper + ecm makeQtWrapper ]; propagatedBuildInputs = [ kcmutils kconfig kdecoration kguiaddons kwidgetsaddons kservice kcompletion diff --git a/pkgs/desktops/kde-5/plasma/plasma-desktop/default.nix b/pkgs/desktops/kde-5/plasma/plasma-desktop/default.nix index 3a61651644f4..dc4e81ef4eaa 100644 --- a/pkgs/desktops/kde-5/plasma/plasma-desktop/default.nix +++ b/pkgs/desktops/kde-5/plasma/plasma-desktop/default.nix @@ -1,4 +1,4 @@ -{ plasmaPackage, substituteAll, extra-cmake-modules, kdoctools +{ plasmaPackage, substituteAll, ecm, kdoctools , attica, baloo, boost, fontconfig, kactivities, kactivities-stats , kauth, kcmutils, kdbusaddons, kdeclarative, kded, kdelibs4support, kemoticons , kglobalaccel, ki18n, kitemmodels, knewstuff, knotifications @@ -6,17 +6,13 @@ , plasma-framework, plasma-workspace, qtdeclarative, qtx11extras , qtsvg, libXcursor, libXft, libxkbfile, xf86inputevdev , xf86inputsynaptics, xinput, xkeyboard_config, xorgserver -, libcanberra_kde, libpulseaudio, makeQtWrapper, utillinux +, libcanberra_kde, libpulseaudio, utillinux , qtquickcontrols, ksysguard }: plasmaPackage rec { name = "plasma-desktop"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - makeQtWrapper - ]; + nativeBuildInputs = [ ecm kdoctools ]; buildInputs = [ attica boost fontconfig kcmutils kdbusaddons kded kitemmodels knewstuff knotifications knotifyconfig kwallet libcanberra_kde libXcursor @@ -42,14 +38,4 @@ plasmaPackage rec { "-DEvdev_INCLUDE_DIRS=${xf86inputevdev.dev}/include/xorg" "-DSynaptics_INCLUDE_DIRS=${xf86inputsynaptics}/include/xorg" ]; - postInstall = '' - wrapQtProgram "$out/bin/kaccess" - wrapQtProgram "$out/bin/solid-action-desktop-gen" - wrapQtProgram "$out/bin/knetattach" - wrapQtProgram "$out/bin/krdb" - wrapQtProgram "$out/bin/kapplymousetheme" - wrapQtProgram "$out/bin/kfontinst" - wrapQtProgram "$out/bin/kcm-touchpad-list-devices" - wrapQtProgram "$out/bin/kfontview" - ''; } diff --git a/pkgs/desktops/kde-5/plasma/plasma-integration.nix b/pkgs/desktops/kde-5/plasma/plasma-integration.nix index 97d30dcd7732..e8680fea930a 100644 --- a/pkgs/desktops/kde-5/plasma/plasma-integration.nix +++ b/pkgs/desktops/kde-5/plasma/plasma-integration.nix @@ -1,4 +1,4 @@ -{ plasmaPackage, extra-cmake-modules +{ plasmaPackage, ecm , breeze-qt5, kconfig, kconfigwidgets, kiconthemes, kio, kwayland , libXcursor }: @@ -8,7 +8,7 @@ plasmaPackage { name = "plasma-integration"; nativeBuildInputs = [ - extra-cmake-modules + ecm ]; buildInputs = [ breeze-qt5 kconfig kconfigwidgets kiconthemes kio kwayland diff --git a/pkgs/desktops/kde-5/plasma/plasma-mediacenter.nix b/pkgs/desktops/kde-5/plasma/plasma-mediacenter.nix index a1e1cf8a127e..1967a0b8a4e0 100644 --- a/pkgs/desktops/kde-5/plasma/plasma-mediacenter.nix +++ b/pkgs/desktops/kde-5/plasma/plasma-mediacenter.nix @@ -1,4 +1,4 @@ -{ plasmaPackage, extra-cmake-modules, baloo, kactivities, kconfig +{ plasmaPackage, ecm, baloo, kactivities, kconfig , kcoreaddons, kdeclarative, kguiaddons, ki18n, kio, kservice , kfilemetadata, plasma-framework, qtdeclarative, qtmultimedia , taglib @@ -7,7 +7,7 @@ plasmaPackage rec { name = "plasma-mediacenter"; nativeBuildInputs = [ - extra-cmake-modules + ecm ]; propagatedBuildInputs = [ baloo kactivities kdeclarative kfilemetadata ki18n kio plasma-framework diff --git a/pkgs/desktops/kde-5/plasma/plasma-nm/default.nix b/pkgs/desktops/kde-5/plasma/plasma-nm/default.nix index 0ea2ab49f557..b6d18dbf91d9 100644 --- a/pkgs/desktops/kde-5/plasma/plasma-nm/default.nix +++ b/pkgs/desktops/kde-5/plasma/plasma-nm/default.nix @@ -1,8 +1,8 @@ -{ plasmaPackage, substituteAll, extra-cmake-modules, kdoctools +{ plasmaPackage, substituteAll, ecm, kdoctools , kcompletion, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative , kdelibs4support, ki18n, kiconthemes, kinit, kio, kitemviews , knotifications, kservice, kwallet, kwidgetsaddons, kwindowsystem -, kxmlgui, makeQtWrapper, mobile_broadband_provider_info +, kxmlgui, mobile_broadband_provider_info , modemmanager-qt, networkmanager-qt, openconnect, plasma-framework , qca-qt5, qtdeclarative, solid }: @@ -15,11 +15,7 @@ plasmaPackage { inherit mobile_broadband_provider_info; }) ]; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - makeQtWrapper - ]; + nativeBuildInputs = [ ecm kdoctools ]; propagatedBuildInputs = [ kdeclarative kdelibs4support ki18n kio kwindowsystem plasma-framework qtdeclarative kcompletion kconfigwidgets kcoreaddons kdbusaddons kiconthemes @@ -27,7 +23,4 @@ plasmaPackage { mobile_broadband_provider_info modemmanager-qt networkmanager-qt openconnect qca-qt5 solid ]; - postInstall = '' - wrapQtProgram "$out/bin/kde5-nm-connection-editor" - ''; } diff --git a/pkgs/desktops/kde-5/plasma/plasma-pa.nix b/pkgs/desktops/kde-5/plasma/plasma-pa.nix index 1712dab773db..b0ad9ac69ffe 100644 --- a/pkgs/desktops/kde-5/plasma/plasma-pa.nix +++ b/pkgs/desktops/kde-5/plasma/plasma-pa.nix @@ -1,4 +1,4 @@ -{ plasmaPackage, extra-cmake-modules, glib, kdoctools, kconfigwidgets +{ plasmaPackage, ecm, glib, kdoctools, kconfigwidgets , kcoreaddons, kdeclarative, kglobalaccel, ki18n, libpulseaudio , plasma-framework }: @@ -6,7 +6,7 @@ plasmaPackage { name = "plasma-pa"; nativeBuildInputs = [ - extra-cmake-modules + ecm kdoctools ]; propagatedBuildInputs = [ diff --git a/pkgs/desktops/kde-5/plasma/plasma-workspace-wallpapers.nix b/pkgs/desktops/kde-5/plasma/plasma-workspace-wallpapers.nix index bc87abcad153..6ffdb17cbeab 100644 --- a/pkgs/desktops/kde-5/plasma/plasma-workspace-wallpapers.nix +++ b/pkgs/desktops/kde-5/plasma/plasma-workspace-wallpapers.nix @@ -1,10 +1,11 @@ { plasmaPackage -, extra-cmake-modules +, ecm }: plasmaPackage { name = "plasma-workspace-wallpapers"; + outputs = [ "out" ]; nativeBuildInputs = [ - extra-cmake-modules + ecm ]; } diff --git a/pkgs/desktops/kde-5/plasma/plasma-workspace/default.nix b/pkgs/desktops/kde-5/plasma/plasma-workspace/default.nix index 190003ca5c78..09bba4a709f7 100644 --- a/pkgs/desktops/kde-5/plasma/plasma-workspace/default.nix +++ b/pkgs/desktops/kde-5/plasma/plasma-workspace/default.nix @@ -1,7 +1,7 @@ { plasmaPackage, lib, copyPathsToStore, - extra-cmake-modules, kdoctools, + ecm, kdoctools, baloo, kactivities, kcmutils, kconfig, kcrash, kdbusaddons, kdeclarative, kdelibs4support, kdesu, kglobalaccel, kidletime, kjsembed, knewstuff, @@ -14,9 +14,7 @@ plasmaPackage { name = "plasma-workspace"; - nativeBuildInputs = [ - extra-cmake-modules kdoctools - ]; + nativeBuildInputs = [ ecm kdoctools ]; buildInputs = [ baloo kactivities kcmutils kconfig kcrash kdbusaddons kdeclarative kdelibs4support kdesu kglobalaccel kidletime kjsembed knewstuff diff --git a/pkgs/desktops/kde-5/plasma/polkit-kde-agent.nix b/pkgs/desktops/kde-5/plasma/polkit-kde-agent.nix index 68bb3a9ef3dc..002c2bb10ff3 100644 --- a/pkgs/desktops/kde-5/plasma/polkit-kde-agent.nix +++ b/pkgs/desktops/kde-5/plasma/polkit-kde-agent.nix @@ -1,22 +1,12 @@ -{ plasmaPackage -, extra-cmake-modules -, ki18n -, kwindowsystem -, kdbusaddons -, kwidgetsaddons -, kcoreaddons -, kcrash -, kconfig -, kiconthemes -, knotifications -, polkit-qt +{ + plasmaPackage, ecm, + kcoreaddons, kconfig, kcrash, kdbusaddons, ki18n, kiconthemes, knotifications, + kwidgetsaddons, kwindowsystem, polkit-qt }: plasmaPackage { name = "polkit-kde-agent"; - nativeBuildInputs = [ - extra-cmake-modules - ]; + nativeBuildInputs = [ ecm ]; propagatedBuildInputs = [ kdbusaddons kwidgetsaddons kcoreaddons kcrash kconfig ki18n kiconthemes knotifications kwindowsystem polkit-qt diff --git a/pkgs/desktops/kde-5/plasma/powerdevil.nix b/pkgs/desktops/kde-5/plasma/powerdevil.nix index cbb2b9b019fc..c0c18a6eae6c 100644 --- a/pkgs/desktops/kde-5/plasma/powerdevil.nix +++ b/pkgs/desktops/kde-5/plasma/powerdevil.nix @@ -1,4 +1,4 @@ -{ plasmaPackage, extra-cmake-modules, kdoctools, bluez-qt, kactivities +{ plasmaPackage, ecm, kdoctools, bluez-qt, kactivities , kauth, kconfig, kdbusaddons, kdelibs4support, kglobalaccel, ki18n , kidletime, kio, knotifyconfig, kwayland, libkscreen, networkmanager-qt , plasma-workspace, qtx11extras, solid, udev @@ -6,10 +6,7 @@ plasmaPackage { name = "powerdevil"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; + nativeBuildInputs = [ ecm kdoctools ]; propagatedBuildInputs = [ kconfig kdbusaddons knotifyconfig solid udev bluez-qt kactivities kauth kdelibs4support kglobalaccel ki18n kio kidletime kwayland libkscreen diff --git a/pkgs/desktops/kde-5/plasma/srcs.nix b/pkgs/desktops/kde-5/plasma/srcs.nix index 2dbfb6dd04ac..15048dc9da26 100644 --- a/pkgs/desktops/kde-5/plasma/srcs.nix +++ b/pkgs/desktops/kde-5/plasma/srcs.nix @@ -3,323 +3,323 @@ { bluedevil = { - version = "5.7.1"; + version = "5.7.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.1/bluedevil-5.7.1.tar.xz"; - sha256 = "1sz84r27bc4qavb22haqswr1qjv9m47b8j3knvlpzdln4wpxnb81"; - name = "bluedevil-5.7.1.tar.xz"; + url = "${mirror}/stable/plasma/5.7.2/bluedevil-5.7.2.tar.xz"; + sha256 = "0lw7yf38vdxl5q8fyqp7xnhppv0r6ayr7wd3m73f1w7fqpkjd9v6"; + name = "bluedevil-5.7.2.tar.xz"; }; }; breeze = { - version = "5.7.1"; + version = "5.7.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.1/breeze-5.7.1.tar.xz"; - sha256 = "1sparlwykzr6mjqzv3ghzl59j0xi3yxf0m93sx7d3js92k77rqpk"; - name = "breeze-5.7.1.tar.xz"; + url = "${mirror}/stable/plasma/5.7.2/breeze-5.7.2.tar.xz"; + sha256 = "150lpy6jd2asbx8s5mznyagja31q5xwhhqqisrlnxapln2qj6xay"; + name = "breeze-5.7.2.tar.xz"; }; }; breeze-grub = { - version = "5.7.1"; + version = "5.7.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.1/breeze-grub-5.7.1.tar.xz"; - sha256 = "0ahpsq429f8cdk2w91h9ji9fiqc7g8m9zlg447pz7r6lxnj9aw3x"; - name = "breeze-grub-5.7.1.tar.xz"; + url = "${mirror}/stable/plasma/5.7.2/breeze-grub-5.7.2.tar.xz"; + sha256 = "1qhgqb3wa8mciddwa0v4kw3vs17annib0qy2jpy5qdfjc4yblq5q"; + name = "breeze-grub-5.7.2.tar.xz"; }; }; breeze-gtk = { - version = "5.7.1"; + version = "5.7.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.1/breeze-gtk-5.7.1.tar.xz"; - sha256 = "1xcznd9m6kxrv8c4j66m4qqgq02h32714dkjwr754k9qfiava2qg"; - name = "breeze-gtk-5.7.1.tar.xz"; + url = "${mirror}/stable/plasma/5.7.2/breeze-gtk-5.7.2.tar.xz"; + sha256 = "08jfvxfmzbnk4jjzljlp9wr37b7rmxcwnmi866x5v01x9iqfbcgw"; + name = "breeze-gtk-5.7.2.tar.xz"; }; }; breeze-plymouth = { - version = "5.7.1"; + version = "5.7.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.1/breeze-plymouth-5.7.1.tar.xz"; - sha256 = "16wx7k18yxf2jhxl2wwxy1dzdrrlfr9qkxbw72m5c21spx734wwb"; - name = "breeze-plymouth-5.7.1.tar.xz"; + url = "${mirror}/stable/plasma/5.7.2/breeze-plymouth-5.7.2.tar.xz"; + sha256 = "16dwqiq26xxpff0fni7aiq919k7jfmi35sj8xvvafb30wm4y3jix"; + name = "breeze-plymouth-5.7.2.tar.xz"; }; }; discover = { - version = "5.7.1"; + version = "5.7.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.1/discover-5.7.1.tar.xz"; - sha256 = "1r4g4ajyp6ap1nq2n9ngvsgzifypivrkkzfk14c06mmc4fbqblpd"; - name = "discover-5.7.1.tar.xz"; + url = "${mirror}/stable/plasma/5.7.2/discover-5.7.2.tar.xz"; + sha256 = "0kp3d7d21zxc8ag6f075r8mvfqd5mmk258aix5pyqc1njzb6rgg0"; + name = "discover-5.7.2.tar.xz"; }; }; kactivitymanagerd = { - version = "5.7.1"; + version = "5.7.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.1/kactivitymanagerd-5.7.1.tar.xz"; - sha256 = "1mc4dxxkvjyrq4khlg1gjhxdhn87xsghwlznp4gnfx4cjgvxi8bq"; - name = "kactivitymanagerd-5.7.1.tar.xz"; + url = "${mirror}/stable/plasma/5.7.2/kactivitymanagerd-5.7.2.tar.xz"; + sha256 = "0asp3jzl1vaqxs0nvkfxx5d8hnnsvcygbjgc4i63l7fjs64a789r"; + name = "kactivitymanagerd-5.7.2.tar.xz"; }; }; kde-cli-tools = { - version = "5.7.1"; + version = "5.7.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.1/kde-cli-tools-5.7.1.tar.xz"; - sha256 = "0q3j6kd7yfrp10pbld5pdis8w234442va3h460q9j3bp7n7xp8h9"; - name = "kde-cli-tools-5.7.1.tar.xz"; + url = "${mirror}/stable/plasma/5.7.2/kde-cli-tools-5.7.2.tar.xz"; + sha256 = "0y2pwshsiqgcxvj3yc6vyyhg8fkb5ddslnf1f86r92sy66gbjw0s"; + name = "kde-cli-tools-5.7.2.tar.xz"; }; }; kdecoration = { - version = "5.7.1"; + version = "5.7.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.1/kdecoration-5.7.1.tar.xz"; - sha256 = "181vay4alcckv93cralbj980c4zxbmca710dh9qrmy4nfk2y0pq7"; - name = "kdecoration-5.7.1.tar.xz"; + url = "${mirror}/stable/plasma/5.7.2/kdecoration-5.7.2.tar.xz"; + sha256 = "1wpb1kivy570ggrd7ip8n3zllyslzk6qlqc02i8g4rbavw0fxscx"; + name = "kdecoration-5.7.2.tar.xz"; }; }; kde-gtk-config = { - version = "5.7.1"; + version = "5.7.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.1/kde-gtk-config-5.7.1.tar.xz"; - sha256 = "18xm51j1604gg9sf9cmchqzgfrchwf2may4qhl2glns3c7xnps94"; - name = "kde-gtk-config-5.7.1.tar.xz"; + url = "${mirror}/stable/plasma/5.7.2/kde-gtk-config-5.7.2.tar.xz"; + sha256 = "08giv5w4055rd70nb28lwapdcfnywx2whgzpc1gdvsbgl6ap742n"; + name = "kde-gtk-config-5.7.2.tar.xz"; }; }; kdeplasma-addons = { - version = "5.7.1"; + version = "5.7.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.1/kdeplasma-addons-5.7.1.tar.xz"; - sha256 = "13mg01ll9np8av55ilns1dc0k3rv5cix901gp459dl9r05hzhxgp"; - name = "kdeplasma-addons-5.7.1.tar.xz"; + url = "${mirror}/stable/plasma/5.7.2/kdeplasma-addons-5.7.2.tar.xz"; + sha256 = "1qlr3fgp7gqyjyncn1qjajhbvb45sdbp9aqhz6ccnv3smwm74mp7"; + name = "kdeplasma-addons-5.7.2.tar.xz"; }; }; kgamma5 = { - version = "5.7.1"; + version = "5.7.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.1/kgamma5-5.7.1.tar.xz"; - sha256 = "1myxjj99jmp2n58f4jbarphr12jh9rqpjmvk2dpcijb94sxaimsl"; - name = "kgamma5-5.7.1.tar.xz"; + url = "${mirror}/stable/plasma/5.7.2/kgamma5-5.7.2.tar.xz"; + sha256 = "0jkk0lz4qaxsmgii3i698anpp0a9q0nakpb5h0kxffx5j01s5s25"; + name = "kgamma5-5.7.2.tar.xz"; }; }; khotkeys = { - version = "5.7.1"; + version = "5.7.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.1/khotkeys-5.7.1.tar.xz"; - sha256 = "0djnfax9ba1zm3lkxm2hfa4ai399g1p1n0zfpchjfif8639pf6fk"; - name = "khotkeys-5.7.1.tar.xz"; + url = "${mirror}/stable/plasma/5.7.2/khotkeys-5.7.2.tar.xz"; + sha256 = "02v0q8j65fbc39krc2gcs42yyx3g056w156zg6d59j6srwci5ksm"; + name = "khotkeys-5.7.2.tar.xz"; }; }; kinfocenter = { - version = "5.7.1"; + version = "5.7.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.1/kinfocenter-5.7.1.tar.xz"; - sha256 = "0ynm1lb5f2ggc470k805acxrgxbjw00b780psg60m64bh12jn5ws"; - name = "kinfocenter-5.7.1.tar.xz"; + url = "${mirror}/stable/plasma/5.7.2/kinfocenter-5.7.2.tar.xz"; + sha256 = "1xpyi05y9qxv51j8gazk0qlhy2yscz8lgzgh3lw7lp21jv1frxg4"; + name = "kinfocenter-5.7.2.tar.xz"; }; }; kmenuedit = { - version = "5.7.1"; + version = "5.7.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.1/kmenuedit-5.7.1.tar.xz"; - sha256 = "19188hwidv6vak1qas60jzc7bd6fx1slaqkiwljyx8r6w7l1lx4h"; - name = "kmenuedit-5.7.1.tar.xz"; + url = "${mirror}/stable/plasma/5.7.2/kmenuedit-5.7.2.tar.xz"; + sha256 = "0bavsxh3lsnk5h70l81317vqgmms5r0lr7ph2vdlcfrb708xp0xp"; + name = "kmenuedit-5.7.2.tar.xz"; }; }; kscreen = { - version = "5.7.1"; + version = "5.7.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.1/kscreen-5.7.1.tar.xz"; - sha256 = "0f2zniavlh18ipkn3k6kpzd5nqhlj0pg723dqb3p5zdmxfwddqal"; - name = "kscreen-5.7.1.tar.xz"; + url = "${mirror}/stable/plasma/5.7.2/kscreen-5.7.2.tar.xz"; + sha256 = "1d23i6mw1di01386icdq5p64a3gmq6n6cg73v6wfw3vvgl0lls6w"; + name = "kscreen-5.7.2.tar.xz"; }; }; kscreenlocker = { - version = "5.7.1"; + version = "5.7.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.1/kscreenlocker-5.7.1.tar.xz"; - sha256 = "0dpx1cwvjzsnf9aryavqajlw10iqfmg3vjry50wkg03nb8z1rd49"; - name = "kscreenlocker-5.7.1.tar.xz"; + url = "${mirror}/stable/plasma/5.7.2/kscreenlocker-5.7.2.tar.xz"; + sha256 = "1c4afc7s5b2q5yc53xpp8q2k0w8lxmvg8rrqb6qnrqz1xrxil3ld"; + name = "kscreenlocker-5.7.2.tar.xz"; }; }; ksshaskpass = { - version = "5.7.1"; + version = "5.7.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.1/ksshaskpass-5.7.1.tar.xz"; - sha256 = "0blmwnm512lld8r3gj2fi7z0cj2nhcngn6xw3568p54ijb5da6c2"; - name = "ksshaskpass-5.7.1.tar.xz"; + url = "${mirror}/stable/plasma/5.7.2/ksshaskpass-5.7.2.tar.xz"; + sha256 = "07annxlr46h7x6dq5vfs6rzgm11x8bv1n1icgji2wabdj3zsy2pa"; + name = "ksshaskpass-5.7.2.tar.xz"; }; }; ksysguard = { - version = "5.7.1"; + version = "5.7.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.1/ksysguard-5.7.1.tar.xz"; - sha256 = "14b9wspfls4q3zl1rxpr6h5kxx9q6dv10x8lbzmxml1fdkid3i5j"; - name = "ksysguard-5.7.1.tar.xz"; + url = "${mirror}/stable/plasma/5.7.2/ksysguard-5.7.2.tar.xz"; + sha256 = "08y9vsdzsq18hgfrk52hk3hmv23x6xv4j73dji97g38z26slvbp6"; + name = "ksysguard-5.7.2.tar.xz"; }; }; kwallet-pam = { - version = "5.7.1"; + version = "5.7.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.1/kwallet-pam-5.7.1.tar.xz"; - sha256 = "04jxi4a75km9c5gy30aaikqzsd2z2algvh7w6phfqaqq66h5qx8d"; - name = "kwallet-pam-5.7.1.tar.xz"; + url = "${mirror}/stable/plasma/5.7.2/kwallet-pam-5.7.2.tar.xz"; + sha256 = "1701abpwp90vsi5v4n675848gnp17psiagd5hv9yypc2a7g82sf2"; + name = "kwallet-pam-5.7.2.tar.xz"; }; }; kwayland-integration = { - version = "5.7.1"; + version = "5.7.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.1/kwayland-integration-5.7.1.tar.xz"; - sha256 = "0ix30304ggh12xgqnnb9zrniqhklg3a8rkjnp3fad7sr3wa9346s"; - name = "kwayland-integration-5.7.1.tar.xz"; + url = "${mirror}/stable/plasma/5.7.2/kwayland-integration-5.7.2.tar.xz"; + sha256 = "0jd9cv8ivn71h90xjr53nanx02z95ylsn5pkwx03wjvx4bdwwvpv"; + name = "kwayland-integration-5.7.2.tar.xz"; }; }; kwin = { - version = "5.7.1"; + version = "5.7.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.1/kwin-5.7.1.tar.xz"; - sha256 = "0mkvfbsv1ivzs02fphm28km55cn258w6sram9zbqldklk2js7is0"; - name = "kwin-5.7.1.tar.xz"; + url = "${mirror}/stable/plasma/5.7.2/kwin-5.7.2.tar.xz"; + sha256 = "00f9chy1qg24r6rqpqfhc4jjx6j1nw18gxzpd1m16shkqf5il15h"; + name = "kwin-5.7.2.tar.xz"; }; }; kwrited = { - version = "5.7.1"; + version = "5.7.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.1/kwrited-5.7.1.tar.xz"; - sha256 = "0mmb4hmwpcmxc03nzqhybwxk5nlyqamdswmr0vf8jcbvcqdmp473"; - name = "kwrited-5.7.1.tar.xz"; + url = "${mirror}/stable/plasma/5.7.2/kwrited-5.7.2.tar.xz"; + sha256 = "06j18395pkyiph9mzvmfjjdm623ggijgkalggsz4a7kllk1v964q"; + name = "kwrited-5.7.2.tar.xz"; }; }; libkscreen = { - version = "5.7.1"; + version = "5.7.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.1/libkscreen-5.7.1.tar.xz"; - sha256 = "1my8k7r7i2qh59g46l79xdyci1km3ykxms1314vwzqf7fyadwjnp"; - name = "libkscreen-5.7.1.tar.xz"; + url = "${mirror}/stable/plasma/5.7.2/libkscreen-5.7.2.tar.xz"; + sha256 = "0ympads0iylpsv0idmbgwc8gzc3xskqcgv1bn4mbpfrp360ibmia"; + name = "libkscreen-5.7.2.tar.xz"; }; }; libksysguard = { - version = "5.7.1"; + version = "5.7.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.1/libksysguard-5.7.1.tar.xz"; - sha256 = "0249cxgfy6yb9dcc9z2ckxwy7khkbzk0922479v900avaf87l4hj"; - name = "libksysguard-5.7.1.tar.xz"; + url = "${mirror}/stable/plasma/5.7.2/libksysguard-5.7.2.tar.xz"; + sha256 = "0qk14ca9hfbm4ba840yjrar1kqh3dsl2hywqf45lrv42r47k19ak"; + name = "libksysguard-5.7.2.tar.xz"; }; }; milou = { - version = "5.7.1"; + version = "5.7.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.1/milou-5.7.1.tar.xz"; - sha256 = "0fcrf8q0sxsgjbi9j2h9qcl4g40mvia1zkb98crzir5qb1z6ji1f"; - name = "milou-5.7.1.tar.xz"; + url = "${mirror}/stable/plasma/5.7.2/milou-5.7.2.tar.xz"; + sha256 = "13w9fn1icxaxslk04a3gb41yb6hw705xj0xkmv5wy198m8f9m84a"; + name = "milou-5.7.2.tar.xz"; }; }; oxygen = { - version = "5.7.1"; + version = "5.7.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.1/oxygen-5.7.1.tar.xz"; - sha256 = "1pjygznb3fjyyvm84dxxj6smm6hpi5mr0c5077rc1xm2p20g7xn0"; - name = "oxygen-5.7.1.tar.xz"; + url = "${mirror}/stable/plasma/5.7.2/oxygen-5.7.2.tar.xz"; + sha256 = "0156v7b9capc1j5kv099fy00dzcqiygvmvs9nsy6m3ly7v9av428"; + name = "oxygen-5.7.2.tar.xz"; }; }; plasma-desktop = { - version = "5.7.1"; + version = "5.7.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.1/plasma-desktop-5.7.1.tar.xz"; - sha256 = "1civd76q2lkas8x5pzm57dfjyplmgb91w34avn75lcdkl2p0zq44"; - name = "plasma-desktop-5.7.1.tar.xz"; + url = "${mirror}/stable/plasma/5.7.2/plasma-desktop-5.7.2.tar.xz"; + sha256 = "0kkw4h1vn32qdpzd16334s2m38wcckc06bx1bs99jj6hpmgh6597"; + name = "plasma-desktop-5.7.2.tar.xz"; }; }; plasma-integration = { - version = "5.7.1"; + version = "5.7.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.1/plasma-integration-5.7.1.tar.xz"; - sha256 = "12cjays5y3zr4za7j49p8yrzk6fxmsgvw4n8i8aida390lbnw5c6"; - name = "plasma-integration-5.7.1.tar.xz"; + url = "${mirror}/stable/plasma/5.7.2/plasma-integration-5.7.2.tar.xz"; + sha256 = "1j8a0c0dxdl7kyj6hm1r5lq7ykg9xhn51s90gyhr6rqs0hla7n6g"; + name = "plasma-integration-5.7.2.tar.xz"; }; }; plasma-mediacenter = { - version = "5.7.1"; + version = "5.7.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.1/plasma-mediacenter-5.7.1.tar.xz"; - sha256 = "135c7vgps9nsna4x5b28p8p2lir7wx2ad6p5m4sg7irf2wr6mivd"; - name = "plasma-mediacenter-5.7.1.tar.xz"; + url = "${mirror}/stable/plasma/5.7.2/plasma-mediacenter-5.7.2.tar.xz"; + sha256 = "1vgb7mlqqlh338p0mqfc613qcdz1c3kwgg9m7yb5fk8kzh9v1fwn"; + name = "plasma-mediacenter-5.7.2.tar.xz"; }; }; plasma-nm = { - version = "5.7.1"; + version = "5.7.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.1/plasma-nm-5.7.1.tar.xz"; - sha256 = "0siq0na8cqqp0lqp963miwimsr7w9papj6cpf9k0frw40arqk26h"; - name = "plasma-nm-5.7.1.tar.xz"; + url = "${mirror}/stable/plasma/5.7.2/plasma-nm-5.7.2.tar.xz"; + sha256 = "1aqf2jzljzc1wwswxq9gn74p0169sqq9yrm7ngz1ns11b0q8m1bm"; + name = "plasma-nm-5.7.2.tar.xz"; }; }; plasma-pa = { - version = "5.7.1"; + version = "5.7.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.1/plasma-pa-5.7.1.tar.xz"; - sha256 = "0g4rgsf39imknxbccl77d7j7404gfyv0nh6r0dmli19alhhiczay"; - name = "plasma-pa-5.7.1.tar.xz"; + url = "${mirror}/stable/plasma/5.7.2/plasma-pa-5.7.2.tar.xz"; + sha256 = "0w201rrxjds5i1hc6mn4mpqn6kvpz175r0id9rxqfdzyrqcgknpv"; + name = "plasma-pa-5.7.2.tar.xz"; }; }; plasma-sdk = { - version = "5.7.1"; + version = "5.7.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.1/plasma-sdk-5.7.1.tar.xz"; - sha256 = "1mn54zwq9bcrazv6zh832xyagrd4k1xjdwhdqxqbvq1d139v8shj"; - name = "plasma-sdk-5.7.1.tar.xz"; + url = "${mirror}/stable/plasma/5.7.2/plasma-sdk-5.7.2.tar.xz"; + sha256 = "0zsbrlmv5kgaa53a906ky071vj38i58kz0wqrr2dy2b47pnx77pl"; + name = "plasma-sdk-5.7.2.tar.xz"; }; }; plasma-workspace = { - version = "5.7.1"; + version = "5.7.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.1/plasma-workspace-5.7.1.tar.xz"; - sha256 = "0x4ghm385kkj2ax91vy10p4f481c6ikpk0azmhnk2d685r7x03yn"; - name = "plasma-workspace-5.7.1.tar.xz"; + url = "${mirror}/stable/plasma/5.7.2/plasma-workspace-5.7.2.tar.xz"; + sha256 = "1k03g6scbgrsrk1dmfaw6s5sahlck81rka7kpzx60rdas6vfw60y"; + name = "plasma-workspace-5.7.2.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.7.1"; + version = "5.7.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.1/plasma-workspace-wallpapers-5.7.1.tar.xz"; - sha256 = "0nl3bjb57djzgvx81knrjkbdix9y3j5ggxpd1a6lj80nixicg8h7"; - name = "plasma-workspace-wallpapers-5.7.1.tar.xz"; + url = "${mirror}/stable/plasma/5.7.2/plasma-workspace-wallpapers-5.7.2.tar.xz"; + sha256 = "1wzhrix2nafzlszanh05fbcs746c391wp27i24fvh3rhpg5j57zx"; + name = "plasma-workspace-wallpapers-5.7.2.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.7.1"; + version = "1-5.7.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.1/polkit-kde-agent-1-5.7.1.tar.xz"; - sha256 = "1pcmdplxq0fsa3bdxyl73vpndvhlmsmjbqfc35aa1ds2wkj7ql2q"; - name = "polkit-kde-agent-1-5.7.1.tar.xz"; + url = "${mirror}/stable/plasma/5.7.2/polkit-kde-agent-1-5.7.2.tar.xz"; + sha256 = "0kx021xjgsp1gpv2s9kigxf1srabkly2l61hf5wpj0hml79dwrc5"; + name = "polkit-kde-agent-1-5.7.2.tar.xz"; }; }; powerdevil = { - version = "5.7.1"; + version = "5.7.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.1/powerdevil-5.7.1.tar.xz"; - sha256 = "0vdrpfgdw2c2gp6cwmrwyrwgfgxfslypa5ls79cf9wqgkrlh3phy"; - name = "powerdevil-5.7.1.tar.xz"; + url = "${mirror}/stable/plasma/5.7.2/powerdevil-5.7.2.tar.xz"; + sha256 = "132k18dqm487f8v2irxlxhs1ljvcyyig9lkb36isajsw7k6949vb"; + name = "powerdevil-5.7.2.tar.xz"; }; }; sddm-kcm = { - version = "5.7.1"; + version = "5.7.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.1/sddm-kcm-5.7.1.tar.xz"; - sha256 = "0bnfy0ndg5040za73sj41ajskwx7bvfa4x92wrfzv27gda3c7fdg"; - name = "sddm-kcm-5.7.1.tar.xz"; + url = "${mirror}/stable/plasma/5.7.2/sddm-kcm-5.7.2.tar.xz"; + sha256 = "19bxbpz80pr66gd9mycwfcw8sagkpzbffm98bzikpdjcll6a6ysh"; + name = "sddm-kcm-5.7.2.tar.xz"; }; }; systemsettings = { - version = "5.7.1"; + version = "5.7.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.1/systemsettings-5.7.1.tar.xz"; - sha256 = "0arcvhqvcsm59l3fm6brqqcv1084qm8wawj9dj6w5wb194ys41hw"; - name = "systemsettings-5.7.1.tar.xz"; + url = "${mirror}/stable/plasma/5.7.2/systemsettings-5.7.2.tar.xz"; + sha256 = "0f2q0mfhmn0nf4mx76hp3lxciwiivsqq3ayv15s1hzxpi24vsini"; + name = "systemsettings-5.7.2.tar.xz"; }; }; user-manager = { - version = "5.7.1"; + version = "5.7.2"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.1/user-manager-5.7.1.tar.xz"; - sha256 = "1jzwwzixwbb6f92zi09i3jfs4dqsg3kcjis60w1bh2pkm96gq35y"; - name = "user-manager-5.7.1.tar.xz"; + url = "${mirror}/stable/plasma/5.7.2/user-manager-5.7.2.tar.xz"; + sha256 = "0faf4wnbkcx6wlg92cd8mskp1xhqm0crj886y22ycjiaqhbnc43p"; + name = "user-manager-5.7.2.tar.xz"; }; }; } diff --git a/pkgs/desktops/kde-5/plasma/systemsettings.nix b/pkgs/desktops/kde-5/plasma/systemsettings.nix index 47264cf38fd7..407d0e916264 100644 --- a/pkgs/desktops/kde-5/plasma/systemsettings.nix +++ b/pkgs/desktops/kde-5/plasma/systemsettings.nix @@ -1,22 +1,14 @@ -{ plasmaPackage, extra-cmake-modules, kdoctools, kitemviews -, kcmutils, ki18n, kio, kservice, kiconthemes, kwindowsystem -, kxmlgui, kdbusaddons, kconfig, khtml, makeQtWrapper +{ + plasmaPackage, ecm, kdoctools, makeQtWrapper, + kcmutils, kconfig, kdbusaddons, khtml, ki18n, kiconthemes, kio, kitemviews, + kservice, kwindowsystem, kxmlgui, qtquickcontrols }: plasmaPackage { name = "systemsettings"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - makeQtWrapper - ]; - buildInputs = [ - ]; + nativeBuildInputs = [ ecm kdoctools makeQtWrapper ]; propagatedBuildInputs = [ - khtml ki18n kio kwindowsystem kitemviews kcmutils kservice kiconthemes - kxmlgui kdbusaddons kconfig + kcmutils kconfig kdbusaddons khtml ki18n kiconthemes kio kitemviews kservice + kwindowsystem kxmlgui qtquickcontrols ]; - postInstall = '' - wrapQtProgram "$out/bin/systemsettings5" - ''; } diff --git a/pkgs/development/arduino/arduino-core/default.nix b/pkgs/development/arduino/arduino-core/default.nix index 652a52600b2a..f1f598c1359c 100644 --- a/pkgs/development/arduino/arduino-core/default.nix +++ b/pkgs/development/arduino/arduino-core/default.nix @@ -6,7 +6,7 @@ assert withGui -> gtk2 != null; let - externalDownloads = import ./downloads.nix {inherit fetchurl;}; + externalDownloads = import ./downloads.nix {inherit fetchurl; inherit (lib) optionalAttrs; inherit (stdenv) system;}; # Some .so-files are later copied from .jar-s to $HOME, so patch them beforehand patchelfInJars = lib.optional (stdenv.system == "x86_64-linux") {jar = "share/arduino/lib/jssc-2.8.0.jar"; file = "libs/linux/libjSSC-2.8_x86_64.so";} diff --git a/pkgs/development/arduino/arduino-core/downloads.nix b/pkgs/development/arduino/arduino-core/downloads.nix index bb36ce750b45..5057d5ac6b5b 100644 --- a/pkgs/development/arduino/arduino-core/downloads.nix +++ b/pkgs/development/arduino/arduino-core/downloads.nix @@ -1,4 +1,4 @@ -{fetchurl}: +{fetchurl, optionalAttrs, system}: { # Following 3 files are snapshots of files that were downloaded from http://download.arduino.cc/ @@ -77,6 +77,8 @@ url = "http://downloads.arduino.cc/liblistSerials/liblistSerials-1.1.0.zip"; sha256 = "12n3y9y3gfi7i3x6llbwvi59jram02v8yyilv2kd38dm7wrqpw16"; }; +} +// optionalAttrs (system == "x86_64-linux") { "build/arduino-builder-linux64-1.3.18.tar.bz2" = fetchurl { url = "http://downloads.arduino.cc/tools/arduino-builder-linux64-1.3.18.tar.bz2"; sha256 = "0xbzcmvfa1h22dlvym8v4s68w4r1vdq8pj086sk1iwlkfiq0y4zq"; @@ -90,3 +92,45 @@ sha256 = "0xm4hfr4binny9f5affnmyrrq3lhrxr66s6ymplgfq9l72kwq9nq"; }; } +// optionalAttrs (system == "i686-linux") { + "build/arduino-builder-linux32-1.3.18.tar.bz2" = fetchurl { + url = "http://downloads.arduino.cc/tools/arduino-builder-linux32-1.3.18.tar.bz2"; + sha256 = "0b6ls31gaagni929v4isr8ivyviid37721ffhgw6mnb8vshcws2d"; + }; + "build/linux/avr-gcc-4.8.1-arduino5-i686-pc-linux-gnu.tar.bz2" = fetchurl { + url = "http://downloads.arduino.cc/tools/avr-gcc-4.8.1-arduino5-i686-pc-linux-gnu.tar.bz2"; + sha256 = "07ql6apml1w5gy3ygd1wmj12yr8vg6p3pr8b1gd92wdk97svfj3n"; + }; + "build/linux/avrdude-6.0.1-arduino5-i686-pc-linux-gnu.tar.bz2" = fetchurl { + url = "http://downloads.arduino.cc/tools/avrdude-6.0.1-arduino5-i686-pc-linux-gnu.tar.bz2"; + sha256 = "1vmzqvkg8z2xp3j5qypzyg26hgymy6vshs4vpax6mr5w4xlxccsr"; + }; +} +// optionalAttrs (system == "x86_64-darwin") { + "build/arduino-builder-macosx-1.3.18.tar.bz2" = fetchurl { + url = "http://downloads.arduino.cc/tools/arduino-builder-macosx-1.3.18.tar.bz2"; + sha256 = "01m21r2blh3rwzmjgjn65hivlbj95ddqkjq5xm1yb4b5h3i03mfj"; + }; + "build/linux/avr-gcc-4.8.1-arduino5-i386-apple-darwin11.tar.bz2" = fetchurl { + url = "http://downloads.arduino.cc/tools/avr-gcc-4.8.1-arduino5-i386-apple-darwin11.tar.bz2"; + sha256 = "00d9i1vg1zngcd3f52c6d7j2iffb0qs97a1pnag0czbk1pq3w6qi"; + }; + "build/linux/avrdude-6.0.1-arduino5-i386-apple-darwin11.tar.bz2" = fetchurl { + url = "http://downloads.arduino.cc/tools/avrdude-6.0.1-arduino5-i386-apple-darwin11.tar.bz2"; + sha256 = "1rf3dwb4534qzn0gdpbh3155knx07hbbakvv67456s2q18xqvbs1"; + }; +} +// optionalAttrs (system == "armv6l-linux") { + "build/arduino-builder-arm-1.3.18.tar.bz2" = fetchurl { + url = "http://downloads.arduino.cc/tools/arduino-builder-arm-1.3.18.tar.bz2"; + sha256 = "1v4vrmv24cajl7hxmyz5nh2y007kmwrcgl6180dlfwpc9526s4p1"; + }; + "build/linux/avr-gcc-4.8.1-arduino5-armhf-pc-linux-gnu.tar.bz2" = fetchurl { + url = "http://downloads.arduino.cc/tools/avr-gcc-4.8.1-arduino5-armhf-pc-linux-gnu.tar.bz2"; + sha256 = "0jqmyamvvwiab6ag580h09zkxbpv6i5xn6ganj5b8ld6nwnwvzy8"; + }; + "build/linux/avrdude-6.0.1-arduino5-armhf-pc-linux-gnu.tar.bz2" = fetchurl { + url = "http://downloads.arduino.cc/tools/avrdude-6.0.1-arduino5-armhf-pc-linux-gnu.tar.bz2"; + sha256 = "1d7n0jcc6670n803q57hzw8pvp9bmnca9c9fgw3fq5y1vd0i7si3"; + }; +} diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix index fb8d789f533d..b9356f0aa4b8 100644 --- a/pkgs/development/compilers/ghcjs/default.nix +++ b/pkgs/development/compilers/ghcjs/default.nix @@ -97,6 +97,8 @@ in mkDerivation (rec { --replace "@CC@" "${stdenv.cc}/bin/cc" ''; preBuild = '' + export HOME="$TMP" + local topDir=$out/lib/ghcjs-${version} mkdir -p $topDir @@ -136,6 +138,36 @@ in mkDerivation (rec { isGhcjs = true; inherit nodejs ghcjsBoot; inherit (ghcjsNodePkgs) "socket.io"; + + # This is the list of the Stage 1 packages that are built into a booted ghcjs installation + # It can be generated with the command: + # nix-shell -p haskell.packages.ghcjs.ghc --command "ghcjs-pkg list | sed -n 's/^ \(.*\)-\([0-9.]*\)$/\1_\2/ p' | sed 's/\./_/g' | sed 's/^\([^_]*\)\(.*\)$/ \"\1\"/'" + stage1Packages = [ + "array" + "base" + "binary" + "rts" + "bytestring" + "containers" + "deepseq" + "directory" + "filepath" + "ghc-prim" + "ghcjs-prim" + "integer-gmp" + "old-locale" + "pretty" + "primitive" + "process" + "template-haskell" + "time" + "transformers" + "unix" + ]; + + mkStage2 = import ./stage2.nix { + inherit ghcjsBoot; + }; }; homepage = "https://github.com/ghcjs/ghcjs"; diff --git a/pkgs/development/haskell-modules/ghcjs/gen-stage2.rb b/pkgs/development/compilers/ghcjs/gen-stage2.rb index c801dbe3e4b7..709e635db55c 100644..100755 --- a/pkgs/development/haskell-modules/ghcjs/gen-stage2.rb +++ b/pkgs/development/compilers/ghcjs/gen-stage2.rb @@ -26,10 +26,10 @@ stage2_packages = [ ] nixpkgs = File.expand_path("../../../../..", __FILE__) -boot = `nix-build #{nixpkgs} -A haskell.packages.ghcjs.ghc.ghcjsBoot`.chomp +boot = ARGV[0] || `nix-build #{nixpkgs} -A haskell.packages.ghcjs.ghc.ghcjsBoot`.chomp out = "".dup -out << "{ ghcjsBoot, callPackage }:\n" +out << "{ ghcjsBoot }: { callPackage }:\n" out << "\n" out << "{\n" @@ -37,6 +37,7 @@ stage2_packages.each do |package| name = Pathname.new(package).basename nix = `cabal2nix file://#{boot}/#{package} --jailbreak` nix.sub!(/src =.*?$/, "src = \"${ghcjsBoot}/#{package}\";") + nix.sub!(" doCheck = false;\n", "") nix.sub!("libraryHaskellDepends", "doCheck = false;\n libraryHaskellDepends") # cabal2nix somehow generates the deps for 'text' as if it had selected flag # 'integer-simple' (despite not passing the flag within the generated diff --git a/pkgs/development/haskell-modules/ghcjs/stage2.nix b/pkgs/development/compilers/ghcjs/stage2.nix index aca4c6c7828f..8c68b6f15a67 100644 --- a/pkgs/development/haskell-modules/ghcjs/stage2.nix +++ b/pkgs/development/compilers/ghcjs/stage2.nix @@ -1,4 +1,4 @@ -{ ghcjsBoot, callPackage }: +{ ghcjsBoot }: { callPackage }: { async = callPackage diff --git a/pkgs/development/compilers/lessc/default.nix b/pkgs/development/compilers/lessc/default.nix index 3d7947dae7b6..5caef5b3b66f 100644 --- a/pkgs/development/compilers/lessc/default.nix +++ b/pkgs/development/compilers/lessc/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { description = "LESS to CSS compiler"; homepage = http://lesscss.org/; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/development/compilers/openjdk/7.nix b/pkgs/development/compilers/openjdk/7.nix index de803a5d90c5..5426b0162a72 100644 --- a/pkgs/development/compilers/openjdk/7.nix +++ b/pkgs/development/compilers/openjdk/7.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, unzip, zip, procps, coreutils, alsaLib, ant, freetype -, which, bootjdk, nettools, xorg, file +, which, bootjdk, nettools, xorg, file, cups , fontconfig, cpio, cacert, perl, setJavaClassPath , minimal ? false }: @@ -24,11 +24,6 @@ let # On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well. paxflags = if stdenv.isi686 then "msp" else "m"; - cupsSrc = fetchurl { - url = http://ftp.easysw.com/pub/cups/1.5.4/cups-1.5.4-source.tar.bz2; - md5 = "de3006e5cf1ee78a9c6145ce62c4e982"; - }; - baseurl = "http://hg.openjdk.java.net/jdk7u/jdk7u"; repover = "jdk7u${update}-b${build}"; jdk7 = fetchurl { @@ -89,7 +84,7 @@ let sed -i "s@/bin/echo -e@${coreutils}/bin/echo -e@" \ {jdk,corba}/make/common/shared/Defs-utils.gmk - tar xf ${cupsSrc} + tar xf ${cups.src} cupsDir=$(echo $(pwd)/cups-*) makeFlagsArray+=(CUPS_HEADERS_PATH=$cupsDir) ''; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 687171713461..d2339c7e297b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -41,7 +41,7 @@ self: super: { src = pkgs.fetchFromGitHub { owner = "joeyh"; repo = "git-annex"; - sha256 = "1b154qskvcldk4kyzcbaw6mijrsn9327wldxwcv16a8zz39gvc5r"; + sha256 = "1b4yw305h7ca28x8s2jnkcc9cwn3rygnjyarib33dk4z066lsg7s"; rev = drv.version; }; })).override { @@ -969,9 +969,4 @@ self: super: { url = "https://github.com/commercialhaskell/stack/commit/7f7f1a5f67f4ecdd1f3009495f1ff101dd38047e.patch"; sha256 = "1yh2g45mkfpwxq0vyzcbc4nbxh6wmb2xpp0k7r5byd8jicgvli29"; }); - - # Glob depends conditionally on semigroups for GHC < 8 - Glob = if pkgs.lib.versionAtLeast self.ghc.version "8.0" - then super.Glob - else addBuildDepend super.Glob self.semigroups; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index ab8a091aabe8..66f7d4763b4a 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -173,7 +173,7 @@ self: super: { hwsl2 = dontCheck super.hwsl2; # https://github.com/haskell/haddock/issues/427 - haddock = dontCheck super.haddock; + haddock = dontCheck self.haddock_2_16_1; # haddock-api >= 2.17 is GHC 8.0 only haddock-api = self.haddock-api_2_16_1; @@ -181,8 +181,6 @@ self: super: { # lens-family-th >= 0.5.0.0 is GHC 8.0 only lens-family-th = self.lens-family-th_0_4_1_0; - # cereal must have `fail` in pre-ghc-8.0.x versions - cereal = addBuildDepend super.cereal self.fail; # The tests in vty-ui do not build, but vty-ui itself builds. vty-ui = enableCabalFlag super.vty-ui "no-tests"; @@ -210,8 +208,14 @@ self: super: { intervals = addBuildDepends super.intervals (with self; [doctest QuickCheck]); Glob_0_7_9 = addBuildDepends super.Glob_0_7_9 (with self; [semigroups]); Glob = addBuildDepends super.Glob (with self; [semigroups]); + # cereal must have `fail` in pre-ghc-8.0.x versions + # also tests require bytestring>=0.10.8.1 + cereal = dontCheck (addBuildDepend super.cereal self.fail); + cereal_0_5_2_0 = dontCheck (addBuildDepend super.cereal_0_5_2_0 self.fail); # Moved out from common as no longer the case for GHC8 ghc-mod = super.ghc-mod.override { cabal-helper = self.cabal-helper_0_6_3_1; }; + generic-deriving = self.generic-deriving_1_10_5; + } diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index d75a7f889aad..1feaa2a977ba 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -8,12 +8,14 @@ in with import ./lib.nix { inherit pkgs; }; self: super: - # The stage 2 packages. Regenerate with ./ghcjs/gen-stage2.rb - let stage2 = - (import ./ghcjs/stage2.nix { - inherit (self) callPackage; - inherit (self.ghc) ghcjsBoot; - }); in stage2 // { + + let # The stage 1 packages + stage1 = pkgs.lib.genAttrs super.ghc.stage1Packages (pkg: null); + # The stage 2 packages. Regenerate with ../compilers/ghcjs/gen-stage2.rb + stage2 = super.ghc.mkStage2 { + inherit (self) callPackage; + }; + in stage1 // stage2 // { old-time = overrideCabal stage2.old-time (drv: { postPatch = '' @@ -32,30 +34,6 @@ self: super: inherit (self.ghc.bootPkgs) jailbreak-cabal alex happy gtk2hs-buildtools rehoo hoogle; - # This is the list of the Stage 1 packages that are built into a booted ghcjs installation - # It can be generated with the command: - # nix-shell -p haskell.packages.ghcjs.ghc --command "ghcjs-pkg list | sed -n 's/^ \(.*\)-\([0-9.]*\)$/\1_\2/ p' | sed 's/\./_/g' | sed 's/-\(.\)/\U\1/' | sed 's/^\([^_]*\)\(.*\)$/\1 = null;/'" - array = null; - base = null; - binary = null; - rts = null; - bytestring = null; - containers = null; - deepseq = null; - directory = null; - filepath = null; - ghc-prim = null; - ghcjs-prim = null; - integer-gmp = null; - old-locale = null; - pretty = null; - primitive = null; - process = null; - template-haskell = null; - time = null; - transformers = null; - unix = null; - # Don't set integer-simple to null! # GHCJS uses integer-gmp, so any package expression that depends on # integer-simple is wrong. diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 9120297c5744..ffa3405d6eb8 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -44,8 +44,11 @@ extra-packages: - control-monad-free < 0.6 # newer versions don't compile with anything but GHC 7.8.x - deepseq == 1.3.0.1 # required to build Cabal with GHC 6.12.3 - descriptive < 0.1 # required for structured-haskell-mode-1.0.8 + - generic-deriving == 1.10.5.* # new versions don't compile with GHC 7.10.x - gloss < 1.9.3 # new versions don't compile with GHC 7.8.x - - haddock-api < 2.16 # required on GHC 7.8.x + - haddock < 2.17 # required on GHC 7.10.x + - haddock-api == 2.15.* # required on GHC 7.8.x + - haddock-api == 2.16.* # required on GHC 7.10.x - haskell-src-exts < 1.16 # required for structured-haskell-mode-1.0.8 - mtl < 2.2 # newer versions require transformers > 0.4.x, which we cannot provide in GHC 7.8.x - mtl-prelude < 2 # required for to build postgrest on mtl 2.1.x platforms diff --git a/pkgs/development/haskell-modules/configuration-lts.nix b/pkgs/development/haskell-modules/configuration-lts.nix index c81c3421f614..f05b20598334 100644 --- a/pkgs/development/haskell-modules/configuration-lts.nix +++ b/pkgs/development/haskell-modules/configuration-lts.nix @@ -27,7 +27,7 @@ self: super: { transformers = null; unix = null; - # lts-6.7 packages + # lts-6.9 packages "3d-graphics-examples" = dontDistribute super."3d-graphics-examples"; "3dmodels" = dontDistribute super."3dmodels"; "4Blocks" = dontDistribute super."4Blocks"; @@ -126,7 +126,6 @@ self: super: { "BitSyntax" = dontDistribute super."BitSyntax"; "Bitly" = dontDistribute super."Bitly"; "Blobs" = dontDistribute super."Blobs"; - "BlogLiterately" = doDistribute super."BlogLiterately_0_8_3_1"; "BluePrintCSS" = dontDistribute super."BluePrintCSS"; "Blueprint" = dontDistribute super."Blueprint"; "Bookshelf" = dontDistribute super."Bookshelf"; @@ -358,7 +357,6 @@ self: super: { "GiST" = dontDistribute super."GiST"; "Gifcurry" = dontDistribute super."Gifcurry"; "GiveYouAHead" = dontDistribute super."GiveYouAHead"; - "Glob" = doDistribute super."Glob_0_7_9"; "GlomeTrace" = dontDistribute super."GlomeTrace"; "GlomeVec" = dontDistribute super."GlomeVec"; "GlomeView" = dontDistribute super."GlomeView"; @@ -700,7 +698,6 @@ self: super: { "OpenCLRaw" = dontDistribute super."OpenCLRaw"; "OpenCLWrappers" = dontDistribute super."OpenCLWrappers"; "OpenGLCheck" = dontDistribute super."OpenGLCheck"; - "OpenGLRaw" = doDistribute super."OpenGLRaw_3_2_0_0"; "OpenGLRaw21" = dontDistribute super."OpenGLRaw21"; "OpenSCAD" = dontDistribute super."OpenSCAD"; "OpenVG" = dontDistribute super."OpenVG"; @@ -716,6 +713,7 @@ self: super: { "PCLT" = dontDistribute super."PCLT"; "PCLT-DB" = dontDistribute super."PCLT-DB"; "PDBtools" = dontDistribute super."PDBtools"; + "PPrinter" = dontDistribute super."PPrinter"; "PTQ" = dontDistribute super."PTQ"; "PUH-Project" = dontDistribute super."PUH-Project"; "PageIO" = dontDistribute super."PageIO"; @@ -872,7 +870,6 @@ self: super: { "Stomp" = dontDistribute super."Stomp"; "Strafunski-ATermLib" = dontDistribute super."Strafunski-ATermLib"; "Strafunski-Sdf2Haskell" = dontDistribute super."Strafunski-Sdf2Haskell"; - "Strafunski-StrategyLib" = doDistribute super."Strafunski-StrategyLib_5_0_0_8"; "StrappedTemplates" = dontDistribute super."StrappedTemplates"; "StrategyLib" = dontDistribute super."StrategyLib"; "Stream" = dontDistribute super."Stream"; @@ -1044,6 +1041,7 @@ self: super: { "acme-colosson" = dontDistribute super."acme-colosson"; "acme-comonad" = dontDistribute super."acme-comonad"; "acme-cutegirl" = dontDistribute super."acme-cutegirl"; + "acme-default" = dontDistribute super."acme-default"; "acme-dont" = dontDistribute super."acme-dont"; "acme-flipping-tables" = dontDistribute super."acme-flipping-tables"; "acme-grawlix" = dontDistribute super."acme-grawlix"; @@ -1095,11 +1093,13 @@ self: super: { "aeson-diff" = dontDistribute super."aeson-diff"; "aeson-filthy" = dontDistribute super."aeson-filthy"; "aeson-flatten" = dontDistribute super."aeson-flatten"; + "aeson-injector" = dontDistribute super."aeson-injector"; "aeson-iproute" = dontDistribute super."aeson-iproute"; "aeson-json-ast" = dontDistribute super."aeson-json-ast"; "aeson-native" = dontDistribute super."aeson-native"; "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; "aeson-prefix" = dontDistribute super."aeson-prefix"; + "aeson-pretty" = doDistribute super."aeson-pretty_0_7_2"; "aeson-schema" = dontDistribute super."aeson-schema"; "aeson-serialize" = dontDistribute super."aeson-serialize"; "aeson-smart" = dontDistribute super."aeson-smart"; @@ -1216,6 +1216,7 @@ self: super: { "applicative-parsec" = dontDistribute super."applicative-parsec"; "applicative-quoters" = dontDistribute super."applicative-quoters"; "applicative-splice" = dontDistribute super."applicative-splice"; + "apply-refact" = doDistribute super."apply-refact_0_2_0_0"; "apportionment" = dontDistribute super."apportionment"; "approx-rand-test" = dontDistribute super."approx-rand-test"; "approximate-equality" = dontDistribute super."approximate-equality"; @@ -1254,6 +1255,7 @@ self: super: { "arxiv" = dontDistribute super."arxiv"; "ascetic" = dontDistribute super."ascetic"; "ascii" = dontDistribute super."ascii"; + "ascii-cows" = dontDistribute super."ascii-cows"; "ascii-flatten" = dontDistribute super."ascii-flatten"; "ascii-table" = dontDistribute super."ascii-table"; "ascii-vector-avc" = dontDistribute super."ascii-vector-avc"; @@ -1271,6 +1273,7 @@ self: super: { "astrds" = dontDistribute super."astrds"; "astview" = dontDistribute super."astview"; "astview-utils" = dontDistribute super."astview-utils"; + "async-ajax" = dontDistribute super."async-ajax"; "async-extras" = dontDistribute super."async-extras"; "async-manager" = dontDistribute super."async-manager"; "async-pool" = dontDistribute super."async-pool"; @@ -1441,7 +1444,6 @@ self: super: { "binary-generic" = dontDistribute super."binary-generic"; "binary-indexed-tree" = dontDistribute super."binary-indexed-tree"; "binary-literal-qq" = dontDistribute super."binary-literal-qq"; - "binary-orphans" = doDistribute super."binary-orphans_0_1_5_0"; "binary-protocol" = dontDistribute super."binary-protocol"; "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; "binary-state" = dontDistribute super."binary-state"; @@ -1455,7 +1457,6 @@ self: super: { "binding-wx" = dontDistribute super."binding-wx"; "bindings" = dontDistribute super."bindings"; "bindings-EsounD" = dontDistribute super."bindings-EsounD"; - "bindings-GLFW" = doDistribute super."bindings-GLFW_3_1_2_0"; "bindings-K8055" = dontDistribute super."bindings-K8055"; "bindings-apr" = dontDistribute super."bindings-apr"; "bindings-apr-util" = dontDistribute super."bindings-apr-util"; @@ -1543,6 +1544,7 @@ self: super: { "bla" = dontDistribute super."bla"; "black-jewel" = dontDistribute super."black-jewel"; "blacktip" = dontDistribute super."blacktip"; + "blake2" = doDistribute super."blake2_0_1_0"; "blakesum" = dontDistribute super."blakesum"; "blakesum-demo" = dontDistribute super."blakesum-demo"; "blas" = dontDistribute super."blas"; @@ -1551,10 +1553,12 @@ self: super: { "blaze" = dontDistribute super."blaze"; "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit"; "blaze-from-html" = dontDistribute super."blaze-from-html"; + "blaze-html" = doDistribute super."blaze-html_0_8_1_1"; "blaze-html-contrib" = dontDistribute super."blaze-html-contrib"; "blaze-html-hexpat" = dontDistribute super."blaze-html-hexpat"; "blaze-html-truncate" = dontDistribute super."blaze-html-truncate"; "blaze-json" = dontDistribute super."blaze-json"; + "blaze-markup" = doDistribute super."blaze-markup_0_7_0_3"; "blaze-shields" = dontDistribute super."blaze-shields"; "blaze-textual-native" = dontDistribute super."blaze-textual-native"; "blazeMarker" = dontDistribute super."blazeMarker"; @@ -1609,7 +1613,6 @@ self: super: { "broccoli" = dontDistribute super."broccoli"; "broker-haskell" = dontDistribute super."broker-haskell"; "bsd-sysctl" = dontDistribute super."bsd-sysctl"; - "bson" = doDistribute super."bson_0_3_2_2"; "bson-generic" = dontDistribute super."bson-generic"; "bson-generics" = dontDistribute super."bson-generics"; "bson-mapping" = dontDistribute super."bson-mapping"; @@ -1679,6 +1682,7 @@ self: super: { "cabal-nirvana" = dontDistribute super."cabal-nirvana"; "cabal-progdeps" = dontDistribute super."cabal-progdeps"; "cabal-query" = dontDistribute super."cabal-query"; + "cabal-rpm" = doDistribute super."cabal-rpm_0_9_11"; "cabal-scripts" = dontDistribute super."cabal-scripts"; "cabal-setup" = dontDistribute super."cabal-setup"; "cabal-sign" = dontDistribute super."cabal-sign"; @@ -1728,6 +1732,7 @@ self: super: { "campfire" = dontDistribute super."campfire"; "canonical-filepath" = dontDistribute super."canonical-filepath"; "canteven-config" = dontDistribute super."canteven-config"; + "canteven-http" = dontDistribute super."canteven-http"; "canteven-listen-http" = dontDistribute super."canteven-listen-http"; "canteven-log" = dontDistribute super."canteven-log"; "canteven-template" = dontDistribute super."canteven-template"; @@ -1779,6 +1784,7 @@ self: super: { "ceilometer-common" = dontDistribute super."ceilometer-common"; "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; "cerberus" = dontDistribute super."cerberus"; + "cereal" = doDistribute super."cereal_0_5_2_0"; "cereal-derive" = dontDistribute super."cereal-derive"; "cereal-enumerator" = dontDistribute super."cereal-enumerator"; "cereal-ieee754" = dontDistribute super."cereal-ieee754"; @@ -1814,7 +1820,6 @@ self: super: { "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; "check-pvp" = dontDistribute super."check-pvp"; "checked" = dontDistribute super."checked"; - "checkers" = doDistribute super."checkers_0_4_4"; "chell-hunit" = dontDistribute super."chell-hunit"; "chesshs" = dontDistribute super."chesshs"; "chevalier-common" = dontDistribute super."chevalier-common"; @@ -1853,20 +1858,13 @@ self: super: { "clanki" = dontDistribute super."clanki"; "clarifai" = dontDistribute super."clarifai"; "clash" = dontDistribute super."clash"; - "clash-ghc" = doDistribute super."clash-ghc_0_6_19"; - "clash-lib" = doDistribute super."clash-lib_0_6_17"; - "clash-prelude" = doDistribute super."clash-prelude_0_10_9"; "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; - "clash-systemverilog" = doDistribute super."clash-systemverilog_0_6_6"; - "clash-verilog" = doDistribute super."clash-verilog_0_6_6"; - "clash-vhdl" = doDistribute super."clash-vhdl_0_6_13"; "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; "classy-prelude" = doDistribute super."classy-prelude_0_12_8"; "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_8"; "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_8"; "clay" = doDistribute super."clay_0_10_1"; - "clckwrks" = doDistribute super."clckwrks_0_23_16"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs"; "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot"; @@ -1898,8 +1896,9 @@ self: super: { "clustertools" = dontDistribute super."clustertools"; "clutterhs" = dontDistribute super."clutterhs"; "cmaes" = dontDistribute super."cmaes"; - "cmark" = doDistribute super."cmark_0_5_2_1"; "cmark-highlight" = dontDistribute super."cmark-highlight"; + "cmark-lucid" = dontDistribute super."cmark-lucid"; + "cmark-sections" = dontDistribute super."cmark-sections"; "cmath" = dontDistribute super."cmath"; "cmathml3" = dontDistribute super."cmathml3"; "cmd-item" = dontDistribute super."cmd-item"; @@ -1972,6 +1971,7 @@ self: super: { "complexity" = dontDistribute super."complexity"; "compose-ltr" = dontDistribute super."compose-ltr"; "compose-trans" = dontDistribute super."compose-trans"; + "compound-types" = dontDistribute super."compound-types"; "compression" = dontDistribute super."compression"; "compstrat" = dontDistribute super."compstrat"; "comptrans" = dontDistribute super."comptrans"; @@ -2003,6 +2003,7 @@ self: super: { "conduit-audio-lame" = dontDistribute super."conduit-audio-lame"; "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; + "conduit-find" = dontDistribute super."conduit-find"; "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; @@ -2083,7 +2084,6 @@ self: super: { "count" = dontDistribute super."count"; "countable" = dontDistribute super."countable"; "counter" = dontDistribute super."counter"; - "courier" = doDistribute super."courier_0_1_1_2"; "court" = dontDistribute super."court"; "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; @@ -2219,6 +2219,7 @@ self: super: { "data-carousel" = dontDistribute super."data-carousel"; "data-category" = dontDistribute super."data-category"; "data-cell" = dontDistribute super."data-cell"; + "data-check" = dontDistribute super."data-check"; "data-checked" = dontDistribute super."data-checked"; "data-clist" = dontDistribute super."data-clist"; "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; @@ -2281,6 +2282,7 @@ self: super: { "data-rev" = dontDistribute super."data-rev"; "data-rope" = dontDistribute super."data-rope"; "data-rtuple" = dontDistribute super."data-rtuple"; + "data-serializer" = dontDistribute super."data-serializer"; "data-size" = dontDistribute super."data-size"; "data-spacepart" = dontDistribute super."data-spacepart"; "data-store" = dontDistribute super."data-store"; @@ -2403,12 +2405,12 @@ self: super: { "dgs" = dontDistribute super."dgs"; "dia-base" = dontDistribute super."dia-base"; "dia-functions" = dontDistribute super."dia-functions"; + "diagrams-boolean" = dontDistribute super."diagrams-boolean"; "diagrams-graphviz" = dontDistribute super."diagrams-graphviz"; "diagrams-hsqml" = dontDistribute super."diagrams-hsqml"; "diagrams-pandoc" = dontDistribute super."diagrams-pandoc"; "diagrams-pdf" = dontDistribute super."diagrams-pdf"; "diagrams-pgf" = dontDistribute super."diagrams-pgf"; - "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_6"; "diagrams-qrcode" = dontDistribute super."diagrams-qrcode"; "diagrams-reflex" = dontDistribute super."diagrams-reflex"; "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube"; @@ -2494,6 +2496,7 @@ self: super: { "domain-auth" = dontDistribute super."domain-auth"; "dominion" = dontDistribute super."dominion"; "domplate" = dontDistribute super."domplate"; + "dot" = dontDistribute super."dot"; "dot-linker" = dontDistribute super."dot-linker"; "dot2graphml" = dontDistribute super."dot2graphml"; "dotenv" = doDistribute super."dotenv_0_3_0_1"; @@ -2806,8 +2809,6 @@ self: super: { "ffmpeg-light" = dontDistribute super."ffmpeg-light"; "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials"; "fftwRaw" = dontDistribute super."fftwRaw"; - "fgl" = doDistribute super."fgl_5_5_2_3"; - "fgl-arbitrary" = doDistribute super."fgl-arbitrary_0_2_0_1"; "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions"; "fgl-visualize" = dontDistribute super."fgl-visualize"; "fibon" = dontDistribute super."fibon"; @@ -3052,7 +3053,6 @@ self: super: { "generic-storable" = dontDistribute super."generic-storable"; "generic-tree" = dontDistribute super."generic-tree"; "generic-xml" = dontDistribute super."generic-xml"; - "generics-sop" = doDistribute super."generics-sop_0_2_1_0"; "generics-sop-lens" = dontDistribute super."generics-sop-lens"; "genericserialize" = dontDistribute super."genericserialize"; "genetics" = dontDistribute super."genetics"; @@ -3092,6 +3092,7 @@ self: super: { "ghc-dup" = dontDistribute super."ghc-dup"; "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; "ghc-events-parallel" = dontDistribute super."ghc-events-parallel"; + "ghc-exactprint" = doDistribute super."ghc-exactprint_0_5_1_1"; "ghc-gc-tune" = dontDistribute super."ghc-gc-tune"; "ghc-generic-instances" = dontDistribute super."ghc-generic-instances"; "ghc-make" = dontDistribute super."ghc-make"; @@ -3106,7 +3107,7 @@ self: super: { "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin"; "ghc-syb" = dontDistribute super."ghc-syb"; "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof"; - "ghc-typelits-natnormalise" = doDistribute super."ghc-typelits-natnormalise_0_4_2"; + "ghc-typelits-presburger" = dontDistribute super."ghc-typelits-presburger"; "ghc-vis" = dontDistribute super."ghc-vis"; "ghci-diagrams" = dontDistribute super."ghci-diagrams"; "ghci-haskeline" = dontDistribute super."ghci-haskeline"; @@ -3176,6 +3177,7 @@ self: super: { "gitlib-s3" = dontDistribute super."gitlib-s3"; "gitlib-sample" = dontDistribute super."gitlib-sample"; "gitlib-utils" = dontDistribute super."gitlib-utils"; + "gitson" = doDistribute super."gitson_0_5_1"; "gitter" = dontDistribute super."gitter"; "givegif" = dontDistribute super."givegif"; "gl-capture" = dontDistribute super."gl-capture"; @@ -3188,6 +3190,7 @@ self: super: { "glicko" = dontDistribute super."glicko"; "glider-nlp" = dontDistribute super."glider-nlp"; "glintcollider" = dontDistribute super."glintcollider"; + "glirc" = dontDistribute super."glirc"; "gll" = dontDistribute super."gll"; "global" = dontDistribute super."global"; "global-config" = dontDistribute super."global-config"; @@ -3381,7 +3384,6 @@ self: super: { "graphmod" = dontDistribute super."graphmod"; "graphql" = dontDistribute super."graphql"; "graphtype" = dontDistribute super."graphtype"; - "graphviz" = doDistribute super."graphviz_2999_18_1_0"; "grasp" = dontDistribute super."grasp"; "gray-code" = dontDistribute super."gray-code"; "gray-extended" = dontDistribute super."gray-extended"; @@ -3572,7 +3574,6 @@ self: super: { "happs-tutorial" = dontDistribute super."happs-tutorial"; "happstack" = dontDistribute super."happstack"; "happstack-auth" = dontDistribute super."happstack-auth"; - "happstack-authenticate" = doDistribute super."happstack-authenticate_2_3_4_2"; "happstack-contrib" = dontDistribute super."happstack-contrib"; "happstack-data" = dontDistribute super."happstack-data"; "happstack-dlg" = dontDistribute super."happstack-dlg"; @@ -3742,8 +3743,9 @@ self: super: { "hasloGUI" = dontDistribute super."hasloGUI"; "hasparql-client" = dontDistribute super."hasparql-client"; "haspell" = dontDistribute super."haspell"; - "hasql" = doDistribute super."hasql_0_19_12"; "hasql-backend" = dontDistribute super."hasql-backend"; + "hasql-cursor-query" = dontDistribute super."hasql-cursor-query"; + "hasql-cursor-transaction" = dontDistribute super."hasql-cursor-transaction"; "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; "hasql-pool" = dontDistribute super."hasql-pool"; "hasql-postgres" = dontDistribute super."hasql-postgres"; @@ -3788,6 +3790,7 @@ self: super: { "hcron" = dontDistribute super."hcron"; "hcube" = dontDistribute super."hcube"; "hcwiid" = dontDistribute super."hcwiid"; + "hdaemonize" = doDistribute super."hdaemonize_0_5_0_2"; "hdaemonize-buildfix" = dontDistribute super."hdaemonize-buildfix"; "hdbc-aeson" = dontDistribute super."hdbc-aeson"; "hdbc-postgresql-hstore" = dontDistribute super."hdbc-postgresql-hstore"; @@ -3869,6 +3872,7 @@ self: super: { "hexpat-tagsoup" = dontDistribute super."hexpat-tagsoup"; "hexpr" = dontDistribute super."hexpr"; "hexquote" = dontDistribute super."hexquote"; + "hext" = dontDistribute super."hext"; "heyefi" = dontDistribute super."heyefi"; "hfann" = dontDistribute super."hfann"; "hfd" = dontDistribute super."hfd"; @@ -3913,7 +3917,6 @@ self: super: { "himerge" = dontDistribute super."himerge"; "himg" = dontDistribute super."himg"; "himpy" = dontDistribute super."himpy"; - "hindent" = doDistribute super."hindent_4_6_3"; "hindley-milner" = dontDistribute super."hindley-milner"; "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; "hinduce-classifier" = dontDistribute super."hinduce-classifier"; @@ -4082,6 +4085,7 @@ self: super: { "hpodder" = dontDistribute super."hpodder"; "hpp" = dontDistribute super."hpp"; "hpqtypes" = dontDistribute super."hpqtypes"; + "hpqtypes-extras" = dontDistribute super."hpqtypes-extras"; "hprotoc" = doDistribute super."hprotoc_2_2_0"; "hprotoc-fork" = dontDistribute super."hprotoc-fork"; "hps" = dontDistribute super."hps"; @@ -4224,6 +4228,7 @@ self: super: { "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; "hspec2" = dontDistribute super."hspec2"; + "hspecVariant" = dontDistribute super."hspecVariant"; "hspr-sh" = dontDistribute super."hspr-sh"; "hspread" = dontDistribute super."hspread"; "hspresent" = dontDistribute super."hspresent"; @@ -4298,7 +4303,6 @@ self: super: { "http-kinder" = dontDistribute super."http-kinder"; "http-kit" = dontDistribute super."http-kit"; "http-listen" = dontDistribute super."http-listen"; - "http-media" = doDistribute super."http-media_0_6_3"; "http-monad" = dontDistribute super."http-monad"; "http-proxy" = dontDistribute super."http-proxy"; "http-querystring" = dontDistribute super."http-querystring"; @@ -4320,7 +4324,6 @@ self: super: { "huffman" = dontDistribute super."huffman"; "hugs2yc" = dontDistribute super."hugs2yc"; "hulk" = dontDistribute super."hulk"; - "human-readable-duration" = doDistribute super."human-readable-duration_0_2_0_1"; "hums" = dontDistribute super."hums"; "hunch" = dontDistribute super."hunch"; "hunit-gui" = dontDistribute super."hunit-gui"; @@ -4440,6 +4443,7 @@ self: super: { "imports" = dontDistribute super."imports"; "impossible" = dontDistribute super."impossible"; "improve" = dontDistribute super."improve"; + "impure-containers" = dontDistribute super."impure-containers"; "inc-ref" = dontDistribute super."inc-ref"; "inch" = dontDistribute super."inch"; "incremental-computing" = dontDistribute super."incremental-computing"; @@ -4759,7 +4763,6 @@ self: super: { "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; "lambdacube-engine" = dontDistribute super."lambdacube-engine"; "lambdacube-examples" = dontDistribute super."lambdacube-examples"; - "lambdacube-gl" = doDistribute super."lambdacube-gl_0_5_0_5"; "lambdacube-samples" = dontDistribute super."lambdacube-samples"; "lambdatex" = dontDistribute super."lambdatex"; "lambdatwit" = dontDistribute super."lambdatwit"; @@ -4926,6 +4929,7 @@ self: super: { "linkedhashmap" = dontDistribute super."linkedhashmap"; "linklater" = dontDistribute super."linklater"; "linode" = dontDistribute super."linode"; + "linode-v4" = dontDistribute super."linode-v4"; "linux-blkid" = dontDistribute super."linux-blkid"; "linux-cgroup" = dontDistribute super."linux-cgroup"; "linux-evdev" = dontDistribute super."linux-evdev"; @@ -5051,7 +5055,6 @@ self: super: { "lui" = dontDistribute super."lui"; "luis-client" = dontDistribute super."luis-client"; "luka" = dontDistribute super."luka"; - "luminance" = doDistribute super."luminance_0_11_0_1"; "lushtags" = dontDistribute super."lushtags"; "luthor" = dontDistribute super."luthor"; "lvish" = dontDistribute super."lvish"; @@ -5106,7 +5109,6 @@ self: super: { "manatee-terminal" = dontDistribute super."manatee-terminal"; "manatee-welcome" = dontDistribute super."manatee-welcome"; "mancala" = dontDistribute super."mancala"; - "mandrill" = doDistribute super."mandrill_0_5_2_1"; "mandulia" = dontDistribute super."mandulia"; "mangopay" = dontDistribute super."mangopay"; "manifold-random" = dontDistribute super."manifold-random"; @@ -5193,9 +5195,10 @@ self: super: { "mi" = dontDistribute super."mi"; "microbench" = dontDistribute super."microbench"; "microformats2-types" = dontDistribute super."microformats2-types"; + "microlens" = doDistribute super."microlens_0_4_5_0"; "microlens-each" = dontDistribute super."microlens-each"; - "microlens-mtl" = doDistribute super."microlens-mtl_0_1_8_0"; - "microlens-platform" = doDistribute super."microlens-platform_0_3_2_0"; + "microlens-ghc" = doDistribute super."microlens-ghc_0_4_5_0"; + "microlens-platform" = doDistribute super."microlens-platform_0_3_3_0"; "micrologger" = dontDistribute super."micrologger"; "microtimer" = dontDistribute super."microtimer"; "mida" = dontDistribute super."mida"; @@ -5213,6 +5216,7 @@ self: super: { "mime" = dontDistribute super."mime"; "mime-directory" = dontDistribute super."mime-directory"; "mime-string" = dontDistribute super."mime-string"; + "minecraft-data" = dontDistribute super."minecraft-data"; "mines" = dontDistribute super."mines"; "minesweeper" = dontDistribute super."minesweeper"; "miniball" = dontDistribute super."miniball"; @@ -5271,7 +5275,6 @@ self: super: { "monad-lgbt" = dontDistribute super."monad-lgbt"; "monad-log" = dontDistribute super."monad-log"; "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; - "monad-logger-syslog" = doDistribute super."monad-logger-syslog_0_1_1_1"; "monad-loops-stm" = dontDistribute super."monad-loops-stm"; "monad-lrs" = dontDistribute super."monad-lrs"; "monad-memo" = dontDistribute super."monad-memo"; @@ -5312,11 +5315,11 @@ self: super: { "mongodb-queue" = dontDistribute super."mongodb-queue"; "mongrel2-handler" = dontDistribute super."mongrel2-handler"; "monitor" = dontDistribute super."monitor"; + "monky" = dontDistribute super."monky"; "mono-foldable" = dontDistribute super."mono-foldable"; "mono-traversable" = doDistribute super."mono-traversable_0_10_2"; "mono-traversable-instances" = dontDistribute super."mono-traversable-instances"; "monoid-absorbing" = dontDistribute super."monoid-absorbing"; - "monoid-extras" = doDistribute super."monoid-extras_0_4_1_2"; "monoid-owns" = dontDistribute super."monoid-owns"; "monoid-record" = dontDistribute super."monoid-record"; "monoid-statistics" = dontDistribute super."monoid-statistics"; @@ -5453,7 +5456,6 @@ self: super: { "nc-indicators" = dontDistribute super."nc-indicators"; "ncurses" = dontDistribute super."ncurses"; "neat" = dontDistribute super."neat"; - "neat-interpolation" = doDistribute super."neat-interpolation_0_3_2"; "needle" = dontDistribute super."needle"; "neet" = dontDistribute super."neet"; "nehe-tuts" = dontDistribute super."nehe-tuts"; @@ -5612,7 +5614,6 @@ self: super: { "oden-go-packages" = dontDistribute super."oden-go-packages"; "oeis" = dontDistribute super."oeis"; "off-simple" = dontDistribute super."off-simple"; - "ofx" = doDistribute super."ofx_0_4_0_4"; "ohloh-hs" = dontDistribute super."ohloh-hs"; "oi" = dontDistribute super."oi"; "oidc-client" = dontDistribute super."oidc-client"; @@ -5776,10 +5777,12 @@ self: super: { "partly" = dontDistribute super."partly"; "passage" = dontDistribute super."passage"; "passwords" = dontDistribute super."passwords"; + "pasta" = dontDistribute super."pasta"; "pastis" = dontDistribute super."pastis"; "pasty" = dontDistribute super."pasty"; "patch-combinators" = dontDistribute super."patch-combinators"; "patch-image" = dontDistribute super."patch-image"; + "path" = doDistribute super."path_0_5_8"; "path-io" = doDistribute super."path-io_1_1_0"; "pathfinding" = dontDistribute super."pathfinding"; "pathfindingcore" = dontDistribute super."pathfindingcore"; @@ -5879,7 +5882,7 @@ self: super: { "piet" = dontDistribute super."piet"; "piki" = dontDistribute super."piki"; "pinboard" = dontDistribute super."pinboard"; - "pinch" = doDistribute super."pinch_0_2_0_1"; + "pinch" = doDistribute super."pinch_0_2_0_2"; "pipe-enumerator" = dontDistribute super."pipe-enumerator"; "pipeclip" = dontDistribute super."pipeclip"; "pipes-async" = dontDistribute super."pipes-async"; @@ -5900,7 +5903,6 @@ self: super: { "pipes-interleave" = dontDistribute super."pipes-interleave"; "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv"; "pipes-lzma" = dontDistribute super."pipes-lzma"; - "pipes-network" = doDistribute super."pipes-network_0_6_4"; "pipes-network-tls" = dontDistribute super."pipes-network-tls"; "pipes-p2p" = dontDistribute super."pipes-p2p"; "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples"; @@ -5943,12 +5945,12 @@ self: super: { "pngload-fixed" = dontDistribute super."pngload-fixed"; "pnm" = dontDistribute super."pnm"; "pocket-dns" = dontDistribute super."pocket-dns"; - "point-octree" = dontDistribute super."point-octree"; "pointed" = doDistribute super."pointed_4_2_0_2"; "pointfree" = dontDistribute super."pointfree"; "pointless-haskell" = dontDistribute super."pointless-haskell"; "pointless-lenses" = dontDistribute super."pointless-lenses"; "pointless-rewrite" = dontDistribute super."pointless-rewrite"; + "pokemon-go-protobuf-types" = dontDistribute super."pokemon-go-protobuf-types"; "poker-eval" = dontDistribute super."poker-eval"; "pokitdok" = dontDistribute super."pokitdok"; "polar" = dontDistribute super."polar"; @@ -5996,6 +5998,7 @@ self: super: { "posix-waitpid" = dontDistribute super."posix-waitpid"; "possible" = dontDistribute super."possible"; "postcodes" = dontDistribute super."postcodes"; + "postgres-tmp" = dontDistribute super."postgres-tmp"; "postgresql-config" = dontDistribute super."postgresql-config"; "postgresql-connector" = dontDistribute super."postgresql-connector"; "postgresql-copy-escape" = dontDistribute super."postgresql-copy-escape"; @@ -6008,6 +6011,7 @@ self: super: { "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; "postgresql-typed" = dontDistribute super."postgresql-typed"; "postgrest" = dontDistribute super."postgrest"; + "postgrest-ws" = dontDistribute super."postgrest-ws"; "postie" = dontDistribute super."postie"; "postmark" = dontDistribute super."postmark"; "postmaster" = dontDistribute super."postmaster"; @@ -6115,6 +6119,7 @@ self: super: { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psqueues" = doDistribute super."psqueues_0_2_2_1"; "pub" = dontDistribute super."pub"; "publicsuffix" = doDistribute super."publicsuffix_0_20160522"; "publicsuffixlist" = dontDistribute super."publicsuffixlist"; @@ -6181,7 +6186,6 @@ self: super: { "quick-schema" = dontDistribute super."quick-schema"; "quickbooks" = dontDistribute super."quickbooks"; "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; - "quickcheck-io" = doDistribute super."quickcheck-io_0_1_2"; "quickcheck-poly" = dontDistribute super."quickcheck-poly"; "quickcheck-properties" = dontDistribute super."quickcheck-properties"; "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; @@ -6221,9 +6225,7 @@ self: super: { "radix" = dontDistribute super."radix"; "rados-haskell" = dontDistribute super."rados-haskell"; "rail-compiler-editor" = dontDistribute super."rail-compiler-editor"; - "rainbow" = doDistribute super."rainbow_0_28_0_2"; "rainbow-tests" = dontDistribute super."rainbow-tests"; - "rainbox" = doDistribute super."rainbox_0_18_0_8"; "rake" = dontDistribute super."rake"; "rakhana" = dontDistribute super."rakhana"; "ralist" = dontDistribute super."ralist"; @@ -6238,6 +6240,7 @@ self: super: { "random-extras" = dontDistribute super."random-extras"; "random-hypergeometric" = dontDistribute super."random-hypergeometric"; "random-stream" = dontDistribute super."random-stream"; + "random-strings" = dontDistribute super."random-strings"; "random-variates" = dontDistribute super."random-variates"; "randomgen" = dontDistribute super."randomgen"; "randproc" = dontDistribute super."randproc"; @@ -6368,7 +6371,6 @@ self: super: { "relacion" = dontDistribute super."relacion"; "relation" = dontDistribute super."relation"; "relational-postgresql8" = dontDistribute super."relational-postgresql8"; - "relational-query" = doDistribute super."relational-query_0_8_2_3"; "relational-record-examples" = dontDistribute super."relational-record-examples"; "relative-date" = dontDistribute super."relative-date"; "relit" = dontDistribute super."relit"; @@ -6422,11 +6424,9 @@ self: super: { "restricted-workers" = dontDistribute super."restricted-workers"; "restyle" = dontDistribute super."restyle"; "resumable-exceptions" = dontDistribute super."resumable-exceptions"; - "rethinkdb" = doDistribute super."rethinkdb_2_2_0_5"; "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_22"; "rethinkdb-model" = dontDistribute super."rethinkdb-model"; "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; - "retry" = doDistribute super."retry_0_7_4"; "retryer" = dontDistribute super."retryer"; "revdectime" = dontDistribute super."revdectime"; "reverse-apply" = dontDistribute super."reverse-apply"; @@ -6439,6 +6439,8 @@ self: super: { "rezoom" = dontDistribute super."rezoom"; "rfc3339" = dontDistribute super."rfc3339"; "rhythm-game-tutorial" = dontDistribute super."rhythm-game-tutorial"; + "riak" = doDistribute super."riak_1_0_1_1"; + "riak-protobuf" = doDistribute super."riak-protobuf_0_21_0_0"; "richreports" = dontDistribute super."richreports"; "riemann" = dontDistribute super."riemann"; "riff" = dontDistribute super."riff"; @@ -6450,6 +6452,8 @@ self: super: { "rison" = dontDistribute super."rison"; "rivers" = dontDistribute super."rivers"; "rivet" = dontDistribute super."rivet"; + "rivet-adaptor-postgresql" = dontDistribute super."rivet-adaptor-postgresql"; + "rivet-autoimporter" = dontDistribute super."rivet-autoimporter"; "rivet-core" = dontDistribute super."rivet-core"; "rivet-migration" = dontDistribute super."rivet-migration"; "rivet-simple-deploy" = dontDistribute super."rivet-simple-deploy"; @@ -6582,7 +6586,6 @@ self: super: { "sci-ratio" = dontDistribute super."sci-ratio"; "science-constants" = dontDistribute super."science-constants"; "science-constants-dimensional" = dontDistribute super."science-constants-dimensional"; - "scientific" = doDistribute super."scientific_0_3_4_8"; "scion" = dontDistribute super."scion"; "scion-browser" = dontDistribute super."scion-browser"; "scons2dot" = dontDistribute super."scons2dot"; @@ -6609,7 +6612,6 @@ self: super: { "scyther-proof" = dontDistribute super."scyther-proof"; "sde-solver" = dontDistribute super."sde-solver"; "sdf2p1-parser" = dontDistribute super."sdf2p1-parser"; - "sdl2" = doDistribute super."sdl2_2_1_1"; "sdl2-cairo" = dontDistribute super."sdl2-cairo"; "sdl2-cairo-image" = dontDistribute super."sdl2-cairo-image"; "sdl2-compositor" = dontDistribute super."sdl2-compositor"; @@ -6719,6 +6721,7 @@ self: super: { "shake-pack" = dontDistribute super."shake-pack"; "shake-persist" = dontDistribute super."shake-persist"; "shaker" = dontDistribute super."shaker"; + "shakespeare" = doDistribute super."shakespeare_2_0_9"; "shakespeare-babel" = dontDistribute super."shakespeare-babel"; "shakespeare-css" = dontDistribute super."shakespeare-css"; "shakespeare-i18n" = dontDistribute super."shakespeare-i18n"; @@ -6770,6 +6773,7 @@ self: super: { "simple-conduit" = dontDistribute super."simple-conduit"; "simple-config" = dontDistribute super."simple-config"; "simple-css" = dontDistribute super."simple-css"; + "simple-download" = dontDistribute super."simple-download"; "simple-eval" = dontDistribute super."simple-eval"; "simple-firewire" = dontDistribute super."simple-firewire"; "simple-form" = dontDistribute super."simple-form"; @@ -6778,6 +6782,7 @@ self: super: { "simple-get-opt" = dontDistribute super."simple-get-opt"; "simple-index" = dontDistribute super."simple-index"; "simple-log-syslog" = dontDistribute super."simple-log-syslog"; + "simple-logger" = dontDistribute super."simple-logger"; "simple-neural-networks" = dontDistribute super."simple-neural-networks"; "simple-nix" = dontDistribute super."simple-nix"; "simple-observer" = dontDistribute super."simple-observer"; @@ -6918,6 +6923,7 @@ self: super: { "snow-white" = dontDistribute super."snow-white"; "snowball" = dontDistribute super."snowball"; "snowglobe" = dontDistribute super."snowglobe"; + "soap" = doDistribute super."soap_0_2_3_0"; "sock2stream" = dontDistribute super."sock2stream"; "sockaddr" = dontDistribute super."sockaddr"; "socket-activation" = dontDistribute super."socket-activation"; @@ -7015,7 +7021,6 @@ self: super: { "stack-prism" = dontDistribute super."stack-prism"; "stack-run" = dontDistribute super."stack-run"; "stackage-curator" = doDistribute super."stackage-curator_0_14_0"; - "stackage-install" = doDistribute super."stackage-install_0_1_1_1"; "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; "standalone-haddock" = dontDistribute super."standalone-haddock"; "star-to-star" = dontDistribute super."star-to-star"; @@ -7024,6 +7029,7 @@ self: super: { "starrover2" = dontDistribute super."starrover2"; "stash" = dontDistribute super."stash"; "state" = dontDistribute super."state"; + "state-bag" = dontDistribute super."state-bag"; "state-record" = dontDistribute super."state-record"; "statechart" = dontDistribute super."statechart"; "stateful-mtl" = dontDistribute super."stateful-mtl"; @@ -7080,6 +7086,7 @@ self: super: { "store" = dontDistribute super."store"; "store-core" = dontDistribute super."store-core"; "str" = dontDistribute super."str"; + "stratosphere" = doDistribute super."stratosphere_0_1_2_1"; "stratum-tool" = dontDistribute super."stratum-tool"; "stratux" = dontDistribute super."stratux"; "stratux-http" = dontDistribute super."stratux-http"; @@ -7126,6 +7133,7 @@ self: super: { "structures" = dontDistribute super."structures"; "stunclient" = dontDistribute super."stunclient"; "stunts" = dontDistribute super."stunts"; + "stylish-haskell" = doDistribute super."stylish-haskell_0_5_17_0"; "stylized" = dontDistribute super."stylized"; "sub-state" = dontDistribute super."sub-state"; "subhask" = dontDistribute super."subhask"; @@ -7173,7 +7181,6 @@ self: super: { "symengine" = dontDistribute super."symengine"; "symengine-hs" = dontDistribute super."symengine-hs"; "sync" = dontDistribute super."sync"; - "sync-mht" = doDistribute super."sync-mht_0_3_8_4"; "synchronous-channels" = dontDistribute super."synchronous-channels"; "syncthing-hs" = dontDistribute super."syncthing-hs"; "synt" = dontDistribute super."synt"; @@ -7260,7 +7267,6 @@ self: super: { "tasty-laws" = dontDistribute super."tasty-laws"; "tasty-lens" = dontDistribute super."tasty-lens"; "tasty-program" = dontDistribute super."tasty-program"; - "tasty-rerun" = doDistribute super."tasty-rerun_1_1_5"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; "tbox" = dontDistribute super."tbox"; @@ -7326,6 +7332,7 @@ self: super: { "testrunner" = dontDistribute super."testrunner"; "tetris" = dontDistribute super."tetris"; "tex2txt" = dontDistribute super."tex2txt"; + "texmath" = doDistribute super."texmath_0_8_6_4"; "texrunner" = dontDistribute super."texrunner"; "text-all" = dontDistribute super."text-all"; "text-and-plots" = dontDistribute super."text-and-plots"; @@ -7372,7 +7379,6 @@ self: super: { "th-instances" = dontDistribute super."th-instances"; "th-kinds" = dontDistribute super."th-kinds"; "th-kinds-fork" = dontDistribute super."th-kinds-fork"; - "th-lift-instances" = doDistribute super."th-lift-instances_0_1_9"; "th-orphans" = doDistribute super."th-orphans_0_13_0"; "th-printf" = dontDistribute super."th-printf"; "th-sccs" = dontDistribute super."th-sccs"; @@ -7550,6 +7556,7 @@ self: super: { "tuple-morph" = dontDistribute super."tuple-morph"; "tupleinstances" = dontDistribute super."tupleinstances"; "turing" = dontDistribute super."turing"; + "turing-machines" = dontDistribute super."turing-machines"; "turing-music" = dontDistribute super."turing-music"; "turingMachine" = dontDistribute super."turingMachine"; "turkish-deasciifier" = dontDistribute super."turkish-deasciifier"; @@ -7623,6 +7630,7 @@ self: super: { "typelevel-tensor" = dontDistribute super."typelevel-tensor"; "typeof" = dontDistribute super."typeof"; "typeparams" = dontDistribute super."typeparams"; + "typerbole" = dontDistribute super."typerbole"; "typesafe-endian" = dontDistribute super."typesafe-endian"; "typescript-docs" = dontDistribute super."typescript-docs"; "typical" = dontDistribute super."typical"; @@ -7767,9 +7775,9 @@ self: super: { "valid-names" = dontDistribute super."valid-names"; "validate" = dontDistribute super."validate"; "validated-literals" = dontDistribute super."validated-literals"; - "validation" = doDistribute super."validation_0_5_2"; "validations" = dontDistribute super."validations"; "validity" = dontDistribute super."validity"; + "validity-containers" = dontDistribute super."validity-containers"; "value-supply" = dontDistribute super."value-supply"; "vampire" = dontDistribute super."vampire"; "var" = dontDistribute super."var"; @@ -7789,6 +7797,7 @@ self: super: { "vect-floating-accelerate" = dontDistribute super."vect-floating-accelerate"; "vect-opengl" = dontDistribute super."vect-opengl"; "vector-binary" = dontDistribute super."vector-binary"; + "vector-bytes-instances" = dontDistribute super."vector-bytes-instances"; "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; @@ -7867,7 +7876,6 @@ self: super: { "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; - "wai-middleware-crowd" = doDistribute super."wai-middleware-crowd_0_1_4"; "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; @@ -7899,7 +7907,6 @@ self: super: { "watcher" = dontDistribute super."watcher"; "watchit" = dontDistribute super."watchit"; "wavconvert" = dontDistribute super."wavconvert"; - "wavefront" = doDistribute super."wavefront_0_7"; "wavesurfer" = dontDistribute super."wavesurfer"; "wavy" = dontDistribute super."wavy"; "wcwidth" = dontDistribute super."wcwidth"; @@ -7910,6 +7917,7 @@ self: super: { "web-inv-route" = dontDistribute super."web-inv-route"; "web-mongrel2" = dontDistribute super."web-mongrel2"; "web-page" = dontDistribute super."web-page"; + "web-routes" = doDistribute super."web-routes_0_27_10"; "web-routes-mtl" = dontDistribute super."web-routes-mtl"; "web-routes-quasi" = dontDistribute super."web-routes-quasi"; "web-routes-regular" = dontDistribute super."web-routes-regular"; @@ -7931,6 +7939,7 @@ self: super: { "webrtc-vad" = dontDistribute super."webrtc-vad"; "webserver" = dontDistribute super."webserver"; "websnap" = dontDistribute super."websnap"; + "websockets" = doDistribute super."websockets_0_9_6_2"; "webwire" = dontDistribute super."webwire"; "wedding-announcement" = dontDistribute super."wedding-announcement"; "wedged" = dontDistribute super."wedged"; @@ -7973,6 +7982,7 @@ self: super: { "words" = dontDistribute super."words"; "wordsearch" = dontDistribute super."wordsearch"; "wordsetdiff" = dontDistribute super."wordsetdiff"; + "workdays" = dontDistribute super."workdays"; "workflow-osx" = dontDistribute super."workflow-osx"; "wp-archivebot" = dontDistribute super."wp-archivebot"; "wraparound" = dontDistribute super."wraparound"; @@ -8024,7 +8034,6 @@ self: super: { "xinput-conduit" = dontDistribute super."xinput-conduit"; "xkbcommon" = dontDistribute super."xkbcommon"; "xkcd" = dontDistribute super."xkcd"; - "xlsx" = doDistribute super."xlsx_0_2_2_2"; "xlsx-templater" = dontDistribute super."xlsx-templater"; "xml-basic" = dontDistribute super."xml-basic"; "xml-catalog" = dontDistribute super."xml-catalog"; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 9d391954a341..dff47c509f9a 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -8,12 +8,11 @@ self: { ({ mkDerivation, base, GLUT, OpenGL, random }: mkDerivation { pname = "3d-graphics-examples"; - version = "0.0.0.1"; - sha256 = "c537abf41884456b2355a52ed61bb81cc9c5f4ee87cd089f50c69dde6ab2678d"; + version = "0.0.0.2"; + sha256 = "fdb14c0601d63fb1fd3d029f5912c19a3a3658bb88c7a7f17e9c46b336c1a509"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base GLUT OpenGL random ]; - jailbreak = true; homepage = "http://darcs.wolfgang.jeltsch.info/haskell/3d-graphics-examples"; description = "Examples of 3D graphics programming with OpenGL"; license = stdenv.lib.licenses.bsd3; @@ -1737,32 +1736,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "BlogLiterately_0_8_3_1" = callPackage - ({ mkDerivation, base, blaze-html, bool-extras, bytestring, cmdargs - , containers, data-default, directory, filepath, HaXml, haxr - , highlighting-kate, hscolour, HTTP, lens, mtl, pandoc - , pandoc-citeproc, pandoc-types, parsec, process, split, strict - , tagsoup, temporary, transformers - }: - mkDerivation { - pname = "BlogLiterately"; - version = "0.8.3.1"; - sha256 = "230edb974c43c7639c89ce2415fea6f9b57d4a15078f674f2b39f6437f5be09a"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base blaze-html bool-extras bytestring cmdargs containers - data-default directory filepath HaXml haxr highlighting-kate - hscolour HTTP lens mtl pandoc pandoc-citeproc pandoc-types parsec - process split strict tagsoup temporary transformers - ]; - executableHaskellDepends = [ base cmdargs ]; - homepage = "http://byorgey.wordpress.com/blogliterately/"; - description = "A tool for posting Haskelly articles to blogs"; - license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "BlogLiterately" = callPackage ({ mkDerivation, base, blaze-html, bool-extras, bytestring, cmdargs , containers, data-default, directory, filepath, HaXml, haxr @@ -3039,8 +3012,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "Concurrent-Cache"; - version = "0.2.1.0"; - sha256 = "4b729f38e34be0f9b9bc51eafd513c1e476a14f4058d4476341db51e6c0ad642"; + version = "0.2.2.3"; + sha256 = "08084673a92a6ae2b5be1f3cf115cdef1139ff23b60f7cd6a8df0ce954028a55"; libraryHaskellDepends = [ base ]; description = "A Cached variable for IO functions"; license = stdenv.lib.licenses.bsd3; @@ -6323,30 +6296,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "Glob_0_7_9" = callPackage - ({ mkDerivation, base, containers, directory, dlist, filepath - , HUnit, QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2, transformers, transformers-compat - }: - mkDerivation { - pname = "Glob"; - version = "0.7.9"; - sha256 = "a6c48b6a94971c00f8d1360c417275b1e0c089017db523df3f54729622567dbd"; - libraryHaskellDepends = [ - base containers directory dlist filepath transformers - transformers-compat - ]; - testHaskellDepends = [ - base containers directory dlist filepath HUnit QuickCheck - test-framework test-framework-hunit test-framework-quickcheck2 - transformers transformers-compat - ]; - homepage = "http://iki.fi/matti.niemenmaa/glob/"; - description = "Globbing library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "Glob" = callPackage ({ mkDerivation, base, containers, directory, dlist, filepath , HUnit, QuickCheck, test-framework, test-framework-hunit @@ -6365,7 +6314,6 @@ self: { test-framework test-framework-hunit test-framework-quickcheck2 transformers transformers-compat ]; - doCheck = false; homepage = "http://iki.fi/matti.niemenmaa/glob/"; description = "Globbing library"; license = stdenv.lib.licenses.bsd3; @@ -7153,14 +7101,14 @@ self: { }) {inherit (pkgs) fuse;}; "HGE2D" = callPackage - ({ mkDerivation, base, GLUT, OpenGL, time }: + ({ mkDerivation, base, GLUT, OpenGL, safe, time }: mkDerivation { pname = "HGE2D"; - version = "0.1.6.5"; - sha256 = "072579275b26bc68356e564f6691bf9168548848e5ef759865e629b7f684d326"; + version = "0.1.9.0"; + sha256 = "59777250da5b74324c92fb7b2c9a306f2be670877eb32655e0d844690f9b09c4"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base GLUT OpenGL time ]; + libraryHaskellDepends = [ base GLUT OpenGL safe time ]; executableHaskellDepends = [ base ]; homepage = "https://github.com/I3ck/HGE2D"; description = "2D game engine written in Haskell"; @@ -11057,8 +11005,8 @@ self: { }: mkDerivation { pname = "ListLike"; - version = "4.4"; - sha256 = "5aea87970f913a2e826634e4fb1d0c082202d005ce27ef9c1dcbc33ac412171a"; + version = "4.5"; + sha256 = "3b3a562cf432597c02aa440142e11dc4069fdc30c4397887e8cab6abbd88ef3b"; libraryHaskellDepends = [ array base bytestring containers deepseq dlist fmlist text utf8-string vector @@ -13023,24 +12971,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "OpenGLRaw_3_2_0_0" = callPackage - ({ mkDerivation, base, bytestring, containers, fixed, half, mesa - , text, transformers - }: - mkDerivation { - pname = "OpenGLRaw"; - version = "3.2.0.0"; - sha256 = "21346bfd1b2b7df9ae97df6f57d81dd03edd57c1965bf5b2befbfffad45229c5"; - libraryHaskellDepends = [ - base bytestring containers fixed half text transformers - ]; - librarySystemDepends = [ mesa ]; - homepage = "http://www.haskell.org/haskellwiki/Opengl"; - description = "A raw binding for the OpenGL graphics system"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) mesa;}; - "OpenGLRaw" = callPackage ({ mkDerivation, base, bytestring, containers, fixed, half, mesa , text, transformers @@ -13288,6 +13218,18 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "PPrinter" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + pname = "PPrinter"; + version = "0.0.2"; + sha256 = "f501e812332d106bc08f38cd18609db48caea5e9a88544cf00bb6044beae2ac3"; + libraryHaskellDepends = [ base containers ]; + jailbreak = true; + description = "A derivable Haskell pretty printer"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "PSQueue" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -14225,10 +14167,9 @@ self: { ({ mkDerivation, base, QuickCheck }: mkDerivation { pname = "QuickCheckVariant"; - version = "0.1.0.2"; - sha256 = "a27d5a4de49f1ef4a519544d996c015b59d25eb4ec9bde3ee2b6e14a5b4349e4"; + version = "0.1.1.0"; + sha256 = "3d29e3b03f3908b04db06d3912e65e4370f752d57296e509bbf7e17db949c2f8"; libraryHaskellDepends = [ base QuickCheck ]; - jailbreak = true; homepage = "https://github.com/sanjorgek/QuickCheckVariant"; description = "Generator of \"valid\" and \"invalid\" data in a type class"; license = stdenv.lib.licenses.gpl3; @@ -16237,19 +16178,6 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; - "Strafunski-StrategyLib_5_0_0_8" = callPackage - ({ mkDerivation, base, directory, mtl, syb, transformers }: - mkDerivation { - pname = "Strafunski-StrategyLib"; - version = "5.0.0.8"; - sha256 = "4c552011c167dc361bb9665c3bc889a9937702af863dc5fdb946fe9633a36926"; - libraryHaskellDepends = [ base directory mtl syb transformers ]; - jailbreak = true; - description = "Library for strategic programming"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "Strafunski-StrategyLib" = callPackage ({ mkDerivation, base, directory, mtl, syb, transformers }: mkDerivation { @@ -19307,6 +19235,18 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "acme-default" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "acme-default"; + version = "0.1.0"; + sha256 = "375e166dafd8af2c3318ced8f48bfb237378fa69935fd864803bf131ef177d42"; + libraryHaskellDepends = [ base ]; + homepage = "http://hub.darcs.net/esz/acme-default"; + description = "A class for types with a distinguished aesthetically pleasing value"; + license = stdenv.lib.licenses.asl20; + }) {}; + "acme-dont" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -20273,6 +20213,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "aeson-injector" = callPackage + ({ mkDerivation, aeson, base, bifunctors, deepseq, HUnit, lens + , QuickCheck, quickcheck-text, swagger2, tasty, tasty-hunit + , tasty-quickcheck, text, unordered-containers + }: + mkDerivation { + pname = "aeson-injector"; + version = "1.0.2.0"; + sha256 = "7944a3e56660d83774adafa78a4f3e740af714b0dd6e32f98c87a668ca12bec1"; + libraryHaskellDepends = [ + aeson base bifunctors deepseq lens swagger2 text + unordered-containers + ]; + testHaskellDepends = [ + aeson base HUnit lens QuickCheck quickcheck-text swagger2 tasty + tasty-hunit tasty-quickcheck text + ]; + description = "Injecting fields into aeson values"; + license = stdenv.lib.licenses.mit; + }) {}; + "aeson-iproute" = callPackage ({ mkDerivation, aeson, base, iproute, text }: mkDerivation { @@ -20370,7 +20331,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "aeson-pretty" = callPackage + "aeson-pretty_0_7_2" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, cmdargs, text , unordered-containers, vector }: @@ -20389,9 +20350,10 @@ self: { homepage = "http://github.com/informatikr/aeson-pretty"; description = "JSON pretty-printing library and command-line tool"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "aeson-pretty_0_8_1" = callPackage + "aeson-pretty" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring , cmdargs, scientific, text, unordered-containers, vector }: @@ -20411,7 +20373,6 @@ self: { homepage = "http://github.com/informatikr/aeson-pretty"; description = "JSON pretty-printing library and command-line tool"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-qq" = callPackage @@ -21323,10 +21284,9 @@ self: { ({ mkDerivation, base, syb, template-haskell }: mkDerivation { pname = "algebraic-classes"; - version = "0.6"; - sha256 = "c1548c369dc3695b655a1c3211fc4415556a6df3b16eac6cee22705b69b06444"; + version = "0.7"; + sha256 = "76ecdf393bb6f9d1e3b429ba1af82b49bd20b966914cb17d307625f7498e5e38"; libraryHaskellDepends = [ base syb template-haskell ]; - jailbreak = true; homepage = "https://github.com/sjoerdvisscher/algebraic-classes"; description = "Conversions between algebraic classes and F-algebras"; license = stdenv.lib.licenses.bsd3; @@ -21643,10 +21603,9 @@ self: { ({ mkDerivation, base, composition }: mkDerivation { pname = "altcomposition"; - version = "0.2.2.0"; - sha256 = "a9051c75339d16d6d3b875145f98c704127a5caba615280be5be36be04402321"; + version = "0.2.3.0"; + sha256 = "35fbf66ebc949163977f3894e12bdd83c563b24a317684fd6ead48093a338cc9"; libraryHaskellDepends = [ base composition ]; - jailbreak = true; homepage = "https://github.com/jcristovao/altcomposition"; description = "Alternative combinators for unorthodox function composition"; license = stdenv.lib.licenses.bsd3; @@ -23850,21 +23809,20 @@ self: { "api-builder" = callPackage ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal , containers, hspec, HTTP, http-client, http-client-tls, http-types - , text, transformers + , text, tls, transformers }: mkDerivation { pname = "api-builder"; - version = "0.11.0.0"; - sha256 = "d8df94d14ffa9f0e60c88cf75eb221281c89251af67ac0a2068b3f774a0916c7"; + version = "0.12.0.0"; + sha256 = "d1ca9125a15cb70d7dfe85d04ab75e9d34620a58ca109b139b401578bda14b99"; libraryHaskellDepends = [ aeson base bifunctors bytestring HTTP http-client http-client-tls - http-types text transformers + http-types text tls transformers ]; testHaskellDepends = [ aeson base bytestring Cabal containers hspec http-client text transformers ]; - jailbreak = true; homepage = "https://github.com/intolerable/api-builder"; description = "Library for easily building REST API wrappers in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -24466,7 +24424,7 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; - "apply-refact" = callPackage + "apply-refact_0_2_0_0" = callPackage ({ mkDerivation, base, containers, directory, filemanip, filepath , ghc, ghc-exactprint, mtl, optparse-applicative, process, refact , silently, syb, tasty, tasty-expected-failure, tasty-golden @@ -24496,6 +24454,38 @@ self: { jailbreak = true; description = "Perform refactorings specified by the refact library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "apply-refact" = callPackage + ({ mkDerivation, base, containers, directory, filemanip, filepath + , ghc, ghc-exactprint, mtl, optparse-applicative, process, refact + , silently, syb, tasty, tasty-expected-failure, tasty-golden + , temporary, transformers, unix-compat + }: + mkDerivation { + pname = "apply-refact"; + version = "0.3.0.0"; + sha256 = "0d2a8845ed554c4a6742a3d0a130dac3f16d0d710b65b20dfeb8e773409ed70f"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers directory filemanip ghc ghc-exactprint mtl process + refact syb temporary transformers unix-compat + ]; + executableHaskellDepends = [ + base containers directory filemanip filepath ghc ghc-exactprint mtl + optparse-applicative process refact syb temporary transformers + unix-compat + ]; + testHaskellDepends = [ + base containers directory filemanip filepath ghc ghc-exactprint mtl + optparse-applicative process refact silently syb tasty + tasty-expected-failure tasty-golden temporary transformers + unix-compat + ]; + description = "Perform refactorings specified by the refact library"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = [ "x86_64-darwin" ]; }) {}; @@ -25304,6 +25294,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ascii-cows" = callPackage + ({ mkDerivation, base, random-extras, random-fu, text }: + mkDerivation { + pname = "ascii-cows"; + version = "0.0.1.0"; + sha256 = "dd20c8858ae432ced8c34d0a8b0deb6bf5ff805a5283fc4735d852df92282aac"; + libraryHaskellDepends = [ base random-extras random-fu text ]; + homepage = "http://github.com/passy/cows-hs"; + description = "A collection of ASCII cows. Moo."; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ascii-flatten" = callPackage ({ mkDerivation, base, text }: mkDerivation { @@ -25686,6 +25688,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "async-ajax" = callPackage + ({ mkDerivation, async, base, ghcjs-ajax, text }: + mkDerivation { + pname = "async-ajax"; + version = "0.2.0.0"; + sha256 = "11eab7c772155f6219dc37d24f7601192e9f16de81fdf53b794920e2d6145204"; + libraryHaskellDepends = [ async base ghcjs-ajax text ]; + homepage = "https://github.com/agrafix/ghcjs-ajax#readme"; + description = "Crossbrowser async AJAX Bindings for GHCJS"; + license = stdenv.lib.licenses.mit; + }) {}; + "async-dejafu" = callPackage ({ mkDerivation, base, dejafu, exceptions, HUnit, hunit-dejafu }: mkDerivation { @@ -25838,8 +25852,8 @@ self: { }: mkDerivation { pname = "atlassian-connect-descriptor"; - version = "0.4.3.1"; - sha256 = "9e7ebc206c9625dd511cc20ade5952b972091c1aafa617086578fd9f33099b84"; + version = "0.4.4.0"; + sha256 = "4e4cac3e768e7488772751264b8ecf217841a8bc45e0fc2931398d1b056f416b"; libraryHaskellDepends = [ aeson base cases network network-uri text time-units unordered-containers @@ -25848,7 +25862,6 @@ self: { aeson base bytestring Cabal cases HUnit network network-uri scientific text time-units unordered-containers vector ]; - jailbreak = true; description = "Code that helps you create a valid Atlassian Connect Descriptor"; license = stdenv.lib.licenses.asl20; hydraPlatforms = [ "x86_64-darwin" ]; @@ -29137,27 +29150,6 @@ self: { }: mkDerivation { pname = "bifunctors"; - version = "5.3"; - sha256 = "66d2faa673752b4e47018a9ebfd84075c450b41556bb9551cf04d359dbcce8bf"; - libraryHaskellDepends = [ - base base-orphans comonad containers semigroups tagged - template-haskell transformers transformers-compat - ]; - testHaskellDepends = [ - base hspec QuickCheck transformers transformers-compat - ]; - homepage = "http://github.com/ekmett/bifunctors/"; - description = "Bifunctors"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "bifunctors_5_4_1" = callPackage - ({ mkDerivation, base, base-orphans, comonad, containers, hspec - , QuickCheck, semigroups, tagged, template-haskell, transformers - , transformers-compat - }: - mkDerivation { - pname = "bifunctors"; version = "5.4.1"; sha256 = "3746f971f69ce31ced23d12e4785d96985f5c620ac7a26d5f4efead970c43b87"; libraryHaskellDepends = [ @@ -29170,7 +29162,6 @@ self: { homepage = "http://github.com/ekmett/bifunctors/"; description = "Bifunctors"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bighugethesaurus" = callPackage @@ -29558,32 +29549,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "binary-orphans_0_1_5_0" = callPackage - ({ mkDerivation, aeson, base, binary, case-insensitive, hashable - , quickcheck-instances, scientific, tagged, tasty, tasty-quickcheck - , text, text-binary, time, unordered-containers, vector - , vector-binary-instances - }: - mkDerivation { - pname = "binary-orphans"; - version = "0.1.5.0"; - sha256 = "6e93593ac39485f6e0290fcbeaf96ef1b3be0ec3dc7434643529583c31db5d10"; - libraryHaskellDepends = [ - aeson base binary case-insensitive hashable scientific tagged text - text-binary time unordered-containers vector - vector-binary-instances - ]; - testHaskellDepends = [ - aeson base binary case-insensitive hashable quickcheck-instances - scientific tagged tasty tasty-quickcheck text time - unordered-containers vector - ]; - homepage = "https://github.com/phadej/binary-orphans#readme"; - description = "Orphan instances for binary"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "binary-orphans" = callPackage ({ mkDerivation, aeson, base, binary, case-insensitive, hashable , QuickCheck, quickcheck-instances, scientific, tagged, tasty @@ -29907,34 +29872,6 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {esound = null;}; - "bindings-GLFW_3_1_2_0" = callPackage - ({ mkDerivation, base, bindings-DSL, HUnit, libX11, libXcursor - , libXext, libXfixes, libXi, libXinerama, libXrandr, libXxf86vm - , mesa, template-haskell, test-framework, test-framework-hunit - }: - mkDerivation { - pname = "bindings-GLFW"; - version = "3.1.2.0"; - sha256 = "8ed860cea817a213f4972d68860c48ca81377d4fcd488dee29677ff02c2d4ea1"; - libraryHaskellDepends = [ base bindings-DSL template-haskell ]; - librarySystemDepends = [ - libX11 libXcursor libXext libXfixes libXi libXinerama libXrandr - libXxf86vm mesa - ]; - testHaskellDepends = [ - base HUnit test-framework test-framework-hunit - ]; - jailbreak = true; - doCheck = false; - description = "Low-level bindings to GLFW OpenGL library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXcursor; - inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXfixes; - inherit (pkgs.xorg) libXi; inherit (pkgs.xorg) libXinerama; - inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXxf86vm; - inherit (pkgs) mesa;}; - "bindings-GLFW" = callPackage ({ mkDerivation, base, bindings-DSL, HUnit, libX11, libXcursor , libXext, libXfixes, libXi, libXinerama, libXrandr, libXxf86vm @@ -29953,6 +29890,7 @@ self: { base HUnit test-framework test-framework-hunit ]; jailbreak = true; + doCheck = false; description = "Low-level bindings to GLFW OpenGL library"; license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXcursor; @@ -31365,7 +31303,7 @@ self: { "bitspeak" = callPackage ({ mkDerivation, base, bindings-DSL, bindings-glib - , bindings-gobject, gdk2, gtk2, pango + , bindings-gobject, gtk2, pango }: mkDerivation { pname = "bitspeak"; @@ -31376,13 +31314,12 @@ self: { executableHaskellDepends = [ base bindings-DSL bindings-glib bindings-gobject ]; - executablePkgconfigDepends = [ gdk2 gtk2 pango ]; + executablePkgconfigDepends = [ gtk2 pango ]; jailbreak = true; description = "Proof-of-concept tool for writing using binary choices"; license = "GPL"; hydraPlatforms = [ "x86_64-darwin" ]; - }) {gdk2 = null; gtk2 = pkgs.gnome2.gtk; - inherit (pkgs.gnome) pango;}; + }) {gtk2 = pkgs.gnome2.gtk; inherit (pkgs.gnome) pango;}; "bitstream" = callPackage ({ mkDerivation, base, base-unicode-symbols, bytestring, QuickCheck @@ -31491,8 +31428,8 @@ self: { }: mkDerivation { pname = "bitx-bitcoin"; - version = "0.9.0.1"; - sha256 = "5a0b9076aafd4ad9939891df0251c8bfaed687d12f4bcb21f46e3a5f85ffd332"; + version = "0.10.0.0"; + sha256 = "a55e13de9eadffe78a0fc3edf4055a98c70a6f9738c98db4f055df8aa9fc509c"; libraryHaskellDepends = [ aeson base bytestring exceptions http-client http-client-tls http-types microlens microlens-th network QuickCheck scientific @@ -31612,7 +31549,7 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; - "blake2" = callPackage + "blake2_0_1_0" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, hlint , QuickCheck, tasty, tasty-quickcheck }: @@ -31628,6 +31565,25 @@ self: { homepage = "https://github.com/centromere/blake2"; description = "A library providing BLAKE2"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "blake2" = callPackage + ({ mkDerivation, base, base16-bytestring, bytestring, hlint + , QuickCheck, tasty, tasty-quickcheck + }: + mkDerivation { + pname = "blake2"; + version = "0.2.0"; + sha256 = "07d910e3f5c6e98f5a6b9d53dbe5f52506c3859b513bc7493b52552a28382cfc"; + libraryHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ + base base16-bytestring bytestring hlint QuickCheck tasty + tasty-quickcheck + ]; + homepage = "https://github.com/centromere/blake2"; + description = "A library providing BLAKE2"; + license = stdenv.lib.licenses.publicDomain; hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; @@ -31845,7 +31801,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "blaze-html" = callPackage + "blaze-html_0_8_1_1" = callPackage ({ mkDerivation, base, blaze-builder, blaze-markup, bytestring , containers, HUnit, QuickCheck, test-framework , test-framework-hunit, test-framework-quickcheck2, text @@ -31865,6 +31821,29 @@ self: { homepage = "http://jaspervdj.be/blaze"; description = "A blazingly fast HTML combinator library for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "blaze-html" = callPackage + ({ mkDerivation, base, blaze-builder, blaze-markup, bytestring + , containers, HUnit, QuickCheck, test-framework + , test-framework-hunit, test-framework-quickcheck2, text + }: + mkDerivation { + pname = "blaze-html"; + version = "0.8.1.2"; + sha256 = "f7ee92b38112e939bf251530afb7385a1588a8a6c929f409492dfde7b67ef2b7"; + libraryHaskellDepends = [ + base blaze-builder blaze-markup bytestring text + ]; + testHaskellDepends = [ + base blaze-builder blaze-markup bytestring containers HUnit + QuickCheck test-framework test-framework-hunit + test-framework-quickcheck2 text + ]; + homepage = "http://jaspervdj.be/blaze"; + description = "A blazingly fast HTML combinator library for Haskell"; + license = stdenv.lib.licenses.bsd3; }) {}; "blaze-html-contrib" = callPackage @@ -31937,7 +31916,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "blaze-markup" = callPackage + "blaze-markup_0_7_0_3" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit , QuickCheck, test-framework, test-framework-hunit , test-framework-quickcheck2, text @@ -31954,6 +31933,26 @@ self: { homepage = "http://jaspervdj.be/blaze"; description = "A blazingly fast markup combinator library for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "blaze-markup" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit + , QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2, text + }: + mkDerivation { + pname = "blaze-markup"; + version = "0.7.1.0"; + sha256 = "62ce7977b68873eda328c4e8e3c2034102a49718d63631a6dc76abf479b7c6ba"; + libraryHaskellDepends = [ base blaze-builder bytestring text ]; + testHaskellDepends = [ + base blaze-builder bytestring containers HUnit QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 text + ]; + homepage = "http://jaspervdj.be/blaze"; + description = "A blazingly fast markup combinator library for Haskell"; + license = stdenv.lib.licenses.bsd3; }) {}; "blaze-shields" = callPackage @@ -32504,6 +32503,7 @@ self: { filepath HUnit monad-loops parsec pretty QuickCheck tasty tasty-golden tasty-hunit tasty-quickcheck text ]; + jailbreak = true; homepage = "https://github.com/Microsoft/bond"; description = "Bond schema compiler and code generator"; license = stdenv.lib.licenses.mit; @@ -32542,8 +32542,8 @@ self: { }: mkDerivation { pname = "bond-haskell-compiler"; - version = "0.1.3.0"; - sha256 = "be3887eb0404614cff445b99c943788d1556337552fcc099587a9bfdc833a4f7"; + version = "0.1.3.1"; + sha256 = "ec6a50128f18f5278d6296883d361145cd3de0cdafb319ef8fa17fbd6b3a10c2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bond filepath haskell-src-exts ]; @@ -33151,29 +33151,6 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; - "bson_0_3_2_2" = callPackage - ({ mkDerivation, base, binary, bytestring, cryptohash - , data-binary-ieee754, mtl, network, QuickCheck, test-framework - , test-framework-quickcheck2, text, time - }: - mkDerivation { - pname = "bson"; - version = "0.3.2.2"; - sha256 = "31b80e85b801e9c53abf16f8e9660e5bd4fcee766f469f7f91505f6406aa3870"; - libraryHaskellDepends = [ - base binary bytestring cryptohash data-binary-ieee754 mtl network - text time - ]; - testHaskellDepends = [ - base binary bytestring cryptohash data-binary-ieee754 mtl network - QuickCheck test-framework test-framework-quickcheck2 text time - ]; - homepage = "http://github.com/mongodb-haskell/bson"; - description = "BSON documents are JSON-like objects with a standard binary encoding"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "bson" = callPackage ({ mkDerivation, base, binary, bytestring, cryptohash , data-binary-ieee754, mtl, network, QuickCheck, test-framework @@ -34628,6 +34605,35 @@ self: { license = stdenv.lib.licenses.agpl3; }) {}; + "cabal-helper_0_7_2_0" = callPackage + ({ mkDerivation, base, bytestring, Cabal, cabal-install, directory + , extra, filepath, ghc-prim, mtl, process, template-haskell + , temporary, transformers, unix, utf8-string + }: + mkDerivation { + pname = "cabal-helper"; + version = "0.7.2.0"; + sha256 = "90572b1e4aeb780464f7d5f2f88c4f59ebb4539fe303f0b86d42ef3b9078a362"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base Cabal directory filepath ghc-prim mtl process transformers + ]; + executableHaskellDepends = [ + base bytestring Cabal directory filepath ghc-prim mtl process + template-haskell temporary transformers utf8-string + ]; + testHaskellDepends = [ + base bytestring Cabal directory extra filepath ghc-prim mtl process + template-haskell temporary transformers unix utf8-string + ]; + testToolDepends = [ cabal-install ]; + doCheck = false; + description = "Simple interface to some of Cabal's configuration state used by ghc-mod"; + license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cabal-info" = callPackage ({ mkDerivation, base, Cabal, directory, filepath , optparse-applicative @@ -34926,7 +34932,7 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; - "cabal-rpm" = callPackage + "cabal-rpm_0_9_11" = callPackage ({ mkDerivation, base, Cabal, directory, filepath, old-locale , process, time, unix }: @@ -34942,6 +34948,25 @@ self: { homepage = "https://github.com/juhp/cabal-rpm"; description = "RPM packaging tool for Haskell Cabal-based packages"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "cabal-rpm" = callPackage + ({ mkDerivation, base, Cabal, directory, filepath, old-locale + , process, time, unix + }: + mkDerivation { + pname = "cabal-rpm"; + version = "0.10.0"; + sha256 = "b516bd0850bd1433bd5bba7e93d98c6fe22ea785aa0d640584208d9c22437112"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base Cabal directory filepath old-locale process time unix + ]; + homepage = "https://github.com/juhp/cabal-rpm"; + description = "RPM packaging tool for Haskell Cabal-based packages"; + license = stdenv.lib.licenses.gpl3; }) {}; "cabal-scripts" = callPackage @@ -35814,13 +35839,13 @@ self: { ({ mkDerivation, alex, array, base, bytestring, comonad, containers , directory, fclabels, fgl, filepath, fortran-src, generic-deriving , GenericPretty, ghc-prim, happy, haskell-src, hmatrix, hspec - , language-fortran, matrix, mtl, QuickCheck, regex-base, regex-pcre - , syb, syz, template-haskell, text, transformers, uniplate, vector + , language-fortran, matrix, mtl, QuickCheck, syb, syz + , template-haskell, text, transformers, uniplate, vector }: mkDerivation { pname = "camfort"; - version = "0.802"; - sha256 = "de057c0bfc71ff291b7a0e5581eaddaceadedc83af00774a329593a11842d6a2"; + version = "0.804"; + sha256 = "45a0d5df36e9cd948b37eb8bdf51cbe8e9b414b09a402214fc4873c4f77f3b2d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -35833,14 +35858,14 @@ self: { executableHaskellDepends = [ array base bytestring comonad containers directory fclabels fgl filepath fortran-src generic-deriving GenericPretty ghc-prim - haskell-src hmatrix language-fortran matrix mtl QuickCheck - regex-base regex-pcre syb syz template-haskell text transformers - uniplate vector + haskell-src hmatrix language-fortran matrix mtl QuickCheck syb syz + template-haskell text transformers uniplate vector ]; testHaskellDepends = [ - base bytestring containers directory filepath fortran-src hspec mtl - QuickCheck uniplate + array base bytestring containers directory filepath fortran-src + hmatrix hspec mtl QuickCheck uniplate ]; + doCheck = false; description = "CamFort - Cambridge Fortran infrastructure"; license = stdenv.lib.licenses.asl20; hydraPlatforms = [ "x86_64-darwin" ]; @@ -35905,6 +35930,24 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "canteven-http" = callPackage + ({ mkDerivation, base, bytestring, canteven-log, exceptions + , http-types, monad-logger, text, time, transformers, uuid, wai + }: + mkDerivation { + pname = "canteven-http"; + version = "0.1.1.1"; + sha256 = "584a33ae1543afab727d6f22d3895432df3c8bea9e23e5e9c69dd93e5c4e7690"; + libraryHaskellDepends = [ + base bytestring canteven-log exceptions http-types monad-logger + text time transformers uuid wai + ]; + jailbreak = true; + homepage = "https://github.com/SumAll/canteven-http"; + description = "Utilities for HTTP programming"; + license = stdenv.lib.licenses.mit; + }) {}; + "canteven-listen-http" = callPackage ({ mkDerivation, aeson, base }: mkDerivation { @@ -36221,8 +36264,8 @@ self: { }: mkDerivation { pname = "casadi-bindings"; - version = "3.0.0.3"; - sha256 = "39eee803fda99b785de6f162467f75941ee62048ae4edebb0932540ade80febf"; + version = "3.0.0.4"; + sha256 = "0bc7e65fb3bedf79511642bedfa03670c062a189ae8ab034d6756707025c91cf"; libraryHaskellDepends = [ base binary casadi-bindings-core casadi-bindings-internal cereal containers linear spatial-math vector vector-binary-instances @@ -36357,23 +36400,6 @@ self: { }: mkDerivation { pname = "case-insensitive"; - version = "1.2.0.6"; - sha256 = "bc7b53517fefc475311bfe6dbab8ade47ab8df11a59079653aa3271e9ffcb1c4"; - libraryHaskellDepends = [ base bytestring deepseq hashable text ]; - testHaskellDepends = [ - base bytestring HUnit test-framework test-framework-hunit text - ]; - homepage = "https://github.com/basvandijk/case-insensitive"; - description = "Case insensitive string comparison"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "case-insensitive_1_2_0_7" = callPackage - ({ mkDerivation, base, bytestring, deepseq, hashable, HUnit - , test-framework, test-framework-hunit, text - }: - mkDerivation { - pname = "case-insensitive"; version = "1.2.0.7"; sha256 = "160d3898fd0d8b50bed820ff633e6292438f069adec5267c42b8bcf0f386cac8"; libraryHaskellDepends = [ base bytestring deepseq hashable text ]; @@ -36383,7 +36409,6 @@ self: { homepage = "https://github.com/basvandijk/case-insensitive"; description = "Case insensitive string comparison"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cased" = callPackage @@ -36984,7 +37009,7 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; - "cereal" = callPackage + "cereal_0_5_2_0" = callPackage ({ mkDerivation, array, base, bytestring, containers, ghc-prim , QuickCheck, test-framework, test-framework-quickcheck2 }: @@ -37002,6 +37027,27 @@ self: { homepage = "https://github.com/GaloisInc/cereal"; description = "A binary serialization library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "cereal" = callPackage + ({ mkDerivation, array, base, bytestring, containers, ghc-prim + , QuickCheck, test-framework, test-framework-quickcheck2 + }: + mkDerivation { + pname = "cereal"; + version = "0.5.3.0"; + sha256 = "c316e07cde7559684b71d345890e8f16eb5f6cc1cdd29f96e8c4296bcf8a8af4"; + libraryHaskellDepends = [ + array base bytestring containers ghc-prim + ]; + testHaskellDepends = [ + base bytestring QuickCheck test-framework + test-framework-quickcheck2 + ]; + homepage = "https://github.com/GaloisInc/cereal"; + description = "A binary serialization library"; + license = stdenv.lib.licenses.bsd3; }) {}; "cereal-conduit" = callPackage @@ -37760,18 +37806,6 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; - "checkers_0_4_4" = callPackage - ({ mkDerivation, array, base, QuickCheck, random }: - mkDerivation { - pname = "checkers"; - version = "0.4.4"; - sha256 = "11ad84ddb449ef97188c32b1a1324cc611a6d75033020890699ae8dba9fd8e9d"; - libraryHaskellDepends = [ array base QuickCheck random ]; - description = "Check properties on standard classes and data structures"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "checkers" = callPackage ({ mkDerivation, array, base, QuickCheck, random }: mkDerivation { @@ -38628,36 +38662,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "clash-ghc_0_6_19" = callPackage - ({ mkDerivation, array, base, bifunctors, bytestring, clash-lib - , clash-prelude, clash-systemverilog, clash-verilog, clash-vhdl - , containers, deepseq, directory, filepath, ghc, ghc-typelits-extra - , ghc-typelits-natnormalise, hashable, haskeline, lens, mtl - , process, text, time, transformers, unbound-generics, unix - , unordered-containers - }: - mkDerivation { - pname = "clash-ghc"; - version = "0.6.19"; - sha256 = "35aa6bfec8dba42d40b44fd75703fcee4d4927c3e530d2f803e01405ab8b789b"; - revision = "1"; - editedCabalFile = "333860d4a5deff8eb95a1fec544a29c86ac3db879e80f4341796f5227d89c55a"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - array base bifunctors bytestring clash-lib clash-prelude - clash-systemverilog clash-verilog clash-vhdl containers deepseq - directory filepath ghc ghc-typelits-extra ghc-typelits-natnormalise - hashable haskeline lens mtl process text time transformers - unbound-generics unix unordered-containers - ]; - jailbreak = true; - homepage = "http://www.clash-lang.org/"; - description = "CAES Language for Synchronous Hardware"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "clash-ghc" = callPackage ({ mkDerivation, array, base, bifunctors, bytestring, clash-lib , clash-prelude, clash-systemverilog, clash-verilog, clash-vhdl @@ -38686,54 +38690,9 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; - "clash-lib_0_6_17" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, clash-prelude - , concurrent-supply, containers, deepseq, directory, errors, fgl - , filepath, hashable, lens, mtl, pretty, process, template-haskell - , text, time, transformers, unbound-generics, unordered-containers - , uu-parsinglib, wl-pprint-text - }: - mkDerivation { - pname = "clash-lib"; - version = "0.6.17"; - sha256 = "b6a036da95283f66f9dc6c0b2c0ae11845384a2c01a8b38b9c223771b0cbb179"; - libraryHaskellDepends = [ - aeson attoparsec base bytestring clash-prelude concurrent-supply - containers deepseq directory errors fgl filepath hashable lens mtl - pretty process template-haskell text time transformers - unbound-generics unordered-containers uu-parsinglib wl-pprint-text - ]; - homepage = "http://www.clash-lang.org/"; - description = "CAES Language for Synchronous Hardware - As a Library"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "clash-lib" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, clash-prelude , concurrent-supply, containers, deepseq, directory, errors, fgl - , filepath, ghc, hashable, lens, mtl, pretty, process - , template-haskell, text, time, transformers, unbound-generics - , unordered-containers, uu-parsinglib, wl-pprint-text - }: - mkDerivation { - pname = "clash-lib"; - version = "0.6.18"; - sha256 = "84031ce63203a0e339ec64de2f8804a8721a04b8be7f14e56faa8671bbcbb9fc"; - libraryHaskellDepends = [ - aeson attoparsec base bytestring clash-prelude concurrent-supply - containers deepseq directory errors fgl filepath ghc hashable lens - mtl pretty process template-haskell text time transformers - unbound-generics unordered-containers uu-parsinglib wl-pprint-text - ]; - homepage = "http://www.clash-lang.org/"; - description = "CAES Language for Synchronous Hardware - As a Library"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "clash-lib_0_6_19" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, clash-prelude - , concurrent-supply, containers, deepseq, directory, errors, fgl , filepath, ghc, hashable, integer-gmp, lens, mtl, pretty, process , template-haskell, text, time, transformers, unbound-generics , unordered-containers, uu-parsinglib, wl-pprint-text @@ -38752,30 +38711,6 @@ self: { homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - As a Library"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "clash-prelude_0_10_9" = callPackage - ({ mkDerivation, array, base, data-default, doctest, ghc-prim - , ghc-typelits-extra, ghc-typelits-natnormalise, integer-gmp, lens - , QuickCheck, reflection, singletons, template-haskell - }: - mkDerivation { - pname = "clash-prelude"; - version = "0.10.9"; - sha256 = "4a96fa9222427df9b515c343d0db6f53441c710141a09a344ee47ab30ebacee1"; - revision = "2"; - editedCabalFile = "966a6c0c7d74ee6932671fc44d7cd1d809ef6a11523ff5caf4c4a9c13583cb80"; - libraryHaskellDepends = [ - array base data-default ghc-prim ghc-typelits-extra - ghc-typelits-natnormalise integer-gmp lens QuickCheck reflection - singletons template-haskell - ]; - testHaskellDepends = [ base doctest ]; - homepage = "http://www.clash-lang.org/"; - description = "CAES Language for Synchronous Hardware - Prelude library"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clash-prelude" = callPackage @@ -38812,26 +38747,6 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; - "clash-systemverilog_0_6_6" = callPackage - ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl - , text, unordered-containers, wl-pprint-text - }: - mkDerivation { - pname = "clash-systemverilog"; - version = "0.6.6"; - sha256 = "89afc5fb0ed8abc66412ee28a01742be14f08b11f976dd2a9efb357ae4d8840a"; - revision = "1"; - editedCabalFile = "6766cfda0bfaebd8f39b54491e1af8be77516e43923b49826c9b515fcc1d540b"; - libraryHaskellDepends = [ - base clash-lib clash-prelude fgl lens mtl text unordered-containers - wl-pprint-text - ]; - homepage = "http://www.clash-lang.org/"; - description = "CAES Language for Synchronous Hardware - SystemVerilog backend"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "clash-systemverilog" = callPackage ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl , text, unordered-containers, wl-pprint-text @@ -38849,26 +38764,6 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; - "clash-verilog_0_6_6" = callPackage - ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl - , text, unordered-containers, wl-pprint-text - }: - mkDerivation { - pname = "clash-verilog"; - version = "0.6.6"; - sha256 = "8dda7b2d72f849016fc32f563efcf59d22efc68d29f2eb2f3c8b7338701bb844"; - revision = "1"; - editedCabalFile = "d387b5796b663d97383a199d470690c93513fd4cc7e6c4a24b17c26204693c9e"; - libraryHaskellDepends = [ - base clash-lib clash-prelude fgl lens mtl text unordered-containers - wl-pprint-text - ]; - homepage = "http://www.clash-lang.org/"; - description = "CAES Language for Synchronous Hardware - Verilog backend"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "clash-verilog" = callPackage ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl , text, unordered-containers, wl-pprint-text @@ -38886,47 +38781,12 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; - "clash-vhdl_0_6_13" = callPackage - ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl - , text, unordered-containers, wl-pprint-text - }: - mkDerivation { - pname = "clash-vhdl"; - version = "0.6.13"; - sha256 = "77a702328472782f1cc878f12220a7fdacc032decd28f42e630d6e04c8b36825"; - libraryHaskellDepends = [ - base clash-lib clash-prelude fgl lens mtl text unordered-containers - wl-pprint-text - ]; - homepage = "http://www.clash-lang.org/"; - description = "CAES Language for Synchronous Hardware - VHDL backend"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "clash-vhdl" = callPackage ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl , text, unordered-containers, wl-pprint-text }: mkDerivation { pname = "clash-vhdl"; - version = "0.6.14"; - sha256 = "1a1e42191123299d9c8e0aaed7f95f81cd3059bff91321e028e9c9641dc2b0e0"; - libraryHaskellDepends = [ - base clash-lib clash-prelude fgl lens mtl text unordered-containers - wl-pprint-text - ]; - homepage = "http://www.clash-lang.org/"; - description = "CAES Language for Synchronous Hardware - VHDL backend"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "clash-vhdl_0_6_15" = callPackage - ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl - , text, unordered-containers, wl-pprint-text - }: - mkDerivation { - pname = "clash-vhdl"; version = "0.6.15"; sha256 = "9472699b6d62804093a2dea8b49da573b750c326963ff9dc4cf1ef2bfde521a8"; libraryHaskellDepends = [ @@ -38936,7 +38796,6 @@ self: { homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - VHDL backend"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "classify" = callPackage @@ -39005,8 +38864,8 @@ self: { }: mkDerivation { pname = "classy-prelude"; - version = "1.0.0"; - sha256 = "066603ee1d29d5738d34076870003d211632712251a7124983828fe4763c23b7"; + version = "1.0.0.1"; + sha256 = "3df8f7120fa540415fd83d7ddc43b9fc088cc1cefc97bc08ca32c711b636c47e"; libraryHaskellDepends = [ async base basic-prelude bifunctors bytestring chunked-data containers deepseq dlist exceptions ghc-prim hashable lifted-async @@ -39144,41 +39003,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "clckwrks_0_23_16" = callPackage - ({ mkDerivation, acid-state, aeson, aeson-qq, attoparsec, base - , blaze-html, bytestring, cereal, containers, directory, filepath - , happstack-authenticate, happstack-hsp, happstack-jmacro - , happstack-server, happstack-server-tls, hsp, hsx-jmacro, hsx2hs - , ixset, jmacro, lens, mtl, network, network-uri, old-locale - , openssl, process, random, reform, reform-happstack, reform-hsp - , safecopy, stm, text, time, time-locale-compat - , unordered-containers, userid, utf8-string, uuid-orphans - , uuid-types, vector, web-plugins, web-routes, web-routes-happstack - , web-routes-hsp, web-routes-th, xss-sanitize - }: - mkDerivation { - pname = "clckwrks"; - version = "0.23.16"; - sha256 = "17622913f530b68dcb570603a5223c31f72263a57d5be7342642d18dd41a47b6"; - libraryHaskellDepends = [ - acid-state aeson aeson-qq attoparsec base blaze-html bytestring - cereal containers directory filepath happstack-authenticate - happstack-hsp happstack-jmacro happstack-server - happstack-server-tls hsp hsx-jmacro hsx2hs ixset jmacro lens mtl - network network-uri old-locale process random reform - reform-happstack reform-hsp safecopy stm text time - time-locale-compat unordered-containers userid utf8-string - uuid-orphans uuid-types vector web-plugins web-routes - web-routes-happstack web-routes-hsp web-routes-th xss-sanitize - ]; - librarySystemDepends = [ openssl ]; - jailbreak = true; - homepage = "http://www.clckwrks.com/"; - description = "A secure, reliable content management system (CMS) and blogging platform"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) openssl;}; - "clckwrks" = callPackage ({ mkDerivation, acid-state, aeson, aeson-qq, attoparsec, base , blaze-html, bytestring, cereal, containers, directory, filepath @@ -39193,8 +39017,8 @@ self: { }: mkDerivation { pname = "clckwrks"; - version = "0.23.17"; - sha256 = "ac6134a2b6a54d08aadda1fa2251120fb034238397199c62fc50d980d143b08d"; + version = "0.23.18"; + sha256 = "48e6a3093b6c9830f9830952833d95bc1a6de742ffb38f8873b0963f8cf7ebce"; libraryHaskellDepends = [ acid-state aeson aeson-qq attoparsec base blaze-html bytestring cereal containers directory filepath happstack-authenticate @@ -39946,20 +39770,6 @@ self: { license = "unknown"; }) {}; - "cmark_0_5_2_1" = callPackage - ({ mkDerivation, base, bytestring, HUnit, text }: - mkDerivation { - pname = "cmark"; - version = "0.5.2.1"; - sha256 = "a332b84e5983bc616682cb20cf2c7ed59e16b0002bada1ccaaa381f556dd8dc8"; - libraryHaskellDepends = [ base bytestring text ]; - testHaskellDepends = [ base HUnit text ]; - homepage = "https://github.com/jgm/commonmark-hs"; - description = "Fast, accurate CommonMark (Markdown) parser and renderer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "cmark" = callPackage ({ mkDerivation, base, bytestring, HUnit, text }: mkDerivation { @@ -39978,8 +39788,8 @@ self: { }: mkDerivation { pname = "cmark-highlight"; - version = "0.1.0.0"; - sha256 = "e2575a841fe0774a466566bf896164acf86d9aa7902a3e039222b8fccbed32f9"; + version = "0.2.0.0"; + sha256 = "de769cd703d3fcd5d69428477184fad57019db55a71b1315a9bbb54317f0812b"; libraryHaskellDepends = [ base blaze-html cmark highlighting-kate text ]; @@ -39988,6 +39798,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cmark-lucid" = callPackage + ({ mkDerivation, base, cmark, lucid }: + mkDerivation { + pname = "cmark-lucid"; + version = "0.1.0.0"; + sha256 = "d2927b9fed0e32fe7afc539e7b427e0a95f8c9297bb6bc531101b476ba8a3c03"; + libraryHaskellDepends = [ base cmark lucid ]; + homepage = "http://github.com/aelve/cmark-lucid"; + description = "Use cmark with Lucid"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "cmark-sections" = callPackage + ({ mkDerivation, base, base-prelude, cmark, containers, hspec + , microlens, QuickCheck, split, text + }: + mkDerivation { + pname = "cmark-sections"; + version = "0.1.0.0"; + sha256 = "17ce46b79d6261357d390bac6a62da8de76d2e264e4fef6dc5d65dddc6689f06"; + libraryHaskellDepends = [ + base base-prelude cmark containers microlens split text + ]; + testHaskellDepends = [ + base base-prelude cmark containers hspec QuickCheck text + ]; + homepage = "http://github.com/aelve/cmark-sections"; + description = "Represent cmark-parsed Markdown as a tree of sections"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cmath" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -40195,8 +40036,8 @@ self: { ({ mkDerivation, array, base, bytestring, text }: mkDerivation { pname = "cndict"; - version = "0.8.1"; - sha256 = "75440cd6aa70bd56de500c3bb50438e8c035c5cab2603199014e69fd2c4501e6"; + version = "0.8.2"; + sha256 = "17401b89b5f1709df605808daec4147607800beedae79e172bbed794e0cd865d"; libraryHaskellDepends = [ array base bytestring text ]; homepage = "https://github.com/Lemmih/cndict"; description = "Chinese/Mandarin <-> English dictionary, Chinese lexer"; @@ -41394,8 +41235,8 @@ self: { ({ mkDerivation, base, hspec, QuickCheck }: mkDerivation { pname = "compose-ltr"; - version = "0.1.3"; - sha256 = "ebd267fc0ff418bd58d337830cf9cabab5d2d01eec59e3a1bdf82786cc8ab750"; + version = "0.2.3"; + sha256 = "f76dbb87f336da695e921f7f65913e1a5cbe7db06898d678c2310356ae9727af"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec QuickCheck ]; jailbreak = true; @@ -41451,6 +41292,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "compound-types" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "compound-types"; + version = "0.1.3.1"; + sha256 = "81c67beb0379502875e2fbec9c346db7221f598197534064a4b4bd3d4ae930f2"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/nikita-volkov/compound-types"; + description = "Sum and Product types and such"; + license = stdenv.lib.licenses.mit; + }) {}; + "compressed" = callPackage ({ mkDerivation, base, comonad, containers, fingertree, hashable , keys, pointed, reducers, semigroupoids, semigroups @@ -42155,6 +42008,41 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "conduit-find" = callPackage + ({ mkDerivation, attoparsec, base, conduit, conduit-combinators + , conduit-extra, directory, doctest, either, exceptions, filepath + , hspec, mmorph, monad-control, mtl, regex-posix, semigroups + , streaming-commons, text, time, transformers, transformers-base + , unix, unix-compat + }: + mkDerivation { + pname = "conduit-find"; + version = "0.1.0.3"; + sha256 = "498de0dc5056a2863df72b710acf571379f241ca1bd8b634dd620eddf1beeb8d"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base conduit conduit-combinators conduit-extra either + exceptions filepath mmorph monad-control mtl regex-posix semigroups + streaming-commons text time transformers transformers-base + unix-compat + ]; + executableHaskellDepends = [ + attoparsec base conduit conduit-combinators conduit-extra either + exceptions filepath mmorph monad-control mtl regex-posix semigroups + streaming-commons text time transformers transformers-base unix + ]; + testHaskellDepends = [ + attoparsec base conduit conduit-combinators directory doctest + either exceptions filepath hspec mmorph monad-control mtl + regex-posix semigroups streaming-commons text time transformers + transformers-base unix-compat + ]; + homepage = "https://github.com/erikd/conduit-find"; + description = "A file-finding conduit that allows user control over traversals"; + license = stdenv.lib.licenses.mit; + }) {}; + "conduit-iconv" = callPackage ({ mkDerivation, base, bytestring, conduit, mtl, QuickCheck , test-framework, test-framework-quickcheck2, text @@ -43850,32 +43738,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "courier_0_1_1_2" = callPackage - ({ mkDerivation, async, base, bytestring, cereal, containers - , directory, hslogger, HUnit, network, stm, test-framework - , test-framework-hunit, text, uuid - }: - mkDerivation { - pname = "courier"; - version = "0.1.1.2"; - sha256 = "1b15696197ab61fb8a675541923cbe23ee75950e43657161b2460f1897b75330"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - async base bytestring cereal containers hslogger network stm text - uuid - ]; - executableHaskellDepends = [ base cereal ]; - testHaskellDepends = [ - async base cereal containers directory hslogger HUnit network stm - test-framework test-framework-hunit - ]; - homepage = "http://github.com/hargettp/courier"; - description = "A message-passing library for simplifying network applications"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "courier" = callPackage ({ mkDerivation, async, base, bytestring, cereal, containers , directory, hslogger, HUnit, network, stm, test-framework @@ -47024,6 +46886,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "data-check" = callPackage + ({ mkDerivation, base, containers, hspec, QuickCheck }: + mkDerivation { + pname = "data-check"; + version = "0.1.0"; + sha256 = "587cd23689719faeee59c94d7ca4b79bdbe293ea43bf7e64f547160a66bc9ae7"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ base hspec QuickCheck ]; + homepage = "https://github.com/mrkkrp/data-check"; + description = "Library for checking and normalization of data (e.g. from web forms)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "data-checked" = callPackage ({ mkDerivation, base, deepseq }: mkDerivation { @@ -47385,8 +47260,8 @@ self: { }: mkDerivation { pname = "data-easy"; - version = "0.6.1"; - sha256 = "3bc1e2d63e713f7ca34cfc75df1d8e22c4cab9de1893244dc0feada11960f406"; + version = "0.7.0"; + sha256 = "301dbacdd9d89109701702b5ff3b97c007e657a1a255c8fd926146babf2726d8"; libraryHaskellDepends = [ base containers safe ]; testHaskellDepends = [ base containers directory errors haskell-src-exts hlint hspec HUnit @@ -47400,16 +47275,13 @@ self: { }) {}; "data-elf" = callPackage - ({ mkDerivation, base, binary, bytestring, data-endian, data-flags - , data-sword, text-latin1 - }: + ({ mkDerivation, base, data-flags, data-serializer, data-sword }: mkDerivation { pname = "data-elf"; - version = "0.1.0.1"; - sha256 = "33f6f3508721bafabb5cc2d1f04b262964e178883d7dbcbe3feeb8cc069e5df9"; + version = "0.2"; + sha256 = "07b24983181705980c1b772c59f87a5ba1e43c6a94d704b2aca00ba4de769d3e"; libraryHaskellDepends = [ - base binary bytestring data-endian data-flags data-sword - text-latin1 + base data-flags data-serializer data-sword ]; homepage = "https://github.com/mvv/data-elf"; description = "Executable and Linkable Format (ELF) data structures"; @@ -48100,6 +47972,25 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; + "data-serializer" = callPackage + ({ mkDerivation, base, binary, bytestring, cereal, data-endian + , parsers, tasty, tasty-quickcheck + }: + mkDerivation { + pname = "data-serializer"; + version = "0.2"; + sha256 = "1e134ab268125d0202ed95c723cd903283e8dc111918498cf27696820285a584"; + libraryHaskellDepends = [ + base binary bytestring cereal data-endian parsers + ]; + testHaskellDepends = [ + base binary bytestring cereal tasty tasty-quickcheck + ]; + homepage = "https://github.com/mvv/data-serializer"; + description = "Common API for serialization libraries"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "data-size" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, text }: mkDerivation { @@ -48195,8 +48086,8 @@ self: { }: mkDerivation { pname = "data-sword"; - version = "0.1.1"; - sha256 = "9fa52df57b18f0086a0a5e718221357e7f2a23917252648ec6b66c222ae6ce88"; + version = "0.2"; + sha256 = "57db4db48eb3bda4a8b70c781c64342241ee7d7b53f020262dc3c7506f8eec95"; libraryHaskellDepends = [ base data-bword hashable template-haskell ]; @@ -49737,8 +49628,8 @@ self: { }: mkDerivation { pname = "dejafu"; - version = "0.3.2.0"; - sha256 = "6ca48c93c962c11d8379d1809c5ab103ad45aac111c4c38a755efc203b9b2f1b"; + version = "0.3.2.1"; + sha256 = "cf3ed66e7b3cf9b45f42227d45cc6136f36b1a06744de1fba2b3aebe84d0777f"; libraryHaskellDepends = [ array atomic-primops base containers deepseq dpor exceptions monad-control monad-loops mtl semigroups stm template-haskell @@ -50548,6 +50439,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "diagrams-boolean" = callPackage + ({ mkDerivation, base, cubicbezier, diagrams-lib }: + mkDerivation { + pname = "diagrams-boolean"; + version = "0.1.0"; + sha256 = "c0b174cc23e6dc461e6ec6a68797a9552933e7d800e3e66ce85ef1ccf151b69e"; + libraryHaskellDepends = [ base cubicbezier diagrams-lib ]; + description = "boolean operations on Diagrams paths"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "diagrams-builder" = callPackage ({ mkDerivation, base, base-orphans, bytestring, cmdargs , diagrams-cairo, diagrams-lib, diagrams-postscript @@ -50866,26 +50768,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "diagrams-postscript_1_3_0_6" = callPackage - ({ mkDerivation, base, containers, data-default-class - , diagrams-core, diagrams-lib, dlist, filepath, hashable, lens - , monoid-extras, mtl, semigroups, split, statestack - }: - mkDerivation { - pname = "diagrams-postscript"; - version = "1.3.0.6"; - sha256 = "713301a1febb383287349c1a317855add01812ea12ea680a8b4a86967d935093"; - libraryHaskellDepends = [ - base containers data-default-class diagrams-core diagrams-lib dlist - filepath hashable lens monoid-extras mtl semigroups split - statestack - ]; - homepage = "http://projects.haskell.org/diagrams/"; - description = "Postscript backend for diagrams drawing EDSL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "diagrams-postscript" = callPackage ({ mkDerivation, base, containers, data-default-class , diagrams-core, diagrams-lib, dlist, filepath, hashable, lens @@ -52851,14 +52733,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dlist_0_8" = callPackage + "dlist_0_8_0_1" = callPackage ({ mkDerivation, base, Cabal, deepseq, QuickCheck }: mkDerivation { pname = "dlist"; - version = "0.8"; - sha256 = "1110fcbb197cb678452b74c7850c98b5be6c0a6bb97c33a606612d81963efd4f"; + version = "0.8.0.1"; + sha256 = "3b5d9898bd0b94190f558c8a4133a16d60d71cd5b1dc3b3347854fb3442298e6"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base Cabal QuickCheck ]; + jailbreak = true; homepage = "https://github.com/spl/dlist"; description = "Difference lists"; license = stdenv.lib.licenses.bsd3; @@ -52869,27 +52752,12 @@ self: { ({ mkDerivation, base, dlist, semigroups }: mkDerivation { pname = "dlist-instances"; - version = "0.1"; - sha256 = "2598aae775532829923d2a8f99dcaaa20e49efec31314e8460a761ee653b3264"; - revision = "1"; - editedCabalFile = "21ba4b861e244658892e61f3ca5ae4dc2aea78f46a3fcc2a8750784bf4ea6f2c"; - libraryHaskellDepends = [ base dlist semigroups ]; - homepage = "https://github.com/gregwebs/dlist-instances"; - description = "Difference lists instances"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "dlist-instances_0_1_1" = callPackage - ({ mkDerivation, base, dlist, semigroups }: - mkDerivation { - pname = "dlist-instances"; - version = "0.1.1"; - sha256 = "86b09f925a4e8a84cc3b9f8cb8c61ae396a7ca4df0fd8b27dbf529a68a003001"; + version = "0.1.1.1"; + sha256 = "d14a10c06f52fb412b2c1066d729f5534aa43204221e7ba7d81d935c44ce4f5b"; libraryHaskellDepends = [ base dlist semigroups ]; homepage = "https://github.com/gregwebs/dlist-instances"; description = "Difference lists instances"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dns" = callPackage @@ -52899,30 +52767,6 @@ self: { }: mkDerivation { pname = "dns"; - version = "2.0.3"; - sha256 = "ce364ece31f9c0ecb4255a48d4cb6b55e22778db571f0ed311a918c3f7e89aa0"; - libraryHaskellDepends = [ - attoparsec base binary blaze-builder bytestring conduit - conduit-extra containers iproute mtl network random resourcet safe - ]; - testHaskellDepends = [ - attoparsec base binary blaze-builder bytestring conduit - conduit-extra containers doctest hspec iproute mtl network random - resourcet safe word8 - ]; - doCheck = false; - testTarget = "spec"; - description = "DNS library in Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "dns_2_0_4" = callPackage - ({ mkDerivation, attoparsec, base, binary, blaze-builder - , bytestring, conduit, conduit-extra, containers, doctest, hspec - , iproute, mtl, network, random, resourcet, safe, word8 - }: - mkDerivation { - pname = "dns"; version = "2.0.4"; sha256 = "2b4fc61f4ccb440aa2b8403bff1ba00a87782e46b4261d34e6c1a5a1f1c71d6d"; libraryHaskellDepends = [ @@ -52934,10 +52778,10 @@ self: { conduit-extra containers doctest hspec iproute mtl network random resourcet safe word8 ]; + doCheck = false; testTarget = "spec"; description = "DNS library in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dnscache" = callPackage @@ -53171,6 +53015,7 @@ self: { HUnit process QuickCheck setenv silently stringbuilder syb transformers with-location ]; + doCheck = false; homepage = "https://github.com/sol/doctest#readme"; description = "Test interactive Haskell examples"; license = stdenv.lib.licenses.mit; @@ -53381,6 +53226,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dot" = callPackage + ({ mkDerivation, base, impure-containers, text }: + mkDerivation { + pname = "dot"; + version = "0.2.0"; + sha256 = "58d5e5d0848f3fa255d61a48a98e005d0c460088d6e5dc6b160ec4f0e50bb25d"; + libraryHaskellDepends = [ base impure-containers text ]; + homepage = "https://github.com/andrewthad/dot#readme"; + description = "Data types and encoding for graphviz dot files"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "dot-linker" = callPackage ({ mkDerivation, attoparsec, base, bytestring, HUnit , system-filepath, tasty, tasty-hunit, text, turtle, unix @@ -54864,8 +54721,8 @@ self: { }: mkDerivation { pname = "easyrender"; - version = "0.1.1.1"; - sha256 = "ad303ad4bc4f746564b32fe587a9c0290af2c2173a9370ec42a8b4dcdacbfe63"; + version = "0.1.1.2"; + sha256 = "303d5f310105be9afd27382134ff4d7802a899f980192953f46a9602ae2aa616"; libraryHaskellDepends = [ base bytestring containers mtl superdoc zlib ]; @@ -55224,8 +55081,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "edit-lenses-demo"; - version = "0.1"; - sha256 = "ec7a4a7265d096c84e39ccd83cfcdb573190d11340c8563879d5ceba208f7d37"; + version = "0.1.1"; + sha256 = "54ea931564d6bc92a6f6d6faf0202036f3fc5224c720b30ae9d2891015c9a474"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base ]; @@ -55628,13 +55485,12 @@ self: { }: mkDerivation { pname = "ekg-bosun"; - version = "1.0.5"; - sha256 = "3f09b8630041ff5ac96cedf03beaa51993389bc049d12b26448df0c428b56284"; + version = "1.0.6"; + sha256 = "1083f3fac91439ccd32d1d0fcdf0fd6a1885ef78c688f02082e6369dcbb5364f"; libraryHaskellDepends = [ aeson base ekg-core http-client lens network network-uri old-locale text time unordered-containers vector wreq ]; - jailbreak = true; homepage = "http://github.com/ocharles/ekg-bosun"; description = "Send ekg metrics to a Bosun instance"; license = stdenv.lib.licenses.bsd3; @@ -56251,16 +56107,16 @@ self: { "email-header" = callPackage ({ mkDerivation, attoparsec, base, base64-bytestring, bytestring - , case-insensitive, containers, QuickCheck, tasty, tasty-quickcheck - , text, text-icu, time + , case-insensitive, containers, exceptions, QuickCheck, tasty + , tasty-quickcheck, text, text-icu, time }: mkDerivation { pname = "email-header"; - version = "0.2.0"; - sha256 = "db474e1425647e860b67d3891451fec034a2149c9dd01e9b7cdee0ce746887ce"; + version = "0.4.0"; + sha256 = "16824082b726ac2cc4db2f5fe7e8ea435752c61fc432a7795ebcf024345aad52"; libraryHaskellDepends = [ attoparsec base base64-bytestring bytestring case-insensitive - containers text text-icu time + containers exceptions text text-icu time ]; testHaskellDepends = [ base bytestring case-insensitive containers QuickCheck tasty @@ -57071,13 +56927,16 @@ self: { }) {}; "equational-reasoning" = callPackage - ({ mkDerivation, base, singletons, template-haskell, void }: + ({ mkDerivation, base, containers, singletons, template-haskell + , th-desugar, void + }: mkDerivation { pname = "equational-reasoning"; - version = "0.2.0.7"; - sha256 = "8fb23a193f904527e632e0eaea89f42ad08caacbed133ac08af23e38baf32711"; - libraryHaskellDepends = [ base singletons template-haskell void ]; - jailbreak = true; + version = "0.4.0.0"; + sha256 = "1e68f9d15fdc4de5286b9b1bd7a1789f1f7b06d83dbb94ba20f824bce6c14fba"; + libraryHaskellDepends = [ + base containers singletons template-haskell th-desugar void + ]; description = "Proof assistant for Haskell using DataKinds & PolyKinds"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = [ "x86_64-darwin" ]; @@ -57555,13 +57414,14 @@ self: { }) {}; "eternal" = callPackage - ({ mkDerivation, base, base-unicode-symbols, transformers + ({ mkDerivation, base, base-unicode-symbols, Cabal, transformers , utf8-string }: mkDerivation { pname = "eternal"; - version = "0.1.4"; - sha256 = "e7224a9b8f8fa210ed3ed078a2aeec3d1ffb829df678cabfd09dc1cc749b2aac"; + version = "0.1.7"; + sha256 = "151f824cb38176f0282802e03cccfc66a9e93798aba2c272d5062c727892d6b2"; + setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base base-unicode-symbols transformers utf8-string ]; @@ -58146,29 +58006,6 @@ self: { }: mkDerivation { pname = "exceptions"; - version = "0.8.2.1"; - sha256 = "c435877ff2f04a1855e50c78bbcbf8c89f3dc42837e440956500599f6d851035"; - revision = "1"; - editedCabalFile = "0a3f64eb292941f2b9141a178b5d8ed5a9de82d2ed35b341b05c3e8e1b38c313"; - libraryHaskellDepends = [ - base mtl stm template-haskell transformers transformers-compat - ]; - testHaskellDepends = [ - base mtl QuickCheck stm template-haskell test-framework - test-framework-quickcheck2 transformers transformers-compat - ]; - homepage = "http://github.com/ekmett/exceptions/"; - description = "Extensible optionally-pure exceptions"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "exceptions_0_8_3" = callPackage - ({ mkDerivation, base, mtl, QuickCheck, stm, template-haskell - , test-framework, test-framework-quickcheck2, transformers - , transformers-compat - }: - mkDerivation { - pname = "exceptions"; version = "0.8.3"; sha256 = "4d6ad97e8e3d5dc6ce9ae68a469dc2fd3f66e9d312bc6faa7ab162eddcef87be"; libraryHaskellDepends = [ @@ -58181,7 +58018,6 @@ self: { homepage = "http://github.com/ekmett/exceptions/"; description = "Extensible optionally-pure exceptions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "executable-hash" = callPackage @@ -60196,23 +60032,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) fftw;}; - "fgl_5_5_2_3" = callPackage - ({ mkDerivation, array, base, containers, deepseq, hspec - , QuickCheck, transformers - }: - mkDerivation { - pname = "fgl"; - version = "5.5.2.3"; - sha256 = "f4113b5221917feb6389494bf8b7b6221ee00f322b6c25fc25a25795549f9e20"; - libraryHaskellDepends = [ - array base containers deepseq transformers - ]; - testHaskellDepends = [ base containers hspec QuickCheck ]; - description = "Martin Erwig's Functional Graph Library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "fgl" = callPackage ({ mkDerivation, array, base, containers, deepseq, hspec , QuickCheck, transformers @@ -60229,19 +60048,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "fgl-arbitrary_0_2_0_1" = callPackage - ({ mkDerivation, base, containers, fgl, hspec, QuickCheck }: - mkDerivation { - pname = "fgl-arbitrary"; - version = "0.2.0.1"; - sha256 = "3e85922a7dde02ee0dac8f93eb233ccb16dfdd1a5a4ec8397fa1d9f7404a6104"; - libraryHaskellDepends = [ base fgl QuickCheck ]; - testHaskellDepends = [ base containers fgl hspec QuickCheck ]; - description = "QuickCheck support for fgl"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "fgl-arbitrary" = callPackage ({ mkDerivation, base, containers, fgl, hspec, QuickCheck }: mkDerivation { @@ -62565,8 +62371,8 @@ self: { }: mkDerivation { pname = "fortran-src"; - version = "0.1.0.0"; - sha256 = "bfe476623599655d58d3a26c77ca17503c512eb1470fb1a39add1e8fd5f1120a"; + version = "0.1.0.2"; + sha256 = "c250862a13ca8f877f4e25e1ee9b34ed1ca4e381351d95db22cf5e20c2d7ae57"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -62581,6 +62387,7 @@ self: { testHaskellDepends = [ array base bytestring containers fgl hspec mtl text uniplate ]; + doHaddock = false; description = "Parser and anlyses for Fortran standards 66, 77, 90"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -64876,8 +64683,8 @@ self: { ({ mkDerivation, base, containers, ghc-prim, template-haskell }: mkDerivation { pname = "generic-deriving"; - version = "1.10.6"; - sha256 = "be129ff66c91e2e17c62e304c0f30e5e654dc7a1d9a71beaba3219a9f5d1c2fe"; + version = "1.10.7"; + sha256 = "c0d8bc935951beafb13aec33e25e2896eb0e39aba60b1eba17dbd990adae07fa"; libraryHaskellDepends = [ base containers ghc-prim template-haskell ]; @@ -65059,19 +64866,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "generics-sop_0_2_1_0" = callPackage - ({ mkDerivation, base, ghc-prim, template-haskell }: - mkDerivation { - pname = "generics-sop"; - version = "0.2.1.0"; - sha256 = "f5fcdd0e6c509d35971e851d29356f718e907ff4c1bdabe17c25308a69ea9f31"; - libraryHaskellDepends = [ base ghc-prim template-haskell ]; - testHaskellDepends = [ base ]; - description = "Generic Programming using True Sums of Products"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "generics-sop" = callPackage ({ mkDerivation, base, ghc-prim, template-haskell }: mkDerivation { @@ -65284,8 +65078,8 @@ self: { ({ mkDerivation, base, hspec, QuickCheck, validity }: mkDerivation { pname = "genvalidity"; - version = "0.2.0.0"; - sha256 = "45312a8ba7603f99f16799f0c20e4bd613104e0a4340566ec3c9cf2ca7d315fe"; + version = "0.2.0.1"; + sha256 = "b5f071c161a5720728f03998a50aac86bf298b21cd07723ef151943dac3ac447"; libraryHaskellDepends = [ base QuickCheck validity ]; testHaskellDepends = [ base hspec QuickCheck ]; homepage = "https://github.com/NorfairKing/validity#readme"; @@ -65313,8 +65107,8 @@ self: { ({ mkDerivation, base, genvalidity, hspec, QuickCheck, validity }: mkDerivation { pname = "genvalidity-hspec"; - version = "0.2.0.0"; - sha256 = "58f2b372c3997ae2bd31da8cf5f23cb7a1bc21d3824a93a144151cd0928243a3"; + version = "0.2.0.1"; + sha256 = "0757d0b3be06262b537a04efb45132e1f59629a3b3a387de014dea2d50c8713a"; libraryHaskellDepends = [ base genvalidity hspec QuickCheck validity ]; @@ -65840,7 +65634,7 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; - "ghc-exactprint" = callPackage + "ghc-exactprint_0_5_1_1" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filemanip , filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl, silently , syb @@ -65857,7 +65651,28 @@ self: { base containers directory filemanip filepath ghc ghc-boot ghc-paths HUnit mtl silently syb ]; - doHaddock = false; + description = "ExactPrint for GHC"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "ghc-exactprint" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, filemanip + , filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl, silently + , syb + }: + mkDerivation { + pname = "ghc-exactprint"; + version = "0.5.2.1"; + sha256 = "756d6d0a706321a3ccd0b3c11c6cee65b5ecce95a988dda540e4f6743a602f08"; + libraryHaskellDepends = [ + base bytestring containers directory filepath free ghc ghc-boot + ghc-paths mtl syb + ]; + testHaskellDepends = [ + base containers directory filemanip filepath ghc ghc-boot ghc-paths + HUnit mtl silently syb + ]; description = "ExactPrint for GHC"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = [ "x86_64-darwin" ]; @@ -66007,7 +65822,6 @@ self: { homepage = "http://www.mew.org/~kazu/proj/ghc-mod/"; description = "Happy Haskell Programming"; license = stdenv.lib.licenses.agpl3; - hydraPlatforms = [ "x86_64-darwin" ]; }) {}; "ghc-mtl" = callPackage @@ -66279,25 +66093,6 @@ self: { "ghc-typelits-extra" = callPackage ({ mkDerivation, base, ghc, ghc-tcplugins-extra - , ghc-typelits-natnormalise, tasty, tasty-hunit, transformers - }: - mkDerivation { - pname = "ghc-typelits-extra"; - version = "0.1.2"; - sha256 = "cd054d68809ed73338469afcafacd3955f417edcce93c1ef69b3cd6104062019"; - libraryHaskellDepends = [ - base ghc ghc-tcplugins-extra transformers - ]; - testHaskellDepends = [ - base ghc-typelits-natnormalise tasty tasty-hunit - ]; - homepage = "http://www.clash-lang.org/"; - description = "Additional type-level operations on GHC.TypeLits.Nat"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "ghc-typelits-extra_0_1_3" = callPackage - ({ mkDerivation, base, ghc, ghc-tcplugins-extra , ghc-typelits-natnormalise, integer-gmp, tasty, tasty-hunit , transformers }: @@ -66314,39 +66109,9 @@ self: { homepage = "http://www.clash-lang.org/"; description = "Additional type-level operations on GHC.TypeLits.Nat"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "ghc-typelits-natnormalise_0_4_2" = callPackage - ({ mkDerivation, base, ghc, ghc-tcplugins-extra, tasty, tasty-hunit - }: - mkDerivation { - pname = "ghc-typelits-natnormalise"; - version = "0.4.2"; - sha256 = "b9eb8337e9643c0706352d148ad160edffc01a87f8df784efde71e15f93797a8"; - libraryHaskellDepends = [ base ghc ghc-tcplugins-extra ]; - testHaskellDepends = [ base tasty tasty-hunit ]; - homepage = "http://www.clash-lang.org/"; - description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-typelits-natnormalise" = callPackage - ({ mkDerivation, base, ghc, ghc-tcplugins-extra, tasty, tasty-hunit - }: - mkDerivation { - pname = "ghc-typelits-natnormalise"; - version = "0.4.3"; - sha256 = "7dc2b7d308b49780ee7eda9a2a88b7d0df9cf88a9fc3a2c0391a28322c136b67"; - libraryHaskellDepends = [ base ghc ghc-tcplugins-extra ]; - testHaskellDepends = [ base tasty tasty-hunit ]; - homepage = "http://www.clash-lang.org/"; - description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "ghc-typelits-natnormalise_0_4_6" = callPackage ({ mkDerivation, base, ghc, ghc-tcplugins-extra, integer-gmp, tasty , tasty-hunit }: @@ -66361,7 +66126,25 @@ self: { homepage = "http://www.clash-lang.org/"; description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "ghc-typelits-presburger" = callPackage + ({ mkDerivation, base, equational-reasoning, ghc + , ghc-tcplugins-extra, presburger, reflection + }: + mkDerivation { + pname = "ghc-typelits-presburger"; + version = "0.1.0.0"; + sha256 = "b1680ec1b8c0d687f3212b17028e199cbcb74cfdeb7810cf032b84c37db96e57"; + revision = "6"; + editedCabalFile = "36bbf66eb11f1937d0c389922c9d515705a35ec86f6a4f9ca796de0602d66df4"; + libraryHaskellDepends = [ + base equational-reasoning ghc ghc-tcplugins-extra presburger + reflection + ]; + homepage = "https://github.com/konn/ghc-typelits-presburger#readme"; + description = "Presburger Arithmetic Solver for GHC Type-level natural numbers"; + license = stdenv.lib.licenses.bsd3; }) {}; "ghc-vis" = callPackage @@ -66528,12 +66311,12 @@ self: { }) {}; "ghcjs-ajax" = callPackage - ({ mkDerivation, base, http-types, text }: + ({ mkDerivation, aeson, base, http-types, text }: mkDerivation { pname = "ghcjs-ajax"; - version = "0.1.0.0"; - sha256 = "c6108172d6626c120ad2f5af3e5cb9f36821ac04c3d382214149eff39f4b9643"; - libraryHaskellDepends = [ base http-types text ]; + version = "0.2.0.0"; + sha256 = "865da70c859da72171d6adbbf8a55023ed2f625d1fbcc0838921217bdaa5c279"; + libraryHaskellDepends = [ aeson base http-types text ]; homepage = "https://github.com/agrafix/ghcjs-ajax#readme"; description = "Crossbrowser AJAX Bindings for GHCJS"; license = stdenv.lib.licenses.mit; @@ -66804,7 +66587,7 @@ self: { ]; libraryPkgconfigDepends = [ cairo gobjectIntrospection ]; doHaddock = false; - preConfigure = "export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0"; + preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0''; preCompileBuildDriver = '' PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig" setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" @@ -66830,7 +66613,7 @@ self: { ]; libraryPkgconfigDepends = [ cairo gobjectIntrospection ]; doHaddock = false; - preConfigure = "export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0"; + preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0''; preCompileBuildDriver = '' PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig" setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" @@ -66842,9 +66625,9 @@ self: { }) {inherit (pkgs) cairo; inherit (pkgs) gobjectIntrospection;}; "gi-gdk" = callPackage - ({ mkDerivation, base, bytestring, containers, gdk3, gi-cairo - , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, haskell-gi - , haskell-gi-base, text, transformers + ({ mkDerivation, base, bytestring, containers, gi-cairo + , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk3 + , haskell-gi, haskell-gi-base, text, transformers }: mkDerivation { pname = "gi-gdk"; @@ -66854,17 +66637,18 @@ self: { base bytestring containers gi-cairo gi-gdkpixbuf gi-gio gi-glib gi-gobject gi-pango haskell-gi haskell-gi-base text transformers ]; - libraryPkgconfigDepends = [ gdk3 ]; + libraryPkgconfigDepends = [ gtk3 ]; doHaddock = false; + preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gtk3.dev}/share/gir-1.0''; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Gdk bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {gdk3 = null;}; + }) {gtk3 = pkgs.gnome3.gtk;}; "gi-gdk_3_0_6" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gdk3 - , gi-cairo, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango + ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo + , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk3 , haskell-gi, haskell-gi-base, text, transformers }: mkDerivation { @@ -66876,18 +66660,19 @@ self: { base bytestring containers gi-cairo gi-gdkpixbuf gi-gio gi-glib gi-gobject gi-pango haskell-gi-base text transformers ]; - libraryPkgconfigDepends = [ gdk3 ]; + libraryPkgconfigDepends = [ gtk3 ]; doHaddock = false; + preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gtk3.dev}/share/gir-1.0''; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Gdk bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {gdk3 = null;}; + }) {gtk3 = pkgs.gnome3.gtk;}; "gi-gdkpixbuf" = callPackage ({ mkDerivation, base, bytestring, containers, gdk_pixbuf, gi-gio - , gi-glib, gi-gobject, haskell-gi, haskell-gi-base, text - , transformers + , gi-glib, gi-gobject, gobjectIntrospection, haskell-gi + , haskell-gi-base, text, transformers }: mkDerivation { pname = "gi-gdkpixbuf"; @@ -66897,18 +66682,23 @@ self: { base bytestring containers gi-gio gi-glib gi-gobject haskell-gi haskell-gi-base text transformers ]; - libraryPkgconfigDepends = [ gdk_pixbuf ]; + libraryPkgconfigDepends = [ gdk_pixbuf gobjectIntrospection ]; doHaddock = false; + preConfigure = '' + export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0:${gdk_pixbuf.dev}/share/gir-1.0 + export GI_TYPELIB_PATH=${gdk_pixbuf.out}/lib/girepository-1.0 + ''; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GdkPixbuf bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) gdk_pixbuf;}; + }) {inherit (pkgs) gdk_pixbuf; + inherit (pkgs) gobjectIntrospection;}; "gi-gdkpixbuf_2_0_6" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gdk_pixbuf - , gi-gio, gi-glib, gi-gobject, haskell-gi, haskell-gi-base, text - , transformers + , gi-gio, gi-glib, gi-gobject, gobjectIntrospection, haskell-gi + , haskell-gi-base, text, transformers }: mkDerivation { pname = "gi-gdkpixbuf"; @@ -66919,13 +66709,18 @@ self: { base bytestring containers gi-gio gi-glib gi-gobject haskell-gi-base text transformers ]; - libraryPkgconfigDepends = [ gdk_pixbuf ]; + libraryPkgconfigDepends = [ gdk_pixbuf gobjectIntrospection ]; doHaddock = false; + preConfigure = '' + export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0:${gdk_pixbuf.dev}/share/gir-1.0 + export GI_TYPELIB_PATH=${gdk_pixbuf.out}/lib/girepository-1.0 + ''; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GdkPixbuf bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) gdk_pixbuf;}; + }) {inherit (pkgs) gdk_pixbuf; + inherit (pkgs) gobjectIntrospection;}; "gi-gio" = callPackage ({ mkDerivation, base, bytestring, containers, gi-glib, gi-gobject @@ -66942,7 +66737,7 @@ self: { ]; libraryPkgconfigDepends = [ glib gobjectIntrospection ]; doHaddock = false; - preConfigure = "export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0"; + preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0''; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Gio bindings"; license = stdenv.lib.licenses.lgpl21; @@ -66965,7 +66760,7 @@ self: { ]; libraryPkgconfigDepends = [ glib gobjectIntrospection ]; doHaddock = false; - preConfigure = "export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0"; + preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0''; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Gio bindings"; license = stdenv.lib.licenses.lgpl21; @@ -67009,7 +66804,7 @@ self: { ]; libraryPkgconfigDepends = [ glib gobjectIntrospection ]; doHaddock = false; - preConfigure = "export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0"; + preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0''; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GLib bindings"; license = stdenv.lib.licenses.lgpl21; @@ -67031,7 +66826,7 @@ self: { ]; libraryPkgconfigDepends = [ glib gobjectIntrospection ]; doHaddock = false; - preConfigure = "export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0"; + preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0''; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GLib bindings"; license = stdenv.lib.licenses.lgpl21; @@ -67053,7 +66848,7 @@ self: { ]; libraryPkgconfigDepends = [ glib gobjectIntrospection ]; doHaddock = false; - preConfigure = "export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0"; + preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0''; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GObject bindings"; license = stdenv.lib.licenses.lgpl21; @@ -67076,7 +66871,7 @@ self: { ]; libraryPkgconfigDepends = [ glib gobjectIntrospection ]; doHaddock = false; - preConfigure = "export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0"; + preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0''; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GObject bindings"; license = stdenv.lib.licenses.lgpl21; @@ -67187,11 +66982,12 @@ self: { ]; libraryPkgconfigDepends = [ gtk3 ]; doHaddock = false; + preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gtk3.dev}/share/gir-1.0''; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Gtk bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {gtk3 = pkgs.gnome2.gtk;}; + }) {gtk3 = pkgs.gnome3.gtk;}; "gi-gtk_3_0_6" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk @@ -67210,11 +67006,12 @@ self: { ]; libraryPkgconfigDepends = [ gtk3 ]; doHaddock = false; + preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gtk3.dev}/share/gir-1.0''; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Gtk bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {gtk3 = pkgs.gnome2.gtk;}; + }) {gtk3 = pkgs.gnome3.gtk;}; "gi-gtk-hs" = callPackage ({ mkDerivation, base, base-compat, containers, gi-gdk @@ -67296,7 +67093,7 @@ self: { ]; libraryPkgconfigDepends = [ javascriptcoregtk webkitgtk ]; doHaddock = false; - preConfigure = "export HASKELL_GI_GIR_SEARCH_PATH=${webkitgtk}/share/gir-1.0"; + preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${webkitgtk}/share/gir-1.0''; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "JavaScriptCore bindings"; license = stdenv.lib.licenses.lgpl21; @@ -67317,7 +67114,7 @@ self: { ]; libraryPkgconfigDepends = [ javascriptcoregtk webkitgtk ]; doHaddock = false; - preConfigure = "export HASKELL_GI_GIR_SEARCH_PATH=${webkitgtk}/share/gir-1.0"; + preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${webkitgtk}/share/gir-1.0''; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "JavaScriptCore bindings"; license = stdenv.lib.licenses.lgpl21; @@ -67361,7 +67158,7 @@ self: { ]; libraryPkgconfigDepends = [ gobjectIntrospection pango ]; doHaddock = false; - preConfigure = "export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0"; + preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0''; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Pango bindings"; license = stdenv.lib.licenses.lgpl21; @@ -67385,7 +67182,7 @@ self: { ]; libraryPkgconfigDepends = [ gobjectIntrospection pango ]; doHaddock = false; - preConfigure = "export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0"; + preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0''; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Pango bindings"; license = stdenv.lib.licenses.lgpl21; @@ -67553,7 +67350,7 @@ self: { ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-cairo, gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk , gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base, text - , transformers, webkit2gtk + , transformers, webkit2gtk, webkitgtk }: mkDerivation { pname = "gi-webkit2"; @@ -67565,14 +67362,15 @@ self: { gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi-base text transformers ]; - libraryPkgconfigDepends = [ webkit2gtk ]; + libraryPkgconfigDepends = [ webkit2gtk webkitgtk ]; doHaddock = false; jailbreak = true; + preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${webkitgtk}/share/gir-1.0''; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "WebKit2 bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {webkit2gtk = null;}; + }) {webkit2gtk = null; inherit (pkgs) webkitgtk;}; "gi-webkit2webextension" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gobject @@ -67633,12 +67431,13 @@ self: { "ginger" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default, filepath , http-types, mtl, parsec, safe, scientific, tasty, tasty-hunit - , text, transformers, unordered-containers, utf8-string, vector + , tasty-quickcheck, text, transformers, unordered-containers + , utf8-string, vector }: mkDerivation { pname = "ginger"; - version = "0.2.5.0"; - sha256 = "8a5e6d780b42e641d54c57513f12ef2b0193ee37f420182c3cff773dbbe566cc"; + version = "0.2.6.0"; + sha256 = "43a575e23753388fe1208bea7c1447e1c17a3b3fc6691c9a12e808f2c7882e26"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -67651,8 +67450,8 @@ self: { unordered-containers ]; testHaskellDepends = [ - aeson base bytestring data-default mtl tasty tasty-hunit text - transformers utf8-string + aeson base bytestring data-default mtl tasty tasty-hunit + tasty-quickcheck text transformers unordered-containers utf8-string ]; homepage = "https://bitbucket.org/tdammers/ginger"; description = "An implementation of the Jinja2 template language in Haskell"; @@ -67767,6 +67566,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "gipeda_0_3_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, cassava + , concurrent-output, containers, directory, extra, file-embed + , filepath, gitlib, gitlib-libgit2, scientific, shake, split + , tagged, text, transformers, unordered-containers, vector, yaml + }: + mkDerivation { + pname = "gipeda"; + version = "0.3.1"; + sha256 = "965d79f58dcad40ae67d0b4a896710a5fd81ffab163e32501ed3f5aa4f93895d"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base bytestring cassava concurrent-output containers + directory extra file-embed filepath gitlib gitlib-libgit2 + scientific shake split tagged text transformers + unordered-containers vector yaml + ]; + homepage = "https://github.com/nomeata/gipeda"; + description = "Git Performance Dashboard"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "giphy-api" = callPackage ({ mkDerivation, aeson, base, basic-prelude, bytestring, containers , directory, hspec, http-api-data, http-client, http-client-tls @@ -68241,6 +68064,7 @@ self: { base containers directory filepath hspec process temporary ]; testToolDepends = [ git ]; + jailbreak = true; homepage = "https://github.com/oswynb/git-vogue"; description = "A framework for pre-commit checks"; license = stdenv.lib.licenses.bsd3; @@ -68253,8 +68077,8 @@ self: { }: mkDerivation { pname = "gitHUD"; - version = "1.3.2"; - sha256 = "1ae533abaa42c6fdca5eef94cc0e94ae6712cf1fc1336486912dedb863c4fb06"; + version = "1.3.3"; + sha256 = "c9868144e8fd72604a79cb6543d1099b931cdd8ce527319dd1f9294850d4b2d3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl parsec process unix ]; @@ -68715,7 +68539,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "gitson" = callPackage + "gitson_0_5_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory , doctest, errors, filepath, flock, Glob, hspec, monad-control , process, transformers @@ -68735,6 +68559,31 @@ self: { homepage = "https://github.com/myfreeweb/gitson"; description = "A document store library for Git + JSON"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "gitson" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring + , conduit-combinators, conduit-extra, directory, doctest, errors + , filepath, flock, Glob, hspec, lifted-base, monad-control, process + , transformers + }: + mkDerivation { + pname = "gitson"; + version = "0.5.2"; + sha256 = "671dd6e7aa64ea0bb77e2db3d97bbce545a32c132015c81feebb3ff087ec2196"; + libraryHaskellDepends = [ + aeson aeson-pretty base base-compat bytestring conduit-combinators + conduit-extra directory errors filepath flock lifted-base + monad-control process transformers + ]; + testHaskellDepends = [ + aeson base directory doctest Glob hspec process transformers + ]; + doCheck = false; + homepage = "https://github.com/myfreeweb/gitson"; + description = "A document store library for Git + JSON"; + license = stdenv.lib.licenses.publicDomain; }) {}; "gitter" = callPackage @@ -68976,6 +68825,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "glirc" = callPackage + ({ mkDerivation, array, async, attoparsec, base, bytestring + , config-value, connection, containers, data-default-class + , directory, filepath, hashable, lens, memory, network, profunctors + , split, stm, text, text-icu, time, tls, transformers + , unordered-containers, vector, vty, x509, x509-store, x509-system + }: + mkDerivation { + pname = "glirc"; + version = "2.1"; + sha256 = "d0bb86a2d632255bce3d23b0e7e5cefd1432b9f36d986d05030460aee0e645e8"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + array async attoparsec base bytestring config-value connection + containers data-default-class directory filepath hashable lens + memory network profunctors split stm text text-icu time tls + transformers unordered-containers vector vty x509 x509-store + x509-system + ]; + description = "Console IRC client"; + license = stdenv.lib.licenses.isc; + }) {}; + "gll" = callPackage ({ mkDerivation, array, base, containers, pretty, regex-applicative , text, TypeCompose @@ -69107,8 +68980,8 @@ self: { }: mkDerivation { pname = "gloss"; - version = "1.10.2.2"; - sha256 = "d8a43a02c8b82481c9b33c3c71e007afca2fd98a3d048b1b4a161cdbd8fab707"; + version = "1.10.2.3"; + sha256 = "33d457f0b01c844abf50687a8c0d060df5c6b1177da6236ae39561491f7a7210"; libraryHaskellDepends = [ base bmp bytestring containers ghc-prim gloss-rendering GLUT OpenGL ]; @@ -69136,8 +69009,8 @@ self: { ({ mkDerivation, base, containers, ghc-prim, gloss }: mkDerivation { pname = "gloss-algorithms"; - version = "1.10.2.1"; - sha256 = "ae4b966823ad5b3864b6cdb1b62e027e219d49c23e45d1ad2b6853454c65a32e"; + version = "1.10.2.3"; + sha256 = "8874065cdd7184ebf0fea50543ad31de6bca8f9d264e018f9d8a458e8bdbc675"; libraryHaskellDepends = [ base containers ghc-prim gloss ]; homepage = "http://gloss.ouroborus.net"; description = "Data structures and algorithms for working with 2D graphics"; @@ -69179,8 +69052,8 @@ self: { }: mkDerivation { pname = "gloss-examples"; - version = "1.10.2.1"; - sha256 = "b690a043d11d111a709a0ab6fb183a0f1618e61958e70853adf1e99914c8aa9e"; + version = "1.10.2.3"; + sha256 = "0d25bd4a7ae5f69f68175476647d7d2dbfa987ebe33419166ff312b88c527df3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -69234,8 +69107,8 @@ self: { }: mkDerivation { pname = "gloss-raster"; - version = "1.10.2.1"; - sha256 = "7485e0fca77a1ba40cb0064d9dcbb53624a40c0e5fb8124d3f077271d63262bb"; + version = "1.10.2.3"; + sha256 = "28485da7f90e37c778acba0232f3bba47a796dc62ed9cc02ebc43c7ddd7875b1"; libraryHaskellDepends = [ base containers ghc-prim gloss gloss-rendering repa ]; @@ -69266,8 +69139,8 @@ self: { ({ mkDerivation, base, bmp, bytestring, containers, GLUT, OpenGL }: mkDerivation { pname = "gloss-rendering"; - version = "1.10.3.1"; - sha256 = "c39f51b8b026f717e9469716ec0afa17aa7804eb6794a3d0c3eb712b8d8404ba"; + version = "1.10.3.3"; + sha256 = "ca559268107524c8ac73f7bd4ea164e26fe5426bff49b457276ff04fce872567"; libraryHaskellDepends = [ base bmp bytestring containers GLUT OpenGL ]; @@ -69526,17 +69399,19 @@ self: { "gnss-converters" = callPackage ({ mkDerivation, base, basic-prelude, binary-conduit, bytestring - , conduit, conduit-extra, extra, HUnit-approx, lens, resourcet - , rtcm, sbp, tasty, tasty-hunit, time, unordered-containers + , conduit, conduit-extra, exceptions, extra, HUnit-approx, lens + , monad-control, mtl, random, resourcet, rtcm, sbp, tasty + , tasty-hunit, time, transformers-base, unordered-containers }: mkDerivation { pname = "gnss-converters"; - version = "0.1.11"; - sha256 = "30b908f69abc9fceb6b0b510ef764b9ae26020b7e6d1ffeaf7f6582b401c9542"; + version = "0.1.15"; + sha256 = "4fd123578ac8037646072ce98ae2b0d34269fbc27649922b377a398fd3cb28cc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base basic-prelude conduit-extra extra lens rtcm sbp time + base basic-prelude conduit-extra exceptions extra lens + monad-control mtl random resourcet rtcm sbp time transformers-base unordered-containers ]; executableHaskellDepends = [ @@ -69544,7 +69419,7 @@ self: { ]; testHaskellDepends = [ base basic-prelude binary-conduit bytestring conduit conduit-extra - HUnit-approx lens resourcet sbp tasty tasty-hunit + HUnit-approx lens resourcet rtcm sbp tasty tasty-hunit unordered-containers ]; homepage = "http://github.com/swift-nav/gnss-converters"; @@ -69711,13 +69586,12 @@ self: { }: mkDerivation { pname = "goatee"; - version = "0.3.1.1"; - sha256 = "88837cda9add9a05ca6f8bf8c0547f6cc629253f6e033b198e27142735074ce2"; + version = "0.3.1.2"; + sha256 = "a9a1332749575de3b300b83b1b5109916252cb2024a21f1b8b22597f0227e1d3"; libraryHaskellDepends = [ base containers mtl parsec template-haskell ]; testHaskellDepends = [ base containers HUnit mtl parsec ]; - jailbreak = true; homepage = "http://khumba.net/projects/goatee"; description = "A monadic take on a 2,500-year-old board game - library"; license = stdenv.lib.licenses.agpl3; @@ -72147,29 +72021,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "graphviz_2999_18_1_0" = callPackage - ({ mkDerivation, base, bytestring, colour, containers, directory - , dlist, fgl, fgl-arbitrary, filepath, polyparse, process - , QuickCheck, temporary, text, transformers, wl-pprint-text - }: - mkDerivation { - pname = "graphviz"; - version = "2999.18.1.0"; - sha256 = "fe3575744144337ad0339a8c6aa10e93197444f8c93a359865d8b2e06b68e19f"; - libraryHaskellDepends = [ - base bytestring colour containers directory dlist fgl filepath - polyparse process temporary text transformers wl-pprint-text - ]; - testHaskellDepends = [ - base containers fgl fgl-arbitrary filepath QuickCheck text - ]; - doCheck = false; - homepage = "http://projects.haskell.org/graphviz/"; - description = "Bindings to Graphviz for graph visualisation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "graphviz" = callPackage ({ mkDerivation, base, bytestring, colour, containers, directory , dlist, fgl, fgl-arbitrary, filepath, polyparse, process @@ -72177,28 +72028,6 @@ self: { }: mkDerivation { pname = "graphviz"; - version = "2999.18.1.1"; - sha256 = "059de2521e36fd6b43b387113d6617da5949c8638be829a31b2d62d87ed4fe61"; - libraryHaskellDepends = [ - base bytestring colour containers directory dlist fgl filepath - polyparse process temporary text transformers wl-pprint-text - ]; - testHaskellDepends = [ - base containers fgl fgl-arbitrary filepath QuickCheck text - ]; - doCheck = false; - homepage = "http://projects.haskell.org/graphviz/"; - description = "Bindings to Graphviz for graph visualisation"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "graphviz_2999_18_1_2" = callPackage - ({ mkDerivation, base, bytestring, colour, containers, directory - , dlist, fgl, fgl-arbitrary, filepath, polyparse, process - , QuickCheck, temporary, text, transformers, wl-pprint-text - }: - mkDerivation { - pname = "graphviz"; version = "2999.18.1.2"; sha256 = "b08c2026d3810c15f6ad49a07fd7b879978d958fa477b369b719ec00741c85fc"; libraryHaskellDepends = [ @@ -72208,10 +72037,10 @@ self: { testHaskellDepends = [ base containers fgl fgl-arbitrary filepath QuickCheck text ]; + doCheck = false; homepage = "http://projects.haskell.org/graphviz/"; description = "Bindings to Graphviz for graph visualisation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "grasp" = callPackage @@ -72992,7 +72821,7 @@ self: { }) {gtk-mac-integration-gtk2 = null;}; "gtk-serialized-event" = callPackage - ({ mkDerivation, array, base, containers, gdk2, glib, gtk + ({ mkDerivation, array, base, containers, glib, gtk, gtk2 , haskell98, mtl }: mkDerivation { @@ -73002,13 +72831,13 @@ self: { libraryHaskellDepends = [ array base containers glib gtk haskell98 mtl ]; - libraryPkgconfigDepends = [ gdk2 ]; + libraryPkgconfigDepends = [ gtk2 ]; jailbreak = true; homepage = "http://www.haskell.org/gtk2hs/"; description = "GTK+ Serialized event"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {gdk2 = null;}; + }) {gtk2 = pkgs.gnome2.gtk;}; "gtk-simple-list-view" = callPackage ({ mkDerivation, base, gtk }: @@ -74642,7 +74471,6 @@ self: { base bytestring Cabal containers HUnit network-uri QuickCheck tar tasty tasty-hunit tasty-quickcheck temporary time zlib ]; - doCheck = false; homepage = "https://github.com/well-typed/hackage-security"; description = "Hackage security library"; license = stdenv.lib.licenses.bsd3; @@ -74908,6 +74736,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "haddock_2_16_1" = callPackage + ({ mkDerivation, base, Cabal, directory, filepath, haddock-api + , process + }: + mkDerivation { + pname = "haddock"; + version = "2.16.1"; + sha256 = "46ecd130cb5ad2b5c7452c843f9b75e976f1416d1cf17e6436d65c2c0bdbd6d6"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base haddock-api ]; + testHaskellDepends = [ base Cabal directory filepath process ]; + jailbreak = true; + doCheck = false; + preCheck = "unset GHC_PACKAGE_PATH"; + homepage = "http://www.haskell.org/haddock/"; + description = "A documentation-generation tool for Haskell libraries"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haddock" = callPackage ({ mkDerivation, base, filepath, haddock-api, hspec }: mkDerivation { @@ -76334,36 +76183,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "happstack-authenticate_2_3_4_2" = callPackage - ({ mkDerivation, acid-state, aeson, authenticate, base - , base64-bytestring, boomerang, bytestring, containers - , data-default, email-validate, filepath, happstack-hsp - , happstack-jmacro, happstack-server, hsp, hsx-jmacro, hsx2hs - , http-conduit, http-types, ixset-typed, jmacro, jwt, lens - , mime-mail, mtl, pwstore-purehaskell, random, safecopy - , shakespeare, text, time, unordered-containers, userid, web-routes - , web-routes-boomerang, web-routes-happstack, web-routes-hsp - , web-routes-th - }: - mkDerivation { - pname = "happstack-authenticate"; - version = "2.3.4.2"; - sha256 = "53a20c001ea7aed653923c8449ab19656c967d9b892c7689d9b8b2535df8e456"; - libraryHaskellDepends = [ - acid-state aeson authenticate base base64-bytestring boomerang - bytestring containers data-default email-validate filepath - happstack-hsp happstack-jmacro happstack-server hsp hsx-jmacro - hsx2hs http-conduit http-types ixset-typed jmacro jwt lens - mime-mail mtl pwstore-purehaskell random safecopy shakespeare text - time unordered-containers userid web-routes web-routes-boomerang - web-routes-happstack web-routes-hsp web-routes-th - ]; - homepage = "http://www.happstack.com/"; - description = "Happstack Authentication Library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "happstack-authenticate" = callPackage ({ mkDerivation, acid-state, aeson, authenticate, base , base64-bytestring, boomerang, bytestring, containers @@ -77253,8 +77072,8 @@ self: { }: mkDerivation { pname = "hascar"; - version = "0.2.0.1"; - sha256 = "5ef1d2278594fb13875421c882ce04aadbffd764ab789c99dbee4d6e47a85365"; + version = "0.2.0.2"; + sha256 = "3ad50a9349ea6e9df26cb452adf56fd059eea4ed2a254d15b6fd1ab63e345c42"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -78352,6 +78171,7 @@ self: { base containers filemanip filepath haskell-src-exts mtl pretty-show tasty tasty-golden traverse-with-class ]; + doCheck = false; homepage = "http://documentup.com/haskell-suite/haskell-names"; description = "Name resolution library for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -78670,6 +78490,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haskell-src-exts_1_18_2" = callPackage + ({ mkDerivation, array, base, containers, cpphs, directory + , filepath, ghc-prim, happy, mtl, pretty, pretty-show, smallcheck + , tasty, tasty-golden, tasty-smallcheck + }: + mkDerivation { + pname = "haskell-src-exts"; + version = "1.18.2"; + sha256 = "31583804dcec5c200bcf184db8a2eb33fdcc3354b011c6485370be63b2710943"; + libraryHaskellDepends = [ array base cpphs ghc-prim pretty ]; + libraryToolDepends = [ happy ]; + testHaskellDepends = [ + base containers directory filepath mtl pretty-show smallcheck tasty + tasty-golden tasty-smallcheck + ]; + homepage = "https://github.com/haskell-suite/haskell-src-exts"; + description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-src-exts-qq" = callPackage ({ mkDerivation, base, haskell-src-exts, haskell-src-meta, hspec , syb, template-haskell @@ -79583,6 +79424,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskintex_0_7_0_0" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, directory + , filepath, haskell-src-exts, HaTeX, hint, parsec, process, text + , transformers + }: + mkDerivation { + pname = "haskintex"; + version = "0.7.0.0"; + sha256 = "99523779fa18e2a6565b9603ae5c8c6a079dbaa2c315188a5ac05ebbd384a591"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring containers directory filepath + haskell-src-exts HaTeX hint parsec process text transformers + ]; + executableHaskellDepends = [ base ]; + jailbreak = true; + homepage = "http://daniel-diaz.github.io/projects/haskintex"; + description = "Haskell Evaluation inside of LaTeX code"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskmon" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, http-streams , io-streams, time, vector @@ -80062,37 +79926,6 @@ self: { license = stdenv.lib.licenses.mit; }) {inherit (pkgs) aspell;}; - "hasql_0_19_12" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring - , bytestring-tree-builder, contravariant, contravariant-extras - , data-default-class, dlist, either, hashable, hashtables, loch-th - , mtl, placeholders, postgresql-binary, postgresql-libpq - , profunctors, QuickCheck, quickcheck-instances, rebase, scientific - , semigroups, tasty, tasty-hunit, tasty-quickcheck - , tasty-smallcheck, text, time, transformers, uuid, vector - }: - mkDerivation { - pname = "hasql"; - version = "0.19.12"; - sha256 = "8f211a2ce98debdd31a3a0ecf835c14ceb314c1e6421924cb3f7356ad3132342"; - libraryHaskellDepends = [ - aeson attoparsec base base-prelude bytestring - bytestring-tree-builder contravariant contravariant-extras - data-default-class dlist either hashable hashtables loch-th mtl - placeholders postgresql-binary postgresql-libpq profunctors - scientific semigroups text time transformers uuid vector - ]; - testHaskellDepends = [ - data-default-class QuickCheck quickcheck-instances rebase tasty - tasty-hunit tasty-quickcheck tasty-smallcheck - ]; - doCheck = false; - homepage = "https://github.com/nikita-volkov/hasql"; - description = "A very efficient PostgreSQL driver and a flexible mapping API"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hasql" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring , bytestring-tree-builder, contravariant, contravariant-extras @@ -80104,8 +79937,8 @@ self: { }: mkDerivation { pname = "hasql"; - version = "0.19.13"; - sha256 = "f58a3b5b7cd8c674a1b0735b6d3e43ca5d932e66124446eed2270a749ab2b114"; + version = "0.19.14"; + sha256 = "e30cfa9d2d037927937ffabf489acef88412f30e3b122de6324e09503c957a35"; libraryHaskellDepends = [ aeson attoparsec base base-prelude bytestring bytestring-tree-builder contravariant contravariant-extras @@ -80117,6 +79950,7 @@ self: { data-default-class QuickCheck quickcheck-instances rebase tasty tasty-hunit tasty-quickcheck tasty-smallcheck ]; + doCheck = false; homepage = "https://github.com/nikita-volkov/hasql"; description = "A very efficient PostgreSQL driver and a flexible mapping API"; license = stdenv.lib.licenses.mit; @@ -80140,6 +79974,47 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; + "hasql-cursor-query" = callPackage + ({ mkDerivation, base, base-prelude, bytestring, contravariant + , foldl, hasql, hasql-cursor-transaction, hasql-transaction + , profunctors, QuickCheck, quickcheck-instances, rebase, tasty + , tasty-hunit, tasty-quickcheck, tasty-smallcheck + }: + mkDerivation { + pname = "hasql-cursor-query"; + version = "0.4"; + sha256 = "f1456233ced567b884edfebe2a8a4e2e8367bd258d850ae9811072ab86f3a55d"; + libraryHaskellDepends = [ + base base-prelude bytestring contravariant foldl hasql + hasql-cursor-transaction hasql-transaction profunctors + ]; + testHaskellDepends = [ + foldl hasql QuickCheck quickcheck-instances rebase tasty + tasty-hunit tasty-quickcheck tasty-smallcheck + ]; + homepage = "https://github.com/nikita-volkov/hasql-cursor-query"; + description = "A declarative abstraction over PostgreSQL Cursor"; + license = stdenv.lib.licenses.mit; + }) {}; + + "hasql-cursor-transaction" = callPackage + ({ mkDerivation, base, base-prelude, bytestring + , bytestring-tree-builder, contravariant, hasql, hasql-transaction + , transformers + }: + mkDerivation { + pname = "hasql-cursor-transaction"; + version = "0.5.0.1"; + sha256 = "6e4a064b2d108ba5d94250045faa347f07b9337849438c09b2f8cb5466ac5465"; + libraryHaskellDepends = [ + base base-prelude bytestring bytestring-tree-builder contravariant + hasql hasql-transaction transformers + ]; + homepage = "https://github.com/nikita-volkov/hasql-cursor-transaction"; + description = "An abstraction for simultaneous fetching from multiple PostgreSQL cursors"; + license = stdenv.lib.licenses.mit; + }) {}; + "hasql-optparse-applicative" = callPackage ({ mkDerivation, base-prelude, hasql, hasql-pool , optparse-applicative @@ -81151,7 +81026,7 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {bluetooth = null; inherit (pkgs) cwiid;}; - "hdaemonize" = callPackage + "hdaemonize_0_5_0_2" = callPackage ({ mkDerivation, base, extensible-exceptions, filepath, hsyslog , mtl, unix }: @@ -81169,6 +81044,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hdaemonize" = callPackage + ({ mkDerivation, base, bytestring, extensible-exceptions, filepath + , hsyslog, mtl, unix + }: + mkDerivation { + pname = "hdaemonize"; + version = "0.5.2"; + sha256 = "1f21059958fbf6de2299b281cf269104c5e314df6ff1da852fbd1b021c44a052"; + libraryHaskellDepends = [ + base bytestring extensible-exceptions filepath hsyslog mtl unix + ]; + homepage = "http://github.com/greydot/hdaemonize"; + description = "Library to handle the details of writing daemons for UNIX"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hdaemonize-buildfix" = callPackage ({ mkDerivation, base, extensible-exceptions, filepath, hsyslog , mtl, unix @@ -81679,22 +81571,22 @@ self: { }) {}; "heckle" = callPackage - ({ mkDerivation, base, blaze-html, containers, dates, directory - , HaTeX, pandoc, pandoc-types, process, split, tagsoup, text + ({ mkDerivation, base, blaze-html, dates, directory, pandoc + , pandoc-types, process, split, tagsoup }: mkDerivation { pname = "heckle"; - version = "2.0.0.1"; - sha256 = "f5bdf2392d1a213b024dccd24da988ea9bc50ef9e2751f9d88657accdcf08fb2"; + version = "2.0.0.3"; + sha256 = "f0d4214ae4de15ba61264c8cd2ecbad5ea8c6955aba73349f230a10311978918"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base blaze-html containers dates directory HaTeX pandoc - pandoc-types process split tagsoup text + base blaze-html dates directory pandoc pandoc-types process split + tagsoup ]; jailbreak = true; homepage = "https://github.com/2016rshah/heckle"; - description = "Jekyll in Haskell"; + description = "Jekyll in Haskell (feat. LaTeX)"; license = stdenv.lib.licenses.mit; }) {}; @@ -82866,6 +82758,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hext" = callPackage + ({ mkDerivation, base, containers, text, unordered-containers }: + mkDerivation { + pname = "hext"; + version = "0.1.0.3"; + sha256 = "76e2cd8d655fead634401f65d698f2ef03617dae2bd2a6287e9f461f11861588"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers text unordered-containers + ]; + executableHaskellDepends = [ base text ]; + homepage = "https://github.com/aneksteind/hext#readme"; + description = "a text classification library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "heyefi" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, configurator , containers, directory, exceptions, filepath, HandsomeSoup, hspec @@ -83231,19 +83140,16 @@ self: { }) {}; "hgeos" = callPackage - ({ mkDerivation, base, doctest, geos_c, Glob }: + ({ mkDerivation, base, geos_c, MissingH, mtl, transformers }: mkDerivation { pname = "hgeos"; - version = "0.1.0.1"; - sha256 = "0fd5eed74db8f8aba80ad060bead52c4c27c1d84556e5fb95e1ce32f1bcf7da8"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base ]; + version = "0.1.4.0"; + sha256 = "2c2c0524c599ac0770be7c094932a4b6bcaf0521e7ecc024f0e6da9aa7f4bc66"; + libraryHaskellDepends = [ base transformers ]; librarySystemDepends = [ geos_c ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest Glob ]; + testHaskellDepends = [ base MissingH mtl transformers ]; homepage = "https://github.com/rcook/hgeos#readme"; - description = "Haskell bindings to GEOS C API"; + description = "Simple Haskell bindings to GEOS C API"; license = stdenv.lib.licenses.mit; }) {geos_c = null;}; @@ -83624,17 +83530,18 @@ self: { }) {}; "higher-leveldb" = callPackage - ({ mkDerivation, base, bytestring, cereal, data-default, hspec - , leveldb-haskell, lifted-base, monad-control, mtl, process + ({ mkDerivation, base, bytestring, cereal, data-default, exceptions + , hspec, leveldb-haskell, lifted-base, monad-control, mtl, process , resourcet, transformers, transformers-base }: mkDerivation { pname = "higher-leveldb"; - version = "0.3.1.0"; - sha256 = "b6580aef684d6c08322dc9a98f9e37273d2ffaa5a92495573d25b73321e37b65"; + version = "0.4.0.0"; + sha256 = "6d671cba2f5cd85c350e5ac847688faf955004aa980922c68c0249b012bfcc84"; libraryHaskellDepends = [ - base bytestring cereal data-default leveldb-haskell lifted-base - monad-control mtl resourcet transformers transformers-base + base bytestring cereal data-default exceptions leveldb-haskell + lifted-base monad-control mtl resourcet transformers + transformers-base ]; testHaskellDepends = [ base bytestring cereal hspec leveldb-haskell lifted-base @@ -83834,35 +83741,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hindent_4_6_3" = callPackage - ({ mkDerivation, base, containers, data-default, descriptive - , directory, ghc-prim, haskell-src-exts, hspec, monad-loops, mtl - , text, transformers - }: - mkDerivation { - pname = "hindent"; - version = "4.6.3"; - sha256 = "6b8d9d4e0c6ea04115bb555964348350c7cea5e05e66aafa1d624e75c6d5bf8e"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers data-default haskell-src-exts monad-loops mtl text - transformers - ]; - executableHaskellDepends = [ - base descriptive directory ghc-prim haskell-src-exts text - ]; - testHaskellDepends = [ - base data-default directory haskell-src-exts hspec monad-loops mtl - text - ]; - doCheck = false; - homepage = "http://www.github.com/chrisdone/hindent"; - description = "Extensible Haskell pretty printer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hindent" = callPackage ({ mkDerivation, base, containers, descriptive, directory, ghc-prim , haskell-src-exts, hspec, monad-loops, mtl, text, transformers @@ -84952,6 +84830,7 @@ self: { old-time parsec pretty-show regex-tdfa safe split test-framework test-framework-hunit time transformers uglymemo utf8-string ]; + doCheck = false; homepage = "http://hledger.org"; description = "Core data types, parsers and functionality for the hledger accounting tools"; license = "GPL"; @@ -85165,6 +85044,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hlint_1_9_36" = callPackage + ({ mkDerivation, ansi-terminal, base, cmdargs, containers, cpphs + , directory, extra, filepath, haskell-src-exts, hscolour, process + , refact, transformers, uniplate + }: + mkDerivation { + pname = "hlint"; + version = "1.9.36"; + sha256 = "dfcd31ce03590f20c1dcea4e78756329e97cccbddbf76db976b3392bd276addc"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base cmdargs containers cpphs directory extra + filepath haskell-src-exts hscolour process refact transformers + uniplate + ]; + executableHaskellDepends = [ base ]; + jailbreak = true; + homepage = "https://github.com/ndmitchell/hlint#readme"; + description = "Source code suggestions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hlogger" = callPackage ({ mkDerivation, base, old-locale, time }: mkDerivation { @@ -86234,6 +86137,30 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; + "homplexity_0_4_3_4" = callPackage + ({ mkDerivation, base, containers, cpphs, deepseq, directory + , filepath, happy, haskell-src-exts, hflags, template-haskell + , uniplate + }: + mkDerivation { + pname = "homplexity"; + version = "0.4.3.4"; + sha256 = "49620a1746c1e29d069028806da2b2d694e65e7407227d02ca5640cfcb4d3be7"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base containers cpphs deepseq directory filepath haskell-src-exts + hflags template-haskell uniplate + ]; + executableToolDepends = [ happy ]; + testHaskellDepends = [ base haskell-src-exts uniplate ]; + jailbreak = true; + homepage = "https://github.com/mgajda/homplexity"; + description = "Haskell code quality tool"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "honi" = callPackage ({ mkDerivation, base, bytestring, freenect, hspec, HUnit, OpenNI2 , text @@ -86348,8 +86275,8 @@ self: { }: mkDerivation { pname = "hoodle"; - version = "0.4.0"; - sha256 = "b8ea55295da7902ae272f26c6473dc36ee5481deeca1eb9b8b263c05d78ff579"; + version = "0.5"; + sha256 = "051f80685b81a75cf0890dd96be703de6f8d7c9ae7487c3856b6feca71ac1de6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -86369,8 +86296,8 @@ self: { }: mkDerivation { pname = "hoodle-builder"; - version = "0.3.0"; - sha256 = "a76ef986e072c7334fe7359c80043481fc96d01211b818ad7fc5bd1adc1b8a3c"; + version = "0.4"; + sha256 = "f350ef1032d6052290d5bd228758564a6f5972808eedaa15878746fb65e3ac04"; libraryHaskellDepends = [ base blaze-builder bytestring double-conversion hoodle-types lens strict text @@ -86382,30 +86309,29 @@ self: { "hoodle-core" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, attoparsec, base - , base64-bytestring, binary, bytestring, cairo, case-insensitive - , cereal, configurator, containers, coroutine-object, Diff - , directory, either, errors, filepath, fsnotify, gd, gtk - , handa-gdata, hoodle-builder, hoodle-parser, hoodle-publish - , hoodle-render, hoodle-types, http-types, lens, libX11, libXi - , monad-loops, mtl, network-uri, old-locale, pango, poppler - , process, pureMD5, stm, strict, svgcairo, system-filepath - , template-haskell, text, time, transformers, transformers-free - , unordered-containers, uuid, vector, websockets, xournal-parser + , base64-bytestring, binary, bytestring, cairo, cereal + , configurator, containers, coroutine-object, Diff, directory + , either, errors, filepath, fsnotify, gd, gtk3, hoodle-builder + , hoodle-parser, hoodle-publish, hoodle-render, hoodle-types + , http-types, lens, libX11, libXi, monad-loops, mtl, network-uri + , pango, poppler, process, pureMD5, stm, strict, svgcairo + , system-filepath, template-haskell, text, time, transformers + , transformers-free, unordered-containers, uuid, vector + , xournal-parser }: mkDerivation { pname = "hoodle-core"; - version = "0.15.0"; - sha256 = "330f355427738c2f3407982658a607a4e1bc0dfdd23deb056dc3926d173c0010"; + version = "0.16.0"; + sha256 = "6a92a9946102d3d340a4383c3a9d679033e6640abcdd905c4176ae5c7a4a3eec"; libraryHaskellDepends = [ aeson aeson-pretty array attoparsec base base64-bytestring binary - bytestring cairo case-insensitive cereal configurator containers - coroutine-object Diff directory either errors filepath fsnotify gd - gtk handa-gdata hoodle-builder hoodle-parser hoodle-publish - hoodle-render hoodle-types http-types lens monad-loops mtl - network-uri old-locale pango poppler process pureMD5 stm strict - svgcairo system-filepath template-haskell text time transformers - transformers-free unordered-containers uuid vector websockets - xournal-parser + bytestring cairo cereal configurator containers coroutine-object + Diff directory either errors filepath fsnotify gd gtk3 + hoodle-builder hoodle-parser hoodle-publish hoodle-render + hoodle-types http-types lens monad-loops mtl network-uri pango + poppler process pureMD5 stm strict svgcairo system-filepath + template-haskell text time transformers transformers-free + unordered-containers uuid vector xournal-parser ]; librarySystemDepends = [ libX11 libXi ]; homepage = "http://ianwookim.org/hoodle"; @@ -86442,17 +86368,17 @@ self: { }) {}; "hoodle-parser" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers, either - , hoodle-types, lens, mtl, strict, text, transformers - , xournal-types + ({ mkDerivation, attoparsec, base, bytestring, containers + , directory, either, hoodle-types, lens, mtl, strict, text + , transformers, xournal-types }: mkDerivation { pname = "hoodle-parser"; - version = "0.3.0"; - sha256 = "4f946ad314df7fff43a83ce292228b8aa5aaf1d1d9d79d59e2c431a599e9e762"; + version = "0.4"; + sha256 = "2e8c05e4c4d66a35a833a5a35d7c91c33a183c4e24861c7367fb5c54b488517a"; libraryHaskellDepends = [ - attoparsec base bytestring containers either hoodle-types lens mtl - strict text transformers xournal-types + attoparsec base bytestring containers directory either hoodle-types + lens mtl strict text transformers xournal-types ]; homepage = "http://ianwookim.org/hoodle"; description = "Hoodle file parser"; @@ -86462,25 +86388,25 @@ self: { "hoodle-publish" = callPackage ({ mkDerivation, attoparsec, base, bytestring, cairo, cmdargs - , containers, directory, directory-tree, filepath, gtk + , containers, directory, directory-tree, filepath, gtk3 , hoodle-parser, hoodle-render, hoodle-types, HTTP, io-streams , lens, mtl, network-uri, pdf-toolbox-core, pdf-toolbox-document , process, transformers, unordered-containers, uuid }: mkDerivation { pname = "hoodle-publish"; - version = "0.2.0"; - sha256 = "b5283d38c5e6ea5708650922538008d0026828e9bd037d6b6af101001cf1a2db"; + version = "0.2.1"; + sha256 = "5de77eb3a3ab92b61a7018345c8a94e86c6d4df74849504487edc9e1d57613bf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ attoparsec base bytestring cairo containers directory - directory-tree filepath gtk hoodle-parser hoodle-render + directory-tree filepath gtk3 hoodle-parser hoodle-render hoodle-types HTTP io-streams lens mtl network-uri pdf-toolbox-core pdf-toolbox-document process transformers unordered-containers uuid ]; executableHaskellDepends = [ - base cmdargs directory directory-tree filepath gtk + base cmdargs directory directory-tree filepath gtk3 ]; homepage = "http://ianwookim.org/hoodle"; description = "publish hoodle files as a static web site"; @@ -86490,17 +86416,17 @@ self: { "hoodle-render" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, cairo - , containers, directory, filepath, gd, gtk, hashable, hoodle-types + , containers, directory, filepath, gd, gtk3, hashable, hoodle-types , lens, monad-loops, mtl, poppler, stm, strict, svgcairo, time , transformers, unix, unordered-containers, uuid }: mkDerivation { pname = "hoodle-render"; - version = "0.5.0"; - sha256 = "910882d3bfd2b3970b71f8984b03e2ba64509561905966f6db9615495d92c010"; + version = "0.6"; + sha256 = "47070f0ace7d68e22b78ad37bc4f8420390021c371c465b93a3da15b3768d4e3"; libraryHaskellDepends = [ base base64-bytestring bytestring cairo containers directory - filepath gd gtk hashable hoodle-types lens monad-loops mtl poppler + filepath gd gtk3 hashable hoodle-types lens monad-loops mtl poppler stm strict svgcairo time transformers unix unordered-containers uuid ]; @@ -86510,15 +86436,16 @@ self: { }) {}; "hoodle-types" = callPackage - ({ mkDerivation, base, bytestring, cereal, containers, lens, mtl - , strict, text, uuid + ({ mkDerivation, aeson, base, bytestring, cereal, containers, lens + , mtl, strict, text, uuid, vector }: mkDerivation { pname = "hoodle-types"; - version = "0.3.0"; - sha256 = "253ffbd51a6c4cfd673030f4b97b55dd350e12f22e96d98a318344ab831d7d56"; + version = "0.4"; + sha256 = "1db3356172cbae0bef43a36719d669f4f82ee8e237e8a58c754489dec5ea33b6"; libraryHaskellDepends = [ - base bytestring cereal containers lens mtl strict text uuid + aeson base bytestring cereal containers lens mtl strict text uuid + vector ]; description = "Data types for programs for hoodle file format"; license = stdenv.lib.licenses.bsd3; @@ -86590,6 +86517,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hoogle_5_0_2" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, cmdargs, conduit + , conduit-extra, connection, containers, deepseq, directory, extra + , filepath, haskell-src-exts, http-conduit, http-types, js-flot + , js-jquery, mmap, network, network-uri, old-locale, process + , QuickCheck, resourcet, tar, template-haskell, text, time + , transformers, uniplate, utf8-string, vector, wai, wai-logger + , warp, warp-tls, zlib + }: + mkDerivation { + pname = "hoogle"; + version = "5.0.2"; + sha256 = "2617f06f2df2be90fc1b69f87df53936b575edd32a974f813e78b7bc155b6c82"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base binary bytestring cmdargs conduit conduit-extra + connection containers deepseq directory extra filepath + haskell-src-exts http-conduit http-types js-flot js-jquery mmap + network network-uri old-locale process QuickCheck resourcet tar + template-haskell text time transformers uniplate utf8-string vector + wai wai-logger warp warp-tls zlib + ]; + executableHaskellDepends = [ base ]; + jailbreak = true; + homepage = "http://hoogle.haskell.org/"; + description = "Haskell API Search"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hoogle-index" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, directory , errors, filepath, hoogle, optparse-applicative, process @@ -87665,6 +87623,25 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {inherit (pkgs) postgresql;}; + "hpqtypes-extras" = callPackage + ({ mkDerivation, base, base16-bytestring, bytestring, containers + , cryptohash, exceptions, fields-json, hpqtypes, lifted-base, log + , monad-control, mtl, text, text-show + }: + mkDerivation { + pname = "hpqtypes-extras"; + version = "1.2.4"; + sha256 = "3a195eba52d0454a573c5c820af3db45359bc4f7a8fd88c935f00a8496b12118"; + libraryHaskellDepends = [ + base base16-bytestring bytestring containers cryptohash exceptions + fields-json hpqtypes lifted-base log monad-control mtl text + text-show + ]; + homepage = "https://github.com/scrive/hpqtypes-extras"; + description = "Extra utilities for hpqtypes library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hprotoc_2_2_0" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , directory, filepath, haskell-src-exts, mtl, parsec @@ -90651,6 +90628,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hspecVariant" = callPackage + ({ mkDerivation, base, hspec, QuickCheckVariant }: + mkDerivation { + pname = "hspecVariant"; + version = "0.1.0.0"; + sha256 = "2ca22b48d9535b9099a38df0d26dc7bd694632e5ba0b50791450fdf540912d0c"; + libraryHaskellDepends = [ base hspec QuickCheckVariant ]; + homepage = "https://github.com/sanjorgek/hspecVariant"; + description = "Spec for testing properties for variant types"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "hspr-sh" = callPackage ({ mkDerivation, base, old-time }: mkDerivation { @@ -90789,8 +90778,8 @@ self: { }: mkDerivation { pname = "hsqml"; - version = "0.3.4.0"; - sha256 = "12a0e7dd484ee36b793cf20b3bd42efdba67dd85b7918b26917bc6f59c6f5c69"; + version = "0.3.4.1"; + sha256 = "716112897561a16031057ae9edf08056a6daf3621e9b9afeb7b980dfae38ef63"; libraryHaskellDepends = [ base containers filepath tagged text transformers ]; @@ -91797,18 +91786,19 @@ self: { }) {}; "http-api-data" = callPackage - ({ mkDerivation, base, bytestring, doctest, Glob, hspec, HUnit - , QuickCheck, text, time, time-locale-compat + ({ mkDerivation, base, bytestring, directory, doctest, filepath + , hspec, HUnit, QuickCheck, text, time, time-locale-compat }: mkDerivation { pname = "http-api-data"; - version = "0.2.3"; - sha256 = "66dae92ec5c137136a771f1050ed23a0ee923fe6c6f5ad2acabcfad20d727042"; + version = "0.2.4"; + sha256 = "6bb90863343b17b9ce6ee8cfce9a41db0b4287343aa6cf0654a3ad5c5c5e6635"; libraryHaskellDepends = [ base bytestring text time time-locale-compat ]; testHaskellDepends = [ - base doctest Glob hspec HUnit QuickCheck text time + base bytestring directory doctest filepath hspec HUnit QuickCheck + text time ]; homepage = "http://github.com/fizruk/http-api-data"; description = "Converting to/from HTTP API data like URL pieces, headers and query parameters"; @@ -92350,27 +92340,6 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; - "http-media_0_6_3" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, containers - , QuickCheck, test-framework, test-framework-quickcheck2 - }: - mkDerivation { - pname = "http-media"; - version = "0.6.3"; - sha256 = "38ac24e33a2ef0fdeb9f1c3311aa1efb4902701888fd4a590c1912aaa9b1dad6"; - libraryHaskellDepends = [ - base bytestring case-insensitive containers - ]; - testHaskellDepends = [ - base bytestring case-insensitive containers QuickCheck - test-framework test-framework-quickcheck2 - ]; - homepage = "https://github.com/zmthy/http-media"; - description = "Processing HTTP Content-Type and Accept headers"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "http-media" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , QuickCheck, test-framework, test-framework-quickcheck2 @@ -92393,17 +92362,17 @@ self: { "http-monad" = callPackage ({ mkDerivation, base, bytestring, containers, explicit-exception - , HTTP, lazyio, network, parsec, transformers, utility-ht + , HTTP, lazyio, network, network-uri, parsec, transformers + , utility-ht }: mkDerivation { pname = "http-monad"; - version = "0.1.1"; - sha256 = "e75643a34100c171050f4f9011b2120c87269ebf49f372a7005aa63a49f1ee88"; + version = "0.1.1.1"; + sha256 = "ad3ea0bc4a95cf66b442d69084f99906e79bcd431ae1c0eb0237fb1ee7276355"; libraryHaskellDepends = [ base bytestring containers explicit-exception HTTP lazyio network - parsec transformers utility-ht + network-uri parsec transformers utility-ht ]; - jailbreak = true; description = "Monad abstraction for HTTP allowing lazy transfer and non-I/O simulation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = [ "x86_64-darwin" ]; @@ -92889,20 +92858,6 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; - "human-readable-duration_0_2_0_1" = callPackage - ({ mkDerivation, base, doctest, time }: - mkDerivation { - pname = "human-readable-duration"; - version = "0.2.0.1"; - sha256 = "082524e9d29fd4cc06b75ab646df47fdd40bc95a8bf4c315806408d215ebc0b4"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest time ]; - homepage = "http://github.com/yogsototh/human-readable-duration#readme"; - description = "Provide duration helper"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "human-readable-duration" = callPackage ({ mkDerivation, base, doctest, Glob }: mkDerivation { @@ -93307,6 +93262,29 @@ self: { hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; + "hw-bits_0_0_0_8" = callPackage + ({ mkDerivation, base, bytestring, criterion, hspec, hw-prim, mmap + , parsec, QuickCheck, resourcet, vector + }: + mkDerivation { + pname = "hw-bits"; + version = "0.0.0.8"; + sha256 = "039ab7bb84f1cbb1b9ad72db2955c529622a64f267cd41d3948f165df08266cb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base bytestring hw-prim parsec vector ]; + executableHaskellDepends = [ + base criterion mmap resourcet vector + ]; + testHaskellDepends = [ + base bytestring hspec hw-prim QuickCheck vector + ]; + homepage = "http://github.com/haskell-works/hw-bits#readme"; + description = "Conduits for tokenizing streams"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-conduit" = callPackage ({ mkDerivation, array, base, bytestring, conduit, criterion, hspec , hw-bits, resourcet, word8 @@ -93376,22 +93354,22 @@ self: { }) {}; "hw-json" = callPackage - ({ mkDerivation, array, attoparsec, base, bytestring, conduit - , containers, criterion, errors, hspec, hw-bits, hw-conduit - , hw-diagnostics, hw-parser, hw-prim, hw-rankselect, mmap - , mono-traversable, parsec, QuickCheck, resourcet, text - , transformers, vector, word8 + ({ mkDerivation, ansi-wl-pprint, array, attoparsec, base + , bytestring, conduit, containers, criterion, errors, hspec + , hw-bits, hw-conduit, hw-diagnostics, hw-parser, hw-prim + , hw-rankselect, mmap, mono-traversable, parsec, QuickCheck + , resourcet, text, transformers, vector, word8 }: mkDerivation { pname = "hw-json"; - version = "0.2.0.2"; - sha256 = "823b9019ef370c5c542987b673c530979e636b6273a09f4c920d731801dcd913"; + version = "0.2.0.4"; + sha256 = "771c33414a125d75417a546aa7a9e26210541407460da61294fa3a0e05a22eed"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array attoparsec base bytestring conduit containers hw-bits - hw-conduit hw-diagnostics hw-parser hw-prim hw-rankselect mmap - mono-traversable resourcet text vector word8 + ansi-wl-pprint array attoparsec base bytestring conduit containers + hw-bits hw-conduit hw-diagnostics hw-parser hw-prim hw-rankselect + mmap mono-traversable resourcet text vector word8 ]; executableHaskellDepends = [ base bytestring conduit criterion errors hw-bits hw-conduit @@ -93477,28 +93455,8 @@ self: { }: mkDerivation { pname = "hw-prim"; - version = "0.0.3.2"; - sha256 = "c96ca6011d55419105bba7eebcae2d5afc627bdbcb4536469ba0b7a9f553c764"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base bytestring random vector ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base bytestring hspec QuickCheck random vector - ]; - homepage = "http://github.com/haskell-works/hw-prim#readme"; - description = "Primitive functions and data types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-prim_0_0_3_3" = callPackage - ({ mkDerivation, base, bytestring, hspec, QuickCheck, random - , vector - }: - mkDerivation { - pname = "hw-prim"; - version = "0.0.3.3"; - sha256 = "be98f5d9e7e8c923fe51b918ef49a2b2052a6b817fd384f76ed2d14f90005e17"; + version = "0.0.3.4"; + sha256 = "086f811f8b420aa385519f483db7bb35e0a74527f9648c1a7af2b8d5d1711d56"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring random vector ]; @@ -93509,7 +93467,6 @@ self: { homepage = "http://github.com/haskell-works/hw-prim#readme"; description = "Primitive functions and data types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-rankselect_0_0_0_2" = callPackage @@ -95120,29 +95077,29 @@ self: { "idris" = callPackage ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal - , ansi-wl-pprint, async, base, base64-bytestring, binary + , ansi-wl-pprint, array, async, base, base64-bytestring, binary , blaze-html, blaze-markup, bytestring, cheapskate, containers , deepseq, directory, filepath, fingertree, fsnotify, gmp , haskeline, ieee754, libffi, mtl, network, optparse-applicative - , parsers, pretty, process, safe, split, terminal-size, text, time - , transformers, transformers-compat, trifecta, uniplate, unix - , unordered-containers, utf8-string, vector + , parsers, pretty, process, regex-tdfa, safe, split, terminal-size + , text, time, transformers, transformers-compat, trifecta, uniplate + , unix, unordered-containers, utf8-string, vector , vector-binary-instances, zip-archive }: mkDerivation { pname = "idris"; - version = "0.12"; - sha256 = "b361dde5367a8bc96edd955ef38e26750a207a5a9980176bb4a12df62c328e72"; + version = "0.12.1"; + sha256 = "2d3e4d1768975db5f786796d0d9a98037c011a3bf7765e41b17aa585680a49bb"; configureFlags = [ "-fcurses" "-fffi" "-fgmp" ]; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson annotated-wl-pprint ansi-terminal ansi-wl-pprint async base - base64-bytestring binary blaze-html blaze-markup bytestring + aeson annotated-wl-pprint ansi-terminal ansi-wl-pprint array async + base base64-bytestring binary blaze-html blaze-markup bytestring cheapskate containers deepseq directory filepath fingertree fsnotify haskeline ieee754 libffi mtl network optparse-applicative - parsers pretty process safe split terminal-size text time - transformers transformers-compat trifecta uniplate unix + parsers pretty process regex-tdfa safe split terminal-size text + time transformers transformers-compat trifecta uniplate unix unordered-containers utf8-string vector vector-binary-instances zip-archive ]; @@ -95154,7 +95111,6 @@ self: { base containers directory filepath haskeline process time transformers ]; - jailbreak = true; homepage = "http://www.idris-lang.org/"; description = "Functional Programming Language with Dependent Types"; license = stdenv.lib.licenses.bsd3; @@ -96109,6 +96065,27 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; + "impure-containers" = callPackage + ({ mkDerivation, base, containers, ghc-prim, hashable, HUnit + , primitive, QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2, vector + }: + mkDerivation { + pname = "impure-containers"; + version = "0.3"; + sha256 = "fb0e9e0664ff60da9126b416ed6407b85d0d1cff2d9a311f8186c312d864fcb5"; + libraryHaskellDepends = [ + base containers ghc-prim hashable primitive vector + ]; + testHaskellDepends = [ + base containers HUnit QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 vector + ]; + homepage = "https://github.com/andrewthad/impure-containers#readme"; + description = "Mutable containers in haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "inc-ref" = callPackage ({ mkDerivation, base, stm }: mkDerivation { @@ -96165,15 +96142,14 @@ self: { }: mkDerivation { pname = "incremental-computing"; - version = "0.0.0.0"; - sha256 = "03efed30f17d3a2eafc72a549298368ebaf6303d3af6b65f44015b508508b87d"; + version = "0.0.1.0"; + sha256 = "7c596494b118619707bedaea799fa23b70a456c4d94188eb83a7afff4b0348f9"; libraryHaskellDepends = [ base containers dlist fingertree order-maintenance transformers ]; testHaskellDepends = [ base Cabal cabal-test-quickcheck containers QuickCheck ]; - jailbreak = true; homepage = "http://darcs.wolfgang.jeltsch.info/haskell/incremental-computing"; description = "Incremental computing"; license = stdenv.lib.licenses.bsd3; @@ -96381,6 +96357,7 @@ self: { version = "0.2"; sha256 = "b01fe384c942d57a62a6416f3a312e8436ce54a664421311b104f8f8a6982b9f"; libraryHaskellDepends = [ base bifunctors indexed mtl pointed ]; + jailbreak = true; homepage = "https://github.com/reinerp/indexed-extras"; description = "Indexed functors, monads and comonads that require extensions to Haskell98"; license = stdenv.lib.licenses.bsd3; @@ -96723,8 +96700,8 @@ self: { }: mkDerivation { pname = "inline-c"; - version = "0.5.5.4"; - sha256 = "4cd7a9dfce3866033cfe6eac1168eb2e6ddb29f6110c5de9d728c474a93a18bf"; + version = "0.5.5.5"; + sha256 = "f3d142647eaa89b6fc4833fbb5722172ab950f6ef17f186659e947b1958c7230"; libraryHaskellDepends = [ ansi-wl-pprint base binary bytestring containers cryptohash directory filepath hashable mtl parsec parsers QuickCheck @@ -96848,6 +96825,7 @@ self: { tasty-expected-failure tasty-golden tasty-hunit tasty-quickcheck template-haskell temporary text unix vector ]; + doCheck = false; homepage = "https://tweag.github.io/HaskellR"; description = "Seamlessly call R from Haskell and vice versa. No FFI required."; license = stdenv.lib.licenses.bsd3; @@ -97205,15 +97183,17 @@ self: { }) {}; "interlude-l" = callPackage - ({ mkDerivation, aeson, base, exceptions, lens, mtl, protolude - , string-conv, witherable + ({ mkDerivation, aeson, base, exceptions, lens, monad-control + , MonadRandom, mtl, protolude, string-conv, text, transformers + , witherable }: mkDerivation { pname = "interlude-l"; - version = "0.1.0.1"; - sha256 = "0128de332aa2b5520f96555921197e14db1e07990cd1ac5a05fd2618b49e9813"; + version = "0.1.0.5"; + sha256 = "23243eb47b718de5e49c3b5db730b874607793a47cfe37efba1ea284b5cd5578"; libraryHaskellDepends = [ - aeson base exceptions lens mtl protolude string-conv witherable + aeson base exceptions lens monad-control MonadRandom mtl protolude + string-conv text transformers witherable ]; jailbreak = true; description = "Prelude replacement based on protolude"; @@ -98036,24 +98016,6 @@ self: { }: mkDerivation { pname = "irc-client"; - version = "0.4.2.1"; - sha256 = "2fe59527a1403a1ad960d1f7021871c85818ca3fe50f593505efb7ccbafa1308"; - libraryHaskellDepends = [ - base bytestring conduit irc-conduit irc-ctcp old-locale stm - stm-conduit text time transformers - ]; - homepage = "https://github.com/barrucadu/irc-client"; - description = "An IRC client library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = [ "x86_64-darwin" ]; - }) {}; - - "irc-client_0_4_2_2" = callPackage - ({ mkDerivation, base, bytestring, conduit, irc-conduit, irc-ctcp - , old-locale, stm, stm-conduit, text, time, transformers - }: - mkDerivation { - pname = "irc-client"; version = "0.4.2.2"; sha256 = "adde49f71e32f9c89c7b4ec307efc1b70556ab8c04864a091ce2d05ad105ab27"; libraryHaskellDepends = [ @@ -98063,7 +98025,7 @@ self: { homepage = "https://github.com/barrucadu/irc-client"; description = "An IRC client library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = [ "x86_64-darwin" ]; }) {}; "irc-colors" = callPackage @@ -98509,12 +98471,18 @@ self: { }) {}; "isobmff-builder" = callPackage - ({ mkDerivation, base, bytestring, type-list }: + ({ mkDerivation, base, binary, bytestring, data-default, hspec + , lens, singletons, text, time, type-list, vector-sized + }: mkDerivation { pname = "isobmff-builder"; - version = "0.2.0.3"; - sha256 = "85d52ef7b203e2685936dea8891344241fab4081cd8ff2aed6650ad9a0abaccb"; - libraryHaskellDepends = [ base bytestring type-list ]; + version = "0.10.0.0"; + sha256 = "6a246c26e4ef173fafc190e6fe79cffc44c9513855d5e2d0f4710315ece1ac2d"; + libraryHaskellDepends = [ + base bytestring data-default lens singletons text time type-list + vector-sized + ]; + testHaskellDepends = [ base binary bytestring hspec text ]; homepage = "https://github.com/sheyll/isobmff-builder#readme"; description = "A (bytestring-) builder for the ISO-14496-12 base media file format"; license = stdenv.lib.licenses.bsd3; @@ -99932,6 +99900,7 @@ self: { aeson aeson-pretty base bytestring containers data-default hspec lens lens-aeson text url ]; + jailbreak = true; homepage = "https://github.com/toddmohney/json-api"; description = "Utilities for generating JSON-API payloads"; license = stdenv.lib.licenses.mit; @@ -100340,8 +100309,8 @@ self: { }: mkDerivation { pname = "json-rpc-generic"; - version = "0.1.0.0"; - sha256 = "20aee2bf91cd7e9b630282e34adb0b5ba6ae2f881aa5d3f4bd1b41536c49faa1"; + version = "0.2.0.1"; + sha256 = "92cc61f7d04c8d8d867d9b7da97c592d933c34e0da570a457cd39c4611bacd0d"; libraryHaskellDepends = [ aeson base bytestring containers dlist scientific text transformers unordered-containers vector @@ -101160,6 +101129,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "kawhi_0_2_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, exceptions, http-client + , http-conduit, http-types, mtl, safe, scientific, smallcheck + , tasty, tasty-hunit, tasty-quickcheck, tasty-smallcheck, text + }: + mkDerivation { + pname = "kawhi"; + version = "0.2.0"; + sha256 = "cbabf52a49d6f323445d9db536382fb43471a8a1065671f9d5b2073c42d53871"; + libraryHaskellDepends = [ + aeson base bytestring exceptions http-client http-conduit + http-types mtl safe scientific text + ]; + testHaskellDepends = [ + aeson base bytestring exceptions http-client http-types mtl + scientific smallcheck tasty tasty-hunit tasty-quickcheck + tasty-smallcheck text + ]; + jailbreak = true; + homepage = "https://github.com/hamsterdam/kawhi"; + description = "stats.NBA.com library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "kazura-queue" = callPackage ({ mkDerivation, async, atomic-primops, base, containers, deepseq , doctest, exceptions, free, hspec, hspec-expectations, HUnit, mtl @@ -102975,25 +102969,6 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; - "lambdacube-gl_0_5_0_5" = callPackage - ({ mkDerivation, base, bytestring, containers, JuicyPixels - , lambdacube-ir, mtl, OpenGLRaw, vector, vector-algorithms - }: - mkDerivation { - pname = "lambdacube-gl"; - version = "0.5.0.5"; - sha256 = "29f0094d25905a3c6aadc6dcfcc0c77664db589c7e30ee20e8216e40a4403250"; - libraryHaskellDepends = [ - base bytestring containers JuicyPixels lambdacube-ir mtl OpenGLRaw - vector vector-algorithms - ]; - jailbreak = true; - homepage = "http://lambdacube3d.com"; - description = "OpenGL 3.3 Core Profile backend for LambdaCube 3D"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "lambdacube-gl" = callPackage ({ mkDerivation, base, bytestring, containers, JuicyPixels , lambdacube-ir, mtl, OpenGLRaw, vector, vector-algorithms @@ -103518,28 +103493,6 @@ self: { }: mkDerivation { pname = "language-javascript"; - version = "0.6.0.7"; - sha256 = "235641c4617acaeefb98a94eda9588e121ad7539a4b0143377e8f56ded94f96c"; - libraryHaskellDepends = [ - array base blaze-builder bytestring containers mtl text utf8-string - ]; - libraryToolDepends = [ alex happy ]; - testHaskellDepends = [ - array base blaze-builder bytestring Cabal containers hspec mtl - QuickCheck utf8-light utf8-string - ]; - homepage = "http://github.com/erikd/language-javascript"; - description = "Parser for JavaScript"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "language-javascript_0_6_0_8" = callPackage - ({ mkDerivation, alex, array, base, blaze-builder, bytestring - , Cabal, containers, happy, hspec, mtl, QuickCheck, text - , utf8-light, utf8-string - }: - mkDerivation { - pname = "language-javascript"; version = "0.6.0.8"; sha256 = "98a48760012d7b9eb7625532ea1d18ee0127a18dc11ccd679717ea53151c2ab9"; libraryHaskellDepends = [ @@ -103553,7 +103506,6 @@ self: { homepage = "http://github.com/erikd/language-javascript"; description = "Parser for JavaScript"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "language-kort" = callPackage @@ -103832,8 +103784,8 @@ self: { }: mkDerivation { pname = "language-python"; - version = "0.5.3"; - sha256 = "cbc4cc08d4fa57cd774bed02b4766acb2d8ba0b80796563500e1e69e2ceb8ae2"; + version = "0.5.4"; + sha256 = "ba93508e5e7b6b3c881eb9b04f9032c2e8c5f20255d812a0a365eba82ffbf129"; libraryHaskellDepends = [ array base containers monads-tf pretty transformers utf8-string ]; @@ -103864,8 +103816,8 @@ self: { ({ mkDerivation, base, language-python }: mkDerivation { pname = "language-python-test"; - version = "0.5.3"; - sha256 = "d4501e72569036239037fa06b146aef782dd3c82374cc37fab7b7d56df9f45fa"; + version = "0.5.4"; + sha256 = "e39155a758660df916f3b0f7942a7997e1460e3071d5ef7893a5adb4bb39ed8e"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base language-python ]; @@ -104033,12 +103985,13 @@ self: { }) {}; "language-webidl" = callPackage - ({ mkDerivation, base, parsec, wl-pprint }: + ({ mkDerivation, base, HUnit, parsec, wl-pprint }: mkDerivation { pname = "language-webidl"; - version = "0.1.2.0"; - sha256 = "50be4849f64d6bfa799fafd77b89480e7342d4daf30684179dc88b8891cdce4c"; + version = "0.1.3.1"; + sha256 = "4e04013c57078e72217a60dcaf2e1e29e6ac2d219e5fd3113ac8771a771c9127"; libraryHaskellDepends = [ base parsec wl-pprint ]; + testHaskellDepends = [ base HUnit ]; description = "Parser and Pretty Printer for WebIDL"; license = stdenv.lib.licenses.mit; }) {}; @@ -104281,8 +104234,8 @@ self: { ({ mkDerivation, base, convertible, hinduce-missingh }: mkDerivation { pname = "layout"; - version = "0.0.0.1"; - sha256 = "0f483650f9d95f35aa5089135164d07187bb95d125f69bb872d110e3442f0710"; + version = "0.0.0.2"; + sha256 = "89e2053308b369d1ce1f2c64a6a9213e5a5e1e2dcc7177a89ee32b55ec21d988"; libraryHaskellDepends = [ base convertible hinduce-missingh ]; description = "Turn values into pretty text or markup"; license = stdenv.lib.licenses.bsd3; @@ -104666,20 +104619,21 @@ self: { "legion" = callPackage ({ mkDerivation, attoparsec, base, binary, binary-conduit - , bytestring, conduit, conduit-extra, containers - , data-default-class, data-dword, directory, exceptions + , bytestring, canteven-http, conduit, conduit-extra, containers + , data-default-class, data-dword, directory, exceptions, http-types , monad-logger, network, Ranged-sets, scotty, scotty-resource, stm - , text, time, transformers, unix, uuid, warp + , text, time, transformers, unix, uuid, wai, wai-extra, warp }: mkDerivation { pname = "legion"; - version = "0.1.0.0"; - sha256 = "6fd7529a009775aab6a266503482e35b83d5dd8198d30811468b69b09377a5e7"; + version = "0.1.0.1"; + sha256 = "f6f04163894726e3d636a4bf23bd427b736ce3341e5e97586c5d20aa34bae081"; libraryHaskellDepends = [ - attoparsec base binary binary-conduit bytestring conduit - conduit-extra containers data-default-class data-dword directory - exceptions monad-logger network Ranged-sets scotty scotty-resource - stm text time transformers unix uuid warp + attoparsec base binary binary-conduit bytestring canteven-http + conduit conduit-extra containers data-default-class data-dword + directory exceptions http-types monad-logger network Ranged-sets + scotty scotty-resource stm text time transformers unix uuid wai + wai-extra warp ]; jailbreak = true; homepage = "https://github.com/taphu/legion"; @@ -106145,27 +106099,6 @@ self: { }: mkDerivation { pname = "lifted-base"; - version = "0.2.3.6"; - sha256 = "57c5837d83f569bb72136ca89256e50e1ac168ee935804a8e7763e9d8322e1fb"; - libraryHaskellDepends = [ base monad-control transformers-base ]; - testHaskellDepends = [ - base HUnit monad-control test-framework test-framework-hunit - transformers transformers-base transformers-compat - ]; - jailbreak = true; - doCheck = false; - homepage = "https://github.com/basvandijk/lifted-base"; - description = "lifted IO operations from the base library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "lifted-base_0_2_3_8" = callPackage - ({ mkDerivation, base, HUnit, monad-control, test-framework - , test-framework-hunit, transformers, transformers-base - , transformers-compat - }: - mkDerivation { - pname = "lifted-base"; version = "0.2.3.8"; sha256 = "1605df810bc941951522d0cd1b777ff1d62dac6628aabed165a49b848f25df9f"; libraryHaskellDepends = [ base monad-control transformers-base ]; @@ -106173,10 +106106,10 @@ self: { base HUnit monad-control test-framework test-framework-hunit transformers transformers-base transformers-compat ]; + doCheck = false; homepage = "https://github.com/basvandijk/lifted-base"; description = "lifted IO operations from the base library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lifted-protolude" = callPackage @@ -106733,6 +106666,23 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; + "linode-v4" = callPackage + ({ mkDerivation, aeson, base, bytestring, http-conduit + , unordered-containers + }: + mkDerivation { + pname = "linode-v4"; + version = "0.1.0.1"; + sha256 = "838b407b13077d9d61bb01d96dbf0235fa5be7d5b6403eb954d318965c28b722"; + libraryHaskellDepends = [ + aeson base bytestring http-conduit unordered-containers + ]; + jailbreak = true; + homepage = "https://github.com/eatonphil/linode-haskell"; + description = "Haskell wrapper for the Linode v4 API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "linux-blkid" = callPackage ({ mkDerivation, base, blkid, monad-control, transformers , transformers-base @@ -106869,6 +106819,8 @@ self: { pname = "linux-ptrace"; version = "0.1.2"; sha256 = "75108b21c04301c3f2e9f8912fcd2e101cd0ed6bbda79c27d68b79ba938ff643"; + revision = "1"; + editedCabalFile = "104fac22d2c56d66864f68408a17a93bdaa44d268fcddb6b9e5fca155a79242a"; libraryHaskellDepends = [ base bytestring mmap posix-waitpid process template-haskell unix ]; @@ -107638,13 +107590,12 @@ self: { }: mkDerivation { pname = "llvm-extra"; - version = "0.6"; - sha256 = "c814cd36aacbf0f8627d4aa40fb8ea880f2100b3dd5b7e65f0877d70002d905a"; + version = "0.6.0.1"; + sha256 = "7e3abaf6f8f75bcfb1c595e200218dfe0bb46635bc166c7884c03577b01ede4f"; libraryHaskellDepends = [ base containers cpuid llvm-tf non-empty tfp transformers unsafe utility-ht ]; - jailbreak = true; homepage = "http://code.haskell.org/~thielema/llvm-extra/"; description = "Utility functions for the llvm interface"; license = stdenv.lib.licenses.bsd3; @@ -108138,7 +108089,6 @@ self: { monad-control monad-time mtl old-locale split stm text text-show time transformers transformers-base unordered-containers vector ]; - jailbreak = true; homepage = "https://github.com/scrive/log"; description = "Structured logging solution with multiple backends"; license = stdenv.lib.licenses.bsd3; @@ -109266,25 +109216,6 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {objc = null;}; - "luminance_0_11_0_1" = callPackage - ({ mkDerivation, base, containers, contravariant, dlist, gl, linear - , mtl, resourcet, semigroups, transformers, vector, void - }: - mkDerivation { - pname = "luminance"; - version = "0.11.0.1"; - sha256 = "bb61c59d14a0f12866365c5ec97bc791c4f9ae0cbad7b191769d14650f52eb44"; - libraryHaskellDepends = [ - base containers contravariant dlist gl linear mtl resourcet - semigroups transformers vector void - ]; - jailbreak = true; - homepage = "https://github.com/phaazon/luminance"; - description = "Type-safe, type-level and stateless graphics framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "luminance" = callPackage ({ mkDerivation, base, containers, contravariant, dlist, gl, linear , mtl, resourcet, semigroups, transformers, vector, void @@ -110515,31 +110446,6 @@ self: { license = stdenv.lib.licenses.lgpl3; }) {}; - "mandrill_0_5_2_1" = callPackage - ({ mkDerivation, aeson, base, base64-bytestring, blaze-html - , bytestring, containers, email-validate, http-client - , http-client-tls, http-types, lens, mtl, old-locale, QuickCheck - , raw-strings-qq, tasty, tasty-hunit, tasty-quickcheck, text, time - , unordered-containers - }: - mkDerivation { - pname = "mandrill"; - version = "0.5.2.1"; - sha256 = "3b80c10d9a55dfa3e9bbe5b00e65573e29e60b5186699e30b012f911d3acfa5c"; - libraryHaskellDepends = [ - aeson base base64-bytestring blaze-html bytestring containers - email-validate http-client http-client-tls http-types lens mtl - old-locale QuickCheck text time unordered-containers - ]; - testHaskellDepends = [ - aeson base bytestring QuickCheck raw-strings-qq tasty tasty-hunit - tasty-quickcheck text - ]; - description = "Library for interfacing with the Mandrill JSON API"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "mandrill" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, blaze-html , bytestring, containers, email-validate, http-client @@ -112480,13 +112386,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "microlens" = callPackage + "microlens_0_4_5_0" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "microlens"; version = "0.4.5.0"; sha256 = "93cbdb35aa3a653aaee6ec39f895a5c12a663adc120ecb4978b31b034fd69e19"; libraryHaskellDepends = [ base ]; + homepage = "http://github.com/aelve/microlens"; + description = "A tiny lens library with no dependencies. If you're writing an app, you probably want microlens-platform, not this."; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "microlens" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "microlens"; + version = "0.4.6.0"; + sha256 = "6b3dcc4921568c89bacb0b2c827b91065db3711eb78b7ec91fc8c9a02d78812b"; + libraryHaskellDepends = [ base ]; doHaddock = false; homepage = "http://github.com/aelve/microlens"; description = "A tiny lens library with no dependencies. If you're writing an app, you probably want microlens-platform, not this."; @@ -112541,7 +112460,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "microlens-ghc" = callPackage + "microlens-ghc_0_4_5_0" = callPackage ({ mkDerivation, array, base, bytestring, containers, microlens , transformers }: @@ -112552,26 +112471,27 @@ self: { libraryHaskellDepends = [ array base bytestring containers microlens transformers ]; + jailbreak = true; homepage = "http://github.com/aelve/microlens"; description = "microlens + array, bytestring, containers, transformers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "microlens-mtl_0_1_8_0" = callPackage - ({ mkDerivation, base, microlens, mtl, transformers - , transformers-compat + "microlens-ghc" = callPackage + ({ mkDerivation, array, base, bytestring, containers, microlens + , transformers }: mkDerivation { - pname = "microlens-mtl"; - version = "0.1.8.0"; - sha256 = "c7513217d63db7add00dab8e86e949be85541702101278b28bf5ee4a98d8670e"; + pname = "microlens-ghc"; + version = "0.4.6.0"; + sha256 = "e1fbcd4b6506658dccb2df5ea548d46fa76434f80af368701ae93df84e01fec1"; libraryHaskellDepends = [ - base microlens mtl transformers transformers-compat + array base bytestring containers microlens transformers ]; homepage = "http://github.com/aelve/microlens"; - description = "microlens support for Reader/Writer/State from mtl"; + description = "microlens + array, bytestring, containers, transformers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "microlens-mtl" = callPackage @@ -112590,14 +112510,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "microlens-platform_0_3_2_0" = callPackage + "microlens-platform_0_3_3_0" = callPackage ({ mkDerivation, base, hashable, microlens, microlens-ghc , microlens-mtl, microlens-th, text, unordered-containers, vector }: mkDerivation { pname = "microlens-platform"; - version = "0.3.2.0"; - sha256 = "7b4c81c7f0125a3ca7feb2cac6ff0182afd728c5510c0f55647a3207072cf9c1"; + version = "0.3.3.0"; + sha256 = "174c87afcb0d3004e52b4283773aa16d2a6f0a3b819b362a36f75d7e72433ca8"; libraryHaskellDepends = [ base hashable microlens microlens-ghc microlens-mtl microlens-th text unordered-containers vector @@ -112615,8 +112535,8 @@ self: { }: mkDerivation { pname = "microlens-platform"; - version = "0.3.3.0"; - sha256 = "174c87afcb0d3004e52b4283773aa16d2a6f0a3b819b362a36f75d7e72433ca8"; + version = "0.3.4.0"; + sha256 = "ef6bb97b8c58344b5ab6eed7d47dd4cadbdb6052089f28d44e27bd37eada149d"; libraryHaskellDepends = [ base hashable microlens microlens-ghc microlens-mtl microlens-th text unordered-containers vector @@ -112857,8 +112777,8 @@ self: { }: mkDerivation { pname = "mighttpd2"; - version = "3.3.3"; - sha256 = "f716ab686c9edb2d549f03b069c3b630dd5c147eff6ab1317781450c47a8f7b4"; + version = "3.3.4"; + sha256 = "9a8dd3e2bf2a62f34695a8baf8b715223c3aa57de1c3b30d5a604d364ae1d4b4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -113046,6 +112966,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "minecraft-data" = callPackage + ({ mkDerivation, array, base, bytestring, cereal, containers, lens + , mtl, nbt, pipes, pipes-bytestring, pipes-cereal, pipes-parse + , pipes-zlib, text, text-show, time, vector, zlib + }: + mkDerivation { + pname = "minecraft-data"; + version = "0.1.0.0"; + sha256 = "993725a6baa1a1eb887f48de09f7d4bb64753ed37aaf11a4698cd3b1466414dc"; + libraryHaskellDepends = [ + array base bytestring cereal containers lens mtl nbt pipes + pipes-bytestring pipes-cereal pipes-parse pipes-zlib text text-show + time vector zlib + ]; + homepage = "https://github.com/stepcut/minecraft-data"; + description = "a DSL for generating minecraft commands and levels"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "mines" = callPackage ({ mkDerivation, base, directory, mtl, random }: mkDerivation { @@ -113863,8 +113802,8 @@ self: { }: mkDerivation { pname = "mohws"; - version = "0.2.1.4"; - sha256 = "6d418e31959d24b436e89acf0c6b67a0e25a45ed5fb053d84c6ce3a4ae908fda"; + version = "0.2.1.5"; + sha256 = "49616643f76c144bf0e31e731fc08a2e382c482c59fc4a378b85441ac39a73f6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -113872,7 +113811,6 @@ self: { explicit-exception filepath html HTTP network network-uri old-locale old-time parsec process transformers unix utility-ht ]; - jailbreak = true; homepage = "http://code.haskell.org/mohws/"; description = "Modular Haskell Web Server"; license = stdenv.lib.licenses.bsd3; @@ -114210,8 +114148,8 @@ self: { }: mkDerivation { pname = "monad-lgbt"; - version = "0.0.1"; - sha256 = "259b2c08e8690873202f06eb8ef66ec51a0104bf13bc24670885c4db773bb2f1"; + version = "0.0.2"; + sha256 = "94ea581538e9167b1498f704a35c37f8481df63a6bdb2aa4028d2facb413abf8"; libraryHaskellDepends = [ base containers deepseq hspec logict mtl QuickCheck ]; @@ -114296,23 +114234,6 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; - "monad-logger-syslog_0_1_1_1" = callPackage - ({ mkDerivation, base, bytestring, fast-logger, hsyslog - , monad-logger, text, transformers - }: - mkDerivation { - pname = "monad-logger-syslog"; - version = "0.1.1.1"; - sha256 = "6e1bc3833c3768c354ea269b95a8c566036ba606b769dacda1b9653b4b22b541"; - libraryHaskellDepends = [ - base bytestring fast-logger hsyslog monad-logger text transformers - ]; - homepage = "https://github.com/fpco/monad-logger-syslog"; - description = "syslog output for monad-logger"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "monad-logger-syslog" = callPackage ({ mkDerivation, base, bytestring, fast-logger, hsyslog , monad-logger, text, transformers @@ -115214,6 +115135,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "monky" = callPackage + ({ mkDerivation, base, bytestring, cereal, composition, containers + , directory, env-locale, formatting, mtl, netlink, network + , optparse-applicative, process, statvfs, stm, template-haskell + , text, time, transformers, unix + }: + mkDerivation { + pname = "monky"; + version = "2.0.0.0"; + sha256 = "922edbc9f8926fdcba6f1a141c010a4aff00fc7cb9df7094a9150412fc53d850"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring cereal composition containers directory env-locale + formatting mtl netlink network statvfs stm template-haskell text + time transformers unix + ]; + executableHaskellDepends = [ + base containers directory mtl optparse-applicative process unix + ]; + description = "A system state collecting library and application"; + license = stdenv.lib.licenses.lgpl3; + }) {}; + "mono-foldable" = callPackage ({ mkDerivation, base, bytestring, text, vector }: mkDerivation { @@ -115305,18 +115250,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "monoid-extras_0_4_1_2" = callPackage - ({ mkDerivation, base, groups, semigroupoids, semigroups }: - mkDerivation { - pname = "monoid-extras"; - version = "0.4.1.2"; - sha256 = "f186c64df24fddf2e3344dda3cad1d4c66898db0cf141fa5357007959472b143"; - libraryHaskellDepends = [ base groups semigroupoids semigroups ]; - description = "Various extra monoid-related definitions and utilities"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "monoid-extras" = callPackage ({ mkDerivation, base, groups, semigroupoids, semigroups }: mkDerivation { @@ -116822,6 +116755,7 @@ self: { base base16-bytestring bytestring HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 ]; + jailbreak = true; homepage = "http://github.com/plaprade/murmur3"; description = "Pure Haskell implementation of the MurmurHash3 x86_32 algorithm"; license = stdenv.lib.licenses.publicDomain; @@ -117743,12 +117677,12 @@ self: { }) {}; "namespace" = callPackage - ({ mkDerivation, base, containers }: + ({ mkDerivation, base, containers, monoid-extras }: mkDerivation { pname = "namespace"; - version = "0.1.0.0"; - sha256 = "5bb87af21ac3ac6fe6fee9ecf657b7c10a60b3b308e7ab7a933e80a52a743213"; - libraryHaskellDepends = [ base containers ]; + version = "0.1.2.0"; + sha256 = "defefa737c991b1648e70bb1c4fd318dcc74a63071cc966c5dd8fe20b47d580e"; + libraryHaskellDepends = [ base containers monoid-extras ]; testHaskellDepends = [ base ]; homepage = "https://github.com/xu-hao/namespace"; description = "A Generic Haskell library for managing namespaces"; @@ -118217,24 +118151,6 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; - "neat-interpolation_0_3_2" = callPackage - ({ mkDerivation, base, base-prelude, HTF, parsec, template-haskell - , text - }: - mkDerivation { - pname = "neat-interpolation"; - version = "0.3.2"; - sha256 = "875e77c4a624c2fef750a68d0296decd4dd9f3afd174e8831427cdab03ef5e0a"; - libraryHaskellDepends = [ - base base-prelude parsec template-haskell text - ]; - testHaskellDepends = [ base-prelude HTF ]; - homepage = "https://github.com/nikita-volkov/neat-interpolation"; - description = "A quasiquoter for neat and simple multiline text interpolation"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "neat-interpolation" = callPackage ({ mkDerivation, base, base-prelude, HTF, parsec, template-haskell , text @@ -118492,8 +118408,8 @@ self: { }: mkDerivation { pname = "nested-routes"; - version = "7.1.1"; - sha256 = "d6f8411ec298909e93abfc37748fb9579d4cc346edd4287a434f4fcd8ddccf02"; + version = "7.2.0"; + sha256 = "a9d15f4f1c98add0f91ec50102d088bf24e27b7a58a3d9984feb71ed58bea037"; libraryHaskellDepends = [ attoparsec base bytestring composition-extra errors exceptions hashable hashtables mtl poly-arity pred-set pred-trie regex-compat @@ -118889,6 +118805,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "network_2_6_3_0" = callPackage + ({ mkDerivation, base, bytestring, doctest, HUnit, test-framework + , test-framework-hunit, unix + }: + mkDerivation { + pname = "network"; + version = "2.6.3.0"; + sha256 = "854aab832f3f84a33a6d417f9692232208ec1d9604cded252018f52fd091945d"; + libraryHaskellDepends = [ base bytestring unix ]; + testHaskellDepends = [ + base bytestring doctest HUnit test-framework test-framework-hunit + ]; + homepage = "https://github.com/haskell/network"; + description = "Low-level networking interface"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "network-address" = callPackage ({ mkDerivation, base, Cabal, QuickCheck, test-framework , test-framework-quickcheck2 @@ -119806,8 +119740,8 @@ self: { }: mkDerivation { pname = "newsynth"; - version = "0.3.0.2"; - sha256 = "68d4cb379fc339baeeaf4a6cdc5dc1adec63fadecf9b587043b9e041d11bf172"; + version = "0.3.0.3"; + sha256 = "82ef8feb9baf760242630dec8f0856554d5c5913aa713cd5947fc57a424b70ed"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -121381,6 +121315,7 @@ self: { testHaskellDepends = [ base binary bytestring containers tasty tasty-hspec ]; + jailbreak = true; homepage = "https://github.com/tfausak/octane#readme"; description = "Parse Rocket League replays"; license = stdenv.lib.licenses.mit; @@ -121406,7 +121341,6 @@ self: { ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base doctest tasty tasty-hspec ]; - doCheck = false; homepage = "https://github.com/tfausak/octane#readme"; description = "Parse Rocket League replays"; license = stdenv.lib.licenses.mit; @@ -121535,19 +121469,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ofx_0_4_0_4" = callPackage - ({ mkDerivation, base, parsec, pretty, time }: - mkDerivation { - pname = "ofx"; - version = "0.4.0.4"; - sha256 = "c953333a0b8b85d57534823a57d219d245b7cb682d493c0afc38c4652b9e05fd"; - libraryHaskellDepends = [ base parsec pretty time ]; - homepage = "http://www.github.com/massysett/ofx"; - description = "Parser for OFX data"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "ofx" = callPackage ({ mkDerivation, base, parsec, pretty, time }: mkDerivation { @@ -123208,13 +123129,12 @@ self: { }: mkDerivation { pname = "order-maintenance"; - version = "0.1.1.0"; - sha256 = "6dd7f457978619dbc4d5fd919a61e1108f56af4aa2e9b08032a338724e60c234"; + version = "0.1.1.1"; + sha256 = "9b00674ed6902afcc455a1a2fce9c1b919a4c3b5ef5ec299726447137a25934c"; libraryHaskellDepends = [ base containers transformers ]; testHaskellDepends = [ base Cabal cabal-test-quickcheck containers QuickCheck transformers ]; - jailbreak = true; homepage = "http://darcs.wolfgang.jeltsch.info/haskell/order-maintenance"; description = "Algorithms for the order maintenance problem with a safe interface"; license = stdenv.lib.licenses.bsd3; @@ -124092,40 +124012,6 @@ self: { }: mkDerivation { pname = "pandoc-citeproc"; - version = "0.10"; - sha256 = "2465117b5e922d8c93f6ebf3b99d76c90d31573d01bd9935f5a1cc7be1cdb702"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring containers data-default directory filepath - hs-bibutils mtl old-locale pandoc pandoc-types parsec rfc5051 - setenv split syb tagsoup text time unordered-containers vector - xml-conduit yaml - ]; - executableHaskellDepends = [ - aeson aeson-pretty attoparsec base bytestring filepath pandoc - pandoc-types syb text yaml - ]; - testHaskellDepends = [ - aeson base bytestring directory filepath pandoc pandoc-types - process temporary text yaml - ]; - doCheck = false; - homepage = "https://github.com/jgm/pandoc-citeproc"; - description = "Supports using pandoc with citeproc"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "pandoc-citeproc_0_10_1" = callPackage - ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring - , containers, data-default, directory, filepath, hs-bibutils, mtl - , old-locale, pandoc, pandoc-types, parsec, process, rfc5051 - , setenv, split, syb, tagsoup, temporary, text, time - , unordered-containers, vector, xml-conduit, yaml - }: - mkDerivation { - pname = "pandoc-citeproc"; version = "0.10.1"; sha256 = "ebc3eb3ff95e97ebd46c0918a65db2da021de2a70d02dc85ca5b344ea5c21205"; isLibrary = true; @@ -124144,7 +124030,6 @@ self: { aeson base bytestring directory filepath pandoc pandoc-types process temporary text yaml ]; - jailbreak = true; doCheck = false; homepage = "https://github.com/jgm/pandoc-citeproc"; description = "Supports using pandoc with citeproc"; @@ -125163,6 +125048,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "pasta" = callPackage + ({ mkDerivation, base, hspec, microlens, microlens-th, protolude + , semigroups, text, text-show + }: + mkDerivation { + pname = "pasta"; + version = "0.1.0.1"; + sha256 = "19a2b39efebef3faedf7cff7434e2d1f6c9a09e1a4c49d1d7ef49f8d6d3f9e83"; + libraryHaskellDepends = [ + base microlens microlens-th protolude semigroups text text-show + ]; + testHaskellDepends = [ base hspec microlens protolude ]; + jailbreak = true; + homepage = "http://github.com/diogob/pasta#readme"; + description = "PostgreSQL Abstract Syntax Tree Assember"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pastis" = callPackage ({ mkDerivation, base, HTTP, network }: mkDerivation { @@ -125245,7 +125148,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "path" = callPackage + "path_0_5_8" = callPackage ({ mkDerivation, aeson, base, deepseq, exceptions, filepath, hspec , HUnit, mtl, template-haskell }: @@ -125259,6 +125162,23 @@ self: { testHaskellDepends = [ aeson base hspec HUnit mtl ]; description = "Support for well-typed paths"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "path" = callPackage + ({ mkDerivation, aeson, base, bytestring, deepseq, exceptions + , filepath, hspec, HUnit, mtl, template-haskell + }: + mkDerivation { + pname = "path"; + version = "0.5.9"; + sha256 = "e67982fe579b6318def4769db9a7a3ae07ac7b67b4e8d6326f568cb72aafa727"; + libraryHaskellDepends = [ + aeson base deepseq exceptions filepath template-haskell + ]; + testHaskellDepends = [ aeson base bytestring hspec HUnit mtl ]; + description = "Support for well-typed paths"; + license = stdenv.lib.licenses.bsd3; }) {}; "path-extra" = callPackage @@ -127637,15 +127557,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "pinch_0_2_0_1" = callPackage + "pinch_0_2_0_2" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq , ghc-prim, hashable, hspec, hspec-discover, QuickCheck, text , unordered-containers, vector }: mkDerivation { pname = "pinch"; - version = "0.2.0.1"; - sha256 = "02115cbe9ad2053d57e4d14e203acb9962bcaa7a4b390b838e650a5d5e18d536"; + version = "0.2.0.2"; + sha256 = "be722c513c696845e2a04758639b661b065cd821d4e5f608fc1ec74fe18a0e0f"; libraryHaskellDepends = [ array base bytestring containers deepseq ghc-prim hashable text unordered-containers vector @@ -128339,25 +128259,6 @@ self: { maintainers = with stdenv.lib.maintainers; [ jb55 ]; }) {}; - "pipes-network_0_6_4" = callPackage - ({ mkDerivation, base, bytestring, network, network-simple, pipes - , pipes-safe, transformers - }: - mkDerivation { - pname = "pipes-network"; - version = "0.6.4"; - sha256 = "57d48f8b1a129eae2715ed06714026d06d5ad5c0edf88c7eec1c6022cbf64bf1"; - libraryHaskellDepends = [ - base bytestring network network-simple pipes pipes-safe - transformers - ]; - jailbreak = true; - homepage = "https://github.com/k0001/pipes-network"; - description = "Use network sockets together with the pipes library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "pipes-network" = callPackage ({ mkDerivation, base, bytestring, network, network-simple, pipes , pipes-safe, transformers @@ -129413,6 +129314,8 @@ self: { pname = "pointful"; version = "1.0.8"; sha256 = "813152e920e7aad9d2ba2ab5d922deff9cd82ec156f981d16de4bc91320967ac"; + revision = "1"; + editedCabalFile = "b2038459d89251a94f3cc8709f5be0ce80c0cc1be72e2b65fca387efdd61d477"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -129483,6 +129386,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pokemon-go-protobuf-types" = callPackage + ({ mkDerivation, base, bytestring, containers, data-default-class + , lens-family, proto-lens, text + }: + mkDerivation { + pname = "pokemon-go-protobuf-types"; + version = "0.1.2"; + sha256 = "141b68926bb890137e258c7c689d2e010a9137a41675bec4257a4fd55a0bd22c"; + libraryHaskellDepends = [ + base bytestring containers data-default-class lens-family + proto-lens text + ]; + jailbreak = true; + homepage = "https://github.com/relrod/pokemon-go-protobuf-types"; + description = "Haskell types for the Pokemon Go protobuf protocol"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "poker-eval" = callPackage ({ mkDerivation, array, base, mtl, poker-eval, random, vector }: mkDerivation { @@ -129988,23 +129909,24 @@ self: { }) {}; "poppler" = callPackage - ({ mkDerivation, array, base, bytestring, cairo, containers, gdk2 - , gdk_pixbuf, glib, gtk, gtk2hs-buildtools, mtl, pango, poppler + ({ mkDerivation, array, base, bytestring, Cabal, cairo, containers + , gdk_pixbuf, glib, gtk, gtk2, gtk2hs-buildtools, mtl, pango + , poppler }: mkDerivation { pname = "poppler"; - version = "0.14.0"; - sha256 = "fefe5a01abfe3c87f038ea35e0a4efff63e879d4872d511e916b4aeda3115317"; + version = "0.14.1"; + sha256 = "5b577a0a14791eb952ed8ed704ad37bcc535703d4d52f6da0ca1556424465db6"; + setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; libraryHaskellDepends = [ array base bytestring cairo containers glib gtk mtl ]; - libraryPkgconfigDepends = [ gdk2 gdk_pixbuf pango poppler ]; - libraryToolDepends = [ gtk2hs-buildtools ]; + libraryPkgconfigDepends = [ gdk_pixbuf gtk2 pango poppler ]; homepage = "http://projects.haskell.org/gtk2hs"; description = "Binding to the Poppler"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = [ "x86_64-darwin" ]; - }) {gdk2 = null; inherit (pkgs) gdk_pixbuf; + }) {inherit (pkgs) gdk_pixbuf; gtk2 = pkgs.gnome2.gtk; inherit (pkgs.gnome) pango; inherit (pkgs) poppler;}; "populate-setup-exe-cache" = callPackage @@ -130211,7 +130133,10 @@ self: { pname = "posix-waitpid"; version = "0.1"; sha256 = "1336c1c5bfcc9250fb1f22cf46ef24730f29b2d2ae30dca0111aec37de1d7eec"; + revision = "1"; + editedCabalFile = "b0c171edc197595d1edbbf49c22fb91a1d3ffac56316ba1023d9d7a175f15589"; libraryHaskellDepends = [ base unix ]; + jailbreak = true; description = "Low-level wrapping of POSIX waitpid(2)"; license = stdenv.lib.licenses.mit; hydraPlatforms = [ "x86_64-darwin" ]; @@ -130253,6 +130178,18 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; + "postgres-tmp" = callPackage + ({ mkDerivation, base, bytestring, postgresql-simple, text }: + mkDerivation { + pname = "postgres-tmp"; + version = "0.1.0.1"; + sha256 = "6d032edb06f2c477b316d6bd023f7bb7845e90b54279beba4b5919bc31b677e4"; + libraryHaskellDepends = [ base bytestring postgresql-simple text ]; + homepage = "https://github.com/cocreature/postgres-tmp#readme"; + description = "Create a temporary database that is deleted after performing some operation"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "postgresql-binary" = callPackage ({ mkDerivation, aeson, base, base-prelude, binary-parser , bytestring, conversion, conversion-bytestring, conversion-text @@ -130658,6 +130595,34 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "postgrest-ws" = callPackage + ({ mkDerivation, aeson, base, bytestring, hasql, hasql-pool + , http-types, jwt, postgresql-libpq, postgrest, string-conversions + , text, time, transformers, unix, unordered-containers, wai + , wai-websockets, warp, websockets + }: + mkDerivation { + pname = "postgrest-ws"; + version = "0.1.0.1"; + sha256 = "50ce5a13c8b7fe1719e61630ae019b9eb3ca4a923a036585c98635f0df1e3dfb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring hasql-pool http-types postgresql-libpq + postgrest string-conversions text time unordered-containers wai + wai-websockets websockets + ]; + executableHaskellDepends = [ + base hasql hasql-pool jwt postgresql-libpq postgrest + string-conversions transformers unix warp + ]; + testHaskellDepends = [ base ]; + jailbreak = true; + homepage = "https://github.com/diogob/postgrest-ws#readme"; + description = "PostgREST extension to map LISTEN/NOTIFY messages to Websockets"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "postie" = callPackage ({ mkDerivation, attoparsec, base, bytestring, cprng-aes , data-default-class, mtl, network, pipes, pipes-parse @@ -131311,26 +131276,6 @@ self: { }: mkDerivation { pname = "pretty-show"; - version = "1.6.11"; - sha256 = "b80bb4c5ddcb49dcd2df68a837aafd1d9361fc9157a8bafbb92fef229e9def82"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base filepath ghc-prim haskell-lexer pretty - ]; - libraryToolDepends = [ happy ]; - executableHaskellDepends = [ base ]; - homepage = "http://wiki.github.com/yav/pretty-show"; - description = "Tools for working with derived `Show` instances and generic inspection of values"; - license = stdenv.lib.licenses.mit; - }) {}; - - "pretty-show_1_6_12" = callPackage - ({ mkDerivation, array, base, filepath, ghc-prim, happy - , haskell-lexer, pretty - }: - mkDerivation { - pname = "pretty-show"; version = "1.6.12"; sha256 = "9629c98ac0f2eb215cd81cf61321c5181acd18df35d89817093e934f786774b9"; isLibrary = true; @@ -131340,11 +131285,9 @@ self: { ]; libraryToolDepends = [ happy ]; executableHaskellDepends = [ base ]; - jailbreak = true; homepage = "http://wiki.github.com/yav/pretty-show"; description = "Tools for working with derived `Show` instances and generic inspection of values"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pretty-sop" = callPackage @@ -132988,7 +132931,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "psqueues" = callPackage + "psqueues_0_2_2_1" = callPackage ({ mkDerivation, array, base, deepseq, ghc-prim, hashable, HUnit , QuickCheck, tagged, test-framework, test-framework-hunit , test-framework-quickcheck2 @@ -133004,6 +132947,25 @@ self: { ]; description = "Pure priority search queues"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "psqueues" = callPackage + ({ mkDerivation, array, base, deepseq, ghc-prim, hashable, HUnit + , QuickCheck, tagged, test-framework, test-framework-hunit + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "psqueues"; + version = "0.2.2.2"; + sha256 = "97b539c4d9da0f0460cd17153641a647b59eb04fde00ec38ea8b56dd9086423f"; + libraryHaskellDepends = [ base deepseq ghc-prim hashable ]; + testHaskellDepends = [ + array base deepseq ghc-prim hashable HUnit QuickCheck tagged + test-framework test-framework-hunit test-framework-quickcheck2 + ]; + description = "Pure priority search queues"; + license = stdenv.lib.licenses.bsd3; }) {}; "pub" = callPackage @@ -133614,8 +133576,8 @@ self: { }: mkDerivation { pname = "purescript-bridge"; - version = "0.6.0.1"; - sha256 = "8abbc3ca3df18daac6ba730a39baf71d426555cebc24e73acdbbafb4538bfd8f"; + version = "0.6.0.2"; + sha256 = "821c1376f642e7721ce2076726013e18e01cec8dafbe916dad8baaede9f80ed5"; libraryHaskellDepends = [ base containers directory filepath generic-deriving lens mtl text transformers @@ -133784,8 +133746,8 @@ self: { }: mkDerivation { pname = "pusher-http-haskell"; - version = "1.0.0.0"; - sha256 = "d44aa39471613080153462e7ac7df4ed477a7485470c6f15ac6e5eaee986dac0"; + version = "1.1.0.0"; + sha256 = "2938607770675541738af018e086b365e34fab98f389110ec34abb4fef79ca69"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring cryptohash hashable http-client http-types QuickCheck text time transformers @@ -134552,21 +134514,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "quickcheck-io_0_1_2" = callPackage - ({ mkDerivation, base, HUnit, QuickCheck }: - mkDerivation { - pname = "quickcheck-io"; - version = "0.1.2"; - sha256 = "50275e5253dcf0c838e340fa19eb841804deb634aeedbf33f0b46a97b89bc1cd"; - revision = "1"; - editedCabalFile = "e0ffcf52d48037f25073c440a0b0f880b4a22e132915a1910c259e8cf8bd1fc3"; - libraryHaskellDepends = [ base HUnit QuickCheck ]; - homepage = "https://github.com/hspec/quickcheck-io#readme"; - description = "Use HUnit assertions as QuickCheck properties"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "quickcheck-io" = callPackage ({ mkDerivation, base, HUnit, QuickCheck }: mkDerivation { @@ -135099,8 +135046,8 @@ self: { }: mkDerivation { pname = "raaz"; - version = "0.0.1"; - sha256 = "f46d66378adf33dc624251e4553197c50ab742d264d7b97dbcf606d679f660e5"; + version = "0.0.2"; + sha256 = "89009f7ef7f7f995781f124ef99322eec0f2b820ca926eb529f41680c52b2f7a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -135258,26 +135205,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "rainbow_0_28_0_2" = callPackage - ({ mkDerivation, base, bytestring, microlens, microlens-th, process - , QuickCheck, text - }: - mkDerivation { - pname = "rainbow"; - version = "0.28.0.2"; - sha256 = "564cbb99f3718e01f838576c4ec2f326361c538b936c27a62f42eeade96e68fd"; - libraryHaskellDepends = [ - base bytestring microlens microlens-th process text - ]; - testHaskellDepends = [ - base bytestring microlens microlens-th process QuickCheck text - ]; - homepage = "https://www.github.com/massysett/rainbow"; - description = "Print text to terminal with colors and effects"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "rainbow" = callPackage ({ mkDerivation, base, bytestring, lens-simple, process, QuickCheck , text @@ -135315,27 +135242,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "rainbox_0_18_0_8" = callPackage - ({ mkDerivation, base, bytestring, containers, microlens-th - , QuickCheck, rainbow, tasty, tasty-quickcheck, text - }: - mkDerivation { - pname = "rainbox"; - version = "0.18.0.8"; - sha256 = "85b077a51a4846dc94a259faef1bfd13e3f90a40d3a612b6c7e46357e9e9e3bc"; - libraryHaskellDepends = [ - base bytestring containers microlens-th rainbow text - ]; - testHaskellDepends = [ - base bytestring containers microlens-th QuickCheck rainbow tasty - tasty-quickcheck text - ]; - homepage = "http://www.github.com/massysett/rainbox"; - description = "Two-dimensional box pretty printing, with colors"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "rainbox" = callPackage ({ mkDerivation, base, bytestring, containers, lens-simple , QuickCheck, rainbow, tasty, tasty-quickcheck, text @@ -135618,6 +135524,22 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; + "random-strings" = callPackage + ({ mkDerivation, base, containers, mtl, QuickCheck, random }: + mkDerivation { + pname = "random-strings"; + version = "0.1.1.0"; + sha256 = "9b7342fdcb37250a45a14825754ed8ba3fd1a45468c78aaa4ef3671342e59452"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base random ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base containers mtl QuickCheck ]; + homepage = "https://github.com/mikehat/random-strings"; + description = "Generate random strings with specific qualities"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "random-tree" = callPackage ({ mkDerivation, base, containers, lens, MonadRandom, mtl, random , random-shuffle, transformers, tree-fun @@ -136668,19 +136590,19 @@ self: { "rebase" = callPackage ({ mkDerivation, base, base-prelude, bifunctors, bytestring , containers, contravariant, contravariant-extras, deepseq, dlist - , either, fail, hashable, mtl, profunctors, scientific, semigroups - , text, time, transformers, unordered-containers, uuid, vector - , void + , either, fail, hashable, mtl, profunctors, scientific + , semigroupoids, semigroups, text, time, transformers + , unordered-containers, uuid, vector, void }: mkDerivation { pname = "rebase"; - version = "0.5.4"; - sha256 = "86fda65310e4b7b83575ed8717780e6295116ff220621ee383b71fa98e09e2f2"; + version = "1"; + sha256 = "cb4338a1993a7ef39c35c022f848d964151e2b1a05834f5f3deb2f68efbfd79a"; libraryHaskellDepends = [ base base-prelude bifunctors bytestring containers contravariant contravariant-extras deepseq dlist either fail hashable mtl - profunctors scientific semigroups text time transformers - unordered-containers uuid vector void + profunctors scientific semigroupoids semigroups text time + transformers unordered-containers uuid vector void ]; homepage = "https://github.com/nikita-volkov/rebase"; description = "A more progressive alternative to the \"base\" package"; @@ -138365,30 +138287,6 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; - "relational-query_0_8_2_3" = callPackage - ({ mkDerivation, array, base, bytestring, containers, dlist - , names-th, persistable-record, quickcheck-simple, sql-words - , template-haskell, text, th-reify-compat, time, time-locale-compat - , transformers - }: - mkDerivation { - pname = "relational-query"; - version = "0.8.2.3"; - sha256 = "e97f411f066a9315f03df10cfd49a138806409148978c18e7dc26b34bd82c18b"; - libraryHaskellDepends = [ - array base bytestring containers dlist names-th persistable-record - sql-words template-haskell text th-reify-compat time - time-locale-compat transformers - ]; - testHaskellDepends = [ - base containers quickcheck-simple transformers - ]; - homepage = "http://khibino.github.io/haskell-relational-record/"; - description = "Typeful, Modular, Relational, algebraic query engine"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "relational-query" = callPackage ({ mkDerivation, array, base, bytestring, containers, dlist , names-th, persistable-record, quickcheck-simple, sql-words @@ -139057,8 +138955,8 @@ self: { }: mkDerivation { pname = "repl-toolkit"; - version = "1.0.0.1"; - sha256 = "f6b6c55a73c4408381204b22edf05a8b2681eef23ec7631c2a919b28609be79a"; + version = "1.0.1.0"; + sha256 = "4b170911926fc0ac270ab1e1689d4427c6141a5a67336ad79a675d8a5c0945ef"; libraryHaskellDepends = [ aeson base bytestring data-default directory exceptions filepath functor-monadic ListLike listsafe monad-loops mtl parsec @@ -139747,29 +139645,6 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; - "rethinkdb_2_2_0_5" = callPackage - ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring - , containers, data-default, doctest, mtl, network, scientific, text - , time, unordered-containers, utf8-string, vector - }: - mkDerivation { - pname = "rethinkdb"; - version = "2.2.0.5"; - sha256 = "0756db7984ea0a9085eccadad78cac31e1324ed2bc9c580b6177e18826ccc78f"; - libraryHaskellDepends = [ - aeson base base64-bytestring binary bytestring containers - data-default mtl network scientific text time unordered-containers - utf8-string vector - ]; - testHaskellDepends = [ base doctest ]; - jailbreak = true; - doCheck = false; - homepage = "http://github.com/atnnn/haskell-rethinkdb"; - description = "A driver for RethinkDB 2.2"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "rethinkdb" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring , containers, data-default, doctest, mtl, network, scientific, text @@ -139885,28 +139760,6 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; - "retry_0_7_4" = callPackage - ({ mkDerivation, base, data-default-class, exceptions, ghc-prim - , hspec, HUnit, mtl, QuickCheck, random, stm, time, transformers - }: - mkDerivation { - pname = "retry"; - version = "0.7.4"; - sha256 = "fd63242da0640ff6ab6e8d474388ceca917ee405d40c210431b159a56dd847a7"; - libraryHaskellDepends = [ - base data-default-class exceptions ghc-prim random transformers - ]; - testHaskellDepends = [ - base data-default-class exceptions ghc-prim hspec HUnit mtl - QuickCheck random stm time transformers - ]; - doCheck = false; - homepage = "http://github.com/Soostone/retry"; - description = "Retry combinators for monadic actions that may fail"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "retry" = callPackage ({ mkDerivation, base, data-default-class, exceptions, ghc-prim , hspec, HUnit, mtl, QuickCheck, random, stm, time, transformers @@ -139922,6 +139775,7 @@ self: { base data-default-class exceptions ghc-prim hspec HUnit mtl QuickCheck random stm time transformers ]; + doCheck = false; homepage = "http://github.com/Soostone/retry"; description = "Retry combinators for monadic actions that may fail"; license = stdenv.lib.licenses.bsd3; @@ -139998,14 +139852,11 @@ self: { }: mkDerivation { pname = "reverse-geocoding"; - version = "0.2.2.2"; - sha256 = "3e1b2f6f44272a1173483b8d2aa9c4bfa4eb1bc15e99468e7fa3aae156e75f59"; - revision = "1"; - editedCabalFile = "9d91cf76a4c2958487e3ec7ad6e38963cbae63cf8586ca041c71addb84dd009c"; + version = "0.2.4.0"; + sha256 = "07a70639586b92b557b922672685b353ff47fbbdb963196b0cd1d88020cf791d"; libraryHaskellDepends = [ aeson base iso3166-country-codes lens lens-aeson text wreq ]; - jailbreak = true; homepage = "https://github.com/jcristovao/reverse-geocoding"; description = "Simple reverse geocoding using OpenStreeMap"; license = stdenv.lib.licenses.bsd3; @@ -140134,7 +139985,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "riak" = callPackage + "riak_1_0_1_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, binary, blaze-builder , bytestring, containers, data-default-class, deepseq , enclosed-exceptions, exceptions, hashable, HUnit @@ -140164,9 +140015,41 @@ self: { homepage = "http://github.com/markhibberd/riak-haskell-client"; description = "A Haskell client for the Riak decentralized data store"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "riak-protobuf" = callPackage + "riak" = callPackage + ({ mkDerivation, aeson, attoparsec, base, binary, blaze-builder + , bytestring, containers, data-default-class, deepseq + , enclosed-exceptions, exceptions, hashable, HUnit + , mersenne-random-pure64, monad-control, mtl, network + , protocol-buffers, pureMD5, QuickCheck, random, resource-pool + , riak-protobuf, semigroups, stm, tasty, tasty-hunit + , tasty-quickcheck, text, time, transformers, transformers-base + , unordered-containers, vector + }: + mkDerivation { + pname = "riak"; + version = "1.1.0.0"; + sha256 = "afb7bbee7a95c1b08ed226a1b9cbea3664439c05176d4f2811248ceec3f3e1ee"; + libraryHaskellDepends = [ + aeson attoparsec base binary blaze-builder bytestring containers + data-default-class deepseq enclosed-exceptions exceptions hashable + mersenne-random-pure64 monad-control network protocol-buffers + pureMD5 random resource-pool riak-protobuf semigroups stm text time + transformers transformers-base unordered-containers vector + ]; + testHaskellDepends = [ + base bytestring containers data-default-class HUnit mtl QuickCheck + riak-protobuf semigroups tasty tasty-hunit tasty-quickcheck text + ]; + jailbreak = true; + homepage = "http://github.com/markhibberd/riak-haskell-client"; + description = "A Haskell client for the Riak decentralized data store"; + license = "unknown"; + }) {}; + + "riak-protobuf_0_21_0_0" = callPackage ({ mkDerivation, array, base, parsec, protocol-buffers , protocol-buffers-descriptor }: @@ -140181,6 +140064,23 @@ self: { homepage = "http://github.com/markhibberd/riak-haskell-client"; description = "Haskell types for the Riak protocol buffer API"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "riak-protobuf" = callPackage + ({ mkDerivation, array, base, parsec, protocol-buffers + , protocol-buffers-descriptor + }: + mkDerivation { + pname = "riak-protobuf"; + version = "0.22.0.0"; + sha256 = "32b576289697bfcc1800806e5cc8b4be63df13fe95f9357f96b3f8b47b5a6919"; + libraryHaskellDepends = [ + array base parsec protocol-buffers protocol-buffers-descriptor + ]; + homepage = "http://github.com/markhibberd/riak-haskell-client"; + description = "Haskell types for the Riak protocol buffer API"; + license = "unknown"; }) {}; "richreports" = callPackage @@ -140388,23 +140288,42 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "rivet-adaptor-postgresql" = callPackage + ({ mkDerivation, base, postgresql-simple, rivet-core, text }: + mkDerivation { + pname = "rivet-adaptor-postgresql"; + version = "0.1.0.0"; + sha256 = "298d29197464faadb9fc72b69065c342c1d32b10d5c36f66df8a54f372a7fb3e"; + libraryHaskellDepends = [ base postgresql-simple rivet-core text ]; + homepage = "http://github.com/name/project"; + description = "Rivet migration library postgresql backend"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "rivet-autoimporter" = callPackage + ({ mkDerivation, base, directory, filepath }: + mkDerivation { + pname = "rivet-autoimporter"; + version = "0.1.0.0"; + sha256 = "77c23a683c515fae9570a316978791a359aba2da36424b5706102649b3a7f1ac"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base directory filepath ]; + homepage = "http://github.com/dbp/rivet"; + description = "Database migration library; automatic importer"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "rivet-core" = callPackage - ({ mkDerivation, base, configurator, directory, directory-tree - , filepath, postgresql-simple, process, shake, template-haskell - , text, time, unordered-containers - }: + ({ mkDerivation, base, text }: mkDerivation { pname = "rivet-core"; - version = "0.1.0.1"; - sha256 = "417451d2d95d6a676187a7d8b98ec112bdba7eaa1da68c6020833a9fc37a5f80"; - libraryHaskellDepends = [ - base configurator directory directory-tree filepath - postgresql-simple process shake template-haskell text time - unordered-containers - ]; - jailbreak = true; - homepage = "https://github.com/dbp/rivet"; - description = "Core library for project management tool"; + version = "0.2.0.0"; + sha256 = "187957e5923406020cb7a46f21c1ef54a5bb0c3756a0cfc87d64eda94c5e401e"; + libraryHaskellDepends = [ base text ]; + testHaskellDepends = [ base ]; + homepage = "http://github.com/dbp/rivet"; + description = "Database migration library; core functionality"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -140820,7 +140739,6 @@ self: { semigroupoids semigroups sets tasty tasty-quickcheck unordered-containers witherable ]; - doCheck = false; description = "A collection of rose tree structures"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -141663,8 +141581,8 @@ self: { }: mkDerivation { pname = "safe-exceptions"; - version = "0.1.3.0"; - sha256 = "1acc605f83e2954f01a502095bec89f064a510cfc52a2a08369e4e60542c13e5"; + version = "0.1.4.0"; + sha256 = "c52078c8457f8233a3796f84a3ae3f336f4668a013ba935e74c7218eeb9a41a6"; libraryHaskellDepends = [ base deepseq exceptions transformers ]; testHaskellDepends = [ base hspec void ]; homepage = "https://github.com/fpco/safe-exceptions#readme"; @@ -142464,8 +142382,8 @@ self: { }: mkDerivation { pname = "sbp"; - version = "1.0.0"; - sha256 = "be31aef2450cd2a1b39009cf9288d3d027101b57f46c61b8bef46eb5884220b3"; + version = "1.0.1"; + sha256 = "e1f369043af7d306ec485778a0f1629103d96513eb19a30c944bee0207a90ae9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -143041,30 +142959,6 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; - "scientific_0_3_4_8" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, deepseq - , ghc-prim, hashable, integer-gmp, QuickCheck, smallcheck, tasty - , tasty-ant-xml, tasty-hunit, tasty-quickcheck, tasty-smallcheck - , text, vector - }: - mkDerivation { - pname = "scientific"; - version = "0.3.4.8"; - sha256 = "4addf1bebe66ff681967372a3d68ba131400108043a4d5bc91e58558d23b2d85"; - libraryHaskellDepends = [ - base binary bytestring containers deepseq ghc-prim hashable - integer-gmp text vector - ]; - testHaskellDepends = [ - base binary bytestring QuickCheck smallcheck tasty tasty-ant-xml - tasty-hunit tasty-quickcheck tasty-smallcheck text - ]; - homepage = "https://github.com/basvandijk/scientific"; - description = "Numbers represented using scientific notation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "scientific" = callPackage ({ mkDerivation, base, binary, bytestring, containers, deepseq , ghc-prim, hashable, integer-gmp, QuickCheck, smallcheck, tasty @@ -143679,25 +143573,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "sdl2_2_1_1" = callPackage - ({ mkDerivation, base, bytestring, exceptions, linear, SDL2 - , StateVar, text, transformers, vector - }: - mkDerivation { - pname = "sdl2"; - version = "2.1.1"; - sha256 = "6c38f02842fdda0be25359cc1d2579c09a66a2f80687943cebe0fe14b1d7efad"; - libraryHaskellDepends = [ - base bytestring exceptions linear StateVar text transformers vector - ]; - librarySystemDepends = [ SDL2 ]; - libraryPkgconfigDepends = [ SDL2 ]; - jailbreak = true; - description = "Both high- and low-level bindings to the SDL library (version 2.0.3)."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) SDL2;}; - "sdl2" = callPackage ({ mkDerivation, base, bytestring, exceptions, linear, SDL2 , StateVar, text, transformers, vector @@ -144752,8 +144627,8 @@ self: { }: mkDerivation { pname = "sequor"; - version = "0.7.2"; - sha256 = "ba9edb69ef6164f17998509a96f7248e40f9b7dd18d508c64bf4abb7cef481d4"; + version = "0.7.5"; + sha256 = "49165162d900370db64027b1444de2f64c021ff87e4e1af82449ae39c0b591b5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -144764,6 +144639,7 @@ self: { array base binary bytestring containers mtl nlp-scores pretty split text vector ]; + jailbreak = true; homepage = "https://bitbucket.org/gchrupala/sequor"; description = "A sequence labeler based on Collins's sequence perceptron"; license = stdenv.lib.licenses.bsd3; @@ -144995,27 +144871,34 @@ self: { }) {}; "servant-auth-cookie" = callPackage - ({ mkDerivation, base, base64-bytestring, blaze-html, blaze-markup - , bytestring, cereal, cookie, cryptonite, http-media, http-types - , memory, mtl, servant, servant-server, text, time, transformers - , wai, warp + ({ mkDerivation, base, base64-bytestring, blaze-builder, blaze-html + , blaze-markup, bytestring, cereal, cookie, cryptonite + , data-default, deepseq, exceptions, hspec, http-media, http-types + , memory, mtl, QuickCheck, servant, servant-blaze, servant-server + , text, time, transformers, wai, warp }: mkDerivation { pname = "servant-auth-cookie"; - version = "0.1.0.1"; - sha256 = "891ed1a3d4ca5e17835aa906595ab601551e084c0831be1154f99adec23b699b"; + version = "0.3.0.0"; + sha256 = "8f93e254ea5c09319b0636694a323d2a817d7b606631e3cccdf1bc8c5770659a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base base64-bytestring bytestring cereal cookie cryptonite - http-types memory servant servant-server time transformers wai + base base64-bytestring blaze-builder bytestring cereal cookie + cryptonite data-default exceptions http-types memory mtl servant + servant-server time transformers wai ]; executableHaskellDepends = [ - base blaze-html blaze-markup bytestring cereal http-media mtl - servant servant-server text wai warp + base blaze-html blaze-markup bytestring cereal cryptonite + data-default http-media mtl servant servant-blaze servant-server + text wai warp + ]; + testHaskellDepends = [ + base bytestring cereal cryptonite data-default deepseq hspec + QuickCheck servant-server time ]; description = "Authentication via encrypted cookies"; - license = stdenv.lib.licenses.gpl3; + license = stdenv.lib.licenses.bsd3; }) {}; "servant-blaze" = callPackage @@ -145527,18 +145410,19 @@ self: { }) {}; "servant-purescript" = callPackage - ({ mkDerivation, aeson, base, containers, directory, filepath - , http-types, lens, mainland-pretty, purescript-bridge, servant - , servant-foreign, servant-subscriber, text + ({ mkDerivation, aeson, base, bytestring, containers, directory + , filepath, http-types, lens, mainland-pretty, purescript-bridge + , servant, servant-foreign, servant-server, servant-subscriber + , text }: mkDerivation { pname = "servant-purescript"; - version = "0.1.0.2"; - sha256 = "d6852c19120c1bae8bc94997bfcd75594f7d5dcbb327eb7e1f412bae70e48086"; + version = "0.2.0.1"; + sha256 = "161930685b414a1780860d6364bff3504923218156b000e0f502b6010db1e178"; libraryHaskellDepends = [ - aeson base containers directory filepath http-types lens + aeson base bytestring containers directory filepath http-types lens mainland-pretty purescript-bridge servant servant-foreign - servant-subscriber text + servant-server servant-subscriber text ]; testHaskellDepends = [ aeson base containers lens mainland-pretty purescript-bridge @@ -145716,8 +145600,8 @@ self: { }: mkDerivation { pname = "servant-subscriber"; - version = "0.1.0.2"; - sha256 = "c575bc3afe97433e8fbb450afb5a6c63ac692f8a95e4a6f34960b8faf083ae48"; + version = "0.2.0.1"; + sha256 = "2e4f7084e8fd8caaee9cb7d8e37d9466c78a49e83e846e147a4727a60d4330df"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -145773,10 +145657,8 @@ self: { }: mkDerivation { pname = "servant-swagger"; - version = "1.1"; - sha256 = "cf3aed6fd51e7078e27c0ee745f2718c43058047dd0996256a920675dee9f311"; - revision = "1"; - editedCabalFile = "71194662078eb9978c49774cc45f0489bd699ea657af03fafe3996be58ac3e06"; + version = "1.1.1"; + sha256 = "c6d8a62e495cd72a42f2ae600c4e523cf3337bb3cd24426f4cc54141a9600445"; libraryHaskellDepends = [ aeson base bytestring hspec http-media insert-ordered-containers lens QuickCheck servant swagger2 text unordered-containers @@ -145785,6 +145667,7 @@ self: { aeson aeson-qq base directory doctest filepath hspec lens QuickCheck servant swagger2 text time ]; + doCheck = false; homepage = "https://github.com/haskell-servant/servant-swagger"; description = "Generate Swagger specification for your servant API"; license = stdenv.lib.licenses.bsd3; @@ -145799,10 +145682,8 @@ self: { }: mkDerivation { pname = "servant-swagger-ui"; - version = "0.1.0.2.1.4"; - sha256 = "88fee2a597f8810a7da56c15210e4019b407456e4a127fad5e9b08b2a8f41ff1"; - revision = "1"; - editedCabalFile = "d2fb00b812c0d2087ca43e38c0a5629940c3e6313b968faf05db36d4c89ff7ef"; + version = "0.1.1.2.1.4"; + sha256 = "45d27f6e92207422937cfc865c9e0a5aa32596282a134a9196f1248fe15496e4"; libraryHaskellDepends = [ base blaze-markup bytestring directory file-embed filepath http-media servant servant-blaze servant-server servant-swagger @@ -146746,7 +146627,7 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; - "shakespeare" = callPackage + "shakespeare_2_0_9" = callPackage ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec , process, scientific, template-haskell, text, time, transformers @@ -146769,6 +146650,33 @@ self: { homepage = "http://www.yesodweb.com/book/shakespearean-templates"; description = "A toolkit for making compile-time interpolated templates"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ psibi ]; + }) {}; + + "shakespeare" = callPackage + ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring + , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec + , process, scientific, template-haskell, text, time, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "shakespeare"; + version = "2.0.10"; + sha256 = "b5544f1a9e246a45357c37507b2228ebb12a8828907e9280fcade23761b0f6f8"; + libraryHaskellDepends = [ + aeson base blaze-html blaze-markup bytestring containers directory + exceptions ghc-prim parsec process scientific template-haskell text + time transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson base blaze-html blaze-markup bytestring containers directory + exceptions ghc-prim hspec HUnit parsec process template-haskell + text time transformers + ]; + homepage = "http://www.yesodweb.com/book/shakespearean-templates"; + description = "A toolkit for making compile-time interpolated templates"; + license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; @@ -147759,6 +147667,22 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; + "simple-download" = callPackage + ({ mkDerivation, base, conduit-combinators, http-client + , http-conduit, mtl, transformers + }: + mkDerivation { + pname = "simple-download"; + version = "0.0.2"; + sha256 = "57aafeb55eb54811b6bba0f41f01af2a95e6bb8d1288bab5d2fd7749b9f90fce"; + libraryHaskellDepends = [ + base conduit-combinators http-client http-conduit mtl transformers + ]; + homepage = "https://github.com/TerrorJack/simple-download#readme"; + description = "A simple wrapper of http-conduit for file download"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "simple-eval" = callPackage ({ mkDerivation, base, parsec, text, transformers }: mkDerivation { @@ -147903,6 +147827,18 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; + "simple-logger" = callPackage + ({ mkDerivation, base, fast-logger, mtl, text }: + mkDerivation { + pname = "simple-logger"; + version = "0.0.1"; + sha256 = "01efbc3f3859deb175d157e983f3497a4db2eb00b7daf35da9431bcdf484f4eb"; + libraryHaskellDepends = [ base fast-logger mtl text ]; + homepage = "https://github.com/agrafix/simple-logger#readme"; + description = "A very simple but efficient logging framework"; + license = stdenv.lib.licenses.mit; + }) {}; + "simple-neural-networks" = callPackage ({ mkDerivation, base, containers, deepseq, parallel, random, split }: @@ -148621,13 +148557,12 @@ self: { }: mkDerivation { pname = "sized-vector"; - version = "1.4.3.0"; - sha256 = "319fe06e8879373ec7019de6549fcc9a36851f5d4ab62d614bac3782f38d11e4"; + version = "1.4.3.1"; + sha256 = "433dfc02259b362c5c081044ac5ab579228451e3f95b5d941e16970d25c6962a"; libraryHaskellDepends = [ base constraints deepseq equational-reasoning hashable monomorphic singletons template-haskell type-natural ]; - jailbreak = true; homepage = "https://github.com/konn/sized-vector"; description = "Size-parameterized vector types and functions"; license = stdenv.lib.licenses.bsd3; @@ -150872,7 +150807,7 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; - "soap" = callPackage + "soap_0_2_3_0" = callPackage ({ mkDerivation, base, bytestring, conduit, configurator , data-default, exceptions, hspec, http-client, http-types, HUnit , iconv, mtl, resourcet, text, unordered-containers, xml-conduit @@ -150894,6 +150829,31 @@ self: { homepage = "https://bitbucket.org/dpwiz/haskell-soap"; description = "SOAP client tools"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "soap" = callPackage + ({ mkDerivation, base, bytestring, conduit, configurator + , data-default, exceptions, hspec, http-client, http-types, HUnit + , iconv, mtl, resourcet, text, unordered-containers, xml-conduit + , xml-conduit-writer, xml-types + }: + mkDerivation { + pname = "soap"; + version = "0.2.3.1"; + sha256 = "a9cad8d48dfe6674b836e017ba0d1cf80d78f55e543e0bf58d07e5656a6c1c39"; + libraryHaskellDepends = [ + base bytestring conduit configurator data-default exceptions + http-client http-types iconv mtl resourcet text + unordered-containers xml-conduit xml-conduit-writer xml-types + ]; + testHaskellDepends = [ + base bytestring hspec HUnit text unordered-containers xml-conduit + xml-conduit-writer + ]; + homepage = "https://bitbucket.org/dpwiz/haskell-soap"; + description = "SOAP client tools"; + license = stdenv.lib.licenses.mit; }) {}; "soap-openssl" = callPackage @@ -151696,6 +151656,7 @@ self: { editedCabalFile = "adba306bc3280e794c4f69da6fb87346d53bd5c72bd9940069d68d1fc194ce61"; libraryHaskellDepends = [ base transformers ]; testHaskellDepends = [ base tasty tasty-quickcheck ]; + doCheck = false; homepage = "https://github.com/phadej/spdx"; description = "SPDX license expression language"; license = stdenv.lib.licenses.bsd3; @@ -152103,15 +152064,14 @@ self: { }: mkDerivation { pname = "split-record"; - version = "0.1.1.1"; - sha256 = "fb7029494472a22583ac20bfb3f7dcb8db50d44b054f79f7406ad511ddb5a334"; + version = "0.1.1.2"; + sha256 = "8d87da014bbf612290335c4f2df31e77c30882ac3a2b8daae4158eab3483877e"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base numeric-prelude soxlib storablevector synthesizer-core transformers utility-ht ]; - jailbreak = true; homepage = "http://code.haskell.org/~thielema/split-record/"; description = "Split a big audio file into pieces at positions of silence"; license = stdenv.lib.licenses.bsd3; @@ -152875,6 +152835,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "stache_0_1_3" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, deepseq + , directory, exceptions, file-embed, filepath, hspec + , hspec-megaparsec, megaparsec, mtl, template-haskell, text + , unordered-containers, vector, yaml + }: + mkDerivation { + pname = "stache"; + version = "0.1.3"; + sha256 = "2ffd7f2c215ebf9ccf528c6bb82bb87e9aebf443656b4f056627410f8839d819"; + libraryHaskellDepends = [ + aeson base bytestring containers deepseq directory exceptions + filepath megaparsec mtl template-haskell text unordered-containers + vector + ]; + testHaskellDepends = [ + aeson base bytestring containers file-embed hspec hspec-megaparsec + megaparsec text yaml + ]; + jailbreak = true; + homepage = "https://github.com/stackbuilders/stache"; + description = "Mustache templates for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "stack" = callPackage ({ mkDerivation, aeson, ansi-terminal, async, attoparsec, base , base-compat, base16-bytestring, base64-bytestring, binary @@ -152991,18 +152977,17 @@ self: { "stack-run" = callPackage ({ mkDerivation, ansi-terminal, async, base, bytestring, Cabal , conduit, conduit-extra, directory, filepath, MissingH - , projectroot, questioner, stm, terminal-size, time, vty + , projectroot, stm, terminal-size, time, vty }: mkDerivation { pname = "stack-run"; - version = "0.1.1.0"; - sha256 = "06fe29fe67a1fea82708b38d6ebb9752f5c4951261d6a8670ebbfbac4b6691ae"; + version = "0.1.1.3"; + sha256 = "5e70f11916ca2fe00e86b78ba0aa0762b8fe98b34881247035d25273f41ecaf7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ ansi-terminal async base bytestring Cabal conduit conduit-extra - directory filepath MissingH projectroot questioner stm - terminal-size time vty + directory filepath MissingH projectroot stm terminal-size time vty ]; homepage = "https://github.com/yamadapc/stack-run"; description = "An equivalent to cabal run for stack"; @@ -153220,31 +153205,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "stackage-install_0_1_1_1" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, containers - , cryptohash, directory, filepath, http-client, http-client-tls - , http-types, process, stm, tar, text - }: - mkDerivation { - pname = "stackage-install"; - version = "0.1.1.1"; - sha256 = "46af3ae310cd7691f3b9edf3e17b0078c38b81c2c136c1485718f81e7068b875"; - revision = "1"; - editedCabalFile = "4d211f81f164148b6fd1581e19446c1aeb0d5783d8f5b1d4ec7caca2b784edef"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson async base bytestring containers cryptohash directory - filepath http-client http-client-tls http-types process stm tar - text - ]; - executableHaskellDepends = [ base ]; - homepage = "https://github.com/fpco/stackage-install"; - description = "Secure download of packages for cabal-install"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "stackage-install" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers , cryptohash, directory, filepath, http-client, http-client-tls @@ -153511,6 +153471,23 @@ self: { license = "LGPL"; }) {}; + "state-bag" = callPackage + ({ mkDerivation, base, ghc-prim, hspec, primitive, transformers + , vector + }: + mkDerivation { + pname = "state-bag"; + version = "0.1.0.0"; + sha256 = "acbaa99b8dfd4712427effca595a16cdfa6613d59488f0e2c295bc2638402544"; + libraryHaskellDepends = [ + base ghc-prim primitive transformers vector + ]; + testHaskellDepends = [ base hspec transformers ]; + homepage = "http://www.gekkou.co.uk/software/"; + description = "Monad transformers for holding bags of state"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "state-plus" = callPackage ({ mkDerivation, base, checkers, mtl, QuickCheck }: mkDerivation { @@ -154039,11 +154016,10 @@ self: { }: mkDerivation { pname = "stitch"; - version = "0.3.3.0"; - sha256 = "1f27e9ff43da60dd67fe33c7ea927df09c9bfa7968aac0b06f07417eb8cf858e"; + version = "0.4.0.0"; + sha256 = "72c114222abde4dbee6f087def13105bde3036a039ac6ded9e0f44462691ad77"; libraryHaskellDepends = [ base containers text transformers ]; testHaskellDepends = [ base Cabal hspec text ]; - jailbreak = true; description = "lightweight CSS DSL"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -154159,8 +154135,8 @@ self: { }: mkDerivation { pname = "stm-containers"; - version = "0.2.13"; - sha256 = "ba38ce4c8438071fad33d69902e2a8637ec53aec2175b0c88b1de8af02db4b1c"; + version = "0.2.14"; + sha256 = "6d415061d23cee818cd3c879c828809d177c28a1c4d36fdfc408867c3bbe8e6f"; libraryHaskellDepends = [ base base-prelude focus hashable list-t primitive transformers ]; @@ -154616,7 +154592,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stratosphere" = callPackage + "stratosphere_0_1_2_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory , hlint, lens, tasty, tasty-hspec, template-haskell, text , unordered-containers @@ -154642,9 +154618,10 @@ self: { homepage = "https://github.com/frontrowed/stratosphere#readme"; description = "EDSL for AWS CloudFormation"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "stratosphere_0_1_3" = callPackage + "stratosphere" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory , hlint, lens, tasty, tasty-hspec, template-haskell, text , unordered-containers @@ -154667,11 +154644,9 @@ self: { aeson aeson-pretty base bytestring directory hlint lens tasty tasty-hspec template-haskell text unordered-containers ]; - jailbreak = true; homepage = "https://github.com/frontrowed/stratosphere#readme"; description = "EDSL for AWS CloudFormation"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stratum-tool" = callPackage @@ -155743,7 +155718,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "stylish-haskell" = callPackage + "stylish-haskell_0_5_17_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, haskell-src-exts, HUnit, mtl, optparse-applicative , strict, syb, test-framework, test-framework-hunit, yaml @@ -155770,6 +155745,36 @@ self: { homepage = "https://github.com/jaspervdj/stylish-haskell"; description = "Haskell code prettifier"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "stylish-haskell" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , filepath, haskell-src-exts, HUnit, mtl, optparse-applicative + , strict, syb, test-framework, test-framework-hunit, yaml + }: + mkDerivation { + pname = "stylish-haskell"; + version = "0.6.1.0"; + sha256 = "eef85fe3940779e092c3a3ffa26c17ae6c96625a5fa606f0c816a37fce357b0d"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers directory filepath + haskell-src-exts mtl syb yaml + ]; + executableHaskellDepends = [ + aeson base bytestring containers directory filepath + haskell-src-exts mtl optparse-applicative strict syb yaml + ]; + testHaskellDepends = [ + aeson base bytestring containers directory filepath + haskell-src-exts HUnit mtl syb test-framework test-framework-hunit + yaml + ]; + homepage = "https://github.com/jaspervdj/stylish-haskell"; + description = "Haskell code prettifier"; + license = stdenv.lib.licenses.bsd3; }) {}; "stylized" = callPackage @@ -156165,8 +156170,8 @@ self: { ({ mkDerivation, base, Cabal, containers, directory, filepath }: mkDerivation { pname = "superdoc"; - version = "0.1.2.3"; - sha256 = "99666b5f574c053c8c5282a89dc3473e8ce0137fa93f61100f2fd7f83ea2a6e7"; + version = "0.1.2.4"; + sha256 = "24108e7aeefaf7a931594953da53f861cecda3d7a8a3cc27aeaafa361ef06250"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -156448,8 +156453,8 @@ self: { }: mkDerivation { pname = "swagger2"; - version = "2.1"; - sha256 = "b47b4bf7951f46ae80628551d13e877c77a9bd20d7e4e6a270eeed275b739bdc"; + version = "2.1.1"; + sha256 = "f492429ea0f3f48b9bc1c164de17e47509b9192e10b4a53d8c1316e97b366918"; libraryHaskellDepends = [ aeson base base-compat containers generics-sop hashable http-media insert-ordered-containers lens mtl network scientific @@ -156764,43 +156769,6 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; - "sync-mht_0_3_8_4" = callPackage - ({ mkDerivation, array, base, base16-bytestring, byteable, bytes - , bytestring, cereal, containers, cryptohash, directory, exceptions - , filepath, HUnit, io-streams, mtl, process, random, regex-compat - , temporary, text, time, transformers, unix, zlib - }: - mkDerivation { - pname = "sync-mht"; - version = "0.3.8.4"; - sha256 = "f276fac5a403f84dc4d1e75dfe257f3cc9b4c69f03803cd1c5654820a3035138"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base base16-bytestring byteable bytes bytestring cereal - containers cryptohash directory exceptions filepath HUnit - io-streams mtl process random regex-compat temporary text time - transformers unix zlib - ]; - executableHaskellDepends = [ - array base base16-bytestring byteable bytes bytestring cereal - containers cryptohash directory exceptions filepath HUnit - io-streams mtl process random regex-compat temporary text time - transformers unix zlib - ]; - testHaskellDepends = [ - array base base16-bytestring byteable bytes bytestring cereal - containers cryptohash directory exceptions filepath HUnit - io-streams mtl process random regex-compat temporary text time - transformers unix zlib - ]; - jailbreak = true; - homepage = "https://github.com/ekarayel/sync-mht"; - description = "Fast incremental file transfer using Merkle-Hash-Trees"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "sync-mht" = callPackage ({ mkDerivation, array, base, base16-bytestring, byteable, bytes , bytestring, cereal, containers, cryptohash, directory, exceptions @@ -157106,15 +157074,14 @@ self: { }: mkDerivation { pname = "synthesizer-alsa"; - version = "0.5.0.2"; - sha256 = "c3db1a0d422a7348b4dbbae321faba688b564460b9901bd2f85de2dc28b4904c"; + version = "0.5.0.3"; + sha256 = "f8f68c297e3e136b221fa1a66e6074c54b7b929f88749213758b7844d6a309ed"; libraryHaskellDepends = [ alsa-core alsa-pcm alsa-seq base event-list midi midi-alsa non-negative numeric-prelude old-time random sox storablevector synthesizer-core synthesizer-dimensional synthesizer-midi transformers utility-ht ]; - jailbreak = true; homepage = "http://www.haskell.org/haskellwiki/Synthesizer"; description = "Control synthesizer effects via ALSA/MIDI"; license = "GPL"; @@ -157157,14 +157124,13 @@ self: { }: mkDerivation { pname = "synthesizer-dimensional"; - version = "0.7.0.2"; - sha256 = "ebef455e1c0e188b55cbb15f5d88f933303b184ab1aae2b62016e8773fb572f8"; + version = "0.7.0.3"; + sha256 = "7bdd848e7657dc45e9afd7307915d666614d8d40d6883b31eb55423a64230b83"; libraryHaskellDepends = [ base bytestring event-list non-negative numeric-prelude random sox storable-record storablevector synthesizer-core transformers utility-ht ]; - jailbreak = true; homepage = "http://www.haskell.org/haskellwiki/Synthesizer"; description = "Audio signal processing with static physical dimensions"; license = "GPL"; @@ -157731,8 +157697,8 @@ self: { }: mkDerivation { pname = "table-layout"; - version = "0.6.0.1"; - sha256 = "e03658d0a01721794b53d52b4b5997bbf5135cfa0597843f537a229642f5b2de"; + version = "0.7.0.0"; + sha256 = "6f84aff983689619e1733858c3e4c0c89befc6777ea3c50c73642dc9428e6908"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -157948,6 +157914,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tagged_0_8_5" = callPackage + ({ mkDerivation, base, deepseq, template-haskell, transformers + , transformers-compat + }: + mkDerivation { + pname = "tagged"; + version = "0.8.5"; + sha256 = "e47c51c955ed77b0fa36897f652df990aa0a8c4eb278efaddcd604be00fc8d99"; + libraryHaskellDepends = [ + base deepseq template-haskell transformers transformers-compat + ]; + homepage = "http://github.com/ekmett/tagged"; + description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tagged-binary" = callPackage ({ mkDerivation, base, binary, bytestring, pureMD5 }: mkDerivation { @@ -158899,25 +158882,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "tasty-rerun_1_1_5" = callPackage - ({ mkDerivation, base, containers, mtl, optparse-applicative - , reducers, split, stm, tagged, tasty, transformers - }: - mkDerivation { - pname = "tasty-rerun"; - version = "1.1.5"; - sha256 = "9877de7602a231fb9cf772c47f9a15ef6764e159ddd96a350a7c16b1a158403e"; - libraryHaskellDepends = [ - base containers mtl optparse-applicative reducers split stm tagged - tasty transformers - ]; - jailbreak = true; - homepage = "http://github.com/ocharles/tasty-rerun"; - description = "Run tests by filtering the test tree depending on the result of previous test runs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "tasty-rerun" = callPackage ({ mkDerivation, base, containers, mtl, optparse-applicative , reducers, split, stm, tagged, tasty, transformers @@ -159127,8 +159091,8 @@ self: { }: mkDerivation { pname = "tcp-streams"; - version = "0.2.1.0"; - sha256 = "6a379d1d4e3727cb7f9ce1cd36736e93a9ad8eb58aceb0418729a96b23fe8814"; + version = "0.3.0.0"; + sha256 = "850582af5b8020aa30b4593b31be2710fbb28624fa440d01d01dda70058d596a"; libraryHaskellDepends = [ base bytestring data-default-class HsOpenSSL HsOpenSSL-x509-system io-streams network pem tls x509 x509-store x509-system @@ -160363,7 +160327,7 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; - "texmath" = callPackage + "texmath_0_8_6_4" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , mtl, pandoc-types, parsec, process, split, syb, temporary, text , utf8-string, xml @@ -160382,6 +160346,28 @@ self: { homepage = "http://github.com/jgm/texmath"; description = "Conversion between formats used to represent mathematics"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "texmath" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, filepath + , mtl, pandoc-types, parsec, process, split, syb, temporary, text + , utf8-string, xml + }: + mkDerivation { + pname = "texmath"; + version = "0.8.6.5"; + sha256 = "33f8c3d78f2f46246b64cecab47e27f1f4e587f05b2375e94a8a43dfce446c90"; + libraryHaskellDepends = [ + base containers mtl pandoc-types parsec syb xml + ]; + testHaskellDepends = [ + base bytestring directory filepath process split temporary text + utf8-string xml + ]; + homepage = "http://github.com/jgm/texmath"; + description = "Conversion between formats used to represent mathematics"; + license = "GPL"; }) {}; "texrunner" = callPackage @@ -160433,8 +160419,8 @@ self: { ({ mkDerivation, base, text, text-format, text-show }: mkDerivation { pname = "text-all"; - version = "0.3.0.0"; - sha256 = "b982107ded04aa3570f363209477210a3eb82536f3e14d7bbc2a9b6d099d3743"; + version = "0.3.0.1"; + sha256 = "2ffe6420dc2793b2e0ff8b108b4fc04fc76ab3cc562b0007c6c134515247004c"; libraryHaskellDepends = [ base text text-format text-show ]; homepage = "http://github.com/aelve/text-all"; description = "Everything Data.Text related in one package"; @@ -160845,29 +160831,28 @@ self: { "text-show" = callPackage ({ mkDerivation, array, base, base-compat, base-orphans, bifunctors - , bytestring, bytestring-builder, containers, generic-deriving - , ghc-boot, ghc-prim, hspec, integer-gmp, nats, QuickCheck - , quickcheck-instances, semigroups, tagged, template-haskell, text - , th-lift, transformers, transformers-compat, void + , bytestring, bytestring-builder, containers, contravariant + , deriving-compat, generic-deriving, ghc-boot-th, ghc-prim, hspec + , integer-gmp, nats, QuickCheck, quickcheck-instances, semigroups + , tagged, template-haskell, text, th-lift, transformers + , transformers-compat, void }: mkDerivation { pname = "text-show"; - version = "3.2.2"; - sha256 = "93a9479d19f303d4e8310ae8e35a8609d27ef6e443f8a4531c73bd5d1bbd4c40"; - revision = "1"; - editedCabalFile = "2d52fb92d26513d648126820f6abffa4e2971fde5565a3608982dabec0cd7152"; + version = "3.3"; + sha256 = "a581f42ee24690fd96dd81179b86135e95502b22f2ab41d28f81acfd882d92e6"; libraryHaskellDepends = [ array base base-compat bifunctors bytestring bytestring-builder - containers generic-deriving ghc-boot ghc-prim integer-gmp nats - semigroups tagged template-haskell text th-lift transformers - transformers-compat void + containers contravariant generic-deriving ghc-boot-th ghc-prim + integer-gmp nats semigroups tagged template-haskell text th-lift + transformers transformers-compat void ]; testHaskellDepends = [ array base base-compat base-orphans bifunctors bytestring - bytestring-builder containers generic-deriving ghc-boot ghc-prim - hspec integer-gmp nats QuickCheck quickcheck-instances semigroups - tagged template-haskell text th-lift transformers - transformers-compat void + bytestring-builder containers contravariant deriving-compat + generic-deriving ghc-boot-th ghc-prim hspec integer-gmp nats + QuickCheck quickcheck-instances semigroups tagged template-haskell + text th-lift transformers transformers-compat void ]; homepage = "https://github.com/RyanGlScott/text-show"; description = "Efficient conversion of values into Text"; @@ -160876,32 +160861,31 @@ self: { "text-show-instances" = callPackage ({ mkDerivation, base, base-compat, bifunctors, binary, bytestring - , containers, directory, generic-deriving, ghc-prim, haskeline - , hoopl, hpc, hspec, old-locale, old-time, pretty, QuickCheck - , quickcheck-instances, random, semigroups, tagged + , containers, directory, generic-deriving, ghc-boot, ghc-prim + , haskeline, hoopl, hpc, hspec, old-locale, old-time, pretty + , QuickCheck, quickcheck-instances, random, semigroups, tagged , template-haskell, terminfo, text, text-show, th-orphans, time , transformers, transformers-compat, unix, unordered-containers , vector, xhtml }: mkDerivation { pname = "text-show-instances"; - version = "3.2.1"; - sha256 = "33433b9d15d43254e1dbca31fdf226579a77c8c12e98e76a29a566703a000c68"; - revision = "1"; - editedCabalFile = "779438a1fe229b098458abe877276c851c4fb8ccf095213d9b7018e95715e04e"; + version = "3.3"; + sha256 = "795d7e22f4ade987293a8b0376ef976822fb7f3383b4e1629566d27c1c4f991c"; libraryHaskellDepends = [ base base-compat bifunctors binary bytestring containers directory - haskeline hoopl hpc old-locale old-time pretty random semigroups - tagged template-haskell terminfo text text-show time transformers - transformers-compat unix unordered-containers vector xhtml + ghc-boot haskeline hoopl hpc old-locale old-time pretty random + semigroups tagged template-haskell terminfo text text-show time + transformers transformers-compat unix unordered-containers vector + xhtml ]; testHaskellDepends = [ base base-compat bifunctors binary bytestring containers directory - generic-deriving ghc-prim haskeline hoopl hpc hspec old-locale - old-time pretty QuickCheck quickcheck-instances random semigroups - tagged template-haskell terminfo text text-show th-orphans time - transformers transformers-compat unix unordered-containers vector - xhtml + generic-deriving ghc-boot ghc-prim haskeline hoopl hpc hspec + old-locale old-time pretty QuickCheck quickcheck-instances random + semigroups tagged template-haskell terminfo text text-show + th-orphans time transformers transformers-compat unix + unordered-containers vector xhtml ]; homepage = "https://github.com/RyanGlScott/text-show-instances"; description = "Additional instances for text-show"; @@ -161429,26 +161413,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "th-lift-instances_0_1_9" = callPackage - ({ mkDerivation, base, bytestring, containers, QuickCheck - , template-haskell, text, th-lift, vector - }: - mkDerivation { - pname = "th-lift-instances"; - version = "0.1.9"; - sha256 = "6c44eb1d62dc1073b8719b21bf36ecf10d6b38fdf371dc855adfeda51367755b"; - libraryHaskellDepends = [ - base bytestring containers template-haskell text th-lift vector - ]; - testHaskellDepends = [ - base bytestring containers QuickCheck template-haskell text vector - ]; - homepage = "http://github.com/bennofs/th-lift-instances/"; - description = "Lift instances for template-haskell for common data types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "th-lift-instances" = callPackage ({ mkDerivation, base, bytestring, containers, QuickCheck , template-haskell, text, th-lift, vector @@ -161491,8 +161455,8 @@ self: { }: mkDerivation { pname = "th-orphans"; - version = "0.13.1"; - sha256 = "bfa4b391bae1eeb8470e05b43b229e4f6eb8af5c5a4d39b723801963f325e141"; + version = "0.13.2"; + sha256 = "ac863234791b0860f7a33adc8656f0026698e1247c5fa4bd13d7befbfddc0204"; libraryHaskellDepends = [ base mtl template-haskell th-lift th-lift-instances th-reify-many ]; @@ -161608,29 +161572,6 @@ self: { }: mkDerivation { pname = "th-utilities"; - version = "0.1.1.0"; - sha256 = "8d9905d0be5ac2e009f0cab4f0c44e61b997beb8c3e7183bb1ce544217cbbe70"; - libraryHaskellDepends = [ - base bytestring containers directory filepath primitive syb - template-haskell text th-orphans - ]; - testHaskellDepends = [ - base bytestring containers directory filepath hspec primitive syb - template-haskell text th-orphans vector - ]; - doCheck = false; - homepage = "https://github.com/fpco/th-utilities#readme"; - description = "Collection of useful functions for use with Template Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = [ "x86_64-darwin" ]; - }) {}; - - "th-utilities_0_1_1_1" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, filepath - , hspec, primitive, syb, template-haskell, text, th-orphans, vector - }: - mkDerivation { - pname = "th-utilities"; version = "0.1.1.1"; sha256 = "05da9652c04535fadf7a5b937fbbd96df989b787c12dd5f829919487b64aa631"; libraryHaskellDepends = [ @@ -161644,7 +161585,7 @@ self: { homepage = "https://github.com/fpco/th-utilities#readme"; description = "Collection of useful functions for use with Template Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = [ "x86_64-darwin" ]; }) {}; "themoviedb" = callPackage @@ -161780,25 +161721,25 @@ self: { }) {}; "these" = callPackage - ({ mkDerivation, base, bifunctors, containers, data-default-class - , hashable, mtl, profunctors, QuickCheck, quickcheck-instances - , semigroupoids, tasty, tasty-quickcheck, transformers - , transformers-compat, unordered-containers, vector + ({ mkDerivation, aeson, base, bifunctors, binary, containers + , data-default-class, deepseq, hashable, keys, mtl, profunctors + , QuickCheck, quickcheck-instances, semigroupoids, tasty + , tasty-quickcheck, transformers, transformers-compat + , unordered-containers, vector, vector-instances }: mkDerivation { pname = "these"; - version = "0.7"; - sha256 = "21959dd626454a9b7f0ac7b57d923802b72d008ca77f752fa8f569698bf6ea10"; - revision = "2"; - editedCabalFile = "2b24a8c4430c41db5ee2e58f853f944e4500ce6c2ccd0899502e701312e452c4"; + version = "0.7.1"; + sha256 = "97102610f8822ce6f543d2d6219555b8696c78b2e220c7fa73fb3e9489a04439"; libraryHaskellDepends = [ - base bifunctors containers data-default-class hashable mtl - profunctors semigroupoids transformers transformers-compat - unordered-containers vector + aeson base bifunctors binary containers data-default-class deepseq + hashable keys mtl profunctors QuickCheck semigroupoids transformers + transformers-compat unordered-containers vector vector-instances ]; testHaskellDepends = [ - base bifunctors containers hashable QuickCheck quickcheck-instances - tasty tasty-quickcheck transformers unordered-containers vector + aeson base bifunctors binary containers hashable QuickCheck + quickcheck-instances tasty tasty-quickcheck transformers + unordered-containers vector ]; homepage = "https://github.com/isomorphism/these"; description = "An either-or-both data type & a generalized 'zip with padding' typeclass"; @@ -162198,7 +162139,7 @@ self: { description = "A desktop bar based on WebKit"; license = stdenv.lib.licenses.mit; hydraPlatforms = [ "x86_64-darwin" ]; - }) {gtk3 = pkgs.gnome2.gtk;}; + }) {gtk3 = pkgs.gnome3.gtk;}; "tic-tac-toe" = callPackage ({ mkDerivation, base, glade, gtk, haskell98 }: @@ -162647,8 +162588,8 @@ self: { pname = "time-parsers"; version = "0.1.0.0"; sha256 = "e4eb246c3d97e69785a26ecd91381b4cf80e4d1d4313381ad68861b7e72ccff8"; - revision = "3"; - editedCabalFile = "b05dabb850510fe5c058510383fda2e2b6fda4775802440a0f85eb7c4a0e175e"; + revision = "4"; + editedCabalFile = "b245d40a3dd52af19e835fb9b0aaa9373dddd63cff13a3c298c97e02bca29e1e"; libraryHaskellDepends = [ base parsers template-haskell time ]; testHaskellDepends = [ attoparsec base bifunctors parsec parsers tasty tasty-hunit @@ -164271,6 +164212,28 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; + "transient-universe_0_3_2" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, containers + , directory, filepath, hashable, HTTP, iproute, mtl, network + , network-info, network-uri, process, random, stm, TCache, text + , time, transformers, transient, vector, websockets + }: + mkDerivation { + pname = "transient-universe"; + version = "0.3.2"; + sha256 = "2c5871cc7d15b666c78651501d006cb6a9759ea547a97cb9ee70ced6e88c3297"; + libraryHaskellDepends = [ + base bytestring case-insensitive containers directory filepath + hashable HTTP iproute mtl network network-info network-uri process + random stm TCache text time transformers transient vector + websockets + ]; + homepage = "http://www.fpcomplete.com/user/agocorona"; + description = "Remote execution and map-reduce: distributed computing for Transient"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "translatable-intset" = callPackage ({ mkDerivation, base, fingertree }: mkDerivation { @@ -165118,6 +165081,19 @@ self: { license = "GPL"; }) {}; + "turing-machines" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "turing-machines"; + version = "0.1.0.1"; + sha256 = "65c4a837e590e86350e0aa3c7c8cd9c85037a07e28449bd02adacfb64937d0aa"; + libraryHaskellDepends = [ base ]; + jailbreak = true; + homepage = "https://github.com/jariazavalverde/hackage-turing-machines"; + description = "A simple simulator for Turing machines"; + license = stdenv.lib.licenses.mit; + }) {}; + "turing-music" = callPackage ({ mkDerivation, ALUT, base }: mkDerivation { @@ -165945,10 +165921,9 @@ self: { ({ mkDerivation, base, type-level }: mkDerivation { pname = "type-equality-check"; - version = "0.0.0.3"; - sha256 = "c7f8bcc8bfc2b87f7ce4e48ce422c3a8cfe2d4807c4edacca638c2a55715523b"; + version = "0.0.0.4"; + sha256 = "91a1e5e0e34737c956ee7a84492dbf91f49d7c4fa5e8037e3167483f6f170fe4"; libraryHaskellDepends = [ base type-level ]; - jailbreak = true; homepage = "http://darcs.wolfgang.jeltsch.info/haskell/type-equality-check"; description = "Type equality check"; license = stdenv.lib.licenses.bsd3; @@ -165972,12 +165947,9 @@ self: { ({ mkDerivation, base, kinds }: mkDerivation { pname = "type-functions"; - version = "0.2.0.3"; - sha256 = "55ed9016a713a74f40c9b6c148b6d12cb749a5b3cbfcd55dd0e3fef1c3e446ef"; - revision = "1"; - editedCabalFile = "cbcb6222648cd677de48ef9592d2f2387f8b3fef59b9a5411e3864c561c795ab"; + version = "0.2.0.4"; + sha256 = "c8534aa61f06628d572a39fce794cb6526a2ffa5b7fb27301c86759e7e6961c5"; libraryHaskellDepends = [ base kinds ]; - jailbreak = true; homepage = "http://darcs.wolfgang.jeltsch.info/haskell/type-functions"; description = "Emulation of type-level functions"; license = stdenv.lib.licenses.bsd3; @@ -166147,17 +166119,17 @@ self: { "type-natural" = callPackage ({ mkDerivation, base, constraints, equational-reasoning - , monomorphic, singletons, template-haskell + , ghc-typelits-natnormalise, ghc-typelits-presburger, monomorphic + , singletons, template-haskell }: mkDerivation { pname = "type-natural"; - version = "0.3.0.0"; - sha256 = "6a85b784389ee2d7240f0222cace4e3ff69ae8827f2d591773c0a02abfc0080b"; + version = "0.4.1.1"; + sha256 = "aebf48c5ecee80effa51d564783cb26be918b3e9ece9feffd4854ad7f3a15ea1"; libraryHaskellDepends = [ - base constraints equational-reasoning monomorphic singletons - template-haskell + base constraints equational-reasoning ghc-typelits-natnormalise + ghc-typelits-presburger monomorphic singletons template-haskell ]; - jailbreak = true; homepage = "https://github.com/konn/type-natural"; description = "Type-level natural and proofs of their properties"; license = stdenv.lib.licenses.bsd3; @@ -166510,6 +166482,33 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; + "typerbole" = callPackage + ({ mkDerivation, base, bifunctors, checkers, containers + , data-ordlist, either, fgl, generic-random, hspec, lens + , megaparsec, mtl, QuickCheck, safe, semigroups, syb + , template-haskell, th-lift + }: + mkDerivation { + pname = "typerbole"; + version = "0.0.0.5"; + sha256 = "69c659f118017ef1bb99267d64b5c330115a589801481f3ee25c41067e0781a6"; + revision = "1"; + editedCabalFile = "62f89e02f7752d24111a37f753a4024f84828a4af7dc7de3af25d70d5b17981b"; + libraryHaskellDepends = [ + base bifunctors containers data-ordlist either fgl generic-random + lens megaparsec mtl QuickCheck safe semigroups syb template-haskell + th-lift + ]; + testHaskellDepends = [ + base bifunctors checkers containers either hspec QuickCheck + semigroups syb + ]; + jailbreak = true; + homepage = "https://github.com/Lokidottir/typerbole"; + description = "A typesystems library with exaggerated claims"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "types-compat" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -169469,28 +169468,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "validation_0_5_2" = callPackage - ({ mkDerivation, base, bifunctors, directory, doctest, filepath - , lens, mtl, QuickCheck, semigroupoids, semigroups - , template-haskell, transformers - }: - mkDerivation { - pname = "validation"; - version = "0.5.2"; - sha256 = "dd1a5857ead5b9ceec3839c9b6af7f3096bbc5694e37e34dfd4be7c1d5f35437"; - libraryHaskellDepends = [ - base bifunctors lens mtl semigroupoids semigroups transformers - ]; - testHaskellDepends = [ - base directory doctest filepath QuickCheck template-haskell - ]; - jailbreak = true; - homepage = "https://github.com/NICTA/validation"; - description = "A data-type like Either but with an accumulating Applicative"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "validation" = callPackage ({ mkDerivation, base, bifunctors, directory, doctest, filepath , lens, mtl, QuickCheck, semigroupoids, semigroups @@ -169539,14 +169516,26 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "validity"; - version = "0.2.0.0"; - sha256 = "4e6fb906ca4b7f35995ca2a700f58cfae6bead91319f30c3a2a35ca0ede08d93"; + version = "0.3.0.0"; + sha256 = "38d5604e01679f6c1b6d5e7ef379d7a7ab65020a6dc788b45b1ae349e522620e"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/NorfairKing/validity#readme"; description = "Validity typeclass"; license = stdenv.lib.licenses.mit; }) {}; + "validity-containers" = callPackage + ({ mkDerivation, base, containers, validity }: + mkDerivation { + pname = "validity-containers"; + version = "0.1.0.0"; + sha256 = "58d5a5b068ec6f53718d73a6fdc7e76f15cad27fe6f1deff2132bb577e25e6f5"; + libraryHaskellDepends = [ base containers validity ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "Validity instances for containers"; + license = stdenv.lib.licenses.mit; + }) {}; + "value-supply" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -169995,6 +169984,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vector-bytes-instances" = callPackage + ({ mkDerivation, base, bytes, tasty, tasty-quickcheck, vector }: + mkDerivation { + pname = "vector-bytes-instances"; + version = "0.1"; + sha256 = "eab90f20312299512d2c919a30a16568813be651f5de768e1e225c8634d2baae"; + libraryHaskellDepends = [ base bytes vector ]; + testHaskellDepends = [ base bytes tasty tasty-quickcheck vector ]; + homepage = "https://github.com/k0001/vector-bytes-instances"; + description = "Serial (from the bytes package) for Vector (from the vector package)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "vector-bytestring" = callPackage ({ mkDerivation, base, bytestring, deepseq, directory, ghc-prim , primitive, QuickCheck, random, vector @@ -170146,7 +170148,10 @@ self: { pname = "vector-random"; version = "0.2"; sha256 = "6bb735a7bf2c81ac75029499bc160d22f4a2a721ab6bf23ae26cd5a217c1e4b8"; + revision = "2"; + editedCabalFile = "de331a5826345df371a52a3b130f1f608611f564dee5e82a4cb561482e4d447b"; libraryHaskellDepends = [ base mersenne-random-pure64 vector ]; + jailbreak = true; homepage = "http://code.haskell.org/~dons/code/vector-random"; description = "Generate vectors filled with high quality pseudorandom numbers"; license = stdenv.lib.licenses.bsd3; @@ -170275,8 +170280,8 @@ self: { }: mkDerivation { pname = "vectortiles"; - version = "1.1.0"; - sha256 = "0a43edc63ae436bc4ccaeb4bfcf1b007c533b7adb5968ae95d7c081df8938aef"; + version = "1.2.0"; + sha256 = "c8876068442349178a8626608b777f707cbe9dc7dc465b250b6e303de4c654ae"; libraryHaskellDepends = [ base bytestring cereal containers deepseq protobuf text th-printf transformers vector @@ -171598,8 +171603,8 @@ self: { }: mkDerivation { pname = "wai-http2-extra"; - version = "0.0.2"; - sha256 = "f5442dfcb2eb91e3a5a96b1836d96b63d00147cd3dc165876f24571dcc6453fe"; + version = "0.1.0"; + sha256 = "8d9e64d785024be7c1a3b316f9cb49cb471791a0d5b75216d45a89bc0d1915bf"; libraryHaskellDepends = [ auto-update base bytestring containers http-types wai warp word8 ]; @@ -171891,36 +171896,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "wai-middleware-crowd_0_1_4" = callPackage - ({ mkDerivation, authenticate, base, base64-bytestring, binary - , blaze-builder, bytestring, case-insensitive, clientsession - , containers, cookie, gitrev, http-client, http-client-tls - , http-reverse-proxy, http-types, optparse-applicative, resourcet - , template-haskell, text, time, transformers, unix-compat, vault - , wai, wai-app-static, wai-extra, warp - }: - mkDerivation { - pname = "wai-middleware-crowd"; - version = "0.1.4"; - sha256 = "f496aa3581ecb75ec611c50fbbb10b17cbca612c7caba00dfa24191aba1585cb"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - authenticate base base64-bytestring binary blaze-builder bytestring - case-insensitive clientsession containers cookie http-client - http-client-tls http-types resourcet text time unix-compat vault - wai - ]; - executableHaskellDepends = [ - base bytestring clientsession gitrev http-client http-client-tls - http-reverse-proxy http-types optparse-applicative template-haskell - text transformers wai wai-app-static wai-extra warp - ]; - description = "Middleware and utilities for using Atlassian Crowd authentication"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "wai-middleware-crowd" = callPackage ({ mkDerivation, authenticate, base, base64-bytestring, binary , blaze-builder, bytestring, case-insensitive, clientsession @@ -172871,24 +172846,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "wavefront_0_7" = callPackage - ({ mkDerivation, attoparsec, base, dlist, filepath, mtl, text - , transformers, vector - }: - mkDerivation { - pname = "wavefront"; - version = "0.7"; - sha256 = "4ccdfd6b8c22a24bdcc91f067b6234e9fe69cef1864dcda4c9b134c7cdfa416c"; - libraryHaskellDepends = [ - attoparsec base dlist filepath mtl text transformers vector - ]; - jailbreak = true; - homepage = "https://github.com/phaazon/wavefront"; - description = "Wavefront OBJ loader"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "wavefront" = callPackage ({ mkDerivation, attoparsec, base, dlist, filepath, mtl, text , transformers, vector @@ -173108,7 +173065,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "web-routes" = callPackage + "web-routes_0_27_10" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, exceptions , ghc-prim, hspec, http-types, HUnit, mtl, parsec, QuickCheck , split, text, utf8-string @@ -173125,6 +173082,26 @@ self: { homepage = "http://www.happstack.com/docs/crashcourse/index.html#web-routes"; description = "portable, type-safe URL routing"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "web-routes" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, exceptions + , ghc-prim, hspec, http-types, HUnit, mtl, parsec, QuickCheck + , split, text, utf8-string + }: + mkDerivation { + pname = "web-routes"; + version = "0.27.11"; + sha256 = "45624d4d8a912809603d72a36bf738a027ebec71ce0104928f144abb16de8cd8"; + libraryHaskellDepends = [ + base blaze-builder bytestring exceptions ghc-prim http-types mtl + parsec split text utf8-string + ]; + testHaskellDepends = [ base hspec HUnit QuickCheck text ]; + homepage = "http://www.happstack.com/docs/crashcourse/index.html#web-routes"; + description = "portable, type-safe URL routing"; + license = stdenv.lib.licenses.bsd3; }) {}; "web-routes-boomerang" = callPackage @@ -173695,7 +173672,7 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; - "websockets" = callPackage + "websockets_0_9_6_2" = callPackage ({ mkDerivation, attoparsec, base, base64-bytestring, binary , blaze-builder, bytestring, case-insensitive, containers, entropy , HUnit, network, QuickCheck, random, SHA, test-framework @@ -173721,6 +173698,33 @@ self: { homepage = "http://jaspervdj.be/websockets"; description = "A sensible and clean way to write WebSocket-capable servers in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "websockets" = callPackage + ({ mkDerivation, attoparsec, base, base64-bytestring, binary + , blaze-builder, bytestring, case-insensitive, containers, entropy + , HUnit, network, QuickCheck, random, SHA, test-framework + , test-framework-hunit, test-framework-quickcheck2, text + }: + mkDerivation { + pname = "websockets"; + version = "0.9.7.0"; + sha256 = "07141953f005347214233617ce2654265dea67f63ffbcf4656fdea47066b7baa"; + libraryHaskellDepends = [ + attoparsec base base64-bytestring binary blaze-builder bytestring + case-insensitive containers entropy network random SHA text + ]; + testHaskellDepends = [ + attoparsec base base64-bytestring binary blaze-builder bytestring + case-insensitive containers entropy HUnit network QuickCheck random + SHA test-framework test-framework-hunit test-framework-quickcheck2 + text + ]; + doCheck = false; + homepage = "http://jaspervdj.be/websockets"; + description = "A sensible and clean way to write WebSocket-capable servers in Haskell"; + license = stdenv.lib.licenses.bsd3; }) {}; "websockets-snap" = callPackage @@ -174697,6 +174701,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "workdays" = callPackage + ({ mkDerivation, base, containers, doctest, hspec, time }: + mkDerivation { + pname = "workdays"; + version = "0.1.0"; + sha256 = "61c41d0b6257630ed2e9b484264a8f0c19595e6f0bf1c30dd35129951bd4a4de"; + libraryHaskellDepends = [ base containers time ]; + testHaskellDepends = [ base containers doctest hspec ]; + homepage = "https://github.com/stackbuilders/workdays"; + description = "Workday calculations"; + license = stdenv.lib.licenses.mit; + }) {}; + "workflow-osx" = callPackage ({ mkDerivation, base, bv, bytestring, exceptions, filepath, free , http-types, mtl, transformers @@ -174766,8 +174783,8 @@ self: { }: mkDerivation { pname = "wraxml"; - version = "0.4.4"; - sha256 = "2347454654a07e8865c14986db9df95b323ba0170310933d52731b0cb6c214c1"; + version = "0.4.4.1"; + sha256 = "828d9250db9472c321c55d08f9daa2c4c9995e95d2fd964ef0c1d16b32c75613"; libraryHaskellDepends = [ base containers data-accessor explicit-exception HaXml hxt hxt-filter polyparse tagchup tagsoup transformers utility-ht @@ -175826,34 +175843,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "xlsx_0_2_2_2" = callPackage - ({ mkDerivation, base, base64-bytestring, binary-search, bytestring - , conduit, containers, data-default, extra, filepath, HUnit, lens - , mtl, network-uri, old-locale, raw-strings-qq, safe, smallcheck - , tasty, tasty-hunit, tasty-smallcheck, text, time, transformers - , unordered-containers, vector, xml-conduit, zip-archive, zlib - }: - mkDerivation { - pname = "xlsx"; - version = "0.2.2.2"; - sha256 = "3dfadd268e41b3bc61ef45844cf40cbf06d79d081fd42d897e2f047cf3aedc30"; - libraryHaskellDepends = [ - base base64-bytestring binary-search bytestring conduit containers - data-default extra filepath lens mtl network-uri old-locale safe - text time transformers unordered-containers vector xml-conduit - zip-archive zlib - ]; - testHaskellDepends = [ - base bytestring containers HUnit lens raw-strings-qq smallcheck - tasty tasty-hunit tasty-smallcheck time unordered-containers vector - xml-conduit - ]; - homepage = "https://github.com/qrilka/xlsx"; - description = "Simple and incomplete Excel file parser/writer"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "xlsx" = callPackage ({ mkDerivation, base, base64-bytestring, binary-search, bytestring , conduit, containers, data-default, Diff, extra, filepath, groom @@ -176541,8 +176530,8 @@ self: { }: mkDerivation { pname = "xmobar"; - version = "0.23.1"; - sha256 = "3b31558373bdb8561f06440da902dd0db8398e5c774fa027931785c263f5567a"; + version = "0.24.1"; + sha256 = "94b61be06a6c08d8f7dced28e4721acb231987710981ef9c438c60f3a133d985"; configureFlags = [ "-fall_extensions" ]; isLibrary = false; isExecutable = true; @@ -177263,35 +177252,6 @@ self: { }: mkDerivation { pname = "yaml"; - version = "0.8.18"; - sha256 = "65d49ec10b0a11c885b380b2f351000200d151e88b1d1b2d4a2fbf519c1afe29"; - configureFlags = [ "-fsystem-libyaml" ]; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec base bytestring conduit containers directory - enclosed-exceptions filepath resourcet scientific semigroups text - transformers unordered-containers vector - ]; - libraryPkgconfigDepends = [ libyaml ]; - executableHaskellDepends = [ aeson base bytestring ]; - testHaskellDepends = [ - aeson aeson-qq base base-compat bytestring conduit hspec HUnit - mockery resourcet text transformers unordered-containers vector - ]; - homepage = "http://github.com/snoyberg/yaml/"; - description = "Support for parsing and rendering YAML documents"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) libyaml;}; - - "yaml_0_8_18_1" = callPackage - ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat - , bytestring, conduit, containers, directory, enclosed-exceptions - , filepath, hspec, HUnit, libyaml, mockery, resourcet, scientific - , semigroups, text, transformers, unordered-containers, vector - }: - mkDerivation { - pname = "yaml"; version = "0.8.18.1"; sha256 = "24610e879d243dd7307123d076d436197f7e28bee5d6a78cafe444833cc9ac7a"; configureFlags = [ "-fsystem-libyaml" ]; @@ -177311,7 +177271,6 @@ self: { homepage = "http://github.com/snoyberg/yaml/"; description = "Support for parsing and rendering YAML documents"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libyaml;}; "yaml-config" = callPackage @@ -179949,12 +179908,11 @@ self: { ({ mkDerivation, base, bytestring, process, utility-ht }: mkDerivation { pname = "youtube"; - version = "0.2.0.1"; - sha256 = "a40a7a4d25e701c805262f9b0c9e6fdfd78d5b57185cc366fb8d51a7d0396358"; + version = "0.2.1"; + sha256 = "7de760b734e35aec2eedc421a785b04cf0c519021246c756cf560cf06f0765d1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bytestring process utility-ht ]; - jailbreak = true; description = "Upload video to YouTube via YouTube API"; license = stdenv.lib.licenses.bsd3; }) {}; diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 3802a43348ba..04d6c706b46c 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -74,8 +74,8 @@ let preConfigure = '' configureFlags="$configureFlags -Dprefix=$out -Dman1dir=$out/share/man/man1 -Dman3dir=$out/share/man/man3" - '' + optionalString stdenv.isArm '' - configureFlagsArray=(-Dldflags="-lm -lrt") + '' + optionalString (stdenv.isArm || stdenv.isMips) '' + configureFlagsArray=(-Dldflags="-lm -lrt") '' + optionalString stdenv.isDarwin '' substituteInPlace hints/darwin.sh --replace "env MACOSX_DEPLOYMENT_TARGET=10.3" "" '' + optionalString (!enableThreading) '' diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 11910acb5499..bffd4ce38a26 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -301,13 +301,13 @@ let in { php55 = generic { - version = "5.5.37"; - sha256 = "122xj115fjl6rqlxqqjzvh16fbm801yqcmfh9hn7zwfa8sz0wf6j"; + version = "5.5.38"; + sha256 = "0f1y76whg6yx9a18mh97f8yq8lb64ri1f0zfr9la9374nbmq2g27"; }; php56 = generic { - version = "5.6.23"; - sha256 = "1isq6pym20nwsf2j1jdz321vck9xd6g86q2b13vycxyjjq42ikgs"; + version = "5.6.24"; + sha256 = "1iiqmjgxr10ci69f33fzyhplp06km6ybgqmxr1g142pdqdz628xz"; }; php70 = generic { diff --git a/pkgs/development/interpreters/tcl/8.6.nix b/pkgs/development/interpreters/tcl/8.6.nix index fd88c8e87166..61d67a874e90 100644 --- a/pkgs/development/interpreters/tcl/8.6.nix +++ b/pkgs/development/interpreters/tcl/8.6.nix @@ -2,10 +2,10 @@ callPackage ./generic.nix (args // rec { release = "8.6"; - version = "${release}.4"; + version = "${release}.6"; src = fetchurl { url = "mirror://sourceforge/tcl/tcl${version}-src.tar.gz"; - sha256 = "13cwa4bc85ylf5gfj9vk182lvgy60qni3f7gbxghq78wk16djvly"; + sha256 = "01zypqhy57wvh1ikk28bg733sk5kf4q568pq9v6fvcz4h6bl0rd2"; }; }) diff --git a/pkgs/development/interpreters/tcl/generic.nix b/pkgs/development/interpreters/tcl/generic.nix index cfa4bb48c197..d01df5ce8be8 100644 --- a/pkgs/development/interpreters/tcl/generic.nix +++ b/pkgs/development/interpreters/tcl/generic.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { homepage = http://www.tcl.tk/; license = licenses.tcltk; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; + maintainers = with maintainers; [ wkennington vrthra ]; }; passthru = rec { diff --git a/pkgs/development/interpreters/wasm/default.nix b/pkgs/development/interpreters/wasm/default.nix new file mode 100644 index 000000000000..56eebbf89a2e --- /dev/null +++ b/pkgs/development/interpreters/wasm/default.nix @@ -0,0 +1,56 @@ +{ stdenv, fetchFromGitHub, cmake, clang, python, v8_static, coreutils }: + +let + sexpr_wasm_prototype = stdenv.mkDerivation { + name = "sexpr_wasm_prototype"; + src = fetchFromGitHub { + owner = "WebAssembly"; + repo = "sexpr-wasm-prototype"; + rev = "1347a367c34876bfe92562f244a8c8b770372479"; + sha256 = "1v1mph5fp1rffhvh8bbx937gpjqjrdgm7yhffdxzdn4pih9d0grn"; + }; + + configurePhase = '' + # set this to nonempty string to disable default cmake configure + ''; + + buildInputs = [ cmake clang python ]; + + buildPhase = "make clang-debug-no-tests"; + installPhase = '' + mkdir -p $out/bin + cp out/clang/Debug/no-tests/sexpr-wasm $out/bin + ''; + }; + +in + +stdenv.mkDerivation { + name = "wasm-0.0.1"; + + src = fetchFromGitHub { + owner = "proglodyte"; + repo = "wasm"; + rev = "650188eecaaf4b64f12b341986b4e89e5fdb3bbe"; + sha256 = "1f5mdl0l2448lx7h36b4bdr541a4q1wapn1kdwrd4z7s94n7a5gq"; + }; + + configurePhase = '' + sed -i -e "s|sudo ||g" Makefile + ''; + + installPhase = '' + export DESTDIR=$out + export MKTEMPDIR=${coreutils}/bin + export D8DIR=${v8_static}/bin + export SWDIR=${sexpr_wasm_prototype}/bin + make install + ''; + + meta = with stdenv.lib; { + description = "wasm runs WebAssembly from the command line"; + maintainers = with maintainers; [ proglodyte ]; + platforms = platforms.linux; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 1848bd064f16..948cbacf8766 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -23,6 +23,10 @@ stdenv.mkDerivation rec { ++ lib.optional (apis != ["*"]) "-DBUILD_ONLY=${lib.concatMapStringsSep ";" (api: "aws-cpp-sdk-" + api) apis}"; + # curl upgrade to 7.50.0 (#17152) changes the libcurl headers slightly and + # therefore requires the followin flag until this package gets updated + NIX_CFLAGS_COMPILE = [ "-fpermissive" ]; + enableParallelBuilding = true; preBuild = diff --git a/pkgs/development/libraries/freeglut/default.nix b/pkgs/development/libraries/freeglut/default.nix index 368a1e274878..4135c451eebc 100644 --- a/pkgs/development/libraries/freeglut/default.nix +++ b/pkgs/development/libraries/freeglut/default.nix @@ -11,6 +11,14 @@ in stdenv.mkDerivation { buildInputs = [ libXi libXrandr libXxf86vm mesa xlibsWrapper cmake ]; + cmakeFlags = stdenv.lib.optionals stdenv.isDarwin [ + "-DOPENGL_INCLUDE_DIR=${mesa}/include" + "-DOPENGL_gl_LIBRARY:FILEPATH=${mesa}/lib/libGL.dylib" + "-DOPENGL_glu_LIBRARY:FILEPATH=${mesa}/lib/libGLU.dylib" + "-DFREEGLUT_BUILD_DEMOS:BOOL=OFF" + "-DFREEGLUT_BUILD_STATIC:BOOL=OFF" + ]; + meta = with stdenv.lib; { description = "Create and manage windows containing OpenGL contexts"; longDescription = '' diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix index 100478884239..8d3ef3f4c777 100644 --- a/pkgs/development/libraries/gnutls/generic.nix +++ b/pkgs/development/libraries/gnutls/generic.nix @@ -10,7 +10,7 @@ assert guileBindings -> guile != null; let # XXX: Gnulib's `test-select' fails on FreeBSD: # http://hydra.nixos.org/build/2962084/nixlog/1/raw . - doCheck = (!stdenv.isFreeBSD && !stdenv.isDarwin); + doCheck = !stdenv.isFreeBSD && !stdenv.isDarwin && lib.versionAtLeast version "3.4"; in stdenv.mkDerivation { name = "gnutls-${version}"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { outputs = [ "dev" "out" "bin" "man" "docdev" ]; outputInfo = "docdev"; - postPatch = '' + postPatch = lib.optionalString (lib.versionAtLeast version "3.4") '' sed '2iecho "name constraints tests skipped due to datefudge problems"\nexit 0' \ -i tests/cert-tests/name-constraints '' + postPatch; diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix index 755a4e8fcdcf..afd5ee591c60 100644 --- a/pkgs/development/libraries/gupnp/default.nix +++ b/pkgs/development/libraries/gupnp/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib gssdp libsoup libxml2 libuuid ]; postInstall = '' - ln -sv ${libsoup.dev}/include/*/libsoup $out/include + ln -sv ${libsoup.dev}/include/libsoup-2*/libsoup $out/include ln -sv ${libxml2.dev}/include/*/libxml $out/include ln -sv ${gssdp}/include/*/libgssdp $out/include ''; diff --git a/pkgs/development/libraries/kde-frameworks/attica.nix b/pkgs/development/libraries/kde-frameworks/attica.nix new file mode 100644 index 000000000000..d34b3f3a2c5f --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks/attica.nix @@ -0,0 +1,7 @@ +{ kdeFramework, lib, ecm }: + +kdeFramework { + name = "attica"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + nativeBuildInputs = [ ecm ]; +} diff --git a/pkgs/desktops/kde-5/frameworks/baloo.nix b/pkgs/development/libraries/kde-frameworks/baloo.nix index 825a125c8a79..9c803fdc7176 100644 --- a/pkgs/desktops/kde-5/frameworks/baloo.nix +++ b/pkgs/development/libraries/kde-frameworks/baloo.nix @@ -1,16 +1,14 @@ -{ kdeFramework, lib, extra-cmake-modules, kauth, kconfig +{ kdeFramework, lib, ecm, kauth, kconfig , kcoreaddons, kcrash, kdbusaddons, kfilemetadata, ki18n, kidletime , kio, lmdb, qtbase, solid }: kdeFramework { name = "baloo"; - nativeBuildInputs = [ extra-cmake-modules ]; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + nativeBuildInputs = [ ecm ]; propagatedBuildInputs = [ kauth kconfig kcoreaddons kcrash kdbusaddons kfilemetadata ki18n kio kidletime lmdb qtbase solid ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; } diff --git a/pkgs/desktops/kde-5/frameworks/bluez-qt.nix b/pkgs/development/libraries/kde-frameworks/bluez-qt.nix index 26490167dbdb..7ab82bdc1ef5 100644 --- a/pkgs/desktops/kde-5/frameworks/bluez-qt.nix +++ b/pkgs/development/libraries/kde-frameworks/bluez-qt.nix @@ -1,17 +1,15 @@ { kdeFramework, lib -, extra-cmake-modules +, ecm , qtdeclarative }: kdeFramework { name = "bluez-qt"; - nativeBuildInputs = [ extra-cmake-modules ]; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + nativeBuildInputs = [ ecm ]; propagatedBuildInputs = [ qtdeclarative ]; preConfigure = '' substituteInPlace CMakeLists.txt \ --replace /lib/udev/rules.d "$out/lib/udev/rules.d" ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; } diff --git a/pkgs/development/libraries/kde-frameworks/breeze-icons.nix b/pkgs/development/libraries/kde-frameworks/breeze-icons.nix new file mode 100644 index 000000000000..c87ba75b2b46 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks/breeze-icons.nix @@ -0,0 +1,10 @@ +{ kdeFramework, lib, ecm, qtsvg }: + +kdeFramework { + name = "breeze-icons"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + outputs = [ "out" ]; + nativeBuildInputs = [ ecm ]; + buildInputs = [ qtsvg ]; + propagatedUserEnvPkgs = [ qtsvg.out ]; +} diff --git a/pkgs/desktops/kde-5/frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index bff2b394038b..bf27d52dceb5 100644 --- a/pkgs/desktops/kde-5/frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -19,21 +19,31 @@ let srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; }; packages = self: with self; { - kdeFramework = args: + + kdeDerivation = args: let - inherit (args) name; - inherit (srcs."${name}") src version; in stdenv.mkDerivation (args // { - name = "${name}-${version}"; - inherit src; outputs = args.outputs or [ "dev" "out" ]; + propagatedUserEnvPkgs = + builtins.map lib.getBin (args.propagatedBuildInputs or []); + cmakeFlags = (args.cmakeFlags or []) ++ [ "-DBUILD_TESTING=OFF" ] ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug"; + }); + + kdeFramework = args: + let + inherit (args) name; + inherit (srcs."${name}") src version; + in kdeDerivation (args // { + name = "${name}-${version}"; + inherit src; + meta = { license = with lib.licenses; [ lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 @@ -43,11 +53,29 @@ let } // (args.meta or {}); }); + kdeEnv = import ./kde-env.nix { + inherit (pkgs) stdenv lib; + inherit (pkgs.xorg) lndir; + }; + + kdeWrapper = import ./kde-wrapper.nix { + inherit (pkgs) stdenv lib makeWrapper; + inherit kdeEnv; + }; + attica = callPackage ./attica.nix {}; baloo = callPackage ./baloo.nix {}; bluez-qt = callPackage ./bluez-qt.nix {}; breeze-icons = callPackage ./breeze-icons.nix {}; - extra-cmake-modules = callPackage ./extra-cmake-modules {}; + ecm = + let drv = { cmake, ecmNoHooks, pkgconfig, qtbase, qttools }: + makeSetupHook + { deps = [ cmake ecmNoHooks pkgconfig qtbase qttools ]; } + ./setup-hook.sh; + in callPackage drv {}; + ecmNoHooks = callPackage ./extra-cmake-modules { + inherit (srcs.extra-cmake-modules) src version; + }; frameworkintegration = callPackage ./frameworkintegration.nix {}; kactivities = callPackage ./kactivities.nix {}; kactivities-stats = callPackage ./kactivities-stats.nix {}; @@ -98,7 +126,7 @@ let kross = callPackage ./kross.nix {}; krunner = callPackage ./krunner.nix {}; kservice = callPackage ./kservice {}; - ktexteditor = callPackage ./ktexteditor {}; + ktexteditor = callPackage ./ktexteditor.nix {}; ktextwidgets = callPackage ./ktextwidgets.nix {}; kunitconversion = callPackage ./kunitconversion.nix {}; kwallet = callPackage ./kwallet.nix {}; diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix new file mode 100644 index 000000000000..d2f1688e330b --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix @@ -0,0 +1,20 @@ +{ stdenv, lib, copyPathsToStore, src, version, cmake }: + +stdenv.mkDerivation { + name = "extra-cmake-modules-${version}"; + + inherit src; + + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + + outputs = [ "out" ]; # this package has no runtime components + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + platforms = lib.platforms.linux; + homepage = "http://www.kde.org"; + license = licenses.bsd2; + maintainers = [ maintainers.ttuegel ]; + }; +} diff --git a/pkgs/desktops/kde-5/frameworks/extra-cmake-modules/nix-lib-path.patch b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/nix-lib-path.patch index a74340a6dc96..a74340a6dc96 100644 --- a/pkgs/desktops/kde-5/frameworks/extra-cmake-modules/nix-lib-path.patch +++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/nix-lib-path.patch diff --git a/pkgs/desktops/kde-5/frameworks/extra-cmake-modules/series b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/series index b4569e50a5f7..b4569e50a5f7 100644 --- a/pkgs/desktops/kde-5/frameworks/extra-cmake-modules/series +++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/series diff --git a/pkgs/desktops/kde-5/frameworks/frameworkintegration.nix b/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix index ee1b188d4073..0a782ae177da 100644 --- a/pkgs/desktops/kde-5/frameworks/frameworkintegration.nix +++ b/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix @@ -1,4 +1,4 @@ -{ kdeFramework, lib, extra-cmake-modules, kbookmarks, kcompletion +{ kdeFramework, lib, ecm, kbookmarks, kcompletion , kconfig, kconfigwidgets, ki18n, kiconthemes, kio, knotifications , kwidgetsaddons, libXcursor, qtx11extras }: @@ -6,7 +6,7 @@ kdeFramework { name = "frameworkintegration"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ ecm ]; propagatedBuildInputs = [ kbookmarks kcompletion kconfig kconfigwidgets knotifications ki18n kio kiconthemes kwidgetsaddons libXcursor qtx11extras diff --git a/pkgs/desktops/kde-5/frameworks/kactivities-stats.nix b/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix index 0080c5c31649..4f406376faa7 100644 --- a/pkgs/desktops/kde-5/frameworks/kactivities-stats.nix +++ b/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix @@ -1,9 +1,8 @@ -{ kdeFramework, lib, extra-cmake-modules -, boost, kactivities, kconfig }: +{ kdeFramework, lib, ecm, boost, kactivities, kconfig }: kdeFramework { name = "kactivities-stats"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ ecm ]; propagatedBuildInputs = [ boost kactivities kconfig ]; } diff --git a/pkgs/desktops/kde-5/frameworks/kactivities.nix b/pkgs/development/libraries/kde-frameworks/kactivities.nix index 167c3f15bbda..a2cacd4b257d 100644 --- a/pkgs/desktops/kde-5/frameworks/kactivities.nix +++ b/pkgs/development/libraries/kde-frameworks/kactivities.nix @@ -1,4 +1,4 @@ -{ kdeFramework, lib, extra-cmake-modules, boost, kcmutils, kconfig +{ kdeFramework, lib, ecm, boost, kcmutils, kconfig , kcoreaddons, kdbusaddons, kdeclarative, kglobalaccel, ki18n , kio, kservice, kwindowsystem, kxmlgui, qtdeclarative }: @@ -6,7 +6,7 @@ kdeFramework { name = "kactivities"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ ecm ]; propagatedBuildInputs = [ boost kcmutils kconfig kcoreaddons kdbusaddons kdeclarative kglobalaccel ki18n kio kservice kwindowsystem kxmlgui qtdeclarative diff --git a/pkgs/development/libraries/kde-frameworks/kapidox.nix b/pkgs/development/libraries/kde-frameworks/kapidox.nix new file mode 100644 index 000000000000..f6c60b7731e1 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks/kapidox.nix @@ -0,0 +1,7 @@ +{ kdeFramework, lib, ecm, python }: + +kdeFramework { + name = "kapidox"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + nativeBuildInputs = [ ecm python ]; +} diff --git a/pkgs/desktops/kde-5/frameworks/karchive.nix b/pkgs/development/libraries/kde-frameworks/karchive.nix index bec44a6d6874..265df45800f1 100644 --- a/pkgs/desktops/kde-5/frameworks/karchive.nix +++ b/pkgs/development/libraries/kde-frameworks/karchive.nix @@ -1,9 +1,7 @@ -{ kdeFramework, lib -, extra-cmake-modules -}: +{ kdeFramework, lib, ecm }: kdeFramework { name = "karchive"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ ecm ]; } diff --git a/pkgs/desktops/kde-5/frameworks/kauth/cmake-install-paths.patch b/pkgs/development/libraries/kde-frameworks/kauth/cmake-install-paths.patch index c66f5ecd008f..c66f5ecd008f 100644 --- a/pkgs/desktops/kde-5/frameworks/kauth/cmake-install-paths.patch +++ b/pkgs/development/libraries/kde-frameworks/kauth/cmake-install-paths.patch diff --git a/pkgs/desktops/kde-5/frameworks/kauth/default.nix b/pkgs/development/libraries/kde-frameworks/kauth/default.nix index 4bdba88bc3bb..f2a1c7717d5d 100644 --- a/pkgs/desktops/kde-5/frameworks/kauth/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kauth/default.nix @@ -1,13 +1,9 @@ -{ kdeFramework, lib, copyPathsToStore -, extra-cmake-modules -, kcoreaddons -, polkit-qt -}: +{ kdeFramework, lib, copyPathsToStore, ecm, kcoreaddons, polkit-qt }: kdeFramework { name = "kauth"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ ecm ]; propagatedBuildInputs = [ kcoreaddons polkit-qt ]; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); } diff --git a/pkgs/desktops/kde-5/frameworks/kauth/series b/pkgs/development/libraries/kde-frameworks/kauth/series index d2689425c387..d2689425c387 100644 --- a/pkgs/desktops/kde-5/frameworks/kauth/series +++ b/pkgs/development/libraries/kde-frameworks/kauth/series diff --git a/pkgs/desktops/kde-5/frameworks/kbookmarks.nix b/pkgs/development/libraries/kde-frameworks/kbookmarks.nix index 7348e591d9cb..50cec5a39c86 100644 --- a/pkgs/desktops/kde-5/frameworks/kbookmarks.nix +++ b/pkgs/development/libraries/kde-frameworks/kbookmarks.nix @@ -1,17 +1,12 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kcodecs -, kconfig -, kconfigwidgets -, kcoreaddons -, kiconthemes -, kxmlgui +{ + kdeFramework, lib, ecm, + kcodecs, kconfig, kconfigwidgets, kcoreaddons, kiconthemes, kxmlgui }: kdeFramework { name = "kbookmarks"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ ecm ]; propagatedBuildInputs = [ kcodecs kconfig kconfigwidgets kcoreaddons kiconthemes kxmlgui ]; diff --git a/pkgs/desktops/kde-5/frameworks/kcmutils/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks/kcmutils/0001-qdiriterator-follow-symlinks.patch index 0d861fa95012..0d861fa95012 100644 --- a/pkgs/desktops/kde-5/frameworks/kcmutils/0001-qdiriterator-follow-symlinks.patch +++ b/pkgs/development/libraries/kde-frameworks/kcmutils/0001-qdiriterator-follow-symlinks.patch diff --git a/pkgs/desktops/kde-5/frameworks/kcmutils/default.nix b/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix index fdf55174548e..dd1af737d68e 100644 --- a/pkgs/desktops/kde-5/frameworks/kcmutils/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix @@ -1,4 +1,4 @@ -{ kdeFramework, lib, extra-cmake-modules, kconfigwidgets +{ kdeFramework, lib, ecm, kconfigwidgets , kcoreaddons, kdeclarative, ki18n, kiconthemes, kitemviews , kpackage, kservice, kxmlgui }: @@ -6,7 +6,7 @@ kdeFramework { name = "kcmutils"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ ecm ]; propagatedBuildInputs = [ kconfigwidgets kcoreaddons kdeclarative ki18n kiconthemes kitemviews kpackage kservice kxmlgui diff --git a/pkgs/development/libraries/kde-frameworks/kcodecs.nix b/pkgs/development/libraries/kde-frameworks/kcodecs.nix new file mode 100644 index 000000000000..a3fcd3023f52 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks/kcodecs.nix @@ -0,0 +1,7 @@ +{ kdeFramework, lib, ecm }: + +kdeFramework { + name = "kcodecs"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + nativeBuildInputs = [ ecm ]; +} diff --git a/pkgs/desktops/kde-5/frameworks/kcompletion.nix b/pkgs/development/libraries/kde-frameworks/kcompletion.nix index 8c45bed25856..893f374933ea 100644 --- a/pkgs/desktops/kde-5/frameworks/kcompletion.nix +++ b/pkgs/development/libraries/kde-frameworks/kcompletion.nix @@ -1,12 +1,8 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kconfig -, kwidgetsaddons -}: +{ kdeFramework, lib, ecm, kconfig, kwidgetsaddons }: kdeFramework { name = "kcompletion"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ ecm ]; propagatedBuildInputs = [ kconfig kwidgetsaddons ]; } diff --git a/pkgs/desktops/kde-5/frameworks/kconfig.nix b/pkgs/development/libraries/kde-frameworks/kconfig.nix index 154329d0e98e..0f003f8ea97e 100644 --- a/pkgs/desktops/kde-5/frameworks/kconfig.nix +++ b/pkgs/development/libraries/kde-frameworks/kconfig.nix @@ -1,9 +1,7 @@ -{ kdeFramework, lib -, extra-cmake-modules -}: +{ kdeFramework, lib, ecm }: kdeFramework { name = "kconfig"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ ecm ]; } diff --git a/pkgs/desktops/kde-5/frameworks/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch index 7a6c0ee90534..7a6c0ee90534 100644 --- a/pkgs/desktops/kde-5/frameworks/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch +++ b/pkgs/development/libraries/kde-frameworks/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch diff --git a/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix b/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix new file mode 100644 index 000000000000..b88308b634c0 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix @@ -0,0 +1,17 @@ +{ + kdeFramework, lib, ecm, + kauth, kcodecs, kconfig, kdoctools, kguiaddons, ki18n, kwidgetsaddons +}: + +kdeFramework { + name = "kconfigwidgets"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + nativeBuildInputs = [ ecm kdoctools ]; + propagatedBuildInputs = [ + kauth kconfig kcodecs kguiaddons ki18n kwidgetsaddons + ]; + patches = [ ./0001-qdiriterator-follow-symlinks.patch ]; + postInstall = '' + moveToOutput "bin/preparetips5" "$dev" + ''; +} diff --git a/pkgs/desktops/kde-5/frameworks/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix index 94b4136df3da..a3d5735ad274 100644 --- a/pkgs/desktops/kde-5/frameworks/kcoreaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix @@ -1,11 +1,8 @@ -{ kdeFramework, lib -, extra-cmake-modules -, shared_mime_info -}: +{ kdeFramework, lib, ecm, shared_mime_info }: kdeFramework { name = "kcoreaddons"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ ecm ]; propagatedBuildInputs = [ shared_mime_info ]; } diff --git a/pkgs/desktops/kde-5/frameworks/kcrash.nix b/pkgs/development/libraries/kde-frameworks/kcrash.nix index 133a81c60c18..2fcadc828cf4 100644 --- a/pkgs/desktops/kde-5/frameworks/kcrash.nix +++ b/pkgs/development/libraries/kde-frameworks/kcrash.nix @@ -1,13 +1,8 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kcoreaddons -, kwindowsystem -, qtx11extras -}: +{ kdeFramework, lib, ecm, kcoreaddons, kwindowsystem, qtx11extras }: kdeFramework { name = "kcrash"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ ecm ]; propagatedBuildInputs = [ kcoreaddons kwindowsystem qtx11extras ]; } diff --git a/pkgs/desktops/kde-5/frameworks/kdbusaddons.nix b/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix index eadd645fb99a..663200516604 100644 --- a/pkgs/desktops/kde-5/frameworks/kdbusaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix @@ -1,11 +1,8 @@ -{ kdeFramework, lib -, extra-cmake-modules -, qtx11extras -}: +{ kdeFramework, lib, ecm, qtx11extras }: kdeFramework { name = "kdbusaddons"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ ecm ]; propagatedBuildInputs = [ qtx11extras ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kde-env.nix b/pkgs/development/libraries/kde-frameworks/kde-env.nix new file mode 100644 index 000000000000..c77ff49bfeaf --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks/kde-env.nix @@ -0,0 +1,31 @@ +{ stdenv, lib, lndir }: + +drv: pkgs: + +stdenv.mkDerivation { + name = "kde-env-${drv.name}"; + nativeBuildInputs = [ lndir ]; + propagatedUserEnvPkgs = builtins.map lib.getBin ([drv] ++ pkgs); + unpackPhase = "true"; + configurePhase = "runHook preConfigure; runHook postConfigure"; + buildPhase = "true"; + installPhase = '' + runHook preInstall + + propagated="" + for i in $propagatedUserEnvPkgs; do + findInputs $i propagated propagated-user-env-packages + done + + for tgt in bin etc/xdg lib/libexec lib/qt5 share; do + mkdir -p "$out/$tgt" + for p in $propagated; do + if [ -d "$p/$tgt" ]; then + lndir -silent "$p/$tgt" "$out/$tgt" >/dev/null 2>&1 + fi + done + done + + runHook postInstall + ''; +} diff --git a/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix b/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix new file mode 100644 index 000000000000..95f9cdcecb77 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix @@ -0,0 +1,47 @@ +{ stdenv, lib, makeWrapper, kdeEnv }: + +drv: + +{ targets, paths ? [] }: + +let + env = kdeEnv drv paths; +in +stdenv.mkDerivation { + inherit (drv) name; + + drv = lib.getBin drv; + inherit env targets; + passthru = { unwrapped = drv; }; + + nativeBuildInputs = [ makeWrapper ]; + + unpackPhase = "true"; + configurePhase = "runHook preConfigure; runHook postConfigure"; + buildPhase = "true"; + + installPhase = '' + for t in $targets; do + if [ -a "$drv/$t" ]; then + makeWrapper "$drv/$t" "$out/$t" \ + --argv0 '"$0"' \ + --suffix PATH : "$out/bin:$env/bin" \ + --prefix XDG_CONFIG_DIRS : "$env/etc/xdg" \ + --prefix XDG_DATA_DIRS : "$env/share" \ + --set QML_IMPORT_PATH "$env/lib/qt5/imports" \ + --set QML2_IMPORT_PATH "$env/lib/qt5/qml" \ + --set QT_PLUGIN_PATH "$env/lib/qt5/plugins" + else + echo "no such file or directory: $drv/$t" + exit 1 + fi + done + + for s in applications dbus-1 desktop-directories icons mime polkit-1; do + if [ -d "$env/share/$s" ]; then + mkdir -p "$out/share" + ln -s "$env/share/$s" "$out/share/$s" + fi + done + ''; +} diff --git a/pkgs/desktops/kde-5/frameworks/kdeclarative.nix b/pkgs/development/libraries/kde-frameworks/kdeclarative.nix index 8db1b73c91a7..a90a419d9b84 100644 --- a/pkgs/desktops/kde-5/frameworks/kdeclarative.nix +++ b/pkgs/development/libraries/kde-frameworks/kdeclarative.nix @@ -1,13 +1,13 @@ -{ kdeFramework, lib, extra-cmake-modules, epoxy, kconfig -, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kpackage -, kwidgetsaddons, kwindowsystem, pkgconfig -, qtdeclarative +{ + kdeFramework, lib, ecm, + epoxy, kconfig, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kpackage, + kwidgetsaddons, kwindowsystem, pkgconfig, qtdeclarative }: kdeFramework { name = "kdeclarative"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ ecm ]; propagatedBuildInputs = [ epoxy kconfig kglobalaccel kguiaddons ki18n kiconthemes kio kpackage kwidgetsaddons kwindowsystem qtdeclarative diff --git a/pkgs/development/libraries/kde-frameworks/kded.nix b/pkgs/development/libraries/kde-frameworks/kded.nix new file mode 100644 index 000000000000..d8fe820518d3 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks/kded.nix @@ -0,0 +1,13 @@ +{ + kdeFramework, lib, ecm, + kconfig, kcoreaddons, kcrash, kdbusaddons, kdoctools, kinit, kservice +}: + +kdeFramework { + name = "kded"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + nativeBuildInputs = [ ecm kdoctools ]; + propagatedBuildInputs = [ + kconfig kcoreaddons kcrash kdbusaddons kinit kservice + ]; +} diff --git a/pkgs/desktops/kde-5/frameworks/kdelibs4support/default.nix b/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix index 1765ffa9a39f..f3fd315e5500 100644 --- a/pkgs/desktops/kde-5/frameworks/kdelibs4support/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix @@ -1,5 +1,5 @@ { kdeFramework, lib, copyPathsToStore -, extra-cmake-modules, docbook_xml_dtd_45, kauth +, ecm, docbook_xml_dtd_45, kauth , karchive, kcompletion, kconfig, kconfigwidgets, kcoreaddons , kcrash, kdbusaddons, kded, kdesignerplugin, kdoctools, kemoticons , kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kitemmodels @@ -13,10 +13,9 @@ kdeFramework { name = "kdelibs4support"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - outputs = [ "dev" "out" ]; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); setupHook = ./setup-hook.sh; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + nativeBuildInputs = [ ecm kdoctools ]; propagatedBuildInputs = [ kauth karchive kcompletion kconfig kconfigwidgets kcoreaddons kcrash kdbusaddons kded kdesignerplugin kemoticons kglobalaccel kguiaddons ki18n diff --git a/pkgs/desktops/kde-5/frameworks/kdelibs4support/nix-kde-include-dir.patch b/pkgs/development/libraries/kde-frameworks/kdelibs4support/nix-kde-include-dir.patch index eabb70254483..eabb70254483 100644 --- a/pkgs/desktops/kde-5/frameworks/kdelibs4support/nix-kde-include-dir.patch +++ b/pkgs/development/libraries/kde-frameworks/kdelibs4support/nix-kde-include-dir.patch diff --git a/pkgs/desktops/kde-5/frameworks/kdelibs4support/series b/pkgs/development/libraries/kde-frameworks/kdelibs4support/series index 9b08ab208774..9b08ab208774 100644 --- a/pkgs/desktops/kde-5/frameworks/kdelibs4support/series +++ b/pkgs/development/libraries/kde-frameworks/kdelibs4support/series diff --git a/pkgs/desktops/kde-5/frameworks/kdelibs4support/setup-hook.sh b/pkgs/development/libraries/kde-frameworks/kdelibs4support/setup-hook.sh index 21ac2e83b5da..21ac2e83b5da 100644 --- a/pkgs/desktops/kde-5/frameworks/kdelibs4support/setup-hook.sh +++ b/pkgs/development/libraries/kde-frameworks/kdelibs4support/setup-hook.sh diff --git a/pkgs/desktops/kde-5/frameworks/kdesignerplugin.nix b/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix index 8e17a1a60c8d..e87bb5bf9d01 100644 --- a/pkgs/desktops/kde-5/frameworks/kdesignerplugin.nix +++ b/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix @@ -1,5 +1,5 @@ { kdeFramework, lib -, extra-cmake-modules +, ecm , kcompletion , kconfig , kconfigwidgets @@ -18,7 +18,7 @@ kdeFramework { name = "kdesignerplugin"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + nativeBuildInputs = [ ecm kdoctools ]; propagatedBuildInputs = [ kcompletion kconfig kconfigwidgets kcoreaddons kiconthemes kio kitemviews kplotting ktextwidgets kwidgetsaddons kxmlgui sonnet diff --git a/pkgs/desktops/kde-5/frameworks/kdesu.nix b/pkgs/development/libraries/kde-frameworks/kdesu.nix index fcccea9161f1..0c5cb85cc494 100644 --- a/pkgs/desktops/kde-5/frameworks/kdesu.nix +++ b/pkgs/development/libraries/kde-frameworks/kdesu.nix @@ -1,10 +1,10 @@ -{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n, kpty +{ kdeFramework, lib, ecm, kcoreaddons, ki18n, kpty , kservice }: kdeFramework { name = "kdesu"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ ecm ]; propagatedBuildInputs = [ kcoreaddons ki18n kpty kservice ]; } diff --git a/pkgs/desktops/kde-5/frameworks/kdnssd.nix b/pkgs/development/libraries/kde-frameworks/kdnssd.nix index 8fda4e63e3a6..49fd368fccbf 100644 --- a/pkgs/desktops/kde-5/frameworks/kdnssd.nix +++ b/pkgs/development/libraries/kde-frameworks/kdnssd.nix @@ -1,11 +1,11 @@ { kdeFramework, lib -, extra-cmake-modules +, ecm , avahi }: kdeFramework { name = "kdnssd"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ ecm ]; propagatedBuildInputs = [ avahi ]; } diff --git a/pkgs/desktops/kde-5/frameworks/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix index 99fc4c7d023c..4a31ea5396df 100644 --- a/pkgs/desktops/kde-5/frameworks/kdoctools/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix @@ -1,11 +1,11 @@ -{ kdeFramework, lib, extra-cmake-modules, docbook_xml_dtd_45 +{ kdeFramework, lib, ecm, docbook_xml_dtd_45 , docbook5_xsl, karchive, ki18n, perl, perlPackages }: kdeFramework { name = "kdoctools"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ ecm ]; propagatedBuildInputs = [ karchive ki18n ]; propagatedNativeBuildInputs = [ perl perlPackages.URI ]; cmakeFlags = [ diff --git a/pkgs/desktops/kde-5/frameworks/kdoctools/kdoctools-no-find-docbook-xml.patch b/pkgs/development/libraries/kde-frameworks/kdoctools/kdoctools-no-find-docbook-xml.patch index 4e3a33efab32..4e3a33efab32 100644 --- a/pkgs/desktops/kde-5/frameworks/kdoctools/kdoctools-no-find-docbook-xml.patch +++ b/pkgs/development/libraries/kde-frameworks/kdoctools/kdoctools-no-find-docbook-xml.patch diff --git a/pkgs/desktops/kde-5/frameworks/kdoctools/setup-hook.sh b/pkgs/development/libraries/kde-frameworks/kdoctools/setup-hook.sh index 5cfffbd622d1..5cfffbd622d1 100644 --- a/pkgs/desktops/kde-5/frameworks/kdoctools/setup-hook.sh +++ b/pkgs/development/libraries/kde-frameworks/kdoctools/setup-hook.sh diff --git a/pkgs/desktops/kde-5/frameworks/kemoticons.nix b/pkgs/development/libraries/kde-frameworks/kemoticons.nix index 1e31277172d7..cdffbd503576 100644 --- a/pkgs/desktops/kde-5/frameworks/kemoticons.nix +++ b/pkgs/development/libraries/kde-frameworks/kemoticons.nix @@ -1,5 +1,5 @@ { kdeFramework, lib -, extra-cmake-modules +, ecm , karchive , kconfig , kcoreaddons @@ -9,6 +9,6 @@ kdeFramework { name = "kemoticons"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ ecm ]; propagatedBuildInputs = [ karchive kconfig kcoreaddons kservice ]; } diff --git a/pkgs/desktops/kde-5/frameworks/kfilemetadata/cmake-install-paths.patch b/pkgs/development/libraries/kde-frameworks/kfilemetadata/cmake-install-paths.patch index 732f7b69c828..732f7b69c828 100644 --- a/pkgs/desktops/kde-5/frameworks/kfilemetadata/cmake-install-paths.patch +++ b/pkgs/development/libraries/kde-frameworks/kfilemetadata/cmake-install-paths.patch diff --git a/pkgs/desktops/kde-5/frameworks/kfilemetadata/default.nix b/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix index bc7349e7453f..31f692deca64 100644 --- a/pkgs/desktops/kde-5/frameworks/kfilemetadata/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix @@ -1,4 +1,4 @@ -{ kdeFramework, lib, copyPathsToStore, extra-cmake-modules +{ kdeFramework, lib, copyPathsToStore, ecm , attr, ebook_tools, exiv2, ffmpeg, karchive, ki18n, poppler, qtbase, taglib }: @@ -6,7 +6,7 @@ kdeFramework { name = "kfilemetadata"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ ecm ]; propagatedBuildInputs = [ attr ebook_tools exiv2 ffmpeg karchive ki18n poppler qtbase taglib ]; diff --git a/pkgs/desktops/kde-5/frameworks/kfilemetadata/series b/pkgs/development/libraries/kde-frameworks/kfilemetadata/series index d2689425c387..d2689425c387 100644 --- a/pkgs/desktops/kde-5/frameworks/kfilemetadata/series +++ b/pkgs/development/libraries/kde-frameworks/kfilemetadata/series diff --git a/pkgs/desktops/kde-5/frameworks/kglobalaccel.nix b/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix index 4743d0b8f1b0..8ac0adafbd18 100644 --- a/pkgs/desktops/kde-5/frameworks/kglobalaccel.nix +++ b/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix @@ -1,5 +1,5 @@ { kdeFramework, lib -, extra-cmake-modules +, ecm , kconfig , kcoreaddons , kcrash @@ -11,7 +11,7 @@ kdeFramework { name = "kglobalaccel"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ ecm ]; propagatedBuildInputs = [ kconfig kcoreaddons kcrash kdbusaddons kwindowsystem qtx11extras ]; diff --git a/pkgs/desktops/kde-5/frameworks/kguiaddons.nix b/pkgs/development/libraries/kde-frameworks/kguiaddons.nix index 6ebfd1104f70..9f20ecd598a4 100644 --- a/pkgs/desktops/kde-5/frameworks/kguiaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kguiaddons.nix @@ -1,11 +1,11 @@ { kdeFramework, lib -, extra-cmake-modules +, ecm , qtx11extras }: kdeFramework { name = "kguiaddons"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ ecm ]; propagatedBuildInputs = [ qtx11extras ]; } diff --git a/pkgs/desktops/kde-5/frameworks/khtml.nix b/pkgs/development/libraries/kde-frameworks/khtml.nix index 99f6fe31e0d7..be1094b7cf5a 100644 --- a/pkgs/desktops/kde-5/frameworks/khtml.nix +++ b/pkgs/development/libraries/kde-frameworks/khtml.nix @@ -1,4 +1,4 @@ -{ kdeFramework, lib, extra-cmake-modules, giflib, karchive +{ kdeFramework, lib, ecm, giflib, karchive , kcodecs, kglobalaccel, ki18n, kiconthemes, kio, kjs , knotifications, kparts, ktextwidgets, kwallet, kwidgetsaddons , kwindowsystem, kxmlgui, perl, phonon, qtx11extras, sonnet @@ -7,7 +7,7 @@ kdeFramework { name = "khtml"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules perl ]; + nativeBuildInputs = [ ecm perl ]; propagatedBuildInputs = [ giflib karchive kcodecs kglobalaccel ki18n kiconthemes kio kjs knotifications kparts ktextwidgets kwallet kwidgetsaddons kwindowsystem diff --git a/pkgs/desktops/kde-5/frameworks/ki18n.nix b/pkgs/development/libraries/kde-frameworks/ki18n.nix index 2698a97fd33f..cf2212413bd2 100644 --- a/pkgs/desktops/kde-5/frameworks/ki18n.nix +++ b/pkgs/development/libraries/kde-frameworks/ki18n.nix @@ -1,5 +1,5 @@ { kdeFramework, lib -, extra-cmake-modules +, ecm , gettext , python , qtdeclarative @@ -9,7 +9,7 @@ kdeFramework { name = "ki18n"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ ecm ]; propagatedBuildInputs = [ qtdeclarative qtscript ]; propagatedNativeBuildInputs = [ gettext python ]; } diff --git a/pkgs/desktops/kde-5/frameworks/kiconthemes/default-theme-breeze.patch b/pkgs/development/libraries/kde-frameworks/kiconthemes/default-theme-breeze.patch index f7cb0ea3aacc..f7cb0ea3aacc 100644 --- a/pkgs/desktops/kde-5/frameworks/kiconthemes/default-theme-breeze.patch +++ b/pkgs/development/libraries/kde-frameworks/kiconthemes/default-theme-breeze.patch diff --git a/pkgs/desktops/kde-5/frameworks/kiconthemes/default.nix b/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix index 6102bb0d4b56..6141db849efe 100644 --- a/pkgs/desktops/kde-5/frameworks/kiconthemes/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix @@ -1,5 +1,5 @@ { kdeFramework, lib, copyPathsToStore -, extra-cmake-modules +, ecm , karchive, kconfigwidgets, ki18n, breeze-icons, kitemviews, qtsvg }: @@ -7,6 +7,6 @@ kdeFramework { name = "kiconthemes"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ ecm ]; propagatedBuildInputs = [ breeze-icons kconfigwidgets karchive ki18n kitemviews qtsvg ]; } diff --git a/pkgs/desktops/kde-5/frameworks/kiconthemes/series b/pkgs/development/libraries/kde-frameworks/kiconthemes/series index ab5cc8a3edb2..ab5cc8a3edb2 100644 --- a/pkgs/desktops/kde-5/frameworks/kiconthemes/series +++ b/pkgs/development/libraries/kde-frameworks/kiconthemes/series diff --git a/pkgs/desktops/kde-5/frameworks/kidletime.nix b/pkgs/development/libraries/kde-frameworks/kidletime.nix index 758260517e7d..d3f46512db23 100644 --- a/pkgs/desktops/kde-5/frameworks/kidletime.nix +++ b/pkgs/development/libraries/kde-frameworks/kidletime.nix @@ -1,5 +1,5 @@ { kdeFramework, lib -, extra-cmake-modules +, ecm , qtbase , qtx11extras }: @@ -7,6 +7,6 @@ kdeFramework { name = "kidletime"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ ecm ]; propagatedBuildInputs = [ qtbase qtx11extras ]; } diff --git a/pkgs/desktops/kde-5/frameworks/kimageformats.nix b/pkgs/development/libraries/kde-frameworks/kimageformats.nix index fbc8d092f865..ec22dc335d5f 100644 --- a/pkgs/desktops/kde-5/frameworks/kimageformats.nix +++ b/pkgs/development/libraries/kde-frameworks/kimageformats.nix @@ -1,11 +1,11 @@ { kdeFramework, lib -, extra-cmake-modules +, ecm , ilmbase }: kdeFramework { name = "kimageformats"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ ecm ]; NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR"; } diff --git a/pkgs/desktops/kde-5/frameworks/kinit/default.nix b/pkgs/development/libraries/kde-frameworks/kinit/default.nix index b965f761e922..032bdd30d9ec 100644 --- a/pkgs/desktops/kde-5/frameworks/kinit/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kinit/default.nix @@ -1,13 +1,13 @@ { kdeFramework, lib, copyPathsToStore, - extra-cmake-modules, kdoctools, + ecm, kdoctools, kconfig, kcrash, ki18n, kio, kservice, kwindowsystem }: kdeFramework { name = "kinit"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + nativeBuildInputs = [ ecm kdoctools ]; propagatedBuildInputs = [ kconfig kcrash ki18n kio kservice kwindowsystem ]; diff --git a/pkgs/desktops/kde-5/frameworks/kinit/kinit-libpath.patch b/pkgs/development/libraries/kde-frameworks/kinit/kinit-libpath.patch index a5c76fca2481..a5c76fca2481 100644 --- a/pkgs/desktops/kde-5/frameworks/kinit/kinit-libpath.patch +++ b/pkgs/development/libraries/kde-frameworks/kinit/kinit-libpath.patch diff --git a/pkgs/desktops/kde-5/frameworks/kinit/series b/pkgs/development/libraries/kde-frameworks/kinit/series index 576b8a935bf1..576b8a935bf1 100644 --- a/pkgs/desktops/kde-5/frameworks/kinit/series +++ b/pkgs/development/libraries/kde-frameworks/kinit/series diff --git a/pkgs/desktops/kde-5/frameworks/kinit/start_kdeinit-path.patch b/pkgs/development/libraries/kde-frameworks/kinit/start_kdeinit-path.patch index fbecf9433f69..fbecf9433f69 100644 --- a/pkgs/desktops/kde-5/frameworks/kinit/start_kdeinit-path.patch +++ b/pkgs/development/libraries/kde-frameworks/kinit/start_kdeinit-path.patch diff --git a/pkgs/desktops/kde-5/frameworks/kio/default.nix b/pkgs/development/libraries/kde-frameworks/kio/default.nix index cb67c8459034..7623e44a0761 100644 --- a/pkgs/desktops/kde-5/frameworks/kio/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kio/default.nix @@ -1,5 +1,5 @@ { kdeFramework, lib, copyPathsToStore -, extra-cmake-modules, acl, karchive +, ecm, acl, karchive , kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons , kdbusaddons, kdoctools, ki18n, kiconthemes, kitemviews , kjobwidgets, knotifications, kservice, ktextwidgets, kwallet @@ -10,7 +10,7 @@ kdeFramework { name = "kio"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + nativeBuildInputs = [ ecm kdoctools ]; propagatedBuildInputs = [ acl karchive kbookmarks kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons ki18n kiconthemes kitemviews kjobwidgets knotifications kservice diff --git a/pkgs/desktops/kde-5/frameworks/kio/samba-search-path.patch b/pkgs/development/libraries/kde-frameworks/kio/samba-search-path.patch index c9ad46b41bb7..c9ad46b41bb7 100644 --- a/pkgs/desktops/kde-5/frameworks/kio/samba-search-path.patch +++ b/pkgs/development/libraries/kde-frameworks/kio/samba-search-path.patch diff --git a/pkgs/desktops/kde-5/frameworks/kio/series b/pkgs/development/libraries/kde-frameworks/kio/series index 77ca15450047..77ca15450047 100644 --- a/pkgs/desktops/kde-5/frameworks/kio/series +++ b/pkgs/development/libraries/kde-frameworks/kio/series diff --git a/pkgs/desktops/kde-5/frameworks/kitemmodels.nix b/pkgs/development/libraries/kde-frameworks/kitemmodels.nix index 7dff10b7fe06..0a474dfdb7d7 100644 --- a/pkgs/desktops/kde-5/frameworks/kitemmodels.nix +++ b/pkgs/development/libraries/kde-frameworks/kitemmodels.nix @@ -1,9 +1,9 @@ { kdeFramework, lib -, extra-cmake-modules +, ecm }: kdeFramework { name = "kitemmodels"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ ecm ]; } diff --git a/pkgs/desktops/kde-5/frameworks/kitemviews.nix b/pkgs/development/libraries/kde-frameworks/kitemviews.nix index 77f4b6621604..0af3de5770a9 100644 --- a/pkgs/desktops/kde-5/frameworks/kitemviews.nix +++ b/pkgs/development/libraries/kde-frameworks/kitemviews.nix @@ -1,9 +1,9 @@ { kdeFramework, lib -, extra-cmake-modules +, ecm }: kdeFramework { name = "kitemviews"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ ecm ]; } diff --git a/pkgs/desktops/kde-5/frameworks/kjobwidgets.nix b/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix index 2692458b8be7..1337f4109c2d 100644 --- a/pkgs/desktops/kde-5/frameworks/kjobwidgets.nix +++ b/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix @@ -1,5 +1,5 @@ { kdeFramework, lib -, extra-cmake-modules +, ecm , kcoreaddons , kwidgetsaddons , qtx11extras @@ -8,6 +8,6 @@ kdeFramework { name = "kjobwidgets"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ ecm ]; propagatedBuildInputs = [ kcoreaddons kwidgetsaddons qtx11extras ]; } diff --git a/pkgs/desktops/kde-5/frameworks/kjs.nix b/pkgs/development/libraries/kde-frameworks/kjs.nix index abdc15ce8df6..12852e6a1e77 100644 --- a/pkgs/desktops/kde-5/frameworks/kjs.nix +++ b/pkgs/development/libraries/kde-frameworks/kjs.nix @@ -1,10 +1,10 @@ { kdeFramework, lib -, extra-cmake-modules +, ecm , kdoctools }: kdeFramework { name = "kjs"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + nativeBuildInputs = [ ecm kdoctools ]; } diff --git a/pkgs/desktops/kde-5/frameworks/kjsembed.nix b/pkgs/development/libraries/kde-frameworks/kjsembed.nix index 95bc02422f1b..20c8b2eea162 100644 --- a/pkgs/desktops/kde-5/frameworks/kjsembed.nix +++ b/pkgs/development/libraries/kde-frameworks/kjsembed.nix @@ -1,10 +1,10 @@ -{ kdeFramework, lib, extra-cmake-modules, kdoctools, ki18n, kjs +{ kdeFramework, lib, ecm, kdoctools, ki18n, kjs , qtsvg }: kdeFramework { name = "kjsembed"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + nativeBuildInputs = [ ecm kdoctools ]; propagatedBuildInputs = [ ki18n kjs qtsvg ]; } diff --git a/pkgs/desktops/kde-5/frameworks/kmediaplayer.nix b/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix index 93a6b450f762..360d8e90daf2 100644 --- a/pkgs/desktops/kde-5/frameworks/kmediaplayer.nix +++ b/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix @@ -1,5 +1,5 @@ { kdeFramework, lib -, extra-cmake-modules +, ecm , kparts , kxmlgui }: @@ -7,6 +7,6 @@ kdeFramework { name = "kmediaplayer"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ ecm ]; propagatedBuildInputs = [ kparts kxmlgui ]; } diff --git a/pkgs/desktops/kde-5/frameworks/knewstuff.nix b/pkgs/development/libraries/kde-frameworks/knewstuff.nix index 002418c65ad0..b6a84e2539d2 100644 --- a/pkgs/desktops/kde-5/frameworks/knewstuff.nix +++ b/pkgs/development/libraries/kde-frameworks/knewstuff.nix @@ -1,4 +1,4 @@ -{ kdeFramework, lib, extra-cmake-modules, attica, karchive +{ kdeFramework, lib, ecm, attica, karchive , kcompletion, kconfig, kcoreaddons, ki18n, kiconthemes, kio , kitemviews, kservice, ktextwidgets, kwidgetsaddons, kxmlgui }: @@ -6,7 +6,7 @@ kdeFramework { name = "knewstuff"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ ecm ]; propagatedBuildInputs = [ attica karchive kcompletion kconfig kcoreaddons ki18n kiconthemes kio kitemviews kservice ktextwidgets kwidgetsaddons kxmlgui diff --git a/pkgs/desktops/kde-5/frameworks/knotifications.nix b/pkgs/development/libraries/kde-frameworks/knotifications.nix index 7196832495f3..061a5d8d142a 100644 --- a/pkgs/desktops/kde-5/frameworks/knotifications.nix +++ b/pkgs/development/libraries/kde-frameworks/knotifications.nix @@ -1,5 +1,5 @@ { kdeFramework, lib -, extra-cmake-modules +, ecm , kcodecs, kconfig, kcoreaddons, kwindowsystem , libdbusmenu , phonon @@ -9,7 +9,7 @@ kdeFramework { name = "knotifications"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ ecm ]; propagatedBuildInputs = [ kcodecs kconfig kcoreaddons kwindowsystem libdbusmenu phonon qtx11extras ]; diff --git a/pkgs/desktops/kde-5/frameworks/knotifyconfig.nix b/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix index 0e357aecb999..b64f109f08b1 100644 --- a/pkgs/desktops/kde-5/frameworks/knotifyconfig.nix +++ b/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix @@ -1,10 +1,10 @@ -{ kdeFramework, lib, extra-cmake-modules, kcompletion, kconfig +{ kdeFramework, lib, ecm, kcompletion, kconfig , ki18n, kio, phonon }: kdeFramework { name = "knotifyconfig"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ ecm ]; propagatedBuildInputs = [ kcompletion kconfig ki18n kio phonon ]; } diff --git a/pkgs/desktops/kde-5/frameworks/kpackage/allow-external-paths.patch b/pkgs/development/libraries/kde-frameworks/kpackage/allow-external-paths.patch index e9d744448148..e9d744448148 100644 --- a/pkgs/desktops/kde-5/frameworks/kpackage/allow-external-paths.patch +++ b/pkgs/development/libraries/kde-frameworks/kpackage/allow-external-paths.patch diff --git a/pkgs/desktops/kde-5/frameworks/kpackage/default.nix b/pkgs/development/libraries/kde-frameworks/kpackage/default.nix index a39a672574bb..76ab7dbe013a 100644 --- a/pkgs/desktops/kde-5/frameworks/kpackage/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kpackage/default.nix @@ -1,5 +1,5 @@ { kdeFramework, lib, copyPathsToStore -, extra-cmake-modules +, ecm , karchive , kconfig , kcoreaddons @@ -10,7 +10,7 @@ kdeFramework { name = "kpackage"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + nativeBuildInputs = [ ecm kdoctools ]; propagatedBuildInputs = [ karchive kconfig kcoreaddons ki18n ]; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); } diff --git a/pkgs/desktops/kde-5/frameworks/kpackage/qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks/kpackage/qdiriterator-follow-symlinks.patch index ddbf17d00064..ddbf17d00064 100644 --- a/pkgs/desktops/kde-5/frameworks/kpackage/qdiriterator-follow-symlinks.patch +++ b/pkgs/development/libraries/kde-frameworks/kpackage/qdiriterator-follow-symlinks.patch diff --git a/pkgs/desktops/kde-5/frameworks/kpackage/series b/pkgs/development/libraries/kde-frameworks/kpackage/series index 9b7f076efc70..9b7f076efc70 100644 --- a/pkgs/desktops/kde-5/frameworks/kpackage/series +++ b/pkgs/development/libraries/kde-frameworks/kpackage/series diff --git a/pkgs/desktops/kde-5/frameworks/kparts.nix b/pkgs/development/libraries/kde-frameworks/kparts.nix index ad6ea2dbc305..a46fa210b276 100644 --- a/pkgs/desktops/kde-5/frameworks/kparts.nix +++ b/pkgs/development/libraries/kde-frameworks/kparts.nix @@ -1,4 +1,4 @@ -{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons +{ kdeFramework, lib, ecm, kconfig, kcoreaddons , ki18n, kiconthemes, kio, kjobwidgets, knotifications, kservice , ktextwidgets, kwidgetsaddons, kxmlgui }: @@ -6,7 +6,7 @@ kdeFramework { name = "kparts"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ ecm ]; propagatedBuildInputs = [ kconfig kcoreaddons ki18n kiconthemes kio kjobwidgets knotifications kservice ktextwidgets kwidgetsaddons kxmlgui diff --git a/pkgs/desktops/kde-5/frameworks/kpeople.nix b/pkgs/development/libraries/kde-frameworks/kpeople.nix index 6acb5e2eed51..4ca9bc7fdbf9 100644 --- a/pkgs/desktops/kde-5/frameworks/kpeople.nix +++ b/pkgs/development/libraries/kde-frameworks/kpeople.nix @@ -1,11 +1,11 @@ -{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n +{ kdeFramework, lib, ecm, kcoreaddons, ki18n , kitemviews, kservice, kwidgetsaddons, qtdeclarative }: kdeFramework { name = "kpeople"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ ecm ]; propagatedBuildInputs = [ kcoreaddons ki18n kitemviews kservice kwidgetsaddons qtdeclarative ]; diff --git a/pkgs/desktops/kde-5/frameworks/kplotting.nix b/pkgs/development/libraries/kde-frameworks/kplotting.nix index 601f1778db7d..6eda06445dc5 100644 --- a/pkgs/desktops/kde-5/frameworks/kplotting.nix +++ b/pkgs/development/libraries/kde-frameworks/kplotting.nix @@ -1,9 +1,9 @@ { kdeFramework, lib -, extra-cmake-modules +, ecm }: kdeFramework { name = "kplotting"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ ecm ]; } diff --git a/pkgs/desktops/kde-5/frameworks/kpty.nix b/pkgs/development/libraries/kde-frameworks/kpty.nix index 8bdaacb85f82..d42f96fb92c5 100644 --- a/pkgs/desktops/kde-5/frameworks/kpty.nix +++ b/pkgs/development/libraries/kde-frameworks/kpty.nix @@ -1,8 +1,8 @@ -{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n }: +{ kdeFramework, lib, ecm, kcoreaddons, ki18n }: kdeFramework { name = "kpty"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ ecm ]; propagatedBuildInputs = [ kcoreaddons ki18n ]; } diff --git a/pkgs/desktops/kde-5/frameworks/kross.nix b/pkgs/development/libraries/kde-frameworks/kross.nix index 0e66d95b5cce..ae098654eb11 100644 --- a/pkgs/desktops/kde-5/frameworks/kross.nix +++ b/pkgs/development/libraries/kde-frameworks/kross.nix @@ -1,4 +1,4 @@ -{ kdeFramework, lib, extra-cmake-modules, kcompletion, kcoreaddons +{ kdeFramework, lib, ecm, kcompletion, kcoreaddons , kdoctools, ki18n, kiconthemes, kio, kparts, kwidgetsaddons , kxmlgui, qtscript }: @@ -6,7 +6,7 @@ kdeFramework { name = "kross"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + nativeBuildInputs = [ ecm kdoctools ]; propagatedBuildInputs = [ kcompletion kcoreaddons ki18n kiconthemes kio kparts kwidgetsaddons kxmlgui qtscript diff --git a/pkgs/desktops/kde-5/frameworks/krunner.nix b/pkgs/development/libraries/kde-frameworks/krunner.nix index ec9ab7abe9f9..064a89e08067 100644 --- a/pkgs/desktops/kde-5/frameworks/krunner.nix +++ b/pkgs/development/libraries/kde-frameworks/krunner.nix @@ -1,4 +1,4 @@ -{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons +{ kdeFramework, lib, ecm, kconfig, kcoreaddons , ki18n, kio, kservice, plasma-framework, solid , threadweaver }: @@ -6,7 +6,7 @@ kdeFramework { name = "krunner"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ ecm ]; propagatedBuildInputs = [ kconfig kcoreaddons ki18n kio kservice plasma-framework solid threadweaver diff --git a/pkgs/desktops/kde-5/frameworks/kservice/default.nix b/pkgs/development/libraries/kde-frameworks/kservice/default.nix index 484be4087943..12e617a7d9af 100644 --- a/pkgs/desktops/kde-5/frameworks/kservice/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kservice/default.nix @@ -1,11 +1,12 @@ -{ kdeFramework, lib, copyPathsToStore, extra-cmake-modules, kconfig, kcoreaddons -, kcrash, kdbusaddons, kdoctools, ki18n, kwindowsystem +{ + kdeFramework, lib, copyPathsToStore, ecm, + kconfig, kcoreaddons, kcrash, kdbusaddons, kdoctools, ki18n, kwindowsystem }: kdeFramework { name = "kservice"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - propagatedNativeBuildInputs = [ extra-cmake-modules ]; + propagatedNativeBuildInputs = [ ecm ]; nativeBuildInputs = [ kdoctools ]; propagatedBuildInputs = [ kconfig kcoreaddons kcrash kdbusaddons ki18n kwindowsystem ]; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); diff --git a/pkgs/desktops/kde-5/frameworks/kservice/no-canonicalize-path.patch b/pkgs/development/libraries/kde-frameworks/kservice/no-canonicalize-path.patch index cf98ffb9067f..cf98ffb9067f 100644 --- a/pkgs/desktops/kde-5/frameworks/kservice/no-canonicalize-path.patch +++ b/pkgs/development/libraries/kde-frameworks/kservice/no-canonicalize-path.patch diff --git a/pkgs/desktops/kde-5/frameworks/kservice/qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks/kservice/qdiriterator-follow-symlinks.patch index cbe13b709508..cbe13b709508 100644 --- a/pkgs/desktops/kde-5/frameworks/kservice/qdiriterator-follow-symlinks.patch +++ b/pkgs/development/libraries/kde-frameworks/kservice/qdiriterator-follow-symlinks.patch diff --git a/pkgs/desktops/kde-5/frameworks/kservice/series b/pkgs/development/libraries/kde-frameworks/kservice/series index 3ce22dbd35a0..3ce22dbd35a0 100644 --- a/pkgs/desktops/kde-5/frameworks/kservice/series +++ b/pkgs/development/libraries/kde-frameworks/kservice/series diff --git a/pkgs/desktops/kde-5/frameworks/ktexteditor/default.nix b/pkgs/development/libraries/kde-frameworks/ktexteditor.nix index a35af2e7fbfd..8cd7e95b659a 100644 --- a/pkgs/desktops/kde-5/frameworks/ktexteditor/default.nix +++ b/pkgs/development/libraries/kde-frameworks/ktexteditor.nix @@ -1,5 +1,5 @@ { kdeFramework, lib, copyPathsToStore -, extra-cmake-modules, perl +, ecm, perl , karchive, kconfig, kguiaddons, kiconthemes, kparts , libgit2 , qtscript, qtxmlpatterns @@ -9,10 +9,9 @@ kdeFramework { name = "ktexteditor"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules perl ]; + nativeBuildInputs = [ ecm perl ]; propagatedBuildInputs = [ karchive kconfig kguiaddons ki18n kiconthemes kio kparts libgit2 qtscript qtxmlpatterns sonnet ]; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); } diff --git a/pkgs/desktops/kde-5/frameworks/ktextwidgets.nix b/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix index 25954c603971..3a1258e9a37b 100644 --- a/pkgs/desktops/kde-5/frameworks/ktextwidgets.nix +++ b/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix @@ -1,4 +1,4 @@ -{ kdeFramework, lib, extra-cmake-modules, kcompletion, kconfig +{ kdeFramework, lib, ecm, kcompletion, kconfig , kconfigwidgets, ki18n, kiconthemes, kservice, kwindowsystem , sonnet }: @@ -6,7 +6,7 @@ kdeFramework { name = "ktextwidgets"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ ecm ]; propagatedBuildInputs = [ kcompletion kconfig kconfigwidgets ki18n kiconthemes kservice kwindowsystem sonnet diff --git a/pkgs/desktops/kde-5/frameworks/kunitconversion.nix b/pkgs/development/libraries/kde-frameworks/kunitconversion.nix index c04ded722aa4..136587cc682e 100644 --- a/pkgs/desktops/kde-5/frameworks/kunitconversion.nix +++ b/pkgs/development/libraries/kde-frameworks/kunitconversion.nix @@ -1,8 +1,8 @@ -{ kdeFramework, lib, extra-cmake-modules, ki18n }: +{ kdeFramework, lib, ecm, ki18n }: kdeFramework { name = "kunitconversion"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ ecm ]; propagatedBuildInputs = [ ki18n ]; } diff --git a/pkgs/desktops/kde-5/frameworks/kwallet.nix b/pkgs/development/libraries/kde-frameworks/kwallet.nix index f02c6138df77..fb801f48b119 100644 --- a/pkgs/desktops/kde-5/frameworks/kwallet.nix +++ b/pkgs/development/libraries/kde-frameworks/kwallet.nix @@ -1,4 +1,4 @@ -{ kdeFramework, lib, extra-cmake-modules, kconfig, kconfigwidgets +{ kdeFramework, lib, ecm, kconfig, kconfigwidgets , kcoreaddons , kdbusaddons, kdoctools, ki18n, kiconthemes , knotifications , kservice, kwidgetsaddons, kwindowsystem, libgcrypt }: @@ -6,7 +6,7 @@ kdeFramework { name = "kwallet"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + nativeBuildInputs = [ ecm kdoctools ]; propagatedBuildInputs = [ kconfig kconfigwidgets kcoreaddons kdbusaddons ki18n kiconthemes knotifications kservice kwidgetsaddons kwindowsystem libgcrypt diff --git a/pkgs/desktops/kde-5/frameworks/kwayland.nix b/pkgs/development/libraries/kde-frameworks/kwayland.nix index db3328413082..c530bf80a90e 100644 --- a/pkgs/desktops/kde-5/frameworks/kwayland.nix +++ b/pkgs/development/libraries/kde-frameworks/kwayland.nix @@ -1,12 +1,12 @@ { kdeFramework -, extra-cmake-modules +, ecm , wayland }: kdeFramework { name = "kwayland"; nativeBuildInputs = [ - extra-cmake-modules + ecm ]; propagatedBuildInputs = [ wayland diff --git a/pkgs/desktops/kde-5/frameworks/kwidgetsaddons.nix b/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix index 7f2b35d8f7b5..ae34e60c4c12 100644 --- a/pkgs/desktops/kde-5/frameworks/kwidgetsaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix @@ -1,9 +1,9 @@ { kdeFramework, lib -, extra-cmake-modules +, ecm }: kdeFramework { name = "kwidgetsaddons"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ ecm ]; } diff --git a/pkgs/desktops/kde-5/frameworks/kwindowsystem.nix b/pkgs/development/libraries/kde-frameworks/kwindowsystem.nix index 6acab52d1353..64186a30eadc 100644 --- a/pkgs/desktops/kde-5/frameworks/kwindowsystem.nix +++ b/pkgs/development/libraries/kde-frameworks/kwindowsystem.nix @@ -1,11 +1,11 @@ { kdeFramework, lib -, extra-cmake-modules +, ecm , qtx11extras }: kdeFramework { name = "kwindowsystem"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ ecm ]; propagatedBuildInputs = [ qtx11extras ]; } diff --git a/pkgs/desktops/kde-5/frameworks/kxmlgui.nix b/pkgs/development/libraries/kde-frameworks/kxmlgui.nix index ea800bf58ae0..c48fc9efdfad 100644 --- a/pkgs/desktops/kde-5/frameworks/kxmlgui.nix +++ b/pkgs/development/libraries/kde-frameworks/kxmlgui.nix @@ -1,4 +1,4 @@ -{ kdeFramework, lib, extra-cmake-modules, attica, kconfig +{ kdeFramework, lib, ecm, attica, kconfig , kconfigwidgets, kglobalaccel, ki18n, kiconthemes, kitemviews , ktextwidgets, kwindowsystem, sonnet }: @@ -6,7 +6,7 @@ kdeFramework { name = "kxmlgui"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ ecm ]; propagatedBuildInputs = [ attica kconfig kconfigwidgets kglobalaccel ki18n kiconthemes kitemviews ktextwidgets kwindowsystem sonnet diff --git a/pkgs/desktops/kde-5/frameworks/kxmlrpcclient.nix b/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix index f20f4a223945..31301875351f 100644 --- a/pkgs/desktops/kde-5/frameworks/kxmlrpcclient.nix +++ b/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix @@ -1,8 +1,8 @@ -{ kdeFramework, lib, extra-cmake-modules, ki18n, kio }: +{ kdeFramework, lib, ecm, ki18n, kio }: kdeFramework { name = "kxmlrpcclient"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ ecm ]; propagatedBuildInputs = [ ki18n kio ]; } diff --git a/pkgs/desktops/kde-5/frameworks/modemmanager-qt.nix b/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix index e03254a71edd..bf3487dcb391 100644 --- a/pkgs/desktops/kde-5/frameworks/modemmanager-qt.nix +++ b/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix @@ -1,11 +1,11 @@ { kdeFramework, lib -, extra-cmake-modules +, ecm , modemmanager }: kdeFramework { name = "modemmanager-qt"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ ecm ]; propagatedBuildInputs = [ modemmanager ]; } diff --git a/pkgs/desktops/kde-5/frameworks/networkmanager-qt.nix b/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix index 0515509a77c5..bb5968635388 100644 --- a/pkgs/desktops/kde-5/frameworks/networkmanager-qt.nix +++ b/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix @@ -1,11 +1,11 @@ { kdeFramework, lib -, extra-cmake-modules +, ecm , networkmanager }: kdeFramework { name = "networkmanager-qt"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ ecm ]; propagatedBuildInputs = [ networkmanager ]; } diff --git a/pkgs/desktops/kde-5/frameworks/oxygen-icons5.nix b/pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix index 0b5c75b960d3..42978b46992d 100644 --- a/pkgs/desktops/kde-5/frameworks/oxygen-icons5.nix +++ b/pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix @@ -1,6 +1,6 @@ { kdeFramework , lib -, extra-cmake-modules +, ecm }: kdeFramework { @@ -10,5 +10,5 @@ kdeFramework { maintainers = [ lib.maintainers.ttuegel ]; }; outputs = [ "out" ]; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ ecm ]; } diff --git a/pkgs/desktops/kde-5/frameworks/plasma-framework.nix b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix index a41381486538..60910b0d678b 100644 --- a/pkgs/desktops/kde-5/frameworks/plasma-framework.nix +++ b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix @@ -1,4 +1,4 @@ -{ kdeFramework, lib, extra-cmake-modules, kactivities, karchive +{ kdeFramework, lib, ecm, kactivities, karchive , kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative , kdoctools, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio , knotifications, kpackage, kservice, kwindowsystem, kxmlgui @@ -8,7 +8,7 @@ kdeFramework { name = "plasma-framework"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + nativeBuildInputs = [ ecm kdoctools ]; propagatedBuildInputs = [ kactivities karchive kconfig kconfigwidgets kcoreaddons kdbusaddons kdeclarative kglobalaccel kguiaddons ki18n kiconthemes kio knotifications diff --git a/pkgs/development/libraries/kde-frameworks/setup-hook.sh b/pkgs/development/libraries/kde-frameworks/setup-hook.sh new file mode 100644 index 000000000000..a1638ca541be --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks/setup-hook.sh @@ -0,0 +1,51 @@ +_ecmSetXdgDirs() { + addToSearchPathOnce XDG_DATA_DIRS "$1/share" + addToSearchPathOnce XDG_CONFIG_DIRS "$1/etc/xdg" +} + +envHooks+=(_ecmSetXdgDirs) + +_ecmConfig() { + # Because we need to use absolute paths here, we must set *all* the paths. + cmakeFlags+=" -DKDE_INSTALL_EXECROOTDIR=${!outputBin}" + cmakeFlags+=" -DKDE_INSTALL_BINDIR=${!outputBin}/bin" + cmakeFlags+=" -DKDE_INSTALL_SBINDIR=${!outputBin}/sbin" + cmakeFlags+=" -DKDE_INSTALL_LIBDIR=${!outputLib}/lib" + cmakeFlags+=" -DKDE_INSTALL_LIBEXECDIR=${!outputBin}/lib/libexec" + cmakeFlags+=" -DKDE_INSTALL_CMAKEPACKAGEDIR=${!outputDev}/lib/cmake" + cmakeFlags+=" -DKDE_INSTALL_QTPLUGINDIR=${!outputBin}/lib/qt5/plugins" + cmakeFlags+=" -DKDE_INSTALL_PLUGINDIR=${!outputBin}/lib/qt5/plugins" + cmakeFlags+=" -DKDE_INSTALL_QTQUICKIMPORTSDIR=${!outputBin}/lib/qt5/imports" + cmakeFlags+=" -DKDE_INSTALL_QMLDIR=${!outputBin}/lib/qt5/qml" + cmakeFlags+=" -DKDE_INSTALL_INCLUDEDIR=${!outputInclude}/include" + cmakeFlags+=" -DKDE_INSTALL_LOCALSTATEDIR=/var" + cmakeFlags+=" -DKDE_INSTALL_DATAROOTDIR=${!outputBin}/share" + cmakeFlags+=" -DKDE_INSTALL_DATADIR=${!outputBin}/share" + cmakeFlags+=" -DKDE_INSTALL_DOCBUNDLEDIR=${!outputBin}/share/doc/HTML" + cmakeFlags+=" -DKDE_INSTALL_KCFGDIR=${!outputBin}/share/config.kcfg" + cmakeFlags+=" -DKDE_INSTALL_KCONFUPDATEDIR=${!outputBin}/share/kconf_update" + cmakeFlags+=" -DKDE_INSTALL_KSERVICES5DIR=${!outputBin}/share/kservices5" + cmakeFlags+=" -DKDE_INSTALL_KSERVICETYPES5DIR=${!outputBin}/share/kservicetypes5" + cmakeFlags+=" -DKDE_INSTALL_KXMLGUI5DIR=${!outputBin}/share/kxmlgui5" + cmakeFlags+=" -DKDE_INSTALL_KNOTIFY5RCDIR=${!outputBin}/share/knotifications5" + cmakeFlags+=" -DKDE_INSTALL_ICONDIR=${!outputBin}/share/icons" + cmakeFlags+=" -DKDE_INSTALL_LOCALEDIR=${!outputBin}/share/locale" + cmakeFlags+=" -DKDE_INSTALL_SOUNDDIR=${!outputBin}/share/sounds" + cmakeFlags+=" -DKDE_INSTALL_TEMPLATEDIR=${!outputBin}/share/templates" + cmakeFlags+=" -DKDE_INSTALL_WALLPAPERDIR=${!outputBin}/share/wallpapers" + cmakeFlags+=" -DKDE_INSTALL_APPDIR=${!outputBin}/share/applications" + cmakeFlags+=" -DKDE_INSTALL_DESKTOPDIR=${!outputBin}/share/desktop-directories" + cmakeFlags+=" -DKDE_INSTALL_MIMEDIR=${!outputBin}/share/mime/packages" + cmakeFlags+=" -DKDE_INSTALL_METAINFODIR=${!outputBin}/share/appdata" + cmakeFlags+=" -DKDE_INSTALL_MANDIR=${!outputBin}/share/man" + cmakeFlags+=" -DKDE_INSTALL_INFODIR=${!outputBin}/share/info" + cmakeFlags+=" -DKDE_INSTALL_DBUSDIR=${!outputBin}/share/dbus-1" + cmakeFlags+=" -DKDE_INSTALL_DBUSINTERFACEDIR=${!outputBin}/share/dbus-1/interfaces" + cmakeFlags+=" -DKDE_INSTALL_DBUSSERVICEDIR=${!outputBin}/share/dbus-1/services" + cmakeFlags+=" -DKDE_INSTALL_DBUSSYSTEMSERVICEDIR=${!outputBin}/share/dbus-1/system-services" + cmakeFlags+=" -DKDE_INSTALL_SYSCONFDIR=${!outputBin}/etc" + cmakeFlags+=" -DKDE_INSTALL_CONFDIR=${!outputBin}/etc/xdg" + cmakeFlags+=" -DKDE_INSTALL_AUTOSTARTDIR=${!outputBin}/etc/xdg/autostart" +} + +preConfigureHooks+=(_ecmConfig) diff --git a/pkgs/desktops/kde-5/frameworks/solid.nix b/pkgs/development/libraries/kde-frameworks/solid.nix index c4f580fe1c2d..aad6e5eb601b 100644 --- a/pkgs/desktops/kde-5/frameworks/solid.nix +++ b/pkgs/development/libraries/kde-frameworks/solid.nix @@ -1,11 +1,11 @@ { kdeFramework, lib -, extra-cmake-modules +, ecm , qtdeclarative }: kdeFramework { name = "solid"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ ecm ]; propagatedBuildInputs = [ qtdeclarative ]; } diff --git a/pkgs/desktops/kde-5/frameworks/sonnet.nix b/pkgs/development/libraries/kde-frameworks/sonnet.nix index 28c24302abc4..8b1cf6a2cd11 100644 --- a/pkgs/desktops/kde-5/frameworks/sonnet.nix +++ b/pkgs/development/libraries/kde-frameworks/sonnet.nix @@ -1,11 +1,11 @@ { kdeFramework, lib -, extra-cmake-modules +, ecm , hunspell }: kdeFramework { name = "sonnet"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ ecm ]; buildInputs = [ hunspell ]; } diff --git a/pkgs/desktops/kde-5/frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index 5c48ece1e99e..5c48ece1e99e 100644 --- a/pkgs/desktops/kde-5/frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix diff --git a/pkgs/desktops/kde-5/frameworks/threadweaver.nix b/pkgs/development/libraries/kde-frameworks/threadweaver.nix index b8f2939e8b59..6d3dff604132 100644 --- a/pkgs/desktops/kde-5/frameworks/threadweaver.nix +++ b/pkgs/development/libraries/kde-frameworks/threadweaver.nix @@ -1,9 +1,9 @@ { kdeFramework, lib -, extra-cmake-modules +, ecm }: kdeFramework { name = "threadweaver"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ ecm ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; } diff --git a/pkgs/development/libraries/libassuan/default.nix b/pkgs/development/libraries/libassuan/default.nix index f2f31963d670..43cfd316b5ca 100644 --- a/pkgs/development/libraries/libassuan/default.nix +++ b/pkgs/development/libraries/libassuan/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, pth, libgpgerror }: stdenv.mkDerivation rec { - name = "libassuan-2.4.2"; + name = "libassuan-2.4.3"; src = fetchurl { url = "mirror://gnupg/libassuan/${name}.tar.bz2"; - sha256 = "086bbcdnvs48qq5g4iac7dpk76j0q3jrp16mchdvyx0b720xq1mv"; + sha256 = "0w9bmasln4z8mn16s1is55a06w3nv8jbyal496z5jvr5vcxkm112"; }; outputs = [ "dev" "out" "info" ]; diff --git a/pkgs/development/libraries/libebml/default.nix b/pkgs/development/libraries/libebml/default.nix index 3bdcfeda6a5f..7b7f880ab9ed 100644 --- a/pkgs/development/libraries/libebml/default.nix +++ b/pkgs/development/libraries/libebml/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libebml-1.3.3"; + name = "libebml-1.3.4"; src = fetchurl { url = "http://dl.matroska.org/downloads/libebml/${name}.tar.bz2"; - sha256 = "16alhwd1yz5bv3765xfn5azwk37805lg1f61195gjq8rlkd49yrm"; + sha256 = "11zka6z9ncywyjr1gfm5cnii33ln7y3w6s86kiacchip2g7kw3f5"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix index 7a039a813d8a..eb2b46629ade 100644 --- a/pkgs/development/libraries/libfilezilla/default.nix +++ b/pkgs/development/libraries/libfilezilla/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libfilezilla-${version}"; - version = "0.5.3"; + version = "0.6.1"; src = fetchurl { url = "mirror://sourceforge/project/filezilla/libfilezilla/${version}/${name}.tar.bz2"; - sha256 = "05z9d2pi8n8yl3dbwg2nw6bcvi0zzc9hkammm1mayfh7h4akqc0i"; + sha256 = "73c3ada6f9c5649abd93e6a3e7ecc6682d4f43248660b5506918eab76a7b901b"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index 7a62011ddb4b..58de089a7174 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -4,11 +4,11 @@ assert enableCapabilities -> stdenv.isLinux; stdenv.mkDerivation rec { name = "libgcrypt-${version}"; - version = "1.7.1"; + version = "1.7.2"; src = fetchurl { url = "mirror://gnupg/libgcrypt/${name}.tar.bz2"; - sha256 = "15bsdpihb8xvr2a6sh0ikzw9wdw3gdi4pl1vpr6wc48npzy9q3a5"; + sha256 = "17v8nvvxagcwxz46apzz575l8682kfd78pf00i2kbavfdn8dyd9x"; }; outputs = [ "dev" "out" "info" ]; diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index c15dcc4993df..1238fc760883 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libgpg-error-${version}"; - version = "1.23"; + version = "1.24"; src = fetchurl { url = "mirror://gnupg/libgpg-error/${name}.tar.bz2"; - sha256 = "1alyjd6671drj92m0qi9943rfmf1sjjbzvmz97v4hh4cp5jpy33z"; + sha256 = "0h75sf1ngr750c3fjfn4583q7wz40qm63jhg8vjfdrbx936f2s4j"; }; postPatch = "sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure"; diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix index 9b62436ae080..5f1f6afcec12 100644 --- a/pkgs/development/libraries/libiconv/default.nix +++ b/pkgs/development/libraries/libiconv/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ]; postPatch = - lib.optionalString (stdenv.cross.libc or null == "msvcrt") + lib.optionalString ((stdenv ? cross && stdenv.cross.libc == "msvcrt") || stdenv.cc.nativeLibc) '' sed '/^_GL_WARN_ON_USE (gets/d' -i srclib/stdio.in.h ''; diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix index e49a85942d76..52b74c54d99f 100644 --- a/pkgs/development/libraries/libidn/default.nix +++ b/pkgs/development/libraries/libidn/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, libiconv }: stdenv.mkDerivation rec { - name = "libidn-1.32"; + name = "libidn-1.33"; src = fetchurl { url = "mirror://gnu/libidn/${name}.tar.gz"; - sha256 = "1xf4hphhahcjm2xwx147lfpsavjwv9l4c2gf6hx71zxywbz5lpds"; + sha256 = "068fjg2arlppjqqpzd714n1lf6gxkpac9v5yyvp1qwmv6nvam9s4"; }; outputs = [ "dev" "out" "bin" "info" "docdev" ]; diff --git a/pkgs/development/libraries/libmatroska/default.nix b/pkgs/development/libraries/libmatroska/default.nix index 134f6b1bf270..3b3dee138a54 100644 --- a/pkgs/development/libraries/libmatroska/default.nix +++ b/pkgs/development/libraries/libmatroska/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libebml }: stdenv.mkDerivation rec { - name = "libmatroska-1.4.4"; + name = "libmatroska-1.4.5"; src = fetchurl { url = "http://dl.matroska.org/downloads/libmatroska/${name}.tar.bz2"; - sha256 = "1mvb54q3gag9dj0pkwci8w75gp6mm14gi85y0ld3ar1rdngsmvyk"; + sha256 = "1g2p2phmhkp86ldd2zqx6q0s33r7d38rsfnr4wmmdr81d6j3y0kr"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index aa84c507c97a..785e3320cc11 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -1,33 +1,41 @@ { stdenv, fetchurl, glib, libxml2, pkgconfig -, gnomeSupport ? false, libgnome_keyring, sqlite, glib_networking, gobjectIntrospection +, gnomeSupport ? true, libgnome_keyring, sqlite, glib_networking, gobjectIntrospection +, valaSupport ? true, vala , libintlOrEmpty , intltool, python }: let - majorVersion = "2.52"; - version = "${majorVersion}.2"; + majorVersion = "2.54"; + version = "${majorVersion}.1"; in stdenv.mkDerivation { name = "libsoup-${version}"; src = fetchurl { url = "mirror://gnome/sources/libsoup/${majorVersion}/libsoup-${version}.tar.xz"; - sha256 = "1p4k40y2gikr6m8p3hm0vswdzj2pj133dckipd2jk5bxbj5n4mfv"; + sha256 = "0cyn5pq4xl1gb8413h2p4d5wrn558dc054zhwmk4swrl40ijrd27"; }; - patchPhase = '' + prePatch = '' patchShebangs libsoup/ + '' + stdenv.lib.optionalString valaSupport + '' + substituteInPlace libsoup/Makefile.in --replace "\$(DESTDIR)\$(vapidir)" "\$(DESTDIR)\$(girdir)/../vala/vapi" ''; outputs = [ "dev" "out" ]; - buildInputs = libintlOrEmpty ++ [ intltool python sqlite ]; + buildInputs = libintlOrEmpty ++ [ intltool python sqlite ] + ++ stdenv.lib.optionals valaSupport [ vala ]; nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ glib libxml2 gobjectIntrospection ] ++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring ]; passthru.propagatedUserEnvPackages = [ glib_networking.out ]; # glib_networking is a runtime dependency, not a compile-time dependency - configureFlags = "--disable-tls-check --enable-vala=no" + stdenv.lib.optionalString (!gnomeSupport) " --without-gnome"; + configureFlags = "--disable-tls-check" + + stdenv.lib.optionalString (!valaSupport) " --enable-vala=no" + + stdenv.lib.optionalString (valaSupport) " --enable-vala=yes" + + stdenv.lib.optionalString (!gnomeSupport) " --without-gnome"; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; diff --git a/pkgs/development/libraries/mesa-darwin/default.nix b/pkgs/development/libraries/mesa-darwin/default.nix index af8b4e1179ce..0ae17b4d3f61 100644 --- a/pkgs/development/libraries/mesa-darwin/default.nix +++ b/pkgs/development/libraries/mesa-darwin/default.nix @@ -25,6 +25,8 @@ let libffi libvdpau ] ++ stdenv.lib.optionals stdenv.isDarwin [ OpenGL apple_sdk.sdk Xplugin ]; + propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ OpenGL ]; + postUnpack = '' ln -s darwin $sourceRoot/configs/current ''; diff --git a/pkgs/development/libraries/motif/default.nix b/pkgs/development/libraries/motif/default.nix new file mode 100644 index 000000000000..9d50fb3d3d19 --- /dev/null +++ b/pkgs/development/libraries/motif/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl, pkgconfig, libtool +, xlibsWrapper, xbitmaps, libXrender, libXmu, libXt +, expat, libjpeg, libpng, libiconv +, flex +, libXp, libXau +, demoSupport ? false, autoconf, automake +}: +# refer to the gentoo package + +stdenv.mkDerivation rec { + name = "motif-${version}"; + version = "2.3.6"; + + src = fetchurl { + url = "mirror://sourceforge/motif/${name}.tar.gz"; + sha256 = "1ksqbp0bzdw6wcrx8s4hj4ivvxmw54hz85l2xfigb87cxmmhx0gs"; + }; + + buildInputs = [ + pkgconfig libtool + xlibsWrapper xbitmaps libXrender libXmu libXt + expat libjpeg libpng libiconv + ] ++ stdenv.lib.optionals (!demoSupport) [ autoconf automake ]; + + nativeBuildInputs = [ flex ]; + + propagatedBuildInputs = [ libXp libXau ]; + + makeFlags = [ "CFLAGS=-fno-strict-aliasing" ]; + + patchPhase = '' + rm lib/Xm/Xm.h + echo -e '"The X.Org Foundation"\t\t\t\t\tpc' >>bindings/xmbind.alias + '' + stdenv.lib.optionalString (!demoSupport) + '' + sed -i -e '/^SUBDIRS/{:x;/\\$/{N;bx;};s/[ \t\n\\]*demos//;}' Makefile.am + ''; + + meta = with stdenv.lib; { + homepage = http://motif.ics.com; + description = "Unix standard widget-toolkit and window-manager"; + platforms = with platforms; linux; + license = with licenses; [ lgpl21 ]; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/libraries/phonon/backends/gstreamer.nix b/pkgs/development/libraries/phonon/backends/gstreamer.nix index 3f2ab6696d18..1fb542c2c5f4 100644 --- a/pkgs/development/libraries/phonon/backends/gstreamer.nix +++ b/pkgs/development/libraries/phonon/backends/gstreamer.nix @@ -1,13 +1,14 @@ { stdenv, lib, fetchurl, cmake, gst_all_1, phonon, pkgconfig -, extra-cmake-modules ? null, qtbase ? null, qtx11extras ? null, qt4 ? null -, debug ? false }: +, extra-cmake-modules, qtbase ? null, qtx11extras ? null, qt4 ? null +, withQt5 ? false +, debug ? false +}: with lib; let v = "4.9.0"; pname = "phonon-backend-gstreamer"; - withQt5 = extra-cmake-modules != null; in assert withQt5 -> qtbase != null; diff --git a/pkgs/development/libraries/phonon/backends/vlc.nix b/pkgs/development/libraries/phonon/backends/vlc.nix index aaff26eee286..f296e34e783a 100644 --- a/pkgs/development/libraries/phonon/backends/vlc.nix +++ b/pkgs/development/libraries/phonon/backends/vlc.nix @@ -1,13 +1,14 @@ { stdenv, lib, fetchurl, cmake, phonon, pkgconfig, vlc -, extra-cmake-modules ? null, qtbase ? null, qtx11extras ? null, qt4 ? null -, debug ? false }: +, extra-cmake-modules, qtbase ? null, qtx11extras ? null, qt4 ? null +, withQt5 ? false +, debug ? false +}: with lib; let v = "0.9.0"; pname = "phonon-backend-vlc"; - withQt5 = extra-cmake-modules != null; in assert withQt5 -> qtbase != null; diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix index 3fbbccc08e30..4bbe05fea6ee 100644 --- a/pkgs/development/libraries/phonon/default.nix +++ b/pkgs/development/libraries/phonon/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchurl, cmake, mesa, pkgconfig, libpulseaudio -, qt4 ? null, extra-cmake-modules ? null, qtbase ? null, qttools ? null +, qt4 ? null, extra-cmake-modules, qtbase ? null, qttools ? null +, withQt5 ? false , debug ? false }: with lib; let v = "4.9.0"; - withQt5 = extra-cmake-modules != null; in assert withQt5 -> qtbase != null; diff --git a/pkgs/development/libraries/qt-5/5.5/default.nix b/pkgs/development/libraries/qt-5/5.5/default.nix index 24b4c749853d..8401e9f0d3de 100644 --- a/pkgs/development/libraries/qt-5/5.5/default.nix +++ b/pkgs/development/libraries/qt-5/5.5/default.nix @@ -42,7 +42,7 @@ let inherit src; propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or []); - nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ self.fixQtModuleCMakeConfig self.qmakeHook ]; + nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ self.qmakeHook ]; NIX_QT_SUBMODULE = args.NIX_QT_SUBMODULE or true; @@ -113,7 +113,6 @@ let ]; makeQtWrapper = makeSetupHook { deps = [ makeWrapper ]; } ./make-qt-wrapper.sh; - fixQtModuleCMakeConfig = makeSetupHook { } ./fix-qt-module-cmake-config.sh; qmakeHook = makeSetupHook { substitutions = { qt_dev = qtbase.dev; lndir = pkgs.xorg.lndir; }; } ./qmake-hook.sh; }; diff --git a/pkgs/development/libraries/qt-5/5.5/fix-qt-module-cmake-config.sh b/pkgs/development/libraries/qt-5/5.5/fix-qt-module-cmake-config.sh deleted file mode 100644 index 7ca3e33b613c..000000000000 --- a/pkgs/development/libraries/qt-5/5.5/fix-qt-module-cmake-config.sh +++ /dev/null @@ -1,5 +0,0 @@ -fixQtModuleCMakeConfig() { - local module="$1" - sed -e "/set(imported_location/ s@\\\${_qt5${module}_install_prefix}@${!outputLib}@" \ - -i "${!outputDev}/lib/cmake/Qt5${module}/Qt5${module}Config.cmake" -} diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/cmake-paths.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/cmake-paths.patch new file mode 100644 index 000000000000..63c4ab7256a6 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/cmake-paths.patch @@ -0,0 +1,321 @@ +Index: qtbase-opensource-src-5.6.0/qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +=================================================================== +--- qtbase-opensource-src-5.6.0.orig/qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in ++++ qtbase-opensource-src-5.6.0/qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +@@ -9,30 +9,6 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0) + endif() + !!ENDIF + +-!!IF !isEmpty(CMAKE_USR_MOVE_WORKAROUND) +-!!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +-set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") +-!!ELSE +-get_filename_component(_IMPORT_PREFIX \"${CMAKE_CURRENT_LIST_FILE}\" PATH) +-# Use original install prefix when loaded through a +-# cross-prefix symbolic link such as /lib -> /usr/lib. +-get_filename_component(_realCurr \"${_IMPORT_PREFIX}\" REALPATH) +-get_filename_component(_realOrig \"$$CMAKE_INSTALL_LIBS_DIR/cmake/Qt5$${CMAKE_MODULE_NAME}\" REALPATH) +-if(_realCurr STREQUAL _realOrig) +- get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$CMAKE_INSTALL_LIBS_DIR/$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}\" ABSOLUTE) +-else() +- get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE) +-endif() +-unset(_realOrig) +-unset(_realCurr) +-unset(_IMPORT_PREFIX) +-!!ENDIF +-!!ELIF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +-get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE) +-!!ELSE +-set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") +-!!ENDIF +- + !!IF !equals(TEMPLATE, aux) + # For backwards compatibility only. Use Qt5$${CMAKE_MODULE_NAME}_VERSION instead. + set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.MAJOR_VERSION).$$eval(QT.$${MODULE}.MINOR_VERSION).$$eval(QT.$${MODULE}.PATCH_VERSION)") +@@ -59,7 +35,10 @@ macro(_populate_$${CMAKE_MODULE_NAME}_ta + set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) + + !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") ++ set(imported_location \"@NIX_OUT@/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") ++ if(NOT EXISTS \"${imported_location}\") ++ set(imported_location \"@NIX_DEV@/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") ++ endif() + !!ELSE + set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\") + !!ENDIF +@@ -74,45 +53,18 @@ macro(_populate_$${CMAKE_MODULE_NAME}_ta + \"IMPORTED_LINK_INTERFACE_LIBRARIES_${Configuration}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\" + ) + +-!!IF !isEmpty(CMAKE_WINDOWS_BUILD) +-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") +-!!ELSE +- set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") +-!!ENDIF +- _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_implib}) +- if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\") +- set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES +- \"IMPORTED_IMPLIB_${Configuration}\" ${imported_implib} +- ) +- endif() +-!!ENDIF + endmacro() + !!ENDIF + + if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) + + !!IF !no_module_headers +-!!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK) +- set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework\" +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Headers\" +- ) +-!!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES) +- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/\" +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\" +- ) +-!!ELSE +- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") +-!!ENDIF +-!!ELSE + !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE) +- set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR\" \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}\") ++ set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"@NIX_DEV@/$$CMAKE_INCLUDE_DIR\" \"@NIX_DEV@/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}\") + !!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES) + set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION\" +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION/$${MODULE_INCNAME}\" ++ \"@NIX_DEV@/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION\" ++ \"@NIX_DEV@/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION/$${MODULE_INCNAME}\" + ) + !!ELSE + set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") +@@ -128,7 +80,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME + set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") + !!ENDIF + !!ENDIF +-!!ENDIF ++ + !!IF !isEmpty(CMAKE_ADD_SOURCE_INCLUDE_DIRS) + include(\"${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake\" OPTIONAL) + !!ENDIF +@@ -253,28 +205,19 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME + + !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) + !!IF isEmpty(CMAKE_DEBUG_TYPE) +-!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) +-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) +-!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE +- if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) +-!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE +- _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" ) +-!!ELSE // CMAKE_STATIC_WINDOWS_BUILD + if (EXISTS + !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" ++ \"@NIX_OUT@/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" + !!ELSE + \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" + !!ENDIF + AND EXISTS + !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) ++ \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) + !!ELSE + \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) + !!ENDIF + _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) +-!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD + endif() + !!ENDIF // CMAKE_DEBUG_TYPE + !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD +@@ -282,36 +225,23 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME + !!ENDIF // CMAKE_RELEASE_TYPE + + !!IF !isEmpty(CMAKE_DEBUG_TYPE) +-!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) +- _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" ) +-!!ELSE + _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) +-!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD + + !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) + !!IF isEmpty(CMAKE_RELEASE_TYPE) +-!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) +-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) +-!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE +- if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) +-!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE +- _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" ) +-!!ELSE // CMAKE_STATIC_WINDOWS_BUILD + if (EXISTS + !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" ++ \"@NIX_OUT@/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" + !!ELSE + \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" + !!ENDIF + AND EXISTS + !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) ++ \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) + !!ELSE + \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) + !!ENDIF + _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) +-!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD + endif() + !!ENDIF // CMAKE_RELEASE_TYPE + !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD +@@ -329,7 +259,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME + set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) + + !!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") ++ set(imported_location \"@NIX_OUT@/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") + !!ELSE + set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") + !!ENDIF +Index: qtbase-opensource-src-5.6.0/qtbase/src/gui/Qt5GuiConfigExtras.cmake.in +=================================================================== +--- qtbase-opensource-src-5.6.0.orig/qtbase/src/gui/Qt5GuiConfigExtras.cmake.in ++++ qtbase-opensource-src-5.6.0/qtbase/src/gui/Qt5GuiConfigExtras.cmake.in +@@ -2,7 +2,7 @@ + !!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE) + + !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE) +-set(Qt5Gui_EGL_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR/QtANGLE\") ++set(Qt5Gui_EGL_INCLUDE_DIRS \"@NIX_DEV@/$$CMAKE_INCLUDE_DIR/QtANGLE\") + !!ELSE + set(Qt5Gui_EGL_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR/QtANGLE\") + !!ENDIF +@@ -17,13 +17,13 @@ macro(_populate_qt5gui_gl_target_propert + set_property(TARGET Qt5::${TargetName} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) + + !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Gui_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") ++ set(imported_location \"@NIX_OUT@/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") + !!ELSE + set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\") + !!ENDIF + + !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- set(imported_implib \"${_qt5Gui_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") ++ set(imported_implib \"@NIX_DEV@/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") + !!ELSE + set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") + !!ENDIF +Index: qtbase-opensource-src-5.6.0/qtbase/src/widgets/Qt5WidgetsConfigExtras.cmake.in +=================================================================== +--- qtbase-opensource-src-5.6.0.orig/qtbase/src/widgets/Qt5WidgetsConfigExtras.cmake.in ++++ qtbase-opensource-src-5.6.0/qtbase/src/widgets/Qt5WidgetsConfigExtras.cmake.in +@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::uic) + add_executable(Qt5::uic IMPORTED) + + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Widgets_install_prefix}/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") + !!ENDIF +Index: qtbase-opensource-src-5.6.0/qtbase/src/corelib/Qt5CoreConfigExtras.cmake.in +=================================================================== +--- qtbase-opensource-src-5.6.0.orig/qtbase/src/corelib/Qt5CoreConfigExtras.cmake.in ++++ qtbase-opensource-src-5.6.0/qtbase/src/corelib/Qt5CoreConfigExtras.cmake.in +@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qmake) + add_executable(Qt5::qmake IMPORTED) + + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") + !!ENDIF +@@ -18,7 +18,7 @@ if (NOT TARGET Qt5::moc) + add_executable(Qt5::moc IMPORTED) + + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") + !!ENDIF +@@ -35,7 +35,7 @@ if (NOT TARGET Qt5::rcc) + add_executable(Qt5::rcc IMPORTED) + + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") + !!ENDIF +@@ -131,7 +131,7 @@ if (NOT TARGET Qt5::WinMain) + !!IF !isEmpty(CMAKE_RELEASE_TYPE) + set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) + !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") ++ set(imported_location \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") + !!ELSE + set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") + !!ENDIF +@@ -145,7 +145,7 @@ if (NOT TARGET Qt5::WinMain) + set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) + + !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") ++ set(imported_location \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") + !!ELSE + set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") + !!ENDIF +Index: qtbase-opensource-src-5.6.0/qtbase/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in +=================================================================== +--- qtbase-opensource-src-5.6.0.orig/qtbase/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in ++++ qtbase-opensource-src-5.6.0/qtbase/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in +@@ -1,6 +1,6 @@ + + !!IF isEmpty(CMAKE_INSTALL_DATA_DIR_IS_ABSOLUTE) +-set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") ++set(_qt5_corelib_extra_includes \"@NIX_DEV@/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") + !!ELSE + set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") + !!ENDIF +Index: qtbase-opensource-src-5.6.0/qtbase/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in +=================================================================== +--- qtbase-opensource-src-5.6.0.orig/qtbase/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in ++++ qtbase-opensource-src-5.6.0/qtbase/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in +@@ -1,6 +1,6 @@ + + !!IF isEmpty(CMAKE_HOST_DATA_DIR_IS_ABSOLUTE) +-set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") ++set(_qt5_corelib_extra_includes \"@NIX_DEV@/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") + !!ELSE + set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") + !!ENDIF +Index: qtbase-opensource-src-5.6.0/src/qtbase/dbus/Qt5DBusConfigExtras.cmake.in +=================================================================== +--- qtbase-opensource-src-5.6.0.orig/qtbase/src/dbus/Qt5DBusConfigExtras.cmake.in ++++ qtbase-opensource-src-5.6.0/qtbase/src/dbus/Qt5DBusConfigExtras.cmake.in +@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml) + add_executable(Qt5::qdbuscpp2xml IMPORTED) + + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") + !!ENDIF +@@ -18,7 +18,7 @@ if (NOT TARGET Qt5::qdbusxml2cpp) + add_executable(Qt5::qdbusxml2cpp IMPORTED) + + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") + !!ENDIF diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix index fcd870163074..ef64a87d0e28 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, copyPathsToStore, fixQtModuleCMakeConfig +{ stdenv, lib, fetchurl, copyPathsToStore , srcs , xlibs, libX11, libxcb, libXcursor, libXext, libXrender, libXi @@ -213,11 +213,19 @@ stdenv.mkDerivation { # FIXME: move to the main list on rebuild. ++ [gnome_vfs.out libgnomeui.out gtk GConf]; - nativeBuildInputs = [ fixQtModuleCMakeConfig lndir patchelf perl pkgconfig python ]; + nativeBuildInputs = [ lndir patchelf perl pkgconfig python ]; # freetype-2.5.4 changed signedness of some struct fields NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare"; + postInstall = '' + find "$out" -name "*.cmake" | while read file; do + substituteInPlace "$file" \ + --subst-var-by NIX_OUT "$out" \ + --subst-var-by NIX_DEV "$dev" + done + ''; + preFixup = '' # We cannot simply set these paths in configureFlags because libQtCore retains # references to the paths it was built with. @@ -229,17 +237,6 @@ stdenv.mkDerivation { mkdir -p "$dev/share" moveToOutput "share/doc" "$dev" - # Move libtool archives and qmake projects - if [ "z''${!outputLib}" != "z''${!outputDev}" ]; then - pushd "''${!outputLib}" - find lib -name '*.a' -o -name '*.la' -o -name '*.prl' | \ - while read -r file; do - mkdir -p "''${!outputDev}/$(dirname "$file")" - mv "''${!outputLib}/$file" "''${!outputDev}/$file" - done - popd - fi - # Move the QGtkStyle plugin to the gtk output mkdir -p "$gtk/lib/qt5/plugins/platformthemes" mv "$out/lib/qt5/plugins/platformthemes/libqgtk2.so" "$gtk/lib/qt5/plugins/platformthemes" @@ -262,18 +259,16 @@ stdenv.mkDerivation { # Don't retain build-time dependencies like gdb and ruby. sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $dev/mkspecs/qconfig.pri - fixQtModuleCMakeConfig "Concurrent" - fixQtModuleCMakeConfig "Core" - fixQtModuleCMakeConfig "DBus" - fixQtModuleCMakeConfig "Gui" - fixQtModuleCMakeConfig "Network" - fixQtModuleCMakeConfig "OpenGL" - fixQtModuleCMakeConfig "OpenGLExtensions" - fixQtModuleCMakeConfig "PrintSupport" - fixQtModuleCMakeConfig "Sql" - fixQtModuleCMakeConfig "Test" - fixQtModuleCMakeConfig "Widgets" - fixQtModuleCMakeConfig "Xml" + # Move libtool archives and qmake projects + if [ "z''${!outputLib}" != "z''${!outputDev}" ]; then + pushd "''${!outputLib}" + find lib -name '*.a' -o -name '*.la' -o -name '*.prl' | \ + while read -r file; do + mkdir -p "''${!outputDev}/$(dirname "$file")" + mv "''${!outputLib}/$file" "''${!outputDev}/$file" + done + popd + fi ''; inherit lndir; diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/series b/pkgs/development/libraries/qt-5/5.5/qtbase/series index 2196d8383752..1dfd8ac2683c 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/series +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/series @@ -7,3 +7,4 @@ xdg-config-dirs.patch nix-profiles-library-paths.patch compose-search-path.patch libressl.patch +cmake-paths.patch \ No newline at end of file diff --git a/pkgs/development/libraries/qt-5/5.5/qtconnectivity.nix b/pkgs/development/libraries/qt-5/5.5/qtconnectivity.nix index 35538c7261f1..95cd6fea79b4 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtconnectivity.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtconnectivity.nix @@ -3,8 +3,4 @@ qtSubmodule { name = "qtconnectivity"; qtInputs = [ qtbase qtdeclarative ]; - postFixup = '' - fixQtModuleCMakeConfig "Bluetooth" - fixQtModuleCMakeConfig "Nfc" - ''; } diff --git a/pkgs/development/libraries/qt-5/5.5/qtdeclarative/default.nix b/pkgs/development/libraries/qt-5/5.5/qtdeclarative/default.nix index 407513f78498..328d8aee72bd 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtdeclarative/default.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtdeclarative/default.nix @@ -5,10 +5,4 @@ qtSubmodule { patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); qtInputs = [ qtbase qtsvg qtxmlpatterns ]; nativeBuildInputs = [ python ]; - postFixup = '' - fixQtModuleCMakeConfig "Qml" - fixQtModuleCMakeConfig "Quick" - fixQtModuleCMakeConfig "QuickTest" - fixQtModuleCMakeConfig "QuickWidgets" - ''; } diff --git a/pkgs/development/libraries/qt-5/5.5/qtenginio.nix b/pkgs/development/libraries/qt-5/5.5/qtenginio.nix index 503a0f7ce4f5..b860a73ef890 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtenginio.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtenginio.nix @@ -3,7 +3,4 @@ qtSubmodule { name = "qtenginio"; qtInputs = [ qtdeclarative ]; - postFixup = '' - fixQtModuleCMakeConfig "Enginio" - ''; } diff --git a/pkgs/development/libraries/qt-5/5.5/qtlocation.nix b/pkgs/development/libraries/qt-5/5.5/qtlocation.nix index bd11d4816ff3..1e134057c4b4 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtlocation.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtlocation.nix @@ -3,7 +3,4 @@ qtSubmodule { name = "qtlocation"; qtInputs = [ qtbase qtmultimedia ]; - postFixup = '' - fixQtModuleCMakeConfig "Positioning" - ''; } diff --git a/pkgs/development/libraries/qt-5/5.5/qtmultimedia.nix b/pkgs/development/libraries/qt-5/5.5/qtmultimedia.nix index 9eb68ba6b5ba..7c1cc5da07e3 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtmultimedia.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtmultimedia.nix @@ -9,8 +9,4 @@ qtSubmodule { pkgconfig alsaLib gstreamer gst-plugins-base libpulseaudio ]; qmakeFlags = [ "GST_VERSION=1.0" ]; - postFixup = '' - fixQtModuleCMakeConfig "Multimedia" - fixQtModuleCMakeConfig "MultimediaWidgets" - ''; } diff --git a/pkgs/development/libraries/qt-5/5.5/qtquick1/default.nix b/pkgs/development/libraries/qt-5/5.5/qtquick1/default.nix index 4bf92fa01473..64937b3dcd37 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtquick1/default.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtquick1/default.nix @@ -4,7 +4,4 @@ qtSubmodule { name = "qtquick1"; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); qtInputs = [ qtscript qtsvg qtwebkit qtxmlpatterns ]; - postFixup = '' - fixQtModuleCMakeConfig "Declarative" - ''; } diff --git a/pkgs/development/libraries/qt-5/5.5/qtscript/default.nix b/pkgs/development/libraries/qt-5/5.5/qtscript/default.nix index b81a43aeadb0..127766e2ebd6 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtscript/default.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtscript/default.nix @@ -4,7 +4,4 @@ qtSubmodule { name = "qtscript"; qtInputs = [ qtbase qttools ]; patches = [ ./0001-glib-2.32.patch ]; - postFixup = '' - fixQtModuleCMakeConfig "Script" - ''; } diff --git a/pkgs/development/libraries/qt-5/5.5/qtsensors.nix b/pkgs/development/libraries/qt-5/5.5/qtsensors.nix index 5776f45a7068..61e64dc47e4d 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtsensors.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtsensors.nix @@ -3,7 +3,4 @@ qtSubmodule { name = "qtsensors"; qtInputs = [ qtbase qtdeclarative ]; - postFixup = '' - fixQtModuleCMakeConfig "Sensors" - ''; } diff --git a/pkgs/development/libraries/qt-5/5.5/qtserialport/default.nix b/pkgs/development/libraries/qt-5/5.5/qtserialport/default.nix index 3f409f9c0e08..32549c95344a 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtserialport/default.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtserialport/default.nix @@ -9,7 +9,4 @@ qtSubmodule { libudev = libudev.out; }) ]; - postFixup = '' - fixQtModuleCMakeConfig "SerialPort" - ''; } diff --git a/pkgs/development/libraries/qt-5/5.5/qtsvg.nix b/pkgs/development/libraries/qt-5/5.5/qtsvg.nix index a460d6da4c2a..b9ccac7cf933 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtsvg.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtsvg.nix @@ -3,7 +3,4 @@ qtSubmodule { name = "qtsvg"; qtInputs = [ qtbase ]; - postFixup = '' - fixQtModuleCMakeConfig "Svg" - ''; } diff --git a/pkgs/development/libraries/qt-5/5.5/qttools.nix b/pkgs/development/libraries/qt-5/5.5/qttools.nix index 1472691c5254..47ebd17c08f6 100644 --- a/pkgs/development/libraries/qt-5/5.5/qttools.nix +++ b/pkgs/development/libraries/qt-5/5.5/qttools.nix @@ -6,11 +6,5 @@ qtSubmodule { postFixup = '' moveToOutput "bin/qdbus" "$out" moveToOutput "bin/qtpaths" "$out" - - fixQtModuleCMakeConfig "Designer" - fixQtModuleCMakeConfig "Help" - fixQtModuleCMakeConfig "LinguistTools" - fixQtModuleCMakeConfig "UiPlugin" - fixQtModuleCMakeConfig "UiTools" ''; } diff --git a/pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix b/pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix index b441a2448d76..2e92391f4c08 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix @@ -31,8 +31,4 @@ qtSubmodule { }; in optionals flashplayerFix [ dlopen-webkit-nsplugin dlopen-webkit-gtk ] ++ [ dlopen-webkit-udev ]; - postFixup = '' - fixQtModuleCMakeConfig "WebKit" - fixQtModuleCMakeConfig "WebKitWidgets" - ''; } diff --git a/pkgs/development/libraries/qt-5/5.5/qtwebsockets.nix b/pkgs/development/libraries/qt-5/5.5/qtwebsockets.nix index c0d0f9e7d714..fbdfbbcf0dbe 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtwebsockets.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtwebsockets.nix @@ -3,7 +3,4 @@ qtSubmodule { name = "qtwebsockets"; qtInputs = [ qtbase qtdeclarative ]; - postFixup = '' - fixQtModuleCMakeConfig "WebSockets" - ''; } diff --git a/pkgs/development/libraries/qt-5/5.5/qtx11extras.nix b/pkgs/development/libraries/qt-5/5.5/qtx11extras.nix index db92f1353627..a765161e2d7e 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtx11extras.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtx11extras.nix @@ -3,7 +3,4 @@ qtSubmodule { name = "qtx11extras"; qtInputs = [ qtbase ]; - postFixup = '' - fixQtModuleCMakeConfig "X11Extras" - ''; } diff --git a/pkgs/development/libraries/qt-5/5.5/qtxmlpatterns.nix b/pkgs/development/libraries/qt-5/5.5/qtxmlpatterns.nix index 3b22132e4c38..9a8ddbba2bd2 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtxmlpatterns.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtxmlpatterns.nix @@ -3,7 +3,4 @@ qtSubmodule { name = "qtxmlpatterns"; qtInputs = [ qtbase ]; - postFixup = '' - fixQtModuleCMakeConfig "XmlPatterns" - ''; } diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix index 3cc8c51909b7..94b75f1c18b9 100644 --- a/pkgs/development/libraries/qt-5/5.6/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/default.nix @@ -66,8 +66,6 @@ let mesa = pkgs.mesa_noglu; harfbuzz = pkgs.harfbuzz-icu; cups = if stdenv.isLinux then pkgs.cups else null; - # GNOME dependencies are not used unless gtkStyle == true - inherit (pkgs.gnome) libgnomeui GConf gnome_vfs; bison = pkgs.bison2; # error: too few arguments to function 'int yylex(... inherit developerBuild decryptSslTraffic; }; diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix index 14a89f82038d..82b54ebd3a11 100644 --- a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix @@ -19,15 +19,11 @@ , buildExamples ? false , buildTests ? false , developerBuild ? false -, libgnomeui, GConf, gnome_vfs, gtk , decryptSslTraffic ? false }: let system-x86_64 = lib.elem stdenv.system lib.platforms.x86_64; - - # Search path for Gtk plugin - gtkLibPath = lib.makeLibraryPath [ gtk gnome_vfs libgnomeui GConf ]; in stdenv.mkDerivation { @@ -35,7 +31,7 @@ stdenv.mkDerivation { name = "qtbase-${srcs.qtbase.version}"; inherit (srcs.qtbase) src version; - outputs = [ "dev" "out" "gtk" ]; + outputs = [ "dev" "out" ]; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series) @@ -127,7 +123,6 @@ stdenv.mkDerivation { -xcb -qpa xcb -${lib.optionalString (cups == null) "no-"}cups - -gtkstyle -no-eglfs -no-directfb @@ -189,9 +184,7 @@ stdenv.mkDerivation { ++ lib.optional developerBuild gdb ++ lib.optional (cups != null) cups ++ lib.optional (mysql != null) mysql.lib - ++ lib.optional (postgresql != null) postgresql - # FIXME: move to the main list on rebuild. - ++ [gnome_vfs.out libgnomeui.out gtk GConf]; + ++ lib.optional (postgresql != null) postgresql; nativeBuildInputs = [ lndir patchelf perl pkgconfig python ]; @@ -216,22 +209,6 @@ stdenv.mkDerivation { # The destination directory must exist or moveToOutput will do nothing mkdir -p "$dev/share" moveToOutput "share/doc" "$dev" - - # Move the QGtkStyle plugin to the gtk output - mkdir -p "$gtk/lib/qt5/plugins/platformthemes" - mv "$out/lib/qt5/plugins/platformthemes/libqgtk2.so" "$gtk/lib/qt5/plugins/platformthemes" - rm "$out/lib/cmake/Qt5Gui/Qt5Gui_QGtk2ThemePlugin.cmake" - - # Set RPATH for QGtkStyle plugin - qgtk2="$gtk/lib/qt5/plugins/platformthemes/libqgtk2.so" - qgtk2_RPATH="$(patchelf --print-rpath "$qgtk2")" - qgtk2_RPATH="$qgtk2_RPATH''${qgtk2_RPATH:+:}${gtkLibPath}" - patchelf "$qgtk2" \ - --add-needed libgtk-x11-2.0.so \ - --add-needed libgnomeui-2.so \ - --add-needed libgnomevfs-2.so \ - --add-needed libgconf-2.so \ - --set-rpath "$qgtk2_RPATH" ''; postFixup = diff --git a/pkgs/development/libraries/qt-5/5.7/default.nix b/pkgs/development/libraries/qt-5/5.7/default.nix new file mode 100644 index 000000000000..90bd6b0726ee --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.7/default.nix @@ -0,0 +1,119 @@ +/* + +# Updates + +Before a major version update, make a copy of this directory. (We like to +keep the old version around for a short time after major updates.) Add a +top-level attribute to `top-level/all-packages.nix`. + +1. Update the URL in `maintainers/scripts/generate-qt.sh`. +2. From the top of the Nixpkgs tree, run + `./maintainers/scripts/generate-qt.sh > pkgs/development/libraries/qt-5/$VERSION/srcs.nix`. +3. Check that the new packages build correctly. +4. Commit the changes and open a pull request. + +*/ + +{ pkgs + +# options +, developerBuild ? false +, decryptSslTraffic ? false +}: + +let inherit (pkgs) makeSetupHook makeWrapper stdenv; in + +with stdenv.lib; + +let + + mirror = "http://download.qt.io"; + srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; }; + + qtSubmodule = args: + let + inherit (args) name; + version = args.version or srcs."${name}".version; + src = args.src or srcs."${name}".src; + inherit (pkgs.stdenv) mkDerivation; + in mkDerivation (args // { + name = "${name}-${version}"; + inherit src; + + propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or []); + nativeBuildInputs = + (args.nativeBuildInputs or []) + ++ [ pkgs.perl self.qmakeHook ]; + + NIX_QT_SUBMODULE = args.NIX_QT_SUBMODULE or true; + + outputs = args.outputs or [ "dev" "out" ]; + setOutputFlags = args.setOutputFlags or false; + + setupHook = ./setup-hook.sh; + + enableParallelBuilding = args.enableParallelBuilding or true; + + meta = self.qtbase.meta // (args.meta or {}); + }); + + addPackages = self: with self; + let + callPackage = self.newScope { inherit qtSubmodule srcs; }; + in { + + qtbase = callPackage ./qtbase { + inherit (srcs.qtbase) src version; + mesa = pkgs.mesa_noglu; + harfbuzz = pkgs.harfbuzz-icu; + cups = if stdenv.isLinux then pkgs.cups else null; + # GNOME dependencies are not used unless gtkStyle == true + bison = pkgs.bison2; # error: too few arguments to function 'int yylex(... + inherit developerBuild decryptSslTraffic; + }; + + qtconnectivity = callPackage ./qtconnectivity.nix {}; + qtdeclarative = callPackage ./qtdeclarative {}; + qtdoc = callPackage ./qtdoc.nix {}; + qtgraphicaleffects = callPackage ./qtgraphicaleffects.nix {}; + qtimageformats = callPackage ./qtimageformats.nix {}; + qtlocation = callPackage ./qtlocation.nix {}; + qtmultimedia = callPackage ./qtmultimedia.nix { + inherit (pkgs.gst_all_1) gstreamer gst-plugins-base; + }; + qtquickcontrols = callPackage ./qtquickcontrols.nix {}; + qtscript = callPackage ./qtscript {}; + qtsensors = callPackage ./qtsensors.nix {}; + qtserialport = callPackage ./qtserialport {}; + qtsvg = callPackage ./qtsvg.nix {}; + qttools = callPackage ./qttools.nix {}; + qttranslations = callPackage ./qttranslations.nix {}; + qtwebchannel = callPackage ./qtwebchannel.nix {}; + qtwebengine = callPackage ./qtwebengine.nix {}; + qtwebsockets = callPackage ./qtwebsockets.nix {}; + qtx11extras = callPackage ./qtx11extras.nix {}; + qtxmlpatterns = callPackage ./qtxmlpatterns.nix {}; + + env = callPackage ../qt-env.nix {}; + full = env "qt-${qtbase.version}" [ + qtconnectivity qtdeclarative qtdoc qtgraphicaleffects + qtimageformats qtlocation qtmultimedia qtquickcontrols qtscript + qtsensors qtserialport qtsvg qttools qttranslations qtwebsockets + qtx11extras qtxmlpatterns + ]; + + makeQtWrapper = + makeSetupHook + { deps = [ makeWrapper ]; } + ./make-qt-wrapper.sh; + + qmakeHook = + makeSetupHook + { deps = [ self.qtbase ]; } + ./qmake-hook.sh; + + }; + + self = makeScope pkgs.newScope addPackages; + +in self diff --git a/pkgs/development/libraries/qt-5/5.7/make-qt-wrapper.sh b/pkgs/development/libraries/qt-5/5.7/make-qt-wrapper.sh new file mode 100644 index 000000000000..b0d0bec9e3f6 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.7/make-qt-wrapper.sh @@ -0,0 +1,36 @@ +wrapQtProgram() { + local prog="$1" + shift + wrapProgram "$prog" \ + --set QT_PLUGIN_PATH "$QT_PLUGIN_PATH" \ + --set QML_IMPORT_PATH "$QML_IMPORT_PATH" \ + --set QML2_IMPORT_PATH "$QML2_IMPORT_PATH" \ + --prefix XDG_DATA_DIRS : "$RUNTIME_XDG_DATA_DIRS" \ + --prefix XDG_CONFIG_DIRS : "$RUNTIME_XDG_CONFIG_DIRS" \ + "$@" +} + +makeQtWrapper() { + local old="$1" + local new="$2" + shift + shift + makeWrapper "$old" "$new" \ + --set QT_PLUGIN_PATH "$QT_PLUGIN_PATH" \ + --set QML_IMPORT_PATH "$QML_IMPORT_PATH" \ + --set QML2_IMPORT_PATH "$QML2_IMPORT_PATH" \ + --prefix XDG_DATA_DIRS : "$RUNTIME_XDG_DATA_DIRS" \ + --prefix XDG_CONFIG_DIRS : "$RUNTIME_XDG_CONFIG_DIRS" \ + "$@" +} + +_makeQtWrapperSetup() { + # cannot use addToSearchPath because these directories may not exist yet + export QT_PLUGIN_PATH="$QT_PLUGIN_PATH${QT_PLUGIN_PATH:+:}${!outputLib}/lib/qt5/plugins" + export QML_IMPORT_PATH="$QML_IMPORT_PATH${QML_IMPORT_PATH:+:}${!outputLib}/lib/qt5/imports" + export QML2_IMPORT_PATH="$QML2_IMPORT_PATH${QML2_IMPORT_PATH:+:}${!outputLib}/lib/qt5/qml" + export RUNTIME_XDG_DATA_DIRS="$XDG_DATA_DIRS${XDG_DATA_DIRS:+:}${!outputBin}/share" + export RUNTIME_XDG_CONFIG_DIRS="$XDG_CONFIG_DIRS${XDG_CONFIG_DIRS:+:}${!outputBin}/etc/xdg" +} + +prePhases+=(_makeQtWrapperSetup) diff --git a/pkgs/development/libraries/qt-5/5.7/qmake-hook.sh b/pkgs/development/libraries/qt-5/5.7/qmake-hook.sh new file mode 100644 index 000000000000..696b4ea8dad3 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.7/qmake-hook.sh @@ -0,0 +1,42 @@ +qmakeConfigurePhase() { + runHook preConfigure + + qmake PREFIX=$out $qmakeFlags + + runHook postConfigure +} + +if [ -z "$dontUseQmakeConfigure" -a -z "$configurePhase" ]; then + configurePhase=qmakeConfigurePhase +fi + +_qtModuleMultioutDevsPre() { + # We cannot simply set these paths in configureFlags because libQtCore retains + # references to the paths it was built with. + moveToOutput "bin" "${!outputDev}" + moveToOutput "include" "${!outputDev}" + + # The destination directory must exist or moveToOutput will do nothing + mkdir -p "${!outputDev}/share" + moveToOutput "share/doc" "${!outputDev}" +} + +_qtModuleMultioutDevsPost() { + # Move libtool archives and qmake project files to $dev/lib + if [ "z${!outputLib}" != "z${!outputDev}" ]; then + pushd "${!outputLib}" + if [ -d "lib" ]; then + find lib \( -name '*.a' -o -name '*.la' -o -name '*.prl' \) -print0 | \ + while read -r -d $'\0' file; do + mkdir -p "${!outputDev}/$(dirname "$file")" + mv "${!outputLib}/$file" "${!outputDev}/$file" + done + fi + popd + fi +} + +if [ -n "$NIX_QT_SUBMODULE" ]; then + preFixupHooks+=(_qtModuleMultioutDevsPre) + postFixupHooks+=(_qtModuleMultioutDevsPost) +fi diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/cmake-paths.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/cmake-paths.patch new file mode 100644 index 000000000000..6e2de0b3022a --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.7/qtbase/cmake-paths.patch @@ -0,0 +1,321 @@ +Index: qtbase-opensource-src-5.7.0/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +=================================================================== +--- qtbase-opensource-src-5.7.0.orig/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in ++++ qtbase-opensource-src-5.7.0/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +@@ -9,30 +9,6 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0) + endif() + !!ENDIF + +-!!IF !isEmpty(CMAKE_USR_MOVE_WORKAROUND) +-!!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +-set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") +-!!ELSE +-get_filename_component(_IMPORT_PREFIX \"${CMAKE_CURRENT_LIST_FILE}\" PATH) +-# Use original install prefix when loaded through a +-# cross-prefix symbolic link such as /lib -> /usr/lib. +-get_filename_component(_realCurr \"${_IMPORT_PREFIX}\" REALPATH) +-get_filename_component(_realOrig \"$$CMAKE_INSTALL_LIBS_DIR/cmake/Qt5$${CMAKE_MODULE_NAME}\" REALPATH) +-if(_realCurr STREQUAL _realOrig) +- get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$CMAKE_INSTALL_LIBS_DIR/$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}\" ABSOLUTE) +-else() +- get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE) +-endif() +-unset(_realOrig) +-unset(_realCurr) +-unset(_IMPORT_PREFIX) +-!!ENDIF +-!!ELIF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +-get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE) +-!!ELSE +-set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") +-!!ENDIF +- + !!IF !equals(TEMPLATE, aux) + # For backwards compatibility only. Use Qt5$${CMAKE_MODULE_NAME}_VERSION instead. + set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.MAJOR_VERSION).$$eval(QT.$${MODULE}.MINOR_VERSION).$$eval(QT.$${MODULE}.PATCH_VERSION)") +@@ -59,7 +35,10 @@ macro(_populate_$${CMAKE_MODULE_NAME}_ta + set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) + + !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") ++ set(imported_location \"@NIX_OUT@/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") ++ if(NOT EXISTS \"${imported_location}\") ++ set(imported_location \"@NIX_DEV@/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") ++ endif() + !!ELSE + set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\") + !!ENDIF +@@ -74,45 +53,18 @@ macro(_populate_$${CMAKE_MODULE_NAME}_ta + \"IMPORTED_LINK_INTERFACE_LIBRARIES_${Configuration}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\" + ) + +-!!IF !isEmpty(CMAKE_WINDOWS_BUILD) +-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") +-!!ELSE +- set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") +-!!ENDIF +- _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_implib}) +- if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\") +- set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES +- \"IMPORTED_IMPLIB_${Configuration}\" ${imported_implib} +- ) +- endif() +-!!ENDIF + endmacro() + !!ENDIF + + if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) + + !!IF !no_module_headers +-!!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK) +- set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework\" +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Headers\" +- ) +-!!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES) +- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/\" +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\" +- ) +-!!ELSE +- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") +-!!ENDIF +-!!ELSE + !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE) +- set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR\" \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}\") ++ set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"@NIX_DEV@/$$CMAKE_INCLUDE_DIR\" \"@NIX_DEV@/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}\") + !!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES) + set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION\" +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION/$${MODULE_INCNAME}\" ++ \"@NIX_DEV@/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION\" ++ \"@NIX_DEV@/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION/$${MODULE_INCNAME}\" + ) + !!ELSE + set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") +@@ -128,7 +80,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME + set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") + !!ENDIF + !!ENDIF +-!!ENDIF ++ + !!IF !isEmpty(CMAKE_ADD_SOURCE_INCLUDE_DIRS) + include(\"${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake\" OPTIONAL) + !!ENDIF +@@ -253,28 +205,19 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME + + !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) + !!IF isEmpty(CMAKE_DEBUG_TYPE) +-!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) +-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) +-!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE +- if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) +-!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE +- _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" ) +-!!ELSE // CMAKE_STATIC_WINDOWS_BUILD + if (EXISTS + !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" ++ \"@NIX_OUT@/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" + !!ELSE + \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" + !!ENDIF + AND EXISTS + !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) ++ \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) + !!ELSE + \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) + !!ENDIF + _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) +-!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD + endif() + !!ENDIF // CMAKE_DEBUG_TYPE + !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD +@@ -282,36 +225,23 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME + !!ENDIF // CMAKE_RELEASE_TYPE + + !!IF !isEmpty(CMAKE_DEBUG_TYPE) +-!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) +- _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" ) +-!!ELSE + _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) +-!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD + + !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) + !!IF isEmpty(CMAKE_RELEASE_TYPE) +-!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) +-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) +-!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE +- if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) +-!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE +- _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" ) +-!!ELSE // CMAKE_STATIC_WINDOWS_BUILD + if (EXISTS + !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" ++ \"@NIX_OUT@/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" + !!ELSE + \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" + !!ENDIF + AND EXISTS + !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) ++ \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) + !!ELSE + \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) + !!ENDIF + _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) +-!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD + endif() + !!ENDIF // CMAKE_RELEASE_TYPE + !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD +@@ -329,7 +259,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME + set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) + + !!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") ++ set(imported_location \"@NIX_OUT@/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") + !!ELSE + set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") + !!ENDIF +Index: qtbase-opensource-src-5.7.0/src/gui/Qt5GuiConfigExtras.cmake.in +=================================================================== +--- qtbase-opensource-src-5.7.0.orig/src/gui/Qt5GuiConfigExtras.cmake.in ++++ qtbase-opensource-src-5.7.0/src/gui/Qt5GuiConfigExtras.cmake.in +@@ -2,7 +2,7 @@ + !!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE) + + !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE) +-set(Qt5Gui_EGL_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR/QtANGLE\") ++set(Qt5Gui_EGL_INCLUDE_DIRS \"@NIX_DEV@/$$CMAKE_INCLUDE_DIR/QtANGLE\") + !!ELSE + set(Qt5Gui_EGL_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR/QtANGLE\") + !!ENDIF +@@ -17,13 +17,13 @@ macro(_populate_qt5gui_gl_target_propert + set_property(TARGET Qt5::${TargetName} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) + + !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Gui_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") ++ set(imported_location \"@NIX_OUT@/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") + !!ELSE + set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\") + !!ENDIF + + !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- set(imported_implib \"${_qt5Gui_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") ++ set(imported_implib \"@NIX_DEV@/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") + !!ELSE + set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") + !!ENDIF +Index: qtbase-opensource-src-5.7.0/src/widgets/Qt5WidgetsConfigExtras.cmake.in +=================================================================== +--- qtbase-opensource-src-5.7.0.orig/src/widgets/Qt5WidgetsConfigExtras.cmake.in ++++ qtbase-opensource-src-5.7.0/src/widgets/Qt5WidgetsConfigExtras.cmake.in +@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::uic) + add_executable(Qt5::uic IMPORTED) + + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Widgets_install_prefix}/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") + !!ENDIF +Index: qtbase-opensource-src-5.7.0/src/corelib/Qt5CoreConfigExtras.cmake.in +=================================================================== +--- qtbase-opensource-src-5.7.0.orig/src/corelib/Qt5CoreConfigExtras.cmake.in ++++ qtbase-opensource-src-5.7.0/src/corelib/Qt5CoreConfigExtras.cmake.in +@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qmake) + add_executable(Qt5::qmake IMPORTED) + + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") + !!ENDIF +@@ -18,7 +18,7 @@ if (NOT TARGET Qt5::moc) + add_executable(Qt5::moc IMPORTED) + + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") + !!ENDIF +@@ -35,7 +35,7 @@ if (NOT TARGET Qt5::rcc) + add_executable(Qt5::rcc IMPORTED) + + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") + !!ENDIF +@@ -133,7 +133,7 @@ if (NOT TARGET Qt5::WinMain) + !!IF !isEmpty(CMAKE_RELEASE_TYPE) + set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) + !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") ++ set(imported_location \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") + !!ELSE + set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") + !!ENDIF +@@ -147,7 +147,7 @@ if (NOT TARGET Qt5::WinMain) + set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) + + !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") ++ set(imported_location \"@NIX_DEV@/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") + !!ELSE + set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") + !!ENDIF +Index: qtbase-opensource-src-5.7.0/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in +=================================================================== +--- qtbase-opensource-src-5.7.0.orig/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in ++++ qtbase-opensource-src-5.7.0/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in +@@ -1,6 +1,6 @@ + + !!IF isEmpty(CMAKE_INSTALL_DATA_DIR_IS_ABSOLUTE) +-set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") ++set(_qt5_corelib_extra_includes \"@NIX_DEV@/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") + !!ELSE + set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") + !!ENDIF +Index: qtbase-opensource-src-5.7.0/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in +=================================================================== +--- qtbase-opensource-src-5.7.0.orig/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in ++++ qtbase-opensource-src-5.7.0/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in +@@ -1,6 +1,6 @@ + + !!IF isEmpty(CMAKE_HOST_DATA_DIR_IS_ABSOLUTE) +-set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") ++set(_qt5_corelib_extra_includes \"@NIX_DEV@/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") + !!ELSE + set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") + !!ENDIF +Index: qtbase-opensource-src-5.7.0/src/dbus/Qt5DBusConfigExtras.cmake.in +=================================================================== +--- qtbase-opensource-src-5.7.0.orig/src/dbus/Qt5DBusConfigExtras.cmake.in ++++ qtbase-opensource-src-5.7.0/src/dbus/Qt5DBusConfigExtras.cmake.in +@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml) + add_executable(Qt5::qdbuscpp2xml IMPORTED) + + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") + !!ENDIF +@@ -18,7 +18,7 @@ if (NOT TARGET Qt5::qdbusxml2cpp) + add_executable(Qt5::qdbusxml2cpp IMPORTED) + + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"@NIX_DEV@/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") + !!ENDIF diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/compose-search-path.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/compose-search-path.patch new file mode 100644 index 000000000000..a0e344a7bc68 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.7/qtbase/compose-search-path.patch @@ -0,0 +1,16 @@ +Index: qtbase-opensource-src-5.7.0/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp +=================================================================== +--- qtbase-opensource-src-5.7.0.orig/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp ++++ qtbase-opensource-src-5.7.0/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp +@@ -257,10 +257,7 @@ void TableGenerator::initPossibleLocatio + // the QTCOMPOSE environment variable + if (qEnvironmentVariableIsSet("QTCOMPOSE")) + m_possibleLocations.append(QString::fromLocal8Bit(qgetenv("QTCOMPOSE"))); +- m_possibleLocations.append(QStringLiteral("/usr/share/X11/locale")); +- m_possibleLocations.append(QStringLiteral("/usr/local/share/X11/locale")); +- m_possibleLocations.append(QStringLiteral("/usr/lib/X11/locale")); +- m_possibleLocations.append(QStringLiteral("/usr/local/lib/X11/locale")); ++ m_possibleLocations.append(QStringLiteral("${libX11}/share/X11/locale")); + m_possibleLocations.append(QStringLiteral(X11_PREFIX "/share/X11/locale")); + m_possibleLocations.append(QStringLiteral(X11_PREFIX "/lib/X11/locale")); + } diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/decrypt-ssl-traffic.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/decrypt-ssl-traffic.patch new file mode 100644 index 000000000000..495db07cfbb5 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.7/qtbase/decrypt-ssl-traffic.patch @@ -0,0 +1,13 @@ +Index: qtbase-opensource-src-5.5.1/src/network/ssl/qsslsocket_openssl.cpp +=================================================================== +--- qtbase-opensource-src-5.5.1.orig/src/network/ssl/qsslsocket_openssl.cpp ++++ qtbase-opensource-src-5.5.1/src/network/ssl/qsslsocket_openssl.cpp +@@ -48,7 +48,7 @@ + ****************************************************************************/ + + //#define QSSLSOCKET_DEBUG +-//#define QT_DECRYPT_SSL_TRAFFIC ++#define QT_DECRYPT_SSL_TRAFFIC + + #include "qssl_p.h" + #include "qsslsocket_openssl_p.h" diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix new file mode 100644 index 000000000000..94ddb21f3b60 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix @@ -0,0 +1,247 @@ +{ + stdenv, lib, copyPathsToStore, + src, version, + + coreutils, bison, flex, gdb, gperf, lndir, patchelf, perl, pkgconfig, python, + ruby, + + dbus, fontconfig, freetype, glib, gtk3, harfbuzz, icu, libX11, libXcomposite, + libXcursor, libXext, libXi, libXrender, libinput, libjpeg, libpng, libtiff, + libxcb, libxkbcommon, libxml2, libxslt, openssl, pcre16, sqlite, udev, + xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, xcbutilwm, xlibs, + zlib, + + # optional dependencies + cups ? null, mysql ? null, postgresql ? null, + + # options + mesaSupported, mesa, + buildExamples ? false, + buildTests ? false, + developerBuild ? false, + decryptSslTraffic ? false +}: + +let + system-x86_64 = lib.elem stdenv.system lib.platforms.x86_64; +in + +stdenv.mkDerivation { + + name = "qtbase-${version}"; + inherit src version; + + outputs = [ "dev" "out" ]; + + patches = + copyPathsToStore (lib.readPathsFromFile ./. ./series) + ++ lib.optional decryptSslTraffic ./decrypt-ssl-traffic.patch + ++ lib.optional mesaSupported [ ./dlopen-gl.patch ./mkspecs-libgl.patch ]; + + postPatch = + '' + substituteInPlace configure --replace /bin/pwd pwd + substituteInPlace src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls + sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i config.tests/*/*.test -i mkspecs/*/*.conf + + sed -i 's/PATHS.*NO_DEFAULT_PATH//' "src/corelib/Qt5Config.cmake.in" + sed -i 's/PATHS.*NO_DEFAULT_PATH//' "src/corelib/Qt5CoreMacros.cmake" + sed -i 's/NO_DEFAULT_PATH//' "src/gui/Qt5GuiConfigExtras.cmake.in" + sed -i 's/PATHS.*NO_DEFAULT_PATH//' "mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in" + + substituteInPlace src/network/kernel/qdnslookup_unix.cpp \ + --replace "@glibc@" "${stdenv.cc.libc.out}" + substituteInPlace src/network/kernel/qhostinfo_unix.cpp \ + --replace "@glibc@" "${stdenv.cc.libc.out}" + + substituteInPlace src/plugins/platforms/xcb/qxcbcursor.cpp \ + --replace "@libXcursor@" "${libXcursor.out}" + + substituteInPlace src/network/ssl/qsslsocket_openssl_symbols.cpp \ + --replace "@openssl@" "${openssl.out}" + + substituteInPlace src/dbus/qdbus_symbols.cpp \ + --replace "@dbus_libs@" "${dbus.lib}" + + substituteInPlace \ + src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp \ + --replace "@libX11@" "${libX11.out}" + '' + + lib.optionalString mesaSupported '' + substituteInPlace \ + src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp \ + --replace "@mesa_lib@" "${mesa.out}" + substituteInPlace mkspecs/common/linux.conf \ + --replace "@mesa_lib@" "${mesa.out}" \ + --replace "@mesa_inc@" "${mesa.dev or mesa}" + ''; + + + setOutputFlags = false; + preConfigure = '' + export LD_LIBRARY_PATH="$PWD/lib:$PWD/plugins/platforms:$LD_LIBRARY_PATH" + export MAKEFLAGS=-j$NIX_BUILD_CORES + + configureFlags+="\ + -plugindir $out/lib/qt5/plugins \ + -importdir $out/lib/qt5/imports \ + -qmldir $out/lib/qt5/qml \ + -docdir $out/share/doc/qt5" + ''; + + prefixKey = "-prefix "; + + # -no-eglfs, -no-directfb, -no-linuxfb and -no-kms because of the current minimalist mesa + # TODO Remove obsolete and useless flags once the build will be totally mastered + configureFlags = '' + -verbose + -confirm-license + -opensource + + -release + -shared + ${lib.optionalString developerBuild "-developer-build"} + -largefile + -accessibility + -rpath + -optimized-qmake + -strip + -reduce-relocations + -system-proxies + -pkg-config + + -gui + -widgets + -opengl desktop + -qml-debug + -nis + -iconv + -icu + -pch + -glib + -xcb + -qpa xcb + -${lib.optionalString (cups == null) "no-"}cups + + -no-eglfs + -no-directfb + -no-linuxfb + -no-kms + + ${lib.optionalString (!system-x86_64) "-no-sse2"} + -no-sse3 + -no-ssse3 + -no-sse4.1 + -no-sse4.2 + -no-avx + -no-avx2 + -no-mips_dsp + -no-mips_dspr2 + + -system-zlib + -system-libpng + -system-libjpeg + -system-harfbuzz + -system-xcb + -system-xkbcommon + -system-pcre + -openssl-linked + -dbus-linked + -libinput + -gtk + + -system-sqlite + -${if mysql != null then "plugin" else "no"}-sql-mysql + -${if postgresql != null then "plugin" else "no"}-sql-psql + + -make libs + -make tools + -${lib.optionalString (buildExamples == false) "no"}make examples + -${lib.optionalString (buildTests == false) "no"}make tests + -v + ''; + + # PostgreSQL autodetection fails sporadically because Qt omits the "-lpq" flag + # if dependency paths contain the string "pq", which can occur in the hash. + # To prevent these failures, we need to override PostgreSQL detection. + PSQL_LIBS = lib.optionalString (postgresql != null) "-L${postgresql.lib}/lib -lpq"; + + propagatedBuildInputs = [ + dbus glib libxml2 libxslt openssl pcre16 sqlite udev zlib + + # Image formats + libjpeg libpng libtiff + + # Text rendering + fontconfig freetype harfbuzz icu + + # X11 libs + libX11 libXcomposite libXext libXi libXrender libxcb libxkbcommon xcbutil + xcbutilimage xcbutilkeysyms xcbutilrenderutil xcbutilwm + ] + ++ lib.optional mesaSupported mesa; + + buildInputs = + [ gtk3 libinput ] + ++ lib.optional developerBuild gdb + ++ lib.optional (cups != null) cups + ++ lib.optional (mysql != null) mysql.lib + ++ lib.optional (postgresql != null) postgresql; + + nativeBuildInputs = + [ bison flex gperf lndir patchelf perl pkgconfig python ruby ]; + + # freetype-2.5.4 changed signedness of some struct fields + NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare"; + + postInstall = '' + find "$out" -name "*.cmake" | while read file; do + substituteInPlace "$file" \ + --subst-var-by NIX_OUT "$out" \ + --subst-var-by NIX_DEV "$dev" + done + ''; + + preFixup = '' + # We cannot simply set these paths in configureFlags because libQtCore retains + # references to the paths it was built with. + moveToOutput "bin" "$dev" + moveToOutput "include" "$dev" + moveToOutput "mkspecs" "$dev" + + # The destination directory must exist or moveToOutput will do nothing + mkdir -p "$dev/share" + moveToOutput "share/doc" "$dev" + ''; + + postFixup = + '' + # Don't retain build-time dependencies like gdb and ruby. + sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $dev/mkspecs/qconfig.pri + + # Move libtool archives and qmake projects + if [ "z''${!outputLib}" != "z''${!outputDev}" ]; then + pushd "''${!outputLib}" + find lib -name '*.a' -o -name '*.la' -o -name '*.prl' | \ + while read -r file; do + mkdir -p "''${!outputDev}/$(dirname "$file")" + mv "''${!outputLib}/$file" "''${!outputDev}/$file" + done + popd + fi + ''; + + inherit lndir; + setupHook = ./setup-hook.sh; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = http://www.qt.io; + description = "A cross-platform application framework for C++"; + license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ]; + maintainers = with maintainers; [ bbenoist qknight ttuegel ]; + platforms = platforms.linux; + }; + +} diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-dbus.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-dbus.patch new file mode 100644 index 000000000000..10b0b6701ddc --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-dbus.patch @@ -0,0 +1,13 @@ +Index: qtbase-opensource-src-5.7.0/src/dbus/qdbus_symbols.cpp +=================================================================== +--- qtbase-opensource-src-5.7.0.orig/src/dbus/qdbus_symbols.cpp ++++ qtbase-opensource-src-5.7.0/src/dbus/qdbus_symbols.cpp +@@ -97,7 +97,7 @@ bool qdbus_loadLibDBus() + #ifdef Q_OS_WIN + QLatin1String("dbus-1"), + #endif +- QLatin1String("libdbus-1") ++ QLatin1String("@dbus_libs@/lib/libdbus-1") + }; + + lib->unload(); diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-gl.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-gl.patch new file mode 100644 index 000000000000..ea3073ced50a --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-gl.patch @@ -0,0 +1,17 @@ +Index: qtbase-opensource-src-5.5.1/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp +=================================================================== +--- qtbase-opensource-src-5.5.1.orig/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp ++++ qtbase-opensource-src-5.5.1/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp +@@ -563,7 +563,12 @@ void (*QGLXContext::getProcAddress(const + { + extern const QString qt_gl_library_name(); + // QLibrary lib(qt_gl_library_name()); ++ // Check system library paths first + QLibrary lib(QLatin1String("GL")); ++ if (!lib.load()) { ++ // Fallback to Mesa driver ++ lib.setFileName(QLatin1String("@mesa_lib@/lib/libGL")); ++ } + glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB"); + } + } diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-gtkstyle.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-gtkstyle.patch index 755b0965cf5f..755b0965cf5f 100644 --- a/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-gtkstyle.patch +++ b/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-gtkstyle.patch diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-libXcursor.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-libXcursor.patch new file mode 100644 index 000000000000..02b7efb73d22 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-libXcursor.patch @@ -0,0 +1,17 @@ +Index: qtbase-opensource-src-5.7.0/src/plugins/platforms/xcb/qxcbcursor.cpp +=================================================================== +--- qtbase-opensource-src-5.7.0.orig/src/plugins/platforms/xcb/qxcbcursor.cpp ++++ qtbase-opensource-src-5.7.0/src/plugins/platforms/xcb/qxcbcursor.cpp +@@ -309,10 +309,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *c + #if defined(XCB_USE_XLIB) && !defined(QT_NO_LIBRARY) + static bool function_ptrs_not_initialized = true; + if (function_ptrs_not_initialized) { +- QLibrary xcursorLib(QLatin1String("Xcursor"), 1); ++ QLibrary xcursorLib(QLatin1String("@libXcursor@/lib/libXcursor"), 1); + bool xcursorFound = xcursorLib.load(); + if (!xcursorFound) { // try without the version number +- xcursorLib.setFileName(QLatin1String("Xcursor")); ++ xcursorLib.setFileName(QLatin1String("@libXcursor@/lib/Xcursor")); + xcursorFound = xcursorLib.load(); + } + if (xcursorFound) { diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-openssl.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-openssl.patch new file mode 100644 index 000000000000..9891bfeac5bf --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-openssl.patch @@ -0,0 +1,26 @@ +Index: qtbase-opensource-src-5.7.0/src/network/ssl/qsslsocket_openssl_symbols.cpp +=================================================================== +--- qtbase-opensource-src-5.7.0.orig/src/network/ssl/qsslsocket_openssl_symbols.cpp ++++ qtbase-opensource-src-5.7.0/src/network/ssl/qsslsocket_openssl_symbols.cpp +@@ -658,8 +658,8 @@ static QPair<QLibrary*, QLibrary*> loadO + #endif + #if defined(SHLIB_VERSION_NUMBER) && !defined(Q_OS_QNX) // on QNX, the libs are always libssl.so and libcrypto.so + // first attempt: the canonical name is libssl.so.<SHLIB_VERSION_NUMBER> +- libssl->setFileNameAndVersion(QLatin1String("ssl"), QLatin1String(SHLIB_VERSION_NUMBER)); +- libcrypto->setFileNameAndVersion(QLatin1String("crypto"), QLatin1String(SHLIB_VERSION_NUMBER)); ++ libssl->setFileNameAndVersion(QLatin1String("@openssl@/lib/libssl"), QLatin1String(SHLIB_VERSION_NUMBER)); ++ libcrypto->setFileNameAndVersion(QLatin1String("@openssl@/lib/libcrypto"), QLatin1String(SHLIB_VERSION_NUMBER)); + if (libcrypto->load() && libssl->load()) { + // libssl.so.<SHLIB_VERSION_NUMBER> and libcrypto.so.<SHLIB_VERSION_NUMBER> found + return pair; +@@ -676,8 +676,8 @@ static QPair<QLibrary*, QLibrary*> loadO + // OS X's /usr/lib/libssl.dylib, /usr/lib/libcrypto.dylib will be picked up in the third + // attempt, _after_ <bundle>/Contents/Frameworks has been searched. + // iOS does not ship a system libssl.dylib, libcrypto.dylib in the first place. +- libssl->setFileNameAndVersion(QLatin1String("ssl"), -1); +- libcrypto->setFileNameAndVersion(QLatin1String("crypto"), -1); ++ libssl->setFileNameAndVersion(QLatin1String("@openssl@/lib/libssl"), -1); ++ libcrypto->setFileNameAndVersion(QLatin1String("@openssl@/lib/libcrypto"), -1); + if (libcrypto->load() && libssl->load()) { + // libssl.so.0 and libcrypto.so.0 found + return pair; diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-resolv.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-resolv.patch new file mode 100644 index 000000000000..98a3610f5fbd --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.7/qtbase/dlopen-resolv.patch @@ -0,0 +1,26 @@ +Index: qtbase-opensource-src-5.7.0/src/network/kernel/qdnslookup_unix.cpp +=================================================================== +--- qtbase-opensource-src-5.7.0.orig/src/network/kernel/qdnslookup_unix.cpp ++++ qtbase-opensource-src-5.7.0/src/network/kernel/qdnslookup_unix.cpp +@@ -85,7 +85,7 @@ static bool resolveLibraryInternal() + if (!lib.load()) + #endif + { +- lib.setFileName(QLatin1String("resolv")); ++ lib.setFileName(QLatin1String("@glibc@/lib/resolv")); + if (!lib.load()) + return false; + } +Index: qtbase-opensource-src-5.7.0/src/network/kernel/qhostinfo_unix.cpp +=================================================================== +--- qtbase-opensource-src-5.7.0.orig/src/network/kernel/qhostinfo_unix.cpp ++++ qtbase-opensource-src-5.7.0/src/network/kernel/qhostinfo_unix.cpp +@@ -100,7 +100,7 @@ static bool resolveLibraryInternal() + if (!lib.load()) + #endif + { +- lib.setFileName(QLatin1String("resolv")); ++ lib.setFileName(QLatin1String("@glibc@/lib/libresolv")); + if (!lib.load()) + return false; + } diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/libressl.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/libressl.patch new file mode 100644 index 000000000000..4390db977a71 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.7/qtbase/libressl.patch @@ -0,0 +1,33 @@ +From 81494e67eccba04fc3fe554d76a9ca6fe7f2250e Mon Sep 17 00:00:00 2001 +From: hasufell <hasufell@gentoo.org> +Date: Sat, 10 Oct 2015 01:15:01 +0200 +Subject: [PATCH] Fix compilation with libressl + +By additionally checking for defined(SSL_CTRL_SET_CURVES), which +is defined in openssl, but not in libressl. +--- + src/network/ssl/qsslcontext_openssl.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +Index: qtbase-opensource-src-5.7.0/src/network/ssl/qsslcontext_openssl.cpp +=================================================================== +--- qtbase-opensource-src-5.7.0.orig/src/network/ssl/qsslcontext_openssl.cpp ++++ qtbase-opensource-src-5.7.0/src/network/ssl/qsslcontext_openssl.cpp +@@ -347,7 +347,7 @@ init_context: + + const QVector<QSslEllipticCurve> qcurves = sslContext->sslConfiguration.ellipticCurves(); + if (!qcurves.isEmpty()) { +-#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(OPENSSL_NO_EC) ++#if OPENSSL_VERSION_NUMBER >= 0x10002000L && defined(SSL_CTRL_SET_CURVES) && !defined(OPENSSL_NO_EC) + // Set the curves to be used + if (q_SSLeay() >= 0x10002000L) { + // SSL_CTX_ctrl wants a non-const pointer as last argument, +@@ -360,7 +360,7 @@ init_context: + sslContext->errorCode = QSslError::UnspecifiedError; + } + } else +-#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(OPENSSL_NO_EC) ++#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L && defined(SSL_CTRL_SET_CURVES) && !defined(OPENSSL_NO_EC) + { + // specific curves requested, but not possible to set -> error + sslContext->errorStr = msgErrorSettingEllipticCurves(QSslSocket::tr("OpenSSL version too old, need at least v1.0.2")); diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/mkspecs-libgl.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/mkspecs-libgl.patch new file mode 100644 index 000000000000..fda3d3e36533 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.7/qtbase/mkspecs-libgl.patch @@ -0,0 +1,15 @@ +Index: qtbase-opensource-src-5.5.1/mkspecs/common/linux.conf +=================================================================== +--- qtbase-opensource-src-5.5.1.orig/mkspecs/common/linux.conf ++++ qtbase-opensource-src-5.5.1/mkspecs/common/linux.conf +@@ -12,8 +12,8 @@ QMAKE_INCDIR = + QMAKE_LIBDIR = + QMAKE_INCDIR_X11 = + QMAKE_LIBDIR_X11 = +-QMAKE_INCDIR_OPENGL = +-QMAKE_LIBDIR_OPENGL = ++QMAKE_INCDIR_OPENGL = @mesa_inc@/include ++QMAKE_LIBDIR_OPENGL = @mesa_lib@/lib + QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL + QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL + QMAKE_INCDIR_EGL = diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/nix-profiles-library-paths.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/nix-profiles-library-paths.patch new file mode 100644 index 000000000000..ebaf3651a6d0 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.7/qtbase/nix-profiles-library-paths.patch @@ -0,0 +1,22 @@ +Index: qtbase-opensource-src-5.7.0/src/corelib/kernel/qcoreapplication.cpp +=================================================================== +--- qtbase-opensource-src-5.7.0.orig/src/corelib/kernel/qcoreapplication.cpp ++++ qtbase-opensource-src-5.7.0/src/corelib/kernel/qcoreapplication.cpp +@@ -2487,7 +2487,17 @@ QStringList QCoreApplication::libraryPat + QStringList *app_libpaths = new QStringList; + coreappdata()->app_libpaths.reset(app_libpaths); + ++ // Add library paths derived from NIX_PROFILES. ++ const QByteArrayList profiles = qgetenv("NIX_PROFILES").split(' '); ++ const QString plugindir = QString::fromLatin1("/lib/qt5/plugins"); ++ for (const QByteArray &profile: profiles) { ++ if (!profile.isEmpty()) { ++ app_libpaths->append(QFile::decodeName(profile) + plugindir); ++ } ++ } ++ + const QByteArray libPathEnv = qgetenv("QT_PLUGIN_PATH"); ++ qunsetenv("QT_PLUGIN_PATH"); // do not propagate to child processes + if (!libPathEnv.isEmpty()) { + QStringList paths = QFile::decodeName(libPathEnv).split(QDir::listSeparator(), QString::SkipEmptyParts); + for (QStringList::const_iterator it = paths.constBegin(); it != paths.constEnd(); ++it) { diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/series b/pkgs/development/libraries/qt-5/5.7/qtbase/series new file mode 100644 index 000000000000..44e2d9040807 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.7/qtbase/series @@ -0,0 +1,10 @@ +dlopen-resolv.patch +tzdir.patch +dlopen-libXcursor.patch +dlopen-openssl.patch +dlopen-dbus.patch +xdg-config-dirs.patch +nix-profiles-library-paths.patch +compose-search-path.patch +libressl.patch +cmake-paths.patch diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/setup-hook.sh b/pkgs/development/libraries/qt-5/5.7/qtbase/setup-hook.sh new file mode 100644 index 000000000000..6d8989281eba --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.7/qtbase/setup-hook.sh @@ -0,0 +1,171 @@ +addToSearchPathOnceWithCustomDelimiter() { + local delim="$1" + local search="$2" + local target="$3" + local dirs + local exported + IFS="$delim" read -a dirs <<< "${!search}" + local canonical + if canonical=$(readlink -e "$target"); then + for dir in ${dirs[@]}; do + if [ "z$dir" == "z$canonical" ]; then exported=1; fi + done + if [ -z $exported ]; then + eval "export ${search}=\"${!search}${!search:+$delim}$canonical\"" + fi + fi +} + +addToSearchPathOnce() { + addToSearchPathOnceWithCustomDelimiter ':' "$@" +} + +propagateOnce() { + addToSearchPathOnceWithCustomDelimiter ' ' "$@" +} + +_qtPropagate() { + for dir in "lib/qt5/plugins" "lib/qt5/qml" "lib/qt5/imports"; do + if [ -d "$1/$dir" ]; then + propagateOnce propagatedBuildInputs "$1" + break + fi + done + addToSearchPathOnce QT_PLUGIN_PATH "$1/lib/qt5/plugins" + addToSearchPathOnce QML_IMPORT_PATH "$1/lib/qt5/imports" + addToSearchPathOnce QML2_IMPORT_PATH "$1/lib/qt5/qml" +} + +crossEnvHooks+=(_qtPropagate) + +_qtPropagateNative() { + for dir in "lib/qt5/plugins" "lib/qt5/qml" "lib/qt5/imports"; do + if [ -d "$1/$dir" ]; then + propagateOnce propagatedNativeBuildInputs "$1" + break + fi + done + if [ -z "$crossConfig" ]; then + addToSearchPathOnce QT_PLUGIN_PATH "$1/lib/qt5/plugins" + addToSearchPathOnce QML_IMPORT_PATH "$1/lib/qt5/imports" + addToSearchPathOnce QML2_IMPORT_PATH "$1/lib/qt5/qml" + fi +} + +envHooks+=(_qtPropagateNative) + +_qtMultioutDevs() { + # This is necessary whether the package is a Qt module or not + moveToOutput "mkspecs" "${!outputDev}" +} + +preFixupHooks+=(_qtMultioutDevs) + +if [[ -z "$NIX_QT_PIC" ]]; then + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE${NIX_CFLAGS_COMPILE:+ }-fPIC" + export NIX_QT_PIC=1 +fi + +_qtSetCMakePrefix() { + export CMAKE_PREFIX_PATH="$NIX_QT5_TMP${CMAKE_PREFIX_PATH:+:}${CMAKE_PREFIX_PATH}" +} + +_qtRmTmp() { + if [ -z "$NIX_QT_SUBMODULE" ]; then + rm -fr "$NIX_QT5_TMP" + else + cat "$NIX_QT5_TMP/nix-support/qt-inputs" | while read file; do + if [ ! -d "$NIX_QT5_TMP/$file" ]; then + rm -f "$NIX_QT5_TMP/$file" + fi + done + + cat "$NIX_QT5_TMP/nix-support/qt-inputs" | while read dir; do + if [ -d "$NIX_QT5_TMP/$dir" ]; then + rmdir --ignore-fail-on-non-empty -p "$NIX_QT5_TMP/$dir" + fi + done + + rm "$NIX_QT5_TMP/nix-support/qt-inputs" + fi +} + +_qtSetQmakePath() { + export PATH="$NIX_QT5_TMP/bin${PATH:+:}$PATH" +} + +if [ -z "$NIX_QT5_TMP" ]; then + if [ -z "$NIX_QT_SUBMODULE" ]; then + NIX_QT5_TMP=$(mktemp -d) + else + NIX_QT5_TMP=$out + fi + postInstallHooks+=(_qtRmTmp) + + mkdir -p "$NIX_QT5_TMP/nix-support" + for subdir in bin include lib mkspecs share; do + mkdir "$NIX_QT5_TMP/$subdir" + echo "$subdir/" >> "$NIX_QT5_TMP/nix-support/qt-inputs" + done + + postHooks+=(_qtSetCMakePrefix) + + cp "@dev@/bin/qmake" "$NIX_QT5_TMP/bin" + echo "bin/qmake" >> "$NIX_QT5_TMP/nix-support/qt-inputs" + + cat >"$NIX_QT5_TMP/bin/qt.conf" <<EOF +[Paths] +Prefix = $NIX_QT5_TMP +Plugins = lib/qt5/plugins +Imports = lib/qt5/imports +Qml2Imports = lib/qt5/qml +Documentation = share/doc/qt5 +EOF + echo "bin/qt.conf" >> "$NIX_QT5_TMP/nix-support/qt-inputs" + + export QMAKE="$NIX_QT5_TMP/bin/qmake" + + # Set PATH to find qmake first in a preConfigure hook + # It must run after all the envHooks! + preConfigureHooks+=(_qtSetQmakePath) +fi + +qt5LinkModuleDir() { + if [ -d "$1/$2" ]; then + @lndir@/bin/lndir -silent "$1/$2" "$NIX_QT5_TMP/$2" + find "$1/$2" -printf "$2/%P\n" >> "$NIX_QT5_TMP/nix-support/qt-inputs" + fi +} + +NIX_QT5_MODULES="${NIX_QT5_MODULES}${NIX_QT5_MODULES:+:}@out@" +NIX_QT5_MODULES_DEV="${NIX_QT5_MODULES_DEV}${NIX_QT5_MODULES_DEV:+:}@dev@" + +_qtLinkAllModules() { + IFS=: read -a modules <<< $NIX_QT5_MODULES + for module in ${modules[@]}; do + qt5LinkModuleDir "$module" "lib" + done + + IFS=: read -a modules <<< $NIX_QT5_MODULES_DEV + for module in ${modules[@]}; do + qt5LinkModuleDir "$module" "bin" + qt5LinkModuleDir "$module" "include" + qt5LinkModuleDir "$module" "lib" + qt5LinkModuleDir "$module" "mkspecs" + qt5LinkModuleDir "$module" "share" + done +} + +preConfigureHooks+=(_qtLinkAllModules) + +_qtFixCMakePaths() { + find "${!outputLib}" -name "*.cmake" | while read file; do + substituteInPlace "$file" \ + --subst-var-by NIX_OUT "${!outputLib}" \ + --subst-var-by NIX_DEV "${!outputDev}" + done +} + +if [ -n "$NIX_QT_SUBMODULE" ]; then + postInstallHooks+=(_qtFixCMakePaths) +fi diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/tzdir.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/tzdir.patch new file mode 100644 index 000000000000..f4056dd9cc97 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.7/qtbase/tzdir.patch @@ -0,0 +1,40 @@ +Index: qtbase-opensource-src-5.7.0/src/corelib/tools/qtimezoneprivate_tz.cpp +=================================================================== +--- qtbase-opensource-src-5.7.0.orig/src/corelib/tools/qtimezoneprivate_tz.cpp ++++ qtbase-opensource-src-5.7.0/src/corelib/tools/qtimezoneprivate_tz.cpp +@@ -68,7 +68,10 @@ typedef QHash<QByteArray, QTzTimeZone> Q + // Parse zone.tab table, assume lists all installed zones, if not will need to read directories + static QTzTimeZoneHash loadTzTimeZones() + { +- QString path = QStringLiteral("/usr/share/zoneinfo/zone.tab"); ++ QString path = qgetenv("TZDIR"); ++ path += "/zone.tab"; ++ if (!QFile::exists(path)) ++ path = QStringLiteral("/usr/share/zoneinfo/zone.tab"); + if (!QFile::exists(path)) + path = QStringLiteral("/usr/lib/zoneinfo/zone.tab"); + +@@ -566,12 +569,18 @@ void QTzTimeZonePrivate::init(const QByt + if (!tzif.open(QIODevice::ReadOnly)) + return; + } else { +- // Open named tz, try modern path first, if fails try legacy path +- tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId)); ++ // Try TZDIR first ++ QString zoneinfoDir = qgetenv("TZDIR"); ++ zoneinfoDir += "/" + QString::fromLocal8Bit(ianaId); ++ tzif.setFileName(zoneinfoDir); + if (!tzif.open(QIODevice::ReadOnly)) { +- tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId)); +- if (!tzif.open(QIODevice::ReadOnly)) +- return; ++ // Open named tz, try modern path first, if fails try legacy path ++ tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId)); ++ if (!tzif.open(QIODevice::ReadOnly)) { ++ tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId)); ++ if (!tzif.open(QIODevice::ReadOnly)) ++ return; ++ } + } + } + diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/xdg-config-dirs.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/xdg-config-dirs.patch new file mode 100644 index 000000000000..1f2f316c5b26 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.7/qtbase/xdg-config-dirs.patch @@ -0,0 +1,41 @@ +Index: qtbase-opensource-src-5.7.0/src/corelib/io/qsettings.cpp +=================================================================== +--- qtbase-opensource-src-5.7.0.orig/src/corelib/io/qsettings.cpp ++++ qtbase-opensource-src-5.7.0/src/corelib/io/qsettings.cpp +@@ -1161,6 +1161,23 @@ QConfFileSettingsPrivate::QConfFileSetti + confFiles[F_System | F_Application].reset(QConfFile::fromName(systemPath + appFile, false)); + confFiles[F_System | F_Organization].reset(QConfFile::fromName(systemPath + orgFile, false)); + ++#if !defined(Q_OS_WIN) ++ // Add directories specified in $XDG_CONFIG_DIRS ++ const QString pathEnv = QString::fromLocal8Bit(getenv("XDG_CONFIG_DIRS")); ++ if (!pathEnv.isEmpty()) { ++ const QStringList pathEntries = pathEnv.split(QLatin1Char(':'), QString::SkipEmptyParts); ++ if (!pathEntries.isEmpty()) { ++ int j = 4; // This is the number of confFiles set above -- we need to start adding $XDG_CONFIG_DIRS after those. ++ for (int k = 0; k < pathEntries.size() && j < NumConfFiles - 1; ++k) { ++ const QString& path = pathEntries.at(k); ++ if (!application.isEmpty()) ++ confFiles[j++].reset(QConfFile::fromName(path + QDir::separator() + appFile, false)); ++ confFiles[j++].reset(QConfFile::fromName(path + QDir::separator() + orgFile, false)); ++ } ++ } ++ } ++#endif ++ + for (i = 0; i < NumConfFiles; ++i) { + if (confFiles[i]) { + spec = i; +Index: qtbase-opensource-src-5.7.0/src/corelib/io/qsettings_p.h +=================================================================== +--- qtbase-opensource-src-5.7.0.orig/src/corelib/io/qsettings_p.h ++++ qtbase-opensource-src-5.7.0/src/corelib/io/qsettings_p.h +@@ -246,7 +246,7 @@ public: + F_Organization = 0x1, + F_User = 0x0, + F_System = 0x2, +- NumConfFiles = 4 ++ NumConfFiles = 40 // HACK: increase NumConfFiles from 4 to 40 in order to accommodate more paths in $XDG_CONFIG_DIRS -- ellis + }; + + QSettings::Format format; diff --git a/pkgs/development/libraries/qt-5/5.7/qtconnectivity.nix b/pkgs/development/libraries/qt-5/5.7/qtconnectivity.nix new file mode 100644 index 000000000000..95cd6fea79b4 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.7/qtconnectivity.nix @@ -0,0 +1,6 @@ +{ qtSubmodule, qtbase, qtdeclarative }: + +qtSubmodule { + name = "qtconnectivity"; + qtInputs = [ qtbase qtdeclarative ]; +} diff --git a/pkgs/development/libraries/qt-5/5.7/qtdeclarative/default.nix b/pkgs/development/libraries/qt-5/5.7/qtdeclarative/default.nix new file mode 100644 index 000000000000..328d8aee72bd --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.7/qtdeclarative/default.nix @@ -0,0 +1,8 @@ +{ qtSubmodule, lib, copyPathsToStore, python, qtbase, qtsvg, qtxmlpatterns }: + +qtSubmodule { + name = "qtdeclarative"; + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + qtInputs = [ qtbase qtsvg qtxmlpatterns ]; + nativeBuildInputs = [ python ]; +} diff --git a/pkgs/development/libraries/qt-5/5.7/qtdeclarative/nix-profiles-import-paths.patch b/pkgs/development/libraries/qt-5/5.7/qtdeclarative/nix-profiles-import-paths.patch new file mode 100644 index 000000000000..06b244b974ff --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.7/qtdeclarative/nix-profiles-import-paths.patch @@ -0,0 +1,20 @@ +Index: qtdeclarative-opensource-src-5.5.1/src/qml/qml/qqmlimport.cpp +=================================================================== +--- qtdeclarative-opensource-src-5.5.1.orig/src/qml/qml/qqmlimport.cpp ++++ qtdeclarative-opensource-src-5.5.1/src/qml/qml/qqmlimport.cpp +@@ -1549,6 +1549,15 @@ QQmlImportDatabase::QQmlImportDatabase(Q + QString installImportsPath = QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath); + addImportPath(installImportsPath); + ++ // Add library paths derived from NIX_PROFILES. ++ const QByteArrayList profiles = qgetenv("NIX_PROFILES").split(' '); ++ const QString qmldir = QString::fromLatin1("/lib/qt5/qml"); ++ Q_FOREACH (const QByteArray &profile, profiles) { ++ if (!profile.isEmpty()) { ++ addImportPath(QFile::decodeName(profile) + qmldir); ++ } ++ } ++ + // env import paths + QByteArray envImportPath = qgetenv("QML2_IMPORT_PATH"); + if (!envImportPath.isEmpty()) { diff --git a/pkgs/development/libraries/qt-5/5.7/qtdeclarative/series b/pkgs/development/libraries/qt-5/5.7/qtdeclarative/series new file mode 100644 index 000000000000..7dbe197c56e0 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.7/qtdeclarative/series @@ -0,0 +1 @@ +nix-profiles-import-paths.patch diff --git a/pkgs/development/libraries/qt-5/5.7/qtdoc.nix b/pkgs/development/libraries/qt-5/5.7/qtdoc.nix new file mode 100644 index 000000000000..578ea6ba0b22 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.7/qtdoc.nix @@ -0,0 +1,6 @@ +{ qtSubmodule, qtdeclarative }: + +qtSubmodule { + name = "qtdoc"; + qtInputs = [ qtdeclarative ]; +} diff --git a/pkgs/development/libraries/qt-5/5.7/qtgraphicaleffects.nix b/pkgs/development/libraries/qt-5/5.7/qtgraphicaleffects.nix new file mode 100644 index 000000000000..3273f12eb830 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.7/qtgraphicaleffects.nix @@ -0,0 +1,6 @@ +{ qtSubmodule, qtdeclarative }: + +qtSubmodule { + name = "qtgraphicaleffects"; + qtInputs = [ qtdeclarative ]; +} diff --git a/pkgs/development/libraries/qt-5/5.7/qtimageformats.nix b/pkgs/development/libraries/qt-5/5.7/qtimageformats.nix new file mode 100644 index 000000000000..03d0fffbe80e --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.7/qtimageformats.nix @@ -0,0 +1,6 @@ +{ qtSubmodule, qtbase }: + +qtSubmodule { + name = "qtimageformats"; + qtInputs = [ qtbase ]; +} diff --git a/pkgs/development/libraries/qt-5/5.7/qtlocation.nix b/pkgs/development/libraries/qt-5/5.7/qtlocation.nix new file mode 100644 index 000000000000..1e134057c4b4 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.7/qtlocation.nix @@ -0,0 +1,6 @@ +{ qtSubmodule, qtbase, qtmultimedia }: + +qtSubmodule { + name = "qtlocation"; + qtInputs = [ qtbase qtmultimedia ]; +} diff --git a/pkgs/development/libraries/qt-5/5.7/qtmultimedia.nix b/pkgs/development/libraries/qt-5/5.7/qtmultimedia.nix new file mode 100644 index 000000000000..7c1cc5da07e3 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.7/qtmultimedia.nix @@ -0,0 +1,12 @@ +{ qtSubmodule, qtbase, qtdeclarative, pkgconfig +, alsaLib, gstreamer, gst-plugins-base, libpulseaudio +}: + +qtSubmodule { + name = "qtmultimedia"; + qtInputs = [ qtbase qtdeclarative ]; + buildInputs = [ + pkgconfig alsaLib gstreamer gst-plugins-base libpulseaudio + ]; + qmakeFlags = [ "GST_VERSION=1.0" ]; +} diff --git a/pkgs/development/libraries/qt-5/5.7/qtquickcontrols.nix b/pkgs/development/libraries/qt-5/5.7/qtquickcontrols.nix new file mode 100644 index 000000000000..93a864621b82 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.7/qtquickcontrols.nix @@ -0,0 +1,6 @@ +{ qtSubmodule, qtdeclarative }: + +qtSubmodule { + name = "qtquickcontrols"; + qtInputs = [ qtdeclarative ]; +} diff --git a/pkgs/development/libraries/qt-5/5.7/qtscript/0001-glib-2.32.patch b/pkgs/development/libraries/qt-5/5.7/qtscript/0001-glib-2.32.patch new file mode 100644 index 000000000000..887e107b6c1b --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.7/qtscript/0001-glib-2.32.patch @@ -0,0 +1,25 @@ +From abd80356449bb36c8adcc5c9ca1df6b47715d265 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel <ttuegel@gmail.com> +Date: Sun, 23 Aug 2015 09:13:34 -0500 +Subject: [PATCH] glib-2.32 + +--- + src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h +index 1f6d25e..087c3fb 100644 +--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h ++++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h +@@ -81,7 +81,7 @@ + #include <pthread.h> + #elif PLATFORM(GTK) + #include <wtf/gtk/GOwnPtr.h> +-typedef struct _GMutex GMutex; ++typedef union _GMutex GMutex; + typedef struct _GCond GCond; + #endif + +-- +2.5.0 + diff --git a/pkgs/development/libraries/qt-5/5.7/qtscript/default.nix b/pkgs/development/libraries/qt-5/5.7/qtscript/default.nix new file mode 100644 index 000000000000..127766e2ebd6 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.7/qtscript/default.nix @@ -0,0 +1,7 @@ +{ qtSubmodule, qtbase, qttools }: + +qtSubmodule { + name = "qtscript"; + qtInputs = [ qtbase qttools ]; + patches = [ ./0001-glib-2.32.patch ]; +} diff --git a/pkgs/development/libraries/qt-5/5.7/qtsensors.nix b/pkgs/development/libraries/qt-5/5.7/qtsensors.nix new file mode 100644 index 000000000000..61e64dc47e4d --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.7/qtsensors.nix @@ -0,0 +1,6 @@ +{ qtSubmodule, qtbase, qtdeclarative }: + +qtSubmodule { + name = "qtsensors"; + qtInputs = [ qtbase qtdeclarative ]; +} diff --git a/pkgs/development/libraries/qt-5/5.7/qtserialport/0001-dlopen-serialport-udev.patch b/pkgs/development/libraries/qt-5/5.7/qtserialport/0001-dlopen-serialport-udev.patch new file mode 100644 index 000000000000..3a813dc80074 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.7/qtserialport/0001-dlopen-serialport-udev.patch @@ -0,0 +1,28 @@ +From d81c2c870b9bea8fb8e6b85baefb06542f568338 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel <ttuegel@gmail.com> +Date: Sun, 23 Aug 2015 09:16:02 -0500 +Subject: [PATCH] dlopen serialport udev + +--- + src/serialport/qtudev_p.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/serialport/qtudev_p.h b/src/serialport/qtudev_p.h +index 6f2cabd..81b9849 100644 +--- a/src/serialport/qtudev_p.h ++++ b/src/serialport/qtudev_p.h +@@ -105,9 +105,9 @@ inline QFunctionPointer resolveSymbol(QLibrary *udevLibrary, const char *symbolN + inline bool resolveSymbols(QLibrary *udevLibrary) + { + if (!udevLibrary->isLoaded()) { +- udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 1); ++ udevLibrary->setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 1); + if (!udevLibrary->load()) { +- udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 0); ++ udevLibrary->setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 0); + if (!udevLibrary->load()) { + qWarning("Failed to load the library: %s, supported version(s): %i and %i", qPrintable(udevLibrary->fileName()), 1, 0); + return false; +-- +2.5.0 + diff --git a/pkgs/development/libraries/qt-5/5.7/qtserialport/default.nix b/pkgs/development/libraries/qt-5/5.7/qtserialport/default.nix new file mode 100644 index 000000000000..32549c95344a --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.7/qtserialport/default.nix @@ -0,0 +1,12 @@ +{ qtSubmodule, qtbase, substituteAll, libudev }: + +qtSubmodule { + name = "qtserialport"; + qtInputs = [ qtbase ]; + patches = [ + (substituteAll { + src = ./0001-dlopen-serialport-udev.patch; + libudev = libudev.out; + }) + ]; +} diff --git a/pkgs/development/libraries/qt-5/5.7/qtsvg.nix b/pkgs/development/libraries/qt-5/5.7/qtsvg.nix new file mode 100644 index 000000000000..b9ccac7cf933 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.7/qtsvg.nix @@ -0,0 +1,6 @@ +{ qtSubmodule, qtbase }: + +qtSubmodule { + name = "qtsvg"; + qtInputs = [ qtbase ]; +} diff --git a/pkgs/development/libraries/qt-5/5.7/qttools.nix b/pkgs/development/libraries/qt-5/5.7/qttools.nix new file mode 100644 index 000000000000..4aeaea729a25 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.7/qttools.nix @@ -0,0 +1,10 @@ +{ qtSubmodule, qtbase, qtdeclarative }: + +qtSubmodule { + name = "qttools"; + qtInputs = [ qtbase qtdeclarative ]; + postFixup = '' + moveToOutput "bin/qdbus" "$out" + moveToOutput "bin/qtpaths" "$out" + ''; +} diff --git a/pkgs/development/libraries/qt-5/5.7/qttranslations.nix b/pkgs/development/libraries/qt-5/5.7/qttranslations.nix new file mode 100644 index 000000000000..50fc8cf6826a --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.7/qttranslations.nix @@ -0,0 +1,6 @@ +{ qtSubmodule, qttools }: + +qtSubmodule { + name = "qttranslations"; + qtInputs = [ qttools ]; +} diff --git a/pkgs/development/libraries/qt-5/5.7/qtwebchannel.nix b/pkgs/development/libraries/qt-5/5.7/qtwebchannel.nix new file mode 100644 index 000000000000..fd7a3c52026e --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.7/qtwebchannel.nix @@ -0,0 +1,7 @@ +{ qtSubmodule, qtbase, qtdeclarative }: + +qtSubmodule { + name = "qtwebchannel"; + qtInputs = [ qtbase qtdeclarative ]; +} + diff --git a/pkgs/development/libraries/qt-5/5.7/qtwebengine.nix b/pkgs/development/libraries/qt-5/5.7/qtwebengine.nix new file mode 100644 index 000000000000..a433976dad1f --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.7/qtwebengine.nix @@ -0,0 +1,6 @@ +{ qtSubmodule, qtquickcontrols, qtlocation, qtwebchannel }: + +qtSubmodule { + name = "qtwebengine"; + qtInputs = [ qtquickcontrols qtlocation qtwebchannel ]; +} diff --git a/pkgs/development/libraries/qt-5/5.7/qtwebsockets.nix b/pkgs/development/libraries/qt-5/5.7/qtwebsockets.nix new file mode 100644 index 000000000000..fbdfbbcf0dbe --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.7/qtwebsockets.nix @@ -0,0 +1,6 @@ +{ qtSubmodule, qtbase, qtdeclarative }: + +qtSubmodule { + name = "qtwebsockets"; + qtInputs = [ qtbase qtdeclarative ]; +} diff --git a/pkgs/development/libraries/qt-5/5.7/qtx11extras.nix b/pkgs/development/libraries/qt-5/5.7/qtx11extras.nix new file mode 100644 index 000000000000..a765161e2d7e --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.7/qtx11extras.nix @@ -0,0 +1,6 @@ +{ qtSubmodule, qtbase }: + +qtSubmodule { + name = "qtx11extras"; + qtInputs = [ qtbase ]; +} diff --git a/pkgs/development/libraries/qt-5/5.7/qtxmlpatterns.nix b/pkgs/development/libraries/qt-5/5.7/qtxmlpatterns.nix new file mode 100644 index 000000000000..9a8ddbba2bd2 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.7/qtxmlpatterns.nix @@ -0,0 +1,6 @@ +{ qtSubmodule, qtbase }: + +qtSubmodule { + name = "qtxmlpatterns"; + qtInputs = [ qtbase ]; +} diff --git a/pkgs/development/libraries/qt-5/5.7/setup-hook.sh b/pkgs/development/libraries/qt-5/5.7/setup-hook.sh new file mode 100644 index 000000000000..e41433c11386 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.7/setup-hook.sh @@ -0,0 +1,2 @@ +NIX_QT5_MODULES="${NIX_QT5_MODULES}${NIX_QT5_MODULES:+:}@out@" +NIX_QT5_MODULES_DEV="${NIX_QT5_MODULES_DEV}${NIX_QT5_MODULES_DEV:+:}@dev@" diff --git a/pkgs/development/libraries/qt-5/5.7/srcs.nix b/pkgs/development/libraries/qt-5/5.7/srcs.nix new file mode 100644 index 000000000000..38334fa77f18 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.7/srcs.nix @@ -0,0 +1,301 @@ +# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh +{ fetchurl, mirror }: + +{ + qt3d = { + version = "5.7.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qt3d-opensource-src-5.7.0.tar.xz"; + sha256 = "0a9y4fxm4xmdl5hsv4hfvxcw7jmshy0mwd4j1r2ylqdmg4bql958"; + name = "qt3d-opensource-src-5.7.0.tar.xz"; + }; + }; + qtactiveqt = { + version = "5.7.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtactiveqt-opensource-src-5.7.0.tar.xz"; + sha256 = "149wj6a5i35k750129kz77y4r8q3hpxqzn1c676fcn9wpmfhay4v"; + name = "qtactiveqt-opensource-src-5.7.0.tar.xz"; + }; + }; + qtandroidextras = { + version = "5.7.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtandroidextras-opensource-src-5.7.0.tar.xz"; + sha256 = "1caimhfyag96v98j1b07pfzjl5inhsyfi9kxzy9nj0pkvpjdgi4g"; + name = "qtandroidextras-opensource-src-5.7.0.tar.xz"; + }; + }; + qtbase = { + version = "5.7.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtbase-opensource-src-5.7.0.tar.xz"; + sha256 = "0ip6xnizsn269r4s1nq9lkx8cdxkjqr1fidwrj3sa8xb7h96syry"; + name = "qtbase-opensource-src-5.7.0.tar.xz"; + }; + }; + qtcanvas3d = { + version = "5.7.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtcanvas3d-opensource-src-5.7.0.tar.xz"; + sha256 = "15xxwciyiy8rwrwgb7bgcbxdiiaba3l4cxxm7rdiqmhs9kyv6wbq"; + name = "qtcanvas3d-opensource-src-5.7.0.tar.xz"; + }; + }; + qtcharts = { + version = "5.7.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtcharts-opensource-src-5.7.0.tar.xz"; + sha256 = "0hsj5m9in4w9wzyvbs76v7zc67n9ja641ljc5vgfpbn7fmrsij1b"; + name = "qtcharts-opensource-src-5.7.0.tar.xz"; + }; + }; + qtconnectivity = { + version = "5.7.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtconnectivity-opensource-src-5.7.0.tar.xz"; + sha256 = "00r7lc1w3snfp2qfqmviqzv0cw16zd8m1sfpvxvpl65yqmzcli4q"; + name = "qtconnectivity-opensource-src-5.7.0.tar.xz"; + }; + }; + qtdatavis3d = { + version = "5.7.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtdatavis3d-opensource-src-5.7.0.tar.xz"; + sha256 = "18p82vh5s9bdshmxxkh7r9482i5vaih8nfya9f81l8ff7lw7lpcs"; + name = "qtdatavis3d-opensource-src-5.7.0.tar.xz"; + }; + }; + qtdeclarative = { + version = "5.7.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtdeclarative-opensource-src-5.7.0.tar.xz"; + sha256 = "1x7rij423g5chlfd2kix54f393vxwjvdfsn1c7sybqmfycwn5pl6"; + name = "qtdeclarative-opensource-src-5.7.0.tar.xz"; + }; + }; + qtdeclarative-render2d = { + version = "5.7.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtdeclarative-render2d-opensource-src-5.7.0.tar.xz"; + sha256 = "1qf893i7z2iyjpqpaxfhji4cgzlmpgh0w3vdqarpn51vcn7jj4q6"; + name = "qtdeclarative-render2d-opensource-src-5.7.0.tar.xz"; + }; + }; + qtdoc = { + version = "5.7.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtdoc-opensource-src-5.7.0.tar.xz"; + sha256 = "0d7c7137jvxlwl91c2hh33l4falmjvkmsy1f7lyi73x6nnqzdz8i"; + name = "qtdoc-opensource-src-5.7.0.tar.xz"; + }; + }; + qtgamepad = { + version = "5.7.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtgamepad-opensource-src-5.7.0.tar.xz"; + sha256 = "0g36nlnnq19p9svl6pvklxybpwig7r7z4hw0d5dwc2id02ygg62q"; + name = "qtgamepad-opensource-src-5.7.0.tar.xz"; + }; + }; + qtgraphicaleffects = { + version = "5.7.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtgraphicaleffects-opensource-src-5.7.0.tar.xz"; + sha256 = "1rwdjg5mk6xpadmxfq64xfp573zp5lrj9illb9105ra5wff565n8"; + name = "qtgraphicaleffects-opensource-src-5.7.0.tar.xz"; + }; + }; + qtimageformats = { + version = "5.7.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtimageformats-opensource-src-5.7.0.tar.xz"; + sha256 = "1rb27x7i2pmvsck6wax2cg31gqpzaakciy45wm5l3lcl86j48czg"; + name = "qtimageformats-opensource-src-5.7.0.tar.xz"; + }; + }; + qtlocation = { + version = "5.7.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtlocation-opensource-src-5.7.0.tar.xz"; + sha256 = "0rd898gndn41jrp78203lxd94ybfv693l0qg0myag4r46ikk69vh"; + name = "qtlocation-opensource-src-5.7.0.tar.xz"; + }; + }; + qtmacextras = { + version = "5.7.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtmacextras-opensource-src-5.7.0.tar.xz"; + sha256 = "1p439sqnchrypggaqkfq3rvfk7xmvqgck4nhwv762jk3kgp48ccq"; + name = "qtmacextras-opensource-src-5.7.0.tar.xz"; + }; + }; + qtmultimedia = { + version = "5.7.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtmultimedia-opensource-src-5.7.0.tar.xz"; + sha256 = "0ndmhiflmyr144nq8drd5njsdi282ixsm4730q5n0ji2v9dp1bh5"; + name = "qtmultimedia-opensource-src-5.7.0.tar.xz"; + }; + }; + qtpurchasing = { + version = "5.7.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtpurchasing-opensource-src-5.7.0.tar.xz"; + sha256 = "1db44q3d02nhmrh0fd239n2nsm74myac8saa6jqx1pcap4y4llby"; + name = "qtpurchasing-opensource-src-5.7.0.tar.xz"; + }; + }; + qtquickcontrols = { + version = "5.7.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtquickcontrols-opensource-src-5.7.0.tar.xz"; + sha256 = "0cpcrmz9n5b4bgmshmk093lirl9xwqb23inchnai1zqg21vrmqfq"; + name = "qtquickcontrols-opensource-src-5.7.0.tar.xz"; + }; + }; + qtquickcontrols2 = { + version = "5.7.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtquickcontrols2-opensource-src-5.7.0.tar.xz"; + sha256 = "0i8h933vhvx1bmniqdx0idg6vk82w9byd3dq0bb2phwjg5vv1xb3"; + name = "qtquickcontrols2-opensource-src-5.7.0.tar.xz"; + }; + }; + qtscript = { + version = "5.7.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtscript-opensource-src-5.7.0.tar.xz"; + sha256 = "0040890p5ilyrmcpndz1hhp08x2ms5gw4lp4n5iax2a957yy2i4w"; + name = "qtscript-opensource-src-5.7.0.tar.xz"; + }; + }; + qtscxml = { + version = "5.7.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtscxml-opensource-src-5.7.0.tar.xz"; + sha256 = "1waidk96vp9510g94fry0sv1vm2lgzgpwybf6c2xybcsdkbi62rp"; + name = "qtscxml-opensource-src-5.7.0.tar.xz"; + }; + }; + qtsensors = { + version = "5.7.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtsensors-opensource-src-5.7.0.tar.xz"; + sha256 = "1gii6wg2xd3bkb86y5hgpmwcpl04xav030zscpl6fhscl9kcqg98"; + name = "qtsensors-opensource-src-5.7.0.tar.xz"; + }; + }; + qtserialbus = { + version = "5.7.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtserialbus-opensource-src-5.7.0.tar.xz"; + sha256 = "0f2xq6fm8lmvd88lc3l37kybqp4wqp71kdch14bwz79y7777lhrc"; + name = "qtserialbus-opensource-src-5.7.0.tar.xz"; + }; + }; + qtserialport = { + version = "5.7.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtserialport-opensource-src-5.7.0.tar.xz"; + sha256 = "0rc2l14s59qskp16wqlkizfai32s41qlm7a86r3qahx28gc51qaw"; + name = "qtserialport-opensource-src-5.7.0.tar.xz"; + }; + }; + qtsvg = { + version = "5.7.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtsvg-opensource-src-5.7.0.tar.xz"; + sha256 = "10fqrlqkiq83xhx79g8d2sjy7hjdnp28067z8f4byj7db81rzy51"; + name = "qtsvg-opensource-src-5.7.0.tar.xz"; + }; + }; + qttools = { + version = "5.7.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qttools-opensource-src-5.7.0.tar.xz"; + sha256 = "004m9l7bgh7qnncbyl3d5fkggdrqx58ib21xv4hflvvarxrssibg"; + name = "qttools-opensource-src-5.7.0.tar.xz"; + }; + }; + qttranslations = { + version = "5.7.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qttranslations-opensource-src-5.7.0.tar.xz"; + sha256 = "0vasg5ycg5rhj8ljk3aqg1sxfrlz3602n38fr14ip853yqld83ha"; + name = "qttranslations-opensource-src-5.7.0.tar.xz"; + }; + }; + qtvirtualkeyboard = { + version = "5.7.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtvirtualkeyboard-opensource-src-5.7.0.tar.xz"; + sha256 = "0bzzci32f8ji94p2n6n16n838lrykyy3h822gfw77c93ivk3shyz"; + name = "qtvirtualkeyboard-opensource-src-5.7.0.tar.xz"; + }; + }; + qtwayland = { + version = "5.7.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtwayland-opensource-src-5.7.0.tar.xz"; + sha256 = "04dynjcr6gxi3hcqdf688a4hkabi2l17slpcx9k0f3dxygwcgf96"; + name = "qtwayland-opensource-src-5.7.0.tar.xz"; + }; + }; + qtwebchannel = { + version = "5.7.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtwebchannel-opensource-src-5.7.0.tar.xz"; + sha256 = "05lqfidlh1ahdd1j9y20p2037qbcq51zkdzj2m8fwhn7ghbwvd1s"; + name = "qtwebchannel-opensource-src-5.7.0.tar.xz"; + }; + }; + qtwebengine = { + version = "5.7.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtwebengine-opensource-src-5.7.0.tar.xz"; + sha256 = "0pfwsqjh107jqdw1mzzrhn38jxl64d8lljk4586im2ndypzn4mwq"; + name = "qtwebengine-opensource-src-5.7.0.tar.xz"; + }; + }; + qtwebsockets = { + version = "5.7.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtwebsockets-opensource-src-5.7.0.tar.xz"; + sha256 = "0hwb2l7iwf4wf7l95dli8j3b7h0nffp56skfg1x810kzj0df26vl"; + name = "qtwebsockets-opensource-src-5.7.0.tar.xz"; + }; + }; + qtwebview = { + version = "5.7.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtwebview-opensource-src-5.7.0.tar.xz"; + sha256 = "1i2ikv1ah4g3rc1pivxiw77p0yj79lialqww91fj781g66pky6l0"; + name = "qtwebview-opensource-src-5.7.0.tar.xz"; + }; + }; + qtwinextras = { + version = "5.7.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtwinextras-opensource-src-5.7.0.tar.xz"; + sha256 = "1fh7kqfwgwi9pcfg9b6hp2fpgvs938wl96ppqan79apxlhqy5awd"; + name = "qtwinextras-opensource-src-5.7.0.tar.xz"; + }; + }; + qtx11extras = { + version = "5.7.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtx11extras-opensource-src-5.7.0.tar.xz"; + sha256 = "1yrkn8pqdbvbqykas3wx1vdfimhjkgx3s5jgdxib9dgmgyx6vjzw"; + name = "qtx11extras-opensource-src-5.7.0.tar.xz"; + }; + }; + qtxmlpatterns = { + version = "5.7.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.7/5.7.0/submodules/qtxmlpatterns-opensource-src-5.7.0.tar.xz"; + sha256 = "02z2qxamslg6sphnaykjcjfpypq4b69pb586s43vw4fplm72m21q"; + name = "qtxmlpatterns-opensource-src-5.7.0.tar.xz"; + }; + }; +} diff --git a/pkgs/development/libraries/sfml/default.nix b/pkgs/development/libraries/sfml/default.nix index 7d4ce1616200..480cc81c53c5 100644 --- a/pkgs/development/libraries/sfml/default.nix +++ b/pkgs/development/libraries/sfml/default.nix @@ -1,14 +1,19 @@ -{ stdenv, fetchurl, cmake, libX11, freetype, libjpeg, openal, libsndfile -, glew, libXrandr, libXrender, udev +{ stdenv, fetchurl, cmake, libX11, freetype, libjpeg, openal, flac, libvorbis +, glew, libXrandr, libXrender, udev, xcbutilimage }: + +let + version = "2.3"; +in + stdenv.mkDerivation rec { - name = "sfml-2.2"; + name = "sfml-${version}"; src = fetchurl { - url = "https://github.com/LaurentGomila/SFML/archive/2.2.tar.gz"; - sha256 = "1xbpzkqwgbsjdda7n3c2z5m16bhppz1z9rbhmhb8r1im7s95hd2l"; + url = "https://github.com/LaurentGomila/SFML/archive/${version}.tar.gz"; + sha256 = "12588hfs0pfsv20x3zhq0gdmxv9m7g27i5lfz88303kpglp9yzn2"; }; - buildInputs = [ cmake libX11 freetype libjpeg openal libsndfile glew - libXrandr libXrender udev + buildInputs = [ cmake libX11 freetype libjpeg openal flac libvorbis glew + libXrandr libXrender udev xcbutilimage ]; meta = with stdenv.lib; { homepage = http://www.sfml-dev.org/; diff --git a/pkgs/development/libraries/tk/8.6.nix b/pkgs/development/libraries/tk/8.6.nix index c10771c9109d..666332d45fb8 100644 --- a/pkgs/development/libraries/tk/8.6.nix +++ b/pkgs/development/libraries/tk/8.6.nix @@ -4,7 +4,7 @@ callPackage ./generic.nix (args // rec { src = fetchurl { url = "mirror://sourceforge/tcl/tk${tcl.version}-src.tar.gz"; - sha256 = "1h96vp15zl5xz0d4qp6wjyrchqmrmdm3q5k22wkw9jaxbvw9vy88"; + sha256 = "17diivcfcwdhp4v5zi6j9nkxncccjqkivhp363c4wx5lf4d3fb6n"; }; patches = [ ./different-prefix-with-tcl.patch ] ++ stdenv.lib.optionals stdenv.isDarwin [ ./Fix-bad-install_name-for-libtk8.6.dylib.patch ]; diff --git a/pkgs/development/libraries/tk/generic.nix b/pkgs/development/libraries/tk/generic.nix index 934bfa6a9e94..c5a01ec7e7c8 100644 --- a/pkgs/development/libraries/tk/generic.nix +++ b/pkgs/development/libraries/tk/generic.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation { homepage = http://www.tcl.tk/; license = licenses.tcltk; platforms = platforms.all; - maintainers = with maintainers; [ lovek323 wkennington ]; + maintainers = with maintainers; [ lovek323 vrthra wkennington ]; }; } diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index 09e1c9512400..2c6e818b4e12 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -1,6 +1,7 @@ { stdenv, lib, fetchgit, fetchFromGitHub, gyp, readline, python, which, icu , patchelf, coreutils , doCheck ? false +, static ? false }: assert readline != null; @@ -15,6 +16,7 @@ let else "ia32"; git_url = "https://chromium.googlesource.com"; clangFlag = if stdenv.isDarwin then "1" else "0"; + sharedFlag = if static then "static_library" else "shared_library"; deps = { "build" = fetchgit { @@ -143,7 +145,7 @@ stdenv.mkDerivation rec { -Dclang=${clangFlag} \ -Dv8_enable_i18n_support=1 \ -Duse_system_icu=1 \ - -Dcomponent=shared_library \ + -Dcomponent=${sharedFlag} \ -Dconsole=readline \ -Dv8_target_arch=${arch} \ -Dv8_use_external_startup_data=0 @@ -170,7 +172,8 @@ stdenv.mkDerivation rec { installPhase = '' install -vD out/Release/d8 "$out/bin/d8" install -vD out/Release/mksnapshot "$out/bin/mksnapshot" - ${if stdenv.isDarwin then '' + ${if static then "" + else if stdenv.isDarwin then '' install -vD out/Release/lib.target/libv8.dylib "$out/lib/libv8.dylib" install_name_tool -change /usr/local/lib/libv8.dylib $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc.lib}/lib/libgcc_s.1.dylib $out/bin/d8 install_name_tool -id $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc.lib}/lib/libgcc_s.1.dylib $out/lib/libv8.dylib @@ -180,6 +183,7 @@ stdenv.mkDerivation rec { mkdir -p "$out/include" cp -vr include/*.h "$out/include" cp -vr include/libplatform "$out/include" + mkdir -p "$out/lib" cp -v out/Release/*.a "$out/lib" ''; diff --git a/pkgs/development/libraries/webkitgtk/2.4.nix b/pkgs/development/libraries/webkitgtk/2.4.nix index e6e61e0482cb..39c0eed0a543 100644 --- a/pkgs/development/libraries/webkitgtk/2.4.nix +++ b/pkgs/development/libraries/webkitgtk/2.4.nix @@ -2,7 +2,7 @@ , pkgconfig, which, gettext, gobjectIntrospection , gtk2, gtk3, wayland, libwebp, enchant, sqlite , libxml2, libsoup, libsecret, libxslt, harfbuzz, xorg -, gst-plugins-base +, gst-plugins-base, libobjc , withGtk2 ? false , enableIntrospection ? !stdenv.isDarwin , enableCredentialStorage ? !stdenv.isDarwin @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { description = "Web content rendering engine, GTK+ port"; homepage = "http://webkitgtk.org/"; license = licenses.bsd2; - platforms = platforms.linux; + platforms = with platforms; linux ++ darwin; maintainers = []; }; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { patches = [ ./webcore-svg-libxml-cflags.patch ] ++ optionals stdenv.isDarwin [ - ./impure-icucore.patch + ./configure.patch ./quartz-webcore.patch ./libc++.patch ./plugin-none.patch @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { ] ++ optionals enableCredentialStorage [ libsecret ] ++ (if stdenv.isDarwin then [ - readline libedit + readline libedit libobjc ] else [ wayland ]); diff --git a/pkgs/development/libraries/webkitgtk/configure.patch b/pkgs/development/libraries/webkitgtk/configure.patch new file mode 100644 index 000000000000..2f4c1e7ad314 --- /dev/null +++ b/pkgs/development/libraries/webkitgtk/configure.patch @@ -0,0 +1,20 @@ +--- webkitgtk-2.4.11-orig/configure 2016-04-10 17:00:06.000000000 +0800 ++++ webkitgtk-2.4.11/configure 2016-07-21 23:04:10.000000000 +0800 +@@ -17738,7 +17738,7 @@ + cat >>confdefs.h <<_ACEOF + #define HAVE_WEBP_DECODE_H 1 + _ACEOF +- WEBP_LIBS='-lwebp' ++ WEBP_LIBS=`$PKG_CONFIG --libs libwebp` + else + as_fn_error $? "WebP library (libwebp) not found" "$LINENO" 5 + fi +@@ -18388,7 +18388,7 @@ + case "$host" in + *-*-darwin*) + UNICODE_CFLAGS="-I$srcdir/Source/JavaScriptCore/icu -I$srcdir/Source/WebCore/icu" +- UNICODE_LIBS="-licucore" ++ UNICODE_LIBS="/usr/lib/libicucore.dylib" + ;; + *-*-mingw*) + diff --git a/pkgs/development/libraries/webkitgtk/impure-icucore.patch b/pkgs/development/libraries/webkitgtk/impure-icucore.patch deleted file mode 100644 index 24bf690d8b8f..000000000000 --- a/pkgs/development/libraries/webkitgtk/impure-icucore.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru webkitgtk-2.4.9-orig/configure webkitgtk-2.4.9/configure ---- webkitgtk-2.4.9-orig/configure 2016-02-02 13:23:22.000000000 -0500 -+++ webkitgtk-2.4.9/configure 2016-02-02 13:24:13.000000000 -0500 -@@ -17715,7 +17715,7 @@ - case "$host" in - *-*-darwin*) - UNICODE_CFLAGS="-I$srcdir/Source/JavaScriptCore/icu -I$srcdir/Source/WebCore/icu" -- UNICODE_LIBS="-licucore" -+ UNICODE_LIBS="/usr/lib/libicucore.dylib" - ;; - *-*-mingw*) - diff --git a/pkgs/development/mobile/androidenv/addon.xml b/pkgs/development/mobile/androidenv/addon.xml index c9c7bfa86a8e..645795034cd8 100644 --- a/pkgs/development/mobile/androidenv/addon.xml +++ b/pkgs/development/mobile/androidenv/addon.xml @@ -1,6 +1,6 @@ <?xml version="1.0" ?> <sdk:sdk-addon xmlns:sdk="http://schemas.android.com/sdk/android/addon/7" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <!--Generated on 2016-07-15 21:31:36.580145 with ADRT.--> + <!--Generated on 2016-07-21 16:22:25.601902 with ADRT.--> <sdk:license id="android-sdk-license" type="text">Terms and Conditions This is the Android Software Development Kit License Agreement @@ -1229,18 +1229,18 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& <sdk:libs/> </sdk:add-on> <sdk:extra> - <!--Generated from bid:3063959, branch:git_nyc-dev--> + <!--Generated from bid:3078275, branch:git_nyc-dev--> <sdk:revision> - <sdk:major>34</sdk:major> + <sdk:major>35</sdk:major> <sdk:minor>0</sdk:minor> <sdk:micro>0</sdk:micro> </sdk:revision> <sdk:archives> <sdk:archive> - <!--Built on: Fri Jul 15 16:41:11 2016.--> - <sdk:size>244424374</sdk:size> - <sdk:checksum type="sha1">103e1f1001589986c93e04a691bcce0908b16c65</sdk:checksum> - <sdk:url>android_m2repository_r34.zip</sdk:url> + <!--Built on: Thu Jul 21 12:00:22 2016.--> + <sdk:size>251973915</sdk:size> + <sdk:checksum type="sha1">7a201334775d78bf185ffcce686b1b168d152217</sdk:checksum> + <sdk:url>android_m2repository_r35.zip</sdk:url> </sdk:archive> </sdk:archives> <sdk:uses-license ref="android-sdk-license"/> diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix index 50625c323198..0c09dc809267 100644 --- a/pkgs/development/mobile/androidenv/androidsdk.nix +++ b/pkgs/development/mobile/androidenv/androidsdk.nix @@ -1,9 +1,8 @@ { stdenv, stdenv_32bit, fetchurl, unzip, makeWrapper , platformTools, buildTools, support, supportRepository, platforms, sysimages, addons -, zlib_32bit -, libX11_32bit, libxcb_32bit, libXau_32bit, libXdmcp_32bit, libXext_32bit, mesa_32bit, alsaLib_32bit , libX11, libXext, libXrender, libxcb, libXau, libXdmcp, libXtst, mesa, alsaLib -, freetype, fontconfig, glib, gtk, atk, file, jdk, coreutils +, freetype, fontconfig, glib, gtk, atk, file, jdk, coreutils, libpulseaudio +, zlib, glxinfo, xkeyboardconfig }: { platformVersions, abiVersions, useGoogleAPIs, useExtraSupportLibs ? false, useGooglePlayServices ? false }: @@ -11,16 +10,16 @@ with { inherit (stdenv.lib) makeLibraryPath; }; stdenv.mkDerivation rec { name = "android-sdk-${version}"; - version = "24.4.1"; + version = "25.1.7"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { - url = "http://dl.google.com/android/android-sdk_r${version}-linux.tgz"; - sha1 = "dlr6346lpmxdb8pmryn4xl7py1hb6nvj"; + url = "http://dl.google.com/android/repository/tools_r${version}-linux.zip"; + sha1 = "p03br08zfq0j7aar5638z8fdh5n9x1in"; } else if stdenv.system == "x86_64-darwin" then fetchurl { - url = "http://dl.google.com/android/android-sdk_r${version}-macosx.zip"; - sha1 = "rm03hm87f7qcadb3c4gnz7hz1g5wrac5"; + url = "http://dl.google.com/android/repository/tools_r${version}-macosx.zip"; + sha1 = "7fzlfms37cfk25kk4f9zriy63djmbi8g"; } else throw "platform not ${stdenv.system} supported!"; @@ -28,7 +27,7 @@ stdenv.mkDerivation rec { mkdir -p $out/libexec cd $out/libexec unpackFile $src - cd android-sdk-*/tools + cd tools for f in android traceview draw9patch hierarchyviewer monitor ddms screenshot2 uiautomatorviewer monkeyrunner jobb lint do @@ -39,16 +38,24 @@ stdenv.mkDerivation rec { '' # There are a number of native binaries. We must patch them to let them find the interpreter and libstdc++ - for i in emulator emulator-arm emulator-mips emulator-x86 mksdcard + for i in mksdcard do patchelf --set-interpreter ${stdenv_32bit.cc.libc.out}/lib/ld-linux.so.2 $i patchelf --set-rpath ${stdenv_32bit.cc.cc.lib}/lib $i done - + + ${stdenv.lib.optionalString (stdenv.system == "x86_64-linux") '' + for i in bin64/{mkfs.ext4,fsck.ext4,e2fsck,tune2fs,resize2fs} + do + patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 $i + patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64 $i + done + ''} + ${stdenv.lib.optionalString (stdenv.system == "x86_64-linux") '' # We must also patch the 64-bit emulator instances, if needed - for i in emulator64-arm emulator64-mips emulator64-x86 + for i in emulator emulator64-arm emulator64-mips emulator64-x86 emulator64-crash-service emulator-check qemu/linux-x86_64/qemu-system-* do patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 $i patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64 $i @@ -71,20 +78,14 @@ stdenv.mkDerivation rec { --prefix LD_LIBRARY_PATH : ${glib}/lib:${gtk}/lib:${libXtst}/lib # The emulators need additional libraries, which are dynamically loaded => let's wrap them - - for i in emulator emulator-arm emulator-mips emulator-x86 - do - wrapProgram `pwd`/$i \ - --prefix PATH : ${file}/bin \ - --suffix LD_LIBRARY_PATH : `pwd`/lib:${makeLibraryPath [ libX11_32bit libxcb_32bit libXau_32bit libXdmcp_32bit libXext_32bit mesa_32bit ]} - done - + ${stdenv.lib.optionalString (stdenv.system == "x86_64-linux") '' - for i in emulator64-arm emulator64-mips emulator64-x86 + for i in emulator emulator64-arm emulator64-mips emulator64-x86 emulator64-crash-service do wrapProgram `pwd`/$i \ - --prefix PATH : ${file}/bin \ - --suffix LD_LIBRARY_PATH : `pwd`/lib64:${makeLibraryPath [ libX11 libxcb libXau libXdmcp libXext mesa alsaLib ]} + --prefix PATH : ${file}/bin:${glxinfo}/bin \ + --suffix LD_LIBRARY_PATH : `pwd`/lib64:`pwd`/lib64/qt/lib:${makeLibraryPath [ stdenv.cc.cc libX11 libxcb libXau libXdmcp libXext mesa alsaLib zlib libpulseaudio ]} \ + --suffix QT_XKB_CONFIG_ROOT : ${xkeyboardconfig}/share/X11/xkb done ''} ''} @@ -205,7 +206,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin - for i in $out/libexec/android-sdk-*/tools/* + for i in $out/libexec/tools/* do if [ ! -d $i ] && [ -x $i ] then @@ -213,7 +214,7 @@ stdenv.mkDerivation rec { fi done - for i in $out/libexec/android-sdk-*/platform-tools/* + for i in $out/libexec/platform-tools/* do if [ ! -d $i ] && [ -x $i ] then @@ -221,7 +222,7 @@ stdenv.mkDerivation rec { fi done - for i in $out/libexec/android-sdk-*/build-tools/*/* + for i in $out/libexec/build-tools/*/* do if [ ! -d $i ] && [ -x $i ] then diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index a30a17d67013..7874792b3a09 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -40,20 +40,12 @@ rec { androidsdk = import ./androidsdk.nix { inherit (pkgs) stdenv fetchurl unzip makeWrapper; - inherit (pkgs) freetype fontconfig glib gtk atk mesa file alsaLib jdk coreutils; - inherit (pkgs.xorg) libX11 libXext libXrender libxcb libXau libXdmcp libXtst; + inherit (pkgs) zlib glxinfo freetype fontconfig glib gtk atk mesa file alsaLib jdk coreutils libpulseaudio; + inherit (pkgs.xorg) libX11 libXext libXrender libxcb libXau libXdmcp libXtst xkeyboardconfig; inherit platformTools buildTools support supportRepository platforms sysimages addons; stdenv_32bit = pkgs_i686.stdenv; - zlib_32bit = pkgs_i686.zlib; - libX11_32bit = pkgs_i686.xorg.libX11; - libxcb_32bit = pkgs_i686.xorg.libxcb; - libXau_32bit = pkgs_i686.xorg.libXau; - libXdmcp_32bit = pkgs_i686.xorg.libXdmcp; - libXext_32bit = pkgs_i686.xorg.libXext; - mesa_32bit = pkgs_i686.mesa; - alsaLib_32bit = pkgs_i686.alsaLib; }; androidsdk_2_1 = androidsdk { diff --git a/pkgs/development/mobile/androidenv/repository-11.xml b/pkgs/development/mobile/androidenv/repository-11.xml index 68c9d0f77263..ead5dcad7117 100644 --- a/pkgs/development/mobile/androidenv/repository-11.xml +++ b/pkgs/development/mobile/androidenv/repository-11.xml @@ -15,7 +15,7 @@ * limitations under the License. --> <sdk:sdk-repository xmlns:sdk="http://schemas.android.com/sdk/android/repository/11" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <!--Generated on 2016-07-18 18:30:41.214218 with ADRT.--> + <!--Generated on 2016-07-22 11:17:21.550545 with ADRT.--> <sdk:license id="android-sdk-license" type="text">Terms and Conditions This is the Android Software Development Kit License Agreement diff --git a/pkgs/development/mobile/androidenv/support-repository.nix b/pkgs/development/mobile/androidenv/support-repository.nix index fabebaf770b4..182fdded2bd7 100644 --- a/pkgs/development/mobile/androidenv/support-repository.nix +++ b/pkgs/development/mobile/androidenv/support-repository.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, unzip}: stdenv.mkDerivation rec { - version = "33"; + version = "35"; name = "android-support-repository-r${version}"; src = fetchurl { url = "http://dl.google.com/android/repository/android_m2repository_r${version}.zip"; - sha1 = "pdg5s78wypnc27fs5n62c8rrjl8gwyv4"; + sha1 = "2wi1b38n3dmnikpwbwcbyy2xfws1683s"; }; buildCommand = '' diff --git a/pkgs/development/ocaml-modules/menhir/default.nix b/pkgs/development/ocaml-modules/menhir/default.nix index 16bdc17f578e..5b2fd400cd7f 100644 --- a/pkgs/development/ocaml-modules/menhir/default.nix +++ b/pkgs/development/ocaml-modules/menhir/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ocaml, findlib -, version ? if stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02" then "20160303" else "20140422" +, version ? if stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02" then "20160526" else "20140422" }@args: let sha256 = if version == "20140422" then "1ki1f2id6a14h9xpv2k8yb6px7dyw8cvwh39csyzj4qpzx7wia0d" - else if version == "20160303" then "1q57x81483xkvbx6bqjx31d4c4lpy9fs3y7h3l8azrs9yi7r6c63" + else if version == "20160526" then "1i6yqxhs29n6qcvi6c5qbg5mh8752ywsyv1dr6x1qcv0ncqpxhns" else throw ("menhir: unknown version " ++ version); in diff --git a/pkgs/development/python-modules/scipy.nix b/pkgs/development/python-modules/scipy.nix index ae312cd32d59..023335a5e347 100644 --- a/pkgs/development/python-modules/scipy.nix +++ b/pkgs/development/python-modules/scipy.nix @@ -12,6 +12,11 @@ in buildPythonPackage (args // rec { buildInputs = (args.buildInputs or [ gfortran nose ]); propagatedBuildInputs = (args.propagatedBuildInputs or [ passthru.blas numpy]); + # Remove tests because of broken wrapper + prePatch = '' + rm scipy/linalg/tests/test_lapack.py + ''; + preConfigure = '' sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py ''; diff --git a/pkgs/development/tools/continuous-integration/gocd-server/default.nix b/pkgs/development/tools/continuous-integration/gocd-server/default.nix index 0b9794fd6d7f..d08d72c394ec 100644 --- a/pkgs/development/tools/continuous-integration/gocd-server/default.nix +++ b/pkgs/development/tools/continuous-integration/gocd-server/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "gocd-server-${version}-${rev}"; - version = "16.5.0"; - rev = "3305"; + version = "16.6.0"; + rev = "3590"; src = fetchurl { url = "https://download.go.cd/binaries/${version}-${rev}/generic/go-server-${version}-${rev}.zip"; - sha256 = "41139051f419dc340a5c05c76e5de06eeef3516526341f377ac77532511bfa2c"; + sha256 = "6e737c8b419544deb5089e9a2540892a6faec73c962ee7c4e526a799056acca1"; }; meta = with stdenv.lib; { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { homepage = http://www.go.cd; license = licenses.asl20; platforms = platforms.all; - maintainers = with maintainers; [ swarren83 ]; + maintainers = with maintainers; [ grahamc swarren83 ]; }; buildInputs = [ unzip ]; diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 0d13e7c978cf..93b0b35c8151 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -2,7 +2,7 @@ , cross ? null, gold ? true, bison ? null }: -let basename = "binutils-2.26"; in +let basename = "binutils-2.26.1"; in with { inherit (stdenv.lib) optional optionals optionalString; }; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnu/binutils/${basename}.tar.bz2"; - sha256 = "1ngc2h3knhiw8s22l8y6afycfaxr5grviqy7mwvm4bsl14cf9b62"; + sha256 = "1n4zjibdvqwz63kkzkjdqdp1nh993pn0lml6yyr19yx4gb44dhrr"; }; patches = [ @@ -32,12 +32,6 @@ stdenv.mkDerivation rec { # This is needed, for instance, so that running "ldd" on a binary that is # PaX-marked to disable mprotect doesn't fail with permission denied. ./pt-pax-flags.patch - - # Bug fix backported from binutils master. - ./fix-bsymbolic.patch - - # Bug fix backported from binutils master. - ./fix-update-symbol-version.patch ]; outputs = (optional (cross == null) "dev") ++ [ "out" "info" ]; diff --git a/pkgs/development/tools/misc/binutils/fix-bsymbolic.patch b/pkgs/development/tools/misc/binutils/fix-bsymbolic.patch deleted file mode 100644 index afaafc997efb..000000000000 --- a/pkgs/development/tools/misc/binutils/fix-bsymbolic.patch +++ /dev/null @@ -1,47 +0,0 @@ -http://lists.gnu.org/archive/html/bug-binutils/2016-01/msg00193.html -https://sourceware.org/bugzilla/show_bug.cgi?id=19615 - -From 1dab972d797c060e17229c2e10da01852ba82629 Mon Sep 17 00:00:00 2001 -From: "H.J. Lu" <hjl.tools@gmail.com> -Date: Thu, 11 Feb 2016 15:31:15 -0800 -Subject: [PATCH] Enable -Bsymbolic and -Bsymbolic-functions to PIE - -Before binutils 2.26, -Bsymbolic and -Bsymbolic-functions were also -applied to PIE so that "ld -pie -Bsymbolic -E" can be used to export -symbols in PIE with local binding. This patch re-enables -Bsymbolic -and -Bsymbolic-functions for PIE. - -diff --git a/ld/lexsup.c b/ld/lexsup.c -index 4cad209..e2fb212 100644 ---- a/ld/lexsup.c -+++ b/ld/lexsup.c -@@ -1586,15 +1586,14 @@ parse_args (unsigned argc, char **argv) - /* We may have -Bsymbolic, -Bsymbolic-functions, --dynamic-list-data, - --dynamic-list-cpp-new, --dynamic-list-cpp-typeinfo and - --dynamic-list FILE. -Bsymbolic and -Bsymbolic-functions are -- for shared libraries. -Bsymbolic overrides all others and vice -- versa. */ -+ for PIC outputs. -Bsymbolic overrides all others and vice versa. */ - switch (command_line.symbolic) - { - case symbolic_unset: - break; - case symbolic: -- /* -Bsymbolic is for shared library only. */ -- if (bfd_link_dll (&link_info)) -+ /* -Bsymbolic is for PIC output only. */ -+ if (bfd_link_pic (&link_info)) - { - link_info.symbolic = TRUE; - /* Should we free the unused memory? */ -@@ -1603,8 +1602,8 @@ parse_args (unsigned argc, char **argv) - } - break; - case symbolic_functions: -- /* -Bsymbolic-functions is for shared library only. */ -- if (bfd_link_dll (&link_info)) -+ /* -Bsymbolic-functions is for PIC output only. */ -+ if (bfd_link_pic (&link_info)) - command_line.dynamic_list = dynamic_list_data; - break; - } diff --git a/pkgs/development/tools/misc/binutils/fix-update-symbol-version.patch b/pkgs/development/tools/misc/binutils/fix-update-symbol-version.patch deleted file mode 100644 index ca7dcf969f37..000000000000 --- a/pkgs/development/tools/misc/binutils/fix-update-symbol-version.patch +++ /dev/null @@ -1,106 +0,0 @@ -NOTE: removed Changelog diffs to avoid the patch failing to apply - -From 544ddf9322b1b83982e5cb84a54d084ee7e718ea Mon Sep 17 00:00:00 2001 -From: H.J. Lu <hjl.tools@gmail.com> -Date: Wed, 24 Feb 2016 15:13:35 -0800 -Subject: [PATCH] Update symbol version for symbol from linker script - -We need to update symbol version for symbols from linker script. - -Backport from master - -bfd/ - - PR ld/19698 - * elflink.c (bfd_elf_record_link_assignment): Set versioned if - symbol version is unknown. - -ld/ - - PR ld/19698 - * testsuite/ld-elf/pr19698.d: New file. - * testsuite/ld-elf/pr19698.s: Likewise. - * testsuite/ld-elf/pr19698.t: Likewise. ---- - bfd/ChangeLog | 9 +++++++++ - bfd/elflink.c | 13 +++++++++++++ - ld/ChangeLog | 10 ++++++++++ - ld/testsuite/ld-elf/pr19698.d | 10 ++++++++++ - ld/testsuite/ld-elf/pr19698.s | 5 +++++ - ld/testsuite/ld-elf/pr19698.t | 11 +++++++++++ - 6 files changed, 58 insertions(+), 0 deletions(-) - create mode 100644 ld/testsuite/ld-elf/pr19698.d - create mode 100644 ld/testsuite/ld-elf/pr19698.s - create mode 100644 ld/testsuite/ld-elf/pr19698.t - -diff --git a/bfd/elflink.c b/bfd/elflink.c -index ae8d148..8fcaadd 100644 ---- a/bfd/elflink.c -+++ b/bfd/elflink.c -@@ -555,6 +555,19 @@ bfd_elf_record_link_assignment (bfd *output_bfd, - if (h == NULL) - return provide; - -+ if (h->versioned == unknown) -+ { -+ /* Set versioned if symbol version is unknown. */ -+ char *version = strrchr (name, ELF_VER_CHR); -+ if (version) -+ { -+ if (version > name && version[-1] != ELF_VER_CHR) -+ h->versioned = versioned_hidden; -+ else -+ h->versioned = versioned; -+ } -+ } -+ - switch (h->root.type) - { - case bfd_link_hash_defined: -diff --git a/ld/testsuite/ld-elf/pr19698.d b/ld/testsuite/ld-elf/pr19698.d -new file mode 100644 -index 0000000..a39f67a ---- /dev/null -+++ b/ld/testsuite/ld-elf/pr19698.d -@@ -0,0 +1,10 @@ -+#ld: -shared $srcdir/$subdir/pr19698.t -+#readelf : --dyn-syms --wide -+#target: *-*-linux* *-*-gnu* *-*-solaris* -+ -+Symbol table '\.dynsym' contains [0-9]+ entries: -+#... -+ +[0-9]+: +[0-9a-f]+ +[0-9a-f]+ +FUNC +GLOBAL +DEFAULT +[0-9]+ +foo@VERS.1 -+#... -+ +[0-9]+: +[0-9a-f]+ +[0-9a-f]+ +FUNC +GLOBAL +DEFAULT +[0-9]+ +foo@@VERS.2 -+#pass -diff --git a/ld/testsuite/ld-elf/pr19698.s b/ld/testsuite/ld-elf/pr19698.s -new file mode 100644 -index 0000000..875dca4 ---- /dev/null -+++ b/ld/testsuite/ld-elf/pr19698.s -@@ -0,0 +1,5 @@ -+ .text -+ .globl foo -+ .type foo, %function -+foo: -+ .byte 0 -diff --git a/ld/testsuite/ld-elf/pr19698.t b/ld/testsuite/ld-elf/pr19698.t -new file mode 100644 -index 0000000..09d9125 ---- /dev/null -+++ b/ld/testsuite/ld-elf/pr19698.t -@@ -0,0 +1,11 @@ -+"foo@VERS.1" = foo; -+ -+VERSION { -+VERS.2 { -+ global: -+ foo; -+}; -+ -+VERS.1 { -+}; -+} --- -1.7.1 - diff --git a/pkgs/development/tools/misc/ddd/default.nix b/pkgs/development/tools/misc/ddd/default.nix index a57840827c1f..9375dfb20cd8 100644 --- a/pkgs/development/tools/misc/ddd/default.nix +++ b/pkgs/development/tools/misc/ddd/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, lesstif, ncurses, libX11, libXt}: +{stdenv, fetchurl, motif, ncurses, libX11, libXt}: stdenv.mkDerivation rec { name = "ddd-3.3.12"; @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { url = "mirror://gnu/ddd/${name}.tar.gz"; sha256 = "0p5nx387857w3v2jbgvps2p6mlm0chajcdw5sfrddcglsxkwvmis"; }; - buildInputs = [lesstif ncurses libX11 libXt]; + buildInputs = [motif ncurses libX11 libXt]; configureFlags = "--with-x"; patches = [ ./gcc44.patch ]; diff --git a/pkgs/development/tools/misc/kibana/default.nix b/pkgs/development/tools/misc/kibana/default.nix index ca3d33624915..f356827a93a2 100644 --- a/pkgs/development/tools/misc/kibana/default.nix +++ b/pkgs/development/tools/misc/kibana/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "kibana-${version}"; - version = "4.5.1"; + version = "4.5.2"; src = fetchurl { url = "http://download.elastic.co/kibana/kibana-snapshot/${name}-snapshot-linux-x86.tar.gz"; - sha256 = "0k9pmzx2sa3026yw29f2h2lddxdkhyn3jvdf3si8scz70ncwylj9"; + sha256 = "1na8xh525znxaqjhxfvpx0q3rj85cjb6l9zlzd44dl31a9l117y4"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/misc/swig/3.x.nix b/pkgs/development/tools/misc/swig/3.x.nix index f93f7d6511db..2d5358b2255f 100644 --- a/pkgs/development/tools/misc/swig/3.x.nix +++ b/pkgs/development/tools/misc/swig/3.x.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "swig-${version}"; - version = "3.0.7"; + version = "3.0.10"; src = fetchFromGitHub { owner = "swig"; repo = "swig"; rev = "rel-${version}"; - sha256 = "18zp9546d5xfq88nyykk5v3hh0iyp8r59i2ridbavxn3z914mhyv"; + sha256 = "049rj883r9mf2bgabj3b03p7cnmqgl5939lmh8v5nnia24zb51jg"; }; nativeBuildInputs = [ autoconf automake libtool bison ]; @@ -23,12 +23,12 @@ stdenv.mkDerivation rec { ./autogen.sh ''; - meta = { + meta = with stdenv.lib; { description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages"; homepage = http://swig.org/; - # Licensing is a mess: http://www.swig.org/Release/LICENSE . - license = "BSD-style"; - platforms = lib.platforms.linux ++ lib.platforms.darwin; - maintainers = [ lib.maintainers.urkud lib.maintainers.wkennington ]; + # Different types of licenses available: http://www.swig.org/Release/LICENSE . + license = licenses.gpl3Plus; + platforms = with platforms; linux ++ darwin; + maintainers = with maintainers; [ urkud wkennington ]; }; } diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix index 3cb7a3e23466..ffaae16b7420 100644 --- a/pkgs/development/tools/rust/racer/default.nix +++ b/pkgs/development/tools/rust/racer/default.nix @@ -17,9 +17,11 @@ buildRustPackage rec { buildInputs = [ makeWrapper ]; preCheck = '' - export RUST_SRC;_PATH="${rustPlatform.rust.rustc.src}/src" + export RUST_SRC_PATH="${rustPlatform.rust.rustc.src}/src" ''; + doCheck = true; + installPhase = '' mkdir -p $out/bin cp -p target/release/racer $out/bin/ diff --git a/pkgs/development/tools/solarus-quest-editor/default.nix b/pkgs/development/tools/solarus-quest-editor/default.nix new file mode 100644 index 000000000000..3df6d3de3e16 --- /dev/null +++ b/pkgs/development/tools/solarus-quest-editor/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, cmake, luajit, + SDL2, SDL2_image, SDL2_ttf, physfs, + openal, libmodplug, libvorbis, solarus, + qtbase, qttools }: + +stdenv.mkDerivation rec { + name = "solarus-quest-editor-${version}"; + version = "1.4.5"; + + src = fetchFromGitHub { + owner = "christopho"; + repo = "solarus-quest-editor"; + rev = "61f0fa7a5048994fcd9c9f3a3d1255d0be2967df"; + sha256 = "1fpq55nvs5k2rxgzgf39c069rmm73vmv4gr5lvmqzgsz07rkh07f"; + }; + + buildInputs = [ cmake luajit SDL2 + SDL2_image SDL2_ttf physfs + openal libmodplug libvorbis + solarus qtbase qttools ]; + + patches = [ ./patches/fix-install.patch ]; + + meta = with stdenv.lib; { + description = "The editor for the Zelda-like ARPG game engine, Solarus"; + longDescription = '' + Solarus is a game engine for Zelda-like ARPG games written in lua. + Many full-fledged games have been writen for the engine. + Games can be created easily using the editor. + ''; + homepage = http://www.solarus-games.org; + license = licenses.gpl3; + maintainers = [ maintainers.Nate-Devv ]; + platforms = platforms.linux; + }; + +} diff --git a/pkgs/development/tools/solarus-quest-editor/patches/fix-install.patch b/pkgs/development/tools/solarus-quest-editor/patches/fix-install.patch new file mode 100644 index 000000000000..98c26c1a7061 --- /dev/null +++ b/pkgs/development/tools/solarus-quest-editor/patches/fix-install.patch @@ -0,0 +1,16 @@ +# Description Fix CMakeLists.txt to install binaries. Fixed in 1.5 upstream. +# Author "Nathan R. Moore <natedevv@gmail.com>" +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -359,6 +359,11 @@ + "${MODPLUG_LIBRARY}" + ) + ++# Set files to install ++install(TARGETS solarus-quest-editor ++ RUNTIME DESTINATION bin ++) ++ + # Platform specific. + + # Windows: disable the console. diff --git a/pkgs/games/arx-libertatis/default.nix b/pkgs/games/arx-libertatis/default.nix index af4f6e2c7ec9..12f8efd7325a 100644 --- a/pkgs/games/arx-libertatis/default.nix +++ b/pkgs/games/arx-libertatis/default.nix @@ -1,20 +1,21 @@ { stdenv, fetchgit, cmake, zlib, boost, openal, glm, freetype, mesa, glew, SDL2, - dejavu_fonts }: + dejavu_fonts, inkscape, optipng, imagemagick }: stdenv.mkDerivation rec { name = "arx-libertatis-${version}"; - version = "2016-02-02"; + version = "2016-07-27"; src = fetchgit { url = "https://github.com/arx/ArxLibertatis"; - rev = "205c6cda4d5ac10f3af4ea7bb89c2fc88dac7c9a"; - sha256 = "0dy81pk4r94qq720kk6ynkjp2wr3z9hzm9h1x46nkkpn7fj8srrn"; + rev = "e3aa6353f90886e7e9db2f4350ad9a232dd01c1e"; + sha256 = "1hkkf0z607z8wxdikxq1ji120b3w7pxixq9qapdj1p54dzgbhgza"; }; buildInputs = [ cmake zlib boost openal glm - freetype mesa glew SDL2 + freetype mesa glew SDL2 inkscape + optipng imagemagick ]; preConfigure = '' diff --git a/pkgs/games/chessx/default.nix b/pkgs/games/chessx/default.nix index 345840af2493..404b3b90d7cd 100644 --- a/pkgs/games/chessx/default.nix +++ b/pkgs/games/chessx/default.nix @@ -1,10 +1,10 @@ { stdenv, pkgconfig, zlib, qtbase, qtsvg, qttools, qtmultimedia, qmakeHook, fetchurl }: stdenv.mkDerivation rec { name = "chessx-${version}"; - version = "1.3.2"; + version = "1.4.0"; src = fetchurl { url = "mirror://sourceforge/chessx/chessx-${version}.tgz"; - sha256 = "b136cf56d37d34867cdb9538176e1703b14f61b3384885b6f100580d0af0a3ff"; + sha256 = "1x10c9idj2qks8xk9dy7aw3alc5w7z1kvv6dnahs0428j0sp4a74"; }; buildInputs = [ stdenv @@ -19,10 +19,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; installPhase = '' + runHook preInstall mkdir -p "$out/bin" mkdir -p "$out/share/applications" cp -pr release/chessx "$out/bin" cp -pr unix/chessx.desktop "$out/share/applications" + runHook postInstall ''; meta = with stdenv.lib; { @@ -30,6 +32,5 @@ stdenv.mkDerivation rec { description = "ChessX allows you to browse and analyse chess games"; license = licenses.gpl2; maintainers = [maintainers.luispedro]; - broken = true; }; } diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix index f180a446d055..870f80477ca8 100644 --- a/pkgs/misc/emulators/higan/default.nix +++ b/pkgs/misc/emulators/higan/default.nix @@ -11,12 +11,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "higan-${version}"; - version = "099"; + version = "100"; sourceName = "higan_v${version}-source"; src = fetchurl { urls = [ "http://download.byuu.org/${sourceName}.7z" ]; - sha256 = "11lfsas1ym3xwb1rc27z1skvb4m176swix9dih4rvnlqxkqz4qhw"; + sha256 = "1pp20dxv6y2brb144v8kxfkkn0rcd755rivgrbvzzgn3v9dgjprp"; curlOpts = "--user-agent 'Mozilla/5.0'"; # the good old user-agent trick... }; diff --git a/pkgs/misc/long-shebang/default.nix b/pkgs/misc/long-shebang/default.nix new file mode 100644 index 000000000000..17bf0e95feeb --- /dev/null +++ b/pkgs/misc/long-shebang/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl }: let + version = "1.0.0"; +in stdenv.mkDerivation { + name = "long-shebang-${version}"; + + src = fetchurl { + url = "https://github.com/shlevy/long-shebang/releases/download/v1.0.0/long-shebang-1.0.0.tar.xz"; + sha256 = "15f5rmihj3r53rmalix1bn1agybbzrc3g2a9xzjyd4v3vfd2vckr"; + }; + + meta = { + description = "A tool for #! scripts with more than one argument"; + + homepage = https://github.com/shlevy/long-shebang; + + license = stdenv.lib.licenses.mit; + + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index b06f609bffa3..bdeda5b776ef 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -173,11 +173,11 @@ rec { }; Syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Syntastic-2016-07-16"; + name = "Syntastic-2016-07-21"; src = fetchgit { url = "git://github.com/scrooloose/syntastic"; - rev = "8ab7705b21cbe5f1c70750dee89bf8b711890a82"; - sha256 = "1gk12lzyqgjh4qzq46m3i70h4xzf9whgdahigf6nr0yqxd6w90rw"; + rev = "663fea9dc9371d574f1a4a6ba15cc9e60ebbe510"; + sha256 = "1y37m1iikki13y6rpzfgdyadd565q9zixg6xkly34bgbp1yrq5g0"; }; dependencies = []; @@ -239,11 +239,11 @@ rec { }; VimOutliner = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "VimOutliner-2015-10-01"; + name = "VimOutliner-2016-07-22"; src = fetchgit { url = "git://github.com/vimoutliner/vimoutliner"; - rev = "cb41cfd6d636e1243e7e9c46b35fc5cb50588069"; - sha256 = "16szrm282l608i1v3z1vfnqrnk5x4gfljvvxqaszzm4qgdg90qg7"; + rev = "bd80cee8d9df9530c730ec4237de7ebe197b3642"; + sha256 = "0ynf60vzahif8ccb50kssjk64bh3r8bai3x37n6qb1gi5m61yn3z"; }; dependencies = []; @@ -342,6 +342,17 @@ rec { }; + vim-auto-save = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-auto-save-2016-07-20"; + src = fetchgit { + url = "git://github.com/907th/vim-auto-save"; + rev = "ef54e6c66c5a2ffeb39b45db731f00e1811f7334"; + sha256 = "03kbphnkcxvbvvanzj22j0rkhp19dbbmqqsgypdz7avx9bra3nxw"; + }; + dependencies = []; + + }; + vim-autoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-autoformat-2016-07-08"; src = fetchgit { @@ -365,11 +376,11 @@ rec { }; deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "deoplete-nvim-2016-07-14"; + name = "deoplete-nvim-2016-07-26"; src = fetchgit { url = "git://github.com/Shougo/deoplete.nvim"; - rev = "e3cb71b4053041dffb250733bd9531814bfa4af9"; - sha256 = "1wz3q1020f8vb7s9nncdgji045iz2nlqp59j06gbli9cjvgfhg60"; + rev = "cd52ac6c076720541c6b9a82581622f597778e97"; + sha256 = "0rd9hdhk800nj5sz52zabxb2im75ckq2jmrqhff0n5dlmc61hdd2"; }; dependencies = []; @@ -387,33 +398,33 @@ rec { }; vim-closetag = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-closetag-2016-04-21"; + name = "vim-closetag-2016-07-19"; src = fetchgit { url = "git://github.com/alvan/vim-closetag"; - rev = "26e41a5b0c3752d5300506a49120d9dff19d8323"; - sha256 = "0c8x25hb912jmhf5jpfll08937wr2yls28i9divldm9jkmxvcx2k"; + rev = "e7e6cb99b9abb2aaa4711b9b2a98ad029169253b"; + sha256 = "0827yrgawfjf82z37lndf58ikyh6s8g9qhxvnbfxvz8cc4a6r21v"; }; dependencies = []; }; vim-css-color = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-css-color-2016-07-14"; + name = "vim-css-color-2016-07-21"; src = fetchgit { url = "git://github.com/ap/vim-css-color"; - rev = "86dff1b9c2a549994042c4548a47514350c25b6d"; - sha256 = "1wzkcprn6sky03v6yg0dkijmdva3jszrpwzbld1744m8ylbdgf0i"; + rev = "e2017678257fa8a175e4ab1191f9cfbe8cab39b2"; + sha256 = "1179kcm44sssw09lj38p9n3h8lrnfraxn6hf9x7azl0kx0v4jjry"; }; dependencies = []; }; neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neomake-2016-07-16"; + name = "neomake-2016-07-23"; src = fetchgit { url = "git://github.com/benekastah/neomake"; - rev = "5560a4dd58a47a0af2ae128d707e822b54c55c72"; - sha256 = "01l7ws2m3pm90q5985rrpc7rqcgv93ypg3swy1n1sfn0m0vm1a4l"; + rev = "ab22f656cd3ce77a7092568c412b7422c15889e8"; + sha256 = "1x26srp0grvjna7cvzsncjnzynvzg22rwn96dc90zn4qlrnnhw1s"; }; dependencies = []; @@ -431,22 +442,22 @@ rec { }; vim-tmux-navigator = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-tmux-navigator-2016-07-07"; + name = "vim-tmux-navigator-2016-07-17"; src = fetchgit { url = "git://github.com/christoomey/vim-tmux-navigator"; - rev = "d0123a8679cebec89ddd385756b25e4c812556b6"; - sha256 = "1bk3saff0lxzl1zrv97klx8f4kqvr01ypv13vg5andc1ylk2nqqf"; + rev = "caf4c48141f9088632b457f488fb797af77c3ce1"; + sha256 = "0gj6klb296jqq8zi40q7ryparpbv85dx4ahx6gpfv85452zn7rml"; }; dependencies = []; }; spacevim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "spacevim-2016-07-07"; + name = "spacevim-2016-07-19"; src = fetchgit { url = "git://github.com/ctjhoa/spacevim"; - rev = "714cc22f8c4544676a9cc2a4ac075b630ffa5b34"; - sha256 = "0l66h05hridjihjp4g94zq3mrfjs4pywzlb5wh95yvcdix8kyzzm"; + rev = "59864e305977fa47e032529d20d9dfb589c06659"; + sha256 = "0d99bnrb2yz3d40kr9gdxwp369b18d6vn3jm3d3fz2n55k6xp9ww"; }; dependencies = []; @@ -486,11 +497,11 @@ rec { }; elm-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "elm-vim-2016-06-22"; + name = "elm-vim-2016-07-25"; src = fetchgit { url = "git://github.com/elmcast/elm-vim"; - rev = "6527c8a9e1d1af31c81e60b6b40bf3316c7fbdf2"; - sha256 = "0aj1cd5dy7z48lf6vzg76r787hgs4z5f11bczvvs1h99qik1rgbc"; + rev = "abc998a113a77a729bf8c2b918978c8e43e60847"; + sha256 = "1byma9dyh59b4mnmr0nmjmy0ribgn9l8m2gddbc0hfgcwbzjxy5y"; }; dependencies = []; @@ -530,11 +541,11 @@ rec { }; vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-go-2016-07-14"; + name = "vim-go-2016-07-26"; src = fetchgit { url = "git://github.com/fatih/vim-go"; - rev = "789de8e4e8c505c3058f407750165f0148ea1d02"; - sha256 = "0hnq3abl6qvwk9rynk8pmi8slfikdaxf5irrx0xvddp38giydws1"; + rev = "b7ac76ad7ef469d45aa44d2209a3a61b46cb3b1a"; + sha256 = "0dx7zqh6hq4lgjqc8jvjaa1yjc46yfcbfpj8cs4qd06zafzqf8wf"; }; dependencies = []; @@ -607,11 +618,11 @@ rec { }; calendar-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "calendar-vim-2016-07-06"; + name = "calendar-vim-2016-07-18"; src = fetchgit { url = "git://github.com/itchyny/calendar.vim"; - rev = "e5ecd6c6635b0b8c3bc11d3a28f48e0b224e1391"; - sha256 = "0v611z5a24201194j592bpyid27cyfir66xr0pss71yk35wk9agy"; + rev = "a61af2bf6d8919d75e9ab48776316f1b3e11c336"; + sha256 = "0zxdx1q3x541ddm1d5qlwx8rl37gqhm3bgrsl1kmkn14az8nyy7k"; }; dependencies = []; @@ -739,11 +750,11 @@ rec { }; fzf-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "fzf-vim-2016-07-02"; + name = "fzf-vim-2016-07-21"; src = fetchgit { url = "git://github.com/junegunn/fzf.vim"; - rev = "e0182d33716068ffb1b53f7a8931fe1b5594f382"; - sha256 = "0hg6yzm11qwgq6cbf1ldb9i3p4r8h6f5ykvlrqh5znyzlxxf27vz"; + rev = "491ff9942f1bc18919176b781f0acc8bfb1ae73d"; + sha256 = "05g07gji55rb35hfiisbjwbnkfz7msxq6xsjajvwdl6g2v4nmfyl"; }; dependencies = []; @@ -761,11 +772,11 @@ rec { }; vim-peekaboo = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-peekaboo-2016-07-08"; + name = "vim-peekaboo-2016-07-25"; src = fetchgit { url = "git://github.com/junegunn/vim-peekaboo"; - rev = "13e44380895b4a0e52a710a7056ad40514ff5927"; - sha256 = "12pa03dj4plc6za93skcrn3zhz2faw578a78038dwh3fd608rwyd"; + rev = "3a7c48bd8f2ab0d30485e9d64f930f3d99b46088"; + sha256 = "0g1lhxzqf4mddm82nilff46pgcpkzcv5yb7yxkisy06byw18vbnq"; }; dependencies = []; @@ -805,11 +816,11 @@ rec { }; vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimtex-2016-07-16"; + name = "vimtex-2016-07-26"; src = fetchgit { url = "git://github.com/lervag/vimtex"; - rev = "8dd4ed77dbd547a819b1220aa2e298e0ae6e5643"; - sha256 = "0n5zbhgf0ks0b166p94m7i3cfkh6v2zc6srci0rp45byi4mwpddz"; + rev = "35fae13d17a08a7688a385644879f073a0fc8809"; + sha256 = "0czj44ivvhh26w69w6grv26sq4b2rbcphsgs5hjga8wdnw63yxmd"; }; dependencies = []; @@ -842,11 +853,11 @@ rec { }; vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-startify-2016-07-01"; + name = "vim-startify-2016-07-21"; src = fetchgit { url = "git://github.com/mhinz/vim-startify"; - rev = "84a296eb5c36dc263ab67db3202e57fa783473b0"; - sha256 = "0pv15n8mpzgkp7b0fqpjbv24yn8fswwryxi6lzavjhrbqzmv7mxw"; + rev = "3f7b8d7b5e8b9f7670f7bcfab3596cb72930ca5e"; + sha256 = "00shnn7wmi3y3354ppd4dgjkxzdnj6cc9wa5sp998y7jlxnc84i9"; }; dependencies = []; @@ -897,11 +908,11 @@ rec { }; shabadou-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "shabadou-vim-2014-07-27"; + name = "shabadou-vim-2016-07-19"; src = fetchgit { url = "git://github.com/osyo-manga/shabadou.vim"; - rev = "c5af30bb0c028d53cfd89e00cab636c844034a9a"; - sha256 = "1rjdbjsyhs514cqysrr4cr3qva6v1nixjwdmg3j1jlkjbs5glbir"; + rev = "7d4bfed1ea8985ae125df3d1403cc19e252443e1"; + sha256 = "1kvik1yf7yjg9jdmdw38yhkksxg0n3nry02banwik7wgjnpvg870"; }; dependencies = []; @@ -952,33 +963,33 @@ rec { }; neoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neoformat-2016-05-25"; + name = "neoformat-2016-07-20"; src = fetchgit { url = "git://github.com/sbdchd/neoformat"; - rev = "d74e8d5b338219fe2ab6e8b5bfdaaf653101ed21"; - sha256 = "0yiq519x99vhl217504pv57lpfwz916r1fq0m3mr33pv0g1kx6c5"; + rev = "3ce811e317512bbdfa4be8bc5c78c253301854c5"; + sha256 = "07ycc0n1y9qrgv17ykid2nnrw984hwswisjijhpnfmpqkjrxg662"; }; dependencies = []; }; vim-polyglot = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-polyglot-2016-07-05"; + name = "vim-polyglot-2016-07-26"; src = fetchgit { url = "git://github.com/sheerun/vim-polyglot"; - rev = "1422f7a75ce0b382d601238c5979b04473b9021e"; - sha256 = "0jqb75lrf75br9wg95cxcy3aal1bk929881gy4ly1n0r6fv96yz1"; + rev = "3019afa721b893ebfe130eb4f955bc4c0c20ec23"; + sha256 = "1f463w66k6brzq3qa8a3xhz2n6xgkri451fclrz2qp41x0bdwjic"; }; dependencies = []; }; neocomplete-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neocomplete-vim-2016-06-26"; + name = "neocomplete-vim-2016-07-23"; src = fetchgit { url = "git://github.com/shougo/neocomplete.vim"; - rev = "71800331948b1bc3c3d79dbbf203a274cd5b6f56"; - sha256 = "132bksxnj50yc2d8hx5sh4xbhzh0shidrvzlalb7gfhkanpg443w"; + rev = "8d2a574c1708080ef1fac3336c99d2d9e1898fce"; + sha256 = "10c885hjp0w50ry1s72zziw7ddvzkri5dbjxa3wnfhisqw7awb8h"; }; dependencies = []; @@ -1007,11 +1018,11 @@ rec { }; unite-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "unite-vim-2016-06-30"; + name = "unite-vim-2016-07-26"; src = fetchgit { url = "git://github.com/shougo/unite.vim"; - rev = "faeff916c6af683990d3afe571047ebdb8bf2a4b"; - sha256 = "1a29h4450z2g3599g8ln1l10h2lfwf7qr5j15hkrg7z23i5xgrj7"; + rev = "47daeed4a6934fbcc418fda8ce19ac702904520f"; + sha256 = "0nl57spp8pbhbad259s5xnihjpnh38sw0rqgg6i80vzmjziy9wiv"; }; dependencies = []; @@ -1037,11 +1048,11 @@ rec { }; vimshell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimshell-vim-2016-06-11"; + name = "vimshell-vim-2016-07-15"; src = fetchgit { url = "git://github.com/shougo/vimshell.vim"; - rev = "d36fde6da558d4cad7a1d03a07fd5e1fcf299141"; - sha256 = "0xx84552k7ziymp81slgxsym1nvzkyyyf1d31y7k8cqbvq87nbn1"; + rev = "c71ffb48b9ea2c718facd2eaad431f59503e58aa"; + sha256 = "0yvj0a50gmss56yb2vkh6f9pyarnv9cnvrrai8pyrb2jxhl3ipv6"; }; dependencies = [ "vimproc-vim" ]; }; @@ -1146,11 +1157,11 @@ rec { }; youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "youcompleteme-2016-07-12"; + name = "youcompleteme-2016-07-23"; src = fetchgit { url = "git://github.com/valloric/youcompleteme"; - rev = "d5610e577c0f1f0bb8bb22d8bbbd25be11327391"; - sha256 = "1c2001ywj0zczhpzm5iahyb6rg7yjbgljqpnwfr9f7fa3y363cgk"; + rev = "9968a43f7ec058298667c2c56ca86cfbbf1dac51"; + sha256 = "17fxlflzggzx0mzsbmgvhp7dmkrx760w2pkais2vkafk3xdr1yr7"; }; dependencies = []; buildInputs = [ @@ -1189,11 +1200,11 @@ rec { }; vim-airline-themes = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-airline-themes-2016-07-08"; + name = "vim-airline-themes-2016-07-19"; src = fetchgit { url = "git://github.com/vim-airline/vim-airline-themes"; - rev = "aa95f935047323dbcbe2fed210bd3a0356a3c32b"; - sha256 = "0mz1wb8bwcyd21wcvkdd58dbga78pdrcxnxwmvf0pi8ywix7aw01"; + rev = "8b58708ec4318cee43a878ea74f7dedb61c8f07a"; + sha256 = "0wfh8ayrvcl1ysshkfad1kqwgzad35nlxffljb542z3f23n84g86"; }; dependencies = []; @@ -1222,11 +1233,11 @@ rec { }; vim-pandoc-syntax = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-pandoc-syntax-2016-06-14"; + name = "vim-pandoc-syntax-2016-07-23"; src = fetchgit { url = "git://github.com/vim-pandoc/vim-pandoc-syntax"; - rev = "eaf2507e0bd51ec06bc111777376b21da7340d5d"; - sha256 = "0xxsjvzv98wnfzw0j590am8za75y7gr8r480izb3db2z437micw7"; + rev = "e9fb38706fa676320191975abf32b9f25f14b049"; + sha256 = "18423bdw49w4pncl4ivh1fdw41wqdlcgwa3l3c66br1ja917ria7"; }; dependencies = []; @@ -1338,11 +1349,11 @@ rec { }; deoplete-jedi = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "deoplete-jedi-2016-07-12"; + name = "deoplete-jedi-2016-07-18"; src = fetchgit { url = "git://github.com/zchee/deoplete-jedi"; - rev = "3eee7e801723d9c174d801b94b2c2ddcee43ac56"; - sha256 = "0z8766wgam2s2vwp9a3xi9cl5c3sb99iadinzy7c348wx004nkxq"; + rev = "47992e47ff420d9779c1dc4e951dce48a1ae84a4"; + sha256 = "0cirfir1n4c86d82z7lw4wg6i92qzzbjad35imr3f2kkf2fqbn72"; }; dependencies = []; @@ -1502,22 +1513,22 @@ rec { }; tlib = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "tlib-2016-06-28"; + name = "tlib-2016-07-25"; src = fetchgit { url = "git://github.com/tomtom/tlib_vim"; - rev = "5636472e5dba1a4104376ce6bd93cc2546e02483"; - sha256 = "0cjb7q5aa77ff8r503sn2j35x5w80fkgvmv42nrpxqhz0ldkn5vp"; + rev = "e5526d34f36e5b84792a9b866f532e1221b95e33"; + sha256 = "1dmhi4jr0vq879dzs584c01c6g6grk733cfdvq0gcyd20xc9lhn1"; }; dependencies = []; }; undotree = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "undotree-2016-05-16"; + name = "undotree-2016-07-19"; src = fetchgit { url = "git://github.com/mbbill/undotree"; - rev = "97ef890fea5452c1c4c68f0d864c7969d7aba578"; - sha256 = "06mifmfqvzy8af54s0h9hjcmhxgjccikqilfz9l8hn3gdl7ixfix"; + rev = "17dfeb6aeacc40036567d29c691898ac57b09182"; + sha256 = "0xmc95h5nbmjx6hvfd9lvkz8hdp8fw5xm5c7wcyy5f0rg7b6l68x"; }; dependencies = []; @@ -1733,11 +1744,11 @@ rec { }; vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-airline-2016-07-04"; + name = "vim-airline-2016-07-25"; src = fetchgit { url = "git://github.com/vim-airline/vim-airline"; - rev = "4d0c4f6b1e3fee30873b0c9734fbe83f4d74b81c"; - sha256 = "15fdd6i8p7w0xcj5b3zl8nqn7bx9wqg6s7pq9xj32ya7rg49f5bn"; + rev = "4b5441a8f7276689fcd41e3c706eb6a2b68064a3"; + sha256 = "1ckdx8qgdkmx7k7m0wpyrhm6ms574kdykikfdqvbyyin5dg015px"; }; dependencies = []; @@ -1821,44 +1832,44 @@ rec { }; vim-signature = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-signature-2016-07-09"; + name = "vim-signature-2016-07-25"; src = fetchgit { url = "git://github.com/kshenoy/vim-signature"; - rev = "e2fca5f3b0474e7174e08b32c89634ac6f53bfe2"; - sha256 = "0ik68qzx0pqsvsla6y593cwab4iw3xy1sl8kb4kq89lhvv1wgxmg"; + rev = "537651a3a6dac10442f3e5ea2bb55a0bfd3324a6"; + sha256 = "0s0m75h8jqk0jykhhnjpw02ynvxw5pnsyjv0zb7n0azv96dvvznk"; }; dependencies = []; }; vim-signify = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-signify-2016-06-19"; + name = "vim-signify-2016-07-21"; src = fetchgit { url = "git://github.com/mhinz/vim-signify"; - rev = "76bde232d163c99a8e72b517d8ef770b0d79849e"; - sha256 = "1yzq5ll7yx38872mpph976mn9yqyyypfif5vjhgvlk4l2an18qk6"; + rev = "472668fbd286c8f8f3db0024a02056d4c25524b1"; + sha256 = "1lmap4amfrqngqdbp87kf9fhqnpshdacikkr9nkfry8l9mhhyqb9"; }; dependencies = []; }; vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-snippets-2016-07-06"; + name = "vim-snippets-2016-07-25"; src = fetchgit { url = "git://github.com/honza/vim-snippets"; - rev = "d285c86221e917d13c6cbf89f347627ea9fe1796"; - sha256 = "1dxzl2d9kxn7vhxpz0shd2qsn6mgvbj9gn9rym8j9v4wjn2zvqws"; + rev = "8b054b0957c3c17aa458e549c5259ed84604f976"; + sha256 = "0mvawc4kr1r50jvl5khcd9443mnq85nansh0vj7ic4zz4rias8h4"; }; dependencies = []; }; vim-webdevicons = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-webdevicons-2016-06-03"; + name = "vim-webdevicons-2016-07-23"; src = fetchgit { url = "git://github.com/ryanoasis/vim-devicons"; - rev = "0bf80d78cba8603dd4f594f1807cc5bee706db84"; - sha256 = "17r98gh4pk0xdfprjmqzp617szwq4j6yrn6pbx0l1n7k7q5crv89"; + rev = "87ee171b566cfd82bb9bfa3885c8020d83e699aa"; + sha256 = "081srlbxd3aw6hl818i7l31g85w4hsfkz67ga9ihhwjkd94sib4s"; }; dependencies = []; @@ -1907,5 +1918,4 @@ rec { dependencies = []; }; - } diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index bc040271cd96..8f09ea935ed9 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -19,9 +19,9 @@ "extradite" "fugitive" "ghcmod" +"github:907th/vim-auto-save" "github:Chiel92/vim-autoformat" "github:LnL7/vim-nix" -"github:sbdchd/neoformat" "github:Shougo/deoplete.nvim" "github:ajh17/Spacegray.vim" "github:alvan/vim-closetag" @@ -75,6 +75,7 @@ "github:racer-rust/vim-racer" "github:raichoo/purescript-vim" "github:rust-lang/rust.vim" +"github:sbdchd/neoformat" "github:sheerun/vim-polyglot" "github:shougo/neocomplete.vim" "github:shougo/neosnippet-snippets" diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix index 5053ef3d1d2f..63fd17117211 100644 --- a/pkgs/os-specific/linux/hostapd/default.nix +++ b/pkgs/os-specific/linux/hostapd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libnl, openssl, sqlite ? null }: +{ stdenv, fetchurl, fetchpatch, pkgconfig, libnl, openssl, sqlite ? null }: with stdenv.lib; stdenv.mkDerivation rec { @@ -10,6 +10,14 @@ stdenv.mkDerivation rec { sha256 = "0jn77r39ysshkzihv5rjbdajqazci59v2yab4rn05my09najs9wf"; }; + patches = [ + (fetchpatch { + url = "https://raw.githubusercontent.com/voidlinux/void-packages/a7bcbc258ba9884bccde831c0ae2069cade99e41/srcpkgs/wpa_supplicant/patches/patch-src_crypto_tls_openssl_c"; + sha256 = "1ifa2i54a7ijsha197dyldal3m4q5i05ih2sk15f5a5ybb6x7vmp"; + addPrefixes = true; + }) + ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libnl openssl sqlite ]; diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index e563a5bee62c..4dd3444d524e 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.4.14"; + version = "4.4.16"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1yam0lmj465xsdv3h9zkz2ca5j6sdn18ydv8225scq3ig49bllsr"; + sha256 = "18v4n7yypl4c8k69zrnf9g09pilh47y0ciy3mwbksz2kmw4yq573"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-4.5.nix b/pkgs/os-specific/linux/kernel/linux-4.5.nix index 94561ed2e549..63db17790147 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.5.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.5.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.5.6"; + version = "4.5.7"; extraMeta.branch = "4.5"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1bdyviimgnc4zbgd9v1xk87sj9h8cprjykifriddwslqxyr2yh0y"; + sha256 = "0azvh7lf9kak1xcs5f9smlvx4gkf45vyandizmxhx0zyjlhacw60"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-4.6.nix b/pkgs/os-specific/linux/kernel/linux-4.6.nix index c0849942f4f2..0559df72ae6d 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.6.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.6.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.6.4"; + version = "4.6.5"; extraMeta.branch = "4.6"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0zpz29hgwdwkil6rakn08bdq77qjcz8q18qlkfc43s84f4fd8s45"; + sha256 = "1i8ksv8w6dn86q54gzk230gxrylqx3m55x789d29q5balg456bby"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix index c0849942f4f2..0559df72ae6d 100644 --- a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix +++ b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.6.4"; + version = "4.6.5"; extraMeta.branch = "4.6"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0zpz29hgwdwkil6rakn08bdq77qjcz8q18qlkfc43s84f4fd8s45"; + sha256 = "1i8ksv8w6dn86q54gzk230gxrylqx3m55x789d29q5balg456bby"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 085bbef73956..e538a527f507 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -93,9 +93,9 @@ rec { grsecurity_4_4 = throw "grsecurity stable is no longer supported"; grsecurity_testing = grsecPatch - { kver = "4.6.4"; - grrev = "201607242014"; - sha256 = "1imzz4m1a6i7199plwj264izj8xvvx7r09v3s50rrb17jcsrfiss"; + { kver = "4.6.5"; + grrev = "201607272152"; + sha256 = "120rj3cpvbchihj3w3i9j2fxvap3270kfxjfznw2ljglzf7pi8zc"; }; # This patch relaxes grsec constraints on the location of usermode helpers, diff --git a/pkgs/os-specific/linux/rewritefs/default.nix b/pkgs/os-specific/linux/rewritefs/default.nix index e0f39a558a08..362f3edbc92a 100644 --- a/pkgs/os-specific/linux/rewritefs/default.nix +++ b/pkgs/os-specific/linux/rewritefs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "rewritefs-${version}"; - version = "2016-02-08"; + version = "2016-07-27"; src = fetchFromGitHub { owner = "sloonz"; repo = "rewritefs"; - rev = "3ac0d1789bb9d48dbeddc6721d00eef19d1dc956"; - sha256 = "0bj8mq5hd52afmy01dyhqsx2rby7injhg96x9z3gyv0r90wa59bh"; + rev = "fe19d389746bdffcc1cc7b3e3156dbacd04b4e9b"; + sha256 = "15bcxprkxf0xqxljsqhb0jpi7p1vwqcb00sjs7nzrj7vh2p7mqla"; }; buildInputs = [ pkgconfig fuse pcre ]; diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 1dcbb8d8e18c..eff515c3dad1 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -10,14 +10,14 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - version = "230"; + version = "231"; name = "systemd-${version}"; src = fetchFromGitHub { owner = "NixOS"; repo = "systemd"; - rev = "81d5aaac06b43fd72f5ab02734a17cbfb55d1f5b"; - sha256 = "1ig7jwmvaa1r4qlngjpnvvvvxhmzbxr171d257q4ryf87l93g1an"; + rev = "124564dd451349ec12673a7d4836b4a7a2f8fb4e"; + sha256 = "021b7filp1dlhic1iv54b821w7mj5595njvzns939pmn636ry4m5"; }; /* gave up for now! diff --git a/pkgs/os-specific/linux/tiptop/default.nix b/pkgs/os-specific/linux/tiptop/default.nix new file mode 100644 index 000000000000..b1b230b8ba7c --- /dev/null +++ b/pkgs/os-specific/linux/tiptop/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, fetchpatch, libxml2, ncurses, bison, flex }: + +stdenv.mkDerivation rec { + name = "tiptop-${version}"; + version = "2.3"; + + src = fetchurl { + url = "${meta.homepage}/releases/${name}.tar.gz"; + sha256 = "1jhqmcgx664ygayw471cg05bxc4ikxn35ccyiswymjhanicfj1rz"; + }; + + patches = [(fetchpatch { + name = "reproducibility.patch"; + url = "http://anonscm.debian.org/cgit/collab-maint/tiptop.git/plain/debian/" + + "patches/0001-fix-reproducibility-of-build-process.patch?id=c777d0d5803"; + sha256 = "116l7n3nl9lj691i7j8x0d0za1i6zpqgghw5d70qfpb17c04cblp"; + })]; + + postPatch = '' + substituteInPlace ./configure --replace -lcurses -lncurses + ''; + + nativeBuildInputs = [ flex bison ]; + buildInputs = [ libxml2 ncurses ]; + + NIX_CFLAGS_COMPILE = [ "-I${libxml2.dev}/include/libxml2" ]; + + meta = with stdenv.lib; { + description = "Performance monitoring tool for Linux"; + homepage = http://tiptop.gforge.inria.fr; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.vcunat ]; + }; +} + diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index c023e4f3d6db..4ade0af9815a 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchgit, libmnl, kernel ? null }: let - name = "wireguard-${version}"; + name = "wireguard-unstable-${version}"; - version = "20160708"; + version = "2016-07-22"; src = fetchgit { url = "https://git.zx2c4.com/WireGuard"; - rev = "dcc2583fe0618931e51aedaeeddde356d123acb2"; - sha256 = "1ciyjpp8c3fv95y1cypk9qyqynp8cqyh2676afq2hd33110d37ni"; + rev = "8e8bf6f848c324603827c0e57f0856d5866ac32d"; + sha256 = "11qrf9fxm6mkwjnjq7dgbisdric5w22cyfkqc6zx9fla2dz99mxk"; }; meta = with stdenv.lib; { diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix index 1d9d9772706c..c576bcf87369 100644 --- a/pkgs/servers/emby/default.nix +++ b/pkgs/servers/emby/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "emby-${version}"; - version = "3.0.5986"; + version = "3.0.6020"; src = fetchurl { url = "https://github.com/MediaBrowser/Emby/archive/${version}.tar.gz"; - sha256 = "0lccyvwk9pm9vn3fg4pa9956f4xn6fcqzlyj8rkxgwf7avzibxix"; + sha256 = "1hpzprhvwwrxjx3qijwvcnjprvx9g58idqnms7d9qql53a20scaq"; }; propagatedBuildInputs = with pkgs; [ diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 95d32aa1bdda..96f874139d51 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -27,7 +27,7 @@ buildPythonApplication rec { blist canonicaljson daemonize dateutil frozendict pillow pybcrypt pyasn1 pydenticon pymacaroons-pynacl pynacl pyopenssl pysaml2 pytz requests2 service-identity signedjson systemd twisted ujson unpaddedbase64 pyyaml - matrix-angular-sdk bleach netaddr jinja2 psycopg2 + matrix-angular-sdk bleach netaddr jinja2 psycopg2 python.modules.curses ]; # Checks fail because of Tox. @@ -41,6 +41,6 @@ buildPythonApplication rec { homepage = https://matrix.org; description = "Matrix reference homeserver"; license = licenses.asl20; - maintainers = [ maintainers.ralith ]; + maintainers = [ maintainers.ralith maintainers.roblabla ]; }; } diff --git a/pkgs/servers/search/elasticsearch/2.x.nix b/pkgs/servers/search/elasticsearch/2.x.nix index 9495106ea00a..a9f125941884 100644 --- a/pkgs/servers/search/elasticsearch/2.x.nix +++ b/pkgs/servers/search/elasticsearch/2.x.nix @@ -3,12 +3,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "2.3.1"; + version = "2.3.4"; name = "elasticsearch-${version}"; src = fetchurl { url = "https://download.elasticsearch.org/elasticsearch/release/org/elasticsearch/distribution/tar/elasticsearch/${version}/${name}.tar.gz"; - sha256 = "1fqf24bv4jfxai507jh91zm94dp1j8kmygljvpy7414f0drjw2gh"; + sha256 = "0vphyqhna510y8bcihlmz3awzszgyfpmzrfcy548a2pd9mghq7ip"; }; patches = [ ./es-home-2.x.patch ]; diff --git a/pkgs/servers/sql/mysql/5.1.x.nix b/pkgs/servers/sql/mysql/5.1.x.nix deleted file mode 100644 index 017c99b01d02..000000000000 --- a/pkgs/servers/sql/mysql/5.1.x.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ stdenv, fetchurl, ps, ncurses, zlib, perl, openssl }: - -# Note: zlib is not required; MySQL can use an internal zlib. - -stdenv.mkDerivation rec { - name = "mysql-5.1.73"; - - src = fetchurl { - url = "mirror://mysql/MySQL-5.1/${name}.tar.gz"; - sha256 = "1dfwi4ck0vq6sdci6gz0031s7zz5lc3pddqlgm0292s00l9y5sq5"; - }; - - buildInputs = [ ncurses zlib perl openssl ] ++ stdenv.lib.optional stdenv.isLinux ps; - - configureFlags = [ - "--enable-thread-safe-client" - "--with-ssl=${openssl.dev}" - "--with-embedded-server" - "--with-plugins=max-no-ndb" - "--with-unix-socket-path=/run/mysqld/mysqld.sock" - ] ++ stdenv.lib.optional (stdenv.system == "x86_64-linux") " --with-lib-ccflags=-fPIC"; - - NIX_CFLAGS_COMPILE = if stdenv.system == "x86_64-linux" then "-fPIC" else ""; - NIX_CFLAGS_CXXFLAGS = if stdenv.system == "x86_64-linux" then "-fPIC" else ""; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; - - patches = [ ./abi_check.patch ]; - - postInstall = - '' - ln -s mysqld_safe $out/bin/mysqld - rm -rf $out/mysql-test $out/sql-bench $out/share/info - ''; - - passthru.mysqlVersion = "5.1"; - - meta = { - homepage = http://www.mysql.com/; - description = "The world's most popular open source database"; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 63e628bf29e1..4a2ac2469d82 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -556,17 +556,6 @@ let meta.platforms = stdenv.lib.platforms.unix; }) // {inherit ;}; - glamoregl = (mkDerivation "glamoregl" { - name = "glamor-egl-0.6.0"; - builder = ./builder.sh; - src = fetchurl { - url = mirror://xorg/individual/driver/glamor-egl-0.6.0.tar.bz2; - sha256 = "1jg5clihklb9drh1jd7nhhdsszla6nv7xmbvm8yvakh5wrb1nlv6"; - }; - buildInputs = [pkgconfig dri2proto xorgserver ]; - meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit dri2proto xorgserver ;}; - glproto = (mkDerivation "glproto" { name = "glproto-1.4.17"; builder = ./builder.sh; @@ -1718,9 +1707,9 @@ let url = mirror://xorg/individual/driver/xf86-video-ati-7.7.0.tar.bz2; sha256 = "1hy1n8an98mflfbdcb3q7wv59x971j7nf9zhivf90p0lgdbiqkc4"; }; - buildInputs = [pkgconfig fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; + buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; + }) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; xf86videochips = (mkDerivation "xf86videochips" { name = "xf86-video-chips-1.2.6"; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index fdf2a44210b8..e16e53fe8818 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -41,10 +41,6 @@ in ''; }; - glamoregl = attrs: attrs // { - installFlags = "sdkdir=\${out}/include/xorg configdir=\${out}/share/X11/xorg.conf.d"; - }; - imake = attrs: attrs // { inherit (xorg) xorgcffiles; x11BuildHook = ./imake.sh; @@ -324,7 +320,7 @@ in }; xf86videoati = attrs: attrs // { - NIX_CFLAGS_COMPILE = "-I${xorg.glamoregl}/include/xorg"; + NIX_CFLAGS_COMPILE = "-I${xorg.xorgserver}/include/xorg"; }; xf86videonv = attrs: attrs // { @@ -418,7 +414,7 @@ in then { outputs = [ "dev" "out" ]; buildInputs = [ makeWrapper ] ++ commonBuildInputs; - propagatedBuildInputs = [ libpciaccess ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [ + propagatedBuildInputs = [ libpciaccess args.epoxy ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [ args.udev ]; patches = commonPatches; @@ -428,6 +424,7 @@ in "--enable-xcsecurity" # enable SECURITY extension "--with-default-font-path=" # there were only paths containing "${prefix}", # and there are no fonts in this package anyway + "--enable-glamor" ]; postInstall = '' rm -fr $out/share/X11/xkb/compiled diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 06a1699017ff..3dae9846335d 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -130,7 +130,6 @@ mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2 mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ati-7.7.0.tar.bz2 -mirror://xorg/individual/driver/glamor-egl-0.6.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-nouveau-1.0.12.tar.bz2 mirror://xorg/individual/driver/xf86-video-chips-1.2.6.tar.bz2 mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2 diff --git a/pkgs/shells/pash/default.nix b/pkgs/shells/pash/default.nix index 0b424c897771..78d508840ba8 100644 --- a/pkgs/shells/pash/default.nix +++ b/pkgs/shells/pash/default.nix @@ -2,13 +2,13 @@ buildDotnetPackage rec { baseName = "pash"; - version = "git-2015-11-06"; + version = "git-2016-07-06"; src = fetchFromGitHub { owner = "Pash-Project"; repo = "Pash"; - rev = "50695a28eaf6c8cbfdc8ecddd91923c64e07b618"; - sha256 = "17hs1f6ayk9qyyh1xsydk46n6na7flh2kbd36dynk86bnda5d3bn"; + rev = "8d6a48f5ed70d64f9b49e6849b3ee35b887dc254"; + sha256 = "0c4wa8qi1zs01p9ck171jkw0n1rsymsrhpsb42gl7warwhpmv59f"; }; preConfigure = "rm -rvf $src/Source/PashConsole/bin/*"; @@ -18,7 +18,7 @@ buildDotnetPackage rec { meta = with stdenv.lib; { description = "An open source implementation of Windows PowerShell"; homepage = https://github.com/Pash-Project/Pash; - maintainers = [ maintainers.fornever ]; + maintainers = [ maintainers.fornever maintainers.vrthra ]; platforms = platforms.all; license = with licenses; [ bsd3 gpl3 ]; }; diff --git a/pkgs/tools/X11/sct/default.nix b/pkgs/tools/X11/sct/default.nix index 2eed4335af12..1890e9c5266b 100644 --- a/pkgs/tools/X11/sct/default.nix +++ b/pkgs/tools/X11/sct/default.nix @@ -5,6 +5,14 @@ stdenv.mkDerivation rec { src = fetchurl { url = http://www.tedunangst.com/flak/files/sct.c; sha256 = "01f3ndx3s6d2qh2xmbpmhd4962dyh8yp95l87xwrs4plqdz6knhd"; + + # Discussion regarding the checksum and the source code can be found in issue #17163 + # The code seems unmaintained, yet an unknown (probably small change) in the code caused + # failed builds as the checksum had changed. + # The checksum is updated for now, however, this is unpractical and potentially unsafe + # so any future changes might warrant a fork of the (feature complete) project. + # The code is under public domain. + }; phases = ["patchPhase" "buildPhase" "installPhase"]; patchPhase = '' diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix index ccc87a231a16..1e07b4114a55 100644 --- a/pkgs/tools/archivers/unrar/default.nix +++ b/pkgs/tools/archivers/unrar/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "unrar-${version}"; - version = "5.4.2"; + version = "5.4.4"; src = fetchurl { url = "http://www.rarlab.com/rar/unrarsrc-${version}.tar.gz"; - sha256 = "1ggiad65j8kzhixrgvmda32khaqs8p0pqcdpwarn1b6vmfl5y7fr"; + sha256 = "10rdbp19mcblgzhs9xh3lr1d1x0n1clyc46flg21ic3427b6assm"; }; postPatch = '' diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-ecm.patch b/pkgs/tools/inputmethods/fcitx/fcitx-ecm.patch deleted file mode 100644 index 8a886f2bc78e..000000000000 --- a/pkgs/tools/inputmethods/fcitx/fcitx-ecm.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index fd54ad8..ebb33d0 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -5,8 +5,7 @@ project(fcitx) - set(version 4.2.9) - - --find_package(ECM 0.0.11 REQUIRED NO_MODULE) --set(CMAKE_MODULE_PATH "${ECM_MODULE_PATH}" "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH}) -+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH}) - set(CMAKE_AUTOMOC_RELAXED_MODE TRUE) - - set_property(GLOBAL PROPERTY "__FCITX_INTERNAL_BUILD" On) ---- a/cmake/FindXKBCommon.cmake -+++ b/cmake/FindXKBCommon.cmake -@@ -1,5 +1,5 @@ - --include(ECMFindModuleHelpersStub) -+include(ECMFindModuleHelpers) - - ecm_find_package_version_check(XKBCommon) - --- -2.8.0 diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-qt5-ecm.patch b/pkgs/tools/inputmethods/fcitx/fcitx-qt5-ecm.patch deleted file mode 100644 index 8fe100dd3b24..000000000000 --- a/pkgs/tools/inputmethods/fcitx/fcitx-qt5-ecm.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b8e729a..ebd3603 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -5,9 +5,7 @@ project(fcitx-qt5) - set(FcitxQt5_VERSION 1.0.0) - set(REQUIRED_QT_VERSION 5.1.0) - --find_package(ECM 1.4.0 REQUIRED NO_MODULE) -- --set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) -+set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) - - include(GNUInstallDirs) - include(FeatureSummary) -diff --git a/cmake/FindXKBCommon.cmake b/cmake/FindXKBCommon.cmake -index a645584..de0007d 100644 ---- a/cmake/FindXKBCommon.cmake -+++ b/cmake/FindXKBCommon.cmake -@@ -1,5 +1,5 @@ - --include(ECMFindModuleHelpersStub) -+include(ECMFindModuleHelpers) - - ecm_find_package_version_check(XKBCommon) - --- -2.8.0 - diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix index fc9dd1e6a253..3f421e327d71 100644 --- a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix +++ b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, cmake, fcitx, pkgconfig, qtbase, kde5 }: +{ stdenv, lib, fetchurl, cmake, fcitx, pkgconfig, qtbase, extra-cmake-modules }: stdenv.mkDerivation rec { name = "fcitx-qt5-${version}"; @@ -9,19 +9,9 @@ stdenv.mkDerivation rec { sha256 = "1pj1b04n8r4kl7jh1qdv0xshgzb3zrmizfa3g5h3yk589h191vwc"; }; - # The following is to not have a dependency on kde5 so the plugin can be part of qt5LibsFun - postUnpack = '' - ${lib.concatMapStrings (f: '' - ln -s ${kde5.extra-cmake-modules}/share/ECM/modules/${f} $sourceRoot/cmake/ - '') - [ "ECMFindModuleHelpers.cmake" "ECMGenerateHeaders.cmake" - "ECMPackageConfigHelpers.cmake" "ECMQueryQmake.cmake" - "ECMSetupVersion.cmake" "ECMVersionHeader.h.in" ]} - ''; - - patches = [ ./fcitx-qt5-ecm.patch ]; + nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig ]; - buildInputs = [ cmake fcitx pkgconfig qtbase ]; + buildInputs = [ fcitx qtbase ]; preInstall = '' substituteInPlace platforminputcontext/cmake_install.cmake \ diff --git a/pkgs/tools/inputmethods/fcitx/unwrapped.nix b/pkgs/tools/inputmethods/fcitx/unwrapped.nix index ba3a3f76ed93..c489b3e4ed74 100644 --- a/pkgs/tools/inputmethods/fcitx/unwrapped.nix +++ b/pkgs/tools/inputmethods/fcitx/unwrapped.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, cmake, intltool, gettext , libxml2, enchant, isocodes, icu, libpthreadstubs , pango, cairo, libxkbfile, libXau, libXdmcp, libxkbcommon -, dbus, gtk2, gtk3, qt4, kde5 +, dbus, gtk2, gtk3, qt4, extra-cmake-modules }: stdenv.mkDerivation rec { @@ -13,22 +13,16 @@ stdenv.mkDerivation rec { sha256 = "0xvcmm4yi7kagf55d0yl3ql5ssbkm9410fwbz3kd988pchichdsk"; }; - postUnpack = '' - ln -s ${kde5.extra-cmake-modules}/share/ECM/modules/ECMFindModuleHelpers.cmake \ - $sourceRoot/cmake/ - ''; - - patches = [ ./fcitx-ecm.patch ]; - postPatch = '' substituteInPlace src/frontend/qt/CMakeLists.txt \ --replace $\{QT_PLUGINS_DIR} $out/lib/qt4/plugins ''; + nativeBuildInputs = [ cmake extra-cmake-modules intltool pkgconfig ]; + buildInputs = [ - cmake enchant gettext isocodes pkgconfig intltool icu - libpthreadstubs libXau libXdmcp libxkbfile libxkbcommon libxml2 - dbus cairo gtk2 gtk3 pango qt4 + enchant gettext isocodes icu libpthreadstubs libXau libXdmcp libxkbfile + libxkbcommon libxml2 dbus cairo gtk2 gtk3 pango qt4 ]; cmakeFlags = '' diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix index f10db80f71f3..be908b162c32 100644 --- a/pkgs/tools/misc/bdf2psf/default.nix +++ b/pkgs/tools/misc/bdf2psf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "bdf2psf-${version}"; - version = "1.146"; + version = "1.147"; src = fetchurl { url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb"; - sha256 = "0lv77wl8vmjaish3v3gsaxb34hv8lcqarcm0mhl87ys37c1lr31x"; + sha256 = "0nz1ymf9yn8aw2va7mhnzz2y5pf6r651sap8k09r92h1224i0wbj"; }; buildInputs = [ dpkg ]; diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix index 14d1417e5a42..62f8d31ee7ea 100644 --- a/pkgs/tools/misc/exa/default.nix +++ b/pkgs/tools/misc/exa/default.nix @@ -6,7 +6,7 @@ buildRustPackage rec { name = "exa-${version}"; version = "2016-04-20"; - depsSha256 = "0dm8zaxy29pfbq68ysssab9i06sj4azgi3vib9617rklg7w3hdmk"; + depsSha256 = "0nyrdl57nhr3lxqs3gaij3mdmlrm0z52qv6mznvgw0ziwqmlq5w1"; src = fetchFromGitHub { owner = "ogham"; diff --git a/pkgs/tools/misc/logstash/default.nix b/pkgs/tools/misc/logstash/default.nix index 289d57f88c06..e8f3ccf747d6 100644 --- a/pkgs/tools/misc/logstash/default.nix +++ b/pkgs/tools/misc/logstash/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "1.5.3"; + version = "2.3.4"; name = "logstash-${version}"; src = fetchurl { url = "https://download.elasticsearch.org/logstash/logstash/logstash-${version}.tar.gz"; - sha256 = "1an476k4q2shdxvhcx4fzbrcpk6isjrrvzlb6ivxfqg5fih3cg7b"; + sha256 = "10wm4f5ygzifk84c1n9yyj285ccn2zd2m61y6hyf6wirvhys0qkz"; }; dontBuild = true; diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index d6bb00eeb640..023498de371c 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl, makeWrapper, procps }: stdenv.mkDerivation rec { - name = "parallel-20160622"; + name = "parallel-20160722"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "1axng9bwapmb0vrrv67pp787gv7r5g02zyrfwnrhpxhi8zmm1jmg"; + sha256 = "e391ebd081e8ba13e870be68106d1beb5def2b001fa5881f46df0ab95304f521"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/networking/cmst/default.nix b/pkgs/tools/networking/cmst/default.nix index d9c6c2630fa6..08bdb052d639 100644 --- a/pkgs/tools/networking/cmst/default.nix +++ b/pkgs/tools/networking/cmst/default.nix @@ -1,16 +1,21 @@ { stdenv, fetchFromGitHub, qtbase, qmakeHook, makeWrapper, libX11 }: stdenv.mkDerivation rec { - name = "cmst-2016.01.28"; + name = "cmst-${version}"; + version = "2016.04.03"; src = fetchFromGitHub { - sha256 = "1zf4jnrnbi05mrq1fnsji5zx60h1knrkr64pwcz2c7q8p59k4646"; - rev = name; - repo = "cmst"; - owner = "andrew-bibb"; + repo = "cmst"; + owner = "andrew-bibb"; + rev = name; + sha256 = "1334ynhq1lxcfqln3bq17hy1awyfnn3zhzpsnymlyp0z3h4ydpp9"; }; - buildInputs = [ qtbase makeWrapper qmakeHook ]; + nativeBuildInputs = [ makeWrapper qmakeHook ]; + + buildInputs = [ qtbase ]; + + enableParallelBuilding = true; preConfigure = '' substituteInPlace ./cmst.pro \ diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index f2e6117966f0..eaf427d61a36 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -18,11 +18,11 @@ assert scpSupport -> libssh2 != null; assert c-aresSupport -> c-ares != null; stdenv.mkDerivation rec { - name = "curl-7.47.1"; + name = "curl-7.50.0"; src = fetchurl { url = "http://curl.haxx.se/download/${name}.tar.bz2"; - sha256 = "13z9gba3q2ybp50z0gdkzhwcx9m0i7qkvm278yz4pql2jfml7inx"; + sha256 = "16psxjcl25i7v5x71193nkq2anm5mj8pfziq5iwxnj3znwnzx3b0"; }; outputs = [ "dev" "out" "bin" "man" "docdev" ]; diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix index 4d66565406c2..9f933cc97090 100644 --- a/pkgs/tools/networking/dd-agent/default.nix +++ b/pkgs/tools/networking/dd-agent/default.nix @@ -36,12 +36,20 @@ stdenv.mkDerivation rec { ln -s $out/agent/dogstatsd.py $out/bin/dogstatsd ln -s $out/agent/ddagent.py $out/bin/dd-forwarder + cat > $out/bin/dd-jmxfetch <<EOF + #!/usr/bin/env bash + exec ${python}/bin/python $out/agent/jmxfetch.py $@ + EOF + chmod a+x $out/bin/dd-jmxfetch + wrapProgram $out/bin/dd-forwarder \ --prefix PYTHONPATH : $PYTHONPATH wrapProgram $out/bin/dd-agent \ --prefix PYTHONPATH : $PYTHONPATH wrapProgram $out/bin/dogstatsd \ --prefix PYTHONPATH : $PYTHONPATH + wrapProgram $out/bin/dd-jmxfetch \ + --prefix PYTHONPATH : $PYTHONPATH patchShebangs $out ''; diff --git a/pkgs/tools/networking/dnscrypt-proxy/default.nix b/pkgs/tools/networking/dnscrypt-proxy/default.nix index 985344616e92..3dadbeedd4df 100644 --- a/pkgs/tools/networking/dnscrypt-proxy/default.nix +++ b/pkgs/tools/networking/dnscrypt-proxy/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { license = licenses.isc; maintainers = with maintainers; [ joachifm jgeerds ]; # upstream claims OSX support, but Hydra fails - platforms = with platforms; allBut [ darwin ]; + platforms = with platforms; allBut darwin; }; } diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix index 548fc597e292..42f72ef7e368 100644 --- a/pkgs/tools/networking/offlineimap/default.nix +++ b/pkgs/tools/networking/offlineimap/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pythonPackages, sqlite3 }: pythonPackages.buildPythonApplication rec { - version = "7.0.0"; + version = "7.0.2"; name = "offlineimap-${version}"; namePrefix = ""; @@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication rec { owner = "OfflineIMAP"; repo = "offlineimap"; rev = "v${version}"; - sha256 = "15m0z3y3gxx30b980gym0mnc2icmdy2xy2ckcbmwp97ynm7pmzmp"; + sha256 = "1xwblb1nvqq6gkxjynzsw31xja07qday58x5jqak8sp3d4lqw2h2"; }; doCheck = false; diff --git a/pkgs/tools/networking/shadowsocks-libev/default.nix b/pkgs/tools/networking/shadowsocks-libev/default.nix index eb30ba2368a8..6b4c684834aa 100644 --- a/pkgs/tools/networking/shadowsocks-libev/default.nix +++ b/pkgs/tools/networking/shadowsocks-libev/default.nix @@ -6,12 +6,17 @@ , libev ? null , libsodium ? null , udns ? null +, asciidoc +, xmlto +, docbook_xml_dtd_45 +, docbook_xsl +, libxslt }: let - version = "2.4.7"; - sha256 = "957265cc5339e020d8c8bb7414ab14936e3939dc7355f334aec896ec9b03c6ed"; + version = "2.4.8"; + sha256 = "af3fc3be50fb24dfd1aed8ce34d2d13448735f6181269f54f4860438a1838472"; in @@ -24,7 +29,7 @@ stdenv.mkDerivation rec { inherit sha256; }; - buildInputs = [ zlib ] + buildInputs = [ zlib asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt ] ++ optional (!withMbedTLS) openssl ++ optional withMbedTLS mbedtls ++ optional enableSystemSharedLib [libev libsodium udns]; diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix index e62cce9e4e3e..881362e4acb4 100644 --- a/pkgs/tools/security/clamav/default.nix +++ b/pkgs/tools/security/clamav/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "clamav-${version}"; - version = "0.99.1"; + version = "0.99.2"; src = fetchurl { - url = "mirror://sourceforge/clamav/clamav-${version}.tar.gz"; - sha256 = "12nm4mxzx3qlbm65cadflzncjfkxdfqcp0lch29i5yfk4a8nhi71"; + url = "https://www.clamav.net/downloads/production/${name}.tar.gz"; + sha256 = "0yh2q318bnmf2152g2h1yvzgqbswn0wvbzb8p4kf7v057shxcyqn"; }; buildInputs = [ zlib bzip2 libxml2 openssl ncurses curl libiconv libmilter pcre ]; diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix index 1266e57e76f3..30ce33bd6a51 100644 --- a/pkgs/tools/security/gnupg/21.nix +++ b/pkgs/tools/security/gnupg/21.nix @@ -15,11 +15,11 @@ assert x11Support -> pinentry != null; stdenv.mkDerivation rec { name = "gnupg-${version}"; - version = "2.1.13"; + version = "2.1.14"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "0xcn46vcb5x5qx0bc803vpzhzhnn6wfhp7x71w9n1ahx4ak877ag"; + sha256 = "0hmsiscpdpdqd8kcjpzkz2gzcc3cnrvswk9p1jzi4sivd7lxwl4l"; }; buildInputs = [ diff --git a/pkgs/tools/security/simple-tpm-pk11/default.nix b/pkgs/tools/security/simple-tpm-pk11/default.nix index f22966dca4a1..75886399fdc5 100644 --- a/pkgs/tools/security/simple-tpm-pk11/default.nix +++ b/pkgs/tools/security/simple-tpm-pk11/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, trousers, openssl, opencryptoki, automake, autoconf, libtool }: stdenv.mkDerivation rec { - name = "simple-tpm-pk11-2014-09-25"; + name = "simple-tpm-pk11-2016-07-12"; src = fetchgit { url = "https://github.com/ThomasHabets/simple-tpm-pk11"; - rev = "f26f10e11344560ff6e1479e6795dc0e5dc49a26"; - sha256 = "0546lhxssngpkrhg5kmrvn4bm1s2kyd20kvhz3rfavfrvr72cs9k"; + rev = "6f1f7a6b96ac82965e977cfecb88d930f1d70243"; + sha256 = "06vf3djp29slh7hrh4hlh3npyl277fy7d77jv9mxa1sk1idjklxc"; }; buildInputs = [ trousers openssl opencryptoki automake autoconf libtool ]; diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 6e956b7a7780..4ede689bf972 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "vault-${version}"; - version = "0.5.3"; + version = "0.6.0"; rev = "v${version}"; goPackagePath = "github.com/hashicorp/vault"; @@ -11,6 +11,6 @@ buildGoPackage rec { inherit rev; owner = "hashicorp"; repo = "vault"; - sha256 = "0px9l5zkvqawzsss70g58fx1anrx5zsdgxl6iplv0md111h0d87z"; + sha256 = "0byb91nqrhl7w0rq0ilml1ybamh8w1qga47a790kggsmjhcj9ybx"; }; } diff --git a/pkgs/tools/typesetting/pdf2odt/default.nix b/pkgs/tools/typesetting/pdf2odt/default.nix new file mode 100644 index 000000000000..4f798702101b --- /dev/null +++ b/pkgs/tools/typesetting/pdf2odt/default.nix @@ -0,0 +1,51 @@ +{ stdenv, lib, makeWrapper, fetchFromGitHub +, bc, coreutils, file, gawk, ghostscript, gnused, imagemagick, zip }: + +stdenv.mkDerivation rec { + version = "2014-12-17"; + name = "pdf2odt-${version}"; + + src = fetchFromGitHub { + owner = "gutschke"; + repo = "pdf2odt"; + rev = "master"; + sha256 = "14f9r5f0g6jzanl54jv86ls0frvspka1p9c8dy3fnriqpm584j0r"; + }; + + dontStrip = true; + + nativeBuildInputs = [ makeWrapper ]; + + path = lib.makeBinPath [ + bc + coreutils + file + gawk + ghostscript + gnused + imagemagick + zip + ]; + + patches = [ ./use_mktemp.patch ]; + + installPhase = '' + mkdir -p $out/bin $out/share/doc + + install -m0755 pdf2odt $out/bin/pdf2odt + ln -rs $out/bin/pdf2odt $out/bin/pdf2ods + + install -m0644 README.md LICENSE -t $out/share/doc + + wrapProgram $out/bin/pdf2odt --prefix PATH : ${path} + ''; + + meta = with stdenv.lib; { + description = "PDF to ODT format converter"; + homepage = http://github.com/gutschke/pdf2odt; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ peterhoeg ]; + inherit version; + }; +} diff --git a/pkgs/tools/typesetting/pdf2odt/use_mktemp.patch b/pkgs/tools/typesetting/pdf2odt/use_mktemp.patch new file mode 100644 index 000000000000..1425aa5ae6a3 --- /dev/null +++ b/pkgs/tools/typesetting/pdf2odt/use_mktemp.patch @@ -0,0 +1,19 @@ +diff --git a/pdf2odt b/pdf2odt +index d38bb07..e1ddf05 100755 +--- a/pdf2odt ++++ b/pdf2odt +@@ -173,13 +173,7 @@ if [ -e "${out}" ] && + fi + + # Set up temporary staging directory +-TMPDIR="/tmp/pdf2odt.$$" +-[ \! -e "${TMPDIR}" ] || { +- echo "Staging directory ${TMPDIR} already exists" >&2 +- exit 1 +-} +-trap 'rm -rf "${TMPDIR}"' EXIT INT TERM QUIT HUP +-mkdir -p "${TMPDIR}" ++TMPDIR=$(mktemp -d) + + # Adjust DPI so that the image fits on a letter- or a4-sized page. + function scale() { diff --git a/pkgs/tools/typesetting/psutils/default.nix b/pkgs/tools/typesetting/psutils/default.nix new file mode 100644 index 000000000000..25f12838be08 --- /dev/null +++ b/pkgs/tools/typesetting/psutils/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, perl }: + +stdenv.mkDerivation rec { + name = "psutils-17"; + + src = fetchurl { + url = "ftp://ftp.knackered.org/pub/psutils/psutils-p17.tar.gz"; + sha256 = "1r4ab1fvgganm02kmm70b2r1azwzbav2am41gbigpa2bb1wynlrq"; + }; + + configurePhase = '' + sed -e 's,/usr/local/bin/perl,${perl}/bin/perl,' \ + -e "s,/usr/local,$out," \ + Makefile.unix > Makefile + ''; + + preInstall = '' + mkdir -p $out/bin $out/share/man/man1 + ''; + + meta = with stdenv.lib; { + description = "Collection of useful utilities for manipulating PS documents"; + homepage = http://knackered.knackered.org/angus/psutils/; + license = licenses.bsd3; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 866e156540f3..5119c077f943 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -672,6 +672,8 @@ in catdoc = callPackage ../tools/text/catdoc { }; + catclock = callPackage ../applications/misc/catclock { }; + cdemu-daemon = callPackage ../misc/emulators/cdemu/daemon.nix { }; cdemu-client = callPackage ../misc/emulators/cdemu/client.nix { }; @@ -821,6 +823,8 @@ in interlock = callPackage ../servers/interlock {}; + long-shebang = callPackage ../misc/long-shebang {}; + mathics = pythonPackages.mathics; mcrl = callPackage ../tools/misc/mcrl { }; @@ -2174,6 +2178,8 @@ in kalibrate-rtl = callPackage ../tools/misc/kalibrate-rtl { }; + kakoune = callPackage ../applications/editors/kakoune { }; + kbdd = callPackage ../applications/window-managers/kbdd { }; kdbplus = callPackage_i686 ../applications/misc/kdbplus { }; @@ -3003,6 +3009,8 @@ in pdf2djvu = callPackage ../tools/typesetting/pdf2djvu { }; + pdf2odt = callPackage ../tools/typesetting/pdf2odt { }; + pdf2svg = callPackage ../tools/graphics/pdf2svg { }; pdfjam = callPackage ../tools/typesetting/pdfjam { }; @@ -3154,6 +3162,8 @@ in pstoedit = callPackage ../tools/graphics/pstoedit { }; + psutils = callPackage ../tools/typesetting/psutils { }; + pv = callPackage ../tools/misc/pv { }; pwgen = callPackage ../tools/security/pwgen { }; @@ -5961,6 +5971,8 @@ in tcl-8_5 = callPackage ../development/interpreters/tcl/8.5.nix { }; tcl-8_6 = callPackage ../development/interpreters/tcl/8.6.nix { }; + wasm = callPackage ../development/interpreters/wasm { }; + xulrunner = callPackage ../development/interpreters/xulrunner { inherit (gnome) libIDL; inherit (pythonPackages) pysqlite; @@ -6224,6 +6236,9 @@ in cmakeWithGui = self.cmakeCurses.override { useQt4 = true; }; + # Does not actually depend on Qt 5 + extra-cmake-modules = qt5.ecmNoHooks; + coccinelle = callPackage ../development/tools/misc/coccinelle { }; cpptest = callPackage ../development/libraries/cpptest { }; @@ -9066,11 +9081,20 @@ in let imported = import ../development/libraries/qt-5/5.6 { inherit pkgs; }; in recurseIntoAttrs (imported.override (super: qt5LibsFun)); + qt57 = + let imported = import ../development/libraries/qt-5/5.7 { inherit pkgs; }; + in recurseIntoAttrs (imported.override (super: qt5LibsFun)); + qt5 = self.qt56; qt5ct = qt5.callPackage ../tools/misc/qt5ct { }; - qt5LibsFun = self: with self; { + qt5LibsFun = self: with self; + let kdeFrameworks = + import ../development/libraries/kde-frameworks { inherit pkgs; } self; + in { + + inherit kdeFrameworks; accounts-qt = callPackage ../development/libraries/accounts-qt { }; @@ -9090,6 +9114,18 @@ in openbr = callPackage ../development/libraries/openbr { }; + phonon = callPackage ../development/libraries/phonon { + withQt5 = true; + }; + + phonon-backend-gstreamer = callPackage ../development/libraries/phonon/backends/gstreamer.nix { + withQt5 = true; + }; + + phonon-backend-vlc = callPackage ../development/libraries/phonon/backends/vlc.nix { + withQt5 = true; + }; + polkit-qt = callPackage ../development/libraries/polkit-qt-1/qt-5.nix { }; poppler = callPackage ../development/libraries/poppler { @@ -9114,7 +9150,7 @@ in ffmpeg = ffmpeg_2; }); - }; + } // kdeFrameworks; qtEnv = qt5.env; qt5Full = qt5.full; @@ -9514,6 +9550,8 @@ in inherit (pythonPackages) gyp; }; + v8_static = lowPrio (self.v8.override { static = true; }); + vaapiIntel = callPackage ../development/libraries/vaapi-intel { libva = libva-full; # also wants libva-{x11,drm,wayland} }; @@ -9574,6 +9612,7 @@ in webkitgtk24x = callPackage ../development/libraries/webkitgtk/2.4.nix { harfbuzz = harfbuzz-icu; gst-plugins-base = gst_all_1.gst-plugins-base; + inherit (darwin) libobjc; }; webkitgtk212x = callPackage ../development/libraries/webkitgtk/2.12.nix { @@ -10352,10 +10391,6 @@ in hyperdex = callPackage ../servers/nosql/hyperdex { }; - mysql51 = callPackage ../servers/sql/mysql/5.1.x.nix { - ps = procps; /* !!! Linux only */ - }; - mysql55 = callPackage ../servers/sql/mysql/5.5.x.nix { inherit (darwin) cctools; inherit (darwin.apple_sdk.frameworks) CoreServices; @@ -10598,7 +10633,7 @@ in libxslt expat libpng zlib perl mesa_drivers spice_protocol libunwind dbus libuuid openssl gperf m4 libevdev tradcpp libinput mcpp makeWrapper autoreconfHook autoconf automake libtool xmlto asciidoc flex bison python mtdev pixman - cairo; + cairo epoxy; inherit (darwin) apple_sdk cf-private libobjc; bootstrap_cmds = if stdenv.isDarwin then darwin.bootstrap_cmds else null; mesa = mesa_noglu; @@ -11035,8 +11070,6 @@ in linux_4_4 = callPackage ../os-specific/linux/kernel/linux-4.4.nix { kernelPatches = [ kernelPatches.bridge_stp_helper - kernelPatches.qat_common_Makefile - kernelPatches.hiddev_CVE_2016_5829 kernelPatches.ecryptfs_fix_mmap_bug ] ++ lib.optionals ((platform.kernelArch or null) == "mips") @@ -11062,8 +11095,6 @@ in linux_4_6 = callPackage ../os-specific/linux/kernel/linux-4.6.nix { kernelPatches = [ kernelPatches.bridge_stp_helper - kernelPatches.qat_common_Makefile - kernelPatches.hiddev_CVE_2016_5829 ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu @@ -11271,7 +11302,7 @@ in linux_grsec_nixos = callPackage ../build-support/grsecurity { inherit (lib) overrideDerivation; kernel = callPackage ../os-specific/linux/kernel/linux-grsecurity.nix { - kernelPatches = with self.kernelPatches; [ bridge_stp_helper qat_common_Makefile ] + kernelPatches = with self.kernelPatches; [ bridge_stp_helper ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill @@ -11624,6 +11655,8 @@ in # FIXME: `tcp-wrapper' is actually not OS-specific. tcp_wrappers = callPackage ../os-specific/linux/tcp-wrappers { }; + tiptop = callPackage ../os-specific/linux/tiptop { }; + trinity = callPackage ../os-specific/linux/trinity { }; tunctl = callPackage ../os-specific/linux/tunctl { }; @@ -12998,6 +13031,8 @@ in photivo = callPackage ../applications/graphics/photivo { }; + rhythmbox = callPackage ../applications/audio/rhythmbox { }; + wavesurfer = callPackage ../applications/misc/audio/wavesurfer { }; wireshark-cli = callPackage ../applications/networking/sniffers/wireshark { @@ -13833,6 +13868,8 @@ in mopidy-musicbox-webclient = callPackage ../applications/audio/mopidy-musicbox-webclient { }; + motif = callPackage ../development/libraries/motif { }; + mozplugger = callPackage ../applications/networking/browsers/mozilla-plugins/mozplugger {}; mozjpeg = callPackage ../applications/graphics/mozjpeg { }; @@ -14028,9 +14065,7 @@ in ne = callPackage ../applications/editors/ne { }; - nedit = callPackage ../applications/editors/nedit { - motif = lesstif; - }; + nedit = callPackage ../applications/editors/nedit { }; notmuch = callPackage ../applications/networking/mailreaders/notmuch { # No need to build Emacs - notmuch.el works just fine without @@ -14666,6 +14701,8 @@ in syncthing013 = callPackage ../applications/networking/syncthing013 { }; + syncthing-inotify = callPackage ../applications/networking/syncthing/inotify.nix { }; + # linux only by now synergy = callPackage ../applications/misc/synergy { }; @@ -15227,7 +15264,6 @@ in apvlv = callPackage ../applications/misc/apvlv { }; xpdf = callPackage ../applications/misc/xpdf { - motif = lesstif; base14Fonts = "${ghostscript}/share/ghostscript/fonts"; }; @@ -15767,6 +15803,8 @@ in }; solarus = callPackage ../games/solarus { }; + + solarus-quest-editor = qt5.callPackage ../development/tools/solarus-quest-editor { }; # You still can override by passing more arguments. space-orbit = callPackage ../games/space-orbit { }; @@ -15978,7 +16016,6 @@ in libsoup libwnck gtk_doc gnome_doc_utils; }; - gnome3_18 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.18 { }); gnome3_20 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.20 { }); gnome3 = self.gnome3_20; @@ -16259,12 +16296,6 @@ in openjpeg = openjpeg_1; }; - phonon = callPackage ../development/libraries/phonon { }; - - phonon-backend-gstreamer = callPackage ../development/libraries/phonon/backends/gstreamer.nix { }; - - phonon-backend-vlc = callPackage ../development/libraries/phonon/backends/vlc.nix { }; - quassel = callPackage ../applications/networking/irc/quassel/qt-5.nix { monolithic = true; daemon = false; @@ -16307,14 +16338,13 @@ in kde5 = let - frameworks = import ../desktops/kde-5/frameworks { inherit pkgs; }; plasma = import ../desktops/kde-5/plasma { inherit pkgs; }; applications = import ../desktops/kde-5/applications { inherit pkgs; }; merged = self: { plasma = plasma self; - frameworks = frameworks self; + frameworks = qt5.kdeFrameworks; applications = applications self; } - // frameworks self + // qt5.kdeFrameworks // plasma self // applications self // kde5PackagesFun self; @@ -16342,9 +16372,7 @@ in ### SCIENCE/BIOLOGY - alliance = callPackage ../applications/science/electronics/alliance { - motif = lesstif; - }; + alliance = callPackage ../applications/science/electronics/alliance { }; archimedes = callPackage ../applications/science/electronics/archimedes { stdenv = overrideCC stdenv gcc49; @@ -16782,6 +16810,8 @@ in withX = true; }; + scilab-bin = callPackage ../applications/science/math/scilab-bin {}; + scotch = callPackage ../applications/science/math/scotch { }; msieve = callPackage ../applications/science/math/msieve { }; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 1bf3b4c0e61b..d2e3d2b866f9 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -471,6 +471,30 @@ let }; }; + emacs-source-directory = stdenv.mkDerivation { + name = "emacs-source-directory-1.0.0"; + src = emacs.src; + + # We don't want accidentally start bulding emacs one more time + phases = "unpackPhase buildPhase"; + + buildPhase = '' + mkdir -p $out/share/emacs/site-lisp/elpa/emacs-source-directory + cp -a src $out/src + (cd $out/src && ${emacs}/bin/etags *.c *.h) + cat <<EOF > $out/share/emacs/site-lisp/elpa/emacs-source-directory/emacs-source-directory-autoloads.el + (setq source-directory "$out") + (setq find-function-C-source-directory (expand-file-name "src" source-directory)) + EOF + cat <<EOF > $out/share/emacs/site-lisp/elpa/emacs-source-directory/emacs-source-directory-pkg.el + (define-package "emacs-source-directory" "1.0.0" "Make emacs C source code available inside emacs. To use with emacsWithPackages in NixOS" '()) + EOF + ''; + meta = { + description = "Make emacs C source code available inside emacs. To use with emacsWithPackages in NixOS"; + }; + }; + engine-mode = melpaBuild rec { pname = "engine-mode"; version = "1.0.0"; @@ -1445,21 +1469,6 @@ let }; }; - seq = melpaBuild rec { - pname = "seq"; - version = "1.11"; - src = fetchFromGitHub { - owner = "NicolasPetton"; - repo = "${pname}.el"; - rev = version; - sha256 = "18ydaz2y5n7h4wr0dx2k9qbxl0mc50qfwk52ma4amk8nmm1bjwgc"; - }; - meta = { - description = "Sequence manipulation library for Emacs"; - license = gpl3Plus; # probably - }; - }; - shorten = melpaBuild rec { pname = "shorten"; version = circe.version; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7c7a7cb2d448..e87964fd9a6d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14353,13 +14353,18 @@ let self = _self // overrides; _self = with self; { makeMakerFlags = "EXPATLIBPATH=${pkgs.expat.out}/lib EXPATINCPATH=${pkgs.expat.dev}/include"; }; - XMLXPath = buildPerlPackage { - name = "XML-XPath-1.13"; + XMLXPath = buildPerlPackage rec { + name = "XML-XPath-1.37"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSERGEANT/XML-XPath-1.13.tar.gz; - sha256 = "0xjmfwda7m3apj7yrjzmkm4sjwnz4bqyaynzgcwqhx806kgw4j9a"; + url = "mirror://cpan/authors/id/M/MA/MANWAR/${name}.tar.gz"; + sha256 = "b8ae1196184f794528a9727988dce944ecec7155e6ee1c433b17e12737a22725"; + }; + buildInputs = [ PathTiny ]; + propagatedBuildInputs = [ XMLParser ]; + meta = { + description = "Modules for parsing and evaluating XPath statements"; + license = stdenv.lib.licenses.artistic2; }; - propagatedBuildInputs = [XMLParser]; }; XMLXPathEngine = buildPerlPackage { diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 1e042bedb4fd..a0d340826f50 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -236,11 +236,11 @@ let phpcs = pkgs.stdenv.mkDerivation rec { name = "phpcs-${version}"; - version = "2.3.4"; + version = "2.6.0"; src = pkgs.fetchurl { url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcs.phar"; - sha256 = "ce11e02fba30a35a80b691b05be20415eb8b5dea585a4e6646803342b86abb8c"; + sha256 = "02mlv44x508rnkzkwiyh7lg2ah7aqyxcq65q9ycj06czm0xdzs41"; }; phases = [ "installPhase" ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6a103af4015a..76fd4596e545 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1376,7 +1376,7 @@ in modules // { bcdoc s3transfer six - colorama + colorama_3_3 docutils rsa pkgs.groff @@ -1638,6 +1638,26 @@ in modules // { }; }; + backports_abc = buildPythonPackage rec { + name = "backports_abc-${version}"; + version = "0.4"; + + src = pkgs.fetchurl { + url = "mirror://pypi/b/backports_abc/${name}.tar.gz"; + sha256 = "8b3e4092ba3d541c7a2f9b7d0d9c0275b21c6a01c53a61c731eba6686939d0a5"; + }; + + checkPhase = '' + ${python.interpreter} -m unittest discover + ''; + + meta = { + homepage = https://github.com/cython/backports_abc; + license = licenses.psfl; + description = "A backport of recent additions to the 'collections.abc' module"; + }; + }; + backports_shutil_get_terminal_size = if !(pythonOlder "3.3") then null else buildPythonPackage rec { name = "backports.shutil_get_terminal_size-${version}"; version = "1.0.0"; @@ -2639,15 +2659,20 @@ in modules // { bokeh = buildPythonPackage rec { name = "bokeh-${version}"; - version = "0.10.0"; + version = "0.12.1"; src = pkgs.fetchurl { url = "mirror://pypi/b/bokeh/${name}.tar.gz"; - sha256 = "2d8bd8c98e2f62b2a28328d3cc95bfbe257742fa7efc9c382b4c8ae4a141df14"; + sha256 = "06d3ed14308f550376d5b0c7e9f2bacb3ff5bbcceefd7f6369d070de71dfa563"; }; disabled = isPyPy; + # Some test that uses tornado fails + doCheck = false; + + buildInputs = with self; [ mock pytest ]; + propagatedBuildInputs = with self; [ flask jinja2 @@ -2655,7 +2680,8 @@ in modules // { werkzeug itsdangerous dateutil - requests + futures + requests2 six pygments pystache @@ -2669,6 +2695,10 @@ in modules // { ++ optionals ( !isPy3k && !isPyPy ) [ websocket_client ] ++ optionals ( !isPyPy ) [ numpy pandas greenlet ]; + checkPhase = '' + ${python.interpreter} -m unittest discover -s bokeh/tests + ''; + meta = { description = "Statistical and novel interactive HTML plots for Python"; homepage = "http://github.com/bokeh/bokeh"; @@ -3234,11 +3264,11 @@ in modules // { certifi = buildPythonPackage rec { name = "certifi-${version}"; - version = "2015.11.20.1"; + version = "2016.2.28"; src = pkgs.fetchurl { url = "mirror://pypi/c/certifi/${name}.tar.gz"; - sha256 = "05lgwf9rz1kn465azy2bpb3zmpnsn9gkypbhnjlclchv98ssgc1h"; + sha256 = "5e8eccf95924658c97b990b50552addb64f55e1e3dfe4880456ac1f287dc79d0"; }; meta = { @@ -3572,13 +3602,16 @@ in modules // { colorama = buildPythonPackage rec { name = "colorama-${version}"; - version = "0.3.3"; + version = "0.3.7"; src = pkgs.fetchurl { url = "mirror://pypi/c/colorama/${name}.tar.gz"; - sha256 = "eb21f2ba718fbf357afdfdf6f641ab393901c7ca8d9f37edd0bee4806ffa269c"; + sha256 = "e043c8d32527607223652021ff648fbb394d5e19cba9f1a698670b338c9d782b"; }; + # No tests in archive + doCheck = false; + meta = { homepage = https://github.com/tartley/colorama; license = "bsd"; @@ -3586,6 +3619,16 @@ in modules // { }; }; + # Needed for awscli + colorama_3_3 = self.colorama.override rec { + name = "colorama-${version}"; + version = "0.3.3"; + src = pkgs.fetchurl { + url = "mirror://pypi/c/colorama/${name}.tar.gz"; + sha256 = "eb21f2ba718fbf357afdfdf6f641ab393901c7ca8d9f37edd0bee4806ffa269c"; + }; + }; + CommonMark = buildPythonPackage rec { name = "CommonMark-${version}"; @@ -3893,11 +3936,11 @@ in modules // { cython = buildPythonPackage rec { name = "Cython-${version}"; - version = "0.24"; + version = "0.24.1"; src = pkgs.fetchurl { url = "mirror://pypi/C/Cython/${name}.tar.gz"; - sha256 = "1wd3q97gia3zhsgcdlvxh26hkrf3m53i6r1l4g0yya119264vr3d"; + sha256 = "84808fda00508757928e1feadcf41c9f78e9a9b7167b6649ab0933b76f75e7b9"; }; buildInputs = with self; [ pkgs.pkgconfig pkgs.gdb ]; @@ -4950,11 +4993,11 @@ in modules // { datashape = buildPythonPackage rec { name = "datashape-${version}"; - version = "0.5.1"; + version = "0.5.2"; src = pkgs.fetchurl { url = "mirror://pypi/D/DataShape/${name}.tar.gz"; - sha256 = "21c424f11604873da9a36d4c55ef1d15cc3960cd208d7828b82315c494bff96a"; + sha256 = "2356ea690c3cf003c1468a243a9063144235de45b080b3652de4f3d44e57d783"; }; buildInputs = with self; [ pytest mock ]; @@ -6473,6 +6516,37 @@ in modules // { }; + git-up = buildPythonPackage rec { + version = "1.4.0"; + name = "git-up-${version}"; + + src = pkgs.fetchFromGitHub { + owner = "msiemens"; + repo = "PyGitUp"; + rev = "v${version}"; + sha256 = "1g7sxiqg6vxx2jlgg8pg9fqsk1xgvm80d7mcpw8i3mw7r835q4bi"; + }; + + buildInputs = with self; [ pkgs.git nose ]; + propagatedBuildInputs = with self; [ colorama docopt GitPython six termcolor ]; + + # git fails to run as it cannot detect the email address, so we set it + # $HOME is by default not a valid dir, so we have to set that too + # https://github.com/NixOS/nixpkgs/issues/12591 + preCheck = '' + export HOME=$TMPDIR + git config --global user.email "nobody@example.com" + git config --global user.name "Nobody" + ''; + + meta = { + homepage = http://github.com/msiemens/PyGitUp; + description = "A git pull replacement that rebases all local branches when pulling."; + license = licenses.mit; + maintainers = with maintainers; [ peterhoeg ]; + }; + }; + GitPython = buildPythonPackage rec { version = "2.0.2"; name = "GitPython-${version}"; @@ -7962,9 +8036,9 @@ in modules // { }; }; - pytools = buildPythonPackage rec { - name = "pytools-${version}"; - version = "2016.2.1"; + pytools = buildPythonPackage rec { + name = "pytools-${version}"; + version = "2016.2.1"; src = pkgs.fetchFromGitHub { owner = "inducer"; @@ -7983,7 +8057,7 @@ in modules // { ]; meta = { - homepage = https://github.com/inducer/pytools/; + homepage = https://github.com/inducer/pytools/; description = "Miscellaneous Python lifesavers."; license = licenses.mit; maintainers = with maintainers; [ artuuge ]; @@ -12334,13 +12408,13 @@ in modules // { llvmlite = buildPythonPackage rec { name = "llvmlite-${version}"; - version = "0.11.0"; + version = "0.12.1"; disabled = isPyPy; src = pkgs.fetchurl { url = "mirror://pypi/l/llvmlite/${name}.tar.gz"; - sha256 = "1gc2yd4j855fb16nb341lm4z3hd4j40lhswqv116xlg4p5dyxkwk"; + sha256 = "3ce71beebd4cbc7a49abe4eadfc99725477fd43caeb7405650ebb746c7a1d0df"; }; llvm = pkgs.llvm_37; @@ -13957,7 +14031,7 @@ in modules // { nipy = buildPythonPackage rec { version = "0.4.0"; name = "nipy-${version}"; - + disabled = pythonOlder "2.6"; checkPhase = '' # wants to be run in a different directory @@ -14310,12 +14384,12 @@ in modules // { }; numba = buildPythonPackage rec { - version = "0.26.0"; + version = "0.27.0"; name = "numba-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/n/numba/${name}.tar.gz"; - sha256 = "1ai06ks2ly6wcw2fpljmmyr41y9jidds8qingyih8cbq37fpym44"; + sha256 = "5fc8069cdc839b8b44ac6c54260902f60cbd77bd027b20999970a81cce7008ba"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${pkgs.libcxx}/include/c++/v1"; @@ -17228,11 +17302,11 @@ in modules // { praw = buildPythonPackage rec { - name = "praw-3.3.0"; + name = "praw-3.5.0"; src = pkgs.fetchurl { url = "mirror://pypi/p/praw/${name}.zip"; - sha256 = "17s8s4a1yk9rq21f3kmj9k4dbgvfa3650l8b39nhwybvxl3j5nfv"; + sha256 = "1hwdzqbrjdkicqhyxpcpsmld21k0ndpy8d2gk6l5mv9isw3dm8qa"; }; propagatedBuildInputs = with self; [ @@ -17619,28 +17693,25 @@ in modules // { vobject = buildPythonPackage rec { - version = "0.8.1d"; + version = "0.9.2"; name = "vobject-${version}"; src = pkgs.fetchFromGitHub { - owner = "adieu"; + owner = "eventable"; repo = "vobject"; - sha256 = "04fz8g9i9pvrksbpzmp2ci8z34gwjdr7j0f0cxr60v5sdv6v88l9"; - rev = "ef870dfbb7642756d6b691ebf9f52285ec9e504f"; + sha256 = "0zj0wplj8pry98x3g551wdhh12ric7rl6rsd6li23lzdxik82s3g"; + rev = "7f042fdc62c9e9dc29d5f81313b9747cde205670"; }; - disabled = isPy3k || isPyPy; + disabled = isPyPy; propagatedBuildInputs = with self; [ dateutil ]; - patchPhase = '' - # fails due to hash randomization - sed -i 's/RRULE:FREQ=MONTHLY;BYMONTHDAY=-1,-5/RRULE:FREQ=MONTHLY;BYMONTHDAY=.../' test_vobject.py - ''; + checkPhase = "${python.interpreter} tests.py"; meta = { description = "Module for reading vCard and vCalendar files"; - homepage = https://github.com/adieu/vobject/; + homepage = http://eventable.github.io/vobject/; license = licenses.asl20; maintainers = with maintainers; [ DamienCassou ]; }; @@ -18169,11 +18240,11 @@ in modules // { pyfftw = buildPythonPackage rec { name = "pyfftw-${version}"; - version = "0.10.1"; + version = "0.10.4"; src = pkgs.fetchurl { url = "mirror://pypi/p/pyFFTW/pyFFTW-${version}.tar.gz"; - sha256 = "1789k6w17qpn9vknn2sjiwbig6yhfjvzs9fvcpvy3fyf9qala77y"; + sha256 = "739b436b7c0aeddf99a48749380260364d2dc027cf1d5f63dafb5f50068ede1a"; }; buildInputs = [ pkgs.fftw pkgs.fftwFloat pkgs.fftwLongDouble]; @@ -18754,7 +18825,7 @@ in modules // { # SyntaxError Python 3 # https://github.com/defunkt/pystache/issues/181 - disabled = isPy3k; + doCheck = !isPy3k; meta = { description = "A framework-agnostic, logic-free templating system inspired by ctemplate and et"; @@ -20241,11 +20312,11 @@ in modules // { geoalchemy2 = buildPythonPackage rec { name = "GeoAlchemy2-${version}"; - version = "0.3.0.dev1"; + version = "0.3.0"; src = pkgs.fetchurl { url = "mirror://pypi/G/GeoAlchemy2/${name}.tar.gz"; - sha256 = "1j95p860ikpcpcirs5791yjpy8rf18zsz7vvsdy6v3x32hkim0k6"; + sha256 = "0p2h1kgl5b0jz8wadx485vjh1mmm5s67p71yxh9lhp1441hkfswf"; }; propagatedBuildInputs = with self ; [ sqlalchemy shapely ]; @@ -20889,22 +20960,22 @@ in modules // { gfortran = pkgs.gfortran; }; - scipy = self.scipy_0_17; + scipy = self.scipy_0_18; - scipy_0_16 = self.buildScipyPackage rec { - version = "0.16.1"; + scipy_0_17 = self.buildScipyPackage rec { + version = "0.17.1"; src = pkgs.fetchurl { url = "mirror://pypi/s/scipy/scipy-${version}.tar.gz"; - sha256 = "ecd1efbb1c038accb0516151d1e6679809c6010288765eb5da6051550bf52260"; + sha256 = "1b1qpfz2j2rvmlplsjbnznnxnqr9ckbmis506110ii1w07wd4k4w"; }; numpy = self.numpy; }; - scipy_0_17 = self.buildScipyPackage rec { - version = "0.17.1"; + scipy_0_18 = self.buildScipyPackage rec { + version = "0.18.0"; src = pkgs.fetchurl { url = "mirror://pypi/s/scipy/scipy-${version}.tar.gz"; - sha256 = "1b1qpfz2j2rvmlplsjbnznnxnqr9ckbmis506110ii1w07wd4k4w"; + sha256 = "f01784fb1c2bc246d4211f2482ecf4369db5abaecb9d5afb9d94f6c59663286a"; }; numpy = self.numpy; }; @@ -21353,14 +21424,14 @@ in modules // { shapely = buildPythonPackage rec { name = "Shapely-${version}"; - version = "1.5.13"; + version = "1.5.15"; src = pkgs.fetchurl { url = "mirror://pypi/S/Shapely/${name}.tar.gz"; - sha256 = "68f8efb43112e8ef1f7e56e2c9eef64e0cbc1c19528c627696fb07345075a348"; + sha256 = "0lfqxb3kpdn0g9zzlhzg79yc8iyy4fpsk0p5nd80gar1mmhr8pg7"; }; - buildInputs = with self; [ pkgs.geos pkgs.glibcLocales pytest ]; + buildInputs = with self; [ pkgs.geos pkgs.glibcLocales pytest cython ]; propagatedBuildInputs = with self; [ numpy ]; @@ -21372,8 +21443,10 @@ in modules // { sed -i "s|_lgeos = load_dll('geos_c', fallbacks=.*)|_lgeos = load_dll('geos_c', fallbacks=['${pkgs.geos}/lib/libgeos_c.so'])|" shapely/geos.py ''; + # tests/test_voctorized fails because the vectorized extension is not + # available in when running tests checkPhase = '' - py.test $out + py.test --ignore tests/test_vectorized.py ''; meta = { @@ -22307,11 +22380,11 @@ in modules // { sqlalchemy_1_0 = buildPythonPackage rec { name = "SQLAlchemy-${version}"; - version = "1.0.12"; + version = "1.0.14"; src = pkgs.fetchurl { url = "mirror://pypi/S/SQLAlchemy/${name}.tar.gz"; - sha256 = "1l8qclhd0s90w3pvwhi5mjxdwr5j7gw7cjka2fx6f2vqmq7f4yb6"; + sha256 = "1cq52yyplvi1wrvrzn779l9sfsjb158a18xaqbn7z779q4wilkfs"; }; buildInputs = with self; [ nose mock ] @@ -25153,9 +25226,9 @@ in modules // { tornado = buildPythonPackage rec { name = "tornado-${version}"; - version = "4.2.1"; + version = "4.4.1"; - propagatedBuildInputs = with self; [ backports_ssl_match_hostname_3_4_0_2 certifi ]; + propagatedBuildInputs = with self; [ backports_abc backports_ssl_match_hostname_3_4_0_2 certifi singledispatch ]; # We specify the name of the test files to prevent # https://github.com/NixOS/nixpkgs/issues/14634 @@ -25165,7 +25238,7 @@ in modules // { src = pkgs.fetchurl { url = "mirror://pypi/t/tornado/${name}.tar.gz"; - sha256 = "a16fcdc4f76b184cb82f4f9eaeeacef6113b524b26a2cb331222e4a7fa6f2969"; + sha256 = "371d0cf3d56c47accc66116a77ad558d76eebaa8458a6b677af71ca606522146"; }; }; @@ -28805,4 +28878,21 @@ in modules // { --prefix PYTHONPATH : "$PYTHONPATH" ''; }; + + yapf = buildPythonPackage rec { + name = "yapf-${version}"; + version = "0.11.0"; + + meta = { + description = "A formatter for Python code."; + homepage = "https://github.com/google/yapf"; + license = licenses.asl20; + maintainers = with maintainers; [ siddharthist ]; + }; + + src = pkgs.fetchurl { + url = "mirror://pypi/y/yapf/${name}.tar.gz"; + sha256 = "14kb9gxw39zhvrijhp066b4bm6bgv35iw56c394y4dyczpha0dij"; + }; + }; } diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix index fb16530542a3..28a13adf4cf9 100644 --- a/pkgs/top-level/rust-packages.nix +++ b/pkgs/top-level/rust-packages.nix @@ -7,9 +7,9 @@ { runCommand, fetchFromGitHub, git }: let - version = "2016-07-13"; - rev = "8c0d367a18349078cc33df1eed7394fbaa2d602e"; - sha256 = "1r59qvzrr1rmjbq8al0qwkc65nd3n512i4pgn9688192d68cjnl8"; + version = "2016-07-26"; + rev = "b4dbf6af6672b9f1c0f51cdf4e4aeb11664f3f69"; + sha256 = "0hzf2yn5yv6r2h4azx4rsbpab73hg3hvk4n6hqa2jr927v1zd5bv"; src = fetchFromGitHub { inherit rev; |