diff --git a/doc/cross-compilation.xml b/doc/cross-compilation.xml
index e99e90bac9c5..7ff354376116 100644
--- a/doc/cross-compilation.xml
+++ b/doc/cross-compilation.xml
@@ -128,7 +128,7 @@
This is a string identifying the standard C library used.
- Valid identifiers include "glibc" for GNU libc, "libsystem" for Darwin's Libsystem, and "uclibc" for µClibc.
+ Valid identifiers include "glibc" for GNU libc, "libSystem" for Darwin's Libsystem, and "uclibc" for µClibc.
It should probably be refactored to use the module system, like parse.
diff --git a/lib/default.nix b/lib/default.nix
index e692637abf19..3893e349db36 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -5,8 +5,9 @@
*/
let
- # trivial, often used functions
+ # often used, or depending on very little
trivial = import ./trivial.nix;
+ fixedPoints = import ./fixed-points.nix;
# datatypes
attrsets = import ./attrsets.nix;
@@ -42,7 +43,7 @@ let
filesystem = import ./filesystem.nix;
in
- { inherit trivial
+ { inherit trivial fixedPoints
attrsets lists strings stringsWithDeps
customisation maintainers meta sources
modules options types
@@ -55,6 +56,7 @@ in
}
# !!! don't include everything at top-level; perhaps only the most
# commonly used functions.
- // trivial // lists // strings // stringsWithDeps // attrsets // sources
+ // trivial // fixedPoints
+ // lists // strings // stringsWithDeps // attrsets // sources
// options // types // meta // debug // misc // modules
// customisation
diff --git a/lib/fixed-points.nix b/lib/fixed-points.nix
new file mode 100644
index 000000000000..a11b5a6f4bdc
--- /dev/null
+++ b/lib/fixed-points.nix
@@ -0,0 +1,78 @@
+rec {
+ # Compute the fixed point of the given function `f`, which is usually an
+ # attribute set that expects its final, non-recursive representation as an
+ # argument:
+ #
+ # f = self: { foo = "foo"; bar = "bar"; foobar = self.foo + self.bar; }
+ #
+ # Nix evaluates this recursion until all references to `self` have been
+ # resolved. At that point, the final result is returned and `f x = x` holds:
+ #
+ # nix-repl> fix f
+ # { bar = "bar"; foo = "foo"; foobar = "foobar"; }
+ #
+ # Type: fix :: (a -> a) -> a
+ #
+ # See https://en.wikipedia.org/wiki/Fixed-point_combinator for further
+ # details.
+ fix = f: let x = f x; in x;
+
+ # A variant of `fix` that records the original recursive attribute set in the
+ # result. This is useful in combination with the `extends` function to
+ # implement deep overriding. See pkgs/development/haskell-modules/default.nix
+ # for a concrete example.
+ fix' = f: let x = f x // { __unfix__ = f; }; in x;
+
+ # Modify the contents of an explicitly recursive attribute set in a way that
+ # honors `self`-references. This is accomplished with a function
+ #
+ # g = self: super: { foo = super.foo + " + "; }
+ #
+ # that has access to the unmodified input (`super`) as well as the final
+ # non-recursive representation of the attribute set (`self`). `extends`
+ # differs from the native `//` operator insofar as that it's applied *before*
+ # references to `self` are resolved:
+ #
+ # nix-repl> fix (extends g f)
+ # { bar = "bar"; foo = "foo + "; foobar = "foo + bar"; }
+ #
+ # The name of the function is inspired by object-oriented inheritance, i.e.
+ # think of it as an infix operator `g extends f` that mimics the syntax from
+ # Java. It may seem counter-intuitive to have the "base class" as the second
+ # 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: { })
+ #
+ # nix-repl> obj
+ # { __unfix__ = «lambda»; extend = «lambda»; }
+ #
+ # nix-repl> obj = obj.extend (self: super: { foo = "foo"; })
+ #
+ # nix-repl> obj
+ # { __unfix__ = «lambda»; extend = «lambda»; foo = "foo"; }
+ #
+ # nix-repl> obj = obj.extend (self: super: { foo = super.foo + " + "; bar = "bar"; foobar = self.foo + self.bar; })
+ #
+ # nix-repl> obj
+ # { __unfix__ = «lambda»; bar = "bar"; extend = «lambda»; foo = "foo + "; foobar = "foo + bar"; }
+ makeExtensible = makeExtensibleWithCustomName "extend";
+
+ # Same as `makeExtensible` but the name of the extending attribute is
+ # customized.
+ makeExtensibleWithCustomName = extenderName: rattrs:
+ fix' rattrs // {
+ ${extenderName} = f: makeExtensibleWithCustomName extenderName (extends f rattrs);
+ };
+}
diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index 3ffaf393435e..e394f43831c9 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -96,14 +96,14 @@ rec {
iphone64 = {
config = "aarch64-apple-darwin14";
arch = "arm64";
- libc = "libsystem";
+ libc = "libSystem";
platform = {};
};
iphone32 = {
config = "arm-apple-darwin10";
arch = "armv7-a";
- libc = "libsystem";
+ libc = "libSystem";
platform = {};
};
diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix
index 334e1a707334..f55f3d712727 100644
--- a/lib/tests/misc.nix
+++ b/lib/tests/misc.nix
@@ -1,7 +1,6 @@
# to run these tests:
# nix-instantiate --eval --strict nixpkgs/lib/tests/misc.nix
# if the resulting list is empty, all tests passed
-let inherit (builtins) add; in
with import ../default.nix;
runTests {
@@ -88,6 +87,37 @@ runTests {
expected = [ "2001" "db8" "0" "0042" "" "8a2e" "370" "" ];
};
+ testIsStorePath = {
+ expr =
+ let goodPath =
+ "/nix/store/d945ibfx9x185xf04b890y4f9g3cbb63-python-2.7.11";
+ in {
+ storePath = isStorePath goodPath;
+ storePathAppendix = isStorePath
+ "${goodPath}/bin/python";
+ nonAbsolute = isStorePath (concatStrings (tail (stringToCharacters goodPath)));
+ asPath = isStorePath (builtins.toPath goodPath);
+ otherPath = isStorePath "/something/else";
+ otherVals = {
+ attrset = isStorePath {};
+ list = isStorePath [];
+ int = isStorePath 42;
+ };
+ };
+ expected = {
+ storePath = true;
+ storePathAppendix = false;
+ nonAbsolute = false;
+ asPath = true;
+ otherPath = false;
+ otherVals = {
+ attrset = false;
+ list = false;
+ int = false;
+ };
+ };
+ };
+
# LISTS
testFilter = {
@@ -266,14 +296,14 @@ runTests {
res4 = let x = defaultOverridableDelayableArgs id { a = 7; };
in (x.merge) ( x: { b = 10; });
res5 = let x = defaultOverridableDelayableArgs id { a = 7; };
- in (x.merge) ( x: { a = add x.a 3; });
- res6 = let x = defaultOverridableDelayableArgs id { a = 7; mergeAttrBy = { a = add; }; };
+ in (x.merge) ( x: { a = builtins.add x.a 3; });
+ res6 = let x = defaultOverridableDelayableArgs id { a = 7; mergeAttrBy = { a = builtins.add; }; };
y = x.merge {};
in (y.merge) { a = 10; };
resRem7 = res6.replace (a: removeAttrs a ["a"]);
- resReplace6 = let x = defaultOverridableDelayableArgs id { a = 7; mergeAttrBy = { a = add; }; };
+ resReplace6 = let x = defaultOverridableDelayableArgs id { a = 7; mergeAttrBy = { a = builtins.add; }; };
x2 = x.merge { a = 20; }; # now we have 27
in (x2.replace) { a = 10; }; # and override the value by 10
diff --git a/lib/trivial.nix b/lib/trivial.nix
index ffbf96aa9bca..9ee0549fc0fb 100644
--- a/lib/trivial.nix
+++ b/lib/trivial.nix
@@ -43,84 +43,6 @@ rec {
*/
mergeAttrs = x: y: x // y;
-
- # Compute the fixed point of the given function `f`, which is usually an
- # attribute set that expects its final, non-recursive representation as an
- # argument:
- #
- # f = self: { foo = "foo"; bar = "bar"; foobar = self.foo + self.bar; }
- #
- # Nix evaluates this recursion until all references to `self` have been
- # resolved. At that point, the final result is returned and `f x = x` holds:
- #
- # nix-repl> fix f
- # { bar = "bar"; foo = "foo"; foobar = "foobar"; }
- #
- # Type: fix :: (a -> a) -> a
- #
- # See https://en.wikipedia.org/wiki/Fixed-point_combinator for further
- # details.
- fix = f: let x = f x; in x;
-
- # A variant of `fix` that records the original recursive attribute set in the
- # result. This is useful in combination with the `extends` function to
- # implement deep overriding. See pkgs/development/haskell-modules/default.nix
- # for a concrete example.
- fix' = f: let x = f x // { __unfix__ = f; }; in x;
-
- # Modify the contents of an explicitly recursive attribute set in a way that
- # honors `self`-references. This is accomplished with a function
- #
- # g = self: super: { foo = super.foo + " + "; }
- #
- # that has access to the unmodified input (`super`) as well as the final
- # non-recursive representation of the attribute set (`self`). `extends`
- # differs from the native `//` operator insofar as that it's applied *before*
- # references to `self` are resolved:
- #
- # nix-repl> fix (extends g f)
- # { bar = "bar"; foo = "foo + "; foobar = "foo + bar"; }
- #
- # The name of the function is inspired by object-oriented inheritance, i.e.
- # think of it as an infix operator `g extends f` that mimics the syntax from
- # Java. It may seem counter-intuitive to have the "base class" as the second
- # 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: { })
- #
- # nix-repl> obj
- # { __unfix__ = «lambda»; extend = «lambda»; }
- #
- # nix-repl> obj = obj.extend (self: super: { foo = "foo"; })
- #
- # nix-repl> obj
- # { __unfix__ = «lambda»; extend = «lambda»; foo = "foo"; }
- #
- # nix-repl> obj = obj.extend (self: super: { foo = super.foo + " + "; bar = "bar"; foobar = self.foo + self.bar; })
- #
- # nix-repl> obj
- # { __unfix__ = «lambda»; bar = "bar"; extend = «lambda»; foo = "foo + "; foobar = "foo + bar"; }
- makeExtensible = makeExtensibleWithCustomName "extend";
-
- # Same as `makeExtensible` but the name of the extending attribute is
- # customized.
- makeExtensibleWithCustomName = extenderName: rattrs:
- fix' rattrs // {
- ${extenderName} = f: makeExtensibleWithCustomName extenderName (extends f rattrs);
- };
-
# Flip the order of the arguments of a binary function.
flip = f: a: b: f b a;
diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml
index d0f0216686a5..6948c22cc88f 100644
--- a/nixos/doc/manual/release-notes/rl-1709.xml
+++ b/nixos/doc/manual/release-notes/rl-1709.xml
@@ -78,6 +78,17 @@ rmdir /var/lib/ipfs/.ipfs
+
+
+ The postgres default version was changed from 9.5 to 9.6.
+
+
+ The postgres superuser name has changed from root to postgres to more closely follow what other Linux distributions are doing.
+
+
+ The postgres default dataDir has changed from /var/db/postgres to /var/lib/postgresql/$psqlSchema where $psqlSchema is 9.6 for example.
+
+
diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix
index ae30a710bf6f..d503f5a8b20e 100644
--- a/nixos/modules/config/networking.nix
+++ b/nixos/modules/config/networking.nix
@@ -222,13 +222,11 @@ in
'' + cfg.extraResolvconfConf + ''
'';
- } // (optionalAttrs config.services.resolved.enable (
- if dnsmasqResolve then {
- "dnsmasq-resolv.conf".source = "/run/systemd/resolve/resolv.conf";
- } else {
- "resolv.conf".source = "/run/systemd/resolve/resolv.conf";
- }
- ));
+ } // optionalAttrs config.services.resolved.enable {
+ "resolv.conf".source = "/run/systemd/resolve/resolv.conf";
+ } // optionalAttrs (config.services.resolved.enable && dnsmasqResolve) {
+ "dnsmasq-resolv.conf".source = "/run/systemd/resolve/resolv.conf";
+ };
networking.proxy.envVars =
optionalAttrs (cfg.proxy.default != null) {
diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix
index 161ed9457af9..80abec95c03d 100644
--- a/nixos/modules/hardware/video/nvidia.nix
+++ b/nixos/modules/hardware/video/nvidia.nix
@@ -28,7 +28,7 @@ let
nvidia_libs32 = (nvidiaForKernel pkgs_i686.linuxPackages).override { libsOnly = true; kernel = null; };
nvidiaPackage = nvidia: pkgs:
- if !nvidia.useGLVND then nvidia
+ if !nvidia.useGLVND then nvidia.out
else pkgs.buildEnv {
name = "nvidia-libs";
paths = [ pkgs.libglvnd nvidia.out ];
@@ -56,7 +56,8 @@ in
hardware.opengl.package = nvidiaPackage nvidia_x11 pkgs;
hardware.opengl.package32 = nvidiaPackage nvidia_libs32 pkgs_i686;
- environment.systemPackages = [ nvidia_x11.bin nvidia_x11.settings nvidia_x11.persistenced ];
+ environment.systemPackages = [ nvidia_x11.bin nvidia_x11.settings ]
+ ++ lib.filter (p: p != null) [ nvidia_x11.persistenced ];
boot.extraModulePackages = [ nvidia_x11.bin ];
diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index 24ef4637ec98..d06e03a52978 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -38,6 +38,10 @@ let
pre84 = versionOlder (builtins.parseDrvName postgresql.name).version "8.4";
+ # NixOS traditionally used `root` as superuser, most other distros use `postgres`. From 17.09
+ # we also try to follow this standard
+ superuser = (if versionAtLeast config.system.stateVersion "17.09" then "postgres" else "root");
+
in
{
@@ -74,7 +78,7 @@ in
dataDir = mkOption {
type = types.path;
- default = "/var/db/postgresql";
+ example = "/var/lib/postgresql/9.6";
description = ''
Data directory for PostgreSQL.
'';
@@ -160,7 +164,13 @@ in
# Note: when changing the default, make it conditional on
# ‘system.stateVersion’ to maintain compatibility with existing
# systems!
- mkDefault (if versionAtLeast config.system.stateVersion "16.03" then pkgs.postgresql95 else pkgs.postgresql94);
+ mkDefault (if versionAtLeast config.system.stateVersion "17.09" then pkgs.postgresql96
+ else if versionAtLeast config.system.stateVersion "16.03" then pkgs.postgresql95
+ else pkgs.postgresql94);
+
+ services.postgresql.dataDir =
+ mkDefault (if versionAtLeast config.system.stateVersion "17.09" then "/var/lib/postgresql/${config.services.postgresql.package.psqlSchema}"
+ else "/var/db/postgresql");
services.postgresql.authentication = mkAfter
''
@@ -205,7 +215,7 @@ in
''
# Initialise the database.
if ! test -e ${cfg.dataDir}/PG_VERSION; then
- initdb -U root
+ initdb -U ${superuser}
# See postStart!
touch "${cfg.dataDir}/.first_startup"
fi
@@ -237,14 +247,14 @@ in
# Wait for PostgreSQL to be ready to accept connections.
postStart =
''
- while ! psql --port=${toString cfg.port} postgres -c "" 2> /dev/null; do
+ while ! ${pkgs.sudo}/bin/sudo -u ${superuser} psql --port=${toString cfg.port} -d postgres -c "" 2> /dev/null; do
if ! kill -0 "$MAINPID"; then exit 1; fi
sleep 0.1
done
if test -e "${cfg.dataDir}/.first_startup"; then
${optionalString (cfg.initialScript != null) ''
- psql -f "${cfg.initialScript}" --port=${toString cfg.port} postgres
+ ${pkgs.sudo}/bin/sudo -u ${superuser} psql -f "${cfg.initialScript}" --port=${toString cfg.port} -d postgres
''}
rm -f "${cfg.dataDir}/.first_startup"
fi
diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix
index 6b24ac2c7c62..332a04634d06 100644
--- a/nixos/modules/services/monitoring/graphite.nix
+++ b/nixos/modules/services/monitoring/graphite.nix
@@ -488,9 +488,7 @@ in {
# create index
${pkgs.python27Packages.graphite_web}/bin/build-index.sh
- chown graphite:graphite ${cfg.dataDir}
- chown graphite:graphite ${cfg.dataDir}/whisper
- chown -R graphite:graphite ${cfg.dataDir}/log
+ chown -R graphite:graphite ${cfg.dataDir}
touch ${dataDir}/db-created
fi
diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix
index 574f74d547a5..c76c86b0cadc 100644
--- a/nixos/modules/services/search/elasticsearch.nix
+++ b/nixos/modules/services/search/elasticsearch.nix
@@ -5,13 +5,22 @@ with lib;
let
cfg = config.services.elasticsearch;
+ es5 = builtins.compareVersions (builtins.parseDrvName cfg.package.name).version "5" >= 0;
+
esConfig = ''
network.host: ${cfg.listenAddress}
- network.port: ${toString cfg.port}
- network.tcp.port: ${toString cfg.tcp_port}
- # TODO: find a way to enable security manager
- security.manager.enabled: false
cluster.name: ${cfg.cluster_name}
+
+ ${if es5 then ''
+ http.port: ${toString cfg.port}
+ transport.tcp.port: ${toString cfg.tcp_port}
+ '' else ''
+ network.port: ${toString cfg.port}
+ network.tcp.port: ${toString cfg.tcp_port}
+ # TODO: find a way to enable security manager
+ security.manager.enabled: false
+ ''}
+
${cfg.extraConf}
'';
@@ -19,13 +28,18 @@ let
name = "elasticsearch-config";
paths = [
(pkgs.writeTextDir "elasticsearch.yml" esConfig)
- (pkgs.writeTextDir "logging.yml" cfg.logging)
+ (if es5 then (pkgs.writeTextDir "log4j2.properties" cfg.logging)
+ else (pkgs.writeTextDir "logging.yml" cfg.logging))
];
+ # Elasticsearch 5.x won't start when the scripts directory does not exist
+ postBuild = if es5 then "${pkgs.coreutils}/bin/mkdir -p $out/scripts" else "";
};
esPlugins = pkgs.buildEnv {
name = "elasticsearch-plugins";
paths = cfg.plugins;
+ # Elasticsearch 5.x won't start when the plugins directory does not exist
+ postBuild = if es5 then "${pkgs.coreutils}/bin/mkdir -p $out/plugins" else "";
};
in {
@@ -85,18 +99,30 @@ in {
logging = mkOption {
description = "Elasticsearch logging configuration.";
- default = ''
- rootLogger: INFO, console
- logger:
- action: INFO
- com.amazonaws: WARN
- appender:
- console:
- type: console
- layout:
- type: consolePattern
- conversionPattern: "[%d{ISO8601}][%-5p][%-25c] %m%n"
- '';
+ default =
+ if es5 then ''
+ logger.action.name = org.elasticsearch.action
+ logger.action.level = info
+
+ appender.console.type = Console
+ appender.console.name = console
+ appender.console.layout.type = PatternLayout
+ appender.console.layout.pattern = [%d{ISO8601}][%-5p][%-25c{1.}] %marker%m%n
+
+ rootLogger.level = info
+ rootLogger.appenderRef.console.ref = console
+ '' else ''
+ rootLogger: INFO, console
+ logger:
+ action: INFO
+ com.amazonaws: WARN
+ appender:
+ console:
+ type: console
+ layout:
+ type: consolePattern
+ conversionPattern: "[%d{ISO8601}][%-5p][%-25c] %m%n"
+ '';
type = types.str;
};
@@ -112,6 +138,12 @@ in {
description = "Extra command line options for the elasticsearch launcher.";
default = [];
type = types.listOf types.str;
+ };
+
+ extraJavaOptions = mkOption {
+ description = "Extra command line options for Java.";
+ default = [];
+ type = types.listOf types.str;
example = [ "-Djava.net.preferIPv4Stack=true" ];
};
@@ -133,13 +165,21 @@ in {
path = [ pkgs.inetutils ];
environment = {
ES_HOME = cfg.dataDir;
+ ES_JAVA_OPTS = toString ([ "-Des.path.conf=${configDir}" ] ++ cfg.extraJavaOptions);
};
serviceConfig = {
- ExecStart = "${cfg.package}/bin/elasticsearch -Des.path.conf=${configDir} ${toString cfg.extraCmdLineOptions}";
+ ExecStart = "${cfg.package}/bin/elasticsearch ${toString cfg.extraCmdLineOptions}";
User = "elasticsearch";
PermissionsStartOnly = true;
+ LimitNOFILE = "1024000";
};
preStart = ''
+ # Only set vm.max_map_count if lower than ES required minimum
+ # This avoids conflict if configured via boot.kernel.sysctl
+ if [ `${pkgs.procps}/bin/sysctl -n vm.max_map_count` -lt 262144 ]; then
+ ${pkgs.procps}/bin/sysctl -w vm.max_map_count=262144
+ fi
+
mkdir -m 0700 -p ${cfg.dataDir}
# Install plugins
diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index 41a347000f81..44e9a83e872b 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -1550,10 +1550,10 @@
}) {};
rainbow-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "rainbow-mode";
- version = "0.12";
+ version = "0.13";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/rainbow-mode-0.12.el";
- sha256 = "10a7qs7fvw4qi4vxj9n56j26gjk61bl79dgz4md1d26slb2j1c04";
+ url = "https://elpa.gnu.org/packages/rainbow-mode-0.13.el";
+ sha256 = "1d3aamx6qgqqpqijwsr02ggwrh67gfink1bir0692alfkm3zdddl";
};
packageRequires = [];
meta = {
@@ -1564,10 +1564,10 @@
realgud = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, load-relative, loc-changes, test-simple }:
elpaBuild {
pname = "realgud";
- version = "1.4.3";
+ version = "1.4.4";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/realgud-1.4.3.tar";
- sha256 = "07yfah8kmr60rhrj8y8gs7l85hsbylv26crw3qbqh67ka4ykpj01";
+ url = "https://elpa.gnu.org/packages/realgud-1.4.4.tar";
+ sha256 = "1nc8km339ip90h1j55ahfga03v7x7rh4iycmw6yrxyzir68vwn7c";
};
packageRequires = [
cl-lib
@@ -1730,10 +1730,10 @@
soap-client = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "soap-client";
- version = "3.1.1";
+ version = "3.1.2";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/soap-client-3.1.1.tar";
- sha256 = "0is2923g882farf73dix6ncq3m26yn5j5qr8wz6s0xad04zdbdhk";
+ url = "https://elpa.gnu.org/packages/soap-client-3.1.2.tar";
+ sha256 = "0crfpp2ksqvzf2j3q44qq6z8zh1r10q9kw12cxbmjiih89q01b68";
};
packageRequires = [ cl-lib ];
meta = {
diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index 7f022e4dbb0c..bf943bf125e8 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -801,8 +801,8 @@
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "301a0e421c1f0e1605ad5c132662c9363e7ae6af";
- sha256 = "11hmx6jp9shabf9xw86ny6ra3rh46jhjwn9q1c1k9q24mjny2pmx";
+ rev = "499db6f98cc725bca66d122bce571adcdfa32187";
+ sha256 = "10mgzyb3ccs781b7r37qfjw7ynhh9k8hqpahh9pcn3p462si341a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags";
@@ -1007,12 +1007,12 @@
ace-link = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ace-link";
- version = "20170319.553";
+ version = "20170528.1158";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "ace-link";
- rev = "0b6e06e0b5222a57e5e6f1d9af6436eb12102e3e";
- sha256 = "1h8j1dl9xyybm0pj3j2j6fcq7bryby2h1s64r6ijcsgrqgimq66i";
+ rev = "99787dc79ed9ec14a2b87257d6c8ce5b8ec0a0b0";
+ sha256 = "103pb0c5g25fsnbjcjgj04aq4damxwhm2fg86fgxihrch8a7bhcn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/68032f40c0ce4170a22db535be4bfa7099f61f85/recipes/ace-link";
@@ -1178,8 +1178,8 @@
src = fetchFromGitHub {
owner = "nickmccurdy";
repo = "add-hooks";
- rev = "9b1bdb91c59ea9c2cc0aba48262c49069273d856";
- sha256 = "1jzgyfcr6m64q79qibnbqa41sbpivslwk2hygbk9yp46l5vgj1hc";
+ rev = "f7a94ef1762ad8eb58d24c0857751863ea93cd5b";
+ sha256 = "1j524wvl9l9hzahq8by9bnh745kg2z7l808ad9b0y0wx5kf17xlz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/901f846aef46d512dc0a1770bab7f07c0ae330cd/recipes/add-hooks";
@@ -1487,12 +1487,12 @@
alda-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "alda-mode";
- version = "20170524.846";
+ version = "20170529.1224";
src = fetchFromGitHub {
owner = "jgkamat";
repo = "alda-mode";
- rev = "07dabfe6132ba7622012eb457abe0a75c48d6414";
- sha256 = "1lwpfbqz6cq0bandjz8v42l21f47g4z83m7cyrmr0n75wzb99kc8";
+ rev = "69f9f1aec6a52350a67ed1db87b6f6c99400622f";
+ sha256 = "1fkpq787z1k914kyln280mk06x58niks5hp9if620qpqvmqaih3s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2612c494a2b6bd43ffbbaef88ce9ee6327779158/recipes/alda-mode";
@@ -4382,12 +4382,12 @@
base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "base16-theme";
- version = "20170505.1010";
+ version = "20170525.1746";
src = fetchFromGitHub {
owner = "belak";
repo = "base16-emacs";
- rev = "89ee73d88183b4f60f973ff0a47a571a5de46d1d";
- sha256 = "046db0np55fdnyr7bwhl2h1cqjh1ryd09fvkwn02cv2kb7knkfig";
+ rev = "ac27813fdc7ce32eca1c16a439b46eb3a6835ac1";
+ sha256 = "1alhmgj40hhkgdpc7j34iswl9d5afmxjw74p189gm782mzl9y4c6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme";
@@ -4798,12 +4798,12 @@
beginend = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "beginend";
- version = "20170521.1251";
+ version = "20170526.743";
src = fetchFromGitHub {
owner = "DamienCassou";
repo = "beginend";
- rev = "784f3bcbe2a8e9b1148e12ff35200de3e320ea0e";
- sha256 = "1as0l3pyl7r2lkigzr923lrb6wyr5gia1z2klfclkydk6v2rix6d";
+ rev = "01920ffea5965d0ac5bc7196b73d4e0dcfe86c60";
+ sha256 = "04fdcxb0rvrrrglwcd6f83fk445bziycrzdcvh3gcpq09x5ryinx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/31c1157d4fd9e47a780bbd91075252acdc7899dd/recipes/beginend";
@@ -5115,8 +5115,8 @@
src = fetchFromGitHub {
owner = "jwiegley";
repo = "use-package";
- rev = "4aa7d9a68a1a4a9f3e4b7a22fca3d8a2e45a8354";
- sha256 = "17s5zdmprjbzxy68ah0f7k1j7cxncdyy9qlx5707zrqxqbnwlfrn";
+ rev = "726eea13a3a4d75d630aac29d6b71d74d9dc69e3";
+ sha256 = "1r75ysdz6cj97vn46lj4g2a3hsab377f667a8bfs17rz007nddv4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key";
@@ -5632,12 +5632,12 @@
boon = callPackage ({ dash, emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }:
melpaBuild {
pname = "boon";
- version = "20170508.733";
+ version = "20170528.2317";
src = fetchFromGitHub {
owner = "jyp";
repo = "boon";
- rev = "b5326c5bd68f2dbeef87adae6657eb24f068dbc5";
- sha256 = "1mxzsm1zkb99hpn7hav0yph3s04cbkhyj7dps49rphfp8s0ks90f";
+ rev = "4b76f0a86c84b0e4032cdee787c3ee55372e6c31";
+ sha256 = "1rr52dwwxq26v0h7apgr6nqpvfahrzm3j6p3zpbyp3lhb4sc2rjw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/boon";
@@ -7135,12 +7135,12 @@
centered-window-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "centered-window-mode";
- version = "20170522.2358";
+ version = "20170528.25";
src = fetchFromGitHub {
owner = "anler";
repo = "centered-window-mode";
- rev = "eba5ad249f50e62dd881040e8a0119fb8f5a1129";
- sha256 = "01xa2qjv4mdi4ipnd26cngdgs2nxazm8ikjwnghdy0izp4mxik8w";
+ rev = "c46af782ada0d4062d7de5cbbdc7c7471fdd0d15";
+ sha256 = "1xbfmanimq0ql61lzxx74jf4kj1g9imzgwiy1498mhbdbw295fg0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/centered-window-mode";
@@ -7195,22 +7195,22 @@
license = lib.licenses.free;
};
}) {};
- ceylon-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ ceylon-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ceylon-mode";
- version = "20170514.604";
+ version = "20170527.334";
src = fetchFromGitHub {
owner = "lucaswerkmeister";
repo = "ceylon-mode";
- rev = "e9b4a34dfe4fdeb4812d98e24b4b37a86d61717f";
- sha256 = "0kwbv9qzl7ci4nfi229m9j0gklx9rsrb70a9ip9fcqfc4cc8sw8q";
+ rev = "2a53cef43915576f68deb9646e38d432334d7ee0";
+ sha256 = "01qfivq3rr1rrsh45xjmw2wbljw14jbsm72a0c1fnbj9v75q2xlh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/09cd1a2ccf33b209a470780a66d54e1b1d597a86/recipes/ceylon-mode";
sha256 = "0dgqmmb8qmvzn557h0fw1mx4y0p96870l8f8glizkk3fifg7wgq4";
name = "ceylon-mode";
};
- packageRequires = [];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/ceylon-mode";
license = lib.licenses.free;
@@ -7223,8 +7223,8 @@
src = fetchFromGitHub {
owner = "cfengine";
repo = "core";
- rev = "c2e7e2e97b594a8eb8bd7fbb48c825951fead8e0";
- sha256 = "0kd3m47bcsz0vg92fqjryvy567aaaiipnyzm05klv7jb3v4hqn57";
+ rev = "1caec0c64d8fcf3b1e57192d1a6dff58e0a9ff87";
+ sha256 = "0w3l9awi76m4d4jscy3s50xfk56z4ym1qrihf9yansdqjzlzsi8l";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style";
@@ -7263,7 +7263,7 @@
version = "20170201.347";
src = fetchsvn {
url = "https://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs";
- rev = "12203";
+ rev = "12213";
sha256 = "0lv9lsh1dnsmida4hhj04ysq48v4m12nj9yq621xn3i6s2qz7s1k";
};
recipeFile = fetchurl {
@@ -8055,12 +8055,12 @@
circe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "circe";
- version = "20170509.1443";
+ version = "20170528.731";
src = fetchFromGitHub {
owner = "jorgenschaefer";
repo = "circe";
- rev = "1e90e5a89d07bd1584e990c35f5a9d564334a1ae";
- sha256 = "13pv21bk4khq97a7km7gpj8rmwkmcb1y1nk72w35b9kipxv76vg2";
+ rev = "13c605e639194c3da0c2e685056fac685f8c76a0";
+ sha256 = "0n7v0g332ml1ang2fjc8rjbi8h1f4bqazcqi8dlfn99vvv8kcd21";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/circe";
@@ -8142,8 +8142,8 @@
version = "20170120.137";
src = fetchsvn {
url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format";
- rev = "303849";
- sha256 = "1m3h5kln4v2hcwc4ahzk356415iizcg8cmika8221qvqci4wj7bm";
+ rev = "304204";
+ sha256 = "1yvk57q2q4hg04lkvrnx79vgkw6j7hzlx3kvrq0xw93nr351adqv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/69e56114948419a27f06204f6fe5326cc250ae28/recipes/clang-format";
@@ -8352,8 +8352,8 @@
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "clj-refactor.el";
- rev = "d7888fd722e5bd69bf89ecc687bb19b7f65c60b6";
- sha256 = "0pb7642y5nqgpg805y66cd0m1d26zynx6ixz43ff9iy4n1c7s9n5";
+ rev = "8904b7a9e21ea6319f8c37cf83a7200896bfae9c";
+ sha256 = "1bklsndfhg76a6y3vwbdcakmbrr2hnywjjfk2qaa3mbyxvmlqii3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3a2db268e55d10f7d1d5a5f02d35b2c27b12b78e/recipes/clj-refactor";
@@ -8528,12 +8528,12 @@
clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "clojure-mode";
- version = "20170407.312";
+ version = "20170527.1442";
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "clojure-mode";
- rev = "2d67af4230657fb06f0df4453b9d21031b32c1db";
- sha256 = "1dan05yd3dvf3r4khahpyq849sq96bjxz7zyady8x3k3gnn35q5w";
+ rev = "6e966d57578bd1d30f2986b7aa8e222baa59a11c";
+ sha256 = "0l97zfa6vzb90w6592mydxvbppg126nyvd13m6w5b37bdm1ykj7v";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode";
@@ -8553,8 +8553,8 @@
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "clojure-mode";
- rev = "2d67af4230657fb06f0df4453b9d21031b32c1db";
- sha256 = "1dan05yd3dvf3r4khahpyq849sq96bjxz7zyady8x3k3gnn35q5w";
+ rev = "6e966d57578bd1d30f2986b7aa8e222baa59a11c";
+ sha256 = "0l97zfa6vzb90w6592mydxvbppg126nyvd13m6w5b37bdm1ykj7v";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking";
@@ -8784,8 +8784,8 @@
src = fetchFromGitHub {
owner = "Kitware";
repo = "CMake";
- rev = "bc2cfd7c98d6a238710504172f78321d099d0eaa";
- sha256 = "06769g9ivldnm7qx36zlrckcy2gfc11wky26h1rdhdxfxy9jg0k2";
+ rev = "3ed14cb3ac03e7df53b9f9f987d5180e74dc2b64";
+ sha256 = "1c8ilgx713lkg2hlla5bgp6lm3g12l6viy0ddflcghh3ql744x4f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -9259,12 +9259,12 @@
color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "color-theme-sanityinc-tomorrow";
- version = "20170524.2244";
+ version = "20170528.1653";
src = fetchFromGitHub {
owner = "purcell";
repo = "color-theme-sanityinc-tomorrow";
- rev = "a0667cc4943513d52f8e268e6003f02f2bf05227";
- sha256 = "0fzxjx0x4hlwpv0y3hpi1sqj07r5zbm8gr76cw8g9rff1h46wic4";
+ rev = "2e229477acab33f4df54e3106ab3dc379df10f35";
+ sha256 = "00zhdmqfk50gilcan067ymc9n4wjw1ab3xyvv6v6q3s365wyh120";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-tomorrow";
@@ -9710,8 +9710,8 @@
src = fetchFromGitHub {
owner = "cpitclaudel";
repo = "company-coq";
- rev = "561a7e9243669c1edf406472f85a2836ebfcec4c";
- sha256 = "1gk7in9arz4dnkyysxl0wbigf7ssnr3qr4jzjca2c731n8sc566b";
+ rev = "eddb16e5ed9bd2945c57054b2c0054dee600b985";
+ sha256 = "18l442b2gnbgzn6x1qfdcfqn4ilh646fw694qam9g996vd0ncajb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7f89e3097c654774981953ef125679fec0b5b7c9/recipes/company-coq";
@@ -10311,8 +10311,8 @@
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "301a0e421c1f0e1605ad5c132662c9363e7ae6af";
- sha256 = "11hmx6jp9shabf9xw86ny6ra3rh46jhjwn9q1c1k9q24mjny2pmx";
+ rev = "499db6f98cc725bca66d122bce571adcdfa32187";
+ sha256 = "10mgzyb3ccs781b7r37qfjw7ynhh9k8hqpahh9pcn3p462si341a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags";
@@ -10831,12 +10831,12 @@
counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
melpaBuild {
pname = "counsel";
- version = "20170518.1425";
+ version = "20170526.203";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "swiper";
- rev = "859eb7844ac608fa48186ee124b2ca4ea7e98c6c";
- sha256 = "0wg0ivfb354l8h3nj0178wzbkriik51cp8wvjn4c1q40w5lhdfbr";
+ rev = "c93194941c1ac36ee762b70dc9061ee830769f6a";
+ sha256 = "0i75kyh3si8x6k0bqj1055kcp8zzbv05sps4flmwh59vn4j8paca";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel";
@@ -10982,8 +10982,8 @@
src = fetchFromGitHub {
owner = "AdamNiederer";
repo = "cov";
- rev = "74e8f32433eab6b31357642ad5a7ed79a3dfbd05";
- sha256 = "100fk11fjj8wx8lm4ln4p4b6brxfgnkxq387v6ikyigr6lascmsw";
+ rev = "158d6bacb0986a27aa90a5b6dce81ae820b62cef";
+ sha256 = "1n510afmaprwlv6hck2kc9myvj9wsrspqyjzj5vql1y9c6w1xhsc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d0f35ce436ac157955d6f92de96e14bef9ad69e3/recipes/cov";
@@ -11630,8 +11630,8 @@
src = fetchFromGitHub {
owner = "mortberg";
repo = "cubicaltt";
- rev = "f021b2766d57d44d3f8d4b1c99ef5620f889bb79";
- sha256 = "1z61km49c1a2hpfvr5i3c5xh3gfs4yrsnrf0mg5gvzd5ldf37jld";
+ rev = "290fb3c5101cf2957596cd21dfc8c04f6c441ca2";
+ sha256 = "0wxk1ylqn5zamjs6ksin4a2j3afgv3bygngb3sfvf6x061wyvzzr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1be42b49c206fc4f0df6fb50fed80b3d9b76710b/recipes/cubicaltt";
@@ -11897,8 +11897,8 @@
src = fetchFromGitHub {
owner = "cython";
repo = "cython";
- rev = "601f25ae776b0ee0dab70cd26a694e910f95465f";
- sha256 = "0njfaqmfs0v1dw27r77c3z38nqk5jga4vpdwhavrfybxsxb2gqrl";
+ rev = "1b7a91a2c2aea7d3a25e8f0bf3689b106d673201";
+ sha256 = "0msv987niax3sid3krj791p780lm9kb2v83gd4f8g5y29if930dm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@@ -12229,12 +12229,12 @@
darktooth-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "darktooth-theme";
- version = "20170401.1521";
+ version = "20170528.2201";
src = fetchFromGitHub {
owner = "emacsfodder";
repo = "emacs-theme-darktooth";
- rev = "fb66992286c009e594eb7bb9ee2f1cdc3bebb555";
- sha256 = "0n7qgnyl4rdvgwjb7gz6m1c22mxwg8bp08r7lz27z0b1bcyw94sc";
+ rev = "e5e2433fccb225b347c84c3bba5e3ed9769c2922";
+ sha256 = "0l3clqy9zrd8xbaacx7ck8kw1x6rl1b9vd5ss57wnqpsdz25nggi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme";
@@ -12250,12 +12250,12 @@
dart-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "dart-mode";
- version = "20170519.1742";
+ version = "20170525.1236";
src = fetchFromGitHub {
owner = "nex3";
repo = "dart-mode";
- rev = "1c9da5a7fdbdb703f7dffc9da81abef010e897e4";
- sha256 = "1fs6am7sshxgc78sslmg93z030q0kpc45r84p49l6l824maaxgnw";
+ rev = "9b11e8fb63549ee3700fb53e92e4ce2cb302c971";
+ sha256 = "1cp0qmnhnp57vihn343jz14kxm1rwn5b004q9yjlbv1am389rr12";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dart-mode";
@@ -12834,12 +12834,12 @@
demangle-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "demangle-mode";
- version = "20170311.1148";
+ version = "20170526.1508";
src = fetchFromGitHub {
owner = "liblit";
repo = "demangle-mode";
- rev = "19716fbc60851192aae6b4d4aaad5dcc1c88627a";
- sha256 = "0wmaf4278479zs2vic837ss1p99n7fhygcpcmy80i28fbfyskr6p";
+ rev = "d3fce31974b1c9f659da427f3c69c2e6168df508";
+ sha256 = "0k4pacjjgxagsa8kgzvynvmvczhbb73waq3l6gld7v3h38js163a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6ced9f4ffb051a8474d3f72695156416cf2dd8be/recipes/demangle-mode";
@@ -14738,12 +14738,12 @@
doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "doom-themes";
- version = "20170519.759";
+ version = "20170528.1204";
src = fetchFromGitHub {
owner = "hlissner";
repo = "emacs-doom-theme";
- rev = "eeb9247249e86a75a32dec7ccd865e9ee734613a";
- sha256 = "029hr90hv7cvmbdmx7i5mdzsqplfid15ipmxshn8fk914hn1wpa2";
+ rev = "71ca3f2910f2d857cea50f84a8cd27894aef848f";
+ sha256 = "1f4c3nf0psn6si13a7044z06mhj416hzqjgiyypxcwqx9mgbryhn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/73fd9f3c2352ea1af49166c2fe586d0410614081/recipes/doom-themes";
@@ -15173,7 +15173,7 @@
version = "20130120.1257";
src = fetchsvn {
url = "https://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/";
- rev = "1796143";
+ rev = "1796835";
sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq";
};
recipeFile = fetchurl {
@@ -15651,12 +15651,12 @@
easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "easy-hugo";
- version = "20170524.208";
+ version = "20170529.2039";
src = fetchFromGitHub {
owner = "masasam";
repo = "emacs-easy-hugo";
- rev = "89cdb14784e9e5c68f6cf26b6328befb338fedab";
- sha256 = "03xm7p9md8g7yqyrnmiawkgllbivf20kaiq2pj4kfq8cq1wikwim";
+ rev = "1aee9432aa99286410611c59c6317c3f97a66481";
+ sha256 = "0l05hg1fwjxknvv2rcz145disyxy9yr98lfd0nd1rhjgwhwyv2wh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo";
@@ -17304,12 +17304,12 @@
elisp-refs = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }:
melpaBuild {
pname = "elisp-refs";
- version = "20161205.444";
+ version = "20170528.1223";
src = fetchFromGitHub {
owner = "Wilfred";
repo = "refs.el";
- rev = "54b6221a06a32075d1d0c991f75f53c6c792830e";
- sha256 = "1xzm86l37fjiknqbsdv14n70mgaw0105i55fbl4rf0p9q4nircmv";
+ rev = "8f2da5ba5b728a8f278813c95d0fda3364cca40c";
+ sha256 = "0i0xjy4x3i349jbpbqhfz57frk8cdakwi78fw1mlycx4qinlx2n0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/60891099e241ebd32d39bdcfe4953529a5a3263e/recipes/elisp-refs";
@@ -17409,12 +17409,12 @@
elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }:
melpaBuild {
pname = "elm-mode";
- version = "20170322.1347";
+ version = "20170527.1917";
src = fetchFromGitHub {
owner = "jcollard";
repo = "elm-mode";
- rev = "3d36c16bbe1cebc285341452a60da578afbb2804";
- sha256 = "1aywgkf5505hx7qd0r4b8k89xmskkrz9imlmhp6xnwj31qs7ix63";
+ rev = "2edb123372624222e3510b5ce9b59c5e20a55a3e";
+ sha256 = "1yc3xbfx3ly6r5hicn4qm4rp27x6j4nm41cc0m7cshl7fdf83wzi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode";
@@ -17668,12 +17668,12 @@
elquery = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "elquery";
- version = "20170522.1934";
+ version = "20170527.1930";
src = fetchFromGitHub {
owner = "AdamNiederer";
repo = "elquery";
- rev = "b0bfc066c072c18797183f1d65b085f7b409fb5c";
- sha256 = "1dkr4xhhx2wvzsyl58f834025n4b9jw4n70nm87ypb1xkds7vm84";
+ rev = "d4309cfebb275495f071fc3449261bf6b23b0afe";
+ sha256 = "12qv4fg9dbgl6c05r501va9dcw16ml0yxkmvs32cr7wfffhxjy4w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/121f7d2091b83143402b44542db12e8f78275103/recipes/elquery";
@@ -18506,12 +18506,12 @@
emojify = callPackage ({ emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, seq }:
melpaBuild {
pname = "emojify";
- version = "20170401.954";
+ version = "20170528.147";
src = fetchFromGitHub {
owner = "iqbalansari";
repo = "emacs-emojify";
- rev = "4f365dc562c8c5642719faf85b7536278c561d2e";
- sha256 = "0j3ydg2n6dq77qpyhyqdkbxhfhzmml5b5h8cghsx0i5267grssph";
+ rev = "033e3b2fa171d73b932ecf27df237be2fd6e1c36";
+ sha256 = "0x8ydqzacrps0kl3j50ajp8fwxg8vnggvjpjbnrglkpwwn2j1kzr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/488d2751b5fd3bf00f5a6f0545530f44563b86d7/recipes/emojify";
@@ -18728,12 +18728,12 @@
ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }:
melpaBuild {
pname = "ensime";
- version = "20170522.2359";
+ version = "20170530.354";
src = fetchFromGitHub {
owner = "ensime";
repo = "ensime-emacs";
- rev = "b40cd66ac44d597fdb70fe539f42112f445fd49c";
- sha256 = "19wxprvr85qvq48w67njfflgyvb4snsh573zdmcb1fdq3pmqxdn9";
+ rev = "cccdd2f7caa9b5357f8021098e63384b4cae381c";
+ sha256 = "0fhzlawd2nq14a0b8yx6lnmmklh2s9y5i23nwz8zmwmxxivffn3z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime";
@@ -19260,12 +19260,12 @@
ereader = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, xml-plus }:
melpaBuild {
pname = "ereader";
- version = "20170508.2149";
+ version = "20170529.1408";
src = fetchFromGitHub {
owner = "bddean";
repo = "emacs-ereader";
- rev = "258807f77b203963dbc855c5e34da3d7f2751abc";
- sha256 = "0wnl7vfxgvz4qp3lpx48wl1mni1alkawm460nvivsr02dgmriwaa";
+ rev = "ef3cd7b9ced044bbd9a3e7cce0c78a970a483288";
+ sha256 = "0n0n7600zwa9z8srafq0gp6d17lkr4pkrsql50rl2qa1fr44zi7z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ereader";
@@ -19369,8 +19369,8 @@
src = fetchFromGitHub {
owner = "erlang";
repo = "otp";
- rev = "0ab4a336d0935c47b26cceb202ab63344c03b8a2";
- sha256 = "1vjrz6c3a7zbadbh6a5kd2w5fc1fk94l26hvzgxil02021f5sys9";
+ rev = "b182febe36aa63eb8290f24ba4b7932673a9a9bc";
+ sha256 = "0p45lcfm4qxzfrcw2pw53m19swgx1m1805v7vdgdkcm63qbdjalj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -20326,12 +20326,12 @@
evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }:
melpaBuild {
pname = "evil";
- version = "20170521.1211";
+ version = "20170528.1105";
src = fetchFromGitHub {
owner = "emacs-evil";
repo = "evil";
- rev = "6770774609373af2fc9e480f3a906a1d1c5becb0";
- sha256 = "05ldm0cvw79c4pypw1rzhjvykh4c1z8acg7hf3y9hqx5662f5qkn";
+ rev = "00ab2876f2849c3be9f5d7475e4538a0ffecf872";
+ sha256 = "06idkqrbh96vp6nb2835g4cgxdcxhp3nm7am46r5ylvgmflw9jf6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/514964d788f250e1e7893142bc094c63131bc6a5/recipes/evil";
@@ -20683,12 +20683,12 @@
evil-goggles = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-goggles";
- version = "20170508.1509";
+ version = "20170529.2251";
src = fetchFromGitHub {
owner = "edkolev";
repo = "evil-goggles";
- rev = "cb295a7f6882f7b885886aca8bb88ce119973f40";
- sha256 = "0w04plip3kf1kzky4528550jvlwbp965p41697fr7kwsc7ipymx4";
+ rev = "d2dfe823d5b1b70e4ed47518db98b238ff67b81a";
+ sha256 = "08hffzamrg3d8fqq94z7p9pywkzckhv6a58x7s1x7z8qvg2irlkz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/811b1261705b4c525e165fa9ee23ae191727a623/recipes/evil-goggles";
@@ -20914,12 +20914,12 @@
evil-mc = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-mc";
- version = "20170523.1902";
+ version = "20170526.1158";
src = fetchFromGitHub {
owner = "gabesoft";
repo = "evil-mc";
- rev = "ad72fa5743e8d9e638c6836deba122b2daaaac0d";
- sha256 = "165vp7a3v0fin9py7i7jdyp7x3jvdmik3vvxsgczgyqgrkqlvcml";
+ rev = "506f92dc610906fc279e50c598efe2068161edaa";
+ sha256 = "0ng2l70zllkvjsq2ybgdcdzyg0brplaznxr2y3qmbk72vgs3wxra";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/96770d778a03ab012fb82a3a0122983db6f9b0c4/recipes/evil-mc";
@@ -21061,12 +21061,12 @@
evil-org = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "evil-org";
- version = "20170514.755";
+ version = "20170528.1654";
src = fetchFromGitHub {
owner = "Somelauw";
repo = "evil-org-mode";
- rev = "25d159750fe90b9b42e2edf6390752e18b80e021";
- sha256 = "028bnvbmbxj47nhf8a2whf64jr1kzni8mszabsb11i6y7gs6w344";
+ rev = "7cd1903419b9681993210723fc854bd43ca080e5";
+ sha256 = "14jfvk7y102ba7ky8qanhpg46i6if3narshixlbnsb2jd26dyvh6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1768558ed0a0249421437b66fe45018dd768e637/recipes/evil-org";
@@ -21774,12 +21774,12 @@
exwm-x = callPackage ({ cl-lib ? null, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper, switch-window }:
melpaBuild {
pname = "exwm-x";
- version = "20170524.2329";
+ version = "20170528.2210";
src = fetchFromGitHub {
owner = "tumashu";
repo = "exwm-x";
- rev = "02e108cb8942d44b0ce241baf87f54f8a61a3b32";
- sha256 = "01cr6nhmma2yxpdvfzb7ms6sswhvppziy0aj5fz50pvqrlf3xjv1";
+ rev = "9f71ca70942724e7a0c0ec2723963961ed0980c8";
+ sha256 = "13dpqm1b58ivlb17nbsb0rxg5bm52r64y4x0k0pajqfyig2krsrd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a0e6e23bcffdcd1e17c70599c563609050e5de40/recipes/exwm-x";
@@ -23545,12 +23545,12 @@
flycheck-credo = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-credo";
- version = "20161121.2201";
+ version = "20170526.845";
src = fetchFromGitHub {
owner = "aaronjensen";
repo = "flycheck-credo";
- rev = "f773422c356c1c3b39fcece3cb7cc1257c7df517";
- sha256 = "0cq6lap4gndm801lj1q1wajpb03vz40hsdimr1n02p2k2dkrz8p3";
+ rev = "e88f11ead53805c361ec7706e44c3dfee1daa19f";
+ sha256 = "04i7fbqpkjpsfa8vjpkdhg1sj5isczxwncdp4vr9x3vll3svblm7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/88dfffe034135cc46d661f8173e8b14e0fb7f240/recipes/flycheck-credo";
@@ -24368,8 +24368,8 @@
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "301a0e421c1f0e1605ad5c132662c9363e7ae6af";
- sha256 = "11hmx6jp9shabf9xw86ny6ra3rh46jhjwn9q1c1k9q24mjny2pmx";
+ rev = "499db6f98cc725bca66d122bce571adcdfa32187";
+ sha256 = "10mgzyb3ccs781b7r37qfjw7ynhh9k8hqpahh9pcn3p462si341a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags";
@@ -25351,12 +25351,12 @@
flyspell-popup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
melpaBuild {
pname = "flyspell-popup";
- version = "20150926.803";
+ version = "20170529.115";
src = fetchFromGitHub {
owner = "xuchunyang";
repo = "flyspell-popup";
- rev = "f31d89ec60364ee24f89c90e9acc110bd86ea67f";
- sha256 = "1rdpggnw9mz3qr4kp5gh9nvwncivj446vdhpc04d4jgrl568bhqb";
+ rev = "29311849bfd253b9b689bf331860b4c4d3bd4dde";
+ sha256 = "0x7jilwb0fgzsr7ma59sgd0d4122cl0hwzr28vi3z5s8wdab7nc4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/186d00724137c055b521a5f5c54acf71c4b16c32/recipes/flyspell-popup";
@@ -25811,12 +25811,12 @@
forth-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "forth-mode";
- version = "20170516.2235";
+ version = "20170527.1230";
src = fetchFromGitHub {
owner = "larsbrinkhoff";
repo = "forth-mode";
- rev = "37da49757293baeca1180bb689aea181a4da81c2";
- sha256 = "1bqgyygdj5v78gsh3g7085719a45fblw3i9wkbljdrjmjpq006gw";
+ rev = "522256d98d1a909983bcfd3ae20c65226d5929b6";
+ sha256 = "110ycl8zkimy2818rhp3hk3mn2y25m695shdsy6dwxnrv90agss6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e46832079ee34c655835f06bf565ad5a5ab48ebd/recipes/forth-mode";
@@ -26171,12 +26171,12 @@
fstar-mode = callPackage ({ company, company-quickhelp, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, quick-peek, yasnippet }:
melpaBuild {
pname = "fstar-mode";
- version = "20170523.1755";
+ version = "20170529.2340";
src = fetchFromGitHub {
owner = "FStarLang";
repo = "fstar-mode.el";
- rev = "913857661425f8662ea4b6b734e39beb8743ef37";
- sha256 = "04q3jrqb3ivmbi3cq037fd81gpgc7nrhi13fhp83q7vl0piif621";
+ rev = "75444875c86fdf33b1604b26100cf5399d6aec86";
+ sha256 = "0a8nb947xab72pcahjz11jilnzasldi0ywcaxwviv6z6k92j8k62";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c58ace42342c3d3ff5a56d86a16206f2ecb45f77/recipes/fstar-mode";
@@ -26203,8 +26203,8 @@
version = "20170107.626";
src = fetchgit {
url = "git://factorcode.org/git/factor.git";
- rev = "72e6699279ac7ce2499405d64d524530789c8f58";
- sha256 = "0pdvqi7z9fkpg11dd376344d1p0wpz1yag5604dys32y90fpqs0w";
+ rev = "5b1198e20cc5b7e748835040bd5331b4618c419f";
+ sha256 = "0gyy77zm8mfx4krrdzdpivmzrfx3kp89sw7wipqpx6g4a4ji6pgz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel";
@@ -26329,8 +26329,8 @@
src = fetchFromGitHub {
owner = "HIPERFIT";
repo = "futhark";
- rev = "1e757116f2f1462fe429b8a058b351af12cf37eb";
- sha256 = "123d5q6c4gpgb2bmng1d7jzbhbac0l7vfln1hk46x42gd23p2r7c";
+ rev = "6a06fd8ce22d945edf6eb777d6b82f8859c5189f";
+ sha256 = "1jglv0f1lw5wf7xc9hmbgdbfn465qymp53wmy93k43k0zhg9nzpi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode";
@@ -26489,12 +26489,12 @@
fzf = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fzf";
- version = "20161226.936";
+ version = "20170527.2120";
src = fetchFromGitHub {
owner = "bling";
repo = "fzf.el";
- rev = "779254fe1ec7a0c9110af36fd039cece3040a312";
- sha256 = "1p0k71vz9v8vx5h85ph1krb9v0jyhmq73h91ws9zcxpf1bdgy050";
+ rev = "8d75f98cf904c3ab62e8cc54f2b8701c215620d7";
+ sha256 = "1rr0d937j078xyhlx5i305l5wavd3fcmvfqmdnbfwah8mfnp4kip";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1671e17c99ef1932c6a2e83fc4fa2e4eb6674bc8/recipes/fzf";
@@ -26676,12 +26676,12 @@
general = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "general";
- version = "20170328.954";
+ version = "20170528.336";
src = fetchFromGitHub {
owner = "noctuid";
repo = "general.el";
- rev = "fa0e6e2d2a9c06671fd44b5d938ea24387654525";
- sha256 = "0wnh24jnnf0kl291l36hykx86nrn74kqwxlwzd2llydbhk07sq8s";
+ rev = "a8470934373b2bdd67f38e46e1dd4fb963cee31b";
+ sha256 = "17hg6iw3dz1ssxvz1zm8c90927a2sf22yv31g2y7n98jnpq622bs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d86383b443622d78f6d8ff7b8ac74c8d72879d26/recipes/general";
@@ -26844,12 +26844,12 @@
ghc = callPackage ({ fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }:
melpaBuild {
pname = "ghc";
- version = "20160808.813";
+ version = "20170526.44";
src = fetchFromGitHub {
owner = "DanielG";
repo = "ghc-mod";
- rev = "e2490a1cf076ed0340f01e68e7962d65305f94f5";
- sha256 = "19bb7xrciqlrhjwdllq08wmsnkhvgnfc3q1kifgflxxs9c40fvxk";
+ rev = "8bfd542ad210debd00a0be9f15b21c90043b15d4";
+ sha256 = "04vjp5m25yyxhdzwc50g0qcggzhg1rs4kyj7d0ax0blfnqzggf2c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ghc";
@@ -27163,8 +27163,8 @@
src = fetchFromGitHub {
owner = "magit";
repo = "magit";
- rev = "cb891c3678c8ce2cc6919f5043d712a9439719a3";
- sha256 = "0n0i8880lc3pl7f05640xhjamvchdlif8l4gdcip7nvan1l1mbyp";
+ rev = "7c833ba867dc27346e4e16975e107cc49e8494ca";
+ sha256 = "03w5aascvkx5ajj0zbi0934f4yzjjshz8733z3jw7g4qwhwfp18f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
@@ -28610,8 +28610,8 @@
src = fetchFromGitHub {
owner = "golang";
repo = "lint";
- rev = "cb00e5669539f047b2f4c53a421a01b0c8e172c6";
- sha256 = "1wav8y5yps407znh0wspvcripbp2xjigqhzhgbv0adqsm9nyn70p";
+ rev = "a5f4a247366d8fc436941822e14fc3eac7727015";
+ sha256 = "0fixw5j4ypzaj5jni7d1pak8g0wv3c9h267x3nkyjdwwwqrxkwi0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/34f22d829257456abbc020c006b92da9c7a7860e/recipes/golint";
@@ -28673,8 +28673,8 @@
src = fetchFromGitHub {
owner = "google";
repo = "styleguide";
- rev = "c212f99186958f25d3d20994144ea11df923da79";
- sha256 = "1lhld1y3zxcj30fwjydiza4kfjpd2z1nc88kk7jkgzz670yk8qi4";
+ rev = "142b0e64babdb0066d2ffebfedb3c886fe75c680";
+ sha256 = "0vccg70zf0c7xx6acffrdvhvvih95fcgxq9dw4bsax46p2pffc6q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/google-c-style";
@@ -28923,8 +28923,8 @@
src = fetchFromGitHub {
owner = "vmware";
repo = "govmomi";
- rev = "8bff8355d10c46dcac74d3d64b2d38740f9e3dcd";
- sha256 = "1rjq72rsxwkk4ak657rh3f0lkqlpwxc5md55i77yi0l28rh3gsiq";
+ rev = "67b13b52bd135469ede5b0caa4b1f79e19d228d0";
+ sha256 = "15mpcp8pyg22d9a81nxv7zbwiqipvz7xfllkrrwn9ggb0vp3bj2q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc";
@@ -29049,8 +29049,8 @@
src = fetchFromGitHub {
owner = "Groovy-Emacs-Modes";
repo = "groovy-emacs-modes";
- rev = "be04a75f5b074a57978d006378db8f020fc5a891";
- sha256 = "0cn7rzm611cygl40p2g0n7ynl0cyp4f6dy8b29v051wrds5qg3z2";
+ rev = "ee8ba955af9709e705664cb8847a2e91cca5bcb2";
+ sha256 = "1j40rcxjak45ybwj9v0dai7hn49vq33sfk3gq41ky7j2xqdz2kv7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode";
@@ -29430,12 +29430,12 @@
groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "groovy-mode";
- version = "20170522.2244";
+ version = "20170529.46";
src = fetchFromGitHub {
owner = "Groovy-Emacs-Modes";
repo = "groovy-emacs-modes";
- rev = "be04a75f5b074a57978d006378db8f020fc5a891";
- sha256 = "0cn7rzm611cygl40p2g0n7ynl0cyp4f6dy8b29v051wrds5qg3z2";
+ rev = "ee8ba955af9709e705664cb8847a2e91cca5bcb2";
+ sha256 = "1j40rcxjak45ybwj9v0dai7hn49vq33sfk3gq41ky7j2xqdz2kv7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode";
@@ -29766,12 +29766,12 @@
hack-time-mode = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "hack-time-mode";
- version = "20170520.307";
+ version = "20170527.910";
src = fetchFromGitLab {
owner = "marcowahl";
repo = "hack-time-mode";
- rev = "8640a3b8eff72b869cf56941ba1b3104b01d25fc";
- sha256 = "04cp8sls5ci3nz5478gfyg8bzh7d5sn08z2rg93jfrax81dkvfx6";
+ rev = "73d6fcf8b39283526e5d4e3919193611e25a0898";
+ sha256 = "1w0idf28fhyn0qmjk1zgh80gzcrkgx5bc8mb0xamc20i53wpr4xl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6481dc9f487c5677f2baf1bffdf8f2297185345e/recipes/hack-time-mode";
@@ -30144,12 +30144,12 @@
haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "haskell-mode";
- version = "20170519.1555";
+ version = "20170526.2107";
src = fetchFromGitHub {
owner = "haskell";
repo = "haskell-mode";
- rev = "5b9a3e3688ff9f53eef190407568e851549b8c98";
- sha256 = "0yal4nsys37j55vrmdqjzzjcvzgmm2ri2dhyimp44dwq5c3ngyqv";
+ rev = "b0a5743f349e5e5b812291b5b06095aee1456656";
+ sha256 = "0ms4jf9zj2svyyh0rqbdbkx4rjll4rla7x5lzyiki7z27pf3c7df";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode";
@@ -30413,12 +30413,12 @@
helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
melpaBuild {
pname = "helm";
- version = "20170524.2011";
+ version = "20170527.2302";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm";
- rev = "da5a3396f82d6d0c32b4900beaf57893787a95f2";
- sha256 = "1m82wmq997l94yaglclkmh87dln0i9x2wy3m2cp72plkpa39awdp";
+ rev = "3396747e847a355b9cfbf7df1e851c507bd96381";
+ sha256 = "1x3b73l4yr2rf8czymxnhpnr7f74vhfybjkj8sp2slxhzjj4v644";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -31001,12 +31001,12 @@
helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "helm-core";
- version = "20170525.14";
+ version = "20170526.36";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm";
- rev = "da5a3396f82d6d0c32b4900beaf57893787a95f2";
- sha256 = "1m82wmq997l94yaglclkmh87dln0i9x2wy3m2cp72plkpa39awdp";
+ rev = "3396747e847a355b9cfbf7df1e851c507bd96381";
+ sha256 = "1x3b73l4yr2rf8czymxnhpnr7f74vhfybjkj8sp2slxhzjj4v644";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -32789,8 +32789,8 @@
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "301a0e421c1f0e1605ad5c132662c9363e7ae6af";
- sha256 = "11hmx6jp9shabf9xw86ny6ra3rh46jhjwn9q1c1k9q24mjny2pmx";
+ rev = "499db6f98cc725bca66d122bce571adcdfa32187";
+ sha256 = "10mgzyb3ccs781b7r37qfjw7ynhh9k8hqpahh9pcn3p462si341a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags";
@@ -34456,12 +34456,12 @@
hledger-mode = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, popup }:
melpaBuild {
pname = "hledger-mode";
- version = "20170520.812";
+ version = "20170525.748";
src = fetchFromGitHub {
owner = "narendraj9";
repo = "hledger-mode";
- rev = "8da51cf3cfd2ca87e8f767ad2fd28653c8ca260a";
- sha256 = "00685wld620bc149b6vz7kp9igb7va3m4ms5ml89gj9y40i70544";
+ rev = "6dacb781f48bc818286d8a63bcb23a93991ed292";
+ sha256 = "0vgmms7z5rfhjjh2gszyaqdnfhx585mlmn8mp54rrz9zbnqy5qnd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hledger-mode";
@@ -35960,12 +35960,12 @@
iflipb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "iflipb";
- version = "20170205.200";
+ version = "20170527.839";
src = fetchFromGitHub {
owner = "jrosdahl";
repo = "iflipb";
- rev = "8eb478535aa4847b94ea4ce29d9476a6b652be2b";
- sha256 = "0plvjg1nkq37mpdbli2fyqhvabzi18mq5kjrgxk9d6s6ki2m26kq";
+ rev = "e19229473be70e55c56a26ccc26c4e11e8be6389";
+ sha256 = "1ybnxl6zgzhxrwsqf54hz235xhz3rmxy7w459salb7rr2s1fqvlz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fad6fc8bc3c0be0d5789a0d7626ebc3f298b4318/recipes/iflipb";
@@ -37361,10 +37361,10 @@
}) {};
isearch-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
pname = "isearch-plus";
- version = "20170518.1419";
+ version = "20170529.1907";
src = fetchurl {
url = "https://www.emacswiki.org/emacs/download/isearch+.el";
- sha256 = "19pnnf3z2c0m3qma7xi27z0fnpxqdrkrwvwnnd0bv2n3k63rsj8f";
+ sha256 = "1lg8gciy9i44y80v9g2h5q8mg6dhi6abx2ssg6jws3nci0y5c0bl";
name = "isearch+.el";
};
recipeFile = fetchurl {
@@ -37593,8 +37593,8 @@
src = fetchFromGitHub {
owner = "abo-abo";
repo = "swiper";
- rev = "859eb7844ac608fa48186ee124b2ca4ea7e98c6c";
- sha256 = "0wg0ivfb354l8h3nj0178wzbkriik51cp8wvjn4c1q40w5lhdfbr";
+ rev = "c93194941c1ac36ee762b70dc9061ee830769f6a";
+ sha256 = "0i75kyh3si8x6k0bqj1055kcp8zzbv05sps4flmwh59vn4j8paca";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy";
@@ -37698,8 +37698,8 @@
src = fetchFromGitHub {
owner = "abo-abo";
repo = "swiper";
- rev = "859eb7844ac608fa48186ee124b2ca4ea7e98c6c";
- sha256 = "0wg0ivfb354l8h3nj0178wzbkriik51cp8wvjn4c1q40w5lhdfbr";
+ rev = "c93194941c1ac36ee762b70dc9061ee830769f6a";
+ sha256 = "0i75kyh3si8x6k0bqj1055kcp8zzbv05sps4flmwh59vn4j8paca";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra";
@@ -37782,8 +37782,8 @@
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "301a0e421c1f0e1605ad5c132662c9363e7ae6af";
- sha256 = "11hmx6jp9shabf9xw86ny6ra3rh46jhjwn9q1c1k9q24mjny2pmx";
+ rev = "499db6f98cc725bca66d122bce571adcdfa32187";
+ sha256 = "10mgzyb3ccs781b7r37qfjw7ynhh9k8hqpahh9pcn3p462si341a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags";
@@ -38347,8 +38347,8 @@
src = fetchFromGitHub {
owner = "jdee-emacs";
repo = "jdee";
- rev = "5b0bcf6db09d6f6d4ec68c1f3d748d91f189b5ea";
- sha256 = "1vq4x1kvwbynb7kb6mq03939dqg3jjj6jkhkl8jjc6lk3rz7fj29";
+ rev = "e572d4889604c0b4e1d9180b8a68f9c0f99b99d2";
+ sha256 = "1vhwza7xak2im2xp7qzs8b6bmnf9yw2di86rav8wh5xapqr8x7mn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a6d2c98f3bf2075e33d95c7befe205df802e798d/recipes/jdee";
@@ -38866,12 +38866,12 @@
js2-refactor = callPackage ({ dash, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, multiple-cursors, s, yasnippet }:
melpaBuild {
pname = "js2-refactor";
- version = "20170522.455";
+ version = "20170525.544";
src = fetchFromGitHub {
owner = "magnars";
repo = "js2-refactor.el";
- rev = "c2849d8e5c132126ca7cc8aa547c484513c19579";
- sha256 = "0aycbr4s6p8b22vmmpbmj0v63m74a64dka82vpg1iqf4x1xczb3p";
+ rev = "6ee315825b6f0424f15a8520733dc145c85ccd83";
+ sha256 = "14ykvbj5f9w5pk8l73k8niwr62slfx956px35zn51563sjs55gnd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8935264dfea9bacc89fef312215624d1ad9fc437/recipes/js2-refactor";
@@ -39408,12 +39408,12 @@
kaolin-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "kaolin-theme";
- version = "20170524.303";
+ version = "20170529.1516";
src = fetchFromGitHub {
owner = "0rdy";
repo = "kaolin-theme";
- rev = "16fde8b16e1ce0c42b9c9937bfa278b2233544ac";
- sha256 = "1cs6zfi4h6f38vbrswz3kj17m56dw4dg7hbqbvahqwzzxknrmbl0";
+ rev = "4b3dab02562eeadfb67ea07bc9f2c9d7b6be2d44";
+ sha256 = "1gqfpg2agf2ln8ca3qp14rwmh1blxrfwm1aai2n7bv2maz3b1lz9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d2abf9d914cdc210bbd47ea92d0dac76683e21f0/recipes/kaolin-theme";
@@ -39916,8 +39916,8 @@
src = fetchFromGitHub {
owner = "kivy";
repo = "kivy";
- rev = "b47d519a9a160489e85fe7ac9a44e926aca35a64";
- sha256 = "0b0f1614d2wsscngrzpyyqhi2dcnmlzybi4wqri060mh24xgizgf";
+ rev = "b7906e7456383c39555cd988f410043dbcca47a1";
+ sha256 = "1ifzx2z48l1g1livnmhngnaf875fgnnmv1p79j2w10xjwkasvff4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode";
@@ -40686,12 +40686,12 @@
ledger-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ledger-mode";
- version = "20170423.1748";
+ version = "20170529.647";
src = fetchFromGitHub {
owner = "ledger";
repo = "ledger-mode";
- rev = "348ba97b960d045bccbd9cb5a63697704c401315";
- sha256 = "0qcjdvzis6ws8z0laixakik26djjmcv021dbz00pjrwkcwfs5nwi";
+ rev = "7a987a57317272e9ffc1f7e8bb82045a2f4566f8";
+ sha256 = "0jazqm4cb4sai9qbb0pwnpql0x6s2w6mfwk32kzm7fn9iplih8rl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1549048b6f57fbe9d1f7fcda74b78a7294327b7b/recipes/ledger-mode";
@@ -40942,8 +40942,8 @@
src = fetchFromGitHub {
owner = "rvirding";
repo = "lfe";
- rev = "9cf7d7558d5a492587cfd0720e270f3f95efe379";
- sha256 = "1vh275mv950l4sapdk2kppr6934b8prjv486zvd6hy40898g4wlk";
+ rev = "c6422663ab03a3d8e9bee6413890d0fe93bc9556";
+ sha256 = "0lx5lxlql9pxgjqidb2k850i36qgx97jx15b24vv2s2l9f1skrw2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode";
@@ -41592,12 +41592,12 @@
live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "live-py-mode";
- version = "20170524.2216";
+ version = "20170528.2030";
src = fetchFromGitHub {
owner = "donkirkby";
repo = "live-py-plugin";
- rev = "6f4a6be975e4c1fb14ad3c15bcb2c851b03fcad0";
- sha256 = "04wgikflpbl98lyw51f48lkaswv7i8r32yzlwygy6524zs96n8yi";
+ rev = "5a04d426b33566027fdf5fd3090dfd315fda7314";
+ sha256 = "073cqwy2iw9ynrdbb8r9n4rnkk9j8zba91872sx2gyp47xkq6pjk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode";
@@ -41696,12 +41696,12 @@
load-relative = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "load-relative";
- version = "20170524.2323";
+ version = "20170526.310";
src = fetchFromGitHub {
owner = "rocky";
repo = "emacs-load-relative";
- rev = "d6b4b9f3797214213ec152c073f923677959a26d";
- sha256 = "0rcy1abw479i9jjv52z09l58vsphd1yx9gxi52abdfybf85sz1mw";
+ rev = "738896e3da491b35399178ed2c6bc92cc728d119";
+ sha256 = "1rpy5mfncncl6gqgg53d3g25g1700g4b9bivd4c0cfcv5dbxhp73";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f052f201f7c308325c27cc2423e85cf6b9b67b4e/recipes/load-relative";
@@ -42470,12 +42470,12 @@
magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
melpaBuild {
pname = "magit";
- version = "20170522.1835";
+ version = "20170528.740";
src = fetchFromGitHub {
owner = "magit";
repo = "magit";
- rev = "cb891c3678c8ce2cc6919f5043d712a9439719a3";
- sha256 = "0n0i8880lc3pl7f05640xhjamvchdlif8l4gdcip7nvan1l1mbyp";
+ rev = "7c833ba867dc27346e4e16975e107cc49e8494ca";
+ sha256 = "03w5aascvkx5ajj0zbi0934f4yzjjshz8733z3jw7g4qwhwfp18f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit";
@@ -42670,8 +42670,8 @@
src = fetchFromGitHub {
owner = "magit";
repo = "magit";
- rev = "cb891c3678c8ce2cc6919f5043d712a9439719a3";
- sha256 = "0n0i8880lc3pl7f05640xhjamvchdlif8l4gdcip7nvan1l1mbyp";
+ rev = "7c833ba867dc27346e4e16975e107cc49e8494ca";
+ sha256 = "03w5aascvkx5ajj0zbi0934f4yzjjshz8733z3jw7g4qwhwfp18f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup";
@@ -43275,12 +43275,12 @@
markdown-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "markdown-mode";
- version = "20170525.435";
+ version = "20170526.1213";
src = fetchFromGitHub {
owner = "jrblevin";
repo = "markdown-mode";
- rev = "cf0438d9a9f59344d7c43265160dc69f3e2ca5ed";
- sha256 = "00jp16sclpf2yi4asab1rm09skb1szrjga0wb91g9vq1qn01sr3s";
+ rev = "e9bb47d8d87ae8205ed935a3b485e12c12e43aa9";
+ sha256 = "1lccxj18zhhhrc87dzm8fd4989pgkvbfkrlp53bjbrzzkh9bd6vs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/74610ec93d4478e835f8b3b446279efc0c71d644/recipes/markdown-mode";
@@ -43846,12 +43846,12 @@
meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
melpaBuild {
pname = "meghanada";
- version = "20170522.908";
+ version = "20170525.2333";
src = fetchFromGitHub {
owner = "mopemope";
repo = "meghanada-emacs";
- rev = "b12faec5b6698852be441efdf86ac0ff30b03f07";
- sha256 = "0y9d0cvv5rdhcbsik3vilp6j1mgmnlwjpcvbhibgw4mfzaxcqz4k";
+ rev = "71e28b98653ff269a30ddf32d8ecef43a8656d76";
+ sha256 = "0wrxriqg3dn90za52pzsmvqaszkqmx0xmxkzghlq8s21xc21kznp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
@@ -45195,12 +45195,12 @@
monokai-alt-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "monokai-alt-theme";
- version = "20170325.1430";
+ version = "20170529.1607";
src = fetchFromGitHub {
owner = "dawidof";
repo = "emacs-monokai-theme";
- rev = "584aaf88b83a40bbbfeb6a7c89c5feecebf5a52b";
- sha256 = "1709f2gf8gdz5ppb0k3gxcg4z0r7kgcm2hpymji9gnag87nnx1m6";
+ rev = "09370802ddf6010a9a83b6c38cfc055e31433a73";
+ sha256 = "1dn8z2lj8kvgs0vxiiqm0wz73sgqykkbi32d6f7qa6i4ishyw341";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6ff05515c2f3bd80cb8d7de9afc8fd983e62ad91/recipes/monokai-alt-theme";
@@ -45695,12 +45695,12 @@
msvc = callPackage ({ ac-clang, cedet ? null, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "msvc";
- version = "20161221.558";
+ version = "20170528.2256";
src = fetchFromGitHub {
owner = "yaruopooner";
repo = "msvc";
- rev = "71c38323187c98b32250b89088768599bb216ddb";
- sha256 = "1wwa861a8bnrqv59bx6l5k3qi98wqv6cicvg5gjyx8rdvpcq28dg";
+ rev = "ffc7974f1cafb5e03bae2765afc6a984ffcb0f7e";
+ sha256 = "155bgayysdyr5a9wpx78azpipd11s3k8ijgw4mpvbmkk5j7fi6a8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/69939b85353a23f374cab996ede879ab315a323b/recipes/msvc";
@@ -46903,12 +46903,12 @@
neon-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "neon-mode";
- version = "20170524.452";
+ version = "20170529.637";
src = fetchFromGitHub {
owner = "Fuco1";
repo = "neon-mode";
- rev = "2a48a3b62a1082be2a68458b229be6d4f590be74";
- sha256 = "1mr2j39mp7vkjxvx0r2cggs73apbzr9ingwg2gwa47i3jbxnr8l0";
+ rev = "69edc4b051604143db8e044606bbcc0904a3829c";
+ sha256 = "09753w4psyzh583264nswk9313d9yh5s4aad3jc9qq5mg6ycb6iy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c6b2a4898bf21413c4d9e6714af129bbb0a23e1a/recipes/neon-mode";
@@ -47243,8 +47243,8 @@
src = fetchFromGitHub {
owner = "NixOS";
repo = "nix";
- rev = "a7e55151a8d45d987ca42ba318c44ed3ccdeecca";
- sha256 = "0qnnc8wbh55j2mpnywvj22ajcqfcdfismxbgkix45hq4nm5lkb1j";
+ rev = "6e01ecd112dce8d8bbe46c839f982892a3ffb589";
+ sha256 = "1gxsp2xf8lcqwk0f842g9cimc6k12cpf0m4rs0qv3v3mqqic985n";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode";
@@ -47551,11 +47551,11 @@
}) {};
notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
pname = "notmuch";
- version = "20170513.451";
+ version = "20170530.454";
src = fetchgit {
url = "git://git.notmuchmail.org/git/notmuch";
- rev = "523d2b50fcaae90cbe09975c1f1bc652ff521ec6";
- sha256 = "16srxq78phsd4bq4xqhz6jv70i4870b6r9rcgl5r332pmpx9anjk";
+ rev = "51cf6dbab220ca0f7c9f7472280adf02189ba437";
+ sha256 = "1ixdrg3ak0x8rnkckz392s91dhssrsh9hcg30606fhjd9nk811a5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
@@ -47734,6 +47734,27 @@
license = lib.licenses.free;
};
}) {};
+ nubox = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "nubox";
+ version = "20170528.109";
+ src = fetchFromGitHub {
+ owner = "martijnat";
+ repo = "nubox";
+ rev = "2ef0281511aa29347d79575449c3f44f91fd0f97";
+ sha256 = "0idd2sg68x02ishcziigkr5izvdrda5ra3imqgb1ilgfh6kgfqjw";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/725948568b8a067762b63475bc400f089f478a36/recipes/nubox";
+ sha256 = "0snzfsd765i363ykdhqkn65lqy97c79d20lalszrwcl2snm96n1f";
+ name = "nubox";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/nubox";
+ license = lib.licenses.free;
+ };
+ }) {};
number = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "number";
@@ -49611,12 +49632,12 @@
org-caldav = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "org-caldav";
- version = "20170520.1550";
+ version = "20170529.1205";
src = fetchFromGitHub {
owner = "dengste";
repo = "org-caldav";
- rev = "c492f4434a6c93c97d9b0baae2f18c038a1e99ca";
- sha256 = "1p7bjy4r0nqp3nnwhb23xsh8kbyp7g2kw8mcfn6y7abiwr7gmvcc";
+ rev = "4a618a03ef4a0c95d4f8ffe1c92e986c12a53416";
+ sha256 = "0sgwq7zwgr2khhyvf0a1b5fl616h8x05bd2bmm6437ih3fcx8mjy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-caldav";
@@ -50052,12 +50073,12 @@
org-evil = callPackage ({ dash, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, monitor, org }:
melpaBuild {
pname = "org-evil";
- version = "20161029.222";
+ version = "20170529.741";
src = fetchFromGitHub {
owner = "GuiltyDolphin";
repo = "org-evil";
- rev = "5349f4f50d8b16ac4d38ef70a2a7562632e193cc";
- sha256 = "112rr4cwldwnwhg0qdq6khfl41azxp0c4j5l4il06560s6h7dmjq";
+ rev = "6c98be7488fb0dc7cea8f88af6e432edb43e0e32";
+ sha256 = "0jlaspk11l0g8mqbwqiarn7ada1zgnxg9i68xgrjzhxmv1nw9mq5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/17a4772d409aa5dbda5fb84d86c237fd2653c70b/recipes/org-evil";
@@ -50219,12 +50240,12 @@
org-jira = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
melpaBuild {
pname = "org-jira";
- version = "20170416.2152";
+ version = "20170527.2154";
src = fetchFromGitHub {
owner = "ahungry";
repo = "org-jira";
- rev = "2ec35547088c090ae1ad71bbc943953f619611e6";
- sha256 = "1zfam31pjm8sg3j038vvd1jf3qi9jq3452vriqmzczbjfg3b7l7y";
+ rev = "4d8bda9b5207175ecd3ae647ebec42b3546efd49";
+ sha256 = "0877klmy48ad0rpy7azd4xbm9d07wrhr3g96sixx35wgp216kvlm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/730a585e5c9216a2428a134c09abcc20bc7c631d/recipes/org-jira";
@@ -50300,6 +50321,46 @@
license = lib.licenses.free;
};
}) {};
+ org-mac-iCal = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "org-mac-iCal";
+ version = "20140107.519";
+ src = fetchgit {
+ url = "git://orgmode.org/org-mode.git";
+ rev = "496b2a9855fe514b186890a1f883411ee566d294";
+ sha256 = "02b9sj1d11czwv3n1bkn38mjzc7pzxbs70hbixbzamiil0dpbyi0";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal";
+ sha256 = "1ilzvmw1x5incagp1vf8d9v9mz0krlv7bpv428gg3gpqzpm6kksw";
+ name = "org-mac-iCal";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/org-mac-iCal";
+ license = lib.licenses.free;
+ };
+ }) {};
+ org-mac-link = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "org-mac-link";
+ version = "20170105.1723";
+ src = fetchgit {
+ url = "git://orgmode.org/org-mode.git";
+ rev = "496b2a9855fe514b186890a1f883411ee566d294";
+ sha256 = "02b9sj1d11czwv3n1bkn38mjzc7pzxbs70hbixbzamiil0dpbyi0";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link";
+ sha256 = "02rmhrwikppppw8adnzvwj43kp9wsyk60csj5pygg7cd7wah7khw";
+ name = "org-mac-link";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/org-mac-link";
+ license = lib.licenses.free;
+ };
+ }) {};
org-mime = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-mime";
@@ -50480,11 +50541,11 @@
org-parser = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-parser";
- version = "20170516.2055";
+ version = "20170528.1324";
src = fetchhg {
url = "https://bitbucket.com/zck/org-parser.el";
- rev = "e46ab80dabac";
- sha256 = "1vw6vr4h82sk6fgfyfs7lw3jdcsz987hwxzgs023m3v6rx6bkk5c";
+ rev = "c4870192ea24";
+ sha256 = "04s39zfa1gwn6zclgdhz3b9fbgyqlbysh6hsn7iqkwfzkpmc2n9c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/28d55005cbce276cda21021a8d9368568cb4bcc6/recipes/org-parser";
@@ -50733,15 +50794,15 @@
license = lib.licenses.free;
};
}) {};
- org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, s }:
+ org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, pdf-tools, s }:
melpaBuild {
pname = "org-ref";
- version = "20170523.1821";
+ version = "20170526.1519";
src = fetchFromGitHub {
owner = "jkitchin";
repo = "org-ref";
- rev = "be4d43571e2d467795dae994b06d6c25ea6a4358";
- sha256 = "0kjs56w3fw59y4mvbishkxw5k9bg9fhgq7h0nph3qq2wbnxvqqlh";
+ rev = "d61770adfbc39dd8544db3a96724089d5bd6ded3";
+ sha256 = "16anl4ls66xm7vbcziwisg41jwzcd4cphxvrxv83vw52w24gqf1r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref";
@@ -50757,6 +50818,7 @@
hydra
ivy
key-chord
+ pdf-tools
s
];
meta = {
@@ -51905,8 +51967,8 @@
src = fetchFromGitHub {
owner = "jkitchin";
repo = "scimax";
- rev = "05bcb4eed383dc011f01c1d37afaa5869914e8c6";
- sha256 = "1sry1x3y2sb4ly7nvg78zdc67xf032f1w4640zdkaa50ywg0gkfb";
+ rev = "feaa96ff995237270f0ed0af861f59b544e484c9";
+ sha256 = "05idkkvnjrsfbrg0dhcvagsgbybvlqyiqnng5z6abqwbsp344hv2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/222ccf4480395bda8c582ad5faf8c7902a69370e/recipes/ox-clip";
@@ -53991,6 +54053,27 @@
license = lib.licenses.free;
};
}) {};
+ pfuture = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "pfuture";
+ version = "20170529.813";
+ src = fetchFromGitHub {
+ owner = "Alexander-Miller";
+ repo = "pfuture";
+ rev = "f6728c808ba96b19718ff4e15ac5173bf848b21d";
+ sha256 = "10v5rc1kcv3rd6mqksqc8bcc6w0w20fcz77fvgq0hxl88ng6vi4q";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/5fb70c9f56a58b5c7a2e8b69b191aa2fc7c9bcc8/recipes/pfuture";
+ sha256 = "15fr9wkpv8v1p22wz7hsyihq7f807ck105c2crfs8y7capfvs53s";
+ name = "pfuture";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/pfuture";
+ license = lib.licenses.free;
+ };
+ }) {};
pg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "pg";
@@ -54897,12 +54980,12 @@
plan9-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "plan9-theme";
- version = "20170520.1827";
+ version = "20170529.2212";
src = fetchFromGitHub {
owner = "john2x";
repo = "plan9-theme.el";
- rev = "111886d6eae152e102ad0ff6a859aad0b2026ec7";
- sha256 = "190hk15j96fb5ab82j0r0p63skyj3k2ndzrnidzddh1bknyv6nqd";
+ rev = "cdc50195f6579e6c3e6e8060142ce25b609f7949";
+ sha256 = "17grr5rvazh448qzrksxrgp0yclp32s2rxs4h5pygky7knb5vf3v";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cdc4c2bafaa09e38edd485a9091db689fbda2fe6/recipes/plan9-theme";
@@ -56750,12 +56833,12 @@
protobuf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "protobuf-mode";
- version = "20160805.1045";
+ version = "20170526.950";
src = fetchFromGitHub {
owner = "google";
repo = "protobuf";
- rev = "0b07d7eb9e15d897bfd3f3d569e0a66b2bb48d18";
- sha256 = "05ll1g420qg8414k9pxsgv7m0si5ksr2cva2455z9x8mbs53jyha";
+ rev = "1e86ef4e9f0b9c9e8bd8d62a61e141f139366920";
+ sha256 = "1cf87jxq8r56nxp4h9ig3q489lj7bb35wkasrw2yi48q9j445bw8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -57012,12 +57095,12 @@
puppet-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
melpaBuild {
pname = "puppet-mode";
- version = "20170421.2255";
+ version = "20170528.904";
src = fetchFromGitHub {
owner = "voxpupuli";
repo = "puppet-mode";
- rev = "e704bc790a96f5f3703b2c56e5a1b15bc4446937";
- sha256 = "07dcrpkyf3b2kpdgfxir3mvm1c5rs2zdbgv9ajkn9y0b9zvp0cm8";
+ rev = "c5a0fc884d0f33c3140585c9c7699ce0bc969f63";
+ sha256 = "0s9nza9v1qpjip5zig3374bn5jqw8fsn57ayqymbnp70nxdwcw6n";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1de94f0ab39ab18dfd0b050e337f502d894fb3ad/recipes/puppet-mode";
@@ -57518,8 +57601,8 @@
src = fetchFromGitHub {
owner = "PyCQA";
repo = "pylint";
- rev = "f515f28601e6ac2409d098affb913ed758d87a16";
- sha256 = "10xhvpnlcmr61h3j549ipy9ifxl3acvkcfcvrfyqyf2s5sak6sx8";
+ rev = "6f2b4ccf5542be7243db1b679c6f52e2e4acf504";
+ sha256 = "0966c47nja1mav4qixj9xr0529pxqqrh7j4vb9jk8l3hdky99vw9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint";
@@ -59965,12 +60048,12 @@
rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }:
melpaBuild {
pname = "rg";
- version = "20170522.1050";
+ version = "20170527.806";
src = fetchFromGitHub {
owner = "dajva";
repo = "rg.el";
- rev = "b55c4b380732d5186830dc03da0ab1c3a6ca105e";
- sha256 = "1fccb6p0w64vjmbgizysgnck1w2l6ym3xlrngzj1zc34rkbprbi4";
+ rev = "6069dafb4a71b8d8b6c8787d2b68f4745e0c9cae";
+ sha256 = "09xdpzp2yviqnxc7m2l1zy4rkyp1m8sdwyvsbbdqiiwa8pjg9gvf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg";
@@ -60364,12 +60447,12 @@
rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rtags";
- version = "20170523.711";
+ version = "20170527.450";
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "301a0e421c1f0e1605ad5c132662c9363e7ae6af";
- sha256 = "11hmx6jp9shabf9xw86ny6ra3rh46jhjwn9q1c1k9q24mjny2pmx";
+ rev = "499db6f98cc725bca66d122bce571adcdfa32187";
+ sha256 = "10mgzyb3ccs781b7r37qfjw7ynhh9k8hqpahh9pcn3p462si341a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags";
@@ -60430,8 +60513,8 @@
version = "20161115.2259";
src = fetchsvn {
url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/";
- rev = "58887";
- sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf";
+ rev = "58969";
+ sha256 = "1sfh2wr840mi08yx2y9vhrngl0190l7v964vfjgbbk8778ny6vzb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ruby-additional";
@@ -60511,8 +60594,8 @@
version = "20150424.752";
src = fetchsvn {
url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/";
- rev = "58887";
- sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf";
+ rev = "58969";
+ sha256 = "1sfh2wr840mi08yx2y9vhrngl0190l7v964vfjgbbk8778ny6vzb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/ruby-electric";
@@ -60948,12 +61031,12 @@
salt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-jinja2, mmm-mode, yaml-mode }:
melpaBuild {
pname = "salt-mode";
- version = "20170515.1320";
+ version = "20170526.1702";
src = fetchFromGitHub {
owner = "glynnforrest";
repo = "salt-mode";
- rev = "e6944cb4caf6c95509ac9774c634067635767f97";
- sha256 = "1fpypvgyf5vsqqz73v43ivi57jrxvd7pnr20w1lzp41gx15npk3q";
+ rev = "6f5776ab411aa62668e774c5cf2aaff22cae5401";
+ sha256 = "05fla50f9dmp3wb4wr8wx5j2mhfarsq50sbr0yi29kabyn3va9ig";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9dcf1a93a06fc42581521c88cfd988b03bedc000/recipes/salt-mode";
@@ -61137,12 +61220,12 @@
sbt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sbt-mode";
- version = "20170517.631";
+ version = "20170530.355";
src = fetchFromGitHub {
owner = "ensime";
repo = "emacs-sbt-mode";
- rev = "b85b4fd6802af62971d4f6ccef7811670af8c7fa";
- sha256 = "0d43737qs7v1nbr7xyj29v0yp5j257filbkvvbaszlhps4wgxk34";
+ rev = "736da7f466aad2b64c846ece258082c6aac647ae";
+ sha256 = "0idj4p3d36yp0irp1yfbihq8mf17jc7facz5qy6kx7zj0wdx4fjw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/364abdc3829fc12e19f00b534565227dbc30baad/recipes/sbt-mode";
@@ -61162,8 +61245,8 @@
src = fetchFromGitHub {
owner = "openscad";
repo = "openscad";
- rev = "6ba775b4d5f1ffee8aca0e4f453ceeb52f834897";
- sha256 = "0cq6mign7q7dmsmj5bfyvgnca6szx70wv3bfxsxwicf35sx2rvx8";
+ rev = "d1e295137589b5285e26c962d648f53c081bb972";
+ sha256 = "17y7db32836gj97k85hk8acvd0xvrdck3hb9j1qxmdzf16lmagfi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode";
@@ -61200,12 +61283,12 @@
scala-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "scala-mode";
- version = "20170323.502";
+ version = "20170530.356";
src = fetchFromGitHub {
owner = "ensime";
repo = "emacs-scala-mode";
- rev = "970d88eeff82df635ee12336ab1eb185585f30c6";
- sha256 = "0wfv20dyb13v7fbfsvy0k5dajvmyyhn80l6xyx6kppiv3qmy9s90";
+ rev = "52091426ee319b4ec53799696bae75571f7ecbf6";
+ sha256 = "15vr1yz23h0kb7h3d6gh3ljax762666lkz53chqgm54bszgfwjcm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/564aa1637485192a97803af46b3a1f8e0d042c9a/recipes/scala-mode";
@@ -62743,12 +62826,12 @@
shr-tag-pre-highlight = callPackage ({ emacs, fetchFromGitHub, fetchurl, language-detection, lib, melpaBuild }:
melpaBuild {
pname = "shr-tag-pre-highlight";
- version = "20170520.1021";
+ version = "20170525.902";
src = fetchFromGitHub {
owner = "xuchunyang";
repo = "shr-tag-pre-highlight.el";
- rev = "02ea683e2ae9f59a20f74cc59e98b3ff2301ac71";
- sha256 = "1j0ampyjfns20a2dk8zhvbwbn8d9az1ma9c9app9pfzvhmffw621";
+ rev = "bc1bff471cf4adcd86d87b8c045623aff3b20889";
+ sha256 = "1lyam12wilvv8ir3x0ylyfinjh9g65aq6ia1s314fr0gc8hjk5z6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7be3c139bee02e8bd9a9830026cbfdd17629ac4d/recipes/shr-tag-pre-highlight";
@@ -62803,6 +62886,27 @@
license = lib.licenses.free;
};
}) {};
+ shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "shx";
+ version = "20170529.2012";
+ src = fetchFromGitHub {
+ owner = "riscy";
+ repo = "shx-for-emacs";
+ rev = "bcdbc7142a0542639f47abb48fe17aa6c92f8406";
+ sha256 = "0wrxwjlkix5qgi3fvkaj9m43hyif9ba2bdyzc0hkig7ng0b99cjd";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx";
+ sha256 = "0h5ldglx4y85lm0pfilasnch2k82mlr7rb20qvarzwd41hb1az1k";
+ name = "shx";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/shx";
+ license = lib.licenses.free;
+ };
+ }) {};
sibilant-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sibilant-mode";
@@ -64971,12 +65075,12 @@
spaceline = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline, s }:
melpaBuild {
pname = "spaceline";
- version = "20170524.26";
+ version = "20170530.434";
src = fetchFromGitHub {
owner = "TheBB";
repo = "spaceline";
- rev = "f59fac1f8aa8820beefffc3a05d2e3c1e32c0d8d";
- sha256 = "0xll4cjbdk37l4kb6z7lc1hz2m4gxzxfnw3drfgl9cxac0501hcd";
+ rev = "d86fc0353cbf1a95df261e40ec5b7292b0d557f3";
+ sha256 = "1pj1rdfm2dxri6v2c1m8slpabdmbgqqr0cp23s5w4s39g0mmphvg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/46e4c876aeeb0bb0d0e81dcbb8363a5db9c3ff61/recipes/spaceline";
@@ -64992,12 +65096,12 @@
spaceline-all-the-icons = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize, spaceline }:
melpaBuild {
pname = "spaceline-all-the-icons";
- version = "20170517.1502";
+ version = "20170530.114";
src = fetchFromGitHub {
owner = "domtronn";
repo = "spaceline-all-the-icons.el";
- rev = "c2c0b9249204b8f9a405a63abf20d07ac8e8ef79";
- sha256 = "0frg52kdfygzz9r1w1d39dmlgksfy07p54xyrcpwfzkg0hh7b80y";
+ rev = "d5750c0aa40a66c6d76c74540587b8cbb0142350";
+ sha256 = "1rjb7jpbizafxixqrwzzxgbah0b8b8wsmqxzvqdv867i5w6682p2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d039e057c1d441592da8f54e6d524b395b030375/recipes/spaceline-all-the-icons";
@@ -66573,12 +66677,12 @@
suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }:
melpaBuild {
pname = "suggest";
- version = "20170326.321";
+ version = "20170525.1254";
src = fetchFromGitHub {
owner = "Wilfred";
repo = "suggest.el";
- rev = "2f8e52d9d34535899292799778fc1242342b64d9";
- sha256 = "18vpr0k3pd4cvmxaxhvl8abz78fpni8vk3mws89grjbb3fc4b17i";
+ rev = "13611ca0e4dfb8e6e4a314142368bfa7f0de5b9b";
+ sha256 = "0svlf2kgdbhwaygydvwvhinafiwv3qrgyn5wkfpcnz1km30g92hf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest";
@@ -66676,12 +66780,12 @@
suomalainen-kalenteri = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "suomalainen-kalenteri";
- version = "20151129.304";
+ version = "20170528.801";
src = fetchFromGitHub {
owner = "tlikonen";
repo = "suomalainen-kalenteri";
- rev = "f5907236ce4da372325fce8b3ce429defa5b0f5a";
- sha256 = "1f16ds671mp8jwkkhvpbdqkk3jji96q9ipjlr8ij9vglp2arvslg";
+ rev = "d380321ce7b7a5650847a7866bd98226af51d4b4";
+ sha256 = "1fcyh26zd7rpp0519kswgr9ps67flwwypw2ic3nwgjdhxb41kmzs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/181adf1b16253481674663fd28b195172231b7da/recipes/suomalainen-kalenteri";
@@ -66951,8 +67055,8 @@
src = fetchFromGitHub {
owner = "abo-abo";
repo = "swiper";
- rev = "859eb7844ac608fa48186ee124b2ca4ea7e98c6c";
- sha256 = "0wg0ivfb354l8h3nj0178wzbkriik51cp8wvjn4c1q40w5lhdfbr";
+ rev = "c93194941c1ac36ee762b70dc9061ee830769f6a";
+ sha256 = "0i75kyh3si8x6k0bqj1055kcp8zzbv05sps4flmwh59vn4j8paca";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper";
@@ -67094,12 +67198,12 @@
symbol-overlay = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "symbol-overlay";
- version = "20170513.2";
+ version = "20170528.119";
src = fetchFromGitHub {
owner = "wolray";
repo = "symbol-overlay";
- rev = "0ec27ba84bc8d3f467f351e8d03248d36cbeeaae";
- sha256 = "0mmy3q25jzlfn5lpwmp39pbkij9qsqx9p2lmya5h455pppggrqrq";
+ rev = "fcd6ffe97aeb3e9190610f29f1d69895771edcb6";
+ sha256 = "10iidqq7gz3cmkp8sxg0jwyn0hn6hrlnbvll62hdrb91cxa0hgnf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c2a468ebe1a3e5a35ef40c59a62befbf8960bd7b/recipes/symbol-overlay";
@@ -67888,12 +67992,12 @@
telephone-line = callPackage ({ cl-generic, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
melpaBuild {
pname = "telephone-line";
- version = "20170523.1416";
+ version = "20170528.1027";
src = fetchFromGitHub {
owner = "dbordak";
repo = "telephone-line";
- rev = "778d435ad2182ad7ffd344721ad7b4c720739a36";
- sha256 = "03snpsmbf54hi04bjhixpsmhcqlij3s4kfx82hgnl62mlhb0bjdv";
+ rev = "80b09f3357161705fce9ccee9ca23056e91ee2cf";
+ sha256 = "08wc37qw22rsmyzxqiz6d8mwq13j6r4i38lb4gk7kxjpqxwzblxc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9c998b70365fb0a210c3b9639db84034c7d45097/recipes/telephone-line";
@@ -68165,8 +68269,8 @@
src = fetchFromGitHub {
owner = "ternjs";
repo = "tern";
- rev = "21fd14f052252095a4a6238fb4d8916cb34d73ed";
- sha256 = "06bvha88wipc66z3v723ypzcwd5a9pfx4hzz5f5z2ws8ycx5sjxv";
+ rev = "a4db15583ea15cd7b62c706ea42a38bff9b418fb";
+ sha256 = "150snv08wv8fyzp3qif6yvfy1b24rrbdc50vzlz640rmcd6qhk59";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern";
@@ -68186,8 +68290,8 @@
src = fetchFromGitHub {
owner = "ternjs";
repo = "tern";
- rev = "21fd14f052252095a4a6238fb4d8916cb34d73ed";
- sha256 = "06bvha88wipc66z3v723ypzcwd5a9pfx4hzz5f5z2ws8ycx5sjxv";
+ rev = "a4db15583ea15cd7b62c706ea42a38bff9b418fb";
+ sha256 = "150snv08wv8fyzp3qif6yvfy1b24rrbdc50vzlz640rmcd6qhk59";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern-auto-complete";
@@ -68329,12 +68433,12 @@
test-simple = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "test-simple";
- version = "20170524.2323";
+ version = "20170527.832";
src = fetchFromGitHub {
owner = "rocky";
repo = "emacs-test-simple";
- rev = "e7c948e1cf22b8f85f0dd289a88a44d624b965c1";
- sha256 = "03d1bx42mcasli73c0iidch4188brim6ysysq3sl67n0ancpk3fz";
+ rev = "b3b69f52207d3a8111421ad7ab9ed82abbe85316";
+ sha256 = "0n400nmz3iyp50sdd4gz0bmfn1sfq5p6a69yv4zd09ypa9gkndws";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a4b76e053faee299f5b770a0e41aa615bf5fbf10/recipes/test-simple";
@@ -68683,8 +68787,8 @@
src = fetchFromGitHub {
owner = "apache";
repo = "thrift";
- rev = "e41e47c2b4b2407bac525d203b281c63fb253978";
- sha256 = "083926465cncjx93ykkdhp8z9gwf6wl5rmhh6dm85xc2d5j4an9z";
+ rev = "72ca60debae1d9fb35d9f0085118873669006d7f";
+ sha256 = "1hgqs1z2m2g3avid98bhgipsqp2478bpf1vby3c3f2xmymag0l74";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift";
@@ -69497,12 +69601,12 @@
traad = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, request, request-deferred, virtualenvwrapper }:
melpaBuild {
pname = "traad";
- version = "20170302.613";
+ version = "20170528.2302";
src = fetchFromGitHub {
owner = "abingham";
repo = "emacs-traad";
- rev = "6d797f124fd4e037df7727d7696328a95748b9af";
- sha256 = "1r3s7qjlf943h3wqc5plw0la0p54xmxzdj3iwaz9lymfxx6n3h72";
+ rev = "4b84b8b4cf43e1167b3d7fcc51eb7a16b62c26f1";
+ sha256 = "0mpx2wlw7fhqmgvya3vq7yfjqpab10wjbgpxyyd2ki15nwc4c0xd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2b3eb31c077fcaff94b74b757c1ce17650333943/recipes/traad";
@@ -69528,8 +69632,8 @@
src = fetchFromGitHub {
owner = "jorgenschaefer";
repo = "circe";
- rev = "1e90e5a89d07bd1584e990c35f5a9d564334a1ae";
- sha256 = "13pv21bk4khq97a7km7gpj8rmwkmcb1y1nk72w35b9kipxv76vg2";
+ rev = "13c605e639194c3da0c2e685056fac685f8c76a0";
+ sha256 = "0n7v0g332ml1ang2fjc8rjbi8h1f4bqazcqi8dlfn99vvv8kcd21";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/tracking";
@@ -70194,12 +70298,12 @@
typescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "typescript-mode";
- version = "20170424.2231";
+ version = "20170530.530";
src = fetchFromGitHub {
owner = "ananthakumaran";
repo = "typescript.el";
- rev = "e0b4a6cb31750314e827bbc57de9a35558b34fd9";
- sha256 = "0z9s1aacalc17inc6rxxmyp8ffwy4as0va96rwfmhq3lmhcbbclf";
+ rev = "4235b47a389bf04a95fa54e59695f60599dc918b";
+ sha256 = "1mkl8y1khzsggg08jmjj73f1gvvjy3z34i1vfrhik05qx1n9z3jz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d3f534a1e2cee4ad2e32e32802c5080207417b3d/recipes/typescript-mode";
@@ -70400,12 +70504,12 @@
ujelly-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ujelly-theme";
- version = "20170506.941";
+ version = "20170530.246";
src = fetchFromGitHub {
owner = "marktran";
repo = "color-theme-ujelly";
- rev = "148a173441e7371a01382446d683bfb251f00cc7";
- sha256 = "05bp1szqrbqh4hvd4gmhk9hfmki0xhib7z762bd4jabh6k68kap7";
+ rev = "30efb05b1135992eaa88c5755814b35291e1f343";
+ sha256 = "1j0hzbm5zhz3qrz264xmj60f4227yrly2namr5ys115pbvhhh4hc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/ujelly-theme";
@@ -70998,8 +71102,8 @@
src = fetchFromGitHub {
owner = "jwiegley";
repo = "use-package";
- rev = "4aa7d9a68a1a4a9f3e4b7a22fca3d8a2e45a8354";
- sha256 = "17s5zdmprjbzxy68ah0f7k1j7cxncdyy9qlx5707zrqxqbnwlfrn";
+ rev = "726eea13a3a4d75d630aac29d6b71d74d9dc69e3";
+ sha256 = "1r75ysdz6cj97vn46lj4g2a3hsab377f667a8bfs17rz007nddv4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3f9b52790e2a0bd579c24004873df5384e2ba549/recipes/use-package";
@@ -71040,8 +71144,8 @@
src = fetchFromGitHub {
owner = "diml";
repo = "utop";
- rev = "ea49d8e947e1cd5deeec813e78eba92ff5c6ff3b";
- sha256 = "17x6bbflqicwk489mkwsqqkb97nriqbgv5shp8p87p7ykkpiw21d";
+ rev = "ab45d0499f541884d009654d99c5014508c7c5bd";
+ sha256 = "0zp67asbn0kic4clc0r6hmmplq38rdvqfs561sw7zilh5wrnj5dy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/30489fe52b4031184e54f994770aa3291257bc9d/recipes/utop";
@@ -71393,12 +71497,12 @@
vdiff = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }:
melpaBuild {
pname = "vdiff";
- version = "20170523.516";
+ version = "20170525.1231";
src = fetchFromGitHub {
owner = "justbur";
repo = "emacs-vdiff";
- rev = "4a6f27b83ef0240c56587354277ba685d9834bc9";
- sha256 = "0ab5li8qb3jfy952vjhyqqwvmrpz40i961w61p7vlmpkw206mrm8";
+ rev = "66ae1ac324d9ec7ef87abee38f260734f036cf3d";
+ sha256 = "0d8zam8p6qyzjr99n0jpmjav429qkjgg59gidmhgf0cbx2pyvy8s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e90f19c8fa4b0d267d269b76f117995e812e899c/recipes/vdiff";
@@ -72500,12 +72604,12 @@
web-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "web-mode";
- version = "20170510.1127";
+ version = "20170529.1030";
src = fetchFromGitHub {
owner = "fxbois";
repo = "web-mode";
- rev = "2ed2b26348326e3bf814fff6f3bca8440b4b7416";
- sha256 = "18j0j5wq3ria0bllf6nfw97j4am1h2x51gxfn42hgdp027jdfn3j";
+ rev = "aef2a32f6e5e2fdb7f38a650b009a737c67959e2";
+ sha256 = "14x91pngh9i7r66inssc4jaqvzv2kb3bnbks5x2bhsidvls7s28r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode";
@@ -72857,12 +72961,12 @@
which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "which-key";
- version = "20170521.549";
+ version = "20170530.526";
src = fetchFromGitHub {
owner = "justbur";
repo = "emacs-which-key";
- rev = "32dad608abdb72c5d2df1e8bc3f3d350943d5c4e";
- sha256 = "0rpabggs9kbfy3lgqn29b2dc41fgq3i8vfbcxrnjqmy3i7amk8y1";
+ rev = "3144b4c1fc774b63fc2350a0171e8ef01ab63298";
+ sha256 = "1fyg4b5ngf4k30x9rb5n62w2y9awc1lasrszxp9bg6ydmigncans";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key";
@@ -72962,12 +73066,12 @@
whizzml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "whizzml-mode";
- version = "20170524.1937";
+ version = "20170525.818";
src = fetchFromGitHub {
owner = "whizzml";
repo = "whizzml-mode";
- rev = "662c60173cdb396fcb2386d7d7c774d26f16cd9f";
- sha256 = "1nyl1whhi3zrzb5b4vkmqdaggnxrqmzmw1amf7hbw0mvx5mpy9pa";
+ rev = "92986cbb260642c129b049950036b2b6698a8bd9";
+ sha256 = "01mxjyan8bbjxl055f8zbsydsn01iszk3qi3668aa6i1m3vsz60h";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/11f26b15c326c3b8541bac510579b32493916042/recipes/whizzml-mode";
@@ -73816,12 +73920,12 @@
writeroom-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, visual-fill-column }:
melpaBuild {
pname = "writeroom-mode";
- version = "20170502.1252";
+ version = "20170528.639";
src = fetchFromGitHub {
owner = "joostkremers";
repo = "writeroom-mode";
- rev = "9ccb0512b0dc5da103d857ab4c9b187f3c800f8f";
- sha256 = "0izs7h0wkzkq6071v1ic5gbxq5d4l63fs39cr2iz565qkrmda8v1";
+ rev = "d3252f54c8f9f37a19d6a21fb2291c3da7a7121a";
+ sha256 = "13nbls5qxz5z8firjxaip8m9vzfbbpxmwrmr01njbk4axpwrpj0z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/writeroom-mode";
@@ -74068,12 +74172,12 @@
xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "xah-fly-keys";
- version = "20170524.157";
+ version = "20170527.1910";
src = fetchFromGitHub {
owner = "xahlee";
repo = "xah-fly-keys";
- rev = "fe22efb182bec2e0a0a34731bcd4d53bc7bd24d2";
- sha256 = "005jbzp5kll2dx4k905fqz9p3a9q7626n6jgrgky1z3axb4w2s4a";
+ rev = "85748f769689d923ff7f88227c78ccd3315b8336";
+ sha256 = "07miaf7fgfl54pdjj7y6lymmk9yz1qyyvvdv4i1h1fshv07c57qd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fc1683be70d1388efa3ce00adc40510e595aef2b/recipes/xah-fly-keys";
@@ -74089,12 +74193,12 @@
xah-get-thing = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "xah-get-thing";
- version = "20170303.1530";
+ version = "20170527.1806";
src = fetchFromGitHub {
owner = "xahlee";
repo = "xah-get-thing-or-selection";
- rev = "1eef698b7be06fa49347798089ca1e2ed8484da5";
- sha256 = "0cysykwnwpy43mnx9fjiqk1r004ac6c7h92zhki8858bcgjnwzzk";
+ rev = "5adaf02b8a7464ffb81ae185edb48902a4c3a4d4";
+ sha256 = "16cxk55haln36m57pszxbbyx2h0dzdxagsj2zvm6i2nn0jhyy4v7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9e8dc32a5317f0ff0e72fa87220243dd742eb1ef/recipes/xah-get-thing";
@@ -74467,12 +74571,12 @@
xref-js2 = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
melpaBuild {
pname = "xref-js2";
- version = "20160803.116";
+ version = "20170530.126";
src = fetchFromGitHub {
owner = "NicolasPetton";
repo = "xref-js2";
- rev = "031def02271fdbe2e0ab30515c7291a239fea4e6";
- sha256 = "1i3gsv7npf6lg7hakky6yxn96aqjdlridj74l0vhj55j2w7ia6f8";
+ rev = "d5f93605405989529c2f66b542def6c32429b927";
+ sha256 = "1vzsw257xkqwlgfj8d5hnrirjhxzzs9d8ms40ihb2zwsxn70im53";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b5dab444ead98210b4ab3a6f9a61d013aed6d5b7/recipes/xref-js2";
@@ -74828,8 +74932,8 @@
src = fetchFromGitHub {
owner = "Kungsgeten";
repo = "yankpad";
- rev = "9a8789c6b20547545204e44f3c753fa84f9007c7";
- sha256 = "0g6jandrhm570szgm4dbak8m8md9s91vsn67napyppaclp5iwff0";
+ rev = "1742630496f1994fe0746f8079582da5a168232d";
+ sha256 = "09qjpkk9q4xw395afnzf3rmwaahsrzhx0793p77rrpxckg64hrgz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e64746d10f9e0158621a7c4dc41dc2eca6ad573c/recipes/yankpad";
@@ -75010,11 +75114,11 @@
}) {};
yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
pname = "yatex";
- version = "20170522.1944";
+ version = "20170528.1711";
src = fetchhg {
url = "https://www.yatex.org/hgrepos/yatex/";
- rev = "9db0e1522847";
- sha256 = "17f0n7la3p72n8qmdlfq1i9plr3cqc0gsd758lz103a8rbp9aj1d";
+ rev = "c940797c19ad";
+ sha256 = "17jc65kaf37c86karq5fl2417i5csq5gn4yqagjzlik1cd6vrj03";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex";
diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index 78d55a9ec47d..9491122a7ad0 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -587,6 +587,27 @@
license = lib.licenses.free;
};
}) {};
+ ac-rtags = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, rtags }:
+ melpaBuild {
+ pname = "ac-rtags";
+ version = "2.10";
+ src = fetchFromGitHub {
+ owner = "Andersbakken";
+ repo = "rtags";
+ rev = "3b3ace901f53827daef81d4c13658ec4feb318b4";
+ sha256 = "1lm0s1918zsnd4hmfzf3xfrd68ip2zjnr9ciyf4bwpd66y0zfrbk";
+ };
+ 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-slime = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, slime }:
melpaBuild {
pname = "ac-slime";
@@ -4006,12 +4027,12 @@
circe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "circe";
- version = "2.4";
+ version = "2.5";
src = fetchFromGitHub {
owner = "jorgenschaefer";
repo = "circe";
- rev = "87f2d8604e41c6caf68cff3fcf61b1f4d4e8a961";
- sha256 = "19mjzws9hiqhaa8v0wxa369m3qzam2axvhcqcrggdjjsr7hyhvwr";
+ rev = "13c605e639194c3da0c2e685056fac685f8c76a0";
+ sha256 = "0n7v0g332ml1ang2fjc8rjbi8h1f4bqazcqi8dlfn99vvv8kcd21";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/circe";
@@ -5112,22 +5133,22 @@
license = lib.licenses.free;
};
}) {};
- company-rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ company-rtags = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rtags }:
melpaBuild {
pname = "company-rtags";
- version = "2.9";
+ version = "2.10";
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "ffa21b5408a30a346815bc4db6e74e2c6562d936";
- sha256 = "0828i5lcbspacydjnbrp3zhgbw2gggaaizzm0qqgmvry4cs79bxv";
+ rev = "3b3ace901f53827daef81d4c13658ec4feb318b4";
+ sha256 = "1lm0s1918zsnd4hmfzf3xfrd68ip2zjnr9ciyf4bwpd66y0zfrbk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags";
sha256 = "0dicxbp3xn02pflrpfndj7hs494prvz64llsk1xpc2z23kfarp6f";
name = "company-rtags";
};
- packageRequires = [];
+ packageRequires = [ company emacs rtags ];
meta = {
homepage = "https://melpa.org/#/company-rtags";
license = lib.licenses.free;
@@ -7555,12 +7576,12 @@
easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "easy-hugo";
- version = "0.7.7";
+ version = "0.9.7";
src = fetchFromGitHub {
owner = "masasam";
repo = "emacs-easy-hugo";
- rev = "99833cf30cfd702e5f04f7c4cd80217f17a56d70";
- sha256 = "0a4g4zwwxl6gbql14fsnk1ax718vbdfjgczx5kwv3bl45ga928pc";
+ rev = "708bea9516812c6641ef8fc6f42dc087036addd8";
+ sha256 = "0yz0q3qvv9qxvwvjqd9zjqrrg6qxag092ni16vpni1mihw5803b8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo";
@@ -10912,12 +10933,12 @@
exwm-x = callPackage ({ cl-lib ? null, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper, switch-window }:
melpaBuild {
pname = "exwm-x";
- version = "0.8.1";
+ version = "1.0";
src = fetchFromGitHub {
owner = "tumashu";
repo = "exwm-x";
- rev = "a928743ea35b21efb574fb9c77ea65c5084cccd1";
- sha256 = "0pv3r2b5lr1dxq5pr9y0gra08aklja7vd6q5r0gbp8ac71xbrg2g";
+ rev = "47952c09e74fc0da3135e7ba0d4fef0eb88f98dc";
+ sha256 = "14mf388iygirlv7j5db2x5avn70b54mm34kd3y851n6i6yzgz7jw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a0e6e23bcffdcd1e17c70599c563609050e5de40/recipes/exwm-x";
@@ -12050,22 +12071,22 @@
license = lib.licenses.free;
};
}) {};
- flycheck-rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ flycheck-rtags = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, rtags }:
melpaBuild {
pname = "flycheck-rtags";
- version = "2.9";
+ version = "2.10";
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "ffa21b5408a30a346815bc4db6e74e2c6562d936";
- sha256 = "0828i5lcbspacydjnbrp3zhgbw2gggaaizzm0qqgmvry4cs79bxv";
+ rev = "3b3ace901f53827daef81d4c13658ec4feb318b4";
+ sha256 = "1lm0s1918zsnd4hmfzf3xfrd68ip2zjnr9ciyf4bwpd66y0zfrbk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags";
sha256 = "00v6shfs7piqapmyqyi0fk3182rcfa3p8wr2cm5vqlrana13kbw4";
name = "flycheck-rtags";
};
- packageRequires = [];
+ packageRequires = [ emacs flycheck rtags ];
meta = {
homepage = "https://melpa.org/#/flycheck-rtags";
license = lib.licenses.free;
@@ -12683,12 +12704,12 @@
flyspell-popup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
melpaBuild {
pname = "flyspell-popup";
- version = "0.2";
+ version = "0.3";
src = fetchFromGitHub {
owner = "xuchunyang";
repo = "flyspell-popup";
- rev = "a3890c9272c0cfa1e2cde6526f7d6280ad4af00c";
- sha256 = "1rk7fsill0salrhb4anbf698nd21nxj8pni35brbmv64nj9fhfic";
+ rev = "29311849bfd253b9b689bf331860b4c4d3bd4dde";
+ sha256 = "0x7jilwb0fgzsr7ma59sgd0d4122cl0hwzr28vi3z5s8wdab7nc4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/186d00724137c055b521a5f5c54acf71c4b16c32/recipes/flyspell-popup";
@@ -15679,12 +15700,12 @@
helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
melpaBuild {
pname = "helm";
- version = "2.7.0";
+ version = "2.7.1";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm";
- rev = "bdc6711656954562ed721545ac22ee3a507110a3";
- sha256 = "1zx41nwfpzc0zrzi3bm6pmja0rl1jl3brbybiww4f4kqh34d0ddj";
+ rev = "05a297dda6fe9dc42e04220275b0bf2a37b56582";
+ sha256 = "04l3sjvy5y7ph9h02y4jlasd98bihqn19ngpf2yhc0k5mdhkww1s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -15994,12 +16015,12 @@
helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "helm-core";
- version = "2.7.0";
+ version = "2.7.1";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm";
- rev = "bdc6711656954562ed721545ac22ee3a507110a3";
- sha256 = "1zx41nwfpzc0zrzi3bm6pmja0rl1jl3brbybiww4f4kqh34d0ddj";
+ rev = "05a297dda6fe9dc42e04220275b0bf2a37b56582";
+ sha256 = "04l3sjvy5y7ph9h02y4jlasd98bihqn19ngpf2yhc0k5mdhkww1s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -16957,6 +16978,27 @@
license = lib.licenses.free;
};
}) {};
+ helm-rtags = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, rtags }:
+ melpaBuild {
+ pname = "helm-rtags";
+ version = "2.10";
+ src = fetchFromGitHub {
+ owner = "Andersbakken";
+ repo = "rtags";
+ rev = "3b3ace901f53827daef81d4c13658ec4feb318b4";
+ sha256 = "1lm0s1918zsnd4hmfzf3xfrd68ip2zjnr9ciyf4bwpd66y0zfrbk";
+ };
+ 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-org = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-rubygems-org";
@@ -19161,6 +19203,27 @@
license = lib.licenses.free;
};
}) {};
+ ivy-rtags = callPackage ({ fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, rtags }:
+ melpaBuild {
+ pname = "ivy-rtags";
+ version = "2.10";
+ src = fetchFromGitHub {
+ owner = "Andersbakken";
+ repo = "rtags";
+ rev = "3b3ace901f53827daef81d4c13658ec4feb318b4";
+ sha256 = "1lm0s1918zsnd4hmfzf3xfrd68ip2zjnr9ciyf4bwpd66y0zfrbk";
+ };
+ 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-youtube = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, request }:
melpaBuild {
pname = "ivy-youtube";
@@ -21609,22 +21672,22 @@
license = lib.licenses.free;
};
}) {};
- markdown-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ markdown-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "markdown-mode";
- version = "2.1";
+ version = "2.2";
src = fetchFromGitHub {
owner = "jrblevin";
repo = "markdown-mode";
- rev = "c6eb56eff31f7961c9a00a5d18eaf939c2c40b7d";
- sha256 = "098lf4n4rpx00sm07sy8dwp683a4sb7x0p15mrfp268apir3kkxb";
+ rev = "e9bb47d8d87ae8205ed935a3b485e12c12e43aa9";
+ sha256 = "1lccxj18zhhhrc87dzm8fd4989pgkvbfkrlp53bjbrzzkh9bd6vs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/74610ec93d4478e835f8b3b446279efc0c71d644/recipes/markdown-mode";
sha256 = "0gfb3hp87kpcrvxax3m5hsaclwwk1qmxc73cg26smzd1kjfwgz14";
name = "markdown-mode";
};
- packageRequires = [ cl-lib ];
+ packageRequires = [ cl-lib emacs ];
meta = {
homepage = "https://melpa.org/#/markdown-mode";
license = lib.licenses.free;
@@ -21955,12 +22018,12 @@
meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
melpaBuild {
pname = "meghanada";
- version = "0.7.9";
+ version = "0.7.10";
src = fetchFromGitHub {
owner = "mopemope";
repo = "meghanada-emacs";
- rev = "b12faec5b6698852be441efdf86ac0ff30b03f07";
- sha256 = "0y9d0cvv5rdhcbsik3vilp6j1mgmnlwjpcvbhibgw4mfzaxcqz4k";
+ rev = "71e28b98653ff269a30ddf32d8ecef43a8656d76";
+ sha256 = "0wrxriqg3dn90za52pzsmvqaszkqmx0xmxkzghlq8s21xc21kznp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
@@ -22794,12 +22857,12 @@
msvc = callPackage ({ ac-clang, cedet ? null, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "msvc";
- version = "1.3.0";
+ version = "1.3.1";
src = fetchFromGitHub {
owner = "yaruopooner";
repo = "msvc";
- rev = "71c38323187c98b32250b89088768599bb216ddb";
- sha256 = "1wwa861a8bnrqv59bx6l5k3qi98wqv6cicvg5gjyx8rdvpcq28dg";
+ rev = "ffc7974f1cafb5e03bae2765afc6a984ffcb0f7e";
+ sha256 = "155bgayysdyr5a9wpx78azpipd11s3k8ijgw4mpvbmkk5j7fi6a8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/69939b85353a23f374cab996ede879ab315a323b/recipes/msvc";
@@ -24771,6 +24834,26 @@
license = lib.licenses.free;
};
}) {};
+ org-mac-iCal = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "org-mac-iCal";
+ version = "7.9.3.5";
+ src = fetchgit {
+ url = "git://orgmode.org/org-mode.git";
+ rev = "592dc2ee7e4c80b9b61efb77117c8dc22d6cefd1";
+ sha256 = "0rvsn085r1sgvv0gwvjlfgn7371bjd254hdzamc97m122pqr7cxr";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal";
+ sha256 = "1ilzvmw1x5incagp1vf8d9v9mz0krlv7bpv428gg3gpqzpm6kksw";
+ name = "org-mac-iCal";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/org-mac-iCal";
+ license = lib.licenses.free;
+ };
+ }) {};
org-mime = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-mime";
@@ -29480,12 +29563,12 @@
rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rtags";
- version = "2.9";
+ version = "2.10";
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "ffa21b5408a30a346815bc4db6e74e2c6562d936";
- sha256 = "0828i5lcbspacydjnbrp3zhgbw2gggaaizzm0qqgmvry4cs79bxv";
+ rev = "3b3ace901f53827daef81d4c13658ec4feb318b4";
+ sha256 = "1lm0s1918zsnd4hmfzf3xfrd68ip2zjnr9ciyf4bwpd66y0zfrbk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags";
@@ -29925,8 +30008,8 @@
src = fetchFromGitHub {
owner = "ensime";
repo = "emacs-scala-mode";
- rev = "970d88eeff82df635ee12336ab1eb185585f30c6";
- sha256 = "0wfv20dyb13v7fbfsvy0k5dajvmyyhn80l6xyx6kppiv3qmy9s90";
+ rev = "52091426ee319b4ec53799696bae75571f7ecbf6";
+ sha256 = "15vr1yz23h0kb7h3d6gh3ljax762666lkz53chqgm54bszgfwjcm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/564aa1637485192a97803af46b3a1f8e0d042c9a/recipes/scala-mode";
@@ -30546,6 +30629,27 @@
license = lib.licenses.free;
};
}) {};
+ shr-tag-pre-highlight = callPackage ({ emacs, fetchFromGitHub, fetchurl, language-detection, lib, melpaBuild }:
+ melpaBuild {
+ pname = "shr-tag-pre-highlight";
+ version = "1";
+ src = fetchFromGitHub {
+ owner = "xuchunyang";
+ repo = "shr-tag-pre-highlight.el";
+ rev = "bc1bff471cf4adcd86d87b8c045623aff3b20889";
+ sha256 = "1lyam12wilvv8ir3x0ylyfinjh9g65aq6ia1s314fr0gc8hjk5z6";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/7be3c139bee02e8bd9a9830026cbfdd17629ac4d/recipes/shr-tag-pre-highlight";
+ sha256 = "1v8fqx8bd5504r2mflq6x8xs3k0py3bgsnadz3bjs68yhaxacj3v";
+ name = "shr-tag-pre-highlight";
+ };
+ packageRequires = [ emacs language-detection ];
+ meta = {
+ homepage = "https://melpa.org/#/shr-tag-pre-highlight";
+ license = lib.licenses.free;
+ };
+ }) {};
shrink-whitespace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "shrink-whitespace";
@@ -30588,6 +30692,27 @@
license = lib.licenses.free;
};
}) {};
+ shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "shx";
+ version = "0.0.3";
+ src = fetchFromGitHub {
+ owner = "riscy";
+ repo = "shx-for-emacs";
+ rev = "bcdbc7142a0542639f47abb48fe17aa6c92f8406";
+ sha256 = "0wrxwjlkix5qgi3fvkaj9m43hyif9ba2bdyzc0hkig7ng0b99cjd";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx";
+ sha256 = "0h5ldglx4y85lm0pfilasnch2k82mlr7rb20qvarzwd41hb1az1k";
+ name = "shx";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/shx";
+ license = lib.licenses.free;
+ };
+ }) {};
sift = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sift";
@@ -31515,12 +31640,12 @@
spaceline-all-the-icons = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize, spaceline }:
melpaBuild {
pname = "spaceline-all-the-icons";
- version = "1.3.2";
+ version = "1.3.3";
src = fetchFromGitHub {
owner = "domtronn";
repo = "spaceline-all-the-icons.el";
- rev = "c2c0b9249204b8f9a405a63abf20d07ac8e8ef79";
- sha256 = "0frg52kdfygzz9r1w1d39dmlgksfy07p54xyrcpwfzkg0hh7b80y";
+ rev = "d5750c0aa40a66c6d76c74540587b8cbb0142350";
+ sha256 = "1rjb7jpbizafxixqrwzzxgbah0b8b8wsmqxzvqdv867i5w6682p2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d039e057c1d441592da8f54e6d524b395b030375/recipes/spaceline-all-the-icons";
@@ -33442,12 +33567,12 @@
tracking = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "tracking";
- version = "2.4";
+ version = "2.5";
src = fetchFromGitHub {
owner = "jorgenschaefer";
repo = "circe";
- rev = "87f2d8604e41c6caf68cff3fcf61b1f4d4e8a961";
- sha256 = "19mjzws9hiqhaa8v0wxa369m3qzam2axvhcqcrggdjjsr7hyhvwr";
+ rev = "13c605e639194c3da0c2e685056fac685f8c76a0";
+ sha256 = "0n7v0g332ml1ang2fjc8rjbi8h1f4bqazcqi8dlfn99vvv8kcd21";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/tracking";
@@ -34078,12 +34203,12 @@
utop = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "utop";
- version = "1.19.3";
+ version = "2.0.1";
src = fetchFromGitHub {
owner = "diml";
repo = "utop";
- rev = "ee81ce49bab31757837bed35a182d29cbd54dfcb";
- sha256 = "1p2vjxw0y6py5hly6vjl4gxm171n9pr4rkimxd0rg3dl1npvn99z";
+ rev = "d658bd8f63ed6b23144fdba2ee3f2a6d77979c4f";
+ sha256 = "1x96zxkvfq8mshgi654vvklrr7dqvq9can89n4jrrb82pcn06k5j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/30489fe52b4031184e54f994770aa3291257bc9d/recipes/utop";
@@ -34726,22 +34851,22 @@
license = lib.licenses.free;
};
}) {};
- web-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ web-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "web-mode";
- version = "14.1";
+ version = "15";
src = fetchFromGitHub {
owner = "fxbois";
repo = "web-mode";
- rev = "44de4e0198051b52110d50d860db26ed770219f3";
- sha256 = "0pbim6aw0w9z5bb0hl98bda1a19pjmfki6jr1mxcfi5yismk2863";
+ rev = "aef2a32f6e5e2fdb7f38a650b009a737c67959e2";
+ sha256 = "14x91pngh9i7r66inssc4jaqvzv2kb3bnbks5x2bhsidvls7s28r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode";
sha256 = "1vyhyc5nf4yj2m63inpwmcqvlsihaqw8nn8xvfdg44nhl6vjz97i";
name = "web-mode";
};
- packageRequires = [];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/web-mode";
license = lib.licenses.free;
@@ -34939,12 +35064,12 @@
which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "which-key";
- version = "2.0.1";
+ version = "3.0.1";
src = fetchFromGitHub {
owner = "justbur";
repo = "emacs-which-key";
- rev = "3c7ecc69d48258af66978a685aedcbc8d1ada512";
- sha256 = "1q6v4bnw9sl6f138lxkqp979xpbgsb57gxj8a1k7clms16kkn5ci";
+ rev = "3ff303b50495d492cfac70cc9f7321971928bdb1";
+ sha256 = "1q0rg13lq31fqnkpkss61pfyx7ib7i4r1jbcavpjyr5gqcb08fzm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key";
@@ -35442,12 +35567,12 @@
writeroom-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, visual-fill-column }:
melpaBuild {
pname = "writeroom-mode";
- version = "3.6.1";
+ version = "3.7";
src = fetchFromGitHub {
owner = "joostkremers";
repo = "writeroom-mode";
- rev = "f853350da848d0814f822587ae310e52d895f523";
- sha256 = "1al4ch96p0c8qf51pqv62nl3cwz05w8s2cgkxl01ff3l9y7qjsvz";
+ rev = "d3252f54c8f9f37a19d6a21fb2291c3da7a7121a";
+ sha256 = "13nbls5qxz5z8firjxaip8m9vzfbbpxmwrmr01njbk4axpwrpj0z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/writeroom-mode";
@@ -35906,8 +36031,8 @@
version = "1.78";
src = fetchhg {
url = "https://www.yatex.org/hgrepos/yatex/";
- rev = "9db0e1522847";
- sha256 = "17f0n7la3p72n8qmdlfq1i9plr3cqc0gsd758lz103a8rbp9aj1d";
+ rev = "c940797c19ad";
+ sha256 = "17jc65kaf37c86karq5fl2417i5csq5gn4yqagjzlik1cd6vrj03";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex";
diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index fdcd7636c02e..f48ce6a4ce44 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -26,17 +26,18 @@ stdenv.mkDerivation rec {
postPatch = ''
patchShebangs share/extensions
patchShebangs fix-roff-punct
- '';
- # Python is used at run-time to execute scripts, e.g., those from
- # the "Effects" menu.
- propagatedBuildInputs = [ python2Env ];
+ # Python is used at run-time to execute scripts, e.g., those from
+ # the "Effects" menu.
+ substituteInPlace src/extension/implementation/script.cpp \
+ --replace '"python-interpreter", "python"' '"python-interpreter", "${python2Env}/bin/python"'
+ '';
buildInputs = [
pkgconfig perl perlXMLParser libXft libpng zlib popt boehmgc
libxml2 libxslt glib gtkmm2 glibmm libsigcxx lcms boost gettext
makeWrapper intltool gsl poppler imagemagick libwpg librevenge
- libvisio libcdr libexif automake114x potrace cmake
+ libvisio libcdr libexif automake114x potrace cmake python2Env
];
enableParallelBuilding = true;
diff --git a/pkgs/applications/networking/cluster/pachyderm/default.nix b/pkgs/applications/networking/cluster/pachyderm/default.nix
index a0df23e6f623..c276c2e752fd 100644
--- a/pkgs/applications/networking/cluster/pachyderm/default.nix
+++ b/pkgs/applications/networking/cluster/pachyderm/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "pachyderm-${version}";
- version = "1.3.0";
+ version = "1.4.6";
rev = "v${version}";
goPackagePath = "github.com/pachyderm/pachyderm";
@@ -12,7 +12,7 @@ buildGoPackage rec {
inherit rev;
owner = "pachyderm";
repo = "pachyderm";
- sha256 = "0y25xh6h7p8hg0bzrjlschmz62r6dwh5mrvbnni1hb1pm0w9jb6g";
+ sha256 = "1fivihn9s04lmzdiwg0f05qm708fb14xy81pbc31wxdyjw28m8ns";
};
meta = with lib; {
diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index c89f871b1c5f..0173a8985756 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -48,13 +48,9 @@ in {
sha256 = "0ibgpcpvz0bmn3cw60nzsabsrxrbmmym1hv7fx6zmjxiwd68w5gb";
};
- terraform_0_9_4 = generic {
- version = "0.9.4";
- sha256 = "07vcmjyl0y48hm5lqqzdd51hmrxapvywzbdkg5f3rcqd7dn9c2xs";
- postPatch = ''
- rm builtin/providers/dns/data_dns_cname_record_set_test.go
- rm builtin/providers/vsphere/resource_vsphere_file_test.go
- '';
- doCheck = true;
+ terraform_0_9_6 = generic {
+ version = "0.9.6";
+ sha256 = "1f6z1zkklzpqgc7akgdz1g306ccmhni5lmg7i6g762n3qai60bnv";
+ doCheck = true;
};
}
diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix
index cdb9c142da65..94adef2dda89 100644
--- a/pkgs/applications/networking/instant-messengers/dino/default.nix
+++ b/pkgs/applications/networking/instant-messengers/dino/default.nix
@@ -13,13 +13,13 @@
}:
stdenv.mkDerivation rec {
- name = "dino-unstable-2017-05-11";
+ name = "dino-unstable-2017-05-31";
src = fetchFromGitHub {
owner = "dino";
repo = "dino";
- rev = "b09a056a13de131a4f2f072ffa2f795a0bb2abe7";
- sha256 = "1dis1kgaqb1925anmxlcy9n722zzyn5wvq8lmczi6h2h3j7wnnmz";
+ rev = "2480c1ec26a8e0ccef3ea76e3c29566221405ffb";
+ sha256 = "0wdjj38gbr2j6yklna3pd8nsfpdfp1j936dy8s49pzayw4pxs2g2";
fetchSubmodules = true;
};
diff --git a/pkgs/applications/networking/insync/default.nix b/pkgs/applications/networking/insync/default.nix
index 86cc9bded10d..7beb489178b6 100644
--- a/pkgs/applications/networking/insync/default.nix
+++ b/pkgs/applications/networking/insync/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
name = "insync-${version}";
- version = "1.3.13.36129";
+ version = "1.3.16.36155";
src = fetchurl {
url = "http://s.insynchq.com/builds/insync-portable_${version}_amd64.tar.bz2";
- sha256 = "18d8ww529nvhwcl5k31qmkzb83k9753ics0dw64w202r8vwbm3cd";
+ sha256 = "1gf1qg7mkbcgqhwxkiljmd1w2zvarq6vhxhips3w06bqdyg12210";
};
buildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix
index 4800fa938a0e..d4e1bf39f1aa 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.2";
+ version = "1.8.3";
src = fetchurl {
url = "http://ftp.mutt.org/pub/mutt/${name}.tar.gz";
- sha256 = "0dgjjryp1ggbc6ivy9cfz5jl3gnbahb6d6hcwn7c7wk5npqpn18x";
+ sha256 = "0hpd896mw630sd6ps60hpka8cg691nvr627n8kmabv7zcxnp90cv";
};
patchPhase = optionalString (openssl != null) ''
diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix
index 41967f50bd05..146cb3b0e464 100644
--- a/pkgs/applications/video/smplayer/default.nix
+++ b/pkgs/applications/video/smplayer/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, qmakeHook, qtscript }:
stdenv.mkDerivation rec {
- name = "smplayer-17.4.2";
+ name = "smplayer-17.6.0";
src = fetchurl {
url = "mirror://sourceforge/smplayer/${name}.tar.bz2";
- sha256 = "1lc5pj0y56yynygb7cnl98lpvsf82rc0aa4si8isn81nvy07hmq5";
+ sha256 = "0kgrkn50sgr79jfj66p59wka17prnxibf7fbfpg5m0n95kdkr7rg";
};
buildInputs = [ qtscript ];
diff --git a/pkgs/applications/video/smtube/default.nix b/pkgs/applications/video/smtube/default.nix
index ea0bd083b1d8..3f0aff6a15b9 100644
--- a/pkgs/applications/video/smtube/default.nix
+++ b/pkgs/applications/video/smtube/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, qmakeHook, qtscript, qtwebkit }:
stdenv.mkDerivation rec {
- version = "17.1.0";
+ version = "17.5.0";
name = "smtube-${version}";
src = fetchurl {
url = "mirror://sourceforge/smtube/SMTube/${version}/${name}.tar.bz2";
- sha256 = "1kg45qkr7nvchy9ih24vlbpkn6vd8v8qw5xqsjhjpjkizcmzaa61";
+ sha256 = "13m0ll18n1da8i4r4b7gn0jjz9dgrkkyk9mpfas4rgnjw92m5jld";
};
makeFlags = [
diff --git a/pkgs/development/arduino/arduino-core/default.nix b/pkgs/development/arduino/arduino-core/default.nix
index fbc139c314fd..fdb9d1be6ad2 100644
--- a/pkgs/development/arduino/arduino-core/default.nix
+++ b/pkgs/development/arduino/arduino-core/default.nix
@@ -54,25 +54,25 @@ let
+ stdenv.lib.optionalString (!withGui) "-core";
in
stdenv.mkDerivation rec {
- version = "1.6.12";
+ version = "1.8.2";
name = "${flavor}-${version}";
src = fetchFromGitHub {
owner = "arduino";
repo = "Arduino";
rev = "${version}";
- sha256 = "0rz8dv1mncwx2wkafakxqdi2y0rq3f72fr57cg0z5hgdgdm89lkh";
+ sha256 = "1ssznjmzmahayslj2xnci9b5wpsl53nyg85say54akng93qipmfb";
};
teensyduino_src = fetchurl {
- url = "http://www.pjrc.com/teensy/td_131/TeensyduinoInstall.${teensy_architecture}";
+ url = "https://www.pjrc.com/teensy/td_136/TeensyduinoInstall.${teensy_architecture}";
sha256 =
lib.optionalString ("${teensy_architecture}" == "linux64")
- "1q4wv6s0900hyv9z1mjq33fr2isscps4q3bsy0h12wi3l7ir94g9"
+ "0qvb5z9y6nsqy0kzib9fvvbn8dakl50vib6r3nm6bnpvyxzwjl2r"
+ lib.optionalString ("${teensy_architecture}" == "linux32")
- "06fl951f44avqyqim5qmy73siylbqcnsmz55zmj2dzhgf4sflkvc"
+ "14ca62vq7cpx269vfd92shi80qj8spf0dzli8gfcb39ss2zc4jf1"
+ lib.optionalString ("${teensy_architecture}" == "linuxarm")
- "0ldf33w8wkqwklcj8fn4p22f23ibpwpf7873dc6i2jfmmbx0yvxn";
+ "122z1gxcgkmwjb8wdklb2w8c3qkj5rc1ap5n4a8fi3kjz29va9rx";
};
buildInputs = [ jdk ant libusb libusb1 unzip zlib ncurses5 readline
@@ -93,6 +93,10 @@ stdenv.mkDerivation rec {
cp -v $file_src $file_dst
done
+ # Deliberately break build.xml's download statement in order to cause
+ # an error if anything needed is missing from download.nix.
+ substituteInPlace build/build.xml --replace "get src" "get error"
+
cd ./arduino-core && ant
cd ../build && ant
cd ..
@@ -208,7 +212,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Open-source electronics prototyping platform";
homepage = http://arduino.cc/;
- license = stdenv.lib.licenses.gpl2;
+ license = if withTeensyduino then licenses.unfreeRedistributable else licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ antono auntie robberer bjornfor ];
};
diff --git a/pkgs/development/arduino/arduino-core/downloads.nix b/pkgs/development/arduino/arduino-core/downloads.nix
index 9d3ed56bee99..f74da9773724 100644
--- a/pkgs/development/arduino/arduino-core/downloads.nix
+++ b/pkgs/development/arduino/arduino-core/downloads.nix
@@ -2,28 +2,28 @@
{
"build/shared/reference-1.6.6-3.zip" = fetchurl {
- url = "http://downloads.arduino.cc/reference-1.6.6-3.zip";
+ url = "https://downloads.arduino.cc/reference-1.6.6-3.zip";
sha256 = "119nj1idz85l71fy6a6wwsx0mcd8y0ib1wy0l6j9kz88nkwvggy3";
};
"build/shared/Galileo_help_files-1.6.2.zip" = fetchurl {
- url = "http://downloads.arduino.cc/Galileo_help_files-1.6.2.zip";
+ url = "https://downloads.arduino.cc/Galileo_help_files-1.6.2.zip";
sha256 = "0qda0xml353sfhjmx9my4mlcyzbf531k40dcr1cnsa438xp2fw0w";
};
"build/shared/Edison_help_files-1.6.2.zip" = fetchurl {
- url = "http://downloads.arduino.cc/Edison_help_files-1.6.2.zip";
+ url = "https://downloads.arduino.cc/Edison_help_files-1.6.2.zip";
sha256 = "1x25rivmh0zpa6lr8dafyxvim34wl3wnz3r9msfxg45hnbjqqwan";
};
- "build/Firmata-2.5.3.zip" = fetchurl {
- url = "https://github.com/arduino-libraries/Firmata/archive/2.5.3.zip";
- sha256 = "1ims6bdmwv8lgcvd4ri4i39vqm1q5jbwirmki35bybqqb1sl171v";
+ "build/Firmata-2.5.6.zip" = fetchurl {
+ url = "https://github.com/arduino-libraries/Firmata/archive/2.5.6.zip";
+ sha256 = "117dd4pdlgv60gdlgm2ckjfq89i0dg1q8vszg6hxywdf701c1fk4";
};
"build/Bridge-1.6.3.zip" = fetchurl {
url = "https://github.com/arduino-libraries/Bridge/archive/1.6.3.zip";
sha256 = "1lha5wkzz63bgcn7bhx4rmgsh9ywa47lffycpyz6qjnl1pvm5mmj";
};
- "build/Robot_Control-1.0.2.zip" = fetchurl {
- url = "https://github.com/arduino-libraries/Robot_Control/archive/1.0.2.zip";
- sha256 = "1wdpz3ilnza3lfd5a628dryic46j72h4a89y8vp0qkbscvifcvdk";
+ "build/Robot_Control-1.0.3.zip" = fetchurl {
+ url = "https://github.com/arduino-libraries/Robot_Control/archive/1.0.3.zip";
+ sha256 = "1pc3b8skbpx7j32jnxa67mfqhnsmfz3876pc9mdyzpsad4mmcn62";
};
"build/Robot_Motor-1.0.2.zip" = fetchurl {
url = "https://github.com/arduino-libraries/Robot_Motor/archive/1.0.2.zip";
@@ -37,9 +37,9 @@
url = "https://github.com/arduino-libraries/SpacebrewYun/archive/1.0.1.zip";
sha256 = "1zs6ymlzw66bglrm0x6d3cvr52q85c8rlm525x0wags111xx3s90";
};
- "build/Temboo-1.1.7.zip" = fetchurl {
- url = "https://github.com/arduino-libraries/Temboo/archive/1.1.7.zip";
- sha256 = "0fq2q6qs0qp15njsl9dif8dkpxgb4cgg8jk3s5y0fcz9lb8m2j50";
+ "build/Temboo-1.2.1.zip" = fetchurl {
+ url = "https://github.com/arduino-libraries/Temboo/archive/1.2.1.zip";
+ sha256 = "1fyzfihsbcjpjasqbmbbfcall2zl48nzrp4xk9pslppal31mvl8x";
};
"build/Esplora-1.0.4.zip" = fetchurl {
url = "https://github.com/arduino-libraries/Esplora/archive/1.0.4.zip";
@@ -53,72 +53,100 @@
url = "https://github.com/arduino-libraries/Keyboard/archive/1.0.1.zip";
sha256 = "1spv73zhjbrb0vgpzjnh6wr3bddlbyzv78d21dbn8z2l0aqv2sac";
};
+ "build/SD-1.1.1.zip" = fetchurl {
+ url = "https://github.com/arduino-libraries/SD/archive/1.1.1.zip";
+ sha256 = "0nackcf7yx5np1s24wnsrcjl8j0nlmqqir6316vqqkfayvb1247n";
+ };
+ "build/Servo-1.1.2.zip" = fetchurl {
+ url = "https://github.com/arduino-libraries/Servo/archive/1.1.2.zip";
+ sha256 = "14k1883qrx425wnm0r8kszzq32yvvs3jwxf3g7ybp7v0ga0q47l7";
+ };
+ "build/Adafruit_CircuitPlayground-1.6.4.zip" = fetchurl {
+ url = "https://github.com/Adafruit/Adafruit_CircuitPlayground/archive/1.6.4.zip";
+ sha256 = "1ph7m0l1sfx9db56n2h6vi78pn3zyah813lfhqiqghncx34amrhj";
+ };
"build/libastylej-2.05.1-3.zip" = fetchurl {
- url = "http://downloads.arduino.cc/libastylej-2.05.1-3.zip";
+ url = "https://downloads.arduino.cc/libastylej-2.05.1-3.zip";
sha256 = "0a1xy2cdl0xls5r21vy5d2j1dapn1jsdw0vbimlwnzfx7r84mxa6";
};
- "build/liblistSerials-1.1.4.zip" = fetchurl {
- url = "http://downloads.arduino.cc/liblistSerials/liblistSerials-1.1.4.zip";
- sha256 = "1w0zs155hs5b87i5wj049hfj2jsnf9jk30qq93wz1mxab01261v0";
+ "build/liblistSerials-1.4.0.zip" = fetchurl {
+ url = "https://downloads.arduino.cc/liblistSerials/liblistSerials-1.4.0.zip";
+ sha256 = "129mfbyx7snq3znzhkfbdjiifdr85cwk6wjn8l9ia0wynszs5zyv";
};
- "build/shared/WiFi101-Updater-ArduinoIDE-Plugin-0.8.0.zip" = fetchurl {
- url = "https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.8.0/WiFi101-Updater-ArduinoIDE-Plugin-0.8.0.zip";
- sha256 = "0fp4mb1qa3w02hrwd51wf261l8ywcl36mi9wipsrgx2y29pk759z";
+ "build/shared/WiFi101-Updater-ArduinoIDE-Plugin-0.9.0.zip" = fetchurl {
+ url = "https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.9.0/WiFi101-Updater-ArduinoIDE-Plugin-0.9.0.zip";
+ sha256 = "1nkk87q2l3bs9y387hdxzgqllm0lqpmc5kdmr6my4hjz5lcpgbza";
};
}
// optionalAttrs (system == "x86_64-linux") {
- "build/arduino-builder-linux64-1.3.21_r1.tar.bz2" = fetchurl {
- url = "http://downloads.arduino.cc/tools/arduino-builder-linux64-1.3.21_r1.tar.bz2";
- sha256 = "1cqx5smzm4dhbj2ah191vbbxi0l7xj95c5gcdbgqm9283hrpfrn7";
+ "build/arduino-builder-linux64-1.3.25.tar.bz2" = fetchurl {
+ url = "https://downloads.arduino.cc/tools/arduino-builder-linux64-1.3.25.tar.bz2";
+ sha256 = "15y80p255w2rg028vc8dq4hpqsmf770qigv3hgf78npb4qrjnqqf";
};
- "build/linux/avr-gcc-4.9.2-atmel3.5.3-arduino2-x86_64-pc-linux-gnu.tar.bz2" = fetchurl {
- url = "http://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.3-arduino2-x86_64-pc-linux-gnu.tar.bz2";
- sha256 = "124icbjh28cax6pgg6bzrfdi27shsn9mjjshgrr93pczpg8sc0rr";
+ "build/linux/avr-gcc-4.9.2-atmel3.5.4-arduino2-x86_64-pc-linux-gnu.tar.bz2" = fetchurl {
+ url = "https://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.4-arduino2-x86_64-pc-linux-gnu.tar.bz2";
+ sha256 = "132qm8l6h50z4s9h0i5mfv6bp0iia0pp9kc3gd37hkajy4bh4j0r";
};
- "build/linux/avrdude-6.3.0-arduino6-x86_64-pc-linux-gnu.tar.bz2" = fetchurl {
- url = "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino6-x86_64-pc-linux-gnu.tar.bz2";
- sha256 = "08b6dbllnvzv1aqx0v037zks4r3vqcx6yxxv040wf431mmf8gd4p";
+ "build/linux/avrdude-6.3.0-arduino9-x86_64-pc-linux-gnu.tar.bz2" = fetchurl {
+ url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino9-x86_64-pc-linux-gnu.tar.bz2";
+ sha256 = "0shz5ymnlsrbnaqcb13fwbd73hz9k45adw14gf1ywjgywa2cpk68";
+ };
+ "build/linux/arduinoOTA-1.1.1-linux_amd64.tar.bz2" = fetchurl {
+ url = "https://downloads.arduino.cc/tools/arduinoOTA-1.1.1-linux_amd64.tar.bz2";
+ sha256 = "0xy25srvpz6d0yfnz8b17mkmary3k51lb1cvgw7n2zyxayjd0npb";
};
}
// optionalAttrs (system == "i686-linux") {
- "build/arduino-builder-linux32-1.3.21_r1.tar.bz2" = fetchurl {
- url = "http://downloads.arduino.cc/tools/arduino-builder-linux32-1.3.21_r1.tar.bz2";
- sha256 = "1prfwb5scprvd74gihd78ibsdy3806b0fsjhgyj9in4w1q8s3dxj";
+ "build/arduino-builder-linux32-1.3.25.tar.bz2" = fetchurl {
+ url = "https://downloads.arduino.cc/tools/arduino-builder-linux32-1.3.25.tar.bz2";
+ sha256 = "0hjiqbf7xspdcr7lganqnl68qcmndc9pz06dghkrwzbzc5ki72qr";
};
- "build/linux/avr-gcc-4.9.2-atmel3.5.3-arduino2-i686-pc-linux-gnu.tar.bz2" = fetchurl {
- url = "http://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.3-arduino2-i686-pc-linux-gnu.tar.bz2";
- sha256 = "0s7chsp1jyk477zvfaraf0yacvlzahkwqxpws4k0kjadghg9a27i";
+ "build/linux/avr-gcc-4.9.2-atmel3.5.4-arduino2-i686-pc-linux-gnu.tar.bz2" = fetchurl {
+ url = "https://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.4-arduino2-i686-pc-linux-gnu.tar.bz2";
+ sha256 = "1d81z5m4cklv29hgb5ywrmyq64ymlwmjx2plm1gzs1mcpg7d9ab3";
};
- "build/linux/avrdude-6.3.0-arduino6-i686-pc-linux-gnu.tar.bz2" = fetchurl {
- url = "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino6-i686-pc-linux-gnu.tar.bz2";
- sha256 = "1yyn016b5162j94nmqcznfabi5y2ly27z2whr77387bvjnqc8jsz";
+ "build/linux/avrdude-6.3.0-arduino9-i686-pc-linux-gnu.tar.bz2" = fetchurl {
+ url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino9-i686-pc-linux-gnu.tar.bz2";
+ sha256 = "12r1drjafxwzrvf1y1glxd46rv870mhz1ifn0g328ciwivas4da2";
+ };
+ "build/linux/arduinoOTA-1.1.1-linux_386.tar.bz2" = fetchurl {
+ url = "https://downloads.arduino.cc/tools/arduinoOTA-1.1.1-linux_386.tar.bz2";
+ sha256 = "1vvilbbbvv68svxzyhjspacbavcqakph5glhnz7c0mxkspqixjbs";
};
}
// optionalAttrs (system == "x86_64-darwin") {
- "build/arduino-builder-macosx-1.3.21_r1.tar.bz2" = fetchurl {
- url = "http://downloads.arduino.cc/tools/arduino-builder-macosx-1.3.21_r1.tar.bz2";
- sha256 = "06y5j1z9jjnqa7v6nl9dflm1qqpf3ar1jc53zxgdgsrb9c473d8l";
+ "build/arduino-builder-macosx-1.3.25.tar.bz2" = fetchurl {
+ url = "https://downloads.arduino.cc/tools/arduino-builder-macosx-1.3.25.tar.bz2";
+ sha256 = "0inkxjzdplb8b17j7lyam6v9gca25rxmsinrkgqnx3xxgkaxz2k0";
};
- "build/linux/avr-gcc-4.9.2-arduino5-i386-apple-darwin11.tar.bz2" = fetchurl {
- url = "http://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.3-arduino2-i386-apple-darwin11.tar.bz2";
- sha256 = "12r4a1q7mh1gbasy7lqn0p4acg699lglw7il9d5f5vwd32pmh4ii";
+ "build/macosx/avr-gcc-4.9.2-atmel3.5.4-arduino2-i386-apple-darwin11.tar.bz2" = fetchurl {
+ url = "https://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.4-arduino2-i386-apple-darwin11.tar.bz2";
+ sha256 = "0c27i3y4f5biinxjdpp43wbj00lz7dvl08pnqr7hpkzaalsyvcv7";
};
- "build/linux/avrdude-6.3.0-arduino6-i386-apple-darwin11.tar.bz2" = fetchurl {
- url = "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino6-i386-apple-darwin11.tar.bz2";
- sha256 = "11703f0r82aq3mmkiy7vwa4jfjhs9826qpp724hbng9dx74kk86r";
+ "build/macosx/avrdude-6.3.0-arduino9-i386-apple-darwin11.tar.bz2" = fetchurl {
+ url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino9-i386-apple-darwin11.tar.bz2";
+ sha256 = "0rc4x8mcsva4v6j7ssfj8rdyg14l2pd9ivgdm39m5wnz8b06p85z11703f0r82aq3mmkiy7vwa4jfjhs9826qpp724hbng9dx74kk86r";
+ };
+ "build/macosx/appbundler/appbundler-1.0ea-arduino4.jar.zip" = fetchurl {
+ url = "https://downloads.arduino.cc/appbundler-1.0ea-arduino4.jar.zip";
+ sha256 = "1vz0g98ancfqdf7yx5m3zrxmzb3fwp18zh5lkh2nyl5xlr9m368z";
};
}
// optionalAttrs (system == "armv6l-linux") {
- "build/arduino-builder-arm-1.3.21_r1.tar.bz2" = fetchurl {
- url = "http://downloads.arduino.cc/tools/arduino-builder-arm-1.3.21_r1.tar.bz2";
- sha256 = "1ik6r5n6g20x4pb0vbxbkqxgzj39f13n995ki9xgpsrq22x6g1n4";
+ "build/arduino-builder-linuxarm-1.3.25.tar.bz2" = fetchurl {
+ url = "https://downloads.arduino.cc/tools/arduino-builder-linuxarm-1.3.25.tar.bz2";
+ sha256 = "1jvlihpcbdv1sgq1wjdwp7dhznk7nd88zin6yj40kr80gcd2ykry";
};
- "build/linux/avr-gcc-4.9.2-arduino5-armhf-pc-linux-gnu.tar.bz2" = fetchurl {
- url = "http://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.3-arduino2-armhf-pc-linux-gnu.tar.bz2";
- sha256 = "08b8z7ca0wcgzxmjz6q5ihjrm3i10frnrcqpvwjrlsxw37ah1wvp";
+ "build/linux/avr-gcc-4.9.2-atmel3.5.4-arduino2-armhf-pc-linux-gnu.tar.bz2" = fetchurl {
+ url = "https://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.4-arduino2-armhf-pc-linux-gnu.tar.bz2";
+ sha256 = "033jb1vmspcxsv0w9pk73xv195xnbnmckjsiccgqs8xx36g00dpf";
};
- "build/linux/avrdude-6.3.0-arduino6-armhf-pc-linux-gnu.tar.bz2" = fetchurl {
- url = "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino6-armhf-pc-linux-gnu.tar.bz2";
- sha256 = "1rybp4hgk0mm7dydr3rj7yx59jzi30s4kyadzkjv13nm4ds209i4";
+ "build/linux/avrdude-6.3.0-arduino9-armhf-pc-linux-gnu.tar.bz2" = fetchurl {
+ url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino9-armhf-pc-linux-gnu.tar.bz2";
+ sha256 = "1kp1xry97385zbrs94j285h1gqlzyyhkchh26z7zq6c0wi5879i5";
+ };
+ "build/linux/arduinoOTA-1.1.1-linux_arm.tar.bz2" = fetchurl {
+ url = "https://downloads.arduino.cc/tools/arduinoOTA-1.1.1-linux_arm.tar.bz2";
+ sha256 = "0k1pib8lmvk6c0y3m038fj3mc18ax1hy3kbvgd5nygrxvy1hv274";
};
}
diff --git a/pkgs/development/compilers/iasl/default.nix b/pkgs/development/compilers/iasl/default.nix
index 934fbeeb6f9b..5e0970ea12f4 100644
--- a/pkgs/development/compilers/iasl/default.nix
+++ b/pkgs/development/compilers/iasl/default.nix
@@ -1,11 +1,12 @@
{stdenv, fetchurl, bison, flex}:
-stdenv.mkDerivation {
- name = "iasl-20130117";
+stdenv.mkDerivation rec {
+ name = "iasl-${version}";
+ version = "20170303";
src = fetchurl {
- url = http://www.acpica.org/download/acpica-unix-20130117.tar.gz;
- sha256 = "1zils7l7gnkbbl8916dlhvij1g625ryb7769zhzffn3flshfdivh";
+ url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz";
+ sha256 = "1dc933rr11gv1nlaf5j8ih1chdakbjbjkn34jgbm330zppmck4y0";
};
NIX_CFLAGS_COMPILE = "-O3";
diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix
index 8090732ddee6..8e7d19e089fd 100644
--- a/pkgs/development/haskell-modules/default.nix
+++ b/pkgs/development/haskell-modules/default.nix
@@ -2,6 +2,7 @@
, compilerConfig ? (self: super: {})
, packageSetConfig ? (self: super: {})
, overrides ? (self: super: {})
+, initialPackages ? import ./hackage-packages.nix
}:
let
@@ -10,7 +11,7 @@ let
inherit (import ./lib.nix { inherit pkgs; }) overrideCabal makePackageSet;
haskellPackages = makePackageSet {
- package-set = import ./hackage-packages.nix;
+ package-set = initialPackages;
inherit ghc;
};
diff --git a/pkgs/development/libraries/irrlicht/default.nix b/pkgs/development/libraries/irrlicht/default.nix
index 71bb871a45d7..bc3e1a20abba 100644
--- a/pkgs/development/libraries/irrlicht/default.nix
+++ b/pkgs/development/libraries/irrlicht/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
'';
buildPhase = ''
- make sharedlib NDEBUG=1
+ make sharedlib NDEBUG=1 "LDFLAGS=-lX11 -lGL -lXxf86vm"
'';
preInstall = ''
diff --git a/pkgs/development/node-packages/composition-v4.nix b/pkgs/development/node-packages/composition-v4.nix
index 8c4a5390f554..b78bbda5d5e7 100644
--- a/pkgs/development/node-packages/composition-v4.nix
+++ b/pkgs/development/node-packages/composition-v4.nix
@@ -1,8 +1,8 @@
-# This file has been generated by node2nix 1.2.0. Do not edit!
+# This file has been generated by node2nix 1.1.1. Do not edit!
{pkgs ? import {
inherit system;
- }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-4_x"}:
+ }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs"}:
let
nodeEnv = import ./node-env.nix {
diff --git a/pkgs/development/node-packages/composition-v6.nix b/pkgs/development/node-packages/composition-v6.nix
index ea30c5b04c4d..02a2fc1f3de3 100644
--- a/pkgs/development/node-packages/composition-v6.nix
+++ b/pkgs/development/node-packages/composition-v6.nix
@@ -1,4 +1,4 @@
-# This file has been generated by node2nix 1.2.0. Do not edit!
+# This file has been generated by node2nix 1.1.1. Do not edit!
{pkgs ? import {
inherit system;
diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix
index 356e78f027bf..bd1de3e9f93e 100644
--- a/pkgs/development/node-packages/node-env.nix
+++ b/pkgs/development/node-packages/node-env.nix
@@ -57,6 +57,60 @@ let
# Recursively composes the dependencies of a package
composePackage = { name, packageName, src, dependencies ? [], ... }@args:
+ let
+ fixImpureDependencies = writeTextFile {
+ name = "fixDependencies.js";
+ text = ''
+ var fs = require('fs');
+ var url = require('url');
+
+ /*
+ * Replaces an impure version specification by *
+ */
+ function replaceImpureVersionSpec(versionSpec) {
+ var parsedUrl = url.parse(versionSpec);
+
+ if(versionSpec == "latest" || versionSpec == "unstable" ||
+ versionSpec.substr(0, 2) == ".." || dependency.substr(0, 2) == "./" || dependency.substr(0, 2) == "~/" || dependency.substr(0, 1) == '/')
+ return '*';
+ else if(parsedUrl.protocol == "git:" || parsedUrl.protocol == "git+ssh:" || parsedUrl.protocol == "git+http:" || parsedUrl.protocol == "git+https:" ||
+ parsedUrl.protocol == "http:" || parsedUrl.protocol == "https:")
+ return '*';
+ else
+ return versionSpec;
+ }
+
+ var packageObj = JSON.parse(fs.readFileSync('./package.json'));
+
+ /* Replace dependencies */
+ if(packageObj.dependencies !== undefined) {
+ for(var dependency in packageObj.dependencies) {
+ var versionSpec = packageObj.dependencies[dependency];
+ packageObj.dependencies[dependency] = replaceImpureVersionSpec(versionSpec);
+ }
+ }
+
+ /* Replace development dependencies */
+ if(packageObj.devDependencies !== undefined) {
+ for(var dependency in packageObj.devDependencies) {
+ var versionSpec = packageObj.devDependencies[dependency];
+ packageObj.devDependencies[dependency] = replaceImpureVersionSpec(versionSpec);
+ }
+ }
+
+ /* Replace optional dependencies */
+ if(packageObj.optionalDependencies !== undefined) {
+ for(var dependency in packageObj.optionalDependencies) {
+ var versionSpec = packageObj.optionalDependencies[dependency];
+ packageObj.optionalDependencies[dependency] = replaceImpureVersionSpec(versionSpec);
+ }
+ }
+
+ /* Write the fixed JSON file */
+ fs.writeFileSync("package.json", JSON.stringify(packageObj));
+ '';
+ };
+ in
''
DIR=$(pwd)
cd $TMPDIR
@@ -96,97 +150,17 @@ let
# Unset the stripped name to not confuse the next unpack step
unset strippedName
- # Include the dependencies of the package
+ # Some version specifiers (latest, unstable, URLs, file paths) force NPM to make remote connections or consult paths outside the Nix store.
+ # The following JavaScript replaces these by * to prevent that
cd "$DIR/${packageName}"
+ node ${fixImpureDependencies}
+
+ # Include the dependencies of the package
${includeDependencies { inherit dependencies; }}
cd ..
${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
'';
- pinpointDependencies = {dependencies, production}:
- let
- pinpointDependenciesFromPackageJSON = writeTextFile {
- name = "pinpointDependencies.js";
- text = ''
- var fs = require('fs');
- var path = require('path');
-
- function resolveDependencyVersion(location, name) {
- if(location == process.env['NIX_STORE']) {
- return null;
- } else {
- var dependencyPackageJSON = path.join(location, "node_modules", name, "package.json");
-
- if(fs.existsSync(dependencyPackageJSON)) {
- var dependencyPackageObj = JSON.parse(fs.readFileSync(dependencyPackageJSON));
-
- if(dependencyPackageObj.name == name) {
- return dependencyPackageObj.version;
- }
- } else {
- return resolveDependencyVersion(path.resolve(location, ".."), name);
- }
- }
- }
-
- function replaceDependencies(dependencies) {
- if(typeof dependencies == "object" && dependencies !== null) {
- for(var dependency in dependencies) {
- var resolvedVersion = resolveDependencyVersion(process.cwd(), dependency);
-
- if(resolvedVersion === null) {
- process.stderr.write("WARNING: cannot pinpoint dependency: "+dependency+", context: "+process.cwd()+"\n");
- } else {
- dependencies[dependency] = resolvedVersion;
- }
- }
- }
- }
-
- /* Read the package.json configuration */
- var packageObj = JSON.parse(fs.readFileSync('./package.json'));
-
- /* Pinpoint all dependencies */
- replaceDependencies(packageObj.dependencies);
- if(process.argv[2] == "development") {
- replaceDependencies(packageObj.devDependencies);
- }
- replaceDependencies(packageObj.optionalDependencies);
-
- /* Write the fixed package.json file */
- fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2));
- '';
- };
- in
- ''
- node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"}
-
- ${stdenv.lib.optionalString (dependencies != [])
- ''
- if [ -d node_modules ]
- then
- cd node_modules
- ${stdenv.lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies}
- cd ..
- fi
- ''}
- '';
-
- # Recursively traverses all dependencies of a package and pinpoints all
- # dependencies in the package.json file to the versions that are actually
- # being used.
-
- pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args:
- ''
- if [ -d "${packageName}" ]
- then
- cd "${packageName}"
- ${pinpointDependencies { inherit dependencies production; }}
- cd ..
- ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
- fi
- '';
-
# Extract the Node.js source code which is used to compile packages with
# native bindings
nodeSources = runCommand "node-sources" {} ''
@@ -209,9 +183,7 @@ let
buildPhase = args.buildPhase or "true";
compositionScript = composePackage args;
- pinpointDependenciesScript = pinpointDependenciesOfPackage args;
-
- passAsFile = [ "compositionScript" "pinpointDependenciesScript" ];
+ passAsFile = [ "compositionScript" ];
installPhase = args.installPhase or ''
# Create and enter a root node_modules/ folder
@@ -220,10 +192,6 @@ let
# Compose the package and all its dependencies
source $compositionScriptPath
-
- # Pinpoint the versions of all dependencies to the ones that are actually being used
- echo "pinpointing versions of dependencies..."
- source $pinpointDependenciesScriptPath
# Patch the shebangs of the bundled modules to prevent them from
# calling executables outside the Nix store as much as possible
@@ -286,18 +254,12 @@ let
buildInputs = [ tarWrapper python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ args.buildInputs or [];
includeScript = includeDependencies { inherit dependencies; };
- pinpointDependenciesScript = pinpointDependenciesOfPackage args;
-
- passAsFile = [ "includeScript" "pinpointDependenciesScript" ];
+ passAsFile = [ "includeScript" ];
buildCommand = ''
mkdir -p $out/lib
cd $out/lib
source $includeScriptPath
-
- # Pinpoint the versions of all dependencies to the ones that are actually being used
- echo "pinpointing versions of dependencies..."
- source $pinpointDependenciesScriptPath
# Create fake package.json to make the npm commands work properly
cat > package.json < unrar != null;
+assert !useUnrar -> libarchive != null;
buildPythonPackage rec {
pname = "rarfile";
@@ -15,8 +21,16 @@ buildPythonPackage rec {
prePatch = ''
substituteInPlace rarfile.py \
- --replace 'UNRAR_TOOL = "unrar"' "UNRAR_TOOL = \"${unrar}/bin/unrar\""
- '';
+ '' + (if useUnrar then
+ ''--replace 'UNRAR_TOOL = "unrar"' "UNRAR_TOOL = \"${unrar}/bin/unrar\""
+ ''
+ else
+ ''--replace 'ALT_TOOL = "bsdtar"' "ALT_TOOL = \"${libarchive}/bin/bsdtar\""
+ '')
+ + ''
+ '';
+ # the tests only work with the standard unrar package
+ doCheck = useUnrar;
LC_ALL = "en_US.UTF-8";
checkPhase = ''
py.test test -k "not test_printdir"
diff --git a/pkgs/development/python-modules/semver/default.nix b/pkgs/development/python-modules/semver/default.nix
new file mode 100644
index 000000000000..285da5460717
--- /dev/null
+++ b/pkgs/development/python-modules/semver/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchPypi, buildPythonPackage }:
+
+buildPythonPackage rec {
+ name = "${pname}-${version}";
+ pname = "semver";
+ version = "2.2.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "161gvsfpw0l8lnf1v19rvqc8b9f8n70cc8ppya4l0n6rwc1c1n4m";
+ };
+
+ meta = with stdenv.lib; {
+ description = "Python package to work with Semantic Versioning (http://semver.org/)";
+ homepage = "https://github.com/k-bx/python-semver";
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ np ];
+ };
+}
diff --git a/pkgs/development/python-modules/treq/default.nix b/pkgs/development/python-modules/treq/default.nix
index ede5f2520c19..7bb028b233d9 100644
--- a/pkgs/development/python-modules/treq/default.nix
+++ b/pkgs/development/python-modules/treq/default.nix
@@ -1,45 +1,38 @@
-{ stdenv, fetchurl, buildPythonPackage, service-identity, requests,
- six, mock, twisted, incremental, coreutils, gnumake, pep8, sphinx,
- openssl, pyopenssl }:
+{ stdenv, fetchPypi, buildPythonPackage, service-identity, requests, six
+, mock, twisted, incremental, pep8 }:
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "treq";
version = "17.3.1";
- src = fetchurl {
- url = "mirror://pypi/t/${pname}/${name}.tar.gz";
- sha256 = "313af6dedecfdde2750968dc17653b6147cf2340b3479d70031cf741f5be0cf6";
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1xhcpvsl3xqw0dq9sixk80iwyiv17djigp3815sy5pfgvvggcfii";
};
- buildInputs = [
+ propagatedBuildInputs = [ twisted requests six incremental service-identity ];
+
+ checkInputs = [
pep8
mock
];
- propagatedBuildInputs = [
- service-identity
- requests
- twisted
- incremental
- sphinx
- six
- openssl
- pyopenssl
- ];
-
- checkPhase = ''
- ${pep8}/bin/pep8 --ignore=E902 treq
- trial treq
+ postPatch = ''
+ rm -fv src/treq/test/test_treq_integration.py
'';
- doCheck = false;
- # Failure: twisted.web._newclient.RequestTransmissionFailed: []
+ # XXX tox tries to install coverage despite it is installed
+ #postBuild = ''
+ # # build documentation and install in $out
+ # tox -e docs
+ # mkdir -pv $out/docs
+ # cp -rv docs/* $out/docs/
+ #'';
- postBuild = ''
- ${coreutils}/bin/mkdir -pv treq
- ${coreutils}/bin/echo "${version}" | ${coreutils}/bin/tee treq/_version
- cd docs && ${gnumake}/bin/make html && cd ..
+ checkPhase = ''
+ pep8 --ignore=E902 treq
+ trial treq
'';
meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/trezor.nix b/pkgs/development/python-modules/trezor/default.nix
similarity index 80%
rename from pkgs/development/python-modules/trezor.nix
rename to pkgs/development/python-modules/trezor/default.nix
index 70160dcb0f94..6fc6622cf3f2 100644
--- a/pkgs/development/python-modules/trezor.nix
+++ b/pkgs/development/python-modules/trezor/default.nix
@@ -1,12 +1,12 @@
-{ lib, fetchurl, buildPythonPackage, protobuf3_0, hidapi, ecdsa, mnemonic }:
+{ lib, fetchPypi, buildPythonPackage, protobuf3_0, hidapi, ecdsa, mnemonic }:
buildPythonPackage rec {
+ name = "${pname}-${version}";
pname = "trezor";
version = "0.7.13";
- name = "${pname}-${version}";
- src = fetchurl {
- url = "mirror://pypi/t/${pname}/${name}.tar.gz";
+ src = fetchPypi {
+ inherit pname version;
sha256 = "d05f388bb56b6f61cc727999cc725078575238a0b6172450322bc55c437fefe5";
};
diff --git a/pkgs/development/python-modules/txaio/default.nix b/pkgs/development/python-modules/txaio/default.nix
index 68cb28dc8507..98060536638e 100644
--- a/pkgs/development/python-modules/txaio/default.nix
+++ b/pkgs/development/python-modules/txaio/default.nix
@@ -18,8 +18,10 @@ buildPythonPackage rec {
sed -i '152d' test/test_logging.py
'';
+ # test_chained_callback has been removed just post-2.7.1 because the functionality was decided against and the test
+ # breaks on python 3.6 https://github.com/crossbario/txaio/pull/104
checkPhase = ''
- py.test -k "not test_sdist"
+ py.test -k "not (test_sdist or test_chained_callback)"
'';
meta = with stdenv.lib; {
diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix
index 9251c4d2a415..fc6a4bab75c5 100644
--- a/pkgs/development/ruby-modules/bundler/default.nix
+++ b/pkgs/development/ruby-modules/bundler/default.nix
@@ -4,8 +4,8 @@ buildRubyGem rec {
inherit ruby;
name = "${gemName}-${version}";
gemName = "bundler";
- version = "1.14.6";
- sha256 = "0h3x2csvlz99v2ryj1w72vn6kixf7rl35lhdryvh7s49brnj0cgl";
+ version = "1.15.0";
+ sha256 = "1k84zjr49ri7dj0mbjm7wkqdmknwdid817y2kyhn42mh4vxa68id";
dontPatchShebangs = true;
postFixup = ''
diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix
index 9f791db50472..4f253c061863 100644
--- a/pkgs/development/tools/ammonite/default.nix
+++ b/pkgs/development/tools/ammonite/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
name = "ammonite-${version}";
- version = "0.9.3";
+ version = "0.9.5";
scalaVersion = "2.12";
src = fetchurl {
url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}";
- sha256 = "1s62idj8lg2g5kz325kqjmyks7ghhl5nzc4snji25qkgxirpibpl";
+ sha256 = "1ni829qpdm5wflc1n827b9ywpv836r2068rmj9yd2nyh8b6q2him";
};
propagatedBuildInputs = [ jre ] ;
diff --git a/pkgs/development/tools/build-managers/kati/default.nix b/pkgs/development/tools/build-managers/kati/default.nix
new file mode 100644
index 000000000000..7b5dc2b79374
--- /dev/null
+++ b/pkgs/development/tools/build-managers/kati/default.nix
@@ -0,0 +1,26 @@
+{ fetchgit, stdenv }:
+
+stdenv.mkDerivation rec {
+ name = "kati-unstable-${version}";
+ version = "2017-05-23";
+ rev = "2dde61e46ab789f18956ff3b7c257dd8eb97993f";
+
+ src = fetchgit {
+ inherit rev;
+ url = "https://github.com/google/kati.git";
+ sha256 = "1das1fvycra546lmh72cr5qpgblhbzqqy7gfywiijjgx160l75vq";
+ };
+
+ patches = [ ./version.patch ];
+
+ installPhase = ''
+ install -D ckati $out/bin/ckati
+ '';
+
+ meta = {
+ description = "An experimental GNU make clone";
+ homepage = "https://github.com/google/kati";
+ platforms = stdenv.lib.platforms.all;
+ license = stdenv.lib.licenses.asl20;
+ };
+}
diff --git a/pkgs/development/tools/build-managers/kati/version.patch b/pkgs/development/tools/build-managers/kati/version.patch
new file mode 100644
index 000000000000..1821ac6bbb73
--- /dev/null
+++ b/pkgs/development/tools/build-managers/kati/version.patch
@@ -0,0 +1,19 @@
+diff --git a/Makefile.ckati b/Makefile.ckati
+index e4067bb..15518f3 100644
+--- a/Makefile.ckati
++++ b/Makefile.ckati
+@@ -102,14 +102,8 @@ $(KATI_CXX_TEST_EXES): $(KATI_BIN_PATH)/%: $(KATI_INTERMEDIATES_PATH)/%.o
+ $(KATI_LD) $^ -o $@ $(KATI_LIBS)
+
+ # Rule to generate version.cc
+-KATI_GIT_DIR := $(shell git -C $(KATI_SRC_PATH) rev-parse --show-toplevel)
+-ifneq ($(KATI_GIT_DIR),)
+-KATI_VERSION_DEPS := $(KATI_GIT_DIR)/.git/HEAD $(KATI_GIT_DIR)/.git/index
+-KATI_VERSION := $(shell git -C $(KATI_GIT_DIR) rev-parse HEAD)
+-else
+ KATI_VERSION_DEPS :=
+ KATI_VERSION := unknown
+-endif
+ $(KATI_INTERMEDIATES_PATH)/version.cc: $(KATI_VERSION_DEPS)
+ @mkdir -p $(dir $@)
+ echo '// +build ignore' > $@
diff --git a/pkgs/development/tools/google-app-engine-go-sdk/default.nix b/pkgs/development/tools/google-app-engine-go-sdk/default.nix
index b95906d20027..27ad4c996ce8 100644
--- a/pkgs/development/tools/google-app-engine-go-sdk/default.nix
+++ b/pkgs/development/tools/google-app-engine-go-sdk/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchzip, python27, python27Packages }:
+{ stdenv, fetchzip, python27, python27Packages, makeWrapper }:
-assert stdenv.system == "x86_64-linux" || stdenv.system == "x86_64-darwin";
+with python27Packages;
stdenv.mkDerivation rec {
name = "google-app-engine-go-sdk-${version}";
@@ -17,9 +17,7 @@ stdenv.mkDerivation rec {
sha256 = "18hgl4wz3rhaklkwaxl8gm70h7l8k225f86da682kafawrr8zhv4";
};
- buildInputs = with python27Packages; [
- (python27.withPackages(ps: [ cffi cryptography pyopenssl ]))
- ];
+ buildInputs = [python27 makeWrapper];
installPhase = ''
mkdir -p $out/bin $out/share/
@@ -27,7 +25,9 @@ stdenv.mkDerivation rec {
# create wrappers with correct env
for i in goapp appcfg.py; do
- ln -s "$out/share/go_appengine/$i" "$out/bin/$i"
+ makeWrapper "$out/share/go_appengine/$i" "$out/bin/$i" \
+ --prefix PATH : "${python27}/bin" \
+ --prefix PYTHONPATH : "$(toPythonPath ${cffi}):$(toPythonPath ${cryptography}):$(toPythonPath ${pyopenssl})"
done
'';
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
version = version;
homepage = "https://cloud.google.com/appengine/docs/go/";
license = licenses.asl20;
- platforms = with platforms; linux ++ darwin;
+ platforms = ["x86_64-linux" "x86_64-darwin"];
maintainers = with maintainers; [ lufia ];
};
}
diff --git a/pkgs/development/tools/quilt/default.nix b/pkgs/development/tools/quilt/default.nix
index 1fd70730265a..fe6aeb3fa6e1 100644
--- a/pkgs/development/tools/quilt/default.nix
+++ b/pkgs/development/tools/quilt/default.nix
@@ -1,13 +1,12 @@
-{ stdenv, fetchurl, pkgs}:
-
-with pkgs;
+{ stdenv, fetchurl, makeWrapper, bash, perl, diffstat, diffutils, patch, findutils }:
stdenv.mkDerivation rec {
- name = "quilt-0.63";
+
+ name = "quilt-0.65";
src = fetchurl {
url = "mirror://savannah/quilt/${name}.tar.gz";
- sha256 = "2846788221aa8844c54f10239c7cbc5e88031859162bcc285449446c3cfffe52";
+ sha256 = "06b816m2gz9jfif7k9v2hrm7fz76zjg5pavf7hd3ifybwn4cgjzn";
};
buildInputs = [ makeWrapper perl bash diffutils patch findutils diffstat ];
@@ -31,4 +30,5 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.all;
};
+
}
diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix
index 659c831bbe3c..557d1fde79d5 100644
--- a/pkgs/development/tools/vagrant/default.nix
+++ b/pkgs/development/tools/vagrant/default.nix
@@ -2,7 +2,7 @@
, libxml2, libxslt, makeWrapper, p7zip, xar, gzip, cpio }:
let
- version = "1.9.1";
+ version = "1.9.5";
rake = buildRubyGem {
inherit ruby;
gemName = "rake";
@@ -13,16 +13,16 @@ let
url = if stdenv.isLinux
then "https://releases.hashicorp.com/vagrant/${version}/vagrant_${version}_${arch}.deb"
else if stdenv.isDarwin
- then "https://releases.hashicorp.com/vagrant/${version}/vagrant_${version}.dmg"
+ then "https://releases.hashicorp.com/vagrant/${version}/vagrant_${version}_${arch}.dmg"
else "system ${stdenv.system} not supported";
sha256 = {
- "x86_64-linux" = "0l1if9c4s4wkbi8k00pl7x00lil21izrd8wb9nv2b5q4gqidc1nh";
- "i686-linux" = "1789wjwcpgw3mljl49c8v5kycisay684gyalkkvd06928423y9zb";
- "x86_64-darwin" = "1xrfq1a0xyifkhhjnpm6wsnms9w8c9q5rd2qqn4sm5npl7viy68p";
+ "x86_64-linux" = "16ijzaacfbqrgh561bf51747d2rv8kydgs14dfdr572qi0f88baw";
+ "i686-linux" = "0lvkb4k0a34a8hzlsi0apf056rhyprh5w0gn16d0n2ijnaf9j2yk";
+ "x86_64-darwin" = "070mrczsx1j0jl9sx6963l3hrk9anqa13r008wk1d22d25xj25mc";
}."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
- arch = builtins.replaceStrings ["-linux"] [""] stdenv.system;
+ arch = builtins.replaceStrings ["-linux" "-darwin"] ["" ""] stdenv.system;
in stdenv.mkDerivation rec {
name = "vagrant-${version}";
diff --git a/pkgs/development/tools/wiggle/default.nix b/pkgs/development/tools/wiggle/default.nix
new file mode 100644
index 000000000000..5a97eb09e4be
--- /dev/null
+++ b/pkgs/development/tools/wiggle/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchurl, ncurses, groff }:
+
+stdenv.mkDerivation {
+
+ name = "wiggle-1.0";
+
+ src = fetchurl {
+ url = "https://github.com/neilbrown/wiggle/archive/v1.0.tar.gz";
+ sha256 = "0552dkdvl001b2jasj0jwb69s7zy6wbc8gcysqj69b4qgl9c54cs";
+ };
+
+ buildInputs = [ ncurses groff ];
+
+ configurePhase = ''
+ makeFlagsArray=( CFLAGS="-I. -O3"
+ INSTALL="install"
+ BINDIR="$out/bin"
+ MANDIR="$out/share/man"
+ )
+ patchShebangs .
+ '';
+
+ meta = {
+ homepage = http://blog.neil.brown.name/category/wiggle/;
+ description = "Tool for applying patches with conflicts";
+
+ longDescription = ''
+ Wiggle applies patches to a file in a similar manner to the patch(1)
+ program. The distinctive difference is, however, that wiggle will
+ attempt to apply a patch even if the "before" part of the patch doesn't
+ match the target file perfectly. This is achieved by breaking the file
+ and patch into words and finding the best alignment of words in the file
+ with words in the patch. Once this alignment has been found, any
+ differences (word-wise) in the patch are applied to the file as best as
+ possible. Also, wiggle will (in some cases) detect changes that have
+ already been applied, and will ignore them.
+ '';
+
+ license = stdenv.lib.licenses.gpl2Plus;
+ platforms = stdenv.lib.platforms.all;
+ };
+
+}
diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix
index 4c9cf1d010cc..b6009ee72fd0 100644
--- a/pkgs/games/xonotic/default.nix
+++ b/pkgs/games/xonotic/default.nix
@@ -27,11 +27,16 @@ stdenv.mkDerivation rec {
sourceRoot = "Xonotic/source/darkplaces";
+ # "debug", "release", "profile"
+ target = "release";
+
+ dontStrip = target != "release";
+
buildPhase = ''
DP_FS_BASEDIR="$out/share/xonotic"
- make DP_FS_BASEDIR=$DP_FS_BASEDIR cl-release
- make DP_FS_BASEDIR=$DP_FS_BASEDIR sdl-release
- make DP_FS_BASEDIR=$DP_FS_BASEDIR sv-release
+ make DP_FS_BASEDIR=$DP_FS_BASEDIR cl-${target}
+ make DP_FS_BASEDIR=$DP_FS_BASEDIR sdl-${target}
+ make DP_FS_BASEDIR=$DP_FS_BASEDIR sv-${target}
'';
enableParallelBuilding = true;
@@ -52,8 +57,16 @@ stdenv.mkDerivation rec {
dontPatchELF = true;
postFixup = ''
patchelf --add-needed ${curl.out}/lib/libcurl.so $out/bin/xonotic-dedicated
- patchelf --add-needed ${curl.out}/lib/libcurl.so $out/bin/xonotic-sdl
- patchelf --add-needed ${curl.out}/lib/libcurl.so $out/bin/xonotic-glx
+ patchelf \
+ --add-needed ${curl.out}/lib/libcurl.so \
+ --add-needed ${libvorbis}/lib/libvorbisfile.so \
+ --add-needed ${libvorbis}/lib/libvorbis.so \
+ $out/bin/xonotic-glx
+ patchelf \
+ --add-needed ${curl.out}/lib/libcurl.so \
+ --add-needed ${libvorbis}/lib/libvorbisfile.so \
+ --add-needed ${libvorbis}/lib/libvorbis.so \
+ $out/bin/xonotic-sdl
'';
meta = {
diff --git a/pkgs/os-specific/linux/eventstat/default.nix b/pkgs/os-specific/linux/eventstat/default.nix
index de27d7b0d838..cd11a79c8f82 100644
--- a/pkgs/os-specific/linux/eventstat/default.nix
+++ b/pkgs/os-specific/linux/eventstat/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
name = "eventstat-${version}";
- version = "0.03.03";
+ version = "0.03.04";
src = fetchzip {
url = "http://kernel.ubuntu.com/~cking/tarballs/eventstat/eventstat-${version}.tar.gz";
- sha256 = "02pg46f3x7v1c1vvqzfjqq0wjb2bzmfkd6a8xp06cg9zvidn6jpb";
+ sha256 = "1sqf1mfafrw6402qx457gh8yxgsw80311qi0lp4cjl9dfz7vl2x1";
};
buildInputs = [ ncurses ];
installFlags = [ "DESTDIR=$(out)" ];
diff --git a/pkgs/os-specific/linux/fnotifystat/default.nix b/pkgs/os-specific/linux/fnotifystat/default.nix
index 35638e7dabd5..2c90ff94d4a0 100644
--- a/pkgs/os-specific/linux/fnotifystat/default.nix
+++ b/pkgs/os-specific/linux/fnotifystat/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
name = "fnotifystat-${version}";
- version = "0.01.16";
+ version = "0.01.17";
src = fetchurl {
url = "http://kernel.ubuntu.com/~cking/tarballs/fnotifystat/fnotifystat-${version}.tar.gz";
- sha256 = "1k9nc7a4r7c2l7vrlcrfxj9rsdb04amiqcsnxm5kpshncry38nl5";
+ sha256 = "0ncfbrpyb3ak49nrdr4cb3w082n9s181lizfqx51zi9rdgkj1vm3";
};
installFlags = [ "DESTDIR=$(out)" ];
postInstall = ''
diff --git a/pkgs/os-specific/linux/forkstat/default.nix b/pkgs/os-specific/linux/forkstat/default.nix
index f8d0eab835bd..6a987dc9f5b5 100644
--- a/pkgs/os-specific/linux/forkstat/default.nix
+++ b/pkgs/os-specific/linux/forkstat/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
name = "forkstat-${version}";
- version = "0.01.16";
+ version = "0.01.17";
src = fetchurl {
url = "http://kernel.ubuntu.com/~cking/tarballs/forkstat/forkstat-${version}.tar.gz";
- sha256 = "0g65basrs569y42zhgjq9sdyz62km8xy55yfilmyxa43ckb3xmlw";
+ sha256 = "0plm2409mmp6n2fjj6bb3z7af2cnh5lg3czlylhgaki9zd0cyb7w";
};
installFlags = [ "DESTDIR=$(out)" ];
postInstall = ''
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index c117f8f29fae..307c661ddf43 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -1,4 +1,4 @@
-{ callPackage }:
+{ lib, callPackage, fetchurl, fetchpatch }:
let
generic = args: callPackage (import ./generic.nix args) { };
@@ -28,16 +28,42 @@ in
settingsSha256 = "0nm5c06b09p6wsxpyfaqrzsnal3p1047lk6p4p2a0vksb7id9598";
persistencedSha256 = "1jwmggbph9zd8fj4syihldp2a5bxff7q1i2l9c55xz8cvk0rx08i";
useGLVND = false;
+
+ patches = [
+ (fetchpatch {
+ name = "kernel-4.10.patch";
+ url = https://git.archlinux.org/svntogit/packages.git/plain/nvidia-340xx/trunk/4.10.0_kernel.patch?id=53fb1df89;
+ sha256 = "171hb57m968qdjcr3h8ppfzhrchf573f39rdja86a1qq1gmrv7pa";
+ })
+ # from https://git.archlinux.org/svntogit/packages.git/plain/trunk/fs52243.patch?h=packages/nvidia-340xx
+ # with datestamps removed
+ ./fs52243.patch
+ ];
};
legacy_304 = generic {
- version = "304.134";
- sha256_32bit = "178wx0a2pmdnaypa9pq6jh0ii0i8ykz1sh1liad9zfriy4d8kxw4";
- sha256_64bit = "0pydw7nr4d2dply38kwvjbghsbilbp2q0mas4nfq5ad050d2c550";
- settingsSha256 = "0q92xw4fr9p5nbhj1plynm50d32881861daxfwrisywszqijhmlf";
+ version = "304.135";
+ sha256_32bit = "14qdl39wird04sqba94dcb77i63igmxxav62ndr4qyyavn8s3c2w";
+ sha256_64bit = "125mianhvq591np7y5jjrv9vmpbvixnkicr49ni48mcr0yjnjqkh";
+ settingsSha256 = "1y7swikdngq4nlwzkrq20yfah9zr31n1a5i6nw37awnp8xjilhzm";
persistencedSha256 = null;
useGLVND = false;
useProfiles = false;
+
+ prePatch = let
+ debPatches = fetchurl {
+ url = "mirror://debian/pool/non-free/n/nvidia-graphics-drivers-legacy-304xx/"
+ + "nvidia-graphics-drivers-legacy-304xx_304.135-2.debian.tar.xz";
+ sha256 = "0mhji0ssn7075q5a650idigs48kzf11pzj2ca2n07rwxg3vj6pdr";
+ };
+ prefix = "debian/module/debian/patches";
+ applyPatches = pnames: if pnames == [] then null else
+ ''
+ tar xf '${debPatches}'
+ sed 's|^\([+-]\{3\} [ab]\)/|\1/kernel/|' -i ${prefix}/*.patch
+ patches="$patches ${lib.concatMapStringsSep " " (pname: "${prefix}/${pname}.patch") pnames}"
+ '';
+ in applyPatches [ "fix-typos" "drm-driver-legacy" "deprecated-cpu-events" "disable-mtrr" ];
};
legacy_173 = callPackage ./legacy173.nix { };
diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix
index a21e6ecfc312..0d19079fe662 100644
--- a/pkgs/os-specific/linux/nvidia-x11/generic.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix
@@ -6,6 +6,9 @@
, useGLVND ? true
, useProfiles ? true
, preferGtk2 ? false
+
+, prePatch ? ""
+, patches ? []
}:
{ stdenv, callPackage, callPackage_i686, fetchurl, fetchpatch
@@ -42,24 +45,8 @@ let
}
else throw "nvidia-x11 does not support platform ${stdenv.system}";
- # patch to get the nvidia and nvidiaBeta driver to compile on kernel 4.10
- patches = if libsOnly
- then null
- else if versionOlder version "340"
- then null
- else if versionOlder version "375"
- then [
- (fetchpatch {
- name = "kernel-4.10.patch";
- url = https://git.archlinux.org/svntogit/packages.git/plain/nvidia-340xx/trunk/4.10.0_kernel.patch?id=53fb1df89;
- sha256 = "171hb57m968qdjcr3h8ppfzhrchf573f39rdja86a1qq1gmrv7pa";
- })
- # from https://git.archlinux.org/svntogit/packages.git/plain/trunk/fs52243.patch?h=packages/nvidia-340xx
- # with datestamps removed
- ./fs52243.patch
- ]
- else null;
-
+ patches = if libsOnly then null else patches;
+ inherit prePatch;
inherit version useGLVND useProfiles;
inherit (stdenv) system;
diff --git a/pkgs/os-specific/linux/smemstat/default.nix b/pkgs/os-specific/linux/smemstat/default.nix
index 9a244c6ed8fb..04f5bf53f936 100644
--- a/pkgs/os-specific/linux/smemstat/default.nix
+++ b/pkgs/os-specific/linux/smemstat/default.nix
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
name = "smemstat-${version}";
- version = "0.01.16";
+ version = "0.01.17";
src = fetchurl {
url = "http://kernel.ubuntu.com/~cking/tarballs/smemstat/smemstat-${version}.tar.gz";
- sha256 = "14n3s6ibm9bq58drvpiasqn11ci6mrwswfpcbpbsimx6fh2j4bi3";
+ sha256 = "093ifrz688cm0kmzz1c6himhbdr75ig1mcaapmqy8jadc1gaw2im";
};
buildInputs = [ ncurses ];
installFlags = [ "DESTDIR=$(out)" ];
diff --git a/pkgs/servers/search/elasticsearch/5.x.nix b/pkgs/servers/search/elasticsearch/5.x.nix
new file mode 100644
index 000000000000..030c4730f38e
--- /dev/null
+++ b/pkgs/servers/search/elasticsearch/5.x.nix
@@ -0,0 +1,44 @@
+{ stdenv, fetchurl, makeWrapper, jre, utillinux, getopt }:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+ version = "5.4.0";
+ name = "elasticsearch-${version}";
+
+ src = fetchurl {
+ url = "https://artifacts.elastic.co/downloads/elasticsearch/${name}.tar.gz";
+ sha256 = "1ml2dvwxxhj3azj13wa8xd08kpapal2477lpcaxzw5gnzizgyx5z";
+ };
+
+ patches = [ ./es-home-5.x.patch ./es-classpath-5.x.patch ];
+
+ buildInputs = [ makeWrapper jre ] ++
+ (if (!stdenv.isDarwin) then [utillinux] else [getopt]);
+
+ installPhase = ''
+ mkdir -p $out
+ cp -R bin config lib modules plugins $out
+
+ chmod -x $out/bin/*.*
+
+ wrapProgram $out/bin/elasticsearch \
+ --prefix ES_CLASSPATH : "$out/lib/*" \
+ ${if (!stdenv.isDarwin)
+ then ''--prefix PATH : "${utillinux}/bin/"''
+ else ''--prefix PATH : "${getopt}/bin"''} \
+ --set JAVA_HOME "${jre}" \
+ --set ES_JVM_OPTIONS "$out/config/jvm.options"
+
+ wrapProgram $out/bin/elasticsearch-plugin --set JAVA_HOME "${jre}"
+ '';
+
+ meta = {
+ description = "Open Source, Distributed, RESTful Search Engine";
+ license = licenses.asl20;
+ platforms = platforms.unix;
+ maintainers = [
+ maintainers.apeschar
+ ];
+ };
+}
diff --git a/pkgs/servers/search/elasticsearch/es-classpath-5.x.patch b/pkgs/servers/search/elasticsearch/es-classpath-5.x.patch
new file mode 100644
index 000000000000..6898ffcf1d79
--- /dev/null
+++ b/pkgs/servers/search/elasticsearch/es-classpath-5.x.patch
@@ -0,0 +1,34 @@
+diff -rupN a/bin/elasticsearch b/bin/elasticsearch
+--- a/bin/elasticsearch 2017-05-17 10:53:49.444487071 +0200
++++ b/bin/elasticsearch 2017-05-17 10:55:52.755081523 +0200
+@@ -129,12 +129,7 @@ ES_JAVA_OPTS="$(parse_jvm_options "$ES_J
+ # If an include wasn't specified in the environment, then search for one...
+ if [ "x$ES_INCLUDE" = "x" ]; then
+ # Locations (in order) to use when searching for an include file.
+- for include in /usr/share/elasticsearch/elasticsearch.in.sh \
+- /usr/local/share/elasticsearch/elasticsearch.in.sh \
+- /opt/elasticsearch/elasticsearch.in.sh \
+- ~/.elasticsearch.in.sh \
+- "$ES_HOME/bin/elasticsearch.in.sh" \
+- "`dirname "$0"`"/elasticsearch.in.sh; do
++ for include in "`dirname "$0"`"/elasticsearch.in.sh; do
+ if [ -r "$include" ]; then
+ . "$include"
+ break
+diff -rupN a/bin/elasticsearch.in.sh b/bin/elasticsearch.in.sh
+--- a/bin/elasticsearch.in.sh 2017-04-28 19:41:47.000000000 +0200
++++ b/bin/elasticsearch.in.sh 2017-05-17 10:56:49.303519788 +0200
+@@ -1,13 +1 @@
+ #!/bin/bash
+-
+-# check in case a user was using this mechanism
+-if [ "x$ES_CLASSPATH" != "x" ]; then
+- cat >&2 << EOF
+-Error: Don't modify the classpath with ES_CLASSPATH. Best is to add
+-additional elements via the plugin mechanism, or if code must really be
+-added to the main classpath, add jars to lib/ (unsupported).
+-EOF
+- exit 1
+-fi
+-
+-ES_CLASSPATH="$ES_HOME/lib/*"
diff --git a/pkgs/servers/search/elasticsearch/es-home-5.x.patch b/pkgs/servers/search/elasticsearch/es-home-5.x.patch
new file mode 100644
index 000000000000..cee0137312f1
--- /dev/null
+++ b/pkgs/servers/search/elasticsearch/es-home-5.x.patch
@@ -0,0 +1,31 @@
+diff -rupN a/bin/elasticsearch b/bin/elasticsearch
+--- a/bin/elasticsearch 2017-05-17 10:53:42.214686741 +0200
++++ b/bin/elasticsearch 2017-05-17 10:53:49.444487071 +0200
+@@ -105,7 +105,11 @@ while [ -h "$SCRIPT" ] ; do
+ done
+
+ # determine elasticsearch home
+-ES_HOME=`dirname "$SCRIPT"`/..
++
++if [ -z "$ES_HOME" ]; then
++ echo "You must set the ES_HOME var" >&2
++ exit 1
++fi
+
+ # make ELASTICSEARCH_HOME absolute
+ ES_HOME=`cd "$ES_HOME"; pwd`
+diff -rupN a/bin/elasticsearch-plugin b/bin/elasticsearch-plugin
+--- a/bin/elasticsearch-plugin 2017-05-17 10:53:42.214686741 +0200
++++ b/bin/elasticsearch-plugin 2017-05-17 10:53:49.445487044 +0200
+@@ -16,7 +16,10 @@ while [ -h "$SCRIPT" ] ; do
+ done
+
+ # determine elasticsearch home
+-ES_HOME=`dirname "$SCRIPT"`/..
++if [ -z "$ES_HOME" ]; then
++ echo "You must set the ES_HOME var" >&2
++ exit 1
++fi
+
+ # make ELASTICSEARCH_HOME absolute
+ ES_HOME=`cd "$ES_HOME"; pwd`
diff --git a/pkgs/tools/admin/daemontools/default.nix b/pkgs/tools/admin/daemontools/default.nix
index 5594368b04f4..7e8c1bccc3e8 100644
--- a/pkgs/tools/admin/daemontools/default.nix
+++ b/pkgs/tools/admin/daemontools/default.nix
@@ -2,40 +2,42 @@
stdenv.mkDerivation rec {
name = "daemontools-0.76";
-
+
src = fetchurl {
url = "https://cr.yp.to/daemontools/${name}.tar.gz";
sha256 = "07scvw88faxkscxi91031pjkpccql6wspk4yrlnsbrrb5c0kamd5";
};
-
+
+ patches = [ ./fix-nix-usernamespace-build.patch ];
+
configurePhase = ''
cd ${name}
-
+
sed -ie '1 s_$_ -include ${glibc.dev}/include/errno.h_' src/conf-cc
-
+
substituteInPlace src/Makefile \
--replace '/bin/sh' '${bash}/bin/bash -oxtrace'
-
+
sed -ie "s_^PATH=.*_PATH=$src/${name}/compile:''${PATH}_" src/rts.tests
-
+
cat ${glibc.dev}/include/errno.h
'';
-
+
buildPhase = ''
package/compile
'';
-
+
installPhase = ''
for cmd in $(cat package/commands); do
install -Dm755 "command/$cmd" "$out/bin/$cmd"
done
'';
-
+
meta = {
license = stdenv.lib.licenses.publicDomain;
homepage = https://cr.yp.to/daemontools.html;
description = "A collection of tools for managing UNIX services.";
-
+
maintainers = with stdenv.lib.maintainers; [ kevincox ];
platforms = stdenv.lib.platforms.unix;
};
diff --git a/pkgs/tools/admin/daemontools/fix-nix-usernamespace-build.patch b/pkgs/tools/admin/daemontools/fix-nix-usernamespace-build.patch
new file mode 100644
index 000000000000..9b784e7ca112
--- /dev/null
+++ b/pkgs/tools/admin/daemontools/fix-nix-usernamespace-build.patch
@@ -0,0 +1,10 @@
+--- admin.org/daemontools-0.76/src/chkshsgr.c 2001-07-12 17:49:49.000000000 +0100
++++ admin/daemontools-0.76/src/chkshsgr.c 2017-05-31 23:54:56.662174028 +0100
+@@ -4,6 +4,7 @@
+
+ int main()
+ {
++ return 0;
+ short x[4];
+
+ x[0] = x[1] = 0;
diff --git a/pkgs/tools/misc/patdiff/default.nix b/pkgs/tools/misc/patdiff/default.nix
new file mode 100644
index 000000000000..6e3c635f87aa
--- /dev/null
+++ b/pkgs/tools/misc/patdiff/default.nix
@@ -0,0 +1,13 @@
+{ ocamlPackages }:
+
+with ocamlPackages;
+
+janePackage {
+ name = "patdiff";
+ hash = "15b6nkmd2z07j4nnmkb2g6qn3daw2xmmz3lgswkj03v29ffib014";
+ buildInputs = [ core_extended expect_test_helpers patience_diff ocaml_pcre ];
+ meta = {
+ description = "File Diff using the Patience Diff algorithm";
+ inherit (core_extended.meta) platforms;
+ };
+}
diff --git a/pkgs/tools/security/pgpdump/default.nix b/pkgs/tools/security/pgpdump/default.nix
index 1e33c18753a6..dfe4579aa588 100644
--- a/pkgs/tools/security/pgpdump/default.nix
+++ b/pkgs/tools/security/pgpdump/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "pgpdump-${version}";
- version = "0.31";
+ version = "0.32";
src = fetchFromGitHub {
owner = "kazu-yamamoto";
repo = "pgpdump";
rev = "v${version}";
- sha256 = "05ywdgxzq3976dsy95vgdx3nnhd9i9vypzyrkabpmnxphfnjfrb4";
+ sha256 = "1ip7q5sgh3nwdqbrzpp6sllkls5kma98kns53yspw1830xi1n8xc";
};
meta = with stdenv.lib; {
diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix
index 50782f176702..785ba93f1371 100644
--- a/pkgs/tools/security/sudo/default.nix
+++ b/pkgs/tools/security/sudo/default.nix
@@ -4,14 +4,14 @@
}:
stdenv.mkDerivation rec {
- name = "sudo-1.8.20";
+ name = "sudo-1.8.20p1";
src = fetchurl {
urls =
[ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz"
"ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz"
];
- sha256 = "1q70f2wqbpgq828xmfzidbhyll5p08qbj7f3p2sw2v4whpdbi5wy";
+ sha256 = "07fvh8qy0l1h93lccc625f48d8yp0pkp5rjjykq13pb07ar0x64y";
};
configureFlags = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7a4864faa6d9..aecb500995f1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1057,6 +1057,10 @@ with pkgs;
nfdump = callPackage ../tools/networking/nfdump { };
+ patdiff = callPackage ../tools/misc/patdiff {
+ ocamlPackages = ocamlPackages_4_03;
+ };
+
playerctl = callPackage ../tools/audio/playerctl { };
socklog = callPackage ../tools/system/socklog { };
@@ -1727,6 +1731,7 @@ with pkgs;
elasticsearch = callPackage ../servers/search/elasticsearch { };
elasticsearch2 = callPackage ../servers/search/elasticsearch/2.x.nix { };
+ elasticsearch5 = callPackage ../servers/search/elasticsearch/5.x.nix { };
elasticsearchPlugins = recurseIntoAttrs (
callPackage ../servers/search/elasticsearch/plugins.nix { }
@@ -3795,6 +3800,8 @@ with pkgs;
quilt = callPackage ../development/tools/quilt { };
+ wiggle = callPackage ../development/tools/wiggle { };
+
radamsa = callPackage ../tools/security/radamsa { };
radarr = callPackage ../servers/radarr { };
@@ -6857,6 +6864,8 @@ with pkgs;
jenkins-job-builder = pythonPackages.jenkins-job-builder;
+ kati = callPackage ../development/tools/build-managers/kati { };
+
kconfig-frontends = callPackage ../development/tools/misc/kconfig-frontends {
gperf = gperf_3_0;
};
@@ -18567,10 +18576,10 @@ with pkgs;
inherit (callPackage ../applications/networking/cluster/terraform {})
terraform_0_8_5
terraform_0_8_8
- terraform_0_9_4;
+ terraform_0_9_6;
terraform_0_8 = terraform_0_8_8;
- terraform_0_9 = terraform_0_9_4;
+ terraform_0_9 = terraform_0_9_6;
terraform = terraform_0_9;
terraform-inventory = callPackage ../applications/networking/cluster/terraform-inventory {};
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 3a185bc0a10b..83c7d610c72e 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -5,6 +5,7 @@ let
let
packageSet = self:
with self; let inherit (self) callPackage; in
+ let ocamlPackages =
{
callPackage = newScope self;
@@ -30,11 +31,17 @@ let
async_extra_p4 = callPackage ../development/ocaml-modules/async_extra { };
- async_find = callPackage ../development/ocaml-modules/async_find { };
+ async_find =
+ if lib.versionOlder "4.03" ocaml.version
+ then janeStreet.async_find
+ else callPackage ../development/ocaml-modules/async_find { };
async_kernel_p4 = callPackage ../development/ocaml-modules/async_kernel { };
- async_shell = callPackage ../development/ocaml-modules/async_shell { };
+ async_shell =
+ if lib.versionOlder "4.03" ocaml.version
+ then janeStreet.async_shell
+ else callPackage ../development/ocaml-modules/async_shell { };
async_unix_p4 = callPackage ../development/ocaml-modules/async_unix { };
@@ -47,8 +54,6 @@ let
atdgen = callPackage ../development/ocaml-modules/atdgen { };
- base = callPackage ../development/ocaml-modules/base { };
-
base64 = callPackage ../development/ocaml-modules/base64 { };
bap = callPackage ../development/ocaml-modules/bap { };
@@ -525,8 +530,6 @@ let
sqlite3EZ = callPackage ../development/ocaml-modules/sqlite3EZ { };
- stdio = callPackage ../development/ocaml-modules/stdio { };
-
stog = callPackage ../applications/misc/stog { };
stringext = callPackage ../development/ocaml-modules/stringext { };
@@ -582,208 +585,243 @@ let
};
# Jane Street
+
+ janePackage = callPackage ../development/ocaml-modules/janestreet/janePackage.nix {};
+
+ janeStreet = import ../development/ocaml-modules/janestreet {
+ inherit lib janePackage ocamlbuild ctypes cryptokit magic-mime;
+ inherit ocaml-migrate-parsetree octavius ounit ppx_deriving re zarith;
+ openssl = pkgs.openssl;
+ };
+
js_build_tools = callPackage ../development/ocaml-modules/janestreet/js-build-tools.nix {};
buildOcamlJane = callPackage ../development/ocaml-modules/janestreet/buildOcamlJane.nix {};
- ocaml-compiler-libs = callPackage ../development/ocaml-modules/janestreet/ocaml-compiler-libs.nix {};
-
- ppx_ast = callPackage ../development/ocaml-modules/janestreet/ppx_ast.nix {};
-
ppx_core =
if lib.versionOlder "4.03" ocaml.version
- then callPackage ../development/ocaml-modules/janestreet/ppx_core-113_33_01.nix {}
+ then janeStreet.ppx_core
else callPackage ../development/ocaml-modules/janestreet/ppx-core.nix {};
ppx_optcomp =
if lib.versionOlder "4.03" ocaml.version
- then callPackage ../development/ocaml-modules/janestreet/ppx_optcomp-113_33_01.nix {
- oasis = ocaml_oasis; }
+ then janeStreet.ppx_optcomp
else callPackage ../development/ocaml-modules/janestreet/ppx-optcomp.nix {};
- ppx_driver = callPackage ../development/ocaml-modules/janestreet/ppx-driver.nix {};
+ ppx_driver =
+ if lib.versionOlder "4.03" ocaml.version
+ then janeStreet.ppx_driver
+ else callPackage ../development/ocaml-modules/janestreet/ppx-driver.nix {};
ppx_type_conv =
if lib.versionOlder "4.03" ocaml.version
- then callPackage ../development/ocaml-modules/janestreet/ppx_type_conv-113_33_02.nix { }
+ then janeStreet.ppx_type_conv
else callPackage ../development/ocaml-modules/janestreet/ppx-type-conv.nix {};
ppx_compare =
if lib.versionOlder "4.03" ocaml.version
- then callPackage ../development/ocaml-modules/janestreet/ppx_compare-113_33_00.nix {}
+ then janeStreet.ppx_compare
else callPackage ../development/ocaml-modules/janestreet/ppx-compare.nix {};
- ppx_here = callPackage ../development/ocaml-modules/janestreet/ppx-here.nix {};
+ ppx_here =
+ if lib.versionOlder "4.03" ocaml.version
+ then janeStreet.ppx_here
+ else callPackage ../development/ocaml-modules/janestreet/ppx-here.nix {};
ppx_sexp_conv =
if lib.versionOlder "4.03" ocaml.version
- then callPackage ../development/ocaml-modules/janestreet/ppx_sexp_conv-113_33_01.nix { }
+ then janeStreet.ppx_sexp_conv
else callPackage ../development/ocaml-modules/janestreet/ppx-sexp-conv.nix {};
- ppx_assert = callPackage ../development/ocaml-modules/janestreet/ppx-assert.nix {};
+ ppx_assert =
+ if lib.versionOlder "4.03" ocaml.version
+ then janeStreet.ppx_assert
+ else callPackage ../development/ocaml-modules/janestreet/ppx-assert.nix {};
ppx_inline_test =
if lib.versionOlder "4.03" ocaml.version
- then callPackage ../development/ocaml-modules/janestreet/ppx_inline_test-113_33_00.nix {}
+ then janeStreet.ppx_inline_test
else callPackage ../development/ocaml-modules/janestreet/ppx-inline-test.nix {};
ppx_bench =
if lib.versionOlder "4.03" ocaml.version
- then callPackage ../development/ocaml-modules/janestreet/ppx_bench-113_33_00.nix {}
+ then janeStreet.ppx_bench
else callPackage ../development/ocaml-modules/janestreet/ppx-bench.nix {};
ppx_bin_prot =
if lib.versionOlder "4.03" ocaml.version
- then callPackage ../development/ocaml-modules/janestreet/ppx_bin_prot-113_33_00.nix {}
+ then janeStreet.ppx_bin_prot
else callPackage ../development/ocaml-modules/janestreet/ppx-bin-prot.nix {};
ppx_custom_printf =
if lib.versionOlder "4.03" ocaml.version
- then callPackage ../development/ocaml-modules/janestreet/ppx_custom_printf-113_33_00.nix {}
+ then janeStreet.ppx_custom_printf
else callPackage ../development/ocaml-modules/janestreet/ppx-custom-printf.nix {};
ppx_enumerate =
if lib.versionOlder "4.03" ocaml.version
- then callPackage ../development/ocaml-modules/janestreet/ppx_enumerate-113_33_00.nix {}
+ then janeStreet.ppx_enumerate
else callPackage ../development/ocaml-modules/janestreet/ppx-enumerate.nix {};
ppx_fail =
if lib.versionOlder "4.03" ocaml.version
- then callPackage ../development/ocaml-modules/janestreet/ppx_fail-113_33_00.nix {}
+ then janeStreet.ppx_fail
else callPackage ../development/ocaml-modules/janestreet/ppx-fail.nix {};
ppx_fields_conv =
if lib.versionOlder "4.03" ocaml.version
- then callPackage ../development/ocaml-modules/janestreet/ppx_fields_conv-113_33_00.nix {}
+ then janeStreet.ppx_fields_conv
else callPackage ../development/ocaml-modules/janestreet/ppx-fields-conv.nix {};
ppx_let =
if lib.versionOlder "4.03" ocaml.version
- then callPackage ../development/ocaml-modules/janestreet/ppx_let-113_33_00.nix {}
+ then janeStreet.ppx_let
else callPackage ../development/ocaml-modules/janestreet/ppx-let.nix {};
ppx_pipebang =
if lib.versionOlder "4.03" ocaml.version
- then callPackage ../development/ocaml-modules/janestreet/ppx_pipebang-113_33_00.nix {}
+ then janeStreet.ppx_pipebang
else callPackage ../development/ocaml-modules/janestreet/ppx-pipebang.nix {};
ppx_sexp_message =
if lib.versionOlder "4.03" ocaml.version
- then callPackage ../development/ocaml-modules/janestreet/ppx_sexp_message-113_33_00.nix {}
+ then janeStreet.ppx_sexp_message
else callPackage ../development/ocaml-modules/janestreet/ppx-sexp-message.nix {};
ppx_sexp_value =
if lib.versionOlder "4.03" ocaml.version
- then callPackage ../development/ocaml-modules/janestreet/ppx_sexp_value-113_33_00.nix {}
+ then janeStreet.ppx_sexp_value
else callPackage ../development/ocaml-modules/janestreet/ppx-sexp-value.nix {};
ppx_typerep_conv =
if lib.versionOlder "4.03" ocaml.version
- then callPackage ../development/ocaml-modules/janestreet/ppx_typerep_conv-113_33_00.nix {}
+ then janeStreet.ppx_typerep_conv
else callPackage ../development/ocaml-modules/janestreet/ppx-typerep-conv.nix {};
ppx_variants_conv =
if lib.versionOlder "4.03" ocaml.version
- then callPackage ../development/ocaml-modules/janestreet/ppx_variants_conv-113_33_00.nix {}
+ then janeStreet.ppx_variants_conv
else callPackage ../development/ocaml-modules/janestreet/ppx-variants-conv.nix {};
ppx_expect =
if lib.versionOlder "4.03" ocaml.version
- then callPackage ../development/ocaml-modules/janestreet/ppx_expect-113_33_01.nix {}
+ then janeStreet.ppx_expect
else callPackage ../development/ocaml-modules/janestreet/ppx-expect.nix {};
ppx_jane =
if lib.versionOlder "4.03" ocaml.version
- then callPackage ../development/ocaml-modules/janestreet/ppx_jane-113_33_00.nix {}
+ then janeStreet.ppx_jane
else callPackage ../development/ocaml-modules/janestreet/ppx-jane.nix {};
- ppx_traverse_builtins = callPackage ../development/ocaml-modules/janestreet/ppx_traverse_builtins.nix {};
-
# Core sublibs
typerep =
- if lib.versionOlder "4.02" ocaml.version
+ if lib.versionOlder "4.03" ocaml.version
+ then janeStreet.typerep
+ else if lib.versionOlder "4.02" ocaml.version
then callPackage ../development/ocaml-modules/janestreet/typerep.nix {}
else typerep_p4;
fieldslib =
- if lib.versionOlder "4.02" ocaml.version
+ if lib.versionOlder "4.03" ocaml.version
+ then janeStreet.fieldslib
+ else if lib.versionOlder "4.02" ocaml.version
then callPackage ../development/ocaml-modules/janestreet/fieldslib.nix {}
else fieldslib_p4;
sexplib =
if lib.versionOlder "4.03" ocaml.version
- then callPackage ../development/ocaml-modules/janestreet/sexplib-113_33_00.nix {}
+ then janeStreet.sexplib
else if lib.versionOlder "4.02" ocaml.version
then callPackage ../development/ocaml-modules/janestreet/sexplib.nix {}
else sexplib_p4;
variantslib =
- if lib.versionOlder "4.02" ocaml.version
+ if lib.versionOlder "4.03" ocaml.version
+ then janeStreet.variantslib
+ else if lib.versionOlder "4.02" ocaml.version
then callPackage ../development/ocaml-modules/janestreet/variantslib.nix {}
else variantslib_p4;
bin_prot =
- if lib.versionOlder "4.02" ocaml.version
+ if lib.versionOlder "4.03" ocaml.version
+ then janeStreet.bin_prot
+ else if lib.versionOlder "4.02" ocaml.version
then callPackage ../development/ocaml-modules/janestreet/bin_prot.nix {}
else bin_prot_p4;
core_kernel =
if lib.versionOlder "4.03" ocaml.version
- then callPackage ../development/ocaml-modules/janestreet/core_kernel-113_33_01.nix {}
+ then janeStreet.core_kernel
else if lib.versionOlder "4.02" ocaml.version
then callPackage ../development/ocaml-modules/janestreet/core_kernel.nix {}
else core_kernel_p4;
core =
if lib.versionOlder "4.03" ocaml.version
- then callPackage ../development/ocaml-modules/janestreet/core-113_33_02.nix {}
+ then janeStreet.core
else if lib.versionOlder "4.02" ocaml.version
then callPackage ../development/ocaml-modules/janestreet/core.nix {}
else core_p4;
re2 =
- if lib.versionOlder "4.02" ocaml.version
+ if lib.versionOlder "4.03" ocaml.version
+ then janeStreet.re2
+ else if lib.versionOlder "4.02" ocaml.version
then callPackage ../development/ocaml-modules/janestreet/re2.nix {}
else re2_p4;
textutils =
- if lib.versionOlder "4.02" ocaml.version
+ if lib.versionOlder "4.03" ocaml.version
+ then janeStreet.textutils
+ else if lib.versionOlder "4.02" ocaml.version
then callPackage ../development/ocaml-modules/janestreet/textutils.nix {}
else textutils_p4;
core_extended =
- if lib.versionOlder "4.02" ocaml.version
+ if lib.versionOlder "4.03" ocaml.version
+ then janeStreet.core_extended
+ else if lib.versionOlder "4.02" ocaml.version
then callPackage ../development/ocaml-modules/janestreet/core-extended.nix {}
else core_extended_p4;
async_kernel =
if lib.versionOlder "4.03" ocaml.version
- then callPackage ../development/ocaml-modules/janestreet/async_kernel-113_33_00.nix {}
+ then janeStreet.async_kernel
else if lib.versionOlder "4.02" ocaml.version
then callPackage ../development/ocaml-modules/janestreet/async-kernel.nix {}
else async_kernel_p4;
- async_rpc_kernel = callPackage ../development/ocaml-modules/janestreet/async-rpc-kernel.nix {};
+ async_rpc_kernel =
+ if lib.versionOlder "4.03" ocaml.version
+ then janeStreet.async_rpc_kernel
+ else callPackage ../development/ocaml-modules/janestreet/async-rpc-kernel.nix {};
async_unix =
if lib.versionOlder "4.03" ocaml.version
- then callPackage ../development/ocaml-modules/janestreet/async_unix-113_33_00.nix {}
+ then janeStreet.async_unix
else if lib.versionOlder "4.02" ocaml.version
then callPackage ../development/ocaml-modules/janestreet/async-unix.nix {}
else async_unix_p4;
async_extra =
- if lib.versionOlder "4.02" ocaml.version
+ if lib.versionOlder "4.03" ocaml.version
+ then janeStreet.async_extra
+ else if lib.versionOlder "4.02" ocaml.version
then callPackage ../development/ocaml-modules/janestreet/async-extra.nix {}
else async_extra_p4;
async =
- if lib.versionOlder "4.02" ocaml.version
+ if lib.versionOlder "4.03" ocaml.version
+ then janeStreet.async
+ else if lib.versionOlder "4.02" ocaml.version
then callPackage ../development/ocaml-modules/janestreet/async.nix {}
else async_p4;
- async_ssl = callPackage ../development/ocaml-modules/janestreet/async_ssl.nix { };
+ async_ssl =
+ if lib.versionOlder "4.03" ocaml.version
+ then janeStreet.async_ssl
+ else callPackage ../development/ocaml-modules/janestreet/async_ssl.nix { };
# Apps / from all-packages
@@ -835,6 +873,7 @@ let
};
};
+ in (ocamlPackages.janeStreet // ocamlPackages);
in lib.fix' (lib.extends overrides packageSet);
in rec
{
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1f10fac50410..c694534d3a98 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2605,7 +2605,7 @@ in {
};
- rarfile = callPackage ../development/python-modules/rarfile {};
+ rarfile = callPackage ../development/python-modules/rarfile { inherit (pkgs) libarchive; };
proboscis = buildPythonPackage rec {
name = "proboscis-1.2.6.0";
@@ -4076,11 +4076,11 @@ in {
consul = buildPythonPackage (rec {
- name = "python-consul-0.6.0";
+ name = "python-consul-0.7.0";
src = pkgs.fetchurl {
url = "mirror://pypi/p/python-consul/${name}.tar.gz";
- sha256 = "0vfyr499sbc4nnhhijp2lznyj507nnak95bvv9w8y78ngxggskbh";
+ sha256 = "18gs5myk9wkkq5zvj0n0s68ngj3mrbdcifshxfj1j0bgb1km0wpm";
};
buildInputs = with self; [ requests six pytest ];
@@ -14967,12 +14967,12 @@ in {
};
nbxmpp = buildPythonPackage rec {
- name = "nbxmpp-0.5.3";
+ name = "nbxmpp-${version}";
+ version = "0.5.5";
src = pkgs.fetchurl {
- name = "${name}.tar.gz";
- url = "https://python-nbxmpp.gajim.org/downloads/8";
- sha256 = "0dcr786dyips1fdvgsn8yvpgcz5j7217fi05c29cfypdl8jnp6mp";
+ url = "mirror://pypi/n/nbxmpp/${name}.tar.gz";
+ sha256 = "1gnzrzrdl4nii1sc5x8p5iw2ya5sl70j3nn34abqsny51p2pzmv6";
};
meta = {
@@ -29626,106 +29626,40 @@ EOF
};
};
- hidapi = buildPythonPackage rec{
- version = "0.7.99.post15";
- name = "hidapi-${version}";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/h/hidapi/${name}.tar.gz";
- sha256 = "09wlr1d7mx80974bsq62j4pk80234jgl7ip4br0y43q6999dpcr0";
- };
-
- propagatedBuildInputs = with self; [ pkgs.libusb1 pkgs.udev cython ];
-
- # Fix the USB backend library lookup
- postPatch = ''
- libusb=${pkgs.libusb1.dev}/include/libusb-1.0
- test -d $libusb || { echo "ERROR: $libusb doesn't exist, please update/fix this build expression."; exit 1; }
- sed -i -e "s|/usr/include/libusb-1.0|$libusb|" setup.py
- '';
-
- meta = {
- description = "A Cython interface to the hidapi from https://github.com/signal11/hidapi";
- homepage = https://github.com/trezor/cython-hidapi;
- # license can actually be either bsd3 or gpl3
- # see https://github.com/trezor/cython-hidapi/blob/master/LICENSE-orig.txt
- license = licenses.bsd3;
- maintainers = with maintainers; [ np ];
- };
+ hidapi = callPackage ../development/python-modules/hidapi {
+ inherit (pkgs) udev libusb1;
};
- mnemonic = callPackage ../development/python-modules/mnemonic.nix { };
+ mnemonic = callPackage ../development/python-modules/mnemonic { };
- trezor = callPackage ../development/python-modules/trezor.nix { };
+ keepkey = callPackage ../development/python-modules/keepkey { };
- keepkey = buildPythonPackage rec{
- version = "0.7.3";
- name = "keepkey-${version}";
+ libagent = callPackage ../development/python-modules/libagent { };
- src = pkgs.fetchurl {
- url = "mirror://pypi/k/keepkey/${name}.tar.gz";
- sha256 = "14d2r8dlx997ypgma2k8by90acw7i3l7hfq4gar9lcka0lqfj714";
- };
+ ledgerblue = callPackage ../development/python-modules/ledgerblue { };
- propagatedBuildInputs = with self; [ protobuf3_0 hidapi ];
+ ecpy = callPackage ../development/python-modules/ecpy { };
- buildInputs = with self; [ ecdsa mnemonic ];
+ semver = callPackage ../development/python-modules/semver { };
- # There are no actual tests: "ImportError: No module named tests"
- doCheck = false;
+ ed25519 = callPackage ../development/python-modules/ed25519 { };
- meta = {
- description = "KeepKey Python client";
- homepage = https://github.com/keepkey/python-keepkey;
- license = licenses.gpl3;
- maintainers = with maintainers; [ np ];
- };
- };
-
- semver = buildPythonPackage rec {
- name = "semver-${version}";
- version = "2.2.1";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/s/semver/${name}.tar.gz";
- sha256 = "161gvsfpw0l8lnf1v19rvqc8b9f8n70cc8ppya4l0n6rwc1c1n4m";
- };
-
- meta = {
- description = "Python package to work with Semantic Versioning (http://semver.org/)";
- homepage = "https://github.com/k-bx/python-semver";
- license = licenses.bsd3;
- maintainers = with maintainers; [ np ];
- };
- };
-
- ed25519 = buildPythonPackage rec {
- name = "ed25519-${version}";
- version = "1.4";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/e/ed25519/${name}.tar.gz";
- sha256 = "0ahx1nkxa0xis3cw0h5c4fpgv8mq4znkq7kajly33lc3317bk499";
- };
-
- meta = {
- description = "Ed25519 public-key signatures";
- homepage = "https://github.com/warner/python-ed25519";
- license = licenses.mit;
- maintainers = with maintainers; [ np ];
- };
- };
+ trezor = callPackage ../development/python-modules/trezor { };
trezor_agent = buildPythonPackage rec{
- version = "0.7.0";
- name = "trezor_agent-${version}";
+ name = "${pname}-${version}";
+ pname = "trezor_agent";
+ version = "0.9.0";
- src = pkgs.fetchurl {
- url = "mirror://pypi/t/trezor_agent/${name}.tar.gz";
- sha256 = "1x1gwih6w8kxhpgmcp0v1k7mpmfsqiikkjca291sd0v2if24x7q1";
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1i5cdamlf3c0ym600pjklij74p8ifj9cv7xrpnrfl1b8nkadswbz";
};
- propagatedBuildInputs = with self; [ trezor ecdsa ed25519 mnemonic keepkey semver ];
+ propagatedBuildInputs = with self; [
+ trezor libagent ecdsa ed25519
+ mnemonic keepkey semver
+ ];
meta = {
description = "Using Trezor as hardware SSH agent";