diff --git a/doc/cross-compilation.xml b/doc/cross-compilation.xml
index 728616a9f26..7ff35437611 100644
--- a/doc/cross-compilation.xml
+++ b/doc/cross-compilation.xml
@@ -30,7 +30,7 @@
Platform parameters
- The three GNU Autoconf platforms, build, host, and cross, are historically the result of much confusion.
+ The three GNU Autoconf platforms, build, host, and target, are historically the result of much confusion.
clears this up somewhat but there is more to be said.
An important advice to get out the way is, unless you are packaging a compiler or other build tool, just worry about the build and host platforms.
Dealing with just two platforms usually better matches people's preconceptions, and in this case is completely correct.
@@ -62,8 +62,8 @@
The "target platform" is black sheep.
The other two intrinsically apply to all compiled software—or any build process with a notion of "build-time" followed by "run-time".
The target platform only applies to programming tools, and even then only is a good for for some of them.
- Briefly, GCC, Binutils, GHC, and certain other tools are written in such a way such that a single build can only compiler code for a single platform.
- Thus, when building them, one must think ahead about what platforms they wish to use the tool to produce machine code for, and build binaries for each.
+ Briefly, GCC, Binutils, GHC, and certain other tools are written in such a way such that a single build can only compile code for a single platform.
+ Thus, when building them, one must think ahead about which platforms they wish to use the tool to produce machine code for, and build binaries for each.
There is no fundamental need to think about the target ahead of time like this.
@@ -85,7 +85,8 @@
This field is obsolete and will soon disappear—please do not use it.
- The exact scheme these fields is a bit ill-defined due to a long and convoluted evolution, but this is slowly being cleaned up.
+ The exact schema these fields follow is a bit ill-defined due to a long and convoluted evolution, but this is slowly being cleaned up.
+ You can see examples of ones used in practice in lib.systems.examples; note how they are not all very consistent.
For now, here are few fields can count on them containing:
@@ -118,8 +119,27 @@
This is a nix representation of a parsed LLVM target triple with white-listed components.
This can be specified directly, or actually parsed from the config.
[Technically, only one need be specified and the others can be inferred, though the precision of inference may not be very good.]
- See lib.systems.parse for the exact representation, along with some is*predicates.
- These predicates are superior to the ones in stdenv as they aren't tied to the build platform (host, as previously discussed, would be a saner default).
+ See lib.systems.parse for the exact representation.
+
+
+
+
+ libc
+
+
+ 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.
+ It should probably be refactored to use the module system, like parse.
+
+
+
+
+ is*
+
+
+ These predicates are defined in lib.systems.inspect, and slapped on every platform.
+ They are superior to the ones in stdenv as they force the user to be explicit about which platform they are inspecting.
+ Please use these instead of those.
@@ -128,7 +148,7 @@
This is, quite frankly, a dumping ground of ad-hoc settings (it's an attribute set).
- See lib.systems.platforms for examples—there's hopefully one in there that will work verbatim for each platform one is working.
+ See lib.systems.platforms for examples—there's hopefully one in there that will work verbatim for each platform that is working.
Please help us triage these flags and give them better homes!
@@ -158,10 +178,10 @@
The depending package's target platform is unconstrained by the sliding window principle, which makes sense in that one can in principle build cross compilers targeting arbitrary platforms.
- How does this work in practice? Nixpkgs is now structured so that build-time dependencies are taken from from buildPackages, whereas run-time dependencies are taken from the top level attribute set.
+ How does this work in practice? Nixpkgs is now structured so that build-time dependencies are taken from buildPackages, whereas run-time dependencies are taken from the top level attribute set.
For example, buildPackages.gcc should be used at build time, while gcc should be used at run time.
Now, for most of Nixpkgs's history, there was no buildPackages, and most packages have not been refactored to use it explicitly.
- Instead, one can use the four attributes used for specifying dependencies as documented in .
+ Instead, one can use the four attributes used for specifying dependencies as documented in .
We "splice" together the run-time and build-time package sets with callPackage, and then mkDerivation for each of four attributes pulls the right derivation out.
This splicing can be skipped when not cross compiling as the package sets are the same, but is a bit slow for cross compiling.
Because of this, a best-of-both-worlds solution is in the works with no splicing or explicit access of buildPackages needed.
@@ -184,11 +204,27 @@
More information needs to moved from the old wiki, especially , for this section.
- Many sources (manual, wiki, etc) probably mention passing system, platform, and, optionally, crossSystem to nixpkgs:
- import <nixpkgs> { system = ..; platform = ..; crossSystem = ..; }.
- system and platform together determine the system on which packages are built, and crossSystem specifies the platform on which packages are ultimately intended to run, if it is different.
- This still works, but with more recent changes, one can alternatively pass localSystem, containing system and platform, for symmetry.
+ Nixpkgs can be instantiated with localSystem alone, in which case there is no cross compiling and everything is built by and for that system,
+ or also with crossSystem, in which case packages run on the latter, but all building happens on the former.
+ Both parameters take the same schema as the 3 (build, host, and target) platforms defined in the previous section.
+ As mentioned above, lib.systems.examples has some platforms which are used as arguments for these parameters in practice.
+ You can use them programmatically, or on the command line like nix-build <nixpkgs> --arg crossSystem '(import <nixpkgs/lib>).systems.examples.fooBarBaz'.
+
+ While one is free to pass both parameters in full, there's a lot of logic to fill in missing fields.
+ As discussed in the previous section, only one of system, config, and parsed is needed to infer the other two.
+ Additionally, libc will be inferred from parse.
+ Finally, localSystem.system is also impurely inferred based on the platform evaluation occurs.
+ This means it is often not necessary to pass localSystem at all, as in the command-line example in the previous paragraph.
+
+
+
+ Many sources (manual, wiki, etc) probably mention passing system, platform, along with the optional crossSystem to nixpkgs:
+ import <nixpkgs> { system = ..; platform = ..; crossSystem = ..; }.
+ Passing those two instead of localSystem is still supported for compatibility, but is discouraged.
+ Indeed, much of the inference we do for these parameters is motivated by compatibility as much as convenience.
+
+
One would think that localSystem and crossSystem overlap horribly with the three *Platforms (buildPlatform, hostPlatform, and targetPlatform; see stage.nix or the manual).
Actually, those identifiers are purposefully not used here to draw a subtle but important distinction:
diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md
index d9306ae56bd..c17739825bc 100644
--- a/doc/languages-frameworks/python.md
+++ b/doc/languages-frameworks/python.md
@@ -710,7 +710,7 @@ nix-env -if build.nix
```
Now you can use the Python interpreter, as well as the extra packages that you added to the environment.
-#### Environment defined in `~/.nixpkgs/config.nix`
+#### Environment defined in `~/.config/nixpkgs/config.nix`
If you prefer to, you could also add the environment as a package override to the Nixpkgs set.
```nix
diff --git a/lib/default.nix b/lib/default.nix
index e692637abf1..3893e349db3 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 00000000000..a11b5a6f4bd
--- /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/maintainers.nix b/lib/maintainers.nix
index a3e397f2173..db40b36fd6a 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -132,6 +132,7 @@
deepfire = "Kosyrev Serge <_deepfire@feelingofgreen.ru>";
demin-dmitriy = "Dmitriy Demin ";
DerGuteMoritz = "Moritz Heidkamp ";
+ dermetfan = "Robin Stumm ";
DerTim1 = "Tim Digel ";
desiderius = "Didier J. Devroye ";
devhell = "devhell <\"^\"@regexmail.net>";
@@ -161,6 +162,7 @@
ehegnes = "Eric Hegnes ";
ehmry = "Emery Hemingway ";
eikek = "Eike Kettner ";
+ ekleog = "Leo Gaspard ";
elasticdog = "Aaron Bull Schaefer ";
eleanor = "Dejan Lukan ";
elitak = "Eric Litak ";
diff --git a/lib/strings.nix b/lib/strings.nix
index d48624257cf..1cc633c729d 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -438,8 +438,13 @@ rec {
=> true
isStorePath pkgs.python
=> true
+ isStorePath [] || isStorePath 42 || isStorePath {} || …
+ => false
*/
- isStorePath = x: builtins.substring 0 1 (toString x) == "/" && dirOf (builtins.toPath x) == builtins.storeDir;
+ isStorePath = x:
+ builtins.isString x
+ && builtins.substring 0 1 (toString x) == "/"
+ && dirOf (builtins.toPath x) == builtins.storeDir;
/* Convert string to int
Obviously, it is a bit hacky to use fromJSON that way.
diff --git a/lib/systems/default.nix b/lib/systems/default.nix
index c37b6be2523..c22c9956196 100644
--- a/lib/systems/default.nix
+++ b/lib/systems/default.nix
@@ -5,6 +5,7 @@ rec {
parse = import ./parse.nix;
inspect = import ./inspect.nix;
platforms = import ./platforms.nix;
+ examples = import ./examples.nix;
# Elaborate a `localSystem` or `crossSystem` so that it contains everything
# necessary.
diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
new file mode 100644
index 00000000000..e394f43831c
--- /dev/null
+++ b/lib/systems/examples.nix
@@ -0,0 +1,130 @@
+# These can be passed to nixpkgs as either the `localSystem` or
+# `crossSystem`. They are put here for user convenience, but also used by cross
+# tests and linux cross stdenv building, so handle with care!
+
+let platforms = import ./platforms.nix; in
+
+rec {
+ #
+ # Linux
+ #
+
+ sheevaplug = rec {
+ config = "armv5tel-unknown-linux-gnueabi";
+ bigEndian = false;
+ arch = "armv5tel";
+ float = "soft";
+ withTLS = true;
+ libc = "glibc";
+ platform = platforms.sheevaplug;
+ openssl.system = "linux-generic32";
+ inherit (platform) gcc;
+ };
+
+ raspberryPi = rec {
+ config = "armv6l-unknown-linux-gnueabihf";
+ bigEndian = false;
+ arch = "armv6l";
+ float = "hard";
+ fpu = "vfp";
+ withTLS = true;
+ libc = "glibc";
+ platform = platforms.raspberrypi;
+ openssl.system = "linux-generic32";
+ inherit (platform) gcc;
+ };
+
+ armv7l-hf-multiplatform = rec {
+ config = "arm-unknown-linux-gnueabihf";
+ bigEndian = false;
+ arch = "armv7-a";
+ float = "hard";
+ fpu = "vfpv3-d16";
+ withTLS = true;
+ libc = "glibc";
+ platform = platforms.armv7l-hf-multiplatform;
+ openssl.system = "linux-generic32";
+ inherit (platform) gcc;
+ };
+
+ aarch64-multiplatform = rec {
+ config = "aarch64-unknown-linux-gnu";
+ bigEndian = false;
+ arch = "aarch64";
+ withTLS = true;
+ libc = "glibc";
+ platform = platforms.aarch64-multiplatform;
+ inherit (platform) gcc;
+ };
+
+ scaleway-c1 = armv7l-hf-multiplatform // rec {
+ platform = platforms.scaleway-c1;
+ inherit (platform) gcc;
+ inherit (gcc) fpu;
+ };
+
+ pogoplug4 = rec {
+ arch = "armv5tel";
+ config = "armv5tel-softfloat-linux-gnueabi";
+ float = "soft";
+
+ platform = platforms.pogoplug4;
+
+ inherit (platform) gcc;
+ libc = "glibc";
+
+ withTLS = true;
+ openssl.system = "linux-generic32";
+ };
+
+ fuloongminipc = rec {
+ config = "mips64el-unknown-linux-gnu";
+ bigEndian = false;
+ arch = "mips";
+ float = "hard";
+ withTLS = true;
+ libc = "glibc";
+ platform = platforms.fuloong2f_n32;
+ openssl.system = "linux-generic32";
+ inherit (platform) gcc;
+ };
+
+ #
+ # Darwin
+ #
+
+ iphone64 = {
+ config = "aarch64-apple-darwin14";
+ arch = "arm64";
+ libc = "libSystem";
+ platform = {};
+ };
+
+ iphone32 = {
+ config = "arm-apple-darwin10";
+ arch = "armv7-a";
+ libc = "libSystem";
+ platform = {};
+ };
+
+ #
+ # Windows
+ #
+
+ # 32 bit mingw-w64
+ mingw32 = {
+ config = "i686-pc-mingw32";
+ arch = "x86"; # Irrelevant
+ libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain
+ platform = {};
+ };
+
+ # 64 bit mingw-w64
+ mingwW64 = {
+ # That's the triplet they use in the mingw-w64 docs.
+ config = "x86_64-pc-mingw32";
+ arch = "x86_64"; # Irrelevant
+ libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain
+ platform = {};
+ };
+}
diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix
index 0bea38ab419..ae4fc355c71 100644
--- a/lib/systems/platforms.nix
+++ b/lib/systems/platforms.nix
@@ -255,6 +255,10 @@ rec {
arch = "armv6";
fpu = "vfp";
float = "hard";
+ # TODO(@Ericson2314) what is this and is it a good idea? It was
+ # used in some cross compilation examples but not others.
+ #
+ # abi = "aapcs-linux";
};
};
@@ -460,7 +464,10 @@ rec {
'';
kernelTarget = "vmlinux";
uboot = null;
- gcc.arch = "loongson2f";
+ gcc = {
+ arch = "loongson2f";
+ abi = "n32";
+ };
};
beaglebone = armv7l-hf-multiplatform // {
diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix
index 334e1a70733..f55f3d71272 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 ffbf96aa9bc..9ee0549fc0f 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/lib/types.nix b/lib/types.nix
index 45122759bfc..50aa6d77085 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -92,6 +92,8 @@ rec {
};
+ # When adding new types don't forget to document them in
+ # nixos/doc/manual/development/option-types.xml!
types = rec {
unspecified = mkOptionType {
@@ -257,6 +259,7 @@ rec {
functor = (defaultFunctor name) // { wrapped = elemType; };
};
+ # Value of given type but with no merging (i.e. `uniq list`s are not concatenated).
uniq = elemType: mkOptionType rec {
name = "uniq";
inherit (elemType) description check;
@@ -267,6 +270,7 @@ rec {
functor = (defaultFunctor name) // { wrapped = elemType; };
};
+ # Null or value of ...
nullOr = elemType: mkOptionType rec {
name = "nullOr";
description = "null or ${elemType.description}";
@@ -283,6 +287,7 @@ rec {
functor = (defaultFunctor name) // { wrapped = elemType; };
};
+ # A submodule (like typed attribute set). See NixOS manual.
submodule = opts:
let
opts' = toList opts;
@@ -314,6 +319,7 @@ rec {
};
};
+ # A value from a set of allowed ones.
enum = values:
let
show = v:
@@ -329,6 +335,7 @@ rec {
functor = (defaultFunctor name) // { payload = values; binOp = a: b: unique (a ++ b); };
};
+ # Either value of type `t1` or `t2`.
either = t1: t2: mkOptionType rec {
name = "either";
description = "${t1.description} or ${t2.description}";
@@ -352,6 +359,8 @@ rec {
functor = (defaultFunctor name) // { wrapped = [ t1 t2 ]; };
};
+ # Either value of type `finalType` or `coercedType`, the latter is
+ # converted to `finalType` using `coerceFunc`.
coercedTo = coercedType: coerceFunc: finalType:
assert coercedType.getSubModules == null;
mkOptionType rec {
diff --git a/maintainers/scripts/rebuild-amount.sh b/maintainers/scripts/rebuild-amount.sh
index ebc5dc3b87e..098a8c88cb7 100755
--- a/maintainers/scripts/rebuild-amount.sh
+++ b/maintainers/scripts/rebuild-amount.sh
@@ -1,260 +1,115 @@
-#!/bin/sh
+#!/usr/bin/env bash
+set -e
-usage () {
- echo 1>&2 "
-usage:
- $0
- [--git commit..commit | --git commit]
- [--svn rev:rev | --svn rev]
- [--path path[:path]*]
- [--help]
-
-This program is used to investigate how any changes inside your nixpkgs
-repository may hurt. With these kind of information you may choose wisely
-where you should commit your changes.
-
-This program adapts it-self to your versionning system to avoid too much
-effort on your Internet bandwidth. If you need to check more than one
-commits / revisions, you may use the following commands:
-
- --git remotes/trunk..master
- --svn 17670:17677
-
- Check the differences between each commit separating the first and the
- last commit.
-
- --path /etc/nixos/nixpkgs:/tmp/nixpkgs_1:/tmp/nixpkgs_2
-
- Check the differences between multiple directories containing different
- versions of nixpkgs.
-
-All these options exist with one commit / revision argument. Such options
-are used to compare your \$NIXPKGS path with the specified version.
-
-If you omit to mention any other commit / revision, then your \$NIXPKGS path
-is compared with its last update. This command is useful to test code from
-a dirty repository.
-
-"
-
- exit 1;
-}
-
-#####################
-# Process Arguments #
-#####################
-
-: ${NIXPKGS=/etc/nixos/nixpkgs/}
-
-vcs=""
-gitCommits=""
-svnRevisions=""
-pathLocations=""
-verbose=false
-
-argfun=""
-for arg; do
- if test -z "$argfun"; then
- case $arg in
- --git) vcs="git"; argfun="set_gitCommits";;
- --svn) vcs="svn"; argfun="set_svnRevisions";;
- --path) vcs="path"; argfun="set_pathLocations";;
- --verbose) verbose=true;;
- --help) usage;;
- *) usage;;
- esac
- else
- case $argfun in
- set_*)
- var=$(echo $argfun | sed 's,^set_,,')
- eval $var=$arg
- ;;
- esac
- argfun=""
- fi
-done
-
-if $verbose; then
- set -x
-else
- set +x
+if [ "$#" != 1 ] && [ "$#" != 2 ]; then
+ cat <<-EOF
+ Usage: $0 commit-spec [commit-spec]
+ You need to be in a git-controlled nixpkgs tree.
+ The current state of the tree will be used if the second commit is missing.
+ EOF
+ exit 1
fi
-############################
-# Find the repository type #
-############################
+# A slightly hacky way to get the config.
+parallel="$(echo 'config.rebuild-amount.parallel or false' | nix-repl . 2>/dev/null \
+ | grep -v '^\(nix-repl.*\)\?$' | tail -n 1 || true)"
-if test -z "$vcs"; then
- if test -x "$NIXPKGS/.git"; then
- if git --git-dir="$NIXPKGS/.git" branch > /dev/null 2>&1; then
- vcs="git"
- gitCommits=$(git --git-dir="$NIXPKGS/.git" log -n 1 --pretty=format:%H 2> /dev/null)
- fi
- elif test -x "$NIXPKGS/.svn"; then
- cd "$NIXPKGS"
- if svn info > /dev/null 2>&1; then
- vcs="svn";
- svnRevisions=$(svn info | sed -n 's,Revision: ,,p')
- fi
- cd -
- else
- usage
- fi
-fi
+echo "Estimating rebuild amount by counting changed Hydra jobs."
-###############################
-# Define a storage directory. #
-###############################
+toRemove=()
-pkgListDir=""
-exitCode=1
-cleanup(){
- test -e "$pkgListDir" && rm -rf "$pkgListDir"
- exit $exitCode;
+cleanup() {
+ rm -rf "${toRemove[@]}"
}
-
trap cleanup EXIT SIGINT SIGQUIT ERR
-pkgListDir=$(mktemp --tmpdir -d rebuild-amount-XXXXXXXX)
-vcsDir="$pkgListDir/.vcs"
+MKTEMP='mktemp --tmpdir nix-rebuild-amount-XXXXXXXX'
-###########################
-# Versionning for Dummies #
-###########################
+nixexpr() {
+ cat <<-EONIX
+ let
+ lib = import $1/lib;
+ hydraJobs = import $1/pkgs/top-level/release.nix
+ # Compromise: accuracy vs. resources needed for evaluation.
+ { supportedSystems = cfg.systems or [ "x86_64-linux" "x86_64-darwin" ]; };
+ cfg = (import $1 {}).config.rebuild-amount or {};
-path_init() {
- if test "${pathLocations#*:}" = "$pathLocations"; then
- pathLocations="$NIXPKGS:$pathLocations"
- fi
- pathLocations="${pathLocations}:"
+ recurseIntoAttrs = attrs: attrs // { recurseForDerivations = true; };
+
+ # hydraJobs leaves recurseForDerivations as empty attrmaps;
+ # that would break nix-env and we also need to recurse everywhere.
+ tweak = lib.mapAttrs
+ (name: val:
+ if name == "recurseForDerivations" then true
+ else if lib.isAttrs val && val.type or null != "derivation"
+ then recurseIntoAttrs (tweak val)
+ else val
+ );
+
+ # Some of these contain explicit references to platform(s) we want to avoid;
+ # some even (transitively) depend on ~/.nixpkgs/config.nix (!)
+ blacklist = [
+ "tarball" "metrics" "manual"
+ "darwin-tested" "unstable" "stdenvBootstrapTools"
+ "moduleSystem" "lib-tests" # these just confuse the output
+ ];
+
+ in
+ tweak (builtins.removeAttrs hydraJobs blacklist)
+ EONIX
}
-path_getNext() {
- pathLoc="${pathLocations%%:*}"
- pathLocations="${pathLocations#*:}"
+# Output packages in tree $2 that weren't in $1.
+# Changing the output hash or name is taken as a change.
+# Extra nix-env parameters can be in $3
+newPkgs() {
+ # We use files instead of pipes, as running multiple nix-env processes
+ # could eat too much memory for a standard 4GiB machine.
+ local -a list
+ for i in 1 2; do
+ local l="$($MKTEMP)"
+ list[$i]="$l"
+ toRemove+=("$l")
+
+ local expr="$($MKTEMP)"
+ toRemove+=("$expr")
+ nixexpr "${!i}" > "$expr"
+
+ nix-env -f "$expr" -qaP --no-name --out-path --show-trace $3 \
+ | sort > "${list[$i]}" &
+
+ if [ "$parallel" != "true" ]; then
+ wait
+ fi
+ done
+
+ wait
+ comm -13 "${list[@]}"
}
-path_setPath() {
- path="$pathLoc"
-}
+# Prepare nixpkgs trees.
+declare -a tree
+for i in 1 2; do
+ if [ -n "${!i}" ]; then # use the given commit
+ dir="$($MKTEMP -d)"
+ tree[$i]="$dir"
+ toRemove+=("$dir")
-path_setName() {
- name=$(echo "$pathLoc" | tr '/' '_')
-}
-
-################
-# Git Commands #
-################
-
-git_init() {
- git clone "$NIXPKGS/.git" "$vcsDir" > /dev/null 2>&1
- if echo "gitCommits" | grep -c "\.\." > /dev/null 2>&1; then
- gitCommits=$(git --git-dir="$vcsDir/.git" log --reverse --pretty=format:%H $gitCommits 2> /dev/null)
- else
- pathLocations="$vcsDir:$NIXPKGS"
- vcs="path"
- path_init
- fi
-}
-
-git_getNext() {
- git --git-dir="$vcsDir/.git" checkout $(echo "$gitCommits" | head -n 1) > /dev/null 2>&1
- gitCommits=$(echo "$gitCommits" | sed '1 d')
-}
-
-git_setPath() {
- path="$vcsDir"
-}
-
-git_setName() {
- name=$(git --git-dir="$vcsDir/.git" log -n 1 --pretty=format:%H 2> /dev/null)
-}
-
-#######################
-# Subversion Commands #
-#######################
-
-svn_init() {
- cp -r "$NIXPKGS" "$vcsDir" > /dev/null 2>&1
- if echo "svnRevisions" | grep -c ":" > /dev/null 2>&1; then
- svnRevisions=$(seq ${svnRevisions%:*} ${svnRevisions#*:})
- else
- pathLocations="$vcsDir:$NIXPKGS"
- vcs="path"
- path_init
- fi
-}
-
-svn_getNext() {
- cd "$vcsDir"
- svn checkout $(echo "$svnRevisions" | head -n 1) > /dev/null 2>&1
- cd -
- svnRevisions=$(echo "$svnRevisions" | sed '1 d')
-}
-
-svn_setPath() {
- path="$vcsDir"
-}
-
-svn_setName() {
- name=$(svn info 2> /dev/null | sed -n 's,Revision: ,,p')
-}
-
-####################
-# Logical Commands #
-####################
-
-init () { ${vcs}_init; }
-getNext () { ${vcs}_getNext; }
-setPath () { ${vcs}_setPath; }
-setName () { ${vcs}_setName; }
-
-
-#####################
-# Check for Rebuild #
-#####################
-
-# Generate the list of all derivations that could be build from a nixpkgs
-# respository. This list of derivation hashes is compared with previous
-# lists and a brief summary is produced on the output.
-
-compareNames () {
- nb=$(diff -y --suppress-common-lines --speed-large-files "$pkgListDir/$1.drvs" "$pkgListDir/$2.drvs" 2> /dev/null | wc -l)
- echo "$1 -> $2: $nb"
-}
-
-echo "Please wait, this may take some minutes ..."
-
-init
-first=""
-oldPrev=""
-
-prev=""
-curr=""
-
-while true; do
- getNext
- setPath # set path=...
- setName # set name=...
- curr="$name"
-
- test -z "$curr" && break || true
-
- nix-instantiate "$path" > "$pkgListDir/$curr.drvs" > /dev/null 2>&1 || true
-
- if test -n "$prev"; then
- compareNames "$prev" "$curr"
- else
- echo "Number of package to rebuild:"
- first="$curr"
- fi
- oldPrev="$prev"
- prev="$curr"
+ git clone --shared --no-checkout --quiet . "${tree[$i]}"
+ (cd "${tree[$i]}" && git checkout --quiet "${!i}")
+ else #use the current tree
+ tree[$i]="$(pwd)"
+ fi
done
-if test "$first" != "$oldPrev"; then
- echo "Number of package to rebuild (first -> last):"
- compareNames "$first" "$curr"
-fi
+newlist="$($MKTEMP)"
+toRemove+=("$newlist")
+# Notes:
+# - the evaluation is done on x86_64-linux, like on Hydra.
+# - using $newlist file so that newPkgs() isn't in a sub-shell (because of toRemove)
+newPkgs "${tree[1]}" "${tree[2]}" '--argstr system "x86_64-linux"' > "$newlist"
+
+# Hacky: keep only the last word of each attribute path and sort.
+sed -n 's/\([^. ]*\.\)*\([^. ]*\) .*$/\2/p' < "$newlist" \
+ | sort | uniq -c
-exitCode=0
diff --git a/maintainers/scripts/update-python-libraries b/maintainers/scripts/update-python-libraries
new file mode 100755
index 00000000000..90f6c94233a
--- /dev/null
+++ b/maintainers/scripts/update-python-libraries
@@ -0,0 +1,250 @@
+#! /usr/bin/env nix-shell
+#! nix-shell -i python3 -p 'python3.withPackages(ps: with ps; [ requests toolz ])'
+
+"""
+Update a Python package expression by passing in the `.nix` file, or the directory containing it.
+You can pass in multiple files or paths.
+
+You'll likely want to use
+``
+ $ ./update-python-libraries ../../pkgs/development/python-modules/*
+``
+to update all libraries in that folder.
+"""
+
+import argparse
+import logging
+import os
+import re
+import requests
+import toolz
+
+INDEX = "https://pypi.io/pypi"
+"""url of PyPI"""
+
+EXTENSIONS = ['tar.gz', 'tar.bz2', 'tar', 'zip', '.whl']
+"""Permitted file extensions. These are evaluated from left to right and the first occurance is returned."""
+
+def _get_value(attribute, text):
+ """Match attribute in text and return it."""
+ regex = '{}\s+=\s+"(.*)";'.format(attribute)
+ regex = re.compile(regex)
+ value = regex.findall(text)
+ n = len(value)
+ if n > 1:
+ raise ValueError("Found too many values for {}".format(attribute))
+ elif n == 1:
+ return value[0]
+ else:
+ raise ValueError("No value found for {}".format(attribute))
+
+def _get_line_and_value(attribute, text):
+ """Match attribute in text. Return the line and the value of the attribute."""
+ regex = '({}\s+=\s+"(.*)";)'.format(attribute)
+ regex = re.compile(regex)
+ value = regex.findall(text)
+ n = len(value)
+ if n > 1:
+ raise ValueError("Found too many values for {}".format(attribute))
+ elif n == 1:
+ return value[0]
+ else:
+ raise ValueError("No value found for {}".format(attribute))
+
+
+def _replace_value(attribute, value, text):
+ """Search and replace value of attribute in text."""
+ old_line, old_value = _get_line_and_value(attribute, text)
+ new_line = old_line.replace(old_value, value)
+ new_text = text.replace(old_line, new_line)
+ return new_text
+
+def _fetch_page(url):
+ r = requests.get(url)
+ if r.status_code == requests.codes.ok:
+ return r.json()
+ else:
+ raise ValueError("Request for {} failed".format(url))
+
+def _get_latest_version(package, extension):
+
+
+ url = "{}/{}/json".format(INDEX, package)
+ json = _fetch_page(url)
+
+ data = extract_relevant_nix_data(json, extension)[1]
+
+ version = data['latest_version']
+ if version in data['versions']:
+ sha256 = data['versions'][version]['sha256']
+ else:
+ sha256 = None # Its possible that no file was uploaded to PyPI
+
+ return version, sha256
+
+
+def extract_relevant_nix_data(json, extension):
+ """Extract relevant Nix data from the JSON of a package obtained from PyPI.
+
+ :param json: JSON obtained from PyPI
+ """
+ def _extract_license(json):
+ """Extract license from JSON."""
+ return json['info']['license']
+
+ def _available_versions(json):
+ return json['releases'].keys()
+
+ def _extract_latest_version(json):
+ return json['info']['version']
+
+ def _get_src_and_hash(json, version, extensions):
+ """Obtain url and hash for a given version and list of allowable extensions."""
+ if not json['releases']:
+ msg = "Package {}: No releases available.".format(json['info']['name'])
+ raise ValueError(msg)
+ else:
+ # We use ['releases'] and not ['urls'] because we want to have the possibility for different version.
+ for possible_file in json['releases'][version]:
+ for extension in extensions:
+ if possible_file['filename'].endswith(extension):
+ src = {'url': str(possible_file['url']),
+ 'sha256': str(possible_file['digests']['sha256']),
+ }
+ return src
+ else:
+ msg = "Package {}: No release with valid file extension available.".format(json['info']['name'])
+ logging.info(msg)
+ return None
+ #raise ValueError(msg)
+
+ def _get_sources(json, extensions):
+ versions = _available_versions(json)
+ releases = {version: _get_src_and_hash(json, version, extensions) for version in versions}
+ releases = toolz.itemfilter(lambda x: x[1] is not None, releases)
+ return releases
+
+ # Collect data)
+ name = str(json['info']['name'])
+ latest_version = str(_extract_latest_version(json))
+ #src = _get_src_and_hash(json, latest_version, EXTENSIONS)
+ sources = _get_sources(json, [extension])
+
+ # Collect meta data
+ license = str(_extract_license(json))
+ license = license if license != "UNKNOWN" else None
+ summary = str(json['info'].get('summary')).strip('.')
+ summary = summary if summary != "UNKNOWN" else None
+ #description = str(json['info'].get('description'))
+ #description = description if description != "UNKNOWN" else None
+ homepage = json['info'].get('home_page')
+
+ data = {
+ 'latest_version' : latest_version,
+ 'versions' : sources,
+ #'src' : src,
+ 'meta' : {
+ 'description' : summary if summary else None,
+ #'longDescription' : description,
+ 'license' : license,
+ 'homepage' : homepage,
+ },
+ }
+ return name, data
+
+
+def _update_package(path):
+
+ # We need to read and modify a Nix expression.
+ if os.path.isdir(path):
+ path = os.path.join(path, 'default.nix')
+
+ if not os.path.isfile(path):
+ logging.warning("Path does not exist: {}".format(path))
+ return False
+
+ if not path.endswith(".nix"):
+ logging.warning("Path does not end with `.nix`, skipping: {}".format(path))
+ return False
+
+ with open(path, 'r') as f:
+ text = f.read()
+
+ try:
+ pname = _get_value('pname', text)
+ except ValueError as e:
+ logging.warning("Path {}: {}".format(path, str(e)))
+ return False
+
+ try:
+ version = _get_value('version', text)
+ except ValueError as e:
+ logging.warning("Path {}: {}".format(path, str(e)))
+ return False
+
+ # If we use a wheel, then we need to request a wheel as well
+ try:
+ format = _get_value('format', text)
+ except ValueError as e:
+ # No format mentioned, then we assume we have setuptools
+ # and use a .tar.gz
+ logging.info("Path {}: {}".format(path, str(e)))
+ extension = ".tar.gz"
+ else:
+ if format == 'wheel':
+ extension = ".whl"
+ else:
+ try:
+ url = _get_value('url', text)
+ extension = os.path.splitext(url)[1]
+ if 'pypi' not in url:
+ logging.warning("Path {}: uses non-PyPI url, not updating.".format(path))
+ return False
+ except ValueError as e:
+ logging.info("Path {}: {}".format(path, str(e)))
+ extension = ".tar.gz"
+
+ try:
+ new_version, new_sha256 = _get_latest_version(pname, extension)
+ except ValueError as e:
+ logging.warning("Path {}: {}".format(path, str(e)))
+ else:
+ if not new_sha256:
+ logging.warning("Path has no valid file available: {}".format(path))
+ return False
+ if new_version != version:
+ try:
+ text = _replace_value('version', new_version, text)
+ except ValueError as e:
+ logging.warning("Path {}: {}".format(path, str(e)))
+ try:
+ text = _replace_value('sha256', new_sha256, text)
+ except ValueError as e:
+ logging.warning("Path {}: {}".format(path, str(e)))
+
+ with open(path, 'w') as f:
+ f.write(text)
+
+ logging.info("Updated {} from {} to {}".format(pname, version, new_version))
+
+ else:
+ logging.info("No update available for {} at {}".format(pname, version))
+
+ return True
+
+
+def main():
+
+ parser = argparse.ArgumentParser()
+ parser.add_argument('package', type=str, nargs='+')
+
+ args = parser.parse_args()
+
+ packages = args.package
+
+ count = list(map(_update_package, packages))
+
+ #logging.info("{} package(s) updated".format(sum(count)))
+
+if __name__ == '__main__':
+ main()
\ No newline at end of file
diff --git a/nixos/doc/manual/development/option-types.xml b/nixos/doc/manual/development/option-types.xml
index 741e763c295..e928c557087 100644
--- a/nixos/doc/manual/development/option-types.xml
+++ b/nixos/doc/manual/development/option-types.xml
@@ -68,8 +68,7 @@
Value Types
- Value types are type that take a value parameter. The only value type
- in the library is enum.
+ Value types are type that take a value parameter.
@@ -141,6 +140,17 @@
str. Multiple definitions cannot be
merged.
+
+ types.coercedTo from
+ f to
+ Type to or type
+ from which will be coerced to
+ type to using function
+ f which takes an argument of type
+ from and return a value of type
+ to. Can be used to preserve backwards
+ compatibility of an option if its type was changed.
+
diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml
index 25766439759..6948c22cc88 100644
--- a/nixos/doc/manual/release-notes/rl-1709.xml
+++ b/nixos/doc/manual/release-notes/rl-1709.xml
@@ -68,6 +68,27 @@ following incompatible changes:
db-config.sqlite which will be automatically recreated.
+
+
+ The ipfs package now doesn't ignore the dataDir option anymore. If you've ever set this option to anything other than the default you'll have to either unset it (so the default gets used) or migrate the old data manually with
+
+dataDir=<valueOfDataDir>
+mv /var/lib/ipfs/.ipfs/* $dataDir
+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 ae30a710bf6..d503f5a8b20 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/config/nsswitch.nix b/nixos/modules/config/nsswitch.nix
index 4e5de421d8a..d541fff140e 100644
--- a/nixos/modules/config/nsswitch.nix
+++ b/nixos/modules/config/nsswitch.nix
@@ -10,10 +10,12 @@ let
inherit (config.services.samba) nsswins;
ldap = (config.users.ldap.enable && config.users.ldap.nsswitch);
sssd = config.services.sssd.enable;
+ resolved = config.services.resolved.enable;
hostArray = [ "files" "mymachines" ]
++ optionals nssmdns [ "mdns_minimal [!UNAVAIL=return]" ]
++ optionals nsswins [ "wins" ]
+ ++ optionals resolved ["resolv [!UNAVAIL=return]"]
++ [ "dns" ]
++ optionals nssmdns [ "mdns" ]
++ ["myhostname" ];
diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix
index bf66994b502..bd80c811348 100644
--- a/nixos/modules/config/pulseaudio.nix
+++ b/nixos/modules/config/pulseaudio.nix
@@ -240,11 +240,14 @@ in {
};
systemd.user = {
services.pulseaudio = {
+ restartIfChanged = true;
serviceConfig = {
RestartSec = "500ms";
+ PassEnvironment = "DISPLAY";
};
- environment = { DISPLAY = ":${toString config.services.xserver.display}"; };
- restartIfChanged = true;
+ };
+ sockets.pulseaudio = {
+ wantedBy = [ "sockets.target" ];
};
};
})
diff --git a/nixos/modules/hardware/nitrokey.nix b/nixos/modules/hardware/nitrokey.nix
new file mode 100644
index 00000000000..bd440de6972
--- /dev/null
+++ b/nixos/modules/hardware/nitrokey.nix
@@ -0,0 +1,41 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+ cfg = config.hardware.nitrokey;
+
+in
+
+{
+ options.hardware.nitrokey = {
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Enables udev rules for Nitrokey devices. By default grants access
+ to users in the "nitrokey" group. You may want to install the
+ nitrokey-app package, depending on your device and needs.
+ '';
+ };
+
+ group = mkOption {
+ type = types.str;
+ default = "nitrokey";
+ example = "wheel";
+ description = ''
+ Grant access to Nitrokey devices to users in this group.
+ '';
+ };
+ };
+
+ config = mkIf cfg.enable {
+ services.udev.packages = [
+ (pkgs.nitrokey-udev-rules.override (attrs:
+ { inherit (cfg) group; }
+ ))
+ ];
+ users.extraGroups."${cfg.group}" = {};
+ };
+}
diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix
index 161ed9457af..80abec95c03 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/module-list.nix b/nixos/modules/module-list.nix
index a358344a888..7afcb9051bd 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -39,6 +39,7 @@
./hardware/network/intel-3945abg.nix
./hardware/network/ralink.nix
./hardware/network/rtl8192c.nix
+ ./hardware/nitrokey.nix
./hardware/opengl.nix
./hardware/pcmcia.nix
./hardware/usb-wwan.nix
@@ -79,6 +80,7 @@
./programs/environment.nix
./programs/fish.nix
./programs/freetds.nix
+ ./programs/gnupg.nix
./programs/gphoto2.nix
./programs/info.nix
./programs/java.nix
@@ -129,6 +131,8 @@
./security/rtkit.nix
./security/wrappers/default.nix
./security/sudo.nix
+ ./service-managers/docker.nix
+ ./service-managers/trivial.nix
./services/admin/salt/master.nix
./services/admin/salt/minion.nix
./services/amqp/activemq/default.nix
@@ -239,8 +243,9 @@
./services/logging/logrotate.nix
./services/logging/logstash.nix
./services/logging/rsyslogd.nix
- ./services/logging/syslogd.nix
+ ./services/logging/SystemdJournal2Gelf.nix
./services/logging/syslog-ng.nix
+ ./services/logging/syslogd.nix
./services/mail/dovecot.nix
./services/mail/dspam.nix
./services/mail/exim.nix
diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix
index 6c0d5d8b604..ba356a8ad2d 100644
--- a/nixos/modules/programs/environment.nix
+++ b/nixos/modules/programs/environment.nix
@@ -20,7 +20,7 @@ in
{ NIXPKGS_CONFIG = "/etc/nix/nixpkgs-config.nix";
PAGER = mkDefault "less -R";
EDITOR = mkDefault "nano";
- XCURSOR_PATH = "$HOME/.icons";
+ XCURSOR_PATH = [ "$HOME/.icons" ];
};
environment.profiles =
diff --git a/nixos/modules/programs/gnupg.nix b/nixos/modules/programs/gnupg.nix
new file mode 100644
index 00000000000..c5277f40d26
--- /dev/null
+++ b/nixos/modules/programs/gnupg.nix
@@ -0,0 +1,75 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+ cfg = config.programs.gnupg;
+
+in
+
+{
+
+ options.programs.gnupg = {
+ agent.enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Enables GnuPG agent with socket-activation for every user session.
+ '';
+ };
+
+ agent.enableSSHSupport = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ Enable SSH agent support in GnuPG agent. Also sets SSH_AUTH_SOCK
+ environment variable correctly. This will disable socket-activation
+ and thus always start a GnuPG agent per user session.
+ '';
+ };
+ };
+
+ config = mkIf cfg.agent.enable {
+ systemd.user.services.gpg-agent = {
+ serviceConfig = {
+ ExecStart = [
+ ""
+ ("${pkgs.gnupg}/bin/gpg-agent --supervised "
+ + optionalString cfg.agent.enableSSHSupport "--enable-ssh-support")
+ ];
+ };
+ };
+
+ systemd.user.sockets.gpg-agent = {
+ wantedBy = [ "sockets.target" ];
+ };
+
+ systemd.user.sockets.gpg-agent-ssh = mkIf cfg.agent.enableSSHSupport {
+ wantedBy = [ "sockets.target" ];
+ };
+
+ systemd.packages = [ pkgs.gnupg ];
+
+ environment.extraInit = ''
+ # Bind gpg-agent to this TTY if gpg commands are used.
+ export GPG_TTY=$(tty)
+
+ '' + (optionalString cfg.agent.enableSSHSupport ''
+ # SSH agent protocol doesn't support changing TTYs, so bind the agent
+ # to every new TTY.
+ ${pkgs.gnupg}/bin/gpg-connect-agent --quiet updatestartuptty /bye > /dev/null
+
+ if [ -z "$SSH_AUTH_SOCK" ]; then
+ export SSH_AUTH_SOCK=$(${pkgs.gnupg}/bin/gpgconf --list-dirs agent-ssh-socket)
+ fi
+ '');
+
+ assertions = [
+ { assertion = cfg.agent.enableSSHSupport && !config.programs.ssh.startAgent;
+ message = "You can't use ssh-agent and GnuPG agent with SSH support enabled at the same time!";
+ }
+ ];
+ };
+
+}
diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix
index a00fc0dfd19..4faef2c609b 100644
--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@@ -199,9 +199,8 @@ in
environment.etc."ssh/ssh_known_hosts".text = knownHostsText;
# FIXME: this should really be socket-activated for über-awesomeness.
- systemd.user.services.ssh-agent =
- { enable = cfg.startAgent;
- description = "SSH Agent";
+ systemd.user.services.ssh-agent = mkIf cfg.startAgent
+ { description = "SSH Agent";
wantedBy = [ "default.target" ];
serviceConfig =
{ ExecStartPre = "${pkgs.coreutils}/bin/rm -f %t/ssh-agent";
diff --git a/nixos/modules/programs/zsh/oh-my-zsh.nix b/nixos/modules/programs/zsh/oh-my-zsh.nix
index 335f596ca80..446c05da39d 100644
--- a/nixos/modules/programs/zsh/oh-my-zsh.nix
+++ b/nixos/modules/programs/zsh/oh-my-zsh.nix
@@ -3,11 +3,11 @@
with lib;
let
- cfg = config.programs.zsh.oh-my-zsh;
+ cfg = config.programs.zsh.ohMyZsh;
in
{
options = {
- programs.zsh.oh-my-zsh = {
+ programs.zsh.ohMyZsh = {
enable = mkOption {
default = false;
description = ''
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 3b64feeaa90..c3fb5758ede 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -210,5 +210,9 @@ with lib;
(mkRenamedOptionModule [ "programs" "zsh" "syntax-highlighting" "enable" ] [ "programs" "zsh" "syntaxHighlighting" "enable" ])
(mkRenamedOptionModule [ "programs" "zsh" "syntax-highlighting" "highlighters" ] [ "programs" "zsh" "syntaxHighlighting" "highlighters" ])
(mkRenamedOptionModule [ "programs" "zsh" "syntax-highlighting" "patterns" ] [ "programs" "zsh" "syntaxHighlighting" "patterns" ])
+ (mkRenamedOptionModule [ "programs" "zsh" "oh-my-zsh" "enable" ] [ "programs" "zsh" "ohMyZsh" "enable" ])
+ (mkRenamedOptionModule [ "programs" "zsh" "oh-my-zsh" "theme" ] [ "programs" "zsh" "ohMyZsh" "theme" ])
+ (mkRenamedOptionModule [ "programs" "zsh" "oh-my-zsh" "custom" ] [ "programs" "zsh" "ohMyZsh" "custom" ])
+ (mkRenamedOptionModule [ "programs" "zsh" "oh-my-zsh" "plugins" ] [ "programs" "zsh" "ohMyZsh" "plugins" ])
];
}
diff --git a/nixos/modules/service-managers/docker.nix b/nixos/modules/service-managers/docker.nix
new file mode 100644
index 00000000000..8e9c763b18a
--- /dev/null
+++ b/nixos/modules/service-managers/docker.nix
@@ -0,0 +1,29 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.docker-containers;
+
+ containerModule = {
+ script = mkOption {
+ type = types.lines;
+ description = "Shell commands executed as the service's main process.";
+ };
+ };
+
+ toContainer = name: value: pkgs.dockerTools.buildImage {
+ inherit name;
+ config = {
+ Cmd = [ value.script ];
+ };
+ };
+in {
+ options.docker-containers = mkOption {
+ default = {};
+ type = with types; attrsOf (types.submodule containerModule);
+ description = "Definition of docker containers";
+ };
+
+ config.system.build.toplevel-docker = lib.mapAttrs toContainer cfg;
+}
diff --git a/nixos/modules/service-managers/trivial.nix b/nixos/modules/service-managers/trivial.nix
new file mode 100644
index 00000000000..77e615d1e2e
--- /dev/null
+++ b/nixos/modules/service-managers/trivial.nix
@@ -0,0 +1,35 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.trivial-services;
+
+ serviceModule.options = {
+ script = mkOption {
+ type = types.lines;
+ description = "Shell commands executed as the service's main process.";
+ };
+
+ environment = mkOption {
+ default = {};
+ type = types.attrs; # FIXME
+ example = { PATH = "/foo/bar/bin"; LANG = "nl_NL.UTF-8"; };
+ description = "Environment variables passed to the service's processes.";
+ };
+ };
+
+ launcher = name: value: pkgs.writeScript name ''
+ #!${pkgs.stdenv.shell} -eu
+
+ ${pkgs.writeScript "${name}-entry" value.script}
+ '';
+in {
+ options.trivial-services = mkOption {
+ default = {};
+ type = with types; attrsOf (types.submodule serviceModule);
+ description = "Definition of trivial services";
+ };
+
+ config.system.build.toplevel-trivial = lib.mapAttrs launcher cfg;
+}
diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix
index fcf1f123cfb..bae6b170c47 100644
--- a/nixos/modules/services/databases/mysql.nix
+++ b/nixos/modules/services/databases/mysql.nix
@@ -72,7 +72,7 @@ in
dataDir = mkOption {
type = types.path;
- default = "/var/mysql"; # !!! should be /var/db/mysql
+ example = "/var/lib/mysql";
description = "Location where MySQL stores its table files";
};
@@ -166,6 +166,10 @@ in
config = mkIf config.services.mysql.enable {
+ services.mysql.dataDir =
+ mkDefault (if versionAtLeast config.system.stateVersion "17.09" then "/var/lib/mysql"
+ else "/var/mysql");
+
users.extraUsers.mysql = {
description = "MySQL server user";
group = "mysql";
diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index 24ef4637ec9..d06e03a5297 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/logging/SystemdJournal2Gelf.nix b/nixos/modules/services/logging/SystemdJournal2Gelf.nix
new file mode 100644
index 00000000000..e90d9e7a12b
--- /dev/null
+++ b/nixos/modules/services/logging/SystemdJournal2Gelf.nix
@@ -0,0 +1,59 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let cfg = config.services.SystemdJournal2Gelf;
+in
+
+{ options = {
+ services.SystemdJournal2Gelf = {
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether to enable SystemdJournal2Gelf.
+ '';
+ };
+
+ graylogServer = mkOption {
+ type = types.string;
+ example = "graylog2.example.com:11201";
+ description = ''
+ Host and port of your graylog2 input. This should be a GELF
+ UDP input.
+ '';
+ };
+
+ extraOptions = mkOption {
+ type = types.string;
+ default = "";
+ description = ''
+ Any extra flags to pass to SystemdJournal2Gelf. Note that
+ these are basically journalctl flags.
+ '';
+ };
+
+ package = mkOption {
+ type = types.package;
+ default = pkgs.systemd-journal2gelf;
+ description = ''
+ SystemdJournal2Gelf package to use.
+ '';
+ };
+
+ };
+ };
+
+ config = mkIf cfg.enable {
+ systemd.services.SystemdJournal2Gelf = {
+ description = "SystemdJournal2Gelf";
+ after = [ "network.target" ];
+ wantedBy = [ "multi-user.target" ];
+ serviceConfig = {
+ ExecStart = "${cfg.package}/bin/SystemdJournal2Gelf ${cfg.graylogServer} --follow ${cfg.extraOptions}";
+ Restart = "on-failure";
+ RestartSec = "30";
+ };
+ };
+ };
+}
\ No newline at end of file
diff --git a/nixos/modules/services/mail/mlmmj.nix b/nixos/modules/services/mail/mlmmj.nix
index 4a01745eb8b..b6439b44fb5 100644
--- a/nixos/modules/services/mail/mlmmj.nix
+++ b/nixos/modules/services/mail/mlmmj.nix
@@ -4,6 +4,8 @@ with lib;
let
+ concatMapLines = f: l: lib.concatStringsSep "\n" (map f l);
+
cfg = config.services.mlmmj;
stateDir = "/var/lib/mlmmj";
spoolDir = "/var/spool/mlmmj";
@@ -16,13 +18,24 @@ let
listAddress = domain: list: "${list}@${domain}";
customHeaders = domain: list: [ "List-Id: ${list}" "Reply-To: ${list}@${domain}" ];
footer = domain: list: "To unsubscribe send a mail to ${list}+unsubscribe@${domain}";
- createList = d: l: ''
- ${pkgs.coreutils}/bin/mkdir -p ${listCtl d l}
- echo ${listAddress d l} > ${listCtl d l}/listaddress
- echo "${lib.concatStringsSep "\n" (customHeaders d l)}" > ${listCtl d l}/customheaders
- echo ${footer d l} > ${listCtl d l}/footer
- echo ${subjectPrefix l} > ${listCtl d l}/prefix
- '';
+ createList = d: l:
+ let ctlDir = listCtl d l; in
+ ''
+ for DIR in incoming queue queue/discarded archive text subconf unsubconf \
+ bounce control moderation subscribers.d digesters.d requeue \
+ nomailsubs.d
+ do
+ mkdir -p '${listDir d l}'/"$DIR"
+ done
+ ${pkgs.coreutils}/bin/mkdir -p ${ctlDir}
+ echo ${listAddress d l} > '${ctlDir}/listaddress'
+ [ ! -e ${ctlDir}/customheaders ] && \
+ echo "${lib.concatStringsSep "\n" (customHeaders d l)}" > '${ctlDir}/customheaders'
+ [ ! -e ${ctlDir}/footer ] && \
+ echo ${footer d l} > '${ctlDir}/footer'
+ [ ! -e ${ctlDir}/prefix ] && \
+ echo ${subjectPrefix l} > '${ctlDir}/prefix'
+ '';
in
{
@@ -63,6 +76,16 @@ in
description = "The collection of hosted maillists";
};
+ maintInterval = mkOption {
+ type = types.str;
+ default = "20min";
+ description = ''
+ Time interval between mlmmj-maintd runs, see
+ systemd.time
+ 7 for format information.
+ '';
+ };
+
};
};
@@ -93,7 +116,7 @@ in
mlmmj unix - n n - - pipe flags=ORhu user=mlmmj argv=${pkgs.mlmmj}/bin/mlmmj-receive -F -L ${spoolDir}/$nexthop
'';
- extraAliases = concatMapStrings (alias cfg.listDomain) cfg.mailLists;
+ extraAliases = concatMapLines (alias cfg.listDomain) cfg.mailLists;
extraConfig = ''
transport_maps = hash:${stateDir}/transports
@@ -107,17 +130,15 @@ in
system.activationScripts.mlmmj = ''
${pkgs.coreutils}/bin/mkdir -p ${stateDir} ${spoolDir}/${cfg.listDomain}
${pkgs.coreutils}/bin/chown -R ${cfg.user}:${cfg.group} ${spoolDir}
- ${lib.concatMapStrings (createList cfg.listDomain) cfg.mailLists}
- echo ${lib.concatMapStrings (virtual cfg.listDomain) cfg.mailLists} > ${stateDir}/virtuals
- echo ${lib.concatMapStrings (transport cfg.listDomain) cfg.mailLists} > ${stateDir}/transports
+ ${concatMapLines (createList cfg.listDomain) cfg.mailLists}
+ echo "${concatMapLines (virtual cfg.listDomain) cfg.mailLists}" > ${stateDir}/virtuals
+ echo "${concatMapLines (transport cfg.listDomain) cfg.mailLists}" > ${stateDir}/transports
${pkgs.postfix}/bin/postmap ${stateDir}/virtuals
${pkgs.postfix}/bin/postmap ${stateDir}/transports
'';
systemd.services."mlmmj-maintd" = {
description = "mlmmj maintenance daemon";
- wantedBy = [ "multi-user.target" ];
-
serviceConfig = {
User = cfg.user;
Group = cfg.group;
@@ -125,6 +146,11 @@ in
};
};
+ systemd.timers."mlmmj-maintd" = {
+ description = "mlmmj maintenance timer";
+ timerConfig.OnUnitActiveSec = cfg.maintInterval;
+ wantedBy = [ "timers.target" ];
+ };
};
}
diff --git a/nixos/modules/services/monitoring/arbtt.nix b/nixos/modules/services/monitoring/arbtt.nix
index a8d5e3b7fa0..b41a3c7b501 100644
--- a/nixos/modules/services/monitoring/arbtt.nix
+++ b/nixos/modules/services/monitoring/arbtt.nix
@@ -48,7 +48,8 @@ in {
config = mkIf cfg.enable {
systemd.user.services.arbtt = {
description = "arbtt statistics capture service";
- wantedBy = [ "default.target" ];
+ wantedBy = [ "graphical-session.target" ];
+ partOf = [ "graphical-session.target" ];
serviceConfig = {
Type = "simple";
diff --git a/nixos/modules/services/monitoring/dd-agent/dd-agent-defaults.nix b/nixos/modules/services/monitoring/dd-agent/dd-agent-defaults.nix
deleted file mode 100644
index 04512819742..00000000000
--- a/nixos/modules/services/monitoring/dd-agent/dd-agent-defaults.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-# Generated using update-dd-agent-default, please re-run after updating dd-agent. DO NOT EDIT MANUALLY.
-[
- "auto_conf"
- "agent_metrics.yaml.default"
- "disk.yaml.default"
- "network.yaml.default"
- "ntp.yaml.default"
-]
diff --git a/nixos/modules/services/monitoring/dd-agent/dd-agent.nix b/nixos/modules/services/monitoring/dd-agent/dd-agent.nix
index 8d3d4f2065e..04a21871519 100644
--- a/nixos/modules/services/monitoring/dd-agent/dd-agent.nix
+++ b/nixos/modules/services/monitoring/dd-agent/dd-agent.nix
@@ -16,100 +16,24 @@ let
forwarder_log_file: /var/log/datadog/forwarder.log
dogstatsd_log_file: /var/log/datadog/dogstatsd.log
pup_log_file: /var/log/datadog/pup.log
-
- # proxy_host: my-proxy.com
- # proxy_port: 3128
- # proxy_user: user
- # proxy_password: password
-
- # tags: mytag0, mytag1
${optionalString (cfg.tags != null ) "tags: ${concatStringsSep "," cfg.tags }"}
-
- # collect_ec2_tags: no
- # recent_point_threshold: 30
- # use_mount: no
- # listen_port: 17123
- # graphite_listen_port: 17124
- # non_local_traffic: no
- # use_curl_http_client: False
- # bind_host: localhost
-
- # use_pup: no
- # pup_port: 17125
- # pup_interface: localhost
- # pup_url: http://localhost:17125
-
- # dogstatsd_port : 8125
- # dogstatsd_interval : 10
- # dogstatsd_normalize : yes
- # statsd_forward_host: address_of_own_statsd_server
- # statsd_forward_port: 8125
-
- # device_blacklist_re: .*\/dev\/mapper\/lxc-box.*
-
- # ganglia_host: localhost
- # ganglia_port: 8651
+ ${cfg.extraDdConfig}
'';
- diskConfig = pkgs.writeText "disk.yaml" ''
- init_config:
-
- instances:
- - use_mount: no
- '';
-
- networkConfig = pkgs.writeText "network.yaml" ''
- init_config:
-
- instances:
- # Network check only supports one configured instance
- - collect_connection_state: false
- excluded_interfaces:
- - lo
- - lo0
- '';
-
- postgresqlConfig = pkgs.writeText "postgres.yaml" cfg.postgresqlConfig;
- nginxConfig = pkgs.writeText "nginx.yaml" cfg.nginxConfig;
- mongoConfig = pkgs.writeText "mongo.yaml" cfg.mongoConfig;
- jmxConfig = pkgs.writeText "jmx.yaml" cfg.jmxConfig;
- processConfig = pkgs.writeText "process.yaml" cfg.processConfig;
-
etcfiles =
- let
- defaultConfd = import ./dd-agent-defaults.nix;
- in (map (f: { source = "${pkgs.dd-agent}/agent/conf.d-system/${f}";
- target = "dd-agent/conf.d/${f}";
- }) defaultConfd) ++ [
- { source = ddConf;
- target = "dd-agent/datadog.conf";
- }
- { source = diskConfig;
- target = "dd-agent/conf.d/disk.yaml";
- }
- { source = networkConfig;
- target = "dd-agent/conf.d/network.yaml";
- } ] ++
- (optional (cfg.postgresqlConfig != null)
- { source = postgresqlConfig;
- target = "dd-agent/conf.d/postgres.yaml";
- }) ++
- (optional (cfg.nginxConfig != null)
- { source = nginxConfig;
- target = "dd-agent/conf.d/nginx.yaml";
- }) ++
- (optional (cfg.mongoConfig != null)
- { source = mongoConfig;
- target = "dd-agent/conf.d/mongo.yaml";
- }) ++
- (optional (cfg.processConfig != null)
- { source = processConfig;
- target = "dd-agent/conf.d/process.yaml";
- }) ++
- (optional (cfg.jmxConfig != null)
- { source = jmxConfig;
- target = "dd-agent/conf.d/jmx.yaml";
- });
+ map (i: { source = if builtins.hasAttr "config" i
+ then pkgs.writeText "${i.name}.yaml" i.config
+ else "${cfg.agent}/agent/conf.d-system/${i.name}.yaml";
+ target = "dd-agent/conf.d/${i.name}.yaml";
+ }
+ ) cfg.integrations ++
+ [ { source = ddConf;
+ target = "dd-agent/datadog.conf";
+ }
+ ];
+
+ # restart triggers
+ etcSources = map (i: i.source) etcfiles;
in {
options.services.dd-agent = {
@@ -139,44 +63,46 @@ in {
type = types.uniq (types.nullOr types.string);
};
- postgresqlConfig = mkOption {
- description = "Datadog PostgreSQL integration configuration";
- default = null;
- type = types.uniq (types.nullOr types.string);
+ agent = mkOption {
+ description = "The dd-agent package to use. Useful when overriding the package.";
+ default = pkgs.dd-agent;
+ type = types.package;
};
- nginxConfig = mkOption {
- description = "Datadog nginx integration configuration";
- default = null;
- type = types.uniq (types.nullOr types.string);
- };
-
- mongoConfig = mkOption {
- description = "MongoDB integration configuration";
- default = null;
- type = types.uniq (types.nullOr types.string);
- };
-
- jmxConfig = mkOption {
- description = "JMX integration configuration";
- default = null;
- type = types.uniq (types.nullOr types.string);
- };
-
- processConfig = mkOption {
+ integrations = mkOption {
description = ''
- Process integration configuration
-
- See http://docs.datadoghq.com/integrations/process/
+ Any integrations to use. Default config used if none
+ specified. It is currently up to the user to make sure that
+ the dd-agent package used has all the dependencies chosen
+ integrations require in scope.
+ '';
+ type = types.listOf (types.attrsOf types.string);
+ default = [];
+ example = ''
+ [ { name = "elastic";
+ config = '''
+ init_config:
+
+ instances:
+ - url: http://localhost:9200
+ ''';
+ }
+ { name = "nginx"; }
+ { name = "ntp"; }
+ { name = "network"; }
+ ]
'';
- default = null;
- type = types.uniq (types.nullOr types.string);
};
+ extraDdConfig = mkOption {
+ description = "Extra settings to append to datadog agent config.";
+ default = "";
+ type = types.string;
+ };
};
config = mkIf cfg.enable {
- environment.systemPackages = [ pkgs."dd-agent" pkgs.sysstat pkgs.procps ];
+ environment.systemPackages = [ cfg.agent pkgs.sysstat pkgs.procps ];
users.extraUsers.datadog = {
description = "Datadog Agent User";
@@ -190,46 +116,30 @@ in {
systemd.services.dd-agent = {
description = "Datadog agent monitor";
- path = [ pkgs."dd-agent" pkgs.python pkgs.sysstat pkgs.procps ];
+ path = [ cfg.agent pkgs.python pkgs.sysstat pkgs.procps ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
- ExecStart = "${pkgs.dd-agent}/bin/dd-agent foreground";
+ ExecStart = "${cfg.agent}/bin/dd-agent foreground";
User = "datadog";
Group = "datadog";
Restart = "always";
RestartSec = 2;
};
- restartTriggers = [ pkgs.dd-agent ddConf diskConfig networkConfig postgresqlConfig nginxConfig mongoConfig jmxConfig processConfig ];
+ restartTriggers = [ cfg.agent ddConf ] ++ etcSources;
};
- systemd.services.dogstatsd = {
- description = "Datadog statsd";
- path = [ pkgs."dd-agent" pkgs.python pkgs.procps ];
- wantedBy = [ "multi-user.target" ];
- serviceConfig = {
- ExecStart = "${pkgs.dd-agent}/bin/dogstatsd start";
- User = "datadog";
- Group = "datadog";
- Type = "forking";
- PIDFile = "/tmp/dogstatsd.pid";
- Restart = "always";
- RestartSec = 2;
- };
- restartTriggers = [ pkgs.dd-agent ddConf diskConfig networkConfig postgresqlConfig nginxConfig mongoConfig jmxConfig processConfig ];
- };
-
- systemd.services.dd-jmxfetch = lib.mkIf (cfg.jmxConfig != null) {
+ systemd.services.dd-jmxfetch = lib.mkIf (builtins.any (i: i.name == "jmx") cfg.integrations) {
description = "Datadog JMX Fetcher";
- path = [ pkgs."dd-agent" pkgs.python pkgs.sysstat pkgs.procps pkgs.jdk ];
+ path = [ cfg.agent pkgs.python pkgs.sysstat pkgs.procps pkgs.jdk ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
- ExecStart = "${pkgs.dd-agent}/bin/dd-jmxfetch";
+ ExecStart = "${cfg.agent}/bin/dd-jmxfetch";
User = "datadog";
Group = "datadog";
Restart = "always";
RestartSec = 2;
};
- restartTriggers = [ pkgs.dd-agent ddConf diskConfig networkConfig postgresqlConfig nginxConfig mongoConfig jmxConfig ];
+ restartTriggers = [ cfg.agent ddConf ] ++ etcSources;
};
environment.etc = etcfiles;
diff --git a/nixos/modules/services/monitoring/dd-agent/update-dd-agent-defaults b/nixos/modules/services/monitoring/dd-agent/update-dd-agent-defaults
deleted file mode 100755
index 76724173171..00000000000
--- a/nixos/modules/services/monitoring/dd-agent/update-dd-agent-defaults
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-dd=$(nix-build --no-out-link -A dd-agent ../../../..)
-echo '# Generated using update-dd-agent-default, please re-run after updating dd-agent. DO NOT EDIT MANUALLY.' > dd-agent-defaults.nix
-echo '[' >> dd-agent-defaults.nix
-echo ' "auto_conf"' >> dd-agent-defaults.nix
-for f in $(find $dd/agent/conf.d-system -maxdepth 1 -type f | grep -v '\.example' | sort); do
- echo " \"$(basename $f)\"" >> dd-agent-defaults.nix
-done
-echo ']' >> dd-agent-defaults.nix
diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix
index 6b24ac2c7c6..332a04634d0 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/network-filesystems/glusterfs.nix b/nixos/modules/services/network-filesystems/glusterfs.nix
index a2f2c033951..f7fed793066 100644
--- a/nixos/modules/services/network-filesystems/glusterfs.nix
+++ b/nixos/modules/services/network-filesystems/glusterfs.nix
@@ -3,7 +3,7 @@
with lib;
let
- inherit (pkgs) glusterfs;
+ inherit (pkgs) glusterfs rsync;
cfg = config.services.glusterfs;
@@ -50,8 +50,11 @@ in
after = [ "rpcbind.service" "network.target" "local-fs.target" ];
before = [ "network-online.target" ];
+ # The copying of hooks is due to upstream bug https://bugzilla.redhat.com/show_bug.cgi?id=1452761
preStart = ''
install -m 0755 -d /var/log/glusterfs
+ mkdir -p /var/lib/glusterd/hooks/
+ ${rsync}/bin/rsync -a ${glusterfs}/var/lib/glusterd/hooks/ /var/lib/glusterd/hooks/
'';
serviceConfig = {
diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix
index bd46147c6bc..10c1d751ac5 100644
--- a/nixos/modules/services/network-filesystems/ipfs.nix
+++ b/nixos/modules/services/network-filesystems/ipfs.nix
@@ -9,7 +9,10 @@ let
ipfsFlags = ''${if cfg.autoMigrate then "--migrate" else ""} ${if cfg.enableGC then "--enable-gc" else ""} ${toString cfg.extraFlags}'';
- pathEnv = { IPFS_PATH = cfg.dataDir; };
+ # Before Version 17.09, ipfs would always use "/var/lib/ipfs/.ipfs" as it's dataDir
+ defaultDataDir = if versionAtLeast config.system.stateVersion "17.09" then
+ "/var/lib/ipfs" else
+ "/var/lib/ipfs/.ipfs";
# Wrapping the ipfs binary with the environment variable IPFS_PATH set to dataDir because we can't set it in the user environment
wrapped = runCommand "ipfs" { buildInputs = [ makeWrapper ]; } ''
@@ -42,7 +45,7 @@ in
dataDir = mkOption {
type = types.str;
- default = "/var/lib/ipfs";
+ default = defaultDataDir;
description = "The data dir for IPFS";
};
@@ -117,16 +120,15 @@ in
after = [ "local-fs.target" ];
before = [ "ipfs.service" "ipfs-offline.service" ];
+ environment.IPFS_PATH = cfg.dataDir;
+
path = [ pkgs.ipfs pkgs.su pkgs.bash ];
preStart = ''
install -m 0755 -o ${cfg.user} -g ${cfg.group} -d ${cfg.dataDir}
'';
-
- environment = pathEnv;
-
script = ''
- if [[ ! -d ${cfg.dataDir}/.ipfs ]]; then
+ if [[ ! -f ${cfg.dataDir}/config ]]; then
${ipfs}/bin/ipfs init ${optionalString cfg.emptyRepo "-e"}
fi
${ipfs}/bin/ipfs --local config Addresses.API ${cfg.apiAddress}
@@ -151,9 +153,9 @@ in
conflicts = [ "ipfs-offline.service" ];
wants = [ "ipfs-init.service" ];
- path = [ pkgs.ipfs ];
+ environment.IPFS_PATH = cfg.dataDir;
- environment = pathEnv;
+ path = [ pkgs.ipfs ];
serviceConfig = {
ExecStart = "${ipfs}/bin/ipfs daemon ${ipfsFlags}";
@@ -172,9 +174,9 @@ in
conflicts = [ "ipfs.service" ];
wants = [ "ipfs-init.service" ];
- path = [ pkgs.ipfs ];
+ environment.IPFS_PATH = cfg.dataDir;
- environment = pathEnv;
+ path = [ pkgs.ipfs ];
serviceConfig = {
ExecStart = "${ipfs}/bin/ipfs daemon ${ipfsFlags} --offline";
diff --git a/nixos/modules/services/network-filesystems/u9fs.nix b/nixos/modules/services/network-filesystems/u9fs.nix
index 8bc37f0f62c..4f37fc2a9e5 100644
--- a/nixos/modules/services/network-filesystems/u9fs.nix
+++ b/nixos/modules/services/network-filesystems/u9fs.nix
@@ -67,6 +67,7 @@ in
StandardInput = "socket";
StandardError = "journal";
User = cfg.user;
+ AmbientCapabilities = "cap_setuid cap_setgid";
};
};
};
diff --git a/nixos/modules/services/networking/charybdis.nix b/nixos/modules/services/networking/charybdis.nix
index 2f7d006b881..c354ec61fe2 100644
--- a/nixos/modules/services/networking/charybdis.nix
+++ b/nixos/modules/services/networking/charybdis.nix
@@ -51,6 +51,17 @@ in
'';
};
+ motd = mkOption {
+ type = types.nullOr types.lines;
+ default = null;
+ description = ''
+ Charybdis MOTD text.
+
+ Charybdis will read its MOTD from /etc/charybdis/ircd.motd .
+ If set, the value of this option will be written to this path.
+ '';
+ };
+
};
};
@@ -58,39 +69,42 @@ in
###### implementation
- config = mkIf cfg.enable {
-
- users.extraUsers = singleton {
- name = cfg.user;
- description = "Charybdis IRC daemon user";
- uid = config.ids.uids.ircd;
- group = cfg.group;
- };
-
- users.extraGroups = singleton {
- name = cfg.group;
- gid = config.ids.gids.ircd;
- };
-
- systemd.services.charybdis = {
- description = "Charybdis IRC daemon";
- wantedBy = [ "multi-user.target" ];
- environment = {
- BANDB_DBPATH = "${cfg.statedir}/ban.db";
+ config = mkIf cfg.enable (lib.mkMerge [
+ {
+ users.extraUsers = singleton {
+ name = cfg.user;
+ description = "Charybdis IRC daemon user";
+ uid = config.ids.uids.ircd;
+ group = cfg.group;
};
- serviceConfig = {
- ExecStart = "${charybdis}/bin/charybdis-ircd -foreground -logfile /dev/stdout -configfile ${configFile}";
- Group = cfg.group;
- User = cfg.user;
- PermissionsStartOnly = true; # preStart needs to run with root permissions
+
+ users.extraGroups = singleton {
+ name = cfg.group;
+ gid = config.ids.gids.ircd;
};
- preStart = ''
- ${coreutils}/bin/mkdir -p ${cfg.statedir}
- ${coreutils}/bin/chown ${cfg.user}:${cfg.group} ${cfg.statedir}
- '';
- };
-
- };
+ systemd.services.charybdis = {
+ description = "Charybdis IRC daemon";
+ wantedBy = [ "multi-user.target" ];
+ environment = {
+ BANDB_DBPATH = "${cfg.statedir}/ban.db";
+ };
+ serviceConfig = {
+ ExecStart = "${charybdis}/bin/charybdis-ircd -foreground -logfile /dev/stdout -configfile ${configFile}";
+ Group = cfg.group;
+ User = cfg.user;
+ PermissionsStartOnly = true; # preStart needs to run with root permissions
+ };
+ preStart = ''
+ ${coreutils}/bin/mkdir -p ${cfg.statedir}
+ ${coreutils}/bin/chown ${cfg.user}:${cfg.group} ${cfg.statedir}
+ '';
+ };
+ }
+
+ (mkIf (cfg.motd != null) {
+ environment.etc."charybdis/ircd.motd".text = cfg.motd;
+ })
+ ]);
}
diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix
index 243cd04c96c..68a814b2305 100644
--- a/nixos/modules/services/networking/firewall.nix
+++ b/nixos/modules/services/networking/firewall.nix
@@ -114,14 +114,15 @@ let
# The "nixos-fw" chain does the actual work.
ip46tables -N nixos-fw
- # Perform a reverse-path test to refuse spoofers
- # For now, we just drop, as the raw table doesn't have a log-refuse yet
- ${optionalString (kernelHasRPFilter && (cfg.checkReversePath != false)) ''
- # Clean up rpfilter rules
- ip46tables -t raw -D PREROUTING -j nixos-fw-rpfilter 2> /dev/null || true
- ip46tables -t raw -F nixos-fw-rpfilter 2> /dev/null || true
- ip46tables -t raw -N nixos-fw-rpfilter 2> /dev/null || true
+ # Clean up rpfilter rules
+ ip46tables -t raw -D PREROUTING -j nixos-fw-rpfilter 2> /dev/null || true
+ ip46tables -t raw -F nixos-fw-rpfilter 2> /dev/null || true
+ ip46tables -t raw -X nixos-fw-rpfilter 2> /dev/null || true
+ ${optionalString (kernelHasRPFilter && (cfg.checkReversePath != false)) ''
+ # Perform a reverse-path test to refuse spoofers
+ # For now, we just drop, as the raw table doesn't have a log-refuse yet
+ ip46tables -t raw -N nixos-fw-rpfilter 2> /dev/null || true
ip46tables -t raw -A nixos-fw-rpfilter -m rpfilter ${optionalString (cfg.checkReversePath == "loose") "--loose"} -j RETURN
# Allows this host to act as a DHCPv4 server
diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix
index 4e176353fc2..7622f030f83 100644
--- a/nixos/modules/services/networking/i2pd.nix
+++ b/nixos/modules/services/networking/i2pd.nix
@@ -212,7 +212,8 @@ in
type = with types; nullOr int;
default = null;
description = ''
- Set a router bandwidth limit integer in kbps or letters: L (32), O (256), P (2048), X (>9000)
+ Set a router bandwidth limit integer in KBps.
+ If not set, i2pd defaults to 32KBps.
'';
};
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index 876dbe1524e..f8b7f26f5f2 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -12,6 +12,7 @@ let
configFile = writeText "NetworkManager.conf" ''
[main]
plugins=keyfile
+ dhcp=${cfg.dhcp}
dns=${if cfg.useDnsmasq then "dnsmasq" else "default"}
[keyfile]
@@ -21,7 +22,7 @@ let
''unmanaged-devices=${lib.concatStringsSep ";" cfg.unmanaged}''}
[logging]
- level=WARN
+ level=${cfg.logLevel}
[connection]
ipv6.ip6-privacy=2
@@ -138,6 +139,22 @@ in {
apply = list: (attrValues cfg.basePackages) ++ list;
};
+ dhcp = mkOption {
+ type = types.enum [ "dhclient" "dhcpcd" "internal" ];
+ default = "dhclient";
+ description = ''
+ Which program (or internal library) should be used for DHCP.
+ '';
+ };
+
+ logLevel = mkOption {
+ type = types.enum [ "OFF" "ERR" "WARN" "INFO" "DEBUG" "TRACE" ];
+ default = "WARN";
+ description = ''
+ Set the default logging verbosity level.
+ '';
+ };
+
appendNameservers = mkOption {
type = types.listOf types.str;
default = [];
@@ -181,7 +198,7 @@ in {
};
type = mkOption {
- type = types.enum (attrNames dispatcherTypesSubdirMap);
+ type = types.enum (attrNames dispatcherTypesSubdirMap);
default = "basic";
description = ''
Dispatcher hook type. Only basic hooks are currently available.
diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix
index 6cb40185274..79a0aa953fe 100644
--- a/nixos/modules/services/networking/tinc.nix
+++ b/nixos/modules/services/networking/tinc.nix
@@ -35,7 +35,8 @@ in
description = ''
The name of the node which is used as an identifier when communicating
with the remote nodes in the mesh. If null then the hostname of the system
- is used.
+ is used to derive a name (note that tinc may replace non-alphanumeric characters in
+ hostnames by underscores).
'';
};
diff --git a/nixos/modules/services/networking/znc.nix b/nixos/modules/services/networking/znc.nix
index abd02012bc9..2b9867ade10 100644
--- a/nixos/modules/services/networking/znc.nix
+++ b/nixos/modules/services/networking/znc.nix
@@ -53,7 +53,8 @@ let
Server = ${net.server} ${lib.optionalString net.useSSL "+"}${toString net.port} ${net.password}
${concatMapStrings (c: "\n\n") net.channels}
${lib.optionalString net.hasBitlbeeControlChannel ''
-
+
+
''}
${net.extraConf}
@@ -279,7 +280,7 @@ in
example = defaultPassBlock;
type = types.string;
description = ''
- Generate with znc --makepass.
+ Generate with `nix-shell -p znc --command "znc --makepass"`.
This is the password used to log in to the ZNC web admin interface.
'';
};
diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix
index 574f74d547a..c76c86b0cad 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/nixos/modules/services/security/hologram-server.nix b/nixos/modules/services/security/hologram-server.nix
index e267fed2795..8315c9ea5d6 100644
--- a/nixos/modules/services/security/hologram-server.nix
+++ b/nixos/modules/services/security/hologram-server.nix
@@ -23,6 +23,8 @@ let
stats = cfg.statsAddress;
listen = cfg.listenAddress;
});
+
+ script = "${pkgs.hologram.bin}/bin/hologram-server --debug --conf ${cfgFile}";
in {
options = {
services.hologram-server = {
@@ -94,9 +96,15 @@ in {
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
- serviceConfig = {
- ExecStart = "${pkgs.hologram.bin}/bin/hologram-server --debug --conf ${cfgFile}";
- };
+ inherit script;
+ };
+
+ docker-containers.hologram-server = {
+ inherit script;
+ };
+
+ trivial-services.hologram-server = {
+ inherit script;
};
};
}
diff --git a/nixos/modules/services/x11/compton.nix b/nixos/modules/services/x11/compton.nix
index d75d24830f8..56bc66b7179 100644
--- a/nixos/modules/services/x11/compton.nix
+++ b/nixos/modules/services/x11/compton.nix
@@ -208,13 +208,13 @@ in {
config = mkIf cfg.enable {
systemd.user.services.compton = {
description = "Compton composite manager";
- wantedBy = [ "default.target" ];
+ wantedBy = [ "graphical-session.target" ];
+ partOf = [ "graphical-session.target" ];
serviceConfig = {
ExecStart = "${cfg.package}/bin/compton --config ${configFile}";
RestartSec = 3;
Restart = "always";
};
- environment.DISPLAY = ":0";
};
environment.systemPackages = [ cfg.package ];
diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix
index d56050c3626..c207aab5de0 100644
--- a/nixos/modules/services/x11/desktop-managers/default.nix
+++ b/nixos/modules/services/x11/desktop-managers/default.nix
@@ -26,6 +26,34 @@ in
services.xserver.desktopManager = {
+ wallpaper = {
+ mode = mkOption {
+ type = types.enum [ "center" "fill" "max" "scale" "tile" ];
+ default = "scale";
+ example = "fill";
+ description = ''
+ The file ~/.background-image is used as a background image.
+ This option specifies the placement of this image onto your desktop.
+
+ Possible values:
+ center: Center the image on the background. If it is too small, it will be surrounded by a black border.
+ fill: Like scale, but preserves aspect ratio by zooming the image until it fits. Either a horizontal or a vertical part of the image will be cut off.
+ max: Like fill, but scale the image to the maximum size that fits the screen with black borders on one side.
+ scale: Fit the file into the background without repeating it, cutting off stuff or using borders. But the aspect ratio is not preserved either.
+ tile: Tile (repeat) the image in case it is too small for the screen.
+ '';
+ };
+
+ combineScreens = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ When set to true the wallpaper will stretch across all screens.
+ When set to false the wallpaper is duplicated to all screens.
+ '';
+ };
+ };
+
session = mkOption {
internal = true;
default = [];
@@ -45,7 +73,7 @@ in
start = d.start
+ optionalString (needBGCond d) ''
if [ -e $HOME/.background-image ]; then
- ${pkgs.feh}/bin/feh --bg-scale $HOME/.background-image
+ ${pkgs.feh}/bin/feh --bg-${cfg.wallpaper.mode} ${optionalString cfg.wallpaper.combineScreens "--no-xinerama"} $HOME/.background-image
else
# Use a solid black background as fallback
${pkgs.xorg.xsetroot}/bin/xsetroot -solid black
diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index cf6efb7dae7..58773685ec1 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -122,6 +122,9 @@ let
source ~/.xprofile
fi
+ # Start systemd user services for graphical sessions
+ ${config.systemd.package}/bin/systemctl --user start graphical-session.target
+
# Allow the user to setup a custom session type.
if test -x ~/.xsession; then
exec ~/.xsession
@@ -164,6 +167,9 @@ let
''}
test -n "$waitPID" && wait "$waitPID"
+
+ ${config.systemd.package}/bin/systemctl --user stop graphical-session.target
+
exit 0
'';
@@ -325,6 +331,13 @@ in
config = {
services.xserver.displayManager.xserverBin = "${xorg.xorgserver.out}/bin/X";
+
+ systemd.user.targets.graphical-session = {
+ unitConfig = {
+ RefuseManualStart = false;
+ StopWhenUnneeded = false;
+ };
+ };
};
imports = [
diff --git a/nixos/modules/services/x11/redshift.nix b/nixos/modules/services/x11/redshift.nix
index eb5dfdf9584..992709ed000 100644
--- a/nixos/modules/services/x11/redshift.nix
+++ b/nixos/modules/services/x11/redshift.nix
@@ -95,7 +95,8 @@ in {
config = mkIf cfg.enable {
systemd.user.services.redshift = {
description = "Redshift colour temperature adjuster";
- wantedBy = [ "default.target" ];
+ wantedBy = [ "graphical-session.target" ];
+ partOf = [ "graphical-session.target" ];
serviceConfig = {
ExecStart = ''
${cfg.package}/bin/redshift \
@@ -107,12 +108,6 @@ in {
RestartSec = 3;
Restart = "always";
};
- environment = {
- DISPLAY = ":${toString (
- let display = config.services.xserver.display;
- in if display != null then display else 0
- )}";
- };
};
};
diff --git a/nixos/modules/services/x11/unclutter-xfixes.nix b/nixos/modules/services/x11/unclutter-xfixes.nix
index b94dfb1a26a..71262431b68 100644
--- a/nixos/modules/services/x11/unclutter-xfixes.nix
+++ b/nixos/modules/services/x11/unclutter-xfixes.nix
@@ -43,7 +43,8 @@ in {
config = mkIf cfg.enable {
systemd.user.services.unclutter-xfixes = {
description = "unclutter-xfixes";
- wantedBy = [ "graphical.target" ];
+ wantedBy = [ "graphical-session.target" ];
+ partOf = [ "graphical-session.target" ];
serviceConfig.ExecStart = ''
${cfg.package}/bin/unclutter \
--timeout ${toString cfg.timeout} \
diff --git a/nixos/modules/services/x11/unclutter.nix b/nixos/modules/services/x11/unclutter.nix
index a22e5ac2c95..5f16a680050 100644
--- a/nixos/modules/services/x11/unclutter.nix
+++ b/nixos/modules/services/x11/unclutter.nix
@@ -56,19 +56,17 @@ in {
config = mkIf cfg.enable {
systemd.user.services.unclutter = {
description = "unclutter";
- wantedBy = [ "default.target" ];
+ wantedBy = [ "graphical-session.target" ];
+ partOf = [ "graphical-session.target" ];
serviceConfig.ExecStart = ''
${cfg.package}/bin/unclutter \
-idle ${toString cfg.timeout} \
- -display :${toString (
- let display = config.services.xserver.display;
- in if display != null then display else 0
- )} \
-jitter ${toString (cfg.threeshold - 1)} \
${optionalString cfg.keystroke "-keystroke"} \
${concatMapStrings (x: " -"+x) cfg.extraOptions} \
-not ${concatStringsSep " " cfg.excluded} \
'';
+ serviceConfig.PassEnvironment = "DISPLAY";
serviceConfig.RestartSec = 3;
serviceConfig.Restart = "always";
};
diff --git a/nixos/modules/services/x11/urxvtd.nix b/nixos/modules/services/x11/urxvtd.nix
index 57ad93f2017..f2ce089ce19 100644
--- a/nixos/modules/services/x11/urxvtd.nix
+++ b/nixos/modules/services/x11/urxvtd.nix
@@ -21,9 +21,8 @@ in {
systemd.user = {
sockets.urxvtd = {
description = "socket for urxvtd, the urxvt terminal daemon";
- after = [ "graphical.target" ];
- wants = [ "graphical.target" ];
- wantedBy = [ "sockets.target" ];
+ wantedBy = [ "graphical-session.target" ];
+ partOf = [ "graphical-session.target" ];
socketConfig = {
ListenStream = "%t/urxvtd-socket";
};
diff --git a/nixos/modules/services/x11/xbanish.nix b/nixos/modules/services/x11/xbanish.nix
index e1e3cbc8e44..b95fac68f16 100644
--- a/nixos/modules/services/x11/xbanish.nix
+++ b/nixos/modules/services/x11/xbanish.nix
@@ -20,7 +20,8 @@ in {
config = mkIf cfg.enable {
systemd.user.services.xbanish = {
description = "xbanish hides the mouse pointer";
- wantedBy = [ "default.target" ];
+ wantedBy = [ "graphical-session.target" ];
+ partOf = [ "graphical-session.target" ];
serviceConfig.ExecStart = ''
${pkgs.xbanish}/bin/xbanish ${cfg.arguments}
'';
diff --git a/nixos/modules/system/boot/systemd-nspawn.nix b/nixos/modules/system/boot/systemd-nspawn.nix
index b462822bc2f..8fa9f8b795e 100644
--- a/nixos/modules/system/boot/systemd-nspawn.nix
+++ b/nixos/modules/system/boot/systemd-nspawn.nix
@@ -18,7 +18,6 @@ let
])
(assertValueOneOf "Boot" boolValues)
(assertValueOneOf "ProcessTwo" boolValues)
- (assertValueOneOf "PrivateUsers" (boolValues ++ [ "pick" ]))
(assertValueOneOf "NotifyReady" boolValues)
];
@@ -42,8 +41,7 @@ let
];
instanceOptions = {
- options = {
-
+ options = sharedOptions // {
execConfig = mkOption {
default = {};
example = { Parameters = "/bin/sh"; };
@@ -84,17 +82,19 @@ let
};
instanceToUnit = name: def:
- { text = ''
- [Exec]
- ${attrsToSection def.execConfig}
+ let base = {
+ text = ''
+ [Exec]
+ ${attrsToSection def.execConfig}
- [Files]
- ${attrsToSection def.filesConfig}
+ [Files]
+ ${attrsToSection def.filesConfig}
- [Network]
- ${attrsToSection def.networkConfig}
- '';
- };
+ [Network]
+ ${attrsToSection def.networkConfig}
+ '';
+ } // def;
+ in base // { unit = makeUnit name base; };
in {
@@ -110,7 +110,7 @@ in {
config =
let
- units = mapAttrs' (n: v: nameValuePair "${n}.nspawn" (instanceToUnit n v)) cfg.instances;
+ units = mapAttrs' (n: v: nameValuePair "${n}.nspawn" (instanceToUnit n v)) cfg;
in mkIf (cfg != {}) {
environment.etc."systemd/nspawn".source = generateUnits "nspawn" units [] [];
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index f798862513c..00d6d370dd7 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -396,6 +396,11 @@ let
'';
};
+ logindHandlerType = types.enum [
+ "ignore" "poweroff" "reboot" "halt" "kexec" "suspend"
+ "hibernate" "hybrid-sleep" "lock"
+ ];
+
in
{
@@ -595,6 +600,27 @@ in
'';
};
+ services.logind.lidSwitch = mkOption {
+ default = "suspend";
+ example = "ignore";
+ type = logindHandlerType;
+
+ description = ''
+ Specifies what to be done when the laptop lid is closed.
+ '';
+ };
+
+ services.logind.lidSwitchDocked = mkOption {
+ default = "ignore";
+ example = "suspend";
+ type = logindHandlerType;
+
+ description = ''
+ Specifies what to be done when the laptop lid is closed
+ and another screen is added.
+ '';
+ };
+
systemd.user.extraConfig = mkOption {
default = "";
type = types.lines;
@@ -721,6 +747,8 @@ in
"systemd/logind.conf".text = ''
[Login]
KillUserProcesses=no
+ HandleLidSwitch=${config.services.logind.lidSwitch}
+ HandleLidSwitchDocked=${config.services.logind.lidSwitchDocked}
${config.services.logind.extraConfig}
'';
diff --git a/nixos/modules/virtualisation/lxd.nix b/nixos/modules/virtualisation/lxd.nix
index 9d76b890872..b1ff0337994 100644
--- a/nixos/modules/virtualisation/lxd.nix
+++ b/nixos/modules/virtualisation/lxd.nix
@@ -45,7 +45,7 @@ in
after = [ "systemd-udev-settle.service" ];
# TODO(wkennington): Add lvm2 and thin-provisioning-tools
- path = with pkgs; [ acl rsync gnutar xz btrfs-progs ];
+ path = with pkgs; [ acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute iptables ];
serviceConfig.ExecStart = "@${pkgs.lxd.bin}/bin/lxd lxd --syslog --group lxd";
serviceConfig.Type = "simple";
diff --git a/nixos/release.nix b/nixos/release.nix
index aaf23d7ffb7..54c2a963e69 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -262,6 +262,7 @@ in rec {
tests.keystone = callTest tests/keystone.nix {};
tests.kubernetes = hydraJob (import tests/kubernetes.nix { system = "x86_64-linux"; });
tests.latestKernel.login = callTest tests/login.nix { latestKernel = true; };
+ tests.ldap = callTest tests/ldap.nix {};
#tests.lightdm = callTest tests/lightdm.nix {};
tests.login = callTest tests/login.nix {};
#tests.logstash = callTest tests/logstash.nix {};
diff --git a/nixos/tests/ldap.nix b/nixos/tests/ldap.nix
new file mode 100644
index 00000000000..b39f4124c95
--- /dev/null
+++ b/nixos/tests/ldap.nix
@@ -0,0 +1,119 @@
+import ./make-test.nix ({ pkgs, lib, ...} :
+
+let
+
+ dbSuffix = "dc=example,dc=com";
+ dbPath = "/var/db/openldap";
+ dbAdminDn = "cn=admin,${dbSuffix}";
+ dbAdminPwd = "test";
+ serverUri = "ldap:///";
+ ldapUser = "test-ldap-user";
+ ldapUserId = 10000;
+ ldapUserPwd = "test";
+ ldapGroup = "test-ldap-group";
+ ldapGroupId = 10000;
+ setupLdif = pkgs.writeText "test-ldap.ldif" ''
+ dn: ${dbSuffix}
+ dc: ${with lib; let dc = head (splitString "," dbSuffix); dcName = head (tail (splitString "=" dc)); in dcName}
+ o: ${dbSuffix}
+ objectclass: top
+ objectclass: dcObject
+ objectclass: organization
+
+ dn: cn=${ldapUser},${dbSuffix}
+ sn: ${ldapUser}
+ objectClass: person
+ objectClass: posixAccount
+ uid: ${ldapUser}
+ uidNumber: ${toString ldapUserId}
+ gidNumber: ${toString ldapGroupId}
+ homeDirectory: /home/${ldapUser}
+ loginShell: /bin/sh
+ userPassword: ${ldapUserPwd}
+
+ dn: cn=${ldapGroup},${dbSuffix}
+ objectClass: posixGroup
+ gidNumber: ${toString ldapGroupId}
+ memberUid: ${ldapUser}
+ '';
+ mkClient = useDaemon:
+ { config, pkgs, lib, ... }:
+ {
+ virtualisation.memorySize = 256;
+ virtualisation.vlans = [ 1 ];
+ security.pam.services.su.rootOK = lib.mkForce false;
+ users.ldap.enable = true;
+ users.ldap.daemon.enable = useDaemon;
+ users.ldap.loginPam = true;
+ users.ldap.nsswitch = true;
+ users.ldap.server = "ldap://server";
+ users.ldap.base = "${dbSuffix}";
+ };
+
+in
+
+{
+ name = "ldap";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ montag451 ];
+ };
+
+ nodes = {
+
+ server =
+ { config, pkgs, lib, ... }:
+ {
+ virtualisation.memorySize = 256;
+ virtualisation.vlans = [ 1 ];
+ networking.firewall.allowedTCPPorts = [ 389 ];
+ services.openldap.enable = true;
+ services.openldap.dataDir = dbPath;
+ services.openldap.urlList = [
+ serverUri
+ ];
+ services.openldap.extraConfig = ''
+ include ${pkgs.openldap.out}/etc/schema/core.schema
+ include ${pkgs.openldap.out}/etc/schema/cosine.schema
+ include ${pkgs.openldap.out}/etc/schema/inetorgperson.schema
+ include ${pkgs.openldap.out}/etc/schema/nis.schema
+
+ database mdb
+ suffix ${dbSuffix}
+ rootdn ${dbAdminDn}
+ rootpw ${dbAdminPwd}
+ directory ${dbPath}
+ '';
+ };
+
+ client1 = mkClient true; # use nss_pam_ldapd
+ client2 = mkClient false; # use nss_ldap and pam_ldap
+
+ };
+
+ testScript = ''
+ startAll;
+ $server->waitForUnit("default.target");
+ $client1->waitForUnit("default.target");
+ $client2->waitForUnit("default.target");
+
+ $server->succeed("ldapadd -D '${dbAdminDn}' -w ${dbAdminPwd} -H ${serverUri} -f '${setupLdif}'");
+
+ # NSS tests
+ subtest "nss", sub {
+ $client1->succeed("test \"\$(id -u '${ldapUser}')\" -eq ${toString ldapUserId}");
+ $client1->succeed("test \"\$(id -u -n '${ldapUser}')\" = '${ldapUser}'");
+ $client1->succeed("test \"\$(id -g '${ldapUser}')\" -eq ${toString ldapGroupId}");
+ $client1->succeed("test \"\$(id -g -n '${ldapUser}')\" = '${ldapGroup}'");
+ $client2->succeed("test \"\$(id -u '${ldapUser}')\" -eq ${toString ldapUserId}");
+ $client2->succeed("test \"\$(id -u -n '${ldapUser}')\" = '${ldapUser}'");
+ $client2->succeed("test \"\$(id -g '${ldapUser}')\" -eq ${toString ldapGroupId}");
+ $client2->succeed("test \"\$(id -g -n '${ldapUser}')\" = '${ldapGroup}'");
+ };
+
+ # PAM tests
+ subtest "pam", sub {
+ $client1->succeed("echo ${ldapUserPwd} | su -l '${ldapUser}' -c true");
+ $client2->succeed("echo ${ldapUserPwd} | su -l '${ldapUser}' -c true");
+ };
+ '';
+})
diff --git a/nixos/tests/plasma5.nix b/nixos/tests/plasma5.nix
index f561fc8c3c4..f97544b5ea5 100644
--- a/nixos/tests/plasma5.nix
+++ b/nixos/tests/plasma5.nix
@@ -13,6 +13,21 @@ import ./make-test.nix ({ pkgs, ...} :
services.xserver.desktopManager.plasma5.enable = true;
services.xserver.desktopManager.default = "plasma5";
virtualisation.memorySize = 1024;
+
+ # fontconfig-penultimate-0.3.3 -> 0.3.4 broke OCR apparently, but no idea why.
+ nixpkgs.config.packageOverrides = superPkgs: {
+ fontconfig-penultimate = superPkgs.fontconfig-penultimate.overrideAttrs
+ (_attrs: rec {
+ version = "0.3.3";
+ name = "fontconfig-penultimate-${version}";
+ src = pkgs.fetchFromGitHub {
+ owner = "ttuegel";
+ repo = "fontconfig-penultimate";
+ rev = version;
+ sha256 = "0392lw31jps652dcjazln77ihb6bl7gk201gb7wb9i223avp86w9";
+ };
+ });
+ };
};
enableOCR = true;
diff --git a/pkgs/applications/altcoins/ethabi.nix b/pkgs/applications/altcoins/ethabi.nix
index d2532e0d41e..c584dd65ebb 100644
--- a/pkgs/applications/altcoins/ethabi.nix
+++ b/pkgs/applications/altcoins/ethabi.nix
@@ -15,6 +15,8 @@ buildRustPackage rec {
depsSha256 = "1n4rxipna307r4xppb2iaads7kpa3yjv99fimvpn8l0f999ir2rz";
+ cargoBuildFlags = ["--features cli"];
+
meta = {
description = "Ethereum function call encoding (ABI) utility";
homepage = https://github.com/ethcore/ethabi/;
diff --git a/pkgs/applications/altcoins/seth.nix b/pkgs/applications/altcoins/seth.nix
index 387f5594c62..bf2d6f65326 100644
--- a/pkgs/applications/altcoins/seth.nix
+++ b/pkgs/applications/altcoins/seth.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "seth-${version}";
- version = "0.5.0";
+ version = "0.5.1";
src = fetchFromGitHub {
owner = "dapphub";
repo = "seth";
rev = "v${version}";
- sha256 = "0bgygvilhbabb0y9pv9cn8cx7cj513w9is4vh6v69h2czknrjmgz";
+ sha256 = "1qph1gldj24r8l6aswb1w133lrm8zsxmmxl4krjik0a73bm4ghdm";
};
nativeBuildInputs = [makeWrapper];
diff --git a/pkgs/applications/audio/openmpt123/default.nix b/pkgs/applications/audio/openmpt123/default.nix
index a13009407eb..da0f7484888 100644
--- a/pkgs/applications/audio/openmpt123/default.nix
+++ b/pkgs/applications/audio/openmpt123/default.nix
@@ -9,7 +9,7 @@ in stdenv.mkDerivation rec {
sha256 = "0qp2nnz6pnl1d7yv9hcjyim7q6yax5881k1jxm8jfgjqagmz5k6p";
};
buildInputs = [ SDL2 pkgconfig flac libsndfile ];
- makeFlags = [ "NO_LTDL=1 TEST=0 EXAMPLES=0" ]
+ makeFlags = [ "NO_PULSEAUDIO=1 NO_LTDL=1 TEST=0 EXAMPLES=0" ]
++ stdenv.lib.optional (stdenv.isDarwin) "SHARED_SONAME=0";
installFlags = "PREFIX=\${out}";
diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index 765f0e9e5a7..e5dbf0aab84 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -8,7 +8,7 @@ let
# Please update the stable branch!
# Latest version number can be found at:
# http://repository-origin.spotify.com/pool/non-free/s/spotify-client/
- version = "1.0.53.758.gde3fc4b2-33";
+ version = "1.0.55.487.g256699aa-16";
deps = [
alsaLib
@@ -53,7 +53,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb";
- sha256 = "1sh6bv23yx0fcbmf60c2yyi6411ij85k4jalpjlck2w26nfj1b3g";
+ sha256 = "09rhm0jp5prcvyf8zpw4pl422yiy8nkazcjc3lv61ngpznk3n1r0";
};
buildInputs = [ dpkg makeWrapper ];
diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index 2b068156910..e936c8a5a7c 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "atom-${version}";
- version = "1.17.0";
+ version = "1.17.2";
src = fetchurl {
url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
- sha256 = "10m1sww8zkhnhs3frlnd6g3b6f4fimgp0512wcszgqhvlhjbf9ln";
+ sha256 = "05lf9f5c9l111prx7d76cr5h8h340vm7vb8hra5rdrqhjpdvwhhn";
name = "${name}.deb";
};
diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index c69d4c2786f..44e9a83e872 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -1100,10 +1100,10 @@
}) {};
load-relative = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "load-relative";
- version = "1.2";
+ version = "1.3";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/load-relative-1.2.el";
- sha256 = "0vmfal05hznb10k2y3j9mychi9ra4hxcm6qf7j1r8aw9j7af6riw";
+ url = "https://elpa.gnu.org/packages/load-relative-1.3.el";
+ sha256 = "1hfxb2436jdsi9wfmsv47lkkpa5galjf5q81bqabbsv79rv59dps";
};
packageRequires = [];
meta = {
@@ -1404,10 +1404,10 @@
}) {};
org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org";
- version = "20170502";
+ version = "20170515";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/org-20170502.tar";
- sha256 = "12inz804j55ycprb2m3ay54d1bhwhjssmn5nrfm7cfklyhfsy27s";
+ url = "https://elpa.gnu.org/packages/org-20170515.tar";
+ sha256 = "0lfapcxil69x1a63cszgq72lqks1z3gpyxw7vcllqlgi7n7a4y6f";
};
packageRequires = [];
meta = {
@@ -1431,10 +1431,10 @@
other-frame-window = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "other-frame-window";
- version = "1.0.2";
+ version = "1.0.3";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/other-frame-window-1.0.2.el";
- sha256 = "0gr4vn7ld4fx372091wxnzm1rhq6rc4ycim4fwz5bxnpykz83l7d";
+ url = "https://elpa.gnu.org/packages/other-frame-window-1.0.3.el";
+ sha256 = "0vq1zfsdnxdjvmb7lkjyax27kfv0rw0141rd5fjnl6ap9yjwpxkv";
};
packageRequires = [ emacs ];
meta = {
@@ -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 = {
@@ -1850,10 +1850,10 @@
test-simple = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "test-simple";
- version = "1.2.0";
+ version = "1.3.0";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/test-simple-1.2.0.el";
- sha256 = "1j97qrwi3i2kihszsxf3y2cby2bzp8g0zf6jlpdix3dinav8xa3b";
+ url = "https://elpa.gnu.org/packages/test-simple-1.3.0.el";
+ sha256 = "1yd61jc9ds95a5n09052kwc5gasy57g4lxr0jsff040brlyi9czz";
};
packageRequires = [ cl-lib ];
meta = {
@@ -1981,6 +1981,19 @@
license = lib.licenses.free;
};
}) {};
+ vdiff = callPackage ({ elpaBuild, emacs, fetchurl, hydra, lib }: elpaBuild {
+ pname = "vdiff";
+ version = "0.2.3";
+ src = fetchurl {
+ url = "https://elpa.gnu.org/packages/vdiff-0.2.3.el";
+ sha256 = "197wszzhm2kbfvvlg3f0dzfs3lf4536yq5fd67k2rycj421fr9qz";
+ };
+ packageRequires = [ emacs hydra ];
+ meta = {
+ homepage = "https://elpa.gnu.org/packages/vdiff.html";
+ license = lib.licenses.free;
+ };
+ }) {};
vlf = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "vlf";
version = "1.7";
diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index 99d08e87f67..bf943bf125e 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -381,8 +381,8 @@
src = fetchFromGitHub {
owner = "emacs-eclim";
repo = "emacs-eclim";
- rev = "1d0ac3f4cd90d44e75f75c8c0bd234013349e14f";
- sha256 = "0cds3rmyp3imx234vdbmrl5l7fq90aixb8n1iv0ba5jrx1yk91lz";
+ rev = "ebb844d1ebdd7eb347e89063a9b6e9f890a1ff57";
+ sha256 = "18q4blnxf7p2kvgh1rhr7pizga06z97hv1lxjgzv0dc2dll2zwmd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/ac-emacs-eclim";
@@ -738,8 +738,8 @@
src = fetchFromGitHub {
owner = "xcwen";
repo = "ac-php";
- rev = "58b68de970201712ecf7f1ba64fdb9b7bee2d66e";
- sha256 = "0sqv9kzcxlvcf72xlr2xpblhcnq6xvrr6kqdy4zrgiqdw884q134";
+ rev = "eba56378cf8d60c4871e0e9d0d0e201d302778ea";
+ sha256 = "0d5pwxla9lkrkb2a5c7y4sm6js7jgm2m8i3lja0c5qzw5b50zwxs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php";
@@ -759,8 +759,8 @@
src = fetchFromGitHub {
owner = "xcwen";
repo = "ac-php";
- rev = "58b68de970201712ecf7f1ba64fdb9b7bee2d66e";
- sha256 = "0sqv9kzcxlvcf72xlr2xpblhcnq6xvrr6kqdy4zrgiqdw884q134";
+ rev = "eba56378cf8d60c4871e0e9d0d0e201d302778ea";
+ sha256 = "0d5pwxla9lkrkb2a5c7y4sm6js7jgm2m8i3lja0c5qzw5b50zwxs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core";
@@ -797,12 +797,12 @@
ac-rtags = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, rtags }:
melpaBuild {
pname = "ac-rtags";
- version = "20170402.653";
+ version = "20170522.2154";
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "2abdfb2adf24b881cdd04e904ecb341bb51e8cb6";
- sha256 = "11f9sd8w7qqhfd6mxbihlc6mdki4lqyk4dwbi3v91k9hbxb9hlq2";
+ 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";
@@ -1070,12 +1070,12 @@
ace-popup-menu = callPackage ({ avy-menu, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ace-popup-menu";
- version = "20170501.1109";
+ version = "20170518.2244";
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "ace-popup-menu";
- rev = "1080044df90d27e50fed233d5195560ced355822";
- sha256 = "08ym1jvg72b8aj99w52bink800m1i6ckidj8hzav32s6w4nsssxk";
+ rev = "e7cc8bace9dda5c9fbe545c6fbd41c12679c3d7d";
+ sha256 = "1khqh5b9c7ass3q2gc04ayc8idanabkyfpaqvfnag063x16fv40c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/53742e2242101c4b3b3901f5c74e24facf62c7d6/recipes/ace-popup-menu";
@@ -1174,12 +1174,12 @@
add-hooks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "add-hooks";
- version = "20170410.2133";
+ version = "20170518.209";
src = fetchFromGitHub {
owner = "nickmccurdy";
repo = "add-hooks";
- rev = "73f2ac34529f4ea0c9fc9f333531d082032d4025";
- sha256 = "1gnnnydvmkgqzbfnc0wx386il5kcgfxdba3vq7c9p6cqxslpd8k5";
+ rev = "f7a94ef1762ad8eb58d24c0857751863ea93cd5b";
+ sha256 = "1j524wvl9l9hzahq8by9bnh745kg2z7l808ad9b0y0wx5kf17xlz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/901f846aef46d512dc0a1770bab7f07c0ae330cd/recipes/add-hooks";
@@ -1342,12 +1342,12 @@
aggressive-indent = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "aggressive-indent";
- version = "20170321.1300";
+ version = "20170515.927";
src = fetchFromGitHub {
owner = "Malabarba";
repo = "aggressive-indent-mode";
- rev = "9dfde9ccef6dffbfa68219d91703d779cfe7016a";
- sha256 = "1aslsq5jjvg0hywk4qzk30k6kaics1xslpqd38n24w37872b70jn";
+ rev = "5a019ef01b29b46381b9263f0edb3eee72b60328";
+ sha256 = "1vgmkkdnns0xw2khyxprb1cv5pqjpx6vl71zdqrr41zb3kdfl628";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/aggressive-indent";
@@ -1487,12 +1487,12 @@
alda-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "alda-mode";
- version = "20170125.1720";
+ version = "20170529.1224";
src = fetchFromGitHub {
owner = "jgkamat";
repo = "alda-mode";
- rev = "921b1d39ee1122c0f6935598dc17aaa904e74819";
- sha256 = "01zz3h6q3djqmb3l6s9jld8x1zx2m0x1qskxzywnyfh8hcvbqy6f";
+ rev = "69f9f1aec6a52350a67ed1db87b6f6c99400622f";
+ sha256 = "1fkpq787z1k914kyln280mk06x58niks5hp9if620qpqvmqaih3s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2612c494a2b6bd43ffbbaef88ce9ee6327779158/recipes/alda-mode";
@@ -1592,12 +1592,12 @@
all-the-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild, memoize }:
melpaBuild {
pname = "all-the-icons";
- version = "20170509.318";
+ version = "20170516.158";
src = fetchFromGitHub {
owner = "domtronn";
repo = "all-the-icons.el";
- rev = "d070531959036edabc38f39ae8cb1a15608af993";
- sha256 = "1a6j09n0bgxihyql4p49g61zbdwns23pbhb1abphrwn3c2aap2lx";
+ rev = "7134b7467a7061b57c8cda3503e9644d4ed92a2a";
+ sha256 = "0xwj8wyj0ywpy4rcqxz15hkr8jnffn7nrp5fnq56j360v8858q8x";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons";
@@ -1659,8 +1659,8 @@
src = fetchFromGitHub {
owner = "NicolasPetton";
repo = "amd-mode.el";
- rev = "977b53e28b3141408fff4814be8b67ee23650cac";
- sha256 = "0m80bwar80qsga735cqrn6rbvfz4w9a036zh8inhsigylv3vwqjv";
+ rev = "11e27444692bbf0eb38ec28af6bd041618c5c091";
+ sha256 = "1qcag5sjg2p64lllgy237j8gkm7vp2kxr6wppkps5wgkf7bn4q4z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e4d6e9935e4935c9de769c7bf1c1b6dd256e10da/recipes/amd-mode";
@@ -1752,8 +1752,8 @@
src = fetchFromGitHub {
owner = "proofit404";
repo = "anaconda-mode";
- rev = "6141aba393e992308d01b550f0b96add62440b04";
- sha256 = "1gkkjnmczpvaw020vw1gbda3dv0h1g7fzdqs3rigwlzzajc96bj4";
+ rev = "1e7c9322c1ef395c4c4585bb29f5a421f2aa3077";
+ sha256 = "1bb090n8nz8vacspihvnq37dx8knjgnarjbx5r4mqy9bp1v8i52p";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode";
@@ -2455,22 +2455,22 @@
license = lib.licenses.free;
};
}) {};
- apib-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }:
+ apib-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }:
melpaBuild {
pname = "apib-mode";
- version = "20161201.817";
+ version = "20170520.658";
src = fetchFromGitHub {
owner = "w-vi";
repo = "apib-mode";
- rev = "940fb1faecb4b0a460ed36de5551a59ebd1edf58";
- sha256 = "0sny3jv4amfc3lx45j1di2snp42xfl907q3l7frqhhsal57lkvd1";
+ rev = "6cc7c6f21b8e415b1718bb6a07ab2182e9e9dde6";
+ sha256 = "1717f78kaqkmbhfwb9kzsv5wi2zabcbwb4wh1jklhcaalvmk3z7d";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/dc2ebb04f975d8226a76260895399c937d6a1940/recipes/apib-mode";
sha256 = "0y3n0xmyc4gkypq07v4sp0i6291qaj2m13zkg6mxp61zm669v2fb";
name = "apib-mode";
};
- packageRequires = [ emacs markdown-mode ];
+ packageRequires = [ markdown-mode ];
meta = {
homepage = "https://melpa.org/#/apib-mode";
license = lib.licenses.free;
@@ -2483,8 +2483,8 @@
src = fetchFromGitHub {
owner = "vermiculus";
repo = "apiwrap.el";
- rev = "4ae045879cb3d7ce45f0a4a8ad4520b9225ca37b";
- sha256 = "0845qajz2jcyfjxynabdnqpgm6cm9h5sbb6wiq06q30794pvlc0n";
+ rev = "8b60f9e9082583aa537369499506c70f192467ab";
+ sha256 = "13pr2hkn2jmg85299lga9rvllghkc0khfdgl3d8g2al9ib0il8pk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0197fd3657e65e3826375d9b6f19da3058366c91/recipes/apiwrap";
@@ -2728,12 +2728,12 @@
arjen-grey-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "arjen-grey-theme";
- version = "20160403.1215";
+ version = "20170522.1347";
src = fetchFromGitHub {
owner = "credmp";
repo = "arjen-grey-theme";
- rev = "b795dcb5760a5ccc3597733c5933b91252542135";
- sha256 = "0p8k6sxmvmf535sawis6rn6lfyl5ph263i1phf2d5wl3dzs0xj5x";
+ rev = "4cd0be72b65d42390e2105cfdaa408a1ead8d8d1";
+ sha256 = "1n5axwn498ahb6984ir1zfl8vvwgbvq9bbrdfzydkmjljhgrp0rd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ed9804061cfadd26c69bb1bfe63dbe22f916f723/recipes/arjen-grey-theme";
@@ -2749,12 +2749,12 @@
artbollocks-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "artbollocks-mode";
- version = "20161030.2059";
+ version = "20170523.2122";
src = fetchFromGitHub {
owner = "sachac";
repo = "artbollocks-mode";
- rev = "d77a01985a9161ce1676fb18d7228a0df566942b";
- sha256 = "1y69zq4r9ir1a2hy03lillxhw3skfj8ckkjv45i5xpasz4hjw50j";
+ rev = "4a907e470bf345b88c3802c1241ce2b8cf4123ee";
+ sha256 = "1l1dwhdfd5bwx92k84h5v47pv9my4p4wj0wq8hrwvwzwlv8dzn2w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/22b237ab91ddd3c17986ea12e6a32f2ce62d3a79/recipes/artbollocks-mode";
@@ -3108,8 +3108,8 @@
src = fetchFromGitHub {
owner = "DamienCassou";
repo = "auth-password-store";
- rev = "cfd9cecb319c8fb547a62c732a5c1a106049c200";
- sha256 = "14cxchnp3sxnps03iycifvjx0w5lsxfnz6qsxgkxnis300lmnkym";
+ rev = "e8d8733b1af67e4ea088d1ed015c554171feecb9";
+ sha256 = "05yzqrdk2d6mqyapgnfflfvm2pqifmb6fprf5si8n6wb8gmi2idw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0f4d2a28373ba93da5b280ebf40c5a3fa758ea11/recipes/auth-password-store";
@@ -3709,12 +3709,12 @@
auto-virtualenvwrapper = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s, virtualenvwrapper }:
melpaBuild {
pname = "auto-virtualenvwrapper";
- version = "20170421.26";
+ version = "20170518.1442";
src = fetchFromGitHub {
owner = "robert-zaremba";
repo = "auto-virtualenvwrapper.el";
- rev = "de613a872e9f3cf59786578883177b1bd654a75c";
- sha256 = "1y2b3i5fk3qhp90xcpdwzl2bdgjk3nrlxi78icpb81rw700qlqzq";
+ rev = "e2fb997e452e62e8bf9f80691941d3d25208e944";
+ sha256 = "0c0llr8kpq54zy1k2qjhhln76ii7r0nmgb85s3nrzar5l1z57zqg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/02a209ae8f9fc68feb3bb64d32d129fedef2b80b/recipes/auto-virtualenvwrapper";
@@ -4044,12 +4044,12 @@
avy-menu = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "avy-menu";
- version = "20170501.1112";
+ version = "20170518.2245";
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "avy-menu";
- rev = "663d3816b01baf445b3076ed757f503c944018f0";
- sha256 = "0x6aa2dmvamqw90gqylj2yyrzsp8gyqvb2nwnzdpighnzal5rhl7";
+ rev = "71b71e64900d0637e17013781042e086e9bf56e7";
+ sha256 = "1mxrq2fpx3qa9vy121wnv02r43sb7djc2j8z7c2vh8x56h8bpial";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2f0b4cfb30c405d44803b36ebcaccef0cf87fe2d/recipes/avy-menu";
@@ -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 = "20170324.728";
+ version = "20170526.743";
src = fetchFromGitHub {
owner = "DamienCassou";
repo = "beginend";
- rev = "2d8908922fadc1e29938703593a77da6456dc276";
- sha256 = "0h6i56pa92x89rilgb7kgfpnsx57d157r284q0icm4xj990svg21";
+ 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 = "54ce52604477c237b663a02d49be9d6d307d49bd";
- sha256 = "1rpyfbh0zp6a013nva2b1czis10mr8vzv52qlhgcfm78m48bvhya";
+ rev = "726eea13a3a4d75d630aac29d6b71d74d9dc69e3";
+ sha256 = "1r75ysdz6cj97vn46lj4g2a3hsab377f667a8bfs17rz007nddv4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key";
@@ -5571,12 +5571,12 @@
boogie-friends = callPackage ({ cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
melpaBuild {
pname = "boogie-friends";
- version = "20161019.1425";
+ version = "20170521.1917";
src = fetchFromGitHub {
owner = "boogie-org";
repo = "boogie-friends";
- rev = "8b567f5efe71d94bba3c29c52dffd58a33abc0cb";
- sha256 = "1gwj8d1635l7l7cqk1508gkzfgi8hpq6w0x22w7rd5yrwz1nmx5b";
+ rev = "38ab3efc2021318cd62f9187214b69d34b4afca6";
+ sha256 = "01yccb86gzag2anmqj1p196m5374mxnxha1fbhv7krc2avx2j71x";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5bdd06b82d002677c046876642efe1dc01bc3e77/recipes/boogie-friends";
@@ -5591,7 +5591,7 @@
}) {};
bookmark-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
pname = "bookmark-plus";
- version = "20170331.1856";
+ version = "20170512.1631";
src = fetchurl {
url = "https://www.emacswiki.org/emacs/download/bookmark+.el";
sha256 = "0iqvlwqilwpqlymj8iynw2miifl28h1g7z10q08rly2430fnmi37";
@@ -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";
@@ -5821,12 +5821,12 @@
browse-at-remote = callPackage ({ cl-lib ? null, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "browse-at-remote";
- version = "20170330.1452";
+ version = "20170523.556";
src = fetchFromGitHub {
owner = "rmuslimov";
repo = "browse-at-remote";
- rev = "7a34d6579a98d13b2887addab25947ea96502de9";
- sha256 = "1ybb9gyw1b4fjbh02lj632vc89m9yq91dvshnbnzg0wbr77d33xr";
+ rev = "5de73fcaa54b638554fcbd59a693bc647ff9dee1";
+ sha256 = "04ad27g1jpy7gdbibyckwrv0y6psq9v66k0zd1hnll1aqlx1k70h";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/browse-at-remote";
@@ -6403,12 +6403,12 @@
buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "buttercup";
- version = "20170421.245";
+ version = "20170520.147";
src = fetchFromGitHub {
owner = "jorgenschaefer";
repo = "emacs-buttercup";
- rev = "ed649d722aeb20683705a2378438833efd96e271";
- sha256 = "1bjkfivxs0x0jlj5qh5adjxmjvj8nd0vs77l4mbm6yv2gm08shxd";
+ rev = "d8dc80da12cc1e71fcf54b0f4deb8d229bc97beb";
+ sha256 = "0zsf2qk41i1ay6h85d1ppj5qnzdrb9n09bzj9s9hk7ysag1rlqj1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b187cb5b3cc5b546bfa6b94b6792e6363242d1/recipes/buttercup";
@@ -7135,12 +7135,12 @@
centered-window-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "centered-window-mode";
- version = "20170510.1334";
+ version = "20170528.25";
src = fetchFromGitHub {
owner = "anler";
repo = "centered-window-mode";
- rev = "cb1b7d010c8f59969fd326983503ee6935d9da8e";
- sha256 = "12210z0aa9arhah2s4gpc4k9l29i293qgz1zimaryizxcfqvp4n8";
+ rev = "c46af782ada0d4062d7de5cbbdc7c7471fdd0d15";
+ sha256 = "1xbfmanimq0ql61lzxx74jf4kj1g9imzgwiy1498mhbdbw295fg0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/centered-window-mode";
@@ -7195,6 +7195,27 @@
license = lib.licenses.free;
};
}) {};
+ ceylon-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "ceylon-mode";
+ version = "20170527.334";
+ src = fetchFromGitHub {
+ owner = "lucaswerkmeister";
+ repo = "ceylon-mode";
+ rev = "2a53cef43915576f68deb9646e38d432334d7ee0";
+ sha256 = "01qfivq3rr1rrsh45xjmw2wbljw14jbsm72a0c1fnbj9v75q2xlh";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/09cd1a2ccf33b209a470780a66d54e1b1d597a86/recipes/ceylon-mode";
+ sha256 = "0dgqmmb8qmvzn557h0fw1mx4y0p96870l8f8glizkk3fifg7wgq4";
+ name = "ceylon-mode";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/ceylon-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
cfengine-code-style = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cfengine-code-style";
@@ -7202,8 +7223,8 @@
src = fetchFromGitHub {
owner = "cfengine";
repo = "core";
- rev = "5c98a709d1a282354af57781c500467f3562e18f";
- sha256 = "0j48v4ai7hn5mxhs3acwmyndzlzlxgzdvqj0a2205w22alb7dxdn";
+ rev = "1caec0c64d8fcf3b1e57192d1a6dff58e0a9ff87";
+ sha256 = "0w3l9awi76m4d4jscy3s50xfk56z4ym1qrihf9yansdqjzlzsi8l";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style";
@@ -7242,7 +7263,7 @@
version = "20170201.347";
src = fetchsvn {
url = "https://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs";
- rev = "12189";
+ rev = "12213";
sha256 = "0lv9lsh1dnsmida4hhj04ysq48v4m12nj9yq621xn3i6s2qz7s1k";
};
recipeFile = fetchurl {
@@ -7322,12 +7343,12 @@
char-menu = callPackage ({ avy-menu, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "char-menu";
- version = "20170501.1119";
+ version = "20170518.2247";
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "char-menu";
- rev = "06250f472d2c6dd55c62057e7e0411d6ca494e35";
- sha256 = "0ibmsixxhb1j2jz7s7hilmqk8f2p609q5g9xhi915xb6vlq9yrwb";
+ rev = "f4d8bf8fa6787e2aaca2ccda5223646541d7a4b2";
+ sha256 = "0zyi1ha17jk3zz7nirasrrx43j3jkrsfz7ypbc4mk44w7hsvx2hj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f6676747e853045b3b19e7fc9524c793c6a08303/recipes/char-menu";
@@ -7364,12 +7385,12 @@
chatwork = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "chatwork";
- version = "20161121.555";
+ version = "20170510.2142";
src = fetchFromGitHub {
owner = "ataka";
repo = "chatwork";
- rev = "70b41451e2d2751e634e84e0452b34c558463fe4";
- sha256 = "11h76qc2n2p8yz941drmi0rp13xmmlacikfygdv1n7s730ja0hgy";
+ rev = "fea231d479f06bf40dbfcf45de143eecc9ed744c";
+ sha256 = "163xr18lm4awfgh4lcp7pr04jirpvlk8w1g4445zbxbpjfvv268z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/77ae72e62b8771e890525c063522e7091ca8f674/recipes/chatwork";
@@ -7431,8 +7452,8 @@
src = fetchFromGitHub {
owner = "eikek";
repo = "chee";
- rev = "a986cce6fe0290934dedfb7afcfdcf5f5eb47a30";
- sha256 = "1cwn5xjchra3dsngbyh23w2p4ndjyjjg0zmj1ij4fk3v86cfqf79";
+ rev = "19437183960ee525de1c0cde13dc2c8d8921abfb";
+ sha256 = "0hrl7h2069g6r2b3i2b7sxizny6ihgf8qajfima32la3gsb0hd4k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9f4a3775720924e5a292819511a8ea42efe1a7dc/recipes/chee";
@@ -7553,12 +7574,12 @@
chinese-fonts-setup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "chinese-fonts-setup";
- version = "20170507.245";
+ version = "20170512.1";
src = fetchFromGitHub {
owner = "tumashu";
repo = "chinese-fonts-setup";
- rev = "43f08ae41903dce980aed8b8ee1e92aee2c4806e";
- sha256 = "074hgpsfzk0zwrnhm6j3q6hw4ygqf08fpc4zbn8f32dsvcd2nlws";
+ rev = "a88f45239ca73e95eb6bac923590f1d108b822ca";
+ sha256 = "1h0nwrnh0krn9p0x1cj67gjdlzr82xml76ycn6745f943sn6d5ah";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c536882e613e83a4a2baf86479bfb3efb86d916a/recipes/chinese-fonts-setup";
@@ -7595,12 +7616,12 @@
chinese-pyim = callPackage ({ async, chinese-pyim-basedict, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip }:
melpaBuild {
pname = "chinese-pyim";
- version = "20170430.131";
+ version = "20170512.735";
src = fetchFromGitHub {
owner = "tumashu";
repo = "chinese-pyim";
- rev = "2fd3610a6585069693c4ce7b7eef6dcba7e57855";
- sha256 = "0k0nvv032i065lkmh1afyax5jx8bnshnxr2d0dfqhmlp8mpa5znx";
+ rev = "d57d0fd47565dc087724a68c6b3abd16a58625ae";
+ sha256 = "10ir2452rj6f48qfgwps6y1mn5afrsa04z0xl2f31j5463j4b4mx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/157a264533124ba05c161aa93a32c7209f002fba/recipes/chinese-pyim";
@@ -7637,12 +7658,12 @@
chinese-pyim-greatdict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "chinese-pyim-greatdict";
- version = "20160619.2109";
+ version = "20170513.1833";
src = fetchFromGitHub {
owner = "tumashu";
repo = "chinese-pyim-greatdict";
- rev = "11cf5145710349e9d928eb9197bebb426025fd58";
- sha256 = "1pza690b31ynyj31f1gp7y2d29ri3swcblpzd2pcpj3ynmnbsy3f";
+ rev = "8efd9321d21d5daabdb32cb3696bc7c7b83ce991";
+ sha256 = "05ap9d2kk9dyj85zm581nwizbdqx8fqa0yjswk4df0y6mgz4g0q9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/03234f7a1abe7423c5a9bcb4c100957c8eece351/recipes/chinese-pyim-greatdict";
@@ -7845,12 +7866,12 @@
cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }:
melpaBuild {
pname = "cider";
- version = "20170509.208";
+ version = "20170525.255";
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "cider";
- rev = "d84b8a8ba77cd685b3a4bc474b1928461cc86bf3";
- sha256 = "1xj6ymyrr156w1cyw571dnnws0013c819x3lvl4cgiaj05nd4422";
+ rev = "7ffc207cf0e56305963e1a3387dce3114325544d";
+ sha256 = "1n4pik7fp4xlc0xdcnw649mx2r2qaiv1f5w9bbz1n4r4pqhmy5q7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider";
@@ -8034,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";
@@ -8121,8 +8142,8 @@
version = "20170120.137";
src = fetchsvn {
url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format";
- rev = "302728";
- sha256 = "1m3h5kln4v2hcwc4ahzk356415iizcg8cmika8221qvqci4wj7bm";
+ rev = "304204";
+ sha256 = "1yvk57q2q4hg04lkvrnx79vgkw6j7hzlx3kvrq0xw93nr351adqv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/69e56114948419a27f06204f6fe5326cc250ae28/recipes/clang-format";
@@ -8327,12 +8348,12 @@
clj-refactor = callPackage ({ cider, clojure-mode, edn, emacs, fetchFromGitHub, fetchurl, hydra, inflections, lib, melpaBuild, multiple-cursors, paredit, s, seq, yasnippet }:
melpaBuild {
pname = "clj-refactor";
- version = "20170502.1115";
+ version = "20170520.323";
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "clj-refactor.el";
- rev = "b6d07155d4ff9181ea0d243235a496bc9d790857";
- sha256 = "1y0vx1yx4ibr9qpkbmp2p48ah03vjin3w3wx9jxzd6dlprbyg59h";
+ rev = "8904b7a9e21ea6319f8c37cf83a7200896bfae9c";
+ sha256 = "1bklsndfhg76a6y3vwbdcakmbrr2hnywjjfk2qaa3mbyxvmlqii3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3a2db268e55d10f7d1d5a5f02d35b2c27b12b78e/recipes/clj-refactor";
@@ -8507,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";
@@ -8532,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";
@@ -8738,12 +8759,12 @@
cmake-ide = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, levenshtein, lib, melpaBuild, seq }:
melpaBuild {
pname = "cmake-ide";
- version = "20170502.30";
+ version = "20170522.1105";
src = fetchFromGitHub {
owner = "atilaneves";
repo = "cmake-ide";
- rev = "ad5cdbdf2eec24ca1a527d56c1c75d47d1208e5c";
- sha256 = "110d3vbjp41400wz2fjgmaqap7ma5f7rsg8i5ni74a8ys89333hd";
+ rev = "afad08063f8b3d4e412b92663b237a2a7db467e9";
+ sha256 = "12n4fznz38p4iy8ak5ix7yvclhxrdkkmg324m4b2i3hd2s4ql80r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/17e8a8a5205d222950dc8e9245549a48894b864a/recipes/cmake-ide";
@@ -8763,8 +8784,8 @@
src = fetchFromGitHub {
owner = "Kitware";
repo = "CMake";
- rev = "8cc9e07a2ca7018feb0dbc286f1db23a4294eeec";
- sha256 = "010ip83v6kbaqjwl8jv3n8by9zv8aldkpal1ass39dvp5rl7q56y";
+ rev = "3ed14cb3ac03e7df53b9f9f987d5180e74dc2b64";
+ sha256 = "1c8ilgx713lkg2hlla5bgp6lm3g12l6viy0ddflcghh3ql744x4f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -9030,10 +9051,10 @@
col-highlight = callPackage ({ fetchurl, lib, melpaBuild, vline }:
melpaBuild {
pname = "col-highlight";
- version = "20170221.1559";
+ version = "20170510.1541";
src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/col-highlight.el?revision=30";
- sha256 = "1xm1sbmcily1zy5xfpiphy3waq7928xpqmsrm3rcy37xbk2xj7vr";
+ url = "https://www.emacswiki.org/emacs/download/col-highlight.el?revision=31";
+ sha256 = "0wi4xz8n5ib65spyrgqsp8l6zafnvxdiw3hy918fs0xjj7ziy6qc";
name = "col-highlight.el";
};
recipeFile = fetchurl {
@@ -9238,12 +9259,12 @@
color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "color-theme-sanityinc-tomorrow";
- version = "20170509.327";
+ version = "20170528.1653";
src = fetchFromGitHub {
owner = "purcell";
repo = "color-theme-sanityinc-tomorrow";
- rev = "b1fd68e9114413825aee28491f1bb7de917ef758";
- sha256 = "0ai93fs7l86ih8smf0j51cn0wqph0c3y41vzpbnw9fck3bbxmivk";
+ rev = "2e229477acab33f4df54e3106ab3dc379df10f35";
+ sha256 = "00zhdmqfk50gilcan067ymc9n4wjw1ab3xyvv6v6q3s365wyh120";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-tomorrow";
@@ -9488,12 +9509,12 @@
common-lisp-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
melpaBuild {
pname = "common-lisp-snippets";
- version = "20161231.1557";
+ version = "20170522.2147";
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "common-lisp-snippets";
- rev = "bb8d22994592a7e69ef8e613e8638882e4e0e404";
- sha256 = "0i4w5jkz0yxnnapyijvjd5z1rcp0g3r3abj6hchb5yd26h1jcz8a";
+ rev = "46f1de08c8d86b72b474c2f8e1c1b313ac70f23d";
+ sha256 = "148ach1p3iqch3a6r1y8wkr1avyprg47jjz3a31vjvqgcwgs3ynw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/48d0166ccd3dcdd3df4719349778c6c5ab6872ca/recipes/common-lisp-snippets";
@@ -9509,12 +9530,12 @@
company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "company";
- version = "20170420.1837";
+ version = "20170517.1436";
src = fetchFromGitHub {
owner = "company-mode";
repo = "company-mode";
- rev = "1fe263493fc3cb3551c55bb3441fd9d7eb0c0a96";
- sha256 = "14l8p1qibhd2jx9cgfb6h2fvcl1xn8rw4l6jd5n2m5580qv7cx5g";
+ rev = "a5289c533c7a5445b2add25b7bf784cfa0f1f23c";
+ sha256 = "1wz1dp3fincxjcajmy35cbkjbwz5gi9iqdan9bhxii91g842zgpq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company";
@@ -9689,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";
@@ -9706,12 +9727,12 @@
company-dcd = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, flycheck-dmd-dub, ivy, lib, melpaBuild, popwin, yasnippet }:
melpaBuild {
pname = "company-dcd";
- version = "20161114.2306";
+ version = "20170516.210";
src = fetchFromGitHub {
owner = "tsukimizake";
repo = "company-dcd";
- rev = "4161374fd0da40bbebb6f6e01f1589625708d8ef";
- sha256 = "0pi0363s8ww6xz7drgxi195jcanvmx1g4wv4zrpdl9dx8cf166bs";
+ rev = "4832188a9e42287539a69c372fe1643166a6a7aa";
+ sha256 = "07caaff8chabrgl4hqanq13p5qhzqx5fcg2synl8856d7v1456vc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ad5be8c53911271fba03a88da7e9d518c6508ffe/recipes/company-dcd";
@@ -9801,8 +9822,8 @@
src = fetchFromGitHub {
owner = "emacs-eclim";
repo = "emacs-eclim";
- rev = "1d0ac3f4cd90d44e75f75c8c0bd234013349e14f";
- sha256 = "0cds3rmyp3imx234vdbmrl5l7fq90aixb8n1iv0ba5jrx1yk91lz";
+ rev = "ebb844d1ebdd7eb347e89063a9b6e9f890a1ff57";
+ sha256 = "18q4blnxf7p2kvgh1rhr7pizga06z97hv1lxjgzv0dc2dll2zwmd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/company-emacs-eclim";
@@ -9986,12 +10007,12 @@
company-irony = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, irony, lib, melpaBuild }:
melpaBuild {
pname = "company-irony";
- version = "20170411.1645";
+ version = "20170515.1608";
src = fetchFromGitHub {
owner = "Sarcasm";
repo = "company-irony";
- rev = "87834a6e46dea52b8469ec636e6dc0a97e85bf27";
- sha256 = "05j439h4fzwakf91j0m70giyb6cwycnwy087nikxyfdiq7nk8lg2";
+ rev = "cebd82506c59d21a9c436bd8e8a33dfa8be84955";
+ sha256 = "09mzxyvp07qwdhxagyiggpccxsklkbhjg730q6wbqd13g1mlkryj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/company-irony";
@@ -10011,8 +10032,8 @@
src = fetchFromGitHub {
owner = "hotpxl";
repo = "company-irony-c-headers";
- rev = "ba304fe7eebdff90bbc7dea063b45b82638427fa";
- sha256 = "1x2dfjmy86icyv2g1y5bjlr87w8rixqdcndkwm1sba6ha277wp9i";
+ rev = "5bbd427a2d3d4445e3413f7516def9aa80543b2a";
+ sha256 = "172wf0ywbvqn9smwnh4kgxx8gw9g2f76irg3fmcv4d8d53mi08wa";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9f9f62d8ef438a9ba4872bd7731768eddc5905de/recipes/company-irony-c-headers";
@@ -10158,8 +10179,8 @@
src = fetchFromGitHub {
owner = "xcwen";
repo = "ac-php";
- rev = "58b68de970201712ecf7f1ba64fdb9b7bee2d66e";
- sha256 = "0sqv9kzcxlvcf72xlr2xpblhcnq6xvrr6kqdy4zrgiqdw884q134";
+ rev = "eba56378cf8d60c4871e0e9d0d0e201d302778ea";
+ sha256 = "0d5pwxla9lkrkb2a5c7y4sm6js7jgm2m8i3lja0c5qzw5b50zwxs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php";
@@ -10286,12 +10307,12 @@
company-rtags = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rtags }:
melpaBuild {
pname = "company-rtags";
- version = "20170504.49";
+ version = "20170522.2154";
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "2abdfb2adf24b881cdd04e904ecb341bb51e8cb6";
- sha256 = "11f9sd8w7qqhfd6mxbihlc6mdki4lqyk4dwbi3v91k9hbxb9hlq2";
+ rev = "499db6f98cc725bca66d122bce571adcdfa32187";
+ sha256 = "10mgzyb3ccs781b7r37qfjw7ynhh9k8hqpahh9pcn3p462si341a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags";
@@ -10304,22 +10325,22 @@
license = lib.licenses.free;
};
}) {};
- company-shell = callPackage ({ cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ company-shell = callPackage ({ cl-lib ? null, company, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "company-shell";
- version = "20170507.445";
+ version = "20170517.2241";
src = fetchFromGitHub {
owner = "Alexander-Miller";
repo = "company-shell";
- rev = "57445b8116148875ad80f434af55781749c72960";
- sha256 = "0kh0cwhivj3gnh2vml98rlfqfzfn8lkvz5kws9ni0r86fcdlwdc0";
+ rev = "6ae625f80d90e0779c79de38e8f83a336c1d00fa";
+ sha256 = "0da9y7x1xvaahsslcmgji6hr3cbn779i504cfrmsabbr3wmkn3fy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/bbaa05d158f3806b9f79a2c826763166dbee56ca/recipes/company-shell";
sha256 = "0my9jghf3s4idkgrpki8mj1lm5ichfvznb09lfwf07fjhg0q1apz";
name = "company-shell";
};
- packageRequires = [ cl-lib company dash ];
+ packageRequires = [ cl-lib company dash emacs ];
meta = {
homepage = "https://melpa.org/#/company-shell";
license = lib.licenses.free;
@@ -10454,12 +10475,12 @@
company-ycmd = callPackage ({ company, dash, deferred, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s, ycmd }:
melpaBuild {
pname = "company-ycmd";
- version = "20161026.2337";
+ version = "20170521.1109";
src = fetchFromGitHub {
owner = "abingham";
repo = "emacs-ycmd";
- rev = "05f0409fb7902daf49b4cd329e5c9ef569d77689";
- sha256 = "0mp05xsphbidjgskp2pnv2x54z95dzmvfwdddpgmysmc99sz305y";
+ rev = "b7ad7c440dc3640a46291a9acf98e523272e302b";
+ sha256 = "0cpq2kqhxg61rs6q53mfidgd96gna3czw90rhb6njhch01cv9i5m";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-ycmd";
@@ -10810,12 +10831,12 @@
counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
melpaBuild {
pname = "counsel";
- version = "20170506.1638";
+ version = "20170526.203";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "swiper";
- rev = "f565f76dfb3a31becc32c807916c011cde6c4e64";
- sha256 = "1dl39b4c7jij0gxdri2li6nkm7x73ljhbk0n1zwi6lw4xd7dix6p";
+ rev = "c93194941c1ac36ee762b70dc9061ee830769f6a";
+ sha256 = "0i75kyh3si8x6k0bqj1055kcp8zzbv05sps4flmwh59vn4j8paca";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel";
@@ -10933,6 +10954,27 @@
license = lib.licenses.free;
};
}) {};
+ counsel-spotify = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
+ melpaBuild {
+ pname = "counsel-spotify";
+ version = "20170523.1321";
+ src = fetchFromGitHub {
+ owner = "Lautaro-Garcia";
+ repo = "counsel-spotify";
+ rev = "7cecb359224f24e1e922b513b545187e6774d207";
+ sha256 = "0lbh9z0w1czxvrdlbch71gys9wjsc9zr9i6xwq3ah40aydx251x2";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/b386462518a5ebb6454f4d01582df98395239bcc/recipes/counsel-spotify";
+ sha256 = "1xs4km5vjhn6dnlmrscz7airip07n1ppybp8mr17hinb8scfpv47";
+ name = "counsel-spotify";
+ };
+ packageRequires = [ emacs ivy ];
+ meta = {
+ homepage = "https://melpa.org/#/counsel-spotify";
+ license = lib.licenses.free;
+ };
+ }) {};
cov = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "cov";
@@ -10940,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";
@@ -11292,12 +11334,12 @@
crux = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
melpaBuild {
pname = "crux";
- version = "20161219.2313";
+ version = "20170510.2148";
src = fetchFromGitHub {
owner = "bbatsov";
repo = "crux";
- rev = "430235753cda1e9af75d209e36a2c9c4f6599a80";
- sha256 = "1v16ac9wfvnhy5h8v82ym165lz27bv9p0wma44c8nz24cl848rrm";
+ rev = "3b377b4fdd23df35f72bcb1021800d41fdccf863";
+ sha256 = "13z0hbkhzrsml30kp3maipc87qciilg99vy8w9lc0da5fv64i7ya";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/575e3442a925500a5806e0b900208c1e6bfd11ae/recipes/crux";
@@ -11588,8 +11630,8 @@
src = fetchFromGitHub {
owner = "mortberg";
repo = "cubicaltt";
- rev = "40797d45bce17024e8a8bc1ae8598de0397b7adf";
- sha256 = "1mcc1ai51zw575kw0w4dam58bplj8wamf2qvnckc45cjcifci549";
+ rev = "290fb3c5101cf2957596cd21dfc8c04f6c441ca2";
+ sha256 = "0wxk1ylqn5zamjs6ksin4a2j3afgv3bygngb3sfvf6x061wyvzzr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1be42b49c206fc4f0df6fb50fed80b3d9b76710b/recipes/cubicaltt";
@@ -11706,12 +11748,12 @@
cyberpunk-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cyberpunk-theme";
- version = "20161012.1855";
+ version = "20170524.803";
src = fetchFromGitHub {
owner = "n3mo";
repo = "cyberpunk-theme.el";
- rev = "eb6ee11315180ae27b17b351163f47a1014348a0";
- sha256 = "0s9ja6l2y75lnkd1js4x3ks6pj5p6x7i9sm5vlcr5yq4qvmamn3h";
+ rev = "8c3cc39bcff5def0d476c080b5248436da7f990f";
+ sha256 = "1npwrw3pgdmvqhihcqcfi2yrs178iiip5fcj8zhpp6cr9yqsvvgi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4c632d1e501d48dab54432ab111ce589aa229125/recipes/cyberpunk-theme";
@@ -11809,12 +11851,12 @@
cyphejor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cyphejor";
- version = "20170501.1126";
+ version = "20170518.2255";
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "cyphejor";
- rev = "fa48bb532fcd5c41dc32c0d8290ad806a9a14f1b";
- sha256 = "1bjszg3r7n4c31y97rzsv1yhb9j0c5600ckxj36rw3axzg4ighk5";
+ rev = "d7842388a1872b165489624a1a68f536de97e28d";
+ sha256 = "1gi7rp0vf3iahljzjhs3rj9c0rvfcfs93hr8a3hl0ch3h9qq8ng2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ad7cacfa39d8f85e26372ef21898663aebb68e43/recipes/cyphejor";
@@ -11855,8 +11897,8 @@
src = fetchFromGitHub {
owner = "cython";
repo = "cython";
- rev = "b20ed8ddf161d467d4c8b2088e7040b370855af3";
- sha256 = "0dilcfzp47mlf5mjpl72nxrby75bma1r87s63qiybmv779rc0h63";
+ rev = "1b7a91a2c2aea7d3a25e8f0bf3689b106d673201";
+ sha256 = "0msv987niax3sid3krj791p780lm9kb2v83gd4f8g5y29if930dm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@@ -12187,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";
@@ -12208,12 +12250,12 @@
dart-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "dart-mode";
- version = "20170127.1652";
+ version = "20170525.1236";
src = fetchFromGitHub {
owner = "nex3";
repo = "dart-mode";
- rev = "b3808189cf6c5165499d3f67540f550e49b26aa2";
- sha256 = "1bs3p72gxlcviz0l2dl1h92708j0c3ly0kwpdbr370i2hdv0l8ys";
+ rev = "9b11e8fb63549ee3700fb53e92e4ce2cb302c971";
+ sha256 = "1cp0qmnhnp57vihn343jz14kxm1rwn5b004q9yjlbv1am389rr12";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dart-mode";
@@ -12229,12 +12271,12 @@
dash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dash";
- version = "20170207.2056";
+ version = "20170523.219";
src = fetchFromGitHub {
owner = "magnars";
repo = "dash.el";
- rev = "81ef1efa63590db02351cd52d2953717bde8dd00";
- sha256 = "1ivf14i61h6fgk052qggc7cfnjnmsrcjps1zjy9nbkwj0a56swyr";
+ rev = "524e6fe86ba240d4405d3de1c862921fb8085c8d";
+ sha256 = "0ipgfwz5xvqm6lk3r3z0pxr49j7rqwsc4zd9d061dh5f9s5vv2qx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash";
@@ -12275,8 +12317,8 @@
src = fetchFromGitHub {
owner = "magnars";
repo = "dash.el";
- rev = "81ef1efa63590db02351cd52d2953717bde8dd00";
- sha256 = "1ivf14i61h6fgk052qggc7cfnjnmsrcjps1zjy9nbkwj0a56swyr";
+ rev = "524e6fe86ba240d4405d3de1c862921fb8085c8d";
+ sha256 = "0ipgfwz5xvqm6lk3r3z0pxr49j7rqwsc4zd9d061dh5f9s5vv2qx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash-functional";
@@ -12792,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";
@@ -13001,12 +13043,12 @@
diff-hl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "diff-hl";
- version = "20170424.303";
+ version = "20170519.1530";
src = fetchFromGitHub {
owner = "dgutov";
repo = "diff-hl";
- rev = "3e9d26407e8767375e75757e5adcb23a6fe94985";
- sha256 = "1bdpn00vlgzsi3w53l7k5lkw6ps1h0mb0d9ww3zmif2y801krzqr";
+ rev = "63f1687aafb4449761bb19f3f5f1b677ab1b5d91";
+ sha256 = "0zaaik87ndbcc77swakhfkh8pbl0zgk5ajq9wfpr7i27mf1x7n2y";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/diff-hl";
@@ -13584,10 +13626,10 @@
}) {};
dired-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
pname = "dired-plus";
- version = "20170409.1822";
+ version = "20170522.918";
src = fetchurl {
url = "https://www.emacswiki.org/emacs/download/dired+.el";
- sha256 = "0anrf0cax9ah5mlxxbav7f2vvv50l7psi32rgn3z3hv4z34fmkrx";
+ sha256 = "061m501k8mg641acpvfjh6vbfhlml98xz0zxdqd34mm7aqsbrnz2";
name = "dired+.el";
};
recipeFile = fetchurl {
@@ -14289,12 +14331,12 @@
django-mode = callPackage ({ fetchFromGitHub, fetchurl, helm-make, lib, melpaBuild, projectile, s }:
melpaBuild {
pname = "django-mode";
- version = "20161109.749";
+ version = "20170522.14";
src = fetchFromGitHub {
owner = "myfreeweb";
repo = "django-mode";
- rev = "561a3a7359a1526b67688239cdee67e0425b6a01";
- sha256 = "0xyi5j0cf1d8dv7lpfcgzkfargkpga3dp93pxi8x9pshafmlnrw8";
+ rev = "a71b8dd984e7f724b8321246e5c353a4ae5c986e";
+ sha256 = "0xf33ri5phy2mrb1dwvqb8waba33gj9bwmf6jhl6n0ksm43x0z40";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/bdc46811612ff96cb1e09552b9f095d68528dcb3/recipes/django-mode";
@@ -14314,8 +14356,8 @@
src = fetchFromGitHub {
owner = "myfreeweb";
repo = "django-mode";
- rev = "561a3a7359a1526b67688239cdee67e0425b6a01";
- sha256 = "0xyi5j0cf1d8dv7lpfcgzkfargkpga3dp93pxi8x9pshafmlnrw8";
+ rev = "a71b8dd984e7f724b8321246e5c353a4ae5c986e";
+ sha256 = "0xf33ri5phy2mrb1dwvqb8waba33gj9bwmf6jhl6n0ksm43x0z40";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/bdc46811612ff96cb1e09552b9f095d68528dcb3/recipes/django-snippets";
@@ -14696,12 +14738,12 @@
doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "doom-themes";
- version = "20170510.1144";
+ version = "20170528.1204";
src = fetchFromGitHub {
owner = "hlissner";
repo = "emacs-doom-theme";
- rev = "8a4e364a96b404a87f731d87ed76db8bfe0880b5";
- sha256 = "0hw701d2vd72rw8yqfkf3rk3isiizm6djy0fbsll1pf79lvwvz66";
+ rev = "71ca3f2910f2d857cea50f84a8cd27894aef848f";
+ sha256 = "1f4c3nf0psn6si13a7044z06mhj416hzqjgiyypxcwqx9mgbryhn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/73fd9f3c2352ea1af49166c2fe586d0410614081/recipes/doom-themes";
@@ -15131,7 +15173,7 @@
version = "20130120.1257";
src = fetchsvn {
url = "https://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/";
- rev = "1794764";
+ rev = "1796835";
sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq";
};
recipeFile = fetchurl {
@@ -15232,12 +15274,12 @@
dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }:
melpaBuild {
pname = "dumb-jump";
- version = "20170510.1430";
+ version = "20170520.112";
src = fetchFromGitHub {
owner = "jacktasia";
repo = "dumb-jump";
- rev = "175f9f57a5319f2917390402c0b47f7d7000a5dc";
- sha256 = "0sw5p1jgfxqmg3f3cikd87sncgcb7zqdkhcqc83fv1y17zxl1xa9";
+ rev = "4fd2911b97db3d2d2450b4129337fa47da7e9011";
+ sha256 = "0zfc2lpb4lhrkhr5lyaqyk20zw11xh05hgb6b26sbvaz730s2rwb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dumb-jump";
@@ -15295,11 +15337,11 @@
dyalog-mode = callPackage ({ cl-lib ? null, emacs, fetchhg, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dyalog-mode";
- version = "20170427.55";
+ version = "20170519.704";
src = fetchhg {
url = "https://bitbucket.com/harsman/dyalog-mode";
- rev = "2c70af4813fc";
- sha256 = "0brhk5q0jdb3p9nlsfk2bjixqymy4lmrqha138idpx47ka7cjsvn";
+ rev = "56fa34ea25d4";
+ sha256 = "1hk7i557m0m42zdg59z278cylglnp49dr8wa3zbdwzk2xzdg0m00";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode";
@@ -15609,12 +15651,12 @@
easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "easy-hugo";
- version = "20170426.6";
+ version = "20170529.2039";
src = fetchFromGitHub {
owner = "masasam";
repo = "emacs-easy-hugo";
- rev = "5ea62c254c61fcad89d1620ce40b6fda65586d65";
- sha256 = "0p961msrkqxc99rkjdy79x1pdns4dfbvdmv8yl0zi4ib3b07qar1";
+ rev = "1aee9432aa99286410611c59c6317c3f97a66481";
+ sha256 = "0l05hg1fwjxknvv2rcz145disyxy9yr98lfd0nd1rhjgwhwyv2wh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo";
@@ -15714,12 +15756,12 @@
ebal = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }:
melpaBuild {
pname = "ebal";
- version = "20170327.2229";
+ version = "20170520.130";
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "ebal";
- rev = "e47c9eb6b8d6d2bc16c17f9d1dfa9fa2fc00124f";
- sha256 = "00d4i1y9z3gaw01cgccsk6q4qcbn9sg8lzs0im4dh6hzg27w12qm";
+ rev = "2d274ee56d5a61152e846f9a759ebccd70dc8eb1";
+ sha256 = "15hygzw52w5c10hh3gq0hzs499h8zkn1ns80hb2q02cn9hyy962q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/629aa451162a0085488caad4052a56366b7ce392/recipes/ebal";
@@ -15756,12 +15798,12 @@
ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }:
melpaBuild {
pname = "ebib";
- version = "20170401.1342";
+ version = "20170523.1324";
src = fetchFromGitHub {
owner = "joostkremers";
repo = "ebib";
- rev = "a1c8a5045ff31001f0a0dde188e20f23640f5469";
- sha256 = "1awrkcqk38aash3whihhjrxq9f9b568vpiaihyhcsi0773hl5h3b";
+ rev = "594f69068c0022e3d9655ec794b55318458f3d6a";
+ sha256 = "00aw1mc7vaywk808jsnc0myl9l6vhkz2ag202mh5rp8zdsm9vy9s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib";
@@ -15817,12 +15859,12 @@
eclim = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, popup, s, yasnippet }:
melpaBuild {
pname = "eclim";
- version = "20170430.1903";
+ version = "20170522.1354";
src = fetchFromGitHub {
owner = "emacs-eclim";
repo = "emacs-eclim";
- rev = "1d0ac3f4cd90d44e75f75c8c0bd234013349e14f";
- sha256 = "0cds3rmyp3imx234vdbmrl5l7fq90aixb8n1iv0ba5jrx1yk91lz";
+ rev = "ebb844d1ebdd7eb347e89063a9b6e9f890a1ff57";
+ sha256 = "18q4blnxf7p2kvgh1rhr7pizga06z97hv1lxjgzv0dc2dll2zwmd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/eclim";
@@ -16237,12 +16279,12 @@
editorconfig = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "editorconfig";
- version = "20170425.2155";
+ version = "20170518.817";
src = fetchFromGitHub {
owner = "editorconfig";
repo = "editorconfig-emacs";
- rev = "fa13d6dc990b7603652e622d848b5466bb43332b";
- sha256 = "1gica5jwjbyysh5zv90hnhqkl70zrszsb726ncbykwwwxsibq9b2";
+ rev = "4355de0802a88c04fa3016e91a66a640e2af066b";
+ sha256 = "0ikp37wq0992vn7qjzymp8xqri257mprqwxijxcp7q7w8xhcdq0n";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig";
@@ -16255,6 +16297,27 @@
license = lib.licenses.free;
};
}) {};
+ editorconfig-charset-extras = callPackage ({ editorconfig, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "editorconfig-charset-extras";
+ version = "20170508.112";
+ src = fetchFromGitHub {
+ owner = "10sr";
+ repo = "editorconfig-charset-extras-el";
+ rev = "1b8248de9e85bc846af8dfb53b70fdae8900cc69";
+ sha256 = "0gqnx5dwy9qxl1npvp8858i0lwjv1znpqr08h129vaycyyq1n69r";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/62f27dad806fa135209289933f2131ee4ce8f8bf/recipes/editorconfig-charset-extras";
+ sha256 = "15p9qpdwradcnjr0nf0ibhy94yi73l18xz7zxf6khmdirsirpwgh";
+ name = "editorconfig-charset-extras";
+ };
+ packageRequires = [ editorconfig ];
+ meta = {
+ homepage = "https://melpa.org/#/editorconfig-charset-extras";
+ license = lib.licenses.free;
+ };
+ }) {};
editorconfig-custom-majormode = callPackage ({ editorconfig, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "editorconfig-custom-majormode";
@@ -16396,8 +16459,8 @@
src = fetchFromGitHub {
owner = "egisatoshi";
repo = "egison3";
- rev = "a9bec9b4cdaec8fa92bec398c4c5231817e7efad";
- sha256 = "146jq14xjab996r5ff9nschbrh4zk7grggnj7xm8bxwnr9yv0qv0";
+ rev = "c06b457113a7e9484f8f4ae079cb257d8eb65396";
+ sha256 = "16gij5kc4r4x85d8pnpyfkb2z7fjlmfxc73vhd0hf76740kgnnxy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode";
@@ -16474,12 +16537,12 @@
ein = callPackage ({ cl-generic, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }:
melpaBuild {
pname = "ein";
- version = "20170426.1909";
+ version = "20170524.758";
src = fetchFromGitHub {
owner = "millejoh";
repo = "emacs-ipython-notebook";
- rev = "db07da61d3e2dea02efafb8daf82c95c28521817";
- sha256 = "13wf9cqm1sf92dyfr71rci3x8pcwww8chfccgcafq9gc7lvb9ias";
+ rev = "8a231bfb2dd8e3b8e88cc449e73bcd73beba62e9";
+ sha256 = "02hqxfvb5yzqlslas7cd268s2apminw8nh2nj8x1l6hlnmcqvqd7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein";
@@ -16671,12 +16734,12 @@
el-patch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "el-patch";
- version = "20170310.2128";
+ version = "20170513.2050";
src = fetchFromGitHub {
owner = "raxod502";
repo = "el-patch";
- rev = "c0f1c01a82903a1d7f5d49eba6d9e9d373423907";
- sha256 = "0kj4rbn86v9hjkshpyn65cmyhrnmg3s6ir6p4ricnhzv11rgkx6y";
+ rev = "22682dd020ac93b621bf45e57c738e551e2cb14b";
+ sha256 = "1hv9i78fchvmygmb7pfx1ybkq270aibdhjsidzskipfzw40p0dz2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2f4f57e0edbae35597aa4a7744d22d2f971d5de5/recipes/el-patch";
@@ -17045,12 +17108,12 @@
elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "elfeed";
- version = "20170429.1038";
+ version = "20170518.1835";
src = fetchFromGitHub {
owner = "skeeto";
repo = "elfeed";
- rev = "f06c06d36117985d7a7b4aa799d256ca8ec25962";
- sha256 = "0y3rgg4524xw7gdxzhq2jmjkj0qgkffpw251ysc88ihz24pcxc8l";
+ rev = "c79fd5824a3881a8d82cd2fb4b18a559e1f26b8b";
+ sha256 = "1vgbk8blh43h2ih4jqn19wrhdigbf649d28iplv8r9d8vp54njp4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed";
@@ -17119,8 +17182,8 @@
src = fetchFromGitHub {
owner = "skeeto";
repo = "elfeed";
- rev = "f06c06d36117985d7a7b4aa799d256ca8ec25962";
- sha256 = "0y3rgg4524xw7gdxzhq2jmjkj0qgkffpw251ysc88ihz24pcxc8l";
+ rev = "c79fd5824a3881a8d82cd2fb4b18a559e1f26b8b";
+ sha256 = "1vgbk8blh43h2ih4jqn19wrhdigbf649d28iplv8r9d8vp54njp4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web";
@@ -17241,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";
@@ -17346,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";
@@ -17409,12 +17472,12 @@
elmine = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "elmine";
- version = "20151121.423";
+ version = "20170511.20";
src = fetchFromGitHub {
owner = "leoc";
repo = "elmine";
- rev = "60639f46a5f45653f490cdd30732beb2dca47ada";
- sha256 = "1463y4zc6yabd30k6806yw0am18fjv0bkxm56p2siqrwn9pbsh8k";
+ rev = "432d2f2f7cb5b533f25b993d1001abcadcebe8ed";
+ sha256 = "02lsxj9zkcaiqlzy986n1f65cfyd8pkrdljgplsbd9p0w8ys0s94";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/elmine";
@@ -17577,12 +17640,12 @@
elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }:
melpaBuild {
pname = "elpy";
- version = "20170430.255";
+ version = "20170519.1544";
src = fetchFromGitHub {
owner = "jorgenschaefer";
repo = "elpy";
- rev = "574605dce756e878457164817e6d63d915008a84";
- sha256 = "1q8ll1sxdvxgd6mqwz55bv2zwxgz2rqlzyk2xksnh9sna4bhr6xv";
+ rev = "2cf34afa0c3e7249149a65c0ae89e6c593050f2c";
+ sha256 = "0i57dhljf0ymsqlqjr1bz0hxr108k7iiw267s24a3bm3p3ac5lfi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy";
@@ -17602,22 +17665,22 @@
license = lib.licenses.free;
};
}) {};
- elquery = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+ elquery = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "elquery";
- version = "20170226.1238";
+ version = "20170527.1930";
src = fetchFromGitHub {
owner = "AdamNiederer";
repo = "elquery";
- rev = "bfda1499d11b5705bea60886a3d25ca6d3808111";
- sha256 = "1q0ifhq7wflzayg9mqy0wfc1fhgh4fmy17psz977k01yc7nc5s42";
+ rev = "d4309cfebb275495f071fc3449261bf6b23b0afe";
+ sha256 = "12qv4fg9dbgl6c05r501va9dcw16ml0yxkmvs32cr7wfffhxjy4w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/121f7d2091b83143402b44542db12e8f78275103/recipes/elquery";
sha256 = "19yik9w4kcj7i9d3bwwdszznwcrh75hxd0540iqk5by861z5f3zr";
name = "elquery";
};
- packageRequires = [ emacs s ];
+ packageRequires = [ dash emacs s ];
meta = {
homepage = "https://melpa.org/#/elquery";
license = lib.licenses.free;
@@ -18443,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";
@@ -18665,12 +18728,12 @@
ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }:
melpaBuild {
pname = "ensime";
- version = "20170508.3";
+ version = "20170530.354";
src = fetchFromGitHub {
owner = "ensime";
repo = "ensime-emacs";
- rev = "8117122e36a77f9e5616c4260680a07317aebe80";
- sha256 = "02qmpppawziqpsyb2d2mrdyvs4mn6mvcn5smnkkanibabwgld9za";
+ rev = "cccdd2f7caa9b5357f8021098e63384b4cae381c";
+ sha256 = "0fhzlawd2nq14a0b8yx6lnmmklh2s9y5i23nwz8zmwmxxivffn3z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime";
@@ -19197,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";
@@ -19306,8 +19369,8 @@
src = fetchFromGitHub {
owner = "erlang";
repo = "otp";
- rev = "b7a5e0e9070adcd3bd14b8315caa3007b7d2e89f";
- sha256 = "1v2ydy6zpy1fhx3zz6a66xxyfs7zvm27fvagan553670qmfpgi59";
+ rev = "b182febe36aa63eb8290f24ba4b7932673a9a9bc";
+ sha256 = "0p45lcfm4qxzfrcw2pw53m19swgx1m1805v7vdgdkcm63qbdjalj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -19725,8 +19788,8 @@
src = fetchFromGitHub {
owner = "peterwvj";
repo = "eshell-up";
- rev = "b00e447ad7941ab31bcbb6bc0205fd492e887e7d";
- sha256 = "1802887ad7y6m40azfvzz6aapdzkp655jpiryimqd11kwbsinmvv";
+ rev = "2216e149ffdd5cd8eb49d6661187d676b6a22d19";
+ sha256 = "1czl7gab46n9lxp91v1l9rgnz72h9x1im20yq4hw8w0x71a45ss7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eshell-up";
@@ -19889,12 +19952,12 @@
ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }:
melpaBuild {
pname = "ess";
- version = "20170501.306";
+ version = "20170516.257";
src = fetchFromGitHub {
owner = "emacs-ess";
repo = "ESS";
- rev = "40583c1e2680f1746ceb91242c478d0b6fb988d5";
- sha256 = "1mj11wpiy96q48l8hclgkhm0963p7904rzr991wfr465p17bsg6q";
+ rev = "39fa48ac89fcc0a3b8dfd9708207e4acf64bb2fa";
+ sha256 = "1i40v2dah5d1rx5pj40ivl534qs840bvk1h44hqs8n9fz945ck2j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess";
@@ -20263,12 +20326,12 @@
evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }:
melpaBuild {
pname = "evil";
- version = "20170510.1321";
+ version = "20170528.1105";
src = fetchFromGitHub {
owner = "emacs-evil";
repo = "evil";
- rev = "0445068b65a9702660db1abef4f96ad393e29dad";
- sha256 = "0qm0ih4by38x6m99gpan3k3fmjhivi084iylgc7bg5bg3vncflrn";
+ rev = "00ab2876f2849c3be9f5d7475e4538a0ffecf872";
+ sha256 = "06idkqrbh96vp6nb2835g4cgxdcxhp3nm7am46r5ylvgmflw9jf6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/514964d788f250e1e7893142bc094c63131bc6a5/recipes/evil";
@@ -20536,12 +20599,12 @@
evil-exchange = callPackage ({ cl-lib ? null, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-exchange";
- version = "20160812.843";
+ version = "20170510.1959";
src = fetchFromGitHub {
owner = "Dewdrops";
repo = "evil-exchange";
- rev = "8902966aec2709b7e680d13c362d74b7f89b909b";
- sha256 = "1jfjgh75ycm6i01zpnz8y1hp205w61rqbvargk3rp65c34j48dcd";
+ rev = "47691537815150715e64e6f6ec79be7746c96120";
+ sha256 = "0bjpn4yqig17ddym6wqq5fm1b294q74hzcbj9a6gs97fqiwf88xa";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9b06397c032d24a8da4074ad97cdb30d0c468e20/recipes/evil-exchange";
@@ -20620,16 +20683,16 @@
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/ad1b922fc3a6c74b1fd5c8477f769a22bf2241fb/recipes/evil-goggles";
- sha256 = "0m8yj2rsjgkrwdh3jk9g36299s5ib5xbaah3vcjq8ladp3v7amqa";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/811b1261705b4c525e165fa9ee23ae191727a623/recipes/evil-goggles";
+ sha256 = "151xvawyhcjp98skaif08wbxqaw602f51zgwm604hp25a111qmnq";
name = "evil-goggles";
};
packageRequires = [ emacs evil ];
@@ -20725,12 +20788,12 @@
evil-lion = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-lion";
- version = "20170429.1542";
+ version = "20170523.450";
src = fetchFromGitHub {
owner = "edkolev";
repo = "evil-lion";
- rev = "f11ccadecc5d7fe9e78b81a7eedf0556677fb9a8";
- sha256 = "0jbs208b4r6s487flh628b1bf330y7d4r3288gk5ydpn6rzr3wnd";
+ rev = "79766bfb8cbaa82af92eb9c90ea370e10ff74ea4";
+ sha256 = "1799gjd1qj6hdzdy88x7lw0xwygkh70zm0y5gkhlmn4rzkdka9j1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8a7a0691775afec6d2c7be3d6739b55bd1d2053d/recipes/evil-lion";
@@ -20851,12 +20914,12 @@
evil-mc = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-mc";
- version = "20170501.2103";
+ version = "20170526.1158";
src = fetchFromGitHub {
owner = "gabesoft";
repo = "evil-mc";
- rev = "23a1d61154b83b8330dfa90cd55e3842d05f599a";
- sha256 = "1qr5irq3rgis3h6j54qcrq0qy1xw2h9rhcl9mgxg0j623dm9n54l";
+ rev = "506f92dc610906fc279e50c598efe2068161edaa";
+ sha256 = "0ng2l70zllkvjsq2ybgdcdzyg0brplaznxr2y3qmbk72vgs3wxra";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/96770d778a03ab012fb82a3a0122983db6f9b0c4/recipes/evil-mc";
@@ -20914,12 +20977,12 @@
evil-multiedit = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, iedit, lib, melpaBuild }:
melpaBuild {
pname = "evil-multiedit";
- version = "20170408.1744";
+ version = "20170515.337";
src = fetchFromGitHub {
owner = "hlissner";
repo = "evil-multiedit";
- rev = "615f2ac3539c39d5ec11e4c9ba0958d8a9381090";
- sha256 = "068cymahvpyzn13wnma0lfym0f0vfr36kdq7pl8qmhf8ra7xxq92";
+ rev = "8d146312565949850328e4ef365e1f5d71216281";
+ sha256 = "1xw5r3mwyjfbpgdvnm1pv5dfg56qbzvmwhv929x93sjs0j4ybwml";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/997f5a6999d1add57fae33ba8eb3e3bc60d7bb56/recipes/evil-multiedit";
@@ -20995,22 +21058,22 @@
license = lib.licenses.free;
};
}) {};
- evil-org = callPackage ({ evil, evil-leader, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+ evil-org = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "evil-org";
- version = "20151202.2347";
+ version = "20170528.1654";
src = fetchFromGitHub {
- owner = "edwtjo";
+ owner = "Somelauw";
repo = "evil-org-mode";
- rev = "61319f85979e8768c930983595caa2483c0fb319";
- sha256 = "0pir7a3xxbcp5f3q9pi36rpdpi8pbx18afmh0r3501ynssyjfq53";
+ rev = "7cd1903419b9681993210723fc854bd43ca080e5";
+ sha256 = "14jfvk7y102ba7ky8qanhpg46i6if3narshixlbnsb2jd26dyvh6";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/evil-org";
- sha256 = "1306pf5ws7acdanypn3c0r4yh5wxdf0knl6j3hhs4ys9zszd79bw";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/1768558ed0a0249421437b66fe45018dd768e637/recipes/evil-org";
+ sha256 = "18glpsnpxap4dvnvkl59h9pnwlp20libsfbbkmvrbzsvbdyspg6z";
name = "evil-org";
};
- packageRequires = [ evil evil-leader org ];
+ packageRequires = [ emacs evil org ];
meta = {
homepage = "https://melpa.org/#/evil-org";
license = lib.licenses.free;
@@ -21124,16 +21187,16 @@
evil-search-highlight-persist = callPackage ({ fetchFromGitHub, fetchurl, highlight, lib, melpaBuild }:
melpaBuild {
pname = "evil-search-highlight-persist";
- version = "20160912.807";
+ version = "20170522.2034";
src = fetchFromGitHub {
- owner = "juanjux";
+ owner = "naclander";
repo = "evil-search-highlight-persist";
- rev = "1b130e771fc9f3bb7c80e1a50c2847a9e024ad09";
- sha256 = "1la7gamv1qd5wsdlxjjx859zciynln3g9lnxq51iylsbfxgc2f7s";
+ rev = "6e04a8c075f5fd62526d222447048faab8bfa187";
+ sha256 = "1ni1bila3kjqrjcn1sm6g6h2cmf1chrh4d8nj4qfjvkb12fkw6j6";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/91361f95852910968b395423e16377c70189fc55/recipes/evil-search-highlight-persist";
- sha256 = "0iia136js364iygi1mydyzwvizhic6w5z9pbwmhva4654pq8dzqy";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/f2e91974ddb219c88229782b70ade7e14f20c0b5/recipes/evil-search-highlight-persist";
+ sha256 = "08l8ymrp9vkpwprq9gp4562yvcnd4hfc3z7n4n5lz7h6ffv3zym3";
name = "evil-search-highlight-persist";
};
packageRequires = [ highlight ];
@@ -21606,12 +21669,12 @@
expand-region = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "expand-region";
- version = "20170222.343";
+ version = "20170514.1309";
src = fetchFromGitHub {
owner = "magnars";
repo = "expand-region.el";
- rev = "d1252200bac2e0197497d6d57ab6fd004f1b2e77";
- sha256 = "0bhwv92wqccz8y5xm6gj71ryci8cpsnm8z8vmdj8lsf6ki8vz512";
+ rev = "2357f1d5efd9d5b9e37f3513342237fec2629291";
+ sha256 = "0sggq57q8fxzd0my2kwbb2li91zq13cyhxn789bafzxq2d5fpk9h";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/expand-region";
@@ -21711,12 +21774,12 @@
exwm-x = callPackage ({ cl-lib ? null, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper, switch-window }:
melpaBuild {
pname = "exwm-x";
- version = "20170507.622";
+ version = "20170528.2210";
src = fetchFromGitHub {
owner = "tumashu";
repo = "exwm-x";
- rev = "bb894c44ffca623f37461617bdc53b2092ca2b4c";
- sha256 = "1xkandsng3r79vp2i3kqcva35qs4wvcafjxzsnawrvgbskh8kd1g";
+ rev = "9f71ca70942724e7a0c0ec2723963961ed0980c8";
+ sha256 = "13dpqm1b58ivlb17nbsb0rxg5bm52r64y4x0k0pajqfyig2krsrd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a0e6e23bcffdcd1e17c70599c563609050e5de40/recipes/exwm-x";
@@ -21795,12 +21858,12 @@
eziam-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "eziam-theme";
- version = "20170508.1613";
+ version = "20170517.847";
src = fetchFromGitHub {
owner = "thblt";
repo = "eziam-theme-emacs";
- rev = "7b10585034d773348049a7f6b7d9552137f96f73";
- sha256 = "1j9lgykfwyl8iy8p2n6kg10b7xmpq0wkr8gvikk4i43jpag3flp8";
+ rev = "6c7e6ac20e27a26e7b27761f11a3a959ea815b5c";
+ sha256 = "1jzqb1w8ax5h6g9nwqwnagalag2kj7mabq889vl59ka5lvccac0f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0411583bd4fdbe425eb07de98851136fa1eeb0/recipes/eziam-theme";
@@ -21978,12 +22041,12 @@
faff-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "faff-theme";
- version = "20161026.1047";
+ version = "20170522.1219";
src = fetchFromGitHub {
owner = "WJCFerguson";
repo = "emacs-faff-theme";
- rev = "61d98d43c9173662078c0c337ce78918eb6a3610";
- sha256 = "15shbzjpl89ybyyn7d53psn9i8csxi2h9jwz7mx98lg9pjy58ifa";
+ rev = "e79dc142d99bc5a455a46345d3aba6f95f3f3f42";
+ sha256 = "0j5vdbwwpav09v3kkx7cn5qd41inam0jd7smx8133hqpnirsh8mv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0b35c169fe56a5612ff5a4242140f617fdcae14f/recipes/faff-theme";
@@ -22474,12 +22537,12 @@
find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "find-file-in-project";
- version = "20170507.150";
+ version = "20170522.729";
src = fetchFromGitHub {
owner = "technomancy";
repo = "find-file-in-project";
- rev = "1f5b7ef7c6e00ab6fb818c4dc9131c1fe7806704";
- sha256 = "0pcq992pd5vsajsrcpkp5jl3sgxk1p2p0i8in050rs25i3l3lgj0";
+ rev = "d84263bdac55501e05662caffcb0642bb8bb4a53";
+ sha256 = "0f133fpa53sqrx9a4hycvqzi3sbaswxdbma25isfrr0g9kf7j7db";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project";
@@ -22785,12 +22848,12 @@
fix-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fix-input";
- version = "20170501.1340";
+ version = "20170518.2311";
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "fix-input";
- rev = "8eafca061645dbbb913d82b380c1d594eead1d81";
- sha256 = "1b1rlhmb43fyi57vcknx81ycfckfr8qbsv8z94fjbm33j69abxj9";
+ rev = "a70edfa7880ff9b082f358607d2a9ad6a8dcc8f3";
+ sha256 = "121m0h0nwxr27f9d2llbgl63ni1makcg66lnvg24wx07wggf0n8z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7d31f907997d1d07ec794a4f09824f43818f035c/recipes/fix-input";
@@ -22827,12 +22890,12 @@
fix-word = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fix-word";
- version = "20170501.1349";
+ version = "20170518.2343";
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "fix-word";
- rev = "14e65660e17faa024943603eab9e887292fb3614";
- sha256 = "1v9rpfcnviwkzr5bz4x655ldk6hsxpqsvm9qs805pc4k0f4niz5w";
+ rev = "91552cbceac8e2b7c23036f044fc84f5c6f8e338";
+ sha256 = "1pilsd3hkryyl4sd6s4nvmraszkdmcn3qdqi939yjgzp4lz3q412";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/22636390e8a15c09293a1506a901286dd72e565f/recipes/fix-word";
@@ -22960,12 +23023,12 @@
flatui-dark-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "flatui-dark-theme";
- version = "20170423.958";
+ version = "20170513.722";
src = fetchFromGitHub {
owner = "theasp";
repo = "flatui-dark-theme";
- rev = "af5c84e2a2810748cc71a68ec7ba333097cc1f63";
- sha256 = "0c0pm67d8w9jdraap0sswvx7ywly9ifimij2c5w9p4hiph8gisr9";
+ rev = "5b959a9f743f891e4660b1b432086417947872ea";
+ sha256 = "0nz4ql7qf49cwsgjb7dg0jhipr5d472r4fddy6fhr1h17s1cd9qy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5f9dc5abeb37422c63cac74f9a006d54c4a7c5a5/recipes/flatui-dark-theme";
@@ -23230,12 +23293,12 @@
flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }:
melpaBuild {
pname = "flycheck";
- version = "20170507.113";
+ version = "20170524.1742";
src = fetchFromGitHub {
owner = "flycheck";
repo = "flycheck";
- rev = "4cb411b27b244af81ef40318f7854abdccc38291";
- sha256 = "0kfq9h81nh9j8kv7fcx1qh7yx2kmq7l6lkdivabwh6jbnvdyw23n";
+ rev = "b6baa8abc95d83a2f612e4f62f99681b8c4a91b6";
+ sha256 = "1i0bpfpascza9mw9w34a20d4l8q9pm444hw9dk39jkkvzksh98qc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck";
@@ -23440,12 +23503,12 @@
flycheck-color-mode-line = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-color-mode-line";
- version = "20131125.2138";
+ version = "20170512.1607";
src = fetchFromGitHub {
owner = "flycheck";
repo = "flycheck-color-mode-line";
- rev = "c85319f8d2579e770c9060bfef11bedc1370d8be";
- sha256 = "11xc08xld758xx9myqjsiqz8vk3gh4d9c4yswswvky6mrx34c0y5";
+ rev = "b2b20727d133c05fd31eac7b9b5c0886bbca8f98";
+ sha256 = "1dgm9i2b9irp454ag9pv96hbacz1j3gsapk96xr45wjh4hblgwa3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/02b5b60b74581ff0d1815155223e0c6e94a851a1/recipes/flycheck-color-mode-line";
@@ -23458,15 +23521,36 @@
license = lib.licenses.free;
};
}) {};
+ flycheck-coverity = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+ melpaBuild {
+ pname = "flycheck-coverity";
+ version = "20170520.825";
+ src = fetchFromGitHub {
+ owner = "alexmurray";
+ repo = "flycheck-coverity";
+ rev = "fb8ef7b07ca17681b72272331d43578f30405bec";
+ sha256 = "0068wzh2fyrbjn5gvfyf1kpfppfw49mnwkd0n046nhjgaz9y1lc7";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/55e8df91adbcf8b059096e02aba2781424250381/recipes/flycheck-coverity";
+ sha256 = "1knd1sqgjkgb5zs8hgsi6lyvkqmrcrdjgx81f26nhg40qv5m2p5l";
+ name = "flycheck-coverity";
+ };
+ packageRequires = [ dash emacs flycheck ];
+ meta = {
+ homepage = "https://melpa.org/#/flycheck-coverity";
+ license = lib.licenses.free;
+ };
+ }) {};
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";
@@ -23608,12 +23692,12 @@
flycheck-dialyxir = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-dialyxir";
- version = "20170124.2319";
+ version = "20170515.825";
src = fetchFromGitHub {
owner = "aaronjensen";
repo = "flycheck-dialyxir";
- rev = "7e79dc33a12b8aded7a86d64d302072eed522cb4";
- sha256 = "1ylg8v1khh2bph6hscib7diw039z0nxfh28b9mhgyi6s33jyq618";
+ rev = "adfb73374cb2bee75724822972f405f2ec371199";
+ sha256 = "1kzvq99f052mdj4ml1m6nvxhv0kqqblmpdgnwcm89krf0qfl4gjg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fa49551b8f726c235e03ea377bb09a8be37b9f32/recipes/flycheck-dialyxir";
@@ -23755,12 +23839,12 @@
flycheck-flow = callPackage ({ fetchFromGitHub, fetchurl, flycheck, json ? null, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-flow";
- version = "20170325.504";
+ version = "20170512.836";
src = fetchFromGitHub {
owner = "lbolla";
repo = "emacs-flycheck-flow";
- rev = "e51aff467edf2d86e7b315d79d6f2f4d8408ea78";
- sha256 = "1w1s7rcbmiikb7f80rf9d77gzszjcfyymx75x20vvq3rw4wvdnyj";
+ rev = "01c1150737b6d824153ec41adfbafcd3e1442d61";
+ sha256 = "1wxmx40hs391pkjiqmxdz1i4ajksagxbrm3wmp654pix8ynxcvxl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4d18fb21d8ef9b33aa84bc26f5918e636c5771e5/recipes/flycheck-flow";
@@ -23818,12 +23902,12 @@
flycheck-haskell = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, let-alist, lib, melpaBuild, seq }:
melpaBuild {
pname = "flycheck-haskell";
- version = "20160524.117";
+ version = "20170519.1321";
src = fetchFromGitHub {
owner = "flycheck";
repo = "flycheck-haskell";
- rev = "a475c9c4d799bf98931efec95b61160e3ad8b61f";
- sha256 = "05a5hyl6avf09drq6wva8mmxbag41dqixaz6azifywa8p63w1mlk";
+ rev = "2e4167d4cc055d5f825ed22d25b1662e10ebf8d2";
+ sha256 = "1idh7ji2hn4wxhxw4cz66qwkgh6fhzy6lqbxw55d0wlwwq1zva3d";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6ca601613788ae830655e148a222625035195f55/recipes/flycheck-haskell";
@@ -24280,12 +24364,12 @@
flycheck-rtags = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, rtags }:
melpaBuild {
pname = "flycheck-rtags";
- version = "20170403.957";
+ version = "20170522.2154";
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "2abdfb2adf24b881cdd04e904ecb341bb51e8cb6";
- sha256 = "11f9sd8w7qqhfd6mxbihlc6mdki4lqyk4dwbi3v91k9hbxb9hlq2";
+ rev = "499db6f98cc725bca66d122bce571adcdfa32187";
+ sha256 = "10mgzyb3ccs781b7r37qfjw7ynhh9k8hqpahh9pcn3p462si341a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags";
@@ -24445,6 +24529,27 @@
license = lib.licenses.free;
};
}) {};
+ flycheck-vale = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }:
+ melpaBuild {
+ pname = "flycheck-vale";
+ version = "20170521.109";
+ src = fetchFromGitHub {
+ owner = "abingham";
+ repo = "flycheck-vale";
+ rev = "7ca0a2a29b6185761bd07369c565774269c909dd";
+ sha256 = "1crlyphv00a1zm8wbsysxfxhfasv34bbnckc4a3psnvl913nc1gn";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/7693eeb536e601589b49f96d0e2734cd08fad4f2/recipes/flycheck-vale";
+ sha256 = "1ny30q81hq62s178rj3jjwsf9f3988dd6pl82r0vq53z3asnsxyd";
+ name = "flycheck-vale";
+ };
+ packageRequires = [ emacs flycheck let-alist ];
+ meta = {
+ homepage = "https://melpa.org/#/flycheck-vale";
+ license = lib.licenses.free;
+ };
+ }) {};
flycheck-yamllint = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-yamllint";
@@ -24473,8 +24578,8 @@
src = fetchFromGitHub {
owner = "abingham";
repo = "emacs-ycmd";
- rev = "05f0409fb7902daf49b4cd329e5c9ef569d77689";
- sha256 = "0mp05xsphbidjgskp2pnv2x54z95dzmvfwdddpgmysmc99sz305y";
+ rev = "b7ad7c440dc3640a46291a9acf98e523272e302b";
+ sha256 = "0cpq2kqhxg61rs6q53mfidgd96gna3czw90rhb6njhch01cv9i5m";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flycheck-ycmd";
@@ -25246,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";
@@ -25330,12 +25435,12 @@
focus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "focus";
- version = "20161113.1145";
+ version = "20170520.901";
src = fetchFromGitHub {
owner = "larstvei";
repo = "Focus";
- rev = "75202c9445f52eab6fb82f00006f37cd20dae6b2";
- sha256 = "1v9y3dp7sd4rsm31myp3l1jxpwjw3madajb6yz9rw0yhdirfwgbg";
+ rev = "155da77a324f28fd37f6167d5c843c491dc3327d";
+ sha256 = "0jkfwammgzvfdhs4pg751rkljhrkmbyvqfs762i3smpqw95jqh2w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4e8f1217224514f9b048b7101c89e3b1a305821e/recipes/focus";
@@ -25706,12 +25811,12 @@
forth-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "forth-mode";
- version = "20170208.2305";
+ version = "20170527.1230";
src = fetchFromGitHub {
owner = "larsbrinkhoff";
repo = "forth-mode";
- rev = "2d30ca8eaaebbb9ee94aca46418ba4bb71ea2569";
- sha256 = "14v2vq71rj9byilzw04aky90h5fqn5bpv3xy742zbivn6msp2fxi";
+ rev = "522256d98d1a909983bcfd3ae20c65226d5929b6";
+ sha256 = "110ycl8zkimy2818rhp3hk3mn2y25m695shdsy6dwxnrv90agss6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e46832079ee34c655835f06bf565ad5a5ab48ebd/recipes/forth-mode";
@@ -26066,16 +26171,16 @@
fstar-mode = callPackage ({ company, company-quickhelp, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, quick-peek, yasnippet }:
melpaBuild {
pname = "fstar-mode";
- version = "20170504.2114";
+ version = "20170529.2340";
src = fetchFromGitHub {
owner = "FStarLang";
repo = "fstar-mode.el";
- rev = "f1ea9d9eb1c529f6a3859779d24718b4fc8ee7a1";
- sha256 = "0v4r3nczn8whi0drsqrm2zdq4lj0l95hbplqbr80z420y6xchasc";
+ rev = "75444875c86fdf33b1604b26100cf5399d6aec86";
+ sha256 = "0a8nb947xab72pcahjz11jilnzasldi0ywcaxwviv6z6k92j8k62";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/fstar-mode";
- sha256 = "1cjwai0qf48m18dsa0r9sh4qlgvdzg5ajfbmxxc2vqzcl5ygrxjx";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/c58ace42342c3d3ff5a56d86a16206f2ecb45f77/recipes/fstar-mode";
+ sha256 = "1kwa6gqh91265vpp4gcady2brkizfkfjj0gnya9lar6x7rn4gj7s";
name = "fstar-mode";
};
packageRequires = [
@@ -26098,8 +26203,8 @@
version = "20170107.626";
src = fetchgit {
url = "git://factorcode.org/git/factor.git";
- rev = "c1d6477c22df9cd0604c2b06aca919a53674bb78";
- sha256 = "1lz1bwgjvjijs3v2v6qyivzbz9jl7zx55n65hlsq0nq6limjd8bh";
+ rev = "5b1198e20cc5b7e748835040bd5331b4618c419f";
+ sha256 = "0gyy77zm8mfx4krrdzdpivmzrfx3kp89sw7wipqpx6g4a4ji6pgz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel";
@@ -26224,8 +26329,8 @@
src = fetchFromGitHub {
owner = "HIPERFIT";
repo = "futhark";
- rev = "f7b42f135db488dc449e18108bdde176937c6a8c";
- sha256 = "1wiwbpd0ssb07q0wlr5rj7wkwdfgff9s5d9fldpwvsyhad6p4dj2";
+ rev = "6a06fd8ce22d945edf6eb777d6b82f8859c5189f";
+ sha256 = "1jglv0f1lw5wf7xc9hmbgdbfn465qymp53wmy93k43k0zhg9nzpi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode";
@@ -26384,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";
@@ -26512,8 +26617,8 @@
src = fetchFromGitHub {
owner = "ahungry";
repo = "geben-helm-projectile";
- rev = "14db489efcb20c5aa9102288c94cec3c5a87c35d";
- sha256 = "1nd1jhy393vkn2g65zhygxkpgna0l8gkndxr8jb6qjkkapk58k8l";
+ rev = "31ce0faca5dcc71924884f03fd5a7a25d00ccd9b";
+ sha256 = "0a1srhwfbgkvndjfi9irg5s6snlxyqrw1vwyqg1sn8aqnbpgib04";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b7d28c45304a69e6ca78b3d00df2563171c027ee/recipes/geben-helm-projectile";
@@ -26571,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";
@@ -26697,12 +26802,12 @@
gh = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, logito, marshal, melpaBuild, pcache, s }:
melpaBuild {
pname = "gh";
- version = "20161119.2004";
+ version = "20170512.2049";
src = fetchFromGitHub {
owner = "sigma";
repo = "gh.el";
- rev = "6a76836a2ed1ebc3380dcfbe2b46786abf905fab";
- sha256 = "0anlavmfhm0ax6566sl9ih0j4v80s313n32d4yfp9lh4f1drp62k";
+ rev = "6efe3db1acb841c3366878baefc576caa2eb5e09";
+ sha256 = "0nchfzlnhzns1d6362yv5qa469qmgcvr15nx8ygcpw8ncf4pqjpw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/gh";
@@ -26739,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 = "50617fe41d382132472c3beec50749b21e21325c";
- sha256 = "1l2a7nab0d3w75qv30597ib5s4gfj0jghdjqfcjcr9267jz1yhs4";
+ rev = "8bfd542ad210debd00a0be9f15b21c90043b15d4";
+ sha256 = "04vjp5m25yyxhdzwc50g0qcggzhg1rs4kyj7d0ax0blfnqzggf2c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ghc";
@@ -26865,12 +26970,12 @@
ghub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ghub";
- version = "20170426.419";
+ version = "20170518.358";
src = fetchFromGitHub {
owner = "tarsius";
repo = "ghub";
- rev = "da60fa2316bf829cab18676afd5a43088ac06b60";
- sha256 = "0aj0ayh4jvpxwqss5805qnklqbp9krzbh689syyz65ja6r0r2bgs";
+ rev = "715dfef4a926228c059674bc68a16e27d4f539ee";
+ sha256 = "1y6crh3v3g7g0i225pcp9ff18pcfl5fnpc22yf4wcbf1if7pd2vs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9375cbae3ffe5bf4ba5606358860050f3005d9b7/recipes/ghub";
@@ -26883,6 +26988,27 @@
license = lib.licenses.free;
};
}) {};
+ ghub-plus = callPackage ({ apiwrap, emacs, fetchFromGitHub, fetchurl, ghub, lib, melpaBuild }:
+ melpaBuild {
+ pname = "ghub-plus";
+ version = "20170517.1445";
+ src = fetchFromGitHub {
+ owner = "vermiculus";
+ repo = "ghub-plus";
+ rev = "07bd117a77d2f2de88facfa18b839c5c8bd5a423";
+ sha256 = "04k3xvs33vv3g01ah16bc4l6f3ym4w16i9bk5q2s4f1xh4lad3jn";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/03a412fd25218ff6f302734e078a699ff0234e36/recipes/ghub+";
+ sha256 = "0xx7nwmjx3f7z6z164x1lb9arbb3m3d16mpn92v66w572rhbr34n";
+ name = "ghub-plus";
+ };
+ packageRequires = [ apiwrap emacs ghub ];
+ meta = {
+ homepage = "https://melpa.org/#/ghub+";
+ license = lib.licenses.free;
+ };
+ }) {};
gildas-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, polymode }:
melpaBuild {
pname = "gildas-mode";
@@ -27037,8 +27163,8 @@
src = fetchFromGitHub {
owner = "magit";
repo = "magit";
- rev = "d783e7b2427ed0c2d25895bcecc7190b9e953b97";
- sha256 = "04hbgbrfdv9jn86p0g9rw6yzfbgfbqxhiq7y9ncc4dm4vfmrli66";
+ rev = "7c833ba867dc27346e4e16975e107cc49e8494ca";
+ sha256 = "03w5aascvkx5ajj0zbi0934f4yzjjshz8733z3jw7g4qwhwfp18f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
@@ -27180,12 +27306,12 @@
git-lens = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "git-lens";
- version = "20170509.258";
+ version = "20170517.144";
src = fetchFromGitHub {
owner = "pidu";
repo = "git-lens";
- rev = "5999cbeb365930dcd56a7c44083bf3426c58e018";
- sha256 = "1k2kq2fqrlmgvkpngyxfh77ilg0pcjr160rhg0ml775i0jcvk3hy";
+ rev = "91bf19d6dd7368de5cad373a8155c48c4e254723";
+ sha256 = "1gszcsji3n42xpshz1pzyvlrd0hxjh14fr4n0ixqv2igk3fywxr3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/66fd7c0642e8e61b883d2030f88892d039380475/recipes/git-lens";
@@ -28484,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";
@@ -28547,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";
@@ -28690,12 +28816,12 @@
gotest = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild, s }:
melpaBuild {
pname = "gotest";
- version = "20170303.13";
+ version = "20170522.53";
src = fetchFromGitHub {
owner = "nlamirault";
repo = "gotest.el";
- rev = "30a31c14e5c83019ec4b31fd9913efaf9220b4b9";
- sha256 = "09pplr231ga3ic8i8jqxqi19ydjp6245spwraqymxqq5h1x94bfs";
+ rev = "c15bdcb78a46167e7a3fbaf5f71cbeddf2f13b78";
+ sha256 = "0pzzcjc41k3by534ii11jxfind4fq1cv3pqa3scisv4pvyj6lha6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0670b42c0c998daa7bf01080757976ac3589ec06/recipes/gotest";
@@ -28711,12 +28837,12 @@
gotham-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "gotham-theme";
- version = "20170426.1411";
+ version = "20170521.417";
src = fetchFromGitHub {
owner = "wasamasa";
repo = "gotham-theme";
- rev = "b939d0687ffdcc961f58af30178cee1981c72c4f";
- sha256 = "1inldaab0mzpv81zkfjy9kbwd89iclmdbgnwg790yympqaycpynf";
+ rev = "df428b477eb84f2ccd791c4310587cfd72644692";
+ sha256 = "0ph5h08cx61nh70hafmnqzdcxb799fss0pl2d36hhimkf866zvln";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4b388de872be397864a1217a330ba80437c287c0/recipes/gotham-theme";
@@ -28797,8 +28923,8 @@
src = fetchFromGitHub {
owner = "vmware";
repo = "govmomi";
- rev = "35caa01bfa4cbff15d06382021e2028bdf0a77ad";
- sha256 = "0j4xwlr1zlvhj6193nvqbfz5wmcr2dnmv2n6qsdyzfxk25z6ngc0";
+ rev = "67b13b52bd135469ede5b0caa4b1f79e19d228d0";
+ sha256 = "15mpcp8pyg22d9a81nxv7zbwiqipvz7xfllkrrwn9ggb0vp3bj2q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc";
@@ -28923,8 +29049,8 @@
src = fetchFromGitHub {
owner = "Groovy-Emacs-Modes";
repo = "groovy-emacs-modes";
- rev = "9849318762a1f495b3c8913e47256450c1854489";
- sha256 = "0f0h6syghw0kfqzway1f8hc0agrbdsdc68931bjprm7fm43dhrzw";
+ rev = "ee8ba955af9709e705664cb8847a2e91cca5bcb2";
+ sha256 = "1j40rcxjak45ybwj9v0dai7hn49vq33sfk3gq41ky7j2xqdz2kv7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode";
@@ -29304,12 +29430,12 @@
groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "groovy-mode";
- version = "20170503.148";
+ version = "20170529.46";
src = fetchFromGitHub {
owner = "Groovy-Emacs-Modes";
repo = "groovy-emacs-modes";
- rev = "9849318762a1f495b3c8913e47256450c1854489";
- sha256 = "0f0h6syghw0kfqzway1f8hc0agrbdsdc68931bjprm7fm43dhrzw";
+ rev = "ee8ba955af9709e705664cb8847a2e91cca5bcb2";
+ sha256 = "1j40rcxjak45ybwj9v0dai7hn49vq33sfk3gq41ky7j2xqdz2kv7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode";
@@ -29430,12 +29556,12 @@
gtk-pomodoro-indicator = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "gtk-pomodoro-indicator";
- version = "20170327.948";
+ version = "20170517.900";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "gtk-pomodoro-indicator";
- rev = "35da6b5eeb91ea2488e25be5d8200a060c88aea1";
- sha256 = "19q99bwdbii0qvk9lkr0z8iy1h131j69q4zwbjgwslj19vq12mn6";
+ rev = "0fa0e682b3bd1595f230275d73ca231e93c6d28a";
+ sha256 = "1jm7kcray6qd867hacyhs5c7hhdm0fyfa1jx35sh09g5c9xa4x2f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b98ec72605077f3b3f587713a681eb2144f29645/recipes/gtk-pomodoro-indicator";
@@ -29451,12 +29577,12 @@
guess-language = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "guess-language";
- version = "20170417.1359";
+ version = "20170521.404";
src = fetchFromGitHub {
owner = "tmalsburg";
repo = "guess-language.el";
- rev = "2bc0e1f9c8947b9b5ac8d792bd7f6d2c36d294ab";
- sha256 = "0nl9963m20cpfn3n50khbbmc1aas56q38xjjwiq01s8pmjvmcs6v";
+ rev = "65dccb18df4d0c766d516c5f1423994bae445b51";
+ sha256 = "0w189k3nnkzgh6gqw4zknhjykigym42rxjhcr5xl1b3h3mn0zz7j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6e78cb707943fcaaba0414d7af2af717efce84d0/recipes/guess-language";
@@ -29640,12 +29766,12 @@
hack-time-mode = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "hack-time-mode";
- version = "20170413.630";
+ version = "20170527.910";
src = fetchFromGitLab {
owner = "marcowahl";
repo = "hack-time-mode";
- rev = "79abe7652690186224ba22d1346d24e7603448f7";
- sha256 = "176zpdxsjydl7vvh2jhpbwsndzwzzyfhw6hpak16wj5b7rv9jj19";
+ rev = "73d6fcf8b39283526e5d4e3919193611e25a0898";
+ sha256 = "1w0idf28fhyn0qmjk1zgh80gzcrkgx5bc8mb0xamc20i53wpr4xl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6481dc9f487c5677f2baf1bffdf8f2297185345e/recipes/hack-time-mode";
@@ -30018,12 +30144,12 @@
haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "haskell-mode";
- version = "20170406.25";
+ version = "20170526.2107";
src = fetchFromGitHub {
owner = "haskell";
repo = "haskell-mode";
- rev = "90a352f0d23ffc46a626d512c1c76d70994e77a8";
- sha256 = "177r3vv9vh24bxara2wq4nrfi6yvfchi9syy8j5ridj2l3vzsxiz";
+ rev = "b0a5743f349e5e5b812291b5b06095aee1456656";
+ sha256 = "0ms4jf9zj2svyyh0rqbdbkx4rjll4rla7x5lzyiki7z27pf3c7df";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode";
@@ -30080,12 +30206,12 @@
hasky-extensions = callPackage ({ avy-menu, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "hasky-extensions";
- version = "20170426.1347";
+ version = "20170520.149";
src = fetchFromGitHub {
owner = "hasky-mode";
repo = "hasky-extensions";
- rev = "f1159dd640b54852beb6d3ef51b167e72f2c066b";
- sha256 = "15zjxiqd9akvr8v1id8i2qwb30393cskp1a20c8wlvh5y7i4fffp";
+ rev = "5a57a6401f6625640f46d8f8d540ecddf52bb12d";
+ sha256 = "1262kddcn3jr758s6wv15q3bh8j160q4m8nz2pbv2prabg0csz5n";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e3f73e3df8476fa231d04211866671dd74911603/recipes/hasky-extensions";
@@ -30287,12 +30413,12 @@
helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
melpaBuild {
pname = "helm";
- version = "20170510.853";
+ version = "20170527.2302";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm";
- rev = "ab8e6fa02968b0391d45c0003355a958335c0946";
- sha256 = "0ch05a4kiw7dbiffja5p019776pfk4g0i62vl2vpklpbnggxrfzx";
+ rev = "3396747e847a355b9cfbf7df1e851c507bd96381";
+ sha256 = "1x3b73l4yr2rf8czymxnhpnr7f74vhfybjkj8sp2slxhzjj4v644";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -30854,16 +30980,16 @@
helm-company = callPackage ({ company, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-company";
- version = "20170306.2113";
+ version = "20170519.2126";
src = fetchFromGitHub {
- owner = "manuel-uberti";
+ owner = "Sodel-the-Vociferous";
repo = "helm-company";
- rev = "f00df346098636650c4047394aa593d67b007859";
- sha256 = "03rcn9a3fbhcbh739xykjk94jg2sl4mj6y22knfwbh1hm1wymii3";
+ rev = "467617b68f43600e09ea6e3e7ad82cab08148fd1";
+ sha256 = "1akrc04xfsv3xjvj783mvmq20rch1igpzldd3ym4l343xrgbi69w";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/78ff0a6cf493ff148406140f3e4902bfafd83e4a/recipes/helm-company";
- sha256 = "1pbsg7zrz447siwd8pasw2hz5z21wa1xpqs5nrylhbghsk076ld3";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/8acf7420f2ac8a36474594bc34316f187b43d771/recipes/helm-company";
+ sha256 = "1wl1mzm1h9ig351y77yascdv4z0cka1gayi8cnnlayk763is7q34";
name = "helm-company";
};
packageRequires = [ company helm ];
@@ -30875,12 +31001,12 @@
helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "helm-core";
- version = "20170507.531";
+ version = "20170526.36";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm";
- rev = "ab8e6fa02968b0391d45c0003355a958335c0946";
- sha256 = "0ch05a4kiw7dbiffja5p019776pfk4g0i62vl2vpklpbnggxrfzx";
+ rev = "3396747e847a355b9cfbf7df1e851c507bd96381";
+ sha256 = "1x3b73l4yr2rf8czymxnhpnr7f74vhfybjkj8sp2slxhzjj4v644";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -31043,12 +31169,12 @@
helm-dired-history = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-dired-history";
- version = "20170321.2201";
+ version = "20170524.346";
src = fetchFromGitHub {
owner = "jixiuf";
repo = "helm-dired-history";
- rev = "9480383b6ccede6f7c200fbd50aaeb2898b3a008";
- sha256 = "0cfq06lray7hpnhkwnhjq18izyk2w0m4cxqg0m5nyidiwc4qssqa";
+ rev = "281523f9fc46cf00fafd670ba5cd16552a607212";
+ sha256 = "1bqavj5ljr350dckyf39i9plkb0rbhyd17ka94n2g6daapgpq0x6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-dired-history";
@@ -31127,12 +31253,12 @@
helm-emms = callPackage ({ cl-lib ? null, emacs, emms, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-emms";
- version = "20170510.755";
+ version = "20170517.1010";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm-emms";
- rev = "a00839beffc34f252dd4c75553e5a414577dd2ae";
- sha256 = "0pfb6b1g7wsj1yj75nm152d7n247zbzc9pg1nqb9x3cw7ln2dgpg";
+ rev = "b1c7d03e80c3012e327f0d518258508acf980c1c";
+ sha256 = "18fpsr6kaw2m1bvj05i5qayq6d01v54jw98489bgwshp9wmhsy9m";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/db836b671705607f6cd9bce8229884b1f29b4a76/recipes/helm-emms";
@@ -31904,12 +32030,12 @@
helm-ls-git = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-ls-git";
- version = "20170214.525";
+ version = "20170523.1149";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm-ls-git";
- rev = "7b7b6dc2554603ad98412927f84a803625069ab3";
- sha256 = "1s748a5abj58hd7cwzfggfnnmyzhj04gpbqqwqmskn8xlsq5qcdi";
+ rev = "61ee52a6b095a8cd1b23387e0eec58c93a7368be";
+ sha256 = "10g60rdbk46xr8kxcvvqnpha20vv38fj1qpc1872ycg3r911sa11";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b487b4c0db9092bb7e32aad9265b79a9d18c8478/recipes/helm-ls-git";
@@ -32155,12 +32281,12 @@
helm-org-rifle = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
melpaBuild {
pname = "helm-org-rifle";
- version = "20170509.1646";
+ version = "20170518.312";
src = fetchFromGitHub {
owner = "alphapapa";
repo = "helm-org-rifle";
- rev = "9570ee6ddf67ead1baafaf1128b6ea5069aa97df";
- sha256 = "0v93cmgnd4v6skkn7aag1x0z8pin0mr3myqaxi08knwz31j8s2r8";
+ rev = "61adb8ec3af0b7b87b2f9245510dc8b014d026ed";
+ sha256 = "05zqp6yifc87i22q0p37jl90cfyh5v1bq9ifhpkdy1rs3sgcmnif";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle";
@@ -32659,12 +32785,12 @@
helm-rtags = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, rtags }:
melpaBuild {
pname = "helm-rtags";
- version = "20170402.653";
+ version = "20170522.2154";
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "2abdfb2adf24b881cdd04e904ecb341bb51e8cb6";
- sha256 = "11f9sd8w7qqhfd6mxbihlc6mdki4lqyk4dwbi3v91k9hbxb9hlq2";
+ rev = "499db6f98cc725bca66d122bce571adcdfa32187";
+ sha256 = "10mgzyb3ccs781b7r37qfjw7ynhh9k8hqpahh9pcn3p462si341a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags";
@@ -33688,12 +33814,12 @@
highlight-indent-guides = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "highlight-indent-guides";
- version = "20170508.1133";
+ version = "20170516.1355";
src = fetchFromGitHub {
owner = "DarthFennec";
repo = "highlight-indent-guides";
- rev = "9614941bce44e16d0681ad1f3f87ca072582a325";
- sha256 = "1lw9pmykwswi0rg1y80v7ng29fdhymr4wn6k2p3q3yk78d9hi3m0";
+ rev = "b51744bde1287979f2d948f46501bd6ed0897f69";
+ sha256 = "17xbd1kiww762dibws48gwn682g1bxy5rb7np5alqhiiw1l13wdw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c8acca65a5c134d4405900a43b422c4f4e18b586/recipes/highlight-indent-guides";
@@ -33983,8 +34109,8 @@
src = fetchFromGitHub {
owner = "chrisdone";
repo = "hindent";
- rev = "a62a7d09912674842063239983995c3cb6e5b411";
- sha256 = "0cgwshmng2dnwfimrrpd4m4r74rj7v875wmlvpmxiak9idjgm6a9";
+ rev = "ea919ff276028b525688bcc09105943c584c0892";
+ sha256 = "08gd4dl7p0gxmlds1yw1a36902zgbrdcjzb6sp45yk1i4xqqg1az";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent";
@@ -34330,12 +34456,12 @@
hledger-mode = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, popup }:
melpaBuild {
pname = "hledger-mode";
- version = "20170416.111";
+ version = "20170525.748";
src = fetchFromGitHub {
owner = "narendraj9";
repo = "hledger-mode";
- rev = "f4244cbd773a20b887b937a2eafd1933d91a4d4d";
- sha256 = "1qv3v6x2ld518kg1f9ic3bz5y61jpqqzrlwlisd8jwx7cc8jvzic";
+ rev = "6dacb781f48bc818286d8a63bcb23a93991ed292";
+ sha256 = "0vgmms7z5rfhjjh2gszyaqdnfhx585mlmn8mp54rrz9zbnqy5qnd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hledger-mode";
@@ -35144,7 +35270,7 @@
}) {};
icicles = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
pname = "icicles";
- version = "20170409.1830";
+ version = "20170522.1503";
src = fetchurl {
url = "https://www.emacswiki.org/emacs/download/icicles.el?revision=1087";
sha256 = "00zsdahszs919zvklxgpm5kqhm2139cdr4acchgp9ppnyljs94jp";
@@ -35834,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";
@@ -36247,12 +36373,12 @@
importmagic = callPackage ({ emacs, epc, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "importmagic";
- version = "20170504.1725";
+ version = "20170519.2206";
src = fetchFromGitHub {
owner = "anachronic";
repo = "importmagic.el";
- rev = "135e049d763ceb4cabd0bab068c4c71452459065";
- sha256 = "1fzd3m0zwgyh3qmkhzcvgsgbnjv8nzy30brsbsa081djj5d2dagq";
+ rev = "a5505985086ce3c5bb3255ca10b140f3a5563e65";
+ sha256 = "1ikik8b99qkmfdcp6lqy0ivpb1wbav6vd0idvbd5qazkp9jj3qya";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/importmagic";
@@ -36328,22 +36454,29 @@
license = lib.licenses.free;
};
}) {};
- indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }:
+ indium = callPackage ({ company, emacs, exec-path-from-shell, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }:
melpaBuild {
pname = "indium";
- version = "20170504.117";
+ version = "20170524.651";
src = fetchFromGitHub {
owner = "NicolasPetton";
repo = "Indium";
- rev = "cf07e83d0f7357355d814ecdbe32aec3a5cc1eaf";
- sha256 = "1y7cb1pll81nnrq7d27pfm7kzmnxlbms184j8flnipag91h9dgqc";
+ rev = "07c3d444def957a05757a035dc178b8459822ee1";
+ sha256 = "1hbhkl7i1b09dhc9vc555xic8hsmlh8rjhvkcb09g372slikzxfa";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium";
sha256 = "024ljx7v8xahmr8jm41fiy8i5jbg48ybqp5n67k4jwg819cz8wvl";
name = "indium";
};
- packageRequires = [ company emacs js2-mode seq websocket ];
+ packageRequires = [
+ company
+ emacs
+ exec-path-from-shell
+ js2-mode
+ seq
+ websocket
+ ];
meta = {
homepage = "https://melpa.org/#/indium";
license = lib.licenses.free;
@@ -36373,12 +36506,12 @@
inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "inf-clojure";
- version = "20170509.1254";
+ version = "20170520.914";
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "inf-clojure";
- rev = "4e96e936a760c48d55f60b395a5ef65a69dd13cc";
- sha256 = "11q3j7pq178pv7l71l0vszwcbsn7rcl4x0qgx62vyj7k3mldvr26";
+ rev = "9ba23b0e8369a5dfa17e544288b366008516e6f9";
+ sha256 = "079hsk05isagcnj0fbdaxkaj8zfhrvm60zbz35id4101s4053frh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure";
@@ -36436,12 +36569,12 @@
inf-ruby = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "inf-ruby";
- version = "20170212.1444";
+ version = "20170515.1648";
src = fetchFromGitHub {
owner = "nonsequitur";
repo = "inf-ruby";
- rev = "af4f238ef4555521d13c5eb2fb8e818acf59d70a";
- sha256 = "1668dr6y0nph739x947kjz435qikg77m8ja7h6laf3f9wzcxcg9s";
+ rev = "81adadf0f98122b655d0c2bee9c8074d2b6a3ee2";
+ sha256 = "1r452h6cyypqlc59q8dx5smkwhck4qjcg1pf9qdw539cpva5q77z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/inf-ruby";
@@ -36728,12 +36861,12 @@
inline-docs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "inline-docs";
- version = "20170428.632";
+ version = "20170522.2150";
src = fetchFromGitHub {
owner = "stardiviner";
repo = "inline-docs.el";
- rev = "6bf47ce245de9603cbb0405084f733e5927d9fb0";
- sha256 = "10vlm92h97cx18my72jm72911c7j5ipl6ngrv3m6paz3bwklxdz1";
+ rev = "b57f1681be6147f999cdc12abff414a0442e8897";
+ sha256 = "0ji8qgscs4fxp2i29l3v8z9y6i2glga6bysbcsn855pqsn00xkcv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/inline-docs";
@@ -36895,12 +37028,12 @@
intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }:
melpaBuild {
pname = "intero";
- version = "20170506.1859";
+ version = "20170518.307";
src = fetchFromGitHub {
owner = "commercialhaskell";
repo = "intero";
- rev = "2db59100d2eff6bd9e34a0067c36fbab0d0ec72c";
- sha256 = "0q0h7fikp4v8m55ci3xfmqhzh5z1rpygc4idcpnvlzgc61a7kzgi";
+ rev = "4151177d17af8af58488398a4092e406bb93311d";
+ sha256 = "0q8qbg2j84vb4n2yyg279yprf9ssh0s6mi0gpmawjwvqp7f3rjdw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero";
@@ -37166,12 +37299,12 @@
irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
melpaBuild {
pname = "irony";
- version = "20170503.1447";
+ version = "20170523.618";
src = fetchFromGitHub {
owner = "Sarcasm";
repo = "irony-mode";
- rev = "823854936e8d228ab7350d0f1cf4801ed000f142";
- sha256 = "125qwy3zpxhckqmlbxd5s2ni7910xpkv8qgdrmcafk7ld2ipjvz9";
+ rev = "db29f5851cb75f30e0bd1840f60a9d7d0e0b6dc1";
+ sha256 = "0rynn8sknyp8f9m4qf1i6c017gl1il7rsgaifm0l77zh1bplha96";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony";
@@ -37228,10 +37361,10 @@
}) {};
isearch-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
pname = "isearch-plus";
- version = "20170321.1306";
+ version = "20170529.1907";
src = fetchurl {
url = "https://www.emacswiki.org/emacs/download/isearch+.el";
- sha256 = "0zdc45nmswipfi8vrsbfipzd1vg9y0pcggvi5mfpwf7c3qn4sgh2";
+ sha256 = "1lg8gciy9i44y80v9g2h5q8mg6dhi6abx2ssg6jws3nci0y5c0bl";
name = "isearch+.el";
};
recipeFile = fetchurl {
@@ -37456,12 +37589,12 @@
ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ivy";
- version = "20170501.1903";
+ version = "20170524.950";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "swiper";
- rev = "f565f76dfb3a31becc32c807916c011cde6c4e64";
- sha256 = "1dl39b4c7jij0gxdri2li6nkm7x73ljhbk0n1zwi6lw4xd7dix6p";
+ rev = "c93194941c1ac36ee762b70dc9061ee830769f6a";
+ sha256 = "0i75kyh3si8x6k0bqj1055kcp8zzbv05sps4flmwh59vn4j8paca";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy";
@@ -37498,12 +37631,12 @@
ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "ivy-erlang-complete";
- version = "20170424.2319";
+ version = "20170524.2010";
src = fetchFromGitHub {
owner = "s-kostyaev";
repo = "ivy-erlang-complete";
- rev = "906c31b679a4a676fe593a9620fbfc3707afb616";
- sha256 = "1sxz8cyr9i4nk5vrvf6qag8i7yrgqnxyhkilrqrmdyf6vw1vxgag";
+ rev = "2d93b1b0ec1705e449f2e0f43073aacc8f1e3242";
+ sha256 = "0lrnd5r9ycy2qqggqd0sr6b2w7s28yfm15pgyh0r0rjdxky4a5vm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete";
@@ -37565,8 +37698,8 @@
src = fetchFromGitHub {
owner = "abo-abo";
repo = "swiper";
- rev = "f565f76dfb3a31becc32c807916c011cde6c4e64";
- sha256 = "1dl39b4c7jij0gxdri2li6nkm7x73ljhbk0n1zwi6lw4xd7dix6p";
+ rev = "c93194941c1ac36ee762b70dc9061ee830769f6a";
+ sha256 = "0i75kyh3si8x6k0bqj1055kcp8zzbv05sps4flmwh59vn4j8paca";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra";
@@ -37624,12 +37757,12 @@
ivy-rich = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "ivy-rich";
- version = "20170227.1745";
+ version = "20170517.554";
src = fetchFromGitHub {
owner = "yevgnen";
repo = "ivy-rich";
- rev = "ba15a2fb46a63f0aaf5e5b4dae026c2e1228ec1a";
- sha256 = "1hkydyrcqv3qn605kjm8lhv2hpjmrjp7qvfxwyjbr878nhbm6jn0";
+ rev = "9c36765a941b88c3aa0f4739ad2cb7207c453575";
+ sha256 = "09m2m6nrgcpzyam50y3snir3dya1mif8c0miv77hkqa2w2ijxiq9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0fc297f4949e8040d1b0b3271c9a70c64887b960/recipes/ivy-rich";
@@ -37645,12 +37778,12 @@
ivy-rtags = callPackage ({ fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, rtags }:
melpaBuild {
pname = "ivy-rtags";
- version = "20170509.2100";
+ version = "20170522.2154";
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "2abdfb2adf24b881cdd04e904ecb341bb51e8cb6";
- sha256 = "11f9sd8w7qqhfd6mxbihlc6mdki4lqyk4dwbi3v91k9hbxb9hlq2";
+ rev = "499db6f98cc725bca66d122bce571adcdfa32187";
+ sha256 = "10mgzyb3ccs781b7r37qfjw7ynhh9k8hqpahh9pcn3p462si341a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags";
@@ -38214,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";
@@ -38569,8 +38702,8 @@
src = fetchFromGitHub {
owner = "Qquanwei";
repo = "auto-beautify.el";
- rev = "dd2e5940a07c5bb8e793f25e644def62c3426eed";
- sha256 = "0wqw9gj59n4bxb3zpr3ddaqzwl2rb8zk7zv5dkfrzzvy2rz10zxd";
+ rev = "180d15af7b5dfaab4ee1954cca2fdc797932f9de";
+ sha256 = "0xwkjq41v32dqc5gq8hcmcvdjg2y38xq6hkw5pja0kyvyk92c82d";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/js-auto-beautify";
@@ -38712,12 +38845,12 @@
js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "js2-mode";
- version = "20170503.1846";
+ version = "20170516.1643";
src = fetchFromGitHub {
owner = "mooz";
repo = "js2-mode";
- rev = "ca7df5bf9d0a76b77edfb6d6fe11e83965aa2cb3";
- sha256 = "14s4i150ri7x6360dr6n4gmyzfvwjrb4xck20wmfgyszys2h8ypd";
+ rev = "8a5f492c7ed427a3bdb1125e26a836e582bd2492";
+ sha256 = "1kaaa3gs1wm6834b1wd3nzl58vkbk7pcs53s2d93k12l5wzps8lp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode";
@@ -38733,12 +38866,12 @@
js2-refactor = callPackage ({ dash, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, multiple-cursors, s, yasnippet }:
melpaBuild {
pname = "js2-refactor";
- version = "20170315.1315";
+ version = "20170525.544";
src = fetchFromGitHub {
owner = "magnars";
repo = "js2-refactor.el";
- rev = "1f0ffe0a3948d7a610f20544c31de91fb08a8bb5";
- sha256 = "0rf2lagzw8qnglnmgq73np829j2i7n8hzz3y8d8ragkaz8gipsi1";
+ rev = "6ee315825b6f0424f15a8520733dc145c85ccd83";
+ sha256 = "14ykvbj5f9w5pk8l73k8niwr62slfx956px35zn51563sjs55gnd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8935264dfea9bacc89fef312215624d1ad9fc437/recipes/js2-refactor";
@@ -39275,12 +39408,12 @@
kaolin-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "kaolin-theme";
- version = "20170510.545";
+ version = "20170529.1516";
src = fetchFromGitHub {
owner = "0rdy";
repo = "kaolin-theme";
- rev = "13395f561028cefaf17f5026b2a0067f0c985a76";
- sha256 = "1hjpdsax55rvna1wh52pn8nc23s4z449d7g1v97cwfrhzz941v9x";
+ rev = "4b3dab02562eeadfb67ea07bc9f2c9d7b6be2d44";
+ sha256 = "1gqfpg2agf2ln8ca3qp14rwmh1blxrfwm1aai2n7bv2maz3b1lz9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d2abf9d914cdc210bbd47ea92d0dac76683e21f0/recipes/kaolin-theme";
@@ -39674,12 +39807,12 @@
kill-or-bury-alive = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "kill-or-bury-alive";
- version = "20170501.1356";
+ version = "20170518.2358";
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "kill-or-bury-alive";
- rev = "3292602a137a2708463dbe4a7d6f4b4f54f8714f";
- sha256 = "0jxbnk6r2qrdbvwvvf30ib1irbwfazrpn04qidrljipvvbw4kq4m";
+ rev = "51daf55565034b8cb6aa3ca2aa0a827e31751041";
+ sha256 = "1qbdxjni1brhsw6m4cvd2jjaf3y8v3fkbxxf0pvsb089mkpi7mpq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/25016ed09b6333bd79b989a8f6b7b03cd92e08b3/recipes/kill-or-bury-alive";
@@ -39783,8 +39916,8 @@
src = fetchFromGitHub {
owner = "kivy";
repo = "kivy";
- rev = "fa1e0b28340ef6d9e0a7cf4629986afb25d58c0c";
- sha256 = "0rfh15j1s4hda37gvblyflbb4fs5aqnwfwbd18dp8n552v85483y";
+ rev = "b7906e7456383c39555cd988f410043dbcca47a1";
+ sha256 = "1ifzx2z48l1g1livnmhngnaf875fgnnmv1p79j2w10xjwkasvff4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode";
@@ -39863,12 +39996,12 @@
kodi-remote = callPackage ({ elnode, fetchFromGitHub, fetchurl, json ? null, let-alist, lib, melpaBuild, request }:
melpaBuild {
pname = "kodi-remote";
- version = "20170410.958";
+ version = "20170512.950";
src = fetchFromGitHub {
owner = "spiderbit";
repo = "kodi-remote.el";
- rev = "76603f29cbaf316d72c858afeb3d7ce17e195dba";
- sha256 = "1j9y678ddpbi6jcnn9yb3bw97kwqgx1k9d172fa324m2iqylrfiq";
+ rev = "fe750b9f71e9970e2f1331aabc31d7b6dc8a41d2";
+ sha256 = "1w05yp3qwrpdb43h4iz4mkn92bsqbx137a83qyz6vgl95rpj7b9j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/08f06dd824e67250afafdecc25128ba794ca971f/recipes/kodi-remote";
@@ -39968,12 +40101,12 @@
kotlin-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "kotlin-mode";
- version = "20170403.826";
+ version = "20170522.1524";
src = fetchFromGitHub {
owner = "Emacs-Kotlin-Mode-Maintainers";
repo = "kotlin-mode";
- rev = "e5c6d845e689ed0623b864ff863cc99ca558b442";
- sha256 = "0add2vi13caxgcxgl2yxdjccjmszs0918jm70084ry3iih8ljl37";
+ rev = "e5ee4c4bd25a61e0f5067ca8939d1a3185909471";
+ sha256 = "1sfl4cz2ll5vvzzmg3cr8gpcbg0rmnd8dvmbvphb80gc8qacnd7s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9f2560e913b215821221c96069a1385fe4e19c3e/recipes/kotlin-mode";
@@ -40052,12 +40185,12 @@
kubernetes = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
melpaBuild {
pname = "kubernetes";
- version = "20170508.337";
+ version = "20170523.1517";
src = fetchFromGitHub {
owner = "chrisbarrett";
repo = "kubernetes-el";
- rev = "52223c7c09f709fb4897283fbc3bf7561e86f5d2";
- sha256 = "1h5sryzb945pk46zlalsssc63nwjvnx9qhdz5ssfm1jr96ci3m2y";
+ rev = "560b65baef1c4f2bedffd8e767774b55dfc35594";
+ sha256 = "0n9msgawac0jbid671nfr8c5z1zw89wnfw021igxaqwqrl3438rw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/16850227ea48f6f38102b9cdf80e0758766a24d2/recipes/kubernetes";
@@ -40073,12 +40206,12 @@
kubernetes-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, kubernetes, lib, melpaBuild }:
melpaBuild {
pname = "kubernetes-evil";
- version = "20170505.251";
+ version = "20170523.1517";
src = fetchFromGitHub {
owner = "chrisbarrett";
repo = "kubernetes-el";
- rev = "52223c7c09f709fb4897283fbc3bf7561e86f5d2";
- sha256 = "1h5sryzb945pk46zlalsssc63nwjvnx9qhdz5ssfm1jr96ci3m2y";
+ rev = "560b65baef1c4f2bedffd8e767774b55dfc35594";
+ sha256 = "0n9msgawac0jbid671nfr8c5z1zw89wnfw021igxaqwqrl3438rw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/16850227ea48f6f38102b9cdf80e0758766a24d2/recipes/kubernetes-evil";
@@ -40323,12 +40456,12 @@
latex-math-preview = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "latex-math-preview";
- version = "20160321.2159";
+ version = "20170522.1455";
src = fetchFromGitLab {
owner = "latex-math-preview";
repo = "latex-math-preview";
- rev = "2c7a526a4e46f7154befc9009b131dfbab22ac03";
- sha256 = "0cxmvadkiqhvhmvmx3vvwxasw7wll8abhviss7wgizwqf4i2p3v4";
+ rev = "775887a89447dd19541b121161cc02e9799d0d3a";
+ sha256 = "1mp6bpl8992pi40vs6b86q922h4z8879mrjalldv5dyz57ym5fsq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9e413b7684e9199510b00035825aa861d670e072/recipes/latex-math-preview";
@@ -40553,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";
@@ -40809,8 +40942,8 @@
src = fetchFromGitHub {
owner = "rvirding";
repo = "lfe";
- rev = "69a2d1d410220a688ad169366d0d20e138e264f6";
- sha256 = "0ky6dcvqprmaww5503q2y42vz5qls844xvb7yx2sl3czlm47riy0";
+ rev = "c6422663ab03a3d8e9bee6413890d0fe93bc9556";
+ sha256 = "0lx5lxlql9pxgjqidb2k850i36qgx97jx15b24vv2s2l9f1skrw2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode";
@@ -41124,12 +41257,12 @@
lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }:
melpaBuild {
pname = "lispy";
- version = "20170510.925";
+ version = "20170515.855";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "lispy";
- rev = "aa5b20f69180a09da16c66bb05a18eeaef3c2668";
- sha256 = "1rdxrwg5b415ag22zdfmf9af86cpnm9ji2vyw30w799dnsaxv0zh";
+ rev = "5306bb969047cb12b0fd4c6804198afb719acdb3";
+ sha256 = "0lgjxaic8vwxhzm2w0prrydlz0fchk3bwvf0i9j96pi6x227b066";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy";
@@ -41166,12 +41299,12 @@
lispyville = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, lispy, melpaBuild }:
melpaBuild {
pname = "lispyville";
- version = "20170205.1833";
+ version = "20170515.807";
src = fetchFromGitHub {
owner = "noctuid";
repo = "lispyville";
- rev = "3ba91c5908484188971e952d98256139123c4cbe";
- sha256 = "15zfpa2bd80537vcmlp4i39rpxvn6396wynh7sa9yiwrnq246sj6";
+ rev = "92e22ed9f70e0ae2c68736fc8d91240af36102e1";
+ sha256 = "0gz9z6dsslrx8fgzgy98y3mcpcs00k10hygrw8rbrdf2q8k2xpcg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b5d96d3603dc328467fcce29d3ac1b0a02833d51/recipes/lispyville";
@@ -41459,12 +41592,12 @@
live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "live-py-mode";
- version = "20170429.2207";
+ version = "20170528.2030";
src = fetchFromGitHub {
owner = "donkirkby";
repo = "live-py-plugin";
- rev = "4be2360a693b41da84a3f38dce52fdcd183442e4";
- sha256 = "0r8cmk6lybnp8ggfhq5wabs0jdgvvxmbl370r3sfx8njz5c2hv3v";
+ rev = "5a04d426b33566027fdf5fd3090dfd315fda7314";
+ sha256 = "073cqwy2iw9ynrdbb8r9n4rnkk9j8zba91872sx2gyp47xkq6pjk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode";
@@ -41563,12 +41696,12 @@
load-relative = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "load-relative";
- version = "20160716.438";
+ version = "20170526.310";
src = fetchFromGitHub {
owner = "rocky";
repo = "emacs-load-relative";
- rev = "8280df5ce6db836559a5c2442b97a2f02b6f7a05";
- sha256 = "0jzq3vpdq5cw5nh2l2pvj0y3lnvjff2wyy6ip2z9n6xcjjdnzki9";
+ rev = "738896e3da491b35399178ed2c6bc92cc728d119";
+ sha256 = "1rpy5mfncncl6gqgg53d3g25g1700g4b9bivd4c0cfcv5dbxhp73";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f052f201f7c308325c27cc2423e85cf6b9b67b4e/recipes/load-relative";
@@ -41751,12 +41884,12 @@
logstash-conf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "logstash-conf";
- version = "20150308.518";
+ version = "20170524.1229";
src = fetchFromGitHub {
owner = "Wilfred";
repo = "logstash-conf.el";
- rev = "60a06ad1ceb6699cef849e9f2e8255f7816ca5de";
- sha256 = "05px3zc3is7k2jmh7mal0al5zx5cqvn1bzmhgqq02pp6lwsx5xqa";
+ rev = "4e127f9aec190786613445aa88efa307ff7c6748";
+ sha256 = "119yb1wk1n5ycfzgpffcwy7yx8ar8k1gza0gvbq3r61ha5a9qijs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/logstash-conf";
@@ -41772,12 +41905,12 @@
logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "logview";
- version = "20170414.1223";
+ version = "20170518.428";
src = fetchFromGitHub {
owner = "doublep";
repo = "logview";
- rev = "aa996ca1df79701e59a6ab0b324adc8b11531563";
- sha256 = "0mjb2806hkvy8xqkwabfwp29q4gnc719zdc0gjq74xblbrx5f90x";
+ rev = "c85f0527664538ac9d59bbac9bea40c207c8b9d5";
+ sha256 = "1gnia7vkhdh116b7hyxnrnkjnqliqsy5zskn43wjhfw6swf0ipxn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview";
@@ -41961,12 +42094,12 @@
lsp-java = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }:
melpaBuild {
pname = "lsp-java";
- version = "20170506.213";
+ version = "20170522.633";
src = fetchFromGitHub {
owner = "emacs-lsp";
repo = "lsp-java";
- rev = "fc30a0606e48049f14d750e3478d1765921424f7";
- sha256 = "09vbj8v77samb4r4dl6ib566z4s1angrh2kgymcc5pi23cxhchkm";
+ rev = "5c58fc74872e318b2894f11331bec8f699f34c77";
+ sha256 = "0b6n1hlhzqqnih26f412ag77dz5bc550ma9ijcbs0n3vbd5z45hs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-java";
@@ -42028,8 +42161,8 @@
src = fetchFromGitHub {
owner = "emacs-lsp";
repo = "lsp-rust";
- rev = "ec2a89f901726fee61a5587b09c237615ee8b25a";
- sha256 = "16ihil3gsvlwbg9hjjl9sp6y7d7zm4k9zhrb61z5biwfxh49a6in";
+ rev = "bd9b1f5d9195067decc496e61ad383d615b7f054";
+ sha256 = "1nai41wv3wfxx2lslkpm0qas73j6hachiqwbvhvvcfz34h9nnc5l";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-rust";
@@ -42337,12 +42470,12 @@
magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
melpaBuild {
pname = "magit";
- version = "20170508.936";
+ version = "20170528.740";
src = fetchFromGitHub {
owner = "magit";
repo = "magit";
- rev = "d783e7b2427ed0c2d25895bcecc7190b9e953b97";
- sha256 = "04hbgbrfdv9jn86p0g9rw6yzfbgfbqxhiq7y9ncc4dm4vfmrli66";
+ rev = "7c833ba867dc27346e4e16975e107cc49e8494ca";
+ sha256 = "03w5aascvkx5ajj0zbi0934f4yzjjshz8733z3jw7g4qwhwfp18f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit";
@@ -42537,8 +42670,8 @@
src = fetchFromGitHub {
owner = "magit";
repo = "magit";
- rev = "d783e7b2427ed0c2d25895bcecc7190b9e953b97";
- sha256 = "04hbgbrfdv9jn86p0g9rw6yzfbgfbqxhiq7y9ncc4dm4vfmrli66";
+ rev = "7c833ba867dc27346e4e16975e107cc49e8494ca";
+ sha256 = "03w5aascvkx5ajj0zbi0934f4yzjjshz8733z3jw7g4qwhwfp18f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup";
@@ -42635,22 +42768,22 @@
license = lib.licenses.free;
};
}) {};
- magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit, melpaBuild, s, with-editor }:
+ magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub-plus, lib, magit, melpaBuild, s }:
melpaBuild {
pname = "magithub";
- version = "20170214.1710";
+ version = "20170516.612";
src = fetchFromGitHub {
owner = "vermiculus";
repo = "magithub";
- rev = "0b5207f3097dee40feefea916cdf211734c9fe32";
- sha256 = "143iwmga1ypa6v9086pcfr3n5jvaf1dl9czlld5y7npm4r0pxnbr";
+ rev = "7fd7343c3c87df56c7c7dd6c41a80b14291b1ac4";
+ sha256 = "0a0q94lvk0rzj4r7hchypp197rj561d2a28jfzrfvvhq6x9vb4im";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/magithub";
sha256 = "11par5rncsa866gazdw98d4902rvyjnnwbiwpndlyh06ak0lryab";
name = "magithub";
};
- packageRequires = [ emacs git-commit magit s with-editor ];
+ packageRequires = [ emacs ghub-plus magit s ];
meta = {
homepage = "https://melpa.org/#/magithub";
license = lib.licenses.free;
@@ -42848,12 +42981,12 @@
malinka = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, rtags, s }:
melpaBuild {
pname = "malinka";
- version = "20170421.906";
+ version = "20170523.1007";
src = fetchFromGitHub {
owner = "LefterisJP";
repo = "malinka";
- rev = "5207995089020ff0e8ea2f1fe4628c61de7eb7d5";
- sha256 = "1ikhy7yyl65j7aw1yyhfi8bz2p4p8s8f2cmzsa6ld0gmvjw6cl5s";
+ rev = "9a546487f9de5dd7277de34756499560579c2568";
+ sha256 = "06ikk9yapq5j401fql29vl3w06xwci2437narf0pjhnnzvnidiw0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/malinka";
@@ -42995,12 +43128,12 @@
mandoku = callPackage ({ fetchFromGitHub, fetchurl, git, github-clone, lib, magit, melpaBuild, org }:
melpaBuild {
pname = "mandoku";
- version = "20170508.27";
+ version = "20170514.1827";
src = fetchFromGitHub {
owner = "mandoku";
repo = "mandoku";
- rev = "0e733fdaea77150539455656c2e6af08d19611b0";
- sha256 = "0sfyxdb3pnsdygk832w7mpxps1gwqaa0fqk2qrzqgl61yjlfvnd6";
+ rev = "1bdcbcb42248d67029b0288c8572372fc1cafb29";
+ sha256 = "1g4vgybkqn8bf95dl0gxd68lv4gw69bxms75s6k85i665fa2njal";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1aac4ae2c908de2c44624fb22a3f5ccf0b7a4912/recipes/mandoku";
@@ -43142,12 +43275,12 @@
markdown-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "markdown-mode";
- version = "20170510.1137";
+ version = "20170526.1213";
src = fetchFromGitHub {
owner = "jrblevin";
repo = "markdown-mode";
- rev = "c9cb29b2e0caa516bf0fc33e0ec6682d4c837445";
- sha256 = "0bnpsbldpc7c0g5xlj9jrz5lziab54vwqyg3pkfsjilsxg24wwds";
+ rev = "e9bb47d8d87ae8205ed935a3b485e12c12e43aa9";
+ sha256 = "1lccxj18zhhhrc87dzm8fd4989pgkvbfkrlp53bjbrzzkh9bd6vs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/74610ec93d4478e835f8b3b446279efc0c71d644/recipes/markdown-mode";
@@ -43380,12 +43513,12 @@
mastodon = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mastodon";
- version = "20170505.1201";
+ version = "20170518.1031";
src = fetchFromGitHub {
owner = "jdenen";
repo = "mastodon.el";
- rev = "4d0bd43c0ede0159c0f0130a5565ea5a6511997a";
- sha256 = "0l0n9l7j4inwyd4z8yvf9bi3cmq6ba5dm90lwzqx8hykwdh8ghi7";
+ rev = "a9e595142eee69fe84f0ab06f7fde76cef27cdac";
+ sha256 = "1wgx8i6ww9w99f0f62p7v626bb6pvdg04hnhqyjgsmb99wzwlpk7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/809d963b69b154325faaf61e54ca87b94c1c9a90/recipes/mastodon";
@@ -43713,12 +43846,12 @@
meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
melpaBuild {
pname = "meghanada";
- version = "20170426.1921";
+ version = "20170525.2333";
src = fetchFromGitHub {
owner = "mopemope";
repo = "meghanada-emacs";
- rev = "54be7c38ceeb7de4bd926a577f9920e174534b37";
- sha256 = "0apqxpkngyygfdj1wnqs5fl87bfbb4m5vis9cv8q3fcq92yhjqa1";
+ rev = "71e28b98653ff269a30ddf32d8ecef43a8656d76";
+ sha256 = "0wrxriqg3dn90za52pzsmvqaszkqmx0xmxkzghlq8s21xc21kznp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
@@ -44000,27 +44133,6 @@
license = lib.licenses.free;
};
}) {};
- metafmt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "metafmt";
- version = "20160221.855";
- src = fetchFromGitHub {
- owner = "lvillani";
- repo = "metafmt";
- rev = "b624ba1ac46cdbeddb0cfe920dd44dcab3fdb529";
- sha256 = "1r4v06pyi7y7gp3w0p3xfz8hf807p7i4frgws54naagzihww06y6";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/7a53f740fb7a58cd6339b301d0de8c543b61f6a5/recipes/metafmt";
- sha256 = "1ca102al7r3k2g92b4jkqv53crnmxy3z7cz31w1rprf41s69mn75";
- name = "metafmt";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/metafmt";
- license = lib.licenses.free;
- };
- }) {};
metalheart-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "metalheart-theme";
@@ -44667,12 +44779,12 @@
mmt = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mmt";
- version = "20170501.1359";
+ version = "20170519.4";
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "mmt";
- rev = "d62725f173b886e4ef80844ec97192157e8529d2";
- sha256 = "041a9jnk0k6ai8gv0vvhxpjqwzw199xhq8mgwa4bafp0afpa8xzg";
+ rev = "1d89502ea4b0f6a7da327a95f104f5c11e662493";
+ sha256 = "1pqarm9gpzc5qyiqr2713q1xn1p20kl5shrmm77m150z4qfhxzhx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d1137bb53ecd92b1a8537abcd2635602c5ab3277/recipes/mmt";
@@ -44751,12 +44863,12 @@
mocha = callPackage ({ f, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
melpaBuild {
pname = "mocha";
- version = "20170320.1128";
+ version = "20170513.1501";
src = fetchFromGitHub {
owner = "scottaj";
repo = "mocha.el";
- rev = "55f1e6afd100891ffd7008f5c5efbc5a9ab1c22d";
- sha256 = "1jqygkn02vawynfnymvnjnglj7gscfinwyk7vbkbh2dp932wsl02";
+ rev = "dbda778badb8f33c9ed816b927710ef6d0123cf5";
+ sha256 = "1jvczadgkq2b8gxjg2pllg3qjr1ymnc9kjjgvyi7v91vb7h51yii";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/39c26134ba95f277a4e9400e506433d96a695aa4/recipes/mocha";
@@ -44814,12 +44926,12 @@
modalka = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "modalka";
- version = "20170501.1417";
+ version = "20170519.32";
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "modalka";
- rev = "1a26f1f032f725481dfab6298a1570f408eb9307";
- sha256 = "12c1lxxhx4darcd2dl3halgr4k27zqwkrh5i8na3spay2qfxl3bx";
+ rev = "f2b2e206105332620b97c1f3bfd6cb03469db98f";
+ sha256 = "09wg7hbigk3084nvjw0ikfs9hgdp1ip0spmrsx70iq18xgv5fm37";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fa0a02da851a603b81e183f461da55bf4c71f0e9/recipes/modalka";
@@ -45083,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";
@@ -45125,12 +45237,12 @@
monroe = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "monroe";
- version = "20170507.653";
+ version = "20170522.632";
src = fetchFromGitHub {
owner = "sanel";
repo = "monroe";
- rev = "9f5e0a226a40f0e9775ab351d33dfe9b841f7a25";
- sha256 = "145m0lh9jypg26qdnpqj6480gk2g5g1qjzj7gz6fpgdj6940sip5";
+ rev = "1705eca01924210504d4270af7dab57278194875";
+ sha256 = "19yca80zghb9zmyqdq155743plzzjghkfbi9zb5z8x2fvppixvwn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/590e5e784c5a1c12a241d90c9a0794d2737a61ef/recipes/monroe";
@@ -45331,12 +45443,12 @@
move-dup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "move-dup";
- version = "20161026.742";
+ version = "20170513.1911";
src = fetchFromGitHub {
owner = "wyuenho";
repo = "move-dup";
- rev = "612f5b3faa5bc36f7403b6fac7a1a524ae146f37";
- sha256 = "0xiwlqhhx9aqj4059srp04zw1nksf8crp1z1wcfn4516f8mxs66p";
+ rev = "dae61de7aa5e2bf56a7bab1fa36fa3a39520a3c0";
+ sha256 = "1mrrxx2slxi1qgf483nnxv3y8scfsc844sfnzn4b7hjpfpali0r8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3ea1f7f015a366192492981ff75672fc363c6c18/recipes/move-dup";
@@ -45377,8 +45489,8 @@
src = fetchFromGitHub {
owner = "retroj";
repo = "mowedline";
- rev = "67ca629b4bc3063ea19a7fccc693432a4eb10021";
- sha256 = "0i06ms5m7qhv2m1mmgzqh73j9wz3nxygz65p6vsnicxas09w70rd";
+ rev = "5c848d79c9eba921df77879bb7b3e6b97b9bccb2";
+ sha256 = "1dmfks09yd4y7p1sidr39a9c6gxby47vdv8pwy1hwi11kxd6zbwf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/86f7df6b8df3398ef476c0ed31722b03f16b2fec/recipes/mowedline";
@@ -45583,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";
@@ -46791,12 +46903,12 @@
neon-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "neon-mode";
- version = "20160811.216";
+ version = "20170529.637";
src = fetchFromGitHub {
owner = "Fuco1";
repo = "neon-mode";
- rev = "370212fa9ffcba3ff542a154d17ccf5be1066c4c";
- sha256 = "13a760jidh00czl05c0pnpbxzr7smrkf5ms9kd3h1cq613ffapby";
+ rev = "69edc4b051604143db8e044606bbcc0904a3829c";
+ sha256 = "09753w4psyzh583264nswk9313d9yh5s4aad3jc9qq5mg6ycb6iy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c6b2a4898bf21413c4d9e6714af129bbb0a23e1a/recipes/neon-mode";
@@ -46812,12 +46924,12 @@
neotree = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "neotree";
- version = "20170507.1711";
+ version = "20170522.758";
src = fetchFromGitHub {
owner = "jaypei";
repo = "emacs-neotree";
- rev = "5e1271655170f4cdc6849258e383c548a4e6e3d0";
- sha256 = "0hx72fq10772bbyqrj7mhhp02k26cccjxdadiqm1ykainhfmn1x0";
+ rev = "bc98dfb44c106375efa4f26848f3790ee264da97";
+ sha256 = "1m30ldbprz3f62szyi1alzjy337ryczljxy1z5lf6smb03ymns2s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9caf2e12762d334563496d2c75fae6c74cfe5c1c/recipes/neotree";
@@ -46959,12 +47071,12 @@
nginx-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "nginx-mode";
- version = "20170213.1326";
+ version = "20170524.1812";
src = fetchFromGitHub {
owner = "ajc";
repo = "nginx-mode";
- rev = "b58708d15a6659577945c0aa3a63983eebff2e67";
- sha256 = "0y2wwgvm3495h6hms425gzgi3qx2wn33xq6b7clrvj4amfy29qix";
+ rev = "9e25e1f696087c412a45fe004b98b9345f610767";
+ sha256 = "0hjvbjwsk64aw63k4wcizpqiqq6d8s4qwzfvvsdbm3rx743zgzsz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a6da3640b72496e2b32e6ed21aa39df87af9f7f3/recipes/nginx-mode";
@@ -47040,26 +47152,6 @@
license = lib.licenses.free;
};
}) {};
- nikola = callPackage ({ async, emacs, fetchgit, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "nikola";
- version = "20170301.1148";
- src = fetchgit {
- url = "https://git.daemons.cf/drymer/nikola.el/";
- rev = "6752cc70b08889ff5184ac111616863f1881d357";
- sha256 = "0cwn05q0fj6xddfc5qimryvqi5l68sqyxvw638vzmrpnzl6dfc9h";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/89354d06dddc3be4b952e3f0b86d11824064dd97/recipes/nikola";
- sha256 = "1i6z4gkh52fr9s506dqr3ccczank7c8zr0q1bg8ik5gbna0jv705";
- name = "nikola";
- };
- packageRequires = [ async emacs ];
- meta = {
- homepage = "https://melpa.org/#/nikola";
- license = lib.licenses.free;
- };
- }) {};
nim-mode = callPackage ({ commenter, emacs, epc, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }:
melpaBuild {
pname = "nim-mode";
@@ -47109,8 +47201,8 @@
src = fetchFromGitHub {
owner = "martine";
repo = "ninja";
- rev = "586bb6daef38b3657ba917eb3d7f07ba80c72cd7";
- sha256 = "0qs73q4d83f6xiz1zdpmln8lzgi78h4indha7r783rx07crvvxw6";
+ rev = "d6eb8baf8130ab93140395dceca363774092135d";
+ sha256 = "02dwb8xv4rz08wigr6im8rdfjjlhrpf620a7faq1ka2gn41hv1qv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/aed2f32a02cb38c49163d90b1b503362e2e4a480/recipes/ninja-mode";
@@ -47151,8 +47243,8 @@
src = fetchFromGitHub {
owner = "NixOS";
repo = "nix";
- rev = "1fd59447d56a88add8874f9a8b0885a1acd13606";
- sha256 = "042pabfg6ssc1fr0zzflsnrbfnj64a5j90nnzrdvpy2jilgb04jw";
+ rev = "6e01ecd112dce8d8bbe46c839f982892a3ffb589";
+ sha256 = "1gxsp2xf8lcqwk0f842g9cimc6k12cpf0m4rs0qv3v3mqqic985n";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode";
@@ -47273,12 +47365,12 @@
no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "no-littering";
- version = "20170426.404";
+ version = "20170515.1945";
src = fetchFromGitHub {
owner = "tarsius";
repo = "no-littering";
- rev = "e041942cb0f4f02d00cf30afb956208496562ba4";
- sha256 = "00d6fz5kg2k6py5mj2h9rzbqa4gkiv02h9ba55psfgbnmak6ip0v";
+ rev = "4bb6640ddc4c9453318133e777f09ca5c429d057";
+ sha256 = "0m0grzppcnk447ysyh03dw6nz6vhdnihgf7s4rlqcy0b4qb7fmxw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering";
@@ -47459,11 +47551,11 @@
}) {};
notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
pname = "notmuch";
- version = "20170420.258";
+ version = "20170530.454";
src = fetchgit {
url = "git://git.notmuchmail.org/git/notmuch";
- rev = "11d47950c18f2d19718e35b7264dabf2ff2fd621";
- sha256 = "0arfwk0aycp39451z8a5xv5rhdy40avyczqv7v69sla4kxw04rik";
+ rev = "51cf6dbab220ca0f7c9f7472280adf02189ba437";
+ sha256 = "1ixdrg3ak0x8rnkckz392s91dhssrsh9hcg30606fhjd9nk811a5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
@@ -47519,12 +47611,12 @@
noxml-fold = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "noxml-fold";
- version = "20160707.847";
+ version = "20170520.545";
src = fetchFromGitHub {
owner = "paddymcall";
repo = "noXML-fold";
- rev = "4cf3628004ad872fb44943aab5274a45e22ea430";
- sha256 = "0i4fyxkwp2yksz8d4x309q8imab8gz59vcw64k9y1kzylcnxci0i";
+ rev = "41cd645531783982e03cb1af2fc2acd59c88f6cb";
+ sha256 = "1bpakbwcs6qilx0j24xg01yarkyvv8wvcf6j5kxqmls3hq23i47s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/13d2af88b292293cb5ab50819c63acfe936630c8/recipes/noxml-fold";
@@ -47642,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";
@@ -47729,12 +47842,12 @@
nvm = callPackage ({ dash, dash-functional, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "nvm";
- version = "20151113.55";
+ version = "20170513.1501";
src = fetchFromGitHub {
owner = "rejeep";
repo = "nvm.el";
- rev = "d6c7ad048f1d2854ec3c043d80528857aa1090a8";
- sha256 = "0prag0ks511ifa5mdpqmizp5n8190dxp4vdr81ld9w9xv7migpd7";
+ rev = "61590e7fdeb19b1d866d26e48aef1af4767e5709";
+ sha256 = "04z8zkgp0km575ijijpvmrqs0aa2f0878c5n4rl91hs1grq93mjf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/nvm";
@@ -47893,6 +48006,27 @@
license = lib.licenses.free;
};
}) {};
+ ob-blockdiag = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "ob-blockdiag";
+ version = "20170524.1605";
+ src = fetchFromGitHub {
+ owner = "corpix";
+ repo = "ob-blockdiag.el";
+ rev = "715e7d41124a98d3f1e38e430e3a7f31b52704e4";
+ sha256 = "0mqi9hm00apq43mmabai05x96q4x0l29n9gvdhphzjrhvjabmm6l";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/261b77a3fd07644d1c250b16857de70cc1bbf478/recipes/ob-blockdiag";
+ sha256 = "1lmawbgrlp6qd7p664jcl98y1xd2yqw9np6j52bh9i6s3cz6628g";
+ name = "ob-blockdiag";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/ob-blockdiag";
+ license = lib.licenses.free;
+ };
+ }) {};
ob-browser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "ob-browser";
@@ -48439,6 +48573,27 @@
license = lib.licenses.free;
};
}) {};
+ ob-uart = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "ob-uart";
+ version = "20170521.158";
+ src = fetchFromGitHub {
+ owner = "andrmuel";
+ repo = "ob-uart";
+ rev = "90daeac90a9e75c20cdcf71234c67b812110c50e";
+ sha256 = "1syxxq411izmyfrhlywasax7n5c3yjy487mvfdjzjg8csmmk0m9v";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/5334f1a48b8ea6b7a660db27910769093c76113d/recipes/ob-uart";
+ sha256 = "1dkbyk8da0zw784dgwi8njnz304s54341dyfzvlb0lhcn41dmkz7";
+ name = "ob-uart";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/ob-uart";
+ license = lib.licenses.free;
+ };
+ }) {};
oberon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "oberon";
@@ -48933,8 +49088,8 @@
sha256 = "1jjhksrp3ljl4pqkclyvdwbj0dzn1alnxdz42f4xmlx4kn93w8bs";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/68bdb7e0100e120b95e9416398127d83530a221d/recipes/omnisharp";
- sha256 = "0dwya22y92k7x2s223az1g8hmrpfmk1sgwbr9z47raaa8kd52iad";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp";
+ sha256 = "0gh0wwdpdx2cjf95pcagj52inf7mrmiq7x8p0x5c7lvl4pfzhh87";
name = "omnisharp";
};
packageRequires = [
@@ -49351,12 +49506,12 @@
org-babel-eval-in-repl = callPackage ({ emacs, ess, eval-in-repl, fetchFromGitHub, fetchurl, lib, matlab-mode, melpaBuild }:
melpaBuild {
pname = "org-babel-eval-in-repl";
- version = "20170510.700";
+ version = "20170511.514";
src = fetchFromGitHub {
owner = "diadochos";
repo = "org-babel-eval-in-repl";
- rev = "38d02b8e2412381f6498c29511d1981a88b7d7f4";
- sha256 = "0fwmcignkglx73spk3cv7acap15yrn0c0npr4ikfc9prs6svaah6";
+ rev = "bfa72c582ac1531ad42aba23e2b1267ab68e31f6";
+ sha256 = "1jm56zxa99s163jv02vhfrshmykvld7girq7gmj1x60g3wjzhn5k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-babel-eval-in-repl";
@@ -49432,22 +49587,22 @@
license = lib.licenses.free;
};
}) {};
- org-brain = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+ org-brain = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "org-brain";
- version = "20170404.2329";
+ version = "20170521.1409";
src = fetchFromGitHub {
owner = "Kungsgeten";
repo = "org-brain";
- rev = "9424b8002238a1ffb67e78e25bc997826f37dc14";
- sha256 = "0vn2s8p21kfnabva7ikal87hl4asgdj6hm7597hfx45w60vakn9a";
+ rev = "de138a717813a8c269c07c0d284dfd71265bbf20";
+ sha256 = "1nr78r0zsn6s626knay4zybk0222ng5yn6wh8ji7gl0bq47kqq75";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/47480fbae06e4110d50bc89db7df05fa80afc7d3/recipes/org-brain";
sha256 = "0c05c6lbr740nnjp9p34padrbrc3q1x2pgylkyhsxadm4mfsvj0c";
name = "org-brain";
};
- packageRequires = [ dash emacs org ];
+ packageRequires = [ emacs org ];
meta = {
homepage = "https://melpa.org/#/org-brain";
license = lib.licenses.free;
@@ -49477,12 +49632,12 @@
org-caldav = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "org-caldav";
- version = "20160614.1342";
+ version = "20170529.1205";
src = fetchFromGitHub {
owner = "dengste";
repo = "org-caldav";
- rev = "f8638d459c7294d44ccd7792b4216541c181d891";
- sha256 = "0vjw8fn6ipi2fg5wkj4jq8cs3m7694xgccy1h1n774w12bby3xhk";
+ rev = "4a618a03ef4a0c95d4f8ffe1c92e986c12a53416";
+ sha256 = "0sgwq7zwgr2khhyvf0a1b5fl616h8x05bd2bmm6437ih3fcx8mjy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-caldav";
@@ -49918,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";
@@ -50085,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";
@@ -50172,8 +50327,8 @@
version = "20140107.519";
src = fetchgit {
url = "git://orgmode.org/org-mode.git";
- rev = "6fee6b6cde5e82e8632408c865681c3aa709013a";
- sha256 = "0as51c7p1r3a5n62h4a2iwqps9ib3rzrdmd1i3c25d3id7mkaixq";
+ rev = "496b2a9855fe514b186890a1f883411ee566d294";
+ sha256 = "02b9sj1d11czwv3n1bkn38mjzc7pzxbs70hbixbzamiil0dpbyi0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal";
@@ -50192,8 +50347,8 @@
version = "20170105.1723";
src = fetchgit {
url = "git://orgmode.org/org-mode.git";
- rev = "6fee6b6cde5e82e8632408c865681c3aa709013a";
- sha256 = "0as51c7p1r3a5n62h4a2iwqps9ib3rzrdmd1i3c25d3id7mkaixq";
+ rev = "496b2a9855fe514b186890a1f883411ee566d294";
+ sha256 = "02b9sj1d11czwv3n1bkn38mjzc7pzxbs70hbixbzamiil0dpbyi0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link";
@@ -50356,12 +50511,12 @@
org-page = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, git, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }:
melpaBuild {
pname = "org-page";
- version = "20170428.424";
+ version = "20170522.524";
src = fetchFromGitHub {
owner = "kelvinh";
repo = "org-page";
- rev = "ca37f5bd48c1bb2a90ff0dc6ce708fb408903ed2";
- sha256 = "1v1a51xy1lnp2flg929fkann405l0rsgv3fpg6y3q39m28wxz2xk";
+ rev = "35404eac9aba04081e575b7c84e628bc68e01dd1";
+ sha256 = "1apx105gm36xf813lhwsq69lk88gyb9gmmvscrps9gmml6lzknnf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/872f163d4da58760009001472e2240f00d4d2d89/recipes/org-page";
@@ -50386,11 +50541,11 @@
org-parser = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-parser";
- version = "20170317.2238";
+ version = "20170528.1324";
src = fetchhg {
url = "https://bitbucket.com/zck/org-parser.el";
- rev = "a1dd102b9cb5";
- sha256 = "06qwqfv0lz7l1fy5i2r4dbc8alkzshxcv8r3s4iy2866z2lgl7pi";
+ rev = "c4870192ea24";
+ sha256 = "04s39zfa1gwn6zclgdhz3b9fbgyqlbysh6hsn7iqkwfzkpmc2n9c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/28d55005cbce276cda21021a8d9368568cb4bcc6/recipes/org-parser";
@@ -50510,12 +50665,12 @@
org-projectile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
melpaBuild {
pname = "org-projectile";
- version = "20161205.1508";
+ version = "20170520.2310";
src = fetchFromGitHub {
owner = "IvanMalison";
repo = "org-projectile";
- rev = "e2b78ca7fbd2e3b873d3ab9bb7196be4d7613f92";
- sha256 = "03zy2bb1ha22xpx29d8610yrqfyaiaa8vgplpx6bmixaw85mcv58";
+ rev = "0ca3b80a46d8c541d36f161506ac8d8dc36d8e80";
+ sha256 = "0r5h6ibq73b84w82382ld5dbihhvff4pj2bind68i5isam7pxlbh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-projectile";
@@ -50600,12 +50755,12 @@
org-recent-headings = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "org-recent-headings";
- version = "20170423.1817";
+ version = "20170518.129";
src = fetchFromGitHub {
owner = "alphapapa";
repo = "org-recent-headings";
- rev = "0558fa8b6e114321f76ab6315e0a319c01213b78";
- sha256 = "197nm66g6iljfpsy218kvqi0kan5dyacdsar5xglsz19cy2n2wkf";
+ rev = "7bc05874de270c5314e4c927b66f27d6aed344ee";
+ sha256 = "13kqkv2wn3c7s5pnp1hyr2558827cipqg3lg31bpbjr6j9pn9l6m";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/668b79c179cbdb77c4049e7c620433255f63d808/recipes/org-recent-headings";
@@ -50639,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 = "20170509.1755";
+ version = "20170526.1519";
src = fetchFromGitHub {
owner = "jkitchin";
repo = "org-ref";
- rev = "c730314d51594191e5e761d087d7d5d5c4d7a5a6";
- sha256 = "0bcagkwzzaawm4lc93dnysjc8ccqnrchywsnixvv6rsc6b7s4q61";
+ rev = "d61770adfbc39dd8544db3a96724089d5bd6ded3";
+ sha256 = "16anl4ls66xm7vbcziwisg41jwzcd4cphxvrxv83vw52w24gqf1r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref";
@@ -50663,6 +50818,7 @@
hydra
ivy
key-chord
+ pdf-tools
s
];
meta = {
@@ -51114,12 +51270,12 @@
org2blog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, metaweblog, org, xml-rpc }:
melpaBuild {
pname = "org2blog";
- version = "20160502.1821";
+ version = "20170521.903";
src = fetchFromGitHub {
owner = "punchagan";
repo = "org2blog";
- rev = "fc7b2d934f2199368d9fc2a0a97d46f20c4f667b";
- sha256 = "1bqiq27ln1pl40b9dms05nla4kf72s80g9ilvrgqflxgl36gxws7";
+ rev = "b3de93c348f5da8b9cb892664c1eab461e443525";
+ sha256 = "1c4zr4bz3w8y8gaq21flgrj1bid0rh6dsajgl0gydb8sbrfc4f3q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org2blog";
@@ -51811,8 +51967,8 @@
src = fetchFromGitHub {
owner = "jkitchin";
repo = "scimax";
- rev = "da84a1cfe3c95757abc7bd3e567866a26f724f76";
- sha256 = "0bkhx6rnvv70z60lgkf36hcp7pcakh3drd8q277xhzfirg4dixa7";
+ rev = "feaa96ff995237270f0ed0af861f59b544e484c9";
+ sha256 = "05idkkvnjrsfbrg0dhcvagsgbybvlqyiqnng5z6abqwbsp344hv2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/222ccf4480395bda8c582ad5faf8c7902a69370e/recipes/ox-clip";
@@ -52500,12 +52656,12 @@
page-break-lines = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "page-break-lines";
- version = "20161205.2251";
+ version = "20170517.235";
src = fetchFromGitHub {
owner = "purcell";
repo = "page-break-lines";
- rev = "c133848345ceef91e257aab8804c61f31c31b264";
- sha256 = "1d0b2pb2s04l7nkcn7yhrbcm927bsinyiayxn59in7p3mqlcmsnb";
+ rev = "82f9100312dcc922fb66ff289faf5d4795d8ca7a";
+ sha256 = "1bwh5g63cg2iw3kmcwj4y2jdw46rxll9rgjn6ymx7hbw15s7m5yp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/page-break-lines";
@@ -53897,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";
@@ -54254,6 +54431,27 @@
license = lib.licenses.free;
};
}) {};
+ php-cs-fixer = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "php-cs-fixer";
+ version = "20170506.1133";
+ src = fetchFromGitHub {
+ owner = "OVYA";
+ repo = "php-cs-fixer";
+ rev = "ca2c075a22ad156c336d2aa093fb6394c9f6c112";
+ sha256 = "1axjfsfasg7xyq5ax2bx7rh2mgf8caw5bh858hhp1gk9xvi21qhx";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/a3631c4b81c1784995ae9e74d832e301d79214e2/recipes/php-cs-fixer";
+ sha256 = "1xvz6v1fwngi2rizrx5sf0wrs4cy8rb13467r26k8hb7z8h1rqmf";
+ name = "php-cs-fixer";
+ };
+ packageRequires = [ cl-lib ];
+ meta = {
+ homepage = "https://melpa.org/#/php-cs-fixer";
+ license = lib.licenses.free;
+ };
+ }) {};
php-eldoc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "php-eldoc";
@@ -54307,8 +54505,8 @@
sha256 = "06ffbw66zw5ssavgbllcb9a0syi5asy6wq8yqxdyw66nj941kjbr";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/f10631b740eea56e7209d7e84f0da8613274ef1d/recipes/php+-mode";
- sha256 = "1ibcsky6la3l7gawpgx814w1acjf73b68i6wbb4p6saxhwg6adik";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/d542e94471b9f601f1ee6f31e727bc4a31fa8f9e/recipes/php+-mode";
+ sha256 = "1wl15l4m68xng1b87a19fm21qwr230ckjz1iwi3y1xl184zliv8p";
name = "php-plus--mode";
};
packageRequires = [];
@@ -54782,12 +54980,12 @@
plan9-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "plan9-theme";
- version = "20170129.553";
+ version = "20170529.2212";
src = fetchFromGitHub {
owner = "john2x";
repo = "plan9-theme.el";
- rev = "db36861907144674a2526fed3ff733c53489b7f5";
- sha256 = "1sxx749xwxxab3k98wb4gpvy723kw5lcm7zhvvbjbgxr43lk6d05";
+ rev = "cdc50195f6579e6c3e6e8060142ce25b609f7949";
+ sha256 = "17grr5rvazh448qzrksxrgp0yclp32s2rxs4h5pygky7knb5vf3v";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cdc4c2bafaa09e38edd485a9091db689fbda2fe6/recipes/plan9-theme";
@@ -55053,8 +55251,8 @@
version = "20170419.303";
src = fetchgit {
url = "https://git.savannah.gnu.org/git/gettext.git";
- rev = "3531b829b30803bab9e0d9ff62747e061145fec5";
- sha256 = "107pc3hdarwv7x7mb8dgc79ldl59r09mwrrw9vcsxqnd2w1jbmca";
+ rev = "a6f9caf8cc7614665d1be694485dd7bc30399e0f";
+ sha256 = "0gpbixx68bfxvpx3y9fv0v4kgxwacydkwid6gmh1lgjc65ky0fy7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/po-mode";
@@ -55341,12 +55539,12 @@
ponylang-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ponylang-mode";
- version = "20161008.1423";
+ version = "20170514.1419";
src = fetchFromGitHub {
owner = "SeanTAllen";
repo = "ponylang-mode";
- rev = "1f4ce183e11f4908173cea16685020f2acb818ae";
- sha256 = "1lxzl5ks4lydn8zzvkc0jz6p1zjz7hfm4fs9dlyjxi6fn2bvj5kw";
+ rev = "88833317195f5ee2880e33a907861c6c2d3851da";
+ sha256 = "0kzzf03m1jzkl9fxzivzh3536c0c9l7m9g5h7zycdz7nj5da38c0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7d51adec3c6519d6ffe9b3f7f8a86b4dbc2c9817/recipes/ponylang-mode";
@@ -56341,12 +56539,12 @@
projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }:
melpaBuild {
pname = "projectile-rails";
- version = "20170411.152";
+ version = "20170524.1333";
src = fetchFromGitHub {
owner = "asok";
repo = "projectile-rails";
- rev = "9647dc1368df6a3b6de17314332d024cceb90052";
- sha256 = "1v8hipd7i63dv9lvq0ff5v9awg017kr0xfjk5hysamb346r1rsrn";
+ rev = "399a214f629168501c33589b6175c447f38ea0b3";
+ sha256 = "1d6y8pqn6yll2vpv457z5bf30qb92wmnpyfarfvcs07spqq3zkz0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails";
@@ -56404,12 +56602,12 @@
projectile-speedbar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, sr-speedbar }:
melpaBuild {
pname = "projectile-speedbar";
- version = "20170127.810";
+ version = "20170516.1943";
src = fetchFromGitHub {
owner = "anshulverma";
repo = "projectile-speedbar";
- rev = "1b9b3ae7624ca58a41ca7e0d0eb37556d3105c44";
- sha256 = "0src453yf63j5dhndrqjx6gh6nfm5c83y2xj2ibk3sj61x9daxj2";
+ rev = "dcab13db72c2084edbebe808e35f1126fe0b3bcd";
+ sha256 = "106a4y5r1adjpbnjn734s7d910r6akhjlyjpd6bnczjhp357wyc7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/eda8cb5a175258404c347ffa30fca002504467a0/recipes/projectile-speedbar";
@@ -56635,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 = "455b61c6b0f39ac269b26969877dd3c6f3e32270";
- sha256 = "091xxj46nckd4vxg34bsv1283s8l4fa9jhamz6jvxy7br6ajslna";
+ rev = "1e86ef4e9f0b9c9e8bd8d62a61e141f139366920";
+ sha256 = "1cf87jxq8r56nxp4h9ig3q489lj7bb35wkasrw2yi48q9j445bw8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -56677,12 +56875,12 @@
psc-ide = callPackage ({ cl-lib ? null, company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, s, seq }:
melpaBuild {
pname = "psc-ide";
- version = "20170420.2343";
+ version = "20170512.1513";
src = fetchFromGitHub {
owner = "epost";
repo = "psc-ide-emacs";
- rev = "3a5416c150a69a1420b4e94c7d130e13b42ff58a";
- sha256 = "1yv4wdjhmh811852y4vzcbkbb0cf1j60ixp89zn2psz4ij8lvmp3";
+ rev = "cba01805f1c767fba386ca61305bfb781cf7286e";
+ sha256 = "0384l3n1870xw3bcskp2hrbdkbvzr2dp8w0zd8nja1zpx38gr0ly";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8189f4e7d6742d72fb22acf61a9d7eb0bffb2d93/recipes/psc-ide";
@@ -56897,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";
@@ -57403,8 +57601,8 @@
src = fetchFromGitHub {
owner = "PyCQA";
repo = "pylint";
- rev = "cb6e4523ce001012202e5767c8029fdfad21af1e";
- sha256 = "1xj0qpfi18gklrh5lvi12xaich4kbxl0yjlqk6gifnx58jhi81y4";
+ rev = "6f2b4ccf5542be7243db1b679c6f52e2e4acf504";
+ sha256 = "0966c47nja1mav4qixj9xr0529pxqqrh7j4vb9jk8l3hdky99vw9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint";
@@ -57546,12 +57744,12 @@
python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "python-mode";
- version = "20170507.953";
+ version = "20170521.1217";
src = fetchFromGitLab {
owner = "python-mode-devs";
repo = "python-mode";
- rev = "08012d66ea2d678795a766d227b74405e73e1267";
- sha256 = "1mkbzs2jqhdqr4rn1plmh06pzy3kghlwci47mhac4dpx0wbkmw13";
+ rev = "5d2d85a370ae20c29203ad64f1eb508a63420ed9";
+ sha256 = "1r36xxm5xhhrps3wywjnr5rb4dcb8zpkwvj4bgadvmszi8pbzbpj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode";
@@ -57966,12 +58164,12 @@
racket-mode = callPackage ({ emacs, faceup, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "racket-mode";
- version = "20170424.1130";
+ version = "20170524.935";
src = fetchFromGitHub {
owner = "greghendershott";
repo = "racket-mode";
- rev = "471c46fa9eb9de2e0b0056814caae824986f0915";
- sha256 = "11s25kxh0909pq00xmpyv2lhafxhz4p40hivz884rkpi0gfvggg1";
+ rev = "4cfb2eba0bf3a78f5e622731496cc3783c42054d";
+ sha256 = "0cly2c1k2gmf7v4ka0l1kkq24r2r33cj44ajaaacr3i59bahcvnf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7ad88d92cf02e718c9318d197dd458a2ecfc0f46/recipes/racket-mode";
@@ -58239,12 +58437,12 @@
ranger = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ranger";
- version = "20170315.2037";
+ version = "20170522.2331";
src = fetchFromGitHub {
owner = "ralesi";
repo = "ranger.el";
- rev = "e0429a06d55b3f11b369da61aa9043bb2843fa12";
- sha256 = "171r9iljbp0pz7lvqsrnhdnir0bq2ynmhlb1ikf4k3i02w95i4v6";
+ rev = "e371cdc2d6065099fe7c68583597b1d0abea792b";
+ sha256 = "1c0jlykxkl46qimr60crac4j7nvzr0jixjiv4m6zzk93pn12y3g1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0207e754f424823fb48e9c065c3ed9112a0c445b/recipes/ranger";
@@ -58491,12 +58689,12 @@
rdf-prefix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rdf-prefix";
- version = "20170304.508";
+ version = "20170514.859";
src = fetchFromGitHub {
owner = "simenheg";
repo = "rdf-prefix";
- rev = "d7e61535aaf89e643673b27c79b4a84ddb530288";
- sha256 = "1in1xp559g8hlxa9i2algwlgc069m8afjad6laxbyjqc61srzw6i";
+ rev = "35129521d5b6035e5dd75d5b3481ce4971f46034";
+ sha256 = "1iy9385n8a2b7ph4wdf8p92n81slirsxxckrc3khbk5zrpp62z5k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a5f083bd629697038ea6391c7a4eeedc909a5231/recipes/rdf-prefix";
@@ -58638,12 +58836,12 @@
realgud = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, load-relative, loc-changes, melpaBuild, test-simple }:
melpaBuild {
pname = "realgud";
- version = "20170218.740";
+ version = "20170522.325";
src = fetchFromGitHub {
owner = "rocky";
repo = "emacs-dbgr";
- rev = "2328ede5bbe6f20c69c0696e9f6ed4692ca4b4f0";
- sha256 = "04fa6sbw7hwwmrs0s94l1bdb4gw9q5xs3y26ngqqx0y6a211pb6q";
+ rev = "a1130df3ada34e76675324a8c25823b420b20239";
+ sha256 = "12nz159if1hlz12fmkil3mmzn1f66f6vjnlz65na8jr39hrkgx8n";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud";
@@ -58980,8 +59178,8 @@
src = fetchFromGitHub {
owner = "RedPRL";
repo = "sml-redprl";
- rev = "608b896b58c6e1c7fec8c6e97202fc303a731a8b";
- sha256 = "1x1d4gq2j8lanzpnqhx8aarwzd2mpprhkrz6j9w1s94g2p210ssg";
+ rev = "a9afa481d6194ea46ec00c1dc3098e88b419f6d1";
+ sha256 = "1hjkqjvnjmalmrcb1dikzsg0glnlzjb5s4insn2g83irwid7v8y1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl";
@@ -59623,12 +59821,12 @@
restclient = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "restclient";
- version = "20160801.707";
+ version = "20170516.137";
src = fetchFromGitHub {
owner = "pashky";
repo = "restclient.el";
- rev = "87c4f25155abef1ee8678e2137c1d8b3b2154ff5";
- sha256 = "18ym81hmcj83qsw96y6amb84wxjk63a9fgij6hbkq7d6vp970x5g";
+ rev = "07a3888bb36d0e29608142ebe743b4362b800f40";
+ sha256 = "00lmjhb5im1kgrp54yipf1h9pshxzgjlg71yf2rq5n973gvb0w0q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/59303304fe1f724596245556dd90f6afffba425d/recipes/restclient";
@@ -59648,8 +59846,8 @@
src = fetchFromGitHub {
owner = "pashky";
repo = "restclient.el";
- rev = "87c4f25155abef1ee8678e2137c1d8b3b2154ff5";
- sha256 = "18ym81hmcj83qsw96y6amb84wxjk63a9fgij6hbkq7d6vp970x5g";
+ rev = "07a3888bb36d0e29608142ebe743b4362b800f40";
+ sha256 = "00lmjhb5im1kgrp54yipf1h9pshxzgjlg71yf2rq5n973gvb0w0q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/59303304fe1f724596245556dd90f6afffba425d/recipes/restclient-helm";
@@ -59850,12 +60048,12 @@
rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }:
melpaBuild {
pname = "rg";
- version = "20170506.2235";
+ version = "20170527.806";
src = fetchFromGitHub {
owner = "dajva";
repo = "rg.el";
- rev = "261ed756377285f0f8941b7a33866ef538465d74";
- sha256 = "1fs367w5695v8kvwka1w9kykgpq3qp1209cxkxs096rlkxhbdvv5";
+ rev = "6069dafb4a71b8d8b6c8787d2b68f4745e0c9cae";
+ sha256 = "09xdpzp2yviqnxc7m2l1zy4rkyp1m8sdwyvsbbdqiiwa8pjg9gvf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg";
@@ -60036,22 +60234,22 @@
license = lib.licenses.free;
};
}) {};
- robe = callPackage ({ fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }:
+ robe = callPackage ({ emacs, fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }:
melpaBuild {
pname = "robe";
- version = "20170428.553";
+ version = "20170522.1815";
src = fetchFromGitHub {
owner = "dgutov";
repo = "robe";
- rev = "336dea660fc382de413ca4b7755232ec2abb3602";
- sha256 = "0945c0qnyr289qzy2pxsn2v4z0gxzjs3ln859h387dl451c99l8q";
+ rev = "845d10041b3eb76fb35b895279c9dde45c599929";
+ sha256 = "0cvspl9wqg73bl9xpdlzcm564i9kvlr29by3lc8n1sc4yaghw8sq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/673f920d02fe761bc080b73db7d37dbf5b6d86d8/recipes/robe";
sha256 = "19py2lwi7maya90kh1mgwqb16j72f7gm05dwla6xrzq1aks18wrk";
name = "robe";
};
- packageRequires = [ inf-ruby ];
+ packageRequires = [ emacs inf-ruby ];
meta = {
homepage = "https://melpa.org/#/robe";
license = lib.licenses.free;
@@ -60186,12 +60384,12 @@
rpn-calc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
melpaBuild {
pname = "rpn-calc";
- version = "20170508.100";
+ version = "20170522.1842";
src = fetchFromGitHub {
owner = "zk-phi";
repo = "rpn-calc";
- rev = "ae4bf0dd8a922ea41b228fac81dee2c10b11982a";
- sha256 = "03kvrvafwm7czg8jb4r9wggrabczdd809wr2g62z1wqjiz94fxnp";
+ rev = "66fcb64dbfddfc23823356b6213215bd7ab5efc6";
+ sha256 = "1lgabs97x6h4yrgwln8hsxi47wgl46jzhf162wa1almdbqbp9100";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/47d5b3c931cdbc2351e01d15e2b98c78081c9506/recipes/rpn-calc";
@@ -60232,8 +60430,8 @@
src = fetchFromGitHub {
owner = "pezra";
repo = "rspec-mode";
- rev = "fe336636a57955b927b5994c8c738e21cacdc800";
- sha256 = "07qjp6bb5rkcpbda7gb8g0zr2mr6cwplaspwc4ckidfcd8vzdn7b";
+ rev = "1f468e443e7f2d8419eec29e42074edc400f8c0c";
+ sha256 = "03wv1k3ppvdk2776bkbz8bhxw5n7h4b8zm3b2j2j6x7hrxfza5h4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cd83e61b10da20198de990aa081b47d3b0b44d43/recipes/rspec-mode";
@@ -60249,12 +60447,12 @@
rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rtags";
- version = "20170509.2255";
+ version = "20170527.450";
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "2abdfb2adf24b881cdd04e904ecb341bb51e8cb6";
- sha256 = "11f9sd8w7qqhfd6mxbihlc6mdki4lqyk4dwbi3v91k9hbxb9hlq2";
+ rev = "499db6f98cc725bca66d122bce571adcdfa32187";
+ sha256 = "10mgzyb3ccs781b7r37qfjw7ynhh9k8hqpahh9pcn3p462si341a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags";
@@ -60315,8 +60513,8 @@
version = "20161115.2259";
src = fetchsvn {
url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/";
- rev = "58657";
- sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf";
+ rev = "58969";
+ sha256 = "1sfh2wr840mi08yx2y9vhrngl0190l7v964vfjgbbk8778ny6vzb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ruby-additional";
@@ -60396,8 +60594,8 @@
version = "20150424.752";
src = fetchsvn {
url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/";
- rev = "58657";
- sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf";
+ rev = "58969";
+ sha256 = "1sfh2wr840mi08yx2y9vhrngl0190l7v964vfjgbbk8778ny6vzb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/ruby-electric";
@@ -60539,12 +60737,12 @@
ruby-test-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pcre2el, ruby-mode ? null }:
melpaBuild {
pname = "ruby-test-mode";
- version = "20160930.9";
+ version = "20170515.1008";
src = fetchFromGitHub {
owner = "r0man";
repo = "ruby-test-mode";
- rev = "0924e9d17e0a9b7c5c1a4e878367be47f58a396c";
- sha256 = "0hlzkwll6di13hja3hm3nzmcjkwgciq9bziz837cr49agagz3b55";
+ rev = "740ff1a7c81eb8380fd0f0cdb7c32238acf13dd1";
+ sha256 = "1a7lhx7ibh9rrxdamxwd107npnmsf9sxbksvy9rm8l3rnm8yjnvy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ruby-test-mode";
@@ -60644,12 +60842,12 @@
rust-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rust-mode";
- version = "20170411.2043";
+ version = "20170514.2022";
src = fetchFromGitHub {
owner = "rust-lang";
repo = "rust-mode";
- rev = "dae5af71ebf4b5c6797ef057e8a0ebf655bcdbfb";
- sha256 = "0s01pzlq0lqzbxqj0x2x4lr3l1rsvnd8h2kskgli6y2m8nv97qc6";
+ rev = "3220937aca17fd3200c9616d97a3484f55b604d5";
+ sha256 = "060kk4yds0iz070p8x3mjjsyify7pyxfs7zhhvs4hf1v0mzil21c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8f6e5d990d699d571dccbdeb13327b33389bb113/recipes/rust-mode";
@@ -60833,12 +61031,12 @@
salt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-jinja2, mmm-mode, yaml-mode }:
melpaBuild {
pname = "salt-mode";
- version = "20170313.725";
+ version = "20170526.1702";
src = fetchFromGitHub {
owner = "glynnforrest";
repo = "salt-mode";
- rev = "e14ed8f2ce0ab7a783c4341879ec8c003e2b5c81";
- sha256 = "19gw35qv13f2r4wif5fgqfhrph2r320n81faxx8980zds28x2q0x";
+ rev = "6f5776ab411aa62668e774c5cf2aaff22cae5401";
+ sha256 = "05fla50f9dmp3wb4wr8wx5j2mhfarsq50sbr0yi29kabyn3va9ig";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9dcf1a93a06fc42581521c88cfd988b03bedc000/recipes/salt-mode";
@@ -61022,12 +61220,12 @@
sbt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sbt-mode";
- version = "20170508.1";
+ version = "20170530.355";
src = fetchFromGitHub {
owner = "ensime";
repo = "emacs-sbt-mode";
- rev = "1ab82c187c49440b08fc468957fa10b79ac603b8";
- sha256 = "1pwi6i5q7fzvx8ychg2i0ndn2czhrl8fr86695vh99wmy7shvw6i";
+ rev = "736da7f466aad2b64c846ece258082c6aac647ae";
+ sha256 = "0idj4p3d36yp0irp1yfbihq8mf17jc7facz5qy6kx7zj0wdx4fjw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/364abdc3829fc12e19f00b534565227dbc30baad/recipes/sbt-mode";
@@ -61047,8 +61245,8 @@
src = fetchFromGitHub {
owner = "openscad";
repo = "openscad";
- rev = "ec1c3fd61152f119cb6bd7efeef4816bea8f8e65";
- sha256 = "00lvh1ix9xs9844mp1yz1gfwx8wi53jzgy4wrg8vgwwbd5mrkdvw";
+ rev = "d1e295137589b5285e26c962d648f53c081bb972";
+ sha256 = "17y7db32836gj97k85hk8acvd0xvrdck3hb9j1qxmdzf16lmagfi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode";
@@ -61085,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";
@@ -61169,11 +61367,11 @@
schrute = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "schrute";
- version = "20161124.1227";
+ version = "20170521.1140";
src = fetchgit {
url = "https://bitbucket.org/shackra/dwight-k.-schrute";
- rev = "08ab6565fa94f3a8016163fe6f7be1932af1156b";
- sha256 = "0l1k6wjjr569lk5k8ydwq13041kn889g20qbzf79qj1ws96rim4m";
+ rev = "59faa6c4232ae183cea93237301acad8c0763997";
+ sha256 = "1w5l1vf4cn4psrxgnq5n6j3zw644s70inpa17vsvng3sk5r8crcb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/505fc4d26049d4e2973a54b24117ccaf4f2fb7e7/recipes/schrute";
@@ -61273,16 +61471,16 @@
scratch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "scratch";
- version = "20120830.1105";
+ version = "20170523.2046";
src = fetchFromGitHub {
- owner = "cbbrowne";
+ owner = "ieure";
repo = "scratch-el";
- rev = "b377e5642aa0d0ddc9dbb2003d2055bc013e6426";
- sha256 = "1nr6yqmxz6jqjkfj249yz88480shlsnmri0d322pkz88d4nkr0hq";
+ rev = "3363e861cf7c135873ccf273f759d72dd0bb5854";
+ sha256 = "0k4y7kqd7izaqpa0xmp7ag84vpnrgz5mi6cgh5ap1vspxg3pycz4";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/scratch";
- sha256 = "1g4jm54n5k0pkspbd9636hcmxi1p3lkgayiwavlgs0sg2s6vc9l9";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/b46813f928eadfa08a1d4bf94ceeb96dbc2a7c72/recipes/scratch";
+ sha256 = "1an30pr64fz13s6lghlcb36b7hn3961vv0yipfp9s140ccygdvh7";
name = "scratch";
};
packageRequires = [];
@@ -61378,12 +61576,12 @@
scratch-pop = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popwin }:
melpaBuild {
pname = "scratch-pop";
- version = "20150820.139";
+ version = "20170510.758";
src = fetchFromGitHub {
owner = "zk-phi";
repo = "scratch-pop";
- rev = "2c9648a669ce8e3a9e35e8e1e3c808531d20c549";
- sha256 = "1yvmfiv1s83r0jcxzbxyrx3b263d73lbap6agansmrhkxp914xr1";
+ rev = "7f4172c792b10bd38898dd8963cf0ade91921869";
+ sha256 = "0mwjq7z0cpaqhqygzhfcpfqyx8376jsc1g2874np6ff49389bj4d";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/420fb3408b64f1a3e42316262016728c483bf0c1/recipes/scratch-pop";
@@ -62483,12 +62681,12 @@
shm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "shm";
- version = "20170126.420";
+ version = "20170523.238";
src = fetchFromGitHub {
owner = "chrisdone";
repo = "structured-haskell-mode";
- rev = "3b81e8739abe187fa378701152370d31bf44b331";
- sha256 = "1p9yb105yjzhhl2aj2hpqb4275m0liagn43r49ily8syvaj15r4m";
+ rev = "bd08a0b2297667e2ac7896e3b480033ae5721d4d";
+ sha256 = "14rl739z19ns31h9fj48sx9ppca4g4mqkc7ccpacagwwf55m259c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/68a2fddb7e000487f022b3827a7de9808ae73e2a/recipes/shm";
@@ -62625,6 +62823,27 @@
license = lib.licenses.free;
};
}) {};
+ shr-tag-pre-highlight = callPackage ({ emacs, fetchFromGitHub, fetchurl, language-detection, lib, melpaBuild }:
+ melpaBuild {
+ pname = "shr-tag-pre-highlight";
+ version = "20170525.902";
+ 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";
@@ -62667,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";
@@ -63173,12 +63413,12 @@
slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }:
melpaBuild {
pname = "slack";
- version = "20170504.629";
+ version = "20170524.2122";
src = fetchFromGitHub {
owner = "yuya373";
repo = "emacs-slack";
- rev = "5bd003364f0de8737cedfacb0766da0dd6e3496f";
- sha256 = "12cwpra9jgixab54pd7pb7g073b5gbhmsjbhfnnk38yqlgdrzisc";
+ rev = "3cd88700176541b3c1ae39fa9f1219d3367be684";
+ sha256 = "020vvzqv39lm9h037jk42zisx59xz9c5pkmblg7p35yjz9nxydwf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack";
@@ -63236,12 +63476,12 @@
slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }:
melpaBuild {
pname = "slime";
- version = "20170502.914";
+ version = "20170511.1221";
src = fetchFromGitHub {
owner = "slime";
repo = "slime";
- rev = "743d9ff1a05957559476ef333042f57aedb534a2";
- sha256 = "1ydfzz2a5vqv5ikx96x2g4ki3mxljv5c82d07rv04bs5lxlk7iaf";
+ rev = "7ccaa81b4266d478ed92003fba097756afc6ae19";
+ sha256 = "1l4idfy98qh7c3vaxiv91irhw14nz8h2mvfs3g7j4abv51102kx5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime";
@@ -63422,6 +63662,27 @@
license = lib.licenses.free;
};
}) {};
+ slstats = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "slstats";
+ version = "20170522.631";
+ src = fetchFromGitHub {
+ owner = "davep";
+ repo = "slstats.el";
+ rev = "a2f640f724fee7ecbd1cf28fc78297180cd959bc";
+ sha256 = "0gzpwcrmlbd7fphgyv6g04wjavd9i3vgn3y1fnh178iswmpsxj62";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/fe7c8c241cc6920bbedb6711db63ea28ed633327/recipes/slstats";
+ sha256 = "0z5y2fmb3v16g5gf87c9gll04wbjp3d1cf7gm5cxi4w3y1kw4r7q";
+ name = "slstats";
+ };
+ packageRequires = [ cl-lib emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/slstats";
+ license = lib.licenses.free;
+ };
+ }) {};
sly = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sly";
@@ -63926,12 +64187,12 @@
smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "smartparens";
- version = "20170430.844";
+ version = "20170524.1533";
src = fetchFromGitHub {
owner = "Fuco1";
repo = "smartparens";
- rev = "f493fdba6af036497e0f0a204c7f7388888bf6b3";
- sha256 = "03f2p29i0zv0dl4s24pyr93ckh9iams6hlvdd7dmdc6v96sc83w0";
+ rev = "a758dd1d231ce0b6a5648bbedc20927abb6a2bce";
+ sha256 = "1kfsnbdj9mgx666pq94ajjwnf3hj59rlmr545ka3k0g981lqkap2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens";
@@ -64576,12 +64837,12 @@
sotclojure = callPackage ({ cider, clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sotlisp }:
melpaBuild {
pname = "sotclojure";
- version = "20160421.1811";
+ version = "20170512.612";
src = fetchFromGitHub {
owner = "Malabarba";
repo = "speed-of-thought-clojure";
- rev = "8d879ef41c004726cca3c27a81b7543cc273c19b";
- sha256 = "13yn2yadkpmykaly3l3xsq1bhm4sxyk8k1px555y11qi0mfdcjhh";
+ rev = "84e2be5939c33d44f9518aea60cfccff4d6c9707";
+ sha256 = "1jz3lscjq8xfkrx464a1s8vyggnh5sjl8jvq8dvx0w7blny2jvz8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3a2ccef8af91eada4449d9cd4bda6bd28272722e/recipes/sotclojure";
@@ -64814,12 +65075,12 @@
spaceline = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline, s }:
melpaBuild {
pname = "spaceline";
- version = "20170102.59";
+ version = "20170530.434";
src = fetchFromGitHub {
owner = "TheBB";
repo = "spaceline";
- rev = "75cc751c3da252bd84f33b12daf11655a9f98fa6";
- sha256 = "1jn3qjxjhbgjixxny1n68ha80c2zqmfrj24ws7ni4zia264phxs0";
+ rev = "d86fc0353cbf1a95df261e40ec5b7292b0d557f3";
+ sha256 = "1pj1rdfm2dxri6v2c1m8slpabdmbgqqr0cp23s5w4s39g0mmphvg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/46e4c876aeeb0bb0d0e81dcbb8363a5db9c3ff61/recipes/spaceline";
@@ -64832,22 +65093,22 @@
license = lib.licenses.free;
};
}) {};
- spaceline-all-the-icons = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spaceline }:
+ spaceline-all-the-icons = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize, spaceline }:
melpaBuild {
pname = "spaceline-all-the-icons";
- version = "20170506.408";
+ version = "20170530.114";
src = fetchFromGitHub {
owner = "domtronn";
repo = "spaceline-all-the-icons.el";
- rev = "481329d1d1c4c505a91b7f2ac231f77a19e2c74d";
- sha256 = "15snhm5rq0n31g9hk5gzimhjclfll67vi7avhrhd9z9x6dvq0sp4";
+ rev = "d5750c0aa40a66c6d76c74540587b8cbb0142350";
+ sha256 = "1rjb7jpbizafxixqrwzzxgbah0b8b8wsmqxzvqdv867i5w6682p2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d039e057c1d441592da8f54e6d524b395b030375/recipes/spaceline-all-the-icons";
sha256 = "1h6clkr2f29k2vw0jcrmnfbjpphaxm7s3zai6pn6qag32bgm3jq6";
name = "spaceline-all-the-icons";
};
- packageRequires = [ all-the-icons emacs spaceline ];
+ packageRequires = [ all-the-icons emacs memoize spaceline ];
meta = {
homepage = "https://melpa.org/#/spaceline-all-the-icons";
license = lib.licenses.free;
@@ -65460,12 +65721,12 @@
sqlup-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sqlup-mode";
- version = "20170502.1505";
+ version = "20170521.1628";
src = fetchFromGitHub {
owner = "Trevoke";
repo = "sqlup-mode.el";
- rev = "d34d4c5c8fe052dbf29baacb6014ad4af70218b5";
- sha256 = "1abh60xlxhhj7lky6kyr8316gj9xvbwzvcbchkih41s9xm06yg8g";
+ rev = "40f2bc0179539087971d48556dcce38e14907768";
+ sha256 = "1ya5acz07l61hry96fq0yx81w7zwcswxinb3fi0g1s4gshxy4hgk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/sqlup-mode";
@@ -65607,12 +65868,12 @@
ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ssh-deploy";
- version = "20170506.932";
+ version = "20170520.26";
src = fetchFromGitHub {
owner = "cjohansson";
repo = "emacs-ssh-deploy";
- rev = "6d1c10c2b5bb8a1a1f30ab3850970c731ff54086";
- sha256 = "09bmvgvkhn3cg8lwav77zvsfp5kr3vh6b1mg7cay7jw4m6cjscx4";
+ rev = "5e86b22d14e34207bf9c0888ac5fe2e782dcf5cb";
+ sha256 = "0pirqgvvl7dyhfk5c3hk419mb67qhmgz1qvp124aprdwhnmjd153";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy";
@@ -65712,12 +65973,12 @@
standoff-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "standoff-mode";
- version = "20170214.1713";
+ version = "20170516.1042";
src = fetchFromGitHub {
owner = "lueck";
repo = "standoff-mode";
- rev = "cecb6bb0bbb3692ab9179376d88d14327965a43b";
- sha256 = "01fdv5v8hlckqdsjq5m4cvghq7mvcwh4mqv49mh2dlahs5m055dk";
+ rev = "83ec2460cd9f6979aab2ed64a9ae32221a0ec930";
+ sha256 = "0hzdq8wf28zx7llisg2907fibb4pfn2x5vxl44ka0c45kbza3q8b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/98858a45f72c28eec552b119a66479ea99b60f93/recipes/standoff-mode";
@@ -66125,11 +66386,11 @@
stupid-indent-mode = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "stupid-indent-mode";
- version = "20130816.1354";
+ version = "20170525.417";
src = fetchgit {
url = "https://gist.github.com/5487564.git";
- rev = "e26ff5a2c4a582c6c1940bbcd204cfeed8e65222";
- sha256 = "0sw7r4sbg0vmm7gqisjdp1wansn9k64djz3p83fwmyq3qkj90ar4";
+ rev = "3295e7de5e2cfddc3bf0e462e852bf58972f5d70";
+ sha256 = "00js2jkzvmvh1gbraijknv48y86pqyk9zv264a5n3l4sw5q6kcvk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/68cd648bde8028a39849f7beae8deae78bfb877b/recipes/stupid-indent-mode";
@@ -66353,12 +66614,12 @@
sudo-edit = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sudo-edit";
- version = "20170201.916";
+ version = "20170520.845";
src = fetchFromGitHub {
owner = "nflath";
repo = "sudo-edit";
- rev = "615f6c073e42d433e79ae5a63210e2e04357a4c8";
- sha256 = "0k3ldywy1g6672hhasqmj1rvzrs0cmd3nzxkb688vw6mhzxfzld4";
+ rev = "0e079e12cba524dc9745f30cbd6e8c553679b624";
+ sha256 = "1gq48whi09hib1723r7182iy8ywpa9xxvbr8ybb0z5jn0z2dvs51";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3b08d4bbdb23b988db5ed7cb5a2a925b7c2e242e/recipes/sudo-edit";
@@ -66416,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";
@@ -66519,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";
@@ -66790,12 +67051,12 @@
swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "swiper";
- version = "20170410.24";
+ version = "20170515.1409";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "swiper";
- rev = "f565f76dfb3a31becc32c807916c011cde6c4e64";
- sha256 = "1dl39b4c7jij0gxdri2li6nkm7x73ljhbk0n1zwi6lw4xd7dix6p";
+ rev = "c93194941c1ac36ee762b70dc9061ee830769f6a";
+ sha256 = "0i75kyh3si8x6k0bqj1055kcp8zzbv05sps4flmwh59vn4j8paca";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper";
@@ -66853,12 +67114,12 @@
switch-window = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "switch-window";
- version = "20170501.1626";
+ version = "20170522.2042";
src = fetchFromGitHub {
owner = "dimitri";
repo = "switch-window";
- rev = "07105313cf4c86267ecfc0ad160971475d185c67";
- sha256 = "0nsi4ikidl42y8cfxk313zkgnl6fq470vy1fliikqp14b6h8k0c3";
+ rev = "8d37f5660666516ab6c9e6ec1da748ea1669ed4b";
+ sha256 = "19bszzslzz8rprch0z3h6xa6pjhrwik7j53i4kj33w306d58gi3f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7d2204e3b53ade1e400e143ac219f3c7ab63a1e9/recipes/switch-window";
@@ -66916,12 +67177,12 @@
sx = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, let-alist, lib, markdown-mode, melpaBuild }:
melpaBuild {
pname = "sx";
- version = "20161222.1205";
+ version = "20170521.1832";
src = fetchFromGitHub {
owner = "vermiculus";
repo = "sx.el";
- rev = "de73e993930f910862698727b5c0d93a1f656deb";
- sha256 = "03dah9rn6ray0c65rkqcmak77b1hgyi2fc1nqgb5vfgf65jk7z7c";
+ rev = "8f1e3346286cfa5a5299ef192cc5aca3f37a7745";
+ sha256 = "1ans6l0rv71w2vq0v4137jr0jhgzhkk62l7cq6b5m83v4ld9gr09";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f16958a09820233fbe2abe403561fd9a012d0046/recipes/sx";
@@ -66937,12 +67198,12 @@
symbol-overlay = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "symbol-overlay";
- version = "20170502.157";
+ version = "20170528.119";
src = fetchFromGitHub {
owner = "wolray";
repo = "symbol-overlay";
- rev = "b4659bf6b10e37032603de1dfdb6a707ca5a224c";
- sha256 = "028sklksa57dyyzg2mgxh010vrm9rvkbmbvd00cyawbpj7i7d5lq";
+ rev = "fcd6ffe97aeb3e9190610f29f1d69895771edcb6";
+ sha256 = "10iidqq7gz3cmkp8sxg0jwyn0hn6hrlnbvll62hdrb91cxa0hgnf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c2a468ebe1a3e5a35ef40c59a62befbf8960bd7b/recipes/symbol-overlay";
@@ -67124,12 +67385,12 @@
syntactic-close = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "syntactic-close";
- version = "20170418.3";
+ version = "20170510.2348";
src = fetchFromGitHub {
owner = "emacs-berlin";
repo = "syntactic-close";
- rev = "d9f01e66d495db42142b845c6da5fa3d7692bf29";
- sha256 = "0630v7h84fjw28j3lpwmwhfz3r6f7phiqccy7454vs0yxjyz0bp5";
+ rev = "83f6a212637175c8cfb1132eb40cdd4c3343040a";
+ sha256 = "0r5zff8fb0gid84f62l88lfh1hp8nkgf9cldnhmmv3icrhc2r0kc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f2c15c0c8ee37a1de042a974c6daddbfa7f33f1d/recipes/syntactic-close";
@@ -67567,8 +67828,8 @@
src = fetchFromGitHub {
owner = "phillord";
repo = "tawny-owl";
- rev = "c2ed2499796b91c31f249211717e18f475334404";
- sha256 = "0q34k4mnd7hkgm9p0q7b8x8j5p3dllm5xxhjbadm6mlygr6wx3bj";
+ rev = "37d65c003224b88108d035732bfa729b2a14e8ab";
+ sha256 = "1dva713chyv3y4d689a81zpmrk22spvx56lkdmbvq5hfp467kayq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ea9a114ff739f7d6f5d4c3167f5635ddf79bf60c/recipes/tawny-mode";
@@ -67731,12 +67992,12 @@
telephone-line = callPackage ({ cl-generic, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
melpaBuild {
pname = "telephone-line";
- version = "20170501.2058";
+ version = "20170528.1027";
src = fetchFromGitHub {
owner = "dbordak";
repo = "telephone-line";
- rev = "d0428bbd5c308b7c249359be8c854fe80a2905a8";
- sha256 = "1zr4c63jmjd4lmbrp975c92wh9nn7861dkf5q7mjsglfdf0zp1wj";
+ rev = "80b09f3357161705fce9ccee9ca23056e91ee2cf";
+ sha256 = "08wc37qw22rsmyzxqiz6d8mwq13j6r4i38lb4gk7kxjpqxwzblxc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9c998b70365fb0a210c3b9639db84034c7d45097/recipes/telephone-line";
@@ -67987,8 +68248,8 @@
src = fetchFromGitHub {
owner = "davidshepherd7";
repo = "terminal-here";
- rev = "86b3fb5616be1a0a90e21a9b2cade25c62243b5d";
- sha256 = "11cp9r282syyxqx4ihx3h75lac1xg32hhwssjib29p3ph48mq8si";
+ rev = "26e7c8d180dcc62d8802762ba738eb2ee02fd16c";
+ sha256 = "06hqqjj8fl32mxiws6jqnii6cnbds2686y2hfv7v83rj6fy31vgc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f8df6f7e23476eb52e7fdfbf9de277d3b44db978/recipes/terminal-here";
@@ -68008,8 +68269,8 @@
src = fetchFromGitHub {
owner = "ternjs";
repo = "tern";
- rev = "a1cf72d9e2ed32ac3c75583cd9db75c5f981382d";
- sha256 = "08njp03bcihb28sx0n5ngp8xsbc9pdsvc18h0k4c3vybvv3km88n";
+ rev = "a4db15583ea15cd7b62c706ea42a38bff9b418fb";
+ sha256 = "150snv08wv8fyzp3qif6yvfy1b24rrbdc50vzlz640rmcd6qhk59";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern";
@@ -68025,12 +68286,12 @@
tern-auto-complete = callPackage ({ auto-complete, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, tern }:
melpaBuild {
pname = "tern-auto-complete";
- version = "20160906.1204";
+ version = "20170521.1235";
src = fetchFromGitHub {
owner = "ternjs";
repo = "tern";
- rev = "a1cf72d9e2ed32ac3c75583cd9db75c5f981382d";
- sha256 = "08njp03bcihb28sx0n5ngp8xsbc9pdsvc18h0k4c3vybvv3km88n";
+ rev = "a4db15583ea15cd7b62c706ea42a38bff9b418fb";
+ sha256 = "150snv08wv8fyzp3qif6yvfy1b24rrbdc50vzlz640rmcd6qhk59";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern-auto-complete";
@@ -68172,12 +68433,12 @@
test-simple = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "test-simple";
- version = "20170117.411";
+ version = "20170527.832";
src = fetchFromGitHub {
owner = "rocky";
repo = "emacs-test-simple";
- rev = "604942d36021a8b14877a0a640234a09c79e0927";
- sha256 = "1ydbhd1xkwhd5zmas06rw7v5vzcmvri8gla3pyf2rcf2li5sz247";
+ rev = "b3b69f52207d3a8111421ad7ab9ed82abbe85316";
+ sha256 = "0n400nmz3iyp50sdd4gz0bmfn1sfq5p6a69yv4zd09ypa9gkndws";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a4b76e053faee299f5b770a0e41aa615bf5fbf10/recipes/test-simple";
@@ -68256,12 +68517,12 @@
textx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "textx-mode";
- version = "20170329.339";
+ version = "20170516.211";
src = fetchFromGitHub {
owner = "novakboskov";
repo = "textx-mode";
- rev = "cd47daf9737479ff06e2fa43fbb45ada2d7386e8";
- sha256 = "165m6p18nzpqvdvx2a6hf94blsa2r947wdf1x6jicqflfpki45cx";
+ rev = "72f9f0c5855b382024f0da8f56833c22a70a5cb3";
+ sha256 = "1lr9v7dk0pnmpvdvs4m5d9yvxlii0xzr8b3akknm25gvbw1y1q8k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/dada0378af342e0798c418032a8dcc7dfd80d600/recipes/textx-mode";
@@ -68526,8 +68787,8 @@
src = fetchFromGitHub {
owner = "apache";
repo = "thrift";
- rev = "224c334e50a553504385dd001dadf31f7346b30a";
- sha256 = "0xhpal5a8kap5ngn6p22i6ww1ha1d1yg44a47jfkgfbwx1fmykmj";
+ rev = "72ca60debae1d9fb35d9f0085118873669006d7f";
+ sha256 = "1hgqs1z2m2g3avid98bhgipsqp2478bpf1vby3c3f2xmymag0l74";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift";
@@ -68584,12 +68845,12 @@
tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }:
melpaBuild {
pname = "tide";
- version = "20170509.1134";
+ version = "20170516.543";
src = fetchFromGitHub {
owner = "ananthakumaran";
repo = "tide";
- rev = "5f52ed822a80d140a3dc1ce993d75d301c24bf78";
- sha256 = "15h1fvm17bw9mjx1pvasr99cmjqhlfhy9m6a9ws0r1il7fkwhnl1";
+ rev = "669ce39bcd93ca6353d24a72a358272d7b0e2268";
+ sha256 = "1sbvkgrdf6s8bkg38rfyj677dq3x4pry84hv30dgqhll7h8ja72w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide";
@@ -68927,12 +69188,12 @@
toc-org = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "toc-org";
- version = "20170404.15";
+ version = "20170518.451";
src = fetchFromGitHub {
owner = "snosov1";
repo = "toc-org";
- rev = "d30b57f16d158fa859b0626f5350520f3ee86f44";
- sha256 = "0q0wshcxn60c87lml2fxrhikrj7zay48ijrwj334yzwp26dvm422";
+ rev = "5a8a3f9b3a1440eb207a031685b7f4d77ef05b76";
+ sha256 = "0cwc7l8vf6x62s7727a6zr099zxgbbgnqkb2y60js6bys2mxqv99";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1305d88eca984a66039444da1ea64f29f1950206/recipes/toc-org";
@@ -69340,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";
@@ -69371,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";
@@ -69848,12 +70109,12 @@
turing-machine = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "turing-machine";
- version = "20170505.804";
+ version = "20170512.1438";
src = fetchFromGitHub {
owner = "therockmandolinist";
repo = "turing-machine";
- rev = "41e367e54fbeff572f599f2f321ffc863601484e";
- sha256 = "0qlm7y3pm8sfy36a8jc3cr955hqsmypzshbgxfnmcmz7wl96dplh";
+ rev = "4b5901a13b38028b05ce19cecc78bcd2f708f97d";
+ sha256 = "1avsqqpsbzlm0wi6fc5lgnmhps5wcr6gp05d4hw51sd5r0vx00dk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a003b40a52a92b3ab4d1ffc003f570d4fa6bfbde/recipes/turing-machine";
@@ -70037,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";
@@ -70098,12 +70359,12 @@
typit = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, mmt }:
melpaBuild {
pname = "typit";
- version = "20170501.1427";
+ version = "20170519.51";
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "typit";
- rev = "96e3fda8c5db51ca511973f0e7a530eae26c752b";
- sha256 = "17dv7qh1b93wvqw650asc6r0d6dx8kxwa2xkybza57vnrgr4mjaf";
+ rev = "a4e3147dedac5535bdc8b06aca00f34f14f26e35";
+ sha256 = "0hbnwrhxj9wwjvxsk372ffgjqfkb3ljxhgi5h7wps2r15dxfvf3w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d17d019155e19c156f123dcd702f18cfba488701/recipes/typit";
@@ -70243,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";
@@ -70837,12 +71098,12 @@
use-package = callPackage ({ bind-key, diminish, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "use-package";
- version = "20170509.1157";
+ version = "20170524.2245";
src = fetchFromGitHub {
owner = "jwiegley";
repo = "use-package";
- rev = "54ce52604477c237b663a02d49be9d6d307d49bd";
- sha256 = "1rpyfbh0zp6a013nva2b1czis10mr8vzv52qlhgcfm78m48bvhya";
+ rev = "726eea13a3a4d75d630aac29d6b71d74d9dc69e3";
+ sha256 = "1r75ysdz6cj97vn46lj4g2a3hsab377f667a8bfs17rz007nddv4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3f9b52790e2a0bd579c24004873df5384e2ba549/recipes/use-package";
@@ -70883,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";
@@ -71236,12 +71497,12 @@
vdiff = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }:
melpaBuild {
pname = "vdiff";
- version = "20170320.1805";
+ version = "20170525.1231";
src = fetchFromGitHub {
owner = "justbur";
repo = "emacs-vdiff";
- rev = "f11c7c2eeef33a0b75fe4e025818e7e672c57397";
- sha256 = "1shkjk38piwrsn78bcy557zvm68xznlk4kg5l2fgiwfmmzdnvj13";
+ rev = "66ae1ac324d9ec7ef87abee38f260734f036cf3d";
+ sha256 = "0d8zam8p6qyzjr99n0jpmjav429qkjgg59gidmhgf0cbx2pyvy8s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e90f19c8fa4b0d267d269b76f117995e812e899c/recipes/vdiff";
@@ -71254,6 +71515,27 @@
license = lib.licenses.free;
};
}) {};
+ vdiff-magit = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, vdiff }:
+ melpaBuild {
+ pname = "vdiff-magit";
+ version = "20170519.1407";
+ src = fetchFromGitHub {
+ owner = "justbur";
+ repo = "emacs-vdiff-magit";
+ rev = "1ccf0a8be5aad18648fd59c775a8dd6070398b74";
+ sha256 = "1skcrpfgz2c9s9r2xvwanrvyczcqjgmjrwjm188d55l4pn8ylr83";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/2159275fabde8ec8b297f6635546b1314d519b8b/recipes/vdiff-magit";
+ sha256 = "1vjc1r5xfdg9bmscgppx1fps1w5bd0zpp6ab5z5dxlg2zx2vdldw";
+ name = "vdiff-magit";
+ };
+ packageRequires = [ emacs magit vdiff ];
+ meta = {
+ homepage = "https://melpa.org/#/vdiff-magit";
+ license = lib.licenses.free;
+ };
+ }) {};
vdirel = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, org-vcard, seq }:
melpaBuild {
pname = "vdirel";
@@ -71530,12 +71812,12 @@
vimish-fold = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "vimish-fold";
- version = "20161231.1600";
+ version = "20170519.729";
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "vimish-fold";
- rev = "1eb00dc2d803df411d7b2eae1c775eecc6512728";
- sha256 = "1shxvnlpb3hw3pa7883nmpzjy2q6cyww3r8x4yx3h315nvxwxfkq";
+ rev = "3e0bdb14ecce4f601ef37350a20e31167f7708bf";
+ sha256 = "1v80m7aficvjj0h1vg2d5pxznzh8y7fq5cwmi957cin30ac0k7cw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b4862b0a3d43f073e645803cbbf11d973a4b51d5/recipes/vimish-fold";
@@ -71885,12 +72167,12 @@
vue-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode, ssass-mode, vue-html-mode }:
melpaBuild {
pname = "vue-mode";
- version = "20170403.2159";
+ version = "20170514.2341";
src = fetchFromGitHub {
owner = "CodeFalling";
repo = "vue-mode";
- rev = "95ca5d13f55b7863fe187865c8c4f6e378af11a1";
- sha256 = "18dxqfkgg2ii6ys6vsi2y7jx26rk3pwh1z3wnqpw225x2jzfz7rv";
+ rev = "35d803b19a302e7206d1a54db47b6dcbb674ce88";
+ sha256 = "1j7qvj653gf7dwimwl26zvz5ki04bp7vlkwcxqkc9fshcjm5py1q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2e5e0a9fff332aeec09f6d3d758e2b67dfdf8397/recipes/vue-mode";
@@ -72028,12 +72310,12 @@
wakatime-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "wakatime-mode";
- version = "20170324.2348";
+ version = "20170517.2053";
src = fetchFromGitHub {
owner = "wakatime";
repo = "wakatime-mode";
- rev = "7172a92df66a69537c849182c22404715ddd9bfe";
- sha256 = "0scayq5vwxsilm90zbma8lc6fvmm6w7p3gfyphcvvsm93rx5601r";
+ rev = "b1eae15f38a367017e519c10837c44650631b154";
+ sha256 = "0l2nwjz978lamlikipljw143j40bnli7rzf9rixsia9iby4krl25";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a46036a0e53afbebacafd3bc9545c99af79ccfcc/recipes/wakatime-mode";
@@ -72322,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";
@@ -72427,12 +72709,12 @@
webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, request }:
melpaBuild {
pname = "webpaste";
- version = "20170510.1052";
+ version = "20170514.240";
src = fetchFromGitHub {
owner = "etu";
repo = "webpaste.el";
- rev = "f0a36e24cab482e3f33a9a70103f600b478f9c79";
- sha256 = "0kb2485sb6p9sfj1fh9dkw7vhss8pp3l95sys1h25rklinjb8hkq";
+ rev = "865ff10f5315ead9c9ed29edd9cbed85babf8c4c";
+ sha256 = "1mg9bfya0j3kax7h74jhx9mbf6a2l56qpchm8rxbvr31gkk1ffcg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/13847d91c1780783e516943adee8a3530c757e17/recipes/webpaste";
@@ -72557,8 +72839,8 @@
src = fetchFromGitHub {
owner = "mhayashi1120";
repo = "Emacs-wgrep";
- rev = "4e9f3d9822acab2d353c858d33ddaebb629fbfe8";
- sha256 = "14xja70gh9v3565fkl4b46swfrkmh6j6zg9pxwj5h1gicqrgaiwz";
+ rev = "1cdd7c136f1e7565bb13d2df69be3dc77b83698d";
+ sha256 = "057p99hq0r6z1k8sl15w3sxrqvlv0g9wp39zy1pqhccv2mn3g2d6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9648e3df896fcd97b3757a727108bc78261973cc/recipes/wgrep";
@@ -72578,8 +72860,8 @@
src = fetchFromGitHub {
owner = "mhayashi1120";
repo = "Emacs-wgrep";
- rev = "4e9f3d9822acab2d353c858d33ddaebb629fbfe8";
- sha256 = "14xja70gh9v3565fkl4b46swfrkmh6j6zg9pxwj5h1gicqrgaiwz";
+ rev = "1cdd7c136f1e7565bb13d2df69be3dc77b83698d";
+ sha256 = "057p99hq0r6z1k8sl15w3sxrqvlv0g9wp39zy1pqhccv2mn3g2d6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9648e3df896fcd97b3757a727108bc78261973cc/recipes/wgrep-ack";
@@ -72599,8 +72881,8 @@
src = fetchFromGitHub {
owner = "mhayashi1120";
repo = "Emacs-wgrep";
- rev = "4e9f3d9822acab2d353c858d33ddaebb629fbfe8";
- sha256 = "14xja70gh9v3565fkl4b46swfrkmh6j6zg9pxwj5h1gicqrgaiwz";
+ rev = "1cdd7c136f1e7565bb13d2df69be3dc77b83698d";
+ sha256 = "057p99hq0r6z1k8sl15w3sxrqvlv0g9wp39zy1pqhccv2mn3g2d6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2c50b704343c4cac5e2a62a67e284ba6d8e15f8a/recipes/wgrep-ag";
@@ -72616,12 +72898,12 @@
wgrep-helm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, wgrep }:
melpaBuild {
pname = "wgrep-helm";
- version = "20140528.1427";
+ version = "20170510.1539";
src = fetchFromGitHub {
owner = "mhayashi1120";
repo = "Emacs-wgrep";
- rev = "4e9f3d9822acab2d353c858d33ddaebb629fbfe8";
- sha256 = "14xja70gh9v3565fkl4b46swfrkmh6j6zg9pxwj5h1gicqrgaiwz";
+ rev = "1cdd7c136f1e7565bb13d2df69be3dc77b83698d";
+ sha256 = "057p99hq0r6z1k8sl15w3sxrqvlv0g9wp39zy1pqhccv2mn3g2d6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9648e3df896fcd97b3757a727108bc78261973cc/recipes/wgrep-helm";
@@ -72641,8 +72923,8 @@
src = fetchFromGitHub {
owner = "mhayashi1120";
repo = "Emacs-wgrep";
- rev = "4e9f3d9822acab2d353c858d33ddaebb629fbfe8";
- sha256 = "14xja70gh9v3565fkl4b46swfrkmh6j6zg9pxwj5h1gicqrgaiwz";
+ rev = "1cdd7c136f1e7565bb13d2df69be3dc77b83698d";
+ sha256 = "057p99hq0r6z1k8sl15w3sxrqvlv0g9wp39zy1pqhccv2mn3g2d6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c39faef3b9c2e1867cd48341d9878b714dbed4eb/recipes/wgrep-pt";
@@ -72679,12 +72961,12 @@
which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "which-key";
- version = "20170501.544";
+ version = "20170530.526";
src = fetchFromGitHub {
owner = "justbur";
repo = "emacs-which-key";
- rev = "9d2ba1bcba289fb81f92b797022b238c6b21f82e";
- sha256 = "01hfp4arbzfklhrmv0va7h8g8ykzgr52qqp2kgn8cim937wdwy6w";
+ rev = "3144b4c1fc774b63fc2350a0171e8ef01ab63298";
+ sha256 = "1fyg4b5ngf4k30x9rb5n62w2y9awc1lasrszxp9bg6ydmigncans";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key";
@@ -72784,12 +73066,12 @@
whizzml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "whizzml-mode";
- version = "20161115.1720";
+ version = "20170525.818";
src = fetchFromGitHub {
owner = "whizzml";
repo = "whizzml-mode";
- rev = "b5804004fb35c603468054cf179f4dd6936c8882";
- sha256 = "0x0cxwifqb8pv6j55iwxy7hdk0cvjz0zygayi494y4nhabcyp3kf";
+ rev = "92986cbb260642c129b049950036b2b6698a8bd9";
+ sha256 = "01mxjyan8bbjxl055f8zbsydsn01iszk3qi3668aa6i1m3vsz60h";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/11f26b15c326c3b8541bac510579b32493916042/recipes/whizzml-mode";
@@ -73302,12 +73584,12 @@
with-editor = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "with-editor";
- version = "20170417.1458";
+ version = "20170517.1242";
src = fetchFromGitHub {
owner = "magit";
repo = "with-editor";
- rev = "eb0083125eb69033d53374742fd4af7a850a97fb";
- sha256 = "0i0cw68vv8w01jwlxvs4zjh2b72msjq358x3cv074mzv1ma3y3v1";
+ rev = "3385ffdc6faed5a283e26a7ebf89825c700dd395";
+ sha256 = "1kznr0zv1y6lwsllpksqjzq2f4bc5a99lg19fmifn7w0dhv6fn0m";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor";
@@ -73638,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";
@@ -73827,12 +74109,12 @@
xah-css-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "xah-css-mode";
- version = "20170312.151";
+ version = "20170517.1634";
src = fetchFromGitHub {
owner = "xahlee";
repo = "xah-css-mode";
- rev = "b710877056cc91641aff82d26af01db728131563";
- sha256 = "0hmnbbdf2rsw24dspfbbdr0b0f4wlrrkw9pzc73dcn8y0pafavyg";
+ rev = "a5a19ee45b54eff7eeccd81b65ba42a0e9c7ba4c";
+ sha256 = "1x3vwqpbz06xg2wazg7skgsvgq36cs0445nrk2ahzvqknxh638vr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/57c2e2112c4eb50ee6ebddef9c3d219cc5ced804/recipes/xah-css-mode";
@@ -73848,12 +74130,12 @@
xah-elisp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "xah-elisp-mode";
- version = "20170127.1616";
+ version = "20170511.2126";
src = fetchFromGitHub {
owner = "xahlee";
repo = "xah-elisp-mode";
- rev = "c32bae59a8d8daf97769b1c57b70ef9fb8b2570c";
- sha256 = "1gs6h8csy8yz3f6gvqn3lx3i6xdqrddfhg54m4g8c5yxz0202yyg";
+ rev = "7cd242de67d9567c343d5f530134759c2a8115d2";
+ sha256 = "10z2c1hbprgi2hil72g4w109namgns4mibgd4v8j9wggphjy8v6y";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f2e996dd5b0061371662490e0b21d3c5bb506550/recipes/xah-elisp-mode";
@@ -73890,12 +74172,12 @@
xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "xah-fly-keys";
- version = "20170510.31";
+ version = "20170527.1910";
src = fetchFromGitHub {
owner = "xahlee";
repo = "xah-fly-keys";
- rev = "db24e037b4d24b848cfceb4be058d973dcb9b569";
- sha256 = "053yn6i0hcmyz6h8nfknhw4qrsdgz9jiblqxc7v5i81a6ng93mjk";
+ rev = "85748f769689d923ff7f88227c78ccd3315b8336";
+ sha256 = "07miaf7fgfl54pdjj7y6lymmk9yz1qyyvvdv4i1h1fshv07c57qd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fc1683be70d1388efa3ce00adc40510e595aef2b/recipes/xah-fly-keys";
@@ -73911,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";
@@ -73932,12 +74214,12 @@
xah-lookup = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "xah-lookup";
- version = "20170227.1044";
+ version = "20170517.1459";
src = fetchFromGitHub {
owner = "xahlee";
repo = "lookup-word-on-internet";
- rev = "4843663678db42827d12f2514f8ad4e2f4abcfb9";
- sha256 = "1hr4m5lrwhx1jf8zlwpx60w9528vq49j0q8kzydlsb895nivnn3s";
+ rev = "3872d3273b472202052dfd63a7d8e388f9517830";
+ sha256 = "0krmxp55gbmbxmzkj293v7i9c9lfxji47g0cmfjiyhzzamz1kdgw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/38e6609a846a3c7781e0f03730b79bbf8d0355a9/recipes/xah-lookup";
@@ -74016,12 +74298,12 @@
xahk-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "xahk-mode";
- version = "20161218.2311";
+ version = "20170523.1946";
src = fetchFromGitHub {
owner = "xahlee";
repo = "xahk-mode.el";
- rev = "24aa00cd0a8c47f7d8906379eeccbeca22c1a50b";
- sha256 = "1npa30kp5jaqn7qmsca0a3ch0428l4n8w0hix0bvlfwr5s4zksfy";
+ rev = "538b891a1565d109d079185b56332cd28dd846a7";
+ sha256 = "1rm3sih1rciszs7m9d29r7vkgs8q2kwpn8sdwadlycgjmk9c38s1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3d6422756b435f59ead15fa7e8081f5c88b2e93f/recipes/xahk-mode";
@@ -74289,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";
@@ -74643,22 +74925,22 @@
license = lib.licenses.free;
};
}) {};
- yankpad = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ yankpad = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "yankpad";
- version = "20170220.55";
+ version = "20170523.235";
src = fetchFromGitHub {
owner = "Kungsgeten";
repo = "yankpad";
- rev = "0f2af3671f5f3b879a2c9a3f521f1d4066889d58";
- sha256 = "0qx98klmc40064si47s7ivvyx3vzki1skyjkxszi6gl8g5k0i1dl";
+ rev = "1742630496f1994fe0746f8079582da5a168232d";
+ sha256 = "09qjpkk9q4xw395afnzf3rmwaahsrzhx0793p77rrpxckg64hrgz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e64746d10f9e0158621a7c4dc41dc2eca6ad573c/recipes/yankpad";
sha256 = "1w5r9zk33cjgsmk45znfg32ym06nyqj5q3knr59jmn1fafx7a3z4";
name = "yankpad";
};
- packageRequires = [];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/yankpad";
license = lib.licenses.free;
@@ -74686,12 +74968,12 @@
yapfify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "yapfify";
- version = "20170504.2218";
+ version = "20170519.115";
src = fetchFromGitHub {
owner = "JorisE";
repo = "yapfify";
- rev = "6bc89053a100f09f0568f67f3d47a3f94c392df2";
- sha256 = "0mg94x6kx6wsql0r12pasb84dhq23gpzgk3n8i09w4qyjajhf20y";
+ rev = "492eb038b35f49b1012fb843d880bccc40f2260b";
+ sha256 = "1jj1j525xlwhylsysay52f4rdrwz3r72ghx4iggkxqiqbv919ia4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/060c32d8e9fdc56fe702d265a935d74d76082f86/recipes/yapfify";
@@ -74791,12 +75073,12 @@
yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "yasnippet";
- version = "20170418.351";
+ version = "20170518.1753";
src = fetchFromGitHub {
owner = "joaotavora";
repo = "yasnippet";
- rev = "8797a31337895fe5fb29727c5ef289168a856a1b";
- sha256 = "0qvr7gbvjhh4n7j5hqj424v8np17x2kdcs1nx49p2zg9hm6y04ap";
+ rev = "1043b6c557f39a38b14b7618c174d8c47e946c4a";
+ sha256 = "1yn1aij0s4zibc51i7ya9wxmd6xfcr8769skm2d0psi1ng8wjfsc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet";
@@ -74832,11 +75114,11 @@
}) {};
yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
pname = "yatex";
- version = "20170503.1833";
+ version = "20170528.1711";
src = fetchhg {
url = "https://www.yatex.org/hgrepos/yatex/";
- rev = "428584533eab";
- sha256 = "1nrvlziqfsyvsk09ynpww99z4vb8zv8h2jxsslvx1nm1shyn2ckh";
+ rev = "c940797c19ad";
+ sha256 = "17jc65kaf37c86karq5fl2417i5csq5gn4yqagjzlik1cd6vrj03";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex";
@@ -74894,12 +75176,12 @@
ycmd = callPackage ({ cl-lib ? null, dash, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, request, request-deferred, s }:
melpaBuild {
pname = "ycmd";
- version = "20170509.2303";
+ version = "20170515.2255";
src = fetchFromGitHub {
owner = "abingham";
repo = "emacs-ycmd";
- rev = "05f0409fb7902daf49b4cd329e5c9ef569d77689";
- sha256 = "0mp05xsphbidjgskp2pnv2x54z95dzmvfwdddpgmysmc99sz305y";
+ rev = "b7ad7c440dc3640a46291a9acf98e523272e302b";
+ sha256 = "0cpq2kqhxg61rs6q53mfidgd96gna3czw90rhb6njhch01cv9i5m";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd";
@@ -75092,12 +75374,12 @@
zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "zenburn-theme";
- version = "20170430.758";
+ version = "20170511.1337";
src = fetchFromGitHub {
owner = "bbatsov";
repo = "zenburn-emacs";
- rev = "a035b214d6862289f8e0b1bf9fc737222da6b4a3";
- sha256 = "0wkcgm9n56ws8frw7zsdhvibzr5xmzg4in8bbfw3rr8na9ggvhh3";
+ rev = "2f31ef9a954ec08202668a8d1b004db5a05831a2";
+ sha256 = "0g4vgdzpbp0l734ajd1r9lj6qylljxaazk139lhzzyvmqd5dwaf9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/zenburn-theme";
@@ -75633,12 +75915,12 @@
zzz-to-char = callPackage ({ avy, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "zzz-to-char";
- version = "20161231.1557";
+ version = "20170519.335";
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "zzz-to-char";
- rev = "aaa854efb6b9e4451e97dfe90d37f368ff868b9e";
- sha256 = "1k66wsbgb7fqb5mbani0lzffy3yf0801rlgxwbkj34ciblz6a197";
+ rev = "b62414b155fe2e09d91b70059a909d1403d89acf";
+ sha256 = "07a086s3fpncr4plkmr89vghn7xwji9k69m64ri7i1vhnnl6q4zj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7063cbc1f1501ce81552d7ef1d42d1309f547c42/recipes/zzz-to-char";
diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index 8ac454a5047..9491122a7ad 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";
@@ -779,12 +800,12 @@
ace-popup-menu = callPackage ({ avy-menu, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ace-popup-menu";
- version = "0.2.0";
+ version = "0.2.1";
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "ace-popup-menu";
- rev = "3e771b470b0c633d7633dceec054fc05beac81f0";
- sha256 = "1qiiivkwa95bhyym8ly7fnwwglc9dcifkyr314bsq8m4rp1mgry4";
+ rev = "e7cc8bace9dda5c9fbe545c6fbd41c12679c3d7d";
+ sha256 = "1khqh5b9c7ass3q2gc04ayc8idanabkyfpaqvfnag063x16fv40c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/53742e2242101c4b3b3901f5c74e24facf62c7d6/recipes/ace-popup-menu";
@@ -863,12 +884,12 @@
add-hooks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "add-hooks";
- version = "2.2.0";
+ version = "3.0.0";
src = fetchFromGitHub {
owner = "nickmccurdy";
repo = "add-hooks";
- rev = "fa88bfc17c01f526a156a45ad00fa66cc0909805";
- sha256 = "0jq9gywg6zvlv8rmvw5vv3228y0k4pk1bczygiwfmav13g0dnb1k";
+ rev = "9b1bdb91c59ea9c2cc0aba48262c49069273d856";
+ sha256 = "1jzgyfcr6m64q79qibnbqa41sbpivslwk2hygbk9yp46l5vgj1hc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/901f846aef46d512dc0a1770bab7f07c0ae330cd/recipes/add-hooks";
@@ -884,12 +905,12 @@
add-node-modules-path = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "add-node-modules-path";
- version = "1.0.0";
+ version = "1.1.0";
src = fetchFromGitHub {
owner = "codesuki";
repo = "add-node-modules-path";
- rev = "9ed240e05dcb9628ba380151b54b02688be5e78e";
- sha256 = "0avv3ypdpscchq9n1lxs0ba0fc52zjyv7dbv54s7sclqxx4mi63k";
+ rev = "8eef7fa6765af1716fc21db08f19f3d3e9b68998";
+ sha256 = "1dm2gdhs9zy5jqhbqipdgzfj24mrzxz064ax9l2dg0lqylk1dc0q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/63e99d8fc0678d7b1831cae8940e9e6547780861/recipes/add-node-modules-path";
@@ -1157,12 +1178,12 @@
all-the-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild, memoize }:
melpaBuild {
pname = "all-the-icons";
- version = "2.6.2";
+ version = "2.6.4";
src = fetchFromGitHub {
owner = "domtronn";
repo = "all-the-icons.el";
- rev = "f21e1004e0e115a73e503b92e8a4faf656fa413a";
- sha256 = "022pk57dszg253bk7q5p0sp91ihc7dnyvky49b73gwcm77jgrjzd";
+ rev = "7134b7467a7061b57c8cda3503e9644d4ed92a2a";
+ sha256 = "0xwj8wyj0ywpy4rcqxz15hkr8jnffn7nrp5fnq56j360v8858q8x";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons";
@@ -1645,22 +1666,22 @@
license = lib.licenses.free;
};
}) {};
- apib-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }:
+ apib-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }:
melpaBuild {
pname = "apib-mode";
- version = "0.6";
+ version = "0.7";
src = fetchFromGitHub {
owner = "w-vi";
repo = "apib-mode";
- rev = "18aebab7cd61b9d296b7d5d2de0c828e2058c906";
- sha256 = "0sj948j4s26sxxandjzjjzmjqma7vf86msyyi23gsljy1q28vwlf";
+ rev = "6cc7c6f21b8e415b1718bb6a07ab2182e9e9dde6";
+ sha256 = "1717f78kaqkmbhfwb9kzsv5wi2zabcbwb4wh1jklhcaalvmk3z7d";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/dc2ebb04f975d8226a76260895399c937d6a1940/recipes/apib-mode";
sha256 = "0y3n0xmyc4gkypq07v4sp0i6291qaj2m13zkg6mxp61zm669v2fb";
name = "apib-mode";
};
- packageRequires = [ emacs markdown-mode ];
+ packageRequires = [ markdown-mode ];
meta = {
homepage = "https://melpa.org/#/apib-mode";
license = lib.licenses.free;
@@ -2320,12 +2341,12 @@
avy-menu = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "avy-menu";
- version = "0.1.0";
+ version = "0.1.1";
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "avy-menu";
- rev = "9b8c6be09487dd3e804a10761266c4f22923eb9c";
- sha256 = "1564yv9330vjymw3xnikc2lz20f65n40fbl8m1zs1gp4nlgzkk38";
+ rev = "71b71e64900d0637e17013781042e086e9bf56e7";
+ sha256 = "1mxrq2fpx3qa9vy121wnv02r43sb7djc2j8z7c2vh8x56h8bpial";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2f0b4cfb30c405d44803b36ebcaccef0cf87fe2d/recipes/avy-menu";
@@ -3250,12 +3271,12 @@
buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "buttercup";
- version = "1.6";
+ version = "1.7";
src = fetchFromGitHub {
owner = "jorgenschaefer";
repo = "emacs-buttercup";
- rev = "c95b95fe8d93eeed510c281990842718a21e53b3";
- sha256 = "077hxzichvr406m9grdxjf31k0l33g6wh9zdvx73f7crsmzxhkzy";
+ rev = "d8dc80da12cc1e71fcf54b0f4deb8d229bc97beb";
+ sha256 = "0zsf2qk41i1ay6h85d1ppj5qnzdrb9n09bzj9s9hk7ysag1rlqj1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b187cb5b3cc5b546bfa6b94b6792e6363242d1/recipes/buttercup";
@@ -3667,6 +3688,27 @@
license = lib.licenses.free;
};
}) {};
+ ceylon-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "ceylon-mode";
+ version = "0.1";
+ src = fetchFromGitHub {
+ owner = "lucaswerkmeister";
+ repo = "ceylon-mode";
+ rev = "5817a8ff2189a8dd0ee77b8ff23353ca81ee4f38";
+ sha256 = "0n0kz0s2w82lbhzxmh8pq9xqnmc60ni0srvbwjbsinakwgkispf6";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/09cd1a2ccf33b209a470780a66d54e1b1d597a86/recipes/ceylon-mode";
+ sha256 = "0dgqmmb8qmvzn557h0fw1mx4y0p96870l8f8glizkk3fifg7wgq4";
+ name = "ceylon-mode";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/ceylon-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
cfengine-code-style = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cfengine-code-style";
@@ -3712,12 +3754,12 @@
char-menu = callPackage ({ avy-menu, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "char-menu";
- version = "0.1.0";
+ version = "0.1.1";
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "char-menu";
- rev = "5bdd7e880f89f27dbabe11def0fd31225b7f1c0a";
- sha256 = "0vb03k10i8vwy5wv65xl15kcsh9zz4y2xhpgndih87ssckdnhhlw";
+ rev = "f4d8bf8fa6787e2aaca2ccda5223646541d7a4b2";
+ sha256 = "0zyi1ha17jk3zz7nirasrrx43j3jkrsfz7ypbc4mk44w7hsvx2hj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f6676747e853045b3b19e7fc9524c793c6a08303/recipes/char-menu";
@@ -3751,6 +3793,27 @@
license = lib.licenses.free;
};
}) {};
+ chatwork = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "chatwork";
+ version = "0.3";
+ src = fetchFromGitHub {
+ owner = "ataka";
+ repo = "chatwork";
+ rev = "fea231d479f06bf40dbfcf45de143eecc9ed744c";
+ sha256 = "163xr18lm4awfgh4lcp7pr04jirpvlk8w1g4445zbxbpjfvv268z";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/77ae72e62b8771e890525c063522e7091ca8f674/recipes/chatwork";
+ sha256 = "0p71swcpfqbx2zmp5nh57f0m30cn68g3019005wa5x4fg7dx746p";
+ name = "chatwork";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/chatwork";
+ license = lib.licenses.free;
+ };
+ }) {};
checkbox = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "checkbox";
@@ -3964,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";
@@ -4605,12 +4668,12 @@
common-lisp-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
melpaBuild {
pname = "common-lisp-snippets";
- version = "0.1.1";
+ version = "0.1.2";
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "common-lisp-snippets";
- rev = "3b2b50fda8b1526d45a74e3d30f560d6b6bbb284";
- sha256 = "1cc9ak9193m92g6l4mrfxbkkmvljl3c51d0xzdidwww978q3x6ad";
+ rev = "fc5c2683952328927a6d1c1f2694b85ddf7e9053";
+ sha256 = "1835kg05794p1wdi7fsmpzlnnqy79dgfnfrxjfjj2j1gzcwmynsw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/48d0166ccd3dcdd3df4719349778c6c5ab6872ca/recipes/common-lisp-snippets";
@@ -4878,12 +4941,12 @@
company-irony = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, irony, lib, melpaBuild }:
melpaBuild {
pname = "company-irony";
- version = "0.1.1";
+ version = "1.0.0";
src = fetchFromGitHub {
owner = "Sarcasm";
repo = "company-irony";
- rev = "c09f66c26bdd0dda007559a5c9bccfca0bd49ccd";
- sha256 = "17zi0xx8p2diwy1wgrhl6j8p57alwz24rjpz4apyyrqjk09ippq4";
+ rev = "cebd82506c59d21a9c436bd8e8a33dfa8be84955";
+ sha256 = "09mzxyvp07qwdhxagyiggpccxsklkbhjg730q6wbqd13g1mlkryj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/company-irony";
@@ -5070,43 +5133,43 @@
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;
};
}) {};
- company-shell = callPackage ({ cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ company-shell = callPackage ({ cl-lib ? null, company, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "company-shell";
- version = "1.0";
+ version = "1.2.1";
src = fetchFromGitHub {
owner = "Alexander-Miller";
repo = "company-shell";
- rev = "40599df46a7e4b7b1ef5ad6e23764dda8510bbf4";
- sha256 = "1qnlqwifrlbzcsi1lf1s7c32v6szpi5n6ngmj2lmdyic2b3pv1id";
+ rev = "acdbf8cba6ad9831d81a77bab7bbfd50f19edd86";
+ sha256 = "1dk927da7g4a39sva9bda978bx6hpiz5kf341fj8sb7xhryvh5r2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/bbaa05d158f3806b9f79a2c826763166dbee56ca/recipes/company-shell";
sha256 = "0my9jghf3s4idkgrpki8mj1lm5ichfvznb09lfwf07fjhg0q1apz";
name = "company-shell";
};
- packageRequires = [ cl-lib company dash ];
+ packageRequires = [ cl-lib company dash emacs ];
meta = {
homepage = "https://melpa.org/#/company-shell";
license = lib.licenses.free;
@@ -5826,6 +5889,27 @@
license = lib.licenses.free;
};
}) {};
+ cubicaltt = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "cubicaltt";
+ version = "1.0";
+ src = fetchFromGitHub {
+ owner = "mortberg";
+ repo = "cubicaltt";
+ rev = "3257eadf70826fb3ef060c46f85b7a4d60464b1d";
+ sha256 = "1c5nfzsj4bi2rk3d3r2iw03kkpc5dg9p3q3xzj7cxfg2wmg1xaxk";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/1be42b49c206fc4f0df6fb50fed80b3d9b76710b/recipes/cubicaltt";
+ sha256 = "1wgy6965cnw201wx4a2pn71sa40mh2712y0d0470klr156krj0n9";
+ name = "cubicaltt";
+ };
+ packageRequires = [ cl-lib emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/cubicaltt";
+ license = lib.licenses.free;
+ };
+ }) {};
cuda-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cuda-mode";
@@ -5850,12 +5934,12 @@
cyberpunk-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cyberpunk-theme";
- version = "1.18";
+ version = "1.19";
src = fetchFromGitHub {
owner = "n3mo";
repo = "cyberpunk-theme.el";
- rev = "bec963abce7a208ec192a8349ed0b8e1ac3b3041";
- sha256 = "1adbws88113lfm5ljahms12aji1swip732l7pamxwibfywhgpn2f";
+ rev = "8c3cc39bcff5def0d476c080b5248436da7f990f";
+ sha256 = "1npwrw3pgdmvqhihcqcfi2yrs178iiip5fcj8zhpp6cr9yqsvvgi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4c632d1e501d48dab54432ab111ce589aa229125/recipes/cyberpunk-theme";
@@ -5871,12 +5955,12 @@
cyphejor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cyphejor";
- version = "0.1.1";
+ version = "0.1.2";
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "cyphejor";
- rev = "9e1cdaaaf86f3acae074e40d96de008115d81ef9";
- sha256 = "04add8i0g4x5kzi1yd49i5viq9i2f5r5gzq33k05q6rimsp2ga02";
+ rev = "d7842388a1872b165489624a1a68f536de97e28d";
+ sha256 = "1gi7rp0vf3iahljzjhs3rj9c0rvfcfs93hr8a3hl0ch3h9qq8ng2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ad7cacfa39d8f85e26372ef21898663aebb68e43/recipes/cyphejor";
@@ -7307,8 +7391,8 @@
version = "0.7";
src = fetchhg {
url = "https://bitbucket.com/harsman/dyalog-mode";
- rev = "2c70af4813fc";
- sha256 = "0brhk5q0jdb3p9nlsfk2bjixqymy4lmrqha138idpx47ka7cjsvn";
+ rev = "56fa34ea25d4";
+ sha256 = "1hk7i557m0m42zdg59z278cylglnp49dr8wa3zbdwzk2xzdg0m00";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode";
@@ -7492,12 +7576,12 @@
easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "easy-hugo";
- version = "0.6.6";
+ version = "0.9.7";
src = fetchFromGitHub {
owner = "masasam";
repo = "emacs-easy-hugo";
- rev = "5ea62c254c61fcad89d1620ce40b6fda65586d65";
- sha256 = "0p961msrkqxc99rkjdy79x1pdns4dfbvdmv8yl0zi4ib3b07qar1";
+ rev = "708bea9516812c6641ef8fc6f42dc087036addd8";
+ sha256 = "0yz0q3qvv9qxvwvjqd9zjqrrg6qxag092ni16vpni1mihw5803b8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo";
@@ -7576,12 +7660,12 @@
ebal = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }:
melpaBuild {
pname = "ebal";
- version = "0.2.0";
+ version = "0.2.1";
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "ebal";
- rev = "4d2ffa7ffbdfd6ee8a39a268e7c7c0de0905df6b";
- sha256 = "0ysym38xaqyx1wc7xd3fvjm62dmiq4727dnjvyxv7hs4czff1gcb";
+ rev = "2d274ee56d5a61152e846f9a759ebccd70dc8eb1";
+ sha256 = "15hygzw52w5c10hh3gq0hzs499h8zkn1ns80hb2q02cn9hyy962q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/629aa451162a0085488caad4052a56366b7ce392/recipes/ebal";
@@ -7618,12 +7702,12 @@
ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }:
melpaBuild {
pname = "ebib";
- version = "2.10.2";
+ version = "2.11.3";
src = fetchFromGitHub {
owner = "joostkremers";
repo = "ebib";
- rev = "558097220099505994b7e9a2ea9e1208da6c5668";
- sha256 = "1v9x69jzsfl7kh5nnbax218xykylz6ib0f73f9yrsjbmgap3fvva";
+ rev = "ee28c043492a550c68ca2f465042cd51ef150b9e";
+ sha256 = "0jzw313hn7srr9mhwygl56iibx0wxra4php6pk9isbl338cw3gv0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib";
@@ -7991,22 +8075,22 @@
license = lib.licenses.free;
};
}) {};
- ein = callPackage ({ cl-generic, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }:
+ ein = callPackage ({ cl-generic, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }:
melpaBuild {
pname = "ein";
- version = "0.12.2";
+ version = "0.12.5";
src = fetchFromGitHub {
owner = "millejoh";
repo = "emacs-ipython-notebook";
- rev = "0ede9e7ef64017039748b8f47de4df834b0443ed";
- sha256 = "03fm7lhfzrhn4dddlhqx6v1dqfgz6rj352y0znnfdaskzychw1sa";
+ rev = "9b4b9e28e307368568560a4290b278bc480e4173";
+ sha256 = "0hgg6wckxlmwg45jsl35zxxd08apsk0csi1sp9jhy72alah2mflp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein";
sha256 = "14blq1cbrp00rq0ilk7z9qppqfj0r4n3jidw3abcpchvh5ln086r";
name = "ein";
};
- packageRequires = [ cl-generic request websocket ];
+ packageRequires = [ cl-generic dash request websocket ];
meta = {
homepage = "https://melpa.org/#/ein";
license = lib.licenses.free;
@@ -8519,12 +8603,12 @@
elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }:
melpaBuild {
pname = "elpy";
- version = "1.15.0";
+ version = "1.15.1";
src = fetchFromGitHub {
owner = "jorgenschaefer";
repo = "elpy";
- rev = "574605dce756e878457164817e6d63d915008a84";
- sha256 = "1q8ll1sxdvxgd6mqwz55bv2zwxgz2rqlzyk2xksnh9sna4bhr6xv";
+ rev = "55ee3d57872c87cb640abd5d63ac1887f9e8dc5d";
+ sha256 = "0866l17sqq2p7bla2krg10y70wgsxf158kashcgschfr0h2f7r1i";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy";
@@ -9734,6 +9818,27 @@
license = lib.licenses.free;
};
}) {};
+ eslint-fix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "eslint-fix";
+ version = "1.0.0";
+ src = fetchFromGitHub {
+ owner = "codesuki";
+ repo = "eslint-fix";
+ rev = "be90d1e78b1dfd43b6b3b1c06868539e2ac27d3a";
+ sha256 = "1l7pm0ywjby0giilyn6qsz1zh54sgmvmii7y9jhrva13c5kgg9an";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eslint-fix";
+ sha256 = "0ry271jlv95nhdqx6qxmvkpa10lpwkg1q6asnliviwplq2mxw2da";
+ name = "eslint-fix";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/eslint-fix";
+ license = lib.licenses.free;
+ };
+ }) {};
eslintd-fix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "eslintd-fix";
@@ -10369,14 +10474,14 @@
pname = "evil-org";
version = "0.1.1";
src = fetchFromGitHub {
- owner = "edwtjo";
+ owner = "Somelauw";
repo = "evil-org-mode";
rev = "2d7c58dbeca0d4ac7b4eab5f47b77946951f27e9";
sha256 = "09l0ph9rc941kr718zq0dw27fq6l7rb0h2003ihw7q0a5yr8fpk7";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/evil-org";
- sha256 = "1306pf5ws7acdanypn3c0r4yh5wxdf0knl6j3hhs4ys9zszd79bw";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/1768558ed0a0249421437b66fe45018dd768e637/recipes/evil-org";
+ sha256 = "18glpsnpxap4dvnvkl59h9pnwlp20libsfbbkmvrbzsvbdyspg6z";
name = "evil-org";
};
packageRequires = [ evil org ];
@@ -10432,14 +10537,14 @@
pname = "evil-search-highlight-persist";
version = "1.8";
src = fetchFromGitHub {
- owner = "juanjux";
+ owner = "naclander";
repo = "evil-search-highlight-persist";
rev = "0e2b3d4e3dec5f38ae95f62519eb2736f73c0b85";
sha256 = "1jfi2k9dm0cc9bx8klppm965ydhdw17a2n664199vhxrap6g27yk";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/91361f95852910968b395423e16377c70189fc55/recipes/evil-search-highlight-persist";
- sha256 = "0iia136js364iygi1mydyzwvizhic6w5z9pbwmhva4654pq8dzqy";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/f2e91974ddb219c88229782b70ade7e14f20c0b5/recipes/evil-search-highlight-persist";
+ sha256 = "08l8ymrp9vkpwprq9gp4562yvcnd4hfc3z7n4n5lz7h6ffv3zym3";
name = "evil-search-highlight-persist";
};
packageRequires = [ highlight ];
@@ -10828,12 +10933,12 @@
exwm-x = callPackage ({ cl-lib ? null, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper, switch-window }:
melpaBuild {
pname = "exwm-x";
- version = "0.7.1";
+ version = "1.0";
src = fetchFromGitHub {
owner = "tumashu";
repo = "exwm-x";
- rev = "503051b19858ede766c4987f65e7c375d0200e3b";
- sha256 = "0m0fhi5pxq43kyl4shqz199x6mnwyxjk62z338vlmd6g8izlg5j7";
+ rev = "47952c09e74fc0da3135e7ba0d4fef0eb88f98dc";
+ sha256 = "14mf388iygirlv7j5db2x5avn70b54mm34kd3y851n6i6yzgz7jw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a0e6e23bcffdcd1e17c70599c563609050e5de40/recipes/exwm-x";
@@ -11164,12 +11269,12 @@
find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "find-file-in-project";
- version = "5.3.0";
+ version = "5.3.1";
src = fetchFromGitHub {
owner = "technomancy";
repo = "find-file-in-project";
- rev = "9416c3db483dc86530a204f5ae1b587c5c3c8cec";
- sha256 = "16mwa3si70z2q8g859vbc0al3h8mjig8z6m3l7a0lrx373mp205j";
+ rev = "d84263bdac55501e05662caffcb0642bb8bb4a53";
+ sha256 = "0f133fpa53sqrx9a4hycvqzi3sbaswxdbma25isfrr0g9kf7j7db";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project";
@@ -11311,12 +11416,12 @@
fix-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fix-input";
- version = "0.1.0";
+ version = "0.1.1";
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "fix-input";
- rev = "728ae9258ebe790a69cf332407cba2f8c0be7d81";
- sha256 = "16rd23ygh76fs4i7rni94k8gwa9n360h40qmhm65snp31kqnpr1p";
+ rev = "a70edfa7880ff9b082f358607d2a9ad6a8dcc8f3";
+ sha256 = "121m0h0nwxr27f9d2llbgl63ni1makcg66lnvg24wx07wggf0n8z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7d31f907997d1d07ec794a4f09824f43818f035c/recipes/fix-input";
@@ -11353,12 +11458,12 @@
fix-word = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fix-word";
- version = "0.1.1";
+ version = "0.1.2";
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "fix-word";
- rev = "256a87d4b871ead0975fa0e7f76a1ecbaa074582";
- sha256 = "1hj5jp4vbkcmnc8l2hqsvjc76f7c9zcsq8znwcwv2nv9xj9hlbkr";
+ rev = "91552cbceac8e2b7c23036f044fc84f5c6f8e338";
+ sha256 = "1pilsd3hkryyl4sd6s4nvmraszkdmcn3qdqi939yjgzp4lz3q412";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/22636390e8a15c09293a1506a901286dd72e565f/recipes/fix-word";
@@ -11966,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;
@@ -12599,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";
@@ -12993,8 +13098,8 @@
sha256 = "0manmkd66355g1fw2q1q96ispd0vxf842i8dcr6g592abrz5lhi7";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/fstar-mode";
- sha256 = "1cjwai0qf48m18dsa0r9sh4qlgvdzg5ajfbmxxc2vqzcl5ygrxjx";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/c58ace42342c3d3ff5a56d86a16206f2ecb45f77/recipes/fstar-mode";
+ sha256 = "1kwa6gqh91265vpp4gcady2brkizfkfjj0gnya9lar6x7rn4gj7s";
name = "fstar-mode";
};
packageRequires = [ dash emacs ];
@@ -13256,12 +13361,12 @@
geben-helm-projectile = callPackage ({ emacs, fetchFromGitHub, fetchurl, geben, helm-projectile, lib, melpaBuild }:
melpaBuild {
pname = "geben-helm-projectile";
- version = "0.0.3";
+ version = "0.0.4";
src = fetchFromGitHub {
owner = "ahungry";
repo = "geben-helm-projectile";
- rev = "14db489efcb20c5aa9102288c94cec3c5a87c35d";
- sha256 = "1nd1jhy393vkn2g65zhygxkpgna0l8gkndxr8jb6qjkkapk58k8l";
+ rev = "31ce0faca5dcc71924884f03fd5a7a25d00ccd9b";
+ sha256 = "0a1srhwfbgkvndjfi9irg5s6snlxyqrw1vwyqg1sn8aqnbpgib04";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b7d28c45304a69e6ca78b3d00df2563171c027ee/recipes/geben-helm-projectile";
@@ -13484,6 +13589,27 @@
license = lib.licenses.free;
};
}) {};
+ ghub-plus = callPackage ({ apiwrap, emacs, fetchFromGitHub, fetchurl, ghub, lib, melpaBuild }:
+ melpaBuild {
+ pname = "ghub-plus";
+ version = "0.1.4";
+ src = fetchFromGitHub {
+ owner = "vermiculus";
+ repo = "ghub-plus";
+ rev = "44a5558eb299adee1463b7120c23b26b1d914ea8";
+ sha256 = "0fn5rb7ba4p39if68alvxv321918pki010vfylpp6jk98kzzh487";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/03a412fd25218ff6f302734e078a699ff0234e36/recipes/ghub+";
+ sha256 = "0xx7nwmjx3f7z6z164x1lb9arbb3m3d16mpn92v66w572rhbr34n";
+ name = "ghub-plus";
+ };
+ packageRequires = [ apiwrap emacs ghub ];
+ meta = {
+ homepage = "https://melpa.org/#/ghub+";
+ license = lib.licenses.free;
+ };
+ }) {};
gist = callPackage ({ emacs, fetchFromGitHub, fetchurl, gh, lib, melpaBuild }:
melpaBuild {
pname = "gist";
@@ -15574,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";
@@ -15889,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";
@@ -15973,12 +16099,12 @@
helm-dired-history = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-dired-history";
- version = "1.2";
+ version = "1.3";
src = fetchFromGitHub {
owner = "jixiuf";
repo = "helm-dired-history";
- rev = "9480383b6ccede6f7c200fbd50aaeb2898b3a008";
- sha256 = "0cfq06lray7hpnhkwnhjq18izyk2w0m4cxqg0m5nyidiwc4qssqa";
+ rev = "281523f9fc46cf00fafd670ba5cd16552a607212";
+ sha256 = "1bqavj5ljr350dckyf39i9plkb0rbhyd17ka94n2g6daapgpq0x6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-dired-history";
@@ -15994,12 +16120,12 @@
helm-emms = callPackage ({ cl-lib ? null, emacs, emms, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-emms";
- version = "1.0";
+ version = "1.3";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm-emms";
- rev = "ed3da37e86ea5dabc15da708335b1e439ae0777d";
- sha256 = "0330s07b41nw9q32xhjdl7yw83p8ikj6b2qkir3y0jyx16gk10dl";
+ rev = "d7da090af0f63b92c5d735197992c732adbeef3d";
+ sha256 = "0fs0i33di3liyx1f55xpg5nmac1b750n37g3pkxw2mil7fx7dz32";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/db836b671705607f6cd9bce8229884b1f29b4a76/recipes/helm-emms";
@@ -16852,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";
@@ -18448,6 +18595,27 @@
license = lib.licenses.free;
};
}) {};
+ importmagic = callPackage ({ emacs, epc, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "importmagic";
+ version = "1.0";
+ src = fetchFromGitHub {
+ owner = "anachronic";
+ repo = "importmagic.el";
+ rev = "135e049d763ceb4cabd0bab068c4c71452459065";
+ sha256 = "1fzd3m0zwgyh3qmkhzcvgsgbnjv8nzy30brsbsa081djj5d2dagq";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/importmagic";
+ sha256 = "1kpmgpll0zz3zlr3q863v1fq6wmwdwx7mn676x0r7g4iy1bdslmv";
+ name = "importmagic";
+ };
+ packageRequires = [ emacs epc f ];
+ meta = {
+ homepage = "https://melpa.org/#/importmagic";
+ license = lib.licenses.free;
+ };
+ }) {};
indent-guide = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "indent-guide";
@@ -18493,12 +18661,12 @@
inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "inf-clojure";
- version = "2.0.0";
+ version = "2.0.1";
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "inf-clojure";
- rev = "c797a5aea3d2126b19c48ed99aefe3ebddd5f304";
- sha256 = "1m8bkh8mwl1zbvpgllrghpqr5m86lkwxn3jl3i0qd60arwy51iiy";
+ rev = "956b22e7941d71216799ca4e8d5244e94fad9558";
+ sha256 = "1wakfwmb43na3g2yqign764kwi791x7ikzmf76pkdpky70a5dkhz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure";
@@ -18514,12 +18682,12 @@
inf-ruby = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "inf-ruby";
- version = "2.5.0";
+ version = "2.5.1";
src = fetchFromGitHub {
owner = "nonsequitur";
repo = "inf-ruby";
- rev = "54eb6bf6d68d71bdac63fcb2042d8e1c554b427f";
- sha256 = "0yqcl2r8kwdl99704vm8qsdzziidznp0gpyr29ipya7fl24nkfxr";
+ rev = "81adadf0f98122b655d0c2bee9c8074d2b6a3ee2";
+ sha256 = "1r452h6cyypqlc59q8dx5smkwhck4qjcg1pf9qdw539cpva5q77z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/inf-ruby";
@@ -18849,12 +19017,12 @@
irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
melpaBuild {
pname = "irony";
- version = "0.2.1";
+ version = "1.0.0";
src = fetchFromGitHub {
owner = "Sarcasm";
repo = "irony-mode";
- rev = "250ed1e03359fe5b29070da13cd55abc6deb0cda";
- sha256 = "168bnirfqpgiqmrjs52ixzqzq074y9szvxi6bml9zbxi8dcmafaq";
+ rev = "2424f57a3c0d320946c7ad32b44d296a91104201";
+ sha256 = "13lg7ra4g3nbg96vbwk1giw2pjhqarpd72qi21x57w3lc44fwqld";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony";
@@ -18933,12 +19101,12 @@
ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "ivy-erlang-complete";
- version = "0.2.2";
+ version = "0.2.3";
src = fetchFromGitHub {
owner = "s-kostyaev";
repo = "ivy-erlang-complete";
- rev = "906c31b679a4a676fe593a9620fbfc3707afb616";
- sha256 = "1sxz8cyr9i4nk5vrvf6qag8i7yrgqnxyhkilrqrmdyf6vw1vxgag";
+ rev = "2d93b1b0ec1705e449f2e0f43073aacc8f1e3242";
+ sha256 = "0lrnd5r9ycy2qqggqd0sr6b2w7s28yfm15pgyh0r0rjdxky4a5vm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete";
@@ -19035,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";
@@ -20128,12 +20317,12 @@
kubernetes = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
melpaBuild {
pname = "kubernetes";
- version = "0.11.0";
+ version = "0.11.3";
src = fetchFromGitHub {
owner = "chrisbarrett";
repo = "kubernetes-el";
- rev = "1b70b632f0e8aa851c2a54f8b19881b4657b541d";
- sha256 = "044864d12h7ddv42b8kmnppm2ccmxl1nzarbvgkszxgmg7f6c14z";
+ rev = "560b65baef1c4f2bedffd8e767774b55dfc35594";
+ sha256 = "0n9msgawac0jbid671nfr8c5z1zw89wnfw021igxaqwqrl3438rw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/16850227ea48f6f38102b9cdf80e0758766a24d2/recipes/kubernetes";
@@ -20149,12 +20338,12 @@
kubernetes-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, kubernetes, lib, melpaBuild }:
melpaBuild {
pname = "kubernetes-evil";
- version = "0.11.0";
+ version = "0.11.3";
src = fetchFromGitHub {
owner = "chrisbarrett";
repo = "kubernetes-el";
- rev = "1b70b632f0e8aa851c2a54f8b19881b4657b541d";
- sha256 = "044864d12h7ddv42b8kmnppm2ccmxl1nzarbvgkszxgmg7f6c14z";
+ rev = "560b65baef1c4f2bedffd8e767774b55dfc35594";
+ sha256 = "0n9msgawac0jbid671nfr8c5z1zw89wnfw021igxaqwqrl3438rw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/16850227ea48f6f38102b9cdf80e0758766a24d2/recipes/kubernetes-evil";
@@ -21483,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;
@@ -21640,12 +21829,12 @@
mastodon = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mastodon";
- version = "0.6.2";
+ version = "0.7.0";
src = fetchFromGitHub {
owner = "jdenen";
repo = "mastodon.el";
- rev = "ac10d7a647aa77aa933076a523a48ec0a283dd15";
- sha256 = "1cy11qlms6499vjphnx5yxpknvs1a90q67ibrijhwyhsy9gi798l";
+ rev = "a9e595142eee69fe84f0ab06f7fde76cef27cdac";
+ sha256 = "1wgx8i6ww9w99f0f62p7v626bb6pvdg04hnhqyjgsmb99wzwlpk7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/809d963b69b154325faaf61e54ca87b94c1c9a90/recipes/mastodon";
@@ -21829,12 +22018,12 @@
meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
melpaBuild {
pname = "meghanada";
- version = "0.7.5";
+ version = "0.7.10";
src = fetchFromGitHub {
owner = "mopemope";
repo = "meghanada-emacs";
- rev = "54be7c38ceeb7de4bd926a577f9920e174534b37";
- sha256 = "0apqxpkngyygfdj1wnqs5fl87bfbb4m5vis9cv8q3fcq92yhjqa1";
+ rev = "71e28b98653ff269a30ddf32d8ecef43a8656d76";
+ sha256 = "0wrxriqg3dn90za52pzsmvqaszkqmx0xmxkzghlq8s21xc21kznp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
@@ -21931,27 +22120,6 @@
license = lib.licenses.free;
};
}) {};
- metafmt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "metafmt";
- version = "0.0.3";
- src = fetchFromGitHub {
- owner = "lvillani";
- repo = "metafmt";
- rev = "bd20fc67d0affd48c1199315b7da06a7182e7d76";
- sha256 = "0n4nv1s25z70xfy3bl1wy467abz3agj4qmpx4rwdwzbarnqp9ps3";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/7a53f740fb7a58cd6339b301d0de8c543b61f6a5/recipes/metafmt";
- sha256 = "1ca102al7r3k2g92b4jkqv53crnmxy3z7cz31w1rprf41s69mn75";
- name = "metafmt";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/metafmt";
- license = lib.licenses.free;
- };
- }) {};
metaweblog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }:
melpaBuild {
pname = "metaweblog";
@@ -22353,12 +22521,12 @@
modalka = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "modalka";
- version = "0.1.4";
+ version = "0.1.5";
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "modalka";
- rev = "95627e660768c7ab7af4d8ad35c2bc0c4fa7195b";
- sha256 = "0yf5lwd95j55dkrkplsgnynq37ww0g97vw517j9q7spn7dqnq5f6";
+ rev = "1259afa084f58d143d133aac56a6c0c10bc460f2";
+ sha256 = "0ggj8q92sb6wp3hs1vhpmy56id0p3i9zwnw24g2v7xa7w8ac9s7l";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fa0a02da851a603b81e183f461da55bf4c71f0e9/recipes/modalka";
@@ -22542,12 +22710,12 @@
move-dup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "move-dup";
- version = "0.2.1";
+ version = "1.0.0";
src = fetchFromGitHub {
owner = "wyuenho";
repo = "move-dup";
- rev = "4df67072eebac69d6be7619335b03f56f9960235";
- sha256 = "01mdy7sps0xryz5gfpl083rv7ixkxs2rkz5yaqjlam2rypdcsyy2";
+ rev = "dae61de7aa5e2bf56a7bab1fa36fa3a39520a3c0";
+ sha256 = "1mrrxx2slxi1qgf483nnxv3y8scfsc844sfnzn4b7hjpfpali0r8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3ea1f7f015a366192492981ff75672fc363c6c18/recipes/move-dup";
@@ -22584,12 +22752,12 @@
mowedline = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mowedline";
- version = "3.1.0";
+ version = "3.1.1";
src = fetchFromGitHub {
owner = "retroj";
repo = "mowedline";
- rev = "67ca629b4bc3063ea19a7fccc693432a4eb10021";
- sha256 = "0i06ms5m7qhv2m1mmgzqh73j9wz3nxygz65p6vsnicxas09w70rd";
+ rev = "5c848d79c9eba921df77879bb7b3e6b97b9bccb2";
+ sha256 = "1dmfks09yd4y7p1sidr39a9c6gxby47vdv8pwy1hwi11kxd6zbwf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/86f7df6b8df3398ef476c0ed31722b03f16b2fec/recipes/mowedline";
@@ -22689,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";
@@ -23214,12 +23382,12 @@
neon-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "neon-mode";
- version = "1.0.2";
+ version = "1.1.0";
src = fetchFromGitHub {
owner = "Fuco1";
repo = "neon-mode";
- rev = "370212fa9ffcba3ff542a154d17ccf5be1066c4c";
- sha256 = "13a760jidh00czl05c0pnpbxzr7smrkf5ms9kd3h1cq613ffapby";
+ rev = "0822d6f42ef497e28e320a2fa924b8496bcac3df";
+ sha256 = "134i42cjyy33bdqprhk7ziy8iz8y3j6bw0vw5x8izmf9y1hnwyyh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c6b2a4898bf21413c4d9e6714af129bbb0a23e1a/recipes/neon-mode";
@@ -23256,12 +23424,12 @@
nginx-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "nginx-mode";
- version = "1.1.7";
+ version = "1.1.8";
src = fetchFromGitHub {
owner = "ajc";
repo = "nginx-mode";
- rev = "b58708d15a6659577945c0aa3a63983eebff2e67";
- sha256 = "0y2wwgvm3495h6hms425gzgi3qx2wn33xq6b7clrvj4amfy29qix";
+ rev = "9e25e1f696087c412a45fe004b98b9345f610767";
+ sha256 = "0hjvbjwsk64aw63k4wcizpqiqq6d8s4qwzfvvsdbm3rx743zgzsz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a6da3640b72496e2b32e6ed21aa39df87af9f7f3/recipes/nginx-mode";
@@ -23711,6 +23879,27 @@
license = lib.licenses.free;
};
}) {};
+ ob-blockdiag = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "ob-blockdiag";
+ version = "20170501.112";
+ src = fetchFromGitHub {
+ owner = "corpix";
+ repo = "ob-blockdiag.el";
+ rev = "e6532af46dcea8e79f3ad3cb2863cbbe516efbf6";
+ sha256 = "059jcl1qpfxwsykbj1sf7r1fpg7wix4fbdhhghrhbhgf5w165hsv";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/261b77a3fd07644d1c250b16857de70cc1bbf478/recipes/ob-blockdiag";
+ sha256 = "1lmawbgrlp6qd7p664jcl98y1xd2yqw9np6j52bh9i6s3cz6628g";
+ name = "ob-blockdiag";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/ob-blockdiag";
+ license = lib.licenses.free;
+ };
+ }) {};
ob-http = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "ob-http";
@@ -23837,6 +24026,27 @@
license = lib.licenses.free;
};
}) {};
+ ob-uart = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "ob-uart";
+ version = "0.1.0";
+ src = fetchFromGitHub {
+ owner = "andrmuel";
+ repo = "ob-uart";
+ rev = "90daeac90a9e75c20cdcf71234c67b812110c50e";
+ sha256 = "1syxxq411izmyfrhlywasax7n5c3yjy487mvfdjzjg8csmmk0m9v";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/5334f1a48b8ea6b7a660db27910769093c76113d/recipes/ob-uart";
+ sha256 = "1dkbyk8da0zw784dgwi8njnz304s54341dyfzvlb0lhcn41dmkz7";
+ name = "ob-uart";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/ob-uart";
+ license = lib.licenses.free;
+ };
+ }) {};
obfusurl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "obfusurl";
@@ -24079,8 +24289,8 @@
sha256 = "1jjhksrp3ljl4pqkclyvdwbj0dzn1alnxdz42f4xmlx4kn93w8bs";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/68bdb7e0100e120b95e9416398127d83530a221d/recipes/omnisharp";
- sha256 = "0dwya22y92k7x2s223az1g8hmrpfmk1sgwbr9z47raaa8kd52iad";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp";
+ sha256 = "0gh0wwdpdx2cjf95pcagj52inf7mrmiq7x8p0x5c7lvl4pfzhh87";
name = "omnisharp";
};
packageRequires = [
@@ -24295,8 +24505,8 @@
src = fetchFromGitHub {
owner = "diadochos";
repo = "org-babel-eval-in-repl";
- rev = "38d02b8e2412381f6498c29511d1981a88b7d7f4";
- sha256 = "0fwmcignkglx73spk3cv7acap15yrn0c0npr4ikfc9prs6svaah6";
+ rev = "bfa72c582ac1531ad42aba23e2b1267ab68e31f6";
+ sha256 = "1jm56zxa99s163jv02vhfrshmykvld7girq7gmj1x60g3wjzhn5k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-babel-eval-in-repl";
@@ -25181,12 +25391,12 @@
org2blog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, metaweblog, org, xml-rpc }:
melpaBuild {
pname = "org2blog";
- version = "0.9.2";
+ version = "0.9.3";
src = fetchFromGitHub {
owner = "punchagan";
repo = "org2blog";
- rev = "ad389ae994d269a57e56fbea68df7e6fe5c2ff55";
- sha256 = "0av1477jn3s4s5kymd7sbb0av437vb5mnfc6rpfgzwji7b8mfr7l";
+ rev = "9313bbce85cda3150a797d05c223ad6df79c275c";
+ sha256 = "1facdvgqwvv8pv96wx5hdh5x8q9yjwvxa07i69125fgw2sgrckk8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org2blog";
@@ -26623,6 +26833,27 @@
license = lib.licenses.free;
};
}) {};
+ php-cs-fixer = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "php-cs-fixer";
+ version = "1.0beta4";
+ src = fetchFromGitHub {
+ owner = "OVYA";
+ repo = "php-cs-fixer";
+ rev = "ca2c075a22ad156c336d2aa093fb6394c9f6c112";
+ sha256 = "1axjfsfasg7xyq5ax2bx7rh2mgf8caw5bh858hhp1gk9xvi21qhx";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/a3631c4b81c1784995ae9e74d832e301d79214e2/recipes/php-cs-fixer";
+ sha256 = "1xvz6v1fwngi2rizrx5sf0wrs4cy8rb13467r26k8hb7z8h1rqmf";
+ name = "php-cs-fixer";
+ };
+ packageRequires = [ cl-lib ];
+ meta = {
+ homepage = "https://melpa.org/#/php-cs-fixer";
+ license = lib.licenses.free;
+ };
+ }) {};
php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "php-mode";
@@ -27065,12 +27296,12 @@
ponylang-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ponylang-mode";
- version = "0.0.8";
+ version = "0.0.9";
src = fetchFromGitHub {
owner = "SeanTAllen";
repo = "ponylang-mode";
- rev = "bdc549e2658f4662f462e0c233b4825c761288cd";
- sha256 = "0v55bdj3vhf260addgsim6q4rwfzyvhqswxan4qqcq6acgi1liw4";
+ rev = "38786ba7f9f5709d511e27b85028b2dc6aff532d";
+ sha256 = "0cr22scxk3y2qdlhhfvwf4fkk2ql1c0r73fxzhw64dhwm4q01pih";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7d51adec3c6519d6ffe9b3f7f8a86b4dbc2c9817/recipes/ponylang-mode";
@@ -27652,12 +27883,12 @@
protobuf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "protobuf-mode";
- version = "3.3.0";
+ version = "3.3.1";
src = fetchFromGitHub {
owner = "google";
repo = "protobuf";
- rev = "a6189acd18b00611c1dc7042299ad75486f08a1a";
- sha256 = "1258yz9flyyaswh3izv227kwnhwcxn4nwavdz9iznqmh24qmi59w";
+ rev = "49a56da93ff3ab7d9a2252639344ad28db8cdff6";
+ sha256 = "0rq8q7viyy2nfmk2b0pik4amdndi6z51fww3m0p8a7l4yfkn14wb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -28513,12 +28744,12 @@
rdf-prefix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rdf-prefix";
- version = "1.7";
+ version = "1.8";
src = fetchFromGitHub {
owner = "simenheg";
repo = "rdf-prefix";
- rev = "d7e61535aaf89e643673b27c79b4a84ddb530288";
- sha256 = "1in1xp559g8hlxa9i2algwlgc069m8afjad6laxbyjqc61srzw6i";
+ rev = "35129521d5b6035e5dd75d5b3481ce4971f46034";
+ sha256 = "1iy9385n8a2b7ph4wdf8p92n81slirsxxckrc3khbk5zrpp62z5k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a5f083bd629697038ea6391c7a4eeedc909a5231/recipes/rdf-prefix";
@@ -29203,22 +29434,22 @@
license = lib.licenses.free;
};
}) {};
- robe = callPackage ({ fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }:
+ robe = callPackage ({ emacs, fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }:
melpaBuild {
pname = "robe";
- version = "0.7.9";
+ version = "0.8.0";
src = fetchFromGitHub {
owner = "dgutov";
repo = "robe";
- rev = "7c56895b6c2fd5d6c9572182f5de10ebe5bfc977";
- sha256 = "01xd3nc7bmf4r4d37x08rw2dlsg6gns8mraahi4rwkg6a9lwl44n";
+ rev = "92704288036a3111835488933002c58c1da240b1";
+ sha256 = "0sa1dfd3smhsxy7r1s4kl9a3rds8xjx7kszr9nw8f5h98z1999ws";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/673f920d02fe761bc080b73db7d37dbf5b6d86d8/recipes/robe";
sha256 = "19py2lwi7maya90kh1mgwqb16j72f7gm05dwla6xrzq1aks18wrk";
name = "robe";
};
- packageRequires = [ inf-ruby ];
+ packageRequires = [ emacs inf-ruby ];
meta = {
homepage = "https://melpa.org/#/robe";
license = lib.licenses.free;
@@ -29332,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";
@@ -29777,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";
@@ -30293,6 +30524,27 @@
license = lib.licenses.free;
};
}) {};
+ shen-elisp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "shen-elisp";
+ version = "0.1";
+ src = fetchFromGitHub {
+ owner = "deech";
+ repo = "shen-elisp";
+ rev = "ffe17dee05f75539cf5e4c59395e4c7400ececaa";
+ sha256 = "10dq3qj1q8i6f604zws97xrvjxwrdcjj3ygh6xpna00cvf40llc2";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/shen-elisp";
+ sha256 = "045nawzyqaxd3g5f56fxfy680pl18x67w0wi28nrq4l4681w9xyq";
+ name = "shen-elisp";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/shen-elisp";
+ license = lib.licenses.free;
+ };
+ }) {};
shift-number = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "shift-number";
@@ -30377,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";
@@ -30419,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";
@@ -30776,6 +31070,27 @@
license = lib.licenses.free;
};
}) {};
+ slstats = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "slstats";
+ version = "1.7";
+ src = fetchFromGitHub {
+ owner = "davep";
+ repo = "slstats.el";
+ rev = "a2f640f724fee7ecbd1cf28fc78297180cd959bc";
+ sha256 = "0gzpwcrmlbd7fphgyv6g04wjavd9i3vgn3y1fnh178iswmpsxj62";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/fe7c8c241cc6920bbedb6711db63ea28ed633327/recipes/slstats";
+ sha256 = "0z5y2fmb3v16g5gf87c9gll04wbjp3d1cf7gm5cxi4w3y1kw4r7q";
+ name = "slstats";
+ };
+ packageRequires = [ cl-lib emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/slstats";
+ license = lib.licenses.free;
+ };
+ }) {};
sly = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sly";
@@ -31322,22 +31637,22 @@
license = lib.licenses.free;
};
}) {};
- spaceline-all-the-icons = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spaceline }:
+ spaceline-all-the-icons = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize, spaceline }:
melpaBuild {
pname = "spaceline-all-the-icons";
- version = "1.1.1";
+ version = "1.3.3";
src = fetchFromGitHub {
owner = "domtronn";
repo = "spaceline-all-the-icons.el";
- rev = "481329d1d1c4c505a91b7f2ac231f77a19e2c74d";
- sha256 = "15snhm5rq0n31g9hk5gzimhjclfll67vi7avhrhd9z9x6dvq0sp4";
+ rev = "d5750c0aa40a66c6d76c74540587b8cbb0142350";
+ sha256 = "1rjb7jpbizafxixqrwzzxgbah0b8b8wsmqxzvqdv867i5w6682p2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d039e057c1d441592da8f54e6d524b395b030375/recipes/spaceline-all-the-icons";
sha256 = "1h6clkr2f29k2vw0jcrmnfbjpphaxm7s3zai6pn6qag32bgm3jq6";
name = "spaceline-all-the-icons";
};
- packageRequires = [ all-the-icons emacs spaceline ];
+ packageRequires = [ all-the-icons emacs memoize spaceline ];
meta = {
homepage = "https://melpa.org/#/spaceline-all-the-icons";
license = lib.licenses.free;
@@ -31577,12 +31892,12 @@
sqlup-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sqlup-mode";
- version = "0.7.1";
+ version = "0.7.2";
src = fetchFromGitHub {
owner = "Trevoke";
repo = "sqlup-mode.el";
- rev = "65e75ebc7d85a63e4e27900ba746623a8e4bfa95";
- sha256 = "1yiz1k2dg010dypql5l9ahcl33nvqxl731wghv4jvp6bdxcf90g3";
+ rev = "40f2bc0179539087971d48556dcce38e14907768";
+ sha256 = "1ya5acz07l61hry96fq0yx81w7zwcswxinb3fi0g1s4gshxy4hgk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/sqlup-mode";
@@ -33001,12 +33316,12 @@
textx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "textx-mode";
- version = "0.0.1";
+ version = "0.0.2";
src = fetchFromGitHub {
owner = "novakboskov";
repo = "textx-mode";
- rev = "1f9ae651508176b4cb1ae9a03aec06049f333c61";
- sha256 = "00hdnfa27rb9inqq4dn51v8jrbsl4scql0cngp6fxdaf93j1p5gk";
+ rev = "72f9f0c5855b382024f0da8f56833c22a70a5cb3";
+ sha256 = "1lr9v7dk0pnmpvdvs4m5d9yvxlii0xzr8b3akknm25gvbw1y1q8k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/dada0378af342e0798c418032a8dcc7dfd80d600/recipes/textx-mode";
@@ -33106,12 +33421,12 @@
tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }:
melpaBuild {
pname = "tide";
- version = "2.2.2";
+ version = "2.3.1";
src = fetchFromGitHub {
owner = "ananthakumaran";
repo = "tide";
- rev = "eabcad4dbebb705d4e366f90344ea543068d2dc4";
- sha256 = "1ykxsr8q9gwx2d8b0v2xf4glchwg3ikcx60a5r4phw1nlwff8gg7";
+ rev = "669ce39bcd93ca6353d24a72a358272d7b0e2268";
+ sha256 = "1sbvkgrdf6s8bkg38rfyj677dq3x4pry84hv30dgqhll7h8ja72w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide";
@@ -33252,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";
@@ -33441,12 +33756,12 @@
turing-machine = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "turing-machine";
- version = "0.1.2";
+ version = "0.1.4";
src = fetchFromGitHub {
owner = "therockmandolinist";
repo = "turing-machine";
- rev = "41e367e54fbeff572f599f2f321ffc863601484e";
- sha256 = "0qlm7y3pm8sfy36a8jc3cr955hqsmypzshbgxfnmcmz7wl96dplh";
+ rev = "41bfe79ecf8a44dcbaf308c33cbdf324f7c806ae";
+ sha256 = "04j4nw526mxlm4fd2a28p0pa2ss4b4vznjvpk0f0wlf61ymvy884";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a003b40a52a92b3ab4d1ffc003f570d4fa6bfbde/recipes/turing-machine";
@@ -33546,12 +33861,12 @@
typit = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, mmt }:
melpaBuild {
pname = "typit";
- version = "0.2.0";
+ version = "0.2.1";
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "typit";
- rev = "0e5b374830e85a32b51a4cc8206df8e494378cb2";
- sha256 = "1jv5qmp3xs37py7d9aln4jn85j65h9pp5vb2dcmd8rlszhplsrng";
+ rev = "a4e3147dedac5535bdc8b06aca00f34f14f26e35";
+ sha256 = "0hbnwrhxj9wwjvxsk372ffgjqfkb3ljxhgi5h7wps2r15dxfvf3w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d17d019155e19c156f123dcd702f18cfba488701/recipes/typit";
@@ -33888,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";
@@ -34011,6 +34326,48 @@
license = lib.licenses.free;
};
}) {};
+ vdiff = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }:
+ melpaBuild {
+ pname = "vdiff";
+ version = "0.2.2";
+ src = fetchFromGitHub {
+ owner = "justbur";
+ repo = "emacs-vdiff";
+ rev = "f55acdbfcbb14e463d0850cfd041614c7002669e";
+ sha256 = "0dlhisvnlzkzlilg456lxi0m5wh4a8681n142684hmk8vaw3wx2k";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e90f19c8fa4b0d267d269b76f117995e812e899c/recipes/vdiff";
+ sha256 = "11gw0l63fssbiyhngqb7ykrp7m1vy55wlf27ybhh2dkwh1cpkr4l";
+ name = "vdiff";
+ };
+ packageRequires = [ emacs hydra ];
+ meta = {
+ homepage = "https://melpa.org/#/vdiff";
+ license = lib.licenses.free;
+ };
+ }) {};
+ vdiff-magit = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, vdiff }:
+ melpaBuild {
+ pname = "vdiff-magit";
+ version = "0.3.1";
+ src = fetchFromGitHub {
+ owner = "justbur";
+ repo = "emacs-vdiff-magit";
+ rev = "5e245b6a078860d3b0f58436efec8ff6b4f485db";
+ sha256 = "0rz06jh5ayg0w6a19w9jyyn6jw27ri3cydynflxygk9364zvj59p";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/2159275fabde8ec8b297f6635546b1314d519b8b/recipes/vdiff-magit";
+ sha256 = "1vjc1r5xfdg9bmscgppx1fps1w5bd0zpp6ab5z5dxlg2zx2vdldw";
+ name = "vdiff-magit";
+ };
+ packageRequires = [ emacs magit vdiff ];
+ meta = {
+ homepage = "https://melpa.org/#/vdiff-magit";
+ license = lib.licenses.free;
+ };
+ }) {};
vdirel = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, org-vcard, seq }:
melpaBuild {
pname = "vdirel";
@@ -34494,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;
@@ -34539,12 +34896,12 @@
webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, request }:
melpaBuild {
pname = "webpaste";
- version = "1.3.0";
+ version = "1.4.0";
src = fetchFromGitHub {
owner = "etu";
repo = "webpaste.el";
- rev = "70e8fd064184632b0363572b74647c7250d6eb1b";
- sha256 = "1zlc65c0wnp8wgnpn9f60bxm4p2g46h1s2dpqm6rrvb7yp0diml3";
+ rev = "b5491ab52d9e73e8a3175f9713b6c1acde6dcfe5";
+ sha256 = "1l45glgw6va6xaqbpjia69035p06a6csgwxs9xislfvmvq9lcxqz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/13847d91c1780783e516943adee8a3530c757e17/recipes/webpaste";
@@ -34707,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";
@@ -34767,6 +35124,27 @@
license = lib.licenses.free;
};
}) {};
+ whizzml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "whizzml-mode";
+ version = "0.2.1";
+ src = fetchFromGitHub {
+ owner = "whizzml";
+ repo = "whizzml-mode";
+ rev = "662c60173cdb396fcb2386d7d7c774d26f16cd9f";
+ sha256 = "1nyl1whhi3zrzb5b4vkmqdaggnxrqmzmw1amf7hbw0mvx5mpy9pa";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/11f26b15c326c3b8541bac510579b32493916042/recipes/whizzml-mode";
+ sha256 = "0gas9xfpz5v9fbhjxhd4msihwz9w4a05l5icsaclxvh06f92wcyk";
+ name = "whizzml-mode";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/whizzml-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
whole-line-or-region = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "whole-line-or-region";
@@ -35189,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";
@@ -35653,8 +36031,8 @@
version = "1.78";
src = fetchhg {
url = "https://www.yatex.org/hgrepos/yatex/";
- rev = "428584533eab";
- sha256 = "1nrvlziqfsyvsk09ynpww99z4vb8zv8h2jxsslvx1nm1shyn2ckh";
+ rev = "c940797c19ad";
+ sha256 = "17jc65kaf37c86karq5fl2417i5csq5gn4yqagjzlik1cd6vrj03";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex";
@@ -35995,12 +36373,12 @@
zzz-to-char = callPackage ({ avy, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "zzz-to-char";
- version = "0.1.1";
+ version = "0.1.2";
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "zzz-to-char";
- rev = "efbe99c9163602f23408abaea70ffe292632bf26";
- sha256 = "0y0hhar3krkvbpb5y9k197mb0wfpz8cl6fmxazq8msjml7hkk339";
+ rev = "b62414b155fe2e09d91b70059a909d1403d89acf";
+ sha256 = "07a086s3fpncr4plkmr89vghn7xwji9k69m64ri7i1vhnnl6q4zj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7063cbc1f1501ce81552d7ef1d42d1309f547c42/recipes/zzz-to-char";
diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix
index 83f5208e81e..024ae63f205 100644
--- a/pkgs/applications/editors/emacs-modes/org-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/org-generated.nix
@@ -1,10 +1,10 @@
{ callPackage }: {
org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org";
- version = "20170502";
+ version = "20170515";
src = fetchurl {
- url = "http://orgmode.org/elpa/org-20170502.tar";
- sha256 = "1y5rdf6740z45v75y17yh3a1ivdk5fjrax3hyr11jydyicczk4h1";
+ url = "http://orgmode.org/elpa/org-20170515.tar";
+ sha256 = "04kpi7q1q4r9w4km941cy70q3k9azspw1wdr71if4f8am6frj3d4";
};
packageRequires = [];
meta = {
@@ -14,10 +14,10 @@
}) {};
org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org-plus-contrib";
- version = "20170502";
+ version = "20170515";
src = fetchurl {
- url = "http://orgmode.org/elpa/org-plus-contrib-20170502.tar";
- sha256 = "06pr3w11zpns66km27ql3w8qlk6bxaxqx3bmaiwrxykhbf74dib0";
+ url = "http://orgmode.org/elpa/org-plus-contrib-20170515.tar";
+ sha256 = "0jdcxir8wvmdxi0rxnljbhy31yh83n4p0l8jp85fxf5sx0kcc32p";
};
packageRequires = [];
meta = {
diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/pg.patch b/pkgs/applications/editors/emacs-modes/proofgeneral/pg.patch
new file mode 100644
index 00000000000..704e4b6c8c7
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/proofgeneral/pg.patch
@@ -0,0 +1,16 @@
+diff -r c7d8bfff4c0a bin/proofgeneral
+--- a/bin/proofgeneral Sat Sep 27 02:25:15 2014 +0100
++++ b/bin/proofgeneral Sat Sep 27 02:28:16 2014 +0100
+@@ -73,11 +73,7 @@
+
+ # Try to find Proof General directory
+ if [ -z "$PGHOME" ] || [ ! -d "$PGHOME" ]; then
+- # default relative to this script, otherwise PGHOMEDEFAULT
+- MYDIR="`readlink --canonicalize "$0" | sed -ne 's,/bin/proofgeneral$,,p'`"
+- if [ -d "$MYDIR/generic" ]; then
+- PGHOME="$MYDIR"
+- elif [ -d "$PGHOMEDEFAULT" ]; then
++ if [ -d "$PGHOMEDEFAULT" ]; then
+ PGHOME="$PGHOMEDEFAULT"
+ else
+ echo "Cannot find the Proof General lisp files: Set PGHOME or use --pghome."
diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index e919627ffe2..d8738203f13 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -305,24 +305,24 @@ in
pycharm-community = buildPycharm rec {
name = "pycharm-community-${version}";
- version = "2017.1.2";
+ version = "2017.1.3";
description = "PyCharm Community Edition";
license = stdenv.lib.licenses.asl20;
src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz";
- sha256 = "03c352lj6vnc7cs5ch8p12i4f95qadnibzbrxmxv5xqglpdrp7g9";
+ sha256 = "06sai589zli5xaggfk4g0j0grbw9mya9qlwabmxh9414qq3bzvbd";
};
wmClass = "jetbrains-pycharm-ce";
};
pycharm-professional = buildPycharm rec {
name = "pycharm-professional-${version}";
- version = "2017.1.2";
+ version = "2017.1.3";
description = "PyCharm Professional Edition";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz";
- sha256 = "0jrrlrkwi6f70nqrrz2vv1wdjpwjbh2in1g658dsbr9gpmkdmy0q";
+ sha256 = "1wzgh83504px7q93h9xkarih2qjchiavgysy4di82q7377s6xd0c";
};
wmClass = "jetbrains-pycharm";
};
diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix
index 2ee7f3bb160..7455736ed02 100644
--- a/pkgs/applications/graphics/ImageMagick/7.0.nix
+++ b/pkgs/applications/graphics/ImageMagick/7.0.nix
@@ -12,8 +12,8 @@ let
else throw "ImageMagick is not supported on this platform.";
cfg = {
- version = "7.0.4-6";
- sha256 = "1nm0hjijwhcp6rzcn7zksp2820dxvj4lmblj7kzpzd3s1ds09q0y";
+ version = "7.0.5-7";
+ sha256 = "11k53193az0bvdhp4gz2g9p8fb6r5fr1h74dnfx6ijfnfj80hbgp";
patches = [];
};
in
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index 58a88e89681..d6c74c9ed0c 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -12,8 +12,8 @@ let
else throw "ImageMagick is not supported on this platform.";
cfg = {
- version = "6.9.7-6";
- sha256 = "17pc3xz8srb9g5a5gkk6q9sjiss77fgm0wxxfmb5qya4rqivjpzn";
+ version = "6.9.8-6";
+ sha256 = "1sxg2wx3nrzbymh5wcqiv1x401nrz95xkrqgk3x446vx8lq7ln6w";
patches = [];
}
# Freeze version on mingw so we don't need to port the patch too often.
diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index fdcd7636c02..f48ce6a4ce4 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/graphics/simple-scan/default.nix b/pkgs/applications/graphics/simple-scan/default.nix
index 8a24eab2200..0c800ce9859 100644
--- a/pkgs/applications/graphics/simple-scan/default.nix
+++ b/pkgs/applications/graphics/simple-scan/default.nix
@@ -29,6 +29,17 @@ stdenv.mkDerivation rec {
postInstall = ''
mkdir -p $out/share/icons
mv $out/share/simple-scan/icons/* $out/share/icons/
+ (
+ cd ${gnome3.defaultIconTheme}/share/icons/Adwaita
+ for f in `find . | grep 'scanner\.'`
+ do
+ local outFile="`echo "$out/share/icons/hicolor/$f" | sed \
+ -e 's#/devices/#/apps/#g' \
+ -e 's#scanner\.#simple-scan\.#g'`"
+ mkdir -p "`realpath -m "$outFile/.."`"
+ cp "$f" "$outFile"
+ done
+ )
'';
enableParallelBuilding = true;
diff --git a/pkgs/applications/misc/dmenu/default.nix b/pkgs/applications/misc/dmenu/default.nix
index 1dc9fe5e202..8ef4f3ae897 100644
--- a/pkgs/applications/misc/dmenu/default.nix
+++ b/pkgs/applications/misc/dmenu/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, libX11, libXinerama, libXft, zlib, patches ? null }:
stdenv.mkDerivation rec {
- name = "dmenu-4.6";
+ name = "dmenu-4.7";
src = fetchurl {
url = "http://dl.suckless.org/tools/${name}.tar.gz";
- sha256 = "1cwnvamqqlgczvd5dv5rsgqbhv8kp0ddjnhmavb3q732i8028yja";
+ sha256 = "1fgph549i0yw62x02jhfc8qmqk2rnzcnm46bxq6jig1cvkw3amm7";
};
buildInputs = [ libX11 libXinerama zlib libXft ];
diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index a2d39f2d486..14c6c18f91c 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -2,11 +2,11 @@
python2Packages.buildPythonApplication rec {
name = "electrum-${version}";
- version = "2.8.2";
+ version = "2.8.3";
src = fetchurl {
url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
- sha256 = "01xphbi7lx64s9380zjfakz5h8blqmxp0ryqlll7px66qpmjn5fq";
+ sha256 = "04jswalydzwm16iismbq1h2shj17iq9sqm0mz8p98sh3dwkacvn1";
};
propagatedBuildInputs = with python2Packages; [
diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix
index 5b977d13796..42fc1e46e33 100644
--- a/pkgs/applications/misc/gpxsee/default.nix
+++ b/pkgs/applications/misc/gpxsee/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "gpxsee-${version}";
- version = "4.3";
+ version = "4.8";
src = fetchFromGitHub {
owner = "tumic0";
repo = "GPXSee";
rev = version;
- sha256 = "15f686frxlrmdvh5cc837kx62g0ihqj4vb87i8433g7l5vqkv3lf";
+ sha256 = "17s1v6b1j7pi0yj554bd0cg14bl854gssp5gj2pl51rxji6zr0wp";
};
nativeBuildInputs = [ qmakeHook qttools makeQtWrapper ];
diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix
index a4687c385c6..a3e5f99eef6 100644
--- a/pkgs/applications/misc/mupdf/default.nix
+++ b/pkgs/applications/misc/mupdf/default.nix
@@ -3,26 +3,26 @@
, libX11, libXcursor, libXrandr, libXinerama, libXext, harfbuzz, mesa }:
stdenv.mkDerivation rec {
- version = "1.10a";
+ version = "1.11";
name = "mupdf-${version}";
src = fetchurl {
url = "http://mupdf.com/downloads/archive/${name}-source.tar.gz";
- sha256 = "0dm8wcs8i29aibzkqkrn8kcnk4q0kd1v66pg48h5c3qqp4v1zk5a";
+ sha256 = "02phamcchgsmvjnb3ir7r5sssvx9fcrscn297z73b82n1jl79510";
};
patches = [
# Compatibility with new openjpeg
(fetchpatch {
- name = "mupdf-1.9a-openjpeg-2.1.1.patch";
- url = "https://git.archlinux.org/svntogit/community.git/plain/mupdf/trunk/0001-mupdf-openjpeg.patch?id=5a28ad0a8999a9234aa7848096041992cc988099";
- sha256 = "1i24qr4xagyapx4bijjfksj4g3bxz8vs5c2mn61nkm29c63knp75";
+ name = "mupdf-1.11-openjpeg-2.1.1.patch";
+ url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/0001-mupdf-openjpeg.patch?h=packages/mupdf&id=3d997e7ff2ac20c44856ede22760ba6fbca81a5c";
+ sha256 = "1vr12kpzmmfr8pp3scwfhrm5laqwd58xm6vx971c4y8bxy60b2ig";
})
(fetchurl {
- name = "CVE-2017-5896.patch";
- url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=2c4e5867ee699b1081527bc6c6ea0e99a35a5c27";
- sha256 = "14k7x47ifx82sds1c06ibzbmcparfg80719jhgwjk6w1vkh4r693";
+ name = "mupdf-1.11-CVE-2017-6060.patch";
+ url = "http://git.ghostscript.com/?p=mupdf.git;a=blobdiff_plain;f=platform/x11/jstest_main.c;h=f158d9628ed0c0a84e37fe128277679e8334422a;hp=13c3a0a3ba3ff4aae29f6882d23740833c1d842f;hb=06a012a42c9884e3cd653e7826cff1ddec04eb6e;hpb=34e18d127a02146e3415b33c4b67389ce1ddb614";
+ sha256 = "163bllvjrbm0gvjb25lv7b6sih4zr4g4lap3h0cbq8dvpjxx0jfc";
})
];
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = http://mupdf.com;
repositories.git = git://git.ghostscript.com/mupdf.git;
- description = "Lightweight PDF viewer and toolkit written in portable C";
+ description = "Lightweight PDF, XPS, and E-book viewer and toolkit written in portable C";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ viric vrthra fpletz ];
platforms = platforms.linux;
diff --git a/pkgs/applications/misc/taskwarrior/default.nix b/pkgs/applications/misc/taskwarrior/default.nix
index e4938b928da..841e0a494e4 100644
--- a/pkgs/applications/misc/taskwarrior/default.nix
+++ b/pkgs/applications/misc/taskwarrior/default.nix
@@ -16,8 +16,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake libuuid gnutls ];
postInstall = ''
- mkdir -p "$out/etc/bash_completion.d"
- ln -s "../../share/doc/task/scripts/bash/task.sh" "$out/etc/bash_completion.d/"
+ mkdir -p "$out/share/bash-completion/completions"
+ ln -s "../../doc/task/scripts/bash/task.sh" "$out/share/bash-completion/completions/"
+ mkdir -p "$out/etc/fish/completions"
+ ln -s "../../../share/doc/task/scripts/fish/task.fish" "$out/etc/fish/completions/"
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/misc/yakuake/default.nix b/pkgs/applications/misc/yakuake/default.nix
index 0d9f3834c61..a70b4be287c 100644
--- a/pkgs/applications/misc/yakuake/default.nix
+++ b/pkgs/applications/misc/yakuake/default.nix
@@ -20,13 +20,13 @@
let
unwrapped = let
pname = "yakuake";
- version = "3.0.2";
+ version = "3.0.3";
in kdeDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
url = "http://download.kde.org/stable/${pname}/${version}/src/${name}.tar.xz";
- sha256 = "0vcdji1k8d3pz7k6lkw8ighkj94zff2l2cf9v1avf83f4hjyfhg5";
+ sha256 = "ef51aa3325916d352fde17870cf706397e41105103e4c9289cc4032a1b8609a7";
};
buildInputs = [
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index dac821a4898..f36f28ac880 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -1,4 +1,4 @@
-{ stdenv, ninja, which
+{ stdenv, ninja, which, nodejs
# default dependencies
, bzip2, flac, speex, libopus
@@ -87,7 +87,7 @@ let
nativeBuildInputs = [
ninja which python2Packages.python perl pkgconfig
- python2Packages.ply python2Packages.jinja2
+ python2Packages.ply python2Packages.jinja2 nodejs
];
buildInputs = defaultDependencies ++ [
@@ -105,6 +105,7 @@ let
patches = [
./patches/nix_plugin_paths_52.patch
+ ./patches/fix-bootstrap-gn.patch
] ++ optional (versionOlder version "57.0") ./patches/glibc-2.24.patch
++ optional enableWideVine ./patches/widevine.patch;
@@ -130,6 +131,9 @@ let
}' gpu/config/gpu_control_list.cc
patchShebangs .
+ # use our own nodejs
+ mkdir -p third_party/node/linux/node-linux-x64/bin
+ ln -s $(which node) third_party/node/linux/node-linux-x64/bin/node
'' + optionalString (versionAtLeast version "52.0.0.0") ''
sed -i -re 's/([^:])\<(isnan *\()/\1std::\2/g' \
third_party/pdfium/xfa/fxbarcode/utils.h
diff --git a/pkgs/applications/networking/browsers/chromium/patches/fix-bootstrap-gn.patch b/pkgs/applications/networking/browsers/chromium/patches/fix-bootstrap-gn.patch
new file mode 100644
index 00000000000..34efb4f7a45
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/patches/fix-bootstrap-gn.patch
@@ -0,0 +1,12 @@
+diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
+index 3148ccf..38cfb11 100755
+--- a/tools/gn/bootstrap/bootstrap.py
++++ b/tools/gn/bootstrap/bootstrap.py
+@@ -385,6 +385,7 @@ def write_gn_ninja(path, root_gen_dir, options):
+ 'base/base_switches.cc',
+ 'base/build_time.cc',
+ 'base/callback_internal.cc',
++ 'base/callback_helpers.cc',
+ 'base/command_line.cc',
+ 'base/debug/activity_tracker.cc',
+ 'base/debug/alias.cc',
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index 2800a3ed5d2..7ee28c7fc27 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@@ -1,18 +1,18 @@
# This file is autogenerated from update.sh in the same directory.
{
beta = {
- sha256 = "1q9iqmq5amzfw03jiw18g1w285b6x2qckn8gc60r5m3xx1hbivv2";
- sha256bin64 = "1ddhhcydcwwc2pkwm4c8rlr60968zy5vda410g4bwx0v5q7p22q9";
- version = "58.0.3029.68";
+ sha256 = "1dcad79kfayagqiv85ycla3iv3gc99k0rvnvnpar9hd6x1iv8cfl";
+ sha256bin64 = "0ywf50rfzv1kkfpld62fi5g0kz33an0p03xqf7wkcqi7hild607v";
+ version = "59.0.3071.47";
};
dev = {
- sha256 = "0zvnj9n2p057fxx7n4d1qc0nw34qhlsvrx20fwigq96blamckvd8";
- sha256bin64 = "1s1r3h7x49bp64lzzphm4jcg7g68l0x7mr3airj3hqii58dvndm0";
- version = "59.0.3067.0";
+ sha256 = "05kxl938mh41341lh5xsxcqxv9hhx8yn6nkawgg241sfwdx72db8";
+ sha256bin64 = "1mr2615r30zjxa55mdcbfi0k2grgyykzawslmg41aw0jy5hfamal";
+ version = "60.0.3095.5";
};
stable = {
- sha256 = "1xwchazqqx0cs9rd15r80kw6p918zp9libx34qlcj8p5lxq1f0bh";
- sha256bin64 = "0ggn5rljch36sx0i37qzp6ldcy3ibdj0z9217lqzjq3r7ixsfqja";
- version = "57.0.2987.133";
+ sha256 = "1zvqim75mlqckvf7awrbyggis71dlkz4gjpfrmfdvydcs8yyyk7j";
+ sha256bin64 = "0vfx2m5zqfvfb6sgd3dg1sji72dzjcd1sf4r6qwhnz38wadys7id";
+ version = "58.0.3029.110";
};
}
diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix
index fb4b33ef71a..42f45419198 100644
--- a/pkgs/applications/networking/browsers/lynx/default.nix
+++ b/pkgs/applications/networking/browsers/lynx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ncurses, gzip
+{ stdenv, fetchurl, ncurses, gzip, pkgconfig
, sslSupport ? true, openssl ? null
}:
@@ -13,14 +13,10 @@ stdenv.mkDerivation rec {
sha256 = "1cqm1i7d209brkrpzaqqf2x951ra3l67dw8x9yg10vz7rpr9441a";
};
- configureFlags = []
- ++ stdenv.lib.optionals sslSupport [ "--with-ssl=${openssl.dev}" ];
+ configureFlags = [ "--enable-widec" ] ++ stdenv.lib.optional sslSupport "--with-ssl";
- buildInputs = [ ncurses gzip ];
-
- crossAttrs = {
- configureFlags = configureFlags ++ [ "--enable-widec" ];
- };
+ nativeBuildInputs = stdenv.lib.optional sslSupport pkgconfig;
+ buildInputs = [ ncurses gzip ] ++ stdenv.lib.optional sslSupport openssl.dev;
meta = with stdenv.lib; {
homepage = http://lynx.isc.org/;
diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
index 4443c848066..2c9661c36fa 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -87,12 +87,18 @@ let
srcs = {
"x86_64-linux" = fetchurl {
- url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz";
+ urls = [
+ "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
+ "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
+ ];
sha256 = "0jn98arczlgjigpmql1qg5b7izabv4zy4mji6vvcg3b8g1ma108r";
};
"i686-linux" = fetchurl {
- url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz";
+ urls = [
+ "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
+ "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
+ ];
sha256 = "0micxgkbys0py4bj6csbc8xz4gq0x5v2zirgi38krnm5x5riqj3w";
};
};
@@ -105,6 +111,7 @@ stdenv.mkDerivation rec {
src = srcs."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}");
preferLocalBuild = true;
+ allowSubstitutes = false;
desktopItem = makeDesktopItem {
name = "torbrowser";
diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix
index 8268b3baa98..19b6c030f2e 100644
--- a/pkgs/applications/networking/cluster/helm/default.nix
+++ b/pkgs/applications/networking/cluster/helm/default.nix
@@ -34,6 +34,10 @@ stdenv.mkDerivation {
tar -xvzf $src
cp ${arch}/helm $out/bin/${pname}
chmod +x $out/bin/${pname}
+ mkdir -p $out/share/bash-completion/completions
+ mkdir -p $out/share/zsh/site-functions
+ $out/bin/helm completion bash > $out/share/bash-completion/completions/helm
+ $out/bin/helm completion zsh > $out/share/zsh/site-functions/_helm
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix
index ea25fa6ccb5..aaade82e31d 100644
--- a/pkgs/applications/networking/cluster/kops/default.nix
+++ b/pkgs/applications/networking/cluster/kops/default.nix
@@ -2,24 +2,37 @@
buildGoPackage rec {
name = "kops-${version}";
- version = "1.4.0";
- rev = "v${version}";
+ version = "1.6.0";
goPackagePath = "k8s.io/kops";
src = fetchFromGitHub {
- inherit rev;
+ rev = version;
owner = "kubernetes";
repo = "kops";
- sha256 = "1jwgn7l8c639j5annwymqjdw5mcajwn58y21042jy5lhgdh8pdf5";
+ sha256 = "1z890kjgsdnghg71v4sp7lljvw14dhzr23m2qjmk6wndyssscykr";
};
buildInputs = [go-bindata];
subPackages = ["cmd/kops"];
+ buildFlagsArray = ''
+ -ldflags=
+ -X k8s.io/kops.Version=${version}
+ -X k8s.io/kops.GitVersion=${version}
+ '';
+
preBuild = ''
(cd go/src/k8s.io/kops
- go-bindata -o upup/models/bindata.go -pkg models -prefix upup/models/ upup/models/...)
+ go-bindata -o upup/models/bindata.go -pkg models -prefix upup/models/ upup/models/...
+ go-bindata -o federation/model/bindata.go -pkg model -prefix federation/model federation/model/...)
+ '';
+
+ postInstall = ''
+ mkdir -p $bin/share/bash-completion/completions
+ mkdir -p $bin/share/zsh/site-functions
+ $bin/bin/kops completion bash > $bin/share/bash-completion/completions/kops
+ $bin/bin/kops completion zsh > $bin/share/zsh/site-functions/_kops
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/cluster/pachyderm/default.nix b/pkgs/applications/networking/cluster/pachyderm/default.nix
index a0df23e6f62..c276c2e752f 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 c89f871b1c5..0173a898575 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/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index b894322062f..9c68253cf42 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -23,11 +23,11 @@
let
# NOTE: When updating, please also update in current stable,
# as older versions stop working
- version = "26.4.24";
+ version = "27.4.22";
sha256 =
{
- "x86_64-linux" = "1qzz88d3akbqfk1539w2z0ldyjjscqjqgsvadf9i4xr2y0syfv4y";
- "i686-linux" = "12xwmmycrg56xl88k9pqd7mcn0jqi4jijf36vn4fdjvmn7ksskcw";
+ "x86_64-linux" = "1v1q799dj0bffg3s98ifzpsccjaajl221h5ckaqijlmpzr2q5hhh";
+ "i686-linux" = "1qsw6c0mb0n0djz7xpfixispi9k68kbvf8dc92frpcbcvm0h845y";
}."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
arch =
diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix
index cdb9c142da6..94adef2dda8 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/instant-messengers/jackline/default.nix b/pkgs/applications/networking/instant-messengers/jackline/default.nix
index 25d71fa8859..a9cb3f09bce 100644
--- a/pkgs/applications/networking/instant-messengers/jackline/default.nix
+++ b/pkgs/applications/networking/instant-messengers/jackline/default.nix
@@ -3,18 +3,16 @@
assert stdenv.lib.versionAtLeast ocamlPackages.ocaml.version "4.02.2";
stdenv.mkDerivation rec {
- version = "2016-11-18";
+ version = "2017-05-21";
name = "jackline-${version}";
src = fetchFromGitHub {
owner = "hannesm";
repo = "jackline";
- rev = "cab34acab004023911997ec9aee8b00a976af7e4";
- sha256 = "0h7wdsic4v6ys130w61zvxm5s2vc7y574hn7zby12rq88lhhrjh7";
+ rev = "0a1e4ea23245633fe23edf09b2309659a1bc3649";
+ sha256 = "1wnmwsp3a5nh3qs4h9grrdsvv0i3p419cfmhrrql3lj2x3ngdw82";
};
- patches = [ ./uchar.patch ];
-
buildInputs = with ocamlPackages; [
ocaml ocamlbuild findlib topkg ppx_sexp_conv
erm_xmpp_0_3 tls nocrypto x509 ocaml_lwt otr astring
diff --git a/pkgs/applications/networking/instant-messengers/jackline/uchar.patch b/pkgs/applications/networking/instant-messengers/jackline/uchar.patch
deleted file mode 100644
index f861135090e..00000000000
--- a/pkgs/applications/networking/instant-messengers/jackline/uchar.patch
+++ /dev/null
@@ -1,302 +0,0 @@
-diff --git a/_tags b/_tags
-index 88318d9..b433ee8 100644
---- a/_tags
-+++ b/_tags
-@@ -7,9 +7,11 @@ true : package(sexplib astring)
-
- : package(otr ppx_sexp_conv)
- : package(uutf)
-+: package(uchar)
-+: package(uchar)
- : package(lwt nocrypto)
- : package(ppx_sexp_conv erm_xmpp)
--: package(ppx_sexp_conv otr hex ptime ptime.clock.os)
-+: package(uchar ppx_sexp_conv otr hex ptime ptime.clock.os)
- : package(erm_xmpp lwt tls tls.lwt ptime)
- : package(erm_xmpp lwt tls tls.lwt)
-
-@@ -18,6 +20,6 @@ true : package(sexplib astring)
- : package(notty lwt erm_xmpp otr)
- : package(lwt otr erm_xmpp)
- : package(lwt nocrypto otr notty tls.lwt x509)
--: package(hex lwt nocrypto erm_xmpp tls.lwt x509)
-+: package(uchar hex lwt nocrypto erm_xmpp tls.lwt x509)
-
- : package(erm_xmpp hex lwt notty notty.lwt nocrypto otr sexplib tls tls.lwt ptime ptime.clock.os)
-diff --git a/cli/cli_config.ml b/cli/cli_config.ml
-index 618d655..dac6e68 100644
---- a/cli/cli_config.ml
-+++ b/cli/cli_config.ml
-@@ -34,7 +34,7 @@ let rewrap term above below (prefix, inp, inp2) (width, _) =
- let height = if col mod width = 0 then succ h else h in
- (succ (col mod width), height)
- in
-- Notty_lwt.Term.cursor term (Some (col, row))
-+ Notty_lwt.Term.cursor term (Some (col - 1, row - 1))
-
- let read_line ?(above = []) ?(prefix = "") ?default ?(below = []) term =
- let rec go (pre, post) =
-@@ -56,8 +56,8 @@ let read_line ?(above = []) ?(prefix = "") ?default ?(below = []) term =
- | `Unhandled k ->
- match k with
- | `Key (`Enter, []) -> Lwt.return (char_list_to_str (pre @ post))
-- | `Key (`Uchar 0x43, [`Ctrl]) -> Lwt.fail (Invalid_argument "Ctrl-c")
-- | `Key (`Uchar 0x44, [`Ctrl]) -> Lwt.fail (Invalid_argument "Ctrl-d")
-+ | `Key (`Uchar u, [`Ctrl]) when Uchar.to_int u = 0x43 -> Lwt.fail (Invalid_argument "Ctrl-c")
-+ | `Key (`Uchar u, [`Ctrl]) when Uchar.to_int u = 0x44 -> Lwt.fail (Invalid_argument "Ctrl-d")
- | _ -> go (pre, post)
- in
- let pre = Utils.option [] str_to_char_list default in
-@@ -180,7 +180,7 @@ let configure term () =
- let pw = "Password: " in
- let chars = match password with
- | None -> I.string A.empty "will be asked at startup"
-- | Some _ -> I.uchar A.empty 0x2605 5 1
-+ | Some _ -> I.uchar A.empty (Uchar.of_int 0x2605) 5 1
- in
- above @ [I.(string A.empty pw <|> chars)]
- in
-diff --git a/cli/cli_input.ml b/cli/cli_input.ml
-index 34b4288..07488f2 100644
---- a/cli/cli_input.ml
-+++ b/cli/cli_input.ml
-@@ -314,19 +314,19 @@ let read_terminal term mvar input_mvar () =
- | `Key (`Arrow `Up, []) -> p (fun s -> ok (history s Up)) >>= fun () -> loop ()
- | `Key (`Arrow `Down, []) -> p (fun s -> ok (history s Down)) >>= fun () -> loop ()
-
-- | `Key (`Uchar 0x44, [`Ctrl]) (* C-d *) -> p (fun s -> Lwt.return (`Quit s))
-+ | `Key (`Uchar u, [`Ctrl]) when Uchar.to_int u = 0x44 (* C-d *) -> p (fun s -> Lwt.return (`Quit s))
-
- (* UI navigation and toggles *)
- | `Key (`Page `Up, []) -> p (fun s -> ok (navigate_buddy_list s Up)) >>= fun () -> loop ()
- | `Key (`Page `Down, []) -> p (fun s -> ok (navigate_buddy_list s Down)) >>= fun () -> loop ()
-
- | `Key (`Page `Up, [`Ctrl]) -> p (fun s -> ok (navigate_message_buffer s Up)) >>= fun () -> loop ()
-- | `Key (`Uchar 0x50, [`Ctrl]) (* C-p *) -> p (fun s -> ok (navigate_message_buffer s Up)) >>= fun () -> loop ()
-+ | `Key (`Uchar u, [`Ctrl]) when Uchar.to_int u = 0x50 (* C-p *) -> p (fun s -> ok (navigate_message_buffer s Up)) >>= fun () -> loop ()
- | `Key (`Page `Down, [`Ctrl]) -> p (fun s -> ok (navigate_message_buffer s Down)) >>= fun () -> loop ()
-- | `Key (`Uchar 0x4E, [`Ctrl]) (* C-n *) -> p (fun s -> ok (navigate_message_buffer s Down)) >>= fun () -> loop ()
-+ | `Key (`Uchar u, [`Ctrl]) when Uchar.to_int u = 0x4E (* C-n *) -> p (fun s -> ok (navigate_message_buffer s Down)) >>= fun () -> loop ()
-
-- | `Key (`Uchar 0x58, [`Ctrl]) (* C-x *) -> p (fun s -> ok (activate_contact s s.last_active_contact)) >>= fun () -> loop ()
-- | `Key (`Uchar 0x51, [`Ctrl]) (* C-q *) ->
-+ | `Key (`Uchar u, [`Ctrl]) when Uchar.to_int u = 0x58 (* C-x *) -> p (fun s -> ok (activate_contact s s.last_active_contact)) >>= fun () -> loop ()
-+ | `Key (`Uchar u, [`Ctrl]) when Uchar.to_int u = 0x51 (* C-q *) ->
- let handle s =
- let s = match List.rev s.notifications with
- | x::_ -> activate_contact s x
-diff --git a/cli/cli_state.ml b/cli/cli_state.ml
-index 5603cfe..ee320ce 100644
---- a/cli/cli_state.ml
-+++ b/cli/cli_state.ml
-@@ -24,7 +24,7 @@ type connect_v =
- | Reconnect
- | Presence of (User.presence * string option * int option)
-
--type input = int list * int list
-+type input = Uchar.t list * Uchar.t list
-
- type state = {
- (* set only initially *)
-diff --git a/cli/cli_support.ml b/cli/cli_support.ml
-index 1c54df6..8275c38 100644
---- a/cli/cli_support.ml
-+++ b/cli/cli_support.ml
-@@ -4,17 +4,17 @@ open Notty
- module Char = struct
- let hdash a w =
- if !Utils.unicode then
-- I.uchar a 0x2500 w 1
-+ I.uchar a (Uchar.of_int 0x2500) w 1
- else
- I.char a '-' w 1
- and vdash a h =
- if !Utils.unicode then
-- I.uchar a 0x2502 1 h
-+ I.uchar a (Uchar.of_int 0x2502) 1 h
- else
- I.char a '|' 1 h
- and star a w =
- if !Utils.unicode then
-- I.uchar a 0x2605 w 1
-+ I.uchar a (Uchar.of_int 0x2605) w 1
- else
- I.char a '*' w 1
- end
-@@ -186,8 +186,8 @@ let v_center left right width =
- and rw = I.width right
- in
- match rw, lw >= width with
-- | 0, true -> (I.hcrop (lw - width + 1) 0 left, width)
-- | 0, false -> (left, succ lw)
-+ | 0, true -> (I.hcrop (lw - width + 1) 0 left, width - 1)
-+ | 0, false -> (left, lw)
- | _, _ ->
- if lw + rw >= width then
- let leftw = min (max (width - rw) (width / 2)) lw in
-@@ -195,11 +195,11 @@ let v_center left right width =
- let l = I.hcrop (lw - leftw) 0 left
- and r = I.hcrop 0 (rw - rightw) right
- in
-- (I.(l <|> r), succ leftw)
-+ (I.(l <|> r), leftw)
- else
-- (I.(left <|> right), succ lw)
-+ (I.(left <|> right), lw)
-
--let str_to_char_list str : int list =
-+let str_to_char_list str : Uchar.t list =
- let open Uutf in
- List.rev (String.fold_utf_8 (fun acc _ -> function `Uchar i -> i :: acc | `Malformed _ -> acc) [] str)
-
-@@ -236,22 +236,26 @@ let readline_input = function
- | k -> `Unhandled k
-
- let emacs_bindings = function
-- | `Key (`Uchar 0x41, [`Ctrl]) (* C-a *) -> `Ok (fun (pre, post) -> ([], pre @ post))
-- | `Key (`Uchar 0x45, [`Ctrl]) (* C-e *) -> `Ok (fun (pre, post) -> (pre @ post, []))
-+ | `Key (`Uchar u, [`Ctrl]) as k ->
-+ begin match Uchar.to_int u with
-+ | 0x41 (* C-a *) -> `Ok (fun (pre, post) -> ([], pre @ post))
-+ | 0x45 (* C-e *) -> `Ok (fun (pre, post) -> (pre @ post, []))
-
-- | `Key (`Uchar 0x4b, [`Ctrl]) (* C-k *) -> `Ok (fun (pre, _) -> (pre, []))
-- | `Key (`Uchar 0x55, [`Ctrl]) (* C-u *) -> `Ok (fun (_, post) -> ([], post))
-+ | 0x4b (* C-k *) -> `Ok (fun (pre, _) -> (pre, []))
-+ | 0x55 (* C-u *) -> `Ok (fun (_, post) -> ([], post))
-
-- | `Key (`Uchar 0x46, [`Ctrl]) (* C-f *) ->
-+ | 0x46 (* C-f *) ->
- `Ok (fun (pre, post) ->
- match post with
- | [] -> (pre, post)
- | hd::tl -> (pre @ [hd], tl))
-- | `Key (`Uchar 0x42, [`Ctrl]) (* C-b *) ->
-+ | 0x42 (* C-b *) ->
- `Ok (fun (pre, post) ->
- match List.rev pre with
- | [] -> ([], post)
- | hd::tl -> (List.rev tl, hd :: post))
-+ | _ -> `Unhandled k
-+ end
-
- | `Key (`Arrow `Left, [`Ctrl]) ->
- `Ok (fun (pre, post) ->
-diff --git a/src/contact.mli b/src/contact.mli
-index 6926296..d6c795b 100644
---- a/src/contact.mli
-+++ b/src/contact.mli
-@@ -8,7 +8,7 @@ val bare : contact -> Xjid.bare_jid
- val preserve_messages : contact -> bool
- val expanded : contact -> bool
- val messages : contact -> User.message list
--val input_buffer : contact -> (int list * int list)
-+val input_buffer : contact -> (Uchar.t list * Uchar.t list)
-
- val readline_history : contact -> string list
- val add_readline_history : contact -> string -> contact
-@@ -18,7 +18,7 @@ val set_history_position : contact -> int -> contact
- val received : contact -> string -> contact
-
- val expand : contact -> contact
--val set_input_buffer : contact -> (int list * int list) -> contact
-+val set_input_buffer : contact -> (Uchar.t list * Uchar.t list) -> contact
- val set_preserve_messages : contact -> bool -> contact
-
- val reset : contact -> contact
-diff --git a/src/muc.ml b/src/muc.ml
-index 1c98037..3293541 100644
---- a/src/muc.ml
-+++ b/src/muc.ml
-@@ -132,7 +132,7 @@ type groupchat = {
- expand : bool ;
- preserve_messages : bool ;
- message_history : User.message list ; (* persistent if preserve_messages *)
-- input_buffer : (int list * int list) ;
-+ input_buffer : (Uchar.t list * Uchar.t list) ;
- readline_history : string list ;
- history_position : int ;
- autojoin : bool ;
-diff --git a/src/user.ml b/src/user.ml
-index d039278..42a8c47 100644
---- a/src/user.ml
-+++ b/src/user.ml
-@@ -229,7 +229,7 @@ type user = {
- properties : property list ;
- preserve_messages : bool ;
- message_history : message list ; (* persistent if preserve_messages is true *)
-- input_buffer: (int list * int list) ; (* not persistent *)
-+ input_buffer: (Uchar.t list * Uchar.t list) ; (* not persistent *)
- readline_history : string list ; (* not persistent *)
- history_position : int ; (* not persistent *)
- otr_fingerprints : fingerprint list ;
-diff --git a/src/user.mli b/src/user.mli
-index 52b503d..5ce41be 100644
---- a/src/user.mli
-+++ b/src/user.mli
-@@ -118,7 +118,7 @@ type user = {
- properties : property list ;
- preserve_messages : bool ;
- message_history : message list ; (* persistent if preserve_messages is true *)
-- input_buffer: (int list * int list) ; (* not persistent *)
-+ input_buffer: (Uchar.t list * Uchar.t list) ; (* not persistent *)
- readline_history : string list ; (* not persistent *)
- history_position : int ;
- otr_fingerprints : fingerprint list ;
-diff --git a/src/utils.ml b/src/utils.ml
-index 0b4a3a7..cd9cb10 100644
---- a/src/utils.ml
-+++ b/src/utils.ml
-@@ -30,31 +30,33 @@ let validate_utf8 txt =
- let rec loop d buf = match Uutf.decode d with
- | `Await -> Buffer.contents buf
- | `End -> Buffer.contents buf
-- | `Malformed _ -> if !unicode then Uutf.Buffer.add_utf_8 buf 0xFFFD; loop d buf
-- | `Uchar 0x000A -> (* newline *) Uutf.Buffer.add_utf_8 buf 0x000A ; loop d buf
-- | `Uchar 0x0009 -> (* tab -> 4 spaces *) Uutf.Buffer.add_utf_8 buf 0x0020 ; Uutf.Buffer.add_utf_8 buf 0x0020 ; Uutf.Buffer.add_utf_8 buf 0x0020 ; Uutf.Buffer.add_utf_8 buf 0x0020 ; loop d buf
-- | `Uchar 0x007F (* DEL *)
-+ | `Malformed _ -> if !unicode then Uutf.Buffer.add_utf_8 buf (Uchar.of_int 0xFFFD); loop d buf
-+ | `Uchar u ->
-+ match Uchar.to_int u with
-+ | 0x000A -> (* newline *) Uutf.Buffer.add_utf_8 buf (Uchar.of_int 0x000A) ; loop d buf
-+ | 0x0009 -> (* tab -> 4 spaces *) Uutf.Buffer.add_utf_8 buf (Uchar.of_int 0x0020) ; Uutf.Buffer.add_utf_8 buf (Uchar.of_int 0x0020) ; Uutf.Buffer.add_utf_8 buf (Uchar.of_int 0x0020) ; Uutf.Buffer.add_utf_8 buf (Uchar.of_int 0x0020) ; loop d buf
-+ | 0x007F (* DEL *)
- (* See https://en.wikipedia.org/wiki/Unicode_control_characters / https://en.wikipedia.org/wiki/Bi-directional_text *)
-- | `Uchar 0x200E | `Uchar 0x200F (* left-to-right / right-to-left *)
-- | `Uchar 0x202A | `Uchar 0x202D (* left-to-right embedding / override *)
-- | `Uchar 0x202B | `Uchar 0x202E (* right-to-left embedding / override *)
-- | `Uchar 0x202C (* pop directional format *)
-- | `Uchar 0x2066 | `Uchar 0x2067 (* l-t-r isolate r-t-l isolate *)
-- | `Uchar 0x2068 | `Uchar 0x2069 (* first strong isolate / pop directional isolate *)
-- | `Uchar 0x2028 | `Uchar 0x2029 (* line separator / page separator *) ->
-- if !unicode then Uutf.Buffer.add_utf_8 buf 0xFFFD ; loop d buf
-- | `Uchar x when x < 0x20 ->
-+ | 0x200E | 0x200F (* left-to-right / right-to-left *)
-+ | 0x202A | 0x202D (* left-to-right embedding / override *)
-+ | 0x202B | 0x202E (* right-to-left embedding / override *)
-+ | 0x202C (* pop directional format *)
-+ | 0x2066 | 0x2067 (* l-t-r isolate r-t-l isolate *)
-+ | 0x2068 | 0x2069 (* first strong isolate / pop directional isolate *)
-+ | 0x2028 | 0x2029 (* line separator / page separator *) ->
-+ if !unicode then Uutf.Buffer.add_utf_8 buf (Uchar.of_int 0xFFFD) ; loop d buf
-+ | x when x < 0x20 ->
- (* other control characters *)
-- if !unicode then Uutf.Buffer.add_utf_8 buf 0xFFFD ; loop d buf
-- | `Uchar x when x >= 0x0080 && x <= 0x009F ->
-+ if !unicode then Uutf.Buffer.add_utf_8 buf (Uchar.of_int 0xFFFD) ; loop d buf
-+ | x when x >= 0x0080 && x <= 0x009F ->
- (* ctrl chars used in conjunction with ISO 8859 character sets (C0/C1) *)
-- if !unicode then Uutf.Buffer.add_utf_8 buf 0xFFFD ; loop d buf
-+ if !unicode then Uutf.Buffer.add_utf_8 buf (Uchar.of_int 0xFFFD) ; loop d buf
-
-- | `Uchar x ->
-+ | x ->
- let c = if !unicode then x else if x > 0xff then 0x3f else x in
-- Uutf.Buffer.add_utf_8 buf c ; loop d buf
-+ Uutf.Buffer.add_utf_8 buf (Uchar.of_int c) ; loop d buf
- in
-- let nln = `Readline 0x000A in
-+ let nln = `Readline (Uchar.of_int 0x000A) in
- loop (Uutf.decoder ~nln ~encoding:`UTF_8 (`String txt)) (Buffer.create (String.length txt))
-
- let version = "%%VERSION_NUM%%"
diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix
index bb5e26f3310..d1773456df2 100644
--- a/pkgs/applications/networking/instant-messengers/qtox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
name = "qtox-${version}";
- version = "1.10.1";
+ version = "1.10.2";
src = fetchFromGitHub {
owner = "tux3";
repo = "qTox";
rev = "v${version}";
- sha256 = "1c5y7fwhsq1f6z8208xl1jd6bl1r6k8g0fjqxf0z10373c9395jq";
+ sha256 = "0c2633rc9l73q9qs9hybn11hmlqbwsvih3sf6jk1jp4151k5wp1y";
};
buildInputs = [
diff --git a/pkgs/applications/networking/instant-messengers/scudcloud/default.nix b/pkgs/applications/networking/instant-messengers/scudcloud/default.nix
index d9a3dfc690d..9d2de536dbf 100644
--- a/pkgs/applications/networking/instant-messengers/scudcloud/default.nix
+++ b/pkgs/applications/networking/instant-messengers/scudcloud/default.nix
@@ -1,14 +1,12 @@
-{ stdenv, fetchgit, python3Packages }:
+{ stdenv, fetchurl, python3Packages }:
-python3Packages.buildPythonPackage {
- name = "scudcloud-1.44";
+let version = "1.58";
+in python3Packages.buildPythonPackage {
+ name = "scudcloud-${version}";
- # Branch 254-port-to-qt5
- # https://github.com/raelgc/scudcloud/commit/65c304416dfdd5f456fa6f7301432a953d5e12d0
- src = fetchgit {
- url = https://github.com/raelgc/scudcloud/;
- rev = "65c304416dfdd5f456fa6f7301432a953d5e12d0";
- sha256 = "0h1055y88kldqw31ayqfx9zsksgxsyqd8h0hwnhj80yn3jcx0rp6";
+ src = fetchurl {
+ url = "https://github.com/raelgc/scudcloud/archive/v${version}.tar.gz";
+ sha256 = "1j84qdc2j3dvl1nhrjqm0blc8ww723p9a6hqprkkp8alw77myq1l";
};
propagatedBuildInputs = with python3Packages; [ pyqt5 dbus-python ];
diff --git a/pkgs/applications/networking/insync/default.nix b/pkgs/applications/networking/insync/default.nix
index 86cc9bded10..7beb489178b 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/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix
index a00aebef296..84a2106f2a2 100644
--- a/pkgs/applications/networking/ipfs/default.nix
+++ b/pkgs/applications/networking/ipfs/default.nix
@@ -2,15 +2,15 @@
buildGoPackage rec {
name = "ipfs-${version}";
- version = "0.4.6";
- rev = "ed729423ce548785834cdcaa21aab11ebc3a1b1a";
+ version = "0.4.9";
+ rev = "7ea34c6c6ed18e886f869a1fbe725a848d13695c";
goPackagePath = "github.com/ipfs/go-ipfs";
extraSrcPaths = [
(fetchgx {
inherit name src;
- sha256 = "1wwzbps3ry3vlrr0iqhvxd44x0wi99dcp5hlxvh79dc0g9r7myfk";
+ sha256 = "1xgk9gdnlcxkrpj98h2mrnlpr9b8084k4q926i4pbmxipwxkwl4b";
})
];
@@ -18,7 +18,7 @@ buildGoPackage rec {
owner = "ipfs";
repo = "go-ipfs";
inherit rev;
- sha256 = "1b262k1lhb1g68l8hghly4pdrxx1c6wbv6ij6dg399zdwqzczl13";
+ sha256 = "1n2m2yah54cx4i9nlcsmljrwqi3wqxih517y8jpyjij6wraa334j";
};
meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix
index 4800fa938a0..d4e1bf39f1a 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/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index c8880e630a6..4e5d9893c2c 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -12,7 +12,7 @@ assert withQt -> !withGtk && qt5 != null;
with stdenv.lib;
let
- version = "2.2.5";
+ version = "2.2.6";
variant = if withGtk then "gtk" else if withQt then "qt" else "cli";
in stdenv.mkDerivation {
@@ -20,7 +20,7 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "http://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.bz2";
- sha256 = "1j4sc3pmy8l6k41007spglcqiabjlzc7f85pn3jmjr9ksv9qipbm";
+ sha256 = "0jd89i9si43lyv3hsl6p1lkjmz4zagvc37wcbigsxxc5v8gda9zn";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix
index 2daa846990a..ed48bce7b2e 100644
--- a/pkgs/applications/networking/sync/unison/default.nix
+++ b/pkgs/applications/networking/sync/unison/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation (rec {
description = "Bidirectional file synchronizer";
license = stdenv.lib.licenses.gpl3Plus;
maintainers = with stdenv.lib.maintainers; [viric];
- platforms = with stdenv.lib.platforms; linux;
+ platforms = with stdenv.lib.platforms; unix;
};
})
diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix
index ac2f71c872d..65a7c9730e9 100644
--- a/pkgs/applications/office/homebank/default.nix
+++ b/pkgs/applications/office/homebank/default.nix
@@ -2,10 +2,10 @@
, hicolor_icon_theme, libsoup, gnome3 }:
stdenv.mkDerivation rec {
- name = "homebank-5.1.4";
+ name = "homebank-5.1.5";
src = fetchurl {
url = "http://homebank.free.fr/public/${name}.tar.gz";
- sha256 = "07zxb9n7d281nfv29gi09fsp7y73fx4w2s48hgdn9s4vij25zwqa";
+ sha256 = "03rkl4bvi1cmb8rqyvmhxhg63bdmb3nzqa3firfimsbphm3x6gsw";
};
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
diff --git a/pkgs/applications/science/math/calc/default.nix b/pkgs/applications/science/math/calc/default.nix
index 19f769e4365..b8ed7ffac3c 100644
--- a/pkgs/applications/science/math/calc/default.nix
+++ b/pkgs/applications/science/math/calc/default.nix
@@ -34,6 +34,9 @@ stdenv.mkDerivation rec {
wrapProgram $out/bin/calc --prefix LD_LIBRARY_PATH : $out/lib
'';
+ # Hack to avoid TMPDIR in RPATHs.
+ preFixup = ''rm -rf "$(pwd)" '';
+
meta = {
description = "C-style arbitrary precision calculator";
homepage = http://www.isthe.com/chongo/tech/comp/calc/;
diff --git a/pkgs/applications/science/math/ecm/default.nix b/pkgs/applications/science/math/ecm/default.nix
index 072d772775c..44dc7af98c1 100644
--- a/pkgs/applications/science/math/ecm/default.nix
+++ b/pkgs/applications/science/math/ecm/default.nix
@@ -10,9 +10,12 @@ stdenv.mkDerivation {
inherit name;
src = fetchurl {
- url = http://gforge.inria.fr/frs/download.php/file/32159/ecm-6.4.4.tar.gz;
- sha256 = "0v5h2nicz9yx78c2d72plbhi30iq4nxbvphja1s9501db4aah4y8";
- };
+ url = http://gforge.inria.fr/frs/download.php/file/32159/ecm-6.4.4.tar.gz;
+ sha256 = "0v5h2nicz9yx78c2d72plbhi30iq4nxbvphja1s9501db4aah4y8";
+ };
+
+ # See https://trac.sagemath.org/ticket/19233
+ configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-asm-redc";
buildInputs = [ m4 gmp ];
@@ -23,6 +26,6 @@ stdenv.mkDerivation {
license = stdenv.lib.licenses.gpl2Plus;
homepage = http://ecm.gforge.inria.fr/;
maintainers = [ stdenv.lib.maintainers.roconnor ];
- platforms = stdenv.lib.platforms.linux;
+ platforms = with stdenv.lib.platforms; linux ++ darwin;
};
}
diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix
index bc766b96bca..2712388ffe7 100644
--- a/pkgs/applications/science/math/geogebra/default.nix
+++ b/pkgs/applications/science/math/geogebra/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "geogebra-${version}";
- version = "5-0-355-0";
+ version = "5-0-361-0";
preferLocalBuild = true;
src = fetchurl {
url = "http://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2";
- sha256 = "0gm6jqlc3kgnbwnqlz6i9rahdy802jq7xc9gw1q5ynk63smm3ngk";
+ sha256 = "14kidnk8bidklv474zqipv3f77qnfmc697pl407v0rja481c649a";
};
srcIcon = fetchurl {
diff --git a/pkgs/applications/science/math/msieve/default.nix b/pkgs/applications/science/math/msieve/default.nix
index 4c99b5081cc..6e1926810df 100644
--- a/pkgs/applications/science/math/msieve/default.nix
+++ b/pkgs/applications/science/math/msieve/default.nix
@@ -1,29 +1,30 @@
{stdenv, fetchurl, zlib, gmp, ecm }:
stdenv.mkDerivation {
- name = "msieve-1.48";
+ name = "msieve-1.53";
src = fetchurl {
- url = mirror://sourceforge/msieve/msieve/Msieve%20v1.48/msieve148.tar.gz;
- sha256 = "05cm23mpfsbwssqda243sbi8m31j783qx89x9gl7sy8a4dnv7h63";
- };
+ url = mirror://sourceforge/msieve/msieve/Msieve%20v1.53/msieve153_src.tar.gz;
+ sha256 = "1d1vv7j4rh3nnxsmvafi73qy7lw7n3akjlm5pjl3m936yapvmz65";
+ };
buildInputs = [ zlib gmp ecm ];
ECM = if ecm == null then "0" else "1";
- buildFlags = if stdenv.system == "x86_64-linux" then "x86_64"
- else if stdenv.system == "i686-linux" then "x86"
- else "generic";
+ # Doesn't hurt Linux but lets clang-based platforms like Darwin work fine too
+ makeFlags = "CC=cc all";
- installPhase = ''mkdir -p $out/bin/
- cp msieve $out/bin/'';
+ installPhase = ''
+ mkdir -p $out/bin/
+ cp msieve $out/bin/
+ '';
meta = {
description = "A C library implementing a suite of algorithms to factor large integers";
license = stdenv.lib.licenses.publicDomain;
homepage = http://msieve.sourceforge.net/;
maintainers = [ stdenv.lib.maintainers.roconnor ];
- platforms = [ "x86_64-linux" ];
+ platforms = [ "x86_64-linux" ] ++ stdenv.lib.platforms.darwin;
};
}
diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix
index d1996b72154..d38529e92e6 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix
@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
name = "git-annex-remote-rclone-${version}";
- version = "0.4";
+ version = "0.5";
rev = "v${version}";
src = fetchFromGitHub {
inherit rev;
owner = "DanielDent";
repo = "git-annex-remote-rclone";
- sha256 = "1myk307hqm8dlxhkmwr347rdd28niv5h0gyrxm30y77zlly30ddk";
+ sha256 = "1353b6q3lnxhpdfy9yd2af65v7aypdhyvgn7ziksmsrbi12lb74i";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix
index 001aa0c5b09..886efefa8bb 100644
--- a/pkgs/applications/version-management/git-repo/default.nix
+++ b/pkgs/applications/version-management/git-repo/default.nix
@@ -1,24 +1,41 @@
-{ stdenv, fetchurl, python }:
+{ stdenv, fetchFromGitHub, makeWrapper
+, python, git, gnupg1compat, less }:
-stdenv.mkDerivation {
- name = "git-repo-1.23";
- src = fetchurl {
- # I could not find a versioned url for the 1.21 version. In case
- # the sha mismatches, check the homepage for new version and sha.
- url = "http://commondatastorage.googleapis.com/git-repo-downloads/repo";
- sha256 = "1i8xymxh630a7d5nkqi49nmlwk77dqn36vsygpyhri464qwz0iz1";
+stdenv.mkDerivation rec {
+ name = "git-repo-${version}";
+ version = "1.12.37";
+
+ src = fetchFromGitHub {
+ owner = "android";
+ repo = "tools_repo";
+ rev = "v${version}";
+ sha256 = "0qp7jqhblv7xblfgpcq4n18dyjdv8shz7r60c3vnjxx2fngkj2jd";
};
- unpackPhase = "true";
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ python git gnupg1compat less ];
+
installPhase = ''
mkdir -p $out/bin
- sed -e 's,!/usr/bin/env python,!${python}/bin/python,' < $src > $out/bin/repo
- chmod +x $out/bin/repo
+ cp $src/repo $out/bin/repo
'';
- meta = {
- homepage = "http://source.android.com/source/downloading.html";
+ postFixup = ''
+ wrapProgram $out/bin/repo --prefix PATH ":" \
+ "${stdenv.lib.makeBinPath [ git gnupg1compat less ]}"
+ '';
+
+ meta = with stdenv.lib; {
description = "Android's repo management tool";
- platforms = stdenv.lib.platforms.unix;
+ longDescription = ''
+ Repo is a Python script based on Git that helps manage many Git
+ repositories, does the uploads to revision control systems, and automates
+ parts of the development workflow. Repo is not meant to replace Git, only
+ to make it easier to work with Git.
+ '';
+ homepage = "https://android.googlesource.com/tools/repo";
+ license = licenses.asl20;
+ maintainers = [ maintainers.primeos ];
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index 649dad0bb57..33e64c65cf4 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -54,17 +54,16 @@ let
};
in stdenv.mkDerivation rec {
name = "kodi-${version}";
- version = "17.1";
+ version = "17.3";
src = fetchurl {
url = "https://github.com/xbmc/xbmc/archive/${version}-${rel}.tar.gz";
- sha256 = "1vmvrq0qdjnphw34yils2b5jnm05cmsg777hc4lwqz5mrc1kjgrh";
+ sha256 = "189isc1jagrnq549vwpvb0x1w6p0mkjwv7phm8dzvki96wx6bs0x";
};
buildInputs = [
- makeWrapper libxml2 gnutls
- pkgconfig cmake gnumake yasm python2
- boost libmicrohttpd autoreconfHook
+ libxml2 gnutls yasm python2
+ boost libmicrohttpd
gettext pcre-cpp yajl fribidi libva
openssl gperf tinyxml2 taglib libssh swig jre
libX11 xproto inputproto which
@@ -91,6 +90,9 @@ in stdenv.mkDerivation rec {
++ lib.optional rtmpSupport rtmpdump
++ lib.optional joystickSupport SDL2;
+ nativeBuildInputs = [
+ autoreconfHook cmake gnumake makeWrapper pkgconfig
+ ];
dontUseCmakeConfigure = true;
diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix
index 8228c2c6cd9..495171b77ee 100644
--- a/pkgs/applications/video/kodi/plugins.nix
+++ b/pkgs/applications/video/kodi/plugins.nix
@@ -112,11 +112,11 @@ in
plugin = "exodus";
namespace = "plugin.video.exodus";
- version = "3.0.5";
+ version = "3.1.13";
src = fetchurl {
url = "https://offshoregit.com/${plugin}/${namespace}/${namespace}-${version}.zip";
- sha256 = "0di34sp6y3v72l6gfhj7cvs1vljs9vf0d0x2giix3jk433cj01j0";
+ sha256 = "1zyay7cinljxmpzngzlrr4pnk2a7z9wwfdcsk6a4p416iglyggdj";
};
meta = with stdenv.lib; {
@@ -160,14 +160,14 @@ in
plugin = "svtplay";
namespace = "plugin.video.svtplay";
- version = "4.0.42";
+ version = "4.0.48";
src = fetchFromGitHub {
name = plugin + "-" + version + ".tar.gz";
owner = "nilzen";
repo = "xbmc-" + plugin;
- rev = "83cb52b949930a1b6d2e51a7a0faf9bd69c7fb7d";
- sha256 = "0ync2ya4lwmfn6ngg8v0z6bng45whwg280irsn4bam5ca88383iy";
+ rev = "dc18ad002cd69257611d0032fba91f57bb199165";
+ sha256 = "0klk1jpjc243ak306k94mag4b4s17w68v69yb8lzzydszqkaqa7x";
};
meta = with stdenv.lib; {
diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix
index 41967f50bd0..146cb3b0e46 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 ea0bd083b1d..3f0aff6a15b 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/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index c52d1439012..b806ff65ddb 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -20,19 +20,13 @@ assert (!withQt5 -> qt4 != null);
stdenv.mkDerivation rec {
name = "vlc-${version}";
- version = "2.2.4";
+ version = "2.2.6";
src = fetchurl {
url = "http://get.videolan.org/vlc/${version}/${name}.tar.xz";
- sha256 = "1gjkrwlg8ab3skzl67cxb9qzg4187ifckd1z9kpy11q058fyjchn";
+ sha256 = "1a22b913p2227ljz89c4fgjlyln5gcz8z58w32r0wh4srnnd60y4";
};
- patches = optional withQt5 (fetchurl {
- name = "Fix-build-using-old-GCC-intrinsics.patch";
- url = "https://patches.videolan.org/patch/14061/raw/";
- sha256 = "16v4k7378a590diz11bdvdaqi9cpf6333hp5wr6v5sfrsma8qvpx";
- });
-
# Comment-out the Qt 5.5 version check, as we do apply the relevant patch.
# https://trac.videolan.org/vlc/ticket/16497
postPatch = if (!withQt5) then null else
diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix
index 4f7ea37ca18..121875a69de 100644
--- a/pkgs/applications/virtualization/OVMF/default.nix
+++ b/pkgs/applications/virtualization/OVMF/default.nix
@@ -23,6 +23,9 @@ stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" {
hardeningDisable = [ "stackprotector" "pic" "fortify" ];
unpackPhase = ''
+ # $fd is overwritten during the build
+ export OUTPUT_FD=$fd
+
for file in \
"${edk2.src}"/{UefiCpuPkg,MdeModulePkg,IntelFrameworkModulePkg,PcAtChipsetPkg,FatBinPkg,EdkShellBinPkg,MdePkg,ShellPkg,OptionRomPkg,IntelFrameworkPkg};
do
@@ -51,8 +54,8 @@ stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" {
'';
postFixup = ''
- mkdir -p $fd/FV
- mv $out/FV/OVMF{,_CODE,_VARS}.fd $fd/FV
+ mkdir -vp $OUTPUT_FD/FV
+ mv -v $out/FV/OVMF{,_CODE,_VARS}.fd $OUTPUT_FD/FV
'';
dontPatchELF = true;
diff --git a/pkgs/applications/virtualization/lkl/default.nix b/pkgs/applications/virtualization/lkl/default.nix
index 134df59159b..e40d054520f 100644
--- a/pkgs/applications/virtualization/lkl/default.nix
+++ b/pkgs/applications/virtualization/lkl/default.nix
@@ -1,31 +1,35 @@
{ stdenv, fetchFromGitHub, bc, python, fuse, libarchive }:
stdenv.mkDerivation rec {
- name = "lkl-${stdenv.lib.substring 0 7 rev}";
- rev = "d74707304d4e4614081ae2a612a833aeb46622b5";
+ name = "lkl-2017-03-24";
+ rev = "a063e1631db5e2b9b04f184c5e6d185c1cd645cb";
- buildInputs = [ bc python fuse libarchive ];
+ outputs = [ "dev" "lib" "out" ];
+
+ nativeBuildInputs = [ bc python ];
+
+ buildInputs = [ fuse libarchive ];
src = fetchFromGitHub {
inherit rev;
owner = "lkl";
repo = "linux";
- sha256 = "0x1hdjsrj6hfk1sgfw11ihm00fmp6g158sr2q3cgjy2b6jnsr4hp";
+ sha256 = "07dmira76i0ki577sra4fdl1wvzfzxzd75252lza0sc6jdzrrwvj";
};
# Fix a /usr/bin/env reference in here that breaks sandboxed builds
prePatch = "patchShebangs arch/lkl/scripts";
installPhase = ''
- mkdir -p $out/{bin,lib}
+ mkdir -p $out/bin $lib/lib $dev
- # This tool assumes a different directory structure so let's point it at the right location
cp tools/lkl/bin/lkl-hijack.sh $out/bin
- substituteInPlace $out/bin/lkl-hijack.sh --replace '/../' '/../lib'
+ sed -i $out/bin/lkl-hijack.sh \
+ -e "s,LD_LIBRARY_PATH=.*,LD_LIBRARY_PATH=$lib/lib,"
cp tools/lkl/{cptofs,cpfromfs,fs2tar,lklfuse} $out/bin
- cp -r tools/lkl/include $out
- cp tools/lkl/liblkl*.{a,so} $out/lib
+ cp -r tools/lkl/include $dev/
+ cp tools/lkl/liblkl*.{a,so} $lib/lib
'';
# We turn off format and fortify because of these errors (fortify implies -O2, which breaks the jitter entropy code):
@@ -38,7 +42,13 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
meta = with stdenv.lib; {
- description = "LKL (Linux Kernel Library) aims to allow reusing the Linux kernel code as extensively as possible with minimal effort and reduced maintenance overhead";
+ description = "The Linux kernel as a library";
+ longDescription = ''
+ LKL (Linux Kernel Library) aims to allow reusing the Linux kernel code as
+ extensively as possible with minimal effort and reduced maintenance
+ overhead
+ '';
+ homepage = https://github.com/lkl/linux/;
platforms = [ "x86_64-linux" ]; # Darwin probably works too but I haven't tested it
license = licenses.gpl2;
maintainers = with maintainers; [ copumpkin ];
diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix
index 81e26f78528..41c2397d59e 100644
--- a/pkgs/applications/virtualization/rkt/default.nix
+++ b/pkgs/applications/virtualization/rkt/default.nix
@@ -12,7 +12,7 @@ let
stage1Dir = "lib/rkt/stage1-images";
in stdenv.mkDerivation rec {
- version = "1.25.0";
+ version = "1.26.0";
name = "rkt-${version}";
BUILDDIR="build-${name}";
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
owner = "coreos";
repo = "rkt";
rev = "v${version}";
- sha256 = "0lcnhyaxq8z0ndwqg0svcc1gg0ahhcprxlf9gifm4mpxqimhaz8j";
+ sha256 = "16zwrx5v6pjjw1c6nbl19cchq71fj0bp5ci52rrfvl5mbn8xrs70";
};
stage1BaseImage = fetchurl {
diff --git a/pkgs/applications/virtualization/virt-manager/qt.nix b/pkgs/applications/virtualization/virt-manager/qt.nix
index 25a70ee9bce..7e05324a046 100644
--- a/pkgs/applications/virtualization/virt-manager/qt.nix
+++ b/pkgs/applications/virtualization/virt-manager/qt.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
name = "virt-manager-qt-${version}";
- version = "0.43.70";
+ version = "0.43.70.2";
src = fetchFromGitHub {
owner = "F1ash";
repo = "qt-virt-manager";
rev = "${version}";
- sha256 = "0d8g0pg15cyi450qgkgi7fh83wkxcqfpphgsh5q10r6jjl87166x";
+ sha256 = "06123bywzgs5y2yskqm8qypj9diym5xip2bdlghfhw30957pcxxg";
};
cmakeFlags = [
diff --git a/pkgs/build-support/cc-wrapper/utils.sh b/pkgs/build-support/cc-wrapper/utils.sh
index aba5f3295a9..d17930e8ab5 100644
--- a/pkgs/build-support/cc-wrapper/utils.sh
+++ b/pkgs/build-support/cc-wrapper/utils.sh
@@ -23,26 +23,55 @@ badPath() {
"${p:0:${#NIX_BUILD_TOP}}" != "$NIX_BUILD_TOP"
}
-expandResponseParams() {
- local inparams=("$@")
- local n=0
- local p
- params=()
- while [ $n -lt ${#inparams[*]} ]; do
- p=${inparams[n]}
- case $p in
- @*)
- if [ -e "${p:1}" ]; then
- args=$(<"${p:1}")
- eval 'for arg in '${args//$/\\$}'; do params+=("$arg"); done'
- else
- params+=("$p")
- fi
- ;;
- *)
- params+=("$p")
- ;;
+# @args.rsp parser.
+# Char classes: space, other, backslash, single quote, double quote.
+# States: 0 - outside, 1/2 - unquoted arg/slash, 3/4 - 'arg'/slash, 5/6 - "arg"/slash.
+# State transitions:
+rspT=(01235 01235 11111 33413 33333 55651 55555)
+# Push char on transition:
+rspC[01]=1 rspC[11]=1 rspC[21]=1 rspC[33]=1 rspC[43]=1 rspC[55]=1 rspC[65]=1
+
+rspParse() {
+ rsp=()
+ local s="$1"
+ local state=0
+ local arg=''
+
+ for (( i=0; i<${#s}; i++ )); do
+ local c="${s:$i:1}"
+ local cls=1
+ case "$c" in
+ ' ' | $'\t' | $'\r' | $'\n') cls=0 ;;
+ '\') cls=2 ;;
+ "'") cls=3 ;;
+ '"') cls=4 ;;
esac
- n=$((n + 1))
+ local nextstates="${rspT[$state]}"
+ local nextstate="${nextstates:$cls:1}"
+ if [ "${rspC[$state$nextstate]}" ]; then
+ arg+="$c"
+ elif [ "$state$nextstate" = "10" ]; then
+ rsp+=("$arg")
+ arg=''
+ fi
+ state="$nextstate"
+ done
+
+ if [ "$state" -ne 0 ]; then
+ rsp+=("$arg")
+ fi
+}
+
+expandResponseParams() {
+ params=()
+ while [ $# -gt 0 ]; do
+ local p="$1"
+ shift
+ if [ "${p:0:1}" = '@' -a -e "${p:1}" ]; then
+ rspParse "$(<"${p:1}")"
+ set -- "${rsp[@]}" "$@"
+ else
+ params+=("$p")
+ fi
done
}
diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix
index 05b4a9b4f2d..49cbb7a9817 100644
--- a/pkgs/build-support/docker/examples.nix
+++ b/pkgs/build-support/docker/examples.nix
@@ -83,16 +83,12 @@ rec {
};
# 4. example of pulling an image. could be used as a base for other images
- #
- # ***** Currently broken, getting 404s. Perhaps the docker API has changed?
- #
- #
- # debian = pullImage {
- # imageName = "debian";
- # imageTag = "jessie";
- # # this hash will need change if the tag is updated at docker hub
- # sha256 = "18kd495lc2k35h03bpcbdjnix17nlqbwf6nmq3sb161blf0dk14q";
- # };
+ nix = pullImage {
+ imageName = "nixos/nix";
+ imageTag = "1.11";
+ # this hash will need change if the tag is updated at docker hub
+ sha256 = "1gk4bq05vl3rj3mh4mlbl4iicgndmimlv8jvkhdk4hrv0r44bwr3";
+ };
# 5. example of multiple contents, emacs and vi happily coexisting
editors = buildImage {
diff --git a/pkgs/build-support/docker/pull.nix b/pkgs/build-support/docker/pull.nix
index 0e1b147f6e1..5ccd0a41c5e 100644
--- a/pkgs/build-support/docker/pull.nix
+++ b/pkgs/build-support/docker/pull.nix
@@ -1,41 +1,32 @@
-{ stdenv, lib, curl, jshon, python, runCommand }:
-
-# Inspired and simplified version of fetchurl.
+{ stdenv, lib, docker, vmTools, utillinux, curl, kmod, dhcp, cacert, e2fsprogs }:
+let
+ nameReplace = name: builtins.replaceStrings ["/" ":"] ["-" "-"] name;
+in
# For simplicity we only support sha256.
+{ imageName, imageTag ? "latest", imageId ? "${imageName}:${imageTag}"
+, sha256, name ? (nameReplace "docker-image-${imageName}-${imageTag}.tar") }:
+let
+ pullImage = vmTools.runInLinuxVM (
+ stdenv.mkDerivation {
+ inherit name imageId;
-# Currently only registry v1 is supported, compatible with Docker Hub.
+ certs = "${cacert}/etc/ssl/certs/ca-bundle.crt";
-{ imageName, imageTag ? "latest", imageId ? null
-, sha256, name ? "${imageName}-${imageTag}"
-, indexUrl ? "https://index.docker.io"
-, registryVersion ? "v1"
-, curlOpts ? "" }:
+ builder = ./pull.sh;
-assert registryVersion == "v1";
+ buildInputs = [ curl utillinux docker kmod dhcp cacert e2fsprogs ];
-let layer = stdenv.mkDerivation {
- inherit name imageName imageTag imageId
- indexUrl registryVersion curlOpts;
+ outputHashAlgo = "sha256";
+ outputHash = sha256;
- builder = ./pull.sh;
- detjson = ./detjson.py;
+ impureEnvVars = lib.fetchers.proxyImpureEnvVars;
- buildInputs = [ curl jshon python ];
+ preVM = vmTools.createEmptyImage {
+ size = 2048;
+ fullName = "${name}-disk";
+ };
- outputHashAlgo = "sha256";
- outputHash = sha256;
- outputHashMode = "recursive";
-
- impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [
- # This variable allows the user to pass additional options to curl
- "NIX_CURL_FLAGS"
- ];
-
- # Doing the download on a remote machine just duplicates network
- # traffic, so don't do that.
- preferLocalBuild = true;
-};
-
-in runCommand "${name}.tar.gz" {} ''
- tar -C ${layer} -czf $out .
-''
+ QEMU_OPTS = "-netdev user,id=net0 -device virtio-net-pci,netdev=net0";
+ });
+in
+ pullImage
diff --git a/pkgs/build-support/docker/pull.sh b/pkgs/build-support/docker/pull.sh
index 7ba146e9de0..db643f5e88e 100644
--- a/pkgs/build-support/docker/pull.sh
+++ b/pkgs/build-support/docker/pull.sh
@@ -1,86 +1,36 @@
-# Reference: docker src contrib/download-frozen-image.sh
-
source $stdenv/setup
-# Curl flags to handle redirects, not use EPSV, handle cookies for
-# servers to need them during redirects, and work on SSL without a
-# certificate (this isn't a security problem because we check the
-# cryptographic hash of the output anyway).
-curl=$(command -v curl)
-curl() {
- [[ -n ${token:-} ]] && set -- -H "Authorization: Token $token" "$@"
- $curl \
- --location --max-redirs 20 \
- --retry 3 \
- --fail \
- --disable-epsv \
- --cookie-jar cookies \
- --insecure \
- $curlOpts \
- $NIX_CURL_FLAGS \
- "$@"
-}
+mkdir -p /var/lib/docker
+mkfs.ext4 /dev/vda
+mount -t ext4 /dev/vda /var/lib/docker
-fetchLayer() {
- local url="$1"
- local dest="$2"
- local curlexit=18;
+modprobe virtio_net
+dhclient eth0
- # if we get error code 18, resume partial download
- while [ $curlexit -eq 18 ]; do
- # keep this inside an if statement, since on failure it doesn't abort the script
- if curl -C - "$url" --output "$dest"; then
- return 0
- else
- curlexit=$?;
- fi
- done
+mkdir -p /etc/ssl/certs/
+cp "$certs" "/etc/ssl/certs/"
- return $curlexit
-}
-
-headers=$(curl -o /dev/null -D- -H 'X-Docker-Token: true' \
- "$indexUrl/$registryVersion/repositories/$imageName/images")
-
-header() {
- grep $1 <<< "$headers" | tr -d '\r' | cut -d ' ' -f 2
-}
-
-# this only takes the first endpoint, more may be provided
-# https://docs.docker.com/v1.6/reference/api/docker-io_api/
-if ! registryUrl=$(header X-Docker-Endpoints); then
- echo "error: index returned no endpoint"
- exit 1
-fi
-baseUrl="https://$registryUrl/$registryVersion"
-
-token="$(header X-Docker-Token || true)";
-
-if [ -z "$imageId" ]; then
- imageId="$(curl "$baseUrl/repositories/$imageName/tags/$imageTag")"
- imageId="${imageId//\"/}"
- if [ -z "$imageId" ]; then
- echo "error: no image ID found for ${imageName}:${imageTag}"
- exit 1
+# from https://github.com/tianon/cgroupfs-mount/blob/master/cgroupfs-mount
+mount -t tmpfs -o uid=0,gid=0,mode=0755 cgroup /sys/fs/cgroup
+cd /sys/fs/cgroup
+for sys in $(awk '!/^#/ { if ($4 == 1) print $1 }' /proc/cgroups); do
+ mkdir -p $sys
+ if ! mountpoint -q $sys; then
+ if ! mount -n -t cgroup -o $sys cgroup $sys; then
+ rmdir $sys || true
fi
-
- echo "found image ${imageName}:${imageTag}@$imageId"
-fi
-
-mkdir -p $out
-
-jshon -n object \
- -n object -s "$imageId" -i "$imageTag" \
- -i "$imageName" > $out/repositories
-
-curl "$baseUrl/images/$imageId/ancestry" -o ancestry.json
-
-layerIds=$(jshon -a -u < ancestry.json)
-for layerId in $layerIds; do
- echo "fetching layer $layerId"
-
- mkdir "$out/$layerId"
- echo '1.0' > "$out/$layerId/VERSION"
- curl "$baseUrl/images/$layerId/json" | python $detjson > "$out/$layerId/json"
- fetchLayer "$baseUrl/images/$layerId/layer" "$out/$layerId/layer.tar"
+ fi
done
+
+# run docker daemon
+dockerd -H tcp://127.0.0.1:5555 -H unix:///var/run/docker.sock &
+
+until $(curl --output /dev/null --silent --connect-timeout 2 http://127.0.0.1:5555); do
+ printf '.'
+ sleep 1
+done
+
+rm -r $out
+
+docker pull ${imageId}
+docker save ${imageId} > $out
diff --git a/pkgs/build-support/fetchgx/default.nix b/pkgs/build-support/fetchgx/default.nix
index 6d209cec254..ea91a0854d1 100644
--- a/pkgs/build-support/fetchgx/default.nix
+++ b/pkgs/build-support/fetchgx/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
phases = [ "unpackPhase" "buildPhase" "installPhase" ];
- SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
+ NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
buildPhase = ''
export GOPATH=$(pwd)/vendor
diff --git a/pkgs/build-support/libredirect/libredirect.c b/pkgs/build-support/libredirect/libredirect.c
index ed0d5b0043d..d1e8f77fb1f 100644
--- a/pkgs/build-support/libredirect/libredirect.c
+++ b/pkgs/build-support/libredirect/libredirect.c
@@ -47,6 +47,7 @@ static void init()
static const char * rewrite(const char * path, char * buf)
{
+ if (path == NULL) return path;
for (int n = 0; n < nrRedirects; ++n) {
int len = strlen(from[n]);
if (strncmp(path, from[n], len) != 0) continue;
diff --git a/pkgs/build-support/setup-hooks/audit-tmpdir.sh b/pkgs/build-support/setup-hooks/audit-tmpdir.sh
new file mode 100644
index 00000000000..ffaa61f2d80
--- /dev/null
+++ b/pkgs/build-support/setup-hooks/audit-tmpdir.sh
@@ -0,0 +1,41 @@
+# Check whether RPATHs or wrapper scripts contain references to
+# $TMPDIR. This is a serious security bug because it allows any user
+# to inject files into search paths of other users' processes.
+#
+# It might be better to have Nix scan build output for any occurrence
+# of $TMPDIR (which would also be good for reproducibility), but at
+# the moment that would produce too many spurious errors (e.g. debug
+# info or assertion messages that refer to $TMPDIR).
+
+fixupOutputHooks+=('if [ -z "$noAuditTmpdir" -a -e "$prefix" ]; then auditTmpdir "$prefix"; fi')
+
+auditTmpdir() {
+ local dir="$1"
+ [ -e "$dir" ] || return 0
+
+ header "checking for references to $TMPDIR in $dir..."
+
+ local i
+ while IFS= read -r -d $'\0' i; do
+ if [[ "$i" =~ .build-id ]]; then continue; fi
+
+ if isELF "$i"; then
+ if patchelf --print-rpath "$i" | grep -q -F "$TMPDIR"; then
+ echo "RPATH of binary $i contains a forbidden reference to $TMPDIR"
+ exit 1
+ fi
+ fi
+
+ if isScript "$i"; then
+ if [ -e "$(dirname $i)/.$(basename $i)-wrapped" ]; then
+ if grep -q -F "$TMPDIR" "$i"; then
+ echo "wrapper script $i contains a forbidden reference to $TMPDIR"
+ exit 1
+ fi
+ fi
+ fi
+
+ done < <(find "$dir" -type f -print0)
+
+ stopNest
+}
diff --git a/pkgs/build-support/setup-hooks/multiple-outputs.sh b/pkgs/build-support/setup-hooks/multiple-outputs.sh
index eafc770a8e1..62a6491b8dc 100644
--- a/pkgs/build-support/setup-hooks/multiple-outputs.sh
+++ b/pkgs/build-support/setup-hooks/multiple-outputs.sh
@@ -61,7 +61,7 @@ _multioutConfig() {
local shareDocName="$(sed -n "s/^PACKAGE_TARNAME='\(.*\)'$/\1/p" < "$confScript")"
fi
# PACKAGE_TARNAME sometimes contains garbage.
- if [ -n "$shareDocName" ] || echo "$shareDocName" | grep -q '[^a-zA-Z-_0-9]'; then
+ if [ -n "$shareDocName" ] || echo "$shareDocName" | grep -q '[^a-zA-Z0-9_-]'; then
shareDocName="$(echo "$name" | sed 's/-[^a-zA-Z].*//')"
fi
fi
diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix
index 1529869aa33..4debd963639 100644
--- a/pkgs/build-support/trivial-builders.nix
+++ b/pkgs/build-support/trivial-builders.nix
@@ -71,7 +71,7 @@ rec {
''
mkdir -p $out
for i in $paths; do
- ${lndir}/bin/lndir $i $out
+ ${lndir}/bin/lndir -silent $i $out
done
${postBuild}
'';
diff --git a/pkgs/data/fonts/droid/default.nix b/pkgs/data/fonts/droid/default.nix
index 8051606632d..fd32f478b71 100644
--- a/pkgs/data/fonts/droid/default.nix
+++ b/pkgs/data/fonts/droid/default.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Droid Family fonts by Google Android";
- homepage = [ https://github.com/google/fonts ];
+ homepage = "https://github.com/google/fonts";
license = stdenv.lib.licenses.asl20;
platforms = stdenv.lib.platforms.all;
maintainers = [];
diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix
index 07c5828a9e7..282a0dd1596 100644
--- a/pkgs/data/misc/geolite-legacy/default.nix
+++ b/pkgs/data/misc/geolite-legacy/default.nix
@@ -8,26 +8,26 @@ let
in
stdenv.mkDerivation rec {
name = "geolite-legacy-${version}";
- version = "2016-07-08";
+ version = "2017-05-26";
srcGeoIP = fetchDB
"GeoLiteCountry/GeoIP.dat.gz" "GeoIP.dat.gz"
- "03rp862snj4pxpz272az2mjp0vdw9a6rzbzcml9bzwvsi1ap5sl7";
+ "04akk0jczvki8rdvz6z6v5s26ds0m27953lzvp3v0fsg7rl08q5n";
srcGeoIPv6 = fetchDB
"GeoIPv6.dat.gz" "GeoIPv6.dat.gz"
- "1s5y6r4ji1ljsl1d3w9mcqppxy2kvxjk5aq5lldbj616rbcp2v72";
+ "0i0885vvj0s5sysyafvk8pc8gr3znh7gmiy8rp4iiai7qnbylb7y";
srcGeoLiteCity = fetchDB
"GeoLiteCity.dat.xz" "GeoIPCity.dat.xz"
- "07dp3wf5b6g62y6zgm9f1zfc7gn2wnss7fjdips879373kj3lgbr";
+ "0bgf4kfg4mmqvgmrff27lbiglnnb3pnd7f3i4fxzl68c33bizmbm";
srcGeoLiteCityv6 = fetchDB
"GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz" "GeoIPCityv6.dat.gz"
- "1y7c8f84x99dbrqij124bylddc7bmcld1xp4h3qxvmmp8ch5hcxz";
+ "06slyw2644y2z5bgn4yl79aa4smf94mdcddybldh1glc3ay3p4iz";
srcGeoIPASNum = fetchDB
"asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz"
- "168z6j6adrn80sl3ip41fa0jfv2p26lfa8qil6w17sqhg8f61rnp";
+ "1gpvsqvq9z9pg9zfn86i50fb481llfyn79r1jwddwfflp1qqfrrv";
srcGeoIPASNumv6 = fetchDB
"asnum/GeoIPASNumv6.dat.gz" "GeoIPASNumv6.dat.gz"
- "0q0vgjgxixcq5qnl5d6hxg3bpsbylmmjkhdp308vbbd68q6fws22";
+ "0nmhz82dn9clm5w2y6z861ifj7i761spy1p1zcam93046cdpqqaa";
meta = with stdenv.lib; {
description = "GeoLite Legacy IP geolocation databases";
diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix
index 2b92e366296..e9302fca674 100644
--- a/pkgs/desktops/enlightenment/efl.nix
+++ b/pkgs/desktops/enlightenment/efl.nix
@@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
name = "efl-${version}";
- version = "1.19.0";
+ version = "1.19.1";
src = fetchurl {
url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.xz";
- sha256 = "1pza8lacqh3bgsvcm4h2hyc577bvnzix932g87dhg03ph4839q54";
+ sha256 = "0fndwraca9rg0bz3al4isdprvyw56szr88qiyvglb4j8ygsylscc";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix
index 23805b469ae..968cf8baf6a 100644
--- a/pkgs/desktops/enlightenment/enlightenment.nix
+++ b/pkgs/desktops/enlightenment/enlightenment.nix
@@ -4,11 +4,11 @@ mesa_glu , xkeyboard_config }:
stdenv.mkDerivation rec {
name = "enlightenment-${version}";
- version = "0.21.7";
+ version = "0.21.8";
src = fetchurl {
url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz";
- sha256 = "1xvngjdsa0p901vfhrh2qpa50k32hwwhc8bgi16a9b5d9byzfhvn";
+ sha256 = "0cjjiip12hd8bfjl9ccl3vzl81pxh1wpymxk2yvrzf6ap5girhps";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/desktops/gnome-3/3.22/default.nix b/pkgs/desktops/gnome-3/3.22/default.nix
index d9b26d6aee3..b1293cb47ba 100644
--- a/pkgs/desktops/gnome-3/3.22/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/default.nix
@@ -45,7 +45,7 @@ let
hitori gnome-taquin
];
- inherit (pkgs) glib gtk2 webkitgtk214x gtk3 gtkmm3 libcanberra_gtk2
+ inherit (pkgs) glib gtk2 webkitgtk216x gtk3 gtkmm3 libcanberra_gtk2
clutter clutter-gst clutter_gtk cogl gtkvnc;
inherit (pkgs.gnome2) ORBit2;
libsoup = pkgs.libsoup.override { gnomeSupport = true; };
@@ -56,7 +56,7 @@ let
gtkmm = gtkmm3;
vala = pkgs.vala_0_32;
gegl_0_3 = pkgs.gegl_0_3.override { inherit gtk; };
- webkitgtk = webkitgtk214x;
+ webkitgtk = webkitgtk216x;
# Simplify the nixos module and gnome packages
defaultIconTheme = adwaita-icon-theme;
diff --git a/pkgs/development/arduino/arduino-core/default.nix b/pkgs/development/arduino/arduino-core/default.nix
index fbc139c314f..fdb9d1be6ad 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 9d3ed56bee9..f74da977372 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/bigloo/default.nix b/pkgs/development/compilers/bigloo/default.nix
index 3599ff750c2..bf2272a75c1 100644
--- a/pkgs/development/compilers/bigloo/default.nix
+++ b/pkgs/development/compilers/bigloo/default.nix
@@ -32,6 +32,9 @@ stdenv.mkDerivation rec {
checkTarget = "test";
+ # Hack to avoid TMPDIR in RPATHs.
+ preFixup = ''rm -rf "$(pwd)" '';
+
meta = {
description = "Efficient Scheme compiler";
homepage = http://www-sop.inria.fr/indes/fp/Bigloo/;
diff --git a/pkgs/development/compilers/colm/default.nix b/pkgs/development/compilers/colm/default.nix
index 767023053c6..ee9224b380c 100644
--- a/pkgs/development/compilers/colm/default.nix
+++ b/pkgs/development/compilers/colm/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchurl, makeWrapper, gcc }:
+{ stdenv, fetchurl, makeWrapper, gcc, asciidoc }:
stdenv.mkDerivation rec {
name = "colm-${version}";
- version = "0.13.0.4";
+ version = "0.13.0.5";
src = fetchurl {
url = "http://www.colm.net/files/colm/${name}.tar.gz";
- sha256 = "04xcb7w82x9i4ygxqla9n39y646n3jw626khdp5297z1dkxx1czx";
+ sha256 = "1320bx96ycd1xwww137cixrb983838wnrgkfsym8x5bnf5kj9rik";
};
- buildInputs = [ makeWrapper ];
+ nativeBuildInputs = [ makeWrapper asciidoc ];
doCheck = true;
diff --git a/pkgs/development/compilers/fstar/default.nix b/pkgs/development/compilers/fstar/default.nix
index 00714875ffc..51777f748e3 100644
--- a/pkgs/development/compilers/fstar/default.nix
+++ b/pkgs/development/compilers/fstar/default.nix
@@ -19,7 +19,8 @@ stdenv.mkDerivation rec {
];
preBuild = ''
- substituteInPlace src/Makefile --replace "\$(RUNTIME) VS/.nuget/NuGet.exe" "true"
+ substituteInPlace src/Makefile --replace "\$(RUNTIME) VS/.nuget/NuGet.exe" "true" \
+ --replace Darwin xyz
substituteInPlace src/VS/.nuget/NuGet.targets --replace "mono" "true"
# Fails with bad interpreter otherwise
diff --git a/pkgs/development/compilers/go/1.7.nix b/pkgs/development/compilers/go/1.7.nix
index 7ecae36a4d5..d7a824239b8 100644
--- a/pkgs/development/compilers/go/1.7.nix
+++ b/pkgs/development/compilers/go/1.7.nix
@@ -24,13 +24,13 @@ in
stdenv.mkDerivation rec {
name = "go-${version}";
- version = "1.7.5";
+ version = "1.7.6";
src = fetchFromGitHub {
owner = "golang";
repo = "go";
rev = "go${version}";
- sha256 = "00radlwbrssn0x3naamb33cfx7ap2jv7s51bqr705nmn2j5yyblk";
+ sha256 = "1gacjwbs1qbx8x84746qdxx2xwylirvd31ybgagfglfsl77vi4m2";
};
# perl is used for testing go vet
diff --git a/pkgs/development/compilers/go/1.8.nix b/pkgs/development/compilers/go/1.8.nix
index 24a40ca0ba0..8e0b1c7360f 100644
--- a/pkgs/development/compilers/go/1.8.nix
+++ b/pkgs/development/compilers/go/1.8.nix
@@ -25,13 +25,13 @@ in
stdenv.mkDerivation rec {
name = "go-${version}";
- version = "1.8.1";
+ version = "1.8.3";
src = fetchFromGitHub {
owner = "golang";
repo = "go";
rev = "go${version}";
- sha256 = "1157mmzjpk887cpcpn2qy9c69anc22c4p3cjpl84zl7an41x660j";
+ sha256 = "0g83xm9gb872rsqzwqr1zw5szq69xhynljj2nglg4yyfi7dm2r1c";
};
# perl is used for testing go vet
@@ -80,6 +80,9 @@ stdenv.mkDerivation rec {
'' + optionalString stdenv.isLinux ''
sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go
+ '' + optionalString stdenv.isArm ''
+ sed -i '/TestCurrent/areturn' src/os/user/user_test.go
+ echo '#!/usr/bin/env bash' > misc/cgo/testplugin/test.bash
'' + optionalString stdenv.isDarwin ''
substituteInPlace src/race.bash --replace \
"sysctl machdep.cpu.extfeatures | grep -qv EM64T" true
diff --git a/pkgs/development/compilers/iasl/default.nix b/pkgs/development/compilers/iasl/default.nix
index 934fbeeb6f9..5e0970ea12f 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/compilers/llvm/3.4/fix-llvm-config.patch b/pkgs/development/compilers/llvm/3.4/fix-llvm-config.patch
new file mode 100644
index 00000000000..772c4960927
--- /dev/null
+++ b/pkgs/development/compilers/llvm/3.4/fix-llvm-config.patch
@@ -0,0 +1,13 @@
+diff --git a/utils/llvm-build/llvmbuild/main.py b/utils/llvm-build/llvmbuild/main.py
+index eacefdf60bf..40d25f5cef8 100644
+--- a/utils/llvm-build/llvmbuild/main.py
++++ b/utils/llvm-build/llvmbuild/main.py
+@@ -412,7 +412,7 @@ subdirectories = %s
+ if library_name is None:
+ library_name_as_cstr = '0'
+ else:
+- library_name_as_cstr = '"lib%s.a"' % library_name
++ library_name_as_cstr = '"lib%s.so"' % library_name
+ f.write(' { "%s", %s, %d, { %s } },\n' % (
+ name, library_name_as_cstr, is_installed,
+ ', '.join('"%s"' % dep
diff --git a/pkgs/development/compilers/llvm/3.4/llvm.nix b/pkgs/development/compilers/llvm/3.4/llvm.nix
index 0a18f7e01cf..73469fa122a 100644
--- a/pkgs/development/compilers/llvm/3.4/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.4/llvm.nix
@@ -29,12 +29,16 @@ in stdenv.mkDerivation rec {
'';
buildInputs =
- [ perl groff cmake libxml2 libffi ]
- ++ stdenv.lib.optional (!stdenv.isDarwin) python2 /*
+ [ perl groff cmake libxml2 libffi python2 ] /*
++ stdenv.lib.optional stdenv.isLinux valgrind */;
propagatedBuildInputs = [ ncurses zlib ];
+ patches = stdenv.lib.optionals (!stdenv.isDarwin) [
+ # llvm-config --libfiles returns (non-existing) static libs
+ ./fix-llvm-config.patch
+ ];
+
# hacky fix: created binaries need to be run before installation
preBuild = ''
mkdir -p $out/
@@ -48,7 +52,7 @@ in stdenv.mkDerivation rec {
"-DLLVM_REQUIRES_RTTI=1"
"-DLLVM_BINUTILS_INCDIR=${binutils.dev or binutils}/include"
"-DCMAKE_CXX_FLAGS=-std=c++11"
- ] ++ stdenv.lib.optional (!isDarwin) "-DBUILD_SHARED_LIBS=ON";
+ ] ++ stdenv.lib.optional (!stdenv.isDarwin) "-DBUILD_SHARED_LIBS=ON";
postBuild = ''
rm -fR $out
diff --git a/pkgs/development/compilers/llvm/3.9/clang/default.nix b/pkgs/development/compilers/llvm/3.9/clang/default.nix
index 91068227110..ec2ec27df36 100644
--- a/pkgs/development/compilers/llvm/3.9/clang/default.nix
+++ b/pkgs/development/compilers/llvm/3.9/clang/default.nix
@@ -13,7 +13,9 @@ let
mv clang-tools-extra-* $sourceRoot/tools/extra
'';
- buildInputs = [ cmake libedit libxml2 llvm python ];
+ nativeBuildInputs = [ cmake ];
+
+ buildInputs = [ libedit libxml2 llvm python ];
cmakeFlags = [
"-DCMAKE_CXX_FLAGS=-std=c++11"
diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix
index 2c47ec5127f..964b6232fb5 100644
--- a/pkgs/development/compilers/llvm/3.9/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.9/llvm.nix
@@ -15,10 +15,15 @@
, compiler-rt_src
, libcxxabi
, debugVersion ? false
-, enableSharedLibraries ? true
+, enableSharedLibraries ? (buildPlatform == hostPlatform)
, darwin
+, buildPackages
+, buildPlatform
+, hostPlatform
}:
+assert (hostPlatform != buildPlatform) -> !enableSharedLibraries;
+
let
src = fetch "llvm" "1vi9sf7rx1q04wj479rsvxayb6z740iaz3qniwp266fgp5a07n8z";
shlib = if stdenv.isDarwin then "dylib" else "so";
@@ -39,8 +44,17 @@ in stdenv.mkDerivation rec {
outputs = [ "out" ] ++ stdenv.lib.optional enableSharedLibraries "lib";
- buildInputs = [ perl groff cmake libxml2 python libffi ]
- ++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi ];
+ nativeBuildInputs = [
+ perl
+ cmake
+ python
+ ];
+
+ buildInputs = [
+ groff
+ libxml2
+ libffi
+ ] ++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi ];
propagatedBuildInputs = [ ncurses zlib ];
@@ -88,6 +102,9 @@ in stdenv.mkDerivation rec {
++ stdenv.lib.optionals (isDarwin) [
"-DLLVM_ENABLE_LIBCXX=ON"
"-DCAN_TARGET_i386=false"
+ ] ++ stdenv.lib.optionals (buildPlatform != hostPlatform) [
+ "-DCMAKE_CROSSCOMPILING=True"
+ "-DLLVM_TABLEGEN=${buildPackages.llvmPackages_39.llvm}/bin/llvm-tblgen"
];
postBuild = ''
diff --git a/pkgs/development/compilers/llvm/4/clang/default.nix b/pkgs/development/compilers/llvm/4/clang/default.nix
index c9387159283..bc286eaf05e 100644
--- a/pkgs/development/compilers/llvm/4/clang/default.nix
+++ b/pkgs/development/compilers/llvm/4/clang/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, release_version, clang-tools-extra_src, python }:
+{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, release_version, clang-tools-extra_src, python
+, fixDarwinDylibNames
+}:
let
gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
@@ -13,10 +15,17 @@ let
mv clang-tools-extra-* $sourceRoot/tools/extra
'';
- buildInputs = [ cmake libedit libxml2 llvm python ];
+ nativeBuildInputs = [ cmake python python.pkgs.sphinx ];
+ buildInputs = [ libedit libxml2 llvm ]
+ ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
cmakeFlags = [
"-DCMAKE_CXX_FLAGS=-std=c++11"
+ "-DCLANG_INCLUDE_DOCS=ON"
+ "-DLLVM_ENABLE_SPHINX=ON"
+ "-DSPHINX_OUTPUT_MAN=ON"
+ "-DSPHINX_OUTPUT_HTML=OFF"
+ "-DSPHINX_WARNINGS_AS_ERRORS=OFF"
] ++
# Maybe with compiler-rt this won't be needed?
(stdenv.lib.optional stdenv.isLinux "-DGCC_INSTALL_PREFIX=${gcc}") ++
@@ -24,12 +33,19 @@ let
patches = [ ./purity.patch ];
+ postBuild = ''
+ cmake --build . --target docs-clang-man
+ '';
+
postPatch = ''
sed -i -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/Tools.cpp
sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/ToolChains.cpp
+
+ # Patch for standalone doc building
+ sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt
'';
- outputs = [ "out" "python" ];
+ outputs = [ "out" "man" "python" ];
# Clang expects to find LLVMgold in its own prefix
# Clang expects to find sanitizer libraries in its own prefix
@@ -46,6 +62,12 @@ let
mv $out/share/clang/*.py $python/share/clang
rm $out/bin/c-index-test
+
+ # Manually install clang manpage
+ cp docs/man/*.1 $out/share/man/man1/
+
+ # Move it and other man pages to 'man' output
+ moveToOutput "share/man" "$man"
'';
enableParallelBuilding = true;
diff --git a/pkgs/development/compilers/llvm/4/libc++abi.nix b/pkgs/development/compilers/llvm/4/libc++abi.nix
index 559b6b26bc5..3a0e996fb9a 100644
--- a/pkgs/development/compilers/llvm/4/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/4/libc++abi.nix
@@ -5,7 +5,8 @@ stdenv.mkDerivation {
src = fetch "libcxxabi" "1n416kv27anabg9jsw6331r28ic30xk46p381lx2vbb2jrhwpafw";
- buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind;
+ nativeBuildInputs = [ cmake ];
+ buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind;
postUnpack = ''
unpackFile ${libcxx.src}
diff --git a/pkgs/development/compilers/llvm/4/lld.nix b/pkgs/development/compilers/llvm/4/lld.nix
index 549fa863c15..f9cd72b4200 100644
--- a/pkgs/development/compilers/llvm/4/lld.nix
+++ b/pkgs/development/compilers/llvm/4/lld.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation {
src = fetch "lld" "00km1qawk146pyjqa6aphcdzgkzrmg6cgk0ikg4661ffp5bn9q1k";
- buildInputs = [ cmake llvm ];
+ nativeBuildInputs = [ cmake ];
+ buildInputs = [ llvm ];
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/compilers/llvm/4/lldb-libedit.patch b/pkgs/development/compilers/llvm/4/lldb-libedit.patch
new file mode 100644
index 00000000000..73459ce6c86
--- /dev/null
+++ b/pkgs/development/compilers/llvm/4/lldb-libedit.patch
@@ -0,0 +1,30 @@
+From 94764369222a8e6c65420a6981d7f179a18a5417 Mon Sep 17 00:00:00 2001
+From: Will Dietz
+Date: Thu, 25 May 2017 15:03:42 -0500
+Subject: [PATCH] EditLine.h: libedit supports wide chars on NixOS
+
+---
+ include/lldb/Host/Editline.h | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/include/lldb/Host/Editline.h b/include/lldb/Host/Editline.h
+index faed373bc..b248cdee1 100644
+--- a/include/lldb/Host/Editline.h
++++ b/include/lldb/Host/Editline.h
+@@ -43,12 +43,9 @@
+ // will only be
+ // used in cases where this is true. This is a compile time dependecy, for now
+ // selected per target Platform
+-#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__)
++// (libedit on NixOS is always wide-char capable)
+ #define LLDB_EDITLINE_USE_WCHAR 1
+ #include
+-#else
+-#define LLDB_EDITLINE_USE_WCHAR 0
+-#endif
+
+ #include "lldb/Host/ConnectionFileDescriptor.h"
+ #include "lldb/lldb-private.h"
+--
+2.13.0
+
diff --git a/pkgs/development/compilers/llvm/4/lldb.nix b/pkgs/development/compilers/llvm/4/lldb.nix
index 6e6fdf012dd..a71c2332dc1 100644
--- a/pkgs/development/compilers/llvm/4/lldb.nix
+++ b/pkgs/development/compilers/llvm/4/lldb.nix
@@ -19,7 +19,8 @@ stdenv.mkDerivation {
src = fetch "lldb" "0g83hbw1r4gd0z8hlph9i34xs6dlcc69vz3h2bqwkhb2qq2qzg9d";
- patchPhase = ''
+ patches = [ ./lldb-libedit.patch ];
+ postPatch = ''
# Fix up various paths that assume llvm and clang are installed in the same place
sed -i 's,".*ClangConfig.cmake","${clang-unwrapped}/lib/cmake/clang/ClangConfig.cmake",' \
cmake/modules/LLDBStandalone.cmake
@@ -29,16 +30,13 @@ stdenv.mkDerivation {
cmake/modules/LLDBStandalone.cmake
'';
- buildInputs = [ cmake python which swig ncurses zlib libedit libxml2 llvm ]
+ nativeBuildInputs = [ cmake python which swig ];
+ buildInputs = [ ncurses zlib libedit libxml2 llvm ]
++ stdenv.lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc ];
CXXFLAGS = "-fno-rtti";
hardeningDisable = [ "format" ];
- cmakeFlags = [
- "-DLLDB_DISABLE_LIBEDIT=ON"
- ];
-
enableParallelBuilding = true;
meta = with stdenv.lib; {
diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix
index 83a14b7fc4d..1a78d672bfe 100644
--- a/pkgs/development/compilers/llvm/4/llvm.nix
+++ b/pkgs/development/compilers/llvm/4/llvm.nix
@@ -38,9 +38,10 @@ in stdenv.mkDerivation rec {
mv compiler-rt-* $sourceRoot/projects/compiler-rt
'';
- outputs = [ "out" ] ++ stdenv.lib.optional enableSharedLibraries "lib";
+ outputs = [ "out" "man" ] ++ stdenv.lib.optional enableSharedLibraries "lib";
- buildInputs = [ perl groff cmake libxml2 python libffi ]
+ nativeBuildInputs = [ perl groff cmake python python.pkgs.sphinx ];
+ buildInputs = [ libxml2 libffi ]
++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi ];
propagatedBuildInputs = [ ncurses zlib ];
@@ -80,6 +81,11 @@ in stdenv.mkDerivation rec {
"-DLLVM_ENABLE_FFI=ON"
"-DLLVM_ENABLE_RTTI=ON"
"-DCOMPILER_RT_INCLUDE_TESTS=OFF" # FIXME: requires clang source code
+ "-DLLVM_BUILD_DOCS=ON"
+ "-DLLVM_ENABLE_SPHINX=ON"
+ "-DSPHINX_OUTPUT_MAN=ON"
+ "-DSPHINX_OUTPUT_HTML=OFF"
+ "-DSPHINX_WARNINGS_AS_ERRORS=OFF"
] ++ stdenv.lib.optional enableSharedLibraries [
"-DLLVM_LINK_LLVM_DYLIB=ON"
] ++ stdenv.lib.optional (!isDarwin)
@@ -103,7 +109,9 @@ in stdenv.mkDerivation rec {
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib
'';
- postInstall = ""
+ postInstall = ''
+ moveToOutput "share/man" "$man"
+ ''
+ stdenv.lib.optionalString (enableSharedLibraries) ''
moveToOutput "lib/libLLVM-*" "$lib"
moveToOutput "lib/libLLVM.${shlib}" "$lib"
diff --git a/pkgs/development/compilers/llvm/4/openmp.nix b/pkgs/development/compilers/llvm/4/openmp.nix
index c8ba770e241..197e9a78465 100644
--- a/pkgs/development/compilers/llvm/4/openmp.nix
+++ b/pkgs/development/compilers/llvm/4/openmp.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation {
src = fetch "openmp" "09kf41zgv551fnv628kqhlwgqkd2bkiwii9gqi6q12djgdddhmfv";
- buildInputs = [ cmake llvm perl ];
+ nativeBuildInputs = [ cmake perl ];
+ buildInputs = [ llvm ];
enableParallelBuilding = true;
diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix
index ecf975bf76f..3ed5a2bef72 100644
--- a/pkgs/development/compilers/solc/default.nix
+++ b/pkgs/development/compilers/solc/default.nix
@@ -5,19 +5,22 @@ let jsoncpp = fetchzip {
sha256 = "0jz93zv17ir7lbxb3dv8ph2n916rajs8i96immwx9vb45pqid3n0";
}; in
+let commit = "68ef5810593e7c8092ed41d5f474dd43141624eb"; in
+
stdenv.mkDerivation rec {
- version = "0.4.8";
+ version = "0.4.11";
name = "solc-${version}";
# Cannot use `fetchFromGitHub' because of submodules
src = fetchgit {
url = "https://github.com/ethereum/solidity";
- rev = "60cc1668517f56ce6ca8225555472e7a27eab8b0";
- sha256 = "09mwah7c5ca1bgnqp5qgghsi6mbsi7p16z8yxm0aylsn2cjk23na";
+ rev = commit;
+ sha256 = "13zycybf23yvf3hkf9zgw9gbc1y4ifzxaf7sll69bsn24fcyq961";
};
patchPhase = ''
- echo >commit_hash.txt 2dabbdf06f414750ef0425c664f861aeb3e470b8
+ echo >commit_hash.txt ${commit}
+ echo >prerelease.txt
substituteInPlace deps/jsoncpp.cmake \
--replace https://github.com/open-source-parsers/jsoncpp/archive/1.7.7.tar.gz ${jsoncpp}
substituteInPlace cmake/EthCompilerSettings.cmake \
diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix
index 4b918c9e32a..839ecdbeb65 100644
--- a/pkgs/development/compilers/swift/default.nix
+++ b/pkgs/development/compilers/swift/default.nix
@@ -253,6 +253,9 @@ stdenv.mkDerivation rec {
ln -s ${binutils}/bin/ar $out/bin/ar
'';
+ # Hack to avoid TMPDIR in RPATHs.
+ preFixup = ''rm -rf "$(pwd)" '';
+
meta = with stdenv.lib; {
description = "The Swift Programming Language";
homepage = "https://github.com/apple/swift";
diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix
index dfbbaa4d431..fcad6045dbf 100644
--- a/pkgs/development/compilers/tinycc/default.nix
+++ b/pkgs/development/compilers/tinycc/default.nix
@@ -2,10 +2,10 @@
with stdenv.lib;
let
- date = "20170225";
+ date = "20170527";
version = "0.9.27pre-${date}";
- rev = "bb93064d7857d887b674999c9b4152b44a628f9a";
- sha256 = "12wcahj1x4qy9ia931i23lvwkqjmyhaks3wipnzvbnlnc2b03kpr";
+ rev = "53c5fc2246270e0242903de0152a9a5d40f3d679";
+ sha256 = "0z5ayz0kdn5xqm84k730hmd7r9cq0zxxf45g5phgqppdfajrmswz";
in
stdenv.mkDerivation rec {
diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index b54f07fb004..c2e4b39472c 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -198,7 +198,7 @@ go.stdenv.mkDerivation (
ln -s "${dep.src}" "$d/src/${dep.goPackagePath}"
''
) goPath) + ''
- export GOPATH="$d:$GOPATH"
+ export GOPATH=${lib.concatStringsSep ":" ( ["$d"] ++ ["$GOPATH"] ++ ["$PWD"] ++ extraSrcPaths)}
'';
disallowedReferences = lib.optional (!allowGoReference) go
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index f9206e9c4a0..ec6e723db0d 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -332,7 +332,6 @@ self: super: {
language-slice = dontCheck super.language-slice;
ldap-client = dontCheck super.ldap-client;
lensref = dontCheck super.lensref;
- liquidhaskell = dontCheck super.liquidhaskell;
lucid = dontCheck super.lucid; #https://github.com/chrisdone/lucid/issues/25
lvmrun = disableHardening (dontCheck super.lvmrun) ["format"];
memcache = dontCheck super.memcache;
@@ -707,9 +706,9 @@ self: super: {
servant-server = dontCheck super.servant-server;
# Fix build for latest versions of servant and servant-client.
- servant-client_0_10 = super.servant-client_0_10.overrideScope (self: super: {
- servant-server = self.servant-server_0_10;
- servant = self.servant_0_10;
+ servant-client_0_11 = super.servant-client_0_11.overrideScope (self: super: {
+ servant-server = self.servant-server_0_11;
+ servant = self.servant_0_11;
});
# build servant docs from the repository
@@ -858,4 +857,8 @@ self: super: {
# https://github.com/danidiaz/tailfile-hinotify/issues/2
tailfile-hinotify = dontCheck super.tailfile-hinotify;
+
+ # build liquidhaskell with the proper (old) aeson version
+ liquidhaskell = super.liquidhaskell.override { aeson = self.aeson_0_11_3_0; };
+
}
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 6c59b0860b2..f0fbfe43cad 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -37,7 +37,7 @@ core-packages:
- ghcjs-base-0
default-package-overrides:
- # LTS Haskell 8.14
+ # LTS Haskell 8.15
- abstract-deque ==0.3
- abstract-par ==0.3.3
- AC-Vector ==2.3.2
@@ -46,7 +46,7 @@ default-package-overrides:
- ace ==0.6
- acid-state ==0.14.2
- action-permutations ==0.0.0.1
- - active ==0.2.0.12
+ - active ==0.2.0.13
- ad ==4.3.3
- adjunctions ==4.3
- adler32 ==0.1.1.0
@@ -308,7 +308,7 @@ default-package-overrides:
- c2hs ==0.28.1
- Cabal ==1.24.2.0
- cabal-dependency-licenses ==0.2.0.0
- - cabal-doctest ==1.0.1
+ - cabal-doctest ==1.0.2
- cabal-file-th ==0.2.4
- cabal-helper ==0.7.3.0
- cabal-rpm ==0.11.1
@@ -406,7 +406,7 @@ default-package-overrides:
- conduit ==1.2.10
- conduit-combinators ==1.1.1
- conduit-connection ==0.1.0.3
- - conduit-extra ==1.1.15
+ - conduit-extra ==1.1.16
- conduit-iconv ==0.1.1.1
- conduit-parse ==0.1.2.0
- ConfigFile ==1.1.4
@@ -697,7 +697,7 @@ default-package-overrides:
- fold-debounce ==0.2.0.5
- fold-debounce-conduit ==0.1.0.5
- foldl ==1.2.5
- - foldl-statistics ==0.1.4.2
+ - foldl-statistics ==0.1.4.3
- folds ==0.7.3
- FontyFruity ==0.5.3.2
- force-layout ==0.4.0.6
@@ -1045,7 +1045,7 @@ default-package-overrides:
- hpio ==0.8.0.7
- hpp ==0.4.0
- hpqtypes ==1.5.1.1
- - hquantlib ==0.0.3.3
+ - hquantlib ==0.0.4.0
- hreader ==1.1.0
- hruby ==0.3.4.3
- hs-bibutils ==5.5
@@ -1100,7 +1100,7 @@ default-package-overrides:
- html-conduit ==1.2.1.1
- html-email-validate ==0.2.0.0
- htoml ==1.0.0.3
- - HTTP ==4000.3.6
+ - HTTP ==4000.3.7
- http-api-data ==0.3.7.1
- http-client ==0.5.6.1
- http-client-openssl ==0.2.0.5
@@ -1558,7 +1558,7 @@ default-package-overrides:
- parsers ==0.12.4
- partial-handler ==1.0.2
- partial-isomorphisms ==0.2.2.1
- - patat ==0.5.1.2
+ - patat ==0.5.2.0
- path ==0.5.13
- path-extra ==0.0.3
- path-io ==1.2.2
@@ -1578,7 +1578,7 @@ default-package-overrides:
- persistable-record ==0.4.1.1
- persistable-types-HDBC-pg ==0.0.1.4
- persistent ==2.6.1
- - persistent-mysql ==2.6.0.1
+ - persistent-mysql ==2.6.0.2
- persistent-postgresql ==2.6.1
- persistent-redis ==2.5.2
- persistent-refs ==0.4
@@ -1649,7 +1649,7 @@ default-package-overrides:
- present ==4.1.0
- pretty-class ==1.0.1.1
- pretty-hex ==1.0
- - pretty-show ==1.6.12
+ - pretty-show ==1.6.13
- pretty-simple ==2.0.0.0
- pretty-types ==0.2.3.1
- prettyclass ==1.0.0.0
@@ -1747,7 +1747,7 @@ default-package-overrides:
- reform-happstack ==0.2.5.1
- reform-hsp ==0.2.7.1
- RefSerialize ==0.4.0
- - regex ==0.5.0.0
+ - regex ==1.0.0.0
- regex-applicative ==0.3.3
- regex-applicative-text ==0.1.0.1
- regex-base ==0.93.2
@@ -2240,7 +2240,7 @@ default-package-overrides:
- vector-th-unbox ==0.2.1.6
- vectortiles ==1.2.0.4
- verbosity ==0.2.3.0
- - versions ==3.0.0
+ - versions ==3.0.1.1
- vhd ==0.2.2
- ViennaRNAParser ==1.3.2
- viewprof ==0.0.0.1
@@ -2362,7 +2362,7 @@ default-package-overrides:
- xml-to-json-fast ==2.0.0
- xml-types ==0.3.6
- xmlgen ==0.6.2.1
- - xmlhtml ==0.2.3.5
+ - xmlhtml ==0.2.4
- xmonad ==0.13
- xmonad-contrib ==0.13
- xss-sanitize ==0.3.5.7
@@ -2424,8 +2424,8 @@ default-package-overrides:
- ztail ==1.2
extra-packages:
- - aeson < 0.8 # newer versions don't work with GHC 6.12.3
- - aeson < 1.1 # required by stack
+ - aeson < 0.8 # newer versions don't work with GHC 7.6.x or earlier
+ - aeson < 1 # required by liquidhaskell-0.8.0.0
- aeson-pretty < 0.8 # required by elm compiler
- binary > 0.7 && < 0.8 # keep a 7.x major release around for older compilers
- binary > 0.8 && < 0.9 # keep a 8.x major release around for older compilers
@@ -2473,6 +2473,7 @@ package-maintainers:
- hsyslog
- jailbreak-cabal
- language-nix
+ - logging-facade-syslog
- pandoc
- stack
- streamproc
@@ -2715,6 +2716,7 @@ dont-distribute-packages:
amazonka-elbv2: [ i686-linux, x86_64-linux, x86_64-darwin ]
amazonka-health: [ i686-linux, x86_64-linux, x86_64-darwin ]
amazonka-kinesis-analytics: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ amazonka-lambda: [ i686-linux, x86_64-linux, x86_64-darwin ]
amazonka-lightsail: [ i686-linux, x86_64-linux, x86_64-darwin ]
amazonka-opsworks-cm: [ i686-linux, x86_64-linux, x86_64-darwin ]
amazonka-pinpoint: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2901,6 +2903,7 @@ dont-distribute-packages:
backward-state: [ i686-linux, x86_64-linux, x86_64-darwin ]
Baggins: [ i686-linux, x86_64-linux, x86_64-darwin ]
bag: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ ballast: [ i686-linux, x86_64-linux, x86_64-darwin ]
bamboo: [ i686-linux, x86_64-linux, x86_64-darwin ]
bamboo-launcher: [ i686-linux, x86_64-linux, x86_64-darwin ]
bamboo-plugin-highlight: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2925,6 +2928,7 @@ dont-distribute-packages:
basic-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ]
basic-sop: [ i686-linux, x86_64-linux, x86_64-darwin ]
baskell: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ batchd: [ i686-linux, x86_64-linux, x86_64-darwin ]
battlenet: [ i686-linux, x86_64-linux, x86_64-darwin ]
battlenet-yesod: [ i686-linux, x86_64-linux, x86_64-darwin ]
battleships: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3118,6 +3122,7 @@ dont-distribute-packages:
Buster: [ i686-linux, x86_64-linux, x86_64-darwin ]
buster-network: [ i686-linux, x86_64-linux, x86_64-darwin ]
bustle: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ butcher: [ i686-linux, x86_64-linux, x86_64-darwin ]
butterflies: [ i686-linux, x86_64-linux, x86_64-darwin ]
byline: [ i686-linux, x86_64-linux, x86_64-darwin ]
bytable: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3151,6 +3156,7 @@ dont-distribute-packages:
cabal-install-bundle: [ i686-linux, x86_64-linux, x86_64-darwin ]
cabal-install-ghc72: [ i686-linux, x86_64-linux, x86_64-darwin ]
cabal-install-ghc74: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ cabalish: [ i686-linux, x86_64-linux, x86_64-darwin ]
cabal-macosx: [ i686-linux, x86_64-linux, x86_64-darwin ]
cabalmdvrpm: [ i686-linux, x86_64-linux, x86_64-darwin ]
cabal-mon: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3359,6 +3365,9 @@ dont-distribute-packages:
cloud-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ]
cloudi: [ i686-linux, x86_64-linux, x86_64-darwin ]
cloudyfs: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ clr-bindings: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ clr-inline: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ clr-typed: [ i686-linux, x86_64-linux, x86_64-darwin ]
clua: [ i686-linux, x86_64-linux, x86_64-darwin ]
cluss: [ i686-linux, x86_64-linux, x86_64-darwin ]
clustering: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3433,6 +3442,11 @@ dont-distribute-packages:
complexity: [ i686-linux, x86_64-linux, x86_64-darwin ]
compose-ltr: [ i686-linux, x86_64-linux, x86_64-darwin ]
compose-trans: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ composite-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ composite-aeson-refined: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ composite-base: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ composite-ekg: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ composite-opaleye: [ i686-linux, x86_64-linux, x86_64-darwin ]
composition-tree: [ i686-linux, x86_64-linux, x86_64-darwin ]
compressed: [ i686-linux, x86_64-linux, x86_64-darwin ]
compression: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3712,6 +3726,7 @@ dont-distribute-packages:
dead-code-detection: [ i686-linux, x86_64-linux, x86_64-darwin ]
dead-simple-json: [ i686-linux, x86_64-linux, x86_64-darwin ]
debian-binary: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ debug-me: [ i686-linux, x86_64-linux, x86_64-darwin ]
decepticons: [ i686-linux, x86_64-linux, x86_64-darwin ]
decimal-arithmetic: [ i686-linux, x86_64-linux, x86_64-darwin ]
DecisionTree: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3760,6 +3775,7 @@ dont-distribute-packages:
dfsbuild: [ i686-linux, x86_64-linux, x86_64-darwin ]
dgim: [ i686-linux, x86_64-linux, x86_64-darwin ]
dgs: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ dhall-check: [ i686-linux, x86_64-linux, x86_64-darwin ]
dia-functions: [ i686-linux, x86_64-linux, x86_64-darwin ]
diagrams-boolean: [ i686-linux, x86_64-linux, x86_64-darwin ]
diagrams-builder: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3981,6 +3997,7 @@ dont-distribute-packages:
entangle: [ i686-linux, x86_64-linux, x86_64-darwin ]
EntrezHTTP: [ i686-linux, x86_64-linux, x86_64-darwin ]
EnumContainers: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ enumerate-function: [ i686-linux, x86_64-linux, x86_64-darwin ]
enumerate: [ i686-linux, x86_64-linux, x86_64-darwin ]
enumeration: [ i686-linux, x86_64-linux, x86_64-darwin ]
enumfun: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4030,6 +4047,8 @@ dont-distribute-packages:
eurofxref: [ i686-linux, x86_64-linux, x86_64-darwin ]
Euterpea: [ i686-linux, x86_64-linux, x86_64-darwin ]
event-driven: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ eventful-dynamodb: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ eventful-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ]
eventloop: [ i686-linux, x86_64-linux, x86_64-darwin ]
event-monad: [ i686-linux, x86_64-linux, x86_64-darwin ]
EventSocket: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4256,6 +4275,7 @@ dont-distribute-packages:
friday-scale-dct: [ i686-linux, x86_64-linux, x86_64-darwin ]
frp-arduino: [ i686-linux, x86_64-linux, x86_64-darwin ]
fs-events: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ fsh-csv: [ i686-linux, x86_64-linux, x86_64-darwin ]
fsmActions: [ i686-linux, x86_64-linux, x86_64-darwin ]
fsutils: [ i686-linux, x86_64-linux, x86_64-darwin ]
fswatcher: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4320,6 +4340,8 @@ dont-distribute-packages:
genericserialize: [ i686-linux, x86_64-linux, x86_64-darwin ]
generic-storable: [ i686-linux, x86_64-linux, x86_64-darwin ]
generic-xml: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ genesis: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ genesis-test: [ i686-linux, x86_64-linux, x86_64-darwin ]
genetics: [ i686-linux, x86_64-linux, x86_64-darwin ]
geniconvert: [ i686-linux, x86_64-linux, x86_64-darwin ]
genifunctors: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4697,6 +4719,7 @@ dont-distribute-packages:
halive: [ i686-linux, x86_64-linux, x86_64-darwin ]
halma-gui: [ i686-linux, x86_64-linux, x86_64-darwin ]
halma: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ halma-telegram-bot: [ i686-linux, x86_64-linux, x86_64-darwin ]
hamilton: [ i686-linux, x86_64-linux, x86_64-darwin ]
HaMinitel: [ i686-linux, x86_64-linux, x86_64-darwin ]
hampp: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5028,6 +5051,7 @@ dont-distribute-packages:
hfann: [ i686-linux, x86_64-linux, x86_64-darwin ]
hfd: [ i686-linux, x86_64-linux, x86_64-darwin ]
hfiar: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ HFitUI: [ i686-linux, x86_64-linux, x86_64-darwin ]
hfmt: [ i686-linux, x86_64-linux, x86_64-darwin ]
hfoil: [ i686-linux, x86_64-linux, x86_64-darwin ]
hfov: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5171,6 +5195,7 @@ dont-distribute-packages:
hmumps: [ i686-linux, x86_64-linux, x86_64-darwin ]
hnetcdf: [ i686-linux, x86_64-linux, x86_64-darwin ]
HNM: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ hnormalise: [ i686-linux, x86_64-linux, x86_64-darwin ]
hoauth: [ i686-linux, x86_64-linux, x86_64-darwin ]
hobbes: [ i686-linux, x86_64-linux, x86_64-darwin ]
hobbits: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5349,6 +5374,7 @@ dont-distribute-packages:
hs-mesos: [ i686-linux, x86_64-linux, x86_64-darwin ]
Hsmtlib: [ i686-linux, x86_64-linux, x86_64-darwin ]
hsmtpclient: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ hs-multiaddr: [ i686-linux, x86_64-linux, x86_64-darwin ]
hsnock: [ i686-linux, x86_64-linux, x86_64-darwin ]
hs-nombre-generator: [ i686-linux, x86_64-linux, x86_64-darwin ]
hsns: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5409,6 +5435,7 @@ dont-distribute-packages:
hstyle: [ i686-linux, x86_64-linux, x86_64-darwin ]
hstzaar: [ i686-linux, x86_64-linux, x86_64-darwin ]
hsubconvert: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ hsudoku: [ i686-linux, x86_64-linux, x86_64-darwin ]
hs-vcard: [ i686-linux, x86_64-linux, x86_64-darwin ]
hsverilog: [ i686-linux, x86_64-linux, x86_64-darwin ]
HSvm: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5996,6 +6023,7 @@ dont-distribute-packages:
librato: [ i686-linux, x86_64-linux, x86_64-darwin ]
libroman: [ i686-linux, x86_64-linux, x86_64-darwin ]
libssh2-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ libssh2: [ i686-linux, x86_64-linux, x86_64-darwin ]
libsystemd-daemon: [ i686-linux, x86_64-linux, x86_64-darwin ]
libsystemd-journal: [ i686-linux, x86_64-linux, x86_64-darwin ]
libtagc: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6018,6 +6046,7 @@ dont-distribute-packages:
limp: [ i686-linux, x86_64-linux, x86_64-darwin ]
lin-alg: [ i686-linux, x86_64-linux, x86_64-darwin ]
linda: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ linden: [ i686-linux, x86_64-linux, x86_64-darwin ]
linear-algebra-cblas: [ i686-linux, x86_64-linux, x86_64-darwin ]
linear-circuit: [ i686-linux, x86_64-linux, x86_64-darwin ]
linearmap-category: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6044,10 +6073,8 @@ dont-distribute-packages:
lio-eci11: [ i686-linux, x86_64-linux, x86_64-darwin ]
lio-simple: [ i686-linux, x86_64-linux, x86_64-darwin ]
lipsum-gen: [ i686-linux, x86_64-linux, x86_64-darwin ]
- liquid-fixpoint: [ i686-linux, x86_64-linux, x86_64-darwin ]
liquidhaskell-cabal-demo: [ i686-linux, x86_64-linux, x86_64-darwin ]
liquidhaskell-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ]
- liquidhaskell: [ i686-linux, x86_64-linux, x86_64-darwin ]
liquid: [ i686-linux, x86_64-linux, x86_64-darwin ]
listlike-instances: [ i686-linux, x86_64-linux, x86_64-darwin ]
list-mux: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6221,6 +6248,9 @@ dont-distribute-packages:
matlab: [ i686-linux, x86_64-linux, x86_64-darwin ]
matplotlib: [ i686-linux, x86_64-linux, x86_64-darwin ]
matsuri: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ matterhorn: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ mattermost-api: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ mattermost-api-qc: [ i686-linux, x86_64-linux, x86_64-darwin ]
maude: [ i686-linux, x86_64-linux, x86_64-darwin ]
maxent: [ i686-linux, x86_64-linux, x86_64-darwin ]
maxsharing: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6232,6 +6262,7 @@ dont-distribute-packages:
MBot: [ i686-linux, x86_64-linux, x86_64-darwin ]
mbox-tools: [ i686-linux, x86_64-linux, x86_64-darwin ]
MC-Fold-DP: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ mcl: [ i686-linux, x86_64-linux, x86_64-darwin ]
mcmaster-gloss-examples: [ i686-linux, x86_64-linux, x86_64-darwin ]
mcmc-samplers: [ i686-linux, x86_64-linux, x86_64-darwin ]
mcmc-synthesis: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6764,6 +6795,8 @@ dont-distribute-packages:
pandoc-placetable: [ i686-linux, x86_64-linux, x86_64-darwin ]
pandoc-plantuml-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ]
pandoc-unlit: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ pang-a-lambda: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ panpipe: [ i686-linux, x86_64-linux, x86_64-darwin ]
pansite: [ i686-linux, x86_64-linux, x86_64-darwin ]
papa: [ i686-linux, x86_64-linux, x86_64-darwin ]
papa-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6968,6 +7001,7 @@ dont-distribute-packages:
pool: [ i686-linux, x86_64-linux, x86_64-darwin ]
popenhs: [ i686-linux, x86_64-linux, x86_64-darwin ]
poppler: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ portager: [ i686-linux, x86_64-linux, x86_64-darwin ]
porte: [ i686-linux, x86_64-linux, x86_64-darwin ]
porter: [ i686-linux, x86_64-linux, x86_64-darwin ]
PortFusion: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7170,6 +7204,7 @@ dont-distribute-packages:
rados-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ]
raft: [ i686-linux, x86_64-linux, x86_64-darwin ]
rail-compiler-editor: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ rails-session: [ i686-linux, x86_64-linux, x86_64-darwin ]
rainbow-tests: [ i686-linux, x86_64-linux, x86_64-darwin ]
rakhana: [ i686-linux, x86_64-linux, x86_64-darwin ]
ralist: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7244,6 +7279,7 @@ dont-distribute-packages:
record: [ i686-linux, x86_64-linux, x86_64-darwin ]
record-preprocessor: [ i686-linux, x86_64-linux, x86_64-darwin ]
records: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ records-sop: [ i686-linux, x86_64-linux, x86_64-darwin ]
records-th: [ i686-linux, x86_64-linux, x86_64-darwin ]
record-syntax: [ i686-linux, x86_64-linux, x86_64-darwin ]
recursion-schemes: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7274,6 +7310,7 @@ dont-distribute-packages:
ref-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ]
refresht: [ i686-linux, x86_64-linux, x86_64-darwin ]
refty: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ refurb: [ i686-linux, x86_64-linux, x86_64-darwin ]
regexchar: [ i686-linux, x86_64-linux, x86_64-darwin ]
regex-deriv: [ i686-linux, x86_64-linux, x86_64-darwin ]
regex-dfa: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7462,6 +7499,7 @@ dont-distribute-packages:
saferoute: [ i686-linux, x86_64-linux, x86_64-darwin ]
sai-shape-syb: [ i686-linux, x86_64-linux, x86_64-darwin ]
Salsa: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ saltine: [ i686-linux, x86_64-linux, x86_64-darwin ]
saltine-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ]
salvia-demo: [ i686-linux, x86_64-linux, x86_64-darwin ]
salvia-extras: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7589,6 +7627,7 @@ dont-distribute-packages:
servant-pool: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-purescript: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ servant-py: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-router: [ i686-linux, x86_64-linux, x86_64-darwin ]
servant-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7600,6 +7639,7 @@ dont-distribute-packages:
serversession-backend-redis: [ i686-linux, x86_64-linux, x86_64-darwin ]
serversession-frontend-snap: [ i686-linux, x86_64-linux, x86_64-darwin ]
serv: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ services: [ i686-linux, x86_64-linux, x86_64-darwin ]
serv-wai: [ i686-linux, x86_64-linux, x86_64-darwin ]
ses-html: [ i686-linux, x86_64-linux, x86_64-darwin ]
ses-html-snaplet: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7701,6 +7741,7 @@ dont-distribute-packages:
sink: [ i686-linux, x86_64-linux, x86_64-darwin ]
siphon: [ i686-linux, x86_64-linux, x86_64-darwin ]
sirkel: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ sitepipe: [ i686-linux, x86_64-linux, x86_64-darwin ]
sixfiguregroup: [ i686-linux, x86_64-linux, x86_64-darwin ]
sized: [ i686-linux, x86_64-linux, x86_64-darwin ]
sized-vector: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7737,6 +7778,7 @@ dont-distribute-packages:
smt-lib: [ i686-linux, x86_64-linux, x86_64-darwin ]
SmtLib: [ i686-linux, x86_64-linux, x86_64-darwin ]
smtp2mta: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ SMTPClient: [ i686-linux, x86_64-linux, x86_64-darwin ]
smtp-mail-ng: [ i686-linux, x86_64-linux, x86_64-darwin ]
snake-game: [ i686-linux, x86_64-linux, x86_64-darwin ]
snake: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7869,6 +7911,7 @@ dont-distribute-packages:
sproxy2: [ i686-linux, x86_64-linux, x86_64-darwin ]
sproxy-web: [ i686-linux, x86_64-linux, x86_64-darwin ]
spsa: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ sqlcipher: [ i686-linux, x86_64-linux, x86_64-darwin ]
sqlite-simple-typed: [ i686-linux, x86_64-linux, x86_64-darwin ]
sql-simple: [ i686-linux, x86_64-linux, x86_64-darwin ]
sql-simple-mysql: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8030,6 +8073,7 @@ dont-distribute-packages:
Sysmon: [ i686-linux, x86_64-linux, x86_64-darwin ]
sys-process: [ i686-linux, x86_64-linux, x86_64-darwin ]
system-canonicalpath: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ system-info: [ i686-linux, x86_64-linux, x86_64-darwin ]
system-lifted: [ i686-linux, x86_64-linux, x86_64-darwin ]
system-locale: [ i686-linux, x86_64-linux, x86_64-darwin ]
system-random-effect: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8103,6 +8147,14 @@ dont-distribute-packages:
temporal-csound: [ i686-linux, x86_64-linux, x86_64-darwin ]
temporary-resourcet: [ i686-linux, x86_64-linux, x86_64-darwin ]
tempus: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ tensorflow-core-ops: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ tensorflow: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ tensorflow-logging: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ tensorflow-opgen: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ tensorflow-ops: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ tensorflow-proto: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ tensorflow-records-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ tensorflow-records: [ i686-linux, x86_64-linux, x86_64-darwin ]
tensor: [ i686-linux, x86_64-linux, x86_64-darwin ]
termbox-bindings: [ i686-linux, x86_64-linux, x86_64-darwin ]
terminal-progress-bar: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8192,6 +8244,7 @@ dont-distribute-packages:
TicTacToe: [ i686-linux, x86_64-linux, x86_64-darwin ]
tidal-midi: [ i686-linux, x86_64-linux, x86_64-darwin ]
tidal-serial: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ tidal-vis: [ i686-linux, x86_64-linux, x86_64-darwin ]
tie-knot: [ i686-linux, x86_64-linux, x86_64-darwin ]
tiempo: [ i686-linux, x86_64-linux, x86_64-darwin ]
TigerHash: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8224,6 +8277,7 @@ dont-distribute-packages:
TinyURL: [ i686-linux, x86_64-linux, x86_64-darwin ]
tip-haskell-frontend: [ i686-linux, x86_64-linux, x86_64-darwin ]
tip-lib: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ titan: [ i686-linux, x86_64-linux, x86_64-darwin ]
Titim: [ i686-linux, x86_64-linux, x86_64-darwin ]
tkhs: [ i686-linux, x86_64-linux, x86_64-darwin ]
tkyprof: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8253,6 +8307,7 @@ dont-distribute-packages:
toxcore: [ i686-linux, x86_64-linux, x86_64-darwin ]
toysolver: [ i686-linux, x86_64-linux, x86_64-darwin ]
tpar: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ tpb: [ i686-linux, x86_64-linux, x86_64-darwin ]
trace-call: [ i686-linux, x86_64-linux, x86_64-darwin ]
traced: [ i686-linux, x86_64-linux, x86_64-darwin ]
trace-function-call: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8293,6 +8348,7 @@ dont-distribute-packages:
TrieMap: [ i686-linux, x86_64-linux, x86_64-darwin ]
tries: [ i686-linux, x86_64-linux, x86_64-darwin ]
trimpolya: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ triplesec: [ i686-linux, x86_64-linux, x86_64-darwin ]
tripLL: [ i686-linux, x86_64-linux, x86_64-darwin ]
tropical: [ i686-linux, x86_64-linux, x86_64-darwin ]
tsession-happstack: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8554,6 +8610,7 @@ dont-distribute-packages:
wai-static-cache: [ i686-linux, x86_64-linux, x86_64-darwin ]
wai-thrift: [ i686-linux, x86_64-linux, x86_64-darwin ]
wai-throttler: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ waldo: [ i686-linux, x86_64-linux, x86_64-darwin ]
warc: [ i686-linux, x86_64-linux, x86_64-darwin ]
warp-dynamic: [ i686-linux, x86_64-linux, x86_64-darwin ]
warp-static: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8603,6 +8660,7 @@ dont-distribute-packages:
web-routing: [ i686-linux, x86_64-linux, x86_64-darwin ]
webserver: [ i686-linux, x86_64-linux, x86_64-darwin ]
websnap: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ websockets-simple: [ i686-linux, x86_64-linux, x86_64-darwin ]
websockets-snap: [ i686-linux, x86_64-linux, x86_64-darwin ]
webwire: [ i686-linux, x86_64-linux, x86_64-darwin ]
wedged: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8646,6 +8704,7 @@ dont-distribute-packages:
wordsearch: [ i686-linux, x86_64-linux, x86_64-darwin ]
workdays: [ i686-linux, x86_64-linux, x86_64-darwin ]
workflow-osx: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ workflow-pure: [ i686-linux, x86_64-linux, x86_64-darwin ]
workflow-windows: [ i686-linux, x86_64-linux, x86_64-darwin ]
wp-archivebot: [ i686-linux, x86_64-linux, x86_64-darwin ]
wraxml: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8777,6 +8836,7 @@ dont-distribute-packages:
yesod-auth-deskcom: [ i686-linux, x86_64-linux, x86_64-darwin ]
yesod-auth-fb: [ i686-linux, x86_64-linux, x86_64-darwin ]
yesod-auth-hashdb: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ yesod-auth-hmac-keccak: [ i686-linux, x86_64-linux, x86_64-darwin ]
yesod-auth-kerberos: [ i686-linux, x86_64-linux, x86_64-darwin ]
yesod-auth-ldap: [ i686-linux, x86_64-linux, x86_64-darwin ]
yesod-auth-ldap-mediocre: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8866,6 +8926,7 @@ dont-distribute-packages:
ZFS: [ i686-linux, x86_64-linux, x86_64-darwin ]
zifter-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ]
zifter-git: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ zifter-google-java-format: [ i686-linux, x86_64-linux, x86_64-darwin ]
zifter-hindent: [ i686-linux, x86_64-linux, x86_64-darwin ]
zifter-hlint: [ i686-linux, x86_64-linux, x86_64-darwin ]
zifter: [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8880,6 +8941,7 @@ dont-distribute-packages:
zlib-enum: [ i686-linux, x86_64-linux, x86_64-darwin ]
ZMachine: [ i686-linux, x86_64-linux, x86_64-darwin ]
zmcat: [ i686-linux, x86_64-linux, x86_64-darwin ]
+ zm: [ i686-linux, x86_64-linux, x86_64-darwin ]
zmidi-score: [ i686-linux, x86_64-linux, x86_64-darwin ]
zmqat: [ i686-linux, x86_64-linux, x86_64-darwin ]
zoneinfo: [ i686-linux, x86_64-linux, x86_64-darwin ]
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 15dca1c0bc5..58ab8024369 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -198,9 +198,6 @@ self: super: builtins.intersectAttrs super {
# Nix-specific workaround
xmonad = appendPatch (dontCheck super.xmonad) ./patches/xmonad-nix.patch;
- # https://github.com/ucsd-progsys/liquid-fixpoint/issues/44
- liquid-fixpoint = overrideCabal super.liquid-fixpoint (drv: { preConfigure = "patchShebangs ."; });
-
# wxc supports wxGTX >= 3.0, but our current default version points to 2.8.
# http://hydra.cryp.to/build/1331287/log/raw
wxc = (addBuildDepend super.wxc self.split).override { wxGTK = pkgs.wxGTK30; };
@@ -458,4 +455,10 @@ self: super: builtins.intersectAttrs super {
# loc and loc-test depend on each other for testing. Break that infinite cycle:
loc-test = super.loc-test.override { loc = dontCheck self.loc; };
+ # The test suites try to run the "fixpoint" and "liquid" executables built just
+ # before and fail because the library search paths aren't configured properly.
+ # Also needs https://github.com/ucsd-progsys/liquidhaskell/issues/1038 resolved.
+ liquid-fixpoint = disableSharedExecutables super.liquid-fixpoint;
+ liquidhaskell = dontCheck (disableSharedExecutables super.liquidhaskell);
+
}
diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix
index 8090732ddee..8e7d19e089f 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/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 653e5cd245c..7d21996fe1c 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -197,13 +197,11 @@ stdenv.mkDerivation ({
${jailbreak-cabal}/bin/jailbreak-cabal ${pname}.cabal
'' + postPatch;
- # for ghcjs, we want to put ghcEnv on PATH so compiler plugins will be available.
- # TODO(cstrahan): would the same be of benefit to native ghc?
setupCompilerEnvironmentPhase = ''
runHook preSetupCompilerEnvironment
echo "Build with ${ghc}."
- export PATH="${if ghc.isGhcjs or false then ghcEnv else ghc}/bin:$PATH"
+ export PATH="${ghc}/bin:$PATH"
${optionalString (hasActiveLibrary && hyperlinkSource) "export PATH=${hscolour}/bin:$PATH"}
packageConfDir="$TMPDIR/package.conf.d"
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index acccdd61528..32ed0045309 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1377,8 +1377,8 @@ self: {
}:
mkDerivation {
pname = "BioHMM";
- version = "1.1.3";
- sha256 = "0h4jll4dnya71lawkpsyyd4nnagpjpyss268ccrrn8z8wvbml8la";
+ version = "1.1.6";
+ sha256 = "0id4lnxff5a774yzhwfhj0gxk5qxgxa8z8igv1z4n7s981lc2xxm";
libraryHaskellDepends = [
base colour diagrams-cairo diagrams-lib directory either-unwrap
filepath parsec ParsecTools StockholmAlignment SVGFonts text vector
@@ -1812,16 +1812,29 @@ self: {
}) {};
"Blogdown" = callPackage
- ({ mkDerivation, base, containers, MissingH, parsec }:
+ ({ mkDerivation, base, Cabal, containers, criterion, MissingH
+ , network-uri, parsec
+ }:
mkDerivation {
pname = "Blogdown";
- version = "0.1.0";
- sha256 = "0cjmpn0bj6jizz78mhbhh03d07ha7mx3zqihp63mh6xnyjjmwj74";
+ version = "0.2.2";
+ sha256 = "18lxj5ka4jfaz1ig6x6qkdzlil99i3bcy4cqpbsccvyvhbax323c";
isLibrary = true;
isExecutable = true;
- libraryHaskellDepends = [ base containers MissingH parsec ];
- executableHaskellDepends = [ base containers MissingH parsec ];
- testHaskellDepends = [ base containers MissingH parsec ];
+ setupHaskellDepends = [ base Cabal MissingH ];
+ libraryHaskellDepends = [
+ base containers MissingH network-uri parsec
+ ];
+ executableHaskellDepends = [
+ base containers MissingH network-uri parsec
+ ];
+ testHaskellDepends = [
+ base containers MissingH network-uri parsec
+ ];
+ benchmarkHaskellDepends = [
+ base containers criterion MissingH network-uri parsec
+ ];
+ homepage = "https://blogdown.io";
description = "A markdown-like markup language designed for blog posts";
license = stdenv.lib.licenses.agpl3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -2409,6 +2422,8 @@ self: {
pname = "Cabal";
version = "1.24.2.0";
sha256 = "0h33v1716wkqh9wvq2wynvhwzkjjhg4aav0a1i3cmyq36n7fpl5p";
+ revision = "1";
+ editedCabalFile = "0jw809psa2ms9sy1mnirmbj9h7rs76wbmf24zgjqvhp4wq919z3m";
libraryHaskellDepends = [
array base binary bytestring containers deepseq directory filepath
pretty process time unix
@@ -2572,6 +2587,19 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "ChannelT_0_0_0_4" = callPackage
+ ({ mkDerivation, base, free, mmorph, mtl, transformers-base }:
+ mkDerivation {
+ pname = "ChannelT";
+ version = "0.0.0.4";
+ sha256 = "06yr40kpi4jr65r76vlbf68ybh17n4b2k8claj0czgs4igspyhvn";
+ libraryHaskellDepends = [ base free mmorph mtl transformers-base ];
+ homepage = "https://github.com/pthariensflame/ChannelT";
+ description = "Generalized stream processors";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"Chart" = callPackage
({ mkDerivation, array, base, colour, data-default-class, lens, mtl
, old-locale, operational, time, vector
@@ -7149,6 +7177,7 @@ self: {
homepage = "https://github.com/iqsf/HFitUI.git";
description = "The library for generating a graphical interface on the web";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"HFrequencyQueue" = callPackage
@@ -8296,6 +8325,8 @@ self: {
pname = "HStringTemplate";
version = "0.8.5";
sha256 = "1zrmbclnc0njdcppzsjlp4ln69hzcixmw1x1l6rjvxx5y51k0az0";
+ revision = "1";
+ editedCabalFile = "0qwz8lby7096vpmi73wryanky27aimwxpmfwpbarjm2lzbiq868i";
libraryHaskellDepends = [
array base blaze-builder bytestring containers deepseq directory
filepath mtl old-locale parsec pretty syb template-haskell text
@@ -8305,6 +8336,25 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "HStringTemplate_0_8_6" = callPackage
+ ({ mkDerivation, array, base, blaze-builder, bytestring, containers
+ , deepseq, directory, filepath, mtl, old-locale, parsec, pretty
+ , syb, template-haskell, text, time, void
+ }:
+ mkDerivation {
+ pname = "HStringTemplate";
+ version = "0.8.6";
+ sha256 = "1kam09fhnz1485swp5z1k8whjiwz9fcscp6zibxkq8hw3sfcn8kh";
+ libraryHaskellDepends = [
+ array base blaze-builder bytestring containers deepseq directory
+ filepath mtl old-locale parsec pretty syb template-haskell text
+ time void
+ ];
+ description = "StringTemplate implementation in Haskell";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"HStringTemplateHelpers" = callPackage
({ mkDerivation, base, containers, directory, FileManipCompat
, filepath, HSH, HStringTemplate, mtl, safe, strict
@@ -8369,29 +8419,6 @@ self: {
}) {};
"HTTP" = callPackage
- ({ mkDerivation, array, base, bytestring, case-insensitive, conduit
- , conduit-extra, deepseq, http-types, httpd-shed, HUnit, mtl
- , network, network-uri, parsec, pureMD5, split, test-framework
- , test-framework-hunit, time, wai, warp
- }:
- mkDerivation {
- pname = "HTTP";
- version = "4000.3.6";
- sha256 = "0j5sz52pikk82nz02iimq4khbz0yd2h00fvknhpp2s32mix8ii0q";
- libraryHaskellDepends = [
- array base bytestring mtl network network-uri parsec time
- ];
- testHaskellDepends = [
- base bytestring case-insensitive conduit conduit-extra deepseq
- http-types httpd-shed HUnit mtl network network-uri pureMD5 split
- test-framework test-framework-hunit wai warp
- ];
- homepage = "https://github.com/haskell/HTTP";
- description = "A library for client-side HTTP";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "HTTP_4000_3_7" = callPackage
({ mkDerivation, array, base, bytestring, case-insensitive, conduit
, conduit-extra, deepseq, http-types, httpd-shed, HUnit, mtl
, network, network-uri, parsec, pureMD5, split, test-framework
@@ -8412,7 +8439,6 @@ self: {
homepage = "https://github.com/haskell/HTTP";
description = "A library for client-side HTTP";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"HTTP-Simple" = callPackage
@@ -10462,6 +10488,8 @@ self: {
pname = "JuicyPixels-extra";
version = "0.2.1";
sha256 = "0lai831n9iak96l854fynpa1bf41rq8mg45397zjg0p25w0i1dka";
+ revision = "1";
+ editedCabalFile = "0f42a7jirsk3ciyd081wcb2pkss34yzfwhaiaclgf17yiav4zzv0";
libraryHaskellDepends = [ base JuicyPixels ];
testHaskellDepends = [ base hspec JuicyPixels ];
benchmarkHaskellDepends = [ base criterion JuicyPixels ];
@@ -12362,6 +12390,8 @@ self: {
pname = "MusicBrainz";
version = "0.2.4";
sha256 = "1f1x3iivxkn5d7w3xyh2q8mpn1mg24c1n6v8dvdsph745xszh8fj";
+ revision = "1";
+ editedCabalFile = "1bnj0wq9q6y2pxjnl1rk5ybdj16g17g7qkzrfnjrwmm7iq8xbm62";
libraryHaskellDepends = [
aeson base bytestring conduit conduit-extra HTTP http-conduit
http-types monad-control resourcet text time time-locale-compat
@@ -12372,6 +12402,29 @@ self: {
license = stdenv.lib.licenses.gpl3;
}) {};
+ "MusicBrainz_0_3" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, conduit, conduit-extra
+ , HTTP, http-conduit, http-types, monad-control, resourcet, text
+ , time, time-locale-compat, transformers, vector, xml-conduit
+ , xml-types
+ }:
+ mkDerivation {
+ pname = "MusicBrainz";
+ version = "0.3";
+ sha256 = "1c0vl5zkb8628k5222fg6z806byjqnsxr0h3yw86fzwhgkxqywd4";
+ revision = "1";
+ editedCabalFile = "1bv1nwl4pijgiw4zpnw6b15d7phj6b8chiqvv42s8vrq51crdvm6";
+ libraryHaskellDepends = [
+ aeson base bytestring conduit conduit-extra HTTP http-conduit
+ http-types monad-control resourcet text time time-locale-compat
+ transformers vector xml-conduit xml-types
+ ];
+ homepage = "http://floss.scru.org/hMusicBrainz";
+ description = "interface to MusicBrainz XML2 web service";
+ license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"MusicBrainz-libdiscid" = callPackage
({ mkDerivation, base, containers, vector }:
mkDerivation {
@@ -15229,25 +15282,15 @@ self: {
pname = "SCalendar";
version = "0.1.0.0";
sha256 = "0dvmfr82hnavgpiv2zi0dccldpyl84l653gncrbgd7dmdnmbsvw9";
+ revision = "1";
+ editedCabalFile = "0vcdmzisi7v7jsm6bj34q43f42ab0bhq992lyq740ickzp3a6k22";
libraryHaskellDepends = [ base containers text time ];
homepage = "https://github.com/sebasHack/SCalendar";
- description = "Library for managing calendars and resource availability";
+ description = "XXXX";
license = stdenv.lib.licenses.mit;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "SConfig" = callPackage
- ({ mkDerivation, base, containers }:
- mkDerivation {
- pname = "SConfig";
- version = "0.2.0.0";
- sha256 = "032s6szll58zavdnf6fsj2rhpdlizv3l46lh819bqjy1kbffv0yz";
- libraryHaskellDepends = [ base containers ];
- homepage = "https://github.com/fgaz/SConfig";
- description = "A simple config library";
- license = stdenv.lib.licenses.mit;
- }) {};
-
"SDL" = callPackage
({ mkDerivation, base, SDL }:
mkDerivation {
@@ -15471,6 +15514,7 @@ self: {
];
description = "A simple SMTP client library";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"SNet" = callPackage
@@ -16641,8 +16685,8 @@ self: {
}:
mkDerivation {
pname = "StockholmAlignment";
- version = "1.1.0";
- sha256 = "0ycvlacvr49gjzci1l68wi128z5gw0z6pgw00i3spjybd87ydykc";
+ version = "1.1.1";
+ sha256 = "085kw1rw4dkyivjpm7l5alj0x9cgzd8c2ai4f2k1kkcwjkhbpllv";
libraryHaskellDepends = [
base colour diagrams-cairo diagrams-lib directory either-unwrap
filepath parsec ParsecTools SVGFonts text vector
@@ -17932,17 +17976,17 @@ self: {
}) {};
"Villefort" = callPackage
- ({ mkDerivation, base, FindBin, HDBC, HDBC-sqlite3, mtl, scotty
- , split, text, time
+ ({ mkDerivation, base, FindBin, HDBC, HDBC-sqlite3, mtl, random
+ , scotty, split, text, time
}:
mkDerivation {
pname = "Villefort";
- version = "0.1.0.7";
- sha256 = "05njwx4d6cd4h4zx8bxpnypq9hm9fzz6kmnx6ic308asvyjgkhav";
+ version = "0.1.0.8";
+ sha256 = "0974k5adxxa0jpi99wqq13lnav2rdb7qr40snvycsazk5mx1fd35";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- base FindBin HDBC HDBC-sqlite3 mtl split time
+ base FindBin HDBC HDBC-sqlite3 mtl random split time
];
executableHaskellDepends = [
base HDBC HDBC-sqlite3 scotty split text time
@@ -19368,6 +19412,8 @@ self: {
pname = "accelerate";
version = "1.0.0.0";
sha256 = "04pix2hazqafyb3zr8ikn1acrc77f9r9061fygpblbl5fxmk9g96";
+ revision = "1";
+ editedCabalFile = "1n6mhckkry2ga6w5yhc9s37saf055jfs2ixi1g0np5cca6027h10";
libraryHaskellDepends = [
base base-orphans containers deepseq directory exceptions fclabels
filepath ghc-prim hashable hashtables mtl pretty template-haskell
@@ -19696,10 +19742,10 @@ self: {
}:
mkDerivation {
pname = "accelerate-llvm-ptx";
- version = "1.0.0.0";
- sha256 = "03ids4vmyvrxj70jx5rd2p7v73p6d4w0dj4zkyc1xkir2fwizbjg";
- revision = "2";
- editedCabalFile = "1ywp6xiaa3c1zs0x26997mki3l9lm38pqj298rs1vz9nagqh31z6";
+ version = "1.0.0.1";
+ sha256 = "0s01vfqrg6kg2jkg9dkj98b7xr88m519drs73x5ffj6xdgq6b57z";
+ revision = "1";
+ editedCabalFile = "0r9j7pnhfxvx1qv3xn877mbr1pfwqh0nhm436cpqanqrj7sk876n";
libraryHaskellDepends = [
accelerate accelerate-llvm base bytestring containers cuda
directory dlist fclabels filepath hashable llvm-hs llvm-hs-pure mtl
@@ -20430,26 +20476,6 @@ self: {
}) {};
"active" = callPackage
- ({ mkDerivation, base, lens, linear, QuickCheck, semigroupoids
- , semigroups, vector
- }:
- mkDerivation {
- pname = "active";
- version = "0.2.0.12";
- sha256 = "07mrm3ij5466lpvh43jpb1xlg64lp6gpdl84knb7c9rbmn7iya2m";
- revision = "2";
- editedCabalFile = "17x1irvhj2snkljgdplm1330a4ji3lz9myi809hvxk37knfp9djq";
- libraryHaskellDepends = [
- base lens linear semigroupoids semigroups vector
- ];
- testHaskellDepends = [
- base lens linear QuickCheck semigroupoids semigroups vector
- ];
- description = "Abstractions for animation";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "active_0_2_0_13" = callPackage
({ mkDerivation, base, lens, linear, QuickCheck, semigroupoids
, semigroups, vector
}:
@@ -20465,7 +20491,6 @@ self: {
];
description = "Abstractions for animation";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"activehs" = callPackage
@@ -20800,6 +20825,35 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "aeson_0_11_3_0" = callPackage
+ ({ mkDerivation, attoparsec, base, base-orphans, bytestring
+ , containers, deepseq, dlist, fail, ghc-prim, hashable, HUnit, mtl
+ , QuickCheck, quickcheck-instances, scientific, syb, tagged
+ , template-haskell, test-framework, test-framework-hunit
+ , test-framework-quickcheck2, text, time, transformers
+ , unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "aeson";
+ version = "0.11.3.0";
+ sha256 = "1sgcjmf945hazdfx7iyr60w0x9l3y292q2k13zcjihl1g32zl9pk";
+ libraryHaskellDepends = [
+ attoparsec base bytestring containers deepseq dlist fail ghc-prim
+ hashable mtl scientific syb tagged template-haskell text time
+ transformers unordered-containers vector
+ ];
+ testHaskellDepends = [
+ attoparsec base base-orphans bytestring containers ghc-prim
+ hashable HUnit QuickCheck quickcheck-instances tagged
+ template-haskell test-framework test-framework-hunit
+ test-framework-quickcheck2 text time unordered-containers vector
+ ];
+ homepage = "https://github.com/bos/aeson";
+ description = "Fast JSON parsing and encoding";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"aeson" = callPackage
({ mkDerivation, attoparsec, base, base-compat, base-orphans
, base16-bytestring, bytestring, containers, deepseq, dlist
@@ -23792,6 +23846,7 @@ self: {
homepage = "https://github.com/brendanhay/amazonka";
description = "Amazon Lambda SDK";
license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"amazonka-lightsail" = callPackage
@@ -24078,7 +24133,7 @@ self: {
hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
}) {};
- "amazonka-s3-streaming_0_2_0_1" = callPackage
+ "amazonka-s3-streaming_0_2_0_2" = callPackage
({ mkDerivation, amazonka, amazonka-core, amazonka-s3, base
, bytestring, conduit, conduit-extra, deepseq, dlist, exceptions
, http-client, lens, lifted-async, mmap, mmorph, mtl, resourcet
@@ -24086,8 +24141,8 @@ self: {
}:
mkDerivation {
pname = "amazonka-s3-streaming";
- version = "0.2.0.1";
- sha256 = "0rk99kl4j6mxlws5mjglhpwd2kg1pkzncf9cyxlckpq3p7k64k3i";
+ version = "0.2.0.2";
+ sha256 = "0bhr141kjwrrk0cd6052np1q0y6jw2yd1wxrpgkrk41wl26makrr";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -24990,6 +25045,21 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "ansi-terminal_0_6_3" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "ansi-terminal";
+ version = "0.6.3";
+ sha256 = "1m9s5h8cj5gh23ybkl1kim3slmlprmk3clrbrnnb078afamlwg6s";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base ];
+ homepage = "https://github.com/feuerbach/ansi-terminal";
+ description = "Simple ANSI terminal support, with Windows compatibility";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"ansi-wl-pprint" = callPackage
({ mkDerivation, ansi-terminal, base }:
mkDerivation {
@@ -29630,6 +29700,7 @@ self: {
homepage = "https://github.com/bitemyapp/ballast#readme";
description = "Shipwire API client";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"bamboo" = callPackage
@@ -30351,6 +30422,39 @@ self: {
license = stdenv.lib.licenses.publicDomain;
}) {};
+ "batchd" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, connection, containers
+ , cryptonite, data-default, dates, directory, esqueleto, filepath
+ , Glob, http-client, http-client-tls, http-types, libssh2
+ , monad-logger, monad-logger-syslog, mtl, optparse-applicative
+ , parsec, persistent, persistent-postgresql, persistent-sqlite
+ , persistent-template, process, readline, resourcet, scotty, syb
+ , template, template-haskell, text, th-lift, time, tls
+ , transformers, unix, unordered-containers, vault, wai, wai-cors
+ , wai-extra, wai-middleware-static, warp, x509-store, yaml
+ }:
+ mkDerivation {
+ pname = "batchd";
+ version = "0.1.0.0";
+ sha256 = "1axj4w0g34fgnn89l6f2zxbx172z6yq98clksp2bqxmnswza7di2";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ aeson base bytestring connection containers cryptonite data-default
+ dates directory esqueleto filepath Glob http-client http-client-tls
+ http-types libssh2 monad-logger monad-logger-syslog mtl
+ optparse-applicative parsec persistent persistent-postgresql
+ persistent-sqlite persistent-template process readline resourcet
+ scotty syb template template-haskell text th-lift time tls
+ transformers unix unordered-containers vault wai wai-cors wai-extra
+ wai-middleware-static warp x509-store yaml
+ ];
+ homepage = "https://github.com/portnov/batchd";
+ description = "Batch processing toolset for Linux / Unix";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"battlenet" = callPackage
({ mkDerivation, aeson, base, containers, http-conduit, text }:
mkDerivation {
@@ -30677,6 +30781,25 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "bench_1_0_4" = callPackage
+ ({ mkDerivation, base, criterion, optparse-applicative, silently
+ , text, turtle
+ }:
+ mkDerivation {
+ pname = "bench";
+ version = "1.0.4";
+ sha256 = "1q376q5jy3i99smx06dma4d05jdxmcfyfskjkj7bmm3g84fdwxas";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ base criterion optparse-applicative silently text turtle
+ ];
+ homepage = "http://github.com/Gabriel439/bench";
+ description = "Command-line benchmark tool";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"benchmark-function" = callPackage
({ mkDerivation, base, process, random, time }:
mkDerivation {
@@ -36001,6 +36124,7 @@ self: {
homepage = "https://github.com/lspitzner/butcher/";
description = "Chops a command or program invocation into digestable pieces";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"butterflies" = callPackage
@@ -37020,18 +37144,6 @@ self: {
}) {};
"cabal-doctest" = callPackage
- ({ mkDerivation, base, Cabal, directory, filepath }:
- mkDerivation {
- pname = "cabal-doctest";
- version = "1.0.1";
- sha256 = "1fj8marihk7is2qcv0m9lfgycqqvi0b84s19xbfgywq3w54z16jl";
- libraryHaskellDepends = [ base Cabal directory filepath ];
- homepage = "https://github.com/phadej/cabal-doctest";
- description = "A Setup.hs helper for doctests running";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "cabal-doctest_1_0_2" = callPackage
({ mkDerivation, base, Cabal, directory, filepath }:
mkDerivation {
pname = "cabal-doctest";
@@ -37041,7 +37153,6 @@ self: {
homepage = "https://github.com/phadej/cabal-doctest";
description = "A Setup.hs helper for doctests running";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"cabal-file-th" = callPackage
@@ -37178,6 +37289,8 @@ self: {
pname = "cabal-install";
version = "1.24.0.2";
sha256 = "1q0gl3i9cpg854lcsiifxxginnvhp2bpx19wkkzpzrd072983j1a";
+ revision = "1";
+ editedCabalFile = "0v112hvvppa31sklpzg54vr0hfidy1334kg5p3jc0gbgl8in1n90";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -37810,6 +37923,7 @@ self: {
homepage = "https://github.com/RobertFischer/cabalish#readme";
description = "Provides access to the cabal file data for shell scripts";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"cabalmdvrpm" = callPackage
@@ -38342,13 +38456,13 @@ self: {
({ mkDerivation, base, bytestring, Imlib, terminfo }:
mkDerivation {
pname = "camh";
- version = "0.0.2";
- sha256 = "0xk1rxydncwfwj9cg4jwdgi8mlgwmk5nfk462pla26dqqg44aw2p";
+ version = "0.0.3";
+ sha256 = "0r6wzn9kxwinfa383lbxsjlrpv4v2m72qzpsyc9gcigvd5h7zhzz";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [ base bytestring Imlib terminfo ];
homepage = "not yet available";
- description = "Image converter to 256-colored text";
+ description = "write image files onto 256(or 24bit) color terminals";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -40879,6 +40993,18 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "chronologique" = callPackage
+ ({ mkDerivation, base, hourglass, hspec, QuickCheck, time }:
+ mkDerivation {
+ pname = "chronologique";
+ version = "0.2.1.0";
+ sha256 = "13lrngxfbsfsmqph8slh8zn7hvvihbwzc6cna315kjzhi3a3mwbm";
+ libraryHaskellDepends = [ base hourglass time ];
+ testHaskellDepends = [ base hourglass hspec QuickCheck ];
+ description = "Time to manipulate time";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"chronos" = callPackage
({ mkDerivation, aeson, attoparsec, base, bytestring, hashable
, HUnit, primitive, QuickCheck, test-framework
@@ -42635,6 +42761,7 @@ self: {
homepage = "https://gitlab.com/tim-m89/clr-haskell/tree/master/libs/clr-bindings";
description = "Glue between clr-host and clr-typed";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"clr-host" = callPackage
@@ -42677,6 +42804,7 @@ self: {
homepage = "https://gitlab.com/tim-m89/clr-haskell";
description = "Quasiquoters for inline C# and F#";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"clr-marshal" = callPackage
@@ -42704,6 +42832,7 @@ self: {
homepage = "https://gitlab.com/tim-m89/clr-haskell/tree/master/libs/clr-typed";
description = "A strongly typed Haskell interface to the CLR type system";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"clr-win-linker" = callPackage
@@ -44518,6 +44647,7 @@ self: {
homepage = "https://github.com/ConferHealth/composite#readme";
description = "JSON for Vinyl/Frames records";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"composite-aeson-refined" = callPackage
@@ -44530,6 +44660,7 @@ self: {
homepage = "https://github.com/ConferHealth/composite#readme";
description = "composite-aeson support for Refined from the refined package";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"composite-base" = callPackage
@@ -44552,6 +44683,7 @@ self: {
homepage = "https://github.com/ConferHealth/composite#readme";
description = "Shared utilities for composite-* packages";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"composite-ekg" = callPackage
@@ -44568,6 +44700,7 @@ self: {
homepage = "https://github.com/ConferHealth/composite#readme";
description = "EKG Metrics for Vinyl/Frames records";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"composite-opaleye" = callPackage
@@ -44586,6 +44719,7 @@ self: {
homepage = "https://github.com/ConferHealth/composite#readme";
description = "Opaleye SQL for Frames records";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"composition" = callPackage
@@ -45022,8 +45156,8 @@ self: {
}:
mkDerivation {
pname = "concurrent-extra";
- version = "0.7.0.10";
- sha256 = "04nw39pbfqa4ldymn706ij83hxa07c73r7hy18y5pwpmj05cq9vg";
+ version = "0.7.0.11";
+ sha256 = "0bvfgm26hyix074c36l7cqdq40xx8zzml6v50qdfly04g1bb05m5";
libraryHaskellDepends = [ base stm unbounded-delays ];
testHaskellDepends = [
async base HUnit random stm test-framework test-framework-hunit
@@ -45429,38 +45563,6 @@ self: {
}) {};
"conduit-extra" = callPackage
- ({ mkDerivation, async, attoparsec, base, blaze-builder, bytestring
- , bytestring-builder, conduit, criterion, directory, exceptions
- , filepath, hspec, monad-control, network, primitive, process
- , QuickCheck, resourcet, stm, streaming-commons, text, transformers
- , transformers-base
- }:
- mkDerivation {
- pname = "conduit-extra";
- version = "1.1.15";
- sha256 = "13dvj271bhdaf83px99mlm0pgvc3474cmidh35jj775m1pmjkvvv";
- revision = "1";
- editedCabalFile = "0kqnggsn4fqvjh5gadaf8h5sw4hprppx63ihpmz32rymhc48sjcl";
- libraryHaskellDepends = [
- async attoparsec base blaze-builder bytestring conduit directory
- exceptions filepath monad-control network primitive process
- resourcet stm streaming-commons text transformers transformers-base
- ];
- testHaskellDepends = [
- async attoparsec base blaze-builder bytestring bytestring-builder
- conduit directory exceptions hspec process QuickCheck resourcet stm
- streaming-commons text transformers transformers-base
- ];
- benchmarkHaskellDepends = [
- base blaze-builder bytestring bytestring-builder conduit criterion
- transformers
- ];
- homepage = "http://github.com/snoyberg/conduit";
- description = "Batteries included conduit: adapters for common libraries";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "conduit-extra_1_1_16" = callPackage
({ mkDerivation, async, attoparsec, base, blaze-builder, bytestring
, bytestring-builder, conduit, criterion, directory, exceptions
, filepath, hspec, monad-control, network, primitive, process
@@ -45488,7 +45590,6 @@ self: {
homepage = "http://github.com/snoyberg/conduit";
description = "Batteries included conduit: adapters for common libraries";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"conduit-find" = callPackage
@@ -48163,8 +48264,8 @@ self: {
}:
mkDerivation {
pname = "creatur";
- version = "5.9.14";
- sha256 = "10ymq9cyavj21k0y7acaa1y0hr8bazvf21ysazfgg0vvip9p43q4";
+ version = "5.9.16";
+ sha256 = "03ipmz55cw6d8d79zv0m7cg8r6izdgy2v50xc8s7hk1sln86qbmx";
libraryHaskellDepends = [
array base bytestring cereal cond directory exceptions filepath
gray-extended hdaemonize hsyslog MonadRandom mtl old-locale process
@@ -48383,6 +48484,39 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "criterion_1_2_0_0" = callPackage
+ ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat, binary
+ , bytestring, cassava, code-page, containers, deepseq, directory
+ , exceptions, filepath, Glob, HUnit, js-flot, js-jquery
+ , microstache, mtl, mwc-random, optparse-applicative, parsec
+ , QuickCheck, statistics, tasty, tasty-hunit, tasty-quickcheck
+ , text, time, transformers, transformers-compat, vector
+ , vector-algorithms
+ }:
+ mkDerivation {
+ pname = "criterion";
+ version = "1.2.0.0";
+ sha256 = "0rbmfjgxba7qsp79lj7k00yzphmknimqh5r20nw1bc6i1v4civ6f";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson ansi-wl-pprint base base-compat binary bytestring cassava
+ code-page containers deepseq directory exceptions filepath Glob
+ js-flot js-jquery microstache mtl mwc-random optparse-applicative
+ parsec statistics text time transformers transformers-compat vector
+ vector-algorithms
+ ];
+ executableHaskellDepends = [ base optparse-applicative ];
+ testHaskellDepends = [
+ aeson base bytestring deepseq directory HUnit QuickCheck statistics
+ tasty tasty-hunit tasty-quickcheck vector
+ ];
+ homepage = "http://www.serpentine.com/criterion";
+ description = "Robust, reliable performance measurement and analysis";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"criterion-plus" = callPackage
({ mkDerivation, base, criterion, deepseq, HTF, HUnit, loch-th
, monad-control, mtl, optparse-applicative, placeholders
@@ -49820,6 +49954,28 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "cue-sheet_0_1_1" = callPackage
+ ({ mkDerivation, base, bytestring, containers, data-default-class
+ , exceptions, hspec, hspec-megaparsec, megaparsec, mtl, QuickCheck
+ , text
+ }:
+ mkDerivation {
+ pname = "cue-sheet";
+ version = "0.1.1";
+ sha256 = "1h0v7jzxavjs2c50p1z3bfvbn1r29z31qcr17mjmd7a9yskp4yhd";
+ libraryHaskellDepends = [
+ base bytestring containers data-default-class exceptions megaparsec
+ mtl QuickCheck text
+ ];
+ testHaskellDepends = [
+ base bytestring exceptions hspec hspec-megaparsec QuickCheck text
+ ];
+ homepage = "https://github.com/mrkkrp/cue-sheet";
+ description = "Support for construction, rendering, and parsing of CUE sheets";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"cufft" = callPackage
({ mkDerivation, base, c2hs, Cabal, cuda, directory, filepath
, template-haskell
@@ -50929,6 +51085,20 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "data-check_0_1_1" = callPackage
+ ({ mkDerivation, base, containers, hspec, QuickCheck }:
+ mkDerivation {
+ pname = "data-check";
+ version = "0.1.1";
+ sha256 = "00di2szqavzmbx4y5b6dq7qalm5pgalb19lfqcdawd5n61fj2gq1";
+ libraryHaskellDepends = [ base containers ];
+ testHaskellDepends = [ base hspec QuickCheck ];
+ homepage = "https://github.com/mrkkrp/data-check";
+ description = "Library for checking and normalization of data (e.g. from web forms)";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"data-checked" = callPackage
({ mkDerivation, base, deepseq }:
mkDerivation {
@@ -53418,6 +53588,7 @@ self: {
homepage = "https://debug-me.branchable.com/";
description = "secure remote debugging";
license = stdenv.lib.licenses.agpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"debug-time" = callPackage
@@ -54704,6 +54875,7 @@ self: {
homepage = "https://github.com/anfelor/dhall-check#readme";
description = "Check all dhall files in a project";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"dhall-json" = callPackage
@@ -54746,6 +54918,25 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "dhcp-lease-parser" = callPackage
+ ({ mkDerivation, attoparsec, base, bytestring, chronos, ip, tasty
+ , tasty-hunit, text
+ }:
+ mkDerivation {
+ pname = "dhcp-lease-parser";
+ version = "0.1";
+ sha256 = "00h40vr2x77ajv1kks9gdg7a6nmrykc8pjf13zs1bq3pvgygqacs";
+ libraryHaskellDepends = [
+ attoparsec base bytestring chronos ip text
+ ];
+ testHaskellDepends = [
+ attoparsec base bytestring chronos ip tasty tasty-hunit
+ ];
+ homepage = "https://github.com/andrewthad/dhcp-lease-parser#readme";
+ description = "Parse a DHCP lease file";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"di" = callPackage
({ mkDerivation, base, stm, text, time, transformers }:
mkDerivation {
@@ -54948,6 +55139,8 @@ self: {
pname = "diagrams-graphviz";
version = "1.4";
sha256 = "1lb1r8681c2dypm420102grnkxkwjqzgv30gljnq2dnpm6m42fj8";
+ revision = "1";
+ editedCabalFile = "0x1nsbp8np317qx96civ9bgknqhvjff7afcj24bg8ql56f5sd2cl";
libraryHaskellDepends = [
base containers diagrams-lib fgl graphviz split
];
@@ -55414,7 +55607,7 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "dictionaries_0_2_0_1" = callPackage
+ "dictionaries_0_2_0_2" = callPackage
({ mkDerivation, attoparsec, base, binary, bytestring, containers
, criterion, data-default, deepseq, directory, exceptions, filepath
, hspec, QuickCheck, random, random-shuffle, tagged, text, time
@@ -55422,8 +55615,8 @@ self: {
}:
mkDerivation {
pname = "dictionaries";
- version = "0.2.0.1";
- sha256 = "0jvyhx2mgw8fiwckj5bjljaisxzqhy0sa7y8cvxjbxp8darbjx0a";
+ version = "0.2.0.2";
+ sha256 = "0zzzlk2479kk321f06aw5j5fkrza7nmg41f886b47bzd6mzmmnq8";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -56276,8 +56469,8 @@ self: {
}:
mkDerivation {
pname = "dirstream";
- version = "1.0.2";
- sha256 = "0xgsf15hz08rh49kz6l25hsx1jcvc13p3h8j2fl0h8xvzxnihppz";
+ version = "1.0.3";
+ sha256 = "1yga8qzmarskjlnz7wnkrjiv438m2yswz640bcw8dawwqk8xf1x4";
libraryHaskellDepends = [
base directory pipes pipes-safe system-fileio system-filepath unix
];
@@ -60320,8 +60513,8 @@ self: {
pname = "either";
version = "4.4.1.1";
sha256 = "1lrlwqqnm6ibfcydlv5qvvssw7bm0c6yypy0rayjzv1znq7wp1xh";
- revision = "1";
- editedCabalFile = "1ccxjfp1vsnrq9wyd5jrz7adk9rwmrlvppsc8ad1dpjy5zsayxij";
+ revision = "2";
+ editedCabalFile = "1n7792mcrvfh31qrbj8mpnx372s03kz83mypj7l4fm5h6zi4a3hs";
libraryHaskellDepends = [
base bifunctors exceptions free mmorph monad-control MonadRandom
mtl profunctors semigroupoids semigroups transformers
@@ -61595,11 +61788,16 @@ self: {
}) {};
"entropy" = callPackage
- ({ mkDerivation, base, bytestring, unix }:
+ ({ mkDerivation, base, bytestring, Cabal, directory, filepath
+ , process, unix
+ }:
mkDerivation {
pname = "entropy";
version = "0.3.7";
sha256 = "1vzg9fi597dbrcbjsr71y47rvmhiih7lg5rjnb297fzdlbmj1w0z";
+ revision = "1";
+ editedCabalFile = "01lyh4cbpqlcj1y8mnkw6vk4vid5rzqg1vcf9kwxwd88zj86cgjg";
+ setupHaskellDepends = [ base Cabal directory filepath process ];
libraryHaskellDepends = [ base bytestring unix ];
homepage = "https://github.com/TomMD/entropy";
description = "A platform independent entropy source";
@@ -61657,6 +61855,7 @@ self: {
homepage = "http://github.com/sboosali/enumerate-function#readme";
description = "simple package for inverting functions and testing totality, via brute enumeration of the domain";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"enumeration" = callPackage
@@ -62542,6 +62741,31 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "esqueleto_2_5_2" = callPackage
+ ({ mkDerivation, base, blaze-html, bytestring, conduit, containers
+ , hspec, HUnit, monad-control, monad-logger, persistent
+ , persistent-sqlite, persistent-template, QuickCheck, resourcet
+ , tagged, text, transformers, unordered-containers
+ }:
+ mkDerivation {
+ pname = "esqueleto";
+ version = "2.5.2";
+ sha256 = "1hbwb6vzd5ykqg6v6f1jmbpbdin1hpjgghgnz1c986d9n6skm6wf";
+ libraryHaskellDepends = [
+ base blaze-html bytestring conduit monad-logger persistent
+ resourcet tagged text transformers unordered-containers
+ ];
+ testHaskellDepends = [
+ base conduit containers hspec HUnit monad-control monad-logger
+ persistent persistent-sqlite persistent-template QuickCheck
+ resourcet text transformers
+ ];
+ homepage = "https://github.com/bitemyapp/esqueleto";
+ description = "Type-safe EDSL for SQL queries on persistent backends";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"ess" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -63156,6 +63380,7 @@ self: {
homepage = "https://github.com/jdreaver/eventful#readme";
description = "Library for eventful DynamoDB event stores";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"eventful-memory" = callPackage
@@ -63199,6 +63424,7 @@ self: {
homepage = "https://github.com/jdreaver/eventful#readme";
description = "Postgres implementations for eventful";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"eventful-sql-common" = callPackage
@@ -64943,6 +65169,25 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "fastparser" = callPackage
+ ({ mkDerivation, base, bytestring, bytestring-lexing, containers
+ , microlens, thyme, vector-space
+ }:
+ mkDerivation {
+ pname = "fastparser";
+ version = "0.3.0";
+ sha256 = "1dg7nsyn2qrf37x1512kzxhg2ldwkfngsy0jc4y2szd37i4iqqb4";
+ revision = "1";
+ editedCabalFile = "1qg6bbar66qxhnh3mdv41m9zrvggwnjszzr42z9x4gybx6anqzfi";
+ libraryHaskellDepends = [
+ base bytestring bytestring-lexing containers microlens thyme
+ vector-space
+ ];
+ homepage = "https://github.com/bartavelle/fastparser#readme";
+ description = "A fast, but bare bones, bytestring parser combinators library";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"fastpbkdf2" = callPackage
({ mkDerivation, base, base16-bytestring, bytestring, criterion
, cryptonite, openssl, pbkdf, tasty, tasty-hunit
@@ -65371,6 +65616,22 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "feature-flipper" = callPackage
+ ({ mkDerivation, base, containers, hspec, mtl, QuickCheck, text }:
+ mkDerivation {
+ pname = "feature-flipper";
+ version = "0.1.0.0";
+ sha256 = "0gl8r3xxxw5ys7dac45gc8mrmzyzrh1nplxb3w36qsj6fm6bzg6g";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base containers mtl text ];
+ executableHaskellDepends = [ base containers mtl ];
+ testHaskellDepends = [ base containers hspec mtl QuickCheck ];
+ homepage = "https://github.com/toddmohney/feature-flipper#readme";
+ description = "A minimally obtrusive feature flag library";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"fec" = callPackage
({ mkDerivation, base, bytestring }:
mkDerivation {
@@ -66374,6 +66635,21 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "final-pretty-printer" = callPackage
+ ({ mkDerivation, ansi-terminal, base, containers, exceptions, mtl
+ , temporary, text
+ }:
+ mkDerivation {
+ pname = "final-pretty-printer";
+ version = "0.1.0.0";
+ sha256 = "0p0g73nq7154msvzazkn79fjnkzd939chgmxqdi9xbcpq47zgac2";
+ libraryHaskellDepends = [
+ ansi-terminal base containers exceptions mtl temporary text
+ ];
+ description = "Extensible pretty printing with semantic annotations and proportional fonts";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"find-clumpiness" = callPackage
({ mkDerivation, aeson, base, bytestring, clumpiness, containers
, optparse-applicative, text, text-show, tree-fun
@@ -67045,6 +67321,30 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {FLAC = null;};
+ "flac_0_1_2" = callPackage
+ ({ mkDerivation, base, bytestring, containers, data-default-class
+ , directory, exceptions, filepath, FLAC, hspec, mtl, temporary
+ , text, transformers, vector, wave
+ }:
+ mkDerivation {
+ pname = "flac";
+ version = "0.1.2";
+ sha256 = "0adc88h5dmazf9m2xah0qkcav3pm0l3jiy8wbg9fxjv1qpgv74jn";
+ libraryHaskellDepends = [
+ base bytestring containers data-default-class directory exceptions
+ filepath mtl text transformers vector wave
+ ];
+ librarySystemDepends = [ FLAC ];
+ testHaskellDepends = [
+ base bytestring data-default-class directory filepath hspec
+ temporary transformers vector wave
+ ];
+ homepage = "https://github.com/mrkkrp/flac";
+ description = "Complete high-level binding to libFLAC";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {FLAC = null;};
+
"flac-picture" = callPackage
({ mkDerivation, base, bytestring, data-default-class, directory
, flac, hspec, JuicyPixels, temporary
@@ -67066,6 +67366,25 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "flac-picture_0_1_1" = callPackage
+ ({ mkDerivation, base, bytestring, data-default-class, directory
+ , flac, hspec, JuicyPixels, temporary
+ }:
+ mkDerivation {
+ pname = "flac-picture";
+ version = "0.1.1";
+ sha256 = "1kn1zvv5izinyidmxij7zqml94a8q52bbm2icg7704sj906gh71w";
+ libraryHaskellDepends = [ base bytestring flac JuicyPixels ];
+ testHaskellDepends = [
+ base bytestring data-default-class directory flac hspec JuicyPixels
+ temporary
+ ];
+ homepage = "https://github.com/mrkkrp/flac-picture";
+ description = "Support for writing picture to FLAC metadata blocks with JuicyPixels";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"flaccuraterip" = callPackage
({ mkDerivation, base, binary, deepseq, HTTP, optparse-applicative
, process
@@ -67608,8 +67927,8 @@ self: {
}:
mkDerivation {
pname = "fltkhs";
- version = "0.5.1.5";
- sha256 = "1w257l6cva99558jrgjn0a78bcrqzfkjblgya72v2lpyfz3gvkbl";
+ version = "0.5.1.8";
+ sha256 = "0y0fkn067f0iwpvwhk7ypnp3b0zpgzyxzkmr69vkmmcaliqzcayz";
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal directory filepath ];
@@ -67928,31 +68247,6 @@ self: {
}) {};
"foldl-statistics" = callPackage
- ({ mkDerivation, base, criterion, foldl, math-functions, mwc-random
- , profunctors, quickcheck-instances, semigroups, statistics, tasty
- , tasty-quickcheck, vector
- }:
- mkDerivation {
- pname = "foldl-statistics";
- version = "0.1.4.2";
- sha256 = "1q4bbi6v9x4wfgpbb38v1xjlssqb2fzr1xx6369m4h7z6rnnvyhw";
- libraryHaskellDepends = [
- base foldl math-functions profunctors semigroups
- ];
- testHaskellDepends = [
- base foldl profunctors quickcheck-instances semigroups statistics
- tasty tasty-quickcheck vector
- ];
- benchmarkHaskellDepends = [
- base criterion foldl mwc-random statistics vector
- ];
- homepage = "http://github.com/Data61/foldl-statistics#readme";
- description = "Statistical functions from the statistics package implemented as Folds";
- license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
- }) {};
-
- "foldl-statistics_0_1_4_3" = callPackage
({ mkDerivation, base, criterion, foldl, math-functions, mwc-random
, profunctors, quickcheck-instances, semigroups, statistics, tasty
, tasty-quickcheck, vector
@@ -67974,7 +68268,7 @@ self: {
homepage = "http://github.com/Data61/foldl-statistics#readme";
description = "Statistical functions from the statistics package implemented as Folds";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
+ hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
}) {};
"foldl-transduce" = callPackage
@@ -68584,6 +68878,35 @@ self: {
license = stdenv.lib.licenses.asl20;
}) {};
+ "fortran-src_0_1_0_6" = callPackage
+ ({ mkDerivation, alex, array, base, binary, bytestring, containers
+ , directory, fgl, filepath, GenericPretty, happy, hspec, mtl
+ , pretty, text, uniplate
+ }:
+ mkDerivation {
+ pname = "fortran-src";
+ version = "0.1.0.6";
+ sha256 = "1rmjcbhfh0j67ffrqg0qp4qsz7bv49k3iw40qy0kmwiivhkgbaxl";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ array base binary bytestring containers directory fgl filepath
+ GenericPretty mtl pretty text uniplate
+ ];
+ libraryToolDepends = [ alex happy ];
+ executableHaskellDepends = [
+ array base binary bytestring containers directory fgl filepath
+ GenericPretty mtl pretty text uniplate
+ ];
+ testHaskellDepends = [
+ array base binary bytestring containers directory fgl filepath
+ GenericPretty hspec mtl pretty text uniplate
+ ];
+ description = "Parser and anlyses for Fortran standards 66, 77, 90";
+ license = stdenv.lib.licenses.asl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"foscam-directory" = callPackage
({ mkDerivation, base, directory, doctest, filepath
, foscam-filename, lens, pretty, QuickCheck, template-haskell
@@ -69649,6 +69972,7 @@ self: {
libraryHaskellDepends = [ base hint ];
description = "csv parser for fsh";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"fsharp" = callPackage
@@ -71487,6 +71811,7 @@ self: {
homepage = "https://github.com/cjdev/genesis#readme";
description = "Opinionated bootstrapping for Haskell web services";
license = stdenv.lib.licenses.isc;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"genesis-test" = callPackage
@@ -71510,6 +71835,7 @@ self: {
homepage = "https://github.com/cjdev/genesis#readme";
description = "Opinionated bootstrapping for Haskell web services";
license = stdenv.lib.licenses.isc;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"genetics" = callPackage
@@ -71887,14 +72213,16 @@ self: {
}) {};
"genvalidity-time" = callPackage
- ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec, time
- , validity-time
+ ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec
+ , QuickCheck, time, validity-time
}:
mkDerivation {
pname = "genvalidity-time";
- version = "0.0.0.1";
- sha256 = "10m0nmjrsrqnf18ippcrc4dsvcicyr3w39hfwckhi6w9basbmbxj";
- libraryHaskellDepends = [ base genvalidity time validity-time ];
+ version = "0.0.0.2";
+ sha256 = "0fck7f6ipizd05v56kgmsbkqr8nkxzb18kv1wmw9n7n6mdimjqv0";
+ libraryHaskellDepends = [
+ base genvalidity QuickCheck time validity-time
+ ];
testHaskellDepends = [ base genvalidity-hspec hspec time ];
homepage = "https://github.com/NorfairKing/validity#readme";
description = "GenValidity support for time";
@@ -75712,8 +76040,8 @@ self: {
}:
mkDerivation {
pname = "glirc";
- version = "2.21";
- sha256 = "1bvilflgsdlyrxq0q88nz8c3lz7fhda05kz3w0bc400jgp9jfb55";
+ version = "2.21.1";
+ sha256 = "12ivc4pbqq3564q0g0dz2h731r8dnlxkq471vfk03lrhvjyf8sak";
isLibrary = true;
isExecutable = true;
setupHaskellDepends = [ base Cabal filepath ];
@@ -76330,8 +76658,8 @@ self: {
}:
mkDerivation {
pname = "gnss-converters";
- version = "0.2.8";
- sha256 = "0n0p31n3mivk5wsfaa6805ybjn7d7jli5vdpmap3p8f2ld48ina7";
+ version = "0.2.9";
+ sha256 = "083simwpm3d9jk1iaymb2sbkaa98yxg3ngg0rmvl8vk015p7hcxr";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -80055,10 +80383,8 @@ self: {
({ mkDerivation, base, base-unicode-symbols, containers, mtl }:
mkDerivation {
pname = "graph-rewriting";
- version = "0.7.9";
- sha256 = "09cfx9vz34623rpl903v4fmb59n0bymlcy8ilv13lp8cmcinawy4";
- revision = "1";
- editedCabalFile = "0jw4s59qgw3jyn9lbbl01z9q6wlk58ashw7bl9sdfmr3qgz5xb8z";
+ version = "0.7.10";
+ sha256 = "14gggfh1z6p4i8x8pf5744a6jbw7wz7kvdqvlzmmf6rf5cb68a35";
libraryHaskellDepends = [
base base-unicode-symbols containers mtl
];
@@ -80094,8 +80420,8 @@ self: {
}:
mkDerivation {
pname = "graph-rewriting-gl";
- version = "0.7.7";
- sha256 = "0gc0s57qzwxn1jpckg2g9kk6mzzz7zi68czwqrrs6z44bh6mpbks";
+ version = "0.7.8";
+ sha256 = "0fqfylas4y7993riw9vf2ppazk1wgpzxrd8a0avf5s63s0w29hm7";
libraryHaskellDepends = [
AC-Vector base base-unicode-symbols containers GLUT graph-rewriting
graph-rewriting-layout OpenGL
@@ -80113,8 +80439,8 @@ self: {
}:
mkDerivation {
pname = "graph-rewriting-lambdascope";
- version = "0.5.9";
- sha256 = "0qq5yvyjxlsw1w53vpi3vcrvvwa55davjnk60x24hk144asjxarn";
+ version = "0.5.10";
+ sha256 = "0sz87nsn7ff0k63j54rdxp5v9xl926d47fkfa0jjnmdjg1xz2pn4";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -80134,8 +80460,8 @@ self: {
}:
mkDerivation {
pname = "graph-rewriting-layout";
- version = "0.5.5";
- sha256 = "0qf3451pz1rgkh11czls60rajzv91jxs91i3dlvxpyh37xacka0q";
+ version = "0.5.6";
+ sha256 = "0h8inqg673kb6kwvsgl0hi44yil08775rw9l5bq9g8qzldz34z85";
libraryHaskellDepends = [
AC-Vector base base-unicode-symbols graph-rewriting
];
@@ -80151,8 +80477,8 @@ self: {
}:
mkDerivation {
pname = "graph-rewriting-ski";
- version = "0.6.6";
- sha256 = "1w1h5jkf8dk224gv06pkmndv1kpqfjs2f212xm7jh6xwfjfvfciv";
+ version = "0.6.7";
+ sha256 = "1ahwm3dlvy9aaara644m4y0s89xgjcgm2hpkc92z2wmdfydc05g6";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -80171,8 +80497,8 @@ self: {
}:
mkDerivation {
pname = "graph-rewriting-strategies";
- version = "0.2.5";
- sha256 = "16jxrwxyxx4d8dfq6hbi4xdk4bvw61b90j29pviphn6jyfppna6x";
+ version = "0.2.6";
+ sha256 = "0paacz014jvxixqscd2nlny7x4vd735qqw0zbxsyxr3qz9jxjll9";
libraryHaskellDepends = [
base base-unicode-symbols containers graph-rewriting
];
@@ -80189,8 +80515,8 @@ self: {
}:
mkDerivation {
pname = "graph-rewriting-trs";
- version = "0.1.8";
- sha256 = "074g3kl05g85ylg90rwx5xlh6z3kj7f0c7rhj9nbklp55krfyaw2";
+ version = "0.1.9";
+ sha256 = "0wygasyj35sa05vvcmkk8ipdla3zms85pvq48jq1rl2gnk79f2jy";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -80211,8 +80537,8 @@ self: {
}:
mkDerivation {
pname = "graph-rewriting-ww";
- version = "0.3.6";
- sha256 = "12vdwvl06f2ryyr454ibnbsplqnkmsjxi6x3jpx4n7i67sx4w5xj";
+ version = "0.3.7";
+ sha256 = "07fjl05w1lidmwh7iz9km3590ggxncq43rmrhzssn49as7basah8";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -83237,6 +83563,31 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "hackernews_1_1_2_0" = callPackage
+ ({ mkDerivation, aeson, base, hspec, http-client, http-client-tls
+ , http-types, QuickCheck, quickcheck-instances, servant
+ , servant-client, string-conversions, text
+ }:
+ mkDerivation {
+ pname = "hackernews";
+ version = "1.1.2.0";
+ sha256 = "07hsky158rgl3v70vrvfj1babvk9ad3pmasvx5sd932rkdwmz8g5";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base http-client http-types QuickCheck quickcheck-instances
+ servant servant-client string-conversions text
+ ];
+ executableHaskellDepends = [ base http-client http-client-tls ];
+ testHaskellDepends = [
+ aeson base hspec http-client http-client-tls QuickCheck
+ quickcheck-instances
+ ];
+ description = "API for Hacker News";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hackertyper" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -83284,8 +83635,8 @@ self: {
}:
mkDerivation {
pname = "hackport";
- version = "0.5.2";
- sha256 = "0qvwxnmj8x05lkv92al27aa5m35lc0vqblrqckc7al5b2f1qff7s";
+ version = "0.5.3";
+ sha256 = "1ywmrr2frvp3pz4c6dvsp9vqwykhbwbdaykjpsyrjq0idn47akhf";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -83677,8 +84028,8 @@ self: {
}:
mkDerivation {
pname = "haiji";
- version = "0.2.0.0";
- sha256 = "0a7px4z7c102h0ll600k3rz81f4lrbky07zzdz16y5bn72z014hk";
+ version = "0.2.1.0";
+ sha256 = "054iyikik4n2qkpbpc4p1jikj7z6vgvcjhm3ay9mi9zwmz0mb3f8";
libraryHaskellDepends = [
aeson attoparsec base data-default mtl scientific tagged
template-haskell text transformers unordered-containers vector
@@ -84408,6 +84759,7 @@ self: {
homepage = "https://github.com/timjb/halma";
description = "Telegram bot for playing Halma";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"haltavista" = callPackage
@@ -89201,6 +89553,45 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "haskus-binary" = callPackage
+ ({ mkDerivation, base, bytestring, cereal, criterion, haskus-utils
+ , mtl, QuickCheck, tasty, tasty-quickcheck
+ }:
+ mkDerivation {
+ pname = "haskus-binary";
+ version = "0.6.0.0";
+ sha256 = "0r0np4kdvyfslgjqs983dzv4xi5s62splahn2ra55qjbm8lpmps0";
+ libraryHaskellDepends = [
+ base bytestring cereal haskus-utils mtl
+ ];
+ testHaskellDepends = [
+ base bytestring haskus-utils QuickCheck tasty tasty-quickcheck
+ ];
+ benchmarkHaskellDepends = [ base criterion ];
+ homepage = "http://www.haskus.org/system";
+ description = "Haskus binary format manipulation";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "haskus-utils" = callPackage
+ ({ mkDerivation, base, containers, extra, file-embed, list-t, mtl
+ , stm, stm-containers, tasty, tasty-quickcheck, template-haskell
+ , transformers, vector
+ }:
+ mkDerivation {
+ pname = "haskus-utils";
+ version = "0.6.0.0";
+ sha256 = "0hph5305ykz9qbc0dbm043q6m4x9bxzgwdnjqby7f6rir6ks995w";
+ libraryHaskellDepends = [
+ base containers extra file-embed list-t mtl stm stm-containers
+ template-haskell transformers vector
+ ];
+ testHaskellDepends = [ base tasty tasty-quickcheck ];
+ homepage = "http://www.haskus.org/system";
+ description = "Haskus utility modules";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"haslo" = callPackage
({ mkDerivation, base, mtl, old-time, QuickCheck, time, wtk }:
mkDerivation {
@@ -92289,6 +92680,20 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "hexml_0_3_2" = callPackage
+ ({ mkDerivation, base, bytestring, extra }:
+ mkDerivation {
+ pname = "hexml";
+ version = "0.3.2";
+ sha256 = "0vyv45s6nqhbgkzxcgx1ihmif0d7sxmfafqc2xcmcm2vg4jb7ls4";
+ libraryHaskellDepends = [ base bytestring extra ];
+ testHaskellDepends = [ base bytestring ];
+ homepage = "https://github.com/ndmitchell/hexml#readme";
+ description = "XML subset DOM parser";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hexpat" = callPackage
({ mkDerivation, base, bytestring, containers, deepseq, List, text
, transformers, utf8-string
@@ -94498,6 +94903,8 @@ self: {
pname = "hledger";
version = "1.2";
sha256 = "18j7h8km15lyqhhglbxj9gqrhk3r2wh6qv8v3cly05lrlkjvmx06";
+ revision = "1";
+ editedCabalFile = "02ddp8gkx3k36b9n2jywd0pkzvjq8mapc6idxa70az84va3lmnvd";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -94671,6 +95078,8 @@ self: {
pname = "hledger-lib";
version = "1.2";
sha256 = "15yp89q5im3b7fbjz50inkmrgihq16vgbrfkdd6nnnd9n8vxhzrc";
+ revision = "1";
+ editedCabalFile = "0alkb7hd6rvfr5fvlqyqy1ma7fbsfnkn36gnx8dcvij75b1ym0a2";
libraryHaskellDepends = [
array base base-compat blaze-markup bytestring cmdargs containers
csv data-default Decimal deepseq directory filepath hashtables
@@ -94701,6 +95110,8 @@ self: {
pname = "hledger-ui";
version = "1.2";
sha256 = "02mhhhkk6zz3bjcv6x0yhp4f2ifhj3pdk1z4wf6qkwm7jqsamqk1";
+ revision = "1";
+ editedCabalFile = "0ryr7rwf4bc9biwdpn3mjm82jlsr91773a7wsr0xw765mvgxvzbf";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -94747,6 +95158,8 @@ self: {
pname = "hledger-web";
version = "1.2";
sha256 = "1rn5x8h8vn28hk1201v2zzaawc86zkxrlqv8jwiyp2jls3l4m8d3";
+ revision = "1";
+ editedCabalFile = "1l08fzwdn1wqb1f1788rqdqr0znvgfqyb4r82vbjm62dar8qmzcg";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -94875,7 +95288,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "hlint_2_0_7" = callPackage
+ "hlint_2_0_8" = callPackage
({ mkDerivation, ansi-terminal, base, bytestring, cmdargs
, containers, cpphs, directory, extra, filepath, haskell-src-exts
, hscolour, process, refact, text, transformers, uniplate
@@ -94883,8 +95296,8 @@ self: {
}:
mkDerivation {
pname = "hlint";
- version = "2.0.7";
- sha256 = "08dvhdxii1wpgd1rchld35fgm82jzmxxgv2d2km326y5j3n7gaa6";
+ version = "2.0.8";
+ sha256 = "1zdwlyj913cwdi0gfv5wmbqbgsxjg4ypggmkmlzj006sj7qpbn2z";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -95563,6 +95976,42 @@ self: {
license = stdenv.lib.licenses.unfree;
}) {};
+ "hnormalise" = callPackage
+ ({ mkDerivation, aeson, aeson-pretty, attoparsec
+ , attoparsec-iso8601, base, bytestring, conduit
+ , conduit-combinators, conduit-extra, containers, criterion
+ , directory, hspec, hspec-attoparsec, hspec-core
+ , hspec-expectations, ip, optparse-applicative, permute, random
+ , resourcet, text, time, word8, yaml
+ }:
+ mkDerivation {
+ pname = "hnormalise";
+ version = "0.3.1.0";
+ sha256 = "0jrx5xxwpfzvjxj3bzz47csals1sgs99dgn8asqzx2w73d53srl8";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson aeson-pretty attoparsec attoparsec-iso8601 base bytestring
+ containers directory ip permute text time yaml
+ ];
+ executableHaskellDepends = [
+ aeson aeson-pretty attoparsec attoparsec-iso8601 base bytestring
+ conduit conduit-combinators conduit-extra containers directory ip
+ optparse-applicative resourcet text time word8 yaml
+ ];
+ testHaskellDepends = [
+ aeson attoparsec attoparsec-iso8601 base conduit-extra hspec
+ hspec-attoparsec hspec-core hspec-expectations ip text time
+ ];
+ benchmarkHaskellDepends = [
+ attoparsec base criterion random text
+ ];
+ homepage = "https://github.com/itkovian/hnormalise#readme";
+ description = "Log message normalisation tool producing structured JSON messages";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"ho-rewriting" = callPackage
({ mkDerivation, base, compdata, containers, mtl, patch-combinators
}:
@@ -96499,15 +96948,13 @@ self: {
({ mkDerivation, base, bytestring, doctest, HUnit, openssl }:
mkDerivation {
pname = "hopenssl";
- version = "2";
- sha256 = "1mw3wxb18rvfqqsvllgfkpn0wy15vlgqrz0kvqgzwybjy04n8008";
- revision = "1";
- editedCabalFile = "117a56v2p9s69j3f8l0ky0m1vz8xdwwavszp02f37bs6li6pqrdg";
+ version = "2.2";
+ sha256 = "0hypc779yyrf3kgb9ik396zwf83d05x2gvrzr1nhv55pr8m0kvax";
libraryHaskellDepends = [ base bytestring ];
librarySystemDepends = [ openssl ];
testHaskellDepends = [ base doctest HUnit ];
homepage = "http://github.com/peti/hopenssl";
- description = "FFI bindings to OpenSSL's EVP digest interface";
+ description = "FFI Bindings to OpenSSL's EVP Digest Interface";
license = stdenv.lib.licenses.bsd3;
maintainers = with stdenv.lib.maintainers; [ peti ];
}) {inherit (pkgs) openssl;};
@@ -97401,6 +97848,38 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "hpio_0_8_0_9" = callPackage
+ ({ mkDerivation, async, base, base-compat, bytestring, containers
+ , directory, doctest, exceptions, filepath, hlint, hspec, mtl
+ , mtl-compat, optparse-applicative, QuickCheck, text, transformers
+ , transformers-compat, unix, unix-bytestring
+ }:
+ mkDerivation {
+ pname = "hpio";
+ version = "0.8.0.9";
+ sha256 = "1yr86m9zw3kbhb6wl2i3ikkvhzkzrlswgvan8wpyvd5chp4vxjm7";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base base-compat bytestring containers directory exceptions
+ filepath mtl mtl-compat QuickCheck text transformers
+ transformers-compat unix unix-bytestring
+ ];
+ executableHaskellDepends = [
+ async base base-compat exceptions mtl mtl-compat
+ optparse-applicative transformers transformers-compat
+ ];
+ testHaskellDepends = [
+ async base base-compat bytestring containers directory doctest
+ exceptions filepath hlint hspec mtl mtl-compat QuickCheck text
+ transformers transformers-compat unix unix-bytestring
+ ];
+ homepage = "https://github.com/quixoftic/hpio";
+ description = "Monads for GPIO in Haskell";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hplayground" = callPackage
({ mkDerivation, base, containers, data-default, haste-compiler
, haste-perch, monads-tf, transformers
@@ -97696,37 +98175,6 @@ self: {
}) {};
"hquantlib" = callPackage
- ({ mkDerivation, base, containers, hmatrix, hmatrix-gsl
- , hmatrix-special, HUnit, mersenne-random, parallel, QuickCheck
- , statistics, test-framework, test-framework-hunit
- , test-framework-quickcheck2, time, vector, vector-algorithms
- }:
- mkDerivation {
- pname = "hquantlib";
- version = "0.0.3.3";
- sha256 = "0a4cszl77arpk4vcgkdn8s57cvqniqy6454jw2qg7xaaibv3k210";
- revision = "2";
- editedCabalFile = "1zyvr1rgasymap5zbj16nbg8klshwm43842f8y0y56779ynai4vy";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- base containers hmatrix hmatrix-gsl hmatrix-special mersenne-random
- parallel statistics time vector vector-algorithms
- ];
- executableHaskellDepends = [
- base containers mersenne-random parallel
- ];
- testHaskellDepends = [
- base HUnit QuickCheck test-framework test-framework-hunit
- test-framework-quickcheck2
- ];
- homepage = "http://github.com/paulrzcz/hquantlib.git";
- description = "HQuantLib is a port of essencial parts of QuantLib to Haskell";
- license = "LGPL";
- hydraPlatforms = stdenv.lib.platforms.none;
- }) {};
-
- "hquantlib_0_0_4_0" = callPackage
({ mkDerivation, base, containers, hmatrix, hmatrix-gsl
, hmatrix-special, HUnit, mersenne-random-pure64, parallel
, QuickCheck, random, statistics, test-framework
@@ -98247,6 +98695,26 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) mesos; inherit (pkgs) protobuf;};
+ "hs-multiaddr" = callPackage
+ ({ mkDerivation, base, bytes, bytestring, cereal, either-unwrap
+ , filepath, hspec, iproute, multihash, sandi
+ }:
+ mkDerivation {
+ pname = "hs-multiaddr";
+ version = "0.1.0.1";
+ sha256 = "0bac505a3fvz46zbh60vl0m6jj5snjbmj925vxhv6bpdydidi8hw";
+ libraryHaskellDepends = [
+ base bytes bytestring cereal filepath iproute multihash sandi
+ ];
+ testHaskellDepends = [
+ base bytestring either-unwrap hspec iproute multihash sandi
+ ];
+ homepage = "https://github.com/MatrixAI/haskell-multiaddr#readme";
+ description = "Multiaddr Library for LibP2P";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"hs-nombre-generator" = callPackage
({ mkDerivation, base, HandsomeSoup, hxt, random }:
mkDerivation {
@@ -100308,6 +100776,8 @@ self: {
pname = "hspec-core";
version = "2.4.3";
sha256 = "0mg1144azwhrvk6224qnn7gbjyqlpq4kbxqns0hh4gwvg4s6z7bw";
+ revision = "1";
+ editedCabalFile = "0shqhsss67lhp2kn7spjn9ngfhlf6cnsrn66s6h1wk4f9k24lf5v";
libraryHaskellDepends = [
ansi-terminal array async base call-stack deepseq directory
filepath hspec-expectations HUnit QuickCheck quickcheck-io random
@@ -101499,6 +101969,7 @@ self: {
homepage = "https://github.com/marcelmoosbrugger/hsudoku";
description = "Sudoku game with a GTK3 interface";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"hsverilog" = callPackage
@@ -101691,14 +102162,14 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {inherit (pkgs) taglib;};
- "htaglib_1_1_0" = callPackage
+ "htaglib_1_1_1" = callPackage
({ mkDerivation, base, bytestring, directory, filepath, hspec
, taglib, text, transformers
}:
mkDerivation {
pname = "htaglib";
- version = "1.1.0";
- sha256 = "007zk5y9j404w3hfj39bxhkf64x7af02qvsyiz4d88v82ggwklp2";
+ version = "1.1.1";
+ sha256 = "0a4rzw1343zixkmdy84bg7j35qxbnpx7pjr23857cil906wi33r3";
libraryHaskellDepends = [ base bytestring text transformers ];
librarySystemDepends = [ taglib ];
testHaskellDepends = [ base directory filepath hspec ];
@@ -105736,6 +106207,29 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "identicon_0_2_2" = callPackage
+ ({ mkDerivation, base, bytestring, criterion, hspec, JuicyPixels
+ , QuickCheck, random, tf-random
+ }:
+ mkDerivation {
+ pname = "identicon";
+ version = "0.2.2";
+ sha256 = "0qzj2063sh7phbqyxqxf96avz1zcwd1ry06jdqxwkg55q3yb8y9n";
+ revision = "1";
+ editedCabalFile = "0jlm9cmw0ycbyifab7bzkmykj8w7vn2wyc6pfadfjrhb76zyvcxr";
+ libraryHaskellDepends = [ base bytestring JuicyPixels ];
+ testHaskellDepends = [
+ base bytestring hspec JuicyPixels QuickCheck
+ ];
+ benchmarkHaskellDepends = [
+ base bytestring criterion JuicyPixels random tf-random
+ ];
+ homepage = "https://github.com/mrkkrp/identicon";
+ description = "Flexible generation of identicons";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"identifiers" = callPackage
({ mkDerivation, base, binary, bytestring, cereal, containers
, criterion, deepseq, hashable, ListLike, QuickCheck
@@ -108808,8 +109302,8 @@ self: {
pname = "io-streams-haproxy";
version = "1.0.0.1";
sha256 = "0zwjdsg1pcxzd8s0d308q4jhx0pfrk2aq8q039gs8k9y8h9cbh64";
- revision = "1";
- editedCabalFile = "0jyv2d0llc63lnlz263n41lcc1pcq7kicq6g3cc99i8s1p38bz48";
+ revision = "2";
+ editedCabalFile = "1zm580jcncmh667k51k47xwwhd171r3f0h00d25hi6isq812ia40";
libraryHaskellDepends = [
attoparsec base bytestring io-streams network transformers
];
@@ -111599,6 +112093,28 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "json-feed" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, filepath, hspec
+ , mime-types, network-uri, tagsoup, text, time
+ }:
+ mkDerivation {
+ pname = "json-feed";
+ version = "0.0.1";
+ sha256 = "1y37dbifc3q9lr4d0vr9s6r8xf4yzbvrs8cr9pwxh964h84j9h0s";
+ revision = "1";
+ editedCabalFile = "0sxsa637qm6434n7h12flfm71xfc0swyrljf2s9ayaknvwzxdmjq";
+ libraryHaskellDepends = [
+ aeson base bytestring mime-types network-uri tagsoup text time
+ ];
+ testHaskellDepends = [
+ aeson base bytestring filepath hspec mime-types network-uri tagsoup
+ text time
+ ];
+ homepage = "https://github.com/tfausak/json-feed#readme";
+ description = "JSON Feed";
+ license = stdenv.lib.licenses.mit;
+ }) {};
+
"json-fu" = callPackage
({ mkDerivation, aeson, attoparsec, base, bytestring, containers
, hashable, hspec, mtl, syb, text, time, unordered-containers
@@ -114395,6 +114911,22 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "lackey_0_4_3" = callPackage
+ ({ mkDerivation, base, servant, servant-foreign, tasty, tasty-hspec
+ , text
+ }:
+ mkDerivation {
+ pname = "lackey";
+ version = "0.4.3";
+ sha256 = "07n5acnrwy991qsx0bg1hbpxky0nxwybnh1zs08n4jmbl10rvsrs";
+ libraryHaskellDepends = [ base servant servant-foreign text ];
+ testHaskellDepends = [ base servant tasty tasty-hspec text ];
+ homepage = "https://github.com/tfausak/lackey#readme";
+ description = "Generate Ruby clients from Servant APIs";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"lagrangian" = callPackage
({ mkDerivation, ad, base, hmatrix, HUnit, nonlinear-optimization
, test-framework, test-framework-hunit, test-framework-quickcheck2
@@ -115042,8 +115574,8 @@ self: {
}:
mkDerivation {
pname = "lambdacube-gl";
- version = "0.5.2.3";
- sha256 = "0ayxfz35gwrwk9jqfdzv1fyp067kx2c2xpd7rcsc2lspbvkvscxy";
+ version = "0.5.2.4";
+ sha256 = "1qbf81fv66l0d0j2n1zlf3l2wlmr0wby0j4ckkims2biyzf9pflx";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -115179,8 +115711,8 @@ self: {
}:
mkDerivation {
pname = "lame";
- version = "0.1.0";
- sha256 = "0k1fd58gsr71mbm7yfwhcc88944m7qk7yc3wazwnlagfpa2wlwmg";
+ version = "0.1.1";
+ sha256 = "0j35zpfhppb09m6h23awxgsawisvgsnrw7d99f5z3xq2bjihjq5k";
libraryHaskellDepends = [
base bytestring data-default-class directory exceptions filepath
text transformers wave
@@ -118038,25 +118570,27 @@ self: {
({ mkDerivation, aeson, base, base-unicode-symbols, binary
, boomerang, bytestring, concurrent-machines, containers
, containers-unicode-symbols, contravariant, data-textual, dns
- , exceptions, filepath, hjsonschema, lens, machines, managed
- , monad-control, mtl, network, network-ip, parsers, pathtype
- , protolude, QuickCheck, random, semigroups, stm, stm-containers
- , temporary, test-framework, test-framework-quickcheck2
- , test-framework-th, text, text-icu, text-icu-normalized
- , text-printer, time, transformers, zippers
+ , exceptions, filepath, hjsonschema, lens, lifted-async, machines
+ , managed, monad-control, mtl, network, network-ip, parsers
+ , pathtype, protolude, QuickCheck, random, semigroups, stm
+ , stm-chans, stm-containers, temporary, test-framework
+ , test-framework-quickcheck2, test-framework-th, text, text-icu
+ , text-icu-normalized, text-printer, time, transformers
+ , transformers-base, zippers
}:
mkDerivation {
pname = "liblawless";
- version = "0.21.3";
- sha256 = "042hk5lck8pp2zkpsqvr96lpaxnm7r0ai9nk0mhzxbq7x4hb6bd7";
+ version = "0.23.1";
+ sha256 = "190lw6ppqszfzx48y7f8l5yywz1zb98wrr4yjzvpvgiabazjbh5i";
libraryHaskellDepends = [
aeson base base-unicode-symbols binary boomerang bytestring
concurrent-machines containers containers-unicode-symbols
- contravariant data-textual dns exceptions hjsonschema lens machines
- managed monad-control mtl network network-ip parsers pathtype
- protolude QuickCheck random semigroups stm stm-containers temporary
- text text-icu text-icu-normalized text-printer time transformers
- zippers
+ contravariant data-textual dns exceptions hjsonschema lens
+ lifted-async machines managed monad-control mtl network network-ip
+ parsers pathtype protolude QuickCheck random semigroups stm
+ stm-chans stm-containers temporary text text-icu
+ text-icu-normalized text-printer time transformers
+ transformers-base zippers
];
testHaskellDepends = [
aeson base binary bytestring exceptions filepath QuickCheck
@@ -118312,6 +118846,7 @@ self: {
homepage = "https://github.com/portnov/libssh2-hs";
description = "FFI bindings to libssh2 SSH2 client library (http://libssh2.org/)";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) libssh2; ssh2 = null;};
"libssh2-conduit" = callPackage
@@ -118854,6 +119389,7 @@ self: {
homepage = "https://oss.xkcd.com/";
description = "Zen gardening, based on l-systems";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"lindenmayer" = callPackage
@@ -118892,7 +119428,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "line_3_0_1" = callPackage
+ "line_3_1_0" = callPackage
({ mkDerivation, aeson, base, base64-bytestring, bytestring
, cryptohash-sha256, hspec, hspec-wai, http-conduit, http-types
, QuickCheck, quickcheck-instances, raw-strings-qq, scotty, text
@@ -118900,8 +119436,8 @@ self: {
}:
mkDerivation {
pname = "line";
- version = "3.0.1";
- sha256 = "0fc2g3mcb4x2vmdsm80zfia96r6cwyiifavvvfs0jr4gccman6q1";
+ version = "3.1.0";
+ sha256 = "0s5cp8si8iabbm53jsicy158xym6jpxllykfwjsn1c13kydq40by";
libraryHaskellDepends = [
aeson base base64-bytestring bytestring cryptohash-sha256
http-conduit http-types scotty text time transformers wai
@@ -119680,7 +120216,6 @@ self: {
homepage = "https://github.com/ucsd-progsys/liquid-fixpoint";
description = "Predicate Abstraction-based Horn-Clause/Implication Constraint Solver";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) ocaml; inherit (pkgs) z3;};
"liquidhaskell" = callPackage
@@ -119721,7 +120256,6 @@ self: {
homepage = "https://github.com/ucsd-progsys/liquidhaskell";
description = "Liquid Types for Haskell";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) z3;};
"liquidhaskell-cabal" = callPackage
@@ -121342,6 +121876,7 @@ self: {
homepage = "https://github.com/peti/logging-facade-syslog#readme";
description = "A logging back-end to syslog(3) for the logging-facade library";
license = stdenv.lib.licenses.bsd3;
+ maintainers = with stdenv.lib.maintainers; [ peti ];
}) {};
"logic-TPTP" = callPackage
@@ -122806,6 +123341,8 @@ self: {
pname = "machines";
version = "0.6.2";
sha256 = "0p346dr68qmaiyhfn697nb13fwl07f5b945bihfwk7r8pjsl6l0w";
+ revision = "1";
+ editedCabalFile = "1aj0admkxs91x3bax0rsz073m8rpfingrwggj3hi4f7zprmynjj1";
setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
adjunctions base comonad containers distributive mtl pointed
@@ -122822,21 +123359,21 @@ self: {
}) {};
"machines-amazonka" = callPackage
- ({ mkDerivation, amazonka, amazonka-core, amazonka-ec2, amazonka-s3
- , amazonka-sts, base, concurrent-machines, containers, exceptions
- , focus, free, hashable, liblawless, lifted-async, list-t
- , monad-control, mtl, resourcet, stm, stm-containers, time
- , transformers
+ ({ mkDerivation, amazonka, amazonka-autoscaling, amazonka-core
+ , amazonka-ec2, amazonka-s3, amazonka-sts, base
+ , concurrent-machines, containers, exceptions, focus, free
+ , hashable, liblawless, lifted-async, list-t, monad-control, mtl
+ , resourcet, stm, stm-containers, time, transformers
}:
mkDerivation {
pname = "machines-amazonka";
- version = "0.6.2";
- sha256 = "0x0g8ff3dz8wasl6abv9hz6p34j4kln17snmgx5pdrmwqbgv9hfy";
+ version = "0.7.1";
+ sha256 = "02gqv35ld86gncjryi756zv5991qq7x9f535azs010b8y6mngvgk";
libraryHaskellDepends = [
- amazonka amazonka-core amazonka-ec2 amazonka-s3 amazonka-sts base
- concurrent-machines containers exceptions focus free hashable
- liblawless lifted-async list-t monad-control mtl resourcet stm
- stm-containers time transformers
+ amazonka amazonka-autoscaling amazonka-core amazonka-ec2
+ amazonka-s3 amazonka-sts base concurrent-machines containers
+ exceptions focus free hashable liblawless lifted-async list-t
+ monad-control mtl resourcet stm stm-containers time transformers
];
description = "Machine transducers for Amazonka calls";
license = stdenv.lib.licenses.gpl3;
@@ -124664,6 +125201,88 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "matterhorn" = callPackage
+ ({ mkDerivation, base, base-compat, brick, bytestring, cheapskate
+ , checkers, config-ini, connection, containers, directory, filepath
+ , gitrev, hashable, Hclip, mattermost-api, mattermost-api-qc
+ , microlens-platform, mtl, process, quickcheck-text, stm, strict
+ , string-conversions, tasty, tasty-hunit, tasty-quickcheck
+ , temporary, text, text-zipper, time, transformers, Unique
+ , unordered-containers, utf8-string, vector, vty, xdg-basedir
+ }:
+ mkDerivation {
+ pname = "matterhorn";
+ version = "30802.1.0";
+ sha256 = "0sn8r6yaq2mc034dp9ib5gfcvw30p1a2frqkcmk9f9bjk22r5ix9";
+ revision = "2";
+ editedCabalFile = "1jrnxx144ckngbvk7sr3sw9im8a2w57dzqwzvdpxr2ql3hanwf2c";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ base base-compat brick bytestring cheapskate config-ini connection
+ containers directory filepath gitrev hashable Hclip mattermost-api
+ microlens-platform mtl process stm strict temporary text
+ text-zipper time transformers unordered-containers utf8-string
+ vector vty xdg-basedir
+ ];
+ testHaskellDepends = [
+ base base-compat brick bytestring cheapskate checkers config-ini
+ connection containers directory filepath hashable Hclip
+ mattermost-api mattermost-api-qc microlens-platform mtl process
+ quickcheck-text stm strict string-conversions tasty tasty-hunit
+ tasty-quickcheck text text-zipper time transformers Unique
+ unordered-containers vector vty xdg-basedir
+ ];
+ description = "Terminal client for the MatterMost chat system";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "mattermost-api" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, connection, containers
+ , cryptonite, gitrev, hashable, HTTP, HUnit, memory, microlens
+ , microlens-th, mtl, network-uri, pretty-show, process, stm, tasty
+ , tasty-hunit, template-haskell, text, time, unordered-containers
+ , websockets
+ }:
+ mkDerivation {
+ pname = "mattermost-api";
+ version = "30802.1.0";
+ sha256 = "0bbg37aj6jxrdvy1zx9q143s7gjhx5dnba9y8vyjcfgypyzlggsv";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base bytestring connection containers cryptonite gitrev
+ hashable HTTP memory microlens microlens-th network-uri pretty-show
+ process stm template-haskell text time unordered-containers
+ websockets
+ ];
+ testHaskellDepends = [
+ aeson base containers HUnit mtl pretty-show stm tasty tasty-hunit
+ text unordered-containers
+ ];
+ description = "Client API for MatterMost chat system";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "mattermost-api-qc" = callPackage
+ ({ mkDerivation, base, containers, mattermost-api, QuickCheck, text
+ , time
+ }:
+ mkDerivation {
+ pname = "mattermost-api-qc";
+ version = "30802.1.0";
+ sha256 = "0rld7i62z66w0c0jfrk6kj7a8ha6hczmavdy3qss14p3z651l8p3";
+ libraryHaskellDepends = [
+ base containers mattermost-api QuickCheck text time
+ ];
+ homepage = "https://github.com/matterhorn-chat/mattermost-api-qc";
+ description = "QuickCheck instances for the Mattermost client API library";
+ license = stdenv.lib.licenses.isc;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"maude" = callPackage
({ mkDerivation, base, directory, filepath, process, process-extras
, temporary, text, xml
@@ -124888,6 +125507,7 @@ self: {
];
description = "Bindings to mcl, a generic and fast pairing-based cryptography library";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) gmpxx; mcl = null; inherit (pkgs) openssl;};
"mcm" = callPackage
@@ -125463,6 +126083,8 @@ self: {
pname = "megaparsec";
version = "5.3.0";
sha256 = "0lpf3f24lyid1chb2hrxiw97kciww844wzkp910zj811b6pbm6rs";
+ revision = "1";
+ editedCabalFile = "185fy44b3ivblh7hw2d18r494g0b4m9wp02m5ms85f8b57r90jws";
libraryHaskellDepends = [
base bytestring containers deepseq exceptions mtl QuickCheck
scientific text transformers
@@ -125496,14 +126118,14 @@ self: {
}:
mkDerivation {
pname = "mellon-core";
- version = "0.7.1.0";
- sha256 = "0nj2glhlmgc7mipqbjzcdy0bkdsr78gw930b9vp893ak66wvfca3";
+ version = "0.7.1.1";
+ sha256 = "1s3a5wkfi9pjxgsg92cx5sgf8kwlvc423414k679b2il97ff1cwf";
libraryHaskellDepends = [ async base mtl time transformers ];
testHaskellDepends = [
async base doctest hlint hspec mtl QuickCheck quickcheck-instances
time transformers
];
- homepage = "https://github.com/dhess/mellon/";
+ homepage = "https://github.com/quixoftic/mellon/";
description = "Control physical access devices";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -125513,11 +126135,11 @@ self: {
({ mkDerivation, base, hlint, hpio, mellon-core }:
mkDerivation {
pname = "mellon-gpio";
- version = "0.7.1.0";
- sha256 = "153dmi0l7xf2gj3abd8i4apjhnmvapsc0m36ias3madk40vyi89a";
+ version = "0.7.1.1";
+ sha256 = "0mq5p462rm8h2nwkdqhwfndi3qqjcqb30hwlpa8ms3d4bjn8xdan";
libraryHaskellDepends = [ base hpio mellon-core ];
testHaskellDepends = [ base hlint ];
- homepage = "https://github.com/dhess/mellon/";
+ homepage = "https://github.com/quixoftic/mellon/";
description = "GPIO support for mellon";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -125535,8 +126157,8 @@ self: {
}:
mkDerivation {
pname = "mellon-web";
- version = "0.7.1.0";
- sha256 = "114g7wj5sfm5qc1yi4z8hz9j65chgp65zdqkgn2wb8zx9grnjsmh";
+ version = "0.7.1.1";
+ sha256 = "0x9pj12lfk2yk18rp81s6dvh70rybrzcwclnwxwsqvfza3p3kpzc";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -125557,7 +126179,7 @@ self: {
servant-lucid servant-server servant-swagger servant-swagger-ui
swagger2 text time transformers wai wai-extra warp
];
- homepage = "https://github.com/dhess/mellon/";
+ homepage = "https://github.com/quixoftic/mellon/";
description = "A REST web service for Mellon controllers";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
@@ -126415,6 +127037,27 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "microstache" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, containers, deepseq
+ , directory, filepath, hspec, parsec, text, transformers
+ , unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "microstache";
+ version = "1";
+ sha256 = "0r3ia4hamyrij4vdaa6vnfwhgv40xr4g9wcigi6yhm4ymkz5p1z8";
+ libraryHaskellDepends = [
+ aeson base bytestring containers deepseq directory filepath parsec
+ text transformers unordered-containers vector
+ ];
+ testHaskellDepends = [
+ aeson base bytestring containers hspec parsec text
+ ];
+ homepage = "https://github.com/phadej/microstache";
+ description = "Mustache templates for Haskell";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"microtimer" = callPackage
({ mkDerivation, base, time }:
mkDerivation {
@@ -127445,6 +128088,20 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "mmorph_1_1_0" = callPackage
+ ({ mkDerivation, base, mtl, transformers, transformers-compat }:
+ mkDerivation {
+ pname = "mmorph";
+ version = "1.1.0";
+ sha256 = "1pklvg28hjfsq5r66x4igjrxbdq0l74g6lirrvsh6ckmc1av9g61";
+ libraryHaskellDepends = [
+ base mtl transformers transformers-compat
+ ];
+ description = "Monad morphisms";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"mmtf" = callPackage
({ mkDerivation, base, binary, bytestring, containers, data-msgpack
, hspec, QuickCheck, text
@@ -129770,6 +130427,38 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "morte_1_6_7" = callPackage
+ ({ mkDerivation, alex, array, base, binary, code-page, containers
+ , criterion, deepseq, Earley, http-client, http-client-tls
+ , microlens, microlens-mtl, mtl, optparse-applicative, pipes
+ , QuickCheck, system-fileio, system-filepath, tasty, tasty-hunit
+ , tasty-quickcheck, text, text-format, transformers
+ }:
+ mkDerivation {
+ pname = "morte";
+ version = "1.6.7";
+ sha256 = "16h33fk02zyjf73xvz73p5aqvvv2i6ax8b42fv87rybabsa3h0j5";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ array base binary containers deepseq Earley http-client
+ http-client-tls microlens microlens-mtl pipes system-fileio
+ system-filepath text text-format transformers
+ ];
+ libraryToolDepends = [ alex ];
+ executableHaskellDepends = [
+ base code-page optparse-applicative text text-format
+ ];
+ testHaskellDepends = [
+ base mtl QuickCheck system-filepath tasty tasty-hunit
+ tasty-quickcheck text transformers
+ ];
+ benchmarkHaskellDepends = [ base criterion system-filepath text ];
+ description = "A bare-bones calculus of constructions";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"mosaico-lib" = callPackage
({ mkDerivation, base, base-unicode-symbols, colour, diagrams-cairo
, diagrams-core, diagrams-gtk, diagrams-lib, glib, gtk, JuicyPixels
@@ -131441,7 +132130,7 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "mustache_2_2_2" = callPackage
+ "mustache_2_2_3" = callPackage
({ mkDerivation, aeson, base, base-unicode-symbols, bytestring
, cmdargs, containers, directory, either, filepath, hspec, lens
, mtl, parsec, process, scientific, tar, template-haskell
@@ -131450,8 +132139,8 @@ self: {
}:
mkDerivation {
pname = "mustache";
- version = "2.2.2";
- sha256 = "1sn8agk413ngibh1zi96vqbc8j9p3hfrkirbz6vc8xpr4060rzdc";
+ version = "2.2.3";
+ sha256 = "1gy21h97ckjy7lkncm7zyn7bfcpyj488cc7cqy65qapryr9sa5aj";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -131893,6 +132582,31 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "mysql-haskell_0_8_1_0" = callPackage
+ ({ mkDerivation, base, binary, binary-ieee754, binary-parsers
+ , blaze-textual, bytestring, bytestring-lexing, cryptonite
+ , io-streams, memory, monad-loops, network, scientific, tasty
+ , tasty-hunit, tcp-streams, text, time, tls, vector, wire-streams
+ , word24
+ }:
+ mkDerivation {
+ pname = "mysql-haskell";
+ version = "0.8.1.0";
+ sha256 = "02nxfm3y7f24gqs4hac5pk2q32l0xvaspby6n56zcrdwmpfs3241";
+ libraryHaskellDepends = [
+ base binary binary-ieee754 binary-parsers blaze-textual bytestring
+ bytestring-lexing cryptonite io-streams memory monad-loops network
+ scientific tcp-streams text time tls vector wire-streams word24
+ ];
+ testHaskellDepends = [
+ base bytestring io-streams tasty tasty-hunit text time vector
+ ];
+ homepage = "https://github.com/winterland1989/mysql-haskell";
+ description = "pure haskell MySQL driver";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"mysql-haskell-nem" = callPackage
({ mkDerivation, base, bytestring, io-streams, mysql-haskell
, scientific, text, time
@@ -134640,8 +135354,8 @@ self: {
({ mkDerivation, async, base, bytestring, template-haskell, unix }:
mkDerivation {
pname = "ngx-export";
- version = "0.3.0.0";
- sha256 = "0mr6mvii02cpd6c6bjhnb0zk7qzf8mkzhi7xclm0cffpwks2g1q6";
+ version = "0.3.2.1";
+ sha256 = "0rmvws1k58iqlcb0h0089l4niki1v90hr15mifjj2jbzrmlas26n";
libraryHaskellDepends = [
async base bytestring template-haskell unix
];
@@ -135268,6 +135982,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "nonce_1_0_3" = callPackage
+ ({ mkDerivation, base, base64-bytestring, bytestring, cryptonite
+ , text, transformers
+ }:
+ mkDerivation {
+ pname = "nonce";
+ version = "1.0.3";
+ sha256 = "03y4365ljd79wl2gfvlplkdirvvd7lai8mqblssnd413fl56dvw5";
+ libraryHaskellDepends = [
+ base base64-bytestring bytestring cryptonite text transformers
+ ];
+ homepage = "https://github.com/prowdsponsor/nonce";
+ description = "Generate cryptographic nonces";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"nondeterminism" = callPackage
({ mkDerivation, base, containers, mtl, tasty, tasty-hunit }:
mkDerivation {
@@ -139130,6 +139861,20 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "pagination_0_2_0" = callPackage
+ ({ mkDerivation, base, deepseq, exceptions, hspec, QuickCheck }:
+ mkDerivation {
+ pname = "pagination";
+ version = "0.2.0";
+ sha256 = "04jzwg9r0f8rza9zkzqfynx76snfw54kppfk9z5bjgqw6pqpx2jh";
+ libraryHaskellDepends = [ base deepseq exceptions ];
+ testHaskellDepends = [ base exceptions hspec QuickCheck ];
+ homepage = "https://github.com/mrkkrp/pagination";
+ description = "Framework-agnostic pagination boilerplate";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"pagure-hook-receiver" = callPackage
({ mkDerivation, base, containers, scotty, shelly, text
, transformers, unix
@@ -139575,6 +140320,25 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "pang-a-lambda" = callPackage
+ ({ mkDerivation, base, bytestring, containers, IfElse, mtl, SDL
+ , SDL-gfx, SDL-ttf, transformers, Yampa
+ }:
+ mkDerivation {
+ pname = "pang-a-lambda";
+ version = "0.2.0.0";
+ sha256 = "0cnz4n2vywj4w9cnj7kh6jml6k29li9wnaifnwn69b6883043iwm";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ base bytestring containers IfElse mtl SDL SDL-gfx SDL-ttf
+ transformers Yampa
+ ];
+ description = "A super-pang clone";
+ license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"pango" = callPackage
({ mkDerivation, array, base, Cabal, cairo, containers, directory
, filepath, glib, gtk2hs-buildtools, mtl, pango, pretty, process
@@ -139637,6 +140401,7 @@ self: {
homepage = "http://chriswarbo.net/essays/activecode";
description = "Pandoc filter to execute code blocks";
license = stdenv.lib.licenses.publicDomain;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"pansite" = callPackage
@@ -140746,6 +141511,8 @@ self: {
pname = "parsers";
version = "0.12.4";
sha256 = "07najh7f9y3ahh42z96sw4hnd0kc4x3wm0xlf739y0gh81ys5097";
+ revision = "1";
+ editedCabalFile = "1y63jydbb5jsxj66ac0wljk0dyg4prrn2ik1rm636v9g0s8lf2di";
libraryHaskellDepends = [
attoparsec base base-orphans charset containers parsec scientific
text transformers unordered-containers
@@ -141000,28 +141767,6 @@ self: {
}) {};
"patat" = callPackage
- ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base
- , bytestring, containers, directory, filepath, highlighting-kate
- , mtl, optparse-applicative, pandoc, terminal-size, text, time
- , unordered-containers, yaml
- }:
- mkDerivation {
- pname = "patat";
- version = "0.5.1.2";
- sha256 = "0yx5g8kl02abj51mql45c5jv78f367dx42kbb5z992sba7j0q93r";
- isLibrary = false;
- isExecutable = true;
- executableHaskellDepends = [
- aeson ansi-terminal ansi-wl-pprint base bytestring containers
- directory filepath highlighting-kate mtl optparse-applicative
- pandoc terminal-size text time unordered-containers yaml
- ];
- homepage = "http://github.com/jaspervdj/patat";
- description = "Terminal-based presentations using Pandoc";
- license = stdenv.lib.licenses.gpl2;
- }) {};
-
- "patat_0_5_2_0" = callPackage
({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base
, bytestring, containers, directory, filepath, mtl
, optparse-applicative, pandoc, skylighting, terminal-size, text
@@ -141041,7 +141786,6 @@ self: {
homepage = "http://github.com/jaspervdj/patat";
description = "Terminal-based presentations using Pandoc";
license = stdenv.lib.licenses.gpl2;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"patch-combinators" = callPackage
@@ -142506,26 +143250,6 @@ self: {
}) {};
"persistent-mysql" = callPackage
- ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit
- , containers, monad-control, monad-logger, mysql, mysql-simple
- , persistent, resource-pool, resourcet, text, transformers
- }:
- mkDerivation {
- pname = "persistent-mysql";
- version = "2.6.0.1";
- sha256 = "1gjci54yv8kk0i3sqq4n70wp7j7bww98zdxwf7clw23wa42ihyvc";
- libraryHaskellDepends = [
- aeson base blaze-builder bytestring conduit containers
- monad-control monad-logger mysql mysql-simple persistent
- resource-pool resourcet text transformers
- ];
- homepage = "http://www.yesodweb.com/book/persistent";
- description = "Backend for the persistent library using MySQL database server";
- license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
- }) {};
-
- "persistent-mysql_2_6_0_2" = callPackage
({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit
, containers, monad-control, monad-logger, mysql, mysql-simple
, persistent, resource-pool, resourcet, text, transformers
@@ -142704,8 +143428,8 @@ self: {
}:
mkDerivation {
pname = "persistent-relational-record";
- version = "0.1.0.0";
- sha256 = "0w48b8n5w97wxg76br9n61l4hpyl5p8vbnrhkjg8hg5zra5qbddj";
+ version = "0.1.1.0";
+ sha256 = "145am29vwjvvs93z8kqj4dgh71h64ascmqnd70w9g9qszb2rjwrm";
libraryHaskellDepends = [
base conduit containers mtl persistable-record persistent
relational-query resourcet template-haskell text
@@ -143759,6 +144483,30 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "pipes_4_3_4" = callPackage
+ ({ mkDerivation, base, criterion, exceptions, mmorph, mtl
+ , optparse-applicative, QuickCheck, test-framework
+ , test-framework-quickcheck2, transformers, void
+ }:
+ mkDerivation {
+ pname = "pipes";
+ version = "4.3.4";
+ sha256 = "08am4yxn0f2aizyh34g6nwm7l9i2bxd0s38dsfwqm6h0sdvfsffb";
+ libraryHaskellDepends = [
+ base exceptions mmorph mtl transformers void
+ ];
+ testHaskellDepends = [
+ base mtl QuickCheck test-framework test-framework-quickcheck2
+ transformers
+ ];
+ benchmarkHaskellDepends = [
+ base criterion mtl optparse-applicative transformers
+ ];
+ description = "Compositional pipelines";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"pipes-aeson" = callPackage
({ mkDerivation, aeson, attoparsec, base, bytestring, pipes
, pipes-attoparsec, pipes-bytestring, pipes-parse, transformers
@@ -145048,6 +145796,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "plan-b_0_2_1" = callPackage
+ ({ mkDerivation, base, exceptions, hspec, path, path-io
+ , transformers
+ }:
+ mkDerivation {
+ pname = "plan-b";
+ version = "0.2.1";
+ sha256 = "038w0y90k7fn13ba5vrpyxa6vjn03lxqdnd2vgki9hmb4idxiakv";
+ libraryHaskellDepends = [
+ base exceptions path path-io transformers
+ ];
+ testHaskellDepends = [ base hspec path path-io ];
+ homepage = "https://github.com/mrkkrp/plan-b";
+ description = "Failure-tolerant file and directory editing";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"planar-graph" = callPackage
({ mkDerivation, attoparsec, base, blaze-builder, bytestring
, containers, data-clist, deepseq
@@ -145343,6 +146109,8 @@ self: {
pname = "plugins";
version = "1.5.6.0";
sha256 = "1l40i9n4iqsj2pw5kv7p8mkfg9vninplasz27zdgfs4hxd9pxl8q";
+ revision = "1";
+ editedCabalFile = "0l4sx1d9lgs6yr23dq4ccz1la9i94cz4nfvpdkpr5wni40mzl2m3";
libraryHaskellDepends = [
array base Cabal containers directory filepath ghc ghc-paths
ghc-prim haskell-src process random
@@ -146325,6 +147093,27 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "portager" = callPackage
+ ({ mkDerivation, base, containers, directory, filepath, hspec, lens
+ , mtl, optparse-applicative, QuickCheck, text, transformers
+ }:
+ mkDerivation {
+ pname = "portager";
+ version = "0.1.1.0";
+ sha256 = "0yxrld29mp48vv9i301qx0lrpsvbbpwpmsk4vqhg5wygk9qsbsbn";
+ revision = "1";
+ editedCabalFile = "1mak5a3y5ip0n6ygq33cbr132j72qy7acb00k5c2mprx2zp8aq4z";
+ libraryHaskellDepends = [
+ base containers directory filepath lens mtl optparse-applicative
+ text transformers
+ ];
+ testHaskellDepends = [ base containers hspec mtl QuickCheck text ];
+ homepage = "https://github.com/j1r1k/portager";
+ description = "DSL for configuring Gentoo portage";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"portaudio" = callPackage
({ mkDerivation, base, containers, portaudio }:
mkDerivation {
@@ -147067,20 +147856,20 @@ self: {
, base64-bytestring, bytestring, configurator, containers, either
, hasql, hasql-pool, heredoc, hspec, hspec-wai, hspec-wai-json
, http-types, jwt, lens, lens-aeson, optparse-applicative
- , postgresql-libpq, protolude, stm, stm-containers, text, time
- , transformers, unix, unordered-containers, wai, wai-app-static
- , wai-extra, wai-websockets, warp, websockets
+ , postgresql-libpq, protolude, retry, stm, stm-containers, text
+ , time, transformers, unix, unordered-containers, wai
+ , wai-app-static, wai-extra, wai-websockets, warp, websockets
}:
mkDerivation {
pname = "postgrest-ws";
- version = "0.3.1.0";
- sha256 = "10bqq28knvwigvskm294ihzz09s5avlxs4bqpj952cw6fkwb05l2";
+ version = "0.3.2.0";
+ sha256 = "04jj51fhssw4fa050qa8pk559m38kc8mharswidxph52vi6jv051";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson base bytestring either hasql hasql-pool http-types jwt lens
- lens-aeson postgresql-libpq protolude stm stm-containers text time
- unordered-containers wai wai-websockets websockets
+ lens-aeson postgresql-libpq protolude retry stm stm-containers text
+ time unordered-containers wai wai-websockets websockets
];
executableHaskellDepends = [
ansi-wl-pprint auto-update base base64-bytestring bytestring
@@ -147160,8 +147949,8 @@ self: {
}:
mkDerivation {
pname = "postmaster";
- version = "0.3.1";
- sha256 = "0kd9vx7q9fhkdl8wsk3llzdza34vrspnqc6n6ijwxy3v6yvawh2i";
+ version = "0.3.2";
+ sha256 = "1l1hq77qxi1f9nv7bxgkfvcm50p61svqvn9f59aq3b9zj2vikmf6";
isLibrary = false;
isExecutable = true;
executableHaskellDepends = [
@@ -147446,8 +148235,8 @@ self: {
}:
mkDerivation {
pname = "preamble";
- version = "0.0.35";
- sha256 = "17qyffqyjlmi0nlcc73a9jafzxcya7gdpnr047nvk4mfaz31j51a";
+ version = "0.0.37";
+ sha256 = "1qli01x2cbh8sfr4fxbyiq88n28cdmmziaz5qaqa3ii3wm1ajjaf";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -148008,26 +148797,6 @@ self: {
}) {};
"pretty-show" = callPackage
- ({ mkDerivation, array, base, filepath, ghc-prim, happy
- , haskell-lexer, pretty
- }:
- mkDerivation {
- pname = "pretty-show";
- version = "1.6.12";
- sha256 = "1fblcxw4z4ry14brin1mvwccs6hqqlhi7xhwv1f23szjq25cjacn";
- isLibrary = true;
- isExecutable = true;
- libraryHaskellDepends = [
- array base filepath ghc-prim haskell-lexer pretty
- ];
- libraryToolDepends = [ happy ];
- executableHaskellDepends = [ base ];
- homepage = "http://wiki.github.com/yav/pretty-show";
- description = "Tools for working with derived `Show` instances and generic inspection of values";
- license = stdenv.lib.licenses.mit;
- }) {};
-
- "pretty-show_1_6_13" = callPackage
({ mkDerivation, array, base, filepath, ghc-prim, happy
, haskell-lexer, pretty
}:
@@ -148045,7 +148814,6 @@ self: {
homepage = "http://wiki.github.com/yav/pretty-show";
description = "Tools for working with derived `Show` instances and generic inspection of values";
license = stdenv.lib.licenses.mit;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"pretty-simple" = callPackage
@@ -148939,6 +149707,27 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "profiteur_0_4_3_0" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, containers, filepath
+ , ghc-prof, js-jquery, scientific, text, unordered-containers
+ , vector
+ }:
+ mkDerivation {
+ pname = "profiteur";
+ version = "0.4.3.0";
+ sha256 = "1swsy006axh06f1nwvfbvs3rsd1y1733n6b3xyncnc6vifnf7gz2";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [
+ aeson base bytestring containers filepath ghc-prof js-jquery
+ scientific text unordered-containers vector
+ ];
+ homepage = "http://github.com/jaspervdj/profiteur";
+ description = "Treemap visualiser for GHC prof files";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"profunctor-extras" = callPackage
({ mkDerivation, base, profunctors }:
mkDerivation {
@@ -151878,6 +152667,19 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "quickcheck-unicode_1_0_1_0" = callPackage
+ ({ mkDerivation, base, QuickCheck }:
+ mkDerivation {
+ pname = "quickcheck-unicode";
+ version = "1.0.1.0";
+ sha256 = "0s43s1bzbg3gwsjgm7fpyksd1339f0m26dlw2famxwyzgvm0a80k";
+ libraryHaskellDepends = [ base QuickCheck ];
+ homepage = "https://github.com/bos/quickcheck-unicode";
+ description = "Generator and shrink functions for testing Unicode-related software";
+ license = stdenv.lib.licenses.bsd2;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"quickcheck-webdriver" = callPackage
({ mkDerivation, base, QuickCheck, transformers, webdriver }:
mkDerivation {
@@ -152510,6 +153312,7 @@ self: {
homepage = "http://github.com/iconnect/rails-session#readme";
description = "Decrypt Ruby on Rails sessions in Haskell";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"rainbow" = callPackage
@@ -152753,8 +153556,8 @@ self: {
}:
mkDerivation {
pname = "random-bytestring";
- version = "0.0.1";
- sha256 = "1h2s7zjv1p8bhn49q3hcv7kiw5bs5qlqvjlzcmy36kmzc9x9wsrw";
+ version = "0.1.0";
+ sha256 = "0v4fmns5qji5mb0grnghl2yv5l4rg29319f1d1d7kcz9qwz9qwrd";
libraryHaskellDepends = [ base bytestring mwc-random ];
benchmarkHaskellDepends = [
async base bytestring criterion entropy ghc-prim mwc-random
@@ -154685,6 +155488,7 @@ self: {
];
description = "Record subtyping and record utilities with generics-sop";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"records-th" = callPackage
@@ -155556,33 +156360,10 @@ self: {
homepage = "https://github.com/ConferHealth/refurb#readme";
description = "Tools for maintaining a database";
license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "regex" = callPackage
- ({ mkDerivation, array, base, base-compat, bytestring, containers
- , hashable, heredoc, regex-base, regex-pcre-builtin, regex-tdfa
- , regex-tdfa-text, template-haskell, text, time, time-locale-compat
- , transformers, unordered-containers
- }:
- mkDerivation {
- pname = "regex";
- version = "0.5.0.0";
- sha256 = "0zy2m3qiz98xs4whg0j423j5zc6zr66hrcr7aqf6v6739hw948s2";
- revision = "1";
- editedCabalFile = "148afb42b7w24sb6j5842spqhhhps4nifxz6psxcs4cm6qylmkha";
- libraryHaskellDepends = [
- array base base-compat bytestring containers hashable heredoc
- regex-base regex-pcre-builtin regex-tdfa regex-tdfa-text
- template-haskell text time time-locale-compat transformers
- unordered-containers
- ];
- homepage = "http://regex.uk";
- description = "Toolkit for regex-base";
- license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "regex_1_0_0_0" = callPackage
+ "regex" = callPackage
({ mkDerivation, array, base, base-compat, bytestring, containers
, hashable, regex-base, regex-tdfa, regex-tdfa-text
, template-haskell, text, time, time-locale-compat, transformers
@@ -157990,8 +158771,8 @@ self: {
pname = "rest-types";
version = "1.14.1.1";
sha256 = "16lnwd7rwjb67sqklrwl40bq4h8qhp3wj1893y4vs85fpdjqxq5p";
- revision = "2";
- editedCabalFile = "083s97w8ymzz3dwjj96miyhjj3svi76yqdp53s3zqmfdb25g93vg";
+ revision = "3";
+ editedCabalFile = "0psp44114ca8cmcg0gbn64j4q6vkiyagrvgc957j80mfcy93xz92";
libraryHaskellDepends = [
aeson base base-compat case-insensitive generic-aeson
generic-xmlpickler hxt json-schema rest-stringmap text uuid
@@ -158469,6 +159250,40 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "riak_1_1_2_0" = callPackage
+ ({ mkDerivation, aeson, async, attoparsec, base, binary
+ , blaze-builder, bytestring, containers, criterion
+ , data-default-class, deepseq, enclosed-exceptions, exceptions
+ , hashable, HUnit, mersenne-random-pure64, monad-control, mtl
+ , network, process, protocol-buffers, pureMD5, QuickCheck, random
+ , resource-pool, riak-protobuf, semigroups, stm, tasty, tasty-hunit
+ , tasty-quickcheck, template-haskell, text, time, transformers
+ , transformers-base, unordered-containers, vector, yaml
+ }:
+ mkDerivation {
+ pname = "riak";
+ version = "1.1.2.0";
+ sha256 = "1vin0klwg8ajbcirxr82bk5g4yg3d2v7d40dxbpkncksbzva6wjj";
+ libraryHaskellDepends = [
+ aeson async attoparsec base binary blaze-builder bytestring
+ containers data-default-class deepseq enclosed-exceptions
+ exceptions hashable mersenne-random-pure64 monad-control network
+ protocol-buffers pureMD5 random resource-pool riak-protobuf
+ semigroups stm text time transformers transformers-base
+ unordered-containers vector
+ ];
+ testHaskellDepends = [
+ aeson base bytestring containers data-default-class HUnit mtl
+ process QuickCheck riak-protobuf semigroups tasty tasty-hunit
+ tasty-quickcheck template-haskell text yaml
+ ];
+ benchmarkHaskellDepends = [ base bytestring criterion semigroups ];
+ homepage = "http://github.com/markhibberd/riak-haskell-client";
+ description = "A Haskell client for the Riak decentralized data store";
+ license = "unknown";
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"riak-protobuf" = callPackage
({ mkDerivation, array, base, parsec, protocol-buffers
, protocol-buffers-descriptor
@@ -158506,21 +159321,39 @@ self: {
}:
mkDerivation {
pname = "ridley";
- version = "0.3.0.0";
- sha256 = "138g2d7bsqc02j5cdrr99j7v3dj6kd4pshnzbcrv9690wb1czm30";
+ version = "0.3.1.2";
+ sha256 = "15hc1j0bkdb0wbivxl73rgrk4hl598d96yv0fhpsgls74alarniq";
libraryHaskellDepends = [
async base containers ekg-core ekg-prometheus-adapter inline-c
katip microlens microlens-th mtl process prometheus raw-strings-qq
- shelly template-haskell text time transformers unix vector
- wai-middleware-metrics
+ shelly string-conv template-haskell text time transformers unix
+ vector wai-middleware-metrics
];
testHaskellDepends = [
base bytestring containers ekg-core ekg-prometheus-adapter
http-client microlens prometheus string-conv tasty tasty-hunit
tasty-quickcheck text
];
- homepage = "https://github.com/iconnect/ridley#readme";
- description = "Quick metrics to grow you app strong";
+ homepage = "https://github.com/iconnect/ridley#README";
+ description = "Quick metrics to grow your app strong";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "ridley-extras" = callPackage
+ ({ mkDerivation, base, ekg-prometheus-adapter, microlens, mtl
+ , prometheus, ridley, shelly, text, transformers
+ }:
+ mkDerivation {
+ pname = "ridley-extras";
+ version = "0.1.0.1";
+ sha256 = "01fl5mq9rp7nipxqi38k2bcdi8hiix02gf2sw8mr1xvvwdm925l2";
+ libraryHaskellDepends = [
+ base ekg-prometheus-adapter microlens mtl prometheus ridley shelly
+ text transformers
+ ];
+ testHaskellDepends = [ base ];
+ homepage = "https://github.com/iconnect/ridley/ridley-extras#readme";
+ description = "Handy metrics that don't belong to ridley";
license = stdenv.lib.licenses.bsd3;
}) {};
@@ -160652,6 +161485,7 @@ self: {
];
description = "Cryptography that's easy to digest (NaCl/libsodium bindings)";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) libsodium;};
"saltine-quickcheck" = callPackage
@@ -161183,8 +162017,8 @@ self: {
}:
mkDerivation {
pname = "sbp";
- version = "2.2.1";
- sha256 = "1qa9zjzv0nn61whmfis8rxvn14rfx78i0nj7b9v5s4dk0hzzfxhr";
+ version = "2.2.3";
+ sha256 = "1hqq3qz6xbbc2di85larf3ixj2gxsn6vhcxdhzxfn72lxdr9xgir";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -161625,6 +162459,30 @@ self: {
license = stdenv.lib.licenses.agpl3;
}) {};
+ "schematic" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, hspec, hspec-core
+ , hspec-discover, hspec-smallcheck, HUnit, regex-compat, scientific
+ , singletons, smallcheck, smallcheck-series, text
+ , unordered-containers, validationt, vector, vinyl
+ }:
+ mkDerivation {
+ pname = "schematic";
+ version = "0.1.1.0";
+ sha256 = "1g0myq6rslzn4q611r6wvcfdpvvfw8f85rck3ha7qhaw7vmm5vyb";
+ libraryHaskellDepends = [
+ aeson base bytestring regex-compat scientific singletons smallcheck
+ smallcheck-series text unordered-containers validationt vector
+ vinyl
+ ];
+ testHaskellDepends = [
+ aeson base bytestring hspec hspec-core hspec-discover
+ hspec-smallcheck HUnit regex-compat singletons smallcheck
+ smallcheck-series text unordered-containers validationt vinyl
+ ];
+ description = "JSON-biased spec and validation tool";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"scholdoc" = callPackage
({ mkDerivation, aeson, base, base64-bytestring, binary, blaze-html
, blaze-markup, bytestring, containers, criterion, data-default
@@ -163936,24 +164794,24 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "servant_0_10" = callPackage
+ "servant_0_11" = callPackage
({ mkDerivation, aeson, aeson-compat, attoparsec, base, base-compat
- , bytestring, Cabal, case-insensitive, directory, doctest
- , filemanip, filepath, hspec, http-api-data, http-media, http-types
- , mmorph, mtl, natural-transformation, network-uri, QuickCheck
- , quickcheck-instances, string-conversions, text, url, vault
+ , bytestring, Cabal, cabal-doctest, case-insensitive, directory
+ , doctest, filemanip, filepath, hspec, http-api-data, http-media
+ , http-types, mmorph, mtl, natural-transformation, network-uri
+ , QuickCheck, quickcheck-instances, string-conversions, tagged
+ , text, url, vault
}:
mkDerivation {
pname = "servant";
- version = "0.10";
- sha256 = "07ik9ddaj1vmq37dl4mg00rawa9phfapm8a52cs1b5km5fxaknp1";
- revision = "1";
- editedCabalFile = "0wm2jj3sknd946k8gmlxx3hka6ggp0pnbmariplkcf0y8qkr7cdj";
- setupHaskellDepends = [ base Cabal directory filepath ];
+ version = "0.11";
+ sha256 = "00vbhijdxb00n8ha068zdwvqlfqv1iradkkdchzzvnhg2jpzgcy5";
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
aeson attoparsec base base-compat bytestring case-insensitive
http-api-data http-media http-types mmorph mtl
- natural-transformation network-uri string-conversions text vault
+ natural-transformation network-uri string-conversions tagged text
+ vault
];
testHaskellDepends = [
aeson aeson-compat attoparsec base base-compat bytestring directory
@@ -164037,8 +164895,8 @@ self: {
}:
mkDerivation {
pname = "servant-auth-client";
- version = "0.2.7.0";
- sha256 = "1cw4b6x3mwj8djjyr2fpd9n7k59wcdl239qnjp3zl9ih52kdwvlk";
+ version = "0.2.7.1";
+ sha256 = "1y5ha76j81biyzzgl9r26i0hkx1j3yslidzyl5h8xz55y712m16d";
libraryHaskellDepends = [
base bytestring servant servant-auth servant-client text
];
@@ -164082,7 +164940,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "servant-auth-cookie_0_5_0_2" = callPackage
+ "servant-auth-cookie_0_5_0_4" = callPackage
({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring
, cereal, cookie, criterion, cryptonite, data-default, deepseq
, exceptions, hspec, http-api-data, http-types, memory, mtl
@@ -164091,8 +164949,8 @@ self: {
}:
mkDerivation {
pname = "servant-auth-cookie";
- version = "0.5.0.2";
- sha256 = "16b32y2jbm8m8hbkxzz008fsk72nqvgshh7pqyvsir0snysgafnf";
+ version = "0.5.0.4";
+ sha256 = "0h9m9mzq2b5k5l3zp42cs45k5wi42bqvsp3lp2p1z1fb9as4cw2v";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -164174,36 +165032,36 @@ self: {
, bytestring, bytestring-conversion, case-insensitive, cookie
, crypto-api, data-default-class, entropy, hspec, http-api-data
, http-client, http-types, jose, lens, lens-aeson, markdown-unlit
- , monad-time, mtl, QuickCheck, servant-auth, servant-server, text
- , time, transformers, unordered-containers, wai, warp, wreq
+ , monad-time, mtl, QuickCheck, servant-auth, servant-server, tagged
+ , text, time, transformers, unordered-containers, wai, warp, wreq
}:
mkDerivation {
pname = "servant-auth-server";
- version = "0.2.7.0";
- sha256 = "0f6a7lh0hbsjs0gk360an98d79ipl4gs0aksj95wakdmpnqrx9r6";
+ version = "0.2.8.0";
+ sha256 = "18z7894nkav1l95mjp9a9xjl5x4v5safg5m88rbnzfg81i16szg7";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
aeson base base64-bytestring blaze-builder bytestring
bytestring-conversion case-insensitive cookie crypto-api
data-default-class entropy http-api-data http-types jose lens
- monad-time mtl servant-auth servant-server text time
+ monad-time mtl servant-auth servant-server tagged text time
unordered-containers wai
];
executableHaskellDepends = [
aeson base base64-bytestring blaze-builder bytestring
bytestring-conversion case-insensitive cookie crypto-api
data-default-class entropy http-api-data http-types jose lens
- markdown-unlit monad-time mtl servant-auth servant-server text time
- transformers unordered-containers wai warp
+ markdown-unlit monad-time mtl servant-auth servant-server tagged
+ text time transformers unordered-containers wai warp
];
testHaskellDepends = [
aeson base base64-bytestring blaze-builder bytestring
bytestring-conversion case-insensitive cookie crypto-api
data-default-class entropy hspec http-api-data http-client
http-types jose lens lens-aeson monad-time mtl QuickCheck
- servant-auth servant-server text time unordered-containers wai warp
- wreq
+ servant-auth servant-server tagged text time unordered-containers
+ wai warp wreq
];
homepage = "http://github.com/plow-technologies/servant-auth#readme";
description = "servant-server/servant-auth compatibility";
@@ -164366,8 +165224,8 @@ self: {
pname = "servant-blaze";
version = "0.7.1";
sha256 = "0ii60xn5khsj8w3glvwqpwrpd6v9yc1n52gk9qsfwfxq49x1rvch";
- revision = "4";
- editedCabalFile = "17wvkd6aa9fjgygpjv057ijirh7n9sccbpwg9xds7yp8vg237rya";
+ revision = "5";
+ editedCabalFile = "05zz0kvnmai230palf44f72gm1vadqyssk9hl4h0qq5263frbsli";
libraryHaskellDepends = [ base blaze-html http-media servant ];
homepage = "http://haskell-servant.readthedocs.org/";
description = "Blaze-html support for servant";
@@ -164388,6 +165246,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "servant-cassava_0_9" = callPackage
+ ({ mkDerivation, base, base-compat, bytestring, cassava, http-media
+ , servant, vector
+ }:
+ mkDerivation {
+ pname = "servant-cassava";
+ version = "0.9";
+ sha256 = "08g1yjrfx2q79r0ldjnxr05437bg889virfy52i3s66d5h69d9q3";
+ libraryHaskellDepends = [
+ base base-compat bytestring cassava http-media servant vector
+ ];
+ homepage = "http://haskell-servant.readthedocs.org/";
+ description = "Servant CSV content-type for cassava";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"servant-checked-exceptions" = callPackage
({ mkDerivation, aeson, base, bytestring, deepseq, doctest, Glob
, hspec-wai, http-media, profunctors, servant, servant-client
@@ -164443,7 +165318,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "servant-client_0_10" = callPackage
+ "servant-client_0_11" = callPackage
({ mkDerivation, aeson, attoparsec, base, base-compat
, base64-bytestring, bytestring, deepseq, exceptions, generics-sop
, hspec, http-api-data, http-client, http-client-tls, http-media
@@ -164454,10 +165329,8 @@ self: {
}:
mkDerivation {
pname = "servant-client";
- version = "0.10";
- sha256 = "1aiyz6731fjgmjsppql1f5xnmqwv6qh26g4dgnvw399qgsn13r2m";
- revision = "2";
- editedCabalFile = "0j5ws3zjz748kmd7sn9vgdwp4mqdyzw26qnl46jdcf838b6klhl1";
+ version = "0.11";
+ sha256 = "1yiar76gf1zg8jaymz0xq751xs51fp0ryra4x4hwg71s32l2nvga";
libraryHaskellDepends = [
aeson attoparsec base base-compat base64-bytestring bytestring
exceptions generics-sop http-api-data http-client http-client-tls
@@ -164565,7 +165438,7 @@ self: {
hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
}) {};
- "servant-docs_0_10" = callPackage
+ "servant-docs_0_10_0_1" = callPackage
({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring
, case-insensitive, control-monad-omega, hashable, hspec
, http-media, http-types, lens, servant, string-conversions, text
@@ -164573,8 +165446,8 @@ self: {
}:
mkDerivation {
pname = "servant-docs";
- version = "0.10";
- sha256 = "0fv06v4df6b6lls9iya920d5qs652lpa5wf7wa5x8bi9bb61liqa";
+ version = "0.10.0.1";
+ sha256 = "1lhfvlnpgliiv84pp0gjk1kzmrd66k9dsdxf1y7mwm4mq6r7qf7k";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -164700,12 +165573,12 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "servant-foreign_0_10" = callPackage
+ "servant-foreign_0_10_1" = callPackage
({ mkDerivation, base, hspec, http-types, lens, servant, text }:
mkDerivation {
pname = "servant-foreign";
- version = "0.10";
- sha256 = "099g1jp1gny73zah99vi8p83abg75y30fb2m781cgainrjpqk98l";
+ version = "0.10.1";
+ sha256 = "1j69mv1i6q5z790asbj0n24h62biz3dlnm2zrxnmwn4k4aygbwl8";
libraryHaskellDepends = [ base http-types lens servant text ];
testHaskellDepends = [ base hspec servant ];
description = "Helpers for generating clients for servant APIs in any programming language";
@@ -164838,8 +165711,8 @@ self: {
pname = "servant-lucid";
version = "0.7.1";
sha256 = "0h7yw140ymigrzrzp2vkkhg13gg1d8pj9xmcpq8bw2cv2myvl9pc";
- revision = "4";
- editedCabalFile = "067yhdf2ryrxw38wmci57wvsd79x04w7m2k0apmf9fqi1w6ws17a";
+ revision = "5";
+ editedCabalFile = "0hqwbh0mcl3mdv0aj9xvnzpqdv8am07i48cjpx96yihkg86r5phm";
libraryHaskellDepends = [ base http-media lucid servant ];
homepage = "http://haskell-servant.readthedocs.org/";
description = "Servant support for lucid";
@@ -164897,15 +165770,15 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
- "servant-mock_0_8_1_2" = callPackage
+ "servant-mock_0_8_2" = callPackage
({ mkDerivation, aeson, base, bytestring, bytestring-conversion
, hspec, hspec-wai, http-types, QuickCheck, servant, servant-server
, transformers, wai, warp
}:
mkDerivation {
pname = "servant-mock";
- version = "0.8.1.2";
- sha256 = "05yi65lj0b8j5wibhq1rw4swrc23n0lj2dxiv7bk65jm28hycr9a";
+ version = "0.8.2";
+ sha256 = "146z4n7ayg0347kabwdz1crha7ilfdcdx3pazdgsmq2bl8mwad3w";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -164932,8 +165805,8 @@ self: {
}:
mkDerivation {
pname = "servant-multipart";
- version = "0.10";
- sha256 = "16c1d618clq1mzgklls79xlkrh7mv17s3syc4ghg95qj87krhli8";
+ version = "0.10.0.1";
+ sha256 = "1wba440qlcjw6h6k8qiycsfq26snfkmy0p45d51li704s4m3idcv";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -165125,6 +165998,7 @@ self: {
homepage = "https://github.com/pellagic-puffbomb/servant-py#readme";
description = "Automatically derive python functions to query servant webservices";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"servant-quickcheck" = callPackage
@@ -165260,30 +166134,28 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "servant-server_0_10" = callPackage
+ "servant-server_0_11" = callPackage
({ mkDerivation, aeson, attoparsec, base, base-compat
- , base64-bytestring, bytestring, Cabal, containers, directory
- , doctest, exceptions, filemanip, filepath, hspec, hspec-wai
- , http-api-data, http-types, monad-control, mtl, network
+ , base64-bytestring, bytestring, Cabal, cabal-doctest, containers
+ , directory, doctest, exceptions, filemanip, filepath, hspec
+ , hspec-wai, http-api-data, http-types, monad-control, mtl, network
, network-uri, parsec, QuickCheck, resourcet, safe, servant
, should-not-typecheck, split, string-conversions, system-filepath
- , temporary, text, transformers, transformers-base
+ , tagged, temporary, text, transformers, transformers-base
, transformers-compat, wai, wai-app-static, wai-extra, warp, word8
}:
mkDerivation {
pname = "servant-server";
- version = "0.10";
- sha256 = "0g87g48p179v1j3ki3vsvkk5gidqfp5yb9xwnh0j90v7x8ilvlcr";
- revision = "1";
- editedCabalFile = "0wsrcvf9lgq1i8p6ms46rb9bm7zgdszilil8gw0id314wcd5hcj3";
+ version = "0.11";
+ sha256 = "1c821ia2741v7nxbv651hcj21dmcqnqf4ix198is5b63sj4ff3ib";
isLibrary = true;
isExecutable = true;
- setupHaskellDepends = [ base Cabal directory filepath ];
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
aeson attoparsec base base-compat base64-bytestring bytestring
containers exceptions filepath http-api-data http-types
monad-control mtl network network-uri resourcet safe servant split
- string-conversions system-filepath text transformers
+ string-conversions system-filepath tagged text transformers
transformers-base transformers-compat wai wai-app-static warp word8
];
executableHaskellDepends = [ aeson base servant text wai warp ];
@@ -165471,7 +166343,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "servant-swagger_1_1_2_1" = callPackage
+ "servant-swagger_1_1_3" = callPackage
({ mkDerivation, aeson, aeson-qq, base, bytestring, Cabal
, cabal-doctest, directory, doctest, filepath, hspec, http-media
, insert-ordered-containers, lens, QuickCheck, servant, swagger2
@@ -165479,13 +166351,9 @@ self: {
}:
mkDerivation {
pname = "servant-swagger";
- version = "1.1.2.1";
- sha256 = "0qgrc01y9d2wsfg4r1iq71m2075qg75656wlljqb7pbkywxb0aih";
- revision = "1";
- editedCabalFile = "1phpl00wrqa5lwb2a9yn1dl9jsaqy2l478yysysmq449g64czry0";
- setupHaskellDepends = [
- base Cabal cabal-doctest directory filepath
- ];
+ version = "1.1.3";
+ sha256 = "0hf3psdcbnj0mj73zdfhv0l4p432hxzj1i9m66al3kd3k7rz79pk";
+ setupHaskellDepends = [ base Cabal cabal-doctest ];
libraryHaskellDepends = [
aeson base bytestring hspec http-media insert-ordered-containers
lens QuickCheck servant swagger2 text unordered-containers
@@ -165526,6 +166394,33 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "servant-swagger-ui_0_2_3_2_2_8" = callPackage
+ ({ mkDerivation, aeson, base, base-compat, blaze-markup, bytestring
+ , directory, file-embed, filepath, http-media, lens, servant
+ , servant-blaze, servant-server, servant-swagger, swagger2
+ , template-haskell, text, transformers, transformers-compat, wai
+ , wai-app-static, warp
+ }:
+ mkDerivation {
+ pname = "servant-swagger-ui";
+ version = "0.2.3.2.2.8";
+ sha256 = "0daqlhwy48098wp2hjsnam7d29fj6zqxmdckqfc8z0xfs07ppbg8";
+ libraryHaskellDepends = [
+ base blaze-markup bytestring directory file-embed filepath
+ http-media servant servant-blaze servant-server servant-swagger
+ swagger2 template-haskell text transformers transformers-compat
+ wai-app-static
+ ];
+ testHaskellDepends = [
+ aeson base base-compat lens servant servant-server servant-swagger
+ swagger2 text transformers transformers-compat wai warp
+ ];
+ homepage = "https://github.com/phadej/servant-swagger-ui#readme";
+ description = "Servant swagger ui";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"servant-yaml" = callPackage
({ mkDerivation, aeson, base, base-compat, bytestring, http-media
, servant, servant-server, wai, warp, yaml
@@ -165534,8 +166429,8 @@ self: {
pname = "servant-yaml";
version = "0.1.0.0";
sha256 = "011jxvr2i65bf0kmdn0sxkqgfz628a0sfhzphr1rqsmh8sqdj5y9";
- revision = "13";
- editedCabalFile = "0ww5wl0sd5aj4z6s6b3m1yniiqgnkh6395bq88kilwlwr3w539nv";
+ revision = "15";
+ editedCabalFile = "0wbgbp0la0a8jg0g4xkx6cq47zgg5wpqhp1jkhbfr81x9xjmn3hk";
libraryHaskellDepends = [
base bytestring http-media servant yaml
];
@@ -165732,6 +166627,7 @@ self: {
homepage = "https://github.com/seanhess/services#readme";
description = "Tools for building services";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"servius" = callPackage
@@ -166234,6 +167130,8 @@ self: {
pname = "shade";
version = "0.1.1.1";
sha256 = "0yri1xy40lx04sg4nm6z4wg9ayqqq5nga6yk9hv4rpf5aw3n264r";
+ revision = "1";
+ editedCabalFile = "164nw1gg6yl3fb4pqbgxxphafw2120a8kryhqx0i09l8c1n49557";
libraryHaskellDepends = [ base mtl transformers ];
homepage = "https://github.com/fredefox/shade#readme";
description = "A control structure used to combine heterogenous types with delayed effects";
@@ -167405,6 +168303,33 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "sibe_0_2_0_5" = callPackage
+ ({ mkDerivation, base, Chart, Chart-cairo, containers
+ , data-default-class, deepseq, directory, hmatrix, JuicyPixels
+ , lens, random, random-shuffle, regex-base, regex-pcre, split
+ , stemmer, text, vector
+ }:
+ mkDerivation {
+ pname = "sibe";
+ version = "0.2.0.5";
+ sha256 = "0sj4k0z3w18hwzfb32dnscidksj05awspvqdhx49j7ckbc155aic";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base Chart Chart-cairo containers data-default-class deepseq
+ hmatrix lens random random-shuffle regex-base regex-pcre split
+ stemmer text vector
+ ];
+ executableHaskellDepends = [
+ base Chart Chart-cairo containers data-default-class directory
+ hmatrix JuicyPixels random random-shuffle split vector
+ ];
+ homepage = "https://github.com/mdibaiee/sibe";
+ description = "Machine Learning algorithms";
+ license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"sieve" = callPackage
({ mkDerivation, base }:
mkDerivation {
@@ -167916,6 +168841,8 @@ self: {
pname = "simple-log";
version = "0.5.1";
sha256 = "1xnv5vgi1an91fw32m2c8wcf85cqwc5bh41f6cw6b23pg0hcvdyi";
+ revision = "1";
+ editedCabalFile = "0xqzi65hhmazyqpvw2c7rzs49xdm4rah84kcz7w3c25zac9hbxl2";
libraryHaskellDepends = [
async base containers deepseq directory exceptions filepath mtl
SafeSemaphore text time transformers
@@ -167925,7 +168852,7 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
- "simple-log_0_9_1" = callPackage
+ "simple-log_0_9_2" = callPackage
({ mkDerivation, async, base, base-unicode-symbols, containers
, data-default, deepseq, directory, exceptions, filepath, hformat
, hspec, microlens, microlens-platform, mmorph, mtl, SafeSemaphore
@@ -167933,8 +168860,8 @@ self: {
}:
mkDerivation {
pname = "simple-log";
- version = "0.9.1";
- sha256 = "0znyy233b5bnqi9j1zm6s0mvsbg4khvvm74gypaykq5q5n6yiva4";
+ version = "0.9.2";
+ sha256 = "13a1rqbig0q0nkkwk33vq7vp6w4dvm8famf5dpydw3vlizwh4db9";
libraryHaskellDepends = [
async base base-unicode-symbols containers data-default deepseq
directory exceptions filepath hformat microlens microlens-platform
@@ -168291,6 +169218,23 @@ self: {
license = stdenv.lib.licenses.lgpl3;
}) {};
+ "simple-text-format" = callPackage
+ ({ mkDerivation, attoparsec, base, hspec, microlens-platform, text
+ , unordered-containers
+ }:
+ mkDerivation {
+ pname = "simple-text-format";
+ version = "0.1";
+ sha256 = "1k8pdc0hr09zkqnc9rzzkr0w89y9kqnj1mv60y0z5hfblwpk5xk6";
+ libraryHaskellDepends = [ attoparsec base text ];
+ testHaskellDepends = [
+ base hspec microlens-platform text unordered-containers
+ ];
+ homepage = "https://github.com/JustusAdam/simple-text-format#readme";
+ description = "Simple text based format strings with named identifiers";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"simple-vec3" = callPackage
({ mkDerivation, base, criterion, QuickCheck, tasty
, tasty-quickcheck, tasty-th, vector, vector-th-unbox
@@ -168673,6 +169617,34 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "sitepipe" = callPackage
+ ({ mkDerivation, aeson, base, bytestring, containers, directory
+ , exceptions, filepath, Glob, lens, lens-aeson, megaparsec
+ , MissingH, mtl, mustache, optparse-applicative, optparse-generic
+ , pandoc, parsec, shelly, text, unordered-containers, yaml
+ }:
+ mkDerivation {
+ pname = "sitepipe";
+ version = "0.1.0";
+ sha256 = "1vdfhmmhppca40iq27dry6ic1cirmjb5canjp7v8vl2d6jg646bq";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson base bytestring containers directory exceptions filepath Glob
+ lens lens-aeson megaparsec MissingH mtl mustache
+ optparse-applicative optparse-generic pandoc parsec shelly text
+ unordered-containers yaml
+ ];
+ executableHaskellDepends = [
+ base containers lens mustache text unordered-containers
+ ];
+ testHaskellDepends = [ base ];
+ homepage = "https://github.com/ChrisPenner/sitepipe#readme";
+ description = "A simple to understand static site generator";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"sixfiguregroup" = callPackage
({ mkDerivation, base, digit, directory, doctest, filepath, lens
, parsec, parsers, QuickCheck, template-haskell
@@ -171128,12 +172100,12 @@ self: {
}) {};
"snipcheck" = callPackage
- ({ mkDerivation, base, pandoc, process }:
+ ({ mkDerivation, base, containers, pandoc, process }:
mkDerivation {
pname = "snipcheck";
- version = "0.1.0.0";
- sha256 = "0v44p82sn9kaflr3sa1jk0wlmxwl49zj709p8rjyxfk0hxq9g40k";
- libraryHaskellDepends = [ base pandoc process ];
+ version = "0.1.0.1";
+ sha256 = "1kc3yzah4xss479lhzyb083qm0sfnkix7h03pd4da35i1q30k0w0";
+ libraryHaskellDepends = [ base containers pandoc process ];
homepage = "https://github.com/nmattia/snipcheck#readme";
description = "Markdown tester";
license = stdenv.lib.licenses.mit;
@@ -171342,6 +172314,31 @@ self: {
license = stdenv.lib.licenses.mit;
}) {};
+ "soap_0_2_3_4" = callPackage
+ ({ mkDerivation, base, bytestring, conduit, configurator
+ , data-default, exceptions, hspec, http-client, http-types, HUnit
+ , iconv, mtl, resourcet, text, unordered-containers, xml-conduit
+ , xml-conduit-writer, xml-types
+ }:
+ mkDerivation {
+ pname = "soap";
+ version = "0.2.3.4";
+ sha256 = "08ff0v6vfa8pgcwzgc4ajsah572zrjp29ryghhbg3g5mb75qx6dm";
+ libraryHaskellDepends = [
+ base bytestring conduit configurator data-default exceptions
+ http-client http-types iconv mtl resourcet text
+ unordered-containers xml-conduit xml-conduit-writer xml-types
+ ];
+ testHaskellDepends = [
+ base bytestring hspec HUnit text unordered-containers xml-conduit
+ xml-conduit-writer
+ ];
+ homepage = "https://bitbucket.org/dpwiz/haskell-soap";
+ description = "SOAP client tools";
+ license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"soap-openssl" = callPackage
({ mkDerivation, base, configurator, data-default, HsOpenSSL
, http-client, http-client-openssl, soap, text
@@ -173141,6 +174138,7 @@ self: {
homepage = "http://github.com/figome/haskell-sqlcipher";
description = "Haskell binding to sqlcipher";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {inherit (pkgs) openssl;};
"sqlite" = callPackage
@@ -173633,8 +174631,8 @@ self: {
pname = "stache";
version = "0.2.2";
sha256 = "0vmqfs956cziwb3q2v4nzn4b9d87062z9pixwfr7iiwd0ypmmiv6";
- revision = "1";
- editedCabalFile = "0rx69m3aisib3vl66hgj9fq33xccjd1v5axmd7hlnh73s3vi8w99";
+ revision = "2";
+ editedCabalFile = "1bwdg0y98bw8p1857isjcg3f51d0nv52zbfc0s6f9syq70ahbhz9";
libraryHaskellDepends = [
aeson base bytestring containers deepseq directory exceptions
filepath megaparsec mtl template-haskell text unordered-containers
@@ -175161,6 +176159,18 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "stm-split_0_0_2" = callPackage
+ ({ mkDerivation, base, stm }:
+ mkDerivation {
+ pname = "stm-split";
+ version = "0.0.2";
+ sha256 = "01rqf5b75p3np5ym0am98mibmsw6vrqryad5nwjj9h5ci4wa81iw";
+ libraryHaskellDepends = [ base stm ];
+ description = "TMVars, TVars and TChans with distinguished input and output side";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"stm-stats" = callPackage
({ mkDerivation, base, containers, stm, template-haskell, time }:
mkDerivation {
@@ -176804,8 +177814,8 @@ self: {
}:
mkDerivation {
pname = "stutter";
- version = "0.1.0.0";
- sha256 = "04fal5j1mdgpn5w4vh4gw4jb20j8jh3clsiz82llc392h5c8w0x3";
+ version = "0.1.0.1";
+ sha256 = "1s3bwwylbf7mcjzpnl8681aaw92q8kcyp074gns5cazsi0slfzl4";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -177317,6 +178327,8 @@ self: {
pname = "superbuffer";
version = "0.3.1.0";
sha256 = "1aimkngya9b1l6imjnv9xgdfbrrw8wljgjm52fs9rz26vp5lgdxm";
+ revision = "1";
+ editedCabalFile = "1nz1ix5xsb10zvi1xskfvx9x1yrdlvn8i20abjx0i8vqbdh4yl67";
libraryHaskellDepends = [ base bytestring ];
testHaskellDepends = [ async base bytestring HTF QuickCheck ];
benchmarkHaskellDepends = [
@@ -177371,6 +178383,23 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "superconstraints" = callPackage
+ ({ mkDerivation, base, constraints, containers, haskell-src-meta
+ , mtl, tagged, template-haskell, type-eq
+ }:
+ mkDerivation {
+ pname = "superconstraints";
+ version = "0.0.1";
+ sha256 = "1gx9p9i5jli91dnvvrc30j04h1v2m3d71i8sxli6qrhplq5y63dk";
+ libraryHaskellDepends = [
+ base constraints containers haskell-src-meta mtl tagged
+ template-haskell type-eq
+ ];
+ homepage = "http://github.com/ryantrinkle/superconstraints";
+ description = "Access an instance's constraints";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"superdoc" = callPackage
({ mkDerivation, base, Cabal, containers, directory, filepath }:
mkDerivation {
@@ -177804,6 +178833,8 @@ self: {
pname = "syb";
version = "0.6";
sha256 = "1p3cnqjm13677r4a966zffzhi9b3a321aln8zs8ckqj0d9z1z3d3";
+ revision = "1";
+ editedCabalFile = "158ngdnlq9n1mil7cq2bzy4zkgx73zzms9q56wp6ll93m5mc4nlx";
libraryHaskellDepends = [ base ];
testHaskellDepends = [ base containers HUnit mtl ];
homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB";
@@ -178629,6 +179660,7 @@ self: {
homepage = "https://github.com/ChaosGroup/system-info";
description = "Get information about CPUs, memory, etc";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"system-inotify" = callPackage
@@ -179249,6 +180281,19 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "tagged-identity_0_1_2" = callPackage
+ ({ mkDerivation, base, mtl, transformers }:
+ mkDerivation {
+ pname = "tagged-identity";
+ version = "0.1.2";
+ sha256 = "0402snxl1cpi7yq03aqkp036hjcrrqiy0if3c3bz6ljls7yxfvci";
+ libraryHaskellDepends = [ base mtl transformers ];
+ homepage = "https://github.com/mrkkrp/tagged-identity";
+ description = "Trivial monad transformer that allows identical monad stacks have different types";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"tagged-list" = callPackage
({ mkDerivation, AbortT-transformers, base, binary, natural-number
, type-equality, type-level-natural-number
@@ -180775,8 +181820,8 @@ self: {
pname = "tdigest-Chart";
version = "0";
sha256 = "19vhyk2wgvxnaad32vj9fm0vw8rl5n1lp540dp4yn9dsbilhda3l";
- revision = "1";
- editedCabalFile = "1vpq8gkhwziiird8v89fmlrjmc45kfz5k8znk0r779iwzbsnfajr";
+ revision = "2";
+ editedCabalFile = "139qimahwi9q2vm2z6m42ghk59drgii71lrgcj2dbai5x5fnfcgb";
libraryHaskellDepends = [
base base-compat Chart colour lens semigroupoids semigroups tdigest
];
@@ -180874,6 +181919,33 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "telegram-api_0_6_3_0" = callPackage
+ ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, filepath
+ , hjpath, hspec, http-api-data, http-client, http-client-tls
+ , http-media, http-types, mime-types, mtl, optparse-applicative
+ , servant, servant-client, string-conversions, text, transformers
+ , utf8-string
+ }:
+ mkDerivation {
+ pname = "telegram-api";
+ version = "0.6.3.0";
+ sha256 = "0fp8ryh9pdpfycyknd9d1r9z1v0p06r87nf19x7azv4i1yl5msia";
+ libraryHaskellDepends = [
+ aeson base bytestring http-api-data http-client http-media
+ http-types mime-types mtl servant servant-client string-conversions
+ text transformers
+ ];
+ testHaskellDepends = [
+ aeson ansi-wl-pprint base filepath hjpath hspec http-client
+ http-client-tls http-types optparse-applicative servant
+ servant-client text transformers utf8-string
+ ];
+ homepage = "http://github.com/klappvisor/haskell-telegram-api#readme";
+ description = "Telegram Bot API bindings";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"telegram-bot" = callPackage
({ mkDerivation, base, containers, http-client, http-client-tls
, pipes, telegram-api, text, transformers
@@ -181353,6 +182425,7 @@ self: {
homepage = "https://github.com/tensorflow/haskell#readme";
description = "TensorFlow bindings";
license = stdenv.lib.licenses.asl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {tensorflow = null;};
"tensorflow-core-ops" = callPackage
@@ -181374,6 +182447,7 @@ self: {
homepage = "https://github.com/tensorflow/haskell#readme";
description = "Haskell wrappers for Core Tensorflow Ops";
license = stdenv.lib.licenses.asl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"tensorflow-logging" = callPackage
@@ -181402,6 +182476,7 @@ self: {
homepage = "https://github.com/tensorflow/haskell#readme";
description = "TensorBoard related functionality";
license = stdenv.lib.licenses.asl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"tensorflow-opgen" = callPackage
@@ -181420,6 +182495,7 @@ self: {
homepage = "https://github.com/tensorflow/haskell#readme";
description = "Code generation for TensorFlow operations";
license = stdenv.lib.licenses.asl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"tensorflow-ops" = callPackage
@@ -181450,6 +182526,7 @@ self: {
homepage = "https://github.com/tensorflow/haskell#readme";
description = "Friendly layer around TensorFlow bindings";
license = stdenv.lib.licenses.asl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"tensorflow-proto" = callPackage
@@ -181463,6 +182540,7 @@ self: {
homepage = "https://github.com/tensorflow/haskell#readme";
description = "TensorFlow protocol buffers";
license = stdenv.lib.licenses.asl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"tensorflow-records" = callPackage
@@ -181480,6 +182558,7 @@ self: {
homepage = "https://github.com/tensorflow/haskell#readme";
description = "Encoder and decoder for the TensorFlow \"TFRecords\" format";
license = stdenv.lib.licenses.asl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"tensorflow-records-conduit" = callPackage
@@ -181497,6 +182576,7 @@ self: {
homepage = "https://github.com/tensorflow/haskell#readme";
description = "Conduit wrappers for TensorFlow.Records.";
license = stdenv.lib.licenses.asl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"tensorflow-test" = callPackage
@@ -182320,6 +183400,31 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "text_1_2_2_2" = callPackage
+ ({ mkDerivation, array, base, binary, bytestring, deepseq
+ , directory, ghc-prim, HUnit, integer-gmp, QuickCheck
+ , quickcheck-unicode, random, test-framework, test-framework-hunit
+ , test-framework-quickcheck2
+ }:
+ mkDerivation {
+ pname = "text";
+ version = "1.2.2.2";
+ sha256 = "1y9d0zjs2ls0c574mr5xw7y3y49s62sd3wcn9lhpwz8a6q352iii";
+ libraryHaskellDepends = [
+ array base binary bytestring deepseq ghc-prim integer-gmp
+ ];
+ testHaskellDepends = [
+ array base binary bytestring deepseq directory ghc-prim HUnit
+ integer-gmp QuickCheck quickcheck-unicode random test-framework
+ test-framework-hunit test-framework-quickcheck2
+ ];
+ doCheck = false;
+ homepage = "https://github.com/bos/text";
+ description = "An efficient packed Unicode text type";
+ license = stdenv.lib.licenses.bsd2;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"text-all" = callPackage
({ mkDerivation, base, text, text-format, text-show }:
mkDerivation {
@@ -182682,6 +183787,8 @@ self: {
pname = "text-metrics";
version = "0.2.0";
sha256 = "0fp4zzmq14hwprxv3h8zbm7107drj1yj0l9zp75q4qdc2k7088q8";
+ revision = "1";
+ editedCabalFile = "1j3xzb7l2qd2340p4hzfpp26y5414h61nkvhpwpg4brmd041h7fh";
libraryHaskellDepends = [ base text ];
testHaskellDepends = [ base hspec QuickCheck text ];
benchmarkHaskellDepends = [ base criterion deepseq text ];
@@ -183292,8 +184399,8 @@ self: {
({ mkDerivation, base, containers, ghc-prim, template-haskell }:
mkDerivation {
pname = "th-abstraction";
- version = "0.1.1.0";
- sha256 = "06r335nx4h9sjqnvnplhkrps1m176d2322l3zn8sm9kv8mww33c4";
+ version = "0.1.2.1";
+ sha256 = "08wzlann9gpxdn6hkhj1qz0shqj9lwarczw1m9svjsxy90x2riiv";
libraryHaskellDepends = [
base containers ghc-prim template-haskell
];
@@ -183667,25 +184774,19 @@ self: {
}) {};
"th-typegraph" = callPackage
- ({ mkDerivation, array, base, base-compat, bytestring, containers
- , data-default, deepseq, ghc-prim, haskell-src-exts, hspec
- , hspec-core, lens, mtl, mtl-unleashed, pretty, set-extra, syb
- , template-haskell, text, th-context, th-desugar, th-lift-instances
- , th-orphans, th-reify-many
+ ({ mkDerivation, aeson, base, cereal, containers, fgl, lens, mtl
+ , parsec, pretty, safecopy, split, syb, template-haskell, text
+ , th-desugar, th-lift, th-lift-instances, th-orphans, time, userid
+ , web-routes
}:
mkDerivation {
pname = "th-typegraph";
- version = "0.35.1";
- sha256 = "1pw7qkqg942rjx5i6rfif2626iv636y7iqd4afrm4dwby4y5z69h";
+ version = "1.0";
+ sha256 = "0p6cczd087lk8mxmax149d3zwmpskyj5ms0gdfdxff927q9g1aj6";
libraryHaskellDepends = [
- base base-compat containers data-default haskell-src-exts lens mtl
- mtl-unleashed pretty set-extra syb template-haskell th-context
- th-desugar th-lift-instances th-orphans
- ];
- testHaskellDepends = [
- array base bytestring containers data-default deepseq ghc-prim
- hspec hspec-core lens mtl mtl-unleashed syb template-haskell text
- th-desugar th-orphans th-reify-many
+ aeson base cereal containers fgl lens mtl parsec pretty safecopy
+ split syb template-haskell text th-desugar th-lift
+ th-lift-instances th-orphans time userid web-routes
];
homepage = "https://github.com/seereason/th-typegraph";
description = "Graph of the subtype relation";
@@ -184068,8 +185169,8 @@ self: {
}:
mkDerivation {
pname = "threepenny-editors";
- version = "0.2.0.7";
- sha256 = "1r7k4m08z4a4cy6miyk2za5azyvl7gj0fzqzd7aqwkcvcgsixbsb";
+ version = "0.2.0.10";
+ sha256 = "0hspg2zlkcmckdx2skgx3yh1sprx3a5fa57xspv4vcj0rws4kjr2";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -184506,6 +185607,7 @@ self: {
homepage = "http://yaxu.org/tidal/";
description = "Visual rendering for Tidal patterns";
license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"tie-knot" = callPackage
@@ -185549,6 +186651,21 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "titan" = callPackage
+ ({ mkDerivation, base }:
+ mkDerivation {
+ pname = "titan";
+ version = "0.1.0.0";
+ sha256 = "1bq8j1ch9fqpfgbchmi284afm1bbhjc47pw4lbnadxfwfcldm1gs";
+ isLibrary = false;
+ isExecutable = true;
+ executableHaskellDepends = [ base ];
+ homepage = "http://keera.co.uk";
+ description = "Testing Infrastructure for Temporal AbstractioNs";
+ license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"titlecase" = callPackage
({ mkDerivation, base, blaze-markup, semigroups, tasty, tasty-hunit
, tasty-quickcheck, text
@@ -185557,6 +186674,8 @@ self: {
pname = "titlecase";
version = "0.1.0.3";
sha256 = "08i22wcb0amrl3rl3bkdbvym6zcjz2msraj78px0l0ky3prc7fv7";
+ revision = "1";
+ editedCabalFile = "0p7f68d4v1rp9lf2zaa2bx195ylrsxrds5ybl8mhdr49p0y642qf";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [ base blaze-markup semigroups text ];
@@ -185571,6 +186690,24 @@ self: {
maintainers = with stdenv.lib.maintainers; [ peti ];
}) {};
+ "titlecase_1" = callPackage
+ ({ mkDerivation, base, tasty, tasty-hunit, tasty-quickcheck }:
+ mkDerivation {
+ pname = "titlecase";
+ version = "1";
+ sha256 = "1q7pll71rqgmzm90949i6fskfjysfdqhqvby0mh38ykm88bxm80w";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [ base ];
+ executableHaskellDepends = [ base ];
+ testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
+ homepage = "https://github.com/peti/titlecase#readme";
+ description = "Convert English Words to Title Case";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ maintainers = with stdenv.lib.maintainers; [ peti ];
+ }) {};
+
"tkhs" = callPackage
({ mkDerivation, base, HUnit, mtl, parsec, pretty, test-framework
, test-framework-hunit, utf8-string, vty
@@ -185743,16 +186880,21 @@ self: {
}) {};
"tmapmvar" = callPackage
- ({ mkDerivation, base, containers, hashable, stm
+ ({ mkDerivation, async, base, containers, hashable, QuickCheck
+ , quickcheck-instances, stm, tasty, tasty-quickcheck
, unordered-containers
}:
mkDerivation {
pname = "tmapmvar";
- version = "0.0.2";
- sha256 = "1vn0sz5cnzzhf8wxvscahm242dz8n6mp4h7cgfgqmnshpq65gx6y";
+ version = "0.0.3";
+ sha256 = "1w5afnh7v04cjwb6qmgmmzgqhqj58rrxl6m31myk2rgd8i9j1fvf";
libraryHaskellDepends = [
base containers hashable stm unordered-containers
];
+ testHaskellDepends = [
+ async base containers QuickCheck quickcheck-instances stm tasty
+ tasty-quickcheck
+ ];
homepage = "https://github.com/athanclark/tmapmvar#readme";
description = "A single-entity stateful Map in STM, similar to tmapchan";
license = stdenv.lib.licenses.bsd3;
@@ -186095,6 +187237,30 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "top" = callPackage
+ ({ mkDerivation, acid-state, async, base, bytestring, containers
+ , data-default-class, deepseq, directory, doctest, extra, filemanip
+ , filepath, flat, hslogger, ListLike, mtl, pipes, pretty, safecopy
+ , stm, tasty, tasty-hunit, template-haskell, text, time
+ , transformers, websockets, zm
+ }:
+ mkDerivation {
+ pname = "top";
+ version = "0.2";
+ sha256 = "0xspyjz9cwfcwb0ihir8y5ddygsvdm3mxy2gdq3cfvzx8axainzh";
+ libraryHaskellDepends = [
+ acid-state async base bytestring containers data-default-class
+ deepseq extra filepath flat hslogger ListLike mtl pipes pretty
+ safecopy stm template-haskell text time transformers websockets zm
+ ];
+ testHaskellDepends = [
+ base directory doctest filemanip tasty tasty-hunit zm
+ ];
+ homepage = "http://github.com/tittoassini/top";
+ description = "Top (typed oriented protocol) API";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"topkata" = callPackage
({ mkDerivation, ALUT, array, base, filepath, GLFW-b, OpenAL
, OpenGL, parseargs, random
@@ -186369,6 +187535,7 @@ self: {
];
description = "Applications for interacting with the Pushbullet API";
license = stdenv.lib.licenses.gpl3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"tpdb" = callPackage
@@ -187315,6 +188482,7 @@ self: {
homepage = "https://github.com/SamProtas/hs-triplesec";
description = "TripleSec is a simple, triple-paranoid, symmetric encryption library";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"trivia" = callPackage
@@ -190182,6 +191350,23 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "unfoldable_0_9_3" = callPackage
+ ({ mkDerivation, base, containers, ghc-prim, one-liner, QuickCheck
+ , random, transformers
+ }:
+ mkDerivation {
+ pname = "unfoldable";
+ version = "0.9.3";
+ sha256 = "0bf5qf6w6blwxbyz5cd8662hd6xv0s0wa8zcrx6s696f2qvjr10f";
+ libraryHaskellDepends = [
+ base containers ghc-prim one-liner QuickCheck random transformers
+ ];
+ homepage = "https://github.com/sjoerdvisscher/unfoldable";
+ description = "Class of data structures that can be unfolded";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"unfoldable-restricted" = callPackage
({ mkDerivation, base, constraints, containers, hashable
, transformers, unfoldable, unit-constraint, unordered-containers
@@ -191629,8 +192814,8 @@ self: {
({ mkDerivation, aeson, base, bytestring, text, uri-bytestring }:
mkDerivation {
pname = "uri-bytestring-aeson";
- version = "0.1.0.0";
- sha256 = "0pr82nrkn2ar9nphy6zwdizjj716cg81k22rg4y7lz1l759lhlnq";
+ version = "0.1.0.1";
+ sha256 = "1zi5jl2ksjmvflfzff0hqy7a66ma6xifl2nycb1f6qd0fsrc6hpg";
libraryHaskellDepends = [
aeson base bytestring text uri-bytestring
];
@@ -192394,6 +193579,8 @@ self: {
pname = "uuid";
version = "1.3.13";
sha256 = "09xhk42yhxvqmka0iqrv3338asncz8cap3j0ic0ps896f2581b6z";
+ revision = "1";
+ editedCabalFile = "0yp01hzsw07d9ismqqkkzwqllfnyyhzhjmwhbhgmkb6v7y7iqrbm";
libraryHaskellDepends = [
base binary bytestring cryptohash-md5 cryptohash-sha1 entropy
network-info random text time uuid-types
@@ -193745,6 +194932,33 @@ self: {
license = stdenv.lib.licenses.asl20;
}) {};
+ "vectortiles_1_2_0_5" = callPackage
+ ({ mkDerivation, base, bytestring, cereal, containers, criterion
+ , deepseq, hex, microlens, microlens-platform, protobuf, tasty
+ , tasty-hunit, text, transformers, vector
+ }:
+ mkDerivation {
+ pname = "vectortiles";
+ version = "1.2.0.5";
+ sha256 = "0pbilwfrz2lv10x9fgy1ndxnz1as0v41r9g36yc5g41dhyhnp82l";
+ libraryHaskellDepends = [
+ base bytestring cereal containers deepseq protobuf text
+ transformers vector
+ ];
+ testHaskellDepends = [
+ base bytestring cereal containers hex protobuf tasty tasty-hunit
+ text vector
+ ];
+ benchmarkHaskellDepends = [
+ base bytestring cereal containers criterion microlens
+ microlens-platform protobuf text vector
+ ];
+ homepage = "https://github.com/fosskers/vectortiles";
+ description = "GIS Vector Tiles, as defined by Mapbox";
+ license = stdenv.lib.licenses.asl20;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"verbalexpressions" = callPackage
({ mkDerivation, base, regex-pcre }:
mkDerivation {
@@ -193846,22 +195060,6 @@ self: {
}) {};
"versions" = callPackage
- ({ mkDerivation, base, either, megaparsec, microlens, semigroups
- , tasty, tasty-hunit, text
- }:
- mkDerivation {
- pname = "versions";
- version = "3.0.0";
- sha256 = "0f7wvsjavv9hkrm5pgwg99w78apsqbrw4hk559cww83k3bbbg3j6";
- libraryHaskellDepends = [ base megaparsec semigroups text ];
- testHaskellDepends = [
- base either microlens tasty tasty-hunit text
- ];
- description = "Types and parsers for software version numbers";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "versions_3_0_1_1" = callPackage
({ mkDerivation, base, megaparsec, microlens, tasty, tasty-hunit
, text
}:
@@ -193873,6 +195071,20 @@ self: {
testHaskellDepends = [ base microlens tasty tasty-hunit text ];
description = "Types and parsers for software version numbers";
license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "versions_3_0_2" = callPackage
+ ({ mkDerivation, base, megaparsec, microlens, tasty, tasty-hunit
+ , text
+ }:
+ mkDerivation {
+ pname = "versions";
+ version = "3.0.2";
+ sha256 = "1s33il4w94h51zsqbqylbzbhn9q5y7cjnscblhhkpglvgc2z61ii";
+ libraryHaskellDepends = [ base megaparsec text ];
+ testHaskellDepends = [ base microlens tasty tasty-hunit text ];
+ description = "Types and parsers for software version numbers";
+ license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
@@ -194520,6 +195732,8 @@ self: {
pname = "vty";
version = "5.15";
sha256 = "1xyphl595dvwrippg6gz7k4ks07mnfgss8gpw14149rc2fjhzgq3";
+ revision = "1";
+ editedCabalFile = "1gjwkw4swxsvm8gpdgiifmrxxyk0g7y1jiqdnxwgabz9qq54nj9k";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -194555,6 +195769,8 @@ self: {
pname = "vty";
version = "5.15.1";
sha256 = "0ba8qnb59ixg9czfj71ckh82p7kkwgnhwh6c69bkjhy0f7g36hr4";
+ revision = "1";
+ editedCabalFile = "0bcvqvhmsj8fbxs19nwy80acjdp1dsphgfzj2xkj8kkxaw08s2g8";
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
@@ -196343,6 +197559,29 @@ self: {
];
description = "A generator of comics based on some ascertainable data about the requester";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
+ "wallpaper" = callPackage
+ ({ mkDerivation, base, bytestring, filepath, JuicyPixels, text
+ , yaml
+ }:
+ mkDerivation {
+ pname = "wallpaper";
+ version = "0.1.0.1";
+ sha256 = "0dpy3vnf8vn0z64r6kla2qm1czlzz3xvpmm4rz95yjynsrc5n7mz";
+ revision = "1";
+ editedCabalFile = "00a67dn1ald61zwm9bg6p2vr9ahr6diprx9vmwcjns28g4158qag";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ base bytestring filepath JuicyPixels text yaml
+ ];
+ executableHaskellDepends = [ base JuicyPixels yaml ];
+ testHaskellDepends = [ base ];
+ homepage = "https://github.com/jeffreyrosenbluth/wallpaper#readme";
+ description = "A library and executable for creating wallpaper, frieze, and rosette patterns";
+ license = stdenv.lib.licenses.bsd3;
}) {};
"warc" = callPackage
@@ -196491,8 +197730,8 @@ self: {
({ mkDerivation, base, mtl, time }:
mkDerivation {
pname = "watchdog";
- version = "0.2.2.1";
- sha256 = "06b93cqn6rbl6jbjyawzqmrx80h0dbcks7ia6l3wzdqpic8yjj6v";
+ version = "0.2.3";
+ sha256 = "18x0y0pnbbhfl1yjjdlf34fkl76rj702kdq4bqvnap25067hmgdm";
libraryHaskellDepends = [ base mtl time ];
description = "Simple control structure to re-try an action with exponential backoff";
license = stdenv.lib.licenses.bsd3;
@@ -196579,6 +197818,27 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "wave_0_1_5" = callPackage
+ ({ mkDerivation, base, bytestring, cereal, containers
+ , data-default-class, hspec, QuickCheck, temporary, transformers
+ }:
+ mkDerivation {
+ pname = "wave";
+ version = "0.1.5";
+ sha256 = "03zycmwrchhqvi37fdvlzz2d1vl4hy0i8xyys1zznw38qfq0h2i5";
+ libraryHaskellDepends = [
+ base bytestring cereal containers data-default-class transformers
+ ];
+ testHaskellDepends = [
+ base bytestring containers data-default-class hspec QuickCheck
+ temporary
+ ];
+ homepage = "https://github.com/mrkkrp/wave";
+ description = "Work with WAVE and RF64 files";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"wavefront" = callPackage
({ mkDerivation, attoparsec, base, dlist, filepath, mtl, text
, transformers, vector
@@ -197568,8 +198828,8 @@ self: {
}:
mkDerivation {
pname = "websockets-simple";
- version = "0.0.6.1";
- sha256 = "1gmagrfq0kzz954dj6kvxsgajz4zz4a7yii26jp4z1cpjk7pl8pk";
+ version = "0.0.6.3";
+ sha256 = "057gm855nqx4rbmhsai4fw4l7p42a40d27567pgnb81chj638w9g";
libraryHaskellDepends = [
aeson async base bytestring every exceptions monad-control stm
transformers wai-transformers websockets
@@ -197578,6 +198838,7 @@ self: {
homepage = "https://github.com/athanclark/websockets-simple#readme";
description = "Simpler interface to the websockets api";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"websockets-snap" = callPackage
@@ -198847,6 +200108,7 @@ self: {
homepage = "http://github.com/sboosali/workflow-pure#readme";
description = "manipulate `workflow-types:Workflow`'s";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"workflow-types" = callPackage
@@ -199096,6 +200358,35 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "write-buffer-core" = callPackage
+ ({ mkDerivation, base, bytestring, clock, dlist, exceptions
+ , lifted-async, lifted-base, monad-control, mtl, stm, stm-chans
+ }:
+ mkDerivation {
+ pname = "write-buffer-core";
+ version = "0.1.0.0";
+ sha256 = "066w2xpmf988r27i987ia47nska33hs60h3xwk69dm7vg42ylh3m";
+ libraryHaskellDepends = [
+ base bytestring clock dlist exceptions lifted-async lifted-base
+ monad-control mtl stm stm-chans
+ ];
+ homepage = "https://github.com/parsonsmatt/write-buffer#readme";
+ description = "Buffer your writes, transparently";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
+ "write-buffer-stm" = callPackage
+ ({ mkDerivation, base, stm, stm-chans, write-buffer-core }:
+ mkDerivation {
+ pname = "write-buffer-stm";
+ version = "0.1.0.0";
+ sha256 = "0q03pnkw3343jmcs2f2mrx84g3wj3plcagnjdviphzsg7rrf3a4l";
+ libraryHaskellDepends = [ base stm stm-chans write-buffer-core ];
+ homepage = "https://github.com/parsonsmatt/write-buffer#readme";
+ description = "A write buffer for STM channels and queues";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"writer-cps-full" = callPackage
({ mkDerivation, base, writer-cps-lens, writer-cps-morph
, writer-cps-mtl, writer-cps-transformers
@@ -199186,6 +200477,19 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "wryte" = callPackage
+ ({ mkDerivation, base, mtl, text }:
+ mkDerivation {
+ pname = "wryte";
+ version = "0.1.1.0";
+ sha256 = "15ksy5dzi64fkjkgk5pmm8iclavp3aq8jz1c35458azdn1xi1qdj";
+ libraryHaskellDepends = [ base mtl text ];
+ testHaskellDepends = [ base ];
+ homepage = "https://github.com/tdammers/wryte#readme";
+ description = "Pretty output for source generators";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"ws-chans" = callPackage
({ mkDerivation, async, base, http-types, HUnit, network
, QuickCheck, quickcheck-instances, test-framework
@@ -200995,33 +202299,6 @@ self: {
}) {};
"xmlhtml" = callPackage
- ({ mkDerivation, base, blaze-builder, blaze-html, blaze-markup
- , bytestring, containers, directory, HUnit, parsec, QuickCheck
- , test-framework, test-framework-hunit, test-framework-quickcheck2
- , text, unordered-containers
- }:
- mkDerivation {
- pname = "xmlhtml";
- version = "0.2.3.5";
- sha256 = "0vdhfh1fnhmkymasrcv5rh4498r5fgm7yia3n5h8n1nmmz3s2cz3";
- revision = "4";
- editedCabalFile = "073a98mmczjb80bjblzwcybnidchj9vgivcj6b5rdvh584iwbhz2";
- libraryHaskellDepends = [
- base blaze-builder blaze-html blaze-markup bytestring containers
- parsec text unordered-containers
- ];
- testHaskellDepends = [
- base blaze-builder blaze-html blaze-markup bytestring containers
- directory HUnit parsec QuickCheck test-framework
- test-framework-hunit test-framework-quickcheck2 text
- unordered-containers
- ];
- homepage = "https://github.com/snapframework/xmlhtml";
- description = "XML parser and renderer with HTML 5 quirks mode";
- license = stdenv.lib.licenses.bsd3;
- }) {};
-
- "xmlhtml_0_2_4" = callPackage
({ mkDerivation, base, blaze-builder, blaze-html, blaze-markup
, bytestring, containers, directory, HUnit, parsec, test-framework
, test-framework-hunit, text, unordered-containers
@@ -201041,7 +202318,6 @@ self: {
homepage = "https://github.com/snapframework/xmlhtml";
description = "XML parser and renderer with HTML 5 quirks mode";
license = stdenv.lib.licenses.bsd3;
- hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"xmltv" = callPackage
@@ -201626,10 +202902,8 @@ self: {
}:
mkDerivation {
pname = "xturtle";
- version = "0.1.25";
- sha256 = "161fpfvzbz2kks5pxmq3wrkgfkrfjvqrl4izlq0v7sicqphfkgmd";
- revision = "1";
- editedCabalFile = "073w2jgr4m6wdip397ply7hsnn9bh3b3kcvmxzj2iiys0vclpprh";
+ version = "0.2.0.0";
+ sha256 = "08nf4hz47ayypm3f14y7f6wdxskw1ipxvgc3dx24xckx6wvha623";
libraryHaskellDepends = [
base convertible Imlib setlocale X11 X11-xft x11-xim yjsvg yjtools
];
@@ -201755,6 +203029,29 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
+ "yahoo-finance-api_0_2_0_2" = callPackage
+ ({ mkDerivation, aeson, base, doctest, either, Glob, hspec
+ , http-api-data, http-client, http-client-tls, mtl, safe, servant
+ , servant-client, text, time, transformers, vector
+ }:
+ mkDerivation {
+ pname = "yahoo-finance-api";
+ version = "0.2.0.2";
+ sha256 = "0frwwpcf7xwbh28sx6k7v9yw9kswx0wrbqgmsr6kcyzbxl2i54pj";
+ libraryHaskellDepends = [
+ aeson base either http-api-data http-client mtl servant
+ servant-client text time transformers vector
+ ];
+ testHaskellDepends = [
+ base doctest either Glob hspec http-client http-client-tls mtl safe
+ servant servant-client
+ ];
+ homepage = "https://github.com/cdepillabout/yahoo-finance-api";
+ description = "Read quotes from Yahoo Finance API";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"yahoo-finance-conduit" = callPackage
({ mkDerivation, attoparsec, base, cassava, conduit, lens, mtl
, text, vector, wreq
@@ -201870,6 +203167,38 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {inherit (pkgs) libyaml;};
+ "yaml_0_8_23" = callPackage
+ ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat
+ , bytestring, conduit, containers, directory, filepath, hspec
+ , HUnit, libyaml, mockery, resourcet, scientific, semigroups
+ , template-haskell, temporary, text, transformers
+ , unordered-containers, vector
+ }:
+ mkDerivation {
+ pname = "yaml";
+ version = "0.8.23";
+ sha256 = "0p0ya8vgydsjc9nvc92kncz7239lixjh1rdw3gprnqs2h8a3f428";
+ configureFlags = [ "-fsystem-libyaml" ];
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ aeson attoparsec base bytestring conduit containers directory
+ filepath resourcet scientific semigroups template-haskell text
+ transformers unordered-containers vector
+ ];
+ libraryPkgconfigDepends = [ libyaml ];
+ executableHaskellDepends = [ aeson base bytestring ];
+ testHaskellDepends = [
+ aeson aeson-qq base base-compat bytestring conduit directory hspec
+ HUnit mockery resourcet temporary text transformers
+ unordered-containers vector
+ ];
+ homepage = "http://github.com/snoyberg/yaml/";
+ description = "Support for parsing and rendering YAML documents";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {inherit (pkgs) libyaml;};
+
"yaml-combinators" = callPackage
({ mkDerivation, aeson, base, bytestring, doctest, generics-sop
, scientific, tasty, tasty-hunit, text, transformers
@@ -202165,15 +203494,23 @@ self: {
}) {};
"yarn-lock" = callPackage
- ({ mkDerivation, base, containers, megaparsec, protolude, text }:
+ ({ mkDerivation, ansi-wl-pprint, base, containers, megaparsec
+ , protolude, tasty, tasty-hunit, tasty-th, text
+ }:
mkDerivation {
pname = "yarn-lock";
- version = "0.1.0";
- sha256 = "0gab7blc20xfn6k8gz02b3li1cf759ixkp2vl10hf7k4swhj9ag7";
+ version = "0.2.0";
+ sha256 = "0jily4hrxbj487450amx6nayxpcm0giwrv0zn3mld906lqr2f990";
+ revision = "1";
+ editedCabalFile = "1ji64dab6wf59l9yi1czm81xgnx86qgvcawnxwa83wp1fa3flics";
libraryHaskellDepends = [
base containers megaparsec protolude text
];
- homepage = "https://github.com/Profpatsch/yaml-lock#readme";
+ testHaskellDepends = [
+ ansi-wl-pprint base containers megaparsec protolude tasty
+ tasty-hunit tasty-th text
+ ];
+ homepage = "https://github.com/Profpatsch/yarn-lock#readme";
description = "Represent and parse yarn.lock files";
license = stdenv.lib.licenses.mit;
}) {};
@@ -202632,6 +203969,7 @@ self: {
];
description = "An account authentication plugin for yesod with encrypted token transfer";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"yesod-auth-kerberos" = callPackage
@@ -204792,8 +206130,8 @@ self: {
({ mkDerivation, base, HaXml }:
mkDerivation {
pname = "yjsvg";
- version = "0.2.0.0";
- sha256 = "05vgprnpvz55by5l5g17f6l7pjnjcgywyj7z2v3578hb2bqwhha8";
+ version = "0.2.0.1";
+ sha256 = "0zif4sqrd7kv1546vcp1q78bb8k94mkiqxh7glix6gvv7gabfdzp";
libraryHaskellDepends = [ base HaXml ];
description = "make SVG string from Haskell data";
license = stdenv.lib.licenses.bsd3;
@@ -205392,6 +206730,7 @@ self: {
homepage = "http://cs-syd.eu";
description = "zifter-google-java-format";
license = stdenv.lib.licenses.mit;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"zifter-hindent" = callPackage
@@ -205512,6 +206851,31 @@ self: {
hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
}) {};
+ "zip_0_1_11" = callPackage
+ ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive
+ , cereal, conduit, conduit-extra, containers, digest, exceptions
+ , filepath, hspec, mtl, path, path-io, plan-b, QuickCheck
+ , resourcet, text, time, transformers
+ }:
+ mkDerivation {
+ pname = "zip";
+ version = "0.1.11";
+ sha256 = "0adflrr7h6aqq4nz0751chs65zfj0ljz1mjwyym3s080sbrwncjn";
+ libraryHaskellDepends = [
+ base bytestring bzlib-conduit case-insensitive cereal conduit
+ conduit-extra containers digest exceptions filepath mtl path
+ path-io plan-b resourcet text time transformers
+ ];
+ testHaskellDepends = [
+ base bytestring conduit containers exceptions filepath hspec path
+ path-io QuickCheck text time transformers
+ ];
+ homepage = "https://github.com/mrkkrp/zip";
+ description = "Operations on zip archives";
+ license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
+ }) {};
+
"zip-archive" = callPackage
({ mkDerivation, array, base, binary, bytestring, containers
, digest, directory, filepath, HUnit, mtl, old-time, pretty
@@ -205815,6 +207179,7 @@ self: {
homepage = "http://github.com/tittoassini/zm";
description = "Language independent, reproducible, absolute types";
license = stdenv.lib.licenses.bsd3;
+ hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"zmcat" = callPackage
@@ -206010,6 +207375,33 @@ self: {
license = stdenv.lib.licenses.bsd3;
}) {};
+ "zre" = callPackage
+ ({ mkDerivation, async, attoparsec, base, binary, binary-strict
+ , bytestring, containers, lifted-async, monad-control, mtl, network
+ , network-info, network-multicast, optparse-applicative, process
+ , random, sockaddr, stm, time, transformers-base, uuid
+ , zeromq4-haskell
+ }:
+ mkDerivation {
+ pname = "zre";
+ version = "0.1.0.0";
+ sha256 = "11lnz7pxmqz39xjqjh1kkgywv0jg81yzi2hrp2ibaw2nslf65xzl";
+ isLibrary = true;
+ isExecutable = true;
+ libraryHaskellDepends = [
+ async attoparsec base binary binary-strict bytestring containers
+ monad-control mtl network network-info network-multicast
+ optparse-applicative process random sockaddr stm time
+ transformers-base uuid zeromq4-haskell
+ ];
+ executableHaskellDepends = [
+ async base bytestring lifted-async monad-control mtl stm time
+ ];
+ testHaskellDepends = [ base ];
+ description = "ZRE protocol implementation";
+ license = stdenv.lib.licenses.bsd3;
+ }) {};
+
"zsh-battery" = callPackage
({ mkDerivation, base, directory, filepath, mtl }:
mkDerivation {
diff --git a/pkgs/development/interpreters/maude/default.nix b/pkgs/development/interpreters/maude/default.nix
index 7632784463f..a977e0801a8 100644
--- a/pkgs/development/interpreters/maude/default.nix
+++ b/pkgs/development/interpreters/maude/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, unzip, makeWrapper , flex, bison, ncurses, buddy, tecla
-, libsigsegv, gmpxx, cvc4, cln
+, libsigsegv, gmpxx, cln
}:
let
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
- flex bison ncurses buddy tecla gmpxx libsigsegv makeWrapper unzip cvc4 cln
+ flex bison ncurses buddy tecla gmpxx libsigsegv makeWrapper unzip cln
];
hardeningDisable = [ "stackprotector" ] ++
@@ -34,6 +34,7 @@ stdenv.mkDerivation rec {
TECLA_LIBS="-ltecla -lncursesw"
LIBS="-lcln"
CFLAGS="-O3" CXXFLAGS="-O3"
+ --without-cvc4 # Our version is too new for Maude to cope.
)
'';
diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix
index 3fe04e6bde2..e4aa7db3e28 100644
--- a/pkgs/development/interpreters/perl/default.nix
+++ b/pkgs/development/interpreters/perl/default.nix
@@ -93,23 +93,23 @@ let
passthru.libPrefix = "lib/perl5/site_perl";
- # TODO: it seems like absolute paths to some coreutils is required.
- postInstall =
- ''
- # Remove dependency between "out" and "man" outputs.
- rm "$out"/lib/perl5/*/*/.packlist
+ # TODO: it seems like absolute paths to some coreutils is required.
+ postInstall =
+ ''
+ # Remove dependency between "out" and "man" outputs.
+ rm "$out"/lib/perl5/*/*/.packlist
- # Remove dependencies on glibc and gcc
- sed "/ *libpth =>/c libpth => ' '," \
- -i "$out"/lib/perl5/*/*/Config.pm
- # TODO: removing those paths would be cleaner than overwriting with nonsense.
- substituteInPlace "$out"/lib/perl5/*/*/Config_heavy.pl \
- --replace "${libcInc}" /no-such-path \
- --replace "${
- if stdenv.cc.cc or null != null then stdenv.cc.cc else "/no-such-path"
- }" /no-such-path \
- --replace "$man" /no-such-path
- ''; # */
+ # Remove dependencies on glibc and gcc
+ sed "/ *libpth =>/c libpth => ' '," \
+ -i "$out"/lib/perl5/*/*/Config.pm
+ # TODO: removing those paths would be cleaner than overwriting with nonsense.
+ substituteInPlace "$out"/lib/perl5/*/*/Config_heavy.pl \
+ --replace "${libcInc}" /no-such-path \
+ --replace "${
+ if stdenv.cc.cc or null != null then stdenv.cc.cc else "/no-such-path"
+ }" /no-such-path \
+ --replace "$man" /no-such-path
+ ''; # */
meta = {
homepage = https://www.perl.org/;
diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index dc1df2dd48a..b1fdb9e81f9 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -334,7 +334,7 @@ in {
};
php71 = generic {
- version = "7.1.2";
- sha256 = "013hlvzjmp7ilckqf3851xwmj37xzq6afsqm67i4whv64d723wp0";
+ version = "7.1.5";
+ sha256 = "15w60nrickdi0rlsy5yw6aa1j42m6z2chv90f7fbgn0v9xwa9si8";
};
}
diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix
index 8426902414a..c5fa05651bb 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/default.nix
+++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix
@@ -15,6 +15,7 @@
, expat
, libffi
, CF, configd, coreutils
+, python-setup-hook
# For the Python package set
, pkgs, packageOverrides ? (self: super: {})
}:
@@ -150,7 +151,7 @@ in stdenv.mkDerivation {
NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-msse2";
DETERMINISTIC_BUILD = 1;
- setupHook = ./setup-hook.sh;
+ setupHook = python-setup-hook sitePackages;
postPatch = optionalString (x11Support && (tix != null)) ''
substituteInPlace "Lib/lib-tk/Tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'"
diff --git a/pkgs/development/interpreters/python/cpython/2.7/setup-hook.sh b/pkgs/development/interpreters/python/cpython/2.7/setup-hook.sh
deleted file mode 100644
index 4770eea886f..00000000000
--- a/pkgs/development/interpreters/python/cpython/2.7/setup-hook.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-addPythonPath() {
- addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/python2.7/site-packages
-}
-
-toPythonPath() {
- local paths="$1"
- local result=
- for i in $paths; do
- p="$i/lib/python2.7/site-packages"
- result="${result}${result:+:}$p"
- done
- echo $result
-}
-
-envHooks+=(addPythonPath)
diff --git a/pkgs/development/interpreters/python/cpython/3.3/default.nix b/pkgs/development/interpreters/python/cpython/3.3/default.nix
index c561a1ed750..9ff8ec51efe 100644
--- a/pkgs/development/interpreters/python/cpython/3.3/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.3/default.nix
@@ -11,6 +11,7 @@
, callPackage
, self
, CF, configd
+, python-setup-hook
# For the Python package set
, pkgs, packageOverrides ? (self: super: {})
}:
@@ -77,7 +78,7 @@ in stdenv.mkDerivation {
)
'';
- setupHook = ./setup-hook.sh;
+ setupHook = python-setup-hook sitePackages;
postInstall = ''
# needed for some packages, especially packages that backport functionality
diff --git a/pkgs/development/interpreters/python/cpython/3.3/setup-hook.sh b/pkgs/development/interpreters/python/cpython/3.3/setup-hook.sh
deleted file mode 100644
index 82a8c0abd32..00000000000
--- a/pkgs/development/interpreters/python/cpython/3.3/setup-hook.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-addPythonPath() {
- addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/python3.3/site-packages
-}
-
-toPythonPath() {
- local paths="$1"
- local result=
- for i in $paths; do
- p="$i/lib/python3.3/site-packages"
- result="${result}${result:+:}$p"
- done
- echo $result
-}
-
-envHooks+=(addPythonPath)
diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix
index b2a4d849c94..4d20a21a4d1 100644
--- a/pkgs/development/interpreters/python/cpython/3.4/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.4/default.nix
@@ -13,6 +13,7 @@
, callPackage
, self
, CF, configd
+, python-setup-hook
# For the Python package set
, pkgs, packageOverrides ? (self: super: {})
}:
@@ -100,7 +101,7 @@ in stdenv.mkDerivation {
''}
'';
- setupHook = ./setup-hook.sh;
+ setupHook = python-setup-hook sitePackages;
postInstall = ''
# needed for some packages, especially packages that backport functionality
diff --git a/pkgs/development/interpreters/python/cpython/3.4/setup-hook.sh b/pkgs/development/interpreters/python/cpython/3.4/setup-hook.sh
deleted file mode 100644
index fddcc0b73fe..00000000000
--- a/pkgs/development/interpreters/python/cpython/3.4/setup-hook.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-addPythonPath() {
- addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/python3.4/site-packages
-}
-
-toPythonPath() {
- local paths="$1"
- local result=
- for i in $paths; do
- p="$i/lib/python3.4/site-packages"
- result="${result}${result:+:}$p"
- done
- echo $result
-}
-
-envHooks+=(addPythonPath)
diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix
index 76f445f7a50..a4aec241a1a 100644
--- a/pkgs/development/interpreters/python/cpython/3.5/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix
@@ -13,6 +13,7 @@
, callPackage
, self
, CF, configd
+, python-setup-hook
# For the Python package set
, pkgs, packageOverrides ? (self: super: {})
}:
@@ -102,7 +103,7 @@ in stdenv.mkDerivation {
''}
'';
- setupHook = ./setup-hook.sh;
+ setupHook = python-setup-hook sitePackages;
postInstall = ''
# needed for some packages, especially packages that backport functionality
diff --git a/pkgs/development/interpreters/python/cpython/3.5/setup-hook.sh b/pkgs/development/interpreters/python/cpython/3.5/setup-hook.sh
deleted file mode 100644
index 2836ad7e8f5..00000000000
--- a/pkgs/development/interpreters/python/cpython/3.5/setup-hook.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-addPythonPath() {
- addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/python3.5/site-packages
-}
-
-toPythonPath() {
- local paths="$1"
- local result=
- for i in $paths; do
- p="$i/lib/python3.5/site-packages"
- result="${result}${result:+:}$p"
- done
- echo $result
-}
-
-envHooks+=(addPythonPath)
diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix
index 15078619166..d2d922ce495 100644
--- a/pkgs/development/interpreters/python/cpython/3.6/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix
@@ -14,6 +14,7 @@
, callPackage
, self
, CF, configd
+, python-setup-hook
# For the Python package set
, pkgs, packageOverrides ? (self: super: {})
}:
@@ -94,7 +95,7 @@ in stdenv.mkDerivation {
''}
'';
- setupHook = ./setup-hook.sh;
+ setupHook = python-setup-hook sitePackages;
postInstall = ''
# needed for some packages, especially packages that backport functionality
diff --git a/pkgs/development/interpreters/python/cpython/3.6/setup-hook.sh b/pkgs/development/interpreters/python/cpython/3.6/setup-hook.sh
deleted file mode 100644
index 26a0d57bc87..00000000000
--- a/pkgs/development/interpreters/python/cpython/3.6/setup-hook.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-addPythonPath() {
- addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/python3.6/site-packages
-}
-
-toPythonPath() {
- local paths="$1"
- local result=
- for i in $paths; do
- p="$i/lib/python3.6/site-packages"
- result="${result}${result:+:}$p"
- done
- echo $result
-}
-
-envHooks+=(addPythonPath)
diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix
index 5d710fcad88..bc586e0b3ce 100644
--- a/pkgs/development/interpreters/python/mk-python-derivation.nix
+++ b/pkgs/development/interpreters/python/mk-python-derivation.nix
@@ -37,6 +37,9 @@
# generated binaries.
, makeWrapperArgs ? []
+# Skip wrapping of python programs altogether
+, dontWrapPythonPrograms ? false
+
, meta ? {}
, passthru ? {}
@@ -51,19 +54,12 @@ if disabled
then throw "${name} not supported for interpreter ${python.executable}"
else
-python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled"] // {
+python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled" "checkInputs"] // {
name = namePrefix + name;
inherit pythonPath;
-
- # Determinism: The interpreter is patched to write null timestamps when compiling python files.
- # This way python doesn't try to update them when we freeze timestamps in nix store.
- DETERMINISTIC_BUILD=1;
- # Determinism: We fix the hashes of str, bytes and datetime objects.
- PYTHONHASHSEED = 0;
-
buildInputs = [ wrapPython ] ++ buildInputs ++ pythonPath
++ [ (ensureNewerSourcesHook { year = "1980"; }) ]
++ (lib.optional (lib.hasSuffix "zip" attrs.src.name or "") unzip)
@@ -76,7 +72,7 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled"] // {
doCheck = false;
doInstallCheck = doCheck;
- postFixup = ''
+ postFixup = lib.optionalString (!dontWrapPythonPrograms) ''
wrapPythonPrograms
'' + lib.optionalString catchConflicts ''
# Check if we have two packages with the same name in the closure and fail.
diff --git a/pkgs/development/interpreters/python/pypy/2.7/default.nix b/pkgs/development/interpreters/python/pypy/2.7/default.nix
index 456a078874c..7552c6cd285 100644
--- a/pkgs/development/interpreters/python/pypy/2.7/default.nix
+++ b/pkgs/development/interpreters/python/pypy/2.7/default.nix
@@ -1,6 +1,7 @@
{ stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, pkgconfig, libffi
, sqlite, openssl, ncurses, python, expat, tcl, tk, tix, xlibsWrapper, libX11
, makeWrapper, callPackage, self, gdbm, db
+, python-setup-hook
# For the Python package set
, pkgs, packageOverrides ? (self: super: {})
}:
@@ -14,6 +15,7 @@ let
pythonVersion = "2.7";
version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
libPrefix = "pypy${majorVersion}";
+ sitePackages = "site-packages";
in stdenv.mkDerivation rec {
name = "pypy-${version}";
@@ -67,7 +69,7 @@ in stdenv.mkDerivation rec {
${python.interpreter} rpython/bin/rpython --make-jobs="$NIX_BUILD_CORES" -Ojit --batch pypy/goal/targetpypystandalone.py --withmod-_minimal_curses --withmod-unicodedata --withmod-thread --withmod-bz2 --withmod-_multiprocessing
'';
- setupHook = ./setup-hook.sh;
+ setupHook = python-setup-hook sitePackages;
postBuild = ''
cd ./lib_pypy
@@ -125,12 +127,11 @@ in stdenv.mkDerivation rec {
passthru = let
pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;};
in rec {
- inherit zlibSupport libPrefix;
+ inherit zlibSupport libPrefix sitePackages;
executable = "pypy";
isPypy = true;
buildEnv = callPackage ../../wrapper.nix { python = self; };
interpreter = "${self}/bin/${executable}";
- sitePackages = "site-packages";
withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;};
pkgs = pythonPackages;
};
diff --git a/pkgs/development/interpreters/python/pypy/2.7/setup-hook.sh b/pkgs/development/interpreters/python/pypy/2.7/setup-hook.sh
deleted file mode 100644
index e9081d1eaa5..00000000000
--- a/pkgs/development/interpreters/python/pypy/2.7/setup-hook.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-addPythonPath() {
- addToSearchPathWithCustomDelimiter : PYTHONPATH $1/site-packages
-}
-
-toPythonPath() {
- local paths="$1"
- local result=
- for i in $paths; do
- p="$i/site-packages"
- result="${result}${result:+:}$p"
- done
- echo $result
-}
-
-envHooks+=(addPythonPath)
diff --git a/pkgs/development/interpreters/python/setup-hook.nix b/pkgs/development/interpreters/python/setup-hook.nix
new file mode 100644
index 00000000000..b66bd1cc5f6
--- /dev/null
+++ b/pkgs/development/interpreters/python/setup-hook.nix
@@ -0,0 +1,13 @@
+{ runCommand }:
+
+sitePackages:
+
+let
+ hook = ./setup-hook.sh;
+in runCommand "python-setup-hook.sh" {
+ inherit sitePackages;
+} ''
+ cp ${hook} hook.sh
+ substituteAllInPlace hook.sh
+ mv hook.sh $out
+''
diff --git a/pkgs/development/interpreters/python/setup-hook.sh b/pkgs/development/interpreters/python/setup-hook.sh
new file mode 100644
index 00000000000..dda9bed39f8
--- /dev/null
+++ b/pkgs/development/interpreters/python/setup-hook.sh
@@ -0,0 +1,21 @@
+addPythonPath() {
+ addToSearchPathWithCustomDelimiter : PYTHONPATH $1/@sitePackages@
+}
+
+toPythonPath() {
+ local paths="$1"
+ local result=
+ for i in $paths; do
+ p="$i/@sitePackages@"
+ result="${result}${result:+:}$p"
+ done
+ echo $result
+}
+
+envHooks+=(addPythonPath)
+
+# Determinism: The interpreter is patched to write null timestamps when compiling python files.
+# This way python doesn't try to update them when we freeze timestamps in nix store.
+export DETERMINISTIC_BUILD=1;
+# Determinism: We fix the hashes of str, bytes and datetime objects.
+export PYTHONHASHSEED=0;
diff --git a/pkgs/development/interpreters/python/wrap.sh b/pkgs/development/interpreters/python/wrap.sh
index 55998bc5b41..1c74e612b55 100644
--- a/pkgs/development/interpreters/python/wrap.sh
+++ b/pkgs/development/interpreters/python/wrap.sh
@@ -1,7 +1,7 @@
# Wrapper around wrapPythonProgramsIn, below. The $pythonPath
# variable is passed in from the buildPythonPackage function.
wrapPythonPrograms() {
- wrapPythonProgramsIn $out "$out $pythonPath"
+ wrapPythonProgramsIn "$out/bin" "$out $pythonPath"
}
# Builds environment variables like PYTHONPATH and PATH walking through closure
@@ -47,34 +47,36 @@ wrapPythonProgramsIn() {
buildPythonPath "$pythonPath"
# Find all regular files in the output directory that are executable.
- find "$dir" -type f -perm -0100 -print0 | while read -d "" f; do
- # Rewrite "#! .../env python" to "#! /nix/store/.../python".
- # Strip suffix, like "3" or "2.7m" -- we don't have any choice on which
- # Python to use besides one with this hook anyway.
- if head -n1 "$f" | grep -q '#!.*/env.*\(python\|pypy\)'; then
- sed -i "$f" -e "1 s^.*/env[ ]*\(python\|pypy\)[^ ]*^#! @executable@^"
- fi
-
- # catch /python and /.python-wrapped
- if head -n1 "$f" | grep -q '/\.\?\(python\|pypy\)'; then
- # dont wrap EGG-INFO scripts since they are called from python
- if echo "$f" | grep -qv EGG-INFO/scripts; then
- echo "wrapping \`$f'..."
- patchPythonScript "$f"
- # wrapProgram creates the executable shell script described
- # above. The script will set PYTHONPATH and PATH variables.!
- # (see pkgs/build-support/setup-hooks/make-wrapper.sh)
- local -a wrap_args=("$f"
- --prefix PATH ':' "$program_PATH")
-
- # Add any additional arguments provided by makeWrapperArgs
- # argument to buildPythonPackage.
- local -a user_args="($makeWrapperArgs)"
- local -a wrapProgramArgs=("${wrap_args[@]}" "${user_args[@]}")
- wrapProgram "${wrapProgramArgs[@]}"
+ if [ -d "$dir" ]; then
+ find "$dir" -type f -perm -0100 -print0 | while read -d "" f; do
+ # Rewrite "#! .../env python" to "#! /nix/store/.../python".
+ # Strip suffix, like "3" or "2.7m" -- we don't have any choice on which
+ # Python to use besides one with this hook anyway.
+ if head -n1 "$f" | grep -q '#!.*/env.*\(python\|pypy\)'; then
+ sed -i "$f" -e "1 s^.*/env[ ]*\(python\|pypy\)[^ ]*^#! @executable@^"
fi
- fi
- done
+
+ # catch /python and /.python-wrapped
+ if head -n1 "$f" | grep -q '/\.\?\(python\|pypy\)'; then
+ # dont wrap EGG-INFO scripts since they are called from python
+ if echo "$f" | grep -qv EGG-INFO/scripts; then
+ echo "wrapping \`$f'..."
+ patchPythonScript "$f"
+ # wrapProgram creates the executable shell script described
+ # above. The script will set PYTHONPATH and PATH variables.!
+ # (see pkgs/build-support/setup-hooks/make-wrapper.sh)
+ local -a wrap_args=("$f"
+ --prefix PATH ':' "$program_PATH")
+
+ # Add any additional arguments provided by makeWrapperArgs
+ # argument to buildPythonPackage.
+ local -a user_args="($makeWrapperArgs)"
+ local -a wrapProgramArgs=("${wrap_args[@]}" "${user_args[@]}")
+ wrapProgram "${wrapProgramArgs[@]}"
+ fi
+ fi
+ done
+ fi
}
# Adds the lib and bin directories to the PYTHONPATH and PATH variables,
diff --git a/pkgs/development/libraries/accounts-qt/default.nix b/pkgs/development/libraries/accounts-qt/default.nix
index 4f74c5fca35..a6d9a9381f9 100644
--- a/pkgs/development/libraries/accounts-qt/default.nix
+++ b/pkgs/development/libraries/accounts-qt/default.nix
@@ -18,6 +18,9 @@ stdenv.mkDerivation rec {
qmakeFlags="$qmakeFlags LIBDIR=$out/lib CMAKE_CONFIG_PATH=$out/lib/cmake"
'';
+ # Hack to avoid TMPDIR in RPATHs.
+ preFixup = ''rm -rf "$(pwd)" '';
+
meta = with stdenv.lib; {
description = "Qt library for accessing the online accounts database";
homepage = "http://code.google.com/p/accounts-sso/";
diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix
index bdd3b5cea50..848cae09ed4 100644
--- a/pkgs/development/libraries/ffmpeg-full/default.nix
+++ b/pkgs/development/libraries/ffmpeg-full/default.nix
@@ -230,11 +230,11 @@ assert nvenc -> nvidia-video-sdk != null && nonfreeLicensing;
stdenv.mkDerivation rec {
name = "ffmpeg-full-${version}";
- version = "3.3";
+ version = "3.3.1";
src = fetchurl {
url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz";
- sha256 = "17anx7rnbi63if1ndr61836lf76dpn47n0y424hc48bj05y7z7jr";
+ sha256 = "0bwgm6z6k3khb91qh9xv15inykkfchpkm0lcdckkxhkacpyaf0mp";
};
patchPhase = ''patchShebangs .
diff --git a/pkgs/development/libraries/ffmpeg/3.3.nix b/pkgs/development/libraries/ffmpeg/3.3.nix
index 03bb9d44dda..d6380b795af 100644
--- a/pkgs/development/libraries/ffmpeg/3.3.nix
+++ b/pkgs/development/libraries/ffmpeg/3.3.nix
@@ -6,7 +6,7 @@
callPackage ./generic.nix (args // rec {
version = "${branch}";
- branch = "3.3";
- sha256 = "1p3brx0qa3i3569zlmcmpbxf17q73nrmbx2vp39s8h77r53qdq11";
+ branch = "3.3.1";
+ sha256 = "0c37bdqwmaziikr2d5pqp7504ail6i7a1mfcmc06mdpwfxxwvcpw";
darwinFrameworks = [ Cocoa CoreMedia ];
})
diff --git a/pkgs/development/libraries/freetype/cve-2017-8105.patch b/pkgs/development/libraries/freetype/cve-2017-8105.patch
new file mode 100644
index 00000000000..dc4327a52a8
--- /dev/null
+++ b/pkgs/development/libraries/freetype/cve-2017-8105.patch
@@ -0,0 +1,27 @@
+http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=f958c48ee43
+
+diff --git a/src/psaux/t1decode.c b/src/psaux/t1decode.c
+index af7b465..7dd4513 100644
+--- a/src/psaux/t1decode.c
++++ b/src/psaux/t1decode.c
+@@ -780,10 +780,19 @@
+ /* point without adding any point to the outline */
+ idx = decoder->num_flex_vectors++;
+ if ( idx > 0 && idx < 7 )
++ {
++ /* in malformed fonts it is possible to have other */
++ /* opcodes in the middle of a flex (which don't */
++ /* increase `num_flex_vectors'); we thus have to */
++ /* check whether we can add a point */
++ if ( FT_SET_ERROR( t1_builder_check_points( builder, 1 ) ) )
++ goto Syntax_Error;
++
+ t1_builder_add_point( builder,
+ x,
+ y,
+ (FT_Byte)( idx == 3 || idx == 6 ) );
++ }
+ }
+ break;
+
+
diff --git a/pkgs/development/libraries/freetype/cve-2017-8287.patch b/pkgs/development/libraries/freetype/cve-2017-8287.patch
new file mode 100644
index 00000000000..7ccf4f3278b
--- /dev/null
+++ b/pkgs/development/libraries/freetype/cve-2017-8287.patch
@@ -0,0 +1,22 @@
+http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=3774fc08b
+
+diff --git a/src/psaux/psobjs.c b/src/psaux/psobjs.c
+index d18e821..0baf836 100644
+--- a/src/psaux/psobjs.c
++++ b/src/psaux/psobjs.c
+@@ -1718,6 +1718,14 @@
+ first = outline->n_contours <= 1
+ ? 0 : outline->contours[outline->n_contours - 2] + 1;
+
++ /* in malformed fonts it can happen that a contour was started */
++ /* but no points were added */
++ if ( outline->n_contours && first == outline->n_points )
++ {
++ outline->n_contours--;
++ return;
++ }
++
+ /* We must not include the last point in the path if it */
+ /* is located on the first point. */
+ if ( outline->n_points > 1 )
+
diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix
index 287a0742440..9b2c6fe11e1 100644
--- a/pkgs/development/libraries/freetype/default.nix
+++ b/pkgs/development/libraries/freetype/default.nix
@@ -48,6 +48,9 @@ in stdenv.mkDerivation {
./pcf-config-long-family-names.patch
./disable-pcf-long-family-names.patch
./enable-table-validation.patch
+ # remove the two CVE patches after updating to >= 2.8
+ ./cve-2017-8105.patch
+ ./cve-2017-8287.patch
] ++
optional useEncumberedCode ./enable-subpixel-rendering.patch;
diff --git a/pkgs/development/libraries/gnutls/3.5.nix b/pkgs/development/libraries/gnutls/3.5.nix
index 77ecd4957f7..8071cd4b46b 100644
--- a/pkgs/development/libraries/gnutls/3.5.nix
+++ b/pkgs/development/libraries/gnutls/3.5.nix
@@ -1,11 +1,11 @@
{ callPackage, fetchurl, libunistring, ... } @ args:
callPackage ./generic.nix (args // rec {
- version = "3.5.11";
+ version = "3.5.12";
src = fetchurl {
url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.5/gnutls-${version}.tar.xz";
- sha256 = "13z2dxxyrsb7gfpl1k2kafqh2zaigi872y5xgykhs9cyaz2mqxji";
+ sha256 = "1jspvrmydqgz30c1ji94b55gr2dynz7p96p4y8fkhad0xajkkjv3";
};
# Skip two tests introduced in 3.5.11. Probable reasons of failure:
diff --git a/pkgs/development/libraries/irrlicht/default.nix b/pkgs/development/libraries/irrlicht/default.nix
index 71bb871a45d..bc3e1a20abb 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/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix
index f7261e11738..d3cb1283331 100644
--- a/pkgs/development/libraries/libao/default.nix
+++ b/pkgs/development/libraries/libao/default.nix
@@ -14,7 +14,8 @@ stdenv.mkDerivation rec {
buildInputs =
[ pkgconfig ] ++
- lib.optional stdenv.isLinux (if usePulseAudio then libpulseaudio else alsaLib) ++
+ lib.optional usePulseAudio libpulseaudio ++
+ lib.optional stdenv.isLinux alsaLib ++
lib.optional stdenv.isLinux libcap ++
lib.optionals stdenv.isDarwin [ CoreAudio CoreServices AudioUnit ];
diff --git a/pkgs/development/libraries/libcommuni/default.nix b/pkgs/development/libraries/libcommuni/default.nix
index 8e911a9b015..3632fff43bd 100644
--- a/pkgs/development/libraries/libcommuni/default.nix
+++ b/pkgs/development/libraries/libcommuni/default.nix
@@ -25,6 +25,9 @@ stdenv.mkDerivation rec {
doCheck = true;
+ # Hack to avoid TMPDIR in RPATHs.
+ preFixup = ''rm -rf "$(pwd)" '';
+
meta = with stdenv.lib; {
description = "A cross-platform IRC framework written with Qt";
homepage = https://communi.github.io;
diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix
index de219bee382..a8cf2864807 100644
--- a/pkgs/development/libraries/libdrm/default.nix
+++ b/pkgs/development/libraries/libdrm/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, valgrind }:
+{ stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, valgrind-light }:
stdenv.mkDerivation rec {
- name = "libdrm-2.4.79";
+ name = "libdrm-2.4.81";
src = fetchurl {
url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2";
- sha256 = "c6aaf319293bce38023e9a637471b0f45c93c807d2a279060d741fc7a2e5b197";
+ sha256 = "8cc05c195ac8708199979a94c4e4d1a928c14ec338ecbcb38ead09f54dae11ae";
};
outputs = [ "out" "dev" ];
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ libpthreadstubs libpciaccess ];
+ buildInputs = [ libpthreadstubs libpciaccess valgrind-light ];
# libdrm as of 2.4.70 does not actually do anything with udev.
patches = stdenv.lib.optional stdenv.isDarwin ./libdrm-apple.patch;
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
preConfigure = stdenv.lib.optionalString stdenv.isDarwin
"echo : \\\${ac_cv_func_clock_gettime=\'yes\'} > config.cache";
- configureFlags = [ "--disable-valgrind" ]
+ configureFlags = [ ]
++ stdenv.lib.optionals (stdenv.isArm || stdenv.isAarch64) [ "--enable-tegra-experimental-api" "--enable-etnaviv-experimental-api" ]
++ stdenv.lib.optional stdenv.isDarwin "-C";
diff --git a/pkgs/development/libraries/libdwg/default.nix b/pkgs/development/libraries/libdwg/default.nix
index 2a2dfbb0be5..5ee92b46385 100644
--- a/pkgs/development/libraries/libdwg/default.nix
+++ b/pkgs/development/libraries/libdwg/default.nix
@@ -12,6 +12,9 @@ stdenv.mkDerivation {
hardeningDisable = [ "format" ];
+ # Hack to avoid TMPDIR in RPATHs.
+ preFixup = ''rm -rf "$(pwd)" '';
+
meta = {
description = "Library reading dwg files";
homepage = http://libdwg.sourceforge.net/en/;
diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix
index d6c0c538a8f..b0f1046aa59 100644
--- a/pkgs/development/libraries/libfilezilla/default.nix
+++ b/pkgs/development/libraries/libfilezilla/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "libfilezilla-${version}";
- version = "0.9.1";
+ version = "0.9.2";
src = fetchurl {
url = "http://download.filezilla-project.org/libfilezilla/${name}.tar.bz2";
- sha256 = "06ivj40bk5b76a36zwhnwqvg564hgccncnn5nb5cqc7kf4bkkchq";
+ sha256 = "1qrvddjqz5jv6920gcfqsrsjksi2845hn96g0z3vpcsm6nifhqn1";
};
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/libftdi/default.nix b/pkgs/development/libraries/libftdi/default.nix
index 36f4a04c9df..f0d05c0b263 100644
--- a/pkgs/development/libraries/libftdi/default.nix
+++ b/pkgs/development/libraries/libftdi/default.nix
@@ -12,6 +12,9 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ libusb ];
+ # Hack to avoid TMPDIR in RPATHs.
+ preFixup = ''rm -rf "$(pwd)" '';
+
meta = {
description = "A library to talk to FTDI chips using libusb";
homepage = http://www.intra2net.com/en/developer/libftdi/;
diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix
index 7bcfcef5788..328c5db0b65 100644
--- a/pkgs/development/libraries/libopus/default.nix
+++ b/pkgs/development/libraries/libopus/default.nix
@@ -2,14 +2,14 @@
, fixedPoint ? false, withCustomModes ? true }:
let
- version = "1.1.4";
+ version = "1.1.5";
in
stdenv.mkDerivation rec {
name = "libopus-${version}";
src = fetchurl {
url = "http://downloads.xiph.org/releases/opus/opus-${version}.tar.gz";
- sha256 = "14l6kpapmcnvl7p9hrmbqcnzj13zfzyppyc9a5kd4788h2rvc8li";
+ sha256 = "1r33nm7b052dw7gsc99809df1zmj5icfiljqbrfkw2pll0f9i17b";
};
outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix
index 163357a0c0f..cf3ad5f1ebb 100644
--- a/pkgs/development/libraries/libproxy/default.nix
+++ b/pkgs/development/libraries/libproxy/default.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake
-, dbus, networkmanager, webkitgtk214x, pcre, python2 }:
+, dbus, networkmanager, webkitgtk216x, pcre, python2 }:
stdenv.mkDerivation rec {
name = "libproxy-${version}";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig cmake ];
- buildInputs = [ dbus networkmanager webkitgtk214x pcre ];
+ buildInputs = [ dbus networkmanager webkitgtk216x pcre ];
cmakeFlags = [
"-DWITH_WEBKIT3=ON"
diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix
index 3b74406d7bf..dbd203b97cf 100644
--- a/pkgs/development/libraries/libtasn1/default.nix
+++ b/pkgs/development/libraries/libtasn1/default.nix
@@ -8,6 +8,14 @@ stdenv.mkDerivation rec {
sha256 = "00jsix5hny0g768zv4hk78dib7w0qmk5fbizf4jj37r51nd4s6k8";
};
+ patches = [
+ (fetchurl {
+ name = "CVE-2017-6891.patch";
+ url = "https://git.savannah.gnu.org/gitweb/?p=libtasn1.git;a=patch;h=5520704d075802df25ce4ffccc010ba1641bd484";
+ sha256 = "000r6wb87zkx8yhzkf1c3h7p5akwhjw51cv8f1yjnplrqqrr7h2k";
+ })
+ ];
+
outputs = [ "out" "dev" "devdoc" ];
outputBin = "dev";
diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix
index c6705703149..a23e3704035 100644
--- a/pkgs/development/libraries/libtiff/default.nix
+++ b/pkgs/development/libraries/libtiff/default.nix
@@ -12,10 +12,10 @@ stdenv.mkDerivation rec {
};
prePatch =let
- # https://lwn.net/Vulnerabilities/711777/
+ # https://lwn.net/Vulnerabilities/711777/ and more patched in *-6 -> *-7
debian = fetchurl {
- url = http://http.debian.net/debian/pool/main/t/tiff/tiff_4.0.7-5.debian.tar.xz;
- sha256 = "1ribxdn89wx3nllcyh7ql3dx6wpr1h7z3waglz1w7dklxm43q67l";
+ url = http://http.debian.net/debian/pool/main/t/tiff/tiff_4.0.7-6.debian.tar.xz;
+ sha256 = "9c9048c28205bdbeb5ba36c7a194d0cd604bd137c70961607bfc8a079be5fa31";
};
in ''
tar xf '${debian}'
diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix
index 941ab6710c2..fdf5191bf72 100644
--- a/pkgs/development/libraries/libuv/default.nix
+++ b/pkgs/development/libraries/libuv/default.nix
@@ -2,19 +2,19 @@
, ApplicationServices, CoreServices }:
stdenv.mkDerivation rec {
- version = "1.11.0";
+ version = "1.12.0";
name = "libuv-${version}";
src = fetchFromGitHub {
owner = "libuv";
repo = "libuv";
rev = "v${version}";
- sha256 = "02sm7f3l0shpfz25b77q2jjvlypc1mmz4zpzfgfmiplhgxxaa6la";
+ sha256 = "0m025i0sfm4iv3aiic88x4y4bbhhdb204pmd9r383fsl458fck2p";
};
postPatch = let
toDisable = [
- "getnameinfo_basic" # probably network-dependent
+ "getnameinfo_basic" "udp_send_hang_loop" # probably network-dependent
"spawn_setuid_fails" "spawn_setgid_fails" "fs_chown" # user namespaces
"getaddrinfo_fail" "getaddrinfo_fail_sync"
]
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index e9edda698f4..a8561d22bf5 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -2,7 +2,7 @@
, pkgconfig, intltool, autoreconfHook, substituteAll
, file, expat, libdrm, xorg, wayland, openssl
, llvmPackages, libffi, libomxil-bellagio, libva
-, libelf, libvdpau, python2
+, libelf, libvdpau
, grsecEnabled ? false
, enableRadv ? false
# Texture floats are patented, see docs/patents.txt, so we don't enable them for full Mesa.
@@ -36,7 +36,7 @@ let
then ["nouveau" "freedreno" "vc4" "etnaviv" "imx"]
else if stdenv.isAarch64
then ["nouveau" "vc4" ]
- else ["i915" "ilo" "r300" "r600" "radeonsi" "nouveau"];
+ else ["i915" "r300" "r600" "radeonsi" "nouveau"];
defaultDriDrivers =
if (stdenv.isArm || stdenv.isAarch64)
then ["nouveau"]
@@ -67,7 +67,7 @@ let
in
let
- version = "17.0.4";
+ version = "17.1.1";
branch = head (splitString "." version);
driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32";
in
@@ -82,7 +82,7 @@ stdenv.mkDerivation {
"ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
"https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz"
];
- sha256 = "1269dc8545a193932a0779b2db5bce9be4a5f6813b98c38b93b372be8362a346";
+ sha256 = "aed503f94c0c1630a162a3e276f4ee12a86764cee4cb92338ea2dea99a04e7ef";
};
prePatch = "patchShebangs .";
@@ -103,7 +103,7 @@ stdenv.mkDerivation {
"--localstatedir=/var"
"--with-dri-driverdir=$(drivers)/lib/dri"
"--with-dri-searchpath=${driverLink}/lib/dri"
- "--with-egl-platforms=x11,wayland,drm"
+ "--with-platforms=x11,wayland,drm"
]
++ (optional (galliumDrivers != [])
("--with-gallium-drivers=" +
@@ -126,7 +126,7 @@ stdenv.mkDerivation {
"--enable-glx"
"--enable-glx-tls"
"--enable-gallium-osmesa" # used by wine
- "--enable-gallium-llvm"
+ "--enable-llvm"
"--enable-egl"
"--enable-xa" # used in vmware driver
"--enable-gbm"
@@ -152,7 +152,6 @@ stdenv.mkDerivation {
libX11 libXext libxcb libXt libXfixes libxshmfence
libffi wayland libvdpau libelf libXvMC
libomxil-bellagio libva libpthreadstubs openssl/*or another sha1 provider*/
- (python2.withPackages (ps: [ ps.Mako ]))
];
diff --git a/pkgs/development/libraries/mesa/symlink-drivers.patch b/pkgs/development/libraries/mesa/symlink-drivers.patch
index 68c0f1da26b..af2ec9fdb09 100644
--- a/pkgs/development/libraries/mesa/symlink-drivers.patch
+++ b/pkgs/development/libraries/mesa/symlink-drivers.patch
@@ -11,11 +11,12 @@ diff -ru -x '*~' mesa-12.0.3-orig/src/gallium/targets/dri/Makefile.am mesa-12.0.
install-data-hook:
for i in $(TARGET_DRIVERS); do \
- ln -f $(DESTDIR)$(dridir)/gallium_dri.so \
-+ ln -srf $(DESTDIR)$(dridir)/gallium_dri.so \
++ ln -srf $(DESTDIR)$(dridir)/gallium_dri.so \
$(DESTDIR)$(dridir)/$${i}_dri.so; \
done; \
-- $(RM) $(DESTDIR)$(dridir)/gallium_dri.*
-+ $(RM) $(DESTDIR)$(dridir)/gallium_dri.la
+- $(RM) $(DESTDIR)$(dridir)/gallium_dri.*; \
++ $(RM) $(DESTDIR)$(dridir)/gallium_dri.la \
+ $(RM) -d $(DESTDIR)$(dridir) &>/dev/null || true
uninstall-hook:
for i in $(TARGET_DRIVERS); do \
@@ -60,8 +61,9 @@ diff -ru -x '*~' mesa-12.0.3-orig/src/gallium/targets/vdpau/Makefile.am mesa-12.
ln -sf $${l} \
$${dest_dir}/$${k}; \
done; \
-- $(RM) $${dest_dir}/libvdpau_gallium.*
-+ $(RM) $${dest_dir}/libvdpau_gallium.la
+- $(RM) $${dest_dir}/libvdpau_gallium.*; \
++ $(RM) $${dest_dir}/libvdpau_gallium.la \
+ $(RM) -d $${dest_dir} &>/dev/null || true
uninstall-hook:
for i in $(TARGET_DRIVERS); do \
@@ -73,7 +75,7 @@ diff -ru -x '*~' mesa-12.0.3-orig/src/gallium/targets/xvmc/Makefile.am mesa-12.0
k=libXvMC$${i}.$(LIB_EXT); \
l=$${k}.$(XVMC_MAJOR).$(XVMC_MINOR).0; \
- ln -f $${dest_dir}/$${j}.$(XVMC_MAJOR).$(XVMC_MINOR).0 \
-+ ln -srf $${dest_dir}/$${j}.$(XVMC_MAJOR).$(XVMC_MINOR).0 \
++ ln -srf $${dest_dir}/$${j}.$(XVMC_MAJOR).$(XVMC_MINOR).0 \
$${dest_dir}/$${l}; \
ln -sf $${l} \
$${dest_dir}/$${k}.$(XVMC_MAJOR).$(XVMC_MINOR); \
@@ -81,8 +83,9 @@ diff -ru -x '*~' mesa-12.0.3-orig/src/gallium/targets/xvmc/Makefile.am mesa-12.0
ln -sf $${l} \
$${dest_dir}/$${k}; \
done; \
-- $(RM) $${dest_dir}/libXvMCgallium.*
-+ $(RM) $${dest_dir}/libXvMCgallium.la
+- $(RM) $${dest_dir}/libXvMCgallium.*; \
++ $(RM) $${dest_dir}/libXvMCgallium.la \
+ $(RM) -d $${dest_dir} &>/dev/null || true
uninstall-hook:
for i in $(TARGET_DRIVERS); do \
diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 9e7f2eef46b..46283e371aa 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -65,9 +65,6 @@ stdenv.mkDerivation rec {
sed -i -e 's,LIB_SUFFIX="t,LIB_SUFFIX=",' configure
'';
- # Here only for native hash, remove on next mass rebuild
- selfNativeBuildInput = buildPlatform == hostPlatform;
-
enableParallelBuilding = true;
doCheck = false;
diff --git a/pkgs/development/libraries/physics/cernlib/default.nix b/pkgs/development/libraries/physics/cernlib/default.nix
new file mode 100644
index 00000000000..dad138c8433
--- /dev/null
+++ b/pkgs/development/libraries/physics/cernlib/default.nix
@@ -0,0 +1,63 @@
+{ stdenv, fetchurl, gfortran, gnumake, imake, makedepend, motif, xorg }:
+
+stdenv.mkDerivation rec {
+ version = "2006";
+ name = "cernlib-${version}";
+
+ src = fetchurl {
+ url = "http://cernlib.web.cern.ch/cernlib/download/${version}_source/tar/${version}_src.tar.gz";
+ sha256 = "0awla1rl96z82br7slcmg8ks1d2a7slk6dj79ywb871j2ksi3fky";
+ };
+
+ buildInputs = with xorg; [ gfortran motif libX11 libXft libXt ];
+ nativeBuildInputs = [ gnumake imake makedepend ];
+ sourceRoot = ".";
+
+ patches = [ ./patch ];
+
+ postPatch = ''
+ substituteInPlace 2006/src/config/site.def \
+ --replace "# define MakeCmd gmake" "# define MakeCmd make"
+ '';
+
+ configurePhase = ''
+ export CERN=`pwd`
+ export CERN_LEVEL=${version}
+ export CERN_ROOT=$CERN/$CERN_LEVEL
+ export CVSCOSRC=`pwd`/$CERN_LEVEL/src
+ export PATH=$PATH:$CERN_ROOT/bin
+ '';
+
+ buildPhase = ''
+ cd $CERN_ROOT
+ mkdir -p build bin lib
+
+ cd $CERN_ROOT/build
+ $CVSCOSRC/config/imake_boot
+ make bin/kuipc
+ make scripts/Makefile
+ pushd scripts
+ make install.bin
+ popd
+ make
+ '';
+
+ installPhase = ''
+ mkdir "$out"
+ cp -r "$CERN_ROOT/bin" "$out"
+ cp -r "$CERN_ROOT/lib" "$out"
+ mkdir "$out/$CERN_LEVEL"
+ ln -s "$out/bin" "$out/$CERN_LEVEL/bin"
+ ln -s "$out/lib" "$out/$CERN_LEVEL/lib"
+ '';
+
+ setupHook = ./setup-hook.sh;
+
+ meta = {
+ homepage = http://cernlib.web.cern.ch;
+ description = "Legacy collection of libraries and modules for data analysis in high energy physics";
+ platforms = stdenv.lib.platforms.unix;
+ maintainers = with stdenv.lib.maintainers; [ veprbl ];
+ license = stdenv.lib.licenses.gpl2;
+ };
+}
diff --git a/pkgs/development/libraries/physics/cernlib/patch b/pkgs/development/libraries/physics/cernlib/patch
new file mode 100644
index 00000000000..2d75b6bf0f8
--- /dev/null
+++ b/pkgs/development/libraries/physics/cernlib/patch
@@ -0,0 +1,186 @@
+diff --git a/2006/src/config/Imake.tmpl b/2006/src/config/Imake.tmpl
+index 054fb04..a3b3828 100644
+--- a/2006/src/config/Imake.tmpl
++++ b/2006/src/config/Imake.tmpl
+@@ -455,7 +455,7 @@ XCOMM the platform-specific parameters - edit site.def to change
+ #define NoRConst NO /* YES if const for structs of funcs is bad */
+ #endif
+ #ifndef InstPgmFlags
+-#define InstPgmFlags -s
++#define InstPgmFlags
+ #endif
+ #ifndef InstBinFlags
+ #define InstBinFlags -m 0755
+diff --git a/2006/src/config/biglib.rules b/2006/src/config/biglib.rules
+index c90e58a..9173bdc 100644
+--- a/2006/src/config/biglib.rules
++++ b/2006/src/config/biglib.rules
+@@ -368,7 +368,7 @@ define build-object-list @@\
+ @ (set -e;\ @@\
+ case '${MFLAGS}' in *[i]*) set +e;; esac; \ @@\
+ subdirs=Quote(dirs);\ @@\
+- list=`/bin/pwd`/$@;\ @@\
++ list=`pwd`/$@;\ @@\
+ for dir in $$subdirs; do \ @@\
+ (set -e;cd $$dir;SedCmd -e "\=^[^/]=s=^.=$$dir/&=" $@ >> $$list);\@@\
+ done) || (rm $@; exit 1) @@\
+diff --git a/2006/src/config/imake_boot b/2006/src/config/imake_boot
+index b52d0d3..69cf1b3 100755
+--- a/2006/src/config/imake_boot
++++ b/2006/src/config/imake_boot
+@@ -10,8 +10,8 @@ if [ "$CVSCOSRC" = "" ] ; then
+ fi
+ if [ -f Imakefile ] ; then
+ imake -DUseInstalled -I$CVSCOSRC/config \
+- -DTOPDIR=`/bin/pwd` -DCURDIR= -fImakefile
++ -DTOPDIR=`pwd` -DCURDIR= -fImakefile
+ else
+ imake -DUseInstalled -I$CVSCOSRC/config \
+- -DTOPDIR=`/bin/pwd` -DCURDIR= -f$CVSCOSRC/Imakefile
++ -DTOPDIR=`pwd` -DCURDIR= -f$CVSCOSRC/Imakefile
+ fi
+diff --git a/2006/src/config/linux-lp64.cf b/2006/src/config/linux-lp64.cf
+index e071b2f..3cc5c3b 100644
+--- a/2006/src/config/linux-lp64.cf
++++ b/2006/src/config/linux-lp64.cf
+@@ -173,7 +173,7 @@
+ #define FortranCmd g77
+ #define XargsCmd xargs
+ #define FortranSaveFlags /* */ /* Everything static !? */
+-#define DefaultFCOptions -fno-automatic -fno-second-underscore -fugly-complex
++#define DefaultFCOptions -fno-automatic -fno-second-underscore
+ #define CernlibSystem -DCERNLIB_LINUX -DCERNLIB_UNIX -DCERNLIB_LNX -DCERNLIB_QMGLIBC -DCERNLIB_QMLXIA64
+
+ # endif
+diff --git a/2006/src/config/linux.cf b/2006/src/config/linux.cf
+index cc0bee5..a8dd954 100644
+--- a/2006/src/config/linux.cf
++++ b/2006/src/config/linux.cf
+@@ -258,7 +258,7 @@ endif @@\
+ #define FortranCmd g77
+ #define XargsCmd xargs
+ #define FortranSaveFlags /* */ /* Everything static !? */
+-#define DefaultFCOptions -fno-automatic -fno-second-underscore -fugly-complex
++#define DefaultFCOptions -fno-automatic -fno-second-underscore
+ #define CernlibSystem -DCERNLIB_LINUX -DCERNLIB_UNIX -DCERNLIB_LNX -DCERNLIB_QMGLIBC
+
+ # endif
+diff --git a/2006/src/packlib/kuip/code_kuip/kkern.c b/2006/src/packlib/kuip/code_kuip/kkern.c
+index 3a5579f..5f3c352 100644
+--- a/2006/src/packlib/kuip/code_kuip/kkern.c
++++ b/2006/src/packlib/kuip/code_kuip/kkern.c
+@@ -543,24 +543,6 @@ char *str0dup( const char *str )
+
+
+ /*
+- * like strdup() but string is n characters long and not terminated
+- */
+-char *strndup( const char *str,
+- size_t len )
+-{
+- size_t bytes = len + 1;
+- char *p;
+-
+- if( bytes < ALLOC_MIN_BYTES )
+- bytes = ALLOC_MIN_BYTES;
+-
+- p = strncpy( malloc( bytes ), str, len );
+- p[len] = '\0';
+- return p;
+-}
+-
+-
+-/*
+ * strdup() of character representation of integer n
+ */
+ char *stridup( int n )
+diff --git a/2006/src/packlib/kuip/code_kuip/kmenu.c b/2006/src/packlib/kuip/code_kuip/kmenu.c
+index f135b07..23007a8 100644
+--- a/2006/src/packlib/kuip/code_kuip/kmenu.c
++++ b/2006/src/packlib/kuip/code_kuip/kmenu.c
+@@ -1404,7 +1404,7 @@ void interactive_find( char *expr, int keym )
+ printf ("See also:\n ");
+ for (i = 0; i < nval; i++) {
+ if (i == ncmd) continue;
+- printf (flis_name[i]);
++ printf ("%s", flis_name[i]);
+ if (i < nval-1)
+ printf (", ");
+ else
+diff --git a/2006/src/packlib/kuip/kuip/kstring.h b/2006/src/packlib/kuip/kuip/kstring.h
+index 7811f15..12a1344 100644
+--- a/2006/src/packlib/kuip/kuip/kstring.h
++++ b/2006/src/packlib/kuip/kuip/kstring.h
+@@ -21,7 +21,6 @@ extern "C" {
+ */
+
+ #ifndef WIN32
+-extern void* memmove( void* dst, const void* src, size_t n );
+ #endif
+
+ /* GF. make conform to kkern.c#if !defined(__convexc__)*/
+@@ -46,7 +45,6 @@ extern char* str4dup( const char* str1, const char* str2, const char* str3,
+ const char* str4 );
+ extern char* str5dup( const char* str1, const char* str2, const char* str3,
+ const char* str4, const char* str5 );
+-extern char* strndup( const char* buf, size_t n );
+ extern char* stridup( int i );
+
+ extern char* mstrcat( char* ptr, const char* str );
+diff --git a/2006/src/pawlib/paw/cpaw/bugrep.c b/2006/src/pawlib/paw/cpaw/bugrep.c
+index d503a45..d26e30f 100644
+--- a/2006/src/pawlib/paw/cpaw/bugrep.c
++++ b/2006/src/pawlib/paw/cpaw/bugrep.c
+@@ -432,51 +432,7 @@ br_add_config( char * tmp_file )
+
+ static int
+ br_mail_file( char *addr, char *subj, char *file )
+-#if (defined(CERNLIB_UNIX))&&(!defined(CERNLIB_WINNT))&&(!defined(CERNLIB_MACOSX))
+-{
+- FILE *mfp, *fp;
+- char line[1024], my_addr[L_cuserid];
+- time_t clock;
+- struct tm *ts;
+-
+- fp = fopen( file, "r" );
+- if ( fp == NULL ) {
+- printf( "BUGREPORT: cannot (re)open temporary file\n" );
+- return MAIL_ERROR;
+- }
+-
+- cuserid( my_addr );
+-
+- sprintf( line, "/usr/lib/sendmail -t" );
+- mfp = popen( line, "w" );
+-
+- if ( mfp == NULL ) {
+- printf( "BUGREPORT: cannot run sendmail\n" );
+- return MAIL_ERROR;
+- }
+-
+-
+- clock = time( (time_t *) 0 );
+- ts = localtime( &clock );
+- strftime( line, sizeof( line ),
+- "%a, %d %h %y %H:%M:%S", ts );
+- fprintf ( mfp, "To: %s\n", addr );
+- fprintf ( mfp, "Bcc: %s\n", my_addr );
+- fprintf ( mfp, "Date: %s\n", line );
+- fprintf ( mfp, "Subject: %s\n", subj );
+- fprintf ( mfp, "\n" );
+-
+- while( fgets( line, sizeof( line ), fp ) != NULL ) {
+- fputs( line, mfp );
+- }
+- fclose( fp );
+-
+- pclose( mfp );
+-
+- return MAIL_OK;
+-}
+-#endif
+-#if defined(CERNLIB_MACOSX)
++#if (defined(CERNLIB_UNIX))&&(!defined(CERNLIB_WINNT))
+ {
+ FILE *mfp, *fp;
+ char line[1024], *my_addr;
diff --git a/pkgs/development/libraries/physics/cernlib/setup-hook.sh b/pkgs/development/libraries/physics/cernlib/setup-hook.sh
new file mode 100644
index 00000000000..d8375932776
--- /dev/null
+++ b/pkgs/development/libraries/physics/cernlib/setup-hook.sh
@@ -0,0 +1,3 @@
+export CERN_LEVEL=@version@
+export CERN=@out@
+export CERN_ROOT=$CERN/$CERN_LEVEL
diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix
index c1f8725f6f7..804bca5f8a5 100644
--- a/pkgs/development/libraries/polkit/default.nix
+++ b/pkgs/development/libraries/polkit/default.nix
@@ -1,6 +1,8 @@
-{ stdenv, fetchurl, pkgconfig, glib, expat, pam, intltool, spidermonkey_17
-, gobjectIntrospection, libxslt, docbook_xsl, docbook_xml_dtd_412
-, useSystemd ? stdenv.isLinux, systemd }:
+{ stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, glib, expat, pam
+, intltool, spidermonkey_17 , gobjectIntrospection, libxslt, docbook_xsl
+, docbook_xml_dtd_412, gtk_doc
+, useSystemd ? stdenv.isLinux, systemd
+}:
let
@@ -22,11 +24,28 @@ stdenv.mkDerivation rec {
sha256 = "109w86kfqrgz83g9ivggplmgc77rz8kx8646izvm2jb57h4rbh71";
};
+ patches = [
+ (fetchpatch {
+ url = "http://pkgs.fedoraproject.org/cgit/rpms/polkit.git/plain/polkit-0.113-agent-leaks.patch?id=fa6fd575804de92886c95d3bc2b7eb2abcd13760";
+ sha256 = "1cxnhj0y30g7ldqq1y6zwsbdwcx7h97d3mpd3h5jy7dhg3h9ym91";
+ })
+ (fetchpatch {
+ url = "http://pkgs.fedoraproject.org/cgit/rpms/polkit.git/plain/polkit-0.113-polkitpermission-leak.patch?id=fa6fd575804de92886c95d3bc2b7eb2abcd13760";
+ sha256 = "1h1rkd4avqyyr8q6836zzr3w10jf521gcqnvhrhzwdpgp1ay4si7";
+ })
+ (fetchpatch {
+ url = "http://pkgs.fedoraproject.org/cgit/rpms/polkit.git/plain/polkit-0.113-itstool.patch?id=fa6fd575804de92886c95d3bc2b7eb2abcd13760";
+ sha256 = "0bxmjwp8ahy1y5g1l0kxmld0l3mlvb2l0i5n1qabia3d5iyjkyfh";
+ })
+ ];
+
outputs = [ "bin" "dev" "out" ]; # small man pages in $bin
+ nativeBuildInputs =
+ [ gtk_doc pkgconfig autoreconfHook ]
+ ++ [ libxslt docbook_xsl docbook_xml_dtd_412 ]; # man pages
buildInputs =
- [ pkgconfig glib expat pam intltool spidermonkey_17 gobjectIntrospection ]
- ++ [ libxslt docbook_xsl docbook_xml_dtd_412 ] # man pages
+ [ glib expat pam intltool spidermonkey_17 gobjectIntrospection ]
++ stdenv.lib.optional useSystemd systemd;
# Ugly hack to overwrite hardcoded directories
diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index 89368282f2c..20e35fa3e08 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, libiconv, libintlOrEmpty
, zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg
-, withData ? false, poppler_data
+, withData ? true, poppler_data
, qt4Support ? false, qt4 ? null
, qt5Support ? false, qtbase ? null
, introspectionSupport ? false, gobjectIntrospection ? null
diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebkit/default.nix b/pkgs/development/libraries/qt-5/5.6/qtwebkit/default.nix
index 915a6bcae8a..23a45dd44ed 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtwebkit/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/qtwebkit/default.nix
@@ -31,5 +31,9 @@ qtSubmodule {
};
in optionals flashplayerFix [ dlopen-webkit-nsplugin dlopen-webkit-gtk ]
++ [ dlopen-webkit-udev ];
+
+ # Hack to avoid TMPDIR in RPATHs.
+ preFixup = ''rm -rf "$(pwd)" && mkdir "$(pwd)" '';
+
meta.maintainers = with stdenv.lib.maintainers; [ abbradar ];
}
diff --git a/pkgs/development/libraries/qt-5/5.8/qtwebkit/default.nix b/pkgs/development/libraries/qt-5/5.8/qtwebkit/default.nix
index 881acb442e8..bee3786ef32 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtwebkit/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtwebkit/default.nix
@@ -39,5 +39,9 @@ qtSubmodule {
in optionals flashplayerFix [ dlopen-webkit-nsplugin dlopen-webkit-gtk ]
++ optionals (!stdenv.isDarwin) [ dlopen-webkit-udev ]
++ optionals (stdenv.isDarwin) [ ./0004-icucore-darwin.patch ];
+
+ # Hack to avoid TMPDIR in RPATHs.
+ preFixup = ''rm -rf "$(pwd)" && mkdir "$(pwd)" '';
+
meta.maintainers = with stdenv.lib.maintainers; [ abbradar periklis ];
}
diff --git a/pkgs/development/libraries/webkitgtk/2.14.nix b/pkgs/development/libraries/webkitgtk/2.16.nix
similarity index 91%
rename from pkgs/development/libraries/webkitgtk/2.14.nix
rename to pkgs/development/libraries/webkitgtk/2.16.nix
index a1b22094855..4431972b5dd 100644
--- a/pkgs/development/libraries/webkitgtk/2.14.nix
+++ b/pkgs/development/libraries/webkitgtk/2.16.nix
@@ -12,7 +12,7 @@ assert enableGeoLocation -> geoclue2 != null;
with stdenv.lib;
stdenv.mkDerivation rec {
name = "webkitgtk-${version}";
- version = "2.14.5";
+ version = "2.16.3";
meta = {
description = "Web content rendering engine, GTK+ port";
@@ -25,9 +25,9 @@ stdenv.mkDerivation rec {
postConfigure = optionalString stdenv.isDarwin ''
substituteInPlace Source/WebKit2/CMakeFiles/WebKit2.dir/link.txt \
- --replace "../../lib/libWTFGTK.a" ""
+ --replace "../../lib/libWTFGTK.a" ""
substituteInPlace Source/JavaScriptCore/CMakeFiles/JavaScriptCore.dir/link.txt \
- --replace "../../lib/libbmalloc.a" ""
+ --replace "../../lib/libbmalloc.a" ""
sed -i "s|[\./]*\.\./lib/lib[^\.]*\.a||g" \
Source/JavaScriptCore/CMakeFiles/LLIntOffsetsExtractor.dir/link.txt \
Source/JavaScriptCore/shell/CMakeFiles/jsc.dir/link.txt \
@@ -37,18 +37,18 @@ stdenv.mkDerivation rec {
Source/WebKit2/CMakeFiles/webkit2gtkinjectedbundle.dir/link.txt \
Source/WebKit2/CMakeFiles/WebProcess.dir/link.txt
substituteInPlace Source/JavaScriptCore/CMakeFiles/JavaScriptCore.dir/link.txt \
- --replace "../../lib/libWTFGTK.a" "-Wl,-all_load ../../lib/libWTFGTK.a"
+ --replace "../../lib/libWTFGTK.a" "-Wl,-all_load ../../lib/libWTFGTK.a"
'';
src = fetchurl {
url = "http://webkitgtk.org/releases/${name}.tar.xz";
- sha256 = "17rnjs7yl198bkghzcc2cgh30sb5i03irb6wag3xchwv7b1z3a1w";
+ sha256 = "04mmfxm8284zrlkrhkcn9gq1l4lpm1q6wwb5hyybj081v8qr2ki0";
};
# see if we can clean this up....
patches = [ ./finding-harfbuzz-icu.patch ]
- ++ optionals stdenv.isDarwin [
+ ++ optionals stdenv.isDarwin [
./PR-152650-2.patch
./PR-153138.patch
./PR-157554.patch
diff --git a/pkgs/development/libraries/webkitgtk/PR-152650-2.patch b/pkgs/development/libraries/webkitgtk/PR-152650-2.patch
index db84a4a6b26..f87b8ee73e2 100644
--- a/pkgs/development/libraries/webkitgtk/PR-152650-2.patch
+++ b/pkgs/development/libraries/webkitgtk/PR-152650-2.patch
@@ -38,9 +38,9 @@ index 6b01f1a..b443d10 100644
- set(ENABLE_GTKDOC OFF)
-endif ()
-
- set(DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR ${DERIVED_SOURCES_DIR}/webkitdom)
set(DERIVED_SOURCES_WEBKITGTK_DIR ${DERIVED_SOURCES_DIR}/webkitgtk)
set(DERIVED_SOURCES_WEBKITGTK_API_DIR ${DERIVED_SOURCES_WEBKITGTK_DIR}/webkit)
+ set(DERIVED_SOURCES_WEBKIT2GTK_DIR ${DERIVED_SOURCES_DIR}/webkit2gtk)
diff --git a/Tools/gtk/gtkdoc.py b/Tools/gtk/gtkdoc.py
index 4c8237b..a628ae0 100644
--- a/Tools/gtk/gtkdoc.py
diff --git a/pkgs/development/libraries/webkitgtk/adding-libintl.patch b/pkgs/development/libraries/webkitgtk/adding-libintl.patch
deleted file mode 100644
index b6e8b073c9d..00000000000
--- a/pkgs/development/libraries/webkitgtk/adding-libintl.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- webkitgtk-2.10.4-orig/Source/WebKit2/CMakeLists.txt 2015-11-11 02:42:51.000000000 -0500
-+++ webkitgtk-2.10.4/Source/WebKit2/CMakeLists.txt 2016-01-31 18:27:49.000000000 -0500
-@@ -738,6 +738,7 @@
- set(WebKit2_LIBRARIES
- JavaScriptCore
- WebCore
-+ intl
- )
-
- set(PluginProcess_LIBRARIES
diff --git a/pkgs/development/node-packages/composition-v4.nix b/pkgs/development/node-packages/composition-v4.nix
index 8c4a5390f55..b78bbda5d5e 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 ea30c5b04c4..02a2fc1f3de 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 356e78f027b..bd1de3e9f93 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 < install.sh
- sh install.sh
+ buildPhase = ''
+ ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib pkg/pkg.ml build
+ '';
+
+ installPhase = ''
+ opam-installer --script --prefix=$out | sh
ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml.version}/site-lib/
'';
@@ -33,7 +36,7 @@ stdenv.mkDerivation rec {
homepage = http://erratique.ch/software/cmdliner;
description = "An OCaml module for the declarative definition of command line interfaces";
license = licenses.bsd3;
- maintainers = [ maintainers.vbgl ];
platforms = ocaml.meta.platforms or [];
+ maintainers = [ maintainers.vbgl ];
};
}
diff --git a/pkgs/development/ocaml-modules/janestreet/async_kernel-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/async_kernel-113_33_00.nix
deleted file mode 100644
index 2110b1d6b50..00000000000
--- a/pkgs/development/ocaml-modules/janestreet/async_kernel-113_33_00.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, core_kernel, ppx_jane
-}:
-
-stdenv.mkDerivation {
- name = "ocaml${ocaml.version}-async_kernel-113.33.00";
- src = fetchurl {
- url = http://ocaml.janestreet.com/ocaml-core/113.33/files/async_kernel-113.33.00.tar.gz;
- sha256 = "1kkkqpdd3mq9jh3b3l1yk37841973lh6g3pfv8fcjzif4n7myf15";
- };
-
- buildInputs = [ ocaml findlib ocamlbuild opam ppx_jane ];
- propagatedBuildInputs = [ core_kernel ];
-
- inherit (topkg) installPhase;
-
- meta = {
- license = stdenv.lib.licenses.asl20;
- inherit (ocaml.meta) platforms;
- };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/async_unix-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/async_unix-113_33_00.nix
deleted file mode 100644
index 595e1198de5..00000000000
--- a/pkgs/development/ocaml-modules/janestreet/async_unix-113_33_00.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, async_kernel, core, ppx_jane
-}:
-
-stdenv.mkDerivation {
- name = "ocaml${ocaml.version}-async_unix-113.33.00+4.03";
- src = fetchurl {
- url = http://ocaml.janestreet.com/ocaml-core/113.33/files/async_unix-113.33.00+4.03.tar.gz;
- sha256 = "12b0ffq9yhv3f49kk2k7z7hrn2j4xlka7knm99hczl6gmjni7nqv";
- };
-
- buildInputs = [ ocaml findlib ocamlbuild opam ppx_jane ];
- propagatedBuildInputs = [ async_kernel core ];
-
- inherit (topkg) installPhase;
-
- meta = {
- license = stdenv.lib.licenses.asl20;
- inherit (ocaml.meta) platforms;
- };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/core-113_33_02.nix b/pkgs/development/ocaml-modules/janestreet/core-113_33_02.nix
deleted file mode 100644
index 48bafd5c3c5..00000000000
--- a/pkgs/development/ocaml-modules/janestreet/core-113_33_02.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, ppx_jane, core_kernel
-}:
-
-stdenv.mkDerivation {
- name = "ocaml${ocaml.version}-core-113.33.02+4.03";
- src = fetchurl {
- url = http://ocaml.janestreet.com/ocaml-core/113.33/files/core-113.33.02+4.03.tar.gz;
- sha256 = "1gvd5saa0sdgyv9w09imqlkw0c21v2ixic8fxx14jxrwck0zn4bc";
- };
-
- buildInputs = [ ocaml findlib ocamlbuild opam ppx_jane ];
- propagatedBuildInputs = [ core_kernel ];
-
- inherit (topkg) installPhase;
-
- meta = {
- license = stdenv.lib.licenses.asl20;
- inherit (ocaml.meta) platforms;
- };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/core_kernel-113_33_01.nix b/pkgs/development/ocaml-modules/janestreet/core_kernel-113_33_01.nix
deleted file mode 100644
index d6da9caed7d..00000000000
--- a/pkgs/development/ocaml-modules/janestreet/core_kernel-113_33_01.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, ppx_jane
-, bin_prot, fieldslib, typerep, variantslib
-, ppx_assert, ppx_bench, ppx_expect, ppx_inline_test
-}:
-
-stdenv.mkDerivation {
- name = "ocaml${ocaml.version}-core_kernel-113.33.01+4.03";
- src = fetchurl {
- url = http://ocaml.janestreet.com/ocaml-core/113.33/files/core_kernel-113.33.01+4.03.tar.gz;
- sha256 = "0ra2frspqjqk1wbb58lrb0anrgsyhja00zsybka85qy71lblamfs";
- };
-
- buildInputs = [ ocaml findlib ocamlbuild opam ppx_jane ];
- propagatedBuildInputs = [
- bin_prot fieldslib typerep variantslib
- ppx_assert ppx_bench ppx_expect ppx_inline_test
- ];
-
- inherit (topkg) installPhase;
-
- meta = {
- license = stdenv.lib.licenses.asl20;
- inherit (ocaml.meta) platforms;
- };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/default.nix b/pkgs/development/ocaml-modules/janestreet/default.nix
new file mode 100644
index 00000000000..98a303e2a67
--- /dev/null
+++ b/pkgs/development/ocaml-modules/janestreet/default.nix
@@ -0,0 +1,605 @@
+{ lib, janePackage, ocamlbuild, cryptokit, ctypes, magic-mime,
+ ocaml-migrate-parsetree, octavius, ounit, ppx_deriving, re, zarith,
+ openssl }:
+
+rec {
+
+ # Jane Street packages, up to ppx_core
+
+ sexplib = janePackage {
+ name = "sexplib";
+ version = "0.9.1";
+ hash = "087md38l73lp24j2lmwi053jjav00k11r06s6whmff1xlhj70wdj";
+ meta.description = "Automated S-expression conversion";
+ };
+
+ base = janePackage {
+ name = "base";
+ version = "0.9.1";
+ hash = "09gj30zyv23gv3gkf2pb3d3ywmkgd74dq8sfaps5xarr3grvndhm";
+ propagatedBuildInputs = [ sexplib ];
+ meta.description = "Full standard library replacement for OCaml";
+ };
+
+ ocaml-compiler-libs = janePackage {
+ name = "ocaml-compiler-libs";
+ hash = "1jz3nfrb6295sj4xj1j0zld8mhfj0xy2k4vlp9yf9sh3748n090l";
+ meta.description = "OCaml compiler libraries repackaged";
+ };
+
+ ppx_ast = janePackage {
+ name = "ppx_ast";
+ hash = "0p9v4q3cjz8wwdrh6bjidani2npzvhdy8isnqwigqkl6n326dba9";
+ propagatedBuildInputs = [ ocaml-compiler-libs ocaml-migrate-parsetree ];
+ meta.description = "OCaml AST used by Jane Street ppx rewriters";
+ };
+
+ ppx_traverse_builtins = janePackage {
+ name = "ppx_traverse_builtins";
+ hash = "10ajvz02ka6qimlfrq7py4ljhk8awqkga6240kn8j046b4xfyxzi";
+ meta.description = "Builtins for Ppx_traverse";
+ };
+
+ stdio = janePackage {
+ name = "stdio";
+ hash = "1c08jg930j7yxn0sjvlm3fs2fvwaf15sn9513yf1rb7y1lxrgwc4";
+ propagatedBuildInputs = [ base ];
+ meta.description = "Standard IO library for OCaml";
+ };
+
+ ppx_core = janePackage {
+ name = "ppx_core";
+ hash = "15400zxxkqdimmjpdjcs36gcbxbrhylmaczlzwd6x65v1h9aydz3";
+ propagatedBuildInputs = [ ppx_ast ppx_traverse_builtins stdio ];
+ meta.description = "Jane Street's standard library for ppx rewriters";
+ };
+
+ # Jane Street packages, up to ppx_base
+
+ ppx_optcomp = janePackage {
+ name = "ppx_optcomp";
+ hash = "1wfj6fnh92s81yncq7yyhmax7j6zpjj1sg1f3qa1f9c5kf4kkzrd";
+ propagatedBuildInputs = [ ppx_core ];
+ meta.description = "Optional compilation for OCaml";
+ };
+
+ ppx_driver = janePackage {
+ name = "ppx_driver";
+ hash = "1w3khwnvy18nkh673zrbhcs6051hs7z5z5dib7npkvpxndw22hwj";
+ buildInputs = [ ocamlbuild ];
+ propagatedBuildInputs = [ ppx_optcomp ];
+ meta.description = "Feature-full driver for OCaml AST transformers";
+ };
+
+ ppx_metaquot = janePackage {
+ name = "ppx_metaquot";
+ hash = "15qfd3s4x2pz006nx5316laxd3gqqi472x432qg4rfx4yh3vn31k";
+ propagatedBuildInputs = [ ppx_driver ];
+ meta.description = "Metaquotations for ppx_ast";
+ };
+
+ ppx_type_conv = janePackage {
+ name = "ppx_type_conv";
+ hash = "0a0gxjvjiql9vg37k0akn8xr5724nv3xb7v37xpidv7ld927ks7p";
+ propagatedBuildInputs = [ ppx_metaquot ppx_deriving ];
+ meta.description = "Support Library for type-driven code generators";
+ };
+
+ ppx_sexp_conv = janePackage {
+ name = "ppx_sexp_conv";
+ hash = "03cg2sym0wvpd5l7q4w9bclp589z5byygwsmnnq9h1ih56cmd55l";
+ propagatedBuildInputs = [ ppx_type_conv sexplib ];
+ meta.description = "Generation of S-expression conversion functions from type definitions";
+ };
+
+ ppx_compare = janePackage {
+ name = "ppx_compare";
+ hash = "0wrszpvn1nms5sb5rb29p7z1wmqyd15gfzdj4ax8f843p5ywx3w9";
+ propagatedBuildInputs = [ ppx_type_conv ];
+ meta.description = "Generation of comparison functions from types";
+ };
+
+ ppx_enumerate = janePackage {
+ name = "ppx_enumerate";
+ hash = "1dfy86j2z12p5n9yrwaakx1ngphs5246vxy279kz6i6j34cwxm46";
+ propagatedBuildInputs = [ ppx_type_conv ];
+ meta.description = "Generate a list containing all values of a finite type";
+ };
+
+ ppx_hash = janePackage {
+ name = "ppx_hash";
+ hash = "1w1riy2sqd9i611sc5f5z2rqqgjl2gvvkzi5xibpv309nacnl01d";
+ propagatedBuildInputs = [ ppx_compare ppx_sexp_conv ];
+ meta.description = "A ppx rewriter that generates hash functions from type expressions and definitions";
+ };
+
+ ppx_js_style = janePackage {
+ name = "ppx_js_style";
+ hash = "09k02b1l2r7svf9l3ls69h8xydsyiang2ziigxnny2i7gy7b0w59";
+ propagatedBuildInputs = [ ppx_metaquot octavius ];
+ meta.description = "Code style checker for Jane Street Packages";
+ };
+
+ ppx_base = janePackage {
+ name = "ppx_base";
+ hash = "0qikfzbkd2wyxfrvizz6rgi6vg4ykvxkivacj4gr178dbgfl5if3";
+ propagatedBuildInputs = [ ppx_enumerate ppx_hash ppx_js_style ];
+ meta.description = "Base set of ppx rewriters";
+ };
+
+ # Jane Street packages, up to ppx_bin_prot
+
+ fieldslib = janePackage {
+ name = "fieldslib";
+ hash = "1wxh59888l1bfz9ipnbcas58gwg744icaixzdbsg4v8f7wymc501";
+ propagatedBuildInputs = [ ppx_driver ];
+ meta.description = "OCaml record fields as first class values";
+ };
+
+ variantslib = janePackage {
+ name = "variantslib";
+ hash = "0kj53n62193j58q9vip8lfhhyf6w9d25wyvxzc163hx5m68yw0fz";
+ propagatedBuildInputs = [ ppx_driver ];
+ meta.description = "OCaml variants as first class values";
+ };
+
+ ppx_traverse = janePackage {
+ name = "ppx_traverse";
+ hash = "1sdqgwyq0w71i03vhc5jq4jk6rsbgwhvain48fnrllpkb5kj2la2";
+ propagatedBuildInputs = [ ppx_type_conv ];
+ meta.description = "Automatic generation of open recursion classes";
+ };
+
+ ppx_custom_printf = janePackage {
+ name = "ppx_custom_printf";
+ hash = "0cjy2c2c5g3qxqvwx1yb6p7kbmmpnpb1hll55f7a44x215lg8x19";
+ propagatedBuildInputs = [ ppx_sexp_conv ppx_traverse ];
+ meta.description = "Printf-style format-strings for user-defined string conversion";
+ };
+
+ ppx_fields_conv = janePackage {
+ name = "ppx_fields_conv";
+ hash = "0qp8zgmk58iskzrkf4g06i471kg6lrh3wqpy9klrb8pp9mg0xr9z";
+ propagatedBuildInputs = [ fieldslib ppx_type_conv ];
+ meta.description = "Generation of accessor and iteration functions for OCaml records";
+ };
+
+ ppx_variants_conv = janePackage {
+ name = "ppx_variants_conv";
+ hash = "1xayhyglgbdjqvb9123kjbwjcv0a3n3302nb0j7g8gmja8w5y834";
+ propagatedBuildInputs = [ ppx_type_conv variantslib ];
+ meta.description = "Generation of accessor and iteration functions for OCaml variant types";
+ };
+
+ bin_prot = janePackage {
+ name = "bin_prot";
+ hash = "0cy6lhksx4jypkrnj3ha31p97ghslki0bx5rpnzc2v28mfp6pzh1";
+ propagatedBuildInputs = [ ppx_compare ppx_custom_printf ppx_fields_conv ppx_variants_conv ];
+ meta.description = "Binary protocol generator";
+ };
+
+ ppx_here = janePackage {
+ name = "ppx_here";
+ hash = "0pjscw5ydxgy4fcxakgsazpp09ka057w5n2fp2dpkv2k5gil6rzh";
+ propagatedBuildInputs = [ ppx_driver ];
+ meta.description = "Expands [%here] into its location";
+ };
+
+ ppx_bin_prot = janePackage {
+ name = "ppx_bin_prot";
+ hash = "0qw9zqrc5yngzrzpk9awnlnd68xrb7wz5lq807c80ibxk0xvnqn3";
+ propagatedBuildInputs = [ ppx_here bin_prot ];
+ meta.description = "Generation of bin_prot readers and writers from types";
+ };
+
+ # Jane Street packages, up to ppx_jane
+
+ ppx_assert = janePackage {
+ name = "ppx_assert";
+ hash = "1s5c75wkc46nlcwmgic5h7f439s26ssrzrcil501c5kpib2hlv6z";
+ propagatedBuildInputs = [ ppx_sexp_conv ppx_here ppx_compare ];
+ meta.description = "Assert-like extension nodes that raise useful errors on failure";
+ };
+
+ ppx_inline_test = janePackage {
+ name = "ppx_inline_test";
+ hash = "01xml88ahrzqnc7g1ib184jbqxpdfx4gn2wdvi09dpi4i0jahy33";
+ propagatedBuildInputs = [ ppx_metaquot ];
+ meta.description = "Syntax extension for writing in-line tests in OCaml code";
+ };
+
+ typerep = janePackage {
+ name = "typerep";
+ hash = "0hlc0xiznli1k6azv2mhm1s4xghhxqqd957np7828bfp7r8n2jy3";
+ propagatedBuildInputs = [ base ];
+ meta.description = "Runtime types for OCaml";
+ };
+
+ ppx_bench = janePackage {
+ name = "ppx_bench";
+ hash = "1qk4y6c2mpw7bqjppi2nam74vs2sc89wzq162j92wsqxyqsv4p93";
+ propagatedBuildInputs = [ ppx_inline_test ];
+ meta.description = "Syntax extension for writing in-line benchmarks in OCaml code";
+ };
+
+ ppx_expect = janePackage {
+ name = "ppx_expect";
+ hash = "1bik53k51wcqv088f0h10n3ms9h51yvg6ha3g1s903i2bxr3xs6b";
+ propagatedBuildInputs = [ ppx_inline_test ppx_fields_conv ppx_custom_printf ppx_assert ppx_variants_conv re ];
+ meta.description = "Cram like framework for OCaml";
+ };
+
+ ppx_fail = janePackage {
+ name = "ppx_fail";
+ hash = "0qz0vlazasjyg7cv3iwpzxlvsah3zmn9dzd029xxqr1bji067s32";
+ propagatedBuildInputs = [ ppx_here ppx_metaquot ];
+ meta.description = "Add location to calls to failwiths";
+ };
+
+ ppx_let = janePackage {
+ name = "ppx_let";
+ hash = "1b914a5nynwxjvfx42v61yigvjhnd548m4yqjfchf38dmqi1f4nr";
+ propagatedBuildInputs = [ ppx_driver ];
+ meta.description = "Monadic let-bindings";
+ };
+
+ ppx_optional = janePackage {
+ name = "ppx_optional";
+ hash = "1vknsarxba0zcp5k2jb31wfpvqrv3bpanxbahfl5s2fwspsfdc82";
+ propagatedBuildInputs = [ ppx_metaquot ];
+ meta.description = "Pattern matching on flat options";
+ };
+
+ ppx_pipebang = janePackage {
+ name = "ppx_pipebang";
+ hash = "1wyfyyjvyi94ds1p90l60wdr85q2v3fq1qdf3gnv9zjfy6sb0g9h";
+ propagatedBuildInputs = [ ppx_metaquot ];
+ meta.description = "A ppx rewriter that inlines reverse application operators |> and |!";
+ };
+
+ ppx_sexp_message = janePackage {
+ name = "ppx_sexp_message";
+ hash = "0r0skyr1zf2jh48xrxbs45gzywynhlivkq24xwc0qq435fmc2jqv";
+ propagatedBuildInputs = [ ppx_sexp_conv ppx_here ];
+ meta.declarations = "A ppx rewriter for easy construction of s-expressions";
+ };
+
+ ppx_sexp_value = janePackage {
+ name = "ppx_sexp_value";
+ hash = "0hha5mmx700m8fy9g4znb8278l09chgwlpshny83vsmmzgq2jhah";
+ propagatedBuildInputs = [ ppx_sexp_conv ppx_here ];
+ meta.declarations = "A ppx rewriter that simplifies building s-expressions from OCaml values";
+ };
+
+ ppx_typerep_conv = janePackage {
+ name = "ppx_typerep_conv";
+ hash = "0bzgfpbqijwxm8x9jq1zb4xi5sbzymk17lw5rylri3hf84p60aq1";
+ propagatedBuildInputs = [ ppx_type_conv typerep ];
+ meta.description = "Generation of runtime types from type declarations";
+ };
+
+ ppx_jane = janePackage {
+ name = "ppx_jane";
+ hash = "16m5iw0qyp452nqj83kd0g0x3rw40lrz7392hwpd4di1wi6v2qzc";
+ propagatedBuildInputs = [ ppx_base ppx_bench ppx_bin_prot ppx_expect ppx_fail ppx_let ppx_optional ppx_pipebang ppx_sexp_message ppx_sexp_value ppx_typerep_conv ];
+ meta.description = "Standard Jane Street ppx rewriters";
+ };
+
+ # Jane Street packages, up to core
+
+ configurator = janePackage {
+ name = "configurator";
+ hash = "1ll90pnprc5nah621ckvqi1gwagvglzx2mzjpkppddw1kr320w80";
+ propagatedBuildInputs = [ ppx_base ];
+ meta.description = "Helper library for gathering system configuration";
+ };
+
+ jane-street-headers = janePackage {
+ name = "jane-street-headers";
+ hash = "0cdab6sblsidjbwvyvmspykyhqh44rpsjzi2djbfd5m4vh2h14gy";
+ meta.description = "Jane Street header files";
+ };
+
+ core_kernel = janePackage {
+ name = "core_kernel";
+ hash = "05iwvggx9m81x7ijgv9gcv5znf5rmsmb76dg909bm9gkr3hbh7wh";
+ propagatedBuildInputs = [ configurator jane-street-headers ppx_jane ];
+ meta.description = "Jane Street's standard library overlay (kernel)";
+ };
+
+ spawn = janePackage {
+ name = "spawn";
+ hash = "1w53b8ni06ajj62yaqjy0pkbm952l0m5fzr088yk15078qaxsnb5";
+ meta.description = "Spawning sub-processes";
+ };
+
+ core = janePackage {
+ name = "core";
+ hash = "0x05ky8l75k2dnpsa02vmqcr7p7q0vvc6279psq3iybrwcvab9yi";
+ propagatedBuildInputs = [ core_kernel spawn ];
+ meta.description = "Jane Street's standard library overlay";
+ };
+
+ # Jane Street packages, up to core_extended
+
+ re2 = janePackage {
+ name = "re2";
+ hash = "1qmhl3yd6y0lq401rz72b1bsbpglb0wighpxn3x8y1ixq415p4xi";
+ propagatedBuildInputs = [ core_kernel ];
+ meta = {
+ description = "OCaml bindings for RE2";
+ platforms = lib.platforms.linux;
+ };
+ };
+
+ textutils = janePackage {
+ name = "textutils";
+ hash = "1y6j2qw7rc8d80343lfv1dygnfrhn2qllz57mx28pl5kan743f6d";
+ propagatedBuildInputs = [ core ];
+ meta.description = "Text output utilities";
+ };
+
+ core_extended = janePackage {
+ name = "core_extended";
+ hash = "05cnzzj0kigz9c9gsmd6mfar82wmkbqm9qzrydb80sy2fz5b30rk";
+ propagatedBuildInputs = [ core re2 textutils ];
+ postPatch = ''
+ patchShebangs src/discover.sh
+ '';
+ meta = {
+ description = "Jane Street Capital's standard library overlay";
+ inherit (re2.meta) platforms;
+ };
+ };
+
+ # Jane Street async packages
+
+ async_kernel = janePackage {
+ name = "async_kernel";
+ hash = "1zwxhzy7f9900rcjls2fql9cpfmwrcah3fazzdz4h2i51f41w62x";
+ propagatedBuildInputs = [ core_kernel ];
+ meta.description = "Jane Street Capital's asynchronous execution library (core)";
+ };
+
+ async_rpc_kernel = janePackage {
+ name = "async_rpc_kernel";
+ hash = "1xk3s6s3xkj182p10kig2cqy8md6znif3v661h9cd02n8s57c40b";
+ propagatedBuildInputs = [ core_kernel async_kernel ];
+ meta.description = "Platform-independent core of Async RPC library";
+ };
+
+ async_unix = janePackage {
+ name = "async_unix";
+ hash = "0yd4z28j5vdj2zxqi0fkgh2ic1s9h740is2dk0raga0zr5a1z03d";
+ propagatedBuildInputs = [ core async_kernel ];
+ meta.description = "Jane Street Capital's asynchronous execution library (unix)";
+ };
+
+ async_extra = janePackage {
+ name = "async_extra";
+ hash = "0rpy5lc5dh5mir7flq1jrppd8imby8wyw191yg4nmklg28xp5sx0";
+ propagatedBuildInputs = [ async_rpc_kernel async_unix ];
+ meta.description = "Jane Street's asynchronous execution library (extra)";
+ };
+
+ async = janePackage {
+ name = "async";
+ hash = "10ykzym19srgdiikj0s74dndx5nk15hjq1r2hc61iz48f6caxkb1";
+ propagatedBuildInputs = [ async_extra ];
+ meta.description = "Jane Street Capital's asynchronous execution library";
+ };
+
+ async_find = janePackage {
+ name = "async_find";
+ hash = "11dmhdzgf5kn4m0cm6zr28wpwhi2kr4lak9nmgxbrxsq28bcncxq";
+ propagatedBuildInputs = [ async ];
+ meta.description = "Directory traversal with Async";
+ };
+
+ async_interactive = janePackage {
+ name = "async_interactive";
+ hash = "1mmqqp6bi2wg7bmgf0sw34jn3iyl5kbm200dax8yqq6rfprcs49j";
+ propagatedBuildInputs = [ async ];
+ meta.description = "Utilities for building simple command-line based user interfaces";
+ };
+
+ async_parallel = janePackage {
+ name = "async_parallel";
+ hash = "0mdprhr1pv4g65g10gr3gaifrzknsdgarwfdbjlvhzfs86075kyn";
+ propagatedBuildInputs = [ async ];
+ meta.description = "Distributed computing library";
+ };
+
+ async_shell = janePackage {
+ name = "async_shell";
+ hash = "02clpz3xv3i5avzifwalylb9gfxzpgnr8bnlfsjixxfk2m7kvsj2";
+ propagatedBuildInputs = [ core_extended async ];
+ meta = {
+ description = "Shell helpers for Async";
+ inherit (core_extended.meta) platforms;
+ };
+ };
+
+ async_ssl = janePackage {
+ name = "async_ssl";
+ hash = "01w3bg38q61lc3hfh8jsr0sy1ylyv0m6g6h9yvsk8ngj6qk70nss";
+ propagatedBuildInputs = [ async ctypes openssl ];
+ meta.description = "Async wrappers for SSL";
+ };
+
+ # Jane Street packages, up to expect_test_helpers
+
+ sexp_pretty = janePackage {
+ name = "sexp_pretty";
+ hash = "1bx8va468j5b813m0vsh1jzgb6h2qnnjfmjlf2hb82sarv8lllfx";
+ propagatedBuildInputs = [ ppx_base re ];
+ meta.description = "S-expression pretty-printer";
+ };
+
+ expect_test_helpers_kernel = janePackage {
+ name = "expect_test_helpers_kernel";
+ hash = "1ycqir8sqgq5nialnrfg29nqn0cqg6jjpgv24drdycdhqf5r2zg6";
+ propagatedBuildInputs = [ core_kernel sexp_pretty ];
+ meta.description = "Helpers for writing expectation tests";
+ };
+
+ expect_test_helpers = janePackage {
+ name = "expect_test_helpers";
+ hash = "0rsh6rwbqfcrqisk8jp7srlnicsadbzrs02ri6zyx0p3lmznw5r2";
+ propagatedBuildInputs = [ async expect_test_helpers_kernel ];
+ meta.description = "Async helpers for writing expectation tests";
+ };
+
+ # Miscellaneous Jane Street packages
+
+ bignum = janePackage {
+ name = "bignum";
+ hash = "0g80mzsi7vc1kq4mzha8y9nl95h6cd041vix3wjrqgkdvb1qd4f3";
+ propagatedBuildInputs = [ core_kernel zarith ];
+ meta.description = "Core-flavoured wrapper around zarith's arbitrary-precision rationals";
+ };
+
+ cinaps = janePackage {
+ name = "cinaps";
+ hash = "02fpjiwrygkpx2q4jfldhbqh0mqxmf955wizr8k4vmsq4wsis0p5";
+ propagatedBuildInputs = [ re ];
+ meta.description = "Trivial Metaprogramming tool using the OCaml toplevel";
+ };
+
+ command_rpc = janePackage {
+ name = "command_rpc";
+ hash = "0w58z9jkz5qzbvf33wrzhfshzdvnrphj6dq8dmi52ykhfvxm7824";
+ propagatedBuildInputs = [ async ];
+ meta.description = "Utilities for Versioned RPC communication with a child process over stdin and stdout";
+ };
+
+ core_bench = janePackage {
+ name = "core_bench";
+ hash = "1m2q7217nmcsck29i59djkm0h6z3aj0i01niijzr5f6ilbnmyd3h";
+ propagatedBuildInputs = [ core_extended ];
+ meta = {
+ description = "Micro-benchmarking library for OCaml";
+ inherit (core_extended.meta) platforms;
+ };
+ };
+
+ core_profiler = janePackage {
+ name = "core_profiler";
+ hash = "1ir2v3wdfbf5xzqcma16asc73mkx2q6dzq5y1bx6q1rpa7iznx44";
+ propagatedBuildInputs = [ core_extended ];
+ meta = {
+ description = "Profiling library";
+ inherit (core_extended.meta) platforms;
+ };
+ };
+
+ csvfields = janePackage {
+ name = "csvfields";
+ hash = "0lbvs1kwl22ryxhw6s089f6683hj2920bn518mvr22rnv7qijy0v";
+ propagatedBuildInputs = [ core ];
+ meta.description = "Runtime support for ppx_xml_conv and ppx_csv_conv";
+ };
+
+ ecaml = janePackage {
+ name = "ecaml";
+ hash = "1a2534bzbwgpm71aj3sm71sm0lkcjdfjj1mk91p1pg9kxn8c5x4i";
+ propagatedBuildInputs = [ async ];
+ meta.description = "Writing Emacs plugin in OCaml";
+ };
+
+ email_message = janePackage {
+ name = "email_message";
+ hash = "0cpaf6wn5g883bxdz029bksvrfzih99m7hzbb30fhqglmpmmkniz";
+ propagatedBuildInputs = [ async core_extended cryptokit magic-mime ounit ];
+ meta = {
+ description = "E-mail message parser";
+ inherit (core_extended.meta) platforms;
+ };
+ };
+
+ incremental_kernel = janePackage {
+ name = "incremental_kernel";
+ hash = "0zq48wbgqcflh84n10iygi8aa3f0zzmgc7r0jwvsyg7i8zccgvf5";
+ propagatedBuildInputs = [ core_kernel ];
+ meta.description = "Library for incremental computations depending only on core_kernel";
+ };
+
+ incremental = janePackage {
+ name = "incremental";
+ hash = "05sx8ia46v4dlvzcn7xgjcwxvbd0wmvv9r2bpvniapjnwr1nvcfh";
+ propagatedBuildInputs = [ core incremental_kernel ];
+ meta.description = "Library for incremental computations";
+ };
+
+ incr_map = janePackage {
+ name = "incr_map";
+ hash = "0358qg9irxbbhn18laqww3mn43mdwvlbr0h2mvg3vdbb2c5jp4fv";
+ propagatedBuildInputs = [ incremental_kernel ];
+ meta.description = "Helpers for incremental operations on map like data structures";
+ };
+
+ ocaml_plugin = janePackage {
+ name = "ocaml_plugin";
+ hash = "0q33swnlx9p1gcn1aj95501kapb7cnbzbsavid69csczwmzcxr14";
+ buildInputs = [ ocamlbuild ];
+ propagatedBuildInputs = [ async ];
+ meta.description = "Automatically build and dynlink ocaml source files";
+ };
+
+ parsexp = janePackage {
+ name = "parsexp";
+ hash = "0brrifvnfqbfk873v6y5b2jixs2d73hpispj9r440kca5cfsv23b";
+ propagatedBuildInputs = [ ppx_compare ppx_fields_conv ppx_js_style ppx_sexp_value ];
+ meta.description = "S-expression parsing library";
+ };
+
+ parsexp_io = janePackage {
+ name = "parsexp_io";
+ hash = "0gcmh4dg48xgszladq92yhk1hf492zf0smz462xrwknzlfdkz6a5";
+ propagatedBuildInputs = [ parsexp ];
+ meta.description = "S-expression parsing library (IO functions)";
+ };
+
+ patience_diff = janePackage {
+ name = "patience_diff";
+ hash = "0vpx9xj1ich5qmj3m26vlmix3nsdj7pd1xzhqwbc7ad2kqwy3grg";
+ propagatedBuildInputs = [ core_kernel ];
+ meta.description = "Tool and library implementing patience diff";
+ };
+
+ posixat = janePackage {
+ name = "posixat";
+ hash = "0ak93dyzi6sc6gb0j07fj85b24d8bv6g2hm7jj5xwb39kjwh51jl";
+ propagatedBuildInputs = [ ppx_sexp_conv ];
+ meta.description = "Binding to the posix *at functions";
+ };
+
+ rpc_parallel = janePackage {
+ name = "rpc_parallel";
+ hash = "0s72msl2p27bz0knjlpgy5qwp0w4z76cq801ps0sab35f8jjfs38";
+ propagatedBuildInputs = [ async ];
+ meta.description = "Type-safe library for building parallel applications";
+ };
+
+ shexp = janePackage {
+ name = "shexp";
+ hash = "1fkz4l9z4i0fz2kccd5blm2j9x2x4z6y1cn29wjmc3spqfxbq37y";
+ propagatedBuildInputs = [ posixat spawn ];
+ meta.description = "Process library and s-expression based shell";
+ };
+
+ topological_sort = janePackage {
+ name = "topological_sort";
+ hash = "1d64fyq0clsgham9p1f5rk01z8pxalglp92xmqw2iznyw0vxhvsy";
+ propagatedBuildInputs = [ core_kernel ];
+ meta.description = "Topological sort algorithm";
+ };
+
+ typerep_extended = janePackage {
+ name = "typerep_extended";
+ hash = "15gq8mrvlipd616rffr3f0wqw5d0ijnnizix610g2d5viirh0j9p";
+ propagatedBuildInputs = [ core_kernel ];
+ meta.description = "Runtime types for OCaml (Extended)";
+ };
+
+}
diff --git a/pkgs/development/ocaml-modules/janestreet/janePackage.nix b/pkgs/development/ocaml-modules/janestreet/janePackage.nix
new file mode 100644
index 00000000000..6d6a4d71442
--- /dev/null
+++ b/pkgs/development/ocaml-modules/janestreet/janePackage.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, ocaml, jbuilder, findlib }:
+
+{ name, version ? "0.9.0", buildInputs ? [], hash, meta, ...}@args:
+
+if !stdenv.lib.versionAtLeast ocaml.version "4.03"
+then throw "${name}-${version} is not available for OCaml ${ocaml.version}" else
+
+stdenv.mkDerivation (args // {
+ name = "ocaml${ocaml.version}-${name}-${version}";
+ inherit version;
+
+ src = fetchFromGitHub {
+ owner = "janestreet";
+ repo = name;
+ rev = "v${version}";
+ sha256 = hash;
+ };
+
+ buildInputs = [ ocaml jbuilder findlib ] ++ buildInputs;
+
+ inherit (jbuilder) installPhase;
+
+ meta = {
+ license = stdenv.lib.licenses.asl20;
+ inherit (ocaml.meta) platforms;
+ homepage = "https://github.com/janestreet/${name}";
+ } // meta;
+})
diff --git a/pkgs/development/ocaml-modules/janestreet/ocaml-compiler-libs.nix b/pkgs/development/ocaml-modules/janestreet/ocaml-compiler-libs.nix
deleted file mode 100644
index 7d7e44ab9cc..00000000000
--- a/pkgs/development/ocaml-modules/janestreet/ocaml-compiler-libs.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, ocaml, jbuilder, findlib }:
-
-stdenv.mkDerivation {
- name = "ocaml${ocaml.version}-ocaml-compiler-libs-0.9.0";
- src = fetchurl {
- url = http://ocaml.janestreet.com/ocaml-core/v0.9/files/ocaml-compiler-libs-v0.9.0.tar.gz;
- sha256 = "0ipi56vg227924ahi9vv926jn16br9zfipm6a3xd4xrl5pxkvzaz";
- };
-
- buildInputs = [ ocaml jbuilder findlib ];
-
- inherit (jbuilder) installPhase;
-
- meta = {
- description = "OCaml compiler libraries repackaged";
- homepage = https://github.com/janestreet/ocaml-compiler-libs;
- license = stdenv.lib.licenses.asl20;
- maintainers = [ stdenv.lib.maintainers.vbgl ];
- inherit (ocaml.meta) platforms;
- };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_ast.nix b/pkgs/development/ocaml-modules/janestreet/ppx_ast.nix
deleted file mode 100644
index 33f1766cb4a..00000000000
--- a/pkgs/development/ocaml-modules/janestreet/ppx_ast.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, ocaml, jbuilder, findlib
-, ocaml-compiler-libs, ocaml-migrate-parsetree
-}:
-
-stdenv.mkDerivation {
- name = "ocaml${ocaml.version}-ppx_ast-0.9.0";
- src = fetchurl {
- url = http://ocaml.janestreet.com/ocaml-core/v0.9/files/ppx_ast-v0.9.0.tar.gz;
- sha256 = "1hirfmxr8hkf3p39k1pqidabxxhd541d6ddfaqpgxbl51bw9ddmz";
- };
-
- buildInputs = [ ocaml jbuilder findlib ];
- propagatedBuildInputs = [ ocaml-compiler-libs ocaml-migrate-parsetree ];
-
- inherit (jbuilder) installPhase;
-
- meta = {
- description = "OCaml AST used by Jane Street ppx rewriters";
- homepage = https://github.com/janestreet/ppx_ast;
- license = stdenv.lib.licenses.asl20;
- maintainers = [ stdenv.lib.maintainers.vbgl ];
- inherit (ocaml.meta) platforms;
- };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_bench-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_bench-113_33_00.nix
deleted file mode 100644
index 3414324a5c8..00000000000
--- a/pkgs/development/ocaml-modules/janestreet/ppx_bench-113_33_00.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, ppx_tools, ppx_inline_test
-}:
-
-stdenv.mkDerivation {
- name = "ocaml${ocaml.version}-ppx_bench-113.33.00+4.03";
- src = fetchurl {
- url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_bench-113.33.00+4.03.tar.gz;
- sha256 = "00iv0p3cni4r7iimwm04bjg2hzvlvdb0b1kynjw2xav64xc29q01";
- };
-
- buildInputs = [ ocaml findlib ocamlbuild opam ppx_tools ];
- propagatedBuildInputs = [ ppx_inline_test ];
-
- inherit (topkg) installPhase;
-
- meta = {
- license = stdenv.lib.licenses.asl20;
- inherit (ocaml.meta) platforms;
- };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_bin_prot-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_bin_prot-113_33_00.nix
deleted file mode 100644
index 43517a82d3b..00000000000
--- a/pkgs/development/ocaml-modules/janestreet/ppx_bin_prot-113_33_00.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, bin_prot, ppx_deriving, ppx_tools, ppx_type_conv
-}:
-
-stdenv.mkDerivation {
- name = "ocaml${ocaml.version}-ppx_bin_prot-113.33.00+4.03";
- src = fetchurl {
- url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_bin_prot-113.33.00+4.03.tar.gz;
- sha256 = "1xw1yjgnd5ny1cq0n6rbsdaywyzq2n0jwg4gjsxv14dhv0alav36";
- };
-
- buildInputs = [ ocaml findlib ocamlbuild opam ppx_tools ];
- propagatedBuildInputs = [ bin_prot ppx_deriving ppx_type_conv ];
-
- inherit (topkg) installPhase;
-
- meta = {
- license = stdenv.lib.licenses.asl20;
- inherit (ocaml.meta) platforms;
- };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_compare-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_compare-113_33_00.nix
deleted file mode 100644
index 79457040202..00000000000
--- a/pkgs/development/ocaml-modules/janestreet/ppx_compare-113_33_00.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, ppx_tools, ppx_deriving, ppx_type_conv
-}:
-
-stdenv.mkDerivation {
- name = "ocaml${ocaml.version}-ppx_compare-113.33.00+4.03";
- src = fetchurl {
- url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_compare-113.33.00+4.03.tar.gz;
- sha256 = "07drgg6c857lsvxdjscdcb1ncdr5p3183spw32sbfcrbnr12nzys";
- };
-
- buildInputs = [ ocaml findlib ocamlbuild opam ppx_tools ];
- propagatedBuildInputs = [ ppx_type_conv ppx_deriving ];
-
- inherit (topkg) installPhase;
-
- meta = {
- license = stdenv.lib.licenses.asl20;
- inherit (ocaml.meta) platforms;
- };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_core-113_33_01.nix b/pkgs/development/ocaml-modules/janestreet/ppx_core-113_33_01.nix
deleted file mode 100644
index 71bc62937d4..00000000000
--- a/pkgs/development/ocaml-modules/janestreet/ppx_core-113_33_01.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, ppx_tools
-}:
-
-stdenv.mkDerivation {
- name = "ocaml${ocaml.version}-ppx_core-133.33.01+4.03";
- src = fetchurl {
- url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_core-113.33.01+4.03.tar.gz;
- sha256 = "0ibww4lx87lmn164mxczl3sa7ldwc7g1zi4m9c4vllsv004iyffl";
- };
-
- buildInputs = [ ocaml findlib ocamlbuild opam ppx_tools ];
-
- inherit (topkg) installPhase;
-
- meta = {
- license = stdenv.lib.licenses.asl20;
- inherit (ocaml.meta) platforms;
- };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_custom_printf-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_custom_printf-113_33_00.nix
deleted file mode 100644
index d75c7f81128..00000000000
--- a/pkgs/development/ocaml-modules/janestreet/ppx_custom_printf-113_33_00.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, ppx_sexp_conv
-}:
-
-stdenv.mkDerivation {
- name = "ocaml${ocaml.version}-ppx_custom_printf-113.33.00+4.03";
- src = fetchurl {
- url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_custom_printf-113.33.00+4.03.tar.gz;
- sha256 = "1hw8q4x0hzyg3brlqpdm0bc7z6lnj6qymzw123cf51q9dq0386jb";
- };
-
- buildInputs = [ ocaml findlib ocamlbuild opam ];
- propagatedBuildInputs = [ ppx_sexp_conv ];
-
- inherit (topkg) installPhase;
-
- meta = {
- license = stdenv.lib.licenses.asl20;
- inherit (ocaml.meta) platforms;
- };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_enumerate-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_enumerate-113_33_00.nix
deleted file mode 100644
index 77fde21e8d7..00000000000
--- a/pkgs/development/ocaml-modules/janestreet/ppx_enumerate-113_33_00.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, ppx_tools, ppx_deriving, ppx_type_conv
-}:
-
-stdenv.mkDerivation {
- name = "ocaml${ocaml.version}-ppx_enumerate-113.33.00+4.03";
- src = fetchurl {
- url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_enumerate-113.33.00+4.03.tar.gz;
- sha256 = "0b0kvdw6kids4yrzqq2h82gmnx1zfiahr82rrdbwiwkk4g0pxl93";
- };
-
- buildInputs = [ ocaml findlib ocamlbuild opam ppx_tools ];
- propagatedBuildInputs = [ ppx_deriving ppx_type_conv ];
-
- inherit (topkg) installPhase;
-
- meta = {
- license = stdenv.lib.licenses.asl20;
- inherit (ocaml.meta) platforms;
- };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_expect-113_33_01.nix b/pkgs/development/ocaml-modules/janestreet/ppx_expect-113_33_01.nix
deleted file mode 100644
index 32133dfb689..00000000000
--- a/pkgs/development/ocaml-modules/janestreet/ppx_expect-113_33_01.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, ppx_driver, ppx_assert, ppx_custom_printf, ppx_inline_test
-, ppx_fields_conv, ppx_variants_conv, re, sexplib, fieldslib
-}:
-
-stdenv.mkDerivation {
- name = "ocaml${ocaml.version}-ppx_expect-113.33.01+4.03";
- src = fetchurl {
- url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_expect-113.33.01+4.03.tar.gz;
- sha256 = "1r358vx3wnkzq8kwgi49400l1fx2bnl6gds4hl7s67lxsqxki2z7";
- };
-
- buildInputs = [ ocaml findlib ocamlbuild opam ppx_assert ppx_custom_printf ppx_fields_conv ppx_variants_conv re ];
- propagatedBuildInputs = [ ppx_driver ppx_inline_test fieldslib sexplib ];
-
- inherit (topkg) installPhase;
-
- meta = {
- license = stdenv.lib.licenses.asl20;
- inherit (ocaml.meta) platforms;
- };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_fail-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_fail-113_33_00.nix
deleted file mode 100644
index ba098b9294f..00000000000
--- a/pkgs/development/ocaml-modules/janestreet/ppx_fail-113_33_00.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, ppx_tools, ppx_here
-}:
-
-stdenv.mkDerivation {
- name = "ocaml${ocaml.version}-ppx_fail-113.33.00+4.03";
- src = fetchurl {
- url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_fail-113.33.00+4.03.tar.gz;
- sha256 = "1fy1aqsylf6yk527w13rm2b20il9vy026c5ww65pj3ks5zykfvx9";
- };
-
- buildInputs = [ ocaml findlib ocamlbuild opam ppx_tools ];
- propagatedBuildInputs = [ ppx_here ];
-
- inherit (topkg) installPhase;
-
- meta = {
- license = stdenv.lib.licenses.asl20;
- inherit (ocaml.meta) platforms;
- };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_fields_conv-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_fields_conv-113_33_00.nix
deleted file mode 100644
index 70d6ec61b0e..00000000000
--- a/pkgs/development/ocaml-modules/janestreet/ppx_fields_conv-113_33_00.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, fieldslib, ppx_deriving, ppx_type_conv
-}:
-
-stdenv.mkDerivation {
- name = "ocaml${ocaml.version}-ppx_fields_conv-113.33.00+4.03";
- src = fetchurl {
- url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_fields_conv-113.33.00+4.03.tar.gz;
- sha256 = "1wfi8pc0y7wjiscvawhfgbcfx7ypmikmyyagwhzw7jhnldljwrkg";
- };
-
- buildInputs = [ ocaml findlib ocamlbuild opam ];
- propagatedBuildInputs = [ fieldslib ppx_deriving ppx_type_conv ];
-
- inherit (topkg) installPhase;
-
- meta = {
- license = stdenv.lib.licenses.asl20;
- inherit (ocaml.meta) platforms;
- };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_inline_test-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_inline_test-113_33_00.nix
deleted file mode 100644
index 7b9414353a9..00000000000
--- a/pkgs/development/ocaml-modules/janestreet/ppx_inline_test-113_33_00.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, ppx_tools, ppx_driver
-}:
-
-stdenv.mkDerivation {
- name = "ocaml${ocaml.version}-ppx_inline_test-113.33.00+4.03";
- src = fetchurl {
- url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_inline_test-113.33.00+4.03.tar.gz;
- sha256 = "1sw71wnwznia1spicilj4bzspgdk1dhp0j4hp57a9xmsscg44i4k";
- };
-
- buildInputs = [ ocaml findlib ocamlbuild opam ppx_tools ];
- propagatedBuildInputs = [ ppx_driver ];
-
- inherit (topkg) installPhase;
-
- meta = {
- license = stdenv.lib.licenses.asl20;
- inherit (ocaml.meta) platforms;
- };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_jane-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_jane-113_33_00.nix
deleted file mode 100644
index 0a5b19051fc..00000000000
--- a/pkgs/development/ocaml-modules/janestreet/ppx_jane-113_33_00.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, ppx_assert, ppx_bench, ppx_bin_prot, ppx_custom_printf, ppx_enumerate, ppx_expect, ppx_fail, ppx_fields_conv, ppx_let, ppx_pipebang, ppx_sexp_message, ppx_sexp_value, ppx_typerep_conv, ppx_variants_conv
-}:
-
-stdenv.mkDerivation {
- name = "ocaml${ocaml.version}-ppx_jane-113.33.00";
- src = fetchurl {
- url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_jane-113.33.00.tar.gz;
- sha256 = "15lbrc9jj83k208gv7knz7mk9xh9mdb657jdjb1006gdsskfmra6";
- };
-
- buildInputs = [ ocaml findlib ocamlbuild opam ];
- propagatedBuildInputs = [ ppx_assert ppx_bench ppx_bin_prot
- ppx_custom_printf ppx_enumerate ppx_expect ppx_fail ppx_fields_conv
- ppx_let ppx_pipebang ppx_sexp_message ppx_sexp_value ppx_typerep_conv
- ppx_variants_conv ];
-
- inherit (topkg) installPhase;
-
- meta = {
- license = stdenv.lib.licenses.asl20;
- inherit (ocaml.meta) platforms;
- };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_let-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_let-113_33_00.nix
deleted file mode 100644
index b5f0bd4c932..00000000000
--- a/pkgs/development/ocaml-modules/janestreet/ppx_let-113_33_00.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, ppx_driver
-}:
-
-stdenv.mkDerivation {
- name = "ocaml${ocaml.version}-ppx_let-113.33.00+4.03";
- src = fetchurl {
- url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_let-113.33.00+4.03.tar.gz;
- sha256 = "012yzayknm9qv8ap9rbwf4fwnmx935mfy7c75ifagbnfl4lh7dmp";
- };
-
- buildInputs = [ ocaml findlib ocamlbuild opam ];
- propagatedBuildInputs = [ ppx_driver ];
-
- inherit (topkg) installPhase;
-
- meta = {
- license = stdenv.lib.licenses.asl20;
- inherit (ocaml.meta) platforms;
- };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_optcomp-113_33_01.nix b/pkgs/development/ocaml-modules/janestreet/ppx_optcomp-113_33_01.nix
deleted file mode 100644
index 05e7f40eb68..00000000000
--- a/pkgs/development/ocaml-modules/janestreet/ppx_optcomp-113_33_01.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, opam, topkg, oasis
-, ppx_core, ppx_tools
-}:
-
-let
- param = {
- "4.03" = {
- version = "113.33.00+4.03";
- sha256 = "1fkz6n40l4ck8bcr548d2yp08zc9fjv42zldlh0cj3ammhiz3gap";
- };
- "4.04" = {
- version = "113.33.01+4.03";
- sha256 = "1caw5dfgh5rw8mcgar0hdn485j1rqlnkbfb8wd0wdl5zhkg8jk3d";
- };
- }."${ocaml.meta.branch}";
-in
-
-stdenv.mkDerivation {
- name = "ocaml${ocaml.version}-ppx_optcomp-${param.version}";
- src = fetchzip {
- url = "http://github.com/janestreet/ppx_optcomp/archive/${param.version}.tar.gz";
- inherit (param) sha256;
- };
-
- buildInputs = [ ocaml findlib ocamlbuild opam oasis ppx_tools ];
- propagatedBuildInputs = [ ppx_core ];
-
- inherit (topkg) installPhase;
-
- meta = {
- license = stdenv.lib.licenses.asl20;
- inherit (ocaml.meta) platforms;
- };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_pipebang-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_pipebang-113_33_00.nix
deleted file mode 100644
index 5aa589e250c..00000000000
--- a/pkgs/development/ocaml-modules/janestreet/ppx_pipebang-113_33_00.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, ppx_tools, ppx_driver
-}:
-
-stdenv.mkDerivation {
- name = "ocaml${ocaml.version}-ppx_pipebang-113.33.00+4.03";
- src = fetchurl {
- url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_pipebang-113.33.00+4.03.tar.gz;
- sha256 = "1rjrpbncy8vzwnmc5n0qs4dd40dmg4h75dvd7h7lm8cpxalifivc";
- };
-
- buildInputs = [ ocaml findlib ocamlbuild opam ppx_tools ];
- propagatedBuildInputs = [ ppx_driver ];
-
- inherit (topkg) installPhase;
-
- meta = {
- license = stdenv.lib.licenses.asl20;
- inherit (ocaml.meta) platforms;
- };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_sexp_conv-113_33_01.nix b/pkgs/development/ocaml-modules/janestreet/ppx_sexp_conv-113_33_01.nix
deleted file mode 100644
index d8c9166585e..00000000000
--- a/pkgs/development/ocaml-modules/janestreet/ppx_sexp_conv-113_33_01.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, sexplib, ppx_deriving, ppx_tools, ppx_type_conv
-}:
-
-stdenv.mkDerivation {
- name = "ocaml${ocaml.version}-ppx_sexp_conv-133.33.01+4.03";
- src = fetchurl {
- url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_sexp_conv-113.33.01+4.03.tar.gz;
- sha256 = "176pydk5fs8m2md9v8v5b16gra90s4v0ssqq38ghfsbv1faca8d6";
- };
-
- buildInputs = [ ocaml findlib ocamlbuild opam ppx_tools ];
- propagatedBuildInputs = [ sexplib ppx_deriving ppx_type_conv ];
-
- inherit (topkg) installPhase;
-
- meta = {
- license = stdenv.lib.licenses.asl20;
- inherit (ocaml.meta) platforms;
- };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_sexp_message-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_sexp_message-113_33_00.nix
deleted file mode 100644
index ddf66364b30..00000000000
--- a/pkgs/development/ocaml-modules/janestreet/ppx_sexp_message-113_33_00.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, ppx_sexp_conv, ppx_here
-}:
-
-stdenv.mkDerivation {
- name = "ocaml${ocaml.version}-ppx_sexp_message-113.33.00+4.03";
- src = fetchurl {
- url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_sexp_message-113.33.00+4.03.tar.gz;
- sha256 = "01vrm8dk413gh19i2y6ffpsmscjhayp3asn5hcbcflxsvlaf4klx";
- };
-
- buildInputs = [ ocaml findlib ocamlbuild opam ];
- propagatedBuildInputs = [ ppx_here ppx_sexp_conv ];
-
- inherit (topkg) installPhase;
-
- meta = {
- license = stdenv.lib.licenses.asl20;
- inherit (ocaml.meta) platforms;
- };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_sexp_value-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_sexp_value-113_33_00.nix
deleted file mode 100644
index 21b67b9cce7..00000000000
--- a/pkgs/development/ocaml-modules/janestreet/ppx_sexp_value-113_33_00.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, ppx_here, ppx_sexp_conv
-}:
-
-stdenv.mkDerivation {
- name = "ocaml${ocaml.version}-ppx_sexp_value-113.33.00+4.03";
- src = fetchurl {
- url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_sexp_value-113.33.00+4.03.tar.gz;
- sha256 = "0pn2v1m479lbdgprv4w9czyv5nim0hz6ailmy1xxlxlhazwbqzwm";
- };
-
- buildInputs = [ ocaml findlib ocamlbuild opam ];
- propagatedBuildInputs = [ ppx_sexp_conv ppx_here ];
-
- inherit (topkg) installPhase;
-
- meta = {
- license = stdenv.lib.licenses.asl20;
- inherit (ocaml.meta) platforms;
- };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_traverse_builtins.nix b/pkgs/development/ocaml-modules/janestreet/ppx_traverse_builtins.nix
deleted file mode 100644
index d84983ed634..00000000000
--- a/pkgs/development/ocaml-modules/janestreet/ppx_traverse_builtins.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, ocaml, jbuilder, findlib }:
-
-stdenv.mkDerivation {
- name = "ocaml${ocaml.version}-ppx_traverse_builtins-0.9.0";
- src = fetchurl {
- url = http://ocaml.janestreet.com/ocaml-core/v0.9/files/ppx_traverse_builtins-v0.9.0.tar.gz;
- sha256 = "0zmf9kybll0xn8dsj10v260l0zwjyykimqml9rl7xqyjyl1rmnx6";
- };
-
- buildInputs = [ ocaml jbuilder findlib ];
-
- inherit (jbuilder) installPhase;
-
- meta = {
- description = "Builtins for Ppx_traverse";
- homepage = https://github.com/janestreet/ppx_traverse_builtins;
- license = stdenv.lib.licenses.asl20;
- inherit (ocaml.meta) platforms;
- maintainers = [ stdenv.lib.maintainers.vbgl ];
- };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_type_conv-113_33_02.nix b/pkgs/development/ocaml-modules/janestreet/ppx_type_conv-113_33_02.nix
deleted file mode 100644
index 49cfc19321d..00000000000
--- a/pkgs/development/ocaml-modules/janestreet/ppx_type_conv-113_33_02.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, ppx_core, ppx_deriving, ppx_driver
-}:
-
-stdenv.mkDerivation {
- name = "ocaml${ocaml.version}-ppx_type_conv-133.33.02+4.03";
- src = fetchurl {
- url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_type_conv-113.33.02+4.03.tar.gz;
- sha256 = "0y7hsh152gcj89i6cr3b9kxgdnb2sx8vhaq2bdvbcc9zrirwq4d2";
- };
-
- buildInputs = [ ocaml findlib ocamlbuild opam ppx_deriving ];
- propagatedBuildInputs = [ ppx_core ppx_driver ];
-
- inherit (topkg) installPhase;
-
- meta = {
- license = stdenv.lib.licenses.asl20;
- inherit (ocaml.meta) platforms;
- };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_typerep_conv-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_typerep_conv-113_33_00.nix
deleted file mode 100644
index 69a4ad7e69a..00000000000
--- a/pkgs/development/ocaml-modules/janestreet/ppx_typerep_conv-113_33_00.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, typerep, ppx_tools, ppx_type_conv, ppx_deriving
-}:
-
-stdenv.mkDerivation {
- name = "ocaml${ocaml.version}-ppx_typerep_conv-113.33.00+4.03";
- src = fetchurl {
- url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_typerep_conv-113.33.00+4.03.tar.gz;
- sha256 = "0k03wp07jvv3zpsm8n5hvskd5iagjvpcpxj9rpj012nia5iqfaj6";
- };
-
- buildInputs = [ ocaml findlib ocamlbuild opam ppx_tools ];
- propagatedBuildInputs = [ ppx_type_conv typerep ppx_deriving ];
-
- inherit (topkg) installPhase;
-
- meta = {
- license = stdenv.lib.licenses.asl20;
- inherit (ocaml.meta) platforms;
- };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_variants_conv-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_variants_conv-113_33_00.nix
deleted file mode 100644
index fb8a994790c..00000000000
--- a/pkgs/development/ocaml-modules/janestreet/ppx_variants_conv-113_33_00.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
-, variantslib, ppx_deriving, ppx_type_conv
-}:
-
-stdenv.mkDerivation {
- name = "ocaml${ocaml.version}-ppx_variants_conv-113.33.00+4.03";
- src = fetchurl {
- url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_variants_conv-113.33.00+4.03.tar.gz;
- sha256 = "0il0nkdwwsc1ymshj4q9nzw5ixm12ls0jj7z3q16k48bg3z5ibc0";
- };
-
- buildInputs = [ ocaml findlib ocamlbuild opam ];
- propagatedBuildInputs = [ variantslib ppx_deriving ppx_type_conv ];
-
- inherit (topkg) installPhase;
-
- meta = {
- license = stdenv.lib.licenses.asl20;
- inherit (ocaml.meta) platforms;
- };
-}
diff --git a/pkgs/development/ocaml-modules/janestreet/sexplib-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/sexplib-113_33_00.nix
deleted file mode 100644
index 4f86f080738..00000000000
--- a/pkgs/development/ocaml-modules/janestreet/sexplib-113_33_00.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg }:
-
-stdenv.mkDerivation {
- name = "ocaml${ocaml.version}-sexplib-113.33.00+4.03";
- src = fetchurl {
- url = http://ocaml.janestreet.com/ocaml-core/113.33/files/sexplib-113.33.00+4.03.tar.gz;
- sha256 = "1dirdrags3z8m80z1vczfnpdfzgcvm2wyy7g61fxdr8h3jgixpl3";
- };
-
- buildInputs = [ ocaml findlib ocamlbuild opam ];
-
- inherit (topkg) installPhase;
-
- meta = {
- license = stdenv.lib.licenses.asl20;
- inherit (ocaml.meta) platforms;
- };
-}
diff --git a/pkgs/development/ocaml-modules/stdio/default.nix b/pkgs/development/ocaml-modules/stdio/default.nix
deleted file mode 100644
index 87382330022..00000000000
--- a/pkgs/development/ocaml-modules/stdio/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl, ocaml, jbuilder, findlib, base }:
-
-stdenv.mkDerivation {
- name = "ocaml${ocaml.version}-stdio-0.9.0";
-
- src = fetchurl {
- url = http://ocaml.janestreet.com/ocaml-core/v0.9/files/stdio-v0.9.0.tar.gz;
- sha256 = "008b5y03223107gfv8qawdfyjvf5g97l472i5p5v8mp512wr7kj5";
- };
-
- buildInputs = [ ocaml jbuilder findlib ];
- propagatedBuildInputs = [ base ];
-
- inherit (jbuilder) installPhase;
-
- meta = {
- license = stdenv.lib.licenses.asl20;
- description = "Standard IO library for OCaml";
- homepage = https://github.com/janestreet/stdio;
- inherit (ocaml.meta) platforms;
- };
-}
diff --git a/pkgs/development/python-modules/3to2/default.nix b/pkgs/development/python-modules/3to2/default.nix
index 4941db3c996..9efcbbfa7d3 100644
--- a/pkgs/development/python-modules/3to2/default.nix
+++ b/pkgs/development/python-modules/3to2/default.nix
@@ -1,6 +1,6 @@
{ lib
, buildPythonPackage
-, fetchurl
+, fetchPypi
, pytest
}:
@@ -9,8 +9,9 @@ buildPythonPackage rec {
version = "1.1.1";
name = "${pname}-${version}";
- src = fetchurl {
- url = "https://files.pythonhosted.org/packages/8f/ab/58a363eca982c40e9ee5a7ca439e8ffc5243dde2ae660ba1ffdd4868026b/${pname}-${version}.zip";
+ src = fetchPypi {
+ inherit pname version;
+ extension = "zip";
sha256 = "fef50b2b881ef743f269946e1090b77567b71bb9a9ce64b7f8e699b562ff685c";
};
diff --git a/pkgs/development/python-modules/Nikola/default.nix b/pkgs/development/python-modules/Nikola/default.nix
new file mode 100644
index 00000000000..762c43d93c0
--- /dev/null
+++ b/pkgs/development/python-modules/Nikola/default.nix
@@ -0,0 +1,59 @@
+{ lib
+, buildPythonPackage
+, isPy3k
+, fetchPypi
+, doit
+, glibcLocales
+, pytest
+, pytestcov
+, pytest-mock
+, pygments
+, pillow
+, dateutil
+, docutils
+, Mako
+, unidecode
+, lxml
+, Yapsy
+, PyRSS2Gen
+, Logbook
+, blinker
+, setuptools
+, natsort
+, requests
+, piexif
+, markdown
+, phpserialize
+, jinja2
+}:
+
+buildPythonPackage rec {
+ name = "${pname}-${version}";
+ pname = "Nikola";
+ version = "7.8.6";
+
+ # Nix contains only Python 3 supported version of doit, which is a dependency
+ # of Nikola. Python 2 support would require older doit 0.29.0 (which on the
+ # other hand doesn't support Python 3.3). So, just disable Python 2.
+ disabled = !isPy3k;
+
+ buildInputs = [ pytest pytestcov pytest-mock glibcLocales ];
+
+ propagatedBuildInputs = [
+ pygments pillow dateutil docutils Mako unidecode lxml Yapsy PyRSS2Gen
+ Logbook blinker setuptools natsort requests piexif markdown phpserialize
+ jinja2 doit
+ ];
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "48d3a00c3fc9c61bcd305653a531949bdd777d9211434172549498fd8136e036";
+ };
+
+ meta = {
+ homepage = "https://getnikola.com/";
+ description = "A modular, fast, simple, static website and blog generator";
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ jluttine ];
+ };
+}
diff --git a/pkgs/development/python-modules/Theano/theano-with-cuda/default.nix b/pkgs/development/python-modules/Theano/theano-with-cuda/default.nix
index c9ea79bef9a..f8b7a713d08 100644
--- a/pkgs/development/python-modules/Theano/theano-with-cuda/default.nix
+++ b/pkgs/development/python-modules/Theano/theano-with-cuda/default.nix
@@ -1,5 +1,7 @@
{ buildPythonPackage
, fetchFromGitHub
+, pythonOlder
+, future
, numpy
, six
, scipy
@@ -56,7 +58,8 @@ buildPythonPackage rec {
pycuda
cudatoolkit
libgpuarray
- ] ++ (stdenv.lib.optional (cudnn != null) [ cudnn ]);
+ cudnn
+ ] ++ (stdenv.lib.optional (pythonOlder "3.0") future);
passthru.cudaSupport = true;
}
diff --git a/pkgs/development/python-modules/aenum/default.nix b/pkgs/development/python-modules/aenum/default.nix
index 9d6fe94a262..61edcca4804 100644
--- a/pkgs/development/python-modules/aenum/default.nix
+++ b/pkgs/development/python-modules/aenum/default.nix
@@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "aenum";
- version = "2.0.6";
+ version = "2.0.7";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
- sha256 = "0rlhb5wzlyyz0l44r2jxn3m0nh51ifih97dk2y7zfs1m299gwcv6";
+ sha256 = "2c5db863b5531cc059313018e57bc765b0ef1fc96ba799f105ea45d99b1c2d23";
};
doCheck = !isPy3k;
diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix
new file mode 100644
index 00000000000..0538e7cf416
--- /dev/null
+++ b/pkgs/development/python-modules/alembic/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, pytest, pytestcov, mock, coverage
+, Mako, sqlalchemy, python-editor, dateutil
+}:
+
+buildPythonPackage rec {
+ name = "${pname}-${version}";
+ pname = "alembic";
+ version = "0.9.2";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0iw6wysm83hycvrycymf9b4mkji47536kl3x7grynfcbyjcvbdm2";
+ };
+
+ buildInputs = [ pytest pytestcov mock coverage ];
+ propagatedBuildInputs = [ Mako sqlalchemy python-editor dateutil ];
+
+ meta = with stdenv.lib; {
+ homepage = http://bitbucket.org/zzzeek/alembic;
+ description = "A database migration tool for SQLAlchemy";
+ license = licenses.mit;
+ };
+}
diff --git a/pkgs/development/python-modules/appdirs/default.nix b/pkgs/development/python-modules/appdirs/default.nix
new file mode 100644
index 00000000000..211d51c241d
--- /dev/null
+++ b/pkgs/development/python-modules/appdirs/default.nix
@@ -0,0 +1,21 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ pname = "appdirs";
+ version = "1.4.3";
+ name = "${pname}-${version}";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "9e5896d1372858f8dd3344faf4e5014d21849c756c8d5701f78f8a103b372d92";
+ };
+
+ meta = {
+ description = "A python module for determining appropriate platform-specific dirs";
+ homepage = http://github.com/ActiveState/appdirs;
+ license = lib.licenses.mit;
+ };
+}
diff --git a/pkgs/development/python-modules/argcomplete/default.nix b/pkgs/development/python-modules/argcomplete/default.nix
new file mode 100644
index 00000000000..cd0cc47d9e7
--- /dev/null
+++ b/pkgs/development/python-modules/argcomplete/default.nix
@@ -0,0 +1,27 @@
+{ buildPythonPackage, fetchPypi, lib,
+ coverage, dicttoxml, flake8, pexpect, prettytable, requests_toolbelt
+}:
+buildPythonPackage rec {
+ name = "${pname}-${version}";
+ pname = "argcomplete";
+ version = "1.8.2";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0sslhl1klvh92c8hjsz3y3mmnpcqspcgi49g5cik2rpbfkhcsb3s";
+ };
+
+ doCheck = false; # bash-completion test fails with "compgen: command not found".
+
+ # re-enable if we are able to make testing work
+ # buildInputs = [ coverage flake8 ];
+
+ propagatedBuildInputs = [ dicttoxml pexpect prettytable requests_toolbelt ];
+
+ meta = with lib; {
+ description = "Bash tab completion for argparse";
+ homepage = "https://argcomplete.readthedocs.io";
+ maintainers = [ maintainers.womfoo ];
+ license = [ licenses.asl20 ];
+ };
+}
diff --git a/pkgs/development/python-modules/asgi_ipc/default.nix b/pkgs/development/python-modules/asgi_ipc/default.nix
index 9774433ddc5..e282294ef0c 100644
--- a/pkgs/development/python-modules/asgi_ipc/default.nix
+++ b/pkgs/development/python-modules/asgi_ipc/default.nix
@@ -2,12 +2,13 @@
asgiref, msgpack, posix_ipc
}:
buildPythonPackage rec {
- name = "asgi_ipc-${version}";
- version = "1.3.1";
+ version = "1.4.0";
+ pname = "asgi_ipc";
+ name = "${pname}-${version}";
src = fetchurl {
url = "mirror://pypi/a/asgi_ipc/${name}.tar.gz";
- sha256 = "1dm8xvm1z28f421ck1ympxsq2sjm9xb7dla6p8yd2bz6gn6p5h7v";
+ sha256 = "1bae453d771eb92c0ec558b826fc0bce75a2a61bf21187784d4e4dc11710e588";
};
propagatedBuildInputs = [ asgiref msgpack posix_ipc ];
diff --git a/pkgs/development/python-modules/asgi_redis/default.nix b/pkgs/development/python-modules/asgi_redis/default.nix
index 5576fc0e68b..1ca6f417bd8 100644
--- a/pkgs/development/python-modules/asgi_redis/default.nix
+++ b/pkgs/development/python-modules/asgi_redis/default.nix
@@ -2,12 +2,13 @@
asgiref, asgi_ipc, msgpack, six, redis, cryptography
}:
buildPythonPackage rec {
- name = "asgi_redis-${version}";
- version = "1.3.0";
+ version = "1.4.0";
+ pname = "asgi_redis";
+ name = "${pname}-${version}";
src = fetchurl {
url = "mirror://pypi/a/asgi_redis/${name}.tar.gz";
- sha256 = "0zhv51w0fx3i8m0032nk9v00l6mxaswyi95yzy7p7fjww4q74ncl";
+ sha256 = "ec137829a9ebfb0de1c034bc699240c9747b97a3eb2dc4df6c812f82290a0f9f";
};
# Requires a redis server available
diff --git a/pkgs/development/python-modules/asgiref/default.nix b/pkgs/development/python-modules/asgiref/default.nix
index 1bd3ef19f7e..1b5112fb335 100644
--- a/pkgs/development/python-modules/asgiref/default.nix
+++ b/pkgs/development/python-modules/asgiref/default.nix
@@ -1,11 +1,12 @@
{ stdenv, buildPythonPackage, fetchurl, six }:
buildPythonPackage rec {
- name = "asgiref-${version}";
- version = "1.1.1";
+ version = "1.1.2";
+ pname = "asgiref";
+ name = "${pname}-${version}";
src = fetchurl {
url = "mirror://pypi/a/asgiref/${name}.tar.gz";
- sha256 = "0gayxnysknwg8hxb5kvmi2mmd5dnrhgza23daf8j25w3nj2drars";
+ sha256 = "8b46c3d6e2ad354d9da3cfb9873f9bd46fe1b768fbc11065275ba5430a46700c";
};
propagatedBuildInputs = [ six ];
diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix
index a690399118d..52f7fdf039c 100644
--- a/pkgs/development/python-modules/astroid/default.nix
+++ b/pkgs/development/python-modules/astroid/default.nix
@@ -1,34 +1,39 @@
-{ stdenv, fetchurl, buildPythonPackage, python, logilab_common, six,
- lazy-object-proxy, wrapt }:
+{ lib, fetchurl, buildPythonPackage, python, logilab_common, six
+, lazy-object-proxy, wrapt, singledispatch, enum34, pythonOlder
+, backports_functools_lru_cache
+}:
- buildPythonPackage rec {
- name = "${pname}-${version}";
- pname = "astroid";
- version = "1.4.9";
+buildPythonPackage rec {
+ name = "${pname}-${version}";
+ pname = "astroid";
+ version = "1.5.2";
- src = fetchurl {
- url = "mirror://pypi/a/${pname}/${name}.tar.gz";
- sha256 = "1mw5q20b80j55vbpcdfl824sbb1q15dhkfbczjnnv8733j4yg0x4";
- };
+ src = fetchurl {
+ url = "mirror://pypi/a/${pname}/${name}.tar.gz";
+ sha256 = "271f1c9ad6519a5dde2a7f0c9b62c2923b55e16569bdd888f9f9055cc5be37ed";
+ };
- propagatedBuildInputs = [ logilab_common six lazy-object-proxy wrapt ];
+ propagatedBuildInputs = [ logilab_common six lazy-object-proxy wrapt ]
+ ++ lib.optionals (pythonOlder "3.4") [ enum34 singledispatch]
+ ++ lib.optionals (pythonOlder "3.3") [ backports_functools_lru_cache ];
- postPatch = ''
- cd astroid/tests
- for i in $(ls unittest*); do mv -v $i test_$i; done
- cd ../..
- rm -vf astroid/tests/test_unittest_inference.py
- '';
+ postPatch = ''
+ cd astroid/tests
+ for i in $(ls unittest*); do mv -v $i test_$i; done
+ cd ../..
+ rm -vf astroid/tests/test_unittest_inference.py
+ rm -vf astroid/tests/test_unittest_manager.py
+ '';
- checkPhase = ''
- ${python.interpreter} -m unittest discover
- '';
+ checkPhase = ''
+ ${python.interpreter} -m unittest discover
+ '';
- meta = with stdenv.lib; {
- description = "A abstract syntax tree for Python with inference support";
- homepage = http://bitbucket.org/logilab/astroid;
- license = licenses.lgpl2;
- platforms = platforms.all;
- maintainers = with maintainers; [ nand0p ];
- };
- }
+ meta = with lib; {
+ description = "A abstract syntax tree for Python with inference support";
+ homepage = http://bitbucket.org/logilab/astroid;
+ license = licenses.lgpl2;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ nand0p ];
+ };
+}
diff --git a/pkgs/development/python-modules/async_timeout/default.nix b/pkgs/development/python-modules/async_timeout/default.nix
index d5009e9bccb..aa548602d37 100644
--- a/pkgs/development/python-modules/async_timeout/default.nix
+++ b/pkgs/development/python-modules/async_timeout/default.nix
@@ -7,13 +7,13 @@
let
pname = "async-timeout";
- version = "1.1.0";
+ version = "1.2.1";
in buildPythonPackage rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
- sha256 = "b88bd1fe001b800ec23c7bf27a81b32819e2a56668e9fba5646a7f3618143081";
+ sha256 = "380e9bfd4c009a14931ffe487499b0906b00b3378bb743542cfd9fbb6d8e4657";
};
buildInputs = [ pytestrunner ];
diff --git a/pkgs/development/python-modules/automat/default.nix b/pkgs/development/python-modules/automat/default.nix
index 146f47bd945..e4f3e061dd4 100644
--- a/pkgs/development/python-modules/automat/default.nix
+++ b/pkgs/development/python-modules/automat/default.nix
@@ -1,12 +1,13 @@
{ stdenv, buildPythonPackage, fetchurl,
m2r, setuptools_scm, six, attrs }:
buildPythonPackage rec {
- name = "Automat-${version}";
- version = "0.5.0";
+ version = "0.6.0";
+ pname = "Automat";
+ name = "${pname}-${version}";
src = fetchurl {
url = "mirror://pypi/A/Automat/${name}.tar.gz";
- sha256 = "1hnpknkqnc2m900kkzrzx9l6g5dy5dassrdj9pn34x1pcdkyr2a8";
+ sha256 = "3c1fd04ecf08ac87b4dd3feae409542e9bf7827257097b2b6ed5692f69d6f6a8";
};
buildInputs = [ m2r setuptools_scm ];
diff --git a/pkgs/development/python-modules/bap/default.nix b/pkgs/development/python-modules/bap/default.nix
index 9362729af44..6a8e33dc2ee 100644
--- a/pkgs/development/python-modules/bap/default.nix
+++ b/pkgs/development/python-modules/bap/default.nix
@@ -1,8 +1,9 @@
{stdenv, buildPythonPackage, fetchFromGitHub, bap, requests}:
buildPythonPackage rec {
- name = "bap";
+ pname = "bap";
version = "1.1.0";
+ name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "BinaryAnalysisPlatform";
repo = "bap-python";
diff --git a/pkgs/development/python-modules/bcrypt.nix b/pkgs/development/python-modules/bcrypt.nix
index 8a099983521..d159ff8fe90 100644
--- a/pkgs/development/python-modules/bcrypt.nix
+++ b/pkgs/development/python-modules/bcrypt.nix
@@ -4,12 +4,13 @@
with stdenv.lib;
buildPythonPackage rec {
- name = "bcrypt-${version}";
- version = "3.1.2";
+ version = "3.1.3";
+ pname = "bcrypt";
+ name = "${pname}-${version}";
src = fetchurl {
url = "mirror://pypi/b/bcrypt/${name}.tar.gz";
- sha256 = "1al54xafv1aharpb22yv5rjjc63fm60z3pn2shbiq48ah9f1fvil";
+ sha256 = "6645c8d0ad845308de3eb9be98b6fd22a46ec5412bfc664a423e411cdd8f5488";
};
buildInputs = [ pycparser mock pytest py ];
propagatedBuildInputs = [ six ] ++ optional (!isPyPy) cffi;
diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix
index 42a7401b09d..19acf7b49ef 100644
--- a/pkgs/development/python-modules/blivet/default.nix
+++ b/pkgs/development/python-modules/blivet/default.nix
@@ -7,7 +7,8 @@ let
selinuxWithPython = libselinux.override pyenable;
cryptsetupWithPython = cryptsetup.override pyenable;
in buildPythonPackage rec {
- name = "blivet-${version}";
+ pname = "blivet";
+ name = "${pname}-${version}";
version = "0.67";
src = fetchFromGitHub {
diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix
index 7c992921e94..cdc77249cb8 100644
--- a/pkgs/development/python-modules/bootstrapped-pip/default.nix
+++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix
@@ -1,24 +1,31 @@
-{ stdenv, python, fetchurl, makeWrapper, unzip }:
+{ stdenv, python, fetchPypi, makeWrapper, unzip }:
let
- wheel_source = fetchurl {
- url = "https://pypi.python.org/packages/py2.py3/w/wheel/wheel-0.29.0-py2.py3-none-any.whl";
+ wheel_source = fetchPypi {
+ pname = "wheel";
+ version = "0.29.0";
+ format = "wheel";
sha256 = "ea8033fc9905804e652f75474d33410a07404c1a78dd3c949a66863bd1050ebd";
};
- setuptools_source = fetchurl {
- url = "https://files.pythonhosted.org/packages/b8/cb/b919f52dd81b4b2210d0c5529b6b629a4002e08d49a90183605d1181b10c/setuptools-30.2.0-py2.py3-none-any.whl";
- sha256 = "b7e7b28d6a728ea38953d66e12ef400c3c153c523539f1b3997c5a42f3770ff1";
+ setuptools_source = fetchPypi {
+ pname = "setuptools";
+ version = "36.0.1";
+ format = "wheel";
+ sha256 = "f2900e560efc479938a219433c48f15a4ff4ecfe575a65de385eeb44f2425587";
};
- argparse_source = fetchurl {
- url = "https://pypi.python.org/packages/2.7/a/argparse/argparse-1.4.0-py2.py3-none-any.whl";
- sha256 = "0533cr5w14da8wdb2q4py6aizvbvsdbk3sj7m1jx9lwznvnlf5n3";
+ argparse_source = fetchPypi {
+ pname = "argparse";
+ version = "1.4.0";
+ sha256 = "c31647edb69fd3d465a847ea3157d37bed1f95f19760b11a47aa91c04b666314";
};
in stdenv.mkDerivation rec {
- name = "${python.libPrefix}-bootstrapped-pip-${version}";
+ pname = "pip";
version = "9.0.1";
+ name = "${python.libPrefix}-bootstrapped-${pname}-${version}";
- src = fetchurl {
- url = "https://files.pythonhosted.org/packages/b6/ac/7015eb97dc749283ffdec1c3a88ddb8ae03b8fad0f0e611408f196358da3/pip-9.0.1-py2.py3-none-any.whl";
+ src = fetchPypi {
+ inherit pname version;
+ format = "wheel";
sha256 = "690b762c0a8460c303c089d5d0be034fb15a5ea2b75bdf565f40421f542fefb0";
};
diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix
index d27a6537556..08d66e539ad 100644
--- a/pkgs/development/python-modules/breathe/default.nix
+++ b/pkgs/development/python-modules/breathe/default.nix
@@ -1,12 +1,13 @@
{ lib, fetchurl, buildPythonPackage, docutils, six, sphinx, isPy3k }:
buildPythonPackage rec {
- name = "breathe-${version}";
- version = "4.2.0";
+ version = "4.6.0";
+ pname = "breathe";
+ name = "${pname}-${version}";
src = fetchurl {
url = "mirror://pypi/b/breathe/${name}.tar.gz";
- sha256 = "0m3w8yx24nm01xxx6aj08cklnifwlzzmczc5b0ni40l63lhvm3lp";
+ sha256 = "9db2ba770f824da323b9ea3db0b98d613a4e0af094c82ccb0a82991da81b736a";
};
propagatedBuildInputs = [ docutils six sphinx ];
diff --git a/pkgs/development/python-modules/btrees/default.nix b/pkgs/development/python-modules/btrees/default.nix
index 8e69a207628..7cb10d96f90 100644
--- a/pkgs/development/python-modules/btrees/default.nix
+++ b/pkgs/development/python-modules/btrees/default.nix
@@ -2,14 +2,14 @@
buildPythonPackage rec {
pname = "BTrees";
- version = "4.3.1";
+ version = "4.4.1";
name = "${pname}-${version}";
propagatedBuildInputs = [ persistent zope_interface transaction ];
src = fetchPypi {
inherit pname version;
- sha256 = "15as34f9sa4nnd62nnjkik2jd4rg1byp0i4kwaqwdpv0ab9vfr95";
+ sha256 = "a2738b71693971c1f7502888d649bef270c65f026db731e03d53f1ec4edfe8a3";
};
meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/certifi/default.nix b/pkgs/development/python-modules/certifi/default.nix
index 8658c76df79..a2cf4633d30 100644
--- a/pkgs/development/python-modules/certifi/default.nix
+++ b/pkgs/development/python-modules/certifi/default.nix
@@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "certifi";
- version = "2017.1.23";
+ version = "2017.4.17";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
- sha256 = "1klrzl3hgvcf2mjk00g0k3kk1p2z27vzwnxivwar4vhjmjvpz1w1";
+ sha256 = "f7527ebf7461582ce95f7a9e03dd141ce810d40590834f4ec20cddd54234c10a";
};
meta = {
diff --git a/pkgs/development/python-modules/channels/default.nix b/pkgs/development/python-modules/channels/default.nix
index a589369210d..e99fcdc4802 100644
--- a/pkgs/development/python-modules/channels/default.nix
+++ b/pkgs/development/python-modules/channels/default.nix
@@ -2,7 +2,8 @@
asgiref, django, daphne
}:
buildPythonPackage rec {
- name = "channels-${version}";
+ pname = "channels";
+ name = "${pname}-${version}";
version = "1.1.3";
src = fetchurl {
diff --git a/pkgs/development/python-modules/constantly/default.nix b/pkgs/development/python-modules/constantly/default.nix
index 44fbeb6d39f..50216c7ae1f 100644
--- a/pkgs/development/python-modules/constantly/default.nix
+++ b/pkgs/development/python-modules/constantly/default.nix
@@ -1,7 +1,8 @@
{ stdenv, buildPythonPackage, fetchurl
}:
buildPythonPackage rec {
- name = "constantly-${version}";
+ pname = "constantly";
+ name = "${pname}-${version}";
version = "15.1.0";
src = fetchurl {
diff --git a/pkgs/development/python-modules/daphne/default.nix b/pkgs/development/python-modules/daphne/default.nix
index 34cc597ede9..562b29cf062 100644
--- a/pkgs/development/python-modules/daphne/default.nix
+++ b/pkgs/development/python-modules/daphne/default.nix
@@ -2,7 +2,8 @@
asgiref, autobahn, twisted, hypothesis
}:
buildPythonPackage rec {
- name = "daphne-${version}";
+ pname = "daphne";
+ name = "${pname}-${version}";
version = "1.2.0";
src = fetchurl {
diff --git a/pkgs/development/python-modules/dateutil/default.nix b/pkgs/development/python-modules/dateutil/default.nix
index 8e05ee34357..c814b82dad0 100644
--- a/pkgs/development/python-modules/dateutil/default.nix
+++ b/pkgs/development/python-modules/dateutil/default.nix
@@ -1,6 +1,7 @@
{ stdenv, buildPythonPackage, fetchurl, six }:
buildPythonPackage rec {
- name = "dateutil-${version}";
+ pname = "dateutil";
+ name = "${pname}-${version}";
version = "2.6.0";
src = fetchurl {
diff --git a/pkgs/development/python-modules/dbfread/default.nix b/pkgs/development/python-modules/dbfread/default.nix
index 6bbc4775605..facdd00edac 100644
--- a/pkgs/development/python-modules/dbfread/default.nix
+++ b/pkgs/development/python-modules/dbfread/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "dbfread";
- version = "2.0.5";
+ version = "2.0.7";
src = fetchPypi {
inherit pname version;
- sha256 = "0r5axq9ax0czyapm7b69krcv22r1nyb4vci7c5x8mx8pq1axim93";
+ sha256 = "07c8a9af06ffad3f6f03e8fe91ad7d2733e31a26d2b72c4dd4cfbae07ee3b73d";
};
meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/dbus/default.nix b/pkgs/development/python-modules/dbus/default.nix
index d2e1d2dc86f..ab6e70a9a64 100644
--- a/pkgs/development/python-modules/dbus/default.nix
+++ b/pkgs/development/python-modules/dbus/default.nix
@@ -2,7 +2,9 @@
, ncurses, pygobject3 }:
if isPyPy then throw "dbus-python not supported for interpreter ${python.executable}" else buildPythonPackage rec {
- name = "dbus-python-1.2.4";
+ pname = "dbus-python";
+ version = "1.2.4";
+ name = "${pname}-${version}";
format = "other";
src = fetchurl {
diff --git a/pkgs/development/python-modules/discordpy/default.nix b/pkgs/development/python-modules/discordpy/default.nix
index c4f92caf8d5..53a4a51fcd8 100644
--- a/pkgs/development/python-modules/discordpy/default.nix
+++ b/pkgs/development/python-modules/discordpy/default.nix
@@ -11,13 +11,13 @@
let
pname = "discord.py";
- version = "0.16.4";
+ version = "0.16.8";
in buildPythonPackage rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
- sha256 = "04q4gknv9lb8r2sdnsqs5nfcyyl850j4pcqcs0xjvmqhd7axa5ai";
+ sha256 = "d775b701383e3a5762accf3816b819f357f299476701615ac30c7715a5ea79aa";
};
propagatedBuildInputs = [ asyncio aiohttp websockets pynacl ];
diff --git a/pkgs/development/python-modules/distro/default.nix b/pkgs/development/python-modules/distro/default.nix
index 9b79d82328f..49349839331 100644
--- a/pkgs/development/python-modules/distro/default.nix
+++ b/pkgs/development/python-modules/distro/default.nix
@@ -3,7 +3,7 @@
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "distro";
- version = "1.0.3";
+ version = "1.0.4";
buildInputs = [ pytest pytestcov tox];
@@ -14,7 +14,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
- sha256 = "1kmjdz1kxspsmps73m2kzhxz86jj43ikx825hmgmwbx793ywv69d";
+ sha256 = "9b000b0d637bb0cbd130a7a4835681e6993e309a85564dfea9d884825fe46954";
};
meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/django-compat/default.nix b/pkgs/development/python-modules/django-compat/default.nix
index d8a314750ca..59103191285 100644
--- a/pkgs/development/python-modules/django-compat/default.nix
+++ b/pkgs/development/python-modules/django-compat/default.nix
@@ -1,23 +1,43 @@
-{ stdenv, buildPythonPackage, fetchurl,
+{ stdenv, buildPythonPackage, fetchFromGitHub, python,
django, django_nose, six
}:
buildPythonPackage rec {
- name = "django-compat-${version}";
+ pname = "django-compat";
+ name = "${pname}-${version}";
version = "1.0.14";
- src = fetchurl {
- url = "mirror://pypi/d/django-compat/${name}.tar.gz";
- sha256 = "18y5bxxmafcd4np42mzbalva5lpssq0b8ki7zckbzvdv2mnv43xj";
+ # the pypi packages don't include everything required for the tests
+ src = fetchFromGitHub {
+ owner = "arteria";
+ repo = "django-compat";
+ rev = "v${version}";
+ sha256 = "11g6ra6djkchqk44v8k7biaxd1v69qyyyask5l92vmrvb0qiwvm8";
};
- doCheck = false;
+ checkPhase = ''
+ runHook preCheck
- buildInputs = [ django_nose ];
+ # we have to do a little bit of tinkering to convince the tests to run against the installed package, not the
+ # source directory
+ mkdir -p testbase/compat
+ pushd testbase
+ # note we're not copying the direct contents of compat/ (notably __init__.py) so python won't recognize this as a
+ # package, but the tests need to be in a specific path for the test templates to get picked up.
+ cp -r ../compat/tests compat/
+ cp ../runtests.py .
+ ${python.interpreter} runtests.py compat/tests
+ popd
+
+ runHook postCheck
+ '';
+
+ checkInputs = [ django_nose ];
propagatedBuildInputs = [ django six ];
meta = with stdenv.lib; {
description = "Forward and backwards compatibility layer for Django 1.4, 1.7, 1.8, 1.9, 1.10 and 1.11";
homepage = https://github.com/arteria/django-compat;
license = licenses.mit;
+ maintainers = with maintainers; [ ris ];
};
}
diff --git a/pkgs/development/python-modules/django-hijack/default.nix b/pkgs/development/python-modules/django-hijack/default.nix
new file mode 100644
index 00000000000..8eb98924491
--- /dev/null
+++ b/pkgs/development/python-modules/django-hijack/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub, python,
+ django, django_compat, django_nose
+}:
+buildPythonPackage rec {
+ name = "django-hijack-${version}";
+ version = "2.1.4";
+
+ # the pypi packages don't include everything required for the tests
+ src = fetchFromGitHub {
+ owner = "arteria";
+ repo = "django-hijack";
+ rev = "v${version}";
+ sha256 = "1wbm6l8mzpkj4wsj4fyfamzpzi3day2v1cva5j89v4dn4403jq21";
+ };
+
+ checkInputs = [ django_nose ];
+ propagatedBuildInputs = [ django django_compat ];
+
+ checkPhase = ''
+ runHook preCheck
+
+ # we have to do a little bit of tinkering to convince the tests to run against the installed package, not the
+ # source directory
+ mkdir testbase
+ pushd testbase
+ cp ../runtests.py .
+ ${python.interpreter} runtests.py hijack
+ popd
+
+ runHook postCheck
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Allows superusers to hijack (=login as) and work on behalf of another user";
+ homepage = https://github.com/arteria/django-hijack;
+ license = licenses.mit;
+ maintainers = with maintainers; [ ris ];
+ };
+}
\ No newline at end of file
diff --git a/pkgs/development/python-modules/django-raster/default.nix b/pkgs/development/python-modules/django-raster/default.nix
index e673d587e3e..2332229100c 100644
--- a/pkgs/development/python-modules/django-raster/default.nix
+++ b/pkgs/development/python-modules/django-raster/default.nix
@@ -3,12 +3,13 @@
pyparsing, django, celery
}:
buildPythonPackage rec {
- name = "django-raster-${version}";
- version = "0.3.1";
+ version = "0.4";
+ pname = "django-raster";
+ name = "${pname}-${version}";
src = fetchurl {
url = "mirror://pypi/d/django-raster/${name}.tar.gz";
- sha256 = "1hsrkvybak1adn9d9qdw7hx3rcxsbzas4ixwll6vrjkrizgfihk3";
+ sha256 = "7fd6afa42b07ac51a3873e3d4840325dd3a8a631fdb5b853c76fbbfe59a2b17f";
};
# Tests require a postgresql + postgis server
diff --git a/pkgs/development/python-modules/django/1_10.nix b/pkgs/development/python-modules/django/1_10.nix
index 6cc3af8c270..52b62e8d8b8 100644
--- a/pkgs/development/python-modules/django/1_10.nix
+++ b/pkgs/development/python-modules/django/1_10.nix
@@ -3,7 +3,8 @@
geos, gdal
}:
buildPythonPackage rec {
- name = "Django-${version}";
+ pname = "Django";
+ name = "${pname}-${version}";
version = "1.10.7";
disabled = pythonOlder "2.7";
diff --git a/pkgs/development/python-modules/django/1_11.nix b/pkgs/development/python-modules/django/1_11.nix
index 01d9992220f..0845352fba1 100644
--- a/pkgs/development/python-modules/django/1_11.nix
+++ b/pkgs/development/python-modules/django/1_11.nix
@@ -3,8 +3,10 @@
geos, gdal, pytz
}:
buildPythonPackage rec {
- name = "Django-${version}";
+ pname = "Django";
+ name = "${pname}-${version}";
version = "1.11.1";
+
disabled = pythonOlder "2.7";
src = fetchurl {
diff --git a/pkgs/development/python-modules/django_guardian.nix b/pkgs/development/python-modules/django_guardian.nix
index aee9707a523..b6df932e658 100644
--- a/pkgs/development/python-modules/django_guardian.nix
+++ b/pkgs/development/python-modules/django_guardian.nix
@@ -3,7 +3,8 @@
, pytest, pytestrunner, pytest-django, setuptools_scm
}:
buildPythonPackage rec {
- name = "django-guardian-${version}";
+ pname = "django-guardian";
+ name = "${pname}-${version}";
version = "1.4.8";
src = fetchurl {
diff --git a/pkgs/development/python-modules/djangorestframework/default.nix b/pkgs/development/python-modules/djangorestframework/default.nix
index 5ad026a8255..8bbce992c1b 100644
--- a/pkgs/development/python-modules/djangorestframework/default.nix
+++ b/pkgs/development/python-modules/djangorestframework/default.nix
@@ -1,11 +1,12 @@
{ stdenv, buildPythonPackage, fetchurl, django }:
buildPythonPackage rec {
- name = "djangorestframework-${version}";
- version = "3.5.4";
+ version = "3.6.3";
+ pname = "djangorestframework";
+ name = "${pname}-${version}";
src = fetchurl {
url = "mirror://pypi/d/djangorestframework/${name}.tar.gz";
- sha256 = "1rays9d8jxqng13fv18ldf11y44w0ln6vvj2k8m4sd9gw9da75gr";
+ sha256 = "6aa6aafdfb7f6152a401873ecae93aff9eb54d7a74266065347cf4de68278ae4";
};
# Test settings are missing
diff --git a/pkgs/development/python-modules/docker.nix b/pkgs/development/python-modules/docker.nix
index 84c7b5ff38b..58c7da4cbe5 100644
--- a/pkgs/development/python-modules/docker.nix
+++ b/pkgs/development/python-modules/docker.nix
@@ -3,12 +3,13 @@
, ipaddress, backports_ssl_match_hostname, docker_pycreds
}:
buildPythonPackage rec {
- name = "docker-${version}";
- version = "2.0.2";
+ version = "2.3.0";
+ pname = "docker";
+ name = "${pname}-${version}";
src = fetchurl {
url = "mirror://pypi/d/docker/${name}.tar.gz";
- sha256 = "1m16n2r8is1gxwmyr6163na2jdyzsnhhk2qj12l7rzm1sr9nhx7z";
+ sha256 = "b0e3f353a3df3eedfbbcaf48235117263479b893edfa0cf6d8d056cca5edde1c";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/docker_compose.nix b/pkgs/development/python-modules/docker_compose.nix
index 9af95f72598..25435c396d7 100644
--- a/pkgs/development/python-modules/docker_compose.nix
+++ b/pkgs/development/python-modules/docker_compose.nix
@@ -6,12 +6,13 @@
, enum34, functools32
}:
buildPythonApplication rec {
- version = "1.10.0";
- name = "docker-compose-${version}";
+ version = "1.13.0";
+ pname = "docker-compose";
+ name = "${pname}-${version}";
src = fetchurl {
url = "mirror://pypi/d/docker-compose/${name}.tar.gz";
- sha256 = "023y2yhkvglaq07d78i89g2p8h040d71il8nfbyg2f9fkffigx9z";
+ sha256 = "3c7b62cd0ab5f33d21db197d8a74739d320a6fe32e4ef8282c35d4dee5a7c77c";
};
# lots of networking and other fails
diff --git a/pkgs/development/python-modules/dogpile.cache/default.nix b/pkgs/development/python-modules/dogpile.cache/default.nix
index de6efe40af7..25913f3a497 100644
--- a/pkgs/development/python-modules/dogpile.cache/default.nix
+++ b/pkgs/development/python-modules/dogpile.cache/default.nix
@@ -4,12 +4,12 @@
buildPythonPackage rec {
pname = "dogpile.cache";
- version = "0.6.2";
+ version = "0.6.3";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
- sha256 = "73793471af07af6dc5b3ee015abfaca4220caaa34c615537f5ab007ed150726d";
+ sha256 = "e9747f5e31f8dea1b80d6204358885f943f69e53574d88005438ca3651c44553";
};
# Disable concurrency tests that often fail,
diff --git a/pkgs/development/python-modules/ds4drv.nix b/pkgs/development/python-modules/ds4drv.nix
index 8698a65ea11..ba40b0b3f85 100644
--- a/pkgs/development/python-modules/ds4drv.nix
+++ b/pkgs/development/python-modules/ds4drv.nix
@@ -4,7 +4,8 @@
}:
buildPythonPackage rec {
- name = "ds4drv-${version}";
+ pname = "ds4drv";
+ name = "${pname}-${version}";
version = "0.5.1";
# PyPi only carries py3 wheel
diff --git a/pkgs/development/python-modules/dulwich.nix b/pkgs/development/python-modules/dulwich.nix
index d482aa14627..804419d0fca 100644
--- a/pkgs/development/python-modules/dulwich.nix
+++ b/pkgs/development/python-modules/dulwich.nix
@@ -3,12 +3,13 @@
, git, glibcLocales }:
buildPythonPackage rec {
- name = "dulwich-${version}";
- version = "0.14.1";
+ version = "0.17.3";
+ pname = "dulwich";
+ name = "${pname}-${version}";
src = fetchurl {
url = "mirror://pypi/d/dulwich/${name}.tar.gz";
- sha256 = "14xsyxha6qyxxyf0ma3zv1sy31iy22vzwayk519n7a1gwzk4j7vw";
+ sha256 = "0c3eccac93823e172b05d57aaeab3d6f03c6c0f1867613606d1909a3ab4100ca";
};
LC_ALL = "en_US.UTF-8";
diff --git a/pkgs/development/python-modules/ecpy/default.nix b/pkgs/development/python-modules/ecpy/default.nix
new file mode 100644
index 00000000000..57549792d21
--- /dev/null
+++ b/pkgs/development/python-modules/ecpy/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchPypi, buildPythonPackage, hidapi
+, pycrypto, pillow, protobuf, future, ecpy
+}:
+
+buildPythonPackage rec {
+ name = "${pname}-${version}";
+ pname = "ECPy";
+ version = "0.8.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0ab60sx4bbsmccwmdvz1023r0cbzi4phar4ipzn5npdj5gw1ny4l";
+ };
+
+ buildInputs = [ hidapi pycrypto pillow protobuf future ];
+
+ meta = with stdenv.lib; {
+ description = "Pure Pyhton Elliptic Curve Library";
+ homepage = "https://github.com/ubinity/ECPy";
+ license = licenses.asl20;
+ };
+}
diff --git a/pkgs/development/python-modules/ed25519/default.nix b/pkgs/development/python-modules/ed25519/default.nix
new file mode 100644
index 00000000000..1cdf85385e8
--- /dev/null
+++ b/pkgs/development/python-modules/ed25519/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchPypi, buildPythonPackage }:
+
+buildPythonPackage rec {
+ name = "${pname}-${version}";
+ pname = "ed25519";
+ version = "1.4";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0ahx1nkxa0xis3cw0h5c4fpgv8mq4znkq7kajly33lc3317bk499";
+ };
+
+ meta = with stdenv.lib; {
+ description = "Ed25519 public-key signatures";
+ homepage = "https://github.com/warner/python-ed25519";
+ license = licenses.mit;
+ maintainers = with maintainers; [ np ];
+ };
+}
diff --git a/pkgs/development/python-modules/edward/default.nix b/pkgs/development/python-modules/edward/default.nix
index 0ae81aef096..4d78acf78de 100644
--- a/pkgs/development/python-modules/edward/default.nix
+++ b/pkgs/development/python-modules/edward/default.nix
@@ -3,14 +3,14 @@
buildPythonPackage rec {
pname = "edward";
- version = "1.2.2";
+ version = "1.3.2";
name = "${pname}-${version}";
disabled = !(isPy27 || pythonAtLeast "3.4");
src = fetchPypi {
inherit pname version;
- sha256 = "0h9i15l7mczwx8jvabjbvxjjidr13x81h6vylb1p8r308w01r2as";
+ sha256 = "24aa0bf237965f47dd39d2b2ff43718ba75cb12c471b26ff80a972a66ff32de3";
};
# disabled for now due to Tensorflow trying to create files in $HOME:
diff --git a/pkgs/development/python-modules/emoji/default.nix b/pkgs/development/python-modules/emoji/default.nix
new file mode 100644
index 00000000000..321259d9939
--- /dev/null
+++ b/pkgs/development/python-modules/emoji/default.nix
@@ -0,0 +1,23 @@
+{ lib, buildPythonPackage, fetchPypi, nose }:
+
+buildPythonPackage rec {
+ pname = "emoji";
+ name = "${pname}-${version}";
+ version = "0.4.5";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "13i9mgkpll8m92b8mgm5yab4i78nwsl9h38nriavg105id94mg6q";
+ };
+
+ checkInputs = [ nose ];
+
+ checkPhase = ''nosetests'';
+
+ meta = with lib; {
+ description = "Emoji for Python";
+ homepage = https://pypi.python.org/pypi/emoji/;
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ joachifm ];
+ };
+}
diff --git a/pkgs/development/python-modules/ezdxf/default.nix b/pkgs/development/python-modules/ezdxf/default.nix
index c6c6137a2d4..1f457235b6a 100644
--- a/pkgs/development/python-modules/ezdxf/default.nix
+++ b/pkgs/development/python-modules/ezdxf/default.nix
@@ -2,7 +2,8 @@
buildPythonPackage rec {
version = "0.8.1";
- name = "ezdxf-${version}";
+ pname = "ezdxf";
+ name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "mozman";
diff --git a/pkgs/development/python-modules/feedgenerator/default.nix b/pkgs/development/python-modules/feedgenerator/default.nix
new file mode 100644
index 00000000000..d5ce8f8afc2
--- /dev/null
+++ b/pkgs/development/python-modules/feedgenerator/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildPythonPackage, glibcLocales, fetchurl, six, pytz }:
+
+buildPythonPackage rec {
+ pname = "feedgenerator";
+ version = "1.9";
+ name = "${pname}-${version}";
+
+ src = fetchurl {
+ url = "mirror://pypi/f/feedgenerator/${name}.tar.gz";
+ sha256 = "01mirwkm7xfx539hmvj7g9da1j51gw5lsx74dr0glizskjm5vq2s";
+ };
+
+ buildInputs = [ glibcLocales ];
+
+ LC_ALL="en_US.UTF-8";
+
+ propagatedBuildInputs = [ six pytz ];
+
+ meta = with stdenv.lib; {
+ description = "Standalone version of django.utils.feedgenerator, compatible with Py3k";
+ homepage = https://github.com/dmdm/feedgenerator-py3k.git;
+ maintainers = with maintainers; [ garbas ];
+ };
+}
diff --git a/pkgs/development/python-modules/flake8-blind-except/default.nix b/pkgs/development/python-modules/flake8-blind-except/default.nix
index 88b4f811e94..a657c25eed7 100644
--- a/pkgs/development/python-modules/flake8-blind-except/default.nix
+++ b/pkgs/development/python-modules/flake8-blind-except/default.nix
@@ -1,7 +1,8 @@
{ lib, fetchurl, buildPythonPackage }:
buildPythonPackage rec {
- name = "flake8-blind-except-${version}";
+ pname = "flake8-blind-except";
+ name = "${pname}-${version}";
version = "0.1.1";
src = fetchurl {
url = "mirror://pypi/f/flake8-blind-except/${name}.tar.gz";
diff --git a/pkgs/development/python-modules/flake8-debugger/default.nix b/pkgs/development/python-modules/flake8-debugger/default.nix
index b383c5db008..c00bf0c8551 100644
--- a/pkgs/development/python-modules/flake8-debugger/default.nix
+++ b/pkgs/development/python-modules/flake8-debugger/default.nix
@@ -1,7 +1,8 @@
{ lib, fetchurl, buildPythonPackage, flake8, nose }:
buildPythonPackage rec {
- name = "flake8-debugger-${version}";
+ pname = "flake8-debugger";
+ name = "${pname}-${version}";
version = "1.4.0";
src = fetchurl {
url = "mirror://pypi/f/flake8-debugger/${name}.tar.gz";
diff --git a/pkgs/development/python-modules/flask-elastic.nix b/pkgs/development/python-modules/flask-elastic.nix
index 9ea9616fbda..4181d964787 100644
--- a/pkgs/development/python-modules/flask-elastic.nix
+++ b/pkgs/development/python-modules/flask-elastic.nix
@@ -2,7 +2,8 @@
, flask, elasticsearch }:
buildPythonPackage rec {
- name = "Flask-Elastic-${version}";
+ pname = "Flask-Elastic";
+ name = "${pname}-${version}";
version = "0.2";
src = fetchurl {
diff --git a/pkgs/development/python-modules/flask-ldap-login.nix b/pkgs/development/python-modules/flask-ldap-login.nix
index 37f9d72dd3f..cdc7cefff95 100644
--- a/pkgs/development/python-modules/flask-ldap-login.nix
+++ b/pkgs/development/python-modules/flask-ldap-login.nix
@@ -3,7 +3,9 @@
, mock, nose }:
buildPythonPackage rec {
- name = "flask-ldap-login-0.3.0";
+ pname = "flask-ldap-login";
+ version = "0.3.0";
+ name = "${pname}-${version}";
src = fetchurl {
url = "mirror://pypi/f/flask-ldap-login/${name}.tar.gz";
diff --git a/pkgs/development/python-modules/flask-login.nix b/pkgs/development/python-modules/flask-login.nix
index 0149e29bcf7..a463964b312 100644
--- a/pkgs/development/python-modules/flask-login.nix
+++ b/pkgs/development/python-modules/flask-login.nix
@@ -2,7 +2,8 @@
, flask, nose, mock, blinker}:
buildPythonPackage rec {
- name = "Flask-Login-${version}";
+ pname = "Flask-Login";
+ name = "${pname}-${version}";
version = "0.4.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/python-modules/flask-migrate/default.nix b/pkgs/development/python-modules/flask-migrate/default.nix
new file mode 100644
index 00000000000..3e2c7ac4602
--- /dev/null
+++ b/pkgs/development/python-modules/flask-migrate/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, buildPythonPackage, fetchPypi, isPy3k, python, glibcLocales, flask, flask_sqlalchemy, flask_script, alembic
+}:
+
+with stdenv.lib;
+
+buildPythonPackage rec {
+ pname = "Flask-Migrate";
+ version = "2.0.4";
+ name = "${pname}-${version}";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1e6dc83bed93aef9a4791d5daaa03b186c8ef5d96c99c7d88166da683c86e42d";
+ };
+
+ checkInputs = optional isPy3k glibcLocales;
+ propagatedBuildInputs = [ flask flask_sqlalchemy flask_script alembic ];
+
+ # tests invoke the flask cli which uses click and therefore has py3k encoding troubles
+ preCheck = optionalString isPy3k ''
+ export LANG="en_US.UTF-8"
+ '';
+
+ meta = {
+ description = "SQLAlchemy database migrations for Flask applications using Alembic";
+ license = licenses.mit;
+ homepage = https://github.com/miguelgrinberg/Flask-Migrate;
+ };
+}
diff --git a/pkgs/development/python-modules/flask-oauthlib.nix b/pkgs/development/python-modules/flask-oauthlib.nix
index 83413dadb7f..cacb16cb7bb 100644
--- a/pkgs/development/python-modules/flask-oauthlib.nix
+++ b/pkgs/development/python-modules/flask-oauthlib.nix
@@ -2,7 +2,8 @@
, flask, oauthlib, requests_oauthlib, flask_sqlalchemy
, mock, nose}:
buildPythonPackage rec {
- name = "Flask-OAuthlib-${version}";
+ pname = "Flask-OAuthlib";
+ name = "${pname}-${version}";
version = "0.9.3";
src = fetchFromGitHub {
diff --git a/pkgs/development/python-modules/flask-wtf.nix b/pkgs/development/python-modules/flask-wtf.nix
index 24e66ea4e98..a0b623c6b6a 100644
--- a/pkgs/development/python-modules/flask-wtf.nix
+++ b/pkgs/development/python-modules/flask-wtf.nix
@@ -1,7 +1,9 @@
{ stdenv, fetchurl, buildPythonPackage, flask, wtforms, nose }:
buildPythonPackage rec {
- name = "Flask-WTF-0.14.2";
+ pname = "Flask-WTF";
+ version = "0.14.2";
+ name = "${pname}-${version}";
src = fetchurl {
url = "mirror://pypi/F/Flask-WTF/${name}.tar.gz";
diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix
new file mode 100644
index 00000000000..b9ef3ba94b6
--- /dev/null
+++ b/pkgs/development/python-modules/fonttools/default.nix
@@ -0,0 +1,32 @@
+{ buildPythonPackage
+, fetchPypi
+, numpy
+, pytest
+, pytestrunner
+}:
+
+buildPythonPackage rec {
+ pname = "fonttools";
+ version = "3.13.0";
+ name = "${pname}-${version}";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "5ec278ff231d0c88afe8266e911ee0f8e66c8501c53f5f144a1a0abbc936c6b8";
+ extension = "zip";
+ };
+
+ buildInputs = [
+ numpy
+ ];
+
+ checkInputs = [
+ pytest
+ pytestrunner
+ ];
+
+ meta = {
+ homepage = "https://github.com/fonttools/fonttools";
+ description = "A library to manipulate font files from Python";
+ };
+}
diff --git a/pkgs/development/python-modules/future/default.nix b/pkgs/development/python-modules/future/default.nix
new file mode 100644
index 00000000000..c368913caae
--- /dev/null
+++ b/pkgs/development/python-modules/future/default.nix
@@ -0,0 +1,40 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, isPy26
+, importlib
+, argparse
+}:
+
+buildPythonPackage rec {
+ pname = "future";
+ version = "0.16.0";
+ name = "${pname}-${version}";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1nzy1k4m9966sikp0qka7lirh8sqrsyainyf8rk97db7nwdfv773";
+ };
+
+ propagatedBuildInputs = lib.optionals isPy26 [ importlib argparse ];
+ doCheck = false;
+
+ meta = {
+ description = "Clean single-source support for Python 3 and 2";
+ longDescription = ''
+ python-future is the missing compatibility layer between Python 2 and
+ Python 3. It allows you to use a single, clean Python 3.x-compatible
+ codebase to support both Python 2 and Python 3 with minimal overhead.
+
+ It provides future and past packages with backports and forward ports
+ of features from Python 3 and 2. It also comes with futurize and
+ pasteurize, customized 2to3-based scripts that helps you to convert
+ either Py2 or Py3 code easily to support both Python 2 and 3 in a
+ single clean Py3-style codebase, module by module.
+ '';
+ homepage = https://python-future.org;
+ downloadPage = https://github.com/PythonCharmers/python-future/releases;
+ license = with lib.licenses; [ mit ];
+ maintainers = with lib.maintainers; [ prikhi ];
+ };
+}
diff --git a/pkgs/development/python-modules/ghdiff.nix b/pkgs/development/python-modules/ghdiff.nix
index 1f14b661d53..5dfd399ac7d 100644
--- a/pkgs/development/python-modules/ghdiff.nix
+++ b/pkgs/development/python-modules/ghdiff.nix
@@ -2,7 +2,9 @@
, zope_testrunner, six, chardet}:
buildPythonPackage rec {
- name = "ghdiff-0.4";
+ pname = "ghdiff";
+ version = "0.4";
+ name = "${pname}-${version}";
src = fetchurl {
url = "mirror://pypi/g/ghdiff/${name}.tar.gz";
diff --git a/pkgs/development/python-modules/guessit/default.nix b/pkgs/development/python-modules/guessit/default.nix
index 7cf051b89a6..cc5c954b645 100644
--- a/pkgs/development/python-modules/guessit/default.nix
+++ b/pkgs/development/python-modules/guessit/default.nix
@@ -9,12 +9,12 @@
buildPythonPackage rec {
pname = "guessit";
- version = "2.1.2";
+ version = "2.1.3";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
- sha256 = "9f7e12b7f2215548284631a20aae6fc009c8af2bb8cc5d5e5e339cb15361dd95";
+ sha256 = "b2eebbb61e4d2b3764ce4462e0b27da0dccbb25b78e13493a2f913a402e1d0fb";
};
# Tests require more packages.
diff --git a/pkgs/development/python-modules/gunicorn.nix b/pkgs/development/python-modules/gunicorn.nix
index 026e9df360c..cc8017f0cd8 100644
--- a/pkgs/development/python-modules/gunicorn.nix
+++ b/pkgs/development/python-modules/gunicorn.nix
@@ -2,11 +2,13 @@
, pytest, mock, pytestcov, coverage }:
buildPythonPackage rec {
- name = "gunicorn-19.3.0";
+ pname = "gunicorn";
+ version = "19.7.1";
+ name = "${pname}-${version}";
src = fetchurl {
url = "mirror://pypi/g/gunicorn/${name}.tar.gz";
- sha256 = "12d0jd9y9fyssc28mn8j6nzrck8y05hc946p5h0rmbc25043bj4b";
+ sha256 = "eee1169f0ca667be05db3351a0960765620dad53f53434262ff8901b68a1b622";
};
buildInputs = [ pytest mock pytestcov coverage ];
diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix
index e2cb11cedb4..7b517df0922 100644
--- a/pkgs/development/python-modules/h5py/default.nix
+++ b/pkgs/development/python-modules/h5py/default.nix
@@ -11,12 +11,13 @@ let
mpiSupport = hdf5.mpiSupport;
in buildPythonPackage rec {
- name = "h5py-${version}";
- version = "2.6.0";
+ version = "2.7.0";
+ pname = "h5py";
+ name = "${pname}-${version}";
src = fetchurl {
url = "mirror://pypi/h/h5py/${name}.tar.gz";
- sha256 = "0df46dg7i7xfking9lp221bfm8dbl974yvlrbi1w7r6m61ac7bxj";
+ sha256 = "79254312df2e6154c4928f5e3b22f7a2847b6e5ffb05ddc33e37b16e76d36310";
};
configure_flags = "--hdf5=${hdf5}" + optionalString mpiSupport " --mpi";
diff --git a/pkgs/development/python-modules/hidapi/default.nix b/pkgs/development/python-modules/hidapi/default.nix
new file mode 100644
index 00000000000..697bc1cd0e3
--- /dev/null
+++ b/pkgs/development/python-modules/hidapi/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, libusb1, udev, fetchPypi, buildPythonPackage, cython }:
+
+buildPythonPackage rec {
+ name = "${pname}-${version}";
+ pname = "hidapi";
+ version = "0.7.99.post20";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1k7z5m7xsqy8j4qkjy4pfxdx4hm36ha68vi65z6smvnyg4zgv22z";
+ };
+
+ propagatedBuildInputs = [ libusb1 udev cython ];
+
+ # Fix the USB backend library lookup
+ postPatch = ''
+ libusb=${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 = with stdenv.lib; {
+ 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 ];
+ };
+}
diff --git a/pkgs/development/python-modules/hieroglyph/default.nix b/pkgs/development/python-modules/hieroglyph/default.nix
index e79cdede092..9e97e56c134 100644
--- a/pkgs/development/python-modules/hieroglyph/default.nix
+++ b/pkgs/development/python-modules/hieroglyph/default.nix
@@ -1,8 +1,9 @@
{ stdenv , fetchurl , buildPythonPackage , sphinx }:
buildPythonPackage rec {
+ pname = "hieroglyph";
version = "0.7.1";
- name = "hieroglyph-${version}";
+ name = "${pname}-${version}";
src = fetchurl {
url = "mirror://pypi/h/hieroglyph/${name}.tar.gz";
diff --git a/pkgs/development/python-modules/hypothesis.nix b/pkgs/development/python-modules/hypothesis.nix
index d5251f1fa55..ab56cde9c13 100644
--- a/pkgs/development/python-modules/hypothesis.nix
+++ b/pkgs/development/python-modules/hypothesis.nix
@@ -1,6 +1,6 @@
{ stdenv, buildPythonPackage, fetchFromGitHub, python
, pythonOlder, pythonAtLeast, enum34
-, doCheck ? true, pytest, flake8, flaky
+, doCheck ? true, pytest, pytest_xdist, flake8, flaky
}:
buildPythonPackage rec {
# http://hypothesis.readthedocs.org/en/latest/packaging.html
@@ -9,25 +9,27 @@ buildPythonPackage rec {
# pytz fake_factory django numpy pytest
# If you need these, you can just add them to your environment.
- name = "hypothesis-${version}";
- version = "3.7.0";
+ version = "3.11.1";
+ pname = "hypothesis";
+ name = "${pname}-${version}";
# Upstream prefers github tarballs
src = fetchFromGitHub {
owner = "HypothesisWorks";
- repo = "hypothesis";
+ repo = "hypothesis-python";
rev = "${version}";
- sha256 = "1zsv1ggf3g9rrigxl3zd1z8qc6fcj8lmszm8ib1ya4ar6r64x0yz";
+ sha256 = "0damf6zbm0db2a3gfwrbbj92yal576wpmhhchc0w0np8vdnax70n";
};
- buildInputs = stdenv.lib.optionals doCheck [ pytest flake8 flaky ];
+ checkInputs = stdenv.lib.optionals doCheck [ pytest pytest_xdist flake8 flaky ];
propagatedBuildInputs = stdenv.lib.optionals (pythonOlder "3.4") [ enum34 ];
inherit doCheck;
# https://github.com/DRMacIver/hypothesis/issues/300
checkPhase = ''
- ${python.interpreter} -m pytest tests/cover
+ rm tox.ini # This file changes how py.test runs and breaks it
+ py.test tests/cover
'';
# Unsupport by upstream on certain versions
diff --git a/pkgs/development/python-modules/incremental/default.nix b/pkgs/development/python-modules/incremental/default.nix
index b8565a8b758..0c54c3ab8ae 100644
--- a/pkgs/development/python-modules/incremental/default.nix
+++ b/pkgs/development/python-modules/incremental/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "incremental";
- version = "16.10.1";
+ version = "17.5.0";
src = fetchurl {
url = "mirror://pypi/i/${pname}/${name}.tar.gz";
- sha256 = "0hh382gsj5lfl3fsabblk2djngl4n5yy90xakinasyn41rr6pb8l";
+ sha256 = "7b751696aaf36eebfab537e458929e194460051ccad279c72b755a167eebd4b3";
};
meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/jabberbot.nix b/pkgs/development/python-modules/jabberbot.nix
index efbd4b981fa..9161f3f6f0b 100644
--- a/pkgs/development/python-modules/jabberbot.nix
+++ b/pkgs/development/python-modules/jabberbot.nix
@@ -1,7 +1,9 @@
{ stdenv, buildPythonPackage, isPy3k, fetchurl, xmpppy }:
buildPythonPackage rec {
- name = "jabberbot-0.16";
+ pname = "jabberbot";
+ version = "0.16";
+ name = "${pname}-${version}";
disabled = isPy3k;
src = fetchurl {
diff --git a/pkgs/development/python-modules/jsbeautifier/default.nix b/pkgs/development/python-modules/jsbeautifier/default.nix
index fa4ba7bffb5..c199b2f50db 100644
--- a/pkgs/development/python-modules/jsbeautifier/default.nix
+++ b/pkgs/development/python-modules/jsbeautifier/default.nix
@@ -1,21 +1,23 @@
{ stdenv, fetchurl, buildPythonApplication, EditorConfig, pytest, six }:
buildPythonApplication rec {
- name = "jsbeautifier-1.6.14";
+ pname = "jsbeautifier";
+ version = "1.6.14";
+ name = "jsbeautifier-1.6.14";
- propagatedBuildInputs = [ six ];
+ propagatedBuildInputs = [ six ];
- buildInputs = [ EditorConfig pytest ];
+ buildInputs = [ EditorConfig pytest ];
- src = fetchurl {
- url = "mirror://pypi/j/jsbeautifier/${name}.tar.gz";
- sha256 = "50b2af556aa1da7283a6a92eaa699668312cb91f2ba6b78a4422b1d42af964a2";
- };
+ src = fetchurl {
+ url = "mirror://pypi/j/jsbeautifier/${name}.tar.gz";
+ sha256 = "50b2af556aa1da7283a6a92eaa699668312cb91f2ba6b78a4422b1d42af964a2";
+ };
- meta = with stdenv.lib; {
- homepage = "http://jsbeautifier.org";
- description = "JavaScript unobfuscator and beautifier.";
- license = licenses.mit;
- maintainers = with maintainers; [ apeyroux ];
- };
- }
+ meta = with stdenv.lib; {
+ homepage = "http://jsbeautifier.org";
+ description = "JavaScript unobfuscator and beautifier.";
+ license = licenses.mit;
+ maintainers = with maintainers; [ apeyroux ];
+ };
+}
diff --git a/pkgs/development/python-modules/keepkey/default.nix b/pkgs/development/python-modules/keepkey/default.nix
new file mode 100644
index 00000000000..0d7f7661e7d
--- /dev/null
+++ b/pkgs/development/python-modules/keepkey/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchPypi, buildPythonPackage, ecdsa
+, mnemonic, protobuf3_0, hidapi }:
+
+buildPythonPackage rec {
+ name = "${pname}-${version}";
+ pname = "keepkey";
+ version = "0.7.3";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "14d2r8dlx997ypgma2k8by90acw7i3l7hfq4gar9lcka0lqfj714";
+ };
+
+ propagatedBuildInputs = [ protobuf3_0 hidapi ];
+
+ buildInputs = [ ecdsa mnemonic ];
+
+ # There are no actual tests: "ImportError: No module named tests"
+ doCheck = false;
+
+ # Remove impossible dependency constraint
+ postPatch = "sed -i -e 's|hidapi==|hidapi>=|' setup.py";
+
+ meta = with stdenv.lib; {
+ description = "KeepKey Python client";
+ homepage = https://github.com/keepkey/python-keepkey;
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ np ];
+ };
+}
diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix
index ab9d315e794..c397ff43074 100644
--- a/pkgs/development/python-modules/keras/default.nix
+++ b/pkgs/development/python-modules/keras/default.nix
@@ -12,12 +12,12 @@
buildPythonPackage rec {
pname = "Keras";
- version = "2.0.3";
+ version = "2.0.4";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
- sha256 = "1x4p179smmnki6mng9n3lsi9glv2jg0y1ls154msplz9jm5bv39r";
+ sha256 = "1cbe62af6821963321b275d5598fd94e63c11feaa1d4deaa79c9eb9ee0e1d68a";
};
checkInputs = [
diff --git a/pkgs/development/python-modules/koji/default.nix b/pkgs/development/python-modules/koji/default.nix
index 28b5e11223f..d43e56781a7 100644
--- a/pkgs/development/python-modules/koji/default.nix
+++ b/pkgs/development/python-modules/koji/default.nix
@@ -1,7 +1,9 @@
{ stdenv, fetchurl, buildPythonPackage, pycurl }:
buildPythonPackage rec {
- name = "koji-1.8";
+ pname = "koji";
+ version = "1.8";
+ name = "${pname}-${version}";
format = "other";
src = fetchurl {
diff --git a/pkgs/development/python-modules/ldap.nix b/pkgs/development/python-modules/ldap.nix
index 95243f52a38..b583a2ae2d8 100644
--- a/pkgs/development/python-modules/ldap.nix
+++ b/pkgs/development/python-modules/ldap.nix
@@ -1,15 +1,41 @@
-{ buildPythonPackage, isPy3k, fetchurl
+{ lib, writeText, buildPythonPackage, isPy3k, fetchPypi
, openldap, cyrus_sasl, openssl }:
buildPythonPackage rec {
- name = "ldap-2.4.22";
+ pname = "python-ldap";
+ version = "2.4.39";
+ name = "${pname}-${version}";
disabled = isPy3k;
- src = fetchurl {
- url = "mirror://pypi/p/python-ldap/python-${name}.tar.gz";
- sha256 = "1dshpq84kl4xpa0hmnjrh6q5h5bybn09r83sa3z3ybr9jlm8gxcy";
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "3fb75108d27e8091de80dffa2ba3bf45c7a3bdc357e2959006aed52fa58bb2f3";
};
+ # Needed by tests to setup a mockup ldap server.
+ preCheck = ''
+ export BIN="${openldap}/bin"
+ export SBIN="${openldap}/bin"
+ export SLAPD="${openldap}/libexec/slapd"
+ export SCHEMA="${openldap}/etc/schema"
+ '';
+
+ patches = lib.singleton (writeText "avoid-syslog.diff" ''
+ diff a/Lib/slapdtest.py b/Lib/slapdtest.py
+ --- a/Lib/slapdtest.py
+ +++ b/Lib/slapdtest.py
+ @@ -60,7 +60,8 @@ def combined_logger(
+ pass
+ # for writing to syslog
+ new_logger = logging.getLogger(log_name)
+ - if sys_log_format:
+ + # /dev/log does not exist in nix build environment.
+ + if False:
+ my_syslog_formatter = logging.Formatter(
+ fmt=' '.join((log_name, sys_log_format)))
+ my_syslog_handler = logging.handlers.SysLogHandler(
+ '');
+
NIX_CFLAGS_COMPILE = "-I${cyrus_sasl.dev}/include/sasl";
propagatedBuildInputs = [openldap cyrus_sasl openssl];
}
diff --git a/pkgs/development/python-modules/ledgerblue/default.nix b/pkgs/development/python-modules/ledgerblue/default.nix
new file mode 100644
index 00000000000..9ed18190a8e
--- /dev/null
+++ b/pkgs/development/python-modules/ledgerblue/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchPypi, buildPythonPackage, hidapi
+, pycrypto, pillow, protobuf, future, ecpy
+}:
+
+buildPythonPackage rec {
+ name = "${pname}-${version}";
+ pname = "ledgerblue";
+ version = "0.1.13";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "09bsiylvgax6m47w8r0myaf61xj9j0h1spvadx6fx31qy0iqicw0";
+ };
+
+ buildInputs = [ hidapi pycrypto pillow protobuf future ecpy ];
+
+ meta = with stdenv.lib; {
+ description = "Python library to communicate with Ledger Blue/Nano S";
+ homepage = "https://github.com/LedgerHQ/blue-loader-python";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ np ];
+ };
+}
diff --git a/pkgs/development/python-modules/libagent/default.nix b/pkgs/development/python-modules/libagent/default.nix
new file mode 100644
index 00000000000..5192abf8200
--- /dev/null
+++ b/pkgs/development/python-modules/libagent/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchPypi, buildPythonPackage, ed25519, ecdsa
+, semver, keepkey, trezor, mnemonic, ledgerblue
+}:
+
+buildPythonPackage rec {
+ name = "${pname}-${version}";
+ pname = "libagent";
+ version = "0.9.1";
+
+ src = fetchPypi{
+ inherit pname version;
+ sha256 = "1g19lsid7lqw567w31fif89w088lzbgh27xpb1pshjk1gvags3bc";
+ };
+
+ buildInputs = [
+ ed25519 ecdsa semver keepkey
+ trezor mnemonic ledgerblue
+ ];
+
+ meta = with stdenv.lib; {
+ description = "Using hardware wallets as SSH/GPG agent";
+ homepage = "https://github.com/romanz/trezor-agent";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ np ];
+ };
+}
diff --git a/pkgs/development/python-modules/libais/default.nix b/pkgs/development/python-modules/libais/default.nix
index 85b5d92e79f..5d8c886e00b 100644
--- a/pkgs/development/python-modules/libais/default.nix
+++ b/pkgs/development/python-modules/libais/default.nix
@@ -2,7 +2,8 @@
six, pytest, pytestrunner, pytestcov, coverage
}:
buildPythonPackage rec {
- name = "libais-${version}";
+ pname = "libais";
+ name = "${pname}-${version}";
version = "0.16";
src = fetchurl {
diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix
index cae6ac62e1e..bfe3b7bbb66 100644
--- a/pkgs/development/python-modules/libarcus/default.nix
+++ b/pkgs/development/python-modules/libarcus/default.nix
@@ -5,7 +5,8 @@ then throw "libArcus not supported for interpreter ${python.executable}"
else
stdenv.mkDerivation rec {
- name = "libarcus-${version}";
+ pname = "libarcus";
+ name = "${pname}-${version}";
version = "2.4.0";
src = fetchFromGitHub {
diff --git a/pkgs/development/python-modules/libasyncns/default.nix b/pkgs/development/python-modules/libasyncns/default.nix
index 63bcad285c4..b27dbc2935a 100644
--- a/pkgs/development/python-modules/libasyncns/default.nix
+++ b/pkgs/development/python-modules/libasyncns/default.nix
@@ -2,7 +2,8 @@
, libasyncns, pkgconfig }:
buildPythonPackage rec {
- name = "libasyncns-python-${version}";
+ pname = "libasyncns-python";
+ name = "${pname}-${version}";
version = "0.7.1";
src = fetchurl {
diff --git a/pkgs/development/python-modules/libsexy/default.nix b/pkgs/development/python-modules/libsexy/default.nix
index 79eb8ab2f83..69d9dde6cba 100644
--- a/pkgs/development/python-modules/libsexy/default.nix
+++ b/pkgs/development/python-modules/libsexy/default.nix
@@ -1,7 +1,8 @@
{ stdenv, fetchurl, buildPythonPackage, libsexy, pkgconfig, libxml2, pygtk, pango, gtk2, glib }:
buildPythonPackage rec {
- name = "libsexy-${version}";
+ pname = "libsexy";
+ name = "${pname}-${version}";
version = "0.1.9";
format = "other";
diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix
index 6b6be639851..c08d05c0341 100644
--- a/pkgs/development/python-modules/llvmlite/default.nix
+++ b/pkgs/development/python-modules/llvmlite/default.nix
@@ -11,13 +11,13 @@
buildPythonPackage rec {
pname = "llvmlite";
name = "${pname}-${version}";
- version = "0.16.0";
+ version = "0.18.0";
disabled = isPyPy;
src = fetchurl {
url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
- sha256 = "ef3bae32482f91742d91571b5225a6943804291eb9405b98090a7b50942ec5e9";
+ sha256 = "25a38af925f0523b834b92216d7f7cc997624942d5958287350c254f5e730404";
};
propagatedBuildInputs = [ llvm ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34;
diff --git a/pkgs/development/python-modules/m2r/default.nix b/pkgs/development/python-modules/m2r/default.nix
index 49f1e2da5ba..5a67d6a719b 100644
--- a/pkgs/development/python-modules/m2r/default.nix
+++ b/pkgs/development/python-modules/m2r/default.nix
@@ -1,7 +1,8 @@
{ stdenv, buildPythonPackage, fetchurl,
mistune, docutils } :
buildPythonPackage rec {
- name = "m2r-${version}";
+ pname = "m2r";
+ name = "${pname}-${version}";
version = "0.1.5";
src = fetchurl {
diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix
index 99da5e83a87..62f40ce8337 100644
--- a/pkgs/development/python-modules/magic-wormhole/default.nix
+++ b/pkgs/development/python-modules/magic-wormhole/default.nix
@@ -16,12 +16,12 @@
buildPythonPackage rec {
pname = "magic-wormhole";
- version = "0.8.1";
+ version = "0.9.2";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
- sha256 = "1yh5nbhh9z1am2pqnb5qqyq1zjl1m7z6jnkmvry2q14qwspw9had";
+ sha256 = "14aed4b453278651d92c3fd8955a105e2d33dcde279fa25d1d759e0e769f16b3";
};
checkInputs = [ mock ];
diff --git a/pkgs/development/python-modules/markdown2.nix b/pkgs/development/python-modules/markdown2.nix
index af7511bc9aa..e5c22bc4dc6 100644
--- a/pkgs/development/python-modules/markdown2.nix
+++ b/pkgs/development/python-modules/markdown2.nix
@@ -1,8 +1,9 @@
{ stdenv, buildPythonPackage, fetchurl }:
buildPythonPackage rec {
- name = "markdown2-${version}";
+ pname = "markdown2";
version = "2.3.1";
+ name = "${pname}-${version}";
src = fetchurl {
url = "mirror://pypi/m/markdown2/${name}.zip";
diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix
index b917575e239..03a03007cf9 100644
--- a/pkgs/development/python-modules/matplotlib/default.nix
+++ b/pkgs/development/python-modules/matplotlib/default.nix
@@ -20,12 +20,13 @@ assert enableTk -> (tcl != null)
assert enableQt -> pyqt4 != null;
buildPythonPackage rec {
- name = "matplotlib-${version}";
- version = "2.0.0";
+ version = "2.0.2";
+ pname = "matplotlib";
+ name = "${pname}-${version}";
src = fetchurl {
url = "mirror://pypi/m/matplotlib/${name}.tar.gz";
- sha256 = "04zqymd5dw6lxvfbxf1sycdnibjk5qky5rfsn6wb46lwha2hkkrn";
+ sha256 = "0ffbc44faa34a8b1704bc108c451ecf87988f900ef7ce757b8e2e84383121ff1";
};
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
diff --git a/pkgs/development/python-modules/mnemonic/default.nix b/pkgs/development/python-modules/mnemonic/default.nix
new file mode 100644
index 00000000000..9f71fdb8e74
--- /dev/null
+++ b/pkgs/development/python-modules/mnemonic/default.nix
@@ -0,0 +1,21 @@
+{ lib, fetchurl, buildPythonPackage, pbkdf2 }:
+
+buildPythonPackage rec {
+ pname = "mnemonic";
+ version = "0.17";
+ name = "${pname}-${version}";
+
+ src = fetchurl {
+ url = "mirror://pypi/m/${pname}/${name}.tar.gz";
+ sha256 = "1hq6xb47jagfqf65iwcrh0065mj3521d2mxmahg7vfraihqyqdjn";
+ };
+
+ propagatedBuildInputs = [ pbkdf2 ];
+
+ meta = {
+ description = "Implementation of Bitcoin BIP-0039";
+ homepage = https://github.com/trezor/python-mnemonic;
+ license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ np ];
+ };
+}
diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix
index c38d948dd6b..a9ffe37a463 100644
--- a/pkgs/development/python-modules/mpi4py/default.nix
+++ b/pkgs/development/python-modules/mpi4py/default.nix
@@ -1,11 +1,13 @@
{ stdenv, fetchurl, python, buildPythonPackage, mpi, openssh, isPy3k, isPyPy }:
buildPythonPackage rec {
- name = "mpi4py-1.3.1";
+ pname = "mpi4py";
+ version = "2.0.0";
+ name = "${pname}-${version}";
src = fetchurl {
url = "https://bitbucket.org/mpi4py/mpi4py/downloads/${name}.tar.gz";
- sha256 = "e7bd2044aaac5a6ea87a87b2ecc73b310bb6efe5026031e33067ea3c2efc3507";
+ sha256 = "6543a05851a7aa1e6d165e673d422ba24e45c41e4221f0993fe1e5924a00cb81";
};
passthru = {
diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix
index 9a2e13f0c59..faece73e172 100644
--- a/pkgs/development/python-modules/multidict/default.nix
+++ b/pkgs/development/python-modules/multidict/default.nix
@@ -7,13 +7,13 @@
let
pname = "multidict";
- version = "2.1.4";
+ version = "2.1.6";
in buildPythonPackage rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
- sha256 = "a77aa8c9f68846c3b5db43ff8ed2a7a884dbe845d01f55113a3fba78518c4cd7";
+ sha256 = "9ec33a1da4d2096949e29ddd66a352aae57fad6b5483087d54566a2f6345ae10";
};
buildInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/netcdf4.nix b/pkgs/development/python-modules/netcdf4.nix
index 979a741e1ab..b123921a1ce 100644
--- a/pkgs/development/python-modules/netcdf4.nix
+++ b/pkgs/development/python-modules/netcdf4.nix
@@ -2,14 +2,15 @@
, numpy, zlib, netcdf, hdf5, curl, libjpeg
}:
buildPythonPackage rec {
- name = "netCDF4-${version}";
- version = "1.2.7";
+ pname = "netCDF4";
+ name = "${pname}-${version}";
+ version = "1.2.8";
disabled = isPyPy;
src = fetchurl {
url = "mirror://pypi/n/netCDF4/${name}.tar.gz";
- sha256 = "1fllizmnpw0zkzzm4j9pgamarlzfn3kmv9zrm0w65q1y31h9ni0c";
+ sha256 = "31eb4eae5fd3b2bd8f828721142ddcefdbf10287281bf6f636764dd7957f8450";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/nltk.nix b/pkgs/development/python-modules/nltk.nix
index c436e40d238..302bd89be02 100644
--- a/pkgs/development/python-modules/nltk.nix
+++ b/pkgs/development/python-modules/nltk.nix
@@ -1,12 +1,13 @@
{ fetchurl, buildPythonPackage, isPy33, lib, six, pythonAtLeast, pythonOlder }:
buildPythonPackage rec {
- name = "nltk-${version}";
- version = "3.2.2";
+ version = "3.2.4";
+ pname = "nltk";
+ name = "${pname}-${version}";
src = fetchurl {
url = "mirror://pypi/n/nltk/nltk-${version}.tar.gz";
- sha256 = "13m8i393h5mhpyvh5rghxxpax3bscv8li3ynwfdiq0kh8wsdndqv";
+ sha256 = "8682ae52f5de4f2ba7b77bd78222a38575ad01ef29946214b254dfdf93a3a0eb";
};
propagatedBuildInputs = [ six ];
diff --git a/pkgs/development/python-modules/ntlm-auth/default.nix b/pkgs/development/python-modules/ntlm-auth/default.nix
new file mode 100644
index 00000000000..03890f712af
--- /dev/null
+++ b/pkgs/development/python-modules/ntlm-auth/default.nix
@@ -0,0 +1,37 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, mock
+, pytest
+, unittest2
+, six
+}:
+
+buildPythonPackage rec {
+ pname = "ntlm-auth";
+ version = "1.0.3";
+ name = "${pname}-${version}";
+
+ src = fetchFromGitHub {
+ owner = "jborean93";
+ repo = "ntlm-auth";
+ rev = "v${version}";
+ sha256 = "09f2g4ivfi9lh1kr30hlg0q4n2imnvmd79w83gza11q9nmhhiwpz";
+ };
+
+ checkInputs = [ mock pytest unittest2 ];
+ propagatedBuildInputs = [ six ];
+
+ # Functional tests require networking
+ checkPhase = ''
+ py.test --ignore=tests/functional/test_iis.py
+ '';
+
+ meta = with lib; {
+ description = "Calculates NTLM Authentication codes";
+ homepage = https://github.com/jborean93/ntlm-auth;
+ license = licenses.lgpl3;
+ maintainers = with maintainers; [ elasticdog ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix
index 3ce40f2618a..99c7ce00853 100644
--- a/pkgs/development/python-modules/numba/default.nix
+++ b/pkgs/development/python-modules/numba/default.nix
@@ -14,12 +14,13 @@
}:
buildPythonPackage rec {
- version = "0.31.0";
- name = "numba-${version}";
+ version = "0.33.0";
+ pname = "numba";
+ name = "${pname}-${version}";
src = fetchurl {
url = "mirror://pypi/n/numba/${name}.tar.gz";
- sha256 = "69f8ecacca687e89625abbc9f9ff2b64b3cc8649c284a3bc92f2df6dc82a7c80";
+ sha256 = "56c5fcf3175f72b67ba8998d02870e3ea598e10c41d93289cecb9d89be7669fd";
};
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
diff --git a/pkgs/development/python-modules/os-testr/default.nix b/pkgs/development/python-modules/os-testr/default.nix
index 3dbf54102e9..d97c525b17a 100644
--- a/pkgs/development/python-modules/os-testr/default.nix
+++ b/pkgs/development/python-modules/os-testr/default.nix
@@ -3,12 +3,13 @@
coverage, oslosphinx, oslotest, testscenarios, six, ddt
}:
buildPythonPackage rec {
- name = "os-testr-${version}";
- version = "0.8.1";
+ version = "0.8.2";
+ pname = "os-testr";
+ name = "${pname}-${version}";
src = fetchurl {
url = "mirror://pypi/o/os-testr/${name}.tar.gz";
- sha256 = "10ws7l5p25psnp6rwymwdzh4zagmmnbf56xwg06cn2292m95l4i7";
+ sha256 = "d8a60bd56c541714a5cab4d1996c8ddfdb5c7c35393d55be617803048c170837";
};
patchPhase = ''
diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix
index eb5b5987a40..0d3a2d2dd5c 100644
--- a/pkgs/development/python-modules/pandas/default.nix
+++ b/pkgs/development/python-modules/pandas/default.nix
@@ -19,7 +19,6 @@
, openpyxl
, tables
, xlwt
-, darwin ? {}
, libcxx ? null
}:
@@ -53,7 +52,7 @@ in buildPythonPackage rec {
openpyxl
tables
xlwt
- ] ++ optional isDarwin darwin.locale; # provides the locale command
+ ];
# For OSX, we need to add a dependency on libcxx, which provides
# `complex.h` and other libraries that pandas depends on to build.
@@ -63,17 +62,22 @@ in buildPythonPackage rec {
substituteInPlace setup.py \
--replace "['pandas/src/klib', 'pandas/src']" \
"['pandas/src/klib', 'pandas/src', '$cpp_sdk']"
-
- # disable clipboard tests since pbcopy/pbpaste are not open source
- substituteInPlace pandas/io/tests/test_clipboard.py \
- --replace pandas.util.clipboard no_such_module \
- --replace OSError ImportError
'';
- # The flag `-A 'not network'` will disable tests that use internet.
checkPhase = ''
runHook preCheck
- py.test $out/${python.sitePackages}/pandas --skip-slow --skip-network
+ ''
+ # TODO: Get locale and clipboard support working on darwin.
+ # Until then we disable the tests.
+ + optionalString isDarwin ''
+ # Fake the impure dependencies pbpaste and pbcopy
+ echo "#!/bin/sh" > pbcopy
+ echo "#!/bin/sh" > pbpaste
+ chmod a+x pbcopy pbpaste
+ export PATH=$(pwd):$PATH
+ '' + ''
+ py.test $out/${python.sitePackages}/pandas --skip-slow --skip-network \
+ ${if isDarwin then "-k 'not test_locale and not test_clipboard'" else ""}
runHook postCheck
'';
@@ -84,7 +88,7 @@ in buildPythonPackage rec {
homepage = "http://pandas.pydata.org/";
description = "Python Data Analysis Library";
license = stdenv.lib.licenses.bsd3;
- maintainers = with stdenv.lib.maintainers; [ raskin fridh ];
+ maintainers = with stdenv.lib.maintainers; [ raskin fridh knedlsepp ];
platforms = stdenv.lib.platforms.unix;
};
}
diff --git a/pkgs/development/python-modules/pbr/default.nix b/pkgs/development/python-modules/pbr/default.nix
index 15c0d921ef8..68a2ef484c5 100644
--- a/pkgs/development/python-modules/pbr/default.nix
+++ b/pkgs/development/python-modules/pbr/default.nix
@@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "pbr";
- version = "2.0.0";
+ version = "3.0.1";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
- sha256 = "0ccd2db529afd070df815b1521f01401d43de03941170f8a800e7531faba265d";
+ sha256 = "d7e8917458094002b9a2e0030ba60ba4c834c456071f2d0c1ccb5265992ada91";
};
# circular dependencies with fixtures
diff --git a/pkgs/development/python-modules/pelican/default.nix b/pkgs/development/python-modules/pelican/default.nix
new file mode 100644
index 00000000000..b54bcc0ed1d
--- /dev/null
+++ b/pkgs/development/python-modules/pelican/default.nix
@@ -0,0 +1,54 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub, isPy26
+, glibcLocales, pandoc, git
+, mock, nose, markdown, lxml, typogrify
+, jinja2, pygments, docutils, pytz, unidecode, six, dateutil, feedgenerator
+, blinker, pillow, beautifulsoup4, markupsafe }:
+
+buildPythonPackage rec {
+ pname = "pelican";
+ name = "${pname}-${version}";
+ version = "3.7.1";
+ disabled = isPy26;
+
+ src = fetchFromGitHub {
+ owner = "getpelican";
+ repo = "pelican";
+ rev = version;
+ sha256 = "0nkxrb77k2bra7bqckg7f5k73wk98hcbz7rimxl8sw05b2bvd62g";
+ };
+
+ doCheck = true;
+
+ checkPhase = ''
+ python -Wd -m unittest discover
+ '';
+
+ buildInputs = [
+ glibcLocales
+ pandoc
+ git
+ mock
+ nose
+ markdown
+ typogrify
+ ];
+
+ propagatedBuildInputs = [
+ jinja2 pygments docutils pytz unidecode six dateutil feedgenerator
+ blinker pillow beautifulsoup4 markupsafe lxml
+ ];
+
+ postPatch= ''
+ substituteInPlace pelican/tests/test_pelican.py \
+ --replace "'git'" "'${git}/bin/git'"
+ '';
+
+ LC_ALL="en_US.UTF-8";
+
+ meta = with stdenv.lib; {
+ description = "A tool to generate a static blog from reStructuredText or Markdown input files";
+ homepage = "http://getpelican.com/";
+ license = licenses.agpl3;
+ maintainers = with maintainers; [ offline prikhi garbas ];
+ };
+}
diff --git a/pkgs/development/python-modules/pep257.nix b/pkgs/development/python-modules/pep257.nix
index 1cd0e4afc0c..9f61619e12b 100644
--- a/pkgs/development/python-modules/pep257.nix
+++ b/pkgs/development/python-modules/pep257.nix
@@ -1,6 +1,7 @@
{ stdenv, buildPythonPackage, fetchurl, pytest, mock }:
buildPythonPackage rec {
- name = "pep257-${version}";
+ pname = "pep257";
+ name = "${pname}-${version}";
version = "0.7.0";
src = fetchurl {
diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix
index ead0e3d858d..5c1d69b00be 100644
--- a/pkgs/development/python-modules/phonenumbers/default.nix
+++ b/pkgs/development/python-modules/phonenumbers/default.nix
@@ -1,7 +1,9 @@
{ stdenv, fetchurl, buildPythonPackage }:
buildPythonPackage rec {
- name = "phonenumbers-8.4.0";
+ pname = "phonenumbers";
+ version = "8.5.0";
+ name = "${pname}-${version}";
meta = {
description = "Python version of Google's common library for parsing, formatting, storing and validating international phone numbers";
@@ -12,6 +14,6 @@ buildPythonPackage rec {
src = fetchurl {
url = "mirror://pypi/p/phonenumbers/${name}.tar.gz";
- sha256 = "1c052gd7ra3v183jq2x5nwa428wxh1g3psfh0ay5jwwmcxy78vab";
+ sha256 = "6d3d82a3dcb0418431099d1b1c24efb280cbec8f81c7ce3d1abf417c238b8859";
};
}
diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix
index fe307513de7..df2bcc03de4 100644
--- a/pkgs/development/python-modules/pip-tools/default.nix
+++ b/pkgs/development/python-modules/pip-tools/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, buildPythonPackage, pip, pytest, click, six, first, glibcLocales }:
buildPythonPackage rec {
pname = "pip-tools";
- version = "1.8.1rc3";
+ version = "1.9.0";
name = "pip-tools-${version}";
src = fetchFromGitHub {
owner = "jazzband";
repo = "pip-tools";
rev = version;
- sha256 = "09rbgzj71bfp1x1jfr1zx3vax4qjbw5l6vcd3fqvshsdvg9lcnpx";
+ sha256 = "0706feb27263a2dade6d39cc508e718282bd08f455d0643f251659f905be4d56";
};
LC_ALL = "en_US.UTF-8";
diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix
index 6e5627a58ca..4c78ac63d30 100644
--- a/pkgs/development/python-modules/plotly/default.nix
+++ b/pkgs/development/python-modules/plotly/default.nix
@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "plotly";
- version = "2.0.8";
+ version = "2.0.9";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
- sha256 = "1zbwx771w6425w4g6l9fhq4x1854fdnni6xq9xhvs8xqgxkrljm5";
+ sha256 = "1b82ec9e09179b5191297b82a3f89f61055b730b09a1821c71fac18e82857e8f";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pyatspi/default.nix b/pkgs/development/python-modules/pyatspi/default.nix
index 012c8c42d6a..d96a4c8cea3 100644
--- a/pkgs/development/python-modules/pyatspi/default.nix
+++ b/pkgs/development/python-modules/pyatspi/default.nix
@@ -1,8 +1,9 @@
{ stdenv, fetchurl, pkgconfig, at_spi2_core, pythonPackages }:
stdenv.mkDerivation rec {
+ pname = "pyatspi";
version = "2.18.0";
- name = "pyatspi-${version}";
+ name = "${pname}-${version}";
src = fetchurl {
url = "mirror://gnome/sources/pyatspi/2.18/${name}.tar.xz";
diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix
index 2919506e931..c1ca9d4c02c 100644
--- a/pkgs/development/python-modules/pycairo/default.nix
+++ b/pkgs/development/python-modules/pycairo/default.nix
@@ -9,8 +9,9 @@ if (isPyPy) then throw "pycairo not supported for interpreter ${python.executabl
patch_waf-py3_5 = ./waf-py3_5.patch;
in buildPythonPackage rec {
+ pname = "pycairo";
version = "1.10.0";
- name = "pycairo-${version}";
+ name = "${pname}-${version}";
format = "other";
src = if isPy3k
diff --git a/pkgs/development/python-modules/pycryptodome/default.nix b/pkgs/development/python-modules/pycryptodome/default.nix
index d465c0befe1..71b90d242f0 100644
--- a/pkgs/development/python-modules/pycryptodome/default.nix
+++ b/pkgs/development/python-modules/pycryptodome/default.nix
@@ -1,12 +1,13 @@
{ stdenv, fetchurl, python, buildPythonPackage, gmp }:
buildPythonPackage rec {
- version = "3.4.3";
- name = "pycryptodome-${version}";
+ version = "3.4.6";
+ pname = "pycryptodome";
+ name = "${pname}-${version}";
src = fetchurl {
url = "mirror://pypi/p/pycryptodome/${name}.tar.gz";
- sha256 = "1x2kk2va77lqys2dd7gwh35m4vrp052zz5hvv1zqxzksg2srf5jb";
+ sha256 = "df1be662060cf3abdcf2086ebb401f750744106425ddebf74c57feab410e4923";
};
meta = {
diff --git a/pkgs/development/python-modules/pycuda/default.nix b/pkgs/development/python-modules/pycuda/default.nix
index 471ffbe6c35..71bf64b7733 100644
--- a/pkgs/development/python-modules/pycuda/default.nix
+++ b/pkgs/development/python-modules/pycuda/default.nix
@@ -22,12 +22,12 @@ let
in
buildPythonPackage rec {
pname = "pycuda";
- version = "2016.1.2";
+ version = "2017.1";
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
- sha256 = "0dvf1cnrlvmrc7i100n2ndrnd7fjm7aq3wpmk2nx5h7hwb3xmnx7";
+ sha256 = "a92725ccd8515b4d7284b9127184b6fdb61f224daa086e7fc6b926e2094b055f";
};
preConfigure = ''
diff --git a/pkgs/development/python-modules/pyexiv2/default.nix b/pkgs/development/python-modules/pyexiv2/default.nix
index 1bdf61904eb..5d11b716a2f 100644
--- a/pkgs/development/python-modules/pyexiv2/default.nix
+++ b/pkgs/development/python-modules/pyexiv2/default.nix
@@ -1,9 +1,9 @@
{ stdenv, fetchurl, python, exiv2, scons, boost }:
-let version = "0.3.2"; in
-
stdenv.mkDerivation rec {
- name = "pyexiv2-${version}";
+ pname = "pyexiv2";
+ version = "0.3.2";
+ name = "${pname}-${version}";
src = fetchurl {
url = "http://launchpad.net/pyexiv2/0.3.x/0.3.2/+download/${name}.tar.bz2";
diff --git a/pkgs/development/python-modules/pyext/default.nix b/pkgs/development/python-modules/pyext/default.nix
index 6f03a2edf79..563a3217e8c 100644
--- a/pkgs/development/python-modules/pyext/default.nix
+++ b/pkgs/development/python-modules/pyext/default.nix
@@ -3,11 +3,11 @@
buildPythonPackage rec {
name = pname + "-" + version;
pname = "pyext";
- version = "0.7";
+ version = "0.6";
src = fetchPypi {
inherit pname version;
- sha256 = "1pvwjkrjqajzh4wiiw1mzqp0bb81cqc2gk23nj24m32fpqssc676";
+ sha256 = "6c406cf71b991e1fc5a7f963d3a289525bce5e7ad1c43b697d9f5223185fcaef";
};
meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix
index af7b7aca93c..a10c858c233 100644
--- a/pkgs/development/python-modules/pygame/default.nix
+++ b/pkgs/development/python-modules/pygame/default.nix
@@ -3,7 +3,8 @@
}:
buildPythonPackage rec {
- name = "pygame-${version}";
+ pname = "pygame";
+ name = "${pname}-${version}";
version = "1.9.3";
src = fetchurl {
diff --git a/pkgs/development/python-modules/pylibmc/default.nix b/pkgs/development/python-modules/pylibmc/default.nix
index c91930292c2..7f57f17efeb 100644
--- a/pkgs/development/python-modules/pylibmc/default.nix
+++ b/pkgs/development/python-modules/pylibmc/default.nix
@@ -1,11 +1,12 @@
-{ buildPythonPackage, fetchurl, stdenv, libmemcached, zlib }:
+{ buildPythonPackage, fetchPypi, stdenv, libmemcached, zlib }:
buildPythonPackage rec {
- name = "pylibmc-${version}";
- version = "1.5.1";
+ version = "1.5.2";
+ pname = "pylibmc";
+ name = "${pname}-${version}";
- src = fetchurl {
- url = "https://pypi.python.org/packages/source/p/pylibmc/${name}.tar.gz";
- sha256 = "1mnd8lng9wmcihl7mxd940hy1dzzvzsb971qclrvmqf3b4c2dfpc";
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "fc54e28a9f1b5b2ec0c030da29c7ad8a15c2755bd98aaa4142eaf419d5fabb33";
};
buildInputs = [ libmemcached zlib ];
diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix
index 67604c3f253..130aef60f97 100644
--- a/pkgs/development/python-modules/pylint/default.nix
+++ b/pkgs/development/python-modules/pylint/default.nix
@@ -1,17 +1,17 @@
{ stdenv, fetchurl, buildPythonPackage, python, astroid, isort,
- pytest, mccabe, configparser, backports_functools_lru_cache }:
+ pytest, pytestrunner, mccabe, configparser, backports_functools_lru_cache }:
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "pylint";
- version = "1.6.5";
+ version = "1.7.1";
src = fetchurl {
url = "mirror://pypi/p/${pname}/${name}.tar.gz";
- sha256 = "06b78nl996949a7h01c4ycy8779hl5cm7vpxij5lm3npim59hwx6";
+ sha256 = "8b4a7ab6cf5062e40e2763c0b4a596020abada1d7304e369578b522e46a6264a";
};
- buildInputs = [ pytest mccabe configparser backports_functools_lru_cache ];
+ buildInputs = [ pytest pytestrunner mccabe configparser backports_functools_lru_cache ];
propagatedBuildInputs = [ astroid isort ];
diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix
index 7be60b1e69b..6b07df0b110 100644
--- a/pkgs/development/python-modules/pyopencl/default.nix
+++ b/pkgs/development/python-modules/pyopencl/default.nix
@@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "pyopencl";
- version = "2016.2";
+ version = "2017.1";
name = "${pname}-${version}";
buildInputs = [ pytest opencl-headers ocl-icd ];
@@ -24,7 +24,7 @@ buildPythonPackage rec {
src = fetchurl {
url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
- sha256 = "1b94540cf59ea71a3ef234a8f1d0eb2b4633c112f0f554fb69e52b4a0337d82b";
+ sha256 = "b5085b6412e5a1037b893853e4e47ecb36dd04586b0f8e1809f50f7fe1437dae";
};
# gcc: error: pygpu_language_opencl.cpp: No such file or directory
diff --git a/pkgs/development/python-modules/pyrax.nix b/pkgs/development/python-modules/pyrax.nix
index 87c0c3db264..7857f46e242 100644
--- a/pkgs/development/python-modules/pyrax.nix
+++ b/pkgs/development/python-modules/pyrax.nix
@@ -1,7 +1,9 @@
{ lib, buildPythonPackage, fetchurl, requests, novaclient, keyring,
rackspace-novaclient, six, isPy3k, pytest, glibcLocales }:
buildPythonPackage rec {
- name = "pyrax-1.9.8";
+ pname = "pyrax";
+ version = "1.9.8";
+ name = "${pname}-${version}";
src = fetchurl {
url = "mirror://pypi/p/pyrax/${name}.tar.gz";
diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix
index 1b47b7f3f7d..757933bd6b6 100644
--- a/pkgs/development/python-modules/pyroute2/default.nix
+++ b/pkgs/development/python-modules/pyroute2/default.nix
@@ -1,11 +1,13 @@
{stdenv, buildPythonPackage, fetchurl}:
buildPythonPackage rec {
- name = "pyroute2-0.4.13";
+ pname = "pyroute2";
+ version = "0.4.15";
+ name = "${pname}-${version}";
src = fetchurl {
url = "mirror://pypi/p/pyroute2/${name}.tar.gz";
- sha256 = "0f8a1ihxc1r78m6dqwhks2vdp4vwwbw72mbv88v70qmkb0pxgwwk";
+ sha256 = "273530e78261ac5e9e2985f12fad9e6c4231f8e49b8c285c05a23dcda5afce58";
};
# requires root priviledges
diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix
index bb2291fb4ac..796bc88430a 100644
--- a/pkgs/development/python-modules/pyscard/default.nix
+++ b/pkgs/development/python-modules/pyscard/default.nix
@@ -1,12 +1,13 @@
{ stdenv, fetchurl, buildPythonPackage, swig, pcsclite }:
buildPythonPackage rec {
- name = "pyscard-${version}";
- version = "1.9.4";
+ version = "1.9.5";
+ pname = "pyscard";
+ name = "${pname}-${version}";
src = fetchurl {
url = "mirror://pypi/p/pyscard/${name}.tar.gz";
- sha256 = "0gn0p4p8dhk99g8vald0dcnh45jbf82bj72n4djyr8b4hawkck4v";
+ sha256 = "7eef027e1939b7595fc13c03616f262f90d118594fdb6f7620af46b54fa06835";
};
patchPhase = ''
diff --git a/pkgs/development/python-modules/pyside/default.nix b/pkgs/development/python-modules/pyside/default.nix
index 009afdd3a03..9d7f11b939d 100644
--- a/pkgs/development/python-modules/pyside/default.nix
+++ b/pkgs/development/python-modules/pyside/default.nix
@@ -2,7 +2,8 @@
# This derivation provides a Python module and should therefore be called via `python-packages.nix`.
buildPythonPackage rec {
- name = "pyside-${version}";
+ pname = "pyside";
+ name = "${pname}-${version}";
version = "1.2.4";
format = "other";
diff --git a/pkgs/development/python-modules/pysrt/default.nix b/pkgs/development/python-modules/pysrt/default.nix
index 076838425a4..147e9773fbf 100644
--- a/pkgs/development/python-modules/pysrt/default.nix
+++ b/pkgs/development/python-modules/pysrt/default.nix
@@ -6,7 +6,8 @@
}:
buildPythonApplication rec {
- name = "pysrt-${version}";
+ pname = "pysrt";
+ name = "${pname}-${version}";
version = "1.1.1";
src = fetchFromGitHub {
diff --git a/pkgs/development/python-modules/pytest-django/default.nix b/pkgs/development/python-modules/pytest-django/default.nix
index 56fc72ebcce..0fd48568446 100644
--- a/pkgs/development/python-modules/pytest-django/default.nix
+++ b/pkgs/development/python-modules/pytest-django/default.nix
@@ -3,7 +3,8 @@
, fetchpatch
}:
buildPythonPackage rec {
- name = "pytest-django-${version}";
+ pname = "pytest-django";
+ name = "${pname}-${version}";
version = "3.1.2";
src = fetchurl {
diff --git a/pkgs/development/python-modules/pytest-httpbin/default.nix b/pkgs/development/python-modules/pytest-httpbin/default.nix
index 34a2bf7e31c..6f6f79109d9 100644
--- a/pkgs/development/python-modules/pytest-httpbin/default.nix
+++ b/pkgs/development/python-modules/pytest-httpbin/default.nix
@@ -10,7 +10,8 @@
}:
buildPythonPackage rec {
- name = "pytest-httpbin-${version}";
+ pname = "pytest-httpbin";
+ name = "${pname}-${version}";
version = "0.2.3";
src = fetchFromGitHub {
diff --git a/pkgs/development/python-modules/pytest-localserver/default.nix b/pkgs/development/python-modules/pytest-localserver/default.nix
new file mode 100644
index 00000000000..fdd1986c04f
--- /dev/null
+++ b/pkgs/development/python-modules/pytest-localserver/default.nix
@@ -0,0 +1,33 @@
+{ buildPythonPackage
+, lib
+, fetchPypi
+, requests
+, pytest
+, six
+, werkzeug
+}:
+
+buildPythonPackage rec {
+ pname = "pytest-localserver";
+ name = "${pname}-${version}";
+ version = "0.3.7";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1c11hn61n06ms0wmw6536vs5k4k9hlndxsb3p170nva56a9dfa6q";
+ };
+
+ propagatedBuildInputs = [ werkzeug ];
+ buildInputs = [ pytest six requests ];
+
+ checkPhase = ''
+ py.test
+ '';
+
+ meta = {
+ description = "Plugin for the pytest testing framework to test server connections locally";
+ homepage = https://pypi.python.org/pypi/pytest-localserver;
+ license = lib.licenses.mit;
+ };
+}
+
diff --git a/pkgs/development/python-modules/pytest-pep257.nix b/pkgs/development/python-modules/pytest-pep257.nix
index 7ce63ebc7a6..1509d80feb1 100644
--- a/pkgs/development/python-modules/pytest-pep257.nix
+++ b/pkgs/development/python-modules/pytest-pep257.nix
@@ -1,19 +1,21 @@
{ stdenv, buildPythonPackage, fetchurl, pytest, pep257 }:
+
buildPythonPackage rec {
- name = "pytest-pep257-${version}";
- version = "0.0.5";
+ pname = "pytest-pep257";
+ name = "${pname}-${version}";
+ version = "0.0.5";
- src = fetchurl {
- url = "mirror://pypi/p/pytest-pep257/${name}.tar.gz";
- sha256 = "082v3d5k4331x53za51kl8zxsndsw1pcyf1xdfpb2gjdjrhixb8w";
- };
+ src = fetchurl {
+ url = "mirror://pypi/p/pytest-pep257/${name}.tar.gz";
+ sha256 = "082v3d5k4331x53za51kl8zxsndsw1pcyf1xdfpb2gjdjrhixb8w";
+ };
- buildInputs = [ pytest ];
- propagatedBuildInputs = [ pep257 ];
+ buildInputs = [ pytest ];
+ propagatedBuildInputs = [ pep257 ];
- meta = with stdenv.lib; {
- homepage = https://github.com/anderslime/pytest-pep257;
- description = "py.test plugin for PEP257";
- license = licenses.mit;
- };
+ meta = with stdenv.lib; {
+ homepage = https://github.com/anderslime/pytest-pep257;
+ description = "py.test plugin for PEP257";
+ license = licenses.mit;
+ };
}
diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix
index 90b67022c5b..402c869c98c 100644
--- a/pkgs/development/python-modules/pytest/default.nix
+++ b/pkgs/development/python-modules/pytest/default.nix
@@ -1,7 +1,8 @@
{ stdenv, buildPythonPackage, fetchurl, isPy26, argparse, hypothesis, py }:
buildPythonPackage rec {
- name = "pytest-${version}";
version = "3.0.7";
+ pname = "pytest";
+ name = "${pname}-${version}";
preCheck = ''
# don't test bash builtins
diff --git a/pkgs/development/python-modules/pytestdjango.nix b/pkgs/development/python-modules/pytestdjango.nix
deleted file mode 100644
index 5a8dd85f4bd..00000000000
--- a/pkgs/development/python-modules/pytestdjango.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, buildPythonPackage, fetchurl
-, pytest, django, setuptools_scm
-}:
-buildPythonPackage rec {
- name = "pytest-django-${version}";
- version = "3.1.2";
-
- src = fetchurl {
- url = "mirror://pypi/p/pytest-django/${name}.tar.gz";
- sha256 = "02932m2sr8x22m4az8syr8g835g4ak77varrnw71n6xakmdcr303";
- };
-
- buildInputs = [ pytest setuptools_scm ];
- propagatedBuildInputs = [ django ];
-
- meta = with stdenv.lib; {
- description = "py.test plugin for testing of Django applications";
- homepage = http://pytest-django.readthedocs.org/en/latest/;
- license = licenses.bsd3;
- };
-}
diff --git a/pkgs/development/python-modules/python-jose/default.nix b/pkgs/development/python-modules/python-jose/default.nix
index da4dd410746..c1472bc66a8 100644
--- a/pkgs/development/python-modules/python-jose/default.nix
+++ b/pkgs/development/python-modules/python-jose/default.nix
@@ -3,7 +3,8 @@
}:
buildPythonPackage rec {
- name = "python-jose-${version}";
+ pname = "python-jose";
+ name = "${pname}-${version}";
version = "1.3.2";
src = fetchFromGitHub {
owner = "mpdavis";
diff --git a/pkgs/development/python-modules/python-sql/default.nix b/pkgs/development/python-modules/python-sql/default.nix
index 30f734d5719..f5ce3a15626 100644
--- a/pkgs/development/python-modules/python-sql/default.nix
+++ b/pkgs/development/python-modules/python-sql/default.nix
@@ -1,11 +1,12 @@
{ lib, fetchurl, buildPythonPackage }:
buildPythonPackage rec {
- name = "python-sql-${version}";
- version = "0.8";
+ pname = "python-sql";
+ name = "${pname}-${version}";
+ version = "0.9";
src = fetchurl {
url = "mirror://pypi/p/python-sql/${name}.tar.gz";
- sha256 = "0xik939sxqfqqbpgcsnfjnws692bjip32khgwhq1ycphfy7df3h2";
+ sha256 = "07b51cc1c977ef5480fe671cae5075ad4b68a6fc67f4569782e06f012456d35c";
};
meta = {
homepage = http://python-sql.tryton.org/;
diff --git a/pkgs/development/python-modules/python-stdnum/default.nix b/pkgs/development/python-modules/python-stdnum/default.nix
index fe85b7bb0d3..337577141c2 100644
--- a/pkgs/development/python-modules/python-stdnum/default.nix
+++ b/pkgs/development/python-modules/python-stdnum/default.nix
@@ -1,13 +1,14 @@
{ lib, fetchurl, buildPythonPackage, isPy3k }:
buildPythonPackage rec {
- name = "python-stdnum-${version}";
- version = "1.5";
+ version = "1.6";
+ pname = "python-stdnum";
+ name = "${pname}-${version}";
# Failing tests and dependency issue on Py3k
disabled = isPy3k;
src = fetchurl {
url = "mirror://pypi/p/python-stdnum/${name}.tar.gz";
- sha256 = "0zkkpjy4gc161dkyxjmingjw48glljlqqrl4fh2k5idf0frkvzhh";
+ sha256 = "157a0aef01b1e846ddd11252dc516637da6b3347e32f0130825b7fae1d8b4655";
};
meta = {
homepage = "http://arthurdejong.org/python-stdnum/";
diff --git a/pkgs/development/python-modules/pyudev.nix b/pkgs/development/python-modules/pyudev.nix
index e9a3ecaac5b..70950e4e927 100644
--- a/pkgs/development/python-modules/pyudev.nix
+++ b/pkgs/development/python-modules/pyudev.nix
@@ -3,7 +3,8 @@
}:
buildPythonPackage rec {
- name = "pyudev-${version}";
+ pname = "pyudev";
+ name = "${pname}-${version}";
version = "0.21.0";
src = fetchurl {
diff --git a/pkgs/development/python-modules/pywebdav/default.nix b/pkgs/development/python-modules/pywebdav/default.nix
index 27925a619f2..a69c8568aca 100644
--- a/pkgs/development/python-modules/pywebdav/default.nix
+++ b/pkgs/development/python-modules/pywebdav/default.nix
@@ -1,7 +1,8 @@
{ lib, fetchurl, buildPythonPackage, isPy3k }:
buildPythonPackage rec {
- name = "PyWebDAV-${version}";
+ pname = "pywebdav";
+ name = "${pname}-${version}";
version = "0.9.8";
disabled = isPy3k;
src = fetchurl {
diff --git a/pkgs/development/python-modules/pywinrm/default.nix b/pkgs/development/python-modules/pywinrm/default.nix
new file mode 100644
index 00000000000..b2b5ba20801
--- /dev/null
+++ b/pkgs/development/python-modules/pywinrm/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, mock
+, pytest
+, requests
+, requests_ntlm
+, six
+, xmltodict
+}:
+
+buildPythonPackage rec {
+ pname = "pywinrm";
+ version = "0.2.2";
+ name = "${pname}-${version}";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "06xc0mbqf718vmsp0fq0rb64nql66l5w2x23bmqnzl6nzc0gfc1h";
+ };
+
+ checkInputs = [ mock pytest ];
+ propagatedBuildInputs = [ requests requests_ntlm six xmltodict ];
+
+ meta = with lib; {
+ description = "Python library for Windows Remote Management";
+ homepage = "http://github.com/diyan/pywinrm/";
+ license = licenses.mit;
+ maintainers = with maintainers; [ elasticdog ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/development/python-modules/pyxml/default.nix b/pkgs/development/python-modules/pyxml/default.nix
index b85b2042369..0ef91fda9e3 100644
--- a/pkgs/development/python-modules/pyxml/default.nix
+++ b/pkgs/development/python-modules/pyxml/default.nix
@@ -1,7 +1,9 @@
{lib, fetchurl, python, buildPythonPackage, makeWrapper}:
buildPythonPackage rec {
- name = "PyXML-0.8.4";
+ pname = "PyXML";
+ version = "0.8.4";
+ name = "${pname}-${pname}";
format = "other";
src = fetchurl {
url = "mirror://sourceforge/pyxml/${name}.tar.gz";
diff --git a/pkgs/development/python-modules/rarfile/default.nix b/pkgs/development/python-modules/rarfile/default.nix
index 7231da9d3d0..c2c8c926432 100644
--- a/pkgs/development/python-modules/rarfile/default.nix
+++ b/pkgs/development/python-modules/rarfile/default.nix
@@ -1,7 +1,14 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, pytest, nose, unrar, glibcLocales }:
+{ stdenv, buildPythonPackage, fetchFromGitHub, pytest, nose, libarchive, glibcLocales
+# unrar is non-free software
+, useUnrar ? false, unrar
+}:
+
+assert useUnrar -> unrar != null;
+assert !useUnrar -> libarchive != null;
buildPythonPackage rec {
- name = "rarfile-${version}";
+ pname = "rarfile";
+ name = "${pname}-${version}";
version = "3.0";
src = fetchFromGitHub {
@@ -14,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/reikna/default.nix b/pkgs/development/python-modules/reikna/default.nix
index 14ebe52eae9..d8b380896cc 100644
--- a/pkgs/development/python-modules/reikna/default.nix
+++ b/pkgs/development/python-modules/reikna/default.nix
@@ -14,11 +14,11 @@
buildPythonPackage rec {
pname = "reikna";
name = "${pname}-${version}";
- version = "0.6.7";
+ version = "0.6.8";
src = fetchurl {
url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
- sha256 = "810b349eb9339aa0d13bca99a3d8a380972708474b8c0990d188ec6074358d62";
+ sha256 = "34d92786237bef9ab5d37d78f01c155d0dcd1fc24df7782af9498a9f1786890c";
};
buildInputs = [ sphinx pytestcov pytest ];
diff --git a/pkgs/development/python-modules/relatorio/default.nix b/pkgs/development/python-modules/relatorio/default.nix
index 4f2c3da8936..dc42449a339 100644
--- a/pkgs/development/python-modules/relatorio/default.nix
+++ b/pkgs/development/python-modules/relatorio/default.nix
@@ -1,7 +1,8 @@
{ lib, fetchurl, buildPythonPackage, genshi, lxml }:
buildPythonPackage rec {
- name = "relatorio-${version}";
+ pname = "relatorio";
+ name = "${pname}-${version}";
version = "0.6.4";
src = fetchurl {
url = "mirror://pypi/r/relatorio/${name}.tar.gz";
diff --git a/pkgs/development/python-modules/requests-oauthlib.nix b/pkgs/development/python-modules/requests-oauthlib.nix
index 62ecf134b49..0162d6f6eb5 100644
--- a/pkgs/development/python-modules/requests-oauthlib.nix
+++ b/pkgs/development/python-modules/requests-oauthlib.nix
@@ -2,12 +2,13 @@
, oauthlib, requests }:
buildPythonPackage rec {
- version = "0.7.0";
- name = "requests-oauthlib-${version}";
+ version = "0.8.0";
+ pname = "requests-oauthlib";
+ name = "${pname}-${version}";
src = fetchurl {
url = "http://github.com/requests/requests-oauthlib/archive/v${version}.tar.gz";
- sha256 = "0cdn45k7qla0qwha0rm9pk9bcfhghvmqrdsphs73irs2rzk5cp2j";
+ sha256 = "883ac416757eada6d3d07054ec7092ac21c7f35cb1d2cf82faf205637081f468";
};
doCheck = false; # Internet tests fail when building in chroot
diff --git a/pkgs/development/python-modules/requests_ntlm/default.nix b/pkgs/development/python-modules/requests_ntlm/default.nix
new file mode 100644
index 00000000000..c475ff85ff3
--- /dev/null
+++ b/pkgs/development/python-modules/requests_ntlm/default.nix
@@ -0,0 +1,30 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, ntlm-auth
+, requests
+}:
+
+buildPythonPackage rec {
+ pname = "requests_ntlm";
+ version = "1.0.0";
+ name = "${pname}-${version}";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0hb689p2jyb867c2wlq5mjkqxgc0jq6lxv3rmhw8rq9qangk3jjk";
+ };
+
+ propagatedBuildInputs = [ ntlm-auth requests ];
+
+ # Tests require networking
+ doCheck = false;
+
+ meta = with lib; {
+ description = "HTTP NTLM authentication support for python-requests";
+ homepage = https://github.com/requests/requests-ntlm;
+ license = licenses.isc;
+ maintainers = with maintainers; [ elasticdog ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/development/python-modules/rfc3986/default.nix b/pkgs/development/python-modules/rfc3986/default.nix
index dde36e7592e..a8848fcac33 100644
--- a/pkgs/development/python-modules/rfc3986/default.nix
+++ b/pkgs/development/python-modules/rfc3986/default.nix
@@ -3,12 +3,12 @@
buildPythonPackage rec {
pname = "rfc3986";
- version = "0.4.1";
+ version = "1.0.0";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
- sha256 = "5ac85eb132fae7bbd811fa48d11984ae3104be30d44d397a351d004c633a68d2";
+ sha256 = "2faacfabcc13ed89b061b5f21cbbf330f82400654b317b5907d311c3478ec4c4";
};
buildInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/rhpl/default.nix b/pkgs/development/python-modules/rhpl/default.nix
index 7ba1c79cd05..d502ad75566 100644
--- a/pkgs/development/python-modules/rhpl/default.nix
+++ b/pkgs/development/python-modules/rhpl/default.nix
@@ -1,16 +1,18 @@
{stdenv, fetchurl, rpmextract, python, wirelesstools, gettext}:
-stdenv.mkDerivation {
- name = "rhpl-0.218";
-
+stdenv.mkDerivation rec {
+ pname = "rhpl";
+ version = "0.218";
+ name = "${pname}-${version}";
+
src = fetchurl {
url = http://ftp-stud.hs-esslingen.de/pub/Mirrors/archive.fedoraproject.org/fedora/linux/releases/10/Everything/source/SRPMS//rhpl-0.218-1.src.rpm;
sha256 = "0c3sc74cjzz5dmpr2gi5naxcc5p2qmzagz7k561xj07njn0ddg16";
};
-
+
inherit python;
-
+
builder = ./builder.sh;
-
+
buildInputs = [ rpmextract python wirelesstools gettext ];
}
diff --git a/pkgs/development/python-modules/ropper/default.nix b/pkgs/development/python-modules/ropper/default.nix
new file mode 100644
index 00000000000..37369b8f0bd
--- /dev/null
+++ b/pkgs/development/python-modules/ropper/default.nix
@@ -0,0 +1,28 @@
+{ stdenv
+, buildPythonApplication
+, fetchPypi
+, capstone
+, filebytes
+, pytest }:
+
+buildPythonApplication rec {
+ name = "${pname}-${version}";
+ pname = "ropper";
+ version = "1.10.10";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1676e07947a19df9d17002307a7555c2647a4224d6f2869949e8fc4bd18f2e87";
+ };
+ checkPhase = ''
+ py.test testcases
+ '';
+ buildInputs = [pytest];
+ propagatedBuildInputs = [ capstone filebytes ];
+ meta = with stdenv.lib; {
+ homepage = "https://scoding.de/ropper/";
+ license = licenses.gpl2;
+ description = "Show information about files in different file formats";
+ maintainers = with maintainers; [ bennofs ];
+ };
+}
diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix
index 8f3b2ef74b2..2fcc0659384 100644
--- a/pkgs/development/python-modules/scrapy/default.nix
+++ b/pkgs/development/python-modules/scrapy/default.nix
@@ -2,8 +2,9 @@
testfixtures, pillow, six, twisted, w3lib, lxml, queuelib, pyopenssl,
service-identity, parsel, pydispatcher, cssselect, lib }:
buildPythonPackage rec {
- name = "Scrapy-${version}";
- version = "1.3.1";
+ version = "1.4.0";
+ pname = "Scrapy";
+ name = "${pname}-${version}";
buildInputs = [ glibcLocales mock pytest botocore testfixtures pillow ];
propagatedBuildInputs = [
@@ -25,7 +26,7 @@ buildPythonPackage rec {
src = fetchurl {
url = "mirror://pypi/S/Scrapy/${name}.tar.gz";
- sha256 = "0s5qkxwfq842maxjd2j82ldp4dyb70kla3z5rr56z0p7ig53cbvk";
+ sha256 = "04a08f027eef5d271342a016439533c81ba46f14bfcf230fecf602e99beaf233";
};
meta = with lib; {
diff --git a/pkgs/development/python-modules/scrapy/permissions-fix.patch b/pkgs/development/python-modules/scrapy/permissions-fix.patch
index 5ea5269c799..53038cf74e5 100644
--- a/pkgs/development/python-modules/scrapy/permissions-fix.patch
+++ b/pkgs/development/python-modules/scrapy/permissions-fix.patch
@@ -21,8 +21,3 @@ index 5941066..89f8edb 100644
def run(self, args, opts):
if len(args) not in (1, 2):
-@@ -118,4 +117,3 @@ class Command(ScrapyCommand):
- _templates_base_dir = self.settings['TEMPLATES_DIR'] or \
- join(scrapy.__path__[0], 'templates')
- return join(_templates_base_dir, 'project')
--
diff --git a/pkgs/development/python-modules/semver/default.nix b/pkgs/development/python-modules/semver/default.nix
new file mode 100644
index 00000000000..285da546071
--- /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/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix
index 63e05736d79..59fe5f14839 100644
--- a/pkgs/development/python-modules/setuptools/default.nix
+++ b/pkgs/development/python-modules/setuptools/default.nix
@@ -1,18 +1,23 @@
-{ stdenv, lib, fetchurl, python, wrapPython }:
+{ stdenv
+, fetchPypi
+, python
+, wrapPython
+, unzip
+}:
+# Should use buildPythonPackage here somehow
stdenv.mkDerivation rec {
pname = "setuptools";
- shortName = "${pname}-${version}";
- name = "${python.libPrefix}-${shortName}";
+ version = "36.0.1";
+ name = "${python.libPrefix}-${pname}-${version}";
- version = "30.2.0";
-
- src = fetchurl {
- url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${shortName}.tar.gz";
- sha256 = "f865709919903e3399343c0b3c42f95e9aeddc41e38cfb334fb2bb5dfa384857";
+ src = fetchPypi {
+ inherit pname version;
+ extension = "zip";
+ sha256 = "e17c4687fddd6d70a6604ac0ad25e33324cec71b5137267dd5c45e103c4b288a";
};
- buildInputs = [ python wrapPython ];
+ buildInputs = [ python wrapPython unzip ];
doCheck = false; # requires pytest
installPhase = ''
dst=$out/${python.sitePackages}
@@ -27,7 +32,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Utilities to facilitate the installation of Python packages";
homepage = http://pypi.python.org/pypi/setuptools;
- license = with lib.licenses; [ psfl zpt20 ];
+ license = with licenses; [ psfl zpt20 ];
platforms = platforms.all;
priority = 10;
};
diff --git a/pkgs/development/python-modules/simpleeval/default.nix b/pkgs/development/python-modules/simpleeval/default.nix
index cd77f66b56e..78dc82bc770 100644
--- a/pkgs/development/python-modules/simpleeval/default.nix
+++ b/pkgs/development/python-modules/simpleeval/default.nix
@@ -1,7 +1,8 @@
{ lib, fetchurl, buildPythonPackage }:
buildPythonPackage rec {
- name = "simpleeval-${version}";
+ pname = "simpleeval";
+ name = "${pname}-${version}";
version = "0.9.5";
src = fetchurl {
url = "mirror://pypi/s/simpleeval/${name}.tar.gz";
diff --git a/pkgs/development/python-modules/simplejson/default.nix b/pkgs/development/python-modules/simplejson/default.nix
new file mode 100644
index 00000000000..983d1765521
--- /dev/null
+++ b/pkgs/development/python-modules/simplejson/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+ pname = "simplejson";
+ version = "3.10.0";
+ name = "${pname}-${version}";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "953be622e88323c6f43fad61ffd05bebe73b9fd9863a46d68b052d2aa7d71ce2";
+ };
+
+ meta = {
+ description = "A simple, fast, extensible JSON encoder/decoder for Python";
+ longDescription = ''
+ simplejson is compatible with Python 2.4 and later with no
+ external dependencies. It covers the full JSON specification
+ for both encoding and decoding, with unicode support. By
+ default, encoding is done in an encoding neutral fashion (plain
+ ASCII with \uXXXX escapes for unicode characters).
+ '';
+ homepage = http://code.google.com/p/simplejson/;
+ license = lib.licenses.mit;
+ };
+}
\ No newline at end of file
diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix
index 76652954cf0..b6094f37c3a 100644
--- a/pkgs/development/python-modules/sip/default.nix
+++ b/pkgs/development/python-modules/sip/default.nix
@@ -1,7 +1,9 @@
{ lib, fetchurl, buildPythonPackage, python, isPyPy }:
if isPyPy then throw "sip not supported for interpreter ${python.executable}" else buildPythonPackage rec {
- name = "sip-4.19.1";
+ pname = "sip";
+ version = "4.19.1";
+ name = "${pname}-${version}";
format = "other";
src = fetchurl {
diff --git a/pkgs/development/python-modules/snakeviz/default.nix b/pkgs/development/python-modules/snakeviz/default.nix
index be6f86dae54..6754089ffce 100644
--- a/pkgs/development/python-modules/snakeviz/default.nix
+++ b/pkgs/development/python-modules/snakeviz/default.nix
@@ -1,7 +1,8 @@
{ stdenv, fetchurl, buildPythonPackage, tornado }:
buildPythonPackage rec {
- name = "snakeviz-${version}";
+ pname = "snakeviz";
+ name = "${pname}-${version}";
version = "0.4.1";
src = fetchurl {
diff --git a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix
index 11ed3a8d673..9cf1ba1b3d8 100644
--- a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix
@@ -3,7 +3,8 @@
pbr, tempita, decorator, sqlalchemy, six, sqlparse
}:
buildPythonPackage rec {
- name = "sqlalchemy-migrate-${version}";
+ pname = "sqlalchemy-migrate";
+ name = "${pname}-${version}";
version = "0.11.0";
src = fetchurl {
diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix
new file mode 100644
index 00000000000..3fdb7cf9a6e
--- /dev/null
+++ b/pkgs/development/python-modules/sqlalchemy/default.nix
@@ -0,0 +1,37 @@
+{ lib
+, fetchPypi
+, buildPythonPackage
+, pytest
+, mock
+, pytest_xdist
+, isPy3k
+, pysqlite
+}:
+
+buildPythonPackage rec {
+ pname = "SQLAlchemy";
+ name = "${pname}-${version}";
+ version = "1.1.10";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "dbd92b8af2306d600efa98ed36262d73aad227440a758c8dc3a067ca30096bd3";
+ };
+
+ checkInputs = [ pytest mock pytest_xdist ]
+ ++ lib.optional (!isPy3k) pysqlite;
+
+ # Test-only dependency pysqlite doesn't build on Python 3. This isn't an
+ # acceptable reason to make all dependents unavailable on Python 3 as well
+ #doCheck = !(isPyPy || isPy3k);
+
+ checkPhase = ''
+ py.test
+ '';
+
+ meta = with lib; {
+ homepage = http://www.sqlalchemy.org/;
+ description = "A Python SQL toolkit and Object Relational Mapper";
+ license = licenses.mit;
+ };
+}
\ No newline at end of file
diff --git a/pkgs/development/python-modules/stringtemplate/default.nix b/pkgs/development/python-modules/stringtemplate/default.nix
index 50a425132a2..cd7bb2b9507 100644
--- a/pkgs/development/python-modules/stringtemplate/default.nix
+++ b/pkgs/development/python-modules/stringtemplate/default.nix
@@ -1,7 +1,8 @@
{stdenv, fetchurl, buildPythonPackage, antlr, isPy3k}:
buildPythonPackage rec {
- name = "PyStringTemplate-${version}";
+ pname = "PyStringTemplate";
+ name = "${pname}-${version}";
version = "3.2b1";
src = fetchurl {
diff --git a/pkgs/development/python-modules/subliminal/default.nix b/pkgs/development/python-modules/subliminal/default.nix
index 545916858d4..0788ddaeec6 100644
--- a/pkgs/development/python-modules/subliminal/default.nix
+++ b/pkgs/development/python-modules/subliminal/default.nix
@@ -19,7 +19,8 @@
}:
buildPythonApplication rec {
- name = "subliminal-${version}";
+ pname = "subliminal";
+ name = "${pname}-${version}";
version = "2.0.5";
src = fetchurl {
diff --git a/pkgs/development/python-modules/tables/default.nix b/pkgs/development/python-modules/tables/default.nix
index 7faad8ec4f4..f80dcdf74fd 100644
--- a/pkgs/development/python-modules/tables/default.nix
+++ b/pkgs/development/python-modules/tables/default.nix
@@ -2,12 +2,13 @@
, cython, bzip2, lzo, numpy, numexpr, hdf5, six, c-blosc }:
buildPythonPackage rec {
- version = "3.3.0";
- name = "tables-${version}";
+ version = "3.4.2";
+ pname = "tables";
+ name = "${pname}-${version}";
src = fetchurl {
url = "mirror://pypi/t/tables/${name}.tar.gz";
- sha256 = "0b4211s0zzdmh74k49ss0m9lc2ql2iazq2aa95ams6h45vqcr0w3";
+ sha256 = "fdbbea4edb6bad0ac0e53fc7bc6970e78e12eef4944aa4146bcdcb573201676c";
};
buildInputs = [ hdf5 cython bzip2 lzo c-blosc ];
diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix
index 8946877eb14..388d27e0686 100644
--- a/pkgs/development/python-modules/tensorflow/default.nix
+++ b/pkgs/development/python-modules/tensorflow/default.nix
@@ -5,7 +5,6 @@
, cudaSupport ? false
, cudatoolkit ? null
, cudnn ? null
-, gcc49 ? null
, linuxPackages ? null
, numpy
, six
@@ -13,13 +12,11 @@
, swig
, werkzeug
, mock
-, gcc
, zlib
}:
assert cudaSupport -> cudatoolkit != null
&& cudnn != null
- && gcc49 != null
&& linuxPackages != null;
# unsupported combination
@@ -98,7 +95,7 @@ buildPythonPackage rec {
propagatedBuildInputs = with stdenv.lib;
[ numpy six protobuf3_2 swig werkzeug mock ]
- ++ optionals cudaSupport [ cudatoolkit cudnn gcc49 ];
+ ++ optionals cudaSupport [ cudatoolkit cudnn stdenv.cc ];
# Note that we need to run *after* the fixup phase because the
# libraries are loaded at runtime. If we run in preFixup then
@@ -106,10 +103,10 @@ buildPythonPackage rec {
postFixup = let
rpath = stdenv.lib.makeLibraryPath
(if cudaSupport then
- [ gcc49.cc.lib zlib cudatoolkit cudnn
+ [ stdenv.cc.cc.lib zlib cudatoolkit cudnn
linuxPackages.nvidia_x11 ]
else
- [ gcc.cc.lib zlib ]
+ [ stdenv.cc.cc.lib zlib ]
);
in
''
diff --git a/pkgs/development/python-modules/treq/default.nix b/pkgs/development/python-modules/treq/default.nix
index 14a2ac9cb92..7bb028b233d 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 = "16.12.0";
+ version = "17.3.1";
- src = fetchurl {
- url = "mirror://pypi/t/${pname}/${name}.tar.gz";
- sha256 = "1aci3f3rmb5mdf4s6s4k4kghmnyy784cxgi3pz99m5jp274fs25h";
+ 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 67%
rename from pkgs/development/python-modules/trezor.nix
rename to pkgs/development/python-modules/trezor/default.nix
index 36bf0c15de2..6fc6622cf3f 100644
--- a/pkgs/development/python-modules/trezor.nix
+++ b/pkgs/development/python-modules/trezor/default.nix
@@ -1,13 +1,13 @@
-{ lib, fetchurl, buildPythonPackage, protobuf3_0, hidapi, ecdsa, mnemonic }:
+{ lib, fetchPypi, buildPythonPackage, protobuf3_0, hidapi, ecdsa, mnemonic }:
buildPythonPackage rec {
- pname = "trezor";
- version = "0.7.12";
name = "${pname}-${version}";
+ pname = "trezor";
+ version = "0.7.13";
- src = fetchurl {
- url = "mirror://pypi/t/${pname}/${name}.tar.gz";
- sha256 = "0ryqdk13x60qq5s68i9dfc1na4dka66kdxqycxignzg9k9ykaa8g";
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "d05f388bb56b6f61cc727999cc725078575238a0b6172450322bc55c437fefe5";
};
propagatedBuildInputs = [ protobuf3_0 hidapi ];
diff --git a/pkgs/development/python-modules/twill/default.nix b/pkgs/development/python-modules/twill/default.nix
index f3e7bb7025b..8f0fbbd6dfb 100644
--- a/pkgs/development/python-modules/twill/default.nix
+++ b/pkgs/development/python-modules/twill/default.nix
@@ -1,12 +1,14 @@
{ stdenv, buildPythonPackage, fetchurl, isPy3k, pythonPackages }:
buildPythonPackage rec {
- name = "twill-0.9.1";
+ pname = "twill";
+ version = "1.8.0";
+ name = "${pname}-${version}";
disabled = isPy3k;
src = fetchurl {
url = "mirror://pypi/t/twill/${name}.tar.gz";
- sha256 = "0zmssp41cgb5sz1jym7rxy6mamb64dxq3wra1bn6snna9v653pyj";
+ sha256 = "d63e8b09aa4f6645571c70cd3ba47a911abbae4d7baa4b38fc7eb72f6cfda188";
};
propagatedBuildInputs = with pythonPackages; [ nose ];
diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix
index 0cfb00c48b8..6898863e8af 100644
--- a/pkgs/development/python-modules/twisted/default.nix
+++ b/pkgs/development/python-modules/twisted/default.nix
@@ -2,8 +2,8 @@
zope_interface, incremental, automat, constantly
}:
buildPythonPackage rec {
-
- name = "Twisted-${version}";
+ pname = "Twisted";
+ name = "${pname}-${version}";
version = "17.1.0";
src = fetchurl {
diff --git a/pkgs/development/python-modules/txaio/default.nix b/pkgs/development/python-modules/txaio/default.nix
index 66b01d61094..98060536638 100644
--- a/pkgs/development/python-modules/txaio/default.nix
+++ b/pkgs/development/python-modules/txaio/default.nix
@@ -1,22 +1,28 @@
-{ stdenv, buildPythonPackage, fetchurl,
- pytest, mock, six, twisted
-}:
+{ stdenv, buildPythonPackage, fetchPypi, pytest, mock, six, twisted }:
+
buildPythonPackage rec {
name = "${pname}-${version}";
pname = "txaio";
- version = "2.7.0";
+ version = "2.7.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1lmllmjjsqzl3w4faq2qhlgkaqn1yn1m7d99k822ib7qgz18bsly";
+ };
buildInputs = [ pytest mock ];
+
propagatedBuildInputs = [ six twisted ];
- checkPhase = ''
- py.test -k "not test_sdist"
+ patchPhase = ''
+ sed -i '152d' test/test_logging.py
'';
- src = fetchurl {
- url = "mirror://pypi/t/${pname}/${name}.tar.gz";
- sha256 = "0hwd6jx6hb44p40id9r0m42y07rav5jvddf0f1bcm269i3dnwr47";
- };
+ # 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 or test_chained_callback)"
+ '';
meta = with stdenv.lib; {
description = "Utilities to support code that runs unmodified on Twisted and asyncio.";
diff --git a/pkgs/development/python-modules/typed-ast/default.nix b/pkgs/development/python-modules/typed-ast/default.nix
index 02a60323420..213f2d33f3b 100644
--- a/pkgs/development/python-modules/typed-ast/default.nix
+++ b/pkgs/development/python-modules/typed-ast/default.nix
@@ -1,11 +1,11 @@
{ buildPythonPackage, fetchPypi, isPy3k, lib, pythonOlder }:
buildPythonPackage rec {
pname = "typed-ast";
- version = "1.0.2";
+ version = "1.0.3";
name = "${pname}-${version}";
src = fetchPypi{
inherit pname version;
- sha256 = "13e02b10479ddff07eb546f9638743702ab9b175bfa3cdf2482688df91b5766d";
+ sha256 = "67184179697ea9128fa8fec1d3b4e26b41d6a2eceab4674c6e3da4b024309862";
};
# Only works with Python 3.3 and newer;
disabled = pythonOlder "3.3";
diff --git a/pkgs/development/python-modules/u-msgpack-python/default.nix b/pkgs/development/python-modules/u-msgpack-python/default.nix
index 34d88d74c55..aca4e370e46 100644
--- a/pkgs/development/python-modules/u-msgpack-python/default.nix
+++ b/pkgs/development/python-modules/u-msgpack-python/default.nix
@@ -7,13 +7,13 @@
let
pname = "u-msgpack-python";
- version = "2.3.0";
+ version = "2.4.1";
in buildPythonPackage rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
- sha256 = "d8df6bb0e2a838aa227c39cfd14aa147ab32b3df6871001874e9b9da9ce1760c";
+ sha256 = "2f31fc1b6dd8632c230ea7012470e40f77119f20999274dda6f1afa9c305e590";
};
LC_ALL="en_US.UTF-8";
diff --git a/pkgs/development/python-modules/uncertainties/default.nix b/pkgs/development/python-modules/uncertainties/default.nix
new file mode 100644
index 00000000000..a0aa1478944
--- /dev/null
+++ b/pkgs/development/python-modules/uncertainties/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchPypi, buildPythonPackage, nose, numpy }:
+
+buildPythonPackage rec {
+ name = "${pname}-${version}";
+ pname = "uncertainties";
+ version = "3.0.1";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "de0765cac6911e5afa93ee941063a07b4a98dbd9c314c5eea4ab14bfff0054a4";
+ };
+
+ buildInputs = [ nose numpy ];
+
+ # No tests included
+ doCheck = false;
+
+ meta = with stdenv.lib; {
+ homepage = "http://pythonhosted.org/uncertainties/";
+ description = "Transparent calculations with uncertainties on the quantities involved (aka error propagation)";
+ maintainer = with maintainers; [ rnhmjoj ];
+ license = licenses.bsd3;
+ };
+}
diff --git a/pkgs/development/python-modules/uranium/default.nix b/pkgs/development/python-modules/uranium/default.nix
index bce88635d3c..066230d0a1f 100644
--- a/pkgs/development/python-modules/uranium/default.nix
+++ b/pkgs/development/python-modules/uranium/default.nix
@@ -5,8 +5,9 @@ then throw "Uranium not supported for interpreter ${python.executable}"
else
stdenv.mkDerivation rec {
- name = "uranium-${version}";
version = "2.4.0";
+ pname = "uranium";
+ name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "Ultimaker";
diff --git a/pkgs/development/python-modules/vcrpy/default.nix b/pkgs/development/python-modules/vcrpy/default.nix
index c82a02cb4a4..9387c7de792 100644
--- a/pkgs/development/python-modules/vcrpy/default.nix
+++ b/pkgs/development/python-modules/vcrpy/default.nix
@@ -16,12 +16,12 @@
buildPythonPackage rec {
pname = "vcrpy";
- version = "1.10.5";
+ version = "1.11.1";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
- sha256 = "12kncg6jyvj15mi8ca74514f2x1ih753nhyz769nwvh39r468167";
+ sha256 = "f434fe7e05d940d576ac850709ae57a738ba40e7f317076ea8d359ced5b32320";
};
checkInputs = [
diff --git a/pkgs/development/python-modules/vowpalwabbit/default.nix b/pkgs/development/python-modules/vowpalwabbit/default.nix
index 4c343985c59..8c980cf2b2c 100644
--- a/pkgs/development/python-modules/vowpalwabbit/default.nix
+++ b/pkgs/development/python-modules/vowpalwabbit/default.nix
@@ -1,32 +1,33 @@
{ fetchurl, boost, zlib, clang, ncurses, pythonPackages, lib }:
+
pythonPackages.buildPythonPackage rec {
- name = "vowpalwabbit-${version}";
- version = "8.3.2";
+ pname = "vowpalwabbit";
+ name = "${pname}-${version}";
+ version = "8.3.2";
- src = fetchurl{
- url = "mirror://pypi/v/vowpalwabbit/${name}.tar.gz";
- sha256 = "0qm8rlrs2gfgamqnpx4lapxakpzgh0yh3kp1lbd7lhb0r748m3k7";
- };
- # vw tries to write some explicit things to home
- # python installed: The directory '/homeless-shelter/.cache/pip/http'
- preInstall = ''
- export HOME=$PWD
- '';
+ src = fetchurl{
+ url = "mirror://pypi/v/vowpalwabbit/${name}.tar.gz";
+ sha256 = "0qm8rlrs2gfgamqnpx4lapxakpzgh0yh3kp1lbd7lhb0r748m3k7";
+ };
+ # vw tries to write some explicit things to home
+ # python installed: The directory '/homeless-shelter/.cache/pip/http'
+ preInstall = ''
+ export HOME=$PWD
+ '';
- buildInputs = with pythonPackages; [ boost.dev zlib.dev clang ncurses pytest docutils pygments ];
- propagatedBuildInputs = with pythonPackages; [ numpy scipy scikitlearn ];
+ buildInputs = with pythonPackages; [ boost.dev zlib.dev clang ncurses pytest docutils pygments ];
+ propagatedBuildInputs = with pythonPackages; [ numpy scipy scikitlearn ];
- checkPhase = ''
- # check-manifest requires a git clone, not a tarball
- # check-manifest --ignore "Makefile,PACKAGE.rst,*.cc,tox.ini,tests*,examples*,src*"
- python setup.py check -mrs
- '';
-
- meta = with lib; {
- description = "Vowpal Wabbit is a fast machine learning library for online learning, and this is the python wrapper for the project.";
- homepage = https://github.com/JohnLangford/vowpal_wabbit;
- license = licenses.bsd3;
- maintainers = with maintainers; [ teh ];
- };
+ checkPhase = ''
+ # check-manifest requires a git clone, not a tarball
+ # check-manifest --ignore "Makefile,PACKAGE.rst,*.cc,tox.ini,tests*,examples*,src*"
+ python setup.py check -mrs
+ '';
+ meta = with lib; {
+ description = "Vowpal Wabbit is a fast machine learning library for online learning, and this is the python wrapper for the project.";
+ homepage = https://github.com/JohnLangford/vowpal_wabbit;
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ teh ];
+ };
}
diff --git a/pkgs/development/python-modules/webencodings/default.nix b/pkgs/development/python-modules/webencodings/default.nix
index 54f3517ca00..834a0ab07fb 100644
--- a/pkgs/development/python-modules/webencodings/default.nix
+++ b/pkgs/development/python-modules/webencodings/default.nix
@@ -6,13 +6,13 @@
let
pname = "webencodings";
- version = "0.5";
+ version = "0.5.1";
in buildPythonPackage rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
- sha256 = "a5c55ee93b24e740fe951c37b5c228dccc1f171450e188555a775261cce1b904";
+ sha256 = "b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923";
};
buildInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/websockets/default.nix b/pkgs/development/python-modules/websockets/default.nix
index 8c66dc60407..7e29b2b6190 100644
--- a/pkgs/development/python-modules/websockets/default.nix
+++ b/pkgs/development/python-modules/websockets/default.nix
@@ -6,13 +6,13 @@
let
pname = "websockets";
- version = "3.2";
+ version = "3.3";
in buildPythonPackage rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
- sha256 = "1dah1faywsnrlqyzagb1qc1cxrq9145srkdy118yhy9s8dyq4dmm";
+ sha256 = "305ab7fdd86afd08c2723461c949e153f7b01233f95a108619a15e41b7a74c93";
};
disabled = pythonOlder "3.3";
diff --git a/pkgs/development/python-modules/wheel/default.nix b/pkgs/development/python-modules/wheel/default.nix
new file mode 100644
index 00000000000..5574a800b5b
--- /dev/null
+++ b/pkgs/development/python-modules/wheel/default.nix
@@ -0,0 +1,32 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytest
+, pytestcov
+, coverage
+, jsonschema
+}:
+
+buildPythonPackage rec {
+ pname = "wheel";
+ version = "0.29.0";
+ name = "${pname}-${version}";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1ebb8ad7e26b448e9caa4773d2357849bf80ff9e313964bcaf79cbf0201a1648";
+ };
+
+ buildInputs = [ pytest pytestcov coverage ];
+
+ propagatedBuildInputs = [ jsonschema ];
+
+ # We add this flag to ignore the copy installed by bootstrapped-pip
+ installFlags = [ "--ignore-installed" ];
+
+ meta = {
+ description = "A built-package format for Python";
+ license = with lib.licenses; [ mit ];
+ homepage = https://bitbucket.org/pypa/wheel/;
+ };
+}
diff --git a/pkgs/development/python-modules/xlwt/default.nix b/pkgs/development/python-modules/xlwt/default.nix
index 01f920a387a..f25646fffdb 100644
--- a/pkgs/development/python-modules/xlwt/default.nix
+++ b/pkgs/development/python-modules/xlwt/default.nix
@@ -8,21 +8,13 @@
buildPythonPackage rec {
pname = "xlwt";
name = "${pname}-${version}";
- version = "1.1.2";
+ version = "1.2.0";
src = fetchurl {
url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
- sha256 = "aed648c17731f40f84550dd2a1aaa53569f0cbcaf5610ba895cd2632587b723c";
+ sha256 = "505669c1eb6a60823fd3e2e723b60eea95f2c56254113bf163091ed2bedb4ac9";
};
- # re.LOCALE was removed in Python 3.6
- patches = [
- (fetchpatch {
- url = "https://github.com/python-excel/xlwt/commit/86564ef26341020316cd8a27c704ef1dc5a6129b.patch";
- sha256 = "0ifavfld3rrqjb0iyriy4c0drw31gszvlg3nmnn9dmfsh91vxhs6";
- })
- ];
-
buildInputs = [ nose ];
checkPhase = ''
nosetests -v
diff --git a/pkgs/development/python-modules/xmpppy/default.nix b/pkgs/development/python-modules/xmpppy/default.nix
index 332feef9e49..33adac52c90 100644
--- a/pkgs/development/python-modules/xmpppy/default.nix
+++ b/pkgs/development/python-modules/xmpppy/default.nix
@@ -1,6 +1,7 @@
{ stdenv, buildPythonPackage, fetchurl, isPy3k }:
buildPythonPackage rec {
- name = "xmpp.py-${version}";
+ pname = "xmpp.py";
+ name = "${pname}-${version}";
version = "0.5.0rc1";
patches = [ ./ssl.patch ];
diff --git a/pkgs/development/python-modules/yarl/default.nix b/pkgs/development/python-modules/yarl/default.nix
index 246b761fa53..03732c5343b 100644
--- a/pkgs/development/python-modules/yarl/default.nix
+++ b/pkgs/development/python-modules/yarl/default.nix
@@ -8,12 +8,12 @@
let
pname = "yarl";
- version = "0.8.1";
+ version = "0.10.2";
in buildPythonPackage rec {
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
- sha256 = "9f0397ae540124bf16a8a5b89bc3ea1c07f8ae70c3e44231a40a9edd254d5712";
+ sha256 = "a042c5b3584531cd09cd5ca647f71553df7caaa3359b9b3f7eb34c3b1045b38d";
};
buildInputs = [ pytest pytestrunner ];
diff --git a/pkgs/development/python-modules/yolk/default.nix b/pkgs/development/python-modules/yolk/default.nix
index 33e9cfeab3a..f6bbb8f4b86 100644
--- a/pkgs/development/python-modules/yolk/default.nix
+++ b/pkgs/development/python-modules/yolk/default.nix
@@ -3,7 +3,8 @@
with lib;
buildPythonApplication rec {
- name = "yolk-${version}";
+ pname = "yolk";
+ name = "${pname}-${version}";
version = "0.4.3";
src = fetchurl {
diff --git a/pkgs/development/python-modules/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix
index c6ae3881f1f..41418a99c8d 100644
--- a/pkgs/development/python-modules/zeep/default.nix
+++ b/pkgs/development/python-modules/zeep/default.nix
@@ -24,13 +24,13 @@
let
pname = "zeep";
- version = "1.1.0";
+ version = "2.0.0";
in buildPythonPackage {
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
- sha256 = "83e82b6cb59e84bf4725add3771ed442bb099fad5959c887efe7c49a8a940ea5";
+ sha256 = "5b9bd6b8772d6b505118c11d6924eb7df0decf12bbbeb43b1c27d781817361ad";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix
index 9251c4d2a41..fc6a4bab75c 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 58788a9290b..4f253c06186 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.0";
+ version = "0.9.5";
scalaVersion = "2.12";
src = fetchurl {
url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}";
- sha256 = "12kmsj1phbbma9mfl0saa0hhjm702hccbb6mqpawmqwhkwz48iak";
+ sha256 = "1ni829qpdm5wflc1n827b9ywpv836r2068rmj9yd2nyh8b6q2him";
};
propagatedBuildInputs = [ jre ] ;
diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix
index a394105faf4..ce9ca76a43b 100644
--- a/pkgs/development/tools/analysis/cppcheck/default.nix
+++ b/pkgs/development/tools/analysis/cppcheck/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "cppcheck";
- version = "1.78";
+ version = "1.79";
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://sourceforge/${pname}/${name}.tar.bz2";
- sha256 = "1cc60y2vjq4g88183jkan91ybzqy0n6p5ncs8z5rh6rjsvvrc9p4";
+ sha256 = "0vgh4zx191d7mcmiilkhcbd9jkspfkppl7l4y5451walvs9vd19b";
};
buildInputs = [ pcre ];
diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix
index 71ffb35a9f0..d356caad1f6 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchFromGitHub, lib, ocaml, libelf, cf-private, CoreServices }:
+{ stdenv, fetchFromGitHub, lib, ocaml, libelf, cf-private, CoreServices, findlib, camlp4, sedlex, ocamlbuild }:
with lib;
stdenv.mkDerivation rec {
- version = "0.42.0";
+ version = "0.46.0";
name = "flow-${version}";
src = fetchFromGitHub {
owner = "facebook";
repo = "flow";
rev = "v${version}";
- sha256 = "1mzl13z3c512b3jrrkzm5wmd9wjpnr173pan0vvpgf23333yvigq";
+ sha256 = "05rnlckwiynkh0300f27xhrn53pf0hxlkb0iz3nlb81xmsk005a4";
};
installPhase = ''
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
cp bin/flow $out/bin/
'';
- buildInputs = [ ocaml libelf ]
+ buildInputs = [ ocaml libelf findlib camlp4 sedlex ocamlbuild ]
++ optionals stdenv.isDarwin [ cf-private CoreServices ];
meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh
index f6dd5460c35..bf876e81cda 100755
--- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh
+++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh
@@ -49,7 +49,7 @@ cmakeConfigurePhase() {
# Avoid cmake resetting the rpath of binaries, on make install
# And build always Release, to ensure optimisation flags
- cmakeFlags="-DCMAKE_BUILD_TYPE=Release -DCMAKE_SKIP_BUILD_RPATH=ON $cmakeFlags"
+ cmakeFlags="-DCMAKE_BUILD_TYPE=${cmakeBuildType:-Release} -DCMAKE_SKIP_BUILD_RPATH=ON $cmakeFlags"
echo "cmake flags: $cmakeFlags ${cmakeFlagsArray[@]}"
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 00000000000..7b5dc2b7937
--- /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 00000000000..1821ac6bbb7
--- /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/build-managers/ninja/default.nix b/pkgs/development/tools/build-managers/ninja/default.nix
index cadda36a0e6..39d0d4e0e39 100644
--- a/pkgs/development/tools/build-managers/ninja/default.nix
+++ b/pkgs/development/tools/build-managers/ninja/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
name = "ninja-${version}";
- version = "1.7.1";
+ version = "1.7.2";
src = fetchurl {
name = "${name}.tar.gz";
url = "https://github.com/ninja-build/ninja/archive/v${version}.tar.gz";
- sha256 = "06dy2dc1aafm61ynw9gzig88la3km9dsh53bxf4mnw7l7kjisn2i";
+ sha256 = "1n8n3g26ppwh7zwrc37n3alkbpbj0wki34ih53s3rkhs8ajs1p9f";
};
buildInputs = [ python asciidoc re2c ];
diff --git a/pkgs/development/tools/build-managers/pants/default.nix b/pkgs/development/tools/build-managers/pants/default.nix
index 624e273cc90..1e37a3f85e2 100644
--- a/pkgs/development/tools/build-managers/pants/default.nix
+++ b/pkgs/development/tools/build-managers/pants/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pythonPackages }:
+{ stdenv, pythonPackages, runCommand, curl }:
with stdenv.lib;
with pythonPackages;
@@ -22,6 +22,38 @@ let
maintainers = with maintainers; [ copumpkin ];
};
};
+
+ pants13-version = "1.3.0rc4";
+
+ # TODO: compile the rust native engine ourselves so we don't need to do this shit. We don't use
+ # fetchurl because we don't know the URL ahead of time, even though it's deterministic. So we have
+ # this downloader figure out the URL on the fly and then produce the deterministic result, so we
+ # can still be a fixed-output derivation.
+ pants13-native-engine-info = {
+ "x86_64-darwin" = { prefix = "mac/10.11"; hash = "04kfqp4fcxj7zkyb21rgp1kdrlnmayfvakpg5xips716d7pp6vc7"; };
+ "x86_64-linux" = { prefix = "linux/x86_64"; hash = "0vgmcqxcabryxgvk4wmbclqjn56jbmsaysckgwfzhmif8pxyrfam"; };
+ "i686-linux" = { prefix = "linux/i386"; hash = "1xgma6cwvzg1d07xq6bd3j4rpzp6wn6lz82xqprr6vflyn78qaaw"; };
+ }.${stdenv.system} or (throw "Unsupported system ${stdenv.system}!");
+
+ pants13-native-engine = runCommand "pants-native-${pants13-version}" {
+ buildInputs = [ curl ];
+ outputHashMode = "recursive";
+ outputHashAlgo = "sha256";
+ outputHash = pants13-native-engine-info.hash;
+ } ''
+ native_version=$(curl -k -L https://raw.githubusercontent.com/pantsbuild/pants/release_${pants13-version}/src/python/pants/engine/subsystem/native_engine_version)
+ curl -kLO "https://dl.bintray.com/pantsbuild/bin/build-support/bin/native-engine/${pants13-native-engine-info.prefix}/$native_version/native_engine.so"
+
+ # Ugh it tries to "download" from this prefix so let's just replicate their directory structure for now...
+ mkdir -p $out/bin/native-engine/${pants13-native-engine-info.prefix}/$native_version/
+
+ # These should behave the same way in Nix land and we try not to differentiate between OS revisions...
+ mkdir -p $out/bin/native-engine/mac/
+ ln -s 10.11 $out/bin/native-engine/mac/10.10
+ ln -s 10.11 $out/bin/native-engine/mac/10.12
+
+ cp native_engine.so $out/bin/native-engine/${pants13-native-engine-info.prefix}/$native_version/
+ '';
in {
pants =
pythonPackages.buildPythonPackage rec {
@@ -61,16 +93,19 @@ in {
pants13-pre = buildPythonApplication rec {
pname = "pantsbuild.pants";
- version = "1.3.0rc2";
+ version = pants13-version;
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
- sha256 = "1d3i0jwhn94b96b3lwwxd10007hnxw6dw1azmwv3hhwq713gwnpi";
+ sha256 = "03zv3g55x056vjggwjr8lpniixcpb3kfy7xkl1bxsvjp2ih2wj6g";
};
prePatch = ''
sed -E -i "s/'([[:alnum:].-]+)[=><][[:digit:]=><.,]*'/'\\1'/g" setup.py
+
+ substituteInPlace src/pants/option/global_options.py \
+ --replace "'/etc/pantsrc'" "'$out/etc/pantsrc', '/etc/pantsrc'"
'';
# Unnecessary, and causes some really weird behavior around .class files, which
@@ -84,6 +119,17 @@ in {
fasteners coverage pywatchman futures cffi
];
+ # Teach pants about where its native engine lives.
+ # TODO: there's probably a better way to teach it this without having it "download"
+ # from a local file: URL to its cache, but I don't know how and this seems to work.
+ postFixup = ''
+ mkdir -p $out/etc
+ cat >$out/etc/pantsrc <="
+ rm tests/test_rowlimit.py
+ '';
+
+ meta = with lib; {
+ description = "Command-line interface for PostgreSQL";
+ longDescription = ''
+ Rich command-line interface for PostgreSQL with auto-completion and
+ syntax highlighting.
+ '';
+ homepage = https://pgcli.com;
+ license = licenses.bsd3;
+ maintainers = with maintainers; [ nckx ];
+ };
+}
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 b95906d2002..27ad4c996ce 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/misc/cgdb/default.nix b/pkgs/development/tools/misc/cgdb/default.nix
index b9a517f671f..a5ad3910f3f 100644
--- a/pkgs/development/tools/misc/cgdb/default.nix
+++ b/pkgs/development/tools/misc/cgdb/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchurl, ncurses, readline, flex, texinfo, help2man }:
+{ stdenv, fetchurl, ncurses, readline, flex, texinfo }:
stdenv.mkDerivation rec {
name = "cgdb-${version}";
- version = "0.6.8";
+ version = "0.7.0";
src = fetchurl {
url = "http://cgdb.me/files/${name}.tar.gz";
- sha256 = "0hfgyj8jimb7imqlfdpzaln787r6r0yzwzmnk91rfl19pqlkw85y";
+ sha256 = "08slzg3702v5nivjhdx2bciqxc5vqcn8pc4i4lsgkcwdcrj94ymz";
};
- buildInputs = [ ncurses readline flex texinfo help2man ];
+ buildInputs = [ ncurses readline flex texinfo ];
meta = with stdenv.lib; {
description = "A curses interface to gdb";
diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix
index 62d96b2158f..f55130ae104 100644
--- a/pkgs/development/tools/misc/global/default.nix
+++ b/pkgs/development/tools/misc/global/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "global-${version}";
- version = "6.5.6";
+ version = "6.5.7";
src = fetchurl {
url = "mirror://gnu/global/${name}.tar.gz";
- sha256 = "018m536k5y6lks1a6gqn3bsp7r8zk017znqj9kva1nm8d7x9lbqj";
+ sha256 = "0cnd7a7d1pl46yk15q6mnr9i9w3xi8pxgchw4ia9njgr4jjqzh6r";
};
nativeBuildInputs = [ libtool makeWrapper ];
diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix
index 7af1b5ccd7a..6f0d71d76b1 100644
--- a/pkgs/development/tools/ocaml/merlin/default.nix
+++ b/pkgs/development/tools/ocaml/merlin/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, ocaml, findlib, yojson, menhir, lib
+{ stdenv, fetchzip, ocaml, findlib, yojson, lib
, withEmacsMode ? false, emacs }:
assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.00";
@@ -8,10 +8,10 @@ let
then
"2.3.1"
else
- "2.5.3";
+ "2.5.4";
hashes = {
"2.3.1" = "192jamcc7rmvadlqqsjkzsl6hlgwhg9my1qc89fxh1lmd4qdsrpn";
- "2.5.3" = "0qljklgcrpqdxzvcqj7b4785zcz322pjvw9cddbmzla33hagglha";
+ "2.5.4" = "101vk16c5wayd51s8w0mvy99bk7q3gm2gz8i8616wa1lmyszjknh";
};
in
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
sha256 = hashes."${version}";
};
- buildInputs = [ ocaml findlib yojson menhir ]
+ buildInputs = [ ocaml findlib yojson ]
++ stdenv.lib.optional withEmacsMode emacs;
preConfigure = "mkdir -p $out/bin";
diff --git a/pkgs/development/tools/ocaml/ocp-indent/default.nix b/pkgs/development/tools/ocaml/ocp-indent/default.nix
index d146dd5e973..500002bed44 100644
--- a/pkgs/development/tools/ocaml/ocp-indent/default.nix
+++ b/pkgs/development/tools/ocaml/ocp-indent/default.nix
@@ -3,18 +3,21 @@
let inherit (stdenv.lib) getVersion versionAtLeast; in
assert versionAtLeast (getVersion ocaml) "3.12.1";
+assert versionAtLeast (getVersion cmdliner) "1.0.0";
assert versionAtLeast (getVersion ocpBuild) "1.99.6-beta";
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
- name = "ocp-indent-1.5.2";
+ name = "ocp-indent-${version}";
+ version = "1.6.0";
src = fetchzip {
- url = "https://github.com/OCamlPro/ocp-indent/archive/1.5.2.tar.gz";
- sha256 = "0ynv2yhm7akpvqp72pdabhddwr352s1k85q8m1khsvspgg1mkiqz";
+ url = "https://github.com/OCamlPro/ocp-indent/archive/${version}.tar.gz";
+ sha256 = "1h9y597s3ag8w1z32zzv4dfk3ppq557s55bnlfw5a5wqwvia911f";
};
- buildInputs = [ ocaml findlib ocpBuild opam cmdliner ];
+ nativeBuildInputs = [ ocpBuild opam ];
+ buildInputs = [ ocaml findlib cmdliner ];
createFindlibDestdir = true;
diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix
index 5c0ea18cab3..bcf08712ccb 100644
--- a/pkgs/development/tools/packer/default.nix
+++ b/pkgs/development/tools/packer/default.nix
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
name = "packer-${version}";
- version = "0.12.2";
+ version = "1.0.0";
goPackagePath = "github.com/mitchellh/packer";
@@ -11,7 +11,7 @@ buildGoPackage rec {
owner = "mitchellh";
repo = "packer";
rev = "v${version}";
- sha256 = "1li141y7rfbn021h33dnryhms5xwzqz8d92djnprbh7ba9ff02zm";
+ sha256 = "16hdh3iwvdg1jk3pswa9r9lq4qkhds1lrqwl19vd1v2yz2r76kzi";
};
meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix
index 0fe243e8aaf..5140719c62b 100644
--- a/pkgs/development/tools/parsing/ragel/default.nix
+++ b/pkgs/development/tools/parsing/ragel/default.nix
@@ -42,7 +42,7 @@ in
};
ragelDev = generic {
- version = "7.0.0.9";
- sha256 = "1w2jhfg3fxl15gcmm7z3jbi6splgc83mmwcfbp08lfc8sg2wmrmr";
+ version = "7.0.0.10";
+ sha256 = "1v4ddzxal4gf8l8nkn32qabba6nbpd2mg8sphgmdn8kaqv52nmj0";
};
}
diff --git a/pkgs/development/tools/quilt/default.nix b/pkgs/development/tools/quilt/default.nix
index 1fd70730265..fe6aeb3fa6e 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/rtags/default.nix b/pkgs/development/tools/rtags/default.nix
index 6ab227dedcd..4f396e26bf9 100644
--- a/pkgs/development/tools/rtags/default.nix
+++ b/pkgs/development/tools/rtags/default.nix
@@ -22,12 +22,6 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- postInstall = lib.optionalString stdenv.isDarwin ''
- for f in $out/bin/{rc,rdm,rp}; do
- install_name_tool -change @rpath/libclang.dylib ${llvmPackages.clang.cc}/lib/libclang.dylib ''${f}
- done
- '';
-
meta = {
description = "C/C++ client-server indexer based on clang";
homepage = https://github.com/andersbakken/rtags;
diff --git a/pkgs/development/tools/rust/rustfmt/default.nix b/pkgs/development/tools/rust/rustfmt/default.nix
index a7164b14d3f..3efc82a60c8 100644
--- a/pkgs/development/tools/rust/rustfmt/default.nix
+++ b/pkgs/development/tools/rust/rustfmt/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
name = "rustfmt-${version}";
- version = "0.8.1";
+ version = "0.8.3";
src = fetchFromGitHub {
owner = "rust-lang-nursery";
repo = "rustfmt";
- rev = "v${version}";
- sha256 = "05rjx7i4wn3z3j8bgqsn146a9vbni6xhxaim9nq13c6dm4nrx96b";
+ rev = "${version}";
+ sha256 = "1nh0h8mncz5vnn5hmw74f8nnh5cxdlrg67891l4dyq0p38vjhimz";
};
- depsSha256 = "1rnk33g85r1hkw9l9c52dzr4zka5kghbci9qwni3ph19rfqf0a73";
+ depsSha256 = "002d7y33a0bavd07wl7xrignmyaamnzfabdnr7a2x3zfizkfnblb";
meta = with stdenv.lib; {
description = "A tool for formatting Rust code according to style guidelines";
diff --git a/pkgs/development/tools/simavr/default.nix b/pkgs/development/tools/simavr/default.nix
index 9fa6b8b5716..5ad2647ea31 100644
--- a/pkgs/development/tools/simavr/default.nix
+++ b/pkgs/development/tools/simavr/default.nix
@@ -18,6 +18,9 @@ stdenv.mkDerivation rec {
buildFlags = "AVR_ROOT=${avrgcclibc}/avr SIMAVR_VERSION=${version}";
installFlags = buildFlags + " DESTDIR=$(out)";
+ # Hack to avoid TMPDIR in RPATHs.
+ preFixup = ''rm -rf "$(pwd)" && mkdir "$(pwd)" '';
+
postFixup = ''
target="$out/bin/simavr"
patchelf --set-rpath "$(patchelf --print-rpath "$target"):$out/lib" "$target"
diff --git a/pkgs/development/tools/unity3d/default.nix b/pkgs/development/tools/unity3d/default.nix
index d9459134fea..c7ba985d0f7 100644
--- a/pkgs/development/tools/unity3d/default.nix
+++ b/pkgs/development/tools/unity3d/default.nix
@@ -25,7 +25,7 @@ let
gnome-sharp gtk-sharp-2_0
];
- ver = "5.5.3";
+ ver = "5.6.1";
build = "f1";
in stdenv.mkDerivation rec {
@@ -33,8 +33,8 @@ in stdenv.mkDerivation rec {
version = "${ver}x${build}";
src = fetchurl {
- url = "http://beta.unity3d.com/download/a2454d41e248/unity-editor-installer-${version}Linux.sh";
- sha256 = "1hvas4n1hm0qp0265gk1nh03kypd9690fnxvzg70f5ni9q97pvm0";
+ url = "http://beta.unity3d.com/download/6a86e542cf5c/unity-editor-installer-${version}Linux.sh";
+ sha256 = "10z4h94c9h967gx4b3gwb268zn7bnrb7ylnqnmnqhx6byac7cf4m";
};
nosuidLib = ./unity-nosuid.c;
@@ -50,41 +50,12 @@ in stdenv.mkDerivation rec {
'';
buildPhase = ''
- patchFile() {
- ftype="$(file -b "$1")"
- if [[ "$ftype" =~ LSB\ .*dynamically\ linked ]]; then
- if [[ "$ftype" =~ 32-bit ]]; then
- rpath="${libPath32}"
- intp="$(cat $NIX_CC/nix-support/dynamic-linker-m32)"
- else
- rpath="${libPath64}"
- intp="$(cat $NIX_CC/nix-support/dynamic-linker)"
- fi
-
- rpath="$(patchelf --print-rpath "$1"):$rpath"
- if [[ "$ftype" =~ LSB\ shared ]]; then
- patchelf \
- --set-rpath "$rpath" \
- "$1"
- elif [[ "$ftype" =~ LSB\ executable ]]; then
- patchelf \
- --set-rpath "$rpath" \
- --interpreter "$intp" \
- "$1"
- fi
- fi
- }
cd Editor
$CC -fPIC -shared -o libunity-nosuid.so $nosuidLib -ldl
strip libunity-nosuid.so
- # Exclude PlaybackEngines to build something that can be run on FHS-compliant Linuxes
- find . -name PlaybackEngines -prune -o -executable -type f -print | while read path; do
- patchFile "$path"
- done
-
cd ..
'';
@@ -122,6 +93,40 @@ in stdenv.mkDerivation rec {
--prefix MONO_GAC_PREFIX : "${developDotnetPath}"
'';
+ preFixup = ''
+ patchFile() {
+ ftype="$(file -b "$1")"
+ if [[ "$ftype" =~ LSB\ .*dynamically\ linked ]]; then
+ if [[ "$ftype" =~ 32-bit ]]; then
+ rpath="${libPath32}"
+ intp="$(cat $NIX_CC/nix-support/dynamic-linker-m32)"
+ else
+ rpath="${libPath64}"
+ intp="$(cat $NIX_CC/nix-support/dynamic-linker)"
+ fi
+
+ oldRpath="$(patchelf --print-rpath "$1")"
+ # Always search at least for libraries in origin directory.
+ rpath="''${oldRpath:-\$ORIGIN}:$rpath"
+ if [[ "$ftype" =~ LSB\ shared ]]; then
+ patchelf \
+ --set-rpath "$rpath" \
+ "$1"
+ elif [[ "$ftype" =~ LSB\ executable ]]; then
+ patchelf \
+ --set-rpath "$rpath" \
+ --interpreter "$intp" \
+ "$1"
+ fi
+ fi
+ }
+
+ # Exclude PlaybackEngines to build something that can be run on FHS-compliant Linuxes
+ find $unitydir -name PlaybackEngines -prune -o -type f -print | while read path; do
+ patchFile "$path"
+ done
+ '';
+
dontStrip = true;
dontPatchELF = true;
diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix
index 659c831bbe3..557d1fde79d 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 00000000000..5a97eb09e4b
--- /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/development/tools/yarn/default.nix b/pkgs/development/tools/yarn/default.nix
index fd30a179876..376018c45a4 100644
--- a/pkgs/development/tools/yarn/default.nix
+++ b/pkgs/development/tools/yarn/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "yarn-${version}";
- version = "0.23.4";
+ version = "0.24.6";
src = fetchzip {
url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz";
- sha256 = "1jv2fbi10rx6whqn1krn9lrgwpnmzlbfym23m0df4y6k9pfyc9pz";
+ sha256 = "1dxshqmz0im1a09p0x8zx1clkmkgjg3pg1gyl95fzzn6jai3nnrb";
};
buildInputs = [makeWrapper nodejs];
diff --git a/pkgs/development/web/nodejs/no-xcode-v7.patch b/pkgs/development/web/nodejs/no-xcode-v7.patch
new file mode 100644
index 00000000000..05623b21f13
--- /dev/null
+++ b/pkgs/development/web/nodejs/no-xcode-v7.patch
@@ -0,0 +1,79 @@
+diff --git a/tools/gyp/pylib/gyp/xcode_emulation.py b/tools/gyp/pylib/gyp/xcode_emulation.py
+index a173ff0..1fc821a 100644
+--- a/tools/gyp/pylib/gyp/xcode_emulation.py
++++ b/tools/gyp/pylib/gyp/xcode_emulation.py
+@@ -507,9 +507,12 @@ class XcodeSettings(object):
+ def _XcodePlatformPath(self, configname=None):
+ sdk_root = self._SdkRoot(configname)
+ if sdk_root not in XcodeSettings._platform_path_cache:
+- platform_path = self._GetSdkVersionInfoItem(sdk_root,
++ try:
++ platform_path = self._GetSdkVersionInfoItem(sdk_root,
+ '--show-sdk-platform-path')
+- XcodeSettings._platform_path_cache[sdk_root] = platform_path
++ XcodeSettings._platform_path_cache[sdk_root] = platform_path
++ except:
++ XcodeSettings._platform_path_cache[sdk_root] = None
+ return XcodeSettings._platform_path_cache[sdk_root]
+
+ def _SdkPath(self, configname=None):
+@@ -520,10 +523,13 @@ class XcodeSettings(object):
+
+ def _XcodeSdkPath(self, sdk_root):
+ if sdk_root not in XcodeSettings._sdk_path_cache:
+- sdk_path = self._GetSdkVersionInfoItem(sdk_root, '--show-sdk-path')
+- XcodeSettings._sdk_path_cache[sdk_root] = sdk_path
+- if sdk_root:
+- XcodeSettings._sdk_root_cache[sdk_path] = sdk_root
++ try:
++ sdk_path = self._GetSdkVersionInfoItem(sdk_root, '--show-sdk-path')
++ XcodeSettings._sdk_path_cache[sdk_root] = sdk_path
++ if sdk_root:
++ XcodeSettings._sdk_root_cache[sdk_path] = sdk_root
++ except:
++ XcodeSettings._sdk_path_cache[sdk_root] = None
+ return XcodeSettings._sdk_path_cache[sdk_root]
+
+ def _AppendPlatformVersionMinFlags(self, lst):
+@@ -653,10 +659,11 @@ class XcodeSettings(object):
+ framework_root = sdk_root
+ else:
+ framework_root = ''
+- config = self.spec['configurations'][self.configname]
+- framework_dirs = config.get('mac_framework_dirs', [])
+- for directory in framework_dirs:
+- cflags.append('-F' + directory.replace('$(SDKROOT)', framework_root))
++ if 'SDKROOT' in self._Settings():
++ config = self.spec['configurations'][self.configname]
++ framework_dirs = config.get('mac_framework_dirs', [])
++ for directory in framework_dirs:
++ cflags.append('-F' + directory.replace('$(SDKROOT)', framework_root))
+
+ self.configname = None
+ return cflags
+@@ -908,10 +915,11 @@ class XcodeSettings(object):
+ sdk_root = self._SdkPath()
+ if not sdk_root:
+ sdk_root = ''
+- config = self.spec['configurations'][self.configname]
+- framework_dirs = config.get('mac_framework_dirs', [])
+- for directory in framework_dirs:
+- ldflags.append('-F' + directory.replace('$(SDKROOT)', sdk_root))
++ if 'SDKROOT' in self._Settings():
++ config = self.spec['configurations'][self.configname]
++ framework_dirs = config.get('mac_framework_dirs', [])
++ for directory in framework_dirs:
++ ldflags.append('-F' + directory.replace('$(SDKROOT)', sdk_root))
+
+ platform_root = self._XcodePlatformPath(configname)
+ if sdk_root and platform_root and self._IsXCTest():
+@@ -1683,6 +1691,9 @@ def _NormalizeEnvVarReferences(str):
+ """Takes a string containing variable references in the form ${FOO}, $(FOO),
+ or $FOO, and returns a string with all variable references in the form ${FOO}.
+ """
++ if str is None:
++ return ''
++
+ # $FOO -> ${FOO}
+ str = re.sub(r'\$([a-zA-Z_][a-zA-Z0-9_]*)', r'${\1}', str)
+
diff --git a/pkgs/development/web/nodejs/v7.nix b/pkgs/development/web/nodejs/v7.nix
index 2fb61fca0ff..1c074fa4751 100644
--- a/pkgs/development/web/nodejs/v7.nix
+++ b/pkgs/development/web/nodejs/v7.nix
@@ -10,12 +10,13 @@ let
baseName = if enableNpm then "nodejs" else "nodejs-slim";
in
stdenv.mkDerivation (nodejs // rec {
- version = "7.9.0";
+ version = "7.10.0";
name = "${baseName}-${version}";
src = fetchurl {
url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz";
- sha256 = "0abaz5z0cv7amd6blm4cm91asj30ydf0lq3j0wdg6aa9i15pcsd5";
+ sha256 = "08czj7ssvzgv13zvhg2y9mhy4cc6pvm4bcp7rbzj3a2ba8axsd6w";
};
+ patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ];
})
diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix
index f0de56b0953..861a44fea8c 100644
--- a/pkgs/games/factorio/default.nix
+++ b/pkgs/games/factorio/default.nix
@@ -10,7 +10,7 @@ assert releaseType == "alpha" || releaseType == "headless" || releaseType == "de
with stdenv.lib;
let
- version = if releaseType != "demo" then "0.15.1" else "0.14.23";
+ version = if releaseType != "demo" then "0.15.16" else "0.14.23";
arch = if stdenv.system == "x86_64-linux" then {
inUrl = "linux64";
@@ -27,8 +27,8 @@ let
url = "https://www.factorio.com/get-download/${version}/${releaseType}/${arch.inUrl}";
name = "factorio_${releaseType}_${arch.inTar}-${version}.${extension}";
x64 = {
- headless = fetchurl { inherit name url; sha256 = "1z84a9yzlld6fv53viwvswp52hlc9fkxzhb2pil7sidzkws3g49l"; };
- alpha = authenticatedFetch { inherit name url; sha256 = "11bxasghrhqb2yg1842v1608x3mjdjv3015jgifpv1xmcqak44jp"; };
+ headless = fetchurl { inherit name url; sha256 = "0ig0nrvqllb9294qn2ci5j5s31ycsjn23bp6hc633xqkgfmklmic"; };
+ alpha = authenticatedFetch { inherit name url; sha256 = "0bf0z6fi0cpbq487hz4sz8ljapchzhld01sj767wsldakjfkm9g9"; };
demo = fetchurl { inherit name url; sha256 = "10a2lwmspqviwgymn3zhjgpiynsa6dplgnikdirma5sl2hhcfb6s"; };
};
i386 = {
diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix
index 608b1a01120..a6f1c305c4e 100644
--- a/pkgs/games/freeciv/default.nix
+++ b/pkgs/games/freeciv/default.nix
@@ -12,7 +12,7 @@ let
gtkName = if gtkClient then "-gtk" else "";
name = "freeciv";
- version = "2.5.6";
+ version = "2.5.7";
in
stdenv.mkDerivation {
name = "${name}${sdlName}${gtkName}-${version}";
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "mirror://sourceforge/freeciv/${name}-${version}.tar.bz2";
- sha256 = "16wrnsx5rmbz6rjs03bhy0vn20i6n6g73lx7fjpai98ixhzc5bfg";
+ sha256 = "1lmydnnqraa947l7gdz6xgm0bgks1ywsivp9h4v8jr3avcv6gqzz";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/games/galaxis/default.nix b/pkgs/games/galaxis/default.nix
new file mode 100644
index 00000000000..c0799e8fdf4
--- /dev/null
+++ b/pkgs/games/galaxis/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchurl, ncurses, xmlto }:
+
+with stdenv.lib;
+stdenv.mkDerivation rec{
+
+ name = "galaxis-${version}";
+ version = "1.9";
+
+ src = fetchurl{
+ url = "http://www.catb.org/~esr/galaxis/${name}.tar.gz";
+ sha256 = "1dsypk5brfbc399pg4fk9myyh5yyln0ljl1aiqkypws8h4nsdphl";
+ };
+
+ buildInputs = [ ncurses xmlto ];
+
+ patchPhase = ''
+ sed -i\
+ -e 's|^install: galaxis\.6 uninstall|install: galaxis.6|'\
+ -e 's|usr/||g' -e 's|ROOT|DESTDIR|g'\
+ -e 's|install -m 755 -o 0 -g 0|install -m 755|' Makefile
+ '';
+
+ dontConfigure = true;
+
+ makeFlags = [ "DESTDIR=$(out)" ];
+
+ meta = {
+ description = "Rescue lifeboats lost in interstellar space";
+ longDescription = ''
+ Lifeboats from a crippled interstellar liner are adrift in a starfield. To
+ find them, you can place probes that look in all eight compass directions
+ and tell you how many lifeboats they see. If you drop a probe directly on
+ a lifeboat it will be revealed immediately. Your objective: find the
+ lifeboats as quickly as possible, before the stranded passengers run out
+ of oxygen!
+
+ This is a UNIX-hosted, curses-based clone of the nifty little Macintosh
+ freeware game Galaxis. It doesn't have the super-simple, point-and-click
+ interface of the original, but compensates by automating away some of the
+ game's simpler deductions.
+ '';
+ homepage = http://catb.org/~esr/galaxis/;
+ license = licenses.gpl2;
+ maintainers = [ maintainers.AndersonTorres ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/games/instead-launcher/default.nix b/pkgs/games/instead-launcher/default.nix
index 6515db9dab3..39324843e5e 100644
--- a/pkgs/games/instead-launcher/default.nix
+++ b/pkgs/games/instead-launcher/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "instead-launcher-${version}";
- version = "0.6.3";
+ version = "0.7.0";
src = fetchFromGitHub {
owner = "instead-hub";
repo = "instead-launcher";
rev = version;
- sha256 = "1q0hdgfy9pr48zvxr9x614ka6bd0g8sicdk2a673nwfdyd41p9cw";
+ sha256 = "1svy8i8anspway01pnz2cy69aad03anvkq04wrdfv1h9c34gbvb9";
};
patches = [ ./path.patch ];
diff --git a/pkgs/games/instead/default.nix b/pkgs/games/instead/default.nix
index e3fd6ccb2f7..a0bb45746f7 100644
--- a/pkgs/games/instead/default.nix
+++ b/pkgs/games/instead/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, SDL, SDL_ttf, SDL_image, SDL_mixer, pkgconfig, lua, zlib, unzip }:
let
- version = "2.4.1";
+ version = "3.0.0";
# I took several games at random from http://instead.syscall.ru/games/
games = [
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://sourceforge/project/instead/instead/${version}/instead_${version}.tar.gz";
- sha256 = "1i69b10jfb980d5zhmvh1i789hh982vxiwgqna82b84pdf3y7kgw";
+ sha256 = "14scbb5x36dywak930ry7hwv502jnzc4m5cjkymqn1vz1xkq2m5w";
};
NIX_LDFLAGS = "-llua -lgcc_s";
diff --git a/pkgs/games/klavaro/default.nix b/pkgs/games/klavaro/default.nix
index 2ca105af19d..162543da10c 100644
--- a/pkgs/games/klavaro/default.nix
+++ b/pkgs/games/klavaro/default.nix
@@ -16,6 +16,9 @@ stdenv.mkDerivation rec {
--prefix LD_LIBRARY_PATH : $out/lib
'';
+ # Hack to avoid TMPDIR in RPATHs.
+ preFixup = ''rm -rf "$(pwd)" '';
+
meta = {
description = "Just another free touch typing tutor program";
homepage = http://klavaro.sourceforge.net/;
diff --git a/pkgs/games/wesnoth/dev.nix b/pkgs/games/wesnoth/dev.nix
index 0b335812ff0..315f9ea7a5e 100644
--- a/pkgs/games/wesnoth/dev.nix
+++ b/pkgs/games/wesnoth/dev.nix
@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "wesnoth";
- version = "1.13.6";
+ version = "1.13.8";
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2";
- sha256 = "0z4k2r4ss46ik9fx5clffpd7vfr0l4l6d0j1war676dwz0z1j2m1";
+ sha256 = "0snm4n7l21cr4443rk93wnaqdzr91pihn452w66344zqwf33xgfr";
};
nativeBuildInputs = [ cmake pkgconfig ];
diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix
index fc42b299e91..b6009ee72fd 100644
--- a/pkgs/games/xonotic/default.nix
+++ b/pkgs/games/xonotic/default.nix
@@ -1,18 +1,18 @@
{ stdenv, fetchurl
, # required for both
- unzip, libjpeg, zlib, libvorbis, curl
+ unzip, libjpeg, zlib, libvorbis, curl, patchelf
, # glx
libX11, mesa, libXpm, libXext, libXxf86vm, alsaLib
, # sdl
- SDL
+ SDL2
}:
stdenv.mkDerivation rec {
- name = "xonotic-0.8.1";
+ name = "xonotic-0.8.2";
src = fetchurl {
url = "http://dl.xonotic.org/${name}.zip";
- sha256 = "0vy4hkrbpz9g91gb84cbv4xl845qxaknak6hshk2yflrw90wr2xy";
+ sha256 = "1mcs6l4clvn7ibfq3q69k2p0z6ww75rxvnngamdq5ic6yhq74bx2";
};
buildInputs = [
@@ -21,17 +21,22 @@ stdenv.mkDerivation rec {
# glx
libX11 mesa libXpm libXext libXxf86vm alsaLib
# sdl
- SDL
+ SDL2
zlib libvorbis curl
];
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;
@@ -48,7 +53,21 @@ stdenv.mkDerivation rec {
ln -s "$out/bin/xonotic-sdl" "$out/bin/xonotic"
'';
+ # Xonotic needs to find libcurl.so at runtime for map downloads
dontPatchELF = true;
+ postFixup = ''
+ patchelf --add-needed ${curl.out}/lib/libcurl.so $out/bin/xonotic-dedicated
+ 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 = {
description = "A free fast-paced first-person shooter";
@@ -62,7 +81,7 @@ stdenv.mkDerivation rec {
'';
homepage = http://www.xonotic.org;
license = stdenv.lib.licenses.gpl2Plus;
- maintainers = with stdenv.lib.maintainers; [ astsmtl ];
+ maintainers = with stdenv.lib.maintainers; [ astsmtl zalakain ];
platforms = stdenv.lib.platforms.linux;
hydraPlatforms = [];
};
diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix
index e4c70e2fe98..6d6fab265b1 100644
--- a/pkgs/misc/cups/filters.nix
+++ b/pkgs/misc/cups/filters.nix
@@ -1,6 +1,7 @@
{ stdenv, fetchurl, pkgconfig, cups, poppler, poppler_utils, fontconfig
, libjpeg, libpng, perl, ijs, qpdf, dbus, substituteAll, bash, avahi
-, makeWrapper, coreutils, gnused, bc, gawk, gnugrep, which
+, makeWrapper, coreutils, gnused, bc, gawk, gnugrep, which, ghostscript
+, mupdf
}:
let
@@ -8,18 +9,18 @@ let
in stdenv.mkDerivation rec {
name = "cups-filters-${version}";
- version = "1.11.1";
+ version = "1.14.0";
src = fetchurl {
url = "http://openprinting.org/download/cups-filters/${name}.tar.xz";
- sha256 = "0x0jxn1hnif92m7dyqrqh015gpsf79dviarb7dfl0zya2drlk1m8";
+ sha256 = "1v553wvr8qdwb1g04if7cw1mfm42vs6xfyg0cvzvbng6yr6jg93s";
};
nativeBuildInputs = [ pkgconfig makeWrapper ];
buildInputs = [
cups poppler poppler_utils fontconfig libjpeg libpng perl
- ijs qpdf dbus avahi
+ ijs qpdf dbus avahi ghostscript mupdf
];
configureFlags = [
@@ -41,6 +42,9 @@ in stdenv.mkDerivation rec {
# Ensure that gstoraster can find gs in $PATH.
substituteInPlace filter/gstoraster.c --replace execve execvpe
+
+ # Patch shebangs of generated build scripts
+ patchShebangs filter
'';
postInstall =
@@ -57,5 +61,6 @@ in stdenv.mkDerivation rec {
description = "Backends, filters, and other software that was once part of the core CUPS distribution but is no longer maintained by Apple Inc";
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
+ maintainers = with stdenv.lib.maintainers; [ layus ];
};
}
diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix
index 19026274d56..80070dec2d9 100644
--- a/pkgs/misc/emulators/wine/base.nix
+++ b/pkgs/misc/emulators/wine/base.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
++ lib.optional odbcSupport pkgs.unixODBC
++ lib.optional netapiSupport pkgs.samba3_light
++ lib.optional cursesSupport pkgs.ncurses
- ++ lib.optional vaSupport pkgs.libva
+ ++ lib.optional vaSupport pkgs.libva-full
++ lib.optional pcapSupport pkgs.libpcap
++ lib.optional v4lSupport pkgs.libv4l
++ lib.optional saneSupport pkgs.saneBackends
@@ -46,7 +46,8 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
++ lib.optional alsaSupport pkgs.alsaLib
++ lib.optional pulseaudioSupport pkgs.libpulseaudio
++ lib.optional xineramaSupport pkgs.xorg.libXinerama
- ++ lib.optionals gstreamerSupport (with pkgs.gst_all; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-ffmpeg ])
+ ++ lib.optional udevSupport pkgs.udev
+ ++ lib.optionals gstreamerSupport (with pkgs.gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav ])
++ lib.optionals gtkSupport [ pkgs.gtk3 pkgs.glib ]
++ lib.optionals openclSupport [ pkgs.opencl-headers pkgs.ocl-icd ]
++ lib.optionals xmlSupport [ pkgs.libxml2 pkgs.libxslt ]
@@ -92,7 +93,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
'' + lib.optionalString supportFlags.gstreamerSupport ''
wrapProgram "$out/bin/wine" \
--argv0 "" \
- --prefix GST_PLUGIN_SYSTEM_PATH ":" "$GST_PLUGIN_SYSTEM_PATH"
+ --prefix GST_PLUGIN_SYSTEM_PATH_1_0 ":" "$GST_PLUGIN_SYSTEM_PATH_1_0"
'';
enableParallelBuilding = true;
diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix
index deeff3c7343..91fb0da82d8 100644
--- a/pkgs/misc/emulators/wine/default.nix
+++ b/pkgs/misc/emulators/wine/default.nix
@@ -38,6 +38,7 @@
gphoto2Support ? false,
ldapSupport ? false,
pulseaudioSupport ? false,
+ udevSupport ? false,
xineramaSupport ? false,
xmlSupport ? false }:
@@ -50,7 +51,7 @@ let wine-build = build: release:
netapiSupport cursesSupport vaSupport pcapSupport v4lSupport saneSupport
gsmSupport gphoto2Support ldapSupport fontconfigSupport alsaSupport
pulseaudioSupport xineramaSupport gtkSupport openclSupport xmlSupport tlsSupport
- openglSupport gstreamerSupport;
+ openglSupport gstreamerSupport udevSupport;
};
});
diff --git a/pkgs/misc/emulators/wine/staging.nix b/pkgs/misc/emulators/wine/staging.nix
index 51af13b8a15..4a7fe0ff55b 100644
--- a/pkgs/misc/emulators/wine/staging.nix
+++ b/pkgs/misc/emulators/wine/staging.nix
@@ -18,7 +18,7 @@ stdenv.lib.overrideDerivation wineUnstable (self: {
chmod +w patches
cd patches
patchShebangs gitapply.sh
- ./patchinstall.sh DESTDIR="$TMP/$sourceRoot" --all
+ ./patchinstall.sh DESTDIR="$PWD/.." --all
cd ..
'';
})
diff --git a/pkgs/misc/my-env/default.nix b/pkgs/misc/my-env/default.nix
index ffdaf3949ae..13102877d7e 100644
--- a/pkgs/misc/my-env/default.nix
+++ b/pkgs/misc/my-env/default.nix
@@ -1,7 +1,7 @@
# idea: provide a build environments for your developement of preference
/*
#### examples of use: ####
- # Add this to your ~/.nixpkgs/config.nix:
+ # Add this to your ~/.config/nixpkgs/config.nix:
{
packageOverrides = pkgs : with pkgs; {
sdlEnv = pkgs.myEnvFun {
@@ -22,7 +22,7 @@
##### Another example, more complicated but achieving more: #######
# Make an environment to build nix from source and create ctags (tagfiles can
# be extracted from TAG_FILES) from every source package. Here would be a
- # full ~/.nixpkgs/config.nix
+ # full ~/.config/nixpkgs/config.nix
{
packageOverrides = pkgs : with pkgs; with sourceAndTags;
let complicatedMyEnv = { name, buildInputs ? [], cTags ? [], extraCmds ? ""}:
diff --git a/pkgs/os-specific/darwin/apple-source-releases/CF/add-cf-initialize.patch b/pkgs/os-specific/darwin/apple-source-releases/CF/add-cf-initialize.patch
deleted file mode 100644
index 46c230cfd1d..00000000000
--- a/pkgs/os-specific/darwin/apple-source-releases/CF/add-cf-initialize.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- CF-855.17/CFRuntime.c 2014-11-26 21:29:48.000000000 -0800
-+++ CF-855.17/CFRuntime.c.new 2014-11-26 21:30:01.000000000 -0800
-@@ -756,6 +756,7 @@
- extern void __CFErrorInitialize(void);
- extern void __CFTreeInitialize(void);
- extern void __CFURLInitialize(void);
-+extern void __CFPreferencesDomainInitialize(void);
- #if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI
- extern void __CFMachPortInitialize(void);
- #endif
-@@ -1015,6 +1016,7 @@
- __CFErrorInitialize();
- __CFTreeInitialize();
- __CFURLInitialize();
-+ __CFPreferencesDomainInitialize();
-
- #if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS
- __CFBundleInitialize();
diff --git a/pkgs/os-specific/darwin/apple-source-releases/CF/default.nix b/pkgs/os-specific/darwin/apple-source-releases/CF/default.nix
index 3993a360156..e44966aa84d 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/CF/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/CF/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, appleDerivation, icu, dyld, libdispatch, launchd, libclosure }:
+{ stdenv, appleDerivation, ICU, dyld, libdispatch, libplatform, launchd, libclosure }:
# this project uses blocks, a clang-only extension
assert stdenv.cc.isClang;
appleDerivation {
- buildInputs = [ dyld icu libdispatch launchd libclosure ];
+ buildInputs = [ dyld ICU libdispatch libplatform launchd libclosure ];
- patches = [ ./add-cf-initialize.patch ./add-cfmachport.patch ./cf-bridging.patch ];
+ patches = [ ./add-cfmachport.patch ./cf-bridging.patch ./remove-xpc.patch ];
__propagatedImpureHostDeps = [ "/System/Library/Frameworks/CoreFoundation.framework/CoreFoundation" ];
@@ -19,7 +19,6 @@ appleDerivation {
--replace "/bin/" "" \
--replace "INSTALLNAME=/System" "INSTALLNAME=$out" \
--replace "install_name_tool -id /System" "install_name_tool -id $out" \
- --replace "-licucore.A" "-licui18n -licuuc" \
--replace 'chown -RH -f root:wheel $(DSTBASE)/CoreFoundation.framework' "" \
--replace 'chmod -RH' 'chmod -R'
diff --git a/pkgs/os-specific/darwin/apple-source-releases/CF/remove-xpc.patch b/pkgs/os-specific/darwin/apple-source-releases/CF/remove-xpc.patch
new file mode 100644
index 00000000000..a7b9fe48643
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/CF/remove-xpc.patch
@@ -0,0 +1,17 @@
+diff --git a/CFBundlePriv.h b/CFBundlePriv.h
+index d4feb5f..e7b52e8 100644
+--- a/CFBundlePriv.h
++++ b/CFBundlePriv.h
+@@ -254,12 +254,6 @@ Boolean _CFBundleGetStringsFilesShared(CFBundleRef bundle);
+ CF_EXPORT
+ CFURLRef _CFBundleCopyFrameworkURLForExecutablePath(CFStringRef executablePath);
+
+-#if (TARGET_OS_MAC && !(TARGET_OS_EMBEDDED || TARGET_OS_IPHONE)) || (TARGET_OS_EMBEDDED || TARGET_OS_IPHONE)
+-#include
+-CF_EXPORT
+-void _CFBundleSetupXPCBootstrap(xpc_object_t bootstrap) CF_AVAILABLE(10_10, 8_0);
+-#endif
+-
+ /* Functions deprecated as SPI */
+
+ CF_EXPORT
diff --git a/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix b/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix
new file mode 100644
index 00000000000..a9d06fc9dbc
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, cctools, appleDerivation }:
+
+appleDerivation {
+ buildInputs = [ cctools ];
+
+ postPatch = ''
+ substituteInPlace makefile \
+ --replace /usr/bin/ "" \
+ --replace '$(ISYSROOT)' "" \
+ --replace 'shell xcodebuild -version -sdk' 'shell true' \
+ --replace 'shell xcrun -sdk $(SDKPATH) -find' 'shell echo' \
+ --replace '-install_name $(libdir)' "-install_name $out/lib/" \
+ --replace /usr/local/bin/ /bin/ \
+ --replace /usr/lib/ /lib/ \
+ '';
+
+ makeFlags = [ "DSTROOT=$(out)" ];
+
+ postInstall = ''
+ mv $out/usr/local/include $out/include
+ '';
+}
diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
index ea5aac60ab9..e3583b3bf84 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
@@ -1,6 +1,6 @@
{ stdenv, appleDerivation, cpio, bootstrap_cmds, xnu, Libc, Libm, libdispatch, cctools, Libinfo,
dyld, Csu, architecture, libclosure, CarbonHeaders, ncurses, CommonCrypto, copyfile,
- removefile, libresolv, Libnotify, libpthread, mDNSResponder, launchd, libutil, version }:
+ removefile, libresolv, Libnotify, libplatform, libpthread, mDNSResponder, launchd, libutil, version }:
appleDerivation rec {
phases = [ "unpackPhase" "installPhase" ];
@@ -19,7 +19,7 @@ appleDerivation rec {
for dep in ${Libc} ${Libm} ${Libinfo} ${dyld} ${architecture} ${libclosure} ${CarbonHeaders} \
${libdispatch} ${ncurses.dev} ${CommonCrypto} ${copyfile} ${removefile} ${libresolv} \
- ${Libnotify} ${mDNSResponder} ${launchd} ${libutil} ${libpthread}; do
+ ${Libnotify} ${libplatform} ${mDNSResponder} ${launchd} ${libutil} ${libpthread}; do
(cd $dep/include && find . -name '*.h' | cpio -pdm $out/include)
done
diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix
index 29a0658d438..a8509d1f009 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix
@@ -30,6 +30,7 @@ let
# is the right one, even though it isn't. The version I have here doesn't appear to be linked
# to any OS releases, but Apple also doesn't mention mDNSResponder from 10.11 to 10.11.6, and
# neither of those versions are publicly available.
+ libplatform = "125";
mDNSResponder = "625.41.2";
libutil = "43";
@@ -47,6 +48,9 @@ let
};
"osx-10.10.5" = {
adv_cmds = "158";
+ CF = "1153.18";
+ ICU = "531.48";
+ libdispatch = "442.1.4";
Security = "57031.40.6";
IOAudioFamily = "203.3";
@@ -66,11 +70,9 @@ let
IOKitUser = "1050.20.2";
};
"osx-10.9.5" = {
- CF = "855.17";
launchd = "842.92.1";
libauto = "185.5";
Libc = "997.90.3"; # We use this, but not from here
- libdispatch = "339.92.1";
Libsystem = "1197.1.1";
Security = "55471.14.18";
security_dotmac_tp = "55107.1";
@@ -189,7 +191,7 @@ let
bootstrap_cmds = applePackage "bootstrap_cmds" "dev-tools-7.0" "1v5dv2q3af1xwj5kz0a5g54fd5dm6j4c9dd2g66n4kc44ixyrhp3" {};
bsdmake = applePackage "bsdmake" "dev-tools-3.2.6" "11a9kkhz5bfgi1i8kpdkis78lhc6b5vxmhd598fcdgra1jw4iac2" {};
CarbonHeaders = applePackage "CarbonHeaders" "osx-10.6.2" "1zam29847cxr6y9rnl76zqmkbac53nx0szmqm9w5p469a6wzjqar" {};
- CF = applePackage "CF" "osx-10.9.5" "1sadmxi9fsvsmdyxvg2133sdzvkzwil5fvyyidxsyk1iyfzqsvln" {};
+ CF = applePackage "CF" "osx-10.10.5" "07f5psjxi7wyd13ci4x83ya5hy6p69sjfqcpp2mmxdlhd8yzkf74" {};
CommonCrypto = applePackage "CommonCrypto" "osx-10.11.6" "0vllfpb8f4f97wj2vpdd7w5k9ibnsbr6ff1zslpp6q323h01n25y" {};
configd = applePackage "configd" "osx-10.8.5" "1gxakahk8gallf16xmhxhprdxkh3prrmzxnmxfvj0slr0939mmr2" {};
copyfile = applePackage "copyfile" "osx-10.11.6" "1rkf3iaxmjz5ycgrmf0g971kh90jb2z1zqxg5vlqz001s4y457gs" {};
@@ -197,6 +199,7 @@ let
dtrace = applePackage "dtrace" "osx-10.11.6" "0pp5x8dgvzmg9vvg32hpy2brm17dpmbwrcr4prsmdmfvd4767wc0" {};
dyld = applePackage "dyld" "osx-10.11.6" "0qkjmjazm2zpgvwqizhandybr9cm3gz9pckx8rmf0py03faafc08" {};
eap8021x = applePackage "eap8021x" "osx-10.11.6" "0iw0qdib59hihyx2275rwq507bq2a06gaj8db4a8z1rkaj1frskh" {};
+ ICU = applePackage "ICU" "osx-10.10.5" "1qihlp42n5g4dl0sn0f9pc0bkxy1452dxzf0vr6y5gqpshlzy03p" {};
IOKit = applePackage "IOKit" "osx-10.11.6" "0kcbrlyxcyirvg5p95hjd9k8a01k161zg0bsfgfhkb90kh2s8x00" { inherit IOKitSrcs; };
launchd = applePackage "launchd" "osx-10.9.5" "0w30hvwqq8j5n90s3qyp0fccxflvrmmjnicjri4i1vd2g196jdgj" {};
libauto = applePackage "libauto" "osx-10.9.5" "17z27yq5d7zfkwr49r7f0vn9pxvj95884sd2k6lq6rfaz9gxqhy3" {};
@@ -208,11 +211,12 @@ let
};
Libc_old = applePackage "Libc/825_40_1.nix" "osx-10.8.5" "0xsx1im52gwlmcrv4lnhhhn9dyk5ci6g27k6yvibn9vj8fzjxwcf" {};
libclosure = applePackage "libclosure" "osx-10.11.6" "1zqy1zvra46cmqv6vsf1mcsz3a76r9bky145phfwh4ab6y15vjpq" {};
- libdispatch = applePackage "libdispatch" "osx-10.9.5" "1lc5033cmkwxy3r26gh9plimxshxfcbgw6i0j7mgjlnpk86iy5bk" {};
+ libdispatch = applePackage "libdispatch" "osx-10.10.5" "0jsfbzp87lwk9snlby0hd4zvj7j894p5q3cw0wdx9ny1mcp3kdcj" {};
libiconv = applePackage "libiconv" "osx-10.11.6" "11h6lfajydri4widis62q8scyz7z8l6msqyx40ly4ahsdlbl0981" {};
Libinfo = applePackage "Libinfo" "osx-10.11.6" "0qjgkd4y8sjvwjzv5wwyzkb61pg8wwg95bkp721dgzv119dqhr8x" {};
Libm = applePackage "Libm" "osx-10.7.4" "02sd82ig2jvvyyfschmb4gpz6psnizri8sh6i982v341x6y4ysl7" {};
Libnotify = applePackage "Libnotify" "osx-10.11.6" "0zbcyxlcfhf91jxczhd5bq9qfgvg494gwwp3l7q5ayb2qdihzr8b" {};
+ libplatform = applePackage "libplatform" "osx-10.11.6" "1v4ik6vlklwsi0xb1g5kmhy29j9xk5m2y8xb9zbi1k4ng8x39czk" {};
libpthread = applePackage "libpthread" "osx-10.11.6" "1kbw738cmr9pa7pz1igmajs307clfq7gv2vm1sqdzhcnnjxbl28w" {};
libresolv = applePackage "libresolv" "osx-10.11.6" "09flfdi3dlzq0yap32sxidacpc4nn4va7z12a6viip21ix2xb2gf" {};
Libsystem = applePackage "Libsystem" "osx-10.11.6" "1nfkmbqml587v2s1d1y2s2v8nmr577jvk51y6vqrfvsrhdhc2w94" {};
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix
index fe65e290717..c80e3757569 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix
@@ -6,8 +6,11 @@ appleDerivation {
installPhase = ''
mkdir -p $out/include/dispatch $out/include/os
- cp -r dispatch/*.h $out/include/dispatch
+ # Move these headers so CF can find
+ mv private/voucher*.h $out/include/os
cp -r private/*.h $out/include/dispatch
+
+ cp -r dispatch/*.h $out/include/dispatch
cp -r os/object*.h $out/include/os
'';
}
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix
new file mode 100644
index 00000000000..65accc870d7
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix
@@ -0,0 +1,10 @@
+{ stdenv, appleDerivation }:
+
+appleDerivation {
+ phases = [ "unpackPhase" "installPhase" ];
+
+ installPhase = ''
+ mkdir $out
+ cp -r include $out/include
+ '';
+}
diff --git a/pkgs/os-specific/linux/autofs/default.nix b/pkgs/os-specific/linux/autofs/default.nix
index a3c08b1b785..698c478aca0 100644
--- a/pkgs/os-specific/linux/autofs/default.nix
+++ b/pkgs/os-specific/linux/autofs/default.nix
@@ -2,14 +2,14 @@
, libxml2, kerberos, kmod, openldap, sssd, cyrus_sasl, openssl }:
let
- version = "5.1.2";
+ version = "5.1.3";
name = "autofs-${version}";
in stdenv.mkDerivation {
inherit name;
src = fetchurl {
url = "mirror://kernel/linux/daemons/autofs/v5/${name}.tar.xz";
- sha256 = "031z64hmbzyllgvi72cw87755vnmafvsfwi0w21xksla10wxxdw8";
+ sha256 = "1gxifa93104pxlmxrikhwciy5zdgk20m63siyhq1myym7vzfnvp9";
};
preConfigure = ''
diff --git a/pkgs/os-specific/linux/cifs-utils/default.nix b/pkgs/os-specific/linux/cifs-utils/default.nix
index f69319b5256..08c6d997795 100644
--- a/pkgs/os-specific/linux/cifs-utils/default.nix
+++ b/pkgs/os-specific/linux/cifs-utils/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "cifs-utils-${version}";
- version = "6.5";
+ version = "6.6";
src = fetchurl {
url = "mirror://samba/pub/linux-cifs/cifs-utils/${name}.tar.bz2";
- sha256 = "1xs9rwqfpx8qj5mcmagw6y1hzwc71zhzb5r8hv06sz16p1w6axz2";
+ sha256 = "09biws1jm23l3mjb9kh99v57z8bgzybrmimwddb40s6y0yl54wfh";
};
buildInputs = [ kerberos keyutils pam talloc ];
diff --git a/pkgs/os-specific/linux/eventstat/default.nix b/pkgs/os-specific/linux/eventstat/default.nix
index de27d7b0d83..cd11a79c8f8 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 35638e7dabd..2c90ff94d4a 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 f8d0eab835b..6a987dc9f5b 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/ixgbevf/default.nix b/pkgs/os-specific/linux/ixgbevf/default.nix
index 1dbc5c74415..96dc0775cec 100644
--- a/pkgs/os-specific/linux/ixgbevf/default.nix
+++ b/pkgs/os-specific/linux/ixgbevf/default.nix
@@ -1,14 +1,12 @@
{ stdenv, fetchurl, kernel, kmod }:
-assert stdenv.lib.versionOlder kernel.version "4.10";
-
stdenv.mkDerivation rec {
name = "ixgbevf-${version}-${kernel.version}";
- version = "4.0.3";
+ version = "4.1.2";
src = fetchurl {
url = "mirror://sourceforge/e1000/ixgbevf-${version}.tar.gz";
- sha256 = "0f95p2d7yhf57qa6fl8nv1rb4x8vwwgh7qhqcqpag0hz19dc3xff";
+ sha256 = "1dismhiq0asf04rv6pv2sk2m3xcy6m3bpk16gmxqybca3xa28a5b";
};
hardeningDisable = [ "pic" ];
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index cd71d563a2f..1dc161cca54 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -238,7 +238,9 @@ with stdenv.lib;
FANOTIFY y
TMPFS y
TMPFS_POSIX_ACL y
- FS_ENCRYPTION? m
+ ${optionalString (versionAtLeast version "4.9") ''
+ FS_ENCRYPTION? m
+ ''}
EXT2_FS_XATTR y
EXT2_FS_POSIX_ACL y
EXT2_FS_SECURITY y
diff --git a/pkgs/os-specific/linux/kernel/linux-4.11.nix b/pkgs/os-specific/linux/kernel/linux-4.11.nix
index a467cc3e156..6680384a03a 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.11.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.11.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
- version = "4.11.2";
+ version = "4.11.3";
extraMeta.branch = "4.11";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "0b32kyjr3bbb2381vg9zd59fk61njhq4r494r0l9gr77m6ar655v";
+ sha256 = "15xgm2hwp3liy400jgndzlf51bxhg1d6sr0qck6qvk8w5karxzav";
};
kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index 820b55a633b..02982fb8055 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
- version = "4.4.69";
+ version = "4.4.70";
extraMeta.branch = "4.4";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "1yl4iwmi1rvnp1q74ypzd737r217c6yi48vnl9kxc9zqm98bqyr0";
+ sha256 = "1yid0y4ha7mrn9ns037kjsrgbqffcz2c2p27rgn92jh4m5nb7a60";
};
kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index 2e6dfa2f026..0f25ff75b5a 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
- version = "4.9.29";
+ version = "4.9.30";
extraMeta.branch = "4.9";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "1kr4zxndwj1bm5zzphbckpy8pqbblyk0j08v2vir7ra4fmvdzdji";
+ sha256 = "1fqbfcfkmbviqkmww9lc3n81ag71hzjwpdcij9y73kg8bh1fywj2";
};
kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index f783828f031..8c8da674f4d 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
- version = "4.12-rc2";
- modDirVersion = "4.12.0-rc2";
+ version = "4.12-rc3";
+ modDirVersion = "4.12.0-rc3";
extraMeta.branch = "4.12";
src = fetchurl {
url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
- sha256 = "18p68ig9irblbxbg68jz766158bxr81824q91mnf372i5z9irj9w";
+ sha256 = "0jwhsmw4igf5iwf4qndqbjzayag2wj2riypzl0v3yrh5zkhfl4dm";
};
features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/libsmbios/default.nix b/pkgs/os-specific/linux/libsmbios/default.nix
index e2b675fb4ff..eaf6d98ba9d 100644
--- a/pkgs/os-specific/linux/libsmbios/default.nix
+++ b/pkgs/os-specific/linux/libsmbios/default.nix
@@ -23,6 +23,9 @@ stdenv.mkDerivation {
cp -va "out/public-include/"* "$out/include/"
'';
+ # Hack to avoid TMPDIR in RPATHs.
+ preFixup = ''rm -rf "$(pwd)" '';
+
meta = {
homepage = "http://linux.dell.com/libsmbios/main";
description = "A library to obtain BIOS information";
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index c117f8f29fa..307c661ddf4 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 a21e6ecfc31..0d19079fe66 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 9a244c6ed8f..04f5bf53f93 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/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index d1042723a71..3092aba506b 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -9,14 +9,14 @@
assert stdenv.isLinux;
stdenv.mkDerivation rec {
- version = "232";
+ version = "233";
name = "systemd-${version}";
src = fetchFromGitHub {
owner = "nixos";
repo = "systemd";
- rev = "66e778e851440fde7f20cff0c24d23538144be8d";
- sha256 = "1valz8v2q4cj0ipz2b6mh5p0rjxpy3m88gg9xa2rcc4gcmscndzk";
+ rev = "a5af87e469ed3bd806d1ac34716d4f17ce9d3464";
+ sha256 = "14slhk9p1f4ngxhhsmk8i1irl6jiffs1ln84ddcqc8iy22cyqvs3";
};
outputs = [ "out" "lib" "man" "dev" ];
diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix
index e69b25c5b94..6cf98daab5b 100644
--- a/pkgs/servers/dns/nsd/default.nix
+++ b/pkgs/servers/dns/nsd/default.nix
@@ -13,13 +13,17 @@
}:
stdenv.mkDerivation rec {
- name = "nsd-4.1.15";
+ name = "nsd-4.1.16";
src = fetchurl {
url = "http://www.nlnetlabs.nl/downloads/nsd/${name}.tar.gz";
- sha256 = "494a862cfcd26a525a4bf06306eb7ab0387b34678ac6d37767507438e3a23a4b";
+ sha256 = "1cmaddfjb7yr87gjd5yv4d0qng0j97sy5rw5m3zxsp6c4fnng0vz";
};
+ prePatch = ''
+ substituteInPlace nsd-control-setup.sh.in --replace openssl ${openssl}/bin/openssl
+ '';
+
buildInputs = [ libevent openssl ];
configureFlags =
diff --git a/pkgs/servers/ftp/pure-ftpd/default.nix b/pkgs/servers/ftp/pure-ftpd/default.nix
index e56669645c3..4e39b78b89e 100644
--- a/pkgs/servers/ftp/pure-ftpd/default.nix
+++ b/pkgs/servers/ftp/pure-ftpd/default.nix
@@ -1,19 +1,22 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, openssl }:
stdenv.mkDerivation rec {
- name = "pure-ftpd-1.0.42";
+ name = "pure-ftpd-1.0.46";
src = fetchurl {
url = "https://download.pureftpd.org/pub/pure-ftpd/releases/${name}.tar.gz";
- sha256 = "1yg7v1l3ng7c08nhh804k28y1f8ccmg0rq1a9l2sg45ib273mrvv";
+ sha256 = "0p0arcaz63fbb03fkavbc8z6m1f90p5vbnxb8mqlvpma6mrq0286";
};
+ buildInputs = [ openssl ];
+
+ configureFlags = [ "--with-tls" ];
+
meta = with stdenv.lib; {
description = "A free, secure, production-quality and standard-conformant FTP server";
homepage = https://www.pureftpd.org;
license = licenses.isc; # with some parts covered by BSD3(?)
maintainers = [ maintainers.lethalman ];
- platforms = platforms.linux;
+ platforms = platforms.unix;
};
-
}
diff --git a/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix b/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix
index 67648f9d4f2..a99f081b24e 100644
--- a/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "mod_auth_mellon-${version}";
- version = "0.12.0";
+ version = "0.13.1";
src = fetchFromGitHub {
owner = "UNINETT";
repo = "mod_auth_mellon";
rev = "v${version}";
- sha256 = "1p6v6vgrfvgvc5y2ygqyyxi0klpm3nxaw3fg35zmpmw663w8skqn";
+ sha256 = "16b43y5a5p8g1287x04rv923230cy8dfs2j18cx6208n4bv4dvnk";
};
patches = [
diff --git a/pkgs/servers/irc/charybdis/default.nix b/pkgs/servers/irc/charybdis/default.nix
index 46e4b755e5c..f63fecb66c8 100644
--- a/pkgs/servers/irc/charybdis/default.nix
+++ b/pkgs/servers/irc/charybdis/default.nix
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
"--enable-ipv6"
"--enable-openssl=${openssl.dev}"
"--with-program-prefix=charybdis-"
+ "--sysconfdir=/etc/charybdis"
];
buildInputs = [ bison flex openssl ];
diff --git a/pkgs/servers/mail/dkimproxy/default.nix b/pkgs/servers/mail/dkimproxy/default.nix
new file mode 100644
index 00000000000..9abf95fb6d6
--- /dev/null
+++ b/pkgs/servers/mail/dkimproxy/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, perl, fetchurl, Error, MailDKIM, MIMEtools, NetServer }:
+
+let
+ pkg = "dkimproxy";
+ version = "1.4.1";
+in
+stdenv.mkDerivation rec {
+ name = "${pkg}-${version}";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/dkimproxy/${name}.tar.gz";
+ sha256 = "1gc5c7lg2qrlck7b0lvjfqr824ch6jkrzkpsn0gjvlzg7hfmld75";
+ };
+
+ # Idea taken from pkgs/development/perl-modules/generic/builder.sh
+ preFixup = ''
+ perlFlags=
+ for i in $(IFS=:; echo $PERL5LIB); do
+ perlFlags="$perlFlags -I$i"
+ done
+ for f in $(ls $out/bin); do
+ sed -i $out/bin/$f -e "s|#\!\(.*/perl.*\)$|#\! \1 $perlFlags|"
+ done
+ '';
+
+ buildInputs = [ perl ];
+ propagatedBuildInputs = [ Error MailDKIM MIMEtools NetServer ];
+
+ meta = with stdenv.lib; {
+ description = "SMTP-proxy that signs and/or verifies emails";
+ homepage = http://dkimproxy.sourceforge.net/;
+ license = licenses.gpl2Plus;
+ maintainers = [ maintainers.ekleog ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/servers/radicale/default.nix b/pkgs/servers/radicale/default.nix
index e49e399194d..f36d19bfb20 100644
--- a/pkgs/servers/radicale/default.nix
+++ b/pkgs/servers/radicale/default.nix
@@ -2,11 +2,11 @@
pythonPackages.buildPythonApplication rec {
name = "radicale-${version}";
- version = "1.1.1";
+ version = "1.1.2";
src = fetchurl {
url = "mirror://pypi/R/Radicale/Radicale-${version}.tar.gz";
- sha256 = "1c5lv8qca21mndkx350wxv34qypqh6gb4rhzms4anr642clq3jg2";
+ sha256 = "1g20p3998f46ywda7swv0py63wjbrhvk0nrafajlbb6wgzxjmqpb";
};
propagatedBuildInputs = stdenv.lib.optionals (!pythonPackages.isPy3k) [
diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix
index 26958e355b3..d7b1c8173dd 100644
--- a/pkgs/servers/samba/4.x.nix
+++ b/pkgs/servers/samba/4.x.nix
@@ -19,11 +19,11 @@ with lib;
stdenv.mkDerivation rec {
name = "samba-${version}";
- version = "4.6.3";
+ version = "4.6.4";
src = fetchurl {
url = "mirror://samba/pub/samba/stable/${name}.tar.gz";
- sha256 = "0q8m9cp76vx0x7zhvbfamqvh8hmmlki8ih9zb2hcn2bqlwyyyf1a";
+ sha256 = "0qcsinhcq3frlqp7bfav5mdc9xn1h4xy4l6vfpf8cmcfs4lp7ija";
};
outputs = [ "out" "dev" "man" ];
diff --git a/pkgs/servers/search/elasticsearch/5.x.nix b/pkgs/servers/search/elasticsearch/5.x.nix
new file mode 100644
index 00000000000..030c4730f38
--- /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 00000000000..6898ffcf1d7
--- /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 00000000000..cee0137312f
--- /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/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix
index 6d29c745697..36d6fc3a62d 100644
--- a/pkgs/servers/uwsgi/default.nix
+++ b/pkgs/servers/uwsgi/default.nix
@@ -49,11 +49,11 @@ in
stdenv.mkDerivation rec {
name = "uwsgi-${version}";
- version = "2.0.14";
+ version = "2.0.15";
src = fetchurl {
url = "http://projects.unbit.it/downloads/${name}.tar.gz";
- sha256 = "11r829j4fyk7y068arqmwbc9dj6lc0n3l6bn6pr5z0vdjbpx3cr1";
+ sha256 = "1zvj28wp3c1hacpd4c6ra5ilwvvfq3l8y6gn8i7mnncpddlzjbjp";
};
nativeBuildInputs = [ python3 pkgconfig ];
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 3e9bc1ba718..452f5081a20 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1010,22 +1010,22 @@ let
}) // {inherit xproto zlib ;};
libpciaccess = (mkDerivation "libpciaccess" {
- name = "libpciaccess-0.13.4";
+ name = "libpciaccess-0.13.5";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/lib/libpciaccess-0.13.4.tar.bz2;
- sha256 = "1krgryi9ngjr66242v0v5mczihgv0y7rrvx0563arr318mjn9y07";
+ url = mirror://xorg/individual/lib/libpciaccess-0.13.5.tar.bz2;
+ sha256 = "16dr80rdw5bzdyhahvilfjrflj7scs2yl2mmghsb84f3nglm8b3m";
};
buildInputs = [pkgconfig zlib ];
meta.platforms = stdenv.lib.platforms.unix;
}) // {inherit zlib ;};
libpthreadstubs = (mkDerivation "libpthreadstubs" {
- name = "libpthread-stubs-0.3";
+ name = "libpthread-stubs-0.4";
builder = ./builder.sh;
src = fetchurl {
- url = http://xcb.freedesktop.org/dist/libpthread-stubs-0.3.tar.bz2;
- sha256 = "16bjv3in19l84hbri41iayvvg4ls9gv1ma0x0qlbmwy67i7dbdim";
+ url = http://xcb.freedesktop.org/dist/libpthread-stubs-0.4.tar.bz2;
+ sha256 = "0cz7s9w8lqgzinicd4g36rjg08zhsbyngh0w68c3np8nlc8mkl74";
};
buildInputs = [pkgconfig ];
meta.platforms = stdenv.lib.platforms.unix;
@@ -1197,11 +1197,11 @@ let
}) // {inherit ;};
sessreg = (mkDerivation "sessreg" {
- name = "sessreg-1.1.0";
+ name = "sessreg-1.1.1";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/app/sessreg-1.1.0.tar.bz2;
- sha256 = "0z013rskwmdadd8cdlxvh4asmgim61qijyzfbqmr1q1mg1jpf4am";
+ url = mirror://xorg/individual/app/sessreg-1.1.1.tar.bz2;
+ sha256 = "1qd66mg2bnppqz4xgdjzif2488zl82vx2c26ld3nb8pnyginm9vq";
};
buildInputs = [pkgconfig xproto ];
meta.platforms = stdenv.lib.platforms.unix;
@@ -1869,11 +1869,11 @@ let
}) // {inherit fontsproto randrproto renderproto videoproto xorgserver xproto ;};
xf86videonouveau = (mkDerivation "xf86videonouveau" {
- name = "xf86-video-nouveau-1.0.14";
+ name = "xf86-video-nouveau-1.0.15";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/driver/xf86-video-nouveau-1.0.14.tar.bz2;
- sha256 = "1h9izq510m2pvg77d0y9krc0cvvbhp2y3xlrrz6id7y47jdzkpsd";
+ url = mirror://xorg/individual/driver/xf86-video-nouveau-1.0.15.tar.bz2;
+ sha256 = "0k0xah72ryjwak4dc4crszxrlkmi9x1s7p3sd4la642n77yi1pmf";
};
buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
meta.platforms = stdenv.lib.platforms.unix;
@@ -2210,11 +2210,11 @@ let
}) // {inherit inputproto libX11 libXext libXi libXinerama libXrandr ;};
xkbcomp = (mkDerivation "xkbcomp" {
- name = "xkbcomp-1.3.1";
+ name = "xkbcomp-1.4.0";
builder = ./builder.sh;
src = fetchurl {
- url = mirror://xorg/individual/app/xkbcomp-1.3.1.tar.bz2;
- sha256 = "0gcjy70ppmcl610z8gxc7sydsx93f8cm8pggm4qhihaa1ngdq103";
+ url = mirror://xorg/individual/app/xkbcomp-1.4.0.tar.bz2;
+ sha256 = "0syfc6zscvai824mzihlnrqxhkcr27dzkpy8zndavi83iischsdw";
};
buildInputs = [pkgconfig libX11 libxkbfile xproto ];
meta.platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list
index 56a7b1f76a9..28b698bdc81 100644
--- a/pkgs/servers/x11/xorg/extra.list
+++ b/pkgs/servers/x11/xorg/extra.list
@@ -1,4 +1,4 @@
-http://xcb.freedesktop.org/dist/libpthread-stubs-0.3.tar.bz2
+http://xcb.freedesktop.org/dist/libpthread-stubs-0.4.tar.bz2
http://xcb.freedesktop.org/dist/libxcb-1.12.tar.bz2
http://xcb.freedesktop.org/dist/xcb-proto-1.12.tar.bz2
http://xcb.freedesktop.org/dist/xcb-util-0.4.0.tar.bz2
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index ee85de75b40..46c07f291ac 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -56,7 +56,7 @@ mirror://xorg/individual/lib/libxshmfence-1.2.tar.bz2
mirror://xorg/individual/lib/libfontenc-1.1.3.tar.bz2
mirror://xorg/individual/lib/libFS-1.0.7.tar.bz2
mirror://xorg/individual/lib/libICE-1.0.9.tar.bz2
-mirror://xorg/individual/lib/libpciaccess-0.13.4.tar.bz2
+mirror://xorg/individual/lib/libpciaccess-0.13.5.tar.bz2
mirror://xorg/individual/lib/libSM-1.2.2.tar.bz2
mirror://xorg/X11R7.7/src/everything/libWindowsWM-1.0.1.tar.bz2
mirror://xorg/individual/lib/libX11-1.6.5.tar.bz2
@@ -96,7 +96,7 @@ mirror://xorg/X11R7.7/src/everything/recordproto-1.14.2.tar.bz2
mirror://xorg/X11R7.7/src/everything/renderproto-0.11.1.tar.bz2
mirror://xorg/X11R7.7/src/everything/resourceproto-1.2.0.tar.bz2
mirror://xorg/X11R7.7/src/everything/scrnsaverproto-1.2.2.tar.bz2
-mirror://xorg/individual/app/sessreg-1.1.0.tar.bz2
+mirror://xorg/individual/app/sessreg-1.1.1.tar.bz2
mirror://xorg/individual/app/setxkbmap-1.3.1.tar.bz2
mirror://xorg/individual/app/smproxy-1.0.6.tar.bz2
mirror://xorg/individual/app/twm-1.0.9.tar.bz2
@@ -131,7 +131,7 @@ mirror://xorg/individual/driver/xf86-video-amdgpu-1.3.0.tar.bz2
mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2
mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2
mirror://xorg/individual/driver/xf86-video-ati-7.9.0.tar.bz2
-mirror://xorg/individual/driver/xf86-video-nouveau-1.0.14.tar.bz2
+mirror://xorg/individual/driver/xf86-video-nouveau-1.0.15.tar.bz2
mirror://xorg/individual/driver/xf86-video-chips-1.2.7.tar.bz2
mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2
mirror://xorg/individual/driver/xf86-video-dummy-0.3.8.tar.bz2
@@ -174,7 +174,7 @@ mirror://xorg/individual/app/xgc-1.0.5.tar.bz2
mirror://xorg/individual/app/xhost-1.0.7.tar.bz2
mirror://xorg/X11R7.7/src/everything/xineramaproto-1.2.1.tar.bz2
mirror://xorg/individual/app/xinput-1.6.2.tar.bz2
-mirror://xorg/individual/app/xkbcomp-1.3.1.tar.bz2
+mirror://xorg/individual/app/xkbcomp-1.4.0.tar.bz2
mirror://xorg/individual/app/xkbevd-1.1.4.tar.bz2
mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2
mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.20.tar.bz2
diff --git a/pkgs/shells/zsh-autosuggestions/default.nix b/pkgs/shells/zsh-autosuggestions/default.nix
index 4071d7bd0f2..fe7ed752f5e 100644
--- a/pkgs/shells/zsh-autosuggestions/default.nix
+++ b/pkgs/shells/zsh-autosuggestions/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "zsh-autosuggestions-${version}";
- version = "0.3.3";
+ version = "0.4.0";
src = fetchFromGitHub {
- repo = "zsh-autosuggestions";
owner = "zsh-users";
+ repo = "zsh-autosuggestions";
rev = "v${version}";
- sha256 = "0mnwyz4byvckrslzqfng5c0cx8ka0y12zcy52kb7amg3l07jrls4";
+ sha256 = "0z6i9wjjklb4lvr7zjhbphibsyx51psv50gm07mbb0kj9058j6kc";
};
buildInputs = [ zsh ];
diff --git a/pkgs/shells/zsh-completions/default.nix b/pkgs/shells/zsh-completions/default.nix
index dc62460441d..a1f70822725 100644
--- a/pkgs/shells/zsh-completions/default.nix
+++ b/pkgs/shells/zsh-completions/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "zsh-completions-${version}";
- version = "0.18.0";
+ version = "0.25.0";
src = fetchFromGitHub {
owner = "zsh-users";
repo = "zsh-completions";
rev = "${version}";
- sha256 = "0iwb1kaidjxaz66kbbdzbydbdlfc6dk21sflzar0zy25jgx1p4xs";
+ sha256 = "0hc56y0fvshzs05acbzxf4q37vqsk4q3zp4c7smh175v56wigy94";
};
installPhase= ''
diff --git a/pkgs/shells/zsh-syntax-highlighting/default.nix b/pkgs/shells/zsh-syntax-highlighting/default.nix
index 792a8875db4..21911c8800c 100644
--- a/pkgs/shells/zsh-syntax-highlighting/default.nix
+++ b/pkgs/shells/zsh-syntax-highlighting/default.nix
@@ -1,25 +1,21 @@
-{ stdenv, fetchurl, zsh }:
+{ stdenv, fetchFromGitHub, zsh }:
# To make use of this derivation, use the `programs.zsh.enableSyntaxHighlighting` option
-let
-
- pkgName = "zsh-syntax-highlighting";
- version = "0.4.1";
-
-in
-
stdenv.mkDerivation rec {
- name = "${pkgName}-${version}";
+ version = "0.5.0";
+ name = "zsh-syntax-highlighting-${version}";
- src = fetchurl {
- url = "https://github.com/zsh-users/${pkgName}/archive/${version}.tar.gz";
- sha256 = "15sih7blqz11d8wdybx38d91vgcq9jg3q0205r26138si0g9q6wp";
+ src = fetchFromGitHub {
+ owner = "zsh-users";
+ repo = "zsh-syntax-highlighting";
+ rev = version;
+ sha256 = "0k0m5aw67lhi4z143sdawx93y1892scvvdfdnjvljb4hf0vzs2ww";
};
buildInputs = [ zsh ];
- installFlags="PREFIX=$(out)";
+ installFlags = "PREFIX=$(out)";
meta = with stdenv.lib; {
description = "Fish shell like syntax highlighting for Zsh";
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 37587e3800d..b9592014b46 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -165,14 +165,14 @@ in rec {
persistent1 = prevStage: self: super: with prevStage; {
inherit
- zlib patchutils m4 scons flex perl bison unifdef unzip openssl icu python
+ zlib patchutils m4 scons flex perl bison unifdef unzip openssl python
libxml2 gettext sharutils gmp libarchive ncurses pkg-config libedit groff
openssh sqlite sed serf openldap db cyrus-sasl expat apr-util subversion xz
findfreetype libssh curl cmake autoconf automake libtool ed cpio coreutils;
darwin = super.darwin // {
inherit (darwin)
- dyld Libsystem xnu configd libdispatch libclosure launchd;
+ dyld Libsystem xnu configd ICU libdispatch libclosure launchd;
};
};
@@ -185,8 +185,8 @@ in rec {
allowedRequisites =
[ bootstrapTools ] ++
- (with pkgs; [ xz.bin xz.out libcxx libcxxabi icu.out ]) ++
- (with pkgs.darwin; [ dyld Libsystem CF locale ]);
+ (with pkgs; [ xz.bin xz.out libcxx libcxxabi ]) ++
+ (with pkgs.darwin; [ dyld Libsystem CF ICU locale ]);
overrides = persistent1 prevStage;
};
@@ -221,8 +221,8 @@ in rec {
allowedRequisites =
[ bootstrapTools ] ++
- (with pkgs; [ xz.bin xz.out icu.out bash libcxx libcxxabi ]) ++
- (with pkgs.darwin; [ dyld Libsystem locale ]);
+ (with pkgs; [ xz.bin xz.out bash libcxx libcxxabi ]) ++
+ (with pkgs.darwin; [ dyld ICU Libsystem locale ]);
overrides = persistent2 prevStage;
};
@@ -256,7 +256,7 @@ in rec {
persistent4 = prevStage: self: super: with prevStage; {
inherit
gnumake gzip gnused bzip2 gawk ed xz patch bash
- libcxxabi libcxx ncurses libffi zlib icu llvm gmp pcre gnugrep
+ libcxxabi libcxx ncurses libffi zlib llvm gmp pcre gnugrep
coreutils findutils diffutils patchutils;
llvmPackages = super.llvmPackages // {
@@ -264,7 +264,7 @@ in rec {
};
darwin = super.darwin // {
- inherit (darwin) dyld Libsystem cctools libiconv;
+ inherit (darwin) dyld ICU Libsystem cctools libiconv;
};
} // lib.optionalAttrs (super.targetPlatform == localSystem) {
# Need to get rid of these when cross-compiling.
@@ -310,13 +310,13 @@ in rec {
};
allowedRequisites = (with pkgs; [
- xz.out xz.bin libcxx libcxxabi icu.out gmp.out gnumake findutils bzip2.out
+ xz.out xz.bin libcxx libcxxabi gmp.out gnumake findutils bzip2.out
bzip2.bin llvmPackages.llvm llvmPackages.llvm.lib zlib.out zlib.dev libffi.out coreutils ed diffutils gnutar
gzip ncurses.out ncurses.dev ncurses.man gnused bash gawk
- gnugrep llvmPackages.clang-unwrapped patch pcre.out binutils-raw.out
+ gnugrep llvmPackages.clang-unwrapped llvmPackages.clang-unwrapped.man patch pcre.out binutils-raw.out
binutils-raw.dev binutils gettext
]) ++ (with pkgs.darwin; [
- dyld Libsystem CF cctools libiconv locale
+ dyld Libsystem CF cctools ICU libiconv locale
]);
overrides = self: super:
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index ceca0432f3e..8b85c5372fd 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -103,6 +103,11 @@ let
../../build-support/setup-hooks/compress-man-pages.sh
../../build-support/setup-hooks/strip.sh
../../build-support/setup-hooks/patch-shebangs.sh
+ ]
+ # FIXME this on Darwin; see
+ # https://github.com/NixOS/nixpkgs/commit/94d164dd7#commitcomment-22030369
+ ++ lib.optional result.isLinux ../../build-support/setup-hooks/audit-tmpdir.sh
+ ++ [
../../build-support/setup-hooks/multiple-outputs.sh
../../build-support/setup-hooks/move-sbin.sh
../../build-support/setup-hooks/move-lib64.sh
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index de33ab56598..eb63b18e5f3 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -199,6 +199,18 @@ isELF() {
if [[ "$magic" =~ ELF ]]; then return 0; else return 1; fi
}
+# Return success if the specified file is a script (i.e. starts with
+# "#!").
+isScript() {
+ local fn="$1"
+ local magic
+ if ! [ -x /bin/sh ]; then return 0; fi
+ exec {fd}< "$fn"
+ read -n 2 -u $fd magic
+ exec {fd}<&-
+ if [[ "$magic" =~ \#! ]]; then return 0; else return 1; fi
+}
+
######################################################################
# Initialisation.
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
index 50fd563e7c2..0378891b27a 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
@@ -6,91 +6,19 @@ let
lib = import ../../../lib;
pkgsFun = import ../../..;
- sheevaplugCrossSystem = {
- crossSystem = rec {
- config = "arm-linux-gnueabi";
- bigEndian = false;
- arch = "armv5te";
- float = "soft";
- withTLS = true;
- libc = "glibc";
- platform = lib.systems.platforms.sheevaplug;
- openssl.system = "linux-generic32";
- inherit (platform) gcc;
- };
- };
-
- raspberrypiCrossSystem = {
- crossSystem = rec {
- config = "arm-linux-gnueabihf";
- bigEndian = false;
- arch = "armv6";
- float = "hard";
- fpu = "vfp";
- withTLS = true;
- libc = "glibc";
- platform = lib.systems.platforms.raspberrypi;
- openssl.system = "linux-generic32";
- inherit (platform) gcc;
- };
- };
-
- armv7l-hf-multiplatform-crossSystem = {
- crossSystem = rec {
- config = "arm-linux-gnueabihf";
- bigEndian = false;
- arch = "armv7-a";
- float = "hard";
- fpu = "vfpv3-d16";
- withTLS = true;
- libc = "glibc";
- platform = lib.systems.platforms.armv7l-hf-multiplatform;
- openssl.system = "linux-generic32";
- inherit (platform) gcc;
- };
- };
-
- aarch64-multiplatform-crossSystem = {
- crossSystem = rec {
- config = "aarch64-linux-gnu";
- bigEndian = false;
- arch = "aarch64";
- withTLS = true;
- libc = "glibc";
- platform = lib.systems.platforms.aarch64-multiplatform;
- inherit (platform) gcc;
- };
- };
-
- scaleway-c1-crossSystem.crossSystem = armv7l-hf-multiplatform-crossSystem.crossSystem // rec {
- platform = lib.systems.platforms.scaleway-c1;
- inherit (platform) gcc;
- inherit (gcc) fpu;
- };
-
- pogoplug4-crossSystem.crossSystem = {
- arch = "armv5tel";
- config = "armv5tel-softfloat-linux-gnueabi";
- float = "soft";
-
- platform = lib.systems.platforms.pogoplug4;
-
- inherit (lib.systems.platforms.pogoplug4) gcc;
- libc = "glibc";
-
- withTLS = true;
- openssl.system = "linux-generic32";
- };
+ inherit (lib.systems.examples)
+ sheevaplug raspberryPi armv7l-hf-multiplatform
+ aarch64-multiplatform scaleway-c1 pogoplug4;
selectedCrossSystem =
- if toolsArch == "armv5tel" then sheevaplugCrossSystem else
- if toolsArch == "scaleway" then scaleway-c1-crossSystem else
- if toolsArch == "pogoplug4" then pogoplug4-crossSystem else
- if toolsArch == "armv6l" then raspberrypiCrossSystem else
- if toolsArch == "armv7l" then armv7l-hf-multiplatform-crossSystem else
- if toolsArch == "aarch64" then aarch64-multiplatform-crossSystem else null;
+ if toolsArch == "armv5tel" then sheevaplug else
+ if toolsArch == "scaleway" then scaleway-c1 else
+ if toolsArch == "pogoplug4" then pogoplug4 else
+ if toolsArch == "armv6l" then raspberryPi else
+ if toolsArch == "armv7l" then armv7l-hf-multiplatform else
+ if toolsArch == "aarch64" then aarch64-multiplatform else null;
- pkgs = pkgsFun ({inherit system;} // selectedCrossSystem);
+ pkgs = pkgsFun ({ inherit system; crossSystem = selectedCrossSystem; });
glibc = pkgs.libcCross;
bash = pkgs.bash;
diff --git a/pkgs/tools/admin/daemontools/default.nix b/pkgs/tools/admin/daemontools/default.nix
index 5594368b04f..7e8c1bccc3e 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 00000000000..9b784e7ca11
--- /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/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix
index 40647f73379..cba686f9c4c 100644
--- a/pkgs/tools/admin/lxd/default.nix
+++ b/pkgs/tools/admin/lxd/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "lxd-${version}";
- version = "2.0.2";
+ version = "2.12";
rev = "lxd-${version}";
goPackagePath = "github.com/lxc/lxd";
@@ -11,7 +11,7 @@ buildGoPackage rec {
inherit rev;
owner = "lxc";
repo = "lxd";
- sha256 = "1rs9g1snjymg6pjz5bj77zk5wbs0w8xmrfxzqs32w6zr1dxhf9hs";
+ sha256 = "1znqsf6iky21kddvl13bf0lsj65czabwysdbvha24lm16s51mv0p";
};
goDeps = ./deps.nix;
diff --git a/pkgs/tools/admin/lxd/deps.nix b/pkgs/tools/admin/lxd/deps.nix
index 7325100bb3a..e0f591a23d1 100644
--- a/pkgs/tools/admin/lxd/deps.nix
+++ b/pkgs/tools/admin/lxd/deps.nix
@@ -1,20 +1,12 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.0
[
{
- goPackagePath = "gopkg.in/yaml.v2";
+ goPackagePath = "github.com/dustinkirkland/golang-petname";
fetch = {
type = "git";
- url = "https://gopkg.in/yaml.v2";
- rev = "a83829b6f1293c91addabc89d0571c246397bbf4";
- sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh";
- };
- }
- {
- goPackagePath = "golang.org/x/crypto";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/crypto";
- rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6";
- sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa";
+ url = "https://github.com/dustinkirkland/golang-petname";
+ rev = "4f77bdee0b67a08d17afadc0d5a4a3d1cb7d8d14";
+ sha256 = "1cizm3xywsp9vc381k02dhjq5a6c772wc05w60m4gfdmp2kmd4di";
};
}
{
@@ -22,44 +14,8 @@
fetch = {
type = "git";
url = "https://github.com/golang/protobuf";
- rev = "59b73b37c1e45995477aae817e4a653c89a858db";
- sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa";
- };
- }
- {
- goPackagePath = "gopkg.in/tomb.v2";
- fetch = {
- type = "git";
- url = "https://gopkg.in/tomb.v2";
- rev = "14b3d72120e8d10ea6e6b7f87f7175734b1faab8";
- sha256 = "1nza31jvkpka5431c4bdbirvjdy36b1b55sbzljqhqih25jrcjx5";
- };
- }
- {
- goPackagePath = "github.com/gorilla/websocket";
- fetch = {
- type = "git";
- url = "https://github.com/gorilla/websocket";
- rev = "a622679ebd7a3b813862379232f645f8e690e43f";
- sha256 = "1nc9jbcmgya1i6dmf6sbcqsnxi9hbjg6dz1z0k7zmc6xdwlq0y4q";
- };
- }
- {
- goPackagePath = "github.com/syndtr/gocapability";
- fetch = {
- type = "git";
- url = "https://github.com/syndtr/gocapability";
- rev = "2c00daeb6c3b45114c80ac44119e7b8801fdd852";
- sha256 = "1x7jdcg2r5pakjf20q7bdiidfmv7vcjiyg682186rkp2wz0yws0l";
- };
- }
- {
- goPackagePath = "gopkg.in/inconshreveable/log15.v2";
- fetch = {
- type = "git";
- url = "https://gopkg.in/inconshreveable/log15.v2";
- rev = "b105bd37f74e5d9dc7b6ad7806715c7a2b83fd3f";
- sha256 = "18rldvi60i7b3lljfrsqgcc24gdkw2pcixxydznyggaqhh96l6a8";
+ rev = "2bba0603135d7d7f5cb73b2125beeda19c09f4ef";
+ sha256 = "1xy0bj66qks2xlzxzlfma16w7m8g6rrwawmlhlv68bcw2k5hvvib";
};
}
{
@@ -67,8 +23,35 @@
fetch = {
type = "git";
url = "https://github.com/gorilla/mux";
- rev = "8096f47503459bcc74d1f4c487b7e6e42e5746b5";
- sha256 = "0163fm9jsh54df471mx9kfhdg0070klqhw9ja0qwdzqibxq791b9";
+ rev = "599cba5e7b6137d46ddf58fb1765f5d928e69604";
+ sha256 = "0wd6jjii1kg5s0nk3ri6gqriz6hbd6bbcn6x4jf8n7ncrb8qsxyz";
+ };
+ }
+ {
+ goPackagePath = "github.com/gorilla/websocket";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gorilla/websocket";
+ rev = "a91eba7f97777409bc2c443f5534d41dd20c5720";
+ sha256 = "13cg6wwkk2ddqbm0nh9fpx4mq7f6qym12ch4lvs53n028ycdgw87";
+ };
+ }
+ {
+ goPackagePath = "github.com/mattn/go-colorable";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mattn/go-colorable";
+ rev = "ded68f7a9561c023e790de24279db7ebf473ea80";
+ sha256 = "0q019h59jq815jfl9rgk4yrpkn5rpcx9s6dksdm48rp1abafwvfc";
+ };
+ }
+ {
+ goPackagePath = "github.com/mattn/go-sqlite3";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mattn/go-sqlite3";
+ rev = "cf7286f069c3ef596efcc87781a4653a2e7607bd";
+ sha256 = "19ipf6bf1xd7w2fm8dnv5my4jp3lhwhlrhfwhwq559amp1h4nwyq";
};
}
{
@@ -76,8 +59,35 @@
fetch = {
type = "git";
url = "https://github.com/pborman/uuid";
- rev = "ca53cad383cad2479bbba7f7a1a05797ec1386e4";
- sha256 = "0rcx669bbjkkwdlw81spnra4ffgzd4rbpywnrj3w41m9vq6mk1gn";
+ rev = "1b00554d822231195d1babd97ff4a781231955c9";
+ sha256 = "0rjkcf85sagdwzsycj1bbjyx5bgmrc1i8l5qf1f44z24rhbbkaan";
+ };
+ }
+ {
+ goPackagePath = "github.com/syndtr/gocapability";
+ fetch = {
+ type = "git";
+ url = "https://github.com/syndtr/gocapability";
+ rev = "e7cb7fa329f456b3855136a2642b197bad7366ba";
+ sha256 = "1i65kyjhbaya45zj9zqkb17plbqf92sfvl9fcz9s9qslg0qab2i1";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/crypto";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/crypto";
+ rev = "3543873453996aaab2fc6b3928a35fc5ca2b5afb";
+ sha256 = "1d7pjqzh5893mzkz60bv5ypmr9zgyvb9z2gvcjrsqniwcqlhbk2c";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/net";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/net";
+ rev = "da118f7b8e5954f39d0d2130ab35d4bf0e3cb344";
+ sha256 = "09xpndqc6a2r0lw42cyl1pkhfddl01sd9c3qqjjwp3vmxm004whv";
};
}
{
@@ -90,21 +100,12 @@
};
}
{
- goPackagePath = "github.com/olekukonko/tablewriter";
+ goPackagePath = "gopkg.in/inconshreveable/log15.v2";
fetch = {
type = "git";
- url = "https://github.com/olekukonko/tablewriter";
- rev = "cca8bbc0798408af109aaaa239cbd2634846b340";
- sha256 = "0f9ph3z7lh6p6gihbl1461j9yq5qiaqxr9mzdkp512n18v89ml48";
- };
- }
- {
- goPackagePath = "github.com/mattn/go-sqlite3";
- fetch = {
- type = "git";
- url = "https://github.com/mattn/go-sqlite3";
- rev = "b4142c444a8941d0d92b0b7103a24df9cd815e42";
- sha256 = "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla";
+ url = "https://gopkg.in/inconshreveable/log15.v2";
+ rev = "b105bd37f74e5d9dc7b6ad7806715c7a2b83fd3f";
+ sha256 = "18rldvi60i7b3lljfrsqgcc24gdkw2pcixxydznyggaqhh96l6a8";
};
}
{
@@ -112,62 +113,53 @@
fetch = {
type = "git";
url = "https://gopkg.in/lxc/go-lxc.v2";
- rev = "8f9e220b36393c03854c2d224c5a55644b13e205";
- sha256 = "1dc1n2561k3pxbm2zzh3qwlh30bcb2k9v22ghvr7ps2j9lmhs0ip";
+ rev = "8304875cc3423823032ec93556beee076c6ba687";
+ sha256 = "12vrx9ilxkl1nxc5k81c6b2a1i715843r23fra681digdjnd8bpk";
};
}
{
- goPackagePath = "github.com/mattn/go-runewidth";
+ goPackagePath = "gopkg.in/tomb.v2";
fetch = {
type = "git";
- url = "https://github.com/mattn/go-runewidth";
- rev = "d6bea18f789704b5f83375793155289da36a3c7f";
- sha256 = "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs";
+ url = "https://gopkg.in/tomb.v2";
+ rev = "d5d1b5820637886def9eef33e03a27a9f166942c";
+ sha256 = "1sv15sri99szkdz1bkh0ir46w9n8prrwx5hfai13nrhkawfyfy10";
};
}
{
- goPackagePath = "github.com/coreos/go-systemd";
+ goPackagePath = "gopkg.in/yaml.v2";
fetch = {
type = "git";
- url = "https://github.com/coreos/go-systemd";
- rev = "a606a1e936df81b70d85448221c7b1c6d8a74ef1";
- sha256 = "0fhan564swp982dnzzspb6jzfdl453489c0qavh65g3shy5x8x28";
+ url = "https://gopkg.in/yaml.v2";
+ rev = "cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b";
+ sha256 = "1hj2ag9knxflpjibck0n90jrhsrqz7qvad4qnif7jddyapi9bqzl";
};
}
{
- goPackagePath = "github.com/dustinkirkland/golang-petname";
- fetch = {
- type = "git";
- url = "https://github.com/dustinkirkland/golang-petname";
- rev = "2182cecef7f257230fc998bc351a08a5505f5e6c";
- sha256 = "1xagj34y5rxl7rykhil8iqxlls9rbgcxgdvgfp7kg39pinw83arl";
- };
+ goPackagePath = "github.com/gosexy/gettext";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gosexy/gettext";
+ rev = "74466a0a0c4a62fea38f44aa161d4bbfbe79dd6b";
+ sha256 = "0asphx8nd7zmp88wk6aakk5292np7yw73akvfdvlvs9q5r5ahkgi";
+ };
}
{
- goPackagePath = "github.com/gorilla/context";
- fetch = {
- type = "git";
- url = "https://github.com/gorilla/context";
- rev = "215affda49addc4c8ef7e2534915df2c8c35c6cd";
- sha256 = "1ybvjknncyx1f112mv28870n0l7yrymsr0861vzw10gc4yn1h97g";
- };
+ goPackagePath = "github.com/olekukonko/tablewriter";
+ fetch = {
+ type = "git";
+ url = "https://github.com/olekukonko/tablewriter";
+ rev = "febf2d34b54a69ce7530036c7503b1c9fbfdf0bb";
+ sha256 = "1ir7bs4m5rk8v9vpycjj7mn6sc6j9wvxkd63i9b6fmrdsx9q0x4g";
+ };
}
{
- goPackagePath = "github.com/mattn/go-colorable";
- fetch = {
- type = "git";
- url = "https://github.com/mattn/go-colorable";
- rev = "3dac7b4f76f6e17fb39b768b89e3783d16e237fe";
- sha256 = "08680mba8hh2rghymqbzd4m40r9k765w5kbzvrif9ngd6h85qnw6";
- };
- }
- {
- goPackagePath = "github.com/gosexy/gettext";
- fetch = {
- type = "git";
- url = "https://github.com/gosexy/gettext";
- rev = "305f360aee30243660f32600b87c3c1eaa947187";
- sha256 = "0sm7ziv56ms0lrk30ipbl6i17azar3a44dd2xvr011442zs5ym09";
- };
+ goPackagePath = "github.com/mattn/go-runewidth";
+ fetch = {
+ type = "git";
+ url = "https://github.com/mattn/go-runewidth";
+ rev = "14207d285c6c197daabb5c9793d63e7af9ab2d50";
+ sha256 = "0y6yq9zd4kh7fimnc00r3h9pr2pwa5j85b3jcn5dyfamsnm2xdsv";
+ };
}
]
diff --git a/pkgs/tools/audio/pnmixer/default.nix b/pkgs/tools/audio/pnmixer/default.nix
index 9827cc47243..385021b7354 100644
--- a/pkgs/tools/audio/pnmixer/default.nix
+++ b/pkgs/tools/audio/pnmixer/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "pnmixer-${version}";
- version = "0.7.1-rc1";
+ version = "0.7.1";
src = fetchFromGitHub {
owner = "nicklan";
repo = "pnmixer";
rev = "v${version}";
- sha256 = "0ns7s1jsc7fc3fvs9m3xwbv1fk1410cqc5w1cmia1mlzy94r3r6p";
+ sha256 = "0mmrq4m2rk0wmkfmqs3fk2rnw5g5lvd7ill2s3d7ggf9vba1pcn2";
};
nativeBuildInputs = [ cmake pkgconfig gettext ];
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = https://github.com/nicklan/pnmixer;
- description = "ALSA mixer for the system tray";
+ description = "ALSA volume mixer for the system tray";
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ campadrenalin romildo ];
diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix
index b816aac99a1..742c1cafc93 100644
--- a/pkgs/tools/backup/restic/default.nix
+++ b/pkgs/tools/backup/restic/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "restic-${version}";
- version = "0.5.0";
+ version = "0.6.1";
goPackagePath = "github.com/restic/restic";
@@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "restic";
repo = "restic";
rev = "v${version}";
- sha256 = "0dj6zg4b00pwgs6nj7w5s0jxm6cfavd9kdcq0z4spypwdf211cgl";
+ sha256 = "1rp4s1gh07j06457rhl4r0qnxqn0h7n4i8k50akdr87nwyikkn17";
};
buildPhase = ''
@@ -28,5 +28,6 @@ buildGoPackage rec {
description = "A backup program that is fast, efficient and secure";
platforms = platforms.linux;
license = licenses.bsd2;
+ maintainers = [ maintainers.mbrgm ];
};
}
diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix
index 0c298aa1f21..db0c2c26d3c 100644
--- a/pkgs/tools/bluetooth/blueman/default.nix
+++ b/pkgs/tools/bluetooth/blueman/default.nix
@@ -33,7 +33,8 @@ in stdenv.mkDerivation rec {
preFixup = ''
makeWrapperArgs="--prefix PATH ':' ${binPath}"
- wrapPythonPrograms
+ wrapPythonProgramsIn "$out/bin" "$pythonPath"
+ wrapPythonProgramsIn "$out/libexec" "$pythonPath"
'';
meta = with lib; {
diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix
index 4689207e835..60e49486454 100644
--- a/pkgs/tools/filesystems/glusterfs/default.nix
+++ b/pkgs/tools/filesystems/glusterfs/default.nix
@@ -1,32 +1,87 @@
{stdenv, fetchurl, fuse, bison, flex_2_5_35, openssl, python2, ncurses, readline,
- autoconf, automake, libtool, pkgconfig, zlib, libaio, libxml2, acl, sqlite
- , liburcu, attr, makeWrapper, coreutils, gnused, gnugrep, which
+ autoconf, automake, libtool, pkgconfig, zlib, libaio, libxml2, acl, sqlite,
+ liburcu, attr, makeWrapper, coreutils, gnused, gnugrep, which, python2Packages,
+ openssh, gawk, findutils, utillinux, lvm2, btrfs-progs, e2fsprogs, xfsprogs, systemd,
+ rsync, glibc
}:
-let
+let
s =
rec {
baseName="glusterfs";
- version = "3.10.1";
+ # NOTE: On each glusterfs release, it should be checked if gluster added
+ # new, or changed, Python scripts whose PYTHONPATH has to be set in
+ # `postFixup` below, and whose runtime deps need to go into
+ # `nativeBuildInputs`.
+ # The command
+ # find /nix/store/...-glusterfs-.../ -name '*.py' -executable
+ # can help with finding new Python scripts.
+ version = "3.10.2";
name="${baseName}-${version}";
- url="http://download.gluster.org/pub/gluster/glusterfs/3.10/${version}/glusterfs-${version}.tar.gz";
- sha256 = "05qmn85lg3d1gz0fhn1v2z7nwl2qwbflvjc8nvkfyr4r57rkvhnk";
+ url="https://github.com/gluster/glusterfs/archive/v${version}.tar.gz";
+ sha256 = "09hpvw42sc77nc3bfv7395wjn7fxvp0n8qnmrlyxq83hf0w81gfs";
};
buildInputs = [
- fuse bison flex_2_5_35 openssl python2 ncurses readline
+ fuse bison flex_2_5_35 openssl ncurses readline
autoconf automake libtool pkgconfig zlib libaio libxml2
acl sqlite liburcu attr makeWrapper
+ (python2.withPackages (pkgs: [
+ pkgs.flask
+ pkgs.prettytable
+ pkgs.requests
+ pkgs.xattr
+ ]))
+ # NOTE: `python2` has to be *AFTER* the above `python2.withPackages`,
+ # to ensure that the packages are available but the `toPythonPath`
+ # shell function used in `postFixup` is also still available.
+ python2
];
# Some of the headers reference acl
propagatedBuildInputs = [
acl
];
+ # Packages from which GlusterFS calls binaries at run-time from PATH,
+ # with comments on which commands are known to be called by it.
+ runtimePATHdeps = [
+ attr # getfattr setfattr
+ btrfs-progs # btrfs
+ coreutils # lots of commands in bash scripts
+ e2fsprogs # tune2fs
+ findutils # find
+ gawk # awk
+ glibc # getent
+ gnugrep # grep
+ gnused # sed
+ lvm2 # lvs
+ openssh # ssh
+ rsync # rsync, e.g. for geo-replication
+ systemd # systemctl
+ utillinux # mount umount
+ which # which
+ xfsprogs # xfs_info
+ ];
in
stdenv.mkDerivation
rec {
inherit (s) name version;
inherit buildInputs propagatedBuildInputs;
- preConfigure = ''
+ patches = [
+ ./glusterfs-use-PATH-instead-of-hardcodes.patch
+ ./glusterfs-fix-unsubstituted-autoconf-macros.patch
+ ./glusterfs-python-remove-find_library.patch
+ ];
+
+ # Note that the VERSION file is something that is present in release tarballs
+ # but not in git tags (at least not as of writing in v3.10.1).
+ # That's why we have to create it.
+ # Without this, gluster (at least 3.10.1) will fail very late and cryptically,
+ # for example when setting up geo-replication, with a message like
+ # Staging of operation 'Volume Geo-replication Create' failed on localhost : Unable to fetch master volume details. Please check the master cluster and master volume.
+ # What happens here is that the gverify.sh script tries to compare the versions,
+ # but fails when the version is empty.
+ # See upstream GlusterFS bug https://bugzilla.redhat.com/show_bug.cgi?id=1452705
+ preConfigure = ''
+ echo "v${s.version}" > VERSION
./autogen.sh
'';
@@ -36,18 +91,78 @@ rec {
makeFlags = "DESTDIR=$(out)";
- preInstall = ''
- substituteInPlace api/examples/Makefile --replace '$(DESTDIR)' $out
- substituteInPlace geo-replication/syncdaemon/Makefile --replace '$(DESTDIR)' $out
- substituteInPlace geo-replication/syncdaemon/Makefile --replace '$(DESTDIR)' $out
- substituteInPlace xlators/features/glupy/examples/Makefile --replace '$(DESTDIR)' $out
- substituteInPlace xlators/features/glupy/src/Makefile --replace '$(DESTDIR)' $out
- '';
+ enableParallelBuilding = true;
postInstall = ''
cp -r $out/$out/* $out
rm -r $out/nix
- wrapProgram $out/sbin/mount.glusterfs --set PATH "${stdenv.lib.makeBinPath [ coreutils gnused attr gnugrep which]}"
+ '';
+
+ postFixup = ''
+ # glusterd invokes `gluster` and other utilities when telling other glusterd nodes to run commands.
+ # For example for `peer_georep-sshkey` key generation, so `$out/bin` is needed in the PATH.
+ # It also invokes bash scripts like `gverify.sh`.
+ # It also invokes executable Python scripts in `$out/libexec/glusterfs`, which is why we set up PYTHONPATH accordingly.
+ # We set up the paths for the main entry point executables.
+
+ GLUSTER_PATH="${stdenv.lib.makeBinPath runtimePATHdeps}:$out/bin"
+ GLUSTER_PYTHONPATH="$(toPythonPath $out):$out/libexec/glusterfs"
+ GLUSTER_LD_LIBRARY_PATH="$out/lib"
+
+ wrapProgram $out/bin/glusterd --set PATH "$GLUSTER_PATH" --set PYTHONPATH "$GLUSTER_PYTHONPATH" --set LD_LIBRARY_PATH "$GLUSTER_LD_LIBRARY_PATH"
+ wrapProgram $out/bin/gluster --set PATH "$GLUSTER_PATH" --set PYTHONPATH "$GLUSTER_PYTHONPATH" --set LD_LIBRARY_PATH "$GLUSTER_LD_LIBRARY_PATH"
+ wrapProgram $out/sbin/mount.glusterfs --set PATH "$GLUSTER_PATH" --set PYTHONPATH "$GLUSTER_PYTHONPATH" --set LD_LIBRARY_PATH "$GLUSTER_LD_LIBRARY_PATH"
+
+ # Set Python environment for the Python based utilities.
+ # It would be nice if there was a better way to do this, automatically for all of them.
+ # Also, this is brittle: If we forget a dependency or gluster adds a new one, things will break deep inside gluster.
+ # We should better try to get an explicit list of Python dependencies from gluster and ensure all of them are in the PYTHONPATH of all these python scripts.
+ # But at the time of writing (gluster 3.10), gluster only provides this in form of a gluster.spec file for RPM creation,
+ # and even that one is not complete (for example it doesn't mention the `flask` dependency).
+
+ wrapProgram $out/bin/gluster-eventsapi --set PATH "$GLUSTER_PATH" --set PYTHONPATH "$GLUSTER_PYTHONPATH" --set LD_LIBRARY_PATH "$GLUSTER_LD_LIBRARY_PATH"
+ wrapProgram $out/bin/gluster-georep-sshkey --set PATH "$GLUSTER_PATH" --set PYTHONPATH "$GLUSTER_PYTHONPATH" --set LD_LIBRARY_PATH "$GLUSTER_LD_LIBRARY_PATH"
+ wrapProgram $out/bin/gluster-mountbroker --set PATH "$GLUSTER_PATH" --set PYTHONPATH "$GLUSTER_PYTHONPATH" --set LD_LIBRARY_PATH "$GLUSTER_LD_LIBRARY_PATH"
+ wrapProgram $out/bin/glusterfind --set PATH "$GLUSTER_PATH" --set PYTHONPATH "$GLUSTER_PYTHONPATH" --set LD_LIBRARY_PATH "$GLUSTER_LD_LIBRARY_PATH"
+
+ # Note that we only wrap the symlinks in $out/bin, not the actual executable scripts in $out/libexec/glusterfs.
+ # This is because those scripts use `__file__` in their program logic
+ # (see https://github.com/gluster/glusterfs/blob/v3.10.1/extras/cliutils/cliutils.py#L116)
+ # which would break if we changed the file name (which is what `wrapProgram` does).
+ # Luckily, `libexec` scripts are never supposed to be invoked straight from PATH,
+ # instead they are invoked directly from `gluster` or `glusterd`, which is why it is
+ # sufficient to set PYTHONPATH for those executables.
+
+ wrapProgram $out/share/glusterfs/scripts/eventsdash.py --set PATH "$GLUSTER_PATH" --set PYTHONPATH "$GLUSTER_PYTHONPATH" --set LD_LIBRARY_PATH "$GLUSTER_LD_LIBRARY_PATH"
+ '';
+
+ doInstallCheck = true;
+
+ # Below we run Python programs. That generates .pyc/.pyo files.
+ # By default they are indeterministic because such files contain time stamps
+ # (see https://nedbatchelder.com/blog/200804/the_structure_of_pyc_files.html).
+ # So we use the same environment variables as in
+ # https://github.com/NixOS/nixpkgs/blob/249b34aadca7038207492f29142a3456d0cecec3/pkgs/development/interpreters/python/mk-python-derivation.nix#L61
+ # to make these files deterministic.
+ # A general solution to this problem might be brought by #25707.
+ DETERMINISTIC_BUILD = 1;
+ PYTHONHASHSEED = 0;
+
+ installCheckPhase = ''
+ # Tests that the above programs work without import errors.
+ # For testing it manually in a shell you may want to substitute `$out` with `$(dirname $(readlink -f $(which gluster)))/../`.
+ $out/bin/glusterd --help
+ # $out/bin/gluster help # can't do this because even `gluster help` tries to write to `/var/log/glusterfs/cli.log`
+ $out/bin/gluster-eventsapi --help
+ $out/bin/gluster-georep-sshkey --help
+ $out/bin/gluster-mountbroker --help
+ $out/bin/glusterfind --help
+ # gfid_to_path.py doesn't accept --help, and it requires different arguments
+ # (a dir as single argument) than the usage prints when stdin is not a TTY.
+ # The `echo ""` is just so that stdin is not a TTY even if you try this line
+ # on a real TTY for testing purposes.
+ echo "" | (mkdir -p nix-test-dir-for-gfid_to_path && touch b && $out/libexec/glusterfs/gfind_missing_files/gfid_to_path.py nix-test-dir-for-gfid_to_path)
+ $out/share/glusterfs/scripts/eventsdash.py --help
'';
src = fetchurl {
@@ -60,7 +175,7 @@ rec {
maintainers = [
stdenv.lib.maintainers.raskin
];
- platforms = with stdenv.lib.platforms;
+ platforms = with stdenv.lib.platforms;
linux ++ freebsd;
};
}
diff --git a/pkgs/tools/filesystems/glusterfs/glusterfs-fix-unsubstituted-autoconf-macros.patch b/pkgs/tools/filesystems/glusterfs/glusterfs-fix-unsubstituted-autoconf-macros.patch
new file mode 100644
index 00000000000..de3c2fa9f62
--- /dev/null
+++ b/pkgs/tools/filesystems/glusterfs/glusterfs-fix-unsubstituted-autoconf-macros.patch
@@ -0,0 +1,236 @@
+From b37e0222a6a60505868a6fbb8591608cdc4bba57 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?=
+Date: Sat, 13 May 2017 15:33:27 +0200
+Subject: [PATCH] Revert "build/packaging: Debian and Ubuntu don't have
+ /usr/libexec". Fixes #1450588
+
+This reverts commit 18509e436f8a728ef522f3e76e2f2dc30e1bd8ac.
+
+This fixes autoconf unsubstituted strings to appear in generated source code.
+---
+ cli/src/Makefile.am | 2 +-
+ configure.ac | 12 ++++++------
+ events/src/Makefile.am | 8 ++++----
+ extras/Makefile.am | 2 +-
+ geo-replication/src/Makefile.am | 8 ++++----
+ geo-replication/syncdaemon/Makefile.am | 2 +-
+ tools/gfind_missing_files/Makefile.am | 4 ++--
+ tools/glusterfind/Makefile.am | 4 ++--
+ tools/glusterfind/src/Makefile.am | 2 +-
+ xlators/features/ganesha/src/Makefile.am | 2 +-
+ xlators/mgmt/glusterd/src/Makefile.am | 2 +-
+ 11 files changed, 24 insertions(+), 24 deletions(-)
+
+diff --git a/cli/src/Makefile.am b/cli/src/Makefile.am
+index 5ef9389..f5b8d00 100644
+--- a/cli/src/Makefile.am
++++ b/cli/src/Makefile.am
+@@ -18,7 +18,7 @@ AM_CPPFLAGS = $(GF_CPPFLAGS) \
+ -I$(top_builddir)/rpc/xdr/src\
+ -DDATADIR=\"$(localstatedir)\" \
+ -DCONFDIR=\"$(sysconfdir)/glusterfs\" \
+- -DGSYNCD_PREFIX=\"$(GLUSTERFS_LIBEXECDIR)\"\
++ -DGSYNCD_PREFIX=\"$(libexecdir)/glusterfs\"\
+ -DSYNCDAEMON_COMPILE=$(SYNCDAEMON_COMPILE) -DSBIN_DIR=\"$(sbindir)\"\
+ $(XML_CPPFLAGS)
+
+diff --git a/configure.ac b/configure.ac
+index c9742e2..0c3a386 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1056,24 +1056,24 @@ old_prefix=$prefix
+ if test "x$prefix" = xNONE; then
+ prefix=$ac_default_prefix
+ fi
+-GLUSTERFS_LIBEXECDIR="$libexecdir/glusterfs"
+-GLUSTERFSD_MISCDIR="$prefix/var/lib/misc/glusterfsd"
++GLUSTERFS_LIBEXECDIR="$(eval echo $prefix)/libexec/glusterfs"
++GLUSTERFSD_MISCDIR="$(eval echo $prefix)/var/lib/misc/glusterfsd"
+ prefix=$old_prefix
+
+ ### Dirty hacky stuff to make LOCALSTATEDIR work
+ if test "x$prefix" = xNONE; then
+- test $localstatedir = '$prefix/var' && localstatedir=$ac_default_prefix/var
++ test $localstatedir = '${prefix}/var' && localstatedir=$ac_default_prefix/var
+ localstatedir=/var
+- LOCALSTATEDIR=$localstatedir
++ LOCALSTATEDIR=$(eval echo ${localstatedir})
+ else
+- LOCALSTATEDIR=$localstatedir
++ LOCALSTATEDIR=$(eval echo ${localstatedir})
+ fi
+
+ old_prefix=$prefix
+ if test "x$prefix" = xNONE; then
+ prefix=$ac_default_prefix
+ fi
+-GLUSTERD_VOLFILE="$sysconfdir/glusterfs/glusterd.vol"
++GLUSTERD_VOLFILE="$(eval echo ${sysconfdir})/glusterfs/glusterd.vol"
+ prefix=$old_prefix
+
+
+diff --git a/events/src/Makefile.am b/events/src/Makefile.am
+index 8493abd..87282c6 100644
+--- a/events/src/Makefile.am
++++ b/events/src/Makefile.am
+@@ -5,7 +5,7 @@ EXTRA_DIST = glustereventsd.py __init__.py eventsapiconf.py.in \
+ BUILT_SOURCES = eventtypes.py
+ CLEANFILES = eventtypes.py
+
+-eventsdir = $(GLUSTERFS_LIBEXECDIR)/events
++eventsdir = $(libexecdir)/glusterfs/events
+ events_PYTHON = __init__.py gf_event.py eventsapiconf.py eventtypes.py \
+ utils.py
+
+@@ -13,7 +13,7 @@ eventtypes.py: $(top_srcdir)/events/eventskeygen.py
+ $(PYTHON) $(top_srcdir)/events/eventskeygen.py PY_HEADER
+
+ if BUILD_EVENTS
+-eventspeerscriptdir = $(GLUSTERFS_LIBEXECDIR)
++eventspeerscriptdir = $(libexecdir)/glusterfs
+ eventsconfdir = $(sysconfdir)/glusterfs
+ eventsconf_DATA = eventsconfig.json
+
+@@ -24,10 +24,10 @@ eventspeerscript_SCRIPTS = peer_eventsapi.py
+ install-exec-hook:
+ $(mkdir_p) $(DESTDIR)$(sbindir)
+ rm -f $(DESTDIR)$(sbindir)/glustereventsd
+- ln -s $(GLUSTERFS_LIBEXECDIR)/events/glustereventsd.py \
++ ln -s $(libexecdir)/glusterfs/events/glustereventsd.py \
+ $(DESTDIR)$(sbindir)/glustereventsd
+ rm -f $(DESTDIR)$(sbindir)/gluster-eventsapi
+- ln -s $(GLUSTERFS_LIBEXECDIR)/peer_eventsapi.py \
++ ln -s $(libexecdir)/glusterfs/peer_eventsapi.py \
+ $(DESTDIR)$(sbindir)/gluster-eventsapi
+
+ uninstall-hook:
+diff --git a/extras/Makefile.am b/extras/Makefile.am
+index 9dfc93d..53ac476 100644
+--- a/extras/Makefile.am
++++ b/extras/Makefile.am
+@@ -1,4 +1,4 @@
+-addonexecdir = $(GLUSTERFS_LIBEXECDIR)
++addonexecdir = $(libexecdir)/glusterfs
+ addonexec_SCRIPTS = peer_add_secret_pub
+
+ EditorModedir = $(docdir)
+diff --git a/geo-replication/src/Makefile.am b/geo-replication/src/Makefile.am
+index 9937a0b..87435d5 100644
+--- a/geo-replication/src/Makefile.am
++++ b/geo-replication/src/Makefile.am
+@@ -1,4 +1,4 @@
+-gsyncddir = $(GLUSTERFS_LIBEXECDIR)
++gsyncddir = $(libexecdir)/glusterfs
+
+ gsyncd_SCRIPTS = gverify.sh peer_gsec_create \
+ set_geo_rep_pem_keys.sh peer_mountbroker peer_mountbroker.py \
+@@ -21,7 +21,7 @@ noinst_HEADERS = procdiggy.h
+
+ AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \
+ -I$(top_srcdir)/rpc/xdr/src -I$(top_builddir)/rpc/xdr/src \
+- -DGSYNCD_PREFIX=\"$(GLUSTERFS_LIBEXECDIR)\" -DUSE_LIBGLUSTERFS \
++ -DGSYNCD_PREFIX=\"$(libexecdir)/glusterfs\" -DUSE_LIBGLUSTERFS \
+ -DSBIN_DIR=\"$(sbindir)\" -DPYTHON=\"$(PYTHON)\"
+
+ AM_CFLAGS = -Wall $(GF_CFLAGS)
+@@ -35,11 +35,11 @@ $(top_builddir)/libglusterfs/src/libglusterfs.la:
+ install-exec-hook:
+ $(mkdir_p) $(DESTDIR)$(sbindir)
+ rm -f $(DESTDIR)$(sbindir)/gluster-mountbroker
+- ln -s $(GLUSTERFS_LIBEXECDIR)/peer_mountbroker.py \
++ ln -s $(libexecdir)/glusterfs/peer_mountbroker.py \
+ $(DESTDIR)$(sbindir)/gluster-mountbroker
+
+ rm -f $(DESTDIR)$(sbindir)/gluster-georep-sshkey
+- ln -s $(GLUSTERFS_LIBEXECDIR)/peer_georep-sshkey.py \
++ ln -s $(libexecdir)/glusterfs/peer_georep-sshkey.py \
+ $(DESTDIR)$(sbindir)/gluster-georep-sshkey
+
+
+diff --git a/geo-replication/syncdaemon/Makefile.am b/geo-replication/syncdaemon/Makefile.am
+index f80fb26..7cdaf45 100644
+--- a/geo-replication/syncdaemon/Makefile.am
++++ b/geo-replication/syncdaemon/Makefile.am
+@@ -1,4 +1,4 @@
+-syncdaemondir = $(GLUSTERFS_LIBEXECDIR)/python/syncdaemon
++syncdaemondir = $(libexecdir)/glusterfs/python/syncdaemon
+
+ syncdaemon_PYTHON = gconf.py gsyncd.py __init__.py master.py README.md repce.py \
+ resource.py configinterface.py syncdutils.py monitor.py libcxattr.py \
+diff --git a/tools/gfind_missing_files/Makefile.am b/tools/gfind_missing_files/Makefile.am
+index f77f789..043c34c 100644
+--- a/tools/gfind_missing_files/Makefile.am
++++ b/tools/gfind_missing_files/Makefile.am
+@@ -1,4 +1,4 @@
+-gfindmissingfilesdir = $(GLUSTERFS_LIBEXECDIR)/gfind_missing_files
++gfindmissingfilesdir = $(libexecdir)/glusterfs/gfind_missing_files
+
+ gfindmissingfiles_SCRIPTS = gfind_missing_files.sh gfid_to_path.sh \
+ gfid_to_path.py
+@@ -21,6 +21,6 @@ uninstall-local:
+
+ install-data-local:
+ rm -f $(DESTDIR)$(sbindir)/gfind_missing_files
+- ln -s $(GLUSTERFS_LIBEXECDIR)/gfind_missing_files/gfind_missing_files.sh $(DESTDIR)$(sbindir)/gfind_missing_files
++ ln -s $(libexecdir)/glusterfs/gfind_missing_files/gfind_missing_files.sh $(DESTDIR)$(sbindir)/gfind_missing_files
+
+ CLEANFILES =
+diff --git a/tools/glusterfind/Makefile.am b/tools/glusterfind/Makefile.am
+index 92fa614..37f23be 100644
+--- a/tools/glusterfind/Makefile.am
++++ b/tools/glusterfind/Makefile.am
+@@ -6,7 +6,7 @@ bin_SCRIPTS = glusterfind
+
+ CLEANFILES = $(bin_SCRIPTS)
+
+-deletehookscriptsdir = $(GLUSTERFS_LIBEXECDIR)/glusterfind/
++deletehookscriptsdir = $(libexecdir)/glusterfs/glusterfind/
+ deletehookscripts_SCRIPTS = S57glusterfind-delete-post.py
+
+ uninstall-local:
+@@ -16,5 +16,5 @@ install-data-local:
+ $(mkdir_p) $(DESTDIR)$(GLUSTERD_WORKDIR)/glusterfind/.keys
+ $(mkdir_p) $(DESTDIR)$(GLUSTERD_WORKDIR)/hooks/1/delete/post/
+ rm -f $(DESTDIR)$(GLUSTERD_WORKDIR)/hooks/1/delete/post/S57glusterfind-delete-post
+- ln -s $(GLUSTERFS_LIBEXECDIR)/glusterfind/S57glusterfind-delete-post.py \
++ ln -s $(libexecdir)/glusterfs/glusterfind/S57glusterfind-delete-post.py \
+ $(DESTDIR)$(GLUSTERD_WORKDIR)/hooks/1/delete/post/S57glusterfind-delete-post
+diff --git a/tools/glusterfind/src/Makefile.am b/tools/glusterfind/src/Makefile.am
+index e4469c1..541ff94 100644
+--- a/tools/glusterfind/src/Makefile.am
++++ b/tools/glusterfind/src/Makefile.am
+@@ -1,4 +1,4 @@
+-glusterfinddir = $(GLUSTERFS_LIBEXECDIR)/glusterfind
++glusterfinddir = $(libexecdir)/glusterfs/glusterfind
+
+ glusterfind_PYTHON = conf.py utils.py __init__.py \
+ main.py libgfchangelog.py changelogdata.py
+diff --git a/xlators/features/ganesha/src/Makefile.am b/xlators/features/ganesha/src/Makefile.am
+index 78715d6..54cfcb3 100644
+--- a/xlators/features/ganesha/src/Makefile.am
++++ b/xlators/features/ganesha/src/Makefile.am
+@@ -12,7 +12,7 @@ AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \
+ -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -D$(GF_HOST_OS)\
+ -I$(top_srcdir)/rpc/xdr/src -I$(top_builddir)/rpc/xdr/src \
+ -DGANESHA_DIR=\"$(sysconfdir)/ganesha\" \
+- -DGYSNCD_PREFIX=\"$(GLUSTERFS_LIBEXECDIR)\"
++ -DGYSNCD_PREFIX=\"$(libexecdir)/glusterfs\"
+
+ AM_CFLAGS = -Wall $(GF_CFLAGS)
+
+diff --git a/xlators/mgmt/glusterd/src/Makefile.am b/xlators/mgmt/glusterd/src/Makefile.am
+index 23ebf37..4f2fffd 100644
+--- a/xlators/mgmt/glusterd/src/Makefile.am
++++ b/xlators/mgmt/glusterd/src/Makefile.am
+@@ -47,7 +47,7 @@ AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \
+ -I$(CONTRIBDIR)/rbtree -I$(top_srcdir)/rpc/rpc-lib/src \
+ -I$(CONTRIBDIR)/mount -I$(CONTRIBDIR)/userspace-rcu \
+ -DSBIN_DIR=\"$(sbindir)\" -DDATADIR=\"$(localstatedir)\" \
+- -DGSYNCD_PREFIX=\"$(GLUSTERFS_LIBEXECDIR)\" \
++ -DGSYNCD_PREFIX=\"$(libexecdir)/glusterfs\" \
+ -DCONFDIR=\"$(localstatedir)/run/gluster/shared_storage/nfs-ganesha\" \
+ -DGANESHA_PREFIX=\"$(libexecdir)/ganesha\" \
+ -DSYNCDAEMON_COMPILE=$(SYNCDAEMON_COMPILE) $(XML_CPPFLAGS)
+--
+2.7.4
+
diff --git a/pkgs/tools/filesystems/glusterfs/glusterfs-python-remove-find_library.patch b/pkgs/tools/filesystems/glusterfs/glusterfs-python-remove-find_library.patch
new file mode 100644
index 00000000000..6dd1baad5df
--- /dev/null
+++ b/pkgs/tools/filesystems/glusterfs/glusterfs-python-remove-find_library.patch
@@ -0,0 +1,151 @@
+From d321df349d10f038f0c89b9c11f8059572264f1b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?=
+Date: Sat, 13 May 2017 18:54:36 +0200
+Subject: [PATCH] python: Remove all uses of find_library. Fixes #1450593
+
+`find_library()` doesn't consider LD_LIBRARY_PATH on Python < 3.6.
+---
+ api/examples/getvolfile.py | 2 +-
+ geo-replication/syncdaemon/libcxattr.py | 3 +--
+ geo-replication/syncdaemon/libgfchangelog.py | 3 +--
+ tests/features/ipctest.py | 10 ++--------
+ tests/utils/libcxattr.py | 5 ++---
+ tools/glusterfind/src/libgfchangelog.py | 3 +--
+ .../features/changelog/lib/examples/python/libgfchangelog.py | 3 +--
+ 7 files changed, 9 insertions(+), 20 deletions(-)
+
+diff --git a/api/examples/getvolfile.py b/api/examples/getvolfile.py
+index 0c95213..32c2268 100755
+--- a/api/examples/getvolfile.py
++++ b/api/examples/getvolfile.py
+@@ -3,7 +3,7 @@
+ import ctypes
+ import ctypes.util
+
+-api = ctypes.CDLL(ctypes.util.find_library("gfapi"))
++api = ctypes.CDLL("libgfapi.so")
+ api.glfs_get_volfile.argtypes = [ctypes.c_void_p,
+ ctypes.c_void_p,
+ ctypes.c_ulong]
+diff --git a/geo-replication/syncdaemon/libcxattr.py b/geo-replication/syncdaemon/libcxattr.py
+index 3671e10..f576648 100644
+--- a/geo-replication/syncdaemon/libcxattr.py
++++ b/geo-replication/syncdaemon/libcxattr.py
+@@ -10,7 +10,6 @@
+
+ import os
+ from ctypes import CDLL, create_string_buffer, get_errno
+-from ctypes.util import find_library
+
+
+ class Xattr(object):
+@@ -25,7 +24,7 @@ class Xattr(object):
+ sizes we expect
+ """
+
+- libc = CDLL(find_library("c"), use_errno=True)
++ libc = CDLL("libc.so.6", use_errno=True)
+
+ @classmethod
+ def geterrno(cls):
+diff --git a/geo-replication/syncdaemon/libgfchangelog.py b/geo-replication/syncdaemon/libgfchangelog.py
+index d87b56c..003c28c 100644
+--- a/geo-replication/syncdaemon/libgfchangelog.py
++++ b/geo-replication/syncdaemon/libgfchangelog.py
+@@ -10,12 +10,11 @@
+
+ import os
+ from ctypes import CDLL, RTLD_GLOBAL, create_string_buffer, get_errno, byref, c_ulong
+-from ctypes.util import find_library
+ from syncdutils import ChangelogException, ChangelogHistoryNotAvailable
+
+
+ class Changes(object):
+- libgfc = CDLL(find_library("gfchangelog"), mode=RTLD_GLOBAL, use_errno=True)
++ libgfc = CDLL("libgfchangelog.so", mode=RTLD_GLOBAL, use_errno=True)
+
+ @classmethod
+ def geterrno(cls):
+diff --git a/tests/features/ipctest.py b/tests/features/ipctest.py
+index 5aff319..9339248 100755
+--- a/tests/features/ipctest.py
++++ b/tests/features/ipctest.py
+@@ -1,14 +1,8 @@
+ #!/usr/bin/python
+
+ import ctypes
+-import ctypes.util
+-
+-# find_library does not lookup LD_LIBRARY_PATH and may miss the
+-# function. In that case, retry with less portable but explicit name.
+-libgfapi = ctypes.util.find_library("gfapi")
+-if libgfapi == None:
+- libgfapi = "libgfapi.so"
+-api = ctypes.CDLL(libgfapi,mode=ctypes.RTLD_GLOBAL)
++
++api = ctypes.CDLL("libgfapi.so",mode=ctypes.RTLD_GLOBAL)
+
+ api.glfs_ipc.argtypes = [ ctypes.c_void_p, ctypes.c_int, ctypes.c_void_p, ctypes.c_void_p ]
+ api.glfs_ipc.restype = ctypes.c_int
+diff --git a/tests/utils/libcxattr.py b/tests/utils/libcxattr.py
+index 149db72..4e6e6c4 100644
+--- a/tests/utils/libcxattr.py
++++ b/tests/utils/libcxattr.py
+@@ -11,7 +11,6 @@
+ import os
+ import sys
+ from ctypes import CDLL, c_int, create_string_buffer
+-from ctypes.util import find_library
+
+
+ class Xattr(object):
+@@ -28,9 +27,9 @@ class Xattr(object):
+
+ if sys.hexversion >= 0x02060000:
+ from ctypes import DEFAULT_MODE
+- libc = CDLL(find_library("libc"), DEFAULT_MODE, None, True)
++ libc = CDLL("libc.so.6", DEFAULT_MODE, None, True)
+ else:
+- libc = CDLL(find_library("libc"))
++ libc = CDLL("libc.so.6")
+
+ @classmethod
+ def geterrno(cls):
+diff --git a/tools/glusterfind/src/libgfchangelog.py b/tools/glusterfind/src/libgfchangelog.py
+index dd8153e..da822cf 100644
+--- a/tools/glusterfind/src/libgfchangelog.py
++++ b/tools/glusterfind/src/libgfchangelog.py
+@@ -12,14 +12,13 @@
+ import os
+ from ctypes import CDLL, get_errno, create_string_buffer, c_ulong, byref
+ from ctypes import RTLD_GLOBAL
+-from ctypes.util import find_library
+
+
+ class ChangelogException(OSError):
+ pass
+
+
+-libgfc = CDLL(find_library("gfchangelog"), use_errno=True, mode=RTLD_GLOBAL)
++libgfc = CDLL("libgfchangelog.so", use_errno=True, mode=RTLD_GLOBAL)
+
+
+ def raise_oserr():
+diff --git a/xlators/features/changelog/lib/examples/python/libgfchangelog.py b/xlators/features/changelog/lib/examples/python/libgfchangelog.py
+index 10e73c0..2cdbf11 100644
+--- a/xlators/features/changelog/lib/examples/python/libgfchangelog.py
++++ b/xlators/features/changelog/lib/examples/python/libgfchangelog.py
+@@ -1,9 +1,8 @@
+ import os
+ from ctypes import *
+-from ctypes.util import find_library
+
+ class Changes(object):
+- libgfc = CDLL(find_library("gfchangelog"), mode=RTLD_GLOBAL, use_errno=True)
++ libgfc = CDLL("libgfchangelog.so", mode=RTLD_GLOBAL, use_errno=True)
+
+ @classmethod
+ def geterrno(cls):
+--
+2.7.4
+
diff --git a/pkgs/tools/filesystems/glusterfs/glusterfs-use-PATH-instead-of-hardcodes.patch b/pkgs/tools/filesystems/glusterfs/glusterfs-use-PATH-instead-of-hardcodes.patch
new file mode 100644
index 00000000000..eb4bd5b7d56
--- /dev/null
+++ b/pkgs/tools/filesystems/glusterfs/glusterfs-use-PATH-instead-of-hardcodes.patch
@@ -0,0 +1,161 @@
+From 616381bc25b0e90198683fb049f994e82d467d96 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?=
+Date: Sat, 13 May 2017 02:45:49 +0200
+Subject: [PATCH] Don't use hardcoded /sbin, /usr/bin etc. paths. Fixes
+ #1450546.
+
+Instead, rely on programs to be in PATH, as gluster already
+does in many places across its code base.
+
+Change-Id: Id21152fe42f5b67205d8f1571b0656c4d5f74246
+---
+ contrib/fuse-lib/mount-common.c | 8 ++++----
+ xlators/mgmt/glusterd/src/glusterd-ganesha.c | 6 +++---
+ xlators/mgmt/glusterd/src/glusterd-quota.c | 6 +++---
+ xlators/mgmt/glusterd/src/glusterd-snapshot.c | 4 ++--
+ xlators/mgmt/glusterd/src/glusterd-utils.c | 14 +-------------
+ 5 files changed, 13 insertions(+), 25 deletions(-)
+
+diff --git a/contrib/fuse-lib/mount-common.c b/contrib/fuse-lib/mount-common.c
+index e9f80fe81..6380dd867 100644
+--- a/contrib/fuse-lib/mount-common.c
++++ b/contrib/fuse-lib/mount-common.c
+@@ -255,16 +255,16 @@ fuse_mnt_umount (const char *progname, const char *abs_mnt,
+ exit (1);
+ }
+ #ifdef GF_LINUX_HOST_OS
+- execl ("/bin/umount", "/bin/umount", "-i", rel_mnt,
++ execl ("umount", "umount", "-i", rel_mnt,
+ lazy ? "-l" : NULL, NULL);
+- GFFUSE_LOGERR ("%s: failed to execute /bin/umount: %s",
++ GFFUSE_LOGERR ("%s: failed to execute umount: %s",
+ progname, strerror (errno));
+ #elif __NetBSD__
+ /* exitting the filesystem causes the umount */
+ exit (0);
+ #else
+- execl ("/sbin/umount", "/sbin/umount", "-f", rel_mnt, NULL);
+- GFFUSE_LOGERR ("%s: failed to execute /sbin/umount: %s",
++ execl ("umount", "umount", "-f", rel_mnt, NULL);
++ GFFUSE_LOGERR ("%s: failed to execute umount: %s",
+ progname, strerror (errno));
+ #endif /* GF_LINUX_HOST_OS */
+ exit (1);
+diff --git a/xlators/mgmt/glusterd/src/glusterd-ganesha.c b/xlators/mgmt/glusterd/src/glusterd-ganesha.c
+index da1fee066..dcb9e5725 100644
+--- a/xlators/mgmt/glusterd/src/glusterd-ganesha.c
++++ b/xlators/mgmt/glusterd/src/glusterd-ganesha.c
+@@ -122,15 +122,15 @@ manage_service (char *action)
+ int i = 0;
+ int ret = 0;
+ struct service_command sc_list[] = {
+- { .binary = "/bin/systemctl",
++ { .binary = "systemctl",
+ .service = "nfs-ganesha",
+ .action = sc_systemctl_action
+ },
+- { .binary = "/sbin/invoke-rc.d",
++ { .binary = "invoke-rc.d",
+ .service = "nfs-ganesha",
+ .action = sc_service_action
+ },
+- { .binary = "/sbin/service",
++ { .binary = "service",
+ .service = "nfs-ganesha",
+ .action = sc_service_action
+ },
+diff --git a/xlators/mgmt/glusterd/src/glusterd-quota.c b/xlators/mgmt/glusterd/src/glusterd-quota.c
+index 0e6629cf0..fcb4738b7 100644
+--- a/xlators/mgmt/glusterd/src/glusterd-quota.c
++++ b/xlators/mgmt/glusterd/src/glusterd-quota.c
+@@ -30,7 +30,7 @@
+
+ #ifndef _PATH_SETFATTR
+ # ifdef GF_LINUX_HOST_OS
+-# define _PATH_SETFATTR "/usr/bin/setfattr"
++# define _PATH_SETFATTR "setfattr"
+ # endif
+ # ifdef __NetBSD__
+ # define _PATH_SETFATTR "/usr/pkg/bin/setfattr"
+@@ -335,7 +335,7 @@ _glusterd_quota_initiate_fs_crawl (glusterd_conf_t *priv,
+
+ if (type == GF_QUOTA_OPTION_TYPE_ENABLE ||
+ type == GF_QUOTA_OPTION_TYPE_ENABLE_OBJECTS)
+- runner_add_args (&runner, "/usr/bin/find", ".", NULL);
++ runner_add_args (&runner, "find", ".", NULL);
+
+ else if (type == GF_QUOTA_OPTION_TYPE_DISABLE) {
+
+@@ -351,7 +351,7 @@ _glusterd_quota_initiate_fs_crawl (glusterd_conf_t *priv,
+ VIRTUAL_QUOTA_XATTR_CLEANUP_KEY, "1",
+ "{}", "\\", ";", NULL);
+ #else
+- runner_add_args (&runner, "/usr/bin/find", ".",
++ runner_add_args (&runner, "find", ".",
+ "-exec", _PATH_SETFATTR, "-n",
+ VIRTUAL_QUOTA_XATTR_CLEANUP_KEY, "-v",
+ "1", "{}", "\\", ";", NULL);
+diff --git a/xlators/mgmt/glusterd/src/glusterd-snapshot.c b/xlators/mgmt/glusterd/src/glusterd-snapshot.c
+index da0152366..f0d135350 100644
+--- a/xlators/mgmt/glusterd/src/glusterd-snapshot.c
++++ b/xlators/mgmt/glusterd/src/glusterd-snapshot.c
+@@ -121,7 +121,7 @@ glusterd_build_snap_device_path (char *device, char *snapname,
+ }
+
+ runinit (&runner);
+- runner_add_args (&runner, "/sbin/lvs", "--noheadings", "-o", "vg_name",
++ runner_add_args (&runner, "lvs", "--noheadings", "-o", "vg_name",
+ device, NULL);
+ runner_redir (&runner, STDOUT_FILENO, RUN_PIPE);
+ snprintf (msg, sizeof (msg), "Get volume group for device %s", device);
+@@ -1982,7 +1982,7 @@ glusterd_is_thinp_brick (char *device, uint32_t *op_errno)
+
+ runinit (&runner);
+
+- runner_add_args (&runner, "/sbin/lvs", "--noheadings", "-o", "pool_lv",
++ runner_add_args (&runner, "lvs", "--noheadings", "-o", "pool_lv",
+ device, NULL);
+ runner_redir (&runner, STDOUT_FILENO, RUN_PIPE);
+ runner_log (&runner, this->name, GF_LOG_DEBUG, msg);
+diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c
+index 51db13df0..6fa7b92f9 100644
+--- a/xlators/mgmt/glusterd/src/glusterd-utils.c
++++ b/xlators/mgmt/glusterd/src/glusterd-utils.c
+@@ -6027,7 +6027,6 @@ static struct fs_info {
+ char *fs_tool_pattern;
+ char *fs_tool_pkg;
+ } glusterd_fs[] = {
+- /* some linux have these in /usr/sbin/and others in /sbin/? */
+ { "xfs", "xfs_info", NULL, "isize=", "xfsprogs" },
+ { "ext3", "tune2fs", "-l", "Inode size:", "e2fsprogs" },
+ { "ext4", "tune2fs", "-l", "Inode size:", "e2fsprogs" },
+@@ -6048,7 +6047,6 @@ glusterd_add_inode_size_to_dict (dict_t *dict, int count)
+ char *trail = NULL;
+ runner_t runner = {0, };
+ struct fs_info *fs = NULL;
+- char fs_tool_name[256] = {0, };
+ static dict_t *cached_fs = NULL;
+
+ memset (key, 0, sizeof (key));
+@@ -6085,17 +6083,7 @@ glusterd_add_inode_size_to_dict (dict_t *dict, int count)
+ cur_word = "N/A";
+ goto cached;
+ }
+-
+- snprintf (fs_tool_name, sizeof (fs_tool_name),
+- "/usr/sbin/%s", fs->fs_tool_name);
+- if (sys_access (fs_tool_name, R_OK|X_OK) == 0)
+- runner_add_arg (&runner, fs_tool_name);
+- else {
+- snprintf (fs_tool_name, sizeof (fs_tool_name),
+- "/sbin/%s", fs->fs_tool_name);
+- if (sys_access (fs_tool_name, R_OK|X_OK) == 0)
+- runner_add_arg (&runner, fs_tool_name);
+- }
++ runner_add_arg (&runner, fs->fs_tool_name);
+ break;
+ }
+ }
+--
+2.12.0
+
diff --git a/pkgs/tools/graphics/ditaa/default.nix b/pkgs/tools/graphics/ditaa/default.nix
index 86ff9ec8fae..56c1c976362 100644
--- a/pkgs/tools/graphics/ditaa/default.nix
+++ b/pkgs/tools/graphics/ditaa/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
description = "Convert ascii art diagrams into proper bitmap graphics";
homepage = http://ditaa.sourceforge.net/;
license = licenses.gpl2;
- platforms = platforms.linux;
+ platforms = platforms.unix;
maintainers = [ maintainers.bjornfor ];
};
}
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix
index 2d25e6bf430..c53f766cb7d 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
isIbusEngine = true;
description = "m17n engine for ibus";
- homepage = https://github.com.com/ibus/ibus-m17n;
+ homepage = https://github.com/ibus/ibus-m17n;
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ ericsagnes ];
diff --git a/pkgs/tools/misc/esptool-ck/default.nix b/pkgs/tools/misc/esptool-ck/default.nix
new file mode 100644
index 00000000000..c1678f3907f
--- /dev/null
+++ b/pkgs/tools/misc/esptool-ck/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+ name = "esptool-ck-${version}";
+ version = "0.4.11";
+
+ src = fetchFromGitHub {
+ owner = "igrr";
+ repo = "esptool-ck";
+ rev = "0.4.11";
+ sha256 = "086x68jza24xkaap8nici18kj78id2p2lzbasin98wilvpjc8d7f";
+ };
+
+ makeFlags = [ "VERSION=${version}" ];
+
+ installPhase = ''
+ mkdir -p $out/bin
+ cp esptool $out/bin
+ '';
+
+ meta = with stdenv.lib; {
+ description = "ESP8266/ESP32 build helper tool";
+ homepage = https://github.com/igrr/esptool-ck;
+ license = licenses.gpl2;
+ maintainers = [ maintainers.dezgeg ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/tools/misc/esptool/default.nix b/pkgs/tools/misc/esptool/default.nix
new file mode 100644
index 00000000000..04ba5788cd9
--- /dev/null
+++ b/pkgs/tools/misc/esptool/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, python3 }:
+
+python3.pkgs.buildPythonApplication rec {
+ name = "esptool-${version}";
+ version = "1.3";
+
+ src = fetchFromGitHub {
+ owner = "espressif";
+ repo = "esptool";
+ rev = "v${version}";
+ sha256 = "0112fybkz4259gyvhcs18wa6938jp6w7clk66kpd0d1dg70lz1h6";
+ };
+
+ propagatedBuildInputs = with python3.pkgs; [ pyserial ];
+
+ doCheck = false; # FIXME: requires packaging some new deps
+
+ meta = with stdenv.lib; {
+ description = "ESP8266 and ESP32 serial bootloader utility";
+ homepage = https://github.com/espressif/esptool;
+ license = licenses.gpl2;
+ maintainers = [ maintainers.dezgeg ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/tools/misc/fsql/default.nix b/pkgs/tools/misc/fsql/default.nix
new file mode 100644
index 00000000000..ffd3b3f5153
--- /dev/null
+++ b/pkgs/tools/misc/fsql/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildGoPackage, fetchgit }:
+
+buildGoPackage rec {
+ name = "fsql-${version}";
+ version = "0.1.1";
+
+ goPackagePath = "github.com/kshvmdn/fsql";
+
+ src = fetchgit {
+ rev = "refs/tags/v${version}";
+ url = "https://github.com/kshvmdn/fsql";
+ sha256 = "1zvblhfd15l86dcx0p12yrc2rrmfdpzyd107508pb72r2ar638vh";
+ };
+
+ meta = with stdenv.lib; {
+ description = "Search through your filesystem with SQL-esque queries";
+ homepage = https://github.com/kshvmdn/fsql;
+ license = licenses.mit;
+ maintainers = with maintainers; [ pSub ];
+ platforms = platforms.linux;
+ inherit version;
+ };
+
+}
diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix
index 176f8aa1f51..192da26b452 100644
--- a/pkgs/tools/misc/hdf5/default.nix
+++ b/pkgs/tools/misc/hdf5/default.nix
@@ -12,6 +12,9 @@
# (--enable-unsupported could be used to force the build)
assert !cpp || mpi == null;
+# No point splitting version 1.8.18 into multiple outputs.
+# The library /lib/libhdf5.so has a reference to gcc-wrapper
+
let inherit (stdenv.lib) optional optionals; in
stdenv.mkDerivation rec {
diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix
index c54f8ebec0d..a8bab014b9e 100644
--- a/pkgs/tools/misc/lf/default.nix
+++ b/pkgs/tools/misc/lf/default.nix
@@ -2,13 +2,13 @@
buildGoPackage rec {
name = "lf-unstable-${version}";
- version = "2017-02-04";
+ version = "2017-05-15";
src = fetchFromGitHub {
owner = "gokcehan";
repo = "lf";
- rev = "c55c4bf254d59c4e943d5559cd6e062652751e36"; # nightly
- sha256 = "0jq85pfhpzdplv083mxbys7pp8igcvhp4daa9dh0yn4xbd8x821d";
+ rev = "9962b378a816c2f792dcbfe9e3f58ae16d5969dd"; # nightly
+ sha256 = "1ln14ma2iajlp9klj4bhrq0y9955rpw9aggvj7hcj1m5yqa0sdqn";
};
goPackagePath = "github.com/gokcehan/lf";
diff --git a/pkgs/tools/misc/lf/deps.nix b/pkgs/tools/misc/lf/deps.nix
index d3aff8de33c..bb136e98d66 100644
--- a/pkgs/tools/misc/lf/deps.nix
+++ b/pkgs/tools/misc/lf/deps.nix
@@ -4,8 +4,8 @@
fetch = {
type = "git";
url = "https://github.com/nsf/termbox-go";
- rev = "abe82ce5fb7a42fbd6784a5ceb71aff977e09ed8"; # master
- sha256 = "156i8apkga8b3272kjhapyqwspgcfkrr9kpqwc5lii43k4swghpv";
+ rev = "7994c181db7761ca3c67a217068cf31826113f5f"; # master
+ sha256 = "0ssc54wamn3h8z68kv4fdgvk3kjii95psi2kk0slsilmg5v6jzhj";
};
}
{
diff --git a/pkgs/tools/misc/loadlibrary/default.nix b/pkgs/tools/misc/loadlibrary/default.nix
new file mode 100644
index 00000000000..6ebf86b06fa
--- /dev/null
+++ b/pkgs/tools/misc/loadlibrary/default.nix
@@ -0,0 +1,31 @@
+{ cabextract, glibc_multi, fetchFromGitHub, readline, stdenv_32bit }:
+
+# stdenv_32bit is needed because the program depends upon 32-bit libraries and does not have
+# support for 64-bit yet: it requires libc6-dev:i386, libreadline-dev:i386.
+
+stdenv_32bit.mkDerivation rec {
+ name = "loadlibrary-${version}";
+ version = "20170525-${stdenv_32bit.lib.strings.substring 0 7 rev}";
+ rev = "721b084c088d779075405b7f20c77c2578e2a961";
+ src = fetchFromGitHub {
+ inherit rev;
+ owner = "taviso";
+ repo = "loadlibrary";
+ sha256 = "01hb7wzfh1s5b8cvmrmr1gqknpq5zpzj9prq3wrpsgg129jpsjkb";
+ };
+
+ buildInputs = [ glibc_multi cabextract readline stdenv_32bit.cc.libc ];
+
+ installPhase = ''
+ mkdir -p $out/bin/
+ cp mpclient $out/bin/
+ '';
+
+ meta = with stdenv_32bit.lib; {
+ homepage = "https://github.com/taviso/loadlibrary";
+ description = "Porting Windows Dynamic Link Libraries to Linux";
+ platforms = platforms.linux;
+ maintainers = [ maintainers.eleanor ];
+ license = licenses.gpl2;
+ };
+}
diff --git a/pkgs/tools/misc/moreutils/default.nix b/pkgs/tools/misc/moreutils/default.nix
index a232028976d..51ac3249fed 100644
--- a/pkgs/tools/misc/moreutils/default.nix
+++ b/pkgs/tools/misc/moreutils/default.nix
@@ -1,13 +1,14 @@
-{ stdenv, fetchurl, libxml2, libxslt, docbook-xsl, docbook_xml_dtd_44, perl, IPCRun, TimeDate, TimeDuration, makeWrapper }:
+{ stdenv, fetchgit, libxml2, libxslt, docbook-xsl, docbook_xml_dtd_44, perl, IPCRun, TimeDate, TimeDuration, makeWrapper }:
with stdenv.lib;
stdenv.mkDerivation rec {
name = "moreutils-${version}";
- version = "0.59";
+ version = "0.61";
- src = fetchurl {
- url = "http://ftp.de.debian.org/debian/pool/main/m/moreutils/moreutils_${version}.orig.tar.gz";
- sha256 = "1d6ik3j4lwp90vb93p7yv60k6vk2chz448d1z9xrmxvv371i33m4";
+ src = fetchgit {
+ url = "git://git.joeyh.name/moreutils";
+ rev = "refs/tags/${version}";
+ sha256 = "1qvwlq0a2zs7qkjqc9c842979axkjfdr7nic1gsm4zc6jd72y7pr";
};
preBuild = ''
@@ -25,7 +26,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Growing collection of the unix tools that nobody thought to write long ago when unix was young";
homepage = https://joeyh.name/code/moreutils/;
- maintainers = with maintainers; [ koral ];
+ maintainers = with maintainers; [ koral pSub ];
platforms = platforms.all;
};
}
diff --git a/pkgs/tools/misc/patdiff/default.nix b/pkgs/tools/misc/patdiff/default.nix
new file mode 100644
index 00000000000..6e3c635f87a
--- /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/misc/pick/default.nix b/pkgs/tools/misc/pick/default.nix
index a407a85d1a2..075949f47e1 100644
--- a/pkgs/tools/misc/pick/default.nix
+++ b/pkgs/tools/misc/pick/default.nix
@@ -2,19 +2,23 @@
stdenv.mkDerivation rec {
name = "pick-${version}";
- version = "1.4.0";
+ version = "1.6.1";
src = fetchFromGitHub {
owner = "thoughtbot";
repo = "pick";
rev = "v${version}";
- sha256 = "113if0jh7svwrwrxhrsbi7h1whfr5707v2ny4dc9kk2sjbv6b9pg";
+ sha256 = "0iw3yqwg8j0pg56xx52xwn7n95vxlqbqh71zrc934v4mq971qlhd";
};
buildInputs = [ ncurses ];
nativeBuildInputs = [ autoreconfHook ];
+ postPatch = ''
+ sed -i -e 's/\[curses]/\[ncurses]/g' configure.ac
+ '';
+
meta = with stdenv.lib; {
inherit (src.meta) homepage;
description = "Fuzzy text selection utility";
diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix
index 95d1a7275d9..ac564de0ea6 100644
--- a/pkgs/tools/misc/tmux/default.nix
+++ b/pkgs/tools/misc/tmux/default.nix
@@ -13,7 +13,7 @@ in
stdenv.mkDerivation rec {
name = "tmux-${version}";
- version = "2.3";
+ version = "2.5";
outputs = [ "out" "man" ];
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
owner = "tmux";
repo = "tmux";
rev = version;
- sha256 = "14c6iw0p3adz7w8jm42w9f3s1zph9is10cbwdjgh5bvifrhxrary";
+ sha256 = "0h0c6rwp4bjifqx9wpx7y0bmayvrvvgh9211rdk4nsf81j17n6vx";
};
nativeBuildInputs = [ pkgconfig autoreconfHook ];
diff --git a/pkgs/tools/misc/vimer/default.nix b/pkgs/tools/misc/vimer/default.nix
new file mode 100644
index 00000000000..231ee9ac157
--- /dev/null
+++ b/pkgs/tools/misc/vimer/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+ version = "0.2.0";
+ name = "vimer-${version}";
+
+ src = fetchFromGitHub {
+ owner = "susam";
+ repo = "vimer";
+ rev = version;
+ sha256 = "01qhr3i7wasbaxvms39c81infpry2vk0nzh7r5m5b9p713p0phsi";
+ };
+
+ installPhase = ''
+ mkdir $out/bin/ -p
+ cp vimer $out/bin/
+ chmod +x $out/bin/vimer
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/susam/vimer";
+ description = ''
+ A convenience wrapper for gvim/mvim --remote(-tab)-silent to open files
+ in an existing instance of GVim or MacVim.
+ '';
+ license = licenses.mit;
+ maintainers = [ maintainers.matthiasbeyer ];
+ platforms = platforms.linux;
+ };
+
+}
+
diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 88750f6e0e1..1acf0e65dea 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -14,11 +14,11 @@ with stdenv.lib;
buildPythonApplication rec {
name = "youtube-dl-${version}";
- version = "2017.04.28";
+ version = "2017.05.23";
src = fetchurl {
url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz";
- sha256 = "0d3mgf8qxb07b7bjf79ppaxhcl4f47q0zjpshp6y2q0lalfskh3j";
+ sha256 = "1na2ccja8p18i3ypf7vjrxlh653906746l966fwm06b5q6867iwd";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/nagstamon/default.nix b/pkgs/tools/nagstamon/default.nix
new file mode 100644
index 00000000000..3163b78437e
--- /dev/null
+++ b/pkgs/tools/nagstamon/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pythonPackages }:
+
+pythonPackages.buildPythonApplication rec {
+ name = "nagstamon-${version}";
+ version = "2.0.1";
+
+ src = fetchurl {
+ url = "https://nagstamon.ifw-dresden.de/files/stable/Nagstamon-${version}.tar.gz";
+ sha256 = "3d4b22190d47250b175a4a70b12391c694ba2399832320887e5909e1ce3dfd7b";
+ };
+
+ # Test assumes darwin
+ doCheck = false;
+
+ propagatedBuildInputs = with pythonPackages; [ configparser pyqt5 psutil requests
+ beautifulsoup4 ];
+
+ meta = with stdenv.lib; {
+ description = "A status monitor for the desktop";
+ homepage = https://nagstamon.ifw-dresden.de/;
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ pSub ];
+ inherit version;
+ };
+}
diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix
index d1171a3c835..338804aa26b 100644
--- a/pkgs/tools/networking/dd-agent/default.nix
+++ b/pkgs/tools/networking/dd-agent/default.nix
@@ -1,5 +1,11 @@
{ stdenv, fetchFromGitHub, pythonPackages
-, sysstat, unzip, makeWrapper }:
+, sysstat, unzip, makeWrapper
+# We need extraBuildInputs as we want to be able to override this
+# package with python packages _and_ have the produced binaries
+# wrapper with their PYTHONPATH. This means overrideAttrs is not
+# strong enough (it overrides too late), we need to call it
+# beforehand.
+, extraBuildInputs ? [ ] }:
let
inherit (pythonPackages) python;
docker_1_10 = pythonPackages.buildPythonPackage rec {
@@ -26,33 +32,42 @@ let
# due to flake8
doCheck = false;
};
+ version = "5.13.2";
+
+ integrations = fetchFromGitHub {
+ owner = "datadog";
+ repo = "integrations-core";
+ rev = version;
+ sha256 = "1nbjmkq0wdfndmx0qap69h2rkwkkb0632j87h9d3j99bykyav3y3";
+ };
in stdenv.mkDerivation rec {
- version = "5.11.2";
name = "dd-agent-${version}";
src = fetchFromGitHub {
owner = "datadog";
repo = "dd-agent";
rev = version;
- sha256 = "1iqxvgpsqibqw3vk79158l2pnb6y4pjhjp2d6724lm5rpz4825lx";
+ sha256 = "0x2bxi70l2yf0wi232qksvcscjdpjg8l7dmgg1286vqryyfazfjb";
};
buildInputs = [
python
unzip
makeWrapper
- pythonPackages.requests
- pythonPackages.psycopg2
- pythonPackages.psutil
- pythonPackages.ntplib
- pythonPackages.simplejson
- pythonPackages.pyyaml
- pythonPackages.pymongo_2_9_1
- pythonPackages.python-etcd
- pythonPackages.consul
+ pythonPackages.boto
docker_1_10
- ];
+ pythonPackages.kazoo
+ pythonPackages.ntplib
+ pythonPackages.consul
+ pythonPackages.python-etcd
+ pythonPackages.pyyaml
+ pythonPackages.requests
+ pythonPackages.simplejson
+ pythonPackages.supervisor
+ pythonPackages.tornado
+ pythonPackages.uptime
+ ] ++ extraBuildInputs;
propagatedBuildInputs = with pythonPackages; [ python tornado ];
buildCommand = ''
@@ -67,6 +82,24 @@ in stdenv.mkDerivation rec {
# Move out default conf.d so that /etc/dd-agent/conf.d is used
mv $out/agent/conf.d $out/agent/conf.d-system
+ # Sometime between 5.11.2 and 5.13.2 datadog moved out all its
+ # checks into separate repository. Copy them back in so dd-agent
+ # service can easily pick and choose by copying out configs into
+ # its etc files.
+ mkdir -p $out/agent/checks.d
+ for i in ${toString integrations}/* # */
+ do
+ if [ -f "$i/check.py" ]; then
+ if [ -f "$i/conf.yaml.default" -o -f "$i/conf.yaml.example" ]; then
+ local name=$(basename $i)
+ cp $i/check.py $out/agent/checks.d/$name.py
+ # Copy .default file first unless it doesn't exist then copy .default
+ cp $i/conf.yaml.default $out/agent/conf.d-system/$name.yaml &> /dev/null || \
+ cp $i/conf.yaml.example $out/agent/conf.d-system/$name.yaml
+ fi
+ fi
+ done
+
cat > $out/bin/dd-jmxfetch <, gc_allocator' \
- 'std::less, gc_allocator >'
-
- sed -i '/if (settings.readOnlyMode) {/a curSchema = getSchema();' src/libstore/local-store.cc
- '';
}) // { perl-bindings = nixStable; };
nixUnstable = (lib.lowPrio (common rec {
diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix
index 914247dcd0b..e450cf5952e 100644
--- a/pkgs/tools/security/ccid/default.nix
+++ b/pkgs/tools/security/ccid/default.nix
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, pcsclite, pkgconfig, libusb1, perl }:
stdenv.mkDerivation rec {
- version = "1.4.26";
+ version = "1.4.27";
name = "ccid-${version}";
src = fetchurl {
- url = "https://alioth.debian.org/frs/download.php/file/4205/ccid-1.4.26.tar.bz2";
- sha256 = "0bxy835c133ajalpj4gx60nqkjvpf9y1n97n04pw105pi9qbyrrj";
+ url = "https://alioth.debian.org/frs/download.php/file/4218/ccid-1.4.27.tar.bz2";
+ sha256 = "0dyikpmhsph36ndgd61bs4yx437v5y0bmm8ahjacp1k9c1ly4q56";
};
patchPhase = ''
diff --git a/pkgs/tools/security/cfssl/default.nix b/pkgs/tools/security/cfssl/default.nix
new file mode 100644
index 00000000000..91a5fa4bdd2
--- /dev/null
+++ b/pkgs/tools/security/cfssl/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, lib, buildGoPackage, fetchFromGitHub, pkgs }:
+
+buildGoPackage rec {
+ name = "cfssl-${version}";
+ version = "20170527";
+
+ goPackagePath = "github.com/cloudflare/cfssl";
+
+ src = fetchFromGitHub {
+ owner = "cloudflare";
+ repo = "cfssl";
+ rev = "114dc9691ec7bf3dac49d5953eccf7d91a0e0904";
+ sha256 = "1ijq43mrzrf1gkgj5ssxq7sgy6sd4rl706dzqkq9krqv5f6kwhj1";
+ };
+
+ meta = with stdenv.lib; {
+ homepage = https://cfssl.org/;
+ description = "Cloudflare's PKI and TLS toolkit";
+ platforms = platforms.linux;
+ license = licenses.bsd2;
+ maintainers = with maintainers; [ mbrgm ];
+ };
+}
diff --git a/pkgs/tools/security/kwalletcli/default.nix b/pkgs/tools/security/kwalletcli/default.nix
new file mode 100644
index 00000000000..c6217024f1b
--- /dev/null
+++ b/pkgs/tools/security/kwalletcli/default.nix
@@ -0,0 +1,55 @@
+{
+ kdeDerivation, kdeWrapper, fetchurl, lib,
+ pkgconfig,
+ kcoreaddons, ki18n, kwallet,
+ mksh
+}:
+
+let
+ pname = "kwalletcli";
+ version = "3.00";
+
+ unwrapped = kdeDerivation rec {
+ name = "${pname}-${version}";
+
+ src = fetchurl {
+ url = "https://www.mirbsd.org/MirOS/dist/hosted/kwalletcli/${name}.tar.gz";
+ sha256 = "1q87nm7pkmgvkrml6hgbmv0ddx3871w7x86gn90sjc3vw59qfh98";
+ };
+
+ postPatch = ''
+ substituteInPlace GNUmakefile \
+ --replace '-I/usr/include/KF5/KCoreAddons' '-I${kcoreaddons.dev}/include/KF5/KCoreAddons' \
+ --replace '-I/usr/include/KF5/KI18n' '-I${ki18n.dev}/include/KF5/KI18n' \
+ --replace '-I/usr/include/KF5/KWallet' '-I${kwallet.dev}/include/KF5/KWallet' \
+ --replace /usr/bin $out/bin \
+ --replace /usr/share/man $out/share/man
+ '';
+
+ makeFlags = [ "KDE_VER=5" ];
+
+ # we need this when building against qt 5.8+
+ NIX_CFLAGS_COMPILE = [ "-std=c++11" ];
+
+ nativeBuildInputs = [ pkgconfig ];
+ # if using just kwallet, cmake will be added as a buildInput and fail the build
+ propagatedBuildInputs = [ kcoreaddons ki18n (lib.getLib kwallet) ];
+
+ preInstall = ''
+ mkdir -p $out/bin $out/share/man/man1
+ '';
+
+ meta = with lib; {
+ description = "Command-Line Interface to the KDE Wallet";
+ homepage = http://www.mirbsd.org/kwalletcli.htm;
+ license = licenses.miros;
+ maintainers = with maintainers; [ peterhoeg ];
+ };
+ };
+
+in kdeWrapper {
+ inherit unwrapped;
+ targets = map (b: "bin/" + b)
+ [ "kwalletaskpass" "kwalletcli" "kwalletcli_getpin" "pinentry-kwallet" ];
+ paths = [ mksh ];
+}
diff --git a/pkgs/tools/security/nitrokey-app/FixInstallDestination.patch b/pkgs/tools/security/nitrokey-app/FixInstallDestination.patch
deleted file mode 100644
index 7acd7239b39..00000000000
--- a/pkgs/tools/security/nitrokey-app/FixInstallDestination.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -273,7 +273,7 @@
- # Install autocompletion scripts
- install(FILES
- ${CMAKE_SOURCE_DIR}/data/bash-autocomplete/nitrokey-app
-- DESTINATION /etc/bash_completion.d
-+ DESTINATION etc/bash_completion.d
- )
-
- install(FILES
diff --git a/pkgs/tools/security/nitrokey-app/HeaderPath.patch b/pkgs/tools/security/nitrokey-app/HeaderPath.patch
deleted file mode 100644
index 695b7559116..00000000000
--- a/pkgs/tools/security/nitrokey-app/HeaderPath.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/utils/hid_libusb.c b/src/utils/hid_libusb.c
-index bd8c14e..537292d 100644
---- a/src/utils/hid_libusb.c
-+++ b/src/utils/hid_libusb.c
-@@ -44,7 +44,7 @@
- #include
-
- /* GNU / LibUSB */
--#include "libusb.h"
-+#include "libusb-1.0/libusb.h"
- #include "iconv.h"
-
- #include "hidapi.h"
diff --git a/pkgs/tools/security/nitrokey-app/default.nix b/pkgs/tools/security/nitrokey-app/default.nix
index 5e1baa4f57b..1443409c022 100644
--- a/pkgs/tools/security/nitrokey-app/default.nix
+++ b/pkgs/tools/security/nitrokey-app/default.nix
@@ -1,29 +1,27 @@
-{ stdenv, cmake, fetchFromGitHub, libusb1, pkgconfig, qt5 }:
+{ stdenv, cmake, fetchgit, hidapi, libusb1, pkgconfig, qt5 }:
stdenv.mkDerivation rec {
name = "nitrokey-app";
- version = "0.6.3";
+ version = "1.1";
- src = fetchFromGitHub {
- owner = "Nitrokey";
- repo = "nitrokey-app";
- rev = "v${version}";
- sha256 = "1l5l4lwxmyd3jrafw19g12sfc42nd43sv7h7i4krqxnkk6gfx11q";
+ src = fetchgit {
+ url = "https://github.com/Nitrokey/nitrokey-app.git";
+ rev = "refs/tags/v${version}";
+ sha256 = "11pz1p5qgghkr5f8s2wg34zqhxk2vq465i73w1h479j88x35rdp0";
};
buildInputs = [
+ hidapi
libusb1
qt5.qtbase
+ qt5.qttranslations
];
nativeBuildInputs = [
cmake
pkgconfig
];
- patches = [
- ./FixInstallDestination.patch
- ./HeaderPath.patch
- ];
cmakeFlags = "-DHAVE_LIBAPPINDICATOR=NO";
+
meta = with stdenv.lib; {
description = "Provides extra functionality for the Nitrokey Pro and Storage";
longDescription = ''
@@ -34,6 +32,6 @@ stdenv.mkDerivation rec {
homepage = https://github.com/Nitrokey/nitrokey-app;
repositories.git = https://github.com/Nitrokey/nitrokey-app.git;
license = licenses.gpl3;
- maintainer = maintainers.kaiha;
+ maintainers = with maintainers; [ kaiha fpletz ];
};
}
diff --git a/pkgs/tools/security/nitrokey-app/udev-rules.nix b/pkgs/tools/security/nitrokey-app/udev-rules.nix
new file mode 100644
index 00000000000..99947a0eefe
--- /dev/null
+++ b/pkgs/tools/security/nitrokey-app/udev-rules.nix
@@ -0,0 +1,25 @@
+{ stdenv, nitrokey-app
+, group ? "nitrokey"
+}:
+
+stdenv.mkDerivation {
+ name = "nitrokey-udev-rules";
+
+ inherit (nitrokey-app) src;
+
+ dontBuild = true;
+
+ patchPhase = ''
+ substituteInPlace data/41-nitrokey.rules --replace plugdev "${group}"
+ '';
+
+ installPhase = ''
+ mkdir -p $out/etc/udev/rules.d
+ cp data/41-nitrokey.rules $out/etc/udev/rules.d
+ '';
+
+ meta = {
+ description = "udev rules for Nitrokeys";
+ inherit (nitrokey-app.meta) homepage license maintainers;
+ };
+}
diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix
index 5a40837f1d9..e3aaca2e5b2 100644
--- a/pkgs/tools/security/pcsclite/default.nix
+++ b/pkgs/tools/security/pcsclite/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "pcsclite-${version}";
- version = "1.8.20";
+ version = "1.8.21";
src = fetchurl {
- # This URL changes in unpredictable ways, so it is not sensicle
+ # This URL changes in unpredictable ways, so it is not sensible
# to put a version variable in there.
- url = "https://alioth.debian.org/frs/download.php/file/4203/pcsc-lite-1.8.20.tar.bz2";
- sha256 = "1ckb0jf4n585a4j26va3jm2nrv3c1y38974514f8qy3c04a02zgc";
+ url = "https://alioth.debian.org/frs/download.php/file/4216/pcsc-lite-1.8.21.tar.bz2";
+ sha256 = "1b8kwl81f6s3y7qh68ahr8sp8a0w6m464v9b3s4zxq2cgpmnaczy";
};
patches = [ ./no-dropdir-literals.patch ];
diff --git a/pkgs/tools/security/pgpdump/default.nix b/pkgs/tools/security/pgpdump/default.nix
index 1e33c18753a..dfe4579aa58 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/ssdeep/default.nix b/pkgs/tools/security/ssdeep/default.nix
index b581d800794..0a9804a743b 100644
--- a/pkgs/tools/security/ssdeep/default.nix
+++ b/pkgs/tools/security/ssdeep/default.nix
@@ -9,6 +9,9 @@ stdenv.mkDerivation rec {
sha256 = "1igqy0j7jrklb8fdlrm6ald4cyl1fda5ipfl8crzyl6bax2ajk3f";
};
+ # Hack to avoid TMPDIR in RPATHs.
+ preFixup = ''rm -rf "$(pwd)" '';
+
# For some reason (probably a build system bug), the binary isn't
# properly linked to $out/lib to find libfuzzy.so
postFixup = stdenv.lib.optionalString (!stdenv.isDarwin) ''
diff --git a/pkgs/tools/security/sslscan/default.nix b/pkgs/tools/security/sslscan/default.nix
index 90034b641a0..87fda1467f0 100644
--- a/pkgs/tools/security/sslscan/default.nix
+++ b/pkgs/tools/security/sslscan/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "sslscan-${version}";
- version = "1.11.8";
+ version = "1.11.10";
src = fetchFromGitHub {
owner = "rbsec";
repo = "sslscan";
rev = "${version}-rbsec";
- sha256 = "0vm9r0hmpb6ifix2biqbr7za1rld9yx8hi8vf7j69vcm647z7aas";
+ sha256 = "1bxr7p7nhg4b8wkcm7j2xk10gf370sqcvl06vbgnqd3azp55fhpf";
};
buildInputs = [ openssl ];
diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix
index 50782f17670..785ba93f137 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/tools/text/diffutils/default.nix b/pkgs/tools/text/diffutils/default.nix
index 587c89554aa..787750c8ecf 100644
--- a/pkgs/tools/text/diffutils/default.nix
+++ b/pkgs/tools/text/diffutils/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, xz, coreutils ? null }:
stdenv.mkDerivation rec {
- name = "diffutils-3.5";
+ name = "diffutils-3.6";
src = fetchurl {
url = "mirror://gnu/diffutils/${name}.tar.xz";
- sha256 = "0csmqfz8ks23kdjsq0v2ll1acqiz8lva06dj19mwmymrsp69ilys";
+ sha256 = "1mivg0fy3a6fcn535ln8nkgfj6vxh5hsxxs5h6692wxmsjyyh8fn";
};
outputs = [ "out" "info" ];
diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix
index df6a1119800..aa9ece8955b 100644
--- a/pkgs/tools/text/groff/default.nix
+++ b/pkgs/tools/text/groff/default.nix
@@ -1,6 +1,7 @@
{ stdenv, fetchurl, perl, groff
, ghostscript #for postscript and html output
, psutils, netpbm #for html output
+, buildPackages
}:
stdenv.mkDerivation rec {
@@ -49,7 +50,7 @@ stdenv.mkDerivation rec {
# Trick to get the build system find the proper 'native' groff
# http://www.mail-archive.com/bug-groff@gnu.org/msg01335.html
preBuild = ''
- makeFlags="GROFF_BIN_PATH=${groff}/bin GROFFBIN=${groff}/bin/groff"
+ makeFlags="GROFF_BIN_PATH=${buildPackages.groff}/bin GROFFBIN=${buildPackages.groff}/bin/groff"
'';
};
diff --git a/pkgs/tools/typesetting/halibut/default.nix b/pkgs/tools/typesetting/halibut/default.nix
index 487af940077..84cd2cf921a 100644
--- a/pkgs/tools/typesetting/halibut/default.nix
+++ b/pkgs/tools/typesetting/halibut/default.nix
@@ -1,11 +1,11 @@
{stdenv, fetchurl, perl}:
stdenv.mkDerivation rec {
- name = "halibut-1.1";
+ name = "halibut-1.2";
src = fetchurl {
- url = "http://www.chiark.greenend.org.uk/~sgtatham/halibut/${name}.tar.gz";
- sha256 = "18409ir55rsa5gkizw2hsr86wgv176jms2dc52px62gd246rar5r";
+ url = "http://www.chiark.greenend.org.uk/~sgtatham/halibut/${name}/${name}.tar.gz";
+ sha256 = "0gqnhfqf555rfpk5xj1imbdxnbkkrv4wl3rrdb1r0wgj81igpv8s";
};
buildInputs = [ perl ];
diff --git a/pkgs/tools/typesetting/pdf2htmlEX/default.nix b/pkgs/tools/typesetting/pdf2htmlEX/default.nix
index a75e883b179..b6d29052dcc 100644
--- a/pkgs/tools/typesetting/pdf2htmlEX/default.nix
+++ b/pkgs/tools/typesetting/pdf2htmlEX/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
glib
cairo
pango
- (poppler.override { withData = true; })
+ poppler
fontforge
openjdk8
];
diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix
index 2c34a9aff32..18ab2d1f9c7 100644
--- a/pkgs/tools/typesetting/sile/default.nix
+++ b/pkgs/tools/typesetting/sile/default.nix
@@ -45,6 +45,9 @@ stdenv.mkDerivation rec {
--set LUA_CPATH "${luaCPath};" \
'';
+ # Hack to avoid TMPDIR in RPATHs.
+ preFixup = ''rm -rf "$(pwd)" && mkdir "$(pwd)" '';
+
meta = {
description = "A typesetting system";
longDescription = ''
diff --git a/pkgs/tools/virtualization/cloudmonkey/default.nix b/pkgs/tools/virtualization/cloudmonkey/default.nix
new file mode 100644
index 00000000000..b133bc094f9
--- /dev/null
+++ b/pkgs/tools/virtualization/cloudmonkey/default.nix
@@ -0,0 +1,27 @@
+{ python2Packages, lib }:
+
+with python2Packages;
+
+buildPythonApplication rec {
+
+ name = "${pname}-${version}";
+ pname = "cloudmonkey";
+ version = "5.3.3";
+
+ propagatedBuildInputs = [ argcomplete pygments ];
+
+ doCheck = false; # upstream has no tests defined
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "064yk3lwl272nyn20xxrh0qxzh3r1rl9015qqf2i4snqdzwd5cf7";
+ };
+
+ meta = with lib; {
+ description = "CLI for Apache CloudStack.";
+ homepage = "https://cwiki.apache.org/confluence/display/CLOUDSTACK/CloudStack+cloudmonkey+CLI";
+ license = [ licenses.asl20 ];
+ maintainers = [ maintainers.womfoo ];
+ };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 406e92fcd5d..fd6f5093484 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -814,6 +814,8 @@ with pkgs;
cloud-init = callPackage ../tools/virtualization/cloud-init { };
+ cloudmonkey = callPackage ../tools/virtualization/cloudmonkey { };
+
clib = callPackage ../tools/package-management/clib { };
colord-kde = libsForQt5.callPackage ../tools/misc/colord-kde {};
@@ -949,6 +951,10 @@ with pkgs;
envconsul = callPackage ../tools/system/envconsul { };
+ esptool = callPackage ../tools/misc/esptool { };
+
+ esptool-ck = callPackage ../tools/misc/esptool-ck { };
+
f3 = callPackage ../tools/filesystems/f3 { };
facter = callPackage ../tools/system/facter {
@@ -965,6 +971,8 @@ with pkgs;
fsmon = callPackage ../tools/misc/fsmon { };
+ fsql = callPackage ../tools/misc/fsql { };
+
fop = callPackage ../tools/typesetting/fop { };
fondu = callPackage ../tools/misc/fondu { };
@@ -1049,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 { };
@@ -1380,6 +1392,8 @@ with pkgs;
c14 = callPackage ../applications/networking/c14 { };
+ cfssl = callPackage ../tools/security/cfssl { };
+
checkbashisms = callPackage ../development/tools/misc/checkbashisms { };
clamav = callPackage ../tools/security/clamav { };
@@ -1681,6 +1695,8 @@ with pkgs;
eid-viewer = callPackage ../tools/security/eid-viewer { };
+ mcrcon = callPackage ../tools/networking/mcrcon {};
+
### DEVELOPMENT / EMSCRIPTEN
buildEmscriptenPackage = callPackage ../development/em-modules/generic { };
@@ -1715,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 { }
@@ -2617,6 +2634,8 @@ with pkgs;
kdiff3 = libsForQt5.callPackage ../tools/text/kdiff3 { };
+ kwalletcli = libsForQt5.callPackage ../tools/security/kwalletcli { };
+
peruse = libsForQt5.callPackage ../tools/misc/peruse { };
kst = libsForQt5.callPackage ../tools/graphics/kst { gsl = gsl_1; };
@@ -2649,6 +2668,8 @@ with pkgs;
lnav = callPackage ../tools/misc/lnav { };
+ loadlibrary = callPackage ../tools/misc/loadlibrary { };
+
loc = callPackage ../development/misc/loc { };
lockfileProgs = callPackage ../tools/misc/lockfile-progs { };
@@ -2697,6 +2718,10 @@ with pkgs;
mxt-app = callPackage ../misc/mxt-app { };
+ nagstamon = callPackage ../tools/nagstamon {
+ pythonPackages = python3Packages;
+ };
+
netdata = callPackage ../tools/system/netdata { };
netsurf = recurseIntoAttrs (let callPackage = newScope pkgs.netsurf; in rec {
@@ -3611,6 +3636,8 @@ with pkgs;
pingtcp = callPackage ../tools/networking/pingtcp { };
+ pirate-get = callPackage ../tools/networking/pirate-get { };
+
pius = callPackage ../tools/security/pius { };
pixiewps = callPackage ../tools/networking/pixiewps {};
@@ -3781,6 +3808,8 @@ with pkgs;
quilt = callPackage ../development/tools/quilt { };
+ wiggle = callPackage ../development/tools/wiggle { };
+
radamsa = callPackage ../tools/security/radamsa { };
radarr = callPackage ../servers/radarr { };
@@ -4050,6 +4079,8 @@ with pkgs;
silver-searcher = callPackage ../tools/text/silver-searcher { };
ag = self.silver-searcher;
+ simpleproxy = callPackage ../tools/networking/simpleproxy { };
+
simplescreenrecorder = callPackage ../applications/video/simplescreenrecorder { };
sipsak = callPackage ../tools/networking/sipsak { };
@@ -4196,6 +4227,10 @@ with pkgs;
stunnel = callPackage ../tools/networking/stunnel { };
+ stutter = haskell.lib.overrideCabal (haskell.lib.justStaticExecutables haskellPackages.stutter) (drv: {
+ preCheck = "export PATH=dist/build/stutter:$PATH";
+ });
+
strongswan = callPackage ../tools/networking/strongswan { };
strongswanTNC = callPackage ../tools/networking/strongswan { enableTNC=true; };
@@ -4473,6 +4508,8 @@ with pkgs;
vim-vint = callPackage ../development/tools/vim-vint { };
+ vimer = callPackage ../tools/misc/vimer { };
+
vit = callPackage ../applications/misc/vit { };
vnc2flv = callPackage ../tools/video/vnc2flv {};
@@ -6168,7 +6205,7 @@ with pkgs;
# available as `pythonPackages.tkinter` and can be used as any other Python package.
python = python2;
python2 = python27;
- python3 = python35;
+ python3 = python36;
# Python interpreter that is build with all modules, including tkinter.
# These are for compatibility and should not be used inside Nixpkgs.
@@ -6182,9 +6219,9 @@ with pkgs;
python36Full = python36.override{x11Support=true;};
# pythonPackages further below, but assigned here because they need to be in sync
- pythonPackages = python2Packages;
- python2Packages = python27Packages;
- python3Packages = python35Packages;
+ pythonPackages = python.pkgs;
+ python2Packages = python2.pkgs;
+ python3Packages = python3.pkgs;
python27 = callPackage ../development/interpreters/python/cpython/2.7 {
self = python27;
@@ -6194,19 +6231,22 @@ with pkgs;
self = python33;
inherit (darwin) CF configd;
};
- python34 = hiPrio (callPackage ../development/interpreters/python/cpython/3.4 {
+ python34 = callPackage ../development/interpreters/python/cpython/3.4 {
inherit (darwin) CF configd;
self = python34;
- });
- python35 = hiPrio (callPackage ../development/interpreters/python/cpython/3.5 {
+ };
+ python35 = callPackage ../development/interpreters/python/cpython/3.5 {
inherit (darwin) CF configd;
self = python35;
- });
+ };
python36 = callPackage ../development/interpreters/python/cpython/3.6 {
inherit (darwin) CF configd;
self = python36;
};
+ # Should eventually be moved inside Python interpreters.
+ python-setup-hook = callPackage ../development/interpreters/python/setup-hook.nix { };
+
pypy = pypy27;
pypy27 = callPackage ../development/interpreters/python/pypy/2.7 {
@@ -6711,7 +6751,7 @@ with pkgs;
flow = callPackage ../development/tools/analysis/flow {
inherit (darwin.apple_sdk.frameworks) CoreServices;
inherit (darwin) cf-private;
- ocaml = ocaml_4_02;
+ inherit (ocamlPackages_4_03) ocaml findlib camlp4 sedlex ocamlbuild;
};
framac = callPackage ../development/tools/analysis/frama-c { };
@@ -6831,6 +6871,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;
};
@@ -6946,6 +6988,8 @@ with pkgs;
peg = callPackage ../development/tools/parsing/peg { };
+ pgcli = callPackage ../development/tools/database/pgcli {};
+
phantomjs = callPackage ../development/tools/phantomjs { };
phantomjs2 = callPackage ../development/tools/phantomjs2 { };
@@ -7146,7 +7190,8 @@ with pkgs;
valgrind = callPackage ../development/tools/analysis/valgrind {
inherit (darwin) xnu bootstrap_cmds cctools;
llvm = llvm_39;
- };
+ };
+ valgrind-light = self.valgrind.override { gdb = null; };
valkyrie = callPackage ../development/tools/analysis/valkyrie { };
@@ -8264,7 +8309,7 @@ with pkgs;
libagar_test = callPackage ../development/libraries/libagar/libagar_test.nix { };
libao = callPackage ../development/libraries/libao {
- usePulseAudio = config.pulseaudio or true;
+ usePulseAudio = config.pulseaudio or stdenv.isLinux;
inherit (darwin.apple_sdk.frameworks) CoreAudio CoreServices AudioUnit;
};
@@ -9235,12 +9280,16 @@ with pkgs;
inherit (darwin) apple_sdk;
}
else alternative;
+
mesa_noglu = mesaDarwinOr (callPackage ../development/libraries/mesa {
# makes it slower, but during runtime we link against just mesa_drivers
# through /run/opengl-driver*, which is overriden according to config.grsecurity
- grsecEnabled = true;
- llvmPackages = llvmPackages_39;
+ # grsecEnabled = true; # no more support in nixpkgs ATM
+
+ # llvm-4.0.0 won't pass tests on aarch64
+ llvmPackages = if system == "aarch64-linux" then llvmPackages_39 else llvmPackages_4;
});
+
mesa_glu = mesaDarwinOr (callPackage ../development/libraries/mesa-glu { });
mesa_drivers = mesaDarwinOr (
let mo = mesa_noglu.override {
@@ -10331,7 +10380,7 @@ with pkgs;
wcslib = callPackage ../development/libraries/wcslib { };
- webkitgtk = webkitgtk214x;
+ webkitgtk = webkitgtk216x;
webkitgtk24x = callPackage ../development/libraries/webkitgtk/2.4.nix {
harfbuzz = harfbuzz-icu;
@@ -10339,7 +10388,7 @@ with pkgs;
inherit (darwin) libobjc;
};
- webkitgtk214x = callPackage ../development/libraries/webkitgtk/2.14.nix {
+ webkitgtk216x = callPackage ../development/libraries/webkitgtk/2.16.nix {
harfbuzz = harfbuzz-icu;
gst-plugins-base = gst_all_1.gst-plugins-base;
};
@@ -10699,9 +10748,9 @@ with pkgs;
python34Packages = python34.pkgs;
- python35Packages = recurseIntoAttrs python35.pkgs;
+ python35Packages = python35.pkgs;
- python36Packages = python36.pkgs;
+ python36Packages = recurseIntoAttrs python36.pkgs;
pypyPackages = pypy.pkgs;
@@ -10850,6 +10899,10 @@ with pkgs;
diod = callPackage ../servers/diod { lua = lua5_1; };
+ dkimproxy = callPackage ../servers/mail/dkimproxy {
+ inherit (perlPackages) Error MailDKIM MIMEtools NetServer;
+ };
+
dnschain = callPackage ../servers/dnschain { };
dovecot = callPackage ../servers/mail/dovecot { };
@@ -13348,7 +13401,7 @@ with pkgs;
clipit = callPackage ../applications/misc/clipit { };
cloud-print-connector = callPackage ../servers/cloud-print-connector { };
-
+
cmatrix = callPackage ../applications/misc/cmatrix { };
cmus = callPackage ../applications/audio/cmus {
@@ -16910,6 +16963,8 @@ with pkgs;
wxGTK = wxGTK28.override { unicode = false; };
};
+ galaxis = callPackage ../games/galaxis { };
+
gambatte = callPackage ../games/gambatte { };
garden-of-coloured-lights = callPackage ../games/garden-of-coloured-lights { allegro = allegro4; };
@@ -17784,7 +17839,7 @@ with pkgs;
coqPackages_8_5 = mkCoqPackages_8_5 coqPackages_8_5;
coqPackages_8_6 = mkCoqPackages_8_6 coqPackages_8_6;
coqPackages = coqPackages_8_6;
-
+
coq_8_4 = coqPackages_8_4.coq;
coq_8_5 = coqPackages_8_5.coq;
coq_8_6 = coqPackages_8_6.coq;
@@ -18083,6 +18138,8 @@ with pkgs;
motif = null; # motif or lesstif
};
+ cernlib = callPackage ../development/libraries/physics/cernlib { };
+
g4py = callPackage ../development/libraries/physics/geant4/g4py { };
hepmc = callPackage ../development/libraries/physics/hepmc { };
@@ -18526,10 +18583,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 {};
@@ -18665,6 +18722,7 @@ with pkgs;
gphoto2Support = true;
ldapSupport = true;
pulseaudioSupport = true;
+ udevSupport = true;
});
wineStable = self.wine.override { wineRelease = "stable"; };
wineUnstable = lowPrio (self.wine.override { wineRelease = "unstable"; });
@@ -18815,6 +18873,7 @@ with pkgs;
xrq = callPackage ../applications/misc/xrq { };
nitrokey-app = callPackage ../tools/security/nitrokey-app { };
+ nitrokey-udev-rules = callPackage ../tools/security/nitrokey-app/udev-rules.nix { };
fpm2 = callPackage ../tools/security/fpm2 { };
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 3a185bc0a10..83c7d610c72 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/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 4874d5d01a2..eaa46c16e5a 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3800,17 +3800,16 @@ let self = _self // overrides; _self = with self; {
};
DBIxClassSchemaLoader = buildPerlPackage rec {
- name = "DBIx-Class-Schema-Loader-0.07045";
+ name = "DBIx-Class-Schema-Loader-0.07047";
src = fetchurl {
url = "mirror://cpan/authors/id/I/IL/ILMARI/${name}.tar.gz";
- sha256 = "b132c667aa7dfe6f054e097c3e572a7dbf8ad433500f085e372740d5bc23a440";
+ sha256 = "6671fb3afbb1b4f3eb5905f34fb47ce18b29af3e055e479b06c09424bbc1421b";
};
buildInputs = [ ConfigAny ConfigGeneral DBDSQLite DBIxClassIntrospectableM2M Moose MooseXMarkAsMethods MooseXNonMoose TestDeep TestDifferences TestException TestPod TestWarn namespaceautoclean ];
propagatedBuildInputs = [ CarpClan ClassAccessorGrouped ClassC3Componentised ClassInspector ClassUnload DBIxClass DataDump HashMerge LinguaENInflectNumber LinguaENInflectPhrase LinguaENTagger MROCompat ScalarListUtils ScopeGuard StringCamelCase StringToIdentifierEN TryTiny namespaceclean ];
meta = {
description = "Create a DBIx::Class::Schema based on a database";
license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
- maintainers = [ maintainers.rycee ];
};
};
@@ -10157,6 +10156,19 @@ let self = _self // overrides; _self = with self; {
};
};
+ NTLM = buildPerlPackage rec {
+ name = "NTLM-1.09";
+ src = fetchurl {
+ url = "mirror://cpan/authors/id/N/NB/NBEBOUT/${name}.tar.gz";
+ sha256 = "c823e30cda76bc15636e584302c960e2b5eeef9517c2448f7454498893151f85";
+ };
+ propagatedBuildInputs = [ DigestHMAC ];
+ meta = {
+ license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+ maintainers = [ maintainers.pSub ];
+ };
+ };
+
ObjectAccessor = buildPerlPackage {
name = "Object-Accessor-0.48";
src = fetchurl {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f40f60c6294..98c7fb77cb3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -53,15 +53,11 @@ let
let
url = "https://files.pythonhosted.org/packages/${python}/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}-${python}-${abi}-${platform}.whl";
in pkgs.fetchurl {inherit url sha256;};
-
- fetchSource = {pname, version, sha256}:
+ fetchSource = {pname, version, sha256, extension ? "tar.gz"}:
# Fetch a source tarball.
let
- urls = [
- "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}.tar.gz"
- "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}.zip"
- ];
- in pkgs.fetchurl {inherit urls sha256;};
+ url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}.${extension}";
+ in pkgs.fetchurl {inherit url sha256;};
fetcher = (if format == "wheel" then fetchWheel
else if format == "setuptools" then fetchSource
else throw "Unsupported kind ${kind}");
@@ -238,6 +234,8 @@ in {
nltk = callPackage ../development/python-modules/nltk.nix { };
+ ntlm-auth = callPackage ../development/python-modules/ntlm-auth { };
+
pitz = callPackage ../applications/misc/pitz { };
plantuml = callPackage ../tools/misc/plantuml { };
@@ -644,23 +642,7 @@ in {
};
- alembic = buildPythonPackage rec {
- name = "alembic-0.8.3";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/a/alembic/${name}.tar.gz";
- sha256 = "1sgwvwylzd5h14130mwr0cbyy0fil0a1bq0d0ki97wqvkic3db7f";
- };
-
- buildInputs = with self; [ pytest pytestcov mock coverage ];
- propagatedBuildInputs = with self; [ Mako sqlalchemy python-editor ];
-
- meta = {
- homepage = http://bitbucket.org/zzzeek/alembic;
- description = "A database migration tool for SQLAlchemy";
- license = licenses.mit;
- };
- };
+ alembic = callPackage ../development/python-modules/alembic {};
ansicolors = buildPythonPackage rec {
name = "ansicolors-${version}";
@@ -1022,20 +1004,7 @@ in {
};
};
- appdirs = buildPythonPackage rec {
- name = "appdirs-1.4.0";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/a/appdirs/appdirs-1.4.0.tar.gz";
- sha256 = "8fc245efb4387a4e3e0ac8ebcc704582df7d72ff6a42a53f5600bbb18fdaadc5";
- };
-
- meta = {
- description = "A python module for determining appropriate platform-specific dirs";
- homepage = http://github.com/ActiveState/appdirs;
- license = licenses.mit;
- };
- };
+ appdirs = callPackage ../development/python-modules/appdirs { };
application = buildPythonPackage rec {
pname = "python-application";
@@ -1159,6 +1128,8 @@ in {
};
};
+ argcomplete = callPackage ../development/python-modules/argcomplete { };
+
area53 = buildPythonPackage (rec {
name = "Area53-0.94";
@@ -1305,36 +1276,8 @@ in {
};
- argparse = buildPythonPackage (rec {
- name = "argparse-1.4.0";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/a/argparse/${name}.tar.gz";
- sha256 = "1r6nznp64j68ih1k537wms7h57nvppq0szmwsaf99n71bfjqkc32";
- };
-
- checkPhase = ''
- export PYTHONPATH=`pwd`/build/lib:$PYTHONPATH
- ${python.interpreter} test/test_argparse.py
- '';
-
- # ordering issues in tests
- doCheck = !isPy3k;
-
- meta = {
- homepage = http://code.google.com/p/argparse/;
- license = licenses.asl20;
- description = "argparse: Python command line parser";
- longDescription = ''
- The argparse module makes writing command line tools in Python
- easy. Just briefly describe your command line interface and
- argparse will take care of the rest, including: parsing the
- arguments and flags from sys.argv, converting arg strings into
- objects for your program, formatting and printing any help
- messages, and much more.
- '';
- };
- });
+ # argparse is part of stdlib in 2.7 and 3.2+
+ argparse = null;
astroid = callPackage ../development/python-modules/astroid { };
@@ -2623,7 +2566,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";
@@ -4094,11 +4037,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 ];
@@ -5299,28 +5242,7 @@ in {
pytest_xdist = callPackage ../development/python-modules/pytest-xdist { };
- pytest-localserver = buildPythonPackage rec {
- name = "pytest-localserver-${version}";
- version = "0.3.5";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/p/pytest-localserver/${name}.tar.gz";
- sha256 = "0dvqspjr6va55zwmnnc2mmpqc7mm65kxig9ya44x1z8aadzxpa4p";
- };
-
- propagatedBuildInputs = with self; [ werkzeug ];
- buildInputs = with self; [ pytest six requests ];
-
- checkPhase = ''
- py.test
- '';
-
- meta = {
- description = "Plugin for the pytest testing framework to test server connections locally";
- homepage = https://pypi.python.org/pypi/pytest-localserver;
- license = licenses.mit;
- };
- };
+ pytest-localserver = callPackage ../development/python-modules/pytest-localserver { };
pytest-subtesthack = buildPythonPackage rec {
name = "pytest-subtesthack-${version}";
@@ -6299,6 +6221,8 @@ in {
nosetests -v --cover-min-percentage 1
'';
+ doCheck = false;
+
buildInputs = with self; [ coverage tornado mock nose psutil pysocks ];
meta = {
@@ -8202,6 +8126,8 @@ in {
netcdf4 = callPackage ../development/python-modules/netcdf4.nix { };
+ Nikola = callPackage ../development/python-modules/Nikola { };
+
nxt-python = buildPythonPackage rec {
version = "unstable-20160819";
pname = "nxt-python";
@@ -8543,29 +8469,6 @@ in {
};
};
- pirate-get = buildPythonPackage rec {
- name = "pirate-get-${version}";
- version = "0.2.9";
-
- disabled = !isPy3k;
- doCheck = false;
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/p/pirate-get/${name}.tar.gz";
- sha256 = "1djmfghnwsn3z525h6d98r0lllayvzsg71z0gskk25zr24kjs24a";
- };
-
- propagatedBuildInputs = with self; [ colorama veryprettytable beautifulsoup4 ];
-
- meta = {
- description = "A command line interface for The Pirate Bay";
- homepage = https://github.com/vikstrous/pirate-get;
- license = licenses.gpl1;
- maintainers = with maintainers; [ rnhmjoj ];
- platforms = platforms.unix;
- };
- };
-
plotly = callPackage ../development/python-modules/plotly { };
podcastparser = callPackage ../development/python-modules/podcastparser { };
@@ -10195,28 +10098,10 @@ in {
};
};
- django_hijack = buildPythonPackage rec {
- name = "django-hijack-${version}";
- version = "2.0.7";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/d/django-hijack/${name}.tar.gz";
- sha256 = "0rpi1bkfx74xfbb2nk874kfdra1jcqp2vzky1r3z7zidlc9kah04";
- };
-
- # TODO improve the that multi-override necessity (the fixpoint based python
- # packages work can be the solution)
- propagatedBuildInputs = with self; [ django_1_9 (django_compat.override {
- django = django_1_9;
- django_nose = django_nose.override { propagatedBuildInputs = [django_1_9 nose]; };
- }) ];
-
- meta = {
- description = "Allows superusers to hijack (=login as) and work on behalf of another user";
- homepage = https://github.com/arteria/django-hijack;
- license = licenses.mit;
- };
- };
+ # This package may need an older version of Django.
+ # Override the package set and set e.g. `django = super.django_1_9`.
+ # See the Nixpkgs manual for examples on how to override the package set.
+ django_hijack = callPackage ../development/python-modules/django-hijack { };
django_nose = buildPythonPackage rec {
name = "django-nose-${version}";
@@ -10798,26 +10683,9 @@ in {
};
};
- feedgenerator = buildPythonPackage (rec {
- name = "feedgenerator-1.7";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/f/feedgenerator/${name}.tar.gz";
- sha256 = "5d6b0b10134ac392be0c0c3a39c0e1d7e9c17cc7894590f75981e3f497a4a60f";
- };
-
- buildInputs = [ pkgs.glibcLocales ];
-
- LC_ALL="en_US.UTF-8";
-
- propagatedBuildInputs = with self; [ six pytz ];
-
- meta = {
- description = "Standalone version of django.utils.feedgenerator, compatible with Py3k";
- homepage = https://github.com/dmdm/feedgenerator-py3k.git;
- maintainers = with maintainers; [ garbas ];
- };
- });
+ feedgenerator = callPackage ../development/python-modules/feedgenerator {
+ inherit (pkgs) glibcLocales;
+ };
feedparser = buildPythonPackage (rec {
name = "feedparser-5.2.1";
@@ -11069,30 +10937,7 @@ in {
flask_ldap_login = callPackage ../development/python-modules/flask-ldap-login.nix { };
- flask_migrate = buildPythonPackage rec {
- name = "Flask-Migrate-${version}";
- version = "1.7.0";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/F/Flask-Migrate/Flask-Migrate-1.7.0.tar.gz";
- sha256 = "16d7vnaj9xmxvb3qbcmhahm3ldfdhzzi6y221h62x4v1v1jayx7v";
- };
-
- # When tests run with python3*, tests should run commands as "python3 ",
- # not "python "
- patchPhase = ''
- substituteInPlace tests/test_migrate.py --replace "python" "${python.executable}"
- substituteInPlace tests/test_multidb_migrate.py --replace "python" "${python.executable}"
- '';
-
- propagatedBuildInputs = with self ; [ flask flask_sqlalchemy flask_script alembic ];
-
- meta = {
- description = "SQLAlchemy database migrations for Flask applications using Alembic";
- license = licenses.mit;
- homepage = https://github.com/miguelgrinberg/Flask-Migrate;
- };
- };
+ flask_migrate = callPackage ../development/python-modules/flask-migrate { };
flask_oauthlib = callPackage ../development/python-modules/flask-oauthlib.nix { };
@@ -11438,24 +11283,7 @@ in {
inherit python;
};
- fonttools = buildPythonPackage (rec {
- version = "3.0";
- name = "fonttools-${version}";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/F/FontTools/fonttools-${version}.tar.gz";
- sha256 = "0f4iblpbf3y3ghajiccvdwk2f46cim6dsj6fq1kkrbqfv05dr4nz";
- };
-
- buildInputs = with self; [
- numpy
- ];
-
- meta = {
- homepage = "https://github.com/behdad/fonttools";
- description = "Font file processing tools";
- };
- });
+ fonttools = callPackage ../development/python-modules/fonttools { };
foolscap = buildPythonPackage (rec {
name = "foolscap-${version}";
@@ -11591,37 +11419,7 @@ in {
};
};
- future = buildPythonPackage rec {
- version = "0.15.2";
- name = "future-${version}";
-
- src = pkgs.fetchurl {
- url = "http://github.com/PythonCharmers/python-future/archive/v${version}.tar.gz";
- sha256 = "0vm61j5br6jiry6pgcxnwvxhki8ksnirp7k9mcbmxmgib3r60xd3";
- };
-
- propagatedBuildInputs = with self; optionals isPy26 [ importlib argparse ];
- doCheck = false;
-
- meta = {
- description = "Clean single-source support for Python 3 and 2";
- longDescription = ''
- python-future is the missing compatibility layer between Python 2 and
- Python 3. It allows you to use a single, clean Python 3.x-compatible
- codebase to support both Python 2 and Python 3 with minimal overhead.
-
- It provides future and past packages with backports and forward ports
- of features from Python 3 and 2. It also comes with futurize and
- pasteurize, customized 2to3-based scripts that helps you to convert
- either Py2 or Py3 code easily to support both Python 2 and 3 in a
- single clean Py3-style codebase, module by module.
- '';
- homepage = https://python-future.org;
- downloadPage = https://github.com/PythonCharmers/python-future/releases;
- license = licenses.mit;
- maintainers = with maintainers; [ prikhi ];
- };
- };
+ future = callPackage ../development/python-modules/future { };
futures = buildPythonPackage rec {
name = "futures-${version}";
@@ -13467,7 +13265,7 @@ in {
};
};
- llvmlite = callPackage ../development/python-modules/llvmlite {llvm=pkgs.llvm_39;};
+ llvmlite = callPackage ../development/python-modules/llvmlite {llvm=pkgs.llvm_4;};
lockfile = buildPythonPackage rec {
pname = "lockfile";
@@ -15060,12 +14858,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 = {
@@ -15551,26 +15349,7 @@ in {
};
};
- emoji = buildPythonPackage rec {
- name = "emoji-${version}";
- version = "0.3.9";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/e/emoji/${name}.tar.gz";
- sha256 = "19p5c2nlq0w9972rf9fghyswnijwgig5f8cyzs32kppnmzvzbkxw";
- };
-
- buildInputs = with self; [ nose ];
-
- checkPhase = ''nosetests'';
-
- meta = {
- description = "Emoji for Python";
- homepage = https://pypi.python.org/pypi/emoji/;
- license = licenses.bsd3;
- maintainers = with maintainers; [ joachifm ];
- };
- };
+ emoji = callPackage ../development/python-modules/emoji { };
ntfy = buildPythonPackage rec {
version = "1.2.0";
@@ -16164,18 +15943,19 @@ in {
});
osc = buildPythonPackage {
- name = "osc-0.156.0-16-g9e6d1a5";
+ name = "osc-0.156.0-94-gd8ba394";
disabled = isPy3k;
src = pkgs.fetchFromGitHub {
owner = "openSUSE";
repo = "osc";
- rev = "64cbb10095cf9ef0270d65fff58085a13bc0abe9";
- sha256 = "0s5kz5ln96ka0f1sa9nyp34c28mkxkrgcxbvysdawlppg7ay9s1z";
+ rev = "d8ba39416bb193a15489cb2ae57847434adbf1c8";
+ sha256 = "0bxl1sjfpdrhyc0qljyqlkffyzn1iywjqgaz2z1y07zq59gc8wq0";
};
buildInputs = with pkgs; [ bashInteractive ]; # needed for bash-completion helper
propagatedBuildInputs = with self; [ urlgrabber m2crypto pyyaml ];
postInstall = ''
ln -s $out/bin/osc-wrapper.py $out/bin/osc
+ install -D -m444 osc.fish $out/etc/fish/completions/osc.fish
install -D -m555 dist/osc.complete $out/share/bash-completion/helpers/osc-helper
mkdir -p $out/share/bash-completion/completions
cat >>$out/share/bash-completion/completions/osc <="
- rm tests/test_rowlimit.py
- '';
-
- meta = {
- description = "Command-line interface for PostgreSQL";
- longDescription = ''
- Rich command-line interface for PostgreSQL with auto-completion and
- syntax highlighting.
- '';
- homepage = http://pgcli.com;
- license = licenses.bsd3;
- maintainers = with maintainers; [ nckx ];
- };
- };
-
pgspecial = buildPythonPackage rec {
- name = "pgspecial-${version}";
- version = "1.6.0";
+ pname = "pgspecial";
+ version = "1.7.0";
+ name = "${pname}-${version}";
- src = pkgs.fetchurl {
- sha256 = "09ilalpgcl86f79648qsjm87dqi97bc70y51nrf0b3i1py3mhs2m";
- url = "mirror://pypi/p/pgspecial/${name}.tar.gz";
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0jnv8mr75pjhj2azb2ljhhkd7s1b0b59f7xps322kqbpmwf26zi9";
};
buildInputs = with self; [ pytest psycopg2 ];
@@ -18200,7 +17899,7 @@ in {
# to force it a little.
installFlags = [ "--ignore-installed" ];
- buildInputs = with self; [ mock scripttest virtualenv pretend pytest ];
+ checkInputs = with self; [ mock scripttest virtualenv pretend pytest ];
# Pip wants pytest, but tests are not distributed
doCheck = false;
@@ -21211,25 +20910,7 @@ in {
};
};
- pywinrm = buildPythonPackage rec {
- version = "0.1.1";
- name = "pywinrm-${version}";
-
- src = pkgs.fetchurl {
- url = "https://github.com/diyan/pywinrm/archive/v${version}.tar.gz";
- sha256 = "1pc0987f6q5sxcgm50a1k1xz2pk45ny9xxnyapaf60662rcavvfb";
- };
-
- propagatedBuildInputs = with self; [ isodate kerberos xmltodict ];
-
- meta = {
- homepage = "http://github.com/diyan/pywinrm/";
- description = "Python library for Windows Remote Management";
- license = licenses.mit;
- # error: libgssapi_krb5.so: cannot open shared object file: No such file or directory
- broken = true; #
- };
- };
+ pywinrm = callPackage ../development/python-modules/pywinrm { };
PyXAPI = stdenv.mkDerivation rec {
name = "PyXAPI-0.1";
@@ -21492,6 +21173,8 @@ in {
};
};
+ requests_ntlm = callPackage ../development/python-modules/requests_ntlm { };
+
requests_oauthlib = callPackage ../development/python-modules/requests-oauthlib.nix { };
requests_toolbelt = buildPythonPackage rec {
@@ -22201,21 +21884,7 @@ in {
};
};
- ropper = buildPythonApplication rec {
- name = "ropper-1.10.10";
- src = pkgs.fetchurl {
- url = "mirror://pypi/r/ropper/${name}.tar.gz";
- sha256 = "1676e07947a19df9d17002307a7555c2647a4224d6f2869949e8fc4bd18f2e87";
- };
- propagatedBuildInputs = with self; [ capstone filebytes ];
- meta = with pkgs.stdenv.lib; {
- homepage = "https://scoding.de/ropper/";
- license = licenses.gpl2;
- description = "Show information about files in different file formats";
- maintainers = with maintainers; [ bennofs ];
- };
- };
-
+ ropper = callPackage ../development/python-modules/ropper { };
routes = buildPythonPackage rec {
name = "routes-1.12.3";
@@ -22724,7 +22393,8 @@ in {
sha256 = "0bwyc5markib0i7i2qlyhdzxhiywzxbkfiapldma8m91m82jvwfs";
};
- buildInputs = with self; [ pip pytest ];
+ buildInputs = with self; [ pip ];
+ checkInputs = with self; [ pytest ];
# Seems to fail due to chroot
doCheck = false;
@@ -22893,30 +22563,7 @@ in {
};
};
- simplejson = buildPythonPackage (rec {
- name = "simplejson-3.8.1";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/s/simplejson/${name}.tar.gz";
- sha256 = "14r4l4rcsyf87p2j4ycsbb017n4vzxfmv285rq2gny4w47rwi2j2";
- };
-
- meta = {
- description = "A simple, fast, extensible JSON encoder/decoder for Python";
-
- longDescription = ''
- simplejson is compatible with Python 2.4 and later with no
- external dependencies. It covers the full JSON specification
- for both encoding and decoding, with unicode support. By
- default, encoding is done in an encoding neutral fashion (plain
- ASCII with \uXXXX escapes for unicode characters).
- '';
-
- homepage = http://code.google.com/p/simplejson/;
-
- license = licenses.mit;
- };
- });
+ simplejson = callPackage ../development/python-modules/simplejson { };
simpleldap = buildPythonPackage rec {
version = "0.8";
@@ -24191,32 +23838,7 @@ in {
- sqlalchemy = buildPythonPackage rec {
- name = "SQLAlchemy-${version}";
- version = "1.0.15";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/S/SQLAlchemy/${name}.tar.gz";
- sha256 = "586f5ccf068211795a89ed22d196c5cc3006b6be00261bcac6f584c0b8e0845a";
- };
-
- buildInputs = with self; [ pytest mock pytest_xdist ]
- ++ stdenv.lib.optional (!isPy3k) pysqlite;
-
- # Test-only dependency pysqlite doesn't build on Python 3. This isn't an
- # acceptable reason to make all dependents unavailable on Python 3 as well
- #doCheck = !(isPyPy || isPy3k);
-
- checkPhase = ''
- py.test
- '';
-
- meta = {
- homepage = http://www.sqlalchemy.org/;
- description = "A Python SQL toolkit and Object Relational Mapper";
- license = licenses.mit;
- };
- };
+ sqlalchemy = callPackage ../development/python-modules/sqlalchemy { };
SQLAlchemy-ImageAttach = buildPythonPackage rec {
pname = "SQLAlchemy-ImageAttach";
@@ -26203,28 +25825,7 @@ EOF
};
};
- wheel = buildPythonPackage rec {
- name = "wheel-${version}";
- version = "0.29.0";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/w/wheel/${name}.tar.gz";
- sha256 = "1ebb8ad7e26b448e9caa4773d2357849bf80ff9e313964bcaf79cbf0201a1648";
- };
-
- buildInputs = with self; [ pytest pytestcov coverage ];
-
- propagatedBuildInputs = with self; [ jsonschema ];
-
- # We add this flag to ignore the copy installed by bootstrapped-pip
- installFlags = [ "--ignore-installed" ];
-
- meta = {
- description = "A built-package format for Python";
- license = with licenses; [ mit ];
- homepage = https://bitbucket.org/pypa/wheel/;
- };
- };
+ wheel = callPackage ../development/python-modules/wheel { };
widgetsnbextension = callPackage ../development/python-modules/widgetsnbextension { };
@@ -28018,23 +27619,21 @@ EOF
};
ws4py = buildPythonPackage rec {
- name = "ws4py-${version}";
+ name = "${pname}-${version}";
+ pname = "ws4py";
+ version = "0.4.2";
- version = "git-20130303";
-
- src = pkgs.fetchgit {
- url = "https://github.com/Lawouach/WebSocket-for-Python.git";
- rev = "ace276500ca7e4c357595e3773be151d37bcd6e2";
- sha256 = "1g7nmhjjxjf6vx75dyzns8bpid3b5i02kakk2lh1i297b5rw2rjq";
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0zr3254ky6r7q15l3dhdczfa8i723055zdkqssjifsgcwvirriks";
};
- # python zip complains about old timestamps
- preConfigure = ''
- find -print0 | xargs -0 touch
- '';
+ buildInputs = with self; [ pytest mock ];
+ propagatedBuildInputs = with self; [ asyncio cherrypy gevent tornado ];
- # Tests depend on other packages
- doCheck = false;
+ checkPhase = ''
+ pytest test
+ '';
meta = {
homepage = https://ws4py.readthedocs.org;
@@ -28390,27 +27989,7 @@ EOF
};
- uncertainties = buildPythonPackage rec {
- name = "uncertainties-${version}";
- version = "3.0.1";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/u/uncertainties/${name}.tar.gz";
- sha256 = "de0765cac6911e5afa93ee941063a07b4a98dbd9c314c5eea4ab14bfff0054a4";
- };
-
- buildInputs = with self; [ nose numpy ];
-
- meta = {
- homepage = "http://pythonhosted.org/uncertainties/";
- description = "Transparent calculations with uncertainties on the quantities involved (aka error propagation)";
- license = licenses.bsd3;
- };
-
- # No tests included
- doCheck = false;
- };
-
+ uncertainties = callPackage ../development/python-modules/uncertainties { };
funcy = buildPythonPackage rec {
name = "funcy-1.6";
@@ -28852,6 +28431,9 @@ EOF
buildInputs = with self; [ nose ];
propagatedBuildInputs = with self; [ decorator ];
+ # 17 failures with 3.6 https://github.com/networkx/networkx/issues/2396#issuecomment-304437299
+ doCheck = !(isPy36);
+
meta = {
homepage = "https://networkx.github.io/";
description = "Library for the creation, manipulation, and study of the structure, dynamics, and functions of complex networks";
@@ -29865,106 +29447,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";
diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix
index c81d65ad0e0..94c1e6c7ad2 100644
--- a/pkgs/top-level/release-cross.nix
+++ b/pkgs/top-level/release-cross.nix
@@ -89,101 +89,26 @@ in
guile = nativePlatforms;
};
- darwinToAarch64 = let
- crossSystem = {
- config = "aarch64-apple-darwin14";
- arch = "arm64";
- libc = "libSystem";
- };
- in mapTestOnCross crossSystem darwinCommon;
+ crossIphone64 = mapTestOnCross lib.systems.examples.iphone64 darwinCommon;
- darwinToArm = let
- crossSystem = {
- config = "arm-apple-darwin10";
- arch = "armv7-a";
- libc = "libSystem";
- };
- in mapTestOnCross crossSystem darwinCommon;
+ crossIphone32 = mapTestOnCross lib.systems.examples.iphone32 darwinCommon;
/* Test some cross builds to the Sheevaplug */
- crossSheevaplugLinux = let
- crossSystem = {
- config = "armv5tel-unknown-linux-gnueabi";
- bigEndian = false;
- arch = "arm";
- float = "soft";
- withTLS = true;
- platform = lib.systems.platforms.sheevaplug;
- libc = "glibc";
- openssl.system = "linux-generic32";
- };
- in mapTestOnCross crossSystem (linuxCommon // {
+ crossSheevaplugLinux = mapTestOnCross lib.systems.examples.sheevaplug (linuxCommon // {
ubootSheevaplug = nativePlatforms;
});
-
/* Test some cross builds on 32 bit mingw-w64 */
- crossMingw32 = let
- crossSystem = {
- config = "i686-pc-mingw32";
- arch = "x86"; # Irrelevant
- libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain
- platform = {};
- };
- in mapTestOnCross crossSystem windowsCommon;
-
+ crossMingw32 = mapTestOnCross lib.systems.examples.mingw32 windowsCommon;
/* Test some cross builds on 64 bit mingw-w64 */
- crossMingwW64 = let
- crossSystem = {
- # That's the triplet they use in the mingw-w64 docs.
- config = "x86_64-pc-mingw32";
- arch = "x86_64"; # Irrelevant
- libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain
- platform = {};
- };
- in mapTestOnCross crossSystem windowsCommon;
-
+ crossMingwW64 = mapTestOnCross lib.systems.examples.mingwW64 windowsCommon;
/* Linux on the fuloong */
- fuloongminipc = let
- crossSystem = {
- config = "mips64el-unknown-linux-gnu";
- bigEndian = false;
- arch = "mips";
- float = "hard";
- withTLS = true;
- libc = "glibc";
- platform = lib.systems.platforms.fuloong2f_n32;
- openssl.system = "linux-generic32";
- gcc = {
- arch = "loongson2f";
- abi = "n32";
- };
- };
- in mapTestOnCross crossSystem linuxCommon;
-
+ fuloongminipc = mapTestOnCross lib.systems.examples.fuloongminipc linuxCommon;
/* Linux on Raspberrypi */
- rpi = let
- crossSystem = {
- config = "armv6l-unknown-linux-gnueabi";
- bigEndian = false;
- arch = "arm";
- float = "hard";
- fpu = "vfp";
- withTLS = true;
- libc = "glibc";
- platform = lib.systems.platforms.raspberrypi;
- openssl.system = "linux-generic32";
- gcc = {
- arch = "armv6";
- fpu = "vfp";
- float = "softfp";
- abi = "aapcs-linux";
- };
- };
- in mapTestOnCross crossSystem (linuxCommon // {
+ rpi = mapTestOnCross lib.systems.examples.raspberryPi (linuxCommon // {
vim = nativePlatforms;
unzip = nativePlatforms;
ddrescue = nativePlatforms;
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 3931a3fe73e..be57b40fca6 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -111,6 +111,7 @@ let
ocamlPackages = { };
perlPackages = { };
pythonPackages = {
+ blaze = unix;
pandas = unix;
scikitlearn = unix;
};
@@ -122,6 +123,12 @@ let
pandas = unix;
scikitlearn = unix;
};
+ python36Packages = {
+ blaze = unix;
+ pandas = unix;
+ scikitlearn = unix;
+ };
+
} ));
in jobs