diff --git a/lib/default.nix b/lib/default.nix
index 09a64f754d8f..632b12510e82 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -1,3 +1,8 @@
+/* Library of low-level helper functions for nix expressions.
+ *
+ * Please implement (mostly) exhaustive unit tests
+ * for new functions in `./tests.nix'.
+ */
let
# trivial, often used functions
diff --git a/lib/licenses.nix b/lib/licenses.nix
index 4d4a3c1a9544..000a55224ea7 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -357,6 +357,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
fullName = "Lucent Public License v1.02";
};
+ miros = {
+ fullname = "MirOS License";
+ url = https://opensource.org/licenses/MirOS;
+ };
+
# spdx.org does not (yet) differentiate between the X11 and Expat versions
# for details see http://en.wikipedia.org/wiki/MIT_License#Various_versions
mit = spdx {
diff --git a/lib/tests.nix b/lib/tests.nix
index 1a9a5accd1c0..d93cadf25335 100644
--- a/lib/tests.nix
+++ b/lib/tests.nix
@@ -277,4 +277,14 @@ runTests {
expected = [ "2001" "db8" "0" "0042" "" "8a2e" "370" "" ];
};
+ testComposeExtensions = {
+ expr = let obj = makeExtensible (self: { foo = self.bar; });
+ f = self: super: { bar = false; baz = true; };
+ g = self: super: { bar = super.baz or false; };
+ f_o_g = composeExtensions f g;
+ composed = obj.extend f_o_g;
+ in composed.foo;
+ expected = true;
+ };
+
}
diff --git a/lib/trivial.nix b/lib/trivial.nix
index 40499b2b5092..62906339e605 100644
--- a/lib/trivial.nix
+++ b/lib/trivial.nix
@@ -30,6 +30,11 @@ rec {
/* boolean “and” */
and = x: y: x && y;
+ /* Convert a boolean to a string.
+ Note that toString on a bool returns "1" and "".
+ */
+ boolToString = b: if b then "true" else "false";
+
/* Merge two attribute sets shallowly, right side trumps left
Example:
@@ -80,6 +85,15 @@ rec {
# argument, but it's nice this way if several uses of `extends` are cascaded.
extends = f: rattrs: self: let super = rattrs self; in super // f self super;
+ # Compose two extending functions of the type expected by 'extends'
+ # into one where changes made in the first are available in the
+ # 'super' of the second
+ composeExtensions =
+ f: g: self: super:
+ let fApplied = f self super;
+ super' = super // fApplied;
+ in fApplied // g self super';
+
# Create an overridable, recursive attribute set. For example:
#
# nix-repl> obj = makeExtensible (self: { })
diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml
index bd999b600133..5fba4c34ec82 100644
--- a/nixos/doc/manual/release-notes/rl-1709.xml
+++ b/nixos/doc/manual/release-notes/rl-1709.xml
@@ -35,6 +35,8 @@ following incompatible changes:
+ Top-level idea package collection was renamed.
+ All JetBrains IDEs are now at jetbrains.
diff --git a/nixos/maintainers/scripts/gce/create-gce.sh b/nixos/maintainers/scripts/gce/create-gce.sh
index 7f8a0d23027a..ef1801fe54be 100755
--- a/nixos/maintainers/scripts/gce/create-gce.sh
+++ b/nixos/maintainers/scripts/gce/create-gce.sh
@@ -1,15 +1,23 @@
-#! /bin/sh -e
+#!/usr/bin/env nix-shell
+#! nix-shell -i bash -p google-cloud-sdk
-BUCKET_NAME=${BUCKET_NAME:-nixos-images}
-export NIX_PATH=nixpkgs=../../../..
-export NIXOS_CONFIG=$(dirname $(readlink -f $0))/../../../modules/virtualisation/google-compute-image.nix
-export TIMESTAMP=$(date +%Y%m%d%H%M)
+set -euo pipefail
+
+BUCKET_NAME="${BUCKET_NAME:-nixos-images}"
+TIMESTAMP="$(date +%Y%m%d%H%M)"
+export TIMESTAMP
nix-build '' \
- -A config.system.build.googleComputeImage --argstr system x86_64-linux -o gce --option extra-binary-caches http://hydra.nixos.org -j 10
+ -A config.system.build.googleComputeImage \
+ --arg configuration "{ imports = [ ]; }" \
+ --argstr system x86_64-linux \
+ -o gce \
+ -j 10
-img=$(echo gce/*.tar.gz)
-if ! gsutil ls gs://${BUCKET_NAME}/$(basename $img); then
- gsutil cp $img gs://${BUCKET_NAME}/$(basename $img)
+img_path=$(echo gce/*.tar.gz)
+img_name=$(basename "$img_path")
+img_id=$(echo "$img_name" | sed 's|.raw.tar.gz$||;s|\.|-|g;s|_|-|g')
+if ! gsutil ls "gs://${BUCKET_NAME}/$img_name"; then
+ gsutil cp "$img_path" "gs://${BUCKET_NAME}/$img_name"
fi
-gcloud compute images create $(basename $img .raw.tar.gz | sed 's|\.|-|' | sed 's|_|-|') --source-uri gs://${BUCKET_NAME}/$(basename $img)
+gcloud compute images create "$img_id" --source-uri "gs://${BUCKET_NAME}/$img_name"
diff --git a/nixos/modules/config/fonts/fontconfig-penultimate.nix b/nixos/modules/config/fonts/fontconfig-penultimate.nix
index 83d6532774e3..3e163b8ec51e 100644
--- a/nixos/modules/config/fonts/fontconfig-penultimate.nix
+++ b/nixos/modules/config/fonts/fontconfig-penultimate.nix
@@ -5,7 +5,7 @@ with lib;
let
cfg = config.fonts.fontconfig;
- fcBool = x: "" + (if x then "true" else "false") + "";
+ fcBool = x: "" + (boolToString x) + "";
# back-supported fontconfig version and package
# version is used for font cache generation
diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix
index d44b583447a3..12f5ca2e7993 100644
--- a/nixos/modules/config/fonts/fontconfig.nix
+++ b/nixos/modules/config/fonts/fontconfig.nix
@@ -20,7 +20,7 @@ with lib;
let cfg = config.fonts.fontconfig;
- fcBool = x: "" + (if x then "true" else "false") + "";
+ fcBool = x: "" + (boolToString x) + "";
# back-supported fontconfig version and package
# version is used for font cache generation
diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix
index ada198e0e586..5301ac14805d 100644
--- a/nixos/modules/security/acme.nix
+++ b/nixos/modules/security/acme.nix
@@ -19,6 +19,12 @@ let
'';
};
+ domain = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ description = "Domain to fetch certificate for (defaults to the entry name)";
+ };
+
email = mkOption {
type = types.nullOr types.str;
default = null;
@@ -157,9 +163,10 @@ in
servicesLists = mapAttrsToList certToServices cfg.certs;
certToServices = cert: data:
let
+ domain = if data.domain != null then data.domain else cert;
cpath = "${cfg.directory}/${cert}";
rights = if data.allowKeysForGroup then "750" else "700";
- cmdline = [ "-v" "-d" cert "--default_root" data.webroot "--valid_min" cfg.validMin ]
+ cmdline = [ "-v" "-d" domain "--default_root" data.webroot "--valid_min" cfg.validMin ]
++ optionals (data.email != null) [ "--email" data.email ]
++ concatMap (p: [ "-f" p ]) data.plugins
++ concatLists (mapAttrsToList (name: root: [ "-d" (if root == null then name else "${name}:${root}")]) data.extraDomains);
diff --git a/nixos/modules/services/cluster/kubernetes.nix b/nixos/modules/services/cluster/kubernetes.nix
index 9ccc7295019a..bf7b44c698cb 100644
--- a/nixos/modules/services/cluster/kubernetes.nix
+++ b/nixos/modules/services/cluster/kubernetes.nix
@@ -612,8 +612,8 @@ in {
--require-kubeconfig \
--address=${cfg.kubelet.address} \
--port=${toString cfg.kubelet.port} \
- --register-node=${if cfg.kubelet.registerNode then "true" else "false"} \
- --register-schedulable=${if cfg.kubelet.registerSchedulable then "true" else "false"} \
+ --register-node=${boolToString cfg.kubelet.registerNode} \
+ --register-schedulable=${boolToString cfg.kubelet.registerSchedulable} \
${optionalString (cfg.kubelet.tlsCertFile != null)
"--tls-cert-file=${cfg.kubelet.tlsCertFile}"} \
${optionalString (cfg.kubelet.tlsKeyFile != null)
@@ -621,7 +621,7 @@ in {
--healthz-bind-address=${cfg.kubelet.healthz.bind} \
--healthz-port=${toString cfg.kubelet.healthz.port} \
--hostname-override=${cfg.kubelet.hostname} \
- --allow-privileged=${if cfg.kubelet.allowPrivileged then "true" else "false"} \
+ --allow-privileged=${boolToString cfg.kubelet.allowPrivileged} \
--root-dir=${cfg.dataDir} \
--cadvisor_port=${toString cfg.kubelet.cadvisorPort} \
${optionalString (cfg.kubelet.clusterDns != "")
@@ -670,14 +670,14 @@ in {
--bind-address=0.0.0.0 \
${optionalString (cfg.apiserver.advertiseAddress != null)
"--advertise-address=${cfg.apiserver.advertiseAddress}"} \
- --allow-privileged=${if cfg.apiserver.allowPrivileged then "true" else "false"} \
+ --allow-privileged=${boolToString cfg.apiserver.allowPrivileged}\
${optionalString (cfg.apiserver.tlsCertFile != null)
"--tls-cert-file=${cfg.apiserver.tlsCertFile}"} \
${optionalString (cfg.apiserver.tlsKeyFile != null)
"--tls-private-key-file=${cfg.apiserver.tlsKeyFile}"} \
${optionalString (cfg.apiserver.tokenAuth != null)
"--token-auth-file=${cfg.apiserver.tokenAuth}"} \
- --kubelet-https=${if cfg.apiserver.kubeletHttps then "true" else "false"} \
+ --kubelet-https=${boolToString cfg.apiserver.kubeletHttps} \
${optionalString (cfg.apiserver.kubeletClientCaFile != null)
"--kubelet-certificate-authority=${cfg.apiserver.kubeletClientCaFile}"} \
${optionalString (cfg.apiserver.kubeletClientCertFile != null)
@@ -719,7 +719,7 @@ in {
ExecStart = ''${cfg.package}/bin/kube-scheduler \
--address=${cfg.scheduler.address} \
--port=${toString cfg.scheduler.port} \
- --leader-elect=${if cfg.scheduler.leaderElect then "true" else "false"} \
+ --leader-elect=${boolToString cfg.scheduler.leaderElect} \
--kubeconfig=${kubeconfig} \
${optionalString cfg.verbose "--v=6"} \
${optionalString cfg.verbose "--log-flush-frequency=1s"} \
@@ -744,7 +744,7 @@ in {
--address=${cfg.controllerManager.address} \
--port=${toString cfg.controllerManager.port} \
--kubeconfig=${kubeconfig} \
- --leader-elect=${if cfg.controllerManager.leaderElect then "true" else "false"} \
+ --leader-elect=${boolToString cfg.controllerManager.leaderElect} \
${if (cfg.controllerManager.serviceAccountKeyFile!=null)
then "--service-account-private-key-file=${cfg.controllerManager.serviceAccountKeyFile}"
else "--service-account-private-key-file=/var/run/kubernetes/apiserver.key"} \
diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix
index fa550f68b338..57f592a2e550 100644
--- a/nixos/modules/services/continuous-integration/hydra/default.nix
+++ b/nixos/modules/services/continuous-integration/hydra/default.nix
@@ -328,7 +328,7 @@ in
IN_SYSTEMD = "1"; # to get log severity levels
};
serviceConfig =
- { ExecStart = "@${cfg.package}/bin/hydra-queue-runner hydra-queue-runner -v --option build-use-substitutes ${if cfg.useSubstitutes then "true" else "false"}";
+ { ExecStart = "@${cfg.package}/bin/hydra-queue-runner hydra-queue-runner -v --option build-use-substitutes ${boolToString cfg.useSubstitutes}";
ExecStopPost = "${cfg.package}/bin/hydra-queue-runner --unlock";
User = "hydra-queue-runner";
Restart = "always";
diff --git a/nixos/modules/services/databases/cassandra.nix b/nixos/modules/services/databases/cassandra.nix
index 5df4ae57f809..1e5cd8f54130 100644
--- a/nixos/modules/services/databases/cassandra.nix
+++ b/nixos/modules/services/databases/cassandra.nix
@@ -21,8 +21,8 @@ let
cassandraConf = ''
cluster_name: ${cfg.clusterName}
num_tokens: 256
- auto_bootstrap: ${if cfg.autoBootstrap then "true" else "false"}
- hinted_handoff_enabled: ${if cfg.hintedHandOff then "true" else "false"}
+ auto_bootstrap: ${boolToString cfg.autoBootstrap}
+ hinted_handoff_enabled: ${boolToString cfg.hintedHandOff}
hinted_handoff_throttle_in_kb: ${builtins.toString cfg.hintedHandOffThrottle}
max_hints_delivery_threads: 2
max_hint_window_in_ms: 10800000 # 3 hours
@@ -62,7 +62,7 @@ let
rpc_keepalive: true
rpc_server_type: sync
thrift_framed_transport_size_in_mb: 15
- incremental_backups: ${if cfg.incrementalBackups then "true" else "false"}
+ incremental_backups: ${boolToString cfg.incrementalBackups}
snapshot_before_compaction: false
auto_snapshot: true
column_index_size_in_kb: 64
@@ -89,7 +89,7 @@ let
truststore: ${cfg.trustStorePath}
truststore_password: ${cfg.trustStorePassword}
client_encryption_options:
- enabled: ${if cfg.clientEncryption then "true" else "false"}
+ enabled: ${boolToString cfg.clientEncryption}
keystore: ${cfg.keyStorePath}
keystore_password: ${cfg.keyStorePassword}
internode_compression: all
diff --git a/nixos/modules/services/databases/mongodb.nix b/nixos/modules/services/databases/mongodb.nix
index 38e46a0c6ef9..c56564f57f36 100644
--- a/nixos/modules/services/databases/mongodb.nix
+++ b/nixos/modules/services/databases/mongodb.nix
@@ -4,8 +4,6 @@ with lib;
let
- b2s = x: if x then "true" else "false";
-
cfg = config.services.mongodb;
mongodb = cfg.package;
diff --git a/nixos/modules/services/logging/graylog.nix b/nixos/modules/services/logging/graylog.nix
index 95283096662e..9f0fb11f0252 100644
--- a/nixos/modules/services/logging/graylog.nix
+++ b/nixos/modules/services/logging/graylog.nix
@@ -4,16 +4,15 @@ with lib;
let
cfg = config.services.graylog;
- configBool = b: if b then "true" else "false";
confFile = pkgs.writeText "graylog.conf" ''
- is_master = ${configBool cfg.isMaster}
+ is_master = ${boolToString cfg.isMaster}
node_id_file = ${cfg.nodeIdFile}
password_secret = ${cfg.passwordSecret}
root_username = ${cfg.rootUsername}
root_password_sha2 = ${cfg.rootPasswordSha2}
elasticsearch_cluster_name = ${cfg.elasticsearchClusterName}
- elasticsearch_discovery_zen_ping_multicast_enabled = ${configBool cfg.elasticsearchDiscoveryZenPingMulticastEnabled}
+ elasticsearch_discovery_zen_ping_multicast_enabled = ${boolToString cfg.elasticsearchDiscoveryZenPingMulticastEnabled}
elasticsearch_discovery_zen_ping_unicast_hosts = ${cfg.elasticsearchDiscoveryZenPingUnicastHosts}
message_journal_dir = ${cfg.messageJournalDir}
mongodb_uri = ${cfg.mongodbUri}
diff --git a/nixos/modules/services/misc/cgminer.nix b/nixos/modules/services/misc/cgminer.nix
index 5f97cc034148..d5071d8ff767 100644
--- a/nixos/modules/services/misc/cgminer.nix
+++ b/nixos/modules/services/misc/cgminer.nix
@@ -6,7 +6,7 @@ let
cfg = config.services.cgminer;
convType = with builtins;
- v: if isBool v then (if v then "true" else "false") else toString v;
+ v: if isBool v then boolToString v else toString v;
mergedHwConfig =
mapAttrsToList (n: v: ''"${n}": "${(concatStringsSep "," (map convType v))}"'')
(foldAttrs (n: a: [n] ++ a) [] cfg.hardware);
diff --git a/nixos/modules/services/misc/confd.nix b/nixos/modules/services/misc/confd.nix
index fe13013286b8..8e9bec15dd4f 100755
--- a/nixos/modules/services/misc/confd.nix
+++ b/nixos/modules/services/misc/confd.nix
@@ -12,7 +12,7 @@ let
nodes = [ ${concatMapStringsSep "," (s: ''"${s}"'') cfg.nodes}, ]
prefix = "${cfg.prefix}"
log-level = "${cfg.logLevel}"
- watch = ${if cfg.watch then "true" else "false"}
+ watch = ${boolToString cfg.watch}
'';
in {
diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix
index 4a1bea50c14e..ae9826968b1f 100644
--- a/nixos/modules/services/misc/matrix-synapse.nix
+++ b/nixos/modules/services/misc/matrix-synapse.nix
@@ -5,9 +5,8 @@ with lib;
let
cfg = config.services.matrix-synapse;
logConfigFile = pkgs.writeText "log_config.yaml" cfg.logConfig;
- mkResource = r: ''{names: ${builtins.toJSON r.names}, compress: ${fromBool r.compress}}'';
- mkListener = l: ''{port: ${toString l.port}, bind_address: "${l.bind_address}", type: ${l.type}, tls: ${fromBool l.tls}, x_forwarded: ${fromBool l.x_forwarded}, resources: [${concatStringsSep "," (map mkResource l.resources)}]}'';
- fromBool = x: if x then "true" else "false";
+ mkResource = r: ''{names: ${builtins.toJSON r.names}, compress: ${boolToString r.compress}}'';
+ mkListener = l: ''{port: ${toString l.port}, bind_address: "${l.bind_address}", type: ${l.type}, tls: ${boolToString l.tls}, x_forwarded: ${boolToString l.x_forwarded}, resources: [${concatStringsSep "," (map mkResource l.resources)}]}'';
configFile = pkgs.writeText "homeserver.yaml" ''
${optionalString (cfg.tls_certificate_path != null) ''
tls_certificate_path: "${cfg.tls_certificate_path}"
@@ -18,7 +17,7 @@ tls_private_key_path: "${cfg.tls_private_key_path}"
${optionalString (cfg.tls_dh_params_path != null) ''
tls_dh_params_path: "${cfg.tls_dh_params_path}"
''}
-no_tls: ${fromBool cfg.no_tls}
+no_tls: ${boolToString cfg.no_tls}
${optionalString (cfg.bind_port != null) ''
bind_port: ${toString cfg.bind_port}
''}
@@ -30,7 +29,7 @@ bind_host: "${cfg.bind_host}"
''}
server_name: "${cfg.server_name}"
pid_file: "/var/run/matrix-synapse.pid"
-web_client: ${fromBool cfg.web_client}
+web_client: ${boolToString cfg.web_client}
${optionalString (cfg.public_baseurl != null) ''
public_baseurl: "${cfg.public_baseurl}"
''}
@@ -58,8 +57,8 @@ media_store_path: "/var/lib/matrix-synapse/media"
uploads_path: "/var/lib/matrix-synapse/uploads"
max_upload_size: "${cfg.max_upload_size}"
max_image_pixels: "${cfg.max_image_pixels}"
-dynamic_thumbnails: ${fromBool cfg.dynamic_thumbnails}
-url_preview_enabled: ${fromBool cfg.url_preview_enabled}
+dynamic_thumbnails: ${boolToString cfg.dynamic_thumbnails}
+url_preview_enabled: ${boolToString cfg.url_preview_enabled}
${optionalString (cfg.url_preview_enabled == true) ''
url_preview_ip_range_blacklist: ${builtins.toJSON cfg.url_preview_ip_range_blacklist}
url_preview_ip_range_whitelist: ${builtins.toJSON cfg.url_preview_ip_range_whitelist}
@@ -67,10 +66,10 @@ url_preview_url_blacklist: ${builtins.toJSON cfg.url_preview_url_blacklist}
''}
recaptcha_private_key: "${cfg.recaptcha_private_key}"
recaptcha_public_key: "${cfg.recaptcha_public_key}"
-enable_registration_captcha: ${fromBool cfg.enable_registration_captcha}
+enable_registration_captcha: ${boolToString cfg.enable_registration_captcha}
turn_uris: ${builtins.toJSON cfg.turn_uris}
turn_shared_secret: "${cfg.turn_shared_secret}"
-enable_registration: ${fromBool cfg.enable_registration}
+enable_registration: ${boolToString cfg.enable_registration}
${optionalString (cfg.registration_shared_secret != null) ''
registration_shared_secret: "${cfg.registration_shared_secret}"
''}
@@ -78,15 +77,15 @@ recaptcha_siteverify_api: "https://www.google.com/recaptcha/api/siteverify"
turn_user_lifetime: "${cfg.turn_user_lifetime}"
user_creation_max_duration: ${cfg.user_creation_max_duration}
bcrypt_rounds: ${cfg.bcrypt_rounds}
-allow_guest_access: ${fromBool cfg.allow_guest_access}
+allow_guest_access: ${boolToString cfg.allow_guest_access}
trusted_third_party_id_servers: ${builtins.toJSON cfg.trusted_third_party_id_servers}
room_invite_state_types: ${builtins.toJSON cfg.room_invite_state_types}
${optionalString (cfg.macaroon_secret_key != null) ''
macaroon_secret_key: "${cfg.macaroon_secret_key}"
''}
-expire_access_token: ${fromBool cfg.expire_access_token}
-enable_metrics: ${fromBool cfg.enable_metrics}
-report_stats: ${fromBool cfg.report_stats}
+expire_access_token: ${boolToString cfg.expire_access_token}
+enable_metrics: ${boolToString cfg.enable_metrics}
+report_stats: ${boolToString cfg.report_stats}
signing_key_path: "/var/lib/matrix-synapse/homeserver.signing.key"
key_refresh_interval: "${cfg.key_refresh_interval}"
perspectives:
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index 4fe89838e29d..bf1304ee7ac2 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -41,12 +41,12 @@ let
build-users-group = nixbld
build-max-jobs = ${toString (cfg.maxJobs)}
build-cores = ${toString (cfg.buildCores)}
- build-use-sandbox = ${if (builtins.isBool cfg.useSandbox) then (if cfg.useSandbox then "true" else "false") else cfg.useSandbox}
+ build-use-sandbox = ${if (builtins.isBool cfg.useSandbox) then boolToString cfg.useSandbox else cfg.useSandbox}
build-sandbox-paths = ${toString cfg.sandboxPaths} /bin/sh=${sh} $(echo $extraPaths)
binary-caches = ${toString cfg.binaryCaches}
trusted-binary-caches = ${toString cfg.trustedBinaryCaches}
binary-cache-public-keys = ${toString cfg.binaryCachePublicKeys}
- auto-optimise-store = ${if cfg.autoOptimiseStore then "true" else "false"}
+ auto-optimise-store = ${boolToString cfg.autoOptimiseStore}
${optionalString cfg.requireSignedBinaryCaches ''
signed-binary-caches = *
''}
diff --git a/nixos/modules/services/misc/taskserver/default.nix b/nixos/modules/services/misc/taskserver/default.nix
index ba9f52f1904b..ab9a6ce32f46 100644
--- a/nixos/modules/services/misc/taskserver/default.nix
+++ b/nixos/modules/services/misc/taskserver/default.nix
@@ -128,7 +128,7 @@ let
certBits = cfg.pki.auto.bits;
clientExpiration = cfg.pki.auto.expiration.client;
crlExpiration = cfg.pki.auto.expiration.crl;
- isAutoConfig = if needToCreateCA then "True" else "False";
+ isAutoConfig = boolToString needToCreateCA;
}}" > "$out/main.py"
cat > "$out/setup.py" </conf" ./ircd.conf ];
inherit (pkgs) ircdHybrid coreutils su iproute gnugrep procps;
- ipv6Enabled = if config.networking.enableIPv6 then "true" else "false";
+ ipv6Enabled = boolToString config.networking.enableIPv6;
inherit (cfg) serverName sid description adminEmail
extraPort;
diff --git a/nixos/modules/services/networking/mosquitto.nix b/nixos/modules/services/networking/mosquitto.nix
index 2325424ff3c5..5451500b56f6 100644
--- a/nixos/modules/services/networking/mosquitto.nix
+++ b/nixos/modules/services/networking/mosquitto.nix
@@ -16,7 +16,7 @@ let
pid_file /run/mosquitto/pid
acl_file ${aclFile}
persistence true
- allow_anonymous ${if cfg.allowAnonymous then "true" else "false"}
+ allow_anonymous ${boolToString cfg.allowAnonymous}
bind_address ${cfg.host}
port ${toString cfg.port}
${listenerConf}
diff --git a/nixos/modules/services/networking/murmur.nix b/nixos/modules/services/networking/murmur.nix
index 81f968ae9fe1..13d7c3254f9d 100644
--- a/nixos/modules/services/networking/murmur.nix
+++ b/nixos/modules/services/networking/murmur.nix
@@ -26,21 +26,21 @@ let
textmessagelength=${toString cfg.textMsgLength}
imagemessagelength=${toString cfg.imgMsgLength}
- allowhtml=${if cfg.allowHtml then "true" else "false"}
+ allowhtml=${boolToString cfg.allowHtml}
logdays=${toString cfg.logDays}
- bonjour=${if cfg.bonjour then "true" else "false"}
- sendversion=${if cfg.sendVersion then "true" else "false"}
+ bonjour=${boolToString cfg.bonjour}
+ sendversion=${boolToString cfg.sendVersion}
${if cfg.registerName == "" then "" else "registerName="+cfg.registerName}
${if cfg.registerPassword == "" then "" else "registerPassword="+cfg.registerPassword}
${if cfg.registerUrl == "" then "" else "registerUrl="+cfg.registerUrl}
${if cfg.registerHostname == "" then "" else "registerHostname="+cfg.registerHostname}
- certrequired=${if cfg.clientCertRequired then "true" else "false"}
+ certrequired=${boolToString cfg.clientCertRequired}
${if cfg.sslCert == "" then "" else "sslCert="+cfg.sslCert}
${if cfg.sslKey == "" then "" else "sslKey="+cfg.sslKey}
${if cfg.sslCa == "" then "" else "sslCA="+cfg.sslCa}
-
+
${cfg.extraConfig}
'';
in
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index 7fb2be786980..220107a24118 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -241,6 +241,7 @@ in {
users.extraUsers = [{
name = "nm-openvpn";
uid = config.ids.uids.nm-openvpn;
+ extraGroups = [ "networkmanager" ];
}];
systemd.packages = cfg.packages;
diff --git a/nixos/modules/services/networking/prosody.nix b/nixos/modules/services/networking/prosody.nix
index feaa007de15e..fb9c9dc67f24 100644
--- a/nixos/modules/services/networking/prosody.nix
+++ b/nixos/modules/services/networking/prosody.nix
@@ -219,7 +219,7 @@ in
data_path = "/var/lib/prosody"
- allow_registration = ${ if cfg.allowRegistration then "true" else "false" };
+ allow_registration = ${boolToString cfg.allowRegistration};
${ optionalString cfg.modules.console "console_enabled = true;" }
@@ -244,7 +244,7 @@ in
${ lib.concatStringsSep "\n" (lib.mapAttrsToList (n: v: ''
VirtualHost "${v.domain}"
- enabled = ${if v.enabled then "true" else "false"};
+ enabled = ${boolToString v.enabled};
${ optionalString (v.ssl != null) (createSSLOptsStr v.ssl) }
${ v.extraConfig }
'') cfg.virtualHosts) }
diff --git a/nixos/modules/services/networking/smokeping.nix b/nixos/modules/services/networking/smokeping.nix
index bac794745277..c5c131cb4c50 100644
--- a/nixos/modules/services/networking/smokeping.nix
+++ b/nixos/modules/services/networking/smokeping.nix
@@ -288,8 +288,11 @@ in
};
systemd.services.smokeping = {
wantedBy = [ "multi-user.target"];
- serviceConfig.User = cfg.user;
- serviceConfig.PermissionsStartOnly = true;
+ serviceConfig = {
+ User = cfg.user;
+ PermissionsStartOnly = true;
+ Restart = "on-failure";
+ };
preStart = ''
mkdir -m 0755 -p ${smokepingHome}/cache ${smokepingHome}/data
rm -f ${smokepingHome}/cropper
diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index 42b50d0426a9..bebf4e145ca8 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -316,8 +316,6 @@ in
UsePAM yes
- UsePrivilegeSeparation sandbox
-
AddressFamily ${if config.networking.enableIPv6 then "any" else "inet"}
${concatMapStrings (port: ''
Port ${toString port}
diff --git a/nixos/modules/services/networking/sslh.nix b/nixos/modules/services/networking/sslh.nix
index bd584a3a85d3..e3d65c49fbf2 100644
--- a/nixos/modules/services/networking/sslh.nix
+++ b/nixos/modules/services/networking/sslh.nix
@@ -5,7 +5,7 @@ with lib;
let
cfg = config.services.sslh;
configFile = pkgs.writeText "sslh.conf" ''
- verbose: ${if cfg.verbose then "true" else "false"};
+ verbose: ${boolToString cfg.verbose};
foreground: true;
inetd: false;
numeric: false;
diff --git a/nixos/modules/services/networking/znc.nix b/nixos/modules/services/networking/znc.nix
index 6d68b790e869..1c63d800e260 100644
--- a/nixos/modules/services/networking/znc.nix
+++ b/nixos/modules/services/networking/znc.nix
@@ -35,7 +35,7 @@ let
Port = ${toString confOpts.port}
IPv4 = true
IPv6 = true
- SSL = ${if confOpts.useSSL then "true" else "false"}
+ SSL = ${boolToString confOpts.useSSL}
diff --git a/nixos/modules/services/scheduling/fcron.nix b/nixos/modules/services/scheduling/fcron.nix
index bd1ecb40969b..bc631bdd0447 100644
--- a/nixos/modules/services/scheduling/fcron.nix
+++ b/nixos/modules/services/scheduling/fcron.nix
@@ -143,10 +143,12 @@ in
};
preStart = ''
- ${pkgs.coreutils}/bin/mkdir -m 0770 -p /var/spool/fcron
- ${pkgs.coreutils}/bin/chown -R fcron:fcron /var/spool/fcron
+ install \
+ --mode 0770 \
+ --owner fcron \
+ --group fcron \
+ --directory /var/spool/fcron
# load system crontab file
- set -x
#${pkgs.fcron}/bin/fcrontab -u systab ${pkgs.writeText "systab" cfg.systab}
'';
diff --git a/nixos/modules/services/security/oauth2_proxy.nix b/nixos/modules/services/security/oauth2_proxy.nix
index caa7d9d50812..e292fd9851e3 100644
--- a/nixos/modules/services/security/oauth2_proxy.nix
+++ b/nixos/modules/services/security/oauth2_proxy.nix
@@ -10,9 +10,6 @@ let
# repeatedArgs (arg: "--arg=${arg}") args
repeatedArgs = concatMapStringsSep " ";
- # 'toString' doesn't quite do what we want for bools.
- fromBool = x: if x then "true" else "false";
-
# oauth2_proxy provides many options that are only relevant if you are using
# a certain provider. This set maps from provider name to a function that
# takes the configuration and returns a string that can be inserted into the
@@ -49,24 +46,24 @@ let
--client-secret='${cfg.clientSecret}' \
${optionalString (!isNull cfg.cookie.domain) "--cookie-domain='${cfg.cookie.domain}'"} \
--cookie-expire='${cfg.cookie.expire}' \
- --cookie-httponly=${fromBool cfg.cookie.httpOnly} \
+ --cookie-httponly=${boolToString cfg.cookie.httpOnly} \
--cookie-name='${cfg.cookie.name}' \
--cookie-secret='${cfg.cookie.secret}' \
- --cookie-secure=${fromBool cfg.cookie.secure} \
+ --cookie-secure=${boolToString cfg.cookie.secure} \
${optionalString (!isNull cfg.cookie.refresh) "--cookie-refresh='${cfg.cookie.refresh}'"} \
${optionalString (!isNull cfg.customTemplatesDir) "--custom-templates-dir='${cfg.customTemplatesDir}'"} \
${repeatedArgs (x: "--email-domain='${x}'") cfg.email.domains} \
--http-address='${cfg.httpAddress}' \
- ${optionalString (!isNull cfg.htpasswd.file) "--htpasswd-file='${cfg.htpasswd.file}' --display-htpasswd-form=${fromBool cfg.htpasswd.displayForm}"} \
+ ${optionalString (!isNull cfg.htpasswd.file) "--htpasswd-file='${cfg.htpasswd.file}' --display-htpasswd-form=${boolToString cfg.htpasswd.displayForm}"} \
${optionalString (!isNull cfg.loginURL) "--login-url='${cfg.loginURL}'"} \
- --pass-access-token=${fromBool cfg.passAccessToken} \
- --pass-basic-auth=${fromBool cfg.passBasicAuth} \
- --pass-host-header=${fromBool cfg.passHostHeader} \
+ --pass-access-token=${boolToString cfg.passAccessToken} \
+ --pass-basic-auth=${boolToString cfg.passBasicAuth} \
+ --pass-host-header=${boolToString cfg.passHostHeader} \
--proxy-prefix='${cfg.proxyPrefix}' \
${optionalString (!isNull cfg.profileURL) "--profile-url='${cfg.profileURL}'"} \
${optionalString (!isNull cfg.redeemURL) "--redeem-url='${cfg.redeemURL}'"} \
${optionalString (!isNull cfg.redirectURL) "--redirect-url='${cfg.redirectURL}'"} \
- --request-logging=${fromBool cfg.requestLogging} \
+ --request-logging=${boolToString cfg.requestLogging} \
${optionalString (!isNull cfg.scope) "--scope='${cfg.scope}'"} \
${repeatedArgs (x: "--skip-auth-regex='${x}'") cfg.skipAuthRegexes} \
${optionalString (!isNull cfg.signatureKey) "--signature-key='${cfg.signatureKey}'"} \
diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix
index 5b2e4ca16066..1f319df794b5 100644
--- a/nixos/modules/services/torrent/transmission.nix
+++ b/nixos/modules/services/torrent/transmission.nix
@@ -15,8 +15,7 @@ let
# Strings must be quoted, ints and bools must not (for settings.json).
toOption = x:
- if x == true then "true"
- else if x == false then "false"
+ if isBool x then boolToString x
else if isInt x then toString x
else toString ''"${x}"'';
diff --git a/nixos/modules/services/web-apps/atlassian/crowd.nix b/nixos/modules/services/web-apps/atlassian/crowd.nix
index ce41aa4f1e18..b54c91d7de92 100644
--- a/nixos/modules/services/web-apps/atlassian/crowd.nix
+++ b/nixos/modules/services/web-apps/atlassian/crowd.nix
@@ -137,7 +137,7 @@ in
sed -e 's,port="8095",port="${toString cfg.listenPort}" address="${cfg.listenAddress}",' \
'' + (lib.optionalString cfg.proxy.enable ''
- -e 's,compression="on",compression="off" protocol="HTTP/1.1" proxyName="${cfg.proxy.name}" proxyPort="${toString cfg.proxy.port}" scheme="${cfg.proxy.scheme}" secure="${if cfg.proxy.secure then "true" else "false"}",' \
+ -e 's,compression="on",compression="off" protocol="HTTP/1.1" proxyName="${cfg.proxy.name}" proxyPort="${toString cfg.proxy.port}" scheme="${cfg.proxy.scheme}" secure="${boolToString cfg.proxy.secure}",' \
'') + ''
${pkg}/apache-tomcat/conf/server.xml.dist > ${cfg.home}/server.xml
'';
diff --git a/nixos/modules/services/web-apps/quassel-webserver.nix b/nixos/modules/services/web-apps/quassel-webserver.nix
index d19e4bc58277..2ba5698d6cb1 100644
--- a/nixos/modules/services/web-apps/quassel-webserver.nix
+++ b/nixos/modules/services/web-apps/quassel-webserver.nix
@@ -12,11 +12,11 @@ let
port: ${toString cfg.quasselCorePort}, // quasselcore port
initialBacklogLimit: ${toString cfg.initialBacklogLimit}, // Amount of backlogs to fetch per buffer on connection
backlogLimit: ${toString cfg.backlogLimit}, // Amount of backlogs to fetch per buffer after first retrieval
- securecore: ${if cfg.secureCore then "true" else "false"}, // Connect to the core using SSL
+ securecore: ${boolToString cfg.secureCore}, // Connect to the core using SSL
theme: '${cfg.theme}' // Default UI theme
},
themes: ['default', 'darksolarized'], // Available themes
- forcedefault: ${if cfg.forceHostAndPort then "true" else "false"}, // Will force default host and port to be used, and will hide the corresponding fields in the UI
+ forcedefault: ${boolToString cfg.forceHostAndPort}, // Will force default host and port to be used, and will hide the corresponding fields in the UI
prefixpath: '${cfg.prefixPath}' // Configure this if you use a reverse proxy
};
'';
diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix
index 5193814da725..76b0ee6da968 100644
--- a/nixos/modules/services/web-apps/tt-rss.nix
+++ b/nixos/modules/services/web-apps/tt-rss.nix
@@ -6,8 +6,6 @@ let
configVersion = 26;
- boolToString = b: if b then "true" else "false";
-
cacheDir = "cache";
lockDir = "lock";
feedIconsDir = "feed-icons";
diff --git a/nixos/modules/services/web-servers/lighttpd/gitweb.nix b/nixos/modules/services/web-servers/lighttpd/gitweb.nix
index f12cc9734465..c8d9836b0b68 100644
--- a/nixos/modules/services/web-servers/lighttpd/gitweb.nix
+++ b/nixos/modules/services/web-servers/lighttpd/gitweb.nix
@@ -60,7 +60,8 @@ in
"/gitweb/" => "${pkgs.git}/share/gitweb/gitweb.cgi"
)
setenv.add-environment = (
- "GITWEB_CONFIG" => "${gitwebConfigFile}"
+ "GITWEB_CONFIG" => "${gitwebConfigFile}",
+ "HOME" => "${cfg.projectroot}"
)
}
'';
diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix
index affc1261d196..99c03ca81c2d 100644
--- a/nixos/modules/services/x11/display-managers/sddm.nix
+++ b/nixos/modules/services/x11/display-managers/sddm.nix
@@ -59,7 +59,7 @@ let
[Autologin]
User=${cfg.autoLogin.user}
Session=${defaultSessionName}.desktop
- Relogin=${if cfg.autoLogin.relogin then "true" else "false"}
+ Relogin=${boolToString cfg.autoLogin.relogin}
''}
${cfg.extraConfig}
diff --git a/nixos/modules/services/x11/hardware/multitouch.nix b/nixos/modules/services/x11/hardware/multitouch.nix
index 0e9eb0214947..c03bb3b494fb 100644
--- a/nixos/modules/services/x11/hardware/multitouch.nix
+++ b/nixos/modules/services/x11/hardware/multitouch.nix
@@ -74,7 +74,7 @@ in {
MatchIsTouchpad "on"
Identifier "Touchpads"
Driver "mtrack"
- Option "IgnorePalm" "${if cfg.ignorePalm then "true" else "false"}"
+ Option "IgnorePalm" "${boolToString cfg.ignorePalm}"
Option "ClickFinger1" "${builtins.elemAt cfg.buttonsMap 0}"
Option "ClickFinger2" "${builtins.elemAt cfg.buttonsMap 1}"
Option "ClickFinger3" "${builtins.elemAt cfg.buttonsMap 2}"
diff --git a/nixos/modules/system/boot/systemd-lib.nix b/nixos/modules/system/boot/systemd-lib.nix
index 7dbf3b25cdb0..7c01f8ea9b7f 100644
--- a/nixos/modules/system/boot/systemd-lib.nix
+++ b/nixos/modules/system/boot/systemd-lib.nix
@@ -10,7 +10,7 @@ rec {
makeUnit = name: unit:
let
- pathSafeName = lib.replaceChars ["@" ":" "\\"] ["-" "-" "-"] name;
+ pathSafeName = lib.replaceChars ["@" ":" "\\" "[" "]"] ["-" "-" "-" "" ""] name;
in
if unit.enable then
pkgs.runCommand "unit-${pathSafeName}"
diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix
index fbc3d1c36f91..b51acea061f1 100644
--- a/pkgs/applications/altcoins/default.nix
+++ b/pkgs/applications/altcoins/default.nix
@@ -22,6 +22,9 @@ rec {
freicoin = callPackage ./freicoin.nix { boost = pkgs.boost155; };
go-ethereum = callPackage ./go-ethereum.nix { };
+ hivemind = callPackage ./hivemind.nix { withGui = true; };
+ hivemindd = callPackage ./hivemind.nix { withGui = false; };
+
litecoin = callPackage ./litecoin.nix { withGui = true; };
litecoind = callPackage ./litecoin.nix { withGui = false; };
diff --git a/pkgs/applications/altcoins/ethabi.nix b/pkgs/applications/altcoins/ethabi.nix
index b92a656c0833..d2532e0d41e9 100644
--- a/pkgs/applications/altcoins/ethabi.nix
+++ b/pkgs/applications/altcoins/ethabi.nix
@@ -4,16 +4,16 @@ with rustPlatform;
buildRustPackage rec {
name = "ethabi-${version}";
- version = "0.2.1";
+ version = "1.0.4";
src = fetchFromGitHub {
- owner = "ethcore";
+ owner = "paritytech";
repo = "ethabi";
- rev = "fbed04984cab0db8767e01054ee16271b8e36281";
- sha256 = "1zgyyg1i5wmz8l1405yg5jmq4ddq530sl7018pkkc7l6cjj3bbhd";
+ rev = "18ddc983d77b2a97e6c322abcc23bec59940d65f";
+ sha256 = "1rg7ydvnhlg8w6blilm3cv6v4q51x1hgrbkln2ikhpdq0vakp5fd";
};
- depsSha256 = "0srxv0wbhvyflc967lkpd2mx5nk7asx2cbxa0qxvas16wy6vxz52";
+ depsSha256 = "1n4rxipna307r4xppb2iaads7kpa3yjv99fimvpn8l0f999ir2rz";
meta = {
description = "Ethereum function call encoding (ABI) utility";
diff --git a/pkgs/applications/altcoins/hivemind.nix b/pkgs/applications/altcoins/hivemind.nix
new file mode 100644
index 000000000000..1b2682f7d4c0
--- /dev/null
+++ b/pkgs/applications/altcoins/hivemind.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost
+, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, libevent
+, withGui }:
+
+with stdenv.lib;
+stdenv.mkDerivation rec {
+ name = "hivemind" + (toString (optional (!withGui) "d")) + "-" + version;
+ version = "unstable";
+
+ src = fetchFromGitHub {
+ owner = "bitcoin-hivemind";
+ repo = "hivemind";
+ rev = "147973cfe76867410578d91d6f0a8df105cab4e0";
+ sha256 = "1ndqqma1b0sh2gn7cl8d9fg44q0g2g42jr2y0nifkjgfjn3c7l5h";
+ };
+
+ nativeBuildInputs = [ pkgconfig autoreconfHook ];
+ buildInputs = [ openssl db48 boost zlib
+ miniupnpc protobuf libevent]
+ ++ optionals stdenv.isLinux [ utillinux ]
+ ++ optionals withGui [ qt4 qrencode ];
+
+ configureFlags = [ "--with-boost-libdir=${boost.out}/lib"
+ "--with-incompatible-bdb"
+ ] ++ optionals withGui [ "--with-gui=qt4" ];
+
+ meta = {
+ description = "Peer-to-Peer oracle protocol";
+ longDescription= ''
+ Hivemind is a Peer-to-Peer Oracle Protocol which absorbs accurate data
+ into a blockchain so that Bitcoin-users can speculate in Prediction
+ Markets.
+ '';
+ homepage = "https://bitcoinhivemind.com";
+ maintainers = with maintainers; [ canndrew ];
+ license = licenses.mit;
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index 60e17982b5be..e9546c16d62b 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "atom-${version}";
- version = "1.15.0";
+ version = "1.16.0";
src = fetchurl {
url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
- sha256 = "0w790b9m94m28bx7n94pg2zjxrcjf13228lsb0pl8kyfsk2k2glx";
+ sha256 = "10qzhfz34i7x7z5fv5a73a6aiwxvanyn0v825a6yz9qfc2mg4shd";
name = "${name}.deb";
};
diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index 868f9619ce2e..852967fecd5c 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -820,10 +820,10 @@
gnorb = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "gnorb";
- version = "1.2.1";
+ version = "1.2.3";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/gnorb-1.2.1.tar";
- sha256 = "0mip0czvpdl26xz9wamii5azj9bacjhdg0jgkrxyv17vqqlbag9x";
+ url = "https://elpa.gnu.org/packages/gnorb-1.2.3.tar";
+ sha256 = "1bqm08i2aam4v4gfzyxfmic0rg0ka7cns38khwj42vhwgv045xc7";
};
packageRequires = [ cl-lib ];
meta = {
@@ -940,10 +940,10 @@
}) {};
ivy = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
pname = "ivy";
- version = "0.8.0";
+ version = "0.9.0";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/ivy-0.8.0.tar";
- sha256 = "1c1impdk1p082v6nb9lms4n258z6ngz8ra90cshprs0ingrk705p";
+ url = "https://elpa.gnu.org/packages/ivy-0.9.0.tar";
+ sha256 = "1p5gfy16xik613ib30mv4yac004z4lpsybmraln1badyd6n3b07s";
};
packageRequires = [ emacs ];
meta = {
diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index 70ea1d58cf80..9ee0fb281e8c 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -316,12 +316,12 @@
ac-clang = callPackage ({ auto-complete, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip, yasnippet }:
melpaBuild {
pname = "ac-clang";
- version = "20161202.725";
+ version = "20170330.1108";
src = fetchFromGitHub {
owner = "yaruopooner";
repo = "ac-clang";
- rev = "ad75d193bb8962136e1ecac04d33352dd70fb72e";
- sha256 = "0pchbhcs3bjf8r6f24lcf29in011502ncr2gi72faww6iz0pb285";
+ rev = "c4aab21df64011916039e18094e189533018e115";
+ sha256 = "1ac8rw0r4x1plrwy6xwswy5mj5h1r975y8wvx01g2j8an41xhlms";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ffe0485048b85825f5e8ba95917d8c9dc64fe5de/recipes/ac-clang";
@@ -793,6 +793,27 @@
license = lib.licenses.free;
};
}) {};
+ ac-rtags = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, rtags }:
+ melpaBuild {
+ pname = "ac-rtags";
+ version = "20170402.653";
+ src = fetchFromGitHub {
+ owner = "Andersbakken";
+ repo = "rtags";
+ rev = "476cdf8b01ced2b49f364c8a2509acddac288cf8";
+ sha256 = "189zmd61sgl0gqacfnglgzazf3gsc3yv57mdk3k7nqs9ysv2wygj";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags";
+ sha256 = "1w9v32di9135mm598c4506gxf0xr5jyz8dyd9dhga5d60q7g9641";
+ name = "ac-rtags";
+ };
+ packageRequires = [ auto-complete rtags ];
+ meta = {
+ homepage = "https://melpa.org/#/ac-rtags";
+ license = lib.licenses.free;
+ };
+ }) {};
ac-skk = callPackage ({ auto-complete, cl-lib ? null, ddskk, fetchFromGitHub, fetchurl, lib, melpaBuild, tinysegmenter }:
melpaBuild {
pname = "ac-skk";
@@ -1173,12 +1194,12 @@
addressbook-bookmark = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "addressbook-bookmark";
- version = "20161130.150";
+ version = "20170331.1209";
src = fetchFromGitHub {
owner = "thierryvolpiatto";
repo = "addressbook-bookmark";
- rev = "ad3c73369b804a48803fdfdf2ab613e6220260de";
- sha256 = "012kfqkmpagn8jrp09acpx631qmjim7b33j0pahv1fcqhin89pn6";
+ rev = "54c4e57b000d54cedb3d791d054d293c8f45f2fe";
+ sha256 = "17g4j5yc7phnn95cya8sw13jm1219j1yrjzdcvadi5xdwlb9gxgz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a497aec6e27efa627068542cae5a16c01c3c6d3c/recipes/addressbook-bookmark";
@@ -1420,22 +1441,22 @@
license = lib.licenses.free;
};
}) {};
- alchemist = callPackage ({ company, dash, elixir-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
+ alchemist = callPackage ({ company, dash, elixir-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }:
melpaBuild {
pname = "alchemist";
- version = "20170118.142";
+ version = "20170402.2339";
src = fetchFromGitHub {
owner = "tonini";
repo = "alchemist.el";
- rev = "20a0c043b5df66ee1f731e1ffe53d5697915b626";
- sha256 = "1szmjcim9mmzm45f7pb39gr0kf3y7x0kdhgvvbl9fbdzrphn02mx";
+ rev = "46d09a6abaa8adf5e06184b77d04638ff3aa9087";
+ sha256 = "1wvbn4capcf049y33633b4v8k1aqwi94lscif810f7p3m0xdai30";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6616dc61d17c5bd89bc4d226baab24a1f8e49b3e/recipes/alchemist";
sha256 = "18jxw0zb7y34qbm4bcpfpb2656f0h9grmrbfskgp4ra4q5q3n369";
name = "alchemist";
};
- packageRequires = [ company dash elixir-mode emacs pkg-info ];
+ packageRequires = [ company dash elixir-mode emacs pkg-info s ];
meta = {
homepage = "https://melpa.org/#/alchemist";
license = lib.licenses.free;
@@ -1448,8 +1469,8 @@
src = fetchFromGitHub {
owner = "jgkamat";
repo = "alda-mode";
- rev = "deeb659b1b1c6ec57a38875e9daf1f76f9b5c013";
- sha256 = "1z462b2cvfqz1pdrba89ag4v9mvw1dzsrzc219fz06f2xcpyz2v2";
+ rev = "921b1d39ee1122c0f6935598dc17aaa904e74819";
+ sha256 = "01zz3h6q3djqmb3l6s9jld8x1zx2m0x1qskxzywnyfh8hcvbqy6f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2612c494a2b6bd43ffbbaef88ce9ee6327779158/recipes/alda-mode";
@@ -1546,22 +1567,22 @@
license = lib.licenses.free;
};
}) {};
- all-the-icons = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild }:
+ all-the-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild }:
melpaBuild {
pname = "all-the-icons";
- version = "20170328.2313";
+ version = "20170410.114";
src = fetchFromGitHub {
owner = "domtronn";
repo = "all-the-icons.el";
- rev = "e7c8f824d542fd946dfe695ef370dd57a218d03c";
- sha256 = "0y5mf6iwyqsfl6xa00pkv23d52dadk1zgcmkx91i0ls3jb1cvarg";
+ rev = "16a0bc57107562e69cb97701d9275b446b411a8c";
+ sha256 = "0i2hrfjgxpg9n7k2n4gsl1wp93g0cv1wrcwwaw3fz0vf250f5avf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons";
sha256 = "00ba4gkfvg38l4s0gsb4asvv1hfw9yjl2786imybzy7bkg9f9x3q";
name = "all-the-icons";
};
- packageRequires = [ dash emacs font-lock-plus ];
+ packageRequires = [ emacs font-lock-plus ];
meta = {
homepage = "https://melpa.org/#/all-the-icons";
license = lib.licenses.free;
@@ -1684,12 +1705,12 @@
anaconda-mode = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }:
melpaBuild {
pname = "anaconda-mode";
- version = "20170329.836";
+ version = "20170405.301";
src = fetchFromGitHub {
owner = "proofit404";
repo = "anaconda-mode";
- rev = "14061ecfbde5f58a0f807eafc7c1871ff178cea0";
- sha256 = "05lq97xfdmw34yh1jy4b7ypks5nf3jjcrx12lk0jxhhgcr7j2lv3";
+ rev = "6141aba393e992308d01b550f0b96add62440b04";
+ sha256 = "1gkkjnmczpvaw020vw1gbda3dv0h1g7fzdqs3rigwlzzajc96bj4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode";
@@ -2273,8 +2294,8 @@
src = fetchFromGitHub {
owner = "masasam";
repo = "emacs-anything-tramp";
- rev = "4e5f2ceb4624a633b809cb7ac671425fa061586b";
- sha256 = "1jzyxxk8c9dfr5d3i89cq7apjlrwc3278nn1fr7hlcg05nv2lfwl";
+ rev = "dc5e218372293ade9bf42bd6782da6b127629d67";
+ sha256 = "0jyh4gi8dz5ifpl1p338rarf9h53z97xfck516fcjdbkm91rwamg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/bf5be5351cb187dff8388865ac424f8e5be71639/recipes/anything-tramp";
@@ -2347,16 +2368,19 @@
license = lib.licenses.free;
};
}) {};
- apache-mode = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+ apache-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
pname = "apache-mode";
- version = "20150828.714";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/apache-mode.el";
- sha256 = "1jndhcjvj6s1clmyyphl5ss5267c7b5a58fz8gbp1ffk1d9ylfik";
+ version = "20170407.1140";
+ src = fetchFromGitHub {
+ owner = "zonuexe";
+ repo = "apache-mode";
+ rev = "8fd0d4db7ede5d4e360630235ede3beb1ba56cdf";
+ sha256 = "0lawq0xx0y2kn89r633lb8kr4zkrbcm53dv8dylmv7lli9a7g1y9";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a6da3640b72496e2b32e6ed21aa39df87af9f7f3/recipes/apache-mode";
- sha256 = "1a1pj3bk0gplfx217yd6qdn7qrhfbkx2bhkk33k0gq5sia6rzs44";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/b5216c40e60c5a69a6235c15b432b5e9bdda6fd3/recipes/apache-mode";
+ sha256 = "0f8r3xnnidcm9ahj8c3s1vxk6yqk3ra34nrc19r76xyprbb2sjsm";
name = "apache-mode";
};
packageRequires = [];
@@ -2756,22 +2780,22 @@
license = lib.licenses.free;
};
}) {};
- assess = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, m-buffer, melpaBuild }:
+ assess = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, m-buffer, melpaBuild }:
melpaBuild {
pname = "assess";
- version = "20161203.327";
+ version = "20170408.1451";
src = fetchFromGitHub {
owner = "phillord";
repo = "assess";
- rev = "47ce039423f660174d097698615aaad6c77e87fb";
- sha256 = "16b0fdz1nj25bkzb3hyarwa2zgk23dn9598a4ljbr9smdl2pdv6b";
+ rev = "0a3e94477a08c3cda7c1dd4ea05ef87208901ac0";
+ sha256 = "03fpfyamcfhc1amfnmq5r2qrzc9iws3mzwihr4nc0k5xjp7z0rhb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6f917a34506193f2674b195569dfd3c13ba62c1d/recipes/assess";
sha256 = "0xj3f48plwxmibax00qn15ya7s0h560xzwr8nkwl5r151v1mc9rr";
name = "assess";
};
- packageRequires = [ dash emacs m-buffer ];
+ packageRequires = [ emacs m-buffer ];
meta = {
homepage = "https://melpa.org/#/assess";
license = lib.licenses.free;
@@ -2910,8 +2934,8 @@
src = fetchFromGitHub {
owner = "tom-tan";
repo = "auctex-latexmk";
- rev = "b7053f71f578ffb0d247f8a9e8d5152efd86e096";
- sha256 = "0slihygr74vyijnyzssckapscxmdd7zlgrs0wvmpw9hnjzwwzzql";
+ rev = "0315925ac9a892e73859cf4b720f36f2727f47f1";
+ sha256 = "0cdc2wkyqs4c6iypkynm0s540isp7yyyavp80rg5x3cid3hsbinm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3f48af615c56f093dff417a5d3b705f9993c518f/recipes/auctex-latexmk";
@@ -3906,12 +3930,12 @@
avy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "avy";
- version = "20170326.1157";
+ version = "20170407.111";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "avy";
- rev = "0c30cdba9e601c9e719b8b00101d2af9f93d2042";
- sha256 = "18sklj4hc8qybcrqymm6144dz6y8hf34s6szxis3flnnhx1x6a06";
+ rev = "105efc84827cb764cac1e1e3a793abf106837021";
+ sha256 = "1kb5l50m8hqmdc5yjw43l53nimsbc3g9jnlkkrdywqm0kbzc5znp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/77fac7a702d4086fb860514e377037acedc60412/recipes/avy";
@@ -3969,12 +3993,12 @@
avy-migemo = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, migemo }:
melpaBuild {
pname = "avy-migemo";
- version = "20161229.605";
+ version = "20170404.904";
src = fetchFromGitHub {
owner = "momomo5717";
repo = "avy-migemo";
- rev = "26e87aa7905a252b797e0bf592c9ff9eede165c1";
- sha256 = "1bfrc7wxnzhjn07psa5z1cflxxr1k8qc4jgsz5w7ds3sn48aji48";
+ rev = "6dd5dde4d4bc0bc7758977b64e1ad1173f5f1602";
+ sha256 = "0lscjwbksdqkjzfzvdz0llpxbmwk94byyxz0fljcncxzdzwvsz6v";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6a02db29eb3e4b76b4a9cdbc966df5a1bd35dec0/recipes/avy-migemo";
@@ -4095,8 +4119,8 @@
src = fetchFromGitHub {
owner = "hung-phan";
repo = "babel-repl";
- rev = "0faa2f6518a2b46236f116ca1736a314f7d9c034";
- sha256 = "0sp0ja0346k401q5zpx3zl4pnxp4ml2jqkgk7z8i08rhdbp0c4nr";
+ rev = "e619c16e349a1ee7bd0ee0d7f3650d33bff73fc3";
+ sha256 = "1174r0gjpn5z3pnf32qlpqhmdfvskcd2vqgicvmqzjsrysj3fypn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/dfd4ac01ea16fcbc6e9343a953a2f278c5874d3d/recipes/babel-repl";
@@ -4429,13 +4453,13 @@
pname = "bbdb";
version = "20170129.2224";
src = fetchgit {
- url = "git://git.savannah.nongnu.org/bbdb.git";
+ url = "https://git.savannah.nongnu.org/git/bbdb.git";
rev = "8998b3416b36873f4e49454879f2eed20c31b384";
sha256 = "086ivc9j7vninb46kzparg7zjmdsv346gqig6ki73889wym1m7xn";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/6b6801fe29cb6fb6183f0babf528375d14f966b3/recipes/bbdb";
- sha256 = "0zhs4psa9b9yf9hxm19q5znsny11cdp23pya3rrlmj39j4jfn73j";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/bbdb";
+ sha256 = "0mm8n3dbi8lap3pjr97n2f675iy7sg476sm1vxygbc3j67rq1zb2";
name = "bbdb";
};
packageRequires = [];
@@ -4514,8 +4538,8 @@
src = fetchFromGitLab {
owner = "iankelling";
repo = "bbdb-csv-import";
- rev = "21c775d776be1a6b3a096912bcdb53dab6bfaa31";
- sha256 = "0amdn5hd72108ylss90yk550w6vzvsg91l29dycbfr8a3hrfs22x";
+ rev = "dc9e722d1c1fcd55b71625ee3f05a4921851d186";
+ sha256 = "0jkrznrfdh562bwy0adg1pzmqh6i766b5ki41g4pr9wcbmh937sn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/76ac7178ee5381e08ae881f3fc6061106eeb1c1d/recipes/bbdb-csv-import";
@@ -4657,12 +4681,12 @@
beacon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
melpaBuild {
pname = "beacon";
- version = "20161004.756";
+ version = "20170404.906";
src = fetchFromGitHub {
owner = "Malabarba";
repo = "beacon";
- rev = "c9d86457d43decf61810006752544d7f7bd5a61d";
- sha256 = "132ixmzjz3sg15qvdbv3s8p6dv3bz7vwlhs50dax0z19dr79cda0";
+ rev = "f1a3ff5ea8fecf9bf250205de66aedf0bf49c35b";
+ sha256 = "0wr2ffwbi5w23a7hbdmn5ijfy5gmizrmy75zj6m1bz4mbw23ccvn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d09cfab21be800831644218e9c8c4433087951c0/recipes/beacon";
@@ -4994,8 +5018,8 @@
src = fetchFromGitHub {
owner = "jwiegley";
repo = "use-package";
- rev = "a354568ec2af8444b741f595a3a7183e3f67ad58";
- sha256 = "19aaqcaycq1msfgvvnlqkzqqijbzqzc015k69pbg41l5bvrwnqcq";
+ rev = "103b6518e66d9acb990832f02dca093a7425ca84";
+ sha256 = "0rsc9shvgla560y3001s9v29wiwz1g9il2z44939phwlkydhak7r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key";
@@ -5448,10 +5472,10 @@
}) {};
bookmark-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
pname = "bookmark-plus";
- version = "20170312.1135";
+ version = "20170331.1856";
src = fetchurl {
url = "https://www.emacswiki.org/emacs/download/bookmark+.el";
- sha256 = "0vr5v6laav6hhx8g9v4pjdmfjcc2bylvvjwzfby9a4s838dakgkr";
+ sha256 = "0iqvlwqilwpqlymj8iynw2miifl28h1g7z10q08rly2430fnmi37";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/bookmark+";
@@ -5488,12 +5512,12 @@
boon = callPackage ({ dash, emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }:
melpaBuild {
pname = "boon";
- version = "20170318.1312";
+ version = "20170406.1153";
src = fetchFromGitHub {
owner = "jyp";
repo = "boon";
- rev = "d9f0545708bbbbe3df23b2b91cdd2824beb0df56";
- sha256 = "0crqwyhzkwpi7c0rqcgmgqx6g4f8fw9gd9nh0ii6p5agiw140yj8";
+ rev = "6dd44cdef13c3695a2890c0329f0d870cce8dfdb";
+ sha256 = "0rfc4zgyijl9gcbf1bf1hnsx2pwl02jmxxj372z7nsvjwhwc20w9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/boon";
@@ -5677,12 +5701,12 @@
browse-at-remote = callPackage ({ cl-lib ? null, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "browse-at-remote";
- version = "20170302.2236";
+ version = "20170330.1452";
src = fetchFromGitHub {
owner = "rmuslimov";
repo = "browse-at-remote";
- rev = "6de3e242e7b11ee2cb942547ac01823fada52605";
- sha256 = "09c4hsg02bmws65z4396j1yavx96785l6h3yl6s91qgx4byq9l17";
+ rev = "7a34d6579a98d13b2887addab25947ea96502de9";
+ sha256 = "1ybb9gyw1b4fjbh02lj632vc89m9yq91dvshnbnzg0wbr77d33xr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/203e177f09eac4ebb8c7e3532bd82f749f8e2607/recipes/browse-at-remote";
@@ -5840,12 +5864,12 @@
bts-github = callPackage ({ bts, fetchFromGitHub, fetchurl, gh, lib, melpaBuild }:
melpaBuild {
pname = "bts-github";
- version = "20150108.27";
+ version = "20170401.549";
src = fetchFromGitHub {
owner = "aki2o";
repo = "emacs-bts-github";
- rev = "57c23f2b842f6775f0bbbdff97eeec78474be6bc";
- sha256 = "1sfr3j11jz4k9jnfa9i05bp4v5vkil38iyrgsp3kxf15797b9dg9";
+ rev = "ef2cf9202dc2128e5efdb613bfde9276a8cd95ad";
+ sha256 = "173i9n4c8mg93gpc7ljxh3nhm4lq2c04yhrvjz6fwwwqvmnkha5f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6f3e87699181877e50d75a89e2ee76e403fc9317/recipes/bts-github";
@@ -6256,12 +6280,12 @@
buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "buttercup";
- version = "20170316.1516";
+ version = "20170401.703";
src = fetchFromGitHub {
owner = "jorgenschaefer";
repo = "emacs-buttercup";
- rev = "677d6d3c253e69bee9e310911605833e79253ee3";
- sha256 = "0h8kq3p2ksyiqn4f6z7flq15q3dxps2fp5a8zzfpxbs67k13nrf3";
+ rev = "f60ed2a563b3867a98ab41290b46572789c43272";
+ sha256 = "11axmbqvak8djldjp9kqcaz7q6dxkig9h193l5javgf78pfcdlki";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b187cb5b3cc5b546bfa6b94b6792e6363242d1/recipes/buttercup";
@@ -6614,13 +6638,13 @@
pname = "caml";
version = "20151009.845";
src = fetchsvn {
- url = "http://caml.inria.fr/svn/ocaml/trunk/emacs/";
+ url = "https://caml.inria.fr/svn/ocaml/trunk/emacs/";
rev = "16556";
sha256 = "16qw82m87i1fcnsccqcvr9l6p2cy0jdhljsgaivq0q10hdmbgqdw";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/55c90eb51ac6a69383c8b63987235d325f43fdb0/recipes/caml";
- sha256 = "0kxrn9s1h2l05akcdcj6fd3g6x5wbi511mf14g9glcn8azyfs698";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/caml";
+ sha256 = "1z5wm2h930fhl4v01i6ki8ms58n4dn4h085iac075sijp8dpih92";
name = "caml";
};
packageRequires = [];
@@ -6762,8 +6786,8 @@
src = fetchFromGitHub {
owner = "AdrieanKhisbe";
repo = "cask-package-toolset.el";
- rev = "24fb0cf745d5e10342dbd2cdcd3d6c9910167726";
- sha256 = "1m40s9q00l06fz525m3zrvwd6s60lggdqls5k5njkn671aa3h71s";
+ rev = "bf5ae2fec2c84816d9e2b45a0799240401de9fc3";
+ sha256 = "1cy4bsrmz4x0c9hfsm789kfw1fb71h25dw8m9yjm795a0vdgskah";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ed71e45389626e700b93b29d5e2659b6706274d8/recipes/cask-package-toolset";
@@ -6987,12 +7011,12 @@
centered-window-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "centered-window-mode";
- version = "20160210.247";
+ version = "20170406.635";
src = fetchFromGitHub {
owner = "anler";
repo = "centered-window-mode";
- rev = "ff2350f5258249bbc9e07ac60c76028f4ae07190";
- sha256 = "1i5ipll7jlrxqb0kcwq0rlrpfaxsyp663bwjdnhj84c50wlv052f";
+ rev = "ac8b7eca96a771e6921ffd6fad09566c0447092c";
+ sha256 = "0lkamd4qi2pp2riqw90flgq6rrz8mrjqghmzppng06dafalyfxnv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/centered-window-mode";
@@ -7054,8 +7078,8 @@
src = fetchFromGitHub {
owner = "cfengine";
repo = "core";
- rev = "19de82713504f253961ad46d30943bf004f8a64c";
- sha256 = "1x8fr5rczzppgpq7hrcvzv95s5hjpvm4ksm5wwmkvy5a8awghdyg";
+ rev = "37e40b61521efb63e1b5c8efb441e20805974fbf";
+ sha256 = "0l3455j6is72vfxlv63bsrwqiykqn4a1nys08l2vx6yxxxy7m0z4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style";
@@ -7093,13 +7117,13 @@
pname = "cg";
version = "20170201.347";
src = fetchsvn {
- url = "http://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs";
- rev = "12088";
+ url = "https://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs";
+ rev = "12127";
sha256 = "0lv9lsh1dnsmida4hhj04ysq48v4m12nj9yq621xn3i6s2qz7s1k";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a275ee794b0aa30b1348bb3a984114eef8dfc808/recipes/cg";
- sha256 = "0ra6mxf8l9fjn1vszjj71fs6f6l08hwypka8zsb3si96fzb6sgjh";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/cg";
+ sha256 = "0xj4yqjg0r9m9cvwgs60lsid6qm1fi8lmb068dj6xaga11n70si5";
name = "cg";
};
packageRequires = [];
@@ -7108,6 +7132,27 @@
license = lib.licenses.free;
};
}) {};
+ challenger-deep-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "challenger-deep-theme";
+ version = "20170402.534";
+ src = fetchFromGitHub {
+ owner = "MaxSt";
+ repo = "challenger-deep";
+ rev = "02317915e36cb19e3e46f17fdec074677159b3a7";
+ sha256 = "02khn3wwzjxai81jrp8yaxfsa5n685l9b09ryd0wjf2hsa8ng975";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/7942f539d025c1e2b059d49e1984716cbbc90a67/recipes/challenger-deep-theme";
+ sha256 = "1apjc32wy7h7fadxckdbfa6wzd360c7v6dig9gikjbsxm8xgdg60";
+ name = "challenger-deep-theme";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/challenger-deep-theme";
+ license = lib.licenses.free;
+ };
+ }) {};
change-inner = callPackage ({ expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "change-inner";
@@ -7675,12 +7720,12 @@
cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }:
melpaBuild {
pname = "cider";
- version = "20170322.155";
+ version = "20170403.402";
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "cider";
- rev = "0816372ff483dd92eb8775c76929835b0955ae70";
- sha256 = "0jh7wv2h6xxm7h3pmabcx30m16j2lz11z5pzv73p3miyqpvkh6mn";
+ rev = "35c18ac8afefecf746fa0a77e930636736cf6541";
+ sha256 = "1r4706s8k3kpgkcn1jm9794bhpjfp0zxc4siqrr0h5hxfjnizc59";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider";
@@ -7801,12 +7846,12 @@
ciel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ciel";
- version = "20170323.2203";
+ version = "20170330.526";
src = fetchFromGitHub {
owner = "cs14095";
repo = "ciel.el";
- rev = "2cc6a4a338e6b1e477f37e8a2fa3c661209c0804";
- sha256 = "148g1wl9f2bbgpqnyl6qppmzs61z771d1l64643vwvrh3xn4q4vg";
+ rev = "8c73f78d60ef52d3c395a9629963a63439b8a83e";
+ sha256 = "1jaxqri8l7y1lqj830h5alxn37skjpb56j6ax8qf9926n8qz3arm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9c70c007a557ea9fb9eb4d3f8b7adbe4dac39c8a/recipes/ciel";
@@ -7951,7 +7996,7 @@
version = "20170120.137";
src = fetchsvn {
url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format";
- rev = "299036";
+ rev = "299842";
sha256 = "0011wlqjkr1x58y0v5nf600nn7dj44cllp2m1dyj90aixjx4saq2";
};
recipeFile = fetchurl {
@@ -8157,12 +8202,12 @@
clj-refactor = callPackage ({ cider, clojure-mode, edn, emacs, fetchFromGitHub, fetchurl, hydra, inflections, lib, melpaBuild, multiple-cursors, paredit, s, seq, yasnippet }:
melpaBuild {
pname = "clj-refactor";
- version = "20170126.118";
+ version = "20170407.553";
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "clj-refactor.el";
- rev = "0fb72efc1cb9a2a688e324e7fdc51f258a86e36d";
- sha256 = "0sibcrsygaxk60f2rrjbmsp7cjfgqkj7a40psal19nf1ygcy634y";
+ rev = "0a25f2ed361fff056ee23cfa64eac1423c75dfeb";
+ sha256 = "1alpvwmfqm9hqgcd4bhg54pvqjc85dc7wrcajxzv00gki47gj2zs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3a2db268e55d10f7d1d5a5f02d35b2c27b12b78e/recipes/clj-refactor";
@@ -8337,12 +8382,12 @@
clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "clojure-mode";
- version = "20170303.2310";
+ version = "20170407.312";
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "clojure-mode";
- rev = "4dcd7bc95f056ea61b0d1b16c5b03e1a6681b709";
- sha256 = "0z27hgd3jc3lnhv2j3gc5inwlwmqidw7js41ciwawjma59bhv1ka";
+ rev = "2d67af4230657fb06f0df4453b9d21031b32c1db";
+ sha256 = "1dan05yd3dvf3r4khahpyq849sq96bjxz7zyady8x3k3gnn35q5w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode";
@@ -8362,8 +8407,8 @@
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "clojure-mode";
- rev = "4dcd7bc95f056ea61b0d1b16c5b03e1a6681b709";
- sha256 = "0z27hgd3jc3lnhv2j3gc5inwlwmqidw7js41ciwawjma59bhv1ka";
+ rev = "2d67af4230657fb06f0df4453b9d21031b32c1db";
+ sha256 = "1dan05yd3dvf3r4khahpyq849sq96bjxz7zyady8x3k3gnn35q5w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking";
@@ -8593,8 +8638,8 @@
src = fetchFromGitHub {
owner = "Kitware";
repo = "CMake";
- rev = "6a5a214f43cccc83fbe3dd6de4747aba43088701";
- sha256 = "09xkv6b83b8wv043zq287azsjvqgl0nsmfprq3lsk5hqc82l6006";
+ rev = "333c565acefef652d2593d6eadc97551865a67e6";
+ sha256 = "14dlvyxvakj1ykm27apv9iv3gxjaa5m4zs7562vih14d7bqywsc3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -8899,12 +8944,12 @@
colemak-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "colemak-evil";
- version = "20140508.1612";
+ version = "20170401.1626";
src = fetchFromGitHub {
owner = "patbl";
repo = "colemak-evil";
- rev = "624985835a9e8192c687b99f7d59e7d01713c453";
- sha256 = "1bwbqb9j5cn9b42n4w8nr6sqyk40xcp06mnxn9f28w4hnjd12pqj";
+ rev = "b01296a50ee225d0e21e81f99c3c01432f89a7c7";
+ sha256 = "09ipxdwvi1bsicl67fbpd5aq5g9ws9frim9q24y7h6srynj4awa7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0f0750a3f9537782ee61d6e56c51ce7b86def12e/recipes/colemak-evil";
@@ -8985,13 +9030,13 @@
pname = "color-theme";
version = "20080305.34";
src = fetchbzr {
- url = "http://bzr.savannah.gnu.org/r/color-theme/trunk";
+ url = "https://bzr.savannah.gnu.org/r/color-theme/trunk";
rev = "57";
sha256 = "17bidzq9kiz250gal1fn9mg8gf8l749nz69z0awpc4x2222wxxiz";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/d49f86519b1340420a5ee587de77a3a6fa5791c3/recipes/color-theme";
- sha256 = "1p4bjh8a9f6ixmwwnyjb520myk3bww1v9w6427za07v68m9cdh79";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/color-theme";
+ sha256 = "1ds098v50p4g6ji0zy7m5nyj2kadm3l3v0pnb01wkjjx6anh3qsy";
name = "color-theme";
};
packageRequires = [];
@@ -9087,12 +9132,12 @@
color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "color-theme-sanityinc-tomorrow";
- version = "20170106.1620";
+ version = "20170330.33";
src = fetchFromGitHub {
owner = "purcell";
repo = "color-theme-sanityinc-tomorrow";
- rev = "ed7bcd2dd40989c99fe0ff13802432de8e0e8edd";
- sha256 = "0z65y0wda3rwymmjy7q8g4h1ar1a9crqgf3i8y9cyq5n8bmc5z7c";
+ rev = "56d9c31a6bea3657363f79d5987d4afa6a4caf41";
+ sha256 = "19aw5bac7sgyj70g093ds43ddx69mqrwgabx0wvjcg84kfggl6j4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-tomorrow";
@@ -9792,12 +9837,12 @@
company-go = callPackage ({ company, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
melpaBuild {
pname = "company-go";
- version = "20170303.909";
+ version = "20170401.345";
src = fetchFromGitHub {
owner = "nsf";
repo = "gocode";
- rev = "007b034ad7b6d5b70bd18348fc7609a9fdcbad18";
- sha256 = "1cy7fjbip8c9pmv91bk4kcjcl5qdz3an2i78ywlb3b2qhsac21kc";
+ rev = "1ed1baa46aeda2ce7de181161d4e2d369a740ce1";
+ sha256 = "1ywyvppqyv6r52jagjn45nbrx9r5hsr2b3nxaya8sxsrkjv6hsn7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/company-go";
@@ -10065,12 +10110,12 @@
company-quickhelp = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip }:
melpaBuild {
pname = "company-quickhelp";
- version = "20170226.522";
+ version = "20170402.35";
src = fetchFromGitHub {
owner = "expez";
repo = "company-quickhelp";
- rev = "30197a39ddedef550fd98803805dc15f844fc3c6";
- sha256 = "1a972l0y58bjpbnmxd2h33arx26naq9f8dbq2vka2axigpy4455r";
+ rev = "a6eaf04e31af9e0d2f47c4c1439fc586f91d0a62";
+ sha256 = "1flb9wzgj0argd10m2l859glpiwzfjyggyrw2zfalkh8c52nywvd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/022cc4fee54bb0194822947c70058145e2980b94/recipes/company-quickhelp";
@@ -10131,6 +10176,27 @@
license = lib.licenses.free;
};
}) {};
+ company-rtags = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rtags }:
+ melpaBuild {
+ pname = "company-rtags";
+ version = "20170405.2311";
+ src = fetchFromGitHub {
+ owner = "Andersbakken";
+ repo = "rtags";
+ rev = "476cdf8b01ced2b49f364c8a2509acddac288cf8";
+ sha256 = "189zmd61sgl0gqacfnglgzazf3gsc3yv57mdk3k7nqs9ysv2wygj";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags";
+ sha256 = "0dicxbp3xn02pflrpfndj7hs494prvz64llsk1xpc2z23kfarp6f";
+ name = "company-rtags";
+ };
+ packageRequires = [ company emacs rtags ];
+ meta = {
+ homepage = "https://melpa.org/#/company-rtags";
+ license = lib.licenses.free;
+ };
+ }) {};
company-shell = callPackage ({ cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "company-shell";
@@ -10285,8 +10351,8 @@
src = fetchFromGitHub {
owner = "abingham";
repo = "emacs-ycmd";
- rev = "8fbdaeaec7704155a047ac17c11d4cf4208f5f79";
- sha256 = "0hvvyficrdxwwg9gyyzmvdsx7v1dh07qrzcvcdn1lq1q1shwcng9";
+ rev = "6b32dc7a832e6c4883dd434530c8d6d69fe36c15";
+ sha256 = "0zx57xhg065hbcisvsryqv2lb34fnzfvzv418nbc6r3yy29yb9ar";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1138c8cc239183a2435ce8c1a6df5163e5fed2ea/recipes/company-ycmd";
@@ -10348,8 +10414,8 @@
src = fetchFromGitHub {
owner = "kiwanami";
repo = "emacs-deferred";
- rev = "9668749635472a63e7a9282e2124325405199b79";
- sha256 = "1ch5br9alvwcpijl9g8w5ypjrah29alpfpk4hjw23rwzyq5p4izq";
+ rev = "7f2bb81e75db895c99611a7a9fbde7c239b757ba";
+ sha256 = "09qnk8xhk5vjn7iqfzg3yzydas47453k1qm22gbmlfxh6lvxsqh2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc29a8d518ce7a584277089bd4654f52ac0f358/recipes/concurrent";
@@ -10637,12 +10703,12 @@
counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
melpaBuild {
pname = "counsel";
- version = "20170328.737";
+ version = "20170410.24";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "swiper";
- rev = "3fbeaa563916c0e23c6cafa82716e9f2eba44073";
- sha256 = "14z8f0lx5s63dy7h0x5m6lkhpfbmlq0p64g2r6y3dhswb8zn1pjl";
+ rev = "d9608bfb593fdc3a60ffa81a19b0533313d44f26";
+ sha256 = "15mnj8mbc7ch4j9rdag18a8biiy0a4837vxak97zh9ffgyk7aiqr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel";
@@ -10763,12 +10829,12 @@
cov = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "cov";
- version = "20170222.940";
+ version = "20170405.1508";
src = fetchFromGitHub {
owner = "AdamNiederer";
repo = "cov";
- rev = "41719590b26b20642c31d233858dc27f34b277b3";
- sha256 = "1ph8hxnwbww194gcqq79ny6p3p396w1dgjr6inkg6f52ylycp25m";
+ rev = "74e8f32433eab6b31357642ad5a7ed79a3dfbd05";
+ sha256 = "100fk11fjj8wx8lm4ln4p4b6brxfgnkxq387v6ikyigr6lascmsw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d0f35ce436ac157955d6f92de96e14bef9ad69e3/recipes/cov";
@@ -11677,8 +11743,8 @@
src = fetchFromGitHub {
owner = "cython";
repo = "cython";
- rev = "bd0bd943792530194e9bea86e4cf6fe9f8261182";
- sha256 = "1z5li1h376978iby273ynvx52phdnsgsil8vlpj98izf19qnsmmq";
+ rev = "0558bdb4d1ed4da734ac7194f0bdbe7c030cc70e";
+ sha256 = "18hf07pyyxdgb1li26yf26g77xqdpmgkxqkhxsq5aa8chj6zv900";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@@ -11778,12 +11844,12 @@
danneskjold-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "danneskjold-theme";
- version = "20170322.1007";
+ version = "20170404.426";
src = fetchFromGitHub {
owner = "rails-to-cosmos";
repo = "danneskjold-theme";
- rev = "2ea398532e8229e329f6ea9b264ffd42068b16b9";
- sha256 = "1zxj81dqci73zf01h9rz3gkd0qfd7n8238jzkjsmyhyvq7l644hz";
+ rev = "e7066a1310b2437d1b68ec5afd800d06977dd687";
+ sha256 = "116hyd5c74m713xmzsl9panvn7014r7bg4267wvla6844n1qshp8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/557244a3b60c7cd3ca964ff843aa1e9d5a1e32ec/recipes/danneskjold-theme";
@@ -11799,12 +11865,12 @@
dante = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "dante";
- version = "20170328.232";
+ version = "20170410.55";
src = fetchFromGitHub {
owner = "jyp";
repo = "dante";
- rev = "0fe8c8243e5ce1aa6c241d4e5d51e489b1fbd512";
- sha256 = "15r1bczfxbp7rgxh0gq1516kypgnkm4wsf9svl0fxzdcayaawl3k";
+ rev = "9c29ac5cca30b02c227518c472af3a645a7c3d1a";
+ sha256 = "1pk6lmzq64fzbhqvxxvymspknq96zakjb65v52a45jgl4y9c1dlr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante";
@@ -11988,12 +12054,12 @@
darktooth-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "darktooth-theme";
- version = "20170328.1604";
+ version = "20170401.1521";
src = fetchFromGitHub {
owner = "emacsfodder";
repo = "emacs-theme-darktooth";
- rev = "419746ab4c06bd2146ff6ddf68aa74dfd73d8c96";
- sha256 = "0gxvz617np99x5ynh7y0cammxmwxp42kcnnqxl5ljknn4lwbapar";
+ rev = "fb66992286c009e594eb7bb9ee2f1cdc3bebb555";
+ sha256 = "0n7qgnyl4rdvgwjb7gz6m1c22mxwg8bp08r7lz27z0b1bcyw94sc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme";
@@ -12093,12 +12159,12 @@
dashboard = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, page-break-lines }:
melpaBuild {
pname = "dashboard";
- version = "20161229.1711";
+ version = "20170408.1653";
src = fetchFromGitHub {
owner = "rakanalh";
repo = "emacs-dashboard";
- rev = "89875ba44ef9f69dd561591ea8ec6d39a0b4aa6d";
- sha256 = "0qx2kb30s1z0mlr2sk1jx538v768g7df7v5ymmnvipl8xkr2ams3";
+ rev = "b409028a42059c70ac3a64e5a033477f27607101";
+ sha256 = "1s5lrc1vgc9q82nyz43sg094za0ncimr67p4mhmxqqxxchfk75x7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e9a79341ccaa82a8c065e71c02fe6aee22007c66/recipes/dashboard";
@@ -12410,8 +12476,8 @@
src = fetchFromGitHub {
owner = "preetpalS";
repo = "decl.el";
- rev = "500ae2da41c65f4e35abf5cd352411ce7ed3f9df";
- sha256 = "1slfh4sjvprmg0pa4pq1h5jiwiszak7l8hakbvjy1ycbh97gnd17";
+ rev = "b25825de88289fab5212dfd6d18874ca2748123f";
+ sha256 = "1imz3w41vblw9gpw42v6hlrz2zdzd6kp5pfvb97v8dw8mc06pyvs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8c2ecd46180643a0c493e05ec86fe50bc1e55146/recipes/decl";
@@ -12490,12 +12556,12 @@
deferred = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "deferred";
- version = "20161228.1930";
+ version = "20170331.1759";
src = fetchFromGitHub {
owner = "kiwanami";
repo = "emacs-deferred";
- rev = "9668749635472a63e7a9282e2124325405199b79";
- sha256 = "1ch5br9alvwcpijl9g8w5ypjrah29alpfpk4hjw23rwzyq5p4izq";
+ rev = "7f2bb81e75db895c99611a7a9fbde7c239b757ba";
+ sha256 = "09qnk8xhk5vjn7iqfzg3yzydas47453k1qm22gbmlfxh6lvxsqh2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0e9a114d85f630648d05a7b552370fa8413da0c2/recipes/deferred";
@@ -12742,13 +12808,13 @@
pname = "dic-lookup-w3m";
version = "20170315.709";
src = fetchsvn {
- url = "http://svn.osdn.jp/svnroot/dic-lookup-w3m/";
+ url = "https://svn.osdn.jp/svnroot/dic-lookup-w3m/";
rev = "96";
sha256 = "17g0bl94qmzalh3m6r6q10q06864d1h1nx5i7fddsamakmg89ziw";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/6627b66fff02513ee467ed0f4436fb5cd400a81d/recipes/dic-lookup-w3m";
- sha256 = "0zc0phym431bjqg0r8n5xsa98m52xnbhpqlh0jcvcy02nbmdc584";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/dic-lookup-w3m";
+ sha256 = "1siqrarpyqjh1h350dsyca993fy6qin4apgyjm4vpp6awip8xfp0";
name = "dic-lookup-w3m";
};
packageRequires = [ stem w3m ];
@@ -13383,10 +13449,10 @@
}) {};
dired-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
pname = "dired-plus";
- version = "20170324.1112";
+ version = "20170409.1441";
src = fetchurl {
url = "https://www.emacswiki.org/emacs/download/dired+.el";
- sha256 = "00w4d3zw789cl0ch7h0nk4mzlb88806cbq6mcslwf82732vxzkv0";
+ sha256 = "0bjpz9zaq6b158964b37llrn6jakfhzai8ahwyi8d6jsf392hljp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/dired+";
@@ -13685,17 +13751,19 @@
license = lib.licenses.free;
};
}) {};
- dirtree = callPackage ({ fetchurl, lib, melpaBuild, tree-mode, windata }:
+ dirtree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, tree-mode, windata }:
melpaBuild {
pname = "dirtree";
version = "20140129.32";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/dirtree.el";
- sha256 = "1q03q4j0wkbg9p2nzf1kb7l517b21mskp2v52i95jbxh09igbjjx";
+ src = fetchFromGitHub {
+ owner = "emacsorphanage";
+ repo = "dirtree";
+ rev = "ba55f1e716e386fdd37cb8e7f48616e405dc7251";
+ sha256 = "0abs3r4zzfnf4igiakrv3bpyxz7qlnw26l57rynsk7c3w3s5ya29";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/343a34103fd435e01bb64e90536cc1e4da4e83c4/recipes/dirtree";
- sha256 = "0wfz9ks5iha2n0rya9yjmrb6f9lhp620iaqi92lw9smm7w83zj29";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/dirtree";
+ sha256 = "1fm003rix3sdfx8fq3ab5s8b2q65gbkjsn1j3fg5qmhv56p7lrs9";
name = "dirtree";
};
packageRequires = [ tree-mode windata ];
@@ -14580,24 +14648,6 @@
license = lib.licenses.free;
};
}) {};
- dos = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "dos";
- version = "20140808.1435";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/dos.el";
- sha256 = "0sfmcd1rq6wih9q7d9vkcfrw6gf7309mm7491jx091ij8m4p8ypp";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/6c536abcb5a544e22bb339effa5bf39df96c12b9/recipes/dos";
- sha256 = "0cpijbqpci96s0d6rwqz5bbi9b0zkan1bg8vdgib1f87r7g980nc";
- name = "dos";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/dos";
- license = lib.licenses.free;
- };
- }) {};
dot-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dot-mode";
@@ -14935,13 +14985,13 @@
pname = "dsvn";
version = "20130120.1257";
src = fetchsvn {
- url = "http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/";
- rev = "1789422";
+ url = "https://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/";
+ rev = "1790830";
sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a6da3640b72496e2b32e6ed21aa39df87af9f7f3/recipes/dsvn";
- sha256 = "12cviq6v08anif762a5qav3l8ircp81kmnl9q4yl6bkh9zxv7vy6";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/dsvn";
+ sha256 = "0fl23fcnf4x9gm51761551cyr3i9954k0d5nq2c99nxzrajbnyk6";
name = "dsvn";
};
packageRequires = [];
@@ -15037,12 +15087,12 @@
dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }:
melpaBuild {
pname = "dumb-jump";
- version = "20170328.2013";
+ version = "20170330.1409";
src = fetchFromGitHub {
owner = "jacktasia";
repo = "dumb-jump";
- rev = "1df89e837d4c28c941db879b028f92b3378745d8";
- sha256 = "19n18a057ngvfqhaancji06abpp3qlqymsygchv0s9v9q6nzfi49";
+ rev = "1c8d705178607e7175341816f4a20ebd36480329";
+ sha256 = "1lav31cmnyzxpqwv74nwhld9rpjz7wl197cslzjl171ca5n322vm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2a60e7c166c2d68e4f719d293014a22139593dde/recipes/dumb-jump";
@@ -15414,12 +15464,12 @@
easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "easy-hugo";
- version = "20170328.2015";
+ version = "20170409.2149";
src = fetchFromGitHub {
owner = "masasam";
repo = "emacs-easy-hugo";
- rev = "544b6ef850c10e6bb15d0ac9a6474d471044309a";
- sha256 = "1j0ffs9517ba29lwd92sk30ih6sxlx2ychrr6lzc0a3lzdlzfaqz";
+ rev = "65fe2afeb240ff16b6fa0e580e3b03342b388e28";
+ sha256 = "0sv4m44zbil54mppqybq5978f3dnn0smjpkl3qw7d4sfh4dwf779";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/544fa512dc3e6379f451fd9b596d74a5849c87d2/recipes/easy-hugo";
@@ -15561,12 +15611,12 @@
ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }:
melpaBuild {
pname = "ebib";
- version = "20170327.141";
+ version = "20170401.1342";
src = fetchFromGitHub {
owner = "joostkremers";
repo = "ebib";
- rev = "1eea156ea6f1376d474274ce76b1d6864223c47e";
- sha256 = "0lhpwa4rgxb480gzfp55infr9672fv3b3my72f6wkwhh1k5i5xjb";
+ rev = "a1c8a5045ff31001f0a0dde188e20f23640f5469";
+ sha256 = "1awrkcqk38aash3whihhjrxq9f9b568vpiaihyhcsi0773hl5h3b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib";
@@ -15810,12 +15860,12 @@
ede-php-autoload = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ede-php-autoload";
- version = "20170221.1002";
+ version = "20170406.609";
src = fetchFromGitHub {
owner = "stevenremot";
repo = "ede-php-autoload";
- rev = "8ab5c333ded9110ed2dce90ca7fd89dcb3912dd4";
- sha256 = "127a5rf21ynw96lw1ydzdvpjpxzccn3dhvc6f24s96sg8r04hpbw";
+ rev = "2aae77b5ca2ce458f56fe67a33d5e84bb9428e5d";
+ sha256 = "1vsmpvip4dwj1jwvj5iswci14xky4mrfpqgh1g8i56p5ql9ifsmr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8ee9f7fd9cbc3397cd9af34b08b75c3d9d8bc551/recipes/ede-php-autoload";
@@ -16201,8 +16251,8 @@
src = fetchFromGitHub {
owner = "egisatoshi";
repo = "egison3";
- rev = "b196db4ca284abfbc63416582fe17cc357551fc2";
- sha256 = "0sw0cf69yswhgnyp10qjirrb2w2p9y6pc7ni8wbw8l16pmc7vgg0";
+ rev = "a9bec9b4cdaec8fa92bec398c4c5231817e7efad";
+ sha256 = "146jq14xjab996r5ff9nschbrh4zk7grggnj7xm8bxwnr9yv0qv0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode";
@@ -16238,11 +16288,11 @@
}) {};
eide = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
pname = "eide";
- version = "20170213.1254";
+ version = "20170407.1229";
src = fetchgit {
url = "git://git.tuxfamily.org/gitroot/eide/emacs-ide.git";
- rev = "66d4490ec38dd992ba90b3801879d3f0ff312635";
- sha256 = "1y8imvgms7nb8fcpm1v6zkx3hqsf6zygc38gbj87c8s85f2qmfrq";
+ rev = "d15589a117ac710b70df71cdf33a33ca05e55d13";
+ sha256 = "0k0x8xlxnv4fn2q3fyaxpbj4776cbc6ylbiwxqjzvqqzaq6lmx8j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d384f185f76039b06a1b5b12c792b346c6d47a22/recipes/eide";
@@ -16279,12 +16329,12 @@
ein = callPackage ({ cl-generic, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }:
melpaBuild {
pname = "ein";
- version = "20170322.650";
+ version = "20170407.618";
src = fetchFromGitHub {
owner = "millejoh";
repo = "emacs-ipython-notebook";
- rev = "2547226f2ee32726809a3a603e6797492896f170";
- sha256 = "1rkva6lmss32vd96wvgh0r5phdr54xs1hjmwpkcr4x2h1dm1w7a6";
+ rev = "39f5d329f188759662f703cc587a9973bda0aa5a";
+ sha256 = "0lais4n817lizqpjv90ajijh8dwa9znc4ib57v8y20g76yffq1gi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein";
@@ -16396,8 +16446,8 @@
src = fetchFromGitHub {
owner = "dimitri";
repo = "el-get";
- rev = "b47a94877b8b621534403a533ad147a971caaf89";
- sha256 = "0qhy7bxgs8gbbjww438jmmqhz20aczp3bvdpbywbwcmfkadv6086";
+ rev = "cdd39a51aab1ed23ac7195297eb986fc482e8c42";
+ sha256 = "0av2lpj1rij8mcf0jxdfm6pm6pwrv1wzh095z8vsfcdda8svznxc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get";
@@ -16480,8 +16530,8 @@
src = fetchFromGitHub {
owner = "raxod502";
repo = "el-patch";
- rev = "26d1b4f7920ca32e0e76a3ffa23784a80253c9f4";
- sha256 = "0rk1qvgdnx1xn7pmb2713i68xm05kp3cfkwvd5smbkzjj2nvbi20";
+ rev = "c0f1c01a82903a1d7f5d49eba6d9e9d373423907";
+ sha256 = "0kj4rbn86v9hjkshpyn65cmyhrnmg3s6ir6p4ricnhzv11rgkx6y";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2f4f57e0edbae35597aa4a7744d22d2f971d5de5/recipes/el-patch";
@@ -16848,12 +16898,12 @@
elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "elfeed";
- version = "20170305.1633";
+ version = "20170402.1842";
src = fetchFromGitHub {
owner = "skeeto";
repo = "elfeed";
- rev = "5028a4f75cc5e7d7e9134ed32a9f5bc4b6809b32";
- sha256 = "1glj6s8hpas5ph9bg85rq6fq6n4nzq84di27sa2nbv7qpjwq4fcj";
+ rev = "67c4f07f5b0f942f030848f5d657909a1424b597";
+ sha256 = "1dc7csmj8w2k5056dz4lm86qhzgwpmr08s2hj216cpgg7cjxnwc0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed";
@@ -16918,12 +16968,12 @@
elfeed-web = callPackage ({ elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, simple-httpd }:
melpaBuild {
pname = "elfeed-web";
- version = "20170125.1846";
+ version = "20170402.1842";
src = fetchFromGitHub {
owner = "skeeto";
repo = "elfeed";
- rev = "5028a4f75cc5e7d7e9134ed32a9f5bc4b6809b32";
- sha256 = "1glj6s8hpas5ph9bg85rq6fq6n4nzq84di27sa2nbv7qpjwq4fcj";
+ rev = "67c4f07f5b0f942f030848f5d657909a1424b597";
+ sha256 = "1dc7csmj8w2k5056dz4lm86qhzgwpmr08s2hj216cpgg7cjxnwc0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web";
@@ -17048,8 +17098,8 @@
src = fetchFromGitHub {
owner = "Wilfred";
repo = "refs.el";
- rev = "6ef632c8922e01714a25c6e04fd5522be6e5ea26";
- sha256 = "00c9s60g7rl784q4slfaavqkjhj8j73pglflpjh8pvrgj77c4y6y";
+ rev = "54b6221a06a32075d1d0c991f75f53c6c792830e";
+ sha256 = "1xzm86l37fjiknqbsdv14n70mgaw0105i55fbl4rf0p9q4nircmv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/60891099e241ebd32d39bdcfe4953529a5a3263e/recipes/elisp-refs";
@@ -17380,12 +17430,12 @@
elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }:
melpaBuild {
pname = "elpy";
- version = "20170324.227";
+ version = "20170401.1152";
src = fetchFromGitHub {
owner = "jorgenschaefer";
repo = "elpy";
- rev = "c793c9d048f16b74bddf7aff5b3e3cf32d90f71f";
- sha256 = "0cmn8j2hbh5qzwwskhjmpilgcdf0h3lm9jj0vx1fwwagxg369gw2";
+ rev = "9d143d1e85d6d05792e4557393edeeb155fc950e";
+ sha256 = "0wbvym7jal2n45pqd1nf10009cxlfffdsyip7yv1fixbb6b39y5c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy";
@@ -17976,13 +18026,13 @@
pname = "emms";
version = "20170301.1406";
src = fetchgit {
- url = "git://git.sv.gnu.org/emms.git";
+ url = "https://git.savannah.gnu.org/git/emms.git";
rev = "6601ba8ef710b8ed260773e18a3baa940a7adc3a";
sha256 = "1fzbzyvm98128dr01rldlabqkz9mag1z1qys36v2h6cfax1xjv9i";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/205eeed002b0848809a4c5f8ad99d925b48799ec/recipes/emms";
- sha256 = "0kzli8b0z5maizfwhlhph1f5w3v6pwxvs2dfs90l8c0h97m4yy2m";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/emms";
+ sha256 = "1xpry8h96gvjnc0v8x0vk5dnmlq1r7m3ljpampdwv9pfwl95fh94";
name = "emms";
};
packageRequires = [];
@@ -18078,12 +18128,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 = "20170322.830";
+ version = "20170330.904";
src = fetchFromGitHub {
owner = "momomo5717";
repo = "emms-player-mpv-jp-radios";
- rev = "dbb22a8ccfabf961965093abefa77217cac1d8ff";
- sha256 = "0w22qkdqw5328rxn7ik4yfw77wbigaspyz30hd1v68qklhxpag94";
+ rev = "7c3dc98e86a178c217bec74fb1e5da7de00fded9";
+ sha256 = "0xdqi3fi26pj166z2f1fpl9ckdma9rsck324ha343r2y3snfzch0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/09ba6da5057061f055d4a3212d167f9666618d4f/recipes/emms-player-mpv-jp-radios";
@@ -18246,12 +18296,12 @@
emojify = callPackage ({ emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, seq }:
melpaBuild {
pname = "emojify";
- version = "20170323.730";
+ version = "20170401.954";
src = fetchFromGitHub {
owner = "iqbalansari";
repo = "emacs-emojify";
- rev = "9ce171d38915c81ba0f387e013aad2e089d61d48";
- sha256 = "1p2hws3jyk4pvgxznirp20r9s6h1554h6sn8kil203cb4l64wb3f";
+ rev = "4f365dc562c8c5642719faf85b7536278c561d2e";
+ sha256 = "0j3ydg2n6dq77qpyhyqdkbxhfhzmml5b5h8cghsx0i5267grssph";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/488d2751b5fd3bf00f5a6f0545530f44563b86d7/recipes/emojify";
@@ -18468,12 +18518,12 @@
ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }:
melpaBuild {
pname = "ensime";
- version = "20170318.1059";
+ version = "20170401.257";
src = fetchFromGitHub {
owner = "ensime";
repo = "ensime-emacs";
- rev = "9ccf54cddb1d7884f36de9d7d077cee55eae410e";
- sha256 = "0y6v9bmhspfmr3bmqf5av4n1xdwj0nx9fws0gw8n9ln92yz6w3sz";
+ rev = "bb09141e7e2a25947f891008cf6036525c8ed484";
+ sha256 = "15r76hmibpyvz87mwi9qzyn63l7k4ab5bhx5g5ziaak8q3vwwibl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime";
@@ -19109,8 +19159,8 @@
src = fetchFromGitHub {
owner = "erlang";
repo = "otp";
- rev = "53b483cb14c4b3b666eab63f9f09d7ac827f9a7c";
- sha256 = "1pw1ibqyn7j56dk6yh21hg91xv5kp478da3xv3gb77mh4is09n8b";
+ rev = "a7307600a2b8dbcf628ae8ccf26137bc32f060cc";
+ sha256 = "0q07c7h6pzfl72i8vfb9j9l069zjblfclcxl9bnmci9kzj7ghmrr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -19165,16 +19215,19 @@
license = lib.licenses.free;
};
}) {};
- ert-expectations = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+ ert-expectations = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
pname = "ert-expectations";
- version = "20130824.500";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/ert-expectations.el";
- sha256 = "0cwy3ilsid90abzzjb7ha2blq9kmv3gfp3icwwfcz6qczgirq6g7";
+ version = "20121009.34";
+ src = fetchFromGitHub {
+ owner = "emacsorphanage";
+ repo = "ert-expectations";
+ rev = "aed70e002c4305b66aed7f6d0d48e9addd2dc1e6";
+ sha256 = "0qgi3rj49k0hz4azg7ghcj6385p5s9gakqjhrjnhih7dxvihcgxi";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/55809f1a04061a26665d2995975aba429815c19e/recipes/ert-expectations";
- sha256 = "094lkf1h83rc0dkvdv8923xjrzj5pnpnsb4izk8n5n7g0rbz1l9w";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/84f836338818946a6bb31d35d6ae959571128ed5/recipes/ert-expectations";
+ sha256 = "07mp0azb6wsa1z4s6q8jyh7dpzils0wh2bamfmxzy4gjqjwv8ncn";
name = "ert-expectations";
};
packageRequires = [];
@@ -19266,22 +19319,22 @@
license = lib.licenses.free;
};
}) {};
- es-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s, spark }:
+ es-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s, spark }:
melpaBuild {
pname = "es-mode";
- version = "20170307.2136";
+ version = "20170410.354";
src = fetchFromGitHub {
owner = "dakrone";
repo = "es-mode";
- rev = "527a2f70e1de7df46e59609b245e7e99c53708d1";
- sha256 = "19kss3hrjf1cj4lgj68qw5zszar7c7pjbqj8sxlwicnrg831mj0n";
+ rev = "25a7361365d25ad6823b99913be72d1b724083b3";
+ sha256 = "0lqxk54443x0ccxr745k5dlq6zh4kqc1dmnhh6dqcnfyc4amqs0v";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/85445b59329bfd81a3fd913d7d6fe7784c31744c/recipes/es-mode";
sha256 = "1541c7d8gbi4mgxwk886hgsxhq7bfx8is7hjjg80sfn40z6kdwcp";
name = "es-mode";
};
- packageRequires = [ cl-lib dash s spark ];
+ packageRequires = [ cl-lib dash request s spark ];
meta = {
homepage = "https://melpa.org/#/es-mode";
license = lib.licenses.free;
@@ -19630,8 +19683,8 @@
src = fetchFromGitHub {
owner = "ecukes";
repo = "espuds";
- rev = "ef854367d469c6eff459d24a544addd21a4fbd23";
- sha256 = "024msmnwlnsgqa523s3phxj1g77pyw917gz1fhz56062576nv22q";
+ rev = "67a77b92f23f9016d133543de93bfbe1b2f9a818";
+ sha256 = "0xmcdw5hw6dmcmwjp1jvdvh2ijymlkcksjscm28cj442s4sarqgs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/14cf66e6929db2a0f377612e786aaed9eb12b799/recipes/espuds";
@@ -20163,22 +20216,22 @@
license = lib.licenses.free;
};
}) {};
- evil-colemak-basics = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ evil-colemak-basics = callPackage ({ emacs, evil, evil-snipe, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-colemak-basics";
- version = "20161117.1319";
+ version = "20170405.1037";
src = fetchFromGitHub {
owner = "wbolster";
repo = "evil-colemak-basics";
- rev = "5e56117af85e89659e9565abefef24fab7b567e8";
- sha256 = "0r62rpgklsc24yj57w72jq9i1c54fr4ksy99siyvkginmcink7kz";
+ rev = "207fddde50e36fc3ccd926c69ef7901e938db2ff";
+ sha256 = "06r0x6yvwa811sfb9izzld4a460wip7nn6dfxw91i6x8g825h2qd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/945417d19faf492fb678aee3ba692d14e7518d85/recipes/evil-colemak-basics";
sha256 = "1sbbli0hdmpc23f3g5n95svqfdg3rlvf71plyvpv1a6va9jhi83k";
name = "evil-colemak-basics";
};
- packageRequires = [ emacs evil ];
+ packageRequires = [ emacs evil evil-snipe ];
meta = {
homepage = "https://melpa.org/#/evil-colemak-basics";
license = lib.licenses.free;
@@ -20208,12 +20261,12 @@
evil-commentary = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-commentary";
- version = "20161015.1251";
+ version = "20170410.227";
src = fetchFromGitHub {
owner = "linktohack";
repo = "evil-commentary";
- rev = "a5f2543cb2b90d73b86776f02b25ef16c505832e";
- sha256 = "1nslk5j55yqaczpbz7w8jirl6gbccb32w8g6bm7higvv8cjv7qsg";
+ rev = "8cd9ea799e981b3b5ed3dcdf45d5464096e4abd2";
+ sha256 = "1bq8f00dczhlqsp6s7k7cjb9mfpdznykwqm3jn7nj5fn5gdiramx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fe5b05152c919d49ddd920b1bd5ffc351141fa0d/recipes/evil-commentary";
@@ -20628,12 +20681,12 @@
evil-mc = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-mc";
- version = "20170312.2052";
+ version = "20170405.1418";
src = fetchFromGitHub {
owner = "gabesoft";
repo = "evil-mc";
- rev = "62378695eb45990dec776864e16c28829136aeb6";
- sha256 = "196ii51malqh2ahfk13rj6p4np0755zhx4pdk18090pwl4hgkzfz";
+ rev = "79f5755a65018d8e9798f52e595771e7abbbed2d";
+ sha256 = "17xx4m6j5dcgd33pjqlra5xfqwx1hdhrwqy2mqbykzxpbmadlmph";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/96770d778a03ab012fb82a3a0122983db6f9b0c4/recipes/evil-mc";
@@ -20691,12 +20744,12 @@
evil-multiedit = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, iedit, lib, melpaBuild }:
melpaBuild {
pname = "evil-multiedit";
- version = "20161010.1703";
+ version = "20170408.1744";
src = fetchFromGitHub {
owner = "hlissner";
repo = "evil-multiedit";
- rev = "e2df8629971df7c905256c504ff5f90b94eebdb8";
- sha256 = "127x55msyy54n6lkml615akhafnbn62cxnmwj1brjwzzi5cbk6bn";
+ rev = "615f2ac3539c39d5ec11e4c9ba0958d8a9381090";
+ sha256 = "068cymahvpyzn13wnma0lfym0f0vfr36kdq7pl8qmhf8ra7xxq92";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/997f5a6999d1add57fae33ba8eb3e3bc60d7bb56/recipes/evil-multiedit";
@@ -20884,8 +20937,8 @@
src = fetchFromGitHub {
owner = "linktohack";
repo = "evil-rsi";
- rev = "236bf6ed1e2285698db808463e5f2f69f5f5e7c0";
- sha256 = "1xz629qv1ss1fap397k48piawcwl8lrybraq5449bw1vvn1a4d9f";
+ rev = "65ae60866be494e4622fe383e23975e04d2a42a3";
+ sha256 = "0cc2yxck5brnicllcadb4m5zlzczvdy6v38q34hj8bri1kxfzslz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/24f438b47e8ede0ef84261424c122d2ac28b90cb/recipes/evil-rsi";
@@ -20905,8 +20958,8 @@
src = fetchFromGitHub {
owner = "juanjux";
repo = "evil-search-highlight-persist";
- rev = "2f9ea9086373292610f50e5f468b55c3fe072bfc";
- sha256 = "04mf3zd424kfnswifrg3qlyi39f58ydnm7ahcd0zi168bv1d9r6j";
+ rev = "1b130e771fc9f3bb7c80e1a50c2847a9e024ad09";
+ sha256 = "1la7gamv1qd5wsdlxjjx859zciynln3g9lnxq51iylsbfxgc2f7s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/91361f95852910968b395423e16377c70189fc55/recipes/evil-search-highlight-persist";
@@ -20943,12 +20996,12 @@
evil-snipe = callPackage ({ cl-lib ? null, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-snipe";
- version = "20170328.1011";
+ version = "20170405.1644";
src = fetchFromGitHub {
owner = "hlissner";
repo = "evil-snipe";
- rev = "3579123acb130e18e9bd8ff3b3029f7052528a32";
- sha256 = "0pn4k55wg2lzjlpv10c39mvcb6y2fgbc6cfb24czw70ykc5ln087";
+ rev = "c3e5e26c14f4a47daedb4fc48e1b0fb993aa0999";
+ sha256 = "009491hskqkvycng70n3mm7zqxlf6jjninddlcbnknyfr44y4xka";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6748f3febbe2f098761e967b4dc67791186d0aa7/recipes/evil-snipe";
@@ -21048,12 +21101,12 @@
evil-terminal-cursor-changer = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-terminal-cursor-changer";
- version = "20160806.2236";
+ version = "20170401.142";
src = fetchFromGitHub {
owner = "7696122";
repo = "evil-terminal-cursor-changer";
- rev = "918a741c2ad83f3aa3478863d01bf57422eb6009";
- sha256 = "0wdn2gp93r555p7pp9pw8ma2wfs2gzvb54ncrh3ad0p8v95x1kf5";
+ rev = "b49ca4393d2f3cc6014174950059b36a5cb22949";
+ sha256 = "1zra2h0x20whshbc4sfyj6w73jv6ak435mr9n6r6s7brqqqgpa36";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/148d324afb1891b239dfad680ad7b87b4611316b/recipes/evil-terminal-cursor-changer";
@@ -21591,12 +21644,12 @@
f = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "f";
- version = "20161002.800";
+ version = "20170404.1039";
src = fetchFromGitHub {
owner = "rejeep";
repo = "f.el";
- rev = "4ef57d1539a964a0d02b23becbe9b5e49b805d66";
- sha256 = "1hymz7chs177pwgfddz6prb18iqj93n1j2xzfszlgl28246939cl";
+ rev = "fabdbd4a4a8caf8684f0fa656f457a03c5dfa4de";
+ sha256 = "1983ymny8329d826kfm5f88na1lym991xnz8wjz4nd1ah52c323x";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/22ddcf536af597b688d8edb70b3636ed6c265bf5/recipes/f";
@@ -22224,10 +22277,10 @@
}) {};
find-dired-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
pname = "find-dired-plus";
- version = "20170222.1750";
+ version = "20170409.1832";
src = fetchurl {
url = "https://www.emacswiki.org/emacs/download/find-dired+.el";
- sha256 = "002lcqhddw163w8h2lkp3yd47qhbia9ml7g8agngffsin9jip7qw";
+ sha256 = "0zfqkw9vghbzvdh3iyqkkdq777bb1yhfgqk7p28dxz861z13cmfs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0c8f884334b7eb83647146e7e8be028935ba12ce/recipes/find-dired+";
@@ -22243,12 +22296,12 @@
find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "find-file-in-project";
- version = "20161202.2205";
+ version = "20170402.2100";
src = fetchFromGitHub {
owner = "technomancy";
repo = "find-file-in-project";
- rev = "08ab38b89d21f528fa7dc18f860191365852959a";
- sha256 = "1ybv1scpf7578zfjpl71nynzydq8g5607ai6l0vavprdhri70xdf";
+ rev = "a81f7d7020d5bdfcc835911d4def6f09301a1f55";
+ sha256 = "167anv3qyslfzyrcq4qnzhdx8zhbj1r0lmrvnp1spsalvcbph9ih";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project";
@@ -22342,16 +22395,19 @@
license = lib.licenses.free;
};
}) {};
- findr = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+ findr = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
pname = "findr";
- version = "20130824.507";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/findr.el";
- sha256 = "0a04mgya59w468jv2bmkqlayzgh0r8sdz0qg3n70wn9rhdcwnl9q";
+ version = "20130127.1232";
+ src = fetchFromGitHub {
+ owner = "emacsorphanage";
+ repo = "findr";
+ rev = "1ddbc0464bb05dcda392b62666ad17239a2152d3";
+ sha256 = "0wx4hd4agrfvk0igyash658cbf7v3bv01rlspllsvzr59fl3faqq";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/66bba94ec4168441c8e43253c7e1cfd82b613431/recipes/findr";
- sha256 = "0pxyfnn3f70gknxv09mfkjixqkzn77rdbql703wsslrj2v1l7bfq";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/findr";
+ sha256 = "0pw72bdpmc0ymlgjmwwrslhynij5a5b9sc3rx6vyprpv1ad4ac2c";
name = "findr";
};
packageRequires = [];
@@ -23081,8 +23137,8 @@
src = fetchFromGitHub {
owner = "Gnouc";
repo = "flycheck-checkbashisms";
- rev = "39362240b8e38e6ddc1da2e2c2229e3fecdf6057";
- sha256 = "1s2zq97d7ryif6rlbvriz36dh23wmwi67v4q6krl77dfzcs705b3";
+ rev = "0794ad763d7cd81286283f6400bc89a81e8e07d4";
+ sha256 = "06jkvi17960wghphar9c1nixanb0197v8q5nm96mgz0gxn923400";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f5678ea5aef4dc8a517d6d9381a64f182645d344/recipes/flycheck-checkbashisms";
@@ -23308,12 +23364,12 @@
flycheck-dedukti = callPackage ({ dedukti-mode, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-dedukti";
- version = "20150106.651";
+ version = "20170407.258";
src = fetchFromGitHub {
owner = "rafoo";
repo = "flycheck-dedukti";
- rev = "717977c0ead0dc6e267ba2164781d92ee016b7b2";
- sha256 = "1hw875dirz041vzw1pxjpk5lr1zmrp2kp9m6pazs9j19d686hyn6";
+ rev = "ea34af5e677fbf18a40935b531abb1d9aae59f6b";
+ sha256 = "03flfn7caxa8jpp6v3mn1mvs8lf4khcl8nsgd1nb93k7wp9x6l5s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/732832e88a65a8866fa3872ff5f29eb8a26438f2/recipes/flycheck-dedukti";
@@ -23392,12 +23448,12 @@
flycheck-dmd-dub = callPackage ({ f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-dmd-dub";
- version = "20170323.634";
+ version = "20170403.1116";
src = fetchFromGitHub {
owner = "atilaneves";
repo = "flycheck-dmd-dub";
- rev = "5bc8c9511eb9817fddadb65ff4f0520b52c09de3";
- sha256 = "18xcgpqr0cxhp79i6zq9c1131rwcsv9lmryiiyph56zl4vg2hb37";
+ rev = "879c52116989f6041ccd20f5db210f5552d5c649";
+ sha256 = "12qblzrw99lcl8qccl26kwqiwscn04izvjrsq3mnp1r5q0s0jxl2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a812594901c1099283bdf51fbea1aa077cfc588d/recipes/flycheck-dmd-dub";
@@ -23417,8 +23473,8 @@
src = fetchFromGitHub {
owner = "aaronjensen";
repo = "flycheck-dogma";
- rev = "7e14207a7da67dc5524a8949cb37a3d11de1db6e";
- sha256 = "1f3wn48am7920s6pm7ds1npfbj1w2pb8k790rl79rvc398g1pyyr";
+ rev = "eea1844a81e87e2488b05e703a93272d0fc3bc74";
+ sha256 = "0wmp4q1jzb6giwrv8ajgqriy155mcc7jnj5sycpfk3hw6q74js66";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1dd7601c55206fd0b9b59f98e861c52b9d640278/recipes/flycheck-dogma";
@@ -23959,12 +24015,12 @@
flycheck-pyflakes = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-pyflakes";
- version = "20170325.1258";
+ version = "20170330.1611";
src = fetchFromGitHub {
owner = "Wilfred";
repo = "flycheck-pyflakes";
- rev = "439c0e5bcc4bb1a0c68b619a862df6ea316f0b43";
- sha256 = "0fjjv8ygx55vk91fdzn7ikm6kgwq9kzn14f5lfawipyymxrih3na";
+ rev = "61b045939e3743b2162b7e4e73249c66fc2b8f65";
+ sha256 = "03p0666vpprp6ijkvx9ypaw58bdq42gh533270plv2k5l8r22cl1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/05e6f3041151006e44f91e5bcbaa7be3750fb403/recipes/flycheck-pyflakes";
@@ -23998,48 +24054,48 @@
license = lib.licenses.free;
};
}) {};
- flycheck-rust = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, seq }:
+ flycheck-rtags = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, rtags }:
+ melpaBuild {
+ pname = "flycheck-rtags";
+ version = "20170403.957";
+ src = fetchFromGitHub {
+ owner = "Andersbakken";
+ repo = "rtags";
+ rev = "476cdf8b01ced2b49f364c8a2509acddac288cf8";
+ sha256 = "189zmd61sgl0gqacfnglgzazf3gsc3yv57mdk3k7nqs9ysv2wygj";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags";
+ sha256 = "00v6shfs7piqapmyqyi0fk3182rcfa3p8wr2cm5vqlrana13kbw4";
+ name = "flycheck-rtags";
+ };
+ packageRequires = [ emacs flycheck rtags ];
+ meta = {
+ homepage = "https://melpa.org/#/flycheck-rtags";
+ license = lib.licenses.free;
+ };
+ }) {};
+ flycheck-rust = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, seq }:
melpaBuild {
pname = "flycheck-rust";
- version = "20170322.306";
+ version = "20170404.842";
src = fetchFromGitHub {
owner = "flycheck";
repo = "flycheck-rust";
- rev = "ae7c14758c3d33615d981f15951500feb2881b06";
- sha256 = "1gldjfg112jphpvzbaz3viars8yjyb783ry1sp37g5nlb80lf7jb";
+ rev = "a89c0298f5e8fdcb0c33833ca1eca64632cec053";
+ sha256 = "1h2n1y69fxj2naxlyl7056rhggbpmh13ny2rcf0jjr1qnrrq756n";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/68d8cdf3d225b13ebbbe5ce81a01366f33266aed/recipes/flycheck-rust";
sha256 = "1k0n0y6lbp71v4465dwq7864vp1qqyx7zjz0kssszcpx5gl1596w";
name = "flycheck-rust";
};
- packageRequires = [ dash emacs flycheck seq ];
+ packageRequires = [ dash emacs flycheck let-alist seq ];
meta = {
homepage = "https://melpa.org/#/flycheck-rust";
license = lib.licenses.free;
};
}) {};
- flycheck-scala-sbt = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, sbt-mode }:
- melpaBuild {
- pname = "flycheck-scala-sbt";
- version = "20170226.1127";
- src = fetchFromGitHub {
- owner = "rjmac";
- repo = "flycheck-scala-sbt";
- rev = "2d063d42628baf4cd4f38224013ece5b027db046";
- sha256 = "0ch63mm24ljpz1kd6w2qs4218ifir6aah7dnxipi2q2yz24frg6x";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/0afc1e5b31689a5ba52443e2878114d9ec0e7757/recipes/flycheck-scala-sbt";
- sha256 = "09d6nj7rc1ba4psnb2csnmrs1mh5xnwh7gq7g6kq4y4f27wr8zcg";
- name = "flycheck-scala-sbt";
- };
- packageRequires = [ emacs flycheck sbt-mode ];
- meta = {
- homepage = "https://melpa.org/#/flycheck-scala-sbt";
- license = lib.licenses.free;
- };
- }) {};
flycheck-stack = callPackage ({ fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-stack";
@@ -24064,12 +24120,12 @@
flycheck-status-emoji = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-status-emoji";
- version = "20170311.1203";
+ version = "20170405.1600";
src = fetchFromGitHub {
owner = "liblit";
repo = "flycheck-status-emoji";
- rev = "2f323cb210a280fc05061f3fc689c627b40bfcb3";
- sha256 = "0gz18jp5bcwm86w6ir8vyf8rb3l2h524zfvx0jpfk0k1mmxj9cs7";
+ rev = "c4e891ad287c12b83b754ada27b4550fb763c07f";
+ sha256 = "12nlzs4fha1bmq1xbfgf5j4wg9llacl2m3jr8fbk8144pyss3kg5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5abd6aaa8d2bf55ae75cd217820763531f91958b/recipes/flycheck-status-emoji";
@@ -24106,12 +24162,12 @@
flycheck-swift3 = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-swift3";
- version = "20161229.331";
+ version = "20170409.25";
src = fetchFromGitHub {
owner = "GyazSquare";
repo = "flycheck-swift3";
- rev = "ae7b29111cb160774c317997902d7ef29cedd7d9";
- sha256 = "17s34rqxkirb88y8jzl3ybs7j3ylp9ckdfx3sqwfn0cyspnj5f1d";
+ rev = "6b0b7c6fffc86809d0535afebd6b0972059992d5";
+ sha256 = "0d411idv9ib1jhmdbjb8ycc8clmm1ygpwapaka3d50gkgrmfin4q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f1fb8c731c118327dc0bbb726e046fec46bcfb82/recipes/flycheck-swift3";
@@ -24194,8 +24250,8 @@
src = fetchFromGitHub {
owner = "abingham";
repo = "emacs-ycmd";
- rev = "8fbdaeaec7704155a047ac17c11d4cf4208f5f79";
- sha256 = "0hvvyficrdxwwg9gyyzmvdsx7v1dh07qrzcvcdn1lq1q1shwcng9";
+ rev = "6b32dc7a832e6c4883dd434530c8d6d69fe36c15";
+ sha256 = "0zx57xhg065hbcisvsryqv2lb34fnzfvzv418nbc6r3yy29yb9ar";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/332e5585963c04112a55894fe7151c380930b17c/recipes/flycheck-ycmd";
@@ -25430,8 +25486,8 @@
src = fetchFromGitHub {
owner = "larsbrinkhoff";
repo = "forth-mode";
- rev = "45650c28a2cdc149a4480d5ea754758c75f8eb01";
- sha256 = "14p0qygs2ng0jq7hqnhq3za52pzs8gv8qr75a6ic0irh21mvspzp";
+ rev = "52d84393c09be34934efe3cf80849d438cffb632";
+ sha256 = "15lq5q0vzzy8hppzxn06wkm843zhnhq922sg0f9bxcnwvs7v2v99";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e46832079ee34c655835f06bf565ad5a5ab48ebd/recipes/forth-mode";
@@ -25468,12 +25524,12 @@
fortune-cookie = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fortune-cookie";
- version = "20151110.2235";
+ version = "20170407.1517";
src = fetchFromGitHub {
owner = "andschwa";
repo = "fortune-cookie";
- rev = "9bf0d29358989e1aee61c472bd5204b9bdf46465";
- sha256 = "1kk04hl2y2svrs07w4pq9f4g7vs9qzy2qpw9prvi1gravmnfrzc4";
+ rev = "bad99a2cd090f6646c7ee1125b95dd98744939c6";
+ sha256 = "1kiflisiabc39lxi5hcazfvcwrpasl01lqsi2sri6pyrcrjyh8mf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ab0d56626c9bf847c693b4d9ddb08acee636054f/recipes/fortune-cookie";
@@ -25759,22 +25815,22 @@
license = lib.licenses.free;
};
}) {};
- fstar-mode = callPackage ({ company, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ fstar-mode = callPackage ({ company, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, quick-peek, yasnippet }:
melpaBuild {
pname = "fstar-mode";
- version = "20170329.953";
+ version = "20170408.1115";
src = fetchFromGitHub {
owner = "FStarLang";
repo = "fstar-mode.el";
- rev = "a033486d2d01cccb3d1b3a17e57155cca167b08e";
- sha256 = "1dwcni802pqmj3safvr36c7l5mafdvyfvxy1k5qp3ah7qy08xknw";
+ rev = "88ac69fbe056972ac92f8f941aade79147df2124";
+ sha256 = "1pm8zjvfdi2qgm0313flmgwjkc7yb1k4h85kw3m0d6g02g5s9rfk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e1198ee309675c391c479ce39efcdca23f548d2a/recipes/fstar-mode";
sha256 = "0kyzkghdkrnqqbd5b969pjyz9jxgq0j8hkmvlcwikl7ynnhm9lgy";
name = "fstar-mode";
};
- packageRequires = [ company dash emacs ];
+ packageRequires = [ company dash emacs flycheck quick-peek yasnippet ];
meta = {
homepage = "https://melpa.org/#/fstar-mode";
license = lib.licenses.free;
@@ -25908,12 +25964,12 @@
futhark-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "futhark-mode";
- version = "20170216.138";
+ version = "20170408.908";
src = fetchFromGitHub {
owner = "HIPERFIT";
repo = "futhark";
- rev = "9e9f3b91db7ac161e5985ee8e6104c7eb05d24f9";
- sha256 = "0kmj9kgp3xcyvx5xc67h69y8ghiw5wc42n9n2gc66in8j8sfxxr3";
+ rev = "dfc095d0cbb77cbdee5005bbfaea10257eea059b";
+ sha256 = "090j76qfj32i9r96cqv8kp57g9mfj3w50a125gx8h1xknqb7831a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode";
@@ -26723,8 +26779,8 @@
src = fetchFromGitHub {
owner = "magit";
repo = "magit";
- rev = "13352f1ef23c5ccbf7f5f4c54049c1dd66ae3335";
- sha256 = "0cfz0mb5p7q1bizvv81pqywhcy883093ld6ly3zv4kxbg6lg5jcb";
+ rev = "51ed4d7b3642f20bcc30cd664bfb1936e92531c3";
+ sha256 = "14m4zhcq8rbfrmb6cykpa6i0rr4cyx1g3p01jgrk7yciygd42255";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
@@ -26866,12 +26922,12 @@
git-lens = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "git-lens";
- version = "20160203.2237";
+ version = "20170403.418";
src = fetchFromGitHub {
owner = "pidu";
repo = "git-lens";
- rev = "be62df785ae14fa8652fe2cdd342d3256f8c0933";
- sha256 = "02p73q0kl9z44b9a2bhqg03mkqx6gf61n88qlwwg4420dxrf7sbc";
+ rev = "77e74e8575e3be49ff19b9d79bd4b8d9d8a662e0";
+ sha256 = "1axh9v1svb6353g2mqkfk9d0b7q1g4rkscw6nj1g9z72ix4rmnch";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/66fd7c0642e8e61b883d2030f88892d039380475/recipes/git-lens";
@@ -27475,12 +27531,12 @@
gnu-apl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "gnu-apl-mode";
- version = "20170123.248";
+ version = "20170406.732";
src = fetchFromGitHub {
owner = "lokedhs";
repo = "gnu-apl-mode";
- rev = "ffa5fec15971ccec0b19f759c9191cac9ee851eb";
- sha256 = "0hlzdvm7d0r9jh4cv9ff1wdjyfffr2417kkq0mlbv0bvqczwdd8b";
+ rev = "72f6a7fc9153d141494b19ca7ff2c0d1e35c2a16";
+ sha256 = "12w5hnp5nnsy532kfwsp43n633k1n03hs1az6pd9sczjzhhz9ihb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/369a55301bba0c4f7ce27f6e141944a523beaa0f/recipes/gnu-apl-mode";
@@ -27686,8 +27742,8 @@
src = fetchFromGitHub {
owner = "nsf";
repo = "gocode";
- rev = "007b034ad7b6d5b70bd18348fc7609a9fdcbad18";
- sha256 = "1cy7fjbip8c9pmv91bk4kcjcl5qdz3an2i78ywlb3b2qhsac21kc";
+ rev = "1ed1baa46aeda2ce7de181161d4e2d369a740ce1";
+ sha256 = "1ywyvppqyv6r52jagjn45nbrx9r5hsr2b3nxaya8sxsrkjv6hsn7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/go-autocomplete";
@@ -28481,8 +28537,8 @@
src = fetchFromGitHub {
owner = "vmware";
repo = "govmomi";
- rev = "ba5f0223b6e1fa692f0e700718a8cfa65595e2b3";
- sha256 = "1bglnvp009x8c5na3zdzbvfz72i1arxmi5y1c2i0yjw4hggqvvlm";
+ rev = "9bfdc5ce62c0585b48b154cc460f8664dcd124c3";
+ sha256 = "0p00s08fjwh106dag9wyhikzrh0vqd4pzb852b2zrmb7zlhigx65";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc";
@@ -29008,12 +29064,12 @@
gruber-darker-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "gruber-darker-theme";
- version = "20161017.1108";
+ version = "20170330.1211";
src = fetchFromGitHub {
owner = "rexim";
repo = "gruber-darker-theme";
- rev = "ac87018437667c84fb5bb7e7b17e5ab2c8347272";
- sha256 = "0gw06d9h0fn9jds8vk8dkz8ghf62jrjmxj8q0qlaisdipmdqk87n";
+ rev = "b9e59d9580d2b95dabf9a53ee3d51c2868b693fa";
+ sha256 = "16g3rshbh9xzr6ng58vp2qw3zin0ylvlnmdg54p5cf8f0d11fd4a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/87ade74553c04cb9dcfe16d03f263cc6f1fed046/recipes/gruber-darker-theme";
@@ -29701,12 +29757,12 @@
haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "haskell-mode";
- version = "20170325.553";
+ version = "20170406.25";
src = fetchFromGitHub {
owner = "haskell";
repo = "haskell-mode";
- rev = "c8fe96acc1a8e73e39445b2d5e050540d69d9f5a";
- sha256 = "03wjrpr191ydqd1kgh65h6naw5bsk16zk14cw885zidyv27d0hr2";
+ rev = "8165d8a809c21e220a257806ebe88180cbc8694a";
+ sha256 = "1vx6liapkkfsd678nmlsx3r641v2vxxbqk82cw6cqanzp3i5p7y4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode";
@@ -29805,12 +29861,12 @@
haxe-imports = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, s }:
melpaBuild {
pname = "haxe-imports";
- version = "20160814.52";
+ version = "20170330.1604";
src = fetchFromGitHub {
owner = "accidentalrebel";
repo = "emacs-haxe-imports";
- rev = "0fbd5d26f976bcf70bf26e685b2c3c0dc465a058";
- sha256 = "0hkyhj29imn1hrjabqjwqlj47qdwigcyclic3k3bigk06pjwalmh";
+ rev = "164e9d2b6ce420dda543d8dade27d2f28d347132";
+ sha256 = "1ymg128qpr325hakjw3b9jckq87k8nhk8jlx8hdqa1yx6rv0lfda";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/db7d2b08e914aab7719c6d3a951b142ec7252f34/recipes/haxe-imports";
@@ -29969,12 +30025,12 @@
helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
melpaBuild {
pname = "helm";
- version = "20170329.1221";
+ version = "20170409.1155";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm";
- rev = "b7b2cf9fbf0ad68a7487ddab62677384d19b3b8a";
- sha256 = "0qhdyazyz5y0gs1fcyy4xf4ffdvwrjxpfiki4iyy1fin481bkhwv";
+ rev = "57ea1a4727cdacf915ba4c20a452d8959919f7e2";
+ sha256 = "1sj228sr4zp6cbcjx5hakm220adxz9a4flkhg00dkafqzhzgflna";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -30557,12 +30613,12 @@
helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "helm-core";
- version = "20170329.1221";
+ version = "20170410.557";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm";
- rev = "b7b2cf9fbf0ad68a7487ddab62677384d19b3b8a";
- sha256 = "0qhdyazyz5y0gs1fcyy4xf4ffdvwrjxpfiki4iyy1fin481bkhwv";
+ rev = "57ea1a4727cdacf915ba4c20a452d8959919f7e2";
+ sha256 = "1sj228sr4zp6cbcjx5hakm220adxz9a4flkhg00dkafqzhzgflna";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -30914,12 +30970,12 @@
helm-flx = callPackage ({ emacs, fetchFromGitHub, fetchurl, flx, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-flx";
- version = "20170110.957";
+ version = "20170404.1230";
src = fetchFromGitHub {
owner = "PythonNut";
repo = "helm-flx";
- rev = "4ba59e1db2d3c33c8ebd40207456f31ab05c5d75";
- sha256 = "1bh0nbw2ylgfba0k2bvhasxr6nlcvs5g62ls0xy8207dayjrbjxk";
+ rev = "c8650d9b34afbc236c28aee12cbee998fda8d810";
+ sha256 = "0400maq605qq631a766lzmphyaxwq0lfvb6x29j6aqd6pgxxrjs5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f1418d260f34d698cec611978001c7fd1d1a8a89/recipes/helm-flx";
@@ -31229,12 +31285,12 @@
helm-google = callPackage ({ fetchFromGitHub, fetchurl, google, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-google";
- version = "20170318.527";
+ version = "20170407.1156";
src = fetchFromGitHub {
owner = "steckerhalter";
repo = "helm-google";
- rev = "27e619d3bd9974a8e1aebd2e10ebf658f49e620b";
- sha256 = "01bw1papl2cblqd6kciw9aha7jkj3rilxb8mzi0avpxgm1g3d1fb";
+ rev = "b3f10af10075f1982434d4c27c5933124940942a";
+ sha256 = "102g8yb15rpyxs4pndqqbskg4b8g8ssqk9wfxs9zlyah5qcb2m33";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/88ed6db7b53d1ac75c40d12c21de1dec6d717fbe/recipes/helm-google";
@@ -31397,12 +31453,12 @@
helm-hunks = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-hunks";
- version = "20170225.602";
+ version = "20170406.257";
src = fetchFromGitHub {
owner = "torgeir";
repo = "helm-hunks.el";
- rev = "1ea40753244ec843f38481b0889bb7d0e8db6619";
- sha256 = "0lhzzm5z50zfhfvg7chrflgnjnmpr9k9w40s6yczpsfanqm96qp3";
+ rev = "287685254002d47432f267884ac6a83de67ea07c";
+ sha256 = "0gfly5wv391cw7dpixxik0nqs2f7h1n8102pijjipk3g79f1f1ic";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d61cbe53ad42f2405a66de9f551f5b870a60709f/recipes/helm-hunks";
@@ -31648,12 +31704,12 @@
helm-make = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }:
melpaBuild {
pname = "helm-make";
- version = "20170206.1323";
+ version = "20170409.44";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "helm-make";
- rev = "ed406557c814bb2521cf826370e57ffe9d40d33e";
- sha256 = "02dfrr474yza18xvshjx41h1fsk81g950k6p3h4j1hpdqgjkv96k";
+ rev = "3a5da626247095d8c1350e50a39736e3bf0db771";
+ sha256 = "1aaw6c3mw064g0ym5vz2fibq7csabqvgc8lx7wwsl35jbcx3y29c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0f25f066c60d4caff1fbf885bc944cac47515ec8/recipes/helm-make";
@@ -31750,6 +31806,27 @@
license = lib.licenses.free;
};
}) {};
+ helm-navi = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, navi-mode, s }:
+ melpaBuild {
+ pname = "helm-navi";
+ version = "20170402.752";
+ src = fetchFromGitHub {
+ owner = "emacs-helm";
+ repo = "helm-navi";
+ rev = "2256591174ff79f889450fdc10822316819d6476";
+ sha256 = "0bbb52v1c81a6ap10qi7mqigi237vwrlmf8mg3ckglm1i710636j";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e5ffbc25c0eb30b9c96594d50f47cd0383aa8ebc/recipes/helm-navi";
+ sha256 = "0v3amm15pwja2y7zg92hsfhp3scmswwl0q0slg33g11rvj26iiks";
+ name = "helm-navi";
+ };
+ packageRequires = [ emacs helm navi-mode s ];
+ meta = {
+ homepage = "https://melpa.org/#/helm-navi";
+ license = lib.licenses.free;
+ };
+ }) {};
helm-nixos-options = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, nixos-options }:
melpaBuild {
pname = "helm-nixos-options";
@@ -31816,12 +31893,12 @@
helm-org-rifle = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
melpaBuild {
pname = "helm-org-rifle";
- version = "20170322.1209";
+ version = "20170409.1055";
src = fetchFromGitHub {
owner = "alphapapa";
repo = "helm-org-rifle";
- rev = "bc9c69b0495b1dd8e84bfcf1722165e30ea87904";
- sha256 = "0zcxpijxgmpjxx8kincq9w8d83y4pnzi0glbiv92xlxm91fk3mbl";
+ rev = "07313ddf77cd38355b77a3fa0b46be998de38732";
+ sha256 = "0rscnb9lws9y6x0ggg03ran2vjpn7a61rywz3y1vvr5skf2nhs9n";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle";
@@ -32152,12 +32229,12 @@
helm-rage = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
melpaBuild {
pname = "helm-rage";
- version = "20161201.222";
+ version = "20170331.607";
src = fetchFromGitHub {
owner = "bomgar";
repo = "helm-rage";
- rev = "d9a342e2bbdabe86d6c25bb1939c55e3a2a12381";
- sha256 = "05amzj09jwn0ypnk53i1m1pzxqxghxcfv6s9y0gxnxhr440rbjhb";
+ rev = "67c62eafe8af70b330895576dcb004e45c93a98a";
+ sha256 = "0rrrkz092h7cikcafwf6blkyqsb6qwq1mkw8k4mbb8vy9bp9mx0b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/84f831fdc5a0e90c23ac11c79f193f4d3c1ebb04/recipes/helm-rage";
@@ -32317,6 +32394,27 @@
license = lib.licenses.free;
};
}) {};
+ helm-rtags = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, rtags }:
+ melpaBuild {
+ pname = "helm-rtags";
+ version = "20170402.653";
+ src = fetchFromGitHub {
+ owner = "Andersbakken";
+ repo = "rtags";
+ rev = "476cdf8b01ced2b49f364c8a2509acddac288cf8";
+ sha256 = "189zmd61sgl0gqacfnglgzazf3gsc3yv57mdk3k7nqs9ysv2wygj";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags";
+ sha256 = "1vv6wnniplyls344qzgcf1ivv25c8qilax6sbhvsf46lvrwnr48n";
+ name = "helm-rtags";
+ };
+ packageRequires = [ helm rtags ];
+ meta = {
+ homepage = "https://melpa.org/#/helm-rtags";
+ license = lib.licenses.free;
+ };
+ }) {};
helm-rubygems-local = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-rubygems-local";
@@ -32597,8 +32695,8 @@
src = fetchFromGitHub {
owner = "masasam";
repo = "emacs-helm-tramp";
- rev = "9c7204ea9d7ce232ce3ff88107854c219397528c";
- sha256 = "1vqr40bkf7ss25x5bd6nhqi417chgdrkf9gvp302z311vnvpycsy";
+ rev = "6c0a61fc31c88577dc701d9d9010367a2873439c";
+ sha256 = "1xahmb3a44iiip2fls4wfkxns08b4y2bq6jwd20ylpccj48qxmjl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4a69f0a17c4efbaea012be8e878af4060fa0c93b/recipes/helm-tramp";
@@ -33037,16 +33135,19 @@
license = lib.licenses.free;
};
}) {};
- hide-lines = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+ hide-lines = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
pname = "hide-lines";
version = "20151127.1040";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/hide-lines.el";
- sha256 = "1q87yp1pr62cza3pqimqd09a39yyij4c7pncdww84zz7cii9qrn2";
+ src = fetchFromGitHub {
+ owner = "emacsorphanage";
+ repo = "hide-lines";
+ rev = "331122bf19361130351cfe55968c2a7820329eb3";
+ sha256 = "183l0sx8zn3jv1fqa3xj7a6fd792sp50jyhm50j3hy7c54m4capf";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/2a4e010b04a4c5dddc3f7259fad929e4cb66760d/recipes/hide-lines";
- sha256 = "146sgvd88w20rqvd8y8kc76cb1nqk6dvqsz9rgl4rcrf0xfqvp7q";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/hide-lines";
+ sha256 = "18h5ygi6idpb5wjlmjjvjmwcw7xiljkfxdvq7pm8wnw75p705x4d";
name = "hide-lines";
};
packageRequires = [];
@@ -33910,12 +34011,12 @@
hledger-mode = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, popup }:
melpaBuild {
pname = "hledger-mode";
- version = "20170315.1829";
+ version = "20170405.1248";
src = fetchFromGitHub {
owner = "narendraj9";
repo = "hledger-mode";
- rev = "9b671c6ca7a2d76338d6f4e38966e9cdb78bd991";
- sha256 = "1v3bd43kaihwbxvflg5kfiw2wmwjmvh5hhdzmdjlvmvqrhwsnxdc";
+ rev = "ff2b2f4afa7a449c7f01defc4227897cd9e6ae8b";
+ sha256 = "0ry8cxki1vhc9h4fkbjdglnx6rcm1wi3ws5bw6pvz20g4jvsz0iw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c656975c61396d8d4ded0f13ab52b17ccc238408/recipes/hledger-mode";
@@ -34304,16 +34405,19 @@
license = lib.licenses.free;
};
}) {};
- http-post-simple = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+ http-post-simple = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
pname = "http-post-simple";
version = "20131010.2058";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/http-post-simple.el";
- sha256 = "1wp2rwc1hgd5c3yr6b96yzzakd1qmy5d95mhc6q4f6lx279nx0my";
+ src = fetchFromGitHub {
+ owner = "emacsorphanage";
+ repo = "http-post-simple";
+ rev = "1c7b06cb0d6930aaaf3f319d9836786d40f1595f";
+ sha256 = "1nvcqh3wwczh83k4nb7zgk1r07bsaycbds4zhpy7gic3jhxbvdns";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/4d1df16d1c429c46ea5555021ce84d050007adfb/recipes/http-post-simple";
- sha256 = "1b2fh0hp5z3712ncgc5ns1f3sww84khkq7zb3k9xclsp1p12a4cf";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/http-post-simple";
+ sha256 = "0z3zphaqywbm7vn2g1f7fkrdamgsc26i8zydm9y53v9z9fmzch5s";
name = "http-post-simple";
};
packageRequires = [];
@@ -34700,7 +34804,7 @@
}) {};
icicles = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
pname = "icicles";
- version = "20170303.1455";
+ version = "20170409.1830";
src = fetchurl {
url = "https://www.emacswiki.org/emacs/download/icicles.el";
sha256 = "00zsdahszs919zvklxgpm5kqhm2139cdr4acchgp9ppnyljs94jp";
@@ -35904,12 +36008,12 @@
inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "inf-clojure";
- version = "20170325.2346";
+ version = "20170330.2134";
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "inf-clojure";
- rev = "4e802769559153b975f1b24d5a28bc80d212c807";
- sha256 = "0i66y0n0yq3dzhl176anqsjj7p0pvrpwfyahhg8cd5mw1svgdf5f";
+ rev = "431c06844bfb1c99b49f494aa73df3e699b48f30";
+ sha256 = "0aza4r44lxzs4fjiqc6y23b7s6r1jyvr39dkmw5570gs4lhlij1s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure";
@@ -36090,12 +36194,12 @@
inherit-local = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "inherit-local";
- version = "20161007.724";
+ version = "20170409.949";
src = fetchFromGitHub {
owner = "shlevy";
repo = "inherit-local";
- rev = "426f7997af0906013846d20729a499f0ce6db634";
- sha256 = "1n97636c3zi7cq93m5fxvgqkqg5aryn742q7pb1s1w47smdpclgl";
+ rev = "b1f4ff9c41f9d64e4adaf5adcc280b82f084cdc7";
+ sha256 = "1fargashyqn4ga420k3ikc1akf7mw3zcarpg24gh2591p4swa0ih";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/inherit-local";
@@ -36404,12 +36508,12 @@
intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }:
melpaBuild {
pname = "intero";
- version = "20170321.129";
+ version = "20170408.1939";
src = fetchFromGitHub {
owner = "commercialhaskell";
repo = "intero";
- rev = "04265e68647bbf27772df7b71c9927d451e6256f";
- sha256 = "0zax01dmrk1zbqw8j8css1w6qynbavfdjfgfxs34pb37gp4v8mgg";
+ rev = "b501c022f5bc40518db726ff08e544308b6bdc55";
+ sha256 = "1wacvnzg07di939782bg0nbgn81rrfqx5psxq1f9k6clzvn7f26i";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero";
@@ -36674,12 +36778,12 @@
irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
melpaBuild {
pname = "irony";
- version = "20170322.1438";
+ version = "20170404.1127";
src = fetchFromGitHub {
owner = "Sarcasm";
repo = "irony-mode";
- rev = "63eb90e1f6f257ea8113450d0e02366148f5c2fb";
- sha256 = "19cr7k33gkkbwzbpib6hvp67r4iz4j68ykmd6mij4gk8r517bqsh";
+ rev = "6b9b0aa40614580b007b55f2096f3f12c46d4288";
+ sha256 = "1055rri447fwlqi7dp7dr6h4r48q9ahx76pyv1grxqf30kzv3wc5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony";
@@ -36962,12 +37066,12 @@
ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ivy";
- version = "20170328.1957";
+ version = "20170410.47";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "swiper";
- rev = "3fbeaa563916c0e23c6cafa82716e9f2eba44073";
- sha256 = "14z8f0lx5s63dy7h0x5m6lkhpfbmlq0p64g2r6y3dhswb8zn1pjl";
+ rev = "d9608bfb593fdc3a60ffa81a19b0533313d44f26";
+ sha256 = "15mnj8mbc7ch4j9rdag18a8biiy0a4837vxak97zh9ffgyk7aiqr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy";
@@ -37004,12 +37108,12 @@
ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "ivy-erlang-complete";
- version = "20170324.401";
+ version = "20170406.107";
src = fetchFromGitHub {
owner = "s-kostyaev";
repo = "ivy-erlang-complete";
- rev = "1dcb258a0207053a33ac207c11f2414aa89daba2";
- sha256 = "1nc6d67cbizk1k44b53sx913h2lbrlfmdbi60pz3h567idclw83i";
+ rev = "712f204d242663ca8cdbb2b2d6732b5cf0c411b4";
+ sha256 = "1mcl5j3brjsrqsafqpag8b4y8iyp2c8cbaffmv5vfw3b18hss3wf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete";
@@ -37067,12 +37171,12 @@
ivy-hydra = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, ivy, lib, melpaBuild }:
melpaBuild {
pname = "ivy-hydra";
- version = "20170302.1033";
+ version = "20170410.24";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "swiper";
- rev = "3fbeaa563916c0e23c6cafa82716e9f2eba44073";
- sha256 = "14z8f0lx5s63dy7h0x5m6lkhpfbmlq0p64g2r6y3dhswb8zn1pjl";
+ rev = "d9608bfb593fdc3a60ffa81a19b0533313d44f26";
+ sha256 = "15mnj8mbc7ch4j9rdag18a8biiy0a4837vxak97zh9ffgyk7aiqr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra";
@@ -37148,6 +37252,27 @@
license = lib.licenses.free;
};
}) {};
+ ivy-rtags = callPackage ({ fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, rtags }:
+ melpaBuild {
+ pname = "ivy-rtags";
+ version = "20170402.653";
+ src = fetchFromGitHub {
+ owner = "Andersbakken";
+ repo = "rtags";
+ rev = "476cdf8b01ced2b49f364c8a2509acddac288cf8";
+ sha256 = "189zmd61sgl0gqacfnglgzazf3gsc3yv57mdk3k7nqs9ysv2wygj";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags";
+ sha256 = "18f0jak643dd8lmx701wgk95miajabd8190ls35831slr28lqxsq";
+ name = "ivy-rtags";
+ };
+ packageRequires = [ ivy rtags ];
+ meta = {
+ homepage = "https://melpa.org/#/ivy-rtags";
+ license = lib.licenses.free;
+ };
+ }) {};
ivy-todo = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "ivy-todo";
@@ -37279,13 +37404,13 @@
pname = "jabber";
version = "20170106.1603";
src = fetchgit {
- url = "git://git.code.sf.net/p/emacs-jabber/git";
+ url = "https://git.code.sf.net/p/emacs-jabber/git";
rev = "2ef76cff4a5a932cf17dc6107a0c5adee806081e";
sha256 = "0jvgp121544vc0yd31cncz06dkgw4za605nkk914vmql321zjzr2";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/cff77a688d51ff2e2f03389593465990089ce83d/recipes/jabber";
- sha256 = "1g5pc80n3cd5pzs3hmpbnmxbldwakd72pdn3vvb0h26j9v073pa8";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/jabber";
+ sha256 = "0saajvfpzgcsqa7h7aa6l0bns6swr40c46md6s0d90x9lrvwp7ws";
name = "jabber";
};
packageRequires = [ fsm ];
@@ -37338,12 +37463,12 @@
jade = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }:
melpaBuild {
pname = "jade";
- version = "20170321.214";
+ version = "20170410.558";
src = fetchFromGitHub {
owner = "NicolasPetton";
repo = "jade";
- rev = "7cd363187a8d41fe604925df51169ca9ed32f798";
- sha256 = "0zy7xfa5m01518jf1jy0r4r4r0y0q4p0jd07zdvxihkga7ycr4bp";
+ rev = "9f473f019963e1abae04f958a6c7ec221aa0aacf";
+ sha256 = "19aydkph56bd1gwqcz04viya8cr4wj98yh8kqgn9kfqxrrkkb2ic";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b989c1bd83f20225314b6e903c5e1df972551c19/recipes/jade";
@@ -37716,12 +37841,12 @@
jdee = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, memoize }:
melpaBuild {
pname = "jdee";
- version = "20170326.1333";
+ version = "20170330.21";
src = fetchFromGitHub {
owner = "jdee-emacs";
repo = "jdee";
- rev = "940069c397b6db841acfd21ffd15495388deba7c";
- sha256 = "0p7pfy75cc2rqf4s9m71zaind8rfn3sqak63w10sn542d2m2nhng";
+ rev = "70ee33d1cb151cff821d31540a6629d21013be04";
+ sha256 = "07hgdp5vl0blgzcs2393lzn285l2s2bf5lvngz6k1xb7zx2zwn93";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a6d2c98f3bf2075e33d95c7befe205df802e798d/recipes/jdee";
@@ -38007,12 +38132,12 @@
jpop = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "jpop";
- version = "20160816.348";
+ version = "20170410.550";
src = fetchFromGitHub {
owner = "domtronn";
repo = "jpop.el";
- rev = "485aec3e09e4f01eeb4b737c4de99fadf79e0b31";
- sha256 = "1a63xzczwb8frr3d4a2z864qq2wx83lgljqbqphkabx99apc749l";
+ rev = "7628b03260be96576b34459d45959ee77d8b2110";
+ sha256 = "1x7qha7xyn2j225h7axhskngc8icjhgm3f451iq3qysj22q8g4d6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2a52a3cf909d12201196b92685435f9fa338b7ba/recipes/jpop";
@@ -38217,12 +38342,12 @@
js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "js2-mode";
- version = "20170321.153";
+ version = "20170330.639";
src = fetchFromGitHub {
owner = "mooz";
repo = "js2-mode";
- rev = "d3b31baf68acd1b7e0d05582e504c44e1a587be7";
- sha256 = "1k9y5vzm518j98iysc7l6vhp2xy8a06qyd1v5p2xmf3dq751r57v";
+ rev = "908395e3aa413b4293b35aab9d41a56f1dbe1e04";
+ sha256 = "1klwg6clx5nvj6755rakzdg62brfms1s8g9cccdkipbb8m6paffh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode";
@@ -38322,12 +38447,12 @@
json-mode = callPackage ({ fetchFromGitHub, fetchurl, json-reformat, json-snatcher, lib, melpaBuild }:
melpaBuild {
pname = "json-mode";
- version = "20160803.1606";
+ version = "20170402.1808";
src = fetchFromGitHub {
owner = "joshwnj";
repo = "json-mode";
- rev = "e8ba0c03c5c10f61b8f0b3f5d531ef1d80dec9b0";
- sha256 = "1j02bg20ngarfwifdxz6al6394rjms2491xh4nlia7d6ihhhrafr";
+ rev = "c528c7784f6449a35a8c90db58cb73125c69987e";
+ sha256 = "0g9zc9sbs3m92qn2jx4nyd0b8s10c1nl92z5rwq9nci5wsmpqxzg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/03d0ff6c8d724cf39446fa27f52aa5cc1a3cefb6/recipes/json-mode";
@@ -38364,12 +38489,12 @@
json-rpc = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "json-rpc";
- version = "20160427.807";
+ version = "20170402.955";
src = fetchFromGitHub {
owner = "skeeto";
repo = "elisp-json-rpc";
- rev = "5692192d25eba1b47758272e8de9d67c9ea4aecd";
- sha256 = "0cbqhijv2zv9mhnjxadr2kbz5b6jcvciwmza22jkwds0nkn2snmp";
+ rev = "e77a62012e4d6c946666eed3a17454d5c6f83367";
+ sha256 = "1pwa1ifz0c83lwwpj75h10wj7jyghsxg6wpdlfy4dp8102wr8nhg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/82c6b97cdfe2970f028a00146b01e5734710291b/recipes/json-rpc";
@@ -38470,13 +38595,13 @@
pname = "jtags";
version = "20160211.1229";
src = fetchgit {
- url = "git://git.code.sf.net/p/jtags/code";
+ url = "https://git.code.sf.net/p/jtags/code";
rev = "b50daa48510f71e74ce0ec2eb85030896a79cf96";
sha256 = "03w5y9c1109kpsn6xnxdaz3maiwbvxywqshc1l5wngfc85jwiv8y";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/c083b5368d0c0682e9e92fe6e027c9be0e0af0f1/recipes/jtags";
- sha256 = "0in5ybgwmghlpa5d7wz0477ba6n14f1mwp5dxcl4y11f1lsq041r";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/jtags";
+ sha256 = "1f3dw9fr31lcqmida14d9rsvy1r1b5d6ihqwdj9hbx5kv7d8jyj7";
name = "jtags";
};
packageRequires = [];
@@ -38763,8 +38888,8 @@
src = fetchFromGitHub {
owner = "wsgac";
repo = "kanji-mode";
- rev = "5e9d5b72468ece11cfb81b729be6babf63ede425";
- sha256 = "1zh7klqaza840q5f44zzh1wrnd6sqa2k93z3dgx3yhhsxfd1dxvy";
+ rev = "eda4f8666486689d36317db7dbda54fb73d3e3d2";
+ sha256 = "1m0s1kdgz1psiidpxcrzm8qmvmrmk5g2k8lz1lq357z482l4i7ll";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c9f1fb16f2f7f677d0817fd63633dd071ba2cf12/recipes/kanji-mode";
@@ -38780,12 +38905,12 @@
kaolin-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "kaolin-theme";
- version = "20170329.649";
+ version = "20170407.1037";
src = fetchFromGitHub {
owner = "0rdy";
repo = "kaolin-theme";
- rev = "be544a81cff86ab1b54ad673b9229185882ca998";
- sha256 = "1pjbkff8lcjb6ixjh9pdmgzfdjqq21w9c4q8qjcwmicj1pn1wwya";
+ rev = "26f631dd8bfbfe7d2bf1006c477a7f29ae9fb365";
+ sha256 = "0sr86hw311j1pwcldg00mwwfq6c2qpqimnfnwhr24nx3q8z0c7ym";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d2abf9d914cdc210bbd47ea92d0dac76683e21f0/recipes/kaolin-theme";
@@ -38882,16 +39007,19 @@
license = lib.licenses.free;
};
}) {};
- key-chord = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+ key-chord = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
pname = "key-chord";
version = "20160227.438";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/key-chord.el";
- sha256 = "03m44pqggfrd53nh9dvpdjgm0rvca34qxmd30hr33hzprzjambxg";
+ src = fetchFromGitHub {
+ owner = "emacsorphanage";
+ repo = "key-chord";
+ rev = "72443e9ff3c4f1c3ccaced3130236801efde3d83";
+ sha256 = "15jfpysyydcvqlvdannxg2s4bh4i9z6i950fad1qlq43jfmq7k55";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/b38ec88553f9b1dfa11b0ce82433b450eb47ebce/recipes/key-chord";
- sha256 = "0cr9lx1pvr0qc762nn5pbh8w93dx1hh1zzf806cag2b9pgk6d4an";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/key-chord";
+ sha256 = "1g0jqmnn575h5n4figxbc5xs76zl8b1cdqa6wbi3d1p2rn3g8scr";
name = "key-chord";
};
packageRequires = [];
@@ -39285,8 +39413,8 @@
src = fetchFromGitHub {
owner = "kivy";
repo = "kivy";
- rev = "dce021f9d6d4b20f32e93876302c89e27e1b3f44";
- sha256 = "0h0vgrmcg922dcssn58slbnqbrlmifwg2qngj1k1gp9kmp8z5jih";
+ rev = "46a687a4d5965290c2907cfc9e99812b358ac3bf";
+ sha256 = "0s0d097k4l6hqqs8mq1syf1529gm62qiwd4lgib7qkkabf4miq24";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode";
@@ -39362,22 +39490,22 @@
license = lib.licenses.free;
};
}) {};
- kodi-remote = callPackage ({ fetchFromGitHub, fetchurl, json ? null, let-alist, lib, melpaBuild, request }:
+ kodi-remote = callPackage ({ elnode, fetchFromGitHub, fetchurl, json ? null, let-alist, lib, melpaBuild, request }:
melpaBuild {
pname = "kodi-remote";
- version = "20170226.1627";
+ version = "20170409.1909";
src = fetchFromGitHub {
owner = "spiderbit";
repo = "kodi-remote.el";
- rev = "60141505ca027231866f7032c557afd7d085b35f";
- sha256 = "1c47p9zan4cifiaz097sc3sxq04inh5rqqc22p105x0jm0hykd93";
+ rev = "9af03ee3e772458061b893b9362259f6f8ad0f3a";
+ sha256 = "1185693h5zfzcfzs1n5xjzh3jxmhlsjr7q7knc19dzmkdf1vxal4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/08f06dd824e67250afafdecc25128ba794ca971f/recipes/kodi-remote";
sha256 = "0f3n7b3plsw28xpz07lf5pv71b6s2xjhq2h23gpyg0r69v99chh5";
name = "kodi-remote";
};
- packageRequires = [ json let-alist request ];
+ packageRequires = [ elnode json let-alist request ];
meta = {
homepage = "https://melpa.org/#/kodi-remote";
license = lib.licenses.free;
@@ -39470,12 +39598,12 @@
kotlin-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "kotlin-mode";
- version = "20160720.1339";
+ version = "20170403.826";
src = fetchFromGitHub {
owner = "Emacs-Kotlin-Mode-Maintainers";
repo = "kotlin-mode";
- rev = "9e2e4c11fe3a9e8f63ce351762a2b1ac5dbe8a75";
- sha256 = "0yzhizxb8g0zlnx97vnaqvv0pm2mx4jg7qc2hnfvc5ya02yxhc6p";
+ rev = "e5c6d845e689ed0623b864ff863cc99ca558b442";
+ sha256 = "0add2vi13caxgcxgl2yxdjccjmszs0918jm70084ry3iih8ljl37";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9f2560e913b215821221c96069a1385fe4e19c3e/recipes/kotlin-mode";
@@ -39551,6 +39679,27 @@
license = lib.licenses.free;
};
}) {};
+ kubernetes = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
+ melpaBuild {
+ pname = "kubernetes";
+ version = "20170410.353";
+ src = fetchFromGitHub {
+ owner = "chrisbarrett";
+ repo = "kubernetes-el";
+ rev = "53f83a2e553647292191738ac65b1b930da748bd";
+ sha256 = "0zv17x2srqflpqf6xqi4qwz81ajghq6xv0fxprb35b4v7j5x3zzw";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/bb95e7cd186d02c45d14319858044468a14d9f72/recipes/kubernetes";
+ sha256 = "0608wkdnbnrq2mhvnq0m2bk50bm3kzr528rvia4hlda1hwbfz867";
+ name = "kubernetes";
+ };
+ packageRequires = [ dash emacs magit ];
+ meta = {
+ homepage = "https://melpa.org/#/kubernetes";
+ license = lib.licenses.free;
+ };
+ }) {};
kurecolor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "kurecolor";
@@ -39740,12 +39889,12 @@
lastpass = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
melpaBuild {
pname = "lastpass";
- version = "20170327.352";
+ version = "20170405.417";
src = fetchFromGitHub {
owner = "storvik";
repo = "emacs-lastpass";
- rev = "37ce019f3d305ac9806bf7a6f087bd53b12b48b0";
- sha256 = "0yvdi4fdgk7bk8mz3vjd246wbfbyw6yl821cx94zczlajg9cz9dn";
+ rev = "69e1ab9fec515c3fedc9230d7c2ef6d0b3d2ff36";
+ sha256 = "1dpl52plihsy8m4qgrj1fzms7q1fny8dr2qi9llg9j9m5apg3i0l";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/46e5e8735baab7728bddce2693cea6bcee0e6360/recipes/lastpass";
@@ -40219,16 +40368,19 @@
license = lib.licenses.free;
};
}) {};
- levenshtein = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+ levenshtein = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
pname = "levenshtein";
- version = "20051013.1056";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/levenshtein.el";
- sha256 = "0m94z18i1428bispxi285flvjf22kjm33s4sm0ad11m0w0jizir6";
+ version = "20090830.340";
+ src = fetchFromGitHub {
+ owner = "emacsorphanage";
+ repo = "levenshtein";
+ rev = "070925197ebf6b704e6e00c4f2d2ec783f3df38c";
+ sha256 = "1w6rhp723kn1ns7r0gcblp5q8bvncicnjjsgdangbib1a4l2xw79";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/dd530e23d6de5a592faf4fec7394d052ff440a8b/recipes/levenshtein";
- sha256 = "1iypnz0bw3baqxa9gldz8cikxvdhw60pvqp00kq5p3v4x3xcy4z2";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/levenshtein";
+ sha256 = "1vdbgzs7gfy89a1dzf6z5l3f5jmly1i8lb2fqi2d08qyl5rhb8bl";
name = "levenshtein";
};
packageRequires = [];
@@ -40578,12 +40730,12 @@
lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }:
melpaBuild {
pname = "lispy";
- version = "20170326.801";
+ version = "20170409.48";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "lispy";
- rev = "15301856dbefe5138f14ade673df4a574cf15eae";
- sha256 = "15wqgjnpr8i9lsk0mj9y0yaykdr8slh2xswh18hvky4x6azzc6lx";
+ rev = "b5f6777fde363723fd82387cf5eaa5182a8b781d";
+ sha256 = "1c1azl4q1frh3d5i58h9ar4lj8nfy920xsvvwbmjlpb4d54di9f7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy";
@@ -40999,8 +41151,8 @@
version = "20150910.644";
src = fetchgit {
url = "http://llvm.org/git/llvm";
- rev = "fef24043fa2c4020eec6ef45d0da7b8b3f967b57";
- sha256 = "0wnzjj84n23nkfvx18pjfhc8jfip54qqbw218w3ci4qfghdx741p";
+ rev = "af6290684b9dc470d885ed1d6c04185034130e04";
+ sha256 = "1wafp2iv6qvsmh37jpmrsjw0dkm3axraz2my7cr37vcalwc5ib04";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode";
@@ -41121,12 +41273,12 @@
log4e = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "log4e";
- version = "20150105.505";
+ version = "20170401.604";
src = fetchFromGitHub {
owner = "aki2o";
repo = "log4e";
- rev = "6592682ab7de0e3d1915aa4d3c53e083be79fbeb";
- sha256 = "1l28n7a0v2zkknc70i1wn6qb5i21dkhfizzk8wcj28v44cgzk022";
+ rev = "34309972ad02abcebbcff6b1682731978aef030c";
+ sha256 = "12zk40gqrh86m50y777kprkwz75vbcm0q1a9narzcs2lnpwc8g4z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/90d0e451c5a8eb25db95990b058964a9acea4b89/recipes/log4e";
@@ -41144,13 +41296,13 @@
pname = "log4j-mode";
version = "20160108.1118";
src = fetchgit {
- url = "git://git.code.sf.net/p/log4j-mode/code";
+ url = "https://git.code.sf.net/p/log4j-mode/code";
rev = "26171b1e723502055e085393b0ecdcb6db406010";
sha256 = "15x6368pk4bbvhbd6cqnazcxfdz0b3f70029x0884a5797janln5";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/39321e054925a8de854942fec4ed8e7570099fc6/recipes/log4j-mode";
- sha256 = "06lam4iqxlbl9ib2n2db2nj6jbjzrw2ak8r99n6w4s3fny1q3yxx";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/log4j-mode";
+ sha256 = "0311jb47fjji8dqy98anr487f7vnvi85p4mn5ymqvxs5c6972gms";
name = "log4j-mode";
};
packageRequires = [];
@@ -41225,12 +41377,12 @@
logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "logview";
- version = "20170303.1225";
+ version = "20170331.1156";
src = fetchFromGitHub {
owner = "doublep";
repo = "logview";
- rev = "6409991053350ab2d3def61749b92780dd1ed095";
- sha256 = "0phhkg3qgh4q4b7as0a00zx7kcrlmh24by1sjbp7b4dsd0mnz22k";
+ rev = "b5cafd1145f22e7beff8ef8ed742bf10af1e6e1c";
+ sha256 = "08is4fg94a6am7c2j0d5qd1nkrnik5vpzg3pqkimyxgy5czj764b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview";
@@ -41285,16 +41437,19 @@
license = lib.licenses.free;
};
}) {};
- look-mode = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+ look-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
pname = "look-mode";
version = "20151211.1026";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/look-mode.el";
- sha256 = "0sl6hqggi6qn2qp9khw11qp5hamngwxrrwx98k3pwpj9kgicdpgp";
+ src = fetchFromGitHub {
+ owner = "emacsorphanage";
+ repo = "look-mode";
+ rev = "d65f75e8ea24eff2ac31c53b4835b45127eedd56";
+ sha256 = "1adzlviy928wsqx9fvxi71rwv89zyydqmf5g0wrlx66r0ksw3793";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/245ded3ee787da7ad5f462fc6f519a963485adb5/recipes/look-mode";
- sha256 = "0y3wjfjx0g5jclmv9m3vimv7zd18pk5im7smr41qk09hswi63yqj";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/look-mode";
+ sha256 = "0nhhz5s423g4kqqh0vy8k0696r0myhjfv84p2vciliky9gv1wkig";
name = "look-mode";
};
packageRequires = [];
@@ -41369,12 +41524,12 @@
lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "lsp-mode";
- version = "20170311.2126";
+ version = "20170409.2355";
src = fetchFromGitHub {
owner = "vibhavp";
repo = "emacs-lsp";
- rev = "0fc5400562247b5d674ae8d18f78824de12ba6b0";
- sha256 = "1zmpkpx2nhm1vvdagrp75jz6v3d4n7zv45xp49m81xzqsyw20im0";
+ rev = "69d041662e1b20c1c2e79f6d4be12fc546c733ac";
+ sha256 = "0s335djpfvb05v8gf44ipxikn79b7h6aw1bsvsrhscy9xcf57fml";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b192c90c96e24ccb464ac56e624a2fd527bc5cc9/recipes/lsp-mode";
@@ -41513,22 +41668,22 @@
license = lib.licenses.free;
};
}) {};
- m-buffer = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ m-buffer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
melpaBuild {
pname = "m-buffer";
- version = "20160721.1539";
+ version = "20170407.1441";
src = fetchFromGitHub {
owner = "phillord";
repo = "m-buffer-el";
- rev = "9c45387989bd7d813f15e56ac5d3210f5e44b1c6";
- sha256 = "1hiasrn3irxg7s413c34zxknml6fsy3yyykkv2lidk19npy6fslh";
+ rev = "e2d5a416ce47b36da10a9815ff5702f28c716d57";
+ sha256 = "0nm8ljciim7wjc4r021jv8xrsk7jffmagzbllbvd5cab4zxvs4ik";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c34d02682e87c9978a3583bd903dcac5da5b41d5/recipes/m-buffer";
sha256 = "17smq7wlidsls870hla5b94xq2pwk24b88jvrbbcqw6f5z3ypf94";
name = "m-buffer";
};
- packageRequires = [ emacs ];
+ packageRequires = [ seq ];
meta = {
homepage = "https://melpa.org/#/m-buffer";
license = lib.licenses.free;
@@ -41681,12 +41836,12 @@
magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
melpaBuild {
pname = "magit";
- version = "20170329.221";
+ version = "20170410.414";
src = fetchFromGitHub {
owner = "magit";
repo = "magit";
- rev = "13352f1ef23c5ccbf7f5f4c54049c1dd66ae3335";
- sha256 = "0cfz0mb5p7q1bizvv81pqywhcy883093ld6ly3zv4kxbg6lg5jcb";
+ rev = "51ed4d7b3642f20bcc30cd664bfb1936e92531c3";
+ sha256 = "14m4zhcq8rbfrmb6cykpa6i0rr4cyx1g3p01jgrk7yciygd42255";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit";
@@ -41709,12 +41864,12 @@
magit-annex = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
melpaBuild {
pname = "magit-annex";
- version = "20170211.1601";
+ version = "20170408.1426";
src = fetchFromGitHub {
owner = "magit";
repo = "magit-annex";
- rev = "2437efb93767b352eecf27f5d5e3513e34a395ca";
- sha256 = "1pmsbl8jh3dgs42k7b0a9ya1ywwy5435pshplc23z33i7qplva9f";
+ rev = "ae6250aead8f283eac8d6951a249cfc7d85e0b40";
+ sha256 = "0n6dhc92z5w67rcfngjzprzbdn42ja263gdqa7fncqq9p66slccq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-annex";
@@ -41881,8 +42036,8 @@
src = fetchFromGitHub {
owner = "magit";
repo = "magit";
- rev = "13352f1ef23c5ccbf7f5f4c54049c1dd66ae3335";
- sha256 = "0cfz0mb5p7q1bizvv81pqywhcy883093ld6ly3zv4kxbg6lg5jcb";
+ rev = "51ed4d7b3642f20bcc30cd664bfb1936e92531c3";
+ sha256 = "14m4zhcq8rbfrmb6cykpa6i0rr4cyx1g3p01jgrk7yciygd42255";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup";
@@ -42192,12 +42347,12 @@
malinka = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, rtags, s }:
melpaBuild {
pname = "malinka";
- version = "20160615.1348";
+ version = "20170410.242";
src = fetchFromGitHub {
owner = "LefterisJP";
repo = "malinka";
- rev = "7a5c6e61462d2d76edcf9231d3cb70a63509269e";
- sha256 = "19ypnqrdxragnhdxfraxrinbsiamwpmgqgjj35crjnifdcj6lqzz";
+ rev = "8ab9e0bcefb122ef5b931284c6cc329d8f8aaa82";
+ sha256 = "0pasdzgikp8rylxxyfmxd0dd4gfjklgrsd6v1idv8cd0955gbrd8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/909a2d78f49a11e3f90e7d3c7f8af55e15113442/recipes/malinka";
@@ -42789,13 +42944,13 @@
pname = "matlab-mode";
version = "20160902.459";
src = fetchgit {
- url = "git://git.code.sf.net/p/matlab-emacs/src";
+ url = "https://git.code.sf.net/p/matlab-emacs/src";
rev = "3b3c48ac0c27039e0bef89c643f0ee4c0b53d3d0";
sha256 = "0kizmzpmc8iw15n6xkrf7m5kbjcs5rwdrxyrfij6cj43szlnkf1z";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/39e384608df76bb3e91bd1405e3a5029181ff94e/recipes/matlab-mode";
- sha256 = "1bybc5xv5hbjh8afmh03qda5g3m2wcgsk6lgj6jkyyxzdfxqkrck";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/matlab-mode";
+ sha256 = "128v4rwc99dwyfgi5crbr5649fz4l7dwh4lid8w2mwpknyxaxy28";
name = "matlab-mode";
};
packageRequires = [];
@@ -43034,12 +43189,12 @@
mediawiki = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mediawiki";
- version = "20170113.1308";
+ version = "20170402.244";
src = fetchFromGitHub {
owner = "hexmode";
repo = "mediawiki-el";
- rev = "03c5ca4e884782950d2bcc784ecc2167e43e4aa9";
- sha256 = "1d2dxpgbccd0p818xpj2wghfhvngyf4mad1ds84v2lbzyxphp6qa";
+ rev = "245cb51fc4b67ccfcc3296f82e8e3a74c1a1602e";
+ sha256 = "1kjpl45y3mnksvd938s1hviyxmrq9ayk9rdna8hhgmirk01fhqyf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/865e0ba1dbace58784181d214000d090478173bd/recipes/mediawiki";
@@ -43055,12 +43210,12 @@
meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
melpaBuild {
pname = "meghanada";
- version = "20170324.222";
+ version = "20170402.2049";
src = fetchFromGitHub {
owner = "mopemope";
repo = "meghanada-emacs";
- rev = "1ddaca25ee978736dcb3922bb1952d750c39cd5a";
- sha256 = "09g81d1l5mhji4vbljxgfrgr0051sv7kqy0vwf7awxa4slgl6bnd";
+ rev = "b38e0a0333e92f8a14840534a8b8ff8fd715330b";
+ sha256 = "0ysjcvbnbc28c8vs7cc18vr4sqffcc4y4p3xzr8d5giccgy9192v";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
@@ -43259,6 +43414,27 @@
license = lib.licenses.free;
};
}) {};
+ meson-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "meson-mode";
+ version = "20170409.522";
+ src = fetchFromGitHub {
+ owner = "wentasah";
+ repo = "meson-mode";
+ rev = "7aae0da7523833d85a229ce7875185c90fa39620";
+ sha256 = "167wdmzcxs1i56hlv3daw0dlhc0mya0fz86m6db2cn8gvi0wnpvj";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/4702a31ffd6b9c34f96d151f2611a1bfb25baa88/recipes/meson-mode";
+ sha256 = "16yg217ghx6pvlxha2swznkg12c2a9hhyi0hnsbqdj2ijcdzca80";
+ name = "meson-mode";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/meson-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
message-x = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
pname = "message-x";
version = "20151029.718";
@@ -44958,12 +45134,12 @@
mu4e-alert = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }:
melpaBuild {
pname = "mu4e-alert";
- version = "20170323.2254";
+ version = "20170403.2222";
src = fetchFromGitHub {
owner = "iqbalansari";
repo = "mu4e-alert";
- rev = "e8b2c1d1a95c5275b1062956eb5384bf45fa8047";
- sha256 = "06jyq6vilry39f24bn08l0wjh1kv9m1pl57vw1qvzk36vmld5cqy";
+ rev = "c57a29933e4a03e0ece8310c51a8bc2143f8b010";
+ sha256 = "0mgxldxb07ixp8jli7j5jgv2b5vfzhvdv9nszqap4hp4iz7hm50f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5a48e8cb571e91b582ff0dea18e8dc75601edc35/recipes/mu4e-alert";
@@ -45098,16 +45274,19 @@
license = lib.licenses.free;
};
}) {};
- multi-term = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+ multi-term = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
pname = "multi-term";
version = "20160619.233";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/multi-term.el";
- sha256 = "0i7gixcyqhd8ajbslfmb58rvdihzfprydwiqr730q9q0yfja36j8";
+ src = fetchFromGitHub {
+ owner = "emacsorphanage";
+ repo = "multi-term";
+ rev = "f954e4e18b0a035151d34852387e724d87a3316f";
+ sha256 = "00cz3q654vpmijbqxp8c6nkxqj9zx1hjr3552l0adk3fbg6qpmcq";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/multi-term";
- sha256 = "1va4ihngwv5qvwps3m9jj0150gbrmq3zllnyq1hbx5ap8hjrhvdx";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/multi-term";
+ sha256 = "16idk4nd7qpyrvyspbrdl8gdfaclng6ny0xigk6fqdv352djalal";
name = "multi-term";
};
packageRequires = [];
@@ -45621,8 +45800,8 @@
src = fetchFromGitHub {
owner = "john2x";
repo = "nameframe";
- rev = "603061cb98eef5472a8e664ee44e5ce1b2d886ff";
- sha256 = "1clfl49viak24v7g7jrg5a8qnf8gz83ywg7mq30hyz2hy9vkq6w0";
+ rev = "d14186e99fa800d293e8e3072ba26f383c6624c6";
+ sha256 = "0aibzwp39lxafag0vpa36xp8md7nhvgibj1nklzhga2d9nq9l4km";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/bd314150b3f8ce529a2ae39a71e03bebedfdc6b9/recipes/nameframe";
@@ -45638,12 +45817,12 @@
nameframe-perspective = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, nameframe, perspective }:
melpaBuild {
pname = "nameframe-perspective";
- version = "20160927.2103";
+ version = "20170405.1819";
src = fetchFromGitHub {
owner = "john2x";
repo = "nameframe";
- rev = "603061cb98eef5472a8e664ee44e5ce1b2d886ff";
- sha256 = "1clfl49viak24v7g7jrg5a8qnf8gz83ywg7mq30hyz2hy9vkq6w0";
+ rev = "d14186e99fa800d293e8e3072ba26f383c6624c6";
+ sha256 = "0aibzwp39lxafag0vpa36xp8md7nhvgibj1nklzhga2d9nq9l4km";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2543af5579d37a3eb52e6fea41da315f5590331e/recipes/nameframe-perspective";
@@ -45663,8 +45842,8 @@
src = fetchFromGitHub {
owner = "john2x";
repo = "nameframe";
- rev = "603061cb98eef5472a8e664ee44e5ce1b2d886ff";
- sha256 = "1clfl49viak24v7g7jrg5a8qnf8gz83ywg7mq30hyz2hy9vkq6w0";
+ rev = "d14186e99fa800d293e8e3072ba26f383c6624c6";
+ sha256 = "0aibzwp39lxafag0vpa36xp8md7nhvgibj1nklzhga2d9nq9l4km";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/bc17af8ff1694120d12a0cdbfccec78834810acd/recipes/nameframe-projectile";
@@ -45970,16 +46149,16 @@
navi-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, outorg, outshine }:
melpaBuild {
pname = "navi-mode";
- version = "20160327.134";
+ version = "20170402.1210";
src = fetchFromGitHub {
- owner = "tj64";
+ owner = "alphapapa";
repo = "navi";
- rev = "a6b824ab2591e89e47f7399987f4fb3fa5d9306b";
- sha256 = "0vmrh8y8q7zch48iz9lk4n0b3s1b8zp3wki3906s709b5ajfvk7h";
+ rev = "ef9b5dd15ef96ed3192774e96cd74ee6cccf8b10";
+ sha256 = "1v0h7chq746x5vwb3fzk4djwgnkl2vg3m7pmnhxsq1nj5kfvw2vx";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/4a06141b0ee1e10bc3f16fcca35d971dc7e9d07e/recipes/navi-mode";
- sha256 = "0f5db983w9kxq8mcjr22zfrm7cpxydml4viac62lvab2kwbpbrmi";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/8edf78a0ecd2ff8e6e066b80751a31e11a068c3f/recipes/navi-mode";
+ sha256 = "0pc52iq8lng2g0vpnrhdfxmibc1dx9ksmrjg0303as1yv41fnc69";
name = "navi-mode";
};
packageRequires = [ outorg outshine ];
@@ -46368,12 +46547,12 @@
nim-mode = callPackage ({ commenter, emacs, epc, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }:
melpaBuild {
pname = "nim-mode";
- version = "20170326.144";
+ version = "20170409.1737";
src = fetchFromGitHub {
owner = "nim-lang";
repo = "nim-mode";
- rev = "dc81622d899976cb7d4515b592972d17d590ca20";
- sha256 = "1mdficz9dgdlb6hvi7c5qkvw22j1wgaap3a6as1qka16mhlgv13j";
+ rev = "58707562dd29c7a9f36e96a8e894caec90ce1e41";
+ sha256 = "1r6vs77b2rsdarkvcsg6awfa4mna308m53002vxykmpj9apkjszr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/dc2ccb5f24b9d55c77eaa7952a9e6a2e0ed7be24/recipes/nim-mode";
@@ -46389,12 +46568,12 @@
nimbus-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "nimbus-theme";
- version = "20170329.538";
+ version = "20170408.1048";
src = fetchFromGitHub {
owner = "m-cat";
repo = "nimbus-theme";
- rev = "94c08d19c94924b5f549aff61be84efc46e41126";
- sha256 = "06plyf6hlkwk3c9kv8sagq5qhjmv82nv4rqbwlfjc0yxk2dr6gcf";
+ rev = "b54285e69c1c27833dda2b50f61985240ae0d4c5";
+ sha256 = "0xir10im940vlj84xi54r0lf1w18pb4dvvqldy1sprgx62iq66z7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fc0e6b456b76e2379c64a86ad844362c58146dc6/recipes/nimbus-theme";
@@ -46456,8 +46635,8 @@
src = fetchFromGitHub {
owner = "NixOS";
repo = "nix";
- rev = "c60715e937e3773bbb8a114fc9b9c6577f8c5cb5";
- sha256 = "0hkc4g7i3z06y3rsdxqzdnx5rz77jb8ij1j13bdskbvpp7vfm60p";
+ rev = "1fe1976e0d68b520f04f8ad4f619bb52c40cef78";
+ sha256 = "02mlf4gmfwwc0fclfx2h4pqs9ahcm7jd4zvr39f0w99b1xrybgf7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode";
@@ -46582,8 +46761,8 @@
src = fetchFromGitHub {
owner = "tarsius";
repo = "no-littering";
- rev = "0227c5eea5b9f3fb056a7ef6052ef6f076371bde";
- sha256 = "0hjb2paylmcc68998cqgfdnw79z43ha5bv1cg91ysbdjcx2lp1x7";
+ rev = "18e1506135be031db010292d27ef156e32766017";
+ sha256 = "1lqz9fda24i3zkff9nnj4gndrs2bfql80wvvfisn106a3j0ah1n8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering";
@@ -46725,12 +46904,12 @@
nord-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "nord-theme";
- version = "20170325.2314";
+ version = "20170406.700";
src = fetchFromGitHub {
owner = "arcticicestudio";
repo = "nord-emacs";
- rev = "8df429d20d69e5fd914881a71ae3a044d02b392a";
- sha256 = "15gjcrx514790djsyfmm8z8q36a3kyf4yhrms5qj423hfc94d3s7";
+ rev = "f7a2f6e6e4757ae6094003b139be9a335eadfef7";
+ sha256 = "11970wjzd8hf3j66fcpyvba7ij7gf9931i584014a72p2y0l7qkg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/31cb60069825abe3998c8b43bc9177b39a7f3659/recipes/nord-theme";
@@ -46767,8 +46946,8 @@
version = "20170313.1712";
src = fetchgit {
url = "git://git.notmuchmail.org/git/notmuch";
- rev = "e1c1d33f3726f5cadb2f92d23735dcd1102fbc88";
- sha256 = "0s2spmjl2v2zv80ri1l36njgipyxkdg7zvlb8ik5118i0fhbf3p2";
+ rev = "ce8c88824ab91882ea50c761b930390953cf2c34";
+ sha256 = "0c6f4qyvwwjp9d6x4v26fdp0kcrz6v42ix7ah0g14h0wa17yf9vi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
@@ -48128,8 +48307,8 @@
src = fetchFromGitHub {
owner = "AdrieanKhisbe";
repo = "omni-log.el";
- rev = "e5a8ee7d63eb1e745b37ba4e3e71c5ea025e2342";
- sha256 = "1nvgh9wvgswcs3r958b579rsx540xrhlnafc6cmcd63z6yck19w0";
+ rev = "21b81c2358e2a17a636c6494eb084241d06962b7";
+ sha256 = "1241jfckijwimm6b9xfp2rjap5va5hkphcvj3qflkprq2y33y8s3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/47bb19bb7b4713c3fd82c1035a2fe66588c069e3/recipes/omni-log";
@@ -48149,8 +48328,8 @@
src = fetchFromGitHub {
owner = "AdrieanKhisbe";
repo = "omni-quotes.el";
- rev = "537f7191bede7156dae94622e92cec04c6cd4bdf";
- sha256 = "1x8af8jv4n83sl4rgj0d2rpmw9g78rknm1h523f3b1a5x4kdvsz6";
+ rev = "3818c60190eea3c8dc119d6a07531f6b68e7b673";
+ sha256 = "0ha4rxkyahcvpaydk3bi06y519sd9glqjs3a3s87i962h9a20caz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3402524f79381c99fdeb81a6a5a9241c918811be/recipes/omni-quotes";
@@ -48170,8 +48349,8 @@
src = fetchFromGitHub {
owner = "AdrieanKhisbe";
repo = "omni-scratch.el";
- rev = "7e04d7f20ee383bf72dfdcfd642bf08e4b8ab973";
- sha256 = "1icdk19vwihc8mn04yxl2brql2gssn3gxd5bv7ljdd6mn5hkw500";
+ rev = "b0f7c39c7e378694191351b234a78abae762fb85";
+ sha256 = "123qxl56d0ikwpjv5i3zh3q7xzd2i34sjgcfb732cg4xfxrpd3bs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6ba3e128a7fe4476d82266506b18ba9984c37944/recipes/omni-scratch";
@@ -48191,8 +48370,8 @@
src = fetchFromGitHub {
owner = "AdrieanKhisbe";
repo = "omni-tags.el";
- rev = "3f88b087d492e8ef742416d6e4bf8be41e5a46c4";
- sha256 = "1lvnkdrav7h15p8d5ayhfsjynllwp4br1vqxmw0ppxnlyq7337n5";
+ rev = "f949a062e8dab12e8fda39eec465d53a2f23e314";
+ sha256 = "01nawy8nadi9yspnql4wq8ssn5xgaf34yknxdjyhkswjr3bql3f4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c77e57f41484c08cae9f47c4379d1752ccf43ce2/recipes/omni-tags";
@@ -48226,15 +48405,15 @@
license = lib.licenses.free;
};
}) {};
- omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, fetchFromGitHub, fetchurl, flycheck, json ? null, lib, melpaBuild, popup, s }:
+ omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, fetchFromGitHub, fetchurl, flycheck, json ? null, lib, melpaBuild, popup, s, shut-up }:
melpaBuild {
pname = "omnisharp";
- version = "20170216.754";
+ version = "20170404.2224";
src = fetchFromGitHub {
owner = "OmniSharp";
repo = "omnisharp-emacs";
- rev = "bcc5d7ba940c1118ab61071783747162f0c927cf";
- sha256 = "05i3z6whvgq81qnrwgvfglhwi214145ksg8h81rc0g4ir54wzsik";
+ rev = "93c188938305533ea34ceca51dd53c7841598ada";
+ sha256 = "0ynjxf0r9i5yb98pnhrcm55shhv4gqfr0wigfkz83yqzpsjzq6fn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/68bdb7e0100e120b95e9416398127d83530a221d/recipes/omnisharp";
@@ -48250,6 +48429,7 @@
json
popup
s
+ shut-up
];
meta = {
homepage = "https://melpa.org/#/omnisharp";
@@ -48548,12 +48728,12 @@
org-ac = callPackage ({ auto-complete-pcmp, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }:
melpaBuild {
pname = "org-ac";
- version = "20140302.413";
+ version = "20170401.607";
src = fetchFromGitHub {
owner = "aki2o";
repo = "org-ac";
- rev = "9cbbda79e2fe964ded3f39cf7a2e74f1be3d6b9a";
- sha256 = "1xckin2d6s40kgr2293g72ipc57f8gp6y63303kmqcv3qm8q13ca";
+ rev = "41e3ef8e4039619d0370c23c66730b3b2e9e32ed";
+ sha256 = "1l3fn8vjdqq7rrn1b7l2i238bhjni13mg9v25dydin0sfb697abk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/adf598f8dae69ff286ae78d353a2a5d4363b4480/recipes/org-ac";
@@ -48695,12 +48875,12 @@
org-board = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-board";
- version = "20170327.1337";
+ version = "20170403.916";
src = fetchFromGitHub {
owner = "scallywag";
repo = "org-board";
- rev = "53469a2f0577924de1c7d887fecea409d17fd588";
- sha256 = "0fg7lkgcr7zwwjald7hbvwgl72m21lqxmz7p8sq31iw3jh42fqgf";
+ rev = "1daf7bbd52edec82156f0289d42fc7b190f0bc3a";
+ sha256 = "0sm4gr17yi2iki28yimzk5mffp9xfpafk6abi6c6frxab0x42vg5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d8063ee17586d9b1e7415f7b924239826b81ab08/recipes/org-board";
@@ -48734,6 +48914,27 @@
license = lib.licenses.free;
};
}) {};
+ org-brain = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+ melpaBuild {
+ pname = "org-brain";
+ version = "20170404.2329";
+ src = fetchFromGitHub {
+ owner = "Kungsgeten";
+ repo = "org-brain";
+ rev = "9424b8002238a1ffb67e78e25bc997826f37dc14";
+ sha256 = "0vn2s8p21kfnabva7ikal87hl4asgdj6hm7597hfx45w60vakn9a";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/47480fbae06e4110d50bc89db7df05fa80afc7d3/recipes/org-brain";
+ sha256 = "0c05c6lbr740nnjp9p34padrbrc3q1x2pgylkyhsxadm4mfsvj0c";
+ name = "org-brain";
+ };
+ packageRequires = [ dash emacs org ];
+ meta = {
+ homepage = "https://melpa.org/#/org-brain";
+ license = lib.licenses.free;
+ };
+ }) {};
org-bullets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-bullets";
@@ -49073,12 +49274,12 @@
org-drill-table = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org-plus-contrib, s }:
melpaBuild {
pname = "org-drill-table";
- version = "20140117.137";
+ version = "20170408.1205";
src = fetchFromGitHub {
owner = "chrisbarrett";
repo = "org-drill-table";
- rev = "d7b5b3743ac04f8cb1087c5c049c0520058fa89c";
- sha256 = "0m5c9x0vazciq6czpg5y9nr5yzjf6nl0qp5cfajv49cw2h0cwqyy";
+ rev = "5662511e98697e086149a223a64f9f01fabf7330";
+ sha256 = "1bd9wifw57v31bihqrq5305a5xmjq980crlnqak0l9pksjkbw2bx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3347da186765877826b224e1f5d1b585ebd3692c/recipes/org-drill-table";
@@ -49136,12 +49337,12 @@
org-edit-latex = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-edit-latex";
- version = "20170327.1847";
+ version = "20170408.2046";
src = fetchFromGitHub {
owner = "et2010";
repo = "org-edit-latex";
- rev = "ecdae5aa9763adbb1c103578a49dcd7fbfea3de7";
- sha256 = "18mg5zy67hvm79y10z5gzjfdggdkfksb1zkpijqv347f84w1l31z";
+ rev = "a3faf83fe13910596c370a0d4b9a69f9b65f6f99";
+ sha256 = "13q2xd8h0i4ain1y68qnvipmilly9ivdsv2glvnz5ji8k9f5wajk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/180416a18ea8c424ec990be91bc11fc149e427d0/recipes/org-edit-latex";
@@ -49453,8 +49654,8 @@
version = "20140107.519";
src = fetchgit {
url = "git://orgmode.org/org-mode.git";
- rev = "8892fbdb6092af9e5ab5d9ed46762da67b57ffa1";
- sha256 = "1n4djqrk9hqsxrra1x2cxgfx2djsavdmqd53bpik3wn6lr00w1gj";
+ rev = "133634706541cc22385e79ca08793cc5593f9e21";
+ sha256 = "05jbwxl7gp1syd5dx73azdka18n2hf5z0ac1lkrdjd8w5xxhrcca";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal";
@@ -49473,8 +49674,8 @@
version = "20170105.1723";
src = fetchgit {
url = "git://orgmode.org/org-mode.git";
- rev = "8892fbdb6092af9e5ab5d9ed46762da67b57ffa1";
- sha256 = "1n4djqrk9hqsxrra1x2cxgfx2djsavdmqd53bpik3wn6lr00w1gj";
+ rev = "133634706541cc22385e79ca08793cc5593f9e21";
+ sha256 = "05jbwxl7gp1syd5dx73azdka18n2hf5z0ac1lkrdjd8w5xxhrcca";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link";
@@ -49833,12 +50034,12 @@
org-random-todo = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-random-todo";
- version = "20170321.804";
+ version = "20170404.318";
src = fetchFromGitHub {
owner = "unhammer";
repo = "org-random-todo";
- rev = "14a065e1d376838f16a6ba32ed8710304542a4e6";
- sha256 = "07qkn59613l32j6b06ckmccl9s2rfwwivmak5v86z0fafzhxk6ir";
+ rev = "8b784ff0419fcaa2467991bc670e0e8e31be62c0";
+ sha256 = "14lsc6a9ddfd69x06z3ia9mlvac2p8iwvxbfnbmn2m49lijs8724";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/80fad6244ea3e5bdf7f448c9f62374fae45bae78/recipes/org-random-todo";
@@ -49902,12 +50103,12 @@
org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, s }:
melpaBuild {
pname = "org-ref";
- version = "20170325.703";
+ version = "20170410.635";
src = fetchFromGitHub {
owner = "jkitchin";
repo = "org-ref";
- rev = "4117e8b9273ea8533a4ca9f1271cc81b789c57a4";
- sha256 = "0kgfask1ylphcxjb93ybdgxmzrmhn58wky1iq0npcsq1949ajx1w";
+ rev = "eed76b5e0ae41668349a4d4d756a478e753817f8";
+ sha256 = "1hbsj594plzwn6aym8zchigc4y98bnf9i3izij5rxv9jpiw4bcc0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref";
@@ -50077,22 +50278,22 @@
license = lib.licenses.free;
};
}) {};
- org-table-sticky-header = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+ org-table-sticky-header = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "org-table-sticky-header";
- version = "20170317.1913";
+ version = "20170408.1814";
src = fetchFromGitHub {
owner = "cute-jumper";
repo = "org-table-sticky-header";
- rev = "4048357d4ac42885b207677eb6f118e167a0f20f";
- sha256 = "1x5b931khl89yfnknndqfwhpqqqy6i8fylr59dpsffsrfp7pbqs1";
+ rev = "93dc69efc00ac9fd3cc2ece5100f51df33ec7d8b";
+ sha256 = "0d9d9sxak6kvqbb91h65ahw272d7dfxpgjw6zbs472xb6di1r6pm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5dd0e18bf4c3f3263eff8aff6d7c743a554243b5/recipes/org-table-sticky-header";
sha256 = "1rk41279rcsdma39zpr1ka5p47gh1d0969wahd0jbm5xlmx5gz2m";
name = "org-table-sticky-header";
};
- packageRequires = [ org ];
+ packageRequires = [ emacs org ];
meta = {
homepage = "https://melpa.org/#/org-table-sticky-header";
license = lib.licenses.free;
@@ -50896,22 +51097,22 @@
license = lib.licenses.free;
};
}) {};
- outorg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ outorg = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "outorg";
- version = "20160327.132";
+ version = "20170402.1415";
src = fetchFromGitHub {
- owner = "tj64";
+ owner = "alphapapa";
repo = "outorg";
- rev = "456b1500b560ead633ce723986a48c33fb52ab76";
- sha256 = "0szvynvw16vr7br95pssqkil0xnfdh46x8lgan4z9v6impdav0nf";
+ rev = "c279ad21517b3c0e07950b0c175d9a69f77cfaf3";
+ sha256 = "1l6w6kfwk1519alksxx1d9cgn04ndwldqkmh98df0z1dgc801b2m";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/d57762fe51a524731e228c80b4b2d25e827e5858/recipes/outorg";
- sha256 = "04swss84p33a9baa4swqc1a9lfp6wziqrwa7vcyi3y0yzllx36cx";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/8edf78a0ecd2ff8e6e066b80751a31e11a068c3f/recipes/outorg";
+ sha256 = "10jh64d1nalfig69nnsib46915jinv37lvmxa0aj91zymq2szdm9";
name = "outorg";
};
- packageRequires = [];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/outorg";
license = lib.licenses.free;
@@ -50920,16 +51121,16 @@
outshine = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, outorg }:
melpaBuild {
pname = "outshine";
- version = "20161024.2158";
+ version = "20170402.1158";
src = fetchFromGitHub {
- owner = "tj64";
+ owner = "alphapapa";
repo = "outshine";
- rev = "d45a512d149996ca232c0218e2d6b5bc802285a9";
- sha256 = "0f4jb39pd23kszf9wpdmibn3wqgx76y68n1l7jb9y8l47vs519lh";
+ rev = "87d7ed5e34d9ed515e526a9e8470e62da7300949";
+ sha256 = "1mm22qs0j1cyr95daj1wv961g9y0pcalr21cnryyilyb3g5dgq29";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/6dc02a576abb8e115f674a9d896f8bc932b7571b/recipes/outshine";
- sha256 = "1ajddzcrnvfgx3xa5wm0bcll9dax52syg1p521mv0ffkld63jyfl";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/8edf78a0ecd2ff8e6e066b80751a31e11a068c3f/recipes/outshine";
+ sha256 = "1qqmvs17hq5s047nqplg4sa09xg5ck6zwqyg91xmbh71bx80v28v";
name = "outshine";
};
packageRequires = [ cl-lib outorg ];
@@ -50983,12 +51184,12 @@
owdriver = callPackage ({ fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, smartrep, yaxception }:
melpaBuild {
pname = "owdriver";
- version = "20141011.738";
+ version = "20170401.612";
src = fetchFromGitHub {
owner = "aki2o";
repo = "owdriver";
- rev = "0479389d9df9e70ff9ce69dff06252d3aa40fc86";
- sha256 = "0f2psx4lq98l3q3fnibsfqxp2hvvwk7b30zjvjlry3bffg3l7pfk";
+ rev = "d934f182bafe29aa16c173440eff3fef08b0ec10";
+ sha256 = "0yy5sah7vcjxcik3sp2cxp9gvcryyzw799h8zf4wbvjxv74kd17c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f3f9c1bb19345c6027a945e7f265632da1a391cb/recipes/owdriver";
@@ -51050,8 +51251,8 @@
src = fetchFromGitHub {
owner = "jkitchin";
repo = "scimax";
- rev = "ac2479dd030ff47c760c30b68d7d6d133ed82903";
- sha256 = "1vgqi073i6wlgfgjnpyaqbygrb3m9pm5frv0r70k07q2kvmalhy9";
+ rev = "c3ac9201777a0a7a5fa572b3504543138f7039eb";
+ sha256 = "1l2v4sh0jhzwngcgx93w85wr5f1d67pbi4sc9ks2csfj9awcw63b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/222ccf4480395bda8c582ad5faf8c7902a69370e/recipes/ox-clip";
@@ -51067,12 +51268,12 @@
ox-epub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "ox-epub";
- version = "20170328.1131";
+ version = "20170331.114";
src = fetchFromGitHub {
owner = "ofosos";
repo = "ox-epub";
- rev = "94ff7358ad311cc6ad3bd720fbbb51fbcce94aa3";
- sha256 = "0iz38qc7fpd8rl9wacwq76y49mi53vr9jy6bw7f0ja1gbzfa8sgg";
+ rev = "4cff438a06dce6e6e6a83e3900e90588f9f05b74";
+ sha256 = "0i3jbvw34aklfxq8q887l83yl5n13bdqhvjz4ih4yqnzwgcsd74r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c3ac31dfef00e83fa6b716ea006f35afb5dc6cd5/recipes/ox-epub";
@@ -51193,12 +51394,12 @@
ox-latex-chinese = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ox-latex-chinese";
- version = "20170313.2146";
+ version = "20170401.439";
src = fetchFromGitHub {
owner = "tumashu";
repo = "ox-latex-chinese";
- rev = "7bc56542dc488d24f22f2653232b1cf5dab17c5f";
- sha256 = "1hs0rrk8bcyskay945d7phjj5ln8j8gr01qybqnl6a6mfrcpv2b2";
+ rev = "f79d25443987a169a1234f5fbb2bc115cccea33e";
+ sha256 = "1sw7wvsyp5z7jdijkc3lyfx7b0cq3c60fjdvmqlpygl9020md99w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a679ebaedcb496f915b9338f9d5c003e1389594d/recipes/ox-latex-chinese";
@@ -51319,12 +51520,12 @@
ox-qmd = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "ox-qmd";
- version = "20160606.504";
+ version = "20170402.957";
src = fetchFromGitHub {
owner = "0x60df";
repo = "ox-qmd";
- rev = "b41ffcf47af1a635596df31d4b0a704f274b5654";
- sha256 = "1zv8kh7hlskj4g1c4k3cx0hzraal3inn75yzxs08ndvycdsn6cky";
+ rev = "3a24c7a0b3ec80e494b977e14a3dfb94c9f1d8ec";
+ sha256 = "030nay81c49ings96akzzy108a6agg91rvpmg0pf05qmjysfysmf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e71826e8a8c30b0eb535cce7a379740011b79534/recipes/ox-qmd";
@@ -51550,12 +51751,12 @@
package-build = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "package-build";
- version = "20161014.2251";
+ version = "20170409.2149";
src = fetchFromGitHub {
owner = "melpa";
repo = "package-build";
- rev = "9a6824cda477d1bd77d0507b62dcc09ed436b32e";
- sha256 = "1yswi3yqpfm8sjlhcv4phd069vl9rc2ngi5ma6acpah532k4gi1f";
+ rev = "5ed001d66463ecc8906f773452702e848e09f2d8";
+ sha256 = "1rkbyqabikbgv3zzr0g7f9qqgr4jpf8qh6qvjlivk9wb594dr0qd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/948fb86b710aafe6bc71f95554655dfdfcab0cca/recipes/package-build";
@@ -51592,12 +51793,12 @@
package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "package-lint";
- version = "20170324.1727";
+ version = "20170404.751";
src = fetchFromGitHub {
owner = "purcell";
repo = "package-lint";
- rev = "de08b846b3a031838b79445bb7a254c9de4a80f6";
- sha256 = "0mvs4afjp5ab89vdz3bd9pca55brn57lxvjqjjyc6cyqxpclh06j";
+ rev = "a8358b3f8fd8dba1d3a883012e2f8e3614f42af2";
+ sha256 = "1bcx152wkgwvh4w86rgh2hhy07klzjfs97sfr3vc7j00si7ps65i";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint";
@@ -51987,15 +52188,15 @@
}) {};
paredit = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
pname = "paredit";
- version = "20160615.1325";
+ version = "20170405.1149";
src = fetchgit {
- url = "http://mumble.net/~campbell/git/paredit.git";
- rev = "7c27746a8eb259ae24b5dce9380801c4846258f0";
- sha256 = "02s8cvrpcdp8xr7m8bfgwiy7wl9bc4834jlm071ypzx5xfip3zxd";
+ url = "https://mumble.net/~campbell/git/paredit.git";
+ rev = "99829aa423c9e8dd1be8d64c4b68982cf4c1559b";
+ sha256 = "13h5gd9s1ajgqzq6ylzcmz4irb071wyhh9qj195ld177irkxi9wd";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/2d83b5d24db3527e48e3de40c320255bc2dbfccb/recipes/paredit";
- sha256 = "1rp859y4qyqdfvp261l8mmbd62p1pw0dypm1mng6838b6q6ycakr";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/paredit";
+ sha256 = "01qh8kfb5hyfi0jfl1kq3inkyzr0rf3wncmzgxlkfdc8zlq4v653";
name = "paredit";
};
packageRequires = [];
@@ -53012,12 +53213,12 @@
persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "persp-mode";
- version = "20170311.716";
+ version = "20170401.218";
src = fetchFromGitHub {
owner = "Bad-ptr";
repo = "persp-mode.el";
- rev = "6b3987b6c085da52a4a1e1a8433bd4a6f3f411d4";
- sha256 = "0w2wmy1mhpjfmm0js5h0nqwwmj2xzpasc1m40slwh0lcm9176w9c";
+ rev = "651fe02ff10eece65c01ac8d286174cc8ffa87fa";
+ sha256 = "1nij6mrz2fm411z97z13dyy38i482dkpj50fjsgnlc9pmggykqnx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode";
@@ -53411,12 +53612,12 @@
php-auto-yasnippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, yasnippet }:
melpaBuild {
pname = "php-auto-yasnippets";
- version = "20170324.914";
+ version = "20170330.1814";
src = fetchFromGitHub {
owner = "ejmr";
repo = "php-auto-yasnippets";
- rev = "d6e04b2db9ebe220e25e4d3a1550bf6fdafdf032";
- sha256 = "160y5kp5m7kfkj832i7rawgj4ylnf100xqn7v0fppqapri2f177l";
+ rev = "03e1f0899c081813901ac15c2f7a675a37cca9f5";
+ sha256 = "0d7y6njsd1s2r5df2k8wvvwgxpwwyaqkhdd2b3p1php8rrbj3mg8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d47ca8cd5900a80a2ede1b354547addf9b2bbbac/recipes/php-auto-yasnippets";
@@ -53495,12 +53696,12 @@
php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "php-mode";
- version = "20170307.1750";
+ version = "20170405.844";
src = fetchFromGitHub {
owner = "ejmr";
repo = "php-mode";
- rev = "c761c97e53d50a015bf8d5d554f4917267b0f6dc";
- sha256 = "0hy0bzscv3hakldmjynsm9rz91v5lyb7rp20ljzfvbzzbkbxzdai";
+ rev = "11674976ee981bb05fb79c5b6de6973b53d51e98";
+ sha256 = "0d1vz95kplyrymv3i9c5k2p2pg2smrv0bkp3kyrjx73nsq2n981k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode";
@@ -54247,13 +54448,13 @@
pname = "po-mode";
version = "20160827.857";
src = fetchgit {
- url = "git://git.savannah.gnu.org/gettext.git";
+ url = "https://git.savannah.gnu.org/git/gettext.git";
rev = "41e5199f0e4a3e9d518d6f95a3efdfae5e2c7913";
sha256 = "06ww6081aicw2d4rprig8ab5g1rx7dqx7cl9xh444k746c8a554d";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/9317ccb52cdbaa2b273f8b2e8a598c9895b1cde1/recipes/po-mode";
- sha256 = "1hb9vrr2x6mh0yzckmx9fk6535d6r189974n4bizpr1xdikn7dgp";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/po-mode";
+ sha256 = "0km19n87iqd6m6n23h46b6225zyvava9jbx6b8frna3sjwb4ls7w";
name = "po-mode";
};
packageRequires = [];
@@ -54532,22 +54733,22 @@
license = lib.licenses.free;
};
}) {};
- pophint = callPackage ({ fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, popup, yaxception }:
+ pophint = callPackage ({ fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }:
melpaBuild {
pname = "pophint";
- version = "20150930.1034";
+ version = "20170403.701";
src = fetchFromGitHub {
owner = "aki2o";
repo = "emacs-pophint";
- rev = "fc02a155e28ae27466bedabc756e75c936b01266";
- sha256 = "0n1w1adglbavqgrv16rzhym72c3q083mh0c8yl5lj7adn4nr4gr3";
+ rev = "5d1db7c0b92862ba2cc5f3566b25840b8ce3ba59";
+ sha256 = "09av2krrmm8g3f3f31kl4j4agmmf8hx9irzrqyvgshljflk0nq1q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0055c2887acbbd8a2803bf3f81ac2cc444cc805a/recipes/pophint";
sha256 = "1chq2j79hg095jxw5z3pz4qicqrccw0gj4sxrin0a55hnprzzp72";
name = "pophint";
};
- packageRequires = [ log4e popup yaxception ];
+ packageRequires = [ log4e yaxception ];
meta = {
homepage = "https://melpa.org/#/pophint";
license = lib.licenses.free;
@@ -54556,12 +54757,12 @@
poporg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "poporg";
- version = "20170303.526";
+ version = "20170403.51";
src = fetchFromGitHub {
owner = "QBobWatson";
repo = "poporg";
- rev = "ba2f7f4c8662164c5e6f89aa2923484d6f1df8ed";
- sha256 = "04z2p4f5mdnc8jms6z360f3qv6ngpbyp7b88ybvw67kjkg9jn821";
+ rev = "2c58d68c81ecca4140bf179f19ed153ec804b65a";
+ sha256 = "1ymqhy0sqd54z154s3cm6q1m4xnr9wkx9dl5f93845k11ay3kvln";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/63502ec265a66d3f72ef93a2f6e7c2e517ff98a3/recipes/poporg";
@@ -54619,12 +54820,12 @@
popup-edit-menu = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "popup-edit-menu";
- version = "20170329.452";
+ version = "20170404.725";
src = fetchFromGitHub {
owner = "debugfan";
repo = "popup-edit-menu";
- rev = "bd823ae3068e053804258697848392492538914c";
- sha256 = "0j2ynj8dshpagbjg38snfk626pfsb25y23w2nkb4h7v4kfv6587g";
+ rev = "925600a6e29183841199e866cf55e566a6a1b002";
+ sha256 = "1dd0ss7cjdjs3c7vkq8p874408iysih80brc8vlfh1f43cnc5v92";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e824ae5bd9214f8de210059f8145f13a4e62e8a1/recipes/popup-edit-menu";
@@ -54928,12 +55129,12 @@
prassee-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "prassee-theme";
- version = "20170329.758";
+ version = "20170406.1953";
src = fetchFromGitHub {
owner = "prassee";
repo = "prassee-emacs-theme";
- rev = "5be0ad067182881012bea5ae352636eaff06b01b";
- sha256 = "1l73dvi5pdbw8x1qbk9zhi1ddz000k54lm0jg2rzlcsxwnz2f4sf";
+ rev = "7ce96272a514caa8598aa3c7227ade8a21e20daa";
+ sha256 = "033qmd1rfjpiz27zz34b96dyc2lil08qdf9nn13sa915gc6704ps";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/15425b576045af1c508912e2091daf475b80b429/recipes/prassee-theme";
@@ -55405,12 +55606,12 @@
projectile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
melpaBuild {
pname = "projectile";
- version = "20170309.30";
+ version = "20170407.319";
src = fetchFromGitHub {
owner = "bbatsov";
repo = "projectile";
- rev = "0c307c8cbf6162fa992bcdbdd1940bf6eff28253";
- sha256 = "18m35h9r1gs96hkgqmjhkwnlg5dj9knh227n2k9xckg161mld2fg";
+ rev = "323fb845f2da0fc95ac27efd11f4d696f5fe647d";
+ sha256 = "1c0iv9k9sapv4f49qsarivg46xkpw1ckdyh7qizv1ailb3q9faax";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile";
@@ -55808,8 +56009,8 @@
src = fetchFromGitHub {
owner = "google";
repo = "protobuf";
- rev = "4a0dd03e52e09332c8fd0f8f26a8e0ae9f911182";
- sha256 = "0x741ivcyx1yn5qp63swl3n5966zwjngmalwr85sq3qb5vacifj0";
+ rev = "efec7571047c680e11354bd30bf8bd3dfda15ff0";
+ sha256 = "1rika22vx05f6jd5a89n31gv62k5r2y31qi9hb5y2ycdghfyd6nz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -56568,12 +56769,12 @@
pylint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "pylint";
- version = "20160728.1033";
+ version = "20170402.555";
src = fetchFromGitHub {
owner = "PyCQA";
repo = "pylint";
- rev = "da2e9724a195ea48451222457e56fbb9311186da";
- sha256 = "15xwdmsffj4xysl4mg17ip7pid9i035xhsh3r1qg2bqi2ikwqzgr";
+ rev = "79f45263a8904533160d3fa0d4e69b11d3d7d315";
+ sha256 = "0fcf8yw40nslc5zhl525np6w0y6sghjhsf0bf5vg2p7l2jwf205r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint";
@@ -56929,8 +57130,8 @@
src = fetchFromGitHub {
owner = "quelpa";
repo = "quelpa";
- rev = "c1fe1dce4740ca1fcc3ac4c72db6999579d867a1";
- sha256 = "1m0mx8marrhc3wb925x66rpr15ynax2vx0crljqqsxk04bralj27";
+ rev = "a39ab429d6544dff17e933f8d98530da4f8c636f";
+ sha256 = "002r4vc2a5yjm448xsk2dsfzm9p1whiwrcb0pccyy2597ba87w55";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7dc3ba4f3efbf66142bf946d9cd31ff0c7a0b60e/recipes/quelpa";
@@ -56985,6 +57186,27 @@
license = lib.licenses.free;
};
}) {};
+ quick-peek = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "quick-peek";
+ version = "20170327.27";
+ src = fetchFromGitHub {
+ owner = "cpitclaudel";
+ repo = "quick-peek";
+ rev = "6a006fbf1a41b04c0e7522d50c942ec89c3637fc";
+ sha256 = "06rww4a6j7wc32hvay83xcjl16aykm8hwlsh764fx9hfxxfa1fka";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/68f59a3048ec6196b138b6584a22ce70baa38284/recipes/quick-peek";
+ sha256 = "0ivg6v9c535bw2bv636wmkd4sy037j55054bfm31wvvxk99bndwq";
+ name = "quick-peek";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/quick-peek";
+ license = lib.licenses.free;
+ };
+ }) {};
quick-preview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "quick-preview";
@@ -57097,8 +57319,8 @@
src = fetchFromGitHub {
owner = "racer-rust";
repo = "emacs-racer";
- rev = "40f99f69b46edbf0855c92d908c11e29bf2e817c";
- sha256 = "18gf9fzn30190mgdgijzqxyh11q1kmx94fixs6c7gv927i8j7whm";
+ rev = "6e0d1b3ebd54497c0cc995a92f09328ff101cd33";
+ sha256 = "0sz78cnx6gifsgd1r1l1p8bkjc5jwfh57yvwabc9zzgivfimhcb5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/97b97037c19655a3ddffee9a86359961f26c155c/recipes/racer";
@@ -57114,12 +57336,12 @@
racket-mode = callPackage ({ emacs, faceup, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "racket-mode";
- version = "20170315.1216";
+ version = "20170407.858";
src = fetchFromGitHub {
owner = "greghendershott";
repo = "racket-mode";
- rev = "1c2c8964c5d16bf5c4ead2be8d19abc0244f59e6";
- sha256 = "0cxi81rgqv4ri96gbzr2p2mnwyp3jn3klsvds9jkmgw6dd5q4b8a";
+ rev = "3332895078ebc5e2f547538913eccb1db63ec0ca";
+ sha256 = "09a251m0j8ican0myp96755ykg6z2bp0kgggwbdbg4af6bwz3a13";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7ad88d92cf02e718c9318d197dd458a2ecfc0f46/recipes/racket-mode";
@@ -57897,12 +58119,12 @@
rebecca-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rebecca-theme";
- version = "20170220.1342";
+ version = "20170406.2136";
src = fetchFromGitHub {
owner = "vic";
repo = "rebecca-theme";
- rev = "c42e33227a18258145156e69627b713b303ee702";
- sha256 = "0nkf3jf8x95ybw29gwkivfc3pnaiga7awz2mpyjm5bnz4i335mkm";
+ rev = "ddbc2e0ceaa4849ddd284a9265211b61a8777106";
+ sha256 = "0d4yk6gkswfx7hkwgq5s9qc2bi73041fcsigpzvl2q0smb8202cr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/19f40f30113c7dabd76a2d0e52898e6d6be69a35/recipes/rebecca-theme";
@@ -58126,8 +58348,8 @@
src = fetchFromGitHub {
owner = "RedPRL";
repo = "sml-redprl";
- rev = "bdf027de732e4a8d10f9f954389dfff0c822f18b";
- sha256 = "08w4ll3z2pygry85x1g1kz2ibbiq93zq3my9zll226xi9hx1nll0";
+ rev = "b1167e3a65694f3c40966f73a3e15ae78f48585d";
+ sha256 = "0f7yzyyqa1mpw15wr56p92kmcx2h2m46x6932qk5fhn7zihik97p";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl";
@@ -58747,12 +58969,12 @@
restart-emacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "restart-emacs";
- version = "20170313.939";
+ version = "20170403.1125";
src = fetchFromGitHub {
owner = "iqbalansari";
repo = "restart-emacs";
- rev = "38603b019b703f6e78f640478ee6412ba743f7b1";
- sha256 = "0zvknsakxfzkbfi7sg61q1m3484h1a0h6clzxd8hg4xifw6crf9y";
+ rev = "67bbbf0635b252a0c76854036c5d7ad864938a6c";
+ sha256 = "0dyfgwnrxc8yyw743ijpgn2hnmxsfvblw80hj8x66ajb0k3j8lnw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b9faeb6d910d686cbcafe7d12e0bcf62a85689bd/recipes/restart-emacs";
@@ -58993,12 +59215,12 @@
rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }:
melpaBuild {
pname = "rg";
- version = "20170318.657";
+ version = "20170322.1049";
src = fetchFromGitHub {
owner = "dajva";
repo = "rg.el";
- rev = "6c85ce6974b67644dce5a607285f04197fe4874e";
- sha256 = "09r5rnnwxyqkf9kzpragwqxhhlgpr49kbvxc6ci18bkcs44vvcnw";
+ rev = "32fc22b192cbad03fca3835f29c36ab4a90e50a0";
+ sha256 = "168p4h7h9ik1f56cw0zr8brbn53d5jglv9r7i9zqh80zzhljw4xv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg";
@@ -59249,8 +59471,8 @@
src = fetchFromGitHub {
owner = "marcowahl";
repo = "rope-read-mode";
- rev = "a43d56d79a0595374a8414979b758fbea3cab0a8";
- sha256 = "1z5f6z3mii24h82lhpdlyaazjlf69ffp6la1ajl0hn91hx297dw9";
+ rev = "66c02e3efab84e12c2857cb2b56d524e98b7bc87";
+ sha256 = "1hmp7k17q5d5i6286x99jmfq954d9ys5347xk3aph9m5pmybvfrf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/14a674559aa485e92357a8b941304ae8167b9c3e/recipes/rope-read-mode";
@@ -59329,12 +59551,12 @@
rpn-calc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
melpaBuild {
pname = "rpn-calc";
- version = "20170328.349";
+ version = "20170402.1833";
src = fetchFromGitHub {
owner = "zk-phi";
repo = "rpn-calc";
- rev = "9f38d2a5f9a7f24e01804dafcf8a4951daa2bc62";
- sha256 = "08y8yczzpwg7bw01bgpc54kx0ijhg0y8pwl8kcgdxgmav38y46fb";
+ rev = "4d8aa137b31392a76a0fd4eaf676291029c1aad9";
+ sha256 = "0m373xzxx6ywrxll0qqsnyx55bfp0phbw6mcczz53yw9kpf3mf22";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/47d5b3c931cdbc2351e01d15e2b98c78081c9506/recipes/rpn-calc";
@@ -59392,16 +59614,16 @@
rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rtags";
- version = "20170329.1245";
+ version = "20170408.1642";
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "8d868af718f29e7428658fe56979e05659f3a9c3";
- sha256 = "1nj1r3hdgzfhmhy7v9s7ivww7y1hd70bw4vp904m20qwq81zpm69";
+ rev = "476cdf8b01ced2b49f364c8a2509acddac288cf8";
+ sha256 = "189zmd61sgl0gqacfnglgzazf3gsc3yv57mdk3k7nqs9ysv2wygj";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/ac3b84fe84a7f57d09f1a303d8947ef19aaf02fb/recipes/rtags";
- sha256 = "08clwydx2b9cl4wv61b0p564jpvq7gzkrlcdkchpi4yz6djbp0lw";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags";
+ sha256 = "0s5m4zjvnc1k4gkkizbs4ysvzzbfh45717pksg9bnyzwx5lcw5yd";
name = "rtags";
};
packageRequires = [];
@@ -59457,13 +59679,13 @@
pname = "ruby-additional";
version = "20161115.2259";
src = fetchsvn {
- url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/";
- rev = "58216";
+ url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/";
+ rev = "58302";
sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/17cc8e84dd68f280c23f77510f58f21e7e7cbaae/recipes/ruby-additional";
- sha256 = "0h0cxik8lp8g81bvp06mddikkk5bjdlch2wffcvsvi01is408w4w";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/ruby-additional";
+ sha256 = "0w88hijkr7rjm8ig65n20bqkb1ymqmb3wdwc6bskp26d49w85xjg";
name = "ruby-additional";
};
packageRequires = [ emacs ruby-mode ];
@@ -59537,13 +59759,13 @@
pname = "ruby-electric";
version = "20150424.752";
src = fetchsvn {
- url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/";
- rev = "58216";
+ url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/";
+ rev = "58302";
sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/2d67431327845171f0e50d28e9276cbabecf6cb0/recipes/ruby-electric";
- sha256 = "04j04dsknzb7xc8v6alawgcbymdfmh27xnpr98yc8b05nzafw056";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/ruby-electric";
+ sha256 = "0abi1hqjscz2wj4n5habjb6rksxkhwv0cvpw68irkj4fas92qhk8";
name = "ruby-electric";
};
packageRequires = [];
@@ -59786,12 +60008,12 @@
rust-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rust-mode";
- version = "20170117.824";
+ version = "20170405.707";
src = fetchFromGitHub {
owner = "rust-lang";
repo = "rust-mode";
- rev = "0de149a9ad04f652cd7a59a9ef67be8a7d86ba76";
- sha256 = "0cj12mz47k20d2lrnwr81ijbs42wjpdzmw646yghvazdrq23b12h";
+ rev = "19e6f604a0c9d838a1426604d70ce3af0960621d";
+ sha256 = "0phggsdcnjcc8zxw66ida1a6hq8ccqh66islhm6ix1yaycrwvhms";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8f6e5d990d699d571dccbdeb13327b33389bb113/recipes/rust-mode";
@@ -60189,8 +60411,8 @@
src = fetchFromGitHub {
owner = "openscad";
repo = "openscad";
- rev = "714e14e4a6b8eb62677784de6213e1cde79a6554";
- sha256 = "0yq86lm8754899lvx9g9w4y34gsw91xw51m9rsk59x7jfd2lfq6x";
+ rev = "e34e519c1276e7f1b299fea40fea2f114c7ef455";
+ sha256 = "09rfxip87iad670xxw0www8ig12qavpjs1ys7x5nzga7aw3apij2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode";
@@ -60269,12 +60491,12 @@
scheme-complete = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "scheme-complete";
- version = "20160604.533";
+ version = "20170410.617";
src = fetchFromGitHub {
owner = "ashinn";
repo = "scheme-complete";
- rev = "bc7f0bd687c9a6625393053fb6490b4f37c82505";
- sha256 = "0xa0md847v3qizvf22jrb1rwynrdp7dbxv32rf4vl8yjsh44wspn";
+ rev = "6bf844202cb9e8490ce37a414374be3f04eefca4";
+ sha256 = "16mbcwx1x6bg86qfgl6bhq5qjkz9xgd5f2jl993vvfk824qg4jgl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/scheme-complete";
@@ -60972,17 +61194,19 @@
license = lib.licenses.free;
};
}) {};
- sentence-highlight = callPackage ({ fetchurl, lib, melpaBuild }:
+ sentence-highlight = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sentence-highlight";
- version = "20121026.750";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/sentence-highlight.el";
- sha256 = "01qj57zpqpr4rxk9bsx828c7baac1xaa58cz22fncirdx00svn2k";
+ version = "20170405.2352";
+ src = fetchFromGitHub {
+ owner = "sbelak";
+ repo = "sentence-highlight";
+ rev = "f47839853455d0f4ffe50b3b0f9d3e7a15ace1fa";
+ sha256 = "11s5zvwklf5vzwiiwmcw5c93qjvf5nxclbbk8hlj8fg88c5ssbzd";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/1f41eba284e297177e89b9b7a8da4779eb6fdcba/recipes/sentence-highlight";
- sha256 = "16kh6567hb9lczh8zpqwbzz5bikg2fsabifhhky8qwxp4dy07v9m";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/531ec8b371465d916f332818c04359dc66009a42/recipes/sentence-highlight";
+ sha256 = "0pr8f3b6hcflk400fq6j7fi8iv7r2drzdg19rbx3w7n3xwipwjf0";
name = "sentence-highlight";
};
packageRequires = [];
@@ -61325,16 +61549,19 @@
license = lib.licenses.free;
};
}) {};
- shell-command = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+ shell-command = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
pname = "shell-command";
- version = "20090621.632";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/shell-command.el";
- sha256 = "0jr5sbmg4zrx2dfdrajh2didm6dxx9ri5ib9qnwhc1jlppinyi7l";
+ version = "20090830.340";
+ src = fetchFromGitHub {
+ owner = "emacsorphanage";
+ repo = "shell-command";
+ rev = "7e22125f746ce9ffbe9b0282d62f4b4bbbe672bd";
+ sha256 = "1my2i26a03z8xyyacsnl5wdylnbhhvazn23bpy639d3l4x4l7jzw";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/shell-command";
- sha256 = "1jxn721i4s1k5x1qldiynnl5khsl22x9k3whm698nzv8m786spxl";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/shell-command";
+ sha256 = "01nviashfr64wm78zi3vrqrqdqgsamp76d9kasxv0b7fqmfx7yjk";
name = "shell-command";
};
packageRequires = [];
@@ -61385,16 +61612,19 @@
license = lib.licenses.free;
};
}) {};
- shell-history = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+ shell-history = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
pname = "shell-history";
- version = "20100504.150";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/shell-history.el";
- sha256 = "0biqjm0fpd7c7jilgkcwp6c32car05r5akimbcdii3clllavma7r";
+ version = "20100505.139";
+ src = fetchFromGitHub {
+ owner = "emacsorphanage";
+ repo = "shell-history";
+ rev = "ee371a81f2d2bf5a308344078329ca1e9b5ed38c";
+ sha256 = "0jyz31j5a07shcf2ym5gnn16xk5r3s84ls8kxk5myvxi3wkpgdd4";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/039854cf1b41b18423876170c5f48300bf3fe29a/recipes/shell-history";
- sha256 = "1blad7ggv27qzpai2ib1pmr23ljj8asq880g3d7w8fhqv0p1pjs7";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/shell-history";
+ sha256 = "1cmk8rymnj7dscxjq0p23jgwc16yvzw1804ya5wsg95v239gz1hy";
name = "shell-history";
};
packageRequires = [];
@@ -61713,16 +61943,19 @@
license = lib.licenses.free;
};
}) {};
- showtip = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+ showtip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
pname = "showtip";
- version = "20080329.1959";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/showtip.el";
- sha256 = "01ibg36lvmdk7ac1k0f0r6wyds4rq0wb7gzw26nkiwykn14gxaql";
+ version = "20090830.340";
+ src = fetchFromGitHub {
+ owner = "emacsorphanage";
+ repo = "showtip";
+ rev = "930da302809a4257e8d69425455b29e1cc91949b";
+ sha256 = "01zak0zhha6dp7a2hm28d065gjnc462iwpsfyxhbxgfzcdlicqc7";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/19636728b501dadddaad9743635fd51ceb12cc07/recipes/showtip";
- sha256 = "1fdhdmkvyz1dcy3x0im1iab6yhhh8gqvxmm6ccwr6rl1r1m5zwc8";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/showtip";
+ sha256 = "1d5ckka2z0ffwyk9g3h91n3waijj2v7n8kvdks35gcr2yl3yk780";
name = "showtip";
};
packageRequires = [];
@@ -62299,12 +62532,12 @@
slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }:
melpaBuild {
pname = "slack";
- version = "20170328.2044";
+ version = "20170331.2242";
src = fetchFromGitHub {
owner = "yuya373";
repo = "emacs-slack";
- rev = "fc85625ed4421e4fe79c87c3844d6561543c0ab8";
- sha256 = "08xfqacvq1a0g6pvj6pjg3mi2yl1c756kn92csacdq3g7z4sfkm2";
+ rev = "86756c37968cbbc171e52e416ef656af2a2258a8";
+ sha256 = "1vhcfmyk9swf5h7gka9fbwq2s3x4a540km6wjxqynmpw8c45q154";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack";
@@ -63030,12 +63263,12 @@
smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "smartparens";
- version = "20170312.450";
+ version = "20170401.315";
src = fetchFromGitHub {
owner = "Fuco1";
repo = "smartparens";
- rev = "2acdee84701021049bea0925988df61e340c2311";
- sha256 = "1k0aybgaa595gdr8d1v3wid349hzmnxr3i0isdh3sdzf9b9dh313";
+ rev = "a5f39550d419ca10eb0075f799c0864ade7c88d7";
+ sha256 = "07j9cr06v78xnsfnd9ixpddiap7il3xrd0fpsyxyl9xsb2gp3jgh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens";
@@ -63386,12 +63619,12 @@
snakemake-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }:
melpaBuild {
pname = "snakemake-mode";
- version = "20170326.1920";
+ version = "20170406.1736";
src = fetchFromGitHub {
owner = "kyleam";
repo = "snakemake-mode";
- rev = "349980879a66493ed421e9c83f4857662267b8df";
- sha256 = "0alwp2i554alac76zlskviabi12nivmpy4yhm9nwz7lsnv7qsikj";
+ rev = "15803162483e635f3e22b2efea33ccad725e0535";
+ sha256 = "1nc8xp22i57kf89x0qh69dspl9hl710m01gdr35ph5gl8ycmyir5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c3a5b51fee1c9e6ce7e21555faa355d118d34b8d/recipes/snakemake-mode";
@@ -64538,16 +64771,19 @@
license = lib.licenses.free;
};
}) {};
- sr-speedbar = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+ sr-speedbar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
pname = "sr-speedbar";
version = "20161025.131";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/sr-speedbar.el";
- sha256 = "15kvl270a5xx1w5fjlrawslnpwyks2x17356xcr0idhv5xw2wn30";
+ src = fetchFromGitHub {
+ owner = "emacsorphanage";
+ repo = "sr-speedbar";
+ rev = "77a83fb50f763a465c021eca7343243f465b4a47";
+ sha256 = "0sd12555hk7z721y00kv3crdybvcn1i08wmd148z5imayzibj153";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/e1f3e11958db5ecf764d6e659608220af2166fb3/recipes/sr-speedbar";
- sha256 = "1zq3ysz1vpc98sz2kpq307v1fp1l4ivwgrfh2kdqkkdjm4fkya23";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/sr-speedbar";
+ sha256 = "1v90jbqdw39yrfcsnyqas8c5g09rcf1db65q2m2rw7rik8cgb052";
name = "sr-speedbar";
};
packageRequires = [];
@@ -64643,12 +64879,12 @@
ssh-config-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ssh-config-mode";
- version = "20170110.1756";
+ version = "20170406.2158";
src = fetchFromGitHub {
owner = "jhgorrell";
repo = "ssh-config-mode-el";
- rev = "badbd859517e0a7c0cb8002cf79f4c474478b16d";
- sha256 = "13dqzyc99qvspy8fxdjai0x0s0ggyhdlf6apyrq2r1z0j6gaf88g";
+ rev = "99d14509289943b29c702232076704c11f19a82b";
+ sha256 = "1khgabsmg8vwpvpligvxwgqq275sh33w4704dpwyq1h25jq317bj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce38cac422ad82f8b77a1757490daa1f5e284b0/recipes/ssh-config-mode";
@@ -65162,13 +65398,13 @@
pname = "stumpwm-mode";
version = "20140130.1816";
src = fetchgit {
- url = "git://git.savannah.nongnu.org/stumpwm.git";
+ url = "https://git.savannah.nongnu.org/git/stumpwm.git";
rev = "61a7cf27e49e0779a53c018b2342f5f1c5cc70b4";
sha256 = "03is0690p7aw77c30j4r2b5gi5rv5f70wvpixy5qhcchlaxhaw82";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/3a1e6358c529e3b9e51bcfa6e2e294acbf662882/recipes/stumpwm-mode";
- sha256 = "0a77mh7h7033adfbwg2fbx84789962par43q31s9msjlqw15gs86";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/stumpwm-mode";
+ sha256 = "11yk7xmmccgv7hin5qd1ibcsm1za01xfwsxa25q7vqwk6svnb0sf";
name = "stumpwm-mode";
};
packageRequires = [];
@@ -65284,12 +65520,12 @@
subemacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "subemacs";
- version = "20160105.359";
+ version = "20170401.234";
src = fetchFromGitHub {
owner = "kbauer";
repo = "subemacs";
- rev = "d693919991de6b93f0797daae2a12285e54ae27e";
- sha256 = "10pirwc7g9vii5cyk4vg6m5g5hlap0yg9w4qy257744c67jmaxvg";
+ rev = "18d53939fec8968c08dfc5aff7240ca07efb1aac";
+ sha256 = "1k2lg7cxr98rq77sk0ypzlr3cyl20ld20jz8y21fdaa6ci8kdvdb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/18714a6b5ca4dcc51fa509fee1dc9afb0595c707/recipes/subemacs";
@@ -65842,12 +66078,12 @@
swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "swiper";
- version = "20170328.737";
+ version = "20170410.24";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "swiper";
- rev = "3fbeaa563916c0e23c6cafa82716e9f2eba44073";
- sha256 = "14z8f0lx5s63dy7h0x5m6lkhpfbmlq0p64g2r6y3dhswb8zn1pjl";
+ rev = "d9608bfb593fdc3a60ffa81a19b0533313d44f26";
+ sha256 = "15mnj8mbc7ch4j9rdag18a8biiy0a4837vxak97zh9ffgyk7aiqr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper";
@@ -65986,6 +66222,27 @@
license = lib.licenses.free;
};
}) {};
+ symbol-overlay = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "symbol-overlay";
+ version = "20170408.449";
+ src = fetchFromGitHub {
+ owner = "wolray";
+ repo = "symbol-overlay";
+ rev = "06c5a46ef7f105ac0281a881b5b4f914e2de314b";
+ sha256 = "1nr564zmi9wsxnpdk3i7hsrpy3dnj9gk153ki2kz3v0fdbkqwy62";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/c2a468ebe1a3e5a35ef40c59a62befbf8960bd7b/recipes/symbol-overlay";
+ sha256 = "1al60x2mnjsv99jd10v5sd56zz185wsddiq7128phf1l35bkibis";
+ name = "symbol-overlay";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/symbol-overlay";
+ license = lib.licenses.free;
+ };
+ }) {};
symon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "symon";
@@ -67010,6 +67267,27 @@
license = lib.licenses.free;
};
}) {};
+ terminal-here = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "terminal-here";
+ version = "20170403.547";
+ src = fetchFromGitHub {
+ owner = "davidshepherd7";
+ repo = "terminal-here";
+ rev = "5f98902c65f0d8130e1ae11b9d1c95bff276962e";
+ sha256 = "0mmjch5jl19dv5y6057vk1wpnialz0ax8wghjmy1xx4yjd1n8rgx";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/f8df6f7e23476eb52e7fdfbf9de277d3b44db978/recipes/terminal-here";
+ sha256 = "1w64r3y88lspxxcqcqfwhakk8p9vl7q3z610dykfbqwqx61a6adj";
+ name = "terminal-here";
+ };
+ packageRequires = [ cl-lib emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/terminal-here";
+ license = lib.licenses.free;
+ };
+ }) {};
tern = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
melpaBuild {
pname = "tern";
@@ -67346,12 +67624,12 @@
theme-looper = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "theme-looper";
- version = "20160924.2205";
+ version = "20170330.1829";
src = fetchFromGitHub {
owner = "myTerminal";
repo = "theme-looper";
- rev = "66788db264b3d94f25a077f9a6cecfa1c8ad2c96";
- sha256 = "1wckby9q7c6xdq0kv0x0fdjr9gplj4an5s3kx78dqrxcjj12a35d";
+ rev = "4c07f6f6e1c733d274e26ed8eb03cc5bb6e9149a";
+ sha256 = "0nq298fclba9k1bdg9yhhnfsxw1dnvs96m6wdl5wnv21087zj77j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/861c3b96189233956b15f222702ff034ed2d8cd1/recipes/theme-looper";
@@ -67406,10 +67684,10 @@
thing-cmds = callPackage ({ fetchurl, hide-comnt, lib, melpaBuild }:
melpaBuild {
pname = "thing-cmds";
- version = "20170307.1538";
+ version = "20170331.1338";
src = fetchurl {
url = "https://www.emacswiki.org/emacs/download/thing-cmds.el";
- sha256 = "16bfjak7953mhmn7abd3pq8cqh8njir5x5x7acqs8zmd9n9qpni6";
+ sha256 = "0zi7hbdb5w0lry09rdsxmb0kqnfp6s72kn0z5npfhvwalkcpywbq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/thing-cmds";
@@ -67531,8 +67809,8 @@
src = fetchFromGitHub {
owner = "apache";
repo = "thrift";
- rev = "7470995ce4bb480a86beaf1d8babce95c6f4b8c7";
- sha256 = "0srq5qcmnfplr30yxh6l4szl4vjfj41dwm615zq0mfjakxd3pbm1";
+ rev = "2d65c2365f19f637bc732222e71d78727bf0b709";
+ sha256 = "0g347bhy6hppkl4769ahfyw2cbl0dqhv889c0xf8wbzfbsn9kaz5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift";
@@ -67588,12 +67866,12 @@
tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }:
melpaBuild {
pname = "tide";
- version = "20170325.602";
+ version = "20170406.2103";
src = fetchFromGitHub {
owner = "ananthakumaran";
repo = "tide";
- rev = "a38e71fd07fceaa069d701cb6a3637dfd53c9f23";
- sha256 = "01fg82i1a5ck6f5qj2nrz2hzl46hcsaxk13chbb71r99r80xm9lm";
+ rev = "eabcad4dbebb705d4e366f90344ea543068d2dc4";
+ sha256 = "1ykxsr8q9gwx2d8b0v2xf4glchwg3ikcx60a5r4phw1nlwff8gg7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide";
@@ -67888,12 +68166,12 @@
tldr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "tldr";
- version = "20160807.2022";
+ version = "20170401.2140";
src = fetchFromGitHub {
owner = "kuanyui";
repo = "tldr.el";
- rev = "b2b154b0cbe495f25de1bd9bccc76666ef209342";
- sha256 = "1bdd31aravm01ahy3ksgfdm65rknzj2v5a69vnag36ap7lj4ax49";
+ rev = "05da2ac1d82f9918b493e0895e98cd59666d3e28";
+ sha256 = "14ni301cn6s793157k1fkz65ab1xgh94n3g12hcj1xnmbdvnlymy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/45af2c5d1a36fcbf739812594c5cc878bf319a26/recipes/tldr";
@@ -67930,12 +68208,12 @@
toc-org = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "toc-org";
- version = "20170324.103";
+ version = "20170404.15";
src = fetchFromGitHub {
owner = "snosov1";
repo = "toc-org";
- rev = "f0b94e07bb4b32db039088a58578bced29256431";
- sha256 = "1dbi8kzr5nnb3sclafniq2sipwyran8h1vsqdy1wqd1a5306538h";
+ rev = "d30b57f16d158fa859b0626f5350520f3ee86f44";
+ sha256 = "0q0wshcxn60c87lml2fxrhikrj7zay48ijrwj334yzwp26dvm422";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1305d88eca984a66039444da1ea64f29f1950206/recipes/toc-org";
@@ -68282,8 +68560,8 @@
src = fetchFromGitHub {
owner = "chmouel";
repo = "tox.el";
- rev = "27a074b21238855ce3c33d22e42d69e2c2921205";
- sha256 = "1m3f0i6vrkrncd7xsgz65m6595iv6yr4gbbzlis8p01kd98wbxfk";
+ rev = "7655eb254038d5e34433e8a9d66b3ffc9c72e40c";
+ sha256 = "1212b7s00kw9hk5gc2jx88hqd825rvkz1ss7phnxkrz833l062ki";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/08a7433e16f2a9a2c04168600a9c99bc21c68ddf/recipes/tox";
@@ -68316,6 +68594,27 @@
license = lib.licenses.free;
};
}) {};
+ tql-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "tql-mode";
+ version = "20170402.1846";
+ src = fetchFromGitHub {
+ owner = "tiros-dev";
+ repo = "tql-mode";
+ rev = "2c4827652b4b9b640f3c55e27e1b1856ec9e2018";
+ sha256 = "08vsg5y2bg9gxzfcm630vv95d9kwzxqhzz5dzbbi3g71nlgcclk2";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/6a7c3dec5d970a4e819c0166a4b9846d74484b08/recipes/tql-mode";
+ sha256 = "0nrycix119vail6vk1kgqsli4l4cw8x49grc368n53w0xwngh0ns";
+ name = "tql-mode";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/tql-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
traad = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, request, request-deferred, virtualenvwrapper }:
melpaBuild {
pname = "traad";
@@ -68469,16 +68768,19 @@
license = lib.licenses.free;
};
}) {};
- transpose-frame = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+ transpose-frame = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
pname = "transpose-frame";
version = "20151126.626";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/transpose-frame.el";
- sha256 = "1f67yksgw9s6j0033hmqzaxx2a93jm11sd5ys7cc3li5gfh680m4";
+ src = fetchFromGitHub {
+ owner = "emacsorphanage";
+ repo = "transpose-frame";
+ rev = "011f420c3496b69fc22d789f64cb8091834feba7";
+ sha256 = "1nhbinwv1ld13c0b0lxlvfm9s6bvxcz2vgfccqg45ncg9rx70rsw";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/7682372c9075e19fcef2a2462c30010ee324cd14/recipes/transpose-frame";
- sha256 = "0bqip7vckic3kfq3d31ifs1zics1djxwj2jadafj6f1agv02sdz5";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/transpose-frame";
+ sha256 = "1ksdc4d9k05452hcq4xx0j5nfl9n01z8abbca6j7j66bdf3m4l1b";
name = "transpose-frame";
};
packageRequires = [];
@@ -68529,16 +68831,19 @@
license = lib.licenses.free;
};
}) {};
- tree-mode = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+ tree-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
pname = "tree-mode";
version = "20151104.531";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/tree-mode.el";
- sha256 = "0hffnzvzbvmzf23z9z7n7y53l5i7kza9hgfl39qqcnw4njg48llx";
+ src = fetchFromGitHub {
+ owner = "emacsorphanage";
+ repo = "tree-mode";
+ rev = "b06078826d5875d74b0e7b7ac47b0d0917610534";
+ sha256 = "13bbdhdmqg4x9yghanhr8fsbsxbnypzxdxgicz31sjjm675kpnix";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/dc67872b6463bebbf06ef9a44521ab2a029fa359/recipes/tree-mode";
- sha256 = "0xwyhlc5lagj46nd70l81rvb43hs08pic96grk62zknig8354c24";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/84f836338818946a6bb31d35d6ae959571128ed5/recipes/tree-mode";
+ sha256 = "1b15xgh96j4qas1kh4ghczcn7hb1ri86wnjgn9wz2d6bw3c6077b";
name = "tree-mode";
};
packageRequires = [];
@@ -69701,22 +70006,22 @@
license = lib.licenses.free;
};
}) {};
- uptimes = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ uptimes = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "uptimes";
- version = "20170326.515";
+ version = "20170402.143";
src = fetchFromGitHub {
owner = "davep";
repo = "uptimes.el";
- rev = "5e321692bf5ccdc286f4831fa8fe55467c1c56aa";
- sha256 = "04n4bryfid6scma43whw156wcza77ij7szgc5f73d98j9fji6lay";
+ rev = "2be31db3508513478d3f27f4eff2ff1094786b4e";
+ sha256 = "177d1h84w9rr6x3hsq9z7sbr8s8pippgy0l99gpdhycbff6a7cwg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/72099e35ce3e34ec6afc6a3f87a4da07ec91499a/recipes/uptimes";
sha256 = "0r8s5c2hdcb1ly7rnhzar4qzf1c9d49gd914ndnc3mg9yb9gyy5h";
name = "uptimes";
};
- packageRequires = [ cl-lib ];
+ packageRequires = [ cl-lib emacs ];
meta = {
homepage = "https://melpa.org/#/uptimes";
license = lib.licenses.free;
@@ -69785,12 +70090,12 @@
use-package = callPackage ({ bind-key, diminish, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "use-package";
- version = "20170327.1449";
+ version = "20170405.1028";
src = fetchFromGitHub {
owner = "jwiegley";
repo = "use-package";
- rev = "a354568ec2af8444b741f595a3a7183e3f67ad58";
- sha256 = "19aaqcaycq1msfgvvnlqkzqqijbzqzc015k69pbg41l5bvrwnqcq";
+ rev = "103b6518e66d9acb990832f02dca093a7425ca84";
+ sha256 = "0rsc9shvgla560y3001s9v29wiwz1g9il2z44939phwlkydhak7r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3f9b52790e2a0bd579c24004873df5384e2ba549/recipes/use-package";
@@ -69831,8 +70136,8 @@
src = fetchFromGitHub {
owner = "diml";
repo = "utop";
- rev = "d6f6a9465a26fc78ff72a3c234f118256ab24309";
- sha256 = "1nswnzmr43b4x1kcai0ygy5v3nyc3713209x3pwq30hs7jk3swb0";
+ rev = "f64e9d2e78ed626216ad29098b23ef200ecdc770";
+ sha256 = "0g01p5qrwiah4z4hahv7a4a4nzrznqcwjnljns1zyk49n63rfrmh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/30489fe52b4031184e54f994770aa3291257bc9d/recipes/utop";
@@ -70076,22 +70381,22 @@
license = lib.licenses.free;
};
}) {};
- vc-darcs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ vc-darcs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "vc-darcs";
- version = "20151225.1228";
+ version = "20170409.623";
src = fetchFromGitHub {
owner = "velkyel";
repo = "vc-darcs";
- rev = "f9b4cd89ed7eff91009ce27d9e1d2fb555a5efff";
- sha256 = "1zpvinbc3nrnjm931fgzrlkl31xcsg9ikh041s1fkfjkhfq0h82h";
+ rev = "9c5cbf6fd9b624a31e918dd1a516b24d8b7ffe9d";
+ sha256 = "0g26hyjblxldqr5hhijqaclmk1p6a1kc5yh3hkflw6y7lgcrqxkx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/54f89c50ae45365e86bdadcf67b2411c0f4c5603/recipes/vc-darcs";
sha256 = "1xskl9wjxkbdpi0fm769ymbvya70vssi944x5252w2d3layibm6m";
name = "vc-darcs";
};
- packageRequires = [];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/vc-darcs";
license = lib.licenses.free;
@@ -70688,12 +70993,12 @@
vlf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "vlf";
- version = "20161030.840";
+ version = "20170330.1613";
src = fetchFromGitHub {
owner = "m00natic";
repo = "vlfi";
- rev = "a8ba8363b20d13fdb474faae0ea8d4178c350ca0";
- sha256 = "02xqfrv45d0d36jn6nvzmy6pc9dy7mban2dvljxspgpidqlwj8p8";
+ rev = "eaa362922734a6fc0b1228a040be267faec07d3c";
+ sha256 = "1s2yqknwg02nnsy7b1lr2si4mj8sz3wkm0criqwnbhh380k5sypr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9116b11eb513dd9e1dc9542d274dd60f183b24c4/recipes/vlf";
@@ -70832,12 +71137,12 @@
vue-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode, ssass-mode, vue-html-mode }:
melpaBuild {
pname = "vue-mode";
- version = "20170329.612";
+ version = "20170403.2159";
src = fetchFromGitHub {
owner = "CodeFalling";
repo = "vue-mode";
- rev = "cbd1e35375309f0c813b5689a765c483caef6d60";
- sha256 = "1lpac1bkgjnkhhglynpwfz4vr3g90m8124ii43yd5n06vpx21c3d";
+ rev = "95ca5d13f55b7863fe187865c8c4f6e378af11a1";
+ sha256 = "18dxqfkgg2ii6ys6vsi2y7jx26rk3pwh1z3wnqpw225x2jzfz7rv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2e5e0a9fff332aeec09f6d3d758e2b67dfdf8397/recipes/vue-mode";
@@ -70850,16 +71155,19 @@
license = lib.licenses.free;
};
}) {};
- w32-browser = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+ w32-browser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
pname = "w32-browser";
- version = "20170308.1518";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/w32-browser.el";
- sha256 = "0pp3fl2r5g32qv8ysiwnznpc5na7cqh3vp5mq59yfhv5p6myayxj";
+ version = "20170101.1154";
+ src = fetchFromGitHub {
+ owner = "emacsorphanage";
+ repo = "w32-browser";
+ rev = "e5c60eafd8f8d3546a0fa295ad5af2414d36b4e6";
+ sha256 = "18hcr9l5id2xdin20wrg9sdmwfad7qk78iryyg24ci9lvl53m02x";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/w32-browser";
- sha256 = "14vc2cipwlwwc0b5ld4x0zvydkg8nbjmp0z2x6ca0nmxw8sfsnc6";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/w32-browser";
+ sha256 = "16sp0gn4yv7iaa55i2kvfsqw3610gr3x31l9lqa14r9xmfhda1rn";
name = "w32-browser";
};
packageRequires = [];
@@ -70927,6 +71235,26 @@
license = lib.licenses.free;
};
}) {};
+ waf-mode = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "waf-mode";
+ version = "20170403.1240";
+ src = fetchgit {
+ url = "https://bitbucket.org/dvalchuk/waf-mode";
+ rev = "20c75eabd1d54fbce8e0dbef785c9fb68577ee4f";
+ sha256 = "09jqxbkkprsrcj7gj9hi8ll7d17425lyjmdmqf12ffqv5pz6aq87";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/44c1aa152ba47113a91878df78d9b56eead98744/recipes/waf-mode";
+ sha256 = "16rplrs599a67dcxcdc33zb9bqivv4a2mvrshvyip1lp75f36r5h";
+ name = "waf-mode";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/waf-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
waher-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "waher-theme";
@@ -71245,12 +71573,12 @@
web-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "web-mode";
- version = "20170320.1240";
+ version = "20170408.1147";
src = fetchFromGitHub {
owner = "fxbois";
repo = "web-mode";
- rev = "4d16489eb14e47f3d63b4bdd4d9f7177133a973c";
- sha256 = "0xgij4ln7r8q56c79m729nayr66bzmlkfbmmy8pr33rca6m66hfr";
+ rev = "f6b8fe78d053a4aba180c4d8037c303f0e4ae453";
+ sha256 = "0wrb88yh26fpl8fg4w9wbvg7xmd6kpsrv3lh79f8q4xzfpl2g56h";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode";
@@ -71581,12 +71909,12 @@
which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "which-key";
- version = "20170315.1055";
+ version = "20170407.605";
src = fetchFromGitHub {
owner = "justbur";
repo = "emacs-which-key";
- rev = "3c7ecc69d48258af66978a685aedcbc8d1ada512";
- sha256 = "1q6v4bnw9sl6f138lxkqp979xpbgsb57gxj8a1k7clms16kkn5ci";
+ rev = "bb30f56868ae4888a8ac5a406c7c7ee2ff168f9b";
+ sha256 = "1v50qa611lqj0hjp8v6pnyqvnmljkd0p5g9aj517kv5d7b2rk1dj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key";
@@ -71792,8 +72120,8 @@
src = fetchFromGitHub {
owner = "foretagsplatsen";
repo = "emacs-js";
- rev = "e66476fef5c5afe75f09e4fe94109423a99fc2c6";
- sha256 = "1lvk8nh9gp3i98jjinqx17fxammxkfwh0dvzhah9ram73i6xq1yd";
+ rev = "8e56c97e19b838a63a79e0a8f69c9c448f04b1ed";
+ sha256 = "0s7y2py0hx0nixqiqz63mj8qb3h8jfpkwrkz6nl093zrxpmby3wa";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/78d7a15152f45a193384741fa00d0649c4bba91e/recipes/widgetjs";
@@ -71908,16 +72236,19 @@
license = lib.licenses.free;
};
}) {};
- windata = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+ windata = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
pname = "windata";
- version = "20080412.755";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/windata.el";
- sha256 = "0dcbnqcqw7jzwwdn0rxxlixga1zw1x3a2zbpxvd90xp7zig4f0yz";
+ version = "20090830.340";
+ src = fetchFromGitHub {
+ owner = "emacsorphanage";
+ repo = "windata";
+ rev = "a723fc446ceaec23d5f29ecc8245d94c99d91625";
+ sha256 = "0y8yw5hazsir5kjskrh4mr63mmz87dc7yy5ddmlwpmn03wanqpha";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/8a813e89fc19130d9cdc68f16bba00a0a501427b/recipes/windata";
- sha256 = "0xq51rdanq5as6kfyi97hsqmig5g35w7xv8c96bhzyflranw7jw5";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/84f836338818946a6bb31d35d6ae959571128ed5/recipes/windata";
+ sha256 = "1mah2vy46pxwjd6c6ac14d2qfcixs2yrgwmzmisnfgsvprdlxryb";
name = "windata";
};
packageRequires = [];
@@ -72160,8 +72491,8 @@
version = "20160419.1232";
src = fetchhg {
url = "https://bitbucket.com/ArneBab/wisp";
- rev = "c5c0bb98b281";
- sha256 = "0gxvx2n6xza17qf1p4v0nbcqfkkhrmg9a56c5d126b4vgmg3bf9v";
+ rev = "e85aef10521f";
+ sha256 = "012h652i35vq3ygh62yr82mcvkmflqbxvz701c9px9i4kgyvhzdi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode";
@@ -72765,12 +73096,12 @@
xah-find = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "xah-find";
- version = "20170124.1342";
+ version = "20170407.251";
src = fetchFromGitHub {
owner = "xahlee";
repo = "xah-find";
- rev = "0bd47dc9b570a1526cd3e387280280f20f6a5602";
- sha256 = "1nl8xgkcvnpp4iwcxvvdr3fb6kz5zjxdvkk6ldnybrcypg0xndsg";
+ rev = "a83fd078b9b475edc5fd29e0c7d4f02f203e0390";
+ sha256 = "166f4yjz1s6bbjz4cw2n8hgv98ambhjy9qs7hkq9d7jjpcjgyzwr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1d94ffd9c3380cd56770f253e43d566a95083e37/recipes/xah-find";
@@ -73458,12 +73789,12 @@
yaml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "yaml-mode";
- version = "20170213.1023";
+ version = "20170406.241";
src = fetchFromGitHub {
owner = "yoshiki";
repo = "yaml-mode";
- rev = "1c3ade410fb0bf5b6f2140b099f0ef96836ee74e";
- sha256 = "1p0m702lyjx5xcqvifc8lkrj430nvjiwswpf3ghcvl5sls8bf5af";
+ rev = "64b28913bfe910b147d6ee16488dbaedb1452ca6";
+ sha256 = "0c4c9qa8avqnkd0qp88wdc1jpp674bghma4x0bvbi147g224ybp7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/yaml-mode";
@@ -73686,12 +74017,12 @@
yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "yasnippet";
- version = "20170326.1030";
+ version = "20170409.2044";
src = fetchFromGitHub {
owner = "joaotavora";
repo = "yasnippet";
- rev = "5043a961215158619199cf03a85a0c063a28c644";
- sha256 = "145v9fvfm1yldr7k02d1lk3sgycs2j8zg9d8zmz7g7b9lghkp6fk";
+ rev = "47f37f70f4748e30010b700b5eca39d5cd063616";
+ sha256 = "0rl0hd6cwa5jvzi3aixws90hvin4p7ppylc4jn7v8cnhy2hckzjp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet";
@@ -73789,12 +74120,12 @@
ycmd = callPackage ({ cl-lib ? null, dash, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, request, request-deferred, s }:
melpaBuild {
pname = "ycmd";
- version = "20170329.1433";
+ version = "20170404.2353";
src = fetchFromGitHub {
owner = "abingham";
repo = "emacs-ycmd";
- rev = "8fbdaeaec7704155a047ac17c11d4cf4208f5f79";
- sha256 = "0hvvyficrdxwwg9gyyzmvdsx7v1dh07qrzcvcdn1lq1q1shwcng9";
+ rev = "6b32dc7a832e6c4883dd434530c8d6d69fe36c15";
+ sha256 = "0zx57xhg065hbcisvsryqv2lb34fnzfvzv418nbc6r3yy29yb9ar";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd";
@@ -73862,12 +74193,12 @@
yoshi-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "yoshi-theme";
- version = "20170307.906";
+ version = "20170330.0";
src = fetchFromGitHub {
owner = "ryuslash";
repo = "yoshi-theme";
- rev = "7ab8df0bd646e0571a4d27cbaa4f62b60f625bad";
- sha256 = "0qh8d14vpaj6hbhxv8zmr7sg85wfjqb2gf30b56lnrvkl783v50b";
+ rev = "eab4fb67e8fec47c25c4c1393ac1211f043dbd44";
+ sha256 = "01al6pzl9mz04b43a3lwnhdvr5i71qhafz6frl5m9q2k6x1x2n2f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6e9a549e31c4097ee24b4bff12ec5d20d3beac68/recipes/yoshi-theme";
@@ -74053,8 +74384,8 @@
src = fetchFromGitHub {
owner = "NicolasPetton";
repo = "zerodark-theme";
- rev = "3f93de4fd1ed7e989873b556517e018f1436f8ed";
- sha256 = "0rqg3mmh7jxsasai6i8y8r2hngvhnncn38ihvbbylyx4f71h59hi";
+ rev = "c7e4d3aa3062aa6c89408720e5b68856a39cd401";
+ sha256 = "0yqb9wbq4ava9i02skyvjh6n1gd9lcp7lz1a2skzihc2hmnjw2jg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/72ef967a9bea2e100ae17aad1a88db95820f4f6a/recipes/zerodark-theme";
@@ -74422,11 +74753,11 @@
zpresent = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild, org-parser }:
melpaBuild {
pname = "zpresent";
- version = "20170326.1630";
+ version = "20170409.2251";
src = fetchhg {
url = "https://bitbucket.com/zck/zpresent.el";
- rev = "ef1de4ed0def";
- sha256 = "1fb7n64wj1b6s5vm43i9xharbbfx9r97fzshmjfhik8vsjc7k4c5";
+ rev = "7b93cb98f370";
+ sha256 = "020rp458a3xgxxd2gb091w1xgd78rl10z9f68y81cxi2gnfv91qb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3aae38ad54490fa650c832fb7d22e2c73b0fb060/recipes/zpresent";
diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index 488699f8a793..abb00d1ce33f 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -212,12 +212,12 @@
ac-clang = callPackage ({ auto-complete, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip, yasnippet }:
melpaBuild {
pname = "ac-clang";
- version = "1.8.0";
+ version = "1.9.0";
src = fetchFromGitHub {
owner = "yaruopooner";
repo = "ac-clang";
- rev = "ad75d193bb8962136e1ecac04d33352dd70fb72e";
- sha256 = "0pchbhcs3bjf8r6f24lcf29in011502ncr2gi72faww6iz0pb285";
+ rev = "c4aab21df64011916039e18094e189533018e115";
+ sha256 = "1ac8rw0r4x1plrwy6xwswy5mj5h1r975y8wvx01g2j8an41xhlms";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ffe0485048b85825f5e8ba95917d8c9dc64fe5de/recipes/ac-clang";
@@ -527,12 +527,12 @@
ac-php = callPackage ({ ac-php-core, auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
melpaBuild {
pname = "ac-php";
- version = "1.7.7";
+ version = "1.7.8";
src = fetchFromGitHub {
owner = "xcwen";
repo = "ac-php";
- rev = "dd04c95ed8a0b5787cb4bf536797cb14aff9991b";
- sha256 = "1yg01ba5c7cv9dvmz5sd797wf46a1ylj57dr4k5i0jjz2y1mb8z6";
+ rev = "36e37b21ebcd3d178da4e23a440759bc6b049c7d";
+ sha256 = "1rs7v5n5rb6gdyxxadg2p8zabh0qxvdmyq9356qk6drx8mnsvq8k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php";
@@ -548,12 +548,12 @@
ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }:
melpaBuild {
pname = "ac-php-core";
- version = "1.7.7";
+ version = "1.7.8";
src = fetchFromGitHub {
owner = "xcwen";
repo = "ac-php";
- rev = "dd04c95ed8a0b5787cb4bf536797cb14aff9991b";
- sha256 = "1yg01ba5c7cv9dvmz5sd797wf46a1ylj57dr4k5i0jjz2y1mb8z6";
+ rev = "36e37b21ebcd3d178da4e23a440759bc6b049c7d";
+ sha256 = "1rs7v5n5rb6gdyxxadg2p8zabh0qxvdmyq9356qk6drx8mnsvq8k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core";
@@ -1031,12 +1031,12 @@
alchemist = callPackage ({ company, dash, elixir-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
melpaBuild {
pname = "alchemist";
- version = "1.8.1";
+ version = "1.8.2";
src = fetchFromGitHub {
owner = "tonini";
repo = "alchemist.el";
- rev = "aa54643c6d64d82c2c8d502bb710e7de87699df1";
- sha256 = "0fbhrri816brh3283q3gisnxnginwzarsydsz881zk24kk2raq1k";
+ rev = "34caeed1bd231c7dfa8d2b9aa5c5de2b2a059601";
+ sha256 = "1cci0sq568ghx6x7my96m0iiwvqz2f4dh6k3gn3mmfyvi7bmrpww";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6616dc61d17c5bd89bc4d226baab24a1f8e49b3e/recipes/alchemist";
@@ -1049,6 +1049,27 @@
license = lib.licenses.free;
};
}) {};
+ alda-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "alda-mode";
+ version = "0.1.0";
+ src = fetchFromGitHub {
+ owner = "jgkamat";
+ repo = "alda-mode";
+ rev = "921b1d39ee1122c0f6935598dc17aaa904e74819";
+ sha256 = "01zz3h6q3djqmb3l6s9jld8x1zx2m0x1qskxzywnyfh8hcvbqy6f";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/2612c494a2b6bd43ffbbaef88ce9ee6327779158/recipes/alda-mode";
+ sha256 = "0vpxiw3k0qxp6s19n93qkkyrr44rbw38ygriqdrfpp84pa09wprh";
+ name = "alda-mode";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/alda-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
alect-themes = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "alect-themes";
@@ -1091,22 +1112,22 @@
license = lib.licenses.free;
};
}) {};
- all-the-icons = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild }:
+ all-the-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild }:
melpaBuild {
pname = "all-the-icons";
- version = "2.2.0";
+ version = "2.4.0";
src = fetchFromGitHub {
owner = "domtronn";
repo = "all-the-icons.el";
- rev = "692ac0816783725600b80b5307bf48a83053a378";
- sha256 = "13l5dqyhsma2a15khfs0vzk6c7rywfph4g9kgq10v89m3kwqich8";
+ rev = "4f7c556167e42c02d2f840aec345b8f60b71c477";
+ sha256 = "0vhmw6z6q5a3abxphxxq5yd37hz5x9hs61vgx4wfyk2853701ks0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons";
sha256 = "00ba4gkfvg38l4s0gsb4asvv1hfw9yjl2786imybzy7bkg9f9x3q";
name = "all-the-icons";
};
- packageRequires = [ dash emacs font-lock-plus ];
+ packageRequires = [ emacs font-lock-plus ];
meta = {
homepage = "https://melpa.org/#/all-the-icons";
license = lib.licenses.free;
@@ -1145,12 +1166,12 @@
anaconda-mode = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }:
melpaBuild {
pname = "anaconda-mode";
- version = "0.1.7";
+ version = "0.1.8";
src = fetchFromGitHub {
owner = "proofit404";
repo = "anaconda-mode";
- rev = "1799bdbe410dc7dd91b766dddaa6c73e2d077059";
- sha256 = "1gn835ny57cgaijjhifiafannbbnrj6v3g4kc45id52grkd041qk";
+ rev = "95fdfab07600171daccb0e9e98fb91c11237fd48";
+ sha256 = "0l5h6apjshr6drfak6j66m3rv26hkr2namj85k8isvalmn4dlrj2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode";
@@ -1540,6 +1561,27 @@
license = lib.licenses.free;
};
}) {};
+ apache-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "apache-mode";
+ version = "2.0";
+ src = fetchFromGitHub {
+ owner = "zonuexe";
+ repo = "apache-mode";
+ rev = "7e79a6602da77b5c3a11dab93d46fef26abc860d";
+ sha256 = "0i4kmw0qbnnfbfih7iwfpihv5d6kh1l9k2b062dvc5mx1vvlr8k8";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/b5216c40e60c5a69a6235c15b432b5e9bdda6fd3/recipes/apache-mode";
+ sha256 = "0f8r3xnnidcm9ahj8c3s1vxk6yqk3ra34nrc19r76xyprbb2sjsm";
+ name = "apache-mode";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/apache-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
apib-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }:
melpaBuild {
pname = "apib-mode";
@@ -2449,6 +2491,27 @@
license = lib.licenses.free;
};
}) {};
+ beacon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
+ melpaBuild {
+ pname = "beacon";
+ version = "1.3.3";
+ src = fetchFromGitHub {
+ owner = "Malabarba";
+ repo = "beacon";
+ rev = "f1a3ff5ea8fecf9bf250205de66aedf0bf49c35b";
+ sha256 = "0wr2ffwbi5w23a7hbdmn5ijfy5gmizrmy75zj6m1bz4mbw23ccvn";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/d09cfab21be800831644218e9c8c4433087951c0/recipes/beacon";
+ sha256 = "1pwxvdfzs9qjd44wvgimipi2hg4qw5sh5wlsl8h8mq2kyx09s7hq";
+ name = "beacon";
+ };
+ packageRequires = [ seq ];
+ meta = {
+ homepage = "https://melpa.org/#/beacon";
+ license = lib.licenses.free;
+ };
+ }) {};
beeminder = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "beeminder";
@@ -3502,12 +3565,12 @@
cfengine-code-style = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cfengine-code-style";
- version = "3.10.0";
+ version = "3.10.1";
src = fetchFromGitHub {
owner = "cfengine";
repo = "core";
- rev = "dc823da05d6790e9f95e3cb75618b51d6273e303";
- sha256 = "0xfdlzdcccz80qp3jbzv7wr1kwkh8797j9d3lfkh8apl4wkgvwpq";
+ rev = "99e8b116e779f97e96866891362817c1c5c6534c";
+ sha256 = "1ckk6jvmwrrlfd4ja8n5q99ajasgvbdkzkba9mswhq9dvk6avvn0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style";
@@ -4206,12 +4269,12 @@
cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cmake-mode";
- version = "3.8.0pre3";
+ version = "3.8.0pre4";
src = fetchFromGitHub {
owner = "Kitware";
repo = "CMake";
- rev = "3b7f19a72ff2216b4613fdc8c5edf5d56e74d6fc";
- sha256 = "0da0ywk6bxr78hiy34m7yf0fwvir2v2hvdmspai8n8kcnlcinkyw";
+ rev = "9e32b88784e5e0f14258597fde162fcaf6290fea";
+ sha256 = "1pg5gc7fbj5fjwz5za2162yrnrvrnd5dp6jd2mm9zjkipwwf2z80";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -4836,12 +4899,12 @@
company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "company-php";
- version = "1.7.7";
+ version = "1.7.8";
src = fetchFromGitHub {
owner = "xcwen";
repo = "ac-php";
- rev = "dd04c95ed8a0b5787cb4bf536797cb14aff9991b";
- sha256 = "1yg01ba5c7cv9dvmz5sd797wf46a1ylj57dr4k5i0jjz2y1mb8z6";
+ rev = "36e37b21ebcd3d178da4e23a440759bc6b049c7d";
+ sha256 = "1rs7v5n5rb6gdyxxadg2p8zabh0qxvdmyq9356qk6drx8mnsvq8k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php";
@@ -4857,12 +4920,12 @@
company-quickhelp = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip }:
melpaBuild {
pname = "company-quickhelp";
- version = "2.0.0";
+ version = "2.2.0";
src = fetchFromGitHub {
owner = "expez";
repo = "company-quickhelp";
- rev = "d8fd045715ca64bc8cb3e714c05fe70d7eb33f09";
- sha256 = "1fdiz1jqxnrl940vqbq14idrs4ird9dkzgckmyawzznv5yi29fw4";
+ rev = "a6eaf04e31af9e0d2f47c4c1439fc586f91d0a62";
+ sha256 = "1flb9wzgj0argd10m2l859glpiwzfjyggyrw2zfalkh8c52nywvd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/022cc4fee54bb0194822947c70058145e2980b94/recipes/company-quickhelp";
@@ -4902,6 +4965,27 @@
license = lib.licenses.free;
};
}) {};
+ company-rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "company-rtags";
+ version = "2.9";
+ src = fetchFromGitHub {
+ owner = "Andersbakken";
+ repo = "rtags";
+ rev = "ffa21b5408a30a346815bc4db6e74e2c6562d936";
+ sha256 = "0828i5lcbspacydjnbrp3zhgbw2gggaaizzm0qqgmvry4cs79bxv";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags";
+ sha256 = "0dicxbp3xn02pflrpfndj7hs494prvz64llsk1xpc2z23kfarp6f";
+ name = "company-rtags";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/company-rtags";
+ license = lib.licenses.free;
+ };
+ }) {};
company-sourcekit = callPackage ({ company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sourcekit }:
melpaBuild {
pname = "company-sourcekit";
@@ -5241,12 +5325,12 @@
counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
melpaBuild {
pname = "counsel";
- version = "0.8.0";
+ version = "0.9.1";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "swiper";
- rev = "c24a3728538dd7d11de9f141b3ad1d8e0996c330";
- sha256 = "19vfj01x7b8f7wyx7m51z00la2r7jcwzv0n06srkvcls0wm5s1h3";
+ rev = "f4b433436668ac09f3d1815fbfb4b71f3e0690fa";
+ sha256 = "10jffa503a6jid34smh0njnhlv27r9vyhwlpf00f13c5i8nh2xjf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel";
@@ -6079,12 +6163,12 @@
demangle-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "demangle-mode";
- version = "1.2";
+ version = "1.2.1";
src = fetchFromGitHub {
owner = "liblit";
repo = "demangle-mode";
- rev = "b40d7174d5d31ea8bf3442fb054f3c15bf6e979c";
- sha256 = "00aqhzamp1492kn0x1j2h15wywbkwx9m0alm5z82z60wrq7gy9z7";
+ rev = "0f9436f98225e0f5a5deecea4680c173e76f0322";
+ sha256 = "0n10c45lvdfczhd2mpkciggv4d83mcnbpmjhxzvmnf7n5ar6aw6a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6ced9f4ffb051a8474d3f72695156416cf2dd8be/recipes/demangle-mode";
@@ -7282,12 +7366,12 @@
easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "easy-hugo";
- version = "0.4.1";
+ version = "0.5.5";
src = fetchFromGitHub {
owner = "masasam";
repo = "emacs-easy-hugo";
- rev = "8e8dde2ce96c9bf561bffa1ee0886cf9b87db370";
- sha256 = "13jf3rps8s54pyxnmxdrxmza5jnyhzcixmqqw4vp4br3kay7lbrz";
+ rev = "65fe2afeb240ff16b6fa0e580e3b03342b388e28";
+ sha256 = "0sv4m44zbil54mppqybq5978f3dnn0smjpkl3qw7d4sfh4dwf779";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/544fa512dc3e6379f451fd9b596d74a5849c87d2/recipes/easy-hugo";
@@ -7513,12 +7597,12 @@
ede-php-autoload = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ede-php-autoload";
- version = "1.0.0";
+ version = "1.1.0";
src = fetchFromGitHub {
owner = "stevenremot";
repo = "ede-php-autoload";
- rev = "2a8988d845d5acf9d49d8177a68c3c8863916d25";
- sha256 = "19i746dyshcm2bih82n1m39sf18zx8gi1xaxc9q3pxm4hvn4s8mm";
+ rev = "28a989232c276ee7fc5112c9050b1c29f628be9f";
+ sha256 = "0kc51bb5jxrsra9ycg43n35dd8kngby321qbcixaj68cksf0whrm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8ee9f7fd9cbc3397cd9af34b08b75c3d9d8bc551/recipes/ede-php-autoload";
@@ -7784,12 +7868,12 @@
ein = callPackage ({ cl-generic, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }:
melpaBuild {
pname = "ein";
- version = "0.12.1";
+ version = "0.12.2";
src = fetchFromGitHub {
owner = "millejoh";
repo = "emacs-ipython-notebook";
- rev = "b52ccbd46dee2a1ece1dd6bd9be1224c323262ca";
- sha256 = "1qdznl8z0s2hy3hhls9ccr516wai11qh663630hc0zwv4gwlwp64";
+ rev = "0ede9e7ef64017039748b8f47de4df834b0443ed";
+ sha256 = "03fm7lhfzrhn4dddlhqx6v1dqfgz6rj352y0znnfdaskzychw1sa";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein";
@@ -8057,12 +8141,12 @@
elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "elfeed";
- version = "2.1.0";
+ version = "2.1.1";
src = fetchFromGitHub {
owner = "skeeto";
repo = "elfeed";
- rev = "ac258aa1956a5ce29c1a50d7ce8b1da55cd23192";
- sha256 = "04y0l4rjsn21a5li43ixw4y9v9cxh26q1ix4zsy41l8wjzbn1hlz";
+ rev = "67c4f07f5b0f942f030848f5d657909a1424b597";
+ sha256 = "1dc7csmj8w2k5056dz4lm86qhzgwpmr08s2hj216cpgg7cjxnwc0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed";
@@ -8078,12 +8162,12 @@
elfeed-web = callPackage ({ elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, simple-httpd }:
melpaBuild {
pname = "elfeed-web";
- version = "2.1.0";
+ version = "2.1.1";
src = fetchFromGitHub {
owner = "skeeto";
repo = "elfeed";
- rev = "ac258aa1956a5ce29c1a50d7ce8b1da55cd23192";
- sha256 = "04y0l4rjsn21a5li43ixw4y9v9cxh26q1ix4zsy41l8wjzbn1hlz";
+ rev = "67c4f07f5b0f942f030848f5d657909a1424b597";
+ sha256 = "1dc7csmj8w2k5056dz4lm86qhzgwpmr08s2hj216cpgg7cjxnwc0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web";
@@ -8674,13 +8758,13 @@
pname = "emms";
version = "4.1";
src = fetchgit {
- url = "git://git.sv.gnu.org/emms.git";
+ url = "https://git.savannah.gnu.org/git/emms.git";
rev = "c1e1a843c3389fc585908de367ff00fdd6470965";
sha256 = "0q8grh20mzz8yashvzwx8s8hr761xmi6s81mjw8cjqzajm4ky8q3";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/205eeed002b0848809a4c5f8ad99d925b48799ec/recipes/emms";
- sha256 = "0kzli8b0z5maizfwhlhph1f5w3v6pwxvs2dfs90l8c0h97m4yy2m";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/emms";
+ sha256 = "1xpry8h96gvjnc0v8x0vk5dnmlq1r7m3ljpampdwv9pfwl95fh94";
name = "emms";
};
packageRequires = [];
@@ -8954,12 +9038,12 @@
ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }:
melpaBuild {
pname = "ensime";
- version = "1.0.0";
+ version = "1.0.1";
src = fetchFromGitHub {
owner = "ensime";
repo = "ensime-emacs";
- rev = "2621509bc9811c103d7efc999d4722e9d4c788e9";
- sha256 = "1bq634bimd5ng2jc5d0aglsrdi08jihm0qx2za4vfdqvnn82gxiv";
+ rev = "2b4d4cd764b9fa4757738a6dae87f4d1e99686d6";
+ sha256 = "0j7zd3qxh4m5gv5s8pvfacad2mkzwwz1xdrvg1sa035xaxahqsyx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime";
@@ -9255,12 +9339,12 @@
erlang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "erlang";
- version = "19.3";
+ version = "19.3.1";
src = fetchFromGitHub {
owner = "erlang";
repo = "otp";
- rev = "a748cafdc7063d9f181ba12088db6458793ced2f";
- sha256 = "0pp2hl8jf4iafpnsmf0q7jbm313daqzif6ajqcmjyl87m5pssr86";
+ rev = "d25ad84195ca42969fbfb017a52aab8c8effc246";
+ sha256 = "06jxpypw8i13gjiq006p0ahy0mlkxhmpq8fhn4pp7hi2n4ycnfj1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -9863,12 +9947,12 @@
evil-commentary = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-commentary";
- version = "2.0.0";
+ version = "2.1.0";
src = fetchFromGitHub {
owner = "linktohack";
repo = "evil-commentary";
- rev = "6d9079894da0bdda8a317c03c90481b8754635c7";
- sha256 = "183fdg7rmnnbps0knnj2kmhf1hxk0q91wbqx1flhciq6wq4rilni";
+ rev = "8cd9ea799e981b3b5ed3dcdf45d5464096e4abd2";
+ sha256 = "1bq8f00dczhlqsp6s7k7cjb9mfpdznykwqm3jn7nj5fn5gdiramx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fe5b05152c919d49ddd920b1bd5ffc351141fa0d/recipes/evil-commentary";
@@ -11651,22 +11735,43 @@
license = lib.licenses.free;
};
}) {};
- flycheck-status-emoji = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }:
+ flycheck-rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "flycheck-rtags";
+ version = "2.9";
+ src = fetchFromGitHub {
+ owner = "Andersbakken";
+ repo = "rtags";
+ rev = "ffa21b5408a30a346815bc4db6e74e2c6562d936";
+ sha256 = "0828i5lcbspacydjnbrp3zhgbw2gggaaizzm0qqgmvry4cs79bxv";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags";
+ sha256 = "00v6shfs7piqapmyqyi0fk3182rcfa3p8wr2cm5vqlrana13kbw4";
+ name = "flycheck-rtags";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/flycheck-rtags";
+ license = lib.licenses.free;
+ };
+ }) {};
+ flycheck-status-emoji = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-status-emoji";
- version = "1.2.1";
+ version = "1.2.2";
src = fetchFromGitHub {
owner = "liblit";
repo = "flycheck-status-emoji";
- rev = "1c67e62562a5c30b3a184ef5090bbe50bab4d681";
- sha256 = "1xxvri9ax5cjrkxhjqhs7zqbch9cx8kvrn7sg611frl68qawkjsm";
+ rev = "2f323cb210a280fc05061f3fc689c627b40bfcb3";
+ sha256 = "0gz18jp5bcwm86w6ir8vyf8rb3l2h524zfvx0jpfk0k1mmxj9cs7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5abd6aaa8d2bf55ae75cd217820763531f91958b/recipes/flycheck-status-emoji";
sha256 = "0p42424b1fsmfcjyl252vhblppmpjwd6br2yqh10fi60wmprvn2p";
name = "flycheck-status-emoji";
};
- packageRequires = [ emacs flycheck let-alist ];
+ packageRequires = [ cl-lib emacs flycheck let-alist ];
meta = {
homepage = "https://melpa.org/#/flycheck-status-emoji";
license = lib.licenses.free;
@@ -11696,12 +11801,12 @@
flycheck-swift3 = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-swift3";
- version = "1.0.8";
+ version = "1.1.0";
src = fetchFromGitHub {
owner = "GyazSquare";
repo = "flycheck-swift3";
- rev = "ae7b29111cb160774c317997902d7ef29cedd7d9";
- sha256 = "17s34rqxkirb88y8jzl3ybs7j3ylp9ckdfx3sqwfn0cyspnj5f1d";
+ rev = "6b0b7c6fffc86809d0535afebd6b0972059992d5";
+ sha256 = "0d411idv9ib1jhmdbjb8ycc8clmm1ygpwapaka3d50gkgrmfin4q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f1fb8c731c118327dc0bbb726e046fec46bcfb82/recipes/flycheck-swift3";
@@ -13319,12 +13424,12 @@
git-lens = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "git-lens";
- version = "0.4.1";
+ version = "0.4.2";
src = fetchFromGitHub {
owner = "pidu";
repo = "git-lens";
- rev = "be62df785ae14fa8652fe2cdd342d3256f8c0933";
- sha256 = "02p73q0kl9z44b9a2bhqg03mkqx6gf61n88qlwwg4420dxrf7sbc";
+ rev = "2d1d94fd2e8a17025224ae2224c5f44d8482dc64";
+ sha256 = "1d0vk8344n4lcdcqxkv44qc7f3753mpy76hmgf8xi60kyajvjrd7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/66fd7c0642e8e61b883d2030f88892d039380475/recipes/git-lens";
@@ -13925,6 +14030,27 @@
license = lib.licenses.free;
};
}) {};
+ go-guru = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
+ melpaBuild {
+ pname = "go-guru";
+ version = "1.5.0";
+ src = fetchFromGitHub {
+ owner = "dominikh";
+ repo = "go-mode.el";
+ rev = "35f6826e435c3004dabf134d0f2ae2f31ea7b6a2";
+ sha256 = "1nd2h50yb0493wvf1h7fzplq45rmqn2w7kxpgnlxzhkvq99v8vzf";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-guru";
+ sha256 = "01f0gz65z8d0iv8k49xl2sp6q4qnsvwhd4g8fb2irp7iclb0xmvk";
+ name = "go-guru";
+ };
+ packageRequires = [ cl-lib go-mode ];
+ meta = {
+ homepage = "https://melpa.org/#/go-guru";
+ license = lib.licenses.free;
+ };
+ }) {};
go-impl = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
melpaBuild {
pname = "go-impl";
@@ -13949,12 +14075,12 @@
go-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "go-mode";
- version = "1.4.0";
+ version = "1.5.0";
src = fetchFromGitHub {
owner = "dominikh";
repo = "go-mode.el";
- rev = "9d94107fae1b1137fb46f8cd7efc7e28f3abf2cb";
- sha256 = "0g0vjm125wmw5nd38r3d7gc2h4pg3a9yskcbk1mzg9vf6gbhr0hx";
+ rev = "35f6826e435c3004dabf134d0f2ae2f31ea7b6a2";
+ sha256 = "1nd2h50yb0493wvf1h7fzplq45rmqn2w7kxpgnlxzhkvq99v8vzf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-mode";
@@ -13988,6 +14114,27 @@
license = lib.licenses.free;
};
}) {};
+ go-rename = callPackage ({ fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
+ melpaBuild {
+ pname = "go-rename";
+ version = "1.5.0";
+ src = fetchFromGitHub {
+ owner = "dominikh";
+ repo = "go-mode.el";
+ rev = "35f6826e435c3004dabf134d0f2ae2f31ea7b6a2";
+ sha256 = "1nd2h50yb0493wvf1h7fzplq45rmqn2w7kxpgnlxzhkvq99v8vzf";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/d806abe90da9a8951fdb0c31e2167bde13183c5c/recipes/go-rename";
+ sha256 = "1cd2nfgwnqzylbry11ahahdip8w66w5hnrndrs65ip10s08w2xki";
+ name = "go-rename";
+ };
+ packageRequires = [ go-mode ];
+ meta = {
+ homepage = "https://melpa.org/#/go-rename";
+ license = lib.licenses.free;
+ };
+ }) {};
go-scratch = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
melpaBuild {
pname = "go-scratch";
@@ -14201,12 +14348,12 @@
govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }:
melpaBuild {
pname = "govc";
- version = "0.13.0";
+ version = "0.14.0";
src = fetchFromGitHub {
owner = "vmware";
repo = "govmomi";
- rev = "b4a3f7a1d0352866c03f42208cddceb53fe12d16";
- sha256 = "1f5bpjzj92ac4jvpbahydf2k894man4v2riv8k7j7fwlaknlvcvj";
+ rev = "9bfdc5ce62c0585b48b154cc460f8664dcd124c3";
+ sha256 = "0p00s08fjwh106dag9wyhikzrh0vqd4pzb852b2zrmb7zlhigx65";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc";
@@ -15133,12 +15280,12 @@
helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
melpaBuild {
pname = "helm";
- version = "2.5.4";
+ version = "2.6.0";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm";
- rev = "7a969880e7ea607517dbaa9d98da036fd9fec2fd";
- sha256 = "0y9jg4xidb0f496fi30p1xjr73kg220qsjrzcr1i6p96qxr0qpfd";
+ rev = "e86cbf2b23eede65eb453a9a03b0e0823f02fcf2";
+ sha256 = "06bw73rfjslk5qb5k7hrwsj1jm47b2cnpzjmgwjckdv9f7dql11w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -15448,12 +15595,12 @@
helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "helm-core";
- version = "2.5.4";
+ version = "2.6.0";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm";
- rev = "7a969880e7ea607517dbaa9d98da036fd9fec2fd";
- sha256 = "0y9jg4xidb0f496fi30p1xjr73kg220qsjrzcr1i6p96qxr0qpfd";
+ rev = "e86cbf2b23eede65eb453a9a03b0e0823f02fcf2";
+ sha256 = "06bw73rfjslk5qb5k7hrwsj1jm47b2cnpzjmgwjckdv9f7dql11w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -16642,6 +16789,27 @@
license = lib.licenses.free;
};
}) {};
+ hide-lines = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "hide-lines";
+ version = "20130623.1701";
+ src = fetchFromGitHub {
+ owner = "emacsorphanage";
+ repo = "hide-lines";
+ rev = "4bfb4c6f4769bd6c637e4c18bbf65506832fc9f0";
+ sha256 = "01cy7v9ql70bsvjz3idq23jpyb8jb61bs9ff8vf5y3fj45pc32ps";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/hide-lines";
+ sha256 = "18h5ygi6idpb5wjlmjjvjmwcw7xiljkfxdvq7pm8wnw75p705x4d";
+ name = "hide-lines";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/hide-lines";
+ license = lib.licenses.free;
+ };
+ }) {};
highlight-blocks = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "highlight-blocks";
@@ -18031,12 +18199,12 @@
inherit-local = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "inherit-local";
- version = "1.1";
+ version = "1.1.1";
src = fetchFromGitHub {
owner = "shlevy";
repo = "inherit-local";
- rev = "e687c702adb27ce5f69fb28a47fe21a86cf84063";
- sha256 = "11z3b1xwg6r769w3scd29lqg62fx8mp81g8dbx4klmj3clvyn69i";
+ rev = "b1f4ff9c41f9d64e4adaf5adcc280b82f084cdc7";
+ sha256 = "1fargashyqn4ga420k3ikc1akf7mw3zcarpg24gh2591p4swa0ih";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/inherit-local";
@@ -18345,12 +18513,12 @@
ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ivy";
- version = "0.8.0";
+ version = "0.9.1";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "swiper";
- rev = "c24a3728538dd7d11de9f141b3ad1d8e0996c330";
- sha256 = "19vfj01x7b8f7wyx7m51z00la2r7jcwzv0n06srkvcls0wm5s1h3";
+ rev = "f4b433436668ac09f3d1815fbfb4b71f3e0690fa";
+ sha256 = "10jffa503a6jid34smh0njnhlv27r9vyhwlpf00f13c5i8nh2xjf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy";
@@ -18387,12 +18555,12 @@
ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "ivy-erlang-complete";
- version = "0.1.5";
+ version = "0.2.0";
src = fetchFromGitHub {
owner = "s-kostyaev";
repo = "ivy-erlang-complete";
- rev = "ead155b5474b0d5b21d78ae735aea74df1e4c3af";
- sha256 = "1lwb8hwbvalwdj1gybc4aw3w5li81mhxagkpxa0dlwxs08lq7v2y";
+ rev = "712f204d242663ca8cdbb2b2d6732b5cf0c411b4";
+ sha256 = "1mcl5j3brjsrqsafqpag8b4y8iyp2c8cbaffmv5vfw3b18hss3wf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete";
@@ -18426,22 +18594,22 @@
license = lib.licenses.free;
};
}) {};
- ivy-hydra = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ ivy-hydra = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, ivy, lib, melpaBuild }:
melpaBuild {
pname = "ivy-hydra";
- version = "0.8.0";
+ version = "0.9.1";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "swiper";
- rev = "c24a3728538dd7d11de9f141b3ad1d8e0996c330";
- sha256 = "19vfj01x7b8f7wyx7m51z00la2r7jcwzv0n06srkvcls0wm5s1h3";
+ rev = "f4b433436668ac09f3d1815fbfb4b71f3e0690fa";
+ sha256 = "10jffa503a6jid34smh0njnhlv27r9vyhwlpf00f13c5i8nh2xjf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra";
sha256 = "1xv8nfi6dzhx868h44ydq4f5jmsa7rbqfa7jk8g0z0ifv477hrvx";
name = "ivy-hydra";
};
- packageRequires = [];
+ packageRequires = [ emacs hydra ivy ];
meta = {
homepage = "https://melpa.org/#/ivy-hydra";
license = lib.licenses.free;
@@ -18577,13 +18745,13 @@
pname = "jabber";
version = "0.8.92";
src = fetchgit {
- url = "git://git.code.sf.net/p/emacs-jabber/git";
+ url = "https://git.code.sf.net/p/emacs-jabber/git";
rev = "2999f58619dd9c20cc6cac8060c4c850a504cbbd";
sha256 = "03x93wkd8syj2ybf5ymwcm6khx0h5nhrl8pyync1520294pq6i1i";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/cff77a688d51ff2e2f03389593465990089ce83d/recipes/jabber";
- sha256 = "1g5pc80n3cd5pzs3hmpbnmxbldwakd72pdn3vvb0h26j9v073pa8";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/jabber";
+ sha256 = "0saajvfpzgcsqa7h7aa6l0bns6swr40c46md6s0d90x9lrvwp7ws";
name = "jabber";
};
packageRequires = [];
@@ -19243,6 +19411,27 @@
license = lib.licenses.free;
};
}) {};
+ key-chord = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "key-chord";
+ version = "0.6";
+ src = fetchFromGitHub {
+ owner = "emacsorphanage";
+ repo = "key-chord";
+ rev = "8468998946367157830df19a1e92785d22a34178";
+ sha256 = "10ldhwp9a21r9g72hzaig1h5yh2zblny0r36nf5nz6gzikfcq0cd";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/key-chord";
+ sha256 = "1g0jqmnn575h5n4figxbc5xs76zl8b1cdqa6wbi3d1p2rn3g8scr";
+ name = "key-chord";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/key-chord";
+ license = lib.licenses.free;
+ };
+ }) {};
key-combo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "key-combo";
@@ -19558,6 +19747,27 @@
license = lib.licenses.free;
};
}) {};
+ kubernetes = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
+ melpaBuild {
+ pname = "kubernetes";
+ version = "0.2.3";
+ src = fetchFromGitHub {
+ owner = "chrisbarrett";
+ repo = "kubernetes-el";
+ rev = "795ba140104aef6f905aab61bc843596958d97db";
+ sha256 = "0l847g5pm8r7y2p0nrryhfdmrqj6h8qp9fmk6bm0xx0xnxpx01xg";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/bb95e7cd186d02c45d14319858044468a14d9f72/recipes/kubernetes";
+ sha256 = "0608wkdnbnrq2mhvnq0m2bk50bm3kzr528rvia4hlda1hwbfz867";
+ name = "kubernetes";
+ };
+ packageRequires = [ dash emacs magit ];
+ meta = {
+ homepage = "https://melpa.org/#/kubernetes";
+ license = lib.licenses.free;
+ };
+ }) {};
kurecolor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "kurecolor";
@@ -20240,12 +20450,12 @@
logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "logview";
- version = "0.7.1";
+ version = "0.8";
src = fetchFromGitHub {
owner = "doublep";
repo = "logview";
- rev = "6409991053350ab2d3def61749b92780dd1ed095";
- sha256 = "0phhkg3qgh4q4b7as0a00zx7kcrlmh24by1sjbp7b4dsd0mnz22k";
+ rev = "b5cafd1145f22e7beff8ef8ed742bf10af1e6e1c";
+ sha256 = "08is4fg94a6am7c2j0d5qd1nkrnik5vpzg3pqkimyxgy5czj764b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview";
@@ -20321,22 +20531,22 @@
license = lib.licenses.free;
};
}) {};
- m-buffer = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ m-buffer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
melpaBuild {
pname = "m-buffer";
- version = "0.14";
+ version = "0.15";
src = fetchFromGitHub {
owner = "phillord";
repo = "m-buffer-el";
- rev = "61d1ed99e528840d2eee2ce07946a9d76eb6d814";
- sha256 = "048ls0ca9yppjj0mx6g00f1vwh4ryvv6bckihxs7ynbr2jcydjr7";
+ rev = "6eb1d2535a82707a83733173bc400a0d8e520c80";
+ sha256 = "1sx76i59razwccvn6x7rx5a124bfyjw9fcbxf4gj7nsg33qiq809";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c34d02682e87c9978a3583bd903dcac5da5b41d5/recipes/m-buffer";
sha256 = "17smq7wlidsls870hla5b94xq2pwk24b88jvrbbcqw6f5z3ypf94";
name = "m-buffer";
};
- packageRequires = [ dash emacs ];
+ packageRequires = [ seq ];
meta = {
homepage = "https://melpa.org/#/m-buffer";
license = lib.licenses.free;
@@ -20436,12 +20646,12 @@
magit-annex = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
melpaBuild {
pname = "magit-annex";
- version = "1.3.0";
+ version = "1.3.1";
src = fetchFromGitHub {
owner = "magit";
repo = "magit-annex";
- rev = "74e0343b4152ad5c0d4f77f9f15dd6f1b02de432";
- sha256 = "08mpnj9c43p528iy3hj8yljhzpkpjxkjiaiiss5n2jgyyc64hw9z";
+ rev = "ae6250aead8f283eac8d6951a249cfc7d85e0b40";
+ sha256 = "0n6dhc92z5w67rcfngjzprzbdn42ja263gdqa7fncqq9p66slccq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-annex";
@@ -21157,12 +21367,12 @@
meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
melpaBuild {
pname = "meghanada";
- version = "0.7.2";
+ version = "0.7.3";
src = fetchFromGitHub {
owner = "mopemope";
repo = "meghanada-emacs";
- rev = "1ddaca25ee978736dcb3922bb1952d750c39cd5a";
- sha256 = "09g81d1l5mhji4vbljxgfrgr0051sv7kqy0vwf7awxa4slgl6bnd";
+ rev = "b38e0a0333e92f8a14840534a8b8ff8fd715330b";
+ sha256 = "0ysjcvbnbc28c8vs7cc18vr4sqffcc4y4p3xzr8d5giccgy9192v";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
@@ -22098,6 +22308,27 @@
license = lib.licenses.free;
};
}) {};
+ multi-term = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "multi-term";
+ version = "1.2";
+ src = fetchFromGitHub {
+ owner = "emacsorphanage";
+ repo = "multi-term";
+ rev = "c9e67edb772f2d9f9da8d887dc746459cfbce244";
+ sha256 = "1bn6zx931vz2fa72ab999r33bxv8brn3cqmalvq25x7s4z3q1lyi";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/multi-term";
+ sha256 = "16idk4nd7qpyrvyspbrdl8gdfaclng6ny0xigk6fqdv352djalal";
+ name = "multi-term";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/multi-term";
+ license = lib.licenses.free;
+ };
+ }) {};
multi-web-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "multi-web-mode";
@@ -22376,14 +22607,14 @@
pname = "navi-mode";
version = "2.0";
src = fetchFromGitHub {
- owner = "tj64";
+ owner = "alphapapa";
repo = "navi";
rev = "5c979b3b3873b0e67751a1321a9e271d066f2022";
sha256 = "15jh1lsgqfnpbmrikm8kdh5bj60yb96f2as2anppjjsgl6w96glh";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/4a06141b0ee1e10bc3f16fcca35d971dc7e9d07e/recipes/navi-mode";
- sha256 = "0f5db983w9kxq8mcjr22zfrm7cpxydml4viac62lvab2kwbpbrmi";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/8edf78a0ecd2ff8e6e066b80751a31e11a068c3f/recipes/navi-mode";
+ sha256 = "0pc52iq8lng2g0vpnrhdfxmibc1dx9ksmrjg0303as1yv41fnc69";
name = "navi-mode";
};
packageRequires = [];
@@ -22626,12 +22857,12 @@
no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "no-littering";
- version = "0.5.5";
+ version = "0.5.6";
src = fetchFromGitHub {
owner = "tarsius";
repo = "no-littering";
- rev = "63bf66630f48403f536f96f8a0d5b5fab46eac9b";
- sha256 = "0qi706xafi05rqpdz87sayqb728f5qisln2i3yicymr0wy93x76i";
+ rev = "0227c5eea5b9f3fb056a7ef6052ef6f076371bde";
+ sha256 = "0hjb2paylmcc68998cqgfdnw79z43ha5bv1cg91ysbdjcx2lp1x7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering";
@@ -22728,11 +22959,11 @@
}) {};
notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
pname = "notmuch";
- version = "0.24";
+ version = "0.24.1";
src = fetchgit {
url = "git://git.notmuchmail.org/git/notmuch";
- rev = "e60b44ecf8bd5934959727496c7ef3016ff80cf6";
- sha256 = "1q81ibvhjvnz4hbwmdna3a1xjkik21avy5im89fnkhq068kwac2j";
+ rev = "e64fdf889d0f78543557f5b72ebca1571caf497e";
+ sha256 = "0vappcyidhzka2za6zqlcygn90a1xm9xrhpr9gvdp258m8qhz6d1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
@@ -23291,15 +23522,15 @@
license = lib.licenses.free;
};
}) {};
- omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, fetchFromGitHub, fetchurl, flycheck, json ? null, lib, melpaBuild, popup, s }:
+ omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, fetchFromGitHub, fetchurl, flycheck, json ? null, lib, melpaBuild, popup, s, shut-up }:
melpaBuild {
pname = "omnisharp";
version = "3.9";
src = fetchFromGitHub {
owner = "OmniSharp";
repo = "omnisharp-emacs";
- rev = "bcc5d7ba940c1118ab61071783747162f0c927cf";
- sha256 = "05i3z6whvgq81qnrwgvfglhwi214145ksg8h81rc0g4ir54wzsik";
+ rev = "93c188938305533ea34ceca51dd53c7841598ada";
+ sha256 = "0ynjxf0r9i5yb98pnhrcm55shhv4gqfr0wigfkz83yqzpsjzq6fn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/68bdb7e0100e120b95e9416398127d83530a221d/recipes/omnisharp";
@@ -23315,6 +23546,7 @@
json
popup
s
+ shut-up
];
meta = {
homepage = "https://melpa.org/#/omnisharp";
@@ -23555,12 +23787,12 @@
org-board = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-board";
- version = "1011";
+ version = "1018";
src = fetchFromGitHub {
owner = "scallywag";
repo = "org-board";
- rev = "53469a2f0577924de1c7d887fecea409d17fd588";
- sha256 = "0fg7lkgcr7zwwjald7hbvwgl72m21lqxmz7p8sq31iw3jh42fqgf";
+ rev = "405bfd630f1b31bd77158bc8e79aab86812cba65";
+ sha256 = "066shdqp0bca2xlds1m0c5ml3yxqfyzsyyy7sy72ybv41n5b11x3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d8063ee17586d9b1e7415f7b924239826b81ab08/recipes/org-board";
@@ -24657,14 +24889,14 @@
pname = "outorg";
version = "2.0";
src = fetchFromGitHub {
- owner = "tj64";
+ owner = "alphapapa";
repo = "outorg";
rev = "e946cda497bae53fca6fa1579910237e216170bf";
sha256 = "1v9kx5xr7xcr6i664h2g6j8824yjsjdn5pvgmawvxrrplbjmiqnp";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/d57762fe51a524731e228c80b4b2d25e827e5858/recipes/outorg";
- sha256 = "04swss84p33a9baa4swqc1a9lfp6wziqrwa7vcyi3y0yzllx36cx";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/8edf78a0ecd2ff8e6e066b80751a31e11a068c3f/recipes/outorg";
+ sha256 = "10jh64d1nalfig69nnsib46915jinv37lvmxa0aj91zymq2szdm9";
name = "outorg";
};
packageRequires = [];
@@ -24678,14 +24910,14 @@
pname = "outshine";
version = "2.0";
src = fetchFromGitHub {
- owner = "tj64";
+ owner = "alphapapa";
repo = "outshine";
rev = "cf1097692b3ea0367d3c821769399fec5831e200";
sha256 = "1v04iyx57w8scw3iqrivii7q0sh8sa7xacswdhd18mw9kvjrbj98";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/6dc02a576abb8e115f674a9d896f8bc932b7571b/recipes/outshine";
- sha256 = "1ajddzcrnvfgx3xa5wm0bcll9dax52syg1p521mv0ffkld63jyfl";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/8edf78a0ecd2ff8e6e066b80751a31e11a068c3f/recipes/outshine";
+ sha256 = "1qqmvs17hq5s047nqplg4sa09xg5ck6zwqyg91xmbh71bx80v28v";
name = "outshine";
};
packageRequires = [];
@@ -24760,12 +24992,12 @@
ox-epub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "ox-epub";
- version = "0.1.6";
+ version = "0.2";
src = fetchFromGitHub {
owner = "ofosos";
repo = "ox-epub";
- rev = "edc253b6f7397ac89a3a0b2d2a05e650baa483f8";
- sha256 = "0kvs5kpkly45fqdb7mka1w2yn7pks95gxgiy2ayx12cgvn3inyw6";
+ rev = "4cff438a06dce6e6e6a83e3900e90588f9f05b74";
+ sha256 = "0i3jbvw34aklfxq8q887l83yl5n13bdqhvjz4ih4yqnzwgcsd74r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c3ac31dfef00e83fa6b716ea006f35afb5dc6cd5/recipes/ox-epub";
@@ -25139,13 +25371,13 @@
pname = "paredit";
version = "24";
src = fetchgit {
- url = "http://mumble.net/~campbell/git/paredit.git";
+ url = "https://mumble.net/~campbell/git/paredit.git";
rev = "82bb75ceb2ddc272d6618d94874b7fc13181a409";
sha256 = "13wzz5fahbz5svc4ql3ajzzpd1fv0ynwpa5widklbcp5yqncv1vm";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/2d83b5d24db3527e48e3de40c320255bc2dbfccb/recipes/paredit";
- sha256 = "1rp859y4qyqdfvp261l8mmbd62p1pw0dypm1mng6838b6q6ycakr";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/paredit";
+ sha256 = "01qh8kfb5hyfi0jfl1kq3inkyzr0rf3wncmzgxlkfdc8zlq4v653";
name = "paredit";
};
packageRequires = [];
@@ -26227,13 +26459,13 @@
pname = "po-mode";
version = "0.19.8.1";
src = fetchgit {
- url = "git://git.savannah.gnu.org/gettext.git";
+ url = "https://git.savannah.gnu.org/git/gettext.git";
rev = "c737bf843616ca984c9416048a2da845e9ad3f50";
sha256 = "0hlvnq3cigpb8f4yxy2llcmmn0b38prlb1awwy6zl5fwwi9ksrwk";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/9317ccb52cdbaa2b273f8b2e8a598c9895b1cde1/recipes/po-mode";
- sha256 = "1hb9vrr2x6mh0yzckmx9fk6535d6r189974n4bizpr1xdikn7dgp";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/po-mode";
+ sha256 = "0km19n87iqd6m6n23h46b6225zyvava9jbx6b8frna3sjwb4ls7w";
name = "po-mode";
};
packageRequires = [];
@@ -26853,12 +27085,12 @@
protobuf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "protobuf-mode";
- version = "3.2.0";
+ version = "3.2.1";
src = fetchFromGitHub {
owner = "google";
repo = "protobuf";
- rev = "593e917c176b5bc5aafa57bf9f6030d749d91cd5";
- sha256 = "120g0bg7ichry74allgmqnh7k0z2sdnrrfklb58b7szzn4zcdz14";
+ rev = "b50c9ec1223895973d0e2fa6b6cb74ec3c8f3ce8";
+ sha256 = "17drjxry365als0drs56gzdpdjhkhjwg9jwvrhmq5dp9ly0rb2f4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -28278,22 +28510,22 @@
license = lib.licenses.free;
};
}) {};
- rg = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+ rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }:
melpaBuild {
pname = "rg";
- version = "1.1.1";
+ version = "1.2.0";
src = fetchFromGitHub {
owner = "dajva";
repo = "rg.el";
- rev = "fd0f056a5912caeeb2d4f668969d9df81c9e22db";
- sha256 = "1lig93lj5mnm2fjvwac42kfw8bhq8ggs4jfc73fmclm6s5dg8661";
+ rev = "32fc22b192cbad03fca3835f29c36ab4a90e50a0";
+ sha256 = "168p4h7h9ik1f56cw0zr8brbn53d5jglv9r7i9zqh80zzhljw4xv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg";
sha256 = "0i78qvqdznh1z3b0mnzihv07j8b9r86dc1lsa1qlzacv6a2i9sbm";
name = "rg";
};
- packageRequires = [ cl-lib s ];
+ packageRequires = [ cl-lib emacs s seq ];
meta = {
homepage = "https://melpa.org/#/rg";
license = lib.licenses.free;
@@ -28541,8 +28773,8 @@
sha256 = "0828i5lcbspacydjnbrp3zhgbw2gggaaizzm0qqgmvry4cs79bxv";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/ac3b84fe84a7f57d09f1a303d8947ef19aaf02fb/recipes/rtags";
- sha256 = "08clwydx2b9cl4wv61b0p564jpvq7gzkrlcdkchpi4yz6djbp0lw";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags";
+ sha256 = "0s5m4zjvnc1k4gkkizbs4ysvzzbfh45717pksg9bnyzwx5lcw5yd";
name = "rtags";
};
packageRequires = [];
@@ -29158,6 +29390,27 @@
license = lib.licenses.free;
};
}) {};
+ sentence-highlight = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "sentence-highlight";
+ version = "0.1";
+ src = fetchFromGitHub {
+ owner = "sbelak";
+ repo = "sentence-highlight";
+ rev = "6f2bc989207ec8cf641e44924ef530a2e436eedb";
+ sha256 = "0740swhm3kzjx58a6nr9992p05q4kzvyham8g7kds4ydd7xsd9am";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/531ec8b371465d916f332818c04359dc66009a42/recipes/sentence-highlight";
+ sha256 = "0pr8f3b6hcflk400fq6j7fi8iv7r2drzdg19rbx3w7n3xwipwjf0";
+ name = "sentence-highlight";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/sentence-highlight";
+ license = lib.licenses.free;
+ };
+ }) {};
servant = callPackage ({ ansi, commander, dash, epl, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up, web-server }:
melpaBuild {
pname = "servant";
@@ -29515,6 +29768,27 @@
license = lib.licenses.free;
};
}) {};
+ showtip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "showtip";
+ version = "0.1";
+ src = fetchFromGitHub {
+ owner = "emacsorphanage";
+ repo = "showtip";
+ rev = "930da302809a4257e8d69425455b29e1cc91949b";
+ sha256 = "01zak0zhha6dp7a2hm28d065gjnc462iwpsfyxhbxgfzcdlicqc7";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/showtip";
+ sha256 = "1d5ckka2z0ffwyk9g3h91n3waijj2v7n8kvdks35gcr2yl3yk780";
+ name = "showtip";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/showtip";
+ license = lib.licenses.free;
+ };
+ }) {};
shpec-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "shpec-mode";
@@ -30232,12 +30506,12 @@
snakemake-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }:
melpaBuild {
pname = "snakemake-mode";
- version = "1.1.0";
+ version = "1.2.0";
src = fetchFromGitHub {
owner = "kyleam";
repo = "snakemake-mode";
- rev = "327c168febbde24c2b39cc10d26c9cfc9189e130";
- sha256 = "1jlv8sr2g3i335h7hp8y39b77wla9hac1b0bk2imalr14lz04vly";
+ rev = "15803162483e635f3e22b2efea33ccad725e0535";
+ sha256 = "1nc8xp22i57kf89x0qh69dspl9hl710m01gdr35ph5gl8ycmyir5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c3a5b51fee1c9e6ce7e21555faa355d118d34b8d/recipes/snakemake-mode";
@@ -30733,6 +31007,27 @@
license = lib.licenses.free;
};
}) {};
+ sr-speedbar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "sr-speedbar";
+ version = "20140914.2339";
+ src = fetchFromGitHub {
+ owner = "emacsorphanage";
+ repo = "sr-speedbar";
+ rev = "4f816528a32eb421197a768d6dcf3a05de83f642";
+ sha256 = "1x9wizd0fzcmpf8ff7c3rcfxk64diy9jmzzvxa7d5a3k8vvpdhg3";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/sr-speedbar";
+ sha256 = "1v90jbqdw39yrfcsnyqas8c5g09rcf1db65q2m2rw7rik8cgb052";
+ name = "sr-speedbar";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/sr-speedbar";
+ license = lib.licenses.free;
+ };
+ }) {};
srefactor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "srefactor";
@@ -30988,13 +31283,13 @@
pname = "stumpwm-mode";
version = "0.9.8";
src = fetchgit {
- url = "git://git.savannah.nongnu.org/stumpwm.git";
+ url = "https://git.savannah.nongnu.org/git/stumpwm.git";
rev = "4d0603e52b5bab993b3be63e3654c74f641e677d";
sha256 = "0pn3xjz433b0djcys25a8fv775yqmj3qgg0hyghgxjpzsh6k2a4f";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/3a1e6358c529e3b9e51bcfa6e2e294acbf662882/recipes/stumpwm-mode";
- sha256 = "0a77mh7h7033adfbwg2fbx84789962par43q31s9msjlqw15gs86";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/stumpwm-mode";
+ sha256 = "11yk7xmmccgv7hin5qd1ibcsm1za01xfwsxa25q7vqwk6svnb0sf";
name = "stumpwm-mode";
};
packageRequires = [];
@@ -31321,12 +31616,12 @@
swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "swiper";
- version = "0.8.0";
+ version = "0.9.1";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "swiper";
- rev = "c24a3728538dd7d11de9f141b3ad1d8e0996c330";
- sha256 = "19vfj01x7b8f7wyx7m51z00la2r7jcwzv0n06srkvcls0wm5s1h3";
+ rev = "f4b433436668ac09f3d1815fbfb4b71f3e0690fa";
+ sha256 = "10jffa503a6jid34smh0njnhlv27r9vyhwlpf00f13c5i8nh2xjf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper";
@@ -32181,12 +32476,12 @@
tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }:
melpaBuild {
pname = "tide";
- version = "2.1.5";
+ version = "2.2.2";
src = fetchFromGitHub {
owner = "ananthakumaran";
repo = "tide";
- rev = "bd89d93d9803319ba86eff0173821deb978ae2ac";
- sha256 = "1a736r1igq66hn6ig4l7c5xaxcyk2kxvj26laphakk1xg8j5x52k";
+ rev = "eabcad4dbebb705d4e366f90344ea543068d2dc4";
+ sha256 = "1ykxsr8q9gwx2d8b0v2xf4glchwg3ikcx60a5r4phw1nlwff8gg7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide";
@@ -32286,12 +32581,12 @@
tox = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "tox";
- version = "0.3";
+ version = "0.4.0";
src = fetchFromGitHub {
owner = "chmouel";
repo = "tox.el";
- rev = "5c1a7c18cb7f2fd2da2386debf86012e6953e15d";
- sha256 = "16217i8rjhgaa5kv8iq0s14b42v5rs8m2qlr60a0x6qzy65chq39";
+ rev = "7655eb254038d5e34433e8a9d66b3ffc9c72e40c";
+ sha256 = "1212b7s00kw9hk5gc2jx88hqd825rvkz1ss7phnxkrz833l062ki";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/08a7433e16f2a9a2c04168600a9c99bc21c68ddf/recipes/tox";
@@ -32579,12 +32874,12 @@
typescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "typescript-mode";
- version = "0.1";
+ version = "0.2";
src = fetchFromGitHub {
owner = "ananthakumaran";
repo = "typescript.el";
- rev = "abc0751c0e3f316a0064fc7342ffb89b49b02e15";
- sha256 = "0lgsyqzfjqhygs8a3icnfsp6y20h2rqrk4wbyc1xfmkbahs7qk8y";
+ rev = "f25f4751fea12298905c811a1f469a6b0a169ef1";
+ sha256 = "1s4qzhi8bd45l824pwzh97i9npf7j4ai6wkbhf28q2nd1hiv29hw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d3f534a1e2cee4ad2e32e32802c5080207417b3d/recipes/typescript-mode";
@@ -32726,12 +33021,12 @@
unfill = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "unfill";
- version = "0.1";
+ version = "0.2";
src = fetchFromGitHub {
owner = "purcell";
repo = "unfill";
- rev = "99388d79f971db70c5d18dab4257301f750ed907";
- sha256 = "1qy0q1fp7cmvmxynqrb086dkb727lmk5h1k98y14j75b94ilpy0w";
+ rev = "88186dce0de69e8f4aeaf2bfdc77d62210f19cd8";
+ sha256 = "0wyradin5igp25nsd3n22i2ppxhmy49ac1iq1w2715v8pfmiydnc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2ade389a20419b3e29a613409ac73a16b7c5bddb/recipes/unfill";
@@ -32897,22 +33192,22 @@
license = lib.licenses.free;
};
}) {};
- uptimes = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ uptimes = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "uptimes";
- version = "3.1";
+ version = "3.3";
src = fetchFromGitHub {
owner = "davep";
repo = "uptimes.el";
- rev = "5e321692bf5ccdc286f4831fa8fe55467c1c56aa";
- sha256 = "04n4bryfid6scma43whw156wcza77ij7szgc5f73d98j9fji6lay";
+ rev = "2be31db3508513478d3f27f4eff2ff1094786b4e";
+ sha256 = "177d1h84w9rr6x3hsq9z7sbr8s8pippgy0l99gpdhycbff6a7cwg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/72099e35ce3e34ec6afc6a3f87a4da07ec91499a/recipes/uptimes";
sha256 = "0r8s5c2hdcb1ly7rnhzar4qzf1c9d49gd914ndnc3mg9yb9gyy5h";
name = "uptimes";
};
- packageRequires = [ cl-lib ];
+ packageRequires = [ cl-lib emacs ];
meta = {
homepage = "https://melpa.org/#/uptimes";
license = lib.licenses.free;
@@ -32942,12 +33237,12 @@
utop = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "utop";
- version = "1.19.3";
+ version = "1.20";
src = fetchFromGitHub {
owner = "diml";
repo = "utop";
- rev = "ee81ce49bab31757837bed35a182d29cbd54dfcb";
- sha256 = "1p2vjxw0y6py5hly6vjl4gxm171n9pr4rkimxd0rg3dl1npvn99z";
+ rev = "46355e96f35fc6c3373cf8268e5e531cc3748644";
+ sha256 = "1jc16vki0d20vwgkf4ns6hn5s1dzfa4x5kf2925s1489f223ski3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/30489fe52b4031184e54f994770aa3291257bc9d/recipes/utop";
@@ -33359,6 +33654,27 @@
license = lib.licenses.free;
};
}) {};
+ w32-browser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "w32-browser";
+ version = "235";
+ src = fetchFromGitHub {
+ owner = "emacsorphanage";
+ repo = "w32-browser";
+ rev = "a8126b60bf18193e8e4ec6f699b5694b6f71a062";
+ sha256 = "13wjvzsas7in8f09sc2qj17dz25wizg1l0r2krgp1zymy92p8f97";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/ae489be43b1aee93614e40f492ebdf0b98a3fbc1/recipes/w32-browser";
+ sha256 = "16sp0gn4yv7iaa55i2kvfsqw3610gr3x31l9lqa14r9xmfhda1rn";
+ name = "w32-browser";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/w32-browser";
+ license = lib.licenses.free;
+ };
+ }) {};
wacspace = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "wacspace";
@@ -34016,8 +34332,8 @@
version = "0.9.1";
src = fetchhg {
url = "https://bitbucket.com/ArneBab/wisp";
- rev = "c5c0bb98b281";
- sha256 = "0gxvx2n6xza17qf1p4v0nbcqfkkhrmg9a56c5d126b4vgmg3bf9v";
+ rev = "e85aef10521f";
+ sha256 = "012h652i35vq3ygh62yr82mcvkmflqbxvz701c9px9i4kgyvhzdi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode";
diff --git a/pkgs/applications/editors/idea/common.nix b/pkgs/applications/editors/jetbrains/common.nix
similarity index 93%
rename from pkgs/applications/editors/idea/common.nix
rename to pkgs/applications/editors/jetbrains/common.nix
index 839f537843d0..a7ac367f048a 100644
--- a/pkgs/applications/editors/idea/common.nix
+++ b/pkgs/applications/editors/jetbrains/common.nix
@@ -63,6 +63,10 @@ with stdenv; lib.makeOverridable mkDerivation rec {
makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${execName}" \
--prefix PATH : "$out/libexec/${name}:${stdenv.lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \
+ --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [
+ # Some internals want libstdc++.so.6
+ stdenv.cc.cc.lib
+ ]}" \
--set JDK_HOME "$jdk" \
--set ${hiName}_JDK "$jdk" \
--set ANDROID_JAVA_HOME "$jdk" \
diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/jetbrains/default.nix
similarity index 77%
rename from pkgs/applications/editors/idea/default.nix
rename to pkgs/applications/editors/jetbrains/default.nix
index e298385f793e..7e9c5e48ad02 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, fetchurl, makeDesktopItem, makeWrapper, patchelf
+{ lib, stdenv, callPackage, fetchurl, makeDesktopItem, makeWrapper, patchelf
, coreutils, gnugrep, which, git, python, unzip, p7zip
, androidsdk, jdk
}:
@@ -6,10 +6,12 @@
assert stdenv.isLinux;
let
- mkIdeaProduct = callPackage ./common.nix { };
+ mkJetBrainsProduct = callPackage ./common.nix { };
+
+ # Sorted alphabetically
buildClion = { name, version, src, license, description, wmClass }:
- (mkIdeaProduct rec {
+ (mkJetBrainsProduct rec {
inherit name version src wmClass jdk;
product = "CLion";
meta = with stdenv.lib; {
@@ -24,8 +26,43 @@ let
};
});
+ buildDataGrip = { name, version, src, license, description, wmClass }:
+ (mkJetBrainsProduct {
+ inherit name version src wmClass jdk;
+ product = "DataGrip";
+ meta = with stdenv.lib; {
+ homepage = "https://www.jetbrains.com/datagrip/";
+ inherit description license;
+ longDescription = ''
+ DataGrip is a new IDE from JetBrains built for database admins.
+ It allows you to quickly migrate and refactor relational databases,
+ construct efficient, statically checked SQL queries and much more.
+ '';
+ maintainers = with maintainers; [ loskutov ];
+ platforms = platforms.linux;
+ };
+ });
+
+ buildGogland = { name, version, src, license, description, wmClass }:
+ (mkJetBrainsProduct {
+ inherit name version src wmClass jdk;
+ product = "Gogland";
+ meta = with stdenv.lib; {
+ homepage = "https://www.jetbrains.com/go/";
+ inherit description license;
+ longDescription = ''
+ Gogland is the codename for a new commercial IDE by JetBrains
+ aimed at providing an ergonomic environment for Go development.
+ The new IDE extends the IntelliJ platform with the coding assistance
+ and tool integrations specific for the Go language
+ '';
+ maintainers = [ maintainers.miltador ];
+ platforms = platforms.linux;
+ };
+ });
+
buildIdea = { name, version, src, license, description, wmClass }:
- (mkIdeaProduct rec {
+ (mkJetBrainsProduct rec {
inherit name version src wmClass jdk;
product = "IDEA";
meta = with stdenv.lib; {
@@ -41,21 +78,8 @@ let
};
});
- buildRubyMine = { name, version, src, license, description, wmClass }:
- (mkIdeaProduct rec {
- inherit name version src wmClass jdk;
- product = "RubyMine";
- meta = with stdenv.lib; {
- homepage = "https://www.jetbrains.com/ruby/";
- inherit description license;
- longDescription = description;
- maintainers = with maintainers; [ edwtjo ];
- platforms = platforms.linux;
- };
- });
-
buildPhpStorm = { name, version, src, license, description, wmClass }:
- (mkIdeaProduct {
+ (mkJetBrainsProduct {
inherit name version src wmClass jdk;
product = "PhpStorm";
meta = with stdenv.lib; {
@@ -71,25 +95,8 @@ let
};
});
- buildWebStorm = { name, version, src, license, description, wmClass }:
- (mkIdeaProduct {
- inherit name version src wmClass jdk;
- product = "WebStorm";
- meta = with stdenv.lib; {
- homepage = "https://www.jetbrains.com/webstorm/";
- inherit description license;
- longDescription = ''
- WebStorm provides an editor for HTML, JavaScript (incl. Node.js),
- and CSS with on-the-fly code analysis, error prevention and
- automated refactorings for JavaScript code.
- '';
- maintainers = with maintainers; [ abaldeau ];
- platforms = platforms.linux;
- };
- });
-
buildPycharm = { name, version, src, license, description, wmClass }:
- (mkIdeaProduct rec {
+ (mkJetBrainsProduct rec {
inherit name version src wmClass jdk;
product = "PyCharm";
meta = with stdenv.lib; {
@@ -115,47 +122,101 @@ let
propagatedUserEnvPkgs = [ python ];
};
- buildDataGrip = { name, version, src, license, description, wmClass }:
- (mkIdeaProduct {
+ buildRider = { name, version, src, license, description, wmClass }:
+ lib.overrideDerivation (mkJetBrainsProduct rec {
inherit name version src wmClass jdk;
- product = "DataGrip";
+ product = "Rider";
meta = with stdenv.lib; {
- homepage = "https://www.jetbrains.com/datagrip/";
+ homepage = "https://www.jetbrains.com/rider/";
inherit description license;
longDescription = ''
- DataGrip is a new IDE from JetBrains built for database admins.
- It allows you to quickly migrate and refactor relational databases,
- construct efficient, statically checked SQL queries and much more.
+ JetBrains Rider is a new .NET IDE based on the IntelliJ
+ platform and ReSharper. Rider supports .NET Core,
+ .NET Framework and Mono based projects. This lets you
+ develop a wide array of applications including .NET desktop
+ apps, services and libraries, Unity games, ASP.NET and
+ ASP.NET Core web applications.
'';
- maintainers = with maintainers; [ loskutov ];
+ maintainers = [ maintainers.miltador ];
+ platforms = platforms.linux;
+ };
+ }) (attrs: {
+ patchPhase = attrs.patchPhase + ''
+ # Patch built-in mono for ReSharperHost to start successfully
+ interpreter=$(echo ${stdenv.glibc.out}/lib/ld-linux*.so.2)
+ patchelf --set-interpreter "$interpreter" lib/ReSharperHost/linux-x64/mono/bin/mono-sgen
+ '';
+ });
+
+ buildRubyMine = { name, version, src, license, description, wmClass }:
+ (mkJetBrainsProduct rec {
+ inherit name version src wmClass jdk;
+ product = "RubyMine";
+ meta = with stdenv.lib; {
+ homepage = "https://www.jetbrains.com/ruby/";
+ inherit description license;
+ longDescription = description;
+ maintainers = with maintainers; [ edwtjo ];
platforms = platforms.linux;
};
});
+
+ buildWebStorm = { name, version, src, license, description, wmClass }:
+ (mkJetBrainsProduct {
+ inherit name version src wmClass jdk;
+ product = "WebStorm";
+ meta = with stdenv.lib; {
+ homepage = "https://www.jetbrains.com/webstorm/";
+ inherit description license;
+ longDescription = ''
+ WebStorm provides an editor for HTML, JavaScript (incl. Node.js),
+ and CSS with on-the-fly code analysis, error prevention and
+ automated refactorings for JavaScript code.
+ '';
+ maintainers = with maintainers; [ abaldeau ];
+ platforms = platforms.linux;
+ };
+ });
+
in
{
+ # Sorted alphabetically
+
clion = buildClion rec {
name = "clion-${version}";
- version = "2016.3.3";
+ version = "2017.1";
description = "C/C++ IDE. New. Intelligent. Cross-platform";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz";
- sha256 = "1zziyg0y51lfybflq83qwd94wcypkv4gh0cdkwfybbk4yidpnz05";
+ sha256 = "00fc023ca56f2781864cddc7bd5c2897d837d1db17dd8f987abe046ed4df3ca5";
};
wmClass = "jetbrains-clion";
};
- clion1 = buildClion rec {
- name = "clion-${version}";
- version = "1.2.5";
- description = "C/C++ IDE. New. Intelligent. Cross-platform";
+ datagrip = buildDataGrip rec {
+ name = "datagrip-${version}";
+ version = "2017.1";
+ description = "Your Swiss Army Knife for Databases and SQL";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
- url = "https://download.jetbrains.com/cpp/${name}.tar.gz";
- sha256 = "0ll1rcnnbd1if6x5rp3qw35lvp5zdzmvyg9n1lha89i34xiw36jp";
+ url = "https://download.jetbrains.com/datagrip/${name}.tar.gz";
+ sha256 = "91ee6a1e43d75a45ae51829835e457da85262410d89e617324d0239ba5625dfa";
};
- wmClass = "jetbrains-clion";
+ wmClass = "jetbrains-datagrip";
+ };
+
+ gogland = buildGogland rec {
+ name = "gogland-${version}";
+ version = "171.3780.106";
+ description = "Up and Coming Go IDE";
+ license = stdenv.lib.licenses.unfree;
+ src = fetchurl {
+ url = "https://download.jetbrains.com/go/${name}.tar.gz";
+ sha256 = "cbe84d07fdec6425d8ac63b0ecd5e04148299c1c0c6d05751523aaaa9360110b";
+ };
+ wmClass = "jetbrains-gogland";
};
idea14-community = buildIdea rec {
@@ -218,40 +279,28 @@ in
wmClass = "jetbrains-idea";
};
- ruby-mine = buildRubyMine rec {
- name = "ruby-mine-${version}";
- version = "2016.3.2";
- description = "The Most Intelligent Ruby and Rails IDE";
+ phpstorm = buildPhpStorm rec {
+ name = "phpstorm-${version}";
+ version = "2017.1";
+ description = "Professional IDE for Web and PHP developers";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
- url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz";
- sha256 = "1fqlrvhlk09z8nx68qv4nqs5n8ldia3lixsl6r04gsfyl1a69sb6";
+ url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
+ sha256 = "1ynffm5x8fqq2r71rr9rbvdifbwbvbhqb2x1hkyy4az38gxal1bm";
};
- wmClass = "jetbrains-rubymine";
+ wmClass = "jetbrains-phpstorm";
};
- ruby-mine7 = buildRubyMine rec {
- name = "ruby-mine-${version}";
- version = "7.1.5";
- description = "The Most Intelligent Ruby and Rails IDE";
+ phpstorm10 = buildPhpStorm rec {
+ name = "phpstorm-${version}";
+ version = "10.0.4";
+ description = "Professional IDE for Web and PHP developers";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
- url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz";
- sha256 = "04fcxj1xlap9mxmwf051s926p2darlj5kwl4lms2gy5d8b2lhd5l";
+ url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
+ sha256 = "0fi042zvjpg5pn2mnhj3bbrdkl1b9vmhpf2l6ca4nr0rhjjv7dsm";
};
- wmClass = "jetbrains-rubymine";
- };
-
- ruby-mine8 = buildRubyMine rec {
- name = "ruby-mine-${version}";
- version = "8.0.4";
- description = "The Most Intelligent Ruby and Rails IDE";
- license = stdenv.lib.licenses.unfree;
- src = fetchurl {
- url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz";
- sha256 = "0hipxib7377232w1jbf8h98bmh0djkllsrq3lq0w3fdxqglma43a";
- };
- wmClass = "jetbrains-rubymine";
+ wmClass = "jetbrains-phpstorm";
};
pycharm-community = buildPycharm rec {
@@ -278,28 +327,52 @@ in
wmClass = "jetbrains-pycharm";
};
- phpstorm = buildPhpStorm rec {
- name = "phpstorm-${version}";
- version = "2017.1";
- description = "Professional IDE for Web and PHP developers";
+ rider = buildRider rec {
+ name = "rider-${version}";
+ version = "171.3655.1246";
+ description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
- url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
- sha256 = "1ynffm5x8fqq2r71rr9rbvdifbwbvbhqb2x1hkyy4az38gxal1bm";
+ url = "https://download.jetbrains.com/resharper/riderRS-${version}.tar.gz";
+ sha256 = "90f9f8f1919e0f1dad42387f1a308483448323b089c13c409f3dd4d52992266b";
};
- wmClass = "jetbrains-phpstorm";
+ wmClass = "jetbrains-rider";
};
- phpstorm10 = buildPhpStorm rec {
- name = "phpstorm-${version}";
- version = "10.0.4";
- description = "Professional IDE for Web and PHP developers";
+ ruby-mine = buildRubyMine rec {
+ name = "ruby-mine-${version}";
+ version = "2017.1";
+ description = "The Most Intelligent Ruby and Rails IDE";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
- url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
- sha256 = "0fi042zvjpg5pn2mnhj3bbrdkl1b9vmhpf2l6ca4nr0rhjjv7dsm";
+ url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz";
+ sha256 = "6c27f43ddc385ffba2cb2f011b80ab46d9b128d0fccf3b4ea43272fe36401a3a";
};
- wmClass = "jetbrains-phpstorm";
+ wmClass = "jetbrains-rubymine";
+ };
+
+ ruby-mine7 = buildRubyMine rec {
+ name = "ruby-mine-${version}";
+ version = "7.1.5";
+ description = "The Most Intelligent Ruby and Rails IDE";
+ license = stdenv.lib.licenses.unfree;
+ src = fetchurl {
+ url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz";
+ sha256 = "04fcxj1xlap9mxmwf051s926p2darlj5kwl4lms2gy5d8b2lhd5l";
+ };
+ wmClass = "jetbrains-rubymine";
+ };
+
+ ruby-mine8 = buildRubyMine rec {
+ name = "ruby-mine-${version}";
+ version = "8.0.4";
+ description = "The Most Intelligent Ruby and Rails IDE";
+ license = stdenv.lib.licenses.unfree;
+ src = fetchurl {
+ url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz";
+ sha256 = "0hipxib7377232w1jbf8h98bmh0djkllsrq3lq0w3fdxqglma43a";
+ };
+ wmClass = "jetbrains-rubymine";
};
webstorm = buildWebStorm rec {
@@ -337,16 +410,4 @@ in
};
wmClass = "jetbrains-webstorm";
};
-
- datagrip = buildDataGrip rec {
- name = "datagrip-${version}";
- version = "2016.3.2";
- description = "Your Swiss Army Knife for Databases and SQL";
- license = stdenv.lib.licenses.unfree;
- src = fetchurl {
- url = "https://download.jetbrains.com/datagrip/${name}.tar.gz";
- sha256 = "19njb6i7nl6szql7cy99jmig59b304c6im3988p1dd8dj2j6csv3";
- };
- wmClass = "jetbrains-datagrip";
- };
}
diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix
index 4590939b516a..067aff5ee69b 100644
--- a/pkgs/applications/editors/kakoune/default.nix
+++ b/pkgs/applications/editors/kakoune/default.nix
@@ -3,25 +3,20 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "kakoune-nightly-${version}";
- version = "2017-02-09";
+ name = "kakoune-unstable-${version}";
+ version = "2017-04-12";
src = fetchFromGitHub {
repo = "kakoune";
owner = "mawww";
- rev = "9ba1665e58ee84b6596d89e6ef75f7c32e7c6c14";
- sha256 = "1l25mzq64a481qlsyh25rzp5rzajrkx4dq29677z85lnjqn30wbi";
+ rev = "7482d117cc85523e840dff595134dcb9cdc62207";
+ sha256 = "08j611y192n9vln9i94ldlvz3k0sg79dkmfc0b1vczrmaxhpgpfh";
};
buildInputs = [ ncurses boost asciidoc docbook_xsl libxslt ];
- buildPhase = ''
- sed -ie 's#--no-xmllint#--no-xmllint --xsltproc-opts="--nonet"#g' src/Makefile
- substituteInPlace src/Makefile --replace "boost_regex-mt" "boost_regex"
+ postPatch = ''
export PREFIX=$out
- (cd src && make )
- '';
-
- installPhase = ''
- (cd src && make install)
+ cd src
+ sed -ie 's#--no-xmllint#--no-xmllint --xsltproc-opts="--nonet"#g' Makefile
'';
meta = {
diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix
index f3a5a27bd366..bfc3b7c79faf 100644
--- a/pkgs/applications/editors/nano/default.nix
+++ b/pkgs/applications/editors/nano/default.nix
@@ -20,11 +20,11 @@ let
in stdenv.mkDerivation rec {
name = "nano-${version}";
- version = "2.8.0";
+ version = "2.8.1";
src = fetchurl {
url = "mirror://gnu/nano/${name}.tar.xz";
- sha256 = "1hjxr0kgq3q1fcns9y4lj0dbhjf33j3pa2wayrb3p3c8v3sbrh8m";
+ sha256 = "02vdnv30ms2s53ch5j4ldch5sxwjsg3098zkvwrwhi9k6yxshdg9";
};
nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext;
@@ -36,15 +36,6 @@ in stdenv.mkDerivation rec {
--sysconfdir=/etc
${optionalString (!enableNls) "--disable-nls"}
${optionalString enableTiny "--enable-tiny"}
- ''
- # Unclear why (perhaps an impurity?) but for some reason it decides that REG_ENHANCED is available
- # during configure but then can't find it at build time.
- + optionalString stdenv.isDarwin ''
- nano_cv_flag_reg_extended=REG_EXTENDED
- '';
-
- postPatch = optionalString stdenv.isDarwin ''
- substituteInPlace src/text.c --replace "__time_t" "time_t"
'';
postInstall = ''
diff --git a/pkgs/applications/misc/gpsbabel/clang-4.patch b/pkgs/applications/misc/gpsbabel/clang-4.patch
new file mode 100644
index 000000000000..6bd19ae60440
--- /dev/null
+++ b/pkgs/applications/misc/gpsbabel/clang-4.patch
@@ -0,0 +1,22 @@
+diff --git a/bushnell.cc b/bushnell.cc
+index 8fa844d..40707c4 100644
+--- a/bushnell.cc
++++ b/bushnell.cc
+@@ -135,7 +135,7 @@ bushnell_get_icon_from_name(QString name)
+ name = "Waypoint";
+ }
+
+- for (t = bushnell_icons; t->icon > 0; t++) {
++ for (t = bushnell_icons; t->icon != 0; t++) {
+ if (0 == name.compare(t->icon, Qt::CaseInsensitive)) {
+ return t->symbol;
+ }
+@@ -147,7 +147,7 @@ static const char*
+ bushnell_get_name_from_symbol(signed int s)
+ {
+ icon_mapping_t* t;
+- for (t = bushnell_icons; t->icon > 0; t++) {
++ for (t = bushnell_icons; t->icon != 0; t++) {
+ if (s == t->symbol) {
+ return t->icon;
+ }
diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix
index 6c248bc4dfa5..ace89cd8a21b 100644
--- a/pkgs/applications/misc/gpsbabel/default.nix
+++ b/pkgs/applications/misc/gpsbabel/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, zlib, qt4, which }:
+{ lib, stdenv, fetchurl, fetchpatch, zlib, qt4, which, IOKit }:
stdenv.mkDerivation rec {
name = "gpsbabel-${version}";
@@ -12,13 +12,15 @@ stdenv.mkDerivation rec {
};
patches = [
+ ./clang-4.patch
(fetchpatch {
url = https://sources.debian.net/data/main/g/gpsbabel/1.5.3-2/debian/patches/use_minizip;
sha256 = "03fpsmlx1wc48d1j405zkzp8j64hcp0z72islf4mk1immql3ibcr";
})
];
- buildInputs = [ zlib qt4 which ];
+ buildInputs = [ zlib qt4 which ]
+ ++ lib.optionals stdenv.isDarwin [ IOKit ];
/* FIXME: Building the documentation, with "make doc", requires this:
@@ -40,11 +42,11 @@ stdenv.mkDerivation rec {
patchShebangs testo
substituteInPlace testo \
--replace "-x /usr/bin/hexdump" ""
- '' + (
+ ''
# The raymarine and gtm tests fail on i686 despite -ffloat-store.
- if stdenv.isi686 then "rm -v testo.d/raymarine.test testo.d/gtm.test;"
- else ""
- );
+ + lib.optionalString stdenv.isi686 "rm -v testo.d/raymarine.test testo.d/gtm.test;"
+ # The gtm, kml and tomtom asc tests fail on darwin, see PR #23572.
+ + lib.optionalString stdenv.isDarwin "rm -v testo.d/gtm.test testo.d/kml.test testo.d/tomtom_asc.test";
meta = with stdenv.lib; {
description = "Convert, upload and download data from GPS and Map programs";
diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index 05a4db7a2500..895299f75b64 100644
--- a/pkgs/applications/misc/hugo/default.nix
+++ b/pkgs/applications/misc/hugo/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "hugo-${version}";
- version = "0.18.1";
+ version = "0.20";
goPackagePath = "github.com/spf13/hugo";
@@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "spf13";
repo = "hugo";
rev = "v${version}";
- sha256 = "1nmabcrq96b339in2yr2zwcd41nadr4bha3rlpyaxlzbyyhz2f81";
+ sha256 = "1dzvwldhf73ycmazq9xnridj7p3m3q6qv47rvk3vgj0xj6c107ij";
};
goDeps = ./deps.nix;
diff --git a/pkgs/applications/misc/hugo/deps.nix b/pkgs/applications/misc/hugo/deps.nix
index 0a95b083c0b8..e2e2d093dded 100644
--- a/pkgs/applications/misc/hugo/deps.nix
+++ b/pkgs/applications/misc/hugo/deps.nix
@@ -1,173 +1,38 @@
[
- {
- goPackagePath = "golang.org/x/sys";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/sys";
- rev = "d9157a9621b69ad1d8d77a1933590c416593f24f";
- sha256 = "1asdbp7rj1j1m1aar1a022wpcwbml6zih6cpbxaw7b2m8v8is931";
- };
- }
- {
- goPackagePath = "gopkg.in/yaml.v2";
- fetch = {
- type = "git";
- url = "https://gopkg.in/yaml.v2";
- rev = "a83829b6f1293c91addabc89d0571c246397bbf4";
- sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh";
- };
- }
- {
- goPackagePath = "golang.org/x/crypto";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/crypto";
- rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6";
- sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa";
- };
- }
- {
- goPackagePath = "github.com/gorilla/websocket";
- fetch = {
- type = "git";
- url = "https://github.com/gorilla/websocket";
- rev = "a622679ebd7a3b813862379232f645f8e690e43f";
- sha256 = "1nc9jbcmgya1i6dmf6sbcqsnxi9hbjg6dz1z0k7zmc6xdwlq0y4q";
- };
- }
- {
- goPackagePath = "github.com/inconshreveable/mousetrap";
- fetch = {
- type = "git";
- url = "https://github.com/inconshreveable/mousetrap";
- rev = "9dbb96d2c3a964935b0870b5abaea13c98b483aa";
- sha256 = "1f9g8vm18qv1rcb745a4iahql9vfrz0jni9mnzriab2wy1pfdl5b";
- };
- }
- {
- goPackagePath = "github.com/kardianos/osext";
- fetch = {
- type = "git";
- url = "https://github.com/kardianos/osext";
- rev = "29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc";
- sha256 = "1mawalaz84i16njkz6f9fd5jxhcbxkbsjnav3cmqq2dncv2hyv8a";
- };
- }
- {
- goPackagePath = "github.com/hashicorp/hcl";
- fetch = {
- type = "git";
- url = "https://github.com/hashicorp/hcl";
- rev = "54864211433d45cb780682431585b3e573b49e4a";
- sha256 = "07l2dydzjpdgm2d4a72hkmincn455j3nrafg6hs3c23bkvizj950";
- };
- }
- {
- goPackagePath = "github.com/hashicorp/go-multierror";
- fetch = {
- type = "git";
- url = "https://github.com/hashicorp/go-multierror";
- rev = "56912fb08d85084aa318edcf2bba735b97cf35c5";
- sha256 = "0s01cqdab2f7fxkkjjk2wqx05a1shnwlvfn45h2pi3i4gapvcn0r";
- };
- }
{
goPackagePath = "github.com/BurntSushi/toml";
fetch = {
type = "git";
url = "https://github.com/BurntSushi/toml";
- rev = "056c9bc7be7190eaa7715723883caffa5f8fa3e4";
- sha256 = "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw";
+ rev = "99064174e013895bbd9b025c31100bd1d9b590ca";
+ sha256 = "058qrar8rvw3wb0ci1mf1axnqq2729cvv9zmdr4ms2nn9s97yiz9";
};
}
{
- goPackagePath = "github.com/mitchellh/mapstructure";
+ goPackagePath = "github.com/PuerkitoBio/purell";
fetch = {
type = "git";
- url = "https://github.com/mitchellh/mapstructure";
- rev = "281073eb9eb092240d33ef253c404f1cca550309";
- sha256 = "1zjx9fv29639sp1fn84rxs830z7gp7bs38yd5y1hl5adb8s5x1mh";
+ url = "https://github.com/PuerkitoBio/purell";
+ rev = "0bcb03f4b4d0a9428594752bd2a3b9aa0a9d4bd4";
+ sha256 = "0vsxyn1fbm7g873b8kf3hcsgqgncb5nmfq3zfsc35a9yhzarka91";
};
}
{
- goPackagePath = "golang.org/x/text";
+ goPackagePath = "github.com/PuerkitoBio/urlesc";
fetch = {
type = "git";
- url = "https://go.googlesource.com/text";
- rev = "5eb8d4684c4796dd36c74f6452f2c0fa6c79597e";
- sha256 = "1cjwm2pv42dbfqc6ylr7jmma902zg4gng5aarqrbjf1k2nf2vs14";
+ url = "https://github.com/PuerkitoBio/urlesc";
+ rev = "5bd2802263f21d8788851d5305584c82a5c75d7e";
+ sha256 = "15y5r3asvm7196m3nza5xvdvlc2k11p6lfs6hi917hl7r9vgi6mp";
};
}
{
- goPackagePath = "github.com/shurcooL/sanitized_anchor_name";
+ goPackagePath = "github.com/bep/gitmap";
fetch = {
type = "git";
- url = "https://github.com/shurcooL/sanitized_anchor_name";
- rev = "10ef21a441db47d8b13ebcc5fd2310f636973c77";
- sha256 = "1cnbzcf47cn796rcjpph1s64qrabhkv5dn9sbynsy7m9zdwr5f01";
- };
- }
- {
- goPackagePath = "github.com/russross/blackfriday";
- fetch = {
- type = "git";
- url = "https://github.com/russross/blackfriday";
- rev = "d18b67ae0afd61dae240896eae1785f00709aa31";
- sha256 = "1l78hz8k1ixry5fjw29834jz1q5ysjcpf6kx2ggjj1s6xh0bfzvf";
- };
- }
- {
- goPackagePath = "github.com/yosssi/ace";
- fetch = {
- type = "git";
- url = "https://github.com/yosssi/ace";
- rev = "71afeb714739f9d5f7e1849bcd4a0a5938e1a70d";
- sha256 = "15k7ji8m3nqbwhnsvp82j4qa45sgvwv2giliw2xkdwi2g7mfrn8k";
- };
- }
- {
- goPackagePath = "github.com/spf13/viper";
- fetch = {
- type = "git";
- url = "https://github.com/spf13/viper";
- rev = "ec4eb2fa8549869ae7a2accd4fcc83d1c0555c15";
- sha256 = "018niqyrg09andj3g08jalflq2ypz9bp7qb1mbk50kfly29lkih7";
- };
- }
- {
- goPackagePath = "github.com/spf13/pflag";
- fetch = {
- type = "git";
- url = "https://github.com/spf13/pflag";
- rev = "b83537d79690b75cac5e021b036ae16792bf0f20";
- sha256 = "19blhq00rnynv11nnvixisx4h1429rp5bik13k661ixw0421qqyx";
- };
- }
- {
- goPackagePath = "github.com/spf13/jwalterweatherman";
- fetch = {
- type = "git";
- url = "https://github.com/spf13/jwalterweatherman";
- rev = "33c24e77fb80341fe7130ee7c594256ff08ccc46";
- sha256 = "1knvzspqzc2bh58q16zggzc8gcabjp5gr7zk4k7nx5ij4092cg0z";
- };
- }
- {
- goPackagePath = "github.com/fsnotify/fsnotify";
- fetch = {
- type = "git";
- url = "https://github.com/fsnotify/fsnotify";
- rev = "30411dbcefb7a1da7e84f75530ad3abe4011b4f8";
- sha256 = "0kbpvyi6p9942k0vmcw5z13mja47f7hq7nqd332pn2zydss6kddm";
- };
- }
- {
- goPackagePath = "github.com/magiconair/properties";
- fetch = {
- type = "git";
- url = "https://github.com/magiconair/properties";
- rev = "c265cfa48dda6474e208715ca93e987829f572f8";
- sha256 = "1ab9ywwsrdq5mvrcwl7m3276y1q4dfwinbv88vgpqwcqai9wkpp3";
+ url = "https://github.com/bep/gitmap";
+ rev = "dcb907b39a0690430d435eb8f63cd8811961231f";
+ sha256 = "0bw4spyiidrvd8rls9g57mwxykfmv57qi9mcnjadbqrpv92br856";
};
}
{
@@ -180,39 +45,21 @@
};
}
{
- goPackagePath = "github.com/eknkc/amber";
+ goPackagePath = "github.com/chaseadamsio/goorgeous";
fetch = {
type = "git";
- url = "https://github.com/eknkc/amber";
- rev = "91774f050c1453128146169b626489e60108ec03";
- sha256 = "1rb8bm35h8a77q4py6r3818cpwh7kpq1kh2ib2rb4i5s7z75ciis";
+ url = "https://github.com/chaseadamsio/goorgeous";
+ rev = "42b0ec184e93fc9fd2c0402f099a4939aba68407";
+ sha256 = "00mlv64q34d0vdq7p88hlsck4lsnk2pnxghx1jzy99r7wvs34am3";
};
}
{
- goPackagePath = "github.com/spf13/afero";
+ goPackagePath = "github.com/cpuguy83/go-md2man";
fetch = {
type = "git";
- url = "https://github.com/spf13/afero";
- rev = "1a8ecf8b9da1fb5306e149e83128fc447957d2a8";
- sha256 = "1nrg0gmqnl4h6zjmi4mdhrwnl3l34nzxpq2hsr3nizfvrx5gqbzw";
- };
- }
- {
- goPackagePath = "github.com/spf13/cast";
- fetch = {
- type = "git";
- url = "https://github.com/spf13/cast";
- rev = "27b586b42e29bec072fe7379259cc719e1289da6";
- sha256 = "1y73pfxdvm1bfpghwsfxj8gl4miv6fpzi9azxcknp6rcjn1gmq0x";
- };
- }
- {
- goPackagePath = "github.com/spf13/cobra";
- fetch = {
- type = "git";
- url = "https://github.com/spf13/cobra";
- rev = "bc81c21bd0d8be5ba2d6630a505d79d4467566e7";
- sha256 = "1sp8gl25cjx0yibh6q1i8d5rbxpwaal3z8vz372wfmbz002say8r";
+ url = "https://github.com/cpuguy83/go-md2man";
+ rev = "a65d4d2de4d5f7c74868dfa9b202a3c8be315aaa";
+ sha256 = "1rm3zjrmfpzy0l3qp02xmd5pqzl77pdql9pbxhl0k1qw2vfzrjv6";
};
}
{
@@ -225,57 +72,66 @@
};
}
{
- goPackagePath = "github.com/spf13/fsync";
+ goPackagePath = "github.com/eknkc/amber";
fetch = {
type = "git";
- url = "https://github.com/spf13/fsync";
- rev = "cb2da332d00cbc04e4f3f677520dc3e7cc11874b";
- sha256 = "03ib2xj80cbz77hx2baanyi50qr40akrybg49fzdvdm3lv9x100z";
+ url = "https://github.com/eknkc/amber";
+ rev = "9be5e8aae85904f63d505e0c00e5e0881d44ef4d";
+ sha256 = "1hmsqxwajgpmg1svzjqxf4n81qy7qs6m39cjv69jkhz9lpwc305j";
};
}
{
- goPackagePath = "github.com/cpuguy83/go-md2man";
+ goPackagePath = "github.com/fortytw2/leaktest";
fetch = {
type = "git";
- url = "https://github.com/cpuguy83/go-md2man";
- rev = "2724a9c9051aa62e9cca11304e7dd518e9e41599";
- sha256 = "1j2bigs7ixy20cdqd246nxr417md2qcyvkfk3x94992cr88d0vyj";
+ url = "https://github.com/fortytw2/leaktest";
+ rev = "0db74e8cd5adacfcc982838c6e185789e4b44e14";
+ sha256 = "11s04f1pliqw185ai1dbpqn5rahc3yzv2fp5zdanjvql4168499m";
};
}
{
- goPackagePath = "github.com/miekg/mmark";
+ goPackagePath = "github.com/fsnotify/fsnotify";
fetch = {
type = "git";
- url = "https://github.com/miekg/mmark";
- rev = "adb5c3e2e9f3e7da9bd25291edda8e66c0045a2a";
- sha256 = "0fycz17fj37fh95lfshdrfwrgkzi3hl1kgnily0cxc9zwfbap3qa";
+ url = "https://github.com/fsnotify/fsnotify";
+ rev = "4da3e2cfbabc9f751898f250b49f2439785783a1";
+ sha256 = "1y2l9jaf99j6gidcfdgq3hifxyiwv4f7awpll80p170ixdbqxvl3";
};
}
{
- goPackagePath = "github.com/spf13/nitro";
+ goPackagePath = "github.com/gorilla/websocket";
fetch = {
type = "git";
- url = "https://github.com/spf13/nitro";
- rev = "24d7ef30a12da0bdc5e2eb370a79c659ddccf0e8";
- sha256 = "143sbpx0jdgf8f8ayv51x6l4jg6cnv6nps6n60qxhx4vd90s6mib";
+ url = "https://github.com/gorilla/websocket";
+ rev = "adf16b31781325cbd41085c5be901d95b4d1f33d";
+ sha256 = "0f93k3igbqqwsl734lxnkbfajc4lcyzg4szg15vb26qn939b5ccx";
};
}
{
- goPackagePath = "github.com/PuerkitoBio/purell";
+ goPackagePath = "github.com/hashicorp/hcl";
fetch = {
type = "git";
- url = "https://github.com/PuerkitoBio/purell";
- rev = "1d5d1cfad45d42ec5f81fa8ef23de09cebc6dcc3";
- sha256 = "12k82576ka21c6572yy2v81kxpjrgf9mffjlz469g3vs0g3nkwlb";
+ url = "https://github.com/hashicorp/hcl";
+ rev = "80e628d796135357b3d2e33a985c666b9f35eee1";
+ sha256 = "0l85a7ir60hycb3mqsxmrz18f1kax03k55afsahr8xf46pjp5pyb";
};
}
{
- goPackagePath = "github.com/pkg/sftp";
+ goPackagePath = "github.com/inconshreveable/mousetrap";
fetch = {
type = "git";
- url = "https://github.com/pkg/sftp";
- rev = "d4c18e7ffdc496a38de67dde6e29b2f364afc472";
- sha256 = "0cnl83k317gxskayfj3xwr4bl0vcbjvlwi3q0vjwvircynb6xscj";
+ url = "https://github.com/inconshreveable/mousetrap";
+ rev = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75";
+ sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152";
+ };
+ }
+ {
+ goPackagePath = "github.com/kardianos/osext";
+ fetch = {
+ type = "git";
+ url = "https://github.com/kardianos/osext";
+ rev = "9b883c5eb462dd5cb1b0a7a104fe86bc6b9bd391";
+ sha256 = "0cyhbgsxwdfnwy57pdfivvjfy951gxbg9qlsjbwm6vs3gfws07mr";
};
}
{
@@ -292,26 +148,35 @@
fetch = {
type = "git";
url = "https://github.com/kyokomi/emoji";
- rev = "17c5e7085c9d59630aa578df67f4469481fbe7a9";
- sha256 = "0qs4mi7z1lghiyiw7s2bz5y959wj9ifmhyqh39xwqk69d690jwlp";
+ rev = "7e06b236c489543f53868841f188a294e3383eab";
+ sha256 = "1q2j0k5a8qqka1syc9zwmf1cvm6k628kf2g1nmghp2kdr7q1xmyb";
};
}
{
- goPackagePath = "github.com/pkg/errors";
+ goPackagePath = "github.com/magiconair/properties";
fetch = {
type = "git";
- url = "https://github.com/pkg/errors";
- rev = "494e70f7620561491c2ca11e185bbef4b70060da";
- sha256 = "0a0961ixl67vryhnzyzhai357c9n9a7v3vpkpqrh32spn033gjd9";
+ url = "https://github.com/magiconair/properties";
+ rev = "9c47895dc1ce54302908ab8a43385d1f5df2c11c";
+ sha256 = "0497bacr3gc7352gcwb07wyw7vb9m04xfd82mw0hpnzzw3kfnav3";
};
}
{
- goPackagePath = "github.com/PuerkitoBio/urlesc";
+ goPackagePath = "github.com/miekg/mmark";
fetch = {
type = "git";
- url = "https://github.com/PuerkitoBio/urlesc";
- rev = "5fa9ff0392746aeae1c4b37fcc42c65afa7a9587";
- sha256 = "0dppkmfs0hb5vcqli191x9yss5vvlx29qxjcywhdfirc89rn0sni";
+ url = "https://github.com/miekg/mmark";
+ rev = "2d4f1dd6f87cad351b9323bbaa6f6c586f0c4bee";
+ sha256 = "1ak54nvmryx73g16q6qaac9x0klhbxxmk1j6zlnfvvibnkj2pa90";
+ };
+ }
+ {
+ goPackagePath = "github.com/mitchellh/mapstructure";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mitchellh/mapstructure";
+ rev = "bfdb1a85537d60bc7e954e600c250219ea497417";
+ sha256 = "141kkh801jyp1r6hba14krydqg1iivp13j12is70j0g05z9fbji8";
};
}
{
@@ -319,17 +184,8 @@
fetch = {
type = "git";
url = "https://github.com/nicksnyder/go-i18n";
- rev = "e6c90c3ceece7f43060f843b495c3c9c031f5575";
- sha256 = "1i1hqvq05lk12wnrhayca66pvfbyjnj7dm0lr0hn5qhb2i8k84kd";
- };
- }
- {
- goPackagePath = "github.com/pelletier/go-toml";
- fetch = {
- type = "git";
- url = "https://github.com/pelletier/go-toml";
- rev = "45932ad32dfdd20826f5671da37a5f3ce9f26a8d";
- sha256 = "1rs25xqlpz2j9gqii144qnkvhsgzhwgy9ild7yvxhnbs2mybgix7";
+ rev = "4df9b06c0c1ffd8538a3cfa9d888f8f52985b302";
+ sha256 = "1cbbvq9l822p7vrscvaah3zybsj5yxcsq9fgvgsg062njbb0x41f";
};
}
{
@@ -337,17 +193,188 @@
fetch = {
type = "git";
url = "https://github.com/pelletier/go-buffruneio";
- rev = "df1e16fde7fc330a0ca68167c23bf7ed6ac31d6d";
- sha256 = "0jwn2g4jfdb3wvpqisd8h055099pwx6c5i3bb4zxk5l9vybg1c5f";
+ rev = "c37440a7cf42ac63b919c752ca73a85067e05992";
+ sha256 = "0l83p1gg6g5mmhmxjisrhfimhbm71lwn1r2w7d6siwwqm9q08sd2";
};
}
{
- goPackagePath = "github.com/bep/gitmap";
+ goPackagePath = "github.com/pelletier/go-toml";
fetch = {
type = "git";
- url = "https://github.com/bep/gitmap";
- rev = "a1a71abe12823e27ae7507189fe2e914ba9626ac";
- sha256 = "0qfhb72y6wbypaqv6dkl42syifnhps3qcy1karpd6ziw4pxak18g";
+ url = "https://github.com/pelletier/go-toml";
+ rev = "fee7787d3f811af92276f5ff10107092e95b7a1d";
+ sha256 = "0srx5hr35f9qzn5dnqqa0msyjknwn7vcq0jmlkvfxgaq0ygd6s3r";
+ };
+ }
+ {
+ goPackagePath = "github.com/pkg/errors";
+ fetch = {
+ type = "git";
+ url = "https://github.com/pkg/errors";
+ rev = "248dadf4e9068a0b3e79f02ed0a610d935de5302";
+ sha256 = "03l80r0i9bxl0vz363w62k4a8apzglgbrz6viwym3044sxkl1qks";
+ };
+ }
+ {
+ goPackagePath = "github.com/pkg/sftp";
+ fetch = {
+ type = "git";
+ url = "https://github.com/pkg/sftp";
+ rev = "4d0e916071f68db74f8a73926335f809396d6b42";
+ sha256 = "0l4n4ld0lx53s0hgz5rhk8gn7kr51adsr0cs6wlqm296xlcfp52h";
+ };
+ }
+ {
+ goPackagePath = "github.com/russross/blackfriday";
+ fetch = {
+ type = "git";
+ url = "https://github.com/russross/blackfriday";
+ rev = "5f33e7b7878355cd2b7e6b8eefc48a5472c69f70";
+ sha256 = "0d7faqxrxvh8hwc1r8gbasgmr8x5blxvzciwspir2yafjfbqy87k";
+ };
+ }
+ {
+ goPackagePath = "github.com/shurcooL/sanitized_anchor_name";
+ fetch = {
+ type = "git";
+ url = "https://github.com/shurcooL/sanitized_anchor_name";
+ rev = "1dba4b3954bc059efc3991ec364f9f9a35f597d2";
+ sha256 = "0pwap8lp79pldd95a1qi3xhlsa17m8zddpgc5jzvk6d1cjpsm6qg";
+ };
+ }
+ {
+ goPackagePath = "github.com/spf13/afero";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spf13/afero";
+ rev = "9be650865eab0c12963d8753212f4f9c66cdcf12";
+ sha256 = "12dhh6d07304lsjv7c4p95hkip0hnshqhwivdw39pbypgg0p8y34";
+ };
+ }
+ {
+ goPackagePath = "github.com/spf13/cast";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spf13/cast";
+ rev = "ce135a4ebeee6cfe9a26c93ee0d37825f26113c7";
+ sha256 = "1a2ahiyynn1kdjznqvzjfm5g5bc098gfw857bw9qikhdljvsnjiy";
+ };
+ }
+ {
+ goPackagePath = "github.com/spf13/cobra";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spf13/cobra";
+ rev = "7be4beda01ec05d0b93d80b3facd2b6f44080d94";
+ sha256 = "0jd2ya8kn763z16c3q5jl1x6raw2f3xq3vbaf4ppiy70zqzscmyg";
+ };
+ }
+ {
+ goPackagePath = "github.com/spf13/fsync";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spf13/fsync";
+ rev = "12a01e648f05a938100a26858d2d59a120307a18";
+ sha256 = "1vvbgxbbsc4mvi1axgqgn9pzjz1p495dsmwpc7mr8qxh8f6s0nhv";
+ };
+ }
+ {
+ goPackagePath = "github.com/spf13/jwalterweatherman";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spf13/jwalterweatherman";
+ rev = "fa7ca7e836cf3a8bb4ebf799f472c12d7e903d66";
+ sha256 = "0404b7bzx7cq1b2bgdb3gs7gjzm4vvg1hl2y9mcm4m6vz56vbcz8";
+ };
+ }
+ {
+ goPackagePath = "github.com/spf13/nitro";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spf13/nitro";
+ rev = "24d7ef30a12da0bdc5e2eb370a79c659ddccf0e8";
+ sha256 = "143sbpx0jdgf8f8ayv51x6l4jg6cnv6nps6n60qxhx4vd90s6mib";
+ };
+ }
+ {
+ goPackagePath = "github.com/spf13/pflag";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spf13/pflag";
+ rev = "9ff6c6923cfffbcd502984b8e0c80539a94968b7";
+ sha256 = "0mfrxzyl8x7araa126lh8l3sihbbgfbzgkrg3v3cx7y4n3wrsqvn";
+ };
+ }
+ {
+ goPackagePath = "github.com/spf13/viper";
+ fetch = {
+ type = "git";
+ url = "https://github.com/spf13/viper";
+ rev = "7538d73b4eb9511d85a9f1dfef202eeb8ac260f4";
+ sha256 = "0i4q715bjp018zw1b52zgx79j4s7s8l26dyrw8cslshibkx0frnl";
+ };
+ }
+ {
+ goPackagePath = "github.com/stretchr/testify";
+ fetch = {
+ type = "git";
+ url = "https://github.com/stretchr/testify";
+ rev = "4d4bfba8f1d1027c4fdbe371823030df51419987";
+ sha256 = "1d3yz1d2s88byjzmn60jbi1m9s552f7ghzbzik97fbph37i8yjhp";
+ };
+ }
+ {
+ goPackagePath = "github.com/yosssi/ace";
+ fetch = {
+ type = "git";
+ url = "https://github.com/yosssi/ace";
+ rev = "ea038f4770b6746c3f8f84f14fa60d9fe1205b56";
+ sha256 = "1kbvbc56grrpnl65grygd23gyn3nkkhxdg8awhzkjmd0cvki8w1f";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/crypto";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/crypto";
+ rev = "453249f01cfeb54c3d549ddb75ff152ca243f9d8";
+ sha256 = "0akybbzgi3v507a39bgnkk79rfhj8gflr7538g5a0177z5i9ygwa";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/net";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/net";
+ rev = "906cda9512f77671ab44f8c8563b13a8e707b230";
+ sha256 = "0aa33n5a2zzrm2pnjyc3xkdmf8hq2qpafgdp8v6fxfb0swqjl2n3";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/sys";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/sys";
+ rev = "075e574b89e4c2d22f2286a7e2b919519c6f3547";
+ sha256 = "1p38siwqcbd592lphaqpigl7scshkfy67k6jcwscbcsl6akw51km";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/text";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/text";
+ rev = "0ad425fe45e885577bef05dc1c50f72e33188b16";
+ sha256 = "1jz0i8iagfd703flx5z006kisjixpm8iy4hiwywgbh31wypsxxyl";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/yaml.v2";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/yaml.v2";
+ rev = "a3f3340b5840cee44f372bddb5880fcbc419b46a";
+ sha256 = "1djb53a8ikwgkfpf8namgf4d8pq1mq6q9q2c7q0z8x4dxf3whxj7";
};
}
]
diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix
index 6dd0f532f183..753d27b33767 100644
--- a/pkgs/applications/misc/josm/default.nix
+++ b/pkgs/applications/misc/josm/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "josm-${version}";
- version = "11639";
+ version = "11826";
src = fetchurl {
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
- sha256 = "1xq074jfk58gh5xmm8s9sjbcbnl34dpx7wsgq9n60phciya90sfb";
+ sha256 = "0x59n6klkxkaqcqgbkscdynyp0grfxdil2fxmg710yp8vkzg0zk2";
};
phases = [ "installPhase" ];
diff --git a/pkgs/applications/misc/latte-dock/default.nix b/pkgs/applications/misc/latte-dock/default.nix
index 8792a07e3e9b..cdde0beb8270 100644
--- a/pkgs/applications/misc/latte-dock/default.nix
+++ b/pkgs/applications/misc/latte-dock/default.nix
@@ -1,26 +1,33 @@
-{ stdenv, lib, cmake, plasma-framework, fetchFromGitHub }:
+{ stdenv, lib, cmake, xorg, plasma-framework, fetchFromGitHub, kdeWrapper }:
-let version = "0.5.98"; in
+let version = "0.6.0";
-stdenv.mkDerivation {
- name = "latte-dock-${version}";
+ unwrapped = stdenv.mkDerivation {
+ name = "latte-dock-${version}";
- src = fetchFromGitHub {
- owner = "psifidotos";
- repo = "Latte-Dock";
- rev = version;
- sha256 = "0z02ipbbv0dmcxs2g3dq5h62klhijni1i4ikq903hjg0j2cqg5xh";
- };
+ src = fetchFromGitHub {
+ owner = "psifidotos";
+ repo = "Latte-Dock";
+ rev = "v${version}";
+ sha256 = "1967hx4lavy96vvik8d5m2c6ycd2mlf9cmhrv40zr0784ni0ikyv";
+ };
- buildInputs = [ plasma-framework ];
+ buildInputs = [ plasma-framework xorg.libpthreadstubs xorg.libXdmcp ];
- nativeBuildInputs = [ cmake ];
+ nativeBuildInputs = [ cmake ];
- meta = with stdenv.lib; {
- description = "Dock-style app launcher based on Plasma frameworks";
- homepage = https://github.com/psifidotos/Latte-Dock;
- license = licenses.gpl2;
- platforms = platforms.unix;
- maintainers = [ maintainers.benley ];
- };
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ description = "Dock-style app launcher based on Plasma frameworks";
+ homepage = https://github.com/psifidotos/Latte-Dock;
+ license = licenses.gpl2;
+ platforms = platforms.unix;
+ maintainers = [ maintainers.benley ];
+ };
+ };
+
+in kdeWrapper {
+ inherit unwrapped;
+ targets = [ "bin/latte-dock" ];
}
diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix
index f202aee38283..581a45da3d8c 100644
--- a/pkgs/applications/networking/browsers/chromium/plugins.nix
+++ b/pkgs/applications/networking/browsers/chromium/plugins.nix
@@ -94,12 +94,12 @@ let
flash = stdenv.mkDerivation rec {
name = "flashplayer-ppapi-${version}";
- version = "25.0.0.127";
+ version = "25.0.0.148";
src = fetchzip {
url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/"
+ "${version}/flash_player_ppapi_linux.x86_64.tar.gz";
- sha256 = "1gf0ncclkk3h4vj9kkhbqj1nnnm54gwm5mdcs4p4pl8i339scs14";
+ sha256 = "1888n0mbzhbvi95kq19fzw310p7nr9h3g5d3nyzq5fnvj0lcfxsf";
stripRoot = false;
};
diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index 01cd7a1df380..5bd275ba31d5 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -82,6 +82,7 @@ stdenv.mkDerivation {
libPath = stdenv.lib.makeLibraryPath
[ stdenv.cc.cc
alsaLib
+ alsaLib.dev
atk
cairo
curl
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
index 72a1f171dec6..bf0b91544ad0 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
@@ -60,7 +60,7 @@
let
arch =
- if stdenv.system == "x86_64-linux" then
+ if stdenv.system == "x86_64-linux" then
"x86_64"
else if stdenv.system == "i686-linux" then
"i386"
@@ -73,7 +73,7 @@ let
in
stdenv.mkDerivation rec {
name = "flashplayer-${version}";
- version = "25.0.0.127";
+ version = "25.0.0.148";
src = fetchurl {
url =
@@ -84,14 +84,14 @@ stdenv.mkDerivation rec {
sha256 =
if debug then
if arch == "x86_64" then
- "0d37rwbqszl593pggph8pm8jwn05fppys7q8vk1jrk9jaz262iva"
+ "1jxxnbd357ndw8b64lw4pwkg9j0shy0ns7xw0f36awimq7bclr8d"
else
- "0lhngdx1q51kfpw3a961h9p9n1fnspk9pmg21i069hvd0h143arx"
+ "1k0zyy4mz307r7ph4pnmyqaa0fdw2f52apala6dbrys0wdl05yfg"
else
if arch == "x86_64" then
- "1yasj9xzmb6ly9209b1hmrqrzxrr1bafsfjszsr3yf994hql6nzn"
+ "0n77a2z0928vd4bjgx69igzxvn8l9wrfh79j6knygdpnsbr3pybj"
else
- "02vs12cm6fpl2fif1lij9y15m89wk6aizc8sbjiw6w59wixn3p9d";
+ "1cb1h37av4icfhl4vjngsa3nfcrcdvzliwxdg22rshimlkfgr7vx";
};
nativeBuildInputs = [ unzip ];
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
index 178b86b61c66..4d65a7e9a629 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
@@ -49,15 +49,13 @@
let
arch =
- if stdenv.system == "x86_64-linux" then
+ if stdenv.system == "x86_64-linux" then
"x86_64"
- else if stdenv.system == "i686-linux" then
- "i386"
else throw "Flash Player is not supported on this platform";
in
stdenv.mkDerivation rec {
name = "flashplayer-standalone-${version}";
- version = "25.0.0.127";
+ version = "25.0.0.148";
src = fetchurl {
url =
@@ -67,9 +65,9 @@ stdenv.mkDerivation rec {
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/25/flash_player_sa_linux.x86_64.tar.gz";
sha256 =
if debug then
- "07a8x1n997lmkxj74bkygh60shwzxzcvfxpz07pxj1nmvakmin51"
+ "1pkzpip8d3m92kyzap00xxq40yilgmaqnc47nak3i7gnbic8fa2r"
else
- "0rzxfcvjjwbd1m6pyby8km4g5834zy5d5sih7xq3czds9x0a2jp2";
+ "0xxsbxnkf9xnljy6sn61jqx9xd1w0lm5mbw4ca7xk5rkc84ik91z";
};
nativeBuildInputs = [ unzip ];
diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index aad5d1a80326..76984fed3404 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -49,20 +49,9 @@ in {
sha256 = "0ibgpcpvz0bmn3cw60nzsabsrxrbmmym1hv7fx6zmjxiwd68w5gb";
};
- terraform_0_9_2 = generic {
- version = "0.9.2";
- sha256 = "1yj5x1d10028fm3v3gjyjdn128ps0as345hr50y8x3vn86n70lxl";
-
- patches = [
- (fetchpatch {
- url = "https://github.com/hashicorp/terraform/pull/13237.patch";
- sha256 = "03c2nq12gvqqp12znvl3lmiviwsqksx4nrplv09fns2kz2gyfnbm";
- })
- (fetchpatch {
- url = "https://github.com/hashicorp/terraform/pull/13248.patch";
- sha256 = "0awj8gaic0j7a69is95f2rll3yip4n6avai1jh20b1x7dybdrp5m";
- })
- ];
+ terraform_0_9_3 = generic {
+ version = "0.9.3";
+ sha256 = "00z72lwv0cprz1jjy0cr8dicl00zwc1zwsxzjssqnq0187sswkxw";
postPatch = ''
rm builtin/providers/dns/data_dns_cname_record_set_test.go
diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix
index 28fc7fcc6662..7ed2cef0e3ba 100644
--- a/pkgs/applications/networking/cluster/terragrunt/default.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "terragrunt-${version}";
- version = "0.11.0";
+ version = "0.11.1";
goPackagePath = "github.com/gruntwork-io/terragrunt";
@@ -10,7 +10,7 @@ buildGoPackage rec {
rev = "v${version}";
owner = "gruntwork-io";
repo = "terragrunt";
- sha256 = "0i0ds6llkzrn6a0qq53d2pbb6ghc47lnd004zqfbgn3kwiajx73b";
+ sha256 = "061ix4m64i8bvjpqm6hn83nnkvqrp5y0hh5gzmxiik2nz3by1rx5";
};
goDeps = ./deps.nix;
diff --git a/pkgs/applications/networking/cluster/terragrunt/deps.nix b/pkgs/applications/networking/cluster/terragrunt/deps.nix
index 31f9f9a2b703..b98a38f8352c 100644
--- a/pkgs/applications/networking/cluster/terragrunt/deps.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/deps.nix
@@ -1,12 +1,12 @@
-# This file was generated by go2nix.
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.0
[
{
goPackagePath = "github.com/aws/aws-sdk-go";
fetch = {
type = "git";
url = "https://github.com/aws/aws-sdk-go";
- rev = "78568b07950e5e7948496878fe99b9436add41d4";
- sha256 = "0qi3q9qx8k055i2hlc6n8agl7nw1hzcw7aqqykla6z0hjv2hq0c3";
+ rev = "c790b8046767d9c773ad83c327ab988312f85a94";
+ sha256 = "0bhk7j088r8hhf05l70gpfnprxk7vzgb1fql9brk065hw2xnplsr";
};
}
{
@@ -32,8 +32,8 @@
fetch = {
type = "git";
url = "https://github.com/hashicorp/go-getter";
- rev = "c3d66e76678dce180a7b452653472f949aedfbcd";
- sha256 = "0ykpkiszcwp3hnvnnyl95zdrsziwrzr989ynyvbfkgpnkqfdhfy7";
+ rev = "e48f67b534e614bf7fbd978fd0020f61a17b7527";
+ sha256 = "0dlmirfi0pfbwylcjf2mggzav5r7bzdy19m3by6dgarn6izx6g7i";
};
}
{
@@ -77,8 +77,8 @@
fetch = {
type = "git";
url = "https://github.com/mitchellh/mapstructure";
- rev = "db1efb556f84b25a0a13a04aad883943538ad2e0";
- sha256 = "1pl1rwc9q3kz0banwi493cyhmn5mlc4mb97sx68jkdz6pck7fy0h";
+ rev = "53818660ed4955e899c0bcafa97299a388bd7c8e";
+ sha256 = "10gdkk8gcjv0lg15ajy68dwgvfkjhawk08ccs9x9ym1adp6l2ycs";
};
}
{
@@ -95,8 +95,8 @@
fetch = {
type = "git";
url = "https://github.com/urfave/cli";
- rev = "9e5b04886c4bfee2ceba1465b8121057355c4e53";
- sha256 = "18jx6ypc1w02ha37rsx6hhmdwqmnybajd6l54qm07bdb850ip9db";
+ rev = "8ba6f23b6e36d03666a14bd9421f5e3efcb59aca";
+ sha256 = "01s53ny3p0fdx64rnwcnmjj4xpc5adihnh6islsfq5z1ph2phhnj";
};
}
]
diff --git a/pkgs/applications/networking/davmail/default.nix b/pkgs/applications/networking/davmail/default.nix
index bb4a4a710094..b491f287e701 100644
--- a/pkgs/applications/networking/davmail/default.nix
+++ b/pkgs/applications/networking/davmail/default.nix
@@ -1,25 +1,27 @@
{ fetchurl, stdenv, jre, glib, libXtst, gtk2, makeWrapper }:
stdenv.mkDerivation rec {
- name = "davmail-4.7.2";
+ name = "davmail-4.8.0";
src = fetchurl {
- url = "mirror://sourceforge/davmail/4.7.1/davmail-linux-x86_64-4.7.1-2416.tgz";
- sha256 = "196jr44kksb197biz984z664llf9z3d8rlnjm2iqcmgkjhx1mgy3";
+ url = "mirror://sourceforge/davmail/4.8.0/davmail-linux-x86_64-4.8.0-2479.tgz";
+ sha256 = "0e650c4a060d64fd2b270ddb00baa906aac617865d5e60c9f526a281cdb27b62";
};
- buildInputs = [ makeWrapper ];
-
- meta = {
- description = "A Java application which presents a Microsoft Exchange server as local CALDAV, IMAP and SMTP servers";
- maintainers = [ stdenv.lib.maintainers.hinton ];
- platforms = stdenv.lib.platforms.all;
- homepage = "http://davmail.sourceforce.net/";
- license = stdenv.lib.licenses.gpl2;
- };
+ nativeBuildInputs = [ makeWrapper ];
installPhase = ''
- mkdir -p $out/bin
- cp ./* $out/bin/ -R
- wrapProgram $out/bin/davmail.sh --prefix PATH : ${jre}/bin --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ glib gtk2 libXtst ]}
- '';
+ mkdir -p $out/share/davmail
+ cp -R ./* $out/share/davmail
+ makeWrapper $out/share/davmail/davmail.sh $out/bin/davmail \
+ --prefix PATH : ${jre}/bin \
+ --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ glib gtk2 libXtst ]}
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = http://davmail.sourceforce.net/;
+ description = "A Java application which presents a Microsoft Exchange server as local CALDAV, IMAP and SMTP servers";
+ maintainers = [ maintainers.hinton ];
+ platforms = platforms.all;
+ license = licenses.gpl2;
+ };
}
diff --git a/pkgs/applications/networking/instant-messengers/tensor/default.nix b/pkgs/applications/networking/instant-messengers/tensor/default.nix
new file mode 100644
index 000000000000..ed78274c799d
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/tensor/default.nix
@@ -0,0 +1,55 @@
+{ stdenv, fetchgit, qtbase, qtquickcontrols, qmakeHook, makeQtWrapper, makeDesktopItem }:
+
+let
+ rev = "f3f3056d770d7fb4a21c610cee7936ee900569f5";
+
+in stdenv.mkDerivation rec {
+ name = "tensor-git-${stdenv.lib.strings.substring 0 8 rev}";
+
+ src = fetchgit {
+ url = "https://github.com/davidar/tensor.git";
+ fetchSubmodules = true;
+ inherit rev;
+ sha256 = "19in8c7a2hxsx2c4lj540w5c3pn1882645m21l91mcriynqr67k9";
+ };
+
+ parallelBuilding = true;
+
+ buildInputs = [ qtbase qtquickcontrols ];
+ nativeBuildInputs = [ qmakeHook makeQtWrapper ];
+
+ desktopItem = makeDesktopItem {
+ name = "tensor";
+ exec = "@bin@";
+ icon = "tensor.png";
+ comment = meta.description;
+ desktopName = "Tensor Matrix Client";
+ genericName = meta.description;
+ categories = "Chat;Utility";
+ mimeType = "text/xml";
+ };
+
+ installPhase = ''
+ runHook preInstall
+
+ install -Dm755 tensor $out/bin/tensor
+ install -Dm644 client/logo.png \
+ $out/share/icons/hicolor/512x512/apps/tensor.png
+ install -Dm644 ${desktopItem}/share/applications/tensor.desktop \
+ $out/share/applications/tensor.desktop
+
+ wrapQtProgram $out/bin/tensor
+
+ substituteInPlace $out/share/applications/tensor.desktop \
+ --subst-var-by bin $out/bin/tensor
+
+ runHook postInstall
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://matrix.org/docs/projects/client/tensor.html;
+ description = "Cross-platform Qt5/QML-based Matrix client";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ peterhoeg ];
+ };
+}
diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix
index 92d1a3446c0d..8eb1169b5a24 100644
--- a/pkgs/applications/networking/mailreaders/mutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/mutt/default.nix
@@ -20,11 +20,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "mutt-${version}";
- version = "1.8.0";
+ version = "1.8.1";
src = fetchurl {
url = "http://ftp.mutt.org/pub/mutt/${name}.tar.gz";
- sha256 = "1axdcylyv0p194y6lj1jx127g5yc74zqzzxdc014cjw02bd1x125";
+ sha256 = "1b8dggq5x1b77a9i9250b3jhv2iddfzhr9rix1yfzckdms65mr8b";
};
patchPhase = optionalString (openssl != null) ''
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 661d499d34e6..69286202823b 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -7,6 +7,7 @@
, autoconf213, which, m4
, writeScript, xidel, common-updater-scripts, coreutils, gnused, gnugrep, curl
, enableGTK3 ? false, gtk3, wrapGAppsHook
+, enableCalendar ? true
, debugBuild ? false
, # If you want the resulting program to call itself "Thunderbird" instead
# of "Earlybird" or whatever, enable this option. However, those
@@ -77,6 +78,7 @@ stdenv.mkDerivation rec {
"--disable-gconf"
"--enable-default-toolkit=cairo-gtk${if enableGTK3 then "3" else "2"}"
]
+ ++ lib.optional enableCalendar "--enable-calendar"
++ (if debugBuild then [ "--enable-debug" "--enable-profiling"]
else [ "--disable-debug" "--enable-release"
"--disable-debug-symbols"
diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix
index 288fa4383610..5c9e96c65277 100644
--- a/pkgs/applications/networking/remote/teamviewer/default.nix
+++ b/pkgs/applications/networking/remote/teamviewer/default.nix
@@ -9,7 +9,7 @@ let
mkLdPath = ps: lib.makeLibraryPath (with ps; [ qt4 dbus alsaLib ]);
- deps = ps: (with ps; [ dbus alsaLib fontconfig freetype libpng12 libjpeg ]) ++ (with ps.xlibs; [ libX11 libXext libXdamage libXrandr libXrender libXfixes libSM libXtst ]);
+ deps = ps: (with ps; [ dbus zlib alsaLib fontconfig freetype libpng12 libjpeg ]) ++ (with ps.xlibs; [ libX11 libXext libXdamage libXrandr libXrender libXfixes libSM libXtst libXinerama]);
tvldpath32 = lib.makeLibraryPath (with pkgsi686Linux; [ qt4 "$out/share/teamviewer/tv_bin/wine" ] ++ deps pkgsi686Linux);
tvldpath64 = lib.makeLibraryPath (deps pkgs);
in
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
rm -R \
$out/share/teamviewer/logfiles \
$out/share/teamviewer/config \
- $out/share/teamviewer/tv_bin/{xdg-utils,RTlib} \
+ $out/share/teamviewer/tv_bin/xdg-utils \
$out/share/teamviewer/tv_bin/script/{teamviewer_setup,teamviewerd.sysv,teamviewerd.service,teamviewerd.*.conf,libdepend,tv-delayed-start.sh}
ln -s $out/share/teamviewer/tv_bin/script/teamviewer $out/bin
@@ -57,13 +57,13 @@ stdenv.mkDerivation rec {
sed -i "s,/opt/teamviewer,$out/share/teamviewer,g" desktop/com.teamviewer.*.desktop
- for i in teamviewer-config teamviewerd TeamViewer_Desktop TVGuiDelegate TVGuiSlave.32 wine/bin/*; do
+ for i in teamviewer-config teamviewerd TeamViewer_Desktop TVGuiDelegate TVGuiSlave.32 wine/bin/* RTlib/libQtCore.so.4; do
echo "patching $i"
- patchelf --set-interpreter $(cat ${ld32}) --set-rpath ${tvldpath32} $i || true
+ patchelf --set-interpreter $(cat ${ld32}) --set-rpath $out/share/teamviewer/tv_bin/RTlib:${tvldpath32} $i || true
done
- for i in resources/*.so wine/drive_c/TeamViewer/tvwine.dll.so wine/lib/*.so* wine/lib/wine/*.so; do
+ for i in resources/*.so wine/drive_c/TeamViewer/tvwine.dll.so wine/lib/*.so* wine/lib/wine/*.so RTlib/*.so* ; do
echo "patching $i"
- patchelf --set-rpath ${tvldpath32} $i || true
+ patchelf --set-rpath $out/share/teamviewer/tv_bin/RTlib:${tvldpath32} $i || true
done
${if stdenv.system == "x86_64-linux" then ''
patchelf --set-interpreter $(cat ${ld64}) --set-rpath ${tvldpath64} TVGuiSlave.64
@@ -81,6 +81,6 @@ stdenv.mkDerivation rec {
license = licenses.unfree;
description = "Desktop sharing application, providing remote support and online meetings";
platforms = [ "i686-linux" "x86_64-linux" ];
- maintainers = with maintainers; [ jagajaga ];
+ maintainers = with maintainers; [ jagajaga dasuxullebt ];
};
}
diff --git a/pkgs/applications/science/biology/diamond/default.nix b/pkgs/applications/science/biology/diamond/default.nix
new file mode 100644
index 000000000000..a45e5df2f528
--- /dev/null
+++ b/pkgs/applications/science/biology/diamond/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, cmake, gcc, zlib }:
+
+stdenv.mkDerivation rec {
+ name = "diamond-0.8.36";
+
+ src = fetchurl {
+ url = "https://github.com/bbuchfink/diamond/archive/v0.8.36.tar.gz";
+ sha256 = "092smzzjcg51n3x4h84k52ijpz9m40ri838j9k2i463ribc3c8rh";
+ };
+
+ patches = [
+ ./diamond-0.8.36-no-warning.patch
+ ];
+
+ nativeBuildInputs = [ cmake ];
+ buildInputs = [ zlib ];
+
+ meta = with stdenv.lib; {
+ description = "Accelerated BLAST compatible local sequence aligner";
+ longDescription = ''
+ A sequence aligner for protein and translated DNA
+ searches and functions as a drop-in replacement for the NCBI BLAST
+ software tools. It is suitable for protein-protein search as well as
+ DNA-protein search on short reads and longer sequences including contigs
+ and assemblies, providing a speedup of BLAST ranging up to x20,000.
+
+ DIAMOND is developed by Benjamin Buchfink. Feel free to contact him for support (Email Twitter).
+
+ If you use DIAMOND in published research, please cite
+ B. Buchfink, Xie C., D. Huson,
+ "Fast and sensitive protein alignment using DIAMOND",
+ Nature Methods 12, 59-60 (2015).
+ '';
+ homepage = https://github.com/bbuchfink/diamond;
+ license = {
+ fullName = "University of Tuebingen, Benjamin Buchfink";
+ url = https://raw.githubusercontent.com/bbuchfink/diamond/master/src/COPYING;
+ };
+ maintainers = [ maintainers.metabar ];
+ };
+}
diff --git a/pkgs/applications/science/biology/diamond/diamond-0.8.36-no-warning.patch b/pkgs/applications/science/biology/diamond/diamond-0.8.36-no-warning.patch
new file mode 100644
index 000000000000..a16d475c5564
--- /dev/null
+++ b/pkgs/applications/science/biology/diamond/diamond-0.8.36-no-warning.patch
@@ -0,0 +1,20 @@
+diff -u -r diamond-0.8.36/src/dp/scalar_traceback.h diamond-0.8.36-patched/src/dp/scalar_traceback.h
+--- diamond-0.8.36/src/dp/scalar_traceback.h 2017-02-06 16:32:05.000000000 +0100
++++ diamond-0.8.36-patched/src/dp/scalar_traceback.h 2017-02-23 15:13:24.000000000 +0100
+@@ -19,6 +19,7 @@
+ #ifndef SCALAR_TRACEBACK_H_
+ #define SCALAR_TRACEBACK_H_
+
++#include
+ #include
+ #include "../basic/score_matrix.h"
+
+@@ -31,7 +32,7 @@
+ template<>
+ inline bool almost_equal(float x, float y)
+ {
+- return abs(x - y) < 0.001f;
++ return std::abs(x - y) < 0.001f;
+ }
+
+ template
diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index 9c421e0c8280..10656af4ef40 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -43,6 +43,15 @@ let
url = "https://github.com/xbmc/FFmpeg/archive/3.1.6-${rel}.tar.gz";
sha256 = "14jicb26s20nr3qmfpazszpc892yjwjn81zbsb8szy3a5xs19y81";
};
+ # Usage of kodi fork of libdvdnav and libdvdread is necessary for functional dvd playback:
+ libdvdnav_src = fetchurl {
+ url = "https://github.com/xbmc/libdvdnav/archive/981488f.tar.gz";
+ sha256 = "312b3d15bc448d24e92f4b2e7248409525eccc4e75776026d805478e51c5ef3d";
+ };
+ libdvdread_src = fetchurl {
+ url = "https://github.com/xbmc/libdvdread/archive/17d99db.tar.gz";
+ sha256 = "e7179b2054163652596a56301c9f025515cb08c6d6310b42b897c3ad11c0199b";
+ };
in stdenv.mkDerivation rec {
name = "kodi-${version}";
version = "17.1";
@@ -92,8 +101,8 @@ in stdenv.mkDerivation rec {
--replace "/bin/bash" "${bash}/bin/bash -ex"
cp ${ffmpeg_3_1_6} tools/depends/target/ffmpeg/ffmpeg-3.1.6-${rel}.tar.gz
ln -s ${libdvdcss.src} tools/depends/target/libdvdcss/libdvdcss-master.tar.gz
- ln -s ${libdvdnav.src} tools/depends/target/libdvdnav/libdvdnav-master.tar.gz
- ln -s ${libdvdread.src} tools/depends/target/libdvdread/libdvdread-master.tar.gz
+ cp ${libdvdnav_src} tools/depends/target/libdvdnav/libdvdnav-master.tar.gz
+ cp ${libdvdread_src} tools/depends/target/libdvdread/libdvdread-master.tar.gz
'';
preConfigure = ''
diff --git a/pkgs/applications/window-managers/trayer/default.nix b/pkgs/applications/window-managers/trayer/default.nix
index 296de4e1e253..146bd7e1438b 100644
--- a/pkgs/applications/window-managers/trayer/default.nix
+++ b/pkgs/applications/window-managers/trayer/default.nix
@@ -1,17 +1,21 @@
-{ stdenv, fetchFromGitHub, pkgconfig, gdk_pixbuf, gtk2, libXmu }:
+{ stdenv, fetchFromGitHub, pkgconfig, gdk_pixbuf, gtk2 }:
stdenv.mkDerivation rec {
- name = "trayer-1.1.6";
+ name = "trayer-1.1.7";
- buildInputs = [ pkgconfig gdk_pixbuf gtk2 libXmu ];
+ buildInputs = [ pkgconfig gdk_pixbuf gtk2 ];
src = fetchFromGitHub {
owner = "sargon";
repo = "trayer-srg";
rev = name;
- sha256 = "0mmya7a1qh3zyqgvcx5fz2lvr9n0ilr490l1j3z4myahi4snk2mg";
+ sha256 = "06lpgralggh5546qgvpilzxh4anshli2za41x68x2zbaizyqb09a";
};
+ preConfigure = ''
+ patchShebangs configure
+ '';
+
makeFlags = [ "PREFIX=$(out)" ];
meta = with stdenv.lib; {
diff --git a/pkgs/build-support/build-fhs-userenv/env.nix b/pkgs/build-support/build-fhs-userenv/env.nix
index 9a1897695a9d..9c228b391147 100644
--- a/pkgs/build-support/build-fhs-userenv/env.nix
+++ b/pkgs/build-support/build-fhs-userenv/env.nix
@@ -52,11 +52,12 @@ let
export LOCALE_ARCHIVE='/usr/lib/locale/locale-archive'
export LD_LIBRARY_PATH='/run/opengl-driver/lib:/run/opengl-driver-32/lib:/usr/lib:/usr/lib32'
export PATH='/run/wrappers/bin:/usr/bin:/usr/sbin'
- export PKG_CONFIG_PATH=/usr/lib/pkgconfig
- # Force compilers to look in default search paths
+ # Force compilers and other tools to look in default search paths
export NIX_CFLAGS_COMPILE='-idirafter /usr/include'
export NIX_LDFLAGS_BEFORE='-L/usr/lib -L/usr/lib32'
+ export PKG_CONFIG_PATH=/usr/lib/pkgconfig
+ export ACLOCAL_PATH=/usr/share/aclocal
${profile}
'';
diff --git a/pkgs/data/fonts/envypn-font/default.nix b/pkgs/data/fonts/envypn-font/default.nix
new file mode 100644
index 000000000000..203b68f5e5d2
--- /dev/null
+++ b/pkgs/data/fonts/envypn-font/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, mkfontdir, mkfontscale }:
+
+stdenv.mkDerivation rec {
+ name = "envypn-font-1.7.1";
+
+ src = fetchurl {
+ url = "https://ywstd.fr/files/p/envypn-font/envypn-font-1.7.1.tar.gz";
+ sha256 = "bda67b6bc6d5d871a4d46565d4126729dfb8a0de9611dae6c68132a7b7db1270";
+ };
+
+ buildInputs = [ mkfontdir mkfontscale ];
+
+ unpackPhase = ''
+ tar -xzf $src --strip-components=1
+ '';
+
+ installPhase = ''
+ # install the pcf fonts (for xorg applications)
+ fontDir="$out/share/fonts/envypn"
+ mkdir -p "$fontDir"
+ mv *.pcf.gz "$fontDir"
+
+ cd "$fontDir"
+ mkfontdir
+ mkfontscale
+ '';
+
+ meta = with stdenv.lib; {
+ description = ''
+ Readable bitmap font inspired by Envy Code R
+ '';
+ homepage = "http://ywstd.fr/p/pj/#envypn";
+ license = licenses.miros;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gtksourceview/default.nix b/pkgs/desktops/gnome-3/3.22/core/gtksourceview/default.nix
index aac1739a6e99..3dfbe6fbf0b5 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gtksourceview/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/gtksourceview/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
patches = [ ./nix_share_path.patch ];
meta = with stdenv.lib; {
- platforms = platforms.linux;
+ platforms = with platforms; linux ++ darwin;
maintainers = gnome3.maintainers;
};
}
diff --git a/pkgs/desktops/plasma-5/plasma-nm/0002-openvpn-binary-path.patch b/pkgs/desktops/plasma-5/plasma-nm/0002-openvpn-binary-path.patch
new file mode 100644
index 000000000000..3bc871f09063
--- /dev/null
+++ b/pkgs/desktops/plasma-5/plasma-nm/0002-openvpn-binary-path.patch
@@ -0,0 +1,13 @@
+diff --git a/vpn/openvpn/openvpnadvancedwidget.cpp b/vpn/openvpn/openvpnadvancedwidget.cpp
+index 2f11ba1d..310f11b4 100644
+--- a/vpn/openvpn/openvpnadvancedwidget.cpp
++++ b/vpn/openvpn/openvpnadvancedwidget.cpp
+@@ -75,7 +75,7 @@ OpenVpnAdvancedWidget::OpenVpnAdvancedWidget(const NetworkManager::VpnSetting::P
+ connect(m_ui->cmbProxyType, static_cast(&QComboBox::currentIndexChanged), this, &OpenVpnAdvancedWidget::proxyTypeChanged);
+
+ // start openVPN process and get its cipher list
+- const QString openVpnBinary = QStandardPaths::findExecutable("openvpn", QStringList() << "/sbin" << "/usr/sbin");
++ const QString openVpnBinary = "@openvpn@/bin/openvpn";
+ const QStringList ciphersArgs(QLatin1String("--show-ciphers"));
+ const QStringList versionArgs(QLatin1String("--version"));
+
diff --git a/pkgs/desktops/plasma-5/plasma-nm/default.nix b/pkgs/desktops/plasma-5/plasma-nm/default.nix
index da57653bb083..736d59b40412 100644
--- a/pkgs/desktops/plasma-5/plasma-nm/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-nm/default.nix
@@ -4,7 +4,7 @@
, knotifications, kservice, kwallet, kwidgetsaddons, kwindowsystem
, kxmlgui, mobile_broadband_provider_info
, modemmanager-qt, networkmanager-qt, openconnect, plasma-framework
-, qca-qt5, qtdeclarative, solid
+, qca-qt5, qtdeclarative, solid, openvpn
}:
plasmaPackage {
@@ -14,6 +14,10 @@ plasmaPackage {
src = ./0001-mobile-broadband-provider-info-path.patch;
inherit mobile_broadband_provider_info;
})
+ (substituteAll {
+ src = ./0002-openvpn-binary-path.patch;
+ inherit openvpn;
+ })
];
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
propagatedBuildInputs = [
@@ -23,4 +27,5 @@ plasmaPackage {
mobile_broadband_provider_info modemmanager-qt networkmanager-qt openconnect
qca-qt5 solid
];
+ enableParallelBuilding = true;
}
diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix
index 81bed7119ea5..12eb8b3a5425 100644
--- a/pkgs/development/compilers/gcc/snapshot/default.nix
+++ b/pkgs/development/compilers/gcc/snapshot/default.nix
@@ -60,7 +60,7 @@ assert langGo -> langCC;
with stdenv.lib;
with builtins;
-let version = "7-20161211";
+let version = "7-20170409";
# Whether building a cross-compiler for GNU/Hurd.
crossGNU = cross != null && cross.config == "i586-pc-gnu";
@@ -217,7 +217,7 @@ stdenv.mkDerivation ({
src = fetchurl {
url = "mirror://gcc/snapshots/${version}/gcc-${version}.tar.bz2";
- sha256 = "114rrrm5d5cawmr3161d2wgjlzkb9l1imj1p7fnypwz7y85l1661";
+ sha256 = "19197rw1xrpkb8h10lfgn6zj7yj52x95hdmr0x5lg8i4v3i23b67";
};
inherit patches;
diff --git a/pkgs/development/compilers/halvm/2.4.0.nix b/pkgs/development/compilers/halvm/2.4.0.nix
index c167f4bdd75a..08e74bdb78e9 100644
--- a/pkgs/development/compilers/halvm/2.4.0.nix
+++ b/pkgs/development/compilers/halvm/2.4.0.nix
@@ -8,13 +8,13 @@ stdenv.mkDerivation rec {
isHaLVM = true;
isGhcjs = false;
src = fetchgit {
- rev = "6aa72c9b047fd8ddff857c994a5a895461fc3925";
+ rev = "65fad65966eb7e60f234453a35aeb564a09d2595";
url = "https://github.com/GaloisInc/HaLVM";
- sha256 = "05cg4w6fw5ajmpmh8g2msprnygmr4isb3pphqhlddfqwyvqhl167";
+ sha256 = "09633h38w0z20cz0wcfp9z5kzv8v1zwcv0wqvgq3c8svqbrxp28k";
};
prePatch = ''
- sed -i '312 d' Makefile
- sed -i '316,446 d' Makefile # Removes RPM packaging
+ sed -i '305 d' Makefile
+ sed -i '309,439 d' Makefile # Removes RPM packaging
sed -i '20 d' src/scripts/halvm-cabal.in
sed -ie 's|ld |${binutils}/bin/ld |g' src/scripts/ldkernel.in
'';
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index d39e1bacd71d..0c51f208f462 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, ghc, pkgconfig, glibcLocales, coreutils, gnugrep, gnused
-, jailbreak-cabal, hscolour, cpphs, nodejs
+, jailbreak-cabal, hscolour, cpphs, nodejs, lib
}: let isCross = (ghc.cross or null) != null; in
{ pname
@@ -53,7 +53,7 @@
, shellHook ? ""
, coreSetup ? false # Use only core packages to build Setup.hs.
, useCpphs ? false
-, hardeningDisable ? []
+, hardeningDisable ? lib.optional (ghc.isHaLVM or false) "all"
} @ args:
assert editedCabalFile != null -> revision != null;
diff --git a/pkgs/development/java-modules/build-maven-package.nix b/pkgs/development/java-modules/build-maven-package.nix
index d83b43ffd75a..b3c3e1732e0d 100644
--- a/pkgs/development/java-modules/build-maven-package.nix
+++ b/pkgs/development/java-modules/build-maven-package.nix
@@ -27,7 +27,7 @@ in stdenv.mkDerivation rec {
echo "\
tmpm2file://$out/m2*\
$out/m2/" >> $out/m2/settings.xml
- ${maven}/bin/mvn ${optionalString (quiet) "-q"} clean package -Dmaven.test.skip=${if skipTests then "true" else "false"} -Danimal.sniffer.skip=true -gs $out/m2/settings.xml
+ ${maven}/bin/mvn ${optionalString (quiet) "-q"} clean package -Dmaven.test.skip=${boolToString skipTests} -Danimal.sniffer.skip=true -gs $out/m2/settings.xml
cp ./target/*.jar $out/m2/${m2Path}
cp -v ./target/*.jar $out/target/
'';
diff --git a/pkgs/development/libraries/NSPlist/default.nix b/pkgs/development/libraries/NSPlist/default.nix
new file mode 100644
index 000000000000..bfee99619840
--- /dev/null
+++ b/pkgs/development/libraries/NSPlist/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchFromGitHub, cmake }:
+
+stdenv.mkDerivation {
+ name = "NSPlist-713decf";
+
+ src = fetchFromGitHub {
+ owner = "matthewbauer";
+ repo = "NSPlist";
+ rev = "713decf06c1ef6c39a707bc99eb45ac9925f2b8a";
+ sha256 = "0v4yfiwfd08hmh2ydgy6pnmlzjbd96k78dsla9pfd56ka89aw74r";
+ };
+
+ buildInputs = [ cmake ];
+
+ meta = with stdenv.lib; {
+ maintainers = with maintainers; [ matthewbauer ];
+ description = "Parses .plist files";
+ license = licenses.mit;
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/development/libraries/PlistCpp/default.nix b/pkgs/development/libraries/PlistCpp/default.nix
new file mode 100644
index 000000000000..f7703b731b99
--- /dev/null
+++ b/pkgs/development/libraries/PlistCpp/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchFromGitHub, cmake, boost, NSPlist, pugixml }:
+
+stdenv.mkDerivation {
+ name = "PlistCpp-11615d";
+
+ src = fetchFromGitHub {
+ owner = "matthewbauer";
+ repo = "PlistCpp";
+ rev = "11615deab3369356a182dabbf5bae30574967264";
+ sha256 = "10jn6bvm9vn6492zix2pd724v5h4lccmkqg3lxfw8r0qg3av0yzv";
+ };
+
+ buildInputs = [ cmake boost NSPlist pugixml ];
+
+
+ meta = with stdenv.lib; {
+ maintainers = with maintainers; [ matthewbauer ];
+ description = "CPP bindings for Plist";
+ license = licenses.mit;
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch b/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch
index 49e059befdb9..75d9281dfb0e 100644
--- a/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch
+++ b/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch
@@ -57,15 +57,16 @@ diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py
index 838d343..ca7fc0d 100644
--- a/giscanner/shlibs.py
+++ b/giscanner/shlibs.py
-@@ -53,10 +53,24 @@ def _resolve_libtool(options, binary, libraries):
+@@ -53,10 +53,27 @@ def _resolve_libtool(options, binary, libraries):
# Match absolute paths on OS X to conform to how libraries are usually
# referenced on OS X systems.
def _ldd_library_pattern(library_name):
+ nix_store_dir = re.escape('@nixStoreDir@'.rstrip('/'))
pattern = "(?
+Date: Tue, 8 Mar 2016 17:26:23 -0800
+Subject: [PATCH 2/2] [GTK][Mac] Enable support for gtk-doc on Mac
+
+https://bugs.webkit.org/show_bug.cgi?id=152650
+
+Signed-off-by: Jeremy Huddleston Sequoia
+---
+ ChangeLog | 10 ++++++++++
+ Source/PlatformGTK.cmake | 2 +-
+ Source/cmake/OptionsGTK.cmake | 5 -----
+ 3 files changed, 11 insertions(+), 6 deletions(-)
+
+diff --git a/Source/PlatformGTK.cmake b/Source/PlatformGTK.cmake
+index af4d2e3..0b11b56 100644
+--- a/Source/PlatformGTK.cmake
++++ b/Source/PlatformGTK.cmake
+@@ -34,7 +34,7 @@ endmacro()
+ add_gtkdoc_generator("docs-build.stamp" "")
+ if (ENABLE_GTKDOC)
+ add_custom_target(gtkdoc ALL DEPENDS "${CMAKE_BINARY_DIR}/docs-build.stamp")
+-elseif (NOT ENABLED_COMPILER_SANITIZERS AND NOT CMAKE_CROSSCOMPILING AND NOT APPLE)
++elseif (NOT ENABLED_COMPILER_SANITIZERS AND NOT CMAKE_CROSSCOMPILING)
+ add_custom_target(gtkdoc DEPENDS "${CMAKE_BINARY_DIR}/docs-build.stamp")
+
+ # Add a default build step which check that documentation does not have any warnings
+diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
+index 6b01f1a..b443d10 100644
+--- a/Source/cmake/OptionsGTK.cmake
++++ b/Source/cmake/OptionsGTK.cmake
+@@ -424,11 +424,6 @@ if (CMAKE_CROSSCOMPILING)
+ set(ENABLE_INTROSPECTION OFF)
+ endif ()
+
+-# Override the cached variable, gtk-doc does not really work when building on Mac.
+-if (APPLE)
+- set(ENABLE_GTKDOC OFF)
+-endif ()
+-
+ set(DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR ${DERIVED_SOURCES_DIR}/webkitdom)
+ set(DERIVED_SOURCES_WEBKITGTK_DIR ${DERIVED_SOURCES_DIR}/webkitgtk)
+ set(DERIVED_SOURCES_WEBKITGTK_API_DIR ${DERIVED_SOURCES_WEBKITGTK_DIR}/webkit)
+diff --git a/Tools/gtk/gtkdoc.py b/Tools/gtk/gtkdoc.py
+index 4c8237b..a628ae0 100644
+--- a/Tools/gtk/gtkdoc.py
++++ b/Tools/gtk/gtkdoc.py
+@@ -322,6 +322,11 @@ class GTKDoc(object):
+ env['RUN'] = 'LD_LIBRARY_PATH="%s:%s" ' % (self.library_path, current_ld_library_path)
+ else:
+ env['RUN'] = 'LD_LIBRARY_PATH="%s" ' % self.library_path
++ current_dyld_library_path = env.get('DYLD_LIBRARY_PATH')
++ if current_ld_library_path:
++ env['RUN'] = 'DYLD_LIBRARY_PATH="%s:%s" ' % (self.library_path, current_dyld_library_path)
++ else:
++ env['RUN'] = 'DYLD_LIBRARY_PATH="%s" ' % self.library_path
+
+ if ldflags:
+ env['LDFLAGS'] = '%s %s' % (ldflags, env.get('LDFLAGS', ''))
+--
+2.7.2
+
diff --git a/pkgs/development/libraries/webkitgtk/PR-153138.patch b/pkgs/development/libraries/webkitgtk/PR-153138.patch
new file mode 100644
index 000000000000..833921f68061
--- /dev/null
+++ b/pkgs/development/libraries/webkitgtk/PR-153138.patch
@@ -0,0 +1,26 @@
+From 07886d9eacb7587dd52a9bcae10c1fc8ab56a910 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia
+Date: Fri, 15 Jan 2016 11:53:07 -0800
+Subject: [PATCH] https://bugs.webkit.org/show_bug.cgi?id=153138
+
+Signed-off-by: Jeremy Huddleston Sequoia
+---
+ Source/JavaScriptCore/bytecode/StructureStubInfo.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/Source/JavaScriptCore/bytecode/StructureStubInfo.cpp b/Source/JavaScriptCore/bytecode/StructureStubInfo.cpp
+index 1e4b4f5..9b27aed 100644
+--- a/Source/JavaScriptCore/bytecode/StructureStubInfo.cpp
++++ b/Source/JavaScriptCore/bytecode/StructureStubInfo.cpp
+@@ -26,6 +26,8 @@
+ #include "config.h"
+ #include "StructureStubInfo.h"
+
++#include "JSCellInlines.h"
++
+ #include "JSObject.h"
+ #include "PolymorphicAccess.h"
+ #include "Repatch.h"
+--
+2.7.0
+
diff --git a/pkgs/development/libraries/webkitgtk/PR-157554.patch b/pkgs/development/libraries/webkitgtk/PR-157554.patch
new file mode 100644
index 000000000000..615e805c92ce
--- /dev/null
+++ b/pkgs/development/libraries/webkitgtk/PR-157554.patch
@@ -0,0 +1,33 @@
+https://bugs.webkit.org/show_bug.cgi?id=157554
+
+--- a/Source/WTF/wtf/OSRandomSource.cpp
++++ b/Source/WTF/wtf/OSRandomSource.cpp
+@@ -29,7 +29,7 @@
+ #include
+ #include
+
+-#if !OS(DARWIN) && OS(UNIX)
++#if OS(UNIX) && !(OS(DARWIN) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070)
+ #include
+ #include
+ #include
+@@ -46,7 +46,7 @@
+
+ namespace WTF {
+
+-#if !OS(DARWIN) && OS(UNIX)
++#if OS(UNIX) && !(OS(DARWIN) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070)
+ NEVER_INLINE NO_RETURN_DUE_TO_CRASH static void crashUnableToOpenURandom()
+ {
+ CRASH();
+@@ -60,8 +56,8 @@ NEVER_INLINE NO_RETURN_DUE_TO_CRASH static void crashUnableToReadFromURandom()
+
+ void cryptographicallyRandomValuesFromOS(unsigned char* buffer, size_t length)
+ {
+-#if OS(DARWIN)
+- RELEASE_ASSERT(!CCRandomCopyBytes(kCCRandomDefault, buffer, length));
++#if OS(DARWIN) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
++ return arc4random_buf(buffer, length);
+ #elif OS(UNIX)
+ int fd = open("/dev/urandom", O_RDONLY, 0);
+ if (fd < 0)
diff --git a/pkgs/development/libraries/webkitgtk/PR-157574.patch b/pkgs/development/libraries/webkitgtk/PR-157574.patch
new file mode 100644
index 000000000000..d9b0795afa5b
--- /dev/null
+++ b/pkgs/development/libraries/webkitgtk/PR-157574.patch
@@ -0,0 +1,62 @@
+diff --git a/Source/JavaScriptCore/API/WebKitAvailability.h b/Source/JavaScriptCore/API/WebKitAvailability.h
+index ab53183..1310dec 100644
+--- a/Source/JavaScriptCore/API/WebKitAvailability.h
++++ b/Source/JavaScriptCore/API/WebKitAvailability.h
+@@ -27,57 +27,12 @@
+ #define __WebKitAvailability__
+
+ #if defined(__APPLE__)
+-
+-#include
+ #include
+-
+-#if !TARGET_OS_IPHONE && __MAC_OS_X_VERSION_MIN_REQUIRED < 101100
+-/* To support availability macros that mention newer OS X versions when building on older OS X versions,
+- we provide our own definitions of the underlying macros that the availability macros expand to. We're
+- free to expand the macros as no-ops since frameworks built on older OS X versions only ship bundled with
+- an application rather than as part of the system.
+-*/
+-
+-#ifndef __NSi_10_10 // Building from trunk rather than SDK.
+-#define __NSi_10_10 introduced=10.0 // Use 10.0 to indicate that everything is available.
+-#endif
+-
+-#ifndef __NSi_10_11 // Building from trunk rather than SDK.
+-#define __NSi_10_11 introduced=10.0 // Use 10.0 to indicate that everything is available.
+-#endif
+-
+-#ifndef __NSi_10_12 // Building from trunk rather than SDK.
+-#define __NSi_10_12 introduced=10.0 // Use 10.0 to indicate that everything is available.
+-#endif
+-
+-#ifndef __AVAILABILITY_INTERNAL__MAC_10_9
+-#define __AVAILABILITY_INTERNAL__MAC_10_9
+-#endif
+-
+-#ifndef __AVAILABILITY_INTERNAL__MAC_10_10
+-#define __AVAILABILITY_INTERNAL__MAC_10_10
+ #endif
+
+-#ifndef AVAILABLE_MAC_OS_X_VERSION_10_9_AND_LATER
+-#define AVAILABLE_MAC_OS_X_VERSION_10_9_AND_LATER
+-#endif
+-
+-#ifndef AVAILABLE_MAC_OS_X_VERSION_10_10_AND_LATER
+-#define AVAILABLE_MAC_OS_X_VERSION_10_10_AND_LATER
+-#endif
+-
+-#endif /* __MAC_OS_X_VERSION_MIN_REQUIRED <= 101100 */
+-
+-#if defined(BUILDING_GTK__)
+ #undef CF_AVAILABLE
+ #define CF_AVAILABLE(_mac, _ios)
+ #undef CF_ENUM_AVAILABLE
+ #define CF_ENUM_AVAILABLE(_mac, _ios)
+-#endif
+-
+-#else
+-#define CF_AVAILABLE(_mac, _ios)
+-#define CF_ENUM_AVAILABLE(_mac, _ios)
+-#endif
+
+ #endif /* __WebKitAvailability__ */
diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix
index d3a373ab4dbc..53d5a25a39eb 100644
--- a/pkgs/development/ocaml-modules/lwt/default.nix
+++ b/pkgs/development/ocaml-modules/lwt/default.nix
@@ -1,19 +1,30 @@
{ stdenv, fetchzip, which, cryptopp, ocaml, findlib, ocamlbuild, camlp4
, ocaml_react, ocaml_ssl, libev, pkgconfig, ncurses, ocaml_oasis, glib
-, ppx_tools, result
+, ppx_tools, result, cppo
, ppxSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02"
}:
+let param =
+ if stdenv.lib.versionAtLeast ocaml.version "4.02"
+ then {
+ version = "2.7.1";
+ sha256 = "0w7f59havrl2fsnvs84lm7wlqpsrldg80gy5afpnpr21zkw22g8w";
+ } else {
+ version = "2.6.0";
+ sha256 = "0f1h83zh60rspm4fxd96z9h5bkhq1n1q968hgq92sq4a6bfi1c2w";
+ };
+in
+
stdenv.mkDerivation rec {
name = "ocaml-lwt-${version}";
- version = "2.6.0";
+ inherit (param) version;
src = fetchzip {
url = "https://github.com/ocsigen/lwt/archive/${version}.tar.gz";
- sha256 = "0f1h83zh60rspm4fxd96z9h5bkhq1n1q968hgq92sq4a6bfi1c2w";
+ inherit (param) sha256;
};
- buildInputs = [ ocaml_oasis pkgconfig which cryptopp ocaml findlib ocamlbuild glib ncurses camlp4 ]
+ buildInputs = [ ocaml_oasis pkgconfig which cryptopp ocaml findlib ocamlbuild glib ncurses camlp4 cppo ]
++ stdenv.lib.optional ppxSupport ppx_tools;
propagatedBuildInputs = [ result ocaml_react ocaml_ssl libev ];
diff --git a/pkgs/development/ocaml-modules/mtime/default.nix b/pkgs/development/ocaml-modules/mtime/default.nix
index a26109bd4f95..5e18d1fd6e42 100644
--- a/pkgs/development/ocaml-modules/mtime/default.nix
+++ b/pkgs/development/ocaml-modules/mtime/default.nix
@@ -1,7 +1,9 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, js_of_ocaml
+{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, opam, js_of_ocaml
, jsooSupport ? !(stdenv.lib.versionAtLeast ocaml.version "4.04")
}:
+with lib;
+
stdenv.mkDerivation {
name = "ocaml${ocaml.version}-mtime-0.8.3";
@@ -15,7 +17,7 @@ stdenv.mkDerivation {
buildInputs = [ ocaml findlib ocamlbuild opam ]
++ stdenv.lib.optional jsooSupport js_of_ocaml;
- buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true jsoo=${if jsooSupport then "true" else "false"}";
+ buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true jsoo=${boolToString jsooSupport}";
installPhase = "opam-installer -i --prefix=$out --libdir=$OCAMLFIND_DESTDIR";
@@ -23,7 +25,7 @@ stdenv.mkDerivation {
description = "Monotonic wall-clock time for OCaml";
homepage = http://erratique.ch/software/mtime;
inherit (ocaml.meta) platforms;
- maintainers = [ stdenv.lib.maintainers.vbgl ];
- license = stdenv.lib.licenses.bsd3;
+ maintainers = [ maintainers.vbgl ];
+ license = licenses.bsd3;
};
}
diff --git a/pkgs/development/ocaml-modules/nocrypto/default.nix b/pkgs/development/ocaml-modules/nocrypto/default.nix
index f9240f7507cf..91ab694eb6f2 100644
--- a/pkgs/development/ocaml-modules/nocrypto/default.nix
+++ b/pkgs/development/ocaml-modules/nocrypto/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
buildPhase = ''
LD_LIBRARY_PATH=${cpuid}/lib/ocaml/${ocaml.version}/site-lib/stubslibs/ \
- ${topkg.buildPhase} --with-lwt ${if withLwt then "true" else "false"}
+ ${topkg.buildPhase} --with-lwt ${boolToString withLwt}
'';
inherit (topkg) installPhase;
diff --git a/pkgs/development/ocaml-modules/notty/default.nix b/pkgs/development/ocaml-modules/notty/default.nix
index b967728d048c..950395bd7eaa 100644
--- a/pkgs/development/ocaml-modules/notty/default.nix
+++ b/pkgs/development/ocaml-modules/notty/default.nix
@@ -29,7 +29,7 @@ buildOcaml rec {
optional withLwt lwt;
buildPhase = topkg.buildPhase
- + " --with-lwt ${if withLwt then "true" else "false"}";
+ + " --with-lwt ${boolToString withLwt}";
inherit (topkg) installPhase;
diff --git a/pkgs/development/ocaml-modules/vg/default.nix b/pkgs/development/ocaml-modules/vg/default.nix
index cb7878ac731e..ba33081486d7 100644
--- a/pkgs/development/ocaml-modules/vg/default.nix
+++ b/pkgs/development/ocaml-modules/vg/default.nix
@@ -1,16 +1,17 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
+{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
, uchar, result, gg, uutf, otfm, js_of_ocaml,
pdfBackend ? true, # depends on uutf and otfm
htmlcBackend ? true # depends on js_of_ocaml
}:
+with lib;
+
let
inherit (stdenv.lib) optionals versionAtLeast;
pname = "vg";
version = "0.9.0";
webpage = "http://erratique.ch/software/${pname}";
- sob = b: if b then "true" else "false";
in
assert versionAtLeast ocaml.version "4.02.0";
@@ -35,13 +36,14 @@ stdenv.mkDerivation rec {
unpackCmd = "tar xjf $src";
buildPhase = topkg.buildPhase
- + " --with-uutf ${sob pdfBackend} --with-otfm ${sob pdfBackend}"
- + " --with-js_of_ocaml ${sob htmlcBackend}"
- + " --with-cairo2 false";
+ + " --with-uutf ${boolToString pdfBackend}"
+ + " --with-otfm ${boolToString pdfBackend}"
+ + " --with-js_of_ocaml ${boolToString htmlcBackend}"
+ + " --with-cairo2 false";
inherit (topkg) installPhase;
- meta = with stdenv.lib; {
+ meta = {
description = "Declarative 2D vector graphics for OCaml";
longDescription = ''
Vg is an OCaml module for declarative 2D vector graphics. In Vg, images
diff --git a/pkgs/development/python-modules/distro/default.nix b/pkgs/development/python-modules/distro/default.nix
new file mode 100644
index 000000000000..9b79d82328f7
--- /dev/null
+++ b/pkgs/development/python-modules/distro/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchPypi, buildPythonPackage, pytest, pytestcov, tox }:
+
+buildPythonPackage rec {
+ name = "${pname}-${version}";
+ pname = "distro";
+ version = "1.0.3";
+
+ buildInputs = [ pytest pytestcov tox];
+
+ checkPhase = ''
+ touch tox.ini
+ tox
+ '';
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1kmjdz1kxspsmps73m2kzhxz86jj43ikx825hmgmwbx793ywv69d";
+ };
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/nir0s/distro;
+ description = "Linux Distribution - a Linux OS platform information API.";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ nand0p ];
+ };
+}
diff --git a/pkgs/development/python-modules/node-semver/default.nix b/pkgs/development/python-modules/node-semver/default.nix
new file mode 100644
index 000000000000..0bd569fd4ad3
--- /dev/null
+++ b/pkgs/development/python-modules/node-semver/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchPypi, buildPythonPackage, pytest, tox }:
+
+buildPythonPackage rec {
+ name = "${pname}-${version}";
+ version = "0.1.1";
+ pname = "node-semver";
+
+ buildInputs = [ pytest tox ];
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1b3xiqgl436q33grbkh4chpfchl8i2dmcpggbb2q4vgv3vjy97p2";
+ };
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/podhmo/python-semver;
+ description = "A port of node-semver";
+ license = licenses.mit;
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix
new file mode 100644
index 000000000000..ead0e3d858d6
--- /dev/null
+++ b/pkgs/development/python-modules/phonenumbers/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, fetchurl, buildPythonPackage }:
+
+buildPythonPackage rec {
+ name = "phonenumbers-8.4.0";
+
+ meta = {
+ description = "Python version of Google's common library for parsing, formatting, storing and validating international phone numbers";
+ homepage = "https://github.com/daviddrysdale/python-phonenumbers";
+ license = stdenv.lib.licenses.asl20;
+ maintainers = with stdenv.lib.maintainers; [ fadenb ];
+ };
+
+ src = fetchurl {
+ url = "mirror://pypi/p/phonenumbers/${name}.tar.gz";
+ sha256 = "1c052gd7ra3v183jq2x5nwa428wxh1g3psfh0ay5jwwmcxy78vab";
+ };
+}
diff --git a/pkgs/development/python-modules/pluginbase/default.nix b/pkgs/development/python-modules/pluginbase/default.nix
new file mode 100644
index 000000000000..9d90c617fc16
--- /dev/null
+++ b/pkgs/development/python-modules/pluginbase/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchPypi, buildPythonPackage, pytest, tox }:
+
+buildPythonPackage rec {
+ name = "${pname}-${version}";
+ version = "0.5";
+ pname = "pluginbase";
+
+ buildInputs = [ pytest tox ];
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1palagrlszs4f4f5j6npzl4d195vclrlza3qr524z2h758j31y5l";
+ };
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/mitsuhiko/pluginbase;
+ description = "A support library for building plugins sytems in Python";
+ license = licenses.bsd3;
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix
new file mode 100644
index 000000000000..417e492f7d0b
--- /dev/null
+++ b/pkgs/development/tools/build-managers/conan/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, pythonPackages }:
+
+pythonPackages.buildPythonApplication rec {
+ name = "${pname}-${version}";
+ version = "0.21.2";
+ pname = "conan";
+
+ src = pythonPackages.fetchPypi {
+ inherit pname version;
+ sha256 = "0x9s5h81d885xdrjw5x99q18lhmj11kalrs6xnjy2phrr8qzil8c";
+ };
+
+ propagatedBuildInputs = with pythonPackages; [
+ requests2 fasteners pyyaml pyjwt colorama patch
+ bottle pluginbase six distro pylint node-semver
+ ];
+
+ # enable tests once all of these pythonPackages available:
+ # [ nose nose_parameterized mock WebTest codecov ]
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ homepage = https://conan.io;
+ description = "Decentralized and portable C/C++ package manager";
+ license = licenses.mit;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index 28b6601cab6f..51aaf5e6a79a 100644
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.nix
@@ -52,12 +52,12 @@ rec {
};
gradle_latest = gradleGen rec {
- name = "gradle-3.4.1";
- nativeVersion = "0.13";
+ name = "gradle-3.5";
+ nativeVersion = "0.14";
src = fetchurl {
url = "http://services.gradle.org/distributions/${name}-bin.zip";
- sha256 = "1cpria3qry4778pxcmqvnaqcyq36abj1fgw4pq115k3rsj9v27fv";
+ sha256 = "046i268zkg89ps7c1sq8yx9lbn9kighh4gcskxmzf3qriiwm0x0b";
};
};
diff --git a/pkgs/development/tools/compile-daemon/default.nix b/pkgs/development/tools/compile-daemon/default.nix
new file mode 100644
index 000000000000..bad35e2422b5
--- /dev/null
+++ b/pkgs/development/tools/compile-daemon/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+ name = "compile-daemon-unstable-${version}";
+ version = "2017-03-08";
+ rev = "d447e567232bcb84cedd3b2be012c7127f31f469";
+
+ goPackagePath = "github.com/githubnemo/CompileDaemon";
+
+ src = fetchFromGitHub {
+ owner = "githubnemo";
+ repo = "CompileDaemon";
+ inherit rev;
+ sha256 = "0jfbipp3gd89n6d7gds1qvfkqvz80qdlqqhijxffh8z8ss0xinqc";
+ };
+
+ goDeps = ./deps.nix;
+
+ meta = with stdenv.lib; {
+ description = "Very simple compile daemon for Go";
+ license = licenses.bsd2;
+ maintainers = with maintainers; [ profpatsch ];
+ inherit (src.meta) homepage;
+ };
+}
diff --git a/pkgs/development/tools/compile-daemon/deps.nix b/pkgs/development/tools/compile-daemon/deps.nix
new file mode 100644
index 000000000000..53771ddad9f0
--- /dev/null
+++ b/pkgs/development/tools/compile-daemon/deps.nix
@@ -0,0 +1,48 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.0-devel
+[
+ {
+ goPackagePath = "github.com/fatih/color";
+ fetch = {
+ type = "git";
+ url = "https://github.com/fatih/color";
+ rev = "9131ab34cf20d2f6d83fdc67168a5430d1c7dc23";
+ sha256 = "111x6rhpxfjhwkjrmrirqqh6nc68q5g7air9fl5kgr3bg85hybr5";
+ };
+ }
+ {
+ goPackagePath = "github.com/mattn/go-colorable";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mattn/go-colorable";
+ rev = "a392f450ea64cee2b268dfaacdc2502b50a22b18";
+ sha256 = "1msiq5nb1sdhwfjv65hjnvr2s4pfsp8mv6f5z8aa8n9bjf0cksyc";
+ };
+ }
+ {
+ goPackagePath = "github.com/mattn/go-isatty";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mattn/go-isatty";
+ rev = "57fdcb988a5c543893cc61bce354a6e24ab70022";
+ sha256 = "1fkhmi3nhz6vasfvjzjjwxkbpwsb9hzc0g5h1rygqrnzjykl2r39";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/sys";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/sys";
+ rev = "99f16d856c9836c42d24e7ab64ea72916925fa97";
+ sha256 = "0g2x5krfhnraq03v0b48y3xv3ffg92pbgvps0npj9l7wq8q9hkmx";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/fsnotify.v1";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/fsnotify.v1";
+ rev = "629574ca2a5df945712d3079857300b5e4da0236";
+ sha256 = "06wfg1mmzjj04z7d0q1x2fai9k6hm957brngsaf02fa9a3qqanv3";
+ };
+ }
+]
diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix
index 4b0768af1e20..1e04a10eccd9 100644
--- a/pkgs/development/tools/misc/hydra/default.nix
+++ b/pkgs/development/tools/misc/hydra/default.nix
@@ -55,6 +55,7 @@ let
TextTable
XMLSimple
nixUnstable
+ nixUnstable.perl-bindings
git
boehmgc
];
diff --git a/pkgs/development/tools/pypi2nix/default.nix b/pkgs/development/tools/pypi2nix/default.nix
index 1e6b6690e71b..e6c2467bc8a0 100644
--- a/pkgs/development/tools/pypi2nix/default.nix
+++ b/pkgs/development/tools/pypi2nix/default.nix
@@ -1,23 +1,24 @@
-{ stdenv, fetchurl, python, zip, makeWrapper, nix, nix-prefetch-scripts
+{ stdenv, fetchurl, pythonPackages, zip, makeWrapper, nix, nix-prefetch-git
+, nix-prefetch-hg
}:
let
- version = "1.6.0";
+ version = "1.8.0";
src = fetchurl {
url = "https://github.com/garbas/pypi2nix/archive/v${version}.tar.gz";
- sha256 = "08iad1ad2gnvsnd66ddw3lff19ms2yly4iq63c8800j603d0pdhn";
+ sha256 = "133sjx8r1jdb5gi3caawa9m7v496jv4id2c3zqnx8hria22425za";
};
click = fetchurl {
- url = "https://pypi.python.org/packages/7a/00/c14926d8232b36b08218067bcd5853caefb4737cda3f0a47437151344792/click-6.6.tar.gz";
- sha256 = "1sggipyz52crrybwbr9xvwxd4aqigvplf53k9w3ygxmzivd1jsnc";
+ url = "https://pypi.python.org/packages/95/d9/c3336b6b5711c3ab9d1d3a80f1a3e2afeb9d8c02a7166462f6cc96570897/click-6.7.tar.gz";
+ sha256 = "02qkfpykbq35id8glfgwc38yc430427yd05z1wc5cnld8zgicmgi";
};
requests = fetchurl {
- url = "https://pypi.python.org/packages/5b/0b/34be574b1ec997247796e5d516f3a6b6509c4e064f2885a96ed885ce7579/requests-2.12.4.tar.gz";
- sha256 = "0d5fwxmw4ibynk3imph3n4n84m0n3ib1vj339fxhkqri0qd4767d";
+ url = "https://pypi.python.org/packages/16/09/37b69de7c924d318e51ece1c4ceb679bf93be9d05973bb30c35babd596e2/requests-2.13.0.tar.gz";
+ sha256 = "1s0wg4any4dsv5l3hqjxqk2zgb7pdbqhy9rhc8kh3aigfq4ws8jp";
};
in stdenv.mkDerivation rec {
@@ -27,7 +28,11 @@ in stdenv.mkDerivation rec {
click
requests
];
- buildInputs = [ python zip makeWrapper nix.out nix-prefetch-scripts ];
+ buildInputs = [
+ pythonPackages.python pythonPackages.flake8
+ zip makeWrapper nix.out nix-prefetch-git nix-prefetch-hg
+ ];
+
sourceRoot = ".";
postUnpack = ''
@@ -47,13 +52,14 @@ in stdenv.mkDerivation rec {
patchPhase = ''
sed -i -e "s|default='nix-shell',|default='${nix.out}/bin/nix-shell',|" $out/pkgs/pypi2nix/cli.py
- sed -i -e "s|nix-prefetch-git|${nix-prefetch-scripts}/bin/nix-prefetch-git|" $out/pkgs/pypi2nix/stage2.py
+ sed -i -e "s|nix-prefetch-git|${nix-prefetch-git}/bin/nix-prefetch-git|" $out/pkgs/pypi2nix/stage2.py
+ sed -i -e "s|nix-prefetch-hg|${nix-prefetch-hg}/bin/nix-prefetch-hg|" $out/pkgs/pypi2nix/stage2.py
'';
commonPhase = ''
mkdir -p $out/bin
- echo "#!${python.interpreter}" > $out/bin/pypi2nix
+ echo "#!${pythonPackages.python.interpreter}" > $out/bin/pypi2nix
echo "import pypi2nix.cli" >> $out/bin/pypi2nix
echo "pypi2nix.cli.main()" >> $out/bin/pypi2nix
@@ -62,8 +68,16 @@ in stdenv.mkDerivation rec {
export PYTHONPATH=$out/pkgs:$PYTHONPATH
'';
+ # flake8 doesn't run on python3
+ doCheck = false;
+ checkPhase = ''
+ flake8 ${src}/src
+ '';
+
installPhase = commonPhase + ''
- wrapProgram $out/bin/pypi2nix --prefix PYTHONPATH : "$PYTHONPATH"
+ wrapProgram $out/bin/pypi2nix \
+ --prefix PYTHONPATH : "$PYTHONPATH" \
+ --prefix PATH : "${nix-prefetch-git}/bin:${nix-prefetch-hg}/bin"
'';
shellHook = ''
diff --git a/pkgs/development/tools/unity3d/default.nix b/pkgs/development/tools/unity3d/default.nix
index 73cb902ae695..d9459134feab 100644
--- a/pkgs/development/tools/unity3d/default.nix
+++ b/pkgs/development/tools/unity3d/default.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, makeWrapper, fakeroot, file, getopt
-, gtk2, gdk_pixbuf, glib, mesa_glu, postgresql, nss, nspr
+, gtk2, gdk_pixbuf, glib, mesa_glu, postgresql, nss, nspr, udev
, alsaLib, GConf, cups, libcap, fontconfig, freetype, pango
, cairo, dbus, expat, zlib, libpng12, nodejs, gnutar, gcc, gcc_32bit
, libX11, libXcursor, libXdamage, libXfixes, libXrender, libXi
@@ -11,7 +11,7 @@ let
libPath64 = lib.makeLibraryPath [
gcc.cc gtk2 gdk_pixbuf glib mesa_glu postgresql nss nspr
alsaLib GConf cups libcap fontconfig freetype pango
- cairo dbus expat zlib libpng12
+ cairo dbus expat zlib libpng12 udev
libX11 libXcursor libXdamage libXfixes libXrender libXi
libXcomposite libXext libXrandr libXtst libSM libICE libxcb
];
@@ -25,19 +25,16 @@ let
gnome-sharp gtk-sharp-2_0
];
- ver = "5.3.5";
+ ver = "5.5.3";
build = "f1";
- date = "20160525";
- pkgVer = "${ver}${build}";
- fullVer = "${pkgVer}+${date}";
in stdenv.mkDerivation rec {
name = "unity-editor-${version}";
- version = pkgVer;
+ version = "${ver}x${build}";
src = fetchurl {
- url = "http://download.unity3d.com/download_unity/linux/unity-editor-installer-${fullVer}.sh";
- sha256 = "0lmc65175fdvbyn3565pjlg6cc4l5i58fj7bxzi5cqykkbzv5wdm";
+ url = "http://beta.unity3d.com/download/a2454d41e248/unity-editor-installer-${version}Linux.sh";
+ sha256 = "1hvas4n1hm0qp0265gk1nh03kypd9690fnxvzg70f5ni9q97pvm0";
};
nosuidLib = ./unity-nosuid.c;
@@ -46,9 +43,10 @@ in stdenv.mkDerivation rec {
outputs = [ "out" "monodevelop" ];
+ sourceRoot = "unity-editor-${version}Linux";
+
unpackPhase = ''
echo -e 'q\ny' | fakeroot sh $src
- sourceRoot="unity-editor-${pkgVer}"
'';
buildPhase = ''
@@ -125,6 +123,7 @@ in stdenv.mkDerivation rec {
'';
dontStrip = true;
+ dontPatchELF = true;
meta = with stdenv.lib; {
homepage = https://unity3d.com/;
diff --git a/pkgs/development/tools/xcbuild/platform.nix b/pkgs/development/tools/xcbuild/platform.nix
index 34fc5b0f6202..31692d9bee68 100644
--- a/pkgs/development/tools/xcbuild/platform.nix
+++ b/pkgs/development/tools/xcbuild/platform.nix
@@ -101,6 +101,54 @@ let
Name = "$(EXECUTABLE_NAME)";
};
}
+ {
+ Identifier = "com.apple.package-type.wrapper";
+ Type = "PackageType";
+ Name = "Wrapper";
+ DefaultBuildSettings = {
+ WRAPPER_SUFFIX = ".bundle";
+ WRAPPER_NAME = "$(WRAPPER_PREFIX)$(PRODUCT_NAME)$(WRAPPER_SUFFIX)";
+ CONTENTS_FOLDER_PATH = "$(WRAPPER_NAME)/Contents";
+ EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)";
+ EXECUTABLE_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/MacOS";
+ EXECUTABLE_PATH = "$(EXECUTABLE_FOLDER_PATH)/$(EXECUTABLE_NAME)";
+ INFOPLIST_PATH = "$(CONTENTS_FOLDER_PATH)/Info.plist";
+ INFOSTRINGS_PATH = "$(LOCALIZED_RESOURCES_FOLDER_PATH)/InfoPlist.strings";
+ PKGINFO_PATH = "$(CONTENTS_FOLDER_PATH)/PkgInfo";
+ PBDEVELOPMENTPLIST_PATH = "$(CONTENTS_FOLDER_PATH)/pbdevelopment.plist";
+ VERSIONPLIST_PATH = "$(CONTENTS_FOLDER_PATH)/version.plist";
+ PUBLIC_HEADERS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Headers";
+ PRIVATE_HEADERS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/PrivateHeaders";
+ EXECUTABLES_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Executables";
+ FRAMEWORKS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Frameworks";
+ SHARED_FRAMEWORKS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/SharedFrameworks";
+ SHARED_SUPPORT_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/SharedSupport";
+ UNLOCALIZED_RESOURCES_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Resources";
+ LOCALIZED_RESOURCES_FOLDER_PATH = "$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/$(DEVELOPMENT_LANGUAGE).lproj";
+ DOCUMENTATION_FOLDER_PATH = "$(LOCALIZED_RESOURCES_FOLDER_PATH)/Documentation";
+ PLUGINS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/PlugIns";
+ SCRIPTS_FOLDER_PATH = "$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/Scripts";
+ };
+ ProductReference = {
+ FileType = "wrapper.cfbundle";
+ Name = "$(WRAPPER_NAME)";
+ IsLaunchable = "NO";
+ };
+ }
+ {
+ Identifier = "com.apple.package-type.wrapper.application";
+ Type = "PackageType";
+ BasedOn = "com.apple.package-type.wrapper";
+ Name = "Application Wrapper";
+ DefaultBuildSettings = {
+ GENERATE_PKGINFO_FILE = "YES";
+ };
+ ProductReference = {
+ FileType = "wrapper.application";
+ Name = "$(WRAPPER_NAME)";
+ IsLaunchable = "YES";
+ };
+ }
];
# Based off of the MacOSX Product Types.xcpsec file. All
@@ -125,6 +173,39 @@ let
Name = "Dynamic Library";
PackageTypes = [ "com.apple.package-type.mach-o-dylib" ];
}
+ {
+ Type = "ProductType";
+ Identifier = "com.apple.product-type.bundle";
+ Name = "Bundle";
+ DefaultBuildProperties = {
+ FULL_PRODUCT_NAME = "$(WRAPPER_NAME)";
+ MACH_O_TYPE = "mh_bundle";
+ WRAPPER_PREFIX = "";
+ WRAPPER_SUFFIX = ".$(WRAPPER_EXTENSION)";
+ WRAPPER_EXTENSION = "bundle";
+ WRAPPER_NAME = "$(WRAPPER_PREFIX)$(PRODUCT_NAME)$(WRAPPER_SUFFIX)";
+ FRAMEWORK_FLAG_PREFIX = "-framework";
+ LIBRARY_FLAG_PREFIX = "-l";
+ LIBRARY_FLAG_NOSPACE = "YES";
+ STRIP_STYLE = "non-global";
+ };
+ PackageTypes = [ "com.apple.package-type.wrapper" ];
+ IsWrapper = "YES";
+ HasInfoPlist = "YES";
+ HasInfoPlistStrings = "YES";
+ }
+ {
+ Identifier = "com.apple.product-type.application";
+ Type = "ProductType";
+ BasedOn = "com.apple.product-type.bundle";
+ Name = "Application";
+ DefaultBuildProperties = {
+ MACH_O_TYPE = "mh_execute";
+ WRAPPER_SUFFIX = ".$(WRAPPER_EXTENSION)";
+ WRAPPER_EXTENSION = "app";
+ };
+ PackageTypes = [ "com.apple.package-type.wrapper.application" ];
+ }
];
in
diff --git a/pkgs/development/tools/xcbuild/toolchain.nix b/pkgs/development/tools/xcbuild/toolchain.nix
index 4313f0051473..9e34360909f9 100644
--- a/pkgs/development/tools/xcbuild/toolchain.nix
+++ b/pkgs/development/tools/xcbuild/toolchain.nix
@@ -1,6 +1,7 @@
{stdenv, writeText, toolchainName, xcbuild, fetchurl
, llvm, cctools, gcc, bootstrap_cmds, binutils
-, yacc, flex, m4, unifdef, gperf, indent, ctags, makeWrapper}:
+, yacc, flex, m4, unifdef, gperf, indent, ctags, makeWrapper
+, xib2nib}:
let
@@ -89,6 +90,8 @@ stdenv.mkDerivation {
ln -s ${cctools}/bin/pagestuff
ln -s ${cctools}/bin/ranlib
ln -s ${cctools}/bin/redo_prebinding
+
+ ln -s ${xib2nib}/bin/ibtool
'' +
# No point including the entire gcc closure if we don't already have it
(if stdenv.cc.isClang then ''
diff --git a/pkgs/development/tools/xib2nib/default.nix b/pkgs/development/tools/xib2nib/default.nix
new file mode 100644
index 000000000000..d585a35b0bc5
--- /dev/null
+++ b/pkgs/development/tools/xib2nib/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, callPackage, fetchFromGitHub, pugixml, boost, PlistCpp }:
+
+stdenv.mkDerivation {
+ name = "xib2nib-730e177";
+
+ src = fetchFromGitHub {
+ owner = "matthewbauer";
+ repo = "xib2nib";
+ rev = "97c6a53aab83d919805efcae33cf80690e953d1e";
+ sha256 = "08442f4xg7racknj35nr56a4c62gvdgdw55pssbkn2qq0rfzziqq";
+ };
+
+ buildInputs = [ PlistCpp pugixml boost ];
+ makeFlags = [ "PREFIX=$(out)" ];
+
+ meta = with stdenv.lib; {
+ maintainers = with maintainers; [ matthewbauer ];
+ description = "Compiles CocoaTouch .xib files into .nib";
+ license = licenses.mit;
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 90559742057f..f818962b8ae0 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -647,11 +647,11 @@ rec {
};
vim-elixir = buildVimPluginFrom2Nix { # created by nix#NixDerivation
- name = "vim-elixir-2017-03-29";
+ name = "vim-elixir-2017-04-13";
src = fetchgit {
url = "https://github.com/elixir-lang/vim-elixir";
- rev = "9482415ab27fddf8125524f54d9e500bb9541756";
- sha256 = "1layanqayf2arg8cvpsx768p544znwsvwispnk01d0c73d2p5llq";
+ rev = "8781ff7c675d0cbfb4859f91698365c2eecf3205";
+ sha256 = "0990qbzs2cn3k07xrn4xcczl7kpapygpa0ypkwpgxamyk0lgjlr8";
};
dependencies = [];
diff --git a/pkgs/os-specific/darwin/install_name_tool/default.nix b/pkgs/os-specific/darwin/install_name_tool/default.nix
deleted file mode 100644
index 581eb31cc71c..000000000000
--- a/pkgs/os-specific/darwin/install_name_tool/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv }:
-
-assert stdenv.isDarwin;
-
-stdenv.mkDerivation {
- name = "install_name_tool";
- src = "/usr/bin/install_name_tool";
-
- unpackPhase = "true";
- dontBuild = true;
-
- installPhase = ''
- mkdir -p "$out"/bin
- ln -s "$src" "$out"/bin
- '';
-
- meta = with stdenv.lib; {
- description = "Change dynamic shared library install names";
- homepage = https://developer.apple.com/library/mac/documentation/Darwin/Reference/Manpages/man1/install_name_tool.1.html;
- maintainers = with maintainers; [ lovek323 ];
- platforms = platforms.darwin;
-
- longDescription = ''
- Install_name_tool changes the dynamic shared library install names and or
- adds, changes or deletes the rpaths recorded in a Mach-O binary.
- '';
- };
-}
-
diff --git a/pkgs/os-specific/linux/blcr/default.nix b/pkgs/os-specific/linux/blcr/default.nix
index c2e3fa4b9e1f..ab1a93b3a703 100644
--- a/pkgs/os-specific/linux/blcr/default.nix
+++ b/pkgs/os-specific/linux/blcr/default.nix
@@ -1,14 +1,10 @@
{ stdenv, lib, fetchurl, kernel, perl, makeWrapper }:
-# BLCR 0.8.5 should works for kernel version up to 3.7.1
-# BLCR 0.8.6 should works for kernel version up to 3.17.x
+# BLCR version 0.8.6 should works with linux kernel up to version 3.17.x
assert stdenv.isLinux;
assert builtins.compareVersions "3.18" kernel.version == 1;
-# it doesn't compile anymore on 3.12
-assert lib.versionAtLeast kernel.version "3.14";
-
stdenv.mkDerivation {
name = "blcr_${kernel.version}-0.8.6pre4";
diff --git a/pkgs/os-specific/linux/kernel/linux-4.10.nix b/pkgs/os-specific/linux/kernel/linux-4.10.nix
index 252eb2498cc8..e24cb7ae38b5 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.10.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
- version = "4.10.9";
+ version = "4.10.10";
extraMeta.branch = "4.10";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "1y8cpwhkcb8lsryiyqqr1w58snw26x3x6c4f9v1xnh9grz0s4j6h";
+ sha256 = "0hbzbzykay1yyrqz06lx9rwhf1xzzjs21i561gi4fjkm1bazv8l4";
};
kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index 718c76b8dfa1..c059a7708184 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.60";
+ version = "4.4.61";
extraMeta.branch = "4.4";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "18r0m991q62gy5i7gkkpyhz65h2d9z4x9qpys5f2i78smq2yk67f";
+ sha256 = "1nii9a6sp6lfkj94m2ia8vzb5kmk0r4nzsm4xf283b8m8qbfgpih";
};
kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index 6e36ab81aa53..ff022201c8b6 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
- version = "4.9.21";
+ version = "4.9.22";
extraMeta.branch = "4.9";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "093cbrzdpj9f3ddxh2p1n05lrrs8yc6hh9jibbjv75vrpx4kfl4p";
+ sha256 = "0sh3p14y50f14m4m5pz2nvr48xgk8qr8zdhzgxi1143af1c1rnyv";
};
kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix
index 7df48850fd12..779a80208d15 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.9.21";
+ version = "4.9.22";
extraMeta.branch = "4.9";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha512 = "1l1m23qdcz4pqnawq2xxiw8pwapgf84ggvb16696qfsh36dhwr62hmg0k5vip2c7yp74dls2gw9qcwhgv9dp7ki74xhzbhpv3148fjd";
+ sha512 = "1hnbadbfvsqsdp7rd1zy07wi3wvryfr0cibk7jq0f35zfkpf4qyry9l1p28kca64p6zg2qb2arnr2p2qgbpx8dzsnwq6q072qddq4hg";
};
kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 0a3b51a4e6e9..2f0073ef25fa 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -100,9 +100,9 @@ rec {
};
grsecurity_testing = grsecPatch
- { kver = "4.9.21";
- grrev = "201704091948";
- sha512 = "1pa9vchnii319w3jarp4aclyjpwpk2s3ddi9facvy0r148xxqsl30hk2l0ihb9wwr9pz5a8l2z85skkkp65hpaz6fr9wmy9d1lb1hwh";
+ { kver = "4.9.22";
+ grrev = "201704120836";
+ sha512 = "3320r4myn9y5wf2i2aybl1aapcl9sms0z6p343xh5x0pvaphsjhksnh7cndrq0qxc7fqdwzh9nw1vf84qy02cg5nf8bq025jpkfp7qh";
};
# This patch relaxes grsec constraints on the location of usermode helpers,
diff --git a/pkgs/servers/cayley/default.nix b/pkgs/servers/cayley/default.nix
new file mode 100644
index 000000000000..9249d7cc347d
--- /dev/null
+++ b/pkgs/servers/cayley/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+ name = "cayley-${version}";
+ version = "0.6.1";
+
+ goPackagePath = "github.com/cayleygraph/cayley";
+
+ src = fetchFromGitHub {
+ owner = "cayleygraph";
+ repo = "cayley";
+ rev = "v${version}";
+ sha256 = "1r0kw3y32bqm7g37svzrch2qj9n45p93xmsrf7dj1cg4wwkb65ry";
+ };
+
+ goDeps = ./deps.nix;
+
+ buildFlagsArray = ''
+ -ldflags=
+ -X=main.Version=${version}
+ '';
+
+ meta = {
+ homepage = "https://cayley.io/";
+ description = "A graph database inspired by Freebase and Knowledge Graph";
+ maintainers = with stdenv.lib.maintainers; [ sigma ];
+ license = stdenv.lib.licenses.asl20;
+ platforms = stdenv.lib.platforms.unix;
+ };
+}
diff --git a/pkgs/servers/cayley/deps.nix b/pkgs/servers/cayley/deps.nix
new file mode 100644
index 000000000000..1e6fadf9f4d8
--- /dev/null
+++ b/pkgs/servers/cayley/deps.nix
@@ -0,0 +1,272 @@
+[
+ {
+ goPackagePath = "github.com/badgerodon/peg";
+ fetch = {
+ type = "git";
+ url = "https://github.com/badgerodon/peg";
+ rev = "9e5f7f4d07ca576562618c23e8abadda278b684f";
+ sha256 = "12vd7hzdgknn8byz77lmvcrz9m5lvmffdnz2wwk83304przkra11";
+ };
+ }
+ {
+ goPackagePath = "github.com/boltdb/bolt";
+ fetch = {
+ type = "git";
+ url = "https://github.com/boltdb/bolt";
+ rev = "a705895fdad108f053eae7ee011ed94a0541ee13";
+ sha256 = "0ql67l2hmjhplkl80j9a49qlra4qx671il5rgn58afkvk20cgq2r";
+ };
+ }
+ {
+ goPackagePath = "github.com/cznic/mathutil";
+ fetch = {
+ type = "git";
+ url = "https://github.com/cznic/mathutil";
+ rev = "f9551431b78e71ee24939a1e9d8f49f43898b5cd";
+ sha256 = "1158mlwzryyna1qslr9v88i0k8x6m8vs4rljnnwh04rmd63ksj75";
+ };
+ }
+ {
+ goPackagePath = "github.com/davecgh/go-spew";
+ fetch = {
+ type = "git";
+ url = "https://github.com/davecgh/go-spew";
+ rev = "2df174808ee097f90d259e432cc04442cf60be21";
+ sha256 = "0jghd5dmwqpcjbxij9yjj8sjzll9s65i2qnxd8rdzwh77xdsfm9g";
+ };
+ }
+ {
+ goPackagePath = "github.com/dlclark/regexp2";
+ fetch = {
+ type = "git";
+ url = "https://github.com/dlclark/regexp2";
+ rev = "4009c9dc49dd8906bfd4d479c255470d6a477ce5";
+ sha256 = "1r6f0q1jvn1lkwqlrmmg5d90p6zss8s64jyp91hp6i97vpahq8xz";
+ };
+ }
+ {
+ goPackagePath = "github.com/dop251/goja";
+ fetch = {
+ type = "git";
+ url = "https://github.com/dop251/goja";
+ rev = "64f863c4eb0329df18ecd1dab1e03609556bfaca";
+ sha256 = "0smipfs7fja286nvlr7q4b8f815br0nia0k4xp8y5fvprrzrm64h";
+ };
+ }
+ {
+ goPackagePath = "github.com/gogo/protobuf";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gogo/protobuf";
+ rev = "50d1bd39ce4e7a96b75e3e040be9caf79dbb4c61";
+ sha256 = "09cad9j98pdqh1sp191j92ng6lvw9la3k3v6m5mv38nwirpwzra1";
+ };
+ }
+ {
+ goPackagePath = "github.com/golang/glog";
+ fetch = {
+ type = "git";
+ url = "https://github.com/golang/glog";
+ rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998";
+ sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30";
+ };
+ }
+ {
+ goPackagePath = "github.com/golang/protobuf";
+ fetch = {
+ type = "git";
+ url = "https://github.com/golang/protobuf";
+ rev = "888eb0692c857ec880338addf316bd662d5e630e";
+ sha256 = "1vhx2dwr71hma9z3dfb3l1yrkjlry0glwxknxzyp9ds51i6pjiq0";
+ };
+ }
+ {
+ goPackagePath = "github.com/hashicorp/go-cleanhttp";
+ fetch = {
+ type = "git";
+ url = "https://github.com/hashicorp/go-cleanhttp";
+ rev = "ad28ea4487f05916463e2423a55166280e8254b5";
+ sha256 = "0xw0qas3ixg8p2xh09hhc81km0mfn9lbnfgrdb309hzcwhmiyqjm";
+ };
+ }
+ {
+ goPackagePath = "github.com/julienschmidt/httprouter";
+ fetch = {
+ type = "git";
+ url = "https://github.com/julienschmidt/httprouter";
+ rev = "b59a38004596b696aca7aa2adccfa68760864d86";
+ sha256 = "0j1w2fkcghyw3lcsc13lwf2zqar9xyni2g7fqp4aq8g08ii7paac";
+ };
+ }
+ {
+ goPackagePath = "github.com/lib/pq";
+ fetch = {
+ type = "git";
+ url = "https://github.com/lib/pq";
+ rev = "0dad96c0b94f8dee039aa40467f767467392a0af";
+ sha256 = "06c38iy37251mh8jy9s8n97b01pjnqpq8ii77nnmqh1dsph37jz4";
+ };
+ }
+ {
+ goPackagePath = "github.com/linkeddata/gojsonld";
+ fetch = {
+ type = "git";
+ url = "https://github.com/linkeddata/gojsonld";
+ rev = "a223ef39bb925d36d4c410d3e35b0e34e370cc31";
+ sha256 = "1i3vl7gbkq2xl2wyv0kszj0x32vp8jw1cf0ngpdqdhdvnbfi1w7i";
+ };
+ }
+ {
+ goPackagePath = "github.com/pborman/uuid";
+ fetch = {
+ type = "git";
+ url = "https://github.com/pborman/uuid";
+ rev = "ca53cad383cad2479bbba7f7a1a05797ec1386e4";
+ sha256 = "0rcx669bbjkkwdlw81spnra4ffgzd4rbpywnrj3w41m9vq6mk1gn";
+ };
+ }
+ {
+ goPackagePath = "github.com/peterh/liner";
+ fetch = {
+ type = "git";
+ url = "https://github.com/peterh/liner";
+ rev = "1bb0d1c1a25ed393d8feb09bab039b2b1b1fbced";
+ sha256 = "05ihxpmp6x3hw71xzvjdgxnyvyx2s4lf23xqnfjj16s4j4qidc48";
+ };
+ }
+ {
+ goPackagePath = "github.com/pmezard/go-difflib";
+ fetch = {
+ type = "git";
+ url = "https://github.com/pmezard/go-difflib";
+ rev = "d8ed2627bdf02c080bf22230dbb337003b7aba2d";
+ sha256 = "0w1jp4k4zbnrxh3jvh8fgbjgqpf2hg31pbj8fb32kh26px9ldpbs";
+ };
+ }
+ {
+ goPackagePath = "github.com/robertkrimen/otto";
+ fetch = {
+ type = "git";
+ url = "https://github.com/robertkrimen/otto";
+ rev = "d1b4d8ef0e0e4b088c8328c95ca63ab9ebd8fc9d";
+ sha256 = "0i31p3paz3n7qi2v1g77lm3cx2hssgwgcfpar4qc2vj7m4766884";
+ };
+ }
+ {
+ goPackagePath = "github.com/russross/blackfriday";
+ fetch = {
+ type = "git";
+ url = "https://github.com/russross/blackfriday";
+ rev = "17bb7999de6cfb791d4f8986cc00b3309b370cdb";
+ sha256 = "1md0sjw69mj359cb4c8ghzllcbn2lnkvby1203wl0pf5wbyfvm5s";
+ };
+ }
+ {
+ goPackagePath = "github.com/shurcooL/sanitized_anchor_name";
+ fetch = {
+ type = "git";
+ url = "https://github.com/shurcooL/sanitized_anchor_name";
+ rev = "8e87604bec3c645a4eeaee97dfec9f25811ff20d";
+ sha256 = "05b6yj23c3xx446kanhaj1l83av8676z7si8n1f4sqy2pp7s966v";
+ };
+ }
+ {
+ goPackagePath = "github.com/sirupsen/logrus";
+ fetch = {
+ type = "git";
+ url = "https://github.com/sirupsen/logrus";
+ rev = "08a8a7c27e3d058a8989316a850daad1c10bf4ab";
+ sha256 = "1fbh1b42alvpbw87v0v2hanliaqp6fm4h9n7byk921mcv6dai8fl";
+ };
+ }
+ {
+ goPackagePath = "github.com/stretchr/testify";
+ fetch = {
+ type = "git";
+ url = "https://github.com/stretchr/testify";
+ rev = "f390dcf405f7b83c997eac1b06768bb9f44dec18";
+ sha256 = "1l3z0ggdcjspfmm6k9glmh52a9x50806k6yldxql73p4bpynsd9g";
+ };
+ }
+ {
+ goPackagePath = "github.com/syndtr/goleveldb";
+ fetch = {
+ type = "git";
+ url = "https://github.com/syndtr/goleveldb";
+ rev = "4875955338b0a434238a31165cb87255ab6e9e4a";
+ sha256 = "0786j6kizrlskqz196ng4d13363d44whl849jcv1q07yab2nq40i";
+ };
+ }
+ {
+ goPackagePath = "github.com/syndtr/gosnappy";
+ fetch = {
+ type = "git";
+ url = "https://github.com/syndtr/gosnappy";
+ rev = "156a073208e131d7d2e212cb749feae7c339e846";
+ sha256 = "08lf8smnp4imj5fkph9sbqzb4a5n191q9m6b2c5kamp19i9h2y6z";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/net";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/net";
+ rev = "6a513affb38dc9788b449d59ffed099b8de18fa0";
+ sha256 = "1g07c05s3ccq0086f0f200k9cfjjzxd4r9nrdilkmy44lbhhrval";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/sys";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/sys";
+ rev = "a646d33e2ee3172a661fc09bca23bb4889a41bc8";
+ sha256 = "1jniqg2nv5zhdzfm9gwfx0s9q8mwxrgcxdbkd6cddk9w0qgji9dc";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/text";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/text";
+ rev = "5a42fa2464759cbb7ee0af9de00b54d69f09a29c";
+ sha256 = "0far6mb2ikwzr7icn0yqi9ygl8kv2wsaasyprbqb9qapr0dqjw0s";
+ };
+ }
+ {
+ goPackagePath = "google.golang.org/appengine";
+ fetch = {
+ type = "git";
+ url = "https://github.com/golang/appengine";
+ rev = "4f7eeb5305a4ba1966344836ba4af9996b7b4e05";
+ sha256 = "09pgvlk5ay3f0avi1bawpy8khi3rmkfl36l2yr3ryp8z12i9k2qj";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/mgo.v2";
+ fetch = {
+ type = "git";
+ url = "https://gopkg.in/mgo.v2";
+ rev = "c6a7dce14133ccac2dcac3793f1d6e2ef048503a";
+ sha256 = "0rg232q1bkq3y3kd5816hgk1jpf7i38aha5q5ia7j6p9xashz7vj";
+ };
+ }
+ {
+ goPackagePath = "github.com/go-sql-driver/mysql";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-sql-driver/mysql";
+ rev = "2e00b5cd70399450106cec6431c2e2ce3cae5034";
+ sha256 = "085g48jq9hzmlcxg122n0c4pi41sc1nn2qpx1vrl2jfa8crsppa5";
+ };
+ }
+ {
+ goPackagePath = "github.com/dennwc/graphql";
+ fetch = {
+ type = "git";
+ url = "https://github.com/dennwc/graphql";
+ rev = "fd5c4aa13f2119414084f229600de0d73f174436";
+ sha256 = "11f9jwfc2j646732gkcjb332ih9fxh04j31zmhvqswx75gvk9wzs";
+ };
+ }
+]
diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix
index 9e0de290143f..f88b82675da2 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.2.10";
+ version = "3.2.12";
src = fetchurl {
url = "https://github.com/MediaBrowser/Emby/releases/download/${version}/Emby.Mono.zip";
- sha256 = "0qqqaxlmcy3nfygbfy1bjc188x8k461nckj1sxfvy6wiv6jjfc25";
+ sha256 = "0vbb7ax3100djz6zl8vji04a1x3r9vrrgkar605sc2w9n1j1msp2";
};
buildInputs = with pkgs; [
diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix
index a9f3d74e99cb..388c355c3f7f 100644
--- a/pkgs/servers/http/nginx/mainline.nix
+++ b/pkgs/servers/http/nginx/mainline.nix
@@ -1,6 +1,6 @@
{ callPackage, ... }@args:
callPackage ./generic.nix (args // {
- version = "1.11.10";
- sha256 = "0gak6pcsn1m8fsz0g95z4b72nn12ivy35vlxrmagfcvnn2mkr2vp";
+ version = "1.11.13";
+ sha256 = "1lqm2ixld5b55s4i1yy5337c6ifp7jzjfsm51z49hagdz0g602rn";
})
diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
index 2d5ad9e2742c..85ebb5a80431 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -24,13 +24,13 @@ let
};
in pythonPackages.buildPythonApplication rec {
name = "matrix-synapse-${version}";
- version = "0.19.3";
+ version = "0.20.0";
src = fetchFromGitHub {
owner = "matrix-org";
repo = "synapse";
rev = "v${version}";
- sha256 = "0dnlv2rgda94zlgwkpryjsypcf995l7zdp19d2xiq7zpd13x6yag";
+ sha256 = "1ss89dd4xn80y0zafs6dc9c24ba1kxk20jhjvqbcbbng6mlynj9h";
};
patches = [ ./matrix-synapse.patch ];
@@ -41,6 +41,7 @@ in pythonPackages.buildPythonApplication rec {
signedjson systemd twisted ujson unpaddedbase64 pyyaml
matrix-angular-sdk bleach netaddr jinja2 psycopg2
psutil msgpack lxml matrix-synapse-ldap3
+ phonenumbers jsonschema
];
# Checks fail because of Tox.
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
index 1a762bd87c79..613edfafd954 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
@@ -221,8 +221,7 @@ rec {
# GCC has certain things built in statically. See
# pkgs/stdenv/linux/default.nix for the details.
cp -d ${isl}/lib/libisl*.so* $out/lib
- # Also this is needed since bzip2 uses a custom build system
- # for native builds but autoconf (via a patch) for cross builds
+
cp -d ${bzip2.out}/lib/libbz2.so* $out/lib
# Copy binutils.
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index 42015a79a3e0..2ce73eb781d8 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -122,6 +122,8 @@ rec {
cp -d ${zlib.out}/lib/libz.so* $out/lib
cp -d ${libelf}/lib/libelf.so* $out/lib
+ cp -d ${bzip2.out}/lib/libbz2.so* $out/lib
+
# Copy binutils.
for i in as ld ar ranlib nm strip readelf objdump; do
cp ${binutils.out}/bin/$i $out/bin
diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix
index 7c410a1a4f4f..67bbb510b13d 100644
--- a/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -7,23 +7,23 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" || stden
stdenv.mkDerivation rec {
name = "google-cloud-sdk-${version}";
- version = "150.0.0";
+ version = "151.0.0";
src =
if stdenv.system == "i686-linux" then
fetchurl {
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86.tar.gz";
- sha256 = "0zg6jnn93dq53glds4cghksyghb4d4z0i2h38na0r88mr8hzmx1l";
+ sha256 = "1d1h6jiqs3grsb6c61v6dkb4l2qv6v8g7wbzgaqkmn09xdbaq40l";
}
else if stdenv.system == "x86_64-darwin" then
fetchurl {
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-darwin-x86_64.tar.gz";
- sha256 = "1vbc360z2da3blwx51asw7jh0v0v6wsrv20z36yq0hccmljlh24w";
+ sha256 = "05idf0g505s8diaz28ij9yqig2wwn43lyppfs483m7vnx5hk62j5";
}
else
fetchurl {
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86_64.tar.gz";
- sha256 = "1q66aap3qidfsa8gm13jff3dprx8qarhjkx5ib65439fy4zj0bca";
+ sha256 = "01hf7pp1v57dxx6f2pz7j13fjdnrfp7gjmzjdlhlx4rnvxrd6i3f";
};
buildInputs = [python27 makeWrapper];
diff --git a/pkgs/tools/filesystems/bonnie/bonnie-homebrew.patch b/pkgs/tools/filesystems/bonnie/bonnie-homebrew.patch
deleted file mode 100644
index aba80e7938dd..000000000000
--- a/pkgs/tools/filesystems/bonnie/bonnie-homebrew.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-Derivied from a patch distributed with the Homebrew formula:
-https://github.com/Homebrew/homebrew-core/blob/6ae11ea82c00dc8c11297ecc3f06bc33979862d8/Formula/bonnie++.rb
-
-
-Copyright 2009-2016 Homebrew contributors.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-# Changes included in this patchset:
-# 3) Remove the #ifdef _LARGEFILE64_SOURCE macros which not only prohibits the intended functionality of
-# splitting into 2 GB files for such filesystems but also incorrectly tests for it in the first place.
-# The ideal fix would be to replace the AC_TRY_RUN() in configure.in if the fail code actually worked.
-# Files affected: bonnie++.cp
-
-diff --git i/bonnie++.cpp w/bonnie++.cpp
-index 8c5a43a..8a4b3dc 100644
---- i/bonnie++.cpp
-+++ w/bonnie++.cpp
-@@ -294,11 +294,7 @@ int main(int argc, char *argv[])
- {
- char *sbuf = _strdup(optarg);
- char *size = strtok(sbuf, ":");
--#ifdef _LARGEFILE64_SOURCE
- file_size = size_from_str(size, "gt");
--#else
-- file_size = size_from_str(size, "g");
--#endif
- size = strtok(NULL, "");
- if(size)
- {
-@@ -384,15 +380,6 @@ int main(int argc, char *argv[])
- if(file_size % 1024 > 512)
- file_size = file_size + 1024 - (file_size % 1024);
- }
--#ifndef _LARGEFILE64_SOURCE
-- if(file_size == 2048)
-- file_size = 2047;
-- if(file_size > 2048)
-- {
-- fprintf(stderr, "Large File Support not present, can't do %dM.\n", file_size);
-- usage();
-- }
--#endif
- globals.byte_io_size = min(file_size, globals.byte_io_size);
- globals.byte_io_size = max(0, globals.byte_io_size);
-
-@@ -465,14 +452,6 @@ int main(int argc, char *argv[])
- && (directory_max_size < directory_min_size || directory_max_size < 0
- || directory_min_size < 0) )
- usage();
--#ifndef _LARGEFILE64_SOURCE
-- if(file_size > (1 << (31 - 20 + globals.io_chunk_bits)) )
-- {
-- fprintf(stderr
-- , "The small chunk size and large IO size make this test impossible in 32bit.\n");
-- usage();
-- }
--#endif
- if(file_size && globals.ram && (file_size * concurrency) < (globals.ram * 2) )
- {
- fprintf(stderr
diff --git a/pkgs/tools/filesystems/bonnie/default.nix b/pkgs/tools/filesystems/bonnie/default.nix
index 65a722c74084..c120073866d4 100644
--- a/pkgs/tools/filesystems/bonnie/default.nix
+++ b/pkgs/tools/filesystems/bonnie/default.nix
@@ -7,8 +7,6 @@ stdenv.mkDerivation rec {
sha256 = "0vkl42rsrsy95fc1ykc6g8rsdbnpxayvdaihnnkly1fww1m3hyz2";
};
- patches = stdenv.lib.optional stdenv.isDarwin ./bonnie-homebrew.patch;
-
enableParallelBuilding = true;
meta = {
diff --git a/pkgs/tools/graphics/icoutils/default.nix b/pkgs/tools/graphics/icoutils/default.nix
index 70f9e29d0f5d..8b26f4ce3c83 100644
--- a/pkgs/tools/graphics/icoutils/default.nix
+++ b/pkgs/tools/graphics/icoutils/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, libpng, perl, perlPackages, makeWrapper }:
stdenv.mkDerivation rec {
- name = "icoutils-0.31.1";
+ name = "icoutils-0.31.3";
src = fetchurl {
url = "mirror://savannah/icoutils/${name}.tar.bz2";
- sha256 = "14rhd7p7v0rvxsfnrgxf5l4rl6n52h2aq09583glqpgjg0y9vqi6";
+ sha256 = "d4651de8e3f9e28d24b5343a2b7564f49754e5fe7d211c5d4dd60dcd65c8a152";
};
buildInputs = [ makeWrapper libpng perl ];
diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index 1c66900c06b7..0bcb0baaab8b 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, zlib, openssl, perl, libedit, pkgconfig, pam
+{ stdenv, fetchurl, fetchpatch, zlib, openssl, perl, libedit, pkgconfig, pam, autoreconfHook
, etcDir ? null
, hpnSupport ? false
, withKerberos ? false
@@ -12,17 +12,12 @@ assert withGssapiPatches -> withKerberos;
let
- hpnSrc = fetchurl {
- url = mirror://sourceforge/hpnssh/openssh-6.6p1-hpnssh14v5.diff.gz;
- sha256 = "682b4a6880d224ee0b7447241b684330b731018585f1ba519f46660c10d63950";
- };
-
# **please** update this patch when you update to a new openssh release.
gssapiSrc = fetchpatch {
name = "openssh-gssapi.patch";
url = "https://anonscm.debian.org/cgit/pkg-ssh/openssh.git/plain/debian"
- + "/patches/gssapi.patch?id=255b8554a50b5c75fca63f76b1ac837c0d4fb7aa";
- sha256 = "0yg9iq7vb2fkvy36ar0jxk29pkw0h3dhv5vn8qncc3pgwx3617n2";
+ + "/patches/gssapi.patch?id=a18d56bd84f04292ec9178b4b17ef6d56a0c7aef";
+ sha256 = "1sb929lfc3s45km2vpylmlbb6mpqcbr74xl6gx2s4cgnsrfd9kp3";
};
in
@@ -31,18 +26,18 @@ stdenv.mkDerivation rec {
# Please ensure that openssh_with_kerberos still builds when
# bumping the version here!
name = "openssh-${version}";
- version = "7.4p1";
+ version = "7.5p1";
- src = fetchurl {
- url = "mirror://openbsd/OpenSSH/portable/${name}.tar.gz";
- sha256 = "1l8r3x4fr2kb6xm95s7kjdif1wp6f94d4kljh4qjj9109shw87qv";
- };
-
- prePatch = optionalString hpnSupport
- ''
- gunzip -c ${hpnSrc} | patch -p1
- export NIX_LDFLAGS="$NIX_LDFLAGS -lgcc_s"
- '';
+ src = if hpnSupport then
+ fetchurl {
+ url = "https://github.com/rapier1/openssh-portable/archive/hpn-KitchenSink-7_5_P1.tar.gz";
+ sha256 = "1hasdcfjl6xf5nbbbvqyyq5v7ad10nywrq89j7naxz9wln58nhnn";
+ }
+ else
+ fetchurl {
+ url = "mirror://openbsd/OpenSSH/portable/${name}.tar.gz";
+ sha256 = "1w7rb5gbrikxdkp8w7zxnci4549gk4bw1lml01s59w5rzb2y6ilq";
+ };
patches =
[
@@ -55,7 +50,8 @@ stdenv.mkDerivation rec {
++ optional withGssapiPatches gssapiSrc;
buildInputs = [ zlib openssl libedit pkgconfig pam ]
- ++ optional withKerberos kerberos;
+ ++ optional withKerberos kerberos
+ ++ optional hpnSupport autoreconfHook;
# I set --disable-strip because later we strip anyway. And it fails to strip
# properly when cross building.
@@ -94,6 +90,5 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.bsd2;
platforms = platforms.unix;
maintainers = with maintainers; [ eelco aneeshusa ];
- broken = hpnSupport; # probably after 6.7 update
};
}
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 93463509b791..629c9b685360 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -16,7 +16,8 @@ let
outputs = [ "out" "dev" "man" "doc" ];
nativeBuildInputs =
- [ perl pkgconfig ]
+ [ pkgconfig ]
+ ++ lib.optionals (!lib.versionAtLeast version "1.12pre") [ perl ]
++ lib.optionals fromGit [ autoreconfHook autoconf-archive bison flex libxml2 libxslt docbook5 docbook5_xsl ];
buildInputs = [ curl openssl sqlite xz ]
@@ -43,12 +44,12 @@ let
[ "--with-store-dir=${storeDir}"
"--localstatedir=${stateDir}"
"--sysconfdir=/etc"
- "--with-dbi=${perlPackages.DBI}/${perl.libPrefix}"
- "--with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix}"
"--disable-init-state"
"--enable-gc"
]
- ++ lib.optional (!lib.versionAtLeast version "1.12pre") [
+ ++ lib.optionals (!lib.versionAtLeast version "1.12pre") [
+ "--with-dbi=${perlPackages.DBI}/${perl.libPrefix}"
+ "--with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix}"
"--with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix}"
];
@@ -97,13 +98,33 @@ let
maintainers = [ stdenv.lib.maintainers.eelco ];
platforms = stdenv.lib.platforms.all;
};
+
+ passthru = { inherit fromGit; };
+ };
+
+ perl-bindings = { nix }: stdenv.mkDerivation {
+ name = "nix-perl-" + nix.version;
+
+ inherit (nix) src;
+
+ postUnpack = "sourceRoot=$sourceRoot/perl";
+
+ nativeBuildInputs =
+ [ perl pkgconfig curl nix libsodium ]
+ ++ lib.optionals nix.fromGit [ autoreconfHook autoconf-archive ];
+
+ configureFlags =
+ [ "--with-dbi=${perlPackages.DBI}/${perl.libPrefix}"
+ "--with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix}"
+ "--with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix}"
+ ];
};
in rec {
nix = nixStable;
- nixStable = common rec {
+ nixStable = (common rec {
name = "nix-1.11.8";
src = fetchurl {
url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
@@ -117,18 +138,18 @@ in rec {
--replace 'std::less, gc_allocator' \
'std::less, gc_allocator >'
'';
- };
+ }) // { perl-bindings = nixStable; };
- nixUnstable = lib.lowPrio (common rec {
+ nixUnstable = (lib.lowPrio (common rec {
name = "nix-1.12${suffix}";
- suffix = "pre5122_c60715e";
+ suffix = "pre5152_915f62fa";
src = fetchFromGitHub {
owner = "NixOS";
repo = "nix";
- rev = "c60715e937e3773bbb8a114fc9b9c6577f8c5cb5";
- sha256 = "0hkc4g7i3z06y3rsdxqzdnx5rz77jb8ij1j13bdskbvpp7vfm60p";
+ rev = "915f62fa19790d8f826aeb4dd3d2bb5bde2f67e9";
+ sha256 = "0mf7y7hvzw2x5dp482qy8774djr3vzcjaqq58cp82zdil8l7kwjd";
};
fromGit = true;
- });
+ })) // { perl-bindings = perl-bindings { nix = nixUnstable; }; };
}
diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix
index 62f1a3a05dd0..83394d984ad7 100644
--- a/pkgs/tools/security/pass/default.nix
+++ b/pkgs/tools/security/pass/default.nix
@@ -21,7 +21,8 @@ stdenv.mkDerivation rec {
sha256 = "002mw7j0m33bw483rllzhcf41wp3ixka8yma6kqrfaj57jyw66hn";
};
- patches = stdenv.lib.optional stdenv.isDarwin ./no-darwin-getopt.patch;
+ patches = [ ./set-correct-program-name-for-sleep.patch
+ ] ++ stdenv.lib.optional stdenv.isDarwin ./no-darwin-getopt.patch;
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/security/pass/set-correct-program-name-for-sleep.patch b/pkgs/tools/security/pass/set-correct-program-name-for-sleep.patch
new file mode 100644
index 000000000000..782e06e20fd9
--- /dev/null
+++ b/pkgs/tools/security/pass/set-correct-program-name-for-sleep.patch
@@ -0,0 +1,69 @@
+From 25b44e00ed5df8ffe2782d38ad5cd9f514379599 Mon Sep 17 00:00:00 2001
+From: "Andrew R. M"
+Date: Sat, 8 Apr 2017 13:50:01 -0400
+Subject: [PATCH] Patch the clip() function to work even when using
+ single-binary coreutils
+
+---
+ src/password-store.sh | 4 ++--
+ src/platform/cygwin.sh | 4 ++--
+ src/platform/darwin.sh | 4 ++--
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/password-store.sh b/src/password-store.sh
+index 6a4172d..4dbd6b8 100755
+--- a/src/password-store.sh
++++ b/src/password-store.sh
+@@ -155,11 +155,11 @@ clip() {
+ # variable. Specifically, it cannot store nulls nor (non-trivally) store
+ # trailing new lines.
+ local sleep_argv0="password store sleep on display $DISPLAY"
+- pkill -f "^$sleep_argv0" 2>/dev/null && sleep 0.5
++ pkill -P $(pgrep -f "^$sleep_argv0") 2>/dev/null && sleep 0.5
+ local before="$(xclip -o -selection "$X_SELECTION" 2>/dev/null | base64)"
+ echo -n "$1" | xclip -selection "$X_SELECTION" || die "Error: Could not copy data to the clipboard"
+ (
+- ( exec -a "$sleep_argv0" bash <<<"trap 'kill %1' TERM; sleep '$CLIP_TIME' & wait" )
++ ( exec -a "$sleep_argv0" bash <(echo trap 'kill %1' TERM\; sleep "$CLIP_TIME & wait") )
+ local now="$(xclip -o -selection "$X_SELECTION" | base64)"
+ [[ $now != $(echo -n "$1" | base64) ]] && before="$now"
+
+diff --git a/src/platform/cygwin.sh b/src/platform/cygwin.sh
+index 6e5dd86..f3574c4 100644
+--- a/src/platform/cygwin.sh
++++ b/src/platform/cygwin.sh
+@@ -3,11 +3,11 @@
+
+ clip() {
+ local sleep_argv0="password store sleep on display $DISPLAY"
+- pkill -f "^$sleep_argv0" 2>/dev/null && sleep 0.5
++ pkill -P $(pgrep -f "^$sleep_argv0") 2>/dev/null && sleep 0.5
+ local before="$(base64 < /dev/clipboard)"
+ echo -n "$1" > /dev/clipboard
+ (
+- ( exec -a "$sleep_argv0" sleep "$CLIP_TIME" )
++ ( exec -a "$sleep_argv0" bash <(echo sleep "$CLIP_TIME") )
+ local now="$(base64 < /dev/clipboard)"
+ [[ $now != $(echo -n "$1" | base64) ]] && before="$now"
+ echo "$before" | base64 -d > /dev/clipboard
+diff --git a/src/platform/darwin.sh b/src/platform/darwin.sh
+index 86eb325..deb04c4 100644
+--- a/src/platform/darwin.sh
++++ b/src/platform/darwin.sh
+@@ -3,11 +3,11 @@
+
+ clip() {
+ local sleep_argv0="password store sleep for user $(id -u)"
+- pkill -f "^$sleep_argv0" 2>/dev/null && sleep 0.5
++ pkill -P $(pgrep -f "^$sleep_argv0") 2>/dev/null && sleep 0.5
+ local before="$(pbpaste | openssl base64)"
+ echo -n "$1" | pbcopy
+ (
+- ( exec -a "$sleep_argv0" sleep "$CLIP_TIME" )
++ ( exec -a "$sleep_argv0" bash <(echo sleep "$CLIP_TIME") )
+ local now="$(pbpaste | openssl base64)"
+ [[ $now != $(echo -n "$1" | openssl base64) ]] && before="$now"
+ echo "$before" | openssl base64 -d | pbcopy
+--
+2.12.2
+
diff --git a/pkgs/tools/security/pinentry-mac/default.nix b/pkgs/tools/security/pinentry-mac/default.nix
index 7116d1777d6d..4cba1c7e6172 100644
--- a/pkgs/tools/security/pinentry-mac/default.nix
+++ b/pkgs/tools/security/pinentry-mac/default.nix
@@ -1,20 +1,22 @@
-{ fetchurl, stdenv }:
+{ fetchurl, stdenv, fetchFromGitHub, xcbuild, libiconv, Cocoa, ncurses }:
stdenv.mkDerivation rec {
name = "pinentry-mac-0.9.4";
- src = fetchurl {
- url = "https://github.com/GPGTools/pinentry-mac/archive/v0.9.4.tar.gz";
- sha256 = "037ebb010377d3a3879ae2a832cefc4513f5c397d7d887d7b86b4e5d9a628271";
+ src = fetchFromGitHub {
+ owner = "matthewbauer";
+ repo = "pinentry-mac";
+ rev = "d60aa902644a1f0126ec50e79937423a3a7c3bc4";
+ sha256 = "0xp4rdyj0mw6gg1z1wraggb1qlkjb5845mibrz3nj0l692da52nq";
};
- postPatch = ''
- substituteInPlace ./Makefile --replace "xcodebuild" "/usr/bin/xcodebuild"
- '';
+ buildInputs = [ xcbuild libiconv Cocoa ncurses ];
+
+ dontUseXcbuild = true;
installPhase = ''
mkdir -p $out/Applications
- mv build/Release/pinentry-mac.app $out/Applications
+ mv pinentry-mac-*/Build/Products/Release/pinentry-mac.app $out/Applications
'';
passthru = {
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 9dca8e7e26cd..1046b86dbb44 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -62,6 +62,7 @@ doNotDisplayTwice rec {
gnustep-make = gnustep.make; # added 2016-7-6
htmlTidy = html-tidy; # added 2014-12-06
iana_etc = iana-etc; # added 2017-03-08
+ idea = jetbrains; # added 2017-04-03
inherit (haskell.compiler) jhc uhc; # 2015-05-15
inotifyTools = inotify-tools;
joseki = apache-jena-fuseki; # added 2016-02-28
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f362efa1d01d..85557b15e3d2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -555,8 +555,6 @@ with pkgs;
reattach-to-user-namespace = callPackage ../os-specific/darwin/reattach-to-user-namespace {};
- install_name_tool = callPackage ../os-specific/darwin/install_name_tool { };
-
xcodeenv = callPackage ../development/mobile/xcodeenv { };
titaniumenv = callPackage ../development/mobile/titaniumenv {
@@ -654,6 +652,8 @@ with pkgs;
blink = callPackage ../applications/networking/instant-messengers/blink { };
+ tensor = libsForQt5.callPackage ../applications/networking/instant-messengers/tensor { };
+
blink1-tool = callPackage ../tools/misc/blink1-tool { };
blitz = callPackage ../development/libraries/blitz {
@@ -3492,7 +3492,9 @@ with pkgs;
libcap = if stdenv.isDarwin then null else libcap;
};
- pinentry_mac = callPackage ../tools/security/pinentry-mac { };
+ pinentry_mac = callPackage ../tools/security/pinentry-mac {
+ inherit (darwin.apple_sdk.frameworks) Cocoa;
+ };
pingtcp = callPackage ../tools/networking/pingtcp { };
@@ -5085,7 +5087,7 @@ with pkgs;
cross = null;
libcCross = if targetPlatform != buildPlatform then libcCross else null;
- isl = if !stdenv.isDarwin then isl_0_14 else null;
+ isl = isl_0_17;
}));
gfortran = gfortran5;
@@ -6073,7 +6075,9 @@ with pkgs;
pythonDocs = recurseIntoAttrs (callPackage ../development/interpreters/python/cpython/docs {});
- pypi2nix = callPackage ../development/tools/pypi2nix { python = python35; };
+ pypi2nix = callPackage ../development/tools/pypi2nix {
+ pythonPackages = python3Packages;
+ };
svg2tikz = python27Packages.svg2tikz;
@@ -6401,8 +6405,12 @@ with pkgs;
coan = callPackage ../development/tools/analysis/coan { };
+ compile-daemon = callPackage ../development/tools/compile-daemon { };
+
complexity = callPackage ../development/tools/misc/complexity { };
+ conan = callPackage ../development/tools/build-managers/conan { };
+
cookiecutter = pythonPackages.cookiecutter;
ctags = callPackage ../development/tools/misc/ctags { };
@@ -7852,6 +7860,10 @@ with pkgs;
gtk = gtk2;
};
+ gtk-mac-integration-gtk3 = callPackage ../development/libraries/gtk-mac-integration {
+ gtk = gtk3;
+ };
+
gtk-mac-bundler = callPackage ../development/tools/gtk-mac-bundler {};
gtkspell2 = callPackage ../development/libraries/gtkspell { };
@@ -9265,7 +9277,7 @@ with pkgs;
openslp = callPackage ../development/libraries/openslp {};
- libressl = libressl_2_4;
+ libressl = libressl_2_5;
libressl_2_4 = callPackage ../development/libraries/libressl/2.4.nix {
fetchurl = fetchurlBoot;
};
@@ -10583,6 +10595,8 @@ with pkgs;
bosun = callPackage ../servers/monitoring/bosun { };
scollector = bosun;
+ cayley = callPackage ../servers/cayley { };
+
charybdis = callPackage ../servers/irc/charybdis {};
couchdb = callPackage ../servers/http/couchdb {
@@ -12435,6 +12449,8 @@ with pkgs;
encode-sans = callPackage ../data/fonts/encode-sans { };
+ envypn-font = callPackage ../data/fonts/envypn-font { };
+
fantasque-sans-mono = callPackage ../data/fonts/fantasque-sans-mono {};
fira = callPackage ../data/fonts/fira { };
@@ -13760,15 +13776,15 @@ with pkgs;
flac = callPackage ../applications/audio/flac { };
flashplayer = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer {
- debug = config.flashplayer.debug or false;
+ debug = config.flashplayer.debug or false;
};
flashplayer-standalone = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix {
- debug = config.flashplayer.debug or false;
+ debug = config.flashplayer.debug or false;
};
flashplayer-standalone-debugger = flashplayer-standalone.override {
- debug = true;
+ debug = true;
};
fluxbox = callPackage ../applications/window-managers/fluxbox { };
@@ -13896,7 +13912,7 @@ with pkgs;
libart = pkgs.gnome2.libart_lgpl;
};
- idea = recurseIntoAttrs (callPackages ../applications/editors/idea { androidsdk = androidsdk_extras; });
+ jetbrains = recurseIntoAttrs (callPackages ../applications/editors/jetbrains { androidsdk = androidsdk_extras; });
libquvi = callPackage ../applications/video/quvi/library.nix { };
@@ -13989,7 +14005,9 @@ with pkgs;
gosmore = callPackage ../applications/misc/gosmore { };
- gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel { };
+ gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel {
+ inherit (darwin) IOKit;
+ };
gpscorrelate = callPackage ../applications/misc/gpscorrelate { };
@@ -17192,6 +17210,8 @@ with pkgs;
bcftools = callPackage ../applications/science/biology/bcftools { };
+ diamond = callPackage ../applications/science/biology/diamond { };
+
ecopcr = callPackage ../applications/science/biology/ecopcr { };
emboss = callPackage ../applications/science/biology/emboss { };
@@ -18183,10 +18203,10 @@ with pkgs;
inherit (callPackage ../applications/networking/cluster/terraform {})
terraform_0_8_5
terraform_0_8_8
- terraform_0_9_2;
+ terraform_0_9_3;
terraform_0_8 = terraform_0_8_8;
- terraform_0_9 = terraform_0_9_2;
+ terraform_0_9 = terraform_0_9_3;
terraform = terraform_0_9;
terragrunt = callPackage ../applications/networking/cluster/terragrunt {
@@ -18478,4 +18498,11 @@ with pkgs;
ghc-standalone-archive = callPackage ../os-specific/darwin/ghc-standalone-archive { inherit (darwin) cctools; };
messenger-for-desktop = callPackage ../applications/networking/instant-messengers/messenger-for-desktop {};
+
+ NSPlist = callPackage ../development/libraries/NSPlist {};
+
+ PlistCpp = callPackage ../development/libraries/PlistCpp {};
+
+ xib2nib = callPackage ../development/tools/xib2nib {};
+
}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9f65ef80b149..59bf5fa1007e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -118,6 +118,8 @@ in {
};
};
+ phonenumbers = callPackage ../development/python-modules/phonenumbers { };
+
agate-dbf = buildPythonPackage rec {
name = "agate-dbf-0.1.0";
disabled = isPy3k;
@@ -2984,11 +2986,10 @@ in {
to do lots of things, you're probably outside the use cases. Either
trust those users, or don't.
'';
- homepage = https://github.com/jsocol/bleach;
- downloadPage = https://github.com/jsocol/bleach/releases;
+ homepage = https://github.com/mozilla/bleach;
+ downloadPage = https://github.com/mozilla/bleach/releases;
license = licenses.asl20;
maintainers = with maintainers; [ prikhi ];
- platforms = platforms.linux;
};
};
@@ -3187,6 +3188,9 @@ in {
runHook postCheck
'';
+ # Network access
+ doCheck = false;
+
meta = {
homepage = https://github.com/boto/boto3;
license = stdenv.lib.licenses.asl20;
@@ -10381,31 +10385,6 @@ in {
};
};
-
- django_1_7 = buildPythonPackage rec {
- name = "Django-${version}";
- version = "1.7.11";
- disabled = pythonOlder "2.7";
-
- src = pkgs.fetchurl {
- url = "http://www.djangoproject.com/m/releases/1.7/${name}.tar.gz";
- sha256 = "18arf0zr98q2gxhimm2fgh0avwcdax1mcnps0cyn06wgrr7i8f90";
- };
-
- # too complicated to setup
- doCheck = false;
-
- # patch only $out/bin to avoid problems with starter templates (see #3134)
- postFixup = ''
- wrapPythonProgramsIn $out/bin "$out $pythonPath"
- '';
-
- meta = {
- description = "A high-level Python Web framework";
- homepage = https://www.djangoproject.com/;
- };
- };
-
django_1_6 = buildPythonPackage rec {
name = "Django-${version}";
version = "1.6.11.5";
@@ -10597,7 +10576,7 @@ in {
sha256 = "0wxvpmjdzk0aajk33y4himn3wqjx7k0aqlka9j8ay3yfav78bdq0";
};
- propagatedBuildInputs = with self; [ django_1_7 ];
+ propagatedBuildInputs = with self; [ django ];
# tests appear to be broken on 0.6.1 at least
doCheck = ( version != "0.6.1" );
@@ -20699,11 +20678,11 @@ in {
};
PyICU = buildPythonPackage rec {
- name = "PyICU-1.9.5";
+ name = "PyICU-1.9.6";
src = pkgs.fetchurl {
url = "mirror://pypi/P/PyICU/${name}.tar.gz";
- sha256 = "16rmxy9y0qhqqna2v49i7nzwm09as699rbyvh4raw7w602w55c3k";
+ sha256 = "0l151zhhyiazzdz8skpxgrw1x4nqa9pq2cwni6d97anmg97i7hn5";
};
buildInputs = [ pkgs.icu ];
@@ -28929,8 +28908,7 @@ EOF
};
propagatedBuildInputs = with self; [ cffi ];
- buildInputs = [ pkgs.libspotify ]
- ++ stdenv.lib.optional stdenv.isDarwin pkgs.install_name_tool;
+ buildInputs = [ pkgs.libspotify ];
# python zip complains about old timestamps
preConfigure = ''
@@ -32211,6 +32189,12 @@ EOF
nitpick = callPackage ../applications/version-management/nitpick { };
+ pluginbase = callPackage ../development/python-modules/pluginbase { };
+
+ node-semver = callPackage ../development/python-modules/node-semver { };
+
+ distro = callPackage ../development/python-modules/distro { };
+
});
in fix' (extends overrides packages)
diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix
index a6e574a7d11a..59d571f0bd18 100644
--- a/pkgs/top-level/release-lib.nix
+++ b/pkgs/top-level/release-lib.nix
@@ -1,17 +1,15 @@
{ supportedSystems
, packageSet ? (import ../..)
, scrubJobs ? true
+, # Attributes passed to nixpkgs. Don't build packages marked as unfree.
+ nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; }; }
}:
with import ../../lib;
rec {
- # Ensure that we don't build packages marked as unfree.
- allPackages = args: packageSet (args // {
- config.allowUnfree = false;
- config.inHydra = true;
- });
+ allPackages = args: packageSet (args // nixpkgsArgs);
pkgs = pkgsFor "x86_64-linux";
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 7c6954564d0b..66ff9a9e6b98 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -15,9 +15,11 @@
supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ]
, # Strip most of attributes when evaluating to spare memory usage
scrubJobs ? true
+, # Attributes passed to nixpkgs. Don't build packages marked as unfree.
+ nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; }; }
}:
-with import ./release-lib.nix { inherit supportedSystems scrubJobs; };
+with import ./release-lib.nix { inherit supportedSystems scrubJobs nixpkgsArgs; };
let
diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix
index ce8605a27e83..77133d1e6af0 100644
--- a/pkgs/top-level/rust-packages.nix
+++ b/pkgs/top-level/rust-packages.nix
@@ -7,9 +7,9 @@
{ runCommand, fetchFromGitHub, git }:
let
- version = "2017-04-08";
- rev = "9876afbb35a2fe28748990f76d91eaae827e2aae";
- sha256 = "14wk74s0mqhxzmgaq07y75y8v4jkffzhs981y9cz806asdcxlrwh";
+ version = "2017-04-11";
+ rev = "4dff0d079e01ca61b093c5a2fb6123378dfd0d38";
+ sha256 = "1ygahq5kmagjmwhrss01134vfb8lvim9110y3abjkmp3cc4xwfhy";
src = fetchFromGitHub {
inherit rev;