diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index d77f064ed552e0d713f4efb250581553b1d1e068..297b91976a88279af01adb41b9855b7bf42edb94 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -7,17 +7,76 @@
# For documentation on this file, see https://help.github.com/articles/about-codeowners/
# Mentioned users will get code review requests.
-# Python-related code and docs
-pkgs/top-level/python-packages.nix @FRidh
-pkgs/development/interpreters/python/* @FRidh
-pkgs/development/python-modules/* @FRidh
-doc/languages-frameworks/python.md @FRidh
+# This file
+/.github/CODEOWNERS @edolstra
# Boostraping and core infra
-pkgs/stdenv/ @Ericson2314
-pkgs/build-support/cc-wrapper/ @Ericson2314
+/pkgs/stdenv @edolstra
+/pkgs/build-support/cc-wrapper @edolstra
+
+# Libraries
+/lib @edolstra @nbp
+
+# Nixpkgs Internals
+/default.nix @nbp
+/pkgs/top-level/default.nix @nbp
+/pkgs/top-level/impure.nix @nbp
+/pkgs/top-level/stage.nix @nbp
+
+# NixOS Internals
+/nixos/default.nix @nbp
+/nixos/lib/from-env.nix @nbp
+/nixos/lib/eval-config.nix @nbp
+/nixos/doc/manual/configuration/abstractions.xml @nbp
+/nixos/doc/manual/configuration/config-file.xml @nbp
+/nixos/doc/manual/configuration/config-syntax.xml @nbp
+/nixos/doc/manual/configuration/modularity.xml @nbp
+/nixos/doc/manual/development/assertions.xml @nbp
+/nixos/doc/manual/development/meta-attributes.xml @nbp
+/nixos/doc/manual/development/option-declarations.xml @nbp
+/nixos/doc/manual/development/option-def.xml @nbp
+/nixos/doc/manual/development/option-types.xml @nbp
+/nixos/doc/manual/development/replace-modules.xml @nbp
+/nixos/doc/manual/development/writing-modules.xml @nbp
+/nixos/doc/manual/man-nixos-option.xml @nbp
+/nixos/modules/installer/tools/nixos-option.sh @nbp
+
+# Python-related code and docs
+/pkgs/top-level/python-packages.nix @FRidh
+/pkgs/development/interpreters/python @FRidh
+/pkgs/development/python-modules @FRidh
+/doc/languages-frameworks/python.md @FRidh
+
+# Haskell
+/pkgs/development/compilers/ghc @peti
+/pkgs/development/haskell-modules @peti
+/pkgs/development/haskell-modules/default.nix @peti
+/pkgs/development/haskell-modules/generic-builder.nix @peti
+/pkgs/development/haskell-modules/hoogle.nix @peti
+
+# R
+/pkgs/applications/science/math/R @peti
+/pkgs/development/r-modules @peti
+
+# Ruby
+/pkgs/development/interpreters/ruby @zimbatm
+/pkgs/development/ruby-modules @zimbatm
# Darwin-related
-pkgs/stdenv/darwin/* @copumpkin @LnL7
-pkgs/os-specific/darwin/* @LnL7
-pkgs/os-specific/darwin/apple-source-releases/* @copumpkin
+/pkgs/stdenv/darwin @NixOS/darwin-maintainers
+/pkgs/os-specific/darwin @NixOS/darwin-maintainers
+
+# Beam-related (Erlang, Elixir, LFE, etc)
+/pkgs/development/beam-modules @gleber
+/pkgs/development/interpreters/erlang @gleber
+/pkgs/development/interpreters/lfe @gleber
+/pkgs/development/interpreters/elixir @gleber
+/pkgs/development/tools/build-managers/rebar @gleber
+/pkgs/development/tools/build-managers/rebar3 @gleber
+/pkgs/development/tools/erlang @gleber
+
+# Jetbrains
+/pkgs/applications/editors/jetbrains @edwtjo
+
+# Eclipse
+/pkgs/applications/editors/eclipse @rycee
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index b77ca7eefb9fe1dacfc31f3a865e79ae57e26fe2..41e85bd5ac46d2c828e08e48eaeda3a8cb2746a2 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -23,7 +23,7 @@ under the terms of [COPYING](../COPYING), which is an MIT-like license.
Examples:
* nginx: init at 2.0.1
- * firefox: 3.0 -> 3.1.1
+ * firefox: 54.0.1 -> 55.0
* nixos/hydra: add bazBaz option
Dual baz behavior is needed to do foo.
@@ -32,11 +32,14 @@ under the terms of [COPYING](../COPYING), which is an MIT-like license.
The old config generation system used impure shell scripts and could break in specific circumstances (see #1234).
* `meta.description` should:
- * Be capitalized
- * Not start with the package name
- * Not have a dot at the end
-
-See the nixpkgs manual for more details on how to [Submit changes to nixpkgs](https://nixos.org/nixpkgs/manual/#chap-submitting-changes).
+ * Be capitalized.
+ * Not start with the package name.
+ * Not have a period at the end.
+* `meta.license` must be set and fit the upstream license.
+ * If there is no upstream license, `meta.license` should default to `stdenv.lib.licenses.unfree`.
+* `meta.maintainers` must be set.
+
+See the nixpkgs manual for more details on [standard meta-attributes](https://nixos.org/nixpkgs/manual/#sec-standard-meta-attributes) and on how to [submit changes to nixpkgs](https://nixos.org/nixpkgs/manual/#chap-submitting-changes).
## Writing good commit messages
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 7e7c24187120d253510bed395c90fee1bd0fbd53..75db8e1377c45393860650f21c77beff7295c9de 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -5,14 +5,11 @@
-- [ ] Tested using sandboxing
- ([nix.useSandbox](http://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS,
- or option `build-use-sandbox` in [`nix.conf`](http://nixos.org/nix/manual/#sec-conf-file)
- on non-NixOS)
+- [ ] Tested using sandboxing ([nix.useSandbox](http://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS, or option `build-use-sandbox` in [`nix.conf`](http://nixos.org/nix/manual/#sec-conf-file) on non-NixOS)
- Built on platform(s)
- [ ] NixOS
- [ ] macOS
- - [ ] Linux
+ - [ ] other Linux distributions
- [ ] Tested via one or more NixOS test(s) if existing and applicable for the change (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests))
- [ ] Tested compilation of all pkgs that depend on this change using `nix-shell -p nox --run "nox-review wip"`
- [ ] Tested execution of all binary files (usually in `./result/bin/`)
diff --git a/.version b/.version
index 2fdad9f4058bbf00e7f436be4eca428ec52b64e9..a88d2ca323198953803097f102cc3d5e6704206c 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-17.09
+18.03
diff --git a/COPYING b/COPYING
index a632d6f58b121cd3f4a8f28cd91a90884cc191f1..afc460fff5cbd448d08f2b4b7d76bc363077bd12 100644
--- a/COPYING
+++ b/COPYING
@@ -23,9 +23,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Note: the license above does not apply to the packages built by the
Nix Packages collection, merely to the package descriptions (i.e., Nix
-expressions, build scripts, etc.). Also, the license does not apply
-to some of the binaries used for bootstrapping Nixpkgs (e.g.,
-pkgs/stdenv/linux/tools/bash). It also might not apply to patches
+expressions, build scripts, etc.). It also might not apply to patches
included in Nixpkgs, which may be derivative works of the packages to
which they apply. The aforementioned artifacts are all covered by the
licenses of the respective packages.
diff --git a/README.md b/README.md
index 1a0fb5014ded706ffb8ad093ef08e541c5ccb00a..64cfb25eac347d9daab49b19e99d2fbb1c3dcdaa 100644
--- a/README.md
+++ b/README.md
@@ -13,12 +13,12 @@ build daemon as so-called channels. To get channel information via git, add
```
For stability and maximum binary package support, it is recommended to maintain
-custom changes on top of one of the channels, e.g. `nixos-17.03` for the latest
+custom changes on top of one of the channels, e.g. `nixos-17.09` for the latest
release and `nixos-unstable` for the latest successful build of master:
```
% git remote update channels
-% git rebase channels/nixos-17.03
+% git rebase channels/nixos-17.09
```
For pull-requests, please rebase onto nixpkgs `master`.
@@ -30,11 +30,11 @@ For pull-requests, please rebase onto nixpkgs `master`.
* [Documentation (Nix Expression Language chapter)](https://nixos.org/nix/manual/#ch-expression-language)
* [Manual (How to write packages for Nix)](https://nixos.org/nixpkgs/manual/)
* [Manual (NixOS)](https://nixos.org/nixos/manual/)
-* [Nix Wiki](https://nixos.org/wiki/) (deprecated, see milestone ["Move the Wiki!"](https://github.com/NixOS/nixpkgs/issues?q=is%3Aopen+is%3Aissue+milestone%3A%22Move+the+wiki%21%22))
+* [Community maintained wiki](https://nixos.wiki/)
* [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined)
-* [Continuous package builds for 17.03 release](https://hydra.nixos.org/jobset/nixos/release-17.03)
+* [Continuous package builds for 17.09 release](https://hydra.nixos.org/jobset/nixos/release-17.09)
* [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents)
-* [Tests for 17.03 release](https://hydra.nixos.org/job/nixos/release-17.03/tested#tabs-constituents)
+* [Tests for 17.09 release](https://hydra.nixos.org/job/nixos/release-17.09/tested#tabs-constituents)
Communication:
diff --git a/doc/coding-conventions.xml b/doc/coding-conventions.xml
index f89437af445c83e59cf6a34caaa6be293f7fc184..0776e70f14e109b95665ef21e1f9e08a9d90544f 100644
--- a/doc/coding-conventions.xml
+++ b/doc/coding-conventions.xml
@@ -254,7 +254,7 @@ bound to the variable name e2fsprogs in
dash) — e.g., "hello-0.3.1rc2".
If a package is not a release but a commit from a repository, then
- the version part of the name must be the date of that
+ the version part of the name must be the date of that
(fetched) commit. The date must be in "YYYY-MM-DD" format.
Also append "unstable" to the name - e.g.,
"pkgname-unstable-2014-09-23".
@@ -365,7 +365,7 @@ splitting up an existing category.
If it’s a (set of) tool(s):
- (A tool is a relatively small program, especially one intented
+ (A tool is a relatively small program, especially one intended
to be used non-interactively.)
@@ -456,7 +456,7 @@ splitting up an existing category.
If it’s a window manager:
- applications/window-managers (e.g. awesome, compiz, stumpwm)
+ applications/window-managers (e.g. awesome, stumpwm)
@@ -608,7 +608,7 @@ evaluate correctly.
Fetching Sources
There are multiple ways to fetch a package source in nixpkgs. The
- general guidline is that you should package sources with a high degree of
+ general guideline is that you should package sources with a high degree of
availability. Right now there is only one fetcher which has mirroring
support and that is fetchurl. Note that you should also
prefer protocols which have a corresponding proxy environment variable.
@@ -661,9 +661,9 @@ src = fetchFromGitHub {
Patches
- Only patches that are unique to nixpkgs should be
+ Only patches that are unique to nixpkgs should be
included in nixpkgs source.
- Patches available online should be retrieved using
+ Patches available online should be retrieved using
fetchpatch.
diff --git a/doc/configuration.xml b/doc/configuration.xml
index ac03b42714c6064e8205bcbab7d7c038570796be..55c5ea809d354493cadf8f89e8b2ee116583c9fb 100644
--- a/doc/configuration.xml
+++ b/doc/configuration.xml
@@ -55,6 +55,10 @@ configuration file located at
+Note that we are not able to test or build unfree software on Hydra
+due to policy. Most unfree licenses prohibit us from either executing or
+distributing the software.
+
Installing broken packages
diff --git a/doc/cross-compilation.xml b/doc/cross-compilation.xml
index 77d020afa2df3a2273a913971c127a55c94f25c0..9e9dd41c288166c8246a8e28bb44f23597907df6 100644
--- a/doc/cross-compilation.xml
+++ b/doc/cross-compilation.xml
@@ -184,7 +184,7 @@
For now, feel free to use either method.
- There is also a "backlink" __targetPackages, yielding a package set whose buildPackages is the current package set.
+ There is also a "backlink" targetPackages, yielding a package set whose buildPackages is the current package set.
This is a hack, though, to accommodate compilers with lousy build systems.
Please do not use this unless you are absolutely sure you are packaging such a compiler and there is no other way.
diff --git a/doc/introduction.md b/doc/introduction.md
index 96a5571b42663c83adc138b1afad7af05d8dbd71..8b03221c64b12b4e3754c3e173796c97ed2c20dd 100644
--- a/doc/introduction.md
+++ b/doc/introduction.md
@@ -48,6 +48,4 @@ The binaries are made available via a [binary cache](https://cache.nixos.org).
The current Nix expressions of the channels are available in the
[`nixpkgs-channels`](https://github.com/NixOS/nixpkgs-channels) repository,
-which has branches corresponding to the available channels. There is also the
-[Nixpkgs Monitor](http://monitor.nixos.org) which keeps track of updates
-and security vulnerabilities.
+which has branches corresponding to the available channels.
diff --git a/doc/languages-frameworks/haskell.md b/doc/languages-frameworks/haskell.md
index 930bd2616156f094179672031a2692e7a8acda3e..da3fd770ce728a6293d5656d33c0dccda150fd01 100644
--- a/doc/languages-frameworks/haskell.md
+++ b/doc/languages-frameworks/haskell.md
@@ -867,6 +867,67 @@ use the following to get the `scientific` package build with `integer-simple`:
nix-build -A haskell.packages.integer-simple.ghc802.scientific
```
+### Quality assurance
+
+The `haskell.lib` library includes a number of functions for checking for
+various imperfections in Haskell packages. It's useful to apply these functions
+to your own Haskell packages and integrate that in a Continuous Integration
+server like [hydra](https://nixos.org/hydra/) to assure your packages maintain a
+minimum level of quality. This section discusses some of these functions.
+
+#### failOnAllWarnings
+
+Applying `haskell.lib.failOnAllWarnings` to a Haskell package enables the
+`-Wall` and `-Werror` GHC options to turn all warnings into build failures.
+
+#### buildStrictly
+
+Applying `haskell.lib.buildStrictly` to a Haskell package calls
+`failOnAllWarnings` on the given package to turn all warnings into build
+failures. Additionally the source of your package is gotten from first invoking
+`cabal sdist` to ensure all needed files are listed in the Cabal file.
+
+#### checkUnusedPackages
+
+Applying `haskell.lib.checkUnusedPackages` to a Haskell package invokes
+the [packunused](http://hackage.haskell.org/package/packunused) tool on the
+package. `packunused` complains when it finds packages listed as build-depends
+in the Cabal file which are redundant. For example:
+
+```
+$ nix-build -E 'let pkgs = import {}; in pkgs.haskell.lib.checkUnusedPackages {} pkgs.haskellPackages.scientific'
+these derivations will be built:
+ /nix/store/3lc51cxj2j57y3zfpq5i69qbzjpvyci1-scientific-0.3.5.1.drv
+...
+detected package components
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+ - library
+ - testsuite(s): test-scientific
+ - benchmark(s): bench-scientific*
+
+(component names suffixed with '*' are not configured to be built)
+
+library
+~~~~~~~
+
+The following package dependencies seem redundant:
+
+ - ghc-prim-0.5.0.0
+
+testsuite(test-scientific)
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+no redundant packages dependencies found
+
+builder for ‘/nix/store/3lc51cxj2j57y3zfpq5i69qbzjpvyci1-scientific-0.3.5.1.drv’ failed with exit code 1
+error: build of ‘/nix/store/3lc51cxj2j57y3zfpq5i69qbzjpvyci1-scientific-0.3.5.1.drv’ failed
+```
+
+As you can see, `packunused` finds out that although the testsuite component has
+no redundant dependencies the library component of `scientific-0.3.5.1` depends
+on `ghc-prim` which is unused in the library.
+
## Other resources
- The Youtube video [Nix Loves Haskell](https://www.youtube.com/watch?v=BsBhi_r-OeE)
diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md
index c100c9d0c20ac11e7648fcdffd9b6d964950dbf8..cf81b240ceac292197b7e0a2f73272e11974ae07 100644
--- a/doc/languages-frameworks/python.md
+++ b/doc/languages-frameworks/python.md
@@ -2,115 +2,204 @@
## User Guide
-Several versions of Python are available on Nix as well as a high amount of
-packages. The default interpreter is CPython 2.7.
-
### Using Python
+#### Overview
+
+Several versions of the Python interpreter are available on Nix, as well as a
+high amount of packages. The attribute `python` refers to the default
+interpreter, which is currently CPython 2.7. It is also possible to refer to
+specific versions, e.g. `python35` refers to CPython 3.5, and `pypy` refers to
+the default PyPy interpreter.
+
+Python is used a lot, and in different ways. This affects also how it is
+packaged. In the case of Python on Nix, an important distinction is made between
+whether the package is considered primarily an application, or whether it should
+be used as a library, i.e., of primary interest are the modules in
+`site-packages` that should be importable.
+
+In the Nixpkgs tree Python applications can be found throughout, depending on
+what they do, and are called from the main package set. Python libraries,
+however, are in separate sets, with one set per interpreter version.
+
+The interpreters have several common attributes. One of these attributes is
+`pkgs`, which is a package set of Python libraries for this specific
+interpreter. E.g., the `toolz` package corresponding to the default interpreter
+is `python.pkgs.toolz`, and the CPython 3.5 version is `python35.pkgs.toolz`.
+The main package set contains aliases to these package sets, e.g.
+`pythonPackages` refers to `python.pkgs` and `python35Packages` to
+`python35.pkgs`.
+
#### Installing Python and packages
-It is important to make a distinction between Python packages that are
-used as libraries, and applications that are written in Python.
+The Nix and NixOS manuals explain how packages are generally installed. In the
+case of Python and Nix, it is important to make a distinction between whether the
+package is considered an application or a library.
-Applications on Nix are installed typically into your user
+Applications on Nix are typically installed into your user
profile imperatively using `nix-env -i`, and on NixOS declaratively by adding the
package name to `environment.systemPackages` in `/etc/nixos/configuration.nix`.
Dependencies such as libraries are automatically installed and should not be
installed explicitly.
The same goes for Python applications and libraries. Python applications can be
-installed in your profile, but Python libraries you would like to use to develop
-cannot. If you do install libraries in your profile, then you will end up with
-import errors.
+installed in your profile. But Python libraries you would like to use for
+development cannot be installed, at least not individually, because they won't
+be able to find each other resulting in import errors. Instead, it is possible
+to create an environment with `python.buildEnv` or `python.withPackages` where
+the interpreter and other executables are able to find each other and all of the
+modules.
-#### Python environments using `nix-shell`
+In the following examples we create an environment with Python 3.5, `numpy` and
+`toolz`. As you may imagine, there is one limitation here, and that's that
+you can install only one environment at a time. You will notice the complaints
+about collisions when you try to install a second environment.
-The recommended method for creating Python environments for development is with
-`nix-shell`. Executing
+##### Environment defined in separate `.nix` file
-```sh
-$ nix-shell -p python35Packages.numpy python35Packages.toolz
+Create a file, e.g. `build.nix`, with the following expression
+```nix
+with import {};
+
+python35.withPackages (ps: with ps; [ numpy toolz ])
+```
+and install it in your profile with
+```shell
+nix-env -if build.nix
+```
+Now you can use the Python interpreter, as well as the extra packages (`numpy`,
+`toolz`) that you added to the environment.
+
+##### 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, e.g.
+using `config.nix`,
+```nix
+{ # ...
+
+ packageOverrides = pkgs: with pkgs; {
+ myEnv = python35.withPackages (ps: with ps; [ numpy toolz ]);
+ };
+}
+```
+and install it in your profile with
+```shell
+nix-env -iA nixpkgs.myEnv
+```
+The environment is is installed by referring to the attribute, and considering
+the `nixpkgs` channel was used.
+
+##### Environment defined in `/etc/nixos/configuration.nix`
+
+For the sake of completeness, here's another example how to install the environment system-wide.
+
+```nix
+{ # ...
+
+ environment.systemPackages = with pkgs; [
+ (python35.withPackages(ps: with ps; [ numpy toolz ]))
+ ];
+}
```
-opens a Nix shell which has available the requested packages and dependencies.
-Now you can launch the Python interpreter (which is itself a dependency)
+#### Temporary Python environment with `nix-shell`
+The examples in the previous section showed how to install a Python environment
+into a profile. For development you may need to use multiple environments.
+`nix-shell` gives the possibility to temporarily load another environment, akin
+to `virtualenv`.
+
+There are two methods for loading a shell with Python packages. The first and recommended method
+is to create an environment with `python.buildEnv` or `python.withPackages` and load that. E.g.
+```sh
+$ nix-shell -p 'python35.withPackages(ps: with ps; [ numpy toolz ])'
+```
+opens a shell from which you can launch the interpreter
```sh
[nix-shell:~] python3
```
-
-If the packages were not available yet in the Nix store, Nix would download or
-build them automatically. A convenient option with `nix-shell` is the `--run`
-option, with which you can execute a command in the `nix-shell`. Let's say we
-want the above environment and directly run the Python interpreter
+The other method, which is not recommended, does not create an environment and requires you to list the packages directly,
```sh
-$ nix-shell -p python35Packages.numpy python35Packages.toolz --run "python3"
+$ nix-shell -p python35.pkgs.numpy python35.pkgs.toolz
+```
+Again, it is possible to launch the interpreter from the shell.
+The Python interpreter has the attribute `pkgs` which contains all Python libraries for that specific interpreter.
+
+##### Load environment from `.nix` expression
+As explained in the Nix manual, `nix-shell` can also load an
+expression from a `.nix` file. Say we want to have Python 3.5, `numpy`
+and `toolz`, like before, in an environment. Consider a `shell.nix` file
+with
+```nix
+with import {};
+
+python35.withPackages (ps: [ps.numpy ps.toolz])
```
+Executing `nix-shell` gives you again a Nix shell from which you can run Python.
+
+What's happening here?
-This way you can use the `--run` option also to directly run a script
+1. We begin with importing the Nix Packages collections. `import ` imports the `` function, `{}` calls it and the `with` statement brings all attributes of `nixpkgs` in the local scope. These attributes form the main package set.
+2. Then we create a Python 3.5 environment with the `withPackages` function.
+3. The `withPackages` function expects us to provide a function as an argument that takes the set of all python packages and returns a list of packages to include in the environment. Here, we select the packages `numpy` and `toolz` from the package set.
+##### Execute command with `--run`
+A convenient option with `nix-shell` is the `--run`
+option, with which you can execute a command in the `nix-shell`. We can
+e.g. directly open a Python shell
+```sh
+$ nix-shell -p python35Packages.numpy python35Packages.toolz --run "python3"
+```
+or run a script
```sh
$ nix-shell -p python35Packages.numpy python35Packages.toolz --run "python3 myscript.py"
```
-In fact, for this specific use case there is a more convenient method. You can
+##### `nix-shell` as shebang
+In fact, for the second use case, there is a more convenient method. You can
add a [shebang](https://en.wikipedia.org/wiki/Shebang_(Unix)) to your script
-specifying which dependencies Nix shell needs. With the following shebang, you
-can use `nix-shell myscript.py` and it will make available all dependencies and
+specifying which dependencies `nix-shell` needs. With the following shebang, you
+can just execute `./myscript.py`, and it will make available all dependencies and
run the script in the `python3` shell.
```py
#! /usr/bin/env nix-shell
-#! nix-shell -i python3 -p python3Packages.numpy
+#! nix-shell -i python3 -p "python3.withPackages(ps: [ps.numpy])"
import numpy
print(numpy.__version__)
```
-Likely you do not want to type your dependencies each and every time. What you
-can do is write a simple Nix expression which sets up an environment for you,
-requiring you only to type `nix-shell`. Say we want to have Python 3.5, `numpy`
-and `toolz`, like before, in an environment. With a `shell.nix` file
-containing
-```nix
-with import {};
-
-(pkgs.python35.withPackages (ps: [ps.numpy ps.toolz])).env
-```
-executing `nix-shell` gives you again a Nix shell from which you can run Python.
-
-What's happening here?
-
-1. We begin with importing the Nix Packages collections. `import ` import the `` function, `{}` calls it and the `with` statement brings all attributes of `nixpkgs` in the local scope. Therefore we can now use `pkgs`.
-2. Then we create a Python 3.5 environment with the `withPackages` function.
-3. The `withPackages` function expects us to provide a function as an argument that takes the set of all python packages and returns a list of packages to include in the environment. Here, we select the packages `numpy` and `toolz` from the package set.
-4. And finally, for in interactive use we return the environment by using the `env` attribute.
-
### Developing with Python
+Now that you know how to get a working Python environment with Nix, it is time
+to go forward and start actually developing with Python. We will first have a
+look at how Python packages are packaged on Nix. Then, we will look at how you
+can use development mode with your code.
-Now that you know how to get a working Python environment on Nix, it is time to go forward and start actually developing with Python.
-We will first have a look at how Python packages are packaged on Nix. Then, we will look how you can use development mode with your code.
+#### Packaging a library
-#### Python packaging on Nix
-
-On Nix all packages are built by functions. The main function in Nix for building Python packages is [`buildPythonPackage`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/interpreters/python/build-python-package.nix).
-Let's see how we would build the `toolz` package. According to [`python-packages.nix`](https://raw.githubusercontent.com/NixOS/nixpkgs/master/pkgs/top-level/python-packages.nix) `toolz` is build using
+With Nix all packages are built by functions. The main function in Nix for
+building Python libraries is `buildPythonPackage`. Let's see how we can build the
+`toolz` package.
```nix
{ # ...
toolz = buildPythonPackage rec {
- name = "toolz-${version}";
+ pname = "toolz";
version = "0.7.4";
+ name = "${pname}-${version}";
- src = pkgs.fetchurl {
- url = "mirror://pypi/t/toolz/toolz-${version}.tar.gz";
+ src = fetchPypi {
+ inherit pname version;
sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd";
};
+ doCheck = false;
+
meta = {
homepage = "http://github.com/pytoolz/toolz/";
description = "List processing tools and functional utilities";
@@ -122,63 +211,37 @@ Let's see how we would build the `toolz` package. According to [`python-packages
```
What happens here? The function `buildPythonPackage` is called and as argument
-it accepts a set. In this case the set is a recursive set ([`rec`](http://nixos.org/nix/manual/#sec-constructs)).
-One of the arguments is the name of the package, which consists of a basename
-(generally following the name on PyPi) and a version. Another argument, `src`
-specifies the source, which in this case is fetched from an url. `fetchurl` not
-only downloads the target file, but also validates its hash. Furthermore, we
-specify some (optional) [meta information](http://nixos.org/nixpkgs/manual/#chap-meta).
-
-The output of the function is a derivation, which is an attribute with the name
-`toolz` of the set `pythonPackages`. Actually, sets are created for all interpreter versions,
-so e.g. `python27Packages`, `python35Packages` and `pypyPackages`.
-
+it accepts a set. In this case the set is a recursive set, `rec`. One of the
+arguments is the name of the package, which consists of a basename (generally
+following the name on PyPi) and a version. Another argument, `src` specifies the
+source, which in this case is fetched from PyPI using the helper function
+`fetchPypi`. The argument `doCheck` is used to set whether tests should be run
+when building the package. Furthermore, we specify some (optional) meta
+information. The output of the function is a derivation.
+
+An expression for `toolz` can be found in the Nixpkgs repository. As explained
+in the introduction of this Python section, a derivation of `toolz` is available
+for each interpreter version, e.g. `python35.pkgs.toolz` refers to the `toolz`
+derivation corresponding to the CPython 3.5 interpreter.
The above example works when you're directly working on
`pkgs/top-level/python-packages.nix` in the Nixpkgs repository. Often though,
-you will want to test a Nix expression outside of the Nixpkgs tree. If you
-create a `shell.nix` file with the following contents
-
-```nix
-with import {};
-
-pkgs.python35Packages.buildPythonPackage rec {
- name = "toolz-${version}";
- version = "0.8.0";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/t/toolz/toolz-${version}.tar.gz";
- sha256 = "e8451af61face57b7c5d09e71c0d27b8005f001ead56e9fdf470417e5cc6d479";
- };
-
- doCheck = false;
-
- meta = {
- homepage = "http://github.com/pytoolz/toolz/";
- description = "List processing tools and functional utilities";
- license = licenses.bsd3;
- maintainers = with maintainers; [ fridh ];
- };
-}
-```
-
-and then execute `nix-shell` will result in an environment in which you can use
-Python 3.5 and the `toolz` package. As you can see we had to explicitly mention
-for which Python version we want to build a package.
+you will want to test a Nix expression outside of the Nixpkgs tree.
-The above example considered only a single package. Generally you will want to use multiple packages.
-If we create a `shell.nix` file with the following contents
+The following expression creates a derivation for the `toolz` package,
+and adds it along with a `numpy` package to a Python environment.
```nix
with import {};
( let
- toolz = pkgs.python35Packages.buildPythonPackage rec {
- name = "toolz-${version}";
- version = "0.8.0";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/t/toolz/toolz-${version}.tar.gz";
- sha256 = "e8451af61face57b7c5d09e71c0d27b8005f001ead56e9fdf470417e5cc6d479";
+ my_toolz = python35.pkgs.buildPythonPackage rec {
+ pname = "toolz";
+ version = "0.7.4";
+ name = "${pname}-${version}";
+
+ src = python35.pkgs.fetchPypi {
+ inherit pname version;
+ sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd";
};
doCheck = false;
@@ -189,24 +252,24 @@ with import {};
};
};
- in pkgs.python35.withPackages (ps: [ps.numpy toolz])
+ in python35.withPackages (ps: [ps.numpy my_toolz])
).env
```
+Executing `nix-shell` will result in an environment in which you can use
+Python 3.5 and the `toolz` package. As you can see we had to explicitly mention
+for which Python version we want to build a package.
-and again execute `nix-shell`, then we get a Python 3.5 environment with our
-locally defined package as well as `numpy` which is build according to the
-definition in Nixpkgs. What did we do here? Well, we took the Nix expression
-that we used earlier to build a Python environment, and said that we wanted to
-include our own version of `toolz`. To introduce our own package in the scope of
-`withPackages` we used a
-[`let`](http://nixos.org/nix/manual/#sec-constructs) expression.
-You can see that we used `ps.numpy` to select numpy from the nixpkgs package set (`ps`).
-But we do not take `toolz` from the nixpkgs package set this time.
-Instead, `toolz` will resolve to our local definition that we introduced with `let`.
+So, what did we do here? Well, we took the Nix expression that we used earlier
+to build a Python environment, and said that we wanted to include our own
+version of `toolz`, named `my_toolz`. To introduce our own package in the scope
+of `withPackages` we used a `let` expression. You can see that we used
+`ps.numpy` to select numpy from the nixpkgs package set (`ps`). We did not take
+`toolz` from the Nixpkgs package set this time, but instead took our own version
+that we introduced with the `let` expression.
-### Handling dependencies
+#### Handling dependencies
-Our example, `toolz`, doesn't have any dependencies on other Python
+Our example, `toolz`, does not have any dependencies on other Python
packages or system libraries. According to the manual, `buildPythonPackage`
uses the arguments `buildInputs` and `propagatedBuildInputs` to specify dependencies. If something is
exclusively a build-time dependency, then the dependency should be included as a
@@ -527,7 +590,7 @@ By default tests are run because `doCheck = true`. Test dependencies, like
e.g. the test runner, should be added to `buildInputs`.
By default `meta.platforms` is set to the same value
-as the interpreter unless overriden otherwise.
+as the interpreter unless overridden otherwise.
##### `buildPythonPackage` parameters
@@ -711,64 +774,35 @@ The `buildPythonPackage` function sets `DETERMINISTIC_BUILD=1` and
Both are also exported in `nix-shell`.
-## FAQ
-
-### How can I install a working Python environment?
+### Automatic tests
-As explained in the user's guide installing individual Python packages
-imperatively with `nix-env -i` or declaratively in `environment.systemPackages`
-is not supported. However, it is possible to install a Python environment with packages (`python.buildEnv`).
+It is recommended to test packages as part of the build process.
+Source distributions (`sdist`) often include test files, but not always.
-In the following examples we create an environment with Python 3.5, `numpy` and `ipython`.
-As you might imagine there is one limitation here, and that's you can install
-only one environment at a time. You will notice the complaints about collisions
-when you try to install a second environment.
+By default the command `python setup.py test` is run as part of the
+`checkPhase`, but often it is necessary to pass a custom `checkPhase`. An
+example of such a situation is when `py.test` is used.
-#### Environment defined in separate `.nix` file
+#### Common issues
-Create a file, e.g. `build.nix`, with the following expression
-```nix
-with import {};
-
-pkgs.python35.withPackages (ps: with ps; [ numpy ipython ])
-```
-and install it in your profile with
-```shell
-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 `~/.config/nixpkgs/config.nix`
-
-If you prefer to, you could also add the environment as a package override to the Nixpkgs set.
-```nix
-{ # ...
-
- packageOverrides = pkgs: with pkgs; {
- myEnv = python35.withPackages (ps: with ps; [ numpy ipython ]);
- };
-}
-```
-and install it in your profile with
-```shell
-nix-env -iA nixpkgs.myEnv
-```
-
-We're installing using the attribute path and assume the channels is named `nixpkgs`.
-Note that I'm using the attribute path here.
-
-#### Environment defined in `/etc/nixos/configuration.nix`
-
-For the sake of completeness, here's another example how to install the environment system-wide.
-
-```nix
-{ # ...
+- Non-working tests can often be deselected. By default `buildPythonPackage` runs `python setup.py test`.
+ Most python modules follows the standard test protocol where the pytest runner can be used instead.
+ `py.test` supports a `-k` parameter to ignore test methods or classes:
+
+ ```nix
+ buildPythonPackage {
+ # ...
+ # assumes the tests are located in tests
+ checkInputs = [ pytest ];
+ checkPhase = ''
+ py.test -k 'not function_name and not other_function' tests
+ '';
+ }
+ ```
+- Unicode issues can typically be fixed by including `glibcLocales` in `buildInputs` and exporting `LC_ALL=en_US.utf-8`.
+- Tests that attempt to access `$HOME` can be fixed by using the following work-around before running tests (e.g. `preCheck`): `export HOME=$(mktemp -d)`
- environment.systemPackages = with pkgs; [
- (python35.withPackages(ps: with ps; [ numpy ipython ]))
- ];
-}
-```
+## FAQ
### How to solve circular dependencies?
@@ -979,8 +1013,9 @@ rec {
Following rules are desired to be respected:
-* Python libraries are supposed to be called from `python-packages.nix` and packaged with `buildPythonPackage`. The expression of a library should be in `pkgs/development/python-modules//default.nix`. Libraries in `pkgs/top-level/python-packages.nix` are sorted quasi-alphabetically to avoid merge conflicts.
+* Python libraries are called from `python-packages.nix` and packaged with `buildPythonPackage`. The expression of a library should be in `pkgs/development/python-modules//default.nix`. Libraries in `pkgs/top-level/python-packages.nix` are sorted quasi-alphabetically to avoid merge conflicts.
* Python applications live outside of `python-packages.nix` and are packaged with `buildPythonApplication`.
* Make sure libraries build for all Python interpreters.
* By default we enable tests. Make sure the tests are found and, in the case of libraries, are passing for all interpreters. If certain tests fail they can be disabled individually. Try to avoid disabling the tests altogether. In any case, when you disable tests, leave a comment explaining why.
-* Commit names of Python libraries should include `pythonPackages`, for example `pythonPackages.numpy: 1.11 -> 1.12`.
+* Commit names of Python libraries should reflect that they are Python libraries, so write for example `pythonPackages.numpy: 1.11 -> 1.12`.
+
diff --git a/doc/languages-frameworks/rust.md b/doc/languages-frameworks/rust.md
index ef6ebc392b33248e8129c124e869110e0102db2f..276b5496fbb8ae6f731be68448ed9a58656cb14d 100644
--- a/doc/languages-frameworks/rust.md
+++ b/doc/languages-frameworks/rust.md
@@ -9,16 +9,15 @@ date: 2017-03-05
To install the rust compiler and cargo put
```
-rustStable.rustc
-rustStable.cargo
+rust
```
-into the `environment.systemPackages` or bring them into scope with
-`nix-shell -p rustStable.rustc -p rustStable.cargo`.
+into the `environment.systemPackages` or bring them into
+scope with `nix-shell -p rust`.
-There are also `rustBeta` and `rustNightly` package sets available.
-These are not updated very regulary. For daily builds use either rustup from
-nixpkgs or use the [Rust nightlies overlay](#using-the-rust-nightlies-overlay).
+For daily builds (beta and nightly) use either rustup from
+nixpkgs or use the [Rust nightlies
+overlay](#using-the-rust-nightlies-overlay).
## Packaging Rust applications
@@ -38,7 +37,7 @@ buildRustPackage rec {
sha256 = "0y5d1n6hkw85jb3rblcxqas2fp82h3nghssa4xqrhqnz25l799pj";
};
- depsSha256 = "0q68qyl2h6i0qsz82z840myxlnjay8p1w5z7hfyr8fqp7wgwa9cx";
+ cargoSha256 = "0q68qyl2h6i0qsz82z840myxlnjay8p1w5z7hfyr8fqp7wgwa9cx";
meta = with stdenv.lib; {
description = "A utility that combines the usability of The Silver Searcher with the raw speed of grep";
@@ -50,7 +49,7 @@ buildRustPackage rec {
}
```
-`buildRustPackage` requires a `depsSha256` attribute which is computed over
+`buildRustPackage` requires a `cargoSha256` attribute which is computed over
all crate sources of this package. Currently it is obtained by inserting a
fake checksum into the expression and building the package once. The correct
checksum can be then take from the failed build.
@@ -76,11 +75,11 @@ in the `~/.config/nixpkgs/overlays` directory.
The latest version can be installed with the following command:
- $ nix-env -Ai nixos.rustChannels.stable.rust
+ $ nix-env -Ai nixos.latest.rustChannels.stable.rust
Or using the attribute with nix-shell:
- $ nix-shell -p nixos.rustChannels.stable.rust
+ $ nix-shell -p nixos.latest.rustChannels.stable.rust
To install the beta or nightly channel, "stable" should be substituted by
"nightly" or "beta", or
diff --git a/doc/manual.xml b/doc/manual.xml
index 75bd21557fd15cb7e7076ad9a36bb24db761cff1..eb0a24789d44c97c93fd267490036e094a846915 100644
--- a/doc/manual.xml
+++ b/doc/manual.xml
@@ -18,6 +18,7 @@
+
diff --git a/doc/meta.xml b/doc/meta.xml
index b1ffd0502b2b50a732b7f839cc9ac8a48cb333e4..0f9dccfb91b58d31094cb777a3fb2bc8dc22a9dd 100644
--- a/doc/meta.xml
+++ b/doc/meta.xml
@@ -200,11 +200,9 @@ meta-attributes
meta.platforms = stdenv.lib.platforms.linux;
- Attribute Set stdenv.lib.platforms in
-
- nixpkgs/lib/platforms.nix defines various common
- lists of platforms types.
-
+ Attribute Set stdenv.lib.platforms defines
+
+ various common lists of platforms types.
diff --git a/doc/package-notes.xml b/doc/package-notes.xml
index 230f0ec7b93fcc87dda29ef703c2902bccd36175..184bee089ae368ff58bbe008f951c9f1b07c4f64 100644
--- a/doc/package-notes.xml
+++ b/doc/package-notes.xml
@@ -101,7 +101,7 @@ modulesTree = [kernel]
$ nix-env -i ncurses
$ export NIX_CFLAGS_LINK=-lncurses
$ make menuconfig ARCH=arch
-
+
@@ -111,9 +111,9 @@ $ make menuconfig ARCH=arch
-
+
-
+
@@ -409,24 +409,24 @@ it. Place the resulting package.nix file into
Steam in Nix
- Steam is distributed as a .deb file, for now only
- as an i686 package (the amd64 package only has documentation).
- When unpacked, it has a script called steam that
+ Steam is distributed as a .deb file, for now only
+ as an i686 package (the amd64 package only has documentation).
+ When unpacked, it has a script called steam that
in ubuntu (their target distro) would go to /usr/bin
- . When run for the first time, this script copies some
- files to the user's home, which include another script that is the
- ultimate responsible for launching the steam binary, which is also
+ . When run for the first time, this script copies some
+ files to the user's home, which include another script that is the
+ ultimate responsible for launching the steam binary, which is also
in $HOME.
Nix problems and constraints:
- We don't have /bin/bash and many
+ We don't have /bin/bash and many
scripts point there. Similarly for /usr/bin/python
.
We don't have the dynamic loader in /lib
.
- The steam.sh script in $HOME can
+ The steam.sh script in $HOME can
not be patched, as it is checked and rewritten by steam.
The steam binary cannot be patched, it's also checked.
@@ -446,10 +446,10 @@ it. Place the resulting package.nix file into
How to play
- For 64-bit systems it's important to have
- hardware.opengl.driSupport32Bit = true;
- in your /etc/nixos/configuration.nix. You'll also need
- hardware.pulseaudio.support32Bit = true;
+ For 64-bit systems it's important to have
+ hardware.opengl.driSupport32Bit = true;
+ in your /etc/nixos/configuration.nix. You'll also need
+ hardware.pulseaudio.support32Bit = true;
if you are using PulseAudio - this will enable 32bit ALSA apps integration.
To use the Steam controller, you need to add
services.udev.extraRules = ''
@@ -470,31 +470,25 @@ it. Place the resulting package.nix file into
Steam fails to start. What do I do?
- Try to run
+ Try to run
strace steam
to see what is causing steam to fail.
- Using the FOSS Radeon drivers
-
- The open source radeon drivers need a newer libc++ than is provided
- by the default runtime, which leads to a crash on launch. Use
- environment.systemPackages = [(pkgs.steam.override { newStdcpp = true; })];
- in your config if you get an error like
-
-libGL error: unable to load driver: radeonsi_dri.so
-libGL error: driver pointer missing
-libGL error: failed to load driver: radeonsi
-libGL error: unable to load driver: swrast_dri.so
-libGL error: failed to load driver: swrast
-
- Steam ships statically linked with a version of libcrypto that
- conflics with the one dynamically loaded by radeonsi_dri.so.
- If you get the error
- steam.sh: line 713: 7842 Segmentation fault (core dumped)
- have a look at this pull request.
-
+ Using the FOSS Radeon or nouveau (nvidia) drivers
+
+ The newStdcpp parameter
+ was removed since NixOS 17.09 and should not be needed anymore.
+
+
+
+ Steam ships statically linked with a version of libcrypto that
+ conflics with the one dynamically loaded by radeonsi_dri.so.
+ If you get the error
+ steam.sh: line 713: 7842 Segmentation fault (core dumped)
+ have a look at this pull request.
+
@@ -504,7 +498,7 @@ libGL error: failed to load driver: swrast
There is no java in steam chrootenv by default. If you get a message like
/home/foo/.local/share/Steam/SteamApps/common/towns/towns.sh: line 1: java: command not found
- You need to add
+ You need to add
steam.override { withJava = true; };
to your configuration.
@@ -519,14 +513,14 @@ libGL error: failed to load driver: swrast
steam-run
-The FHS-compatible chroot used for steam can also be used to run
+The FHS-compatible chroot used for steam can also be used to run
other linux games that expect a FHS environment.
-To do it, add
+To do it, add
pkgs.(steam.override {
nativeOnly = true;
newStdcpp = true;
}).run
-to your configuration, rebuild, and run the game with
+to your configuration, rebuild, and run the game with
steam-run ./foo
@@ -670,4 +664,34 @@ cp ${myEmacsConfig} $out/share/emacs/site-lisp/default.el
+
+Weechat
+
+Weechat can currently be configured to include your choice of plugins.
+To make use of this functionality, install an expression that overrides its configuration such as
+weechat.override {configure = {availablePlugins, ...}: {
+ plugins = with availablePlugins; [ python perl ];
+ }
+}
+
+
+The plugins currently available are python,
+perl, ruby, guile,
+tcl and lua.
+
+
+The python plugin allows the addition of extra libraries. For instance,
+the inotify.py script in weechat-scripts requires
+D-Bus or libnotify, and the fish.py script requires
+pycrypto. To use these scripts, use the python
+plugin's withPackages attribute:
+weechat.override {configure = {availablePlugins, ...}: {
+ plugins = with availablePlugins; [
+ (python.withPackages (ps: with ps; [ pycrypto python-dbus ]))
+ ];
+ }
+}
+
+
+
diff --git a/doc/platform-notes.xml b/doc/platform-notes.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f4f6ec60029412882179bbd9647163af7fcbc9c7
--- /dev/null
+++ b/doc/platform-notes.xml
@@ -0,0 +1,83 @@
+
+
+Platform Notes
+
+
+
+Darwin (macOS)
+Some common issues when packaging software for darwin:
+
+
+
+
+
+ The darwin stdenv uses clang instead of gcc.
+ When referring to the compiler $CC or cc
+ will work in both cases. Some builds hardcode gcc/g++ in their
+ build scripts, that can usually be fixed with using something
+ like makeFlags = [ "CC=cc" ]; or by patching
+ the build scripts.
+
+
+
+ stdenv.mkDerivation {
+ name = "libfoo-1.2.3";
+ # ...
+ buildPhase = ''
+ $CC -o hello hello.c
+ '';
+ }
+
+
+
+
+
+ On darwin libraries are linked using absolute paths, libraries
+ are resolved by their install_name at link
+ time. Sometimes packages won't set this correctly causing the
+ library lookups to fail at runtime. This can be fixed by adding
+ extra linker flags or by running install_name_tool -id
+ during the fixupPhase.
+
+
+
+ stdenv.mkDerivation {
+ name = "libfoo-1.2.3";
+ # ...
+ makeFlags = stdenv.lib.optional stdenv.isDarwin "LDFLAGS=-Wl,-install_name,$(out)/lib/libfoo.dylib";
+ }
+
+
+
+
+
+ Some packages assume xcode is available and use xcrun
+ to resolve build tools like clang, etc.
+ This causes errors like xcode-select: error: no developer tools were found at '/Applications/Xcode.app'
+ while the build doesn't actually depend on xcode.
+
+
+
+ stdenv.mkDerivation {
+ name = "libfoo-1.2.3";
+ # ...
+ prePatch = ''
+ substituteInPlace Makefile \
+ --replace '/usr/bin/xcrun clang' clang
+ '';
+ }
+
+
+
+ The package xcbuild can be used to build projects
+ that really depend on Xcode, however projects that build some kind of
+ graphical interface won't work without using Xcode in an impure way.
+
+
+
+
+
+
+
diff --git a/doc/stdenv.xml b/doc/stdenv.xml
index dac53bc2b8009ae22326d833602ae6eedd02a75d..ee110b7710495b1958873e9d3a4c484f38ed833d 100644
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@@ -1,4 +1,3 @@
-
@@ -188,11 +187,13 @@ genericBuild
NIX_DEBUG
- If set, stdenv will print some
- debug information during the build. In particular, the
- gcc and ld wrapper scripts
- will print out the complete command line passed to the wrapped
- tools.
+
+ A natural number indicating how much information to log.
+ If set to 1 or higher, stdenv will print moderate debug information during the build.
+ In particular, the gcc and ld wrapper scripts will print out the complete command line passed to the wrapped tools.
+ If set to 6 or higher, the stdenv setup script will be run with set -x tracing.
+ If set to 7 or higher, the gcc and ld wrapper scripts will also be run with set -x tracing.
+
@@ -697,8 +698,14 @@ nothing.
A list of strings passed as additional flags to
make. These flags are also used by the default
install and check phase. For setting make flags specific to the
- build phase, use buildFlags (see
- below).
+ build phase, use buildFlags (see below).
+
+
+makeFlags = [ "PREFIX=$(out)" ];
+
+
+ The flags are quoted in bash, but environment variables can
+ be specified by using the make syntax.
diff --git a/doc/submitting-changes.xml b/doc/submitting-changes.xml
index 0b09dffbb2d335aab4e10b84de0a114410709431..f65b2898262e88e42051847d39011f58516e41fd 100644
--- a/doc/submitting-changes.xml
+++ b/doc/submitting-changes.xml
@@ -61,7 +61,7 @@ $ git checkout -b 'fix/pkg-name-update'
Format the commit in a following way:
-(pkg-name | service-name): (from -> to | init at version | refactor | etc)
+(pkg-name | nixos/<module>): (from -> to | init at version | refactor | etc)
Additional information.
@@ -78,19 +78,19 @@ Additional information.
-firefox: 3.0 -> 3.1.1
+firefox: 54.0.1 -> 55.0
-hydra service: add bazBaz option
+nixos/hydra: add bazBaz option
-nginx service: refactor config generation
+nixos/nginx: refactor config generation
@@ -196,7 +196,7 @@ Additional information.
-Write the title in format (pkg-name | service): improvement.
+Write the title in format (pkg-name | nixos/<module>): improvement.
@@ -223,6 +223,133 @@ Additional information.
+
+ Pull Request Template
+
+ The pull request template helps determine what steps have been made for a
+ contribution so far, and will help guide maintainers on the status of a
+ change. The motivation section of the PR should include any extra details
+ the title does not address and link any existing issues related to the pull
+ request.
+
+ When a PR is created, it will be pre-populated with some checkboxes detailed below:
+
+
+ Tested using sandboxing
+
+ When sandbox builds are enabled, Nix will setup an isolated environment
+ for each build process. It is used to remove further hidden dependencies
+ set by the build environment to improve reproducibility. This includes
+ access to the network during the build outside of
+ fetch* functions and files outside the Nix store.
+ Depending on the operating system access to other resources are blocked
+ as well (ex. inter process communication is isolated on Linux); see build-use-sandbox
+ in Nix manual for details.
+
+
+ Sandboxing is not enabled by default in Nix due to a small performance
+ hit on each build. In pull requests for nixpkgs people
+ are asked to test builds with sandboxing enabled (see Tested
+ using sandboxing in the pull request template) because
+ inhttps://nixos.org/hydra/
+ sandboxing is also used.
+
+
+ Depending if you use NixOS or other platforms you can use one of the
+ following methods to enable sandboxing before building the package:
+
+
+
+ Globally enable sandboxing on NixOS:
+ add the following to
+ configuration.nix
+ nix.useSandbox = true;
+
+
+
+
+ Globally enable sandboxing on non-NixOS platforms:
+ add the following to: /etc/nix/nix.conf
+ build-use-sandbox = true
+
+
+
+
+
+
+
+ Built on platform(s)
+
+ Many Nix packages are designed to run on multiple
+ platforms. As such, it's important to let the maintainer know which
+ platforms your changes have been tested on. It's not always practical to
+ test a change on all platforms, and is not required for a pull request to
+ be merged. Only check the systems you tested the build on in this
+ section.
+
+
+
+ Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
+
+ Packages with automated tests are much more likely to be merged in a
+ timely fashion because it doesn't require as much manual testing by the
+ maintainer to verify the functionality of the package. If there are
+ existing tests for the package, they should be run to verify your changes
+ do not break the tests. Tests only apply to packages with NixOS modules
+ defined and can only be run on Linux. For more details on writing and
+ running tests, see the section
+ in the NixOS manual.
+
+
+
+ Tested compilation of all pkgs that depend on this change using <command>nox-review</command>
+
+ If you are updating a package's version, you can use nox to make sure all
+ packages that depend on the updated package still compile correctly. This
+ can be done using the nox utility. The nox-review
+ utility can look for and build all dependencies either based on
+ uncommited changes with the wip option or specifying a
+ github pull request number.
+
+
+ review uncommitted changes:
+ nix-shell -p nox --run nox-review wip
+
+
+ review changes from pull request number 12345:
+ nix-shell -p nox --run nox-review pr 12345
+
+
+
+ Tested execution of all binary files (usually in <filename>./result/bin/</filename>)
+
+ It's important to test any executables generated by a build when you
+ change or create a package in nixpkgs. This can be done by looking in
+ ./result/bin and running any files in there, or at a
+ minimum, the main executable for the package. For example, if you make a change
+ to texlive, you probably would only check the binaries
+ associated with the change you made rather than testing all of them.
+
+
+
+ Meets nixpkgs contribution standards
+
+ The last checkbox is fits CONTRIBUTING.md.
+ The contributing document has detailed information on standards the Nix
+ community has for commit messages, reviews, licensing of contributions
+ you make to the project, etc... Everyone should read and understand the
+ standards the community has for contributing before submitting a pull
+ request.
+
+
+
+
+
Hotfixing pull requests
diff --git a/lib/attrsets.nix b/lib/attrsets.nix
index d2946f6ca9cb0f4cbb6a0905f4a80d5b52a06cdd..19218cfe8ecb40d0827bf715511d948ac88ee514 100644
--- a/lib/attrsets.nix
+++ b/lib/attrsets.nix
@@ -1,11 +1,11 @@
+{ lib }:
# Operations on attribute sets.
let
inherit (builtins) head tail length;
- inherit (import ./trivial.nix) and or;
- inherit (import ./default.nix) fold;
- inherit (import ./strings.nix) concatStringsSep;
- inherit (import ./lists.nix) concatMap concatLists all deepSeqList;
+ inherit (lib.trivial) and or;
+ inherit (lib.strings) concatStringsSep;
+ inherit (lib.lists) fold concatMap concatLists all deepSeqList;
in
rec {
diff --git a/lib/customisation.nix b/lib/customisation.nix
index 98a46ca6c616809d2882aad9e85519668a49ae00..483ef6fd4866abb7202c920b006a1b646fcfaaa6 100644
--- a/lib/customisation.nix
+++ b/lib/customisation.nix
@@ -1,6 +1,6 @@
+{ lib }:
let
- lib = import ./default.nix;
inherit (builtins) attrNames isFunction;
in
diff --git a/lib/debug.nix b/lib/debug.nix
index 925e0d405a79aaa1eb2203b948dfa995bbb6986b..646ef220ad0a3ec897d63c994193469584ca2ddf 100644
--- a/lib/debug.nix
+++ b/lib/debug.nix
@@ -1,4 +1,6 @@
-let lib = import ./default.nix;
+{ lib }:
+
+let
inherit (builtins) trace attrNamesToStr isAttrs isFunction isList isInt
isString isBool head substring attrNames;
diff --git a/lib/default.nix b/lib/default.nix
index 3893e349db369bf789e95044436cbde873914f80..3e30ec515fcbbaaab709e2965c6cf7c4f975ded2 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -5,58 +5,127 @@
*/
let
- # often used, or depending on very little
- trivial = import ./trivial.nix;
- fixedPoints = import ./fixed-points.nix;
-
- # datatypes
- attrsets = import ./attrsets.nix;
- lists = import ./lists.nix;
- strings = import ./strings.nix;
- stringsWithDeps = import ./strings-with-deps.nix;
-
- # packaging
- customisation = import ./customisation.nix;
- maintainers = import ./maintainers.nix;
- meta = import ./meta.nix;
- sources = import ./sources.nix;
-
- # module system
- modules = import ./modules.nix;
- options = import ./options.nix;
- types = import ./types.nix;
-
- # constants
- licenses = import ./licenses.nix;
- systems = import ./systems;
-
- # misc
- debug = import ./debug.nix;
- generators = import ./generators.nix;
- misc = import ./deprecated.nix;
-
- # domain-specific
- sandbox = import ./sandbox.nix;
- fetchers = import ./fetchers.nix;
-
- # Eval-time filesystem handling
- filesystem = import ./filesystem.nix;
-
-in
- { inherit trivial fixedPoints
- attrsets lists strings stringsWithDeps
- customisation maintainers meta sources
- modules options types
- licenses systems
- debug generators misc
- sandbox fetchers filesystem;
+ callLibs = file: import file { inherit lib; };
+
+ lib = rec {
+
+ # often used, or depending on very little
+ trivial = callLibs ./trivial.nix;
+ fixedPoints = callLibs ./fixed-points.nix;
+
+ # datatypes
+ attrsets = callLibs ./attrsets.nix;
+ lists = callLibs ./lists.nix;
+ strings = callLibs ./strings.nix;
+ stringsWithDeps = callLibs ./strings-with-deps.nix;
+
+ # packaging
+ customisation = callLibs ./customisation.nix;
+ maintainers = callLibs ./maintainers.nix;
+ meta = callLibs ./meta.nix;
+ sources = callLibs ./sources.nix;
+
+
+ # module system
+ modules = callLibs ./modules.nix;
+ options = callLibs ./options.nix;
+ types = callLibs ./types.nix;
+
+ # constants
+ licenses = callLibs ./licenses.nix;
+ systems = callLibs ./systems;
+
+ # misc
+ debug = callLibs ./debug.nix;
+
+ generators = callLibs ./generators.nix;
+ misc = callLibs ./deprecated.nix;
+ # domain-specific
+ sandbox = callLibs ./sandbox.nix;
+ fetchers = callLibs ./fetchers.nix;
+
+ # Eval-time filesystem handling
+ filesystem = callLibs ./filesystem.nix;
# back-compat aliases
platforms = systems.doubles;
- }
- # !!! don't include everything at top-level; perhaps only the most
- # commonly used functions.
- // trivial // fixedPoints
- // lists // strings // stringsWithDeps // attrsets // sources
- // options // types // meta // debug // misc // modules
- // customisation
+
+ inherit (builtins) add addErrorContext attrNames
+ concatLists deepSeq elem elemAt filter genericClosure genList
+ getAttr hasAttr head isAttrs isBool isFunction isInt isList
+ isString length lessThan listToAttrs pathExists readFile
+ replaceStrings seq stringLength sub substring tail;
+ inherit (trivial) id const concat or and boolToString mergeAttrs
+ flip mapNullable inNixShell min max importJSON warn info
+ nixpkgsVersion mod;
+
+ inherit (fixedPoints) fix fix' extends composeExtensions
+ makeExtensible makeExtensibleWithCustomName;
+ inherit (attrsets) attrByPath hasAttrByPath setAttrByPath
+ getAttrFromPath attrVals attrValues catAttrs filterAttrs
+ filterAttrsRecursive foldAttrs collect nameValuePair mapAttrs
+ mapAttrs' mapAttrsToList mapAttrsRecursive mapAttrsRecursiveCond
+ genAttrs isDerivation toDerivation optionalAttrs
+ zipAttrsWithNames zipAttrsWith zipAttrs recursiveUpdateUntil
+ recursiveUpdate matchAttrs overrideExisting getOutput getBin
+ getLib getDev chooseDevOutputs zipWithNames zip;
+ inherit (lists) singleton foldr fold foldl foldl' imap0 imap1
+ concatMap flatten remove findSingle findFirst any all count
+ optional optionals toList range partition zipListsWith zipLists
+ reverseList listDfs toposort sort take drop sublist last init
+ crossLists unique intersectLists subtractLists
+ mutuallyExclusive;
+ inherit (strings) concatStrings concatMapStrings concatImapStrings
+ intersperse concatStringsSep concatMapStringsSep
+ concatImapStringsSep makeSearchPath makeSearchPathOutput
+ makeLibraryPath makeBinPath makePerlPath optionalString
+ hasPrefix hasSuffix stringToCharacters stringAsChars escape
+ escapeShellArg escapeShellArgs replaceChars lowerChars upperChars
+ toLower toUpper addContextFrom splitString removePrefix
+ removeSuffix versionOlder versionAtLeast getVersion nameFromURL
+ enableFeature fixedWidthString fixedWidthNumber isStorePath
+ toInt readPathsFromFile fileContents;
+ inherit (stringsWithDeps) textClosureList textClosureMap
+ noDepEntry fullDepEntry packEntry stringAfter;
+ inherit (customisation) overrideDerivation makeOverridable
+ callPackageWith callPackagesWith addPassthru hydraJob makeScope;
+ inherit (meta) addMetaAttrs dontDistribute setName updateName
+ appendToName mapDerivationAttrset lowPrio lowPrioSet hiPrio
+ hiPrioSet;
+ inherit (sources) pathType pathIsDirectory cleanSourceFilter
+ cleanSource sourceByRegex sourceFilesBySuffices
+ commitIdFromGitRepo;
+ inherit (modules) evalModules closeModules unifyModuleSyntax
+ applyIfFunction unpackSubmodule packSubmodule mergeModules
+ mergeModules' mergeOptionDecls evalOptionValue mergeDefinitions
+ pushDownProperties dischargeProperties filterOverrides
+ sortProperties fixupOptionType mkIf mkAssert mkMerge mkOverride
+ mkOptionDefault mkDefault mkForce mkVMOverride mkStrict
+ mkFixStrictness mkOrder mkBefore mkAfter mkAliasDefinitions
+ mkAliasAndWrapDefinitions fixMergeModules mkRemovedOptionModule
+ mkRenamedOptionModule mkMergedOptionModule mkChangedOptionModule
+ mkAliasOptionModule doRename filterModules;
+ inherit (options) isOption mkEnableOption mkSinkUndeclaredOptions
+ mergeDefaultOption mergeOneOption mergeEqualOption getValues
+ getFiles optionAttrSetToDocList optionAttrSetToDocList'
+ scrubOptionValue literalExample showOption showFiles
+ unknownModule mkOption;
+ inherit (types) isType setType defaultTypeMerge defaultFunctor
+ isOptionType mkOptionType;
+ inherit (debug) addErrorContextToAttrs traceIf traceVal
+ traceXMLVal traceXMLValMarked traceSeq traceSeqN traceValSeq
+ traceValSeqN traceShowVal traceShowValMarked
+ showVal traceCall traceCall2 traceCall3 traceValIfNot runTests
+ testAllTrue strict traceCallXml attrNamesToStr;
+ inherit (misc) maybeEnv defaultMergeArg defaultMerge foldArgs
+ defaultOverridableDelayableArgs composedArgsAndFun
+ maybeAttrNullable maybeAttr ifEnable checkFlag getValue
+ checkReqs uniqList uniqListExt condConcat lazyGenericClosure
+ innerModifySumArgs modifySumArgs innerClosePropagation
+ closePropagation mapAttrsFlatten nvs setAttr setAttrMerge
+ mergeAttrsWithFunc mergeAttrsConcatenateValues
+ mergeAttrsNoOverride mergeAttrByFunc mergeAttrsByFuncDefaults
+ mergeAttrsByFuncDefaultsClean mergeAttrBy
+ prepareDerivationArgs nixType imap overridableDelayableArgs;
+ };
+in lib
diff --git a/lib/deprecated.nix b/lib/deprecated.nix
index 8cdfab381baf89c53297e709a802cea854270f04..2a0f5a55bf14e9adc38fb7f5b1894ba9210f9152 100644
--- a/lib/deprecated.nix
+++ b/lib/deprecated.nix
@@ -1,11 +1,12 @@
-let lib = import ./default.nix;
+{ lib }:
+let
inherit (builtins) isFunction head tail isList isAttrs isInt attrNames;
in
-with import ./lists.nix;
-with import ./attrsets.nix;
-with import ./strings.nix;
+with lib.lists;
+with lib.attrsets;
+with lib.strings;
rec {
diff --git a/lib/fetchers.nix b/lib/fetchers.nix
index 21f28c32ef7e131f0e003ec7dedad7d6085d9a79..1107353b51dd3b9996f79826341f471e7eeaa1e5 100644
--- a/lib/fetchers.nix
+++ b/lib/fetchers.nix
@@ -1,4 +1,5 @@
# snippets that can be shared by multiple fetchers (pkgs/build-support)
+{ lib }:
{
proxyImpureEnvVars = [
diff --git a/lib/filesystem.nix b/lib/filesystem.nix
index 3925beb2134782e626986cb4bc96d1b7d16e25ee..fc35a1a72c648cbf7f380472256425b76bccee5d 100644
--- a/lib/filesystem.nix
+++ b/lib/filesystem.nix
@@ -1,3 +1,4 @@
+{ lib }:
{ # haskellPathsInDir : Path -> Map String Path
# A map of all haskell packages defined in the given path,
# identified by having a cabal file with the same name as the
diff --git a/lib/fixed-points.nix b/lib/fixed-points.nix
index a11b5a6f4bdc5a64d5a62dcc7dabdb463a4acfdf..13e053b5aa7dbffcd1db7fe576fea52efc0fa63b 100644
--- a/lib/fixed-points.nix
+++ b/lib/fixed-points.nix
@@ -1,3 +1,4 @@
+{ ... }:
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
diff --git a/lib/generators.nix b/lib/generators.nix
index 4419c3c88917e2013ce6969c172fa777159fee3e..5f9da234f4474638b3fc91279a7087f3da651f26 100644
--- a/lib/generators.nix
+++ b/lib/generators.nix
@@ -7,10 +7,11 @@
* Tests can be found in ./tests.nix
* Documentation in the manual, #sec-generators
*/
-with import ./trivial.nix;
+{ lib }:
+with (lib).trivial;
let
- libStr = import ./strings.nix;
- libAttr = import ./attrsets.nix;
+ libStr = lib.strings;
+ libAttr = lib.attrsets;
flipMapAttrs = flip libAttr.mapAttrs;
in
diff --git a/lib/licenses.nix b/lib/licenses.nix
index 552874325d41485745c8f83a09196ab89853f9b5..cbd737dc57f17e891818ba32bf5bbd2ccc8a8fcc 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -1,7 +1,6 @@
+{ lib }:
let
- lib = import ./default.nix;
-
spdx = lic: lic // {
url = "http://spdx.org/licenses/${lic.spdxId}";
};
@@ -175,6 +174,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
fullName = "DOC License";
};
+ eapl = {
+ fullName = "EPSON AVASYS PUBLIC LICENSE";
+ url = http://avasys.jp/hp/menu000000700/hpg000000603.htm;
+ free = false;
+ };
+
efl10 = spdx {
spdxId = "EFL-1.0";
fullName = "Eiffel Forum License v1.0";
@@ -198,7 +203,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
eupl11 = spdx {
spdxId = "EUPL-1.1";
- fullname = "European Union Public License 1.1";
+ fullName = "European Union Public License 1.1";
};
fdl12 = spdx {
@@ -211,6 +216,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
fullName = "GNU Free Documentation License v1.3";
};
+ ffsl = {
+ fullName = "Floodgap Free Software License";
+ url = http://www.floodgap.com/software/ffsl/license.html;
+ free = false;
+ };
+
free = {
fullName = "Unspecified free software license";
};
@@ -271,6 +282,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
url = https://fedoraproject.org/wiki/Licensing/GPL_Classpath_Exception;
};
+ hpnd = spdx {
+ spdxId = "HPND";
+ fullName = "Historic Permission Notice and Disclaimer";
+ };
+
# Intel's license, seems free
iasl = {
fullName = "iASL";
@@ -282,9 +298,10 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
fullName = "Independent JPEG Group License";
};
- inria = {
- fullName = "INRIA Non-Commercial License Agreement";
+ inria-compcert = {
+ fullName = "INRIA Non-Commercial License Agreement for the CompCert verified compiler";
url = "http://compcert.inria.fr/doc/LICENSE";
+ free = false;
};
ipa = spdx {
@@ -363,7 +380,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
};
miros = {
- fullname = "MirOS License";
+ fullName = "MirOS License";
url = https://opensource.org/licenses/MirOS;
};
@@ -408,7 +425,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
url = "https://raw.githubusercontent.com/raboof/notion/master/LICENSE";
fullName = "Notion modified LGPL";
};
-
+
ofl = spdx {
spdxId = "OFL-1.1";
fullName = "SIL Open Font License 1.1";
diff --git a/lib/lists.nix b/lib/lists.nix
index 6a8fd8a184082358227d2e39dd69da85bdf8bf0b..8f67c6bb0ca3bece07f307c827dc45c46c2c8d23 100644
--- a/lib/lists.nix
+++ b/lib/lists.nix
@@ -1,6 +1,6 @@
# General list operations.
-
-with import ./trivial.nix;
+{ lib }:
+with lib.trivial;
rec {
diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 727fd2091c9967caa9fb6c88a962616d1555c09d..f09869cda2d06809ba9d6b418f6759a4992e6ddc 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -1,3 +1,4 @@
+{ ...}:
/* List of NixOS maintainers. The format is:
handle = "Real Name ";
@@ -30,21 +31,26 @@
ak = "Alexander Kjeldaas ";
akaWolf = "Artjom Vejsel ";
akc = "Anders Claesson ";
+ alexvorobiev = "Alex Vorobiev ";
dezgeg = "Tuomas Tynkkynen ";
+ dfordivam = "Divam ";
dfoxfranke = "Daniel Fox Franke ";
dgonyeo = "Derek Gonyeo ";
dipinhora = "Dipin Hora ";
disassembler = "Samuel Leathers ";
+ dizfer = "David Izquierdo ";
dmalikov = "Dmitry Malikov ";
DmitryTsygankov = "Dmitry Tsygankov ";
dmjio = "David Johnson ";
@@ -156,13 +175,16 @@
dotlambda = "Robert Schütz ";
doublec = "Chris Double ";
dpaetzel = "David Pätzel ";
+ dpflug = "David Pflug ";
drets = "Dmytro Rets ";
drewkett = "Andrew Burkett ";
dsferruzza = "David Sferruzza ";
dtzWill = "Will Dietz ";
+ dupgit = "Olivier Delhomme ";
dywedir = "Vladyslav M. ";
e-user = "Alexander Kahl ";
- ebzzry = "Rommel Martinez ";
+ earldouglas = "James Earl Douglas ";
+ ebzzry = "Rommel Martinez ";
edanaher = "Evan Danaher ";
edef = "edef ";
ederoyd46 = "Matthew Brown ";
@@ -180,17 +202,23 @@
ellis = "Ellis Whitehead ";
eperuffo = "Emanuele Peruffo ";
epitrochoid = "Mabry Cervin ";
+ eqyiel = "Ruben Maher ";
ericbmerritt = "Eric Merritt ";
ericsagnes = "Eric Sagnes ";
+ ericson2314 = "John Ericson ";
+ erictapen = "Justin Humm ";
erikryb = "Erik Rybakken ";
ertes = "Ertugrul Söylemez ";
ethercrow = "Dmitry Ivanov ";
+ etu = "Elis Hirwing ";
exi = "Reno Reckling ";
exlevan = "Alexey Levan ";
expipiplus1 = "Joe Hermaszewski ";
fadenb = "Tristan Helmich ";
- fare = "Francois-Rene Rideau ";
falsifian = "James Cook ";
+ fare = "Francois-Rene Rideau ";
+ fgaz = "Francesco Gazzetta ";
+ flokli = "Florian Klink ";
florianjacob = "Florian Jacob ";
flosse = "Markus Kohlhase ";
fluffynukeit = "Daniel Austin ";
@@ -207,11 +235,13 @@
fuuzetsu = "Mateusz Kowalczyk ";
fuzzy-id = "Thomas Bach ";
fxfactorial = "Edgar Aroutiounian ";
+ gabesoft = "Gabriel Adomnicai ";
gal_bolle = "Florent Becker ";
garbas = "Rok Garbas ";
garrison = "Jim Garrison ";
gavin = "Gavin Rogers ";
gebner = "Gabriel Ebner ";
+ geistesk = "Alvar Penning ";
georgewhewell = "George Whewell ";
gilligan = "Tobias Pflug ";
giogadi = "Luis G. Torres ";
@@ -227,13 +257,16 @@
grburst = "Julius Elias ";
gridaphobe = "Eric Seidel ";
guibert = "David Guibert ";
+ guibou = "Guillaume Bouchard ";
guillaumekoenig = "Guillaume Koenig ";
guyonvarch = "Joris Guyonvarch ";
hakuch = "Jesse Haber-Kucharsky ";
+ hamhut1066 = "Hamish Hutchings ";
havvy = "Ryan Scheel ";
hbunke = "Hendrik Bunke ";
hce = "Hans-Christian Esperer ";
hectorj = "Hector Jusforgues ";
+ hedning = "Tor Hedin Brønner ";
heel = "Sergii Paryzhskyi ";
henrytill = "Henry Till ";
hhm = "hhm ";
@@ -243,9 +276,11 @@
htr = "Hugo Tavares Reis ";
iand675 = "Ian Duncan ";
ianwookim = "Ian-Woo Kim ";
+ iblech = "Ingo Blechschmidt ";
igsha = "Igor Sharonov ";
ikervagyok = "Balázs Lengyel ";
- infinisil = "Silvan Mosberger y then x else y;
+ /* Integer modulus
+
+ Example:
+ mod 11 10
+ => 1
+ mod 1 10
+ => 1
+ */
+ mod = base: int: base - (int * (builtins.div base int));
+
/* Reads a JSON file. */
importJSON = path:
builtins.fromJSON (builtins.readFile path);
diff --git a/lib/types.nix b/lib/types.nix
index a7dcd3f1e1c775726764a0c205fb97bc06bfc784..46ed05d288f2e3ff2477fad7d0af2f5921384076 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -1,15 +1,16 @@
# Definitions related to run-time type checking. Used in particular
# to type-check NixOS configurations.
-
-with import ./lists.nix;
-with import ./attrsets.nix;
-with import ./options.nix;
-with import ./trivial.nix;
-with import ./strings.nix;
-let inherit (import ./modules.nix) mergeDefinitions filterOverrides; in
-
+{ lib }:
+with lib.lists;
+with lib.attrsets;
+with lib.options;
+with lib.trivial;
+with lib.strings;
+let
+
+ inherit (lib.modules) mergeDefinitions filterOverrides;
+ outer_types =
rec {
-
isType = type: x: (x._type or "") == type;
setType = typeName: value: value // {
@@ -95,7 +96,6 @@ rec {
# When adding new types don't forget to document them in
# nixos/doc/manual/development/option-types.xml!
types = rec {
-
unspecified = mkOptionType {
name = "unspecified";
};
@@ -108,11 +108,64 @@ rec {
};
int = mkOptionType rec {
- name = "int";
- description = "integer";
- check = isInt;
- merge = mergeOneOption;
- };
+ name = "int";
+ description = "signed integer";
+ check = isInt;
+ merge = mergeOneOption;
+ };
+
+ # Specialized subdomains of int
+ ints =
+ let
+ betweenDesc = lowest: highest:
+ "${toString lowest} and ${toString highest} (both inclusive)";
+ between = lowest: highest: assert lowest <= highest;
+ addCheck int (x: x >= lowest && x <= highest) // {
+ name = "intBetween";
+ description = "integer between ${betweenDesc lowest highest}";
+ };
+ ign = lowest: highest: name: docStart:
+ between lowest highest // {
+ inherit name;
+ description = docStart + "; between ${betweenDesc lowest highest}";
+ };
+ unsign = bit: range: ign 0 (range - 1)
+ "unsignedInt${toString bit}" "${toString bit} bit unsigned integer";
+ sign = bit: range: ign (0 - (range / 2)) (range / 2 - 1)
+ "signedInt${toString bit}" "${toString bit} bit signed integer";
+
+ in rec {
+ /* An int with a fixed range.
+ *
+ * Example:
+ * (ints.between 0 100).check (-1)
+ * => false
+ * (ints.between 0 100).check (101)
+ * => false
+ * (ints.between 0 0).check 0
+ * => true
+ */
+ inherit between;
+
+ unsigned = addCheck types.int (x: x >= 0) // {
+ name = "unsignedInt";
+ description = "unsigned integer, meaning >=0";
+ };
+ positive = addCheck types.int (x: x > 0) // {
+ name = "positiveInt";
+ description = "positive integer, meaning >0";
+ };
+ u8 = unsign 8 256;
+ u16 = unsign 16 65536;
+ # the biggest int a 64-bit Nix accepts is 2^63 - 1 (9223372036854775808), for a 32-bit Nix it is 2^31 - 1 (2147483647)
+ # the smallest int a 64-bit Nix accepts is -2^63 (-9223372036854775807), for a 32-bit Nix it is -2^31 (-2147483648)
+ # u32 = unsign 32 4294967296;
+ # u64 = unsign 64 18446744073709551616;
+
+ s8 = sign 8 256;
+ s16 = sign 16 65536;
+ # s32 = sign 32 4294967296;
+ };
str = mkOptionType {
name = "str";
@@ -172,7 +225,7 @@ rec {
};
# drop this in the future:
- list = builtins.trace "`types.list' is deprecated; use `types.listOf' instead" types.listOf;
+ list = builtins.trace "`types.list` is deprecated; use `types.listOf` instead" types.listOf;
listOf = elemType: mkOptionType rec {
name = "listOf";
@@ -189,7 +242,7 @@ rec {
).optionalValue
) def.value
else
- throw "The option value `${showOption loc}' in `${def.file}' is not a list.") defs)));
+ throw "The option value `${showOption loc}` in `${def.file}` is not a list.") defs)));
getSubOptions = prefix: elemType.getSubOptions (prefix ++ ["*"]);
getSubModules = elemType.getSubModules;
substSubModules = m: listOf (elemType.substSubModules m);
@@ -240,25 +293,6 @@ rec {
functor = (defaultFunctor name) // { wrapped = elemType; };
};
- # List or element of ...
- loeOf = elemType: mkOptionType rec {
- name = "loeOf";
- description = "element or list of ${elemType.description}s";
- check = x: isList x || elemType.check x;
- merge = loc: defs:
- let
- defs' = filterOverrides defs;
- res = (head defs').value;
- in
- if isList res then concatLists (getValues defs')
- else if lessThan 1 (length defs') then
- throw "The option `${showOption loc}' is defined multiple times, in ${showFiles (getFiles defs)}."
- else if !isString res then
- throw "The option `${showOption loc}' does not have a string value, in ${showFiles (getFiles defs)}."
- else res;
- 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";
@@ -279,7 +313,7 @@ rec {
let nrNulls = count (def: def.value == null) defs; in
if nrNulls == length defs then null
else if nrNulls != 0 then
- throw "The option `${showOption loc}' is defined both null and not null, in ${showFiles (getFiles defs)}."
+ throw "The option `${showOption loc}` is defined both null and not null, in ${showFiles (getFiles defs)}."
else elemType.merge loc defs;
getSubOptions = elemType.getSubOptions;
getSubModules = elemType.getSubModules;
@@ -291,7 +325,7 @@ rec {
submodule = opts:
let
opts' = toList opts;
- inherit (import ./modules.nix) evalModules;
+ inherit (lib.modules) evalModules;
in
mkOptionType rec {
name = "submodule";
@@ -307,8 +341,17 @@ rec {
}).config;
getSubOptions = prefix: (evalModules
{ modules = opts'; inherit prefix;
- # FIXME: hack to get shit to evaluate.
- args = { name = ""; }; }).options;
+ # This is a work-around due to the fact that some sub-modules,
+ # such as the one included in an attribute set, expects a "args"
+ # attribute to be given to the sub-module. As the option
+ # evaluation does not have any specific attribute name, we
+ # provide a default one for the documentation.
+ #
+ # This is mandatory as some option declaration might use the
+ # "name" attribute given as argument of the submodule and use it
+ # as the default of option declarations.
+ args.name = "<name>";
+ }).options;
getSubModules = opts';
substSubModules = m: submodule m;
functor = (defaultFunctor name) // {
@@ -395,5 +438,6 @@ rec {
addCheck = elemType: check: elemType // { check = x: elemType.check x && check x; };
};
+};
-}
+in outer_types // outer_types.types
diff --git a/maintainers/scripts/gnome.sh b/maintainers/scripts/gnome.sh
index e5a8d606f1a3b41279577fd015e316793e28f998..d44bda53f8d68fd5b912d653ffffed408f69aa36 100755
--- a/maintainers/scripts/gnome.sh
+++ b/maintainers/scripts/gnome.sh
@@ -6,20 +6,18 @@ GNOME_FTP=ftp.gnome.org/pub/GNOME/sources
# projects that don't follow the GNOME major versioning, or that we don't want to
# programmatically update
-NO_GNOME_MAJOR="ghex gtkhtml gdm"
+NO_GNOME_MAJOR="ghex gtkhtml gdm gucharmap"
usage() {
- echo "Usage: $0 gnome_dir || [major.minor]" >&2
- echo "gnome_dir is for example pkgs/desktops/gnome-3/3.18" >&2
+ echo "Usage: $0 || [major.minor]" >&2
exit 0
}
-if [ "$#" -lt 2 ]; then
+if [ "$#" -lt 1 ]; then
usage
fi
-GNOME_TOP=$1
-shift
+GNOME_TOP=pkgs/desktops/gnome-3
action=$1
diff --git a/maintainers/scripts/hydra-eval-failures.py b/maintainers/scripts/hydra-eval-failures.py
index 6bbc0a45e44d8070cdab982dba04af2c693238ca..ddc3c7c4a96752f731b7661a8632b91441da1e0e 100755
--- a/maintainers/scripts/hydra-eval-failures.py
+++ b/maintainers/scripts/hydra-eval-failures.py
@@ -13,10 +13,8 @@ from pyquery import PyQuery as pq
maintainers_json = subprocess.check_output([
- 'nix-instantiate',
- 'lib/maintainers.nix',
- '--eval',
- '--json'])
+ 'nix-instantiate', '-E', 'import ./lib/maintainers.nix {}', '--eval', '--json'
+])
maintainers = json.loads(maintainers_json)
MAINTAINERS = {v: k for k, v in maintainers.iteritems()}
@@ -31,25 +29,28 @@ EVAL_FILE = {
def get_maintainers(attr_name):
- nixname = attr_name.split('.')
- meta_json = subprocess.check_output([
- 'nix-instantiate',
- '--eval',
- '--strict',
- '-A',
- '.'.join(nixname[1:]) + '.meta',
- EVAL_FILE[nixname[0]],
- '--json'])
- meta = json.loads(meta_json)
- if meta.get('maintainers'):
- return [MAINTAINERS[name] for name in meta['maintainers'] if MAINTAINERS.get(name)]
+ try:
+ nixname = attr_name.split('.')
+ meta_json = subprocess.check_output([
+ 'nix-instantiate',
+ '--eval',
+ '--strict',
+ '-A',
+ '.'.join(nixname[1:]) + '.meta',
+ EVAL_FILE[nixname[0]],
+ '--json'])
+ meta = json.loads(meta_json)
+ if meta.get('maintainers'):
+ return [MAINTAINERS[name] for name in meta['maintainers'] if MAINTAINERS.get(name)]
+ except:
+ return []
@click.command()
@click.option(
'--jobset',
- default="nixos/release-17.03",
- help='Hydra project like nixos/release-17.03')
+ default="nixos/release-17.09",
+ help='Hydra project like nixos/release-17.09')
def cli(jobset):
"""
Given a Hydra project, inspect latest evaluation
diff --git a/maintainers/scripts/update-python-libraries b/maintainers/scripts/update-python-libraries
index 7c73510c353a65e0775f7454fcafc10487a44977..3ddc8c23a79be8d8b3ee7ad9a90f6b09b6385d9f 100755
--- a/maintainers/scripts/update-python-libraries
+++ b/maintainers/scripts/update-python-libraries
@@ -18,6 +18,7 @@ import os
import re
import requests
import toolz
+from concurrent.futures import ThreadPoolExecutor as pool
INDEX = "https://pypi.io/pypi"
"""url of PyPI"""
@@ -235,7 +236,8 @@ def main():
packages = map(os.path.abspath, args.package)
- count = list(map(_update, packages))
+ with pool() as p:
+ count = list(p.map(_update, packages))
logging.info("{} package(s) updated".format(sum(count)))
diff --git a/nixos/doc/manual/administration/declarative-containers.xml b/nixos/doc/manual/administration/declarative-containers.xml
index f3f65edcec2aecd0a5cfa62130a6da7eb1078f79..94f03a2ee116ad6d930a6f36b4e86c5b90dcb924 100644
--- a/nixos/doc/manual/administration/declarative-containers.xml
+++ b/nixos/doc/manual/administration/declarative-containers.xml
@@ -16,7 +16,7 @@ containers.database =
{ config =
{ config, pkgs, ... }:
{ services.postgresql.enable = true;
- services.postgresql.package = pkgs.postgresql92;
+ services.postgresql.package = pkgs.postgresql96;
};
};
diff --git a/nixos/doc/manual/configuration/summary.xml b/nixos/doc/manual/configuration/summary.xml
index 6ff0390c0ed34e66c97c9bbebe9d83083a09b823..be1f2263149e47edc3f7dc537fe2782f0a103012 100644
--- a/nixos/doc/manual/configuration/summary.xml
+++ b/nixos/doc/manual/configuration/summary.xml
@@ -113,7 +113,8 @@ manual for the rest.
assert 1 + 1 == 2; "yes!"
- Assertion check (evaluates to "yes!")
+ Assertion check (evaluates to "yes!"). See for using assertions in modules
let x = "foo"; y = "bar"; in x + y
diff --git a/nixos/doc/manual/development/assertions.xml b/nixos/doc/manual/development/assertions.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d3434e1f112ee1e71df9aa50cde970d6980b83f5
--- /dev/null
+++ b/nixos/doc/manual/development/assertions.xml
@@ -0,0 +1,80 @@
+
+
+Warnings and Assertions
+
+
+ When configuration problems are detectable in a module, it is a good
+ idea to write an assertion or warning. Doing so provides clear
+ feedback to the user and prevents errors after the build.
+
+
+
+ Although Nix has the abort and
+ builtins.trace functions to perform such tasks,
+ they are not ideally suited for NixOS modules. Instead of these
+ functions, you can declare your warnings and assertions using the
+ NixOS module system.
+
+
+
+
+Warnings
+
+
+ This is an example of using warnings.
+
+
+
+
+
+
+
+
+
+
+Assertions
+
+
+
+ This example, extracted from the
+
+ syslogd module
+ shows how to use assertions. Since there
+ can only be one active syslog daemon at a time, an assertion is useful to
+ prevent such a broken system from being built.
+
+
+
+
+
+
+
+
+
diff --git a/nixos/doc/manual/development/option-declarations.xml b/nixos/doc/manual/development/option-declarations.xml
index d20c2d1aa2e235d345dba62a4fdd090d88686390..be793152f9ef982bae25ccddd9c2ec4811783b94 100644
--- a/nixos/doc/manual/development/option-declarations.xml
+++ b/nixos/doc/manual/development/option-declarations.xml
@@ -137,8 +137,8 @@ services.xserver.displayManager.enable = mkOption {
};
Extending
- <literal>services.foo.backend</literal> in the <literal>sddm</literal>
- module
+ services.xserver.displayManager.enable in the
+ sddm module
services.xserver.displayManager.enable = mkOption {
type = with types; nullOr (enum [ "sddm" ]);
diff --git a/nixos/doc/manual/development/option-types.xml b/nixos/doc/manual/development/option-types.xml
index 441393c982766473e78234556caffb0d64e7a8ec..83dcf0232d9d3c4981b21f526f3357c9b913a9a5 100644
--- a/nixos/doc/manual/development/option-types.xml
+++ b/nixos/doc/manual/development/option-types.xml
@@ -22,10 +22,6 @@
A boolean, its values can be true or
false.
-
- types.int
- An integer.
-
types.path
A filesystem path, defined as anything that when coerced to
@@ -39,7 +35,59 @@
-String related types:
+Integer-related types:
+
+
+
+ types.int
+ A signed integer.
+
+
+
+ types.ints.{s8, s16, s32}
+
+
+ Signed integers with a fixed length (8, 16 or 32 bits).
+ They go from
+ −2n/2
+ to
+ 2n/2−1
+
+ respectively (e.g. −128 to 127
+ for 8 bits).
+
+
+
+
+ types.ints.unsigned
+
+ An unsigned integer (that is >= 0).
+
+
+
+
+ types.ints.{u8, u16, u32}
+
+
+ Unsigned integers with a fixed length (8, 16 or 32 bits).
+ They go from
+ 0 to
+ 2n−1
+
+ respectively (e.g. 0 to 255
+ for 8 bits).
+
+
+
+
+ types.ints.positive
+
+ A positive integer (that is > 0).
+
+
+
+
+String-related types:
@@ -68,7 +116,7 @@
Value Types
- Value types are type that take a value parameter.
+ Value types are types that take a value parameter.
@@ -84,6 +132,17 @@
sep, e.g. types.separatedString
"|".
+
+
+ types.ints.between
+ lowest
+ highest
+
+ An integer between lowest
+ and highest (both inclusive).
+ Useful for creating types like types.port.
+
+
types.submodule o
A set of sub options o.
@@ -157,27 +216,26 @@
Submodule
- Submodule is a very powerful type that defines a set of sub-options that
- are handled like a separate module.
- It is especially interesting when used with composed types like
- attrsOf or listOf.
+ submodule is a very powerful type that defines a set
+ of sub-options that are handled like a separate module.
- The submodule type take a parameter o, that
- should be a set, or a function returning a set with an
- options key defining the sub-options.
- The option set can be defined directly () or as reference ().
+ It takes a parameter o, that should be a set,
+ or a function returning a set with an options key
+ defining the sub-options.
+ Submodule option definitions are type-checked accordingly to the
+ options declarations.
+ Of course, you can nest submodule option definitons for even higher
+ modularity.
- Submodule option definitions are type-checked accordingly to the options
- declarations. It is possible to declare submodule options inside a submodule
- sub-options for even higher modularity.
+ The option set can be defined directly
+ () or as reference
+ ().
Directly defined submodule
options.mod = mkOption {
- name = "mod";
description = "submodule example";
- type = with types; listOf (submodule {
+ type = with types; submodule {
options = {
foo = mkOption {
type = int;
@@ -186,10 +244,10 @@ options.mod = mkOption {
type = str;
};
};
- });
+ };
};
-Submodule defined as a
+<example xml:id='ex-submodule-reference'><title>Submodule defined as a
reference
let
@@ -206,16 +264,20 @@ let
in
options.mod = mkOption {
description = "submodule example";
- type = with types; listOf (submodule modOptions);
+ type = with types; submodule modOptions;
};
-Composed with <literal>listOf</literal>
-
- When composed with listOf, submodule allows multiple
- definitions of the submodule option set.
+ The submodule type is especially interesting when
+ used with composed types like attrsOf or
+ listOf.
+ When composed with listOf
+ (),
+ submodule allows multiple definitions of the submodule
+ option set ().
+
Declaration of a list
- of submodules
+ nof submodules
options.mod = mkOption {
description = "submodule example";
@@ -239,13 +301,11 @@ config.mod = [
{ foo = 2; bar = "two"; }
];
-
-
-
-Composed with <literal>attrsOf</literal>
-
- When composed with attrsOf, submodule allows multiple
- named definitions of the submodule option set.
+ When composed with attrsOf
+ (),
+ submodule allows multiple named definitions of the
+ submodule option set ().
+
Declaration of
attribute sets of submodules
@@ -270,7 +330,6 @@ options.mod = mkOption {
config.mod.one = { foo = 1; bar = "one"; };
config.mod.two = { foo = 2; bar = "two"; };
-
Extending types
diff --git a/nixos/doc/manual/development/releases.xml b/nixos/doc/manual/development/releases.xml
index 01c3dbc22f165756278b0feb74ea2957783da9b6..afcb970ed700baea7b943c13e8aa2c95314bb35f 100755
--- a/nixos/doc/manual/development/releases.xml
+++ b/nixos/doc/manual/development/releases.xml
@@ -10,7 +10,7 @@
Release process
- Going through an example of releasing NixOS 15.09:
+ Going through an example of releasing NixOS 17.09:
@@ -18,13 +18,13 @@
- Send an email to nix-dev mailinglist as a warning about upcoming beta "feature freeze" in a month.
+ Send an email to the nix-devel mailinglist as a warning about upcoming beta "feature freeze" in a month.
Discuss with Eelco Dolstra and the community (via IRC, ML) about what will reach the deadline.
- Any issue or Pull Request targeting the release should have assigned milestone.
+ Any issue or Pull Request targeting the release should be included in the release milestone.
@@ -34,91 +34,88 @@
- Rename rl-unstable.xml ->
- rl-1509.xml.
+ Create
+ an issue for tracking Zero Hydra Failures progress. ZHF is an effort
+ to get build failures down to zero.
- git tag -a -m "Release 15.09-beta" 15.09-beta && git push --tags
+ git tag -a -s -m "Release 17.09-beta" 17.09-beta && git push --tags
- From the master branch run git checkout -B release-15.09.
+ From the master branch run git checkout -B release-17.09.
- Make sure channel is created at http://nixos.org/channels/.
+ Make sure a channel is created at http://nixos.org/channels/.
- Lock the branch on github (so developers can’t force push)
+ Let a GitHub nixpkgs admin lock the branch on github for you.
+ (so developers can’t force push)
- bump
- system.defaultChannel attribute in
- nixos/modules/misc/version.nix
+
+ Bump the system.defaultChannel attribute in
+ nixos/modules/misc/version.nix
+
- update
- versionSuffix in
+
+ Update versionSuffix in
nixos/release.nix, use
- git log --format=%an|wc -l to get commit
+ git log --format=%an|wc -l to get the commit
count
- echo -n "16.03" > .version in
+ echo -n "18.03" > .version on
master.
- pick
- a new name for unstable branch.
-
-
-
-
- Create
- an issue for tracking Zero Hydra Failures progress. ZHF is an effort
- to get build failures down to zero.
+
+ Pick a new name for the unstable branch.
+
- Use https://lwn.net/Vulnerabilities/ and
- triage vulnerabilities in an issue.
+ Create a new release notes file for the upcoming release + 1, in this
+ case rl-1803.xml.
- Create two Hydra jobsets: release-15.09 and release-15.09-small with stableBranch set to false
+ Create two Hydra jobsets: release-17.09 and release-17.09-small with stableBranch set to false.
Edit changelog at
- nixos/doc/manual/release-notes/rl-1509.xml
+ nixos/doc/manual/release-notes/rl-1709.xml
(double check desktop versions are noted)
Get all new NixOS modules
- git diff release-14.12..release-15.09 nixos/modules/module-list.nix|grep ^+
+ git diff release-17.03..release-17.09 nixos/modules/module-list.nix|grep ^+
@@ -130,9 +127,25 @@
+
+ During Beta
+
+
+
+ Monitor the master branch for bugfixes and minor updates
+ and cherry-pick them to the release branch.
+
+
+
+
Before the final release
+
+
+ Re-check that the release notes are complete.
+
+
Release Nix (currently only Eelco Dolstra can do that).
diff --git a/nixos/doc/manual/development/writing-modules.xml b/nixos/doc/manual/development/writing-modules.xml
index 5bdcad5ceb574302b0e935ed4e1adff306853d1e..cb363b45675bf3eda9d2416f9817135f609228ea 100644
--- a/nixos/doc/manual/development/writing-modules.xml
+++ b/nixos/doc/manual/development/writing-modules.xml
@@ -178,6 +178,7 @@ in {
+
diff --git a/nixos/doc/manual/installation/installing-usb.xml b/nixos/doc/manual/installation/installing-usb.xml
index b97f989d902caf8fe0f97afb3b99cdebfb541ed8..31d51816e39b0f0760673bfe1ccd741a583774c1 100644
--- a/nixos/doc/manual/installation/installing-usb.xml
+++ b/nixos/doc/manual/installation/installing-usb.xml
@@ -31,7 +31,7 @@ ISO, copy its contents verbatim to your drive, then either:
Edit loader/entries/nixos-livecd.conf on the drive
and change the root= field in the options
line to point to your drive (see the documentation on root=
- in
+ in
the kernel documentation for more details).
diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml
index 8c37643c08f5c70c439ae828272c1c36d3009567..b0674307a563d48ba44c6d065f0ecd239fa66f00 100644
--- a/nixos/doc/manual/installation/installing.xml
+++ b/nixos/doc/manual/installation/installing.xml
@@ -16,7 +16,8 @@
hardware.
The NixOS manual is available on virtual console 8
- (press Alt+F8 to access).
+ (press Alt+F8 to access) or by running nixos-help.
+
You get logged in as root
(with empty password).
@@ -139,6 +140,11 @@
the GRUB boot loader is to be installed. Without it, NixOS cannot
boot.
+ If there are other operating systems running on the machine before
+ installing NixOS, the
+ option can be set to
+ true to automatically add them to the grub menu.
+
Another critical option is ,
specifying the file systems that need to be mounted by NixOS.
However, you typically don’t need to set it yourself, because
diff --git a/nixos/doc/manual/release-notes/release-notes.xml b/nixos/doc/manual/release-notes/release-notes.xml
index 6065a86f60d890cb2bbc2c396a7f5efaea49827e..5ed56bde66592a6929eec942adf4f2db6aced49f 100644
--- a/nixos/doc/manual/release-notes/release-notes.xml
+++ b/nixos/doc/manual/release-notes/release-notes.xml
@@ -9,6 +9,7 @@
This section lists the release notes for each stable version of NixOS
and current unstable revision.
+
diff --git a/nixos/doc/manual/release-notes/rl-1609.xml b/nixos/doc/manual/release-notes/rl-1609.xml
index 3abafac97378e67aeeae2bdbe4067ede9c5409bc..893f894f42fee5c763c31f88a561f7bc30192ed5 100644
--- a/nixos/doc/manual/release-notes/rl-1609.xml
+++ b/nixos/doc/manual/release-notes/rl-1609.xml
@@ -176,7 +176,7 @@ following incompatible changes:
streamlined. Desktop users should be able to simply set
security.grsecurity.enable = true to get
a reasonably secure system without having to sacrifice too much
- functionality. See for documentation
+ functionality.
Special filesystems, like /proc,
diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml
index 0cd9e9571882c0c2b82a405bacf58e9f26904744..66f7b01db72a8aa103b9f7e0635465ef3d007fd5 100644
--- a/nixos/doc/manual/release-notes/rl-1709.xml
+++ b/nixos/doc/manual/release-notes/rl-1709.xml
@@ -6,10 +6,24 @@
Release 17.09 (“Hummingbird”, 2017/09/??)
+
+
+Highlights
+
In addition to numerous new and upgraded packages, this release
has the following highlights:
+
+
+ The GNOME version is now 3.24. KDE Plasma was upgraded to 5.10,
+ KDE Applications to 17.08.1 and KDE Frameworks to 5.37.
+
+
The user handling now keeps track of deallocated UIDs/GIDs. When a user
@@ -40,16 +54,130 @@ has the following highlights:
even though HDMI-0 is the first head in the list.
+
+
+ The handling of SSL in the services.nginx module has
+ been cleaned up, renaming the misnamed enableSSL to
+ onlySSL which reflects its original intention. This
+ is not to be used with the already existing forceSSL
+ which creates a second non-SSL virtual host redirecting to the SSL
+ virtual host. This by chance had worked earlier due to specific
+ implementation details. In case you had specified both please remove
+ the enableSSL option to keep the previous behaviour.
+
+
+ Another addSSL option has been introduced to configure
+ both a non-SSL virtual host and an SSL virtual host with the same
+ configuration.
+
+
+ Options to configure resolver options and
+ upstream blocks have been introduced. See their information
+ for further details.
+
+
+ The port option has been replaced by a more generic
+ listen option which makes it possible to specify
+ multiple addresses, ports and SSL configs dependant on the new SSL
+ handling mentioned above.
+
+
+
+
+
+New Services
+
The following new services were added since the last release:
-
-
-
+ config/fonts/fontconfig-penultimate.nix
+ config/fonts/fontconfig-ultimate.nix
+ config/terminfo.nix
+ hardware/sensor/iio.nix
+ hardware/nitrokey.nix
+ hardware/raid/hpsa.nix
+ programs/browserpass.nix
+ programs/gnupg.nix
+ programs/qt5ct.nix
+ programs/slock.nix
+ programs/thefuck.nix
+ security/auditd.nix
+ security/lock-kernel-modules.nix
+ service-managers/docker.nix
+ service-managers/trivial.nix
+ services/admin/salt/master.nix
+ services/admin/salt/minion.nix
+ services/audio/slimserver.nix
+ services/cluster/kubernetes/default.nix
+ services/cluster/kubernetes/dns.nix
+ services/cluster/kubernetes/dashboard.nix
+ services/continuous-integration/hail.nix
+ services/databases/clickhouse.nix
+ services/databases/postage.nix
+ services/desktops/gnome3/gnome-disks.nix
+ services/desktops/gnome3/gpaste.nix
+ services/logging/SystemdJournal2Gelf.nix
+ services/logging/heartbeat.nix
+ services/logging/journalwatch.nix
+ services/logging/syslogd.nix
+ services/mail/mailhog.nix
+ services/mail/nullmailer.nix
+ services/misc/airsonic.nix
+ services/misc/autorandr.nix
+ services/misc/exhibitor.nix
+ services/misc/fstrim.nix
+ services/misc/gollum.nix
+ services/misc/irkerd.nix
+ services/misc/jackett.nix
+ services/misc/radarr.nix
+ services/misc/snapper.nix
+ services/monitoring/osquery.nix
+ services/monitoring/prometheus/collectd-exporter.nix
+ services/monitoring/prometheus/fritzbox-exporter.nix
+ services/network-filesystems/kbfs.nix
+ services/networking/dnscache.nix
+ services/networking/fireqos.nix
+ services/networking/iwd.nix
+ services/networking/keepalived/default.nix
+ services/networking/keybase.nix
+ services/networking/lldpd.nix
+ services/networking/matterbridge.nix
+ services/networking/squid.nix
+ services/networking/tinydns.nix
+ services/networking/xrdp.nix
+ services/security/shibboleth-sp.nix
+ services/security/sks.nix
+ services/security/sshguard.nix
+ services/security/torify.nix
+ services/security/usbguard.nix
+ services/security/vault.nix
+ services/system/earlyoom.nix
+ services/system/saslauthd.nix
+ services/web-apps/nexus.nix
+ services/web-apps/pgpkeyserver-lite.nix
+ services/web-apps/piwik.nix
+ services/web-servers/lighttpd/collectd.nix
+ services/web-servers/minio.nix
+ services/x11/display-managers/xpra.nix
+ services/x11/xautolock.nix
+ tasks/filesystems/bcachefs.nix
+ tasks/powertop.nix
+
+
+
+Backward Incompatibilities
When upgrading from a previous release, please be aware of the
following incompatible changes:
@@ -57,10 +185,97 @@ following incompatible changes:
- aiccu package was removed. This is due to SixXS
+
+ In an Qemu-based virtualization environment, the network interface
+ names changed from i.e. enp0s3 to
+ ens3.
+
+
+
+ This is due to a kernel configuration change. The new naming
+ is consistent with those of other Linux distributions with
+ systemd. See
+ #29197
+ for more information.
+
+
+ A machine is affected if the virt-what tool
+ either returns qemu or
+ kvm and has
+ interface names used in any part of its NixOS configuration,
+ in particular if a static network configuration with
+ networking.interfaces is used.
+
+
+ Before rebooting affected machines, please ensure:
+
+
+
+ Change the interface names in your NixOS configuration.
+ The first interface will be called ens3,
+ the second one ens8 and starting from there
+ incremented by 1.
+
+
+
+
+ After changing the interface names, rebuild your system with
+ nixos-rebuild boot to activate the new
+ configuration after a reboot. If you switch to the new
+ configuration right away you might lose network connectivity!
+ If using nixops, deploy with
+ nixops deploy --force-reboot.
+
+
+
+
+
+
+
+ The following changes apply if the stateVersion is changed to 17.09 or higher.
+ For stateVersion = "17.03" or lower the old behavior is preserved.
+
+
+
+
+ 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.
+
+
+
+
+ The mysql default dataDir has changed from /var/mysql to /var/lib/mysql.
+
+
+
+
+ Radicale's default package has changed from 1.x to 2.x. Instructions to migrate can be found here . It is also possible to use the newer version by setting the package to radicale2, which is done automatically when stateVersion is 17.09 or higher. The extraArgs option has been added to allow passing the data migration arguments specified in the instructions; see the radicale.nix NixOS test for an example migration.
+
+
+
+
+
+
+ The aiccu package was removed. This is due to SixXS
sunsetting its IPv6 tunnel.
+
+
+ The fanctl package and fan module
+ have been removed due to the developers not upstreaming their iproute2
+ patches and lagging with compatibility to recent iproute2 versions.
+
+
Top-level idea package collection was renamed.
@@ -76,7 +291,7 @@ following incompatible changes:
- 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
+ The ipfs service 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
@@ -84,29 +299,11 @@ rmdir /var/lib/ipfs/.ipfs
-
-
- The following changes apply if the stateVersion is changed to 17.09 or higher.
- For stateVersion = "17.03 or lower the old behavior is preserved.
-
-
- 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.
-
-
- The mysql default dataDir has changed from /var/mysql to /var/lib/mysql.
-
-
The caddy service was previously using an extra
- .caddy in the data directory specified with the
- dataDir option. The contents of the
+ .caddy directory in the data directory specified
+ with the dataDir option. The contents of the
.caddy directory are now expected to be in the
dataDir.
@@ -154,9 +351,145 @@ rmdir /var/lib/ipfs/.ipfs
variables as parameters.
+
+
+ services.firefox.syncserver now runs by default as a
+ non-root user. To accomodate this change, the default sqlite database
+ location has also been changed. Migration should work automatically.
+ Refer to the description of the options for more details.
+
+
+
+
+ The compiz window manager and package was
+ removed. The system support had been broken for several years.
+
+
+
+
+ Touchpad support should now be enabled through
+ libinput as synaptics is
+ now deprecated. See the option
+ services.xserver.libinput.enable.
+
+
+
+
+ grsecurity/PaX support has been dropped, following upstream's
+ decision to cease free support. See
+
+ upstream's announcement for more information.
+ No complete replacement for grsecurity/PaX is available presently.
+
+
+
+
+ services.mysql now has declarative
+ configuration of databases and users with the ensureDatabases and
+ ensureUsers options.
+
+
+
+ These options will never delete existing databases and users,
+ especially not when the value of the options are changed.
+
+
+
+ The MySQL users will be identified using
+
+ Unix socket authentication. This authenticates the
+ Unix user with the same name only, and that without the need
+ for a password.
+
+
+
+ If you have previously created a MySQL root
+ user with a password, you will need to add
+ root user for unix socket authentication
+ before using the new options. This can be done by running the
+ following SQL script:
+
+
+CREATE USER 'root'@'%' IDENTIFIED BY '';
+GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' WITH GRANT OPTION;
+FLUSH PRIVILEGES;
+
+-- Optionally, delete the password-authenticated user:
+-- DROP USER 'root'@'localhost';
+
+
+
+
+
+
+ services.mysqlBackup now works by default
+ without any user setup, including for users other than
+ mysql.
+
+
+
+ By default, the mysql user is no longer the
+ user which performs the backup. Instead a system account
+ mysqlbackup is used.
+
+
+
+ The mysqlBackup service is also now using
+ systemd timers instead of cron.
+
+
+
+ Therefore, the services.mysqlBackup.period
+ option no longer exists, and has been replaced with
+ services.mysqlBackup.calendar, which is in
+ the format of systemd.time(7).
+
+
+
+ If you expect to be sent an e-mail when the backup fails,
+ consider using a script which monitors the systemd journal for
+ errors. Regretfully, at present there is no built-in
+ functionality for this.
+
+
+
+ You can check that backups still work by running
+ systemctl start mysql-backup then
+ systemctl status mysql-backup.
+
+
+
+
+
+ Templated systemd services e.g container@name are
+ now handled currectly when switching to a new configuration, resulting
+ in them being reloaded.
+
+
+
+
+ Steam: the newStdcpp parameter
+ was removed and should not be needed anymore.
+
+
+
+
+ Redis has been updated to version 4 which mandates a cluster
+ mass-restart, due to changes in the network handling, in order
+ to ensure compatibility with networks NATing traffic.
+
+
-Other notable improvements:
+
+
+
+Other Notable Changes
@@ -199,15 +532,80 @@ rmdir /var/lib/ipfs/.ipfs
Nixpkgs overlays may now be specified with a file as well as a directory. The
- value of <nixpkgs-overlays> may be a file, and
+ value of <nixpkgs-overlays> may be a file, and
~/.config/nixpkgs/overlays.nix can be used instead of the
- ~/.config/nixpkgs/overalys directory.
+ ~/.config/nixpkgs/overlays directory.
See the overlays chapter of the Nixpkgs manual for more details.
+
+
+ Definitions for /etc/hosts can now be specified
+ declaratively with networking.hosts.
+
+
+
+
+ Two new options have been added to the installer loader, in addition
+ to the default having changed. The kernel log verbosity has been lowered
+ to the upstream default for the default options, in order to not spam
+ the console when e.g. joining a network.
+
+
+ This therefore leads to adding a new debug option
+ to set the log level to the previous verbose mode, to make debugging
+ easier, but still accessible easily.
+
+
+ Additionally a copytoram option has been added,
+ which makes it possible to remove the install medium after booting.
+ This allows tethering from your phone after booting from it.
+
+
+
+
+ services.gitlab-runner.configOptions has been added
+ to specify the configuration of gitlab-runners declaratively.
+
+
+
+
+ services.jenkins.plugins has been added
+ to install plugins easily, this can be generated with jenkinsPlugins2nix.
+
+
+
+
+ services.postfix.config has been added
+ to specify the main.cf with NixOS options. Additionally other options
+ have been added to the postfix module and has been improved further.
+
+
+
+
+ The GitLab package and module have been updated to the latest 10.0
+ release.
+
+
+
+
+ The systemd-boot boot loader now lists the NixOS
+ version, kernel version and build date of all bootable generations.
+
+
+
+
+ The dnscrypt-proxy service now defaults to using a random upstream resolver,
+ selected from the list of public non-logging resolvers with DNSSEC support.
+ Existing configurations can be migrated to this mode of operation by
+ omitting the option
+ or setting it to "random".
+
+
+
diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml
new file mode 100644
index 0000000000000000000000000000000000000000..17b385242f6feb409f920bbc9d6de4101c26c74f
--- /dev/null
+++ b/nixos/doc/manual/release-notes/rl-1803.xml
@@ -0,0 +1,96 @@
+
+
+Release 18.03 (“Impala”, 2018/03/??)
+
+
+
+Highlights
+
+In addition to numerous new and upgraded packages, this release
+has the following highlights:
+
+
+
+
+
+
+
+
+
+
+
+New Services
+
+The following new services were added since the last release:
+
+
+
+
+
+
+
+
+
+
+Backward Incompatibilities
+
+When upgrading from a previous release, please be aware of the
+following incompatible changes:
+
+
+
+
+ Dollar signs in options under are
+ passed verbatim to Postfix, which will interpret them as the beginning of
+ a parameter expression. This was already true for string-valued options
+ in the previous release, but not for list-valued options. If you need to
+ pass literal dollar signs through Postfix, double them.
+
+
+
+
+ The postage package (for web-based PostgreSQL
+ administration) has been renamed to pgmanage. The
+ corresponding module has also been renamed. To migrate please rename all
+ options to
+ .
+
+
+
+
+
+
+
+Other Notable Changes
+
+
+
+
+ ZNC option now defaults to true.
+ That means that old configuration is not overwritten by default when update to the znc options are made.
+
+
+
+
+
+
diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix
index 9c91bf39225137de7f0816bd59149833017a555a..9d1327d9c15ad83d6671b3d3166da4476e8b604b 100644
--- a/nixos/lib/make-disk-image.nix
+++ b/nixos/lib/make-disk-image.nix
@@ -33,7 +33,8 @@
, name ? "nixos-disk-image"
-, format ? "raw"
+, # Disk image format, one of qcow2, vpc, raw.
+ format ? "raw"
}:
with lib;
@@ -45,19 +46,7 @@ let
raw = "img";
};
- # Copied from https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/installer/cd-dvd/channel.nix
- # TODO: factor out more cleanly
-
- # Do not include these things:
- # - The '.git' directory
- # - Result symlinks from nix-build ('result', 'result-2', 'result-bin', ...)
- # - VIM/Emacs swap/backup files ('.swp', '.swo', '.foo.swp', 'foo~', ...)
- filterFn = path: type: let basename = baseNameOf (toString path); in
- if type == "directory" then basename != ".git"
- else if type == "symlink" then builtins.match "^result(|-.*)$" basename == null
- else builtins.match "^((|\..*)\.sw[a-z]|.*~)$" basename == null;
-
- nixpkgs = builtins.filterSource filterFn pkgs.path;
+ nixpkgs = cleanSource pkgs.path;
channelSources = pkgs.runCommand "nixos-${config.system.nixosVersion}" {} ''
mkdir -p $out
@@ -85,21 +74,21 @@ let
targets = map (x: x.target) contents;
prepareImage = ''
- export PATH=${pkgs.lib.makeSearchPathOutput "bin" "bin" prepareImageInputs}
+ export PATH=${makeSearchPathOutput "bin" "bin" prepareImageInputs}
mkdir $out
diskImage=nixos.raw
truncate -s ${toString diskSize}M $diskImage
${if partitioned then ''
- parted $diskImage -- mklabel msdos mkpart primary ext4 1M -1s
+ parted --script $diskImage -- mklabel msdos mkpart primary ext4 1M -1s
offset=$((2048*512))
'' else ''
offset=0
''}
mkfs.${fsType} -F -L nixos -E offset=$offset $diskImage
-
+
root="$PWD/root"
mkdir -p $root
diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm
index cd375352c4ca89578d9681728e8f8df96d5796a7..a7ed5d1faa381b6b277bd6046b18030b11e96add 100644
--- a/nixos/lib/test-driver/Machine.pm
+++ b/nixos/lib/test-driver/Machine.pm
@@ -372,6 +372,17 @@ sub getUnitInfo {
return $info;
}
+# Fail if the given systemd unit is not in the "active" state.
+sub requireActiveUnit {
+ my ($self, $unit) = @_;
+ $self->nest("checking if unit ‘$unit’ has reached state 'active'", sub {
+ my $info = $self->getUnitInfo($unit);
+ my $state = $info->{ActiveState};
+ if ($state ne "active") {
+ die "Expected unit ‘$unit’ to to be in state 'active' but it is in state ‘$state’\n";
+ };
+ });
+}
# Wait for a systemd unit to reach the "active" state.
sub waitForUnit {
diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix
index 58c447c76db66f7fad2cd7727836c9cd2f8bfff1..9339ba78ff0c5ad7b17545811dbfe8ff803e7d0e 100644
--- a/nixos/lib/testing.nix
+++ b/nixos/lib/testing.nix
@@ -149,6 +149,7 @@ rec {
{ key = "run-in-machine";
networking.hostName = "client";
nix.readOnlyStore = false;
+ virtualisation.writableStore = false;
}
];
diff --git a/nixos/maintainers/option-usages.nix b/nixos/maintainers/option-usages.nix
index 854ecf7eac51b4d68187e868986cfa1d24b812b1..7be0255b35acb67f08d33617baf6b771dc08bc9e 100644
--- a/nixos/maintainers/option-usages.nix
+++ b/nixos/maintainers/option-usages.nix
@@ -77,7 +77,6 @@ let
excludedOptions = [
"boot.systemd.services"
"systemd.services"
- "environment.gnome3.packageSet"
"kde.extraPackages"
];
excludeOptions = list:
diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix
index d76fb644d029c5b6930d11b79729e720f4f6ac4a..2e67edf8ee3d5846501459ccf1df81f3f8260caf 100644
--- a/nixos/maintainers/scripts/ec2/amazon-image.nix
+++ b/nixos/maintainers/scripts/ec2/amazon-image.nix
@@ -9,6 +9,12 @@ in {
imports = [ ../../../modules/virtualisation/amazon-image.nix ];
options.amazonImage = {
+ name = mkOption {
+ type = types.str;
+ description = "The name of the generated derivation";
+ default = "nixos-disk-image";
+ };
+
contents = mkOption {
example = literalExample ''
[ { source = pkgs.memtest86 + "/memtest.bin";
@@ -38,7 +44,7 @@ in {
config.system.build.amazonImage = import ../../../lib/make-disk-image.nix {
inherit lib config;
- inherit (cfg) contents format;
+ inherit (cfg) contents format name;
pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package
partitioned = config.ec2.hvm;
diskSize = cfg.sizeMB;
diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh
index 24ced8da531a0702a7284147bae877287e804e53..dfc0f8d1146585fb349b60b41fc4ca84681eff5e 100755
--- a/nixos/maintainers/scripts/ec2/create-amis.sh
+++ b/nixos/maintainers/scripts/ec2/create-amis.sh
@@ -17,7 +17,7 @@ mkdir -p $stateDir
rm -f ec2-amis.nix
types="hvm"
-stores="ebs s3"
+stores="ebs"
regions="eu-west-1 eu-west-2 eu-central-1 us-east-1 us-east-2 us-west-1 us-west-2 ca-central-1 ap-southeast-1 ap-southeast-2 ap-northeast-1 ap-northeast-2 sa-east-1 ap-south-1"
for type in $types; do
diff --git a/nixos/maintainers/scripts/openstack/nova-image.nix b/nixos/maintainers/scripts/openstack/nova-image.nix
index fa9cfb74bd6ccede51f54883eeed09f36f804135..b6f3a5b152003cfa8ffd9f680c60ea5289ea40eb 100644
--- a/nixos/maintainers/scripts/openstack/nova-image.nix
+++ b/nixos/maintainers/scripts/openstack/nova-image.nix
@@ -1,3 +1,5 @@
+# nix-build '' -A config.system.build.novaImage --arg configuration "{ imports = [ ./nixos/maintainers/scripts/openstack/nova-image.nix ]; }"
+
{ config, lib, pkgs, ... }:
with lib;
diff --git a/nixos/modules/config/debug-info.nix b/nixos/modules/config/debug-info.nix
index 49991d22a93324f35df029d6921da66fc6f23750..2942ae5905d10b044975ffabfa24ff7351f719e6 100644
--- a/nixos/modules/config/debug-info.nix
+++ b/nixos/modules/config/debug-info.nix
@@ -30,14 +30,15 @@ with lib;
};
- config = {
+ config = mkIf config.environment.enableDebugInfo {
# FIXME: currently disabled because /lib is already in
# environment.pathsToLink, and we can't have both.
#environment.pathsToLink = [ "/lib/debug/.build-id" ];
- environment.extraOutputsToInstall =
- optional config.environment.enableDebugInfo "debug";
+ environment.extraOutputsToInstall = [ "debug" ];
+
+ environment.variables.NIX_DEBUG_INFO_DIRS = [ "/run/current-system/sw/lib/debug" ];
};
diff --git a/nixos/modules/config/fonts/fontconfig-ultimate.nix b/nixos/modules/config/fonts/fontconfig-ultimate.nix
index 1bf9fdb19845131b8d14b363992dc69b18fd5495..c7654ca78c3a1c2f1712ed587a0629d93fe224d0 100644
--- a/nixos/modules/config/fonts/fontconfig-ultimate.nix
+++ b/nixos/modules/config/fonts/fontconfig-ultimate.nix
@@ -53,7 +53,7 @@ in
};
substitutions = mkOption {
- type = types.nullOr (types.enum ["free" "combi" "ms"]);
+ type = types.enum ["free" "combi" "ms" "none"];
default = "free";
description = ''
Font substitutions to replace common Type 1 fonts with nicer
diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix
index 65ef95127805004629c91394489d2a2dcc7e125c..46b22fc128540f85652803deebc33b91049dc367 100644
--- a/nixos/modules/config/i18n.nix
+++ b/nixos/modules/config/i18n.nix
@@ -43,7 +43,7 @@ with lib;
"all" means that all locales supported by
Glibc will be installed. A full list of supported locales
can be found at .
+ xlink:href="https://sourceware.org/git/?p=glibc.git;a=blob;f=localedata/SUPPORTED"/>.
'';
};
diff --git a/nixos/modules/config/krb5.nix b/nixos/modules/config/krb5.nix
deleted file mode 100644
index d318b7207429a97c180085c1ca2a299b64b9cef6..0000000000000000000000000000000000000000
--- a/nixos/modules/config/krb5.nix
+++ /dev/null
@@ -1,206 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-
- cfg = config.krb5;
-
-in
-
-{
- ###### interface
-
- options = {
-
- krb5 = {
-
- enable = mkOption {
- default = false;
- description = "Whether to enable Kerberos V.";
- };
-
- defaultRealm = mkOption {
- default = "ATENA.MIT.EDU";
- description = "Default realm.";
- };
-
- domainRealm = mkOption {
- default = "atena.mit.edu";
- description = "Default domain realm.";
- };
-
- kdc = mkOption {
- default = "kerberos.mit.edu";
- description = "Key Distribution Center";
- };
-
- kerberosAdminServer = mkOption {
- default = "kerberos.mit.edu";
- description = "Kerberos Admin Server.";
- };
-
- };
-
- };
-
- ###### implementation
-
- config = mkIf config.krb5.enable {
-
- environment.systemPackages = [ pkgs.krb5Full ];
-
- environment.etc."krb5.conf".text =
- ''
- [libdefaults]
- default_realm = ${cfg.defaultRealm}
- encrypt = true
-
- # The following krb5.conf variables are only for MIT Kerberos.
- krb4_config = /etc/krb.conf
- krb4_realms = /etc/krb.realms
- kdc_timesync = 1
- ccache_type = 4
- forwardable = true
- proxiable = true
-
- # The following encryption type specification will be used by MIT Kerberos
- # if uncommented. In general, the defaults in the MIT Kerberos code are
- # correct and overriding these specifications only serves to disable new
- # encryption types as they are added, creating interoperability problems.
-
- # default_tgs_enctypes = aes256-cts arcfour-hmac-md5 des3-hmac-sha1 des-cbc-crc des-cbc-md5
- # default_tkt_enctypes = aes256-cts arcfour-hmac-md5 des3-hmac-sha1 des-cbc-crc des-cbc-md5
- # permitted_enctypes = aes256-cts arcfour-hmac-md5 des3-hmac-sha1 des-cbc-crc des-cbc-md5
-
- # The following libdefaults parameters are only for Heimdal Kerberos.
- v4_instance_resolve = false
- v4_name_convert = {
- host = {
- rcmd = host
- ftp = ftp
- }
- plain = {
- something = something-else
- }
- }
- fcc-mit-ticketflags = true
-
- [realms]
- ${cfg.defaultRealm} = {
- kdc = ${cfg.kdc}
- admin_server = ${cfg.kerberosAdminServer}
- #kpasswd_server = ${cfg.kerberosAdminServer}
- }
- ATHENA.MIT.EDU = {
- kdc = kerberos.mit.edu:88
- kdc = kerberos-1.mit.edu:88
- kdc = kerberos-2.mit.edu:88
- admin_server = kerberos.mit.edu
- default_domain = mit.edu
- }
- MEDIA-LAB.MIT.EDU = {
- kdc = kerberos.media.mit.edu
- admin_server = kerberos.media.mit.edu
- }
- ZONE.MIT.EDU = {
- kdc = casio.mit.edu
- kdc = seiko.mit.edu
- admin_server = casio.mit.edu
- }
- MOOF.MIT.EDU = {
- kdc = three-headed-dogcow.mit.edu:88
- kdc = three-headed-dogcow-1.mit.edu:88
- admin_server = three-headed-dogcow.mit.edu
- }
- CSAIL.MIT.EDU = {
- kdc = kerberos-1.csail.mit.edu
- kdc = kerberos-2.csail.mit.edu
- admin_server = kerberos.csail.mit.edu
- default_domain = csail.mit.edu
- krb524_server = krb524.csail.mit.edu
- }
- IHTFP.ORG = {
- kdc = kerberos.ihtfp.org
- admin_server = kerberos.ihtfp.org
- }
- GNU.ORG = {
- kdc = kerberos.gnu.org
- kdc = kerberos-2.gnu.org
- kdc = kerberos-3.gnu.org
- admin_server = kerberos.gnu.org
- }
- 1TS.ORG = {
- kdc = kerberos.1ts.org
- admin_server = kerberos.1ts.org
- }
- GRATUITOUS.ORG = {
- kdc = kerberos.gratuitous.org
- admin_server = kerberos.gratuitous.org
- }
- DOOMCOM.ORG = {
- kdc = kerberos.doomcom.org
- admin_server = kerberos.doomcom.org
- }
- ANDREW.CMU.EDU = {
- kdc = vice28.fs.andrew.cmu.edu
- kdc = vice2.fs.andrew.cmu.edu
- kdc = vice11.fs.andrew.cmu.edu
- kdc = vice12.fs.andrew.cmu.edu
- admin_server = vice28.fs.andrew.cmu.edu
- default_domain = andrew.cmu.edu
- }
- CS.CMU.EDU = {
- kdc = kerberos.cs.cmu.edu
- kdc = kerberos-2.srv.cs.cmu.edu
- admin_server = kerberos.cs.cmu.edu
- }
- DEMENTIA.ORG = {
- kdc = kerberos.dementia.org
- kdc = kerberos2.dementia.org
- admin_server = kerberos.dementia.org
- }
- stanford.edu = {
- kdc = krb5auth1.stanford.edu
- kdc = krb5auth2.stanford.edu
- kdc = krb5auth3.stanford.edu
- admin_server = krb5-admin.stanford.edu
- default_domain = stanford.edu
- }
-
- [domain_realm]
- .${cfg.domainRealm} = ${cfg.defaultRealm}
- ${cfg.domainRealm} = ${cfg.defaultRealm}
- .mit.edu = ATHENA.MIT.EDU
- mit.edu = ATHENA.MIT.EDU
- .exchange.mit.edu = EXCHANGE.MIT.EDU
- exchange.mit.edu = EXCHANGE.MIT.EDU
- .media.mit.edu = MEDIA-LAB.MIT.EDU
- media.mit.edu = MEDIA-LAB.MIT.EDU
- .csail.mit.edu = CSAIL.MIT.EDU
- csail.mit.edu = CSAIL.MIT.EDU
- .whoi.edu = ATHENA.MIT.EDU
- whoi.edu = ATHENA.MIT.EDU
- .stanford.edu = stanford.edu
-
- [logging]
- kdc = SYSLOG:INFO:DAEMON
- admin_server = SYSLOG:INFO:DAEMON
- default = SYSLOG:INFO:DAEMON
- krb4_convert = true
- krb4_get_tickets = false
-
- [appdefaults]
- pam = {
- debug = false
- ticket_lifetime = 36000
- renew_lifetime = 36000
- max_timeout = 30
- timeout_shift = 2
- initial_timeout = 1
- }
- '';
-
- };
-
-}
diff --git a/nixos/modules/config/krb5/default.nix b/nixos/modules/config/krb5/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..c22e99a0a2f182ba6f91f35f59287d0310235612
--- /dev/null
+++ b/nixos/modules/config/krb5/default.nix
@@ -0,0 +1,367 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+ cfg = config.krb5;
+
+ # This is to provide support for old configuration options (as much as is
+ # reasonable). This can be removed after 18.03 was released.
+ defaultConfig = {
+ libdefaults = optionalAttrs (cfg.defaultRealm != null)
+ { default_realm = cfg.defaultRealm; };
+
+ realms = optionalAttrs (lib.all (value: value != null) [
+ cfg.defaultRealm cfg.kdc cfg.kerberosAdminServer
+ ]) {
+ "${cfg.defaultRealm}" = {
+ kdc = cfg.kdc;
+ admin_server = cfg.kerberosAdminServer;
+ };
+ };
+
+ domain_realm = optionalAttrs (lib.all (value: value != null) [
+ cfg.domainRealm cfg.defaultRealm
+ ]) {
+ ".${cfg.domainRealm}" = cfg.defaultRealm;
+ "${cfg.domainRealm}" = cfg.defaultRealm;
+ };
+ };
+
+ mergedConfig = (recursiveUpdate defaultConfig {
+ inherit (config.krb5)
+ kerberos libdefaults realms domain_realm capaths appdefaults plugins
+ extraConfig config;
+ });
+
+ filterEmbeddedMetadata = value: if isAttrs value then
+ (filterAttrs
+ (attrName: attrValue: attrName != "_module" && attrValue != null)
+ value)
+ else value;
+
+ mkIndent = depth: concatStrings (builtins.genList (_: " ") (2 * depth));
+
+ mkRelation = name: value: "${name} = ${mkVal { inherit value; }}";
+
+ mkVal = { value, depth ? 0 }:
+ if (value == true) then "true"
+ else if (value == false) then "false"
+ else if (isInt value) then (toString value)
+ else if (isList value) then
+ concatMapStringsSep " " mkVal { inherit value depth; }
+ else if (isAttrs value) then
+ (concatStringsSep "\n${mkIndent (depth + 1)}"
+ ([ "{" ] ++ (mapAttrsToList
+ (attrName: attrValue: let
+ mappedAttrValue = mkVal {
+ value = attrValue;
+ depth = depth + 1;
+ };
+ in "${attrName} = ${mappedAttrValue}")
+ value))) + "\n${mkIndent depth}}"
+ else value;
+
+ mkMappedAttrsOrString = value: concatMapStringsSep "\n"
+ (line: if builtins.stringLength line > 0
+ then "${mkIndent 1}${line}"
+ else line)
+ (splitString "\n"
+ (if isAttrs value then
+ concatStringsSep "\n"
+ (mapAttrsToList mkRelation value)
+ else value));
+
+in {
+
+ ###### interface
+
+ options = {
+ krb5 = {
+ enable = mkEnableOption "Whether to enable Kerberos V.";
+
+ kerberos = mkOption {
+ type = types.package;
+ default = pkgs.krb5Full;
+ defaultText = "pkgs.krb5Full";
+ example = literalExample "pkgs.heimdalFull";
+ description = ''
+ The Kerberos implementation that will be present in
+ environment.systemPackages after enabling this
+ service.
+ '';
+ };
+
+ libdefaults = mkOption {
+ type = with types; either attrs lines;
+ default = {};
+ apply = attrs: filterEmbeddedMetadata attrs;
+ example = literalExample ''
+ {
+ default_realm = "ATHENA.MIT.EDU";
+ };
+ '';
+ description = ''
+ Settings used by the Kerberos V5 library.
+ '';
+ };
+
+ realms = mkOption {
+ type = with types; either attrs lines;
+ default = {};
+ example = literalExample ''
+ {
+ "ATHENA.MIT.EDU" = {
+ admin_server = "athena.mit.edu";
+ kdc = "athena.mit.edu";
+ };
+ };
+ '';
+ apply = attrs: filterEmbeddedMetadata attrs;
+ description = "Realm-specific contact information and settings.";
+ };
+
+ domain_realm = mkOption {
+ type = with types; either attrs lines;
+ default = {};
+ example = literalExample ''
+ {
+ "example.com" = "EXAMPLE.COM";
+ ".example.com" = "EXAMPLE.COM";
+ };
+ '';
+ apply = attrs: filterEmbeddedMetadata attrs;
+ description = ''
+ Map of server hostnames to Kerberos realms.
+ '';
+ };
+
+ capaths = mkOption {
+ type = with types; either attrs lines;
+ default = {};
+ example = literalExample ''
+ {
+ "ATHENA.MIT.EDU" = {
+ "EXAMPLE.COM" = ".";
+ };
+ "EXAMPLE.COM" = {
+ "ATHENA.MIT.EDU" = ".";
+ };
+ };
+ '';
+ apply = attrs: filterEmbeddedMetadata attrs;
+ description = ''
+ Authentication paths for non-hierarchical cross-realm authentication.
+ '';
+ };
+
+ appdefaults = mkOption {
+ type = with types; either attrs lines;
+ default = {};
+ example = literalExample ''
+ {
+ pam = {
+ debug = false;
+ ticket_lifetime = 36000;
+ renew_lifetime = 36000;
+ max_timeout = 30;
+ timeout_shift = 2;
+ initial_timeout = 1;
+ };
+ };
+ '';
+ apply = attrs: filterEmbeddedMetadata attrs;
+ description = ''
+ Settings used by some Kerberos V5 applications.
+ '';
+ };
+
+ plugins = mkOption {
+ type = with types; either attrs lines;
+ default = {};
+ example = literalExample ''
+ {
+ ccselect = {
+ disable = "k5identity";
+ };
+ };
+ '';
+ apply = attrs: filterEmbeddedMetadata attrs;
+ description = ''
+ Controls plugin module registration.
+ '';
+ };
+
+ extraConfig = mkOption {
+ type = with types; nullOr lines;
+ default = null;
+ example = ''
+ [logging]
+ kdc = SYSLOG:NOTICE
+ admin_server = SYSLOG:NOTICE
+ default = SYSLOG:NOTICE
+ '';
+ description = ''
+ These lines go to the end of krb5.conf verbatim.
+ krb5.conf may include any of the relations that are
+ valid for kdc.conf (see man
+ kdc.conf), but it is not a recommended practice.
+ '';
+ };
+
+ config = mkOption {
+ type = with types; nullOr lines;
+ default = null;
+ example = ''
+ [libdefaults]
+ default_realm = EXAMPLE.COM
+
+ [realms]
+ EXAMPLE.COM = {
+ admin_server = kerberos.example.com
+ kdc = kerberos.example.com
+ default_principal_flags = +preauth
+ }
+
+ [domain_realm]
+ example.com = EXAMPLE.COM
+ .example.com = EXAMPLE.COM
+
+ [logging]
+ kdc = SYSLOG:NOTICE
+ admin_server = SYSLOG:NOTICE
+ default = SYSLOG:NOTICE
+ '';
+ description = ''
+ Verbatim krb5.conf configuration. Note that this
+ is mutually exclusive with configuration via
+ libdefaults, realms,
+ domain_realm, capaths,
+ appdefaults, plugins and
+ extraConfig configuration options. Consult
+ man krb5.conf for documentation.
+ '';
+ };
+
+ defaultRealm = mkOption {
+ type = with types; nullOr str;
+ default = null;
+ example = "ATHENA.MIT.EDU";
+ description = ''
+ DEPRECATED, please use
+ krb5.libdefaults.default_realm.
+ '';
+ };
+
+ domainRealm = mkOption {
+ type = with types; nullOr str;
+ default = null;
+ example = "athena.mit.edu";
+ description = ''
+ DEPRECATED, please create a map of server hostnames to Kerberos realms
+ in krb5.domain_realm.
+ '';
+ };
+
+ kdc = mkOption {
+ type = with types; nullOr str;
+ default = null;
+ example = "kerberos.mit.edu";
+ description = ''
+ DEPRECATED, please pass a kdc attribute to a realm
+ in krb5.realms.
+ '';
+ };
+
+ kerberosAdminServer = mkOption {
+ type = with types; nullOr str;
+ default = null;
+ example = "kerberos.mit.edu";
+ description = ''
+ DEPRECATED, please pass an admin_server attribute
+ to a realm in krb5.realms.
+ '';
+ };
+ };
+ };
+
+ ###### implementation
+
+ config = mkIf cfg.enable {
+
+ environment.systemPackages = [ cfg.kerberos ];
+
+ environment.etc."krb5.conf".text = if isString cfg.config
+ then cfg.config
+ else (''
+ [libdefaults]
+ ${mkMappedAttrsOrString mergedConfig.libdefaults}
+
+ [realms]
+ ${mkMappedAttrsOrString mergedConfig.realms}
+
+ [domain_realm]
+ ${mkMappedAttrsOrString mergedConfig.domain_realm}
+
+ [capaths]
+ ${mkMappedAttrsOrString mergedConfig.capaths}
+
+ [appdefaults]
+ ${mkMappedAttrsOrString mergedConfig.appdefaults}
+
+ [plugins]
+ ${mkMappedAttrsOrString mergedConfig.plugins}
+ '' + optionalString (mergedConfig.extraConfig != null)
+ ("\n" + mergedConfig.extraConfig));
+
+ warnings = flatten [
+ (optional (cfg.defaultRealm != null) ''
+ The option krb5.defaultRealm is deprecated, please use
+ krb5.libdefaults.default_realm.
+ '')
+ (optional (cfg.domainRealm != null) ''
+ The option krb5.domainRealm is deprecated, please use krb5.domain_realm.
+ '')
+ (optional (cfg.kdc != null) ''
+ The option krb5.kdc is deprecated, please pass a kdc attribute to a
+ realm in krb5.realms.
+ '')
+ (optional (cfg.kerberosAdminServer != null) ''
+ The option krb5.kerberosAdminServer is deprecated, please pass an
+ admin_server attribute to a realm in krb5.realms.
+ '')
+ ];
+
+ assertions = [
+ { assertion = !((builtins.any (value: value != null) [
+ cfg.defaultRealm cfg.domainRealm cfg.kdc cfg.kerberosAdminServer
+ ]) && ((builtins.any (value: value != {}) [
+ cfg.libdefaults cfg.realms cfg.domain_realm cfg.capaths
+ cfg.appdefaults cfg.plugins
+ ]) || (builtins.any (value: value != null) [
+ cfg.config cfg.extraConfig
+ ])));
+ message = ''
+ Configuration of krb5.conf by deprecated options is mutually exclusive
+ with configuration by section. Please migrate your config using the
+ attributes suggested in the warnings.
+ '';
+ }
+ { assertion = !(cfg.config != null
+ && ((builtins.any (value: value != {}) [
+ cfg.libdefaults cfg.realms cfg.domain_realm cfg.capaths
+ cfg.appdefaults cfg.plugins
+ ]) || (builtins.any (value: value != null) [
+ cfg.extraConfig cfg.defaultRealm cfg.domainRealm cfg.kdc
+ cfg.kerberosAdminServer
+ ])));
+ message = ''
+ Configuration of krb5.conf using krb.config is mutually exclusive with
+ configuration by section. If you want to mix the two, you can pass
+ lines to any configuration section or lines to krb5.extraConfig.
+ '';
+ }
+ ];
+ };
+}
diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix
index 4b778730252167a0d337bb8913ba75dd270f4007..ae3e17ac27b67dc65036b08bf1f0583af7b36ef0 100644
--- a/nixos/modules/config/no-x-libs.nix
+++ b/nixos/modules/config/no-x-libs.nix
@@ -34,6 +34,7 @@ with lib;
networkmanager_openvpn = pkgs.networkmanager_openvpn.override { withGnome = false; };
networkmanager_pptp = pkgs.networkmanager_pptp.override { withGnome = false; };
networkmanager_vpnc = pkgs.networkmanager_vpnc.override { withGnome = false; };
+ networkmanager_iodine = pkgs.networkmanager_iodine.override { withGnome = false; };
pinentry = pkgs.pinentry.override { gtk2 = null; qt4 = null; };
};
};
diff --git a/nixos/modules/config/nsswitch.nix b/nixos/modules/config/nsswitch.nix
index 97278238dcd59cccf8f3c160e19f999e9284fc8d..7b36d4f1cbdf6f68271c2d000ce008221d298d46 100644
--- a/nixos/modules/config/nsswitch.nix
+++ b/nixos/modules/config/nsswitch.nix
@@ -18,7 +18,7 @@ let
hostArray = [ "files" ]
++ optionals mymachines [ "mymachines" ]
- ++ optionals nssmdns [ "mdns_minimal [!UNAVAIL=return]" ]
+ ++ optionals nssmdns [ "mdns_minimal [NOTFOUND=return]" ]
++ optionals nsswins [ "wins" ]
++ optionals resolved ["resolve [!UNAVAIL=return]"]
++ [ "dns" ]
diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix
index 5d339eaea4851f0025f8471f1ec7e28e545d784b..d3212d93160519f41fae0f51877c97fbfdef03cd 100644
--- a/nixos/modules/config/system-path.nix
+++ b/nixos/modules/config/system-path.nix
@@ -31,6 +31,7 @@ let
pkgs.nano
pkgs.ncurses
pkgs.netcat
+ pkgs.nix-info
config.programs.ssh.package
pkgs.perl
pkgs.procps
diff --git a/nixos/modules/config/timezone.nix b/nixos/modules/config/timezone.nix
index aa030a816d04aaceae843ab4615c38a0f09c8b20..b15948f6e2e58c4da6c4953cce2b648674df78ca 100644
--- a/nixos/modules/config/timezone.nix
+++ b/nixos/modules/config/timezone.nix
@@ -5,6 +5,9 @@ with lib;
let
tzdir = "${pkgs.tzdata}/share/zoneinfo";
+ nospace = str: filter (c: c == " ") (stringToCharacters str) == [];
+ timezone = types.nullOr (types.addCheck types.str nospace)
+ // { description = "null or string without spaces"; };
in
@@ -15,7 +18,7 @@ in
timeZone = mkOption {
default = null;
- type = types.nullOr types.str;
+ type = timezone;
example = "America/New_York";
description = ''
The time zone used when displaying times and dates. See $out/loader/entries/nixos-livecd.conf
- echo "linux /boot/bzImage" >> $out/loader/entries/nixos-livecd.conf
- echo "initrd /boot/initrd" >> $out/loader/entries/nixos-livecd.conf
- echo "options init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}" >> $out/loader/entries/nixos-livecd.conf
+ cat << EOF > $out/loader/entries/nixos-iso.conf
+ title NixOS ${config.system.nixosVersion}${config.isoImage.appendToMenuLabel}
+ linux /boot/bzImage
+ initrd /boot/initrd
+ options init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}
+ EOF
# A variant to boot with 'nomodeset'
- echo "title NixOS Live CD (with nomodeset)" > $out/loader/entries/nixos-livecd-nomodeset.conf
- echo "linux /boot/bzImage" >> $out/loader/entries/nixos-livecd-nomodeset.conf
- echo "initrd /boot/initrd" >> $out/loader/entries/nixos-livecd-nomodeset.conf
- echo "options init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} nomodeset" >> $out/loader/entries/nixos-livecd-nomodeset.conf
+ cat << EOF > $out/loader/entries/nixos-iso-nomodeset.conf
+ title NixOS ${config.system.nixosVersion}${config.isoImage.appendToMenuLabel}
+ version nomodeset
+ linux /boot/bzImage
+ initrd /boot/initrd
+ options init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} nomodeset
+ EOF
# A variant to boot with 'copytoram'
- echo "title NixOS Live CD (with copytoram)" > $out/loader/entries/nixos-livecd-copytoram.conf
- echo "linux /boot/bzImage" >> $out/loader/entries/nixos-livecd-copytoram.conf
- echo "initrd /boot/initrd" >> $out/loader/entries/nixos-livecd-copytoram.conf
- echo "options init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} copytoram" >> $out/loader/entries/nixos-livecd-copytoram.conf
-
- echo "default nixos-livecd" > $out/loader/loader.conf
- echo "timeout ${builtins.toString config.boot.loader.timeout}" >> $out/loader/loader.conf
+ cat << EOF > $out/loader/entries/nixos-iso-copytoram.conf
+ title NixOS ${config.system.nixosVersion}${config.isoImage.appendToMenuLabel}
+ version copytoram
+ linux /boot/bzImage
+ initrd /boot/initrd
+ options init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} copytoram
+ EOF
+
+ # A variant to boot with verbose logging to the console
+ cat << EOF > $out/loader/entries/nixos-iso-debug.conf
+ title NixOS ${config.system.nixosVersion}${config.isoImage.appendToMenuLabel} (debug)
+ linux /boot/bzImage
+ initrd /boot/initrd
+ options init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} loglevel=7
+ EOF
+
+ cat << EOF > $out/loader/loader.conf
+ default nixos-iso
+ timeout ${builtins.toString config.boot.loader.timeout}
+ EOF
'';
efiImg = pkgs.runCommand "efi-image_eltorito" { buildInputs = [ pkgs.mtools pkgs.libfaketime ]; }
@@ -336,6 +361,9 @@ in
{ source = config.isoImage.splashImage;
target = "/isolinux/background.png";
}
+ { source = pkgs.writeText "version" config.system.nixosVersion;
+ target = "/version.txt";
+ }
] ++ optionals config.isoImage.makeEfiBootable [
{ source = efiImg;
target = "/boot/efi.img";
diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
index 063ffb191ee6f9f7ca7ef3ba4cfafba2c78a07a0..c94dc7d40194ae07e2c7abce6b7fdf95fbcb90f4 100644
--- a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
@@ -10,6 +10,7 @@ let
in
{
imports = [
+ ../../profiles/base.nix
../../profiles/installation-device.nix
./sd-image.nix
];
@@ -27,8 +28,12 @@ in
boot.loader.generic-extlinux-compatible.enable = true;
boot.kernelPackages = pkgs.linuxPackages_latest;
- boot.kernelParams = ["console=ttyS0,115200n8" "console=tty0"];
- boot.consoleLogLevel = 7;
+
+ # The serial ports listed here are:
+ # - ttyS0: for Tegra (Jetson TX1)
+ # - ttyAMA0: for QEMU's -machine virt
+ # Also increase the amount of CMA to ensure the virtual console on the RPi3 works.
+ boot.kernelParams = ["cma=32M" "console=ttyS0,115200n8" "console=ttyAMA0,115200n8" "console=tty0"];
# FIXME: this probably should be in installation-device.nix
users.extraUsers.root.initialHashedPassword = "";
diff --git a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix
index 1c664e025036a6ead9507f99b5b6416137b3b2eb..880a6bf2e1e8e64afb15fdd18421d8d107c4d5da 100644
--- a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix
@@ -10,6 +10,7 @@ let
in
{
imports = [
+ ../../profiles/base.nix
../../profiles/installation-device.nix
./sd-image.nix
];
@@ -27,6 +28,12 @@ in
boot.loader.generic-extlinux-compatible.enable = true;
boot.kernelPackages = pkgs.linuxPackages_latest;
+ # The serial ports listed here are:
+ # - ttyS0: for Tegra (Jetson TK1)
+ # - ttymxc0: for i.MX6 (Wandboard)
+ # - ttyAMA0: for Allwinner (pcDuino3 Nano) and QEMU's -machine virt
+ # - ttyO0: for OMAP (BeagleBone Black)
+ # - ttySAC2: for Exynos (ODROID-XU3)
boot.kernelParams = ["console=ttyS0,115200n8" "console=ttymxc0,115200n8" "console=ttyAMA0,115200n8" "console=ttyO0,115200n8" "console=ttySAC2,115200n8" "console=tty0"];
# FIXME: this probably should be in installation-device.nix
diff --git a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
index 3f2970757bd2d9bf76af9fabd17d6f194c83b34f..eb676eae05e8998f0dff2d1803bb9f402939ff3f 100644
--- a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
@@ -10,6 +10,7 @@ let
in
{
imports = [
+ ../../profiles/base.nix
../../profiles/installation-device.nix
./sd-image.nix
];
diff --git a/nixos/modules/installer/scan/detected.nix b/nixos/modules/installer/scan/detected.nix
index e72c78532943683c04e6fe3ae1c8fc51fcd7be04..7e181acb93b1965690c6fdb605b2fd724793c82c 100644
--- a/nixos/modules/installer/scan/detected.nix
+++ b/nixos/modules/installer/scan/detected.nix
@@ -6,8 +6,7 @@ with lib;
{
config = mkDefault {
- # Wireless card firmware
- networking.enableIntel2200BGFirmware = true;
- networking.enableIntel3945ABGFirmware = true;
+ # Common firmware, i.e. for wifi cards
+ hardware.enableRedistributableFirmware = true;
};
}
diff --git a/nixos/modules/installer/tools/auto-upgrade.nix b/nixos/modules/installer/tools/auto-upgrade.nix
index a4d4f16d1d96fac2349f6af270beb8c5ecff4b8d..7b756b70e2fcb40449f229b5f5ebe34221cf71f2 100644
--- a/nixos/modules/installer/tools/auto-upgrade.nix
+++ b/nixos/modules/installer/tools/auto-upgrade.nix
@@ -76,7 +76,7 @@ let cfg = config.system.autoUpgrade; in
environment = config.nix.envVars //
{ inherit (config.environment.sessionVariables) NIX_PATH;
HOME = "/root";
- };
+ } // config.networking.proxy.envVars;
path = [ pkgs.gnutar pkgs.xz.bin config.nix.package.out ];
diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix
index 4568a20e778978a0e1a2c6bb4877f625a336ced7..321fb9a2030ad5ea6659235548ad2f7fcc88b311 100644
--- a/nixos/modules/installer/tools/nix-fallback-paths.nix
+++ b/nixos/modules/installer/tools/nix-fallback-paths.nix
@@ -1,5 +1,5 @@
{
- x86_64-linux = "/nix/store/avwiw7hb1qckag864sc6ixfxr8qmf94w-nix-1.11.13";
- i686-linux = "/nix/store/8wv3ms0afw95hzsz4lxzv0nj4w3614z9-nix-1.11.13";
- x86_64-darwin = "/nix/store/z21lvakv1l7lhasmv5fvaz8mlzxia8k9-nix-1.11.13";
+ x86_64-linux = "/nix/store/b4s1gxiis1ryvybnjhdjvgc5sr1nq0ys-nix-1.11.15";
+ i686-linux = "/nix/store/kgb5hs7qw13bvb6icramv1ry9dard3h9-nix-1.11.15";
+ x86_64-darwin = "/nix/store/dgwz3dxdzs2wwd7pg7cdhvl8rv0qpnbj-nix-1.11.15";
}
diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index 29b447912e7015efefadf994cbae0fd401db1af6..7c737e84de0a826ad2440a873d5e5490544b26b6 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -8,6 +8,7 @@ use File::Basename;
use File::Slurp;
use File::stat;
+umask(0022);
sub uniq {
my %seen;
@@ -103,7 +104,7 @@ if (-e "/sys/devices/system/cpu/cpu0/cpufreq/scaling_available_governors") {
foreach $e (@desired_governors) {
if (index($governors, $e) != -1) {
- last if (push @attrs, "powerManagement.cpuFreqGovernor = \"$e\";");
+ last if (push @attrs, "powerManagement.cpuFreqGovernor = lib.mkDefault \"$e\";");
}
}
}
@@ -398,19 +399,15 @@ EOF
# Is this a btrfs filesystem?
if ($fsType eq "btrfs") {
- my ($status, @id_info) = runCommand("btrfs subvol show $rootDir$mountPoint");
- if ($status != 0 || join("", @id_info) =~ /ERROR:/) {
+ my ($status, @info) = runCommand("btrfs subvol show $rootDir$mountPoint");
+ if ($status != 0 || join("", @info) =~ /ERROR:/) {
die "Failed to retrieve subvolume info for $mountPoint\n";
}
- my @ids = join("", @id_info) =~ m/Subvolume ID:[ \t\n]*([^ \t\n]*)/;
+ my @ids = join("\n", @info) =~ m/^(?!\/\n).*Subvolume ID:[ \t\n]*([0-9]+)/s;
if ($#ids > 0) {
die "Btrfs subvol name for $mountPoint listed multiple times in mount\n"
} elsif ($#ids == 0) {
- my ($status, @path_info) = runCommand("btrfs subvol list $rootDir$mountPoint");
- if ($status != 0) {
- die "Failed to find $mountPoint subvolume id from btrfs\n";
- }
- my @paths = join("", @path_info) =~ m/ID $ids[0] [^\n]* path ([^\n]*)/;
+ my @paths = join("", @info) =~ m/^([^\n]*)/;
if ($#paths > 0) {
die "Btrfs returned multiple paths for a single subvolume id, mountpoint $mountPoint\n";
} elsif ($#paths != 0) {
@@ -583,9 +580,15 @@ $bootLoaderConfig
# List packages installed in system profile. To search by name, run:
# \$ nix-env -qaP | grep wget
# environment.systemPackages = with pkgs; [
- # wget
+ # wget vim
# ];
+ # Some programs need SUID wrappers, can be configured further or are
+ # started in user sessions.
+ # programs.bash.enableCompletion = true;
+ # programs.mtr.enable = true;
+ # programs.gnupg.agent = { enable = true; enableSSHSupport = true; };
+
# List services that you want to enable:
# Enable the OpenSSH daemon.
@@ -605,6 +608,9 @@ $bootLoaderConfig
# services.xserver.layout = "us";
# services.xserver.xkbOptions = "eurosign:e";
+ # Enable touchpad support.
+ # services.xserver.libinput.enable = true;
+
# Enable the KDE Desktop Environment.
# services.xserver.displayManager.sddm.enable = true;
# services.xserver.desktopManager.plasma5.enable = true;
@@ -615,8 +621,11 @@ $bootLoaderConfig
# uid = 1000;
# };
- # The NixOS release to be compatible with for stateful data such as databases.
- system.stateVersion = "${\(qw(@nixosRelease@))}";
+ # This value determines the NixOS release with which your system is to be
+ # compatible, in order to avoid breaking some software such as database
+ # servers. You should change this only after NixOS release notes say you
+ # should.
+ system.stateVersion = "${\(qw(@nixosRelease@))}"; # Did you read the comment?
}
EOF
diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh
index 087fbcd4512f42d6cc386523cb9d0a0b66fa708d..f994d5b4bde1120f6bc4e3659ecd874519ff27d7 100644
--- a/nixos/modules/installer/tools/nixos-install.sh
+++ b/nixos/modules/installer/tools/nixos-install.sh
@@ -102,16 +102,44 @@ fi
extraBuildFlags+=(--option "build-users-group" "$buildUsersGroup")
# Inherit binary caches from the host
-# TODO: will this still work with Nix 1.12 now that it has no perl? Probably not...
+# TODO: will this still work with Nix 1.12 now that it has no perl? Probably not...
binary_caches="$(@perl@/bin/perl -I @nix@/lib/perl5/site_perl/*/* -e 'use Nix::Config; Nix::Config::readConfig; print $Nix::Config::config{"binary-caches"};')"
extraBuildFlags+=(--option "binary-caches" "$binary_caches")
-nixpkgs="$(readlink -f "$(nix-instantiate --find-file nixpkgs)")"
-export NIX_PATH="nixpkgs=$nixpkgs:nixos-config=$mountPoint/$NIXOS_CONFIG"
+# We only need nixpkgs in the path if we don't already have a system closure to install
+if [[ -z "$closure" ]]; then
+ nixpkgs="$(readlink -f "$(nix-instantiate --find-file nixpkgs)")"
+ export NIX_PATH="nixpkgs=$nixpkgs:nixos-config=$mountPoint/$NIXOS_CONFIG"
+fi
unset NIXOS_CONFIG
-# TODO: do I need to set NIX_SUBSTITUTERS here or is the --option binary-caches above enough?
-
+# These get created in nixos-prepare-root as well, but we want to make sure they're here in case we're
+# running with --chroot. TODO: --chroot should just be split into a separate tool.
+mkdir -m 0755 -p "$mountPoint/dev" "$mountPoint/proc" "$mountPoint/sys"
+
+# Set up some bind mounts we'll want regardless of chroot or not
+mount --rbind /dev "$mountPoint/dev"
+mount --rbind /proc "$mountPoint/proc"
+mount --rbind /sys "$mountPoint/sys"
+
+# If we asked for a chroot, that means we're not actually installing anything (yeah I was confused too)
+# and we just want to run a command in the context of a $mountPoint that we're assuming has already been
+# set up by a previous nixos-install invocation. In that case we set up some remaining bind mounts and
+# exec the requested command, skipping the rest of the installation procedure.
+if [ -n "$runChroot" ]; then
+ mount -t tmpfs -o "mode=0755" none $mountPoint/run
+ rm -rf $mountPoint/var/run
+ ln -s /run $mountPoint/var/run
+ for f in /etc/resolv.conf /etc/hosts; do rm -f $mountPoint/$f; [ -f "$f" ] && cp -Lf $f $mountPoint/etc/; done
+ for f in /etc/passwd /etc/group; do touch $mountPoint/$f; [ -f "$f" ] && mount --rbind -o ro $f $mountPoint/$f; done
+
+ if ! [ -L $mountPoint/nix/var/nix/profiles/system ]; then
+ echo "$0: installation not finished; cannot chroot into installation directory"
+ exit 1
+ fi
+ ln -s /nix/var/nix/profiles/system $mountPoint/run/current-system
+ exec chroot $mountPoint "${chrootCommand[@]}"
+fi
# A place to drop temporary closures
trap "rm -rf $tmpdir" EXIT
@@ -123,6 +151,9 @@ function closure() {
}
system_closure="$tmpdir/system.closure"
+# Use a FIFO for piping nix-store --export into nix-store --import, saving disk
+# I/O and space. nix-store --import is run by nixos-prepare-root.
+mkfifo $system_closure
if [ -z "$closure" ]; then
expr="(import {}).system"
@@ -132,7 +163,9 @@ else
system_root=$closure
# Create a temporary file ending in .closure (so nixos-prepare-root knows to --import it) to transport the store closure
# to the filesytem we're preparing. Also delete it on exit!
- nix-store --export $(nix-store -qR $closure) > $system_closure
+ # Run in background to avoid blocking while trying to write to the FIFO
+ # $system_closure refers to
+ nix-store --export $(nix-store -qR $closure) > $system_closure &
fi
channel_root="$(nix-env -p /nix/var/nix/profiles/per-user/root/channels -q nixos --no-name --out-path 2>/dev/null || echo -n "")"
@@ -145,9 +178,7 @@ nix-store --export $channel_root > $channel_closure
# nixos-prepare-root doesn't currently do anything with file ownership, so we set it up here instead
chown @root_uid@:@nixbld_gid@ $mountPoint/nix/store
-mount --rbind /dev $mountPoint/dev
-mount --rbind /proc $mountPoint/proc
-mount --rbind /sys $mountPoint/sys
+
# Grub needs an mtab.
ln -sfn /proc/mounts $mountPoint/etc/mtab
diff --git a/nixos/modules/installer/tools/nixos-prepare-root.sh b/nixos/modules/installer/tools/nixos-prepare-root.sh
index 0bd70d2d349c2c1004f6c3e66c7f6b942d621af9..ed5af234fec966b869c299858abf9d47b855ac26 100644
--- a/nixos/modules/installer/tools/nixos-prepare-root.sh
+++ b/nixos/modules/installer/tools/nixos-prepare-root.sh
@@ -31,16 +31,16 @@ if ! test -e "$mountPoint"; then
fi
# Create a few of the standard directories in the target root directory.
-mkdir -m 0755 -p $mountPoint/dev $mountPoint/proc $mountPoint/sys $mountPoint/etc $mountPoint/run $mountPoint/home
-mkdir -m 01777 -p $mountPoint/tmp
-mkdir -m 0755 -p $mountPoint/tmp/root
-mkdir -m 0755 -p $mountPoint/var
-mkdir -m 0700 -p $mountPoint/root
+install -m 0755 -d $mountPoint/dev $mountPoint/proc $mountPoint/sys $mountPoint/etc $mountPoint/run $mountPoint/home
+install -m 01777 -d $mountPoint/tmp
+install -m 0755 -d $mountPoint/tmp/root
+install -m 0755 -d $mountPoint/var
+install -m 0700 -d $mountPoint/root
ln -sf /run $mountPoint/var/run
# Create the necessary Nix directories on the target device
-mkdir -m 0755 -p \
+install -m 0755 -d \
$mountPoint/nix/var/nix/gcroots \
$mountPoint/nix/var/nix/temproots \
$mountPoint/nix/var/nix/userpool \
@@ -48,7 +48,7 @@ mkdir -m 0755 -p \
$mountPoint/nix/var/nix/db \
$mountPoint/nix/var/log/nix/drvs
-mkdir -m 1775 -p $mountPoint/nix/store
+install -m 1775 -d $mountPoint/nix/store
# All Nix operations below should operate on our target store, not /nix/store.
# N.B: this relies on Nix 1.12 or higher
@@ -80,7 +80,7 @@ if [ ! -x $mountPoint/@shell@ ]; then
echo "Error: @shell@ wasn't included in the closure" >&2
exit 1
fi
-mkdir -m 0755 -p $mountPoint/bin
+install -m 0755 -d $mountPoint/bin
ln -sf @shell@ $mountPoint/bin/sh
echo "setting the system closure to '$system'..."
@@ -89,17 +89,16 @@ nix-env "${extraBuildFlags[@]}" -p $mountPoint/nix/var/nix/profiles/system --set
ln -sfn /nix/var/nix/profiles/system $mountPoint/run/current-system
# Copy the NixOS/Nixpkgs sources to the target as the initial contents of the NixOS channel.
-mkdir -m 0755 -p $mountPoint/nix/var/nix/profiles
-mkdir -m 1777 -p $mountPoint/nix/var/nix/profiles/per-user
-mkdir -m 0755 -p $mountPoint/nix/var/nix/profiles/per-user/root
+install -m 0755 -d $mountPoint/nix/var/nix/profiles
+install -m 1777 -d $mountPoint/nix/var/nix/profiles/per-user
+install -m 0755 -d $mountPoint/nix/var/nix/profiles/per-user/root
if [ -z "$noChannelCopy" ] && [ -n "$channel" ]; then
echo "copying channel..."
nix-env --option build-use-substitutes false "${extraBuildFlags[@]}" -p $mountPoint/nix/var/nix/profiles/per-user/root/channels --set "$channel" --quiet
fi
-mkdir -m 0700 -p $mountPoint/root/.nix-defexpr
+install -m 0700 -d $mountPoint/root/.nix-defexpr
ln -sfn /nix/var/nix/profiles/per-user/root/channels $mountPoint/root/.nix-defexpr/channels
# Mark the target as a NixOS installation, otherwise switch-to-configuration will chicken out.
touch $mountPoint/etc/NIXOS
-
diff --git a/nixos/modules/misc/crashdump.nix b/nixos/modules/misc/crashdump.nix
index 5ef4b7781bd06469e2e2910b41e5f5f9f96c8763..6e0b49fa9af095da04b7b455d1129629e2a5e29e 100644
--- a/nixos/modules/misc/crashdump.nix
+++ b/nixos/modules/misc/crashdump.nix
@@ -18,26 +18,23 @@ in
default = false;
description = ''
If enabled, NixOS will set up a kernel that will
- boot on crash, and leave the user to a stage1 debug1devices
- interactive shell to be able to save the crashed kernel dump.
+ boot on crash, and leave the user in systemd rescue
+ to be able to save the crashed kernel dump at
+ /proc/vmcore.
It also activates the NMI watchdog.
'';
};
- kernelPackages = mkOption {
- type = types.package;
- default = pkgs.linuxPackages;
- # We don't want to evaluate all of linuxPackages for the manual
- # - some of it might not even evaluate correctly.
- defaultText = "pkgs.linuxPackages";
- example = literalExample "pkgs.linuxPackages_2_6_25";
+ reservedMemory = mkOption {
+ default = "128M";
description = ''
- This will override the boot.kernelPackages, and will add some
- kernel configuration parameters for the crash dump to work.
+ The amount of memory reserved for the crashdump kernel.
+ If you choose a too high value, dmesg will mention
+ "crashkernel reservation failed".
'';
};
kernelParams = mkOption {
type = types.listOf types.str;
- default = [ "debug1devices" ];
+ default = [ "1" "boot.shell_on_fail" ];
description = ''
Parameters that will be passed to the kernel kexec-ed on crash.
'';
@@ -51,29 +48,29 @@ in
config = mkIf crashdump.enable {
boot = {
postBootCommands = ''
+ echo "loading crashdump kernel...";
${pkgs.kexectools}/sbin/kexec -p /run/current-system/kernel \
--initrd=/run/current-system/initrd \
- --append="init=$(readlink -f /run/current-system/init) system=$(readlink -f /run/current-system) irqpoll maxcpus=1 reset_devices ${kernelParams}" --reset-vga --console-vga
+ --reset-vga --console-vga \
+ --command-line="systemConfig=$(readlink -f /run/current-system) init=$(readlink -f /run/current-system/init) irqpoll maxcpus=1 reset_devices ${kernelParams}"
'';
kernelParams = [
- "crashkernel=64M"
+ "crashkernel=${crashdump.reservedMemory}"
"nmi_watchdog=panic"
"softlockup_panic=1"
"idle=poll"
];
- kernelPackages = mkOverride 50 (crashdump.kernelPackages // {
- kernel = crashdump.kernelPackages.kernel.override
- (attrs: {
- extraConfig = (optionalString (attrs ? extraConfig) attrs.extraConfig) +
- ''
+ kernelPatches = [ {
+ name = "crashdump-config";
+ patch = null;
+ extraConfig = ''
CRASH_DUMP y
DEBUG_INFO y
PROC_VMCORE y
LOCKUP_DETECTOR y
HARDLOCKUP_DETECTOR y
'';
- });
- });
+ } ];
};
};
}
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 859838182ed4472ff3270e5a2a30520a90d8db45..7d0cbf6aad024eddcaa916f0b4c0046bcfb21ed6 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -207,11 +207,12 @@
ripple-data-api = 186;
mediatomb = 187;
rdnssd = 188;
- # ihaskell = 189; # unused
+ ihaskell = 189;
i2p = 190;
lambdabot = 191;
asterisk = 192;
plex = 193;
+ plexpy = 195;
grafana = 196;
skydns = 197;
# ripple-rest = 198; # unused, removed 2017-08-12
@@ -254,7 +255,6 @@
hydra-queue-runner = 235;
hydra-www = 236;
syncthing = 237;
- mfi = 238;
caddy = 239;
taskd = 240;
factorio = 241;
@@ -297,6 +297,9 @@
clickhouse = 278;
rslsync = 279;
minio = 280;
+ kanboard = 281;
+ pykms = 282;
+ kodi = 283;
# When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
@@ -427,7 +430,7 @@
teamspeak = 124;
influxdb = 125;
nsd = 126;
- #gitolite = 127; # unused
+ gitolite = 127;
znc = 128;
polipo = 129;
mopidy = 130;
@@ -481,7 +484,7 @@
#ripple-data-api = 186; #unused
mediatomb = 187;
#rdnssd = 188; # unused
- # ihaskell = 189; # unused
+ ihaskell = 189;
i2p = 190;
lambdabot = 191;
asterisk = 192;
@@ -522,7 +525,6 @@
octoprint = 230;
radicale = 234;
syncthing = 237;
- #mfi = 238; # unused
caddy = 239;
taskd = 240;
factorio = 241;
@@ -563,6 +565,9 @@
clickhouse = 278;
rslsync = 279;
minio = 280;
+ kanboard = 281;
+ pykms = 282;
+ kodi = 283;
# When adding a gid, make sure it doesn't match an existing
# uid. Users and groups with the same name should have equal
diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix
index 0fe91435ce8cb921612403dfc1ac69df3b5eb024..51953d1110c438d027a908897c42fc1c2786ceaa 100644
--- a/nixos/modules/misc/locate.nix
+++ b/nixos/modules/misc/locate.nix
@@ -125,13 +125,16 @@ in {
warnings = optional (isMLocate && cfg.localuser != null) "mlocate does not support searching as user other than root"
++ optional (isFindutils && cfg.pruneNames != []) "findutils locate does not support pruning by directory component"
++ optional (isFindutils && cfg.pruneBindMounts) "findutils locate does not support skipping bind mounts";
-
+
+ # directory creation needs to be separated from main service
+ # because ReadWritePaths fails when the directory doesn't already exist
+ systemd.tmpfiles.rules = [ "d ${dirOf cfg.output} 0755 root root -" ];
+
systemd.services.update-locatedb =
{ description = "Update Locate Database";
path = mkIf (!isMLocate) [ pkgs.su ];
script =
''
- mkdir -m 0755 -p ${dirOf cfg.output}
exec ${cfg.locate}/bin/updatedb \
${optionalString (cfg.localuser != null && ! isMLocate) ''--localuser=${cfg.localuser}''} \
--output=${toString cfg.output} ${concatStringsSep " " cfg.extraFlags}
@@ -147,8 +150,13 @@ in {
serviceConfig.PrivateTmp = "yes";
serviceConfig.PrivateNetwork = "yes";
serviceConfig.NoNewPrivileges = "yes";
- serviceConfig.ReadOnlyDirectories = "/";
- serviceConfig.ReadWriteDirectories = dirOf cfg.output;
+ serviceConfig.ReadOnlyPaths = "/";
+ # Use dirOf cfg.output because mlocate creates temporary files next to
+ # the actual database. We could specify and create them as well,
+ # but that would make this quite brittle when they change something.
+ # NOTE: If /var/cache does not exist, this leads to the misleading error message:
+ # update-locatedb.service: Failed at step NAMESPACE spawning …/update-locatedb-start: No such file or directory
+ serviceConfig.ReadWritePaths = dirOf cfg.output;
};
systemd.timers.update-locatedb =
diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix
index 315c33a462c6649d4c12553a50da8568d0ffb4bf..48cde2ebbc8ad60782dc4989f6f0e8ccb7071c61 100644
--- a/nixos/modules/misc/version.nix
+++ b/nixos/modules/misc/version.nix
@@ -95,7 +95,7 @@ in
nixosVersionSuffix = mkIf (pathIsDirectory gitRepo) (mkDefault (".git." + gitCommitId));
# Note: code names must only increase in alphabetical order.
- nixosCodeName = "Hummingbird";
+ nixosCodeName = "Impala";
};
# Generate /etc/os-release. See
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index bfc554cc936c7551beefd7636e8d77c53b042c19..99d3c0112f2a20ddfbfd88b3a454bf0958d9c5ce 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -9,7 +9,7 @@
./config/fonts/ghostscript.nix
./config/gnu.nix
./config/i18n.nix
- ./config/krb5.nix
+ ./config/krb5/default.nix
./config/ldap.nix
./config/networking.nix
./config/no-x-libs.nix
@@ -35,14 +35,10 @@
./hardware/ksm.nix
./hardware/mcelog.nix
./hardware/network/b43.nix
- ./hardware/network/intel-2100bg.nix
- ./hardware/network/intel-2200bg.nix
- ./hardware/network/intel-3945abg.nix
- ./hardware/network/ralink.nix
- ./hardware/network/rtl8192c.nix
./hardware/nitrokey.nix
./hardware/opengl.nix
./hardware/pcmcia.nix
+ ./hardware/raid/hpsa.nix
./hardware/usb-wwan.nix
./hardware/video/amdgpu.nix
./hardware/video/amdgpu-pro.nix
@@ -72,6 +68,7 @@
./programs/adb.nix
./programs/atop.nix
./programs/bash/bash.nix
+ ./programs/bcc.nix
./programs/blcr.nix
./programs/browserpass.nix
./programs/cdemu.nix
@@ -91,6 +88,7 @@
./programs/mosh.nix
./programs/mtr.nix
./programs/nano.nix
+ ./programs/npm.nix
./programs/oblogout.nix
./programs/qt5ct.nix
./programs/screen.nix
@@ -100,6 +98,8 @@
./programs/spacefm.nix
./programs/ssh.nix
./programs/ssmtp.nix
+ ./programs/sysdig.nix
+ ./programs/sway.nix
./programs/thefuck.nix
./programs/tmux.nix
./programs/venus.nix
@@ -120,7 +120,6 @@
./security/chromium-suid-sandbox.nix
./security/dhparams.nix
./security/duosec.nix
- ./security/grsecurity.nix
./security/hidepid.nix
./security/lock-kernel-modules.nix
./security/oath.nix
@@ -133,8 +132,6 @@
./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
@@ -156,7 +153,9 @@
./services/backup/tarsnap.nix
./services/backup/znapzend.nix
./services/cluster/fleet.nix
- ./services/cluster/kubernetes.nix
+ ./services/cluster/kubernetes/default.nix
+ ./services/cluster/kubernetes/dns.nix
+ ./services/cluster/kubernetes/dashboard.nix
./services/cluster/panamax.nix
./services/computing/boinc/client.nix
./services/computing/torque/server.nix
@@ -165,6 +164,7 @@
./services/continuous-integration/buildbot/master.nix
./services/continuous-integration/buildbot/worker.nix
./services/continuous-integration/buildkite-agent.nix
+ ./services/continuous-integration/hail.nix
./services/continuous-integration/hydra/default.nix
./services/continuous-integration/gitlab-runner.nix
./services/continuous-integration/gocd-agent/default.nix
@@ -185,7 +185,7 @@
./services/databases/neo4j.nix
./services/databases/openldap.nix
./services/databases/opentsdb.nix
- ./services/databases/postage.nix
+ ./services/databases/pgmanage.nix
./services/databases/postgresql.nix
./services/databases/redis.nix
./services/databases/riak.nix
@@ -203,6 +203,7 @@
./services/desktops/gnome3/gnome-online-miners.nix
./services/desktops/gnome3/gnome-terminal-server.nix
./services/desktops/gnome3/gnome-user-share.nix
+ ./services/desktops/gnome3/gpaste.nix
./services/desktops/gnome3/gvfs.nix
./services/desktops/gnome3/seahorse.nix
./services/desktops/gnome3/sushi.nix
@@ -224,6 +225,7 @@
./services/hardware/brltty.nix
./services/hardware/freefall.nix
./services/hardware/illum.nix
+ ./services/hardware/interception-tools.nix
./services/hardware/irqbalance.nix
./services/hardware/nvidia-optimus.nix
./services/hardware/pcscd.nix
@@ -261,6 +263,7 @@
./services/mail/offlineimap.nix
./services/mail/opendkim.nix
./services/mail/opensmtpd.nix
+ ./services/mail/pfix-srsd.nix
./services/mail/postfix.nix
./services/mail/postsrsd.nix
./services/mail/postgrey.nix
@@ -268,6 +271,7 @@
./services/mail/rspamd.nix
./services/mail/rmilter.nix
./services/mail/nullmailer.nix
+ ./services/misc/airsonic.nix
./services/misc/apache-kafka.nix
./services/misc/autofs.nix
./services/misc/autorandr.nix
@@ -293,14 +297,17 @@
./services/misc/fstrim.nix
./services/misc/gammu-smsd.nix
./services/misc/geoip-updater.nix
+ ./services/misc/gitea.nix
#./services/misc/gitit.nix
./services/misc/gitlab.nix
./services/misc/gitolite.nix
./services/misc/gogs.nix
+ ./services/misc/gollum.nix
./services/misc/gpsd.nix
- #./services/misc/ihaskell.nix
+ ./services/misc/ihaskell.nix
./services/misc/irkerd.nix
./services/misc/jackett.nix
+ ./services/misc/logkeys.nix
./services/misc/leaps.nix
./services/misc/mantisbt.nix
./services/misc/mathics.nix
@@ -321,6 +328,8 @@
./services/misc/parsoid.nix
./services/misc/phd.nix
./services/misc/plex.nix
+ ./services/misc/plexpy.nix
+ ./services/misc/pykms.nix
./services/misc/radarr.nix
./services/misc/redmine.nix
./services/misc/rippled.nix
@@ -337,6 +346,7 @@
./services/misc/svnserve.nix
./services/misc/synergy.nix
./services/misc/taskserver
+ ./services/misc/tzupdate.nix
./services/misc/uhub.nix
./services/misc/zookeeper.nix
./services/monitoring/apcupsd.nix
@@ -346,6 +356,7 @@
./services/monitoring/collectd.nix
./services/monitoring/das_watchdog.nix
./services/monitoring/dd-agent/dd-agent.nix
+ ./services/monitoring/fusion-inventory.nix
./services/monitoring/grafana.nix
./services/monitoring/graphite.nix
./services/monitoring/hdaps.nix
@@ -359,8 +370,10 @@
./services/monitoring/prometheus/default.nix
./services/monitoring/prometheus/alertmanager.nix
./services/monitoring/prometheus/blackbox-exporter.nix
+ ./services/monitoring/prometheus/collectd-exporter.nix
./services/monitoring/prometheus/fritzbox-exporter.nix
./services/monitoring/prometheus/json-exporter.nix
+ ./services/monitoring/prometheus/minio-exporter.nix
./services/monitoring/prometheus/nginx-exporter.nix
./services/monitoring/prometheus/node-exporter.nix
./services/monitoring/prometheus/snmp-exporter.nix
@@ -400,6 +413,7 @@
./services/networking/asterisk.nix
./services/networking/atftpd.nix
./services/networking/avahi-daemon.nix
+ ./services/networking/babeld.nix
./services/networking/bind.nix
./services/networking/autossh.nix
./services/networking/bird.nix
@@ -416,15 +430,16 @@
./services/networking/ddclient.nix
./services/networking/dhcpcd.nix
./services/networking/dhcpd.nix
+ ./services/networking/dnscache.nix
./services/networking/dnschain.nix
./services/networking/dnscrypt-proxy.nix
./services/networking/dnscrypt-wrapper.nix
./services/networking/dnsmasq.nix
./services/networking/ejabberd.nix
- ./services/networking/fan.nix
./services/networking/fakeroute.nix
./services/networking/ferm.nix
./services/networking/firefox/sync-server.nix
+ ./services/networking/fireqos.nix
./services/networking/firewall.nix
./services/networking/flannel.nix
./services/networking/flashpolicyd.nix
@@ -454,7 +469,7 @@
./services/networking/lldpd.nix
./services/networking/logmein-hamachi.nix
./services/networking/mailpile.nix
- ./services/networking/mfi.nix
+ ./services/networking/matterbridge.nix
./services/networking/mjpg-streamer.nix
./services/networking/minidlna.nix
./services/networking/miniupnpd.nix
@@ -505,6 +520,7 @@
./services/networking/smokeping.nix
./services/networking/softether.nix
./services/networking/spiped.nix
+ ./services/networking/squid.nix
./services/networking/sslh.nix
./services/networking/ssh/lshd.nix
./services/networking/ssh/sshd.nix
@@ -515,6 +531,7 @@
./services/networking/tcpcrypt.nix
./services/networking/teamspeak3.nix
./services/networking/tinc.nix
+ ./services/networking/tinydns.nix
./services/networking/tftpd.nix
./services/networking/tox-bootstrapd.nix
./services/networking/toxvpn.nix
@@ -547,7 +564,6 @@
./services/security/fail2ban.nix
./services/security/fprintd.nix
./services/security/fprot.nix
- ./services/security/frandom.nix
./services/security/haka.nix
./services/security/haveged.nix
./services/security/hologram-server.nix
@@ -556,10 +572,12 @@
./services/security/oauth2_proxy.nix
./services/security/physlock.nix
./services/security/shibboleth-sp.nix
+ ./services/security/sks.nix
./services/security/sshguard.nix
./services/security/tor.nix
./services/security/torify.nix
./services/security/torsocks.nix
+ ./services/security/usbguard.nix
./services/security/vault.nix
./services/system/cgmanager.nix
./services/system/cloud-init.nix
@@ -583,6 +601,8 @@
./services/web-apps/frab.nix
./services/web-apps/mattermost.nix
./services/web-apps/nixbot.nix
+ ./services/web-apps/nexus.nix
+ ./services/web-apps/pgpkeyserver-lite.nix
./services/web-apps/piwik.nix
./services/web-apps/pump.io.nix
./services/web-apps/tt-rss.nix
@@ -602,6 +622,7 @@
./services/web-servers/phpfpm/default.nix
./services/web-servers/shellinabox.nix
./services/web-servers/tomcat.nix
+ ./services/web-servers/traefik.nix
./services/web-servers/uwsgi.nix
./services/web-servers/varnish/default.nix
./services/web-servers/winstone.nix
@@ -625,7 +646,6 @@
./services/x11/redshift.nix
./services/x11/urxvtd.nix
./services/x11/window-managers/awesome.nix
- #./services/x11/window-managers/compiz.nix
./services/x11/window-managers/default.nix
./services/x11/window-managers/fluxbox.nix
./services/x11/window-managers/icewm.nix
@@ -675,8 +695,10 @@
./tasks/cpu-freq.nix
./tasks/encrypted-devices.nix
./tasks/filesystems.nix
+ ./tasks/filesystems/bcachefs.nix
./tasks/filesystems/btrfs.nix
./tasks/filesystems/cifs.nix
+ ./tasks/filesystems/ecryptfs.nix
./tasks/filesystems/exfat.nix
./tasks/filesystems/ext.nix
./tasks/filesystems/f2fs.nix
diff --git a/nixos/modules/profiles/all-hardware.nix b/nixos/modules/profiles/all-hardware.nix
index 6e6ae98e19fc75b14de4876d4296b4d3dd791630..3c7e516c497f44b3ec7c5b6d72ce77345fb1335e 100644
--- a/nixos/modules/profiles/all-hardware.nix
+++ b/nixos/modules/profiles/all-hardware.nix
@@ -41,15 +41,12 @@
# Virtio (QEMU, KVM etc.) support.
"virtio_net" "virtio_pci" "virtio_blk" "virtio_scsi" "virtio_balloon" "virtio_console"
-
+
# VMware support.
"mptspi" "vmw_balloon" "vmwgfx" "vmw_vmci" "vmw_vsock_vmci_transport" "vmxnet3" "vsock"
# Hyper-V support.
"hv_storvsc"
-
- # Keyboards
- "usbhid" "hid_apple" "hid_logitech_dj" "hid_lenovo_tpkbd" "hid_roccat"
];
# Include lots of firmware.
diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix
index 687cd9d80d365a6568c8a86aa3ed70a2632aebcd..39b8553976ebd3095a0445c2d1851f9037fa09b6 100644
--- a/nixos/modules/profiles/base.nix
+++ b/nixos/modules/profiles/base.nix
@@ -20,6 +20,7 @@
# Some networking tools.
pkgs.fuse
+ pkgs.fuse3
pkgs.sshfs-fuse
pkgs.socat
pkgs.screen
diff --git a/nixos/modules/profiles/graphical.nix b/nixos/modules/profiles/graphical.nix
index e233753751889bc128209e9fe4433877adcd7212..fe9851e79a6d46446561088b0b64aceeb9a9eb8d 100644
--- a/nixos/modules/profiles/graphical.nix
+++ b/nixos/modules/profiles/graphical.nix
@@ -8,7 +8,7 @@
enable = true;
displayManager.sddm.enable = true;
desktopManager.plasma5.enable = true;
- synaptics.enable = true; # for touchpad support on many laptops
+ libinput.enable = true; # for touchpad support on many laptops
};
environment.systemPackages = [ pkgs.glxinfo ];
diff --git a/nixos/modules/profiles/hardened.nix b/nixos/modules/profiles/hardened.nix
index 0ab210cc4c39e851911693876579d73f033d3825..456538742f5174feee3dd0ccced39d1ae11ce3b9 100644
--- a/nixos/modules/profiles/hardened.nix
+++ b/nixos/modules/profiles/hardened.nix
@@ -25,6 +25,13 @@ with lib;
"nohibernate"
];
+ boot.blacklistedKernelModules = [
+ # Obscure network protocols
+ "ax25"
+ "netrom"
+ "rose"
+ ];
+
# Restrict ptrace() usage to processes with a pre-defined relationship
# (e.g., parent/child)
boot.kernel.sysctl."kernel.yama.ptrace_scope" = mkOverride 500 1;
@@ -65,4 +72,14 @@ with lib;
# Note: mmap_rnd_compat_bits may not exist on 64bit.
boot.kernel.sysctl."vm.mmap_rnd_bits" = mkDefault 32;
boot.kernel.sysctl."vm.mmap_rnd_compat_bits" = mkDefault 16;
+
+ # Allowing users to mmap() memory starting at virtual address 0 can turn a
+ # NULL dereference bug in the kernel into code execution with elevated
+ # privilege. Mitigate by enforcing a minimum base addr beyond the NULL memory
+ # space. This breaks applications that require mapping the 0 page, such as
+ # dosemu or running 16bit applications under wine. It also breaks older
+ # versions of qemu.
+ #
+ # The value is taken from the KSPP recommendations (Debian uses 4096).
+ boot.kernel.sysctl."vm.mmap_min_addr" = mkDefault 65536;
}
diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix
index a24fa75e01dbc8d9b4fa686f77d50650f53f5311..506a6ee3eaa813840eb19ebb595ec71bf525f109 100644
--- a/nixos/modules/profiles/installation-device.nix
+++ b/nixos/modules/profiles/installation-device.nix
@@ -28,7 +28,7 @@ with lib;
services.nixosManual.showManual = true;
# Let the user play Rogue on TTY 8 during the installation.
- services.rogue.enable = true;
+ #services.rogue.enable = true;
# Disable some other stuff we don't need.
security.sudo.enable = false;
@@ -77,7 +77,6 @@ with lib;
# Show all debug messages from the kernel but don't log refused packets
# because we have the firewall enabled. This makes installs from the
# console less cumbersome if the machine has a public IP.
- boot.consoleLogLevel = mkDefault 7;
networking.firewall.logRefusedConnections = mkDefault false;
environment.systemPackages = [ pkgs.vim ];
diff --git a/nixos/modules/programs/bcc.nix b/nixos/modules/programs/bcc.nix
new file mode 100644
index 0000000000000000000000000000000000000000..3522ab22fa8ea4320e8c1a1af747e69a467a098e
--- /dev/null
+++ b/nixos/modules/programs/bcc.nix
@@ -0,0 +1,9 @@
+{ config, lib, pkgs, ... }:
+{
+ options.programs.bcc.enable = lib.mkEnableOption "bcc";
+
+ config = lib.mkIf config.programs.bcc.enable {
+ environment.systemPackages = [ config.boot.kernelPackages.bcc ];
+ boot.extraModulePackages = [ config.boot.kernelPackages.bcc ];
+ };
+}
diff --git a/nixos/modules/programs/command-not-found/command-not-found.nix b/nixos/modules/programs/command-not-found/command-not-found.nix
index 55529d73cb60f3e6c2493c8ca1d7650158546c64..bbe7165c62fbdf3eac5ff63f1b6d0b7a5a7bd86e 100644
--- a/nixos/modules/programs/command-not-found/command-not-found.nix
+++ b/nixos/modules/programs/command-not-found/command-not-found.nix
@@ -25,7 +25,14 @@ in
{
options.programs.command-not-found = {
- enable = mkEnableOption "command-not-found hook for interactive shell";
+ enable = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ Whether interactive shells should show which Nix package (if
+ any) provides a missing command.
+ '';
+ };
dbPath = mkOption {
default = "/nix/var/nix/profiles/per-user/root/channels/nixos/programs.sqlite" ;
diff --git a/nixos/modules/programs/mtr.nix b/nixos/modules/programs/mtr.nix
index 927fe68be875c4afc02278dca15e54b24e8a93f7..1fdec4c04f682e97a09922c7c339f8e800602a90 100644
--- a/nixos/modules/programs/mtr.nix
+++ b/nixos/modules/programs/mtr.nix
@@ -19,8 +19,9 @@ in {
};
config = mkIf cfg.enable {
- security.wrappers.mtr = {
- source = "${pkgs.mtr}/bin/mtr";
+ environment.systemPackages = with pkgs; [ mtr ];
+ security.wrappers.mtr-packet = {
+ source = "${pkgs.mtr}/bin/mtr-packet";
capabilities = "cap_net_raw+p";
};
};
diff --git a/nixos/modules/programs/npm.nix b/nixos/modules/programs/npm.nix
new file mode 100644
index 0000000000000000000000000000000000000000..7ef172355c1fcfd4600ea40d2a3b9c8bd6dc0108
--- /dev/null
+++ b/nixos/modules/programs/npm.nix
@@ -0,0 +1,44 @@
+{ config, lib, ... }:
+
+with lib;
+
+let
+ cfg = config.programs.npm;
+in
+
+{
+ ###### interface
+
+ options = {
+ programs.npm = {
+ enable = mkEnableOption "npm global config";
+
+ npmrc = lib.mkOption {
+ type = lib.types.lines;
+ description = ''
+ The system-wide npm configuration.
+ See .
+ '';
+ default = ''
+ prefix = ''${HOME}/.npm
+ '';
+ example = ''
+ prefix = ''${HOME}/.npm
+ https-proxy=proxy.example.com
+ init-license=MIT
+ init-author-url=http://npmjs.org
+ color=true
+ '';
+ };
+ };
+ };
+
+ ###### implementation
+
+ config = lib.mkIf cfg.enable {
+ environment.etc."npmrc".text = cfg.npmrc;
+
+ environment.variables.NPM_CONFIG_GLOBALCONFIG = "/etc/npmrc";
+ };
+
+}
diff --git a/nixos/modules/programs/oblogout.nix b/nixos/modules/programs/oblogout.nix
index 79a8ddb7ce374540bf882584eb036578c312590a..720c29b1eaeef77e07b9212c31c19d156c24a8ed 100644
--- a/nixos/modules/programs/oblogout.nix
+++ b/nixos/modules/programs/oblogout.nix
@@ -27,6 +27,7 @@ in
type = types.int;
default = 70;
description = ''
+ Opacity percentage of Cairo rendered backgrounds.
'';
};
@@ -34,6 +35,7 @@ in
type = types.str;
default = "black";
description = ''
+ Colour name or hex code (#ffffff) of the background color.
'';
};
@@ -41,6 +43,9 @@ in
type = types.str;
default = "simplistic";
description = ''
+ Icon theme for the buttons, must be in the themes folder of
+ the package, or in
+ ~/.themes/<name>/oblogout/.
'';
};
@@ -48,6 +53,7 @@ in
type = types.str;
default = "cancel, logout, restart, shutdown, suspend, hibernate";
description = ''
+ List and order of buttons to show.
'';
};
@@ -55,6 +61,7 @@ in
type = types.str;
default = "Escape";
description = ''
+ Cancel logout/shutdown shortcut.
'';
};
@@ -62,6 +69,7 @@ in
type = types.str;
default = "S";
description = ''
+ Shutdown shortcut.
'';
};
@@ -69,6 +77,7 @@ in
type = types.str;
default = "R";
description = ''
+ Restart shortcut.
'';
};
@@ -76,6 +85,7 @@ in
type = types.str;
default = "U";
description = ''
+ Suspend shortcut.
'';
};
@@ -83,6 +93,7 @@ in
type = types.str;
default = "L";
description = ''
+ Logout shortcut.
'';
};
@@ -90,6 +101,7 @@ in
type = types.str;
default = "K";
description = ''
+ Lock session shortcut.
'';
};
@@ -97,6 +109,7 @@ in
type = types.str;
default = "H";
description = ''
+ Hibernate shortcut.
'';
};
@@ -104,6 +117,7 @@ in
type = types.str;
default = "openbox --exit";
description = ''
+ Command to logout.
'';
};
@@ -111,6 +125,7 @@ in
type = types.str;
default = "";
description = ''
+ Command to lock screen.
'';
};
@@ -118,6 +133,7 @@ in
type = types.str;
default = "";
description = ''
+ Command to switch user.
'';
};
};
diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix
index e0fbba897fa4ef3d24c340c9be87b6750c026b28..0935bf0cae71446c181c5e4fdd3bca82c3cc84dc 100644
--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@@ -148,11 +148,11 @@ in
[
{
hostNames = [ "myhost" "myhost.mydomain.com" "10.10.1.4" ];
- publicKeyFile = "./pubkeys/myhost_ssh_host_dsa_key.pub";
+ publicKeyFile = ./pubkeys/myhost_ssh_host_dsa_key.pub;
}
{
hostNames = [ "myhost2" ];
- publicKeyFile = "./pubkeys/myhost2_ssh_host_dsa_key.pub";
+ publicKeyFile = ./pubkeys/myhost2_ssh_host_dsa_key.pub;
}
]
'';
diff --git a/nixos/modules/programs/sway.nix b/nixos/modules/programs/sway.nix
new file mode 100644
index 0000000000000000000000000000000000000000..9070722c770bf9ed06fd6530ef6c8e0360dec154
--- /dev/null
+++ b/nixos/modules/programs/sway.nix
@@ -0,0 +1,69 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+ cfg = config.programs.sway;
+ sway = pkgs.sway;
+
+ swayWrapped = pkgs.writeScriptBin "sway" ''
+ #! ${pkgs.stdenv.shell}
+ ${cfg.extraSessionCommands}
+ PATH="${sway}/bin:$PATH"
+ exec ${pkgs.dbus.dbus-launch} --exit-with-session sway-setcap
+ '';
+ swayJoined = pkgs.symlinkJoin {
+ name = "sway-wrapped";
+ paths = [ swayWrapped sway ];
+ };
+in
+{
+ options.programs.sway = {
+ enable = mkEnableOption "sway";
+
+ extraSessionCommands = mkOption {
+ default = "";
+ type = types.lines;
+ example = ''
+ export XKB_DEFAULT_LAYOUT=us,de
+ export XKB_DEFAULT_VARIANT=,nodeadkeys
+ export XKB_DEFAULT_OPTIONS=grp:alt_shift_toggle,
+ '';
+ description = ''
+ Shell commands executed just before sway is started.
+ '';
+ };
+
+ extraPackages = mkOption {
+ type = with types; listOf package;
+ default = with pkgs; [
+ i3status xwayland rxvt_unicode dmenu
+ ];
+ example = literalExample ''
+ with pkgs; [
+ i3status xwayland rxvt_unicode dmenu
+ ]
+ '';
+ description = ''
+ Extra packages to be installed system wide.
+ '';
+ };
+ };
+
+ config = mkIf cfg.enable {
+ environment.systemPackages = [ swayJoined ] ++ cfg.extraPackages;
+ security.wrappers.sway = {
+ program = "sway-setcap";
+ source = "${sway}/bin/sway";
+ capabilities = "cap_sys_ptrace,cap_sys_tty_config=eip";
+ owner = "root";
+ group = "sway";
+ permissions = "u+rx,g+rx";
+ };
+
+ users.extraGroups.sway = {};
+
+ hardware.opengl.enable = mkDefault true;
+ fonts.enableDefaultFonts = mkDefault true;
+ };
+}
diff --git a/nixos/modules/programs/sysdig.nix b/nixos/modules/programs/sysdig.nix
new file mode 100644
index 0000000000000000000000000000000000000000..fbbf2906556477b264fcd3e29f0005ec4d82a9c4
--- /dev/null
+++ b/nixos/modules/programs/sysdig.nix
@@ -0,0 +1,14 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.programs.sysdig;
+in {
+ options.programs.sysdig.enable = mkEnableOption "sysdig";
+
+ config = mkIf cfg.enable {
+ environment.systemPackages = [ pkgs.sysdig ];
+ boot.extraModulePackages = [ config.boot.kernelPackages.sysdig ];
+ };
+}
diff --git a/nixos/modules/programs/xonsh.nix b/nixos/modules/programs/xonsh.nix
index c0be2d8884b30e7524f5ab31cdb1239f74990e7d..49cc4906e0385cddfab1a1461df707471758800c 100644
--- a/nixos/modules/programs/xonsh.nix
+++ b/nixos/modules/programs/xonsh.nix
@@ -21,7 +21,7 @@ in
enable = mkOption {
default = false;
description = ''
- Whether to configure xnosh as an interactive shell.
+ Whether to configure xonsh as an interactive shell.
'';
type = types.bool;
};
diff --git a/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix b/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix
index 9452489e2fb48fbed57f6175dd041b4acdcbf16f..e7cf17c2c00cb00a17c8aef6177bd656e6f2866e 100644
--- a/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix
+++ b/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix
@@ -5,74 +5,74 @@ with lib;
let
cfg = config.programs.zsh.syntaxHighlighting;
in
- {
- options = {
- programs.zsh.syntaxHighlighting = {
- enable = mkEnableOption "zsh-syntax-highlighting";
+{
+ options = {
+ programs.zsh.syntaxHighlighting = {
+ enable = mkEnableOption "zsh-syntax-highlighting";
- highlighters = mkOption {
- default = [ "main" ];
+ highlighters = mkOption {
+ default = [ "main" ];
- # https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/docs/highlighters.md
- type = types.listOf(types.enum([
- "main"
- "brackets"
- "pattern"
- "cursor"
- "root"
- "line"
- ]));
+ # https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/docs/highlighters.md
+ type = types.listOf(types.enum([
+ "main"
+ "brackets"
+ "pattern"
+ "cursor"
+ "root"
+ "line"
+ ]));
- description = ''
- Specifies the highlighters to be used by zsh-syntax-highlighting.
+ description = ''
+ Specifies the highlighters to be used by zsh-syntax-highlighting.
- The following defined options can be found here:
- https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/docs/highlighters.md
- '';
- };
+ The following defined options can be found here:
+ https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/docs/highlighters.md
+ '';
+ };
- patterns = mkOption {
- default = {};
- type = types.attrsOf types.string;
+ patterns = mkOption {
+ default = {};
+ type = types.attrsOf types.string;
- example = literalExample ''
- {
- "rm -rf *" = "fg=white,bold,bg=red";
- }
- '';
+ example = literalExample ''
+ {
+ "rm -rf *" = "fg=white,bold,bg=red";
+ }
+ '';
- description = ''
- Specifies custom patterns to be highlighted by zsh-syntax-highlighting.
+ description = ''
+ Specifies custom patterns to be highlighted by zsh-syntax-highlighting.
- Please refer to the docs for more information about the usage:
- https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/docs/highlighters/pattern.md
- '';
- };
+ Please refer to the docs for more information about the usage:
+ https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/docs/highlighters/pattern.md
+ '';
};
};
+ };
- config = mkIf cfg.enable {
- environment.systemPackages = with pkgs; [ zsh-syntax-highlighting ];
-
- programs.zsh.interactiveShellInit = with pkgs; with builtins; ''
- source ${zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+ config = mkIf cfg.enable {
+ environment.systemPackages = with pkgs; [ zsh-syntax-highlighting ];
- ${optionalString (length(cfg.highlighters) > 0)
- "ZSH_HIGHLIGHT_HIGHLIGHTERS=(${concatStringsSep " " cfg.highlighters})"
- }
+ assertions = [
+ {
+ assertion = length(attrNames cfg.patterns) > 0 -> elem "pattern" cfg.highlighters;
+ message = ''
+ When highlighting patterns, "pattern" needs to be included in the list of highlighters.
+ '';
+ }
+ ];
- ${let
- n = attrNames cfg.patterns;
- in
- optionalString (length(n) > 0)
- (assert(elem "pattern" cfg.highlighters); (foldl (
- a: b:
- ''
- ${a}
- ZSH_HIGHLIGHT_PATTERNS+=('${b}' '${attrByPath [b] "" cfg.patterns}')
- ''
- ) "") n)
- }
- '';
- };
- }
+ programs.zsh.interactiveShellInit = with pkgs;
+ lib.concatStringsSep "\n" ([
+ "source ${zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh"
+ ] ++ optional (length(cfg.highlighters) > 0)
+ "ZSH_HIGHLIGHT_HIGHLIGHTERS=(${concatStringsSep " " cfg.highlighters})"
+ ++ optionals (length(attrNames cfg.patterns) > 0)
+ (mapAttrsToList (
+ pattern: design:
+ "ZSH_HIGHLIGHT_PATTERNS+=('${pattern}' '${design}')"
+ ) cfg.patterns)
+ );
+ };
+}
diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix
index a055291282c994208d70ee5f9214e687b11be7bb..615e54c326b791aa1d6d5f1f20eb76c1ca007ed5 100644
--- a/nixos/modules/programs/zsh/zsh.nix
+++ b/nixos/modules/programs/zsh/zsh.nix
@@ -158,24 +158,24 @@ in
HELPDIR="${pkgs.zsh}/share/zsh/$ZSH_VERSION/help"
+ # Tell zsh how to find installed completions
+ for p in ''${(z)NIX_PROFILES}; do
+ fpath+=($p/share/zsh/site-functions $p/share/zsh/$ZSH_VERSION/functions $p/share/zsh/vendor-completions)
+ done
+
${optionalString cfg.enableCompletion "autoload -U compinit && compinit"}
${optionalString (cfg.enableAutosuggestions)
"source ${pkgs.zsh-autosuggestions}/share/zsh-autosuggestions/zsh-autosuggestions.zsh"
}
- ${zshAliases}
-
${cfge.interactiveShellInit}
${cfg.interactiveShellInit}
- ${cfg.promptInit}
+ ${zshAliases}
- # Tell zsh how to find installed completions
- for p in ''${(z)NIX_PROFILES}; do
- fpath+=($p/share/zsh/site-functions $p/share/zsh/$ZSH_VERSION/functions $p/share/zsh/vendor-completions)
- done
+ ${cfg.promptInit}
# Read system-wide modifications.
if test -f /etc/zshrc.local; then
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 08146d1f568781933e2f601bb19f49b6af84cf88..f30cbe427f09c85a22b6bd6bd699ca9eb5547082 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -1,4 +1,4 @@
-{ lib, ... }:
+{ lib, pkgs, ... }:
with lib;
@@ -11,20 +11,30 @@ with lib;
(mkRenamedOptionModule [ "fonts" "extraFonts" ] [ "fonts" "fonts" ])
(mkRenamedOptionModule [ "networking" "enableWLAN" ] [ "networking" "wireless" "enable" ])
- (mkRenamedOptionModule [ "networking" "enableRT73Firmware" ] [ "networking" "enableRalinkFirmware" ])
+ (mkRenamedOptionModule [ "networking" "enableRT73Firmware" ] [ "hardware" "enableRedistributableFirmware" ])
+ (mkRenamedOptionModule [ "networking" "enableIntel3945ABGFirmware" ] [ "hardware" "enableRedistributableFirmware" ])
+ (mkRenamedOptionModule [ "networking" "enableIntel2100BGFirmware" ] [ "hardware" "enableRedistributableFirmware" ])
+ (mkRenamedOptionModule [ "networking" "enableRalinkFirmware" ] [ "hardware" "enableRedistributableFirmware" ])
+ (mkRenamedOptionModule [ "networking" "enableRTL8192cFirmware" ] [ "hardware" "enableRedistributableFirmware" ])
(mkRenamedOptionModule [ "services" "cadvisor" "host" ] [ "services" "cadvisor" "listenAddress" ])
+ (mkChangedOptionModule [ "services" "printing" "gutenprint" ] [ "services" "printing" "drivers" ]
+ (config:
+ let enabled = getAttrFromPath [ "services" "printing" "gutenprint" ] config;
+ in if enabled then [ pkgs.gutenprint ] else [ ]))
(mkRenamedOptionModule [ "services" "elasticsearch" "host" ] [ "services" "elasticsearch" "listenAddress" ])
(mkRenamedOptionModule [ "services" "graphite" "api" "host" ] [ "services" "graphite" "api" "listenAddress" ])
(mkRenamedOptionModule [ "services" "graphite" "web" "host" ] [ "services" "graphite" "web" "listenAddress" ])
- (mkRenamedOptionModule [ "services" "logstash" "address" ] [ "services" "logstash" "listenAddress" ])
+ (mkRenamedOptionModule [ "services" "i2pd" "extIp" ] [ "services" "i2pd" "address" ])
(mkRenamedOptionModule [ "services" "kibana" "host" ] [ "services" "kibana" "listenAddress" ])
+ (mkRenamedOptionModule [ "services" "logstash" "address" ] [ "services" "logstash" "listenAddress" ])
(mkRenamedOptionModule [ "services" "mpd" "network" "host" ] [ "services" "mpd" "network" "listenAddress" ])
(mkRenamedOptionModule [ "services" "neo4j" "host" ] [ "services" "neo4j" "listenAddress" ])
(mkRenamedOptionModule [ "services" "shout" "host" ] [ "services" "shout" "listenAddress" ])
(mkRenamedOptionModule [ "services" "sslh" "host" ] [ "services" "sslh" "listenAddress" ])
(mkRenamedOptionModule [ "services" "statsd" "host" ] [ "services" "statsd" "listenAddress" ])
(mkRenamedOptionModule [ "services" "subsonic" "host" ] [ "services" "subsonic" "listenAddress" ])
+ (mkRenamedOptionModule [ "services" "tor" "relay" "portSpec" ] [ "services" "tor" "relay" "port" ])
(mkRenamedOptionModule [ "jobs" ] [ "systemd" "services" ])
(mkRenamedOptionModule [ "services" "gitlab" "stateDir" ] [ "services" "gitlab" "statePath" ])
@@ -102,6 +112,9 @@ with lib;
(mkAliasOptionModule [ "environment" "checkConfigurationOptions" ] [ "_module" "check" ])
+ # opendkim
+ (mkRenamedOptionModule [ "services" "opendkim" "keyFile" ] [ "services" "opendkim" "keyPath" ])
+
# XBMC
(mkRenamedOptionModule [ "services" "xserver" "windowManager" "xbmc" ] [ "services" "xserver" "desktopManager" "kodi" ])
(mkRenamedOptionModule [ "services" "xserver" "desktopManager" "xbmc" ] [ "services" "xserver" "desktopManager" "kodi" ])
@@ -118,26 +131,6 @@ with lib;
(mkRenamedOptionModule [ "services" "iodined" "extraConfig" ] [ "services" "iodine" "server" "extraConfig" ])
(mkRemovedOptionModule [ "services" "iodined" "client" ] "")
- # Grsecurity
- (mkRemovedOptionModule [ "security" "grsecurity" "kernelPatch" ] "")
- (mkRemovedOptionModule [ "security" "grsecurity" "config" "mode" ] "")
- (mkRemovedOptionModule [ "security" "grsecurity" "config" "priority" ] "")
- (mkRemovedOptionModule [ "security" "grsecurity" "config" "system" ] "")
- (mkRemovedOptionModule [ "security" "grsecurity" "config" "virtualisationConfig" ] "")
- (mkRemovedOptionModule [ "security" "grsecurity" "config" "hardwareVirtualisation" ] "")
- (mkRemovedOptionModule [ "security" "grsecurity" "config" "virtualisationSoftware" ] "")
- (mkRemovedOptionModule [ "security" "grsecurity" "config" "sysctl" ] "")
- (mkRemovedOptionModule [ "security" "grsecurity" "config" "denyChrootChmod" ] "")
- (mkRemovedOptionModule [ "security" "grsecurity" "config" "denyChrootCaps" ] "")
- (mkRemovedOptionModule [ "security" "grsecurity" "config" "denyUSB" ] "")
- (mkRemovedOptionModule [ "security" "grsecurity" "config" "restrictProc" ] "")
- (mkRemovedOptionModule [ "security" "grsecurity" "config" "restrictProcWithGroup" ] "")
- (mkRemovedOptionModule [ "security" "grsecurity" "config" "unrestrictProcGid" ] "")
- (mkRemovedOptionModule [ "security" "grsecurity" "config" "disableRBAC" ] "")
- (mkRemovedOptionModule [ "security" "grsecurity" "config" "disableSimultConnect" ] "")
- (mkRemovedOptionModule [ "security" "grsecurity" "config" "verboseVersion" ] "")
- (mkRemovedOptionModule [ "security" "grsecurity" "config" "kernelExtraConfig" ] "")
-
# Unity3D
(mkRenamedOptionModule [ "programs" "unity3d" "enable" ] [ "security" "chromiumSuidSandbox" "enable" ])
@@ -195,6 +188,8 @@ with lib;
(mkRemovedOptionModule [ "services" "openvpn" "enable" ] "")
(mkRemovedOptionModule [ "services" "printing" "cupsFilesConf" ] "")
(mkRemovedOptionModule [ "services" "printing" "cupsdConf" ] "")
+ (mkRemovedOptionModule [ "services" "tor" "relay" "isBridge" ] "Use services.tor.relay.role instead.")
+ (mkRemovedOptionModule [ "services" "tor" "relay" "isExit" ] "Use services.tor.relay.role instead.")
(mkRemovedOptionModule [ "services" "xserver" "startGnuPGAgent" ]
"See the 16.09 release notes for more information.")
(mkRemovedOptionModule [ "services" "phpfpm" "phpIni" ] "")
@@ -204,7 +199,6 @@ with lib;
"Set the option `services.xserver.displayManager.sddm.package' instead.")
(mkRemovedOptionModule [ "fonts" "fontconfig" "forceAutohint" ] "")
(mkRemovedOptionModule [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ] "")
- (mkRemovedOptionModule [ "boot" "zfs" "enableUnstable" ] "0.7.0 is now the default")
# ZSH
(mkRenamedOptionModule [ "programs" "zsh" "enableSyntaxHighlighting" ] [ "programs" "zsh" "syntaxHighlighting" "enable" ])
diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix
index a40c5ef9ebe1d3b89c7a900448b24baf50d519e4..fb011019f7f54ff9e29750469e6f85797c8b903b 100644
--- a/nixos/modules/security/acme.nix
+++ b/nixos/modules/security/acme.nix
@@ -139,6 +139,20 @@ in
'';
};
+ production = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ If set to true, use Let's Encrypt's production environment
+ instead of the staging environment. The main benefit of the
+ staging environment is to get much higher rate limits.
+
+ See
+ https://letsencrypt.org/docs/staging-environment
+ for more detail.
+ '';
+ };
+
certs = mkOption {
default = { };
type = with types; attrsOf (submodule certOpts);
@@ -177,7 +191,9 @@ in
cmdline = [ "-v" "-d" domain "--default_root" data.webroot "--valid_min" cfg.validMin ]
++ optionals (data.email != null) [ "--email" data.email ]
++ concatMap (p: [ "-f" p ]) data.plugins
- ++ concatLists (mapAttrsToList (name: root: [ "-d" (if root == null then name else "${name}:${root}")]) data.extraDomains);
+ ++ concatLists (mapAttrsToList (name: root: [ "-d" (if root == null then name else "${name}:${root}")]) data.extraDomains)
+ ++ (if cfg.production then []
+ else ["--server" "https://acme-staging.api.letsencrypt.org/directory"]);
acmeService = {
description = "Renew ACME Certificate for ${cert}";
after = [ "network.target" "network-online.target" ];
diff --git a/nixos/modules/security/acme.xml b/nixos/modules/security/acme.xml
index 823806f4641b465cd91762e1fd9362233f3195a6..6130ed82ed3806370afdffc045b5f8c80f992037 100644
--- a/nixos/modules/security/acme.xml
+++ b/nixos/modules/security/acme.xml
@@ -89,8 +89,5 @@ services.nginx = {
};
}
-
-At the moment you still have to restart Nginx after the ACME
-certs arrive.
diff --git a/nixos/modules/security/chromium-suid-sandbox.nix b/nixos/modules/security/chromium-suid-sandbox.nix
index 0458ffb6c46ce311ea20dd07bf42ed21f4b383e3..be6acb3f1f53e8b68b4c460d5673bb46f4a15fbc 100644
--- a/nixos/modules/security/chromium-suid-sandbox.nix
+++ b/nixos/modules/security/chromium-suid-sandbox.nix
@@ -19,9 +19,6 @@ in
Also, if the URL chrome://sandbox tells you that "You are not adequately
sandboxed!", turning this on might resolve the issue.
-
- Finally, if you have enabled and you
- use Chromium, you probably need this.
'';
};
diff --git a/nixos/modules/security/grsecurity.nix b/nixos/modules/security/grsecurity.nix
deleted file mode 100644
index d23c7f2e86de88cfff723caffcd90180db78536a..0000000000000000000000000000000000000000
--- a/nixos/modules/security/grsecurity.nix
+++ /dev/null
@@ -1,169 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-with lib;
-
-let
- cfg = config.security.grsecurity;
- grsecLockPath = "/proc/sys/kernel/grsecurity/grsec_lock";
-
- # Ascertain whether NixOS container support is required
- containerSupportRequired =
- config.boot.enableContainers && config.containers != {};
-in
-
-{
- meta = {
- maintainers = with maintainers; [ ];
- doc = ./grsecurity.xml;
- };
-
- options.security.grsecurity = {
-
- enable = mkOption {
- type = types.bool;
- default = false;
- description = ''
- Enable grsecurity/PaX.
- '';
- };
-
- lockTunables = mkOption {
- type = types.bool;
- default = true;
- description = ''
- Whether to automatically lock grsecurity tunables
- (). Disable
- this to allow runtime configuration of grsecurity features. Activate
- the grsec-lock service unit to prevent further
- configuration until the next reboot.
- '';
- };
-
- disableEfiRuntimeServices = mkOption {
- type = types.bool;
- default = true;
- description = ''
- Whether to disable access to EFI runtime services. Enabling EFI runtime
- services creates a venue for code injection attacks on the kernel and
- should be disabled if at all possible. Changing this option enters into
- effect upon reboot.
- '';
- };
-
- };
-
- config = mkIf cfg.enable {
-
- boot.kernelPackages = mkForce pkgs.linuxPackages_grsec_nixos;
-
- boot.kernelParams = [ "grsec_sysfs_restrict=0" ]
- ++ optional cfg.disableEfiRuntimeServices "noefi";
-
- nixpkgs.config.grsecurity = true;
-
- # Install PaX related utillities into the system profile.
- environment.systemPackages = with pkgs; [ gradm paxctl pax-utils ];
-
- # Install rules for the grsec device node
- services.udev.packages = [ pkgs.gradm ];
-
- # This service unit is responsible for locking the grsecurity tunables. The
- # unit is always defined, but only activated on bootup if lockTunables is
- # toggled. When lockTunables is toggled, failure to activate the unit will
- # enter emergency mode. The intent is to make it difficult to silently
- # enter multi-user mode without having locked the tunables. Some effort is
- # made to ensure that starting the unit is an idempotent operation.
- systemd.services.grsec-lock = {
- description = "Lock grsecurity tunables";
-
- wantedBy = optional cfg.lockTunables "multi-user.target";
-
- wants = [ "local-fs.target" "systemd-sysctl.service" ];
- after = [ "local-fs.target" "systemd-sysctl.service" ];
- conflicts = [ "shutdown.target" ];
-
- restartIfChanged = false;
-
- script = ''
- if ${pkgs.gnugrep}/bin/grep -Fq 0 ${grsecLockPath} ; then
- echo -n 1 > ${grsecLockPath}
- fi
- '';
-
- unitConfig = {
- ConditionPathIsReadWrite = grsecLockPath;
- DefaultDependencies = false;
- } // optionalAttrs cfg.lockTunables {
- OnFailure = "emergency.target";
- };
-
- serviceConfig = {
- Type = "oneshot";
- RemainAfterExit = true;
- };
- };
-
- # Configure system tunables
- boot.kernel.sysctl = {
- # Read-only under grsecurity
- "kernel.kptr_restrict" = mkForce null;
-
- # All grsec tunables default to off, those not enabled below are
- # *disabled*. We use mkDefault to allow expert users to override
- # our choices, but use mkForce where tunables would outright
- # conflict with other settings.
-
- # Enable all chroot restrictions by default (overwritten as
- # necessary below)
- "kernel.grsecurity.chroot_caps" = mkDefault 1;
- "kernel.grsecurity.chroot_deny_bad_rename" = mkDefault 1;
- "kernel.grsecurity.chroot_deny_chmod" = mkDefault 1;
- "kernel.grsecurity.chroot_deny_chroot" = mkDefault 1;
- "kernel.grsecurity.chroot_deny_fchdir" = mkDefault 1;
- "kernel.grsecurity.chroot_deny_mknod" = mkDefault 1;
- "kernel.grsecurity.chroot_deny_mount" = mkDefault 1;
- "kernel.grsecurity.chroot_deny_pivot" = mkDefault 1;
- "kernel.grsecurity.chroot_deny_shmat" = mkDefault 1;
- "kernel.grsecurity.chroot_deny_sysctl" = mkDefault 1;
- "kernel.grsecurity.chroot_deny_unix" = mkDefault 1;
- "kernel.grsecurity.chroot_enforce_chdir" = mkDefault 1;
- "kernel.grsecurity.chroot_findtask" = mkDefault 1;
- "kernel.grsecurity.chroot_restrict_nice" = mkDefault 1;
-
- # Enable various grsec protections
- "kernel.grsecurity.consistent_setxid" = mkDefault 1;
- "kernel.grsecurity.deter_bruteforce" = mkDefault 1;
- "kernel.grsecurity.fifo_restrictions" = mkDefault 1;
- "kernel.grsecurity.harden_ipc" = mkDefault 1;
- "kernel.grsecurity.harden_ptrace" = mkDefault 1;
- "kernel.grsecurity.harden_tty" = mkDefault 1;
- "kernel.grsecurity.ip_blackhole" = mkDefault 1;
- "kernel.grsecurity.linking_restrictions" = mkDefault 1;
- "kernel.grsecurity.ptrace_readexec" = mkDefault 1;
-
- # Enable auditing
- "kernel.grsecurity.audit_ptrace" = mkDefault 1;
- "kernel.grsecurity.forkfail_logging" = mkDefault 1;
- "kernel.grsecurity.rwxmap_logging" = mkDefault 1;
- "kernel.grsecurity.signal_logging" = mkDefault 1;
- "kernel.grsecurity.timechange_logging" = mkDefault 1;
- } // optionalAttrs config.nix.useSandbox {
- # chroot(2) restrictions that conflict with sandboxed Nix builds
- "kernel.grsecurity.chroot_caps" = mkForce 0;
- "kernel.grsecurity.chroot_deny_chmod" = mkForce 0;
- "kernel.grsecurity.chroot_deny_chroot" = mkForce 0;
- "kernel.grsecurity.chroot_deny_mount" = mkForce 0;
- "kernel.grsecurity.chroot_deny_pivot" = mkForce 0;
- } // optionalAttrs containerSupportRequired {
- # chroot(2) restrictions that conflict with NixOS lightweight containers
- "kernel.grsecurity.chroot_caps" = mkForce 0;
- "kernel.grsecurity.chroot_deny_chmod" = mkForce 0;
- "kernel.grsecurity.chroot_deny_mount" = mkForce 0;
- "kernel.grsecurity.chroot_restrict_nice" = mkForce 0;
- # Disable privileged IO by default, unless X is enabled
- } // optionalAttrs (!config.services.xserver.enable) {
- "kernel.grsecurity.disable_priv_io" = mkDefault 1;
- };
-
- };
-}
diff --git a/nixos/modules/security/grsecurity.xml b/nixos/modules/security/grsecurity.xml
deleted file mode 100644
index 0a884b3f9b55a13e2ecc2b5ef6eb731db19f88c0..0000000000000000000000000000000000000000
--- a/nixos/modules/security/grsecurity.xml
+++ /dev/null
@@ -1,385 +0,0 @@
-
-
- Grsecurity/PaX
-
-
- Grsecurity/PaX is a set of patches against the Linux kernel that
- implements an extensive suite of
- features
- designed to increase the difficulty of exploiting kernel and
- application bugs.
-
-
-
- The NixOS grsecurity/PaX module is designed with casual users in mind and is
- intended to be compatible with normal desktop usage, without
- unnecessarily compromising security. The
- following sections describe the configuration and administration of
- a grsecurity/PaX enabled NixOS system. For more comprehensive
- coverage, please refer to the
- grsecurity wikibook
- and the
- Arch
- Linux wiki page on grsecurity.
-
- Upstream has ceased free support for grsecurity/PaX. See
-
- the announcement for more information. Consequently, NixOS
- support for grsecurity/PaX also must cease. Enabling this module will
- result in a build error.
- We standardise on a desktop oriented configuration primarily due
- to lack of resources. The grsecurity/PaX configuration state space is huge
- and each configuration requires quite a bit of testing to ensure that the
- resulting packages work as advertised. Defining additional package sets
- would likely result in a large number of functionally broken packages, to
- nobody's benefit.
-
-
- Enabling grsecurity/PaX
-
-
- To make use of grsecurity/PaX on NixOS, add the following to your
- configuration.nix:
-
- security.grsecurity.enable = true;
-
- followed by
-
- # nixos-rebuild boot
- # reboot
-
-
- Enabling the grsecurity module overrides
- , to reduce the risk of
- misconfiguration.
- describes how to use a custom kernel package set.
-
-
- For most users, further configuration should be unnecessary. All users
- are encouraged to look over before
- using the system, however. If you experience problems, please refer to
- .
-
-
-
- Once booted into the new system, you can optionally use
- paxtest to exercise various PaX features:
-
-
-
-
-
- Declarative tuning
-
-
- The default configuration mode is strictly declarative. Some features
- simply cannot be changed at all after boot, while others are locked once the
- system is up and running. Moreover, changes to the configuration enter
- into effect only upon booting into the new system.
-
-
-
- The NixOS module exposes a limited number of options for tuning the behavior
- of grsecurity/PaX. These are options thought to be of particular interest
- to most users. For experts, further tuning is possible via
- (see
- ) and
- (the wikibook
- contains an
- exhaustive listing of grsecurity sysctl tunables).
-
-
-
-
- Manual tuning
-
-
- To permit manual tuning of grsecurity runtime parameters, set:
-
- security.grsecurity.lockTunables = false;
-
- Once booted into this system, grsecurity features that have a corresponding
- sysctl tunable can be changed without rebooting, either by switching into
- a new system profile or via the sysctl utility.
-
-
-
- To lock all grsecurity tunables until the next boot, do:
-
- # systemctl start grsec-lock
-
-
-
-
-
- Security considerations
-
-
- The NixOS kernel is built using upstream's recommended settings for a
- desktop deployment that generally favours security over performance. This
- section details deviations from upstream's recommendations that may
- compromise security.
-
- There may be additional problems not covered here!
-
-
-
-
-
-
- The following hardening features are disabled in the NixOS kernel:
-
- Kernel symbol hiding: rendered useless by redistributing
- kernel objects.
-
- Randomization of kernel structures: rendered useless by
- redistributing kernel objects.
-
- TCP simultaneous OPEN connection is permitted: breaking
- strict TCP conformance is inappropriate for a general purpose kernel.
- The trade-off is that an attacker may be able to deny outgoing
- connections if they are able to guess the source port allocated by your
- OS for that connection and also manage to initiate
- a TCP simultaneous OPEN on that port before the connection is actually
- established.
-
- Trusted path execution: a desirable feature, but
- requires some more work to operate smoothly on NixOS.
-
-
-
-
- The NixOS module conditionally weakens chroot
- restrictions to accommodate NixOS lightweight containers and sandboxed Nix
- builds. This can be problematic if the deployment also runs privileged
- network facing processes that rely on
- chroot for isolation.
-
-
-
- The NixOS kernel is patched to allow usermode helpers from anywhere in the
- Nix store. A usermode helper is an executable called by the kernel in
- certain circumstances, e.g., modprobe. Vanilla
- grsecurity only allows usermode helpers from paths typically owned by the
- super user. The NixOS kernel allows an attacker to inject malicious code
- into the Nix store which could then be executed by the kernel as a
- usermode helper.
-
-
-
- The following features are disabled because they overlap with
- vanilla kernel mechanisms:
-
-
- /proc hardening:
- use instead. This
- trades weaker protection for greater compatibility.
-
-
- dmesg restrictions:
- use instead
-
-
-
-
-
-
-
-
- Using a custom grsecurity/PaX kernel
-
-
- The NixOS kernel is likely to be either too permissive or too restrictive
- for many deployment scenarios. In addition to producing a kernel more
- suitable for a particular deployment, a custom kernel may improve security
- by depriving an attacker the ability to study the kernel object code, adding
- yet more guesswork to successfully carry out certain exploits.
-
-
-
- To build a custom kernel using upstream's recommended settings for server
- deployments, while still using the NixOS module:
-
- nixpkgs.config.packageOverrides = super: {
- linux_grsec_nixos = super.linux_grsec_nixos.override {
- extraConfig = ''
- GRKERNSEC_CONFIG_AUTO y
- GRKERNSEC_CONFIG_SERVER y
- GRKERNSEC_CONFIG_SECURITY y
- '';
- };
- };
-
-
-
-
- The grsecurity/PaX wikibook provides an exhaustive listing of
- kernel configuration options.
-
-
-
- The NixOS module makes several assumptions about the kernel and so
- may be incompatible with your customised kernel. Currently, the only way
- to work around these incompatibilities is to eschew the NixOS
- module.
-
-
-
- If not using the NixOS module, a custom grsecurity package set can
- be specified inline instead, as in
-
- boot.kernelPackages =
- let
- kernel = pkgs.linux_grsec_nixos.override {
- extraConfig = /* as above */;
- };
- self = pkgs.linuxPackagesFor kernel self;
- in self;
-
-
-
-
-
- Per-executable PaX flags
-
-
- Manual tuning of per-file PaX flags for executables in the Nix store is
- impossible on a properly configured system. If a package in Nixpkgs fails
- due to PaX, that is a bug in the package recipe and should be reported to
- the maintainer (including relevant dmesg output).
-
-
-
- For executables installed outside of the Nix store, PaX flags can be set
- using the paxctl utility:
-
- paxctl -czem foo
-
-
-
- paxctl overwrites files in-place.
-
-
- Equivalently, on file systems that support extended attributes:
-
- setfattr -n user.pax.flags -v em foo
-
-
-
-
-
-
-
- Issues and work-arounds
-
-
- User namespaces require CAP_SYS_ADMIN:
- consequently, unprivileged namespaces are unsupported. Applications that
- rely on namespaces for sandboxing must use a privileged helper. For chromium
- there is .
-
- Access to EFI runtime services is disabled by default:
- this plugs a potential code injection attack vector; use
- to override
- this behavior.
-
- User initiated autoloading of modules (e.g., when
- using fuse or loop devices) is disallowed; either load requisite modules
- as root or add them to .
-
- Virtualization: KVM is the preferred virtualization
- solution. Xen, Virtualbox, and VMWare are
- unsupported and most likely require a custom kernel.
-
-
-
- Attaching gdb to a running process is disallowed by
- default: unprivileged users can only ptrace processes that are children of
- the ptracing process. To relax this restriction, set
-
- boot.kernel.sysctl."kernel.grsecurity.harden_ptrace" = 0;
-
-
-
-
- Overflows in boot critical code (e.g., the root filesystem module) can
- render the system unbootable. Work around by setting
-
- boot.kernelParams = [ "pax_size_overflow_report_only" ];
-
-
-
-
- The modify_ldt
- 2 syscall is disabled
- by default. This restriction can interfere with programs designed to run
- legacy 16-bit or segmented 32-bit code. To support applications that rely
- on this syscall, set
-
- boot.kernel.sysctl."kernel.modify_ldt" = 1;
-
-
-
-
- The gitlab service ()
- requires a variant of the ruby interpreter
- built without `mprotect()` hardening, as in
-
- services.gitlab.packages.gitlab = pkgs.gitlab.override {
- ruby = pkgs.ruby.overrideAttrs (attrs: {
- postFixup = "paxmark m $out/bin/ruby";
- });
- };
-
-
-
-
-
-
-
- Grsecurity/PaX kernel parameters
-
-
- The NixOS kernel supports the following kernel command line parameters:
-
-
- pax_nouderef: disable UDEREF (separate kernel and
- user address spaces).
-
-
-
- pax_weakuderef: enable a faster but
- weaker variant of UDEREF on 64-bit processors with PCID support
- (check grep pcid /proc/cpuinfo).
-
-
-
- pax_sanitize_slab={off|fast|full}: control kernel
- slab object sanitization. Defaults to fast
-
-
-
- pax_size_overflow_report_only: log size overflow
- violations but leave the violating task running
-
-
-
- grsec_sysfs_restrict=[0|1]: toggle sysfs
- restrictions. The NixOS module sets this to 0
- for systemd compatibility
-
-
-
-
-
-
-
diff --git a/nixos/modules/security/lock-kernel-modules.nix b/nixos/modules/security/lock-kernel-modules.nix
index 260ec3fc94640c3dfa2a7a168928e6b7e9b4fc8f..c81521ed9b085c5856e897b413856dd6fadbfb3f 100644
--- a/nixos/modules/security/lock-kernel-modules.nix
+++ b/nixos/modules/security/lock-kernel-modules.nix
@@ -17,19 +17,27 @@ with lib;
};
config = mkIf config.security.lockKernelModules {
+ boot.kernelModules = concatMap (x:
+ if x.device != null
+ then
+ if x.fsType == "vfat"
+ then [ "vfat" "nls-cp437" "nls-iso8859-1" ]
+ else [ x.fsType ]
+ else []) config.system.build.fileSystems;
+
systemd.services.disable-kernel-module-loading = rec {
description = "Disable kernel module loading";
wantedBy = [ config.systemd.defaultUnit ];
- after = [ "systemd-udev-settle.service" "firewall.service" "systemd-modules-load.service" ] ++ wantedBy;
- script = "echo -n 1 > /proc/sys/kernel/modules_disabled";
+ after = [ "systemd-udev-settle.service" "firewall.service" "systemd-modules-load.service" ] ++ wantedBy;
unitConfig.ConditionPathIsReadWrite = "/proc/sys/kernel";
serviceConfig = {
Type = "oneshot";
RemainAfterExit = true;
+ ExecStart = "/bin/sh -c 'echo -n 1 >/proc/sys/kernel/modules_disabled'";
};
};
};
diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index 5632500df2e043c3ff64fc25b0ff2f094924b638..5ded36329f33333b45e32481888c863a6e156aab 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -281,7 +281,7 @@ let
"auth optional ${pkgs.pam_mount}/lib/security/pam_mount.so"}
${optionalString cfg.enableKwallet
("auth optional ${pkgs.plasma5.kwallet-pam}/lib/security/pam_kwallet5.so" +
- " kwalletd=${pkgs.libsForQt5.kwallet}/bin/kwalletd5")}
+ " kwalletd=${pkgs.libsForQt5.kwallet.bin}/bin/kwalletd5")}
'') + ''
${optionalString cfg.unixAuth
"auth sufficient pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} likeauth try_first_pass"}
@@ -350,7 +350,7 @@ let
"session optional ${pkgs.apparmor-pam}/lib/security/pam_apparmor.so order=user,group,default debug"}
${optionalString (cfg.enableKwallet)
("session optional ${pkgs.plasma5.kwallet-pam}/lib/security/pam_kwallet5.so" +
- " kwalletd=${pkgs.libsForQt5.kwallet}/bin/kwalletd5")}
+ " kwalletd=${pkgs.libsForQt5.kwallet.bin}/bin/kwalletd5")}
'');
};
@@ -486,8 +486,9 @@ in
++ optionals config.krb5.enable [pam_krb5 pam_ccreds]
++ optionals config.security.pam.enableOTPW [ pkgs.otpw ]
++ optionals config.security.pam.oath.enable [ pkgs.oathToolkit ]
- ++ optionals config.security.pam.enableU2F [ pkgs.pam_u2f ]
- ++ optionals config.security.pam.enableEcryptfs [ pkgs.ecryptfs ];
+ ++ optionals config.security.pam.enableU2F [ pkgs.pam_u2f ];
+
+ boot.supportedFilesystems = optionals config.security.pam.enableEcryptfs [ "ecryptfs" ];
security.wrappers = {
unix_chkpwd = {
@@ -495,10 +496,7 @@ in
owner = "root";
setuid = true;
};
- } // (if config.security.pam.enableEcryptfs then {
- "mount.ecryptfs_private".source = "${pkgs.ecryptfs.out}/bin/mount.ecryptfs_private";
- "umount.ecryptfs_private".source = "${pkgs.ecryptfs.out}/bin/umount.ecryptfs_private";
- } else {});
+ };
environment.etc =
mapAttrsToList (n: v: makePAMService v) config.security.pam.services;
@@ -521,6 +519,7 @@ in
ftp = {};
i3lock = {};
i3lock-color = {};
+ swaylock = {};
screen = {};
vlock = {};
xlock = {};
diff --git a/nixos/modules/security/pam_usb.nix b/nixos/modules/security/pam_usb.nix
index 6f811dab8d7610b42beab6d82e2b211edd518055..9bc73bf0b85c3202492b162c2b0fec64ebba16d2 100644
--- a/nixos/modules/security/pam_usb.nix
+++ b/nixos/modules/security/pam_usb.nix
@@ -22,7 +22,7 @@ in
description = ''
Enable USB login for all login systems that support it. For
more information, visit .
+ xlink:href="https://github.com/aluzzardi/pam_usb/wiki/Getting-Started#setting-up-devices-and-users" />.
'';
};
diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix
index a6dc8faaae983f49d2ee7aba127eee510fa06137..1f64213accd46fb38361edfadf8e62575b980625 100644
--- a/nixos/modules/security/wrappers/default.nix
+++ b/nixos/modules/security/wrappers/default.nix
@@ -155,7 +155,10 @@ in
###### implementation
config = {
- security.wrappers.fusermount.source = "${pkgs.fuse}/bin/fusermount";
+ security.wrappers = {
+ fusermount.source = "${pkgs.fuse}/bin/fusermount";
+ fusermount3.source = "${pkgs.fuse3}/bin/fusermount3";
+ };
boot.specialFileSystems.${parentWrapperDir} = {
fsType = "tmpfs";
diff --git a/nixos/modules/service-managers/docker.nix b/nixos/modules/service-managers/docker.nix
deleted file mode 100644
index 8e9c763b18afc2722e668a2ea603a30ea56a2c4f..0000000000000000000000000000000000000000
--- a/nixos/modules/service-managers/docker.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ 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
deleted file mode 100644
index 77e615d1e2e2f8ac3754876f5689a6933e3df633..0000000000000000000000000000000000000000
--- a/nixos/modules/service-managers/trivial.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ 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/amqp/rabbitmq.nix b/nixos/modules/services/amqp/rabbitmq.nix
index 61545a5acba8699bf93b7a90e3ab4ae5337459e5..f536d56d7c63da1cefa530abe03df2d9db6f04f6 100644
--- a/nixos/modules/services/amqp/rabbitmq.nix
+++ b/nixos/modules/services/amqp/rabbitmq.nix
@@ -105,7 +105,8 @@ in {
RABBITMQ_MNESIA_BASE = "${cfg.dataDir}/mnesia";
RABBITMQ_NODE_IP_ADDRESS = cfg.listenAddress;
RABBITMQ_NODE_PORT = toString cfg.port;
- RABBITMQ_SERVER_START_ARGS = "-rabbit error_logger tty -rabbit sasl_error_logger false";
+ RABBITMQ_LOGS = "-";
+ RABBITMQ_SASL_LOGS = "-";
RABBITMQ_PID_FILE = "${cfg.dataDir}/pid";
SYS_PREFIX = "";
RABBITMQ_ENABLED_PLUGINS_FILE = pkgs.writeText "enabled_plugins" ''
@@ -128,7 +129,7 @@ in {
preStart = ''
${optionalString (cfg.cookie != "") ''
echo -n ${cfg.cookie} > ${cfg.dataDir}/.erlang.cookie
- chmod 400 ${cfg.dataDir}/.erlang.cookie
+ chmod 600 ${cfg.dataDir}/.erlang.cookie
''}
'';
};
diff --git a/nixos/modules/services/backup/mysql-backup.nix b/nixos/modules/services/backup/mysql-backup.nix
index 28f607861f7763480ff3d7dc418d640f08a36f72..3f533fa457dc181e8a02dfc6c9de7584feeecf0c 100644
--- a/nixos/modules/services/backup/mysql-backup.nix
+++ b/nixos/modules/services/backup/mysql-backup.nix
@@ -6,10 +6,28 @@ let
inherit (pkgs) mysql gzip;
- cfg = config.services.mysqlBackup ;
- location = cfg.location ;
- mysqlBackupCron = db : ''
- ${cfg.period} ${cfg.user} ${mysql}/bin/mysqldump ${if cfg.singleTransaction then "--single-transaction" else ""} ${db} | ${gzip}/bin/gzip -c > ${location}/${db}.gz
+ cfg = config.services.mysqlBackup;
+ defaultUser = "mysqlbackup";
+
+ backupScript = ''
+ set -o pipefail
+ failed=""
+ ${concatMapStringsSep "\n" backupDatabaseScript cfg.databases}
+ if [ -n "$failed" ]; then
+ echo "Backup of database(s) failed:$failed"
+ exit 1
+ fi
+ '';
+ backupDatabaseScript = db: ''
+ dest="${cfg.location}/${db}.gz"
+ if ${mysql}/bin/mysqldump ${if cfg.singleTransaction then "--single-transaction" else ""} ${db} | ${gzip}/bin/gzip -c > $dest.tmp; then
+ mv $dest.tmp $dest
+ echo "Backed up to $dest"
+ else
+ echo "Failed to back up to $dest"
+ rm -f $dest.tmp
+ failed="$failed ${db}"
+ fi
'';
in
@@ -26,17 +44,16 @@ in
'';
};
- period = mkOption {
- default = "15 01 * * *";
+ calendar = mkOption {
+ type = types.str;
+ default = "01:15:00";
description = ''
- This option defines (in the format used by cron) when the
- databases should be dumped.
- The default is to update at 01:15 (at night) every day.
+ Configured when to run the backup service systemd unit (DayOfWeek Year-Month-Day Hour:Minute:Second).
'';
};
user = mkOption {
- default = "mysql";
+ default = defaultUser;
description = ''
User to be used to perform backup.
'';
@@ -66,16 +83,49 @@ in
};
- config = mkIf config.services.mysqlBackup.enable {
-
- services.cron.systemCronJobs = map mysqlBackupCron config.services.mysqlBackup.databases;
-
- system.activationScripts.mysqlBackup = stringAfter [ "stdio" "users" ]
- ''
- mkdir -m 0700 -p ${config.services.mysqlBackup.location}
- chown ${config.services.mysqlBackup.user} ${config.services.mysqlBackup.location}
- '';
-
+ config = mkIf cfg.enable {
+ users.extraUsers = optionalAttrs (cfg.user == defaultUser) (singleton
+ { name = defaultUser;
+ isSystemUser = true;
+ createHome = false;
+ home = cfg.location;
+ group = "nogroup";
+ });
+
+ services.mysql.ensureUsers = [{
+ name = cfg.user;
+ ensurePermissions = with lib;
+ let
+ privs = "SELECT, SHOW VIEW, TRIGGER, LOCK TABLES";
+ grant = db: nameValuePair "${db}.*" privs;
+ in
+ listToAttrs (map grant cfg.databases);
+ }];
+
+ systemd = {
+ timers."mysql-backup" = {
+ description = "Mysql backup timer";
+ wantedBy = [ "timers.target" ];
+ timerConfig = {
+ OnCalendar = cfg.calendar;
+ AccuracySec = "5m";
+ Unit = "mysql-backup.service";
+ };
+ };
+ services."mysql-backup" = {
+ description = "Mysql backup service";
+ enable = true;
+ serviceConfig = {
+ User = cfg.user;
+ PermissionsStartOnly = true;
+ };
+ preStart = ''
+ mkdir -m 0700 -p ${cfg.location}
+ chown -R ${cfg.user} ${cfg.location}
+ '';
+ script = backupScript;
+ };
+ };
};
}
diff --git a/nixos/modules/services/backup/znapzend.nix b/nixos/modules/services/backup/znapzend.nix
index 8c5af80c8fb7e77c32472f10125792c7ba1c5642..baf99930e3eb23c2d661826d86531ecc6fc600a2 100644
--- a/nixos/modules/services/backup/znapzend.nix
+++ b/nixos/modules/services/backup/znapzend.nix
@@ -27,7 +27,13 @@ in
noDestroy = mkOption {
type = types.bool;
default = false;
- description = "Does all changes to the filesystem except destroy";
+ description = "Does all changes to the filesystem except destroy.";
+ };
+
+ autoCreation = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Automatically create the dataset on dest if it does not exists.";
};
};
};
@@ -44,7 +50,7 @@ in
path = with pkgs; [ zfs mbuffer openssh ];
serviceConfig = {
- ExecStart = "${pkgs.znapzend}/bin/znapzend --logto=${cfg.logTo} --loglevel=${cfg.logLevel} ${optionalString cfg.noDestroy "--nodestroy"}";
+ ExecStart = "${pkgs.znapzend}/bin/znapzend --logto=${cfg.logTo} --loglevel=${cfg.logLevel} ${optionalString cfg.noDestroy "--nodestroy"} ${optionalString cfg.autoCreation "--autoCreation"}";
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
Restart = "on-failure";
};
diff --git a/nixos/modules/services/cluster/kubernetes/dashboard.nix b/nixos/modules/services/cluster/kubernetes/dashboard.nix
new file mode 100644
index 0000000000000000000000000000000000000000..75d71fccfda4b56a4d31be726f97ef0e859a16fc
--- /dev/null
+++ b/nixos/modules/services/cluster/kubernetes/dashboard.nix
@@ -0,0 +1,160 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+ cfg = config.services.kubernetes.addons.dashboard;
+
+ name = "gcr.io/google_containers/kubernetes-dashboard-amd64";
+ version = "v1.6.3";
+
+ image = pkgs.dockerTools.pullImage {
+ imageName = name;
+ imageTag = version;
+ sha256 = "1sf54d96nkgic9hir9c6p14gw24ns1k5d5a0r1sg414kjrvic0b4";
+ };
+in {
+ options.services.kubernetes.addons.dashboard = {
+ enable = mkEnableOption "kubernetes dashboard addon";
+
+ enableRBAC = mkOption {
+ description = "Whether to enable role based access control is enabled for kubernetes dashboard";
+ type = types.bool;
+ default = elem "RBAC" config.services.kubernetes.apiserver.authorizationMode;
+ };
+ };
+
+ config = mkIf cfg.enable {
+ services.kubernetes.kubelet.seedDockerImages = [image];
+
+ services.kubernetes.addonManager.addons = {
+ kubernetes-dashboard-deployment = {
+ kind = "Deployment";
+ apiVersion = "apps/v1beta1";
+ metadata = {
+ labels = {
+ k8s-addon = "kubernetes-dashboard.addons.k8s.io";
+ k8s-app = "kubernetes-dashboard";
+ version = version;
+ "kubernetes.io/cluster-service" = "true";
+ "addonmanager.kubernetes.io/mode" = "Reconcile";
+ };
+ name = "kubernetes-dashboard";
+ namespace = "kube-system";
+ };
+ spec = {
+ replicas = 1;
+ revisionHistoryLimit = 10;
+ selector.matchLabels."k8s-app" = "kubernetes-dashboard";
+ template = {
+ metadata = {
+ labels = {
+ k8s-addon = "kubernetes-dashboard.addons.k8s.io";
+ k8s-app = "kubernetes-dashboard";
+ version = version;
+ "kubernetes.io/cluster-service" = "true";
+ };
+ annotations = {
+ "scheduler.alpha.kubernetes.io/critical-pod" = "";
+ #"scheduler.alpha.kubernetes.io/tolerations" = ''[{"key":"CriticalAddonsOnly", "operator":"Exists"}]'';
+ };
+ };
+ spec = {
+ containers = [{
+ name = "kubernetes-dashboard";
+ image = "${name}:${version}";
+ ports = [{
+ containerPort = 9090;
+ protocol = "TCP";
+ }];
+ resources = {
+ limits = {
+ cpu = "100m";
+ memory = "50Mi";
+ };
+ requests = {
+ cpu = "100m";
+ memory = "50Mi";
+ };
+ };
+ livenessProbe = {
+ httpGet = {
+ path = "/";
+ port = 9090;
+ };
+ initialDelaySeconds = 30;
+ timeoutSeconds = 30;
+ };
+ }];
+ serviceAccountName = "kubernetes-dashboard";
+ tolerations = [{
+ key = "node-role.kubernetes.io/master";
+ effect = "NoSchedule";
+ }];
+ };
+ };
+ };
+ };
+
+ kubernetes-dashboard-svc = {
+ apiVersion = "v1";
+ kind = "Service";
+ metadata = {
+ labels = {
+ k8s-addon = "kubernetes-dashboard.addons.k8s.io";
+ k8s-app = "kubernetes-dashboard";
+ "kubernetes.io/cluster-service" = "true";
+ "kubernetes.io/name" = "KubeDashboard";
+ "addonmanager.kubernetes.io/mode" = "Reconcile";
+ };
+ name = "kubernetes-dashboard";
+ namespace = "kube-system";
+ };
+ spec = {
+ ports = [{
+ port = 80;
+ targetPort = 9090;
+ }];
+ selector.k8s-app = "kubernetes-dashboard";
+ };
+ };
+
+ kubernetes-dashboard-sa = {
+ apiVersion = "v1";
+ kind = "ServiceAccount";
+ metadata = {
+ labels = {
+ k8s-app = "kubernetes-dashboard";
+ k8s-addon = "kubernetes-dashboard.addons.k8s.io";
+ "addonmanager.kubernetes.io/mode" = "Reconcile";
+ };
+ name = "kubernetes-dashboard";
+ namespace = "kube-system";
+ };
+ };
+ } // (optionalAttrs cfg.enableRBAC {
+ kubernetes-dashboard-crb = {
+ apiVersion = "rbac.authorization.k8s.io/v1beta1";
+ kind = "ClusterRoleBinding";
+ metadata = {
+ name = "kubernetes-dashboard";
+ labels = {
+ k8s-app = "kubernetes-dashboard";
+ k8s-addon = "kubernetes-dashboard.addons.k8s.io";
+ "addonmanager.kubernetes.io/mode" = "Reconcile";
+ };
+ };
+ roleRef = {
+ apiGroup = "rbac.authorization.k8s.io";
+ kind = "ClusterRole";
+ name = "cluster-admin";
+ };
+ subjects = [{
+ kind = "ServiceAccount";
+ name = "kubernetes-dashboard";
+ namespace = "kube-system";
+ }];
+ };
+ });
+ };
+}
diff --git a/nixos/modules/services/cluster/kubernetes.nix b/nixos/modules/services/cluster/kubernetes/default.nix
similarity index 58%
rename from nixos/modules/services/cluster/kubernetes.nix
rename to nixos/modules/services/cluster/kubernetes/default.nix
index 4c9d9aad0e2dce8d0369dfac0a455d05045397f2..077953e4d4f8b725f97334cfccae9075231f88e5 100644
--- a/nixos/modules/services/cluster/kubernetes.nix
+++ b/nixos/modules/services/cluster/kubernetes/default.nix
@@ -15,19 +15,19 @@ let
config.Cmd = "/bin/pause";
};
- kubeconfig = pkgs.writeText "kubeconfig" (builtins.toJSON {
+ mkKubeConfig = name: cfg: pkgs.writeText "${name}-kubeconfig" (builtins.toJSON {
apiVersion = "v1";
kind = "Config";
clusters = [{
name = "local";
- cluster.certificate-authority = cfg.kubeconfig.caFile;
- cluster.server = cfg.kubeconfig.server;
+ cluster.certificate-authority = cfg.caFile;
+ cluster.server = cfg.server;
}];
users = [{
name = "kubelet";
user = {
- client-certificate = cfg.kubeconfig.certFile;
- client-key = cfg.kubeconfig.keyFile;
+ client-certificate = cfg.certFile;
+ client-key = cfg.keyFile;
};
}];
contexts = [{
@@ -39,12 +39,42 @@ let
}];
});
- policyFile = pkgs.writeText "kube-policy"
- (concatStringsSep "\n" (map builtins.toJSON cfg.apiserver.authorizationPolicy));
+ mkKubeConfigOptions = prefix: {
+ server = mkOption {
+ description = "${prefix} kube-apiserver server address.";
+ default = "http://${cfg.apiserver.address}:${toString cfg.apiserver.port}";
+ type = types.str;
+ };
+
+ caFile = mkOption {
+ description = "${prefix} certificate authrority file used to connect to kube-apiserver.";
+ type = types.nullOr types.path;
+ default = cfg.caFile;
+ };
+
+ certFile = mkOption {
+ description = "${prefix} client certificate file used to connect to kube-apiserver.";
+ type = types.nullOr types.path;
+ default = null;
+ };
+
+ keyFile = mkOption {
+ description = "${prefix} client key file used to connect to kube-apiserver.";
+ type = types.nullOr types.path;
+ default = null;
+ };
+ };
+
+ kubeConfigDefaults = {
+ server = mkDefault cfg.kubeconfig.server;
+ caFile = mkDefault cfg.kubeconfig.caFile;
+ certFile = mkDefault cfg.kubeconfig.certFile;
+ keyFile = mkDefault cfg.kubeconfig.keyFile;
+ };
cniConfig = pkgs.buildEnv {
name = "kubernetes-cni-config";
- paths = imap1 (i: entry:
+ paths = imap (i: entry:
pkgs.writeTextDir "${toString (10+i)}-${entry.type}.conf" (builtins.toJSON entry)
) cfg.kubelet.cni.config;
};
@@ -56,6 +86,45 @@ let
) cfg.kubelet.manifests;
};
+ addons = pkgs.runCommand "kubernetes-addons" { } ''
+ mkdir -p $out
+ # since we are mounting the addons to the addon manager, they need to be copied
+ ${concatMapStringsSep ";" (a: "cp -v ${a}/* $out/") (mapAttrsToList (name: addon:
+ pkgs.writeTextDir "${name}.json" (builtins.toJSON addon)
+ ) (cfg.addonManager.addons))}
+ '';
+
+ taintOptions = { name, ... }: {
+ options = {
+ key = mkOption {
+ description = "Key of taint.";
+ default = name;
+ type = types.str;
+ };
+ value = mkOption {
+ description = "Value of taint.";
+ type = types.str;
+ };
+ effect = mkOption {
+ description = "Effect of taint.";
+ example = "NoSchedule";
+ type = types.enum ["NoSchedule" "PreferNoSchedule" "NoExecute"];
+ };
+ };
+ };
+
+ taints = concatMapStringsSep "," (v: "${v.key}=${v.value}:${v.effect}") (mapAttrsToList (n: v: v) cfg.kubelet.taints);
+
+ # needed for flannel to pass options to docker
+ mkDockerOpts = pkgs.runCommand "mk-docker-opts" {
+ buildInputs = [ pkgs.makeWrapper ];
+ } ''
+ mkdir -p $out
+ cp ${pkgs.kubernetes.src}/cluster/centos/node/bin/mk-docker-opts.sh $out/mk-docker-opts.sh
+
+ # bashInteractive needed for `compgen`
+ makeWrapper ${pkgs.bashInteractive}/bin/bash $out/mk-docker-opts --add-flags "$out/mk-docker-opts.sh"
+ '';
in {
###### interface
@@ -80,7 +149,7 @@ in {
};
verbose = mkOption {
- description = "Kubernetes enable verbose mode for debugging";
+ description = "Kubernetes enable verbose mode for debugging.";
default = false;
type = types.bool;
};
@@ -93,48 +162,30 @@ in {
};
keyFile = mkOption {
- description = "Etcd key file";
+ description = "Etcd key file.";
default = null;
type = types.nullOr types.path;
};
certFile = mkOption {
- description = "Etcd cert file";
+ description = "Etcd cert file.";
default = null;
type = types.nullOr types.path;
};
caFile = mkOption {
- description = "Etcd ca file";
- default = null;
+ description = "Etcd ca file.";
+ default = cfg.caFile;
type = types.nullOr types.path;
};
};
- kubeconfig = {
- server = mkOption {
- description = "Kubernetes apiserver server address";
- default = "http://${cfg.apiserver.address}:${toString cfg.apiserver.port}";
- type = types.str;
- };
+ kubeconfig = mkKubeConfigOptions "Default kubeconfig";
- caFile = mkOption {
- description = "Certificate authrority file to use to connect to kuberentes apiserver";
- type = types.nullOr types.path;
- default = null;
- };
-
- certFile = mkOption {
- description = "Client certificate file to use to connect to kubernetes";
- type = types.nullOr types.path;
- default = null;
- };
-
- keyFile = mkOption {
- description = "Client key file to use to connect to kubernetes";
- type = types.nullOr types.path;
- default = null;
- };
+ caFile = mkOption {
+ description = "Default kubernetes certificate authority";
+ type = types.nullOr types.path;
+ default = null;
};
dataDir = mkOption {
@@ -143,13 +194,25 @@ in {
type = types.path;
};
+ featureGates = mkOption {
+ description = "List set of feature gates";
+ default = [];
+ type = types.listOf types.str;
+ };
+
apiserver = {
enable = mkOption {
- description = "Whether to enable kubernetes apiserver.";
+ description = "Whether to enable Kubernetes apiserver.";
default = false;
type = types.bool;
};
+ featureGates = mkOption {
+ description = "List set of feature gates";
+ default = cfg.featureGates;
+ type = types.listOf types.str;
+ };
+
address = mkOption {
description = "Kubernetes apiserver listening address.";
default = "127.0.0.1";
@@ -175,6 +238,14 @@ in {
type = types.nullOr types.str;
};
+ storageBackend = mkOption {
+ description = ''
+ Kubernetes apiserver storage backend.
+ '';
+ default = "etcd3";
+ type = types.enum ["etcd2" "etcd3"];
+ };
+
port = mkOption {
description = "Kubernetes apiserver listening port.";
default = 8080;
@@ -201,67 +272,69 @@ in {
clientCaFile = mkOption {
description = "Kubernetes apiserver CA file for client auth.";
- default = null;
+ default = cfg.caFile;
type = types.nullOr types.path;
};
- tokenAuth = mkOption {
+ tokenAuthFile = mkOption {
description = ''
Kubernetes apiserver token authentication file. See
'';
default = null;
- example = ''token,user,uid,"group1,group2,group3"'';
- type = types.nullOr types.lines;
+ type = types.nullOr types.path;
+ };
+
+ basicAuthFile = mkOption {
+ description = ''
+ Kubernetes apiserver basic authentication file. See
+
+ '';
+ default = pkgs.writeText "users" ''
+ kubernetes,admin,0
+ '';
+ type = types.nullOr types.path;
};
authorizationMode = mkOption {
description = ''
- Kubernetes apiserver authorization mode (AlwaysAllow/AlwaysDeny/ABAC). See
-
+ Kubernetes apiserver authorization mode (AlwaysAllow/AlwaysDeny/ABAC/RBAC). See
+
'';
- default = "AlwaysAllow";
- type = types.enum ["AlwaysAllow" "AlwaysDeny" "ABAC"];
+ default = ["RBAC"];
+ type = types.listOf (types.enum ["AlwaysAllow" "AlwaysDeny" "ABAC" "RBAC"]);
};
authorizationPolicy = mkOption {
description = ''
Kubernetes apiserver authorization policy file. See
-
+
'';
default = [];
- example = literalExample ''
- [
- {user = "admin";}
- {user = "scheduler"; readonly = true; kind= "pods";}
- {user = "scheduler"; kind = "bindings";}
- {user = "kubelet"; readonly = true; kind = "bindings";}
- {user = "kubelet"; kind = "events";}
- {user= "alice"; ns = "projectCaribou";}
- {user = "bob"; readonly = true; ns = "projectCaribou";}
- ]
- '';
type = types.listOf types.attrs;
};
allowPrivileged = mkOption {
- description = "Whether to allow privileged containers on kubernetes.";
+ description = "Whether to allow privileged containers on Kubernetes.";
default = true;
type = types.bool;
};
- portalNet = mkOption {
- description = "Kubernetes CIDR notation IP range from which to assign portal IPs";
- default = "10.10.10.10/24";
+ serviceClusterIpRange = mkOption {
+ description = ''
+ A CIDR notation IP range from which to assign service cluster IPs.
+ This must not overlap with any IP ranges assigned to nodes for pods.
+ '';
+ default = "10.0.0.0/24";
type = types.str;
};
runtimeConfig = mkOption {
description = ''
Api runtime configuration. See
-
+
'';
- default = "";
+ default = "authentication.k8s.io/v1beta1=true";
example = "api/all=false,api/v1=true";
type = types.str;
};
@@ -271,10 +344,11 @@ in {
Kubernetes admission control plugins to use. See
'';
- default = ["NamespaceLifecycle" "LimitRanger" "ServiceAccount" "ResourceQuota"];
+ default = ["NamespaceLifecycle" "LimitRanger" "ServiceAccount" "ResourceQuota" "DefaultStorageClass" "DefaultTolerationSeconds"];
example = [
"NamespaceLifecycle" "NamespaceExists" "LimitRanger"
"SecurityContextDeny" "ServiceAccount" "ResourceQuota"
+ "PodSecurityPolicy" "NodeRestriction" "DefaultStorageClass"
];
type = types.listOf types.str;
};
@@ -290,25 +364,25 @@ in {
};
kubeletClientCaFile = mkOption {
- description = "Path to a cert file for connecting to kubelet";
- default = null;
+ description = "Path to a cert file for connecting to kubelet.";
+ default = cfg.caFile;
type = types.nullOr types.path;
};
kubeletClientCertFile = mkOption {
- description = "Client certificate to use for connections to kubelet";
+ description = "Client certificate to use for connections to kubelet.";
default = null;
type = types.nullOr types.path;
};
kubeletClientKeyFile = mkOption {
- description = "Key to use for connections to kubelet";
+ description = "Key to use for connections to kubelet.";
default = null;
type = types.nullOr types.path;
};
kubeletHttps = mkOption {
- description = "Whether to use https for connections to kubelet";
+ description = "Whether to use https for connections to kubelet.";
default = true;
type = types.bool;
};
@@ -322,11 +396,17 @@ in {
scheduler = {
enable = mkOption {
- description = "Whether to enable kubernetes scheduler.";
+ description = "Whether to enable Kubernetes scheduler.";
default = false;
type = types.bool;
};
+ featureGates = mkOption {
+ description = "List set of feature gates";
+ default = cfg.featureGates;
+ type = types.listOf types.str;
+ };
+
address = mkOption {
description = "Kubernetes scheduler listening address.";
default = "127.0.0.1";
@@ -340,11 +420,13 @@ in {
};
leaderElect = mkOption {
- description = "Whether to start leader election before executing main loop";
+ description = "Whether to start leader election before executing main loop.";
type = types.bool;
- default = false;
+ default = true;
};
+ kubeconfig = mkKubeConfigOptions "Kubernetes scheduler";
+
extraOpts = mkOption {
description = "Kubernetes scheduler extra command line options.";
default = "";
@@ -354,11 +436,17 @@ in {
controllerManager = {
enable = mkOption {
- description = "Whether to enable kubernetes controller manager.";
+ description = "Whether to enable Kubernetes controller manager.";
default = false;
type = types.bool;
};
+ featureGates = mkOption {
+ description = "List set of feature gates";
+ default = cfg.featureGates;
+ type = types.listOf types.str;
+ };
+
address = mkOption {
description = "Kubernetes controller manager listening address.";
default = "127.0.0.1";
@@ -372,9 +460,9 @@ in {
};
leaderElect = mkOption {
- description = "Whether to start leader election before executing main loop";
+ description = "Whether to start leader election before executing main loop.";
type = types.bool;
- default = false;
+ default = true;
};
serviceAccountKeyFile = mkOption {
@@ -391,15 +479,11 @@ in {
Kubernetes controller manager certificate authority file included in
service account's token secret.
'';
- default = null;
+ default = cfg.caFile;
type = types.nullOr types.path;
};
- clusterCidr = mkOption {
- description = "Kubernetes controller manager CIDR Range for Pods in cluster";
- default = "10.10.0.0/16";
- type = types.str;
- };
+ kubeconfig = mkKubeConfigOptions "Kubernetes controller manager";
extraOpts = mkOption {
description = "Kubernetes controller manager extra command line options.";
@@ -410,19 +494,25 @@ in {
kubelet = {
enable = mkOption {
- description = "Whether to enable kubernetes kubelet.";
+ description = "Whether to enable Kubernetes kubelet.";
default = false;
type = types.bool;
};
- registerNode = mkOption {
- description = "Whether to auto register kubelet with API server.";
- default = true;
- type = types.bool;
+ featureGates = mkOption {
+ description = "List set of feature gates";
+ default = cfg.featureGates;
+ type = types.listOf types.str;
+ };
+
+ seedDockerImages = mkOption {
+ description = "List of docker images to preload on system";
+ default = [];
+ type = types.listOf types.package;
};
- registerSchedulable = mkOption {
- description = "Register the node as schedulable. No-op if register-node is false.";
+ registerNode = mkOption {
+ description = "Whether to auto register kubelet with API server.";
default = true;
type = types.bool;
};
@@ -451,6 +541,12 @@ in {
type = types.nullOr types.path;
};
+ clientCaFile = mkOption {
+ description = "Kubernetes apiserver CA file for client authentication.";
+ default = cfg.caFile;
+ type = types.nullOr types.path;
+ };
+
healthz = {
bind = mkOption {
description = "Kubernetes kubelet healthz listening address.";
@@ -466,13 +562,13 @@ in {
};
hostname = mkOption {
- description = "Kubernetes kubelet hostname override";
+ description = "Kubernetes kubelet hostname override.";
default = config.networking.hostName;
type = types.str;
};
allowPrivileged = mkOption {
- description = "Whether to allow kubernetes containers to request privileged mode.";
+ description = "Whether to allow Kubernetes containers to request privileged mode.";
default = true;
type = types.bool;
};
@@ -484,32 +580,32 @@ in {
};
clusterDns = mkOption {
- description = "Use alternative dns.";
- default = "10.10.0.1";
+ description = "Use alternative DNS.";
+ default = "10.1.0.1";
type = types.str;
};
clusterDomain = mkOption {
description = "Use alternative domain.";
- default = "cluster.local";
+ default = config.services.kubernetes.addons.dns.clusterDomain;
type = types.str;
};
networkPlugin = mkOption {
- description = "Network plugin to use by kubernetes";
+ description = "Network plugin to use by Kubernetes.";
type = types.nullOr (types.enum ["cni" "kubenet"]);
default = "kubenet";
};
cni = {
packages = mkOption {
- description = "List of network plugin packages to install";
+ description = "List of network plugin packages to install.";
type = types.listOf types.package;
default = [];
};
config = mkOption {
- description = "Kubernetes CNI configuration";
+ description = "Kubernetes CNI configuration.";
type = types.listOf types.attrs;
default = [];
example = literalExample ''
@@ -536,11 +632,37 @@ in {
};
manifests = mkOption {
- description = "List of manifests to bootstrap with kubelet";
+ description = "List of manifests to bootstrap with kubelet (only pods can be created as manifest entry)";
type = types.attrsOf types.attrs;
default = {};
};
+ applyManifests = mkOption {
+ description = "Whether to apply manifests (this is true for master node).";
+ default = false;
+ type = types.bool;
+ };
+
+ unschedulable = mkOption {
+ description = "Whether to set node taint to unschedulable=true as it is the case of node that has only master role.";
+ default = false;
+ type = types.bool;
+ };
+
+ taints = mkOption {
+ description = "Node taints (https://kubernetes.io/docs/concepts/configuration/assign-pod-node/).";
+ default = {};
+ type = types.attrsOf (types.submodule [ taintOptions ]);
+ };
+
+ nodeIp = mkOption {
+ description = "IP address of the node. If set, kubelet will use this IP address for the node.";
+ default = null;
+ type = types.nullOr types.str;
+ };
+
+ kubeconfig = mkKubeConfigOptions "Kubelet";
+
extraOpts = mkOption {
description = "Kubernetes kubelet extra command line options.";
default = "";
@@ -550,17 +672,25 @@ in {
proxy = {
enable = mkOption {
- description = "Whether to enable kubernetes proxy.";
+ description = "Whether to enable Kubernetes proxy.";
default = false;
type = types.bool;
};
+ featureGates = mkOption {
+ description = "List set of feature gates";
+ default = cfg.featureGates;
+ type = types.listOf types.str;
+ };
+
address = mkOption {
description = "Kubernetes proxy listening address.";
default = "0.0.0.0";
type = types.str;
};
+ kubeconfig = mkKubeConfigOptions "Kubernetes proxy";
+
extraOpts = mkOption {
description = "Kubernetes proxy extra command line options.";
default = "";
@@ -568,57 +698,109 @@ in {
};
};
- dns = {
- enable = mkEnableOption "kubernetes dns service.";
-
- port = mkOption {
- description = "Kubernetes dns listening port";
- default = 53;
- type = types.int;
+ addonManager = {
+ enable = mkOption {
+ description = "Whether to enable Kubernetes addon manager.";
+ default = false;
+ type = types.bool;
};
- domain = mkOption {
- description = "Kuberntes dns domain under which to create names.";
- default = cfg.kubelet.clusterDomain;
- type = types.str;
+ addons = mkOption {
+ description = "Kubernetes addons (any kind of Kubernetes resource can be an addon).";
+ default = { };
+ type = types.attrsOf (types.either types.attrs (types.listOf types.attrs));
+ example = literalExample ''
+ {
+ "my-service" = {
+ "apiVersion" = "v1";
+ "kind" = "Service";
+ "metadata" = {
+ "name" = "my-service";
+ "namespace" = "default";
+ };
+ "spec" = { ... };
+ };
+ }
+ // import { cfg = config.services.kubernetes; };
+ '';
};
+ };
- extraOpts = mkOption {
- description = "Kubernetes dns extra command line options.";
- default = "";
- type = types.str;
- };
+ path = mkOption {
+ description = "Packages added to the services' PATH environment variable. Both the bin and sbin subdirectories of each package are added.";
+ type = types.listOf types.package;
+ default = [];
};
+
+ clusterCidr = mkOption {
+ description = "Kubernetes controller manager and proxy CIDR Range for Pods in cluster.";
+ default = "10.1.0.0/16";
+ type = types.str;
+ };
+
+ flannel.enable = mkOption {
+ description = "Whether to enable flannel networking";
+ default = false;
+ type = types.bool;
+ };
+
};
###### implementation
config = mkMerge [
(mkIf cfg.kubelet.enable {
+ services.kubernetes.kubelet.seedDockerImages = [infraContainer];
+
+ systemd.services.kubelet-bootstrap = {
+ description = "Boostrap Kubelet";
+ wantedBy = ["kubernetes.target"];
+ after = ["docker.service" "network.target"];
+ path = with pkgs; [ docker ];
+ script = ''
+ ${concatMapStrings (img: ''
+ echo "Seeding docker image: ${img}"
+ docker load <${img}
+ '') cfg.kubelet.seedDockerImages}
+
+ rm /opt/cni/bin/* || true
+ ${concatMapStrings (package: ''
+ echo "Linking cni package: ${package}"
+ ln -fs ${package.plugins}/* /opt/cni/bin
+ '') cfg.kubelet.cni.packages}
+ '';
+ serviceConfig = {
+ Slice = "kubernetes.slice";
+ Type = "oneshot";
+ };
+ };
+
systemd.services.kubelet = {
description = "Kubernetes Kubelet Service";
wantedBy = [ "kubernetes.target" ];
- after = [ "network.target" "docker.service" "kube-apiserver.service" ];
- path = with pkgs; [ gitMinimal openssh docker utillinux iproute ethtool thin-provisioning-tools iptables ];
- preStart = ''
- docker load < ${infraContainer}
- rm /opt/cni/bin/* || true
- ${concatMapStringsSep "\n" (p: "ln -fs ${p.plugins}/* /opt/cni/bin") cfg.kubelet.cni.packages}
- '';
+ after = [ "network.target" "docker.service" "kube-apiserver.service" "kubelet-bootstrap.service" ];
+ path = with pkgs; [ gitMinimal openssh docker utillinux iproute ethtool thin-provisioning-tools iptables socat ] ++ cfg.path;
serviceConfig = {
Slice = "kubernetes.slice";
ExecStart = ''${cfg.package}/bin/kubelet \
- --pod-manifest-path=${manifests} \
- --kubeconfig=${kubeconfig} \
+ ${optionalString cfg.kubelet.applyManifests
+ "--pod-manifest-path=${manifests}"} \
+ ${optionalString (taints != "")
+ "--register-with-taints=${taints}"} \
+ --kubeconfig=${mkKubeConfig "kubelet" cfg.kubelet.kubeconfig} \
--require-kubeconfig \
--address=${cfg.kubelet.address} \
--port=${toString cfg.kubelet.port} \
--register-node=${boolToString cfg.kubelet.registerNode} \
- --register-schedulable=${boolToString cfg.kubelet.registerSchedulable} \
${optionalString (cfg.kubelet.tlsCertFile != null)
"--tls-cert-file=${cfg.kubelet.tlsCertFile}"} \
${optionalString (cfg.kubelet.tlsKeyFile != null)
"--tls-private-key-file=${cfg.kubelet.tlsKeyFile}"} \
+ ${optionalString (cfg.kubelet.clientCaFile != null)
+ "--client-ca-file=${cfg.kubelet.clientCaFile}"} \
+ --authentication-token-webhook \
+ --authentication-token-webhook-cache-ttl="10s" \
+ --authorization-mode=Webhook \
--healthz-bind-address=${cfg.kubelet.healthz.bind} \
--healthz-port=${toString cfg.kubelet.healthz.port} \
--hostname-override=${cfg.kubelet.hostname} \
@@ -633,8 +815,11 @@ in {
${optionalString (cfg.kubelet.networkPlugin != null)
"--network-plugin=${cfg.kubelet.networkPlugin}"} \
--cni-conf-dir=${cniConfig} \
- --reconcile-cidr \
--hairpin-mode=hairpin-veth \
+ ${optionalString (cfg.kubelet.nodeIp != null)
+ "--node-ip=${cfg.kubelet.nodeIp}"} \
+ ${optionalString (cfg.kubelet.featureGates != [])
+ "--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.kubelet.featureGates}"} \
${optionalString cfg.verbose "--v=6 --log_flush_frequency=1s"} \
${cfg.kubelet.extraOpts}
'';
@@ -642,15 +827,28 @@ in {
};
};
+ # Allways include cni plugins
+ services.kubernetes.kubelet.cni.packages = [pkgs.cni];
+
+ boot.kernelModules = ["br_netfilter"];
+
+ services.kubernetes.kubelet.kubeconfig = kubeConfigDefaults;
+ })
+
+ (mkIf (cfg.kubelet.applyManifests && cfg.kubelet.enable) {
environment.etc = mapAttrs' (name: manifest:
nameValuePair "kubernetes/manifests/${name}.json" {
text = builtins.toJSON manifest;
mode = "0755";
}
) cfg.kubelet.manifests;
+ })
- # Allways include cni plugins
- services.kubernetes.kubelet.cni.packages = [pkgs.cni];
+ (mkIf (cfg.kubelet.unschedulable && cfg.kubelet.enable) {
+ services.kubernetes.kubelet.taints.unschedulable = {
+ value = "true";
+ effect = "NoSchedule";
+ };
})
(mkIf cfg.apiserver.enable {
@@ -677,9 +875,11 @@ in {
"--tls-cert-file=${cfg.apiserver.tlsCertFile}"} \
${optionalString (cfg.apiserver.tlsKeyFile != null)
"--tls-private-key-file=${cfg.apiserver.tlsKeyFile}"} \
- ${optionalString (cfg.apiserver.tokenAuth != null)
- "--token-auth-file=${cfg.apiserver.tokenAuth}"} \
- --kubelet-https=${boolToString cfg.apiserver.kubeletHttps} \
+ ${optionalString (cfg.apiserver.tokenAuthFile != null)
+ "--token-auth-file=${cfg.apiserver.tokenAuthFile}"} \
+ ${optionalString (cfg.apiserver.basicAuthFile != null)
+ "--basic-auth-file=${cfg.apiserver.basicAuthFile}"} \
+ --kubelet-https=${if cfg.apiserver.kubeletHttps then "true" else "false"} \
${optionalString (cfg.apiserver.kubeletClientCaFile != null)
"--kubelet-certificate-authority=${cfg.apiserver.kubeletClientCaFile}"} \
${optionalString (cfg.apiserver.kubeletClientCertFile != null)
@@ -688,11 +888,15 @@ in {
"--kubelet-client-key=${cfg.apiserver.kubeletClientKeyFile}"} \
${optionalString (cfg.apiserver.clientCaFile != null)
"--client-ca-file=${cfg.apiserver.clientCaFile}"} \
- --authorization-mode=${cfg.apiserver.authorizationMode} \
- ${optionalString (cfg.apiserver.authorizationMode == "ABAC")
- "--authorization-policy-file=${policyFile}"} \
+ --authorization-mode=${concatStringsSep "," cfg.apiserver.authorizationMode} \
+ ${optionalString (elem "ABAC" cfg.apiserver.authorizationMode)
+ "--authorization-policy-file=${
+ pkgs.writeText "kube-auth-policy.jsonl"
+ (concatMapStringsSep "\n" (l: builtins.toJSON l) cfg.apiserver.authorizationPolicy)
+ }"
+ } \
--secure-port=${toString cfg.apiserver.securePort} \
- --service-cluster-ip-range=${cfg.apiserver.portalNet} \
+ --service-cluster-ip-range=${cfg.apiserver.serviceClusterIpRange} \
${optionalString (cfg.apiserver.runtimeConfig != "")
"--runtime-config=${cfg.apiserver.runtimeConfig}"} \
--admission_control=${concatStringsSep "," cfg.apiserver.admissionControl} \
@@ -700,6 +904,9 @@ in {
"--service-account-key-file=${cfg.apiserver.serviceAccountKeyFile}"} \
${optionalString cfg.verbose "--v=6"} \
${optionalString cfg.verbose "--log-flush-frequency=1s"} \
+ --storage-backend=${cfg.apiserver.storageBackend} \
+ ${optionalString (cfg.kubelet.featureGates != [])
+ "--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.kubelet.featureGates}"} \
${cfg.apiserver.extraOpts}
'';
WorkingDirectory = cfg.dataDir;
@@ -723,9 +930,11 @@ in {
--address=${cfg.scheduler.address} \
--port=${toString cfg.scheduler.port} \
--leader-elect=${boolToString cfg.scheduler.leaderElect} \
- --kubeconfig=${kubeconfig} \
+ --kubeconfig=${mkKubeConfig "kube-scheduler" cfg.scheduler.kubeconfig} \
${optionalString cfg.verbose "--v=6"} \
${optionalString cfg.verbose "--log-flush-frequency=1s"} \
+ ${optionalString (cfg.scheduler.featureGates != [])
+ "--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.scheduler.featureGates}"} \
${cfg.scheduler.extraOpts}
'';
WorkingDirectory = cfg.dataDir;
@@ -733,6 +942,8 @@ in {
Group = "kubernetes";
};
};
+
+ services.kubernetes.scheduler.kubeconfig = kubeConfigDefaults;
})
(mkIf cfg.controllerManager.enable {
@@ -747,16 +958,19 @@ in {
ExecStart = ''${cfg.package}/bin/kube-controller-manager \
--address=${cfg.controllerManager.address} \
--port=${toString cfg.controllerManager.port} \
- --kubeconfig=${kubeconfig} \
+ --kubeconfig=${mkKubeConfig "kube-controller-manager" cfg.controllerManager.kubeconfig} \
--leader-elect=${boolToString cfg.controllerManager.leaderElect} \
${if (cfg.controllerManager.serviceAccountKeyFile!=null)
then "--service-account-private-key-file=${cfg.controllerManager.serviceAccountKeyFile}"
else "--service-account-private-key-file=/var/run/kubernetes/apiserver.key"} \
- ${optionalString (cfg.controllerManager.rootCaFile!=null)
- "--root-ca-file=${cfg.controllerManager.rootCaFile}"} \
- ${optionalString (cfg.controllerManager.clusterCidr!=null)
- "--cluster-cidr=${cfg.controllerManager.clusterCidr}"} \
+ ${if (cfg.controllerManager.rootCaFile!=null)
+ then "--root-ca-file=${cfg.controllerManager.rootCaFile}"
+ else "--root-ca-file=/var/run/kubernetes/apiserver.crt"} \
+ ${optionalString (cfg.clusterCidr!=null)
+ "--cluster-cidr=${cfg.clusterCidr}"} \
--allocate-node-cidrs=true \
+ ${optionalString (cfg.controllerManager.featureGates != [])
+ "--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.controllerManager.featureGates}"} \
${optionalString cfg.verbose "--v=6"} \
${optionalString cfg.verbose "--log-flush-frequency=1s"} \
${cfg.controllerManager.extraOpts}
@@ -765,7 +979,10 @@ in {
User = "kubernetes";
Group = "kubernetes";
};
+ path = cfg.path;
};
+
+ services.kubernetes.controllerManager.kubeconfig = kubeConfigDefaults;
})
(mkIf cfg.proxy.enable {
@@ -773,65 +990,79 @@ in {
description = "Kubernetes Proxy Service";
wantedBy = [ "kubernetes.target" ];
after = [ "kube-apiserver.service" ];
- path = [pkgs.iptables];
+ path = [pkgs.iptables pkgs.conntrack_tools];
serviceConfig = {
Slice = "kubernetes.slice";
ExecStart = ''${cfg.package}/bin/kube-proxy \
- --kubeconfig=${kubeconfig} \
+ --kubeconfig=${mkKubeConfig "kube-proxy" cfg.proxy.kubeconfig} \
--bind-address=${cfg.proxy.address} \
+ ${optionalString (cfg.proxy.featureGates != [])
+ "--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.proxy.featureGates}"} \
${optionalString cfg.verbose "--v=6"} \
${optionalString cfg.verbose "--log-flush-frequency=1s"} \
+ ${optionalString (cfg.clusterCidr!=null)
+ "--cluster-cidr=${cfg.clusterCidr}"} \
${cfg.proxy.extraOpts}
'';
WorkingDirectory = cfg.dataDir;
};
};
- })
- (mkIf cfg.dns.enable {
- systemd.services.kube-dns = {
- description = "Kubernetes Dns Service";
- wantedBy = [ "kubernetes.target" ];
- after = [ "kube-apiserver.service" ];
- serviceConfig = {
- Slice = "kubernetes.slice";
- ExecStart = ''${cfg.package}/bin/kube-dns \
- --kubecfg-file=${kubeconfig} \
- --dns-port=${toString cfg.dns.port} \
- --domain=${cfg.dns.domain} \
- ${optionalString cfg.verbose "--v=6"} \
- ${optionalString cfg.verbose "--log-flush-frequency=1s"} \
- ${cfg.dns.extraOpts}
- '';
- WorkingDirectory = cfg.dataDir;
- User = "kubernetes";
- Group = "kubernetes";
- AmbientCapabilities = "cap_net_bind_service";
- SendSIGHUP = true;
- };
- };
- })
+ # kube-proxy needs iptables
+ networking.firewall.enable = mkDefault true;
- (mkIf cfg.kubelet.enable {
- boot.kernelModules = ["br_netfilter"];
+ services.kubernetes.proxy.kubeconfig = kubeConfigDefaults;
})
(mkIf (any (el: el == "master") cfg.roles) {
virtualisation.docker.enable = mkDefault true;
services.kubernetes.kubelet.enable = mkDefault true;
services.kubernetes.kubelet.allowPrivileged = mkDefault true;
+ services.kubernetes.kubelet.applyManifests = mkDefault true;
services.kubernetes.apiserver.enable = mkDefault true;
services.kubernetes.scheduler.enable = mkDefault true;
services.kubernetes.controllerManager.enable = mkDefault true;
services.etcd.enable = mkDefault (cfg.etcd.servers == ["http://127.0.0.1:2379"]);
+ services.kubernetes.addonManager.enable = mkDefault true;
+ services.kubernetes.proxy.enable = mkDefault true;
+ })
+
+ # if this node is only a master make it unschedulable by default
+ (mkIf (all (el: el == "master") cfg.roles) {
+ services.kubernetes.kubelet.unschedulable = mkDefault true;
})
(mkIf (any (el: el == "node") cfg.roles) {
- virtualisation.docker.enable = mkDefault true;
- virtualisation.docker.logDriver = mkDefault "json-file";
+ virtualisation.docker = {
+ enable = mkDefault true;
+
+ # kubernetes needs access to logs
+ logDriver = mkDefault "json-file";
+
+ # iptables must be disabled for kubernetes
+ extraOptions = "--iptables=false --ip-masq=false";
+ };
+
services.kubernetes.kubelet.enable = mkDefault true;
services.kubernetes.proxy.enable = mkDefault true;
- services.kubernetes.dns.enable = mkDefault true;
+ })
+
+ (mkIf cfg.addonManager.enable {
+ environment.etc."kubernetes/addons".source = "${addons}/";
+
+ systemd.services.kube-addon-manager = {
+ description = "Kubernetes addon manager";
+ wantedBy = [ "kubernetes.target" ];
+ after = [ "kube-apiserver.service" ];
+ environment.ADDON_PATH = "/etc/kubernetes/addons/";
+ serviceConfig = {
+ Slice = "kubernetes.slice";
+ ExecStart = "${cfg.package}/bin/kube-addons";
+ WorkingDirectory = cfg.dataDir;
+ User = "kubernetes";
+ Group = "kubernetes";
+ };
+ };
})
(mkIf (
@@ -839,8 +1070,7 @@ in {
cfg.scheduler.enable ||
cfg.controllerManager.enable ||
cfg.kubelet.enable ||
- cfg.proxy.enable ||
- cfg.dns.enable
+ cfg.proxy.enable
) {
systemd.targets.kubernetes = {
description = "Kubernetes";
@@ -864,6 +1094,54 @@ in {
createHome = true;
};
users.extraGroups.kubernetes.gid = config.ids.gids.kubernetes;
+
+ # dns addon is enabled by default
+ services.kubernetes.addons.dns.enable = mkDefault true;
+ })
+
+ (mkIf cfg.flannel.enable {
+ services.flannel = {
+ enable = mkDefault true;
+ network = mkDefault cfg.clusterCidr;
+ etcd = mkDefault {
+ endpoints = cfg.etcd.servers;
+ inherit (cfg.etcd) caFile certFile keyFile;
+ };
+ };
+
+ services.kubernetes.kubelet = {
+ networkPlugin = mkDefault "cni";
+ cni.config = mkDefault [{
+ name = "mynet";
+ type = "flannel";
+ delegate = {
+ isDefaultGateway = true;
+ bridge = "docker0";
+ };
+ }];
+ };
+
+ systemd.services."mk-docker-opts" = {
+ description = "Pre-Docker Actions";
+ wantedBy = [ "flannel.service" ];
+ before = [ "docker.service" ];
+ after = [ "flannel.service" ];
+ path = [ pkgs.gawk pkgs.gnugrep ];
+ script = ''
+ mkdir -p /run/flannel
+ ${mkDockerOpts}/mk-docker-opts -d /run/flannel/docker
+ '';
+ serviceConfig.Type = "oneshot";
+ };
+ systemd.services.docker.serviceConfig.EnvironmentFile = "/run/flannel/docker";
+
+ # read environment variables generated by mk-docker-opts
+ virtualisation.docker.extraOptions = "$DOCKER_OPTS";
+
+ networking.firewall.allowedUDPPorts = [
+ 8285 # flannel udp
+ 8472 # flannel vxlan
+ ];
})
];
}
diff --git a/nixos/modules/services/cluster/kubernetes/dns.nix b/nixos/modules/services/cluster/kubernetes/dns.nix
new file mode 100644
index 0000000000000000000000000000000000000000..226fdadffd1a278b2a0315c84a0c0ef02b59821e
--- /dev/null
+++ b/nixos/modules/services/cluster/kubernetes/dns.nix
@@ -0,0 +1,311 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+ version = "1.14.4";
+
+ k8s-dns-kube-dns = pkgs.dockerTools.pullImage {
+ imageName = "gcr.io/google_containers/k8s-dns-kube-dns-amd64";
+ imageTag = version;
+ sha256 = "0q97xfqrigrfjl2a9cxl5in619py0zv44gch09jm8gqjkxl80imp";
+ };
+
+ k8s-dns-dnsmasq-nanny = pkgs.dockerTools.pullImage {
+ imageName = "gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64";
+ imageTag = version;
+ sha256 = "051w5ca4qb88mwva4hbnh9xzlsvv7k1mbk3wz50lmig2mqrqqx6c";
+ };
+
+ k8s-dns-sidecar = pkgs.dockerTools.pullImage {
+ imageName = "gcr.io/google_containers/k8s-dns-sidecar-amd64";
+ imageTag = version;
+ sha256 = "1z0d129bcm8i2cqq36x5jhnrv9hirj8c6kjrmdav8vgf7py78vsm";
+ };
+
+ cfg = config.services.kubernetes.addons.dns;
+in {
+ options.services.kubernetes.addons.dns = {
+ enable = mkEnableOption "kubernetes dns addon";
+
+ clusterIp = mkOption {
+ description = "Dns addon clusterIP";
+
+ # this default is also what kubernetes users
+ default = (
+ concatStringsSep "." (
+ take 3 (splitString "." config.services.kubernetes.apiserver.serviceClusterIpRange
+ ))
+ ) + ".254";
+ type = types.str;
+ };
+
+ clusterDomain = mkOption {
+ description = "Dns cluster domain";
+ default = "cluster.local";
+ type = types.str;
+ };
+ };
+
+ config = mkIf cfg.enable {
+ services.kubernetes.kubelet.seedDockerImages = [
+ k8s-dns-kube-dns
+ k8s-dns-dnsmasq-nanny
+ k8s-dns-sidecar
+ ];
+
+ services.kubernetes.addonManager.addons = {
+ kubedns-deployment = {
+ apiVersion = "apps/v1beta1";
+ kind = "Deployment";
+ metadata = {
+ labels = {
+ "addonmanager.kubernetes.io/mode" = "Reconcile";
+ "k8s-app" = "kube-dns";
+ "kubernetes.io/cluster-service" = "true";
+ };
+ name = "kube-dns";
+ namespace = "kube-system";
+ };
+ spec = {
+ selector.matchLabels."k8s-app" = "kube-dns";
+ strategy = {
+ rollingUpdate = {
+ maxSurge = "10%";
+ maxUnavailable = 0;
+ };
+ };
+ template = {
+ metadata = {
+ annotations."scheduler.alpha.kubernetes.io/critical-pod" = "";
+ labels.k8s-app = "kube-dns";
+ };
+ spec = {
+ containers = [
+ {
+ name = "kubedns";
+ args = [
+ "--domain=${cfg.clusterDomain}"
+ "--dns-port=10053"
+ "--config-dir=/kube-dns-config"
+ "--v=2"
+ ];
+ env = [
+ {
+ name = "PROMETHEUS_PORT";
+ value = "10055";
+ }
+ ];
+ image = "gcr.io/google_containers/k8s-dns-kube-dns-amd64:${version}";
+ livenessProbe = {
+ failureThreshold = 5;
+ httpGet = {
+ path = "/healthcheck/kubedns";
+ port = 10054;
+ scheme = "HTTP";
+ };
+ initialDelaySeconds = 60;
+ successThreshold = 1;
+ timeoutSeconds = 5;
+ };
+ ports = [
+ {
+ containerPort = 10053;
+ name = "dns-local";
+ protocol = "UDP";
+ }
+ {
+ containerPort = 10053;
+ name = "dns-tcp-local";
+ protocol = "TCP";
+ }
+ {
+ containerPort = 10055;
+ name = "metrics";
+ protocol = "TCP";
+ }
+ ];
+ readinessProbe = {
+ httpGet = {
+ path = "/readiness";
+ port = 8081;
+ scheme = "HTTP";
+ };
+ initialDelaySeconds = 3;
+ timeoutSeconds = 5;
+ };
+ resources = {
+ limits.memory = "170Mi";
+ requests = {
+ cpu = "100m";
+ memory = "70Mi";
+ };
+ };
+ volumeMounts = [
+ {
+ mountPath = "/kube-dns-config";
+ name = "kube-dns-config";
+ }
+ ];
+ }
+ {
+ args = [
+ "-v=2"
+ "-logtostderr"
+ "-configDir=/etc/k8s/dns/dnsmasq-nanny"
+ "-restartDnsmasq=true"
+ "--"
+ "-k"
+ "--cache-size=1000"
+ "--log-facility=-"
+ "--server=/${cfg.clusterDomain}/127.0.0.1#10053"
+ "--server=/in-addr.arpa/127.0.0.1#10053"
+ "--server=/ip6.arpa/127.0.0.1#10053"
+ ];
+ image = "gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:${version}";
+ livenessProbe = {
+ failureThreshold = 5;
+ httpGet = {
+ path = "/healthcheck/dnsmasq";
+ port = 10054;
+ scheme = "HTTP";
+ };
+ initialDelaySeconds = 60;
+ successThreshold = 1;
+ timeoutSeconds = 5;
+ };
+ name = "dnsmasq";
+ ports = [
+ {
+ containerPort = 53;
+ name = "dns";
+ protocol = "UDP";
+ }
+ {
+ containerPort = 53;
+ name = "dns-tcp";
+ protocol = "TCP";
+ }
+ ];
+ resources = {
+ requests = {
+ cpu = "150m";
+ memory = "20Mi";
+ };
+ };
+ volumeMounts = [
+ {
+ mountPath = "/etc/k8s/dns/dnsmasq-nanny";
+ name = "kube-dns-config";
+ }
+ ];
+ }
+ {
+ name = "sidecar";
+ image = "gcr.io/google_containers/k8s-dns-sidecar-amd64:${version}";
+ args = [
+ "--v=2"
+ "--logtostderr"
+ "--probe=kubedns,127.0.0.1:10053,kubernetes.default.svc.${cfg.clusterDomain},5,A"
+ "--probe=dnsmasq,127.0.0.1:53,kubernetes.default.svc.${cfg.clusterDomain},5,A"
+ ];
+ livenessProbe = {
+ failureThreshold = 5;
+ httpGet = {
+ path = "/metrics";
+ port = 10054;
+ scheme = "HTTP";
+ };
+ initialDelaySeconds = 60;
+ successThreshold = 1;
+ timeoutSeconds = 5;
+ };
+ ports = [
+ {
+ containerPort = 10054;
+ name = "metrics";
+ protocol = "TCP";
+ }
+ ];
+ resources = {
+ requests = {
+ cpu = "10m";
+ memory = "20Mi";
+ };
+ };
+ }
+ ];
+ dnsPolicy = "Default";
+ serviceAccountName = "kube-dns";
+ tolerations = [
+ {
+ key = "CriticalAddonsOnly";
+ operator = "Exists";
+ }
+ ];
+ volumes = [
+ {
+ configMap = {
+ name = "kube-dns";
+ optional = true;
+ };
+ name = "kube-dns-config";
+ }
+ ];
+ };
+ };
+ };
+ };
+
+ kubedns-svc = {
+ apiVersion = "v1";
+ kind = "Service";
+ metadata = {
+ labels = {
+ "addonmanager.kubernetes.io/mode" = "Reconcile";
+ "k8s-app" = "kube-dns";
+ "kubernetes.io/cluster-service" = "true";
+ "kubernetes.io/name" = "KubeDNS";
+ };
+ name = "kube-dns";
+ namespace = "kube-system";
+ };
+ spec = {
+ clusterIP = cfg.clusterIp;
+ ports = [
+ {name = "dns"; port = 53; protocol = "UDP";}
+ {name = "dns-tcp"; port = 53; protocol = "TCP";}
+ ];
+ selector.k8s-app = "kube-dns";
+ };
+ };
+
+ kubedns-sa = {
+ apiVersion = "v1";
+ kind = "ServiceAccount";
+ metadata = {
+ name = "kube-dns";
+ namespace = "kube-system";
+ labels = {
+ "kubernetes.io/cluster-service" = "true";
+ "addonmanager.kubernetes.io/mode" = "Reconcile";
+ };
+ };
+ };
+
+ kubedns-cm = {
+ apiVersion = "v1";
+ kind = "ConfigMap";
+ metadata = {
+ name = "kube-dns";
+ namespace = "kube-system";
+ labels = {
+ "addonmanager.kubernetes.io/mode" = "EnsureExists";
+ };
+ };
+ };
+ };
+
+ services.kubernetes.kubelet.clusterDns = mkDefault cfg.clusterIp;
+ };
+}
diff --git a/nixos/modules/services/continuous-integration/buildkite-agent.nix b/nixos/modules/services/continuous-integration/buildkite-agent.nix
index 267bc16862c905847c99ad594ea825ed2f1aeaac..9c06e1d43bbe119fa7353238e07646e2ea8edc8b 100644
--- a/nixos/modules/services/continuous-integration/buildkite-agent.nix
+++ b/nixos/modules/services/continuous-integration/buildkite-agent.nix
@@ -9,9 +9,8 @@ let
token="${cfg.token}"
name="${cfg.name}"
meta-data="${cfg.meta-data}"
- hooks-path="${pkgs.buildkite-agent}/share/hooks"
- build-path="/var/lib/buildkite-agent/builds"
- bootstrap-script="${pkgs.buildkite-agent}/share/bootstrap.sh"
+ hooks-path="${cfg.package}/share/hooks"
+ build-path="${cfg.dataDir}"
'';
in
@@ -20,6 +19,26 @@ in
services.buildkite-agent = {
enable = mkEnableOption "buildkite-agent";
+ package = mkOption {
+ default = pkgs.buildkite-agent;
+ defaultText = "pkgs.buildkite-agent";
+ description = "Which buildkite-agent derivation to use";
+ type = types.package;
+ };
+
+ dataDir = mkOption {
+ default = "/var/lib/buildkite-agent";
+ description = "The workdir for the agent";
+ type = types.str;
+ };
+
+ runtimePackages = mkOption {
+ default = [ pkgs.bash pkgs.nix ];
+ defaultText = "[ pkgs.bash pkgs.nix ]";
+ description = "Add programs to the buildkite-agent environment";
+ type = types.listOf types.package;
+ };
+
token = mkOption {
type = types.str;
description = ''
@@ -62,27 +81,31 @@ in
config = mkIf config.services.buildkite-agent.enable {
users.extraUsers.buildkite-agent =
{ name = "buildkite-agent";
- home = "/var/lib/buildkite-agent";
+ home = cfg.dataDir;
createHome = true;
description = "Buildkite agent user";
};
- environment.systemPackages = [ pkgs.buildkite-agent ];
+ environment.systemPackages = [ cfg.package ];
systemd.services.buildkite-agent =
{ description = "Buildkite Agent";
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
- environment.HOME = "/var/lib/buildkite-agent";
+ path = cfg.runtimePackages;
+ environment = config.networking.proxy.envVars // {
+ HOME = cfg.dataDir;
+ NIX_REMOTE = "daemon";
+ };
preStart = ''
- ${pkgs.coreutils}/bin/mkdir -m 0700 -p /var/lib/buildkite-agent/.ssh
+ ${pkgs.coreutils}/bin/mkdir -m 0700 -p ${cfg.dataDir}/.ssh
- echo "${cfg.openssh.privateKey}" > /var/lib/buildkite-agent/.ssh/id_rsa
- ${pkgs.coreutils}/bin/chmod 600 /var/lib/buildkite-agent/.ssh/id_rsa
+ echo "${cfg.openssh.privateKey}" > ${cfg.dataDir}/.ssh/id_rsa
+ ${pkgs.coreutils}/bin/chmod 600 ${cfg.dataDir}/.ssh/id_rsa
- echo "${cfg.openssh.publicKey}" > /var/lib/buildkite-agent/.ssh/id_rsa.pub
- ${pkgs.coreutils}/bin/chmod 600 /var/lib/buildkite-agent/.ssh/id_rsa.pub
- '';
+ echo "${cfg.openssh.publicKey}" > ${cfg.dataDir}/.ssh/id_rsa.pub
+ ${pkgs.coreutils}/bin/chmod 600 ${cfg.dataDir}/.ssh/id_rsa.pub
+ '';
serviceConfig =
{ ExecStart = "${pkgs.buildkite-agent}/bin/buildkite-agent start --config ${configFile}";
diff --git a/nixos/modules/services/continuous-integration/gitlab-runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner.nix
index ce0583dad54d3883d8658f15ae3bc0bc30fa1b6d..6d5cea4f77a5cbe857bfec2b3608302289638baf 100644
--- a/nixos/modules/services/continuous-integration/gitlab-runner.nix
+++ b/nixos/modules/services/continuous-integration/gitlab-runner.nix
@@ -96,10 +96,21 @@ in
example = literalExample "pkgs.gitlab-runner_1_11";
};
+ packages = mkOption {
+ default = [ pkgs.bash pkgs.docker-machine ];
+ defaultText = "[ pkgs.bash pkgs.docker-machine ]";
+ type = types.listOf types.package;
+ description = ''
+ Packages to add to PATH for the gitlab-runner process.
+ '';
+ };
+
};
config = mkIf cfg.enable {
systemd.services.gitlab-runner = {
+ path = cfg.packages;
+ environment = config.networking.proxy.envVars;
description = "Gitlab Runner";
after = [ "network.target" ]
++ optional hasDocker "docker.service";
diff --git a/nixos/modules/services/continuous-integration/hail.nix b/nixos/modules/services/continuous-integration/hail.nix
new file mode 100644
index 0000000000000000000000000000000000000000..5d0c3f7b4ab365ad65b16aa104bc655a8601649a
--- /dev/null
+++ b/nixos/modules/services/continuous-integration/hail.nix
@@ -0,0 +1,61 @@
+{ config, lib, pkgs, ...}:
+
+with lib;
+
+let
+ cfg = config.services.hail;
+in {
+
+
+ ###### interface
+
+ options.services.hail = {
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Enables the Hail Auto Update Service. Hail can automatically deploy artifacts
+ built by a Hydra Continous Integration server. A common use case is to provide
+ continous deployment for single services or a full NixOS configuration.'';
+ };
+ profile = mkOption {
+ type = types.str;
+ default = "hail-profile";
+ description = "The name of the Nix profile used by Hail.";
+ };
+ hydraJobUri = mkOption {
+ type = types.str;
+ description = "The URI of the Hydra Job.";
+ };
+ netrc = mkOption {
+ type = types.nullOr types.path;
+ description = "The netrc file to use when fetching data from Hydra.";
+ default = null;
+ };
+ package = mkOption {
+ type = types.package;
+ default = pkgs.haskellPackages.hail;
+ defaultText = "pkgs.haskellPackages.hail";
+ description = "Hail package to use.";
+ };
+ };
+
+
+ ###### implementation
+
+ config = mkIf cfg.enable {
+ systemd.services.hail = {
+ description = "Hail Auto Update Service";
+ wants = [ "network-online.target" ];
+ wantedBy = [ "multi-user.target" ];
+ path = with pkgs; [ nix ];
+ environment = {
+ HOME = "/var/lib/empty";
+ };
+ serviceConfig = {
+ ExecStart = "${cfg.package}/bin/hail --profile ${cfg.profile} --job-uri ${cfg.hydraJobUri}"
+ + lib.optionalString (cfg.netrc != null) " --netrc-file ${cfg.netrc}";
+ };
+ };
+ };
+}
diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix
index fcc0f58637c41e475da7646078b6c5b902f03ec7..43fec5ff5bb28b3aa842c318f2cb37d6643c9c06 100644
--- a/nixos/modules/services/continuous-integration/hydra/default.nix
+++ b/nixos/modules/services/continuous-integration/hydra/default.nix
@@ -270,8 +270,8 @@ in
${optionalString haveLocalDB ''
if ! [ -e ${baseDir}/.db-created ]; then
- ${config.services.postgresql.package}/bin/createuser hydra
- ${config.services.postgresql.package}/bin/createdb -O hydra hydra
+ ${pkgs.sudo}/bin/sudo -u ${config.services.postgresql.superUser} ${config.services.postgresql.package}/bin/createuser hydra
+ ${pkgs.sudo}/bin/sudo -u ${config.services.postgresql.superUser} ${config.services.postgresql.package}/bin/createdb -O hydra hydra
touch ${baseDir}/.db-created
fi
''}
diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix
index c14aa4167231adee0c35b02a56a69fd1eab92382..0dd59e4fb4442b0bc728a7cab9735b1c89c0338f 100644
--- a/nixos/modules/services/continuous-integration/jenkins/default.nix
+++ b/nixos/modules/services/continuous-integration/jenkins/default.nix
@@ -78,6 +78,13 @@ in {
'';
};
+ package = mkOption {
+ default = pkgs.jenkins;
+ defaultText = "pkgs.jenkins";
+ type = types.package;
+ description = "Jenkins package to use.";
+ };
+
packages = mkOption {
default = [ pkgs.stdenv pkgs.git pkgs.jdk config.programs.ssh.package pkgs.nix ];
defaultText = "[ pkgs.stdenv pkgs.git pkgs.jdk config.programs.ssh.package pkgs.nix ]";
@@ -194,7 +201,7 @@ in {
'';
script = ''
- ${pkgs.jdk}/bin/java ${concatStringsSep " " cfg.extraJavaOptions} -jar ${pkgs.jenkins}/webapps/jenkins.war --httpListenAddress=${cfg.listenAddress} \
+ ${pkgs.jdk}/bin/java ${concatStringsSep " " cfg.extraJavaOptions} -jar ${cfg.package}/webapps/jenkins.war --httpListenAddress=${cfg.listenAddress} \
--httpPort=${toString cfg.port} \
--prefix=${cfg.prefix} \
${concatStringsSep " " cfg.extraOptions}
diff --git a/nixos/modules/services/databases/influxdb.nix b/nixos/modules/services/databases/influxdb.nix
index 9ffe9fdea2cec81f7512350eb25314b4954c8ee2..15b711f57b13b437b3f3cd4da4c21c46932e1f7a 100644
--- a/nixos/modules/services/databases/influxdb.nix
+++ b/nixos/modules/services/databases/influxdb.nix
@@ -170,11 +170,16 @@ in
mkdir -m 0770 -p ${cfg.dataDir}
if [ "$(id -u)" = 0 ]; then chown -R ${cfg.user}:${cfg.group} ${cfg.dataDir}; fi
'';
- postStart = mkBefore ''
- until ${pkgs.curl.bin}/bin/curl -s -o /dev/null 'http://127.0.0.1${toString configOptions.http.bind-address}'/ping; do
- sleep 1;
- done
- '';
+ postStart =
+ let
+ scheme = if configOptions.http.https-enabled then "-k https" else "http";
+ bindAddr = (ba: if hasPrefix ":" ba then "127.0.0.1${ba}" else "${ba}")(toString configOptions.http.bind-address);
+ in
+ mkBefore ''
+ until ${pkgs.curl.bin}/bin/curl -s -o /dev/null ${scheme}://${bindAddr}/ping; do
+ sleep 1;
+ done
+ '';
};
users.extraUsers = optional (cfg.user == "influxdb") {
diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix
index 6027f109285a5862c411c98a8b431e174e6671bb..c6c463bce7d50ccbdfb40ca701b7e09b2d760bab 100644
--- a/nixos/modules/services/databases/mysql.nix
+++ b/nixos/modules/services/databases/mysql.nix
@@ -30,6 +30,10 @@ let
master-password = ${cfg.replication.masterPassword}
master-port = ${toString cfg.replication.masterPort}
''}
+ ${optionalString (cfg.ensureUsers != [])
+ ''
+ plugin-load-add = auth_socket.so
+ ''}
${cfg.extraOptions}
'';
@@ -63,7 +67,7 @@ in
type = types.nullOr types.str;
default = null;
example = literalExample "0.0.0.0";
- description = "Address to bind to. The default it to bind to all addresses";
+ description = "Address to bind to. The default is to bind to all addresses";
};
port = mkOption {
@@ -108,10 +112,13 @@ in
initialDatabases = mkOption {
default = [];
- description = "List of database names and their initial schemas that should be used to create databases on the first startup of MySQL";
+ description = ''
+ List of database names and their initial schemas that should be used to create databases on the first startup
+ of MySQL. The schema attribute is optional: If not specified, an empty database is created.
+ '';
example = [
{ name = "foodatabase"; schema = literalExample "./foodatabase.sql"; }
- { name = "bardatabase"; schema = literalExample "./bardatabase.sql"; }
+ { name = "bardatabase"; }
];
};
@@ -120,6 +127,46 @@ in
description = "A file containing SQL statements to be executed on the first startup. Can be used for granting certain permissions on the database";
};
+ ensureDatabases = mkOption {
+ default = [];
+ description = ''
+ Ensures that the specified databases exist.
+ This option will never delete existing databases, especially not when the value of this
+ option is changed. This means that databases created once through this option or
+ otherwise have to be removed manually.
+ '';
+ example = [
+ "nextcloud"
+ "piwik"
+ ];
+ };
+
+ ensureUsers = mkOption {
+ default = [];
+ description = ''
+ Ensures that the specified users exist and have at least the ensured permissions.
+ The MySQL users will be identified using Unix socket authentication. This authenticates the Unix user with the
+ same name only, and that without the need for a password.
+ This option will never delete existing users or remove permissions, especially not when the value of this
+ option is changed. This means that users created and permissions assigned once through this option or
+ otherwise have to be removed manually.
+ '';
+ example = [
+ {
+ name = "nextcloud";
+ ensurePermissions = {
+ "nextcloud.*" = "ALL PRIVILEGES";
+ };
+ }
+ {
+ name = "backup";
+ ensurePermissions = {
+ "*.*" = "SELECT, LOCK TABLES";
+ };
+ }
+ ];
+ };
+
# FIXME: remove this option; it's a really bad idea.
rootPassword = mkOption {
default = null;
@@ -247,6 +294,8 @@ in
if ! test -e "${cfg.dataDir}/${database.name}"; then
echo "Creating initial database: ${database.name}"
( echo "create database ${database.name};"
+
+ ${optionalString (database ? "schema") ''
echo "use ${database.name};"
if [ -f "${database.schema}" ]
@@ -256,6 +305,7 @@ in
then
cat ${database.schema}/mysql-databases/*.sql
fi
+ ''}
) | ${mysql}/bin/mysql -u root -N
fi
'') cfg.initialDatabases}
@@ -299,6 +349,24 @@ in
rm /tmp/mysql_init
fi
+
+ ${optionalString (cfg.ensureDatabases != []) ''
+ (
+ ${concatMapStrings (database: ''
+ echo "CREATE DATABASE IF NOT EXISTS ${database};"
+ '') cfg.ensureDatabases}
+ ) | ${mysql}/bin/mysql -u root -N
+ ''}
+
+ ${concatMapStrings (user:
+ ''
+ ( echo "CREATE USER IF NOT EXISTS '${user.name}'@'localhost' IDENTIFIED WITH ${if mysql == pkgs.mariadb then "unix_socket" else "auth_socket"};"
+ ${concatStringsSep "\n" (mapAttrsToList (database: permission: ''
+ echo "GRANT ${permission} ON ${database} TO '${user.name}'@'localhost';"
+ '') user.ensurePermissions)}
+ ) | ${mysql}/bin/mysql -u root -N
+ '') cfg.ensureUsers}
+
''; # */
};
diff --git a/nixos/modules/services/databases/postage.nix b/nixos/modules/services/databases/pgmanage.nix
similarity index 53%
rename from nixos/modules/services/databases/postage.nix
rename to nixos/modules/services/databases/pgmanage.nix
index d49c9a83a46fa1273a4c550e05a86b15f83d7079..86733a3e5a075d642f2af75082831dd28775e941 100644
--- a/nixos/modules/services/databases/postage.nix
+++ b/nixos/modules/services/databases/pgmanage.nix
@@ -3,16 +3,16 @@
with lib;
let
- cfg = config.services.postage;
+ cfg = config.services.pgmanage;
confFile = pkgs.writeTextFile {
- name = "postage.conf";
+ name = "pgmanage.conf";
text = ''
- connection_file = ${postageConnectionsFile}
+ connection_file = ${pgmanageConnectionsFile}
allow_custom_connections = ${builtins.toJSON cfg.allowCustomConnections}
- postage_port = ${toString cfg.port}
+ pgmanage_port = ${toString cfg.port}
super_only = ${builtins.toJSON cfg.superOnly}
@@ -20,7 +20,7 @@ let
login_timeout = ${toString cfg.loginTimeout}
- web_root = ${cfg.package}/etc/postage/web_root
+ web_root = ${cfg.package}/etc/pgmanage/web_root
data_root = ${cfg.dataRoot}
@@ -33,24 +33,23 @@ let
'';
};
- postageConnectionsFile = pkgs.writeTextFile {
- name = "postage-connections.conf";
+ pgmanageConnectionsFile = pkgs.writeTextFile {
+ name = "pgmanage-connections.conf";
text = concatStringsSep "\n"
(mapAttrsToList (name : conn : "${name}: ${conn}") cfg.connections);
};
- postage = "postage";
-in {
+ pgmanage = "pgmanage";
- options.services.postage = {
+ pgmanageOptions = {
enable = mkEnableOption "PostgreSQL Administration for the web";
package = mkOption {
type = types.package;
- default = pkgs.postage;
- defaultText = "pkgs.postage";
+ default = pkgs.pgmanage;
+ defaultText = "pkgs.pgmanage";
description = ''
- The postage package to use.
+ The pgmanage package to use.
'';
};
@@ -62,14 +61,14 @@ in {
"mini-server" = "hostaddr=127.0.0.1 port=5432 dbname=postgres sslmode=require";
};
description = ''
- Postage requires at least one PostgreSQL server be defined.
+ pgmanage requires at least one PostgreSQL server be defined.
Detailed information about PostgreSQL connection strings is available at:
Note that you should not specify your user name or password. That
information will be entered on the login screen. If you specify a
- username or password, it will be removed by Postage before attempting to
+ username or password, it will be removed by pgmanage before attempting to
connect to a database.
'';
};
@@ -78,7 +77,7 @@ in {
type = types.bool;
default = false;
description = ''
- This tells Postage whether or not to allow anyone to use a custom
+ This tells pgmanage whether or not to allow anyone to use a custom
connection from the login screen.
'';
};
@@ -87,7 +86,7 @@ in {
type = types.int;
default = 8080;
description = ''
- This tells Postage what port to listen on for browser requests.
+ This tells pgmanage what port to listen on for browser requests.
'';
};
@@ -95,7 +94,7 @@ in {
type = types.bool;
default = true;
description = ''
- This tells Postage whether or not to set the listening socket to local
+ This tells pgmanage whether or not to set the listening socket to local
addresses only.
'';
};
@@ -104,10 +103,10 @@ in {
type = types.bool;
default = true;
description = ''
- This tells Postage whether or not to only allow super users to
+ This tells pgmanage whether or not to only allow super users to
login. The recommended value is true and will restrict users who are not
super users from logging in to any PostgreSQL instance through
- Postage. Note that a connection will be made to PostgreSQL in order to
+ pgmanage. Note that a connection will be made to PostgreSQL in order to
test if the user is a superuser.
'';
};
@@ -116,8 +115,8 @@ in {
type = types.nullOr types.str;
default = null;
description = ''
- This tells Postage to only allow users in a certain PostgreSQL group to
- login to Postage. Note that a connection will be made to PostgreSQL in
+ This tells pgmanage to only allow users in a certain PostgreSQL group to
+ login to pgmanage. Note that a connection will be made to PostgreSQL in
order to test if the user is a member of the login group.
'';
};
@@ -133,10 +132,10 @@ in {
dataRoot = mkOption {
type = types.str;
- default = "/var/lib/postage";
+ default = "/var/lib/pgmanage";
description = ''
- This tells Postage where to put the SQL file history. All tabs are saved
- to this location so that if you get disconnected from Postage you
+ This tells pgmanage where to put the SQL file history. All tabs are saved
+ to this location so that if you get disconnected from pgmanage you
don't lose your work.
'';
};
@@ -156,15 +155,15 @@ in {
});
default = null;
description = ''
- These options tell Postage where the TLS Certificate and Key files
+ These options tell pgmanage where the TLS Certificate and Key files
reside. If you use these options then you'll only be able to access
- Postage through a secure TLS connection. These options are only
- necessary if you wish to connect directly to Postage using a secure TLS
- connection. As an alternative, you can set up Postage in a reverse proxy
+ pgmanage through a secure TLS connection. These options are only
+ necessary if you wish to connect directly to pgmanage using a secure TLS
+ connection. As an alternative, you can set up pgmanage in a reverse proxy
configuration. This allows your web server to terminate the secure
- connection and pass on the request to Postage. You can find help to set
+ connection and pass on the request to pgmanage. You can find help to set
up this configuration in:
-
+
'';
};
@@ -177,29 +176,47 @@ in {
};
};
- config = mkIf cfg.enable {
- systemd.services.postage = {
- description = "postage - PostgreSQL Administration for the web";
- wants = [ "postgresql.service" ];
- after = [ "postgresql.service" ];
- wantedBy = [ "multi-user.target" ];
- serviceConfig = {
- User = postage;
- Group = postage;
- ExecStart = "${pkgs.postage}/sbin/postage -c ${confFile}" +
- optionalString cfg.localOnly " --local-only=true";
- };
- };
- users = {
- users."${postage}" = {
- name = postage;
- group = postage;
- home = cfg.dataRoot;
- createHome = true;
+
+in {
+
+ options.services.pgmanage = pgmanageOptions;
+
+ # This is deprecated and should be removed for NixOS-18.03.
+ options.services.postage = pgmanageOptions;
+
+ config = mkMerge [
+ { assertions = [
+ { assertion = !config.services.postage.enable;
+ message =
+ "services.postage is deprecated in favour of pgmanage. " +
+ "They have the same options so just substitute postage for pgmanage." ;
+ }
+ ];
+ }
+ (mkIf cfg.enable {
+ systemd.services.pgmanage = {
+ description = "pgmanage - PostgreSQL Administration for the web";
+ wants = [ "postgresql.service" ];
+ after = [ "postgresql.service" ];
+ wantedBy = [ "multi-user.target" ];
+ serviceConfig = {
+ User = pgmanage;
+ Group = pgmanage;
+ ExecStart = "${pkgs.pgmanage}/sbin/pgmanage -c ${confFile}" +
+ optionalString cfg.localOnly " --local-only=true";
+ };
};
- groups."${postage}" = {
- name = postage;
+ users = {
+ users."${pgmanage}" = {
+ name = pgmanage;
+ group = pgmanage;
+ home = cfg.dataRoot;
+ createHome = true;
+ };
+ groups."${pgmanage}" = {
+ name = pgmanage;
+ };
};
- };
- };
+ })
+ ];
}
diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index d06e03a52978f9257e4bdc45f896b8134cd8de2c..a23a0ebc7366bc9d73044796d64669475cf91415 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -38,9 +38,6 @@ 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
@@ -62,7 +59,7 @@ in
package = mkOption {
type = types.package;
- example = literalExample "pkgs.postgresql92";
+ example = literalExample "pkgs.postgresql96";
description = ''
PostgreSQL package to use.
'';
@@ -151,6 +148,16 @@ in
Contents of the recovery.conf file.
'';
};
+ superUser = mkOption {
+ type = types.str;
+ default= if versionAtLeast config.system.stateVersion "17.09" then "postgres" else "root";
+ internal = true;
+ description = ''
+ NixOS traditionally used `root` as superuser, most other distros use `postgres`.
+ From 17.09 we also try to follow this standard. Internal since changing this value
+ would lead to breakage while setting up databases.
+ '';
+ };
};
};
@@ -215,7 +222,7 @@ in
''
# Initialise the database.
if ! test -e ${cfg.dataDir}/PG_VERSION; then
- initdb -U ${superuser}
+ initdb -U ${cfg.superUser}
# See postStart!
touch "${cfg.dataDir}/.first_startup"
fi
@@ -247,14 +254,14 @@ in
# Wait for PostgreSQL to be ready to accept connections.
postStart =
''
- while ! ${pkgs.sudo}/bin/sudo -u ${superuser} psql --port=${toString cfg.port} -d postgres -c "" 2> /dev/null; do
+ while ! ${pkgs.sudo}/bin/sudo -u ${cfg.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) ''
- ${pkgs.sudo}/bin/sudo -u ${superuser} psql -f "${cfg.initialScript}" --port=${toString cfg.port} -d postgres
+ ${pkgs.sudo}/bin/sudo -u ${cfg.superUser} psql -f "${cfg.initialScript}" --port=${toString cfg.port} -d postgres
''}
rm -f "${cfg.dataDir}/.first_startup"
fi
diff --git a/nixos/modules/services/desktops/geoclue2.nix b/nixos/modules/services/desktops/geoclue2.nix
index 0e041fdbfbcf1c046162228721eb008c992e4985..c5a000d5c6a720d55c2e9e767e05fdb68b81cd2b 100644
--- a/nixos/modules/services/desktops/geoclue2.nix
+++ b/nixos/modules/services/desktops/geoclue2.nix
@@ -17,7 +17,7 @@ with lib;
default = false;
description = ''
Whether to enable GeoClue 2 daemon, a DBus service
- that provides location informationfor accessing.
+ that provides location information for accessing.
'';
};
diff --git a/nixos/modules/services/desktops/gnome3/at-spi2-core.nix b/nixos/modules/services/desktops/gnome3/at-spi2-core.nix
index 6e4c59f4bb37f123721252adac16175452121165..55ed2d9ee21b67db2bda8db7561fdfaf2f149b80 100644
--- a/nixos/modules/services/desktops/gnome3/at-spi2-core.nix
+++ b/nixos/modules/services/desktops/gnome3/at-spi2-core.nix
@@ -34,6 +34,8 @@ with lib;
services.dbus.packages = [ pkgs.at_spi2_core ];
+ systemd.packages = [ pkgs.at_spi2_core ];
+
};
}
diff --git a/nixos/modules/services/desktops/gnome3/evolution-data-server.nix b/nixos/modules/services/desktops/gnome3/evolution-data-server.nix
index 2db2e2fe1c3449acc099618de1e1424d9ebd9355..86a47488d8658235216594299a185e85fce54e58 100644
--- a/nixos/modules/services/desktops/gnome3/evolution-data-server.nix
+++ b/nixos/modules/services/desktops/gnome3/evolution-data-server.nix
@@ -4,9 +4,6 @@
with lib;
-let
- gnome3 = config.environment.gnome3.packageSet;
-in
{
###### interface
@@ -33,11 +30,11 @@ in
config = mkIf config.services.gnome3.evolution-data-server.enable {
- environment.systemPackages = [ gnome3.evolution_data_server ];
+ environment.systemPackages = [ pkgs.gnome3.evolution_data_server ];
- services.dbus.packages = [ gnome3.evolution_data_server ];
+ services.dbus.packages = [ pkgs.gnome3.evolution_data_server ];
- systemd.packages = [ gnome3.evolution_data_server ];
+ systemd.packages = [ pkgs.gnome3.evolution_data_server ];
};
diff --git a/nixos/modules/services/desktops/gnome3/gnome-disks.nix b/nixos/modules/services/desktops/gnome3/gnome-disks.nix
index 33c4bc49f982e766e9fed4edfe4566985225fa82..139534cdb892cdb055d45cf6beb2d83b7b699077 100644
--- a/nixos/modules/services/desktops/gnome3/gnome-disks.nix
+++ b/nixos/modules/services/desktops/gnome3/gnome-disks.nix
@@ -4,9 +4,6 @@
with lib;
-let
- gnome3 = config.environment.gnome3.packageSet;
-in
{
###### interface
@@ -33,9 +30,9 @@ in
config = mkIf config.services.gnome3.gnome-disks.enable {
- environment.systemPackages = [ gnome3.gnome-disk-utility ];
+ environment.systemPackages = [ pkgs.gnome3.gnome-disk-utility ];
- services.dbus.packages = [ gnome3.gnome-disk-utility ];
+ services.dbus.packages = [ pkgs.gnome3.gnome-disk-utility ];
};
diff --git a/nixos/modules/services/desktops/gnome3/gnome-documents.nix b/nixos/modules/services/desktops/gnome3/gnome-documents.nix
index 88bbdadfcbddd9a44c1afa14f519ee82189a8ded..f6efb668424046f51668a971f83a82165b197103 100644
--- a/nixos/modules/services/desktops/gnome3/gnome-documents.nix
+++ b/nixos/modules/services/desktops/gnome3/gnome-documents.nix
@@ -4,9 +4,6 @@
with lib;
-let
- gnome3 = config.environment.gnome3.packageSet;
-in
{
###### interface
@@ -33,9 +30,9 @@ in
config = mkIf config.services.gnome3.gnome-documents.enable {
- environment.systemPackages = [ gnome3.gnome-documents ];
+ environment.systemPackages = [ pkgs.gnome3.gnome-documents ];
- services.dbus.packages = [ gnome3.gnome-documents ];
+ services.dbus.packages = [ pkgs.gnome3.gnome-documents ];
services.gnome3.gnome-online-accounts.enable = true;
diff --git a/nixos/modules/services/desktops/gnome3/gnome-keyring.nix b/nixos/modules/services/desktops/gnome3/gnome-keyring.nix
index a36643a1cfb3bc6af0ec815d66c9b55e3171e915..2a68af5a7dd891e993fcfe522bccae419d313cd1 100644
--- a/nixos/modules/services/desktops/gnome3/gnome-keyring.nix
+++ b/nixos/modules/services/desktops/gnome3/gnome-keyring.nix
@@ -4,9 +4,6 @@
with lib;
-let
- gnome3 = config.environment.gnome3.packageSet;
-in
{
###### interface
@@ -34,9 +31,9 @@ in
config = mkIf config.services.gnome3.gnome-keyring.enable {
- environment.systemPackages = [ gnome3.gnome_keyring ];
+ environment.systemPackages = [ pkgs.gnome3.gnome_keyring ];
- services.dbus.packages = [ gnome3.gnome_keyring gnome3.gcr ];
+ services.dbus.packages = [ pkgs.gnome3.gnome_keyring pkgs.gnome3.gcr ];
};
diff --git a/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix b/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix
index 82d04c62c70dc3b0cd3027c10c7f4b85cc9340eb..0da4aca73ecb92bbb4e0ebdc9e69e4138d2f7058 100644
--- a/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix
+++ b/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix
@@ -4,9 +4,6 @@
with lib;
-let
- gnome3 = config.environment.gnome3.packageSet;
-in
{
###### interface
@@ -33,9 +30,9 @@ in
config = mkIf config.services.gnome3.gnome-online-accounts.enable {
- environment.systemPackages = [ gnome3.gnome_online_accounts ];
+ environment.systemPackages = [ pkgs.gnome3.gnome_online_accounts ];
- services.dbus.packages = [ gnome3.gnome_online_accounts ];
+ services.dbus.packages = [ pkgs.gnome3.gnome_online_accounts ];
};
diff --git a/nixos/modules/services/desktops/gnome3/gnome-online-miners.nix b/nixos/modules/services/desktops/gnome3/gnome-online-miners.nix
index 6acd633b62c9594f9c76c3dbbc3ddeb1fdaeefc6..d406bf6f5e391e79920b3c7c17d89c7fafe05c66 100644
--- a/nixos/modules/services/desktops/gnome3/gnome-online-miners.nix
+++ b/nixos/modules/services/desktops/gnome3/gnome-online-miners.nix
@@ -4,9 +4,6 @@
with lib;
-let
- gnome3 = config.environment.gnome3.packageSet;
-in
{
###### interface
@@ -33,9 +30,9 @@ in
config = mkIf config.services.gnome3.gnome-online-miners.enable {
- environment.systemPackages = [ gnome3.gnome-online-miners ];
+ environment.systemPackages = [ pkgs.gnome3.gnome-online-miners ];
- services.dbus.packages = [ gnome3.gnome-online-miners ];
+ services.dbus.packages = [ pkgs.gnome3.gnome-online-miners ];
};
diff --git a/nixos/modules/services/desktops/gnome3/gnome-terminal-server.nix b/nixos/modules/services/desktops/gnome3/gnome-terminal-server.nix
index 384cede679c6134686f1d9ef6246428d03aba591..3ac767bfa00d1c0f0a4ca5bfeab668651a0fabfc 100644
--- a/nixos/modules/services/desktops/gnome3/gnome-terminal-server.nix
+++ b/nixos/modules/services/desktops/gnome3/gnome-terminal-server.nix
@@ -4,9 +4,6 @@
with lib;
-let
- gnome3 = config.environment.gnome3.packageSet;
-in
{
###### interface
@@ -33,11 +30,11 @@ in
config = mkIf config.services.gnome3.gnome-terminal-server.enable {
- environment.systemPackages = [ gnome3.gnome_terminal ];
+ environment.systemPackages = [ pkgs.gnome3.gnome_terminal ];
- services.dbus.packages = [ gnome3.gnome_terminal ];
+ services.dbus.packages = [ pkgs.gnome3.gnome_terminal ];
- systemd.packages = [ gnome3.gnome_terminal ];
+ systemd.packages = [ pkgs.gnome3.gnome_terminal ];
};
diff --git a/nixos/modules/services/desktops/gnome3/gnome-user-share.nix b/nixos/modules/services/desktops/gnome3/gnome-user-share.nix
index e5c94cff7c84ec25dfb48e91e341db3d000eecaf..1f6ce2ae968e6fef535e785f6a6d421c304ba5c7 100644
--- a/nixos/modules/services/desktops/gnome3/gnome-user-share.nix
+++ b/nixos/modules/services/desktops/gnome3/gnome-user-share.nix
@@ -4,9 +4,6 @@
with lib;
-let
- gnome3 = config.environment.gnome3.packageSet;
-in
{
###### interface
@@ -33,9 +30,9 @@ in
config = mkIf config.services.gnome3.gnome-user-share.enable {
- environment.systemPackages = [ gnome3.gnome-user-share ];
+ environment.systemPackages = [ pkgs.gnome3.gnome-user-share ];
- services.xserver.displayManager.sessionCommands = with gnome3; ''
+ services.xserver.displayManager.sessionCommands = with pkgs.gnome3; ''
# Don't let gnome-control-center depend upon gnome-user-share
export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${gnome-user-share}/share/gsettings-schemas/${gnome-user-share.name}
'';
diff --git a/nixos/modules/services/desktops/gnome3/gpaste.nix b/nixos/modules/services/desktops/gnome3/gpaste.nix
new file mode 100644
index 0000000000000000000000000000000000000000..5a8258775e0ae3aa0b5e1c4324f228ec6b28958a
--- /dev/null
+++ b/nixos/modules/services/desktops/gnome3/gpaste.nix
@@ -0,0 +1,27 @@
+# GPaste daemon.
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+ ###### interface
+ options = {
+ services.gnome3.gpaste = {
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether to enable GPaste, a clipboard manager.
+ '';
+ };
+ };
+ };
+
+ ###### implementation
+ config = mkIf config.services.gnome3.gpaste.enable {
+ environment.systemPackages = [ pkgs.gnome3.gpaste ];
+ services.dbus.packages = [ pkgs.gnome3.gpaste ];
+ services.xserver.desktopManager.gnome3.sessionPath = [ pkgs.gnome3.gpaste ];
+ systemd.packages = [ pkgs.gnome3.gpaste ];
+ };
+}
diff --git a/nixos/modules/services/desktops/gnome3/gvfs.nix b/nixos/modules/services/desktops/gnome3/gvfs.nix
index 6bbabe8d3c56e5ab4a9495fd987371f61f57f5c1..4e99d191f18c72463e6bba70c3477de2399879f4 100644
--- a/nixos/modules/services/desktops/gnome3/gvfs.nix
+++ b/nixos/modules/services/desktops/gnome3/gvfs.nix
@@ -4,9 +4,6 @@
with lib;
-let
- gnome3 = config.environment.gnome3.packageSet;
-in
{
###### interface
@@ -33,11 +30,11 @@ in
config = mkIf config.services.gnome3.gvfs.enable {
- environment.systemPackages = [ gnome3.gvfs ];
+ environment.systemPackages = [ pkgs.gnome3.gvfs ];
- services.dbus.packages = [ gnome3.gvfs ];
+ services.dbus.packages = [ pkgs.gnome3.gvfs ];
- systemd.packages = [ gnome3.gvfs ];
+ systemd.packages = [ pkgs.gnome3.gvfs ];
services.udev.packages = [ pkgs.libmtp.bin ];
diff --git a/nixos/modules/services/desktops/gnome3/seahorse.nix b/nixos/modules/services/desktops/gnome3/seahorse.nix
index 45925aaca9b9483a4eb50199845bc39f4eb801bd..e9ad738269e434a89c91782585c3415129c8502d 100644
--- a/nixos/modules/services/desktops/gnome3/seahorse.nix
+++ b/nixos/modules/services/desktops/gnome3/seahorse.nix
@@ -4,9 +4,6 @@
with lib;
-let
- gnome3 = config.environment.gnome3.packageSet;
-in
{
###### interface
@@ -32,9 +29,9 @@ in
config = mkIf config.services.gnome3.seahorse.enable {
- environment.systemPackages = [ gnome3.seahorse ];
+ environment.systemPackages = [ pkgs.gnome3.seahorse ];
- services.dbus.packages = [ gnome3.seahorse ];
+ services.dbus.packages = [ pkgs.gnome3.seahorse ];
};
diff --git a/nixos/modules/services/desktops/gnome3/sushi.nix b/nixos/modules/services/desktops/gnome3/sushi.nix
index ff7f484602c78552c1930327991323a5d34c6d07..7a4389038b220870e5abffd41b4b30800ed8f980 100644
--- a/nixos/modules/services/desktops/gnome3/sushi.nix
+++ b/nixos/modules/services/desktops/gnome3/sushi.nix
@@ -4,9 +4,6 @@
with lib;
-let
- gnome3 = config.environment.gnome3.packageSet;
-in
{
###### interface
@@ -32,9 +29,9 @@ in
config = mkIf config.services.gnome3.sushi.enable {
- environment.systemPackages = [ gnome3.sushi ];
+ environment.systemPackages = [ pkgs.gnome3.sushi ];
- services.dbus.packages = [ gnome3.sushi ];
+ services.dbus.packages = [ pkgs.gnome3.sushi ];
};
diff --git a/nixos/modules/services/desktops/gnome3/tracker.nix b/nixos/modules/services/desktops/gnome3/tracker.nix
index dcaa60103a3b3b8b6f58b5b43e9e28006075f5ca..c061f789049942c097ac5c040201deac606f636d 100644
--- a/nixos/modules/services/desktops/gnome3/tracker.nix
+++ b/nixos/modules/services/desktops/gnome3/tracker.nix
@@ -4,9 +4,6 @@
with lib;
-let
- gnome3 = config.environment.gnome3.packageSet;
-in
{
###### interface
@@ -33,11 +30,11 @@ in
config = mkIf config.services.gnome3.tracker.enable {
- environment.systemPackages = [ gnome3.tracker ];
+ environment.systemPackages = [ pkgs.gnome3.tracker ];
- services.dbus.packages = [ gnome3.tracker ];
+ services.dbus.packages = [ pkgs.gnome3.tracker ];
- systemd.packages = [ gnome3.tracker ];
+ systemd.packages = [ pkgs.gnome3.tracker ];
};
diff --git a/nixos/modules/services/hardware/interception-tools.nix b/nixos/modules/services/hardware/interception-tools.nix
new file mode 100644
index 0000000000000000000000000000000000000000..fadcb19a016fc979b8e0ca0381120f1610b983bd
--- /dev/null
+++ b/nixos/modules/services/hardware/interception-tools.nix
@@ -0,0 +1,61 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.interception-tools;
+in {
+ options.services.interception-tools = {
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Whether to enable the interception tools service.";
+ };
+
+ plugins = mkOption {
+ type = types.listOf types.package;
+ default = [ pkgs.interception-tools-plugins.caps2esc ];
+ description = ''
+ A list of interception tools plugins that will be made available to use
+ inside the udevmon configuration.
+ '';
+ };
+
+ udevmonConfig = mkOption {
+ type = types.either types.str types.path;
+ default = ''
+ - JOB: "intercept -g $DEVNODE | caps2esc | uinput -d $DEVNODE"
+ DEVICE:
+ EVENTS:
+ EV_KEY: [KEY_CAPSLOCK, KEY_ESC]
+ '';
+ example = ''
+ - JOB: "intercept -g $DEVNODE | y2z | x2y | uinput -d $DEVNODE"
+ DEVICE:
+ EVENTS:
+ EV_KEY: [KEY_X, KEY_Y]
+ '';
+ description = ''
+ String of udevmon YAML configuration, or path to a udevmon YAML
+ configuration file.
+ '';
+ };
+ };
+
+ config = mkIf cfg.enable {
+ systemd.services.interception-tools = {
+ description = "Interception tools";
+ path = [ pkgs.bash pkgs.interception-tools ] ++ cfg.plugins;
+ serviceConfig = {
+ ExecStart = ''
+ ${pkgs.interception-tools}/bin/udevmon -c \
+ ${if builtins.typeOf cfg.udevmonConfig == "path"
+ then cfg.udevmonConfig
+ else pkgs.writeText "udevmon.yaml" cfg.udevmonConfig}
+ '';
+ Nice = -20;
+ };
+ wantedBy = [ "multi-user.target" ];
+ };
+ };
+}
diff --git a/nixos/modules/services/hardware/tlp.nix b/nixos/modules/services/hardware/tlp.nix
index 3b108c87edd24d6ad52bd21d8053d4d1bbfe52e7..68425822a8844231f162084b3c7100e1da998982 100644
--- a/nixos/modules/services/hardware/tlp.nix
+++ b/nixos/modules/services/hardware/tlp.nix
@@ -57,6 +57,8 @@ in
powerManagement.scsiLinkPolicy = null;
powerManagement.cpuFreqGovernor = null;
+ systemd.sockets."systemd-rfkill".enable = false;
+
systemd.services = {
"systemd-rfkill@".enable = false;
"systemd-rfkill".enable = false;
diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix
index 3b25e41edb190021ef3043a89cf512419dc645d4..6057acc531a38d42cae099ac225a33bc00aee5e9 100644
--- a/nixos/modules/services/mail/dovecot.nix
+++ b/nixos/modules/services/mail/dovecot.nix
@@ -9,6 +9,8 @@ let
baseDir = "/run/dovecot2";
stateDir = "/var/lib/dovecot";
+ canCreateMailUserGroup = cfg.mailUser != null && cfg.mailGroup != null;
+
dovecotConf = concatStrings [
''
base_dir = ${baseDir}
@@ -60,6 +62,39 @@ let
}
'')
+ ''
+ protocol imap {
+ namespace inbox {
+ inbox=yes
+ ${concatStringsSep "\n" (map mailboxConfig cfg.mailboxes)}
+ }
+ }
+ ''
+
+ (optionalString cfg.enableQuota ''
+ mail_plugins = $mail_plugins quota
+ service quota-status {
+ executable = ${dovecotPkg}/libexec/dovecot/quota-status -p postfix
+ inet_listener {
+ port = ${cfg.quotaPort}
+ }
+ client_limit = 1
+ }
+
+ protocol imap {
+ mail_plugins = $mail_plugins imap_quota
+ }
+
+ plugin {
+ quota_rule = *:storage=${cfg.quotaGlobalPerUser}
+ quota = maildir:User quota # per virtual mail user quota # BUG/FIXME broken, we couldn't get this working
+ quota_status_success = DUNNO
+ quota_status_nouser = DUNNO
+ quota_status_overquota = "552 5.2.2 Mailbox is full"
+ quota_grace = 10%%
+ }
+ '')
+
cfg.extraConfig
];
@@ -68,6 +103,34 @@ let
paths = map (pkg: "${pkg}/lib/dovecot") ([ dovecotPkg ] ++ map (module: module.override { dovecot = dovecotPkg; }) cfg.modules);
};
+ mailboxConfig = mailbox: ''
+ mailbox ${mailbox.name} {
+ auto = ${toString mailbox.auto}
+ '' + optionalString (mailbox.specialUse != null) ''
+ special_use = \${toString mailbox.specialUse}
+ '' + "}";
+
+ mailboxes = { lib, pkgs, ... }: {
+ options = {
+ name = mkOption {
+ type = types.str;
+ example = "Spam";
+ description = "The name of the mailbox.";
+ };
+ auto = mkOption {
+ type = types.enum [ "no" "create" "subscribe" ];
+ default = "no";
+ example = "subscribe";
+ description = "Whether to automatically create or create and subscribe to the mailbox or not.";
+ };
+ specialUse = mkOption {
+ type = types.nullOr (types.enum [ "All" "Archive" "Drafts" "Flagged" "Junk" "Sent" "Trash" ]);
+ default = null;
+ example = "Junk";
+ description = "Null if no special use flag is set. Other than that every use flag mentioned in the RFC is valid.";
+ };
+ };
+ };
in
{
@@ -76,7 +139,7 @@ in
enablePop3 = mkOption {
type = types.bool;
- default = true;
+ default = false;
description = "Start the POP3 listener (when Dovecot is enabled).";
};
@@ -145,6 +208,14 @@ in
description = "Default group to store mail for virtual users.";
};
+ createMailUser = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''Whether to automatically create the user
+ given in and the group
+ given in .'';
+ };
+
modules = mkOption {
type = types.listOf types.package;
default = [];
@@ -191,6 +262,36 @@ in
default = false;
description = "Show the PAM failure message on authentication error (useful for OTPW).";
};
+
+ mailboxes = mkOption {
+ type = types.listOf (types.submodule mailboxes);
+ default = [];
+ example = [ { name = "Spam"; specialUse = "Junk"; auto = "create"; } ];
+ description = "Configure mailboxes and auto create or subscribe them.";
+ };
+
+ enableQuota = mkOption {
+ type = types.bool;
+ default = false;
+ example = true;
+ description = "Whether to enable the dovecot quota service.";
+ };
+
+ quotaPort = mkOption {
+ type = types.str;
+ default = "12340";
+ description = ''
+ The Port the dovecot quota service binds to.
+ If using postfix, add check_policy_service inet:localhost:12340 to your smtpd_recipient_restrictions in your postfix config.
+ '';
+ };
+ quotaGlobalPerUser = mkOption {
+ type = types.str;
+ default = "100G";
+ example = "10G";
+ description = "Quota limit for the user in bytes. Supports suffixes b, k, M, G, T and %.";
+ };
+
};
@@ -214,11 +315,20 @@ in
uid = config.ids.uids.dovecot2;
description = "Dovecot user";
group = cfg.group;
- };
+ }
+ ++ optional (cfg.createMailUser && cfg.mailUser != null)
+ ({ name = cfg.mailUser;
+ description = "Virtual Mail User";
+ } // optionalAttrs (cfg.mailGroup != null) {
+ group = cfg.mailGroup;
+ });
users.extraGroups = optional (cfg.group == "dovecot2")
{ name = "dovecot2";
gid = config.ids.gids.dovecot2;
+ }
+ ++ optional (cfg.createMailUser && cfg.mailGroup != null)
+ { name = cfg.mailGroup;
};
environment.etc."dovecot/modules".source = modulesDir;
diff --git a/nixos/modules/services/mail/nullmailer.nix b/nixos/modules/services/mail/nullmailer.nix
index b2c738ab6ebd12d9d75ed38baa0ab5cd440e69c0..59cb512c115b668fc4e215f919aac595b7c14a96 100644
--- a/nixos/modules/services/mail/nullmailer.nix
+++ b/nixos/modules/services/mail/nullmailer.nix
@@ -35,6 +35,18 @@ with lib;
description = "Whether to set the system sendmail to nullmailer's.";
};
+ remotesFile = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ description = ''
+ Path to the remotes control file. This file contains a
+ list of remote servers to which to send each message.
+
+ See man 8 nullmailer-send for syntax and available
+ options.
+ '';
+ };
+
config = {
adminaddr = mkOption {
type = types.nullOr types.str;
@@ -142,7 +154,16 @@ with lib;
type = types.nullOr types.str;
default = null;
description = ''
- If set, content will override the envelope sender on all messages.
+ A list of remote servers to which to send each message. Each line
+ contains a remote host name or address followed by an optional
+ protocol string, separated by white space.
+
+ See man 8 nullmailer-send for syntax and available
+ options.
+
+ WARNING: This is stored world-readable in the nix store. If you need
+ to specify any secret credentials here, consider using the
+ remotesFile option instead.
'';
};
@@ -164,13 +185,19 @@ with lib;
cfg = config.services.nullmailer;
in mkIf cfg.enable {
+ assertions = [
+ { assertion = cfg.config.remotes == null || cfg.remotesFile == null;
+ message = "Only one of `remotesFile` or `config.remotes` may be used at a time.";
+ }
+ ];
+
environment = {
systemPackages = [ pkgs.nullmailer ];
etc = let
- getval = attr: builtins.getAttr attr cfg.config;
- attrs = builtins.attrNames cfg.config;
- attrs' = builtins.filter (attr: ! isNull (getval attr)) attrs;
- in foldl' (as: attr: as // { "nullmailer/${attr}".text = getval attr; }) {} attrs';
+ validAttrs = filterAttrs (name: value: value != null) cfg.config;
+ in
+ (foldl' (as: name: as // { "nullmailer/${name}".text = validAttrs.${name}; }) {} (attrNames validAttrs))
+ // optionalAttrs (cfg.remotesFile != null) { "nullmailer/remotes".source = cfg.remotesFile; };
};
users = {
@@ -192,7 +219,7 @@ with lib;
preStart = ''
mkdir -p /var/spool/nullmailer/{queue,tmp}
- rm -f var/spool/nullmailer/trigger && mkfifo -m 660 /var/spool/nullmailer/trigger
+ rm -f /var/spool/nullmailer/trigger && mkfifo -m 660 /var/spool/nullmailer/trigger
chown ${cfg.user} /var/spool/nullmailer/*
'';
diff --git a/nixos/modules/services/mail/opendkim.nix b/nixos/modules/services/mail/opendkim.nix
index f065208ddfc15dd1fa1f4e28bd7b80046667ad6e..59a8373843a1f28ccc69872e55cf03c322855572 100644
--- a/nixos/modules/services/mail/opendkim.nix
+++ b/nixos/modules/services/mail/opendkim.nix
@@ -8,10 +8,12 @@ let
defaultSock = "local:/run/opendkim/opendkim.sock";
+ keyFile = "${cfg.keyPath}/${cfg.selector}.private";
+
args = [ "-f" "-l"
"-p" cfg.socket
"-d" cfg.domains
- "-k" cfg.keyFile
+ "-k" keyFile
"-s" cfg.selector
] ++ optionals (cfg.configFile != null) [ "-x" cfg.configFile ];
@@ -57,9 +59,13 @@ in {
'';
};
- keyFile = mkOption {
+ keyPath = mkOption {
type = types.path;
- description = "Secret key file used for signing messages.";
+ description = ''
+ The path that opendkim should put its generated private keys into.
+ The DNS settings will be found in this directory with the name selector.txt.
+ '';
+ default = "/var/lib/opendkim/keys";
};
selector = mkOption {
@@ -100,11 +106,25 @@ in {
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
+ preStart = ''
+ mkdir -p "${cfg.keyPath}"
+ cd "${cfg.keyPath}"
+ if ! test -f ${cfg.selector}.private; then
+ ${pkgs.opendkim}/bin/opendkim-genkey -s ${cfg.selector} -d all-domains-generic-key
+ echo "Generated OpenDKIM key! Please update your DNS settings:\n"
+ echo "-------------------------------------------------------------"
+ cat ${cfg.selector}.txt
+ echo "-------------------------------------------------------------"
+ fi
+ chown ${cfg.user}:${cfg.group} ${cfg.selector}.private
+ '';
+
serviceConfig = {
ExecStart = "${pkgs.opendkim}/bin/opendkim ${escapeShellArgs args}";
User = cfg.user;
Group = cfg.group;
RuntimeDirectory = optional (cfg.socket == defaultSock) "opendkim";
+ PermissionsStartOnly = true;
};
};
diff --git a/nixos/modules/services/mail/pfix-srsd.nix b/nixos/modules/services/mail/pfix-srsd.nix
new file mode 100644
index 0000000000000000000000000000000000000000..ab5f4c39e8c2ae0d7bfd874c2fc2f6c156368785
--- /dev/null
+++ b/nixos/modules/services/mail/pfix-srsd.nix
@@ -0,0 +1,56 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+
+ ###### interface
+
+ options = {
+
+ services.pfix-srsd = {
+ enable = mkOption {
+ default = false;
+ type = types.bool;
+ description = "Whether to run the postfix sender rewriting scheme daemon.";
+ };
+
+ domain = mkOption {
+ description = "The domain for which to enable srs";
+ type = types.str;
+ example = "example.com";
+ };
+
+ secretsFile = mkOption {
+ description = ''
+ The secret data used to encode the SRS address.
+ to generate, use a command like:
+ for n in $(seq 5); do dd if=/dev/urandom count=1 bs=1024 status=none | sha256sum | sed 's/ -$//' | sed 's/^/ /'; done
+ '';
+ type = types.path;
+ default = "/var/lib/pfix-srsd/secrets";
+ };
+ };
+ };
+
+ ###### implementation
+
+ config = mkIf config.services.pfix-srsd.enable {
+ environment = {
+ systemPackages = [ pkgs.pfixtools ];
+ };
+
+ systemd.services."pfix-srsd" = {
+ description = "Postfix sender rewriting scheme daemon";
+ before = [ "postfix.service" ];
+ #note that we use requires rather than wants because postfix
+ #is unable to process (almost) all mail without srsd
+ requiredBy = [ "postfix.service" ];
+ serviceConfig = {
+ Type = "forking";
+ PIDFile = "/var/run/pfix-srsd.pid";
+ ExecStart = "${pkgs.pfixtools}/bin/pfix-srsd -p /var/run/pfix-srsd.pid -I ${config.services.pfix-srsd.domain} ${config.services.pfix-srsd.secretsFile}";
+ };
+ };
+ };
+}
\ No newline at end of file
diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
index 01ae49d49090690d1919eb72634ca5a2b46fdffe..867c0ea6761c5d335f8569c4117c3522e9e4faae 100644
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@@ -28,7 +28,7 @@ let
mainCf = let
escape = replaceStrings ["$"] ["$$"];
- mkList = items: "\n " + concatMapStringsSep "\n " escape items;
+ mkList = items: "\n " + concatStringsSep "\n " items;
mkVal = value:
if isList value then mkList value
else " " + (if value == true then "yes"
@@ -60,9 +60,11 @@ let
manpage_directory = "${pkgs.postfix}/share/man";
html_directory = "${pkgs.postfix}/share/postfix/doc/html";
shlib_directory = false;
- relayhost = if cfg.lookupMX || cfg.relayHost == ""
- then cfg.relayHost
- else "[${cfg.relayHost}]";
+ relayhost = if cfg.relayHost == "" then "" else
+ if cfg.lookupMX
+ then "${cfg.relayHost}:${toString cfg.relayPort}"
+ else "[${cfg.relayHost}]:${toString cfg.relayPort}";
+
mail_spool_directory = "/var/spool/mail/";
setgid_group = setgidGroup;
}
@@ -79,6 +81,12 @@ let
// optionalAttrs haveTransport { transport_maps = "hash:/etc/postfix/transport"; }
// optionalAttrs haveVirtual { virtual_alias_maps = "${cfg.virtualMapType}:/etc/postfix/virtual"; }
// optionalAttrs (cfg.dnsBlacklists != []) { smtpd_client_restrictions = clientRestrictions; }
+ // optionalAttrs cfg.useSrs {
+ sender_canonical_maps = "tcp:127.0.0.1:10001";
+ sender_canonical_classes = "envelope_sender";
+ recipient_canonical_maps = "tcp:127.0.0.1:10002";
+ recipient_canonical_classes= "envelope_recipient";
+ }
// optionalAttrs cfg.enableHeaderChecks { header_checks = "regexp:/etc/postfix/header_checks"; }
// optionalAttrs (cfg.sslCert != "") {
smtp_tls_CAfile = cfg.sslCACert;
@@ -452,6 +460,14 @@ in
";
};
+ relayPort = mkOption {
+ type = types.int;
+ default = 25;
+ description = "
+ SMTP port for relay mail relay.
+ ";
+ };
+
lookupMX = mkOption {
type = types.bool;
default = false;
@@ -626,6 +642,12 @@ in
description = "Maps to be compiled and placed into /var/lib/postfix/conf.";
};
+ useSrs = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Whether to enable sender rewriting scheme";
+ };
+
};
};
@@ -646,6 +668,8 @@ in
systemPackages = [ pkgs.postfix ];
};
+ services.pfix-srsd.enable = config.services.postfix.useSrs;
+
services.mail.sendmailSetuidWrapper = mkIf config.services.postfix.setSendmail {
program = "sendmail";
source = "${pkgs.postfix}/bin/sendmail";
@@ -836,11 +860,5 @@ in
(mkIf (cfg.dnsBlacklists != []) {
services.postfix.mapFiles."client_access" = checkClientAccessFile;
})
- (mkIf (cfg.extraConfig != "") {
- warnings = [ "The services.postfix.extraConfig option was deprecated. Please use services.postfix.config instead." ];
- })
- (mkIf (cfg.extraMasterConf != "") {
- warnings = [ "The services.postfix.extraMasterConf option was deprecated. Please use services.postfix.masterConfig instead." ];
- })
]);
}
diff --git a/nixos/modules/services/mail/spamassassin.nix b/nixos/modules/services/mail/spamassassin.nix
index fc8396cd85e9d9ad5c9a0b4648d2c62fda976f95..d483a8c3d67dc7945179a05a7d633cf23c7143dc 100644
--- a/nixos/modules/services/mail/spamassassin.nix
+++ b/nixos/modules/services/mail/spamassassin.nix
@@ -42,7 +42,7 @@ in
Then you can Use this sieve filter:
require ["fileinto", "reject", "envelope"];
-
+
if header :contains "X-Spam-Flag" "YES" {
fileinto "spam";
}
@@ -67,11 +67,11 @@ in
initPreConf = mkOption {
type = types.str;
description = "The SpamAssassin init.pre config.";
- default =
- ''
+ default =
+ ''
#
# to update this list, run this command in the rules directory:
- # grep 'loadplugin.*Mail::SpamAssassin::Plugin::.*' -o -h * | sort | uniq
+ # grep 'loadplugin.*Mail::SpamAssassin::Plugin::.*' -o -h * | sort | uniq
#
#loadplugin Mail::SpamAssassin::Plugin::AccessDB
@@ -122,7 +122,11 @@ in
config = mkIf cfg.enable {
# Allow users to run 'spamc'.
- environment.systemPackages = [ pkgs.spamassassin ];
+
+ environment = {
+ etc = singleton { source = spamdEnv; target = "spamassassin"; };
+ systemPackages = [ pkgs.spamassassin ];
+ };
users.extraUsers = singleton {
name = "spamd";
@@ -138,7 +142,7 @@ in
systemd.services.sa-update = {
script = ''
- set +e
+ set +e
${pkgs.su}/bin/su -s "${pkgs.bash}/bin/bash" -c "${pkgs.spamassassin}/bin/sa-update --gpghomedir=/var/lib/spamassassin/sa-update-keys/ --siteconfigpath=${spamdEnv}/" spamd
v=$?
@@ -153,7 +157,7 @@ in
'';
};
- systemd.timers.sa-update = {
+ systemd.timers.sa-update = {
description = "sa-update-service";
partOf = [ "sa-update.service" ];
wantedBy = [ "timers.target" ];
@@ -177,15 +181,10 @@ in
# 0 and 1 no error, exitcode > 1 means error:
# https://spamassassin.apache.org/full/3.1.x/doc/sa-update.html#exit_codes
preStart = ''
- # this abstraction requires no centralized config at all
- if [ -d /etc/spamassassin ]; then
- echo "This spamassassin does not support global '/etc/spamassassin' folder for configuration as this would be impure. Merge your configs into 'services.spamassassin' and remove the '/etc/spamassassin' folder to make this service work. Also see 'https://github.com/NixOS/nixpkgs/pull/26470'.";
- exit 1
- fi
echo "Recreating '/var/lib/spamasassin' with creating '3.004001' (or similar) and 'sa-update-keys'"
mkdir -p /var/lib/spamassassin
chown spamd:spamd /var/lib/spamassassin -R
- set +e
+ set +e
${pkgs.su}/bin/su -s "${pkgs.bash}/bin/bash" -c "${pkgs.spamassassin}/bin/sa-update --gpghomedir=/var/lib/spamassassin/sa-update-keys/ --siteconfigpath=${spamdEnv}/" spamd
v=$?
set -e
diff --git a/nixos/modules/services/misc/airsonic.nix b/nixos/modules/services/misc/airsonic.nix
new file mode 100644
index 0000000000000000000000000000000000000000..b92104787a5602282812ac3c1de32a23d6676fc0
--- /dev/null
+++ b/nixos/modules/services/misc/airsonic.nix
@@ -0,0 +1,117 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.airsonic;
+in {
+ options = {
+
+ services.airsonic = {
+ enable = mkEnableOption "Airsonic, the Free and Open Source media streaming server (fork of Subsonic and Libresonic)";
+
+ user = mkOption {
+ type = types.str;
+ default = "airsonic";
+ description = "User account under which airsonic runs.";
+ };
+
+ home = mkOption {
+ type = types.path;
+ default = "/var/lib/airsonic";
+ description = ''
+ The directory where Airsonic will create files.
+ Make sure it is writable.
+ '';
+ };
+
+ listenAddress = mkOption {
+ type = types.string;
+ default = "127.0.0.1";
+ description = ''
+ The host name or IP address on which to bind Airsonic.
+ Only relevant if you have multiple network interfaces and want
+ to make Airsonic available on only one of them. The default value
+ will bind Airsonic to all available network interfaces.
+ '';
+ };
+
+ port = mkOption {
+ type = types.int;
+ default = 4040;
+ description = ''
+ The port on which Airsonic will listen for
+ incoming HTTP traffic. Set to 0 to disable.
+ '';
+ };
+
+ contextPath = mkOption {
+ type = types.path;
+ default = "/";
+ description = ''
+ The context path, i.e., the last part of the Airsonic
+ URL. Typically '/' or '/airsonic'. Default '/'
+ '';
+ };
+
+ maxMemory = mkOption {
+ type = types.int;
+ default = 100;
+ description = ''
+ The memory limit (max Java heap size) in megabytes.
+ Default: 100
+ '';
+ };
+
+ transcoders = mkOption {
+ type = types.listOf types.path;
+ default = [ "${pkgs.ffmpeg.bin}/bin/ffmpeg" ];
+ defaultText= [ "\${pkgs.ffmpeg.bin}/bin/ffmpeg" ];
+ description = ''
+ List of paths to transcoder executables that should be accessible
+ from Airsonic. Symlinks will be created to each executable inside
+ ${cfg.home}/transcoders.
+ '';
+ };
+ };
+ };
+
+ config = mkIf cfg.enable {
+ systemd.services.airsonic = {
+ description = "Airsonic Media Server";
+ after = [ "local-fs.target" "network.target" ];
+ wantedBy = [ "multi-user.target" ];
+
+ preStart = ''
+ # Install transcoders.
+ rm -rf ${cfg.home}/transcode
+ mkdir -p ${cfg.home}/transcode
+ for exe in ${toString cfg.transcoders}; do
+ ln -sf "$exe" ${cfg.home}/transcode
+ done
+ '';
+ serviceConfig = {
+ ExecStart = ''
+ ${pkgs.jre}/bin/java -Xmx${toString cfg.maxMemory}m \
+ -Dairsonic.home=${cfg.home} \
+ -Dserver.address=${cfg.listenAddress} \
+ -Dserver.port=${toString cfg.port} \
+ -Dairsonic.contextPath=${cfg.contextPath} \
+ -Djava.awt.headless=true \
+ -verbose:gc \
+ -jar ${pkgs.airsonic}/webapps/airsonic.war
+ '';
+ Restart = "always";
+ User = "airsonic";
+ UMask = "0022";
+ };
+ };
+
+ users.extraUsers.airsonic = {
+ description = "Airsonic service user";
+ name = cfg.user;
+ home = cfg.home;
+ createHome = true;
+ };
+ };
+}
diff --git a/nixos/modules/services/misc/bepasty.nix b/nixos/modules/services/misc/bepasty.nix
index 4d78cddcb54ffd3ce30965ce0fcfc05a560a1321..c499e428af35906321206dfaa32d373b9a5a1cba 100644
--- a/nixos/modules/services/misc/bepasty.nix
+++ b/nixos/modules/services/misc/bepasty.nix
@@ -3,7 +3,7 @@
with lib;
let
gunicorn = pkgs.pythonPackages.gunicorn;
- bepasty = pkgs.pythonPackages.bepasty-server;
+ bepasty = pkgs.bepasty;
gevent = pkgs.pythonPackages.gevent;
python = pkgs.pythonPackages.python;
cfg = config.services.bepasty;
diff --git a/nixos/modules/services/misc/calibre-server.nix b/nixos/modules/services/misc/calibre-server.nix
index a920aa22ccdf684e9cef4c5ea21b291d74c2168d..6b19f780ec0cc46833011264d5f270207ecb1e52 100644
--- a/nixos/modules/services/misc/calibre-server.nix
+++ b/nixos/modules/services/misc/calibre-server.nix
@@ -42,7 +42,7 @@ in
serviceConfig = {
User = "calibre-server";
Restart = "always";
- ExecStart = "${pkgs.calibre}/bin/calibre-server --with-library=${cfg.libraryDir}";
+ ExecStart = "${pkgs.calibre}/bin/calibre-server ${cfg.libraryDir}";
};
};
diff --git a/nixos/modules/services/misc/geoip-updater.nix b/nixos/modules/services/misc/geoip-updater.nix
index 5135fac8f7dceaa62030bf698f3a74451e833bd9..760fa66e80d6cc10ac919525f8c33c2dc23a627c 100644
--- a/nixos/modules/services/misc/geoip-updater.nix
+++ b/nixos/modules/services/misc/geoip-updater.nix
@@ -238,7 +238,7 @@ in
assertions = [
{ assertion = (builtins.filter
- (x: builtins.match ".*\.(gz|xz)$" x == null) cfg.databases) == [];
+ (x: builtins.match ".*\\.(gz|xz)$" x == null) cfg.databases) == [];
message = ''
services.geoip-updater.databases supports only .gz and .xz databases.
@@ -246,7 +246,7 @@ in
${toString cfg.databases}
Offending element(s):
- ${toString (builtins.filter (x: builtins.match ".*\.(gz|xz)$" x == null) cfg.databases)};
+ ${toString (builtins.filter (x: builtins.match ".*\\.(gz|xz)$" x == null) cfg.databases)};
'';
}
];
diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix
new file mode 100644
index 0000000000000000000000000000000000000000..f0b44b7bedebcb4e9a7d318c3360e1f19bd91641
--- /dev/null
+++ b/nixos/modules/services/misc/gitea.nix
@@ -0,0 +1,270 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.gitea;
+ configFile = pkgs.writeText "app.ini" ''
+ APP_NAME = ${cfg.appName}
+ RUN_USER = ${cfg.user}
+ RUN_MODE = prod
+
+ [database]
+ DB_TYPE = ${cfg.database.type}
+ HOST = ${cfg.database.host}:${toString cfg.database.port}
+ NAME = ${cfg.database.name}
+ USER = ${cfg.database.user}
+ PASSWD = #dbpass#
+ PATH = ${cfg.database.path}
+
+ [repository]
+ ROOT = ${cfg.repositoryRoot}
+
+ [server]
+ DOMAIN = ${cfg.domain}
+ HTTP_ADDR = ${cfg.httpAddress}
+ HTTP_PORT = ${toString cfg.httpPort}
+ ROOT_URL = ${cfg.rootUrl}
+ STATIC_ROOT_PATH = ${cfg.staticRootPath}
+
+ [session]
+ COOKIE_NAME = session
+ COOKIE_SECURE = ${boolToString cfg.cookieSecure}
+
+ [security]
+ SECRET_KEY = #secretkey#
+ INSTALL_LOCK = true
+
+ ${cfg.extraConfig}
+ '';
+in
+
+{
+ options = {
+ services.gitea = {
+ enable = mkOption {
+ default = false;
+ type = types.bool;
+ description = "Enable Gitea Service.";
+ };
+
+ useWizard = mkOption {
+ default = false;
+ type = types.bool;
+ description = "Do not generate a configuration and use gitea' installation wizard instead. The first registered user will be administrator.";
+ };
+
+ stateDir = mkOption {
+ default = "/var/lib/gitea";
+ type = types.str;
+ description = "gitea data directory.";
+ };
+
+ user = mkOption {
+ type = types.str;
+ default = "gitea";
+ description = "User account under which gitea runs.";
+ };
+
+ database = {
+ type = mkOption {
+ type = types.enum [ "sqlite3" "mysql" "postgres" ];
+ example = "mysql";
+ default = "sqlite3";
+ description = "Database engine to use.";
+ };
+
+ host = mkOption {
+ type = types.str;
+ default = "127.0.0.1";
+ description = "Database host address.";
+ };
+
+ port = mkOption {
+ type = types.int;
+ default = 3306;
+ description = "Database host port.";
+ };
+
+ name = mkOption {
+ type = types.str;
+ default = "gitea";
+ description = "Database name.";
+ };
+
+ user = mkOption {
+ type = types.str;
+ default = "gitea";
+ description = "Database user.";
+ };
+
+ password = mkOption {
+ type = types.str;
+ default = "";
+ description = ''
+ The password corresponding to .
+ Warning: this is stored in cleartext in the Nix store!
+ Use instead.
+ '';
+ };
+
+ passwordFile = mkOption {
+ type = types.nullOr types.path;
+ default = null;
+ example = "/run/keys/gitea-dbpassword";
+ description = ''
+ A file containing the password corresponding to
+ .
+ '';
+ };
+
+ path = mkOption {
+ type = types.str;
+ default = "${cfg.stateDir}/data/gitea.db";
+ description = "Path to the sqlite3 database file.";
+ };
+ };
+
+ appName = mkOption {
+ type = types.str;
+ default = "gitea: Gitea Service";
+ description = "Application name.";
+ };
+
+ repositoryRoot = mkOption {
+ type = types.str;
+ default = "${cfg.stateDir}/repositories";
+ description = "Path to the git repositories.";
+ };
+
+ domain = mkOption {
+ type = types.str;
+ default = "localhost";
+ description = "Domain name of your server.";
+ };
+
+ rootUrl = mkOption {
+ type = types.str;
+ default = "http://localhost:3000/";
+ description = "Full public URL of gitea server.";
+ };
+
+ httpAddress = mkOption {
+ type = types.str;
+ default = "0.0.0.0";
+ description = "HTTP listen address.";
+ };
+
+ httpPort = mkOption {
+ type = types.int;
+ default = 3000;
+ description = "HTTP listen port.";
+ };
+
+ cookieSecure = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Marks session cookies as "secure" as a hint for browsers to only send
+ them via HTTPS. This option is recommend, if gitea is being served over HTTPS.
+ '';
+ };
+
+ staticRootPath = mkOption {
+ type = types.str;
+ default = "${pkgs.gitea.data}";
+ example = "/var/lib/gitea/data";
+ description = "Upper level of template and static files path.";
+ };
+
+ extraConfig = mkOption {
+ type = types.str;
+ default = "";
+ description = "Configuration lines appended to the generated gitea configuration file.";
+ };
+ };
+ };
+
+ config = mkIf cfg.enable {
+
+ systemd.services.gitea = {
+ description = "gitea";
+ after = [ "network.target" ];
+ wantedBy = [ "multi-user.target" ];
+ path = [ pkgs.gitea.bin ];
+
+ preStart = let
+ runConfig = "${cfg.stateDir}/custom/conf/app.ini";
+ secretKey = "${cfg.stateDir}/custom/conf/secret_key";
+ in ''
+ mkdir -p ${cfg.stateDir}
+
+ # copy custom configuration and generate a random secret key if needed
+ ${optionalString (cfg.useWizard == false) ''
+ mkdir -p ${cfg.stateDir}/custom/conf
+ cp -f ${configFile} ${runConfig}
+
+ if [ ! -e ${secretKey} ]; then
+ head -c 16 /dev/urandom | base64 > ${secretKey}
+ fi
+
+ KEY=$(head -n1 ${secretKey})
+ DBPASS=$(head -n1 ${cfg.database.passwordFile})
+ sed -e "s,#secretkey#,$KEY,g" \
+ -e "s,#dbpass#,$DBPASS,g" \
+ -i ${runConfig}
+ chmod 640 ${runConfig} ${secretKey}
+ ''}
+
+ mkdir -p ${cfg.repositoryRoot}
+ # update all hooks' binary paths
+ HOOKS=$(find ${cfg.repositoryRoot} -mindepth 4 -maxdepth 4 -type f -wholename "*git/hooks/*")
+ if [ "$HOOKS" ]
+ then
+ sed -ri 's,/nix/store/[a-z0-9.-]+/bin/gitea,${pkgs.gitea.bin}/bin/gitea,g' $HOOKS
+ sed -ri 's,/nix/store/[a-z0-9.-]+/bin/env,${pkgs.coreutils}/bin/env,g' $HOOKS
+ sed -ri 's,/nix/store/[a-z0-9.-]+/bin/bash,${pkgs.bash}/bin/bash,g' $HOOKS
+ sed -ri 's,/nix/store/[a-z0-9.-]+/bin/perl,${pkgs.perl}/bin/perl,g' $HOOKS
+ fi
+ if [ ! -d ${cfg.stateDir}/conf/locale ]
+ then
+ mkdir -p ${cfg.stateDir}/conf
+ cp -r ${pkgs.gitea.out}/locale ${cfg.stateDir}/conf/locale
+ fi
+ '';
+
+ serviceConfig = {
+ Type = "simple";
+ User = cfg.user;
+ WorkingDirectory = cfg.stateDir;
+ ExecStart = "${pkgs.gitea.bin}/bin/gitea web";
+ Restart = "always";
+ };
+
+ environment = {
+ USER = cfg.user;
+ HOME = cfg.stateDir;
+ GITEA_WORK_DIR = cfg.stateDir;
+ };
+ };
+
+ users = mkIf (cfg.user == "gitea") {
+ extraUsers.gitea = {
+ description = "Gitea Service";
+ home = cfg.stateDir;
+ createHome = true;
+ };
+ };
+
+ warnings = optional (cfg.database.password != "")
+ ''config.services.gitea.database.password will be stored as plaintext
+ in the Nix store. Use database.passwordFile instead.'';
+
+ # Create database passwordFile default when password is configured.
+ services.gitea.database.passwordFile =
+ (mkDefault (toString (pkgs.writeTextFile {
+ name = "gitea-database-password";
+ text = cfg.database.password;
+ })));
+ };
+}
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index ccc1854d254825e26dcc64edfc6fb38d17748a5a..7b2b40e59232961992c223bde7d34cdaa0d56505 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -10,10 +10,12 @@ let
ruby = cfg.packages.gitlab.ruby;
bundler = pkgs.bundler;
- gemHome = "${cfg.packages.gitlab.env}/${ruby.gemPath}";
+ gemHome = "${cfg.packages.gitlab.rubyEnv}/${ruby.gemPath}";
gitlabSocket = "${cfg.statePath}/tmp/sockets/gitlab.socket";
+ gitalySocket = "${cfg.statePath}/tmp/sockets/gitaly.socket";
pathUrlQuote = url: replaceStrings ["/"] ["%2F"] url;
+ pgSuperUser = config.services.postgresql.superUser;
databaseYml = ''
production:
@@ -25,6 +27,23 @@ let
encoding: utf8
'';
+ gitalyToml = pkgs.writeText "gitaly.toml" ''
+ socket_path = "${lib.escape ["\""] gitalySocket}"
+ prometheus_listen_addr = "localhost:9236"
+
+ [gitaly-ruby]
+ dir = "${cfg.packages.gitaly.ruby}"
+
+ [gitlab-shell]
+ dir = "${cfg.packages.gitlab-shell}"
+
+ ${concatStringsSep "\n" (attrValues (mapAttrs (k: v: ''
+ [[storage]]
+ name = "${lib.escape ["\""] k}"
+ path = "${lib.escape ["\""] v.path}"
+ '') gitlabConfig.production.repositories.storages))}
+ '';
+
gitlabShellYml = ''
user: ${cfg.user}
gitlab_url: "http+unix://${pathUrlQuote gitlabSocket}"
@@ -41,11 +60,17 @@ let
namespace: resque:gitlab
'';
+ redisYml = ''
+ production:
+ url: redis://localhost:6379/
+ '';
+
secretsYml = ''
production:
secret_key_base: ${cfg.secrets.secret}
otp_key_base: ${cfg.secrets.otp}
db_key_base: ${cfg.secrets.db}
+ jws_private_key: ${builtins.toJSON cfg.secrets.jws}
'';
gitlabConfig = {
@@ -69,7 +94,8 @@ let
container_registry = true;
};
};
- repositories.storages.default = "${cfg.statePath}/repositories";
+ repositories.storages.default.path = "${cfg.statePath}/repositories";
+ repositories.storages.default.gitaly_address = "unix:${gitalySocket}";
artifacts.enabled = true;
lfs.enabled = true;
gravatar.enabled = true;
@@ -86,11 +112,22 @@ let
upload_pack = true;
receive_pack = true;
};
+ workhorse = {
+ secret_file = "${cfg.statePath}/.gitlab_workhorse_secret";
+ };
git = {
bin_path = "git";
max_size = 20971520; # 20MB
timeout = 10;
};
+ monitoring = {
+ ip_whitelist = [ "127.0.0.0/8" "::1/128" ];
+ sidekiq_exporter = {
+ enable = true;
+ address = "localhost";
+ port = 3807;
+ };
+ };
extra = {};
};
};
@@ -108,6 +145,8 @@ let
GITLAB_SHELL_CONFIG_PATH = "${cfg.statePath}/shell/config.yml";
GITLAB_SHELL_SECRET_PATH = "${cfg.statePath}/config/gitlab_shell_secret";
GITLAB_SHELL_HOOKS_PATH = "${cfg.statePath}/shell/hooks";
+ GITLAB_REDIS_CONFIG_FILE = pkgs.writeText "gitlab-redis.yml" redisYml;
+ prometheus_multiproc_dir = "/run/gitlab";
RAILS_ENV = "production";
};
@@ -115,15 +154,15 @@ let
gitlab-rake = pkgs.stdenv.mkDerivation rec {
name = "gitlab-rake";
- buildInputs = [ cfg.packages.gitlab cfg.packages.gitlab.env pkgs.makeWrapper ];
+ buildInputs = [ cfg.packages.gitlab cfg.packages.gitlab.rubyEnv pkgs.makeWrapper ];
phases = "installPhase fixupPhase";
buildPhase = "";
installPhase = ''
mkdir -p $out/bin
- makeWrapper ${cfg.packages.gitlab.env}/bin/bundle $out/bin/gitlab-bundle \
+ makeWrapper ${cfg.packages.gitlab.rubyEnv}/bin/bundle $out/bin/gitlab-bundle \
${concatStrings (mapAttrsToList (name: value: "--set ${name} '${value}' ") gitlabEnv)} \
--set GITLAB_CONFIG_PATH '${cfg.statePath}/config' \
- --set PATH '${lib.makeBinPath [ pkgs.nodejs pkgs.gzip config.services.postgresql.package ]}:$PATH' \
+ --set PATH '${lib.makeBinPath [ pkgs.nodejs pkgs.gzip pkgs.git pkgs.gnutar config.services.postgresql.package ]}:$PATH' \
--set RAKEOPT '-f ${cfg.packages.gitlab}/share/gitlab/Rakefile' \
--run 'cd ${cfg.packages.gitlab}/share/gitlab'
makeWrapper $out/bin/gitlab-bundle $out/bin/gitlab-rake \
@@ -182,6 +221,13 @@ in {
description = "Reference to the gitlab-workhorse package";
};
+ packages.gitaly = mkOption {
+ type = types.package;
+ default = pkgs.gitaly;
+ defaultText = "pkgs.gitaly";
+ description = "Reference to the gitaly package";
+ };
+
statePath = mkOption {
type = types.str;
default = "/var/gitlab/state";
@@ -359,6 +405,19 @@ in {
'';
};
+ secrets.jws = mkOption {
+ type = types.str;
+ description = ''
+ The secret is used to encrypt session keys. If you change or lose
+ this key, users will be disconnected.
+
+ Make sure the secret is an RSA private key in PEM format. You can
+ generate one with
+
+ openssl genrsa 2048
+ '';
+ };
+
extraConfig = mkOption {
type = types.attrs;
default = {};
@@ -420,6 +479,7 @@ in {
ruby
openssh
nodejs
+ gnupg
];
serviceConfig = {
Type = "simple";
@@ -428,7 +488,24 @@ in {
TimeoutSec = "300";
Restart = "on-failure";
WorkingDirectory = "${cfg.packages.gitlab}/share/gitlab";
- ExecStart="${cfg.packages.gitlab.env}/bin/bundle exec \"sidekiq -C \"${cfg.packages.gitlab}/share/gitlab/config/sidekiq_queues.yml\" -e production -P ${cfg.statePath}/tmp/sidekiq.pid\"";
+ ExecStart="${cfg.packages.gitlab.rubyEnv}/bin/bundle exec \"sidekiq -C \"${cfg.packages.gitlab}/share/gitlab/config/sidekiq_queues.yml\" -e production -P ${cfg.statePath}/tmp/sidekiq.pid\"";
+ };
+ };
+
+ systemd.services.gitaly = {
+ after = [ "network.target" "gitlab.service" ];
+ wantedBy = [ "multi-user.target" ];
+ environment.HOME = gitlabEnv.HOME;
+ path = with pkgs; [ gitAndTools.git cfg.packages.gitaly.rubyEnv ];
+ serviceConfig = {
+ #PermissionsStartOnly = true; # preStart must be run as root
+ Type = "simple";
+ User = cfg.user;
+ Group = cfg.group;
+ TimeoutSec = "300";
+ Restart = "on-failure";
+ WorkingDirectory = gitlabEnv.HOME;
+ ExecStart = "${cfg.packages.gitaly}/bin/gitaly ${gitalyToml}";
};
};
@@ -463,7 +540,7 @@ in {
+ "-listenAddr /run/gitlab/gitlab-workhorse.socket "
+ "-authSocket ${gitlabSocket} "
+ "-documentRoot ${cfg.packages.gitlab}/share/gitlab/public "
- + "-secretPath ${cfg.packages.gitlab}/share/gitlab/.gitlab_workhorse_secret";
+ + "-secretPath ${cfg.statePath}/.gitlab_workhorse_secret";
};
};
@@ -477,6 +554,8 @@ in {
gitAndTools.git
openssh
nodejs
+ procps
+ gnupg
];
preStart = ''
mkdir -p ${cfg.backupPath}
@@ -486,28 +565,29 @@ in {
mkdir -p ${gitlabConfig.production.shared.path}/lfs-objects
mkdir -p ${gitlabConfig.production.shared.path}/pages
mkdir -p ${cfg.statePath}/log
- mkdir -p ${cfg.statePath}/shell
mkdir -p ${cfg.statePath}/tmp/pids
mkdir -p ${cfg.statePath}/tmp/sockets
+ mkdir -p ${cfg.statePath}/shell
rm -rf ${cfg.statePath}/config ${cfg.statePath}/shell/hooks
- mkdir -p ${cfg.statePath}/config ${cfg.statePath}/shell
+ mkdir -p ${cfg.statePath}/config
- tr -dc A-Za-z0-9 < /dev/urandom | head -c 32 > ${cfg.statePath}/config/gitlab_shell_secret
+ ${pkgs.openssl}/bin/openssl rand -hex 32 > ${cfg.statePath}/config/gitlab_shell_secret
# The uploads directory is hardcoded somewhere deep in rails. It is
# symlinked in the gitlab package to /run/gitlab/uploads to make it
# configurable
mkdir -p /run/gitlab
- mkdir -p ${cfg.statePath}/uploads
+ mkdir -p ${cfg.statePath}/{log,uploads}
+ ln -sf ${cfg.statePath}/log /run/gitlab/log
ln -sf ${cfg.statePath}/uploads /run/gitlab/uploads
+ ln -sf ${cfg.statePath}/tmp /run/gitlab/tmp
chown -R ${cfg.user}:${cfg.group} /run/gitlab
# Prepare home directory
mkdir -p ${gitlabEnv.HOME}/.ssh
touch ${gitlabEnv.HOME}/.ssh/authorized_keys
chown -R ${cfg.user}:${cfg.group} ${gitlabEnv.HOME}/
- chmod -R u+rwX,go-rwx+X ${gitlabEnv.HOME}/
cp -rf ${cfg.packages.gitlab}/share/gitlab/config.dist/* ${cfg.statePath}/config
${optionalString cfg.smtp.enable ''
@@ -532,14 +612,14 @@ in {
if [ "${cfg.databaseHost}" = "127.0.0.1" ]; then
if ! test -e "${cfg.statePath}/db-created"; then
- psql postgres -c "CREATE ROLE ${cfg.databaseUsername} WITH LOGIN NOCREATEDB NOCREATEROLE NOCREATEUSER ENCRYPTED PASSWORD '${cfg.databasePassword}'"
- ${config.services.postgresql.package}/bin/createdb --owner ${cfg.databaseUsername} ${cfg.databaseName} || true
+ ${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql postgres -c "CREATE ROLE ${cfg.databaseUsername} WITH LOGIN NOCREATEDB NOCREATEROLE ENCRYPTED PASSWORD '${cfg.databasePassword}'"
+ ${pkgs.sudo}/bin/sudo -u ${pgSuperUser} ${config.services.postgresql.package}/bin/createdb --owner ${cfg.databaseUsername} ${cfg.databaseName}
touch "${cfg.statePath}/db-created"
fi
fi
# enable required pg_trgm extension for gitlab
- psql gitlab -c "CREATE EXTENSION IF NOT EXISTS pg_trgm"
+ ${pkgs.sudo}/bin/sudo -u ${pgSuperUser} psql ${cfg.databaseName} -c "CREATE EXTENSION IF NOT EXISTS pg_trgm"
# Always do the db migrations just to be sure the database is up-to-date
${gitlab-rake}/bin/gitlab-rake db:migrate RAILS_ENV=production
@@ -548,14 +628,27 @@ in {
# up the initial database
if ! test -e "${cfg.statePath}/db-seeded"; then
${gitlab-rake}/bin/gitlab-rake db:seed_fu RAILS_ENV=production \
- GITLAB_ROOT_PASSWORD="${cfg.initialRootPassword}" GITLAB_ROOT_EMAIL="${cfg.initialRootEmail}"
+ GITLAB_ROOT_PASSWORD='${cfg.initialRootPassword}' GITLAB_ROOT_EMAIL='${cfg.initialRootEmail}'
touch "${cfg.statePath}/db-seeded"
fi
+ # The gitlab:shell:create_hooks task seems broken for fixing links
+ # so we instead delete all the hooks and create them anew
+ rm -f ${cfg.statePath}/repositories/**/*.git/hooks
+ ${gitlab-rake}/bin/gitlab-rake gitlab:shell:create_hooks RAILS_ENV=production
+
# Change permissions in the last step because some of the
# intermediary scripts like to create directories as root.
chown -R ${cfg.user}:${cfg.group} ${cfg.statePath}
- chmod -R u+rwX,go-rwx+X ${cfg.statePath}
+ chmod -R ug+rwX,o-rwx+X ${cfg.statePath}
+ chmod -R u+rwX,go-rwx+X ${gitlabEnv.HOME}
+ chmod -R ug+rwX,o-rwx ${cfg.statePath}/repositories
+ chmod -R ug-s ${cfg.statePath}/repositories
+ find ${cfg.statePath}/repositories -type d -print0 | xargs -0 chmod g+s
+ chmod 770 ${cfg.statePath}/uploads
+ chown -R ${cfg.user} ${cfg.statePath}/uploads
+ find ${cfg.statePath}/uploads -type f -exec chmod 0644 {} \;
+ find ${cfg.statePath}/uploads -type d -not -path ${cfg.statePath}/uploads -exec chmod 0770 {} \;
'';
serviceConfig = {
@@ -566,7 +659,7 @@ in {
TimeoutSec = "300";
Restart = "on-failure";
WorkingDirectory = "${cfg.packages.gitlab}/share/gitlab";
- ExecStart = "${cfg.packages.gitlab.env}/bin/bundle exec \"unicorn -c ${cfg.statePath}/config/unicorn.rb -E production\"";
+ ExecStart = "${cfg.packages.gitlab.rubyEnv}/bin/bundle exec \"unicorn -c ${cfg.statePath}/config/unicorn.rb -E production\"";
};
};
diff --git a/nixos/modules/services/misc/gitlab.xml b/nixos/modules/services/misc/gitlab.xml
index f9636f8e127863213d53df299c2ba72ed3d1e40c..4b00f50abd63d1b3432f4f39d5df8f14a7a07b12 100644
--- a/nixos/modules/services/misc/gitlab.xml
+++ b/nixos/modules/services/misc/gitlab.xml
@@ -66,6 +66,35 @@ services.gitlab = {
db = "uPgq1gtwwHiatiuE0YHqbGa5lEIXH7fMsvuTNgdzJi8P0Dg12gibTzBQbq5LT7PNzcc3BP9P1snHVnduqtGF43PgrQtU7XL93ts6gqe9CBNhjtaqUwutQUDkygP5NrV6";
secret = "devzJ0Tz0POiDBlrpWmcsjjrLaltyiAdS8TtgT9YNBOoUcDsfppiY3IXZjMVtKgXrFImIennFGOpPN8IkP8ATXpRgDD5rxVnKuTTwYQaci2NtaV1XxOQGjdIE50VGsR3";
otp = "e1GATJVuS2sUh7jxiPzZPre4qtzGGaS22FR50Xs1TerRVdgI3CBVUi5XYtQ38W4xFeS4mDqi5cQjExE838iViSzCdcG19XSL6qNsfokQP9JugwiftmhmCadtsnHErBMI";
+ jws = ''
+ -----BEGIN RSA PRIVATE KEY-----
+ MIIEpAIBAAKCAQEArrtx4oHKwXoqUbMNqnHgAklnnuDon3XG5LJB35yPsXKv/8GK
+ ke92wkI+s1Xkvsp8tg9BIY/7c6YK4SR07EWL+dB5qwctsWR2Q8z+/BKmTx9D99pm
+ hnsjuNIXTF7BXrx3RX6BxZpH5Vzzh9nCwWKT/JCFqtwH7afNGGL7aMf+hdaiUg/Q
+ SD05yRObioiO4iXDolsJOhrnbZvlzVHl1ZYxFJv0H6/Snc0BBA9Fl/3uj6ANpbjP
+ eXF1SnJCqT87bj46r5NdVauzaRxAsIfqHroHK4UZ98X5LjGQFGvSqTvyjPBS4I1i
+ s7VJU28ObuutHxIxSlH0ibn4HZqWmKWlTS652wIDAQABAoIBAGtPcUTTw2sJlR3x
+ 4k2wfAvLexkHNbZhBdKEa5JiO5mWPuLKwUiZEY2CU7Gd6csG3oqNWcm7/IjtC7dz
+ xV8p4yp8T4yq7vQIJ93B80NqTLtBD2QTvG2RCMJEPMzJUObWxkVmyVpLQyZo7KOd
+ KE/OM+aj94OUeEYLjRkSCScz1Gvq/qFG/nAy7KPCmN9JDHuhX26WHo2Rr1OnPNT/
+ 7diph0bB9F3b8gjjNTqXDrpdAqVOgR/PsjEBz6DMY+bdyMIn87q2yfmMexxRofN6
+ LulpzSaa6Yup8N8H6PzVO6KAkQuf1aQRj0sMwGk1IZEnj6I0KbuHIZkw21Nc6sf2
+ ESFySDECgYEA1PnCNn5tmLnwe62Ttmrzl20zIS3Me1gUVJ1NTfr6+ai0I9iMYU21
+ 5czuAjJPm9JKQF2vY8UAaCj2ZoObtHa/anb3xsCd8NXoM3iJq5JDoXI1ldz3Y+ad
+ U/bZUg1DLRvAniTuXmw9iOTwTwPxlDIGq5k+wG2Xmi1lk7zH8ezr9BMCgYEA0gfk
+ EhgcmPH8Z5cU3YYwOdt6HSJOM0OyN4k/5gnkv+HYVoJTj02gkrJmLr+mi1ugKj46
+ 7huYO9TVnrKP21tmbaSv1dp5hS3letVRIxSloEtVGXmmdvJvBRzDWos+G+KcvADi
+ fFCz6w8v9NmO40CB7y/3SxTmSiSxDQeoi9LhDBkCgYEAsPgMWm25sfOnkY2NNUIv
+ wT8bAlHlHQT2d8zx5H9NttBpR3P0ShJhuF8N0sNthSQ7ULrIN5YGHYcUH+DyLAWU
+ TuomP3/kfa+xL7vUYb269tdJEYs4AkoppxBySoz8qenqpz422D0G8M6TpIS5Y5Qi
+ GMrQ6uLl21YnlpiCaFOfSQMCgYEAmZxj1kgEQmhZrnn1LL/D7czz1vMMNrpAUhXz
+ wg9iWmSXkU3oR1sDIceQrIhHCo2M6thwyU0tXjUft93pEQocM/zLDaGoVxtmRxxV
+ J08mg8IVD3jFoyFUyWxsBIDqgAKRl38eJsXvkO+ep3mm49Z+Ma3nM+apN3j2dQ0w
+ 3HLzXaECgYBFLMEAboVFwi5+MZjGvqtpg2PVTisfuJy2eYnPwHs+AXUgi/xRNFjI
+ YHEa7UBPb5TEPSzWImQpETi2P5ywcUYL1EbN/nqPWmjFnat8wVmJtV4sUpJhubF4
+ Vqm9LxIWc1uQ1q1HDCejRIxIN3aSH+wgRS3Kcj8kCTIoXd1aERb04g==
+ -----END RSA PRIVATE KEY-----
+ '';
};
extraConfig = {
gitlab = {
diff --git a/nixos/modules/services/misc/gitolite.nix b/nixos/modules/services/misc/gitolite.nix
index 5012bed0c422dbf7edbfe13d2f60b0c3e9c717f0..f395b9558b5a4a985bfea1880a95328caa85e9b5 100644
--- a/nixos/modules/services/misc/gitolite.nix
+++ b/nixos/modules/services/misc/gitolite.nix
@@ -4,7 +4,8 @@ with lib;
let
cfg = config.services.gitolite;
- pubkeyFile = pkgs.writeText "gitolite-admin.pub" cfg.adminPubkey;
+ # Use writeTextDir to not leak Nix store hash into file name
+ pubkeyFile = (pkgs.writeTextDir "gitolite-admin.pub" cfg.adminPubkey) + "/gitolite-admin.pub";
hooks = lib.concatMapStrings (hook: "${hook} ") cfg.commonHooks;
in
{
@@ -40,6 +41,15 @@ in
'';
};
+ enableGitAnnex = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Enable git-annex support. Uses the extraGitoliteRc option
+ to apply the necessary configuration.
+ '';
+ };
+
commonHooks = mkOption {
type = types.listOf types.path;
default = [];
@@ -48,6 +58,37 @@ in
'';
};
+ extraGitoliteRc = mkOption {
+ type = types.lines;
+ default = "";
+ example = literalExample ''
+ $RC{UMASK} = 0027;
+ $RC{SITE_INFO} = 'This is our private repository host';
+ push( @{$RC{ENABLE}}, 'Kindergarten' ); # enable the command/feature
+ @{$RC{ENABLE}} = grep { $_ ne 'desc' } @{$RC{ENABLE}}; # disable the command/feature
+ '';
+ description = ''
+ Extra configuration to append to the default ~/.gitolite.rc.
+
+ This should be Perl code that modifies the %RC
+ configuration variable. The default ~/.gitolite.rc
+ content is generated by invoking gitolite print-default-rc,
+ and extra configuration from this option is appended to it. The result
+ is placed to Nix store, and the ~/.gitolite.rc file
+ becomes a symlink to it.
+
+ If you already have a customized (or otherwise changed)
+ ~/.gitolite.rc file, NixOS will refuse to replace
+ it with a symlink, and the `gitolite-init` initialization service
+ will fail. In this situation, in order to use this option, you
+ will need to take any customizations you may have in
+ ~/.gitolite.rc, convert them to appropriate Perl
+ statements, add them to this option, and remove the file.
+
+ See also the enableGitAnnex option.
+ '';
+ };
+
user = mkOption {
type = types.str;
default = "gitolite";
@@ -55,41 +96,125 @@ in
Gitolite user account. This is the username of the gitolite endpoint.
'';
};
+
+ group = mkOption {
+ type = types.str;
+ default = "gitolite";
+ description = ''
+ Primary group of the Gitolite user account.
+ '';
+ };
};
};
- config = mkIf cfg.enable {
+ config = mkIf cfg.enable (
+ let
+ manageGitoliteRc = cfg.extraGitoliteRc != "";
+ rcDir = pkgs.runCommand "gitolite-rc" { } rcDirScript;
+ rcDirScript =
+ ''
+ mkdir "$out"
+ export HOME=temp-home
+ mkdir -p "$HOME/.gitolite/logs" # gitolite can't run without it
+ '${pkgs.gitolite}'/bin/gitolite print-default-rc >>"$out/gitolite.rc.default"
+ cat <>"$out/gitolite.rc"
+ # This file is managed by NixOS.
+ # Use services.gitolite options to control it.
+
+ END
+ cat "$out/gitolite.rc.default" >>"$out/gitolite.rc"
+ '' +
+ optionalString (cfg.extraGitoliteRc != "") ''
+ echo -n ${escapeShellArg ''
+
+ # Added by NixOS:
+ ${removeSuffix "\n" cfg.extraGitoliteRc}
+
+ # per perl rules, this should be the last line in such a file:
+ 1;
+ ''} >>"$out/gitolite.rc"
+ '';
+ in {
+ services.gitolite.extraGitoliteRc = optionalString cfg.enableGitAnnex ''
+ # Enable git-annex support:
+ push( @{$RC{ENABLE}}, 'git-annex-shell ua');
+ '';
+
users.extraUsers.${cfg.user} = {
description = "Gitolite user";
home = cfg.dataDir;
createHome = true;
uid = config.ids.uids.gitolite;
+ group = cfg.group;
useDefaultShell = true;
};
+ users.extraGroups."${cfg.group}".gid = config.ids.gids.gitolite;
systemd.services."gitolite-init" = {
description = "Gitolite initialization";
wantedBy = [ "multi-user.target" ];
+ unitConfig.RequiresMountsFor = cfg.dataDir;
serviceConfig.User = "${cfg.user}";
serviceConfig.Type = "oneshot";
serviceConfig.RemainAfterExit = true;
- path = [ pkgs.gitolite pkgs.git pkgs.perl pkgs.bash config.programs.ssh.package ];
- script = ''
- cd ${cfg.dataDir}
- mkdir -p .gitolite/logs
- if [ ! -d repositories ]; then
- gitolite setup -pk ${pubkeyFile}
- fi
- if [ -n "${hooks}" ]; then
- cp ${hooks} .gitolite/hooks/common/
- chmod +x .gitolite/hooks/common/*
- fi
- gitolite setup # Upgrade if needed
- '';
+ path = [ pkgs.gitolite pkgs.git pkgs.perl pkgs.bash pkgs.diffutils config.programs.ssh.package ];
+ script =
+ let
+ rcSetupScriptIfCustomFile =
+ if manageGitoliteRc then ''
+ cat <ERROR: NixOS can't apply declarative configuration
+ <3>to your .gitolite.rc file, because it seems to be
+ <3>already customized manually.
+ <3>See the services.gitolite.extraGitoliteRc option
+ <3>in "man configuration.nix" for more information.
+ END
+ # Not sure if the line below addresses the issue directly or just
+ # adds a delay, but without it our error message often doesn't
+ # show up in `systemctl status gitolite-init`.
+ journalctl --flush
+ exit 1
+ '' else ''
+ :
+ '';
+ rcSetupScriptIfDefaultFileOrStoreSymlink =
+ if manageGitoliteRc then ''
+ ln -sf "${rcDir}/gitolite.rc" "$GITOLITE_RC"
+ '' else ''
+ [[ -L "$GITOLITE_RC" ]] && rm -f "$GITOLITE_RC"
+ '';
+ in
+ ''
+ cd ${cfg.dataDir}
+ mkdir -p .gitolite/logs
+
+ GITOLITE_RC=.gitolite.rc
+ GITOLITE_RC_DEFAULT=${rcDir}/gitolite.rc.default
+ if ( [[ ! -e "$GITOLITE_RC" ]] && [[ ! -L "$GITOLITE_RC" ]] ) ||
+ ( [[ -f "$GITOLITE_RC" ]] && diff -q "$GITOLITE_RC" "$GITOLITE_RC_DEFAULT" >/dev/null ) ||
+ ( [[ -L "$GITOLITE_RC" ]] && [[ "$(readlink "$GITOLITE_RC")" =~ ^/nix/store/ ]] )
+ then
+ '' + rcSetupScriptIfDefaultFileOrStoreSymlink +
+ ''
+ else
+ '' + rcSetupScriptIfCustomFile +
+ ''
+ fi
+
+ if [ ! -d repositories ]; then
+ gitolite setup -pk ${pubkeyFile}
+ fi
+ if [ -n "${hooks}" ]; then
+ cp ${hooks} .gitolite/hooks/common/
+ chmod +x .gitolite/hooks/common/*
+ fi
+ gitolite setup # Upgrade if needed
+ '';
};
- environment.systemPackages = [ pkgs.gitolite pkgs.git ];
- };
+ environment.systemPackages = [ pkgs.gitolite pkgs.git ]
+ ++ optional cfg.enableGitAnnex pkgs.gitAndTools.git-annex;
+ });
}
diff --git a/nixos/modules/services/misc/gogs.nix b/nixos/modules/services/misc/gogs.nix
index ad2e36d04d53c77b56584e2d7f447aef903ecaa9..f6d326e43d948c665c64c39fbbe50b6d43a98053 100644
--- a/nixos/modules/services/misc/gogs.nix
+++ b/nixos/modules/services/misc/gogs.nix
@@ -25,6 +25,7 @@ let
HTTP_ADDR = ${cfg.httpAddress}
HTTP_PORT = ${toString cfg.httpPort}
ROOT_URL = ${cfg.rootUrl}
+ STATIC_ROOT_PATH = ${cfg.staticRootPath}
[session]
COOKIE_NAME = session
@@ -175,6 +176,13 @@ in
'';
};
+ staticRootPath = mkOption {
+ type = types.str;
+ default = "${pkgs.gogs.data}";
+ example = "/var/lib/gogs/data";
+ description = "Upper level of template and static files path.";
+ };
+
extraConfig = mkOption {
type = types.str;
default = "";
@@ -195,6 +203,8 @@ in
runConfig = "${cfg.stateDir}/custom/conf/app.ini";
secretKey = "${cfg.stateDir}/custom/conf/secret_key";
in ''
+ mkdir -p ${cfg.stateDir}
+
# copy custom configuration and generate a random secret key if needed
${optionalString (cfg.useWizard == false) ''
mkdir -p ${cfg.stateDir}/custom/conf
@@ -240,7 +250,7 @@ in
};
};
- users = {
+ users = mkIf (cfg.user == "gogs") {
extraUsers.gogs = {
description = "Go Git Service";
uid = config.ids.uids.gogs;
@@ -257,7 +267,7 @@ in
in the Nix store. Use database.passwordFile instead.'';
# Create database passwordFile default when password is configured.
- services.gogs.database.passwordFile = mkIf (cfg.database.password != "")
+ services.gogs.database.passwordFile =
(mkDefault (toString (pkgs.writeTextFile {
name = "gogs-database-password";
text = cfg.database.password;
diff --git a/nixos/modules/services/misc/gollum.nix b/nixos/modules/services/misc/gollum.nix
new file mode 100644
index 0000000000000000000000000000000000000000..81fb024f9094d20b5ebd47a82096d35d746217dd
--- /dev/null
+++ b/nixos/modules/services/misc/gollum.nix
@@ -0,0 +1,92 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.gollum;
+in
+
+{
+ options.services.gollum = {
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Enable the Gollum service.";
+ };
+
+ address = mkOption {
+ type = types.str;
+ default = "0.0.0.0";
+ description = "IP address on which the web server will listen.";
+ };
+
+ port = mkOption {
+ type = types.int;
+ default = 4567;
+ description = "Port on which the web server will run.";
+ };
+
+ extraConfig = mkOption {
+ type = types.lines;
+ default = "";
+ description = "Content of the configuration file";
+ };
+
+ branch = mkOption {
+ type = types.str;
+ default = "master";
+ example = "develop";
+ description = "Git branch to serve";
+ };
+
+ stateDir = mkOption {
+ type = types.path;
+ default = "/var/lib/gollum";
+ description = "Specifies the path of the repository directory. If it does not exist, Gollum will create it on startup.";
+ };
+
+ };
+
+ config = mkIf cfg.enable {
+
+ users.users.gollum = {
+ group = config.users.users.gollum.name;
+ description = "Gollum user";
+ createHome = false;
+ };
+
+ users.groups.gollum = { };
+
+ systemd.services.gollum = {
+ description = "Gollum wiki";
+ after = [ "network.target" ];
+ wantedBy = [ "multi-user.target" ];
+ path = [ pkgs.git ];
+
+ preStart = let
+ userName = config.users.users.gollum.name;
+ groupName = config.users.groups.gollum.name;
+ in ''
+ # All of this is safe to be run on an existing repo
+ mkdir -p ${cfg.stateDir}
+ git init ${cfg.stateDir}
+ chmod 755 ${cfg.stateDir}
+ chown -R ${userName}:${groupName} ${cfg.stateDir}
+ '';
+
+ serviceConfig = {
+ User = config.users.extraUsers.gollum.name;
+ Group = config.users.extraGroups.gollum.name;
+ PermissionsStartOnly = true;
+ ExecStart = ''
+ ${pkgs.gollum}/bin/gollum \
+ --port ${toString cfg.port} \
+ --host ${cfg.address} \
+ --config ${builtins.toFile "gollum-config.rb" cfg.extraConfig} \
+ --ref ${cfg.branch} \
+ ${cfg.stateDir}
+ '';
+ };
+ };
+ };
+}
diff --git a/nixos/modules/services/misc/logkeys.nix b/nixos/modules/services/misc/logkeys.nix
new file mode 100644
index 0000000000000000000000000000000000000000..6051c884465da015ba0b21dd46380f4fb129e0a1
--- /dev/null
+++ b/nixos/modules/services/misc/logkeys.nix
@@ -0,0 +1,23 @@
+{ config, lib, ... }:
+
+with lib;
+
+let
+ cfg = config.services.logkeys;
+in {
+ options.services.logkeys = {
+ enable = mkEnableOption "logkeys service";
+ };
+
+ config = mkIf cfg.enable {
+ systemd.services.logkeys = {
+ description = "LogKeys Keylogger Daemon";
+ wantedBy = [ "multi-user.target" ];
+ serviceConfig = {
+ ExecStart = "${pkgs.logkeys}/bin/logkeys -s";
+ ExecStop = "${pkgs.logkeys}/bin/logkeys -k";
+ Type = "forking";
+ };
+ };
+ };
+}
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index bf1304ee7ac2af1f391a3550c1f96119d8084b7b..beca820d2d602054ccad9cd8f6b976b2b122c67c 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -189,6 +189,7 @@ in
sshKey = "/root/.ssh/id_buildfarm";
system = "x86_64-linux";
maxJobs = 2;
+ speedFactor = 2;
supportedFeatures = [ "kvm" ];
mandatoryFeatures = [ "perf" ];
}
@@ -428,7 +429,7 @@ in
fi
'';
- nix.nrBuildUsers = mkDefault (lib.max 10 cfg.maxJobs);
+ nix.nrBuildUsers = mkDefault (lib.max 32 cfg.maxJobs);
users.extraUsers = nixbldUsers;
diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix
index 515864ec2e2dead629e890480646ec6d1cf6d8d8..41cadb4a6de02d7250adc7d2965475b08c2c5c9a 100644
--- a/nixos/modules/services/misc/nixos-manual.nix
+++ b/nixos/modules/services/misc/nixos-manual.nix
@@ -135,8 +135,9 @@ in
};
};
- services.mingetty.helpLine = mkIf cfg.showManual
- "\nPress for the NixOS manual.";
+ services.mingetty.helpLine = "\nRun `nixos-help` "
+ + lib.optionalString cfg.showManual "or press "
+ + "for the NixOS manual.";
};
diff --git a/nixos/modules/services/misc/nzbget.nix b/nixos/modules/services/misc/nzbget.nix
index b39511624c8095c21e1b809f683cc1115ddf8c0b..a186d57ceba216bbd96e54df4ffed7468a0eb721 100644
--- a/nixos/modules/services/misc/nzbget.nix
+++ b/nixos/modules/services/misc/nzbget.nix
@@ -4,9 +4,7 @@ with lib;
let
cfg = config.services.nzbget;
- nzbget = pkgs.nzbget;
-in
-{
+ nzbget = pkgs.nzbget; in {
options = {
services.nzbget = {
enable = mkEnableOption "NZBGet";
@@ -42,21 +40,41 @@ in
p7zip
];
preStart = ''
- test -d /var/lib/nzbget || {
- echo "Creating nzbget state directoy in /var/lib/"
- mkdir -p /var/lib/nzbget
+ datadir=/var/lib/nzbget
+ cfgtemplate=${cfg.package}/share/nzbget/nzbget.conf
+ test -d $datadir || {
+ echo "Creating nzbget data directory in $datadir"
+ mkdir -p $datadir
}
- test -f /var/lib/nzbget/nzbget.conf || {
- echo "nzbget.conf not found. Copying default config to /var/lib/nzbget/nzbget.conf"
- cp ${cfg.package}/share/nzbget/nzbget.conf /var/lib/nzbget/nzbget.conf
- echo "Setting file mode of nzbget.conf to 0700 (needs to be written and contains plaintext credentials)"
- chmod 0700 /var/lib/nzbget/nzbget.conf
+ test -f $configfile || {
+ echo "nzbget.conf not found. Copying default config $cfgtemplate to $configfile"
+ cp $cfgtemplate $configfile
+ echo "Setting $configfile permissions to 0700 (needs to be written and contains plaintext credentials)"
+ chmod 0700 $configfile
echo "Setting temporary \$MAINDIR variable in default config required in order to allow nzbget to complete initial start"
echo "Remember to change this to a proper value once NZBGet startup has been completed"
- sed -i -e 's/MainDir=.*/MainDir=\/tmp/g' /var/lib/nzbget/nzbget.conf
+ sed -i -e 's/MainDir=.*/MainDir=\/tmp/g' $configfile
}
- echo "Ensuring proper ownership of /var/lib/nzbget (${cfg.user}:${cfg.group})."
- chown -R ${cfg.user}:${cfg.group} /var/lib/nzbget
+ echo "Ensuring proper ownership of $datadir (${cfg.user}:${cfg.group})."
+ chown -R ${cfg.user}:${cfg.group} $datadir
+ '';
+
+ script = ''
+ configfile=/var/lib/nzbget/nzbget.conf
+ args="--daemon --configfile $configfile"
+ # The script in preStart (above) copies nzbget's config template to datadir on first run, containing paths that point to the nzbget derivation installed at the time.
+ # These paths break when nzbget is upgraded & the original derivation is garbage collected. If such broken paths are found in the config file, override them to point to
+ # the currently installed nzbget derivation.
+ cfgfallback () {
+ local hit=`grep -Po "(?<=^$1=).*+" "$configfile" | sed 's/[ \t]*$//'` # Strip trailing whitespace
+ ( test $hit && test -e $hit ) || {
+ echo "In $configfile, valid $1 not found; falling back to $1=$2"
+ args+=" -o $1=$2"
+ }
+ }
+ cfgfallback ConfigTemplate ${cfg.package}/share/nzbget/nzbget.conf
+ cfgfallback WebDir ${cfg.package}/share/nzbget/webui
+ ${cfg.package}/bin/nzbget $args
'';
serviceConfig = {
@@ -64,7 +82,6 @@ in
User = cfg.user;
Group = cfg.group;
PermissionsStartOnly = "true";
- ExecStart = "${cfg.package}/bin/nzbget --daemon --configfile /var/lib/nzbget/nzbget.conf";
Restart = "on-failure";
};
};
diff --git a/nixos/modules/services/misc/plex.nix b/nixos/modules/services/misc/plex.nix
index e37b486375bd557875398571f0c3ab6e26e95355..46221ace30843ca2236cafb1adb61d8798a62942 100644
--- a/nixos/modules/services/misc/plex.nix
+++ b/nixos/modules/services/misc/plex.nix
@@ -137,7 +137,7 @@ in
User = cfg.user;
Group = cfg.group;
PermissionsStartOnly = "true";
- ExecStart = "/bin/sh -c ${cfg.package}/usr/lib/plexmediaserver/Plex\\ Media\\ Server";
+ ExecStart = "\"${cfg.package}/usr/lib/plexmediaserver/Plex Media Server\"";
KillSignal = "SIGQUIT";
Restart = "on-failure";
};
diff --git a/nixos/modules/services/misc/plexpy.nix b/nixos/modules/services/misc/plexpy.nix
new file mode 100644
index 0000000000000000000000000000000000000000..df9f125812471fae6ac4c973863c5b9f8bc63082
--- /dev/null
+++ b/nixos/modules/services/misc/plexpy.nix
@@ -0,0 +1,81 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+ cfg = config.services.plexpy;
+in
+{
+ options = {
+ services.plexpy = {
+ enable = mkEnableOption "PlexPy Plex Monitor";
+
+ dataDir = mkOption {
+ type = types.str;
+ default = "/var/lib/plexpy";
+ description = "The directory where PlexPy stores its data files.";
+ };
+
+ configFile = mkOption {
+ type = types.str;
+ default = "/var/lib/plexpy/config.ini";
+ description = "The location of PlexPy's config file.";
+ };
+
+ port = mkOption {
+ type = types.int;
+ default = 8181;
+ description = "TCP port where PlexPy listens.";
+ };
+
+ user = mkOption {
+ type = types.str;
+ default = "plexpy";
+ description = "User account under which PlexPy runs.";
+ };
+
+ group = mkOption {
+ type = types.str;
+ default = "nogroup";
+ description = "Group under which PlexPy runs.";
+ };
+
+ package = mkOption {
+ type = types.package;
+ default = pkgs.plexpy;
+ defaultText = "pkgs.plexpy";
+ description = ''
+ The PlexPy package to use.
+ '';
+ };
+ };
+ };
+
+ config = mkIf cfg.enable {
+ systemd.services.plexpy = {
+ description = "PlexPy Plex Monitor";
+ after = [ "network.target" ];
+ wantedBy = [ "multi-user.target" ];
+ preStart = ''
+ test -d "${cfg.dataDir}" || {
+ echo "Creating initial PlexPy data directory in \"${cfg.dataDir}\"."
+ mkdir -p "${cfg.dataDir}"
+ chown ${cfg.user}:${cfg.group} "${cfg.dataDir}"
+ }
+ '';
+ serviceConfig = {
+ Type = "simple";
+ User = cfg.user;
+ Group = cfg.group;
+ PermissionsStartOnly = "true";
+ GuessMainPID = "false";
+ ExecStart = "${cfg.package}/bin/plexpy --datadir ${cfg.dataDir} --config ${cfg.configFile} --port ${toString cfg.port} --pidfile ${cfg.dataDir}/plexpy.pid --nolaunch";
+ Restart = "on-failure";
+ };
+ };
+
+ users.extraUsers = mkIf (cfg.user == "plexpy") {
+ plexpy = { group = cfg.group; uid = config.ids.uids.plexpy; };
+ };
+ };
+}
diff --git a/nixos/modules/services/misc/pykms.nix b/nixos/modules/services/misc/pykms.nix
new file mode 100644
index 0000000000000000000000000000000000000000..897e856e2a2d6cc6e782ed4bd3316446c5f9a771
--- /dev/null
+++ b/nixos/modules/services/misc/pykms.nix
@@ -0,0 +1,90 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.pykms;
+
+ home = "/var/lib/pykms";
+
+ services = {
+ serviceConfig = {
+ Restart = "on-failure";
+ RestartSec = "10s";
+ StartLimitInterval = "1min";
+ PrivateTmp = true;
+ ProtectSystem = "full";
+ ProtectHome = true;
+ };
+ };
+
+in {
+
+ options = {
+ services.pykms = rec {
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Whether to enable the PyKMS service.";
+ };
+
+ listenAddress = mkOption {
+ type = types.str;
+ default = "0.0.0.0";
+ description = "The IP address on which to listen.";
+ };
+
+ port = mkOption {
+ type = types.int;
+ default = 1688;
+ description = "The port on which to listen.";
+ };
+
+ verbose = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Show verbose output.";
+ };
+
+ openFirewallPort = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Whether the listening port should be opened automatically.";
+ };
+ };
+ };
+
+ config = mkIf cfg.enable {
+ networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewallPort [ cfg.port ];
+
+ systemd.services = {
+ pykms = services // {
+ description = "Python KMS";
+ wantedBy = [ "multi-user.target" ];
+ serviceConfig = with pkgs; {
+ User = "pykms";
+ Group = "pykms";
+ ExecStartPre = "${getBin pykms}/bin/create_pykms_db.sh ${home}/clients.db";
+ ExecStart = "${getBin pykms}/bin/server.py ${optionalString cfg.verbose "--verbose"} ${cfg.listenAddress} ${toString cfg.port}";
+ WorkingDirectory = home;
+ MemoryLimit = "64M";
+ };
+ };
+ };
+
+ users = {
+ extraUsers.pykms = {
+ name = "pykms";
+ group = "pykms";
+ home = home;
+ createHome = true;
+ uid = config.ids.uids.pykms;
+ description = "PyKMS daemon user";
+ };
+
+ extraGroups.pykms = {
+ gid = config.ids.gids.pykms;
+ };
+ };
+ };
+}
diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix
index e3f1ec67cbb3fc1b1645212996959bb689570324..3997b3f0dca0ead75af5bddc89e30b8c69186a3d 100644
--- a/nixos/modules/services/misc/redmine.nix
+++ b/nixos/modules/services/misc/redmine.nix
@@ -191,7 +191,7 @@ in {
if [ "${cfg.databaseHost}" = "127.0.0.1" ]; then
if ! test -e "${cfg.stateDir}/db-created"; then
- psql postgres -c "CREATE ROLE redmine WITH LOGIN NOCREATEDB NOCREATEROLE NOCREATEUSER ENCRYPTED PASSWORD '${cfg.databasePassword}'"
+ psql postgres -c "CREATE ROLE redmine WITH LOGIN NOCREATEDB NOCREATEROLE ENCRYPTED PASSWORD '${cfg.databasePassword}'"
${config.services.postgresql.package}/bin/createdb --owner redmine redmine || true
touch "${cfg.stateDir}/db-created"
fi
diff --git a/nixos/modules/services/misc/tzupdate.nix b/nixos/modules/services/misc/tzupdate.nix
new file mode 100644
index 0000000000000000000000000000000000000000..570982ced29a730e9d7e84bb7883cce5b9de43f3
--- /dev/null
+++ b/nixos/modules/services/misc/tzupdate.nix
@@ -0,0 +1,45 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.tzupdate;
+in {
+ options.services.tzupdate = {
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Enable the tzupdate timezone updating service. This provides
+ a one-shot service which can be activated with systemctl to
+ update the timezone.
+ '';
+ };
+ };
+
+ config = mkIf cfg.enable {
+ # We need to have imperative time zone management for this to work.
+ # This will give users an error if they have set an explicit time
+ # zone, which is better than silently overriding it.
+ time.timeZone = null;
+
+ # We provide a one-shot service which can be manually run. We could
+ # provide a service that runs on startup, but it's tricky to get
+ # a service to run after you have *internet* access.
+ systemd.services.tzupdate = {
+ description = "tzupdate timezone update service";
+ wants = [ "network-online.target" ];
+ after = [ "network-online.target" ];
+
+ serviceConfig = {
+ Type = "oneshot";
+ # We could link directly into pkgs.tzdata, but at least timedatectl seems
+ # to expect the symlink to point directly to a file in etc.
+ # Setting the "debian timezone file" to point at /dev/null stops it doing anything.
+ ExecStart = "${pkgs.tzupdate}/bin/tzupdate -z /etc/zoneinfo -d /dev/null";
+ };
+ };
+ };
+
+ meta.maintainers = [ maintainers.michaelpj ];
+}
diff --git a/nixos/modules/services/monitoring/dd-agent/dd-agent.nix b/nixos/modules/services/monitoring/dd-agent/dd-agent.nix
index 8d3d4f2065eca99f2753c24c030db52eae2bf5c5..beaa2c01b2984db726a324dfde3d24adefe1f10b 100644
--- a/nixos/modules/services/monitoring/dd-agent/dd-agent.nix
+++ b/nixos/modules/services/monitoring/dd-agent/dd-agent.nix
@@ -23,7 +23,7 @@ let
# proxy_password: password
# tags: mytag0, mytag1
- ${optionalString (cfg.tags != null ) "tags: ${concatStringsSep "," cfg.tags }"}
+ ${optionalString (cfg.tags != null ) "tags: ${concatStringsSep ", " cfg.tags }"}
# collect_ec2_tags: no
# recent_point_threshold: 30
diff --git a/nixos/modules/services/monitoring/fusion-inventory.nix b/nixos/modules/services/monitoring/fusion-inventory.nix
new file mode 100644
index 0000000000000000000000000000000000000000..1c00f3c299e95dd286e6c3b2038b59758b0e3f94
--- /dev/null
+++ b/nixos/modules/services/monitoring/fusion-inventory.nix
@@ -0,0 +1,66 @@
+# Fusion Inventory daemon.
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.fusionInventory;
+
+ configFile = pkgs.writeText "fusion_inventory.conf" ''
+ server = ${concatStringsSep ", " cfg.servers}
+
+ logger = stderr
+
+ ${cfg.extraConfig}
+ '';
+
+in {
+
+ ###### interface
+
+ options = {
+
+ services.fusionInventory = {
+
+ enable = mkEnableOption "Fusion Inventory Agent";
+
+ servers = mkOption {
+ type = types.listOf types.str;
+ description = ''
+ The urls of the OCS/GLPI servers to connect to.
+ '';
+ };
+
+ extraConfig = mkOption {
+ default = "";
+ type = types.lines;
+ description = ''
+ Configuration that is injected verbatim into the configuration file.
+ '';
+ };
+ };
+ };
+
+
+ ###### implementation
+
+ config = mkIf cfg.enable {
+
+ users.extraUsers = singleton {
+ name = "fusion-inventory";
+ description = "FusionInventory user";
+ };
+
+ systemd.services."fusion-inventory" = {
+ description = "Fusion Inventory Agent";
+ wantedBy = [ "multi-user.target" ];
+
+ environment = {
+ OPTIONS = "--no-category=software";
+ };
+ serviceConfig = {
+ ExecStart = "${pkgs.fusionInventory}/bin/fusioninventory-agent --conf-file=${configFile} --daemon --no-fork";
+ };
+ };
+ };
+}
diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix
index 332a04634d06f2bd3966db4288b1dc628773e6eb..4b1ad34b3a4efbc7e4bd256adbb464b51aef9426 100644
--- a/nixos/modules/services/monitoring/graphite.nix
+++ b/nixos/modules/services/monitoring/graphite.nix
@@ -7,10 +7,23 @@ let
writeTextOrNull = f: t: mapNullable (pkgs.writeTextDir f) t;
dataDir = cfg.dataDir;
+ staticDir = cfg.dataDir + "/static";
+
+ graphiteLocalSettingsDir = pkgs.runCommand "graphite_local_settings"
+ {inherit graphiteLocalSettings;} ''
+ mkdir -p $out
+ ln -s $graphiteLocalSettings $out/graphite_local_settings.py
+ '';
+
+ graphiteLocalSettings = pkgs.writeText "graphite_local_settings.py" (
+ "STATIC_ROOT = '${staticDir}'\n" +
+ optionalString (! isNull config.time.timeZone) "TIME_ZONE = '${config.time.timeZone}'\n"
+ + cfg.web.extraConfig
+ );
graphiteApiConfig = pkgs.writeText "graphite-api.yaml" ''
- time_zone: ${config.time.timeZone}
search_index: ${dataDir}/index
+ ${optionalString (!isNull config.time.timeZone) ''time_zone: ${config.time.timeZone}''}
${optionalString (cfg.api.finders != []) ''finders:''}
${concatMapStringsSep "\n" (f: " - " + f.moduleName) cfg.api.finders}
${optionalString (cfg.api.functions != []) ''functions:''}
@@ -94,6 +107,15 @@ in {
default = 8080;
type = types.int;
};
+
+ extraConfig = mkOption {
+ type = types.str;
+ default = "";
+ description = ''
+ Graphite webapp settings. See:
+
+ '';
+ };
};
api = {
@@ -445,7 +467,15 @@ in {
];
})
- (mkIf cfg.web.enable {
+ (mkIf cfg.web.enable (let
+ python27' = pkgs.python27.override {
+ packageOverrides = self: super: {
+ django = self.django_1_8;
+ django_tagging = self.django_tagging_0_4_3;
+ };
+ };
+ pythonPackages = python27'.pkgs;
+ in {
systemd.services.graphiteWeb = {
description = "Graphite Web Interface";
wantedBy = [ "multi-user.target" ];
@@ -455,14 +485,18 @@ in {
PYTHONPATH = let
penv = pkgs.python.buildEnv.override {
extraLibs = [
- pkgs.python27Packages.graphite_web
- pkgs.python27Packages.pysqlite
+ pythonPackages.graphite_web
+ pythonPackages.pysqlite
];
};
penvPack = "${penv}/${pkgs.python.sitePackages}";
- # opt/graphite/webapp contains graphite/settings.py
- # explicitly adding pycairo in path because it cannot be imported via buildEnv
- in "${penvPack}/opt/graphite/webapp:${penvPack}:${pkgs.pythonPackages.pycairo}/${pkgs.python.sitePackages}";
+ in concatStringsSep ":" [
+ "${graphiteLocalSettingsDir}"
+ "${penvPack}/opt/graphite/webapp"
+ "${penvPack}"
+ # explicitly adding pycairo in path because it cannot be imported via buildEnv
+ "${pkgs.pythonPackages.pycairo}/${pkgs.python.sitePackages}"
+ ];
DJANGO_SETTINGS_MODULE = "graphite.settings";
GRAPHITE_CONF_DIR = configDir;
GRAPHITE_STORAGE_DIR = dataDir;
@@ -470,9 +504,9 @@ in {
};
serviceConfig = {
ExecStart = ''
- ${pkgs.python27Packages.waitress}/bin/waitress-serve \
- --host=${cfg.web.listenAddress} --port=${toString cfg.web.port} \
- --call django.core.handlers.wsgi:WSGIHandler'';
+ ${pkgs.python27Packages.waitress-django}/bin/waitress-serve-django \
+ --host=${cfg.web.listenAddress} --port=${toString cfg.web.port}
+ '';
User = "graphite";
Group = "graphite";
PermissionsStartOnly = true;
@@ -482,21 +516,25 @@ in {
mkdir -p ${dataDir}/{whisper/,log/webapp/}
chmod 0700 ${dataDir}/{whisper/,log/webapp/}
- # populate database
- ${pkgs.python27Packages.graphite_web}/bin/manage-graphite.py syncdb --noinput
+ ${pkgs.pythonPackages.django_1_8}/bin/django-admin.py migrate --noinput
- # create index
- ${pkgs.python27Packages.graphite_web}/bin/build-index.sh
-
- chown -R graphite:graphite ${cfg.dataDir}
+ chown -R graphite:graphite ${dataDir}
touch ${dataDir}/db-created
fi
+
+ # Only collect static files when graphite_web changes.
+ if ! [ "${dataDir}/current_graphite_web" -ef "${pythonPackages.graphite_web}" ]; then
+ mkdir -p ${staticDir}
+ ${pkgs.pythonPackages.django_1_8}/bin/django-admin.py collectstatic --noinput --clear
+ chown -R graphite:graphite ${staticDir}
+ ln -sfT "${pythonPackages.graphite_web}" "${dataDir}/current_graphite_web"
+ fi
'';
};
- environment.systemPackages = [ pkgs.python27Packages.graphite_web ];
- })
+ environment.systemPackages = [ pythonPackages.graphite_web ];
+ }))
(mkIf cfg.api.enable {
systemd.services.graphiteApi = {
@@ -506,7 +544,7 @@ in {
environment = {
PYTHONPATH = let
aenv = pkgs.python.buildEnv.override {
- extraLibs = [ cfg.api.package pkgs.cairo ] ++ cfg.api.finders;
+ extraLibs = [ cfg.api.package pkgs.cairo pkgs.pythonPackages.cffi ] ++ cfg.api.finders;
};
in "${aenv}/${pkgs.python.sitePackages}";
GRAPHITE_API_CONFIG = graphiteApiConfig;
diff --git a/nixos/modules/services/monitoring/monit.nix b/nixos/modules/services/monitoring/monit.nix
index e07ffd2e8b548c8faa8ee769676e60fc9e653fa5..71f50cc0f19dfd397a9ba95c641c1f5467616b75 100644
--- a/nixos/modules/services/monitoring/monit.nix
+++ b/nixos/modules/services/monitoring/monit.nix
@@ -17,20 +17,22 @@ in
};
config = mkOption {
default = "";
- description = "monit.conf content";
+ description = "monitrc content";
};
};
};
config = mkIf config.services.monit.enable {
+ environment.systemPackages = [ pkgs.monit ];
+
environment.etc = [
{
source = pkgs.writeTextFile {
- name = "monit.conf";
+ name = "monitrc";
text = config.services.monit.config;
};
- target = "monit.conf";
+ target = "monitrc";
mode = "0400";
}
];
@@ -40,9 +42,9 @@ in
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
- ExecStart = "${pkgs.monit}/bin/monit -I -c /etc/monit.conf";
- ExecStop = "${pkgs.monit}/bin/monit -c /etc/monit.conf quit";
- ExecReload = "${pkgs.monit}/bin/monit -c /etc/monit.conf reload";
+ ExecStart = "${pkgs.monit}/bin/monit -I -c /etc/monitrc";
+ ExecStop = "${pkgs.monit}/bin/monit -c /etc/monitrc quit";
+ ExecReload = "${pkgs.monit}/bin/monit -c /etc/monitrc reload";
KillMode = "process";
Restart = "always";
};
diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix
index 723b04dc0fe90a149df1bcfddfb08fdb60ca9c1c..cc6d51f0ef1bae39e1caf6c5c45e6e8de5e227cc 100644
--- a/nixos/modules/services/monitoring/munin.nix
+++ b/nixos/modules/services/monitoring/munin.nix
@@ -193,6 +193,9 @@ in
};
};
+ # munin_stats plugin breaks as of 2.0.33 when this doesn't exist
+ systemd.tmpfiles.rules = [ "d /var/run/munin 0755 munin munin -" ];
+
}) (mkIf cronCfg.enable {
systemd.timers.munin-cron = {
@@ -212,9 +215,11 @@ in
};
};
- system.activationScripts.munin-cron = stringAfter [ "users" "groups" ] ''
- mkdir -p /var/{run,log,www,lib}/munin
- chown -R munin:munin /var/{run,log,www,lib}/munin
- '';
+ systemd.tmpfiles.rules = [
+ "d /var/run/munin 0755 munin munin -"
+ "d /var/log/munin 0755 munin munin -"
+ "d /var/www/munin 0755 munin munin -"
+ "d /var/lib/munin 0755 munin munin -"
+ ];
})];
}
diff --git a/nixos/modules/services/monitoring/prometheus/collectd-exporter.nix b/nixos/modules/services/monitoring/prometheus/collectd-exporter.nix
new file mode 100644
index 0000000000000000000000000000000000000000..f8a5b9576a1168e8c7559d6562cf4a132c45198b
--- /dev/null
+++ b/nixos/modules/services/monitoring/prometheus/collectd-exporter.nix
@@ -0,0 +1,128 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+ cfg = config.services.prometheus.collectdExporter;
+
+ collectSettingsArgs = if (cfg.collectdBinary.enable) then ''
+ -collectd.listen-address ${optionalString (cfg.collectdBinary.listenAddress != null) cfg.collectdBinary.listenAddress}:${toString cfg.collectdBinary.port} \
+ -collectd.security-level ${cfg.collectdBinary.securityLevel} \
+ '' else "";
+
+in {
+ options = {
+ services.prometheus.collectdExporter = {
+ enable = mkEnableOption "prometheus collectd exporter";
+
+ port = mkOption {
+ type = types.int;
+ default = 9103;
+ description = ''
+ Port to listen on.
+ This is used for scraping as well as the to receive collectd data via the write_http plugin.
+ '';
+ };
+
+ listenAddress = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ example = "0.0.0.0";
+ description = ''
+ Address to listen on for web interface, telemetry and collectd JSON data.
+ '';
+ };
+
+ collectdBinary = {
+ enable = mkEnableOption "collectd binary protocol receiver";
+
+ authFile = mkOption {
+ default = null;
+ type = types.nullOr types.path;
+ description = "File mapping user names to pre-shared keys (passwords).";
+ };
+
+ port = mkOption {
+ type = types.int;
+ default = 25826;
+ description = ''Network address on which to accept collectd binary network packets.'';
+ };
+
+ listenAddress = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ example = "0.0.0.0";
+ description = ''
+ Address to listen on for binary network packets.
+ '';
+ };
+
+ securityLevel = mkOption {
+ type = types.enum ["None" "Sign" "Encrypt"];
+ default = "None";
+ description = ''
+ Minimum required security level for accepted packets.
+ '';
+ };
+ };
+
+ extraFlags = mkOption {
+ type = types.listOf types.str;
+ default = [];
+ description = ''
+ Extra commandline options when launching the collectd exporter.
+ '';
+ };
+
+ logFormat = mkOption {
+ type = types.str;
+ default = "logger:stderr";
+ example = "logger:syslog?appname=bob&local=7 or logger:stdout?json=true";
+ description = ''
+ Set the log target and format.
+ '';
+ };
+
+ logLevel = mkOption {
+ type = types.enum ["debug" "info" "warn" "error" "fatal"];
+ default = "info";
+ description = ''
+ Only log messages with the given severity or above.
+ '';
+ };
+
+ openFirewall = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Open port in firewall for incoming connections.
+ '';
+ };
+ };
+ };
+
+ config = mkIf cfg.enable {
+ networking.firewall.allowedTCPPorts = (optional cfg.openFirewall cfg.port) ++
+ (optional (cfg.openFirewall && cfg.collectdBinary.enable) cfg.collectdBinary.port);
+
+ systemd.services.prometheus-collectd-exporter = {
+ description = "Prometheus exporter for Collectd metrics";
+ unitConfig.Documentation = "https://github.com/prometheus/collectd_exporter";
+ wantedBy = [ "multi-user.target" ];
+ serviceConfig = {
+ DynamicUser = true;
+ Restart = "always";
+ PrivateTmp = true;
+ WorkingDirectory = /tmp;
+ ExecStart = ''
+ ${pkgs.prometheus-collectd-exporter}/bin/collectd_exporter \
+ -log.format ${cfg.logFormat} \
+ -log.level ${cfg.logLevel} \
+ -web.listen-address ${optionalString (cfg.listenAddress != null) cfg.listenAddress}:${toString cfg.port} \
+ ${collectSettingsArgs} \
+ ${concatStringsSep " " cfg.extraFlags}
+ '';
+ };
+ };
+ };
+}
diff --git a/nixos/modules/services/monitoring/prometheus/minio-exporter.nix b/nixos/modules/services/monitoring/prometheus/minio-exporter.nix
new file mode 100644
index 0000000000000000000000000000000000000000..4314671523cf1988d8144b3fa1bbb34250ad8d93
--- /dev/null
+++ b/nixos/modules/services/monitoring/prometheus/minio-exporter.nix
@@ -0,0 +1,117 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+ cfg = config.services.prometheus.minioExporter;
+in {
+ options = {
+ services.prometheus.minioExporter = {
+ enable = mkEnableOption "prometheus minio exporter";
+
+ port = mkOption {
+ type = types.int;
+ default = 9290;
+ description = ''
+ Port to listen on.
+ '';
+ };
+
+ listenAddress = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ example = "0.0.0.0";
+ description = ''
+ Address to listen on for web interface and telemetry.
+ '';
+ };
+
+ minioAddress = mkOption {
+ type = types.str;
+ example = "https://10.0.0.1:9000";
+ default = if config.services.minio.enable then "http://localhost:9000" else null;
+ description = ''
+ The URL of the minio server.
+ Use HTTPS if Minio accepts secure connections only.
+ By default this connects to the local minio server if enabled.
+ '';
+ };
+
+ minioAccessKey = mkOption ({
+ type = types.str;
+ example = "BKIKJAA5BMMU2RHO6IBB";
+ description = ''
+ The value of the Minio access key.
+ It is required in order to connect to the server.
+ By default this uses the one from the local minio server if enabled
+ and config.services.minio.accessKey.
+ '';
+ } // optionalAttrs (config.services.minio.enable && config.services.minio.accessKey != "") {
+ default = config.services.minio.accessKey;
+ });
+
+ minioAccessSecret = mkOption ({
+ type = types.str;
+ description = ''
+ The calue of the Minio access secret.
+ It is required in order to connect to the server.
+ By default this uses the one from the local minio server if enabled
+ and config.services.minio.secretKey.
+ '';
+ } // optionalAttrs (config.services.minio.enable && config.services.minio.secretKey != "") {
+ default = config.services.minio.secretKey;
+ });
+
+ minioBucketStats = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Collect statistics about the buckets and files in buckets.
+ It requires more computation, use it carefully in case of large buckets..
+ '';
+ };
+
+ extraFlags = mkOption {
+ type = types.listOf types.str;
+ default = [];
+ description = ''
+ Extra commandline options when launching the minio exporter.
+ '';
+ };
+
+ openFirewall = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Open port in firewall for incoming connections.
+ '';
+ };
+ };
+ };
+
+ config = mkIf cfg.enable {
+ networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port;
+
+ systemd.services.prometheus-minio-exporter = {
+ description = "Prometheus exporter for Minio server metrics";
+ unitConfig.Documentation = "https://github.com/joe-pll/minio-exporter";
+ wantedBy = [ "multi-user.target" ];
+ after = optional config.services.minio.enable "minio.service";
+ serviceConfig = {
+ DynamicUser = true;
+ Restart = "always";
+ PrivateTmp = true;
+ WorkingDirectory = /tmp;
+ ExecStart = ''
+ ${pkgs.prometheus-minio-exporter}/bin/minio-exporter \
+ -web.listen-address ${optionalString (cfg.listenAddress != null) cfg.listenAddress}:${toString cfg.port} \
+ -minio.server ${cfg.minioAddress} \
+ -minio.access-key ${cfg.minioAccessKey} \
+ -minio.access-secret ${cfg.minioAccessSecret} \
+ ${optionalString cfg.minioBucketStats "-minio.bucket-stats"} \
+ ${concatStringsSep " \\\n " cfg.extraFlags}
+ '';
+ };
+ };
+ };
+}
diff --git a/nixos/modules/services/monitoring/prometheus/node-exporter.nix b/nixos/modules/services/monitoring/prometheus/node-exporter.nix
index 0cf0b85afb570ecb0f24907558e9385c01e2dcde..bad4389ce7993c0a422aac744ad0d90a4e27bedb 100644
--- a/nixos/modules/services/monitoring/prometheus/node-exporter.nix
+++ b/nixos/modules/services/monitoring/prometheus/node-exporter.nix
@@ -4,9 +4,6 @@ with lib;
let
cfg = config.services.prometheus.nodeExporter;
- cmdlineArgs = cfg.extraFlags ++ [
- "-web.listen-address=${cfg.listenAddress}"
- ];
in {
options = {
services.prometheus.nodeExporter = {
@@ -33,7 +30,16 @@ in {
default = [];
example = ''[ "systemd" ]'';
description = ''
- Collectors to enable, additionally to the defaults.
+ Collectors to enable. The collectors listed here are enabled in addition to the default ones.
+ '';
+ };
+
+ disabledCollectors = mkOption {
+ type = types.listOf types.str;
+ default = [];
+ example = ''[ "timex" ]'';
+ description = ''
+ Collectors to disable which are enabled by default.
'';
};
@@ -64,14 +70,14 @@ in {
wantedBy = [ "multi-user.target" ];
script = ''
exec ${pkgs.prometheus-node-exporter}/bin/node_exporter \
- ${optionalString (cfg.enabledCollectors != [])
- ''-collectors.enabled ${concatStringsSep "," cfg.enabledCollectors}''} \
- -web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
+ ${concatMapStringsSep " " (x: "--collector." + x) cfg.enabledCollectors} \
+ ${concatMapStringsSep " " (x: "--no-collector." + x) cfg.disabledCollectors} \
+ --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
${concatStringsSep " \\\n " cfg.extraFlags}
'';
serviceConfig = {
User = "nobody";
- Restart = "always";
+ Restart = "always";
PrivateTmp = true;
WorkingDirectory = /tmp;
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
diff --git a/nixos/modules/services/monitoring/prometheus/unifi-exporter.nix b/nixos/modules/services/monitoring/prometheus/unifi-exporter.nix
index e3059e485098dddd5de2c72ad11f959f6da2cd4a..0a56d6ae95a59b917cf83465b75ec65ebdfc823f 100644
--- a/nixos/modules/services/monitoring/prometheus/unifi-exporter.nix
+++ b/nixos/modules/services/monitoring/prometheus/unifi-exporter.nix
@@ -83,6 +83,7 @@ in {
description = "Prometheus exporter for UniFi Controller metrics";
unitConfig.Documentation = "https://github.com/mdlayher/unifi_exporter";
wantedBy = [ "multi-user.target" ];
+ after = optional config.services.unifi.enable "unifi.service";
serviceConfig = {
User = "nobody";
Restart = "always";
diff --git a/nixos/modules/services/network-filesystems/glusterfs.nix b/nixos/modules/services/network-filesystems/glusterfs.nix
index f7fed793066a61b3b25403abe9e8852ef6fd8170..8ac9f801dcb8b5e991a62006e5b10cb1925f01ad 100644
--- a/nixos/modules/services/network-filesystems/glusterfs.nix
+++ b/nixos/modules/services/network-filesystems/glusterfs.nix
@@ -5,6 +5,22 @@ with lib;
let
inherit (pkgs) glusterfs rsync;
+ tlsCmd = if (cfg.tlsSettings != null) then
+ ''
+ mkdir -p /var/lib/glusterd
+ touch /var/lib/glusterd/secure-access
+ ''
+ else
+ ''
+ rm -f /var/lib/glusterd/secure-access
+ '';
+
+ restartTriggers = if (cfg.tlsSettings != null) then [
+ config.environment.etc."ssl/glusterfs.pem".source
+ config.environment.etc."ssl/glusterfs.key".source
+ config.environment.etc."ssl/glusterfs.ca".source
+ ] else [];
+
cfg = config.services.glusterfs;
in
@@ -25,11 +41,97 @@ in
default = "INFO";
};
+ useRpcbind = mkOption {
+ type = types.bool;
+ description = ''
+ Enable use of rpcbind. This is required for Gluster's NFS functionality.
+
+ You may want to turn it off to reduce the attack surface for DDoS reflection attacks.
+
+ See https://davelozier.com/glusterfs-and-rpcbind-portmap-ddos-reflection-attacks/
+ and https://bugzilla.redhat.com/show_bug.cgi?id=1426842 for details.
+ '';
+ default = true;
+ };
+
+ enableGlustereventsd = mkOption {
+ type = types.bool;
+ description = "Whether to enable the GlusterFS Events Daemon";
+ default = true;
+ };
+
+ killMode = mkOption {
+ type = types.enum ["control-group" "process" "mixed" "none"];
+ description = ''
+ The systemd KillMode to use for glusterd.
+
+ glusterd spawns other daemons like gsyncd.
+ If you want these to stop when glusterd is stopped (e.g. to ensure
+ that NixOS config changes are reflected even for these sub-daemons),
+ set this to 'control-group'.
+ If however you want running volume processes (glusterfsd) and thus
+ gluster mounts not be interrupted when glusterd is restarted
+ (for example, when you want to restart them manually at a later time),
+ set this to 'process'.
+ '';
+ default = "control-group";
+ };
+
+ stopKillTimeout = mkOption {
+ type = types.str;
+ description = ''
+ The systemd TimeoutStopSec to use.
+
+ After this time after having been asked to shut down, glusterd
+ (and depending on the killMode setting also its child processes)
+ are killed by systemd.
+
+ The default is set low because GlusterFS (as of 3.10) is known to
+ not tell its children (like gsyncd) to terminate at all.
+ '';
+ default = "5s";
+ };
+
extraFlags = mkOption {
type = types.listOf types.str;
description = "Extra flags passed to the GlusterFS daemon";
default = [];
};
+
+ tlsSettings = mkOption {
+ description = ''
+ Make the server communicate via TLS.
+ This means it will only connect to other gluster
+ servers having certificates signed by the same CA.
+
+ Enabling this will create a file /var/lib/glusterd/secure-access.
+ Disabling will delete this file again.
+
+ See also: https://gluster.readthedocs.io/en/latest/Administrator%20Guide/SSL/
+ '';
+ default = null;
+ type = types.nullOr (types.submodule {
+ options = {
+ tlsKeyPath = mkOption {
+ default = null;
+ type = types.str;
+ description = "Path to the private key used for TLS.";
+ };
+
+ tlsPem = mkOption {
+ default = null;
+ type = types.path;
+ description = "Path to the certificate used for TLS.";
+ };
+
+ caCert = mkOption {
+ default = null;
+ type = types.path;
+ description = "Path certificate authority used to sign the cluster certificates.";
+ };
+ };
+ });
+ };
};
};
@@ -38,23 +140,39 @@ in
config = mkIf cfg.enable {
environment.systemPackages = [ pkgs.glusterfs ];
- services.rpcbind.enable = true;
+ services.rpcbind.enable = cfg.useRpcbind;
+
+ environment.etc = mkIf (cfg.tlsSettings != null) {
+ "ssl/glusterfs.pem".source = cfg.tlsSettings.tlsPem;
+ "ssl/glusterfs.key".source = cfg.tlsSettings.tlsKeyPath;
+ "ssl/glusterfs.ca".source = cfg.tlsSettings.caCert;
+ };
systemd.services.glusterd = {
+ inherit restartTriggers;
description = "GlusterFS, a clustered file-system server";
wantedBy = [ "multi-user.target" ];
- requires = [ "rpcbind.service" ];
- after = [ "rpcbind.service" "network.target" "local-fs.target" ];
- before = [ "network-online.target" ];
+ requires = lib.optional cfg.useRpcbind "rpcbind.service";
+ after = [ "network.target" "local-fs.target" ] ++ lib.optional cfg.useRpcbind "rpcbind.service";
- # 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
+ ''
+ # The copying of hooks is due to upstream bug https://bugzilla.redhat.com/show_bug.cgi?id=1452761
+ + ''
mkdir -p /var/lib/glusterd/hooks/
${rsync}/bin/rsync -a ${glusterfs}/var/lib/glusterd/hooks/ /var/lib/glusterd/hooks/
+
+ ${tlsCmd}
+ ''
+ # `glusterfind` needs dirs that upstream installs at `make install` phase
+ # https://github.com/gluster/glusterfs/blob/v3.10.2/tools/glusterfind/Makefile.am#L16-L17
+ + ''
+ mkdir -p /var/lib/glusterd/glusterfind/.keys
+ mkdir -p /var/lib/glusterd/hooks/1/delete/post/
'';
serviceConfig = {
@@ -62,11 +180,13 @@ in
PIDFile="/run/glusterd.pid";
LimitNOFILE=65536;
ExecStart="${glusterfs}/sbin/glusterd -p /run/glusterd.pid --log-level=${cfg.logLevel} ${toString cfg.extraFlags}";
- KillMode="process";
+ KillMode=cfg.killMode;
+ TimeoutStopSec=cfg.stopKillTimeout;
};
};
- systemd.services.glustereventsd = {
+ systemd.services.glustereventsd = mkIf cfg.enableGlustereventsd {
+ inherit restartTriggers;
description = "Gluster Events Notifier";
@@ -74,6 +194,10 @@ in
after = [ "syslog.target" "network.target" ];
+ preStart = ''
+ install -m 0755 -d /var/log/glusterfs
+ '';
+
serviceConfig = {
Type="simple";
Environment="PYTHONPATH=${glusterfs}/usr/lib/python2.7/site-packages";
diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix
index 60822b5b547f526dfb8a33e7b36d6eef3c664847..d4a695ef5880561e78422b2c499108f262235749 100644
--- a/nixos/modules/services/network-filesystems/ipfs.nix
+++ b/nixos/modules/services/network-filesystems/ipfs.nix
@@ -1,15 +1,19 @@
{ config, lib, pkgs, ... }:
-
with lib;
-
let
inherit (pkgs) ipfs runCommand makeWrapper;
cfg = config.services.ipfs;
- ipfsFlags = ''${if cfg.autoMigrate then "--migrate" else ""} ${if cfg.enableGC then "--enable-gc" else ""} ${toString cfg.extraFlags}'';
+ ipfsFlags = toString ([
+ (optionalString cfg.autoMount "--mount")
+ #(optionalString cfg.autoMigrate "--migrate")
+ (optionalString cfg.enableGC "--enable-gc")
+ (optionalString (cfg.serviceFdlimit != null) "--manage-fdlimit=false")
+ (optionalString (cfg.defaultMode == "offline") "--offline")
+ (optionalString (cfg.defaultMode == "norouting") "--routing=none")
+ ] ++ cfg.extraFlags);
- # 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";
@@ -17,11 +21,50 @@ let
# 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 ]; } ''
mkdir -p "$out/bin"
- makeWrapper "${ipfs}/bin/ipfs" "$out/bin/ipfs" --set IPFS_PATH ${cfg.dataDir}
+ makeWrapper "${ipfs}/bin/ipfs" "$out/bin/ipfs" \
+ --set IPFS_PATH ${cfg.dataDir} \
+ --prefix PATH : /run/wrappers/bin
'';
-in
-{
+
+ commonEnv = {
+ environment.IPFS_PATH = cfg.dataDir;
+ path = [ wrapped ];
+ serviceConfig.User = cfg.user;
+ serviceConfig.Group = cfg.group;
+ };
+
+ baseService = recursiveUpdate commonEnv {
+ wants = [ "ipfs-init.service" ];
+ # NB: migration must be performed prior to pre-start, else we get the failure message!
+ preStart = ''
+ ipfs repo fsck # workaround for BUG #4212 (https://github.com/ipfs/go-ipfs/issues/4214)
+ ipfs --local config Addresses.API ${cfg.apiAddress}
+ ipfs --local config Addresses.Gateway ${cfg.gatewayAddress}
+ '' + optionalString cfg.autoMount ''
+ ipfs --local config Mounts.FuseAllowOther --json true
+ ipfs --local config Mounts.IPFS ${cfg.ipfsMountDir}
+ ipfs --local config Mounts.IPNS ${cfg.ipnsMountDir}
+ '' + concatStringsSep "\n" (collect
+ isString
+ (mapAttrsRecursive
+ (path: value:
+ # Using heredoc below so that the value is never improperly quoted
+ ''
+ read value <ipfs config, every time the daemon starts.
+ These are applied last, so may override configuration set by other options in this module.
+ Keep in mind that this configuration is stateful; i.e., unsetting anything in here does not reset the value to the default!
'';
+ default = {};
+ example = {
+ Datastore.StorageMax = "100GB";
+ Discovery.MDNS.Enabled = false;
+ Bootstrap = [
+ "/ip4/128.199.219.111/tcp/4001/ipfs/QmSoLSafTMBsPKadTEgaXctDQVcqN88CNLHXMkTNwMKPnu"
+ "/ip4/162.243.248.213/tcp/4001/ipfs/QmSoLueR4xBeUbY9WZ9xGUUxunbKWcrNFTDAadQJmocnWm"
+ ];
+ Swarm.AddrFilters = null;
+ };
+
};
extraFlags = mkOption {
@@ -96,6 +177,14 @@ in
description = "Extra flags passed to the IPFS daemon";
default = [];
};
+
+ serviceFdlimit = mkOption {
+ type = types.nullOr types.int;
+ default = null;
+ description = "The fdlimit for the IPFS systemd unit or null to have the daemon attempt to manage it";
+ example = 64*1024;
+ };
+
};
};
@@ -103,6 +192,9 @@ in
config = mkIf cfg.enable {
environment.systemPackages = [ wrapped ];
+ environment.etc."fuse.conf" = mkIf cfg.autoMount { text = ''
+ user_allow_other
+ ''; };
users.extraUsers = mkIf (cfg.user == "ipfs") {
ipfs = {
@@ -115,108 +207,56 @@ in
};
users.extraGroups = mkIf (cfg.group == "ipfs") {
- ipfs = {
- gid = config.ids.gids.ipfs;
- };
+ ipfs.gid = config.ids.gids.ipfs;
};
- systemd.services.ipfs-init = {
+ systemd.services.ipfs-init = recursiveUpdate commonEnv {
description = "IPFS Initializer";
after = [ "local-fs.target" ];
- before = [ "ipfs.service" "ipfs-offline.service" ];
-
- environment.IPFS_PATH = cfg.dataDir;
-
- path = [ pkgs.ipfs pkgs.su pkgs.bash ];
+ before = [ "ipfs.service" "ipfs-offline.service" "ipfs-norouting.service" ];
preStart = ''
install -m 0755 -o ${cfg.user} -g ${cfg.group} -d ${cfg.dataDir}
+ '' + optionalString cfg.autoMount ''
+ install -m 0755 -o ${cfg.user} -g ${cfg.group} -d ${cfg.ipfsMountDir}
+ install -m 0755 -o ${cfg.user} -g ${cfg.group} -d ${cfg.ipnsMountDir}
'';
- script = ''
+ script = ''
if [[ ! -f ${cfg.dataDir}/config ]]; then
- ${ipfs}/bin/ipfs init ${optionalString cfg.emptyRepo "-e"}
+ ipfs init ${optionalString cfg.emptyRepo "-e"}
fi
- ${ipfs}/bin/ipfs --local config Addresses.API ${cfg.apiAddress}
- ${ipfs}/bin/ipfs --local config Addresses.Gateway ${cfg.gatewayAddress}
'';
serviceConfig = {
- User = cfg.user;
- Group = cfg.group;
Type = "oneshot";
RemainAfterExit = true;
PermissionsStartOnly = true;
};
};
- systemd.services.ipfs = {
- description = "IPFS Daemon";
+ # TODO These 3 definitions possibly be further abstracted through use of a function
+ # like: mutexServices "ipfs" [ "", "offline", "norouting" ] { ... shared conf here ... }
+ systemd.services.ipfs = recursiveUpdate baseService {
+ description = "IPFS Daemon";
wantedBy = mkIf (cfg.defaultMode == "online") [ "multi-user.target" ];
-
after = [ "network.target" "local-fs.target" "ipfs-init.service" ];
-
conflicts = [ "ipfs-offline.service" "ipfs-norouting.service"];
- wants = [ "ipfs-init.service" ];
-
- environment.IPFS_PATH = cfg.dataDir;
-
- path = [ pkgs.ipfs ];
-
- serviceConfig = {
- ExecStart = "${ipfs}/bin/ipfs daemon ${ipfsFlags}";
- User = cfg.user;
- Group = cfg.group;
- Restart = "on-failure";
- RestartSec = 1;
- };
};
- systemd.services.ipfs-offline = {
+ systemd.services.ipfs-offline = recursiveUpdate baseService {
description = "IPFS Daemon (offline mode)";
-
wantedBy = mkIf (cfg.defaultMode == "offline") [ "multi-user.target" ];
-
after = [ "local-fs.target" "ipfs-init.service" ];
-
conflicts = [ "ipfs.service" "ipfs-norouting.service"];
- wants = [ "ipfs-init.service" ];
-
- environment.IPFS_PATH = cfg.dataDir;
-
- path = [ pkgs.ipfs ];
-
- serviceConfig = {
- ExecStart = "${ipfs}/bin/ipfs daemon ${ipfsFlags} --offline";
- User = cfg.user;
- Group = cfg.group;
- Restart = "on-failure";
- RestartSec = 1;
- };
};
- systemd.services.ipfs-norouting = {
+ systemd.services.ipfs-norouting = recursiveUpdate baseService {
description = "IPFS Daemon (no routing mode)";
-
wantedBy = mkIf (cfg.defaultMode == "norouting") [ "multi-user.target" ];
-
after = [ "local-fs.target" "ipfs-init.service" ];
-
conflicts = [ "ipfs.service" "ipfs-offline.service"];
- wants = [ "ipfs-init.service" ];
-
- environment.IPFS_PATH = cfg.dataDir;
-
- path = [ pkgs.ipfs ];
-
- serviceConfig = {
- ExecStart = "${ipfs}/bin/ipfs daemon ${ipfsFlags} --routing=none";
- User = cfg.user;
- Group = cfg.group;
- Restart = "on-failure";
- RestartSec = 1;
- };
};
};
diff --git a/nixos/modules/services/network-filesystems/kbfs.nix b/nixos/modules/services/network-filesystems/kbfs.nix
index cf1d7617cca67d31e71ddcd346cfd7d5883dd180..7b2eea3b585019a767e29d72a8497091d348bedd 100644
--- a/nixos/modules/services/network-filesystems/kbfs.nix
+++ b/nixos/modules/services/network-filesystems/kbfs.nix
@@ -55,8 +55,11 @@ in {
Restart = "on-failure";
PrivateTmp = true;
};
+ wantedBy = [ "default.target" ];
};
services.keybase.enable = true;
+
+ environment.systemPackages = [ pkgs.kbfs ];
};
}
diff --git a/nixos/modules/services/network-filesystems/nfsd.nix b/nixos/modules/services/network-filesystems/nfsd.nix
index 7d127145101b81500cd3966fdf3045688f93158f..1a78f9a76a331f1d531117ee383cc0648ddcacce 100644
--- a/nixos/modules/services/network-filesystems/nfsd.nix
+++ b/nixos/modules/services/network-filesystems/nfsd.nix
@@ -27,6 +27,14 @@ in
'';
};
+ extraNfsdConfig = mkOption {
+ type = types.str;
+ default = "";
+ description = ''
+ Extra configuration options for the [nfsd] section of /etc/nfs.conf.
+ '';
+ };
+
exports = mkOption {
type = types.lines;
default = "";
@@ -107,6 +115,7 @@ in
[nfsd]
threads=${toString cfg.nproc}
${optionalString (cfg.hostName != null) "host=${cfg.hostName}"}
+ ${cfg.extraNfsdConfig}
[mountd]
${optionalString (cfg.mountdPort != null) "port=${toString cfg.mountdPort}"}
diff --git a/nixos/modules/services/network-filesystems/openafs-client/default.nix b/nixos/modules/services/network-filesystems/openafs-client/default.nix
index f7c58c928633b6e0606dd72946de1a3d694dd531..0946e379e796796c94809f67b09e57d69253bca6 100644
--- a/nixos/modules/services/network-filesystems/openafs-client/default.nix
+++ b/nixos/modules/services/network-filesystems/openafs-client/default.nix
@@ -6,8 +6,8 @@ let
cfg = config.services.openafsClient;
cellServDB = pkgs.fetchurl {
- url = http://dl.central.org/dl/cellservdb/CellServDB.2009-06-29;
- sha256 = "be566f850e88130333ab8bc3462872ad90c9482e025c60a92f728b5bac1b4fa9";
+ url = http://dl.central.org/dl/cellservdb/CellServDB.2017-03-14;
+ sha256 = "1197z6c5xrijgf66rhaymnm5cvyg2yiy1i20y4ah4mrzmjx0m7sc";
};
afsConfig = pkgs.runCommand "afsconfig" {} ''
@@ -93,7 +93,6 @@ in
preStop = ''
${pkgs.utillinux}/bin/umount /afs
${openafsPkgs}/sbin/afsd -shutdown
- ${pkgs.kmod}/sbin/rmmod libafs
'';
};
};
diff --git a/nixos/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix
index b3b4d0c915ac90714b87c621c0afdbc411f57756..9b9c91a4f16726b30eff6d59a3ba01f4b39764ee 100644
--- a/nixos/modules/services/network-filesystems/samba.nix
+++ b/nixos/modules/services/network-filesystems/samba.nix
@@ -28,7 +28,7 @@ let
configFile = pkgs.writeText "smb.conf"
(if cfg.configText != null then cfg.configText else
''
- [ global ]
+ [global]
security = ${cfg.securityType}
passwd program = /run/wrappers/bin/passwd %u
pam password change = ${smbToString cfg.syncPasswordsByPam}
diff --git a/nixos/modules/services/networking/babeld.nix b/nixos/modules/services/networking/babeld.nix
new file mode 100644
index 0000000000000000000000000000000000000000..dd76bac9df76809d34e44a165c23a680cd894c27
--- /dev/null
+++ b/nixos/modules/services/networking/babeld.nix
@@ -0,0 +1,98 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+ cfg = config.services.babeld;
+
+ paramsString = params:
+ concatMapStringsSep "" (name: "${name} ${boolToString (getAttr name params)}")
+ (attrNames params);
+
+ interfaceConfig = name:
+ let
+ interface = getAttr name cfg.interfaces;
+ in
+ "interface ${name} ${paramsString interface}\n";
+
+ configFile = with cfg; pkgs.writeText "babeld.conf" (
+ (optionalString (cfg.interfaceDefaults != null) ''
+ default ${paramsString cfg.interfaceDefaults}
+ '')
+ + (concatMapStrings interfaceConfig (attrNames cfg.interfaces))
+ + extraConfig);
+
+in
+
+{
+
+ ###### interface
+
+ options = {
+
+ services.babeld = {
+
+ enable = mkOption {
+ default = false;
+ description = ''
+ Whether to run the babeld network routing daemon.
+ '';
+ };
+
+ interfaceDefaults = mkOption {
+ default = null;
+ description = ''
+ A set describing default parameters for babeld interfaces.
+ See babeld8 for options.
+ '';
+ type = types.nullOr (types.attrsOf types.unspecified);
+ example =
+ {
+ wired = true;
+ "split-horizon" = true;
+ };
+ };
+
+ interfaces = mkOption {
+ default = {};
+ description = ''
+ A set describing babeld interfaces.
+ See babeld8 for options.
+ '';
+ type = types.attrsOf (types.attrsOf types.unspecified);
+ example =
+ { enp0s2 =
+ { wired = true;
+ "hello-interval" = 5;
+ "split-horizon" = "auto";
+ };
+ };
+ };
+
+ extraConfig = mkOption {
+ default = "";
+ description = ''
+ Options that will be copied to babeld.conf.
+ See babeld8 for details.
+ '';
+ };
+ };
+
+ };
+
+
+ ###### implementation
+
+ config = mkIf config.services.babeld.enable {
+
+ systemd.services.babeld = {
+ description = "Babel routing daemon";
+ after = [ "network.target" ];
+ wantedBy = [ "multi-user.target" ];
+ serviceConfig.ExecStart = "${pkgs.babeld}/bin/babeld -c ${configFile}";
+ };
+
+ };
+
+}
diff --git a/nixos/modules/services/networking/connman.nix b/nixos/modules/services/networking/connman.nix
index d0683b877801bb846c01456d74076787a8fe93c0..546d270692328907ea5caf3459a913ba4b8ec739 100644
--- a/nixos/modules/services/networking/connman.nix
+++ b/nixos/modules/services/networking/connman.nix
@@ -115,10 +115,5 @@ in {
wireless.enable = true;
networkmanager.enable = false;
};
-
- powerManagement.resumeCommands = ''
- systemctl restart connman
- '';
-
};
}
diff --git a/nixos/modules/services/networking/consul.nix b/nixos/modules/services/networking/consul.nix
index 166ee7732375cd235358dac6e30c2841cbd1b735..6333970cb338fbbaf39bd44d06b301cab8e14972 100644
--- a/nixos/modules/services/networking/consul.nix
+++ b/nixos/modules/services/networking/consul.nix
@@ -183,6 +183,7 @@ in
ExecReload = "${cfg.package.bin}/bin/consul reload";
PermissionsStartOnly = true;
User = if cfg.dropPrivileges then "consul" else null;
+ Restart = "on-failure";
TimeoutStartSec = "0";
} // (optionalAttrs (cfg.leaveOnStop) {
ExecStop = "${cfg.package.bin}/bin/consul leave";
diff --git a/nixos/modules/services/networking/coturn.nix b/nixos/modules/services/networking/coturn.nix
index 65273a4bf9395a75ab6a47ad520e4c91fa42b612..b3c64490d97e4dcb655e9d2b95224a723cd4f672 100644
--- a/nixos/modules/services/networking/coturn.nix
+++ b/nixos/modules/services/networking/coturn.nix
@@ -307,7 +307,8 @@ in {
systemd.services.coturn = {
description = "coturn TURN server";
- after = [ "network.target" ];
+ after = [ "network-online.target" ];
+ wants = [ "network-online.target" ];
wantedBy = [ "multi-user.target" ];
unitConfig = {
diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix
index cdba14be21f07c27ba59a84f71ce43c5b2c5eafd..d283c7624335692f4bfb16c3de97af431f796639 100644
--- a/nixos/modules/services/networking/dhcpcd.nix
+++ b/nixos/modules/services/networking/dhcpcd.nix
@@ -153,10 +153,14 @@ in
config = mkIf enableDHCP {
- systemd.services.dhcpcd =
+ systemd.services.dhcpcd = let
+ cfgN = config.networking;
+ hasDefaultGatewaySet = (cfgN.defaultGateway != null && cfgN.defaultGateway.address != "")
+ || (cfgN.defaultGateway6 != null && cfgN.defaultGateway6.address != "");
+ in
{ description = "DHCP Client";
- wantedBy = [ "network-online.target" ];
+ wantedBy = optional (!hasDefaultGatewaySet) "network-online.target";
after = [ "network.target" ];
wants = [ "network.target" ];
diff --git a/nixos/modules/services/networking/dnscache.nix b/nixos/modules/services/networking/dnscache.nix
new file mode 100644
index 0000000000000000000000000000000000000000..379203cd1ab6e121d414fab8f9e950081916f49a
--- /dev/null
+++ b/nixos/modules/services/networking/dnscache.nix
@@ -0,0 +1,89 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.dnscache;
+
+ dnscache-root = pkgs.runCommand "dnscache-root" {} ''
+ mkdir -p $out/{servers,ip}
+
+ ${concatMapStrings (ip: ''
+ echo > "$out/ip/"${lib.escapeShellArg ip}
+ '') cfg.clientIps}
+
+ ${concatStrings (mapAttrsToList (host: ips: ''
+ ${concatMapStrings (ip: ''
+ echo ${lib.escapeShellArg ip} > "$out/servers/"${lib.escapeShellArg host}
+ '') ips}
+ '') cfg.domainServers)}
+
+ # if a list of root servers was not provided in config, copy it
+ # over. (this is also done by dnscache-conf, but we 'rm -rf
+ # /var/lib/dnscache/root' below & replace it wholesale with this,
+ # so we have to ensure servers/@ exists ourselves.)
+ if [ ! -e $out/servers/@ ]; then
+ # symlink does not work here, due chroot
+ cp ${pkgs.djbdns}/etc/dnsroots.global $out/servers/@;
+ fi
+ '';
+
+in {
+
+ ###### interface
+
+ options = {
+ services.dnscache = {
+ enable = mkOption {
+ default = false;
+ type = types.bool;
+ description = "Whether to run the dnscache caching dns server";
+ };
+
+ ip = mkOption {
+ default = "0.0.0.0";
+ type = types.str;
+ description = "IP address on which to listen for connections";
+ };
+
+ clientIps = mkOption {
+ default = [ "127.0.0.1" ];
+ type = types.listOf types.str;
+ description = "client IP addresses (or prefixes) from which to accept connections";
+ example = ["192.168" "172.23.75.82"];
+ };
+
+ domainServers = mkOption {
+ default = { };
+ type = types.attrsOf (types.listOf types.str);
+ description = "table of {hostname: server} pairs to use as authoritative servers for hosts (and subhosts)";
+ example = {
+ "example.com" = ["8.8.8.8" "8.8.4.4"];
+ };
+ };
+ };
+ };
+
+ ###### implementation
+
+ config = mkIf config.services.dnscache.enable {
+ environment.systemPackages = [ pkgs.djbdns ];
+ users.extraUsers.dnscache = {};
+
+ systemd.services.dnscache = {
+ description = "djbdns dnscache server";
+ wantedBy = [ "multi-user.target" ];
+ path = with pkgs; [ bash daemontools djbdns ];
+ preStart = ''
+ rm -rf /var/lib/dnscache
+ dnscache-conf dnscache dnscache /var/lib/dnscache ${config.services.dnscache.ip}
+ rm -rf /var/lib/dnscache/root
+ ln -sf ${dnscache-root} /var/lib/dnscache/root
+ '';
+ script = ''
+ cd /var/lib/dnscache/
+ exec ./run
+ '';
+ };
+ };
+}
diff --git a/nixos/modules/services/networking/dnschain.nix b/nixos/modules/services/networking/dnschain.nix
index ab7bbb15ad4f76d72b5b57e6f8502265d1466137..ee1cd36000398494ea91aeb6005223f89ea9a24f 100644
--- a/nixos/modules/services/networking/dnschain.nix
+++ b/nixos/modules/services/networking/dnschain.nix
@@ -158,7 +158,7 @@ in
serviceConfig = {
User = "dnschain";
Restart = "on-failure";
- ExecStart = "${pkgs.dnschain}/bin/dnschain";
+ ExecStart = "${pkgs.nodePackages.dnschain}/bin/dnschain";
};
preStart = ''
diff --git a/nixos/modules/services/networking/dnscrypt-wrapper.nix b/nixos/modules/services/networking/dnscrypt-wrapper.nix
index 85fac660d52ed81c95b59d834d99976b7786afe9..23cc92946e41fe6d601daa264b4c7dc10dcaaee4 100644
--- a/nixos/modules/services/networking/dnscrypt-wrapper.nix
+++ b/nixos/modules/services/networking/dnscrypt-wrapper.nix
@@ -45,7 +45,7 @@ let
rotateKeys = ''
# check if keys are not expired
keyValid() {
- fingerprint=$(dnscrypt-wrapper --show-provider-publickey-fingerprint | awk '{print $(NF)}')
+ fingerprint=$(dnscrypt-wrapper --show-provider-publickey | awk '{print $(NF)}')
dnscrypt-proxy --test=${toString (cfg.keys.checkInterval + 1)} \
--resolver-address=127.0.0.1:${toString cfg.port} \
--provider-name=${cfg.providerName} \
@@ -56,9 +56,10 @@ let
# archive old keys and restart the service
if ! keyValid; then
+ echo "certificate soon to become invalid; backing up old cert"
mkdir -p oldkeys
- mv ${cfg.providerName}.key oldkeys/${cfg.providerName}-$(date +%F-%T).key
- mv ${cfg.providerName}.crt oldkeys/${cfg.providerName}-$(date +%F-%T).crt
+ mv -v ${cfg.providerName}.key oldkeys/${cfg.providerName}-$(date +%F-%T).key
+ mv -v ${cfg.providerName}.crt oldkeys/${cfg.providerName}-$(date +%F-%T).crt
systemctl restart dnscrypt-wrapper
fi
'';
@@ -169,6 +170,7 @@ in {
path = with pkgs; [ dnscrypt-wrapper dnscrypt-proxy gawk ];
script = rotateKeys;
+ serviceConfig.User = "dnscrypt-wrapper";
};
diff --git a/nixos/modules/services/networking/dnsmasq.nix b/nixos/modules/services/networking/dnsmasq.nix
index fcf5aa5f175b7a15cdf7337594098431ae90ab4e..91a3e54474ac9cf7bf4f04619c85297b2a3a9f1f 100644
--- a/nixos/modules/services/networking/dnsmasq.nix
+++ b/nixos/modules/services/networking/dnsmasq.nix
@@ -55,6 +55,14 @@ in
'';
};
+ alwaysKeepRunning = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ If enabled, systemd will always respawn dnsmasq even if shut down manually. The default, disabled, will only restart it on error.
+ '';
+ };
+
extraConfig = mkOption {
type = types.lines;
default = "";
@@ -101,10 +109,12 @@ in
BusName = "uk.org.thekelleys.dnsmasq";
ExecStart = "${dnsmasq}/bin/dnsmasq -k --enable-dbus --user=dnsmasq -C ${dnsmasqConf}";
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+ PrivateTmp = true;
+ ProtectSystem = true;
+ ProtectHome = true;
+ Restart = if cfg.alwaysKeepRunning then "always" else "on-failure";
};
restartTriggers = [ config.environment.etc.hosts.source ];
};
-
};
-
}
diff --git a/nixos/modules/services/networking/fan.nix b/nixos/modules/services/networking/fan.nix
deleted file mode 100644
index 7f4e36478325dbf1e5792dfc84eb68268a77a727..0000000000000000000000000000000000000000
--- a/nixos/modules/services/networking/fan.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-
- cfg = config.networking.fan;
- modprobe = "${pkgs.kmod}/bin/modprobe";
-
-in
-
-{
-
- ###### interface
-
- options = {
-
- networking.fan = {
-
- enable = mkEnableOption "FAN Networking";
-
- };
-
- };
-
-
- ###### implementation
-
- config = mkIf cfg.enable {
-
- environment.systemPackages = [ pkgs.fanctl ];
-
- systemd.services.fan = {
- description = "FAN Networking";
- wantedBy = [ "multi-user.target" ];
- after = [ "network-online.target" ];
- before = [ "docker.service" ];
- restartIfChanged = false;
- preStart = ''
- if [ ! -f /proc/sys/net/fan/version ]; then
- ${modprobe} ipip
- if [ ! -f /proc/sys/net/fan/version ]; then
- echo "The Fan Networking patches have not been applied to this kernel!" 1>&2
- exit 1
- fi
- fi
-
- mkdir -p /var/lib/fan-networking
- '';
- serviceConfig = {
- Type = "oneshot";
- RemainAfterExit = true;
- ExecStart = "${pkgs.fanctl}/bin/fanctl up -a";
- ExecStop = "${pkgs.fanctl}/bin/fanctl down -a";
- };
- };
-
- };
-
-}
diff --git a/nixos/modules/services/networking/firefox/sync-server.nix b/nixos/modules/services/networking/firefox/sync-server.nix
index c1a14931429ad3964b76b581fdaa0dbf770c3caa..a9f3fd65d76b4053e5a28ef3ad1a58e64bb76ab9 100644
--- a/nixos/modules/services/networking/firefox/sync-server.nix
+++ b/nixos/modules/services/networking/firefox/sync-server.nix
@@ -4,6 +4,10 @@ with lib;
let
cfg = config.services.firefox.syncserver;
+
+ defaultDbLocation = "/var/db/firefox-sync-server/firefox-sync-server.db";
+ defaultSqlUri = "sqlite:///${defaultDbLocation}";
+
syncServerIni = pkgs.writeText "syncserver.ini" ''
[DEFAULT]
overrides = ${cfg.privateConfig}
@@ -25,6 +29,7 @@ let
backend = tokenserver.verifiers.LocalVerifier
audiences = ${removeSuffix "/" cfg.publicUrl}
'';
+
in
{
@@ -65,6 +70,18 @@ in
'';
};
+ user = mkOption {
+ type = types.str;
+ default = "syncserver";
+ description = "User account under which syncserver runs.";
+ };
+
+ group = mkOption {
+ type = types.str;
+ default = "syncserver";
+ description = "Group account under which syncserver runs.";
+ };
+
publicUrl = mkOption {
type = types.str;
default = "http://localhost:5000/";
@@ -85,7 +102,7 @@ in
sqlUri = mkOption {
type = types.str;
- default = "sqlite:////var/db/firefox-sync-server.db";
+ default = defaultSqlUri;
example = "postgresql://scott:tiger@localhost/test";
description = ''
The location of the database. This URL is composed of
@@ -126,16 +143,45 @@ in
description = "Firefox Sync Server";
wantedBy = [ "multi-user.target" ];
path = [ pkgs.coreutils syncServerEnv ];
+
+ serviceConfig = {
+ User = cfg.user;
+ Group = cfg.group;
+ PermissionsStartOnly = true;
+ };
+
preStart = ''
if ! test -e ${cfg.privateConfig}; then
- umask u=rwx,g=x,o=x
- mkdir -p $(dirname ${cfg.privateConfig})
+ mkdir -m 700 -p $(dirname ${cfg.privateConfig})
echo > ${cfg.privateConfig} '[syncserver]'
echo >> ${cfg.privateConfig} "secret = $(head -c 20 /dev/urandom | sha1sum | tr -d ' -')"
fi
+ chown ${cfg.user}:${cfg.group} ${cfg.privateConfig}
+ '' + optionalString (cfg.sqlUri == defaultSqlUri) ''
+ if ! test -e $(dirname ${defaultDbLocation}); then
+ mkdir -m 700 -p $(dirname ${defaultDbLocation})
+ chown ${cfg.user}:${cfg.group} $(dirname ${defaultDbLocation})
+ fi
+ # Move previous database file if it exists
+ oldDb="/var/db/firefox-sync-server.db"
+ if test -f $oldDb; then
+ mv $oldDb ${defaultDbLocation}
+ chown ${cfg.user}:${cfg.group} ${defaultDbLocation}
+ fi
'';
serviceConfig.ExecStart = "${syncServerEnv}/bin/paster serve ${syncServerIni}";
};
+ users.extraUsers = optionalAttrs (cfg.user == "syncserver")
+ (singleton {
+ name = "syncserver";
+ group = cfg.group;
+ isSystemUser = true;
+ });
+
+ users.extraGroups = optionalAttrs (cfg.group == "syncserver")
+ (singleton {
+ name = "syncserver";
+ });
};
}
diff --git a/nixos/modules/services/networking/fireqos.nix b/nixos/modules/services/networking/fireqos.nix
new file mode 100644
index 0000000000000000000000000000000000000000..0b34f0b6b8b489fa66f5f774c45ae8e818d2e300
--- /dev/null
+++ b/nixos/modules/services/networking/fireqos.nix
@@ -0,0 +1,52 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.fireqos;
+ fireqosConfig = pkgs.writeText "fireqos.conf" "${cfg.config}";
+in {
+ options.services.fireqos = {
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ If enabled, FireQOS will be launched with the specified
+ configuration given in `config`.
+ '';
+ };
+
+ config = mkOption {
+ type = types.str;
+ default = "";
+ example = ''
+ interface wlp3s0 world-in input rate 10mbit ethernet
+ class web commit 50kbit
+ match tcp ports 80,443
+
+ interface wlp3s0 world-out input rate 10mbit ethernet
+ class web commit 50kbit
+ match tcp ports 80,443
+ '';
+ description = ''
+ The FireQOS configuration goes here.
+ '';
+ };
+ };
+
+ config = mkIf cfg.enable {
+ systemd.services.fireqos = {
+ description = "FireQOS";
+ after = [ "network.target" ];
+ serviceConfig = {
+ Type = "oneshot";
+ RemainAfterExit = true;
+ ExecStart = "${pkgs.firehol}/bin/fireqos start ${fireqosConfig}";
+ ExecStop = [
+ "${pkgs.firehol}/bin/fireqos stop"
+ "${pkgs.firehol}/bin/fireqos clear_all_qos"
+ ];
+ };
+ };
+ };
+}
diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix
index 68a814b23053be92a2ef6fe79cb7cbfb7909a9b6..9bd88ca1707b2ea6bbdf840fddcc03a547f65af6 100644
--- a/nixos/modules/services/networking/firewall.nix
+++ b/nixos/modules/services/networking/firewall.nix
@@ -95,18 +95,18 @@ let
ip46tables -N nixos-fw-log-refuse
${optionalString cfg.logRefusedConnections ''
- ip46tables -A nixos-fw-log-refuse -p tcp --syn -j LOG --log-level info --log-prefix "rejected connection: "
+ ip46tables -A nixos-fw-log-refuse -p tcp --syn -j LOG --log-level info --log-prefix "refused connection: "
''}
${optionalString (cfg.logRefusedPackets && !cfg.logRefusedUnicastsOnly) ''
ip46tables -A nixos-fw-log-refuse -m pkttype --pkt-type broadcast \
- -j LOG --log-level info --log-prefix "rejected broadcast: "
+ -j LOG --log-level info --log-prefix "refused broadcast: "
ip46tables -A nixos-fw-log-refuse -m pkttype --pkt-type multicast \
- -j LOG --log-level info --log-prefix "rejected multicast: "
+ -j LOG --log-level info --log-prefix "refused multicast: "
''}
ip46tables -A nixos-fw-log-refuse -m pkttype ! --pkt-type unicast -j nixos-fw-refuse
${optionalString cfg.logRefusedPackets ''
ip46tables -A nixos-fw-log-refuse \
- -j LOG --log-level info --log-prefix "rejected packet: "
+ -j LOG --log-level info --log-prefix "refused packet: "
''}
ip46tables -A nixos-fw-log-refuse -j nixos-fw-refuse
diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix
index 7622f030f83201fbe2ecc8ab7f5fc8e1d7cb578a..ca2e2a065dcf3ffb38c12980b339421ad7c253ce 100644
--- a/nixos/modules/services/networking/i2pd.nix
+++ b/nixos/modules/services/networking/i2pd.nix
@@ -28,15 +28,15 @@ let
};
mkKeyedEndpointOpt = name: addr: port: keyFile:
- (mkEndpointOpt name addr port) // {
- keys = mkOption {
- type = types.str;
- default = "";
- description = ''
- File to persist ${lib.toUpper name} keys.
- '';
+ (mkEndpointOpt name addr port) // {
+ keys = mkOption {
+ type = types.str;
+ default = "";
+ description = ''
+ File to persist ${lib.toUpper name} keys.
+ '';
+ };
};
- };
commonTunOpts = let
i2cpOpts = {
@@ -59,7 +59,7 @@ let
description = "Number of ElGamal/AES tags to send.";
default = 40;
};
- destination = mkOption {
+ destination = mkOption {
type = types.str;
description = "Remote endpoint, I2P hostname or b32.i2p address.";
};
@@ -70,88 +70,91 @@ let
};
} // mkEndpointOpt name "127.0.0.1" 0;
- i2pdConf = pkgs.writeText "i2pd.conf"
- ''
- ipv4 = ${boolToString cfg.enableIPv4}
- ipv6 = ${boolToString cfg.enableIPv6}
- notransit = ${boolToString cfg.notransit}
- floodfill = ${boolToString cfg.floodfill}
- netid = ${toString cfg.netid}
- ${if isNull cfg.bandwidth then "" else "bandwidth = ${toString cfg.bandwidth}" }
- ${if isNull cfg.port then "" else "port = ${toString cfg.port}"}
-
- [limits]
- transittunnels = ${toString cfg.limits.transittunnels}
-
- [upnp]
- enabled = ${boolToString cfg.upnp.enable}
- name = ${cfg.upnp.name}
-
- [precomputation]
- elgamal = ${boolToString cfg.precomputation.elgamal}
-
- [reseed]
- verify = ${boolToString cfg.reseed.verify}
- file = ${cfg.reseed.file}
- urls = ${builtins.concatStringsSep "," cfg.reseed.urls}
-
- [addressbook]
- defaulturl = ${cfg.addressbook.defaulturl}
- subscriptions = ${builtins.concatStringsSep "," cfg.addressbook.subscriptions}
- ${flip concatMapStrings
+ i2pdConf = pkgs.writeText "i2pd.conf" ''
+ # DO NOT EDIT -- this file has been generated automatically.
+ loglevel = ${cfg.logLevel}
+
+ ipv4 = ${boolToString cfg.enableIPv4}
+ ipv6 = ${boolToString cfg.enableIPv6}
+ notransit = ${boolToString cfg.notransit}
+ floodfill = ${boolToString cfg.floodfill}
+ netid = ${toString cfg.netid}
+ ${if isNull cfg.bandwidth then "" else "bandwidth = ${toString cfg.bandwidth}" }
+ ${if isNull cfg.port then "" else "port = ${toString cfg.port}"}
+
+ [limits]
+ transittunnels = ${toString cfg.limits.transittunnels}
+
+ [upnp]
+ enabled = ${boolToString cfg.upnp.enable}
+ name = ${cfg.upnp.name}
+
+ [precomputation]
+ elgamal = ${boolToString cfg.precomputation.elgamal}
+
+ [reseed]
+ verify = ${boolToString cfg.reseed.verify}
+ file = ${cfg.reseed.file}
+ urls = ${builtins.concatStringsSep "," cfg.reseed.urls}
+
+ [addressbook]
+ defaulturl = ${cfg.addressbook.defaulturl}
+ subscriptions = ${builtins.concatStringsSep "," cfg.addressbook.subscriptions}
+
+ ${flip concatMapStrings
(collect (proto: proto ? port && proto ? address && proto ? name) cfg.proto)
- (proto: let portStr = toString proto.port; in
- ''
- [${proto.name}]
- enabled = ${boolToString proto.enable}
- address = ${proto.address}
- port = ${toString proto.port}
- ${if proto ? keys then "keys = ${proto.keys}" else ""}
- ${if proto ? auth then "auth = ${boolToString proto.auth}" else ""}
- ${if proto ? user then "user = ${proto.user}" else ""}
- ${if proto ? pass then "pass = ${proto.pass}" else ""}
- ${if proto ? outproxy then "outproxy = ${proto.outproxy}" else ""}
- ${if proto ? outproxyPort then "outproxyport = ${toString proto.outproxyPort}" else ""}
- '')
- }
+ (proto: let portStr = toString proto.port; in ''
+ [${proto.name}]
+ enabled = ${boolToString proto.enable}
+ address = ${proto.address}
+ port = ${toString proto.port}
+ ${if proto ? keys then "keys = ${proto.keys}" else ""}
+ ${if proto ? auth then "auth = ${boolToString proto.auth}" else ""}
+ ${if proto ? user then "user = ${proto.user}" else ""}
+ ${if proto ? pass then "pass = ${proto.pass}" else ""}
+ ${if proto ? outproxy then "outproxy = ${proto.outproxy}" else ""}
+ ${if proto ? outproxyPort then "outproxyport = ${toString proto.outproxyPort}" else ""}
+ '')
+ }
'';
i2pdTunnelConf = pkgs.writeText "i2pd-tunnels.conf" ''
- ${flip concatMapStrings
- (collect (tun: tun ? port && tun ? destination) cfg.outTunnels)
- (tun: let portStr = toString tun.port; in ''
- [${tun.name}]
- type = client
- destination = ${tun.destination}
- keys = ${tun.keys}
- address = ${tun.address}
- port = ${toString tun.port}
- inbound.length = ${toString tun.inbound.length}
- outbound.length = ${toString tun.outbound.length}
- inbound.quantity = ${toString tun.inbound.quantity}
- outbound.quantity = ${toString tun.outbound.quantity}
- crypto.tagsToSend = ${toString tun.crypto.tagsToSend}
- '')
- }
- ${flip concatMapStrings
- (collect (tun: tun ? port && tun ? host) cfg.inTunnels)
- (tun: let portStr = toString tun.port; in ''
- [${tun.name}]
- type = server
- destination = ${tun.destination}
- keys = ${tun.keys}
- host = ${tun.address}
- port = ${tun.port}
- inport = ${tun.inPort}
- accesslist = ${builtins.concatStringsSep "," tun.accessList}
- '')
- }
+ # DO NOT EDIT -- this file has been generated automatically.
+ ${flip concatMapStrings
+ (collect (tun: tun ? port && tun ? destination) cfg.outTunnels)
+ (tun: let portStr = toString tun.port; in ''
+ [${tun.name}]
+ type = client
+ destination = ${tun.destination}
+ keys = ${tun.keys}
+ address = ${tun.address}
+ port = ${toString tun.port}
+ inbound.length = ${toString tun.inbound.length}
+ outbound.length = ${toString tun.outbound.length}
+ inbound.quantity = ${toString tun.inbound.quantity}
+ outbound.quantity = ${toString tun.outbound.quantity}
+ crypto.tagsToSend = ${toString tun.crypto.tagsToSend}
+ '')
+ }
+ ${flip concatMapStrings
+ (collect (tun: tun ? port && tun ? host) cfg.inTunnels)
+ (tun: let portStr = toString tun.port; in ''
+ [${tun.name}]
+ type = server
+ destination = ${tun.destination}
+ keys = ${tun.keys}
+ host = ${tun.address}
+ port = ${tun.port}
+ inport = ${tun.inPort}
+ accesslist = ${builtins.concatStringsSep "," tun.accessList}
+ '')
+ }
'';
i2pdSh = pkgs.writeScriptBin "i2pd" ''
#!/bin/sh
- ${pkgs.i2pd}/bin/i2pd \
- ${if isNull cfg.extIp then "" else "--host="+cfg.extIp} \
+ exec ${pkgs.i2pd}/bin/i2pd \
+ ${if isNull cfg.address then "" else "--host="+cfg.address} \
--conf=${i2pdConf} \
--tunconf=${i2pdTunnelConf}
'';
@@ -176,11 +179,23 @@ in
'';
};
- extIp = mkOption {
+ logLevel = mkOption {
+ type = types.enum ["debug" "info" "warn" "error"];
+ default = "error";
+ description = ''
+ The log level. i2pd defaults to "info"
+ but that generates copious amounts of log messages.
+
+ We default to "error" which is similar to the default log
+ level of tor.
+ '';
+ };
+
+ address = mkOption {
type = with types; nullOr str;
default = null;
description = ''
- Your external IP.
+ Your external IP or hostname.
'';
};
@@ -213,7 +228,7 @@ in
default = null;
description = ''
Set a router bandwidth limit integer in KBps.
- If not set, i2pd defaults to 32KBps.
+ If not set, i2pd defaults to 32KBps.
'';
};
@@ -241,6 +256,14 @@ in
'';
};
+ nat = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ Assume router is NATed. Enabled by default.
+ '';
+ };
+
upnp = {
enable = mkOption {
type = types.bool;
@@ -261,9 +284,14 @@ in
precomputation.elgamal = mkOption {
type = types.bool;
- default = false;
+ default = true;
description = ''
- Use ElGamal precomputated tables.
+ Whenever to use precomputated tables for ElGamal.
+ i2pd defaults to false
+ to save 64M of memory (and looses some performance).
+
+ We default to true as that is what most
+ users want anyway.
'';
};
@@ -353,7 +381,7 @@ in
};
};
- proto.httpProxy = mkKeyedEndpointOpt "httpproxy" "127.0.0.1" 4446 "";
+ proto.httpProxy = mkKeyedEndpointOpt "httpproxy" "127.0.0.1" 4444 "";
proto.socksProxy = (mkKeyedEndpointOpt "socksproxy" "127.0.0.1" 4447 "")
// {
outproxy = mkOption {
diff --git a/nixos/modules/services/networking/keybase.nix b/nixos/modules/services/networking/keybase.nix
index ca5c279ac6f0fb7b1065aef4524eda989d9fd037..a149f16a84cb8e0c8ad596f44e9dd446f7b5af67 100644
--- a/nixos/modules/services/networking/keybase.nix
+++ b/nixos/modules/services/networking/keybase.nix
@@ -28,11 +28,12 @@ in {
description = "Keybase service";
serviceConfig = {
ExecStart = ''
- ${pkgs.keybase}/bin/keybase service
+ ${pkgs.keybase}/bin/keybase service --auto-forked
'';
Restart = "on-failure";
PrivateTmp = true;
};
+ wantedBy = [ "default.target" ];
};
environment.systemPackages = [ pkgs.keybase ];
diff --git a/nixos/modules/services/networking/libreswan.nix b/nixos/modules/services/networking/libreswan.nix
index e7a6c565f4ff12e2e7492fa3c25ff7a4a30b5b4a..280158b89f61bc9f5fbd79a16ada0b631f5a0236 100644
--- a/nixos/modules/services/networking/libreswan.nix
+++ b/nixos/modules/services/networking/libreswan.nix
@@ -17,7 +17,7 @@ let
else substring (head nonchars).ind (add 1 (sub (last nonchars).ind (head nonchars).ind)) str;
indent = str: concatStrings (concatMap (s: [" " (trim [" " "\t"] s) "\n"]) (splitString "\n" str));
configText = indent (toString cfg.configSetup);
- connectionText = concatStrings (mapAttrsToList (n: v:
+ connectionText = concatStrings (mapAttrsToList (n: v:
''
conn ${n}
${indent v}
@@ -27,7 +27,7 @@ let
''
config setup
${configText}
-
+
${connectionText}
'';
@@ -93,6 +93,9 @@ in
"${pkgs.libreswan}"
"${pkgs.iproute}"
"${pkgs.procps}"
+ "${pkgs.nssTools}"
+ "${pkgs.iptables}"
+ "${pkgs.nettools}"
];
wants = [ "network-online.target" ];
diff --git a/nixos/modules/services/networking/lldpd.nix b/nixos/modules/services/networking/lldpd.nix
index 4f951d843e2cecf37d639e5b7bf8e93a5d8bba44..ba4e1b1542fe4c756e0af50a39c75b1712076ba7 100644
--- a/nixos/modules/services/networking/lldpd.nix
+++ b/nixos/modules/services/networking/lldpd.nix
@@ -28,16 +28,11 @@ in
users.extraGroups._lldpd = {};
environment.systemPackages = [ pkgs.lldpd ];
+ systemd.packages = [ pkgs.lldpd ];
systemd.services.lldpd = {
wantedBy = [ "multi-user.target" ];
- after = [ "network.target" ];
- requires = [ "network.target" ];
- serviceConfig = {
- ExecStart = "${pkgs.lldpd}/bin/lldpd -d ${concatStringsSep " " cfg.extraArgs}";
- PrivateTmp = true;
- PrivateDevices = true;
- };
+ environment.LLDPD_OPTIONS = concatStringsSep " " cfg.extraArgs;
};
};
}
diff --git a/nixos/modules/services/networking/matterbridge.nix b/nixos/modules/services/networking/matterbridge.nix
new file mode 100644
index 0000000000000000000000000000000000000000..5526e2ba23ac78a25d5fd4bf8c7633eda4ed53b9
--- /dev/null
+++ b/nixos/modules/services/networking/matterbridge.nix
@@ -0,0 +1,96 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+
+ cfg = config.services.matterbridge;
+
+ matterbridgeConfToml = pkgs.writeText "matterbridge.toml" (cfg.configFile);
+
+in
+
+{
+ options = {
+ services.matterbridge = {
+ enable = mkEnableOption "Matterbridge chat platform bridge";
+
+ configFile = mkOption {
+ type = types.str;
+ example = ''
+ #WARNING: as this file contains credentials, be sure to set correct file permissions [irc]
+ [irc.freenode]
+ Server="irc.freenode.net:6667"
+ Nick="matterbot"
+
+ [mattermost]
+ [mattermost.work]
+ #do not prefix it wit http:// or https://
+ Server="yourmattermostserver.domain"
+ Team="yourteam"
+ Login="yourlogin"
+ Password="yourpass"
+ PrefixMessagesWithNick=true
+
+ [[gateway]]
+ name="gateway1"
+ enable=true
+ [[gateway.inout]]
+ account="irc.freenode"
+ channel="#testing"
+
+ [[gateway.inout]]
+ account="mattermost.work"
+ channel="off-topic"
+ '';
+ description = ''
+ The matterbridge configuration file in the TOML file format.
+ '';
+ };
+ user = mkOption {
+ type = types.str;
+ default = "matterbridge";
+ description = ''
+ User which runs the matterbridge service.
+ '';
+ };
+
+ group = mkOption {
+ type = types.str;
+ default = "matterbridge";
+ description = ''
+ Group which runs the matterbridge service.
+ '';
+ };
+ };
+ };
+
+ config = mkMerge [
+ (mkIf cfg.enable {
+
+ users.extraUsers = mkIf (cfg.user == "matterbridge") [
+ { name = "matterbridge";
+ group = "matterbridge";
+ } ];
+
+ users.extraGroups = mkIf (cfg.group == "matterbridge") [
+ { name = "matterbridge";
+ } ];
+
+ systemd.services.matterbridge = {
+ description = "Matterbridge chat platform bridge";
+ wantedBy = [ "multi-user.target" ];
+ after = [ "network.target" ];
+
+ serviceConfig = {
+ User = cfg.user;
+ Group = cfg.group;
+ ExecStart = "${pkgs.matterbridge.bin}/bin/matterbridge -conf ${matterbridgeConfToml}";
+ Restart = "always";
+ RestartSec = "10";
+ };
+ };
+ })
+ ];
+}
+
diff --git a/nixos/modules/services/networking/mfi.nix b/nixos/modules/services/networking/mfi.nix
deleted file mode 100644
index 775564a2c4463f9a31acb6369cb0a42b58f8b9f5..0000000000000000000000000000000000000000
--- a/nixos/modules/services/networking/mfi.nix
+++ /dev/null
@@ -1,100 +0,0 @@
-{ config, lib, pkgs, utils, ... }:
-with lib;
-let
- name = "Ubiquiti mFi Controller";
- cfg = config.services.mfi;
- stateDir = "/var/lib/mfi";
- # XXX 2 runtime exceptions using jre8: JSPException on GET / ; can't initialize ./data/keystore on first run.
- cmd = "@${pkgs.jre7}/bin/java java -jar ${stateDir}/lib/ace.jar";
- mountPoints = [
- { what = "${pkgs.mfi}/dl"; where = "${stateDir}/dl"; }
- { what = "${pkgs.mfi}/lib"; where = "${stateDir}/lib"; }
- { what = "${pkgs.mongodb248}/bin"; where = "${stateDir}/bin"; }
- { what = "${cfg.dataDir}"; where = "${stateDir}/data"; }
- ];
- systemdMountPoints = map (m: "${utils.escapeSystemdPath m.where}.mount") mountPoints;
- ports = [ 6080 6880 6443 6843 ];
-in
-{
- options = {
- services.mfi = {
- enable = mkEnableOption name;
- openPorts = mkOption {
- type = types.bool;
- default = true;
- description = "Whether to open TCP ports ${concatMapStrings (a: "${toString a} ") ports}for the services.";
- };
- dataDir = mkOption {
- type = types.str;
- default = "${stateDir}/data";
- description = ''
- Where to store the database and other data.
-
- This directory will be bind-mounted to ${stateDir}/data as part of the service startup.
- '';
- };
- };
- };
-
- config = mkIf cfg.enable {
-
- networking.firewall.allowedTCPPorts = mkIf config.services.mfi.openPorts ports;
-
- users.users.mfi = {
- uid = config.ids.uids.mfi;
- description = "mFi controller daemon user";
- home = "${stateDir}";
- };
-
- # We must create the binary directories as bind mounts instead of symlinks
- # This is because the controller resolves all symlinks to absolute paths
- # to be used as the working directory.
- systemd.mounts = map ({ what, where }: {
- bindsTo = [ "mfi.service" ];
- partOf = [ "mfi.service" ];
- unitConfig.RequiresMountsFor = stateDir;
- options = "bind";
- what = what;
- where = where;
- }) mountPoints;
-
- systemd.services.mfi = {
- description = "mFi controller daemon";
- wantedBy = [ "multi-user.target" ];
- after = [ "network.target" ] ++ systemdMountPoints;
- partOf = systemdMountPoints;
- bindsTo = systemdMountPoints;
- unitConfig.RequiresMountsFor = stateDir;
-
- preStart = ''
- # Clear ./webapps each run.
- rm -rf "${stateDir}/webapps"
- mkdir -p "${stateDir}/webapps"
- ln -s "${pkgs.mfi}/webapps/ROOT.war" "${stateDir}/webapps"
-
- # Copy initial config only once.
- test -e "${stateDir}/conf" || cp -ar "${pkgs.mfi}/conf" "${stateDir}/conf"
- test -e "${stateDir}/data" || cp -ar "${pkgs.mfi}/data" "${stateDir}/data"
-
- # Fix Permissions.
- # (Bind-mounts cause errors; ignore exit codes)
- chown -fR mfi: "${stateDir}" || true
- chmod -fR u=rwX,go= "${stateDir}" || true
- '';
-
- postStop = ''
- rm -rf "${stateDir}/webapps"
- '';
-
- serviceConfig = {
- Type = "simple";
- ExecStart = "${cmd} start";
- ExecStop = "${cmd} stop";
- User = "mfi";
- PermissionsStartOnly = true;
- UMask = "0077";
- WorkingDirectory = "${stateDir}";
- };
- };
- };
-}
diff --git a/nixos/modules/services/networking/namecoind.nix b/nixos/modules/services/networking/namecoind.nix
index 9df9f67cde834ab2fd670bb30ac4093112ba97d5..11f7d7e5caef7f135bf815114f7c31a44500b586 100644
--- a/nixos/modules/services/networking/namecoind.nix
+++ b/nixos/modules/services/networking/namecoind.nix
@@ -173,7 +173,7 @@ in
serviceConfig = {
User = "namecoin";
- Griup = "namecoin";
+ Group = "namecoin";
ExecStart = "${pkgs.altcoins.namecoind}/bin/namecoind -conf=${configFile} -datadir=${dataDir} -printtoconsole";
ExecStop = "${pkgs.coreutils}/bin/kill -KILL $MAINPID";
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index 2b7086afe7e8328842634146c4489e7f4083126d..6bdae32f72bb329328353d8d55fca5d85f56a047 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -32,6 +32,11 @@ let
ipv6.ip6-privacy=2
ethernet.cloned-mac-address=${cfg.ethernet.macAddress}
wifi.cloned-mac-address=${cfg.wifi.macAddress}
+ ${optionalString (cfg.wifi.powersave != null)
+ ''wifi.powersave=${if cfg.wifi.powersave then "3" else "2"}''}
+
+ [device]
+ wifi.scan-rand-mac-address=${if cfg.wifi.scanRandMacAddress then "yes" else "no"}
'';
/*
@@ -130,7 +135,8 @@ in {
default = { inherit networkmanager modemmanager wpa_supplicant
networkmanager_openvpn networkmanager_vpnc
networkmanager_openconnect networkmanager_fortisslvpn
- networkmanager_pptp networkmanager_l2tp; };
+ networkmanager_pptp networkmanager_l2tp
+ networkmanager_iodine; };
internal = true;
};
@@ -178,7 +184,27 @@ in {
};
ethernet.macAddress = macAddressOpt;
- wifi.macAddress = macAddressOpt;
+
+ wifi = {
+ macAddress = macAddressOpt;
+
+ powersave = mkOption {
+ type = types.nullOr types.bool;
+ default = null;
+ description = ''
+ Whether to enable Wi-Fi power saving.
+ '';
+ };
+
+ scanRandMacAddress = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ Whether to enable MAC address randomization of a Wi-Fi device
+ during scanning.
+ '';
+ };
+ };
useDnsmasq = mkOption {
type = types.bool;
@@ -255,6 +281,9 @@ in {
{ source = "${networkmanager_strongswan}/etc/NetworkManager/VPN/nm-strongswan-service.name";
target = "NetworkManager/VPN/nm-strongswan-service.name";
}
+ { source = "${networkmanager_iodine}/etc/NetworkManager/VPN/nm-iodine-service.name";
+ target = "NetworkManager/VPN/nm-iodine-service.name";
+ }
] ++ optional (cfg.appendNameservers == [] || cfg.insertNameservers == [])
{ source = overrideNameserversScript;
target = "NetworkManager/dispatcher.d/02overridedns";
@@ -278,6 +307,11 @@ in {
name = "nm-openvpn";
uid = config.ids.uids.nm-openvpn;
extraGroups = [ "networkmanager" ];
+ }
+ {
+ name = "nm-iodine";
+ isSystemUser = true;
+ group = "networkmanager";
}];
systemd.packages = cfg.packages;
diff --git a/nixos/modules/services/networking/radicale.nix b/nixos/modules/services/networking/radicale.nix
index ef860e7e5df4db6c30669ec8ca044907ed8949ef..391f4bdebbabbb3b466738233e94bff01f981586 100644
--- a/nixos/modules/services/networking/radicale.nix
+++ b/nixos/modules/services/networking/radicale.nix
@@ -1,4 +1,4 @@
-{config, lib, pkgs, ...}:
+{ config, lib, pkgs, ... }:
with lib;
@@ -8,17 +8,35 @@ let
confFile = pkgs.writeText "radicale.conf" cfg.config;
+ # This enables us to default to version 2 while still not breaking configurations of people with version 1
+ defaultPackage = if versionAtLeast config.system.stateVersion "17.09" then {
+ pkg = pkgs.radicale2;
+ text = "pkgs.radicale2";
+ } else {
+ pkg = pkgs.radicale1;
+ text = "pkgs.radicale1";
+ };
in
{
options = {
-
services.radicale.enable = mkOption {
type = types.bool;
default = false;
description = ''
- Enable Radicale CalDAV and CardDAV server
+ Enable Radicale CalDAV and CardDAV server.
+ '';
+ };
+
+ services.radicale.package = mkOption {
+ type = types.package;
+ default = defaultPackage.pkg;
+ defaultText = defaultPackage.text;
+ description = ''
+ Radicale package to use. This defaults to version 1.x if
+ system.stateVersion < 17.09 and version 2.x
+ otherwise.
'';
};
@@ -27,13 +45,19 @@ in
default = "";
description = ''
Radicale configuration, this will set the service
- configuration file
+ configuration file.
'';
- };
+ };
+
+ services.radicale.extraArgs = mkOption {
+ type = types.listOf types.string;
+ default = [];
+ description = "Extra arguments passed to the Radicale daemon.";
+ };
};
config = mkIf cfg.enable {
- environment.systemPackages = [ pkgs.radicale ];
+ environment.systemPackages = [ cfg.package ];
users.extraUsers = singleton
{ name = "radicale";
@@ -52,11 +76,17 @@ in
description = "A Simple Calendar and Contact Server";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
- script = "${pkgs.radicale}/bin/radicale -C ${confFile} -f";
- serviceConfig.User = "radicale";
- serviceConfig.Group = "radicale";
+ serviceConfig = {
+ ExecStart = concatStringsSep " " ([
+ "${cfg.package}/bin/radicale" "-C" confFile
+ ] ++ (
+ map escapeShellArg cfg.extraArgs
+ ));
+ User = "radicale";
+ Group = "radicale";
+ };
};
};
- meta.maintainers = with lib.maintainers; [ aneeshusa ];
+ meta.maintainers = with lib.maintainers; [ aneeshusa infinisil ];
}
diff --git a/nixos/modules/services/networking/softether.nix b/nixos/modules/services/networking/softether.nix
index 16530078b978a783840d852374a7e91069ae7eb0..9087b75c29c10568747a7c54b4d665a55cb7d014 100644
--- a/nixos/modules/services/networking/softether.nix
+++ b/nixos/modules/services/networking/softether.nix
@@ -3,7 +3,6 @@
with lib;
let
- pkg = pkgs.softether;
cfg = config.services.softether;
in
@@ -17,6 +16,15 @@ in
enable = mkEnableOption "SoftEther VPN services";
+ package = mkOption {
+ type = types.package;
+ default = pkgs.softether;
+ defaultText = "pkgs.softether";
+ description = ''
+ softether derivation to use.
+ '';
+ };
+
vpnserver.enable = mkEnableOption "SoftEther VPN Server";
vpnbridge.enable = mkEnableOption "SoftEther VPN Bridge";
@@ -41,7 +49,7 @@ in
dataDir = mkOption {
type = types.string;
- default = "${pkg.dataDir}";
+ default = "${cfg.package.dataDir}";
description = ''
Data directory for SoftEther VPN.
'';
@@ -57,12 +65,13 @@ in
mkMerge [{
environment.systemPackages = [
- (pkgs.lib.overrideDerivation pkg (attrs: {
+ (pkgs.lib.overrideDerivation cfg.package (attrs: {
dataDir = cfg.dataDir;
}))
];
systemd.services."softether-init" = {
description = "SoftEther VPN services initial task";
+ wantedBy = [ "network.target" ];
serviceConfig = {
Type = "oneshot";
RemainAfterExit = false;
@@ -71,11 +80,11 @@ in
for d in vpnserver vpnbridge vpnclient vpncmd; do
if ! test -e ${cfg.dataDir}/$d; then
${pkgs.coreutils}/bin/mkdir -m0700 -p ${cfg.dataDir}/$d
- install -m0600 ${pkg}${cfg.dataDir}/$d/hamcore.se2 ${cfg.dataDir}/$d/hamcore.se2
+ install -m0600 ${cfg.package}${cfg.dataDir}/$d/hamcore.se2 ${cfg.dataDir}/$d/hamcore.se2
fi
done
rm -rf ${cfg.dataDir}/vpncmd/vpncmd
- ln -s ${pkg}${cfg.dataDir}/vpncmd/vpncmd ${cfg.dataDir}/vpncmd/vpncmd
+ ln -s ${cfg.package}${cfg.dataDir}/vpncmd/vpncmd ${cfg.dataDir}/vpncmd/vpncmd
'';
};
}
@@ -83,17 +92,17 @@ in
(mkIf (cfg.vpnserver.enable) {
systemd.services.vpnserver = {
description = "SoftEther VPN Server";
- after = [ "softether-init.service" "network.target" ];
- wants = [ "softether-init.service" ];
- wantedBy = [ "multi-user.target" ];
+ after = [ "softether-init.service" ];
+ requires = [ "softether-init.service" ];
+ wantedBy = [ "network.target" ];
serviceConfig = {
Type = "forking";
- ExecStart = "${pkg}/bin/vpnserver start";
- ExecStop = "${pkg}/bin/vpnserver stop";
+ ExecStart = "${cfg.package}/bin/vpnserver start";
+ ExecStop = "${cfg.package}/bin/vpnserver stop";
};
preStart = ''
rm -rf ${cfg.dataDir}/vpnserver/vpnserver
- ln -s ${pkg}${cfg.dataDir}/vpnserver/vpnserver ${cfg.dataDir}/vpnserver/vpnserver
+ ln -s ${cfg.package}${cfg.dataDir}/vpnserver/vpnserver ${cfg.dataDir}/vpnserver/vpnserver
'';
postStop = ''
rm -rf ${cfg.dataDir}/vpnserver/vpnserver
@@ -104,17 +113,17 @@ in
(mkIf (cfg.vpnbridge.enable) {
systemd.services.vpnbridge = {
description = "SoftEther VPN Bridge";
- after = [ "softether-init.service" "network.target" ];
- wants = [ "softether-init.service" ];
- wantedBy = [ "multi-user.target" ];
+ after = [ "softether-init.service" ];
+ requires = [ "softether-init.service" ];
+ wantedBy = [ "network.target" ];
serviceConfig = {
Type = "forking";
- ExecStart = "${pkg}/bin/vpnbridge start";
- ExecStop = "${pkg}/bin/vpnbridge stop";
+ ExecStart = "${cfg.package}/bin/vpnbridge start";
+ ExecStop = "${cfg.package}/bin/vpnbridge stop";
};
preStart = ''
rm -rf ${cfg.dataDir}/vpnbridge/vpnbridge
- ln -s ${pkg}${cfg.dataDir}/vpnbridge/vpnbridge ${cfg.dataDir}/vpnbridge/vpnbridge
+ ln -s ${cfg.package}${cfg.dataDir}/vpnbridge/vpnbridge ${cfg.dataDir}/vpnbridge/vpnbridge
'';
postStop = ''
rm -rf ${cfg.dataDir}/vpnbridge/vpnbridge
@@ -125,17 +134,17 @@ in
(mkIf (cfg.vpnclient.enable) {
systemd.services.vpnclient = {
description = "SoftEther VPN Client";
- after = [ "softether-init.service" "network.target" ];
- wants = [ "softether-init.service" ];
- wantedBy = [ "multi-user.target" ];
+ after = [ "softether-init.service" ];
+ requires = [ "softether-init.service" ];
+ wantedBy = [ "network.target" ];
serviceConfig = {
Type = "forking";
- ExecStart = "${pkg}/bin/vpnclient start";
- ExecStop = "${pkg}/bin/vpnclient stop";
+ ExecStart = "${cfg.package}/bin/vpnclient start";
+ ExecStop = "${cfg.package}/bin/vpnclient stop";
};
preStart = ''
rm -rf ${cfg.dataDir}/vpnclient/vpnclient
- ln -s ${pkg}${cfg.dataDir}/vpnclient/vpnclient ${cfg.dataDir}/vpnclient/vpnclient
+ ln -s ${cfg.package}${cfg.dataDir}/vpnclient/vpnclient ${cfg.dataDir}/vpnclient/vpnclient
'';
postStart = ''
sleep 1
diff --git a/nixos/modules/services/networking/squid.nix b/nixos/modules/services/networking/squid.nix
new file mode 100644
index 0000000000000000000000000000000000000000..b220c21b604f633da0bd4c210fd7d27799209e1a
--- /dev/null
+++ b/nixos/modules/services/networking/squid.nix
@@ -0,0 +1,169 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+ cfg = config.services.squid;
+
+
+ squidConfig = pkgs.writeText "squid.conf"
+ (if cfg.configText != null then cfg.configText else
+ ''
+ #
+ # Recommended minimum configuration (3.5):
+ #
+
+ # Example rule allowing access from your local networks.
+ # Adapt to list your (internal) IP networks from where browsing
+ # should be allowed
+ acl localnet src 10.0.0.0/8 # RFC 1918 possible internal network
+ acl localnet src 172.16.0.0/12 # RFC 1918 possible internal network
+ acl localnet src 192.168.0.0/16 # RFC 1918 possible internal network
+ acl localnet src 169.254.0.0/16 # RFC 3927 link-local (directly plugged) machines
+ acl localnet src fc00::/7 # RFC 4193 local private network range
+ acl localnet src fe80::/10 # RFC 4291 link-local (directly plugged) machines
+
+ acl SSL_ports port 443 # https
+ acl Safe_ports port 80 # http
+ acl Safe_ports port 21 # ftp
+ acl Safe_ports port 443 # https
+ acl Safe_ports port 70 # gopher
+ acl Safe_ports port 210 # wais
+ acl Safe_ports port 1025-65535 # unregistered ports
+ acl Safe_ports port 280 # http-mgmt
+ acl Safe_ports port 488 # gss-http
+ acl Safe_ports port 591 # filemaker
+ acl Safe_ports port 777 # multiling http
+ acl CONNECT method CONNECT
+
+ #
+ # Recommended minimum Access Permission configuration:
+ #
+ # Deny requests to certain unsafe ports
+ http_access deny !Safe_ports
+
+ # Deny CONNECT to other than secure SSL ports
+ http_access deny CONNECT !SSL_ports
+
+ # Only allow cachemgr access from localhost
+ http_access allow localhost manager
+ http_access deny manager
+
+ # We strongly recommend the following be uncommented to protect innocent
+ # web applications running on the proxy server who think the only
+ # one who can access services on "localhost" is a local user
+ http_access deny to_localhost
+
+ # Application logs to syslog, access and store logs have specific files
+ cache_log syslog
+ access_log stdio:/var/log/squid/access.log
+ cache_store_log stdio:/var/log/squid/store.log
+
+ # Required by systemd service
+ pid_filename /run/squid.pid
+
+ # Run as user and group squid
+ cache_effective_user squid squid
+
+ #
+ # INSERT YOUR OWN RULE(S) HERE TO ALLOW ACCESS FROM YOUR CLIENTS
+ #
+ ${cfg.extraConfig}
+
+ # Example rule allowing access from your local networks.
+ # Adapt localnet in the ACL section to list your (internal) IP networks
+ # from where browsing should be allowed
+ http_access allow localnet
+ http_access allow localhost
+
+ # And finally deny all other access to this proxy
+ http_access deny all
+
+ # Squid normally listens to port 3128
+ http_port ${toString cfg.proxyPort}
+
+ # Leave coredumps in the first cache dir
+ coredump_dir /var/cache/squid
+
+ #
+ # Add any of your own refresh_pattern entries above these.
+ #
+ refresh_pattern ^ftp: 1440 20% 10080
+ refresh_pattern ^gopher: 1440 0% 1440
+ refresh_pattern -i (/cgi-bin/|\?) 0 0% 0
+ refresh_pattern . 0 20% 4320
+ '');
+
+in
+
+{
+
+ options = {
+
+ services.squid = {
+
+ enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Whether to run squid web proxy.";
+ };
+
+ proxyPort = mkOption {
+ type = types.int;
+ default = 3128;
+ description = "TCP port on which squid will listen.";
+ };
+
+ extraConfig = mkOption {
+ type = types.lines;
+ default = "";
+ description = ''
+ Squid configuration. Contents will be added
+ verbatim to the configuration file.
+ '';
+ };
+
+ configText = mkOption {
+ type = types.nullOr types.lines;
+ default = null;
+ description = ''
+ Verbatim contents of squid.conf. If null (default), use the
+ autogenerated file from NixOS instead.
+ '';
+ };
+
+ };
+
+ };
+
+ config = mkIf cfg.enable {
+
+ users.users.squid = {
+ isSystemUser = true;
+ group = "squid";
+ home = "/var/cache/squid";
+ createHome = true;
+ };
+
+ users.groups.squid = {};
+
+ systemd.services.squid = {
+ description = "Squid caching web proxy";
+ after = [ "network.target" "nss-lookup.target" ];
+ wantedBy = [ "multi-user.target"];
+ preStart = ''
+ mkdir -p "/var/log/squid"
+ chown squid:squid "/var/log/squid"
+ '';
+ serviceConfig = {
+ Type="forking";
+ PIDFile="/run/squid.pid";
+ PermissionsStartOnly = true;
+ ExecStart = "${pkgs.squid}/bin/squid -YCs -f ${squidConfig}";
+ };
+ };
+
+ };
+
+}
\ No newline at end of file
diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index 0f58536b4b7347c1f45f1c6827f13dc931129ee6..8828429a8178b53d3112749f6426d1a086906d87 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -103,6 +103,15 @@ in
'';
};
+ sftpFlags = mkOption {
+ type = with types; listOf str;
+ default = [];
+ example = [ "-f AUTHPRIV" "-l INFO" ];
+ description = ''
+ Commandline flags to add to sftp-server.
+ '';
+ };
+
permitRootLogin = mkOption {
default = "prohibit-password";
type = types.enum ["yes" "without-password" "prohibit-password" "forced-commands-only" "no"];
@@ -208,7 +217,7 @@ in
};
moduliFile = mkOption {
- example = "services.openssh.moduliFile = /etc/my-local-ssh-moduli;";
+ example = "/etc/my-local-ssh-moduli;";
type = types.path;
description = ''
Path to moduli file to install in
@@ -338,7 +347,7 @@ in
''}
${optionalString cfg.allowSFTP ''
- Subsystem sftp ${cfgc.package}/libexec/sftp-server
+ Subsystem sftp ${cfgc.package}/libexec/sftp-server ${concatStringsSep " " cfg.sftpFlags}
''}
PermitRootLogin ${cfg.permitRootLogin}
diff --git a/nixos/modules/services/networking/strongswan.nix b/nixos/modules/services/networking/strongswan.nix
index b0eb0460b9bab71dc112603de193049ee7cdf711..3a3f64221c422291c733e6a63bb7b5182dfffdcc 100644
--- a/nixos/modules/services/networking/strongswan.nix
+++ b/nixos/modules/services/networking/strongswan.nix
@@ -32,8 +32,10 @@ let
${caConf}
'';
- strongswanConf = {setup, connections, ca, secrets}: toFile "strongswan.conf" ''
+ strongswanConf = {setup, connections, ca, secrets, managePlugins, enabledPlugins}: toFile "strongswan.conf" ''
charon {
+ ${if managePlugins then "load_modular = no" else ""}
+ ${if managePlugins then ("load = " + (concatStringsSep " " enabledPlugins)) else ""}
plugins {
stroke {
secrets_file = ${ipsecSecrets secrets}
@@ -112,6 +114,25 @@ in
file.
'';
};
+
+ managePlugins = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ If set to true, this option will disable automatic plugin loading and
+ then tell strongSwan to enable the plugins specified in the
+ option.
+ '';
+ };
+
+ enabledPlugins = mkOption {
+ type = types.listOf types.str;
+ default = [];
+ description = ''
+ A list of additional plugins to enable if
+ is true.
+ '';
+ };
};
config = with cfg; mkIf enable {
@@ -122,7 +143,7 @@ in
wants = [ "keys.target" ];
after = [ "network-online.target" "keys.target" ];
environment = {
- STRONGSWAN_CONF = strongswanConf { inherit setup connections ca secrets; };
+ STRONGSWAN_CONF = strongswanConf { inherit setup connections ca secrets managePlugins enabledPlugins; };
};
serviceConfig = {
ExecStart = "${pkgs.strongswan}/sbin/ipsec start --nofork";
diff --git a/nixos/modules/services/networking/supplicant.nix b/nixos/modules/services/networking/supplicant.nix
index 31d11548f195eac7635a60764c6e0848be77c7ba..dc90a4bcc62075866ef9c59cf3ccd8253bb2d748 100644
--- a/nixos/modules/services/networking/supplicant.nix
+++ b/nixos/modules/services/networking/supplicant.nix
@@ -181,18 +181,19 @@ in
default = { };
- example = {
- "wlan0 wlan1" = {
- configFile = "/etc/wpa_supplicant";
- userControlled.group = "network";
- extraConf = ''
- ap_scan=1
- p2p_disabled=1
- '';
- extraCmdArgs = "-u -W";
- bridge = "br0";
- };
- };
+ example = literalExample ''
+ { "wlan0 wlan1" = {
+ configFile = "/etc/wpa_supplicant";
+ userControlled.group = "network";
+ extraConf = '''
+ ap_scan=1
+ p2p_disabled=1
+ ''';
+ extraCmdArgs = "-u -W";
+ bridge = "br0";
+ };
+ }
+ '';
description = ''
Interfaces for which to start wpa_supplicant.
diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix
index 7a786b54ccbb41cca388f62ad3bfc22d8d661ee4..adb80ea2984059f5761f81375a117388677f8e4f 100644
--- a/nixos/modules/services/networking/tinc.nix
+++ b/nixos/modules/services/networking/tinc.nix
@@ -141,7 +141,6 @@ in
${optionalString (data.ed25519PrivateKeyFile != null) "Ed25519PrivateKeyFile = ${data.ed25519PrivateKeyFile}"}
${optionalString (data.listenAddress != null) "ListenAddress = ${data.listenAddress}"}
${optionalString (data.bindToAddress != null) "BindToAddress = ${data.bindToAddress}"}
- Device = /dev/net/tun
Interface = tinc.${network}
${data.extraConfig}
'';
@@ -164,10 +163,17 @@ in
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
path = [ data.package ];
+ restartTriggers =
+ let
+ drvlist = [ config.environment.etc."tinc/${network}/tinc.conf".source ]
+ ++ mapAttrsToList (host: _: config.environment.etc."tinc/${network}/hosts/${host}".source) data.hosts;
+ in # drvlist might be too long to be used directly
+ [ (builtins.hashString "sha256" (concatMapStrings (d: d.outPath) drvlist)) ];
serviceConfig = {
Type = "simple";
Restart = "always";
RestartSec = "3";
+ ExecStart = "${data.package}/bin/tincd -D -U tinc.${network} -n ${network} ${optionalString (data.chroot) "-R"} --pidfile /run/tinc.${network}.pid -d ${toString data.debugLevel}";
};
preStart = ''
mkdir -p /etc/tinc/${network}/hosts
@@ -187,9 +193,6 @@ in
[ -f "/etc/tinc/${network}/rsa_key.priv" ] || tincd -n ${network} -K 4096
fi
'';
- script = ''
- tincd -D -U tinc.${network} -n ${network} ${optionalString (data.chroot) "-R"} --pidfile /run/tinc.${network}.pid -d ${toString data.debugLevel}
- '';
})
);
@@ -199,8 +202,10 @@ in
buildInputs = [ pkgs.makeWrapper ];
buildCommand = ''
mkdir -p $out/bin
- ${concatStringsSep "\n" (mapAttrsToList (network: data: ''
- makeWrapper ${data.package}/bin/tinc "$out/bin/tinc.${network}" --add-flags "--pidfile=/run/tinc.${network}.pid"
+ ${concatStringsSep "\n" (mapAttrsToList (network: data:
+ optionalString (versionAtLeast data.package.version "1.1pre") ''
+ makeWrapper ${data.package}/bin/tinc "$out/bin/tinc.${network}" \
+ --add-flags "--pidfile=/run/tinc.${network}.pid"
'') cfg.networks)}
'';
};
diff --git a/nixos/modules/services/networking/tinydns.nix b/nixos/modules/services/networking/tinydns.nix
new file mode 100644
index 0000000000000000000000000000000000000000..184888ef05da0192320a942c7476e8e23826694c
--- /dev/null
+++ b/nixos/modules/services/networking/tinydns.nix
@@ -0,0 +1,54 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+ ###### interface
+
+ options = {
+ services.tinydns = {
+ enable = mkOption {
+ default = false;
+ type = types.bool;
+ description = "Whether to run the tinydns dns server";
+ };
+
+ data = mkOption {
+ type = types.lines;
+ default = "";
+ description = "The DNS data to serve, in the format described by tinydns-data(8)";
+ };
+
+ ip = mkOption {
+ default = "0.0.0.0";
+ type = types.str;
+ description = "IP address on which to listen for connections";
+ };
+ };
+ };
+
+ ###### implementation
+
+ config = mkIf config.services.tinydns.enable {
+ environment.systemPackages = [ pkgs.djbdns ];
+
+ users.extraUsers.tinydns = {};
+
+ systemd.services.tinydns = {
+ description = "djbdns tinydns server";
+ wantedBy = [ "multi-user.target" ];
+ path = with pkgs; [ daemontools djbdns ];
+ preStart = ''
+ rm -rf /var/lib/tinydns
+ tinydns-conf tinydns tinydns /var/lib/tinydns ${config.services.tinydns.ip}
+ cd /var/lib/tinydns/root/
+ ln -sf ${pkgs.writeText "tinydns-data" config.services.tinydns.data} data
+ tinydns-data
+ '';
+ script = ''
+ cd /var/lib/tinydns
+ exec ./run
+ '';
+ };
+ };
+}
diff --git a/nixos/modules/services/networking/unbound.nix b/nixos/modules/services/networking/unbound.nix
index f3a04d97c98e7c4e9155ffbfaaf04ccd1bb7f0eb..545ee327d59649cf1641b3b124e91b39774b6d6f 100644
--- a/nixos/modules/services/networking/unbound.nix
+++ b/nixos/modules/services/networking/unbound.nix
@@ -8,9 +8,9 @@ let
stateDir = "/var/lib/unbound";
- access = concatMapStrings (x: " access-control: ${x} allow\n") cfg.allowedAccess;
+ access = concatMapStringsSep "\n " (x: "access-control: ${x} allow") cfg.allowedAccess;
- interfaces = concatMapStrings (x: " interface: ${x}\n") cfg.interfaces;
+ interfaces = concatMapStringsSep "\n " (x: "interface: ${x}") cfg.interfaces;
isLocalAddress = x: substring 0 3 x == "::1" || substring 0 9 x == "127.0.0.1";
@@ -105,7 +105,7 @@ in
description = "Unbound recursive Domain Name Server";
after = [ "network.target" ];
before = [ "nss-lookup.target" ];
- wants = [" nss-lookup.target" ];
+ wants = [ "nss-lookup.target" ];
wantedBy = [ "multi-user.target" ];
preStart = ''
diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix
index 4f54b45639f6bfe2461c0d2ee4098e9a8b451e25..24accd41511c28ee7f3e03e75fb4ffc4a05051e5 100644
--- a/nixos/modules/services/networking/wireguard.nix
+++ b/nixos/modules/services/networking/wireguard.nix
@@ -95,6 +95,14 @@ let
type = with types; listOf (submodule peerOpts);
};
+ allowedIPsAsRoutes = mkOption {
+ example = false;
+ default = true;
+ type = types.bool;
+ description = ''
+ Determines whether to add allowed IPs as routes or not.
+ '';
+ };
};
};
@@ -187,6 +195,7 @@ let
description = "WireGuard Tunnel - ${name}";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
+ environment.DEVICE = name;
serviceConfig = {
Type = "oneshot";
@@ -217,11 +226,11 @@ let
"${ipCommand} link set up dev ${name}"
- (map (peer:
+ (optionals (values.allowedIPsAsRoutes != false) (map (peer:
(map (allowedIP:
"${ipCommand} route replace ${allowedIP} dev ${name} table ${values.table}"
) peer.allowedIPs)
- ) values.peers)
+ ) values.peers))
values.postSetup
]);
diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix
index c91ba91fcb4d5819eb8a05612dec9e7685d10351..4bae05b6dd3029e78c153145d451d391ed34a978 100644
--- a/nixos/modules/services/networking/wpa_supplicant.nix
+++ b/nixos/modules/services/networking/wpa_supplicant.nix
@@ -8,17 +8,20 @@ let
${optionalString cfg.userControlled.enable ''
ctrl_interface=DIR=/var/run/wpa_supplicant GROUP=${cfg.userControlled.group}
update_config=1''}
- ${concatStringsSep "\n" (mapAttrsToList (ssid: networkConfig: let
- psk = if networkConfig.psk != null
- then ''"${networkConfig.psk}"''
- else networkConfig.pskRaw;
- priority = networkConfig.priority;
+ ${concatStringsSep "\n" (mapAttrsToList (ssid: config: with config; let
+ key = if psk != null
+ then ''"${psk}"''
+ else pskRaw;
+ baseAuth = if key != null
+ then ''psk=${key}''
+ else ''key_mgmt=NONE'';
in ''
network={
ssid="${ssid}"
- ${optionalString (psk != null) ''psk=${psk}''}
- ${optionalString (psk == null) ''key_mgmt=NONE''}
${optionalString (priority != null) ''priority=${toString priority}''}
+ ${optionalString hidden "scan_ssid=1"}
+ ${if (auth != null) then auth else baseAuth}
+ ${extraConfig}
}
'') cfg.networks)}
'' else "/etc/wpa_supplicant.conf";
@@ -70,6 +73,32 @@ in {
Mutually exclusive with psk.
'';
};
+
+ auth = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ example = ''
+ key_mgmt=WPA-EAP
+ eap=PEAP
+ identity="user@example.com"
+ password="secret"
+ '';
+ description = ''
+ Use this option to configure advanced authentication methods like EAP.
+ See wpa_supplicant.conf(5) for example configurations.
+
+ Mutually exclusive with psk and pskRaw.
+ '';
+ };
+
+ hidden = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Set this to true if the SSID of the network is hidden.
+ '';
+ };
+
priority = mkOption {
type = types.nullOr types.int;
default = null;
@@ -83,6 +112,19 @@ in {
policy, signal strength, etc.
'';
};
+
+ extraConfig = mkOption {
+ type = types.str;
+ default = "";
+ example = ''
+ bssid_blacklist=02:11:22:33:44:55 02:22:aa:44:55:66
+ '';
+ description = ''
+ Extra configuration lines appended to the network block.
+ See wpa_supplicant.conf(5) for available options.
+ '';
+ };
+
};
});
description = ''
@@ -128,8 +170,8 @@ in {
config = mkIf cfg.enable {
assertions = flip mapAttrsToList cfg.networks (name: cfg: {
- assertion = cfg.psk == null || cfg.pskRaw == null;
- message = ''networking.wireless."${name}".psk and networking.wireless."${name}".pskRaw are mutually exclusive'';
+ assertion = with cfg; count (x: x != null) [ psk pskRaw auth ] <= 1;
+ message = ''options networking.wireless."${name}".{psk,pskRaw,auth} are mutually exclusive'';
});
environment.systemPackages = [ pkgs.wpa_supplicant ];
@@ -148,6 +190,7 @@ in {
wants = [ "network.target" ];
requires = lib.concatMap deviceUnit ifaces;
wantedBy = [ "multi-user.target" ];
+ stopIfChanged = false;
path = [ pkgs.wpa_supplicant ];
diff --git a/nixos/modules/services/networking/znc.nix b/nixos/modules/services/networking/znc.nix
index 2b9867ade10d42d0cf64b8b59347142832c10d04..72313ab2ee1444d4c60dd259531cd6a42196ffca 100644
--- a/nixos/modules/services/networking/znc.nix
+++ b/nixos/modules/services/networking/znc.nix
@@ -212,6 +212,14 @@ in
'';
};
+ openFirewall = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether to open ports in the firewall for ZNC.
+ '';
+ };
+
zncConf = mkOption {
default = "";
example = "See: http://wiki.znc.in/Configuration";
@@ -261,7 +269,7 @@ in
"freenode" = {
server = "chat.freenode.net";
port = 6697;
- ssl = true;
+ useSSL = true;
modules = [ "simple_away" ];
};
};
@@ -321,7 +329,7 @@ in
};
mutable = mkOption {
- default = false;
+ default = true;
type = types.bool;
description = ''
Indicates whether to allow the contents of the `dataDir` directory to be changed
@@ -350,6 +358,10 @@ in
config = mkIf cfg.enable {
+ networking.firewall = mkIf cfg.openFirewall {
+ allowedTCPPorts = [ cfg.confOptions.port ];
+ };
+
systemd.services.znc = {
description = "ZNC Server";
wantedBy = [ "multi-user.target" ];
diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix
index 855c89303847c41d576df7d05bb6374da66db4bb..4c7f58d1d8bc360ba6e9ae5613a5527ba416e19c 100644
--- a/nixos/modules/services/printing/cupsd.nix
+++ b/nixos/modules/services/printing/cupsd.nix
@@ -4,7 +4,7 @@ with lib;
let
- inherit (pkgs) cups cups-pk-helper cups-filters gutenprint;
+ inherit (pkgs) cups cups-pk-helper cups-filters;
cfg = config.services.printing;
@@ -35,7 +35,6 @@ let
name = "cups-progs";
paths =
[ cups.out additionalBackends cups-filters pkgs.ghostscript ]
- ++ optional cfg.gutenprint gutenprint
++ cfg.drivers;
pathsToLink = [ "/lib" "/share/cups" "/bin" ];
postBuild = cfg.bindirCmds;
@@ -97,12 +96,15 @@ let
(writeConf "client.conf" cfg.clientConf)
(writeConf "snmp.conf" cfg.snmpConf)
] ++ optional avahiEnabled browsedFile
- ++ optional cfg.gutenprint gutenprint
++ cfg.drivers;
pathsToLink = [ "/etc/cups" ];
ignoreCollisions = true;
};
+ filterGutenprint = pkgs: filter (pkg: pkg.meta.isGutenprint or false == true) pkgs;
+ containsGutenprint = pkgs: length (filterGutenprint pkgs) > 0;
+ getGutenprint = pkgs: head (filterGutenprint pkgs);
+
in
{
@@ -224,23 +226,17 @@ in
'';
};
- gutenprint = mkOption {
- type = types.bool;
- default = false;
- description = ''
- Whether to enable Gutenprint drivers for CUPS. This includes auto-updating
- Gutenprint PPD files.
- '';
- };
-
drivers = mkOption {
type = types.listOf types.path;
default = [];
- example = literalExample "[ pkgs.splix ]";
+ example = literalExample "[ pkgs.gutenprint pkgs.hplip pkgs.splix ]";
description = ''
- CUPS drivers to use. Drivers provided by CUPS, cups-filters, Ghostscript
- and Samba are added unconditionally. For adding Gutenprint, see
- gutenprint.
+ CUPS drivers to use. Drivers provided by CUPS, cups-filters,
+ Ghostscript and Samba are added unconditionally. If this list contains
+ Gutenprint (i.e. a derivation with
+ meta.isGutenprint = true) the PPD files in
+ /var/lib/cups/ppd will be updated automatically
+ to avoid errors due to incompatible versions.
'';
};
@@ -318,9 +314,9 @@ in
[ ! -e /var/lib/cups/path ] && \
ln -s ${bindir} /var/lib/cups/path
- ${optionalString cfg.gutenprint ''
+ ${optionalString (containsGutenprint cfg.drivers) ''
if [ -d /var/lib/cups/ppd ]; then
- ${gutenprint}/bin/cups-genppdupdate -p /var/lib/cups/ppd
+ ${getGutenprint cfg.drivers}/bin/cups-genppdupdate -p /var/lib/cups/ppd
fi
''}
'';
diff --git a/nixos/modules/services/scheduling/atd.nix b/nixos/modules/services/scheduling/atd.nix
index 0216c9771c96c94614d8c430249007b6d005b41c..77a3f6b51e801929a92b70a315b7eb86d633c6d0 100644
--- a/nixos/modules/services/scheduling/atd.nix
+++ b/nixos/modules/services/scheduling/atd.nix
@@ -42,6 +42,8 @@ in
config = mkIf cfg.enable {
+ # Not wrapping "batch" because it's a shell script (kernel drops perms
+ # anyway) and it's patched to invoke the "at" setuid wrapper.
security.wrappers = builtins.listToAttrs (
map (program: { name = "${program}"; value = {
source = "${at}/bin/${program}";
@@ -49,7 +51,7 @@ in
group = "atd";
setuid = true;
setgid = true;
- };}) [ "at" "atq" "atrm" "batch" ]);
+ };}) [ "at" "atq" "atrm" ]);
environment.systemPackages = [ at ];
diff --git a/nixos/modules/services/scheduling/cron.nix b/nixos/modules/services/scheduling/cron.nix
index 7b1a1599e1419e3395535e075b57c432d7348d9e..6f6977b38a1d81434e6639cfc43c2bdb0669cc63 100644
--- a/nixos/modules/services/scheduling/cron.nix
+++ b/nixos/modules/services/scheduling/cron.nix
@@ -122,7 +122,7 @@ in
fi
'';
- restartTriggers = [ config.environment.etc.localtime.source ];
+ restartTriggers = [ config.time.timeZone ];
serviceConfig.ExecStart = "${cronNixosPkg}/bin/cron -n";
};
diff --git a/nixos/modules/services/scheduling/fcron.nix b/nixos/modules/services/scheduling/fcron.nix
index af4f9f41fd0409c41b433a90e62b54ef2bca91c0..ac589be57736b73f8ab9ccc291b0ad796b2ebbab 100644
--- a/nixos/modules/services/scheduling/fcron.nix
+++ b/nixos/modules/services/scheduling/fcron.nix
@@ -137,10 +137,7 @@ in
after = [ "local-fs.target" ];
wantedBy = [ "multi-user.target" ];
- # FIXME use specific path
- environment = {
- PATH = "/run/current-system/sw/bin";
- };
+ path = [ pkgs.fcron ];
preStart = ''
install \
@@ -149,7 +146,7 @@ in
--group fcron \
--directory /var/spool/fcron
# load system crontab file
- /run/wrappers/bin/fcrontab -u systab ${pkgs.writeText "systab" cfg.systab}
+ /run/wrappers/bin/fcrontab -u systab - < ${pkgs.writeText "systab" cfg.systab}
'';
serviceConfig = {
diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix
index 2ea22a945940f489042beaa31694745405765605..c51dd5d946550402de2ec9304c62b293f56b4d0c 100644
--- a/nixos/modules/services/search/elasticsearch.nix
+++ b/nixos/modules/services/search/elasticsearch.nix
@@ -174,11 +174,13 @@ in {
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
+ ${optionalString (!config.boot.isContainer) ''
+ # 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}
diff --git a/nixos/modules/services/search/solr.nix b/nixos/modules/services/search/solr.nix
index 33d74e897237953a68fec1fb5dc1aa35d1a6e5bd..90140a337ed8c509da9472f05cfc382327413a29 100644
--- a/nixos/modules/services/search/solr.nix
+++ b/nixos/modules/services/search/solr.nix
@@ -15,8 +15,6 @@ let
sha256 = "01mzvh53wrs1p2ym765jwd00gl6kn8f9k3nhdrnhdqr8dhimfb2p";
};
- buildPhases = [ "unpackPhase" "installPhase" ];
-
installPhase = ''
mkdir -p $out/lib
cp common/lib/*.jar $out/lib/
diff --git a/nixos/modules/services/security/frandom.nix b/nixos/modules/services/security/frandom.nix
deleted file mode 100644
index 2d43d12e541db8cacf74d6fc2dd3c1a3164e4115..0000000000000000000000000000000000000000
--- a/nixos/modules/services/security/frandom.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{lib, config, ...}:
-
-let kernel = config.boot.kernelPackages;
-in
-
-{
-
- ###### interface
-
- options = {
-
- services.frandom.enable = lib.mkOption {
- default = false;
- type = lib.types.bool;
- description = ''
- enable the /dev/frandom device (a very fast random number generator)
- '';
- };
-
- };
-
-
- ###### implementation
-
- config = lib.mkIf config.services.frandom.enable {
- boot.kernelModules = [ "frandom" ];
- boot.extraModulePackages = [ kernel.frandom ];
- services.udev.packages = [ kernel.frandom ];
- };
-
-}
diff --git a/nixos/modules/services/security/hologram-agent.nix b/nixos/modules/services/security/hologram-agent.nix
index 49b5c935267b840b99a11eb12c25dd23b4ef137c..6c53a2df630663297f132b4979d0601754a1e5b3 100644
--- a/nixos/modules/services/security/hologram-agent.nix
+++ b/nixos/modules/services/security/hologram-agent.nix
@@ -33,6 +33,8 @@ in {
};
config = mkIf cfg.enable {
+ boot.kernelModules = [ "dummy" ];
+
networking.interfaces.dummy0 = {
ipAddress = "169.254.169.254";
prefixLength = 32;
diff --git a/nixos/modules/services/security/hologram-server.nix b/nixos/modules/services/security/hologram-server.nix
index 8315c9ea5d6103c3c1dc93662ab84325f5cd5a34..e267fed27955e5af66a308cec39a539bc1115ae0 100644
--- a/nixos/modules/services/security/hologram-server.nix
+++ b/nixos/modules/services/security/hologram-server.nix
@@ -23,8 +23,6 @@ let
stats = cfg.statsAddress;
listen = cfg.listenAddress;
});
-
- script = "${pkgs.hologram.bin}/bin/hologram-server --debug --conf ${cfgFile}";
in {
options = {
services.hologram-server = {
@@ -96,15 +94,9 @@ in {
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
- inherit script;
- };
-
- docker-containers.hologram-server = {
- inherit script;
- };
-
- trivial-services.hologram-server = {
- inherit script;
+ serviceConfig = {
+ ExecStart = "${pkgs.hologram.bin}/bin/hologram-server --debug --conf ${cfgFile}";
+ };
};
};
}
diff --git a/nixos/modules/services/security/oauth2_proxy.nix b/nixos/modules/services/security/oauth2_proxy.nix
index 3e5087766b1c116aca778e54e61d0b12ea873b01..ef48d52e7a94b010d09cb7116c83eea1e775da92 100644
--- a/nixos/modules/services/security/oauth2_proxy.nix
+++ b/nixos/modules/services/security/oauth2_proxy.nix
@@ -385,7 +385,7 @@ in
httpAddress = mkOption {
type = types.str;
- default = "127.0.0.1:4180";
+ default = "http://127.0.0.1:4180";
description = ''
HTTPS listening address. This module does not expose the port by
default. If you want this URL to be accessible to other machines, please
diff --git a/nixos/modules/services/security/physlock.nix b/nixos/modules/services/security/physlock.nix
index 0881483967c6e7a80423c4725187062ceb743bad..30224d7fc6bace7c3d30f554db3fa97503bac78f 100644
--- a/nixos/modules/services/security/physlock.nix
+++ b/nixos/modules/services/security/physlock.nix
@@ -99,6 +99,8 @@ in
'';
};
+ security.pam.services.physlock = {};
+
};
}
diff --git a/nixos/modules/services/security/sks.nix b/nixos/modules/services/security/sks.nix
new file mode 100644
index 0000000000000000000000000000000000000000..62308428f32667140c7e2e20ec84ea2891ac490a
--- /dev/null
+++ b/nixos/modules/services/security/sks.nix
@@ -0,0 +1,82 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+ cfg = config.services.sks;
+
+ sksPkg = cfg.package;
+
+in
+
+{
+
+ options = {
+
+ services.sks = {
+
+ enable = mkEnableOption "sks";
+
+ package = mkOption {
+ default = pkgs.sks;
+ defaultText = "pkgs.sks";
+ type = types.package;
+ description = "
+ Which sks derivation to use.
+ ";
+ };
+
+ hkpAddress = mkOption {
+ default = [ "127.0.0.1" "::1" ];
+ type = types.listOf types.str;
+ description = "
+ Wich ip addresses the sks-keyserver is listening on.
+ ";
+ };
+
+ hkpPort = mkOption {
+ default = 11371;
+ type = types.int;
+ description = "
+ Which port the sks-keyserver is listening on.
+ ";
+ };
+ };
+ };
+
+ config = mkIf cfg.enable {
+
+ environment.systemPackages = [ sksPkg ];
+
+ users.users.sks = {
+ createHome = true;
+ home = "/var/db/sks";
+ isSystemUser = true;
+ shell = "${pkgs.coreutils}/bin/true";
+ };
+
+ systemd.services = let
+ hkpAddress = "'" + (builtins.concatStringsSep " " cfg.hkpAddress) + "'" ;
+ hkpPort = builtins.toString cfg.hkpPort;
+ home = config.users.users.sks.home;
+ user = config.users.users.sks.name;
+ in {
+ sks-keyserver = {
+ wantedBy = [ "multi-user.target" ];
+ preStart = ''
+ mkdir -p ${home}/dump
+ ${pkgs.sks}/bin/sks build ${home}/dump/*.gpg -n 10 -cache 100 || true #*/
+ ${pkgs.sks}/bin/sks cleandb || true
+ ${pkgs.sks}/bin/sks pbuild -cache 20 -ptree_cache 70 || true
+ '';
+ serviceConfig = {
+ WorkingDirectory = home;
+ User = user;
+ Restart = "always";
+ ExecStart = "${pkgs.sks}/bin/sks db -hkp_address ${hkpAddress} -hkp_port ${hkpPort}";
+ };
+ };
+ };
+ };
+}
diff --git a/nixos/modules/services/security/sshguard.nix b/nixos/modules/services/security/sshguard.nix
index 5a183443f71d4e77f1a5fca5db411bd1bbc1d6e0..7f09e8893c4d0556641e6e530026f87a2c7fc2aa 100644
--- a/nixos/modules/services/security/sshguard.nix
+++ b/nixos/modules/services/security/sshguard.nix
@@ -89,7 +89,7 @@ in {
environment.systemPackages = [ pkgs.sshguard pkgs.iptables pkgs.ipset ];
- environment.etc."sshguard.conf".text = let
+ environment.etc."sshguard.conf".text = let
list_services = ( name: "-t ${name} ");
in ''
BACKEND="${pkgs.sshguard}/libexec/sshg-fw-ipset"
diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix
index 3f1450ebfbd73272e5a4a68d9bb6e4bcb1e22ddf..bc79d9f2a590c8853ded3e6ad5781b6ca19aa7a3 100644
--- a/nixos/modules/services/security/tor.nix
+++ b/nixos/modules/services/security/tor.nix
@@ -7,7 +7,7 @@ let
torDirectory = "/var/lib/tor";
opt = name: value: optionalString (value != null) "${name} ${value}";
- optint = name: value: optionalString (value != 0) "${name} ${toString value}";
+ optint = name: value: optionalString (value != null && value != 0) "${name} ${toString value}";
torRc = ''
User tor
@@ -27,7 +27,8 @@ let
''
# Relay config
+ optionalString cfg.relay.enable ''
- ORPort ${cfg.relay.portSpec}
+ ORPort ${toString cfg.relay.port}
+ ${opt "Address" cfg.relay.address}
${opt "Nickname" cfg.relay.nickname}
${opt "ContactInfo" cfg.relay.contactInfo}
@@ -36,31 +37,32 @@ let
${opt "AccountingMax" cfg.relay.accountingMax}
${opt "AccountingStart" cfg.relay.accountingStart}
- ${if cfg.relay.isExit then
+ ${if (cfg.relay.role == "exit") then
opt "ExitPolicy" cfg.relay.exitPolicy
else
"ExitPolicy reject *:*"}
- ${optionalString cfg.relay.isBridge ''
+ ${optionalString (elem cfg.relay.role ["bridge" "private-bridge"]) ''
BridgeRelay 1
ServerTransportPlugin obfs2,obfs3 exec ${pkgs.pythonPackages.obfsproxy}/bin/obfsproxy managed
+ ExtORPort auto
+ ${optionalString (cfg.relay.role == "private-bridge") ''
+ ExtraInfoStatistics 0
+ PublishServerDescriptor 0
+ ''}
''}
''
- + hiddenServices
+ # Hidden services
+ + concatStrings (flip mapAttrsToList cfg.hiddenServices (n: v: ''
+ HiddenServiceDir ${torDirectory}/onion/${v.name}
+ ${flip concatMapStrings v.map (p: ''
+ HiddenServicePort ${toString p.port} ${p.destination}
+ '')}
+ ''))
+ cfg.extraConfig;
- hiddenServices = concatStrings (mapAttrsToList (hiddenServiceDir: hs:
- let
- hsports = concatStringsSep "\n" (map mkHiddenServicePort hs.hiddenServicePorts);
- in
- "HiddenServiceDir ${hiddenServiceDir}\n${hsports}\n${hs.extraConfig}\n"
- ) cfg.hiddenServices);
-
- mkHiddenServicePort = hsport: let
- trgt = optionalString (hsport.target != null) (" " + hsport.target);
- in "HiddenServicePort ${toString hsport.virtualPort}${trgt}";
-
torRcFile = pkgs.writeText "torrc" torRc;
+
in
{
options = {
@@ -96,8 +98,8 @@ in
};
controlPort = mkOption {
- type = types.int;
- default = 0;
+ type = types.nullOr (types.either types.int types.str);
+ default = null;
example = 9051;
description = ''
If set, Tor will accept connections on the specified port
@@ -133,9 +135,10 @@ in
example = "192.168.0.1:9101";
description = ''
Bind to this address to listen for connections from
- Socks-speaking applications. Same as socksListenAddress
- but uses weaker circuit isolation to provide performance
- suitable for a web browser.
+ Socks-speaking applications. Same as
+ but uses weaker
+ circuit isolation to provide performance suitable for a
+ web browser.
'';
};
@@ -145,9 +148,9 @@ in
example = "accept 192.168.0.0/16, reject *";
description = ''
Entry policies to allow/deny SOCKS requests based on IP
- address. First entry that matches wins. If no SocksPolicy
+ address. First entry that matches wins. If no SocksPolicy
is set, we accept all (and only) requests from
- SocksListenAddress.
+ .
'';
};
@@ -176,45 +179,147 @@ in
description = ''
Whether to enable relaying TOR traffic for others.
- See https://www.torproject.org/docs/tor-doc-relay for details.
- '';
- };
-
- isBridge = mkOption {
- type = types.bool;
- default = false;
- description = ''
- Bridge relays (or "bridges") are Tor relays that aren't
- listed in the main directory. Since there is no complete
- public list of them, even if an ISP is filtering
- connections to all the known Tor relays, they probably
- won't be able to block all the bridges.
-
- A bridge relay can't be an exit relay.
-
- You need to set relay.enable to true for this option to
- take effect.
+ See
+ for details.
- The bridge is set up with an obfuscated transport proxy.
-
- See https://www.torproject.org/bridges.html.en for more info.
+ Setting this to true requires setting
+
+ and
+
+ options.
'';
};
- isExit = mkOption {
- type = types.bool;
- default = false;
+ role = mkOption {
+ type = types.enum [ "exit" "relay" "bridge" "private-bridge" ];
description = ''
- An exit relay allows Tor users to access regular Internet
- services.
-
- Unlike running a non-exit relay, running an exit relay may
- expose you to abuse complaints. See
- https://www.torproject.org/faq.html.en#ExitPolicies for
- more info.
-
- You can specify which services Tor users may access via
- your exit relay using exitPolicy option.
+ Your role in Tor network. There're several options:
+
+
+
+ exit
+
+
+ An exit relay. This allows Tor users to access regular
+ Internet services through your public IP.
+
+
+
+ Running an exit relay may expose you to abuse
+ complaints. See
+
+ for more info.
+
+
+
+ You can specify which services Tor users may access via
+ your exit relay using option.
+
+
+
+
+
+ relay
+
+
+ Regular relay. This allows Tor users to relay onion
+ traffic to other Tor nodes, but not to public
+ Internet.
+
+
+
+ Note that some misconfigured and/or disrespectful
+ towards privacy sites will block you even if your
+ relay is not an exit relay. That is, just being listed
+ in a public relay directory can have unwanted
+ consequences.
+
+ Which means you might not want to use
+ this role if you browse public Internet from the same
+ network as your relay, unless you want to write
+ e-mails to those sites (you should!).
+
+
+
+ See
+
+ for more info.
+
+
+
+
+
+ bridge
+
+
+ Regular bridge. Works like a regular relay, but
+ doesn't list you in the public relay directory and
+ hides your Tor node behind obfsproxy.
+
+
+
+ Using this option will make Tor advertise your bridge
+ to users through various mechanisms like
+ , though.
+
+
+
+
+ WARNING: THE FOLLOWING PARAGRAPH IS NOT LEGAL ADVISE.
+ Consult with your lawer when in doubt.
+
+
+
+ This role should be safe to use in most situations
+ (unless the act of forwarding traffic for others is
+ a punishable offence under your local laws, which
+ would be pretty insane as it would make ISP
+ illegal).
+
+
+
+
+ See
+ for more info.
+
+
+
+
+
+ private-bridge
+
+
+ Private bridge. Works like regular bridge, but does
+ not advertise your node in any way.
+
+
+
+ Using this role means that you won't contribute to Tor
+ network in any way unless you advertise your node
+ yourself in some way.
+
+
+
+ Use this if you want to run a private bridge, for
+ example because you'll give out your bridge address
+ manually to your friends.
+
+
+
+ Switching to this role after measurable time in
+ "bridge" role is pretty useless as some Tor users
+ would have learned about your node already. In the
+ latter case you can still change
+ option.
+
+
+
+ See
+ for more info.
+
+
+
+
'';
};
@@ -268,8 +373,8 @@ in
};
bandwidthRate = mkOption {
- type = types.int;
- default = 0;
+ type = types.nullOr types.int;
+ default = null;
example = 100;
description = ''
Specify this to limit the bandwidth usage of relayed (server)
@@ -278,7 +383,7 @@ in
};
bandwidthBurst = mkOption {
- type = types.int;
+ type = types.nullOr types.int;
default = cfg.relay.bandwidthRate;
example = 200;
description = ''
@@ -288,9 +393,19 @@ in
'';
};
- portSpec = mkOption {
- type = types.str;
- example = "143";
+ address = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ example = "noname.example.com";
+ description = ''
+ The IP address or full DNS name for advertised address of your relay.
+ Leave unset and Tor will guess.
+ '';
+ };
+
+ port = mkOption {
+ type = types.either types.int types.str;
+ example = 143;
description = ''
What port to advertise for Tor connections. This corresponds to the
ORPort section in the Tor manual; see
@@ -313,13 +428,15 @@ in
considered first to last, and the first match wins. If you
want to _replace_ the default exit policy, end this with
either a reject *:* or an accept *:*. Otherwise, you're
- _augmenting_ (prepending to) the default exit
- policy. Leave commented to just use the default, which is
+ _augmenting_ (prepending to) the default exit policy.
+ Leave commented to just use the default, which is
available in the man page or at
- https://www.torproject.org/documentation.html
+ .
- Look at https://www.torproject.org/faq-abuse.html#TypicalAbuses
- for issues you might encounter if you use the default exit policy.
+ Look at
+
+ for issues you might encounter if you use the default
+ exit policy.
If certain IPs and ports are blocked externally, e.g. by
your firewall, you should update your exit policy to
@@ -330,79 +447,122 @@ in
};
hiddenServices = mkOption {
- type = types.attrsOf (types.submodule ({
- options = {
- hiddenServicePorts = mkOption {
- type = types.listOf (types.submodule {
- options = {
- virtualPort = mkOption {
- type = types.int;
- example = 80;
- description = "Virtual port.";
- };
- target = mkOption {
- type = types.nullOr types.str;
- default = null;
- example = "127.0.0.1:8080";
- description = ''
- Target virtual Port shall be mapped to.
-
- You may override the target port, address, or both by
- specifying a target of addr, port, addr:port, or
- unix:path. (You can specify an IPv6 target as
- [addr]:port. Unix paths may be quoted, and may use
- standard C escapes.)
- '';
- };
- };
- });
- example = [ { virtualPort = 80; target = "127.0.0.1:8080"; } { virtualPort = 6667; } ];
- description = ''
- If target is null the virtual port is mapped
- to the same port on 127.0.0.1 over TCP. You may use
- target to overwrite this behaviour (see
- description of target).
-
- This corresponds to the HiddenServicePort VIRTPORT
- [TARGET] option by looking at the tor manual
- tor
- 1 for more information.
- '';
- };
- extraConfig = mkOption {
- type = types.str;
- default = "";
- description = ''
- Extra configuration. Contents will be added in the current
- hidden service context.
- '';
- };
- };
- }));
+ description = ''
+ A set of static hidden services that terminate their Tor
+ circuits at this node.
+
+ Every element in this set declares a virtual onion host.
+
+ You can specify your onion address by putting corresponding
+ private key to an appropriate place in ${torDirectory}.
+
+ For services without private keys in ${torDirectory} Tor
+ daemon will generate random key pairs (which implies random
+ onion addresses) on restart. The latter could take a while,
+ please be patient.
+
+
+ Hidden services can be useful even if you don't intend to
+ actually hide them, since they can
+ also be seen as a kind of NAT traversal mechanism.
+
+ E.g. the example will make your sshd, whatever runs on
+ "8080" and your mail server available from anywhere where
+ the Tor network is available (which, with the help from
+ bridges, is pretty much everywhere), even if both client
+ and server machines are behind NAT you have no control
+ over.
+
+ '';
default = {};
- example = {
- "/var/lib/tor/webserver" = {
- hiddenServicePorts = [ { virtualPort = 80; } ];
+ example = literalExample ''
+ { "my-hidden-service-example".map = [
+ { port = 22; } # map ssh port to this machine's ssh
+ { port = 80; toPort = 8080; } # map http port to whatever runs on 8080
+ { port = "sip"; toHost = "mail.example.com"; toPort = "imap"; } # because we can
+ ];
+ }
+ '';
+ type = types.loaOf (types.submodule ({name, config, ...}: {
+ options = {
+
+ name = mkOption {
+ type = types.str;
+ description = ''
+ Name of this tor hidden service.
+
+ This is purely descriptive.
+
+ After restarting Tor daemon you should be able to
+ find your .onion address in
+ ${torDirectory}/onion/$name/hostname.
+ '';
+ };
+
+ map = mkOption {
+ default = [];
+ description = "Port mapping for this hidden service.";
+ type = types.listOf (types.submodule ({config, ...}: {
+ options = {
+
+ port = mkOption {
+ type = types.either types.int types.str;
+ example = 80;
+ description = ''
+ Hidden service port to "bind to".
+ '';
+ };
+
+ destination = mkOption {
+ internal = true;
+ type = types.str;
+ description = "Forward these connections where?";
+ };
+
+ toHost = mkOption {
+ type = types.str;
+ default = "127.0.0.1";
+ description = "Mapping destination host.";
+ };
+
+ toPort = mkOption {
+ type = types.either types.int types.str;
+ example = 8080;
+ description = "Mapping destination port.";
+ };
+
+ };
+
+ config = {
+ toPort = mkDefault config.port;
+ destination = mkDefault "${config.toHost}:${toString config.toPort}";
+ };
+ }));
+ };
+
};
- };
- description = ''
- Configure hidden services.
- Please consult the tor manual
- tor
- 1 for a more detailed
- explanation. (search for 'HIDDEN').
- '';
+ config = {
+ name = mkDefault name;
+ };
+ }));
};
};
};
config = mkIf cfg.enable {
- assertions = singleton
- { message = "Can't be both an exit and a bridge relay at the same time";
- assertion =
- cfg.relay.enable -> !(cfg.relay.isBridge && cfg.relay.isExit);
- };
+ # Not sure if `cfg.relay.role == "private-bridge"` helps as tor
+ # sends a lot of stats
+ warnings = optional (cfg.relay.enable && cfg.hiddenServices != {})
+ ''
+ Running Tor hidden services on a public relay makes the
+ presence of hidden services visible through simple statistical
+ analysis of publicly available data.
+
+ You can safely ignore this warning if you don't intend to
+ actually hide your hidden services. In either case, you can
+ always create a container/VM with a separate Tor daemon instance.
+ '';
users.extraGroups.tor.gid = config.ids.gids.tor;
users.extraUsers.tor =
@@ -422,9 +582,13 @@ in
restartTriggers = [ torRcFile ];
# Translated from the upstream contrib/dist/tor.service.in
+ preStart = ''
+ install -o tor -g tor -d ${torDirectory}/onion
+ ${pkgs.tor}/bin/tor -f ${torRcFile} --verify-config
+ '';
+
serviceConfig =
{ Type = "simple";
- ExecStartPre = "${pkgs.tor}/bin/tor -f ${torRcFile} --verify-config";
ExecStart = "${pkgs.tor}/bin/tor -f ${torRcFile} --RunAsDaemon 0";
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
KillSignal = "SIGINT";
diff --git a/nixos/modules/services/security/usbguard.nix b/nixos/modules/services/security/usbguard.nix
new file mode 100644
index 0000000000000000000000000000000000000000..1f2c56a9efa15c5704619fe674fc04f412d0a4f2
--- /dev/null
+++ b/nixos/modules/services/security/usbguard.nix
@@ -0,0 +1,200 @@
+{config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+ cfg = config.services.usbguard;
+
+ # valid policy options
+ policy = (types.enum [ "allow" "block" "reject" "keep" "apply-policy" ]);
+
+ # decide what file to use for rules
+ ruleFile = if cfg.rules != null then pkgs.writeText "usbguard-rules" cfg.rules else cfg.ruleFile;
+
+ daemonConf = ''
+ # generated by nixos/modules/services/security/usbguard.nix
+ RuleFile=${ruleFile}
+ ImplicitPolicyTarget=${cfg.implictPolicyTarget}
+ PresentDevicePolicy=${cfg.presentDevicePolicy}
+ PresentControllerPolicy=${cfg.presentControllerPolicy}
+ InsertedDevicePolicy=${cfg.insertedDevicePolicy}
+ RestoreControllerDeviceState=${if cfg.restoreControllerDeviceState then "true" else "false"}
+ # this does not seem useful for endusers to change
+ DeviceManagerBackend=uevent
+ IPCAllowedUsers=${concatStringsSep " " cfg.IPCAllowedUsers}
+ IPCAllowedGroups=${concatStringsSep " " cfg.IPCAllowedGroups}
+ IPCAccessControlFiles=${cfg.IPCAccessControlFiles}
+ DeviceRulesWithPort=${if cfg.deviceRulesWithPort then "true" else "false"}
+ AuditFilePath=${cfg.auditFilePath}
+ '';
+
+ daemonConfFile = pkgs.writeText "usbguard-daemon-conf" daemonConf;
+
+in {
+
+ ###### interface
+
+ options = {
+ services.usbguard = {
+ enable = mkEnableOption "USBGuard daemon";
+
+ ruleFile = mkOption {
+ type = types.path;
+ default = "/var/lib/usbguard/rules.conf";
+ description = ''
+ The USBGuard daemon will use this file to load the policy rule set
+ from it and to write new rules received via the IPC interface.
+
+ Running the command usbguard generate-policy as
+ root will generate a config for your currently plugged in devices.
+ For a in depth guide consult the official documentation.
+
+ Setting the rules option will ignore the
+ ruleFile option.
+ '';
+ };
+
+ rules = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ example = ''
+ allow with-interface equals { 08:*:* }
+ '';
+ description = ''
+ The USBGuard daemon will load this policy rule set. Modifying it via
+ the IPC interface won't work if you use this option, since the
+ contents of this option will be written into the nix-store it will be
+ read-only.
+
+ You can still use usbguard generate-policy to
+ generate rules, but you would have to insert them here.
+
+ Setting the rules option will ignore the
+ ruleFile option.
+ '';
+ };
+
+ implictPolicyTarget = mkOption {
+ type = policy;
+ default = "block";
+ description = ''
+ How to treat USB devices that don't match any rule in the policy.
+ Target should be one of allow, block or reject (logically remove the
+ device node from the system).
+ '';
+ };
+
+ presentDevicePolicy = mkOption {
+ type = policy;
+ default = "apply-policy";
+ description = ''
+ How to treat USB devices that are already connected when the daemon
+ starts. Policy should be one of allow, block, reject, keep (keep
+ whatever state the device is currently in) or apply-policy (evaluate
+ the rule set for every present device).
+ '';
+ };
+
+ presentControllerPolicy = mkOption {
+ type = policy;
+ default = "keep";
+ description = ''
+ How to treat USB controller devices that are already connected when
+ the daemon starts. One of allow, block, reject, keep or apply-policy.
+ '';
+ };
+
+ insertedDevicePolicy = mkOption {
+ type = policy;
+ default = "apply-policy";
+ description = ''
+ How to treat USB devices that are already connected after the daemon
+ starts. One of block, reject, apply-policy.
+ '';
+ };
+
+ restoreControllerDeviceState = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ The USBGuard daemon modifies some attributes of controller
+ devices like the default authorization state of new child device
+ instances. Using this setting, you can controll whether the daemon
+ will try to restore the attribute values to the state before
+ modificaton on shutdown.
+ '';
+ };
+
+ IPCAllowedUsers = mkOption {
+ type = types.listOf types.str;
+ default = [ "root" ];
+ example = [ "root" "yourusername" ];
+ description = ''
+ A list of usernames that the daemon will accept IPC connections from.
+ '';
+ };
+
+ IPCAllowedGroups = mkOption {
+ type = types.listOf types.str;
+ default = [ ];
+ example = [ "wheel" ];
+ description = ''
+ A list of groupnames that the daemon will accept IPC connections
+ from.
+ '';
+ };
+
+ IPCAccessControlFiles = mkOption {
+ type = types.path;
+ default = "/var/lib/usbguard/IPCAccessControl.d/";
+ description = ''
+ The files at this location will be interpreted by the daemon as IPC
+ access control definition files. See the IPC ACCESS CONTROL section
+ in usbguard-daemon.conf
+ 5 for more details.
+ '';
+ };
+
+ deviceRulesWithPort = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Generate device specific rules including the "via-port" attribute.
+ '';
+ };
+
+ auditFilePath = mkOption {
+ type = types.path;
+ default = "/var/log/usbguard/usbguard-audit.log";
+ description = ''
+ USBGuard audit events log file path.
+ '';
+ };
+ };
+ };
+
+
+ ###### implementation
+
+ config = mkIf cfg.enable {
+
+ environment.systemPackages = [ pkgs.usbguard ];
+
+ systemd.services.usbguard = {
+ description = "USBGuard daemon";
+
+ wantedBy = [ "basic.target" ];
+ wants = [ "systemd-udevd.service" "local-fs.target" ];
+
+ # make sure an empty rule file and required directories exist
+ preStart = ''mkdir -p $(dirname "${cfg.ruleFile}") "${cfg.IPCAccessControlFiles}" && ([ -f "${cfg.ruleFile}" ] || touch ${cfg.ruleFile})'';
+
+ serviceConfig = {
+ Type = "simple";
+ ExecStart = ''${pkgs.usbguard}/bin/usbguard-daemon -d -k -c ${daemonConfFile}'';
+ Restart = "on-failure";
+ };
+ };
+ };
+}
diff --git a/nixos/modules/services/torrent/deluge.nix b/nixos/modules/services/torrent/deluge.nix
index 2534f09b555a443c7dbbfd807a64985ed4368714..ec1e97f4125ed128cf5139f4aeaf290756e01978 100644
--- a/nixos/modules/services/torrent/deluge.nix
+++ b/nixos/modules/services/torrent/deluge.nix
@@ -42,9 +42,9 @@ in {
after = [ "network.target" ];
description = "Deluge BitTorrent Daemon";
wantedBy = [ "multi-user.target" ];
- path = [ pkgs.pythonPackages.deluge ];
+ path = [ pkgs.deluge ];
serviceConfig = {
- ExecStart = "${pkgs.pythonPackages.deluge}/bin/deluged -d";
+ ExecStart = "${pkgs.deluge}/bin/deluged -d";
# To prevent "Quit & shutdown daemon" from working; we want systemd to manage it!
Restart = "on-success";
User = "deluge";
@@ -57,13 +57,13 @@ in {
after = [ "network.target" ];
description = "Deluge BitTorrent WebUI";
wantedBy = [ "multi-user.target" ];
- path = [ pkgs.pythonPackages.deluge ];
- serviceConfig.ExecStart = "${pkgs.pythonPackages.deluge}/bin/deluge --ui web";
+ path = [ pkgs.deluge ];
+ serviceConfig.ExecStart = "${pkgs.deluge}/bin/deluge --ui web";
serviceConfig.User = "deluge";
serviceConfig.Group = "deluge";
};
- environment.systemPackages = [ pkgs.pythonPackages.deluge ];
+ environment.systemPackages = [ pkgs.deluge ];
users.extraUsers.deluge = {
group = "deluge";
diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix
index 1f319df794b5cb591ab024b066e4ce864f569f0e..dd6b585b7e2372ed6f631fceb7203d2d3bcffe03 100644
--- a/nixos/modules/services/torrent/transmission.nix
+++ b/nixos/modules/services/torrent/transmission.nix
@@ -6,7 +6,7 @@ let
cfg = config.services.transmission;
apparmor = config.security.apparmor.enable;
- homeDir = "/var/lib/transmission";
+ homeDir = cfg.home;
downloadDir = "${homeDir}/Downloads";
incompleteDir = "${homeDir}/.incomplete";
@@ -69,6 +69,14 @@ in
default = 9091;
description = "TCP port number to run the RPC/web interface.";
};
+
+ home = mkOption {
+ type = types.path;
+ default = "/var/lib/transmission";
+ description = ''
+ The directory where transmission will create files.
+ '';
+ };
};
};
diff --git a/nixos/modules/services/ttys/kmscon.nix b/nixos/modules/services/ttys/kmscon.nix
index 8bad42927e3f45859368e4c3d7a3510c938be8f5..88e488425bcedeb0a9647edfec4545287e08497c 100644
--- a/nixos/modules/services/ttys/kmscon.nix
+++ b/nixos/modules/services/ttys/kmscon.nix
@@ -60,6 +60,7 @@ in {
ConditionPathExists=/dev/tty0
[Service]
+ ExecStart=
ExecStart=${pkgs.kmscon}/bin/kmscon "--vt=%I" ${cfg.extraOptions} --seats=seat0 --no-switchvt --configdir ${configDir} --login -- ${pkgs.shadow}/bin/login -p
UtmpIdentifier=%I
TTYPath=/dev/%I
diff --git a/nixos/modules/services/web-apps/atlassian/confluence.nix b/nixos/modules/services/web-apps/atlassian/confluence.nix
index 2344b9922d0bad0f241f3b12d60de6849ee34e5b..84c41b6e53c2de04b0910362ba682d4734035a11 100644
--- a/nixos/modules/services/web-apps/atlassian/confluence.nix
+++ b/nixos/modules/services/web-apps/atlassian/confluence.nix
@@ -127,14 +127,11 @@ in
- jrePackage = let
- jreSwitch = unfree: free: if config.nixpkgs.config.allowUnfree or false then unfree else free;
- in mkOption {
+ jrePackage = mkOption {
type = types.package;
- default = jreSwitch pkgs.oraclejre8 pkgs.openjdk8.jre;
- defaultText = jreSwitch "pkgs.oraclejre8" "pkgs.openjdk8.jre";
- example = literalExample "pkgs.openjdk8.jre";
- description = "Java Runtime to use for Confluence. Note that Atlassian recommends the Oracle JRE.";
+ default = pkgs.oraclejre8;
+ defaultText = "pkgs.oraclejre8";
+ description = "Note that Atlassian only support the Oracle JRE (JRASERVER-46152).";
};
};
};
@@ -178,14 +175,13 @@ in
${pkg}/conf/server.xml.dist > ${cfg.home}/server.xml
'';
- script = "${pkg}/bin/start-confluence.sh -fg";
- stopScript = "${pkg}/bin/stop-confluence.sh";
-
serviceConfig = {
User = cfg.user;
Group = cfg.group;
PrivateTmp = true;
PermissionsStartOnly = true;
+ ExecStart = "${pkg}/bin/start-confluence.sh -fg";
+ ExecStop = "${pkg}/bin/stop-confluence.sh";
};
};
};
diff --git a/nixos/modules/services/web-apps/atlassian/crowd.nix b/nixos/modules/services/web-apps/atlassian/crowd.nix
index b54c91d7de92c1baa054019f97d5e4e9a182b479..0ac941b6ec99b3c6116978385d99b5989eabf9b6 100644
--- a/nixos/modules/services/web-apps/atlassian/crowd.nix
+++ b/nixos/modules/services/web-apps/atlassian/crowd.nix
@@ -9,9 +9,10 @@ let
pkg = pkgs.atlassian-crowd.override {
home = cfg.home;
port = cfg.listenPort;
- proxyUrl = "${cfg.proxy.scheme}://${cfg.proxy.name}:${toString cfg.proxy.port}";
openidPassword = cfg.openidPassword;
- };
+ } // (optionalAttrs cfg.proxy.enable {
+ proxyUrl = "${cfg.proxy.scheme}://${cfg.proxy.name}:${toString cfg.proxy.port}";
+ });
in
@@ -92,14 +93,11 @@ in
};
};
- jrePackage = let
- jreSwitch = unfree: free: if config.nixpkgs.config.allowUnfree or false then unfree else free;
- in mkOption {
+ jrePackage = mkOption {
type = types.package;
- default = jreSwitch pkgs.oraclejre8 pkgs.openjdk8.jre;
- defaultText = jreSwitch "pkgs.oraclejre8" "pkgs.openjdk8.jre";
- example = literalExample "pkgs.openjdk8.jre";
- description = "Java Runtime to use for Crowd. Note that Atlassian recommends the Oracle JRE.";
+ default = pkgs.oraclejre8;
+ defaultText = "pkgs.oraclejre8";
+ description = "Note that Atlassian only support the Oracle JRE (JRASERVER-46152).";
};
};
};
@@ -142,13 +140,12 @@ in
${pkg}/apache-tomcat/conf/server.xml.dist > ${cfg.home}/server.xml
'';
- script = "${pkg}/start_crowd.sh";
-
serviceConfig = {
User = cfg.user;
Group = cfg.group;
PrivateTmp = true;
PermissionsStartOnly = true;
+ ExecStart = "${pkg}/start_crowd.sh -fg";
};
};
};
diff --git a/nixos/modules/services/web-apps/atlassian/jira.nix b/nixos/modules/services/web-apps/atlassian/jira.nix
index 19b6a8d308514136123b1c6788966e8a9d191b95..81ee8154326c7a970e5908893593bfd5ff5d9d8e 100644
--- a/nixos/modules/services/web-apps/atlassian/jira.nix
+++ b/nixos/modules/services/web-apps/atlassian/jira.nix
@@ -6,7 +6,7 @@ let
cfg = config.services.jira;
- pkg = pkgs.atlassian-jira.override {
+ pkg = pkgs.atlassian-jira.override (optionalAttrs cfg.sso.enable {
enableSSO = cfg.sso.enable;
crowdProperties = ''
application.name ${cfg.sso.applicationName}
@@ -21,7 +21,7 @@ let
session.validationinterval ${toString cfg.sso.validationInterval}
session.lastvalidation session.lastvalidation
'';
- };
+ });
in
@@ -131,14 +131,11 @@ in
};
};
- jrePackage = let
- jreSwitch = unfree: free: if config.nixpkgs.config.allowUnfree or false then unfree else free;
- in mkOption {
+ jrePackage = mkOption {
type = types.package;
- default = jreSwitch pkgs.oraclejre8 pkgs.openjdk8.jre;
- defaultText = jreSwitch "pkgs.oraclejre8" "pkgs.openjdk8.jre";
- example = literalExample "pkgs.openjdk8.jre";
- description = "Java Runtime to use for JIRA. Note that Atlassian recommends the Oracle JRE.";
+ default = pkgs.oraclejre8;
+ defaultText = "pkgs.oraclejre8";
+ description = "Note that Atlassian only support the Oracle JRE (JRASERVER-46152).";
};
};
};
@@ -183,14 +180,13 @@ in
${pkg}/conf/server.xml.dist > ${cfg.home}/server.xml
'';
- script = "${pkg}/bin/start-jira.sh -fg";
- stopScript = "${pkg}/bin/stop-jira.sh";
-
serviceConfig = {
User = cfg.user;
Group = cfg.group;
PrivateTmp = true;
PermissionsStartOnly = true;
+ ExecStart = "${pkg}/bin/start-jira.sh -fg";
+ ExecStop = "${pkg}/bin/stop-jira.sh";
};
};
};
diff --git a/nixos/modules/services/web-apps/mattermost.nix b/nixos/modules/services/web-apps/mattermost.nix
index be9af78da1818b4b7e8396bdca3a8a5c66292270..be74a2b1955be0332f80b304325e60db5e3e3cc0 100644
--- a/nixos/modules/services/web-apps/mattermost.nix
+++ b/nixos/modules/services/web-apps/mattermost.nix
@@ -173,7 +173,7 @@ in
preStart = ''
mkdir -p ${cfg.statePath}/{data,config,logs}
- ln -sf ${pkgs.mattermost}/{bin,fonts,i18n,templates,webapp} ${cfg.statePath}
+ ln -sf ${pkgs.mattermost}/{bin,fonts,i18n,templates,client} ${cfg.statePath}
'' + lib.optionalString (!cfg.mutableConfig) ''
ln -sf ${mattermostConfJSON} ${cfg.statePath}/config/config.json
'' + lib.optionalString cfg.mutableConfig ''
@@ -184,10 +184,12 @@ in
fi
'' + lib.optionalString cfg.localDatabaseCreate ''
if ! test -e "${cfg.statePath}/.db-created"; then
- ${config.services.postgresql.package}/bin/psql postgres -c \
- "CREATE ROLE ${cfg.localDatabaseUser} WITH LOGIN NOCREATEDB NOCREATEROLE NOCREATEUSER ENCRYPTED PASSWORD '${cfg.localDatabasePassword}'"
- ${config.services.postgresql.package}/bin/createdb \
- --owner ${cfg.localDatabaseUser} ${cfg.localDatabaseName}
+ ${pkgs.sudo}/bin/sudo -u ${config.services.postgresql.superUser} \
+ ${config.services.postgresql.package}/bin/psql postgres -c \
+ "CREATE ROLE ${cfg.localDatabaseUser} WITH LOGIN NOCREATEDB NOCREATEROLE ENCRYPTED PASSWORD '${cfg.localDatabasePassword}'"
+ ${pkgs.sudo}/bin/sudo -u ${config.services.postgresql.superUser} \
+ ${config.services.postgresql.package}/bin/createdb \
+ --owner ${cfg.localDatabaseUser} ${cfg.localDatabaseName}
touch ${cfg.statePath}/.db-created
fi
'' + ''
diff --git a/nixos/modules/services/web-apps/nexus.nix b/nixos/modules/services/web-apps/nexus.nix
new file mode 100644
index 0000000000000000000000000000000000000000..a750aa66b27c5b10d5fb41df43fcf204c4c854a4
--- /dev/null
+++ b/nixos/modules/services/web-apps/nexus.nix
@@ -0,0 +1,100 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+ cfg = config.services.nexus;
+
+in
+
+{
+ options = {
+ services.nexus = {
+ enable = mkEnableOption "SonarType Nexus3 OSS service";
+
+ user = mkOption {
+ type = types.str;
+ default = "nexus";
+ description = "User which runs Nexus3.";
+ };
+
+ group = mkOption {
+ type = types.str;
+ default = "nexus";
+ description = "Group which runs Nexus3.";
+ };
+
+ home = mkOption {
+ type = types.str;
+ default = "/var/lib/sonatype-work";
+ description = "Home directory of the Nexus3 instance.";
+ };
+
+ listenAddress = mkOption {
+ type = types.str;
+ default = "127.0.0.1";
+ description = "Address to listen on.";
+ };
+
+ listenPort = mkOption {
+ type = types.int;
+ default = 8081;
+ description = "Port to listen on.";
+ };
+ };
+ };
+
+ config = mkIf cfg.enable {
+ users.extraUsers."${cfg.user}" = {
+ isSystemUser = true;
+ group = cfg.group;
+ };
+
+ users.extraGroups."${cfg.group}" = {};
+
+ systemd.services.nexus = {
+ description = "SonarType Nexus3";
+
+ wantedBy = [ "multi-user.target" ];
+
+ path = [ cfg.home ];
+
+ environment = {
+ NEXUS_USER = cfg.user;
+ NEXUS_HOME = cfg.home;
+ };
+
+ preStart = ''
+ mkdir -p ${cfg.home}/nexus3/etc
+
+ ln -sf ${cfg.home} /run/sonatype-work
+
+ chown -R ${cfg.user}:${cfg.group} ${cfg.home}
+
+ if [ ! -f ${cfg.home}/nexus3/etc/nexus.properties ]; then
+ echo "# Jetty section" > ${cfg.home}/nexus3/etc/nexus.properties
+ echo "application-port=${toString cfg.listenPort}" >> ${cfg.home}/nexus3/etc/nexus.properties
+ echo "application-host=${toString cfg.listenAddress}" >> ${cfg.home}/nexus3/etc/nexus.properties
+ else
+ sed 's/^application-port=.*/application-port=${toString cfg.listenPort}/' -i ${cfg.home}/nexus3/etc/nexus.properties
+ sed 's/^# application-port=.*/application-port=${toString cfg.listenPort}/' -i ${cfg.home}/nexus3/etc/nexus.properties
+ sed 's/^application-host=.*/application-host=${toString cfg.listenAddress}/' -i ${cfg.home}/nexus3/etc/nexus.properties
+ sed 's/^# application-host=.*/application-host=${toString cfg.listenAddress}/' -i ${cfg.home}/nexus3/etc/nexus.properties
+ fi
+ '';
+
+ script = "${pkgs.nexus}/bin/nexus run";
+
+ serviceConfig = {
+ User = cfg.user;
+ Group = cfg.group;
+ PrivateTmp = true;
+ PermissionsStartOnly = true;
+ LimitNOFILE = 102642;
+ };
+ };
+ };
+
+ meta.maintainers = with stdenv.lib.maintainers; [ ironpinguin ];
+}
diff --git a/nixos/modules/services/web-apps/pgpkeyserver-lite.nix b/nixos/modules/services/web-apps/pgpkeyserver-lite.nix
new file mode 100644
index 0000000000000000000000000000000000000000..93f69bd12651473750111506406e8dae7a5acd0e
--- /dev/null
+++ b/nixos/modules/services/web-apps/pgpkeyserver-lite.nix
@@ -0,0 +1,75 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+ cfg = config.services.pgpkeyserver-lite;
+ sksCfg = config.services.sks;
+
+ webPkg = cfg.package;
+
+in
+
+{
+
+ options = {
+
+ services.pgpkeyserver-lite = {
+
+ enable = mkEnableOption "pgpkeyserver-lite on a nginx vHost proxying to a gpg keyserver";
+
+ package = mkOption {
+ default = pkgs.pgpkeyserver-lite;
+ defaultText = "pkgs.pgpkeyserver-lite";
+ type = types.package;
+ description = "
+ Which webgui derivation to use.
+ ";
+ };
+
+ hostname = mkOption {
+ type = types.str;
+ description = "
+ Which hostname to set the vHost to that is proxying to sks.
+ ";
+ };
+
+ hkpAddress = mkOption {
+ default = builtins.head sksCfg.hkpAddress;
+ type = types.str;
+ description = "
+ Wich ip address the sks-keyserver is listening on.
+ ";
+ };
+
+ hkpPort = mkOption {
+ default = sksCfg.hkpPort;
+ type = types.int;
+ description = "
+ Which port the sks-keyserver is listening on.
+ ";
+ };
+ };
+ };
+
+ config = mkIf cfg.enable {
+
+ services.nginx.enable = true;
+
+ services.nginx.virtualHosts = let
+ hkpPort = builtins.toString cfg.hkpPort;
+ in {
+ "${cfg.hostname}" = {
+ root = webPkg;
+ locations = {
+ "/pks".extraConfig = ''
+ proxy_pass http://${cfg.hkpAddress}:${hkpPort};
+ proxy_pass_header Server;
+ add_header Via "1.1 ${cfg.hostname}";
+ '';
+ };
+ };
+ };
+ };
+}
diff --git a/nixos/modules/services/web-apps/piwik-doc.xml b/nixos/modules/services/web-apps/piwik-doc.xml
index 21342d4454fbd52d89a91b94e2f2353f8bd2b5e3..a393a182d36a946340cf75ecd7d2487d37d91fcc 100644
--- a/nixos/modules/services/web-apps/piwik-doc.xml
+++ b/nixos/modules/services/web-apps/piwik-doc.xml
@@ -79,16 +79,6 @@
You can safely ignore this, unless you need a plugin that needs JavaScript tracker access.
-
-
-
- Sending mail from piwik, e.g. for the password reset function, might not work out of the box:
- There's a problem with using sendmail from php-fpm that is
- being investigated at .
- If you have (or don't have) this problem as well, please report it. You can enable SMTP as method
- to send mail in piwik's General Settings
> Mail Server Settings
instead.
-
-
diff --git a/nixos/modules/services/web-apps/piwik.nix b/nixos/modules/services/web-apps/piwik.nix
index 26342a9c5f004e0337d661e31680001ef3be2fc4..ce86c6873dd408272e9b9efb8c653b4d1f8d6d9b 100644
--- a/nixos/modules/services/web-apps/piwik.nix
+++ b/nixos/modules/services/web-apps/piwik.nix
@@ -24,14 +24,17 @@ in {
default = false;
description = ''
Enable piwik web analytics with php-fpm backend.
+ Either the nginx option or the webServerUser option is mandatory.
'';
};
webServerUser = mkOption {
- type = types.str;
- example = "nginx";
+ type = types.nullOr types.str;
+ default = null;
+ example = "lighttpd";
description = ''
- Name of the owner of the ${phpSocket} fastcgi socket for piwik.
+ Name of the web server user that forwards requests to the ${phpSocket} fastcgi socket for piwik if the nginx
+ option is not used. Either this option or the nginx option is mandatory.
If you want to use another webserver than nginx, you need to set this to that server's user
and pass fastcgi requests to `index.php` and `piwik.php` to this socket.
'';
@@ -57,47 +60,43 @@ in {
};
nginx = mkOption {
- # TODO: for maximum flexibility, it would be nice to use nginx's vhost_options module
- # but this only makes sense if we can somehow specify defaults suitable for piwik.
- # But users can always copy the piwik nginx config to their configuration.nix and customize it.
- type = types.nullOr (types.submodule {
- options = {
- virtualHost = mkOption {
- type = types.str;
- default = "piwik.${config.networking.hostName}";
- example = "piwik.$\{config.networking.hostName\}";
- description = ''
- Name of the nginx virtualhost to use and set up.
- '';
- };
- enableSSL = mkOption {
- type = types.bool;
- default = true;
- description = "Whether to enable https.";
- };
- forceSSL = mkOption {
- type = types.bool;
- default = true;
- description = "Whether to always redirect to https.";
- };
- enableACME = mkOption {
- type = types.bool;
- default = true;
- description = "Whether to ask Let's Encrypt to sign a certificate for this vhost.";
- };
- };
- });
+ type = types.nullOr (types.submodule (
+ recursiveUpdate
+ (import ../web-servers/nginx/vhost-options.nix { inherit config lib; })
+ {
+ # enable encryption by default,
+ # as sensitive login and piwik data should not be transmitted in clear text.
+ options.forceSSL.default = true;
+ options.enableACME.default = true;
+ }
+ )
+ );
default = null;
- example = { virtualHost = "stats.$\{config.networking.hostName\}"; };
+ example = {
+ serverName = "stats.$\{config.networking.hostName\}";
+ enableACME = false;
+ };
description = ''
- The options to use to configure an nginx virtualHost.
- If null (the default), no nginx virtualHost will be configured.
+ With this option, you can customize an nginx virtualHost which already has sensible defaults for piwik.
+ Either this option or the webServerUser option is mandatory.
+ Set this to {} to just enable the virtualHost if you don't need any customization.
+ If enabled, then by default, the serverName is piwik.$\{config.networking.hostName\}, SSL is active,
+ and certificates are acquired via ACME.
+ If this is set to null (the default), no nginx virtualHost will be configured.
'';
};
};
};
config = mkIf cfg.enable {
+ warnings = mkIf (cfg.nginx != null && cfg.webServerUser != null) [
+ "If services.piwik.nginx is set, services.piwik.nginx.webServerUser is ignored and should be removed."
+ ];
+
+ assertions = [ {
+ assertion = cfg.nginx != null || cfg.webServerUser != null;
+ message = "Either services.piwik.nginx or services.piwik.nginx.webServerUser is mandatory";
+ }];
users.extraUsers.${user} = {
isSystemUser = true;
@@ -153,10 +152,16 @@ in {
serviceConfig.UMask = "0007";
};
- services.phpfpm.poolConfigs = {
+ services.phpfpm.poolConfigs = let
+ # workaround for when both are null and need to generate a string,
+ # which is illegal, but as assertions apparently are being triggered *after* config generation,
+ # we have to avoid already throwing errors at this previous stage.
+ socketOwner = if (cfg.nginx != null) then config.services.nginx.user
+ else if (cfg.webServerUser != null) then cfg.webServerUser else "";
+ in {
${pool} = ''
listen = "${phpSocket}"
- listen.owner = ${cfg.webServerUser}
+ listen.owner = ${socketOwner}
listen.group = root
listen.mode = 0600
user = ${user}
@@ -170,12 +175,15 @@ in {
# References:
# https://fralef.me/piwik-hardening-with-nginx-and-php-fpm.html
# https://github.com/perusio/piwik-nginx
- ${cfg.nginx.virtualHost} = {
- root = "${pkgs.piwik}/share";
- enableSSL = cfg.nginx.enableSSL;
- enableACME = cfg.nginx.enableACME;
- forceSSL = cfg.nginx.forceSSL;
-
+ "${user}.${config.networking.hostName}" = mkMerge [ cfg.nginx {
+ # don't allow to override the root easily, as it will almost certainly break piwik.
+ # disadvantage: not shown as default in docs.
+ root = mkForce "${pkgs.piwik}/share";
+
+ # define locations here instead of as the submodule option's default
+ # so that they can easily be extended with additional locations if required
+ # without needing to redefine the piwik ones.
+ # disadvantage: not shown as default in docs.
locations."/" = {
index = "index.php";
};
@@ -208,7 +216,7 @@ in {
locations."= /piwik.js".extraConfig = ''
expires 1M;
'';
- };
+ }];
};
};
diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index 1c3c7835d96108d06090c0df07001e19f33fc579..f9f2511f45dc70b29350beebffd5163e17139b79 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -676,6 +676,7 @@ in
''
; Needed for PHP's mail() function.
sendmail_path = sendmail -t -i
+ '' + optionalString (!isNull config.time.timeZone) ''
; Apparently PHP doesn't use $TZ.
date.timezone = "${config.time.timeZone}"
diff --git a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
index aa0fe4f1479649d4300c5f09b9a1bfbbc52ddacf..02695c1c43a1e619b71541eac2da5b74358a6e3a 100644
--- a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
@@ -83,11 +83,11 @@ let
# Unpack Mediawiki and put the config file in its root directory.
mediawikiRoot = pkgs.stdenv.mkDerivation rec {
- name= "mediawiki-1.27.3";
+ name= "mediawiki-1.29.1";
src = pkgs.fetchurl {
- url = "http://download.wikimedia.org/mediawiki/1.27/${name}.tar.gz";
- sha256 = "08x8mvc0y1gwq8rg0zm98wc6hc5j8imb6dcpx6s7392j5dc71m0i";
+ url = "http://download.wikimedia.org/mediawiki/1.29/${name}.tar.gz";
+ sha256 = "03mpazbxvb011s2nmlw5p6dc43yjgl5yrsilmj1imyykm57bwb3m";
};
skins = config.skins;
diff --git a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix
index c6f4bcd0f6661a43ebf6da7ce2ed937ee8f5c124..1c654667dfc72222b35c9bc8ed8ef58506e0d7a8 100644
--- a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix
@@ -13,6 +13,7 @@ let
define('DB_HOST', '${config.dbHost}');
define('DB_CHARSET', 'utf8');
$table_prefix = '${config.tablePrefix}';
+ define('AUTOMATIC_UPDATER_DISABLED', true);
${config.extraConfig}
if ( !defined('ABSPATH') )
define('ABSPATH', dirname(__FILE__) . '/');
diff --git a/nixos/modules/services/web-servers/caddy.nix b/nixos/modules/services/web-servers/caddy.nix
index ee32a1c86d4d409baff37bf71e8ad112a213ba7b..d8efa24bc6d5408248f07984b732ea9b139b6a1f 100644
--- a/nixos/modules/services/web-servers/caddy.nix
+++ b/nixos/modules/services/web-servers/caddy.nix
@@ -5,12 +5,22 @@ with lib;
let
cfg = config.services.caddy;
configFile = pkgs.writeText "Caddyfile" cfg.config;
-in
-{
+in {
options.services.caddy = {
enable = mkEnableOption "Caddy web server";
config = mkOption {
+ default = "";
+ example = ''
+ example.com {
+ gzip
+ minify
+ log syslog
+
+ root /srv/http
+ }
+ '';
+ type = types.lines;
description = "Verbatim Caddyfile to use";
};
diff --git a/nixos/modules/services/web-servers/lighttpd/default.nix b/nixos/modules/services/web-servers/lighttpd/default.nix
index 45a65965112acd3e8090178a12089172fd8afc79..700b4469c565ab7a5c828ec7c790cff7ab488c10 100644
--- a/nixos/modules/services/web-servers/lighttpd/default.nix
+++ b/nixos/modules/services/web-servers/lighttpd/default.nix
@@ -15,7 +15,8 @@ let
# Some modules are always imported and should not appear in the config:
# disallowedModules = [ "mod_indexfile" "mod_dirlisting" "mod_staticfile" ];
#
- # Get full module list: "ls -1 $lighttpd/lib/*.so"
+ # For full module list, see the output of running ./configure in the lighttpd
+ # source.
allKnownModules = [
"mod_rewrite"
"mod_redirect"
@@ -38,12 +39,15 @@ let
"mod_accesslog"
# Remaining list of modules, order assumed to be unimportant.
"mod_authn_file"
+ "mod_authn_gssapi"
+ "mod_authn_ldap"
"mod_authn_mysql"
"mod_cml"
"mod_deflate"
"mod_evasive"
"mod_extforward"
"mod_flv_streaming"
+ "mod_geoip"
"mod_magnet"
"mod_mysql_vhost"
"mod_scgi"
diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index 293fa77107e3d124be3912f5f0219e784a7f96c9..97511aac973744764dc48be6dd45902183c463d9 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -19,6 +19,24 @@ let
) cfg.virtualHosts;
enableIPv6 = config.networking.enableIPv6;
+ recommendedProxyConfig = pkgs.writeText "nginx-recommended-proxy-headers.conf" ''
+ proxy_set_header Host $host;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_set_header X-Forwarded-Proto $scheme;
+ proxy_set_header X-Forwarded-Host $host;
+ proxy_set_header X-Forwarded-Server $host;
+ proxy_set_header Accept-Encoding "";
+ '';
+
+ upstreamConfig = toString (flip mapAttrsToList cfg.upstreams (name: upstream: ''
+ upstream ${name} {
+ ${toString (flip mapAttrsToList upstream.servers (name: server: ''
+ server ${name} ${optionalString server.backup "backup"};
+ ''))}
+ }
+ ''));
+
configFile = pkgs.writeText "nginx.conf" ''
user ${cfg.user} ${cfg.group};
error_log stderr;
@@ -41,6 +59,7 @@ let
${optionalString (cfg.resolver.addresses != []) ''
resolver ${toString cfg.resolver.addresses} ${optionalString (cfg.resolver.valid != "") "valid=${cfg.resolver.valid}"};
''}
+ ${upstreamConfig}
${optionalString (cfg.recommendedOptimisation) ''
# optimisation
@@ -74,21 +93,19 @@ let
''}
${optionalString (cfg.recommendedProxySettings) ''
- proxy_set_header Host $host;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_set_header X-Forwarded-Proto $scheme;
- proxy_set_header X-Forwarded-Host $host;
- proxy_set_header X-Forwarded-Server $host;
- proxy_set_header Accept-Encoding "";
-
proxy_redirect off;
proxy_connect_timeout 90;
proxy_send_timeout 90;
proxy_read_timeout 90;
proxy_http_version 1.0;
+ include ${recommendedProxyConfig};
''}
+ # $connection_upgrade is used for websocket proxying
+ map $http_upgrade $connection_upgrade {
+ default upgrade;
+ ''' close;
+ }
client_max_body_size ${cfg.clientMaxBodySize};
server_tokens ${if cfg.serverTokens then "on" else "off"};
@@ -130,22 +147,23 @@ let
vhosts = concatStringsSep "\n" (mapAttrsToList (vhostName: vhost:
let
- ssl = with vhost; addSSL || onlySSL || enableSSL;
-
- defaultListen = with vhost;
- if listen != [] then listen
- else if onlySSL || enableSSL then
- singleton { addr = "0.0.0.0"; port = 443; ssl = true; }
- ++ optional enableIPv6 { addr = "[::]"; port = 443; ssl = true; }
- else singleton { addr = "0.0.0.0"; port = 80; ssl = false; }
- ++ optional enableIPv6 { addr = "[::]"; port = 80; ssl = false; }
- ++ optional addSSL { addr = "0.0.0.0"; port = 443; ssl = true; }
- ++ optional (enableIPv6 && addSSL) { addr = "[::]"; port = 443; ssl = true; };
+ onlySSL = vhost.onlySSL || vhost.enableSSL;
+ hasSSL = onlySSL || vhost.addSSL || vhost.forceSSL;
+
+ defaultListen =
+ if vhost.listen != [] then vhost.listen
+ else ((optionals hasSSL (
+ singleton { addr = "0.0.0.0"; port = 443; ssl = true; }
+ ++ optional enableIPv6 { addr = "[::]"; port = 443; ssl = true; }
+ )) ++ optionals (!onlySSL) (
+ singleton { addr = "0.0.0.0"; port = 80; ssl = false; }
+ ++ optional enableIPv6 { addr = "[::]"; port = 80; ssl = false; }
+ ));
hostListen =
- if !vhost.forceSSL
- then defaultListen
- else filter (x: x.ssl) defaultListen;
+ if vhost.forceSSL
+ then filter (x: x.ssl) defaultListen
+ else defaultListen;
listenString = { addr, port, ssl, ... }:
"listen ${addr}:${toString port} "
@@ -155,9 +173,6 @@ let
redirectListen = filter (x: !x.ssl) defaultListen;
- redirectListenString = { addr, ... }:
- "listen ${addr}:80 ${optionalString vhost.default "default_server"};";
-
acmeLocation = ''
location /.well-known/acme-challenge {
${optionalString (vhost.acmeFallbackHost != null) "try_files $uri @acme-fallback;"}
@@ -175,7 +190,7 @@ let
in ''
${optionalString vhost.forceSSL ''
server {
- ${concatMapStringsSep "\n" redirectListenString redirectListen}
+ ${concatMapStringsSep "\n" listenString redirectListen}
server_name ${vhost.serverName} ${concatStringsSep " " vhost.serverAliases};
${optionalString vhost.enableACME acmeLocation}
@@ -191,9 +206,9 @@ let
${optionalString vhost.enableACME acmeLocation}
${optionalString (vhost.root != null) "root ${vhost.root};"}
${optionalString (vhost.globalRedirect != null) ''
- return 301 http${optionalString ssl "s"}://${vhost.globalRedirect}$request_uri;
+ return 301 http${optionalString hasSSL "s"}://${vhost.globalRedirect}$request_uri;
''}
- ${optionalString ssl ''
+ ${optionalString hasSSL ''
ssl_certificate ${vhost.sslCertificate};
ssl_certificate_key ${vhost.sslCertificateKey};
''}
@@ -208,12 +223,24 @@ let
) virtualHosts);
mkLocations = locations: concatStringsSep "\n" (mapAttrsToList (location: config: ''
location ${location} {
- ${optionalString (config.proxyPass != null) "proxy_pass ${config.proxyPass};"}
+ ${optionalString (config.proxyPass != null && !cfg.proxyResolveWhileRunning)
+ "proxy_pass ${config.proxyPass};"
+ }
+ ${optionalString (config.proxyPass != null && cfg.proxyResolveWhileRunning) ''
+ set $nix_proxy_target "${config.proxyPass}";
+ proxy_pass $nix_proxy_target;
+ ''}
+ ${optionalString config.proxyWebsockets ''
+ proxy_http_version 1.1;
+ proxy_set_header Upgrade $http_upgrade;
+ proxy_set_header Connection $connection_upgrade;
+ ''}
${optionalString (config.index != null) "index ${config.index};"}
${optionalString (config.tryFiles != null) "try_files ${config.tryFiles};"}
${optionalString (config.root != null) "root ${config.root};"}
${optionalString (config.alias != null) "alias ${config.alias};"}
${config.extraConfig}
+ ${optionalString (config.proxyPass != null && cfg.recommendedProxySettings) "include ${recommendedProxyConfig};"}
}
'') locations);
mkBasicAuth = vhostName: authDef: let
@@ -405,6 +432,16 @@ in
description = "Path to DH parameters file.";
};
+ proxyResolveWhileRunning = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Resolves domains of proxyPass targets at runtime
+ and not only at start, you have to set
+ services.nginx.resolver, too.
+ '';
+ };
+
resolver = mkOption {
type = types.submodule {
options = {
@@ -431,6 +468,35 @@ in
default = {};
};
+ upstreams = mkOption {
+ type = types.attrsOf (types.submodule {
+ options = {
+ servers = mkOption {
+ type = types.attrsOf (types.submodule {
+ options = {
+ backup = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Marks the server as a backup server. It will be passed
+ requests when the primary servers are unavailable.
+ '';
+ };
+ };
+ });
+ description = ''
+ Defines the address and other parameters of the upstream servers.
+ '';
+ default = {};
+ };
+ };
+ });
+ description = ''
+ Defines a group of servers to use as proxy target.
+ '';
+ default = {};
+ };
+
virtualHosts = mkOption {
type = types.attrsOf (types.submodule (import ./vhost-options.nix {
inherit config lib;
@@ -441,7 +507,6 @@ in
example = literalExample ''
{
"hydra.example.com" = {
- addSSL = true;
forceSSL = true;
enableACME = true;
locations."/" = {
@@ -478,18 +543,15 @@ in
}
{
- assertion = all (conf: with conf; !(addSSL && (onlySSL || enableSSL))) (attrValues virtualHosts);
- message = ''
- Options services.nginx.service.virtualHosts..addSSL and
- services.nginx.virtualHosts..onlySSL are mutually esclusive
- '';
- }
-
- {
- assertion = all (conf: with conf; forceSSL -> addSSL) (attrValues virtualHosts);
+ assertion = all (conf: with conf;
+ !(addSSL && (onlySSL || enableSSL)) &&
+ !(forceSSL && (onlySSL || enableSSL)) &&
+ !(addSSL && forceSSL)
+ ) (attrValues virtualHosts);
message = ''
- Option services.nginx.virtualHosts..forceSSL requires
- services.nginx.virtualHosts..addSSL set to true.
+ Options services.nginx.service.virtualHosts..addSSL,
+ services.nginx.virtualHosts..onlySSL and services.nginx.virtualHosts..forceSSL
+ are mutually exclusive.
'';
}
];
diff --git a/nixos/modules/services/web-servers/nginx/location-options.nix b/nixos/modules/services/web-servers/nginx/location-options.nix
index 83ce0f71734139dc79ea8d8de92265f45c760d3c..4c772734a749af5e38912eba20d4d8a20f67155e 100644
--- a/nixos/modules/services/web-servers/nginx/location-options.nix
+++ b/nixos/modules/services/web-servers/nginx/location-options.nix
@@ -14,7 +14,17 @@ with lib;
default = null;
example = "http://www.example.org/";
description = ''
- Adds proxy_pass directive.
+ Adds proxy_pass directive and sets recommended proxy headers if
+ recommendedProxySettings is enabled.
+ '';
+ };
+
+ proxyWebsockets = mkOption {
+ type = types.bool;
+ default = false;
+ example = true;
+ description = ''
+ Whether to supporty proxying websocket connections with HTTP/1.1.
'';
};
diff --git a/nixos/modules/services/web-servers/nginx/vhost-options.nix b/nixos/modules/services/web-servers/nginx/vhost-options.nix
index 362f8ee90524d6258e990489c261e4c929f2beab..801601aafd9d64064f2d75c43452b5bb23386d8d 100644
--- a/nixos/modules/services/web-servers/nginx/vhost-options.nix
+++ b/nixos/modules/services/web-servers/nginx/vhost-options.nix
@@ -96,8 +96,9 @@ with lib;
default = false;
description = ''
Whether to add a separate nginx server block that permanently redirects (301)
- all plain HTTP traffic to HTTPS. This option needs addSSL
- to be set to true.
+ all plain HTTP traffic to HTTPS. This will set defaults for
+ listen to listen on all interfaces on the respective default
+ ports (80, 443), where the non-SSL listens are used for the redirect vhosts.
'';
};
@@ -141,10 +142,10 @@ with lib;
globalRedirect = mkOption {
type = types.nullOr types.str;
default = null;
- example = http://newserver.example.org/;
+ example = "newserver.example.org";
description = ''
If set, all requests for this host are redirected permanently to
- the given URL.
+ the given hostname.
'';
};
diff --git a/nixos/modules/services/web-servers/phpfpm/default.nix b/nixos/modules/services/web-servers/phpfpm/default.nix
index f9febbfbacdf7922da1deea90a30dca443d12fb5..e1f4ff5db7f2c209a0a7f6476a9ad2d0c2c85cae 100644
--- a/nixos/modules/services/web-servers/phpfpm/default.nix
+++ b/nixos/modules/services/web-servers/phpfpm/default.nix
@@ -150,7 +150,8 @@ in {
PrivateDevices = true;
ProtectSystem = "full";
ProtectHome = true;
- RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6";
+ # XXX: We need AF_NETLINK to make the sendmail SUID binary from postfix work
+ RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6 AF_NETLINK";
Type = "notify";
ExecStart = "${cfg.phpPackage}/bin/php-fpm -y ${cfgFile} -c ${phpIni}";
ExecReload = "${pkgs.coreutils}/bin/kill -USR2 $MAINPID";
diff --git a/nixos/modules/services/web-servers/traefik.nix b/nixos/modules/services/web-servers/traefik.nix
new file mode 100644
index 0000000000000000000000000000000000000000..4ede4fc209670b72d9a20d940977a3fe47d73ffd
--- /dev/null
+++ b/nixos/modules/services/web-servers/traefik.nix
@@ -0,0 +1,115 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.traefik;
+ configFile =
+ if cfg.configFile == null then
+ pkgs.runCommand "config.toml" {
+ buildInputs = [ pkgs.remarshal ];
+ } ''
+ remarshal -if json -of toml \
+ < ${pkgs.writeText "config.json" (builtins.toJSON cfg.configOptions)} \
+ > $out
+ ''
+ else cfg.configFile;
+
+in {
+ options.services.traefik = {
+ enable = mkEnableOption "Traefik web server";
+
+ configFile = mkOption {
+ default = null;
+ example = literalExample "/path/to/config.toml";
+ type = types.nullOr types.path;
+ description = ''
+ Path to verbatim traefik.toml to use.
+ (Using that option has precedence over configOptions)
+ '';
+ };
+
+ configOptions = mkOption {
+ description = ''
+ Config for Traefik.
+ '';
+ type = types.attrs;
+ default = {
+ defaultEntryPoints = ["http"];
+ entryPoints.http.address = ":80";
+ };
+ example = {
+ defaultEntrypoints = [ "http" ];
+ web.address = ":8080";
+ entryPoints.http.address = ":80";
+
+ file = {};
+ frontends = {
+ frontend1 = {
+ backend = "backend1";
+ routes.test_1.rule = "Host:localhost";
+ };
+ };
+ backends.backend1 = {
+ servers.server1.url = "http://localhost:8000";
+ };
+ };
+ };
+
+ dataDir = mkOption {
+ default = "/var/lib/traefik";
+ type = types.path;
+ description = ''
+ Location for any persistent data traefik creates, ie. acme
+ '';
+ };
+
+ package = mkOption {
+ default = pkgs.traefik;
+ defaultText = "pkgs.traefik";
+ type = types.package;
+ description = "Traefik package to use.";
+ };
+ };
+
+ config = mkIf cfg.enable {
+ systemd.services.traefik = {
+ description = "Traefik web server";
+ after = [ "network-online.target" ];
+ wantedBy = [ "multi-user.target" ];
+ serviceConfig = {
+ PermissionsStartOnly = true;
+ ExecStart = ''${cfg.package.bin}/bin/traefik --configfile=${configFile}'';
+ ExecStartPre = [
+ ''${pkgs.coreutils}/bin/mkdir -p "${cfg.dataDir}"''
+ ''${pkgs.coreutils}/bin/chmod 700 "${cfg.dataDir}"''
+ ''${pkgs.coreutils}/bin/chown -R traefik:traefik "${cfg.dataDir}"''
+ ];
+ Type = "simple";
+ User = "traefik";
+ Group = "traefik";
+ Restart = "on-failure";
+ StartLimitInterval = 86400;
+ StartLimitBurst = 5;
+ AmbientCapabilities = "cap_net_bind_service";
+ CapabilityBoundingSet = "cap_net_bind_service";
+ NoNewPrivileges = true;
+ LimitNPROC = 64;
+ LimitNOFILE = 1048576;
+ PrivateTmp = true;
+ PrivateDevices = true;
+ ProtectHome = true;
+ ProtectSystem = "full";
+ ReadWriteDirectories = cfg.dataDir;
+ };
+ };
+
+ users.extraUsers.traefik = {
+ group = "traefik";
+ home = cfg.dataDir;
+ createHome = true;
+ };
+
+ users.extraGroups.traefik = {};
+ };
+}
diff --git a/nixos/modules/services/web-servers/varnish/default.nix b/nixos/modules/services/web-servers/varnish/default.nix
index 5433db3b91c8ddb09c354924bc43dd6e4a1f97ae..c3bc065d4651f10060919cdc916c701f7a52861a 100644
--- a/nixos/modules/services/web-servers/varnish/default.nix
+++ b/nixos/modules/services/web-servers/varnish/default.nix
@@ -7,14 +7,10 @@ with lib;
{
options = {
services.varnish = {
- enable = mkOption {
- default = false;
- description = "
- Enable the Varnish Server.
- ";
- };
+ enable = mkEnableOption "Varnish Server";
http_address = mkOption {
+ type = types.str;
default = "*:6081";
description = "
HTTP listen address and port.
@@ -22,17 +18,37 @@ with lib;
};
config = mkOption {
+ type = types.lines;
description = "
Verbatim default.vcl configuration.
";
};
stateDir = mkOption {
+ type = types.path;
default = "/var/spool/varnish/${config.networking.hostName}";
description = "
Directory holding all state for Varnish to run.
";
};
+
+ extraModules = mkOption {
+ type = types.listOf types.package;
+ default = [];
+ example = literalExample "[ pkgs.varnish-geoip ]";
+ description = "
+ Varnish modules (except 'std').
+ ";
+ };
+
+ extraCommandLine = mkOption {
+ type = types.str;
+ default = "";
+ example = "-s malloc,256M";
+ description = "
+ Command line switches for varnishd (run 'varnishd -?' to get list of options)
+ ";
+ };
};
};
@@ -42,6 +58,7 @@ with lib;
systemd.services.varnish = {
description = "Varnish";
wantedBy = [ "multi-user.target" ];
+ after = [ "network.target" ];
preStart = ''
mkdir -p ${cfg.stateDir}
chown -R varnish:varnish ${cfg.stateDir}
@@ -49,8 +66,19 @@ with lib;
postStop = ''
rm -rf ${cfg.stateDir}
'';
- serviceConfig.ExecStart = "${pkgs.varnish}/sbin/varnishd -a ${cfg.http_address} -f ${pkgs.writeText "default.vcl" cfg.config} -n ${cfg.stateDir} -u varnish";
- serviceConfig.Type = "forking";
+ serviceConfig = {
+ Type = "simple";
+ PermissionsStartOnly = true;
+ ExecStart = "${pkgs.varnish}/sbin/varnishd -a ${cfg.http_address} -f ${pkgs.writeText "default.vcl" cfg.config} -n ${cfg.stateDir} -F ${cfg.extraCommandLine}"
+ + optionalString (cfg.extraModules != []) " -p vmod_path='${makeSearchPathOutput "lib" "lib/varnish/vmods" ([pkgs.varnish] ++ cfg.extraModules)}' -r vmod_path";
+ Restart = "always";
+ RestartSec = "5s";
+ User = "varnish";
+ Group = "varnish";
+ AmbientCapabilities = "cap_net_bind_service";
+ NoNewPrivileges = true;
+ LimitNOFILE = 131072;
+ };
};
environment.systemPackages = [ pkgs.varnish ];
diff --git a/nixos/modules/services/x11/compton.nix b/nixos/modules/services/x11/compton.nix
index 56bc66b717967f13b0f4470a0ad824ded606ff89..11cbcac6fa85747677f032c108f79e22b56f01f4 100644
--- a/nixos/modules/services/x11/compton.nix
+++ b/nixos/modules/services/x11/compton.nix
@@ -7,6 +7,14 @@ let
cfg = config.services.compton;
+ floatBetween = a: b: with lib; with types;
+ addCheck str (x: versionAtLeast x a && versionOlder x b);
+
+ pairOf = x: with types; addCheck (listOf x) (y: lib.length y == 2);
+
+ opacityRules = optionalString (length cfg.opacityRules != 0)
+ (concatMapStringsSep ",\n" (rule: ''"${rule}"'') cfg.opacityRules);
+
configFile = pkgs.writeText "compton.conf"
(optionalString cfg.fade ''
# fading
@@ -30,7 +38,11 @@ let
active-opacity = ${cfg.activeOpacity};
inactive-opacity = ${cfg.inactiveOpacity};
menu-opacity = ${cfg.menuOpacity};
-
+
+ opacity-rule = [
+ ${opacityRules}
+ ];
+
# other options
backend = ${toJSON cfg.backend};
vsync = ${toJSON cfg.vSync};
@@ -57,7 +69,7 @@ in {
};
fadeDelta = mkOption {
- type = types.int;
+ type = types.addCheck types.int (x: x > 0);
default = 10;
example = 5;
description = ''
@@ -66,11 +78,12 @@ in {
};
fadeSteps = mkOption {
- type = types.listOf types.str;
+ type = pairOf (floatBetween "0.01" "1.01");
default = [ "0.028" "0.03" ];
example = [ "0.04" "0.04" ];
description = ''
Opacity change between fade steps (in and out).
+ (numbers in range 0.01 - 1.0)
'';
};
@@ -97,7 +110,7 @@ in {
};
shadowOffsets = mkOption {
- type = types.listOf types.int;
+ type = pairOf types.int;
default = [ (-15) (-15) ];
example = [ (-10) (-15) ];
description = ''
@@ -106,11 +119,11 @@ in {
};
shadowOpacity = mkOption {
- type = types.str;
+ type = floatBetween "0.0" "1.01";
default = "0.75";
example = "0.8";
description = ''
- Window shadows opacity (number in range 0 - 1).
+ Window shadows opacity (number in range 0.0 - 1.0).
'';
};
@@ -129,52 +142,67 @@ in {
};
activeOpacity = mkOption {
- type = types.str;
+ type = floatBetween "0.0" "1.01";
default = "1.0";
example = "0.8";
description = ''
- Opacity of active windows.
+ Opacity of active windows (number in range 0.0 - 1.0).
'';
};
inactiveOpacity = mkOption {
- type = types.str;
+ type = floatBetween "0.1" "1.01";
default = "1.0";
example = "0.8";
description = ''
- Opacity of inactive windows.
+ Opacity of inactive windows (number in range 0.1 - 1.0).
'';
};
menuOpacity = mkOption {
- type = types.str;
+ type = floatBetween "0.0" "1.01";
default = "1.0";
example = "0.8";
description = ''
- Opacity of dropdown and popup menu.
+ Opacity of dropdown and popup menu (number in range 0.0 - 1.0).
+ '';
+ };
+
+ opacityRules = mkOption {
+ type = types.listOf types.str;
+ default = [];
+ example = [
+ "95:class_g = 'URxvt' && !_NET_WM_STATE@:32a"
+ "0:_NET_WM_STATE@:32a *= '_NET_WM_STATE_HIDDEN'"
+ ];
+ description = ''
+ Rules that control the opacity of windows, in format PERCENT:PATTERN.
'';
};
backend = mkOption {
- type = types.str;
- default = "glx";
+ type = types.enum [ "glx" "xrender" ];
+ default = "xrender";
description = ''
Backend to use: glx or xrender.
'';
};
vSync = mkOption {
- type = types.str;
- default = "none";
- example = "opengl-swc";
- description = ''
- Enable vertical synchronization using the specified method.
- See compton(1) man page available methods.
- '';
+ type = types.enum [
+ "none" "drm" "opengl"
+ "opengl-oml" "opengl-swc" "opengl-mswc"
+ ];
+ default = "none";
+ example = "opengl-swc";
+ description = ''
+ Enable vertical synchronization using the specified method.
+ See compton(1) man page an explanation.
+ '';
};
refreshRate = mkOption {
- type = types.int;
+ type = types.addCheck types.int (x: x >= 0);
default = 0;
example = 60;
description = ''
@@ -193,7 +221,7 @@ in {
};
extraOptions = mkOption {
- type = types.str;
+ type = types.lines;
default = "";
example = ''
unredir-if-possible = true;
diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix
index c207aab5de0a8e8cc4935768b9499172f9a8f4be..13f339e3fbf34b89a4821302a66561170cd04105 100644
--- a/nixos/modules/services/x11/desktop-managers/default.nix
+++ b/nixos/modules/services/x11/desktop-managers/default.nix
@@ -19,7 +19,8 @@ in
# E.g., if Plasma 5 is enabled, it supersedes xterm.
imports = [
./none.nix ./xterm.nix ./xfce.nix ./plasma5.nix ./lumina.nix
- ./lxqt.nix ./enlightenment.nix ./gnome3.nix ./kodi.nix
+ ./lxqt.nix ./enlightenment.nix ./gnome3.nix ./kodi.nix ./maxx.nix
+ ./mate.nix
];
options = {
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 2434aa1654a67f01926bbdaf83b86f2ca33c9932..ecf0abb1efd2b724c5bf854a499023a339748b1b 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -4,7 +4,6 @@ with lib;
let
cfg = config.services.xserver.desktopManager.gnome3;
- gnome3 = config.environment.gnome3.packageSet;
# Remove packages of ys from xs, based on their names
removePackagesByName = xs: ys:
@@ -28,7 +27,7 @@ let
nixos-gsettings-desktop-schemas = pkgs.runCommand "nixos-gsettings-desktop-schemas" {}
''
mkdir -p $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas
- cp -rf ${gnome3.gsettings_desktop_schemas}/share/gsettings-schemas/gsettings-desktop-schemas*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas
+ cp -rf ${pkgs.gnome3.gsettings_desktop_schemas}/share/gsettings-schemas/gsettings-desktop-schemas*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas
${concatMapStrings (pkg: "cp -rf ${pkg}/share/gsettings-schemas/*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas\n") cfg.extraGSettingsOverridePackages}
@@ -61,7 +60,7 @@ in {
example = literalExample "[ pkgs.gnome3.gpaste ]";
description = "Additional list of packages to be added to the session search path.
Useful for gnome shell extensions or gsettings-conditionated autostart.";
- apply = list: list ++ [ gnome3.gnome_shell gnome3.gnome-shell-extensions ];
+ apply = list: list ++ [ pkgs.gnome3.gnome_shell pkgs.gnome3.gnome-shell-extensions ];
};
extraGSettingsOverrides = mkOption {
@@ -79,13 +78,6 @@ in {
debug = mkEnableOption "gnome-session debug messages";
};
- environment.gnome3.packageSet = mkOption {
- default = null;
- example = literalExample "pkgs.gnome3_22";
- description = "Which GNOME 3 package set to use.";
- apply = p: if p == null then pkgs.gnome3 else p;
- };
-
environment.gnome3.excludePackages = mkOption {
default = [];
example = literalExample "[ pkgs.gnome3.totem ]";
@@ -169,25 +161,26 @@ in {
# Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/
${pkgs.xdg-user-dirs}/bin/xdg-user-dirs-update
- ${gnome3.gnome_session}/bin/gnome-session ${optionalString cfg.debug "--debug"} &
+ ${pkgs.gnome3.gnome_session}/bin/gnome-session ${optionalString cfg.debug "--debug"} &
waitPID=$!
'';
};
services.xserver.updateDbusEnvironment = true;
- environment.variables.GIO_EXTRA_MODULES = [ "${lib.getLib gnome3.dconf}/lib/gio/modules"
- "${gnome3.glib_networking.out}/lib/gio/modules"
- "${gnome3.gvfs}/lib/gio/modules" ];
- environment.systemPackages = gnome3.corePackages ++ cfg.sessionPath
- ++ (removePackagesByName gnome3.optionalPackages config.environment.gnome3.excludePackages);
+ environment.variables.GIO_EXTRA_MODULES = [ "${lib.getLib pkgs.gnome3.dconf}/lib/gio/modules"
+ "${pkgs.gnome3.glib_networking.out}/lib/gio/modules"
+ "${pkgs.gnome3.gvfs}/lib/gio/modules" ];
+ environment.systemPackages = pkgs.gnome3.corePackages ++ cfg.sessionPath
+ ++ (removePackagesByName pkgs.gnome3.optionalPackages config.environment.gnome3.excludePackages);
# Use the correct gnome3 packageSet
networking.networkmanager.basePackages =
{ inherit (pkgs) networkmanager modemmanager wpa_supplicant;
- inherit (gnome3) networkmanager_openvpn networkmanager_vpnc
- networkmanager_openconnect networkmanager_fortisslvpn networkmanager_pptp
- networkmanager_l2tp; };
+ inherit (pkgs.gnome3) networkmanager_openvpn networkmanager_vpnc
+ networkmanager_openconnect networkmanager_fortisslvpn
+ networkmanager_pptp networkmanager_iodine
+ networkmanager_l2tp; };
# Needed for themes and backgrounds
environment.pathsToLink = [ "/share" ];
diff --git a/nixos/modules/services/x11/desktop-managers/lxqt.nix b/nixos/modules/services/x11/desktop-managers/lxqt.nix
index 89ad2882363de930fcde80e1ddbb4e7764a430c2..fb907618d35b7141070fe18032e599f882a1502f 100644
--- a/nixos/modules/services/x11/desktop-managers/lxqt.nix
+++ b/nixos/modules/services/x11/desktop-managers/lxqt.nix
@@ -41,7 +41,7 @@ in
name = "lxqt";
bgSupport = true;
start = ''
- exec ${pkgs.lxqt.lxqt-common}/bin/startlxqt
+ exec ${pkgs.lxqt.lxqt-session}/bin/startlxqt
'';
};
diff --git a/nixos/modules/services/x11/desktop-managers/mate.nix b/nixos/modules/services/x11/desktop-managers/mate.nix
new file mode 100644
index 0000000000000000000000000000000000000000..ab8a0a48b4837d18097aff4d6f1e2557646f2301
--- /dev/null
+++ b/nixos/modules/services/x11/desktop-managers/mate.nix
@@ -0,0 +1,80 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+ # Remove packages of ys from xs, based on their names
+ removePackagesByName = xs: ys:
+ let
+ pkgName = drv: (builtins.parseDrvName drv.name).name;
+ ysNames = map pkgName ys;
+ in
+ filter (x: !(builtins.elem (pkgName x) ysNames)) xs;
+
+ xcfg = config.services.xserver;
+ cfg = xcfg.desktopManager.mate;
+
+in
+
+{
+ options = {
+
+ services.xserver.desktopManager.mate.enable = mkOption {
+ type = types.bool;
+ default = false;
+ description = "Enable the MATE desktop environment";
+ };
+
+ environment.mate.excludePackages = mkOption {
+ default = [];
+ example = literalExample "[ pkgs.mate.mate-terminal pkgs.mate.pluma ]";
+ type = types.listOf types.package;
+ description = "Which MATE packages to exclude from the default environment";
+ };
+
+ };
+
+ config = mkIf (xcfg.enable && cfg.enable) {
+
+ services.xserver.desktopManager.session = singleton {
+ name = "mate";
+ bgSupport = true;
+ start = ''
+ # Set GTK_DATA_PREFIX so that GTK+ can find the themes
+ export GTK_DATA_PREFIX=${config.system.path}
+
+ # Find theme engines
+ export GTK_PATH=${config.system.path}/lib/gtk-3.0:${config.system.path}/lib/gtk-2.0
+
+ export XDG_MENU_PREFIX=mate
+
+ # Find the mouse
+ export XCURSOR_PATH=~/.icons:${config.system.path}/share/icons
+
+ # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/
+ ${pkgs.xdg-user-dirs}/bin/xdg-user-dirs-update
+
+ ${pkgs.mate.mate-session-manager}/bin/mate-session &
+ waitPID=$!
+ '';
+ };
+
+ environment.systemPackages =
+ pkgs.mate.basePackages ++
+ (removePackagesByName
+ pkgs.mate.extraPackages
+ config.environment.mate.excludePackages);
+
+ services.dbus.packages = [
+ pkgs.gnome3.dconf
+ pkgs.at_spi2_core
+ ];
+
+ services.gnome3.gnome-keyring.enable = true;
+ services.upower.enable = config.powerManagement.enable;
+
+ environment.pathsToLink = [ "/share" ];
+ };
+
+}
diff --git a/nixos/modules/services/x11/desktop-managers/maxx.nix b/nixos/modules/services/x11/desktop-managers/maxx.nix
new file mode 100644
index 0000000000000000000000000000000000000000..d7bd2fc5eb0c3620e313d3b4a2f5dc6f946b48b5
--- /dev/null
+++ b/nixos/modules/services/x11/desktop-managers/maxx.nix
@@ -0,0 +1,25 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ xcfg = config.services.xserver;
+ cfg = xcfg.desktopManager.maxx;
+in {
+ options.services.xserver.desktopManager.maxx = {
+ enable = mkEnableOption "MaXX desktop environment";
+ };
+
+ config = mkIf (xcfg.enable && cfg.enable) {
+ environment.systemPackages = [ pkgs.maxx ];
+
+ services.xserver.desktopManager.session = [
+ { name = "MaXX";
+ start = ''
+ exec ${pkgs.maxx}/opt/MaXX/etc/skel/Xsession.dt
+ '';
+ }];
+ };
+
+ meta.maintainers = [ maintainers.gnidorah ];
+}
diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix
index f099117f47778ea2000567236cc42f9f023de4f3..7f54bb182fe9759fc961d4e8bfc08ffbd37fdf72 100644
--- a/nixos/modules/services/x11/desktop-managers/plasma5.nix
+++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix
@@ -47,7 +47,7 @@ in
${getBin config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1"
''}
- exec "${plasma5.startkde}"
+ exec "${getBin plasma5.plasma-workspace}/bin/startkde"
'';
};
@@ -142,7 +142,8 @@ in
kde-gtk-config breeze-gtk
- phonon-backend-gstreamer
+ libsForQt56.phonon-backend-gstreamer
+ libsForQt5.phonon-backend-gstreamer
]
++ lib.optionals cfg.enableQt4Support [ breeze-qt4 pkgs.phonon-backend-gstreamer ]
@@ -174,7 +175,7 @@ in
serif = [ "Noto Serif" ];
};
- programs.ssh.askPassword = "${plasma5.ksshaskpass.out}/bin/ksshaskpass";
+ programs.ssh.askPassword = mkDefault "${plasma5.ksshaskpass.out}/bin/ksshaskpass";
# Enable helpful DBus services.
services.udisks2.enable = true;
@@ -189,7 +190,12 @@ in
];
services.xserver.displayManager.sddm = {
- theme = "breeze";
+ theme = mkDefault "breeze";
+ };
+
+ boot.plymouth = {
+ theme = mkDefault "breeze";
+ themePackages = mkDefault [ pkgs.breeze-plymouth ];
};
security.pam.services.kde = { allowNullPassword = true; };
diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index 58773685ec1f2cd96900a970b538160d2c77bcaa..3fa482fb672210eaa09ad801eb83b6a11092e957 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -92,9 +92,12 @@ let
${config.hardware.pulseaudio.package.out}/bin/pactl load-module module-x11-publish "display=$DISPLAY"
''}
- # Tell systemd about our $DISPLAY. This is needed by the
- # ssh-agent unit.
- ${config.systemd.package}/bin/systemctl --user import-environment DISPLAY
+ # Tell systemd about our $DISPLAY and $XAUTHORITY.
+ # This is needed by the ssh-agent unit.
+ #
+ # Also tell systemd about the dbus session bus address.
+ # This is required by user units using the session bus.
+ ${config.systemd.package}/bin/systemctl --user import-environment DISPLAY XAUTHORITY DBUS_SESSION_BUS_ADDRESS
# Load X defaults.
${xorg.xrdb}/bin/xrdb -merge ${xresourcesXft}
diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index 6c63fede857ffb09015e72f642aef116aeae8407..e83f26516f5f836f3ff1e014dcfbdd2d818be172 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -5,8 +5,7 @@ with lib;
let
cfg = config.services.xserver.displayManager;
- gnome3 = config.environment.gnome3.packageSet;
- gdm = gnome3.gdm;
+ gdm = pkgs.gnome3.gdm;
in
@@ -65,6 +64,14 @@ in
};
};
+ wayland = mkOption {
+ default = true;
+ description = ''
+ Allow GDM run on Wayland instead of Xserver
+ '';
+ type = types.bool;
+ };
+
};
};
@@ -95,6 +102,7 @@ in
# GDM needs different xserverArgs, presumable because using wayland by default.
services.xserver.tty = null;
services.xserver.display = null;
+ services.xserver.verbose = null;
services.xserver.displayManager.job =
{
@@ -103,16 +111,32 @@ in
(filter (arg: arg != "-terminate") cfg.xserverArgs);
GDM_SESSIONS_DIR = "${cfg.session.desktops}";
# Find the mouse
- XCURSOR_PATH = "~/.icons:${config.system.path}/share/icons";
+ XCURSOR_PATH = "~/.icons:${pkgs.gnome3.adwaita-icon-theme}/share/icons";
};
execCmd = "exec ${gdm}/bin/gdm";
};
# Because sd_login_monitor_new requires /run/systemd/machines
systemd.services.display-manager.wants = [ "systemd-machined.service" ];
- systemd.services.display-manager.after = [ "systemd-machined.service" ];
+ systemd.services.display-manager.after = [
+ "rc-local.service"
+ "systemd-machined.service"
+ "systemd-user-sessions.service"
+ "getty@tty1.service"
+ ];
+
+ systemd.services."getty@tty1".enable = false;
+ systemd.services.display-manager.conflicts = [ "getty@tty1.service" ];
+ systemd.services.display-manager.serviceConfig = {
+ # Restart = "always"; - already defined in xserver.nix
+ KillMode = "mixed";
+ IgnoreSIGPIPE = "no";
+ BusName = "org.gnome.DisplayManager";
+ StandardOutput = "syslog";
+ StandardError = "inherit";
+ };
- systemd.services.display-manager.path = [ gnome3.gnome_session ];
+ systemd.services.display-manager.path = [ pkgs.gnome3.gnome_session ];
services.dbus.packages = [ gdm ];
@@ -125,6 +149,7 @@ in
# presented and there's a little delay.
environment.etc."gdm/custom.conf".text = ''
[daemon]
+ WaylandEnable=${if cfg.gdm.wayland then "true" else "false"}
${optionalString cfg.gdm.autoLogin.enable (
if cfg.gdm.autoLogin.delay > 0 then ''
TimedLoginEnable=true
@@ -171,7 +196,7 @@ in
auth required pam_env.so envfile=${config.system.build.pamEnvironment}
auth required pam_succeed_if.so uid >= 1000 quiet
- auth optional ${gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so
+ auth optional ${pkgs.gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so
auth ${if config.security.pam.enableEcryptfs then "required" else "sufficient"} pam_unix.so nullok likeauth
${optionalString config.security.pam.enableEcryptfs
"auth required ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap"}
@@ -191,7 +216,7 @@ in
"session optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"}
session required pam_loginuid.so
session optional ${pkgs.systemd}/lib/security/pam_systemd.so
- session optional ${gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so auto_start
+ session optional ${pkgs.gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so auto_start
'';
gdm-password.text = ''
@@ -199,7 +224,7 @@ in
auth required pam_env.so envfile=${config.system.build.pamEnvironment}
auth required pam_succeed_if.so uid >= 1000 quiet
- auth optional ${gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so
+ auth optional ${pkgs.gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so
auth ${if config.security.pam.enableEcryptfs then "required" else "sufficient"} pam_unix.so nullok likeauth
${optionalString config.security.pam.enableEcryptfs
"auth required ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap"}
@@ -218,7 +243,7 @@ in
"session optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"}
session required pam_loginuid.so
session optional ${pkgs.systemd}/lib/security/pam_systemd.so
- session optional ${gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so auto_start
+ session optional ${pkgs.gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so auto_start
'';
gdm-autologin.text = ''
diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix
index e6cc02e4d49185a8e3453692b566ebd6c16c3074..facaea131ae5137915ed052de0c1e0ae0fcfc378 100644
--- a/nixos/modules/services/x11/display-managers/sddm.nix
+++ b/nixos/modules/services/x11/display-managers/sddm.nix
@@ -19,6 +19,17 @@ let
Xsetup = pkgs.writeScript "Xsetup" ''
#!/bin/sh
+
+ # Prior to Qt 5.9.2, there is a QML cache invalidation bug which sometimes
+ # strikes new Plasma 5 releases. If the QML cache is not invalidated, SDDM
+ # will segfault without explanation. We really tore our hair out for awhile
+ # before finding the bug:
+ # https://bugreports.qt.io/browse/QTBUG-62302
+ # We work around the problem by deleting the QML cache before startup. It
+ # will be regenerated, causing a small but perceptible delay when SDDM
+ # starts.
+ rm -fr /var/lib/sddm/.cache/sddm-greeter/qmlcache
+
${cfg.setupScript}
'';
diff --git a/nixos/modules/services/x11/display-managers/xpra.nix b/nixos/modules/services/x11/display-managers/xpra.nix
index e60dd8765264592b0b42f584ea4e98a485533008..8f5ce3dccc6a3cd6b2dff64c188256928af2ec3e 100644
--- a/nixos/modules/services/x11/display-managers/xpra.nix
+++ b/nixos/modules/services/x11/display-managers/xpra.nix
@@ -34,6 +34,12 @@ in
};
pulseaudio = mkEnableOption "pulseaudio audio streaming.";
+
+ extraOptions = mkOption {
+ description = "Extra xpra options";
+ default = [];
+ type = types.listOf types.str;
+ };
};
};
@@ -233,7 +239,8 @@ in
--socket-dirs=/var/run/xpra \
--xvfb="xpra_Xdummy ${concatStringsSep " " dmcfg.xserverArgs}" \
${optionalString (cfg.bindTcp != null) "--bind-tcp=${cfg.bindTcp}"} \
- --auth=${cfg.auth}
+ --auth=${cfg.auth} \
+ ${concatStringsSep " " cfg.extraOptions}
'';
};
diff --git a/nixos/modules/services/x11/hardware/libinput.nix b/nixos/modules/services/x11/hardware/libinput.nix
index d75c785270b38063656750cc918a534738ede050..44555cb6e2a923823fe9d21642d02c377e30800c 100644
--- a/nixos/modules/services/x11/hardware/libinput.nix
+++ b/nixos/modules/services/x11/hardware/libinput.nix
@@ -75,12 +75,13 @@ in {
default = null;
description =
''
- Enables a click method. Permitted values are none, buttonareas, clickfinger.
+ Enables a click method. Permitted values are none,
+ buttonareas, clickfinger.
Not all devices support all methods, if an option is unsupported,
- the default click method for this device is used.
+ the default click method for this device is used.
'';
};
-
+
leftHanded = mkOption {
type = types.bool;
default = false;
@@ -96,7 +97,7 @@ in {
simultaneously produces a middle mouse button click.
'';
};
-
+
naturalScrolling = mkOption {
type = types.bool;
default = false;
@@ -120,7 +121,8 @@ in {
example = "edge";
description =
''
- Specify the scrolling method.
+ Specify the scrolling method: twofinger, edge,
+ or none
'';
};
@@ -141,7 +143,8 @@ in {
example = "disabled";
description =
''
- Sets the send events mode to disabled, enabled, or "disable when an external mouse is connected".
+ Sets the send events mode to disabled, enabled,
+ or disabled-on-external-mouse
'';
};
diff --git a/nixos/modules/services/x11/hardware/synaptics.nix b/nixos/modules/services/x11/hardware/synaptics.nix
index 54454c736c1d7d109b8c69dc768368fb2fcc02f2..f032c5938852bbd1242f5cb412512e870bcd906f 100644
--- a/nixos/modules/services/x11/hardware/synaptics.nix
+++ b/nixos/modules/services/x11/hardware/synaptics.nix
@@ -29,7 +29,7 @@ in {
enable = mkOption {
type = types.bool;
default = false;
- description = "Whether to enable touchpad support.";
+ description = "Whether to enable touchpad support. Deprecated: Consider services.xserver.libinput.enable.";
};
dev = mkOption {
diff --git a/nixos/modules/services/x11/redshift.nix b/nixos/modules/services/x11/redshift.nix
index 992709ed00000218c80d2b1ee89eecb2c35f8992..30d853841ea4497f61fdce407da9dcde09300341 100644
--- a/nixos/modules/services/x11/redshift.nix
+++ b/nixos/modules/services/x11/redshift.nix
@@ -19,18 +19,31 @@ in {
};
latitude = mkOption {
- type = types.str;
+ type = types.nullOr types.str;
+ default = null;
description = ''
Your current latitude, between
- -90.0 and 90.0.
+ -90.0 and 90.0. Must be provided
+ along with longitude.
'';
};
longitude = mkOption {
- type = types.str;
+ type = types.nullOr types.str;
+ default = null;
description = ''
Your current longitude, between
- between -180.0 and 180.0.
+ between -180.0 and 180.0. Must be
+ provided along with latitude.
+ '';
+ };
+
+ provider = mkOption {
+ type = types.enum [ "manual" "geoclue2" ];
+ default = "manual";
+ description = ''
+ The location provider to use for determining your location. If set to
+ manual you must also provide latitude/longitude.
'';
};
@@ -93,14 +106,33 @@ in {
};
config = mkIf cfg.enable {
- systemd.user.services.redshift = {
+ assertions = [
+ {
+ assertion =
+ if cfg.provider == "manual"
+ then (cfg.latitude != null && cfg.longitude != null)
+ else (cfg.latitude == null && cfg.longitude == null);
+ message = "Latitude and longitude must be provided together, and with provider set to null.";
+ }
+ ];
+
+ services.geoclue2.enable = mkIf (cfg.provider == "geoclue2") true;
+
+ systemd.user.services.redshift =
+ let
+ providerString =
+ if cfg.provider == "manual"
+ then "${cfg.latitude}:${cfg.longitude}"
+ else cfg.provider;
+ in
+ {
description = "Redshift colour temperature adjuster";
wantedBy = [ "graphical-session.target" ];
partOf = [ "graphical-session.target" ];
serviceConfig = {
ExecStart = ''
${cfg.package}/bin/redshift \
- -l ${cfg.latitude}:${cfg.longitude} \
+ -l ${providerString} \
-t ${toString cfg.temperature.day}:${toString cfg.temperature.night} \
-b ${toString cfg.brightness.day}:${toString cfg.brightness.night} \
${lib.strings.concatStringsSep " " cfg.extraOptions}
diff --git a/nixos/modules/services/x11/window-managers/compiz.nix b/nixos/modules/services/x11/window-managers/compiz.nix
deleted file mode 100644
index 539a83f99068a03b95d6fa3dd215c7fb08acb643..0000000000000000000000000000000000000000
--- a/nixos/modules/services/x11/window-managers/compiz.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-
- cfg = config.services.xserver.windowManager.compiz;
- xorg = config.services.xserver.package;
-
-in
-
-{
-
- options = {
-
- services.xserver.windowManager.compiz = {
-
- enable = mkEnableOption "compiz";
-
- renderingFlag = mkOption {
- default = "";
- example = "--indirect-rendering";
- description = "Pass the flag to Compiz.";
- };
-
- };
-
- };
-
-
- config = mkIf cfg.enable {
-
- services.xserver.windowManager.session = singleton
- { name = "compiz";
- start =
- ''
- # Start Compiz using the flat-file configuration backend
- # (ccp).
- export COMPIZ_PLUGINDIR=${config.system.path}/lib/compiz
- export COMPIZ_METADATADIR=${config.system.path}/share/compiz
- ${pkgs.compiz}/bin/compiz ccp ${cfg.renderingFlag} &
-
- # Start GTK-style window decorator.
- ${pkgs.compiz}/bin/gtk-window-decorator &
- '';
- };
-
- environment.systemPackages =
- [ pkgs.compiz
- pkgs.compiz_ccsm
- pkgs.compiz_plugins_main
- pkgs.compiz_plugins_extra
- pkgs.libcompizconfig # for the "ccp" plugin
- ];
-
- environment.pathsToLink = [ "/lib/compiz" "/share/compiz" ];
-
- };
-
-}
diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix
index 32ef34bdad2b5aa5346128da5d8a1d0225e9dade..d12003768a675ac29fbdb29590b50410ced1d6b7 100644
--- a/nixos/modules/services/x11/window-managers/default.nix
+++ b/nixos/modules/services/x11/window-managers/default.nix
@@ -11,7 +11,6 @@ in
./2bwm.nix
./afterstep.nix
./bspwm.nix
- ./compiz.nix
./dwm.nix
./exwm.nix
./fluxbox.nix
diff --git a/nixos/modules/services/x11/xautolock.nix b/nixos/modules/services/x11/xautolock.nix
index 60ce9e6ed5c0986f03a2ec35aabfc8e6363d3058..28fc92024bcb46a4fa99c59896ee760cee959758 100644
--- a/nixos/modules/services/x11/xautolock.nix
+++ b/nixos/modules/services/x11/xautolock.nix
@@ -31,7 +31,17 @@ in
type = types.string;
description = ''
- The script to use when locking the computer.
+ The script to use when automatically locking the computer.
+ '';
+ };
+
+ nowlocker = mkOption {
+ default = null;
+ example = "i3lock -i /path/to/img";
+ type = types.nullOr types.string;
+
+ description = ''
+ The script to use when manually locking the computer with xautolock -locknow.
'';
};
@@ -45,28 +55,82 @@ in
};
notifier = mkOption {
- default = "notify-send 'Locking in 10 seconds'";
- type = types.string;
+ default = null;
+ example = literalExample ''
+ "${pkgs.libnotify}/bin/notify-send \"Locking in 10 seconds\""
+ '';
+ type = types.nullOr types.string;
description = ''
Notification script to be used to warn about the pending autolock.
'';
};
+
+ killer = mkOption {
+ default = null; # default according to `man xautolock` is none
+ example = "systemctl suspend";
+ type = types.nullOr types.string;
+
+ description = ''
+ The script to use when nothing has happend for as long as
+ '';
+ };
+
+ killtime = mkOption {
+ default = 20; # default according to `man xautolock`
+ type = types.int;
+
+ description = ''
+ Minutes xautolock waits until it executes the script specified in
+ (Has to be at least 10 minutes)
+ '';
+ };
+
+ extraOptions = mkOption {
+ type = types.listOf types.str;
+ default = [ ];
+ example = [ "-detectsleep" ];
+ description = ''
+ Additional command-line arguments to pass to
+ xautolock.
+ '';
+ };
};
};
config = mkIf cfg.enable {
environment.systemPackages = with pkgs; [ xautolock ];
-
- services.xserver.displayManager.sessionCommands = with builtins; with pkgs; ''
- ${xautolock}/bin/xautolock \
- ${concatStringsSep " \\\n" ([
- "-time ${toString(cfg.time)}"
- "-locker ${cfg.locker}"
- ] ++ optional cfg.enableNotifier (concatStringsSep " " [
- "-notify ${toString(cfg.notify)}"
- "-notifier \"${cfg.notifier}\""
- ]))} &
- '';
+ systemd.user.services.xautolock = {
+ description = "xautolock service";
+ wantedBy = [ "graphical-session.target" ];
+ partOf = [ "graphical-session.target" ];
+ serviceConfig = with lib; {
+ ExecStart = strings.concatStringsSep " " ([
+ "${pkgs.xautolock}/bin/xautolock"
+ "-noclose"
+ "-time ${toString cfg.time}"
+ "-locker '${cfg.locker}'"
+ ] ++ optionals cfg.enableNotifier [
+ "-notify ${toString cfg.notify}"
+ "-notifier '${cfg.notifier}'"
+ ] ++ optionals (cfg.nowlocker != null) [
+ "-nowlocker '${cfg.nowlocker}'"
+ ] ++ optionals (cfg.killer != null) [
+ "-killer '${cfg.killer}'"
+ "-killtime ${toString cfg.killtime}"
+ ] ++ cfg.extraOptions);
+ Restart = "always";
+ };
+ };
+ assertions = [
+ {
+ assertion = cfg.enableNotifier -> cfg.notifier != null;
+ message = "When enabling the notifier for xautolock, you also need to specify the notify script";
+ }
+ {
+ assertion = cfg.killer != null -> cfg.killtime >= 10;
+ message = "killtime has to be at least 10 minutes according to `man xautolock`";
+ }
+ ];
};
}
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index 3ce124d3da27e60f3da4c4ae430cf8b182148eea..d4fe475690ce9e92ecc7ac801f19a20a99182669 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -480,6 +480,15 @@ in
'';
};
+ verbose = mkOption {
+ type = types.nullOr types.int;
+ default = 3;
+ example = 7;
+ description = ''
+ Controls verbosity of X logging.
+ '';
+ };
+
useGlamor = mkOption {
type = types.bool;
default = false;
@@ -631,10 +640,11 @@ in
[ "-config ${configFile}"
"-xkbdir" "${cfg.xkbDir}"
# Log at the default verbosity level to stderr rather than /var/log/X.*.log.
- "-verbose" "3" "-logfile" "/dev/null"
+ "-logfile" "/dev/null"
] ++ optional (cfg.display != null) ":${toString cfg.display}"
++ optional (cfg.tty != null) "vt${toString cfg.tty}"
++ optional (cfg.dpi != null) "-dpi ${toString cfg.dpi}"
+ ++ optional (cfg.verbose != null) "-verbose ${toString cfg.verbose}"
++ optional (!cfg.enableTCP) "-nolisten tcp"
++ optional (cfg.autoRepeatDelay != null) "-ardelay ${toString cfg.autoRepeatDelay}"
++ optional (cfg.autoRepeatInterval != null) "-arinterval ${toString cfg.autoRepeatInterval}"
diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl
index 88e7847cf8c8fb9affe8fbe1ce02042e3151cbbf..29cc60b00324bba20e93f135ac876e02f79f060b 100644
--- a/nixos/modules/system/activation/switch-to-configuration.pl
+++ b/nixos/modules/system/activation/switch-to-configuration.pl
@@ -147,11 +147,16 @@ my $activePrev = getActiveUnits;
while (my ($unit, $state) = each %{$activePrev}) {
my $baseUnit = $unit;
- # Recognise template instances.
- $baseUnit = "$1\@.$2" if $unit =~ /^(.*)@[^\.]*\.(.*)$/;
my $prevUnitFile = "/etc/systemd/system/$baseUnit";
my $newUnitFile = "$out/etc/systemd/system/$baseUnit";
+ # Detect template instances.
+ if (!-e $prevUnitFile && !-e $newUnitFile && $unit =~ /^(.*)@[^\.]*\.(.*)$/) {
+ $baseUnit = "$1\@.$2";
+ $prevUnitFile = "/etc/systemd/system/$baseUnit";
+ $newUnitFile = "$out/etc/systemd/system/$baseUnit";
+ }
+
my $baseName = $baseUnit;
$baseName =~ s/\.[a-z]*$//;
diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix
index cf70a891c0ca33f12870cd53f040eeffe0eb430f..4db9631743e3b5a92766a9d020d59362bd8ec8f1 100644
--- a/nixos/modules/system/boot/kernel.nix
+++ b/nixos/modules/system/boot/kernel.nix
@@ -193,11 +193,6 @@ in
"sd_mod"
"sr_mod"
- # Standard IDE stuff.
- "ide_cd"
- "ide_disk"
- "ide_generic"
-
# SD cards and internal eMMC drives.
"mmc_block"
@@ -211,21 +206,11 @@ in
"xhci_hcd"
"xhci_pci"
"usbhid"
- "hid_generic" "hid_lenovo"
- "hid_apple" "hid_logitech_dj" "hid_lenovo_tpkbd" "hid_roccat"
+ "hid_generic" "hid_lenovo" "hid_apple" "hid_roccat"
# Misc. keyboard stuff.
"pcips2" "atkbd" "i8042"
- # Temporary fix for https://github.com/NixOS/nixpkgs/issues/18451
- # Remove as soon as upstream gets fixed - marking it:
- # TODO
- # FIXME
- "i8042"
-
- # To wait for SCSI devices to appear.
- "scsi_wait_scan"
-
# Needed by the stage 2 init script.
"rtc_cmos"
];
diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index 1edb9e0d229b3379a6d73cda51296d406f17603d..cc03e54ead63184ee2dd4075513b4ccfd030d91d 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -121,8 +121,8 @@ sub GetFs {
my $device = $fields[$n + 1];
my @superOptions = split /,/, $fields[$n + 2];
- # Skip the read-only bind-mount on /nix/store.
- next if $mountPoint eq "/nix/store" && (grep { $_ eq "rw" } @superOptions) && (grep { $_ eq "ro" } @mountOptions);
+ # Skip the bind-mount on /nix/store.
+ next if $mountPoint eq "/nix/store" && (grep { $_ eq "rw" } @superOptions);
# Skip mount point generated by systemd-efi-boot-generator?
next if $fsType eq "autofs";
@@ -197,7 +197,7 @@ sub GrubFs {
if ($status != 0) {
die "Failed to retrieve subvolume info for @{[$fs->mount]}\n";
}
- my @ids = join("", @id_info) =~ m/Subvolume ID:[ \t\n]*([^ \t\n]*)/;
+ my @ids = join("\n", @id_info) =~ m/^(?!\/\n).*Subvolume ID:[ \t\n]*([0-9]+)/s;
if ($#ids > 0) {
die "Btrfs subvol name for @{[$fs->device]} listed multiple times in mount\n"
} elsif ($#ids == 0) {
diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
index 779005c0df52fb29856b989cb1b9634bbb4416f5..3333569c36bec059ac1f6511859b96b644db5b9a 100644
--- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
+++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
@@ -12,6 +12,9 @@ import warnings
import ctypes
libc = ctypes.CDLL("libc.so.6")
import re
+import datetime
+import glob
+import os.path
def copy_if_not_exists(source, dest):
if not os.path.exists(dest):
@@ -24,7 +27,7 @@ def system_dir(profile, generation):
return "/nix/var/nix/profiles/system-%d-link" % (generation)
BOOT_ENTRY = """title NixOS{profile}
-version Generation {generation}
+version Generation {generation} {description}
linux {kernel}
initrd {initrd}
options {kernel_params}
@@ -54,6 +57,26 @@ def copy_from_profile(profile, generation, name, dry_run=False):
copy_if_not_exists(store_file_path, "@efiSysMountPoint@%s" % (efi_file_path))
return efi_file_path
+def describe_generation(generation_dir):
+ try:
+ with open("%s/nixos-version" % generation_dir) as f:
+ nixos_version = f.read()
+ except IOError:
+ nixos_version = "Unknown"
+
+ kernel_dir = os.path.dirname(os.path.realpath("%s/kernel" % generation_dir))
+ module_dir = glob.glob("%s/lib/modules/*" % kernel_dir)[0]
+ kernel_version = os.path.basename(module_dir)
+
+ build_time = int(os.path.getctime(generation_dir))
+ build_date = datetime.datetime.fromtimestamp(build_time).strftime('%F')
+
+ description = "NixOS {}, Linux Kernel {}, Built on {}".format(
+ nixos_version, kernel_version, build_date
+ )
+
+ return description
+
def write_entry(profile, generation, machine_id):
kernel = copy_from_profile(profile, generation, "kernel")
initrd = copy_from_profile(profile, generation, "initrd")
@@ -69,6 +92,7 @@ def write_entry(profile, generation, machine_id):
generation_dir = os.readlink(system_dir(profile, generation))
tmp_path = "%s.tmp" % (entry_file)
kernel_params = "systemConfig=%s init=%s/init " % (generation_dir, generation_dir)
+
with open("%s/kernel-params" % (generation_dir)) as params_file:
kernel_params = kernel_params + params_file.read()
with open(tmp_path, 'w') as f:
@@ -76,7 +100,8 @@ def write_entry(profile, generation, machine_id):
generation=generation,
kernel=kernel,
initrd=initrd,
- kernel_params=kernel_params))
+ kernel_params=kernel_params,
+ description=describe_generation(generation_dir)))
if machine_id is not None:
f.write("machine-id %s\n" % machine_id)
os.rename(tmp_path, entry_file)
diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix
index 3ca679b479a0feffb88a5dd1bbcbdb506b678234..06f004fb06ecc2a9c79d0f6e94630b6f02747a56 100644
--- a/nixos/modules/system/boot/luksroot.nix
+++ b/nixos/modules/system/boot/luksroot.nix
@@ -235,6 +235,16 @@ in
'';
};
+ boot.initrd.luks.forceLuksSupportInInitrd = mkOption {
+ type = types.bool;
+ default = false;
+ internal = true;
+ description = ''
+ Whether to configure luks support in the initrd, when no luks
+ devices are configured.
+ '';
+ };
+
boot.initrd.luks.devices = mkOption {
default = { };
example = { "luksroot".device = "/dev/disk/by-uuid/430e9eff-d852-4f68-aa3b-2fa3599ebe08"; };
@@ -417,7 +427,7 @@ in
};
};
- config = mkIf (luks.devices != {}) {
+ config = mkIf (luks.devices != {} || luks.forceLuksSupportInInitrd) {
# actually, sbp2 driver is the one enabling the DMA attack, but this needs to be tested
boot.blacklistedKernelModules = optionals luks.mitigateDMAAttacks
diff --git a/nixos/modules/system/boot/plymouth.nix b/nixos/modules/system/boot/plymouth.nix
index d45b1686c1ea7d49d754b7fef859d386f8eb6ac9..4b0c498424b53a7c3a856c0b3e0df3dd780469a2 100644
--- a/nixos/modules/system/boot/plymouth.nix
+++ b/nixos/modules/system/boot/plymouth.nix
@@ -72,7 +72,7 @@ in
environment.systemPackages = [ plymouth ];
environment.etc."plymouth/plymouthd.conf".source = configFile;
- environment.etc."plymouth/plymouthd.defaults".source = "${plymouth}/share/plymouth/plymouth.defaults";
+ environment.etc."plymouth/plymouthd.defaults".source = "${plymouth}/share/plymouth/plymouthd.defaults";
environment.etc."plymouth/logo.png".source = cfg.logo;
environment.etc."plymouth/themes".source = "${themesEnv}/share/plymouth/themes";
# XXX: Needed because we supply a different set of plugins in initrd.
@@ -97,12 +97,26 @@ in
moduleName="$(sed -n 's,ModuleName *= *,,p' ${themesEnv}/share/plymouth/themes/${cfg.theme}/${cfg.theme}.plymouth)"
mkdir -p $out/lib/plymouth/renderers
- cp ${plymouth}/lib/plymouth/{text,details,$moduleName}.so $out/lib/plymouth
+ # module might come from a theme
+ cp ${themesEnv}/lib/plymouth/{text,details,$moduleName}.so $out/lib/plymouth
cp ${plymouth}/lib/plymouth/renderers/{drm,frame-buffer}.so $out/lib/plymouth/renderers
mkdir -p $out/share/plymouth/themes
cp ${plymouth}/share/plymouth/plymouthd.defaults $out/share/plymouth
- cp -r ${themesEnv}/share/plymouth/themes/{text,details,${cfg.theme}} $out/share/plymouth/themes
+
+ # copy themes into working directory for patching
+ mkdir themes
+ # use -L to copy the directories proper, not the symlinks to them
+ cp -r -L ${themesEnv}/share/plymouth/themes/{text,details,${cfg.theme}} themes
+
+ # patch out any attempted references to the theme or plymouth's themes directory
+ chmod -R +w themes
+ find themes -type f | while read file
+ do
+ sed -i "s,/nix/.*/share/plymouth/themes,$out/share/plymouth/themes,g" $file
+ done
+
+ cp -r themes/* $out/share/plymouth/themes
cp ${cfg.logo} $out/share/plymouth/logo.png
'';
diff --git a/nixos/modules/system/boot/resolved.nix b/nixos/modules/system/boot/resolved.nix
index a3fb733c289da9e2cb81591272b69c3e8b999938..2147d43c4f19a807830083cebe4af819bbb29284 100644
--- a/nixos/modules/system/boot/resolved.nix
+++ b/nixos/modules/system/boot/resolved.nix
@@ -31,8 +31,15 @@ in
example = [ "example.com" ];
type = types.listOf types.str;
description = ''
- A list of domains. These domains are used as search suffixes when resolving single-label host names (domain names which contain no dot), in order to qualify them into fully-qualified domain names (FQDNs).
- For compatibility reasons, if this setting is not specified, the search domains listed in /etc/resolv.conf are used instead, if that file exists and any domains are configured in it.
+ A list of domains. These domains are used as search suffixes
+ when resolving single-label host names (domain names which
+ contain no dot), in order to qualify them into fully-qualified
+ domain names (FQDNs).
+
+ For compatibility reasons, if this setting is not specified,
+ the search domains listed in
+ /etc/resolv.conf are used instead, if
+ that file exists and any domains are configured in it.
'';
};
@@ -41,10 +48,30 @@ in
example = "false";
type = types.enum [ "true" "resolve" "false" ];
description = ''
- Controls Link-Local Multicast Name Resolution support (RFC 4794) on the local host.
- If true, enables full LLMNR responder and resolver support.
- If false, disables both.
- If set to "resolve", only resolution support is enabled, but responding is disabled.
+ Controls Link-Local Multicast Name Resolution support
+ (RFC 4795) on the local host.
+
+ If set to
+
+
+ "true"
+
+ Enables full LLMNR responder and resolver support.
+
+
+
+ "false"
+
+ Disables both.
+
+
+
+ "resolve"
+
+ Only resolution support is enabled, but responding is disabled.
+
+
+
'';
};
@@ -53,9 +80,36 @@ in
example = "true";
type = types.enum [ "true" "allow-downgrade" "false" ];
description = ''
- If true all DNS lookups are DNSSEC-validated locally (excluding LLMNR and Multicast DNS). Note that this mode requires a DNS server that supports DNSSEC. If the DNS server does not properly support DNSSEC all validations will fail.
- If set to "allow-downgrade" DNSSEC validation is attempted, but if the server does not support DNSSEC properly, DNSSEC mode is automatically disabled. Note that this mode makes DNSSEC validation vulnerable to "downgrade" attacks, where an attacker might be able to trigger a downgrade to non-DNSSEC mode by synthesizing a DNS response that suggests DNSSEC was not supported.
- If set to false, DNS lookups are not DNSSEC validated.
+ If set to
+
+
+ "true"
+
+ all DNS lookups are DNSSEC-validated locally (excluding
+ LLMNR and Multicast DNS). Note that this mode requires a
+ DNS server that supports DNSSEC. If the DNS server does
+ not properly support DNSSEC all validations will fail.
+
+
+
+ "allow-downgrade"
+
+ DNSSEC validation is attempted, but if the server does not
+ support DNSSEC properly, DNSSEC mode is automatically
+ disabled. Note that this mode makes DNSSEC validation
+ vulnerable to "downgrade" attacks, where an attacker might
+ be able to trigger a downgrade to non-DNSSEC mode by
+ synthesizing a DNS response that suggests DNSSEC was not
+ supported.
+
+
+
+ "false"
+
+ DNS lookups are not DNSSEC validated.
+
+
+
'';
};
diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh
index 1f4ab3eae07e86f7702380431ec6b406aa1f9561..b442386914ad5b3a2b37da465aee83f2fefcd945 100644
--- a/nixos/modules/system/boot/stage-1-init.sh
+++ b/nixos/modules/system/boot/stage-1-init.sh
@@ -221,6 +221,9 @@ checkFS() {
# Don't check resilient COWs as they validate the fs structures at mount time
if [ "$fsType" = btrfs -o "$fsType" = zfs ]; then return 0; fi
+ # Skip fsck for bcachefs - not implemented yet.
+ if [ "$fsType" = bcachefs ]; then return 0; fi
+
# Skip fsck for inherently readonly filesystems.
if [ "$fsType" = squashfs ]; then return 0; fi
diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix
index 9be10a8283ed0ab83d94542fd03301e33bf1008b..43a9c28bb69404491c1e3ceb418460a72d06492a 100644
--- a/nixos/modules/system/boot/systemd-unit-options.nix
+++ b/nixos/modules/system/boot/systemd-unit-options.nix
@@ -35,21 +35,40 @@ in rec {
description = ''
If set to false, this unit will be a symlink to
/dev/null. This is primarily useful to prevent specific
- template instances (e.g. serial-getty@ttyS0)
- from being started.
+ template instances
+ (e.g. serial-getty@ttyS0) from being
+ started. Note that enable=true does not
+ make a unit start by default at boot; if you want that, see
+ wantedBy.
'';
};
requiredBy = mkOption {
default = [];
type = types.listOf types.str;
- description = "Units that require (i.e. depend on and need to go down with) this unit.";
+ description = ''
+ Units that require (i.e. depend on and need to go down with)
+ this unit. The discussion under wantedBy
+ applies here as well: inverse .requires
+ symlinks are established.
+ '';
};
wantedBy = mkOption {
default = [];
type = types.listOf types.str;
- description = "Units that want (i.e. depend on) this unit.";
+ description = ''
+ Units that want (i.e. depend on) this unit. The standard way
+ to make a unit start by default at boot is to set this option
+ to [ "multi-user.target" ]. That's despite
+ the fact that the systemd.unit(5) manpage says this option
+ goes in the [Install] section that controls
+ the behaviour of systemctl enable. Since
+ such a process is stateful and thus contrary to the design of
+ NixOS, setting this option instead causes the equivalent
+ inverse .wants symlink to be present,
+ establishing the same desired relationship in a stateless way.
+ '';
};
aliases = mkOption {
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index d12d0a06f44451a5c4eda2d259cc4c067531c943..dd9ba7104485854391b1ade5fe5bbe1cf2a15f91 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -639,11 +639,7 @@ in
Rules for creating and cleaning up temporary files
automatically. See
tmpfiles.d5
- for the exact format. You should not use this option to create
- files required by systemd services, since there is no
- guarantee that systemd-tmpfiles runs when
- the system is reconfigured using
- nixos-rebuild.
+ for the exact format.
'';
};
@@ -879,7 +875,12 @@ in
systemd.services.systemd-remount-fs.restartIfChanged = false;
systemd.services.systemd-update-utmp.restartIfChanged = false;
systemd.services.systemd-user-sessions.restartIfChanged = false; # Restart kills all active sessions.
- systemd.services.systemd-logind.restartTriggers = [ config.environment.etc."systemd/logind.conf".source ];
+ # Restarting systemd-logind breaks X11
+ # - upstream commit: https://cgit.freedesktop.org/xorg/xserver/commit/?id=dc48bd653c7e101
+ # - systemd announcement: https://github.com/systemd/systemd/blob/22043e4317ecd2bc7834b48a6d364de76bb26d91/NEWS#L103-L112
+ # - this might be addressed in the future by xorg
+ #systemd.services.systemd-logind.restartTriggers = [ config.environment.etc."systemd/logind.conf".source ];
+ systemd.services.systemd-logind.restartIfChanged = false;
systemd.services.systemd-logind.stopIfChanged = false;
systemd.services.systemd-journald.restartTriggers = [ config.environment.etc."systemd/journald.conf".source ];
systemd.services.systemd-journald.stopIfChanged = false;
diff --git a/nixos/modules/tasks/encrypted-devices.nix b/nixos/modules/tasks/encrypted-devices.nix
index b1a7711ddcb4d1507ab58860fb6db1e69694d6a9..da0c9408d891938f320b6d41e3b6c00bc4b217db 100644
--- a/nixos/modules/tasks/encrypted-devices.nix
+++ b/nixos/modules/tasks/encrypted-devices.nix
@@ -36,7 +36,7 @@ let
keyFile = mkOption {
default = null;
- example = "/root/.swapkey";
+ example = "/mnt-root/root/.swapkey";
type = types.nullOr types.str;
description = "File system location of keyfile. This unlocks the drive after the root has been mounted to /mnt-root.";
};
@@ -56,11 +56,18 @@ in
};
config = mkIf anyEncrypted {
+ assertions = map (dev: {
+ assertion = dev.encrypted.label != null;
+ message = ''
+ The filesystem for ${dev.mountPoint} has encrypted.enable set to true, but no encrypted.label set
+ '';
+ }) encDevs;
+
boot.initrd = {
luks = {
devices =
map (dev: { name = dev.encrypted.label; device = dev.encrypted.blkDev; } ) keylessEncDevs;
- cryptoModules = [ "aes" "sha256" "sha1" "xts" ];
+ forceLuksSupportInInitrd = true;
};
postMountCommands =
concatMapStrings (dev: "cryptsetup luksOpen --key-file ${dev.encrypted.keyFile} ${dev.encrypted.blkDev} ${dev.encrypted.label};\n") keyedEncDevs;
diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix
index 3951d617f6f1711d67a43229be29dfd3a8c29b91..b3690fad1a6a286c23c0f1df591ed973ac452755 100644
--- a/nixos/modules/tasks/filesystems.nix
+++ b/nixos/modules/tasks/filesystems.nix
@@ -115,11 +115,18 @@ let
};
- config = {
+ config = let
+ defaultFormatOptions =
+ # -F needed to allow bare block device without partitions
+ if (builtins.substring 0 3 config.fsType) == "ext" then "-F"
+ # -q needed for non-interactive operations
+ else if config.fsType == "jfs" then "-q"
+ # (same here)
+ else if config.fsType == "reiserfs" then "-q"
+ else null;
+ in {
options = mkIf config.autoResize [ "x-nixos.autoresize" ];
-
- # -F needed to allow bare block device without partitions
- formatOptions = mkIf ((builtins.substring 0 3 config.fsType) == "ext") (mkDefault "-F");
+ formatOptions = mkIf (defaultFormatOptions != null) (mkDefault defaultFormatOptions);
};
};
@@ -217,7 +224,7 @@ in
# Add the mount helpers to the system path so that `mount' can find them.
system.fsPackages = [ pkgs.dosfstools ];
- environment.systemPackages = [ pkgs.fuse ] ++ config.system.fsPackages;
+ environment.systemPackages = with pkgs; [ fuse3 fuse ] ++ config.system.fsPackages;
environment.etc.fstab.text =
let
@@ -294,7 +301,7 @@ in
"/run" = { fsType = "tmpfs"; options = [ "nosuid" "nodev" "strictatime" "mode=755" "size=${config.boot.runSize}" ]; };
"/dev" = { fsType = "devtmpfs"; options = [ "nosuid" "strictatime" "mode=755" "size=${config.boot.devSize}" ]; };
"/dev/shm" = { fsType = "tmpfs"; options = [ "nosuid" "nodev" "strictatime" "mode=1777" "size=${config.boot.devShmSize}" ]; };
- "/dev/pts" = { fsType = "devpts"; options = [ "nosuid" "noexec" "mode=620" "gid=${toString config.ids.gids.tty}" ]; };
+ "/dev/pts" = { fsType = "devpts"; options = [ "nosuid" "noexec" "mode=620" "ptmxmode=0666" "gid=${toString config.ids.gids.tty}" ]; };
# To hold secrets that shouldn't be written to disk (generally used for NixOps, harmless elsewhere)
"/run/keys" = { fsType = "ramfs"; options = [ "nosuid" "nodev" "mode=750" "gid=${toString config.ids.gids.keys}" ]; };
diff --git a/nixos/modules/tasks/filesystems/bcachefs.nix b/nixos/modules/tasks/filesystems/bcachefs.nix
new file mode 100644
index 0000000000000000000000000000000000000000..227707173a3df0fbf7c7a82064067808531dceb6
--- /dev/null
+++ b/nixos/modules/tasks/filesystems/bcachefs.nix
@@ -0,0 +1,26 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+ inInitrd = any (fs: fs == "bcachefs") config.boot.initrd.supportedFilesystems;
+
+in
+
+{
+ config = mkIf (any (fs: fs == "bcachefs") config.boot.supportedFilesystems) {
+
+ system.fsPackages = [ pkgs.bcachefs-tools ];
+
+ # use kernel package with bcachefs support until it's in mainline
+ boot.kernelPackages = pkgs.linuxPackages_testing_bcachefs;
+ boot.initrd.availableKernelModules = mkIf inInitrd [ "bcachefs" ];
+
+ boot.initrd.extraUtilsCommands = mkIf inInitrd
+ ''
+ copy_bin_and_libs ${pkgs.bcachefs-tools}/bin/fsck.bcachefs
+ '';
+
+ };
+}
diff --git a/nixos/modules/tasks/filesystems/ecryptfs.nix b/nixos/modules/tasks/filesystems/ecryptfs.nix
new file mode 100644
index 0000000000000000000000000000000000000000..12a407cabbfb03dd22c463ab0e40b8ccd1130205
--- /dev/null
+++ b/nixos/modules/tasks/filesystems/ecryptfs.nix
@@ -0,0 +1,14 @@
+{ config, lib, pkgs, ... }:
+# TODO: make ecryptfs work in initramfs?
+
+with lib;
+
+{
+ config = mkIf (any (fs: fs == "ecryptfs") config.boot.supportedFilesystems) {
+ system.fsPackages = [ pkgs.ecryptfs ];
+ security.wrappers = {
+ "mount.ecryptfs_private".source = "${pkgs.ecryptfs.out}/bin/mount.ecryptfs_private";
+ "umount.ecryptfs_private".source = "${pkgs.ecryptfs.out}/bin/umount.ecryptfs_private";
+ };
+ };
+}
diff --git a/nixos/modules/tasks/filesystems/ext.nix b/nixos/modules/tasks/filesystems/ext.nix
index cc9d0ef37d5954ccc43659089fb6154654a3638b..3a8999c242bdcbe58b9f0697cace66d21fef17fb 100644
--- a/nixos/modules/tasks/filesystems/ext.nix
+++ b/nixos/modules/tasks/filesystems/ext.nix
@@ -5,7 +5,8 @@
system.fsPackages = [ pkgs.e2fsprogs ];
- boot.initrd.availableKernelModules = [ "ext2" "ext3" "ext4" ];
+ # As of kernel 4.3, there is no separate ext3 driver (they're also handled by ext4.ko)
+ boot.initrd.availableKernelModules = [ "ext2" "ext4" ];
boot.initrd.extraUtilsCommands =
''
diff --git a/nixos/modules/tasks/filesystems/nfs.nix b/nixos/modules/tasks/filesystems/nfs.nix
index 73cf18384bd48fcc7265235b9dd47a69e6275727..d3a558738f4b75ae45c01c101779b1c98c70e072 100644
--- a/nixos/modules/tasks/filesystems/nfs.nix
+++ b/nixos/modules/tasks/filesystems/nfs.nix
@@ -85,8 +85,14 @@ in
enable = mkDefault false;
};
+ systemd.services.auth-rpcgss-module =
+ {
+ unitConfig.ConditionPathExists = [ "" "/etc/krb5.keytab" ];
+ };
+
systemd.services.rpc-gssd =
{ restartTriggers = [ nfsConfFile ];
+ unitConfig.ConditionPathExists = [ "" "/etc/krb5.keytab" ];
};
systemd.services.rpc-statd =
diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix
index f300091b11ee1caf356354f8dfb46b1c569ff306..7fee99115329fc90d7e330ba6327b6379b529164 100644
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
@@ -24,7 +24,11 @@ let
kernel = config.boot.kernelPackages;
- packages = {
+ packages = if config.boot.zfs.enableUnstable then {
+ spl = kernel.splUnstable;
+ zfs = kernel.zfsUnstable;
+ zfsUser = pkgs.zfsUnstable;
+ } else {
spl = kernel.spl;
zfs = kernel.zfs;
zfsUser = pkgs.zfs;
@@ -58,6 +62,19 @@ in
options = {
boot.zfs = {
+ enableUnstable = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Use the unstable zfs package. This might be an option, if the latest
+ kernel is not yet supported by a published release of ZFS. Enabling
+ this option will install a development version of ZFS on Linux. The
+ version will have already passed an extensive test suite, but it is
+ more likely to hit an undiscovered bug compared to running a released
+ version of ZFS on Linux.
+ '';
+ };
+
extraPools = mkOption {
type = types.listOf types.str;
default = [];
@@ -123,6 +140,17 @@ in
this once.
'';
};
+
+ requestEncryptionCredentials = mkOption {
+ type = types.bool;
+ default = config.boot.zfs.enableUnstable;
+ description = ''
+ Request encryption keys or passwords for all encrypted datasets on import.
+
+ Dataset encryption is only supported in zfsUnstable at the moment.
+ '';
+ };
+
};
services.zfs.autoSnapshot = {
@@ -246,6 +274,10 @@ in
assertion = !cfgZfs.forceImportAll || cfgZfs.forceImportRoot;
message = "If you enable boot.zfs.forceImportAll, you must also enable boot.zfs.forceImportRoot";
}
+ {
+ assertion = cfgZfs.requestEncryptionCredentials -> cfgZfs.enableUnstable;
+ message = "This feature is only available for zfs unstable. Set the NixOS option boot.zfs.enableUnstable.";
+ }
];
boot = {
@@ -289,6 +321,9 @@ in
done
echo
if [[ -n "$msg" ]]; then echo "$msg"; fi
+ ${lib.optionalString cfgZfs.requestEncryptionCredentials ''
+ zfs load-key -a
+ ''}
'') rootPools));
};
diff --git a/nixos/modules/tasks/kbd.nix b/nixos/modules/tasks/kbd.nix
index 3975dd5b0ffd9f69bd20ae427c1735a71c957c4f..7fb3cbc5c1bc16f756e8531114cb5968b0709f86 100644
--- a/nixos/modules/tasks/kbd.nix
+++ b/nixos/modules/tasks/kbd.nix
@@ -98,22 +98,10 @@ in
'') config.i18n.consoleColors}
'';
- /* XXX: systemd-vconsole-setup needs a "main" terminal. By default
- * /dev/tty0 is used which wouldn't work when the service is restarted
- * from X11. We set this to /dev/tty1; not ideal because it may also be
- * owned by X11 or something else.
- *
- * See #22470.
- */
systemd.services."systemd-vconsole-setup" =
- { wantedBy = [ "sysinit.target" ];
- before = [ "display-manager.service" ];
+ { before = [ "display-manager.service" ];
after = [ "systemd-udev-settle.service" ];
restartTriggers = [ vconsoleConf kbdEnv ];
- serviceConfig.ExecStart = [
- ""
- "${pkgs.systemd}/lib/systemd/systemd-vconsole-setup /dev/tty1"
- ];
};
}
diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix
index f6f104ce7a682d4370bd13c44c8ca101b3e4ac79..1f424f84c6e0124aca5d77520326584be7c5ba13 100644
--- a/nixos/modules/tasks/network-interfaces-scripted.nix
+++ b/nixos/modules/tasks/network-interfaces-scripted.nix
@@ -9,6 +9,12 @@ let
interfaces = attrValues cfg.interfaces;
hasVirtuals = any (i: i.virtual) interfaces;
+ slaves = concatMap (i: i.interfaces) (attrValues cfg.bonds)
+ ++ concatMap (i: i.interfaces) (attrValues cfg.bridges)
+ ++ concatMap (i: i.interfaces) (attrValues cfg.vswitches)
+ ++ concatMap (i: [i.interface]) (attrValues cfg.macvlans)
+ ++ concatMap (i: [i.interface]) (attrValues cfg.vlans);
+
# We must escape interfaces due to the systemd interpretation
subsystemDevice = interface:
"sys-subsystem-net-devices-${escapeSystemdPath interface}.device";
@@ -71,7 +77,10 @@ let
(hasAttr dev cfg.vswitches) ||
(hasAttr dev cfg.wlanInterfaces)
then [ "${dev}-netdev.service" ]
- else optional (dev != null && !config.boot.isContainer) (subsystemDevice dev);
+ else optional (dev != null && dev != "lo" && !config.boot.isContainer) (subsystemDevice dev);
+
+ hasDefaultGatewaySet = (cfg.defaultGateway != null && cfg.defaultGateway.address != "")
+ || (cfg.defaultGateway6 != null && cfg.defaultGateway6.address != "");
networkLocalCommands = {
after = [ "network-setup.service" ];
@@ -84,8 +93,9 @@ let
after = [ "network-pre.target" "systemd-udevd.service" "systemd-sysctl.service" ];
before = [ "network.target" "shutdown.target" ];
wants = [ "network.target" ];
+ partOf = map (i: "network-addresses-${i.name}.service") interfaces;
conflicts = [ "shutdown.target" ];
- wantedBy = [ "multi-user.target" ];
+ wantedBy = [ "multi-user.target" ] ++ optional hasDefaultGatewaySet "network-online.target";
unitConfig.ConditionCapability = "CAP_NET_ADMIN";
@@ -113,24 +123,32 @@ let
# Set the default gateway.
${optionalString (cfg.defaultGateway != null && cfg.defaultGateway.address != "") ''
- # FIXME: get rid of "|| true" (necessary to make it idempotent).
- ip route add default ${optionalString (cfg.defaultGateway.metric != null)
+ ${optionalString (cfg.defaultGateway.interface != null) ''
+ ip route replace ${cfg.defaultGateway.address} dev ${cfg.defaultGateway.interface} ${optionalString (cfg.defaultGateway.metric != null)
+ "metric ${toString cfg.defaultGateway.metric}"
+ } proto static
+ ''}
+ ip route replace default ${optionalString (cfg.defaultGateway.metric != null)
"metric ${toString cfg.defaultGateway.metric}"
} via "${cfg.defaultGateway.address}" ${
optionalString (cfg.defaultGatewayWindowSize != null)
"window ${toString cfg.defaultGatewayWindowSize}"} ${
optionalString (cfg.defaultGateway.interface != null)
- "dev ${cfg.defaultGateway.interface}"} proto static || true
+ "dev ${cfg.defaultGateway.interface}"} proto static
''}
${optionalString (cfg.defaultGateway6 != null && cfg.defaultGateway6.address != "") ''
- # FIXME: get rid of "|| true" (necessary to make it idempotent).
- ip -6 route add ::/0 ${optionalString (cfg.defaultGateway6.metric != null)
+ ${optionalString (cfg.defaultGateway6.interface != null) ''
+ ip -6 route replace ${cfg.defaultGateway6.address} dev ${cfg.defaultGateway6.interface} ${optionalString (cfg.defaultGateway6.metric != null)
+ "metric ${toString cfg.defaultGateway6.metric}"
+ } proto static
+ ''}
+ ip -6 route replace default ${optionalString (cfg.defaultGateway6.metric != null)
"metric ${toString cfg.defaultGateway6.metric}"
} via "${cfg.defaultGateway6.address}" ${
optionalString (cfg.defaultGatewayWindowSize != null)
"window ${toString cfg.defaultGatewayWindowSize}"} ${
optionalString (cfg.defaultGateway6.interface != null)
- "dev ${cfg.defaultGateway6.interface}"} proto static || true
+ "dev ${cfg.defaultGateway6.interface}"} proto static
''}
'';
};
@@ -149,9 +167,11 @@ let
in
nameValuePair "network-addresses-${i.name}"
{ description = "Address configuration of ${i.name}";
- wantedBy = [ "network-setup.service" ];
- # propagate stop and reload from network-setup
- partOf = [ "network-setup.service" ];
+ wantedBy = [
+ "network-setup.service"
+ "network-link-${i.name}.service"
+ "network.target"
+ ];
# order before network-setup because the routes that are configured
# there may need ip addresses configured
before = [ "network-setup.service" ];
@@ -203,7 +223,7 @@ let
after = [ "dev-net-tun.device" "network-pre.target" ];
wantedBy = [ "network-setup.service" (subsystemDevice i.name) ];
partOf = [ "network-setup.service" ];
- before = [ "network-setup.service" (subsystemDevice i.name) ];
+ before = [ "network-setup.service" ];
path = [ pkgs.iproute ];
serviceConfig = {
Type = "oneshot";
@@ -229,7 +249,7 @@ let
partOf = [ "network-setup.service" ] ++ optional v.rstp "mstpd.service";
after = [ "network-pre.target" ] ++ deps ++ optional v.rstp "mstpd.service"
++ concatMap (i: [ "network-addresses-${i}.service" "network-link-${i}.service" ]) v.interfaces;
- before = [ "network-setup.service" (subsystemDevice n) ];
+ before = [ "network-setup.service" ];
serviceConfig.Type = "oneshot";
serviceConfig.RemainAfterExit = true;
path = [ pkgs.iproute ];
@@ -328,7 +348,7 @@ let
partOf = [ "network-setup.service" ];
after = [ "network-pre.target" ] ++ deps
++ concatMap (i: [ "network-addresses-${i}.service" "network-link-${i}.service" ]) v.interfaces;
- before = [ "network-setup.service" (subsystemDevice n) ];
+ before = [ "network-setup.service" ];
serviceConfig.Type = "oneshot";
serviceConfig.RemainAfterExit = true;
path = [ pkgs.iproute pkgs.gawk ];
@@ -366,7 +386,7 @@ let
bindsTo = deps;
partOf = [ "network-setup.service" ];
after = [ "network-pre.target" ] ++ deps;
- before = [ "network-setup.service" (subsystemDevice n) ];
+ before = [ "network-setup.service" ];
serviceConfig.Type = "oneshot";
serviceConfig.RemainAfterExit = true;
path = [ pkgs.iproute ];
@@ -391,7 +411,7 @@ let
bindsTo = deps;
partOf = [ "network-setup.service" ];
after = [ "network-pre.target" ] ++ deps;
- before = [ "network-setup.service" (subsystemDevice n) ];
+ before = [ "network-setup.service" ];
serviceConfig.Type = "oneshot";
serviceConfig.RemainAfterExit = true;
path = [ pkgs.iproute ];
@@ -419,7 +439,7 @@ let
bindsTo = deps;
partOf = [ "network-setup.service" ];
after = [ "network-pre.target" ] ++ deps;
- before = [ "network-setup.service" (subsystemDevice n) ];
+ before = [ "network-setup.service" ];
serviceConfig.Type = "oneshot";
serviceConfig.RemainAfterExit = true;
path = [ pkgs.iproute ];
@@ -462,5 +482,8 @@ in
config = mkMerge [
bondWarnings
(mkIf (!cfg.useNetworkd) normalConfig)
+ { # Ensure slave interfaces are brought up
+ networking.interfaces = genAttrs slaves (i: {});
+ }
];
}
diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 8ce7b2d2cf369bec2e9d7ded1e6d34043606aba3..b7e85e402aa9e766c13e89175a9b1d69a17c8084 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -923,10 +923,22 @@ in
assertions =
(flip map interfaces (i: {
assertion = i.subnetMask == null;
- message = "The networking.interfaces.${i.name}.subnetMask option is defunct. Use prefixLength instead.";
+ message = ''
+ The networking.interfaces."${i.name}".subnetMask option is defunct. Use prefixLength instead.
+ '';
+ })) ++ (flip map interfaces (i: {
+ # With the linux kernel, interface name length is limited by IFNAMSIZ
+ # to 16 bytes, including the trailing null byte.
+ # See include/linux/if.h in the kernel sources
+ assertion = stringLength i.name < 16;
+ message = ''
+ The name of networking.interfaces."${i.name}" is too long, it needs to be less than 16 characters.
+ '';
})) ++ (flip map slaveIfs (i: {
assertion = i.ip4 == [ ] && i.ipAddress == null && i.ip6 == [ ] && i.ipv6Address == null;
- message = "The networking.interfaces.${i.name} must not have any defined ips when it is a slave.";
+ message = ''
+ The networking.interfaces."${i.name}" must not have any defined ips when it is a slave.
+ '';
})) ++ [
{
assertion = cfg.hostId == null || (stringLength cfg.hostId == 8 && isHexString cfg.hostId);
diff --git a/nixos/modules/tasks/powertop.nix b/nixos/modules/tasks/powertop.nix
index 0ec4974789b4fa80d4b50b19f23e8d38eccde669..609831506e16d346d7c67ba145a9a4c1d24924cc 100644
--- a/nixos/modules/tasks/powertop.nix
+++ b/nixos/modules/tasks/powertop.nix
@@ -16,6 +16,7 @@ in {
powertop = {
wantedBy = [ "multi-user.target" ];
description = "Powertop tunings";
+ path = [ pkgs.kmod ];
serviceConfig = {
Type = "oneshot";
RemainAfterExit = "yes";
diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix
index 3e47710361a8ee19c346a650cef8db259ea4d95c..1eb3ca707afd0ae7cdf82489f4472e5e8d06defb 100644
--- a/nixos/modules/virtualisation/amazon-image.nix
+++ b/nixos/modules/virtualisation/amazon-image.nix
@@ -33,7 +33,7 @@ let cfg = config.ec2; in
config.boot.kernelPackages.ena
];
boot.initrd.kernelModules = [ "xen-blkfront" "xen-netfront" ];
- boot.initrd.availableKernelModules = [ "ixgbevf" "ena" ];
+ boot.initrd.availableKernelModules = [ "ixgbevf" "ena" "nvme" ];
boot.kernelParams = mkIf cfg.hvm [ "console=ttyS0" ];
# Prevent the nouveau kernel module from being loaded, as it
diff --git a/nixos/modules/virtualisation/brightbox-image.nix b/nixos/modules/virtualisation/brightbox-image.nix
index 7f45f0f34f71e71248e287b22942b2feea19a938..08bbcfd9d7c22bd86cd971f9e8f0cb58737b2196 100644
--- a/nixos/modules/virtualisation/brightbox-image.nix
+++ b/nixos/modules/virtualisation/brightbox-image.nix
@@ -33,9 +33,9 @@ in
}
''
# Create partition table
- ${pkgs.parted}/sbin/parted /dev/vda mklabel msdos
- ${pkgs.parted}/sbin/parted /dev/vda mkpart primary ext4 1 ${diskSize}
- ${pkgs.parted}/sbin/parted /dev/vda print
+ ${pkgs.parted}/sbin/parted --script /dev/vda mklabel msdos
+ ${pkgs.parted}/sbin/parted --script /dev/vda mkpart primary ext4 1 ${diskSize}
+ ${pkgs.parted}/sbin/parted --script /dev/vda print
. /sys/class/block/vda1/uevent
mknod /dev/vda1 b $MAJOR $MINOR
diff --git a/nixos/modules/virtualisation/cloud-image.nix b/nixos/modules/virtualisation/cloud-image.nix
deleted file mode 100644
index 0f0141abfb1664874f0a9560ffd90334a17728a8..0000000000000000000000000000000000000000
--- a/nixos/modules/virtualisation/cloud-image.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-# Usage:
-# $ NIX_PATH=`pwd`:nixos-config=`pwd`/nixpkgs/nixos/modules/virtualisation/cloud-image.nix nix-build '' -A config.system.build.cloudImage
-
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
- system.build.cloudImage = import ../../lib/make-disk-image.nix {
- inherit pkgs lib config;
- partitioned = true;
- diskSize = 1 * 1024;
- configFile = pkgs.writeText "configuration.nix"
- ''
- { config, lib, pkgs, ... }:
-
- with lib;
-
- {
- imports = [ ];
- }
- '';
- };
-
- imports = [ ../profiles/qemu-guest.nix ];
-
- fileSystems."/".device = "/dev/disk/by-label/nixos";
-
- boot = {
- kernelParams = [ "console=ttyS0" ];
- loader.grub.device = "/dev/vda";
- loader.timeout = 0;
- };
-
- networking.hostName = mkDefault "";
-
- services.openssh = {
- enable = true;
- permitRootLogin = "without-password";
- passwordAuthentication = mkDefault false;
- };
-
- services.cloud-init.enable = true;
-}
diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 6adb2c1681a20572c25277f938940dc10195d815..e68bfd86060109d678a3b9a98fd1cda9f4ed0126 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -120,7 +120,6 @@ let
# Run systemd-nspawn without startup notification (we'll
# wait for the container systemd to signal readiness).
- EXIT_ON_REBOOT=1 \
exec ${config.systemd.package}/bin/systemd-nspawn \
--keep-unit \
-M "$INSTANCE" -D "$root" $extraFlags \
@@ -538,7 +537,7 @@ in
type = types.bool;
default = false;
description = ''
- Wether the container is automatically started at boot-time.
+ Whether the container is automatically started at boot-time.
'';
};
@@ -596,7 +595,9 @@ in
{ config =
{ config, pkgs, ... }:
{ services.postgresql.enable = true;
- services.postgresql.package = pkgs.postgresql92;
+ services.postgresql.package = pkgs.postgresql96;
+
+ system.stateVersion = "17.03";
};
};
}
diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix
index 5a8a0e27436f1352785123e34f57f18565727970..a9a2095499a731256f48fb578b0d5c3449d80ebd 100644
--- a/nixos/modules/virtualisation/docker.nix
+++ b/nixos/modules/virtualisation/docker.nix
@@ -126,14 +126,23 @@ in
'';
};
};
+
+ package = mkOption {
+ default = pkgs.docker;
+ type = types.package;
+ example = pkgs.docker-edge;
+ description = ''
+ Docker package to be used in the module.
+ '';
+ };
};
###### implementation
config = mkIf cfg.enable (mkMerge [{
- environment.systemPackages = [ pkgs.docker ];
+ environment.systemPackages = [ cfg.package ];
users.extraGroups.docker.gid = config.ids.gids.docker;
- systemd.packages = [ pkgs.docker ];
+ systemd.packages = [ cfg.package ];
systemd.services.docker = {
wantedBy = optional cfg.enableOnBoot "multi-user.target";
@@ -142,7 +151,7 @@ in
ExecStart = [
""
''
- ${pkgs.docker}/bin/dockerd \
+ ${cfg.package}/bin/dockerd \
--group=docker \
--host=fd:// \
--log-driver=${cfg.logDriver} \
@@ -180,7 +189,7 @@ in
serviceConfig.Type = "oneshot";
script = ''
- ${pkgs.docker}/bin/docker system prune -f ${toString cfg.autoPrune.flags}
+ ${cfg.package}/bin/docker system prune -f ${toString cfg.autoPrune.flags}
'';
startAt = optional cfg.autoPrune.enable cfg.autoPrune.dates;
diff --git a/nixos/modules/virtualisation/ec2-amis.nix b/nixos/modules/virtualisation/ec2-amis.nix
index 745518f859725dba14358dcd9dd1faac5fec10dc..14826b6272f7c83cf38f7655a91002314c81258f 100644
--- a/nixos/modules/virtualisation/ec2-amis.nix
+++ b/nixos/modules/virtualisation/ec2-amis.nix
@@ -223,5 +223,21 @@ let self = {
"17.03".us-west-2.hvm-ebs = "ami-a93daac9";
"17.03".us-west-2.hvm-s3 = "ami-5139ae31";
- latest = self."17.03";
+ # 17.09.1483.d0f0657ca0
+ "17.09".eu-west-1.hvm-ebs = "ami-cf33e7b6";
+ "17.09".eu-west-2.hvm-ebs = "ami-7d061419";
+ "17.09".eu-central-1.hvm-ebs = "ami-7548fa1a";
+ "17.09".us-east-1.hvm-ebs = "ami-6f669d15";
+ "17.09".us-east-2.hvm-ebs = "ami-cbe1ccae";
+ "17.09".us-west-1.hvm-ebs = "ami-9d95a5fd";
+ "17.09".us-west-2.hvm-ebs = "ami-d3956fab";
+ "17.09".ca-central-1.hvm-ebs = "ami-ee4ef78a";
+ "17.09".ap-southeast-1.hvm-ebs = "ami-1dfc807e";
+ "17.09".ap-southeast-2.hvm-ebs = "ami-dcb350be";
+ "17.09".ap-northeast-1.hvm-ebs = "ami-00ec3d66";
+ "17.09".ap-northeast-2.hvm-ebs = "ami-1107dd7f";
+ "17.09".sa-east-1.hvm-ebs = "ami-0377086f";
+ "17.09".ap-south-1.hvm-ebs = "ami-4a064625";
+
+ latest = self."17.09";
}; in self
diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix
index 4a8dadaa281d74d4b39df2e2e3fed2402a49e8d6..e3b3e6a5f4ab8735ef38f9cd1ce9e122f60e87d0 100644
--- a/nixos/modules/virtualisation/google-compute-image.nix
+++ b/nixos/modules/virtualisation/google-compute-image.nix
@@ -117,7 +117,7 @@ in
before = ["sshd.service"];
wants = ["local-fs.target" "network-online.target" "network.target"];
wantedBy = [ "sshd.service" "multi-user.target" ];
- path = with pkgs; [ ethtool ];
+ path = with pkgs; [ ethtool openssh ];
serviceConfig = {
ExecStart = "${gce}/bin/google_instance_setup --debug";
Type = "oneshot";
diff --git a/nixos/modules/virtualisation/grow-partition.nix b/nixos/modules/virtualisation/grow-partition.nix
index 5039118d78eeeb22cdc76599c1ce30f39fdbf373..2cb932d208f0f53941dd7c7010a4372b8f5133d2 100644
--- a/nixos/modules/virtualisation/grow-partition.nix
+++ b/nixos/modules/virtualisation/grow-partition.nix
@@ -24,7 +24,12 @@ with lib;
copy_bin_and_libs ${pkgs.gnused}/bin/sed
copy_bin_and_libs ${pkgs.utillinux}/sbin/sfdisk
copy_bin_and_libs ${pkgs.utillinux}/sbin/lsblk
- cp -v ${pkgs.cloud-utils}/bin/.growpart-wrapped $out/bin/growpart
+
+ substitute "${pkgs.cloud-utils}/bin/.growpart-wrapped" "$out/bin/growpart" \
+ --replace "${pkgs.bash}/bin/sh" "/bin/sh" \
+ --replace "awk" "gawk" \
+ --replace "sed" "gnused"
+
ln -s sed $out/bin/gnused
'';
diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix
index ade0ba531cfa5eea2f7df7671136c5fba441a8c3..8aa7ad8e3911cf2c84c0d20880476a350eae4468 100644
--- a/nixos/modules/virtualisation/libvirtd.nix
+++ b/nixos/modules/virtualisation/libvirtd.nix
@@ -102,7 +102,7 @@ in {
config = mkIf cfg.enable {
- environment.systemPackages = with pkgs; [ libvirt netcat-openbsd ];
+ environment.systemPackages = with pkgs; [ libvirt netcat-openbsd qemu_kvm ];
boot.kernelModules = [ "tun" ];
diff --git a/nixos/modules/virtualisation/nova-config.nix b/nixos/modules/virtualisation/nova-config.nix
index aac11ec8a1783efcbea37eb56efe920ee48532ce..c865cf451e405989ba1b6975350d763f1c939ea4 100644
--- a/nixos/modules/virtualisation/nova-config.nix
+++ b/nixos/modules/virtualisation/nova-config.nix
@@ -22,8 +22,13 @@ with lib;
boot.loader.timeout = 0;
# Allow root logins
- services.openssh.enable = true;
- services.openssh.permitRootLogin = "prohibit-password";
+ services.openssh = {
+ enable = true;
+ permitRootLogin = "prohibit-password";
+ passwordAuthentication = mkDefault false;
+ };
+
+ services.cloud-init.enable = true;
# Put /tmp and /var on /ephemeral0, which has a lot more space.
# Unfortunately we can't do this with the `fileSystems' option
diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index a17e2c9ca471b23a7778a296bd33e70995dff642..3c89ca68113b741d20e3d5f4631df5f56e3455bc 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -92,7 +92,7 @@ let
-drive index=0,id=drive1,file=$NIX_DISK_IMAGE,if=${cfg.qemu.diskInterface},cache=writeback,werror=report \
-kernel ${config.system.build.toplevel}/kernel \
-initrd ${config.system.build.toplevel}/initrd \
- -append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.toplevel}/init regInfo=${regInfo} ${kernelConsole} $QEMU_KERNEL_PARAMS" \
+ -append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.toplevel}/init regInfo=${regInfo}/registration ${kernelConsole} $QEMU_KERNEL_PARAMS" \
''} \
$extraDisks \
${qemuGraphics} \
@@ -102,15 +102,7 @@ let
'';
- regInfo = pkgs.runCommand "reginfo"
- { exportReferencesGraph =
- map (x: [("closure-" + baseNameOf x) x]) config.virtualisation.pathsInNixDB;
- buildInputs = [ pkgs.perl ];
- preferLocalBuild = true;
- }
- ''
- printRegistration=1 perl ${pkgs.pathsFromGraph} closure-* > $out
- '';
+ regInfo = pkgs.closureInfo { rootPaths = config.virtualisation.pathsInNixDB; };
# Generate a hard disk image containing a /boot partition and GRUB
diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 54fd4a15ffccc57064e80f1fe13aba203f15f37b..125e6b7050bcc1f454ae675d7a6f19ded41188e7 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -42,12 +42,11 @@ in rec {
name = "nixos-${nixos.channel.version}";
meta = {
description = "Release-critical builds for the NixOS channel";
- maintainers = [ pkgs.lib.maintainers.eelco ];
+ maintainers = with pkgs.lib.maintainers; [ eelco fpletz ];
};
constituents =
let
- all = x: map (system: x.${system})
- (supportedSystems ++ limitedSupportedSystems);
+ all = x: map (system: x.${system}) supportedSystems;
in [
nixos.channel
(all nixos.dummy)
@@ -61,7 +60,7 @@ in rec {
nixos.tests.chromium
(all nixos.tests.firefox)
(all nixos.tests.firewall)
- nixos.tests.gnome3.x86_64-linux # FIXME: i686-linux
+ (all nixos.tests.gnome3)
nixos.tests.installer.zfsroot.x86_64-linux # ZFS is 64bit only
(all nixos.tests.installer.lvm)
(all nixos.tests.installer.luksroot)
@@ -80,8 +79,10 @@ in rec {
(all nixos.tests.boot.uefiCdrom)
(all nixos.tests.boot.uefiUsb)
(all nixos.tests.boot-stage1)
- nixos.tests.hibernate.x86_64-linux # i686 is flaky, see #23107
+ (all nixos.tests.hibernate)
+ nixos.tests.docker
(all nixos.tests.ecryptfs)
+ (all nixos.tests.env)
(all nixos.tests.ipv6)
(all nixos.tests.i3wm)
(all nixos.tests.keymap.azerty)
diff --git a/nixos/release.nix b/nixos/release.nix
index 9604da5a4d701e4c903037e88495b2eaaffba819..28eb76d888e428b41fb80b5a8ca6e40e84e4e90b 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -214,6 +214,8 @@ in rec {
# Run the tests for each platform. You can run a test by doing
# e.g. ‘nix-build -A tests.login.x86_64-linux’, or equivalently,
# ‘nix-build tests/login.nix -A result’.
+ tests.atd = callTest tests/atd.nix {};
+ tests.acme = callTest tests/acme.nix {};
tests.avahi = callTest tests/avahi.nix {};
tests.bittorrent = callTest tests/bittorrent.nix {};
tests.blivet = callTest tests/blivet.nix {};
@@ -234,25 +236,33 @@ in rec {
tests.containers-hosts = callTest tests/containers-hosts.nix {};
tests.containers-macvlans = callTest tests/containers-macvlans.nix {};
tests.docker = hydraJob (import tests/docker.nix { system = "x86_64-linux"; });
+ tests.docker-edge = hydraJob (import tests/docker-edge.nix { system = "x86_64-linux"; });
+ tests.dovecot = callTest tests/dovecot.nix {};
tests.dnscrypt-proxy = callTest tests/dnscrypt-proxy.nix { system = "x86_64-linux"; };
tests.ecryptfs = callTest tests/ecryptfs.nix {};
tests.etcd = hydraJob (import tests/etcd.nix { system = "x86_64-linux"; });
tests.ec2-nixops = hydraJob (import tests/ec2.nix { system = "x86_64-linux"; }).boot-ec2-nixops;
tests.ec2-config = hydraJob (import tests/ec2.nix { system = "x86_64-linux"; }).boot-ec2-config;
+ tests.elk = hydraJob (import tests/elk.nix { system = "x86_64-linux"; });
+ tests.env = callTest tests/env.nix {};
tests.ferm = callTest tests/ferm.nix {};
tests.firefox = callTest tests/firefox.nix {};
tests.firewall = callTest tests/firewall.nix {};
tests.fleet = hydraJob (import tests/fleet.nix { system = "x86_64-linux"; });
#tests.gitlab = callTest tests/gitlab.nix {};
+ tests.gitolite = callTest tests/gitolite.nix {};
tests.glance = callTest tests/glance.nix {};
tests.gocd-agent = callTest tests/gocd-agent.nix {};
tests.gocd-server = callTest tests/gocd-server.nix {};
tests.gnome3 = callTest tests/gnome3.nix {};
tests.gnome3-gdm = callTest tests/gnome3-gdm.nix {};
+ tests.grafana = callTest tests/grafana.nix {};
+ tests.graphite = callTest tests/graphite.nix {};
tests.hardened = callTest tests/hardened.nix { };
tests.hibernate = callTest tests/hibernate.nix {};
tests.hound = callTest tests/hound.nix {};
tests.i3wm = callTest tests/i3wm.nix {};
+ tests.initrd-network-ssh = callTest tests/initrd-network-ssh.nix {};
tests.installer = callSubTests tests/installer.nix {};
tests.influxdb = callTest tests/influxdb.nix {};
tests.ipv6 = callTest tests/ipv6.nix {};
@@ -260,19 +270,28 @@ in rec {
tests.plasma5 = callTest tests/plasma5.nix {};
tests.keymap = callSubTests tests/keymap.nix {};
tests.initrdNetwork = callTest tests/initrd-network.nix {};
+ tests.kafka_0_9 = callTest tests/kafka_0_9.nix {};
+ tests.kafka_0_10 = callTest tests/kafka_0_10.nix {};
+ tests.kafka_0_11 = callTest tests/kafka_0_11.nix {};
+ tests.kafka_1_0 = callTest tests/kafka_1_0.nix {};
+ tests.kernel-copperhead = callTest tests/kernel-copperhead.nix {};
+ tests.kernel-latest = callTest tests/kernel-latest.nix {};
+ tests.kernel-lts = callTest tests/kernel-lts.nix {};
tests.keystone = callTest tests/keystone.nix {};
- tests.kubernetes = hydraJob (import tests/kubernetes.nix { system = "x86_64-linux"; });
+ tests.kubernetes = hydraJob (import tests/kubernetes/default.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 {};
tests.mathics = callTest tests/mathics.nix {};
+ tests.mesos = callTest tests/mesos.nix {};
tests.misc = callTest tests/misc.nix {};
tests.mongodb = callTest tests/mongodb.nix {};
tests.mumble = callTest tests/mumble.nix {};
tests.munin = callTest tests/munin.nix {};
tests.mysql = callTest tests/mysql.nix {};
+ tests.mysqlBackup = callTest tests/mysql-backup.nix {};
tests.mysqlReplication = callTest tests/mysql-replication.nix {};
tests.nat.firewall = callTest tests/nat.nix { withFirewall = true; };
tests.nat.firewall-conntrack = callTest tests/nat.nix { withFirewall = true; withConntrackHelpers = true; };
@@ -291,12 +310,16 @@ in rec {
#tests.panamax = hydraJob (import tests/panamax.nix { system = "x86_64-linux"; });
tests.peerflix = callTest tests/peerflix.nix {};
tests.postgresql = callSubTests tests/postgresql.nix {};
- tests.pgjwt = callTest tests/pgjwt.nix {};
+ tests.pgmanage = callTest tests/pgmanage.nix {};
+ tests.postgis = callTest tests/postgis.nix {};
+ #tests.pgjwt = callTest tests/pgjwt.nix {};
tests.printing = callTest tests/printing.nix {};
+ tests.prometheus = callTest tests/prometheus.nix {};
tests.proxy = callTest tests/proxy.nix {};
tests.pumpio = callTest tests/pump.io.nix {};
# tests.quagga = callTest tests/quagga.nix {};
tests.quake3 = callTest tests/quake3.nix {};
+ tests.radicale = callTest tests/radicale.nix {};
tests.runInMachine = callTest tests/run-in-machine.nix {};
tests.samba = callTest tests/samba.nix {};
tests.sddm = callSubTests tests/sddm.nix {};
@@ -310,7 +333,8 @@ in rec {
tests.virtualbox = callSubTests tests/virtualbox.nix { system = "x86_64-linux"; };
tests.wordpress = callTest tests/wordpress.nix {};
tests.xfce = callTest tests/xfce.nix {};
-
+ tests.xmonad = callTest tests/xmonad.nix {};
+ tests.zookeeper = callTest tests/zookeeper.nix {};
/* Build a bunch of typical closures so that Hydra can keep track of
the evolution of closure sizes. */
diff --git a/nixos/tests/acme.nix b/nixos/tests/acme.nix
new file mode 100644
index 0000000000000000000000000000000000000000..d7452744e17b2e0d05b66c8a744b4f31f722d177
--- /dev/null
+++ b/nixos/tests/acme.nix
@@ -0,0 +1,62 @@
+let
+ commonConfig = { config, lib, pkgs, nodes, ... }: {
+ networking.nameservers = [
+ nodes.letsencrypt.config.networking.primaryIPAddress
+ ];
+
+ nixpkgs.overlays = lib.singleton (self: super: {
+ cacert = super.cacert.overrideDerivation (drv: {
+ installPhase = (drv.installPhase or "") + ''
+ cat "${nodes.letsencrypt.config.test-support.letsencrypt.caCert}" \
+ >> "$out/etc/ssl/certs/ca-bundle.crt"
+ '';
+ });
+
+ pythonPackages = (super.python.override {
+ packageOverrides = lib.const (pysuper: {
+ certifi = pysuper.certifi.overridePythonAttrs (attrs: {
+ postPatch = (attrs.postPatch or "") + ''
+ cat "${self.cacert}/etc/ssl/certs/ca-bundle.crt" \
+ > certifi/cacert.pem
+ '';
+ });
+ });
+ }).pkgs;
+ });
+ };
+
+in import ./make-test.nix {
+ name = "acme";
+
+ nodes = {
+ letsencrypt = ./common/letsencrypt.nix;
+
+ webserver = { config, pkgs, ... }: {
+ imports = [ commonConfig ];
+ networking.firewall.allowedTCPPorts = [ 80 443 ];
+
+ networking.extraHosts = ''
+ ${config.networking.primaryIPAddress} example.com
+ '';
+
+ services.nginx.enable = true;
+ services.nginx.virtualHosts."example.com" = {
+ enableACME = true;
+ forceSSL = true;
+ locations."/".root = pkgs.runCommand "docroot" {} ''
+ mkdir -p "$out"
+ echo hello world > "$out/index.html"
+ '';
+ };
+ };
+
+ client = commonConfig;
+ };
+
+ testScript = ''
+ $letsencrypt->waitForUnit("boulder.service");
+ startAll;
+ $webserver->waitForUnit("acme-certificates.target");
+ $client->succeed('curl https://example.com/ | grep -qF "hello world"');
+ '';
+}
diff --git a/nixos/tests/atd.nix b/nixos/tests/atd.nix
new file mode 100644
index 0000000000000000000000000000000000000000..c2c0a716e0de5feac3f8e3860e9d9cde5e4b0ba8
--- /dev/null
+++ b/nixos/tests/atd.nix
@@ -0,0 +1,36 @@
+import ./make-test.nix ({ pkgs, lib, ... }:
+
+{
+ name = "atd";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ bjornfor ];
+ };
+
+ machine =
+ { config, pkgs, ... }:
+ { services.atd.enable = true;
+ users.extraUsers.alice = { isNormalUser = true; };
+ };
+
+ # "at" has a resolution of 1 minute
+ testScript = ''
+ startAll;
+
+ $machine->fail("test -f ~root/at-1");
+ $machine->fail("test -f ~root/batch-1");
+ $machine->fail("test -f ~alice/at-1");
+ $machine->fail("test -f ~alice/batch-1");
+
+ $machine->succeed("echo 'touch ~root/at-1' | at now+1min");
+ $machine->succeed("echo 'touch ~root/batch-1' | batch");
+ $machine->succeed("su - alice -c \"echo 'touch at-1' | at now+1min\"");
+ $machine->succeed("su - alice -c \"echo 'touch batch-1' | batch\"");
+
+ $machine->succeed("sleep 1.5m");
+
+ $machine->succeed("test -f ~root/at-1");
+ $machine->succeed("test -f ~root/batch-1");
+ $machine->succeed("test -f ~alice/at-1");
+ $machine->succeed("test -f ~alice/batch-1");
+ '';
+})
diff --git a/nixos/tests/common/letsencrypt.nix b/nixos/tests/common/letsencrypt.nix
new file mode 100644
index 0000000000000000000000000000000000000000..5a2a266d4da5c1a1c8e8673fad4693f1af889bf6
--- /dev/null
+++ b/nixos/tests/common/letsencrypt.nix
@@ -0,0 +1,446 @@
+# Fully pluggable module to have Letsencrypt's Boulder ACME service running in
+# a test environment.
+#
+# The certificate for the ACME service is exported as:
+#
+# config.test-support.letsencrypt.caCert
+#
+# This value can be used inside the configuration of other test nodes to inject
+# the snakeoil certificate into security.pki.certificateFiles or into package
+# overlays.
+#
+# Another value that's needed if you don't use a custom resolver (see below for
+# notes on that) is to add the letsencrypt node as a nameserver to every node
+# that needs to acquire certificates using ACME, because otherwise the API host
+# for letsencrypt.org can't be resolved.
+#
+# A configuration example of a full node setup using this would be this:
+#
+# {
+# letsencrypt = import ./common/letsencrypt.nix;
+#
+# example = { nodes, ... }: {
+# networking.nameservers = [
+# nodes.letsencrypt.config.networking.primaryIPAddress
+# ];
+# security.pki.certificateFiles = [
+# nodes.letsencrypt.config.test-support.letsencrypt.caCert
+# ];
+# };
+# }
+#
+# By default, this module runs a local resolver, generated using resolver.nix
+# from the same directory to automatically discover all zones in the network.
+#
+# If you do not want this and want to use your own resolver, you can just
+# override networking.nameservers like this:
+#
+# {
+# letsencrypt = { nodes, ... }: {
+# imports = [ ./common/letsencrypt.nix ];
+# networking.nameservers = [
+# nodes.myresolver.config.networking.primaryIPAddress
+# ];
+# };
+#
+# myresolver = ...;
+# }
+#
+# Keep in mind, that currently only _one_ resolver is supported, if you have
+# more than one resolver in networking.nameservers only the first one will be
+# used.
+#
+# Also make sure that whenever you use a resolver from a different test node
+# that it has to be started _before_ the ACME service.
+{ config, pkgs, lib, ... }:
+
+let
+ softhsm = pkgs.stdenv.mkDerivation rec {
+ name = "softhsm-${version}";
+ version = "1.3.8";
+
+ src = pkgs.fetchurl {
+ url = "https://dist.opendnssec.org/source/${name}.tar.gz";
+ sha256 = "0flmnpkgp65ym7w3qyg78d3fbmvq3aznmi66rgd420n33shf7aif";
+ };
+
+ configureFlags = [ "--with-botan=${pkgs.botan}" ];
+ buildInputs = [ pkgs.sqlite ];
+ };
+
+ pkcs11-proxy = pkgs.stdenv.mkDerivation {
+ name = "pkcs11-proxy";
+
+ src = pkgs.fetchFromGitHub {
+ owner = "SUNET";
+ repo = "pkcs11-proxy";
+ rev = "944684f78bca0c8da6cabe3fa273fed3db44a890";
+ sha256 = "1nxgd29y9wmifm11pjcdpd2y293p0dgi0x5ycis55miy97n0f5zy";
+ };
+
+ postPatch = "patchShebangs mksyscalls.sh";
+
+ nativeBuildInputs = [ pkgs.cmake ];
+ buildInputs = [ pkgs.openssl pkgs.libseccomp ];
+ };
+
+ mkGoDep = { goPackagePath, url ? "https://${goPackagePath}", rev, sha256 }: {
+ inherit goPackagePath;
+ src = pkgs.fetchgit { inherit url rev sha256; };
+ };
+
+ goose = let
+ owner = "liamstask";
+ repo = "goose";
+ rev = "8488cc47d90c8a502b1c41a462a6d9cc8ee0a895";
+ version = "20150116";
+
+ in pkgs.buildGoPackage rec {
+ name = "${repo}-${version}";
+
+ src = pkgs.fetchFromBitbucket {
+ name = "${name}-src";
+ inherit rev owner repo;
+ sha256 = "1jy0pscxjnxjdg3hj111w21g8079rq9ah2ix5ycxxhbbi3f0wdhs";
+ };
+
+ goPackagePath = "bitbucket.org/${owner}/${repo}";
+ subPackages = [ "cmd/goose" ];
+ extraSrcs = map mkGoDep [
+ { goPackagePath = "github.com/go-sql-driver/mysql";
+ rev = "2e00b5cd70399450106cec6431c2e2ce3cae5034";
+ sha256 = "085g48jq9hzmlcxg122n0c4pi41sc1nn2qpx1vrl2jfa8crsppa5";
+ }
+ { goPackagePath = "github.com/kylelemons/go-gypsy";
+ rev = "08cad365cd28a7fba23bb1e57aa43c5e18ad8bb8";
+ sha256 = "1djv7nii3hy451n5jlslk0dblqzb1hia1cbqpdwhnps1g8hqjy8q";
+ }
+ { goPackagePath = "github.com/lib/pq";
+ rev = "ba5d4f7a35561e22fbdf7a39aa0070f4d460cfc0";
+ sha256 = "1mfbqw9g00bk24bfmf53wri5c2wqmgl0qh4sh1qv2da13a7cwwg3";
+ }
+ { goPackagePath = "github.com/mattn/go-sqlite3";
+ rev = "2acfafad5870400156f6fceb12852c281cbba4d5";
+ sha256 = "1rpgil3w4hh1cibidskv1js898hwz83ps06gh0hm3mym7ki8d5h7";
+ }
+ { goPackagePath = "github.com/ziutek/mymysql";
+ rev = "0582bcf675f52c0c2045c027fd135bd726048f45";
+ sha256 = "0bkc9x8sgqbzgdimsmsnhb0qrzlzfv33fgajmmjxl4hcb21qz3rf";
+ }
+ { goPackagePath = "golang.org/x/net";
+ url = "https://go.googlesource.com/net";
+ rev = "10c134ea0df15f7e34d789338c7a2d76cc7a3ab9";
+ sha256 = "14cbr2shl08gyg85n5gj7nbjhrhhgrd52h073qd14j97qcxsakcz";
+ }
+ ];
+ };
+
+ boulder = let
+ owner = "letsencrypt";
+ repo = "boulder";
+ rev = "9866abab8962a591f06db457a4b84c518cc88243";
+ version = "20170510";
+
+ in pkgs.buildGoPackage rec {
+ name = "${repo}-${version}";
+
+ src = pkgs.fetchFromGitHub {
+ name = "${name}-src";
+ inherit rev owner repo;
+ sha256 = "170m5cjngbrm36wi7wschqw8jzs7kxpcyzmshq3pcrmcpigrhna1";
+ };
+
+ postPatch = ''
+ # compat for go < 1.8
+ sed -i -e 's/time\.Until(\([^)]\+\))/\1.Sub(time.Now())/' \
+ test/ocsp/helper/helper.go
+
+ find test -type f -exec sed -i -e '/libpkcs11-proxy.so/ {
+ s,/usr/local,${pkcs11-proxy},
+ }' {} +
+
+ sed -i -r \
+ -e '/^def +install/a \ return True' \
+ -e 's,exec \./bin/,,' \
+ test/startservers.py
+
+ cat "${snakeOilCa}/ca.key" > test/test-ca.key
+ cat "${snakeOilCa}/ca.pem" > test/test-ca.pem
+ '';
+
+ goPackagePath = "github.com/${owner}/${repo}";
+ buildInputs = [ pkgs.libtool ];
+ };
+
+ boulderSource = "${boulder.out}/share/go/src/${boulder.goPackagePath}";
+
+ softHsmConf = pkgs.writeText "softhsm.conf" ''
+ 0:/var/lib/softhsm/slot0.db
+ 1:/var/lib/softhsm/slot1.db
+ '';
+
+ snakeOilCa = pkgs.runCommand "snakeoil-ca" {
+ buildInputs = [ pkgs.openssl ];
+ } ''
+ mkdir "$out"
+ openssl req -newkey rsa:4096 -x509 -sha256 -days 36500 \
+ -subj '/CN=Snakeoil CA' -nodes \
+ -out "$out/ca.pem" -keyout "$out/ca.key"
+ '';
+
+ createAndSignCert = fqdn: let
+ snakeoilCertConf = pkgs.writeText "snakeoil.cnf" ''
+ [req]
+ default_bits = 4096
+ prompt = no
+ default_md = sha256
+ req_extensions = req_ext
+ distinguished_name = dn
+ [dn]
+ CN = ${fqdn}
+ [req_ext]
+ subjectAltName = DNS:${fqdn}
+ '';
+ in pkgs.runCommand "snakeoil-certs-${fqdn}" {
+ buildInputs = [ pkgs.openssl ];
+ } ''
+ mkdir "$out"
+ openssl genrsa -out "$out/snakeoil.key" 4096
+ openssl req -new -key "$out/snakeoil.key" \
+ -config ${lib.escapeShellArg snakeoilCertConf} \
+ -out snakeoil.csr
+ openssl x509 -req -in snakeoil.csr -sha256 -set_serial 666 \
+ -CA "${snakeOilCa}/ca.pem" -CAkey "${snakeOilCa}/ca.key" \
+ -extfile ${lib.escapeShellArg snakeoilCertConf} \
+ -out "$out/snakeoil.pem" -days 36500
+ '';
+
+ wfeCerts = createAndSignCert wfeDomain;
+ wfeDomain = "acme-v01.api.letsencrypt.org";
+ wfeCertFile = "${wfeCerts}/snakeoil.pem";
+ wfeKeyFile = "${wfeCerts}/snakeoil.key";
+
+ siteCerts = createAndSignCert siteDomain;
+ siteDomain = "letsencrypt.org";
+ siteCertFile = "${siteCerts}/snakeoil.pem";
+ siteKeyFile = "${siteCerts}/snakeoil.key";
+
+ # Retrieved via:
+ # curl -s -I https://acme-v01.api.letsencrypt.org/terms \
+ # | sed -ne 's/^[Ll]ocation: *//p'
+ tosUrl = "https://letsencrypt.org/documents/LE-SA-v1.1.1-August-1-2016.pdf";
+ tosPath = builtins.head (builtins.match "https?://[^/]+(.*)" tosUrl);
+
+ tosFile = pkgs.fetchurl {
+ url = tosUrl;
+ sha256 = "08b2gacdz23mzji2pjr1pwnk82a84rzvr36isif7mmi9kydl6wv3";
+ };
+
+ resolver = let
+ message = "You need to define a resolver for the letsencrypt test module.";
+ firstNS = lib.head config.networking.nameservers;
+ in if config.networking.nameservers == [] then throw message else firstNS;
+
+ cfgDir = pkgs.stdenv.mkDerivation {
+ name = "boulder-config";
+ src = "${boulderSource}/test/config";
+ nativeBuildInputs = [ pkgs.jq ];
+ phases = [ "unpackPhase" "patchPhase" "installPhase" ];
+ postPatch = ''
+ sed -i -e 's/5002/80/' -e 's/5002/443/' va.json
+ sed -i -e '/listenAddress/s/:4000/:80/' wfe.json
+ sed -i -r \
+ -e ${lib.escapeShellArg "s,http://boulder:4000/terms/v1,${tosUrl},g"} \
+ -e 's,http://(boulder|127\.0\.0\.1):4000,https://${wfeDomain},g' \
+ -e '/dnsResolver/s/127\.0\.0\.1:8053/${resolver}:53/' \
+ *.json
+ if grep 4000 *.json; then exit 1; fi
+
+ # Change all ports from 1909X to 909X, because the 1909X range of ports is
+ # allocated by startservers.py in order to intercept gRPC communication.
+ sed -i -e 's/\<1\(909[0-9]\)\>/\1/' *.json
+
+ # Patch out all additional issuer certs
+ jq '. + {ca: (.ca + {Issuers:
+ [.ca.Issuers[] | select(.CertFile == "test/test-ca.pem")]
+ })}' ca.json > tmp
+ mv tmp ca.json
+ '';
+ installPhase = "cp -r . \"$out\"";
+ };
+
+ components = {
+ gsb-test-srv.args = "-apikey my-voice-is-my-passport";
+ gsb-test-srv.waitForPort = 6000;
+ gsb-test-srv.first = true;
+ boulder-sa.args = "--config ${cfgDir}/sa.json";
+ boulder-wfe.args = "--config ${cfgDir}/wfe.json";
+ boulder-ra.args = "--config ${cfgDir}/ra.json";
+ boulder-ca.args = "--config ${cfgDir}/ca.json";
+ boulder-va.args = "--config ${cfgDir}/va.json";
+ boulder-publisher.args = "--config ${cfgDir}/publisher.json";
+ boulder-publisher.waitForPort = 9091;
+ ocsp-updater.args = "--config ${cfgDir}/ocsp-updater.json";
+ ocsp-updater.after = [ "boulder-publisher" ];
+ ocsp-responder.args = "--config ${cfgDir}/ocsp-responder.json";
+ ct-test-srv = {};
+ mail-test-srv.args = "--closeFirst 5";
+ };
+
+ commonPath = [ softhsm pkgs.mariadb goose boulder ];
+
+ mkServices = a: b: with lib; listToAttrs (concatLists (mapAttrsToList a b));
+
+ componentServices = mkServices (name: attrs: let
+ mkSrvName = n: "boulder-${n}.service";
+ firsts = lib.filterAttrs (lib.const (c: c.first or false)) components;
+ firstServices = map mkSrvName (lib.attrNames firsts);
+ firstServicesNoSelf = lib.remove "boulder-${name}.service" firstServices;
+ additionalAfter = firstServicesNoSelf ++ map mkSrvName (attrs.after or []);
+ needsPort = attrs ? waitForPort;
+ inits = map (n: "boulder-init-${n}.service") [ "mysql" "softhsm" ];
+ portWaiter = {
+ name = "boulder-${name}";
+ value = {
+ description = "Wait For Port ${toString attrs.waitForPort} (${name})";
+ after = [ "boulder-real-${name}.service" "bind.service" ];
+ requires = [ "boulder-real-${name}.service" ];
+ requiredBy = [ "boulder.service" ];
+ serviceConfig.Type = "oneshot";
+ serviceConfig.RemainAfterExit = true;
+ script = let
+ netcat = "${pkgs.netcat-openbsd}/bin/nc";
+ portCheck = "${netcat} -z 127.0.0.1 ${toString attrs.waitForPort}";
+ in "while ! ${portCheck}; do :; done";
+ };
+ };
+ in lib.optional needsPort portWaiter ++ lib.singleton {
+ name = if needsPort then "boulder-real-${name}" else "boulder-${name}";
+ value = {
+ description = "Boulder ACME Component (${name})";
+ after = inits ++ additionalAfter;
+ requires = inits;
+ requiredBy = [ "boulder.service" ];
+ path = commonPath;
+ environment.GORACE = "halt_on_error=1";
+ environment.SOFTHSM_CONF = softHsmConf;
+ environment.PKCS11_PROXY_SOCKET = "tcp://127.0.0.1:5657";
+ serviceConfig.WorkingDirectory = boulderSource;
+ serviceConfig.ExecStart = "${boulder}/bin/${name} ${attrs.args or ""}";
+ serviceConfig.Restart = "on-failure";
+ };
+ }) components;
+
+in {
+ imports = [ ./resolver.nix ];
+
+ options.test-support.letsencrypt.caCert = lib.mkOption {
+ type = lib.types.path;
+ description = ''
+ A certificate file to use with the nodes attribute to
+ inject the snakeoil CA certificate used in the ACME server into
+ .
+ '';
+ };
+
+ config = {
+ test-support = {
+ resolver.enable = let
+ isLocalResolver = config.networking.nameservers == [ "127.0.0.1" ];
+ in lib.mkOverride 900 isLocalResolver;
+ letsencrypt.caCert = "${snakeOilCa}/ca.pem";
+ };
+
+ # This has priority 140, because modules/testing/test-instrumentation.nix
+ # already overrides this with priority 150.
+ networking.nameservers = lib.mkOverride 140 [ "127.0.0.1" ];
+ networking.firewall.enable = false;
+
+ networking.extraHosts = ''
+ 127.0.0.1 ${toString [
+ "sa.boulder" "ra.boulder" "wfe.boulder" "ca.boulder" "va.boulder"
+ "publisher.boulder" "ocsp-updater.boulder" "admin-revoker.boulder"
+ "boulder" "boulder-mysql" wfeDomain
+ ]}
+ ${config.networking.primaryIPAddress} ${wfeDomain} ${siteDomain}
+ '';
+
+ services.mysql.enable = true;
+ services.mysql.package = pkgs.mariadb;
+
+ services.nginx.enable = true;
+ services.nginx.recommendedProxySettings = true;
+ services.nginx.virtualHosts.${wfeDomain} = {
+ onlySSL = true;
+ enableACME = false;
+ sslCertificate = wfeCertFile;
+ sslCertificateKey = wfeKeyFile;
+ locations."/".proxyPass = "http://127.0.0.1:80";
+ };
+ services.nginx.virtualHosts.${siteDomain} = {
+ onlySSL = true;
+ enableACME = false;
+ sslCertificate = siteCertFile;
+ sslCertificateKey = siteKeyFile;
+ locations.${tosPath}.extraConfig = "alias ${tosFile};";
+ };
+
+ systemd.services = {
+ pkcs11-daemon = {
+ description = "PKCS11 Daemon";
+ after = [ "boulder-init-softhsm.service" ];
+ before = map (n: "${n}.service") (lib.attrNames componentServices);
+ wantedBy = [ "multi-user.target" ];
+ environment.SOFTHSM_CONF = softHsmConf;
+ environment.PKCS11_DAEMON_SOCKET = "tcp://127.0.0.1:5657";
+ serviceConfig.ExecStart = let
+ softhsmLib = "${softhsm}/lib/softhsm/libsofthsm.so";
+ in "${pkcs11-proxy}/bin/pkcs11-daemon ${softhsmLib}";
+ };
+
+ boulder-init-mysql = {
+ description = "Boulder ACME Init (MySQL)";
+ after = [ "mysql.service" ];
+ serviceConfig.Type = "oneshot";
+ serviceConfig.RemainAfterExit = true;
+ serviceConfig.WorkingDirectory = boulderSource;
+ path = commonPath;
+ script = "${pkgs.bash}/bin/sh test/create_db.sh";
+ };
+
+ boulder-init-softhsm = {
+ description = "Boulder ACME Init (SoftHSM)";
+ environment.SOFTHSM_CONF = softHsmConf;
+ serviceConfig.Type = "oneshot";
+ serviceConfig.RemainAfterExit = true;
+ serviceConfig.WorkingDirectory = boulderSource;
+ preStart = "mkdir -p /var/lib/softhsm";
+ path = commonPath;
+ script = ''
+ softhsm --slot 0 --init-token \
+ --label intermediate --pin 5678 --so-pin 1234
+ softhsm --slot 0 --import test/test-ca.key \
+ --label intermediate_key --pin 5678 --id FB
+ softhsm --slot 1 --init-token \
+ --label root --pin 5678 --so-pin 1234
+ softhsm --slot 1 --import test/test-root.key \
+ --label root_key --pin 5678 --id FA
+ '';
+ };
+
+ boulder = {
+ description = "Boulder ACME Server";
+ after = map (n: "${n}.service") (lib.attrNames componentServices);
+ wantedBy = [ "multi-user.target" ];
+ serviceConfig.Type = "oneshot";
+ serviceConfig.RemainAfterExit = true;
+ script = let
+ ports = lib.range 8000 8005 ++ lib.singleton 80;
+ netcat = "${pkgs.netcat-openbsd}/bin/nc";
+ mkPortCheck = port: "${netcat} -z 127.0.0.1 ${toString port}";
+ checks = "(${lib.concatMapStringsSep " && " mkPortCheck ports})";
+ in "while ! ${checks}; do :; done";
+ };
+ } // componentServices;
+ };
+}
diff --git a/nixos/tests/common/resolver.nix b/nixos/tests/common/resolver.nix
new file mode 100644
index 0000000000000000000000000000000000000000..a1901c5c8167c4cff2b82183b0bd36db15ada135
--- /dev/null
+++ b/nixos/tests/common/resolver.nix
@@ -0,0 +1,141 @@
+# This module automatically discovers zones in BIND and NSD NixOS
+# configurations and creates zones for all definitions of networking.extraHosts
+# (except those that point to 127.0.0.1 or ::1) within the current test network
+# and delegates these zones using a fake root zone served by a BIND recursive
+# name server.
+{ config, nodes, pkgs, lib, ... }:
+
+{
+ options.test-support.resolver.enable = lib.mkOption {
+ type = lib.types.bool;
+ default = true;
+ internal = true;
+ description = ''
+ Whether to enable the resolver that automatically discovers zone in the
+ test network.
+
+ This option is true by default, because the module
+ defining this option needs to be explicitly imported.
+
+ The reason this option exists is for the
+ nixos/tests/common/letsencrypt.nix module, which
+ needs that option to disable the resolver once the user has set its own
+ resolver.
+ '';
+ };
+
+ config = lib.mkIf config.test-support.resolver.enable {
+ networking.firewall.enable = false;
+ services.bind.enable = true;
+ services.bind.cacheNetworks = lib.mkForce [ "any" ];
+ services.bind.forwarders = lib.mkForce [];
+ services.bind.zones = lib.singleton {
+ name = ".";
+ file = let
+ addDot = zone: zone + lib.optionalString (!lib.hasSuffix "." zone) ".";
+ mkNsdZoneNames = zones: map addDot (lib.attrNames zones);
+ mkBindZoneNames = zones: map (zone: addDot zone.name) zones;
+ getZones = cfg: mkNsdZoneNames cfg.services.nsd.zones
+ ++ mkBindZoneNames cfg.services.bind.zones;
+
+ getZonesForNode = attrs: {
+ ip = attrs.config.networking.primaryIPAddress;
+ zones = lib.filter (zone: zone != ".") (getZones attrs.config);
+ };
+
+ zoneInfo = lib.mapAttrsToList (lib.const getZonesForNode) nodes;
+
+ # A and AAAA resource records for all the definitions of
+ # networking.extraHosts except those for 127.0.0.1 or ::1.
+ #
+ # The result is an attribute set with keys being the host name and the
+ # values are either { ipv4 = ADDR; } or { ipv6 = ADDR; } where ADDR is
+ # the IP address for the corresponding key.
+ recordsFromExtraHosts = let
+ getHostsForNode = lib.const (n: n.config.networking.extraHosts);
+ allHostsList = lib.mapAttrsToList getHostsForNode nodes;
+ allHosts = lib.concatStringsSep "\n" allHostsList;
+
+ reIp = "[a-fA-F0-9.:]+";
+ reHost = "[a-zA-Z0-9.-]+";
+
+ matchAliases = str: let
+ matched = builtins.match "[ \t]+(${reHost})(.*)" str;
+ continue = lib.singleton (lib.head matched)
+ ++ matchAliases (lib.last matched);
+ in if matched == null then [] else continue;
+
+ matchLine = str: let
+ result = builtins.match "[ \t]*(${reIp})[ \t]+(${reHost})(.*)" str;
+ in if result == null then null else {
+ ipAddr = lib.head result;
+ hosts = lib.singleton (lib.elemAt result 1)
+ ++ matchAliases (lib.last result);
+ };
+
+ skipLine = str: let
+ rest = builtins.match "[^\n]*\n(.*)" str;
+ in if rest == null then "" else lib.head rest;
+
+ getEntries = str: acc: let
+ result = matchLine str;
+ next = getEntries (skipLine str);
+ newEntry = acc ++ lib.singleton result;
+ continue = if result == null then next acc else next newEntry;
+ in if str == "" then acc else continue;
+
+ isIPv6 = str: builtins.match ".*:.*" str != null;
+ loopbackIps = [ "127.0.0.1" "::1" ];
+ filterLoopback = lib.filter (e: !lib.elem e.ipAddr loopbackIps);
+
+ allEntries = lib.concatMap (entry: map (host: {
+ inherit host;
+ ${if isIPv6 entry.ipAddr then "ipv6" else "ipv4"} = entry.ipAddr;
+ }) entry.hosts) (filterLoopback (getEntries (allHosts + "\n") []));
+
+ mkRecords = entry: let
+ records = lib.optional (entry ? ipv6) "AAAA ${entry.ipv6}"
+ ++ lib.optional (entry ? ipv4) "A ${entry.ipv4}";
+ mkRecord = typeAndData: "${entry.host}. IN ${typeAndData}";
+ in lib.concatMapStringsSep "\n" mkRecord records;
+
+ in lib.concatMapStringsSep "\n" mkRecords allEntries;
+
+ # All of the zones that are subdomains of existing zones.
+ # For example if there is only "example.com" the following zones would
+ # be 'subZones':
+ #
+ # * foo.example.com.
+ # * bar.example.com.
+ #
+ # While the following would *not* be 'subZones':
+ #
+ # * example.com.
+ # * com.
+ #
+ subZones = let
+ allZones = lib.concatMap (zi: zi.zones) zoneInfo;
+ isSubZoneOf = z1: z2: lib.hasSuffix z2 z1 && z1 != z2;
+ in lib.filter (z: lib.any (isSubZoneOf z) allZones) allZones;
+
+ # All the zones without 'subZones'.
+ filteredZoneInfo = map (zi: zi // {
+ zones = lib.filter (x: !lib.elem x subZones) zi.zones;
+ }) zoneInfo;
+
+ in pkgs.writeText "fake-root.zone" ''
+ $TTL 3600
+ . IN SOA ns.fakedns. admin.fakedns. ( 1 3h 1h 1w 1d )
+ ns.fakedns. IN A ${config.networking.primaryIPAddress}
+ . IN NS ns.fakedns.
+ ${lib.concatImapStrings (num: { ip, zones }: ''
+ ns${toString num}.fakedns. IN A ${ip}
+ ${lib.concatMapStrings (zone: ''
+ ${zone} IN NS ns${toString num}.fakedns.
+ '') zones}
+ '') (lib.filter (zi: zi.zones != []) filteredZoneInfo)}
+ ${recordsFromExtraHosts}
+ '';
+ };
+ };
+}
diff --git a/nixos/tests/containers-reloadable.nix b/nixos/tests/containers-reloadable.nix
new file mode 100644
index 0000000000000000000000000000000000000000..b5867c6f6ab180c6bf29da176886b0b79a666e7f
--- /dev/null
+++ b/nixos/tests/containers-reloadable.nix
@@ -0,0 +1,66 @@
+import ./make-test.nix ({ pkgs, lib, ...} :
+let
+ client_base = rec {
+
+ containers.test1 = {
+ autoStart = true;
+ config = {
+ environment.etc."check".text = "client_base";
+ };
+ };
+
+ # prevent make-test.nix to change IP
+ networking.interfaces = {
+ eth1.ip4 = lib.mkOverride 0 [ ];
+ };
+ };
+in {
+ name = "cotnainers-reloadable";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ danbst ];
+ };
+
+ nodes = {
+ client = { lib, pkgs, ... }: {
+ imports = [ client_base ];
+ };
+
+ client_c1 = { lib, pkgs, ... }: {
+ imports = [ client_base ];
+
+ containers.test1.config = {
+ environment.etc."check".text = lib.mkForce "client_c1";
+ services.httpd.enable = true;
+ services.httpd.adminAddr = "nixos@example.com";
+ };
+ };
+ client_c2 = { lib, pkgs, ... }: {
+ imports = [ client_base ];
+
+ containers.test1.config = {
+ environment.etc."check".text = lib.mkForce "client_c2";
+ services.nginx.enable = true;
+ };
+ };
+ };
+
+ testScript = {nodes, ...}: let
+ originalSystem = nodes.client.config.system.build.toplevel;
+ c1System = nodes.client_c1.config.system.build.toplevel;
+ c2System = nodes.client_c2.config.system.build.toplevel;
+ in ''
+ $client->start();
+ $client->waitForUnit("default.target");
+ $client->succeed("[[ \$(nixos-container run test1 cat /etc/check) == client_base ]] >&2");
+
+ $client->succeed("${c1System}/bin/switch-to-configuration test >&2");
+ $client->succeed("[[ \$(nixos-container run test1 cat /etc/check) == client_c1 ]] >&2");
+ $client->succeed("systemctl status httpd -M test1 >&2");
+
+ $client->succeed("${c2System}/bin/switch-to-configuration test >&2");
+ $client->succeed("[[ \$(nixos-container run test1 cat /etc/check) == client_c2 ]] >&2");
+ $client->fail("systemctl status httpd -M test1 >&2");
+ $client->succeed("systemctl status nginx -M test1 >&2");
+ '';
+
+})
diff --git a/nixos/tests/docker-edge.nix b/nixos/tests/docker-edge.nix
new file mode 100644
index 0000000000000000000000000000000000000000..38d25daff194c34104c9c0d5420740f54575734a
--- /dev/null
+++ b/nixos/tests/docker-edge.nix
@@ -0,0 +1,47 @@
+# This test runs docker and checks if simple container starts
+
+import ./make-test.nix ({ pkgs, ...} : {
+ name = "docker";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ nequissimus offline ];
+ };
+
+ nodes = {
+ docker =
+ { config, pkgs, ... }:
+ {
+ virtualisation.docker.enable = true;
+ virtualisation.docker.package = pkgs.docker-edge;
+
+ users.users = {
+ noprivs = {
+ isNormalUser = true;
+ description = "Can't access the docker daemon";
+ password = "foobar";
+ };
+
+ hasprivs = {
+ isNormalUser = true;
+ description = "Can access the docker daemon";
+ password = "foobar";
+ extraGroups = [ "docker" ];
+ };
+ };
+ };
+ };
+
+ testScript = ''
+ startAll;
+
+ $docker->waitForUnit("sockets.target");
+ $docker->succeed("tar cv --files-from /dev/null | docker import - scratchimg");
+ $docker->succeed("docker run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10");
+ $docker->succeed("docker ps | grep sleeping");
+ $docker->succeed("sudo -u hasprivs docker ps");
+ $docker->fail("sudo -u noprivs docker ps");
+ $docker->succeed("docker stop sleeping");
+
+ # Must match version twice to ensure client and server versions are correct
+ $docker->succeed('[ $(docker version | grep ${pkgs.docker-edge.version} | wc -l) = "2" ]');
+ '';
+})
diff --git a/nixos/tests/docker.nix b/nixos/tests/docker.nix
index 9096a5868f6cc7e6709688eb44b940d3d89da1cf..c6c8f4cdb5fb9c4590cabe87b6104b300a3a112f 100644
--- a/nixos/tests/docker.nix
+++ b/nixos/tests/docker.nix
@@ -3,7 +3,7 @@
import ./make-test.nix ({ pkgs, ...} : {
name = "docker";
meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ offline ];
+ maintainers = [ nequissimus offline ];
};
nodes = {
@@ -11,6 +11,7 @@ import ./make-test.nix ({ pkgs, ...} : {
{ config, pkgs, ... }:
{
virtualisation.docker.enable = true;
+ virtualisation.docker.package = pkgs.docker;
users.users = {
noprivs = {
@@ -39,5 +40,8 @@ import ./make-test.nix ({ pkgs, ...} : {
$docker->succeed("sudo -u hasprivs docker ps");
$docker->fail("sudo -u noprivs docker ps");
$docker->succeed("docker stop sleeping");
+
+ # Must match version twice to ensure client and server versions are correct
+ $docker->succeed('[ $(docker version | grep ${pkgs.docker.version} | wc -l) = "2" ]');
'';
})
diff --git a/nixos/tests/dovecot.nix b/nixos/tests/dovecot.nix
new file mode 100644
index 0000000000000000000000000000000000000000..3814855ed8e70ad609a774747e7a68a51dde5a1c
--- /dev/null
+++ b/nixos/tests/dovecot.nix
@@ -0,0 +1,64 @@
+import ./make-test.nix {
+ name = "dovecot";
+
+ machine = { pkgs, ... }: {
+ imports = [ common/user-account.nix ];
+ services.postfix.enable = true;
+ services.dovecot2.enable = true;
+ services.dovecot2.protocols = [ "imap" "pop3" ];
+ environment.systemPackages = let
+ sendTestMail = pkgs.writeScriptBin "send-testmail" ''
+ #!${pkgs.stdenv.shell}
+ exec sendmail -vt <waitForUnit('postfix.service');
+ $machine->waitForUnit('dovecot2.service');
+ $machine->succeed('send-testmail');
+ $machine->waitUntilFails('[ "$(postqueue -p)" != "Mail queue is empty" ]');
+ $machine->succeed('test-imap');
+ $machine->succeed('test-pop');
+ '';
+}
diff --git a/nixos/tests/env.nix b/nixos/tests/env.nix
new file mode 100644
index 0000000000000000000000000000000000000000..c6b0424e97b93870802fddfd0c0587545c7086d7
--- /dev/null
+++ b/nixos/tests/env.nix
@@ -0,0 +1,35 @@
+import ./make-test.nix ({ pkgs, ...} : {
+ name = "environment";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ nequissimus ];
+ };
+
+ machine = { config, lib, pkgs, ... }:
+ {
+ boot.kernelPackages = pkgs.linuxPackages;
+ environment.etc."plainFile".text = ''
+ Hello World
+ '';
+ environment.etc."folder/with/file".text = ''
+ Foo Bar!
+ '';
+
+ environment.sessionVariables = {
+ TERMINFO_DIRS = "/run/current-system/sw/share/terminfo";
+ NIXCON = "awesome";
+ };
+ };
+
+ testScript =
+ ''
+ $machine->succeed('[ -L "/etc/plainFile" ]');
+ $machine->succeed('cat "/etc/plainFile" | grep "Hello World"');
+ $machine->succeed('[ -d "/etc/folder" ]');
+ $machine->succeed('[ -d "/etc/folder/with" ]');
+ $machine->succeed('[ -L "/etc/folder/with/file" ]');
+ $machine->succeed('cat "/etc/plainFile" | grep "Hello World"');
+
+ $machine->succeed('echo ''${TERMINFO_DIRS} | grep "/run/current-system/sw/share/terminfo"');
+ $machine->succeed('echo ''${NIXCON} | grep "awesome"');
+ '';
+})
diff --git a/nixos/tests/gitlab.nix b/nixos/tests/gitlab.nix
index 357911046960a9e0dea3d2bfea0f122bf0765b02..7268636b62ad0c7dd0bd818097ec4312b8b0e768 100644
--- a/nixos/tests/gitlab.nix
+++ b/nixos/tests/gitlab.nix
@@ -9,9 +9,57 @@ import ./make-test.nix ({ pkgs, ...} : {
nodes = {
gitlab = { config, pkgs, ... }: {
virtualisation.memorySize = 768;
- services.gitlab.enable = true;
- services.gitlab.databasePassword = "gitlab";
+
+ services.nginx = {
+ enable = true;
+ virtualHosts = {
+ "localhost" = {
+ locations."/".proxyPass = "http://unix:/run/gitlab/gitlab-workhorse.socket";
+ };
+ };
+ };
+
systemd.services.gitlab.serviceConfig.TimeoutStartSec = "10min";
+ services.gitlab = {
+ enable = true;
+ databasePassword = "dbPassword";
+ secrets = {
+ secret = "secret";
+ otp = "otpsecret";
+ db = "dbsecret";
+
+ # nix-shell -p openssl --run "openssl genrsa 2048"
+ jws = ''
+ -----BEGIN RSA PRIVATE KEY-----
+ MIIEpAIBAAKCAQEA13/qEio76OWUtWO0WIz9lWnsTWOU8Esv4sQHDq9PCEFsLt21
+ PAXrlWhLjjWcxGfsrDwnh7YErGHYL62BMSxMdFJolaknlQK/O/V8UETDe45VoHM+
+ Znk270RfUcfYFgiihnXUZXVmL0om9TsQSk646wCcjCY9LxtxUyKNhvT7KjgYw2aX
+ z34aw7M+Js3T2p1TjZPSC82GtmtKkJEKFMi5EjprLTDE7EdcUzr9Xuw+kQ+gRm9k
+ 7FE+JQqSoprwE3Q0v2OAn3UhLMgg0gNFRnsc5l6IAshDzV+H22RPqKKlJjVjjfPY
+ 0TQSvYLVApigHbDPH0BoCXfjFfQazbbP3OUHrwIDAQABAoIBAQCMU+tkcMQaYIV5
+ qLdjgkwO467QpivyXcOM8wF1eosIYTHFQvIlZ+WEoSmyLQ8shlADyBgls01Pw1c3
+ lNAv6RzQEmmwKzpvOh61OKH+0whIiOMRXHoh2IUBQZCgfHYlwvGyhUAN4WjtGmhM
+ AG4XNTQNM5S9Xpkw97nP3Qwz+YskbbkrfqtCEVy9ro+4nhbjqPsuO3adbnkva4zR
+ cyurRhrHgHU6LPjn5NHnHH4qw2faY2oAsL8pmpkTbO5IqWDvOcbjNfjVPgVoq26O
+ bbaa1qs4nmc80qQgMjRPJef535xyf3eLsSlDvpf6O8sPrJzVR1zaqEqixpQCZDac
+ +kRiSBrhAoGBAOwHiq0PuyJh6VzBu7ybqX6+gF/wA4Jkwzx6mbfaBgurvU1aospp
+ kisIonAkxSbxllZMnjbkShZEdATYKeT9o5NEhnU4YnHfc5bJZbiWOZAzYGLcY7g8
+ vDQ31pBItyY4pFgPbSpNlbUvUsoPVJ45RasRADDTNCzMzdjFQQXst2V9AoGBAOm7
+ sSpzYfFPLEAhieAkuhtbsX58Boo46djiKVfzGftfp6F9aHTOfzGORU5jrZ16mSbS
+ qkkC6BEFrATX2051dzzXC89fWoJYALrsffE5I3KlKXsCAWSnCP1MMxOfH+Ls61Mr
+ 7pK/LKfvJt53mUH4jIdbmmFUDwbg18oBEH+x9PmbAoGAS/+JqXu9N67rIxDGUE6W
+ 3tacI0f2+U9Uhe67/DTZaXyc8YFTlXU0uWKIWy+bw5RaYeM9tlL/f/f+m2i25KK+
+ vrZ7zNag7CWU5GJovGyykDnauTpZaYM03mN0VPT08/uc/zXIYqyknbhlIeaZynCK
+ fDB3LUF0NVCknz20WCIGU0kCgYEAkxY0ZXx61Dp4pFr2wwEZxQGs7uXpz64FKyEX
+ 12r6nMATY4Lh6y/Px0W6w5vis8lk+5Ny6cNUevHQ0LNuJS+yu6ywl+1vrbrnqroM
+ f3LvpcPeGLSoX8jl1VDQi7aFgG6LoKly1xJLbdsH4NPutB9PgBbbTghx9GgmI88L
+ rPA2M6UCgYBOmkYJocNgxg6B1/n4Tb9fN1Q/XuJrFDE6NxVUoke+IIyMPRH7FC3m
+ VMYzu+b7zTVJjaBb1cmJemxl/xajziWDofJYPefhdbOVU7HXtmJFY0IG3pVxU1zW
+ 3bmDj5QAtCUDpuuNa6GEIT0YR4+D/V7o3DmlZ0tVIwKJmVJoQ2f5dw==
+ -----END RSA PRIVATE KEY-----
+ '';
+ };
+ };
};
};
@@ -19,6 +67,6 @@ import ./make-test.nix ({ pkgs, ...} : {
$gitlab->start();
$gitlab->waitForUnit("gitlab.service");
$gitlab->waitForUnit("gitlab-sidekiq.service");
- $gitlab->waitUntilSucceeds("curl http://localhost:8080/users/sign_in");
+ $gitlab->waitUntilSucceeds("curl http://localhost:80/users/sign_in");
'';
})
diff --git a/nixos/tests/gitolite.nix b/nixos/tests/gitolite.nix
new file mode 100644
index 0000000000000000000000000000000000000000..4b4e081acc5fb1f26775e90361f77aeba3e2a86e
--- /dev/null
+++ b/nixos/tests/gitolite.nix
@@ -0,0 +1,139 @@
+import ./make-test.nix ({ pkgs, ...}:
+
+let
+ adminPrivateKey = pkgs.writeText "id_ed25519" ''
+ -----BEGIN OPENSSH PRIVATE KEY-----
+ b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
+ QyNTUxOQAAACDu7qxYQAPdAU6RrhB3llk2N1v4PTwcVzcX1oX265uC3gAAAJBJiYxDSYmM
+ QwAAAAtzc2gtZWQyNTUxOQAAACDu7qxYQAPdAU6RrhB3llk2N1v4PTwcVzcX1oX265uC3g
+ AAAEDE1W6vMwSEUcF1r7Hyypm/+sCOoDmKZgPxi3WOa1mD2u7urFhAA90BTpGuEHeWWTY3
+ W/g9PBxXNxfWhfbrm4LeAAAACGJmb0BtaW5pAQIDBAU=
+ -----END OPENSSH PRIVATE KEY-----
+ '';
+
+ adminPublicKey = ''
+ ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO7urFhAA90BTpGuEHeWWTY3W/g9PBxXNxfWhfbrm4Le root@client
+ '';
+
+ alicePrivateKey = pkgs.writeText "id_ed25519" ''
+ -----BEGIN OPENSSH PRIVATE KEY-----
+ b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
+ QyNTUxOQAAACBbeWvHh/AWGWI6EIc1xlSihyXtacNQ9KeztlW/VUy8wQAAAJAwVQ5VMFUO
+ VQAAAAtzc2gtZWQyNTUxOQAAACBbeWvHh/AWGWI6EIc1xlSihyXtacNQ9KeztlW/VUy8wQ
+ AAAEB7lbfkkdkJoE+4TKHPdPQWBKLSx+J54Eg8DaTr+3KoSlt5a8eH8BYZYjoQhzXGVKKH
+ Je1pw1D0p7O2Vb9VTLzBAAAACGJmb0BtaW5pAQIDBAU=
+ -----END OPENSSH PRIVATE KEY-----
+ '';
+
+ alicePublicKey = pkgs.writeText "id_ed25519.pub" ''
+ ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFt5a8eH8BYZYjoQhzXGVKKHJe1pw1D0p7O2Vb9VTLzB alice@client
+ '';
+
+ bobPrivateKey = pkgs.writeText "id_ed25519" ''
+ -----BEGIN OPENSSH PRIVATE KEY-----
+ b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
+ QyNTUxOQAAACCWTaJ1D9Xjxy6759FvQ9oXTes1lmWBciXPkEeqTikBMAAAAJDQBmNV0AZj
+ VQAAAAtzc2gtZWQyNTUxOQAAACCWTaJ1D9Xjxy6759FvQ9oXTes1lmWBciXPkEeqTikBMA
+ AAAEDM1IYYFUwk/IVxauha9kuR6bbRtT3gZ6ZA0GLb9txb/pZNonUP1ePHLrvn0W9D2hdN
+ 6zWWZYFyJc+QR6pOKQEwAAAACGJmb0BtaW5pAQIDBAU=
+ -----END OPENSSH PRIVATE KEY-----
+ '';
+
+ bobPublicKey = pkgs.writeText "id_ed25519.pub" ''
+ ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJZNonUP1ePHLrvn0W9D2hdN6zWWZYFyJc+QR6pOKQEw bob@client
+ '';
+
+ gitoliteAdminConfSnippet = ''
+ repo alice-project
+ RW+ = alice
+ '';
+in
+{
+ name = "gitolite";
+
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ bjornfor ];
+ };
+
+ nodes = {
+
+ server =
+ { config, pkgs, lib, ... }:
+ {
+ services.gitolite = {
+ enable = true;
+ adminPubkey = adminPublicKey;
+ };
+ services.openssh.enable = true;
+ };
+
+ client =
+ { config, pkgs, lib, ... }:
+ {
+ environment.systemPackages = [ pkgs.git ];
+ programs.ssh.extraConfig = ''
+ Host *
+ UserKnownHostsFile /dev/null
+ StrictHostKeyChecking no
+ # there's nobody around that can input password
+ PreferredAuthentications publickey
+ '';
+ users.extraUsers.alice = { isNormalUser = true; };
+ users.extraUsers.bob = { isNormalUser = true; };
+ };
+
+ };
+
+ testScript = ''
+ startAll;
+
+ subtest "can setup ssh keys on system", sub {
+ $client->mustSucceed("mkdir -p ~root/.ssh");
+ $client->mustSucceed("cp ${adminPrivateKey} ~root/.ssh/id_ed25519");
+ $client->mustSucceed("chmod 600 ~root/.ssh/id_ed25519");
+
+ $client->mustSucceed("sudo -u alice mkdir -p ~alice/.ssh");
+ $client->mustSucceed("sudo -u alice cp ${alicePrivateKey} ~alice/.ssh/id_ed25519");
+ $client->mustSucceed("sudo -u alice chmod 600 ~alice/.ssh/id_ed25519");
+
+ $client->mustSucceed("sudo -u bob mkdir -p ~bob/.ssh");
+ $client->mustSucceed("sudo -u bob cp ${bobPrivateKey} ~bob/.ssh/id_ed25519");
+ $client->mustSucceed("sudo -u bob chmod 600 ~bob/.ssh/id_ed25519");
+ };
+
+ subtest "gitolite server starts", sub {
+ $server->waitForUnit("gitolite-init.service");
+ $server->waitForUnit("sshd.service");
+ $client->mustSucceed('ssh gitolite@server info');
+ };
+
+ subtest "admin can clone and configure gitolite-admin.git", sub {
+ $client->mustSucceed('git clone gitolite@server:gitolite-admin.git');
+ $client->mustSucceed("git config --global user.name 'System Administrator'");
+ $client->mustSucceed("git config --global user.email root\@domain.example");
+ $client->mustSucceed("cp ${alicePublicKey} gitolite-admin/keydir/alice.pub");
+ $client->mustSucceed("cp ${bobPublicKey} gitolite-admin/keydir/bob.pub");
+ $client->mustSucceed('(cd gitolite-admin && git add . && git commit -m "Add keys for alice, bob" && git push)');
+ $client->mustSucceed("printf '${gitoliteAdminConfSnippet}' >> gitolite-admin/conf/gitolite.conf");
+ $client->mustSucceed('(cd gitolite-admin && git add . && git commit -m "Add repo for alice" && git push)');
+ };
+
+ subtest "non-admins cannot clone gitolite-admin.git", sub {
+ $client->mustFail('sudo -i -u alice git clone gitolite@server:gitolite-admin.git');
+ $client->mustFail('sudo -i -u bob git clone gitolite@server:gitolite-admin.git');
+ };
+
+ subtest "non-admins can clone testing.git", sub {
+ $client->mustSucceed('sudo -i -u alice git clone gitolite@server:testing.git');
+ $client->mustSucceed('sudo -i -u bob git clone gitolite@server:testing.git');
+ };
+
+ subtest "alice can clone alice-project.git", sub {
+ $client->mustSucceed('sudo -i -u alice git clone gitolite@server:alice-project.git');
+ };
+
+ subtest "bob cannot clone alice-project.git", sub {
+ $client->mustFail('sudo -i -u bob git clone gitolite@server:alice-project.git');
+ };
+ '';
+})
diff --git a/nixos/tests/gnome3-gdm.nix b/nixos/tests/gnome3-gdm.nix
index 2c9c745021af5af990d055fa613060961aafb619..4b459e93e1be613fc395a317d551a94a766d3141 100644
--- a/nixos/tests/gnome3-gdm.nix
+++ b/nixos/tests/gnome3-gdm.nix
@@ -21,7 +21,7 @@ import ./make-test.nix ({ pkgs, ...} : {
};
services.xserver.desktopManager.gnome3.enable = true;
- virtualisation.memorySize = 512;
+ virtualisation.memorySize = 1024;
};
testScript =
diff --git a/nixos/tests/gnome3.nix b/nixos/tests/gnome3.nix
index 4787d42d695acc99a26d2b194cbe67bfbb973569..492fa61484a0f82e6a6e153c614d5e302614e3b5 100644
--- a/nixos/tests/gnome3.nix
+++ b/nixos/tests/gnome3.nix
@@ -15,7 +15,7 @@ import ./make-test.nix ({ pkgs, ...} : {
services.xserver.displayManager.auto.user = "alice";
services.xserver.desktopManager.gnome3.enable = true;
- virtualisation.memorySize = 512;
+ virtualisation.memorySize = 1024;
};
testScript =
diff --git a/nixos/tests/grafana.nix b/nixos/tests/grafana.nix
new file mode 100644
index 0000000000000000000000000000000000000000..16b8181498a6fb70618d5f2e5b44f0c222ec6737
--- /dev/null
+++ b/nixos/tests/grafana.nix
@@ -0,0 +1,25 @@
+import ./make-test.nix ({ lib, ... }:
+{
+ name = "grafana";
+
+ meta = with lib.maintainers; {
+ maintainers = [ willibutz ];
+ };
+
+ machine = { config, pkgs, ... }: {
+ services.grafana = {
+ enable = true;
+ addr = "localhost";
+ analytics.reporting.enable = false;
+ domain = "localhost";
+ security.adminUser = "testusername";
+ };
+ };
+
+ testScript = ''
+ $machine->start;
+ $machine->waitForUnit("grafana.service");
+ $machine->waitForOpenPort(3000);
+ $machine->succeed("curl -sS http://127.0.0.1:3000/");
+ '';
+})
diff --git a/nixos/tests/graphite.nix b/nixos/tests/graphite.nix
new file mode 100644
index 0000000000000000000000000000000000000000..a22ef224580a7852a9e82de7105ec8012864ebcf
--- /dev/null
+++ b/nixos/tests/graphite.nix
@@ -0,0 +1,32 @@
+import ./make-test.nix ({ pkgs, ...} :
+{
+ name = "graphite";
+ nodes = {
+ one =
+ { config, pkgs, ... }: {
+ time.timeZone = "UTC";
+ services.graphite = {
+ web.enable = true;
+ api = {
+ enable = true;
+ port = 8082;
+ };
+ carbon.enableCache = true;
+ seyren.enable = true;
+ pager.enable = true;
+ };
+ };
+ };
+
+ testScript = ''
+ startAll;
+ $one->waitForUnit("default.target");
+ $one->requireActiveUnit("graphiteWeb.service");
+ $one->requireActiveUnit("graphiteApi.service");
+ $one->requireActiveUnit("graphitePager.service");
+ $one->requireActiveUnit("carbonCache.service");
+ $one->requireActiveUnit("seyren.service");
+ $one->succeed("echo \"foo 1 `date +%s`\" | nc -q0 localhost 2003");
+ $one->waitUntilSucceeds("curl 'http://localhost:8080/metrics/find/?query=foo&format=treejson' --silent | grep foo")
+ '';
+})
diff --git a/nixos/tests/hardened.nix b/nixos/tests/hardened.nix
index 1d9a9043e03a592618b3074cec576d95a5b938ac..cb33b69e7199037902081f1b737330953f2c2c73 100644
--- a/nixos/tests/hardened.nix
+++ b/nixos/tests/hardened.nix
@@ -10,6 +10,17 @@ import ./make-test.nix ({ pkgs, ...} : {
{ users.users.alice = { isNormalUser = true; extraGroups = [ "proc" ]; };
users.users.sybil = { isNormalUser = true; group = "wheel"; };
imports = [ ../modules/profiles/hardened.nix ];
+ virtualisation.emptyDiskImages = [ 4096 ];
+ boot.initrd.postDeviceCommands = ''
+ ${pkgs.dosfstools}/bin/mkfs.vfat -n EFISYS /dev/vdb
+ '';
+ fileSystems = lib.mkVMOverride {
+ "/efi" = {
+ device = "/dev/disk/by-label/EFISYS";
+ fsType = "vfat";
+ options = [ "noauto" ];
+ };
+ };
};
testScript =
@@ -32,5 +43,23 @@ import ./make-test.nix ({ pkgs, ...} : {
subtest "userns", sub {
$machine->fail("unshare --user");
};
+
+ # Test dmesg restriction
+ subtest "dmesg", sub {
+ $machine->fail("su -l alice -c dmesg");
+ };
+
+ # Test access to kcore
+ subtest "kcore", sub {
+ $machine->fail("cat /proc/kcore");
+ };
+
+ # Test deferred mount
+ subtest "mount", sub {
+ $machine->fail("mountpoint -q /efi"); # was deferred
+ $machine->execute("mkdir -p /efi");
+ $machine->succeed("mount /dev/disk/by-label/EFISYS /efi");
+ $machine->succeed("mountpoint -q /efi"); # now mounted
+ };
'';
})
diff --git a/nixos/tests/hibernate.nix b/nixos/tests/hibernate.nix
index db58a2f5c857ceb5765e913fd5d8a82436cd34c3..a95235887e897c45e4993ad5fb92c8aa78bc043a 100644
--- a/nixos/tests/hibernate.nix
+++ b/nixos/tests/hibernate.nix
@@ -37,7 +37,7 @@ import ./make-test.nix (pkgs: {
$machine->waitForShutdown;
$machine->start;
$probe->waitForUnit("network.target");
- $probe->waitUntilSucceeds("echo test | nc machine 4444");
+ $probe->waitUntilSucceeds("echo test | nc machine 4444 -q 0");
'';
})
diff --git a/nixos/tests/hydra.nix b/nixos/tests/hydra.nix
new file mode 100644
index 0000000000000000000000000000000000000000..6abd7a5ad30040723f97ac2f098c4554f52bb0f1
--- /dev/null
+++ b/nixos/tests/hydra.nix
@@ -0,0 +1,32 @@
+import ./make-test.nix ({ pkgs, ...} : {
+ name = "hydra-init-localdb";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ pstn ];
+ };
+
+ machine =
+ { config, pkgs, ... }:
+
+ {
+ services.hydra = {
+ enable = true;
+
+ #Hydra needs those settings to start up, so we add something not harmfull.
+ hydraURL = "example.com";
+ notificationSender = "example@example.com";
+ };
+ };
+
+ testScript =
+ ''
+ # let the system boot up
+ $machine->waitForUnit("multi-user.target");
+ # test whether the database is running
+ $machine->succeed("systemctl status postgresql.service");
+ # test whether the actual hydra daemons are running
+ $machine->succeed("systemctl status hydra-queue-runner.service");
+ $machine->succeed("systemctl status hydra-init.service");
+ $machine->succeed("systemctl status hydra-evaluator.service");
+ $machine->succeed("systemctl status hydra-send-stats.service");
+ '';
+})
diff --git a/nixos/tests/initrd-network-ssh.nix b/nixos/tests/initrd-network-ssh.nix
new file mode 100644
index 0000000000000000000000000000000000000000..5966104939215ed6f652ef3eb0216907a9aabb38
--- /dev/null
+++ b/nixos/tests/initrd-network-ssh.nix
@@ -0,0 +1,74 @@
+import ./make-test.nix ({ pkgs, lib, ... }:
+
+let
+ keys = pkgs.runCommand "gen-keys" {
+ outputs = [ "out" "dbPub" "dbPriv" "sshPub" "sshPriv" ];
+ buildInputs = with pkgs; [ dropbear openssh ];
+ }
+ ''
+ touch $out
+ dropbearkey -t rsa -f $dbPriv -s 4096 | sed -n 2p > $dbPub
+ ssh-keygen -q -t rsa -b 4096 -N "" -f client
+ mv client $sshPriv
+ mv client.pub $sshPub
+ '';
+
+in {
+ name = "initrd-network-ssh";
+ meta = with lib.maintainers; {
+ maintainers = [ willibutz ];
+ };
+
+ nodes = with lib; rec {
+ server =
+ { config, pkgs, ... }:
+ {
+ boot.kernelParams = [
+ "ip=${
+ (head config.networking.interfaces.eth1.ip4).address
+ }:::255.255.255.0::eth1:none"
+ ];
+ boot.initrd.network = {
+ enable = true;
+ ssh = {
+ enable = true;
+ authorizedKeys = [ "${readFile keys.sshPub}" ];
+ port = 22;
+ hostRSAKey = keys.dbPriv;
+ };
+ };
+ boot.initrd.preLVMCommands = ''
+ while true; do
+ if [ -f fnord ]; then
+ poweroff
+ fi
+ sleep 1
+ done
+ '';
+ };
+
+ client =
+ { config, pkgs, ... }:
+ {
+ environment.etc.knownHosts = {
+ text = concatStrings [
+ "server,"
+ "${toString (head (splitString " " (
+ toString (elemAt (splitString "\n" config.networking.extraHosts) 2)
+ )))} "
+ "${readFile keys.dbPub}"
+ ];
+ };
+ };
+ };
+
+ testScript = ''
+ startAll;
+ $client->waitForUnit("network.target");
+ $client->copyFileFromHost("${keys.sshPriv}","/etc/sshKey");
+ $client->succeed("chmod 0600 /etc/sshKey");
+ $client->waitUntilSucceeds("ping -c 1 server");
+ $client->succeed("ssh -i /etc/sshKey -o UserKnownHostsFile=/etc/knownHosts server 'touch /fnord'");
+ $client->shutdown;
+ '';
+})
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index d1fc3c85e99adac66f7b8152cdbf999b3eb78a33..da9582deec1d9e4bb330c9e662b7ab2c1ab295cb 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -18,6 +18,9 @@ let
];
+ # To ensure that we can rebuild the grub configuration on the nixos-rebuild
+ system.extraDependencies = with pkgs; [ stdenvNoCC ];
+
${optionalString (bootLoader == "grub") ''
boot.loader.grub.version = ${toString grubVersion};
${optionalString (grubVersion == 1) ''
@@ -71,7 +74,7 @@ let
# Make sure that we get a login prompt etc.
$machine->succeed("echo hello");
#$machine->waitForUnit('getty@tty2');
- $machine->waitForUnit("rogue");
+ #$machine->waitForUnit("rogue");
$machine->waitForUnit("nixos-manual");
# Wait for hard disks to appear in /dev
@@ -257,9 +260,9 @@ in {
{ createPartitions =
''
$machine->succeed(
- "parted /dev/vda mklabel msdos",
- "parted /dev/vda -- mkpart primary linux-swap 1M 1024M",
- "parted /dev/vda -- mkpart primary ext2 1024M -1s",
+ "parted --script /dev/vda mklabel msdos",
+ "parted --script /dev/vda -- mkpart primary linux-swap 1M 1024M",
+ "parted --script /dev/vda -- mkpart primary ext2 1024M -1s",
"udevadm settle",
"mkswap /dev/vda1 -L swap",
"swapon -L swap",
@@ -274,11 +277,11 @@ in {
{ createPartitions =
''
$machine->succeed(
- "parted /dev/vda mklabel gpt",
- "parted -s /dev/vda -- mkpart ESP fat32 1M 50MiB", # /boot
- "parted -s /dev/vda -- set 1 boot on",
- "parted -s /dev/vda -- mkpart primary linux-swap 50MiB 1024MiB",
- "parted -s /dev/vda -- mkpart primary ext2 1024MiB -1MiB", # /
+ "parted --script /dev/vda mklabel gpt",
+ "parted --script /dev/vda -- mkpart ESP fat32 1M 50MiB", # /boot
+ "parted --script /dev/vda -- set 1 boot on",
+ "parted --script /dev/vda -- mkpart primary linux-swap 50MiB 1024MiB",
+ "parted --script /dev/vda -- mkpart primary ext2 1024MiB -1MiB", # /
"udevadm settle",
"mkswap /dev/vda2 -L swap",
"swapon -L swap",
@@ -297,10 +300,10 @@ in {
{ createPartitions =
''
$machine->succeed(
- "parted /dev/vda mklabel msdos",
- "parted /dev/vda -- mkpart primary ext2 1M 50MB", # /boot
- "parted /dev/vda -- mkpart primary linux-swap 50MB 1024M",
- "parted /dev/vda -- mkpart primary ext2 1024M -1s", # /
+ "parted --script /dev/vda mklabel msdos",
+ "parted --script /dev/vda -- mkpart primary ext2 1M 50MB", # /boot
+ "parted --script /dev/vda -- mkpart primary linux-swap 50MB 1024M",
+ "parted --script /dev/vda -- mkpart primary ext2 1024M -1s", # /
"udevadm settle",
"mkswap /dev/vda2 -L swap",
"swapon -L swap",
@@ -318,10 +321,10 @@ in {
{ createPartitions =
''
$machine->succeed(
- "parted /dev/vda mklabel msdos",
- "parted /dev/vda -- mkpart primary ext2 1M 50MB", # /boot
- "parted /dev/vda -- mkpart primary linux-swap 50MB 1024M",
- "parted /dev/vda -- mkpart primary ext2 1024M -1s", # /
+ "parted --script /dev/vda mklabel msdos",
+ "parted --script /dev/vda -- mkpart primary ext2 1M 50MB", # /boot
+ "parted --script /dev/vda -- mkpart primary linux-swap 50MB 1024M",
+ "parted --script /dev/vda -- mkpart primary ext2 1024M -1s", # /
"udevadm settle",
"mkswap /dev/vda2 -L swap",
"swapon -L swap",
@@ -354,9 +357,9 @@ in {
createPartitions =
''
$machine->succeed(
- "parted /dev/vda mklabel msdos",
- "parted /dev/vda -- mkpart primary linux-swap 1M 1024M",
- "parted /dev/vda -- mkpart primary 1024M -1s",
+ "parted --script /dev/vda mklabel msdos",
+ "parted --script /dev/vda -- mkpart primary linux-swap 1M 1024M",
+ "parted --script /dev/vda -- mkpart primary 1024M -1s",
"udevadm settle",
"mkswap /dev/vda1 -L swap",
@@ -377,11 +380,11 @@ in {
{ createPartitions =
''
$machine->succeed(
- "parted /dev/vda mklabel msdos",
- "parted /dev/vda -- mkpart primary 1M 2048M", # PV1
- "parted /dev/vda -- set 1 lvm on",
- "parted /dev/vda -- mkpart primary 2048M -1s", # PV2
- "parted /dev/vda -- set 2 lvm on",
+ "parted --script /dev/vda mklabel msdos",
+ "parted --script /dev/vda -- mkpart primary 1M 2048M", # PV1
+ "parted --script /dev/vda -- set 1 lvm on",
+ "parted --script /dev/vda -- mkpart primary 2048M -1s", # PV2
+ "parted --script /dev/vda -- set 2 lvm on",
"udevadm settle",
"pvcreate /dev/vda1 /dev/vda2",
"vgcreate MyVolGroup /dev/vda1 /dev/vda2",
@@ -399,10 +402,10 @@ in {
luksroot = makeInstallerTest "luksroot"
{ createPartitions = ''
$machine->succeed(
- "parted /dev/vda mklabel msdos",
- "parted /dev/vda -- mkpart primary ext2 1M 50MB", # /boot
- "parted /dev/vda -- mkpart primary linux-swap 50M 1024M",
- "parted /dev/vda -- mkpart primary 1024M -1s", # LUKS
+ "parted --script /dev/vda mklabel msdos",
+ "parted --script /dev/vda -- mkpart primary ext2 1M 50MB", # /boot
+ "parted --script /dev/vda -- mkpart primary linux-swap 50M 1024M",
+ "parted --script /dev/vda -- mkpart primary 1024M -1s", # LUKS
"udevadm settle",
"mkswap /dev/vda2 -L swap",
"swapon -L swap",
@@ -431,7 +434,7 @@ in {
{ createPartitions =
''
$machine->succeed(
- "parted /dev/vda --"
+ "parted --script /dev/vda --"
. " mklabel msdos"
. " mkpart primary ext2 1M 100MB" # /boot
. " mkpart extended 100M -1s"
@@ -466,9 +469,9 @@ in {
{ createPartitions =
''
$machine->succeed(
- "parted /dev/sda mklabel msdos",
- "parted /dev/sda -- mkpart primary linux-swap 1M 1024M",
- "parted /dev/sda -- mkpart primary ext2 1024M -1s",
+ "parted --script /dev/sda mklabel msdos",
+ "parted --script /dev/sda -- mkpart primary linux-swap 1M 1024M",
+ "parted --script /dev/sda -- mkpart primary ext2 1024M -1s",
"udevadm settle",
"mkswap /dev/sda1 -L swap",
"swapon -L swap",
diff --git a/nixos/tests/ipfs.nix b/nixos/tests/ipfs.nix
index 92d742e4f37fce3c51e6af272cb3bc2ad5b5a2d6..c6bc61545245c20d9f7afbf20c37baac0188ffe9 100644
--- a/nixos/tests/ipfs.nix
+++ b/nixos/tests/ipfs.nix
@@ -11,27 +11,45 @@ import ./make-test.nix ({ pkgs, ...} : {
{
services.ipfs = {
enable = true;
+ defaultMode = "norouting";
gatewayAddress = "/ip4/127.0.0.1/tcp/2323";
apiAddress = "/ip4/127.0.0.1/tcp/2324";
};
+ networking.firewall.allowedTCPPorts = [ 4001 ];
};
getter =
{ config, pkgs, ... }:
{
- services.ipfs.enable = true;
+ services.ipfs = {
+ enable = true;
+ defaultMode = "norouting";
+ autoMount = true;
+ };
+ networking.firewall.allowedTCPPorts = [ 4001 ];
};
};
testScript = ''
startAll;
- $adder->waitForUnit("ipfs");
- # * => needs ipfs dht (internet)
- # $getter->waitForUnit("ipfs");
+ $adder->waitForUnit("ipfs-norouting");
+ $getter->waitForUnit("ipfs-norouting");
+
+ # wait until api is available
$adder->waitUntilSucceeds("ipfs --api /ip4/127.0.0.1/tcp/2324 id");
- $adder->mustSucceed("([[ -n '$(ipfs --api /ip4/127.0.0.1/tcp/2324 config Addresses.gatewayAddress | grep /ip4/127.0.0.1/tcp/2323)' ]])");
- # * $getter->waitUntilSucceeds("ipfs --api /ip4/127.0.0.1/tcp/5001 id");
- # * my $ipfsHash = $adder->mustSucceed("echo fnord | ipfs --api /ip4/127.0.0.1/tcp/2324 add | cut -d' ' -f2");
- $adder->mustSucceed("([[ -n '$(echo fnord | ipfs --api /ip4/127.0.0.1/tcp/2324 add | grep added)' ]])");
- # * $getter->mustSucceed("ipfs --api /ip4/127.0.0.1/tcp/5001 cat $ipfsHash");
+ my $addrId = $adder->succeed("ipfs --api /ip4/127.0.0.1/tcp/2324 id -f=\"\"");
+ my $addrIp = (split /[ \/]+/, $adder->succeed("ip -o -4 addr show dev eth1"))[3];
+
+ $adder->mustSucceed("[ -n \"\$(ipfs --api /ip4/127.0.0.1/tcp/2324 config Addresses.Gateway | grep /ip4/127.0.0.1/tcp/2323)\" ]");
+
+ # wait until api is available
+ $getter->waitUntilSucceeds("ipfs --api /ip4/127.0.0.1/tcp/5001 id");
+ my $ipfsHash = $adder->mustSucceed("echo fnord | ipfs --api /ip4/127.0.0.1/tcp/2324 add | cut -d' ' -f2");
+ chomp($ipfsHash);
+
+ $adder->mustSucceed("[ -n \"\$(echo fnord | ipfs --api /ip4/127.0.0.1/tcp/2324 add | grep added)\" ]");
+
+ $getter->mustSucceed("ipfs --api /ip4/127.0.0.1/tcp/5001 swarm connect /ip4/$addrIp/tcp/4001/ipfs/$addrId");
+ $getter->mustSucceed("[ -n \"\$(ipfs --api /ip4/127.0.0.1/tcp/5001 cat /ipfs/$ipfsHash | grep fnord)\" ]");
+ $getter->mustSucceed("[ -n \"$(cat /ipfs/$ipfsHash | grep fnord)\" ]");
'';
})
diff --git a/nixos/tests/kafka_0_10.nix b/nixos/tests/kafka_0_10.nix
new file mode 100644
index 0000000000000000000000000000000000000000..6e7820f64bc4b3d848c475ccd30c76013ec6fd68
--- /dev/null
+++ b/nixos/tests/kafka_0_10.nix
@@ -0,0 +1,48 @@
+import ./make-test.nix ({ pkgs, lib, ... } :
+let
+ kafkaPackage = pkgs.apacheKafka_0_10;
+in {
+ name = "kafka_0_10";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ nequissimus ];
+ };
+
+ nodes = {
+ zookeeper1 = { config, ... }: {
+ services.zookeeper = {
+ enable = true;
+ };
+
+ networking.firewall.allowedTCPPorts = [ 2181 ];
+ };
+ kafka = { config, ... }: {
+ services.apache-kafka = {
+ enable = true;
+ extraProperties = ''
+ offsets.topic.replication.factor = 1
+ '';
+ package = kafkaPackage;
+ zookeeper = "zookeeper1:2181";
+ };
+
+ networking.firewall.allowedTCPPorts = [ 9092 ];
+ virtualisation.memorySize = 2048;
+ };
+ };
+
+ testScript = ''
+ startAll;
+
+ $zookeeper1->waitForUnit("zookeeper");
+ $zookeeper1->waitForUnit("network.target");
+ $zookeeper1->waitForOpenPort(2181);
+
+ $kafka->waitForUnit("apache-kafka");
+ $kafka->waitForUnit("network.target");
+ $kafka->waitForOpenPort(9092);
+
+ $kafka->waitUntilSucceeds("${kafkaPackage}/bin/kafka-topics.sh --create --zookeeper zookeeper1:2181 --partitions 1 --replication-factor 1 --topic testtopic");
+ $kafka->mustSucceed("echo 'test 1' | ${kafkaPackage}/bin/kafka-console-producer.sh --broker-list localhost:9092 --topic testtopic");
+ $kafka->mustSucceed("${kafkaPackage}/bin/kafka-console-consumer.sh --bootstrap-server localhost:9092 --topic testtopic --from-beginning --max-messages 1 | grep 'test 1'");
+ '';
+})
diff --git a/nixos/tests/kafka_0_11.nix b/nixos/tests/kafka_0_11.nix
new file mode 100644
index 0000000000000000000000000000000000000000..39f9c36bb22969f68d194f6cd294af8cdc72173c
--- /dev/null
+++ b/nixos/tests/kafka_0_11.nix
@@ -0,0 +1,48 @@
+import ./make-test.nix ({ pkgs, lib, ... } :
+let
+ kafkaPackage = pkgs.apacheKafka_0_11;
+in {
+ name = "kafka_0_11";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ nequissimus ];
+ };
+
+ nodes = {
+ zookeeper1 = { config, ... }: {
+ services.zookeeper = {
+ enable = true;
+ };
+
+ networking.firewall.allowedTCPPorts = [ 2181 ];
+ };
+ kafka = { config, ... }: {
+ services.apache-kafka = {
+ enable = true;
+ extraProperties = ''
+ offsets.topic.replication.factor = 1
+ '';
+ package = kafkaPackage;
+ zookeeper = "zookeeper1:2181";
+ };
+
+ networking.firewall.allowedTCPPorts = [ 9092 ];
+ virtualisation.memorySize = 2048;
+ };
+ };
+
+ testScript = ''
+ startAll;
+
+ $zookeeper1->waitForUnit("zookeeper");
+ $zookeeper1->waitForUnit("network.target");
+ $zookeeper1->waitForOpenPort(2181);
+
+ $kafka->waitForUnit("apache-kafka");
+ $kafka->waitForUnit("network.target");
+ $kafka->waitForOpenPort(9092);
+
+ $kafka->waitUntilSucceeds("${kafkaPackage}/bin/kafka-topics.sh --create --zookeeper zookeeper1:2181 --partitions 1 --replication-factor 1 --topic testtopic");
+ $kafka->mustSucceed("echo 'test 1' | ${kafkaPackage}/bin/kafka-console-producer.sh --broker-list localhost:9092 --topic testtopic");
+ $kafka->mustSucceed("${kafkaPackage}/bin/kafka-console-consumer.sh --bootstrap-server localhost:9092 --topic testtopic --from-beginning --max-messages 1 | grep 'test 1'");
+ '';
+})
diff --git a/nixos/tests/kafka_0_9.nix b/nixos/tests/kafka_0_9.nix
new file mode 100644
index 0000000000000000000000000000000000000000..fee82aba2bda317884f069291a2cd5a81ee195c2
--- /dev/null
+++ b/nixos/tests/kafka_0_9.nix
@@ -0,0 +1,48 @@
+import ./make-test.nix ({ pkgs, lib, ... } :
+let
+ kafkaPackage = pkgs.apacheKafka_0_9;
+in {
+ name = "kafka_0_9";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ nequissimus ];
+ };
+
+ nodes = {
+ zookeeper1 = { config, ... }: {
+ services.zookeeper = {
+ enable = true;
+ };
+
+ networking.firewall.allowedTCPPorts = [ 2181 ];
+ };
+ kafka = { config, ... }: {
+ services.apache-kafka = {
+ enable = true;
+ extraProperties = ''
+ offsets.topic.replication.factor = 1
+ '';
+ package = kafkaPackage;
+ zookeeper = "zookeeper1:2181";
+ };
+
+ networking.firewall.allowedTCPPorts = [ 9092 ];
+ virtualisation.memorySize = 2048;
+ };
+ };
+
+ testScript = ''
+ startAll;
+
+ $zookeeper1->waitForUnit("zookeeper");
+ $zookeeper1->waitForUnit("network.target");
+ $zookeeper1->waitForOpenPort(2181);
+
+ $kafka->waitForUnit("apache-kafka");
+ $kafka->waitForUnit("network.target");
+ $kafka->waitForOpenPort(9092);
+
+ $kafka->waitUntilSucceeds("${kafkaPackage}/bin/kafka-topics.sh --create --zookeeper zookeeper1:2181 --partitions 1 --replication-factor 1 --topic testtopic");
+ $kafka->mustSucceed("echo 'test 1' | ${kafkaPackage}/bin/kafka-console-producer.sh --broker-list localhost:9092 --topic testtopic");
+ $kafka->mustSucceed("${kafkaPackage}/bin/kafka-console-consumer.sh --zookeeper zookeeper1:2181 --topic testtopic --from-beginning --max-messages 1 | grep 'test 1'");
+ '';
+})
diff --git a/nixos/tests/kafka_1_0.nix b/nixos/tests/kafka_1_0.nix
new file mode 100644
index 0000000000000000000000000000000000000000..936840dbcfdc6a7dfb2eeabcddc344f94a62263c
--- /dev/null
+++ b/nixos/tests/kafka_1_0.nix
@@ -0,0 +1,48 @@
+import ./make-test.nix ({ pkgs, lib, ... } :
+let
+ kafkaPackage = pkgs.apacheKafka_1_0;
+in {
+ name = "kafka_1_0";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ nequissimus ];
+ };
+
+ nodes = {
+ zookeeper1 = { config, ... }: {
+ services.zookeeper = {
+ enable = true;
+ };
+
+ networking.firewall.allowedTCPPorts = [ 2181 ];
+ };
+ kafka = { config, ... }: {
+ services.apache-kafka = {
+ enable = true;
+ extraProperties = ''
+ offsets.topic.replication.factor = 1
+ '';
+ package = kafkaPackage;
+ zookeeper = "zookeeper1:2181";
+ };
+
+ networking.firewall.allowedTCPPorts = [ 9092 ];
+ virtualisation.memorySize = 2048;
+ };
+ };
+
+ testScript = ''
+ startAll;
+
+ $zookeeper1->waitForUnit("zookeeper");
+ $zookeeper1->waitForUnit("network.target");
+ $zookeeper1->waitForOpenPort(2181);
+
+ $kafka->waitForUnit("apache-kafka");
+ $kafka->waitForUnit("network.target");
+ $kafka->waitForOpenPort(9092);
+
+ $kafka->waitUntilSucceeds("${kafkaPackage}/bin/kafka-topics.sh --create --zookeeper zookeeper1:2181 --partitions 1 --replication-factor 1 --topic testtopic");
+ $kafka->mustSucceed("echo 'test 1' | ${kafkaPackage}/bin/kafka-console-producer.sh --broker-list localhost:9092 --topic testtopic");
+ $kafka->mustSucceed("${kafkaPackage}/bin/kafka-console-consumer.sh --bootstrap-server localhost:9092 --topic testtopic --from-beginning --max-messages 1 | grep 'test 1'");
+ '';
+})
diff --git a/nixos/tests/kernel-copperhead.nix b/nixos/tests/kernel-copperhead.nix
new file mode 100644
index 0000000000000000000000000000000000000000..07427d7f2a8935e9378cb47349d7e6a1a28b460a
--- /dev/null
+++ b/nixos/tests/kernel-copperhead.nix
@@ -0,0 +1,19 @@
+import ./make-test.nix ({ pkgs, ...} : {
+ name = "kernel-copperhead";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ nequissimus ];
+ };
+
+ machine = { config, lib, pkgs, ... }:
+ {
+ boot.kernelPackages = pkgs.linuxPackages_hardened_copperhead;
+ };
+
+ testScript =
+ ''
+ $machine->succeed("uname -a");
+ $machine->succeed("uname -s | grep 'Linux'");
+ $machine->succeed("uname -a | grep '${pkgs.linuxPackages_hardened_copperhead.kernel.modDirVersion}'");
+ $machine->succeed("uname -a | grep 'hardened'");
+ '';
+})
diff --git a/nixos/tests/kernel-latest.nix b/nixos/tests/kernel-latest.nix
new file mode 100644
index 0000000000000000000000000000000000000000..1350426654d70ac78f787881cc5339b959427659
--- /dev/null
+++ b/nixos/tests/kernel-latest.nix
@@ -0,0 +1,17 @@
+import ./make-test.nix ({ pkgs, ...} : {
+ name = "kernel-latest";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ nequissimus ];
+ };
+
+ machine = { config, lib, pkgs, ... }:
+ {
+ boot.kernelPackages = pkgs.linuxPackages_latest;
+ };
+
+ testScript =
+ ''
+ $machine->succeed("uname -s | grep 'Linux'");
+ $machine->succeed("uname -a | grep '${pkgs.linuxPackages_latest.kernel.version}'");
+ '';
+})
diff --git a/nixos/tests/kernel-lts.nix b/nixos/tests/kernel-lts.nix
new file mode 100644
index 0000000000000000000000000000000000000000..2aab4ce0b49e1b348226ae2a3880b78e818f3af4
--- /dev/null
+++ b/nixos/tests/kernel-lts.nix
@@ -0,0 +1,17 @@
+import ./make-test.nix ({ pkgs, ...} : {
+ name = "kernel-lts";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ nequissimus ];
+ };
+
+ machine = { config, lib, pkgs, ... }:
+ {
+ boot.kernelPackages = pkgs.linuxPackages;
+ };
+
+ testScript =
+ ''
+ $machine->succeed("uname -s | grep 'Linux'");
+ $machine->succeed("uname -a | grep '${pkgs.linuxPackages.kernel.version}'");
+ '';
+})
diff --git a/nixos/tests/krb5/default.nix b/nixos/tests/krb5/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..dd5b2f37202e8cea5bd176a4bd7f4c1e1ece20a0
--- /dev/null
+++ b/nixos/tests/krb5/default.nix
@@ -0,0 +1,5 @@
+{ system ? builtins.currentSystem }:
+{
+ example-config = import ./example-config.nix { inherit system; };
+ deprecated-config = import ./deprecated-config.nix { inherit system; };
+}
diff --git a/nixos/tests/krb5/deprecated-config.nix b/nixos/tests/krb5/deprecated-config.nix
new file mode 100644
index 0000000000000000000000000000000000000000..980b3e762dc6c44104a355f9426305bec854643f
--- /dev/null
+++ b/nixos/tests/krb5/deprecated-config.nix
@@ -0,0 +1,48 @@
+# Verifies that the configuration suggested in deprecated example values
+# will result in the expected output.
+
+import ../make-test.nix ({ pkgs, ...} : {
+ name = "krb5-with-deprecated-config";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ eqyiel ];
+ };
+
+ machine =
+ { config, pkgs, ... }: {
+ krb5 = {
+ enable = true;
+ defaultRealm = "ATHENA.MIT.EDU";
+ domainRealm = "athena.mit.edu";
+ kdc = "kerberos.mit.edu";
+ kerberosAdminServer = "kerberos.mit.edu";
+ };
+ };
+
+ testScript =
+ let snapshot = pkgs.writeText "krb5-with-deprecated-config.conf" ''
+ [libdefaults]
+ default_realm = ATHENA.MIT.EDU
+
+ [realms]
+ ATHENA.MIT.EDU = {
+ admin_server = kerberos.mit.edu
+ kdc = kerberos.mit.edu
+ }
+
+ [domain_realm]
+ .athena.mit.edu = ATHENA.MIT.EDU
+ athena.mit.edu = ATHENA.MIT.EDU
+
+ [capaths]
+
+
+ [appdefaults]
+
+
+ [plugins]
+
+ '';
+ in ''
+ $machine->succeed("diff /etc/krb5.conf ${snapshot}");
+ '';
+})
diff --git a/nixos/tests/krb5/example-config.nix b/nixos/tests/krb5/example-config.nix
new file mode 100644
index 0000000000000000000000000000000000000000..d5328720931e8b9d6a0c94278a93b8e5d7b3a5d9
--- /dev/null
+++ b/nixos/tests/krb5/example-config.nix
@@ -0,0 +1,106 @@
+# Verifies that the configuration suggested in (non-deprecated) example values
+# will result in the expected output.
+
+import ../make-test.nix ({ pkgs, ...} : {
+ name = "krb5-with-example-config";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ eqyiel ];
+ };
+
+ machine =
+ { config, pkgs, ... }: {
+ krb5 = {
+ enable = true;
+ kerberos = pkgs.krb5Full;
+ libdefaults = {
+ default_realm = "ATHENA.MIT.EDU";
+ };
+ realms = {
+ "ATHENA.MIT.EDU" = {
+ admin_server = "athena.mit.edu";
+ kdc = "athena.mit.edu";
+ };
+ };
+ domain_realm = {
+ "example.com" = "EXAMPLE.COM";
+ ".example.com" = "EXAMPLE.COM";
+ };
+ capaths = {
+ "ATHENA.MIT.EDU" = {
+ "EXAMPLE.COM" = ".";
+ };
+ "EXAMPLE.COM" = {
+ "ATHENA.MIT.EDU" = ".";
+ };
+ };
+ appdefaults = {
+ pam = {
+ debug = false;
+ ticket_lifetime = 36000;
+ renew_lifetime = 36000;
+ max_timeout = 30;
+ timeout_shift = 2;
+ initial_timeout = 1;
+ };
+ };
+ plugins = {
+ ccselect = {
+ disable = "k5identity";
+ };
+ };
+ extraConfig = ''
+ [logging]
+ kdc = SYSLOG:NOTICE
+ admin_server = SYSLOG:NOTICE
+ default = SYSLOG:NOTICE
+ '';
+ };
+ };
+
+ testScript =
+ let snapshot = pkgs.writeText "krb5-with-example-config.conf" ''
+ [libdefaults]
+ default_realm = ATHENA.MIT.EDU
+
+ [realms]
+ ATHENA.MIT.EDU = {
+ admin_server = athena.mit.edu
+ kdc = athena.mit.edu
+ }
+
+ [domain_realm]
+ .example.com = EXAMPLE.COM
+ example.com = EXAMPLE.COM
+
+ [capaths]
+ ATHENA.MIT.EDU = {
+ EXAMPLE.COM = .
+ }
+ EXAMPLE.COM = {
+ ATHENA.MIT.EDU = .
+ }
+
+ [appdefaults]
+ pam = {
+ debug = false
+ initial_timeout = 1
+ max_timeout = 30
+ renew_lifetime = 36000
+ ticket_lifetime = 36000
+ timeout_shift = 2
+ }
+
+ [plugins]
+ ccselect = {
+ disable = k5identity
+ }
+
+ [logging]
+ kdc = SYSLOG:NOTICE
+ admin_server = SYSLOG:NOTICE
+ default = SYSLOG:NOTICE
+ '';
+ in ''
+ $machine->succeed("diff /etc/krb5.conf ${snapshot}");
+ '';
+})
diff --git a/nixos/tests/kubernetes.nix b/nixos/tests/kubernetes.nix
deleted file mode 100644
index dcd25e211971b91c90ed2ce8dd8753a77639c470..0000000000000000000000000000000000000000
--- a/nixos/tests/kubernetes.nix
+++ /dev/null
@@ -1,409 +0,0 @@
-{ system ? builtins.currentSystem }:
-
-with import ../lib/testing.nix { inherit system; };
-with import ../lib/qemu-flags.nix;
-with pkgs.lib;
-
-let
- redisPod = pkgs.writeText "redis-master-pod.json" (builtins.toJSON {
- kind = "Pod";
- apiVersion = "v1";
- metadata.name = "redis";
- metadata.labels.name = "redis";
- spec.containers = [{
- name = "redis";
- image = "redis";
- args = ["--bind" "0.0.0.0"];
- imagePullPolicy = "Never";
- ports = [{
- name = "redis-server";
- containerPort = 6379;
- }];
- }];
- });
-
- redisService = pkgs.writeText "redis-service.json" (builtins.toJSON {
- kind = "Service";
- apiVersion = "v1";
- metadata.name = "redis";
- spec = {
- ports = [{port = 6379; targetPort = 6379;}];
- selector = {name = "redis";};
- };
- });
-
- redisImage = pkgs.dockerTools.buildImage {
- name = "redis";
- tag = "latest";
- contents = pkgs.redis;
- config.Entrypoint = "/bin/redis-server";
- };
-
- testSimplePod = ''
- $kubernetes->execute("docker load < ${redisImage}");
- $kubernetes->waitUntilSucceeds("kubectl create -f ${redisPod}");
- $kubernetes->succeed("kubectl create -f ${redisService}");
- $kubernetes->waitUntilSucceeds("kubectl get pod redis | grep Running");
- $kubernetes->succeed("nc -z \$\(dig \@10.10.0.1 redis.default.svc.cluster.local +short\) 6379");
- '';
-in {
- # This test runs kubernetes on a single node
- trivial = makeTest {
- name = "kubernetes-trivial";
-
- nodes = {
- kubernetes =
- { config, pkgs, lib, nodes, ... }:
- {
- virtualisation.memorySize = 768;
- virtualisation.diskSize = 2048;
-
- programs.bash.enableCompletion = true;
- environment.systemPackages = with pkgs; [ netcat bind ];
-
- services.kubernetes.roles = ["master" "node"];
- virtualisation.docker.extraOptions = "--iptables=false --ip-masq=false -b cbr0";
-
- networking.bridges.cbr0.interfaces = [];
- networking.interfaces.cbr0 = {};
- };
- };
-
- testScript = ''
- startAll;
-
- $kubernetes->waitUntilSucceeds("kubectl get nodes | grep kubernetes | grep Ready");
-
- ${testSimplePod}
- '';
- };
-
- cluster = let
- runWithOpenSSL = file: cmd: pkgs.runCommand file {
- buildInputs = [ pkgs.openssl ];
- } cmd;
-
- ca_key = runWithOpenSSL "ca-key.pem" "openssl genrsa -out $out 2048";
- ca_pem = runWithOpenSSL "ca.pem" ''
- openssl req \
- -x509 -new -nodes -key ${ca_key} \
- -days 10000 -out $out -subj "/CN=etcd-ca"
- '';
- etcd_key = runWithOpenSSL "etcd-key.pem" "openssl genrsa -out $out 2048";
- etcd_csr = runWithOpenSSL "etcd.csr" ''
- openssl req \
- -new -key ${etcd_key} \
- -out $out -subj "/CN=etcd" \
- -config ${openssl_cnf}
- '';
- etcd_cert = runWithOpenSSL "etcd.pem" ''
- openssl x509 \
- -req -in ${etcd_csr} \
- -CA ${ca_pem} -CAkey ${ca_key} \
- -CAcreateserial -out $out \
- -days 365 -extensions v3_req \
- -extfile ${openssl_cnf}
- '';
-
- etcd_client_key = runWithOpenSSL "etcd-client-key.pem"
- "openssl genrsa -out $out 2048";
-
- etcd_client_csr = runWithOpenSSL "etcd-client-key.pem" ''
- openssl req \
- -new -key ${etcd_client_key} \
- -out $out -subj "/CN=etcd-client" \
- -config ${client_openssl_cnf}
- '';
-
- etcd_client_cert = runWithOpenSSL "etcd-client.crt" ''
- openssl x509 \
- -req -in ${etcd_client_csr} \
- -CA ${ca_pem} -CAkey ${ca_key} -CAcreateserial \
- -out $out -days 365 -extensions v3_req \
- -extfile ${client_openssl_cnf}
- '';
-
- apiserver_key = runWithOpenSSL "apiserver-key.pem" "openssl genrsa -out $out 2048";
-
- apiserver_csr = runWithOpenSSL "apiserver.csr" ''
- openssl req \
- -new -key ${apiserver_key} \
- -out $out -subj "/CN=kube-apiserver" \
- -config ${apiserver_cnf}
- '';
-
- apiserver_cert = runWithOpenSSL "apiserver.pem" ''
- openssl x509 \
- -req -in ${apiserver_csr} \
- -CA ${ca_pem} -CAkey ${ca_key} -CAcreateserial \
- -out $out -days 365 -extensions v3_req \
- -extfile ${apiserver_cnf}
- '';
-
- worker_key = runWithOpenSSL "worker-key.pem" "openssl genrsa -out $out 2048";
-
- worker_csr = runWithOpenSSL "worker.csr" ''
- openssl req \
- -new -key ${worker_key} \
- -out $out -subj "/CN=kube-worker" \
- -config ${worker_cnf}
- '';
-
- worker_cert = runWithOpenSSL "worker.pem" ''
- openssl x509 \
- -req -in ${worker_csr} \
- -CA ${ca_pem} -CAkey ${ca_key} -CAcreateserial \
- -out $out -days 365 -extensions v3_req \
- -extfile ${worker_cnf}
- '';
-
- openssl_cnf = pkgs.writeText "openssl.cnf" ''
- [req]
- req_extensions = v3_req
- distinguished_name = req_distinguished_name
- [req_distinguished_name]
- [ v3_req ]
- basicConstraints = CA:FALSE
- keyUsage = digitalSignature, keyEncipherment
- extendedKeyUsage = serverAuth
- subjectAltName = @alt_names
- [alt_names]
- DNS.1 = etcd1
- DNS.2 = etcd2
- DNS.3 = etcd3
- IP.1 = 127.0.0.1
- '';
-
- client_openssl_cnf = pkgs.writeText "client-openssl.cnf" ''
- [req]
- req_extensions = v3_req
- distinguished_name = req_distinguished_name
- [req_distinguished_name]
- [ v3_req ]
- basicConstraints = CA:FALSE
- keyUsage = digitalSignature, keyEncipherment
- extendedKeyUsage = clientAuth
- '';
-
- apiserver_cnf = pkgs.writeText "apiserver-openssl.cnf" ''
- [req]
- req_extensions = v3_req
- distinguished_name = req_distinguished_name
- [req_distinguished_name]
- [ v3_req ]
- basicConstraints = CA:FALSE
- keyUsage = nonRepudiation, digitalSignature, keyEncipherment
- subjectAltName = @alt_names
- [alt_names]
- DNS.1 = kubernetes
- DNS.2 = kubernetes.default
- DNS.3 = kubernetes.default.svc
- DNS.4 = kubernetes.default.svc.cluster.local
- IP.1 = 10.10.10.1
- '';
-
- worker_cnf = pkgs.writeText "worker-openssl.cnf" ''
- [req]
- req_extensions = v3_req
- distinguished_name = req_distinguished_name
- [req_distinguished_name]
- [ v3_req ]
- basicConstraints = CA:FALSE
- keyUsage = nonRepudiation, digitalSignature, keyEncipherment
- subjectAltName = @alt_names
- [alt_names]
- DNS.1 = kubeWorker1
- DNS.2 = kubeWorker2
- '';
-
- etcdNodeConfig = {
- virtualisation.memorySize = 128;
-
- services = {
- etcd = {
- enable = true;
- keyFile = etcd_key;
- certFile = etcd_cert;
- trustedCaFile = ca_pem;
- peerClientCertAuth = true;
- listenClientUrls = ["https://0.0.0.0:2379"];
- listenPeerUrls = ["https://0.0.0.0:2380"];
- };
- };
-
- environment.variables = {
- ETCDCTL_CERT_FILE = "${etcd_client_cert}";
- ETCDCTL_KEY_FILE = "${etcd_client_key}";
- ETCDCTL_CA_FILE = "${ca_pem}";
- ETCDCTL_PEERS = "https://127.0.0.1:2379";
- };
-
- networking.firewall.allowedTCPPorts = [ 2379 2380 ];
- };
-
- kubeConfig = {
- virtualisation.diskSize = 2048;
- programs.bash.enableCompletion = true;
-
- services.flannel = {
- enable = true;
- network = "10.10.0.0/16";
- iface = "eth1";
- etcd = {
- endpoints = ["https://etcd1:2379" "https://etcd2:2379" "https://etcd3:2379"];
- keyFile = etcd_client_key;
- certFile = etcd_client_cert;
- caFile = ca_pem;
- };
- };
-
- # vxlan
- networking.firewall.allowedUDPPorts = [ 8472 ];
-
- systemd.services.docker.after = ["flannel.service"];
- systemd.services.docker.serviceConfig.EnvironmentFile = "/run/flannel/subnet.env";
- virtualisation.docker.extraOptions = "--iptables=false --ip-masq=false --bip $FLANNEL_SUBNET";
-
- services.kubernetes.verbose = true;
- services.kubernetes.etcd = {
- servers = ["https://etcd1:2379" "https://etcd2:2379" "https://etcd3:2379"];
- keyFile = etcd_client_key;
- certFile = etcd_client_cert;
- caFile = ca_pem;
- };
-
- environment.systemPackages = [ pkgs.bind pkgs.tcpdump pkgs.utillinux ];
- };
-
- kubeMasterConfig = {pkgs, ...}: {
- require = [kubeConfig];
-
- # kube apiserver
- networking.firewall.allowedTCPPorts = [ 443 ];
-
- virtualisation.memorySize = 512;
-
- services.kubernetes = {
- roles = ["master"];
- scheduler.leaderElect = true;
- controllerManager.leaderElect = true;
-
- apiserver = {
- publicAddress = "0.0.0.0";
- advertiseAddress = "192.168.1.8";
- tlsKeyFile = apiserver_key;
- tlsCertFile = apiserver_cert;
- clientCaFile = ca_pem;
- kubeletClientCaFile = ca_pem;
- kubeletClientKeyFile = worker_key;
- kubeletClientCertFile = worker_cert;
- };
- };
- };
-
- kubeWorkerConfig = { pkgs, ... }: {
- require = [kubeConfig];
-
- virtualisation.memorySize = 512;
-
- # kubelet
- networking.firewall.allowedTCPPorts = [ 10250 ];
-
- services.kubernetes = {
- roles = ["node"];
- kubeconfig = {
- server = "https://kubernetes:443";
- caFile = ca_pem;
- certFile = worker_cert;
- keyFile = worker_key;
- };
- kubelet = {
- tlsKeyFile = worker_key;
- tlsCertFile = worker_cert;
- };
- };
- };
- in makeTest {
- name = "kubernetes-cluster";
-
- nodes = {
- etcd1 = { config, pkgs, nodes, ... }: {
- require = [etcdNodeConfig];
- services.etcd = {
- advertiseClientUrls = ["https://etcd1:2379"];
- initialCluster = ["etcd1=https://etcd1:2380" "etcd2=https://etcd2:2380" "etcd3=https://etcd3:2380"];
- initialAdvertisePeerUrls = ["https://etcd1:2380"];
- };
- };
-
- etcd2 = { config, pkgs, ... }: {
- require = [etcdNodeConfig];
- services.etcd = {
- advertiseClientUrls = ["https://etcd2:2379"];
- initialCluster = ["etcd1=https://etcd1:2380" "etcd2=https://etcd2:2380" "etcd3=https://etcd3:2380"];
- initialAdvertisePeerUrls = ["https://etcd2:2380"];
- };
- };
-
- etcd3 = { config, pkgs, ... }: {
- require = [etcdNodeConfig];
- services.etcd = {
- advertiseClientUrls = ["https://etcd3:2379"];
- initialCluster = ["etcd1=https://etcd1:2380" "etcd2=https://etcd2:2380" "etcd3=https://etcd3:2380"];
- initialAdvertisePeerUrls = ["https://etcd3:2380"];
- };
- };
-
- kubeMaster1 = { config, pkgs, lib, nodes, ... }: {
- require = [kubeMasterConfig];
- };
-
- kubeMaster2 = { config, pkgs, lib, nodes, ... }: {
- require = [kubeMasterConfig];
- };
-
- # Kubernetes TCP load balancer
- kubernetes = { config, pkgs, ... }: {
- # kubernetes
- networking.firewall.allowedTCPPorts = [ 443 ];
-
- services.haproxy.enable = true;
- services.haproxy.config = ''
- global
- log 127.0.0.1 local0 notice
- user haproxy
- group haproxy
-
- defaults
- log global
- retries 2
- timeout connect 3000
- timeout server 5000
- timeout client 5000
-
- listen kubernetes
- bind 0.0.0.0:443
- mode tcp
- option ssl-hello-chk
- balance roundrobin
- server kube-master-1 kubeMaster1:443 check
- server kube-master-2 kubeMaster2:443 check
- '';
- };
-
- kubeWorker1 = { config, pkgs, lib, nodes, ... }: {
- require = [kubeWorkerConfig];
- };
-
- kubeWorker2 = { config, pkgs, lib, nodes, ... }: {
- require = [kubeWorkerConfig];
- };
- };
-
- testScript = ''
- startAll;
-
- ${testSimplePod}
- '';
- };
-}
diff --git a/nixos/tests/kubernetes/base.nix b/nixos/tests/kubernetes/base.nix
new file mode 100644
index 0000000000000000000000000000000000000000..acf2e0250819abcca0087559da3c6f4337b0b877
--- /dev/null
+++ b/nixos/tests/kubernetes/base.nix
@@ -0,0 +1,113 @@
+{ system ? builtins.currentSystem }:
+
+with import ../../lib/testing.nix { inherit system; };
+with import ../../lib/qemu-flags.nix;
+with pkgs.lib;
+
+let
+ mkKubernetesBaseTest =
+ { name, domain ? "my.zyx", test, machines
+ , pkgs ? import { inherit system; }
+ , certs ? import ./certs.nix { inherit pkgs; externalDomain = domain; }
+ , extraConfiguration ? null }:
+ let
+ masterName = head (filter (machineName: any (role: role == "master") machines.${machineName}.roles) (attrNames machines));
+ master = machines.${masterName};
+ extraHosts = ''
+ ${master.ip} etcd.${domain}
+ ${master.ip} api.${domain}
+ ${concatMapStringsSep "\n" (machineName: "${machines.${machineName}.ip} ${machineName}.${domain}") (attrNames machines)}
+ '';
+ in makeTest {
+ inherit name;
+
+ nodes = mapAttrs (machineName: machine:
+ { config, pkgs, lib, nodes, ... }:
+ mkMerge [
+ {
+ virtualisation.memorySize = mkDefault 768;
+ virtualisation.diskSize = mkDefault 4096;
+ networking = {
+ inherit domain extraHosts;
+ primaryIPAddress = mkForce machine.ip;
+
+ firewall = {
+ allowedTCPPorts = [
+ 10250 # kubelet
+ ];
+ trustedInterfaces = ["docker0"];
+
+ extraCommands = concatMapStrings (node: ''
+ iptables -A INPUT -s ${node.config.networking.primaryIPAddress} -j ACCEPT
+ '') (attrValues nodes);
+ };
+ };
+ programs.bash.enableCompletion = true;
+ environment.variables = {
+ ETCDCTL_CERT_FILE = "${certs.worker}/etcd-client.pem";
+ ETCDCTL_KEY_FILE = "${certs.worker}/etcd-client-key.pem";
+ ETCDCTL_CA_FILE = "${certs.worker}/ca.pem";
+ ETCDCTL_PEERS = "https://etcd.${domain}:2379";
+ };
+ services.flannel.iface = "eth1";
+ services.kubernetes.apiserver.advertiseAddress = master.ip;
+ }
+ (optionalAttrs (any (role: role == "master") machine.roles) {
+ networking.firewall.allowedTCPPorts = [
+ 2379 2380 # etcd
+ 443 # kubernetes apiserver
+ ];
+ services.etcd = {
+ enable = true;
+ certFile = "${certs.master}/etcd.pem";
+ keyFile = "${certs.master}/etcd-key.pem";
+ trustedCaFile = "${certs.master}/ca.pem";
+ peerClientCertAuth = true;
+ listenClientUrls = ["https://0.0.0.0:2379"];
+ listenPeerUrls = ["https://0.0.0.0:2380"];
+ advertiseClientUrls = ["https://etcd.${config.networking.domain}:2379"];
+ initialCluster = ["${masterName}=https://etcd.${config.networking.domain}:2380"];
+ initialAdvertisePeerUrls = ["https://etcd.${config.networking.domain}:2380"];
+ };
+ })
+ (import ./kubernetes-common.nix { inherit (machine) roles; inherit pkgs config certs; })
+ (optionalAttrs (machine ? "extraConfiguration") (machine.extraConfiguration { inherit config pkgs lib nodes; }))
+ (optionalAttrs (extraConfiguration != null) (extraConfiguration { inherit config pkgs lib nodes; }))
+ ]
+ ) machines;
+
+ testScript = ''
+ startAll;
+
+ ${test}
+ '';
+ };
+
+ mkKubernetesMultiNodeTest = attrs: mkKubernetesBaseTest ({
+ machines = {
+ machine1 = {
+ roles = ["master"];
+ ip = "192.168.1.1";
+ };
+ machine2 = {
+ roles = ["node"];
+ ip = "192.168.1.2";
+ };
+ };
+ } // attrs // {
+ name = "kubernetes-${attrs.name}-multinode";
+ });
+
+ mkKubernetesSingleNodeTest = attrs: mkKubernetesBaseTest ({
+ machines = {
+ machine1 = {
+ roles = ["master" "node"];
+ ip = "192.168.1.1";
+ };
+ };
+ } // attrs // {
+ name = "kubernetes-${attrs.name}-singlenode";
+ });
+in {
+ inherit mkKubernetesBaseTest mkKubernetesSingleNodeTest mkKubernetesMultiNodeTest;
+}
diff --git a/nixos/tests/kubernetes/certs.nix b/nixos/tests/kubernetes/certs.nix
new file mode 100644
index 0000000000000000000000000000000000000000..f108e35b98cd11dfdb16bafac094787d3495624d
--- /dev/null
+++ b/nixos/tests/kubernetes/certs.nix
@@ -0,0 +1,185 @@
+{
+ pkgs ? import {},
+ internalDomain ? "cloud.yourdomain.net",
+ externalDomain ? "myawesomecluster.cluster.yourdomain.net",
+ serviceClusterIp ? "10.0.0.1"
+}:
+let
+ runWithCFSSL = name: cmd:
+ builtins.fromJSON (builtins.readFile (
+ pkgs.runCommand "${name}-cfss.json" {
+ buildInputs = [ pkgs.cfssl ];
+ } "cfssl ${cmd} > $out"
+ ));
+
+ writeCFSSL = content:
+ pkgs.runCommand content.name {
+ buildInputs = [ pkgs.cfssl ];
+ } ''
+ mkdir -p $out
+ cd $out
+ cat ${writeFile content} | cfssljson -bare ${content.name}
+ '';
+
+ noCSR = content: pkgs.lib.filterAttrs (n: v: n != "csr") content;
+ noKey = content: pkgs.lib.filterAttrs (n: v: n != "key") content;
+
+ writeFile = content: pkgs.writeText "content" (
+ if pkgs.lib.isAttrs content then builtins.toJSON content
+ else toString content
+ );
+
+ createServingCertKey = { ca, cn, hosts? [], size ? 2048, name ? cn }:
+ noCSR (
+ (runWithCFSSL name "gencert -ca=${writeFile ca.cert} -ca-key=${writeFile ca.key} -profile=server -config=${writeFile ca.config} ${writeFile {
+ CN = cn;
+ hosts = hosts;
+ key = { algo = "rsa"; inherit size; };
+ }}") // { inherit name; }
+ );
+
+ createClientCertKey = { ca, cn, groups ? [], size ? 2048, name ? cn }:
+ noCSR (
+ (runWithCFSSL name "gencert -ca=${writeFile ca.cert} -ca-key=${writeFile ca.key} -profile=client -config=${writeFile ca.config} ${writeFile {
+ CN = cn;
+ names = map (group: {O = group;}) groups;
+ hosts = [""];
+ key = { algo = "rsa"; inherit size; };
+ }}") // { inherit name; }
+ );
+
+ createSigningCertKey = { C ? "xx", ST ? "x", L ? "x", O ? "x", OU ? "x", CN ? "ca", emailAddress ? "x", expiry ? "43800h", size ? 2048, name ? CN }:
+ (noCSR (runWithCFSSL CN "genkey -initca ${writeFile {
+ key = { algo = "rsa"; inherit size; };
+ names = [{ inherit C ST L O OU CN emailAddress; }];
+ }}")) // {
+ inherit name;
+ config.signing = {
+ default.expiry = expiry;
+ profiles = {
+ server = {
+ inherit expiry;
+ usages = [
+ "signing"
+ "key encipherment"
+ "server auth"
+ ];
+ };
+ client = {
+ inherit expiry;
+ usages = [
+ "signing"
+ "key encipherment"
+ "client auth"
+ ];
+ };
+ peer = {
+ inherit expiry;
+ usages = [
+ "signing"
+ "key encipherment"
+ "server auth"
+ "client auth"
+ ];
+ };
+ };
+ };
+ };
+
+ ca = createSigningCertKey {};
+
+ kube-apiserver = createServingCertKey {
+ inherit ca;
+ cn = "kube-apiserver";
+ hosts = ["kubernetes.default" "kubernetes.default.svc" "localhost" "api.${externalDomain}" serviceClusterIp];
+ };
+
+ kubelet = createServingCertKey {
+ inherit ca;
+ cn = "kubelet";
+ hosts = ["*.${externalDomain}"];
+ };
+
+ service-accounts = createServingCertKey {
+ inherit ca;
+ cn = "kube-service-accounts";
+ };
+
+ etcd = createServingCertKey {
+ inherit ca;
+ cn = "etcd";
+ hosts = ["etcd.${externalDomain}"];
+ };
+
+ etcd-client = createClientCertKey {
+ inherit ca;
+ cn = "etcd-client";
+ };
+
+ kubelet-client = createClientCertKey {
+ inherit ca;
+ cn = "kubelet-client";
+ groups = ["system:masters"];
+ };
+
+ apiserver-client = {
+ kubelet = createClientCertKey {
+ inherit ca;
+ cn = "apiserver-client-kubelet";
+ groups = ["system:nodes"];
+ };
+
+ kube-proxy = createClientCertKey {
+ inherit ca;
+ name = "apiserver-client-kube-proxy";
+ cn = "system:kube-proxy";
+ groups = ["system:kube-proxy" "system:nodes"];
+ };
+
+ kube-controller-manager = createClientCertKey {
+ inherit ca;
+ name = "apiserver-client-kube-controller-manager";
+ cn = "system:kube-controller-manager";
+ groups = ["system:masters"];
+ };
+
+ kube-scheduler = createClientCertKey {
+ inherit ca;
+ name = "apiserver-client-kube-scheduler";
+ cn = "system:kube-scheduler";
+ groups = ["system:kube-scheduler"];
+ };
+
+ admin = createClientCertKey {
+ inherit ca;
+ cn = "admin";
+ groups = ["system:masters"];
+ };
+ };
+in {
+ master = pkgs.buildEnv {
+ name = "master-keys";
+ paths = [
+ (writeCFSSL (noKey ca))
+ (writeCFSSL kube-apiserver)
+ (writeCFSSL kubelet-client)
+ (writeCFSSL apiserver-client.kube-controller-manager)
+ (writeCFSSL apiserver-client.kube-scheduler)
+ (writeCFSSL service-accounts)
+ (writeCFSSL etcd)
+ ];
+ };
+
+ worker = pkgs.buildEnv {
+ name = "worker-keys";
+ paths = [
+ (writeCFSSL (noKey ca))
+ (writeCFSSL kubelet)
+ (writeCFSSL apiserver-client.kubelet)
+ (writeCFSSL apiserver-client.kube-proxy)
+ (writeCFSSL etcd-client)
+ ];
+ };
+
+ admin = writeCFSSL apiserver-client.admin;
+}
diff --git a/nixos/tests/kubernetes/default.nix b/nixos/tests/kubernetes/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..a801759bf582bafb0b064d91d292dd35d295a5c3
--- /dev/null
+++ b/nixos/tests/kubernetes/default.nix
@@ -0,0 +1,7 @@
+{ system ? builtins.currentSystem }:
+{
+ dns = import ./dns.nix { inherit system; };
+ # e2e = import ./e2e.nix { inherit system; }; # TODO: make it pass
+ # the following test(s) can be removed when e2e is working:
+ rbac = import ./rbac.nix { inherit system; };
+}
diff --git a/nixos/tests/kubernetes/dns.nix b/nixos/tests/kubernetes/dns.nix
new file mode 100644
index 0000000000000000000000000000000000000000..74d98dabec8d2959806a738cbfa27cc534cb8b1f
--- /dev/null
+++ b/nixos/tests/kubernetes/dns.nix
@@ -0,0 +1,127 @@
+{ system ? builtins.currentSystem, pkgs ? import { inherit system; } }:
+with import ./base.nix { inherit system; };
+let
+ domain = "my.zyx";
+
+ certs = import ./certs.nix { externalDomain = domain; };
+
+ redisPod = pkgs.writeText "redis-pod.json" (builtins.toJSON {
+ kind = "Pod";
+ apiVersion = "v1";
+ metadata.name = "redis";
+ metadata.labels.name = "redis";
+ spec.containers = [{
+ name = "redis";
+ image = "redis";
+ args = ["--bind" "0.0.0.0"];
+ imagePullPolicy = "Never";
+ ports = [{
+ name = "redis-server";
+ containerPort = 6379;
+ }];
+ }];
+ });
+
+ redisService = pkgs.writeText "redis-service.json" (builtins.toJSON {
+ kind = "Service";
+ apiVersion = "v1";
+ metadata.name = "redis";
+ spec = {
+ ports = [{port = 6379; targetPort = 6379;}];
+ selector = {name = "redis";};
+ };
+ });
+
+ redisImage = pkgs.dockerTools.buildImage {
+ name = "redis";
+ tag = "latest";
+ contents = [ pkgs.redis pkgs.bind.host ];
+ config.Entrypoint = "/bin/redis-server";
+ };
+
+ probePod = pkgs.writeText "probe-pod.json" (builtins.toJSON {
+ kind = "Pod";
+ apiVersion = "v1";
+ metadata.name = "probe";
+ metadata.labels.name = "probe";
+ spec.containers = [{
+ name = "probe";
+ image = "probe";
+ args = [ "-f" ];
+ tty = true;
+ imagePullPolicy = "Never";
+ }];
+ });
+
+ probeImage = pkgs.dockerTools.buildImage {
+ name = "probe";
+ tag = "latest";
+ contents = [ pkgs.bind.host pkgs.busybox ];
+ config.Entrypoint = "/bin/tail";
+ };
+
+ extraConfiguration = { config, pkgs, lib, nodes, ... }: {
+ environment.systemPackages = [ pkgs.bind.host ];
+ # virtualisation.docker.extraOptions = "--dns=${config.services.kubernetes.addons.dns.clusterIp}";
+ services.dnsmasq.enable = true;
+ services.dnsmasq.servers = [
+ "/cluster.local/${config.services.kubernetes.addons.dns.clusterIp}#53"
+ ];
+ };
+
+ base = {
+ name = "dns";
+ inherit domain certs extraConfiguration;
+ };
+
+ singleNodeTest = {
+ test = ''
+ # prepare machine1 for test
+ $machine1->waitUntilSucceeds("kubectl get node machine1.${domain} | grep -w Ready");
+ $machine1->execute("docker load < ${redisImage}");
+ $machine1->waitUntilSucceeds("kubectl create -f ${redisPod}");
+ $machine1->waitUntilSucceeds("kubectl create -f ${redisService}");
+ $machine1->execute("docker load < ${probeImage}");
+ $machine1->waitUntilSucceeds("kubectl create -f ${probePod}");
+
+ # check if pods are running
+ $machine1->waitUntilSucceeds("kubectl get pod redis | grep Running");
+ $machine1->waitUntilSucceeds("kubectl get pod probe | grep Running");
+ $machine1->waitUntilSucceeds("kubectl get pods -n kube-system | grep 'kube-dns.*3/3'");
+
+ # check dns on host (dnsmasq)
+ $machine1->succeed("host redis.default.svc.cluster.local");
+
+ # check dns inside the container
+ $machine1->succeed("kubectl exec -ti probe -- /bin/host redis.default.svc.cluster.local");
+ '';
+ };
+
+ multiNodeTest = {
+ test = ''
+ # prepare machines for test
+ $machine1->waitUntilSucceeds("kubectl get node machine1.${domain} | grep -w Ready");
+ $machine1->waitUntilSucceeds("kubectl get node machine2.${domain} | grep -w Ready");
+ $machine2->execute("docker load < ${redisImage}");
+ $machine1->waitUntilSucceeds("kubectl create -f ${redisPod}");
+ $machine1->waitUntilSucceeds("kubectl create -f ${redisService}");
+ $machine2->execute("docker load < ${probeImage}");
+ $machine1->waitUntilSucceeds("kubectl create -f ${probePod}");
+
+ # check if pods are running
+ $machine1->waitUntilSucceeds("kubectl get pod redis | grep Running");
+ $machine1->waitUntilSucceeds("kubectl get pod probe | grep Running");
+ $machine1->waitUntilSucceeds("kubectl get pods -n kube-system | grep 'kube-dns.*3/3'");
+
+ # check dns on hosts (dnsmasq)
+ $machine1->succeed("host redis.default.svc.cluster.local");
+ $machine2->succeed("host redis.default.svc.cluster.local");
+
+ # check dns inside the container
+ $machine1->succeed("kubectl exec -ti probe -- /bin/host redis.default.svc.cluster.local");
+ '';
+ };
+in {
+ singlenode = mkKubernetesSingleNodeTest (base // singleNodeTest);
+ multinode = mkKubernetesMultiNodeTest (base // multiNodeTest);
+}
diff --git a/nixos/tests/kubernetes/e2e.nix b/nixos/tests/kubernetes/e2e.nix
new file mode 100644
index 0000000000000000000000000000000000000000..d9d7ba9bb2cc5858b03b0134db38d6691c52ed3f
--- /dev/null
+++ b/nixos/tests/kubernetes/e2e.nix
@@ -0,0 +1,40 @@
+{ system ? builtins.currentSystem, pkgs ? import { inherit system; } }:
+with import ./base.nix { inherit system; };
+let
+ domain = "my.zyx";
+ certs = import ./certs.nix { externalDomain = domain; };
+ kubeconfig = pkgs.writeText "kubeconfig.json" (builtins.toJSON {
+ apiVersion = "v1";
+ kind = "Config";
+ clusters = [{
+ name = "local";
+ cluster.certificate-authority = "${certs.master}/ca.pem";
+ cluster.server = "https://api.${domain}";
+ }];
+ users = [{
+ name = "kubelet";
+ user = {
+ client-certificate = "${certs.admin}/admin.pem";
+ client-key = "${certs.admin}/admin-key.pem";
+ };
+ }];
+ contexts = [{
+ context = {
+ cluster = "local";
+ user = "kubelet";
+ };
+ current-context = "kubelet-context";
+ }];
+ });
+
+ base = {
+ name = "e2e";
+ inherit domain certs;
+ test = ''
+ $machine1->succeed("e2e.test -kubeconfig ${kubeconfig} -provider local -ginkgo.focus '\\[Conformance\\]' -ginkgo.skip '\\[Flaky\\]|\\[Serial\\]'");
+ '';
+ };
+in {
+ singlenode = mkKubernetesSingleNodeTest base;
+ multinode = mkKubernetesMultiNodeTest base;
+}
diff --git a/nixos/tests/kubernetes/kubernetes-common.nix b/nixos/tests/kubernetes/kubernetes-common.nix
new file mode 100644
index 0000000000000000000000000000000000000000..00a5c9aba4e3cb8f8272e3e0f731ba46ce95f3c7
--- /dev/null
+++ b/nixos/tests/kubernetes/kubernetes-common.nix
@@ -0,0 +1,59 @@
+{ roles, config, pkgs, certs }:
+with pkgs.lib;
+let
+ base = {
+ inherit roles;
+ featureGates = ["AllAlpha"];
+ flannel.enable = true;
+ addons.dashboard.enable = true;
+ verbose = true;
+
+ caFile = "${certs.master}/ca.pem";
+ apiserver = {
+ tlsCertFile = "${certs.master}/kube-apiserver.pem";
+ tlsKeyFile = "${certs.master}/kube-apiserver-key.pem";
+ kubeletClientCertFile = "${certs.master}/kubelet-client.pem";
+ kubeletClientKeyFile = "${certs.master}/kubelet-client-key.pem";
+ serviceAccountKeyFile = "${certs.master}/kube-service-accounts.pem";
+ };
+ etcd = {
+ servers = ["https://etcd.${config.networking.domain}:2379"];
+ certFile = "${certs.worker}/etcd-client.pem";
+ keyFile = "${certs.worker}/etcd-client-key.pem";
+ };
+ kubeconfig = {
+ server = "https://api.${config.networking.domain}";
+ };
+ kubelet = {
+ tlsCertFile = "${certs.worker}/kubelet.pem";
+ tlsKeyFile = "${certs.worker}/kubelet-key.pem";
+ hostname = "${config.networking.hostName}.${config.networking.domain}";
+ kubeconfig = {
+ certFile = "${certs.worker}/apiserver-client-kubelet.pem";
+ keyFile = "${certs.worker}/apiserver-client-kubelet-key.pem";
+ };
+ };
+ controllerManager = {
+ serviceAccountKeyFile = "${certs.master}/kube-service-accounts-key.pem";
+ kubeconfig = {
+ certFile = "${certs.master}/apiserver-client-kube-controller-manager.pem";
+ keyFile = "${certs.master}/apiserver-client-kube-controller-manager-key.pem";
+ };
+ };
+ scheduler = {
+ kubeconfig = {
+ certFile = "${certs.master}/apiserver-client-kube-scheduler.pem";
+ keyFile = "${certs.master}/apiserver-client-kube-scheduler-key.pem";
+ };
+ };
+ proxy = {
+ kubeconfig = {
+ certFile = "${certs.worker}/apiserver-client-kube-proxy.pem";
+ keyFile = "${certs.worker}//apiserver-client-kube-proxy-key.pem";
+ };
+ };
+ };
+
+in {
+ services.kubernetes = base;
+}
diff --git a/nixos/tests/kubernetes/rbac.nix b/nixos/tests/kubernetes/rbac.nix
new file mode 100644
index 0000000000000000000000000000000000000000..1966fed3a5fb944db46a64b8c85581ca16f85382
--- /dev/null
+++ b/nixos/tests/kubernetes/rbac.nix
@@ -0,0 +1,137 @@
+{ system ? builtins.currentSystem, pkgs ? import { inherit system; } }:
+with import ./base.nix { inherit system; };
+let
+
+ roServiceAccount = pkgs.writeText "ro-service-account.json" (builtins.toJSON {
+ kind = "ServiceAccount";
+ apiVersion = "v1";
+ metadata = {
+ name = "read-only";
+ namespace = "default";
+ };
+ });
+
+ roRoleBinding = pkgs.writeText "ro-role-binding.json" (builtins.toJSON {
+ apiVersion = "rbac.authorization.k8s.io/v1beta1";
+ kind = "RoleBinding";
+ metadata = {
+ name = "read-pods";
+ namespace = "default";
+ };
+ roleRef = {
+ apiGroup = "rbac.authorization.k8s.io";
+ kind = "Role";
+ name = "pod-reader";
+ };
+ subjects = [{
+ kind = "ServiceAccount";
+ name = "read-only";
+ namespace = "default";
+ }];
+ });
+
+ roRole = pkgs.writeText "ro-role.json" (builtins.toJSON {
+ apiVersion = "rbac.authorization.k8s.io/v1beta1";
+ kind = "Role";
+ metadata = {
+ name = "pod-reader";
+ namespace = "default";
+ };
+ rules = [{
+ apiGroups = [""];
+ resources = ["pods"];
+ verbs = ["get" "list" "watch"];
+ }];
+ });
+
+ kubectlPod = pkgs.writeText "kubectl-pod.json" (builtins.toJSON {
+ kind = "Pod";
+ apiVersion = "v1";
+ metadata.name = "kubectl";
+ metadata.namespace = "default";
+ metadata.labels.name = "kubectl";
+ spec.serviceAccountName = "read-only";
+ spec.containers = [{
+ name = "kubectl";
+ image = "kubectl:latest";
+ command = ["/bin/tail" "-f"];
+ imagePullPolicy = "Never";
+ tty = true;
+ }];
+ });
+
+ kubectlPod2 = pkgs.writeTextDir "kubectl-pod-2.json" (builtins.toJSON {
+ kind = "Pod";
+ apiVersion = "v1";
+ metadata.name = "kubectl-2";
+ metadata.namespace = "default";
+ metadata.labels.name = "kubectl-2";
+ spec.serviceAccountName = "read-only";
+ spec.containers = [{
+ name = "kubectl-2";
+ image = "kubectl:latest";
+ command = ["/bin/tail" "-f"];
+ imagePullPolicy = "Never";
+ tty = true;
+ }];
+ });
+
+ kubectl = pkgs.runCommand "copy-kubectl" { buildInputs = [ pkgs.kubernetes ]; } ''
+ mkdir -p $out/bin
+ cp ${pkgs.kubernetes}/bin/kubectl $out/bin/kubectl
+ '';
+
+ kubectlImage = pkgs.dockerTools.buildImage {
+ name = "kubectl";
+ tag = "latest";
+ contents = [ kubectl pkgs.busybox kubectlPod2 ];
+ config.Entrypoint = "/bin/sh";
+ };
+
+ base = {
+ name = "rbac";
+ };
+
+ singlenode = base // {
+ test = ''
+ $machine1->waitUntilSucceeds("kubectl get node machine1.my.zyx | grep -w Ready");
+
+ $machine1->execute("docker load < ${kubectlImage}");
+
+ $machine1->waitUntilSucceeds("kubectl apply -f ${roServiceAccount}");
+ $machine1->waitUntilSucceeds("kubectl apply -f ${roRole}");
+ $machine1->waitUntilSucceeds("kubectl apply -f ${roRoleBinding}");
+ $machine1->waitUntilSucceeds("kubectl create -f ${kubectlPod}");
+
+ $machine1->waitUntilSucceeds("kubectl get pod kubectl | grep Running");
+
+ $machine1->succeed("kubectl exec -ti kubectl -- kubectl get pods");
+ $machine1->fail("kubectl exec -ti kubectl -- kubectl create -f /kubectl-pod-2.json");
+ $machine1->fail("kubectl exec -ti kubectl -- kubectl delete pods -l name=kubectl");
+ '';
+ };
+
+ multinode = base // {
+ test = ''
+ $machine1->waitUntilSucceeds("kubectl get node machine1.my.zyx | grep -w Ready");
+ $machine1->waitUntilSucceeds("kubectl get node machine2.my.zyx | grep -w Ready");
+
+ $machine2->execute("docker load < ${kubectlImage}");
+
+ $machine1->waitUntilSucceeds("kubectl apply -f ${roServiceAccount}");
+ $machine1->waitUntilSucceeds("kubectl apply -f ${roRole}");
+ $machine1->waitUntilSucceeds("kubectl apply -f ${roRoleBinding}");
+ $machine1->waitUntilSucceeds("kubectl create -f ${kubectlPod}");
+
+ $machine1->waitUntilSucceeds("kubectl get pod kubectl | grep Running");
+
+ $machine1->succeed("kubectl exec -ti kubectl -- kubectl get pods");
+ $machine1->fail("kubectl exec -ti kubectl -- kubectl create -f /kubectl-pod-2.json");
+ $machine1->fail("kubectl exec -ti kubectl -- kubectl delete pods -l name=kubectl");
+ '';
+ };
+
+in {
+ singlenode = mkKubernetesSingleNodeTest singlenode;
+ multinode = mkKubernetesMultiNodeTest multinode;
+}
diff --git a/nixos/tests/mesos.nix b/nixos/tests/mesos.nix
index 6e9af126f0327c1eaecb37d130dd884647d0ac92..34671df047c8ce228948842d9c89d6f03da8f65e 100644
--- a/nixos/tests/mesos.nix
+++ b/nixos/tests/mesos.nix
@@ -56,9 +56,7 @@ import ./make-test.nix ({ pkgs, ...} : rec {
src = ./mesos_test.py;
phases = [ "installPhase" "fixupPhase" ];
installPhase = ''
- mkdir $out
- cp $src $out/mesos_test.py
- chmod +x $out/mesos_test.py
+ install -Dvm 0755 $src $out/bin/mesos_test.py
echo "done" > test.result
tar czf $out/test.tar.gz test.result
@@ -74,18 +72,18 @@ import ./make-test.nix ({ pkgs, ...} : rec {
$master->waitForOpenPort(5050);
$slave->waitForOpenPort(5051);
- # is slave registred?
+ # is slave registered?
$master->waitUntilSucceeds("curl -s --fail http://master:5050/master/slaves".
" | grep -q \"\\\"hostname\\\":\\\"slave\\\"\"");
- # try to run docker image
+ # try to run docker image
$master->succeed("${pkgs.mesos}/bin/mesos-execute --master=master:5050".
" --resources=\"cpus:0.1;mem:32\" --name=simple-docker".
" --containerizer=mesos --docker_image=echo:latest".
" --shell=true --command=\"echo done\" | grep -q TASK_FINISHED");
# simple command with .tar.gz uri
- $master->succeed("${testFramework}/mesos_test.py master ".
+ $master->succeed("${testFramework}/bin/mesos_test.py master ".
"${testFramework}/test.tar.gz");
'';
})
diff --git a/nixos/tests/minio.nix b/nixos/tests/minio.nix
index a349265b2f579a5569a2ee75252f83b18213d490..07a292a9baa57b275a7c268e8d21c83d71028436 100644
--- a/nixos/tests/minio.nix
+++ b/nixos/tests/minio.nix
@@ -12,6 +12,9 @@ import ./make-test.nix ({ pkgs, ...} : {
secretKey = "V7f1CwQqAcwo80UEIJEjc5gVQUSSx5ohQ9GSrr12";
};
environment.systemPackages = [ pkgs.minio-client ];
+
+ # Minio requires at least 1GiB of free disk space to run.
+ virtualisation.diskSize = 4 * 1024;
};
};
@@ -20,7 +23,6 @@ import ./make-test.nix ({ pkgs, ...} : {
startAll;
$machine->waitForUnit("minio.service");
$machine->waitForOpenPort(9000);
- $machine->succeed("curl --fail http://localhost:9000/minio/index.html");
# Create a test bucket on the server
$machine->succeed("mc config host add minio http://localhost:9000 BKIKJAA5BMMU2RHO6IBB V7f1CwQqAcwo80UEIJEjc5gVQUSSx5ohQ9GSrr12 S3v4");
diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix
index 1b24551009c944929ee2bf1cdace39290fa27fb5..79290861cb0b48ef001e780a434baf59cb979cdf 100644
--- a/nixos/tests/misc.nix
+++ b/nixos/tests/misc.nix
@@ -25,6 +25,8 @@ import ./make-test.nix ({ pkgs, ...} : {
};
users.users.sybil = { isNormalUser = true; group = "wheel"; };
security.sudo = { enable = true; wheelNeedsPassword = false; };
+ boot.kernel.sysctl."vm.swappiness" = 1;
+ boot.kernelParams = [ "vsyscall=emulate" ];
};
testScript =
@@ -117,5 +119,18 @@ import ./make-test.nix ({ pkgs, ...} : {
subtest "sudo", sub {
$machine->succeed("su - sybil -c 'sudo true'");
};
+
+ # Test sysctl
+ subtest "sysctl", sub {
+ $machine->waitForUnit("systemd-sysctl.service");
+ $machine->succeed('[ `sysctl -ne vm.swappiness` = 1 ]');
+ $machine->execute('sysctl vm.swappiness=60');
+ $machine->succeed('[ `sysctl -ne vm.swappiness` = 60 ]');
+ };
+
+ # Test boot parameters
+ subtest "bootparam", sub {
+ $machine->succeed('grep -Fq vsyscall=emulate /proc/cmdline');
+ };
'';
})
diff --git a/nixos/tests/mysql-backup.nix b/nixos/tests/mysql-backup.nix
new file mode 100644
index 0000000000000000000000000000000000000000..f5bcc460cba790a2325e4b93f8c83104ebf90894
--- /dev/null
+++ b/nixos/tests/mysql-backup.nix
@@ -0,0 +1,42 @@
+# Test whether mysqlBackup option works
+import ./make-test.nix ({ pkgs, ... } : {
+ name = "mysql-backup";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ rvl ];
+ };
+
+ nodes = {
+ master = { config, pkgs, ... }: {
+ services.mysql = {
+ enable = true;
+ initialDatabases = [ { name = "testdb"; schema = ./testdb.sql; } ];
+ package = pkgs.mysql;
+ };
+
+ services.mysqlBackup = {
+ enable = true;
+ databases = [ "doesnotexist" "testdb" ];
+ };
+ };
+ };
+
+ testScript =
+ '' startAll;
+
+ # Need to have mysql started so that it can be populated with data.
+ $master->waitForUnit("mysql.service");
+
+ # Wait for testdb to be populated.
+ $master->sleep(10);
+
+ # Do a backup and wait for it to finish.
+ $master->startJob("mysql-backup.service");
+ $master->waitForJob("mysql-backup.service");
+
+ # Check that data appears in backup
+ $master->succeed("${pkgs.gzip}/bin/zcat /var/backup/mysql/testdb.gz | grep hello");
+
+ # Check that a failed backup is logged
+ $master->succeed("journalctl -u mysql-backup.service | grep 'fail.*doesnotexist' > /dev/null");
+ '';
+})
diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix
index 6a7e628d8ef1d05ada4e2336a89fb92c1187d52c..7708775f73f3abdf0f13454262a6c0784a5c8a17 100644
--- a/nixos/tests/networking.nix
+++ b/nixos/tests/networking.nix
@@ -105,7 +105,7 @@ let
startAll;
$client->waitForUnit("network.target");
- $router->waitForUnit("network.target");
+ $router->waitForUnit("network-online.target");
# Make sure dhcpcd is not started
$client->fail("systemctl status dhcpcd.service");
@@ -157,7 +157,7 @@ let
startAll;
$client->waitForUnit("network.target");
- $router->waitForUnit("network.target");
+ $router->waitForUnit("network-online.target");
# Wait until we have an ip address on each interface
$client->waitUntilSucceeds("ip addr show dev eth1 | grep -q '192.168.1'");
diff --git a/nixos/tests/nexus.nix b/nixos/tests/nexus.nix
new file mode 100644
index 0000000000000000000000000000000000000000..1f19fc0867a49df04bd6c09b5f2b2f87ac48b504
--- /dev/null
+++ b/nixos/tests/nexus.nix
@@ -0,0 +1,34 @@
+# verifies:
+# 1. nexus service starts on server
+# 2. nexus user can be extended on server
+# 3. nexus service not can startup on server (creating database and all other initial stuff)
+
+import ./make-test.nix ({ pkgs, ...} : {
+ name = "nexus";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ ironpinguin ];
+ };
+
+ nodes = {
+
+ server =
+ { config, pkgs, ... }:
+ { virtualisation.memorySize = 2048;
+
+ services.nexus.enable = true;
+
+ users.extraUsers.nexus.extraGroups = [ "users" ];
+ };
+ };
+
+ testScript = ''
+ startAll;
+
+ $server->waitForUnit("nexus");
+
+ print $server->execute("sudo -u nexus groups");
+ $server->mustSucceed("sudo -u nexus groups | grep nexus | grep users");
+
+ $server->waitForOpenPort(8081);
+ '';
+})
diff --git a/nixos/tests/pgjwt.nix b/nixos/tests/pgjwt.nix
index 2cf2963ae316d59e2b9ee0d1f9ae9f629337b3bc..d186c42a2a98e2824984e828842a60e1e484f645 100644
--- a/nixos/tests/pgjwt.nix
+++ b/nixos/tests/pgjwt.nix
@@ -1,42 +1,37 @@
-import ./make-test.nix ({ pkgs, ...} :
+import ./make-test.nix ({ pkgs, lib, ...}:
let
- test = pkgs.writeText "test.sql" ''
- CREATE EXTENSION pgcrypto;
- CREATE EXTENSION pgjwt;
- select sign('{"sub":"1234567890","name":"John Doe","admin":true}', 'secret');
- select * from verify('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiYWRtaW4iOnRydWV9.TJVA95OrM7E2cBab30RMHrHDcEfxjoYZgeFONFh7HgQ', 'secret');
+ test = with pkgs; runCommand "patch-test" {
+ nativeBuildInputs = [ pgjwt ];
+ }
+ ''
+ sed -e '12 i CREATE EXTENSION pgcrypto;\nCREATE EXTENSION pgtap;\nSET search_path TO tap,public;' ${pgjwt.src}/test.sql > $out;
'';
in
-{
+with pkgs; {
name = "pgjwt";
- meta = with pkgs.stdenv.lib.maintainers; {
- maintainers = [ spinus ];
+ meta = with lib.maintainers; {
+ maintainers = [ spinus willibutz ];
};
nodes = {
- master =
- { pkgs, config, ... }:
-
- {
- services.postgresql = let mypg = pkgs.postgresql95; in {
- enable = true;
- package = mypg;
- extraPlugins =[pkgs.pgjwt];
- initialScript = pkgs.writeText "postgresql-init.sql"
- ''
- CREATE ROLE postgres WITH superuser login createdb;
- '';
- };
+ master = { pkgs, config, ... }:
+ {
+ services.postgresql = {
+ enable = true;
+ extraPlugins = [ pgjwt pgtap ];
};
+ };
};
- testScript = ''
+ testScript = { nodes, ... }:
+ let
+ sqlSU = "${nodes.master.config.services.postgresql.superUser}";
+ pgProve = "${pkgs.perlPackages.TAPParserSourceHandlerpgTAP}";
+ in
+ ''
startAll;
$master->waitForUnit("postgresql");
- $master->succeed("timeout 10 bash -c 'while ! psql postgres -c \"SELECT 1;\";do sleep 1;done;'");
- $master->succeed("cat ${test} | psql postgres");
- # I can't make original test working :[
- # $master->succeed("${pkgs.perlPackages.TAPParserSourceHandlerpgTAP}/bin/pg_prove -d postgres ${pkgs.pgjwt.src}/test.sql");
-
+ $master->copyFileFromHost("${test}","/tmp/test.sql");
+ $master->succeed("${pkgs.sudo}/bin/sudo -u ${sqlSU} PGOPTIONS=--search_path=tap,public ${pgProve}/bin/pg_prove -d postgres -v -f /tmp/test.sql");
'';
})
diff --git a/nixos/tests/pgmanage.nix b/nixos/tests/pgmanage.nix
new file mode 100644
index 0000000000000000000000000000000000000000..110cbd5c5b402b3dcd541939fd40c7229db52d7c
--- /dev/null
+++ b/nixos/tests/pgmanage.nix
@@ -0,0 +1,39 @@
+import ./make-test.nix ({ pkgs, ... } :
+let
+ role = "test";
+ password = "secret";
+ conn = "local";
+in
+{
+ name = "pgmanage";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ basvandijk ];
+ };
+ nodes = {
+ one = { config, pkgs, ... }: {
+ services = {
+ postgresql = {
+ enable = true;
+ initialScript = pkgs.writeText "pg-init-script" ''
+ CREATE ROLE ${role} SUPERUSER LOGIN PASSWORD '${password}';
+ '';
+ };
+ pgmanage = {
+ enable = true;
+ connections = {
+ "${conn}" = "hostaddr=127.0.0.1 port=${toString config.services.postgresql.port} dbname=postgres";
+ };
+ };
+ };
+ };
+ };
+
+ testScript = ''
+ startAll;
+ $one->waitForUnit("default.target");
+ $one->requireActiveUnit("pgmanage.service");
+
+ # Test if we can log in.
+ $one->waitUntilSucceeds("curl 'http://localhost:8080/pgmanage/auth' --data 'action=login&connname=${conn}&username=${role}&password=${password}' --fail");
+ '';
+})
diff --git a/nixos/tests/postgis.nix b/nixos/tests/postgis.nix
index 1dba5c363c09d506ca7a18b63099f944a2ea0294..f6ce3fe38ed3ea296285a04dcb18ff77f6d84e85 100644
--- a/nixos/tests/postgis.nix
+++ b/nixos/tests/postgis.nix
@@ -9,15 +9,11 @@ import ./make-test.nix ({ pkgs, ...} : {
{ pkgs, config, ... }:
{
- services.postgresql = let mypg = pkgs.postgresql95; in {
+ services.postgresql = let mypg = pkgs.postgresql100; in {
enable = true;
package = mypg;
- extraPlugins = [ (pkgs.postgis.override { postgresql = mypg; }).v_2_2_1 ];
- initialScript = pkgs.writeText "postgresql-init.sql"
- ''
- CREATE ROLE postgres WITH superuser login createdb;
- '';
- };
+ extraPlugins = [ (pkgs.postgis.override { postgresql = mypg; }).v_2_4_0 ];
+ };
};
};
diff --git a/nixos/tests/prometheus.nix b/nixos/tests/prometheus.nix
index ade097597bb832e2bdcbb5361ce9bbe613ba4e0f..374fb2d634b4b36d6d118b7f229ebb909971606b 100644
--- a/nixos/tests/prometheus.nix
+++ b/nixos/tests/prometheus.nix
@@ -5,9 +5,6 @@ import ./make-test.nix {
one = { config, pkgs, ... }: {
services.prometheus = {
enable = true;
- globalConfig = {
- labels = { foo = "bar"; };
- };
scrapeConfigs = [{
job_name = "prometheus";
static_configs = [{
diff --git a/nixos/tests/radicale.nix b/nixos/tests/radicale.nix
index 4c2ed8456ddd14f8bb7005bbe0604e48416734ca..f694fc75ef777f3f376ac26a05f37ea836a3636d 100644
--- a/nixos/tests/radicale.nix
+++ b/nixos/tests/radicale.nix
@@ -1,80 +1,106 @@
let
- port = 5232;
- radicaleOverlay = self: super: {
- radicale = super.radicale.overrideAttrs (oldAttrs: {
- propagatedBuildInputs = with self.pythonPackages;
- (oldAttrs.propagatedBuildInputs or []) ++ [
- passlib
- ];
- });
- };
- common = { config, pkgs, ...}: {
+ user = "someuser";
+ password = "some_password";
+ port = builtins.toString 5232;
+
+ common = { pkgs, ... }: {
services.radicale = {
enable = true;
- config = let home = config.users.extraUsers.radicale.home; in ''
- [server]
- hosts = 127.0.0.1:${builtins.toString port}
- daemon = False
- [encoding]
- [well-known]
+ config = ''
[auth]
type = htpasswd
htpasswd_filename = /etc/radicale/htpasswd
htpasswd_encryption = bcrypt
- [git]
- [rights]
+
[storage]
- type = filesystem
- filesystem_folder = ${home}/collections
+ filesystem_folder = /tmp/collections
+
[logging]
- [headers]
+ debug = True
'';
};
# WARNING: DON'T DO THIS IN PRODUCTION!
# This puts secrets (albeit hashed) directly into the Nix store for ease of testing.
- environment.etc."radicale/htpasswd".source = with pkgs; let
- py = python.withPackages(ps: with ps; [ passlib ]);
- in runCommand "htpasswd" {} ''
- ${py}/bin/python -c "
-from passlib.apache import HtpasswdFile
-ht = HtpasswdFile(
- '$out',
- new=True,
- default_scheme='bcrypt'
-)
-ht.set_password('someuser', 'really_secret_password')
-ht.save()
-"
+ environment.etc."radicale/htpasswd".source = pkgs.runCommand "htpasswd" {} ''
+ ${pkgs.apacheHttpd}/bin/htpasswd -bcB "$out" ${user} ${password}
'';
};
-in import ./make-test.nix ({ lib, ... }: {
- name = "radicale";
- meta.maintainers = with lib.maintainers; [ aneeshusa ];
+in
- # Test radicale with bcrypt-based htpasswd authentication
- nodes = {
- py2 = { config, pkgs, ... }@args: (common args) // {
- nixpkgs.overlays = [
- radicaleOverlay
- ];
- };
- py3 = { config, pkgs, ... }@args: (common args) // {
- nixpkgs.overlays = [
- (self: super: {
- python = self.python3;
- pythonPackages = self.python3.pkgs;
- })
- radicaleOverlay
- ];
+ import ./make-test.nix ({ pkgs, lib, ... }@args: {
+ name = "radicale";
+ meta.maintainers = with lib.maintainers; [ aneeshusa infinisil ];
+
+ nodes = rec {
+ radicale = radicale1; # Make the test script read more nicely
+ radicale1 = lib.recursiveUpdate (common args) {
+ nixpkgs.overlays = [
+ (self: super: {
+ radicale1 = super.radicale1.overrideAttrs (oldAttrs: {
+ propagatedBuildInputs = with self.pythonPackages;
+ (oldAttrs.propagatedBuildInputs or []) ++ [ passlib ];
+ });
+ })
+ ];
+ system.stateVersion = "17.03";
+ };
+ radicale1_export = lib.recursiveUpdate radicale1 {
+ services.radicale.extraArgs = [
+ "--export-storage" "/tmp/collections-new"
+ ];
+ };
+ radicale2_verify = lib.recursiveUpdate radicale2 {
+ services.radicale.extraArgs = [ "--verify-storage" ];
+ };
+ radicale2 = lib.recursiveUpdate (common args) {
+ system.stateVersion = "17.09";
+ };
};
- };
- testScript = ''
- for my $machine ($py2, $py3) {
- $machine->waitForUnit('radicale.service');
- $machine->waitForOpenPort(${builtins.toString port});
- $machine->succeed('curl -s http://someuser:really_secret_password@127.0.0.1:${builtins.toString port}/someuser/calendar.ics/');
- }
- '';
+ # This tests whether the web interface is accessible to an authenticated user
+ testScript = { nodes }: let
+ switchToConfig = nodeName: let
+ newSystem = nodes.${nodeName}.config.system.build.toplevel;
+ in "${newSystem}/bin/switch-to-configuration test";
+ in ''
+ # Check Radicale 1 functionality
+ $radicale->succeed('${switchToConfig "radicale1"} >&2');
+ $radicale->waitForUnit('radicale.service');
+ $radicale->waitForOpenPort(${port});
+ $radicale->succeed('curl --fail http://${user}:${password}@localhost:${port}/someuser/calendar.ics/');
+
+ # Export data in Radicale 2 format
+ $radicale->succeed('systemctl stop radicale');
+ $radicale->succeed('ls -al /tmp/collections');
+ $radicale->fail('ls -al /tmp/collections-new');
+ # Radicale exits immediately after exporting storage
+ $radicale->succeed('${switchToConfig "radicale1_export"} >&2');
+ $radicale->waitUntilFails('systemctl status radicale');
+ $radicale->succeed('ls -al /tmp/collections');
+ $radicale->succeed('ls -al /tmp/collections-new');
+
+ # Verify data in Radicale 2 format
+ $radicale->succeed('rm -r /tmp/collections/${user}');
+ $radicale->succeed('mv /tmp/collections-new/collection-root /tmp/collections');
+ $radicale->succeed('${switchToConfig "radicale2_verify"} >&2');
+ $radicale->waitUntilFails('systemctl status radicale');
+ my ($retcode, $logs) = $radicale->execute('journalctl -u radicale -n 5');
+ if ($retcode != 0 || index($logs, 'Verifying storage') == -1) {
+ die "Radicale 2 didn't verify storage"
+ }
+ if (index($logs, 'failed') != -1 || index($logs, 'exception') != -1) {
+ die "storage verification failed"
+ }
+
+ # Check Radicale 2 functionality
+ $radicale->succeed('${switchToConfig "radicale2"} >&2');
+ $radicale->waitForUnit('radicale.service');
+ $radicale->waitForOpenPort(${port});
+ my ($retcode, $output) = $radicale->execute('curl --fail http://${user}:${password}@localhost:${port}/someuser/calendar.ics/');
+ if ($retcode != 0 || index($output, 'VCALENDAR') == -1) {
+ die "Could not read calendar from Radicale 2"
+ }
+ $radicale->succeed('curl --fail http://${user}:${password}@localhost:${port}/.web/');
+ '';
})
diff --git a/nixos/tests/run-in-machine.nix b/nixos/tests/run-in-machine.nix
index d1102f8d407310425e6a3f5bccdc823dfc71e850..a6dfece44a92e0b14bb015070377c54a955871e2 100644
--- a/nixos/tests/run-in-machine.nix
+++ b/nixos/tests/run-in-machine.nix
@@ -2,7 +2,16 @@
with import ../lib/testing.nix { inherit system; };
-runInMachine {
- drv = pkgs.hello;
- machine = { config, pkgs, ... }: { /* services.sshd.enable = true; */ };
-}
+let
+ output = runInMachine {
+ drv = pkgs.hello;
+ machine = { config, pkgs, ... }: { /* services.sshd.enable = true; */ };
+ };
+in pkgs.runCommand "verify-output" { inherit output; } ''
+ if [ ! -e "$output/bin/hello" ]; then
+ echo "Derivation built using runInMachine produced incorrect output:" >&2
+ ls -laR "$output" >&2
+ exit 1
+ fi
+ "$output/bin/hello" > "$out"
+''
diff --git a/nixos/tests/testdb.sql b/nixos/tests/testdb.sql
index 4fb28fea3df9e90a5e1cd8ef62960c3fe32d837c..3c68c49ae82cd070eb54152d7937a95defd1ca73 100644
--- a/nixos/tests/testdb.sql
+++ b/nixos/tests/testdb.sql
@@ -8,3 +8,4 @@ insert into tests values (1, 'a');
insert into tests values (2, 'b');
insert into tests values (3, 'c');
insert into tests values (4, 'd');
+insert into tests values (5, 'hello');
diff --git a/nixos/tests/trac.nix b/nixos/tests/trac.nix
index d426bbde68d2a2397750899b6700f382f2df3a60..5da5717d7f865673e0a545e76c1530b789c946f7 100644
--- a/nixos/tests/trac.nix
+++ b/nixos/tests/trac.nix
@@ -17,7 +17,7 @@ import ./make-test.nix ({ pkgs, ... }: {
postgresql =
{ config, pkgs, ... }:
{ services.postgresql.enable = true;
- services.postgresql.package = pkgs.postgresql92;
+ services.postgresql.package = pkgs.postgresql;
services.postgresql.enableTCPIP = true;
services.postgresql.authentication = ''
# Generated file; do not edit!
diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix
index 4f7cb176d96f48497b3df7d38c0e312b426957c6..c519d7dae8beba46fb1137f5c978f00646cd5624 100644
--- a/nixos/tests/virtualbox.nix
+++ b/nixos/tests/virtualbox.nix
@@ -107,8 +107,8 @@ let
buildInputs = [ pkgs.utillinux pkgs.perl ];
} ''
- ${pkgs.parted}/sbin/parted /dev/vda mklabel msdos
- ${pkgs.parted}/sbin/parted /dev/vda -- mkpart primary ext2 1M -1s
+ ${pkgs.parted}/sbin/parted --script /dev/vda mklabel msdos
+ ${pkgs.parted}/sbin/parted --script /dev/vda -- mkpart primary ext2 1M -1s
. /sys/class/block/vda1/uevent
mknod /dev/vda1 b $MAJOR $MINOR
@@ -461,11 +461,11 @@ in mapAttrs mkVBoxTest {
my $test1IP = waitForIP_test1 1;
my $test2IP = waitForIP_test2 1;
- $machine->succeed("echo '$test2IP' | nc '$test1IP' 1234");
- $machine->succeed("echo '$test1IP' | nc '$test2IP' 1234");
+ $machine->succeed("echo '$test2IP' | nc -N '$test1IP' 1234");
+ $machine->succeed("echo '$test1IP' | nc -N '$test2IP' 1234");
- $machine->waitUntilSucceeds("nc '$test1IP' 5678 >&2");
- $machine->waitUntilSucceeds("nc '$test2IP' 5678 >&2");
+ $machine->waitUntilSucceeds("nc -N '$test1IP' 5678 < /dev/null >&2");
+ $machine->waitUntilSucceeds("nc -N '$test2IP' 5678 < /dev/null >&2");
shutdownVM_test1;
shutdownVM_test2;
diff --git a/nixos/tests/xmonad.nix b/nixos/tests/xmonad.nix
new file mode 100644
index 0000000000000000000000000000000000000000..3ea455c393c40ae400d36ec91751d3c075f40498
--- /dev/null
+++ b/nixos/tests/xmonad.nix
@@ -0,0 +1,29 @@
+import ./make-test.nix ({ pkgs, ...} : {
+ name = "xmonad";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ nequissimus ];
+ };
+
+ machine = { lib, pkgs, ... }: {
+ imports = [ ./common/x11.nix ./common/user-account.nix ];
+ services.xserver.displayManager.auto.user = "alice";
+ services.xserver.windowManager.default = lib.mkForce "xmonad";
+ services.xserver.windowManager.xmonad = {
+ enable = true;
+ enableContribAndExtras = true;
+ extraPackages = with pkgs.haskellPackages; haskellPackages: [ xmobar ];
+ };
+ };
+
+ testScript = { nodes, ... }: ''
+ $machine->waitForX;
+ $machine->waitForFile("/home/alice/.Xauthority");
+ $machine->succeed("xauth merge ~alice/.Xauthority");
+ $machine->waitUntilSucceeds("xmonad --restart");
+ $machine->sleep(3);
+ $machine->sendKeys("alt-shift-ret");
+ $machine->waitForWindow(qr/machine.*alice/);
+ $machine->sleep(1);
+ $machine->screenshot("terminal");
+ '';
+})
diff --git a/nixos/tests/zookeeper.nix b/nixos/tests/zookeeper.nix
new file mode 100644
index 0000000000000000000000000000000000000000..d247654adadeff7c6bb968fe2da3c526bd4cdaa1
--- /dev/null
+++ b/nixos/tests/zookeeper.nix
@@ -0,0 +1,28 @@
+import ./make-test.nix ({ pkgs, ...} : {
+ name = "zookeeper";
+ meta = with pkgs.stdenv.lib.maintainers; {
+ maintainers = [ nequissimus ];
+ };
+
+ nodes = {
+ server = { pkgs, config, ... }: {
+ services.zookeeper = {
+ enable = true;
+ };
+
+ networking.firewall.allowedTCPPorts = [ 2181 ];
+ };
+ };
+
+ testScript = ''
+ startAll;
+
+ $server->waitForUnit("zookeeper");
+ $server->waitForUnit("network.target");
+ $server->waitForOpenPort(2181);
+
+ $server->waitUntilSucceeds("${pkgs.zookeeper}/bin/zkCli.sh -server localhost:2181 create /foo bar");
+ $server->waitUntilSucceeds("${pkgs.zookeeper}/bin/zkCli.sh -server localhost:2181 set /foo hello");
+ $server->waitUntilSucceeds("${pkgs.zookeeper}/bin/zkCli.sh -server localhost:2181 get /foo | grep hello");
+ '';
+})
diff --git a/pkgs/applications/altcoins/bitcoin-abc.nix b/pkgs/applications/altcoins/bitcoin-abc.nix
new file mode 100644
index 0000000000000000000000000000000000000000..011e3cd7c8741124d25565813531a2dec23f4f81
--- /dev/null
+++ b/pkgs/applications/altcoins/bitcoin-abc.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost
+, zlib, miniupnpc, qtbase ? null , qttools ? null, utillinux, protobuf, qrencode, libevent
+, withGui }:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+
+ name = "bitcoin" + (toString (optional (!withGui) "d")) + "-abc-" + version;
+ version = "0.16.0";
+
+ src = fetchFromGitHub {
+ owner = "bitcoin-ABC";
+ repo = "bitcoin-abc";
+ rev = "v${version}";
+ sha256 = "0wwcgvd8zgl5qh6z1sa3kdv1lr9cwwbs9j2gaad5mqr9sfwbbxdh";
+ };
+
+ patches = [ ./fix-bitcoin-qt-build.patch ];
+
+ nativeBuildInputs = [ pkgconfig autoreconfHook ];
+ buildInputs = [ openssl db48 boost zlib
+ miniupnpc utillinux protobuf libevent ]
+ ++ optionals withGui [ qtbase qttools qrencode ];
+
+ configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]
+ ++ optionals withGui [ "--with-gui=qt5" ];
+
+ meta = {
+ description = "Peer-to-peer electronic cash system (Cash client)";
+ longDescription= ''
+ Bitcoin ABC is the name of open source software which enables the use of Bitcoin.
+ It is designed to facilite a hard fork to increase Bitcoin's block size limit.
+ "ABC" stands for "Adjustable Blocksize Cap".
+
+ Bitcoin ABC is a fork of the Bitcoin Core software project.
+ '';
+ homepage = https://bitcoinabc.org/;
+ maintainers = with maintainers; [ lassulus ];
+ license = licenses.mit;
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/applications/altcoins/bitcoin-classic.nix b/pkgs/applications/altcoins/bitcoin-classic.nix
index 5f17eb3a1cf62a18f20d639fc7bb902f4b74d6eb..9a2145d91cfb49ec982aa6a65508eeac6fdcdffb 100644
--- a/pkgs/applications/altcoins/bitcoin-classic.nix
+++ b/pkgs/applications/altcoins/bitcoin-classic.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost
-, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, libevent
+, zlib, miniupnpc, qtbase ? null, qttools ? null, utillinux, protobuf, qrencode, libevent
, withGui }:
with stdenv.lib;
@@ -7,22 +7,24 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "bitcoin" + (toString (optional (!withGui) "d")) + "-classic-" + version;
- version = "1.2.5";
+ version = "1.3.6";
src = fetchFromGitHub {
owner = "bitcoinclassic";
repo = "bitcoinclassic";
rev = "v${version}";
- sha256 = "00spils0gv8krx2nyxrf6j1dl81wmxk8xjkqc22cv7nsdnakzrvm";
+ sha256 = "129gkg035gv7zmc463jl2spvdh0fl4q8v4jdaslfnp34hbwi1p07";
};
+ patches = [ ./fix-bitcoin-qt-build.patch ];
+
nativeBuildInputs = [ pkgconfig autoreconfHook ];
buildInputs = [ openssl db48 boost zlib
miniupnpc utillinux protobuf libevent ]
- ++ optionals withGui [ qt4 qrencode ];
+ ++ optionals withGui [ qtbase qttools qrencode ];
configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]
- ++ optionals withGui [ "--with-gui=qt4" ];
+ ++ optionals withGui [ "--with-gui=qt5" ];
meta = {
description = "Peer-to-peer electronic cash system (Classic client)";
diff --git a/pkgs/applications/altcoins/bitcoin-unlimited.nix b/pkgs/applications/altcoins/bitcoin-unlimited.nix
index 2ad8e3fb3500223bcee0deb267caf2c877e323e5..9eb1e54b9093325f1e84a39d35e41d1559d7702c 100644
--- a/pkgs/applications/altcoins/bitcoin-unlimited.nix
+++ b/pkgs/applications/altcoins/bitcoin-unlimited.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
owner = "bitcoinunlimited";
repo = "bitcoinunlimited";
rev = "v${version}";
- sha256 = "0rhk6xvzvzyfppg0pgq72nqgm2rmkiw0nhg3rwnzcvvj90nrz3da";
+ sha256 = "17cmyns1908s2rqs0zwr05f3541nqm2pg08n2xn97g2k3yimdg5q";
};
nativeBuildInputs = [ pkgconfig autoreconfHook ];
diff --git a/pkgs/applications/altcoins/bitcoin-xt.nix b/pkgs/applications/altcoins/bitcoin-xt.nix
index 57a969825bac21782d7d9356e008d8c069ba1abd..388676198044d937b474cbed4722515ef66d102b 100644
--- a/pkgs/applications/altcoins/bitcoin-xt.nix
+++ b/pkgs/applications/altcoins/bitcoin-xt.nix
@@ -1,22 +1,22 @@
{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost
-, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, curl
+, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, curl, libevent
, withGui }:
with stdenv.lib;
stdenv.mkDerivation rec{
name = "bitcoin" + (toString (optional (!withGui) "d")) + "-xt-" + version;
- version = "0.11F";
+ version = "0.11G2";
src = fetchFromGitHub {
owner = "bitcoinxt";
repo = "bitcoinxt";
rev = "v${version}";
- sha256 = "13s5k9mxmlbf49p5hc546x20y5dslfp6g9hi6nw5yja5bngbwr24";
+ sha256 = "071rljvsabyc9j64v248qfb7zfqpfl84hpsnvlavin235zljq8qs";
};
nativeBuildInputs = [ pkgconfig autoreconfHook ];
- buildInputs = [ openssl db48 boost zlib
+ buildInputs = [ openssl db48 boost zlib libevent
miniupnpc utillinux protobuf curl ]
++ optionals withGui [ qt4 qrencode ];
diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix
index 9fb7df9fecdcd935d4d1d85d270c36e95310cbda..23c9ffe3a09cebd7413b2fd948139428ab333420 100644
--- a/pkgs/applications/altcoins/bitcoin.nix
+++ b/pkgs/applications/altcoins/bitcoin.nix
@@ -5,13 +5,11 @@
with stdenv.lib;
stdenv.mkDerivation rec{
name = "bitcoin" + (toString (optional (!withGui) "d")) + "-" + version;
- version = "0.14.0";
+ version = "0.15.0.1";
src = fetchurl {
- urls = [ "https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
- "mirror://sourceforge/bitcoin/Bitcoin/bitcoin-${version}/bitcoin-${version}.tar.gz"
- ];
- sha256 = "07k4i9r033dsvkp5ii5g3hykidm8b19c8c0mz1bi8k0dda3d8hyp";
+ url = "https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz";
+ sha256 = "16si3skhm6jhw1pkniv2b9y1kkdhjmhj392palphir0qc1srwzmm";
};
nativeBuildInputs = [ pkgconfig autoreconfHook ];
diff --git a/pkgs/applications/altcoins/btc1.nix b/pkgs/applications/altcoins/btc1.nix
new file mode 100644
index 0000000000000000000000000000000000000000..8ade6fb5251f64c55f270174393055744fd9c513
--- /dev/null
+++ b/pkgs/applications/altcoins/btc1.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchurl, pkgconfig, autoreconfHook, openssl, db48, boost
+, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, libevent
+, withGui }:
+
+with stdenv.lib;
+stdenv.mkDerivation rec{
+ name = "bit1" + (toString (optional (!withGui) "d")) + "-" + version;
+ version = "1.14.5";
+
+ src = fetchurl {
+ url = "https://github.com/btc1/bitcoin/archive/v${version}.tar.gz";
+ sha256 = "1az6bbblh3adgcs16r9cjz8jacg6sbwfpg8zzfzkbp9h9j85ass5";
+ };
+
+ nativeBuildInputs = [ pkgconfig autoreconfHook ];
+ buildInputs = [ openssl db48 boost zlib
+ miniupnpc protobuf libevent]
+ ++ optionals stdenv.isLinux [ utillinux ]
+ ++ optionals withGui [ qt4 qrencode ];
+
+ configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]
+ ++ optionals withGui [ "--with-gui=qt4" ];
+
+ meta = {
+ description = "Peer-to-peer electronic cash system (btc1 client)";
+ longDescription= ''
+ Bitcoin is a free open source peer-to-peer electronic cash system that is
+ completely decentralized, without the need for a central server or trusted
+ parties. Users hold the crypto keys to their own money and transact directly
+ with each other, with the help of a P2P network to check for double-spending.
+
+ btc1 is an implementation of a Bitcoin full node with segwit2x hard fork
+ support.
+ '';
+ homepage = "https://github.com/btc1/bitcoin";
+ license = licenses.mit;
+ maintainers = with maintainers; [ sorpaas ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/applications/altcoins/dapp.nix b/pkgs/applications/altcoins/dapp.nix
index 51de4d202e84c15ed4a39a80fd767a294d79e8ad..6ad66a24397f3ab500419ec6fe75a8dc6e05d944 100644
--- a/pkgs/applications/altcoins/dapp.nix
+++ b/pkgs/applications/altcoins/dapp.nix
@@ -1,15 +1,15 @@
{ lib, stdenv, fetchFromGitHub, makeWrapper
-, seth, git, solc, shellcheck, nodejs, hsevm }:
+, seth, git, solc, shellcheck, nodejs, hevm }:
stdenv.mkDerivation rec {
name = "dapp";
- version = "0.5.3";
+ version = "0.5.7";
src = fetchFromGitHub {
owner = "dapphub";
repo = "dapp";
rev = "v${version}";
- sha256 = "13b2krd02py8jnzjis44lay5i31d95z0myrsy5afzw7fa25giird";
+ sha256 = "128f35hczarihb263as391wr9zbyc1q1p49qbxh30via23r1brb0";
};
nativeBuildInputs = [makeWrapper shellcheck];
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
checkPhase = "make test";
makeFlags = ["prefix=$(out)"];
postInstall = let path = lib.makeBinPath [
- nodejs solc git seth hsevm
+ nodejs solc git seth hevm
]; in ''
wrapProgram "$out/bin/dapp" --prefix PATH : "${path}"
'';
diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix
index 1fbabc338f2aa1353a0c066f99e095e2b1e4c7c8..1a21efc323220c7163c81e4ded51470d030a3b48 100644
--- a/pkgs/applications/altcoins/default.nix
+++ b/pkgs/applications/altcoins/default.nix
@@ -1,26 +1,35 @@
-{ callPackage, pkgs }:
+{ callPackage, boost155, boost162, openssl_1_1_0, haskellPackages, darwin, libsForQt5 }:
rec {
bitcoin = callPackage ./bitcoin.nix { withGui = true; };
bitcoind = callPackage ./bitcoin.nix { withGui = false; };
+ bitcoin-abc = libsForQt5.callPackage ./bitcoin-abc.nix { withGui = true; };
+ bitcoind-abc = callPackage ./bitcoin-abc.nix { withGui = false; };
+
bitcoin-unlimited = callPackage ./bitcoin-unlimited.nix { withGui = true; };
bitcoind-unlimited = callPackage ./bitcoin-unlimited.nix { withGui = false; };
- bitcoin-classic = callPackage ./bitcoin-classic.nix { withGui = true; };
+ bitcoin-classic = libsForQt5.callPackage ./bitcoin-classic.nix { withGui = true; };
bitcoind-classic = callPackage ./bitcoin-classic.nix { withGui = false; };
bitcoin-xt = callPackage ./bitcoin-xt.nix { withGui = true; };
bitcoind-xt = callPackage ./bitcoin-xt.nix { withGui = false; };
+ btc1 = callPackage ./btc1.nix { withGui = true; };
+ btc1d = callPackage ./btc1.nix { withGui = false; };
+
dashpay = callPackage ./dashpay.nix { };
dogecoin = callPackage ./dogecoin.nix { withGui = true; };
dogecoind = callPackage ./dogecoin.nix { withGui = false; };
- freicoin = callPackage ./freicoin.nix { boost = pkgs.boost155; };
- go-ethereum = callPackage ./go-ethereum.nix { };
+ freicoin = callPackage ./freicoin.nix { boost = boost155; };
+ go-ethereum = callPackage ./go-ethereum.nix {
+ inherit (darwin) libobjc;
+ inherit (darwin.apple_sdk.frameworks) IOKit;
+ };
go-ethereum-classic = callPackage ./go-ethereum-classic { };
hivemind = callPackage ./hivemind.nix { withGui = true; };
@@ -32,15 +41,15 @@ rec {
memorycoin = callPackage ./memorycoin.nix { withGui = true; };
memorycoind = callPackage ./memorycoin.nix { withGui = false; };
- namecoin = callPackage ./namecoin.nix { inherit namecoind; };
- namecoind = callPackage ./namecoind.nix { };
+ namecoin = callPackage ./namecoin.nix { withGui = true; };
+ namecoind = callPackage ./namecoin.nix { withGui = false; };
ethabi = callPackage ./ethabi.nix { };
ethrun = callPackage ./ethrun.nix { };
seth = callPackage ./seth.nix { };
dapp = callPackage ./dapp.nix { };
- hsevm = (pkgs.haskellPackages.callPackage ./hsevm.nix {});
+ hevm = (haskellPackages.callPackage ./hevm.nix {});
primecoin = callPackage ./primecoin.nix { withGui = true; };
primecoind = callPackage ./primecoin.nix { withGui = false; };
@@ -49,7 +58,6 @@ rec {
zcash = callPackage ./zcash {
withGui = false;
- openssl = pkgs.openssl_1_1_0;
- boost = pkgs.boost163;
+ openssl = openssl_1_1_0;
};
}
diff --git a/pkgs/applications/altcoins/dogecoin.nix b/pkgs/applications/altcoins/dogecoin.nix
index d8df6dd8349a1dba283eef2a91a7d45f26061e01..33c2e598fca920413a466a5e4c7f2eeb06cc09a3 100644
--- a/pkgs/applications/altcoins/dogecoin.nix
+++ b/pkgs/applications/altcoins/dogecoin.nix
@@ -13,11 +13,11 @@ stdenv.mkDerivation rec {
owner = "dogecoin";
repo = "dogecoin";
rev = "v${version}";
- sha256 = "16q3rldj04hkzzjd23h0knszqr5dgixizy4iyc129mz8wa8pbnvy";
+ sha256 = "04rddx20d4fps2w3h1jxa2j8iyqpjv2fh897z0z3r06qjvjzf7rr";
};
nativeBuildInputs = [ pkgconfig autoreconfHook ];
- buildInputs = [ openssl db5 openssl utillinux
+ buildInputs = [ openssl db5 openssl utillinux
protobuf boost zlib miniupnpc ]
++ optionals withGui [ qt4 qrencode ];
diff --git a/pkgs/applications/altcoins/ethabi.nix b/pkgs/applications/altcoins/ethabi.nix
index c584dd65ebb8049faf42a85e4c56e34a6c12a615..e8fb1c49828eef8e64835018445fb9b2191d76cd 100644
--- a/pkgs/applications/altcoins/ethabi.nix
+++ b/pkgs/applications/altcoins/ethabi.nix
@@ -13,7 +13,7 @@ buildRustPackage rec {
sha256 = "1rg7ydvnhlg8w6blilm3cv6v4q51x1hgrbkln2ikhpdq0vakp5fd";
};
- depsSha256 = "1n4rxipna307r4xppb2iaads7kpa3yjv99fimvpn8l0f999ir2rz";
+ cargoSha256 = "0i9617qwc6d4jvlbydwk03rcsnyvxzpbn2ms10ds4r6x7jy2a4sy";
cargoBuildFlags = ["--features cli"];
diff --git a/pkgs/applications/altcoins/ethrun.nix b/pkgs/applications/altcoins/ethrun.nix
index f61a5884fd4a1deeb2e3225faf9168c62e46905f..2a8c37610dba5cc176de6a088f2dae7501b50583 100644
--- a/pkgs/applications/altcoins/ethrun.nix
+++ b/pkgs/applications/altcoins/ethrun.nix
@@ -13,12 +13,13 @@ buildRustPackage rec {
sha256 = "1w651g4p2mc4ljp20l8lwvfx3l3fzyp6gf2izr85vyb1wjbaccqn";
};
- depsSha256 = "14x8pbjgkz0g724lnvd9mi2alqd6fipjljw6xsraf9gqwijn1knq";
+ cargoSha256 = "14x8pbjgkz0g724lnvd9mi2alqd6fipjljw6xsraf9gqwijn1kn0";
meta = {
description = "Directly run Ethereum bytecode";
homepage = https://github.com/dapphub/ethrun/;
maintainers = [stdenv.lib.maintainers.dbrock];
+ broken = true; # mark temporary as broken
inherit version;
};
}
diff --git a/pkgs/applications/altcoins/fix-bitcoin-qt-build.patch b/pkgs/applications/altcoins/fix-bitcoin-qt-build.patch
new file mode 100644
index 0000000000000000000000000000000000000000..cbbfd85fe5bf77f090ff8ac7f7f08f342352d3c6
--- /dev/null
+++ b/pkgs/applications/altcoins/fix-bitcoin-qt-build.patch
@@ -0,0 +1,15 @@
+--- bitcoin-abc-v0.15.0-src/build-aux/m4/bitcoin_qt.m4 1970-01-01 01:00:01.000000000 +0100
++++ bitcoin-abc-v0.15.0-src.org/build-aux/m4/bitcoin_qt.m4 2017-09-27 23:38:44.748384197 +0100
+@@ -35,11 +35,7 @@
+ dnl Output: $1 is set to the path of $2 if found. $2 are searched in order.
+ AC_DEFUN([BITCOIN_QT_PATH_PROGS],[
+ BITCOIN_QT_CHECK([
+- if test "x$3" != "x"; then
+- AC_PATH_PROGS($1,$2,,$3)
+- else
+- AC_PATH_PROGS($1,$2)
+- fi
++ AC_PATH_PROGS($1,$2)
+ if test "x$$1" = "x" && test "x$4" != "xyes"; then
+ BITCOIN_QT_FAIL([$1 not found])
+ fi
diff --git a/pkgs/applications/altcoins/go-ethereum-classic/default.nix b/pkgs/applications/altcoins/go-ethereum-classic/default.nix
index 3687905ae57a138e97e9684b0b97f3dabfb68a9a..679312d9a8e9b01bf2a6b5e2a2101f7bb2ce9058 100644
--- a/pkgs/applications/altcoins/go-ethereum-classic/default.nix
+++ b/pkgs/applications/altcoins/go-ethereum-classic/default.nix
@@ -2,16 +2,15 @@
buildGoPackage rec {
name = "go-ethereum-classic-${version}";
- version = "3.5.0";
- rev = "402c1700fbefb9512e444b32fe12c2d674638ddb";
+ version = "4.0.0";
goPackagePath = "github.com/ethereumproject/go-ethereum";
subPackages = [ "cmd/evm" "cmd/geth" ];
src = fetchgit {
- inherit rev;
+ rev = "v${version}";
url = "https://github.com/ethereumproject/go-ethereum";
- sha256 = "15wji12wqcrgsb1glwwz4jv7rsas71bbxh7750iv2phn7jivm0fi";
+ sha256 = "06f1w7s45q4zva1xjrx92xinsdrixl0m6zhx5hvdjmg3xqcbwr79";
};
goDeps = ./deps.nix;
@@ -20,5 +19,6 @@ buildGoPackage rec {
description = "Golang implementation of Ethereum Classic";
homepage = https://github.com/ethereumproject/go-ethereum;
license = with lib.licenses; [ lgpl3 gpl3 ];
+ maintainers = with lib.maintainers; [ sorpaas ];
};
}
diff --git a/pkgs/applications/altcoins/go-ethereum.nix b/pkgs/applications/altcoins/go-ethereum.nix
index ce58984c8b8e59b53c503e040acc211b388c6a74..04e68b1f12824d79277aa144bf79b340fd64e882 100644
--- a/pkgs/applications/altcoins/go-ethereum.nix
+++ b/pkgs/applications/altcoins/go-ethereum.nix
@@ -1,23 +1,28 @@
-{ stdenv, lib, clang, buildGoPackage, fetchgit }:
+{ stdenv, lib, buildGoPackage, fetchFromGitHub, libobjc, IOKit }:
buildGoPackage rec {
name = "go-ethereum-${version}";
- version = "1.6.6";
- rev = "refs/tags/v${version}";
+ version = "1.7.2";
goPackagePath = "github.com/ethereum/go-ethereum";
- buildInputs = [ clang ];
- preBuild = "export CC=clang";
+ # Fix for usb-related segmentation faults on darwin
+ propagatedBuildInputs =
+ stdenv.lib.optionals stdenv.isDarwin [ libobjc IOKit ];
- src = fetchgit {
- inherit rev;
- url = "https://${goPackagePath}";
- sha256 = "066s7fp9pbyq670xwnib4p7zaxs941r9kpvj2hm6bkr28yrpvp1a";
+ # Fixes Cgo related build failures (see https://github.com/NixOS/nixpkgs/issues/25959 )
+ hardeningDisable = [ "fortify" ];
+
+ src = fetchFromGitHub {
+ owner = "ethereum";
+ repo = "go-ethereum";
+ rev = "v${version}";
+ sha256 = "11n77zlf8qixhx26sqf33v911716msi6h0z4ng8gxhzhznrn2nrd";
};
- meta = {
+ meta = with stdenv.lib; {
homepage = https://ethereum.github.io/go-ethereum/;
description = "Official golang implementation of the Ethereum protocol";
- license = with lib.licenses; [ lgpl3 gpl3 ];
+ license = with licenses; [ lgpl3 gpl3 ];
+ maintainers = [ maintainers.adisbladis ];
};
}
diff --git a/pkgs/applications/altcoins/hevm.nix b/pkgs/applications/altcoins/hevm.nix
new file mode 100644
index 0000000000000000000000000000000000000000..51e5f6bcb298766ad8d9faaf4da5d8261bc8c2cb
--- /dev/null
+++ b/pkgs/applications/altcoins/hevm.nix
@@ -0,0 +1,61 @@
+{ mkDerivation, abstract-par, aeson, ansi-wl-pprint, async, base
+, base16-bytestring, base64-bytestring, binary, brick, bytestring
+, cereal, containers, cryptonite, data-dword, deepseq, directory
+, filepath, ghci-pretty, here, HUnit, lens
+, lens-aeson, memory, monad-par, mtl, optparse-generic, process
+, QuickCheck, quickcheck-text, readline, rosezipper, scientific
+, stdenv, tasty, tasty-hunit, tasty-quickcheck, temporary, text
+, text-format, time, unordered-containers, vector, vty
+
+, restless-git
+
+, fetchFromGitHub, lib, makeWrapper
+, ncurses, zlib, bzip2, solc, coreutils
+, bash
+}:
+
+lib.overrideDerivation (mkDerivation rec {
+ pname = "hevm";
+ version = "0.8.5";
+
+ src = fetchFromGitHub {
+ owner = "dapphub";
+ repo = "hevm";
+ rev = "v${version}";
+ sha256 = "1a27bh0azf2hdg5hp6s9azv2rhzy7vrlq1kmg688g9nfwwwhgkp0";
+ };
+
+ isLibrary = false;
+ isExecutable = true;
+ enableSharedExecutables = false;
+
+ postInstall = ''
+ wrapProgram $out/bin/hevm \
+ --add-flags '+RTS -N$((`${coreutils}/bin/nproc` - 1)) -RTS' \
+ --suffix PATH : "${lib.makeBinPath [bash coreutils]}"
+ '';
+
+ extraLibraries = [
+ abstract-par aeson ansi-wl-pprint base base16-bytestring
+ base64-bytestring binary brick bytestring cereal containers
+ cryptonite data-dword deepseq directory filepath ghci-pretty lens
+ lens-aeson memory monad-par mtl optparse-generic process QuickCheck
+ quickcheck-text readline rosezipper scientific temporary text text-format
+ unordered-containers vector vty restless-git
+ ];
+ executableHaskellDepends = [
+ async readline zlib bzip2
+ ];
+ testHaskellDepends = [
+ base binary bytestring ghci-pretty here HUnit lens mtl QuickCheck
+ tasty tasty-hunit tasty-quickcheck text vector
+ ];
+
+ homepage = https://github.com/dapphub/hevm;
+ description = "Ethereum virtual machine evaluator";
+ license = stdenv.lib.licenses.agpl3;
+ maintainers = [stdenv.lib.maintainers.dbrock];
+}) (attrs: {
+ buildInputs = attrs.buildInputs ++ [solc];
+ nativeBuildInputs = attrs.nativeBuildInputs ++ [makeWrapper];
+})
diff --git a/pkgs/applications/altcoins/hsevm.nix b/pkgs/applications/altcoins/hsevm.nix
deleted file mode 100644
index d68526e2cd9a1f2d01464a9f7fdfe10f48ededc9..0000000000000000000000000000000000000000
--- a/pkgs/applications/altcoins/hsevm.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{ aeson, ansi-wl-pprint, base, base16-bytestring
-, base64-bytestring, binary, brick, bytestring, containers
-, cryptonite, data-dword, deepseq, directory, filepath, ghci-pretty
-, here, HUnit, lens, lens-aeson, memory, mtl, optparse-generic
-, process, QuickCheck, quickcheck-text, readline, rosezipper
-, stdenv, tasty, tasty-hunit, tasty-quickcheck, temporary, text
-, text-format, unordered-containers, vector, vty
-, mkDerivation, fetchFromGitHub, lib
-, ncurses, zlib, bzip2, solc
-}:
-
-lib.overrideDerivation (mkDerivation rec {
- pname = "hsevm";
- version = "0.3.2";
-
- src = fetchFromGitHub {
- owner = "dapphub";
- repo = "hsevm";
- rev = "v${version}";
- sha256 = "1c6zpphs03yfvyfbv1cjf04qh5q2miq7rpd7kx2cil77msi8hxw4";
- };
-
- isLibrary = false;
- isExecutable = true;
- enableSharedExecutables = false;
-
- postInstall = ''
- rm -rf $out/{lib,share}
- '';
-
- extraLibraries = [
- aeson ansi-wl-pprint base base16-bytestring base64-bytestring
- binary brick bytestring containers cryptonite data-dword deepseq
- directory filepath ghci-pretty lens lens-aeson memory mtl
- optparse-generic process QuickCheck quickcheck-text readline
- rosezipper temporary text text-format unordered-containers vector
- vty
- ];
- executableHaskellDepends = [
- readline zlib bzip2
- ];
- testHaskellDepends = [
- base binary bytestring ghci-pretty here HUnit lens mtl QuickCheck
- tasty tasty-hunit tasty-quickcheck text vector
- ];
-
- homepage = https://github.com/dapphub/hsevm;
- description = "Ethereum virtual machine evaluator";
- license = stdenv.lib.licenses.agpl3;
- maintainers = [stdenv.lib.maintainers.dbrock];
-}) (attrs: {
- buildInputs = attrs.buildInputs ++ [solc];
-})
diff --git a/pkgs/applications/altcoins/litecoin.nix b/pkgs/applications/altcoins/litecoin.nix
index 9b19d2f29969b09e7ad7c959ce34679f78550937..ac42caa80999573c43ab6b26b96ee048fc1442ae 100644
--- a/pkgs/applications/altcoins/litecoin.nix
+++ b/pkgs/applications/altcoins/litecoin.nix
@@ -8,13 +8,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "litecoin" + (toString (optional (!withGui) "d")) + "-" + version;
- version = "0.13.2.1";
+ version = "0.14.2";
src = fetchFromGitHub {
owner = "litecoin-project";
repo = "litecoin";
rev = "v${version}";
- sha256 = "0hml1crml6rx7im8dfbig3znmvnk2di61ybbhrhpad5mj0yrih30";
+ sha256 = "1smadd5d2mpz2v3pyk7wqm60vdp81zqr4m3z4wfvnlz62m1m800y";
};
nativeBuildInputs = [ pkgconfig autoreconfHook ];
diff --git a/pkgs/applications/altcoins/memorycoin.nix b/pkgs/applications/altcoins/memorycoin.nix
index 9efab9a8babbb7f22ad047da6d38b70fdb52ff04..24b891d60eb247908f8d0467b167b78faab0cc11 100644
--- a/pkgs/applications/altcoins/memorycoin.nix
+++ b/pkgs/applications/altcoins/memorycoin.nix
@@ -13,7 +13,8 @@ stdenv.mkDerivation rec{
sha256 = "1iyh6dqrg0mirwci5br5n5qw3ghp2cs23wd8ygr56bh9ml4dr1m8";
};
- buildInputs = [ pkgconfig openssl db48 boost zlib utillinux protobuf ]
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ openssl db48 boost zlib utillinux protobuf ]
++ optionals withGui [ qt4 qmake4Hook qrencode ];
qmakeFlags = ["USE_UPNP=-"];
diff --git a/pkgs/applications/altcoins/namecoin.nix b/pkgs/applications/altcoins/namecoin.nix
index 563363b8baf48c08b644828d7bb8c9446c9cb1ed..83bead0adac589e620be192d5f5fb2860d4f53ef 100644
--- a/pkgs/applications/altcoins/namecoin.nix
+++ b/pkgs/applications/altcoins/namecoin.nix
@@ -1,20 +1,45 @@
-{ stdenv, db4, boost, openssl, qt4, qmake4Hook, miniupnpc, unzip, namecoind }:
+{ stdenv, lib, fetchFromGitHub, openssl, boost, libevent, autoreconfHook, db4, miniupnpc, eject, pkgconfig, qt4, protobuf, libqrencode
+, withGui }:
with stdenv.lib;
stdenv.mkDerivation rec {
+ version = "nc0.13.0rc1";
+ name = "namecoin" + toString (optional (!withGui) "d") + "-" + version;
- name = "namecoin-${version}";
- version = namecoind.version;
- src = namecoind.src;
+ src = fetchFromGitHub {
+ owner = "namecoin";
+ repo = "namecoin-core";
+ rev = version;
+ sha256 = "17zz0rm3js285w2assxp8blfx830rs0ambcsaqqfli9mnaik3m39";
+ };
- buildInputs = [ db4 boost openssl unzip qt4 qmake4Hook miniupnpc ];
+ nativeBuildInputs = [
+ autoreconfHook
+ pkgconfig
+ ];
- qmakeFlags = [ "USE_UPNP=-" ];
+ buildInputs = [
+ openssl
+ boost
+ libevent
+ db4
+ miniupnpc
+ eject
+ ] ++ optionals withGui [
+ qt4
+ protobuf
+ libqrencode
+ ];
- installPhase = ''
- mkdir -p $out/bin
- cp namecoin-qt $out/bin
- '';
+ configureFlags = [
+ "--with-boost-libdir=${boost.out}/lib"
+ ];
- meta = namecoind.meta;
+ meta = {
+ description = "Decentralized open source information registration and transfer system based on the Bitcoin cryptocurrency";
+ homepage = https://namecoin.org;
+ license = licenses.mit;
+ maintainers = with maintainers; [ doublec AndersonTorres infinisil ];
+ platforms = platforms.linux;
+ };
}
diff --git a/pkgs/applications/altcoins/namecoind.nix b/pkgs/applications/altcoins/namecoind.nix
deleted file mode 100644
index 5b39333014784a27f829ca7d9a4182537b823357..0000000000000000000000000000000000000000
--- a/pkgs/applications/altcoins/namecoind.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ stdenv, fetchzip, db4, boost, openssl, miniupnpc, unzip }:
-
-with stdenv.lib;
-stdenv.mkDerivation rec {
- version = "0.3.80";
- name = "namecoind-${version}";
-
- src = fetchzip {
- url = "https://github.com/namecoin/namecoin/archive/nc${version}.tar.gz";
- sha256 = "0mbkhj7y3f4vbqp5q3zk27bzqlk2kq71rcgivvj06w29fzd64mw6";
- };
-
- buildInputs = [ db4 boost openssl unzip miniupnpc ];
-
- patchPhase = ''
- sed -e 's/-Wl,-Bstatic//g' -e 's/-l gthread-2.0//g' -e 's/-l z//g' -i src/Makefile
- '';
-
- buildPhase = ''
- make -C src INCLUDEPATHS= LIBPATHS=
- '';
-
- installPhase = ''
- mkdir -p $out/bin
- cp src/namecoind $out/bin
- '';
-
- meta = {
- description = "Decentralized open source information registration and transfer system based on the Bitcoin cryptocurrency";
- homepage = http://namecoin.info;
- license = licenses.mit;
- maintainers = with maintainers; [ doublec AndersonTorres ];
- platforms = platforms.linux;
- };
-}
diff --git a/pkgs/applications/altcoins/primecoin.nix b/pkgs/applications/altcoins/primecoin.nix
index e6ed05dd27f132d2e28e8f55d4d30201764377c5..b1e3dc2dd93d8328bf4030a1dc906cd8aecc0be9 100644
--- a/pkgs/applications/altcoins/primecoin.nix
+++ b/pkgs/applications/altcoins/primecoin.nix
@@ -16,7 +16,8 @@ stdenv.mkDerivation rec{
qmakeFlags = ["USE_UPNP=-"];
makeFlags = ["USE_UPNP=-"];
- buildInputs = [ pkgconfig openssl db48 boost zlib utillinux protobuf ]
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ openssl db48 boost zlib utillinux protobuf ]
++ optionals withGui [ qt4 qmake4Hook qrencode ];
configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]
diff --git a/pkgs/applications/altcoins/stellar-core.nix b/pkgs/applications/altcoins/stellar-core.nix
index 9942f0898a2fba2831e9c7f887bb976b1df2baa5..4a4665291d6e8864cda85478177b9ddb11165fca 100644
--- a/pkgs/applications/altcoins/stellar-core.nix
+++ b/pkgs/applications/altcoins/stellar-core.nix
@@ -16,7 +16,8 @@ in stdenv.mkDerivation {
leaveDotGit = true;
};
- buildInputs = [ autoconf automake libtool pkgconfig git ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ autoconf automake libtool git ];
propagatedBuildInputs = [ bison flex postgresql ];
diff --git a/pkgs/applications/altcoins/zcash/default.nix b/pkgs/applications/altcoins/zcash/default.nix
index 917e318c189ddfef3596ee53d8d52429e9d936ec..aa912f04efb5d1c0e95364f0f475752b86e60121 100644
--- a/pkgs/applications/altcoins/zcash/default.nix
+++ b/pkgs/applications/altcoins/zcash/default.nix
@@ -1,27 +1,28 @@
{ stdenv, libsodium, fetchFromGitHub, wget, pkgconfig, autoreconfHook, openssl, db62, boost
-, zlib, gtest, gmock, miniupnpc, callPackage, gmp, qt4, utillinux, protobuf, qrencode, libevent
+, zlib, gtest, gmock, callPackage, gmp, qt4, utillinux, protobuf, qrencode, libevent
, withGui }:
let libsnark = callPackage ./libsnark { inherit boost openssl; };
librustzcash = callPackage ./librustzcash {};
in
with stdenv.lib;
-stdenv.mkDerivation rec{
+stdenv.mkDerivation rec {
name = "zcash" + (toString (optional (!withGui) "d")) + "-" + version;
- version = "1.0.8";
+ version = "1.0.12";
src = fetchFromGitHub {
owner = "zcash";
repo = "zcash";
- rev = "f630519d865ce22a6cf72a29785f2a876902f8e1";
- sha256 = "1zjxg3dp0amjfs67469yp9b223v9hx29lkxid9wz2ivxj3paq7bv";
+ rev = "v${version}";
+ sha256 = "19bxhdnkvgncgl9x6nbaf5nwgrdfw99icvdbi9adfh646pd5z64s";
};
enableParallelBuilding = true;
- buildInputs = [ pkgconfig gtest gmock gmp libsnark autoreconfHook openssl wget db62 boost zlib
- miniupnpc protobuf libevent libsodium librustzcash ]
+ nativeBuildInputs = [ autoreconfHook pkgconfig ];
+ buildInputs = [ gtest gmock gmp libsnark openssl wget db62 boost zlib
+ protobuf libevent libsodium librustzcash ]
++ optionals stdenv.isLinux [ utillinux ]
++ optionals withGui [ qt4 qrencode ];
diff --git a/pkgs/applications/altcoins/zcash/librustzcash/default.nix b/pkgs/applications/altcoins/zcash/librustzcash/default.nix
index 2b2094c8401831908baf24cd9f8fb06af3447600..b89582c09e606daf42146277c26ca286e86d4b62 100644
--- a/pkgs/applications/altcoins/zcash/librustzcash/default.nix
+++ b/pkgs/applications/altcoins/zcash/librustzcash/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "02l1f46frpvw1r6k1wfh77mrsnmsdvifqx0vnscxz4xgb9ia9d1c";
};
- depsSha256 = "02qx8zdhmj7rmhqqq5q9428x9mlrjxxcnn4yhnygz9gfgvada2hx";
+ cargoSha256 = "1b0kal53ggcr59hbrsdj8fifjycahrmzwq677n9h3fywv4r237m6";
installPhase = ''
mkdir -p $out/lib
diff --git a/pkgs/applications/audio/a2jmidid/default.nix b/pkgs/applications/audio/a2jmidid/default.nix
index efb69d4c481f19d5d4633e97d2f51ed38df97504..ad12609429f5e4eb9e68f45c3bd25bbad9154bfb 100644
--- a/pkgs/applications/audio/a2jmidid/default.nix
+++ b/pkgs/applications/audio/a2jmidid/default.nix
@@ -12,7 +12,8 @@ in stdenv.mkDerivation rec {
sha256 = "06dgf5655znbvrd7fhrv8msv6zw8vk0hjqglcqkh90960mnnmwz7";
};
- buildInputs = [ makeWrapper pkgconfig alsaLib dbus libjack2 python dbus-python ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ makeWrapper alsaLib dbus libjack2 python dbus-python ];
configurePhase = "${python.interpreter} waf configure --prefix=$out";
diff --git a/pkgs/applications/audio/abcde/default.nix b/pkgs/applications/audio/abcde/default.nix
index 6cb1ae6de7196bfb8709a17278da658f1b76a33b..a23af5b5caf88d0170cf37d401986bd20c3f13d0 100644
--- a/pkgs/applications/audio/abcde/default.nix
+++ b/pkgs/applications/audio/abcde/default.nix
@@ -3,13 +3,13 @@
, perl, DigestSHA, MusicBrainz, MusicBrainzDiscID
, makeWrapper }:
-let version = "2.7.2";
+let version = "2.8.1";
in
stdenv.mkDerivation {
name = "abcde-${version}";
src = fetchurl {
url = "http://abcde.einval.com/download/abcde-${version}.tar.gz";
- sha256 = "1pakpi41k8yd780mfp0snhia6mmwjwxk9lcrq6gynimch8b8hfda";
+ sha256 = "0f9bjs0phk23vry7gvh0cll9vl6kmc1y4fwwh762scfdvpbp3774";
};
# FIXME: This package does not support `distmp3', `eject', etc.
diff --git a/pkgs/applications/audio/aj-snapshot/default.nix b/pkgs/applications/audio/aj-snapshot/default.nix
index 06e143704224af9008b1ea0c56b0dd5c4c995f5d..115df15d2a57abd8da2ecbf628c644d578be0b3e 100644
--- a/pkgs/applications/audio/aj-snapshot/default.nix
+++ b/pkgs/applications/audio/aj-snapshot/default.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
doCheck = false;
- buildInputs = [ alsaLib minixml jack2Full pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ alsaLib minixml jack2Full ];
meta = with stdenv.lib; {
description = "Tool for storing/restoring JACK and/or ALSA connections to/from cml files";
diff --git a/pkgs/applications/audio/ams-lv2/default.nix b/pkgs/applications/audio/ams-lv2/default.nix
index fbbb9f90f8a5316ea66e25e60ed5e5cdccd89323..bc72c3e13144e379fc66ecd9d714a1d747b73182 100644
--- a/pkgs/applications/audio/ams-lv2/default.nix
+++ b/pkgs/applications/audio/ams-lv2/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "1n1dnqnj24xhiy9323lj52nswr5120cj56fpckg802miss05sr6x";
};
- buildInputs = [ cairo fftw gtkmm2 lv2 lvtk pkgconfig python ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ cairo fftw gtkmm2 lv2 lvtk python ];
configurePhase = "python waf configure --prefix=$out";
diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix
index a1cca6ee1627472d2bd17e77c1a1f8298a1db304..850848abcde67e874aa00aa8a43758405f9a72fe 100644
--- a/pkgs/applications/audio/ardour/default.nix
+++ b/pkgs/applications/audio/ardour/default.nix
@@ -16,7 +16,7 @@ let
# "git describe" when _not_ on an annotated tag(!): MAJOR.MINOR-REV-HASH.
# Version to build.
- tag = "5.11";
+ tag = "5.12";
in
@@ -25,12 +25,12 @@ stdenv.mkDerivation rec {
src = fetchgit {
url = "git://git.ardour.org/ardour/ardour.git";
- rev = "bd40b9132cbac2d2b79ba0ef480bd41d837f8f71";
- sha256 = "0xxxjg90jzj5cj364mlhk8srkgaghxif2jj1015bra25pffk41ay";
+ rev = "ae0dcdc0c5d13483271065c360e378202d20170a";
+ sha256 = "0mla5lm51ryikc2rrk53max2m7a5ds6i1ai921l2h95wrha45nkr";
};
buildInputs =
- [ alsaLib aubio boost cairomm curl doxygen dbus fftw fftwSinglePrec flac glibc
+ [ alsaLib aubio boost cairomm curl doxygen dbus fftw fftwSinglePrec flac
glibmm graphviz gtkmm2 libjack2 libgnomecanvas libgnomecanvasmm liblo
libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate
libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv lv2
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
GenericName=Digital Audio Workstation
Comment=Multitrack harddisk recorder
Exec=$out/bin/ardour5
- Icon=$out/share/ardour5/icons/ardour_icon_256px.png
+ Icon=$out/share/ardour5/resources/Ardour-icon_256px.png
Terminal=false
Type=Application
X-MultipleArgs=false
diff --git a/pkgs/applications/audio/ario/default.nix b/pkgs/applications/audio/ario/default.nix
index 29d0241fa02ff8e41c23d3a1e9b780b73b303de8..afb3c8342731bd83a991585adca3b259208273be 100644
--- a/pkgs/applications/audio/ario/default.nix
+++ b/pkgs/applications/audio/ario/default.nix
@@ -14,8 +14,9 @@ stdenv.mkDerivation rec {
patches = [ ./glib-single-include.patch ];
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig gettext gtk2 expat intltool libgcrypt libunique gnutls
+ gettext gtk2 expat intltool libgcrypt libunique gnutls
libxml2 curl mpd_clientlib dbus_glib libnotify libsoup avahi taglib
];
diff --git a/pkgs/applications/audio/artyFX/default.nix b/pkgs/applications/audio/artyFX/default.nix
index 568195c1dba73103d723d53f23936ba1fb61b222..9a9095d2fc120f6273a290e3c918f0215c07cf33 100644
--- a/pkgs/applications/audio/artyFX/default.nix
+++ b/pkgs/applications/audio/artyFX/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "012hcy1mxl7gs2lipfcqp5x0xv1azb9hjrwf0h59yyxnzx96h7c9";
};
- buildInputs = [ cairomm cmake libjack2 libpthreadstubs libXdmcp libxshmfence libsndfile lv2 ntk pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ cairomm cmake libjack2 libpthreadstubs libXdmcp libxshmfence libsndfile lv2 ntk ];
meta = with stdenv.lib; {
homepage = http://openavproductions.com/artyfx/;
diff --git a/pkgs/applications/audio/asunder/default.nix b/pkgs/applications/audio/asunder/default.nix
index b5897c71cd9422bd17fe85fd6c44c49af2b78abc..99d6357e9216c4f3185f6fee00ab63367f388b4e 100644
--- a/pkgs/applications/audio/asunder/default.nix
+++ b/pkgs/applications/audio/asunder/default.nix
@@ -19,7 +19,8 @@ stdenv.mkDerivation rec {
sha256 = "1nq9kd4rd4k2kibf57gdbm0zw2gxa234vvvdhxkm8g5bhx5h3iyq";
};
- buildInputs = [ gtk2 libcddb intltool pkgconfig makeWrapper ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gtk2 libcddb intltool makeWrapper ];
runtimeDeps =
optional mp3Support lame ++
diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix
index 6d4b18e29b00c855adf55d3065af4c34e45b0d50..8242d035e5b8e53f1b2b1bda724f4eb5a464db5c 100644
--- a/pkgs/applications/audio/audacious/default.nix
+++ b/pkgs/applications/audio/audacious/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, wrapGAppsHook, gettext, glib, gtk3
-, libmowgli, libmcs, dbus_glib, libxml2, xorg, gnome3, alsaLib
+, libmowgli, dbus_glib, libxml2, xorg, gnome3, alsaLib
, libpulseaudio, libjack2, fluidsynth, libmad, libogg, libvorbis
, libcdio082, libcddb, flac, ffmpeg, mpg123, libcue, libmms, libbs2b
, libsndfile, libmodplug, libsamplerate, soxr, lirc, curl, wavpack
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- gettext glib gtk3 libmowgli libmcs dbus_glib libxml2
+ gettext glib gtk3 libmowgli dbus_glib libxml2
xorg.libXcomposite gnome3.defaultIconTheme alsaLib libjack2
libpulseaudio fluidsynth libmad libogg libvorbis libcdio082
libcddb flac ffmpeg mpg123 libcue libmms libbs2b libsndfile
diff --git a/pkgs/applications/audio/audacious/qt-5.nix b/pkgs/applications/audio/audacious/qt-5.nix
index da143c7d946a15152fce8d20c23fe1708a7480d5..803b0115fbdfb8592e00eeb49a8d3ba3c6a2d82d 100644
--- a/pkgs/applications/audio/audacious/qt-5.nix
+++ b/pkgs/applications/audio/audacious/qt-5.nix
@@ -3,7 +3,7 @@
gettext, pkgconfig,
qtbase,
alsaLib, curl, faad2, ffmpeg, flac, fluidsynth, gdk_pixbuf, lame, libbs2b,
- libcddb, libcdio082, libcue, libjack2, libmad, libmcs, libmms, libmodplug,
+ libcddb, libcdio082, libcue, libjack2, libmad, libmms, libmodplug,
libmowgli, libnotify, libogg, libpulseaudio, libsamplerate, libsidplayfp,
libsndfile, libvorbis, libxml2, lirc, mpg123, neon, qtmultimedia, soxr,
wavpack
@@ -39,7 +39,7 @@ mkDerivation {
# Plugin dependencies
alsaLib curl faad2 ffmpeg flac fluidsynth gdk_pixbuf lame libbs2b libcddb
- libcdio082 libcue libjack2 libmad libmcs libmms libmodplug libmowgli
+ libcdio082 libcue libjack2 libmad libmms libmodplug libmowgli
libnotify libogg libpulseaudio libsamplerate libsidplayfp libsndfile
libvorbis libxml2 lirc mpg123 neon qtmultimedia soxr wavpack
];
diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix
index 92e6adbaa965b4a7911fe26f814013cb92841e64..26e58c023b823234fcc153d2e01c5d833d038c13 100644
--- a/pkgs/applications/audio/audacity/default.nix
+++ b/pkgs/applications/audio/audacity/default.nix
@@ -1,17 +1,18 @@
{ stdenv, fetchurl, wxGTK30, pkgconfig, file, gettext, gtk2, glib, zlib, perl, intltool,
libogg, libvorbis, libmad, libjack2, lv2, lilv, serd, sord, sratom, suil, alsaLib, libsndfile, soxr, flac, lame, fetchpatch,
- expat, libid3tag, ffmpeg, soundtouch /*, portaudio - given up fighting their portaudio.patch */
+ expat, libid3tag, ffmpeg, soundtouch, /*, portaudio - given up fighting their portaudio.patch */
+ autoconf, automake, libtool
}:
with stdenv.lib;
stdenv.mkDerivation rec {
- version = "2.1.2";
+ version = "2.2.0";
name = "audacity-${version}";
src = fetchurl {
url = "https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz";
- sha256 = "1ggr6g0mk36rqj7ahsg8b0b1r9kphwajzvxgn43md263rm87n04h";
+ sha256 = "09xpr4bjnainz1xmc35v3qg3dadjr9wv8bmn1p4y91aqyihnhjry";
};
patches = [
(fetchpatch {
@@ -20,19 +21,10 @@ stdenv.mkDerivation rec {
+ "/audacity-ffmpeg.patch?h=packages/audacity&id=0c1e35798d4d70692";
sha256 = "19fr674mw844zmkp1476yigkcnmb6zyn78av64ccdwi3p68i00rf";
})
- ]
- ++ optional (hasPrefix "gcc-6" stdenv.cc.cc.name)
- (fetchpatch {
- name = "gcc6.patch";
- url = "https://github.com/audacity/audacity/commit/60f2322055756e8cacfe96530a12c63e9694482c.patch";
- sha256 = "07jlxr8y7ap3nsblx3zh8v9rcx7ajbcfnvwzhwykmbwbsyirgqf2";
- });
+ ];
preConfigure = /* we prefer system-wide libs */ ''
- mv lib-src lib-src-rm
- mkdir lib-src
- mv lib-src-rm/{Makefile*,lib-widget-extra,portaudio-v19,portmixer,portsmf,FileDialog,sbsms,libnyquist} lib-src/
- rm -r lib-src-rm/
+ autoreconf -vi # use system libraries
# we will get a (possibly harmless) warning during configure without this
substituteInPlace configure \
@@ -59,10 +51,12 @@ stdenv.mkDerivation rec {
"-lswscale"
];
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig file gettext wxGTK30 expat alsaLib
+ file gettext wxGTK30 expat alsaLib
libsndfile soxr libid3tag libjack2 lv2 lilv serd sord sratom suil gtk2
ffmpeg libmad lame libvorbis flac soundtouch
+ autoconf automake libtool # for the preConfigure phase
]; #ToDo: detach sbsms
enableParallelBuilding = true;
diff --git a/pkgs/applications/audio/audio-recorder/default.nix b/pkgs/applications/audio/audio-recorder/default.nix
index c482e44e7aa41e61d0661f9913af2e736734b7f1..ac13371dd930fb7eea47eeb59e92e713386a2653 100644
--- a/pkgs/applications/audio/audio-recorder/default.nix
+++ b/pkgs/applications/audio/audio-recorder/default.nix
@@ -8,18 +8,16 @@ with lib;
stdenv.mkDerivation rec {
name = "audio-recorder-${version}";
- version = "1.9.4";
+ version = "1.9.7";
src = fetchurl {
name = "${name}-zesty.tar.gz";
url = "${meta.homepage}/+archive/ubuntu/ppa/+files/audio-recorder_${version}%7Ezesty.tar.gz";
- sha256 = "062bad38cz4fqzv418wza0x8sa4m5mqr3xsisrr1qgkqj9hg1f6x";
+ sha256 = "163c0vs5qj72y62731yp6sl6s0indh2szhjg02mxigv9b68dx89c";
};
nativeBuildInputs = [ pkgconfig intltool autoconf wrapGAppsHook ];
- patches = [ ./icon-names.diff ];
-
buildInputs = with gst_all_1; [
glib dbus gtk3 librsvg libdbusmenu-gtk3 libappindicator-gtk3 (stdenv.lib.getLib gnome3.dconf)
gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav
diff --git a/pkgs/applications/audio/audio-recorder/icon-names.diff b/pkgs/applications/audio/audio-recorder/icon-names.diff
deleted file mode 100644
index 28f21799166a1ea8f08d0c914207838204d19090..0000000000000000000000000000000000000000
--- a/pkgs/applications/audio/audio-recorder/icon-names.diff
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -ru audio-recorder/src/main.c audio-recorder.new/src/main.c
---- audio-recorder/src/main.c 2017-01-03 20:27:36.000000000 +0100
-+++ audio-recorder.new/src/main.c 2017-01-30 20:19:44.019255096 +0100
-@@ -1099,7 +1099,7 @@
- gtk_container_add(GTK_CONTAINER(frame2), g_win.timer_text);
-
- // Timer [Save] button
-- g_win.timer_save_button = gtk_button_new_from_icon_name("gtk-save", GTK_ICON_SIZE_BUTTON);
-+ g_win.timer_save_button = gtk_button_new_from_icon_name("document-save", GTK_ICON_SIZE_BUTTON);
- // Hide it
- gtk_widget_hide(g_win.timer_save_button);
- g_signal_connect(g_win.timer_save_button, "clicked", G_CALLBACK(win_timer_save_text_cb), NULL);
-@@ -1129,7 +1129,7 @@
- // The [Info] button
- GtkWidget *button0 = gtk_button_new();
- gtk_widget_show(button0);
-- GtkWidget *image = gtk_image_new_from_icon_name("gtk-info", GTK_ICON_SIZE_BUTTON);
-+ GtkWidget *image = gtk_image_new_from_icon_name("dialog-information", GTK_ICON_SIZE_BUTTON);
- gtk_widget_show(image);
- gtk_button_set_always_show_image(GTK_BUTTON(button0), TRUE);
- gtk_button_set_image(GTK_BUTTON(button0), image);
-@@ -1220,7 +1220,7 @@
- // Add [Reload] button
- button0 = gtk_button_new();
- gtk_widget_show(button0);
-- image = gtk_image_new_from_icon_name("gtk-refresh", GTK_ICON_SIZE_BUTTON);
-+ image = gtk_image_new_from_icon_name("view-refresh", GTK_ICON_SIZE_BUTTON);
- gtk_widget_show(image);
- gtk_button_set_always_show_image(GTK_BUTTON(button0), TRUE);
-
-@@ -1297,7 +1297,7 @@
- gtk_widget_show(hbox4);
- gtk_box_pack_start(GTK_BOX(vbox0), hbox4, FALSE, TRUE, 0);
-
-- button0 = gtk_button_new_from_icon_name("gtk-close", GTK_ICON_SIZE_BUTTON);
-+ button0 = gtk_button_new_from_icon_name("window-close", GTK_ICON_SIZE_BUTTON);
- gtk_button_set_always_show_image(GTK_BUTTON(button0), TRUE);
- gtk_widget_show(button0);
- gtk_box_pack_end(GTK_BOX(hbox4), button0, FALSE, FALSE, 0);
-diff -ru audio-recorder/src/settings.c audio-recorder.new/src/settings.c
---- audio-recorder/src/settings.c 2017-01-02 10:47:27.000000000 +0100
-+++ audio-recorder.new/src/settings.c 2017-01-30 20:23:04.621314105 +0100
-@@ -659,7 +659,7 @@
- gtk_entry_set_invisible_char(GTK_ENTRY(file_name_pattern), 9679);
-
- button0 = gtk_button_new();
-- GtkWidget *image = gtk_image_new_from_icon_name("gtk-info", GTK_ICON_SIZE_BUTTON);
-+ GtkWidget *image = gtk_image_new_from_icon_name("dialog-information", GTK_ICON_SIZE_BUTTON);
- gtk_button_set_always_show_image(GTK_BUTTON(button0), TRUE);
- gtk_button_set_image(GTK_BUTTON(button0), image);
- g_signal_connect(button0, "clicked", G_CALLBACK(win_settings_show_filename_help), NULL);
diff --git a/pkgs/applications/audio/axoloti/default.nix b/pkgs/applications/audio/axoloti/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..986e476779cb2a2d409c16ddfee8eaf0cbcda49d
--- /dev/null
+++ b/pkgs/applications/audio/axoloti/default.nix
@@ -0,0 +1,101 @@
+{ stdenv, fetchFromGitHub, fetchurl, makeWrapper, unzip
+, gnumake, gcc-arm-embedded, dfu-util-axoloti, jdk, ant, libfaketime }:
+
+stdenv.mkDerivation rec {
+ version = "1.0.12-1";
+ name = "axoloti-${version}";
+
+ src = fetchFromGitHub {
+ owner = "axoloti";
+ repo = "axoloti";
+ rev = "${version}";
+ sha256 = "13njmv8zac0kaaxgkv4y4zfjcclafn9cw0m8lj2k4926wnwjmf50";
+ };
+
+ chibi_version = "2.6.9";
+ chibi_name = "ChibiOS_${chibi_version}";
+
+ chibios = fetchurl {
+ url = "mirror://sourceforge/project/chibios/ChibiOS_RT%20stable/Version%20${chibi_version}/${chibi_name}.zip";
+ sha256 = "0lb5s8pkj80mqhsy47mmq0lqk34s2a2m3xagzihalvabwd0frhlj";
+ };
+
+ buildInputs = [ makeWrapper unzip gcc-arm-embedded dfu-util-axoloti jdk ant libfaketime ];
+
+ patchPhase = ''
+ unzip ${chibios}
+ mv ${chibi_name} chibios
+ (cd chibios/ext; unzip -q -o fatfs-0.9-patched.zip)
+
+ # Remove source of non-determinism in ChibiOS
+ substituteInPlace "chibios/os/various/shell.c" \
+ --replace "#ifdef __DATE__" "#if 0"
+
+ # Hardcode full path to compiler tools
+ for f in "firmware/Makefile.patch" \
+ "firmware/Makefile" \
+ "firmware/flasher/Makefile" \
+ "firmware/mounter/Makefile"; do
+ substituteInPlace "$f" \
+ --replace "arm-none-eabi-" "${gcc-arm-embedded}/bin/arm-none-eabi-"
+ done
+
+ # Hardcode path to "make"
+ for f in "firmware/compile_firmware_linux.sh" \
+ "firmware/compile_patch_linux.sh"; do
+ substituteInPlace "$f" \
+ --replace "make" "${gnumake}/bin/make"
+ done
+
+ # Hardcode dfu-util path
+ substituteInPlace "platform_linux/upload_fw_dfu.sh" \
+ --replace "/bin/dfu-util" ""
+ substituteInPlace "platform_linux/upload_fw_dfu.sh" \
+ --replace "./dfu-util" "${dfu-util-axoloti}/bin/dfu-util"
+
+ # Fix build version
+ substituteInPlace "build.xml" \
+ --replace "(git missing)" "${version}"
+
+ # Remove build time
+ substituteInPlace "build.xml" \
+ --replace "" ""
+ substituteInPlace "build.xml" \
+ --replace \
+ '' \
+ ''
+ substituteInPlace "build.xml" \
+ --replace "" ""
+ substituteInPlace "build.xml" \
+ --replace \
+ '{line.separator}' \
+ '{line.separator} '
+ '';
+
+ buildPhase = ''
+ find . -exec touch -d '1970-01-01 00:00' {} \;
+ (cd platform_linux; sh compile_firmware.sh)
+ faketime "1970-01-01 00:00:00" ant -Dbuild.runtime=true
+ '';
+
+ installPhase = ''
+ mkdir -p $out/bin $out/share/axoloti
+
+ cp -r doc firmware chibios platform_linux CMSIS *.txt $out/share/axoloti/
+ install -vD dist/Axoloti.jar $out/share/axoloti/
+
+ makeWrapper ${jdk}/bin/java $out/bin/axoloti --add-flags "-Daxoloti_release=$out/share/axoloti -Daxoloti_runtime=$out/share/axoloti -jar $out/share/axoloti/Axoloti.jar"
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = http://www.axoloti.com;
+ description = ''
+ Sketching embedded digital audio algorithms.
+
+ To fix permissions of the Axoloti USB device node, add a similar udev rule to services.udev.extraRules:
+ SUBSYSTEM=="usb", ATTR{idVendor}=="16c0", ATTR{idProduct}=="0442", OWNER="someuser", GROUP="somegroup"
+ '';
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ TealG ];
+ };
+}
diff --git a/pkgs/applications/audio/axoloti/dfu-util.nix b/pkgs/applications/audio/axoloti/dfu-util.nix
new file mode 100644
index 0000000000000000000000000000000000000000..2076e45de5469acd8cfbb155e45261b9cb6c63d6
--- /dev/null
+++ b/pkgs/applications/audio/axoloti/dfu-util.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, pkgconfig, libusb1-axoloti }:
+
+stdenv.mkDerivation rec {
+ name="dfu-util-${version}";
+ version = "0.8";
+
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ libusb1-axoloti ];
+
+ src = fetchurl {
+ url = "http://dfu-util.sourceforge.net/releases/${name}.tar.gz";
+ sha256 = "0n7h08avlzin04j93m6hkq9id6hxjiiix7ff9gc2n89aw6dxxjsm";
+ };
+
+ meta = with stdenv.lib; {
+ description = "Device firmware update (DFU) USB programmer";
+ longDescription = ''
+ dfu-util is a program that implements the host (PC) side of the USB
+ DFU 1.0 and 1.1 (Universal Serial Bus Device Firmware Upgrade) protocol.
+
+ DFU is intended to download and upload firmware to devices connected over
+ USB. It ranges from small devices like micro-controller boards up to mobile
+ phones. With dfu-util you are able to download firmware to your device or
+ upload firmware from it.
+ '';
+ homepage = http://dfu-util.gnumonks.org/;
+ license = licenses.gpl2Plus;
+ platforms = platforms.unix;
+ maintainers = [ ];
+ };
+}
diff --git a/pkgs/applications/audio/axoloti/libusb1.nix b/pkgs/applications/audio/axoloti/libusb1.nix
new file mode 100644
index 0000000000000000000000000000000000000000..cf71c006046ed35f8260a103e8cf5cb3456229ad
--- /dev/null
+++ b/pkgs/applications/audio/axoloti/libusb1.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, pkgconfig, systemd ? null, libobjc, IOKit, fetchpatch }:
+
+stdenv.mkDerivation rec {
+ name = "libusb-1.0.19";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/libusb/${name}.tar.bz2";
+ sha256 = "0h38p9rxfpg9vkrbyb120i1diq57qcln82h5fr7hvy82c20jql3c";
+ };
+
+ outputs = [ "out" "dev" ]; # get rid of propagating systemd closure
+
+ buildInputs = [ pkgconfig ];
+ propagatedBuildInputs =
+ stdenv.lib.optional stdenv.isLinux systemd ++
+ stdenv.lib.optionals stdenv.isDarwin [ libobjc IOKit ];
+
+ patches = [
+ (fetchpatch {
+ name = "libusb.stdfu.patch";
+ url = "https://raw.githubusercontent.com/axoloti/axoloti/1.0.12/platform_linux/src/libusb.stdfu.patch";
+ sha256 = "194j7j61i4q6x0ihm9ms8dxd4vliw20n2rj6cm9h17qzdl9xr33d";
+ })
+ ];
+
+ NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
+
+ preFixup = stdenv.lib.optionalString stdenv.isLinux ''
+ sed 's,-ludev,-L${systemd.lib}/lib -ludev,' -i $out/lib/libusb-1.0.la
+ '';
+
+ meta = {
+ homepage = http://www.libusb.info;
+ description = "User-space USB library";
+ platforms = stdenv.lib.platforms.unix;
+ maintainers = [ ];
+ };
+}
diff --git a/pkgs/applications/audio/bitmeter/default.nix b/pkgs/applications/audio/bitmeter/default.nix
index ca3148f0e0a4d98013cb1d5032e8f08cd562d47f..32daf000dc5994c8a7c0a22319acc55afe18531a 100644
--- a/pkgs/applications/audio/bitmeter/default.nix
+++ b/pkgs/applications/audio/bitmeter/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "09ck2gxqky701dc1p0ip61rrn16v0pdc7ih2hc2sd63zcw53g2a7";
};
- buildInputs = [ libjack2 gtk2 pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ libjack2 gtk2 ];
meta = with stdenv.lib; {
homepage = http://devel.tlrmx.org/audio/bitmeter/;
diff --git a/pkgs/applications/audio/bristol/default.nix b/pkgs/applications/audio/bristol/default.nix
index 28155fd2317885c3f9ae2b2a4ca76ac7c9d7bbbf..42e99fa51863221f7360afb6fe6aaf7010347c4a 100644
--- a/pkgs/applications/audio/bristol/default.nix
+++ b/pkgs/applications/audio/bristol/default.nix
@@ -9,8 +9,9 @@ stdenv.mkDerivation rec {
sha256 = "1fi2m4gmvxdi260821y09lxsimq82yv4k5bbgk3kyc3x1nyhn7vx";
};
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- alsaLib libjack2 pkgconfig libpulseaudio xorg.libX11 xorg.libXext
+ alsaLib libjack2 libpulseaudio xorg.libX11 xorg.libXext
xorg.xproto
];
diff --git a/pkgs/applications/audio/calf/default.nix b/pkgs/applications/audio/calf/default.nix
index e133df564d7a159c13a32f709b940f315bd8d256..15fca59deee3cff77123fd04fb23f9718ad235f9 100644
--- a/pkgs/applications/audio/calf/default.nix
+++ b/pkgs/applications/audio/calf/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
];
meta = with stdenv.lib; {
- homepage = http://calf.sourceforge.net;
+ homepage = http://calf-studio-gear.org;
description = "A set of high quality open source audio plugins for musicians";
license = licenses.lgpl2;
maintainers = [ maintainers.goibhniu ];
diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix
index f09791d9aa1f90f09b6581546baf8c1a188e248e..35fe510cbb2b5dceb3a95ab13b8b67ec8a69db84 100644
--- a/pkgs/applications/audio/cantata/default.nix
+++ b/pkgs/applications/audio/cantata/default.nix
@@ -34,20 +34,21 @@ assert withOnlineServices -> withTaglib;
assert withReplaygain -> withTaglib;
let
- version = "2.1.0";
+ version = "2.2.0";
pname = "cantata";
fstat = x: fn: "-DENABLE_" + fn + "=" + (if x then "ON" else "OFF");
fstats = x: map (fstat x);
-in
-stdenv.mkDerivation rec {
+ withUdisks = (withTaglib && withDevices);
+
+in stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "CDrummond";
repo = "cantata";
rev = "v${version}";
- sha256 = "1mwc3cyrvg8qxjn70h4i6kdkvz85xspb3wi8wrb56jrhil409fkh";
+ sha256 = "1b633chgfs8rya78bzzck5zijna15d1y4nmrz4dcjp862ks5y5q6";
};
buildInputs = [ vlc ]
@@ -60,43 +61,37 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional withLame lame
++ stdenv.lib.optional withMtp libmtp
++ stdenv.lib.optional withMusicbrainz libmusicbrainz5
- ++ stdenv.lib.optional (withTaglib && withDevices) udisks2;
+ ++ stdenv.lib.optional withUdisks udisks2;
nativeBuildInputs = [ cmake pkgconfig ];
enableParallelBuilding = true;
cmakeFlags = stdenv.lib.flatten [
- (fstat withQt5 "QT5")
- (fstats withTaglib [ "TAGLIB" "TAGLIB_EXTRAS" ])
- (fstats withReplaygain [ "FFMPEG" "MPG123" "SPEEXDSP" ])
- (fstat withCdda "CDPARANOIA")
- (fstat withCddb "CDDB")
- (fstat withLame "LAME")
- (fstat withMtp "MTP")
- (fstat withMusicbrainz "MUSICBRAINZ")
+ (fstat withQt5 "QT5")
+ (fstats withTaglib [ "TAGLIB" "TAGLIB_EXTRAS" ])
+ (fstats withReplaygain [ "FFMPEG" "MPG123" "SPEEXDSP" ])
+ (fstat withCdda "CDPARANOIA")
+ (fstat withCddb "CDDB")
+ (fstat withLame "LAME")
+ (fstat withMtp "MTP")
+ (fstat withMusicbrainz "MUSICBRAINZ")
(fstat withOnlineServices "ONLINE_SERVICES")
- (fstat withDynamic "DYNAMIC")
- (fstat withDevices "DEVICES_SUPPORT")
- (fstat withHttpServer "HTTP_SERVER")
- (fstat withStreams "STREAMS")
+ (fstat withDynamic "DYNAMIC")
+ (fstat withDevices "DEVICES_SUPPORT")
+ (fstat withHttpServer "HTTP_SERVER")
+ (fstat withStreams "STREAMS")
+ (fstat withUdisks "UDISKS2")
"-DENABLE_HTTPS_SUPPORT=ON"
- "-DENABLE_UDISKS2=ON"
];
- # This is already fixed upstream but not released yet. Maybe in version 2.
- preConfigure = ''
- sed -i -e 's/STRLESS/VERSION_LESS/g' cmake/FindTaglib.cmake
- '';
-
meta = with stdenv.lib; {
- homepage = https://github.com/cdrummond/cantata;
+ homepage = https://github.com/cdrummond/cantata;
description = "A graphical client for MPD";
- license = licenses.gpl3;
-
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ fuuzetsu peterhoeg ];
# Technically Cantata can run on Windows so if someone wants to
# bother figuring that one out, be my guest.
- platforms = platforms.linux;
- maintainers = with maintainers; [ fuuzetsu ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/audio/caps/default.nix b/pkgs/applications/audio/caps/default.nix
index b500429127155c5a2b58a8fb51e8fc56525b1cee..27724bc28e990277e4d03253c4c2e2209a2edc7e 100644
--- a/pkgs/applications/audio/caps/default.nix
+++ b/pkgs/applications/audio/caps/default.nix
@@ -6,6 +6,14 @@ stdenv.mkDerivation rec {
url = "http://www.quitte.de/dsp/caps_${version}.tar.bz2";
sha256 = "081zx0i2ysw5nmy03j60q9j11zdlg1fxws81kwanncdgayxgwipp";
};
+
+ patches = [
+ (fetchurl {
+ url = "https://anonscm.debian.org/cgit/pkg-multimedia/caps.git/plain/debian/patches/0001-Avoid-ambiguity-in-div-invocation.patch";
+ sha256 = "1b1pb5yfskiw8zi1lkj572l2ajpirh4amq538vggwvlpv1fqfway";
+ })
+ ];
+
configurePhase = ''
echo "PREFIX = $out" > defines.make
'';
diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix
index 5b0d285f82d9bd9be7f8d2429116666bd089a8bc..affddd90784cfe02649618d5d40d1e69aa1ae2a4 100644
--- a/pkgs/applications/audio/clementine/default.nix
+++ b/pkgs/applications/audio/clementine/default.nix
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, boost, cmake, chromaprint, gettext, gst_all_1, liblastfm
, qt4, taglib, fftw, glew, qjson, sqlite, libgpod, libplist, usbmuxd, libmtp
-, libpulseaudio, gvfs, libcdio, libechonest, libspotify, pcre, protobuf
+, libpulseaudio, gvfs, libcdio, libechonest, libspotify, pcre, projectm, protobuf
, qca2, pkgconfig, sparsehash, config, makeWrapper, runCommand, gst_plugins }:
let
@@ -26,9 +26,10 @@ let
./clementine-spotify-blob-remove-from-build.patch
];
+ nativeBuildInputs = [ cmake pkgconfig ];
+
buildInputs = [
boost
- cmake
chromaprint
fftw
gettext
@@ -40,7 +41,7 @@ let
liblastfm
libpulseaudio
pcre
- pkgconfig
+ projectm
protobuf
qca2
qjson
@@ -53,16 +54,23 @@ let
++ stdenv.lib.optionals (withCD) [libcdio]
++ stdenv.lib.optionals (withCloud) [sparsehash];
+ postPatch = ''
+ sed -i src/CMakeLists.txt \
+ -e 's,-Werror,,g' \
+ -e 's,-Wno-unknown-warning-option,,g' \
+ -e 's,-Wno-unused-private-field,,g'
+ sed -i CMakeLists.txt \
+ -e 's,libprotobuf.a,protobuf,g'
+ '';
+
free = stdenv.mkDerivation {
name = "clementine-free-${version}";
- inherit patches src buildInputs;
+ inherit src patches nativeBuildInputs buildInputs postPatch;
+
+ cmakeFlags = [ "-DUSE_SYSTEM_PROJECTM=ON" ];
+
enableParallelBuilding = true;
- postPatch = ''
- sed -i src/CMakeLists.txt \
- -e 's,-Werror,,g' \
- -e 's,-Wno-unknown-warning-option,,g' \
- -e 's,-Wno-unused-private-field,,g'
- '';
+
meta = with stdenv.lib; {
homepage = http://www.clementine-player.org;
description = "A multiplatform music player";
@@ -76,7 +84,7 @@ let
blob = stdenv.mkDerivation {
name = "clementine-blob-${version}";
# Use the same patches and sources as Clementine
- inherit src;
+ inherit src nativeBuildInputs postPatch;
patches = [
./clementine-spotify-blob.patch
@@ -114,15 +122,13 @@ runCommand "clementine-${version}"
dontPatchELF = true;
dontStrip = true;
meta = {
- homepage = http://www.clementine-player.org;
description = "A multiplatform music player"
+ " (" + (optionalString withSpotify "with Spotify, ")
+ "with gstreamer plugins: "
+ concatStrings (intersperse ", " (map (x: x.name) gst_plugins))
+ ")";
license = licenses.gpl3Plus;
- platforms = platforms.linux;
- maintainers = [ maintainers.ttuegel ];
+ inherit (free.meta) homepage platforms maintainers;
};
}
''
diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix
index 633ba3832c2cc4ad7e7adda14b715d08845ac062..c0dd2e92178c4d6b0ef975a429b2920fa3d5f411 100644
--- a/pkgs/applications/audio/cmus/default.nix
+++ b/pkgs/applications/audio/cmus/default.nix
@@ -116,7 +116,8 @@ stdenv.mkDerivation rec {
"CONFIG_WAV=y"
] ++ concatMap (a: a.flags) opts);
- buildInputs = [ ncurses pkgconfig ]
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ ncurses ]
++ stdenv.lib.optional stdenv.cc.isClang clangGCC
++ stdenv.lib.optionals stdenv.isDarwin [ libiconv CoreAudio ]
++ concatMap (a: a.deps) opts;
diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix
index 9d157833c0d9d32e99bc39cebdd007b1792dad3f..a80cc36b216408c55c43e689920a150b69d25ebc 100644
--- a/pkgs/applications/audio/distrho/default.nix
+++ b/pkgs/applications/audio/distrho/default.nix
@@ -14,8 +14,9 @@ stdenv.mkDerivation rec {
sed -e "s#@./scripts#sh scripts#" -i Makefile
'';
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- alsaLib fftwSinglePrec freetype libjack2 pkgconfig premake3
+ alsaLib fftwSinglePrec freetype libjack2 premake3
xorg.libX11 xorg.libXcomposite xorg.libXcursor xorg.libXext
xorg.libXinerama xorg.libXrender ladspa-sdk
];
diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix
index 064feeb02a39c04ecb1f1e24de2fbe7da772b26c..fb62b6ea3de6b4620593720accb792eb3cd509d2 100644
--- a/pkgs/applications/audio/drumkv1/default.nix
+++ b/pkgs/applications/audio/drumkv1/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "drumkv1-${version}";
- version = "0.8.1";
+ version = "0.8.4";
src = fetchurl {
url = "mirror://sourceforge/drumkv1/${name}.tar.gz";
- sha256 = "0l6kjb1q9vslwy56836a0c65mf8z8ycam5vzz3k4qvd8g74bs1zq";
+ sha256 = "0qqpklzy4wgw9jy0v2810j06712q90bwc69fp7da82536ba058a9";
};
buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ];
diff --git a/pkgs/applications/audio/eq10q/default.nix b/pkgs/applications/audio/eq10q/default.nix
index 35079ea2738591f169205fd52d2e6fddcf37a072..3faeeb12d4c654cc5b59e37d8c42be69482c9ebe 100644
--- a/pkgs/applications/audio/eq10q/default.nix
+++ b/pkgs/applications/audio/eq10q/default.nix
@@ -7,7 +7,8 @@ stdenv.mkDerivation rec {
sha256 = "16mhcav8gwkp29k9ki4dlkajlcgh1i2wvldabxb046d37dq4qzrk";
};
- buildInputs = [ cmake fftw gtkmm2 libxcb lv2 pkgconfig xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ cmake fftw gtkmm2 libxcb lv2 xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence ];
installFlags = ''
DESTDIR=$(out)
diff --git a/pkgs/applications/audio/espeak/default.nix b/pkgs/applications/audio/espeak/default.nix
index 0faf4841c71b326de1dbdcb41a55043a576371d2..6b5101b50b5a2f63cbaa943f6d0b5027e9d0d8df 100644
--- a/pkgs/applications/audio/espeak/default.nix
+++ b/pkgs/applications/audio/espeak/default.nix
@@ -10,7 +10,11 @@ stdenv.mkDerivation rec {
buildInputs = [ unzip portaudio ];
- patchPhase = ''
+ patches = [
+ ./gcc6.patch
+ ];
+
+ prePatch = ''
sed -e s,/bin/ln,ln,g -i src/Makefile
sed -e 's,^CXXFLAGS=-O2,CXXFLAGS=-O2 -D PATH_ESPEAK_DATA=\\\"$(DATADIR)\\\",' -i src/Makefile
'' + (if portaudio.api_version == 19 then ''
diff --git a/pkgs/applications/audio/espeak/edit.nix b/pkgs/applications/audio/espeak/edit.nix
index 524a95bcca0690c1d289aaf0c33a8bd0ba7734e1..8d7db50fd323449daaf9fc3be3fb4ba05934b2ea 100644
--- a/pkgs/applications/audio/espeak/edit.nix
+++ b/pkgs/applications/audio/espeak/edit.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "0x8s7vpb7rw5x37yjzy1f98m4f2csdg89libb74fm36gn8ly0hli";
};
- buildInputs = [ pkgconfig unzip portaudio wxGTK ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ unzip portaudio wxGTK ];
# TODO:
# Uhm, seems like espeakedit still wants espeak-data/ in $HOME, even thought
@@ -20,9 +21,11 @@ stdenv.mkDerivation rec {
# chmod +w ~/espeak-data
patches = [
+ ./gcc6.patch
./espeakedit-fix-makefile.patch
./espeakedit-configurable-sox-path.patch
./espeakedit-configurable-path-espeak-data.patch
+ ./espeakedit-gcc6.patch
];
postPatch = ''
diff --git a/pkgs/applications/audio/espeak/espeakedit-gcc6.patch b/pkgs/applications/audio/espeak/espeakedit-gcc6.patch
new file mode 100644
index 0000000000000000000000000000000000000000..1e0cb20bbf76622ae89549eaa5686d2c01797e34
--- /dev/null
+++ b/pkgs/applications/audio/espeak/espeakedit-gcc6.patch
@@ -0,0 +1,57 @@
+diff --git i/src/compiledata.cpp w/src/compiledata.cpp
+index f1bcb30..30e9e2d 100755
+--- i/src/compiledata.cpp
++++ w/src/compiledata.cpp
+@@ -212,7 +212,7 @@ enum {
+ kTUNE_SPLIT,
+ };
+
+-static const char utf8_bom[] = {0xef,0xbb,0xbf,0};
++static const char utf8_bom[] = {char(0xef),char(0xbb),char(0xbf),0};
+
+ static keywtab_t k_intonation[] = {
+ {"tune", 0, kTUNE},
+diff --git i/src/espeakedit.cpp w/src/espeakedit.cpp
+index bde03ea..071689d 100755
+--- i/src/espeakedit.cpp
++++ w/src/espeakedit.cpp
+@@ -744,7 +744,7 @@ void MyFrame::OnTools(wxCommandEvent& event)
+ int debug_flag=0;
+ char fname_log[sizeof(path_dsource)+12];
+ char err_fname[sizeof(path_home)+15];
+- static const char utf8_bom[] = {0xef,0xbb,0xbf,0};
++ static const char utf8_bom[] = {char(0xef),char(0xbb),char(0xbf),0};
+
+ switch(event.GetId())
+ {
+diff --git i/src/extras.cpp w/src/extras.cpp
+index fa6ac3b..ee68f59 100644
+--- i/src/extras.cpp
++++ w/src/extras.cpp
+@@ -335,16 +335,16 @@ void Lexicon_It(int pass)
+ static const char *vowels1 = "aeiou";
+ static const char *vowels2 = "aeou";
+
+- static const char ex1[] = {'a',0xc3,0xac,0}; // aì
+- static const char ex2[] = {'e',0xc3,0xac,0}; // eì
+- static const char ex3[] = {0xc3,0xb9,'a',0}; // ùa
+- static const char ex4[] = {0xc3,0xb9,'e',0}; // ùe
+- static const char ex5[] = {0xc3,0xb9,'i',0}; // ùi
+- static const char ex6[] = {0xc3,0xb9,'o',0}; // ùo
+- static const char ex7[] = {'c',0xc3,0xac,'a',0}; // cìa
+- static const char ex8[] = {'c',0xc3,0xac,'o',0}; // cìo
+- static const char ex9[] = {'c',0xc3,0xac,'u',0}; // cìu
+- static const char ex10[] = {'g','l',0xc3,0xac,0}; // glì
++ static const char ex1[] = {'a',char(0xc3),char(0xac),0}; // aì
++ static const char ex2[] = {'e',char(0xc3),char(0xac),0}; // eì
++ static const char ex3[] = {char(0xc3),char(0xb9),'a',0}; // ùa
++ static const char ex4[] = {char(0xc3),char(0xb9),'e',0}; // ùe
++ static const char ex5[] = {char(0xc3),char(0xb9),'i',0}; // ùi
++ static const char ex6[] = {char(0xc3),char(0xb9),'o',0}; // ùo
++ static const char ex7[] = {'c',char(0xc3),char(0xac),'a',0}; // cìa
++ static const char ex8[] = {'c',char(0xc3),char(0xac),'o',0}; // cìo
++ static const char ex9[] = {'c',char(0xc3),char(0xac),'u',0}; // cìu
++ static const char ex10[] = {'g','l',char(0xc3),char(0xac),0}; // glì
+
+
+ static const char *exceptions[] = {ex1, ex2, ex3, ex4, ex5, ex6, ex7, ex8, ex9, ex10, NULL};
diff --git a/pkgs/applications/audio/espeak/gcc6.patch b/pkgs/applications/audio/espeak/gcc6.patch
new file mode 100644
index 0000000000000000000000000000000000000000..58036ecbe50963bef5ce95fb8f46087f449d126b
--- /dev/null
+++ b/pkgs/applications/audio/espeak/gcc6.patch
@@ -0,0 +1,13 @@
+diff --git c/src/tr_languages.cpp i/src/tr_languages.cpp
+index ec210a5..9503f47 100755
+--- c/src/tr_languages.cpp
++++ i/src/tr_languages.cpp
+@@ -198,7 +198,7 @@ static const unsigned short chars_ignore_zwnj_hyphen[] = {
+ 0x200d, 1, // zero width joiner
+ 0, 0 };
+
+-const char string_ordinal[] = {0xc2,0xba,0}; // masculine ordinal character, UTF-8
++const char string_ordinal[] = {char(0xc2),char(0xba),0}; // masculine ordinal character, UTF-8
+
+
+ static Translator* NewTranslator(void)
diff --git a/pkgs/applications/audio/faust/faust1.nix b/pkgs/applications/audio/faust/faust1.nix
index b9e98281a7c662e63eb5209ae7790de537ab4c92..4875ee8b57da3fce6eb5d1d3cf8124c6cacfb1eb 100644
--- a/pkgs/applications/audio/faust/faust1.nix
+++ b/pkgs/applications/audio/faust/faust1.nix
@@ -158,7 +158,8 @@ let
stdenv.mkDerivation ((faust2ApplBase args) // {
- buildInputs = [ makeWrapper pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ makeWrapper ];
propagatedBuildInputs = [ faust ] ++ propagatedBuildInputs;
diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix
index 274f7c9c3b84c44588b7aff8974faa6795a96410..901df19ebf596ead80b79012bb6da92d681ae599 100644
--- a/pkgs/applications/audio/faust/faust2.nix
+++ b/pkgs/applications/audio/faust/faust2.nix
@@ -187,7 +187,8 @@ let
stdenv.mkDerivation ((faust2ApplBase args) // {
- buildInputs = [ makeWrapper pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ makeWrapper ];
propagatedBuildInputs = [ faust ] ++ propagatedBuildInputs;
diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix
index bb37cac5500e947c27982a81ab82c1a431b84e24..a8bf05187e3367cf5174eea6e7bb573bc1a1ed59 100644
--- a/pkgs/applications/audio/fluidsynth/default.nix
+++ b/pkgs/applications/audio/fluidsynth/default.nix
@@ -20,7 +20,8 @@ stdenv.mkDerivation rec {
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin
"-framework CoreAudio -framework CoreServices";
- buildInputs = [ glib libsndfile pkgconfig ]
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ glib libsndfile ]
++ stdenv.lib.optionals (!stdenv.isDarwin) [ alsaLib libpulseaudio libjack2 ]
++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices CoreAudio AudioUnit ];
diff --git a/pkgs/applications/audio/fmsynth/default.nix b/pkgs/applications/audio/fmsynth/default.nix
index 22944ffefe44ad164a53f13ed7ab3d0465b3ca1a..58d095080fe53358fef8030d9d4efbc747edfbcd 100644
--- a/pkgs/applications/audio/fmsynth/default.nix
+++ b/pkgs/applications/audio/fmsynth/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1bk0bpr069hzx2508rgfbwpxiqgr7dmdkhqdywmd2i4rmibgrm1q";
};
- buildInputs = [ gtkmm2 lv2 lvtk pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gtkmm2 lv2 lvtk ];
buildPhase = ''
cd lv2
diff --git a/pkgs/applications/audio/fomp/default.nix b/pkgs/applications/audio/fomp/default.nix
index bdac87aaf3749bb4cd337ad9b611f8adbebc45c7..367b1db139d5485e2bc9906e59259db5f1891b02 100644
--- a/pkgs/applications/audio/fomp/default.nix
+++ b/pkgs/applications/audio/fomp/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1hh2xhknanqn3iwp12ihl6bf8p7bqxryms9qk7mh21lixl42b8k5";
};
- buildInputs = [ lv2 pkgconfig python2 ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ lv2 python2 ];
installPhase = ''
python waf configure --prefix=$out
diff --git a/pkgs/applications/audio/foo-yc20/default.nix b/pkgs/applications/audio/foo-yc20/default.nix
index 073d28ef8703d36dc547456b6fd3153e70f6b1ea..28b2cd98e02c3c2e6ebc8cce0a57743e047c8bbb 100644
--- a/pkgs/applications/audio/foo-yc20/default.nix
+++ b/pkgs/applications/audio/foo-yc20/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "0i8261n95n4xic766h70xkrpbvw3sag96n1883ahmg6h7yb94avq";
};
- buildInputs = [ libjack2 gtk2 lv2 faust pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ libjack2 gtk2 lv2 faust ];
makeFlags = "PREFIX=$(out)";
diff --git a/pkgs/applications/audio/freewheeling/default.nix b/pkgs/applications/audio/freewheeling/default.nix
index f37b44f92317b79b7713742825eb214ded18c481..25704d2628019da5a7e05d45dc6734eb7406a5ac 100644
--- a/pkgs/applications/audio/freewheeling/default.nix
+++ b/pkgs/applications/audio/freewheeling/default.nix
@@ -1,20 +1,23 @@
-{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, gnutls, freetype
+{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, gnutls, freetype
, SDL, SDL_gfx, SDL_ttf, liblo, libxml2, alsaLib, libjack2, libvorbis
-, libSM, libsndfile, libogg
+, libSM, libsndfile, libogg, libtool
}:
+let
+ makeSDLFlags = map (p: "-I${lib.getDev p}/include/SDL");
+in
stdenv.mkDerivation rec {
name = "freewheeling-${version}";
- version = "2016-11-15";
+ version = "0.6.2";
src = fetchFromGitHub {
owner = "free-wheeling";
repo = "freewheeling";
- rev = "05ef3bf150fa6ba1b1d437b1fd70ef363289742f";
- sha256 = "19plf7r0sq4271ln5bya95mp4i1j30x8hsxxga2kla27z953n9ih";
+ rev = "v${version}";
+ sha256 = "01hmp0jxzxpb5sl0x91hdlwmbw9n4yffrpra4f89s4n8cixrz3d9";
};
- nativeBuildInputs = [ pkgconfig autoreconfHook ];
+ nativeBuildInputs = [ pkgconfig autoreconfHook libtool ];
buildInputs = [
freetype SDL SDL_gfx SDL_ttf
liblo libxml2 libjack2 alsaLib libvorbis libsndfile libogg libSM
@@ -22,8 +25,7 @@ stdenv.mkDerivation rec {
configureFlags = oldAttrs.configureFlags ++ [ "--enable-openssl-compatibility" ];
}))
];
-
- patches = [ ./am_path_sdl.patch ./xml.patch ];
+ NIX_CFLAGS_COMPILE = makeSDLFlags [ SDL SDL_ttf SDL_gfx ] ++ [ "-I${libxml2.dev}/include/libxml2" ];
hardeningDisable = [ "format" ];
diff --git a/pkgs/applications/audio/game-music-emu/default.nix b/pkgs/applications/audio/game-music-emu/default.nix
index 4f22ca62c1a8fa395bd646ab863d8fec59c1e31a..a0a79785283c0d0916d5bba75380964bc1794b2b 100644
--- a/pkgs/applications/audio/game-music-emu/default.nix
+++ b/pkgs/applications/audio/game-music-emu/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
buildInputs = [ cmake ];
meta = with stdenv.lib; {
- homepage = https://code.google.com/p/game-music-emu/;
+ homepage = https://bitbucket.org/mpyne/game-music-emu/wiki/Home;
description = "A collection of video game music file emulators";
license = licenses.lgpl21Plus;
platforms = platforms.all;
diff --git a/pkgs/applications/audio/gmpc/default.nix b/pkgs/applications/audio/gmpc/default.nix
index ab6dd0eee72f01ac9bcc54b33e255fa7d7a831db..50b1bcde58f3ef0e81de8607a4df6b8236c54a39 100644
--- a/pkgs/applications/audio/gmpc/default.nix
+++ b/pkgs/applications/audio/gmpc/default.nix
@@ -14,7 +14,9 @@ stdenv.mkDerivation rec {
sha256 = "10vspwsgr8pwf3qp2bviw6b2l8prgdiswgv7qiqiyr0h1mmk487y";
};
patches = [ ./libmpd-11.8.17-remove-strndup.patch ];
- buildInputs = [ pkgconfig glib ];
+
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ glib ];
};
src = fetchurl {
@@ -22,8 +24,9 @@ stdenv.mkDerivation rec {
sha256 = "0b3bnxf98i5lhjyljvgxgx9xmb6p46cn3a9cccrng14nagri9556";
};
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- libtool intltool pkgconfig glib gtk2 curl mpd_clientlib libsoup
+ libtool intltool glib gtk2 curl mpd_clientlib libsoup
libunique libmpd gob2 vala_0_23 libSM libICE sqlite hicolor_icon_theme
wrapGAppsHook
];
diff --git a/pkgs/applications/audio/gnaural/default.nix b/pkgs/applications/audio/gnaural/default.nix
index 2b78d1a4b6dd3281dabb78e878c0e14a17b97e9f..f5887e870db6e8cb1ff6c182a7dae6c327e14c7b 100644
--- a/pkgs/applications/audio/gnaural/default.nix
+++ b/pkgs/applications/audio/gnaural/default.nix
@@ -2,7 +2,8 @@
stdenv.mkDerivation rec {
name = "gnaural-1.0.20110606";
- buildInputs = [ pkgconfig gtk2 libsndfile portaudio ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gtk2 libsndfile portaudio ];
src = fetchurl {
url = "mirror://sourceforge/gnaural/Gnaural/${name}.tar.gz";
sha256 = "0p9rasz1jmxf16vnpj17g3vzdjygcyz3l6nmbq6wr402l61f1vy5";
@@ -13,5 +14,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2;
maintainers = [ maintainers.ehmry ];
platforms = platforms.linux;
+ broken = true;
};
}
diff --git a/pkgs/applications/audio/google-play-music-desktop-player/default.nix b/pkgs/applications/audio/google-play-music-desktop-player/default.nix
index ba9bd0338f577d91f2db1aa0b8e7e8b4ebfd556e..9d9af63118320c9b2fde6e65074d37d07a820c2e 100644
--- a/pkgs/applications/audio/google-play-music-desktop-player/default.nix
+++ b/pkgs/applications/audio/google-play-music-desktop-player/default.nix
@@ -4,7 +4,7 @@
}:
let
- version = "4.4.0";
+ version = "4.4.1";
deps = [
alsaLib
@@ -46,7 +46,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://github.com/MarshallOfSound/Google-Play-Music-Desktop-Player-UNOFFICIAL-/releases/download/v${version}/google-play-music-desktop-player_${version}_amd64.deb";
- sha256 = "01a52rsp0a9k47mm3wqnhnmlnd7fw6xmdrn882msldijjgwsq5cc";
+ sha256 = "0jqgawgij6jxf3zy3glviqj6s34mq7d756syg2c7kk1gkqkwgdpw";
};
dontBuild = true;
diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix
index f49962450a092e92f1c30a393436c94226c112a3..3d074bf1e19ed88f57b7ada3002432ba3281cce4 100644
--- a/pkgs/applications/audio/gpodder/default.nix
+++ b/pkgs/applications/audio/gpodder/default.nix
@@ -51,6 +51,13 @@ python2Packages.buildPythonApplication rec {
feedparser dbus-python mygpoclient pygtk eyeD3 podcastparser html5lib
] ++ stdenv.lib.optional ipodSupport libgpod;
+ preBuild = ''
+ make PREFIX="$out" \
+ share/applications/gpodder-url-handler.desktop \
+ share/applications/gpodder.desktop \
+ share/dbus-1/services/org.gpodder.service
+ '';
+
checkPhase = ''
LC_ALL=C python -m gpodder.unittests
'';
diff --git a/pkgs/applications/audio/gradio/0001-Remove-post-install-script-that-hardcodes-paths.patch b/pkgs/applications/audio/gradio/0001-Remove-post-install-script-that-hardcodes-paths.patch
new file mode 100644
index 0000000000000000000000000000000000000000..3a6296baaa6432d16e1b36c6bcfc0ce138fbf974
--- /dev/null
+++ b/pkgs/applications/audio/gradio/0001-Remove-post-install-script-that-hardcodes-paths.patch
@@ -0,0 +1,23 @@
+From 184c64718ee68b2738647f4a106b260c47f00437 Mon Sep 17 00:00:00 2001
+From: Sam Parkinson
+Date: Thu, 26 Oct 2017 14:50:13 +1100
+Subject: [PATCH] Remove post-install script that hardcodes paths
+
+---
+ meson.build | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 25f3e1a..18b43bd 100644
+--- a/meson.build
++++ b/meson.build
+@@ -21,4 +21,5 @@ subdir('src')
+ # subdir('tests')
+ # TODO: unit tests
+
+-meson.add_install_script('meson_post_install.sh')
++# This does not work for nixos; it hard-codes paths
++# meson.add_install_script('meson_post_install.sh')
+--
+2.14.2
+
diff --git a/pkgs/applications/audio/gradio/default.nix b/pkgs/applications/audio/gradio/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..2f4bde92167b461b66fa1baadd873d2ee6fe00b2
--- /dev/null
+++ b/pkgs/applications/audio/gradio/default.nix
@@ -0,0 +1,72 @@
+{ stdenv, fetchFromGitHub, pkgconfig
+, gcc
+, python3
+, gsettings_desktop_schemas
+, desktop_file_utils
+, glib
+, gtk3
+, intltool
+, libsoup
+, json_glib
+, wrapGAppsHook
+, meson
+, ninja
+, vala
+, sqlite
+, gst_all_1
+, gst_plugins ? with gst_all_1; [ gst-plugins-good gst-plugins-ugly ]
+}:
+let
+ version = "6.0.2";
+
+in stdenv.mkDerivation rec {
+ name = "gradio-${version}";
+
+ src = fetchFromGitHub {
+ owner = "haecker-felix";
+ repo = "gradio";
+ rev = "v${version}";
+ sha256 = "05hg26yr7splgpkl8wjxcsdks9sm1is3hcnp7f5mjnp2ch0nn57s";
+ };
+
+ nativeBuildInputs = [
+ pkgconfig
+
+ meson
+ ninja
+ vala
+
+ python3
+ ];
+ buildInputs = [
+ sqlite
+
+ glib
+ intltool
+ libsoup
+ json_glib
+
+ gtk3
+ gst_all_1.gstreamer
+ gst_all_1.gst-plugins-base
+
+ wrapGAppsHook
+ desktop_file_utils
+ gsettings_desktop_schemas
+ ] ++ gst_plugins;
+
+ enableParallelBuilding = true;
+ postInstall = ''
+ ${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas
+ '';
+
+ patches = [ ./0001-Remove-post-install-script-that-hardcodes-paths.patch ];
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/haecker-felix/gradio;
+ description = "A GTK3 app for finding and listening to internet radio stations";
+ license = licenses.gpl3;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.samdroid-apps ];
+ };
+}
diff --git a/pkgs/applications/audio/greg/default.nix b/pkgs/applications/audio/greg/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..e7a23b6f204c5b8f5a6a56c3528366578a591ec6
--- /dev/null
+++ b/pkgs/applications/audio/greg/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, pythonPackages }:
+
+with pythonPackages; buildPythonApplication rec {
+ pname = "greg";
+ version = "0.4.7";
+ name = pname + "-" + version;
+
+ disabled = !isPy3k;
+
+ src = fetchFromGitHub {
+ owner = "manolomartinez";
+ repo = pname;
+ rev = "v" + version;
+ sha256 = "0bdzgh2k1ppgcvqiasxwp3w89q44s4jgwjidlips3ixx1bzm822v";
+ };
+
+ buildInputs = with pythonPackages; [ feedparser ];
+ propagatedBuildInputs = buildInputs;
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/manolomartinez/greg";
+ description = "A command-line podcast aggregator";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ edwtjo ];
+ };
+}
diff --git a/pkgs/applications/audio/groovebasin/default.nix b/pkgs/applications/audio/groovebasin/default.nix
deleted file mode 100644
index 7eb2e85f7bedf66afd26ec8b5228902980d42581..0000000000000000000000000000000000000000
--- a/pkgs/applications/audio/groovebasin/default.nix
+++ /dev/null
@@ -1,69 +0,0 @@
-{ stdenv, fetchFromGitHub, makeWrapper, callPackage, libgroove, python, utillinux, nodejs }:
-
-with stdenv.lib;
-
-let
- nodePackages = callPackage (import ../../../top-level/node-packages.nix) {
- inherit nodejs;
- neededNatives = [ libgroove python utillinux ];
- self = nodePackages;
- generated = ./package.nix;
- };
-
-in nodePackages.buildNodePackage rec {
- version = "1.5.1";
- name = "groovebasin-${version}";
-
- src = fetchFromGitHub {
- owner = "andrewrk";
- repo = "groovebasin";
- rev = "${version}";
- sha256 = "1g7v0qhvgzpb050hf45pibp68qd67hnnry5npw58f4dvaxdd8yhd";
- };
-
- deps = (filter (v: nixType v == "derivation") (attrValues nodePackages));
-
- buildInputs = [ makeWrapper ];
-
- postInstall = ''
- mkdir -p "$out/lib/node_modules/groovebasin/public"
- stylus -o "$out/lib/node_modules/groovebasin/public/" -c --include-css "$out/lib/node_modules/groovebasin/src/client/styles"
- browserify-lite "$out/lib/node_modules/groovebasin/src/client/app.js" --outfile "$out/lib/node_modules/groovebasin/public/app.js"
- wrapProgram "$out/bin/groovebasin" --set NODE_PATH "$out/lib/node_modules/groovebasin/node_modules/"
- '';
-
- passthru.names = ["groovebasin"];
-
- meta = {
- description = "Music player server with a web-based user interface";
- homepage = http://groovebasin.com/;
- license = licenses.mit;
- platforms = platforms.unix;
- maintainers = [ maintainers.andrewrk ];
- longDescription = ''
- Groove Basin runs on a server optionally connected to speakers. Guests can
- control the music player by connecting with a laptop, tablet, or smart phone.
- Further, users can stream their music libraries remotely.
-
- Groove Basin comes with a fast, responsive web interface that supports keyboard
- shortcuts and drag drop. It also provides the ability to upload songs,
- download songs, and import songs by URL, including YouTube URLs.
-
- Groove Basin supports Dynamic Mode which automatically queues random songs,
- favoring songs that have not been queued recently.
-
- Groove Basin automatically performs ReplayGain scanning on every song using
- the EBU R128 loudness standard, and automatically switches between track
- and album mode.
-
- Groove Basin supports the MPD protocol, which means it is compatible with MPD
- clients. There is also a more powerful Groove Basin protocol which you can
- use if the MPD protocol does not meet your needs.
-
- Groove Basin supports Last.fm scrobbling.
- '';
- # groovebasin was built with nodejs 0.10 which reached end of LTS
- # in October 216, it doesn't built with nodejs 4.x
- broken = true;
- };
-}
diff --git a/pkgs/applications/audio/groovebasin/package.nix b/pkgs/applications/audio/groovebasin/package.nix
deleted file mode 100644
index 3f307cd32f0515f27f3e1861547f626cfe889f7e..0000000000000000000000000000000000000000
--- a/pkgs/applications/audio/groovebasin/package.nix
+++ /dev/null
@@ -1,4396 +0,0 @@
-{ self, fetchurl, fetchgit ? null, lib }:
-
-{
- by-spec."CSSselect"."~0.4.0" =
- self.by-version."CSSselect"."0.4.1";
- by-version."CSSselect"."0.4.1" = self.buildNodePackage {
- name = "CSSselect-0.4.1";
- version = "0.4.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/CSSselect/-/CSSselect-0.4.1.tgz";
- name = "CSSselect-0.4.1.tgz";
- sha1 = "f8ab7e1f8418ce63cda6eb7bd778a85d7ec492b2";
- };
- deps = {
- "CSSwhat-0.4.7" = self.by-version."CSSwhat"."0.4.7";
- "domutils-1.4.3" = self.by-version."domutils"."1.4.3";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."CSSwhat"."0.4" =
- self.by-version."CSSwhat"."0.4.7";
- by-version."CSSwhat"."0.4.7" = self.buildNodePackage {
- name = "CSSwhat-0.4.7";
- version = "0.4.7";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/CSSwhat/-/CSSwhat-0.4.7.tgz";
- name = "CSSwhat-0.4.7.tgz";
- sha1 = "867da0ff39f778613242c44cfea83f0aa4ebdf9b";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."abbrev"."1" =
- self.by-version."abbrev"."1.0.7";
- by-version."abbrev"."1.0.7" = self.buildNodePackage {
- name = "abbrev-1.0.7";
- version = "1.0.7";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz";
- name = "abbrev-1.0.7.tgz";
- sha1 = "5b6035b2ee9d4fb5cf859f08a9be81b208491843";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."abstract-leveldown"."~2.2.1" =
- self.by-version."abstract-leveldown"."2.2.2";
- by-version."abstract-leveldown"."2.2.2" = self.buildNodePackage {
- name = "abstract-leveldown-2.2.2";
- version = "2.2.2";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-2.2.2.tgz";
- name = "abstract-leveldown-2.2.2.tgz";
- sha1 = "ecaff98c20641422710ab04b01e8f04d6b64fe77";
- };
- deps = {
- "xtend-4.0.0" = self.by-version."xtend"."4.0.0";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."accepts"."~1.2.7" =
- self.by-version."accepts"."1.2.9";
- by-version."accepts"."1.2.9" = self.buildNodePackage {
- name = "accepts-1.2.9";
- version = "1.2.9";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/accepts/-/accepts-1.2.9.tgz";
- name = "accepts-1.2.9.tgz";
- sha1 = "76e9631d05e3ff192a34afb9389f7b3953ded001";
- };
- deps = {
- "mime-types-2.1.1" = self.by-version."mime-types"."2.1.1";
- "negotiator-0.5.3" = self.by-version."negotiator"."0.5.3";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."amdefine".">=0.0.4" =
- self.by-version."amdefine"."0.1.1";
- by-version."amdefine"."0.1.1" = self.buildNodePackage {
- name = "amdefine-0.1.1";
- version = "0.1.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/amdefine/-/amdefine-0.1.1.tgz";
- name = "amdefine-0.1.1.tgz";
- sha1 = "b5c75c532052dccd6a39c0064c772c8d57a06cd2";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."ansi-regex"."^1.0.0" =
- self.by-version."ansi-regex"."1.1.1";
- by-version."ansi-regex"."1.1.1" = self.buildNodePackage {
- name = "ansi-regex-1.1.1";
- version = "1.1.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz";
- name = "ansi-regex-1.1.1.tgz";
- sha1 = "41c847194646375e6a1a5d10c3ca054ef9fc980d";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."ansi-regex"."^1.1.0" =
- self.by-version."ansi-regex"."1.1.1";
- by-spec."ansi-styles"."^2.0.1" =
- self.by-version."ansi-styles"."2.0.1";
- by-version."ansi-styles"."2.0.1" = self.buildNodePackage {
- name = "ansi-styles-2.0.1";
- version = "2.0.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/ansi-styles/-/ansi-styles-2.0.1.tgz";
- name = "ansi-styles-2.0.1.tgz";
- sha1 = "b033f57f93e2d28adeb8bc11138fa13da0fd20a3";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."asn1"."0.1.11" =
- self.by-version."asn1"."0.1.11";
- by-version."asn1"."0.1.11" = self.buildNodePackage {
- name = "asn1-0.1.11";
- version = "0.1.11";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz";
- name = "asn1-0.1.11.tgz";
- sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."assert-plus"."^0.1.5" =
- self.by-version."assert-plus"."0.1.5";
- by-version."assert-plus"."0.1.5" = self.buildNodePackage {
- name = "assert-plus-0.1.5";
- version = "0.1.5";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz";
- name = "assert-plus-0.1.5.tgz";
- sha1 = "ee74009413002d84cec7219c6ac811812e723160";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."async"."~0.9.0" =
- self.by-version."async"."0.9.2";
- by-version."async"."0.9.2" = self.buildNodePackage {
- name = "async-0.9.2";
- version = "0.9.2";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/async/-/async-0.9.2.tgz";
- name = "async-0.9.2.tgz";
- sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."aws-sign2"."~0.5.0" =
- self.by-version."aws-sign2"."0.5.0";
- by-version."aws-sign2"."0.5.0" = self.buildNodePackage {
- name = "aws-sign2-0.5.0";
- version = "0.5.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz";
- name = "aws-sign2-0.5.0.tgz";
- sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."base64url"."0.0.3" =
- self.by-version."base64url"."0.0.3";
- by-version."base64url"."0.0.3" = self.buildNodePackage {
- name = "base64url-0.0.3";
- version = "0.0.3";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/base64url/-/base64url-0.0.3.tgz";
- name = "base64url-0.0.3.tgz";
- sha1 = "50c20edac277dde1a0b15059954ced7a2d102d57";
- };
- deps = {
- "tap-0.3.3" = self.by-version."tap"."0.3.3";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."base64url"."~0.0.4" =
- self.by-version."base64url"."0.0.6";
- by-version."base64url"."0.0.6" = self.buildNodePackage {
- name = "base64url-0.0.6";
- version = "0.0.6";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/base64url/-/base64url-0.0.6.tgz";
- name = "base64url-0.0.6.tgz";
- sha1 = "9597b36b330db1c42477322ea87ea8027499b82b";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."base64url"."~1.0.4" =
- self.by-version."base64url"."1.0.4";
- by-version."base64url"."1.0.4" = self.buildNodePackage {
- name = "base64url-1.0.4";
- version = "1.0.4";
- bin = true;
- src = fetchurl {
- url = "http://registry.npmjs.org/base64url/-/base64url-1.0.4.tgz";
- name = "base64url-1.0.4.tgz";
- sha1 = "29a2a7ade9791fbb25f312ab35a2fd3126ceac0e";
- };
- deps = {
- "concat-stream-1.4.10" = self.by-version."concat-stream"."1.4.10";
- "meow-2.0.0" = self.by-version."meow"."2.0.0";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."bindings"."~1.2.1" =
- self.by-version."bindings"."1.2.1";
- by-version."bindings"."1.2.1" = self.buildNodePackage {
- name = "bindings-1.2.1";
- version = "1.2.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz";
- name = "bindings-1.2.1.tgz";
- sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."bl"."~0.9.0" =
- self.by-version."bl"."0.9.4";
- by-version."bl"."0.9.4" = self.buildNodePackage {
- name = "bl-0.9.4";
- version = "0.9.4";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/bl/-/bl-0.9.4.tgz";
- name = "bl-0.9.4.tgz";
- sha1 = "4702ddf72fbe0ecd82787c00c113aea1935ad0e7";
- };
- deps = {
- "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."bl"."~0.9.4" =
- self.by-version."bl"."0.9.4";
- by-spec."bluebird"."^2.9.26" =
- self.by-version."bluebird"."2.9.30";
- by-version."bluebird"."2.9.30" = self.buildNodePackage {
- name = "bluebird-2.9.30";
- version = "2.9.30";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/bluebird/-/bluebird-2.9.30.tgz";
- name = "bluebird-2.9.30.tgz";
- sha1 = "edda875ec9aad1f29cf1f56d6e82fbab2b0df556";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."boom"."0.4.x" =
- self.by-version."boom"."0.4.2";
- by-version."boom"."0.4.2" = self.buildNodePackage {
- name = "boom-0.4.2";
- version = "0.4.2";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/boom/-/boom-0.4.2.tgz";
- name = "boom-0.4.2.tgz";
- sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b";
- };
- deps = {
- "hoek-0.9.1" = self.by-version."hoek"."0.9.1";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."boom"."2.x.x" =
- self.by-version."boom"."2.8.0";
- by-version."boom"."2.8.0" = self.buildNodePackage {
- name = "boom-2.8.0";
- version = "2.8.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/boom/-/boom-2.8.0.tgz";
- name = "boom-2.8.0.tgz";
- sha1 = "317bdfd47018fe7dd79b0e9da73efe244119fdf1";
- };
- deps = {
- "hoek-2.14.0" = self.by-version."hoek"."2.14.0";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."browserify-lite"."~0.2.4" =
- self.by-version."browserify-lite"."0.2.4";
- by-version."browserify-lite"."0.2.4" = self.buildNodePackage {
- name = "browserify-lite-0.2.4";
- version = "0.2.4";
- bin = true;
- src = fetchurl {
- url = "http://registry.npmjs.org/browserify-lite/-/browserify-lite-0.2.4.tgz";
- name = "browserify-lite-0.2.4.tgz";
- sha1 = "00a32f466c8f3dbbd1074250fd0aa775716ab140";
- };
- deps = {
- "pend-1.2.0" = self.by-version."pend"."1.2.0";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- "browserify-lite" = self.by-version."browserify-lite"."0.2.4";
- by-spec."buffer-crc32"."~0.2.3" =
- self.by-version."buffer-crc32"."0.2.5";
- by-version."buffer-crc32"."0.2.5" = self.buildNodePackage {
- name = "buffer-crc32-0.2.5";
- version = "0.2.5";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.5.tgz";
- name = "buffer-crc32-0.2.5.tgz";
- sha1 = "db003ac2671e62ebd6ece78ea2c2e1b405736e91";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."buffer-equal"."~0.0.0" =
- self.by-version."buffer-equal"."0.0.1";
- by-version."buffer-equal"."0.0.1" = self.buildNodePackage {
- name = "buffer-equal-0.0.1";
- version = "0.0.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/buffer-equal/-/buffer-equal-0.0.1.tgz";
- name = "buffer-equal-0.0.1.tgz";
- sha1 = "91bc74b11ea405bc916bc6aa908faafa5b4aac4b";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."buffer-equal-constant-time"."^1.0.1" =
- self.by-version."buffer-equal-constant-time"."1.0.1";
- by-version."buffer-equal-constant-time"."1.0.1" = self.buildNodePackage {
- name = "buffer-equal-constant-time-1.0.1";
- version = "1.0.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz";
- name = "buffer-equal-constant-time-1.0.1.tgz";
- sha1 = "f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."bunker"."0.1.X" =
- self.by-version."bunker"."0.1.2";
- by-version."bunker"."0.1.2" = self.buildNodePackage {
- name = "bunker-0.1.2";
- version = "0.1.2";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/bunker/-/bunker-0.1.2.tgz";
- name = "bunker-0.1.2.tgz";
- sha1 = "c88992464a8e2a6ede86930375f92b58077ef97c";
- };
- deps = {
- "burrito-0.2.12" = self.by-version."burrito"."0.2.12";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."burrito".">=0.2.5 <0.3" =
- self.by-version."burrito"."0.2.12";
- by-version."burrito"."0.2.12" = self.buildNodePackage {
- name = "burrito-0.2.12";
- version = "0.2.12";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/burrito/-/burrito-0.2.12.tgz";
- name = "burrito-0.2.12.tgz";
- sha1 = "d0d6e6ac81d5e99789c6fa4accb0b0031ea54f6b";
- };
- deps = {
- "traverse-0.5.2" = self.by-version."traverse"."0.5.2";
- "uglify-js-1.1.1" = self.by-version."uglify-js"."1.1.1";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."camelcase"."^1.0.1" =
- self.by-version."camelcase"."1.1.0";
- by-version."camelcase"."1.1.0" = self.buildNodePackage {
- name = "camelcase-1.1.0";
- version = "1.1.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/camelcase/-/camelcase-1.1.0.tgz";
- name = "camelcase-1.1.0.tgz";
- sha1 = "953b25c3bc98671ee59a44cb9d542672da7331b9";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."camelcase-keys"."^1.0.0" =
- self.by-version."camelcase-keys"."1.0.0";
- by-version."camelcase-keys"."1.0.0" = self.buildNodePackage {
- name = "camelcase-keys-1.0.0";
- version = "1.0.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz";
- name = "camelcase-keys-1.0.0.tgz";
- sha1 = "bd1a11bf9b31a1ce493493a930de1a0baf4ad7ec";
- };
- deps = {
- "camelcase-1.1.0" = self.by-version."camelcase"."1.1.0";
- "map-obj-1.0.1" = self.by-version."map-obj"."1.0.1";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."caseless"."~0.10.0" =
- self.by-version."caseless"."0.10.0";
- by-version."caseless"."0.10.0" = self.buildNodePackage {
- name = "caseless-0.10.0";
- version = "0.10.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/caseless/-/caseless-0.10.0.tgz";
- name = "caseless-0.10.0.tgz";
- sha1 = "ed6b2719adcd1fd18f58dc081c0f1a5b43963909";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."caseless"."~0.8.0" =
- self.by-version."caseless"."0.8.0";
- by-version."caseless"."0.8.0" = self.buildNodePackage {
- name = "caseless-0.8.0";
- version = "0.8.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/caseless/-/caseless-0.8.0.tgz";
- name = "caseless-0.8.0.tgz";
- sha1 = "5bca2881d41437f54b2407ebe34888c7b9ad4f7d";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."caseless"."~0.9.0" =
- self.by-version."caseless"."0.9.0";
- by-version."caseless"."0.9.0" = self.buildNodePackage {
- name = "caseless-0.9.0";
- version = "0.9.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/caseless/-/caseless-0.9.0.tgz";
- name = "caseless-0.9.0.tgz";
- sha1 = "b7b65ce6bf1413886539cfd533f0b30effa9cf88";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."chalk"."^1.0.0" =
- self.by-version."chalk"."1.0.0";
- by-version."chalk"."1.0.0" = self.buildNodePackage {
- name = "chalk-1.0.0";
- version = "1.0.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz";
- name = "chalk-1.0.0.tgz";
- sha1 = "b3cf4ed0ff5397c99c75b8f679db2f52831f96dc";
- };
- deps = {
- "ansi-styles-2.0.1" = self.by-version."ansi-styles"."2.0.1";
- "escape-string-regexp-1.0.3" = self.by-version."escape-string-regexp"."1.0.3";
- "has-ansi-1.0.3" = self.by-version."has-ansi"."1.0.3";
- "strip-ansi-2.0.1" = self.by-version."strip-ansi"."2.0.1";
- "supports-color-1.3.1" = self.by-version."supports-color"."1.3.1";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."charm"."0.1.x" =
- self.by-version."charm"."0.1.2";
- by-version."charm"."0.1.2" = self.buildNodePackage {
- name = "charm-0.1.2";
- version = "0.1.2";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/charm/-/charm-0.1.2.tgz";
- name = "charm-0.1.2.tgz";
- sha1 = "06c21eed1a1b06aeb67553cdc53e23274bac2296";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."cheerio"."^0.18.0" =
- self.by-version."cheerio"."0.18.0";
- by-version."cheerio"."0.18.0" = self.buildNodePackage {
- name = "cheerio-0.18.0";
- version = "0.18.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/cheerio/-/cheerio-0.18.0.tgz";
- name = "cheerio-0.18.0.tgz";
- sha1 = "4e1c06377e725b740e996e0dfec353863de677fa";
- };
- deps = {
- "CSSselect-0.4.1" = self.by-version."CSSselect"."0.4.1";
- "entities-1.1.1" = self.by-version."entities"."1.1.1";
- "htmlparser2-3.8.3" = self.by-version."htmlparser2"."3.8.3";
- "dom-serializer-0.0.1" = self.by-version."dom-serializer"."0.0.1";
- "lodash-2.4.2" = self.by-version."lodash"."2.4.2";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."clarinet"."~0.8.1" =
- self.by-version."clarinet"."0.8.1";
- by-version."clarinet"."0.8.1" = self.buildNodePackage {
- name = "clarinet-0.8.1";
- version = "0.8.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/clarinet/-/clarinet-0.8.1.tgz";
- name = "clarinet-0.8.1.tgz";
- sha1 = "ddfd10cd292abf5cab239140774e394bfd1ee7a6";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."combined-stream"."~0.0.4" =
- self.by-version."combined-stream"."0.0.7";
- by-version."combined-stream"."0.0.7" = self.buildNodePackage {
- name = "combined-stream-0.0.7";
- version = "0.0.7";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz";
- name = "combined-stream-0.0.7.tgz";
- sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f";
- };
- deps = {
- "delayed-stream-0.0.5" = self.by-version."delayed-stream"."0.0.5";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."combined-stream"."~0.0.5" =
- self.by-version."combined-stream"."0.0.7";
- by-spec."combined-stream"."~1.0.1" =
- self.by-version."combined-stream"."1.0.5";
- by-version."combined-stream"."1.0.5" = self.buildNodePackage {
- name = "combined-stream-1.0.5";
- version = "1.0.5";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz";
- name = "combined-stream-1.0.5.tgz";
- sha1 = "938370a57b4a51dea2c77c15d5c5fdf895164009";
- };
- deps = {
- "delayed-stream-1.0.0" = self.by-version."delayed-stream"."1.0.0";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."commander"."^2.8.1" =
- self.by-version."commander"."2.8.1";
- by-version."commander"."2.8.1" = self.buildNodePackage {
- name = "commander-2.8.1";
- version = "2.8.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/commander/-/commander-2.8.1.tgz";
- name = "commander-2.8.1.tgz";
- sha1 = "06be367febfda0c330aa1e2a072d3dc9762425d4";
- };
- deps = {
- "graceful-readlink-1.0.1" = self.by-version."graceful-readlink"."1.0.1";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."concat-stream"."~1.4.7" =
- self.by-version."concat-stream"."1.4.10";
- by-version."concat-stream"."1.4.10" = self.buildNodePackage {
- name = "concat-stream-1.4.10";
- version = "1.4.10";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/concat-stream/-/concat-stream-1.4.10.tgz";
- name = "concat-stream-1.4.10.tgz";
- sha1 = "acc3bbf5602cb8cc980c6ac840fa7d8603e3ef36";
- };
- deps = {
- "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
- "typedarray-0.0.6" = self.by-version."typedarray"."0.0.6";
- "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."connect-static"."~1.5.0" =
- self.by-version."connect-static"."1.5.0";
- by-version."connect-static"."1.5.0" = self.buildNodePackage {
- name = "connect-static-1.5.0";
- version = "1.5.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/connect-static/-/connect-static-1.5.0.tgz";
- name = "connect-static-1.5.0.tgz";
- sha1 = "f8b455532e04de7c3dc7c1e062207f0b7a626ec7";
- };
- deps = {
- "findit2-2.2.3" = self.by-version."findit2"."2.2.3";
- "mime-1.2.11" = self.by-version."mime"."1.2.11";
- "pend-1.2.0" = self.by-version."pend"."1.2.0";
- "streamsink-1.2.0" = self.by-version."streamsink"."1.2.0";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- "connect-static" = self.by-version."connect-static"."1.5.0";
- by-spec."content-disposition"."0.5.0" =
- self.by-version."content-disposition"."0.5.0";
- by-version."content-disposition"."0.5.0" = self.buildNodePackage {
- name = "content-disposition-0.5.0";
- version = "0.5.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/content-disposition/-/content-disposition-0.5.0.tgz";
- name = "content-disposition-0.5.0.tgz";
- sha1 = "4284fe6ae0630874639e44e80a418c2934135e9e";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."content-disposition"."~0.5.0" =
- self.by-version."content-disposition"."0.5.0";
- "content-disposition" = self.by-version."content-disposition"."0.5.0";
- by-spec."content-type"."~1.0.1" =
- self.by-version."content-type"."1.0.1";
- by-version."content-type"."1.0.1" = self.buildNodePackage {
- name = "content-type-1.0.1";
- version = "1.0.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/content-type/-/content-type-1.0.1.tgz";
- name = "content-type-1.0.1.tgz";
- sha1 = "a19d2247327dc038050ce622b7a154ec59c5e600";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."cookie"."0.1.2" =
- self.by-version."cookie"."0.1.2";
- by-version."cookie"."0.1.2" = self.buildNodePackage {
- name = "cookie-0.1.2";
- version = "0.1.2";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/cookie/-/cookie-0.1.2.tgz";
- name = "cookie-0.1.2.tgz";
- sha1 = "72fec3d24e48a3432073d90c12642005061004b1";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."cookie-signature"."1.0.6" =
- self.by-version."cookie-signature"."1.0.6";
- by-version."cookie-signature"."1.0.6" = self.buildNodePackage {
- name = "cookie-signature-1.0.6";
- version = "1.0.6";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz";
- name = "cookie-signature-1.0.6.tgz";
- sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."cookies"."~0.5.0" =
- self.by-version."cookies"."0.5.0";
- by-version."cookies"."0.5.0" = self.buildNodePackage {
- name = "cookies-0.5.0";
- version = "0.5.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/cookies/-/cookies-0.5.0.tgz";
- name = "cookies-0.5.0.tgz";
- sha1 = "164cac46a1d3ca3b3b87427414c24931d8381025";
- };
- deps = {
- "keygrip-1.0.1" = self.by-version."keygrip"."1.0.1";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- "cookies" = self.by-version."cookies"."0.5.0";
- by-spec."core-util-is"."~1.0.0" =
- self.by-version."core-util-is"."1.0.1";
- by-version."core-util-is"."1.0.1" = self.buildNodePackage {
- name = "core-util-is-1.0.1";
- version = "1.0.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz";
- name = "core-util-is-1.0.1.tgz";
- sha1 = "6b07085aef9a3ccac6ee53bf9d3df0c1521a5538";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."crc"."3.2.1" =
- self.by-version."crc"."3.2.1";
- by-version."crc"."3.2.1" = self.buildNodePackage {
- name = "crc-3.2.1";
- version = "3.2.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/crc/-/crc-3.2.1.tgz";
- name = "crc-3.2.1.tgz";
- sha1 = "5d9c8fb77a245cd5eca291e5d2d005334bab0082";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."cryptiles"."0.2.x" =
- self.by-version."cryptiles"."0.2.2";
- by-version."cryptiles"."0.2.2" = self.buildNodePackage {
- name = "cryptiles-0.2.2";
- version = "0.2.2";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz";
- name = "cryptiles-0.2.2.tgz";
- sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c";
- };
- deps = {
- "boom-0.4.2" = self.by-version."boom"."0.4.2";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."cryptiles"."2.x.x" =
- self.by-version."cryptiles"."2.0.4";
- by-version."cryptiles"."2.0.4" = self.buildNodePackage {
- name = "cryptiles-2.0.4";
- version = "2.0.4";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/cryptiles/-/cryptiles-2.0.4.tgz";
- name = "cryptiles-2.0.4.tgz";
- sha1 = "09ea1775b9e1c7de7e60a99d42ab6f08ce1a1285";
- };
- deps = {
- "boom-2.8.0" = self.by-version."boom"."2.8.0";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."css-parse"."1.7.x" =
- self.by-version."css-parse"."1.7.0";
- by-version."css-parse"."1.7.0" = self.buildNodePackage {
- name = "css-parse-1.7.0";
- version = "1.7.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/css-parse/-/css-parse-1.7.0.tgz";
- name = "css-parse-1.7.0.tgz";
- sha1 = "321f6cf73782a6ff751111390fc05e2c657d8c9b";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."ctype"."0.5.3" =
- self.by-version."ctype"."0.5.3";
- by-version."ctype"."0.5.3" = self.buildNodePackage {
- name = "ctype-0.5.3";
- version = "0.5.3";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz";
- name = "ctype-0.5.3.tgz";
- sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."curlydiff"."~2.0.1" =
- self.by-version."curlydiff"."2.0.1";
- by-version."curlydiff"."2.0.1" = self.buildNodePackage {
- name = "curlydiff-2.0.1";
- version = "2.0.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/curlydiff/-/curlydiff-2.0.1.tgz";
- name = "curlydiff-2.0.1.tgz";
- sha1 = "6ac4b754ea5b63af2632022d03a152306f7eac0b";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- "curlydiff" = self.by-version."curlydiff"."2.0.1";
- by-spec."debug"."*" =
- self.by-version."debug"."2.2.0";
- by-version."debug"."2.2.0" = self.buildNodePackage {
- name = "debug-2.2.0";
- version = "2.2.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/debug/-/debug-2.2.0.tgz";
- name = "debug-2.2.0.tgz";
- sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da";
- };
- deps = {
- "ms-0.7.1" = self.by-version."ms"."0.7.1";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."debug"."~2.2.0" =
- self.by-version."debug"."2.2.0";
- by-spec."deep-equal"."~0.0.0" =
- self.by-version."deep-equal"."0.0.0";
- by-version."deep-equal"."0.0.0" = self.buildNodePackage {
- name = "deep-equal-0.0.0";
- version = "0.0.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.0.0.tgz";
- name = "deep-equal-0.0.0.tgz";
- sha1 = "99679d3bbd047156fcd450d3d01eeb9068691e83";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."deep-is"."0.1.x" =
- self.by-version."deep-is"."0.1.3";
- by-version."deep-is"."0.1.3" = self.buildNodePackage {
- name = "deep-is-0.1.3";
- version = "0.1.3";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz";
- name = "deep-is-0.1.3.tgz";
- sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."delayed-stream"."0.0.5" =
- self.by-version."delayed-stream"."0.0.5";
- by-version."delayed-stream"."0.0.5" = self.buildNodePackage {
- name = "delayed-stream-0.0.5";
- version = "0.0.5";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz";
- name = "delayed-stream-0.0.5.tgz";
- sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."delayed-stream"."~1.0.0" =
- self.by-version."delayed-stream"."1.0.0";
- by-version."delayed-stream"."1.0.0" = self.buildNodePackage {
- name = "delayed-stream-1.0.0";
- version = "1.0.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz";
- name = "delayed-stream-1.0.0.tgz";
- sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."depd"."~1.0.1" =
- self.by-version."depd"."1.0.1";
- by-version."depd"."1.0.1" = self.buildNodePackage {
- name = "depd-1.0.1";
- version = "1.0.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/depd/-/depd-1.0.1.tgz";
- name = "depd-1.0.1.tgz";
- sha1 = "80aec64c9d6d97e65cc2a9caa93c0aa6abf73aaa";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."destroy"."1.0.3" =
- self.by-version."destroy"."1.0.3";
- by-version."destroy"."1.0.3" = self.buildNodePackage {
- name = "destroy-1.0.3";
- version = "1.0.3";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz";
- name = "destroy-1.0.3.tgz";
- sha1 = "b433b4724e71fd8551d9885174851c5fc377e2c9";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."diacritics"."~1.2.1" =
- self.by-version."diacritics"."1.2.1";
- by-version."diacritics"."1.2.1" = self.buildNodePackage {
- name = "diacritics-1.2.1";
- version = "1.2.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/diacritics/-/diacritics-1.2.1.tgz";
- name = "diacritics-1.2.1.tgz";
- sha1 = "e4d323a7c564197f7af514c5964bd45d0eb8cf77";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."difflet"."~0.2.0" =
- self.by-version."difflet"."0.2.6";
- by-version."difflet"."0.2.6" = self.buildNodePackage {
- name = "difflet-0.2.6";
- version = "0.2.6";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/difflet/-/difflet-0.2.6.tgz";
- name = "difflet-0.2.6.tgz";
- sha1 = "ab23b31f5649b6faa8e3d2acbd334467365ca6fa";
- };
- deps = {
- "traverse-0.6.6" = self.by-version."traverse"."0.6.6";
- "charm-0.1.2" = self.by-version."charm"."0.1.2";
- "deep-is-0.1.3" = self.by-version."deep-is"."0.1.3";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."dom-serializer"."0" =
- self.by-version."dom-serializer"."0.1.0";
- by-version."dom-serializer"."0.1.0" = self.buildNodePackage {
- name = "dom-serializer-0.1.0";
- version = "0.1.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz";
- name = "dom-serializer-0.1.0.tgz";
- sha1 = "073c697546ce0780ce23be4a28e293e40bc30c82";
- };
- deps = {
- "domelementtype-1.1.3" = self.by-version."domelementtype"."1.1.3";
- "entities-1.1.1" = self.by-version."entities"."1.1.1";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."dom-serializer"."~0.0.0" =
- self.by-version."dom-serializer"."0.0.1";
- by-version."dom-serializer"."0.0.1" = self.buildNodePackage {
- name = "dom-serializer-0.0.1";
- version = "0.0.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/dom-serializer/-/dom-serializer-0.0.1.tgz";
- name = "dom-serializer-0.0.1.tgz";
- sha1 = "9589827f1e32d22c37c829adabd59b3247af8eaf";
- };
- deps = {
- "domelementtype-1.1.3" = self.by-version."domelementtype"."1.1.3";
- "entities-1.1.1" = self.by-version."entities"."1.1.1";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."domelementtype"."1" =
- self.by-version."domelementtype"."1.3.0";
- by-version."domelementtype"."1.3.0" = self.buildNodePackage {
- name = "domelementtype-1.3.0";
- version = "1.3.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz";
- name = "domelementtype-1.3.0.tgz";
- sha1 = "b17aed82e8ab59e52dd9c19b1756e0fc187204c2";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."domelementtype"."~1.1.1" =
- self.by-version."domelementtype"."1.1.3";
- by-version."domelementtype"."1.1.3" = self.buildNodePackage {
- name = "domelementtype-1.1.3";
- version = "1.1.3";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz";
- name = "domelementtype-1.1.3.tgz";
- sha1 = "bd28773e2642881aec51544924299c5cd822185b";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."domhandler"."2.3" =
- self.by-version."domhandler"."2.3.0";
- by-version."domhandler"."2.3.0" = self.buildNodePackage {
- name = "domhandler-2.3.0";
- version = "2.3.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz";
- name = "domhandler-2.3.0.tgz";
- sha1 = "2de59a0822d5027fabff6f032c2b25a2a8abe738";
- };
- deps = {
- "domelementtype-1.3.0" = self.by-version."domelementtype"."1.3.0";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."domutils"."1.4" =
- self.by-version."domutils"."1.4.3";
- by-version."domutils"."1.4.3" = self.buildNodePackage {
- name = "domutils-1.4.3";
- version = "1.4.3";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/domutils/-/domutils-1.4.3.tgz";
- name = "domutils-1.4.3.tgz";
- sha1 = "0865513796c6b306031850e175516baf80b72a6f";
- };
- deps = {
- "domelementtype-1.3.0" = self.by-version."domelementtype"."1.3.0";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."domutils"."1.5" =
- self.by-version."domutils"."1.5.1";
- by-version."domutils"."1.5.1" = self.buildNodePackage {
- name = "domutils-1.5.1";
- version = "1.5.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz";
- name = "domutils-1.5.1.tgz";
- sha1 = "dcd8488a26f563d61079e48c9f7b7e32373682cf";
- };
- deps = {
- "dom-serializer-0.1.0" = self.by-version."dom-serializer"."0.1.0";
- "domelementtype-1.3.0" = self.by-version."domelementtype"."1.3.0";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."ee-first"."1.1.0" =
- self.by-version."ee-first"."1.1.0";
- by-version."ee-first"."1.1.0" = self.buildNodePackage {
- name = "ee-first-1.1.0";
- version = "1.1.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz";
- name = "ee-first-1.1.0.tgz";
- sha1 = "6a0d7c6221e490feefd92ec3f441c9ce8cd097f4";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."entities"."1.0" =
- self.by-version."entities"."1.0.0";
- by-version."entities"."1.0.0" = self.buildNodePackage {
- name = "entities-1.0.0";
- version = "1.0.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/entities/-/entities-1.0.0.tgz";
- name = "entities-1.0.0.tgz";
- sha1 = "b2987aa3821347fcde642b24fdfc9e4fb712bf26";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."entities"."~1.1.1" =
- self.by-version."entities"."1.1.1";
- by-version."entities"."1.1.1" = self.buildNodePackage {
- name = "entities-1.1.1";
- version = "1.1.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/entities/-/entities-1.1.1.tgz";
- name = "entities-1.1.1.tgz";
- sha1 = "6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."escape-html"."1.0.1" =
- self.by-version."escape-html"."1.0.1";
- by-version."escape-html"."1.0.1" = self.buildNodePackage {
- name = "escape-html-1.0.1";
- version = "1.0.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz";
- name = "escape-html-1.0.1.tgz";
- sha1 = "181a286ead397a39a92857cfb1d43052e356bff0";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."escape-string-regexp"."^1.0.2" =
- self.by-version."escape-string-regexp"."1.0.3";
- by-version."escape-string-regexp"."1.0.3" = self.buildNodePackage {
- name = "escape-string-regexp-1.0.3";
- version = "1.0.3";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz";
- name = "escape-string-regexp-1.0.3.tgz";
- sha1 = "9e2d8b25bc2555c3336723750e03f099c2735bb5";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."etag"."~1.6.0" =
- self.by-version."etag"."1.6.0";
- by-version."etag"."1.6.0" = self.buildNodePackage {
- name = "etag-1.6.0";
- version = "1.6.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/etag/-/etag-1.6.0.tgz";
- name = "etag-1.6.0.tgz";
- sha1 = "8bcb2c6af1254c481dfc8b997c906ef4e442c207";
- };
- deps = {
- "crc-3.2.1" = self.by-version."crc"."3.2.1";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."express"."~4.12.3" =
- self.by-version."express"."4.12.4";
- by-version."express"."4.12.4" = self.buildNodePackage {
- name = "express-4.12.4";
- version = "4.12.4";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/express/-/express-4.12.4.tgz";
- name = "express-4.12.4.tgz";
- sha1 = "8fec2510255bc6b2e58107c48239c0fa307c1aa2";
- };
- deps = {
- "accepts-1.2.9" = self.by-version."accepts"."1.2.9";
- "content-disposition-0.5.0" = self.by-version."content-disposition"."0.5.0";
- "content-type-1.0.1" = self.by-version."content-type"."1.0.1";
- "cookie-0.1.2" = self.by-version."cookie"."0.1.2";
- "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6";
- "debug-2.2.0" = self.by-version."debug"."2.2.0";
- "depd-1.0.1" = self.by-version."depd"."1.0.1";
- "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
- "etag-1.6.0" = self.by-version."etag"."1.6.0";
- "finalhandler-0.3.6" = self.by-version."finalhandler"."0.3.6";
- "fresh-0.2.4" = self.by-version."fresh"."0.2.4";
- "merge-descriptors-1.0.0" = self.by-version."merge-descriptors"."1.0.0";
- "methods-1.1.1" = self.by-version."methods"."1.1.1";
- "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1";
- "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
- "path-to-regexp-0.1.3" = self.by-version."path-to-regexp"."0.1.3";
- "proxy-addr-1.0.8" = self.by-version."proxy-addr"."1.0.8";
- "qs-2.4.2" = self.by-version."qs"."2.4.2";
- "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
- "send-0.12.3" = self.by-version."send"."0.12.3";
- "serve-static-1.9.3" = self.by-version."serve-static"."1.9.3";
- "type-is-1.6.3" = self.by-version."type-is"."1.6.3";
- "vary-1.0.0" = self.by-version."vary"."1.0.0";
- "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- "express" = self.by-version."express"."4.12.4";
- by-spec."fast-future"."~1.0.0" =
- self.by-version."fast-future"."1.0.1";
- by-version."fast-future"."1.0.1" = self.buildNodePackage {
- name = "fast-future-1.0.1";
- version = "1.0.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/fast-future/-/fast-future-1.0.1.tgz";
- name = "fast-future-1.0.1.tgz";
- sha1 = "6cbd22d999ab39cd10fc79392486e7a678716818";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."fd-slicer"."~1.0.0" =
- self.by-version."fd-slicer"."1.0.1";
- by-version."fd-slicer"."1.0.1" = self.buildNodePackage {
- name = "fd-slicer-1.0.1";
- version = "1.0.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz";
- name = "fd-slicer-1.0.1.tgz";
- sha1 = "8b5bcbd9ec327c5041bf9ab023fd6750f1177e65";
- };
- deps = {
- "pend-1.2.0" = self.by-version."pend"."1.2.0";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."fd-slicer"."~1.0.1" =
- self.by-version."fd-slicer"."1.0.1";
- by-spec."finalhandler"."0.3.6" =
- self.by-version."finalhandler"."0.3.6";
- by-version."finalhandler"."0.3.6" = self.buildNodePackage {
- name = "finalhandler-0.3.6";
- version = "0.3.6";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.3.6.tgz";
- name = "finalhandler-0.3.6.tgz";
- sha1 = "daf9c4161b1b06e001466b1411dfdb6973be138b";
- };
- deps = {
- "debug-2.2.0" = self.by-version."debug"."2.2.0";
- "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
- "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."findit2"."~2.2.3" =
- self.by-version."findit2"."2.2.3";
- by-version."findit2"."2.2.3" = self.buildNodePackage {
- name = "findit2-2.2.3";
- version = "2.2.3";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/findit2/-/findit2-2.2.3.tgz";
- name = "findit2-2.2.3.tgz";
- sha1 = "58a466697df8a6205cdfdbf395536b8bd777a5f6";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- "findit2" = self.by-version."findit2"."2.2.3";
- by-spec."forever-agent"."~0.5.0" =
- self.by-version."forever-agent"."0.5.2";
- by-version."forever-agent"."0.5.2" = self.buildNodePackage {
- name = "forever-agent-0.5.2";
- version = "0.5.2";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz";
- name = "forever-agent-0.5.2.tgz";
- sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."forever-agent"."~0.6.0" =
- self.by-version."forever-agent"."0.6.1";
- by-version."forever-agent"."0.6.1" = self.buildNodePackage {
- name = "forever-agent-0.6.1";
- version = "0.6.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz";
- name = "forever-agent-0.6.1.tgz";
- sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."form-data"."~0.2.0" =
- self.by-version."form-data"."0.2.0";
- by-version."form-data"."0.2.0" = self.buildNodePackage {
- name = "form-data-0.2.0";
- version = "0.2.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz";
- name = "form-data-0.2.0.tgz";
- sha1 = "26f8bc26da6440e299cbdcfb69035c4f77a6e466";
- };
- deps = {
- "async-0.9.2" = self.by-version."async"."0.9.2";
- "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7";
- "mime-types-2.0.14" = self.by-version."mime-types"."2.0.14";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."forwarded"."~0.1.0" =
- self.by-version."forwarded"."0.1.0";
- by-version."forwarded"."0.1.0" = self.buildNodePackage {
- name = "forwarded-0.1.0";
- version = "0.1.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz";
- name = "forwarded-0.1.0.tgz";
- sha1 = "19ef9874c4ae1c297bcf078fde63a09b66a84363";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."fresh"."0.2.4" =
- self.by-version."fresh"."0.2.4";
- by-version."fresh"."0.2.4" = self.buildNodePackage {
- name = "fresh-0.2.4";
- version = "0.2.4";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz";
- name = "fresh-0.2.4.tgz";
- sha1 = "3582499206c9723714190edd74b4604feb4a614c";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."gapitoken"."~0.1.2" =
- self.by-version."gapitoken"."0.1.4";
- by-version."gapitoken"."0.1.4" = self.buildNodePackage {
- name = "gapitoken-0.1.4";
- version = "0.1.4";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/gapitoken/-/gapitoken-0.1.4.tgz";
- name = "gapitoken-0.1.4.tgz";
- sha1 = "643dedb26cb142466f62b73d2782e7822a6f1ad8";
- };
- deps = {
- "jws-0.0.2" = self.by-version."jws"."0.0.2";
- "request-2.57.0" = self.by-version."request"."2.57.0";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."generate-function"."^2.0.0" =
- self.by-version."generate-function"."2.0.0";
- by-version."generate-function"."2.0.0" = self.buildNodePackage {
- name = "generate-function-2.0.0";
- version = "2.0.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz";
- name = "generate-function-2.0.0.tgz";
- sha1 = "6858fe7c0969b7d4e9093337647ac79f60dfbe74";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."generate-object-property"."^1.1.0" =
- self.by-version."generate-object-property"."1.2.0";
- by-version."generate-object-property"."1.2.0" = self.buildNodePackage {
- name = "generate-object-property-1.2.0";
- version = "1.2.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz";
- name = "generate-object-property-1.2.0.tgz";
- sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0";
- };
- deps = {
- "is-property-1.0.2" = self.by-version."is-property"."1.0.2";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."get-stdin"."^4.0.1" =
- self.by-version."get-stdin"."4.0.1";
- by-version."get-stdin"."4.0.1" = self.buildNodePackage {
- name = "get-stdin-4.0.1";
- version = "4.0.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz";
- name = "get-stdin-4.0.1.tgz";
- sha1 = "b968c6b0a04384324902e8bf1a5df32579a450fe";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."glob"."3.2.x" =
- self.by-version."glob"."3.2.11";
- by-version."glob"."3.2.11" = self.buildNodePackage {
- name = "glob-3.2.11";
- version = "3.2.11";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/glob/-/glob-3.2.11.tgz";
- name = "glob-3.2.11.tgz";
- sha1 = "4a973f635b9190f715d10987d5c00fd2815ebe3d";
- };
- deps = {
- "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
- "minimatch-0.3.0" = self.by-version."minimatch"."0.3.0";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."google-auth-library"."~0.9.3" =
- self.by-version."google-auth-library"."0.9.6";
- by-version."google-auth-library"."0.9.6" = self.buildNodePackage {
- name = "google-auth-library-0.9.6";
- version = "0.9.6";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/google-auth-library/-/google-auth-library-0.9.6.tgz";
- name = "google-auth-library-0.9.6.tgz";
- sha1 = "57aa09f2621d6eafe8852b0167c9100759a67220";
- };
- deps = {
- "async-0.9.2" = self.by-version."async"."0.9.2";
- "gtoken-1.1.1" = self.by-version."gtoken"."1.1.1";
- "lodash.noop-3.0.0" = self.by-version."lodash.noop"."3.0.0";
- "jws-3.0.0" = self.by-version."jws"."3.0.0";
- "request-2.51.0" = self.by-version."request"."2.51.0";
- "string-template-0.2.1" = self.by-version."string-template"."0.2.1";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."google-p12-pem"."^0.0.1" =
- self.by-version."google-p12-pem"."0.0.1";
- by-version."google-p12-pem"."0.0.1" = self.buildNodePackage {
- name = "google-p12-pem-0.0.1";
- version = "0.0.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/google-p12-pem/-/google-p12-pem-0.0.1.tgz";
- name = "google-p12-pem-0.0.1.tgz";
- sha1 = "965638d464f13b4a866356a5ba047163ec0b08b7";
- };
- deps = {
- "node-forge-0.6.16" = self.by-version."node-forge"."0.6.16";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."googleapis"."~2.0.3" =
- self.by-version."googleapis"."2.0.5";
- by-version."googleapis"."2.0.5" = self.buildNodePackage {
- name = "googleapis-2.0.5";
- version = "2.0.5";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/googleapis/-/googleapis-2.0.5.tgz";
- name = "googleapis-2.0.5.tgz";
- sha1 = "fb2d678f97152eb0a336da84bbc1eeb16a9c8310";
- };
- deps = {
- "async-0.9.2" = self.by-version."async"."0.9.2";
- "gapitoken-0.1.4" = self.by-version."gapitoken"."0.1.4";
- "google-auth-library-0.9.6" = self.by-version."google-auth-library"."0.9.6";
- "request-2.54.0" = self.by-version."request"."2.54.0";
- "string-template-0.2.1" = self.by-version."string-template"."0.2.1";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- "googleapis" = self.by-version."googleapis"."2.0.5";
- by-spec."graceful-readlink".">= 1.0.0" =
- self.by-version."graceful-readlink"."1.0.1";
- by-version."graceful-readlink"."1.0.1" = self.buildNodePackage {
- name = "graceful-readlink-1.0.1";
- version = "1.0.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz";
- name = "graceful-readlink-1.0.1.tgz";
- sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."groove"."~2.3.3" =
- self.by-version."groove"."2.3.4";
- by-version."groove"."2.3.4" = self.buildNodePackage {
- name = "groove-2.3.4";
- version = "2.3.4";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/groove/-/groove-2.3.4.tgz";
- name = "groove-2.3.4.tgz";
- sha1 = "bbfb8e40584c5921f6df9d52d4017f2acb0a7e45";
- };
- deps = {
- "bindings-1.2.1" = self.by-version."bindings"."1.2.1";
- "nan-1.8.4" = self.by-version."nan"."1.8.4";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- "groove" = self.by-version."groove"."2.3.4";
- by-spec."gtoken"."^1.1.0" =
- self.by-version."gtoken"."1.1.1";
- by-version."gtoken"."1.1.1" = self.buildNodePackage {
- name = "gtoken-1.1.1";
- version = "1.1.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/gtoken/-/gtoken-1.1.1.tgz";
- name = "gtoken-1.1.1.tgz";
- sha1 = "969af828d1f7efea32a500ea09b0edfa8e0c438a";
- };
- deps = {
- "google-p12-pem-0.0.1" = self.by-version."google-p12-pem"."0.0.1";
- "jws-3.0.0" = self.by-version."jws"."3.0.0";
- "mime-1.3.4" = self.by-version."mime"."1.3.4";
- "request-2.57.0" = self.by-version."request"."2.57.0";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."har-validator"."^1.4.0" =
- self.by-version."har-validator"."1.7.1";
- by-version."har-validator"."1.7.1" = self.buildNodePackage {
- name = "har-validator-1.7.1";
- version = "1.7.1";
- bin = true;
- src = fetchurl {
- url = "http://registry.npmjs.org/har-validator/-/har-validator-1.7.1.tgz";
- name = "har-validator-1.7.1.tgz";
- sha1 = "8ec8952f8287d21b451ba3e36f27ed8d997d8a95";
- };
- deps = {
- "bluebird-2.9.30" = self.by-version."bluebird"."2.9.30";
- "chalk-1.0.0" = self.by-version."chalk"."1.0.0";
- "commander-2.8.1" = self.by-version."commander"."2.8.1";
- "is-my-json-valid-2.12.0" = self.by-version."is-my-json-valid"."2.12.0";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."har-validator"."^1.6.1" =
- self.by-version."har-validator"."1.7.1";
- by-spec."has-ansi"."^1.0.3" =
- self.by-version."has-ansi"."1.0.3";
- by-version."has-ansi"."1.0.3" = self.buildNodePackage {
- name = "has-ansi-1.0.3";
- version = "1.0.3";
- bin = true;
- src = fetchurl {
- url = "http://registry.npmjs.org/has-ansi/-/has-ansi-1.0.3.tgz";
- name = "has-ansi-1.0.3.tgz";
- sha1 = "c0b5b1615d9e382b0ff67169d967b425e48ca538";
- };
- deps = {
- "ansi-regex-1.1.1" = self.by-version."ansi-regex"."1.1.1";
- "get-stdin-4.0.1" = self.by-version."get-stdin"."4.0.1";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."hawk"."1.1.1" =
- self.by-version."hawk"."1.1.1";
- by-version."hawk"."1.1.1" = self.buildNodePackage {
- name = "hawk-1.1.1";
- version = "1.1.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz";
- name = "hawk-1.1.1.tgz";
- sha1 = "87cd491f9b46e4e2aeaca335416766885d2d1ed9";
- };
- deps = {
- "hoek-0.9.1" = self.by-version."hoek"."0.9.1";
- "boom-0.4.2" = self.by-version."boom"."0.4.2";
- "cryptiles-0.2.2" = self.by-version."cryptiles"."0.2.2";
- "sntp-0.2.4" = self.by-version."sntp"."0.2.4";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."hawk"."~2.3.0" =
- self.by-version."hawk"."2.3.1";
- by-version."hawk"."2.3.1" = self.buildNodePackage {
- name = "hawk-2.3.1";
- version = "2.3.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/hawk/-/hawk-2.3.1.tgz";
- name = "hawk-2.3.1.tgz";
- sha1 = "1e731ce39447fa1d0f6d707f7bceebec0fd1ec1f";
- };
- deps = {
- "hoek-2.14.0" = self.by-version."hoek"."2.14.0";
- "boom-2.8.0" = self.by-version."boom"."2.8.0";
- "cryptiles-2.0.4" = self.by-version."cryptiles"."2.0.4";
- "sntp-1.0.9" = self.by-version."sntp"."1.0.9";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."hoek"."0.9.x" =
- self.by-version."hoek"."0.9.1";
- by-version."hoek"."0.9.1" = self.buildNodePackage {
- name = "hoek-0.9.1";
- version = "0.9.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz";
- name = "hoek-0.9.1.tgz";
- sha1 = "3d322462badf07716ea7eb85baf88079cddce505";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."hoek"."2.x.x" =
- self.by-version."hoek"."2.14.0";
- by-version."hoek"."2.14.0" = self.buildNodePackage {
- name = "hoek-2.14.0";
- version = "2.14.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/hoek/-/hoek-2.14.0.tgz";
- name = "hoek-2.14.0.tgz";
- sha1 = "81211691f52a5a835ae49edbf1e89c9003476aa4";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."htmlparser2"."~3.8.1" =
- self.by-version."htmlparser2"."3.8.3";
- by-version."htmlparser2"."3.8.3" = self.buildNodePackage {
- name = "htmlparser2-3.8.3";
- version = "3.8.3";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz";
- name = "htmlparser2-3.8.3.tgz";
- sha1 = "996c28b191516a8be86501a7d79757e5c70c1068";
- };
- deps = {
- "domhandler-2.3.0" = self.by-version."domhandler"."2.3.0";
- "domutils-1.5.1" = self.by-version."domutils"."1.5.1";
- "domelementtype-1.3.0" = self.by-version."domelementtype"."1.3.0";
- "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
- "entities-1.0.0" = self.by-version."entities"."1.0.0";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."http-signature"."~0.10.0" =
- self.by-version."http-signature"."0.10.1";
- by-version."http-signature"."0.10.1" = self.buildNodePackage {
- name = "http-signature-0.10.1";
- version = "0.10.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz";
- name = "http-signature-0.10.1.tgz";
- sha1 = "4fbdac132559aa8323121e540779c0a012b27e66";
- };
- deps = {
- "assert-plus-0.1.5" = self.by-version."assert-plus"."0.1.5";
- "asn1-0.1.11" = self.by-version."asn1"."0.1.11";
- "ctype-0.5.3" = self.by-version."ctype"."0.5.3";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."http-signature"."~0.11.0" =
- self.by-version."http-signature"."0.11.0";
- by-version."http-signature"."0.11.0" = self.buildNodePackage {
- name = "http-signature-0.11.0";
- version = "0.11.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/http-signature/-/http-signature-0.11.0.tgz";
- name = "http-signature-0.11.0.tgz";
- sha1 = "1796cf67a001ad5cd6849dca0991485f09089fe6";
- };
- deps = {
- "assert-plus-0.1.5" = self.by-version."assert-plus"."0.1.5";
- "asn1-0.1.11" = self.by-version."asn1"."0.1.11";
- "ctype-0.5.3" = self.by-version."ctype"."0.5.3";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."httpolyglot"."~0.1.1" =
- self.by-version."httpolyglot"."0.1.1";
- by-version."httpolyglot"."0.1.1" = self.buildNodePackage {
- name = "httpolyglot-0.1.1";
- version = "0.1.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/httpolyglot/-/httpolyglot-0.1.1.tgz";
- name = "httpolyglot-0.1.1.tgz";
- sha1 = "cd0f5c995cbb95dde325d16a7537f90c0048e53d";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- "httpolyglot" = self.by-version."httpolyglot"."0.1.1";
- by-spec."human-size"."~1.1.0" =
- self.by-version."human-size"."1.1.0";
- by-version."human-size"."1.1.0" = self.buildNodePackage {
- name = "human-size-1.1.0";
- version = "1.1.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/human-size/-/human-size-1.1.0.tgz";
- name = "human-size-1.1.0.tgz";
- sha1 = "052562be999841c037022c20259990c56ea996f9";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- "human-size" = self.by-version."human-size"."1.1.0";
- by-spec."indent-string"."^1.1.0" =
- self.by-version."indent-string"."1.2.1";
- by-version."indent-string"."1.2.1" = self.buildNodePackage {
- name = "indent-string-1.2.1";
- version = "1.2.1";
- bin = true;
- src = fetchurl {
- url = "http://registry.npmjs.org/indent-string/-/indent-string-1.2.1.tgz";
- name = "indent-string-1.2.1.tgz";
- sha1 = "294c5930792f8bb5b14462a4aa425b94f07d3a56";
- };
- deps = {
- "get-stdin-4.0.1" = self.by-version."get-stdin"."4.0.1";
- "minimist-1.1.1" = self.by-version."minimist"."1.1.1";
- "repeating-1.1.3" = self.by-version."repeating"."1.1.3";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."inherits"."*" =
- self.by-version."inherits"."2.0.1";
- by-version."inherits"."2.0.1" = self.buildNodePackage {
- name = "inherits-2.0.1";
- version = "2.0.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz";
- name = "inherits-2.0.1.tgz";
- sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."inherits"."2" =
- self.by-version."inherits"."2.0.1";
- by-spec."inherits"."~2.0.1" =
- self.by-version."inherits"."2.0.1";
- by-spec."ipaddr.js"."1.0.1" =
- self.by-version."ipaddr.js"."1.0.1";
- by-version."ipaddr.js"."1.0.1" = self.buildNodePackage {
- name = "ipaddr.js-1.0.1";
- version = "1.0.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.0.1.tgz";
- name = "ipaddr.js-1.0.1.tgz";
- sha1 = "5f38801dc73e0400fc7076386f6ed5215fbd8f95";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."is-finite"."^1.0.0" =
- self.by-version."is-finite"."1.0.1";
- by-version."is-finite"."1.0.1" = self.buildNodePackage {
- name = "is-finite-1.0.1";
- version = "1.0.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/is-finite/-/is-finite-1.0.1.tgz";
- name = "is-finite-1.0.1.tgz";
- sha1 = "6438603eaebe2793948ff4a4262ec8db3d62597b";
- };
- deps = {
- "number-is-nan-1.0.0" = self.by-version."number-is-nan"."1.0.0";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."is-my-json-valid"."^2.12.0" =
- self.by-version."is-my-json-valid"."2.12.0";
- by-version."is-my-json-valid"."2.12.0" = self.buildNodePackage {
- name = "is-my-json-valid-2.12.0";
- version = "2.12.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.0.tgz";
- name = "is-my-json-valid-2.12.0.tgz";
- sha1 = "8fa6c408b26be95b45a23e8f8c4b464a53874d2b";
- };
- deps = {
- "generate-function-2.0.0" = self.by-version."generate-function"."2.0.0";
- "generate-object-property-1.2.0" = self.by-version."generate-object-property"."1.2.0";
- "jsonpointer-1.1.0" = self.by-version."jsonpointer"."1.1.0";
- "xtend-4.0.0" = self.by-version."xtend"."4.0.0";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."is-property"."^1.0.0" =
- self.by-version."is-property"."1.0.2";
- by-version."is-property"."1.0.2" = self.buildNodePackage {
- name = "is-property-1.0.2";
- version = "1.0.2";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz";
- name = "is-property-1.0.2.tgz";
- sha1 = "57fe1c4e48474edd65b09911f26b1cd4095dda84";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."isarray"."0.0.1" =
- self.by-version."isarray"."0.0.1";
- by-version."isarray"."0.0.1" = self.buildNodePackage {
- name = "isarray-0.0.1";
- version = "0.0.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz";
- name = "isarray-0.0.1.tgz";
- sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."isstream"."~0.1.1" =
- self.by-version."isstream"."0.1.2";
- by-version."isstream"."0.1.2" = self.buildNodePackage {
- name = "isstream-0.1.2";
- version = "0.1.2";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz";
- name = "isstream-0.1.2.tgz";
- sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."json-stringify-safe"."~5.0.0" =
- self.by-version."json-stringify-safe"."5.0.1";
- by-version."json-stringify-safe"."5.0.1" = self.buildNodePackage {
- name = "json-stringify-safe-5.0.1";
- version = "5.0.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz";
- name = "json-stringify-safe-5.0.1.tgz";
- sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."jsonpointer"."^1.1.0" =
- self.by-version."jsonpointer"."1.1.0";
- by-version."jsonpointer"."1.1.0" = self.buildNodePackage {
- name = "jsonpointer-1.1.0";
- version = "1.1.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/jsonpointer/-/jsonpointer-1.1.0.tgz";
- name = "jsonpointer-1.1.0.tgz";
- sha1 = "c3c72efaed3b97154163dc01dd349e1cfe0f80fc";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."jstream"."~0.2.7" =
- self.by-version."jstream"."0.2.7";
- by-version."jstream"."0.2.7" = self.buildNodePackage {
- name = "jstream-0.2.7";
- version = "0.2.7";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/jstream/-/jstream-0.2.7.tgz";
- name = "jstream-0.2.7.tgz";
- sha1 = "55f06cd6d4204caeac4907a5de1b90aabf4d60da";
- };
- deps = {
- "clarinet-0.8.1" = self.by-version."clarinet"."0.8.1";
- "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."jwa"."~1.0.0" =
- self.by-version."jwa"."1.0.0";
- by-version."jwa"."1.0.0" = self.buildNodePackage {
- name = "jwa-1.0.0";
- version = "1.0.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/jwa/-/jwa-1.0.0.tgz";
- name = "jwa-1.0.0.tgz";
- sha1 = "040b64fb582171a65f3368e96837ea4dcf42f3d8";
- };
- deps = {
- "base64url-0.0.6" = self.by-version."base64url"."0.0.6";
- "buffer-equal-constant-time-1.0.1" = self.by-version."buffer-equal-constant-time"."1.0.1";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."jws"."0.0.2" =
- self.by-version."jws"."0.0.2";
- by-version."jws"."0.0.2" = self.buildNodePackage {
- name = "jws-0.0.2";
- version = "0.0.2";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/jws/-/jws-0.0.2.tgz";
- name = "jws-0.0.2.tgz";
- sha1 = "8c6916977183cce3361da48c8c2e0c606e7a95c6";
- };
- deps = {
- "tap-0.3.3" = self.by-version."tap"."0.3.3";
- "base64url-0.0.3" = self.by-version."base64url"."0.0.3";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."jws"."^3.0.0" =
- self.by-version."jws"."3.0.0";
- by-version."jws"."3.0.0" = self.buildNodePackage {
- name = "jws-3.0.0";
- version = "3.0.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/jws/-/jws-3.0.0.tgz";
- name = "jws-3.0.0.tgz";
- sha1 = "da5f267897dd4e9cf8137979db33fc54a3c05418";
- };
- deps = {
- "jwa-1.0.0" = self.by-version."jwa"."1.0.0";
- "base64url-1.0.4" = self.by-version."base64url"."1.0.4";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."jws"."~3.0.0" =
- self.by-version."jws"."3.0.0";
- by-spec."keese"."~1.1.1" =
- self.by-version."keese"."1.1.1";
- by-version."keese"."1.1.1" = self.buildNodePackage {
- name = "keese-1.1.1";
- version = "1.1.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/keese/-/keese-1.1.1.tgz";
- name = "keese-1.1.1.tgz";
- sha1 = "69a1f971e64ee5d2094af002f6d92fa806250842";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- "keese" = self.by-version."keese"."1.1.1";
- by-spec."keygrip"."~1.0.0" =
- self.by-version."keygrip"."1.0.1";
- by-version."keygrip"."1.0.1" = self.buildNodePackage {
- name = "keygrip-1.0.1";
- version = "1.0.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/keygrip/-/keygrip-1.0.1.tgz";
- name = "keygrip-1.0.1.tgz";
- sha1 = "b02fa4816eef21a8c4b35ca9e52921ffc89a30e9";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."lastfm"."~0.9.2" =
- self.by-version."lastfm"."0.9.2";
- by-version."lastfm"."0.9.2" = self.buildNodePackage {
- name = "lastfm-0.9.2";
- version = "0.9.2";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/lastfm/-/lastfm-0.9.2.tgz";
- name = "lastfm-0.9.2.tgz";
- sha1 = "d00ca2e3b30eb484e510792875525900e4d77d88";
- };
- deps = {
- "underscore-1.6.0" = self.by-version."underscore"."1.6.0";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- "lastfm" = self.by-version."lastfm"."0.9.2";
- by-spec."leveldown"."~1.0.6" =
- self.by-version."leveldown"."1.0.7";
- by-version."leveldown"."1.0.7" = self.buildNodePackage {
- name = "leveldown-1.0.7";
- version = "1.0.7";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/leveldown/-/leveldown-1.0.7.tgz";
- name = "leveldown-1.0.7.tgz";
- sha1 = "39bbe95f92ce09992ec12de47ade5167be2b6874";
- };
- deps = {
- "abstract-leveldown-2.2.2" = self.by-version."abstract-leveldown"."2.2.2";
- "bindings-1.2.1" = self.by-version."bindings"."1.2.1";
- "fast-future-1.0.1" = self.by-version."fast-future"."1.0.1";
- "nan-1.8.4" = self.by-version."nan"."1.8.4";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- "leveldown" = self.by-version."leveldown"."1.0.7";
- by-spec."lodash"."~2.4.1" =
- self.by-version."lodash"."2.4.2";
- by-version."lodash"."2.4.2" = self.buildNodePackage {
- name = "lodash-2.4.2";
- version = "2.4.2";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz";
- name = "lodash-2.4.2.tgz";
- sha1 = "fadd834b9683073da179b3eae6d9c0d15053f73e";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."lodash.noop"."~3.0.0" =
- self.by-version."lodash.noop"."3.0.0";
- by-version."lodash.noop"."3.0.0" = self.buildNodePackage {
- name = "lodash.noop-3.0.0";
- version = "3.0.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/lodash.noop/-/lodash.noop-3.0.0.tgz";
- name = "lodash.noop-3.0.0.tgz";
- sha1 = "f383ca8dba97d8f217e49afcd2b824db9e5e8d68";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."lru-cache"."2" =
- self.by-version."lru-cache"."2.6.4";
- by-version."lru-cache"."2.6.4" = self.buildNodePackage {
- name = "lru-cache-2.6.4";
- version = "2.6.4";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.6.4.tgz";
- name = "lru-cache-2.6.4.tgz";
- sha1 = "2675190ccd1b0701ec2f652a4d0d3d400d76c0dd";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."map-obj"."^1.0.0" =
- self.by-version."map-obj"."1.0.1";
- by-version."map-obj"."1.0.1" = self.buildNodePackage {
- name = "map-obj-1.0.1";
- version = "1.0.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz";
- name = "map-obj-1.0.1.tgz";
- sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."media-typer"."0.3.0" =
- self.by-version."media-typer"."0.3.0";
- by-version."media-typer"."0.3.0" = self.buildNodePackage {
- name = "media-typer-0.3.0";
- version = "0.3.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz";
- name = "media-typer-0.3.0.tgz";
- sha1 = "8710d7af0aa626f8fffa1ce00168545263255748";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."meow"."~2.0.0" =
- self.by-version."meow"."2.0.0";
- by-version."meow"."2.0.0" = self.buildNodePackage {
- name = "meow-2.0.0";
- version = "2.0.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/meow/-/meow-2.0.0.tgz";
- name = "meow-2.0.0.tgz";
- sha1 = "8f530a8ecf5d40d3f4b4df93c3472900fba2a8f1";
- };
- deps = {
- "camelcase-keys-1.0.0" = self.by-version."camelcase-keys"."1.0.0";
- "indent-string-1.2.1" = self.by-version."indent-string"."1.2.1";
- "minimist-1.1.1" = self.by-version."minimist"."1.1.1";
- "object-assign-1.0.0" = self.by-version."object-assign"."1.0.0";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."merge-descriptors"."1.0.0" =
- self.by-version."merge-descriptors"."1.0.0";
- by-version."merge-descriptors"."1.0.0" = self.buildNodePackage {
- name = "merge-descriptors-1.0.0";
- version = "1.0.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.0.tgz";
- name = "merge-descriptors-1.0.0.tgz";
- sha1 = "2169cf7538e1b0cc87fb88e1502d8474bbf79864";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."mess"."~0.1.2" =
- self.by-version."mess"."0.1.2";
- by-version."mess"."0.1.2" = self.buildNodePackage {
- name = "mess-0.1.2";
- version = "0.1.2";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/mess/-/mess-0.1.2.tgz";
- name = "mess-0.1.2.tgz";
- sha1 = "2c81a424efc87a69ad11f1c7129d1f6f6353b9c0";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- "mess" = self.by-version."mess"."0.1.2";
- by-spec."methods"."~1.1.1" =
- self.by-version."methods"."1.1.1";
- by-version."methods"."1.1.1" = self.buildNodePackage {
- name = "methods-1.1.1";
- version = "1.1.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/methods/-/methods-1.1.1.tgz";
- name = "methods-1.1.1.tgz";
- sha1 = "17ea6366066d00c58e375b8ec7dfd0453c89822a";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."mime"."1.3.4" =
- self.by-version."mime"."1.3.4";
- by-version."mime"."1.3.4" = self.buildNodePackage {
- name = "mime-1.3.4";
- version = "1.3.4";
- bin = true;
- src = fetchurl {
- url = "http://registry.npmjs.org/mime/-/mime-1.3.4.tgz";
- name = "mime-1.3.4.tgz";
- sha1 = "115f9e3b6b3daf2959983cb38f149a2d40eb5d53";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."mime"."^1.2.11" =
- self.by-version."mime"."1.3.4";
- by-spec."mime"."~1.2.11" =
- self.by-version."mime"."1.2.11";
- by-version."mime"."1.2.11" = self.buildNodePackage {
- name = "mime-1.2.11";
- version = "1.2.11";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz";
- name = "mime-1.2.11.tgz";
- sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."mime-db"."~1.12.0" =
- self.by-version."mime-db"."1.12.0";
- by-version."mime-db"."1.12.0" = self.buildNodePackage {
- name = "mime-db-1.12.0";
- version = "1.12.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz";
- name = "mime-db-1.12.0.tgz";
- sha1 = "3d0c63180f458eb10d325aaa37d7c58ae312e9d7";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."mime-db"."~1.13.0" =
- self.by-version."mime-db"."1.13.0";
- by-version."mime-db"."1.13.0" = self.buildNodePackage {
- name = "mime-db-1.13.0";
- version = "1.13.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/mime-db/-/mime-db-1.13.0.tgz";
- name = "mime-db-1.13.0.tgz";
- sha1 = "fd6808168fe30835e7ea2205fc981d3b633e4e34";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."mime-types"."~1.0.1" =
- self.by-version."mime-types"."1.0.2";
- by-version."mime-types"."1.0.2" = self.buildNodePackage {
- name = "mime-types-1.0.2";
- version = "1.0.2";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz";
- name = "mime-types-1.0.2.tgz";
- sha1 = "995ae1392ab8affcbfcb2641dd054e943c0d5dce";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."mime-types"."~2.0.1" =
- self.by-version."mime-types"."2.0.14";
- by-version."mime-types"."2.0.14" = self.buildNodePackage {
- name = "mime-types-2.0.14";
- version = "2.0.14";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz";
- name = "mime-types-2.0.14.tgz";
- sha1 = "310e159db23e077f8bb22b748dabfa4957140aa6";
- };
- deps = {
- "mime-db-1.12.0" = self.by-version."mime-db"."1.12.0";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."mime-types"."~2.0.3" =
- self.by-version."mime-types"."2.0.14";
- by-spec."mime-types"."~2.1.1" =
- self.by-version."mime-types"."2.1.1";
- by-version."mime-types"."2.1.1" = self.buildNodePackage {
- name = "mime-types-2.1.1";
- version = "2.1.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/mime-types/-/mime-types-2.1.1.tgz";
- name = "mime-types-2.1.1.tgz";
- sha1 = "c7b692796d5166f4826d10b4675c8a916657d04e";
- };
- deps = {
- "mime-db-1.13.0" = self.by-version."mime-db"."1.13.0";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."minimatch"."0.3" =
- self.by-version."minimatch"."0.3.0";
- by-version."minimatch"."0.3.0" = self.buildNodePackage {
- name = "minimatch-0.3.0";
- version = "0.3.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz";
- name = "minimatch-0.3.0.tgz";
- sha1 = "275d8edaac4f1bb3326472089e7949c8394699dd";
- };
- deps = {
- "lru-cache-2.6.4" = self.by-version."lru-cache"."2.6.4";
- "sigmund-1.0.1" = self.by-version."sigmund"."1.0.1";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."minimist"."0.0.8" =
- self.by-version."minimist"."0.0.8";
- by-version."minimist"."0.0.8" = self.buildNodePackage {
- name = "minimist-0.0.8";
- version = "0.0.8";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
- name = "minimist-0.0.8.tgz";
- sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."minimist"."^1.1.0" =
- self.by-version."minimist"."1.1.1";
- by-version."minimist"."1.1.1" = self.buildNodePackage {
- name = "minimist-1.1.1";
- version = "1.1.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/minimist/-/minimist-1.1.1.tgz";
- name = "minimist-1.1.1.tgz";
- sha1 = "1bc2bc71658cdca5712475684363615b0b4f695b";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."mkdirp"."0.3.x" =
- self.by-version."mkdirp"."0.3.5";
- by-version."mkdirp"."0.3.5" = self.buildNodePackage {
- name = "mkdirp-0.3.5";
- version = "0.3.5";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz";
- name = "mkdirp-0.3.5.tgz";
- sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."mkdirp"."~0.3" =
- self.by-version."mkdirp"."0.3.5";
- by-spec."mkdirp"."~0.5.0" =
- self.by-version."mkdirp"."0.5.1";
- by-version."mkdirp"."0.5.1" = self.buildNodePackage {
- name = "mkdirp-0.5.1";
- version = "0.5.1";
- bin = true;
- src = fetchurl {
- url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
- name = "mkdirp-0.5.1.tgz";
- sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
- };
- deps = {
- "minimist-0.0.8" = self.by-version."minimist"."0.0.8";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."mkdirp"."~0.5.1" =
- self.by-version."mkdirp"."0.5.1";
- "mkdirp" = self.by-version."mkdirp"."0.5.1";
- by-spec."ms"."0.7.1" =
- self.by-version."ms"."0.7.1";
- by-version."ms"."0.7.1" = self.buildNodePackage {
- name = "ms-0.7.1";
- version = "0.7.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/ms/-/ms-0.7.1.tgz";
- name = "ms-0.7.1.tgz";
- sha1 = "9cd13c03adbff25b65effde7ce864ee952017098";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."multiparty"."~4.1.2" =
- self.by-version."multiparty"."4.1.2";
- by-version."multiparty"."4.1.2" = self.buildNodePackage {
- name = "multiparty-4.1.2";
- version = "4.1.2";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/multiparty/-/multiparty-4.1.2.tgz";
- name = "multiparty-4.1.2.tgz";
- sha1 = "54f8ec9712052fa1dfd8ec975056c8230d6f2370";
- };
- deps = {
- "fd-slicer-1.0.1" = self.by-version."fd-slicer"."1.0.1";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- "multiparty" = self.by-version."multiparty"."4.1.2";
- by-spec."music-library-index"."~1.3.0" =
- self.by-version."music-library-index"."1.3.0";
- by-version."music-library-index"."1.3.0" = self.buildNodePackage {
- name = "music-library-index-1.3.0";
- version = "1.3.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/music-library-index/-/music-library-index-1.3.0.tgz";
- name = "music-library-index-1.3.0.tgz";
- sha1 = "f7dbf6f7df5a0c8c50382542183872aedc5cb86a";
- };
- deps = {
- "diacritics-1.2.1" = self.by-version."diacritics"."1.2.1";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- "music-library-index" = self.by-version."music-library-index"."1.3.0";
- by-spec."mv"."~2.0.3" =
- self.by-version."mv"."2.0.3";
- by-version."mv"."2.0.3" = self.buildNodePackage {
- name = "mv-2.0.3";
- version = "2.0.3";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/mv/-/mv-2.0.3.tgz";
- name = "mv-2.0.3.tgz";
- sha1 = "e9ab707d71dc38de24edcc637a8e2f5f480c7f32";
- };
- deps = {
- "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
- "ncp-0.6.0" = self.by-version."ncp"."0.6.0";
- "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- "mv" = self.by-version."mv"."2.0.3";
- by-spec."nan"."~1.8.4" =
- self.by-version."nan"."1.8.4";
- by-version."nan"."1.8.4" = self.buildNodePackage {
- name = "nan-1.8.4";
- version = "1.8.4";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/nan/-/nan-1.8.4.tgz";
- name = "nan-1.8.4.tgz";
- sha1 = "3c76b5382eab33e44b758d2813ca9d92e9342f34";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."ncp"."~0.6.0" =
- self.by-version."ncp"."0.6.0";
- by-version."ncp"."0.6.0" = self.buildNodePackage {
- name = "ncp-0.6.0";
- version = "0.6.0";
- bin = true;
- src = fetchurl {
- url = "http://registry.npmjs.org/ncp/-/ncp-0.6.0.tgz";
- name = "ncp-0.6.0.tgz";
- sha1 = "df8ce021e262be21b52feb3d3e5cfaab12491f0d";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."negotiator"."0.5.3" =
- self.by-version."negotiator"."0.5.3";
- by-version."negotiator"."0.5.3" = self.buildNodePackage {
- name = "negotiator-0.5.3";
- version = "0.5.3";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/negotiator/-/negotiator-0.5.3.tgz";
- name = "negotiator-0.5.3.tgz";
- sha1 = "269d5c476810ec92edbe7b6c2f28316384f9a7e8";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."node-forge"."0.6.16" =
- self.by-version."node-forge"."0.6.16";
- by-version."node-forge"."0.6.16" = self.buildNodePackage {
- name = "node-forge-0.6.16";
- version = "0.6.16";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/node-forge/-/node-forge-0.6.16.tgz";
- name = "node-forge-0.6.16.tgz";
- sha1 = "aae85babf97034d46f1b74a39bfe5891282ae842";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."node-uuid"."~1.4.0" =
- self.by-version."node-uuid"."1.4.3";
- by-version."node-uuid"."1.4.3" = self.buildNodePackage {
- name = "node-uuid-1.4.3";
- version = "1.4.3";
- bin = true;
- src = fetchurl {
- url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz";
- name = "node-uuid-1.4.3.tgz";
- sha1 = "319bb7a56e7cb63f00b5c0cd7851cd4b4ddf1df9";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."nopt"."~2" =
- self.by-version."nopt"."2.2.1";
- by-version."nopt"."2.2.1" = self.buildNodePackage {
- name = "nopt-2.2.1";
- version = "2.2.1";
- bin = true;
- src = fetchurl {
- url = "http://registry.npmjs.org/nopt/-/nopt-2.2.1.tgz";
- name = "nopt-2.2.1.tgz";
- sha1 = "2aa09b7d1768487b3b89a9c5aa52335bff0baea7";
- };
- deps = {
- "abbrev-1.0.7" = self.by-version."abbrev"."1.0.7";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."number-is-nan"."^1.0.0" =
- self.by-version."number-is-nan"."1.0.0";
- by-version."number-is-nan"."1.0.0" = self.buildNodePackage {
- name = "number-is-nan-1.0.0";
- version = "1.0.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz";
- name = "number-is-nan-1.0.0.tgz";
- sha1 = "c020f529c5282adfdd233d91d4b181c3d686dc4b";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."oauth-sign"."~0.5.0" =
- self.by-version."oauth-sign"."0.5.0";
- by-version."oauth-sign"."0.5.0" = self.buildNodePackage {
- name = "oauth-sign-0.5.0";
- version = "0.5.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.5.0.tgz";
- name = "oauth-sign-0.5.0.tgz";
- sha1 = "d767f5169325620eab2e087ef0c472e773db6461";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."oauth-sign"."~0.6.0" =
- self.by-version."oauth-sign"."0.6.0";
- by-version."oauth-sign"."0.6.0" = self.buildNodePackage {
- name = "oauth-sign-0.6.0";
- version = "0.6.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.6.0.tgz";
- name = "oauth-sign-0.6.0.tgz";
- sha1 = "7dbeae44f6ca454e1f168451d630746735813ce3";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."oauth-sign"."~0.8.0" =
- self.by-version."oauth-sign"."0.8.0";
- by-version."oauth-sign"."0.8.0" = self.buildNodePackage {
- name = "oauth-sign-0.8.0";
- version = "0.8.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.0.tgz";
- name = "oauth-sign-0.8.0.tgz";
- sha1 = "938fdc875765ba527137d8aec9d178e24debc553";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."object-assign"."^1.0.0" =
- self.by-version."object-assign"."1.0.0";
- by-version."object-assign"."1.0.0" = self.buildNodePackage {
- name = "object-assign-1.0.0";
- version = "1.0.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/object-assign/-/object-assign-1.0.0.tgz";
- name = "object-assign-1.0.0.tgz";
- sha1 = "e65dc8766d3b47b4b8307465c8311da030b070a6";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."on-finished"."~2.2.1" =
- self.by-version."on-finished"."2.2.1";
- by-version."on-finished"."2.2.1" = self.buildNodePackage {
- name = "on-finished-2.2.1";
- version = "2.2.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/on-finished/-/on-finished-2.2.1.tgz";
- name = "on-finished-2.2.1.tgz";
- sha1 = "5c85c1cc36299f78029653f667f27b6b99ebc029";
- };
- deps = {
- "ee-first-1.1.0" = self.by-version."ee-first"."1.1.0";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."os-tmpdir"."^1.0.0" =
- self.by-version."os-tmpdir"."1.0.1";
- by-version."os-tmpdir"."1.0.1" = self.buildNodePackage {
- name = "os-tmpdir-1.0.1";
- version = "1.0.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.1.tgz";
- name = "os-tmpdir-1.0.1.tgz";
- sha1 = "e9b423a1edaf479882562e92ed71d7743a071b6e";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."osenv"."~0.1.0" =
- self.by-version."osenv"."0.1.2";
- by-version."osenv"."0.1.2" = self.buildNodePackage {
- name = "osenv-0.1.2";
- version = "0.1.2";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/osenv/-/osenv-0.1.2.tgz";
- name = "osenv-0.1.2.tgz";
- sha1 = "f4d23ebeceaef078600fb78c0ea58fac5996a02d";
- };
- deps = {
- "os-tmpdir-1.0.1" = self.by-version."os-tmpdir"."1.0.1";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- "osenv" = self.by-version."osenv"."0.1.2";
- by-spec."parseurl"."~1.3.0" =
- self.by-version."parseurl"."1.3.0";
- by-version."parseurl"."1.3.0" = self.buildNodePackage {
- name = "parseurl-1.3.0";
- version = "1.3.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz";
- name = "parseurl-1.3.0.tgz";
- sha1 = "b58046db4223e145afa76009e61bac87cc2281b3";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."path-to-regexp"."0.1.3" =
- self.by-version."path-to-regexp"."0.1.3";
- by-version."path-to-regexp"."0.1.3" = self.buildNodePackage {
- name = "path-to-regexp-0.1.3";
- version = "0.1.3";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.3.tgz";
- name = "path-to-regexp-0.1.3.tgz";
- sha1 = "21b9ab82274279de25b156ea08fd12ca51b8aecb";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."pend"."~1.2.0" =
- self.by-version."pend"."1.2.0";
- by-version."pend"."1.2.0" = self.buildNodePackage {
- name = "pend-1.2.0";
- version = "1.2.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/pend/-/pend-1.2.0.tgz";
- name = "pend-1.2.0.tgz";
- sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- "pend" = self.by-version."pend"."1.2.0";
- by-spec."proxy-addr"."~1.0.8" =
- self.by-version."proxy-addr"."1.0.8";
- by-version."proxy-addr"."1.0.8" = self.buildNodePackage {
- name = "proxy-addr-1.0.8";
- version = "1.0.8";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.8.tgz";
- name = "proxy-addr-1.0.8.tgz";
- sha1 = "db54ec878bcc1053d57646609219b3715678bafe";
- };
- deps = {
- "forwarded-0.1.0" = self.by-version."forwarded"."0.1.0";
- "ipaddr.js-1.0.1" = self.by-version."ipaddr.js"."1.0.1";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."qs"."2.4.2" =
- self.by-version."qs"."2.4.2";
- by-version."qs"."2.4.2" = self.buildNodePackage {
- name = "qs-2.4.2";
- version = "2.4.2";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/qs/-/qs-2.4.2.tgz";
- name = "qs-2.4.2.tgz";
- sha1 = "f7ce788e5777df0b5010da7f7c4e73ba32470f5a";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."qs"."~2.3.1" =
- self.by-version."qs"."2.3.3";
- by-version."qs"."2.3.3" = self.buildNodePackage {
- name = "qs-2.3.3";
- version = "2.3.3";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/qs/-/qs-2.3.3.tgz";
- name = "qs-2.3.3.tgz";
- sha1 = "e9e85adbe75da0bbe4c8e0476a086290f863b404";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."qs"."~2.4.0" =
- self.by-version."qs"."2.4.2";
- by-spec."qs"."~3.1.0" =
- self.by-version."qs"."3.1.0";
- by-version."qs"."3.1.0" = self.buildNodePackage {
- name = "qs-3.1.0";
- version = "3.1.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/qs/-/qs-3.1.0.tgz";
- name = "qs-3.1.0.tgz";
- sha1 = "d0e9ae745233a12dc43fb4f3055bba446261153c";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."range-parser"."~1.0.2" =
- self.by-version."range-parser"."1.0.2";
- by-version."range-parser"."1.0.2" = self.buildNodePackage {
- name = "range-parser-1.0.2";
- version = "1.0.2";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/range-parser/-/range-parser-1.0.2.tgz";
- name = "range-parser-1.0.2.tgz";
- sha1 = "06a12a42e5131ba8e457cd892044867f2344e549";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."readable-stream"."1.1" =
- self.by-version."readable-stream"."1.1.13";
- by-version."readable-stream"."1.1.13" = self.buildNodePackage {
- name = "readable-stream-1.1.13";
- version = "1.1.13";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz";
- name = "readable-stream-1.1.13.tgz";
- sha1 = "f6eef764f514c89e2b9e23146a75ba106756d23e";
- };
- deps = {
- "core-util-is-1.0.1" = self.by-version."core-util-is"."1.0.1";
- "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
- "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31";
- "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."readable-stream"."~1.0.26" =
- self.by-version."readable-stream"."1.0.33";
- by-version."readable-stream"."1.0.33" = self.buildNodePackage {
- name = "readable-stream-1.0.33";
- version = "1.0.33";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz";
- name = "readable-stream-1.0.33.tgz";
- sha1 = "3a360dd66c1b1d7fd4705389860eda1d0f61126c";
- };
- deps = {
- "core-util-is-1.0.1" = self.by-version."core-util-is"."1.0.1";
- "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
- "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31";
- "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."readable-stream"."~1.1.9" =
- self.by-version."readable-stream"."1.1.13";
- by-spec."repeating"."^1.1.0" =
- self.by-version."repeating"."1.1.3";
- by-version."repeating"."1.1.3" = self.buildNodePackage {
- name = "repeating-1.1.3";
- version = "1.1.3";
- bin = true;
- src = fetchurl {
- url = "http://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz";
- name = "repeating-1.1.3.tgz";
- sha1 = "3d4114218877537494f97f77f9785fab810fa4ac";
- };
- deps = {
- "is-finite-1.0.1" = self.by-version."is-finite"."1.0.1";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."request"."^2.37.0" =
- self.by-version."request"."2.57.0";
- by-version."request"."2.57.0" = self.buildNodePackage {
- name = "request-2.57.0";
- version = "2.57.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/request/-/request-2.57.0.tgz";
- name = "request-2.57.0.tgz";
- sha1 = "d445105a42d009b9d724289633b449a6d723d989";
- };
- deps = {
- "bl-0.9.4" = self.by-version."bl"."0.9.4";
- "caseless-0.10.0" = self.by-version."caseless"."0.10.0";
- "forever-agent-0.6.1" = self.by-version."forever-agent"."0.6.1";
- "form-data-0.2.0" = self.by-version."form-data"."0.2.0";
- "json-stringify-safe-5.0.1" = self.by-version."json-stringify-safe"."5.0.1";
- "mime-types-2.0.14" = self.by-version."mime-types"."2.0.14";
- "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
- "qs-3.1.0" = self.by-version."qs"."3.1.0";
- "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0";
- "tough-cookie-2.0.0" = self.by-version."tough-cookie"."2.0.0";
- "http-signature-0.11.0" = self.by-version."http-signature"."0.11.0";
- "oauth-sign-0.8.0" = self.by-version."oauth-sign"."0.8.0";
- "hawk-2.3.1" = self.by-version."hawk"."2.3.1";
- "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0";
- "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4";
- "combined-stream-1.0.5" = self.by-version."combined-stream"."1.0.5";
- "isstream-0.1.2" = self.by-version."isstream"."0.1.2";
- "har-validator-1.7.1" = self.by-version."har-validator"."1.7.1";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."request"."^2.54.0" =
- self.by-version."request"."2.57.0";
- by-spec."request"."^2.55.0" =
- self.by-version."request"."2.57.0";
- by-spec."request"."~2.51.0" =
- self.by-version."request"."2.51.0";
- by-version."request"."2.51.0" = self.buildNodePackage {
- name = "request-2.51.0";
- version = "2.51.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/request/-/request-2.51.0.tgz";
- name = "request-2.51.0.tgz";
- sha1 = "35d00bbecc012e55f907b1bd9e0dbd577bfef26e";
- };
- deps = {
- "bl-0.9.4" = self.by-version."bl"."0.9.4";
- "caseless-0.8.0" = self.by-version."caseless"."0.8.0";
- "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2";
- "form-data-0.2.0" = self.by-version."form-data"."0.2.0";
- "json-stringify-safe-5.0.1" = self.by-version."json-stringify-safe"."5.0.1";
- "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2";
- "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
- "qs-2.3.3" = self.by-version."qs"."2.3.3";
- "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0";
- "tough-cookie-2.0.0" = self.by-version."tough-cookie"."2.0.0";
- "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1";
- "oauth-sign-0.5.0" = self.by-version."oauth-sign"."0.5.0";
- "hawk-1.1.1" = self.by-version."hawk"."1.1.1";
- "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0";
- "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4";
- "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."request"."~2.54.0" =
- self.by-version."request"."2.54.0";
- by-version."request"."2.54.0" = self.buildNodePackage {
- name = "request-2.54.0";
- version = "2.54.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/request/-/request-2.54.0.tgz";
- name = "request-2.54.0.tgz";
- sha1 = "a13917cd8e8fa73332da0bf2f84a30181def1953";
- };
- deps = {
- "bl-0.9.4" = self.by-version."bl"."0.9.4";
- "caseless-0.9.0" = self.by-version."caseless"."0.9.0";
- "forever-agent-0.6.1" = self.by-version."forever-agent"."0.6.1";
- "form-data-0.2.0" = self.by-version."form-data"."0.2.0";
- "json-stringify-safe-5.0.1" = self.by-version."json-stringify-safe"."5.0.1";
- "mime-types-2.0.14" = self.by-version."mime-types"."2.0.14";
- "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
- "qs-2.4.2" = self.by-version."qs"."2.4.2";
- "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0";
- "tough-cookie-2.0.0" = self.by-version."tough-cookie"."2.0.0";
- "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1";
- "oauth-sign-0.6.0" = self.by-version."oauth-sign"."0.6.0";
- "hawk-2.3.1" = self.by-version."hawk"."2.3.1";
- "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0";
- "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4";
- "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7";
- "isstream-0.1.2" = self.by-version."isstream"."0.1.2";
- "har-validator-1.7.1" = self.by-version."har-validator"."1.7.1";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."rimraf"."~2.2.8" =
- self.by-version."rimraf"."2.2.8";
- by-version."rimraf"."2.2.8" = self.buildNodePackage {
- name = "rimraf-2.2.8";
- version = "2.2.8";
- bin = true;
- src = fetchurl {
- url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz";
- name = "rimraf-2.2.8.tgz";
- sha1 = "e439be2aaee327321952730f99a8929e4fc50582";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."runforcover"."~0.0.2" =
- self.by-version."runforcover"."0.0.2";
- by-version."runforcover"."0.0.2" = self.buildNodePackage {
- name = "runforcover-0.0.2";
- version = "0.0.2";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/runforcover/-/runforcover-0.0.2.tgz";
- name = "runforcover-0.0.2.tgz";
- sha1 = "344f057d8d45d33aebc6cc82204678f69c4857cc";
- };
- deps = {
- "bunker-0.1.2" = self.by-version."bunker"."0.1.2";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."sax"."0.5.x" =
- self.by-version."sax"."0.5.8";
- by-version."sax"."0.5.8" = self.buildNodePackage {
- name = "sax-0.5.8";
- version = "0.5.8";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/sax/-/sax-0.5.8.tgz";
- name = "sax-0.5.8.tgz";
- sha1 = "d472db228eb331c2506b0e8c15524adb939d12c1";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."semver"."~4.3.4" =
- self.by-version."semver"."4.3.6";
- by-version."semver"."4.3.6" = self.buildNodePackage {
- name = "semver-4.3.6";
- version = "4.3.6";
- bin = true;
- src = fetchurl {
- url = "http://registry.npmjs.org/semver/-/semver-4.3.6.tgz";
- name = "semver-4.3.6.tgz";
- sha1 = "300bc6e0e86374f7ba61068b5b1ecd57fc6532da";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- "semver" = self.by-version."semver"."4.3.6";
- by-spec."send"."0.12.3" =
- self.by-version."send"."0.12.3";
- by-version."send"."0.12.3" = self.buildNodePackage {
- name = "send-0.12.3";
- version = "0.12.3";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/send/-/send-0.12.3.tgz";
- name = "send-0.12.3.tgz";
- sha1 = "cd12dc58fde21e4f91902b39b2fda05a7a6d9bdc";
- };
- deps = {
- "debug-2.2.0" = self.by-version."debug"."2.2.0";
- "depd-1.0.1" = self.by-version."depd"."1.0.1";
- "destroy-1.0.3" = self.by-version."destroy"."1.0.3";
- "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
- "etag-1.6.0" = self.by-version."etag"."1.6.0";
- "fresh-0.2.4" = self.by-version."fresh"."0.2.4";
- "mime-1.3.4" = self.by-version."mime"."1.3.4";
- "ms-0.7.1" = self.by-version."ms"."0.7.1";
- "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1";
- "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."serve-static"."~1.9.3" =
- self.by-version."serve-static"."1.9.3";
- by-version."serve-static"."1.9.3" = self.buildNodePackage {
- name = "serve-static-1.9.3";
- version = "1.9.3";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/serve-static/-/serve-static-1.9.3.tgz";
- name = "serve-static-1.9.3.tgz";
- sha1 = "5f8da07323ad385ff3dc541f1a7917b2e436eb57";
- };
- deps = {
- "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
- "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
- "send-0.12.3" = self.by-version."send"."0.12.3";
- "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- "serve-static" = self.by-version."serve-static"."1.9.3";
- by-spec."sigmund"."~1.0.0" =
- self.by-version."sigmund"."1.0.1";
- by-version."sigmund"."1.0.1" = self.buildNodePackage {
- name = "sigmund-1.0.1";
- version = "1.0.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz";
- name = "sigmund-1.0.1.tgz";
- sha1 = "3ff21f198cad2175f9f3b781853fd94d0d19b590";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."slide"."*" =
- self.by-version."slide"."1.1.6";
- by-version."slide"."1.1.6" = self.buildNodePackage {
- name = "slide-1.1.6";
- version = "1.1.6";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/slide/-/slide-1.1.6.tgz";
- name = "slide-1.1.6.tgz";
- sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."sntp"."0.2.x" =
- self.by-version."sntp"."0.2.4";
- by-version."sntp"."0.2.4" = self.buildNodePackage {
- name = "sntp-0.2.4";
- version = "0.2.4";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz";
- name = "sntp-0.2.4.tgz";
- sha1 = "fb885f18b0f3aad189f824862536bceeec750900";
- };
- deps = {
- "hoek-0.9.1" = self.by-version."hoek"."0.9.1";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."sntp"."1.x.x" =
- self.by-version."sntp"."1.0.9";
- by-version."sntp"."1.0.9" = self.buildNodePackage {
- name = "sntp-1.0.9";
- version = "1.0.9";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz";
- name = "sntp-1.0.9.tgz";
- sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198";
- };
- deps = {
- "hoek-2.14.0" = self.by-version."hoek"."2.14.0";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."source-map"."0.1.x" =
- self.by-version."source-map"."0.1.43";
- by-version."source-map"."0.1.43" = self.buildNodePackage {
- name = "source-map-0.1.43";
- version = "0.1.43";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz";
- name = "source-map-0.1.43.tgz";
- sha1 = "c24bc146ca517c1471f5dacbe2571b2b7f9e3346";
- };
- deps = {
- "amdefine-0.1.1" = self.by-version."amdefine"."0.1.1";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."streamsink"."~1.2.0" =
- self.by-version."streamsink"."1.2.0";
- by-version."streamsink"."1.2.0" = self.buildNodePackage {
- name = "streamsink-1.2.0";
- version = "1.2.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/streamsink/-/streamsink-1.2.0.tgz";
- name = "streamsink-1.2.0.tgz";
- sha1 = "efafee9f1e22d3591ed7de3dcaa95c3f5e79f73c";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."string-template"."~0.2.0" =
- self.by-version."string-template"."0.2.1";
- by-version."string-template"."0.2.1" = self.buildNodePackage {
- name = "string-template-0.2.1";
- version = "0.2.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/string-template/-/string-template-0.2.1.tgz";
- name = "string-template-0.2.1.tgz";
- sha1 = "42932e598a352d01fc22ec3367d9d84eec6c9add";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."string_decoder"."~0.10.x" =
- self.by-version."string_decoder"."0.10.31";
- by-version."string_decoder"."0.10.31" = self.buildNodePackage {
- name = "string_decoder-0.10.31";
- version = "0.10.31";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz";
- name = "string_decoder-0.10.31.tgz";
- sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."stringstream"."~0.0.4" =
- self.by-version."stringstream"."0.0.4";
- by-version."stringstream"."0.0.4" = self.buildNodePackage {
- name = "stringstream-0.0.4";
- version = "0.0.4";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz";
- name = "stringstream-0.0.4.tgz";
- sha1 = "0f0e3423f942960b5692ac324a57dd093bc41a92";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."strip-ansi"."^2.0.1" =
- self.by-version."strip-ansi"."2.0.1";
- by-version."strip-ansi"."2.0.1" = self.buildNodePackage {
- name = "strip-ansi-2.0.1";
- version = "2.0.1";
- bin = true;
- src = fetchurl {
- url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz";
- name = "strip-ansi-2.0.1.tgz";
- sha1 = "df62c1aa94ed2f114e1d0f21fd1d50482b79a60e";
- };
- deps = {
- "ansi-regex-1.1.1" = self.by-version."ansi-regex"."1.1.1";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."stylus"."~0.49.3" =
- self.by-version."stylus"."0.49.3";
- by-version."stylus"."0.49.3" = self.buildNodePackage {
- name = "stylus-0.49.3";
- version = "0.49.3";
- bin = true;
- src = fetchurl {
- url = "http://registry.npmjs.org/stylus/-/stylus-0.49.3.tgz";
- name = "stylus-0.49.3.tgz";
- sha1 = "1fbdabe479ed460872c71a6252a67f95040ba511";
- };
- deps = {
- "css-parse-1.7.0" = self.by-version."css-parse"."1.7.0";
- "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
- "debug-2.2.0" = self.by-version."debug"."2.2.0";
- "sax-0.5.8" = self.by-version."sax"."0.5.8";
- "glob-3.2.11" = self.by-version."glob"."3.2.11";
- "source-map-0.1.43" = self.by-version."source-map"."0.1.43";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- "stylus" = self.by-version."stylus"."0.49.3";
- by-spec."supports-color"."^1.3.0" =
- self.by-version."supports-color"."1.3.1";
- by-version."supports-color"."1.3.1" = self.buildNodePackage {
- name = "supports-color-1.3.1";
- version = "1.3.1";
- bin = true;
- src = fetchurl {
- url = "http://registry.npmjs.org/supports-color/-/supports-color-1.3.1.tgz";
- name = "supports-color-1.3.1.tgz";
- sha1 = "15758df09d8ff3b4acc307539fabe27095e1042d";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."tap"."~0.3.3" =
- self.by-version."tap"."0.3.3";
- by-version."tap"."0.3.3" = self.buildNodePackage {
- name = "tap-0.3.3";
- version = "0.3.3";
- bin = true;
- src = fetchurl {
- url = "http://registry.npmjs.org/tap/-/tap-0.3.3.tgz";
- name = "tap-0.3.3.tgz";
- sha1 = "c862237af0a213f97fff46594bd1d44eca705d63";
- };
- deps = {
- "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
- "yamlish-0.0.7" = self.by-version."yamlish"."0.0.7";
- "slide-1.1.6" = self.by-version."slide"."1.1.6";
- "runforcover-0.0.2" = self.by-version."runforcover"."0.0.2";
- "nopt-2.2.1" = self.by-version."nopt"."2.2.1";
- "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
- "difflet-0.2.6" = self.by-version."difflet"."0.2.6";
- "deep-equal-0.0.0" = self.by-version."deep-equal"."0.0.0";
- "buffer-equal-0.0.1" = self.by-version."buffer-equal"."0.0.1";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."tough-cookie".">=0.12.0" =
- self.by-version."tough-cookie"."2.0.0";
- by-version."tough-cookie"."2.0.0" = self.buildNodePackage {
- name = "tough-cookie-2.0.0";
- version = "2.0.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-2.0.0.tgz";
- name = "tough-cookie-2.0.0.tgz";
- sha1 = "41ce08720b35cf90beb044dd2609fb19e928718f";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."traverse"."0.6.x" =
- self.by-version."traverse"."0.6.6";
- by-version."traverse"."0.6.6" = self.buildNodePackage {
- name = "traverse-0.6.6";
- version = "0.6.6";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz";
- name = "traverse-0.6.6.tgz";
- sha1 = "cbdf560fd7b9af632502fed40f918c157ea97137";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."traverse"."~0.5.1" =
- self.by-version."traverse"."0.5.2";
- by-version."traverse"."0.5.2" = self.buildNodePackage {
- name = "traverse-0.5.2";
- version = "0.5.2";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/traverse/-/traverse-0.5.2.tgz";
- name = "traverse-0.5.2.tgz";
- sha1 = "e203c58d5f7f0e37db6e74c0acb929bb09b61d85";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."tunnel-agent"."~0.4.0" =
- self.by-version."tunnel-agent"."0.4.0";
- by-version."tunnel-agent"."0.4.0" = self.buildNodePackage {
- name = "tunnel-agent-0.4.0";
- version = "0.4.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz";
- name = "tunnel-agent-0.4.0.tgz";
- sha1 = "b1184e312ffbcf70b3b4c78e8c219de7ebb1c550";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."type-is"."~1.6.2" =
- self.by-version."type-is"."1.6.3";
- by-version."type-is"."1.6.3" = self.buildNodePackage {
- name = "type-is-1.6.3";
- version = "1.6.3";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/type-is/-/type-is-1.6.3.tgz";
- name = "type-is-1.6.3.tgz";
- sha1 = "d87d201777f76dfc526ac202679715d41a28c580";
- };
- deps = {
- "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0";
- "mime-types-2.1.1" = self.by-version."mime-types"."2.1.1";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."typedarray"."~0.0.5" =
- self.by-version."typedarray"."0.0.6";
- by-version."typedarray"."0.0.6" = self.buildNodePackage {
- name = "typedarray-0.0.6";
- version = "0.0.6";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz";
- name = "typedarray-0.0.6.tgz";
- sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."uglify-js"."~1.1.1" =
- self.by-version."uglify-js"."1.1.1";
- by-version."uglify-js"."1.1.1" = self.buildNodePackage {
- name = "uglify-js-1.1.1";
- version = "1.1.1";
- bin = true;
- src = fetchurl {
- url = "http://registry.npmjs.org/uglify-js/-/uglify-js-1.1.1.tgz";
- name = "uglify-js-1.1.1.tgz";
- sha1 = "ee71a97c4cefd06a1a9b20437f34118982aa035b";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."underscore"."^1.6.0" =
- self.by-version."underscore"."1.8.3";
- by-version."underscore"."1.8.3" = self.buildNodePackage {
- name = "underscore-1.8.3";
- version = "1.8.3";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz";
- name = "underscore-1.8.3.tgz";
- sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."underscore"."~1.6.0" =
- self.by-version."underscore"."1.6.0";
- by-version."underscore"."1.6.0" = self.buildNodePackage {
- name = "underscore-1.6.0";
- version = "1.6.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz";
- name = "underscore-1.6.0.tgz";
- sha1 = "8b38b10cacdef63337b8b24e4ff86d45aea529a8";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."utils-merge"."1.0.0" =
- self.by-version."utils-merge"."1.0.0";
- by-version."utils-merge"."1.0.0" = self.buildNodePackage {
- name = "utils-merge-1.0.0";
- version = "1.0.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz";
- name = "utils-merge-1.0.0.tgz";
- sha1 = "0294fb922bb9375153541c4f7096231f287c8af8";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."vary"."~1.0.0" =
- self.by-version."vary"."1.0.0";
- by-version."vary"."1.0.0" = self.buildNodePackage {
- name = "vary-1.0.0";
- version = "1.0.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/vary/-/vary-1.0.0.tgz";
- name = "vary-1.0.0.tgz";
- sha1 = "c5e76cec20d3820d8f2a96e7bee38731c34da1e7";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."xtend"."^4.0.0" =
- self.by-version."xtend"."4.0.0";
- by-version."xtend"."4.0.0" = self.buildNodePackage {
- name = "xtend-4.0.0";
- version = "4.0.0";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz";
- name = "xtend-4.0.0.tgz";
- sha1 = "8bc36ff87aedbe7ce9eaf0bca36b2354a743840f";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."xtend"."~4.0.0" =
- self.by-version."xtend"."4.0.0";
- by-spec."yamlish"."*" =
- self.by-version."yamlish"."0.0.7";
- by-version."yamlish"."0.0.7" = self.buildNodePackage {
- name = "yamlish-0.0.7";
- version = "0.0.7";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/yamlish/-/yamlish-0.0.7.tgz";
- name = "yamlish-0.0.7.tgz";
- sha1 = "b4af9a1dcc63618873c3d6e451ec3213c39a57fb";
- };
- deps = {
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- by-spec."yauzl"."~2.3.0" =
- self.by-version."yauzl"."2.3.1";
- by-version."yauzl"."2.3.1" = self.buildNodePackage {
- name = "yauzl-2.3.1";
- version = "2.3.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/yauzl/-/yauzl-2.3.1.tgz";
- name = "yauzl-2.3.1.tgz";
- sha1 = "6707fe2b6a4dac9445cc429bf04a11c7dedfa36a";
- };
- deps = {
- "fd-slicer-1.0.1" = self.by-version."fd-slicer"."1.0.1";
- "pend-1.2.0" = self.by-version."pend"."1.2.0";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- "yauzl" = self.by-version."yauzl"."2.3.1";
- by-spec."yawl"."~1.0.2" =
- self.by-version."yawl"."1.0.2";
- by-version."yawl"."1.0.2" = self.buildNodePackage {
- name = "yawl-1.0.2";
- version = "1.0.2";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/yawl/-/yawl-1.0.2.tgz";
- name = "yawl-1.0.2.tgz";
- sha1 = "df1301cb50e5bc74cc36d5c1ef9cfbd1f84b408e";
- };
- deps = {
- "bl-0.9.4" = self.by-version."bl"."0.9.4";
- "pend-1.2.0" = self.by-version."pend"."1.2.0";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- "yawl" = self.by-version."yawl"."1.0.2";
- by-spec."yazl"."~2.2.2" =
- self.by-version."yazl"."2.2.2";
- by-version."yazl"."2.2.2" = self.buildNodePackage {
- name = "yazl-2.2.2";
- version = "2.2.2";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/yazl/-/yazl-2.2.2.tgz";
- name = "yazl-2.2.2.tgz";
- sha1 = "60187f4ce6df314e7501c3c0e40bcf1b58fda183";
- };
- deps = {
- "buffer-crc32-0.2.5" = self.by-version."buffer-crc32"."0.2.5";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- "yazl" = self.by-version."yazl"."2.2.2";
- by-spec."ytdl-core".">=0.5.1" =
- self.by-version."ytdl-core"."0.5.1";
- by-version."ytdl-core"."0.5.1" = self.buildNodePackage {
- name = "ytdl-core-0.5.1";
- version = "0.5.1";
- bin = false;
- src = fetchurl {
- url = "http://registry.npmjs.org/ytdl-core/-/ytdl-core-0.5.1.tgz";
- name = "ytdl-core-0.5.1.tgz";
- sha1 = "3c48d696b019d7faae635a3f1e4eaa9131110f43";
- };
- deps = {
- "cheerio-0.18.0" = self.by-version."cheerio"."0.18.0";
- "jstream-0.2.7" = self.by-version."jstream"."0.2.7";
- "request-2.57.0" = self.by-version."request"."2.57.0";
- "underscore-1.8.3" = self.by-version."underscore"."1.8.3";
- };
- optionalDependencies = {
- };
- peerDependencies = [];
- os = [ ];
- cpu = [ ];
- };
- "ytdl-core" = self.by-version."ytdl-core"."0.5.1";
-}
-
diff --git a/pkgs/applications/audio/gtkpod/default.nix b/pkgs/applications/audio/gtkpod/default.nix
index 1b1bf437ce9d7e9167fb55a0dcb15b1281b710e8..7ebdce7835275610aed2ca487d9907a173ea6064 100644
--- a/pkgs/applications/audio/gtkpod/default.nix
+++ b/pkgs/applications/audio/gtkpod/default.nix
@@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
propagatedUserEnvPkgs = [ gnome.gnome_themes_standard ];
- buildInputs = [ pkgconfig makeWrapper intltool curl gettext perl perlXMLParser
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ makeWrapper intltool curl gettext perl perlXMLParser
flex libgpod libid3tag flac libvorbis gtk3 gdk_pixbuf libglade gnome.anjuta
gnome.gdl gnome.defaultIconTheme
hicolor_icon_theme ];
diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix
index 6073008d541dfa745f6c2726e9e8d12b5da14d73..b149aab06e10fa5c40cb653df6ba5ebd4d6d2700 100644
--- a/pkgs/applications/audio/guitarix/default.nix
+++ b/pkgs/applications/audio/guitarix/default.nix
@@ -12,11 +12,11 @@ in
stdenv.mkDerivation rec {
name = "guitarix-${version}";
- version = "0.35.3";
+ version = "0.35.6";
src = fetchurl {
url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.xz";
- sha256 = "0pvw4ijkq6lcn45vrif9b4mqmgzi0qg1dp5b33kb5zan6n1aci4j";
+ sha256 = "0ffvfnvhj6vz73zsrpi88hs69ys4zskm847zf825dl2r39n9nn41";
};
nativeBuildInputs = [ gettext intltool wrapGAppsHook pkgconfig python2 ];
diff --git a/pkgs/applications/audio/hydrogen/default.nix b/pkgs/applications/audio/hydrogen/default.nix
index 686a6b67e6aad8e0ab2ca8b7e871e013b0844c53..d68bfbf2ae4e15386cd16dd5d946c92fe86b5eeb 100644
--- a/pkgs/applications/audio/hydrogen/default.nix
+++ b/pkgs/applications/audio/hydrogen/default.nix
@@ -10,8 +10,9 @@ stdenv.mkDerivation rec {
sha256 = "1dy2jfkdw0nchars4xi4isrz66fqn53a9qk13bqza7lhmsg3s3qy";
};
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- alsaLib boost cmake glib lash libjack2 libarchive liblrdf libsndfile pkgconfig qt4
+ alsaLib boost cmake glib lash libjack2 libarchive liblrdf libsndfile qt4
];
meta = with stdenv.lib; {
diff --git a/pkgs/applications/audio/i-score/default.nix b/pkgs/applications/audio/i-score/default.nix
index 1a47b74e21c72223f49e6ec0af6e6454f07198f5..69fc4b419c0649e82939d88d0a47188bde81afb5 100644
--- a/pkgs/applications/audio/i-score/default.nix
+++ b/pkgs/applications/audio/i-score/default.nix
@@ -1,8 +1,9 @@
{
+ alsaLib,
boost,
cln,
cmake,
- fetchgit,
+ fetchFromGitHub,
gcc,
ginac,
jamomacore,
@@ -10,9 +11,13 @@
libsndfile,
ninja,
portaudio,
+ portmidi,
qtbase,
qtdeclarative,
qtimageformats,
+ qtmultimedia,
+ qtquickcontrols2,
+ qtserialport,
qtsvg,
qttools,
qtwebsockets,
@@ -21,18 +26,19 @@
}:
stdenv.mkDerivation rec {
- version = "1.0.0-a67";
+ version = "1.0.0-b31";
name = "i-score-${version}";
- src = fetchgit {
- url = "https://github.com/OSSIA/i-score.git";
- rev = "ede2453b139346ae46702b5e2643c5488f8c89fb";
- sha256 = "0cl9vdmxkshdacgpp7s2rg40b7xbsjrzw916jds9i3rpq1pcy5pj";
- leaveDotGit = true;
- deepClone = true;
+ src = fetchFromGitHub {
+ owner = "OSSIA";
+ repo = "i-score";
+ rev = "v${version}";
+ sha256 = "0g7s6n11w3wflrv5i2047dxx56lryms7xj0mznnlk5bii7g8dxzb";
+ fetchSubmodules = true;
};
buildInputs = [
+ alsaLib
boost
cln
cmake
@@ -43,9 +49,13 @@ stdenv.mkDerivation rec {
libsndfile
ninja
portaudio
+ portmidi
qtbase
qtdeclarative
qtimageformats
+ qtmultimedia
+ qtquickcontrols2
+ qtserialport
qtsvg
qttools
qtwebsockets
@@ -59,21 +69,11 @@ stdenv.mkDerivation rec {
"-DISCORE_BUILD_FOR_PACKAGE_MANAGER=True"
];
- patchPhase = ''
- sed -e '77d' -i CMake/modules/GetGitRevisionDescription.cmake
- '';
-
preConfigure = ''
export CMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH:$(echo "${jamomacore}/jamoma/share/cmake/Jamoma")"
'';
- preBuild = ''
- ninja
- '';
-
- installPhase = ''
- cmake --build . --target install
- '';
+ postInstall = ''rm $out/bin/i-score.sh'';
meta = {
description = "An interactive sequencer for the intermedia arts";
diff --git a/pkgs/applications/audio/iannix/default.nix b/pkgs/applications/audio/iannix/default.nix
index d56ac75340536f7262a8634cccdc20a630651586..c26980e1bb263549f927658d05f94a8229e7c2c2 100644
--- a/pkgs/applications/audio/iannix/default.nix
+++ b/pkgs/applications/audio/iannix/default.nix
@@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "184ydb9f1303v332k5k3f1ki7cb6nkxhh6ij0yn72v7dp7figrgj";
};
- nativeBuildInputs = [ qmake ];
- buildInputs = [ alsaLib pkgconfig qtbase qtscript ];
+ nativeBuildInputs = [ pkgconfig qmake ];
+ buildInputs = [ alsaLib qtbase qtscript ];
qmakeFlags = [ "PREFIX=/" ];
diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/applications/audio/ingen/default.nix
index 0b0df0b55e4f61d45e7af07dd06e1cb571c0d2a5..ca806aad02feae984640ad9cc2d59fb67e3cfa8f 100644
--- a/pkgs/applications/audio/ingen/default.nix
+++ b/pkgs/applications/audio/ingen/default.nix
@@ -13,8 +13,9 @@ stdenv.mkDerivation rec {
sha256 = "15s8nrzn68hc2s6iw0zshbz3lfnsq0mr6gflq05xm911b7xbp74k";
};
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- boost ganv glibmm gtkmm2 libjack2 lilv lv2 makeWrapper pkgconfig
+ boost ganv glibmm gtkmm2 libjack2 lilv lv2 makeWrapper
python raul serd sord sratom suil
];
diff --git a/pkgs/applications/audio/jack-capture/default.nix b/pkgs/applications/audio/jack-capture/default.nix
index ec7f7a5c32dbcaa52faabee58d2f76cf4ccf1331..f1e00e876730ff4b46b1ce4ddfdde786ee54a626 100644
--- a/pkgs/applications/audio/jack-capture/default.nix
+++ b/pkgs/applications/audio/jack-capture/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0sk7b92my1v1g7rhkpl1c608rb0rdb28m9zqfll95kflxajd16zv";
};
- buildInputs = [ libjack2 libsndfile pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ libjack2 libsndfile ];
buildPhase = "PREFIX=$out make jack_capture";
diff --git a/pkgs/applications/audio/jack-oscrolloscope/default.nix b/pkgs/applications/audio/jack-oscrolloscope/default.nix
index 5f796a29035b96615381c583f4a4bce9e9b768a4..a75513ff059ee86b4f3cd6d48dbeb7aaa383537c 100644
--- a/pkgs/applications/audio/jack-oscrolloscope/default.nix
+++ b/pkgs/applications/audio/jack-oscrolloscope/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1pl55in0sj7h5r06n1v91im7d18pplvhbjhjm1fdl39zwnyxiash";
};
- buildInputs = [ SDL libjack2 mesa pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ SDL libjack2 mesa ];
installPhase = ''
mkdir -p $out/bin
diff --git a/pkgs/applications/audio/jack-rack/default.nix b/pkgs/applications/audio/jack-rack/default.nix
index 1d1925779f0d008ea21a7c61a44c207b12de0a30..d68e67d19dd4e2951ad9c21140ace698fc9f0043 100644
--- a/pkgs/applications/audio/jack-rack/default.nix
+++ b/pkgs/applications/audio/jack-rack/default.nix
@@ -5,7 +5,8 @@ stdenv.mkDerivation rec {
url = "mirror://sourceforge/jack-rack/${name}.tar.bz2";
sha256 = "1lmibx9gicagcpcisacj6qhq6i08lkl5x8szysjqvbgpxl9qg045";
};
- buildInputs = [ pkgconfig libjack2 ladspaH gtk2 alsaLib libxml2 librdf ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ libjack2 ladspaH gtk2 alsaLib libxml2 librdf ];
meta = {
description = ''An effects "rack" for the JACK low latency audio API'';
diff --git a/pkgs/applications/audio/jackmeter/default.nix b/pkgs/applications/audio/jackmeter/default.nix
index c709483a3b21ee91a7d75cbfe97c0bd079b4bd36..060b7f703a31503aa0147f88fa4dd2875bf753f2 100644
--- a/pkgs/applications/audio/jackmeter/default.nix
+++ b/pkgs/applications/audio/jackmeter/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "1cnvgx3jv0yvxlqy0l9k285zgvazmh5k8m4l7lxckjfm5bn6hm1r";
};
- buildInputs = [ libjack2 pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ libjack2 ];
meta = {
description = "Console jack loudness meter";
diff --git a/pkgs/applications/audio/jackmix/default.nix b/pkgs/applications/audio/jackmix/default.nix
index e9e3fd53e54623f243047a249a38d141fdde3def..aa78527d787e00a1eb1f0d2d67726260790beb8c 100644
--- a/pkgs/applications/audio/jackmix/default.nix
+++ b/pkgs/applications/audio/jackmix/default.nix
@@ -7,8 +7,10 @@ stdenv.mkDerivation rec {
sha256 = "18f5v7g66mgarhs476frvayhch7fy4nyjf2xivixc061ipn0m82j";
};
+ patches = [ ./no_error.patch ];
+
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig
scons
qt4
lash
@@ -31,5 +33,3 @@ stdenv.mkDerivation rec {
platforms = stdenv.lib.platforms.linux;
};
}
-
-
diff --git a/pkgs/applications/audio/jackmix/no_error.patch b/pkgs/applications/audio/jackmix/no_error.patch
new file mode 100644
index 0000000000000000000000000000000000000000..d1a714ded9ca9c71496d79ae439e9822b51630a9
--- /dev/null
+++ b/pkgs/applications/audio/jackmix/no_error.patch
@@ -0,0 +1,13 @@
+diff --git a/SConstruct b/SConstruct
+index 4290fa5..0a7a679 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -16,7 +16,7 @@ env = Environment(
+ env.Replace( LIBS="" )
+ env.Replace( LIBPATH="" )
+
+-env.MergeFlags( ['-Wall', '-Werror', '-g', '-fpic'] )
++env.MergeFlags( ['-g', '-fpic'] )
+
+ tests = { }
+ tests.update( env['PKGCONFIG_TESTS'] )
diff --git a/pkgs/applications/audio/jalv/default.nix b/pkgs/applications/audio/jalv/default.nix
index e2c86256ce649eb8950cd3320cada4115591af30..99c3e48ae84dc24bddfbc8f1e81f8c0cf3661744 100644
--- a/pkgs/applications/audio/jalv/default.nix
+++ b/pkgs/applications/audio/jalv/default.nix
@@ -10,8 +10,9 @@ stdenv.mkDerivation rec {
sha256 = "1x2wpzzx2cgvz3dgdcgsj8dr0w3zsasy62mvl199bsdj5fbjaili";
};
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- gtk2 libjack2 lilv lv2 pkgconfig python serd sord sratom suil
+ gtk2 libjack2 lilv lv2 python serd sord sratom suil
];
configurePhase = "python waf configure --prefix=$out";
diff --git a/pkgs/applications/audio/jamin/default.nix b/pkgs/applications/audio/jamin/default.nix
index 4af53389ffdfecdff66cfec3a3c59185b209841c..77946fc41ccc3d4b77883e3924dd00d3bd42dbdc 100644
--- a/pkgs/applications/audio/jamin/default.nix
+++ b/pkgs/applications/audio/jamin/default.nix
@@ -10,8 +10,9 @@ stdenv.mkDerivation {
sha256 = "0g5v74cm0q3p3pzl6xmnp4rqayaymfli7c6z8s78h9rgd24fwbvn";
};
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- fftwFloat gtk2 ladspaPlugins libjack2 liblo libxml2 pkgconfig perl
+ fftwFloat gtk2 ladspaPlugins libjack2 liblo libxml2 perl
perlXMLParser makeWrapper
];
diff --git a/pkgs/applications/audio/klick/default.nix b/pkgs/applications/audio/klick/default.nix
index f8febbe21781b97f0adfe924e51b00216a4108bc..3a0da876acfce8e06b68256a1ba39de62cd5ba11 100644
--- a/pkgs/applications/audio/klick/default.nix
+++ b/pkgs/applications/audio/klick/default.nix
@@ -10,7 +10,9 @@ stdenv.mkDerivation rec {
sha256 = "1289533c0849b1b66463bf27f7ce5f71736b655cfb7672ef884c7e6eb957ac42";
};
- buildInputs = [ scons pkgconfig libsamplerate libsndfile liblo libjack2 boost ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ scons libsamplerate libsndfile liblo libjack2 boost ];
+ NIX_CFLAGS_COMPILE = "-fpermissive";
buildPhase = ''
mkdir -p $out
diff --git a/pkgs/applications/audio/ladspa-plugins/default.nix b/pkgs/applications/audio/ladspa-plugins/default.nix
index 1b68caccf4ec33a428bb93e33af6904e5202fe91..a60b3db2fb86aa3e8e8f916c7076bed0a1d8fa70 100644
--- a/pkgs/applications/audio/ladspa-plugins/default.nix
+++ b/pkgs/applications/audio/ladspa-plugins/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "1rqwh8xrw6hnp69dg4gy336bfbfpmbx4fjrk0nb8ypjcxkz91c6i";
};
- buildInputs = [ autoreconfHook fftw ladspaH libxml2 pkgconfig perlPackages.perl perlPackages.XMLParser ];
+ nativeBuildInputs = [ autoreconfHook pkgconfig ];
+ buildInputs = [ fftw ladspaH libxml2 perlPackages.perl perlPackages.XMLParser ];
patchPhase = ''
patchShebangs .
diff --git a/pkgs/applications/audio/lingot/default.nix b/pkgs/applications/audio/lingot/default.nix
index 47b65ff2b5a34ff24487b148cdc2d71cf616f0a7..65df1b89430e713b8472d74beb73e2db693d4012 100644
--- a/pkgs/applications/audio/lingot/default.nix
+++ b/pkgs/applications/audio/lingot/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation {
hardeningDisable = [ "format" ];
- buildInputs = [ pkgconfig intltool gtk2 alsaLib libglade ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ intltool gtk2 alsaLib libglade ];
configureFlags = "--disable-jack";
diff --git a/pkgs/applications/audio/linuxband/default.nix b/pkgs/applications/audio/linuxband/default.nix
index ba1d88373fffe4ece3462eafe5344f51f587527e..a8e33c23dc0d7e6ab084f6340dba0d2aa7750802 100644
--- a/pkgs/applications/audio/linuxband/default.nix
+++ b/pkgs/applications/audio/linuxband/default.nix
@@ -11,7 +11,8 @@ in stdenv.mkDerivation rec {
sha256 = "1r71h4yg775m4gax4irrvygmrsclgn503ykmc2qwjsxa42ri4n2n";
};
- buildInputs = [ makeWrapper pkgconfig MMA libjack2 libsmf python pyGtkGlade pygtksourceview ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ makeWrapper MMA libjack2 libsmf python pyGtkGlade pygtksourceview ];
patchPhase = ''
sed -i 's@/usr/@${MMA}/@g' src/main/config/linuxband.rc.in
diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix
index 7ba5bcc4ac48f3f36957d975af8dbb2c197506bb..25d7f2ed015b359300fe18bf1fe6f5fc4c78ef38 100644
--- a/pkgs/applications/audio/lmms/default.nix
+++ b/pkgs/applications/audio/lmms/default.nix
@@ -1,31 +1,47 @@
-{ stdenv, fetchFromGitHub, SDL, alsaLib, cmake, fftwSinglePrec, fluidsynth
-, fltk13, libjack2, libvorbis , libsamplerate, libsndfile, pkgconfig
-, libpulseaudio, qt4, freetype, libgig
-}:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, alsaLib ? null, fftwFloat, fltk13
+, fluidsynth ? null, lame ? null, libgig ? null, libjack2 ? null, libpulseaudio ? null
+, libsamplerate, libsoundio ? null, libsndfile, libvorbis ? null, portaudio ? null
+, qtbase, qttools, SDL ? null }:
stdenv.mkDerivation rec {
name = "lmms-${version}";
- version = "1.1.90";
+ version = "1.2.0-rc4";
src = fetchFromGitHub {
owner = "LMMS";
repo = "lmms";
rev = "v${version}";
- sha256 = "0njiarndwqamqiinr1wbwkzjn87yzr1z5k9cfwk0jdkbalgakkq3";
+ sha256 = "1n3py18zqbvfnkdiz4wc6z60xaajpkd3kn1wxmby5dmc4vccvjj5";
};
+ nativeBuildInputs = [ cmake qttools pkgconfig ];
+
buildInputs = [
- SDL alsaLib cmake fftwSinglePrec fltk13 fluidsynth libjack2 libgig
- libsamplerate libsndfile libvorbis pkgconfig libpulseaudio qt4
+ alsaLib
+ fftwFloat
+ fltk13
+ fluidsynth
+ lame
+ libgig
+ libjack2
+ libpulseaudio
+ libsamplerate
+ libsndfile
+ libsoundio
+ libvorbis
+ portaudio
+ qtbase
+ SDL # TODO: switch to SDL2 in the next version
];
+ cmakeFlags = [ "-DWANT_QT5=ON" ];
enableParallelBuilding = true;
meta = with stdenv.lib; {
- description = "Linux MultiMedia Studio";
- homepage = http://lmms.sourceforge.net;
+ description = "DAW similar to FL Studio (music production software)";
+ homepage = https://lmms.io;
license = licenses.gpl2Plus;
platforms = platforms.linux;
- maintainers = [ maintainers.goibhniu ];
+ maintainers = with maintainers; [ goibhniu yegortimoshenko ];
};
}
diff --git a/pkgs/applications/audio/lv2bm/default.nix b/pkgs/applications/audio/lv2bm/default.nix
index a7c8098dd79ab9c725cfdc79283c362fd98762d4..d3821c51fbc6a6aaa45a76918666e18f99a932c7 100644
--- a/pkgs/applications/audio/lv2bm/default.nix
+++ b/pkgs/applications/audio/lv2bm/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "1rrz5sp04zjal6v34ldkl6fjj9xqidb8xm1iscjyljf6z4l516cx";
};
- buildInputs = [ glib lilv lv2 pkgconfig serd sord sratom ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ glib lilv lv2 serd sord sratom ];
installPhase = ''
make install PREFIX=$out
diff --git a/pkgs/applications/audio/mda-lv2/default.nix b/pkgs/applications/audio/mda-lv2/default.nix
index 9d3cdc2eea38c35c19da28579fbf78d5da489c45..c7d0caec8bf5ab4b855b30f2400bc6c82cb127d1 100644
--- a/pkgs/applications/audio/mda-lv2/default.nix
+++ b/pkgs/applications/audio/mda-lv2/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0hh40c5d2m0k5gb3vw031l6lqn59dg804an3mkmhkc7qv4gc6xm4";
};
- buildInputs = [ fftwSinglePrec lv2 pkgconfig python ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ fftwSinglePrec lv2 python ];
configurePhase = "python waf configure --prefix=$out";
diff --git a/pkgs/applications/audio/meters_lv2/default.nix b/pkgs/applications/audio/meters_lv2/default.nix
index e412f31f3168fd8da83cb2ae6aa8a7c633ab610b..f4245b0a51e342eb19bf35d5ed79e9a535f51c96 100644
--- a/pkgs/applications/audio/meters_lv2/default.nix
+++ b/pkgs/applications/audio/meters_lv2/default.nix
@@ -25,7 +25,8 @@ in
stdenv.mkDerivation {
inherit name;
- buildInputs = [ pkgconfig lv2 mesa gtk2 cairo pango fftw ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ lv2 mesa gtk2 cairo pango fftw ];
srcs = [ src robtkSrc ];
sourceRoot = name;
diff --git a/pkgs/applications/audio/milkytracker/default.nix b/pkgs/applications/audio/milkytracker/default.nix
index f22ccd08a8e87690479eabb9ed2c80d80e8c3e2c..6a71971c5fdffaad88006aec2230428aadf0c88d 100644
--- a/pkgs/applications/audio/milkytracker/default.nix
+++ b/pkgs/applications/audio/milkytracker/default.nix
@@ -1,38 +1,23 @@
-{ stdenv, fetchurl, SDL, alsaLib, autoconf, automake, libjack2, perl
-, zlib, zziplib
+{ stdenv, fetchurl, SDL2, alsaLib, cmake, libjack2, perl
+, zlib, zziplib, pkgconfig, makeWrapper
}:
stdenv.mkDerivation rec {
- version = "0.90.85";
+ version = "1.01";
name = "milkytracker-${version}";
src = fetchurl {
- url = "http://milkytracker.org/files/milkytracker-0.90.85.tar.gz";
- sha256 = "184pk0k9nv461a61sh6lb62wfadjwwk8ri3z5kpdbqnyssz0zfpv";
+ url = "https://github.com/milkytracker/MilkyTracker/archive/v${version}.00.tar.gz";
+ sha256 = "1dvnddsnn9c83lz4dlm0cfjpc0m524amfkbalxbswdy0qc8cj1wv";
};
- # Get two official patches.
- no_zzip_patch = fetchurl {
- url = "http://www.milkytracker.org/files/patches-0.90.85/no_zziplib_dep.patch";
- sha256 = "1w550q7pxa7w6v2v19ljk03hayacrs6y887izg11a1983wk7qzb3";
- };
-
- fix_64bit_patch = fetchurl {
- url = "http://www.milkytracker.org/files/patches-0.90.85/64bit_freebsd_fix.patch";
- sha256 = "0gwd4zslbd8kih80k4v7n2c65kvm2cq3kl6d7y33z1l007vzyvf6";
- };
-
- patchPhase = ''
- patch ./src/tracker/sdl/SDL_Main.cpp < ${fix_64bit_patch}
- patch < ${no_zzip_patch}
- patch ./src/compression/DecompressorGZIP.cpp < ${./decompressor_gzip.patch}
- '';
-
preBuild=''
export CPATH=${zlib.out}/lib
'';
- buildInputs = [ SDL alsaLib autoconf automake libjack2 perl zlib zziplib ];
+ nativeBuildInputs = [ cmake pkgconfig makeWrapper ];
+
+ buildInputs = [ SDL2 alsaLib libjack2 perl zlib zziplib ];
meta = {
description = "Music tracker application, similar to Fasttracker II";
diff --git a/pkgs/applications/audio/minimodem/default.nix b/pkgs/applications/audio/minimodem/default.nix
index 025d216910eae1e56428a7db17c57e59ab921253..2e293ee4552dc1ce0db0ade056335d81b3efcd4e 100644
--- a/pkgs/applications/audio/minimodem/default.nix
+++ b/pkgs/applications/audio/minimodem/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "003xyqjq59wcjafrdv1b8w34xsn4nvzz51wwd7mqddajh0g4dz4g";
};
- buildInputs = [ pkgconfig fftw fftwSinglePrec alsaLib libsndfile libpulseaudio ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ fftw fftwSinglePrec alsaLib libsndfile libpulseaudio ];
meta = {
description = "General-purpose software audio FSK modem";
diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix
index 0bf7472ea11507d6f0086b77eb79e2418fc25934..6d353344b07fb25b6c54857b18aa5bd44faad3d4 100644
--- a/pkgs/applications/audio/mixxx/default.nix
+++ b/pkgs/applications/audio/mixxx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, chromaprint, fftw, flac, libid3tag, libmad
+{ stdenv, fetchurl, chromaprint, fetchpatch, fftw, flac, libid3tag, libmad
, libopus, libshout, libsndfile, libusb1, libvorbis, pkgconfig
, portaudio, portmidi, protobuf, qt4, rubberband, scons, sqlite
, taglib, vampSDK
@@ -13,7 +13,17 @@ stdenv.mkDerivation rec {
sha256 = "0vb71w1yq0xwwsclrn2jj9bk8w4n14rfv5c0aw46c11mp8xz7f71";
};
- patches = [ ./sqlite.patch ]; # from: https://bugs.gentoo.org/show_bug.cgi?id=622776
+ patches = [
+ (fetchpatch {
+ url = "https://sources.debian.net/data/main/m/mixxx/2.0.0~dfsg-7.1/debian/patches/0007-fix_gcc6_issue.patch";
+ sha256 = "0kpyv10wcjcvbijk6vpq54gx9sqzrq4kq2qilc1czmisp9qdy5sd";
+ })
+ (fetchpatch {
+ url = "https://622776.bugs.gentoo.org/attachment.cgi?id=487284";
+ name = "sqlite.patch";
+ sha256 = "1qqbd8nrxrjcc1dwvyqfq1k2yz3l071sfcgd2dmpk6j8d4j5kx31";
+ })
+ ];
buildInputs = [
chromaprint fftw flac libid3tag libmad libopus libshout libsndfile
diff --git a/pkgs/applications/audio/mixxx/sqlite.patch b/pkgs/applications/audio/mixxx/sqlite.patch
deleted file mode 100644
index ed9f4ee51437746870aba4d9d565d90a55cba686..0000000000000000000000000000000000000000
--- a/pkgs/applications/audio/mixxx/sqlite.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -urN old/src/library/trackcollection.h mixxx-2.0.0/src/library/trackcollection.h
---- old/src/library/trackcollection.h 2017-07-30 00:04:48.511029517 -0400
-+++ mixxx-2.0.0/src/library/trackcollection.h 2017-07-30 00:05:03.378699826 -0400
-@@ -34,8 +34,7 @@
- #include "library/dao/libraryhashdao.h"
-
- #ifdef __SQLITE3__
--typedef struct sqlite3_context sqlite3_context;
--typedef struct Mem sqlite3_value;
-+#include
- #endif
-
- class TrackInfoObject;
diff --git a/pkgs/applications/audio/monkeys-audio/buildfix.diff b/pkgs/applications/audio/monkeys-audio/buildfix.diff
index 3c48f6ad828f02c2c9a2a2ac558d725144862261..9684e5bf8e433829cba3768a8373ef79a8ed1da2 100644
--- a/pkgs/applications/audio/monkeys-audio/buildfix.diff
+++ b/pkgs/applications/audio/monkeys-audio/buildfix.diff
@@ -1,7 +1,8 @@
-diff -ru monkeys-audio-3.99-u4-b5/src/MACLib/APELink.cpp monkeys-audio-3.99-u4-b5.patched/src/MACLib/APELink.cpp
---- monkeys-audio-3.99-u4-b5/src/MACLib/APELink.cpp 2006-06-01 11:00:57.000000000 +0200
-+++ monkeys-audio-3.99-u4-b5.patched/src/MACLib/APELink.cpp 2012-01-05 14:51:47.000000000 +0100
-@@ -63,10 +63,10 @@
+diff --git a/src/MACLib/APELink.cpp b/src/MACLib/APELink.cpp
+index d349f4b..b00ec83 100644
+--- a/src/MACLib/APELink.cpp
++++ b/src/MACLib/APELink.cpp
+@@ -63,10 +63,10 @@ void CAPELink::ParseData(const char * pData, const str_utf16 * pFilename)
if (pData != NULL)
{
// parse out the information
@@ -16,7 +17,7 @@ diff -ru monkeys-audio-3.99-u4-b5/src/MACLib/APELink.cpp monkeys-audio-3.99-u4-b
if (pHeader && pImageFile && pStartBlock && pFinishBlock)
{
-@@ -81,7 +81,7 @@
+@@ -81,7 +81,7 @@ void CAPELink::ParseData(const char * pData, const str_utf16 * pFilename)
// get the path
char cImageFile[MAX_PATH + 1]; int nIndex = 0;
@@ -25,3 +26,24 @@ diff -ru monkeys-audio-3.99-u4-b5/src/MACLib/APELink.cpp monkeys-audio-3.99-u4-b
while ((*pImageCharacter != 0) && (*pImageCharacter != '\r') && (*pImageCharacter != '\n'))
cImageFile[nIndex++] = *pImageCharacter++;
cImageFile[nIndex] = 0;
+diff --git a/src/Shared/All.h b/src/Shared/All.h
+index 328addc..7730e89 100644
+--- a/src/Shared/All.h
++++ b/src/Shared/All.h
+@@ -21,6 +21,8 @@ Global includes
+ #include
+ #endif
+
++#include
++
+ #ifdef _WIN32
+ #include
+ #include
+@@ -34,7 +36,6 @@ Global includes
+ #include "NoWindows.h"
+ #endif
+
+-#include
+ #include
+ #include
+ #include
diff --git a/pkgs/applications/audio/mopidy-gmusic/default.nix b/pkgs/applications/audio/mopidy-gmusic/default.nix
index ab2a23b1994ce3e398801aa886efa7a064e93866..b792ec3428e74fbb0ddd0b5c798f94a25fedc80f 100644
--- a/pkgs/applications/audio/mopidy-gmusic/default.nix
+++ b/pkgs/applications/audio/mopidy-gmusic/default.nix
@@ -13,7 +13,7 @@ pythonPackages.buildPythonApplication rec {
mopidy
pythonPackages.requests
pythonPackages.gmusicapi
- pythonPackages.cachetools
+ pythonPackages.cachetools_1
];
doCheck = false;
diff --git a/pkgs/applications/audio/mopidy-iris/default.nix b/pkgs/applications/audio/mopidy-iris/default.nix
index 32d7bf78730307d65a6773ccf11a30f2cb9da7f3..caeba5eb1acbcdf618ee6922436f0713602eefab 100644
--- a/pkgs/applications/audio/mopidy-iris/default.nix
+++ b/pkgs/applications/audio/mopidy-iris/default.nix
@@ -2,12 +2,12 @@
pythonPackages.buildPythonApplication rec {
name = "mopidy-iris-${version}";
- version = "3.2.0";
+ version = "3.6.1";
src = pythonPackages.fetchPypi {
inherit version;
pname = "Mopidy-Iris";
- sha256 = "cb97cb14b2d6836f3c28c5fd0ada44b4a33f2e74380f44bd5d03beffa5f67b30";
+ sha256 = "1mfi3qx7pvfq4rz0py39lnbzv7sq703b6k6mypzhj1gdzbisfn46";
};
propagatedBuildInputs = [
@@ -16,6 +16,7 @@ pythonPackages.buildPythonApplication rec {
pythonPackages.configobj
pythonPackages.pylast
pythonPackages.spotipy
+ pythonPackages.raven
];
meta = with stdenv.lib; {
diff --git a/pkgs/applications/audio/mp3info/default.nix b/pkgs/applications/audio/mp3info/default.nix
index 5f1d2bfa93d50465577ed57dd5c1a30e2062475f..6700f21fc8cca9f0ee957ae7540ec45cd8fe6d5a 100644
--- a/pkgs/applications/audio/mp3info/default.nix
+++ b/pkgs/applications/audio/mp3info/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "042f1czcs9n2sbqvg4rsvfwlqib2gk976mfa2kxlfjghx5laqf04";
};
- buildInputs = [ ncurses pkgconfig gtk2 ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ ncurses gtk2 ];
hardeningDisable = [ "format" ];
@@ -39,6 +40,6 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.gpl2Plus;
maintainers = [ ];
- platforms = stdenv.lib.platforms.unix;
+ platforms = stdenv.lib.platforms.linux;
};
}
diff --git a/pkgs/applications/audio/mpc/default.nix b/pkgs/applications/audio/mpc/default.nix
index 59adb7cde4979bbb7651f0a48a0cdff1c7e55e1c..73352b65092144d7342cc04b188829a76f6c992b 100644
--- a/pkgs/applications/audio/mpc/default.nix
+++ b/pkgs/applications/audio/mpc/default.nix
@@ -17,11 +17,6 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- preConfigure = ''
- export LIBMPDCLIENT_LIBS=${mpd_clientlib}/lib/libmpdclient.${if stdenv.isDarwin then mpd_clientlib.majorVersion + ".dylib" else "so." + mpd_clientlib.majorVersion + ".0." + mpd_clientlib.minorVersion}
- export LIBMPDCLIENT_CFLAGS=${mpd_clientlib}
- '';
-
meta = with stdenv.lib; {
description = "A minimalist command line interface to MPD";
homepage = http://www.musicpd.org/clients/mpc/;
diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix
index 37717babce4aa74d113bfb6c7595bba9d42e7613..1e0b46826cf0190f171b9e3bd3f85bf47c19970c 100644
--- a/pkgs/applications/audio/mpg123/default.nix
+++ b/pkgs/applications/audio/mpg123/default.nix
@@ -4,11 +4,11 @@
}:
stdenv.mkDerivation rec {
- name = "mpg123-1.25.4";
+ name = "mpg123-1.25.7";
src = fetchurl {
url = "mirror://sourceforge/mpg123/${name}.tar.bz2";
- sha256 = "1rxknrnl3ji5hi5rbckpzhbl1k5r8i53kcys4xdgg0xbi8765dfd";
+ sha256 = "1ws40fglyyk51jvmz8gfapjkw1g51pkch1rffdsbh4b1yay5xc9i";
};
buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib;
diff --git a/pkgs/applications/audio/mpg321/default.nix b/pkgs/applications/audio/mpg321/default.nix
index b68c44278ee1e600c6457e181a40deda00ebfd73..ee0ebf234ce5a82c9acccbdc18bd13aac798abd2 100644
--- a/pkgs/applications/audio/mpg321/default.nix
+++ b/pkgs/applications/audio/mpg321/default.nix
@@ -1,4 +1,8 @@
-{stdenv, fetchurl, libao, libmad, libid3tag, zlib, alsaLib}:
+{stdenv, fetchurl, libao, libmad, libid3tag, zlib, alsaLib
+# Specify default libao output plugin to use (e.g. "alsa", "pulse" …).
+# If null, it will use the libao system default.
+, defaultAudio ? null
+}:
stdenv.mkDerivation rec {
name = "mpg321-${version}";
@@ -11,9 +15,10 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
- configureFlags = [
- ("--enable-alsa=" + (if stdenv.isLinux then "yes" else "no"))
- ];
+ configureFlags =
+ [ ("--enable-alsa=" + (if stdenv.isLinux then "yes" else "no")) ]
+ ++ (stdenv.lib.optional (defaultAudio != null)
+ "--with-default-audio=${defaultAudio}");
buildInputs = [libao libid3tag libmad zlib]
++ stdenv.lib.optional stdenv.isLinux alsaLib;
diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix
index e43120a715d654f7595188c5f9995d0f59bd5199..cb0f35ebc156cda89a3fe435acda20e4c27e7302 100644
--- a/pkgs/applications/audio/ncmpc/default.nix
+++ b/pkgs/applications/audio/ncmpc/default.nix
@@ -1,36 +1,25 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, ncurses, mpd_clientlib, libintlOrEmpty }:
+{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, glib, ncurses
+, mpd_clientlib, gettext }:
stdenv.mkDerivation rec {
name = "ncmpc-${version}";
- version = "0.27";
+ version = "0.28";
src = fetchFromGitHub {
owner = "MusicPlayerDaemon";
repo = "ncmpc";
rev = "v${version}";
- sha256 = "0sfal3wadqvy6yas4xzhw35awdylikci8kbdcmgm4l2afpmc1lrr";
+ sha256 = "1z0bdkqsdb3f5k2lsws3qzav4r30fzk8fhxj9l0p738flcka6k4n";
};
buildInputs = [ glib ncurses mpd_clientlib ];
- # ++ libintlOrEmpty;
- nativeBuildInputs = [ autoreconfHook pkgconfig ];
-
- NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
-
- # without this, po/Makefile.in.in is not being created
- preAutoreconf = ''
- ./autogen.sh
- '';
-
- configureFlags = [
- "--enable-colors"
- "--enable-lyrics-screen"
- ];
+ nativeBuildInputs = [ meson ninja pkgconfig gettext ];
meta = with stdenv.lib; {
description = "Curses-based interface for MPD (music player daemon)";
homepage = http://www.musicpd.org/clients/ncmpc/;
license = licenses.gpl2Plus;
platforms = platforms.all;
+ maintainers = with maintainers; [ fpletz ];
};
}
diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix
index 1923377e56a2041f6fff11b6d7949968a555022e..4452ab23cd5ee53ebb43f3cf05911155c5a27c7a 100644
--- a/pkgs/applications/audio/ncmpcpp/default.nix
+++ b/pkgs/applications/audio/ncmpcpp/default.nix
@@ -12,11 +12,11 @@ assert taglibSupport -> (taglib != null);
with stdenv.lib;
stdenv.mkDerivation rec {
name = "ncmpcpp-${version}";
- version = "0.8";
+ version = "0.8.1";
src = fetchurl {
- url = "http://ncmpcpp.rybczak.net/stable/${name}.tar.bz2";
- sha256 = "0nj6ky805a55acj0w57sbn3vfmmkbqp97rhbi0q9848n10f2l3rg";
+ url = "https://ncmpcpp.rybczak.net/stable/${name}.tar.bz2";
+ sha256 = "1zw8d07b2bkssbsybg6jnmpq001w525viajrnz4jvfml3l55gyad";
};
configureFlags = [ "BOOST_LIB_SUFFIX=" ]
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
meta = {
description = "A featureful ncurses based MPD client inspired by ncmpc";
- homepage = http://ncmpcpp.rybczak.net/;
+ homepage = https://ncmpcpp.rybczak.net/;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ jfrankenau koral lovek323 mornfall ];
platforms = platforms.all;
diff --git a/pkgs/applications/audio/non/default.nix b/pkgs/applications/audio/non/default.nix
index f4e5998c037546c8725c635769614f998239409c..3b429290f7c8c487828767fac054ae952bc3f596 100644
--- a/pkgs/applications/audio/non/default.nix
+++ b/pkgs/applications/audio/non/default.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
sha256 = "080rha4ffp7qycyg1mqcf4vj0s7z8qfvz6bxm0w29xgg2kkmb3fx";
};
- buildInputs = [ pkgconfig python2 cairo libjpeg ntk libjack2 libsndfile
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ python2 cairo libjpeg ntk libjack2 libsndfile
ladspaH liblrdf liblo libsigcxx
];
configurePhase = "python waf configure --prefix=$out";
diff --git a/pkgs/applications/audio/nova-filters/default.nix b/pkgs/applications/audio/nova-filters/default.nix
index b361e6c33ae4600dba3205778f216cf1c3f701b9..6b50ee1426ce52ff003860dd562d30cdf25ebb9a 100644
--- a/pkgs/applications/audio/nova-filters/default.nix
+++ b/pkgs/applications/audio/nova-filters/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "16064vvl2w5lz4xi3lyjk4xx7fphwsxc14ajykvndiz170q32s6i";
};
- buildInputs = [ scons boost ladspaH pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ scons boost ladspaH ];
patchPhase = ''
# remove TERM:
diff --git a/pkgs/applications/audio/openmpt123/default.nix b/pkgs/applications/audio/openmpt123/default.nix
index da0f7484888877d92dc05cb8636f4c63ffff522e..5d13aa7daf42a0b2092510feecb5bfad162129a3 100644
--- a/pkgs/applications/audio/openmpt123/default.nix
+++ b/pkgs/applications/audio/openmpt123/default.nix
@@ -8,7 +8,8 @@ in stdenv.mkDerivation rec {
url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}.tar.gz";
sha256 = "0qp2nnz6pnl1d7yv9hcjyim7q6yax5881k1jxm8jfgjqagmz5k6p";
};
- buildInputs = [ SDL2 pkgconfig flac libsndfile ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ SDL2 flac libsndfile ];
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/padthv1/default.nix b/pkgs/applications/audio/padthv1/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..820ff385c107f627d3d7a6f2ee67da28b6768dc6
--- /dev/null
+++ b/pkgs/applications/audio/padthv1/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, pkgconfig, libjack2, alsaLib, libsndfile, liblo, lv2, qt5, fftw }:
+
+stdenv.mkDerivation rec {
+ name = "padthv1-${version}";
+ version = "0.8.4";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/padthv1/${name}.tar.gz";
+ sha256 = "1p6wfgh90h7gj1j3hlvwik3zj07xamkxbya85va2lsj6fkkkk20r";
+ };
+
+ buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftw ];
+
+ nativeBuildInputs = [ pkgconfig ];
+
+ meta = with stdenv.lib; {
+ description = "polyphonic additive synthesizer";
+ homepage = http://padthv1.sourceforge.net/;
+ license = licenses.gpl2Plus;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.magnetophon ];
+ };
+}
diff --git a/pkgs/applications/audio/pianobar/default.nix b/pkgs/applications/audio/pianobar/default.nix
index 7dc3e00ebf7b0ba6cd0de95f782978d6f2def6d7..8e591487111b9b81a226ab30a0e81f9650dcddc0 100644
--- a/pkgs/applications/audio/pianobar/default.nix
+++ b/pkgs/applications/audio/pianobar/default.nix
@@ -8,8 +8,9 @@ stdenv.mkDerivation rec {
sha256 = "0n9544bfsdp04xqcjm4nhfvp357dx0c3gpys0rjkq09nzv8b1vy6";
};
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig libao json_c libgcrypt libav curl
+ libao json_c libgcrypt libav curl
];
makeFlags="PREFIX=$(out)";
diff --git a/pkgs/applications/audio/playbar2/default.nix b/pkgs/applications/audio/playbar2/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..16d5eb69cb97929fea0e283df403be4a131674a3
--- /dev/null
+++ b/pkgs/applications/audio/playbar2/default.nix
@@ -0,0 +1,37 @@
+{ stdenv
+, cmake
+, extra-cmake-modules
+, plasma-framework
+, kwindowsystem
+, fetchFromGitHub
+}:
+
+stdenv.mkDerivation rec {
+ name = "playbar2-${version}";
+ version = "2.5";
+
+ src = fetchFromGitHub {
+ owner = "audoban";
+ repo = "PlayBar2";
+ rev = "v${version}";
+ sha256 = "0iv2m4flgaz2r0k7f6l0ca8p6cw8j8j2gin1gci2pg3l5g5khbch";
+ };
+
+ nativeBuildInputs = [
+ cmake
+ extra-cmake-modules
+ ];
+
+ buildInputs = [
+ plasma-framework
+ kwindowsystem
+ ];
+
+ meta = with stdenv.lib; {
+ description = "Mpris2 Client for Plasma5";
+ homepage = https://github.com/audoban/PlayBar2;
+ license = licenses.gpl3;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ pjones ];
+ };
+}
diff --git a/pkgs/applications/audio/plugin-torture/default.nix b/pkgs/applications/audio/plugin-torture/default.nix
index 556582c34f7918b67d5437c47672438c18a5ee3c..5529998803cfd0f1fcbe153d382a246a03b772d7 100644
--- a/pkgs/applications/audio/plugin-torture/default.nix
+++ b/pkgs/applications/audio/plugin-torture/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "1xyhvhm85d9z0kw716cjllrrzksn4s4bw34layg8hf4m5m31sp2p";
};
- buildInputs = [ boost ladspaH lilv lv2 pkgconfig serd sord sratom ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ boost ladspaH lilv lv2 serd sord sratom ];
installPhase = ''
mkdir -p $out/bin
diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix
index 52f2a0ff924c85a2b42076bad4094a2a4a06021d..2bb2960afbf10ac5f9b84aed0cba488a95a309c4 100644
--- a/pkgs/applications/audio/praat/default.nix
+++ b/pkgs/applications/audio/praat/default.nix
@@ -18,7 +18,8 @@ stdenv.mkDerivation rec {
cp praat $out/bin
'';
- buildInputs = [ alsaLib gtk2 pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ alsaLib gtk2 ];
meta = {
description = "Doing phonetics by computer";
diff --git a/pkgs/applications/audio/projectm/default.nix b/pkgs/applications/audio/projectm/default.nix
index 7b103286fe2781df562880af3bede62e8f08b4ba..e7aace763a1b77e9e926c4926cfdb6d188ebc1e4 100644
--- a/pkgs/applications/audio/projectm/default.nix
+++ b/pkgs/applications/audio/projectm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, cmake
+{ stdenv, fetchurl, fetchpatch, pkgconfig, cmake
, glew, ftgl, ttf_bitstream_vera
, withQt ? true, qt4
, withLibvisual ? false, libvisual, SDL
@@ -24,7 +24,13 @@ stdenv.mkDerivation {
sha256 = "1vh6jk68a0jdb6qwppb6f8cbgmhnv2ba3bcavzfd6sq06gq08cji";
};
+ patch_gcc6 = fetchpatch {
+ url = https://raw.githubusercontent.com/gentoo/gentoo/45abd63abc6644b6e177c057b5b42d894dbf8e29/media-libs/libprojectm/files/libprojectm-2.1.0-fix-c++14.patch;
+ sha256 = "1i50scxv1jlqvb3jm3sql89a7wqckxhlpvnhz20vvmm1kii6lrsn";
+ };
+
patchPhase = ''
+ patch -d src/libprojectM -p1 -i "$patch_gcc6"
sed -i 's:''${LIBVISUAL_PLUGINSDIR}:''${CMAKE_INSTALL_PREFIX}/lib/libvisual-0.4:' \
src/projectM-libvisual/CMakeLists.txt
'';
diff --git a/pkgs/applications/audio/puddletag/default.nix b/pkgs/applications/audio/puddletag/default.nix
index c140e1a46e551377d7bae8fbe14d7961b3d788b9..00f58750408b38093afd2b978d9217b4f86118a2 100644
--- a/pkgs/applications/audio/puddletag/default.nix
+++ b/pkgs/applications/audio/puddletag/default.nix
@@ -1,20 +1,19 @@
{ stdenv, fetchFromGitHub, python2Packages, makeWrapper, chromaprint }:
-let
- pname = "puddletag";
-
-in python2Packages.buildPythonApplication rec {
- name = "${pname}-${version}";
+python2Packages.buildPythonApplication rec {
+ name = "puddletag-${version}";
version = "1.2.0";
src = fetchFromGitHub {
- owner = "keithgg";
- repo = pname;
- rev = "v${version}";
+ owner = "keithgg";
+ repo = "puddletag";
+ rev = "v${version}";
sha256 = "1g6wa91awy17z5b704yi9kfynnvfm9lkrvpfvwccscr1h8s3qmiz";
};
- sourceRoot = "${pname}-v${version}-src/source";
+ setSourceRoot = ''
+ sourceRoot=$(echo */source)
+ '';
disabled = python2Packages.isPy3k; # work to support python 3 has not begun
@@ -29,17 +28,21 @@ in python2Packages.buildPythonApplication rec {
dontStrip = true; # we are not generating any binaries
installPhase = ''
+ runHook preInstall
+
siteDir=$(toPythonPath $out)
mkdir -p $siteDir
PYTHONPATH=$PYTHONPATH:$siteDir
${python2Packages.python.interpreter} setup.py install --prefix $out
+
+ runHook postInstall
'';
meta = with stdenv.lib; {
- homepage = https://puddletag.net;
+ homepage = https://puddletag.net;
description = "An audio tag editor similar to the Windows program, Mp3tag";
- license = licenses.gpl3;
- platforms = platforms.linux;
+ license = licenses.gpl3;
maintainers = with maintainers; [ peterhoeg ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/audio/qmidiroute/default.nix b/pkgs/applications/audio/qmidiroute/default.nix
index badac0887a1a011b0070ffdb9a540e1da9a2f60d..1e76e769937bba3164a251c99614bdf9c25757d8 100644
--- a/pkgs/applications/audio/qmidiroute/default.nix
+++ b/pkgs/applications/audio/qmidiroute/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "11bfjz14z37v6hk2xyg4vrw423b5h3qgcbviv07g00ws1fgjygm2";
};
- buildInputs = [ pkgconfig qt4 alsaLib ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ qt4 alsaLib ];
meta = with stdenv.lib; {
description = "MIDI event processor and router";
diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix
index b28f66aaad708b775ce450213f6f9e68255ca6e0..77c82f1737c60e2b2304c555b1e9bc03b860be26 100644
--- a/pkgs/applications/audio/qmmp/default.nix
+++ b/pkgs/applications/audio/qmmp/default.nix
@@ -29,11 +29,11 @@
# handle that.
stdenv.mkDerivation rec {
- name = "qmmp-1.1.5";
+ name = "qmmp-1.1.10";
src = fetchurl {
url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2";
- sha256 = "1gfx6nm9v6qrx58gxib6grfhb45mnib1n4wdsnjq16br6bs8h4lv";
+ sha256 = "16hb3s48filq0q18m7x9vmhpirk4fh0aqj8kwbapv8mkcnzq2mqy";
};
buildInputs =
diff --git a/pkgs/applications/audio/qsampler/default.nix b/pkgs/applications/audio/qsampler/default.nix
index 692938884b63324c3e680d6ec2f869a74b06fb01..1211570f9bc53bcb5cc5a4927f1256654c4906c8 100644
--- a/pkgs/applications/audio/qsampler/default.nix
+++ b/pkgs/applications/audio/qsampler/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "17w3vgpgfmvl11wsd5ndk9zdggl3gbzv3wbd45dyf2al4i0miqnx";
};
- buildInputs = [ autoconf automake liblscp libtool pkgconfig qt4 ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ autoconf automake liblscp libtool qt4 ];
preConfigure = "make -f Makefile.svn";
diff --git a/pkgs/applications/audio/qsynth/default.nix b/pkgs/applications/audio/qsynth/default.nix
index 77c0ba9b2d45789e15a556bdf7bf3a2360df0b05..49d9e80be11785baad38b5dcec5026ee09d9dfc0 100644
--- a/pkgs/applications/audio/qsynth/default.nix
+++ b/pkgs/applications/audio/qsynth/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Fluidsynth GUI";
- homepage = http://sourceforge.net/projects/qsynth;
+ homepage = https://sourceforge.net/projects/qsynth;
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = [ maintainers.goibhniu ];
diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix
index fa582d852157b3a3fc2cbe7204449345410938d6..fd328669846f1c26255f0f240b8d41b6e1d91a0a 100644
--- a/pkgs/applications/audio/quodlibet/default.nix
+++ b/pkgs/applications/audio/quodlibet/default.nix
@@ -1,64 +1,44 @@
-{ stdenv, fetchurl, python2Packages, intltool
-, gst-python, withGstPlugins ? false, gst-plugins-base ? null
-, gst-plugins-good ? null, gst-plugins-ugly ? null, gst-plugins-bad ? null }:
-
-assert withGstPlugins -> gst-plugins-base != null
- || gst-plugins-good != null
- || gst-plugins-ugly != null
- || gst-plugins-bad != null;
-
-let
- version = "2.6.3";
- inherit (python2Packages) buildPythonApplication python mutagen pygtk pygobject2 dbus-python;
-in buildPythonApplication {
- # call the package quodlibet and just quodlibet
- name = "quodlibet${stdenv.lib.optionalString (!withGstPlugins) "-without-gst-plugins"}-${version}";
+{ stdenv, fetchurl, python2Packages, wrapGAppsHook, gettext, intltool, libsoup, gnome3,
+ tag ? "",
+ gst_all_1, withGstPlugins ? true,
+ xineBackend ? false, xineLib,
+ withDbusPython ? false, withPyInotify ? false, withMusicBrainzNgs ? false, withPahoMqtt ? false,
+ webkitgtk ? null,
+ keybinder3 ? null, gtksourceview ? null, libmodplug ? null, kakasi ? null, libappindicator-gtk3 ? null }:
+
+let optionals = stdenv.lib.optionals; in
+python2Packages.buildPythonApplication rec {
+ name = "quodlibet${tag}-${version}";
+ version = "3.9.1";
# XXX, tests fail
doCheck = false;
- srcs = [
- (fetchurl {
- url = "https://bitbucket.org/lazka/quodlibet-files/raw/default/releases/quodlibet-${version}.tar.gz";
- sha256 = "0ilasi4b0ay8r6v6ba209wsm80fq2nmzigzc5kvphrk71jwypx6z";
- })
- (fetchurl {
- url = "https://bitbucket.org/lazka/quodlibet-files/raw/default/releases/quodlibet-plugins-${version}.tar.gz";
- sha256 = "1rv08rhdjad8sjhplqsspcf4vkazgkxyshsqmbfbrrk5kvv57ybc";
- })
- ];
-
- preConfigure = ''
- # TODO: for now don't a apply gdist overrides, will be needed for shipping icons, gtk, etc
- sed -i /distclass/d setup.py
- '';
-
- sourceRoot = "quodlibet-${version}";
-
- postUnpack = ''
- # the patch searches for plugins in directory ../plugins
- # so link the appropriate directory there
- ln -sf quodlibet-plugins-${version} plugins
- '';
+ src = fetchurl {
+ url = "https://github.com/quodlibet/quodlibet/releases/download/release-${version}/quodlibet-${version}.tar.gz";
+ sha256 = "d2b42df5d439213973dc97149fddc779a6c90cec389c24baf1c0bdcc39ffe591";
+ };
- patches = [ ./quodlibet-package-plugins.patch ];
+ nativeBuildInputs = [ wrapGAppsHook gettext intltool ];
+ # ++ (with python2Packages; [ pytest pyflakes pycodestyle polib ]); # test deps
- buildInputs = stdenv.lib.optionals withGstPlugins [
- gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad
- ];
+ buildInputs = [ gnome3.defaultIconTheme libsoup webkitgtk keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi ]
+ ++ (if xineBackend then [ xineLib ] else with gst_all_1;
+ [ gstreamer gst-plugins-base ] ++ optionals withGstPlugins [ gst-plugins-good gst-plugins-ugly gst-plugins-bad ]);
- propagatedBuildInputs = [
- mutagen pygtk pygobject2 dbus-python gst-python intltool
- ];
+ propagatedBuildInputs = with python2Packages;
+ [ pygobject3 pycairo mutagen pygtk gst-python feedparser faulthandler futures ]
+ ++ optionals withDbusPython [ dbus-python ]
+ ++ optionals withPyInotify [ pyinotify ]
+ ++ optionals withMusicBrainzNgs [ musicbrainzngs ]
+ ++ optionals stdenv.isDarwin [ pyobjc ]
+ ++ optionals withPahoMqtt [ paho-mqtt ];
- postInstall = stdenv.lib.optionalString withGstPlugins ''
- # Wrap quodlibet so it finds the GStreamer plug-ins
- wrapProgram "$out/bin/quodlibet" --prefix \
- GST_PLUGIN_SYSTEM_PATH ":" "$GST_PLUGIN_SYSTEM_PATH" \
- '';
+ makeWrapperArgs = optionals (kakasi != null) [ "--prefix PATH : ${kakasi}/bin" ];
meta = {
description = "GTK+-based audio player written in Python, using the Mutagen tagging library";
+ license = stdenv.lib.licenses.gpl2;
longDescription = ''
Quod Libet is a GTK+-based audio player written in Python, using
@@ -74,7 +54,7 @@ in buildPythonApplication {
& internet radio, and all major audio formats.
'';
- maintainers = [ stdenv.lib.maintainers.coroa ];
- homepage = http://code.google.com/p/quodlibet/;
+ maintainers = with stdenv.lib.maintainers; [ coroa sauyon ];
+ homepage = https://quodlibet.readthedocs.io/en/latest/;
};
}
diff --git a/pkgs/applications/audio/quodlibet/quodlibet-package-plugins.patch b/pkgs/applications/audio/quodlibet/quodlibet-package-plugins.patch
deleted file mode 100644
index d518f857cf10abb61fa73c04fd745cfd15c65377..0000000000000000000000000000000000000000
--- a/pkgs/applications/audio/quodlibet/quodlibet-package-plugins.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Naur quodlibet-2.5.orig/setup.py quodlibet-2.5.new/setup.py
---- quodlibet-2.5.orig/setup.py 2012-12-19 08:47:41.000000000 +0000
-+++ quodlibet-2.5.new/setup.py 2013-04-22 19:27:07.152631051 +0000
-@@ -337,5 +338,14 @@
- }
- }
- })
-+ else:
-+ from os.path import join
-+
-+ data_files = []
-+ for type in ["playorder", "songsmenu", "editing", "events", "gstreamer"]:
-+ data_files.append((join('quodlibet', 'plugins', type),
-+ glob.glob(join('..', 'plugins', type, '*.py'))))
-+ setup_kwargs.update({ 'data_files': data_files });
-+
- setup(**setup_kwargs)
-
diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..4bc9371dd17b36f81b7e41b7e67591bc51e272a0
--- /dev/null
+++ b/pkgs/applications/audio/radiotray-ng/default.nix
@@ -0,0 +1,96 @@
+{ stdenv, fetchFromGitHub, fetchpatch
+, cmake, pkgconfig
+# Transport
+, curl
+# Libraries
+, boost
+, jsoncpp
+, libbsd
+, pcre
+# GUI/Desktop
+, dbus
+, glibmm
+, gnome3
+, hicolor_icon_theme
+, libappindicator-gtk3
+, libnotify
+, libxdg_basedir
+# GStreamer
+, gst_all_1
+# User-agent info
+, lsb-release
+# rt2rtng
+, python2
+# Testing
+, gmock
+# Fixup
+, wrapGAppsHook
+, makeWrapper
+}:
+
+let
+ gstInputs = with gst_all_1; [
+ gstreamer gst-plugins-base
+ gst-plugins-good gst-plugins-bad gst-plugins-ugly
+ gst-libav
+ ];
+ # For the rt2rtng utility for converting bookmark file to -ng format
+ pythonInputs = with python2.pkgs; [ python2 lxml ];
+in
+stdenv.mkDerivation rec {
+ name = "radiotray-ng-${version}";
+ version = "0.1.7";
+
+ src = fetchFromGitHub {
+ owner = "ebruck";
+ repo = "radiotray-ng";
+ rev = "v${version}";
+ sha256 = "1m853gzh9r249crn0xyrq22x154r005j58b0kq3nsrgi5cps2zdv";
+ };
+
+ nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook makeWrapper ];
+
+ buildInputs = [
+ curl
+ boost jsoncpp libbsd pcre
+ glibmm hicolor_icon_theme gnome3.gsettings_desktop_schemas libappindicator-gtk3 libnotify
+ libxdg_basedir
+ lsb-release
+ ] ++ stdenv.lib.optional doCheck gmock
+ ++ gstInputs
+ ++ pythonInputs;
+
+ prePatch = ''
+ substituteInPlace debian/CMakeLists.txt \
+ --replace /usr $out
+ substituteInPlace include/radiotray-ng/common.hpp \
+ --replace /usr $out
+ '';
+
+ patches = [
+ (fetchpatch {
+ # Fix menu separators and minor touchup to 'version'
+ url = "https://github.com/ebruck/radiotray-ng/commit/827e9f1baaa03ab4d8a5fb3aab043e72950eb965.patch";
+ sha256 = "1aykl6lq4pga34xg5r9mc616gxnd63q6gr8qzg57w6874cj3csrr";
+ })
+ ];
+
+ enableParallelBuilding = true;
+
+ doCheck = true;
+
+ checkPhase = "ctest";
+
+ preFixup = ''
+ gappsWrapperArgs+=(--suffix PATH : ${stdenv.lib.makeBinPath [ dbus ]})
+ wrapProgram $out/bin/rt2rtng --prefix PYTHONPATH : $PYTHONPATH
+ '';
+
+ meta = with stdenv.lib; {
+ description = "An internet radio player for linux";
+ homepage = https://github.com/ebruck/radiotray-ng;
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ dtzWill ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/applications/audio/rhythmbox/default.nix b/pkgs/applications/audio/rhythmbox/default.nix
index e8bea3ec71c05b27acd67b603c945604e7d4acad..534fd2f0edb12f5c6b064ec7db6b2453d49254b7 100644
--- a/pkgs/applications/audio/rhythmbox/default.nix
+++ b/pkgs/applications/audio/rhythmbox/default.nix
@@ -26,9 +26,8 @@ in stdenv.mkDerivation rec {
sha256 = "0f3radhlji7rxl760yl2vm49fvfslympxrpm8497acbmbd7wlhxz";
};
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig
-
python3
perl
perlPackages.XMLParser
diff --git a/pkgs/applications/audio/rkrlv2/default.nix b/pkgs/applications/audio/rkrlv2/default.nix
index 40ff47b9ee1863fee30ebf1fdf915aa94333e25a..3ebdce2b4820fb8292874bc5b9e98c59a977f818 100644
--- a/pkgs/applications/audio/rkrlv2/default.nix
+++ b/pkgs/applications/audio/rkrlv2/default.nix
@@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
sha256 = "0kr3rvq7n1bh47qryyarcpiibms601qd8l1vypmm61969l4d4bn8";
};
- buildInputs = with xorg; [ automake pkgconfig lv2 fftw cmake libXpm libjack2 libsamplerate libsndfile libXft ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = with xorg; [ automake lv2 fftw cmake libXpm libjack2 libsamplerate libsndfile libXft ];
meta = {
description = "Rakarrak effects ported to LV2";
diff --git a/pkgs/applications/audio/rosegarden/default.nix b/pkgs/applications/audio/rosegarden/default.nix
index 00d7559cd58caa2d58a5599f1df219c94bff31d2..5966d4253f51a6d64c251c5fe1d787554fd7a093 100644
--- a/pkgs/applications/audio/rosegarden/default.nix
+++ b/pkgs/applications/audio/rosegarden/default.nix
@@ -1,33 +1,51 @@
-{ stdenv, fetchurl, qt4, pkgconfig, ladspaPlugins, ladspaH,
- dssi, liblo, liblrdf, fftwSinglePrec, libsndfile,
- libsamplerate, perl, makedepend, libjack2,
- withLirc ? false, lirc ? null } :
+{ stdenv, fetchurl, cmake, makedepend, perl, pkgconfig, qttools
+, dssi, fftwSinglePrec, ladspaH, ladspaPlugins, libjack2
+, liblo, liblrdf, libsamplerate, libsndfile, lirc ? null, qtbase }:
stdenv.mkDerivation (rec {
- version = "15.08";
+ version = "17.04";
name = "rosegarden-${version}";
+
src = fetchurl {
- url = "mirror://sourceforge/rosegarden/${name}.tar.bz2";
- sha256 = "1pk24bhpsmvn6rkqgll31na44w03banra1y7kiqd0gajlnw7wlls";
+ url = "mirror://sourceforge/rosegarden/${name}.tar.bz2";
+ sha256 = "1khfcj22asdhjh0jvhkqsz200wgmigkhsrcz09ffia5hqm0n32lq";
};
- QTDIR=qt4;
-
- buildInputs = [ qt4 pkgconfig ladspaPlugins ladspaH dssi liblo liblrdf fftwSinglePrec
- libsndfile libsamplerate perl makedepend libjack2 ]
- ++ stdenv.lib.optional withLirc [ lirc ];
-
- #enableParallelBuilding = true; issues on hydra
-
+ patchPhase = ''
+ substituteInPlace src/CMakeLists.txt --replace svnheader svnversion
+ '';
+
+ nativeBuildInputs = [ cmake makedepend perl pkgconfig qttools ];
+
+ buildInputs = [
+ dssi
+ fftwSinglePrec
+ ladspaH
+ ladspaPlugins
+ libjack2
+ liblo
+ liblrdf
+ libsamplerate
+ libsndfile
+ lirc
+ qtbase
+ ];
+
+ enableParallelBuilding = true;
+
meta = with stdenv.lib; {
homepage = http://www.rosegardenmusic.com/;
description = "Music composition and editing environment";
longDescription = ''
- Rosegarden is a music composition and editing environment based around a MIDI sequencer that features a rich understanding of music notation and includes basic support for digital audio.
- Rosegarden is an easy-to-learn, attractive application that runs on Linux, ideal for composers, musicians, music students, and small studio or home recording environments.
- '';
+ Rosegarden is a music composition and editing environment based around
+ a MIDI sequencer that features a rich understanding of music notation
+ and includes basic support for digital audio.
- maintainers = [ maintainers.lebastr ];
+ Rosegarden is an easy-to-learn, attractive application that runs on Linux,
+ ideal for composers, musicians, music students, and small studio or home
+ recording environments.
+ '';
+ maintainers = with maintainers; [ lebastr ];
license = licenses.lgpl2Plus;
platforms = platforms.linux;
};
diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix
index 10f06e16cf4c8157a57b418913f799181003f520..1eb366d6bbd9530ee6982ea18632c8d4a4b07bbd 100644
--- a/pkgs/applications/audio/samplv1/default.nix
+++ b/pkgs/applications/audio/samplv1/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "samplv1-${version}";
- version = "0.8.0";
+ version = "0.8.4";
src = fetchurl {
url = "mirror://sourceforge/samplv1/${name}.tar.gz";
- sha256 = "0j3hkmd9q0bw9b7nk9cssqywlrishkd1n790a9vq6gh3pdc5sf3r";
+ sha256 = "107p2xsj066q2bil0xcgqrrn7lawp02wzf7qmlajcbnd79jhsi6i";
};
buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qt5.qtbase qt5.qttools];
diff --git a/pkgs/applications/audio/setbfree/default.nix b/pkgs/applications/audio/setbfree/default.nix
index 2a534047ae38e6cd804249de60c7fbbe3f025f81..0eaa9bde14f68ddff3704b88a2f88bf80cac72fc 100644
--- a/pkgs/applications/audio/setbfree/default.nix
+++ b/pkgs/applications/audio/setbfree/default.nix
@@ -17,8 +17,9 @@ stdenv.mkDerivation rec {
-i b_synth/Makefile
'';
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- alsaLib freetype ftgl libjack2 libX11 lv2 mesa pkgconfig
+ alsaLib freetype ftgl libjack2 libX11 lv2 mesa
ttf_bitstream_vera
];
diff --git a/pkgs/applications/audio/sisco.lv2/default.nix b/pkgs/applications/audio/sisco.lv2/default.nix
index 8ac7a9115ca8e19483a5fd8410e20e7b0f0a51ea..a60c3bef0daacf767c2565cb7df23f9bef54977d 100644
--- a/pkgs/applications/audio/sisco.lv2/default.nix
+++ b/pkgs/applications/audio/sisco.lv2/default.nix
@@ -27,7 +27,8 @@ stdenv.mkDerivation rec {
srcs = [ src robtkSrc ];
sourceRoot = src.name;
- buildInputs = [ pkgconfig lv2 pango cairo libjack2 mesa ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ lv2 pango cairo libjack2 mesa ];
postUnpack = "chmod u+w -R ${robtkName}-src; mv ${robtkName}-src/* ${sourceRoot}/robtk";
sisco_VERSION = version;
diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix
index da76d7f16db17710d8e05a6efa21fa8c7b89e1c1..1932ec3d93bc0ec35b0658f7c1f1c408e50b32f7 100644
--- a/pkgs/applications/audio/snd/default.nix
+++ b/pkgs/applications/audio/snd/default.nix
@@ -4,11 +4,11 @@
}:
stdenv.mkDerivation rec {
- name = "snd-16.9";
+ name = "snd-17.8";
src = fetchurl {
url = "mirror://sourceforge/snd/${name}.tar.gz";
- sha256 = "1rw9wrj1f0g413ya32s9mwhvv3c6iasjza22irzf6xlv49b9s5dp";
+ sha256 = "161bx2xgz692iqmsmhv9yi8rvd7y31si4rniizwirwz7q4y4vwvf";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix
index 9f8ad3e649b6ac767c808482f587d3cbe3c827ee..e91c08c30b77f3559cf0d071f797ba9b79f293eb 100644
--- a/pkgs/applications/audio/sonata/default.nix
+++ b/pkgs/applications/audio/sonata/default.nix
@@ -16,8 +16,9 @@ in buildPythonApplication rec {
disabled = !isPy3k;
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig intltool wrapGAppsHook
+ intltool wrapGAppsHook
gnome3.gnome_themes_standard gnome3.defaultIconTheme
gnome3.gsettings_desktop_schemas
];
diff --git a/pkgs/applications/audio/sonic-pi/default.nix b/pkgs/applications/audio/sonic-pi/default.nix
index 3c7be51554d8d5234348e64ee623609b25c6bf37..d1c48ce44ed8338ae812d67414ea4dbf18c4f5a7 100644
--- a/pkgs/applications/audio/sonic-pi/default.nix
+++ b/pkgs/applications/audio/sonic-pi/default.nix
@@ -1,24 +1,33 @@
{ stdenv
, fetchFromGitHub
-, qscintilla
-, supercollider
+, fftwSinglePrec
, ruby
+, libffi
+, aubio
, cmake
, pkgconfig
-, qt48Full
+, qt5
+, libsForQt5
+, boost
, bash
, makeWrapper
+, jack2Full
}:
-stdenv.mkDerivation rec {
- version = "2.9.0";
+let
+ supercollider = libsForQt5.callPackage ../../../development/interpreters/supercollider {
+ fftw = fftwSinglePrec;
+ };
+
+in stdenv.mkDerivation rec {
+ version = "3.0.1";
name = "sonic-pi-${version}";
src = fetchFromGitHub {
owner = "samaaron";
repo = "sonic-pi";
rev = "v${version}";
- sha256 = "19db5dxrf6h1v2w3frds5g90nb6izd9ppp7cs2xi6i0m67l6jrwb";
+ sha256 = "1l1892hijp1dj2h799sfjr699q6xp660n0siibab5kv238521a81";
};
buildInputs = [
@@ -26,24 +35,18 @@ stdenv.mkDerivation rec {
cmake
makeWrapper
pkgconfig
- qscintilla
- qt48Full
+ qt5.qtbase
+ libsForQt5.qscintilla
+ libsForQt5.qwt
ruby
+ libffi
+ aubio
supercollider
+ boost
];
- meta = {
- homepage = http://sonic-pi.net/;
- description = "Free live coding synth for everyone originally designed to support computing and music lessons within schools";
- license = stdenv.lib.licenses.mit;
- maintainers = [ stdenv.lib.maintainers.Phlogistique ];
- platforms = stdenv.lib.platforms.linux;
- };
-
dontUseCmakeConfigure = true;
- patches = [ ./fixed-prefixes.patch ];
-
preConfigure = ''
patchShebangs .
substituteInPlace app/gui/qt/mainwindow.cpp \
@@ -52,18 +55,45 @@ stdenv.mkDerivation rec {
'';
buildPhase = ''
+ export SONIC_PI_HOME=$TMPDIR
+ export AUBIO_LIB=${aubio}/lib/libaubio.so
+
pushd app/server/bin
./compile-extensions.rb
+ ./i18n-tool.rb -t
popd
pushd app/gui/qt
- ./rp-build-app
+ cp -f ruby_help.tmpl ruby_help.h
+ ../../server/bin/qt-doc.rb -o ruby_help.h
+
+ substituteInPlace SonicPi.pro \
+ --replace "LIBS += -lrt -lqt5scintilla2" \
+ "LIBS += -lrt -lqscintilla2 -lqwt"
+
+ lrelease SonicPi.pro
+ qmake SonicPi.pro
+
+ make
popd
'';
installPhase = ''
+ runHook preInstall
+
cp -r . $out
- wrapProgram $out/bin/sonic-pi --prefix PATH : \
- ${ruby}/bin:${bash}/bin
+ wrapProgram $out/bin/sonic-pi \
+ --prefix PATH : ${ruby}/bin:${bash}/bin:${supercollider}/bin:${jack2Full}/bin \
+ --set AUBIO_LIB "${aubio}/lib/libaubio.so"
+
+ runHook postInstall
'';
+
+ meta = {
+ homepage = http://sonic-pi.net/;
+ description = "Free live coding synth for everyone originally designed to support computing and music lessons within schools";
+ license = stdenv.lib.licenses.mit;
+ maintainers = with stdenv.lib.maintainers; [ Phlogistique kamilchm ];
+ platforms = stdenv.lib.platforms.linux;
+ };
}
diff --git a/pkgs/applications/audio/sonic-pi/fixed-prefixes.patch b/pkgs/applications/audio/sonic-pi/fixed-prefixes.patch
deleted file mode 100644
index 7b045a41cba1ee90036f809b4fa61c360584a7f1..0000000000000000000000000000000000000000
--- a/pkgs/applications/audio/sonic-pi/fixed-prefixes.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/app/gui/qt/mainwindow.cpp b/app/gui/qt/mainwindow.cpp
-index 0af6cf7..97c17ad 100644
---- a/app/gui/qt/mainwindow.cpp
-+++ b/app/gui/qt/mainwindow.cpp
-@@ -677,28 +677,9 @@ void MainWindow::startServer(){
-
- serverProcess = new QProcess();
-
-- QString root = rootPath();
--
-- #if defined(Q_OS_WIN)
-- QString prg_path = root + "/app/server/native/windows/ruby/bin/ruby.exe";
-- QString prg_arg = root + "/app/server/bin/sonic-pi-server.rb";
-- sample_path = root + "/etc/samples";
-- #elif defined(Q_OS_MAC)
-- QString prg_path = root + "/server/native/osx/ruby/bin/ruby";
-- QString prg_arg = root + "/server/bin/sonic-pi-server.rb";
-- sample_path = root + "/etc/samples";
-- #else
-- //assuming Raspberry Pi
-- QString prg_path = root + "/app/server/native/raspberry/ruby/bin/ruby";
-- QFile file(prg_path);
-- if(!file.exists()) {
-- // use system ruby if bundled ruby doesn't exist
-- prg_path = "/usr/bin/ruby";
-- }
--
-- QString prg_arg = root + "/app/server/bin/sonic-pi-server.rb";
-- sample_path = root + "/etc/samples";
-- #endif
-+ QString prg_path = "@ruby@";
-+ QString prg_arg = "@out@/app/server/bin/sonic-pi-server.rb";
-+ sample_path = "@out@/etc/samples";
-
- prg_path = QDir::toNativeSeparators(prg_path);
- prg_arg = QDir::toNativeSeparators(prg_arg);
diff --git a/pkgs/applications/audio/sorcer/default.nix b/pkgs/applications/audio/sorcer/default.nix
index 979f15d4006b02114ce0df2b43a3638b023d352d..cf0b5db81f620989e619e925a2ac6828b9d3f341 100644
--- a/pkgs/applications/audio/sorcer/default.nix
+++ b/pkgs/applications/audio/sorcer/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "1x7pi77nal10717l02qpnhrx6d7w5nqrljkn9zx5w7gpb8fpb3vp";
};
- buildInputs = [ boost cairomm cmake libsndfile lv2 ntk pkgconfig python ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ boost cairomm cmake libsndfile lv2 ntk python ];
installPhase = ''
make install
diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/pkgs/applications/audio/sound-juicer/default.nix
index ba550580cba57df790ffc4c593ac6fe6cadd2de9..cbcdc0ecccd77815ce17b074a2a5007f966bb79d 100644
--- a/pkgs/applications/audio/sound-juicer/default.nix
+++ b/pkgs/applications/audio/sound-juicer/default.nix
@@ -15,7 +15,8 @@ in stdenv.mkDerivation rec {
sha256 = "0mx6n901vb97hsv0cwaafjffj75s1kcp8jsqay90dy3099849dyz";
};
- buildInputs = [ pkgconfig gtk3 intltool itstool libxml2 brasero libcanberra_gtk3
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gtk3 intltool itstool libxml2 brasero libcanberra_gtk3
gnome3.gsettings_desktop_schemas libmusicbrainz5 libdiscid isocodes
makeWrapper (stdenv.lib.getLib gnome3.dconf)
gst_all_1.gstreamer gst_all_1.gst-plugins-base
diff --git a/pkgs/applications/audio/soundscape-renderer/default.nix b/pkgs/applications/audio/soundscape-renderer/default.nix
index c6609814ea0bd4e309493dfa1d91518b1f8603a0..7daae31a468b20475fbae6bce5136819e1a97e3f 100644
--- a/pkgs/applications/audio/soundscape-renderer/default.nix
+++ b/pkgs/applications/audio/soundscape-renderer/default.nix
@@ -30,7 +30,8 @@ stdenv.mkDerivation rec {
LC_ALL = "en_US.UTF-8";
- buildInputs = [ autoreconfHook boost boost.dev ecasound mesa help2man pkgconfig libsndfile fftwFloat libjack2 libxml2 qt4 glibcLocales ];
+ nativeBuildInputs = [ autoreconfHook pkgconfig ];
+ buildInputs = [ boost boost.dev ecasound mesa help2man libsndfile fftwFloat libjack2 libxml2 qt4 glibcLocales ];
# 1) Fix detecting version. https://github.com/SoundScapeRenderer/ssr/pull/53
# 2) Make it find ecasound headers
diff --git a/pkgs/applications/audio/spectrojack/default.nix b/pkgs/applications/audio/spectrojack/default.nix
index 83848671a3e5d86fbb2ef95bb5195b6ecce222d8..86eefc395569001f5b81761c51718b26159654fc 100644
--- a/pkgs/applications/audio/spectrojack/default.nix
+++ b/pkgs/applications/audio/spectrojack/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
url = "http://sed.free.fr/spectrojack/${name}.tar.gz";
sha256 = "0p5aa55hnazv5djw0431mza068h7mjkb9pnglxfpqkx5z0czisdx";
};
- buildInputs = [ pkgconfig libjack2 fftwFloat gtk2 ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ libjack2 fftwFloat gtk2 ];
configurePhase= ''
sed -i 's/.*home.*/#&/' ./Makefile
substituteInPlace ./Makefile \
diff --git a/pkgs/applications/audio/spek/default.nix b/pkgs/applications/audio/spek/default.nix
index 32aac686043c9b42fcf6cd230e86fc4785720fd0..8af7888f74bb30234932b01a3e8dbde7e7d22d95 100644
--- a/pkgs/applications/audio/spek/default.nix
+++ b/pkgs/applications/audio/spek/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "0y4hlhswpqkqpsglrhg5xbfy1a6f9fvasgdf336vhwcjqsc3k2xv";
};
- buildInputs = [ autoconf automake intltool pkgconfig ffmpeg wxGTK ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ autoconf automake intltool ffmpeg wxGTK ];
preConfigure = ''
./autogen.sh
diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index ad0f7ee14c5a2b8d69aa3883bc5d33ab75f3d766..249bbe0d8fb7036118823bbc605aa22acc08a92d 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -9,7 +9,7 @@ let
# Latest version number can be found at:
# http://repository-origin.spotify.com/pool/non-free/s/spotify-client/
# Be careful not to pick the testing version.
- version = "1.0.49.125.g72ee7853-111";
+ version = "1.0.64.407.g9bd02c2d-26";
deps = [
alsaLib
@@ -54,7 +54,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "https://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb";
- sha256 = "0l008x06d257vcw6gq3q90hvv93cq6mxpj11by1np6bzzg61qv8x";
+ sha256 = "0zc8vclf1wx60yllc1jgzhqyv5lkwz95qmmy5f79zkj6vrdak5wc";
};
buildInputs = [ dpkg makeWrapper ];
diff --git a/pkgs/applications/audio/streamripper/default.nix b/pkgs/applications/audio/streamripper/default.nix
index 2df1e1e3b3b5141e945a215cdb47263414f4fcec..0fb1b77e708147522b4dbaa5a244595fc8117b8f 100644
--- a/pkgs/applications/audio/streamripper/default.nix
+++ b/pkgs/applications/audio/streamripper/default.nix
@@ -9,13 +9,14 @@ stdenv.mkDerivation rec {
sha256 = "0hnyv3206r0rfprn3k7k6a0j959kagsfyrmyjm3gsf3vkhp5zmy1";
};
- buildInputs = [ pkgconfig glib libogg libvorbis ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ glib libogg libvorbis ];
meta = with stdenv.lib; {
homepage = http://streamripper.sourceforge.net/;
description = "Application that lets you record streaming mp3 to your hard drive";
license = licenses.gpl2;
- platforms = platforms.unix;
+ platforms = platforms.linux;
maintainers = with maintainers; [ the-kenny ];
};
}
diff --git a/pkgs/applications/audio/swh-lv2/default.nix b/pkgs/applications/audio/swh-lv2/default.nix
index faa895e2e309e5baaccaa868fe734a7d305ac130..26ea4614920393bf68557c5fe958a0982cd699c3 100644
--- a/pkgs/applications/audio/swh-lv2/default.nix
+++ b/pkgs/applications/audio/swh-lv2/default.nix
@@ -14,7 +14,8 @@ stdenv.mkDerivation rec {
sed -e "s#PREFIX = /usr/local#PREFIX = $out#" -i Makefile
'';
- buildInputs = [ fftwSinglePrec lv2 pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ fftwSinglePrec lv2 ];
installPhase = "make install-system";
diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix
index c7932a132d75bffec56bef38e62a27fdad6d95e2..2f5a4ebb43f2eea3f48041d62ab67637b1cf3505 100644
--- a/pkgs/applications/audio/synthv1/default.nix
+++ b/pkgs/applications/audio/synthv1/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "synthv1-${version}";
- version = "0.8.0";
+ version = "0.8.4";
src = fetchurl {
url = "mirror://sourceforge/synthv1/${name}.tar.gz";
- sha256 = "155pfyhr6d35ciw95pbxlqy7751cmij8j5d849rvblqbjzyzb5qx";
+ sha256 = "0awk2zx0xa6vl6ah24zz0k2mwsx50hh5g1rh32mp790fp4x7l5s8";
};
buildInputs = [ qt5.qtbase qt5.qttools libjack2 alsaLib liblo lv2 ];
diff --git a/pkgs/applications/audio/timemachine/default.nix b/pkgs/applications/audio/timemachine/default.nix
index 55e95c0fc15660e5e4c886b17bbe32ec6cf2ebdf..8837566b13d09f9d551f2d01a2e95ee4ed42e831 100644
--- a/pkgs/applications/audio/timemachine/default.nix
+++ b/pkgs/applications/audio/timemachine/default.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
sha256 = "0w5alysixnvlkfl79wf7vs5wsw2vgxl3gqxxcm0zbmhjdpmjpcal";
};
- buildInputs = [ autoconf automake pkgconfig gtk2 libjack2
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ autoconf automake gtk2 libjack2
libsndfile
];
diff --git a/pkgs/applications/audio/tomahawk/default.nix b/pkgs/applications/audio/tomahawk/default.nix
index 2787c65fc547b18b3904bab3ad9e41abbb7dec25..364949b2241650d76e3559a7796c663beb8c4eea 100644
--- a/pkgs/applications/audio/tomahawk/default.nix
+++ b/pkgs/applications/audio/tomahawk/default.nix
@@ -25,8 +25,9 @@ stdenv.mkDerivation rec {
"-DLUCENEPP_LIBRARY_DIR=${lucenepp}/lib"
];
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- cmake pkgconfig attica boost gnutls libechonest liblastfm lucenepp phonon
+ cmake attica boost gnutls libechonest liblastfm lucenepp phonon
qca2 qjson qt4 qtkeychain quazip sparsehash taglib websocketpp
makeWrapper
] ++ stdenv.lib.optional enableXMPP libjreen
diff --git a/pkgs/applications/audio/uade123/default.nix b/pkgs/applications/audio/uade123/default.nix
index 0a07e97270c41697584fccda419cb1f503dac42f..de39c8ecc1cb6fdd1a200731523627fd82ba7c08 100644
--- a/pkgs/applications/audio/uade123/default.nix
+++ b/pkgs/applications/audio/uade123/default.nix
@@ -8,7 +8,8 @@ in stdenv.mkDerivation rec {
url = "http://zakalwe.fi/uade/uade2/uade-${version}.tar.bz2";
sha256 = "04nn5li7xy4g5ysyjjngmv5d3ibxppkbb86m10vrvadzxdd4w69v";
};
- buildInputs = [ which libao pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ which libao ];
meta = with stdenv.lib; {
description = "Plays old Amiga tunes through UAE emulation and cloned m68k-assembler Eagleplayer API";
diff --git a/pkgs/applications/audio/vimpc/default.nix b/pkgs/applications/audio/vimpc/default.nix
index 25292a4408f91f8c48d40bdb70277fcaa93a8d23..37ccbb1425ff966bdf95accfa265cb26a64438fc 100644
--- a/pkgs/applications/audio/vimpc/default.nix
+++ b/pkgs/applications/audio/vimpc/default.nix
@@ -2,17 +2,20 @@
, taglib }:
stdenv.mkDerivation rec {
- version = "0.09.0";
+ version = "0.09.1";
name = "vimpc-${version}";
src = fetchFromGitHub {
owner = "boysetsfrog";
repo = "vimpc";
- rev = "v${version}";
- sha256 = "1z9yx2pz84lyng1ig9y4z6pdalwxb80ig7nnzhqfy3pl36hq6shi";
+ # Using commit-hash as there is not tag available
+ # https://github.com/boysetsfrog/vimpc/issues/70
+ rev = "63556da6b94ab27d7e3f542399f5e0975a5812ba";
+ sha256 = "1495a702df4nja8mlxq98mkbic2zv88sjiinimf9qddrfb38jxk6";
};
- buildInputs = [ autoreconfHook mpd_clientlib ncurses pcre pkgconfig taglib ];
+ nativeBuildInputs = [ autoreconfHook pkgconfig ];
+ buildInputs = [ mpd_clientlib ncurses pcre taglib ];
postInstall = ''
mkdir -p $out/etc
diff --git a/pkgs/applications/audio/vorbis-tools/default.nix b/pkgs/applications/audio/vorbis-tools/default.nix
index 1f85f4423548446be38e18870ad1532f1351c80b..6b9af119859eff111265b9a2922a6ee7a0eed20f 100644
--- a/pkgs/applications/audio/vorbis-tools/default.nix
+++ b/pkgs/applications/audio/vorbis-tools/default.nix
@@ -20,7 +20,8 @@ stdenv.mkDerivation {
done
'';
- buildInputs = [ libogg libvorbis libao pkgconfig curl speex flac ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ libogg libvorbis libao curl speex flac ];
meta = with stdenv.lib; {
description = "Extra tools for Ogg-Vorbis audio codec";
diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix
index 75368c6633bebe83e3425a30d0a03159ad4a17e0..0c151697e8979e602344930d5e2a075b1bdca95d 100644
--- a/pkgs/applications/audio/x42-plugins/default.nix
+++ b/pkgs/applications/audio/x42-plugins/default.nix
@@ -11,7 +11,16 @@ stdenv.mkDerivation rec {
sha256 = "0yi82rak2277x4nzzr5zwbsnha5pi61w975c8src2iwar2b6m0xg";
};
- buildInputs = [ mesa_glu ftgl freefont_ttf libjack2 libltc libsndfile libsamplerate lv2 gtk2 cairo pango fftwFloat pkgconfig zita-convolver];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ mesa_glu ftgl freefont_ttf libjack2 libltc libsndfile libsamplerate lv2 gtk2 cairo pango fftwFloat zita-convolver ];
+
+ # Don't remove this. The default fails with 'do not know how to unpack source archive'
+ # every now and then on Hydra. No idea why.
+ unpackPhase = ''
+ tar xf $src
+ sourceRoot=$(echo x42-plugins-*)
+ chmod -R u+w $sourceRoot
+ '';
makeFlags = [ "PREFIX=$(out)" "FONTFILE=${freefont_ttf}/share/fonts/truetype/FreeSansBold.ttf" ];
diff --git a/pkgs/applications/audio/xmp/default.nix b/pkgs/applications/audio/xmp/default.nix
index 10b5bc0c117de672d45ec6817a6aa0116615aca2..9aa24738c37924563ddd3235fbcf3db9bdd95852 100644
--- a/pkgs/applications/audio/xmp/default.nix
+++ b/pkgs/applications/audio/xmp/default.nix
@@ -15,5 +15,6 @@ stdenv.mkDerivation rec {
sha256 = "0gjylvvmq7ha0nhcjg56qfp0xxpsrcsj7y5r914svd5x1ppmzm5n";
};
- buildInputs = [ pkgconfig alsaLib libxmp ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ alsaLib libxmp ];
}
diff --git a/pkgs/applications/audio/ympd/default.nix b/pkgs/applications/audio/ympd/default.nix
index 672237a8462f837cc025b753f5cc091120b0322f..c3e8efae7fe9d589b7f3be0720dadd73a45005d2 100644
--- a/pkgs/applications/audio/ympd/default.nix
+++ b/pkgs/applications/audio/ympd/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "1nvb19jd556v2h2bi7w4dcl507p3p8xvjkqfzrcsy7ccy3502brq";
};
- buildInputs = [ cmake pkgconfig mpd_clientlib openssl ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ cmake mpd_clientlib openssl ];
meta = {
homepage = http://www.ympd.org;
diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix
index ef10bfed9b66d8aa62c96a9056e8693be078a0e8..2b79718809ff239680abbcec18aed0881f8a01b1 100644
--- a/pkgs/applications/audio/yoshimi/default.nix
+++ b/pkgs/applications/audio/yoshimi/default.nix
@@ -6,11 +6,11 @@ assert stdenv ? glibc;
stdenv.mkDerivation rec {
name = "yoshimi-${version}";
- version = "1.5.0";
+ version = "1.5.3";
src = fetchurl {
url = "mirror://sourceforge/yoshimi/${name}.tar.bz2";
- sha256 = "10s1i18xlmvqfrnr0zn2mj2b28i7p62dlqzzzkmpaapqj1gsgpz5";
+ sha256 = "0sns35pyw2f74xrv1fxiyf9g9415kvh2rrbdjd60hsiv584nlari";
};
buildInputs = [
diff --git a/pkgs/applications/audio/zam-plugins/default.nix b/pkgs/applications/audio/zam-plugins/default.nix
index ecb7d9bceec61d065d515873c3ebd10be8cf8de7..f81aad4e2af188fcf9a5c0fbd9907761aa41aac9 100644
--- a/pkgs/applications/audio/zam-plugins/default.nix
+++ b/pkgs/applications/audio/zam-plugins/default.nix
@@ -2,16 +2,17 @@
stdenv.mkDerivation rec {
name = "zam-plugins-${version}";
- version = "3.8";
+ version = "3.9";
src = fetchgit {
url = "https://github.com/zamaudio/zam-plugins.git";
deepClone = true;
- rev = "830ab2e9dd1db8cf56d12c71057157e5d8e9fd74";
- sha256 = "1hyly5inis59cvh0r7lyi203h8v5jh84ca9jpaljm53cvw6d93px";
+ rev = "4976cf204074c1dfaf344821e83e8d896b35107d";
+ sha256 = "1xgwl51sf2hgc5ikcnycyxaw9vy82lrcswn07b6av6i67qclm8f8";
};
- buildInputs = [ boost libX11 mesa liblo libjack2 ladspaH lv2 pkgconfig rubberband libsndfile ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ boost libX11 mesa liblo libjack2 ladspaH lv2 rubberband libsndfile ];
patchPhase = ''
patchShebangs ./dpf/utils/generate-ttl.sh
diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..c330aeb0092c2d3681d5f34273bfdb7bce06596d
--- /dev/null
+++ b/pkgs/applications/backup/deja-dup/default.nix
@@ -0,0 +1,83 @@
+{ stdenv, fetchurl, meson, ninja, pkgconfig, vala_0_38, gettext
+, gnome3, libnotify, intltool, itstool, glib, gtk3, libxml2
+, coreutils, libsecret, pcre, libxkbcommon, wrapGAppsHook
+, libpthreadstubs, libXdmcp, epoxy, at_spi2_core, dbus, libgpgerror
+, appstream-glib, desktop_file_utils, atk, pango, duplicity
+}:
+
+stdenv.mkDerivation rec {
+ name = "deja-dup-${version}";
+ version = "36.3";
+
+ src = fetchurl {
+ url = "https://launchpad.net/deja-dup/36/${version}/+download/deja-dup-${version}.tar.xz";
+ sha256 = "08pwybzp7ynfcf0vqxfc3p8ir4gnzcv4v4cq5bwidbff9crklhrc";
+ };
+
+ patches = [
+ ./fix-paths.patch
+ ];
+
+ postPatch = ''
+ substituteInPlace libdeja/tools/duplicity/DuplicityInstance.vala --replace \
+ "/bin/rm" \
+ "${coreutils}/bin/rm"
+ '';
+
+ # couldn't find gio/gdesktopappinfo.h
+ NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
+
+ nativeBuildInputs = [
+ meson ninja pkgconfig vala_0_38 gettext intltool itstool
+ appstream-glib desktop_file_utils libxml2 wrapGAppsHook
+ ];
+
+ buildInputs = [
+ libnotify gnome3.libpeas glib gtk3 libsecret
+ pcre libxkbcommon libpthreadstubs libXdmcp epoxy gnome3.nautilus
+ at_spi2_core dbus gnome3.gnome_online_accounts libgpgerror
+ ];
+
+ propagatedUserEnvPkgs = [ duplicity ];
+
+ postInstall = ''
+ glib-compile-schemas $out/share/glib-2.0/schemas
+ '';
+
+ # Manual rpath definition until https://github.com/mesonbuild/meson/issues/314 is fixed
+ postFixup =
+ let
+ rpath = stdenv.lib.makeLibraryPath [
+ glib
+ gtk3
+ gnome3.gnome_online_accounts
+ gnome3.libpeas
+ gnome3.nautilus
+ libgpgerror
+ libsecret
+ # Transitive
+ atk
+ pango
+ ];
+ in ''
+ # Unwrap accidentally wrapped library
+ mv $out/libexec/deja-dup/tools/.libduplicity.so-wrapped $out/libexec/deja-dup/tools/libduplicity.so
+
+ for elf in "$out"/bin/.*-wrapped "$out"/libexec/deja-dup/.deja-dup-monitor-wrapped "$out"/libexec/deja-dup/tools/*.so "$out"/lib/deja-dup/*.so "$out"/lib/nautilus/extensions-3.0/*.so; do
+ patchelf --set-rpath '${rpath}':"$out/lib/deja-dup" "$elf"
+ done
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A simple backup tool";
+ longDescription = ''
+ Déjà Dup is a simple backup tool. It hides the complexity \
+ of backing up the Right Way (encrypted, off-site, and regular) \
+ and uses duplicity as the backend.
+ '';
+ homepage = https://launchpad.net/deja-dup;
+ license = with licenses; gpl3;
+ maintainers = with maintainers; [ jtojnar joncojonathan ];
+ platforms = with platforms; linux;
+ };
+}
diff --git a/pkgs/applications/backup/deja-dup/fix-paths.patch b/pkgs/applications/backup/deja-dup/fix-paths.patch
new file mode 100644
index 0000000000000000000000000000000000000000..1cc57e6a54a2d65ec1b779fbbf2d27dc05037f05
--- /dev/null
+++ b/pkgs/applications/backup/deja-dup/fix-paths.patch
@@ -0,0 +1,12 @@
+diff --git a/deja-dup/nautilus/meson.build b/deja-dup/nautilus/meson.build
+index 04b136f3..ed8f7cba 100644
+--- a/deja-dup/nautilus/meson.build
++++ b/deja-dup/nautilus/meson.build
+@@ -31,6 +31,6 @@ shared_module('deja-dup', ['NautilusExtension.c'],
+ link_with: [dirhandling],
+ dependencies: [nautilus_dep],
+ install: true,
+- install_dir: nautilus_dep.get_pkgconfig_variable('extensiondir'))
++ install_dir: join_paths(get_option('libdir'), 'nautilus', 'extensions-3.0'))
+
+ endif
diff --git a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix
index 235d4d16a405ec8f3e1d454adba485d697234208..9dd7eb2a29941330ed7b186c0c712af5f6c44787 100644
--- a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix
+++ b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix
@@ -26,7 +26,8 @@ stdenv.mkDerivation rec {
})
];
- buildInputs = [ pkgconfig lightdm intltool makeWrapper ]
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ lightdm intltool makeWrapper ]
++ (if useGTK2 then [ gtk2 ] else [ gtk3 ]);
configureFlags = [
diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix
index 191ec84f87bfc701b88a098ee9d8bd6d176805ff..e82d4c69def6801cd82f16d2ce3f8652b6fe29cf 100644
--- a/pkgs/applications/display-managers/lightdm/default.nix
+++ b/pkgs/applications/display-managers/lightdm/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pam, pkgconfig, libxcb, glib, libXdmcp, itstool, libxml2
-, intltool, xlibsWrapper, libxklavier, libgcrypt, libaudit, gcc6
+, intltool, xlibsWrapper, libxklavier, libgcrypt, libaudit
, qt4 ? null
, withQt5 ? false, qtbase
}:
@@ -7,21 +7,21 @@
with stdenv.lib;
let
- ver_branch = "1.22";
- version = "1.22.0";
+ ver_branch = "1.24";
+ version = "1.24.0";
in
stdenv.mkDerivation rec {
name = "lightdm-${version}";
src = fetchurl {
url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.xz";
- sha256 = "0a5bvfl2h7r873al6q7c819h0kg564k9fh51rl6489z6lyvazfg4";
+ sha256 = "18j33bm54i8k7ncxcs69zqi4105s62n58jrydqn3ikrb71s9nl6d";
};
nativeBuildInputs = [ pkgconfig intltool ];
buildInputs = [
pam libxcb glib libXdmcp itstool libxml2 libxklavier libgcrypt
- qt4 libaudit gcc6
+ qt4 libaudit
] ++ optional withQt5 qtbase;
configureFlags = [
diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix
index 920e5ba9abd29fa465be4f18748449210a27490f..86a963bdac48c314d71041ed9c60c25e102ff6bd 100644
--- a/pkgs/applications/display-managers/sddm/default.nix
+++ b/pkgs/applications/display-managers/sddm/default.nix
@@ -1,17 +1,11 @@
-{ mkDerivation, lib, copyPathsToStore, fetchFromGitHub, fetchpatch
+{ mkDerivation, lib, fetchFromGitHub, fetchpatch
, cmake, extra-cmake-modules, pkgconfig, libxcb, libpthreadstubs, lndir
, libXdmcp, libXau, qtbase, qtdeclarative, qttools, pam, systemd
}:
let
- version = "0.14.0";
-
- /* Fix display of user avatars. */
- patchFixUserAvatars = fetchpatch {
- url = https://github.com/sddm/sddm/commit/ecb903e48822bd90650bdd64fe80754e3e9664cb.patch;
- sha256 = "0zm88944pwdad8grmv0xwnxl23xml85ryc71x2xac233jxdyx6ms";
- };
+ version = "0.16.0";
in mkDerivation rec {
name = "sddm-${version}";
@@ -20,12 +14,10 @@ in mkDerivation rec {
owner = "sddm";
repo = "sddm";
rev = "v${version}";
- sha256 = "0wwid23kw0725zpw67zchalg9mmharr7sn4yzhijq7wqpsczjfxj";
+ sha256 = "1j0rc8nk8bz7sxa0bc6lx9v7r3zlcfyicngfjqb894ni9k71kzsb";
};
- patches =
- copyPathsToStore (lib.readPathsFromFile ./. ./series)
- ++ [ patchFixUserAvatars ];
+ patches = [ ./sddm-ignore-config-mtime.patch ];
postPatch =
# Module Qt5::Test must be included in `find_package` before it is used.
@@ -57,12 +49,16 @@ in mkDerivation rec {
postInstall = ''
# remove empty scripts
rm "$out/share/sddm/scripts/Xsetup" "$out/share/sddm/scripts/Xstop"
+ for f in $out/share/sddm/themes/**/theme.conf ; do
+ substituteInPlace $f \
+ --replace 'background=' "background=$(dirname $f)/"
+ done
'';
meta = with lib; {
description = "QML based X11 display manager";
- homepage = https://github.com/sddm/sddm;
- platforms = platforms.linux;
+ homepage = https://github.com/sddm/sddm;
maintainers = with maintainers; [ abbradar ttuegel ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/display-managers/sddm/sddm-ignore-config-mtime.patch b/pkgs/applications/display-managers/sddm/sddm-ignore-config-mtime.patch
index 836df2de292d095541d689ca4cf4b9a9c731ef44..aac09dfe876b52649d8beebe27810227c5677589 100644
--- a/pkgs/applications/display-managers/sddm/sddm-ignore-config-mtime.patch
+++ b/pkgs/applications/display-managers/sddm/sddm-ignore-config-mtime.patch
@@ -1,28 +1,43 @@
-From e9d82bfbc49993a5be2c93f6b72a969630587f26 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel
-Date: Mon, 23 Nov 2015 06:56:28 -0600
-Subject: [PATCH 1/2] ignore config mtime
-
----
- src/common/ConfigReader.cpp | 5 -----
- 1 file changed, 5 deletions(-)
-
diff --git a/src/common/ConfigReader.cpp b/src/common/ConfigReader.cpp
-index cfc9940..5bf5a6a 100644
+index 4b5983c..911c511 100644
--- a/src/common/ConfigReader.cpp
+++ b/src/common/ConfigReader.cpp
-@@ -138,11 +138,6 @@ namespace SDDM {
- QString currentSection = QStringLiteral(IMPLICIT_SECTION);
+@@ -147,16 +147,13 @@ namespace SDDM {
+ // * m_path (classic fallback /etc/sddm.conf)
- QFile in(m_path);
-- QDateTime modificationTime = QFileInfo(in).lastModified();
-- if (modificationTime <= m_fileModificationTime) {
+ QStringList files;
+- QDateTime latestModificationTime = QFileInfo(m_path).lastModified();
+
+ if (!m_sysConfigDir.isEmpty()) {
+ //include the configDir in modification time so we also reload on any files added/removed
+ QDir dir(m_sysConfigDir);
+ if (dir.exists()) {
+- latestModificationTime = std::max(latestModificationTime, QFileInfo(m_sysConfigDir).lastModified());
+ foreach (const QFileInfo &file, dir.entryInfoList(QDir::Files | QDir::NoDotAndDotDot, QDir::LocaleAware)) {
+ files << (file.absoluteFilePath());
+- latestModificationTime = std::max(latestModificationTime, file.lastModified());
+ }
+ }
+ }
+@@ -164,21 +161,14 @@ namespace SDDM {
+ //include the configDir in modification time so we also reload on any files added/removed
+ QDir dir(m_configDir);
+ if (dir.exists()) {
+- latestModificationTime = std::max(latestModificationTime, QFileInfo(m_configDir).lastModified());
+ foreach (const QFileInfo &file, dir.entryInfoList(QDir::Files | QDir::NoDotAndDotDot, QDir::LocaleAware)) {
+ files << (file.absoluteFilePath());
+- latestModificationTime = std::max(latestModificationTime, file.lastModified());
+ }
+ }
+ }
+
+ files << m_path;
+
+- if (latestModificationTime <= m_fileModificationTime) {
- return;
- }
-- m_fileModificationTime = modificationTime;
-
- in.open(QIODevice::ReadOnly);
- while (!in.atEnd()) {
---
-2.6.3
-
+- m_fileModificationTime = latestModificationTime;
+-
+ foreach (const QString &filepath, files) {
+ loadInternal(filepath);
+ }
diff --git a/pkgs/applications/display-managers/sddm/series b/pkgs/applications/display-managers/sddm/series
deleted file mode 100644
index cb6ea65fedb17b00d18de793d70af42f3612895b..0000000000000000000000000000000000000000
--- a/pkgs/applications/display-managers/sddm/series
+++ /dev/null
@@ -1 +0,0 @@
-sddm-ignore-config-mtime.patch
\ No newline at end of file
diff --git a/pkgs/applications/display-managers/slim/default.nix b/pkgs/applications/display-managers/slim/default.nix
index c75a8976b3fa0eb600495f2b3290a6e4680a7a49..5d06c2221b348a1e3474a1abf2a5b96b858a9f1b 100644
--- a/pkgs/applications/display-managers/slim/default.nix
+++ b/pkgs/applications/display-managers/slim/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_LINK = "-lXmu";
meta = {
- homepage = http://sourceforge.net/projects/slim.berlios/; # berlios shut down; I found no replacement yet
+ homepage = https://sourceforge.net/projects/slim.berlios/; # berlios shut down; I found no replacement yet
platforms = stdenv.lib.platforms.linux;
};
}
diff --git a/pkgs/applications/editors/android-studio/packages.nix b/pkgs/applications/editors/android-studio/default.nix
similarity index 64%
rename from pkgs/applications/editors/android-studio/packages.nix
rename to pkgs/applications/editors/android-studio/default.nix
index 471f78f0c0728149db0ea1159aafae079ed30244..57e3c58525e0b552cd54a8fe1f8c6d8d29943ae6 100644
--- a/pkgs/applications/editors/android-studio/packages.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, fetchurl, makeFontsConf }:
+{ stdenv, callPackage, fetchurl, makeFontsConf }:
let
mkStudio = opts: callPackage (import ./common.nix opts) {
fontsConf = makeFontsConf {
@@ -6,11 +6,11 @@ let
};
};
in rec {
- stable = mkStudio rec {
+ stable = mkStudio {
pname = "android-studio";
- version = "2.3.3.0";
- build = "162.4069837";
- sha256Hash = "0zzis9m2xp44xwkj0zvcqw5rh3iyd3finyi5nqhgira1fkacz0qk";
+ version = "3.0.0.18"; # "Android Studio 3.0"
+ build = "171.4408382";
+ sha256Hash = "18npm7ckdybj6vc2vndr0wd50da19m9z2j7wld2mdidnl5ggk4br";
meta = with stdenv.lib; {
description = "The Official IDE for Android (stable version)";
@@ -25,16 +25,15 @@ in rec {
};
};
- preview = mkStudio rec {
+ preview = mkStudio {
pname = "android-studio-preview";
- version = "3.0.0.10"; # "Android Studio 3.0 Beta 2"
- build = "171.4263559";
- sha256Hash = "0bya69qa50s6dbvlzb198b5w6ixs21y6b56v3v1xjb3kndf9y44w";
+ version = "3.1.0.2"; # "Android Studio 3.1 Canary 3"
+ build = "171.4435470";
+ sha256Hash = "1yqzxmzqxvhq9q9k07yfchh2al0wdy0j5k5fmjv4zbw20panx10h";
meta = stable.meta // {
description = "The Official IDE for Android (preview version)";
homepage = https://developer.android.com/studio/preview/index.html;
- maintainers = with stdenv.lib.maintainers; [ primeos tomsmeets ];
};
};
}
diff --git a/pkgs/applications/editors/aseprite/default.nix b/pkgs/applications/editors/aseprite/default.nix
index 9945fd53719b125c4048ba30cc4545a3cf6467f4..39be7f534060bff83628b98bbde0fce39ec4fd80 100644
--- a/pkgs/applications/editors/aseprite/default.nix
+++ b/pkgs/applications/editors/aseprite/default.nix
@@ -1,47 +1,81 @@
-{ stdenv, fetchurl, cmake, pkgconfig
-, giflib, libjpeg, zlib, libpng, tinyxml, allegro
-, libX11, libXext, libXcursor, libXpm, libXxf86vm, libXxf86dga
+{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig
+, curl, freetype, giflib, libjpeg, libpng, libwebp, pixman, tinyxml, zlib
+, libX11, libXext, libXcursor, libXxf86vm
+, unfree ? false
+, cmark
}:
+# Unfree version is not redistributable:
+# https://dev.aseprite.org/2016/09/01/new-source-code-license/
+# Consider supporting the developer: https://aseprite.org/#buy
+
stdenv.mkDerivation rec {
- name = "aseprite-0.9.5";
+ name = "aseprite-${version}";
+ version = if unfree then "1.2.2" else "1.1.7";
- src = fetchurl {
- url = "http://aseprite.googlecode.com/files/${name}.tar.xz";
- sha256 = "0m7i6ybj2bym4w9rybacnnaaq2jjn76vlpbp932xcclakl6kdq41";
+ src = fetchFromGitHub {
+ owner = "aseprite";
+ repo = "aseprite";
+ rev = "v${version}";
+ fetchSubmodules = true;
+ sha256 = if unfree
+ then "1ldi7zikl1g6rq3g9lkypx5wqzza5j0054j1r8bh7lyvb0szicig"
+ else "0gd49lns2bpzbkwax5jf9x1xmg1j8ij997kcxr2596cwiswnw4di";
};
+ nativeBuildInputs = [ cmake pkgconfig ];
+
buildInputs = [
- cmake pkgconfig
- giflib libjpeg zlib libpng tinyxml allegro
- libX11 libXext libXcursor libXpm libXxf86vm libXxf86dga
- ];
+ curl freetype giflib libjpeg libpng libwebp pixman tinyxml zlib
+ libX11 libXext libXcursor libXxf86vm
+ ] ++ lib.optionals unfree [ cmark ];
- patchPhase = ''
- sed -i '/^find_unittests/d' src/CMakeLists.txt
- sed -i '/include_directories(.*third_party\/gtest.*)/d' src/CMakeLists.txt
- sed -i '/add_subdirectory(gtest)/d' third_party/CMakeLists.txt
- sed -i 's/png_\(sizeof\)/\1/g' src/file/png_format.cpp
+ postPatch = ''
+ sed -i src/config.h -e "s-\\(#define VERSION\\) .*-\\1 \"$version\"-"
'';
- cmakeFlags = ''
- -DUSE_SHARED_GIFLIB=ON
- -DUSE_SHARED_JPEGLIB=ON
- -DUSE_SHARED_ZLIB=ON
- -DUSE_SHARED_LIBPNG=ON
- -DUSE_SHARED_LIBLOADPNG=ON
- -DUSE_SHARED_TINYXML=ON
- -DUSE_SHARED_GTEST=ON
- -DUSE_SHARED_ALLEGRO4=ON
- -DENABLE_UPDATER=OFF
+ cmakeFlags = [
+ "-DENABLE_UPDATER=OFF"
+ "-DUSE_SHARED_CURL=ON"
+ "-DUSE_SHARED_FREETYPE=ON"
+ "-DUSE_SHARED_GIFLIB=ON"
+ "-DUSE_SHARED_JPEGLIB=ON"
+ "-DUSE_SHARED_LIBPNG=ON"
+ "-DUSE_SHARED_LIBWEBP=ON"
+ "-DUSE_SHARED_PIXMAN=ON"
+ "-DUSE_SHARED_TINYXML=ON"
+ "-DUSE_SHARED_ZLIB=ON"
+ "-DWITH_DESKTOP_INTEGRATION=ON"
+ "-DWITH_WEBP_SUPPORT=ON"
+ ] ++ lib.optionals unfree [
+ "-DUSE_SHARED_CMARK=ON"
+ # Aseprite needs internal freetype headers.
+ "-DUSE_SHARED_FREETYPE=OFF"
+ # Disable libarchive programs.
+ "-DENABLE_CAT=OFF"
+ "-DENABLE_CPIO=OFF"
+ "-DENABLE_TAR=OFF"
+ ];
+
+ postInstall = ''
+ # Install desktop icons.
+ src="$out/share/aseprite/data/icons"
+ for size in 16 32 48 64; do
+ dst="$out"/share/icons/hicolor/"$size"x"$size"
+ install -Dm644 "$src"/ase"$size".png "$dst"/apps/aseprite.png
+ install -Dm644 "$src"/doc"$size".png "$dst"/mimetypes/aseprite.png
+ done
+ # Delete unneeded artifacts of bundled libraries.
+ rm -rf "$out"/include "$out"/lib
'';
- NIX_LDFLAGS = "-lX11";
+ enableParallelBuilding = true;
- meta = {
- description = "Animated sprite editor & pixel art tool";
+ meta = with lib; {
homepage = https://www.aseprite.org/;
- license = stdenv.lib.licenses.gpl2Plus;
- platforms = stdenv.lib.platforms.linux;
+ description = "Animated sprite editor & pixel art tool";
+ license = if unfree then licenses.unfree else licenses.gpl2;
+ maintainers = with maintainers; [ orivej ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/editors/atom/beta.nix b/pkgs/applications/editors/atom/beta.nix
new file mode 100644
index 0000000000000000000000000000000000000000..391d098625c55caf5c1a232d0e644e92253c13e0
--- /dev/null
+++ b/pkgs/applications/editors/atom/beta.nix
@@ -0,0 +1,52 @@
+{ stdenv, pkgs, fetchurl, lib, makeWrapper, gvfs, atomEnv}:
+
+stdenv.mkDerivation rec {
+ name = "atom-beta-${version}";
+ version = "1.22.0-beta1";
+
+ src = fetchurl {
+ url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
+ sha256 = "0qggj0j0cnkzqwgvzw2fb1z10rvvx9jh0ymhdy1aca18hms44p3d";
+ name = "${name}.deb";
+ };
+
+ nativeBuildInputs = [ makeWrapper ];
+
+ buildCommand = ''
+ mkdir -p $out/usr/
+ ar p $src data.tar.xz | tar -C $out -xJ ./usr
+ substituteInPlace $out/usr/share/applications/atom-beta.desktop \
+ --replace /usr/share/atom-beta $out/bin
+ mv $out/usr/* $out/
+ rm -r $out/share/lintian
+ rm -r $out/usr/
+ sed -i "s/'atom-beta'/'.atom-beta-wrapped'/" $out/bin/atom-beta
+ wrapProgram $out/bin/atom-beta \
+ --prefix "PATH" : "${gvfs}/bin"
+
+ fixupPhase
+
+ patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+ --set-rpath "${atomEnv.libPath}:$out/share/atom-beta" \
+ $out/share/atom-beta/atom
+ patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+ --set-rpath "${atomEnv.libPath}" \
+ $out/share/atom-beta/resources/app/apm/bin/node
+
+ #rm -f $out/share/atom-beta/resources/app/node_modules/dugite/git/bin/git
+ #ln -s ${pkgs.git}/bin/git $out/share/atom-beta/resources/app/node_modules/dugite/git/bin/git
+
+ find $out/share/atom-beta -name "*.node" -exec patchelf --set-rpath "${atomEnv.libPath}:$out/share/atom-beta" {} \;
+
+ paxmark m $out/share/atom-beta/atom
+ paxmark m $out/share/atom-beta/resources/app/apm/bin/node
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A hackable text editor for the 21st Century";
+ homepage = https://atom.io/;
+ license = licenses.mit;
+ maintainers = [ maintainers.offline maintainers.nequissimus ];
+ platforms = [ "x86_64-linux" ];
+ };
+}
diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index 31e6476d282fc5f032494935f376601aa797e1ae..6ab881f227535b34845abca05e668013a79d78b5 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchurl, lib, makeWrapper, gvfs, atomEnv}:
+{ stdenv, pkgs, fetchurl, lib, makeWrapper, gvfs, atomEnv}:
stdenv.mkDerivation rec {
name = "atom-${version}";
- version = "1.19.2";
+ version = "1.21.2";
src = fetchurl {
url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
- sha256 = "0bfhcxhjsa7p35s5dz3zjxm4wc802m3k137p04l9anr3v5hrgqmb";
+ sha256 = "0snhhp8rjmk750snyzkqzwvi7f915pbc6qpa3vf0f57syf47m7vl";
name = "${name}.deb";
};
@@ -32,6 +32,9 @@ stdenv.mkDerivation rec {
--set-rpath "${atomEnv.libPath}" \
$out/share/atom/resources/app/apm/bin/node
+ rm -f $out/share/atom/resources/app.asar.unpacked/node_modules/dugite/git/bin/git
+ ln -s ${pkgs.git}/bin/git $out/share/atom/resources/app.asar.unpacked/node_modules/dugite/git/bin/git
+
find $out/share/atom -name "*.node" -exec patchelf --set-rpath "${atomEnv.libPath}:$out/share/atom" {} \;
paxmark m $out/share/atom/atom
diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index b039bd168d8702f7457dc273bc23f3493fa2a047..5ef29081cf0122e0bf3fe419497828ea562bfd7d 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -8,6 +8,9 @@
assert stdenv ? glibc;
+# http://download.eclipse.org/eclipse/downloads/ is the main place to
+# find the downloads needed for new versions
+
rec {
buildEclipse = import ./build-eclipse.nix {
@@ -111,16 +114,16 @@ rec {
};
eclipse-platform-47 = buildEclipse {
- name = "eclipse-platform-4.7";
+ name = "eclipse-platform-4.7.1a";
description = "Eclipse Platform Oxygen";
sources = {
"x86_64-linux" = fetchurl {
- url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7-201706120950/eclipse-platform-4.7-linux-gtk-x86_64.tar.gz;
- sha256 = "0hrgijydxvd2zz1npv5qw8d79f48a6lsdw3qy1wqf7k59aqyg2fq";
+ url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.1a-201710090410/eclipse-platform-4.7.1a-linux-gtk-x86_64.tar.gz;
+ sha256 = "13gyrnhyhdpsrbi5nl0fhpwrqz3gdyqq3r0m1f2z3y6yr75sgw33";
};
"i686-linux" = fetchurl {
- url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7-201706120950/eclipse-platform-4.7-linux-gtk.tar.gz;
- sha256 = "00m89j26m8nj190q144wx8d88mldx1z6i797p8isg3rhbz3x5dbc";
+ url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.1a-201710090410/eclipse-platform-4.7.1a-linux-gtk.tar.gz;
+ sha256 = "013dfk23wa4jy177ywrkkr16wdjf6jxzjcz6mkl4ygki47yj9c5s";
};
};
};
@@ -165,16 +168,16 @@ rec {
};
eclipse-sdk-47 = buildEclipse {
- name = "eclipse-sdk-4.7";
+ name = "eclipse-sdk-4.7.1a";
description = "Eclipse Oxygen Classic";
sources = {
"x86_64-linux" = fetchurl {
- url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7-201706120950/eclipse-SDK-4.7-linux-gtk-x86_64.tar.gz;
- sha256 = "1nz0hl0gg4a8iffnaggbhdw0ra8a7wljlimvijbbybh0nhvfd9n3";
+ url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.1a-201710090410/eclipse-SDK-4.7.1a-linux-gtk-x86_64.tar.gz;
+ sha256 = "05xpdbig170rw7k5dx33dlyz187wv62mma8s5wxrqi7f4117sx4y";
};
"i686-linux" = fetchurl {
- url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7-201706120950/eclipse-SDK-4.7-linux-gtk.tar.gz;
- sha256 = "0dar69v7d7bkl18si45bccvil809a85ghb7k88m1q2cq1kd2r8z5";
+ url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.1a-201710090410/eclipse-SDK-4.7.1a-linux-gtk.tar.gz;
+ sha256 = "09c9m88k1cm9bhd900p5yf2q9pijrymgjcbhmagz0fcwhldrv0ys";
};
};
};
diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index a3b4193edc6f5acee25f475b11de9f01aa084f06..8d96a79b3c3d7f32c87295308729acd5b154ad4c 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -24,9 +24,7 @@ rec {
buildEclipsePluginBase (attrs // {
srcs = [ srcFeature srcPlugin ];
- phases = [ "installPhase" ];
-
- installPhase = ''
+ buildCommand = ''
dropinDir="$out/eclipse/dropins/${name}"
mkdir -p $dropinDir/features
@@ -35,7 +33,6 @@ rec {
mkdir -p $dropinDir/plugins
cp -v ${srcPlugin} $dropinDir/plugins/${name}.jar
'';
-
});
# Helper for the case where the build directory has the layout of an
@@ -44,7 +41,8 @@ rec {
# directories will be installed.
buildEclipseUpdateSite = { name, ... } @ attrs:
buildEclipsePluginBase (attrs // {
- phases = [ "unpackPhase" "installPhase" ];
+ dontBuild = true;
+ doCheck = false;
installPhase = ''
dropinDir="$out/eclipse/dropins/${name}"
@@ -106,16 +104,16 @@ rec {
anyedittools = buildEclipsePlugin rec {
name = "anyedit-${version}";
- version = "2.7.0.201705171641";
+ version = "2.7.1.201709201439";
srcFeature = fetchurl {
url = "http://andrei.gmxhome.de/eclipse/features/AnyEditTools_${version}.jar";
- sha256 = "07k029nw5ibxpjc0siy06ihylbqrxllf59yz8c544gra8lc079c9";
+ sha256 = "1wqzl7wq85m9gil8rnvly45ps0a2m0svw613pg6djs5i7amhnayh";
};
srcPlugin = fetchurl {
- url = "https://github.com/iloveeclipse/anyedittools/releases/download/2.7.0/de.loskutov.anyedit.AnyEditTools_${version}.jar";
- sha256 = "0wbm8zfjh7gxrw5sy9m3siddiazh5czgxp7zyzxwzkdqyqzqs70h";
+ url = "https://github.com/iloveeclipse/anyedittools/releases/download/2.7.1/de.loskutov.anyedit.AnyEditTools_${version}.jar";
+ sha256 = "03iyb6j2srq74iigmg7dk098c2svyv0ygdfql5jqr44a32n07k8q";
};
meta = with stdenv.lib; {
@@ -152,16 +150,16 @@ rec {
bytecode-outline = buildEclipsePlugin rec {
name = "bytecode-outline-${version}";
- version = "2.4.3";
+ version = "2.5.0.201711011753-5a57fdf";
srcFeature = fetchurl {
url = "http://andrei.gmxhome.de/eclipse/features/de.loskutov.BytecodeOutline.feature_${version}.jar";
- sha256 = "0imhwp73gxy1y5d5gpjgd05ywn0xg3vqc5980wcx3fd51g4ifc67";
+ sha256 = "0yciqhcq0n5i326mwy57r4ywmkz2c2jky7r4pcmznmhvks3z65ps";
};
srcPlugin = fetchurl {
url = "http://dl.bintray.com/iloveeclipse/plugins/de.loskutov.BytecodeOutline_${version}.jar";
- sha256 = "0230i88mvvxhn11m9c5mv3494zhh1xkxyfyva9qahck0wbqwpzkw";
+ sha256 = "1vmsqv32jfl7anvdkw0vir342miv5sr9df7vd1w44lf1yf97vxlw";
};
meta = with stdenv.lib; {
@@ -364,12 +362,12 @@ rec {
jdt = buildEclipseUpdateSite rec {
name = "jdt-${version}";
- version = "4.7";
+ version = "4.7.1a";
src = fetchzip {
stripRoot = false;
- url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7-201706120950/org.eclipse.jdt-4.7.zip";
- sha256 = "0y17shnlh90gg9226lraknvdnp2i71ck91dnxbbzvxl8b64v8v1p";
+ url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.1a-201710090410/org.eclipse.jdt-4.7.1a.zip;
+ sha256 = "1hpvpj8ghfk8aqbzfrpcxw3wxrczq6zd3bpx4sxjrsi926jsjaf4";
};
meta = with stdenv.lib; {
@@ -394,7 +392,7 @@ rec {
sha256 = "1xfj4j27d1h4bdf2v7f78zi8lz4zkkj7s9kskmsqx5jcs2d459yp";
extraPostFetch =
''
- mv "$out/${repo}-${rev}/releases/local-repo"/* "$out/"
+ mv "$out/${repo}-${rev}/releases/local-repo/"* "$out/"
'';
};
@@ -424,6 +422,29 @@ rec {
};
};
+ spotbugs = buildEclipsePlugin rec {
+ name = "spotbugs-${version}";
+ version = "3.1.0.r201710241414-11c9895";
+
+ srcFeature = fetchurl {
+ url = "https://spotbugs.github.io/eclipse/features/com.github.spotbugs.plugin.eclipse_${version}.jar";
+ sha256 = "084dj2bid5issh28j32hi5w9vx5xs829h7d5lbz5hqj1fyn9h6bs";
+ };
+
+ srcPlugin = fetchurl {
+ url = "https://spotbugs.github.io/eclipse/plugins/com.github.spotbugs.plugin.eclipse_${version}.jar";
+ sha256 = "1mqpl3gx06f54w13jm01qd8fbniab3x989mi3lysx078vrp23jas";
+ };
+
+ meta = with stdenv.lib; {
+ homepage = https://spotbugs.github.io/;
+ description = "Plugin that uses static analysis to look for bugs in Java code";
+ license = licenses.lgpl21;
+ platforms = platforms.all;
+ maintainers = [ maintainers.rycee ];
+ };
+ };
+
testng = buildEclipsePlugin rec {
name = "testng-${version}";
version = "6.9.13.201609291640";
@@ -447,6 +468,28 @@ rec {
};
};
+ vrapper = buildEclipseUpdateSite rec {
+ name = "vrapper-${version}";
+ version = "0.72.0";
+ owner = "vrapper";
+ repo = "vrapper";
+ date = "20170311";
+
+ src = fetchzip {
+ stripRoot = false;
+ url = "https://github.com/${owner}/${repo}/releases/download/${version}/vrapper_${version}_${date}.zip";
+ sha256 = "0nyirf6km97q211cxfy01kidxac20m8ba3kk9xj73ykrhsk3cxjp";
+ };
+
+ meta = with stdenv.lib; {
+ homepage = "https://github.com/vrapper/vrapper";
+ description = "A wrapper to provide a Vim-like input scheme for moving around and editing text";
+ license = licenses.gpl3;
+ platforms = platforms.all;
+ maintainers = [ maintainers.stumoss ];
+ };
+ };
+
yedit = buildEclipsePlugin rec {
name = "yedit-${version}";
version = "1.0.20.201509041456";
diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix
index 2404405c307f8e309198fb8bc0c39fab4061548e..9d5848f02637769433610ec271b8987808474fdc 100644
--- a/pkgs/applications/editors/ed/default.nix
+++ b/pkgs/applications/editors/ed/default.nix
@@ -1,26 +1,20 @@
-{ stdenv, fetchurl
+{ stdenv, fetchurl, lzip
, buildPlatform, hostPlatform
}:
stdenv.mkDerivation rec {
name = "ed-${version}";
- version = "1.14.1";
+ version = "1.14.2";
src = fetchurl {
- # gnu only provides *.lz tarball, which is unfriendly for stdenv bootstrapping
- #url = "mirror://gnu/ed/${name}.tar.gz";
- # When updating, please make sure the sources pulled match those upstream by
- # Unpacking both tarballs and running `find . -type f -exec sha256sum \{\} \; | sha256sum`
- # in the resulting directory
- urls = let file_sha512 = "84396fe4e4f0bf0b591037277ff8679a08b2883207628aaa387644ad83ca5fbdaa74a581f33310e28222d2fea32a0b8ba37e579597cc7d6145df6eb956ea75db";
- in [
- ("http://pkgs.fedoraproject.org/repo/extras/ed"
- + "/${name}.tar.bz2/sha512/${file_sha512}/${name}.tar.bz2")
- "http://fossies.org/linux/privat/${name}.tar.bz2"
- ];
- sha256 = "1pk6qa4sr7qc6vgm34hjx44hsh8x2bwaxhdi78jhsacnn4zwi7bw";
+ url = "mirror://gnu/ed/${name}.tar.lz";
+ sha256 = "1nqhk3n1s1p77g2bjnj55acicsrlyb2yasqxqwpx0w0djfx64ygm";
};
+ unpackCmd = "tar --lzip -xf";
+
+ nativeBuildInputs = [ lzip ];
+
/* FIXME: Tests currently fail on Darwin:
building test scripts for ed-1.5...
@@ -32,11 +26,7 @@ stdenv.mkDerivation rec {
*/
doCheck = !(hostPlatform.isDarwin || hostPlatform != buildPlatform);
- # TODO(@Ericson2314): Use placeholder to make this a configure flag once Nix
- # 1.12 is released.
- preConfigure = ''
- export DESTDIR=$out
- '';
+ installFlags = [ "DESTDIR=$(out)" ];
configureFlags = [
"--exec-prefix=${stdenv.cc.prefix}"
diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index e3861c8c2f6d7e816a667830229b5f8aa09fcda6..7b58d895841ec7e549126ca8990364d8f9c9c15e 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -28,10 +28,10 @@
ada-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, wisi }:
elpaBuild {
pname = "ada-mode";
- version = "5.2.2";
+ version = "5.3.1";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/ada-mode-5.2.2.tar";
- sha256 = "0c0lrj4vgsbawyshqbfb7gvndf0yb97wybqb0b34z7kan7q0xgvd";
+ url = "https://elpa.gnu.org/packages/ada-mode-5.3.1.tar";
+ sha256 = "0srna7w3y2nq0y80a01bcx8mg6gvind7nzvsbk9bd7rrr05njrd9";
};
packageRequires = [ cl-lib emacs wisi ];
meta = {
@@ -95,10 +95,10 @@
ahungry-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "ahungry-theme";
- version = "1.4.0";
+ version = "1.8.0";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/ahungry-theme-1.4.0.tar";
- sha256 = "1n8k12mfn01f20j0pyd7ycj77x0y3a008xc94frklaaqjc0v26s4";
+ url = "https://elpa.gnu.org/packages/ahungry-theme-1.8.0.tar";
+ sha256 = "14dhnrlbjzrxk5ligf0z2im5bgnxpjqqzqcrmqg5355xrgpbpb7v";
};
packageRequires = [ emacs ];
meta = {
@@ -149,10 +149,10 @@
ascii-art-to-unicode = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "ascii-art-to-unicode";
- version = "1.9";
+ version = "1.11";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/ascii-art-to-unicode-1.9.el";
- sha256 = "0lfgfkx81s4dd318xcxsl7hdgpi0dc1fv3d00m3xg8smyxcf3adv";
+ url = "https://elpa.gnu.org/packages/ascii-art-to-unicode-1.11.el";
+ sha256 = "1z1vjpskvhynja41cv5z6xrz3rmpdzz51avv2gzrpxxa4k6iaz8s";
};
packageRequires = [];
meta = {
@@ -199,6 +199,19 @@
license = lib.licenses.free;
};
}) {};
+ auto-correct = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+ pname = "auto-correct";
+ version = "1.1.3";
+ src = fetchurl {
+ url = "https://elpa.gnu.org/packages/auto-correct-1.1.3.el";
+ sha256 = "09r58p8na1ai2v9zllb92lvsjlq2jfzwvj0ipck1py0i4xfsm7aq";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://elpa.gnu.org/packages/auto-correct.html";
+ license = lib.licenses.free;
+ };
+ }) {};
auto-overlays = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "auto-overlays";
version = "0.10.9";
@@ -228,10 +241,10 @@
}) {};
beacon = callPackage ({ elpaBuild, fetchurl, lib, seq }: elpaBuild {
pname = "beacon";
- version = "1.3.2";
+ version = "1.3.3";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/beacon-1.3.2.el";
- sha256 = "0ldja8xrrninm588f27bhxvp0b12cngazyz688lkxvwx28cpqb7n";
+ url = "https://elpa.gnu.org/packages/beacon-1.3.3.el";
+ sha256 = "10r4fpf8pcf1qn5ncpm5g7skzba749mrc1ggykq92jlha3q98s02";
};
packageRequires = [ seq ];
meta = {
@@ -266,6 +279,19 @@
license = lib.licenses.free;
};
}) {};
+ captain = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+ pname = "captain";
+ version = "1.0.3";
+ src = fetchurl {
+ url = "https://elpa.gnu.org/packages/captain-1.0.3.el";
+ sha256 = "02b4s4pfnwfwc3xgh4g96wrqll37m35dc2x09pjwkdjxglki7045";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://elpa.gnu.org/packages/captain.html";
+ license = lib.licenses.free;
+ };
+ }) {};
chess = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "chess";
@@ -372,6 +398,20 @@
license = lib.licenses.free;
};
}) {};
+ company-ebdb = callPackage ({ company, ebdb, elpaBuild, fetchurl, lib }:
+ elpaBuild {
+ pname = "company-ebdb";
+ version = "1";
+ src = fetchurl {
+ url = "https://elpa.gnu.org/packages/company-ebdb-1.el";
+ sha256 = "1awriwvjpf9k2r6hzawai5kxz28j40zk9fvpb946kd5yj0hxr9nc";
+ };
+ packageRequires = [ company ebdb ];
+ meta = {
+ homepage = "https://elpa.gnu.org/packages/company-ebdb.html";
+ license = lib.licenses.free;
+ };
+ }) {};
company-math = callPackage ({ company, elpaBuild, fetchurl, lib, math-symbol-lists }:
elpaBuild {
pname = "company-math";
@@ -414,6 +454,20 @@
license = lib.licenses.free;
};
}) {};
+ counsel-ebdb = callPackage ({ ebdb, elpaBuild, fetchurl, ivy, lib }:
+ elpaBuild {
+ pname = "counsel-ebdb";
+ version = "1";
+ src = fetchurl {
+ url = "https://elpa.gnu.org/packages/counsel-ebdb-1.el";
+ sha256 = "0p919gq871rxlrn6lpjbwws7h6i2gc9vgcxzj8bzgz8xk5hq9mis";
+ };
+ packageRequires = [ ebdb ivy ];
+ meta = {
+ homepage = "https://elpa.gnu.org/packages/counsel-ebdb.html";
+ license = lib.licenses.free;
+ };
+ }) {};
crisp = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "crisp";
version = "1.3.4";
@@ -524,10 +578,10 @@
dict-tree = callPackage ({ elpaBuild, fetchurl, heap, lib, tNFA, trie }:
elpaBuild {
pname = "dict-tree";
- version = "0.12.8";
+ version = "0.14";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/dict-tree-0.12.8.el";
- sha256 = "08jaifqaq9cfz1z4fr4ib9l6lbx4x60q7d6gajx1cdhh18x6nys5";
+ url = "https://elpa.gnu.org/packages/dict-tree-0.14.el";
+ sha256 = "1k00k3510bgq7rijvrxbx4b7qlq2abq1dyyn51zgm8q0qk68p5jq";
};
packageRequires = [ heap tNFA trie ];
meta = {
@@ -643,6 +697,48 @@
license = lib.licenses.free;
};
}) {};
+ ebdb = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, seq }:
+ elpaBuild {
+ pname = "ebdb";
+ version = "0.4.2";
+ src = fetchurl {
+ url = "https://elpa.gnu.org/packages/ebdb-0.4.2.tar";
+ sha256 = "1j9hgxa6csj3iz5vrl22xvhl9lxhig0n1cixgzhs1sb3z3nn2li6";
+ };
+ packageRequires = [ cl-lib emacs seq ];
+ meta = {
+ homepage = "https://elpa.gnu.org/packages/ebdb.html";
+ license = lib.licenses.free;
+ };
+ }) {};
+ ebdb-gnorb = callPackage ({ ebdb, elpaBuild, fetchurl, gnorb, lib }:
+ elpaBuild {
+ pname = "ebdb-gnorb";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://elpa.gnu.org/packages/ebdb-gnorb-1.0.2.el";
+ sha256 = "0bma7mqilp3lfgv0z2mk6nnqzh1nn1prkz2aiwrs4hxwydmda13i";
+ };
+ packageRequires = [ ebdb gnorb ];
+ meta = {
+ homepage = "https://elpa.gnu.org/packages/ebdb-gnorb.html";
+ license = lib.licenses.free;
+ };
+ }) {};
+ ebdb-i18n-chn = callPackage ({ ebdb, elpaBuild, fetchurl, lib, pyim }:
+ elpaBuild {
+ pname = "ebdb-i18n-chn";
+ version = "1.2";
+ src = fetchurl {
+ url = "https://elpa.gnu.org/packages/ebdb-i18n-chn-1.2.el";
+ sha256 = "1qgrlk625mhfd6n1mc0kqfzbisnb61kx3vrrl3bzlz4viq3kcc10";
+ };
+ packageRequires = [ ebdb pyim ];
+ meta = {
+ homepage = "https://elpa.gnu.org/packages/ebdb-i18n-chn.html";
+ license = lib.licenses.free;
+ };
+ }) {};
ediprolog = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "ediprolog";
version = "1.2";
@@ -849,10 +945,10 @@
gnorb = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "gnorb";
- version = "1.2.3";
+ version = "1.3.1";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/gnorb-1.2.3.tar";
- sha256 = "1bqm08i2aam4v4gfzyxfmic0rg0ka7cns38khwj42vhwgv045xc7";
+ url = "https://elpa.gnu.org/packages/gnorb-1.3.1.tar";
+ sha256 = "1g6xldkc6l6zlzd1slqizbbd5b9k4pbr66nrf5svidgiy7mlifw5";
};
packageRequires = [ cl-lib ];
meta = {
@@ -876,10 +972,10 @@
}) {};
heap = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "heap";
- version = "0.3";
+ version = "0.5";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/heap-0.3.el";
- sha256 = "1347s06nv88zyhmbimvn13f13d1r147kn6kric1ki6n382zbw6k6";
+ url = "https://elpa.gnu.org/packages/heap-0.5.el";
+ sha256 = "13qv0w3fi87c85jcy7lv359r6rpsgnp5zzs2f2zq4dl3540wzrxg";
};
packageRequires = [];
meta = {
@@ -887,6 +983,20 @@
license = lib.licenses.free;
};
}) {};
+ helm-ebdb = callPackage ({ ebdb, elpaBuild, fetchurl, helm, lib }:
+ elpaBuild {
+ pname = "helm-ebdb";
+ version = "1";
+ src = fetchurl {
+ url = "https://elpa.gnu.org/packages/helm-ebdb-1.el";
+ sha256 = "17gpna0hywxnhfwc9zsm2r35mskyfi416qqmmdba26r4zmpb9r63";
+ };
+ packageRequires = [ ebdb helm ];
+ meta = {
+ homepage = "https://elpa.gnu.org/packages/helm-ebdb.html";
+ license = lib.licenses.free;
+ };
+ }) {};
highlight-escape-sequences = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "highlight-escape-sequences";
@@ -1354,10 +1464,10 @@
}) {};
nlinum = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "nlinum";
- version = "1.7";
+ version = "1.8.1";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/nlinum-1.7.el";
- sha256 = "0ql1dbad29sdv3wmv65985g8ibl2176m2hqhjfrppgg34h3w51lz";
+ url = "https://elpa.gnu.org/packages/nlinum-1.8.1.el";
+ sha256 = "0fx560yfjy6nqgs1d3fiv0h46i8q3r592clsia7nihkriah7rlwf";
};
packageRequires = [];
meta = {
@@ -1446,10 +1556,10 @@
}) {};
org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org";
- version = "20170814";
+ version = "20171106";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/org-20170814.tar";
- sha256 = "1rk3y4ns5f7f22vv0pg1x5mpn3vpm1123sxpd1ilbzajw3hfgwwn";
+ url = "https://elpa.gnu.org/packages/org-20171106.tar";
+ sha256 = "08gziccqfrl65v18ri2m6csb6smyafaz7pv86gnvpw05g7aj6alq";
};
packageRequires = [];
meta = {
@@ -1579,10 +1689,10 @@
}) {};
queue = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "queue";
- version = "0.1.1";
+ version = "0.2";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/queue-0.1.1.el";
- sha256 = "0jw24fxqnf9qcaf2nh09cnds1kqfk7hal35dw83x1ari95say391";
+ url = "https://elpa.gnu.org/packages/queue-0.2.el";
+ sha256 = "0cx2848sqnnkkr4zisvqadzxngjyhmb36mh0q3if7q19yjjhmrkb";
};
packageRequires = [];
meta = {
@@ -1603,6 +1713,32 @@
license = lib.licenses.free;
};
}) {};
+ rcirc-color = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+ pname = "rcirc-color";
+ version = "0.3";
+ src = fetchurl {
+ url = "https://elpa.gnu.org/packages/rcirc-color-0.3.el";
+ sha256 = "1ya4agh63x60lv8qzrjrng02dnrc70ci0s05b800iq71k71ss3dl";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://elpa.gnu.org/packages/rcirc-color.html";
+ license = lib.licenses.free;
+ };
+ }) {};
+ rcirc-menu = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+ pname = "rcirc-menu";
+ version = "1.1";
+ src = fetchurl {
+ url = "https://elpa.gnu.org/packages/rcirc-menu-1.1.el";
+ sha256 = "0w77qlwlmx59v5894i96fldn6x4lliv4ddv8967vq1kfchn4w5mc";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://elpa.gnu.org/packages/rcirc-menu.html";
+ license = lib.licenses.free;
+ };
+ }) {};
realgud = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, load-relative, loc-changes, test-simple }:
elpaBuild {
pname = "realgud";
@@ -1783,14 +1919,14 @@
license = lib.licenses.free;
};
}) {};
- sokoban = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+ sokoban = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
pname = "sokoban";
- version = "1.4.5";
+ version = "1.4.6";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/sokoban-1.4.5.tar";
- sha256 = "1hh35g1p2f5al88jsbgiz35bvhn7iw5sf9zhsjimiig5isv7khip";
+ url = "https://elpa.gnu.org/packages/sokoban-1.4.6.tar";
+ sha256 = "112cl1l36zn5q9cw81rxi96zflf7ddp3by1h7fsz48yjfidpfbzn";
};
- packageRequires = [];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/sokoban.html";
license = lib.licenses.free;
@@ -1919,10 +2055,10 @@
}) {};
tiny = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "tiny";
- version = "0.1.1";
+ version = "0.2.1";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/tiny-0.1.1.tar";
- sha256 = "1nhg8375qdn457wj0xmfaj72s87xbabk2w1nl6q7rjvwxv08yyn7";
+ url = "https://elpa.gnu.org/packages/tiny-0.2.1.tar";
+ sha256 = "1cr73a8gba549ja55x0c2s554f3zywf69zbnd7v82jz5q1k9wd2v";
};
packageRequires = [];
meta = {
@@ -1932,10 +2068,10 @@
}) {};
tramp-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
pname = "tramp-theme";
- version = "0.1.1";
+ version = "0.2";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/tramp-theme-0.1.1.el";
- sha256 = "0l8i625h9sc6h59qfj847blmfwfhf9bvfsbmwfb56qzs535fby3y";
+ url = "https://elpa.gnu.org/packages/tramp-theme-0.2.el";
+ sha256 = "1q1j0vcdyv5gnfbnfl08rnwd5j4ayc1gi1vpinr99ny70wsv7gbf";
};
packageRequires = [ emacs ];
meta = {
@@ -1958,10 +2094,10 @@
}) {};
trie = callPackage ({ elpaBuild, fetchurl, heap, lib, tNFA }: elpaBuild {
pname = "trie";
- version = "0.2.6";
+ version = "0.4";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/trie-0.2.6.el";
- sha256 = "1q3i1dhq55c3b1hqpvmh924vzvhrgyp76hr1ci7bhjqvjmjx24ii";
+ url = "https://elpa.gnu.org/packages/trie-0.4.el";
+ sha256 = "0869fh3bghxil94wd9vgbb5bk1hx2qkh75vbvp0psmcima8dgzgw";
};
packageRequires = [ heap tNFA ];
meta = {
@@ -1998,10 +2134,10 @@
url-http-ntlm = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, ntlm ? null }:
elpaBuild {
pname = "url-http-ntlm";
- version = "2.0.3";
+ version = "2.0.4";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/url-http-ntlm-2.0.3.el";
- sha256 = "01ivfcxrxiqs8dlqg4s3q17y4mxx0kpin60fkwrs18pca4hni203";
+ url = "https://elpa.gnu.org/packages/url-http-ntlm-2.0.4.el";
+ sha256 = "1cakq2ykraci7d1gl8rnpv4f2f5ffyaidhqb1282g7i72adwmb98";
};
packageRequires = [ cl-lib ntlm ];
meta = {
@@ -2036,6 +2172,19 @@
license = lib.licenses.free;
};
}) {};
+ vigenere = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
+ pname = "vigenere";
+ version = "1.0";
+ src = fetchurl {
+ url = "https://elpa.gnu.org/packages/vigenere-1.0.el";
+ sha256 = "1i5s6h1nngcp74gf53dw9pvj5y0ywk9j8pyvkfr7gqq49bz22hmm";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://elpa.gnu.org/packages/vigenere.html";
+ license = lib.licenses.free;
+ };
+ }) {};
vlf = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "vlf";
version = "1.7";
@@ -2115,6 +2264,19 @@
license = lib.licenses.free;
};
}) {};
+ which-key = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
+ pname = "which-key";
+ version = "3.0.2";
+ src = fetchurl {
+ url = "https://elpa.gnu.org/packages/which-key-3.0.2.tar";
+ sha256 = "1s7bq7vq9xsf2pz1w03l743yzaxm9gk5qgympcwlkiq90ph13vcn";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://elpa.gnu.org/packages/which-key.html";
+ license = lib.licenses.free;
+ };
+ }) {};
windresize = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "windresize";
version = "0.1";
@@ -2131,10 +2293,10 @@
wisi = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "wisi";
- version = "1.1.5";
+ version = "1.1.6";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/wisi-1.1.5.tar";
- sha256 = "1q0dbykh9gvh0355vc1lwpriwlqq07jaydqx8zdrs6s0zyffx3a4";
+ url = "https://elpa.gnu.org/packages/wisi-1.1.6.tar";
+ sha256 = "0p7hm9l4gbp50rmpqna6jnc1pss2axdd6m6hk9ik4afbz0knzwnk";
};
packageRequires = [ cl-lib emacs ];
meta = {
@@ -2198,10 +2360,10 @@
yasnippet = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "yasnippet";
- version = "0.12.1";
+ version = "0.12.2";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/yasnippet-0.12.1.tar";
- sha256 = "01q1hn3w8w63s7cvr9bq6l5n4nyirnk8qfba60ajp3j6ndi2964n";
+ url = "https://elpa.gnu.org/packages/yasnippet-0.12.2.tar";
+ sha256 = "03cilldgq7fpzk9ix2a8q1ppilxp5gvyrym7krifvrg1g2rs1qv9";
};
packageRequires = [ cl-lib ];
meta = {
diff --git a/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix b/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix
index b4fb8d1937dfc574929c3a6d56233f4c78ce07b6..634c654d58fcc15e46ec7daec3765368a355aa57 100644
--- a/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix
+++ b/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix
@@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
sha256 = "1lmcj8rf83w13q8q68hh7sa1abc2m6j2zmfska92xdp7hslhdgc5";
};
- buildInputs = [ emacs w3m texinfo autoreconfHook ];
+ nativeBuildInputs = [ autoreconfHook ];
+ buildInputs = [ emacs w3m texinfo ];
# XXX: Should we do the same for xpdf/evince, gv, gs, etc.?
patchPhase = ''
diff --git a/pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix b/pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..ce4010c98811b90b500a230a5a693e7120bf5190
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix
@@ -0,0 +1,23 @@
+{ fetchurl, stdenv, melpaBuild }:
+
+melpaBuild {
+ pname = "font-lock-plus";
+ version = "20170222.1755";
+
+ src = fetchurl {
+ url = "https://www.emacswiki.org/emacs/download/font-lock+.el";
+ sha256 = "0iajkgh0n3pbrwwxx9rmrrwz8dw2m7jsp4mggnhq7zsb20ighs30";
+ name = "font-lock+.el";
+ };
+
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/font-lock+";
+ sha256 = "1wn99cb53ykds87lg9mrlfpalrmjj177nwskrnp9wglyqs65lk4g";
+ name = "font-lock-plus";
+ };
+
+ meta = with stdenv.lib; {
+ homepage = "https://melpa.org/#/font-lock+";
+ license = lib.licenses.gpl2Plus;
+ };
+}
diff --git a/pkgs/applications/editors/emacs-modes/gn/default.nix b/pkgs/applications/editors/emacs-modes/gn/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..39e7d1abf386c61fd3e4e8ae9f6ecb29bde7f8b4
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/gn/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchgit, emacs }:
+
+stdenv.mkDerivation {
+ name = "gn-mode-2017-09-21";
+ src = fetchgit {
+ url = "https://chromium.googlesource.com/chromium/src/tools/gn";
+ rev = "34f2780efb3fe14fe361ec161ad58440de5a6b36";
+ sha256 = "10cisqz3l6ny3471yi7y1z8v622lpl65zh0liqr6absvmy63g866";
+ };
+ buildInputs = [ emacs ];
+
+ buildPhase = ''
+ emacs --batch -f batch-byte-compile misc/emacs/gn-mode.el
+ '';
+
+ installPhase = ''
+ mkdir -p $out/share/emacs/site-lisp/
+ cp misc/emacs/gn-mode.el* $out/share/emacs/site-lisp/
+ '';
+}
diff --git a/pkgs/applications/editors/emacs-modes/icicles/default.nix b/pkgs/applications/editors/emacs-modes/icicles/default.nix
index 11ccff3df016a2e574b0c6c18513a90bc249b487..f0d120dd8030ab293fa26c3a11ef8737621ce726 100644
--- a/pkgs/applications/editors/emacs-modes/icicles/default.nix
+++ b/pkgs/applications/editors/emacs-modes/icicles/default.nix
@@ -2,27 +2,28 @@
let
modules = [
- { name = "icicles.el"; sha256 = "175g8w620vy73pp3zyasfjspgljk6g0lki71kdnvw5z88w3s9d1n"; }
- { name = "icicles-chg.el"; sha256 = "1bx5xdhirvnrjqk4pk0sjp9bpj1syymsjnckklsw04gv6y0x8zik"; }
- { name = "icicles-cmd1.el"; sha256 = "1ff0mndin9zxrswwwq3a7b1s879rr6gy8rzxanr7kxg1ppciafad"; }
- { name = "icicles-cmd2.el"; sha256 = "1a44l86jacp9nsy4z260azz6y672drjw3w5a0jsc8w26fgsrnx1k"; }
- { name = "icicles-doc1.el"; sha256 = "0s3r4z3y06hd1nxp18wd0b8b88z2a7ryy0j8sx5fzibbmp58ars1"; }
- { name = "icicles-doc2.el"; sha256 = "0c10jg91qxyrg1zwiyi4m57dbw3yf43jdrpi4nnby3pkzh6i37ic"; }
- { name = "icicles-face.el"; sha256 = "0n0vcbhwgd2lyj7anq1zpwja28xry018qxbm8sprxkh6y3vlw8d2"; }
- { name = "icicles-fn.el"; sha256 = "1i10593a7hp465bxd86h7h7gwrdyqxx0d13in53z4jnab8icp3d4"; }
- { name = "icicles-mac.el"; sha256 = "1piq0jk8nz0hz9wwci7dkxnfxscdpygjzpj5zg3310vs22l7rrsz"; }
- { name = "icicles-mcmd.el"; sha256 = "0c4325yp84i46605nlxmjm6n0f4fh69shsihvd0wb9ryg0a8qa65"; }
- { name = "icicles-mode.el"; sha256 = "069wx5clqpsq2c9aavgd9xihvlad3g00iwwrc3cpl47v64dvlipq"; }
- { name = "icicles-opt.el"; sha256 = "16487l3361ca8l6il2c0z892843sc5l9v4gr7lx5fxbmrlsswvvn"; }
- { name = "icicles-var.el"; sha256 = "1a9cwxpi10x44fngxa7qnrg8hqfvdjb8s8k47gnn1rbh63blkkry"; }
+ { name = "icicles.el"; sha256 = "10w1lghh9jqxxm5cszi2qyk24vnvazfywmyyz1v7zf6cyiwbndrz"; }
+ { name = "icicles-chg.el"; sha256 = "020yg4hv120mcy7qvn76j85q6hl7mfcfv66w55c6izc9lbrvvnv8"; }
+ { name = "icicles-cmd1.el"; sha256 = "1715x1vkiax93890gfjbzslxsn4swsv37spvyx7chy4s1mym9kfw"; }
+ { name = "icicles-cmd2.el"; sha256 = "187k0gmn34fn6w1dw9hjf4i788y01vk47z7ac11ar4bddwh97ddx"; }
+ { name = "icicles-doc1.el"; sha256 = "1bw5dkymn2xdrfrp80am0gqi0szs0xihny4qmgzgx6hfbng351qh"; }
+ { name = "icicles-doc2.el"; sha256 = "0zd94m1a8mwwbrbcrahxxx8q34w8cg5lna4yww4m1gliyklww86s"; }
+ { name = "icicles-face.el"; sha256 = "1mlz8dq7bgzp2cf5j37i25yw90ry657d2m8r93rdj67h7l4wyxhj"; }
+ { name = "icicles-fn.el"; sha256 = "1cdghvgsr0b7pdq4lmnfm6kwwcqbk4wqf168kf2sjajbpa24ix96"; }
+ { name = "icicles-mac.el"; sha256 = "1w5sgzbp8hyjzrmqd8bwivszaayzh8dkyqa0d751adiwjfs9sq9m"; }
+ { name = "icicles-mcmd.el"; sha256 = "1lf2galn3g52hfz61avlr4ifyn5b42dfbmyq78cpzlq7hzc928v2"; }
+ { name = "icicles-mode.el"; sha256 = "0gci04j6vx0vqsh4skarznklam1xibj7pjvy67kaip8b6a4zx9ip"; }
+ { name = "icicles-opt.el"; sha256 = "17g35ancml0mvywagzhjrgmlr4rhm1wgb5wg3fsqhhldib9qlz56"; }
+ { name = "icicles-var.el"; sha256 = "0ydixg41h09yncp8g2nv8zsyv8avg1hj2f3mgrmd2kf0n27bw2nv"; }
];
forAll = f: map f modules;
in
-stdenv.mkDerivation {
- name = "icicles-2014-11-06";
+stdenv.mkDerivation rec {
+ version = "2017-10-28";
+ name = "icicles-${version}";
- srcs = forAll ({name, sha256}: fetchurl { url = "http://www.emacswiki.org/emacs-en/download/${name}"; inherit sha256; });
+ srcs = forAll ({name, sha256}: fetchurl { url = "http://www.emacswiki.org/emacs/download/${name}"; inherit sha256; });
buildInputs = [ emacs ];
@@ -30,11 +31,13 @@ stdenv.mkDerivation {
buildPhase = "emacs --batch -L . -f batch-byte-compile *.el";
- installPhase = "mkdir -p $out/share/emacs/site-lisp; cp *.el *.elc $out/share/emacs/site-lisp/";
+ installPhase = "mkdir -p $out/share/emacs/site-lisp/emacswiki/${name}/; cp *.el *.elc $out/share/emacs/site-lisp/emacswiki/${name}/";
meta = {
homepage = http://www.emacswiki.org/emacs/Icicles;
description = "Enhance Emacs minibuffer input with cycling and powerful completion";
license = stdenv.lib.licenses.gpl2Plus;
+ platforms = emacs.meta.platforms;
+ maintainers = with stdenv.lib.maintainers; [ scolobb ];
};
}
diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index 4f0839c7d88cf7c26959e464d22b62d5defb9ceb..09c627fbca712585d6bab76497d1fe1a1bc784da 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -127,12 +127,12 @@
abc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "abc-mode";
- version = "20140225.944";
+ version = "20171020.319";
src = fetchFromGitHub {
owner = "mkjunker";
repo = "abc-mode";
- rev = "1dd6e1217136a6f986917a3e5f41c1007bac908d";
- sha256 = "1h4gwp2gyd4jhbkb8ai1zbzhhmlhmihbwzr0wsxg5yq074n72ifs";
+ rev = "238deedeb6c90df168045552eb463cfae9e1f88f";
+ sha256 = "1wkjdvsav2x9zsl25h87iyfl6r0md86i2gmxqhvf63acxqgrgb2q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/aaee9dc5de06747374f311d86a550d3cc15beed1/recipes/abc-mode";
@@ -355,25 +355,6 @@
license = lib.licenses.free;
};
}) {};
- ac-dabbrev = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "ac-dabbrev";
- version = "20130905.2218";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/ac-dabbrev.el?revision=9";
- sha256 = "0q0lbhdng5s5hqa342yyvg02hf2bfbwq513lj1rlaqz4ykvpd7fh";
- name = "ac-dabbrev.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/ac-dabbrev";
- sha256 = "03lndw7y55bzz4rckl80j0kh66qa82xxxhfakzs1dh1h9f1f0azh";
- name = "ac-dabbrev";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/ac-dabbrev";
- license = lib.licenses.free;
- };
- }) {};
ac-dcd = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, flycheck-dmd-dub, lib, melpaBuild }:
melpaBuild {
pname = "ac-dcd";
@@ -398,12 +379,12 @@
ac-emacs-eclim = callPackage ({ auto-complete, eclim, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ac-emacs-eclim";
- version = "20170104.743";
+ version = "20170924.1339";
src = fetchFromGitHub {
owner = "emacs-eclim";
repo = "emacs-eclim";
- rev = "ebb844d1ebdd7eb347e89063a9b6e9f890a1ff57";
- sha256 = "18q4blnxf7p2kvgh1rhr7pizga06z97hv1lxjgzv0dc2dll2zwmd";
+ rev = "14596d3a1c0e7f18be6b88eddebaf7f36eeca859";
+ sha256 = "04vmq8d68na8pxwd18lxf87v0nzf3cxxdvw8cqzj28his7g37bym";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/ac-emacs-eclim";
@@ -759,8 +740,8 @@
src = fetchFromGitHub {
owner = "xcwen";
repo = "ac-php";
- rev = "e0aaae30e4e5f18390e5d00953db02c1f03c44f6";
- sha256 = "1mrk37w88b4843jbghr9i79rbwbzwk8b1wljvzmm6x0q7ldlxmsm";
+ rev = "317ad1d023db6b2fe67444a2c075e656c35f5094";
+ sha256 = "1wyf93faq6z6wgcs3lxc6gv75bmxchg6kd98dza61zdyc0rj60wa";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php";
@@ -776,12 +757,12 @@
ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }:
melpaBuild {
pname = "ac-php-core";
- version = "20170612.2134";
+ version = "20171022.808";
src = fetchFromGitHub {
owner = "xcwen";
repo = "ac-php";
- rev = "e0aaae30e4e5f18390e5d00953db02c1f03c44f6";
- sha256 = "1mrk37w88b4843jbghr9i79rbwbzwk8b1wljvzmm6x0q7ldlxmsm";
+ rev = "317ad1d023db6b2fe67444a2c075e656c35f5094";
+ sha256 = "1wyf93faq6z6wgcs3lxc6gv75bmxchg6kd98dza61zdyc0rj60wa";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core";
@@ -822,8 +803,8 @@
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "de1f11e68f6752b3ee6738287d4dadb11bca8f8a";
- sha256 = "1jsx08pgwrz6n47a0zs05m0h6knpp9sgg8lrdwg792a93nrcqc5c";
+ rev = "e413e31d1e74fae1fc1bf86792013c3680be6580";
+ sha256 = "0hfibc1nllsp9zdb803ac6cwp6xx4xf8mvjszfq9vp5a63sgw0pl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags";
@@ -860,12 +841,12 @@
ac-slime = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, slime }:
melpaBuild {
pname = "ac-slime";
- version = "20150729.2035";
+ version = "20171027.1400";
src = fetchFromGitHub {
owner = "purcell";
repo = "ac-slime";
- rev = "fafc6f75c90b2dbf124edd3e2887860ce052081e";
- sha256 = "0dix8giqbc9la5mycrjgq287j03s44nhrg9b1drsca2sc58cnach";
+ rev = "6c80cb602ddad46486288f94ad7546396c6e4b1a";
+ sha256 = "11w1z653klghi6inv9n92cigz8m3c67j3r18mdk39inc3izwplkj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/ac-slime";
@@ -944,12 +925,12 @@
ace-jump-buffer = callPackage ({ avy, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ace-jump-buffer";
- version = "20170717.1148";
+ version = "20171031.850";
src = fetchFromGitHub {
owner = "waymondo";
repo = "ace-jump-buffer";
- rev = "9b1bb1a817c97cfa3853cc24474bd13e641f560d";
- sha256 = "1qlm025jhxqsb5xcp1mcpm4djlah9xnsw3m26cfrk686b17x8l4l";
+ rev = "ae5be0415c823f7bb66833aa4af2180d4cf99cef";
+ sha256 = "0zg4x5faxkp0gnjq7209hn74qkzmk8k7wbr7k8wxpssjbnmxkvd1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/31100b5b899e942de7796bcbf6365625d1b62574/recipes/ace-jump-buffer";
@@ -1028,12 +1009,12 @@
ace-link = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ace-link";
- version = "20170528.1158";
+ version = "20170925.723";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "ace-link";
- rev = "8af476ac323e56d3c69ec2ecd1c095de56ecd18e";
- sha256 = "0218qfmpjw57842w1wn6p5bkn1qmn39scnnsnc0a1xn8ywz1ivw0";
+ rev = "eee81e6f75b078a207a547e0e8cff8c3d4f0b07c";
+ sha256 = "03p8cdakbx5pz9f8s01chd0bzmgsz50zi433k6gh0vw553y8vcmi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/68032f40c0ce4170a22db535be4bfa7099f61f85/recipes/ace-link";
@@ -1136,11 +1117,11 @@
version = "20150530.1126";
src = fetchhg {
url = "https://bitbucket.com/gvol/emacs-achievements";
- rev = "5b4b7b6816aa";
- sha256 = "0zjncby2884cv8nz2ss7i0p17l15lsk88zwvb7b0gr3apbfpcpa3";
+ rev = "18a422131c12";
+ sha256 = "0nk1zhqx0lvckjc98b36125148zgx1l2axln8gvkdwlhrd2cc6vj";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/achievements";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/83ec19a4ebac6b2d0fd84939b393848f82620978/recipes/achievements";
sha256 = "1pwlibq87ph20z2pssk5hbgs6v8kdym9193jjdx2rxp0nic4k0cr";
name = "achievements";
};
@@ -1216,12 +1197,12 @@
add-node-modules-path = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "add-node-modules-path";
- version = "20170501.151";
+ version = "20170914.1912";
src = fetchFromGitHub {
owner = "codesuki";
repo = "add-node-modules-path";
- rev = "8eef7fa6765af1716fc21db08f19f3d3e9b68998";
- sha256 = "1dm2gdhs9zy5jqhbqipdgzfj24mrzxz064ax9l2dg0lqylk1dc0q";
+ rev = "eb09f4743af210a8e27f21889b4e0fef33208e4a";
+ sha256 = "064gzcyx6nkq9wdrf6sd64fs8biwfrn25qj9vv7gznlrl5rg31x9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/63e99d8fc0678d7b1831cae8940e9e6547780861/recipes/add-node-modules-path";
@@ -1279,12 +1260,12 @@
aes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "aes";
- version = "20170607.157";
+ version = "20171028.2323";
src = fetchFromGitHub {
owner = "Sauermann";
repo = "emacs-aes";
- rev = "8d9ddaa7d13875745241f0f98758b1d72dd3be92";
- sha256 = "1d998xyfnzgci62h0wv1n9a7hlk23ngcbl83k04ahz61g7haqnh2";
+ rev = "b7d5da89c3443292e4f0b1c9d254d459933cf5af";
+ sha256 = "0nz1lf77qr3vm90rm02d4inw8glav722rxsiqds76m4xsjrq02m7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/33ca3106852f82624b36c7e3f03f5c0c620f304f/recipes/aes";
@@ -1321,12 +1302,12 @@
ag = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "ag";
- version = "20170712.1549";
+ version = "20170915.1249";
src = fetchFromGitHub {
owner = "Wilfred";
repo = "ag.el";
- rev = "2efb3ea5c3f3b4de79a6f21fa8dbcf90afb758f5";
- sha256 = "06aagmalpxvic285v0ipvir6777ipj6l9izfqsblbb7j70klw0dm";
+ rev = "3b567902ccbec4ed9b8c5f5cd369be833e485e79";
+ sha256 = "1ihhmz4ww6iqbjbv1cvssixn01bkd2cl8pij7p32dxyyd8jdwlkq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/67f410ac3a58a038e194bcf174bc0a8ceceafb9a/recipes/ag";
@@ -1342,12 +1323,12 @@
aggressive-fill-paragraph = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "aggressive-fill-paragraph";
- version = "20161023.321";
+ version = "20170902.705";
src = fetchFromGitHub {
owner = "davidshepherd7";
repo = "aggressive-fill-paragraph-mode";
- rev = "25668da48db3b505f01875e0f4ededc5ad8dcb9e";
- sha256 = "141vc0byjax91m192gbv7xlcqjzwhm8pp4hv5bka0chx20g14vq6";
+ rev = "bcbc63d1c93cd8dc5bf2fc6eb4988fa76375c631";
+ sha256 = "042xvhfc7h571rdriixdf2s2aai8qz4w1wddbbbsq3ir0n814zp3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/982f5936f2d83222263df2886ca0b629076366bb/recipes/aggressive-fill-paragraph";
@@ -1363,12 +1344,12 @@
aggressive-indent = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "aggressive-indent";
- version = "20170627.1223";
+ version = "20171012.1107";
src = fetchFromGitHub {
owner = "Malabarba";
repo = "aggressive-indent-mode";
- rev = "d6778ae89cd2d40949aa076a43e327f7acff59c3";
- sha256 = "0xya19w1bwpqrrqvmms0lfhqb168iv7j6kvnn49zbynnf9dhgr9w";
+ rev = "1d7185d27020c3e91a7da21800716079297938ac";
+ sha256 = "0397kfy0lmgdic4jc8fqhsgpv8r4lrqcfanqbfbchfxwfswbqb8p";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/aggressive-indent";
@@ -1383,11 +1364,11 @@
}) {};
ahg = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
pname = "ahg";
- version = "20161110.455";
+ version = "20171003.39";
src = fetchhg {
url = "https://bitbucket.com/agriggio/ahg";
- rev = "0e1d1b4142e7";
- sha256 = "09606q8b9qhz1szshv8aapc7450j085rjf2fv769vbivr3kshqvh";
+ rev = "6a4cc7a7eee6";
+ sha256 = "09c3rawxqxxbl648bq1akawmgwiwppzd9g2sspza0k52adsb3rps";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/ahg";
@@ -1424,12 +1405,12 @@
ahungry-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ahungry-theme";
- version = "20170702.2226";
+ version = "20171103.2238";
src = fetchFromGitHub {
owner = "ahungry";
repo = "color-theme-ahungry";
- rev = "e3d7e22cb10582a443b0e245be68aca936cd6abf";
- sha256 = "0fsip64bxs55kkqmpfcg4nr391b6wsd8hiq4fxvwww7n52lwsn5s";
+ rev = "9ec7fca8002b213c7eee1168258e36a683190d18";
+ sha256 = "01gjmyxb0m6i321md77wscqrhy30gyhrk4fjcx7mg2z9hzxvzljb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/520295978fd7de3f4266dd69cc30d0b4fdf09db0/recipes/ahungry-theme";
@@ -1487,12 +1468,12 @@
alchemist = callPackage ({ company, dash, elixir-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }:
melpaBuild {
pname = "alchemist";
- version = "20170803.414";
+ version = "20171029.2307";
src = fetchFromGitHub {
owner = "tonini";
repo = "alchemist.el";
- rev = "8ea2db4781e367c1cf8ce2eec4222daa7d1b7b57";
- sha256 = "0gq4l95krvirv2rb4l52gka39588k817g4kl483hj2ii9il32gd0";
+ rev = "4beb4c9ceee0534a36f7669aa35fcbdfd6bef7b7";
+ sha256 = "0k1k5rb95nyndzhin47r4nzap4fp3dr57gv557wzy3a6jpl88fgz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6616dc61d17c5bd89bc4d226baab24a1f8e49b3e/recipes/alchemist";
@@ -1508,12 +1489,12 @@
alda-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "alda-mode";
- version = "20170803.1852";
+ version = "20171103.1548";
src = fetchFromGitHub {
owner = "jgkamat";
repo = "alda-mode";
- rev = "08556b3050c0bfc2d8f0a6d918610dbb2b85958f";
- sha256 = "1f2m7pz3l62gk5ndfh49hm87ihz0lfk28izps9j3i68h4zclk3ls";
+ rev = "ea0d3a25ca2b45d08c510ad55b3d8a5374b2ec43";
+ sha256 = "18rfn6608sxwv8r0kdrzhag58kf1822xmy7h9gw1ci7mfpq2i1ns";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2612c494a2b6bd43ffbbaef88ce9ee6327779158/recipes/alda-mode";
@@ -1529,12 +1510,12 @@
alect-themes = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "alect-themes";
- version = "20170701.751";
+ version = "20170825.1009";
src = fetchFromGitHub {
owner = "alezost";
repo = "alect-themes";
- rev = "d1d19c76393ffe80fb11c6837e8582c3cb087d40";
- sha256 = "1gyjswlgbx5p1pq74qncrcjypkrfqd3dxm39bnbaszc6rhb58k8k";
+ rev = "ded94ab1421994aa863a4d7538ec7453768ec235";
+ sha256 = "1616vkjgn5g4xf40p15847pkqyrlfzp9d143a4cyk7za50a175ll";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/84c25a290ae4bcc4674434c83c66ae128e4c4282/recipes/alect-themes";
@@ -1550,12 +1531,12 @@
alert = callPackage ({ fetchFromGitHub, fetchurl, gntp, lib, log4e, melpaBuild }:
melpaBuild {
pname = "alert";
- version = "20170503.1714";
+ version = "20171024.1907";
src = fetchFromGitHub {
owner = "jwiegley";
repo = "alert";
- rev = "affbbc5f359a7abcf50f4509b712fc7a80843f51";
- sha256 = "04zxhxkk8dnq07m2cidn9mw05m2wyvix6vvbj1jaaawb60b1ic7q";
+ rev = "206d7095c93a25bb41af17cd26fd3967ddd57e00";
+ sha256 = "1lyvq0zkamlyv3z23x8hb8dirjd45bihqhmwdgilnw3y139vhm4l";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/113953825ac4ff98d90a5375eb48d8b7bfa224e7/recipes/alert";
@@ -1613,12 +1594,12 @@
all-the-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild, memoize }:
melpaBuild {
pname = "all-the-icons";
- version = "20170726.140";
+ version = "20171011.324";
src = fetchFromGitHub {
owner = "domtronn";
repo = "all-the-icons.el";
- rev = "64fd8651fde0a25d55561517576d05c407373f8e";
- sha256 = "0f57pym95bgb6s2mkwpk3jvsinwlz350k63xph6fkijygwzfkmwm";
+ rev = "b93707e3a3a7a4968b3e212b890edfe265dcd57d";
+ sha256 = "09hyg0fs3qgyc6dbn23pw8p7w2m9xvkf5cz8v0f18a7fkvq2j2f9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons";
@@ -1790,12 +1771,12 @@
amx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "amx";
- version = "20170810.1842";
+ version = "20170923.835";
src = fetchFromGitHub {
owner = "DarwinAwardWinner";
repo = "amx";
- rev = "7a51b7854036cf6c5ecce8ff09ace2a9595c002f";
- sha256 = "1x0f5wqyg56xw3byg18wlb16d5m6pn63axvdfiwibyqm9y1ljqm6";
+ rev = "88ab7ccb2a88b5cd3ecc4d703ae9373df3e4971c";
+ sha256 = "1n1zsrlj272scl4xcbys86d6gxnaq08vp5frd96i47c1an75p0xw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c55bfad05343b2b0f3150fd2b4adb07a1768c1c0/recipes/amx";
@@ -1811,12 +1792,12 @@
anaconda-mode = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }:
melpaBuild {
pname = "anaconda-mode";
- version = "20170405.301";
+ version = "20170924.704";
src = fetchFromGitHub {
owner = "proofit404";
repo = "anaconda-mode";
- rev = "0f9576791b86e0b315447e6823b3a7db131cd826";
- sha256 = "1qqh1gg4sanh0vi624gys9wdncmvc92kly4zlwl6a9jhi3sr7w3s";
+ rev = "89fc16d50b889a17521084347b28f3011b84e113";
+ sha256 = "08wdci57vig88iy5kk57k5qjkzphbbzy8g7b87hxakfgdmcwpg3g";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode";
@@ -1850,26 +1831,6 @@
license = lib.licenses.free;
};
}) {};
- anchored-transpose = callPackage ({ fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "anchored-transpose";
- version = "20080904.2254";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/anchored-transpose.el?revision=8";
- sha256 = "1hklypbp79pgaf1yklbm3qx4skm3xlml0cm1r9b9js3dbqyha651";
- name = "anchored-transpose.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/993271c9931170c3352daa3c1c0a8bcfa6915d9a/recipes/anchored-transpose";
- sha256 = "19dgj1605qxc2znvzj0cj6x29zyrh00qnzk2rlwpn9hvzypg9v7w";
- name = "anchored-transpose";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/anchored-transpose";
- license = lib.licenses.free;
- };
- }) {};
android-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "android-mode";
@@ -2041,12 +2002,12 @@
ansible = callPackage ({ f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "ansible";
- version = "20161218.1707";
+ version = "20170926.1951";
src = fetchFromGitHub {
owner = "k1LoW";
repo = "emacs-ansible";
- rev = "a712d9b48809c975525cb059ea278cbe8a839f5a";
- sha256 = "1jfksnk5fvr4h8mqb0mr2czyxnjmcdlrqdylvj0k0ks6xnskza91";
+ rev = "9da54a2a426dca259ec9c2a8a60fb58e954be5bc";
+ sha256 = "16z286gqy18s6bff1njkjpy0swrkfyarvb5xvik49pigd8hzh495";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8e45bf58b980ff542a5e887707a6361eb5ac0492/recipes/ansible";
@@ -2415,25 +2376,6 @@
license = lib.licenses.free;
};
}) {};
- aok = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "aok";
- version = "20130824.427";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/aok.el?revision=13";
- sha256 = "10vdmxzifxx3fkpyg76ngnj79k3d2pq0f322rd8ssc66alxhkz3g";
- name = "aok.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/38eee4f0f7ad25d9b1de9011e63b82400177cdd5/recipes/aok";
- sha256 = "1nkkbfwqp5r44wjwl902gm0xc8p3d2qj5mk1cchilr2rib52zd46";
- name = "aok";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/aok";
- license = lib.licenses.free;
- };
- }) {};
aozora-view = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "aozora-view";
@@ -2460,14 +2402,14 @@
pname = "apache-mode";
version = "20170711.913";
src = fetchFromGitHub {
- owner = "zonuexe";
+ owner = "emacs-php";
repo = "apache-mode";
rev = "0906559e0cb2997405d98ea6b2195954e3935d3b";
sha256 = "0vfyi34qcwkz9975cq5hin1p2zyy3h05fni4f93xyrcs31zvmk22";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/b5216c40e60c5a69a6235c15b432b5e9bdda6fd3/recipes/apache-mode";
- sha256 = "0f8r3xnnidcm9ahj8c3s1vxk6yqk3ra34nrc19r76xyprbb2sjsm";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/apache-mode";
+ sha256 = "0wzfx3kaiwvya30ihq3vpdhy6znkzf25w5x43x457ifdn2vrh9zi";
name = "apache-mode";
};
packageRequires = [];
@@ -2521,12 +2463,12 @@
apiwrap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "apiwrap";
- version = "20170506.2356";
+ version = "20171022.2203";
src = fetchFromGitHub {
owner = "vermiculus";
repo = "apiwrap.el";
- rev = "8b60f9e9082583aa537369499506c70f192467ab";
- sha256 = "13pr2hkn2jmg85299lga9rvllghkc0khfdgl3d8g2al9ib0il8pk";
+ rev = "79422b610f2c3d9f52fb35449485a2fc541bc5a0";
+ sha256 = "0i2k975szdgzmrbwkvcnhrk73ndvk0q215fn68sb5m4zf43ifwxz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0197fd3657e65e3826375d9b6f19da3058366c91/recipes/apiwrap";
@@ -2602,35 +2544,15 @@
license = lib.licenses.free;
};
}) {};
- apropos-fn-plus-var = callPackage ({ fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "apropos-fn-plus-var";
- version = "20170221.748";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/apropos-fn+var.el";
- sha256 = "0aa8d92ibbi1ix60j73nhvy16l8dkb3njn9d9z256jixmvzab7gr";
- name = "apropos-fn+var.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/cd66a7c1a54ede8a279effeee5326be392058d1c/recipes/apropos-fn+var";
- sha256 = "1s5gnsipsj7dhc8ca806grg32i6vlwm78hcxhrbs830vx9k84g5x";
- name = "apropos-fn-plus-var";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/apropos-fn+var";
- license = lib.licenses.free;
- };
- }) {};
apropospriate-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "apropospriate-theme";
- version = "20170726.1123";
+ version = "20171010.1420";
src = fetchFromGitHub {
owner = "waymondo";
repo = "apropospriate-theme";
- rev = "4137ad1eed3fc2fe48c122e636f83580d1d04dd9";
- sha256 = "1ydxwlv3v2whl4k77shlyjk0yyrm4cr6src9rsbzvw6in5cm483f";
+ rev = "b4d5a2fedec176d3562943668609766fab0b23ff";
+ sha256 = "0y31zx6npv03ygjywy23pvrpvjwi1fh1qhs1qzxsi25pbbk1hkq0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1da33013f15825ab656260ce7453b8127e0286f4/recipes/apropospriate-theme";
@@ -2643,22 +2565,23 @@
license = lib.licenses.free;
};
}) {};
- apu = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "apu";
- version = "20170221.750";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/apu.el?revision=27";
- sha256 = "15mq2b0df4hx53hqvgl3hcrbf9ww370byg90cail6rm50wamyik6";
- name = "apu.el";
+ apt-sources-list = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "apt-sources-list";
+ version = "20171004.1143";
+ src = fetchgit {
+ url = "https://git.korewanetadesu.com/apt-sources-list.git";
+ rev = "842c3896f660295e4c16938aa1fd195e5d377460";
+ sha256 = "1d1v2h91vabqdrjcrdnzqj4xzmm7gbad4mxcphrj5yfnc4rrfc12";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/ad04078221946c9d6b758809ec03ff88efce7322/recipes/apu";
- sha256 = "0399rmjwcs7fykj10s9m0lm2wb1cr2bzw2bkgm5rp4n3va0rzaa2";
- name = "apu";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/141a22e593415302d64cf8ebd2635a1baf35eb38/recipes/apt-sources-list";
+ sha256 = "1gnl6zqv6imk2qpv4lj7qyjgf1ldxib3k14gsmwqm0c1zwjsid3j";
+ name = "apt-sources-list";
};
- packageRequires = [];
+ packageRequires = [ emacs ];
meta = {
- homepage = "https://melpa.org/#/apu";
+ homepage = "https://melpa.org/#/apt-sources-list";
license = lib.licenses.free;
};
}) {};
@@ -2667,14 +2590,14 @@
pname = "arch-packer";
version = "20170730.621";
src = fetchFromGitHub {
- owner = "brotzeitmacher";
+ owner = "brotzeit";
repo = "arch-packer";
rev = "940e96f7d357c6570b675a0f942181c787f1bfd7";
sha256 = "0m80ka51m7a1797q6br41x96znvqfmpwzh3vk4mz66mdx2r4xk77";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/39f13017cde2d209a58dc45f0df25dc723398b72/recipes/arch-packer";
- sha256 = "06gmkc63ys6diiwbhdjyn17yhvs91nxdhqkydmm18553pzsmcy72";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/6d1796688ed0d6957557d960ca28e450f9bcb6cf/recipes/arch-packer";
+ sha256 = "04kv22vpcpjhc047yz6k6dizmwwdjk6vcm8imri76gi9ns1w5n5z";
name = "arch-packer";
};
packageRequires = [ async dash emacs s ];
@@ -2704,6 +2627,27 @@
license = lib.licenses.free;
};
}) {};
+ archive-rpm = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "archive-rpm";
+ version = "20171016.112";
+ src = fetchFromGitHub {
+ owner = "legoscia";
+ repo = "archive-rpm";
+ rev = "e2fac6c018c19001f1f28e7c80721724684f8941";
+ sha256 = "1qq0z5mmbhd0ma8v8bxy53n6ynqz5qf9n3h7566dylmdncyyv7hw";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e5f5653e62afdc022eac30bda3d21bd2d2625d2e/recipes/archive-rpm";
+ sha256 = "0s53zbn71lb008gw3f0b5w4q0pw0vgiqbffgnyib24sh03ijl7z7";
+ name = "archive-rpm";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/archive-rpm";
+ license = lib.licenses.free;
+ };
+ }) {};
arduino-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "arduino-mode";
@@ -2830,25 +2774,6 @@
license = lib.licenses.free;
};
}) {};
- ascii = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "ascii";
- version = "20130824.500";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/ascii.el?revision=10";
- sha256 = "05fjsj5nmc05cmsi0qj914dqdwk8rll1d4dwhn0crw36p2ivql75";
- name = "ascii.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ascii";
- sha256 = "0f90anxrpnb8k1lqmz0iim4yp20riy19palwmdyl840hz69m98cd";
- name = "ascii";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/ascii";
- license = lib.licenses.free;
- };
- }) {};
asilea = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "asilea";
@@ -2915,12 +2840,12 @@
async = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "async";
- version = "20170804.2158";
+ version = "20171015.2239";
src = fetchFromGitHub {
owner = "jwiegley";
repo = "emacs-async";
- rev = "d395e92d2a12e8b944ccfcdc1330c8665a3187f5";
- sha256 = "03n93cwbwrbs73kv2ysgc1qw6as8wd2q5cl743zb58y6h74kshv0";
+ rev = "424ecd8a28cd59fe7d2de3cb4b37a4224e34c123";
+ sha256 = "0zmbg3r6sykmchy8hhbw8glzl8xvki030rzg9r55v4g61k8qy13r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/async";
@@ -3020,12 +2945,12 @@
atomic-chrome = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, websocket }:
melpaBuild {
pname = "atomic-chrome";
- version = "20161213.730";
+ version = "20171022.107";
src = fetchFromGitHub {
owner = "alpha22jp";
repo = "atomic-chrome";
- rev = "1b96d563c5d435baf8dfa9cdae5ef38ce34629b9";
- sha256 = "0caiv0snjxj0f1p0rx18r1w4nbsk8shrin2dr2ddg54mpxzf8r98";
+ rev = "1bd79fc940d2be82eaec20aca2069677e156a697";
+ sha256 = "1j5brpmbahnrp8kxphq10g0l703czdalqa731y3s2p3m3gida54x";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/35785773942a5510e2317ded5bdf872ffe434e8c/recipes/atomic-chrome";
@@ -3125,12 +3050,12 @@
auth-password-store = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, seq }:
melpaBuild {
pname = "auth-password-store";
- version = "20170123.107";
+ version = "20171026.537";
src = fetchFromGitHub {
owner = "DamienCassou";
repo = "auth-password-store";
- rev = "b9fb3ef8d4ebe7bef939a3cf574f9caa833347c9";
- sha256 = "1rzqz560zqsymdpv84n1z17jyf7k75797y4bkzhk5grd3ry77x9j";
+ rev = "79e297e9f2c2bccb545994ddda356f958889b4ac";
+ sha256 = "11nc3hicp8n21rmj00svzh0kfhyb92w37ipk6nkl1fd3jk1xzr7d";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0f4d2a28373ba93da5b280ebf40c5a3fa758ea11/recipes/auth-password-store";
@@ -3185,34 +3110,15 @@
license = lib.licenses.free;
};
}) {};
- auto-capitalize = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "auto-capitalize";
- version = "20160415.1403";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/auto-capitalize.el?revision=19";
- sha256 = "0xywyfpsi64g9lihm5ncmjrj06iq9s6pp9fmsgj1hdf9y0z65lg0";
- name = "auto-capitalize.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/d4edbba637a27a641f53f8a51861b176cabaa286/recipes/auto-capitalize";
- sha256 = "18fygc71n9bc0vrpymz2f7sw9hzkpqxzfglh53shmbm1zns3wkw0";
- name = "auto-capitalize";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/auto-capitalize";
- license = lib.licenses.free;
- };
- }) {};
auto-compile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, packed }:
melpaBuild {
pname = "auto-compile";
- version = "20170805.447";
+ version = "20170817.1437";
src = fetchFromGitHub {
owner = "emacscollective";
repo = "auto-compile";
- rev = "ef7d0fb0ac902e40a5010f8c54d3fe1f279723ef";
- sha256 = "11ha04cfs8pm3f23hy4v8cfkfzkhig2mapwyq4brjcrbrwpac9zp";
+ rev = "a31819a1b75a2320edb0f7f25d6c6faf528bf41a";
+ sha256 = "17hzl03livgj49zb0knlfn6r020nvj41pjjz3acy82zwrjydsvxa";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/auto-compile";
@@ -3501,12 +3407,12 @@
auto-dim-other-buffers = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "auto-dim-other-buffers";
- version = "20161004.539";
+ version = "20170925.1208";
src = fetchFromGitHub {
owner = "mina86";
repo = "auto-dim-other-buffers.el";
- rev = "31c13e7ed87dd862c73b836d11c127164edb1458";
- sha256 = "0snkc7pkiv8iiy7xb64mg8ja7ig0rzkp5b6qkbalgxk9m4l8nmcb";
+ rev = "d1ee176652d7f5a77608e54175b7e67c31d41381";
+ sha256 = "1qqb051b16z2ay1xqx2ncy2p07cs29dv6wdy1x3n3w85yw9kh0mx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/auto-dim-other-buffers";
@@ -3561,34 +3467,15 @@
license = lib.licenses.free;
};
}) {};
- auto-install = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "auto-install";
- version = "20150418.1702";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/auto-install.el?revision=82";
- sha256 = "043pb2wk7jh0jgxphdl4848rjyabna26gj0vlhpiyd8zc361pg9d";
- name = "auto-install.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/7ad02a591b981518abd147475195f9484e4012fc/recipes/auto-install";
- sha256 = "1gaxc2ya4r903k0jf3319wg7wg5kzq7k8rfy8ac9b0wfzv247ixk";
- name = "auto-install";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/auto-install";
- license = lib.licenses.free;
- };
- }) {};
auto-minor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "auto-minor-mode";
- version = "20170716.717";
+ version = "20170917.1437";
src = fetchFromGitHub {
owner = "joewreschnig";
repo = "auto-minor-mode";
- rev = "06fa6975a9fb171b91a8b8234d65ef72374d64e2";
- sha256 = "19r71hdgz367f6cgyqfdpilwlmhrjw5drmijpq8m0fxgysnmz2qd";
+ rev = "07ea9df59c5364d1938beef3dfbba24afd46c230";
+ sha256 = "007w6j6zhjv2647njh80vfbrhjzhmb8rx9yi9rf94fhf17z8pmk3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b3ab5f048034777551e344101d8415cac92362c8/recipes/auto-minor-mode";
@@ -3751,12 +3638,12 @@
auto-virtualenvwrapper = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s, virtualenvwrapper }:
melpaBuild {
pname = "auto-virtualenvwrapper";
- version = "20170618.52";
+ version = "20170916.1304";
src = fetchFromGitHub {
owner = "robert-zaremba";
repo = "auto-virtualenvwrapper.el";
- rev = "516cb0406a98fd5a41d389f37544f11b28b1d027";
- sha256 = "0y82n8354nri2qpz7bn58rbhpjkqiaf82q9izhl6jy12g63g416l";
+ rev = "0f2cc8ea8f211c7b88f852ae6ffe677914652b92";
+ sha256 = "1vm2nf7i9v56v57r7ckz8i1y3fk5s302bcfglywqysm4b8k36mp8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/02a209ae8f9fc68feb3bb64d32d129fedef2b80b/recipes/auto-virtualenvwrapper";
@@ -3793,12 +3680,12 @@
autobookmarks = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "autobookmarks";
- version = "20170417.1407";
+ version = "20171021.1532";
src = fetchFromGitHub {
owner = "Fuco1";
repo = "autobookmarks";
- rev = "cd19e15b8951a7af55d67a5bb4e0948e62b0a119";
- sha256 = "1xv73ls9mhvgjxa9lpw3brmzdd8739zyn9nqb1lrnvx468bz4kry";
+ rev = "b40c69f2d1c419adad516bee81b07b99110e5cc3";
+ sha256 = "0dailajx26dixlibqps5wfh224ps7azm453lmzxjc2d10mgapi5v";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e40e6ebeb30b3f23ad37a695e011431a48c5a62e/recipes/autobookmarks";
@@ -3853,26 +3740,6 @@
license = lib.licenses.free;
};
}) {};
- autofit-frame = callPackage ({ fetchurl, fit-frame, lib, melpaBuild }:
- melpaBuild {
- pname = "autofit-frame";
- version = "20170221.752";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/autofit-frame.el?revision=48";
- sha256 = "0c2b0d743w1c58iicg9r194zq2l5xxa08zyxj0nljw2dz9lhacwm";
- name = "autofit-frame.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/autofit-frame";
- sha256 = "0p24qqnfa1vfn5pgnpvbxwi11zjkd6f3cv5igwg6h0pr5s7spnvw";
- name = "autofit-frame";
- };
- packageRequires = [ fit-frame ];
- meta = {
- homepage = "https://melpa.org/#/autofit-frame";
- license = lib.licenses.free;
- };
- }) {};
automargin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "automargin";
@@ -4023,15 +3890,15 @@
avk-emacs-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "avk-emacs-themes";
- version = "20170110.1046";
+ version = "20171001.235";
src = fetchFromGitHub {
owner = "avkoval";
repo = "avk-emacs-themes";
- rev = "c75079ec9a84116c84c884c3bf258c95afcce7a7";
- sha256 = "1s9hn4y918h1ly1s8gfkidlwqijdzpbkfx1px8xfkia3b35qinvv";
+ rev = "bf781eec7d46cce829ac5bdb114e728a110366e7";
+ sha256 = "0bj51ii8vsd2gwyykxp1hvkp4r9kbc0b7ajskf8i5vb8qvpvkali";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/b986c7c981ccc5c7169930908543f2a515edaefa/recipes/avk-emacs-themes";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/ef362a76a3881c7596dcc2639df588227b3713c0/recipes/avk-emacs-themes";
sha256 = "0yimnfm50qsq505fc67b3qnxx2aiyz5a7bw87zkjrdnar12vv144";
name = "avk-emacs-themes";
};
@@ -4044,12 +3911,12 @@
avy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "avy";
- version = "20170813.254";
+ version = "20171014.20";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "avy";
- rev = "8556274978be5ca2947777dc5e28f5487e069449";
- sha256 = "0k0yw5vnv0f8xqly9s3ja90gcywnyg2b0pp3yxyk6r7qqns63pkj";
+ rev = "36f768d9e320d300b81799e0fcc097cb89aad780";
+ sha256 = "05jx71v5shdynia21wkrc1012r0wajdn0km1rclpyvf3ck34rh8q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/77fac7a702d4086fb860514e377037acedc60412/recipes/avy";
@@ -4107,12 +3974,12 @@
avy-migemo = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, migemo }:
melpaBuild {
pname = "avy-migemo";
- version = "20170411.858";
+ version = "20171031.915";
src = fetchFromGitHub {
owner = "momomo5717";
repo = "avy-migemo";
- rev = "97020c34176538480cfd28004f16f9b5494315e6";
- sha256 = "1dgjkhcsb1iyjcwbjyccr7550lczg74jl7w1g7kif8g0df0mc5g6";
+ rev = "5598fd25e483d8521e6d5f691802fa125947d7cf";
+ sha256 = "1gkn1qbywv8as3csp5s1fwmrp89bmbqgyl7av0c1v9ggx7gkhd5f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6a02db29eb3e4b76b4a9cdbc966df5a1bd35dec0/recipes/avy-migemo";
@@ -4146,25 +4013,6 @@
license = lib.licenses.free;
};
}) {};
- awk-it = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "awk-it";
- version = "20130917.1148";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/awk-it.el?revision=10";
- sha256 = "1r1vbi1r3rdbkyb2naciqwja7hxigjhqfxsfcinnygabsi7fw9aw";
- name = "awk-it.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/awk-it";
- sha256 = "0qic9m7c31sq4xgx7hnkhj0j0mfy26smghg266lrp5jii833qlz3";
- name = "awk-it";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/awk-it";
- license = lib.licenses.free;
- };
- }) {};
aws-ec2 = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, tblui }:
melpaBuild {
pname = "aws-ec2";
@@ -4186,18 +4034,18 @@
license = lib.licenses.free;
};
}) {};
- axiom-environment = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }:
+ axiom-environment = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "axiom-environment";
- version = "20161120.1200";
- src = fetchhg {
- url = "https://bitbucket.com/pdo/axiom-environment";
- rev = "110e20a7a86c";
- sha256 = "0s18bbfw4kcv9iij1016pamq394rg8xr7016qp6cxyklp9hivcdm";
+ version = "20171105.128";
+ src = fetchgit {
+ url = "https://bitbucket.org/pdo/axiom-environment.git";
+ rev = "33af42c1c3109f17d63c69cdca0319e424409a37";
+ sha256 = "1nv102jd07nrhkp4fci5n5f1l6z3qan1lb3ykhhvl90k9ygqbac5";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/axiom-environment";
- sha256 = "1d3h1fn5zfbh7kpm2i02kza3bq9s6if4yd2vvfjdhgrykvl86h66";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/9f07feb8686c76c330f282320b9f653dc16cadd5/recipes/axiom-environment";
+ sha256 = "0lr2kdm6jr25mi6s6mpahb8r56d3800r7jgljjdiz4ab36zqvgz3";
name = "axiom-environment";
};
packageRequires = [ emacs ];
@@ -4276,25 +4124,6 @@
license = lib.licenses.free;
};
}) {};
- backup-each-save = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "backup-each-save";
- version = "20130704.732";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/backup-each-save.el?revision=2";
- sha256 = "0b9vvi2m0fdv36wj8mvawl951gjmg3pypg08a8n6rzn3rwg0fwz7";
- name = "backup-each-save.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/88fd979eb479701303e65e68c581f8f847887842/recipes/backup-each-save";
- sha256 = "1fv9sf6vkjyv93vil4l9hjm2fg73zlxbnif0xfm3kpmva9xin337";
- name = "backup-each-save";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/backup-each-save";
- license = lib.licenses.free;
- };
- }) {};
backup-walker = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "backup-walker";
@@ -4379,27 +4208,6 @@
license = lib.licenses.free;
};
}) {};
- baidu-life = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "baidu-life";
- version = "20160426.519";
- src = fetchFromGitHub {
- owner = "lujun9972";
- repo = "el-baidu-life";
- rev = "5c4b3dbc016a2656cc2febaa2ac2268c05725b5c";
- sha256 = "024gpdjr1lbqjg6md526g4wz2shpgfpdrrd2m1bn4fissbzj70i1";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/101ae6ea151df8d423f00cb6ac391374d0f7f3c8/recipes/baidu-life";
- sha256 = "0rib50hja33qk8dmw5i62gaxhx7mscj2y0n25jmnds7k88ms8z19";
- name = "baidu-life";
- };
- packageRequires = [ cl-lib ];
- meta = {
- homepage = "https://melpa.org/#/baidu-life";
- license = lib.licenses.free;
- };
- }) {};
bar-cursor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bar-cursor";
@@ -4424,12 +4232,12 @@
base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "base16-theme";
- version = "20170806.1329";
+ version = "20171025.1545";
src = fetchFromGitHub {
owner = "belak";
repo = "base16-emacs";
- rev = "7b4e0dd8750e7a10fe446201e85346aeb18cca8e";
- sha256 = "1wcdzq4smi0070inrr5pc4zi6rbyxrf1ba0pj206cq14nfvjywj5";
+ rev = "1578c6cd8f76a664bda7fc9b2515ee8106552cb2";
+ sha256 = "0wp2vfk7hpvagdiad9g4wj5992f1fv4v77x387v1sz5w1zn195aj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme";
@@ -4445,12 +4253,12 @@
bash-completion = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bash-completion";
- version = "20170812.623";
+ version = "20170924.1021";
src = fetchFromGitHub {
owner = "szermatt";
repo = "emacs-bash-completion";
- rev = "8ca917f4287c133e27f02fc7f3eda47e16d9ab12";
- sha256 = "0bv0a3d6yk880zfql39xvjhpvw8x61qma57r4vgqk0lk0vqjcwq2";
+ rev = "31bc1c1c21691668c6cc16a46361490d5bec303a";
+ sha256 = "0iq9q0isaynrjhzgkm5hvw26162m52vbzwf12vic5nr9frxbxkv5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/bash-completion";
@@ -4470,8 +4278,8 @@
src = fetchFromGitHub {
owner = "nick96";
repo = "basic-c-compile";
- rev = "335e96e19647ad7245fb68cf7e68cf86c5023d23";
- sha256 = "1sq6mmg5361z30psn6x2ylpr8yxsbg3d47qai9px7p889p63384l";
+ rev = "0129786aeee50d7bb0020d9fc2b7508875d403e8";
+ sha256 = "0q6scyva1psyam7jzygqcr1wayf70vrp237hm01q5i9cin8j4j1z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/basic-c-compile";
@@ -4484,6 +4292,27 @@
license = lib.licenses.free;
};
}) {};
+ basic-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
+ melpaBuild {
+ pname = "basic-mode";
+ version = "20171027.1114";
+ src = fetchFromGitHub {
+ owner = "dykstrom";
+ repo = "basic-mode";
+ rev = "7a76ec2d45f6bc1e4b5a4c8996c4bf27a31741e6";
+ sha256 = "02q9sxx9g8pqyiknbzy48qbmnvgl1pmcgsppbk7rybb68kq5zlqd";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/71801bdc0720f150edeab6796487c753c6e7c3f5/recipes/basic-mode";
+ sha256 = "1l0ylzww7jg6l804fdrklhay4is0wx1drfi9l9wn7gcdjh76mr6g";
+ name = "basic-mode";
+ };
+ packageRequires = [ emacs seq ];
+ meta = {
+ homepage = "https://melpa.org/#/basic-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
basic-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "basic-theme";
@@ -4505,25 +4334,6 @@
license = lib.licenses.free;
};
}) {};
- batch-mode = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "batch-mode";
- version = "20140807.1350";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/batch-mode.el?revision=14";
- sha256 = "1aa611jrzw4svmxvw1ghgh53x4nry0sl7mxmp4kxiaybqqvz6a1p";
- name = "batch-mode.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/7fb675b865b8fa1497cdd33764bad051b2fd4d7e/recipes/batch-mode";
- sha256 = "1p0rh5r8w00jag64sbjy8xb9g6lqhm2fz476v201kbrj9ggp643x";
- name = "batch-mode";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/batch-mode";
- license = lib.licenses.free;
- };
- }) {};
bats-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bats-mode";
@@ -4568,11 +4378,11 @@
}) {};
bbdb = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
pname = "bbdb";
- version = "20170725.300";
+ version = "20171017.817";
src = fetchgit {
url = "https://git.savannah.nongnu.org/git/bbdb.git";
- rev = "c951e15cd01d84193937ae5e347143321c3a2da9";
- sha256 = "1m19f74zkyh0zyigv807rlznvf2l72kdg6gfizf8pan85qvk949l";
+ rev = "339aa15f20e1f542db97a3f3d2d65a61ce5c0e93";
+ sha256 = "00782y1vas8rd9g30jqhnc24bsqsy5c31qn85ipi1vc8lrbyfcg1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/bbdb";
@@ -4693,12 +4503,12 @@
bbyac = callPackage ({ browse-kill-ring, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bbyac";
- version = "20170814.222";
+ version = "20171007.722";
src = fetchFromGitHub {
owner = "baohaojun";
repo = "bbyac";
- rev = "591b4668e80998c4aed85b55623a8f127e77792b";
- sha256 = "1w3x74ca5gkjqzdj4sxy9syy55p1bw2r00hqw423bvv0jr20m6av";
+ rev = "584af0efa4809252bb37cf165df029410198327e";
+ sha256 = "17cmlc49y26j2salkmcsck9618s1p7y49phiy7hvzkipa13qmj9w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/92c10c13a1bd19c8bdbca128852d1c91b76f7002/recipes/bbyac";
@@ -4735,12 +4545,12 @@
beacon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
melpaBuild {
pname = "beacon";
- version = "20170404.906";
+ version = "20171017.1540";
src = fetchFromGitHub {
owner = "Malabarba";
repo = "beacon";
- rev = "f1a3ff5ea8fecf9bf250205de66aedf0bf49c35b";
- sha256 = "0wr2ffwbi5w23a7hbdmn5ijfy5gmizrmy75zj6m1bz4mbw23ccvn";
+ rev = "729338b02a0e331a4faf475da9f54771a3470106";
+ sha256 = "0mypzfasclq7bmw0i8hfyp8c1ycd3kdgd5h1faygzh9r0phh7ciy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d09cfab21be800831644218e9c8c4433087951c0/recipes/beacon";
@@ -4777,12 +4587,12 @@
beginend = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "beginend";
- version = "20170810.624";
+ version = "20171003.548";
src = fetchFromGitHub {
owner = "DamienCassou";
repo = "beginend";
- rev = "bc608ef0735e5b7e34b320b899fd2b3ce2156d1b";
- sha256 = "1vb9505lkzkl9ipczs3q0vmf70mzf9l1wk703g9b5aiss81r5w4i";
+ rev = "2762796b54c7fd8613b02c041b2b9afeb13eb9fa";
+ sha256 = "1g1mml0npypfk0vhicy4s7fa5df76xqpb80llxcfbnl2si9fzyfb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/31c1157d4fd9e47a780bbd91075252acdc7899dd/recipes/beginend";
@@ -4816,6 +4626,27 @@
license = lib.licenses.free;
};
}) {};
+ benchstat = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "benchstat";
+ version = "20171013.2012";
+ src = fetchFromGitHub {
+ owner = "Quasilyte";
+ repo = "benchstat.el";
+ rev = "a5b67cf7972ca2bbc9f5bc6a0f521ab02b76d4f0";
+ sha256 = "02v5l9qvzcr58qr973phgj1c846pqp3cj16khn4h9v3f3gb180n1";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/d9180fbedf95f9b1f5810bbf4929dfee513f89e3/recipes/benchstat";
+ sha256 = "0h2zi4gh23bas1zfj7j2x994lwgd3xyys96ipg1vq7z2b06572k9";
+ name = "benchstat";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/benchstat";
+ license = lib.licenses.free;
+ };
+ }) {};
bert = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bert";
@@ -4858,25 +4689,6 @@
license = lib.licenses.free;
};
}) {};
- better-registers = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "better-registers";
- version = "20140813.119";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/better-registers.el?revision=23";
- sha256 = "05dlhhvd1m9q642gqqj6klif13shbinqi6bi72fldidi1z6wcqlh";
- name = "better-registers.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/2667829dfc72e848ab939be0602cbec1105671b0/recipes/better-registers";
- sha256 = "01i0qjrwsc5way2h9z3pmsgccsbdifsq1dh6zhka4h6qfgrmn3bx";
- name = "better-registers";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/better-registers";
- license = lib.licenses.free;
- };
- }) {};
better-shell = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "better-shell";
@@ -4985,12 +4797,12 @@
bibretrieve = callPackage ({ auctex, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bibretrieve";
- version = "20170709.1150";
+ version = "20170906.1036";
src = fetchFromGitHub {
owner = "pzorin";
repo = "bibretrieve";
- rev = "6aea308680f8f2cab4c5ae06bb3b64bd0a2d9215";
- sha256 = "1lf1az6ijamvqcyvmyyppn53cqf2hp5v0bdj6d95j99rpz38pnfk";
+ rev = "41b9a77e49d6c2e6e6f854fb8b1b45b2967c2f86";
+ sha256 = "0rmb5qw9lj7xzwcw3haz6a22gpcb61cgkks194lq1w03gayj61rd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e548e0cf8babaf32f1db58099599a72cebdbb84d/recipes/bibretrieve";
@@ -5027,12 +4839,12 @@
bibtex-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bibtex-utils";
- version = "20170221.1757";
+ version = "20170817.1219";
src = fetchFromGitHub {
owner = "plantarum";
repo = "bibtex-utils";
- rev = "36953c6bd1e14eac553834720f383d4114585f55";
- sha256 = "0z21p9j4wsbiygwk8lz9awwy1c2w2mnfyq501bvvd7r99k7hhy2k";
+ rev = "ed5ccce46c2088a28a2f0c49caa679d2f20567f0";
+ sha256 = "0cy0w4986lngzhzmfvk9r5xf0qa9bdz2ybzgv3nkwl48pjqvvi15";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5764b6a880e8143db66e9011cc1c2bf0bcd61082/recipes/bibtex-utils";
@@ -5048,12 +4860,12 @@
bifocal = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bifocal";
- version = "20170625.1258";
+ version = "20171004.1124";
src = fetchFromGitHub {
owner = "riscy";
repo = "bifocal-mode";
- rev = "05d1076069d0a19292a38e835c32137e43ee9708";
- sha256 = "1fvr8vvpdd2xawv1j58wpxakbia31rzy513dakd78mlfkih2ixvg";
+ rev = "a8b222b069a6bd64531b4780905989797bad8abe";
+ sha256 = "0c6vzh35lj3pg9wd4v2fy6xdmcg9kq3n5br6rp4lx257gxglzpwh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/79e71995bd8452bad2e717884f148ec74c9735fc/recipes/bifocal";
@@ -5115,8 +4927,8 @@
src = fetchFromGitHub {
owner = "jwiegley";
repo = "use-package";
- rev = "360df30683a711c443f87e495ba14cdd125a505d";
- sha256 = "0nz0gk6gf9060hbyqr5vgzwr620k6l5sk9n6jbhfyrwmcscnmilc";
+ rev = "82d15961a0f2dc7842a98030d6daee0061ef63dc";
+ sha256 = "0i9cqms0bm6vfn8mzkzv40dql2mzmp2jma1na6m8bf1z2ciszy6l";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key";
@@ -5318,25 +5130,6 @@
license = lib.licenses.free;
};
}) {};
- blank-mode = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "blank-mode";
- version = "20130824.459";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/blank-mode.el?revision=40";
- sha256 = "1wdplnmdllbydwr9gyyq4fbkxl5xjh7220vd4iajyv74pg2jkkkv";
- name = "blank-mode.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/7e687f3d3945bdff0e8e36bcff1f629d8ad921fc/recipes/blank-mode";
- sha256 = "1pyx5xwflnni9my5aqpgf8xz4q4rvmj67pwb4zxx1lghrca97z87";
- name = "blank-mode";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/blank-mode";
- license = lib.licenses.free;
- };
- }) {};
blgrep = callPackage ({ clmemo, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "blgrep";
@@ -5386,8 +5179,8 @@
src = fetchFromGitHub {
owner = "mgrachten";
repo = "bln-mode";
- rev = "1de92cec97a4693b8b932713e333730118db9183";
- sha256 = "0dlcxh3acaiw3q9sa74jw4bpz7fv9lvpws68gw1qhs39f1plyzfx";
+ rev = "6c20b3269e88952c19ca9ad151221c7e2e27b465";
+ sha256 = "04ggaybf1yi0ynqfr6vslx0ld5n6zs2ymmk63hr6lp2jb6dyhdhx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ee12ef97df241b7405feee69c1e66b3c1a67204b/recipes/bln-mode";
@@ -5424,12 +5217,12 @@
blog-admin = callPackage ({ cl-lib ? null, ctable, f, fetchFromGitHub, fetchurl, lib, melpaBuild, names, s }:
melpaBuild {
pname = "blog-admin";
- version = "20170430.721";
+ version = "20170923.709";
src = fetchFromGitHub {
owner = "CodeFalling";
repo = "blog-admin";
- rev = "98e397c4014f7c81c42722028778726cbf9baf8c";
- sha256 = "0fj0yri8hayqb6fwgj5i6bw7yx4jsdq7jh9aqd5zdpmyfc6lshzr";
+ rev = "b5f2e1dad7d68ec903619f7280bb0bcb7e398a1e";
+ sha256 = "0fgzmmjxhl8i9yqx1bvb7hgkk9w4ylx73xy990qf1bl7fg21v636";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/blog-admin";
@@ -5466,12 +5259,12 @@
bm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bm";
- version = "20170103.1424";
+ version = "20170815.1609";
src = fetchFromGitHub {
owner = "joodland";
repo = "bm";
- rev = "dd5dc454c62ceae6432cef6639e08db6ea6a865f";
- sha256 = "0pjgiqhbch0kzlyqq0ij86nc8gjv5g9ammgx92z2k2pyj2zglh7h";
+ rev = "b1bc10b1e9f01c48a7eedb9b08a22d05e7baed3c";
+ sha256 = "16kfzi6chf28jyrsmz0jba3qq3mvxqambsdh09vr76ivmwbv48gh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/bm";
@@ -5550,12 +5343,12 @@
bonjourmadame = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bonjourmadame";
- version = "20160112.156";
+ version = "20170919.434";
src = fetchFromGitHub {
owner = "pierre-lecocq";
repo = "bonjourmadame";
- rev = "4b4baaec19d8893268a2c93b3c35ac2581d02ba4";
- sha256 = "06cpbjbv8ysz81szwgglgy5r1aay8rrzw5k86wyqg9jdzwpmilpn";
+ rev = "d3df185fce78aefa689fded8e56a654f0fde4ac0";
+ sha256 = "1acn63hd7s2z8viy52hmhncdic7m86rcqczxnz9aivikqy4hfnsi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/34c4cfd7bbf5b442a9304598ba0a23ba9b8dfae4/recipes/bonjourmadame";
@@ -5571,12 +5364,12 @@
boogie-friends = callPackage ({ cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
melpaBuild {
pname = "boogie-friends";
- version = "20170621.1207";
+ version = "20171024.1955";
src = fetchFromGitHub {
owner = "boogie-org";
repo = "boogie-friends";
- rev = "27c372592e19678bda5012f1ec3c60bcf9df78d4";
- sha256 = "1qcjbmkx6qim2j1sbzjjidqhrakjsipay9bdssyfyi4bwwp8mnq2";
+ rev = "ff9903783013f3598b6f44c99d47b25c5cdbed00";
+ sha256 = "0vc1pym7x6aafd88rrmm8yibq5y9wrx6b1pbgsfr7spcdq0hwwvg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5bdd06b82d002677c046876642efe1dc01bc3e77/recipes/boogie-friends";
@@ -5589,25 +5382,6 @@
license = lib.licenses.free;
};
}) {};
- bookmark-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "bookmark-plus";
- version = "20170731.1658";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/bookmark+.el";
- sha256 = "0iqvlwqilwpqlymj8iynw2miifl28h1g7z10q08rly2430fnmi37";
- name = "bookmark+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/bookmark+";
- sha256 = "0121xx7dp2pakk9g7sg6par4mkxd9ky746yk4wh2wrhprc9dqzni";
- name = "bookmark-plus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/bookmark+";
- license = lib.licenses.free;
- };
- }) {};
bool-flip = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bool-flip";
@@ -5632,12 +5406,12 @@
boon = callPackage ({ dash, emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }:
melpaBuild {
pname = "boon";
- version = "20170802.1256";
+ version = "20170825.416";
src = fetchFromGitHub {
owner = "jyp";
repo = "boon";
- rev = "d5c4e762fcfad605b95125d8422f0071494ddd91";
- sha256 = "1px37ymsakw3yxpa32sw7q4vi1mkiphaz0qfbl02gwxigdylpzlr";
+ rev = "13fca1929639e2239e9b4be060cbd4befd7921b4";
+ sha256 = "0nbwmb4l2f6y58gx8bm42688y6sqc33l5sf0gh1vmn2ki2mq7jvh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/boon";
@@ -5737,15 +5511,15 @@
bpr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bpr";
- version = "20160514.458";
+ version = "20170930.642";
src = fetchFromGitHub {
owner = "ilya-babanov";
repo = "emacs-bpr";
- rev = "8efa52363ae8f86ff06f2677e2e0fb963aa4c186";
- sha256 = "10178l56ryfxsrxysy9qb6vg71q1xavfw1sbchh0mrb90x12vilz";
+ rev = "314b0d6f69ff5a9c2d25a1ce5a2109d67d4d9bb3";
+ sha256 = "02qj8gnhxv39y8kvlw491cbiaknll3hg03pk4xx15rffl7dyrbds";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/410d9d7d9de4d53f1b760081ff46764f121e8f1d/recipes/bpr";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/bpr";
sha256 = "0rjxn40n4s4xdq51bq0w3455g9pli2pvcf1gnbr96zawbngrw6x2";
name = "bpr";
};
@@ -5842,12 +5616,12 @@
browse-kill-ring = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "browse-kill-ring";
- version = "20160125.9";
+ version = "20171016.1312";
src = fetchFromGitHub {
owner = "browse-kill-ring";
repo = "browse-kill-ring";
- rev = "c7df6c8f5fe1e82d17b23da6d43a038784721d10";
- sha256 = "0sndzhza9k4vcf70fzxsyzrfryaz92lm1y7bbb0dx10m65qljpbi";
+ rev = "b746d01c888262e81d76f8949869cf9e02759b6a";
+ sha256 = "177vbziv65jb3xla713iblng04m0f7hdq5d4hf0jaxn7pzm61n0d";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/294dc32a672e6b6b0ebfc46cdf0ff9ceacf73e89/recipes/browse-kill-ring";
@@ -5860,26 +5634,6 @@
license = lib.licenses.free;
};
}) {};
- browse-kill-ring-plus = callPackage ({ browse-kill-ring, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "browse-kill-ring-plus";
- version = "20170221.757";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/browse-kill-ring+.el";
- sha256 = "01cnh9i09b7i97aqjh8m7s18js85wm7cs25dxlkcrhy112pjb1nq";
- name = "browse-kill-ring+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/e700f4066e67991dd67f6476c783e0a5134723db/recipes/browse-kill-ring+";
- sha256 = "1flw7vmqgsjjvr2zlgz2909gvpq9mhz8qkg6hvsrzwg95f4l548w";
- name = "browse-kill-ring-plus";
- };
- packageRequires = [ browse-kill-ring ];
- meta = {
- homepage = "https://melpa.org/#/browse-kill-ring+";
- license = lib.licenses.free;
- };
- }) {};
browse-url-dwim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, string-utils }:
melpaBuild {
pname = "browse-url-dwim";
@@ -5901,34 +5655,15 @@
license = lib.licenses.free;
};
}) {};
- bs-ext = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "bs-ext";
- version = "20130824.459";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/bs-ext.el?revision=8";
- sha256 = "1yslzlx54n17330sf6b2pynz01y6ifnkhipz4hggn1i55bz8hvrw";
- name = "bs-ext.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/74c4861e76bb806ec4c4fd3482162bf0d95530a8/recipes/bs-ext";
- sha256 = "0dddligqr71qdakgfkx0r45k9py85qlym7y5f204bxppyw5jmwb6";
- name = "bs-ext";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/bs-ext";
- license = lib.licenses.free;
- };
- }) {};
bshell = callPackage ({ buffer-manage, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bshell";
- version = "20170806.1446";
+ version = "20170903.1137";
src = fetchFromGitHub {
owner = "plandes";
repo = "bshell";
- rev = "b25907d531d18000f68534d2a97cf4c2ffa38e68";
- sha256 = "04j4gkiqbfmgqs18hwsbwdb3xrzk5laqpdxx6vsj5g3pc9k6d1cv";
+ rev = "884a8b906617d305e9d5d2c3750618d2f86f9aed";
+ sha256 = "16qh71yhpxs5cxjmkiqiia8xrxa0ym2n32znp4yc7xiv2xfw2ss4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cf0ed51304f752af3e1f56caf2856d1521d782a4/recipes/bshell";
@@ -6067,22 +5802,22 @@
license = lib.licenses.free;
};
}) {};
- buffer-manage = callPackage ({ choice-program, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ buffer-manage = callPackage ({ choice-program, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "buffer-manage";
- version = "20170806.1436";
+ version = "20170916.957";
src = fetchFromGitHub {
owner = "plandes";
repo = "buffer-manage";
- rev = "df326e330ec6342648cc3c599155d7efc1eed5f9";
- sha256 = "1y7k1d18a2w8jgqkbmzgvr4ws3yyymgphsnq0dmb3bi4a5q21n4n";
+ rev = "4a0d526ca45264971796efe67c6e41d8aa659e4c";
+ sha256 = "15p089qfz8ra6f2lhny492hiricgs39w7w5iak2zlqm6k88cl1j8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/28f8f376df810e6ebebba9fb2c93eabbe3526cc9/recipes/buffer-manage";
sha256 = "0fwri332faybv2apjh8zajqpryi0g4kk3and8djibpvci40l42jb";
name = "buffer-manage";
};
- packageRequires = [ choice-program emacs ];
+ packageRequires = [ choice-program dash emacs ];
meta = {
homepage = "https://melpa.org/#/buffer-manage";
license = lib.licenses.free;
@@ -6129,25 +5864,6 @@
license = lib.licenses.free;
};
}) {};
- buffer-stack = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "buffer-stack";
- version = "20101223.220";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/buffer-stack.el?revision=2";
- sha256 = "0d87cl7a4rcd6plbjyf26vaar7imwd18z24xdi4dz734m9zbkg6r";
- name = "buffer-stack.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/buffer-stack";
- sha256 = "0lnd5mh20b4isa6m930dzibw3v4jyzp1ryvmz8irca28xfn0hjln";
- name = "buffer-stack";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/buffer-stack";
- license = lib.licenses.free;
- };
- }) {};
buffer-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "buffer-utils";
@@ -6169,6 +5885,27 @@
license = lib.licenses.free;
};
}) {};
+ buffer-watcher = callPackage ({ cl-lib ? null, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "buffer-watcher";
+ version = "20170913.139";
+ src = fetchFromGitHub {
+ owner = "NicolasPetton";
+ repo = "buffer-watcher";
+ rev = "b32c67c8a5d724257d759f4c903d0dedc32246ef";
+ sha256 = "0mygs48mk2z8cw1csz2wfyn7kln9662d16hwpmbxs5x8k71aq8jx";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/c8681776d467951d14d8247e6939bd9a6f2a80ec/recipes/buffer-watcher";
+ sha256 = "0v096021xk7k821bxb5zddw6sljqa6fs8f7s8j0w3pv6lmhra1ln";
+ name = "buffer-watcher";
+ };
+ packageRequires = [ cl-lib f ];
+ meta = {
+ homepage = "https://melpa.org/#/buffer-watcher";
+ license = lib.licenses.free;
+ };
+ }) {};
bufshow = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bufshow";
@@ -6256,12 +5993,12 @@
build-status = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "build-status";
- version = "20170323.1621";
+ version = "20171031.611";
src = fetchFromGitHub {
owner = "sshaw";
repo = "build-status";
- rev = "01bb9cc1776e8eaab68147175aee9879d9541c4b";
- sha256 = "1c6q6rk6rvip5xv2zdpqamprx9kqh0c6v3r939fn7m4fnyyz15fn";
+ rev = "c29a0146c5d0be274f5e17921e01698f572c23a1";
+ sha256 = "03f0h7sp0sr9kjyhvcx7i34lvc26f5x8nikfidihgzhrqpprv2b6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/23bbe012f313cf0cf4c45a66eb0bee9361ced564/recipes/build-status";
@@ -6403,12 +6140,12 @@
buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "buttercup";
- version = "20170812.128";
+ version = "20171029.1011";
src = fetchFromGitHub {
owner = "jorgenschaefer";
repo = "emacs-buttercup";
- rev = "6ad9565cd7adc195f81bdbbc1115a6bd96802a72";
- sha256 = "1qlfr09k39wmhr6lngsq1c7gdw4c8smvmn2vj6r2jlhnfav54ig5";
+ rev = "bbbf6924ff214b518718687ead96ceec92bdbaba";
+ sha256 = "0z05rr85mf9as2byj3k1ai9x5ci45a7g425svv0ywgz1lgv2vsi4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b187cb5b3cc5b546bfa6b94b6792e6363242d1/recipes/buttercup";
@@ -6466,12 +6203,12 @@
c-eldoc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "c-eldoc";
- version = "20170618.845";
+ version = "20170917.1502";
src = fetchFromGitHub {
owner = "nflath";
repo = "c-eldoc";
- rev = "0899f497e98e285d7d2e9cf897e305587b4b0790";
- sha256 = "0yw59pm25a5xrcdl6mv30i08wnhljy6gndvnlpi09vp2dln37kbq";
+ rev = "79d09769362228058246f5e6fa183d121f7fb322";
+ sha256 = "1398lfd18zn2xym36p71yavgggqbb15xz9m7gah4w4k2bk15aczk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/c-eldoc";
@@ -6841,17 +6578,19 @@
license = lib.licenses.free;
};
}) {};
- caml = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild }: melpaBuild {
+ caml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
pname = "caml";
- version = "20151009.845";
- src = fetchsvn {
- url = "https://caml.inria.fr/svn/ocaml/trunk/emacs/";
- rev = "16560";
- sha256 = "16qw82m87i1fcnsccqcvr9l6p2cy0jdhljsgaivq0q10hdmbgqdw";
+ version = "20171020.1013";
+ src = fetchFromGitHub {
+ owner = "ocaml";
+ repo = "ocaml";
+ rev = "43d77ff6ad60a39bac2be88dc399f28e763834d0";
+ sha256 = "1m13qcpzdk660q8q8pdj8lqpdjwxmycvl8205k0iqkgb7bmm0pgp";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/caml";
- sha256 = "1s05s3dqxlz2qhvjr3j9akb56finpmpbnsjb5pmjnzflhc4y01cf";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/d5a3263cdcc229b11a3e96edbf632d56f32c47aa/recipes/caml";
+ sha256 = "1ixs0626nsg1ilqdwj5rd8kicjy7mprswwy0kprppmpmc8y7xf7c";
name = "caml";
};
packageRequires = [];
@@ -6884,12 +6623,12 @@
cargo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }:
melpaBuild {
pname = "cargo";
- version = "20170807.607";
+ version = "20171026.13";
src = fetchFromGitHub {
owner = "kwrooijen";
repo = "cargo.el";
- rev = "61f4673b2b4d76ed6404f2c905e5de57c41ccc97";
- sha256 = "0nkrqmylyv2c7zrfy12p7j161mkg91zm9fb1gjjyq0k7ixad677q";
+ rev = "3ecf0b89b3d36874a301a7e2fb429fc026c73f35";
+ sha256 = "1mv1a0z379mr7y8by5s1lnkvp1kamch01j0yn1aqgxjry3z789dd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e997b356b009b3d2ab467fe49b79d728a8cfe24b/recipes/cargo";
@@ -6947,12 +6686,12 @@
cask = callPackage ({ cl-lib ? null, dash, epl, f, fetchFromGitHub, fetchurl, lib, melpaBuild, package-build, s, shut-up }:
melpaBuild {
pname = "cask";
- version = "20161024.1205";
+ version = "20170917.1107";
src = fetchFromGitHub {
owner = "cask";
repo = "cask";
- rev = "0a2e8436e02af6ca688b25ba90a19505a6113296";
- sha256 = "1fjsss678dj6vikm0ig5jqksjlwgnwhpaqfy3dk56gnjc49nl29v";
+ rev = "bf52c3ecb1356657cae12fe3229c0827181c1ed9";
+ sha256 = "0g4vnvbfvr9c2rjf0fbbvzw1ipvwgsp11sn0rjrpx5cwszghvy0w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/cask";
@@ -6989,12 +6728,12 @@
cask-package-toolset = callPackage ({ ansi, cl-lib ? null, commander, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }:
melpaBuild {
pname = "cask-package-toolset";
- version = "20170411.1430";
+ version = "20170921.1556";
src = fetchFromGitHub {
owner = "AdrieanKhisbe";
repo = "cask-package-toolset.el";
- rev = "aed1f12b6072a2467e0efa23c3265aaa9f414425";
- sha256 = "1as3fxs1h4gq6mv7gdsjqa59prrgzzs22c9qky8q47dr20sc9q6s";
+ rev = "2c74cd827e88c7f8360581a841e45f0b794510e7";
+ sha256 = "1hk5q6p1j7cqg5srr3v21xfyy7aas4hfj1a66h21c2xvfjra3hxw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ed71e45389626e700b93b29d5e2659b6706274d8/recipes/cask-package-toolset";
@@ -7028,6 +6767,26 @@
license = lib.licenses.free;
};
}) {};
+ catmacs = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "catmacs";
+ version = "20170826.457";
+ src = fetchgit {
+ url = "https://bitbucket.org/pymaximus/catmacs";
+ rev = "65d3e0563abe6ff9577202cf2278074d4130fbdd";
+ sha256 = "0954qck9j417c17niy28ccrhmsbjyh95z4dbqc5j4mib06j37587";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e62e45ea234a574ed602f27c3c6bc240bcd4fa43/recipes/catmacs";
+ sha256 = "0ym1szmq9ib75yiyy5jw647fcs7gg0d5dkskqc293pg81qf3im50";
+ name = "catmacs";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/catmacs";
+ license = lib.licenses.free;
+ };
+ }) {};
cbm = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cbm";
@@ -7196,26 +6955,6 @@
license = lib.licenses.free;
};
}) {};
- centered-cursor-mode = callPackage ({ fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "centered-cursor-mode";
- version = "20151001.634";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/centered-cursor-mode.el?revision=30";
- sha256 = "15psyizjz8wf9wfxwwcdmg1bxf8jbv0qy40rskz7si7vxin8hhxl";
- name = "centered-cursor-mode.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/centered-cursor-mode";
- sha256 = "1sq0hfvnm8sbqyxzr0znq0lwrhbqm961wi13yywjcwxd3x0ar3z0";
- name = "centered-cursor-mode";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/centered-cursor-mode";
- license = lib.licenses.free;
- };
- }) {};
centered-window-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "centered-window-mode";
@@ -7223,8 +6962,8 @@
src = fetchFromGitHub {
owner = "anler";
repo = "centered-window-mode";
- rev = "c46af782ada0d4062d7de5cbbdc7c7471fdd0d15";
- sha256 = "1xbfmanimq0ql61lzxx74jf4kj1g9imzgwiy1498mhbdbw295fg0";
+ rev = "6f9e873f5a98f356cee41367f2eaf1f5f5cd96fc";
+ sha256 = "0ih41g9haypr2ifi26kihwx2zfnzjh8n2898w2ljn7xzbd0nkx8c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/centered-window-mode";
@@ -7307,8 +7046,8 @@
src = fetchFromGitHub {
owner = "cfengine";
repo = "core";
- rev = "627b6c44e5af58a0b73503dc4c9f52c077c9136e";
- sha256 = "1ai0czdrzm58gmzg9bkcp16wa05rpwxllf1dwblny77mpd9c0ain";
+ rev = "6ca4b9c1b40de9617a4458d9193525ad99335a86";
+ sha256 = "123sdgjdxbxlml7vhnqv7a2mhwk8f203azdcscbff4hn4r3fz8x2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style";
@@ -7345,12 +7084,12 @@
cfml-mode = callPackage ({ cftag-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode }:
melpaBuild {
pname = "cfml-mode";
- version = "20170811.2240";
+ version = "20170903.1949";
src = fetchFromGitHub {
owner = "am2605";
repo = "cfml-mode";
- rev = "395c5a9422f7bda619fd67875a8a2173aaf9c807";
- sha256 = "1q0hy0baf8vcnnbanpl3za4q5ykxm33fyq2n863jp9v6b6wbc71d";
+ rev = "86e77dcbb583191a3e755bdc29534f33d82bfc56";
+ sha256 = "0b0261ap0jiys9d0x31xg7x36kpq06fni2c0cjhi58wpcykq3s1p";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0d28507e1109195004a371fa201d914b995c2b4e/recipes/cfml-mode";
@@ -7363,6 +7102,27 @@
license = lib.licenses.free;
};
}) {};
+ cframe = callPackage ({ buffer-manage, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "cframe";
+ version = "20170917.1509";
+ src = fetchFromGitHub {
+ owner = "plandes";
+ repo = "cframe";
+ rev = "bb99672502046e87c8f029ce98c637f762a4fc54";
+ sha256 = "088px3wlvr4km913y7hajrjqnxnv6n325rk6353bkbah2d75vxq4";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/6e39555b2538cc8a955766c5533871396e8fe712/recipes/cframe";
+ sha256 = "0pngdaflk1pk2xmwbij4b520b3mlacnjab4r3jby0phah44ziv4l";
+ name = "cframe";
+ };
+ packageRequires = [ buffer-manage dash emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/cframe";
+ license = lib.licenses.free;
+ };
+ }) {};
cftag-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cftag-mode";
@@ -7370,8 +7130,8 @@
src = fetchFromGitHub {
owner = "am2605";
repo = "cfml-mode";
- rev = "395c5a9422f7bda619fd67875a8a2173aaf9c807";
- sha256 = "1q0hy0baf8vcnnbanpl3za4q5ykxm33fyq2n863jp9v6b6wbc71d";
+ rev = "86e77dcbb583191a3e755bdc29534f33d82bfc56";
+ sha256 = "0b0261ap0jiys9d0x31xg7x36kpq06fni2c0cjhi58wpcykq3s1p";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0914d33ebf58847fa3906b1f0d53e97ac335b334/recipes/cftag-mode";
@@ -7384,17 +7144,19 @@
license = lib.licenses.free;
};
}) {};
- cg = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild }: melpaBuild {
+ cg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
pname = "cg";
- version = "20170201.347";
- src = fetchsvn {
- url = "https://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs";
- rev = "12304";
- sha256 = "0lv9lsh1dnsmida4hhj04ysq48v4m12nj9yq621xn3i6s2qz7s1k";
+ version = "20170911.610";
+ src = fetchFromGitHub {
+ owner = "emacsorphanage";
+ repo = "cg";
+ rev = "f5d74973d2cf19fd31db485ee6bfaaebcf96af2d";
+ sha256 = "0bmydpv3slv5fvy1admgsm1qlkfp4sdsd0caik48dn7bnghifggz";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/cg";
- sha256 = "0xj4yqjg0r9m9cvwgs60lsid6qm1fi8lmb068dj6xaga11n70si5";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/cg";
+ sha256 = "0yl2w48953vym4gxcxvjfaq3jgsv5jlya9vq3iwlfxqpapd3r3k9";
name = "cg";
};
packageRequires = [];
@@ -7406,12 +7168,12 @@
challenger-deep-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "challenger-deep-theme";
- version = "20170623.311";
+ version = "20171007.300";
src = fetchFromGitHub {
owner = "MaxSt";
repo = "challenger-deep";
- rev = "22022667437e94c2309c7c77a14268970de16146";
- sha256 = "1prvdrc8wjb7dy8dqj5gvjzzdiz6hqv252inlwcyjrqiq4apipxz";
+ rev = "b4cd8550dd6a26c4efd226156dff33e261e7a8cc";
+ sha256 = "1m0ackx5wvwff0qpy9204rmpq7yr6hd3bfkwahjy6kwfrjavkfbv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7942f539d025c1e2b059d49e1984716cbbc90a67/recipes/challenger-deep-theme";
@@ -7718,27 +7480,6 @@
license = lib.licenses.free;
};
}) {};
- chinese-fonts-setup = callPackage ({ cnfonts, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "chinese-fonts-setup";
- version = "20170726.1517";
- src = fetchFromGitHub {
- owner = "tumashu";
- repo = "cnfonts";
- rev = "5cfe656554c91b3d0dcc5417e43afa85d2a7a182";
- sha256 = "1px5gc83g70whdiysq7mmxz7rm74mhsjs2y1vbzgg8k1z0cs9wkp";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/0d5787ffeeee68ffa41f3e777071815084e0ed7a/recipes/chinese-fonts-setup";
- sha256 = "0fqj721zk57641wxnmk82wsj08ycnzj61z9i34x58d7c0k3424w1";
- name = "chinese-fonts-setup";
- };
- packageRequires = [ cnfonts emacs ];
- meta = {
- homepage = "https://melpa.org/#/chinese-fonts-setup";
- license = lib.licenses.free;
- };
- }) {};
chinese-number = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "chinese-number";
@@ -7760,27 +7501,6 @@
license = lib.licenses.free;
};
}) {};
- chinese-pyim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pyim }:
- melpaBuild {
- pname = "chinese-pyim";
- version = "20170728.2242";
- src = fetchFromGitHub {
- owner = "tumashu";
- repo = "pyim";
- rev = "1f40c4341a886ec952de14f642f07ccce90670b2";
- sha256 = "126h7cxy5gy8hpclfnkp1qfpjj18s5b4j15awm0n411jkccn2h55";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/chinese-pyim";
- sha256 = "0chh4vnb2gh6ckf01w7xd1kw4454p1vkzmy17dvm0c7269rya9mn";
- name = "chinese-pyim";
- };
- packageRequires = [ pyim ];
- meta = {
- homepage = "https://melpa.org/#/chinese-pyim";
- license = lib.licenses.free;
- };
- }) {};
chinese-wbim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "chinese-wbim";
@@ -7823,59 +7543,40 @@
license = lib.licenses.free;
};
}) {};
- chinese-yasdcv = callPackage ({ chinese-pyim, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ chinese-yasdcv = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, pyim }:
melpaBuild {
pname = "chinese-yasdcv";
- version = "20170504.321";
+ version = "20171014.1844";
src = fetchFromGitHub {
owner = "tumashu";
repo = "chinese-yasdcv";
- rev = "92231de8771f2ffc9f5bb9b4ee08700fdb1a9dcb";
- sha256 = "0viihcrnf7psqkfj2izdaah2w5bkz2cm46bgbhygzfqx8424vqh7";
+ rev = "5ab830daf1273d5a5cddcb94b56a9737f12d996f";
+ sha256 = "1mv1n6m73aamxj18i851ww53q7p4ydiqgaapxyvjbm6sx8ddz9ak";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b6d727c30d2ec0f885a927a16a442fe220a740d5/recipes/chinese-yasdcv";
sha256 = "1y2qywldf8b8b0km1lcf74p0w6rd8gr86qcj7ikwhhbvd19dfglm";
name = "chinese-yasdcv";
};
- packageRequires = [ chinese-pyim cl-lib ];
+ packageRequires = [ cl-lib pyim ];
meta = {
homepage = "https://melpa.org/#/chinese-yasdcv";
license = lib.licenses.free;
};
}) {};
- chm-view = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "chm-view";
- version = "20110616.1019";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/chm-view.el?revision=5";
- sha256 = "1r274pf0xrcdml4sy2nhhp3v5pr3y3s4lvk45hd3pmw1i4pw2fd8";
- name = "chm-view.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/8688cd57fca1974403c0e36d6289845059adac5c/recipes/chm-view";
- sha256 = "1acz0fvl3inn7g4himq680yf64bgm7n61hsv2zpm1k6smrdl78nz";
- name = "chm-view";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/chm-view";
- license = lib.licenses.free;
- };
- }) {};
choice-program = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "choice-program";
- version = "20161230.1721";
+ version = "20171004.931";
src = fetchFromGitHub {
owner = "plandes";
repo = "choice-program";
- rev = "691ced104adc6dbb3ddf8c28563c1cd36eb165b1";
- sha256 = "1jd0zj8g9nnzdfy76z9565sz6sd6690nbbi4zg71pxssmsqgkc3w";
+ rev = "27607ec1fe241c58fbc1f861454a8e2ec1fd7b15";
+ sha256 = "0q8krgsydrc2xc29y60qljifdvxfmxnvbncxsh64xhrzsnrgwmq5";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/894357125db5035999a39514516852d7e957453e/recipes/choice-program";
- sha256 = "0hhp6qhrshqrw4978xq6biwddm7gv7yf4avbb64xvz66i3a2kgy1";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/6e39555b2538cc8a955766c5533871396e8fe712/recipes/choice-program";
+ sha256 = "0a21yd3b8sb15vms9mclaa7xnnk0as08p6q38mwdwjp9sgcfyh1b";
name = "choice-program";
};
packageRequires = [ cl-lib emacs ];
@@ -7929,12 +7630,12 @@
cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }:
melpaBuild {
pname = "cider";
- version = "20170729.133";
+ version = "20171001.112";
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "cider";
- rev = "f2b198ed926b9c4deea63cc6a169a748d81c551f";
- sha256 = "1flxbf19k048as38vr3vjcrf3xz2f41y4wfig1sbb7aiag63ahcm";
+ rev = "946a9d44e0d3806f1e06ab68fd832f24dd152086";
+ sha256 = "0fifp2cjspfqvwmy9l9sxm8na7jj3wxbiz0mpq0pj3jm4aa7v6cl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider";
@@ -8115,15 +7816,36 @@
license = lib.licenses.free;
};
}) {};
+ circadian = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "circadian";
+ version = "20171022.724";
+ src = fetchFromGitHub {
+ owner = "GuidoSchmidt";
+ repo = "circadian.el";
+ rev = "feec308591b43e7869d7a018d5c6fc7e943d53ee";
+ sha256 = "0j8an9ny3jk9nmlpi360n064m20nhah9p8rj6wb9xbvnfrri5zjk";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/3440905a20bc91bb2637a87c04ff8410379f150d/recipes/circadian";
+ sha256 = "13797y1w1636bibisz5i5p2xp0smd3apnhc1nx8ijm75smx679id";
+ name = "circadian";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/circadian";
+ license = lib.licenses.free;
+ };
+ }) {};
circe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "circe";
- version = "20170728.638";
+ version = "20170929.1635";
src = fetchFromGitHub {
owner = "jorgenschaefer";
repo = "circe";
- rev = "47bbcf4268602688f90c08ce64ec93226fc3f894";
- sha256 = "1bi9hc1xcg5zjlzlrjgg3pwkdr9krgsyd5y87z57mxzmpndlxadr";
+ rev = "6b110d4c2c6447c4ed65cfa5b7e8676620081ee2";
+ sha256 = "01llr34y9mvgpbz3y10l7gmp40qvislwhm6jb2fvcb7vdn9k9gmz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/circe";
@@ -8139,12 +7861,12 @@
circe-notifications = callPackage ({ alert, circe, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "circe-notifications";
- version = "20160902.42";
+ version = "20171001.2258";
src = fetchFromGitHub {
owner = "eqyiel";
repo = "circe-notifications";
- rev = "80c44441ecd3ae04ae63760aa20afa837c1ed05b";
- sha256 = "0s0iw5vclciziga78f1lvj6sdg84a132in39k4vz0pj598ypin1w";
+ rev = "4b93112b715714fc7b0ac2637df93adb90f35b40";
+ sha256 = "1hfic3qrlskcf0zmd3w76sl1qgrd6myf6mwg06mnc9jy76backqk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/76c0408423c4e0728789de7b356b2971d6c446c7/recipes/circe-notifications";
@@ -8199,18 +7921,19 @@
license = lib.licenses.free;
};
}) {};
- clang-format = callPackage ({ cl-lib ? null, fetchsvn, fetchurl, lib, melpaBuild }:
+ clang-format = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "clang-format";
version = "20170120.137";
- src = fetchsvn {
- url = "https://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format";
- rev = "310836";
- sha256 = "135p8ag315sh9zwssb6f9widiqh6xrcnry1r1v0ij8r94n7bw6la";
+ src = fetchFromGitHub {
+ owner = "emacsorphanage";
+ repo = "clang-format";
+ rev = "6e6114fac0e4e600f1ffed7b2ce978f7adb001cd";
+ sha256 = "07zabj31bgckppkqgg5if515093k0lx2xyf3adh90ymmssvvgary";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/clang-format";
- sha256 = "1s7xbq1xczzz24gi6wlv9ihzs7cbsn3g16rrhdpxwaadagbasgk7";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/clang-format";
+ sha256 = "1w2w8hhyxp73s1ziyd0n7f1yi0x46v93630xxpjnf9bgr1psfk5f";
name = "clang-format";
};
packageRequires = [ cl-lib ];
@@ -8222,12 +7945,12 @@
clean-aindent-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "clean-aindent-mode";
- version = "20150816.2029";
+ version = "20171017.1343";
src = fetchFromGitHub {
owner = "pmarinov";
repo = "clean-aindent-mode";
- rev = "9ae15997cd75c5625a4f759a3aff39bf202fc36f";
- sha256 = "1h6k6kzim1zb87y1kzpqjzk3ip9bmfxyg54kdh2sfp4xy0g5h3p0";
+ rev = "a97bcae8f43a9ff64e95473e4ef0d8bafe829211";
+ sha256 = "07dgx09j6nn5dl9vpqfcs5yqm79kza3h3r1lb7r09wpkmrg0c2cr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ee9dac7c10e652f026643620418dfea9237a0d23/recipes/clean-aindent-mode";
@@ -8327,12 +8050,12 @@
cliphist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
melpaBuild {
pname = "cliphist";
- version = "20170208.514";
+ version = "20170821.1858";
src = fetchFromGitHub {
owner = "redguardtoo";
repo = "cliphist";
- rev = "acbd9782d82d7ae6bfb22fb0955597b9c5fcbb6c";
- sha256 = "1gj5fqjyr4m4qim9qjsvzzk42rm3vw3yycvq3nj0wpj90zb1yh14";
+ rev = "2aceea0e16e2f18b8b51161423ef1c0f655c7c8d";
+ sha256 = "13vhm7dsqbaslml3a2hd3s39c7q494p5w2xznhdxvh8ig6w102lc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/82d86dae4ad8efc8ef342883c164c56e43079171/recipes/cliphist";
@@ -8390,12 +8113,12 @@
clips-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "clips-mode";
- version = "20131012.1401";
+ version = "20170909.123";
src = fetchFromGitHub {
owner = "grettke";
repo = "clips-mode";
- rev = "a3ab4a3e958d54a16544ec38fe6338f27df20817";
- sha256 = "0i6sj5rs4b9v8aqq9l6wr15080qb101hdxspx6innhijhajgmssd";
+ rev = "dd38e2822640a38f7d8bfec4f69d8dd24be27074";
+ sha256 = "1q2jz72wi8d2pdrjic9kwqixp5sczjkkx8rf67rgaz37ysjpcbf6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d28484bf5e9ad72778ad63f73deeea1eb1263236/recipes/clips-mode";
@@ -8591,12 +8314,12 @@
clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "clojure-mode";
- version = "20170807.1610";
+ version = "20171103.1150";
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "clojure-mode";
- rev = "7f886fad02b21583a7caf7ed81dc5bb9e3d9d172";
- sha256 = "11ffsn2sq1mcabh5lasybx7nsnhp0nzg75bc7c89ij037rlbqljj";
+ rev = "118c19700c904ae6a45fb409ca795bb93ff8dbd8";
+ sha256 = "0kdk94ffrw27fz8ycka7a24hj3p3w09rhq3ppga7dwgsxqjfjb5l";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode";
@@ -8612,12 +8335,12 @@
clojure-mode-extra-font-locking = callPackage ({ clojure-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "clojure-mode-extra-font-locking";
- version = "20170303.2310";
+ version = "20171102.1020";
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "clojure-mode";
- rev = "7f886fad02b21583a7caf7ed81dc5bb9e3d9d172";
- sha256 = "11ffsn2sq1mcabh5lasybx7nsnhp0nzg75bc7c89ij037rlbqljj";
+ rev = "118c19700c904ae6a45fb409ca795bb93ff8dbd8";
+ sha256 = "0kdk94ffrw27fz8ycka7a24hj3p3w09rhq3ppga7dwgsxqjfjb5l";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking";
@@ -8696,12 +8419,12 @@
closql = callPackage ({ emacs, emacsql-sqlite, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "closql";
- version = "20170629.921";
+ version = "20170919.455";
src = fetchFromGitHub {
owner = "emacscollective";
repo = "closql";
- rev = "73e68bcfbe076e152beed1b8e5f894ca438f9770";
- sha256 = "0vj18784x6cdl39sbfpsksmxln5yj31ah250q5n7ivh54vk2hvjl";
+ rev = "66597831248bbe14ebc7bbf24b24cafebb5fd362";
+ sha256 = "0jxf7k95l2j6rjyafq3zj6bxaa2xn4zmi4zg1n04sachcdrcgh3l";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/closql";
@@ -8822,12 +8545,12 @@
cmake-ide = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, levenshtein, lib, melpaBuild, s, seq }:
melpaBuild {
pname = "cmake-ide";
- version = "20170804.430";
+ version = "20171101.236";
src = fetchFromGitHub {
owner = "atilaneves";
repo = "cmake-ide";
- rev = "69cfce070ee9e23f45736aec7c92c7ce7c86b479";
- sha256 = "05qh9pigc37446x4ivpsi5j1q22jyjnmky5ja72dajibfrdg3zjp";
+ rev = "114e2df27f79816f023a07e3e8024c7ab73603f0";
+ sha256 = "1n7zv325kjvmz694r11sbz6650b8y22kv2mbx4yrdha9r6y2m1f7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/17e8a8a5205d222950dc8e9245549a48894b864a/recipes/cmake-ide";
@@ -8847,8 +8570,8 @@
src = fetchFromGitHub {
owner = "Kitware";
repo = "CMake";
- rev = "ce2750817b768cee6ae119747cdf806401f09332";
- sha256 = "1kc7308y4y1684dl8nv8s6dy7p5m39dgyyvb3amd6cmfqka9010l";
+ rev = "3d6e45af611983d85b130b4f874d862f7d998013";
+ sha256 = "1gjqzzyfk5z9g2b5qnsfvddjlf6p441l8gv80z7jjq6qmwvppw94";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -8903,25 +8626,6 @@
license = lib.licenses.free;
};
}) {};
- cmds-menu = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "cmds-menu";
- version = "20170221.1557";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/cmds-menu.el?revision=10";
- sha256 = "0ladkkydypf08mn3j749fv46blpzyvh45kx52qdzhwxjiz7nlmfs";
- name = "cmds-menu.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/de6366e4b3e72a5e68b960d6bf4bab2683ad6800/recipes/cmds-menu";
- sha256 = "12s75y9d75cxqgg3hj0s4w0d10zy8y230b5gy09685ab5lcajfks";
- name = "cmds-menu";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/cmds-menu";
- license = lib.licenses.free;
- };
- }) {};
cmm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cmm-mode";
@@ -8943,27 +8647,6 @@
license = lib.licenses.free;
};
}) {};
- cn-outline = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "cn-outline";
- version = "20100321.914";
- src = fetchFromGitHub {
- owner = "mori-dev";
- repo = "cn-outline";
- rev = "47d33a99b7ae26b1cd456441970b4bab2173d981";
- sha256 = "1635k51ppivq6v2702fihq8dvi33445smds9zhqm0drnpv9rv5cr";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/bf843cbcfc5806d9089000f08c72433dc8c12e17/recipes/cn-outline";
- sha256 = "0cw1rr56hdngvhmx59j76hvkfzgybasn0fwhd6vwm709jqiiiwiz";
- name = "cn-outline";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/cn-outline";
- license = lib.licenses.free;
- };
- }) {};
cnfonts = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cnfonts";
@@ -8971,8 +8654,8 @@
src = fetchFromGitHub {
owner = "tumashu";
repo = "cnfonts";
- rev = "5cfe656554c91b3d0dcc5417e43afa85d2a7a182";
- sha256 = "1px5gc83g70whdiysq7mmxz7rm74mhsjs2y1vbzgg8k1z0cs9wkp";
+ rev = "cbe1ddd49e33b790a568c55351146aa5b909f173";
+ sha256 = "11d44lf0m0kbzq1mvyqkl4aprys0xqaarp08nij57xnynin1rynx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0d5787ffeeee68ffa41f3e777071815084e0ed7a/recipes/cnfonts";
@@ -9153,35 +8836,15 @@
license = lib.licenses.free;
};
}) {};
- col-highlight = callPackage ({ fetchurl, lib, melpaBuild, vline }:
- melpaBuild {
- pname = "col-highlight";
- version = "20170510.1541";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/col-highlight.el?revision=31";
- sha256 = "0wi4xz8n5ib65spyrgqsp8l6zafnvxdiw3hy918fs0xjj7ziy6qc";
- name = "col-highlight.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/2a16dca0068d9d4f25ad6b699ec8cb8da6ba17e5/recipes/col-highlight";
- sha256 = "1kycjdlrg7a5x37b0pzqhg56yn7kaisryrk303qx1084kwq9464i";
- name = "col-highlight";
- };
- packageRequires = [ vline ];
- meta = {
- homepage = "https://melpa.org/#/col-highlight";
- license = lib.licenses.free;
- };
- }) {};
colemak-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "colemak-evil";
- version = "20170401.1626";
+ version = "20171015.1607";
src = fetchFromGitHub {
owner = "patbl";
repo = "colemak-evil";
- rev = "b01296a50ee225d0e21e81f99c3c01432f89a7c7";
- sha256 = "09ipxdwvi1bsicl67fbpd5aq5g9ws9frim9q24y7h6srynj4awa7";
+ rev = "192c779281ae1fbf2405dcdb55b3c5b2a1d0b3d1";
+ sha256 = "1clnvr7n6mx5b8pq1c6zchq7n1g8ip8hwgzc61ywrmiyv0v8rnc6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0f0750a3f9537782ee61d6e56c51ce7b86def12e/recipes/colemak-evil";
@@ -9218,12 +8881,12 @@
color-identifiers-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "color-identifiers-mode";
- version = "20170730.1852";
+ version = "20170814.1121";
src = fetchFromGitHub {
owner = "ankurdave";
repo = "color-identifiers-mode";
- rev = "2091833fde5e3877f966e987ee8e30a85c8e31ac";
- sha256 = "0q2il3df7hm4nn3fpn82b9mz911yhzybzcizvhv6dpsdadbhidjr";
+ rev = "5750ee9e1ab8a6890381bb461982113b1eb98879";
+ sha256 = "17ry98s4lcl6g63bj8a0wd1rmh8whlxlmzfdjhp8mapdybqplcql";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5c735755e414fdf169aca5ec6f742533d21472e0/recipes/color-identifiers-mode";
@@ -9257,18 +8920,19 @@
license = lib.licenses.free;
};
}) {};
- color-theme = callPackage ({ fetchbzr, fetchurl, lib, melpaBuild }:
+ color-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "color-theme";
- version = "20080305.34";
- src = fetchbzr {
- url = "https://bzr.savannah.gnu.org/r/color-theme/trunk";
- rev = "57";
+ version = "20070910.1007";
+ src = fetchFromGitHub {
+ owner = "emacsorphanage";
+ repo = "color-theme";
+ rev = "eeb07560b30aaf7934dfd21f5c2518a479905cd9";
sha256 = "17bidzq9kiz250gal1fn9mg8gf8l749nz69z0awpc4x2222wxxiz";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/color-theme";
- sha256 = "1ds098v50p4g6ji0zy7m5nyj2kadm3l3v0pnb01wkjjx6anh3qsy";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/color-theme";
+ sha256 = "1c1n0m4hhj2sxi08vjvayypf9g5i2hyng53ry950yfdqgzq7nk8i";
name = "color-theme";
};
packageRequires = [];
@@ -9347,8 +9011,8 @@
src = fetchFromGitHub {
owner = "purcell";
repo = "color-theme-sanityinc-solarized";
- rev = "99fb4753f071542690e7a17b3dd76b5f2a05e9fc";
- sha256 = "1vhncjyw0qbglgsd04cgyqc3473kz97ks15586ljrpa14f8fnjk2";
+ rev = "74a7065808f82dbdd9638ae33ed0e4f7a55da35c";
+ sha256 = "1af6j8qyzcm4x5p2wkhfh6f62n5i4fapjfrii3rl3l9im39fl8jc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-solarized";
@@ -9364,12 +9028,12 @@
color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "color-theme-sanityinc-tomorrow";
- version = "20170813.237";
+ version = "20171102.900";
src = fetchFromGitHub {
owner = "purcell";
repo = "color-theme-sanityinc-tomorrow";
- rev = "8faa5d0153166e44416d59324dc39e43469d684c";
- sha256 = "137rn1k1hlaz4k47mrh358k5kpc29n87281sq3sd8gq3rdm8hs7a";
+ rev = "3721c9f6a46a284c57dfb2f4d093f1a81de085b6";
+ sha256 = "0whbhhdjcm291rs8jzfwav9f2mxibgh6c8hf6z65jq0qkzvkz8qi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-tomorrow";
@@ -9385,12 +9049,12 @@
color-theme-solarized = callPackage ({ color-theme, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "color-theme-solarized";
- version = "20160626.743";
+ version = "20171024.825";
src = fetchFromGitHub {
owner = "sellout";
repo = "emacs-color-theme-solarized";
- rev = "797229d0d3c9a2233fd8c69c0c2d9948be1d0685";
- sha256 = "1mx4948qdbwg93261bxr0k5cjx05ws7c3cmhrv6znvjzp6gqxlcl";
+ rev = "f3ca8902ea056fb8e46cb09f09c96294e31cd4ee";
+ sha256 = "16d7adqi07lzzr0qipl1fbag9l8kiyr3xrqxi528pimcisbg85d3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/17096b452740bf6b7afa38e62df8e623494aa6b2/recipes/color-theme-solarized";
@@ -9424,15 +9088,36 @@
license = lib.licenses.free;
};
}) {};
+ colormaps = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "colormaps";
+ version = "20171008.1524";
+ src = fetchFromGitHub {
+ owner = "lepisma";
+ repo = "colormaps.el";
+ rev = "19fbb64a6288d505b9cf45c9b5a3eed0bfb135e2";
+ sha256 = "0kbhy8bpxqdr1kjczz2vm7chfpjprx2frpbh1gh9i1gwwx5k4myp";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/f4c795d9e323b08bc8354a6933a061644705a2ec/recipes/colormaps";
+ sha256 = "16plhgpfz1wb58p6h8wxjhplhgv0mbj3f2xj34p6vydh44l8w8q2";
+ name = "colormaps";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/colormaps";
+ license = lib.licenses.free;
+ };
+ }) {};
column-enforce-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "column-enforce-mode";
- version = "20170103.1231";
+ version = "20171030.1200";
src = fetchFromGitHub {
owner = "jordonbiondo";
repo = "column-enforce-mode";
- rev = "379366fe0a5bcb333db2d55cddcf18d6e76ab3fc";
- sha256 = "1vqydf174rydclwmcq6j8xpr16k9w049x9rilg1lvyjc67p7pyaf";
+ rev = "2341a2b6a33d4b8b74c35062ec9cfe1bffd61944";
+ sha256 = "0rcxb7daxxrp5f1i5cbv25viwawbbsn4ij1mnlclp5wz7ilcy2rs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/91bebef8e97665a5d076c557d559367911a25ea2/recipes/column-enforce-mode";
@@ -9445,25 +9130,6 @@
license = lib.licenses.free;
};
}) {};
- column-marker = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "column-marker";
- version = "20121128.43";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/column-marker.el?revision=13";
- sha256 = "05bv198zhqw5hqq6cr11mhz02dpca74hhp1ycwq369m0yb2naxy9";
- name = "column-marker.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/5f629b6b44fae3191f58e007c39b75bbb880d517/recipes/column-marker";
- sha256 = "1xgfsiw46aib2vb9bbjlgnhcgfnlfhdcxd0cl0jqj4fjfxzbz0bq";
- name = "column-marker";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/column-marker";
- license = lib.licenses.free;
- };
- }) {};
comint-intercept = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "comint-intercept";
@@ -9534,8 +9200,8 @@
src = fetchFromGitHub {
owner = "rejeep";
repo = "commander.el";
- rev = "2a4f1fd6cf9aa1798559dbdd5fbd9dcd327cd859";
- sha256 = "06y7ika4781gkh94ygdaz7a760s7ahrma6af6n7cqhgjyikz7lg1";
+ rev = "c93985dc318fe89e5a29abc21d19fb41e2fd14d2";
+ sha256 = "0mlabiraagqwl17payils5589fr2mivvkzrfic6ndsipryab6rfc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8b308e05dd85856addbc04a9438f5026803cebd7/recipes/commander";
@@ -9569,6 +9235,27 @@
license = lib.licenses.free;
};
}) {};
+ comment-tags = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "comment-tags";
+ version = "20170910.1035";
+ src = fetchFromGitHub {
+ owner = "vincekd";
+ repo = "comment-tags";
+ rev = "7d914097f0a03484af71e621db533737fc692f58";
+ sha256 = "0s86a7078arck9z4gzkp2hnxyklprl0zh5hsw7nkyyscjydly80i";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/6ac71f4ffc19bce4f571001f9270d5be855dfc3c/recipes/comment-tags";
+ sha256 = "13slv150zch0b7zpxa2dbqjzpqh0iy559m6rc0zs0dwdagzryp3i";
+ name = "comment-tags";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/comment-tags";
+ license = lib.licenses.free;
+ };
+ }) {};
commenter = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
melpaBuild {
pname = "commenter";
@@ -9614,12 +9301,12 @@
common-lisp-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
melpaBuild {
pname = "common-lisp-snippets";
- version = "20170522.2147";
+ version = "20170918.356";
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "common-lisp-snippets";
- rev = "46f1de08c8d86b72b474c2f8e1c1b313ac70f23d";
- sha256 = "148ach1p3iqch3a6r1y8wkr1avyprg47jjz3a31vjvqgcwgs3ynw";
+ rev = "cd46223fbc6ee99372a25ba455ffec4354895e45";
+ sha256 = "0xii63fw3gx1hhx57yh8gr9mhkgb2vjkfs2sl5z9010myi9504is";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/48d0166ccd3dcdd3df4719349778c6c5ab6872ca/recipes/common-lisp-snippets";
@@ -9635,12 +9322,12 @@
company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "company";
- version = "20170715.1035";
+ version = "20171017.1638";
src = fetchFromGitHub {
owner = "company-mode";
repo = "company-mode";
- rev = "a197b072dc93dbad238f1dc70da01e3775ebfb56";
- sha256 = "0is65adahvfgfjamnr8dmnh5xnijcwzhbzsvvi6ixkkfm2xvs5aa";
+ rev = "098a90769ed47be1cfcebb83c2cad2e5e072bdff";
+ sha256 = "0wm1qrwmhzs3vphk6hbi288rvc66gznis5kfj25d86ilq4fvawsf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company";
@@ -9745,15 +9432,35 @@
license = lib.licenses.free;
};
}) {};
+ company-axiom = callPackage ({ axiom-environment, company, emacs, fetchgit, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "company-axiom";
+ version = "20171024.1310";
+ src = fetchgit {
+ url = "https://bitbucket.org/pdo/axiom-environment.git";
+ rev = "33af42c1c3109f17d63c69cdca0319e424409a37";
+ sha256 = "1nv102jd07nrhkp4fci5n5f1l6z3qan1lb3ykhhvl90k9ygqbac5";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/9f07feb8686c76c330f282320b9f653dc16cadd5/recipes/company-axiom";
+ sha256 = "1qjy2idyfwa1a4z1v05ky26dzq8hs6aaszq4bifd7vymasvnamml";
+ name = "company-axiom";
+ };
+ packageRequires = [ axiom-environment company emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/company-axiom";
+ license = lib.licenses.free;
+ };
+ }) {};
company-bibtex = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib }:
melpaBuild {
pname = "company-bibtex";
- version = "20170125.2135";
+ version = "20171104.2344";
src = fetchFromGitHub {
owner = "gbgar";
repo = "company-bibtex";
- rev = "2cea36c24c35c1e9fafce7526781f119a48b5e82";
- sha256 = "0l4xnqhk3a4szwcfyw90naxasbca8nrnjhnaqiw8zyixhakdbhxz";
+ rev = "225c6f5c0c070c94c8cdbbd452ea548cd94d76f4";
+ sha256 = "0bv2jcmyirdxm158w2766l3q7kh7h71l9milwc9fl8qfz7wb5l80";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-bibtex";
@@ -9790,12 +9497,12 @@
company-cabal = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "company-cabal";
- version = "20151216.720";
+ version = "20170917.617";
src = fetchFromGitHub {
owner = "iquiw";
repo = "company-cabal";
- rev = "05886d6f2621b019fafb40cff4d2567e5d8045b4";
- sha256 = "1yxp6l8a16d6g2sfwrpfx97ds7nfrgk2akwydal1dzr2bjq02pc6";
+ rev = "62112a7259e24bd6c08885629a185afe512b7d3d";
+ sha256 = "1gf45xwjzdm8i4q6c6khk4dbg1mmp2r0awz2sjr4dcr2dbd1n7mg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ee888b1ba57b6af3a3330607898810cd248862db/recipes/company-cabal";
@@ -9927,8 +9634,8 @@
src = fetchFromGitHub {
owner = "emacs-eclim";
repo = "emacs-eclim";
- rev = "ebb844d1ebdd7eb347e89063a9b6e9f890a1ff57";
- sha256 = "18q4blnxf7p2kvgh1rhr7pizga06z97hv1lxjgzv0dc2dll2zwmd";
+ rev = "14596d3a1c0e7f18be6b88eddebaf7f36eeca859";
+ sha256 = "04vmq8d68na8pxwd18lxf87v0nzf3cxxdvw8cqzj28his7g37bym";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/company-emacs-eclim";
@@ -10028,12 +9735,12 @@
company-ghc = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, ghc, lib, melpaBuild }:
melpaBuild {
pname = "company-ghc";
- version = "20160315.710";
+ version = "20170918.133";
src = fetchFromGitHub {
owner = "iquiw";
repo = "company-ghc";
- rev = "ff2205c0b309467eea763521d30220e7849c75b0";
- sha256 = "1a93q5q91xjyvfxbf5q57ndjarqdm9av11bb3dmc72v9bmwgpi7s";
+ rev = "dab111cb5067c545ccdc6b2d0ba70c1c4bbce060";
+ sha256 = "0ygw3dhlz247qzmcsbnkkdry2w2ni60j1rbyqprnzp8sd5yk97r1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/28f6a983444f796c81df7e5ee94d74c480b21298/recipes/company-ghc";
@@ -10067,15 +9774,36 @@
license = lib.licenses.free;
};
}) {};
+ company-glsl = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, glsl-mode, lib, melpaBuild }:
+ melpaBuild {
+ pname = "company-glsl";
+ version = "20171015.1049";
+ src = fetchFromGitHub {
+ owner = "GuidoSchmidt";
+ repo = "company-glsl";
+ rev = "a262c12c3bcd0807718c4edcaf2b054e30ef0e26";
+ sha256 = "0338bym8ifvkgpbc4vyzf3nmlp6rc8lihyxcbym5m08612ln78mk";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/abab3b5a9762639812e2aabf9d288ed367dcdc22/recipes/company-glsl";
+ sha256 = "0lzy3xln5780yjwhhcz6vnc2j0k0rc7jfvqc8bv0xfabikgadmkn";
+ name = "company-glsl";
+ };
+ packageRequires = [ company emacs glsl-mode ];
+ meta = {
+ homepage = "https://melpa.org/#/company-glsl";
+ license = lib.licenses.free;
+ };
+ }) {};
company-go = callPackage ({ company, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
melpaBuild {
pname = "company-go";
- version = "20170420.515";
+ version = "20170825.943";
src = fetchFromGitHub {
owner = "nsf";
repo = "gocode";
- rev = "f1eef9a6ba005abb145d7b58fdd225e83a3c6a05";
- sha256 = "1hkr46ikrprx203i2yr6xds1bzxggblh7bg026m2cda6dxgpnsgw";
+ rev = "e990796e68a2ebfc099afed20b99e26d6b64061a";
+ sha256 = "1s2jpqy599fr5qzfvba5njrwx1n48vqjg20vibssn2kyyc3l42d3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/company-go";
@@ -10112,12 +9840,12 @@
company-irony = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, irony, lib, melpaBuild }:
melpaBuild {
pname = "company-irony";
- version = "20170612.1308";
+ version = "20170905.1346";
src = fetchFromGitHub {
owner = "Sarcasm";
repo = "company-irony";
- rev = "b8001ffc4da7403172835d47bc740cfbac35364d";
- sha256 = "03ym65ckpx6n03l633lwvxiwvcdhm8kjsw91ql1y4f44vijlh2xi";
+ rev = "52aca45bcd0f2cb0648fcafa2bbb4f8ad4b2fee7";
+ sha256 = "1qgyam2vyjw90kpxns5cd6bq3qiqjhzpwrlvmi18vyb69qcgqd8a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/company-irony";
@@ -10172,6 +9900,48 @@
license = lib.licenses.free;
};
}) {};
+ company-lean = callPackage ({ company, dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, lean-mode, lib, melpaBuild, s }:
+ melpaBuild {
+ pname = "company-lean";
+ version = "20171102.754";
+ src = fetchFromGitHub {
+ owner = "leanprover";
+ repo = "lean-mode";
+ rev = "c0af876c967fc969d67c467bc6767210d19c5d87";
+ sha256 = "04qzck156wb2bvrb8adbn7rx2v0bsjcirlbx4ajajjsqy858ayn9";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/42f4d6438c8aeb94ebc1782f2f5e2abd17f0ffde/recipes/company-lean";
+ sha256 = "1hqkn7w5dyznf7i3r3132q8x31r74q188jsm5kdrjqgbwak2p91a";
+ name = "company-lean";
+ };
+ packageRequires = [ company dash dash-functional emacs f lean-mode s ];
+ meta = {
+ homepage = "https://melpa.org/#/company-lean";
+ license = lib.licenses.free;
+ };
+ }) {};
+ company-lsp = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, s }:
+ melpaBuild {
+ pname = "company-lsp";
+ version = "20171031.1844";
+ src = fetchFromGitHub {
+ owner = "tigersoldier";
+ repo = "company-lsp";
+ rev = "5fc50b6ad5c4ee71625bddf348646be44e69f396";
+ sha256 = "1gkabm9iaimv4s7v723aflvxa7z902py46m5mz0szpdcrrh36495";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/5125f53307c1af3d9ccf2bae3c25e7d23dfe1932/recipes/company-lsp";
+ sha256 = "09nbi6vxw8l26gfgsc1k3bx4m8i1px1b0jxaywszky5bv4fdy03l";
+ name = "company-lsp";
+ };
+ packageRequires = [ company emacs lsp-mode s ];
+ meta = {
+ homepage = "https://melpa.org/#/company-lsp";
+ license = lib.licenses.free;
+ };
+ }) {};
company-lua = callPackage ({ company, f, fetchFromGitHub, fetchurl, lib, lua-mode, melpaBuild, s }:
melpaBuild {
pname = "company-lua";
@@ -10179,8 +9949,8 @@
src = fetchFromGitHub {
owner = "ptrv";
repo = "company-lua";
- rev = "0be8122f3adf57ad27953bf4b03545d6298d3da4";
- sha256 = "1d9i165apgmwns7b2fd5wcpjpkah3dyj20v5sb8ynvz6qhhr5r9c";
+ rev = "6a542ba16d7fa47865879b5a99dedd121a84a880";
+ sha256 = "10wy9s29sbzaz61p62vda6cqwjk6rpa6ia8zm4n3d6xvpv2wqa70";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c8191ab2aaa72041be46091e363d216cf1b73fde/recipes/company-lua";
@@ -10196,12 +9966,12 @@
company-math = callPackage ({ company, fetchFromGitHub, fetchurl, lib, math-symbol-lists, melpaBuild }:
melpaBuild {
pname = "company-math";
- version = "20170804.1202";
+ version = "20171016.814";
src = fetchFromGitHub {
owner = "vspinu";
repo = "company-math";
- rev = "7e7f8c71f57b12f9bcbbf01f2bbcc59343ad76d4";
- sha256 = "0akqhhjvzsg0lbqx4bbkfkzijidwgi3bb32sxl3yxz7zfm9pbhn2";
+ rev = "3481f03ebb6a613ff85b71ca8edd2d5842c49012";
+ sha256 = "0nbnqgl2jly1n5nx20hr2i84r2shxjb3axv2p597b5kw2bdbsva5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fadff01600d57f5b9ea9c0c47ed109e058114998/recipes/company-math";
@@ -10263,8 +10033,8 @@
src = fetchFromGitHub {
owner = "travisbhartwell";
repo = "nix-emacs";
- rev = "ace629f7645d12778c96ff7b5cf4b1e41a98af29";
- sha256 = "11infdrdjc30kxvfg5rh1zn4idvkhf9s0c6v60qn441m1d5bnavq";
+ rev = "7007363e773a419203a69798fb0e0731b2eb0f73";
+ sha256 = "00hv8fhyahkdh1vfy1qkahqvsik6d81c7mqh4gjiqxrmb2l1vbcb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6846c7d86e70a9dd8300b89b61435aa7e146be96/recipes/company-nixos-options";
@@ -10284,8 +10054,8 @@
src = fetchFromGitHub {
owner = "xcwen";
repo = "ac-php";
- rev = "e0aaae30e4e5f18390e5d00953db02c1f03c44f6";
- sha256 = "1mrk37w88b4843jbghr9i79rbwbzwk8b1wljvzmm6x0q7ldlxmsm";
+ rev = "317ad1d023db6b2fe67444a2c075e656c35f5094";
+ sha256 = "1wyf93faq6z6wgcs3lxc6gv75bmxchg6kd98dza61zdyc0rj60wa";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php";
@@ -10298,6 +10068,27 @@
license = lib.licenses.free;
};
}) {};
+ company-plsense = callPackage ({ cl-lib ? null, company, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+ melpaBuild {
+ pname = "company-plsense";
+ version = "20171016.1013";
+ src = fetchFromGitHub {
+ owner = "CeleritasCelery";
+ repo = "company-plsense";
+ rev = "68dd1ca0a0837990a2e6c2e36f6b10fdf4a9bb6d";
+ sha256 = "07bqm1bg91r3vchy2q2pk3npngqfb73fh0b7mp1g9fj11h25mjfr";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/9cf9d671d81e07c704676c557a9f0d686067ce5c/recipes/company-plsense";
+ sha256 = "0k8k2vpkknd4nyxzwdj7698lgm5d85byxd49x7w5nrxmh2h1w3c7";
+ name = "company-plsense";
+ };
+ packageRequires = [ cl-lib company dash emacs s ];
+ meta = {
+ homepage = "https://melpa.org/#/company-plsense";
+ license = lib.licenses.free;
+ };
+ }) {};
company-pollen = callPackage ({ company, fetchFromGitHub, fetchurl, lib, melpaBuild, pollen-mode }:
melpaBuild {
pname = "company-pollen";
@@ -10389,8 +10180,8 @@
src = fetchFromGitHub {
owner = "iquiw";
repo = "company-restclient";
- rev = "7b41cd58ffdf965480f1cf52d58d718009ba6fe7";
- sha256 = "0j6b9jqs4i05rxx6fs7rvim1snf33fi1l6dkm9lskchbykzz4adq";
+ rev = "ef67ba2f613ce3d61b70011c9d0a303a754ffc5b";
+ sha256 = "0af1h6n1rgyni686hrrakmmbgymjg8dc1i9g2jc27dxkxz0nk454";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dd063bc3789772fdcc6a8555817588962e60825/recipes/company-restclient";
@@ -10412,12 +10203,12 @@
company-rtags = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rtags }:
melpaBuild {
pname = "company-rtags";
- version = "20170522.2154";
+ version = "20170924.2244";
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "de1f11e68f6752b3ee6738287d4dadb11bca8f8a";
- sha256 = "1jsx08pgwrz6n47a0zs05m0h6knpp9sgg8lrdwg792a93nrcqc5c";
+ rev = "e413e31d1e74fae1fc1bf86792013c3680be6580";
+ sha256 = "0hfibc1nllsp9zdb803ac6cwp6xx4xf8mvjszfq9vp5a63sgw0pl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags";
@@ -10563,8 +10354,8 @@
src = fetchFromGitHub {
owner = "osv";
repo = "company-web";
- rev = "2915da21c6327c7eaa0d03e237163228c9681224";
- sha256 = "0pjxahrhvz7l45whqlgm6n4mvqqxc8zs1dv33p3b498hyb83f52j";
+ rev = "7343eb9ac3d2cf9a2441c27d5d7d35f1869df02e";
+ sha256 = "1bqcz4iyrav89lj0306g3x0w7v1d47lbwb4nk1lcn1hk8rlzxxg6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-web";
@@ -10601,12 +10392,12 @@
company-ycmd = callPackage ({ company, dash, deferred, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s, ycmd }:
melpaBuild {
pname = "company-ycmd";
- version = "20170622.146";
+ version = "20171010.2258";
src = fetchFromGitHub {
owner = "abingham";
repo = "emacs-ycmd";
- rev = "fd037efae08628e41480e9dad705dcc1f64e498d";
- sha256 = "06scz0d3jzgbr919lkjjfq9x1dyr5nqkhblvfpyk5bdp8l6j06d6";
+ rev = "d951afd8c1c2f25a5cbeef3acfcec5f72acfd6e4";
+ sha256 = "0k6z82a3xkk71lbnw3sxqmr8ixafglivmsb5y35q1jichzz6hail";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-ycmd";
@@ -10645,14 +10436,14 @@
pname = "composer";
version = "20170304.1647";
src = fetchFromGitHub {
- owner = "zonuexe";
+ owner = "emacs-php";
repo = "composer.el";
rev = "43e50a5e626bedb3c46c875ac765daf615f18ce9";
sha256 = "0vfr9v60dgynjfz1kpx4c17mhsfbyi9g68jzvjkw7y95pwqv8f0y";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/39c5002f0688397a51b1b0c6c15f6ac07c3681bc/recipes/composer";
- sha256 = "1gwgfbb0fqn87s7jscr9xy47h239wy74n3hgpk4i16p2g6qinpza";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/composer";
+ sha256 = "01w9cywhfngkrl9az8kfpzm12nc0zwmax01pyxlbi2l2icmvp5s1";
name = "composer";
};
packageRequires = [ emacs f request s seq ];
@@ -10668,8 +10459,8 @@
src = fetchFromGitHub {
owner = "kiwanami";
repo = "emacs-deferred";
- rev = "d012a1ab50edcc2c44e3e49006f054dbff47cb6c";
- sha256 = "0xy9zb6wwkgwhcxdnslqk52bq3z24chgk6prqi4ks0qcf2bwyh5h";
+ rev = "2239671d94b38d92e9b28d4e12fd79814cfb9c16";
+ sha256 = "0vz59lm7pfz0gbsgrb44y555js85wbdjn0zm6p8wfqjiqf63ds3i";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc29a8d518ce7a584277089bd4654f52ac0f358/recipes/concurrent";
@@ -10685,12 +10476,12 @@
conda = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }:
melpaBuild {
pname = "conda";
- version = "20170608.756";
+ version = "20171028.617";
src = fetchFromGitHub {
owner = "necaris";
repo = "conda.el";
- rev = "468a9090f3a41e4c14d23a3b7987defd27ccd799";
- sha256 = "0bcjvqs3m5vwmixm745mp19sy0fkdpv080issqf97jqxh3arqh1k";
+ rev = "526be691824f4a32299f560a883913697bc4d847";
+ sha256 = "1jix3md6b02fypjm4y05av7acjkqryd1vqqz9wgxyinydlagrvh7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fcf762e34837975f5440a1d81a7f09699778123e/recipes/conda";
@@ -10706,12 +10497,12 @@
config-general-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "config-general-mode";
- version = "20170719.446";
+ version = "20171024.1140";
src = fetchFromGitHub {
owner = "tlinden";
repo = "config-general-mode";
- rev = "8927fd1c359275dc4236c5f48fea0e3ce8349bed";
- sha256 = "04f6608ndhan6xmipzylzwzx2asx0bsqx8a9rnxfab3bza756c99";
+ rev = "b4a8e6ba0bb027a77e4a0f701409f3e57bb2e4c0";
+ sha256 = "115sk0h6i1bfnxw1v11719926cvnq7gyisjcysvkam40hp3d5fx5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6c06831528e4bbc44aae1cc5cd6bec60150ae087/recipes/config-general-mode";
@@ -10745,18 +10536,19 @@
license = lib.licenses.free;
};
}) {};
- confluence = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild, xml-rpc }:
+ confluence = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }:
melpaBuild {
pname = "confluence";
version = "20151020.1828";
- src = fetchsvn {
- url = "https://svn.code.sf.net/p/confluence-el/code/trunk/";
- rev = "173";
- sha256 = "18859zi60s2y79add998vxh084znbdxxq31m12flg7makxlamyh7";
+ src = fetchFromGitHub {
+ owner = "emacsorphanage";
+ repo = "confluence";
+ rev = "4518d270a07760644c4204985c83d234ece4738b";
+ sha256 = "1lrq23cxlp2vkyv7g56r06bp7chhw10kii3ymkydf24y4pyn1zpg";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/cf9110cd142ece0a8d63815bf00a89574b947bb4/recipes/confluence";
- sha256 = "0hplpqaxjg34pf75p9sf97wlbq4rz9f8qvn4cfpjxf16if078ls3";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/confluence";
+ sha256 = "0xa2g168mm31kh5h7smhx35cjsk1js88nzs19yakjljf56b1khlf";
name = "confluence";
};
packageRequires = [ xml-rpc ];
@@ -10828,6 +10620,27 @@
license = lib.licenses.free;
};
}) {};
+ contextual-menubar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "contextual-menubar";
+ version = "20170908.408";
+ src = fetchFromGitHub {
+ owner = "aaronjensen";
+ repo = "contextual-menubar";
+ rev = "67ddb1c8eec62e2b26524c09585a4f25f03ebb11";
+ sha256 = "06rfkv7q9brahjgaqvpixqb26v4a65hyphl7ymjx8qyyypzrzac5";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/cba21d98f3abbf1f45d1fdd9164d4660b7d3e368/recipes/contextual-menubar";
+ sha256 = "0r9bsnvf45h7gsdfhsz7h02nskjvflfa2yjarjv9fcl7aipz8rr6";
+ name = "contextual-menubar";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/contextual-menubar";
+ license = lib.licenses.free;
+ };
+ }) {};
contrast-color = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "contrast-color";
@@ -10891,6 +10704,27 @@
license = lib.licenses.free;
};
}) {};
+ copy-file-on-save = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+ melpaBuild {
+ pname = "copy-file-on-save";
+ version = "20171019.347";
+ src = fetchFromGitHub {
+ owner = "emacs-php";
+ repo = "emacs-auto-deployment";
+ rev = "fe78b4c9fdc261ce22a771765702ebe4d9437c84";
+ sha256 = "0vf6qp7fxqvgd02vfsbmm38vc8n2wvrfwv4wnsr15gd8y8zldlgs";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/copy-file-on-save";
+ sha256 = "1mcwgkhd241aijnmzrrqqn9f7hiq5k1w4fj83v50aixrcs049gc3";
+ name = "copy-file-on-save";
+ };
+ packageRequires = [ cl-lib emacs f s ];
+ meta = {
+ homepage = "https://melpa.org/#/copy-file-on-save";
+ license = lib.licenses.free;
+ };
+ }) {};
copyit = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "copyit";
@@ -10936,16 +10770,16 @@
coq-commenter = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "coq-commenter";
- version = "20170607.1355";
+ version = "20170822.1609";
src = fetchFromGitHub {
owner = "ailrun";
repo = "coq-commenter";
- rev = "6100933cadea289cdaabf2f56f2a0dd72385c1fe";
- sha256 = "1b28gyyfjknjz23m18yhaj1ir72y8nl75cnam3ggygm9ax65h8i1";
+ rev = "7fe9a2cc0ebdb0b1e54a24eb7971d757fb588ac3";
+ sha256 = "1rq0j6ds9snv21k2lzyja96qxxz8nrai5aj1k1si9zshld28mapx";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/coq-commenter";
- sha256 = "07svxfh6wx78lg2r7jssdlipmcwzk8w14vry9fr5wxxi24y37nvg";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/c97d3f653057eab35c612109792884334be556fe/recipes/coq-commenter";
+ sha256 = "19726z8yvgwjikbl95smdl60k58a5yf7cjbinnb7251d8mhd8562";
name = "coq-commenter";
};
packageRequires = [ cl-lib dash s ];
@@ -10975,15 +10809,36 @@
license = lib.licenses.free;
};
}) {};
+ cosmo = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "cosmo";
+ version = "20170922.44";
+ src = fetchFromGitLab {
+ owner = "montanari";
+ repo = "cosmo-el";
+ rev = "dd83b09a49a2843606b28279b674b2207040b36b";
+ sha256 = "0phcg81g3dy67s1hfymvj0lkcpwygwql8iixf940nv31qllgzvd7";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/3ab914dfefcddf6ecd65261bc11bd3eb12929c79/recipes/cosmo";
+ sha256 = "1pk34d0kv1jm2fq72qa5lj0y39x1yf2nbkjjg8jcj8ari28h9vfk";
+ name = "cosmo";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/cosmo";
+ license = lib.licenses.free;
+ };
+ }) {};
counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
melpaBuild {
pname = "counsel";
- version = "20170813.351";
+ version = "20171101.1121";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "swiper";
- rev = "a5cd13b9487007ba6cb3eb64575800ee14589691";
- sha256 = "00rmcd72hxcsvrkwqsqy9b0jr1rxh3ny3q1fh33zp61s82n1dkn0";
+ rev = "5d373be194e21f3e29a03fb498b901fcc5e128f9";
+ sha256 = "0ycch0gqhjxg9ffz5y942z908zy4y3yl242dnyskkv3vmkrziwsz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel";
@@ -10999,12 +10854,12 @@
counsel-bbdb = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "counsel-bbdb";
- version = "20161105.350";
+ version = "20171016.1545";
src = fetchFromGitHub {
owner = "redguardtoo";
repo = "counsel-bbdb";
- rev = "297d0c7e6e1eaafcd5e188724fea8e8f26b95555";
- sha256 = "14gw4d855v2nvqh06vs9rzs816pn1hp4rhfikb0wzg1ay6gdrwi7";
+ rev = "298b48cb9e1186347fbcaf1ba354efa5fe2d7556";
+ sha256 = "137iv77j9a7mxsfrjxk4fpbaxw964pk4yj15609wijfcwgdjprwd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0ed9bcdb1f25a6dd743c1dac2bb6cda73a5a5dc2/recipes/counsel-bbdb";
@@ -11038,6 +10893,27 @@
license = lib.licenses.free;
};
}) {};
+ counsel-etags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "counsel-etags";
+ version = "20171026.435";
+ src = fetchFromGitHub {
+ owner = "redguardtoo";
+ repo = "counsel-etags";
+ rev = "19757e5d79a7a504760a1e7a7095779b48ec995f";
+ sha256 = "1qacqjl1x01r3ss1a9qwy0651gamnkp59nzl9i6krnrdfksc6gjz";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/87528349a3ab305bfe98f30c5404913272817a38/recipes/counsel-etags";
+ sha256 = "1h3dlczm1m21d4h41vz9ngg5fi02g6f95qalfxdnsvz0d4w4yxk0";
+ name = "counsel-etags";
+ };
+ packageRequires = [ counsel emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/counsel-etags";
+ license = lib.licenses.free;
+ };
+ }) {};
counsel-gtags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "counsel-gtags";
@@ -11083,12 +10959,12 @@
counsel-projectile = callPackage ({ counsel, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
melpaBuild {
pname = "counsel-projectile";
- version = "20170814.341";
+ version = "20171106.529";
src = fetchFromGitHub {
owner = "ericdanan";
repo = "counsel-projectile";
- rev = "280ead0e511904c67a9cb1686206efb65ba9c064";
- sha256 = "1wybb8lh6cbkx9mqhs2nrfjab6p6mfj36c2n6pxps6jsgzb9syi5";
+ rev = "293a8f2f6ab4f57cec63d8c51145853e83879230";
+ sha256 = "15vyzx354m4rr83k52d6hrh01pk88cj8ncgkl367j1ps487hmpxz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/389f16f886a385b02f466540f042a16eea8ba792/recipes/counsel-projectile";
@@ -11101,6 +10977,27 @@
license = lib.licenses.free;
};
}) {};
+ counsel-pydoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
+ melpaBuild {
+ pname = "counsel-pydoc";
+ version = "20171018.1342";
+ src = fetchFromGitHub {
+ owner = "co-dh";
+ repo = "pydoc_utils";
+ rev = "1d8ff8ca3b9d69453cde423b1887fbb490a95c9e";
+ sha256 = "06kf93y8wb9nwvs70xi4lkd5x4g6sl8f83diy2wl7ha657dwx3m8";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/110939c12b4e042a486e97be4c2a2426c5978ca6/recipes/counsel-pydoc";
+ sha256 = "1a3vwh4jf5y03z95bd4blk75n6wjd24l6yw6vpr3991bi4qrxclz";
+ name = "counsel-pydoc";
+ };
+ packageRequires = [ emacs ivy ];
+ meta = {
+ homepage = "https://melpa.org/#/counsel-pydoc";
+ license = lib.licenses.free;
+ };
+ }) {};
counsel-spotify = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "counsel-spotify";
@@ -11230,12 +11127,12 @@
cpputils-cmake = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cpputils-cmake";
- version = "20170507.629";
+ version = "20170819.259";
src = fetchFromGitHub {
owner = "redguardtoo";
repo = "cpputils-cmake";
- rev = "0d4b22cbf548e0d1ce4e79cc82ada3747bb5d389";
- sha256 = "0cg5cnvcd5nz15bpwi5h6972dlr2kxbzbz23lsq35hcbg3gj22k7";
+ rev = "4fa37dd075c716f98b67b96f3b6e022730df1c1b";
+ sha256 = "194vayk2hvqm2nv1rr3myiadrfvk8fpch1qlbic9bzbgfrl74i41";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9b84a159e97f7161d0705da5dd5e8c34ae5cb848/recipes/cpputils-cmake";
@@ -11269,27 +11166,6 @@
license = lib.licenses.free;
};
}) {};
- crab = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, websocket }:
- melpaBuild {
- pname = "crab";
- version = "20150126.2137";
- src = fetchFromGitHub {
- owner = "puffnfresh";
- repo = "crab-emacs";
- rev = "6d66844856c1864157cef3dea9332c319b05d7d5";
- sha256 = "0y37fx4ghx8a74cp7ci6p5yfpji8g42hlah2xcwfnyw0qlpqfbnl";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/25f80586fb88ab5f0eb71d657d602d9faa1169ec/recipes/crab";
- sha256 = "1jz26bw2h7ahcb7y2qhpqrlfald244c92m6pvfrb0jg0z384i6aj";
- name = "crab";
- };
- packageRequires = [ json websocket ];
- meta = {
- homepage = "https://melpa.org/#/crab";
- license = lib.licenses.free;
- };
- }) {};
crappy-jsp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "crappy-jsp-mode";
@@ -11437,47 +11313,6 @@
license = lib.licenses.free;
};
}) {};
- crontab-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "crontab-mode";
- version = "20090510.1355";
- src = fetchFromGitHub {
- owner = "emacsorphanage";
- repo = "crontab-mode";
- rev = "68341c82b26462a6af4a5e2b624b1c2165243b8e";
- sha256 = "1r9dhk8h8lq18vi0hjai8y4z42yjxg18786mcr2qs5m3q1ampf9d";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/5f2a50f62475639af011c99c6cc38928b74b3b0a/recipes/crontab-mode";
- sha256 = "16qc2isvf6cgl5ihdbwmvv0gbhns4mkhd5lxkl6f8f6h0za054ci";
- name = "crontab-mode";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/crontab-mode";
- license = lib.licenses.free;
- };
- }) {};
- crosshairs = callPackage ({ col-highlight, fetchurl, hl-line-plus, lib, melpaBuild, vline }:
- melpaBuild {
- pname = "crosshairs";
- version = "20170626.1548";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/crosshairs.el?revision=40";
- sha256 = "1dcynm83a3ixdccw3cqy533d9xwzswyi67cydaqmv35q88dg2nqw";
- name = "crosshairs.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/crosshairs";
- sha256 = "0s7gh5zrb46hzybmpydb0pad7jinvcwds7i03ndhzwx89rxg3019";
- name = "crosshairs";
- };
- packageRequires = [ col-highlight hl-line-plus vline ];
- meta = {
- homepage = "https://melpa.org/#/crosshairs";
- license = lib.licenses.free;
- };
- }) {};
crux = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
melpaBuild {
pname = "crux";
@@ -11541,6 +11376,27 @@
license = lib.licenses.free;
};
}) {};
+ crystal-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "crystal-mode";
+ version = "20171023.212";
+ src = fetchFromGitHub {
+ owner = "crystal-lang-tools";
+ repo = "emacs-crystal-mode";
+ rev = "1e8061c049766c25f1c06d43e703d3133426f7c0";
+ sha256 = "0w11s1vmp9b4dlq9kvnxi63j69c94bqpg3fn9w4jasnpz4w9nkcf";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b9b47d7deecf0cf24a42b26d50021cb1219a69/recipes/crystal-mode";
+ sha256 = "1fgpz7zab6nc6kvjzjsbvrbg8shf4by0f20cvjvyky8kym72q0hk";
+ name = "crystal-mode";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/crystal-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
csgo-conf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "csgo-conf-mode";
@@ -11565,12 +11421,12 @@
csharp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "csharp-mode";
- version = "20170502.158";
+ version = "20170927.816";
src = fetchFromGitHub {
owner = "josteink";
repo = "csharp-mode";
- rev = "628a4e2afa0e9c4672e8654c86240cb7f7bdf444";
- sha256 = "0gnl7nddgy7b83p70ybr41s3f6ybs383hdbzhp9jvxb21g665hn6";
+ rev = "331b45df9c6e84601cea323638f82ce5e4a68b03";
+ sha256 = "00i53c5a85n1i48jyxg78ab2yicx8maybfc6mzxw8s12j9hbw75i";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/736716bbcfd9c9fb1d10ce290cb4f66fe1c68f44/recipes/csharp-mode";
@@ -11586,12 +11442,12 @@
csound-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, multi, shut-up }:
melpaBuild {
pname = "csound-mode";
- version = "20170731.1504";
+ version = "20171025.401";
src = fetchFromGitHub {
owner = "hlolli";
repo = "csound-mode";
- rev = "34d9499e8da475c491eac1158bd429bf0e10e7de";
- sha256 = "1j7gykp16im5rlrlhrxk5svz9w543350q6lz41754ah0f7i8gc6m";
+ rev = "5680a266a32c62e8d7ebd987bf6e5fd40033bbeb";
+ sha256 = "1zlb7bwx82rayzphf4q5f1w6yhm3r267fzgn74xmckh50jyq917y";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c940d29de11e43b4abf2901c466c94d426a21818/recipes/csound-mode";
@@ -11688,34 +11544,15 @@
license = lib.licenses.free;
};
}) {};
- csv-nav = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "csv-nav";
- version = "20130407.1120";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/csv-nav.el?revision=7";
- sha256 = "15rfg3326xcs3zj3siy9rn7yff101vfch1srskdi2650c3l3krva";
- name = "csv-nav.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/csv-nav";
- sha256 = "0626vsm2f5zc2wi5pyx4xrwcr4ai8w9a3l7gi9883smvayr619sj";
- name = "csv-nav";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/csv-nav";
- license = lib.licenses.free;
- };
- }) {};
ctable = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ctable";
- version = "20140304.1659";
+ version = "20171005.1711";
src = fetchFromGitHub {
owner = "kiwanami";
repo = "emacs-ctable";
- rev = "cd673a09a80ce4e9e102ffe2e3d7e6bfb9d652b0";
- sha256 = "07vasdlai49qs0nsmq2cz1kcq1adqyarv8199imgwwcbh4vn7dqb";
+ rev = "b8830d1ca95abb100a81bc32011bd17d5ecba000";
+ sha256 = "0pg303pnqscrsbx9579hc815angszsgf9vpd2z2f8p4f4ka6a00h";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc29a8d518ce7a584277089bd4654f52ac0f358/recipes/ctable";
@@ -11794,12 +11631,12 @@
cubicaltt = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cubicaltt";
- version = "20170421.1132";
+ version = "20170912.317";
src = fetchFromGitHub {
owner = "mortberg";
repo = "cubicaltt";
- rev = "a331f1d355c5d2fc608a59c1cbbf016ea09d6deb";
- sha256 = "1anwj210gini3p98wy3fj1gbn5ijkbd5vnfc3526h4vppsb4vili";
+ rev = "3d3e890963c6d90d3586e063dd4beba343b1481c";
+ sha256 = "04158nkjvp7wgpfzdqp45yxs44nx1hbma3wsb8myzjcqspxpqip5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1be42b49c206fc4f0df6fb50fed80b3d9b76710b/recipes/cubicaltt";
@@ -11812,6 +11649,27 @@
license = lib.licenses.free;
};
}) {};
+ cubicle-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "cubicle-mode";
+ version = "20171009.1257";
+ src = fetchFromGitHub {
+ owner = "cubicle-model-checker";
+ repo = "cubicle";
+ rev = "9d108b900e0123236b4991c2d06b5061f34feee8";
+ sha256 = "1n3x6m19swkq07zah4hh0ni6gx864bq1w0km06nq33x8189zczrr";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/81c29c912b83cbb536d30ba04130b39c0e5e5969/recipes/cubicle-mode";
+ sha256 = "0xcmd0s6dfryl1ihfaqq0pfqc906yzzwk3d3nv8g6b6w78pv1lzv";
+ name = "cubicle-mode";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/cubicle-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
cucumber-goto-step = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pcre2el }:
melpaBuild {
pname = "cucumber-goto-step";
@@ -11854,25 +11712,6 @@
license = lib.licenses.free;
};
}) {};
- cursor-chg = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "cursor-chg";
- version = "20170221.1610";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/cursor-chg.el?revision=21";
- sha256 = "026x1mbjrf68xrv970jbf131d26rj0nmzi1x0c8r6qdr02pw2jy1";
- name = "cursor-chg.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cursor-chg";
- sha256 = "1yam5hz1v16g2v19j3dmgbj7n2rj8dsqyr5hwfyc031s6q7f649x";
- name = "cursor-chg";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/cursor-chg";
- license = lib.licenses.free;
- };
- }) {};
cursor-test = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cursor-test";
@@ -11894,22 +11733,24 @@
license = lib.licenses.free;
};
}) {};
- cus-edit-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "cus-edit-plus";
- version = "20170604.1000";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/cus-edit+.el";
- sha256 = "0awn3m16cyamb4h9i4iq9fzbwzl6qrkpbcr4v3dr7iwlcz7lw7jl";
- name = "cus-edit+.el";
+ cwl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yaml-mode }:
+ melpaBuild {
+ pname = "cwl-mode";
+ version = "20171030.230";
+ src = fetchFromGitHub {
+ owner = "tom-tan";
+ repo = "cwl-mode";
+ rev = "c5110c1e035535a1133a7107c0d2d55e5fe3c5b9";
+ sha256 = "088998r78bpy77pb2rhbr6a2fks5mcy3qyvyzlqwwl0v2gnscl59";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/57370fc617f4f10cc67e9d3c6dc113ff0a18cace/recipes/cus-edit+";
- sha256 = "1kazcdfajcnrzvhsgsmwwx96rkry0dglprrc02hbd7ky1fppp4sz";
- name = "cus-edit-plus";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/2309764cd56d9631dd97981a78b50b9fe793a280/recipes/cwl-mode";
+ sha256 = "0x8akxxmphpgsc2m78h6b0fs6vvcfvmi1q2jrz8hwlmai8f7zi9j";
+ name = "cwl-mode";
};
- packageRequires = [];
+ packageRequires = [ emacs yaml-mode ];
meta = {
- homepage = "https://melpa.org/#/cus-edit+";
+ homepage = "https://melpa.org/#/cwl-mode";
license = lib.licenses.free;
};
}) {};
@@ -11997,25 +11838,6 @@
license = lib.licenses.free;
};
}) {};
- cygwin-mount = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "cygwin-mount";
- version = "20131111.1346";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/cygwin-mount.el?revision=17";
- sha256 = "09my4gj3qm9rdpk8lg6n6ki8ywj7kwzwd4hhgwascfnfi1hzwdvw";
- name = "cygwin-mount.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/f94fb69a954275ee4098c96495b8566d6ce7cbb9/recipes/cygwin-mount";
- sha256 = "0ik2c8ab9bsx58mgcv511p50h45cpv7455n4b0kri83sx9xf5abb";
- name = "cygwin-mount";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/cygwin-mount";
- license = lib.licenses.free;
- };
- }) {};
cyphejor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cyphejor";
@@ -12061,12 +11883,12 @@
cython-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cython-mode";
- version = "20170723.1342";
+ version = "20170907.1648";
src = fetchFromGitHub {
owner = "cython";
repo = "cython";
- rev = "91f2ad9f1285311058dfee641616053bc8d64eca";
- sha256 = "0mb4kcvrwsvflywh5lnq20irmlgzgyqcjsmbmbhs21s3p6l9fh68";
+ rev = "13ab4d8a1b20d8a4a85172af8e13d07f8e48d455";
+ sha256 = "0mhs6myagzbwi690flaqqpij1pzwmf8asx466h324bfqi4flczzb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@@ -12145,12 +11967,12 @@
dad-joke = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dad-joke";
- version = "20170802.420";
+ version = "20170927.2358";
src = fetchFromGitHub {
owner = "davep";
repo = "dad-joke.el";
- rev = "973f66781bb4ccc01434d30bbff833cbbbfe1605";
- sha256 = "0am97ls9z4awak4y78xhdyzbs93vwk5jks9c48lhjy7vq3vr21zf";
+ rev = "bee47e7b746b403228fa7d7361cb095de19ac9ba";
+ sha256 = "14snnnjs28jg6k8x6g90m3dbcx10306ipcd256d3l6czk9p17vpd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/484d571b2737f7c613816333afdde6460c64e635/recipes/dad-joke";
@@ -12208,12 +12030,12 @@
danneskjold-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "danneskjold-theme";
- version = "20170702.1007";
+ version = "20171101.1146";
src = fetchFromGitHub {
owner = "rails-to-cosmos";
repo = "danneskjold-theme";
- rev = "f4de0fa84bec756ea31419f8db0b900fd1603c83";
- sha256 = "1wzwiahab6r8y772mg6268sh7l3b1fw4hxl10d38qv2khy641vlv";
+ rev = "cab6311e9d1848593d9e9373712642c8723307a9";
+ sha256 = "0dfapi7l8kzal3l7d700fxi3vci0sp0z3sim55yjay3m5ymh1d19";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/557244a3b60c7cd3ca964ff843aa1e9d5a1e32ec/recipes/danneskjold-theme";
@@ -12229,12 +12051,12 @@
dante = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild, s }:
melpaBuild {
pname = "dante";
- version = "20170809.1326";
+ version = "20171106.545";
src = fetchFromGitHub {
owner = "jyp";
repo = "dante";
- rev = "ccb16d240504951ccd3fa71c533d3d7a06769562";
- sha256 = "04gypz2i57zjhpj9khrfj0sr1c4hdf8yqxhlb9rwjknq3a807rr9";
+ rev = "5d4b2a09d5681408225bb5b9189d37e8b3e95079";
+ sha256 = "1m7k73m7qw0aqxx29c8y5liai93csmmhg749k6g0danqzy5dzn81";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante";
@@ -12247,15 +12069,36 @@
license = lib.licenses.free;
};
}) {};
+ darcsum = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "darcsum";
+ version = "20140315.2110";
+ src = fetchFromGitHub {
+ owner = "emacsorphanage";
+ repo = "darcsum";
+ rev = "00c252b51cb24c25fb74f529960ebd631514a4c1";
+ sha256 = "1vbfdmc56ma2ycxhza681ninhdxgvxm9j5xb9374xiqmb6g0vykq";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/darcsum";
+ sha256 = "0p3hwmwjjqwgkjws5b7gkad4yxh0gs2hr03ar18y43yahwgihvnv";
+ name = "darcsum";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/darcsum";
+ license = lib.licenses.free;
+ };
+ }) {};
darcula-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "darcula-theme";
- version = "20161004.2218";
+ version = "20171104.425";
src = fetchFromGitLab {
owner = "fommil";
repo = "emacs-darcula-theme";
- rev = "834202004507221c3bdf49457219a56760b13d22";
- sha256 = "1j2g94cz9b3ivv0w88gw1hcf236kc0c7hnrf13yyspxjm5jfdmd5";
+ rev = "2ecd466ffa7a3157b9ddcd7545b6fb8ad308c976";
+ sha256 = "1h5lssnc1am54hkprnp61bsj5fnm8j556q2gbhljfjgrdwnqv8ky";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/23c8f10205187babb17e3abc3dc40eb1938e6640/recipes/darcula-theme";
@@ -12331,27 +12174,6 @@
license = lib.licenses.free;
};
}) {};
- darkane-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "darkane-theme";
- version = "20161111.1304";
- src = fetchFromGitHub {
- owner = "FelixFortis";
- repo = "emacs-darkane-theme";
- rev = "afa346c793b74645392677b276c56b87c354b8ef";
- sha256 = "1mi2k7llbk4n05mcy80lswv5vqlfca2izslds7z0sihik8fys4m6";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/826bd40f9da54e263dbad4bd861bd8227ea76656/recipes/darkane-theme";
- sha256 = "1lnjjhy70bizqlpih9aqvv6hsx8lj4qa5klbd7mrldqywab8cpib";
- name = "darkane-theme";
- };
- packageRequires = [ emacs ];
- meta = {
- homepage = "https://melpa.org/#/darkane-theme";
- license = lib.licenses.free;
- };
- }) {};
darkburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "darkburn-theme";
@@ -12418,12 +12240,12 @@
darktooth-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "darktooth-theme";
- version = "20170715.1624";
+ version = "20171010.2057";
src = fetchFromGitHub {
owner = "emacsfodder";
repo = "emacs-theme-darktooth";
- rev = "257b0674a5c4ec510b51febba0c7a18e0f10a1bf";
- sha256 = "1ww12h19scda90r4rkgiynk3zvhkhk44gwfqj2m49pr89y7j8lap";
+ rev = "e7c13abeeb18f50658482c7df32701ae4ec375a0";
+ sha256 = "09smbgql9ibgn9l729ylas747xj48ipm6as61l6a5pbch376qriw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme";
@@ -12436,22 +12258,22 @@
license = lib.licenses.free;
};
}) {};
- dart-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+ dart-mode = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s }:
melpaBuild {
pname = "dart-mode";
- version = "20170525.1236";
+ version = "20171024.2137";
src = fetchFromGitHub {
owner = "nex3";
repo = "dart-mode";
- rev = "9b11e8fb63549ee3700fb53e92e4ce2cb302c971";
- sha256 = "1cp0qmnhnp57vihn343jz14kxm1rwn5b004q9yjlbv1am389rr12";
+ rev = "adef2a5b672d503ae3e92b30bb80095879b030d0";
+ sha256 = "0bb790rpijlv4cjdcwgqzb249rnz6br557lnn74rb9g52wpabl69";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dart-mode";
sha256 = "00zvgxfxgk5jair796l6appyq5hc7hs2s2wglv1j4l7g50b05cla";
name = "dart-mode";
};
- packageRequires = [ cl-lib dash flycheck ];
+ packageRequires = [ cl-lib dash emacs flycheck s ];
meta = {
homepage = "https://melpa.org/#/dart-mode";
license = lib.licenses.free;
@@ -12460,12 +12282,12 @@
dash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dash";
- version = "20170810.137";
+ version = "20171028.854";
src = fetchFromGitHub {
owner = "magnars";
repo = "dash.el";
- rev = "0df0ff1a65d54377381e50c08d88b247db44c3dd";
- sha256 = "01v75zavzb476cn3c43h9m2wa7vxrsipaja6y1wib07bfbh6i5gm";
+ rev = "91d8cb01e62bab0d6267d3d4dbcabd6da6fdea78";
+ sha256 = "1q0nnn3j3fv6y3n14kql7gdf2vc038lbmnz542pma8q0yfksbkid";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash";
@@ -12502,12 +12324,12 @@
dash-functional = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dash-functional";
- version = "20160615.1351";
+ version = "20171028.804";
src = fetchFromGitHub {
owner = "magnars";
repo = "dash.el";
- rev = "0df0ff1a65d54377381e50c08d88b247db44c3dd";
- sha256 = "01v75zavzb476cn3c43h9m2wa7vxrsipaja6y1wib07bfbh6i5gm";
+ rev = "91d8cb01e62bab0d6267d3d4dbcabd6da6fdea78";
+ sha256 = "1q0nnn3j3fv6y3n14kql7gdf2vc038lbmnz542pma8q0yfksbkid";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash-functional";
@@ -12523,12 +12345,12 @@
dashboard = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, page-break-lines }:
melpaBuild {
pname = "dashboard";
- version = "20170810.1025";
+ version = "20170923.719";
src = fetchFromGitHub {
owner = "rakanalh";
repo = "emacs-dashboard";
- rev = "f435fd394edc5ad9cf82065ef73b5821e3f93c58";
- sha256 = "0f0ipnij69z90qv9lzl6x9id3f6nayrgqxppbcf4gkxh25pi5nkw";
+ rev = "8594c4f55448148b720eda5b72d51667fb7a8a39";
+ sha256 = "1hhh1kfsz87qfmh45wjf2r93rz79rq0vbyxlfrsl02092zjbl1zr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e9a79341ccaa82a8c065e71c02fe6aee22007c66/recipes/dashboard";
@@ -12586,12 +12408,12 @@
datetime = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "datetime";
- version = "20170318.254";
+ version = "20170928.815";
src = fetchFromGitHub {
owner = "doublep";
repo = "datetime";
- rev = "3ecf9985250ecd441e91614b44cf12323af907c0";
- sha256 = "1x8kj6d9p42lffk15m0c955ibwxxvfxhihij43alwq5xab2l16bv";
+ rev = "082d2c7b0e38c26a8c46af9c9956a2e100d88e71";
+ sha256 = "0fdswqi53qx924lib7nd9dazn0916xf1ybrh3bcn3f8cn6b8ikg5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fff9f0748b0ef76130b24e85ed109325256f956e/recipes/datetime";
@@ -12609,14 +12431,14 @@
pname = "datetime-format";
version = "20160612.1015";
src = fetchFromGitHub {
- owner = "zonuexe";
+ owner = "emacs-php";
repo = "emacs-datetime";
rev = "e6427538b547cbe02e1bd6ed4b765c73620bdae8";
sha256 = "1573z8wq5m8qzbzmnsz2fmbwrj9c0ava0jjfchzmwm2b3jyvqh5r";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/e01f4589dbd8849638d4fc9bd765876987267439/recipes/datetime-format";
- sha256 = "0v9jp54qxzj2scbmr35xi6bz16q8bq6hmyxdglb3a4qbf4zgvwpi";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/datetime-format";
+ sha256 = "19qccjz2lzh01glgkixya7bxd6pvyjqgmw8bmqlwag6cb68bwsyv";
name = "datetime-format";
};
packageRequires = [];
@@ -12730,46 +12552,6 @@
license = lib.licenses.free;
};
}) {};
- debian-bug = callPackage ({ fetchcvs, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "debian-bug";
- version = "20140131.929";
- src = fetchcvs {
- cvsRoot = ":pserver:anonymous@cvs.alioth.debian.org:/cvs/pkg-goodies-el";
- module = "emacs-goodies-el";
- sha256 = "5c75978cdb4339ae7153edeafdf81d6effd8e23df6e406001c8106e105852105";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/19ea27b9e95dafa13b0740e850d065f169625c4f/recipes/debian-bug";
- sha256 = "0qlksbiw9qb0bv85b3rimsmzfr8dhbjjg4h0wnx7x434m6wqlm1a";
- name = "debian-bug";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/debian-bug";
- license = lib.licenses.free;
- };
- }) {};
- debian-changelog-mode = callPackage ({ fetchcvs, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "debian-changelog-mode";
- version = "20140131.929";
- src = fetchcvs {
- cvsRoot = ":pserver:anonymous@cvs.alioth.debian.org:/cvs/pkg-goodies-el";
- module = "emacs-goodies-el";
- sha256 = "5c75978cdb4339ae7153edeafdf81d6effd8e23df6e406001c8106e105852105";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/19ea27b9e95dafa13b0740e850d065f169625c4f/recipes/debian-changelog-mode";
- sha256 = "185l9ghsi6rlbmhs99lpsq257r5q87j8vra6h7jd9fwxfp4n9r22";
- name = "debian-changelog-mode";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/debian-changelog-mode";
- license = lib.licenses.free;
- };
- }) {};
debpaste = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }:
melpaBuild {
pname = "debpaste";
@@ -12878,12 +12660,12 @@
dedukti-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dedukti-mode";
- version = "20170225.722";
+ version = "20171103.512";
src = fetchFromGitHub {
owner = "rafoo";
repo = "dedukti-mode";
- rev = "49d7a83d3e966e0913e3969000701d4159dfab2f";
- sha256 = "0ryibbpq4qpj35lnczy1q4ldja782dzza5b48b7vy8a3x77yv07p";
+ rev = "d7c3505a1046187de3c3aeb144455078d514594e";
+ sha256 = "1842wikq24c8rg0ac84vb1qby9ng1nssxswyyni4kq85lng5lcrp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/767a685fbe8ae86177e90a17dac3815d41d74df4/recipes/dedukti-mode";
@@ -12899,12 +12681,12 @@
default-text-scale = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "default-text-scale";
- version = "20150227.956";
+ version = "20170826.2215";
src = fetchFromGitHub {
owner = "purcell";
repo = "default-text-scale";
- rev = "c680861a459e5a1b4cea0da1b99d2a22f08fdcd2";
- sha256 = "1ysv1q7n7k2l4x8x7hlzmxmawyxl5lx627sbdv3phkvjh5zccsm8";
+ rev = "968e985e219235f3e744d6d967e592acbaf6e0a8";
+ sha256 = "0zds01c3q5yny6ab1fxfkzzgn1kgl3q23lxxap905f4qd70v922h";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/db5e0b70e2d9c80aa41ae2c397f822789c2d3cc2/recipes/default-text-scale";
@@ -12920,12 +12702,12 @@
deferred = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "deferred";
- version = "20170531.2135";
+ version = "20170901.630";
src = fetchFromGitHub {
owner = "kiwanami";
repo = "emacs-deferred";
- rev = "d012a1ab50edcc2c44e3e49006f054dbff47cb6c";
- sha256 = "0xy9zb6wwkgwhcxdnslqk52bq3z24chgk6prqi4ks0qcf2bwyh5h";
+ rev = "2239671d94b38d92e9b28d4e12fd79814cfb9c16";
+ sha256 = "0vz59lm7pfz0gbsgrb44y555js85wbdjn0zm6p8wfqjiqf63ds3i";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/deferred";
@@ -12941,12 +12723,12 @@
define-word = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "define-word";
- version = "20150709.1223";
+ version = "20171001.1616";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "define-word";
- rev = "64d98b7748686c51261fe6e8d42078c6284feb13";
- sha256 = "02i621yq2ih0zp7mna8iykj41prv77hvcadz7rx8c942zyvjzxqd";
+ rev = "a425ffe44d62622b86477a622c6188a56bc2bd9a";
+ sha256 = "02v9yzvinapr6m7pjxr4kcgqnlm7j21ygh1dhkabarz83v43awh3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e318b30d8b2b89981f4b89d78e5a46e77d3de412/recipes/define-word";
@@ -12983,12 +12765,12 @@
deft = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "deft";
- version = "20160610.1739";
+ version = "20171031.530";
src = fetchFromGitHub {
owner = "jrblevin";
repo = "deft";
- rev = "86825cd420985112d9dd38060e0edb72b08c6dab";
- sha256 = "0jz8ikh143n9byidh675jyd76bymbwijs0xi2y141982s69r2n0l";
+ rev = "c7413a390ac22331ad5226a8c8c007bd08759bc8";
+ sha256 = "1rdjffw8vw71ay93zlr2klbr8q4q1sjnw03gsfdyll1q4idbarg1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/deft";
@@ -13025,12 +12807,12 @@
demangle-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "demangle-mode";
- version = "20170526.1508";
+ version = "20170923.1501";
src = fetchFromGitHub {
owner = "liblit";
repo = "demangle-mode";
- rev = "d3fce31974b1c9f659da427f3c69c2e6168df508";
- sha256 = "0k4pacjjgxagsa8kgzvynvmvczhbb73waq3l6gld7v3h38js163a";
+ rev = "79231b05f97da147d66120f947656f856a3a64fb";
+ sha256 = "0whr18qwi5bmz39n8x836sjgky20qhw59qha59c11dvly1qs5nnq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6ced9f4ffb051a8474d3f72695156416cf2dd8be/recipes/demangle-mode";
@@ -13169,18 +12951,40 @@
license = lib.licenses.free;
};
}) {};
- dic-lookup-w3m = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild, stem, w3m }:
+ dhall-mode = callPackage ({ ansi-color ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "dhall-mode";
+ version = "20171006.1233";
+ src = fetchFromGitHub {
+ owner = "psibi";
+ repo = "dhall-mode";
+ rev = "181e5b0df73ce729cf4b711fa76bb43c2581d29d";
+ sha256 = "1jw4is9jxx60hsaqjkmravrkxdfn7ni6zl9wx9i7r2y2r5mmwx88";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/c7ab435077b2f47d75ddc0ff10c64ee2b46044e2/recipes/dhall-mode";
+ sha256 = "1zkspjwllcw9k4nlnif6jdwzl08ki39vmx90apw029n87xhvx7mp";
+ name = "dhall-mode";
+ };
+ packageRequires = [ ansi-color emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/dhall-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
+ dic-lookup-w3m = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, stem, w3m }:
melpaBuild {
pname = "dic-lookup-w3m";
version = "20170803.354";
- src = fetchsvn {
- url = "https://svn.osdn.jp/svnroot/dic-lookup-w3m/";
- rev = "99";
+ src = fetchFromGitHub {
+ owner = "emacsorphanage";
+ repo = "dic-lookup-w3m";
+ rev = "79aca5eb9c78e67cb85a386060d48113caad5ec3";
sha256 = "18l2s37bnnzbgw22mivgw5isxck2y0n3nk7735r4ir5y5wqx88mr";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/dic-lookup-w3m";
- sha256 = "1siqrarpyqjh1h350dsyca993fy6qin4apgyjm4vpp6awip8xfp0";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/dic-lookup-w3m";
+ sha256 = "1kwbmzzf8sj4bn5kicmlp2hzv8ydcikwmdy7s40ggkgf1mk9zvqr";
name = "dic-lookup-w3m";
};
packageRequires = [ stem w3m ];
@@ -13384,8 +13188,8 @@
src = fetchFromGitHub {
owner = "myrjola";
repo = "diminish.el";
- rev = "d5c61a14e1a5590a65f83c099a5bd42fcadff24d";
- sha256 = "0c0p4b3nfnczmkjx64qz2w9dk0b7srfnhrnd902qn9z55k4n0wg8";
+ rev = "565a983a39d2e2cffab5df13b34f3b6116723208";
+ sha256 = "173lzj9l7a4wcfvdq6akvfyyyriy5c30b4vhhv51hs051dmn02d0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1bfb4acb381cada46458cf60eae9b88d007294d5/recipes/diminish";
@@ -13468,8 +13272,8 @@
src = fetchFromGitHub {
owner = "Fuco1";
repo = "dired-hacks";
- rev = "47f955a2dee9b064ce16db9929737ef4af6c941a";
- sha256 = "01sxrjvsm5jpz0xddazc8fa6gr3irqm1hmb0x5pw279lhin23z67";
+ rev = "26bf9b86e67883de3813518b2356f466dc2bb727";
+ sha256 = "0vkpf5w3bklgvz9v0fy1icdq6rf9w19399d0kphsb1a1vql575y1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-avfs";
@@ -13485,12 +13289,12 @@
dired-collapse = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dired-collapse";
- version = "20170806.1203";
+ version = "20171026.159";
src = fetchFromGitHub {
owner = "Fuco1";
repo = "dired-hacks";
- rev = "47f955a2dee9b064ce16db9929737ef4af6c941a";
- sha256 = "01sxrjvsm5jpz0xddazc8fa6gr3irqm1hmb0x5pw279lhin23z67";
+ rev = "26bf9b86e67883de3813518b2356f466dc2bb727";
+ sha256 = "0vkpf5w3bklgvz9v0fy1icdq6rf9w19399d0kphsb1a1vql575y1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6aab23df1451682ff18d9ad02c35cb7ec612bc38/recipes/dired-collapse";
@@ -13503,45 +13307,6 @@
license = lib.licenses.free;
};
}) {};
- dired-details = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "dired-details";
- version = "20130824.458";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/dired-details.el?revision=15";
- sha256 = "1ddrhj1kw0wl7jbs9jn067vfffsvqhz4izfw9f7ihxz34fdl2iza";
- name = "dired-details.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dired-details";
- sha256 = "0kmcnx9zvfdwvq100nazgypkfwlgxgrbimprc5pysid8rrxyzws7";
- name = "dired-details";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/dired-details";
- license = lib.licenses.free;
- };
- }) {};
- dired-details-plus = callPackage ({ dired-details, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "dired-details-plus";
- version = "20170221.1629";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/dired-details+.el";
- sha256 = "0821swa6qp2bs16r1pfamc7n62002rp8v0vimamw33cqxn2d0h6x";
- name = "dired-details+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dired-details+";
- sha256 = "0b4y01hk839z6m7fx5bwa80gwylvkp15niri8vrjak4vgj5g5cg9";
- name = "dired-details-plus";
- };
- packageRequires = [ dired-details ];
- meta = {
- homepage = "https://melpa.org/#/dired-details+";
- license = lib.licenses.free;
- };
- }) {};
dired-dups = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dired-dups";
@@ -13650,12 +13415,12 @@
dired-filter = callPackage ({ cl-lib ? null, dash, dired-hacks-utils, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dired-filter";
- version = "20170718.1145";
+ version = "20171010.204";
src = fetchFromGitHub {
owner = "Fuco1";
repo = "dired-hacks";
- rev = "47f955a2dee9b064ce16db9929737ef4af6c941a";
- sha256 = "01sxrjvsm5jpz0xddazc8fa6gr3irqm1hmb0x5pw279lhin23z67";
+ rev = "26bf9b86e67883de3813518b2356f466dc2bb727";
+ sha256 = "0vkpf5w3bklgvz9v0fy1icdq6rf9w19399d0kphsb1a1vql575y1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-filter";
@@ -13675,8 +13440,8 @@
src = fetchFromGitHub {
owner = "Fuco1";
repo = "dired-hacks";
- rev = "47f955a2dee9b064ce16db9929737ef4af6c941a";
- sha256 = "01sxrjvsm5jpz0xddazc8fa6gr3irqm1hmb0x5pw279lhin23z67";
+ rev = "26bf9b86e67883de3813518b2356f466dc2bb727";
+ sha256 = "0vkpf5w3bklgvz9v0fy1icdq6rf9w19399d0kphsb1a1vql575y1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-hacks-utils";
@@ -13776,12 +13541,12 @@
dired-launch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dired-launch";
- version = "20170409.1923";
+ version = "20171004.1027";
src = fetchFromGitHub {
owner = "thomp";
repo = "dired-launch";
- rev = "75745f2e40d060cae909f9e6f6ca2e5f725180b8";
- sha256 = "1amsqbbjzjw07s40v8c63iw59qf5r1x7rqq2iq1jiybwsrp9s7v0";
+ rev = "f71826804221bafc4f9f2f75a800400a72c24b8b";
+ sha256 = "1cyg1bbn2jj101wz2jjzk832mfk5yhnc4a9m817lnalf73j0nkrs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/31c9a4945d65aa6afc371c447a572284d38d4d71/recipes/dired-launch";
@@ -13801,8 +13566,8 @@
src = fetchFromGitHub {
owner = "Fuco1";
repo = "dired-hacks";
- rev = "47f955a2dee9b064ce16db9929737ef4af6c941a";
- sha256 = "01sxrjvsm5jpz0xddazc8fa6gr3irqm1hmb0x5pw279lhin23z67";
+ rev = "26bf9b86e67883de3813518b2356f466dc2bb727";
+ sha256 = "0vkpf5w3bklgvz9v0fy1icdq6rf9w19399d0kphsb1a1vql575y1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8994330f90a925df17ae425ccdc87865df8e19cd/recipes/dired-narrow";
@@ -13822,8 +13587,8 @@
src = fetchFromGitHub {
owner = "Fuco1";
repo = "dired-hacks";
- rev = "47f955a2dee9b064ce16db9929737ef4af6c941a";
- sha256 = "01sxrjvsm5jpz0xddazc8fa6gr3irqm1hmb0x5pw279lhin23z67";
+ rev = "26bf9b86e67883de3813518b2356f466dc2bb727";
+ sha256 = "0vkpf5w3bklgvz9v0fy1icdq6rf9w19399d0kphsb1a1vql575y1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-open";
@@ -13836,25 +13601,6 @@
license = lib.licenses.free;
};
}) {};
- dired-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "dired-plus";
- version = "20170630.752";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/dired+.el";
- sha256 = "1jl14z15ilkwl45xv34akabnx4430siqkjv14sqi33g3qmnln90y";
- name = "dired+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/dired+";
- sha256 = "1dmp6wcynran03nsa0fd26b9q0zj9wp8ngaafx1i1ybwn2gx32g5";
- name = "dired-plus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/dired+";
- license = lib.licenses.free;
- };
- }) {};
dired-quick-sort = callPackage ({ fetchFromGitLab, fetchurl, hydra, lib, melpaBuild }:
melpaBuild {
pname = "dired-quick-sort";
@@ -13879,12 +13625,12 @@
dired-rainbow = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dired-rainbow";
- version = "20170531.816";
+ version = "20170922.817";
src = fetchFromGitHub {
owner = "Fuco1";
repo = "dired-hacks";
- rev = "47f955a2dee9b064ce16db9929737ef4af6c941a";
- sha256 = "01sxrjvsm5jpz0xddazc8fa6gr3irqm1hmb0x5pw279lhin23z67";
+ rev = "26bf9b86e67883de3813518b2356f466dc2bb727";
+ sha256 = "0vkpf5w3bklgvz9v0fy1icdq6rf9w19399d0kphsb1a1vql575y1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-rainbow";
@@ -13904,8 +13650,8 @@
src = fetchFromGitHub {
owner = "Fuco1";
repo = "dired-hacks";
- rev = "47f955a2dee9b064ce16db9929737ef4af6c941a";
- sha256 = "01sxrjvsm5jpz0xddazc8fa6gr3irqm1hmb0x5pw279lhin23z67";
+ rev = "26bf9b86e67883de3813518b2356f466dc2bb727";
+ sha256 = "0vkpf5w3bklgvz9v0fy1icdq6rf9w19399d0kphsb1a1vql575y1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c03f6f8c779c8784f52adb20b266404cb537113a/recipes/dired-ranger";
@@ -13918,6 +13664,27 @@
license = lib.licenses.free;
};
}) {};
+ dired-sidebar = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "dired-sidebar";
+ version = "20170904.2004";
+ src = fetchFromGitHub {
+ owner = "jojojames";
+ repo = "dired-sidebar";
+ rev = "35e43797f037fc298b6478817d51be3ceff5b568";
+ sha256 = "1rizajqh96im8ygbfzrhn0ysh3r9qlk7njgn2rayk6a5krj6gn16";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/30e15c8361b01195f198197e704828fbcac0e8d6/recipes/dired-sidebar";
+ sha256 = "19a4gsx9wmpc94jd992c7dj5mxfnnij2nc6qnb2lhk8ad69h1lmc";
+ name = "dired-sidebar";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/dired-sidebar";
+ license = lib.licenses.free;
+ };
+ }) {};
dired-single = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dired-single";
@@ -13939,73 +13706,15 @@
license = lib.licenses.free;
};
}) {};
- dired-sort = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "dired-sort";
- version = "20090208.2038";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/dired-sort.el?revision=1";
- sha256 = "1dpxkxxfs14sdm3hwxv0j26lq0qzx4gryw42vrcdi680aj24962z";
- name = "dired-sort.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/f1e4cd8274cdec74a9867060f72ec2025ed0150d/recipes/dired-sort";
- sha256 = "1dzy2601yikmmbfqivf9s5xi4vd1f5g3c53f8rc74kfnxr1qn59x";
- name = "dired-sort";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/dired-sort";
- license = lib.licenses.free;
- };
- }) {};
- dired-sort-menu = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "dired-sort-menu";
- version = "20130824.507";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/dired-sort-menu.el?revision=9";
- sha256 = "1i42r7j1c8677qf79ig33bia24d2yvcj26y92migfvrlbi03w4qi";
- name = "dired-sort-menu.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/dired-sort-menu";
- sha256 = "0n7zh8s3vdw3pcax8wkas9rykf917wn2dzikdlyrl5bbil9ijblb";
- name = "dired-sort-menu";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/dired-sort-menu";
- license = lib.licenses.free;
- };
- }) {};
- dired-sort-menu-plus = callPackage ({ dired-sort-menu, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "dired-sort-menu-plus";
- version = "20170221.1630";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/dired-sort-menu+.el";
- sha256 = "0f2z0nj51i27qqj0ws644k61dj9bp3hagi9phj9d41fcsqzzja4h";
- name = "dired-sort-menu+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/dired-sort-menu+";
- sha256 = "19ah8qgbfdvyhfszdr6hlw8l01lbdb84vf5snldw8qh3x6lw8cfq";
- name = "dired-sort-menu-plus";
- };
- packageRequires = [ dired-sort-menu ];
- meta = {
- homepage = "https://melpa.org/#/dired-sort-menu+";
- license = lib.licenses.free;
- };
- }) {};
dired-subtree = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dired-subtree";
- version = "20160920.130";
+ version = "20170910.1521";
src = fetchFromGitHub {
owner = "Fuco1";
repo = "dired-hacks";
- rev = "47f955a2dee9b064ce16db9929737ef4af6c941a";
- sha256 = "01sxrjvsm5jpz0xddazc8fa6gr3irqm1hmb0x5pw279lhin23z67";
+ rev = "26bf9b86e67883de3813518b2356f466dc2bb727";
+ sha256 = "0vkpf5w3bklgvz9v0fy1icdq6rf9w19399d0kphsb1a1vql575y1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d6a947ac9476f10b95a3c153ec784d2a8330dd4c/recipes/dired-subtree";
@@ -14060,6 +13769,27 @@
license = lib.licenses.free;
};
}) {};
+ diredfl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "diredfl";
+ version = "20171014.1402";
+ src = fetchFromGitHub {
+ owner = "purcell";
+ repo = "diredfl";
+ rev = "085eabf2e70590ec8e31c1e66931d652d8eab432";
+ sha256 = "19gjs90ai6fv4q7rhssrgc45d9g4frg680p1jgmbxzrd9jdy013w";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/3da86e18d423198766455929da1dcb3a9a3be381/recipes/diredfl";
+ sha256 = "0cybq15yq07x2mnrnwapy020d598yymcy8y9wwf1m7f59p3h9hvn";
+ name = "diredfl";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/diredfl";
+ license = lib.licenses.free;
+ };
+ }) {};
diredful = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "diredful";
@@ -14189,12 +13919,12 @@
disable-mouse = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "disable-mouse";
- version = "20160630.1903";
+ version = "20170929.1353";
src = fetchFromGitHub {
owner = "purcell";
repo = "disable-mouse";
- rev = "3b8681b099eb0c3af6078fa0e479d0d0ce6686ad";
- sha256 = "0k65jddjd0xbm91fzjll8j69qd4ql9qz47x2mdhb2xc344kdwp9x";
+ rev = "81639930bcaeedadbcc19728e91719afcac84613";
+ sha256 = "0l6mai68ns3qw3rlvjvzsnqwdy7bxqiy0vdwflq0l1plxb1vazyc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/dbbc396373212fdf731e135cde391f27708ff015/recipes/disable-mouse";
@@ -14210,12 +13940,12 @@
disaster = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "disaster";
- version = "20170507.1626";
+ version = "20171016.1452";
src = fetchFromGitHub {
owner = "jart";
repo = "disaster";
- rev = "3bab3c0db29c6d5484ab8aacbf29490e3aa2d713";
- sha256 = "15brdrcq2i3rckdh2ml5m1fvf7asgqij9swc1p9fgp1fk2i05sfn";
+ rev = "10a785facc60d89d78e0d5177985ab1af1741bb4";
+ sha256 = "0iz43jdkh5qdllqdchliys84gn9bpj6688rpc4jnycp64141m6cx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a4654b3646b96f967e2c75440e664a417cd0f517/recipes/disaster";
@@ -14333,25 +14063,6 @@
license = lib.licenses.free;
};
}) {};
- disk = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "disk";
- version = "20081128.706";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/disk.el?revision=9";
- sha256 = "1c0pgqvl1z2f5hprszln53pn2v2pqy110r3wx3g84v71w6378bbv";
- name = "disk.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/edcafb4c459cf51fecc7c43a3e4dcbe377d68b46/recipes/disk";
- sha256 = "0bij9gr4zv6jmc6dwsy3lb06vsxvmyzl8xrm8wzasxisk1qd2l6n";
- name = "disk";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/disk";
- license = lib.licenses.free;
- };
- }) {};
dispass = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dispass";
@@ -14778,8 +14489,8 @@
src = fetchFromGitHub {
owner = "Silex";
repo = "docker.el";
- rev = "8070936871e0fbb20fb04c28630288ebe314b8b9";
- sha256 = "0gk4ykvsv8wgfiym0z635a3n3jaw4wnvfmf78ppfinrzybg85r76";
+ rev = "4df5f94c78817a1f3755a7c9b1358349bf287270";
+ sha256 = "05ggavxq61w55n6b8g76xpqasfka3rbf3326jwxjrd1p6wzs1d3d";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker";
@@ -14824,12 +14535,12 @@
docker-compose-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yaml-mode }:
melpaBuild {
pname = "docker-compose-mode";
- version = "20170812.1551";
+ version = "20170916.1438";
src = fetchFromGitHub {
owner = "meqif";
repo = "docker-compose-mode";
- rev = "37d8afb6a72f829fdbc77e76f18587530ff319b4";
- sha256 = "11283gl19iqm03a5l635qq36fpxlj05j7a6hlnv7v15n3h7d5512";
+ rev = "f3c06a43d69dfe80041a82a9365281bd5c65a105";
+ sha256 = "1fzz950wb95lp15ak8q4vzls21w9fc3qxqs5hlf50najdw36w52h";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/37dd4c1fc11d22598c6faf03ccc860503a68b950/recipes/docker-compose-mode";
@@ -14863,22 +14574,22 @@
license = lib.licenses.free;
};
}) {};
- dockerfile-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ dockerfile-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "dockerfile-mode";
- version = "20170418.1024";
+ version = "20171105.435";
src = fetchFromGitHub {
owner = "spotify";
repo = "dockerfile-mode";
- rev = "3c6bc90360a2df53caad1721ee4c8285e2e22369";
- sha256 = "166hfzfb45f11jfhx78w6h23cyj9wr1nrwrxxqs2m5cry407gj3k";
+ rev = "69bfba7acc6bda0d0a5834c3774fffc145337a63";
+ sha256 = "09s13cpldrw19m1n6dh17x85nm5kx1km4f5pmzryll23a3qwcm0x";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1406f5a24115d29e3b140c360a51b977a369e4f9/recipes/dockerfile-mode";
sha256 = "1dxvzn35a9qd3x8pjvrvb2g71yf84404g6vz81y0p353rf2zknpa";
name = "dockerfile-mode";
};
- packageRequires = [];
+ packageRequires = [ emacs s ];
meta = {
homepage = "https://melpa.org/#/dockerfile-mode";
license = lib.licenses.free;
@@ -14971,12 +14682,12 @@
doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "doom-themes";
- version = "20170809.1218";
+ version = "20171017.1649";
src = fetchFromGitHub {
owner = "hlissner";
repo = "emacs-doom-themes";
- rev = "af5f703b6b63a7823fe5eec9864222c794a05566";
- sha256 = "0c6sr2n795cjbvvlgiqb6a6lixbwdag5p4l3iw4knikdp31gk55w";
+ rev = "d91f72b83ec22f1620372574582e163f921e6796";
+ sha256 = "1ykl835k0s5nkb6343yk4gyk7hdx4l96jnfa84vdq74x2asidfs1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes";
@@ -14989,84 +14700,6 @@
license = lib.licenses.free;
};
}) {};
- doremi = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "doremi";
- version = "20170221.1634";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/doremi.el?revision=42";
- sha256 = "03alkj4mxajsgmghw935hm3c95a12222zq1ig6kwmfrla5kg3b7q";
- name = "doremi.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/doremi";
- sha256 = "11i4cdxgrspx44p44zz5py89ypji5li6p5w77wy0b07i8a5gq2gb";
- name = "doremi";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/doremi";
- license = lib.licenses.free;
- };
- }) {};
- doremi-cmd = callPackage ({ doremi, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "doremi-cmd";
- version = "20170221.1631";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/doremi-cmd.el?revision=47";
- sha256 = "09iizx079y43qk3jd66n8i8ifm2s7jnc9g7831nv5f3c26rgl0w6";
- name = "doremi-cmd.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/doremi-cmd";
- sha256 = "1qzspirn1abqps0dn5z8w6ymffc6b02dyki5hr8v74wfs8fhzx05";
- name = "doremi-cmd";
- };
- packageRequires = [ doremi ];
- meta = {
- homepage = "https://melpa.org/#/doremi-cmd";
- license = lib.licenses.free;
- };
- }) {};
- doremi-frm = callPackage ({ doremi, faces-plus, fetchurl, frame-fns, hexrgb, lib, melpaBuild }:
- melpaBuild {
- pname = "doremi-frm";
- version = "20170221.1632";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/doremi-frm.el?revision=74";
- sha256 = "0f9vwajgdm37krz55sv5c8ijfqhy5gsxj1zyxg8zbs6l33giynxd";
- name = "doremi-frm.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/doremi-frm";
- sha256 = "1rj3p665q32acsxxwygv1j5nbmjqrhi0b4glzrk88xki4lyz0ihz";
- name = "doremi-frm";
- };
- packageRequires = [ doremi faces-plus frame-fns hexrgb ];
- meta = {
- homepage = "https://melpa.org/#/doremi-frm";
- license = lib.licenses.free;
- };
- }) {};
- doremi-mac = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "doremi-mac";
- version = "20170221.1633";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/doremi-mac.el?revision=30";
- sha256 = "002jhqk26ywiyci1r91aqbq0zhbxy6rsyw3h74ck04rxjfc49rxl";
- name = "doremi-mac.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/doremi-mac";
- sha256 = "0n9fffgxnpqc7cch7aci5kxbwzk36iljdz2r8gcp5y5n1p7aamls";
- name = "doremi-mac";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/doremi-mac";
- license = lib.licenses.free;
- };
- }) {};
dot-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dot-mode";
@@ -15091,12 +14724,12 @@
dotnet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dotnet";
- version = "20170808.1423";
+ version = "20170827.838";
src = fetchFromGitHub {
owner = "julienXX";
repo = "dotnet.el";
- rev = "514d36ec1090f78c999a7d6614176f03a0065a9d";
- sha256 = "1cg5hmkay5zj7ax8dnwipy5vsx2vg3ragvqbzizv71qasyr5vyjh";
+ rev = "e22fd23bf2bfab980d4802b10c4d872b800f90d4";
+ sha256 = "1qq0gkdr0h4b9h6l14wfk3zmw62sa2i5in23bvs6jp6y6hmffr2m";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6ef473594ec57a747ad7d9d57d7287bcacf4b446/recipes/dotnet";
@@ -15263,8 +14896,8 @@
src = fetchFromGitHub {
owner = "rejeep";
repo = "drag-stuff.el";
- rev = "d49fe376d24f0f8ac5ade67b6d7fccc2487c81db";
- sha256 = "1jrr59iazih3imkl9ja1lbni9v3xv6b8gmqs015g2mxhlql35jka";
+ rev = "6d06d846cd37c052d79acd0f372c13006aa7e7c8";
+ sha256 = "1fsj88n1j50cxjzx62khzxrajsvf33si8iwgbaz6z7z8pwh91qcd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/drag-stuff";
@@ -15361,34 +14994,15 @@
license = lib.licenses.free;
};
}) {};
- dropdown-list = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "dropdown-list";
- version = "20120329.936";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/dropdown-list.el?revision=5";
- sha256 = "1szy46sk3nvlbb3yzk1s983281kkf507xr3fkclkki3d3x31n08a";
- name = "dropdown-list.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dropdown-list";
- sha256 = "1zqqa4872r96fp377bcz6pd1djz59ami5k09abb62dw854sc5xfj";
- name = "dropdown-list";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/dropdown-list";
- license = lib.licenses.free;
- };
- }) {};
drupal-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode }:
melpaBuild {
pname = "drupal-mode";
- version = "20170112.1136";
+ version = "20170926.38";
src = fetchFromGitHub {
owner = "arnested";
repo = "drupal-mode";
- rev = "9d5808972f344a09dcf665d5113ae81e39ac1051";
- sha256 = "0vz41jfkfir7ymyl5y0v836zclqfihrjdiyz3vnb081x0gara8l0";
+ rev = "b0ca2c39650136f7e5672461e64397b9add30b92";
+ sha256 = "1l2xc24y037b3z62yxmq2bx1x3qqv56d15bf3qmb3mpgm4gh85j6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/13e16af340868048eb1f51f9865dfc707e57abe8/recipes/drupal-mode";
@@ -15422,17 +15036,19 @@
license = lib.licenses.free;
};
}) {};
- dsvn = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild }: melpaBuild {
+ dsvn = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
pname = "dsvn";
version = "20130120.1257";
- src = fetchsvn {
- url = "https://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/";
- rev = "1804990";
- sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq";
+ src = fetchFromGitHub {
+ owner = "emacsorphanage";
+ repo = "dsvn";
+ rev = "17bce692e9bd5a43373d5cb1d66da50e1acb903b";
+ sha256 = "1bv4ivv9j5r0ax4vay1kmwv753y44qj6qprr38yh7ky0fpsml34c";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dsvn";
- sha256 = "1y55s187q2xiab31vs95jjjp1a3qzwkdwn7p5man666scbjrdyl5";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/dsvn";
+ sha256 = "1kgc0b8as7w1h9dsknv2h7dzr6jcrs0j0p376050pshgzcm79nm6";
name = "dsvn";
};
packageRequires = [];
@@ -15465,12 +15081,12 @@
dtrt-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dtrt-indent";
- version = "20160620.329";
+ version = "20171001.1233";
src = fetchFromGitHub {
owner = "jscheid";
repo = "dtrt-indent";
- rev = "a54871bedadabede505b3913ee1039f5ab36cad2";
- sha256 = "0ylch7q8lh2r10qzrb41bnrpnznvj5fjszazmxfcvj6ss8yrxjzi";
+ rev = "7fd55af3b0311ea24b68397054e705c835fa5ef1";
+ sha256 = "1sgmd1zqdwa1f6y8d6vaacyipkqn2ivvaim1xndbkihgmhyn4kf0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/61bcbcfa6c0f38a1d87f5b6913b8be6c50ef2994/recipes/dtrt-indent";
@@ -15525,15 +15141,36 @@
license = lib.licenses.free;
};
}) {};
+ dumb-diff = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "dumb-diff";
+ version = "20170924.2036";
+ src = fetchFromGitHub {
+ owner = "jacktasia";
+ repo = "dumb-diff";
+ rev = "205ea5fda371f296fd876e362c12a5b64c4724d9";
+ sha256 = "0gxrrhlhp1g679c1ygj8m0jy4pag55b957vyxm9845z4vx93wj1x";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/cf7fa0b4235247d82569ed078f92774f10afa45c/recipes/dumb-diff";
+ sha256 = "1h1dvxbj85kgi04lxh0bpx81f6sl1fd56lhjmq1cw9biwqw0sm0c";
+ name = "dumb-diff";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/dumb-diff";
+ license = lib.licenses.free;
+ };
+ }) {};
dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }:
melpaBuild {
pname = "dumb-jump";
- version = "20170812.1308";
+ version = "20171105.1624";
src = fetchFromGitHub {
owner = "jacktasia";
repo = "dumb-jump";
- rev = "7b6c37a2e4e5a4c3ad9fbcd89c8eba1b32709b6b";
- sha256 = "0z4hgg7ya1x89gplk0hx4gi7div1bnqyi18hcj0zmgl9db0z333w";
+ rev = "ce4eaa49b629140806a8808712356a5a09c2abad";
+ sha256 = "1bjpqghfp1jprhaciqjm11n6bdy5wzph625p2v0xcd59pr8jsj6p";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dumb-jump";
@@ -15612,11 +15249,11 @@
dyalog-mode = callPackage ({ cl-lib ? null, emacs, fetchhg, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dyalog-mode";
- version = "20170519.704";
+ version = "20171012.1339";
src = fetchhg {
url = "https://bitbucket.com/harsman/dyalog-mode";
- rev = "56fa34ea25d4";
- sha256 = "1hk7i557m0m42zdg59z278cylglnp49dr8wa3zbdwzk2xzdg0m00";
+ rev = "9e446540a794";
+ sha256 = "0gyip843fdqp6cwwaqcrnpngf5a3iqcbd9h7rl5lbvxpkqvm7shi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode";
@@ -15692,6 +15329,27 @@
license = lib.licenses.free;
};
}) {};
+ dynamic-spaces = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "dynamic-spaces";
+ version = "20171027.1151";
+ src = fetchFromGitHub {
+ owner = "Lindydancer";
+ repo = "dynamic-spaces";
+ rev = "97ae8480c257ba573ca3d06dbf602f9b23c41d38";
+ sha256 = "0qs7gqjl6ilwwmd21663345az6766j7h1pv7wvd2kyh24yfs1xkj";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e0b59ce66132cbe2b1f41b665dcb30bdd04bc48b/recipes/dynamic-spaces";
+ sha256 = "0l4hwqivzv51j7h5sgd91dxb5slylmrfrvf7r6w0k04bhld6ry0c";
+ name = "dynamic-spaces";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/dynamic-spaces";
+ license = lib.licenses.free;
+ };
+ }) {};
e2ansi = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "e2ansi";
@@ -15881,18 +15539,39 @@
license = lib.licenses.free;
};
}) {};
+ eacl = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
+ melpaBuild {
+ pname = "eacl";
+ version = "20171104.1651";
+ src = fetchFromGitHub {
+ owner = "redguardtoo";
+ repo = "eacl";
+ rev = "ef58d13fbff4b5c49f934cfb9e3fd6ee219ef4b2";
+ sha256 = "0xxxzdr6iddxwx8z4lfay4n9r1ry8571lj2gadz5ycff6f6bxmhb";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/8223bec7eed97f0bad300af9caa4c8207322d39a/recipes/eacl";
+ sha256 = "16afsf3diz498jb63q85lm5ifvm487clfl838qzagl1l4aywhlwr";
+ name = "eacl";
+ };
+ packageRequires = [ emacs ivy ];
+ meta = {
+ homepage = "https://melpa.org/#/eacl";
+ license = lib.licenses.free;
+ };
+ }) {};
easy-after-load = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "easy-after-load";
- version = "20121224.1849";
+ version = "20170817.531";
src = fetchFromGitHub {
owner = "pd";
repo = "easy-after-load";
- rev = "f8e6e10725d80d3b7e8b1ca966de6190089d8f12";
- sha256 = "09ikwg5s42b50lfj0796pa2h32larkf5j6cy042dzh8c441vgih4";
+ rev = "29e20145da49ac9ea40463c552130777408040de";
+ sha256 = "00xgd39qc760lmxpbggzn98aks5nad08b5ry54pkszjlmh37yqj7";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/2086675f58453a597c8bc904b2f6d56f4f4ca702/recipes/easy-after-load";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/384ffc463cc6edb4806f8da68bd251e662718e65/recipes/easy-after-load";
sha256 = "1mn4hpx82nifphzx71yw3rbixbgis8bhvl3iyxcgcd88n5hqwvys";
name = "easy-after-load";
};
@@ -15926,12 +15605,12 @@
easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "easy-hugo";
- version = "20170812.1030";
+ version = "20171025.1516";
src = fetchFromGitHub {
owner = "masasam";
repo = "emacs-easy-hugo";
- rev = "69c7c0df9c3d8b97b5a779c41460f6fb4f65ac75";
- sha256 = "1rd7ssa3v3plpglqvpm03dlqfk8yyfwv0f8wqk1kr97yz7zxrp40";
+ rev = "d55472bdb08850fb3b2b27a373630c68f6cd2ac0";
+ sha256 = "168wz1638arypqz6i0mzj1pw6mzgp6x10i2wz2vpgkw5p79zw46i";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo";
@@ -16014,8 +15693,8 @@
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "ebal";
- rev = "4d19565516785348894c4911e757e33a270b3efd";
- sha256 = "1wj9h8ypi70az387c7pcrpc59lpf89dkp2q4df2ighxw3l648mb7";
+ rev = "65a131b95a1e934c0cab384ef533b0ac58961f0c";
+ sha256 = "1b8i7qh743lhmkrmw1ac486i8nk8fdxl0ayxjs2sfb8fk4621rfr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/629aa451162a0085488caad4052a56366b7ce392/recipes/ebal";
@@ -16091,34 +15770,15 @@
license = lib.licenses.free;
};
}) {};
- echo-bell = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "echo-bell";
- version = "20170221.1635";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/echo-bell.el?revision=8";
- sha256 = "0000ya8y6v5xvl5qkrsamzwh1iikc3clhpdpdr2da6c4b9cznydh";
- name = "echo-bell.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a81e339e9c7cf1ae5fe91ab4442164336a6fbf13/recipes/echo-bell";
- sha256 = "0adhdfbcpmdhd9252rh0jik2z3v9bzf0brpzfvcjn5py2x6724ws";
- name = "echo-bell";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/echo-bell";
- license = lib.licenses.free;
- };
- }) {};
eclim = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, popup, s, yasnippet }:
melpaBuild {
pname = "eclim";
- version = "20170522.1354";
+ version = "20171024.1038";
src = fetchFromGitHub {
owner = "emacs-eclim";
repo = "emacs-eclim";
- rev = "ebb844d1ebdd7eb347e89063a9b6e9f890a1ff57";
- sha256 = "18q4blnxf7p2kvgh1rhr7pizga06z97hv1lxjgzv0dc2dll2zwmd";
+ rev = "14596d3a1c0e7f18be6b88eddebaf7f36eeca859";
+ sha256 = "04vmq8d68na8pxwd18lxf87v0nzf3cxxdvw8cqzj28his7g37bym";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/eclim";
@@ -16155,12 +15815,12 @@
ecukes = callPackage ({ ansi, commander, dash, espuds, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "ecukes";
- version = "20170810.305";
+ version = "20170922.656";
src = fetchFromGitHub {
owner = "ecukes";
repo = "ecukes";
- rev = "65f29ff764c3742cc1190371b1ac91f0812535f3";
- sha256 = "16dypiczds89kpwqj7p29n5qcqpc1d7faci2f4glw1m60gnkgvqq";
+ rev = "e16dcb430cf05a28065ad26eab2b32e2f7af8705";
+ sha256 = "1x085idsgcfzagqm6jqqhgqzy1xqjkq40zl2q7a20v013n3rkbd8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/14cf66e6929db2a0f377612e786aaed9eb12b799/recipes/ecukes";
@@ -16394,8 +16054,8 @@
sha256 = "0crwdgng377sy1zbq7kqkz24v697mlzgdsvkdp1m8r7ympikkj6w";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/1737276c05491b53bf0c71e3aefe1480b3b99535/recipes/edit-at-point";
- sha256 = "0sn5a644zm165li44yffcpcai8bhl3yfvqcljghlwaa0w45sc9im";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/a63b22f357b2d08b12fb86c27261ab4d687c5f7f/recipes/edit-at-point";
+ sha256 = "1mijasr4ww6vcjfyk7jdv4mh7w2rrspqbbmqayiy2918qg2x01df";
name = "edit-at-point";
};
packageRequires = [];
@@ -16428,12 +16088,12 @@
edit-indirect = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "edit-indirect";
- version = "20170310.1002";
+ version = "20170928.430";
src = fetchFromGitHub {
owner = "Fanael";
repo = "edit-indirect";
- rev = "2fc8f382ee12fc8f7202288534258186bdf6068a";
- sha256 = "1m40zi6dkq7m9386adrys5n7w8h9973svfmxl1c3n9vk9kjibb9k";
+ rev = "032ac0ec690d4999d564fd882588c7a197efe8dd";
+ sha256 = "0by1x53pji39fjrj5bd446kz831nv0vdgw2jqasbym4pc1p2947r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/edit-indirect";
@@ -16533,12 +16193,12 @@
editorconfig = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "editorconfig";
- version = "20170802.238";
+ version = "20171005.2129";
src = fetchFromGitHub {
owner = "editorconfig";
repo = "editorconfig-emacs";
- rev = "1e75aa41aaf61ac26cd833635f9d61d44065a915";
- sha256 = "11ym09hijk3dy445pn826r7ng27w2032id3h1pzk0nzfq9zxhwlk";
+ rev = "99bb6882d8ac708a066a9977cc4fa23f86c6b8f6";
+ sha256 = "0372s9xp8gjz6y0ix095r9gy8718jw1vkjszd12kz6vnxn4z4rmi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig";
@@ -16638,12 +16298,12 @@
edts = callPackage ({ auto-complete, auto-highlight-symbol, dash, erlang, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }:
melpaBuild {
pname = "edts";
- version = "20170804.343";
+ version = "20171030.9";
src = fetchFromGitHub {
owner = "tjarvstrand";
repo = "edts";
- rev = "42c69a845bfe1c123d6e2a773c22931892ab85ac";
- sha256 = "0a629i2d6kjzmhrnji0x8320k93y8kwf7bb6r1acz83gh60smd3z";
+ rev = "6ef4bdf571235ee1b078db321402270cabff7fda";
+ sha256 = "1nzf8wdv0hs4kp69cy3blwxh18c2bkxr4d4y6ggdp0vmwv41j3zi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/782db7fba2713bfa17d9305ae15b0a9e1985445b/recipes/edts";
@@ -16688,12 +16348,12 @@
eg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "eg";
- version = "20170812.407";
+ version = "20170830.115";
src = fetchFromGitHub {
owner = "davep";
repo = "eg.el";
- rev = "69ba1defaf636452d46b948d22d8fefc6a937f81";
- sha256 = "13ckp1jbzhq18fpzq670q2mmzka6wfyh8smxvx6msg72nnn740z5";
+ rev = "1c7f1613d2aaae728ef540305f6ba030616f86bd";
+ sha256 = "1g2ha6q9k6dmi63i2p4aypwf5mha699wr7yy5dsck39mqk15hx0f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3d2b6b92b2a71486f260571885bf149ad6afc551/recipes/eg";
@@ -16734,8 +16394,8 @@
src = fetchFromGitHub {
owner = "egisatoshi";
repo = "egison3";
- rev = "c06b457113a7e9484f8f4ae079cb257d8eb65396";
- sha256 = "16gij5kc4r4x85d8pnpyfkb2z7fjlmfxc73vhd0hf76740kgnnxy";
+ rev = "8a7c0e4d3661f07f3c305ac29431ae28fdb98eac";
+ sha256 = "0c3p77yxaj84d2id5qlqxwywh0hrzsbbxxv2qissz8wkrmv9mg0n";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode";
@@ -16771,11 +16431,11 @@
}) {};
eide = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
pname = "eide";
- version = "20170420.1251";
+ version = "20170906.1216";
src = fetchgit {
url = "git://git.tuxfamily.org/gitroot/eide/emacs-ide.git";
- rev = "5f046ea74eee7af9afbd815c2bfd11fa9c72e6b3";
- sha256 = "1bd9vqqzhbkpfr80r91r65gv6mqnjqfnyclylivg79sfkkahil9n";
+ rev = "25f9af215781163b10d411fe2b5674033eb24165";
+ sha256 = "0mwy5a67hap9bx1klk2pzfaav65drd6mfkkhnk2045z4jvzgkn70";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eide";
@@ -16809,15 +16469,15 @@
license = lib.licenses.free;
};
}) {};
- ein = callPackage ({ auto-complete, cl-generic, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, request-deferred, skewer-mode, websocket }:
+ ein = callPackage ({ auto-complete, cl-generic, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, request-deferred, s, skewer-mode, websocket }:
melpaBuild {
pname = "ein";
- version = "20170803.629";
+ version = "20171024.1043";
src = fetchFromGitHub {
owner = "millejoh";
repo = "emacs-ipython-notebook";
- rev = "f47f020336f5ee32bfe7d27c53f6ca10eee2bc16";
- sha256 = "0lpmg05yfza0c4bgj9gjgz3d48pnizvsjjdk3qdw6sz748k9k415";
+ rev = "eaded1e01378c61be8bc454d111e8cc4951a0b5b";
+ sha256 = "0m0dkzr44bmgc5sxzgsp290hvsylvyrsnmfk6ki44qkvp4qg0bxr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein";
@@ -16831,6 +16491,7 @@
deferred
request
request-deferred
+ s
skewer-mode
websocket
];
@@ -16884,12 +16545,12 @@
ejc-sql = callPackage ({ auto-complete, cider, clomacs, dash, direx, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spinner }:
melpaBuild {
pname = "ejc-sql";
- version = "20170810.221";
+ version = "20171019.1304";
src = fetchFromGitHub {
owner = "kostafey";
repo = "ejc-sql";
- rev = "72adcdfb5d12d49429a1c655f0b02fe657445c4f";
- sha256 = "1y10xzvmxqj61r0sq3hcd6zq6x2ird1z54draaa0wpafgq8610g9";
+ rev = "bd5e3f334044c8b33e2a0a2e0d8767aa6f0e03b8";
+ sha256 = "1pyvpsi4krbmdx2739nnw5g71x3y209xwjl5a7xqbczy9qqxs18n";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8f2cd74717269ef7f10362077a91546723a72104/recipes/ejc-sql";
@@ -16938,8 +16599,8 @@
src = fetchFromGitHub {
owner = "dimitri";
repo = "el-get";
- rev = "99bc5e1814ffa302b8413e1d2adddd8c2113f75e";
- sha256 = "06swrmpwfm6asiz3ggrbaa3l277g0xl43wiw6s8kzmqfh58r6837";
+ rev = "07c75d259d89dabb34878d6085a94fb11aef1947";
+ sha256 = "1b1cgfh7wzcw5m32mhn9w6gzllr09hfv2ghdb4wwaw567xcqd4qh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get";
@@ -16997,12 +16658,12 @@
el-mock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "el-mock";
- version = "20170501.1123";
+ version = "20170824.1254";
src = fetchFromGitHub {
owner = "rejeep";
repo = "el-mock.el";
- rev = "e3017494230cb90c5f542acc07c539be1497123b";
- sha256 = "1dzll63ahsrjrx0dx6vzd88qvs3kvpn5jd3i39wjlfml18hpfiqi";
+ rev = "5df1d3a956544f1d3ad0bcd81daf47fff33ab8cc";
+ sha256 = "06ldnrpqvbdxfzr8v7pj9xacgvkp36xjlhvjkpxldmqj1l5v8a6w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b1989beb927657c0ff7e79fe448f62ac58c11be7/recipes/el-mock";
@@ -17018,12 +16679,12 @@
el-patch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "el-patch";
- version = "20170729.1712";
+ version = "20171016.1743";
src = fetchFromGitHub {
owner = "raxod502";
repo = "el-patch";
- rev = "f598a7537710f929c6f7592d8c543768361ba0de";
- sha256 = "1ijnj8ldqhcv3bq22gw1knaasj08yk9vm0nyvnfca3p6w3zv65cm";
+ rev = "a5999539e42fb41d2b31f09022b9efe27ae76684";
+ sha256 = "0qbf851ab8h0zjqr9kvnlwcg6magsldlr835vks576g9cz62zp49";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2f4f57e0edbae35597aa4a7744d22d2f971d5de5/recipes/el-patch";
@@ -17039,15 +16700,15 @@
el-pocket = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, web }:
melpaBuild {
pname = "el-pocket";
- version = "20160528.951";
+ version = "20170922.549";
src = fetchFromGitHub {
owner = "pterygota";
repo = "el-pocket";
- rev = "eb356e013c71903f2e946631ff58a1d0c2372389";
- sha256 = "01dqksnz0nbfmp10sd3wwv1gffs60rk5v9rf2j3q2z13qsh8l2yy";
+ rev = "a80abfb67efe68ada1d7d0a73aecee57e763baaa";
+ sha256 = "0q4nsgqpjmmxml5pcb6im1askk6q7c3ykzv6fgf1w8jgkvdifa6f";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/c3b8857bc84888a3f8566fab6288966e07d4201f/recipes/el-pocket";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/ef362a76a3881c7596dcc2639df588227b3713c0/recipes/el-pocket";
sha256 = "0fgylpfixsx5l1nrgz6n1c2ayf52p60f9q290hmkn36siyx5hixw";
name = "el-pocket";
};
@@ -17141,25 +16802,6 @@
license = lib.licenses.free;
};
}) {};
- el-swank-fuzzy = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "el-swank-fuzzy";
- version = "20130824.457";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/el-swank-fuzzy.el?revision=3";
- sha256 = "1g2jhm9m5qcj6a231n5ch6b8bqwzq3kj275nd4s89p89v1252qhn";
- name = "el-swank-fuzzy.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/2aecf6d476c7898478e6e5dcfc77d91935f07039/recipes/el-swank-fuzzy";
- sha256 = "1m7y4c0r1w8ndmr1wgc2llrbfawbbxnvcvgjpsckb3704s87yxr1";
- name = "el-swank-fuzzy";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/el-swank-fuzzy";
- license = lib.licenses.free;
- };
- }) {};
el-x = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "el-x";
@@ -17244,41 +16886,22 @@
license = lib.licenses.free;
};
}) {};
- eldoc-extension = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "eldoc-extension";
- version = "20140306.645";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/eldoc-extension.el?revision=10";
- sha256 = "13ncpp3hrwk0h030c5nnm2zfiingilr5b876jsf2wxmylg57nbch";
- name = "eldoc-extension.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/2c59866b554def3f6cef997cc23254a560f3eb33/recipes/eldoc-extension";
- sha256 = "0azkdx4ncjhb7qyhyg1a5pxgqqf2z1wq9iz802j0nxxnjzh9ny24";
- name = "eldoc-extension";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/eldoc-extension";
- license = lib.licenses.free;
- };
- }) {};
- eldoc-overlay-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, inline-docs, lib, melpaBuild }:
+ eldoc-overlay-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, inline-docs, lib, melpaBuild, quick-peek }:
melpaBuild {
pname = "eldoc-overlay-mode";
- version = "20170123.6";
+ version = "20170909.651";
src = fetchFromGitHub {
owner = "stardiviner";
repo = "eldoc-overlay-mode";
- rev = "a0f25710b6a1614ce93c71c7947108c09b587c48";
- sha256 = "065sihf0dvi7g37zvf5drigkakydapyvpxdibcdzhcxx2p9bqszi";
+ rev = "4512e5499cd4f647ad3b5212b853f0299d6cff47";
+ sha256 = "1dp7pjr89bq0fjjqvha2smw54aymy4pyjx643qp0x1dhpwa7bv5h";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eldoc-overlay-mode";
sha256 = "09rhh8rj9rcdnl1jfnjlyzcdr56h9yhmfsb27i4v59g06x8qc954";
name = "eldoc-overlay-mode";
};
- packageRequires = [ emacs inline-docs ];
+ packageRequires = [ emacs inline-docs quick-peek ];
meta = {
homepage = "https://melpa.org/#/eldoc-overlay-mode";
license = lib.licenses.free;
@@ -17308,12 +16931,12 @@
electric-operator = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }:
melpaBuild {
pname = "electric-operator";
- version = "20170311.533";
+ version = "20171022.625";
src = fetchFromGitHub {
owner = "davidshepherd7";
repo = "electric-operator";
- rev = "13b5c19049bd7ac9529ee6fb6171f9141311f277";
- sha256 = "0xpqynnl1dxylxgg7h42pamxn7iwa4jwcy355l0sxmra951j22wq";
+ rev = "278086fcffa1a4607392ca2b0ad57522e492b52c";
+ sha256 = "1kf1281igi6pzg04fsiqwhwrlqv56c1fi56a4z6ch76wh5s63vj3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/906cdf8647524bb76f644373cf8b65397d9053a5/recipes/electric-operator";
@@ -17392,12 +17015,12 @@
elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "elfeed";
- version = "20170709.954";
+ version = "20171103.737";
src = fetchFromGitHub {
owner = "skeeto";
repo = "elfeed";
- rev = "14b0430f27e1afbf144c26a63eddd79906e4b4ff";
- sha256 = "1yynda71g93f8ix9ckxanmx5pla2rv5c13byslwzw7i3vi5wn1k9";
+ rev = "312b3bf4ca542dd84e3cc502c5297498d4c1f7ef";
+ sha256 = "0633gvyk1xh5624g0lp3sriqmrzdhb8dbc6xvmnwqrcqdb3yrigv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed";
@@ -17466,8 +17089,8 @@
src = fetchFromGitHub {
owner = "skeeto";
repo = "elfeed";
- rev = "14b0430f27e1afbf144c26a63eddd79906e4b4ff";
- sha256 = "1yynda71g93f8ix9ckxanmx5pla2rv5c13byslwzw7i3vi5wn1k9";
+ rev = "312b3bf4ca542dd84e3cc502c5297498d4c1f7ef";
+ sha256 = "0633gvyk1xh5624g0lp3sriqmrzdhb8dbc6xvmnwqrcqdb3yrigv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web";
@@ -17588,12 +17211,12 @@
elisp-refs = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }:
melpaBuild {
pname = "elisp-refs";
- version = "20170528.1223";
+ version = "20170831.1347";
src = fetchFromGitHub {
owner = "Wilfred";
repo = "refs.el";
- rev = "8f2da5ba5b728a8f278813c95d0fda3364cca40c";
- sha256 = "0i0xjy4x3i349jbpbqhfz57frk8cdakwi78fw1mlycx4qinlx2n0";
+ rev = "9ac6c1a45c620a6d7e0fae3739558fa08b3758a3";
+ sha256 = "1yniapnkr3124isnfkv1j4mqwdmb1xb7xngjwprhjlg3k1zj3rfl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/60891099e241ebd32d39bdcfe4953529a5a3263e/recipes/elisp-refs";
@@ -17634,8 +17257,8 @@
src = fetchFromGitHub {
owner = "purcell";
repo = "elisp-slime-nav";
- rev = "8a1c2717a6fb50b654b8d1ffa12a40420ee32990";
- sha256 = "1nn97aqfawygvwybr5d51y82az4pj774d6qmwsqfpx7yppd45hsd";
+ rev = "34938422929800839e2f935aca890cd4a229ca99";
+ sha256 = "00v8iqlf6pk8a0656s14jd0gv5msqy6q2af15q21f2nl4j0gl9qj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/elisp-slime-nav";
@@ -17651,12 +17274,12 @@
elixir-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
melpaBuild {
pname = "elixir-mode";
- version = "20170102.942";
+ version = "20170918.2231";
src = fetchFromGitHub {
owner = "elixir-lang";
repo = "emacs-elixir";
- rev = "384d8daf8ad563ebf2cb3437c71d30241adbe099";
- sha256 = "0idgfjwd6116zaag0lmq2i9by2mr054nrqmpnsvyhk26hw71k3vn";
+ rev = "861788186f4dbd500209656dcf38a15b3efe74dd";
+ sha256 = "1py8slpda3vsw88v1wp1imnn3r17hz54621c6ks8xm75lnhn60ra";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6374ced0de38d83bf99147f702f30706615480ed/recipes/elixir-mode";
@@ -17693,12 +17316,12 @@
elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }:
melpaBuild {
pname = "elm-mode";
- version = "20170807.1924";
+ version = "20171028.2337";
src = fetchFromGitHub {
owner = "jcollard";
repo = "elm-mode";
- rev = "4d44a51603b4004192d62fe58beb12c029709d89";
- sha256 = "13rxgak84hqkqha86h75l1yvk9yk648sqk70pblbi0309g8sqb10";
+ rev = "6fa343ada4a74850840e21bbe787c14fe5a67155";
+ sha256 = "18yk029k12zd8xwgj4k0741lbxzl9djik0srvb5jn6bcbcp6hb9g";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode";
@@ -17903,12 +17526,12 @@
elpa-mirror = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "elpa-mirror";
- version = "20170722.422";
+ version = "20171012.15";
src = fetchFromGitHub {
owner = "redguardtoo";
repo = "elpa-mirror";
- rev = "5c793f6df944b7f1a68893438696c12240f0b930";
- sha256 = "0p5q44p6jl306qns4xf7f03pq091zczvjnh9bjax6z6sx54yadsd";
+ rev = "f4a84f71368dc343d09093312d1b2c2e9a5a3987";
+ sha256 = "07j3bsv3vinpkxxbw4fyfgb5jb1kcd068821l59pk9yrw145kb96";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d64ce7042c45f29fb394be25ce415912182bac8b/recipes/elpa-mirror";
@@ -17921,15 +17544,15 @@
license = lib.licenses.free;
};
}) {};
- elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }:
+ elpy = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }:
melpaBuild {
pname = "elpy";
- version = "20170701.1412";
+ version = "20171103.1027";
src = fetchFromGitHub {
owner = "jorgenschaefer";
repo = "elpy";
- rev = "6b654b5fdc4e8f09cd842a0dde83ded284223c2f";
- sha256 = "02z965inkp3bxg9nyqscjs14dfzx7s18s3kx7ry50j2yi0iki6rg";
+ rev = "091a91f622b53ff4e3506d4642dc458e93ca2945";
+ sha256 = "1yxyivp4cbg3b2ys51myx2zk66d2k82fzm73fyzfg0v42xqzqlf2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy";
@@ -17938,6 +17561,7 @@
};
packageRequires = [
company
+ emacs
find-file-in-project
highlight-indentation
pyvenv
@@ -18040,8 +17664,8 @@
src = fetchFromGitHub {
owner = "masutaka";
repo = "elscreen-mew";
- rev = "89871fad690ae161dc076e16ef481b1965612077";
- sha256 = "14hwl5jzmm43qa4jbpsyswbz4hk1l2iwqh3ank6502bz58877k6c";
+ rev = "c90a23441d836da14a1cb12788432308ba58e2b6";
+ sha256 = "167kgbnh5q3pqirv0f7wpjn7yc76k8mz9qx45i7d4scmx8952d2g";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/47404ea3cfb591b780ca7e31095951a708b0a6b7/recipes/elscreen-mew";
@@ -18099,12 +17723,12 @@
elvish-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "elvish-mode";
- version = "20170813.1301";
+ version = "20170913.1939";
src = fetchFromGitHub {
owner = "ALSchwalm";
repo = "elvish-mode";
- rev = "002f663fe01665b819711655aaaef2b891382d32";
- sha256 = "1y634zc983yfi53q8sb2pp3h0s6ws3ypyqh3b9iw5jax6ia1h4ys";
+ rev = "9cf31b453ac79b011b84e83ca11c964c4e647649";
+ sha256 = "0ryg9c8pjw98a9l4hyjqwan7kcv492vzy0xxcrcfm69zn8vnw9k0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0fc724072702a565af471f9ae523a1e6e48e3f04/recipes/elvish-mode";
@@ -18456,12 +18080,12 @@
embrace = callPackage ({ cl-lib ? null, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "embrace";
- version = "20170615.1131";
+ version = "20171031.1133";
src = fetchFromGitHub {
owner = "cute-jumper";
repo = "embrace.el";
- rev = "394863dd7271e831cb9c257a1cd2249302ba962a";
- sha256 = "14qs180p5kv1h4p9qsv4jj61pq7d7bsrvwm0wm85lhgpx8v64q7i";
+ rev = "dd5da196e5bcc5e6d87e1937eca0c21da4334ef2";
+ sha256 = "1m0qyipkp5ydgcav8d0m58fbj1gilipbj7g8mg40iajr8wfqcjdc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e8f07e3b5ba4ec4b0b79fba5a2cca5a3986218b6/recipes/embrace";
@@ -18519,11 +18143,11 @@
emms = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "emms";
- version = "20170715.907";
+ version = "20171105.502";
src = fetchgit {
url = "https://git.savannah.gnu.org/git/emms.git";
- rev = "e790730a4e258440184bc8ce5d3015efe09f8984";
- sha256 = "0rh3hsggfw0yp5ssdwjpp0fdnc57cpcw02hxn80mrq16ylpj2zy9";
+ rev = "11954d51e976a83635971fc000a163b0e7056134";
+ sha256 = "1dfyc0f6wfvw90lw135mf6vx5yqx7nwbi5b3a3c6dzsm060dzsqx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/emms";
@@ -18623,12 +18247,12 @@
emms-player-mpv-jp-radios = callPackage ({ cl-lib ? null, emacs, emms, emms-player-simple-mpv, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "emms-player-mpv-jp-radios";
- version = "20170506.1024";
+ version = "20171102.811";
src = fetchFromGitHub {
owner = "momomo5717";
repo = "emms-player-mpv-jp-radios";
- rev = "43ef07db6e724847fdcff5f66d1806b3e8d315e4";
- sha256 = "15wfr6qs4k6anm16zing0rgawpbrnk9589vr06fc6qvkald7ib3v";
+ rev = "57924973b9e7a3b059b6dd40decb194abc596875";
+ sha256 = "0q1sfb2rgzpvxbpq0d3zl03bc8abyzq2d5pvy8z0ighwbhabkrrs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/09ba6da5057061f055d4a3212d167f9666618d4f/recipes/emms-player-mpv-jp-radios";
@@ -18644,12 +18268,12 @@
emms-player-simple-mpv = callPackage ({ cl-lib ? null, emacs, emms, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "emms-player-simple-mpv";
- version = "20160924.825";
+ version = "20170930.2216";
src = fetchFromGitHub {
owner = "momomo5717";
repo = "emms-player-simple-mpv";
- rev = "bcc056364df5f405716006a8b7bb90102a57f62f";
- sha256 = "0kz31qsn3nrpi8r31nlxlkkkah0qcdkq9a9i9ypv4ky7pvnzx6m5";
+ rev = "1af7838037c86872e897bea872d279ff080c28c6";
+ sha256 = "1xgkpw89pyn4p37l5rz9dw8yg065slzq8l5z69n6nam9hndcnjsh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/emms-player-simple-mpv";
@@ -18791,12 +18415,12 @@
emojify = callPackage ({ emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, seq }:
melpaBuild {
pname = "emojify";
- version = "20170709.207";
+ version = "20171018.744";
src = fetchFromGitHub {
owner = "iqbalansari";
repo = "emacs-emojify";
- rev = "5bdf3ccc728ca2db734a686f9d4893c57ed59d90";
- sha256 = "0nxf35b8mblzl3yqq9h2lpr3q6r89pqljyglxm38aid2f5mjnlvx";
+ rev = "001c3adcc521223f6b53a2243635528b2cb7f7e8";
+ sha256 = "0hsrlzx8bslzhpipryxxqrdaiw66cgak14p8v47l0ylvwmxxqn13";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/488d2751b5fd3bf00f5a6f0545530f44563b86d7/recipes/emojify";
@@ -18929,12 +18553,12 @@
enh-ruby-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "enh-ruby-mode";
- version = "20170810.1602";
+ version = "20171101.1638";
src = fetchFromGitHub {
owner = "zenspider";
repo = "enhanced-ruby-mode";
- rev = "23b00cce325453f644e10ea99ca15e9b115ba562";
- sha256 = "0k5r6bip15lqd1c5fkjajrmjxjds3n4r48f4rljayf2acbf13mxa";
+ rev = "9467cd7fc8b6bb3caf644b223e3046fc32013ccb";
+ sha256 = "0spsgfkka6sld8ac3m2biydyp8xj84vxa0w7apqvhhmfk3klbbhf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cd1ac1ce69b77b11f34c4175611a852e7ec0806c/recipes/enh-ruby-mode";
@@ -18979,8 +18603,8 @@
sha256 = "1qimqrvk0myqfi2l3viigkx1ld90qpjgi1gs6xhw2g51r8x4i3in";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/1cb55fa7c9bf6a7004011cb809b65bd430d83b31/recipes/eno";
- sha256 = "0k4n4vw261v3bcxg7pqhxr99vh673l963yjridl0dp1663gcrfpk";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/a63b22f357b2d08b12fb86c27261ab4d687c5f7f/recipes/eno";
+ sha256 = "1pcbvka3g32j1a2j7slw4jm80qpsk3ldziy5n4l02xpnqw6iwy6q";
name = "eno";
};
packageRequires = [ dash edit-at-point ];
@@ -19013,12 +18637,12 @@
ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }:
melpaBuild {
pname = "ensime";
- version = "20170808.1134";
+ version = "20171027.1433";
src = fetchFromGitHub {
owner = "ensime";
repo = "ensime-emacs";
- rev = "08e6b4d98d1afeb637f27432349b4833320808a4";
- sha256 = "0yr4bfp5shvm49qbr9k47ayglr7im65d0is770brjfbxcb68ry95";
+ rev = "483e94546d9b1de5841b8853882d5644cc419479";
+ sha256 = "0dd6agcjpncd3vkdx405ql03rpfacwda0njcz69f1cp7z8rc5cdz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime";
@@ -19088,8 +18712,8 @@
src = fetchFromGitHub {
owner = "kiwanami";
repo = "emacs-epc";
- rev = "76fe6847a341f78c635164c18908a0b691f7212c";
- sha256 = "11z08y61xd00rlw5mcyrix8nx41mqs127wighhjsxsyzbfqydxdr";
+ rev = "e1bfa5ca163273859336e3cc89b4b6460f7f8cda";
+ sha256 = "15nkrjgi64f829isfd6xrhl4zw8jirr8pkas7nisrbk1av868hx0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc29a8d518ce7a584277089bd4654f52ac0f358/recipes/epc";
@@ -19126,12 +18750,12 @@
epkg = callPackage ({ closql, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "epkg";
- version = "20170726.940";
+ version = "20171024.651";
src = fetchFromGitHub {
owner = "emacscollective";
repo = "epkg";
- rev = "f0959ca39cdbcb72049b31cab6e7c449749bfefe";
- sha256 = "1pblli8g6ahsxgjk55yyzpdhlriq44i54yl27wdyvcyv2fffbdab";
+ rev = "6114b78b84cd8a96a117b7652d1e5138eee4b896";
+ sha256 = "1fmvy8h3ng2ykfmr2n0zms2h3csq24f23ldf5zdxyg34riag4nl2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg";
@@ -19151,8 +18775,8 @@
src = fetchFromGitHub {
owner = "cask";
repo = "epl";
- rev = "a5ad061d0a5eb42f66c384e55d102da7d52c96b0";
- sha256 = "0s4k2grikhibd075435giv3bmba1mx71ndxlr0k1i0q0xawpyyb4";
+ rev = "83797835f729f39b80acba4c7e83d73a2e410e26";
+ sha256 = "1rgxvmz9nv7922c30xz8ax3cwj8mmwxfni3xjwnhpfa744in4441";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9c6cf24e86d8865bd2e4b405466118de1894851f/recipes/epl";
@@ -19335,12 +18959,12 @@
erc-image = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "erc-image";
- version = "20170713.1438";
+ version = "20170909.312";
src = fetchFromGitHub {
owner = "kidd";
repo = "erc-image.el";
- rev = "a7e6c6d766f8c2589abf6fd79c5211f970fcbed3";
- sha256 = "044cbz8r788j80f88d2irijpfvh22m9zjvd9ffj201fck428nakh";
+ rev = "15805aa7ed4b13eeaaa4ec294443ef0f9d21c0c2";
+ sha256 = "0ja8iv4wp58xab190mf3pj1bbaz25w8pvns03ayajzrflpkhjs79";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/erc-image";
@@ -19353,6 +18977,27 @@
license = lib.licenses.free;
};
}) {};
+ erc-scrolltoplace = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, switch-buffer-functions }:
+ melpaBuild {
+ pname = "erc-scrolltoplace";
+ version = "20171104.1346";
+ src = fetchFromGitHub {
+ owner = "jgkamat";
+ repo = "erc-scrolltoplace";
+ rev = "7539654e4a72edcc5bba07a101961e5bf0a9d449";
+ sha256 = "11zpqwh1mlfifbgnvhc63bvnhg340jgxssm3m43hr1sxsyb52lh6";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e8ba300957fc00f5e53cf63dfa1e37a27b0d6d60/recipes/erc-scrolltoplace";
+ sha256 = "1cr5nxdk854zcb1w0xvmi4mg45lxv011gap4i96nvdpd4qxmcxph";
+ name = "erc-scrolltoplace";
+ };
+ packageRequires = [ emacs switch-buffer-functions ];
+ meta = {
+ homepage = "https://melpa.org/#/erc-scrolltoplace";
+ license = lib.licenses.free;
+ };
+ }) {};
erc-social-graph = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "erc-social-graph";
@@ -19608,12 +19253,12 @@
ergoemacs-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, undo-tree }:
melpaBuild {
pname = "ergoemacs-mode";
- version = "20170723.1921";
+ version = "20171030.738";
src = fetchFromGitHub {
owner = "ergoemacs";
repo = "ergoemacs-mode";
- rev = "7b0600620fc64cdb92bb9a69144c68eaa088db5b";
- sha256 = "05ihafhhjlq7b4zs58jaqssgqdha5kqv65hvk7946ba7l845fi83";
+ rev = "3ce23bba3cb50562693860f87f3528c471d603ba";
+ sha256 = "1s3b9bridl78hh1mxmdk9nqlmqhibbaxk0a1cixmsf23s06w8w6l";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/02920517987c7fc698de9952cbb09dfd41517c40/recipes/ergoemacs-mode";
@@ -19650,12 +19295,12 @@
erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "erlang";
- version = "20170509.742";
+ version = "20170913.604";
src = fetchFromGitHub {
owner = "erlang";
repo = "otp";
- rev = "dac724923328ad0fd085a4d4e397dcbb12e30084";
- sha256 = "0wc84i939819zbxciqkarfgvdipzhd169cykv1y0l40b21p0jlzx";
+ rev = "de48cf9a757c329dda26875f8cf7dd7c4425fc04";
+ sha256 = "1i2sgg22ydvi49hj8iacdn38aryik36gzapvx47g62y1qfxza6f9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -19737,8 +19382,8 @@
version = "20161018.1217";
src = fetchgit {
url = "https://bitbucket.org/olanilsson/ert-junit";
- rev = "e1d7b795176dceae40adb15c28717276c00269e4";
- sha256 = "0d6ab0f22sing9cimpc86yydvyzb3z3s36372x082pg62ilrj0pi";
+ rev = "c4cd27b60f9e7ccd05fd8a2097cde947eb250599";
+ sha256 = "0zm71kv4wxs6yf70qwrfavxc1845bg4aqqk36zypy17g1x40bms7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/27c627eacab54896a1363dbabc56250a65343dd8/recipes/ert-junit";
@@ -19775,12 +19420,12 @@
ert-runner = callPackage ({ ansi, commander, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }:
melpaBuild {
pname = "ert-runner";
- version = "20161027.159";
+ version = "20170816.1112";
src = fetchFromGitHub {
owner = "rejeep";
repo = "ert-runner.el";
- rev = "10628b8b90294077174f78e7b75e548f2a4b6f78";
- sha256 = "0qq7yml7zlbgvfsdiai8qbvlalh42dghm2ahv9ql9xif3sqjcjiw";
+ rev = "edc21c0d473a16f0130e43962052db2123bb584b";
+ sha256 = "0ihvdcys73l16z180602k6nw9hyirn874li6fd9dp81zqmd9his4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0a1acc68f296e80b6ed99a1783e9f67be54ffac9/recipes/ert-runner";
@@ -19817,12 +19462,12 @@
es-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s, spark }:
melpaBuild {
pname = "es-mode";
- version = "20170803.1433";
+ version = "20170915.801";
src = fetchFromGitHub {
owner = "dakrone";
repo = "es-mode";
- rev = "2e00707f42276b59fff2a32c64703e9586b22ae6";
- sha256 = "0kcrca7f33020hxhx30vqdf21j1w32lvn28ys8g7gwa20nq05zb3";
+ rev = "511eaf59123c2dc4f900cd31d3c30c5bf98599ea";
+ sha256 = "1ldyf39z7faizbg2nzh2myd5yld9iwxi9r5260sp1dv0ab2im4gy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9912193f73c4beae03b295822bf41cb2298756e2/recipes/es-mode";
@@ -19922,12 +19567,12 @@
esh-help = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "esh-help";
- version = "20170730.2157";
+ version = "20170829.2111";
src = fetchFromGitHub {
owner = "tom-tan";
repo = "esh-help";
- rev = "fdd62fb873e2a9a664314a45f91529cac00b8c47";
- sha256 = "1z8gl8mwnr1g7n9jn9iw5a6c9jsr1gjbx3004k07rlw8dld59qd0";
+ rev = "8a8a9d4d9852f8bd96da3b94e95ff57097ac8ec6";
+ sha256 = "02fybhmqm2qmy5qdig7xvwxazqi499pw32kh5mrsbdr14srg9fhs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ab94c66d1ed7cfdbc437ee239984ba70408fd28a/recipes/esh-help";
@@ -19961,6 +19606,27 @@
license = lib.licenses.free;
};
}) {};
+ eshell-bookmark = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "eshell-bookmark";
+ version = "20170922.814";
+ src = fetchFromGitHub {
+ owner = "Fuco1";
+ repo = "eshell-bookmark";
+ rev = "deda4b848b2fb979dbe73ead2cb866610e3596ed";
+ sha256 = "14dmsnixf9vqdhsixw693sml0fn80zcf0b37z049fb40cmppqxdw";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e7bf4702a907727990fcc676980f2b219e22ab0c/recipes/eshell-bookmark";
+ sha256 = "1bybxlq1h5chrjxqjb23kq8dmgw2xrjwkrnvpbphblqzpdy5ck0s";
+ name = "eshell-bookmark";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/eshell-bookmark";
+ license = lib.licenses.free;
+ };
+ }) {};
eshell-did-you-mean = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "eshell-did-you-mean";
@@ -20027,12 +19693,12 @@
eshell-git-prompt = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "eshell-git-prompt";
- version = "20170316.1051";
+ version = "20170909.752";
src = fetchFromGitHub {
owner = "xuchunyang";
repo = "eshell-git-prompt";
- rev = "ec246fa4c27ecb7df10c93b0710e6a64fa5ef4c9";
- sha256 = "0dc1d6z8m3dvgqvp16nsw84g4fwzqv3nh21k1v2mr3iy8nmdf0l2";
+ rev = "b6bb2d7bd4e393b4170b29891cfefb72ae020aab";
+ sha256 = "02i00an9wa8ns66xq900la68m7pd4hwv95g83cvf22bypivx7p2y";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5272280b19579c302ba41b53c77e42bc5e8ccbda/recipes/eshell-git-prompt";
@@ -20048,12 +19714,12 @@
eshell-prompt-extras = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "eshell-prompt-extras";
- version = "20170713.11";
+ version = "20171020.2207";
src = fetchFromGitHub {
owner = "hiddenlotus";
repo = "eshell-prompt-extras";
- rev = "52a8ce66da2c5f419efd41f2a6b6d4af03f78acd";
- sha256 = "1biandbijdngalbjvbfv894qjzmj0fndypa31rmd75c0r5mg2mnf";
+ rev = "9b1a49853909c4fae95d32bb9a68cace471c161e";
+ sha256 = "03sr68mfi52ajqb6d9k3lpcrapjkqx9yynpfwin9y2328pmriaib";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/eshell-prompt-extras";
@@ -20178,8 +19844,8 @@
src = fetchFromGitHub {
owner = "ecukes";
repo = "espuds";
- rev = "8caef13020527956a56b53171057ca1d0e2fb48b";
- sha256 = "0nj5llf9s59dagwqj4s87ccwaky9pan3dyw1dcf8m8f41s5zia62";
+ rev = "444285cde99860b50b4c9a2e1c6a25e4db8d9adf";
+ sha256 = "0nwgh9nrr85n6ix60r6z58rw2078wkzkqqfszq2sr7wmad6kxspx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/14cf66e6929db2a0f377612e786aaed9eb12b799/recipes/espuds";
@@ -20237,12 +19903,12 @@
ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }:
melpaBuild {
pname = "ess";
- version = "20170728.238";
+ version = "20171102.958";
src = fetchFromGitHub {
owner = "emacs-ess";
repo = "ESS";
- rev = "58c130a1bc13c8933bde229424d628ec2b6a6a97";
- sha256 = "086isv62shvvf8sp5iicd45d3p1z071l5vik7445lbgind6wfbg5";
+ rev = "f5d5ddfe5a1b2096ebc90d5fd2c3e98c12e45e8b";
+ sha256 = "0x7ymv0b7p3s79fz4j63v0k45nfywnzqqqi0xxmwbnz3w2gf3k0s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess";
@@ -20276,27 +19942,6 @@
license = lib.licenses.free;
};
}) {};
- ess-R-object-popup = callPackage ({ ess, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
- melpaBuild {
- pname = "ess-R-object-popup";
- version = "20130302.336";
- src = fetchFromGitHub {
- owner = "myuhe";
- repo = "ess-R-object-popup.el";
- rev = "7e1f601bfba72de0fda44d9c82f96028ecbb9948";
- sha256 = "0q8pbaa6wahli6fh0kng5zmnypsxi1fr2bzs2mfk3h8vf4nikpv0";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/8783caab9019623ade5c369a4713eba996507bd0/recipes/ess-R-object-popup";
- sha256 = "1dxwgahfki6d6ywh85ifk3kq6f2a1114kkd8xcv4lcpzqykp93zj";
- name = "ess-R-object-popup";
- };
- packageRequires = [ ess popup ];
- meta = {
- homepage = "https://melpa.org/#/ess-R-object-popup";
- license = lib.licenses.free;
- };
- }) {};
ess-smart-equals = callPackage ({ emacs, ess, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ess-smart-equals";
@@ -20363,12 +20008,12 @@
esup = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "esup";
- version = "20170729.1742";
+ version = "20170923.1328";
src = fetchFromGitHub {
owner = "jschaf";
repo = "esup";
- rev = "94e0d2bef2bcdbd9477e702f63148cc2de75ecb3";
- sha256 = "0rz2a8ydr7jrsgz1mxgjk4wyf7rkz0w3qvx6jy8mygzhzhmniy24";
+ rev = "a589005a9a888537deef94d6fe38a9b8790c97c7";
+ sha256 = "04lxmd0h7mfjjl0qghrycgff0vcv950j1wqv0dbkr61jxp64n5fv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b9d2948a42da5d4864404d2d11a924a4f235fc3b/recipes/esup";
@@ -20384,16 +20029,16 @@
esxml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "esxml";
- version = "20170723.1503";
+ version = "20170903.150";
src = fetchFromGitHub {
owner = "tali713";
repo = "esxml";
- rev = "c4646d3a5a274e21efe125ae9f87b9934014e6ad";
- sha256 = "05r2jhcrzrjna5dnq95gnagjn11bx0ysgbcnn4rffwms09avbwvf";
+ rev = "6d58e047b7c1e3e8cab87cf7ee15e039e8a22510";
+ sha256 = "0bkbp3bycb4vrk0y5n7013yqqzz7rjvfwkr9lppa6sixilhc8h66";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/esxml";
- sha256 = "0v63ihgg2db3648s2xygcky9s0vx9byjjpbhlgjy5j159w2w53vh";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/db6556fe1b2403d1bcdade263986fd0faf0d9087/recipes/esxml";
+ sha256 = "1375gryii984l33gc8f8yhl3vncjmw1w9k6xpvjgmnpx2fwr1vbq";
name = "esxml";
};
packageRequires = [];
@@ -20423,44 +20068,6 @@
license = lib.licenses.free;
};
}) {};
- etags-select = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "etags-select";
- version = "20130824.500";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/etags-select.el?revision=21";
- sha256 = "0gmlmxlwfsfk5axn3x5cfvqy9bx26ynpbg50mdxiljk7wzqs5dyb";
- name = "etags-select.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/5875d00419666388acbcb8a4f392308e7576da0b/recipes/etags-select";
- sha256 = "0j6mxj10n7jf087l7j86s3a8si5hzpwmvrpqisfvlnvn6a0rdy7h";
- name = "etags-select";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/etags-select";
- license = lib.licenses.free;
- };
- }) {};
- etags-table = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "etags-table";
- version = "20130824.457";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/etags-table.el?revision=4";
- sha256 = "0apm8as606bbkpa7i1hkwcbajzsmsyxn6cwfk9dkkll5bh4vglqf";
- name = "etags-table.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/c3efc1791df5658ca5bba4907f2a22c2cabfd3c8/recipes/etags-table";
- sha256 = "1jzij9jknab42jmx358g7f1c0d8lsp9baxbk3xsy7w4nl0l53d84";
- name = "etags-table";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/etags-table";
- license = lib.licenses.free;
- };
- }) {};
ethan-wspace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ethan-wspace";
@@ -20482,22 +20089,22 @@
license = lib.licenses.free;
};
}) {};
- euslisp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ euslisp-mode = callPackage ({ emacs, exec-path-from-shell, fetchFromGitHub, fetchurl, helm-ag, lib, melpaBuild, s }:
melpaBuild {
pname = "euslisp-mode";
- version = "20170807.1433";
+ version = "20170830.1229";
src = fetchFromGitHub {
owner = "iory";
repo = "euslisp-mode";
- rev = "f64c117b62a3715c438bfd85851029c1b4a45748";
- sha256 = "1fqasd25hgif1q9j6rxqqwyrqg48ykb5g12w34jsm8zgg50n43n0";
+ rev = "db62a2d148482317794727982576494596365a55";
+ sha256 = "187ij4s7mzppgmh0ifny70mw8w31nq86rhsrmnflz26iywnkp8x2";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/b09a7c4b73203d75c5260f1d08845236cbbeae46/recipes/euslisp-mode";
- sha256 = "0m04a8k2z7inhfpqz68hv56h352ikcd39fg65dqvj79md05yila9";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/b04fffe5e52f26e92930a112a64531228f94e340/recipes/euslisp-mode";
+ sha256 = "0v92lry9ynkvsvx060njaw1j5lj9sb1i3srs2hfqqwyqni5ldkri";
name = "euslisp-mode";
};
- packageRequires = [];
+ packageRequires = [ emacs exec-path-from-shell helm-ag s ];
meta = {
homepage = "https://melpa.org/#/euslisp-mode";
license = lib.licenses.free;
@@ -20611,12 +20218,12 @@
eve-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, polymode }:
melpaBuild {
pname = "eve-mode";
- version = "20170724.1408";
+ version = "20170822.1531";
src = fetchFromGitHub {
owner = "witheve";
repo = "emacs-eve-mode";
- rev = "16de9c42393f687446dd9ffd36fcc7428437bf7f";
- sha256 = "0xpga18zw78v7wqxmfsv00s2r5rwil0khqjjkm867gk20954j7zh";
+ rev = "a4661114d9c18725691b76321d72167ca5a9070a";
+ sha256 = "19s6cid42q0lm2w94a7f6sxvmy3zpjdj5r5dbwcxxp5n3qfs7nip";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e0f197adfe64ef88d90d24dfd6532bf52a5bce0d/recipes/eve-mode";
@@ -20632,12 +20239,12 @@
evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }:
melpaBuild {
pname = "evil";
- version = "20170802.1333";
+ version = "20171031.22";
src = fetchFromGitHub {
owner = "emacs-evil";
repo = "evil";
- rev = "45712ad214b0ad2257814705d6baa3f9120574cd";
- sha256 = "1z9n8pvr1yyihabh017x3h3ch7nirrw7k9lf3c5cs8vxpcah0npb";
+ rev = "a6d7b32f6d606dedc2c550615d8cf1c43ad8f6a8";
+ sha256 = "0v741j0vxdqsa8lnhyn0g163cgixp3s310zaxbxxznlz1fy1nl8w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/440482c0edac8ee8bd4fe22f6bc5c1607f34c7ad/recipes/evil";
@@ -20758,12 +20365,12 @@
evil-colemak-minimal = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-colemak-minimal";
- version = "20160922.226";
+ version = "20171006.617";
src = fetchFromGitHub {
owner = "bmallred";
repo = "evil-colemak-minimal";
- rev = "5f1db93959359d3efd57abb5a0d06e94dec92556";
- sha256 = "08dfmny7z03h6hbj21f344jv9kpzlzk31j5sd78w1c68mgx9hj6b";
+ rev = "6d98b6da60f414524a0d718f76024c26dce742b3";
+ sha256 = "0pd05jq4qkw5xx7xqzxzx62fsm77vjz0ry9ayaqgqw5831rbp553";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/828c744062069027f19fe5f2f233179f9149dc16/recipes/evil-colemak-minimal";
@@ -20884,12 +20491,12 @@
evil-escape = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-escape";
- version = "20170115.1343";
+ version = "20170913.618";
src = fetchFromGitHub {
owner = "syl20bnr";
repo = "evil-escape";
- rev = "b4d44fc5015341e484495fc86b73d09b2ac062ec";
- sha256 = "0s8lmmm25qabicwaj9jybpbd8mkc62yl7jnhk1lpablydjkv3w2i";
+ rev = "25920fb2f4ef48998eecea433c04096f8d124cfe";
+ sha256 = "1nbk0mlfrg8hbw119dpp2a1k2irgz811kcsrwmxv256gkx4pwmfk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/evil-escape";
@@ -20989,12 +20596,12 @@
evil-goggles = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-goggles";
- version = "20170808.404";
+ version = "20171103.2328";
src = fetchFromGitHub {
owner = "edkolev";
repo = "evil-goggles";
- rev = "513ba2eb3ed7f579b9babeff0d2d0e0b0a37c69f";
- sha256 = "0gq7wlix1zfvlcn901jcr10pfzphmsgmsymqq2pblc8d54nhv4wj";
+ rev = "75d124851fd31bb7014036e969300a0259128557";
+ sha256 = "0184y95d52nbldpn3khxk6f3dlh36v0mjsvhhgg557gwhg5psasi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/811b1261705b4c525e165fa9ee23ae191727a623/recipes/evil-goggles";
@@ -21091,6 +20698,27 @@
license = lib.licenses.free;
};
}) {};
+ evil-ledger = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "evil-ledger";
+ version = "20170905.519";
+ src = fetchFromGitHub {
+ owner = "atheriel";
+ repo = "evil-ledger";
+ rev = "a282fae7921d2648a32c3207413d927d1adda8b8";
+ sha256 = "0b8801mpq55x9r0sgm548wb1qn74wk3dydswrxi8bp6ga49k7rhv";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/500e99a1b92f0a0c144f843cd7645872034d9fbb/recipes/evil-ledger";
+ sha256 = "13idy2kbzhckzfwrjnzjrf8h2881w3v8pmhlcj26xcyf4ch0dq9r";
+ name = "evil-ledger";
+ };
+ packageRequires = [ emacs evil ];
+ meta = {
+ homepage = "https://melpa.org/#/evil-ledger";
+ license = lib.licenses.free;
+ };
+ }) {};
evil-lion = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-lion";
@@ -21157,12 +20785,12 @@
evil-magit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
melpaBuild {
pname = "evil-magit";
- version = "20170613.510";
+ version = "20171018.722";
src = fetchFromGitHub {
owner = "emacs-evil";
repo = "evil-magit";
- rev = "91c96e6ffdc6e7d5e49fd9b0ffb7df8794f0f2db";
- sha256 = "1nwibif8syk5dfygzcafsbh41gaxaps187zxdv75z2hbdbvqx1l3";
+ rev = "a24186be7cc2cdab24b56f6dcc4665eeb8349c1a";
+ sha256 = "12hr2w5r2hgagb3hqbi59v73rxpjml5prc3m7dw3wzsm0rf1rwh3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/50315ec837d2951bf5b2bb75809a35dd7ffc8fe8/recipes/evil-magit";
@@ -21199,12 +20827,12 @@
evil-matchit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-matchit";
- version = "20170727.1741";
+ version = "20171101.2202";
src = fetchFromGitHub {
owner = "redguardtoo";
repo = "evil-matchit";
- rev = "dbaae2b7537aadb2e44a8915745ee190768b4b2a";
- sha256 = "1y386wjz23kqfqbbgrwg4fnv2ma21dzk5ppnqd0y5245v388q69n";
+ rev = "fb5807c0965f3689b9e37f5e5b0fce022938bb43";
+ sha256 = "02yz4m9nzn0dql279xbgaxbrwhn6xxb30kf0pyjqyxg2njzfihid";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/aeab4a998bffbc784e8fb23927d348540baf9951/recipes/evil-matchit";
@@ -21262,12 +20890,12 @@
evil-mu4e = callPackage ({ dash, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-mu4e";
- version = "20160813.413";
+ version = "20170911.122";
src = fetchFromGitHub {
owner = "JorisE";
repo = "evil-mu4e";
- rev = "3edf45cbf94bb304a1d99b00fe43e72b86b3ee94";
- sha256 = "1zd6dccsb7f8rsb6nw29a4kp37q4s5d63c73ppi268nn0jsa3f28";
+ rev = "64b663c3b31d14c4260921a7ec4b8d475d5ed339";
+ sha256 = "1cms5kvgkhaq1gb6yai5ykn3mkb3vjs99b75f7lyl6da89k9kx9w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/332f3f9c6dc106e58345abbc2d8fd99056d518c0/recipes/evil-mu4e";
@@ -21304,12 +20932,12 @@
evil-nerd-commenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-nerd-commenter";
- version = "20170309.49";
+ version = "20171106.407";
src = fetchFromGitHub {
owner = "redguardtoo";
repo = "evil-nerd-commenter";
- rev = "cac2f7945fc90f43d1282dfe4aca24ded9f7cd03";
- sha256 = "1zjnscnj0zrxpdjikxwg4fw7m6yb39060cmn24xzs0hmnmbxnw9m";
+ rev = "31db96711ee894e3b997b5823c5664bbed165143";
+ sha256 = "11x42awwqab6pdxzk1pv5gjfyxaj35vp2pscl23lq421x2mqpifd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a3e1ff69e7cc95a5b5d628524ad836833f4ee736/recipes/evil-nerd-commenter";
@@ -21367,12 +20995,12 @@
evil-org = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "evil-org";
- version = "20170802.1428";
+ version = "20170917.1447";
src = fetchFromGitHub {
owner = "Somelauw";
repo = "evil-org-mode";
- rev = "1725325eae0e3bf3609cb1a86effaa790afcc5de";
- sha256 = "0r9n7yqj9fdcqpz99fwjnln9w0w5lqhsgyipjvihb56plrrc2w8c";
+ rev = "52bbb105a6a7fa9ead68c56746740b4343ecd6e9";
+ sha256 = "1k0akcqbr67lsrj5gkpr9b3nhrf53zd3ksv4sfrapn9xhv13brbi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1768558ed0a0249421437b66fe45018dd768e637/recipes/evil-org";
@@ -21514,12 +21142,12 @@
evil-smartparens = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, smartparens }:
melpaBuild {
pname = "evil-smartparens";
- version = "20161010.322";
+ version = "20171103.941";
src = fetchFromGitHub {
owner = "expez";
repo = "evil-smartparens";
- rev = "7cde5544934930819e9dcaa1e0db2e3c58f0cd6f";
- sha256 = "0pmw98n32fyqr4qnpl52a7vax4rk8dfq98v66v8400b78j6d0n3q";
+ rev = "9fe4eed1c6327197afe6c13bb0771e18908aff00";
+ sha256 = "1di4qz5fbrlwbg16c2j0m7y8zqfxw027qd7zqmc3rwk9znbhg7wl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/850898fbfc8e0aeb779e8feae56476d989110e79/recipes/evil-smartparens";
@@ -21535,12 +21163,12 @@
evil-snipe = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-snipe";
- version = "20170806.1150";
+ version = "20170903.603";
src = fetchFromGitHub {
owner = "hlissner";
repo = "evil-snipe";
- rev = "e247d6980093633f04431967819bf10b0d23c59c";
- sha256 = "1qv8f45g864vhx7k62gcsivmalq2vaqpvp1klc773d2y0k2b2w0n";
+ rev = "69adb46546a871beb54a445cb22652ac276555c1";
+ sha256 = "1g6whd2zg880wxxyn269q4b0697aybj1lc936gi7nrxvm6fnaiwc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6748f3febbe2f098761e967b4dc67791186d0aa7/recipes/evil-snipe";
@@ -21577,12 +21205,12 @@
evil-surround = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-surround";
- version = "20170124.1110";
+ version = "20171004.600";
src = fetchFromGitHub {
owner = "emacs-evil";
repo = "evil-surround";
- rev = "43a266461517d2eb715338da0a31dc6616073116";
- sha256 = "04pzlkblziir91g38kmlmr7p1q5cxjw4q7difwhly3iz567minkq";
+ rev = "822a0f61c3fd7c55cda4e04c8590ae5144401c26";
+ sha256 = "0xd87whrznwk1hggb0jrx6n1m5sbj0014qv26qvvc3f11vrrda2x";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2c9dc47a4c837c44429a74fd998fe468c00639f2/recipes/evil-surround";
@@ -21661,12 +21289,12 @@
evil-test-helpers = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-test-helpers";
- version = "20170719.1445";
+ version = "20171002.135";
src = fetchFromGitHub {
owner = "emacs-evil";
repo = "evil";
- rev = "45712ad214b0ad2257814705d6baa3f9120574cd";
- sha256 = "1z9n8pvr1yyihabh017x3h3ch7nirrw7k9lf3c5cs8vxpcah0npb";
+ rev = "a6d7b32f6d606dedc2c550615d8cf1c43ad8f6a8";
+ sha256 = "0v741j0vxdqsa8lnhyn0g163cgixp3s310zaxbxxznlz1fy1nl8w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/87da8c50f9167ad9c3844b23becb6904f809611d/recipes/evil-test-helpers";
@@ -21703,12 +21331,12 @@
evil-textobj-anyblock = callPackage ({ cl-lib ? null, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-textobj-anyblock";
- version = "20161020.1112";
+ version = "20170905.1207";
src = fetchFromGitHub {
owner = "noctuid";
repo = "evil-textobj-anyblock";
- rev = "b611a54e62a6e6ce40bbb8b5094bd88028fc7efd";
- sha256 = "1wgdzl14hrzjsh6wvc83njfd0321rnbhc68mzcvn27g04zx9a1d0";
+ rev = "ff00980f0634f95bf2ad9956b615a155ea8743be";
+ sha256 = "0wn5lp7kh3ip1bmqi12c9ivpjj0x602h8d7ag39qw36smv4jqvnb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/36b734960313d4cb484cebaac0f112781436631c/recipes/evil-textobj-anyblock";
@@ -21724,12 +21352,12 @@
evil-textobj-column = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, names }:
melpaBuild {
pname = "evil-textobj-column";
- version = "20151228.1344";
+ version = "20170905.1205";
src = fetchFromGitHub {
owner = "noctuid";
repo = "evil-textobj-column";
- rev = "d45a0f2831e6da51435abe27294222055f04ab32";
- sha256 = "0nff90v6d97n2xizvfz126ksrf7ngd5rp0j7k7lhbv0v5zcqgxiv";
+ rev = "835d7036d0bc9a6e44fc9b7c54ccf2a7c01428cd";
+ sha256 = "0g9d62sgcpzvhbrdk4hf3phphfss74mjz6xv4wd9895rzjsziwkf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/de7d6dc0d9c42a89be2959d015efa30960df2de7/recipes/evil-textobj-column";
@@ -21787,12 +21415,12 @@
evil-vimish-fold = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, vimish-fold }:
melpaBuild {
pname = "evil-vimish-fold";
- version = "20161103.333";
+ version = "20171030.451";
src = fetchFromGitHub {
owner = "alexmurray";
repo = "evil-vimish-fold";
- rev = "674a8a894e4ae7e7f4b2608b0c9f801a548c69eb";
- sha256 = "1v2yr5q9c239xf002ymgwndmp5yp617rj7shw2zvfl13d7x229sg";
+ rev = "4db872d12274fdddf7c6e9d01cf68cbad9cfcf15";
+ sha256 = "05phnswbk2r7hdwawzkw6anhkfss9ig8sy469s4vsrqf7cky4gmn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fcd51e24f88ebbbd3fddfc7c6f3b667d5104cf2b/recipes/evil-vimish-fold";
@@ -21829,12 +21457,12 @@
evil-visual-replace = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-visual-replace";
- version = "20170201.1920";
+ version = "20171015.2313";
src = fetchFromGitHub {
owner = "troyp";
repo = "evil-visual-replace";
- rev = "99559e1a6e813056a132f4be32b20f259470e9ed";
- sha256 = "053fqsl8cd2s0cyinvmihaglq4cv1l1ymxy7rcx9spknipcil1xp";
+ rev = "163fc827a1ffc106475da470c37fb26f4cc9b008";
+ sha256 = "1gfyrq7xfzmzh3x8k5f08n027dlbwi0pkkxf9c39fkxp4jngibsz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/evil-visual-replace";
@@ -21892,12 +21520,12 @@
ewmctrl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ewmctrl";
- version = "20161104.1833";
+ version = "20170921.1917";
src = fetchFromGitHub {
owner = "flexibeast";
repo = "ewmctrl";
- rev = "ba1879cc803a63d5a4047ec6f2990e369ae5af3a";
- sha256 = "12h2fgabfmaq1cpr7y7ckyyfgy53ww3v25p2kk5fq77rn40zbniy";
+ rev = "3d0217c4d6cdb5c308b6cb4293574f470d4faacf";
+ sha256 = "0ilwvx0qryv3v6xf0gxqwnfm6pf96gxap8h9g3f6z6lk9ff4n1wi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b2a7679f0961b171bf23080e628ae80f50c446e4/recipes/ewmctrl";
@@ -21955,11 +21583,11 @@
exiftool = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "exiftool";
- version = "20170613.1342";
+ version = "20170822.1432";
src = fetchgit {
url = "https://git.systemreboot.net/exiftool.el/";
- rev = "1c9c6feba21b98337665b6f2b4064b2bf5b75af6";
- sha256 = "1m3jn127w95sb4y34f9lb1cv445pxfs4b90f6ia5cjs75706fn03";
+ rev = "3a07dbcb975577734d4abf6d68e1ab83a01951bb";
+ sha256 = "10prrwvmc891vkzzgqmz0xd85xgi52ni83ydf0bvhfmcg0wmm0cc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4835a76909d020781021e747fbc341111a94dbfa/recipes/exiftool";
@@ -21975,12 +21603,12 @@
exotica-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "exotica-theme";
- version = "20170814.438";
+ version = "20171031.426";
src = fetchFromGitHub {
owner = "jbharat";
repo = "exotica-theme";
- rev = "c099e700e87638fa8cc45aa35e46952857ccf91d";
- sha256 = "08i0d5f011wxvkd4njjabi986cjvf7c82i84jwkpdhv1gx67dmnb";
+ rev = "478dddaae45a8e2373bf2b868aeece64f1288d91";
+ sha256 = "17646sa3pgmlzg2s4yic82hkq1bdiqh1spgp5x2lhqh4643fi62s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9182f92dd62e2f1775a76699a6c8f9c3e71e9030/recipes/exotica-theme";
@@ -22119,22 +21747,30 @@
license = lib.licenses.free;
};
}) {};
- exwm-x = callPackage ({ bind-key, cl-lib ? null, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper, switch-window }:
+ exwm-x = callPackage ({ bind-key, cl-lib ? null, counsel, exwm, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, swiper, switch-window }:
melpaBuild {
pname = "exwm-x";
- version = "20170809.413";
+ version = "20170916.2015";
src = fetchFromGitHub {
owner = "tumashu";
repo = "exwm-x";
- rev = "6adaee93a4f84806cf197dae872f00039a3ca87e";
- sha256 = "04h8qjlvcnafs6771k4k2fsrg36j7b30dfmb9whrggs0lmsb5agq";
+ rev = "abb210ff56134cc6a285d91b875f3115bc951ad0";
+ sha256 = "1l7578jfn3va6bpkjfbazygsn8asxhc7cpss32mnsrzkm1ix6sz8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a0e6e23bcffdcd1e17c70599c563609050e5de40/recipes/exwm-x";
sha256 = "1d9q57vz63sk3h1g5gvp9xnmqkpa73wppmiy2bv8mxk11whl6xa3";
name = "exwm-x";
};
- packageRequires = [ bind-key cl-lib exwm swiper switch-window ];
+ packageRequires = [
+ bind-key
+ cl-lib
+ counsel
+ exwm
+ ivy
+ swiper
+ switch-window
+ ];
meta = {
homepage = "https://melpa.org/#/exwm-x";
license = lib.licenses.free;
@@ -22206,12 +21842,12 @@
eziam-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "eziam-theme";
- version = "20170517.847";
+ version = "20171007.939";
src = fetchFromGitHub {
owner = "thblt";
repo = "eziam-theme-emacs";
- rev = "6c7e6ac20e27a26e7b27761f11a3a959ea815b5c";
- sha256 = "1jzqb1w8ax5h6g9nwqwnagalag2kj7mabq889vl59ka5lvccac0f";
+ rev = "909a84dc5959aac982d1c296e82d687d172d3ecd";
+ sha256 = "0mw9h55f708mv0ngixmdn7976yrhqjcnzac80f6mzddpwavgrhd6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0411583bd4fdbe425eb07de98851136fa1eeb0/recipes/eziam-theme";
@@ -22308,72 +21944,15 @@
license = lib.licenses.free;
};
}) {};
- face-remap-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "face-remap-plus";
- version = "20170222.1742";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/face-remap+.el";
- sha256 = "1p42wjzl2brbqv3vh3g1rcgh5m9a7bix5q80pg7r6515as8kykad";
- name = "face-remap+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/face-remap+";
- sha256 = "0vq6xjrv3qic89pxzi6mx1s08k4ba27g8wqm1ap4fxh3l14wkg0y";
- name = "face-remap-plus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/face-remap+";
- license = lib.licenses.free;
- };
- }) {};
- facemenu-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "facemenu-plus";
- version = "20170222.1744";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/facemenu+.el";
- sha256 = "0nnaqmdsf6ksk6663924bpw3mrldybj6jjkgj0525nhpfjx7x4yq";
- name = "facemenu+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/facemenu+";
- sha256 = "0lbggalgkj59wj67z95949jmppmqrzrp63mdhw42r2x0fz1ir0iv";
- name = "facemenu-plus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/facemenu+";
- license = lib.licenses.free;
- };
- }) {};
- faces-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "faces-plus";
- version = "20170222.1745";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/faces+.el";
- sha256 = "0a80027a78zad0nxlkmv69b2zzbz4b29rsn4ivgb313r4c24igzx";
- name = "faces+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/faces+";
- sha256 = "0k3m434f3d3061pvir0dnykmv6r9jswl7pzybzja3afiy591hh92";
- name = "faces-plus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/faces+";
- license = lib.licenses.free;
- };
- }) {};
faceup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "faceup";
- version = "20170126.1305";
+ version = "20170925.1246";
src = fetchFromGitHub {
owner = "Lindydancer";
repo = "faceup";
- rev = "688b487ad0a78c8707c5aded50e1d85551270034";
- sha256 = "1wmmj69wgzgac5y7gnrz84dvwjzd45h3rr434vv4dxnam0j0lj40";
+ rev = "6c92dad56a133e14e7b27831e1bcf9b3a71ff154";
+ sha256 = "1yzmy7flrhrh0i10bdszx8idx6r8h6czm4vm4q0z6fp5fw94zwrx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a10bf2928b93c3908e89ca8ad9649bb468ebca05/recipes/faceup";
@@ -22494,12 +22073,12 @@
fancy-narrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fancy-narrow";
- version = "20160124.403";
+ version = "20171030.1716";
src = fetchFromGitHub {
owner = "Malabarba";
repo = "fancy-narrow";
- rev = "4737d706d1f3e90885e6642ba782f1fa605414c6";
- sha256 = "0825hyz8b2biil0pd2bgjxqd2zm3gw9si7br5hnh51qasbaw9hid";
+ rev = "9f4a587f6a5a387271fb665e13f59d41fd42504c";
+ sha256 = "0dl0fc3i8g193adpkr4fb2k151lw9r6gd8p27q9xgmm9brf9jf17";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/fancy-narrow";
@@ -22599,12 +22178,12 @@
faust-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "faust-mode";
- version = "20160930.222";
+ version = "20170908.542";
src = fetchFromGitHub {
owner = "magnetophon";
repo = "emacs-faust-mode";
- rev = "41379dd52a8be01cdfac06996ea1593877fdaf58";
- sha256 = "0q624nm9wfyg95wybi542bx8pdpqk9vibyb6b9fin4mw102nah9j";
+ rev = "0f099007574d1430bb0cf73f73dcc284d9d3a190";
+ sha256 = "0rmq6ca75x47hk2bpsk1j2ja62kpplgyanpiqq4hk6q259rd4lyv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/31f4177ce35313e0f40e9ef0e5a1043ecd181573/recipes/faust-mode";
@@ -22617,15 +22196,35 @@
license = lib.licenses.free;
};
}) {};
+ faustine = callPackage ({ emacs, faust-mode, fetchgit, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "faustine";
+ version = "20170908.658";
+ src = fetchgit {
+ url = "https://bitbucket.org/yassinphilip/faustine";
+ rev = "ae67cd9d1a2625d80726dace9dd83539e71d1b36";
+ sha256 = "1wvf37g2bb9xbxi0qxn1sfq0ygaqxfzsnzdbnail6f29qyl541al";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/b298e399335efbbdbc6e9bb06ab915fc07909faa/recipes/faustine";
+ sha256 = "0pkjxfzgdhkjjx38d1c2kw8m5cw5ryhfj7lykpym79wsa471hf9s";
+ name = "faustine";
+ };
+ packageRequires = [ emacs faust-mode ];
+ meta = {
+ homepage = "https://melpa.org/#/faustine";
+ license = lib.licenses.free;
+ };
+ }) {};
fcitx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fcitx";
- version = "20170812.1131";
+ version = "20170913.1900";
src = fetchFromGitHub {
owner = "cute-jumper";
repo = "fcitx.el";
- rev = "6d552ab44234ed78ce9a50f2412f56197266bc9f";
- sha256 = "08l859rw1lwj6hdxrlxqlxf1cfxv8yv9h1jsgs5zfis3hp7nq39j";
+ rev = "095332fbeb994c908c533fe2ad068c0728211c3d";
+ sha256 = "01sm50rqajylah2hx6n5ig0xmrrhxbamzs4bg97qzxzr4nlnjcaz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e8c40f09d9397b3ca32a7ed37203f490497dc984/recipes/fcitx";
@@ -22662,12 +22261,12 @@
feature-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "feature-mode";
- version = "20161123.532";
+ version = "20170907.748";
src = fetchFromGitHub {
owner = "michaelklishin";
repo = "cucumber.el";
- rev = "aa06b88ad96bc556992f011b6aef9b78e99ae48b";
- sha256 = "1iybvdkszrqwz9knmfffmcknsdhnpc71961y0xb4xgad8i043n2y";
+ rev = "722b352c4f0b800a9356dd369c79612782b3b847";
+ sha256 = "0myaddivhvl8x3n2z2vjc6mc2jn1jja67mzwx1jp9gb9p958irk0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0a70991695f9ff305f12cfa45e0a597f4a782ba3/recipes/feature-mode";
@@ -22762,53 +22361,15 @@
license = lib.licenses.free;
};
}) {};
- files-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "files-plus";
- version = "20170222.1746";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/files+.el";
- sha256 = "1ch7k4gpfcb5k6z656rprdcvxp75wsfjhw5l6x8f05qbmm0cbimv";
- name = "files+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/files+";
- sha256 = "1m1pxf6knrnyc9ygmyr27gm709ydxf0kkh1xrfcza6n476frmwr8";
- name = "files-plus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/files+";
- license = lib.licenses.free;
- };
- }) {};
- filesets-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "filesets-plus";
- version = "20170222.1748";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/filesets+.el";
- sha256 = "0i9nc9zhpj208as9pynnh6xvr0qk53y7bpg2gw4gak9xr9xywbpg";
- name = "filesets+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/filesets+";
- sha256 = "06n8pw8c65bmrkxda2akvv57ndfijgbp95l40j7sjg8bjp385spn";
- name = "filesets-plus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/filesets+";
- license = lib.licenses.free;
- };
- }) {};
fill-column-indicator = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fill-column-indicator";
- version = "20151030.1233";
+ version = "20170905.1008";
src = fetchFromGitHub {
owner = "alpaker";
repo = "Fill-Column-Indicator";
- rev = "0e755319451dd9c6c99c2a2ef82c890ba93343b6";
- sha256 = "0gbqspqn4y7f2fwqq8210b6k5q22c0zr7b4ws8qgz9swav8g3vrq";
+ rev = "23ad25f2c2fddd32a1ea12a9e0f631e243e6a779";
+ sha256 = "010kf8jsly74y7m6mmkn1h6y205kz23zphs50zgy2nag2p88rz9y";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4ea0c00a7784621fcca0391a9c8ea85e9dd43852/recipes/fill-column-indicator";
@@ -22824,12 +22385,12 @@
fillcode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fillcode";
- version = "20150812.941";
+ version = "20171029.925";
src = fetchFromGitHub {
owner = "snarfed";
repo = "fillcode";
- rev = "1f64f0303a3157eabec355fd155571bb0c042489";
- sha256 = "0cgrswhbmzyfpkrp8iznsn1lxnb61dz2f0181pqd9gdf55qrk67m";
+ rev = "d0a9e20f5fcc24a786d09ea19bfb9237681ba823";
+ sha256 = "1mf2gfcjaqbw523vkfbzs2nl1y9bn9gbgmbvn2phbyj78gzq18za";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/85eb403503aa83799a6072bfe21bf66c8177ca73/recipes/fillcode";
@@ -22884,34 +22445,15 @@
license = lib.licenses.free;
};
}) {};
- find-dired-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "find-dired-plus";
- version = "20170409.1832";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/find-dired+.el";
- sha256 = "0zfqkw9vghbzvdh3iyqkkdq777bb1yhfgqk7p28dxz861z13cmfs";
- name = "find-dired+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/find-dired+";
- sha256 = "190cj41b6s1l6gk1m0rbwfsdciw4my39ncppdxf9pi7gzhcjpznr";
- name = "find-dired-plus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/find-dired+";
- license = lib.licenses.free;
- };
- }) {};
find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "find-file-in-project";
- version = "20170725.133";
+ version = "20171025.1943";
src = fetchFromGitHub {
owner = "technomancy";
repo = "find-file-in-project";
- rev = "2d3e8d095e0c36f927142e80c4330977be698568";
- sha256 = "1phj6a6ydc8hzv1f1881anyccg1jkd8dh6g229ln476i5y6wqs5j";
+ rev = "a3ecd28182ba3102fefdc080e807866464153edc";
+ sha256 = "08dk8jjg63rs15hq4rb32368nja2iwdsp8dxwb3isza96lsfkwmx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project";
@@ -22987,25 +22529,6 @@
license = lib.licenses.free;
};
}) {};
- finder-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "finder-plus";
- version = "20170222.1752";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/finder+.el";
- sha256 = "0h1jsgb7vivmbay35s9bx8dpl7l88zdh1f6ymdm16b0alpiv4p14";
- name = "finder+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/finder+";
- sha256 = "1ichxghp2vzx01n129fmjm6iwx4b98ay3xk1ja1i8vzyd2p0z8vh";
- name = "finder-plus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/finder+";
- license = lib.licenses.free;
- };
- }) {};
findr = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "findr";
@@ -23069,27 +22592,6 @@
license = lib.licenses.free;
};
}) {};
- firebelly-theme = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "firebelly-theme";
- version = "20140410.155";
- src = fetchFromGitHub {
- owner = "startling";
- repo = "firebelly";
- rev = "5fd621102c676196319579b168da1476e8552d00";
- sha256 = "02ajday0lnk37dnzf4747ha3w0azisq35fmdhq322hx0hfb1c66x";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8f2b5ab0e75dccb9efb998cdc240303dc4a279/recipes/firebelly-theme";
- sha256 = "0lns846l70wcrzqb6p5cy5hpd0szh4gvjxd4xq4zsb0z5nfz97jr";
- name = "firebelly-theme";
- };
- packageRequires = [ cl-lib ];
- meta = {
- homepage = "https://melpa.org/#/firebelly-theme";
- license = lib.licenses.free;
- };
- }) {};
firecode-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "firecode-theme";
@@ -23174,6 +22676,27 @@
license = lib.licenses.free;
};
}) {};
+ fish-completion = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "fish-completion";
+ version = "20171104.1509";
+ src = fetchFromGitHub {
+ owner = "Ambrevar";
+ repo = "emacs-fish-completion";
+ rev = "ccc29e7c925de7051e477d79bff97fec5fb9bec4";
+ sha256 = "08rmk43lsgfkb2cwkrqdv2x38pih9ljasfn74a8y705i2dwqimqb";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/832bae268cd08d7ebfd4b7a8d0570af8549cdbd6/recipes/fish-completion";
+ sha256 = "1lq613b0zb4shlzx5s3br4d16295czx3bfymqcnriyspsfjvakar";
+ name = "fish-completion";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/fish-completion";
+ license = lib.licenses.free;
+ };
+ }) {};
fish-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fish-mode";
@@ -23195,25 +22718,6 @@
license = lib.licenses.free;
};
}) {};
- fit-frame = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "fit-frame";
- version = "20170222.1754";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/fit-frame.el?revision=63";
- sha256 = "1wm2jc7h5zhv695wf21l3n9gjn31ddgd0vybx8brj1nbvavifs0x";
- name = "fit-frame.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/e13c77f822db3c9eaeb3fd5fa95cc2dbe5133f2c/recipes/fit-frame";
- sha256 = "1xcq4n9gj0npjjl98vqacms0a0wnzw62a9iplyf7bgj7n77pgkjb";
- name = "fit-frame";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/fit-frame";
- license = lib.licenses.free;
- };
- }) {};
fix-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fix-input";
@@ -23308,16 +22812,16 @@
flappymacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "flappymacs";
- version = "20140715.901";
+ version = "20171023.304";
src = fetchFromGitHub {
owner = "taksatou";
repo = "flappymacs";
- rev = "bbc69405f62e1bc488533709d4ab0b5eba919dbd";
- sha256 = "07hv6l80ka10qszm16fpan8sas4b0qvl5s6qixxlz02fm7m0s7m5";
+ rev = "27f3e21acb22f786606481e3f4e5dc1edbaaaed4";
+ sha256 = "0zcwsbz93p1l2jb1fs6m4s5y9klcr5qg5nw10qg30j9l2bc1hda8";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flappymacs";
- sha256 = "0id3bz4h9wi4943kp2sab7240fw8hsnkpng02gij9ssyvjiii5cg";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/a63b22f357b2d08b12fb86c27261ab4d687c5f7f/recipes/flappymacs";
+ sha256 = "1rp4r5ldhm8nrj26y1vm5d5fj3kl7v45cj1naxczrqbcgkd0r404";
name = "flappymacs";
};
packageRequires = [];
@@ -23452,6 +22956,27 @@
license = lib.licenses.free;
};
}) {};
+ flex-compile = callPackage ({ buffer-manage, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "flex-compile";
+ version = "20171031.2349";
+ src = fetchFromGitHub {
+ owner = "plandes";
+ repo = "flex-compile";
+ rev = "031f4612a07dc0ddb03424a2f986ea18e7064fe7";
+ sha256 = "1vwvhaxhpmpcyrmzdfbwxsxif3fx40548gks3y4n0nhprji7wjmg";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/259caeebc317e81ab9d532a371ea85656c2b1619/recipes/flex-compile";
+ sha256 = "1hlh4k7qgln87xajnjjhf1yyg6bgdwd0iczhlfw8gdwfj5xpjd38";
+ name = "flex-compile";
+ };
+ packageRequires = [ buffer-manage dash emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/flex-compile";
+ license = lib.licenses.free;
+ };
+ }) {};
flex-isearch = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "flex-isearch";
@@ -23514,25 +23039,6 @@
license = lib.licenses.free;
};
}) {};
- fliptext = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "fliptext";
- version = "20131113.1818";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/fliptext.el?revision=4";
- sha256 = "1viigj04kla20dk46xm913jzqrmx05rpjrpghnc0ylbqppqdwzpw";
- name = "fliptext.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/093046dfb39148d56681e9c8be8cccff23dd19cb/recipes/fliptext";
- sha256 = "0cmyan9hckjsv5wk1mvjzif9nrc07frhzkhhl6pkgm0j0f1q30ji";
- name = "fliptext";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/fliptext";
- license = lib.licenses.free;
- };
- }) {};
floobits = callPackage ({ fetchFromGitHub, fetchurl, highlight, json ? null, lib, melpaBuild }:
melpaBuild {
pname = "floobits";
@@ -23557,12 +23063,12 @@
flow-minor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "flow-minor-mode";
- version = "20170729.1008";
+ version = "20170916.312";
src = fetchFromGitHub {
owner = "an-sh";
repo = "flow-minor-mode";
- rev = "75067baceed7d699dda43944da49dc58d22baeff";
- sha256 = "0r1xs3vff3ng0h2w8nn7mxssdnipnrzwk9dh5f5v7prwk2q60byb";
+ rev = "93184633933b5aa62e6e92b7fe1311261012e591";
+ sha256 = "1laainsc5l4l4r5j17hblv7b1ppxrgfak73ama1qn7kb14y1jfrf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/66504f789069922ea56f268f4da90fac52b601ff/recipes/flow-minor-mode";
@@ -23662,12 +23168,12 @@
flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }:
melpaBuild {
pname = "flycheck";
- version = "20170802.22";
+ version = "20171026.610";
src = fetchFromGitHub {
owner = "flycheck";
repo = "flycheck";
- rev = "ed08ce36e5cc97cfabb84ccaba84a00db917f082";
- sha256 = "1r6lrxc8wv73fh4ybq83awci92ajrbgila8b86vxgvhvhl8jcj6d";
+ rev = "0d982b2860927a03e4cdf663750bd3b4c128918a";
+ sha256 = "0azjq7d3whlqwp0svj04drk1gxd1hm99d95lkqwj9pbag5hip3ly";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck";
@@ -23830,12 +23336,12 @@
flycheck-clang-tidy = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-clang-tidy";
- version = "20170621.202";
+ version = "20171024.108";
src = fetchFromGitHub {
owner = "ch1bo";
repo = "flycheck-clang-tidy";
- rev = "5b1c86477f7d1eaabd781bc83dd1bd105c79335c";
- sha256 = "1zd6rqbrpvjxa9sclkldffb91mgyljh1jcvlvvd2cdlajcv98ciw";
+ rev = "b8ebd49693f67e08e420ba847cc88f6721ef9e3e";
+ sha256 = "0fnn1baw64f7x1zjb95adryr3mfynbblwppcd6ywh7pk0sq18b80";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a289ac549a7735a12eec85521c32f915b9194b85/recipes/flycheck-clang-tidy";
@@ -23893,12 +23399,12 @@
flycheck-color-mode-line = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-color-mode-line";
- version = "20170512.1607";
+ version = "20171020.2128";
src = fetchFromGitHub {
owner = "flycheck";
repo = "flycheck-color-mode-line";
- rev = "b2b20727d133c05fd31eac7b9b5c0886bbca8f98";
- sha256 = "1dgm9i2b9irp454ag9pv96hbacz1j3gsapk96xr45wjh4hblgwa3";
+ rev = "157b1edd79b44c26ef18862160e0ab50db27352e";
+ sha256 = "0lrk2b6xa12zcv18z4j1lpl7b36sl7saz14warxc1fw3p7dr4hm4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/02b5b60b74581ff0d1815155223e0c6e94a851a1/recipes/flycheck-color-mode-line";
@@ -24040,12 +23546,12 @@
flycheck-dedukti = callPackage ({ dedukti-mode, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-dedukti";
- version = "20170407.258";
+ version = "20171103.512";
src = fetchFromGitHub {
owner = "rafoo";
repo = "flycheck-dedukti";
- rev = "ea34af5e677fbf18a40935b531abb1d9aae59f6b";
- sha256 = "03flfn7caxa8jpp6v3mn1mvs8lf4khcl8nsgd1nb93k7wp9x6l5s";
+ rev = "3dbff5646355f39d57a3ec514f560a6b0082a1cd";
+ sha256 = "1ffpxnwl3wx244n44mbw81g00nhnykd0lnid29f4aw1av7w6nw8l";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/732832e88a65a8866fa3872ff5f29eb8a26438f2/recipes/flycheck-dedukti";
@@ -24124,12 +23630,12 @@
flycheck-dmd-dub = callPackage ({ f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-dmd-dub";
- version = "20170403.1116";
+ version = "20170816.648";
src = fetchFromGitHub {
owner = "atilaneves";
repo = "flycheck-dmd-dub";
- rev = "879c52116989f6041ccd20f5db210f5552d5c649";
- sha256 = "12qblzrw99lcl8qccl26kwqiwscn04izvjrsq3mnp1r5q0s0jxl2";
+ rev = "5a2e65fbae90e1dd69cfa78e4af0bda25c7db973";
+ sha256 = "1zh6yb5snjrp09zh24fip97pqq7vk472g8nmjjqk0iq8m9i8sphs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a812594901c1099283bdf51fbea1aa077cfc588d/recipes/flycheck-dmd-dub";
@@ -24229,12 +23735,12 @@
flycheck-flow = callPackage ({ fetchFromGitHub, fetchurl, flycheck, json ? null, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-flow";
- version = "20170604.811";
+ version = "20171018.327";
src = fetchFromGitHub {
owner = "lbolla";
repo = "emacs-flycheck-flow";
- rev = "a249e60803b1e423c67e40462229646cc77fcb68";
- sha256 = "04xghj1l4fnfhl139k3s6q7fhln946gx8ak7l6ys7rz23iizbx4q";
+ rev = "2e21ec3c4eacdc100b1a45e97884350f53b832d3";
+ sha256 = "0ijazydkz9lwxbnsvanpv3202k35a4knipp08inlw3pm3k16p3mj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4d18fb21d8ef9b33aa84bc26f5918e636c5771e5/recipes/flycheck-flow";
@@ -24292,12 +23798,12 @@
flycheck-haskell = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, let-alist, lib, melpaBuild, seq }:
melpaBuild {
pname = "flycheck-haskell";
- version = "20170622.1248";
+ version = "20171022.958";
src = fetchFromGitHub {
owner = "flycheck";
repo = "flycheck-haskell";
- rev = "2aeb2ed5cdde7770cd5da9950981390d7b44f74c";
- sha256 = "0h7zb1f0j3b44ad7ikdyv3mhddvh9hfg61g2aic3x3ms8rph86q5";
+ rev = "ab2e4f9b5ce4665a9b00c3e16dc8ecce30c99d01";
+ sha256 = "1508rd39zkvlwcakw708lpsahmkiq4pzagjd6j8zas0xn1gb6789";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6ca601613788ae830655e148a222625035195f55/recipes/flycheck-haskell";
@@ -24376,12 +23882,12 @@
flycheck-joker = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-joker";
- version = "20170415.2009";
+ version = "20171003.2222";
src = fetchFromGitHub {
owner = "candid82";
repo = "flycheck-joker";
- rev = "43a25fe17ba6ade96fc865bd8ec3fb3c131aa419";
- sha256 = "0m2msyyshbr6pgnjqybv8b1fj0axja3la0drbbbk0va1cn556wfs";
+ rev = "c34c3922a2e8bc918f250602e0ddf655cdcad456";
+ sha256 = "0fp7h0pmxk02x1kisqvnb9wkjjn9bl91capmnllrb7qmb24w6pd5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/599bf33a5d4a4a590b355001e532cab4e1ee9ef6/recipes/flycheck-joker";
@@ -24443,8 +23949,8 @@
src = fetchFromGitHub {
owner = "purcell";
repo = "flycheck-ledger";
- rev = "cba408d61e26cf7c31c4a6f82a28a3a32e145c05";
- sha256 = "0ysc2hwz0xmmlwfwd70nfqvd81dvf4gfrynkrfgg9w6hp7y4z522";
+ rev = "2944c56ad72945f78f88fa363e0239b40650d829";
+ sha256 = "16zfa0npi6jmyvjalsiqk11zp41vc5bfpgz5ssh1xa8v9fk6rxaj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/dc715e6849aa5d6017e2478514c4a0d84c7ddbe5/recipes/flycheck-ledger";
@@ -24460,12 +23966,12 @@
flycheck-liquidhs = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-liquidhs";
- version = "20150618.1922";
+ version = "20170412.1626";
src = fetchFromGitHub {
owner = "ucsd-progsys";
repo = "flycheck-liquidhs.el";
- rev = "ee0d3bd0d5e07a872e541d02c112f1cc204db922";
- sha256 = "1wwn9dnzn4vrh747dgbcm944bp3z02gzxd32afjc9k2dsn32qvz2";
+ rev = "c27252ac24d77f4b6eec76a4ba9cd61761a3fba9";
+ sha256 = "1v5s252w2ai0rrci0rkq6wsx110pw8hp60n67990jg6l6lpvir2s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d5921fde4068ff1bb288f6f9e2fe03f4a7fdbbda/recipes/flycheck-liquidhs";
@@ -24562,15 +24068,36 @@
license = lib.licenses.free;
};
}) {};
+ flycheck-nimsuggest = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+ melpaBuild {
+ pname = "flycheck-nimsuggest";
+ version = "20171027.1508";
+ src = fetchFromGitHub {
+ owner = "yuutayamada";
+ repo = "flycheck-nimsuggest";
+ rev = "dc9a5de1cb3ee05db5794d824610959a1f603bc9";
+ sha256 = "1bf65hrz0s6f180kn2ir8l5qn7in789w8pyy96b9gqn21z50vb9d";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/cb4170f002dbcd1906e81836f3ce035b1e81c379/recipes/flycheck-nimsuggest";
+ sha256 = "099mlzramm6z66zyjb6ypn7qb0hpvwbbgk9ydsanj8sni0dd66hv";
+ name = "flycheck-nimsuggest";
+ };
+ packageRequires = [ emacs flycheck ];
+ meta = {
+ homepage = "https://melpa.org/#/flycheck-nimsuggest";
+ license = lib.licenses.free;
+ };
+ }) {};
flycheck-objc-clang = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-objc-clang";
- version = "20170417.1807";
+ version = "20171014.651";
src = fetchFromGitHub {
owner = "GyazSquare";
repo = "flycheck-objc-clang";
- rev = "b16b77f95e4e53a8951ebee6209a5de311748447";
- sha256 = "0lda99wscj89vhzg9wq7akm3dx1zlf90m91ifr627vcw2mzj4wkh";
+ rev = "29a9eb320d62400564360986f7ad400b74070d8e";
+ sha256 = "0b4vwbxzhds9vb4nknfdywvfpr1gkk86vsbbq6f5ds0pfk75x022";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4ff4412f507371b93cfb85fc744e54110cd87338/recipes/flycheck-objc-clang";
@@ -24611,8 +24138,8 @@
src = fetchFromGitHub {
owner = "purcell";
repo = "flycheck-package";
- rev = "cb526f54f4017454e2503b340757ba15578a5aed";
- sha256 = "1x1pmz7gd909s11fsyqrh8a7bg2j4hw572wwqy1kjz2qf42mfw53";
+ rev = "6d99248b45eea1e5236062f38e524230efdb1a84";
+ sha256 = "00wyi2adiv9cb3x8bid2fhg3cjqlkc7z70i18vldbpmrpppjg4x5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d17ec69c9f192625e74dfadf03b11d0d7dc575e7/recipes/flycheck-package";
@@ -24670,12 +24197,12 @@
flycheck-plantuml = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, plantuml-mode }:
melpaBuild {
pname = "flycheck-plantuml";
- version = "20161122.219";
+ version = "20171017.1811";
src = fetchFromGitHub {
owner = "alexmurray";
repo = "flycheck-plantuml";
- rev = "f1628d589991c3d51965db0f14866b1202374eea";
- sha256 = "1j66y4qps1wjdagr36kgqgz1w8zcmwnpwcvgwn4gkif34n96s78l";
+ rev = "183be89e1dbba0b38237dd198dff600e0790309d";
+ sha256 = "1fbdbpwrlkvbgv693ndr3zamkf3gp28v94jg911fsav8bk08f6pq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/65f050860a0efda8cf472c2945b79a0a57651556/recipes/flycheck-plantuml";
@@ -24775,12 +24302,12 @@
flycheck-pycheckers = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-pycheckers";
- version = "20170810.1143";
+ version = "20171011.2136";
src = fetchFromGitHub {
owner = "msherry";
repo = "flycheck-pycheckers";
- rev = "220c551df591792d08fc9d149ab3329171743cb9";
- sha256 = "0q1sz28nlnamcm4l587q94b7cyak9d4wpgpr33a05m9lw4a6z74i";
+ rev = "0cc2d60ae31f7e2b4e5898091f0a9ba7bafdc854";
+ sha256 = "09a5x83qw5znxdrvrq71r0sgi77qjz901dhhwgzcfgf986si4rhp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/af36dca316b318d25d65c9e842f15f736e19ea63/recipes/flycheck-pycheckers";
@@ -24842,8 +24369,8 @@
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "de1f11e68f6752b3ee6738287d4dadb11bca8f8a";
- sha256 = "1jsx08pgwrz6n47a0zs05m0h6knpp9sgg8lrdwg792a93nrcqc5c";
+ rev = "e413e31d1e74fae1fc1bf86792013c3680be6580";
+ sha256 = "0hfibc1nllsp9zdb803ac6cwp6xx4xf8mvjszfq9vp5a63sgw0pl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags";
@@ -24901,12 +24428,12 @@
flycheck-status-emoji = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-status-emoji";
- version = "20170405.1600";
+ version = "20170923.1439";
src = fetchFromGitHub {
owner = "liblit";
repo = "flycheck-status-emoji";
- rev = "c4e891ad287c12b83b754ada27b4550fb763c07f";
- sha256 = "12nlzs4fha1bmq1xbfgf5j4wg9llacl2m3jr8fbk8144pyss3kg5";
+ rev = "e85072a04f4277a48d90364b8e48fcb26a650d38";
+ sha256 = "12k0nakwv7z90fprpzfrsnmha0w5zsvpq7qiv0md3k3h41b5mgfv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5abd6aaa8d2bf55ae75cd217820763531f91958b/recipes/flycheck-status-emoji";
@@ -24926,8 +24453,8 @@
src = fetchFromGitHub {
owner = "swift-emacs";
repo = "flycheck-swift";
- rev = "c6c416a1b7a7d346e5c040e4e4065abc68d3a844";
- sha256 = "0wa60i99jh0dsks30jssg7l17bcmr6jzkwmkjg8brl756p593zp5";
+ rev = "4c5ad401252400a78da395fd56a71e67ff8c2761";
+ sha256 = "094vpmpjq0skhkq634p3zgj3nmsiq1dl8k0z7hzafnaw2y157z1s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fd99bea06079c4231363c37e3361bd9e5b1ba490/recipes/flycheck-swift";
@@ -24943,12 +24470,12 @@
flycheck-swift3 = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-swift3";
- version = "20170409.25";
+ version = "20170926.317";
src = fetchFromGitHub {
owner = "GyazSquare";
repo = "flycheck-swift3";
- rev = "6b0b7c6fffc86809d0535afebd6b0972059992d5";
- sha256 = "0d411idv9ib1jhmdbjb8ycc8clmm1ygpwapaka3d50gkgrmfin4q";
+ rev = "756833425f51baa9eb0a2fa7493df6e68612c88d";
+ sha256 = "1hvrg717q0nlz4r8wby82gs3vdx8fdhf38rg4j77j3fqfmxdd3fi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f1fb8c731c118327dc0bbb726e046fec46bcfb82/recipes/flycheck-swift3";
@@ -24964,12 +24491,12 @@
flycheck-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup }:
melpaBuild {
pname = "flycheck-tip";
- version = "20170729.1411";
+ version = "20171020.348";
src = fetchFromGitHub {
owner = "yuutayamada";
repo = "flycheck-tip";
- rev = "cbdff9a574fab1222ed50d7c1359ffb820f30934";
- sha256 = "0ic9cdsi30mx5ldrbzc2i9y4q69fpa9s19zrdk10i3wxs6mmgl8l";
+ rev = "9b0072d92e6b4a52834bf5a34120a0f5e1c8c2fd";
+ sha256 = "1adcxz2chy0qcv5z79hhj05gdzk4l0jijy5iy9nd3sg8sclxf6nq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/024f1e588e94014734fa252ee7bdb00b4991ede9/recipes/flycheck-tip";
@@ -25045,6 +24572,27 @@
license = lib.licenses.free;
};
}) {};
+ flycheck-yang = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yang-mode }:
+ melpaBuild {
+ pname = "flycheck-yang";
+ version = "20170915.1308";
+ src = fetchFromGitHub {
+ owner = "andaru";
+ repo = "flycheck-yang";
+ rev = "c5f65fe3f710f73d56e04d077868719afc1ebfaf";
+ sha256 = "00w91mif3wnxgj93qag51yyadnfcsyxik96vf91qlfvwh4wi6ii7";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e58b4f4294d11424918b399898c0044f5b76ab14/recipes/flycheck-yang";
+ sha256 = "0agfmirjwlz13aq1jh94agav0y1rxkyhj7mngdgys7mwjxy0ac9h";
+ name = "flycheck-yang";
+ };
+ packageRequires = [ flycheck yang-mode ];
+ meta = {
+ homepage = "https://melpa.org/#/flycheck-yang";
+ license = lib.licenses.free;
+ };
+ }) {};
flycheck-ycmd = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, ycmd }:
melpaBuild {
pname = "flycheck-ycmd";
@@ -25052,8 +24600,8 @@
src = fetchFromGitHub {
owner = "abingham";
repo = "emacs-ycmd";
- rev = "fd037efae08628e41480e9dad705dcc1f64e498d";
- sha256 = "06scz0d3jzgbr919lkjjfq9x1dyr5nqkhblvfpyk5bdp8l6j06d6";
+ rev = "d951afd8c1c2f25a5cbeef3acfcec5f72acfd6e4";
+ sha256 = "0k6z82a3xkk71lbnw3sxqmr8ixafglivmsb5y35q1jichzz6hail";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flycheck-ycmd";
@@ -26035,12 +25583,12 @@
folding = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "folding";
- version = "20140401.3";
+ version = "20170925.838";
src = fetchFromGitHub {
owner = "jaalto";
repo = "project-emacs--folding-mode";
- rev = "f738e28cd90d794aff698bcd44bf4f5027c92839";
- sha256 = "1z2dkyzj1gq3gp9cc3lhi240f8f3yjpjnw520xszm0wvx1rp06ny";
+ rev = "3bf134fd1ecfa8767ab7020c25281ea5ce9968a2";
+ sha256 = "0kcm4k71syz778cbwqf68a63k4vmhygaib3ylwxbm5dq1dmr7iry";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1912296b7879019bea5ba8353d511496e3a9ca2d/recipes/folding";
@@ -26053,25 +25601,6 @@
license = lib.licenses.free;
};
}) {};
- font-lock-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "font-lock-plus";
- version = "20170222.1755";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/font-lock+.el";
- sha256 = "0iajkgh0n3pbrwwxx9rmrrwz8dw2m7jsp4mggnhq7zsb20ighs30";
- name = "font-lock+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/font-lock+";
- sha256 = "1wn99cb53ykds87lg9mrlfpalrmjj177nwskrnp9wglyqs65lk4g";
- name = "font-lock-plus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/font-lock+";
- license = lib.licenses.free;
- };
- }) {};
font-lock-profiler = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "font-lock-profiler";
@@ -26159,16 +25688,16 @@
forecast = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "forecast";
- version = "20170618.1048";
+ version = "20170924.1440";
src = fetchFromGitHub {
owner = "cadadr";
- repo = "forecast.el";
- rev = "96e37ca81a42061f0e837cc3c4dec1844f682e91";
- sha256 = "0hbz2q9sm70r7sxk56dlnzwh71ckrww7w43xxy3ys1r3p7b3j3aq";
+ repo = "elisp";
+ rev = "b3d8b45c76134e2248448d719c840776e41b747a";
+ sha256 = "0fy0b04mf3brx86xjnidkwg4zs4nh123nc6pgrl4mp6d6552vv98";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/e6ff6a4ee29b96bccb2e4bc0644f2bd2e51971ee/recipes/forecast";
- sha256 = "0whag2n1120384w304g0w4bqr7svdxxncdhnz4rznfpxlgiw2rsc";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/a7ea18a56370348715dec91f75adc162c800dd10/recipes/forecast";
+ sha256 = "0zng8xdficpfccq484pghzg8yylihcy8aq0vpxd1w6l40m2qf6zn";
name = "forecast";
};
packageRequires = [ emacs ];
@@ -26352,8 +25881,8 @@
src = fetchFromGitHub {
owner = "rnkn";
repo = "fountain-mode";
- rev = "be10ce90ede2d76b67abb5eff9c09294fe189f1e";
- sha256 = "17zipwazcqqbbsb7p9j2jcid2m0knlah56vbw71yxqb3qbpq7fcz";
+ rev = "34402a27430f8297d157ac3fba3adb09bd3e0d7f";
+ sha256 = "0ci46n4gy5dprz8998xf8dybi5182wv3h65wb2g4h2zhi1n5053i";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/913386ac8d5049d37154da3ab32bde408a226511/recipes/fountain-mode";
@@ -26387,45 +25916,6 @@
license = lib.licenses.free;
};
}) {};
- frame-cmds = callPackage ({ fetchurl, frame-fns, lib, melpaBuild }:
- melpaBuild {
- pname = "frame-cmds";
- version = "20170506.945";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/frame-cmds.el?revision=93";
- sha256 = "1ax9hcrhhwll4m4xi0dvsv4q498cngq5xzib6n2ka706fmnjj0rj";
- name = "frame-cmds.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/frame-cmds";
- sha256 = "0xwzp6sgcb5ap76hpzm8g4kl08a8cgq7i2x9w64njyfink7frwc0";
- name = "frame-cmds";
- };
- packageRequires = [ frame-fns ];
- meta = {
- homepage = "https://melpa.org/#/frame-cmds";
- license = lib.licenses.free;
- };
- }) {};
- frame-fns = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "frame-fns";
- version = "20170222.1759";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/frame-fns.el?revision=31";
- sha256 = "1yl51wnmlmbirrhcf07rnqix62q7ijymwfbahwjsz2s18g2zyj6n";
- name = "frame-fns.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/frame-fns";
- sha256 = "1wq8wva9q1hdzkvjk582a3fgig0lpqz9ch1p2jd6p29kb1i15f5p";
- name = "frame-fns";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/frame-fns";
- license = lib.licenses.free;
- };
- }) {};
frame-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "frame-mode";
@@ -26468,25 +25958,6 @@
license = lib.licenses.free;
};
}) {};
- framemove = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "framemove";
- version = "20130328.433";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/framemove.el?revision=4";
- sha256 = "03ll68d0j0b55rfxymzcirdigkmxcy8556d0i67ghdzmcqfwily7";
- name = "framemove.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/f075338369dbf0694205c1b2c35dc16821f6dc92/recipes/framemove";
- sha256 = "10qf017j0zfnzmcs1i56pznhbvgw7mv4232p8znqaaxphgh6r0ar";
- name = "framemove";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/framemove";
- license = lib.licenses.free;
- };
- }) {};
frames-only-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "frames-only-mode";
@@ -26494,8 +25965,8 @@
src = fetchFromGitHub {
owner = "davidshepherd7";
repo = "frames-only-mode";
- rev = "dbe2725846ab9d90b309fe0f5e303e600a7d1661";
- sha256 = "0c6xq2l9hzw2gavnwzwp5gg7nzvf7dl1x8qh7aabchd4a8c050rb";
+ rev = "d2e6a825e2079adb58012e9677c494d317494724";
+ sha256 = "1x8w2788yaqfi5ys541kp4wi3rcfa2lvbhnxgd8dwr9h0da332xa";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e628416ad9420b3ac5bbfacf930a86d98958ac8/recipes/frames-only-mode";
@@ -26529,6 +26000,27 @@
license = lib.licenses.free;
};
}) {};
+ frecency = callPackage ({ a, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "frecency";
+ version = "20170908.2331";
+ src = fetchFromGitHub {
+ owner = "alphapapa";
+ repo = "frecency.el";
+ rev = "132130088ef5695cffed6fcacfa219cb0c389026";
+ sha256 = "17s34gaq6jvwr6f4l500xyhv33ykwxiwzsq2rrasgs7l301wqsw0";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/d7a6e855d01e0b1c9a23c006af67c487719c50bd/recipes/frecency";
+ sha256 = "033zhzwvh23igfqxbiy68cq6i1wflna19pbg81r0hh9kcfg2afpa";
+ name = "frecency";
+ };
+ packageRequires = [ a dash emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/frecency";
+ license = lib.licenses.free;
+ };
+ }) {};
free-keys = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "free-keys";
@@ -26616,12 +26108,12 @@
fsharp-mode = callPackage ({ company, company-quickhelp, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, pos-tip, s }:
melpaBuild {
pname = "fsharp-mode";
- version = "20170617.1330";
+ version = "20171021.431";
src = fetchFromGitHub {
owner = "rneatherway";
repo = "emacs-fsharp-mode-bin";
- rev = "9766952bd7830cb0d319736961af8e42e67d42fe";
- sha256 = "1krncbzdhp6kpypaqdn6fhvxhhc1pvy2ayn4w4ljmsd7wx6zazyi";
+ rev = "5504550605354146842c8f5c34482ece778b7b31";
+ sha256 = "0hjqgyjch8fdz54akcpw5kmx2z1yvck6k8qyc0mzzmb54iiayf5a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/dc45611e2b629d8bc5f74555368f964420b79541/recipes/fsharp-mode";
@@ -26645,12 +26137,12 @@
fstar-mode = callPackage ({ company, company-quickhelp, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, quick-peek, yasnippet }:
melpaBuild {
pname = "fstar-mode";
- version = "20170809.1039";
+ version = "20171018.847";
src = fetchFromGitHub {
owner = "FStarLang";
repo = "fstar-mode.el";
- rev = "e4742d609b4da715bc23f3271cb3393e15c22291";
- sha256 = "1rp67kpy9d5dkap80b2613kmplh3bbm0s46c4x8pdh8fy42vh2jv";
+ rev = "98647eb56be24e27cf6abd210dac8c6299cd977f";
+ sha256 = "1dhk9h7gf0hc8w9sdcgk89cbcjlxf4w7hn235rxd6iz7m4n28jzz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c58ace42342c3d3ff5a56d86a16206f2ecb45f77/recipes/fstar-mode";
@@ -26678,8 +26170,8 @@
src = fetchFromGitHub {
owner = "factor";
repo = "factor";
- rev = "3faad21b3d02fe81a2c0fae13ed14ad6652accc1";
- sha256 = "14h2mwg0ny3mn7hjqgb9r5661ar2jwamz90v69bx0kz0lmr9drmz";
+ rev = "d2f3977768f5588b9467cc73c12d9a1de204d9e8";
+ sha256 = "1cx1fyr372zhkf35mjvl46c3zim7whz8z2ax88dqavh67h92ai9h";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/fuel";
@@ -26737,12 +26229,12 @@
fullframe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fullframe";
- version = "20160504.749";
+ version = "20170816.303";
src = fetchFromGitHub {
owner = "tomterl";
repo = "fullframe";
- rev = "b91b0b128c08692c147394842a5e4eeb21ebe0b6";
- sha256 = "0nhw708b5jjymbw3b7np11jlkzdrzq7qnnxdyl8nndsn1c3qcr0l";
+ rev = "d6a5217f7f2a5a5edcb75140f3fa69b3a50f1cdd";
+ sha256 = "0m43qnhp6ibsskpjkxc86p3lrjsjc0ndqml3lbd65s79x4x7i3fi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/13d1dc5c39543b65c6bb4150c3690211872c00dc/recipes/fullframe";
@@ -26755,22 +26247,22 @@
license = lib.licenses.free;
};
}) {};
- function-args = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
+ function-args = callPackage ({ fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "function-args";
- version = "20170813.455";
+ version = "20171031.1004";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "function-args";
- rev = "e803dde6f2f96c4513e6d91af8d1aa859e584c57";
- sha256 = "1bqkwn2nl8dgky73jxhhll26skiyalwl07337qdl7m8gjc25kcy8";
+ rev = "609b25305670fff08d5e357298e7128e4f4e3497";
+ sha256 = "1xymwk42n2l7c7iaigz23i4l580qpjgq8nqhgr4mnw6invdsgg2c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/80688d85a34b77783140ad2b8a47ef60c762b084/recipes/function-args";
sha256 = "13yfscr993pll5yg019v9dwy71g123a166w114n2m78h0rbnzdak";
name = "function-args";
};
- packageRequires = [ swiper ];
+ packageRequires = [ ivy ];
meta = {
homepage = "https://melpa.org/#/function-args";
license = lib.licenses.free;
@@ -26800,12 +26292,12 @@
futhark-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "futhark-mode";
- version = "20170714.1430";
+ version = "20171026.722";
src = fetchFromGitHub {
owner = "HIPERFIT";
repo = "futhark";
- rev = "d49c88c9f71f2b3b20779c223d6c0f7e6e0134c8";
- sha256 = "091p3anl6nqjmy9rlizrg1vmrd2n72gmar6g2hhiw611231z135d";
+ rev = "0397438e8fc6cd2e5549a9d883d1e5a5c11110f7";
+ sha256 = "1mb4m8907bhi2305p2i2mxgpq6h9xs0k87j71p35blnh5spqbikm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode";
@@ -26839,44 +26331,6 @@
license = lib.licenses.free;
};
}) {};
- fuzzy-format = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "fuzzy-format";
- version = "20130824.500";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/fuzzy-format.el?revision=6";
- sha256 = "1iv0x1cb12kknnxyq2gca7m3c3rg9s4cxz397sazkh1csrn0b2i7";
- name = "fuzzy-format.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/154cb0a10c81ce4907029f0eddc51108961c65ae/recipes/fuzzy-format";
- sha256 = "055b8710yxbi2sdqsqk6jqgnzky4nykv8jgqgwy8q2isgj6q98jb";
- name = "fuzzy-format";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/fuzzy-format";
- license = lib.licenses.free;
- };
- }) {};
- fuzzy-match = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "fuzzy-match";
- version = "20170222.1800";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/fuzzy-match.el?revision=23";
- sha256 = "1wxl900wikkzykzp95v84kcyw3m1d16hklhyqqhsmg58ph4i6r94";
- name = "fuzzy-match.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/fuzzy-match";
- sha256 = "0c1f4q985ag5qhv15iw2jhmpsyy09fbj87srp4k58lspjf40acdj";
- name = "fuzzy-match";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/fuzzy-match";
- license = lib.licenses.free;
- };
- }) {};
fvwm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fvwm-mode";
@@ -26964,12 +26418,12 @@
fzf = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fzf";
- version = "20170527.2120";
+ version = "20171026.554";
src = fetchFromGitHub {
owner = "bling";
repo = "fzf.el";
- rev = "8d75f98cf904c3ab62e8cc54f2b8701c215620d7";
- sha256 = "1rr0d937j078xyhlx5i305l5wavd3fcmvfqmdnbfwah8mfnp4kip";
+ rev = "ef1dc851077913a327261a6b971fab5f5f657831";
+ sha256 = "12zbvr7806xiyx2q944nfnqqfnm43v9ziaihkb9n10s2sp6ippb7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1671e17c99ef1932c6a2e83fc4fa2e4eb6674bc8/recipes/fzf";
@@ -27029,11 +26483,11 @@
version = "20160204.736";
src = fetchhg {
url = "https://bitbucket.com/gvol/gap-mode";
- rev = "1de32f2ff384";
- sha256 = "1jsw2mywc0y8sf7yl7y3i3l8vs3jv1srjf34lgb5xfz6p8wc5lc0";
+ rev = "617eff4ff846";
+ sha256 = "08dx8ijivhsfmqkxn33121qcjd6nckpn0jdlh0lhx4z4zg8x37bl";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/gap-mode";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/83ec19a4ebac6b2d0fd84939b393848f82620978/recipes/gap-mode";
sha256 = "07whab3gi4b8gsvy5ijmjnj700lw0rm3bnr1769byhnpi7qpqin2";
name = "gap-mode";
};
@@ -27130,12 +26584,12 @@
geiser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "geiser";
- version = "20170704.1044";
+ version = "20171102.1825";
src = fetchFromGitHub {
owner = "jaor";
repo = "geiser";
- rev = "dd08e3d83d070eb8d041d66217b4591a55729024";
- sha256 = "1mchrrrygwxy2ivnh7zfv0bqqvwinh61b5204yvivw303rfyc2iy";
+ rev = "da22a526c1f683a90bb60840d05a6bb5f3a74ffe";
+ sha256 = "101v0hfsdzksc3pr6vds7ypwmrpxvslmwmskwm9i94sxs39j067c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b0fe32d24cedd5307b4cccfb08a7095d81d639a0/recipes/geiser";
@@ -27148,22 +26602,22 @@
license = lib.licenses.free;
};
}) {};
- general = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ general = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "general";
- version = "20170708.104";
+ version = "20171104.2336";
src = fetchFromGitHub {
owner = "noctuid";
repo = "general.el";
- rev = "00efad765a3ace42a2833c65a169d96c7925623b";
- sha256 = "1jp0vp4g46pcxsyz9d8n9iqf1rsaw4lhsrilmdkayj7n3skg4ipj";
+ rev = "ae94ac1c0efc946963e659366db0101ed6171ade";
+ sha256 = "1k63gmlds4f0sd50j5m0icxp2r9n4w5xxxqx7av7ffkidm31w3fx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d86383b443622d78f6d8ff7b8ac74c8d72879d26/recipes/general";
sha256 = "104ywsfylfymly64p1i3hsy9pnpz3dkpmcq1ygafnld8zjd08gpc";
name = "general";
};
- packageRequires = [ cl-lib ];
+ packageRequires = [ cl-lib emacs ];
meta = {
homepage = "https://melpa.org/#/general";
license = lib.licenses.free;
@@ -27256,12 +26710,12 @@
ggtags = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ggtags";
- version = "20170711.1806";
+ version = "20170918.1838";
src = fetchFromGitHub {
owner = "leoliu";
repo = "ggtags";
- rev = "8579025b9b89c53221c6c608b92a85734ffb0116";
- sha256 = "1fr12adssldynjayylqck85nnlcjx6pf15vp0hhvdnl689imbg3l";
+ rev = "6293c438a4a7aae08b8f5dd5fc0082d3da0aa530";
+ sha256 = "0rb293wjnc36gjy1vvvqsy605nn0vli1b1w210vvcjbg7zgcsak1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b158bb1bc2fbe3de61a6b21174eac7b1457edda2/recipes/ggtags";
@@ -27323,8 +26777,8 @@
src = fetchFromGitHub {
owner = "DanielG";
repo = "ghc-mod";
- rev = "3d9a3398691cb4cf476896994ab0e5640c69742f";
- sha256 = "0w53xj2hlr1nc4sahxgajjl23zsqjjcvsfpafhkhszgprbjdjh31";
+ rev = "06515c44830788254602af90118de07ae2effb12";
+ sha256 = "1ymjq9nsqzf8vhrzniwqzszwbdlq5y2nmr8pgbwhmh3bvfbpj7ff";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ghc";
@@ -27403,16 +26857,16 @@
ghost-blog = callPackage ({ fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }:
melpaBuild {
pname = "ghost-blog";
- version = "20160526.257";
+ version = "20171023.42";
src = fetchFromGitHub {
owner = "javaguirre";
repo = "ghost-blog-emacs";
- rev = "d4e66d114ff7b846b967af4cff64dcafa381ead3";
- sha256 = "174swf066vcf99g38c9x5lxp14fyh59cy9lriywhm6hk7mcaakng";
+ rev = "71b358643cc9a2db1bf752281ff94aba9b59e4cc";
+ sha256 = "1fkh7zslkdi7a4x2xrk73acmigbi7yx9k6iaj75zbjfd49gyqj13";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ghost-blog";
- sha256 = "0289hgvrx96bfpvpbidwi2761kmscg5nzny7g5gxmy3xzzm9bqkj";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/4a906d461bcb2aa07050b72669feb5787414d809/recipes/ghost-blog";
+ sha256 = "0c591cx5kkfmhhqh8jall470iicxdv01mm3m13irq5xhmp3i5kjy";
name = "ghost-blog";
};
packageRequires = [ markdown-mode ];
@@ -27449,8 +26903,8 @@
src = fetchFromGitHub {
owner = "magit";
repo = "ghub";
- rev = "887ba91d724c656c35fed3eecd2e7d826553ff91";
- sha256 = "1ngin66i3rn0j9wz1lhc8nh1saka924ilnw4r91pkr7gsyd3c20s";
+ rev = "7c52e9063ad10f76d45d816a92c65cf1f6c7b9af";
+ sha256 = "1iynfqza146mnkvsgfjnfmja4m42m71s0nw015iks428nzrrkf1j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d5db83957187c9b65f697eba7e4c3320567cf4ab/recipes/ghub";
@@ -27466,12 +26920,12 @@
ghub-plus = callPackage ({ apiwrap, emacs, fetchFromGitHub, fetchurl, ghub, lib, melpaBuild }:
melpaBuild {
pname = "ghub-plus";
- version = "20170806.1323";
+ version = "20171019.944";
src = fetchFromGitHub {
owner = "vermiculus";
repo = "ghub-plus";
- rev = "153c194718abc74a49078b056c87959a39b35627";
- sha256 = "08svh16jdiz3rirk2wba6gwf8m3hhrhazlyb7idn4y22zc0am254";
+ rev = "e04050f81106029c342deb7adbfc67b2a888ec58";
+ sha256 = "0ydd6aiy8x878jlzp88gi30yslhkcin0rbdjirj2vjs88cfvcjq6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/03a412fd25218ff6f302734e078a699ff0234e36/recipes/ghub+";
@@ -27554,8 +27008,8 @@
src = fetchFromGitHub {
owner = "rejeep";
repo = "git.el";
- rev = "2b523c1975d4f258effaf826656c4b7120b2a19f";
- sha256 = "0471xm0h6jkmxnrcqy5agq42i8immdb2qpnw7q7czrbsl521al8d";
+ rev = "a3396a7027a7d986598c6a2d6d5599bac918f3da";
+ sha256 = "10siqf21ay6vl1r1v2c93rajzyjc67m4wq9q88pbij0z18vkq2f0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ce19d2716416295966716db47241a0e37b412ab5/recipes/git";
@@ -27655,12 +27109,12 @@
git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }:
melpaBuild {
pname = "git-commit";
- version = "20170609.2310";
+ version = "20171007.346";
src = fetchFromGitHub {
owner = "magit";
repo = "magit";
- rev = "5c05bdb9de39872649821ea3c70f3489741bcc66";
- sha256 = "0g6578fpycfg7f5v3a7q6vaqgvcnxyf90yzg9mkjgis7b3im8jb7";
+ rev = "ab00c5ba2711da7804a92be0c04b996250d350b7";
+ sha256 = "08psg0gdxb5ng1319ah06d65f8brglb69s992qf2gh1njjfv4l2m";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
@@ -27673,22 +27127,22 @@
license = lib.licenses.free;
};
}) {};
- git-commit-insert-issue = callPackage ({ bitbucket, fetchFromGitLab, fetchurl, github-issues, gitlab, helm, lib, melpaBuild, projectile, s }:
+ git-commit-insert-issue = callPackage ({ bitbucket, fetchFromGitLab, fetchurl, github-issues, gitlab, lib, melpaBuild, projectile, s }:
melpaBuild {
pname = "git-commit-insert-issue";
- version = "20170502.1027";
+ version = "20171102.1141";
src = fetchFromGitLab {
owner = "emacs-stuff";
repo = "git-commit-insert-issue";
- rev = "5f08c17bf93b17915415d435ee41923d924fe20b";
- sha256 = "11my5apnyhdqh0pmq9wdjd1iah415a5nw87sk586cb3vxnbn5qas";
+ rev = "f986923b04b587206ce7ee8e0c456768600e8be7";
+ sha256 = "1gffjf6byasisa9jdcv9n4n5zqalvzfsxv7z75zl0g3ph7wc7bbm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/git-commit-insert-issue";
sha256 = "0xhlchr7dbm0hp4cjba3x1fdf7lnfc97id327i2fqgkdc4yn9fax";
name = "git-commit-insert-issue";
};
- packageRequires = [ bitbucket github-issues gitlab helm projectile s ];
+ packageRequires = [ bitbucket github-issues gitlab projectile s ];
meta = {
homepage = "https://melpa.org/#/git-commit-insert-issue";
license = lib.licenses.free;
@@ -28138,12 +27592,12 @@
github-search = callPackage ({ fetchFromGitHub, fetchurl, gh, lib, magit, melpaBuild }:
melpaBuild {
pname = "github-search";
- version = "20160822.1328";
+ version = "20170823.2023";
src = fetchFromGitHub {
owner = "IvanMalison";
repo = "github-search";
- rev = "24435772bf8c2c55b4f228917a1344d785851e2a";
- sha256 = "1863g5gphlz1xr465r9nplf5n3ajz1b6girswf3fv1gk8xl1swjj";
+ rev = "c5fa1d9f8f9bcf201fa31478a6f5e02ed5ac086b";
+ sha256 = "1v9kswj65sdb90lr4a2xqai55kyp3jp46nksikxx9m243nxdsh9q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/733a808400858513137e0e3d7d38b5b25e8ddc5a/recipes/github-search";
@@ -28306,12 +27760,12 @@
glab = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "glab";
- version = "20160808.539";
+ version = "20170924.359";
src = fetchFromGitLab {
owner = "tarsius";
repo = "glab";
- rev = "5ced0214622450930bcea105b9aac785c594609d";
- sha256 = "100lz4dqn9ggvlvdrp909cy44br9hnlaa62pj0kp1vdqqxfxwfyn";
+ rev = "9848182275e0448390ccdd8dcd8e1e3a1853950c";
+ sha256 = "1fw1ck85y9r6z331g1wj7rix29fwy6gwbm7vqj3wff0lszy208ba";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9375cbae3ffe5bf4ba5606358860050f3005d9b7/recipes/glab";
@@ -28327,12 +27781,12 @@
glsl-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "glsl-mode";
- version = "20160209.833";
+ version = "20170927.736";
src = fetchFromGitHub {
owner = "jimhourihan";
repo = "glsl-mode";
- rev = "b4709644bb01b522ba9c8afe16ed2394783c481f";
- sha256 = "14ziljq34k585scwn606hqbkcvy8h1iylsc4h2n1grfmm8ilf0ws";
+ rev = "384968506cf25c5c2df61b32fdfdbd041e3bf651";
+ sha256 = "0729s4w010vw4ajvh1zpni7szxv9rpm6jk2y9hp7qyi67zbgjjgc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c416822d54df436f29dcf9a5f26398685fdc17a2/recipes/glsl-mode";
@@ -28390,12 +27844,12 @@
gmpl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "gmpl-mode";
- version = "20151116.1149";
+ version = "20171031.1354";
src = fetchFromGitHub {
owner = "cute-jumper";
repo = "gmpl-mode";
- rev = "a4481bcbd84f67cd87e7bc87456b6f5b3a95fcf6";
- sha256 = "0w9dfxpiwwfk1iy83a214xpvqf858k668xkcdr2n25bccg1i148y";
+ rev = "c5d362169819ee8b8e8954145daee7e260c54921";
+ sha256 = "00p2z6kbyc0bas21d1zygx7z49w6mf22y9kf1rcm9gqsnnadb4j9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c89a523f87db358c477e5840b0e043e9f253e640/recipes/gmpl-mode";
@@ -28478,8 +27932,8 @@
src = fetchFromGitHub {
owner = "lokedhs";
repo = "gnu-apl-mode";
- rev = "72f6a7fc9153d141494b19ca7ff2c0d1e35c2a16";
- sha256 = "12w5hnp5nnsy532kfwsp43n633k1n03hs1az6pd9sczjzhhz9ihb";
+ rev = "d79e519308727dec897f2574c938c6425b9a30c2";
+ sha256 = "1dr9wcj697d68dxg1026ggxvyvpxjdvydilmym3fhczijdpwm33y";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/369a55301bba0c4f7ce27f6e141944a523beaa0f/recipes/gnu-apl-mode";
@@ -28516,12 +27970,12 @@
gnuplot-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "gnuplot-mode";
- version = "20170727.1339";
+ version = "20171013.916";
src = fetchFromGitHub {
owner = "mkmcc";
repo = "gnuplot-mode";
- rev = "eafa9395771a5ceace503cf5922efac1df0f5ec5";
- sha256 = "03799c7gwblpwpinbahbp5l510lg6yi85cmpsahsncfvkwirp2rm";
+ rev = "601f6392986f0cba332c87678d31ae0d0a496ce7";
+ sha256 = "14f0yh1rjqc3337j4sbqzfb7pjim2c8a7wk1a73xkrdkmjn82vgb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d801a2e0ba5ae7c65b5d312fbf41261278a8b1ba/recipes/gnuplot-mode";
@@ -28558,12 +28012,12 @@
gnus-desktop-notify = callPackage ({ fetchFromGitHub, fetchurl, gnus ? null, lib, melpaBuild }:
melpaBuild {
pname = "gnus-desktop-notify";
- version = "20170305.1215";
+ version = "20171007.1235";
src = fetchFromGitHub {
owner = "wavexx";
repo = "gnus-desktop-notify.el";
- rev = "7d80d5e1894859e963584c55f570508fdf9c2ee0";
- sha256 = "1slj86f8c4pkl30xkv43vqwijd49nxya1bmhb8mqadncp3wapwr0";
+ rev = "52e5de0961ce0f6890d5e7f26bc05152b99d9979";
+ sha256 = "0r28hrlkji8z62nra71p0q6gvh21w90pyvmgskzjldmj78yjqbdj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/gnus-desktop-notify";
@@ -28597,25 +28051,6 @@
license = lib.licenses.free;
};
}) {};
- gnus-spotlight = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "gnus-spotlight";
- version = "20130901.735";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/gnus-spotlight.el?revision=2";
- sha256 = "1r6bck1hsvk39ccri1h128jj8zd0fh9bsrlp8ijb0v9f6x3cysw4";
- name = "gnus-spotlight.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/004d48a59063163bfe5fbc5311330893d1b3b41c/recipes/gnus-spotlight";
- sha256 = "065jcix6a4mxwq8wc8gkr0x9lxmn6hlvf0rqmhi8hb840km1syjx";
- name = "gnus-spotlight";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/gnus-spotlight";
- license = lib.licenses.free;
- };
- }) {};
gnus-summary-ext = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "gnus-summary-ext";
@@ -28707,8 +28142,8 @@
src = fetchFromGitHub {
owner = "nsf";
repo = "gocode";
- rev = "f1eef9a6ba005abb145d7b58fdd225e83a3c6a05";
- sha256 = "1hkr46ikrprx203i2yr6xds1bzxggblh7bg026m2cda6dxgpnsgw";
+ rev = "e990796e68a2ebfc099afed20b99e26d6b64061a";
+ sha256 = "1s2jpqy599fr5qzfvba5njrwx1n48vqjg20vibssn2kyyc3l42d3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/go-autocomplete";
@@ -28826,6 +28261,27 @@
license = lib.licenses.free;
};
}) {};
+ go-gen-test = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+ melpaBuild {
+ pname = "go-gen-test";
+ version = "20171022.2058";
+ src = fetchFromGitHub {
+ owner = "s-kostyaev";
+ repo = "go-gen-test";
+ rev = "44c202ac97e728e93a35cee028a0ea8dd6e4292c";
+ sha256 = "1vi5xsf0xbcbvapi20hsjangwyp38cbgi8kiccpmingnq2kp8ghs";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/0861c126161a2674f0e115eac6f948490b142b44/recipes/go-gen-test";
+ sha256 = "1pj8n8xj9ccq9ips4wy4v6hdxxgwv11pwi671l6jjrig38v13dzr";
+ name = "go-gen-test";
+ };
+ packageRequires = [ emacs s ];
+ meta = {
+ homepage = "https://melpa.org/#/go-gen-test";
+ license = lib.licenses.free;
+ };
+ }) {};
go-gopath = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "go-gopath";
@@ -28854,8 +28310,8 @@
src = fetchFromGitHub {
owner = "dominikh";
repo = "go-mode.el";
- rev = "99b06da201afb91e8db0c525c0f3c3590fd92fa6";
- sha256 = "0ss6fpjnz3h3g4d1rjv50sknzr112c2r5zwzy2aqp7sw24cz10r2";
+ rev = "7eb5b3dd0ac31d176e9d56da4172f66aef8fae47";
+ sha256 = "1gx8hpgj9pbhpqqg1n5lby03bkg0llbkvb6pnidnfayh338amiqp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-guru";
@@ -28896,8 +28352,8 @@
src = fetchFromGitHub {
owner = "dominikh";
repo = "go-mode.el";
- rev = "99b06da201afb91e8db0c525c0f3c3590fd92fa6";
- sha256 = "0ss6fpjnz3h3g4d1rjv50sknzr112c2r5zwzy2aqp7sw24cz10r2";
+ rev = "7eb5b3dd0ac31d176e9d56da4172f66aef8fae47";
+ sha256 = "1gx8hpgj9pbhpqqg1n5lby03bkg0llbkvb6pnidnfayh338amiqp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-mode";
@@ -28980,8 +28436,8 @@
src = fetchFromGitHub {
owner = "dominikh";
repo = "go-mode.el";
- rev = "99b06da201afb91e8db0c525c0f3c3590fd92fa6";
- sha256 = "0ss6fpjnz3h3g4d1rjv50sknzr112c2r5zwzy2aqp7sw24cz10r2";
+ rev = "7eb5b3dd0ac31d176e9d56da4172f66aef8fae47";
+ sha256 = "1gx8hpgj9pbhpqqg1n5lby03bkg0llbkvb6pnidnfayh338amiqp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d806abe90da9a8951fdb0c31e2167bde13183c5c/recipes/go-rename";
@@ -29018,12 +28474,12 @@
go-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
melpaBuild {
pname = "go-snippets";
- version = "20151121.2257";
+ version = "20170831.2302";
src = fetchFromGitHub {
owner = "toumorokoshi";
repo = "go-snippets";
- rev = "983eb74025030bf6d405f1ed63be3162cc28a528";
- sha256 = "0di6xwpl6pi0430q208gliz8dgrzwqnmp997q7xcczbkk8zfwn0n";
+ rev = "7e38fc0ddf2cc786cdb273882ff9b3563abc3c7a";
+ sha256 = "0dsbp0x8qmv2k649x7l264zc8cv08dlrxz09lv643fchm56rsljm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ca9f3022e7f4d5391be394cd56f6db75c9cff3b6/recipes/go-snippets";
@@ -29190,8 +28646,8 @@
src = fetchFromGitHub {
owner = "golang";
repo = "lint";
- rev = "c5fb716d6688a859aae56d26d3e6070808df29f7";
- sha256 = "0bp9aarkinjr6m358qw9x4qxi3v9h06jvipyx1pg3pwsqh61vb12";
+ rev = "6aaf7c34af0f4c36a57e0c429bace4d706d8e931";
+ sha256 = "1z1j2l0j5175xvin5v56nsq7byg5nfpfvl9xgjszparchkyr8ndz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/34f22d829257456abbc020c006b92da9c7a7860e/recipes/golint";
@@ -29253,8 +28709,8 @@
src = fetchFromGitHub {
owner = "google";
repo = "styleguide";
- rev = "77f7f28d314862754877bf19a8b032158522f7aa";
- sha256 = "0354zk5j5fgin66vc9m63ca272bfq3vlqj5v34xqz26lqs3fpdb2";
+ rev = "ec88ff999b47a5adcd1b09cc8b49c793af337964";
+ sha256 = "0bmbia1h85d8nsl2gk6wfi0fxij0d8ha56f2h9kk2swv3w5yg1d7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/google-c-style";
@@ -29267,22 +28723,22 @@
license = lib.licenses.free;
};
}) {};
- google-contacts = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2 }:
+ google-contacts = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2 }:
melpaBuild {
pname = "google-contacts";
- version = "20170112.1022";
+ version = "20171027.1033";
src = fetchFromGitHub {
owner = "jd";
repo = "google-contacts.el";
- rev = "cf654c59b197a028eb8bf432d52776c2e0ad4135";
- sha256 = "1qrn9zqn25wpsrqbacamn3ixf90xmgxa8ifkday6cxn5ks0kgyj4";
+ rev = "a40389bae006ae094aeb1a39fae9891ca687c0fa";
+ sha256 = "06mfdmr3dlmk4gyq8fxqv78c5jyis8vxx4ih2azcr5c831pkayzi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/671afe0ff3889ae8c4b2d7b8617a3a25c16f3f0f/recipes/google-contacts";
sha256 = "0wgi244zy2am90alimgzazshk2z756bk1hchphssfa4j15n16jgn";
name = "google-contacts";
};
- packageRequires = [ oauth2 ];
+ packageRequires = [ cl-lib oauth2 ];
meta = {
homepage = "https://melpa.org/#/google-contacts";
license = lib.licenses.free;
@@ -29291,12 +28747,12 @@
google-maps = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "google-maps";
- version = "20161210.458";
+ version = "20171002.734";
src = fetchFromGitHub {
owner = "jd";
repo = "google-maps.el";
- rev = "956e6ad42bc3819bcaf4cc66a640f5079b385ed7";
- sha256 = "0dqcs9dl3170zddh4npsqm1ql0n0a0378gyqxk0vi0ibzch537vk";
+ rev = "c0e5dccfdc9f7f77ff8f29177547be47833d7156";
+ sha256 = "1agsfmbd2zbn1xs05kxlb32hhkmrri3hdmcrvf0w1fcsgc5a9085";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/671afe0ff3889ae8c4b2d7b8617a3a25c16f3f0f/recipes/google-maps";
@@ -29393,22 +28849,22 @@
license = lib.licenses.free;
};
}) {};
- gorepl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ gorepl-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, s }:
melpaBuild {
pname = "gorepl-mode";
- version = "20151121.422";
+ version = "20170905.245";
src = fetchFromGitHub {
owner = "manute";
repo = "gorepl-mode";
- rev = "17e025951f5964a0542a4b353ddddbc734c01eed";
- sha256 = "1abb78xxsggawl43hspl0cr0f7i1b3jd9r6xl1nl5jg97i4byg0b";
+ rev = "bbd27f6a0a77f484e2a3f082d70dc69da63ae52a";
+ sha256 = "01lqirxgw7svxy1fdv49mvcbhpslf64in6c4dk36b8xhngyqbilf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/gorepl-mode";
sha256 = "0xcjjh9hf3pv5jgv089c6bb00s215fc9qwn72fav1xbm5f49nkaq";
name = "gorepl-mode";
};
- packageRequires = [ emacs ];
+ packageRequires = [ emacs f hydra s ];
meta = {
homepage = "https://melpa.org/#/gorepl-mode";
license = lib.licenses.free;
@@ -29417,12 +28873,12 @@
gotest = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild, s }:
melpaBuild {
pname = "gotest";
- version = "20170811.0";
+ version = "20170823.141";
src = fetchFromGitHub {
owner = "nlamirault";
repo = "gotest.el";
- rev = "22f54d6c00c48f38a04a74990db501946405c1a8";
- sha256 = "1p69i0w7gbc3fmgwx5mhb30qp7zfgh7sfk7jdvd7270k0nixs7qr";
+ rev = "8a5ef7363f83edb3b77c5e23876f13dd8c23b2b9";
+ sha256 = "1ksi37kmy9mnrjr5lf9f0ga5nvi3r2kc85g6yvdfj0mbsjm1pnp7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0670b42c0c998daa7bf01080757976ac3589ec06/recipes/gotest";
@@ -29438,12 +28894,12 @@
gotham-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "gotham-theme";
- version = "20170521.417";
+ version = "20171013.1216";
src = fetchFromGitHub {
owner = "wasamasa";
repo = "gotham-theme";
- rev = "df428b477eb84f2ccd791c4310587cfd72644692";
- sha256 = "0ph5h08cx61nh70hafmnqzdcxb799fss0pl2d36hhimkf866zvln";
+ rev = "5e97554d1f9639698faedb0660e63694be33bd84";
+ sha256 = "18x0b2qmyzf9sddsv9ps1059pi4ndzq44rm4yl87slq03y75nxi9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4b388de872be397864a1217a330ba80437c287c0/recipes/gotham-theme";
@@ -29456,17 +28912,19 @@
license = lib.licenses.free;
};
}) {};
- goto-chg = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+ goto-chg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
pname = "goto-chg";
- version = "20131228.659";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/goto-chg.el?revision=9";
- sha256 = "078d6p4br5vips7b9x4v6cy0wxf6m5ij9gpqd4g33bryn22gnpij";
- name = "goto-chg.el";
+ version = "20170917.1200";
+ src = fetchFromGitHub {
+ owner = "emacs-evil";
+ repo = "goto-chg";
+ rev = "81fca94d2592cf32bab451c39a9cd2d9b03fbd6b";
+ sha256 = "033msplvpahkva9ha09gsg9232fyz2bjihrdxaa2z9g4yzql8jkq";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/529897b0c076d9031e7ecd13c945d2104ce8c735/recipes/goto-chg";
- sha256 = "0fs0fc1mksbb1266sywasl6pppdn1f9a4q9dwycl9zycr588yjyv";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/cf1fc176430fe3ab55ce537a0efc59780bb812be/recipes/goto-chg";
+ sha256 = "1yd4jq4zql4av9nr1sdk4nsnnk54c3brgjhpczndy1ipiaxlnydy";
name = "goto-chg";
};
packageRequires = [];
@@ -29520,12 +28978,12 @@
govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }:
melpaBuild {
pname = "govc";
- version = "20170801.942";
+ version = "20170919.645";
src = fetchFromGitHub {
owner = "vmware";
repo = "govmomi";
- rev = "2cad15190b417804d82edb4981e7b3e62907c4ee";
- sha256 = "12zssdd23hm5l27lja8q8b78wzq8zwzx8sxpqaqsm53bq6w23jmp";
+ rev = "0572dd8bc01d059ec65475d2b15c3ed5bbce9eaa";
+ sha256 = "0rln9gzzk1kasxfdz2sbkivq2cy7c28djbpbshfw6z3i9sy7pvv8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc";
@@ -29562,12 +29020,12 @@
grab-mac-link = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "grab-mac-link";
- version = "20170228.1039";
+ version = "20170822.2321";
src = fetchFromGitHub {
owner = "xuchunyang";
repo = "grab-mac-link.el";
- rev = "8bf05a69758fd10a4303c5c458cd91a49ab8b1b2";
- sha256 = "12x47k3mm5hvhgn7fmfi7bqfa3naz8w1sx6fl3rmnbzvldb89i1k";
+ rev = "fa23db288c93ff12d804939aa3c78e809169523e";
+ sha256 = "1r2rcxcipyxdr16m8y93yc86vqxcmxamvkj60dg6ljsxg2lgvbx4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e4cc8a72a9f161f024ed9415ad281dbea5f07a18/recipes/grab-mac-link";
@@ -29650,8 +29108,8 @@
src = fetchFromGitHub {
owner = "Groovy-Emacs-Modes";
repo = "groovy-emacs-modes";
- rev = "606d6216c291c96f948e04ca481962c326771cf7";
- sha256 = "0hkxdasgj8jn5dy7yjk3grgvxldic1azclnip24kyrmn36471n6j";
+ rev = "c1e4cf8378bdd7e0d8205b2bcdcb3ff3e05ad8d2";
+ sha256 = "0jk0a0n43jabyn8shv2i0fzqcy2aw16hanjqcsfzmrv5881hzyy1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode";
@@ -29760,22 +29218,22 @@
license = lib.licenses.free;
};
}) {};
- graphql-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ graphql-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
melpaBuild {
pname = "graphql-mode";
- version = "20170625.652";
+ version = "20171102.1606";
src = fetchFromGitHub {
owner = "davazp";
repo = "graphql-mode";
- rev = "3c25bf5cbd5ba4c60dca9c96286412eb765de7c9";
- sha256 = "09y7w6nipg1f59xrdpzmjiynyvjzkyhkmrpc5mbvz1lavkplh6rd";
+ rev = "1f3bd34b18a41dbda75a0baee38aa0f0f1fffb7a";
+ sha256 = "16cqncjyai3kak9p108c85d8jp0n83jpfijkwjv8nx2s5wyw57dx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3850073e6706d4d8151bc6ab12963a19deae8be9/recipes/graphql-mode";
sha256 = "074dc8fgbrikb5inv837n9bpmz1ami7aaxsqcci1f94x3iw8i74i";
name = "graphql-mode";
};
- packageRequires = [ emacs ];
+ packageRequires = [ emacs request ];
meta = {
homepage = "https://melpa.org/#/graphql-mode";
license = lib.licenses.free;
@@ -29784,12 +29242,12 @@
graphviz-dot-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "graphviz-dot-mode";
- version = "20151127.621";
+ version = "20171103.127";
src = fetchFromGitHub {
owner = "ppareit";
repo = "graphviz-dot-mode";
- rev = "fdaabbcc95d9156e3dadc84f81a4750c5b692580";
- sha256 = "1s1qh5r0xp6hs0rl5yz5mkmjhpg04bh449c7vgjbb1pjsl1dl714";
+ rev = "c456a2b65c734089e6c44e87209a5a432a741b1a";
+ sha256 = "0j1r2rspaakw37b0mx7pwpvdsvixq9sw3xjbww5piihzpdxz58z1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6e2f1e66b33fd95142be4622c996911e38d56281/recipes/graphviz-dot-mode";
@@ -29843,6 +29301,48 @@
license = lib.licenses.free;
};
}) {};
+ grayscale-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "grayscale-theme";
+ version = "20171005.102";
+ src = fetchFromGitHub {
+ owner = "belak";
+ repo = "emacs-grayscale-theme";
+ rev = "53ad50e10e68f2f076ebfc96e10ecef7a932d38d";
+ sha256 = "034pa35cjl07bhqdyw3xrcl97xcdg7jg0jvgn034fs3hssmsyxgv";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/2993881c7285cfbfc590b4118db46bfd435817bc/recipes/grayscale-theme";
+ sha256 = "0jbzb1zxv5mg3pivii31d4kz75igm339nw4cmx9kgzia9zal5f1r";
+ name = "grayscale-theme";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/grayscale-theme";
+ license = lib.licenses.free;
+ };
+ }) {};
+ green-is-the-new-black-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "green-is-the-new-black-theme";
+ version = "20171005.1641";
+ src = fetchFromGitHub {
+ owner = "fredcamps";
+ repo = "green-is-the-new-black-emacs";
+ rev = "b9cdecd04691311c30c94ad4ec81124e63b9b122";
+ sha256 = "124q733rirc8a2d9xfparphcjrrbxhp4wxf070l8hqp3p2764bka";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/3e42528d5677fd90515cad47266c07ea3d4363fb/recipes/green-is-the-new-black-theme";
+ sha256 = "03q0vj409icmawffy2kd9yl04r453q80cy1p9y4i3xk368z0362g";
+ name = "green-is-the-new-black-theme";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/green-is-the-new-black-theme";
+ license = lib.licenses.free;
+ };
+ }) {};
green-phosphor-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "green-phosphor-theme";
@@ -29867,12 +29367,12 @@
green-screen-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "green-screen-theme";
- version = "20170209.1208";
+ version = "20170824.728";
src = fetchFromGitHub {
owner = "rbanffy";
repo = "green-screen-emacs";
- rev = "e47e3eb903b4d9dbcc66342d91915947b35e5e1e";
- sha256 = "0gv434aab9ar624l4r7ky4ksvkchzlgj8pyvkc73kfqcxg084pdn";
+ rev = "05a9641d4f7354be7ff1b8dd34cbe5ef7054348c";
+ sha256 = "036l9rbp7p9bf7wb85zr4ykyxiippiwlq53vk30lvkpwbv9vc5qz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/821744ca106f1b74941524782e4581fc93800fed/recipes/green-screen-theme";
@@ -29906,25 +29406,6 @@
license = lib.licenses.free;
};
}) {};
- grep-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "grep-plus";
- version = "20170223.728";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/grep+.el";
- sha256 = "0jx2r21x8ndikvn8zvdnmwg8al56yi9gb0fcmplc3lnq4my6xcjr";
- name = "grep+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/grep+";
- sha256 = "1qj4f6d3l88bdcnq825pylnc76m22x2i15yxdhc2b6rv80df7zsx";
- name = "grep-plus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/grep+";
- license = lib.licenses.free;
- };
- }) {};
greymatters-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "greymatters-theme";
@@ -30010,12 +29491,12 @@
groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "groovy-mode";
- version = "20170810.919";
+ version = "20171024.221";
src = fetchFromGitHub {
owner = "Groovy-Emacs-Modes";
repo = "groovy-emacs-modes";
- rev = "606d6216c291c96f948e04ca481962c326771cf7";
- sha256 = "0hkxdasgj8jn5dy7yjk3grgvxldic1azclnip24kyrmn36471n6j";
+ rev = "c1e4cf8378bdd7e0d8205b2bcdcb3ff3e05ad8d2";
+ sha256 = "0jk0a0n43jabyn8shv2i0fzqcy2aw16hanjqcsfzmrv5881hzyy1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode";
@@ -30073,12 +29554,12 @@
gruvbox-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "gruvbox-theme";
- version = "20170809.719";
+ version = "20170923.2008";
src = fetchFromGitHub {
owner = "Greduan";
repo = "emacs-theme-gruvbox";
- rev = "061bad7cbb939540a559b412b1cf2df25b45cbff";
- sha256 = "0wrqjmdipg515idi385d2yk0vxsq5dkdd0qg743ia90kndcfbwda";
+ rev = "4241935d9cc786d0b4a3a445830c395f2a9eeb90";
+ sha256 = "1x624xc2756pmb4h5ayls8r16zy33d9vxr0as4jm6q682h2swir6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd48c87919f64ced9f3add4860751bb34cb5ecb/recipes/gruvbox-theme";
@@ -30115,12 +29596,12 @@
gscholar-bibtex = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "gscholar-bibtex";
- version = "20170713.1934";
+ version = "20170913.1457";
src = fetchFromGitHub {
owner = "cute-jumper";
repo = "gscholar-bibtex";
- rev = "655bccf0b12c9d95ec992ee4bfb5c7c9a4d0c99b";
- sha256 = "1ivdq3mgym14v5hpv938248vifw1xk9z16d2f38d9xj01icik522";
+ rev = "ba4ce159e385d695d8560e8b06b3cbe48424861c";
+ sha256 = "0idnfhk17avp0r4706grjqqkz0xl98gs0bx7wrkvwym3y2gadlz2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9fa546d3dce59b07a623ee83e3befe139dc10481/recipes/gscholar-bibtex";
@@ -30220,12 +29701,12 @@
guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }:
melpaBuild {
pname = "guix";
- version = "20170803.703";
+ version = "20171031.1241";
src = fetchFromGitHub {
owner = "alezost";
repo = "guix.el";
- rev = "f85e1bc2666a9d668c808984757862c9aa93d269";
- sha256 = "00iggj2vnjf3sy276mq79ia86ll83p9g426miy3n6ig8pr333sz4";
+ rev = "b11ddb65044468a1d1d7091ee9636aab7b13afed";
+ sha256 = "0jhmc2s1xbr5dnmckszx8j0i3kfj7n868xw1d6sqplm7i0r0wm8s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix";
@@ -30325,12 +29806,12 @@
habitica = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "habitica";
- version = "20170203.2122";
+ version = "20171022.1922";
src = fetchFromGitHub {
owner = "abrochard";
repo = "emacs-habitica";
- rev = "f3e326b7342953ffd5d3ced9266b46387b2bf9ce";
- sha256 = "0aixxlfp04vmipki7r7aqid2lsrzy7d38g09qc1hrjjdba7jrjlp";
+ rev = "e51ff7436fe1da10404e2c0872b15d6a7a926717";
+ sha256 = "1hiiqf82nagnpq2qdcdv6y2blfiqs6f8ia8k66a4zn5xgwpd13f4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cf9543db3564f4806440ed8c5c30fecbbc625fa1/recipes/habitica";
@@ -30388,12 +29869,12 @@
hackernews = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
melpaBuild {
pname = "hackernews";
- version = "20160627.1651";
+ version = "20170930.1313";
src = fetchFromGitHub {
owner = "clarete";
repo = "hackernews.el";
- rev = "629fe18abbef6674821876ed089c4fa83b709d1b";
- sha256 = "1s3ybiifbszp7v3gznh9f78dzwb1smdq3hb8np9swjr2fzcshwl4";
+ rev = "520e8dca91b8c2bc1de852f577af46ed1b7cabcd";
+ sha256 = "0951vb08sjpxx28cpaa8njirjw6fml60m91wa146cnxpngd68w6b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c43a342e47e5ede468bcf51a60d4dea3926f51bd/recipes/hackernews";
@@ -30493,12 +29974,12 @@
haml-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "haml-mode";
- version = "20170624.2148";
+ version = "20170923.2153";
src = fetchFromGitHub {
owner = "nex3";
repo = "haml-mode";
- rev = "c7c96a269f9b1a0302ff81360e1b5e693d784774";
- sha256 = "0lh9m0598rmwx9qacb6wjd12hf6njx7r1srl25bw60fs1l5bnvqd";
+ rev = "1cbb2de8f0fc25f35448c5cad04642f28078f3bb";
+ sha256 = "1045bf7bq914d3577kg9xakm4yciwwsvlh5qwfk4wnsraf7rld0r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/haml-mode";
@@ -30640,16 +30121,16 @@
harvest = callPackage ({ fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, s, swiper }:
melpaBuild {
pname = "harvest";
- version = "20160811.1810";
+ version = "20170822.1046";
src = fetchFromGitHub {
owner = "kostajh";
repo = "harvest.el";
- rev = "384e1ae10dcbdec4a1e2097094a8160507ea46a6";
- sha256 = "1bvgca35gl2daccpmhaa4q166iyaqachyd2k8n9vd6hlbbn4rrgl";
+ rev = "7acbc0564b250521b67131ee2a0a92720239454f";
+ sha256 = "0wzv67kkfyaw19ddw0ra45p6rja6bk6d1xi3ak5lkyzvgqvylr3b";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/b1dcfc8f0759792367ee49d2fe96e5bd7ca4105f/recipes/harvest";
- sha256 = "1qfhfzjwlnqpbq4kfxvs97fa3xks8zi02fnwv0ik8wb1ppbb77qd";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/c97d3f653057eab35c612109792884334be556fe/recipes/harvest";
+ sha256 = "1r6brld6iq03wsr1b3jhdkxwrcxa6g6fwa1jiy1kgjsr9dq1m51c";
name = "harvest";
};
packageRequires = [ hydra s swiper ];
@@ -30724,12 +30205,12 @@
haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "haskell-mode";
- version = "20170810.1519";
+ version = "20171022.26";
src = fetchFromGitHub {
owner = "haskell";
repo = "haskell-mode";
- rev = "783ea06cab61e16b86bb434d3c8a61076f564bb7";
- sha256 = "0ypb3qilcnphxhsaskib5h8n4m2ivwka116jnjpdjrgwh838aakp";
+ rev = "9018ad5cac0b1b1b5e0a51586027fb0ca4076b1a";
+ sha256 = "0aj6mjv1i8m18klj9mp690fkmwc81wxh2q69cxjf78fdpgbrhcwl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode";
@@ -30786,12 +30267,12 @@
hasky-extensions = callPackage ({ avy-menu, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "hasky-extensions";
- version = "20170520.149";
+ version = "20170830.625";
src = fetchFromGitHub {
owner = "hasky-mode";
repo = "hasky-extensions";
- rev = "f0c6a4d07bd18b39010a4bc28340aff4ceebf785";
- sha256 = "15926zw2sj180svn53fmb1x8x8aw7754anbaxb8xbcpg2zrkspbh";
+ rev = "65bf7bc3967cbda23789d6c505daf73eed9a43aa";
+ sha256 = "0r91hcm265xa8amdfi44pn0cqf4m9zigzqx1ldgg8qd6l9r2hbh7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e3f73e3df8476fa231d04211866671dd74911603/recipes/hasky-extensions";
@@ -30807,12 +30288,12 @@
hasky-stack = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }:
melpaBuild {
pname = "hasky-stack";
- version = "20170814.417";
+ version = "20170928.359";
src = fetchFromGitHub {
owner = "hasky-mode";
repo = "hasky-stack";
- rev = "bbbe58bf11f0188dfc71d3786a1bef73b9650fba";
- sha256 = "0x31qljrp83r3c34j0npjw49sy491la894x8g8vh5gbih8xd72jm";
+ rev = "a3f890fb8570369898ee9718b128d4e7123a6585";
+ sha256 = "0bc5i4s7aclwrsh8yrhfwwlfbcs5hdbzm31glikd487asv30jq9c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c3faf544872478c3bccf2fe7dc51d406031e4d80/recipes/hasky-stack";
@@ -30971,25 +30452,6 @@
license = lib.licenses.free;
};
}) {};
- header2 = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "header2";
- version = "20170223.729";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/header2.el?revision=69";
- sha256 = "0cv74cfihr13jrgyqbj4x0na659djfyrhflxni6jdbgbysi4zf6k";
- name = "header2.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/header2";
- sha256 = "1vvxb850njn921djvnf76q1p045sqr5hqk6v0p0amvjvih48v0zx";
- name = "header2";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/header2";
- license = lib.licenses.free;
- };
- }) {};
headlong = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "headlong";
@@ -31014,12 +30476,12 @@
helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
melpaBuild {
pname = "helm";
- version = "20170814.46";
+ version = "20171106.429";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm";
- rev = "80dada6a077b29e2f05371b320ac4fcf7ab43b65";
- sha256 = "10902xi9l4564qm4qv5vnw06xqgwl30i3cs9p6amlwcfcppwfmd4";
+ rev = "5eae983b6490fe0ad553a1833be5f8ee7aef7a05";
+ sha256 = "1qds2qw4jnfb5xvqczswylc83q5fams9lhk0bz8zy6a2j01s99w0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -31095,6 +30557,27 @@
license = lib.licenses.free;
};
}) {};
+ helm-addressbook = callPackage ({ addressbook-bookmark, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+ melpaBuild {
+ pname = "helm-addressbook";
+ version = "20170903.28";
+ src = fetchFromGitHub {
+ owner = "emacs-helm";
+ repo = "helm-addressbook";
+ rev = "62497f72d46afd3a9f9f94b27d062a82fb232de4";
+ sha256 = "1lmq7j19qv3pabs5arapx3lv2xhf0sgn4b2hl0l0kzph52fvics7";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/4bb805b0f2d2055aa4e88bd41239d75ec34f5785/recipes/helm-addressbook";
+ sha256 = "1d8byi6sr5gz1rx3kglnkp47sn9dqdd83s12d84wyay06ix3cqqi";
+ name = "helm-addressbook";
+ };
+ packageRequires = [ addressbook-bookmark cl-lib emacs helm ];
+ meta = {
+ homepage = "https://melpa.org/#/helm-addressbook";
+ license = lib.licenses.free;
+ };
+ }) {};
helm-ag = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-ag";
@@ -31224,12 +30707,12 @@
helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }:
melpaBuild {
pname = "helm-bibtex";
- version = "20170808.1124";
+ version = "20171022.220";
src = fetchFromGitHub {
owner = "tmalsburg";
repo = "helm-bibtex";
- rev = "8ed898fb5a68f18e9bb9973832a5c1f8abcfc463";
- sha256 = "14lyx0vbqr97p3anzrsp7m3q0kqclyjcdwplpraim403fcklzbnz";
+ rev = "54de08577f9c19354cc303ee52836263aef486fb";
+ sha256 = "0l98lmy0c9l64khnl9j87l5g9g5fiah5l64hxn97h4b438kjcjm0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex";
@@ -31333,8 +30816,8 @@
src = fetchFromGitHub {
owner = "masutaka";
repo = "emacs-helm-bundle-show";
- rev = "b34523aa8a7f82ed9a1bf3643c35b65866a7877a";
- sha256 = "1j9xmlidipsfbz0kfxwz0c6hi9xsbk36h6i30wqdd0ls0zw5xm30";
+ rev = "850fecb36f609f1dfd5d20ca0170c9a6b7f90ab9";
+ sha256 = "06xi91dy88qnqwqsknhf695324vsiz1vn2fmwl6llywa03k0xnl1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2f10f7387cca102696c38af1d8dc0fe5da5e366f/recipes/helm-bundle-show";
@@ -31623,12 +31106,12 @@
helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "helm-core";
- version = "20170810.2231";
+ version = "20171103.2225";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm";
- rev = "80dada6a077b29e2f05371b320ac4fcf7ab43b65";
- sha256 = "10902xi9l4564qm4qv5vnw06xqgwl30i3cs9p6amlwcfcppwfmd4";
+ rev = "5eae983b6490fe0ad553a1833be5f8ee7aef7a05";
+ sha256 = "1qds2qw4jnfb5xvqczswylc83q5fams9lhk0bz8zy6a2j01s99w0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -31686,15 +31169,15 @@
helm-ctest = callPackage ({ dash, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, s }:
melpaBuild {
pname = "helm-ctest";
- version = "20150823.408";
+ version = "20171101.934";
src = fetchFromGitHub {
owner = "danlamanna";
repo = "helm-ctest";
- rev = "973a138aa8ff4c6a1cd798779e8d0dd80522354d";
- sha256 = "18d96alik66nw3rkk7k8740b4rx2bnh3pwn27ahpgj5yf51wm0ry";
+ rev = "6de962e355e12a69e4aeaf6484f497e28b2e8a68";
+ sha256 = "0nd1ij7iqf02hni4d77mndbxi8w27vawjd9b3d7fia22vdsha040";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/03e17f3700cc531133990bc78ade09132f439664/recipes/helm-ctest";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/1cc85ff5554df10fc2066eec4d90de3b25536923/recipes/helm-ctest";
sha256 = "1mphc9fsclbw19p5i1xf52qg6ljljbajvbcsl95hisrnvhg89vpm";
name = "helm-ctest";
};
@@ -31707,12 +31190,12 @@
helm-dash = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-dash";
- version = "20170531.135";
+ version = "20171017.342";
src = fetchFromGitHub {
owner = "areina";
repo = "helm-dash";
- rev = "9a230125a7a11f5fa90aa048b61abd95eb78ddfe";
- sha256 = "0xs3nq86qmvkiazn5w564npdgbcfjlnpw2f48g2jd43yznblz7ly";
+ rev = "08961190b3982dcb8c359e633daba556a6d92ce3";
+ sha256 = "1vdrfykhcfnmm254gd3aqypk9hfl0fcml1nc0wxmdjlimlsxadc3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-dash";
@@ -31959,12 +31442,12 @@
helm-ext = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-ext";
- version = "20170411.1049";
+ version = "20171101.1231";
src = fetchFromGitHub {
owner = "cute-jumper";
repo = "helm-ext";
- rev = "fe50af14eebc9be72b026e823facfd0a80593248";
- sha256 = "1pz7i1byscfq2j73cfgcjqdx8s14h9qxnfmvs5g00m0y3g25hhc0";
+ rev = "c8ac56918b200239b3f73a4e6a031deecc2c5646";
+ sha256 = "08c6n4zr6s3h7y0kk6g51xqs6hs29hkfmn55jfjw6hpimbk3vi1j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1ee74cb0aa3445bc9ae4226c2043ee4de3ac6cd3/recipes/helm-ext";
@@ -32148,12 +31631,12 @@
helm-fuzzy-find = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-fuzzy-find";
- version = "20150613.349";
+ version = "20171105.2000";
src = fetchFromGitHub {
owner = "xuchunyang";
repo = "helm-fuzzy-find";
- rev = "daf24bc236dafa4f4be45f1621e11dbc9f304b64";
- sha256 = "1yxnmxq6ppfgwxrk5ryc5xfn82kjf4j65j14hy077gphr0q61q6a";
+ rev = "de2abbf7ca13609587325bacd4a1ed4376b5c927";
+ sha256 = "1dacvnkqqiax02c627z9qi61iyqgr0j3qqmjp29h0v494czvrdbs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/34f76bb377ed31aa42663858c407cc5476e6fe1f/recipes/helm-fuzzy-find";
@@ -32194,8 +31677,8 @@
src = fetchFromGitHub {
owner = "masutaka";
repo = "emacs-helm-ghq";
- rev = "21ccdb537a3be3d9351e01c6365df8e804e8bc56";
- sha256 = "1v3h6dszj223yvlkrjj6r4jwiyaj3iswbcl5d4ffwgaf72cxm4gn";
+ rev = "49481685adbb25b3f766aabfdb7472becc673a94";
+ sha256 = "1gxb4cqfzkdag8v6id7bvlv0bvqbfl8mdxphll4pkf1nqj9fk69j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e94eec646def7c77b15f6a6ac1841200848e62c7/recipes/helm-ghq";
@@ -32215,8 +31698,8 @@
src = fetchFromGitHub {
owner = "iory";
repo = "emacs-helm-ghs";
- rev = "f9d4ab80e8a33b21cd635285289ec5779bbe629f";
- sha256 = "0f7wsln7z2dhqn334pjk6hrj36gvx39vg19g8ds9sj9dq9djlf27";
+ rev = "17a70bf16255d90d67c8350e88200ec8bfd47563";
+ sha256 = "1jc51anmkr44db4kbcwza17x3ln78ihpslrf2v9xs0sq0ggw1rva";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0f8d37030806905344a2ca56bfc469f5a238cd69/recipes/helm-ghs";
@@ -32463,12 +31946,12 @@
helm-hatena-bookmark = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-hatena-bookmark";
- version = "20160528.614";
+ version = "20170821.646";
src = fetchFromGitHub {
owner = "masutaka";
repo = "emacs-helm-hatena-bookmark";
- rev = "8350a600d3e03f1ec7dc899cc0b2e323b12518bb";
- sha256 = "0hmvyyhddpf831cad35c9z9fv5mpdq6qg4nzbdghlqs9pf7ik6h2";
+ rev = "ee0d2554f573779210b0e2595e539b3e28461f1d";
+ sha256 = "12qb9jnqa2nl3asfa178ijjrrxkrwddlxf6y6m0d79j2fnqrgbr6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3e9335ad16d4151dd4970c4a3ad1fee9a84404fa/recipes/helm-hatena-bookmark";
@@ -32691,6 +32174,27 @@
license = lib.licenses.free;
};
}) {};
+ helm-js-codemod = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm-core, js-codemod, lib, melpaBuild }:
+ melpaBuild {
+ pname = "helm-js-codemod";
+ version = "20171106.244";
+ src = fetchFromGitHub {
+ owner = "torgeir";
+ repo = "helm-js-codemod.el";
+ rev = "18503d94e64418e8ea5c5854f197ae9f3009cdbf";
+ sha256 = "0d5fsvfa017gda0jryjdvva1q04nry6grc1433gvgrqqp6vxayxc";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/dd005bfb170df2f0c992043130a5e9588dcf4d77/recipes/helm-js-codemod";
+ sha256 = "1m07xh97fjyah8di363yalg9f5g5rfr3k5mbjql3n67lfwgxrz94";
+ name = "helm-js-codemod";
+ };
+ packageRequires = [ emacs helm-core js-codemod ];
+ meta = {
+ homepage = "https://melpa.org/#/helm-js-codemod";
+ license = lib.licenses.free;
+ };
+ }) {};
helm-jstack = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-jstack";
@@ -32736,12 +32240,12 @@
helm-lastpass = callPackage ({ csv, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
melpaBuild {
pname = "helm-lastpass";
- version = "20170808.511";
+ version = "20170914.142";
src = fetchFromGitHub {
owner = "xuchunyang";
repo = "helm-lastpass";
- rev = "3d07a1d68586980ae33dd7f84be00eaace31f7d2";
- sha256 = "1rn19hql62fgz1kiyxyw11h3h9m38nnhba9sghlrxj3wk11fm8gs";
+ rev = "ae5d1252d60450082a5c26af3ad2be43994201ec";
+ sha256 = "0qlcy8g9m3mfnr6p7kax6i1bq0dsxpz22vy5zjp24farx96mj5mi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a39f1b0a5b22e91eb9e298949def6c29e7bc5755/recipes/helm-lastpass";
@@ -32754,6 +32258,27 @@
license = lib.licenses.free;
};
}) {};
+ helm-lean = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, helm, lean-mode, lib, melpaBuild }:
+ melpaBuild {
+ pname = "helm-lean";
+ version = "20171102.754";
+ src = fetchFromGitHub {
+ owner = "leanprover";
+ repo = "lean-mode";
+ rev = "c0af876c967fc969d67c467bc6767210d19c5d87";
+ sha256 = "04qzck156wb2bvrb8adbn7rx2v0bsjcirlbx4ajajjsqy858ayn9";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/42f4d6438c8aeb94ebc1782f2f5e2abd17f0ffde/recipes/helm-lean";
+ sha256 = "0j5ax14lhlyd9mpqk1jwh7nfp090kj71r045v2qjfaw2fa23b7si";
+ name = "helm-lean";
+ };
+ packageRequires = [ dash emacs helm lean-mode ];
+ meta = {
+ homepage = "https://melpa.org/#/helm-lean";
+ license = lib.licenses.free;
+ };
+ }) {};
helm-lobsters = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-lobsters";
@@ -32761,8 +32286,8 @@
src = fetchFromGitHub {
owner = "julienXX";
repo = "helm-lobste.rs";
- rev = "4121b232aeded2f82ad2c8a85c7dda17ef9d97bb";
- sha256 = "0nkmc17ggyfi7iz959mvzh6q7116j44zqwi7ydm9i8z49xfpzafy";
+ rev = "53c5b42baf72776dcba891fc3d7cd7d47721e9b0";
+ sha256 = "1ic0pcr7cfrfalb7760viixz5gfdg5hfazzwfhhw08vx44xx0jk4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6247e3786131e5b2a7824804e49927ed65d266d5/recipes/helm-lobsters";
@@ -32817,18 +32342,19 @@
license = lib.licenses.free;
};
}) {};
- helm-ls-svn = callPackage ({ cl-lib ? null, emacs, fetchsvn, fetchurl, helm, lib, melpaBuild }:
+ helm-ls-svn = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-ls-svn";
version = "20150717.39";
- src = fetchsvn {
- url = "https://svn.macports.org/repository/macports/users/chunyang/helm-ls-svn.el";
- rev = "154482";
+ src = fetchFromGitHub {
+ owner = "emacsorphanage";
+ repo = "helm-ls-svn";
+ rev = "4d4dc1a272f27fba5fdd7cc47e5d309b53c63ae3";
sha256 = "0b7gah21rkfd43mb89lrwaqrrwq646abh7wi4q74sx796gmpz4dz";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/99cc183c09b97264d243b4fe036574ce9c6b9687/recipes/helm-ls-svn";
- sha256 = "08mwzi340akw4ar20by0q981mzmzvf0wz3mn738q4inn2kqgs60d";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/helm-ls-svn";
+ sha256 = "0rqsy6gk114khqr28bp2fi0ixaa8wbqd952yxph517p1pbfwxy66";
name = "helm-ls-svn";
};
packageRequires = [ cl-lib emacs helm ];
@@ -32840,12 +32366,12 @@
helm-make = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }:
melpaBuild {
pname = "helm-make";
- version = "20170430.1053";
+ version = "20171103.1155";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "helm-make";
- rev = "8bb531fa77fe1259cccdc2fa7629d65989684f16";
- sha256 = "1vvdk2f41aqhcb8hawk0x17ix1fyanvx3m2zd398lhv3r6mll0r4";
+ rev = "feae8df22bc4b20705ea08ac9adfc2b43bb348d0";
+ sha256 = "1y2v77mmd1bfkkz51cnk1l0dg3lvvxc39wlamnm7wjns66dbvlam";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0f25f066c60d4caff1fbf885bc944cac47515ec8/recipes/helm-make";
@@ -32924,12 +32450,12 @@
helm-mu = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-mu";
- version = "20161010.102";
+ version = "20171027.933";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm-mu";
- rev = "1f9a6b0f8217c0c6359f53b724d9da4c3c3f896c";
- sha256 = "0ch0zip9ldsza3vq66hs8kyczlhdywr2i9sqkza4inm8b938y1dv";
+ rev = "cda769ef48e1e11e3b21cdafa85adb8e36384d78";
+ sha256 = "0s7v2hdrsd3xmdw0iwd3zqpdj3zp3z0akcyyw3cicpmic7wrcc75";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/63ee2e2aa622c96993c1b705d0fd223d6b36fd0f/recipes/helm-mu";
@@ -32970,8 +32496,8 @@
src = fetchFromGitHub {
owner = "travisbhartwell";
repo = "nix-emacs";
- rev = "ace629f7645d12778c96ff7b5cf4b1e41a98af29";
- sha256 = "11infdrdjc30kxvfg5rh1zn4idvkhf9s0c6v60qn441m1d5bnavq";
+ rev = "7007363e773a419203a69798fb0e0731b2eb0f73";
+ sha256 = "00hv8fhyahkdh1vfy1qkahqvsik6d81c7mqh4gjiqxrmb2l1vbcb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6846c7d86e70a9dd8300b89b61435aa7e146be96/recipes/helm-nixos-options";
@@ -32987,12 +32513,12 @@
helm-notmuch = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, notmuch }:
melpaBuild {
pname = "helm-notmuch";
- version = "20170221.1208";
+ version = "20170903.2159";
src = fetchFromGitHub {
owner = "xuchunyang";
repo = "helm-notmuch";
- rev = "aac6b3ee2142515dc3f4b59f242cdfa2b012118c";
- sha256 = "10d2r9bksiq2v03fw6f44i30dk0hai12d1baygkci850m5n67irz";
+ rev = "782c221bf293eee55990de5b54171f08d881dcee";
+ sha256 = "04mlsjqhh2nw2javxz8m1hbnsq0s70dw5pnwdbx8s9dk1p8ikxvw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/98667b3aa43d3e0f6174eeef82acaf71d7019aac/recipes/helm-notmuch";
@@ -33033,8 +32559,8 @@
src = fetchFromGitHub {
owner = "alphapapa";
repo = "helm-org-rifle";
- rev = "1db8ee9b6c1f8341612216e715b048ab225dedec";
- sha256 = "0z9pcrb4xazv2a2m2kxy26kw0ai1lfnj53y967y40mrkbmsrsa6q";
+ rev = "502ea1285b8ce858a3acbc39dd4f54ff1af5b7e3";
+ sha256 = "1j87fd9qv7pl7s52ksj7iy023lw76qy4mkgjc4w5rljvm5bdnrgp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle";
@@ -33239,12 +32765,12 @@
helm-projectile = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }:
melpaBuild {
pname = "helm-projectile";
- version = "20170613.14";
+ version = "20170926.1123";
src = fetchFromGitHub {
owner = "bbatsov";
repo = "helm-projectile";
- rev = "0e9ba276b3fbc420b8cbdc1b99262ccd5c750db7";
- sha256 = "155df7jyhjgqdks3ba1ca1k8w8aqka9vv3nhzpkvgz7wj84c95pq";
+ rev = "4466adbcada8be19ec97b9dba52e12b8da3da849";
+ sha256 = "1a4s3vs2vh2dz31an7jjrbyli1dsqwl7qcd1r63ak87klzpqn98b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc4e3a5af7ba86d277c73a1966a91c87d3d855a/recipes/helm-projectile";
@@ -33344,12 +32870,12 @@
helm-qiita = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-qiita";
- version = "20160528.611";
+ version = "20170821.609";
src = fetchFromGitHub {
owner = "masutaka";
repo = "emacs-helm-qiita";
- rev = "45e38ae7b816da5db38412b2992c6d1c7a6cc30a";
- sha256 = "05394vf125qlgfrhkaqvly3340qp3zy7kldsnisms9gv0l1c60bq";
+ rev = "f00a61fc802d0f6442f07e7bd1c55fedf60f3895";
+ sha256 = "0z5xyb4kh3hwv8a869kgfx7hdzmja4ksvfkmc7v0xmxzjcg3nb7j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/37331f6cc8a95fd2b2ed5b20be0bcb604ea66dee/recipes/helm-qiita";
@@ -33537,8 +33063,8 @@
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "de1f11e68f6752b3ee6738287d4dadb11bca8f8a";
- sha256 = "1jsx08pgwrz6n47a0zs05m0h6knpp9sgg8lrdwg792a93nrcqc5c";
+ rev = "e413e31d1e74fae1fc1bf86792013c3680be6580";
+ sha256 = "0hfibc1nllsp9zdb803ac6cwp6xx4xf8mvjszfq9vp5a63sgw0pl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags";
@@ -33659,12 +33185,12 @@
helm-smex = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, smex }:
melpaBuild {
pname = "helm-smex";
- version = "20161202.1252";
+ version = "20171004.1308";
src = fetchFromGitHub {
owner = "ptrv";
repo = "helm-smex";
- rev = "7af4e4b44671f739b39584fc50c20084700701ac";
- sha256 = "1dhzglpd48mb47iyii8igb1dldvnr4alg18m7g8xb529dx8z9wni";
+ rev = "2269375dfa452b88b5170d1a5d5849ebb2c1e413";
+ sha256 = "0n2ki7g0hygsq4bi5zkhp3v772ld7niiajfznxmv11dgn949a52s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/85568bd732da952053148e07b95e53f7caf5f62c/recipes/helm-smex";
@@ -33764,12 +33290,12 @@
helm-swoop = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-swoop";
- version = "20160619.953";
+ version = "20170923.2127";
src = fetchFromGitHub {
owner = "ShingoFukuyama";
repo = "helm-swoop";
- rev = "6d3fdcfb6dea06242efc8ff4cafff9917e558bfc";
- sha256 = "1pjpzccviz95zgl86yw2xda7lhlsfdddf8la8di8rka8sz79nw72";
+ rev = "66a951700e0ef0621cc705791bdd6699488ab121";
+ sha256 = "1j1qmbj4g5z891i1xyz8p34mk63ckpl1j80pznbhvb9ffl9aw976";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-swoop";
@@ -33890,12 +33416,12 @@
helm-w3m = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, w3m }:
melpaBuild {
pname = "helm-w3m";
- version = "20170710.1238";
+ version = "20171102.216";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm-w3m";
- rev = "0af89108183ac11dcf75be06fe23a60ae072463f";
- sha256 = "0cjnlml9k1ak26v5j7qghpk2yj4rs37jlkpbn1m5y1j8231m472j";
+ rev = "8345b7e60702911f54eb6571e429c0d31878957d";
+ sha256 = "05izdvs8hwkkmz6hvlm2b5p5jmha39nsnnzzhnli70jrbqj013cq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f683fc9c7990e9ecb8a94808a7d03eb90c5569b1/recipes/helm-w3m";
@@ -33929,27 +33455,6 @@
license = lib.licenses.free;
};
}) {};
- helm-words = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "helm-words";
- version = "20150413.1318";
- src = fetchFromGitHub {
- owner = "pronobis";
- repo = "helm-words";
- rev = "637aa3a7e9cfd34e0127472c5b1f993a4da26185";
- sha256 = "19l8vysjygscr1nsddjz2yv0fjhbsswfq40rdny8zsmaa6qhpj35";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/f8c5b91762d47a4d3024f1ed7f19666c6f2d5ce5/recipes/helm-words";
- sha256 = "0l9mb7g3xzasna1bw2p7vh2wdg1hmjkff40p8kpqvwwzszdm9v76";
- name = "helm-words";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/helm-words";
- license = lib.licenses.free;
- };
- }) {};
helm-xcdoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-xcdoc";
@@ -33974,16 +33479,16 @@
helm-xref = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-xref";
- version = "20170725.546";
+ version = "20170822.1708";
src = fetchFromGitHub {
- owner = "brotzeitmacher";
+ owner = "brotzeit";
repo = "helm-xref";
- rev = "3197a66a605afa42957781cc7f97f6c614ecf02a";
- sha256 = "0nr4yg44qqr5ga8h1hc143953iyyswp2l9bfb5b5wwwzz42iz5cx";
+ rev = "af55df844aa65275c8f75d3a8705e13717fd3ee6";
+ sha256 = "0srjmz3xm6ycx5grjl7iqrnx5qlmg7n42i9wrb3i01zrjrjbqi7x";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/f39f3d09a8f00d0358653631a8643b6dd71a9bd1/recipes/helm-xref";
- sha256 = "157h2h2yw8calysa7jnyz7iy8s3ppqa6m35pl7wbgnzqx425cbny";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/6d1796688ed0d6957557d960ca28e450f9bcb6cf/recipes/helm-xref";
+ sha256 = "1wyh25gxqgsc151bv4j5l050z1cz0n3yq174m62ihi1fy1pkra4l";
name = "helm-xref";
};
packageRequires = [ emacs helm ];
@@ -34034,72 +33539,15 @@
license = lib.licenses.free;
};
}) {};
- help-fns-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "help-fns-plus";
- version = "20170223.733";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/help-fns+.el";
- sha256 = "0n7sdzvplcb0zivpjq9x75kaid59yxr7sl85w7z99irx3kgpy9y4";
- name = "help-fns+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/help-fns+";
- sha256 = "10vz7w79k3barlcs3ph3pc7914xdhcygagdk2wj3bq0wmwxa1lia";
- name = "help-fns-plus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/help-fns+";
- license = lib.licenses.free;
- };
- }) {};
- help-mode-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "help-mode-plus";
- version = "20170223.737";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/help-mode+.el";
- sha256 = "00yx1rhp7akap63c3nqh766zkjvfarmvm0xvza40i167wc7xmydg";
- name = "help-mode+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/help-mode+";
- sha256 = "1pmb845bxa5kazjpdxm12rm2wcshmv2cmisigs3kyva1pmi1shra";
- name = "help-mode-plus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/help-mode+";
- license = lib.licenses.free;
- };
- }) {};
- help-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "help-plus";
- version = "20170223.731";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/help+.el";
- sha256 = "0zypqsj940cmb8szbk5acv47kaj3czg6yplx1lg5dynhvab3p29f";
- name = "help+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/help+";
- sha256 = "1jx0wa4md1mvdsvjyx2yvi4hhm5w061qqcafsrw4axsz7gjpd4yi";
- name = "help-plus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/help+";
- license = lib.licenses.free;
- };
- }) {};
helpful = callPackage ({ dash, elisp-refs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "helpful";
- version = "20170722.522";
+ version = "20171103.1614";
src = fetchFromGitHub {
owner = "Wilfred";
repo = "helpful";
- rev = "d167ee6fd4fbaadc46aa50a96529dc234a4c37c2";
- sha256 = "04r090757jcaljr0bfvxjm45wf201cn04cr467ryh9k92gravlfj";
+ rev = "deb66c4978dd8197149e56d76b9ce3ebd72d98ed";
+ sha256 = "1c6i97l4z21aarjv16901il4irgmadvr42vamnzjr0mzhpki262b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful";
@@ -34112,6 +33560,27 @@
license = lib.licenses.free;
};
}) {};
+ hemera-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "hemera-theme";
+ version = "20170910.603";
+ src = fetchFromGitHub {
+ owner = "GuidoSchmidt";
+ repo = "emacs-hemera-theme";
+ rev = "354ae3b788c11ac08e6e2fe7c86adc621e2b16fd";
+ sha256 = "00cfi9gsn9fvjpgxkz931p02gs8dcgwwsaqz3anss9qadxxmi9xv";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/3440905a20bc91bb2637a87c04ff8410379f150d/recipes/hemera-theme";
+ sha256 = "0lxm06gv5f75s86320m8wh3dirdcspb6zd5n1a6l0pnn585xqkrn";
+ name = "hemera-theme";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/hemera-theme";
+ license = lib.licenses.free;
+ };
+ }) {};
hemisu-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "hemisu-theme";
@@ -34196,25 +33665,6 @@
license = lib.licenses.free;
};
}) {};
- hexrgb = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "hexrgb";
- version = "20170304.1213";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/hexrgb.el?revision=75";
- sha256 = "1aj1fsc3wr8174xs45j2wc2mm6f8v6zs40xn0r4qisdw0plmsbsy";
- name = "hexrgb.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hexrgb";
- sha256 = "0b8lzmyv91f5bg7n2wj50p1pv6hpd2wygjcrffg4wwa52lp24dzk";
- name = "hexrgb";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/hexrgb";
- license = lib.licenses.free;
- };
- }) {};
hfst-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "hfst-mode";
@@ -34299,25 +33749,6 @@
license = lib.licenses.free;
};
}) {};
- hide-comnt = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "hide-comnt";
- version = "20170223.739";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/hide-comnt.el?revision=25";
- sha256 = "1shkq45vm60nh2kkvf284nck8jwxh7f7m4c5d53k66mxn214h53m";
- name = "hide-comnt.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hide-comnt";
- sha256 = "0l3qvklyyc6hfinlzif7vfspl8b91ql0qdiwhixcilglyvad8r80";
- name = "hide-comnt";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/hide-comnt";
- license = lib.licenses.free;
- };
- }) {};
hide-lines = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "hide-lines";
@@ -34339,25 +33770,6 @@
license = lib.licenses.free;
};
}) {};
- hide-region = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "hide-region";
- version = "20140201.314";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/hide-region.el?revision=6";
- sha256 = "1zxrygpf47bzj6p808r3qhj3dfr3m8brp1xgxs33c7f88rinfval";
- name = "hide-region.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/c5fc294a4d0cfa74530c98d81149fd0501ea7efe/recipes/hide-region";
- sha256 = "0nsc6m3yza658xsxvjz8766vkp71rcm6vwnvcv225r2pr94mq7vm";
- name = "hide-region";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/hide-region";
- license = lib.licenses.free;
- };
- }) {};
hideshow-org = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "hideshow-org";
@@ -34379,34 +33791,15 @@
license = lib.licenses.free;
};
}) {};
- hideshowvis = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "hideshowvis";
- version = "20170227.1250";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/hideshowvis.el?revision=10";
- sha256 = "02a6v2m54r5nfbi54h1502aqh7gnz827pfi1sq266qyzj3p6yz12";
- name = "hideshowvis.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/881fd07512c417c0b98021af2a2c26eac4268a5f/recipes/hideshowvis";
- sha256 = "1ajr71fch3v5g8brb83kwmlakcam5w21i3yr8df00c5j2pnc6v1f";
- name = "hideshowvis";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/hideshowvis";
- license = lib.licenses.free;
- };
- }) {};
hierarchy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "hierarchy";
- version = "20170706.552";
+ version = "20171017.1103";
src = fetchFromGitHub {
owner = "DamienCassou";
repo = "hierarchy";
- rev = "98ba6d3d7744d536aee714e1284ffecfe8f590cc";
- sha256 = "1y8jj0xgj6hqqshcfr406216bpni5sj0bh9q52ds9mn5plmh4asa";
+ rev = "cd65d149b8910edfa5536eeda26988aabcfd511a";
+ sha256 = "0746wn62vwgnn4hg8ag0hq80hv7lwv929pjk5cccqqz4s0kp0c80";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7aea238a2d14e9f58c0474251984b6c617b6854d/recipes/hierarchy";
@@ -34419,25 +33812,6 @@
license = lib.licenses.free;
};
}) {};
- highlight = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "highlight";
- version = "20170702.732";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/highlight.el?revision=149";
- sha256 = "0kh72fmqsha25rz0g3ff983badh20clsig7blrhvl8c4bv3sqs56";
- name = "highlight.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/603e9fc90e6e6cf7fe903cb3c38155c1a4f45278/recipes/highlight";
- sha256 = "0clv4mzy9kllcvc0cgsbx3a9anw68dc2c7vzwbrv13sw5gh9skc0";
- name = "highlight";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/highlight";
- license = lib.licenses.free;
- };
- }) {};
highlight-blocks = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "highlight-blocks";
@@ -34459,44 +33833,6 @@
license = lib.licenses.free;
};
}) {};
- highlight-chars = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "highlight-chars";
- version = "20170223.740";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/highlight-chars.el?revision=18";
- sha256 = "00rna5bs0ilgsdi5168djjpb3hg89yq20pp17sx5r3jcksm2fm4f";
- name = "highlight-chars.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/highlight-chars";
- sha256 = "19jawbjvqx1hsjbynx0jgpziap3r64k8s1xfckajrx8aq8m4c6i0";
- name = "highlight-chars";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/highlight-chars";
- license = lib.licenses.free;
- };
- }) {};
- highlight-cl = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "highlight-cl";
- version = "20091012.1030";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/highlight-cl.el?revision=3";
- sha256 = "0r3kzs2fsi3kl5gqmsv75dc7lgfl4imrrqhg09ij6kq1ri8gjxjw";
- name = "highlight-cl.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/7dc85d7fd8e4d7381850f4a379140c64506f86e8/recipes/highlight-cl";
- sha256 = "164h3c3rzriahb7v5hk2pw4i0gk2vk5ak722bai6x4zx4l1xp20w";
- name = "highlight-cl";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/highlight-cl";
- license = lib.licenses.free;
- };
- }) {};
highlight-context-line = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "highlight-context-line";
@@ -34518,26 +33854,6 @@
license = lib.licenses.free;
};
}) {};
- highlight-current-line = callPackage ({ fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "highlight-current-line";
- version = "20051013.1056";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/highlight-current-line.el?revision=4";
- sha256 = "1aki7a7nnj9n7vh19k4fr0v7cqbwkrpc6b3f3yv95vcqj8a4y34c";
- name = "highlight-current-line.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/e2768ed5917ec2e2339412d8fbd146ca5a8a5042/recipes/highlight-current-line";
- sha256 = "01bga6is3frzlzfajpvpgz224vhl0jnc2bl2ipvlygdcmv4h8973";
- name = "highlight-current-line";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/highlight-current-line";
- license = lib.licenses.free;
- };
- }) {};
highlight-defined = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "highlight-defined";
@@ -34583,12 +33899,12 @@
highlight-function-calls = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "highlight-function-calls";
- version = "20170812.1913";
+ version = "20170907.2200";
src = fetchFromGitHub {
owner = "alphapapa";
repo = "highlight-function-calls";
- rev = "bbbbb7fdbcd853163a4bc821c56603164d35792e";
- sha256 = "1a73v78w4ms2lghjai1dvk1kf8jgx7ab87vqk94x4a2xyrfhbf3x";
+ rev = "f7a1eaf95fc64cc0db4d0567f9ff79ec4ae04787";
+ sha256 = "1gbj1awjp69352a5p49ldimvij5mj8cngjp2sh45qw1cm5dpq653";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2d1eed3f9af218d21ea8db37ee91888e23e59bd5/recipes/highlight-function-calls";
@@ -34667,12 +33983,12 @@
highlight-numbers = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parent-mode }:
melpaBuild {
pname = "highlight-numbers";
- version = "20160717.1228";
+ version = "20170905.342";
src = fetchFromGitHub {
owner = "Fanael";
repo = "highlight-numbers";
- rev = "b7adef0286aaa5bca8e98a12d0ffed3a880e25aa";
- sha256 = "1r07mpyr7rhd7bkg778hx6vbhb4n9ixgzkpszhgks7ri6ia38pj8";
+ rev = "f952ecb7448c125d4ef82ee6ad136b25e640d74a";
+ sha256 = "0fgb63iwdaakzm9cddivmr2j0mmay3512wmd14dh804a62j5l2pv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/882e3a4877ddd22cc52f56f0ce3d55b6e4831c7a/recipes/highlight-numbers";
@@ -34810,34 +34126,15 @@
license = lib.licenses.free;
};
}) {};
- highlight-tail = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "highlight-tail";
- version = "20140415.1841";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/highlight-tail.el?revision=5";
- sha256 = "1bbiyqddqkrp3c7xsg1m4143611bhg1kkakrwscqjb4cfmx29qqg";
- name = "highlight-tail.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/d033ff8cceb7e6d1e5a9f0ec7b706eb28bfe30f3/recipes/highlight-tail";
- sha256 = "187kv3n262l38jdapi9bwcafz8fh61pdq2zliwiz7m7xdspp2iws";
- name = "highlight-tail";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/highlight-tail";
- license = lib.licenses.free;
- };
- }) {};
highlight-thing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "highlight-thing";
- version = "20170207.2239";
+ version = "20170919.704";
src = fetchFromGitHub {
owner = "fgeller";
repo = "highlight-thing.el";
- rev = "c998172704ac4b96147d862a0eb4a0f97deb5e0a";
- sha256 = "0s441ya0fcw7sv1ah13dh0b0m2rcvf68a442knvnf06a07hpr5sr";
+ rev = "4eadd178175772fb04ae50e1199d797a6375ad4d";
+ sha256 = "1h2ka1fi0pdh0mx3z8sh4fvwyiyc18d56nl9wd4c96h3n93f7py0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/84b6cb403ff9a588771d051e472596f4e3cc974d/recipes/highlight-thing";
@@ -34895,12 +34192,12 @@
himp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, vimish-fold }:
melpaBuild {
pname = "himp";
- version = "20170810.1117";
+ version = "20170814.1215";
src = fetchFromGitHub {
owner = "mkcms";
repo = "himp";
- rev = "687ed90cbb1566fe09f7fb917c131c9f906f521d";
- sha256 = "08dblmc68q233glpc7chv79a06rwly5nhkzfp3rzjvfphvnlihmq";
+ rev = "140234b7f7cde03cf858c5011a2ab63e3bc802ec";
+ sha256 = "1g3ivash185anw8i67di1mxdfxa9py51prdy5ixl95vpqk5nmwbw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/51b31fb1fa7052d16d659313d249eef01ca3ee88/recipes/himp";
@@ -34920,8 +34217,8 @@
src = fetchFromGitHub {
owner = "chrisdone";
repo = "hindent";
- rev = "dde17a134ae99bd3c6e9b98ed04ad1740c2cd00b";
- sha256 = "1piyzinjz0khfpl96rgxg0f5yy4han16zqj7lcjd9xfzdx9rg4yg";
+ rev = "578d1256e466eb8bf40fd7e441172eb12e878637";
+ sha256 = "02dvnlg3r9pfk18664d5paqc90ll6a4sc05a9w2phafmi9kypwgr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent";
@@ -35123,25 +34420,6 @@
license = lib.licenses.free;
};
}) {};
- hl-defined = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "hl-defined";
- version = "20170223.744";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/hl-defined.el?revision=9";
- sha256 = "0sj1ypfawb1pxblm11zbfyy96f2mbpnmif972yqfrxzf5h20ra1y";
- name = "hl-defined.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/hl-defined";
- sha256 = "1y7vbhvpwxz70kja5hfm4i57mdd1cv43m4y9fr978y3nk265p8xx";
- name = "hl-defined";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/hl-defined";
- license = lib.licenses.free;
- };
- }) {};
hl-indent = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "hl-indent";
@@ -35163,34 +34441,15 @@
license = lib.licenses.free;
};
}) {};
- hl-line-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "hl-line-plus";
- version = "20170621.734";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/hl-line+.el";
- sha256 = "03bgx651nrnwqbclbfaabkw4h2iaiswnndqgms0w6lp3jjfc10wc";
- name = "hl-line+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hl-line+";
- sha256 = "16wlvi97wfkj36rnkbhzsky7sib3b76r2ng0lizp7ncr8d0vvhfv";
- name = "hl-line-plus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/hl-line+";
- license = lib.licenses.free;
- };
- }) {};
hl-sentence = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "hl-sentence";
- version = "20170812.646";
+ version = "20171018.819";
src = fetchFromGitHub {
owner = "milkypostman";
repo = "hl-sentence";
- rev = "1235ec94af083c3e43559ce0cac6db485aa938e0";
- sha256 = "1b58d79pkakfz2l31lg8nfkb1dfzrnbw4p5cs8mlxpfa5j4z13af";
+ rev = "86ae38d3103bd20da5485cbdd59dfbd396c45ee4";
+ sha256 = "1rzc74ckj06qs8kq2bd1cgqvgjd2qc3zxmk7bvgg6dy2m9nj52cm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/hl-sentence";
@@ -35224,25 +34483,6 @@
license = lib.licenses.free;
};
}) {};
- hl-spotlight = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "hl-spotlight";
- version = "20170223.746";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/hl-spotlight.el?revision=15";
- sha256 = "02x7p6hy1mkhbish55mzsdp6a1pnsdcfl4qi9cq48syg6cfm8fw3";
- name = "hl-spotlight.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/adb008d2da35dbd3fca63555f04dd8a0009380c6/recipes/hl-spotlight";
- sha256 = "1166g27fp2pj4j3a8904pzvp5idlq4l22i0w6lbk5c9zh5pqyyf3";
- name = "hl-spotlight";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/hl-spotlight";
- license = lib.licenses.free;
- };
- }) {};
hl-todo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "hl-todo";
@@ -35267,12 +34507,12 @@
hledger-mode = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, popup }:
melpaBuild {
pname = "hledger-mode";
- version = "20170807.1130";
+ version = "20171101.1139";
src = fetchFromGitHub {
owner = "narendraj9";
repo = "hledger-mode";
- rev = "fb314edbb193a1c640ae8f13c0373c7de26e2c8e";
- sha256 = "1gq6f1dhfwsm1xk5952nxv8j67bz230pnswf9s1zp21drxwgdk20";
+ rev = "70f4d9c44077eea13bdcb5688475e0c90578e085";
+ sha256 = "0j4pk2qr93pxgg8smzhxmlpk9b0rv9w20n1dz5lw42641xx8frnf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hledger-mode";
@@ -35288,15 +34528,15 @@
hlint-refactor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "hlint-refactor";
- version = "20151124.1241";
+ version = "20170817.2148";
src = fetchFromGitHub {
owner = "mpickering";
repo = "hlint-refactor-mode";
- rev = "695d39b3434a5e35fab70aa5251f824ffaa30d6b";
- sha256 = "02mkfrs55d32948x739f94v35343gw6a0f7fknbcigbz56mzsvsp";
+ rev = "92c69aa01c65968e86c15db087bb1ea785e4736c";
+ sha256 = "0khnn8qk0948hlq513i7nhf7vg09iwznmj3bgw1b5k5r8j6lhs0g";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/79363587b07f68e30a98698fd33ab39153bcb06c/recipes/hlint-refactor";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/384ffc463cc6edb4806f8da68bd251e662718e65/recipes/hlint-refactor";
sha256 = "1311z6y7ycwx0mj67bya7a39j5hiypg72y6yg93dhgpk23wk7frq";
name = "hlint-refactor";
};
@@ -35499,13 +34739,13 @@
pname = "howm";
version = "20160928.439";
src = fetchgit {
- url = "git://git.osdn.jp/gitroot/howm/howm.git";
+ url = "https://scm.osdn.net/gitroot/howm/howm.git";
rev = "e0237b07f60011a1926b36848c73340ae46cdb3e";
sha256 = "0ljsvrpbj7y690pq6llnqqkvm9mlrhksxihv9jpx06d1g4ghknpq";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/b4f66d7b6835d06b8e7451aec9e32bb9288a6020/recipes/howm";
- sha256 = "007r8mjn7m7m1mvsb1gaiqbizlwykh23k72g48nwan8bw556gfcr";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/0099a1f9b0efb3fc3a1420cfe71a647ec6458998/recipes/howm";
+ sha256 = "07wx3wmc51vm42s81km5sdbm600ax2pv83xg0116xsyn05za3bfn";
name = "howm";
};
packageRequires = [ cl-lib ];
@@ -35517,12 +34757,12 @@
ht = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ht";
- version = "20161015.1945";
+ version = "20171024.1200";
src = fetchFromGitHub {
owner = "Wilfred";
repo = "ht.el";
- rev = "8b9281611c49335e97f2b644e34aa07a47dc4b2a";
- sha256 = "1pnsrirbh901qzqals6p2bbf28g2xn2zminwzj2x02cj49vfyqsz";
+ rev = "a741bac82797d25ec0542764df7443e9e7241033";
+ sha256 = "1m1v31bfaw2g3jymcxsl2bi1z37pj0sfhmldljk8m9zgjll56g6c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6c7589bca1c1dfcc0fe76779f6847fda946ab981/recipes/ht";
@@ -35643,12 +34883,12 @@
htmlize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "htmlize";
- version = "20161211.1019";
+ version = "20171017.141";
src = fetchFromGitHub {
owner = "hniksic";
repo = "emacs-htmlize";
- rev = "88e2cb6588827893d7bc619529393887c264d15a";
- sha256 = "09xpv8dsc39a7w9s6xnilc5kh1krs2jw8cklizxzz4gp36hrsj2n";
+ rev = "a0b55cba65a225df8d9e17a3ac448ce9e8ec962d";
+ sha256 = "0k23xz34ksd6n9xa8anbpvx07fymflyxdggy2is2kp0vqg66pv5q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/075aa00a0757c6cd1ad392f0300bf5f1b937648d/recipes/htmlize";
@@ -35664,12 +34904,12 @@
http = callPackage ({ edit-indirect, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
melpaBuild {
pname = "http";
- version = "20170603.1107";
+ version = "20170906.1111";
src = fetchFromGitHub {
owner = "emacs-pe";
repo = "http.el";
- rev = "19317fcc928bb75e0464e39032af1627b7961a0c";
- sha256 = "14zq54g4ckcrrbpwjcb84krg9bijw88nwnkj8kg9kij5p25knqwh";
+ rev = "193a7bf843dd6b6805c7b18dab31f50c8325d710";
+ sha256 = "1v6adfy1774axplsjfsdkm0azfwb5g7iq26zcss4mj966q1633xv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c7c63aaf27240706d84e464881d40cfb7cbe9ee3/recipes/http";
@@ -35829,22 +35069,22 @@
license = lib.licenses.free;
};
}) {};
- hy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ hy-mode = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "hy-mode";
- version = "20170621.1354";
+ version = "20171030.1023";
src = fetchFromGitHub {
owner = "hylang";
repo = "hy-mode";
- rev = "f34bc19e9a58c7014c1f672d0655d2edee997ad2";
- sha256 = "049f3746dfg9jh29904qnk2asym2rjqqgzn1zimk4bs3v8xnys1c";
+ rev = "afb1610b0f78e059ee1a034048a876ece70118f1";
+ sha256 = "14b5dk7n9727dwyi9p80rcwm0f6i21y1x10rj05bal1s3lxq7frp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fc9ab5cf16b61bb27559cd8ec5cf665a5aab2154/recipes/hy-mode";
sha256 = "1vxrqla3p82x7s3kn7x4h33vcdfms21srxgxzidr02k37f0vi82m";
name = "hy-mode";
};
- packageRequires = [];
+ packageRequires = [ dash dash-functional emacs s ];
meta = {
homepage = "https://melpa.org/#/hy-mode";
license = lib.licenses.free;
@@ -35916,12 +35156,12 @@
hydra = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "hydra";
- version = "20170813.1058";
+ version = "20170924.2259";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "hydra";
- rev = "b4fb3298cd071d56aa9a5fc6be51ae9871ad451e";
- sha256 = "127l60rm1dhq1l5cwsnc5i2vh7xfzdagwlhy4wmjm22xs1ms6kn2";
+ rev = "df3025f7e3cf3899168ae8ced1e9b734df2b32a0";
+ sha256 = "1sbj699956vxbzbdagw5hbx168sx9cfrc5vx6m6s89v2rkq8fw8k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a4375d8ae519290fd5018626b075c226016f951d/recipes/hydra";
@@ -35957,11 +35197,11 @@
}) {};
i3wm = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
pname = "i3wm";
- version = "20170116.1825";
+ version = "20170822.738";
src = fetchgit {
url = "https://git.flintfam.org/swf-projects/emacs-i3.git";
- rev = "7daad9bcbb545ed5cd75706eef56172cef1498cf";
- sha256 = "1y69hh9gaz8q3kljgjarqkxmc70qpf83rzwsb1rzsglf4aqlr2rq";
+ rev = "71391dc61063fee77ad174f3b2ca25c60b41009e";
+ sha256 = "16rwqfg517ask3y6mqxw689w8xx4i51nq8js5wnzbz9a55aj776n";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2e12638554a13ef49ab24da08fe20ed2a53dbd11/recipes/i3wm";
@@ -35977,12 +35217,12 @@
iasm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "iasm-mode";
- version = "20131004.1644";
+ version = "20171023.722";
src = fetchFromGitHub {
owner = "RAttab";
repo = "iasm-mode";
- rev = "6b404ff94bbfe971b3614007c8e5dcd5757c5727";
- sha256 = "1gl21li9vqfjvls4ffjw8a4bicas2c7hmaa621k3hpllgpy6qdg5";
+ rev = "abbec7f308f9ce97beeb57e459fff35f559b4c18";
+ sha256 = "0hvpcckhlxab5f7w4s6iw5lhdbjrqn0l8gayg1w42rn6gssr3rap";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5c230ec10eb62d1b3f6df10c05c5dbc2e25d4507/recipes/iasm-mode";
@@ -36019,12 +35259,12 @@
ibuffer-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
melpaBuild {
pname = "ibuffer-projectile";
- version = "20170721.1823";
+ version = "20171103.2004";
src = fetchFromGitHub {
owner = "purcell";
repo = "ibuffer-projectile";
- rev = "d99fb0d918f13664856178402efe64b4b237648b";
- sha256 = "1rlicnrjs8nmha90i9d4z4ps5dskry08rj5sa3ax2igxwbq1z4w5";
+ rev = "6f03040a93d116b73f9fd3d6b52102b57bfaf597";
+ sha256 = "0jmb4s4n8yxyavvvd4msr58708jlha7jd8hm5djl91fgf87r3ys3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/363a6a888945f2c8b02f5715539439ba744d737d/recipes/ibuffer-projectile";
@@ -36082,12 +35322,12 @@
ibuffer-vc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ibuffer-vc";
- version = "20161103.2358";
+ version = "20171104.1722";
src = fetchFromGitHub {
owner = "purcell";
repo = "ibuffer-vc";
- rev = "de75fb3345384fe13d0500435241ca4a056f5fc7";
- sha256 = "0c8y53aim35v88w5h4zn49187j6v8j7frxlhcw8crfxi1v6i7wdh";
+ rev = "da6b628d51a1a80cfa311200859ae62665a71afa";
+ sha256 = "0hvmlq4c9jcxjgvkk73qq8fnxw4jarzfqcnfwwrqy82cx13nvnk4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/ibuffer-vc";
@@ -36100,44 +35340,6 @@
license = lib.licenses.free;
};
}) {};
- icicles = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "icicles";
- version = "20170811.1012";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/icicles.el?revision=1089";
- sha256 = "10w1lghh9jqxxm5cszi2qyk24vnvazfywmyyz1v7zf6cyiwbndrz";
- name = "icicles.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/icicles";
- sha256 = "15h2511gm38q14avsd86j5mnxhsjvcdmwbnhj66ashj5p5nxhr92";
- name = "icicles";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/icicles";
- license = lib.licenses.free;
- };
- }) {};
- icomplete-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "icomplete-plus";
- version = "20170303.1456";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/icomplete+.el";
- sha256 = "00wy0jqk6jdfh9izdpqq4y6x2x8q1m38sy6nb4ygfg3055lbhkam";
- name = "icomplete+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/fade28733f33e52a8622479de201f451c9a31c11/recipes/icomplete+";
- sha256 = "0gxqkj4bjrxb046qisfz22wvanxx6bzl4hfv91rfwm78q3484slx";
- name = "icomplete-plus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/icomplete+";
- license = lib.licenses.free;
- };
- }) {};
id-manager = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "id-manager";
@@ -36309,12 +35511,12 @@
ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize, s }:
melpaBuild {
pname = "ido-completing-read-plus";
- version = "20170813.2325";
+ version = "20170820.3";
src = fetchFromGitHub {
owner = "DarwinAwardWinner";
repo = "ido-completing-read-plus";
- rev = "e7194753330fb5da295fbb5d1e819b9b4fd926b2";
- sha256 = "1ll19xlchf4br27yxr2f8jb3q5d0cypjjjj852d8g8pgs565amaw";
+ rev = "e2ea358725f03ae623ae03ed90715efb92a61030";
+ sha256 = "1bai04fz6ln4dbc3lgglv11g6mibg40wci5ylmc90wgd38iw9gkn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-completing-read+";
@@ -36621,22 +35823,22 @@
license = lib.licenses.free;
};
}) {};
- ido-ubiquitous = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }:
+ ido-ubiquitous = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }:
melpaBuild {
pname = "ido-ubiquitous";
- version = "20170813.946";
+ version = "20170923.842";
src = fetchFromGitHub {
owner = "DarwinAwardWinner";
repo = "ido-completing-read-plus";
- rev = "e7194753330fb5da295fbb5d1e819b9b4fd926b2";
- sha256 = "1ll19xlchf4br27yxr2f8jb3q5d0cypjjjj852d8g8pgs565amaw";
+ rev = "e2ea358725f03ae623ae03ed90715efb92a61030";
+ sha256 = "1bai04fz6ln4dbc3lgglv11g6mibg40wci5ylmc90wgd38iw9gkn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-ubiquitous";
sha256 = "11sdk0ymsqnsw1gycvq2wj4j0g502fp23qk6q9d95lm98nz68frz";
name = "ido-ubiquitous";
};
- packageRequires = [ cl-lib emacs ido-completing-read-plus ];
+ packageRequires = [ cl-lib ido-completing-read-plus ];
meta = {
homepage = "https://melpa.org/#/ido-ubiquitous";
license = lib.licenses.free;
@@ -36729,15 +35931,15 @@
ids-edit = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ids-edit";
- version = "20170709.338";
+ version = "20170818.802";
src = fetchFromGitHub {
owner = "kawabata";
repo = "ids-edit";
- rev = "8d46429ef1a32c69d770f8187545588549086c91";
- sha256 = "014apjzy6hgcg1mrvhkbp77baz59nafh96az2kfgixp8vwpmjyf4";
+ rev = "8562a6cbfb3f2d44bc6f62ab15081a80f8fee502";
+ sha256 = "10h64c5n9piq9ly7ipqq33ji8x8vwh9j1h7r05yab8a2sn0h8587";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a1aa957ef9ec3db055f439f1cee2994e65ee17ea/recipes/ids-edit";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/ca17de8cdd53bb32a9d3faaeb38f19f92b18ee38/recipes/ids-edit";
sha256 = "1n4gpcl3qj65cmaq9cdljsmrf84570z4chfvga6slsqjz5him8d1";
name = "ids-edit";
};
@@ -36750,12 +35952,12 @@
iedit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "iedit";
- version = "20161228.2111";
+ version = "20170916.1024";
src = fetchFromGitHub {
owner = "victorhge";
repo = "iedit";
- rev = "03b647be8bd35ca82916f2ace27a95d5b85e8ecf";
- sha256 = "1pbbkizaa2f8lazpsc1j7qs3snvwkmw7schzhminzxrvdx15yids";
+ rev = "5b14cc9fcaef509c50f25cff872fba5d70b2c799";
+ sha256 = "1vlfqh616id2kh35diwig6jswq5q5z22zwrpbdxkginag3sq8732";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/iedit";
@@ -36792,12 +35994,12 @@
iflipb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "iflipb";
- version = "20170527.839";
+ version = "20171102.1336";
src = fetchFromGitHub {
owner = "jrosdahl";
repo = "iflipb";
- rev = "e19229473be70e55c56a26ccc26c4e11e8be6389";
- sha256 = "1ybnxl6zgzhxrwsqf54hz235xhz3rmxy7w459salb7rr2s1fqvlz";
+ rev = "3a1ec69ffe7802794fe46baeecbf11846cbdc3ed";
+ sha256 = "1wamzkmndmghvsw8ffbqmllp4nd7yxamym7m62pz22blyh1sj97m";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fad6fc8bc3c0be0d5789a0d7626ebc3f298b4318/recipes/iflipb";
@@ -36831,25 +36033,6 @@
license = lib.licenses.free;
};
}) {};
- igrep = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "igrep";
- version = "20130824.507";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/igrep.el?revision=10";
- sha256 = "0qiv69v7ig38iizif7zg8aljdmpa1jk8bsfa0iyhqqqrkvsmhc29";
- name = "igrep.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/83c05578974289527082bb67338c35e70bbff8f2/recipes/igrep";
- sha256 = "1vyhrziy29q6w8w9vvanb7d29r1n7nfkznbcd62il991n48d08i3";
- name = "igrep";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/igrep";
- license = lib.licenses.free;
- };
- }) {};
igv = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
pname = "igv";
version = "20141210.427";
@@ -36953,6 +36136,27 @@
license = lib.licenses.free;
};
}) {};
+ imake = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "imake";
+ version = "20171006.450";
+ src = fetchFromGitHub {
+ owner = "tarsius";
+ repo = "imake";
+ rev = "edd2e59f7996c35450987cf8f137ecb54777e9ca";
+ sha256 = "12mq1ki001jgjdfr3fx43z1xz4jrki18rb0wkb7n956dvl34w0fg";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/28de8f7f5302b27c7c6600ad65a998119518be43/recipes/imake";
+ sha256 = "0j732fi6999n9990w4l28raw140fvqfbynyh4x65yilhw95r7c34";
+ name = "imake";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/imake";
+ license = lib.licenses.free;
+ };
+ }) {};
imapfilter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "imapfilter";
@@ -37016,25 +36220,6 @@
license = lib.licenses.free;
};
}) {};
- imenu-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "imenu-plus";
- version = "20170303.1457";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/imenu+.el";
- sha256 = "0dga9a61ckvd8w4nnz9z8z0iakaxminwn0lgmf8vfj2nwkd0m6hb";
- name = "imenu+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/imenu+";
- sha256 = "1v2h3xs5pnv7z5qphkn2y5pa1p8pivrknkw7xihm5yr4a4dqjv5d";
- name = "imenu-plus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/imenu+";
- license = lib.licenses.free;
- };
- }) {};
imenus = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "imenus";
@@ -37056,27 +36241,6 @@
license = lib.licenses.free;
};
}) {};
- imgix = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, ht, json ? null, lib, melpaBuild, s }:
- melpaBuild {
- pname = "imgix";
- version = "20141226.1332";
- src = fetchFromGitHub {
- owner = "imgix";
- repo = "imgix-emacs";
- rev = "4906ff0b4f7c9e84a5beb81630fe6d522ec91eaa";
- sha256 = "1q53r3f3x0hpzryxd1v1w3qgs54p384q0azi7xj2gppi1q49sa42";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/imgix";
- sha256 = "1480571q6qy7wv88398kxjhd96gsdhb6ar6pa1kr5y6il0s6d5lg";
- name = "imgix";
- };
- packageRequires = [ cl-lib dash ht json s ];
- meta = {
- homepage = "https://melpa.org/#/imgix";
- license = lib.licenses.free;
- };
- }) {};
imgur = callPackage ({ anything, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "imgur";
@@ -37146,8 +36310,8 @@
src = fetchFromGitHub {
owner = "netguy204";
repo = "imp.el";
- rev = "11600a8441a1c0339252b0c19f151ccac3ee96c7";
- sha256 = "1k251pidqgjn380xbs2h3j02r76lq1gcqkslwfpvq2g3l3ksqkkd";
+ rev = "48e6c4842b1fc2657a3c6c23029f89e35fafc859";
+ sha256 = "0srjgzcmdgvdi9fm127wlj7zsbq00wsmb3fkzzpy05nvmm2dgng5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/bb1fbd03f17d2069a461260ad5e2ad4e5441919b/recipes/impatient-mode";
@@ -37163,12 +36327,12 @@
import-js = callPackage ({ emacs, fetchFromGitHub, fetchurl, grizzl, lib, melpaBuild }:
melpaBuild {
pname = "import-js";
- version = "20161220.508";
+ version = "20171026.1628";
src = fetchFromGitHub {
owner = "Galooshi";
repo = "emacs-import-js";
- rev = "15d395126f57408d770a72db2e5f43271f90fa52";
- sha256 = "1ipbfacjx9vqqhvsf9sgfci8vqx0plks510w1gsjj0xwrpqn1f6l";
+ rev = "0a1032894445062b87dbe4e2c8cdba35ac25c250";
+ sha256 = "0vx2k4k8ig1k74ifxaxvhbkmfmba683qza7f9pp08daa43mgr1r3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6f26b8281f9bd05e3c8f2ef21838275711e622c9/recipes/import-js";
@@ -37244,15 +36408,36 @@
license = lib.licenses.free;
};
}) {};
+ indent-info = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "indent-info";
+ version = "20171105.153";
+ src = fetchFromGitHub {
+ owner = "terlar";
+ repo = "indent-info.el";
+ rev = "2340739dee51e6c45f04053881a2d8c4452fb5ba";
+ sha256 = "0afhx8j7nrkjirq7xr3bcrjm5wcs24slkb6yzi6cw09080s5hlxc";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/1274c0d871c51e358b3de577372dae8e3a04ead0/recipes/indent-info";
+ sha256 = "0fa6p5fvyxib1iz025kqak7navb11jlfxw5x2jr47180vv9a1373";
+ name = "indent-info";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/indent-info";
+ license = lib.licenses.free;
+ };
+ }) {};
indent-tools = callPackage ({ fetchFromGitLab, fetchurl, hydra, lib, melpaBuild, s, yafolding }:
melpaBuild {
pname = "indent-tools";
- version = "20170803.418";
+ version = "20171103.750";
src = fetchFromGitLab {
owner = "emacs-stuff";
repo = "indent-tools";
- rev = "8ea9f4bbe95a118801f8b6a1f5950e331b43876a";
- sha256 = "0sb1c7gdm4ni1jcpb0rz3xgfgs45a8pi4nhks7cm2mly7rb7wvl0";
+ rev = "6e8e9a8cf9efe4a8624e52f45cb5faa5fe8ec996";
+ sha256 = "1hh4r4axnbmi12hk2d3pynvq3nldgbik8jf73v5ddmv06kqlsxya";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/indent-tools";
@@ -37286,30 +36471,22 @@
license = lib.licenses.free;
};
}) {};
- indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, memoize, seq, sourcemap, websocket }:
+ indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }:
melpaBuild {
pname = "indium";
- version = "20170808.1327";
+ version = "20171027.914";
src = fetchFromGitHub {
owner = "NicolasPetton";
repo = "Indium";
- rev = "ee843f08cf6f862b298728103c142ce56824dfc4";
- sha256 = "070yw07fcimblzy94pg1mvf7n5dv91wwq7kwyys4zkm92ypl874l";
+ rev = "f7b46c9dd39dfc7ffefb52e35b0795450d3ea96f";
+ sha256 = "0qba8c4qr8v0881lc2pnw6lddspzkdj7hsapf6x0vk1mwqmnww4x";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium";
sha256 = "024ljx7v8xahmr8jm41fiy8i5jbg48ybqp5n67k4jwg819cz8wvl";
name = "indium";
};
- packageRequires = [
- company
- emacs
- js2-mode
- memoize
- seq
- sourcemap
- websocket
- ];
+ packageRequires = [ company emacs js2-mode seq websocket ];
meta = {
homepage = "https://melpa.org/#/indium";
license = lib.licenses.free;
@@ -37339,12 +36516,12 @@
inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "inf-clojure";
- version = "20170809.114";
+ version = "20171029.40";
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "inf-clojure";
- rev = "21d3e978652bcbb995954bf95e80c0ee4669701a";
- sha256 = "0g0qs0znys123yr50ykhgiz505spar3q2cgsyn61ky44df2pl4ff";
+ rev = "b04f05d2c735795b68a10cc7e699b676a8acc811";
+ sha256 = "16xsrny70f5lr6hr4sipyrnry813cvbhy25jxfx90kp2f9kkak53";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure";
@@ -37378,27 +36555,6 @@
license = lib.licenses.free;
};
}) {};
- inf-php = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode }:
- melpaBuild {
- pname = "inf-php";
- version = "20130414.21";
- src = fetchFromGitHub {
- owner = "taksatou";
- repo = "inf-php";
- rev = "4396022d6e169f0cf30cd9f68ca575d8b30c418a";
- sha256 = "1z5ns94xgj2dkv2sc2ckax6bzwdxsm19pkvni24ys2w7d5nhajzr";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/da48d14bd46f25976f7109306f335bd57b237ee5/recipes/inf-php";
- sha256 = "011sc6f0ka7mmik8z0df8qk24mf6ygq22jy781f2ikhjh94gy83d";
- name = "inf-php";
- };
- packageRequires = [ php-mode ];
- meta = {
- homepage = "https://melpa.org/#/inf-php";
- license = lib.licenses.free;
- };
- }) {};
inf-ruby = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "inf-ruby";
@@ -37406,8 +36562,8 @@
src = fetchFromGitHub {
owner = "nonsequitur";
repo = "inf-ruby";
- rev = "c14a68d1643ac3f439234da6a8275b48cae970d3";
- sha256 = "0b6qp9xljxn4mrh1xcv6fzklq963hrchq8iab4746kvylhn1xmsk";
+ rev = "674a2a837fccea88ada6634e981a656b41d16d8e";
+ sha256 = "09am0gq1sx0wv7bvcs7pp118brjj19qr7mis7cxjvrxbryc1mxf4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/inf-ruby";
@@ -37444,12 +36600,12 @@
inflections = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "inflections";
- version = "20161126.1727";
+ version = "20170913.216";
src = fetchFromGitHub {
owner = "eschulte";
repo = "jump.el";
- rev = "95a9559bd301ff86fa3b72b15126dc4851ce4a69";
- sha256 = "0fyrrzilvacvrxbw8r6wc0jphrk3h4dsw86zp3d63h4s6rlldhsa";
+ rev = "e4f1372cf22e811faca52fc86bdd5d817498a4d8";
+ sha256 = "0354b64drvv8v5g13xy5nc1klwx4hldz1b5mf1frhna7h2dqz0j9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/392c7616d27bf12b29ef3c2ea71e42ffaea81cc6/recipes/inflections";
@@ -37483,46 +36639,6 @@
license = lib.licenses.free;
};
}) {};
- info-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "info-plus";
- version = "20170810.1125";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/info+.el";
- sha256 = "0nr9d2rqipbz2p30f1bmg10mbnndxqx9k6jj1qkmijhzzbk5w36l";
- name = "info+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/e77aadd8195928eed022f1e00c088151e68aa280/recipes/info+";
- sha256 = "0flpmi8dsaalg14xd86xcr087j51899sm8ghsa150ag4g4acfggr";
- name = "info-plus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/info+";
- license = lib.licenses.free;
- };
- }) {};
- inform7-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, sws-mode }:
- melpaBuild {
- pname = "inform7-mode";
- version = "20131009.2354";
- src = fetchFromGitHub {
- owner = "fred-o";
- repo = "inform7-mode";
- rev = "42458733947f2fbd44bc78f7264be247a5d8980b";
- sha256 = "19kc6a8jkx22rg9xp862pqfhv0an7q6fs7v7i2kxp3ji55aq001w";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/inform7-mode";
- sha256 = "0fpnf9rgizsfz9pn06k87v4s0dr7z1pn0gdxfi6hnnv68qni8hg3";
- name = "inform7-mode";
- };
- packageRequires = [ sws-mode ];
- meta = {
- homepage = "https://melpa.org/#/inform7-mode";
- license = lib.licenses.free;
- };
- }) {};
inherit-local = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "inherit-local";
@@ -37656,8 +36772,8 @@
src = fetchFromGitHub {
owner = "ideasman42";
repo = "emacs-inkpot-theme";
- rev = "b992c0996b4a711f3d6ebb6730c6f57edbc75fc5";
- sha256 = "1ykbf5hhs7z33bca5j0vk8vdyrwghbiqgdjy064nccgxlqyysy0k";
+ rev = "7b2f19ebd01535f77da407e28ca970c2ce442493";
+ sha256 = "1d2vi919fz6kdya5gafhy9wwmlzid88j9klcbslzh8bjmamnbxcx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/dd3e02aaf8865d8038b9c590c8545e7a1b21d620/recipes/inkpot-theme";
@@ -37673,15 +36789,15 @@
inline-crypt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "inline-crypt";
- version = "20130409.507";
+ version = "20170824.200";
src = fetchFromGitHub {
owner = "Sodel-the-Vociferous";
repo = "inline-crypt-el";
- rev = "497ce9dc29a8ccac0b6dd6854f5d120514350282";
- sha256 = "0jipds844432a8m4d5gxbbkk2h1rsq9fg748g6bxy2q066kyzfz6";
+ rev = "281385b383f850fd2e895926b1cef804dd052633";
+ sha256 = "0hjmq8j7y4wnjgk6z92w4ci0ag9fm6rn63z9mi3krvdv154vz2n0";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/5bf7761c9091260d378621907a1689498aedc098/recipes/inline-crypt";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/b04fffe5e52f26e92930a112a64531228f94e340/recipes/inline-crypt";
sha256 = "04mcyyqa9h6g6wrzphzqalpqxsndmzxpavlpdc24z4a2c5s3yz8n";
name = "inline-crypt";
};
@@ -37736,12 +36852,12 @@
insert-shebang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "insert-shebang";
- version = "20160626.409";
+ version = "20170825.438";
src = fetchFromGitHub {
owner = "psachin";
repo = "insert-shebang";
- rev = "d5a827ce9ee1bdabb7561203a3e774ca599514c1";
- sha256 = "11dxkgn9d6slcwq1zpi13g2cy80ns97gprxakqjvy9gi2l5wl634";
+ rev = "adfa473f07443b231914d277c20a3419b30399b6";
+ sha256 = "10zy3vg5fr30hhv0q3jldffhjacg1yrv5d9gfkdz55ry277l3xz1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c257f4f5011cd7d0b2a5ef3adf13f9871bf0be92/recipes/insert-shebang";
@@ -37798,12 +36914,12 @@
intellij-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "intellij-theme";
- version = "20170416.359";
+ version = "20171017.715";
src = fetchFromGitLab {
owner = "fommil";
repo = "emacs-intellij-theme";
- rev = "ad207c8c3d266d566fb1e4862df154096c059171";
- sha256 = "06slahp36mj39ri4v4k7sv3mly6cgk76m4zpc1why3h6dmd7hhyr";
+ rev = "1bbfff8e6742d18e9b77ed796f44da3b7bd10606";
+ sha256 = "0ml1gi2cn6h3xm5c78vxwv327r0rgimia1vqqi9jb09yb6lckbgj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cfe86071b2e84929476a771da99341f4a73cfd06/recipes/intellij-theme";
@@ -37840,12 +36956,12 @@
interleave = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "interleave";
- version = "20170630.22";
+ version = "20171003.2324";
src = fetchFromGitHub {
owner = "rudolfochrist";
repo = "interleave";
- rev = "2c0458038bf0440f271f6e000039027be411eba7";
- sha256 = "0rpw1ms80hr01s76av8cvid4gvkd3sapx0c3g3a05za0bq1jqacw";
+ rev = "87549df30cbc681baf86b238bd14c7cf7ec11fc4";
+ sha256 = "07430hsyq9q90rjzxq7ifq4mlfc8k8b7l6b31s7xk1xm2snbky6b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6c43d4aaaf4fca17f2bc0ee90a21c51071886ae2/recipes/interleave";
@@ -37861,12 +36977,12 @@
intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }:
melpaBuild {
pname = "intero";
- version = "20170812.1029";
+ version = "20171023.1102";
src = fetchFromGitHub {
owner = "commercialhaskell";
repo = "intero";
- rev = "1c34f8e858eb11493078ca222fd0f598cf9f1e26";
- sha256 = "115pqqyhinjpcjh1sigwcbqinwcslk19qmqxwxpwfka62j8c22x1";
+ rev = "5697c86fde2b6131629e8d1c69f9b2363dadc7ae";
+ sha256 = "1zwvmchk8rymxfciiip78zf69p3f8jpbr7fqqj43cxv0lq9w284s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero";
@@ -37924,12 +37040,12 @@
inverse-acme-theme = callPackage ({ autothemer, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "inverse-acme-theme";
- version = "20170716.1100";
+ version = "20170822.1954";
src = fetchFromGitHub {
owner = "dcjohnson";
repo = "inverse-acme-theme";
- rev = "361a8840469648a9b98f16cc996df5f151d3c75f";
- sha256 = "1dvaz36037wvh00m3ddqfp9w86pna3k058xw22i4xcdhp1518i03";
+ rev = "74d6f3e2f6534371509dd2d77006435156c276d6";
+ sha256 = "15fk60ky8kbj665yjylmgc4nn4qsk57fvarqzwv3fns64yfshkv3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1c44dbc8d3ca29d8715af755b845af7236e95406/recipes/inverse-acme-theme";
@@ -38029,12 +37145,12 @@
ipcalc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ipcalc";
- version = "20160927.220";
+ version = "20170926.105";
src = fetchFromGitHub {
owner = "dotemacs";
repo = "ipcalc.el";
- rev = "e92afd8b96592b6e2d65ba073bf87c9dd2408e91";
- sha256 = "1s17wpdbrbkbmkndbwm0byy11cmymhs6yn7w0v5lvw5l2cgicxjg";
+ rev = "2720f7e3e662e04e195f8338b81a499cf321296a";
+ sha256 = "1kmqbb9ca3sca59462ha21grbgxkl4wynz2lr4yqb4qk7cijgd6g";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ipcalc";
@@ -38152,34 +37268,15 @@
license = lib.licenses.free;
};
}) {};
- irfc = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "irfc";
- version = "20130824.507";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/irfc.el?revision=45";
- sha256 = "197ybqwbj8qjh2p9pkf5mvqnrkpcgmv8c5s2gvl6msyrabk0mnca";
- name = "irfc.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/0b4f2dc79231b165bd3b03a728e2b872ed6c50c1/recipes/irfc";
- sha256 = "0186l6zk5l427vjvmjvi0xhwk8a4fjhsvw9kd0yw88q3ggpdl25i";
- name = "irfc";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/irfc";
- license = lib.licenses.free;
- };
- }) {};
irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
melpaBuild {
pname = "irony";
- version = "20170725.1249";
+ version = "20171018.1550";
src = fetchFromGitHub {
owner = "Sarcasm";
repo = "irony-mode";
- rev = "d47bc8d94748dbd87fed9bf92cea85e115a39031";
- sha256 = "1hmrpz8fv8prw5jwipfy56m4fw2sbx14nm251wjva5503bim3lw5";
+ rev = "78b06aa2df5251adaabb6c749febc1f1bd2ad605";
+ sha256 = "0nhjrnlmss535jbshjjd30vydbr8py21vkx4p294w6d8vg2rssf8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony";
@@ -38234,44 +37331,6 @@
license = lib.licenses.free;
};
}) {};
- isearch-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "isearch-plus";
- version = "20170723.1826";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/isearch+.el";
- sha256 = "0d7xsr71iadqzg81mv17dqyd0bdzkmljxlrpdlpycjyaf3z59aqr";
- name = "isearch+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/isearch+";
- sha256 = "0n9jh3bx2h6k4mvbwss16m34fxzlq6sb057rj16hgrlmbqknynhw";
- name = "isearch-plus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/isearch+";
- license = lib.licenses.free;
- };
- }) {};
- isearch-prop = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "isearch-prop";
- version = "20170303.1504";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/isearch-prop.el?revision=79";
- sha256 = "0q18i76gq2pfnkqlbxlx2hndpy9mhbag302dvr8irk1kjwgngz5r";
- name = "isearch-prop.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/isearch-prop";
- sha256 = "1z9y88b23m4ffil8p3wcq61q1fiyqjxphyd3wacs5fnc53mdzad9";
- name = "isearch-prop";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/isearch-prop";
- license = lib.licenses.free;
- };
- }) {};
isearch-symbol-at-point = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "isearch-symbol-at-point";
@@ -38380,12 +37439,12 @@
itail = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "itail";
- version = "20170709.1543";
+ version = "20170823.1629";
src = fetchFromGitHub {
owner = "re5et";
repo = "itail";
- rev = "a8c98583cbc4e2b761df95fd738efebb116fe6e6";
- sha256 = "001i7xn6v8j3ls50cnsazjfkpzdnr01rb98a6h0nibkj8hi21myb";
+ rev = "606a5e93f53a36cad958e191a9698dd74683a773";
+ sha256 = "1ddy3q36hhhzjkr4lcaw0brk28ssyllava0yx2xn5kxbfs0lhdfb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6b810bf1deeb79064144d8b684fab336686018ef/recipes/itail";
@@ -38419,6 +37478,27 @@
license = lib.licenses.free;
};
}) {};
+ iter2 = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "iter2";
+ version = "20171031.755";
+ src = fetchFromGitHub {
+ owner = "doublep";
+ repo = "iter2";
+ rev = "a0e41b2f55d50c08c59ffcc6e83a977c141bcc55";
+ sha256 = "0ccr9qjhc35wi07yckd9y26synihhsg8zwkxgqyzkx7avxkqfyhn";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/d94316660051ee0ba0c12e380e6203986440368f/recipes/iter2";
+ sha256 = "0kl3z2wwpvk2ddsb3798g41pv0xycsf9dclhv00snpzsr61d9v65";
+ name = "iter2";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/iter2";
+ license = lib.licenses.free;
+ };
+ }) {};
iterator = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "iterator";
@@ -38443,15 +37523,15 @@
ivariants = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivs-edit, lib, melpaBuild }:
melpaBuild {
pname = "ivariants";
- version = "20140720.2127";
+ version = "20170822.1924";
src = fetchFromGitHub {
owner = "kawabata";
repo = "emacs-ivariants";
- rev = "f9deff2e6fba5647f69771546fb2283136d0fb0d";
- sha256 = "12nqpzcmz724wpk8p16lc3z26rxma3wp6pf6dvrsqagnlixrs9si";
+ rev = "ca0b74d32b5d2d77a45cc6ad6edc00be0ee85284";
+ sha256 = "16hygfx9gla6yhc3kaiy4m6g910m1hak3v86fnpf12kzvjjs9zfx";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/4caff7dc7c8b328c21a3c3cb51c505c21f044ee7/recipes/ivariants";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/ca17de8cdd53bb32a9d3faaeb38f19f92b18ee38/recipes/ivariants";
sha256 = "00fgcm62g4fw4306lw9ld2k7w0c358fcbkxn969k5p009g7pk5bw";
name = "ivariants";
};
@@ -38464,15 +37544,15 @@
ivs-edit = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ivs-edit";
- version = "20140720.346";
+ version = "20170818.741";
src = fetchFromGitHub {
owner = "kawabata";
repo = "ivs-edit";
- rev = "c496e85f93f6f00e723d9df0ea0703f6c672826b";
- sha256 = "1926pyfsbr6j7cn3diq8ibs0db94rgsf0aifvbqrqp4grs85pkva";
+ rev = "5db39c234aa7393b591168a4fd0a9a4cbbca347d";
+ sha256 = "1sdl83cf87zbv0ynvb6qlgbpm4d3dqhdn84jhhs5j247r5qzhmz6";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/7fd59ccf003a7fc4165dc7e34c1648e85abe378f/recipes/ivs-edit";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/ca17de8cdd53bb32a9d3faaeb38f19f92b18ee38/recipes/ivs-edit";
sha256 = "0gzhvzrfk17j2vwlg82f5ifk4dcfc1yv7barcij38ckran8cqmb2";
name = "ivs-edit";
};
@@ -38485,12 +37565,12 @@
ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ivy";
- version = "20170813.351";
+ version = "20171104.252";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "swiper";
- rev = "a5cd13b9487007ba6cb3eb64575800ee14589691";
- sha256 = "00rmcd72hxcsvrkwqsqy9b0jr1rxh3ny3q1fh33zp61s82n1dkn0";
+ rev = "5d373be194e21f3e29a03fb498b901fcc5e128f9";
+ sha256 = "0ycch0gqhjxg9ffz5y942z908zy4y3yl242dnyskkv3vmkrziwsz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy";
@@ -38506,12 +37586,12 @@
ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }:
melpaBuild {
pname = "ivy-bibtex";
- version = "20170808.1124";
+ version = "20171022.220";
src = fetchFromGitHub {
owner = "tmalsburg";
repo = "helm-bibtex";
- rev = "8ed898fb5a68f18e9bb9973832a5c1f8abcfc463";
- sha256 = "14lyx0vbqr97p3anzrsp7m3q0kqclyjcdwplpraim403fcklzbnz";
+ rev = "54de08577f9c19354cc303ee52836263aef486fb";
+ sha256 = "0l98lmy0c9l64khnl9j87l5g9g5fiah5l64hxn97h4b438kjcjm0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex";
@@ -38615,8 +37695,8 @@
src = fetchFromGitHub {
owner = "abo-abo";
repo = "swiper";
- rev = "a5cd13b9487007ba6cb3eb64575800ee14589691";
- sha256 = "00rmcd72hxcsvrkwqsqy9b0jr1rxh3ny3q1fh33zp61s82n1dkn0";
+ rev = "5d373be194e21f3e29a03fb498b901fcc5e128f9";
+ sha256 = "0ycch0gqhjxg9ffz5y942z908zy4y3yl242dnyskkv3vmkrziwsz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra";
@@ -38629,6 +37709,27 @@
license = lib.licenses.free;
};
}) {};
+ ivy-lobsters = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
+ melpaBuild {
+ pname = "ivy-lobsters";
+ version = "20170903.445";
+ src = fetchFromGitHub {
+ owner = "julienXX";
+ repo = "ivy-lobsters";
+ rev = "49923d6b59fc8ede5d930317f63f00577fef60b9";
+ sha256 = "1z593062phsxn7y408zj82w4xc8l5y4x6kj919hm8a0d3nf28kg7";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/d9774fbf133ce8db3ce996b1a40c586309a2fec6/recipes/ivy-lobsters";
+ sha256 = "1g8bwlh4nls21k16r1pmqmb633j19h3jnjbfl2vixyrh2na8ff1w";
+ name = "ivy-lobsters";
+ };
+ packageRequires = [ cl-lib ivy ];
+ meta = {
+ homepage = "https://melpa.org/#/ivy-lobsters";
+ license = lib.licenses.free;
+ };
+ }) {};
ivy-pages = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "ivy-pages";
@@ -38720,8 +37821,8 @@
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "de1f11e68f6752b3ee6738287d4dadb11bca8f8a";
- sha256 = "1jsx08pgwrz6n47a0zs05m0h6knpp9sgg8lrdwg792a93nrcqc5c";
+ rev = "e413e31d1e74fae1fc1bf86792013c3680be6580";
+ sha256 = "0hfibc1nllsp9zdb803ac6cwp6xx4xf8mvjszfq9vp5a63sgw0pl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags";
@@ -38779,12 +37880,12 @@
ivy-youtube = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, request }:
melpaBuild {
pname = "ivy-youtube";
- version = "20170217.404";
+ version = "20170822.659";
src = fetchFromGitHub {
owner = "squiter";
repo = "ivy-youtube";
- rev = "7e916dd531c52a2809188a99716aeff8446056cc";
- sha256 = "1dia1m9fjxbd5lsf788bv7zpdbrwbjswd9m588iaijcdd2hnma8q";
+ rev = "9a9d584124bd9905b5a8a7e29cdafa3224770c9d";
+ sha256 = "0fircdxhfb9s6qmzic2hizhlwfkszw3was83nw09zf0zhab3vllh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ivy-youtube";
@@ -38842,12 +37943,12 @@
j-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "j-mode";
- version = "20140702.809";
+ version = "20171103.845";
src = fetchFromGitHub {
owner = "zellio";
repo = "j-mode";
- rev = "caa55dfaae01d1875380929826952c2b3ef8a653";
- sha256 = "07kbicf760nw4qlb2lkf1ns8yzqy0r5jqqwqjbsnqxx4sm52hml9";
+ rev = "6f7f598eaa1a32ccf06b707631f2d539a2315fba";
+ sha256 = "1qldmcawi94pxv62zb2qgr27kr8lwhsql6wi67g0f5dlihpzc8dq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/410134ab2145adad3648b1024bfe4f6801df82c9/recipes/j-mode";
@@ -39089,36 +38190,15 @@
license = lib.licenses.free;
};
}) {};
- jaunte = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "jaunte";
- version = "20130413.219";
- src = fetchFromGitHub {
- owner = "kawaguchi";
- repo = "jaunte.el";
- rev = "b719c2d4d5d70640d70978b661863d10d6be06fc";
- sha256 = "1bv0al89wlwdv3bhasxnwhsv84phgnixclgrh4l52385rjn8v53f";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/jaunte";
- sha256 = "0chqiai7fv1idga71gc5dw4rdv1rblg5rrbdijh3glyi8yfr4snf";
- name = "jaunte";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/jaunte";
- license = lib.licenses.free;
- };
- }) {};
java-imports = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, s }:
melpaBuild {
pname = "java-imports";
- version = "20160311.1515";
+ version = "20170913.710";
src = fetchFromGitHub {
owner = "dakrone";
repo = "emacs-java-imports";
- rev = "f1631adacdd9fcb7a92ee4fdfb9e592a1a9c3b0b";
- sha256 = "1wk9i43b147bjcvhq27vcqxi6y1yl6w3n4i2sw3krk4vxcm1mwnm";
+ rev = "e96ff44ed48b362ab6227b8b802b84d84f78bcaa";
+ sha256 = "0nryawj8v6gj6hnb81yf6966kjnydcz49zsg2k355gldryqf4v5p";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5f6f4e4c14c422c2066f2200bb9b8f35e2ecc896/recipes/java-imports";
@@ -39239,12 +38319,12 @@
jbeans-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "jbeans-theme";
- version = "20170413.901";
+ version = "20171101.1641";
src = fetchFromGitHub {
owner = "synic";
repo = "jbeans-emacs";
- rev = "ee3c3b95e4a8697438d48757c604f9491b395417";
- sha256 = "10zgdc4619y7w80w41jvr63s3wms52kfz011gaxwhzdgm2mdjqav";
+ rev = "5a37364636caa7b006e4af70b437c63dfad1f448";
+ sha256 = "0zpxhpqs0s2ph86hhy8hqpds08aanncys76dbz4j0zp0z0ic9l54";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6dd4bd78795ec7509d8744fec1e80426ce0557ec/recipes/jbeans-theme";
@@ -39278,22 +38358,22 @@
license = lib.licenses.free;
};
}) {};
- jdee = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, memoize }:
+ jdee = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, memoize, s }:
melpaBuild {
pname = "jdee";
- version = "20170506.1514";
+ version = "20171007.835";
src = fetchFromGitHub {
owner = "jdee-emacs";
repo = "jdee";
- rev = "e572d4889604c0b4e1d9180b8a68f9c0f99b99d2";
- sha256 = "1vhwza7xak2im2xp7qzs8b6bmnf9yw2di86rav8wh5xapqr8x7mn";
+ rev = "ebe5d2e36a6a367376ed6cde590d5f805830ec9e";
+ sha256 = "0rq8vp3pmnyabqzzplc91dk2ka48k809is9v4q486xv7y43013jh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a6d2c98f3bf2075e33d95c7befe205df802e798d/recipes/jdee";
sha256 = "15n76w0ygjmsa2bym59bkmbbh0kpqx6nacp4zz32hlg48kgz1dx4";
name = "jdee";
};
- packageRequires = [ dash emacs flycheck memoize ];
+ packageRequires = [ dash emacs flycheck memoize s ];
meta = {
homepage = "https://melpa.org/#/jdee";
license = lib.licenses.free;
@@ -39446,6 +38526,27 @@
license = lib.licenses.free;
};
}) {};
+ jetbrains = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "jetbrains";
+ version = "20171027.2055";
+ src = fetchFromGitHub {
+ owner = "emacs-php";
+ repo = "jetbrains.el";
+ rev = "38e136079f3f2ddbe0e8b7dec01cf6b515e897d8";
+ sha256 = "1ji64qip5raf0lbv7fv36rd4fwa33zn0xi7sa0zrgf0kcsr0qasb";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/00dd4626e261d9831fc62d866d50b7257ee418c4/recipes/jetbrains";
+ sha256 = "0254dkzf2x5dj3j549xjash0lsadkn0bdcyjkjlrv8hqvdr1f1m7";
+ name = "jetbrains";
+ };
+ packageRequires = [ cl-lib emacs f ];
+ meta = {
+ homepage = "https://melpa.org/#/jetbrains";
+ license = lib.licenses.free;
+ };
+ }) {};
jg-quicknav = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "jg-quicknav";
@@ -39488,25 +38589,6 @@
license = lib.licenses.free;
};
}) {};
- jira = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "jira";
- version = "20131210.1022";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/jira.el?revision=11";
- sha256 = "18b6hdqk59gnqh4ibq8lj59kbsg5gbyfb7vfcvpgmxjikpl3cgkz";
- name = "jira.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/jira";
- sha256 = "1zrywkwzqn5ffzzk3rmy01vj6afm2p9gm81rpc7s86cj3ywfy4wx";
- name = "jira";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/jira";
- license = lib.licenses.free;
- };
- }) {};
jira-markup-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "jira-markup-mode";
@@ -39619,8 +38701,8 @@
src = fetchFromGitHub {
owner = "ljos";
repo = "jq-mode";
- rev = "f2dc70af890694828b8227b2727240e82780d7e5";
- sha256 = "18hprvhlwf110j7anyrrrjp4xjr3556yipz7n4jyqj69i0kvjw5c";
+ rev = "5c081859def7510dafc6b14449f5285916898f15";
+ sha256 = "14421p9k6b02syb8irprz527dcqbh1r4i2m86pi94sv6ffzbs0gg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/318705966e26e58f87b53c115c519db95874ac1c/recipes/jq-mode";
@@ -39675,6 +38757,48 @@
license = lib.licenses.free;
};
}) {};
+ js-auto-format-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "js-auto-format-mode";
+ version = "20171031.1819";
+ src = fetchFromGitHub {
+ owner = "ybiquitous";
+ repo = "js-auto-format-mode";
+ rev = "68c6c51320f124d84145643dda59619966bb29f4";
+ sha256 = "04slx5ipcf1lj9fvx537yfyvqmg324pfji02w5iafqnyvyhdjy9p";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/2d3be16771b5b5fde639da3ee97890620354ee7a/recipes/js-auto-format-mode";
+ sha256 = "1gxf7xz1j3ga2pk5w8cgny7l8kid59zap2a97lhb50w1qczfqqzs";
+ name = "js-auto-format-mode";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/js-auto-format-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
+ js-codemod = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "js-codemod";
+ version = "20171104.454";
+ src = fetchFromGitHub {
+ owner = "torgeir";
+ repo = "js-codemod.el";
+ rev = "014e56c846487d1eeaf8a91dd503b9d96eb1510a";
+ sha256 = "0s07ypjlqsx2pgq89wmr69w9p7ybc62abqp53kzf5gmdl6fdzgxq";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/81670a2467fa846a3f0e6c81e870e8ae140dd54e/recipes/js-codemod";
+ sha256 = "1m5wbyx12sc5qwbrh948ikskck10p6j05ahrrvmmflvfb3q4vpcj";
+ name = "js-codemod";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/js-codemod";
+ license = lib.licenses.free;
+ };
+ }) {};
js-comint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "js-comint";
@@ -39762,12 +38886,12 @@
js2-closure = callPackage ({ fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
melpaBuild {
pname = "js2-closure";
- version = "20160715.1536";
+ version = "20170816.1218";
src = fetchFromGitHub {
owner = "jart";
repo = "js2-closure";
- rev = "2b99540f43ddae123014d0fe20c66f5b536312cd";
- sha256 = "0f280vk7mhslra793183jmi72hlhiq5mgjd0f0b6hr0gyj3iszb0";
+ rev = "f59db386d7d0693935d0bf52babcd2c203c06d04";
+ sha256 = "09zfmxi9m883lzsafnws06ifpq92b2i9q05pxk085vgkdpq35nss";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/61bf3e70ae38a78184f0b373ff6f0db234f51cb2/recipes/js2-closure";
@@ -39804,12 +38928,12 @@
js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "js2-mode";
- version = "20170812.1419";
+ version = "20171103.1540";
src = fetchFromGitHub {
owner = "mooz";
repo = "js2-mode";
- rev = "048da26e17a1011f1466794218ff175acd503c31";
- sha256 = "17hnal44lcbdb5cma1mlbf1flc73vnsbyjhd56hh4bw2qz47zvz9";
+ rev = "4e032e67e11490aacca2aacb208b4b481d430ee1";
+ sha256 = "1j6b51pjsj02z6gslw7867781kfkvv7j76x7q0m12bjrqc6f66rr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode";
@@ -39825,12 +38949,12 @@
js2-refactor = callPackage ({ dash, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, multiple-cursors, s, yasnippet }:
melpaBuild {
pname = "js2-refactor";
- version = "20170703.314";
+ version = "20171013.258";
src = fetchFromGitHub {
owner = "magnars";
repo = "js2-refactor.el";
- rev = "17dff6480c8d0b8e4daf44d65181ebc1371d3bdf";
- sha256 = "0fs9w3110cc62a8g6dasfmxi5zsmhhvhviw8r17p63f3snga6xi7";
+ rev = "b9829059745fbedfeb8c48646056fb27ce23a33a";
+ sha256 = "1jwkly6srxx21ff6xnkvr7qqrlpsvis8i89v0z7vfz5f05yryscj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8935264dfea9bacc89fef312215624d1ad9fc437/recipes/js2-refactor";
@@ -40011,6 +39135,27 @@
license = lib.licenses.free;
};
}) {};
+ jsonnet-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "jsonnet-mode";
+ version = "20171005.24";
+ src = fetchFromGitHub {
+ owner = "mgyucht";
+ repo = "jsonnet-mode";
+ rev = "efe768fdcff25d746674fbbf229b9e1a7efea4f1";
+ sha256 = "1a52266y83z9i3sg7hhc8sw7rhjy5i9wdy2bv7s2fv00lnngaj29";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/ba17372732723f73e8eeb6e7c47abc0edeb20da4/recipes/jsonnet-mode";
+ sha256 = "1aadys887szlc924qr645lby9f8vzvxkwhq6byhppk1b01h911ia";
+ name = "jsonnet-mode";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/jsonnet-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
jss = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, websocket }:
melpaBuild {
pname = "jss";
@@ -40096,12 +39241,12 @@
julia-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "julia-mode";
- version = "20170710.538";
+ version = "20170916.628";
src = fetchFromGitHub {
owner = "JuliaLang";
repo = "julia-emacs";
- rev = "edaaff2e971a527460f838bebc0ef679f9a571b0";
- sha256 = "1sm57dq58fjbjjprl1bf7vibrvp6v5m4ipiq7r73c2bdg8rmaapm";
+ rev = "115d4dc8a07445301772da8376b232fa8c7168f4";
+ sha256 = "1is4dcv6blslpzbjcg8l2jpxi8xj96q4cm0nxjxsyswpm8bw8ki0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8522d197cb1b2c139959e7189765001c5ee7e61a/recipes/julia-mode";
@@ -40117,12 +39262,12 @@
julia-repl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "julia-repl";
- version = "20170708.2324";
+ version = "20171018.443";
src = fetchFromGitHub {
owner = "tpapp";
repo = "julia-repl";
- rev = "93b9d515e6f5fbacd42069a2ae6da3bd80b7c4d0";
- sha256 = "1xpdr343b5qa1pb92d5nz0m9lswq2s8nzg46msjnb1dvihqyb27w";
+ rev = "b20cadb67d65e52ecb57bbb07369215d01c956e0";
+ sha256 = "048jf00lmyrsr815kk8h5y5hdvpmbd6zvchq8x5vyziqd2vpsdc3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9a2a494969a9caf2f4513b12504379c9685047dc/recipes/julia-repl";
@@ -40184,8 +39329,8 @@
src = fetchFromGitHub {
owner = "eschulte";
repo = "jump.el";
- rev = "95a9559bd301ff86fa3b72b15126dc4851ce4a69";
- sha256 = "0fyrrzilvacvrxbw8r6wc0jphrk3h4dsw86zp3d63h4s6rlldhsa";
+ rev = "e4f1372cf22e811faca52fc86bdd5d817498a4d8";
+ sha256 = "0354b64drvv8v5g13xy5nc1klwx4hldz1b5mf1frhna7h2dqz0j9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f0c791aebccc08b770b3969ce5d2e82cbe26f80e/recipes/jump";
@@ -40243,12 +39388,12 @@
jump-tree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "jump-tree";
- version = "20170812.2310";
+ version = "20171014.851";
src = fetchFromGitHub {
owner = "yangwen0228";
repo = "jump-tree";
- rev = "d74a10e86dde8f54b9c3c5392735c0e4d2fc26cc";
- sha256 = "1vqzy9ddmy8jsacxfd94qsdxcx5w310wdnsw115lvm7cl93l8jjl";
+ rev = "282267dc6305889e31d46b405b7ad4dfe5923b66";
+ sha256 = "0r6cwpks4aylndvq5lcny3799fag05zm36gd11043wca7sgr90fz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fe6b08848929c83e3cdea623b331176c0f20cbe9/recipes/jump-tree";
@@ -40369,12 +39514,12 @@
kakapo-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "kakapo-mode";
- version = "20160727.2136";
+ version = "20171003.2151";
src = fetchFromGitHub {
owner = "listx";
repo = "kakapo-mode";
- rev = "bb6de027fb578df31652e58daa92522884ecc274";
- sha256 = "1y6ihk52jza07krz24l9axkwhi46fwi4h6bcjdck9q1qvdrcxw40";
+ rev = "67d516138172fd60782df94454b3d0bd247e84f3";
+ sha256 = "0r2n410arr48skcwm39c6mjhzsia117lb8xd7pc4854y0rbrvrvs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a43f0f1f6a0773240a51d379ec786c20a9389e7b/recipes/kakapo-mode";
@@ -40469,24 +39614,24 @@
license = lib.licenses.free;
};
}) {};
- kaolin-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ kaolin-themes = callPackage ({ autothemer, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
- pname = "kaolin-theme";
- version = "20170802.1135";
+ pname = "kaolin-themes";
+ version = "20171105.1035";
src = fetchFromGitHub {
- owner = "0rdy";
- repo = "kaolin-theme";
- rev = "37b5b837051834cf7f8eb5b486d8b04b021433f3";
- sha256 = "0bmzfc337pv3scs717yhyw0vsrp864s6l255afli0bd2hicncnaa";
+ owner = "ogdenwebb";
+ repo = "emacs-kaolin-themes";
+ rev = "92aabaf06ab58b2c5f89b9d9c0cbff8540535e23";
+ sha256 = "16qvnpan03abhnp14w99chs3m4vl55k410xpk491xxcc4zqr5z1d";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/d2abf9d914cdc210bbd47ea92d0dac76683e21f0/recipes/kaolin-theme";
- sha256 = "1316sn1xpli9aqbhn8sldyvsc2fwk1ql9aw4l0rgkfbivvcklp7c";
- name = "kaolin-theme";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes";
+ sha256 = "1pd2v54d578f1wbwvqzplkdz1qvy8w8s6na511b0v5y9sksgm2xw";
+ name = "kaolin-themes";
};
- packageRequires = [ emacs ];
+ packageRequires = [ autothemer cl-lib emacs ];
meta = {
- homepage = "https://melpa.org/#/kaolin-theme";
+ homepage = "https://melpa.org/#/kaolin-themes";
license = lib.licenses.free;
};
}) {};
@@ -40980,8 +40125,8 @@
src = fetchFromGitHub {
owner = "kivy";
repo = "kivy";
- rev = "0cc3a981220c228d68ce371c929808ce328a0b12";
- sha256 = "1lxgp5isrl6c0zd03gv6r84qlgqqx4gf6b22yshhg333wccfl3h7";
+ rev = "15d95c759f44c6d61a9bd424b482d3c1979bbb5a";
+ sha256 = "1w18nag2db89yjp3ymcwf7ga4psisny7f22jr3pj6m52458ag807";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode";
@@ -40997,12 +40142,12 @@
kiwix = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "kiwix";
- version = "20170508.1802";
+ version = "20170927.120";
src = fetchFromGitHub {
owner = "stardiviner";
repo = "kiwix.el";
- rev = "a62f9e7c17ab34b183b36ae63408123a75689a5b";
- sha256 = "0v86haw2nfd7q4yylzd0ls6916l95960c15khjnv1cfyshhri5q7";
+ rev = "86dbead6c0017beefd92a0b64a0bb5f5d12c5b16";
+ sha256 = "142mm1wy8zvlkzairnc1rjdi1lsq1asfk4zdbs1aria1nxz1sx6x";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/kiwix";
@@ -41060,12 +40205,12 @@
kodi-remote = callPackage ({ elnode, fetchFromGitHub, fetchurl, json ? null, let-alist, lib, melpaBuild, request }:
melpaBuild {
pname = "kodi-remote";
- version = "20170811.105";
+ version = "20171008.2226";
src = fetchFromGitHub {
owner = "spiderbit";
repo = "kodi-remote.el";
- rev = "56440a40e0b43e639e0530414940b21cf4c24280";
- sha256 = "0a1ld6kr244957yh2nlqcr9xf77kzgn9p2b5mhbmwphvfc0r3a1x";
+ rev = "479075d96857696cf029cd1f482b9f2f31d82452";
+ sha256 = "0kvx43ny49j115kj6zpy1i5g87bjgiimfgj9xp2fn9830adymc24";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/08f06dd824e67250afafdecc25128ba794ca971f/recipes/kodi-remote";
@@ -41165,12 +40310,12 @@
kotlin-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "kotlin-mode";
- version = "20170522.1524";
+ version = "20171009.1301";
src = fetchFromGitHub {
owner = "Emacs-Kotlin-Mode-Maintainers";
repo = "kotlin-mode";
- rev = "1ed0c5589ef2d53242f767f6071dbea90c64e813";
- sha256 = "0nywyf0znaffkchca5hal1w6h7fis9pybiivz7vzrr85ppl0gzas";
+ rev = "ebcf6f3730f455894ebb7ed8e42950f66e8e1c1d";
+ sha256 = "1345ahc8i69sl2d9v03gdgrdcj7qkbzrl0pl957hjn3vbvmhrz00";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9f2560e913b215821221c96069a1385fe4e19c3e/recipes/kotlin-mode";
@@ -41186,12 +40331,12 @@
kpm-list = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "kpm-list";
- version = "20160310.1050";
+ version = "20170924.652";
src = fetchFromGitHub {
owner = "KMahoney";
repo = "kpm-list";
- rev = "6fb7db35f7dac7fb8f956c67ee2eea9d3fa54034";
- sha256 = "0hbzr5x9ykzrbwzfsf6rc4pbiw9m59ny3cgcx26nbi6ijbjl2fxj";
+ rev = "e0f5112e5ce8ec1b603f4428fa51681c68bb28f5";
+ sha256 = "1achcr3v0d85narnxqpbfxy9qfk537kl83wiq5lyfy3lwqqf7dmp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6b7065d016e2da49277b165edf565bef5819d483/recipes/kpm-list";
@@ -41288,6 +40433,27 @@
license = lib.licenses.free;
};
}) {};
+ kubernetes-tramp = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "kubernetes-tramp";
+ version = "20171026.922";
+ src = fetchFromGitHub {
+ owner = "gruggiero";
+ repo = "kubernetes-tramp";
+ rev = "9fa84df71f6e88bc23a756cdf2df393a35aec945";
+ sha256 = "1l1ibc97ahp3zwwypqfg3201qdxad4sdpdaq7nsfb87gh46vsbz8";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/8ea4b15e64a9dc33b9977650488693cacadd1ab1/recipes/kubernetes-tramp";
+ sha256 = "15nlx3w2v0gky0zgbx7n0w1mdr6yaj4dh028ay2k19wg8wbsckjq";
+ name = "kubernetes-tramp";
+ };
+ packageRequires = [ cl-lib emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/kubernetes-tramp";
+ license = lib.licenses.free;
+ };
+ }) {};
kurecolor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "kurecolor";
@@ -41372,25 +40538,6 @@
license = lib.licenses.free;
};
}) {};
- lacarte = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "lacarte";
- version = "20170307.837";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/lacarte.el?revision=41";
- sha256 = "0m3swrvxz0cy01pd4kag626fxqp4l2zzwpgr26yp5wpsfxl9avv8";
- name = "lacarte.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/lacarte";
- sha256 = "07rxgjax6ms0knjj5qplfy0hxzfhs6iqk4ny43566zzqv86n0bhi";
- name = "lacarte";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/lacarte";
- license = lib.licenses.free;
- };
- }) {};
lang-refactor-perl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "lang-refactor-perl";
@@ -41436,12 +40583,12 @@
langtool = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "langtool";
- version = "20170606.432";
+ version = "20170917.2154";
src = fetchFromGitHub {
owner = "mhayashi1120";
repo = "Emacs-langtool";
- rev = "d976e4f0cadb2309b798540429558936f8f45889";
- sha256 = "1qlgd5i8jngsq754jm44gb46p5y6j2cccacg72aklvwajay0adyh";
+ rev = "bae4bdd240583b2253b4ff03af5295146e285103";
+ sha256 = "0zwaddpmvkq7v5nnyzacmx0ql5zjlisvkqwa2knw3pihngr160cd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/503845e79e67c921f1fde31447f3dd4da2b6f993/recipes/langtool";
@@ -41482,8 +40629,8 @@
src = fetchFromGitHub {
owner = "storvik";
repo = "emacs-lastpass";
- rev = "a2c94ff358db43a977d02032ba84ee1008579522";
- sha256 = "1nc21pf7cmbfidnilk6012h7124yxhkhzwim7yg95sqcmr8ws9js";
+ rev = "264250725b3ba23412919ec10cfa7390473b534c";
+ sha256 = "1qqmg59vbwb31nx3vi88d53484gy3sg8wnq45xrra45drpjka3ry";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/46e5e8735baab7728bddce2693cea6bcee0e6360/recipes/lastpass";
@@ -41499,12 +40646,12 @@
latex-extra = callPackage ({ auctex, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "latex-extra";
- version = "20160328.1721";
+ version = "20170816.1847";
src = fetchFromGitHub {
owner = "Malabarba";
repo = "latex-extra";
- rev = "9e89c5548298394aa47a5087a8e79655105a6f3d";
- sha256 = "1gz2zay2wah56s0gkkfnhfmm0wr1w4gjz51pb1q72br0n4r01xq9";
+ rev = "82d99b8b0c2db20e5270749582e03bcc2443ffb5";
+ sha256 = "15m7zvdhg5z7d8alrw66p703wdp5r57lxrgq3zz7xc4hscwghlb1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/latex-extra";
@@ -41726,6 +40873,27 @@
license = lib.licenses.free;
};
}) {};
+ lean-mode = callPackage ({ dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s }:
+ melpaBuild {
+ pname = "lean-mode";
+ version = "20171102.754";
+ src = fetchFromGitHub {
+ owner = "leanprover";
+ repo = "lean-mode";
+ rev = "c0af876c967fc969d67c467bc6767210d19c5d87";
+ sha256 = "04qzck156wb2bvrb8adbn7rx2v0bsjcirlbx4ajajjsqy858ayn9";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/42f4d6438c8aeb94ebc1782f2f5e2abd17f0ffde/recipes/lean-mode";
+ sha256 = "0rdraxsirkrzbinjwg4qam15iy3qiixqgwsckngzw8d9a4s9l6sj";
+ name = "lean-mode";
+ };
+ packageRequires = [ dash dash-functional emacs f flycheck s ];
+ meta = {
+ homepage = "https://melpa.org/#/lean-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
leanote = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pcache, request, s }:
melpaBuild {
pname = "leanote";
@@ -41750,12 +40918,12 @@
ledger-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ledger-mode";
- version = "20170714.1529";
+ version = "20170901.2039";
src = fetchFromGitHub {
owner = "ledger";
repo = "ledger-mode";
- rev = "f4abac98adfe747c93abd4398dac3aafa33a816c";
- sha256 = "04gm8i663k9vgij0c9qqmicmq0dcxbnahjrx81agp2sqzixh6adx";
+ rev = "24b43e34dd34de23e54d7ddaa2a147efda6af03d";
+ sha256 = "0cdcd2hpv34yhpplgqljiyncs2q0i321f4xwfkb2inqbv9q4byhk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1549048b6f57fbe9d1f7fcda74b78a7294327b7b/recipes/ledger-mode";
@@ -41901,8 +41069,8 @@
src = fetchFromGitHub {
owner = "purcell";
repo = "less-css-mode";
- rev = "59bf174c4e9f053ec2a7ef8c8a8198490390f6fb";
- sha256 = "1rkjamdy2a80w439vb2hhr7vqjj47wi2azlr7yq2xdz9851xsx9f";
+ rev = "2c3f69640c3c98457255f601db98f520dee2e7b6";
+ sha256 = "01cxa7p299k3kgcv2x4lcri154fij7p02v1kl3fx4vnc88nr9jwd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/less-css-mode";
@@ -41960,12 +41128,12 @@
leuven-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "leuven-theme";
- version = "20170809.1329";
+ version = "20170919.252";
src = fetchFromGitHub {
owner = "fniessen";
repo = "emacs-leuven-theme";
- rev = "23d15ff1a54b8f034fa21bc597f680a37310dd8a";
- sha256 = "1qlympn43shsx44clsgsdc88cdpqlwc1mwvdjkimypvpys5p6swz";
+ rev = "9d31a9d4ed763d6309e9d44985cd8b4a5a2fb500";
+ sha256 = "0vr535a32cgkna0h1z8ac9cb4al3jb01bybn956rz51qdbzm2d1h";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b09451f4eb2be820e94d3fecbf4ec7cecd2cabdc/recipes/leuven-theme";
@@ -42027,8 +41195,8 @@
src = fetchFromGitHub {
owner = "rvirding";
repo = "lfe";
- rev = "446f61280f984f17d4b923150f3b5c58f520ecaa";
- sha256 = "1vnck52yj8h0zahqgxlx70h7pqk9dnd5sy3jdl92rkj0bimhqr9s";
+ rev = "2880c8a2a7fe998238b6490fe3e3c484b5c5985e";
+ sha256 = "1xcnh1hk815wizhp7h1mik3npm7zpbvg4554nwbj072gnbb9j1nx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode";
@@ -42041,25 +41209,6 @@
license = lib.licenses.free;
};
}) {};
- lib-requires = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "lib-requires";
- version = "20170307.855";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/lib-requires.el?revision=53";
- sha256 = "04lrkdjrhsgg7vgvw1mkr9a5m9xlyvjvnj2aj6w453bgmnp1mbvv";
- name = "lib-requires.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/lib-requires";
- sha256 = "1a69qf9dlsq5r7nm32hd0srzka7crd08gl82w8hjfvdhn43n2h0c";
- name = "lib-requires";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/lib-requires";
- license = lib.licenses.free;
- };
- }) {};
libmpdee = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "libmpdee";
@@ -42168,12 +41317,12 @@
link-hint = callPackage ({ avy, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "link-hint";
- version = "20170313.1945";
+ version = "20170923.855";
src = fetchFromGitHub {
owner = "noctuid";
repo = "link-hint.el";
- rev = "6b926a6fbb7288eb062b28747a32644c5c8fea4f";
- sha256 = "047y75wkqiv1vlrgg6fy78xsfms14drfwmil2sb7j5p5p0cw5xc7";
+ rev = "0294df85aee10b47fcf6c2c9bfe7e1038660fa21";
+ sha256 = "0ixfrp6pfljgy5ja79cka0fa6a9ganwhh5myz6czqj4ykjzlyi2c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d24b48fe0bc127ae6ac4084be8059aacb8445afd/recipes/link-hint";
@@ -42320,34 +41469,15 @@
license = lib.licenses.free;
};
}) {};
- lispxmp = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "lispxmp";
- version = "20170110.1508";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/lispxmp.el?revision=17";
- sha256 = "120wgxvckrgryfg2lvyx60rkcayii0g4ny2cdk3aiwsrpqcyhlyr";
- name = "lispxmp.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/6fc8f86533402e4be8bac87ad66bc8d51c8d40f8/recipes/lispxmp";
- sha256 = "02gfbyng3dh2445jfkasxzjc9dlk02dafbfkjm40iwmb8h0fzji4";
- name = "lispxmp";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/lispxmp";
- license = lib.licenses.free;
- };
- }) {};
lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }:
melpaBuild {
pname = "lispy";
- version = "20170813.913";
+ version = "20171105.55";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "lispy";
- rev = "15017ccd229644a3b253937f2bb5e1420f197d6f";
- sha256 = "1lldyv3ixgy3rsxyp6rfz5427vd9bds90rzvjxf747hn5ws6m110";
+ rev = "6ea057a340f60d094468c97dcc63f72750d99a65";
+ sha256 = "1sip61sq8743bn4gyqpscwdhl9s6j4sl61n476c9iljkr9byq620";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy";
@@ -42384,12 +41514,12 @@
lispyville = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, lispy, melpaBuild }:
melpaBuild {
pname = "lispyville";
- version = "20170515.807";
+ version = "20170907.926";
src = fetchFromGitHub {
owner = "noctuid";
repo = "lispyville";
- rev = "92e22ed9f70e0ae2c68736fc8d91240af36102e1";
- sha256 = "0gz9z6dsslrx8fgzgy98y3mcpcs00k10hygrw8rbrdf2q8k2xpcg";
+ rev = "522fd8dcce23b2719c758e64f99b64591406f2f5";
+ sha256 = "0sbqw585lv5j3w13zq2adrcqybw88y36qnnd2vp8nk9kgzvl4p62";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b5d96d3603dc328467fcce29d3ac1b0a02833d51/recipes/lispyville";
@@ -42444,26 +41574,6 @@
license = lib.licenses.free;
};
}) {};
- list-processes-plus = callPackage ({ fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "list-processes-plus";
- version = "20131117.1135";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/list-processes+.el";
- sha256 = "1bssvyjgk1h1wiaxxdi2m5gjy6a790a9rwvi0r22hin7iskg300a";
- name = "list-processes+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/d508d50d89c914c53211197afc758fc0e1154081/recipes/list-processes+";
- sha256 = "10x7hkba2bmryyl68w769fggw65dl4f3a9g0gqdzmkdj80rcipky";
- name = "list-processes-plus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/list-processes+";
- license = lib.licenses.free;
- };
- }) {};
list-register = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "list-register";
@@ -42492,8 +41602,8 @@
src = fetchFromGitHub {
owner = "purcell";
repo = "list-unicode-display";
- rev = "1719e7e90035c78dcc8a780c34cd18e6b3dcc6b1";
- sha256 = "1xy06vlwlhz872099xplzsz7rbyf6jsvcqyg6qpry4b2c57zjx8d";
+ rev = "222c21c68ccc930b2843ea919c960de9be3b55c2";
+ sha256 = "15gz7iw8k4xlj1ik216qw4q1j7nxihlnqgr983ic4k1n2r29fys7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0c8e2a974a56665b97d7622b0428994edadc88a0/recipes/list-unicode-display";
@@ -42555,8 +41665,8 @@
src = fetchFromGitHub {
owner = "Fuco1";
repo = "litable";
- rev = "4a57d7aeddca76448e4df2a46b42d49253e5e625";
- sha256 = "1zryrc0d2avb27w6a6yzqcc73rsr2rp795vi10qhb04ixda4a8w4";
+ rev = "90a2dca14a6da9b24fe332a65cff899ab4a90810";
+ sha256 = "1xaixgjfpnqnsdkhfia107fq5xaq2l0gdb0zp730z97958136mm3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/74f2190b653907985e49a96ded986ab11b4946d7/recipes/litable";
@@ -42677,12 +41787,12 @@
live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "live-py-mode";
- version = "20170805.1249";
+ version = "20171105.2207";
src = fetchFromGitHub {
owner = "donkirkby";
repo = "live-py-plugin";
- rev = "467285fa70dc5f349f2deb0d2950df037fb89f2d";
- sha256 = "0sm2k5988rf0q1zwqsnklx5p7wp4wrma0h11q7jd8j7v8vniqryz";
+ rev = "943cde89c10529891616c6e18484089aba133258";
+ sha256 = "0z4kp0irrc1zgcc42fhw4cc7kxmwy0hg185mh5943sbmz214zdsl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode";
@@ -42698,16 +41808,16 @@
lively = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "lively";
- version = "20160208.1035";
+ version = "20171005.54";
src = fetchFromGitHub {
- owner = "emacsorphanage";
+ owner = "purcell";
repo = "lively";
- rev = "12df5ccaec03670de87c01b0b4cd3e2b96e0738a";
- sha256 = "1qxw7i23z6c4yimrzpaqna8j39rashgbswdv4m0x4qg4sqc7szdp";
+ rev = "348675828c6a81bfa1ac311ca465aad813542c1b";
+ sha256 = "1j8w63hhk1wcxcfqz0wimqijp7p1m8a2n947gwqv8nk1wm40aqg3";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/lively";
- sha256 = "0qnyqlhqmmfq2f47zmy29hn6wqrx5yvsax8kn63nmxw380gw1z18";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/3e4b01286dbc84f01b43955b693ca08e675ffa07/recipes/lively";
+ sha256 = "1q8cbl3sr3dpvzk57985giy4xmz4lvg94jcw7shbhz1v9q05dr5g";
name = "lively";
};
packageRequires = [];
@@ -42785,8 +41895,8 @@
version = "20150910.644";
src = fetchgit {
url = "https://llvm.org/git/llvm";
- rev = "ef4534aee526b0ef3563e578644b0092057089fa";
- sha256 = "057ag54lav5kv14c18hmf8x5d7fryc64afnn9kzlc260m4qkniw2";
+ rev = "044ea898ddf3cf201f6507e0ebfd410353f7ae64";
+ sha256 = "1mn1236c5d46ngb4khla68lbzncs2vwajs6mw8a5jp87z5p7fsy9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/llvm-mode";
@@ -43052,12 +42162,12 @@
logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "logview";
- version = "20170705.1217";
+ version = "20170928.820";
src = fetchFromGitHub {
owner = "doublep";
repo = "logview";
- rev = "134b41557ab539219d9e3a1b3c8939df93676726";
- sha256 = "1jfdm64r6rj7pl6270v084fvaga5csa4snvbfjdlhs5bshn1d0v2";
+ rev = "72b6c5349206172a146b2c730b8ac040a92ebc3f";
+ sha256 = "1f93iyxf8v0jazzh6jljrm7r28z00nn14wr90qrh9y9chyq72n63";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview";
@@ -43196,36 +42306,57 @@
license = lib.licenses.free;
};
}) {};
- lsp-go = callPackage ({ fetchFromGitHub, fetchurl, go-mode, lib, lsp-mode, melpaBuild }:
+ lsp-go = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }:
melpaBuild {
pname = "lsp-go";
- version = "20170709.1021";
+ version = "20171021.336";
src = fetchFromGitHub {
owner = "emacs-lsp";
repo = "lsp-go";
- rev = "d3ff1fdf5c5e735d5beebff3b0bbbdd3432fbfdf";
- sha256 = "08kasnkg7v0haqrhd2r6dn094vcdhygc1v9nx3lhlfd1sq84m7qh";
+ rev = "d270b7c0bd893fdc73a97763e07706830756cad2";
+ sha256 = "0i9l56dmkxcycn9a2ddj1zwa9cmzb5lpj6qn5x1k9q9yfk9hsc6b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-go";
sha256 = "1yg21qqlf8ma734vaz6xrfym2058gvx7llsqy94fbbg1fg61c32c";
name = "lsp-go";
};
- packageRequires = [ go-mode lsp-mode ];
+ packageRequires = [ lsp-mode ];
meta = {
homepage = "https://melpa.org/#/lsp-go";
license = lib.licenses.free;
};
}) {};
+ lsp-hack = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }:
+ melpaBuild {
+ pname = "lsp-hack";
+ version = "20171030.1159";
+ src = fetchFromGitHub {
+ owner = "jra3";
+ repo = "lsp-hack";
+ rev = "b9d1d211015ce347d5a643261903c9c7dfcc8d83";
+ sha256 = "1brwlcqghlklvqswi2gnan4757acrvx4pvgsnk1zhf1knigry7nr";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/a70d8442c653554d28dc87425913424ab42ab5c8/recipes/lsp-hack";
+ sha256 = "1xfvk4hqs748b9dm8dirb2mdpnhq9mybgsbcj258yydr57d9zijs";
+ name = "lsp-hack";
+ };
+ packageRequires = [ lsp-mode ];
+ meta = {
+ homepage = "https://melpa.org/#/lsp-hack";
+ license = lib.licenses.free;
+ };
+ }) {};
lsp-haskell = callPackage ({ fetchFromGitHub, fetchurl, haskell-mode, lib, lsp-mode, melpaBuild }:
melpaBuild {
pname = "lsp-haskell";
- version = "20170421.328";
+ version = "20171021.330";
src = fetchFromGitHub {
owner = "emacs-lsp";
repo = "lsp-haskell";
- rev = "c22e6f4a70156e615e303d623e75362d3b14bcf4";
- sha256 = "1iv1y1pri313m5h59a06cydj8kkzy6ig4mi3hnzz5nxkcynd2whz";
+ rev = "16ca9fa975e64e840e062485ed30e4b297d72424";
+ sha256 = "03zrk3h76hpacrqw7lchjbslh0lg081jqkgf9n5nhxj2jg60v3vd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-haskell";
@@ -43241,12 +42372,12 @@
lsp-java = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }:
melpaBuild {
pname = "lsp-java";
- version = "20170522.633";
+ version = "20171023.650";
src = fetchFromGitHub {
owner = "emacs-lsp";
repo = "lsp-java";
- rev = "ba797f9588944ae917ccbfa15c40ee1e427ea6e5";
- sha256 = "0plccx57j85b53s8nmhkcw8h1hznm147v3ajhzx2j1adbb2j0h3f";
+ rev = "5176f63e80e8f971563c0b98658db7dc72404369";
+ sha256 = "07g259bx3vra2gf9mhxyd3qv1jb2s0lc0hndf0kvrcjdy29wwi52";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-java";
@@ -43259,15 +42390,57 @@
license = lib.licenses.free;
};
}) {};
+ lsp-javacomp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, s }:
+ melpaBuild {
+ pname = "lsp-javacomp";
+ version = "20171024.1547";
+ src = fetchFromGitHub {
+ owner = "tigersoldier";
+ repo = "lsp-javacomp";
+ rev = "ed23aaeee27e6253bed5752fb8fbb7a5fa61967c";
+ sha256 = "096rbyv0qwa454p1ns7g0py9lni5r6h1gw85wm5mwr00shjzq23n";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/6b8a1c034554579a7e271409fa72020cfe441f68/recipes/lsp-javacomp";
+ sha256 = "1gp8dlcpik2lmpicccq2kya498pmw9m8vz9m1fbd725p7wk58fhi";
+ name = "lsp-javacomp";
+ };
+ packageRequires = [ emacs lsp-mode s ];
+ meta = {
+ homepage = "https://melpa.org/#/lsp-javacomp";
+ license = lib.licenses.free;
+ };
+ }) {};
+ lsp-javascript-typescript = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }:
+ melpaBuild {
+ pname = "lsp-javascript-typescript";
+ version = "20171027.1005";
+ src = fetchFromGitHub {
+ owner = "emacs-lsp";
+ repo = "lsp-javascript";
+ rev = "8a565260906f90bb39f2da54cdb6179ec27005a6";
+ sha256 = "1dx0b7sq6wn309l1iy8s3ccn21hkv0xs061jbm53hz40pn30sjqc";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/999a4b0cd84e821c7e785ae4e487f32cff5c346b/recipes/lsp-javascript-typescript";
+ sha256 = "0pml7f7874c5xx94qpq7w5sz5hcail8s5nm5sy5vgax1j742r5y1";
+ name = "lsp-javascript-typescript";
+ };
+ packageRequires = [ lsp-mode ];
+ meta = {
+ homepage = "https://melpa.org/#/lsp-javascript-typescript";
+ license = lib.licenses.free;
+ };
+ }) {};
lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "lsp-mode";
- version = "20170629.33";
+ version = "20171106.535";
src = fetchFromGitHub {
owner = "emacs-lsp";
repo = "lsp-mode";
- rev = "3e93b3fd754931cfd122855659afbd070d844bac";
- sha256 = "0g45zrch41041axpi5j6jbng1dbjqhpysr38cv2f1kqdmw9ybg9a";
+ rev = "7c26203c407786f83b18e89629d15d9dcb31c4cb";
+ sha256 = "0lri2n18h0k5ykmp0w83ll7cyi2m880ah8d4lf5c4r39fz2kvyy3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-mode";
@@ -43280,15 +42453,36 @@
license = lib.licenses.free;
};
}) {};
+ lsp-ocaml = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }:
+ melpaBuild {
+ pname = "lsp-ocaml";
+ version = "20171022.308";
+ src = fetchFromGitHub {
+ owner = "emacs-lsp";
+ repo = "lsp-ocaml";
+ rev = "3683281bcb56fbe778fadb23e4363a411b6f9e73";
+ sha256 = "102cfv52hicmpbczs1z3cfz8d03p2hwzdkp3n0ljx1asnk4l1b8x";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/7be2d7a7af3d744c531e5e018d791bf2566df428/recipes/lsp-ocaml";
+ sha256 = "17334qcgqrz4jd5npizyq20fmxy07z2p3pq98s5np2kc4h9ara33";
+ name = "lsp-ocaml";
+ };
+ packageRequires = [ emacs lsp-mode ];
+ meta = {
+ homepage = "https://melpa.org/#/lsp-ocaml";
+ license = lib.licenses.free;
+ };
+ }) {};
lsp-python = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }:
melpaBuild {
pname = "lsp-python";
- version = "20170430.443";
+ version = "20171021.254";
src = fetchFromGitHub {
owner = "emacs-lsp";
repo = "lsp-python";
- rev = "5e032b39d74e63dee9157bf967f3902caa8524fa";
- sha256 = "1rhk6hlcvvg9yqy3x9fx8qdvhyf2aih2k6m4x5cr80mzvczmxl31";
+ rev = "5acea5f921dc396ea092ee253ec01b45dee3cbfd";
+ sha256 = "0nz0n7k0i0h77fn8w0d49b4pkljw7l15hzvjym16jh4gr1n098ar";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-python";
@@ -43301,22 +42495,22 @@
license = lib.licenses.free;
};
}) {};
- lsp-rust = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, rust-mode }:
+ lsp-rust = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }:
melpaBuild {
pname = "lsp-rust";
- version = "20170421.326";
+ version = "20171021.241";
src = fetchFromGitHub {
owner = "emacs-lsp";
repo = "lsp-rust";
- rev = "bd9b1f5d9195067decc496e61ad383d615b7f054";
- sha256 = "1nai41wv3wfxx2lslkpm0qas73j6hachiqwbvhvvcfz34h9nnc5l";
+ rev = "239e0cb8912749266a6226b68c6bc3b4362876c1";
+ sha256 = "0ki66lcdc67hxx3llzw5x8vrsfi1p5m509jpcvkhrrxs1sqr4bqn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-rust";
sha256 = "0p86223pfpi4hh8m66ccksxgl0yi7zrigd1gmbz0bzqa6yjgbp28";
name = "lsp-rust";
};
- packageRequires = [ lsp-mode rust-mode ];
+ packageRequires = [ lsp-mode ];
meta = {
homepage = "https://melpa.org/#/lsp-rust";
license = lib.licenses.free;
@@ -43490,6 +42684,27 @@
license = lib.licenses.free;
};
}) {};
+ maces-game = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "maces-game";
+ version = "20170903.851";
+ src = fetchFromGitHub {
+ owner = "pawelbx";
+ repo = "maces-game";
+ rev = "c0fb795f5642467ea528d2f04d904547e8a77ecd";
+ sha256 = "1sf1h5660fd3mfcca3h1fqk3xssgigkil26wz1kp1kvxfx9lm31m";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/2c9f33b926ecec48a43ba4f0484c687a7349ce50/recipes/maces-game";
+ sha256 = "0wz91dsa0w4xlkl5lbdr8k4pgkgalsqcy27sd0i8xswq3wwiy0ip";
+ name = "maces-game";
+ };
+ packageRequires = [ cl-lib dash emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/maces-game";
+ license = lib.licenses.free;
+ };
+ }) {};
macro-math = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "macro-math";
@@ -43511,25 +42726,6 @@
license = lib.licenses.free;
};
}) {};
- macros-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "macros-plus";
- version = "20170307.842";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/macros+.el";
- sha256 = "0x9fycqw234s1i0ndy7v0d7vn654id245pi0kwphbqgnga7w3l6p";
- name = "macros+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/macros+";
- sha256 = "0aihszxsjnc93pbbkmkr1iwzvii3jw8yh1f6dpnjykgvb328pvqi";
- name = "macros-plus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/macros+";
- license = lib.licenses.free;
- };
- }) {};
macrostep = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "macrostep";
@@ -43598,14 +42794,14 @@
pname = "magic-filetype";
version = "20161214.1017";
src = fetchFromGitHub {
- owner = "zonuexe";
+ owner = "emacs-php";
repo = "magic-filetype.el";
rev = "9a20137474697063898902b43a40423daa4eb64d";
sha256 = "1r16qlm2pqcph0zwy3fhzdjywdrfcwvldqk809vbhw71qkq4a54i";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/0d6027c5a66386f7140305a4cde12d66da4dfa09/recipes/magic-filetype";
- sha256 = "0gcys45cqn5ghppkn0rmyvfybprlfz1x6hqr21yv93mf79h75zhg";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/magic-filetype";
+ sha256 = "0f0j8fgh2gpkarz9308pns0d89wc2dchyim6hbixkdpqzg9gskc3";
name = "magic-filetype";
};
packageRequires = [ emacs s ];
@@ -43638,12 +42834,12 @@
magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
melpaBuild {
pname = "magit";
- version = "20170808.1712";
+ version = "20171106.529";
src = fetchFromGitHub {
owner = "magit";
repo = "magit";
- rev = "5c05bdb9de39872649821ea3c70f3489741bcc66";
- sha256 = "0g6578fpycfg7f5v3a7q6vaqgvcnxyf90yzg9mkjgis7b3im8jb7";
+ rev = "ab00c5ba2711da7804a92be0c04b996250d350b7";
+ sha256 = "08psg0gdxb5ng1319ah06d65f8brglb69s992qf2gh1njjfv4l2m";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit";
@@ -43666,12 +42862,12 @@
magit-annex = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
melpaBuild {
pname = "magit-annex";
- version = "20170702.832";
+ version = "20170913.659";
src = fetchFromGitHub {
owner = "magit";
repo = "magit-annex";
- rev = "2aa23cd169166e92be3e874c723ff224a9d42c15";
- sha256 = "1bjv8a38y75cpbxhzxsnvzpq2cvs80x8ai7pspsqf4pp3w1dj45n";
+ rev = "895c229c2b0d822a4debb302d8638105ecb4ee20";
+ sha256 = "0316csgc95dalqmkxj6qlb7inzcg4csfs9n3im1ygswcswpdaajh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-annex";
@@ -43771,12 +42967,12 @@
magit-gitflow = callPackage ({ fetchFromGitHub, fetchurl, lib, magit, magit-popup, melpaBuild }:
melpaBuild {
pname = "magit-gitflow";
- version = "20170425.128";
+ version = "20170929.124";
src = fetchFromGitHub {
owner = "jtatarik";
repo = "magit-gitflow";
- rev = "5bdcfe0a7bf4f5bb9a927baa4880233bf11a4a6b";
- sha256 = "12pi6aw44lnzzcw0zgz5rxvcf4p700fkz4q2skbapwmds8gw3fg9";
+ rev = "cc41b561ec6eea947fe9a176349fb4f771ed865b";
+ sha256 = "0jz69wrrzvqadaphmjrr146nzvmphsbl7rmc3ccnpw1gw6gnz81f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/dfaeb33dec2c75d21733b6e51d063664c6544e4d/recipes/magit-gitflow";
@@ -43838,8 +43034,8 @@
src = fetchFromGitHub {
owner = "qoocku";
repo = "magit-p4";
- rev = "ef23e89dc504970e78ac9b158731a3eda7d6d7ee";
- sha256 = "1gld0x4y4jshyfr0q8k5icjpgmfrbcfir13sysgzqjz9ssyn2bi5";
+ rev = "c87de6d3f10fd35415a0c56e63747eb14ed5a113";
+ sha256 = "03gn9xl9mqxb7ways9n9rcl0hc3h41j2nq42q10b0jw5zrzmr9ra";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/440d47ca465845eaa601ca8a6e4b15fc197e522b/recipes/magit-p4";
@@ -43855,12 +43051,12 @@
magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "magit-popup";
- version = "20170810.917";
+ version = "20171023.926";
src = fetchFromGitHub {
owner = "magit";
repo = "magit";
- rev = "5c05bdb9de39872649821ea3c70f3489741bcc66";
- sha256 = "0g6578fpycfg7f5v3a7q6vaqgvcnxyf90yzg9mkjgis7b3im8jb7";
+ rev = "ab00c5ba2711da7804a92be0c04b996250d350b7";
+ sha256 = "08psg0gdxb5ng1319ah06d65f8brglb69s992qf2gh1njjfv4l2m";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup";
@@ -43978,22 +43174,22 @@
license = lib.licenses.free;
};
}) {};
- magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub-plus, lib, magit, melpaBuild, s }:
+ magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub-plus, git-commit, lib, magit, markdown-mode, melpaBuild, s }:
melpaBuild {
pname = "magithub";
- version = "20170810.1947";
+ version = "20171105.918";
src = fetchFromGitHub {
owner = "vermiculus";
repo = "magithub";
- rev = "dccda82fff3532ac6af262f3020b4b063a223045";
- sha256 = "1mn53vqxf8al0a8plx1wv502iglvgnlbi2adlllyh8vjjgfk3w9m";
+ rev = "909804449129a43fbc24ced3362aa5ea37cbefd4";
+ sha256 = "059m1y8bd8779l59701as2y359c1dlf7nha1nsnd5c7vgsmi28ln";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/magithub";
sha256 = "11par5rncsa866gazdw98d4902rvyjnnwbiwpndlyh06ak0lryab";
name = "magithub";
};
- packageRequires = [ emacs ghub-plus magit s ];
+ packageRequires = [ emacs ghub-plus git-commit magit markdown-mode s ];
meta = {
homepage = "https://melpa.org/#/magithub";
license = lib.licenses.free;
@@ -44149,12 +43345,12 @@
makefile-executor = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "makefile-executor";
- version = "20170721.13";
+ version = "20171017.438";
src = fetchFromGitHub {
owner = "thiderman";
repo = "makefile-executor.el";
- rev = "105f76bce212bfe511eda191366fef9ee45fd1ab";
- sha256 = "0p6vk0f3qpcpa7fa4q3r6w5a9d0v67gv4khf5jy9g2nc9bz9ai57";
+ rev = "a950438c93dc2fdcb867ac25174c773deda95aff";
+ sha256 = "1vpa24k8gm9zr8mpam76k1wbzc1zama5s5ch1f8c1h539l8i8cl9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/08f8b4d680e4907dbd8ea46a75d98aa0e93c2bb9/recipes/makefile-executor";
@@ -44167,27 +43363,6 @@
license = lib.licenses.free;
};
}) {};
- maker-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
- melpaBuild {
- pname = "maker-mode";
- version = "20150116.354";
- src = fetchFromGitHub {
- owner = "fommil";
- repo = "maker-mode";
- rev = "335c43b08eff589040129dae1ea13c88793b069e";
- sha256 = "0w3kar52yf8clf9801c4jzfrixi10clc8fs8ni2d4pzhdwwca2zw";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/ba7edfa6ab6b93c346f92859db706acb3fd5fc6e/recipes/maker-mode";
- sha256 = "03q09jxmhwqy7g09navj08z9ir0rbh7w26c1av7hwhmq4i6xwg8a";
- name = "maker-mode";
- };
- packageRequires = [ dash s ];
- meta = {
- homepage = "https://melpa.org/#/maker-mode";
- license = lib.licenses.free;
- };
- }) {};
makey = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "makey";
@@ -44338,12 +43513,12 @@
mandm-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mandm-theme";
- version = "20170304.1401";
+ version = "20170925.321";
src = fetchFromGitHub {
owner = "choppsv1";
repo = "emacs-mandm-theme";
- rev = "cd1505c8bcff0a3de821f0b419f897f4b0378b01";
- sha256 = "1spj3mlydwnngccrny27p8s3m75n039hipqvzqskdg7p1hvr6m59";
+ rev = "078d6d6f11bd48193c5de590cfb0e3d0d687ffc9";
+ sha256 = "070280438388q57lpzvd5wdk16abmxixiq01n68hdskfcipdkn2d";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mandm-theme";
@@ -44359,12 +43534,12 @@
mandoku = callPackage ({ fetchFromGitHub, fetchurl, git, github-clone, lib, magit, melpaBuild, org }:
melpaBuild {
pname = "mandoku";
- version = "20170614.306";
+ version = "20171002.12";
src = fetchFromGitHub {
owner = "mandoku";
repo = "mandoku";
- rev = "01255150a80ada47bf3708daa93069ac3011831f";
- sha256 = "1djlzcg6dl29rifdss3cy0g3xmscblqvkfwzykiqs2y7vl51r60b";
+ rev = "77647573331c602847b06b9e21de69f72cd7bad5";
+ sha256 = "0yqxsls9phvd4dgzb908xds4x437rqpm3ddy07pq3qq7ghri1cnv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1aac4ae2c908de2c44624fb22a3f5ccf0b7a4912/recipes/mandoku";
@@ -44380,15 +43555,15 @@
mandoku-tls = callPackage ({ emacs, fetchFromGitHub, fetchurl, github-clone, helm, helm-charinfo, hydra, lib, mandoku, melpaBuild, org }:
melpaBuild {
pname = "mandoku-tls";
- version = "20170611.6";
+ version = "20170822.1138";
src = fetchFromGitHub {
owner = "mandoku";
repo = "mandoku-tls";
- rev = "e21205ca9c1c053801190f291d6583ce057e8a65";
- sha256 = "0yd33hflm1da61mc54y7yaaxb6y8gzv00n4ghcqn6rp4vlmi6534";
+ rev = "82b1b39305da3259b53a2200260713500d7a9ec5";
+ sha256 = "0xkycqwv5bczz111zlfai2y3m9shwv237dhgyjmhd1j6blpp59jw";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/6667774bba495c45703ef75261f1f14d89684e3a/recipes/mandoku-tls";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/c97d3f653057eab35c612109792884334be556fe/recipes/mandoku-tls";
sha256 = "0zny1l548rvjsbbzj47wysz6gk1sqxvpj215r3w84vw5dyrn78bz";
name = "mandoku-tls";
};
@@ -44535,12 +43710,12 @@
markdown-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "markdown-mode";
- version = "20170812.1201";
+ version = "20171031.1725";
src = fetchFromGitHub {
owner = "jrblevin";
repo = "markdown-mode";
- rev = "c79ab7eac618f54c73ffade336e043dc397ca032";
- sha256 = "12m1hvm918gw5v1xgyc6yhlijsrq0l0875fyv5zbjs88svw52r7i";
+ rev = "7a62259a22ccbf59b0132d077348ee489edf5d1e";
+ sha256 = "137xkm76k6faak478hmnr6yrhymbfln0xs0ninzp4iy57kxyx9d9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/74610ec93d4478e835f8b3b446279efc0c71d644/recipes/markdown-mode";
@@ -44598,12 +43773,12 @@
markdown-preview-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, uuidgen, web-server, websocket }:
melpaBuild {
pname = "markdown-preview-mode";
- version = "20161211.1443";
+ version = "20170820.459";
src = fetchFromGitHub {
owner = "ancane";
repo = "markdown-preview-mode";
- rev = "50e5baed5ca3a1d2fed08f32802976a5ed358fed";
- sha256 = "1p1npnhlh99m9pxvd1jhbzn9dxhg5fjml1bw8yakrv7k1h6zwrd3";
+ rev = "134fd336750b8b3165bc906f0a7161c25eb6f589";
+ sha256 = "0j1jdvmn8psarjdl1j4d3rsjmnb3gcissh2l78xj2c8vckmp2g24";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d3c5d222cf0d7eca6a4e3eb914907f8ca58e40f0/recipes/markdown-preview-mode";
@@ -44731,12 +43906,12 @@
marshal = callPackage ({ eieio ? null, fetchFromGitHub, fetchurl, ht, json ? null, lib, melpaBuild }:
melpaBuild {
pname = "marshal";
- version = "20160807.1954";
+ version = "20171018.932";
src = fetchFromGitHub {
owner = "sigma";
repo = "marshal.el";
- rev = "d5b6fdd97159b22d5a9dbc3b0db18a04089b3f2f";
- sha256 = "1pix1cz8zv3kgf103ml1y42a0l2hvakbykfpbyx81z4nw7n958lf";
+ rev = "406ea2f60c7e4aeafd384b8d6696d726b3d8f611";
+ sha256 = "1mr5p2yiad1k15byrlk0a784kj7rvibpn4li5phk4rnm0zg1xy9s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/203f2061c5c7d4aefab3175de5e0538f12158ee3/recipes/marshal";
@@ -44836,12 +44011,12 @@
math-symbols = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "math-symbols";
- version = "20151121.1642";
+ version = "20170818.759";
src = fetchFromGitHub {
owner = "kawabata";
repo = "math-symbols";
- rev = "666b1f00d9e106cf2a3a7d58c2262fe9a1404764";
- sha256 = "1chyxi096krjbi9zgbrnrkvwgmn4wygnia9m57m0jh4arlbm28la";
+ rev = "3f8b466f002e1b28ddbe9a6f236c9a1352adb17d";
+ sha256 = "0r63acgicb43p05gsiz98m7077sj72c1miz18fi8qbzi02p9qjr7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d7b0799bddbbbecd12bc1589b56a6250acf76407/recipes/math-symbols";
@@ -44937,25 +44112,6 @@
license = lib.licenses.free;
};
}) {};
- mb-depth-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "mb-depth-plus";
- version = "20170307.844";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/mb-depth+.el";
- sha256 = "1vqminlfc146c8wr00ck7drs5kf92fvdmhyqyh2hj6394cvqs7w9";
- name = "mb-depth+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/mb-depth+";
- sha256 = "031hh227rh7l818p3di4h34i4698yynw5g9a5sl2hj47c0734q6w";
- name = "mb-depth-plus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/mb-depth+";
- license = lib.licenses.free;
- };
- }) {};
mb-url = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mb-url";
@@ -45043,12 +44199,12 @@
mc-extras = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }:
melpaBuild {
pname = "mc-extras";
- version = "20150218.234";
+ version = "20170824.2239";
src = fetchFromGitHub {
owner = "knu";
repo = "mc-extras.el";
- rev = "71cf966be06d9c74e781a87bb30fa4cf657ee852";
- sha256 = "0252wdq4sd6jhzfy0pn3gdm6aq2h13nnp8hvrn1mpml9x473a5n1";
+ rev = "f0ba639e9b18cc56e80ae45bbb2b694dbad9171a";
+ sha256 = "0d6ncj6zd0lfsdpffbh3l25ycjw5hn0rwi5znp5hpl06b1ycyk4s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/12747bb8603ebc09ce0873f3317a99e34d818313/recipes/mc-extras";
@@ -45187,27 +44343,6 @@
license = lib.licenses.free;
};
}) {};
- memento = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "memento";
- version = "20150823.339";
- src = fetchFromGitHub {
- owner = "ehartc";
- repo = "memento";
- rev = "35733b79101f694346792a57df686cbffe64bd79";
- sha256 = "0pjqax3pi6pb650yb8iwa4brwwl6cdka7jym3cfkpppyy782dm0q";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/3bee3cd6b491bf8813ec2332794b2548603014f4/recipes/memento";
- sha256 = "0f8ajhj677r2kxszmad6h1j1b827ja0vaz2my1vx145y3gf160b8";
- name = "memento";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/memento";
- license = lib.licenses.free;
- };
- }) {};
memoize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "memoize";
@@ -45271,34 +44406,15 @@
license = lib.licenses.free;
};
}) {};
- menu-bar-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "menu-bar-plus";
- version = "20170720.710";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/menu-bar+.el";
- sha256 = "0yq995jyfw3a1dj49a4wnavfb29amw575dajps6nbv0g1q0rnwkf";
- name = "menu-bar+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/menu-bar+";
- sha256 = "181jxjnzdckmvpsdknhm21xwimvsp0qxn8azfn58dz41gl4xcg90";
- name = "menu-bar-plus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/menu-bar+";
- license = lib.licenses.free;
- };
- }) {};
merlin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "merlin";
- version = "20170731.907";
+ version = "20170917.430";
src = fetchFromGitHub {
owner = "the-lambda-church";
repo = "merlin";
- rev = "b53e4beeeb8da6d7cb035990a7e805fea5da0de6";
- sha256 = "1lw0s78zwr8rd4q4pg34m9q8yd5swh1fff3c5p992a2qlzfb0hax";
+ rev = "a5dbf8e321ff162476555e62264468dd6f55c279";
+ sha256 = "0mq4ddr3g64dd4bhq812hb5xvlkswfmib1nw34f3m8sghmaxcd5z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b1b9bfd3164e62758dc0a3362d85c6627ed7cbf8/recipes/merlin";
@@ -45314,12 +44430,12 @@
meson-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "meson-mode";
- version = "20170501.1310";
+ version = "20170901.1135";
src = fetchFromGitHub {
owner = "wentasah";
repo = "meson-mode";
- rev = "af09db99891c3d19353150e26338c191525711aa";
- sha256 = "1rqccn3j7rm9nncxiq6m4wcx2wxkck5j02phyij8s0dc820bzlhz";
+ rev = "212d9f38a08074f1cb6e914e12b60bc52dcb8bee";
+ sha256 = "1kv7413y5530frs1nrp0nl40h9j0idwp7vlg761r260200m8sl3v";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4702a31ffd6b9c34f96d151f2611a1bfb25baa88/recipes/meson-mode";
@@ -45332,25 +44448,6 @@
license = lib.licenses.free;
};
}) {};
- message-x = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "message-x";
- version = "20151029.718";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/message-x.el?revision=9";
- sha256 = "05ic97plsysh4nqwdrsl5m9f24m11w24bahj8bxzfdawfima2bkf";
- name = "message-x.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/b7bf124ec30fa5551b31c0e0d39be234f19e2e81/recipes/message-x";
- sha256 = "0z12alizwrqp5f9wq3qllym9k5xljh904c9qhlfhp9biazj6yqwj";
- name = "message-x";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/message-x";
- license = lib.licenses.free;
- };
- }) {};
messages-are-flowing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "messages-are-flowing";
@@ -45358,8 +44455,8 @@
src = fetchFromGitHub {
owner = "legoscia";
repo = "messages-are-flowing";
- rev = "17a0d91658390ba8d38f325b3ece380e07e3cb49";
- sha256 = "0600is9cynvppdy9vrnr1c0m3cyxim0ha4gq4wbhw9h0cvkz8i1b";
+ rev = "ef879726957c850c3a5afd7f1118604991e37e32";
+ sha256 = "1mryk48z92r4j8f3qg0j0q5iygv7vnk1k0wgza5pq6bhrl5w13hq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/messages-are-flowing";
@@ -45501,12 +44598,12 @@
mhc = callPackage ({ calfw, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mhc";
- version = "20160704.633";
+ version = "20171016.335";
src = fetchFromGitHub {
owner = "yoshinari-nomura";
repo = "mhc";
- rev = "d5f7c5abe90831248581c26ef3abfec70b2c2b9c";
- sha256 = "0f5ilbl6dc5hf9s4lfp027qjdlwd0kzb7sni7lda6v5597vhsnb4";
+ rev = "03a50a7dd5f90fb981b72e4b9e9385e4d1fe3be3";
+ sha256 = "17p6gkf6xmx6sflzd3pyc3p3x7ma8p497hmj1yc7w863kqm8jclk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d8d3efa0fcd6cd4af94bc99b35614ef6402cbdba/recipes/mhc";
@@ -45519,6 +44616,27 @@
license = lib.licenses.free;
};
}) {};
+ mic-paren = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "mic-paren";
+ version = "20170731.1207";
+ src = fetchFromGitHub {
+ owner = "emacsattic";
+ repo = "mic-paren";
+ rev = "d0410c7d805c9aaf51a1bcefaaef092bed5824c4";
+ sha256 = "0f24ibzgra94bwal8b0dpjxa11n42gkmanqswfnjhlvx052v9dxr";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0e54eac31fbbce9a778fb654f07e11aaaa46ca/recipes/mic-paren";
+ sha256 = "17j0b8jyr0zx6zds2dz5fzvarm2wh8l5hxds2s90kh5z0kk23r07";
+ name = "mic-paren";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/mic-paren";
+ license = lib.licenses.free;
+ };
+ }) {};
micgoline = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }:
melpaBuild {
pname = "micgoline";
@@ -45833,25 +44951,6 @@
license = lib.licenses.free;
};
}) {};
- minor-mode-hack = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "minor-mode-hack";
- version = "20141226.1220";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/minor-mode-hack.el?revision=10";
- sha256 = "0vwvvhzqiad82qvfwygb2arq1mdvh1lj6q2as0a92fg1vc95qcb0";
- name = "minor-mode-hack.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/df182bfd8272f3ded761c90826c8cfe6bfd1a48b/recipes/minor-mode-hack";
- sha256 = "1f2wy25iphk3hzjy39ls5j04173g7gaq2rdp2grkawfhwx0ld4pj";
- name = "minor-mode-hack";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/minor-mode-hack";
- license = lib.licenses.free;
- };
- }) {};
mip-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mip-mode";
@@ -45894,44 +44993,6 @@
license = lib.licenses.free;
};
}) {};
- misc-cmds = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "misc-cmds";
- version = "20170307.847";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/misc-cmds.el?revision=103";
- sha256 = "1w58z2j95sycgkakgb9anlc3q73v77whspi9a4j1kf6lmcbpyms8";
- name = "misc-cmds.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/misc-cmds";
- sha256 = "0bylb84icddgznmim18fwq1mhh3qz8yh8ch6lpadf9p3h420qgcl";
- name = "misc-cmds";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/misc-cmds";
- license = lib.licenses.free;
- };
- }) {};
- misc-fns = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "misc-fns";
- version = "20170307.848";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/misc-fns.el?revision=50";
- sha256 = "0jjmd33z36dikkbskskgbdv8pflkwaxn4ifajq4ghrdprdhm6gbm";
- name = "misc-fns.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/c2cbbe5a718ec961982a7f65de8f6ec1c9513696/recipes/misc-fns";
- sha256 = "1spjbkcac33lyfsgkd6z186a3432x9nw3akmx194gaap2863xcam";
- name = "misc-fns";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/misc-fns";
- license = lib.licenses.free;
- };
- }) {};
mixed-pitch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mixed-pitch";
@@ -46018,12 +45079,12 @@
mmm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mmm-mode";
- version = "20170808.1814";
+ version = "20171004.336";
src = fetchFromGitHub {
owner = "purcell";
repo = "mmm-mode";
- rev = "c68cee0beaeb99c5bd178fab6fec995bce4e501f";
- sha256 = "1k13q5hwb2p2bq5j84pln9kx18bs2x9zfnzgqm4acrxjp9hnknlc";
+ rev = "7661968fa6974996e58dfa28da33bca0cbde777d";
+ sha256 = "066qp884qw0bqcglncxvag89i1z5rmqjc73y7ksr7ll3309y1969";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/mmm-mode";
@@ -46057,19 +45118,19 @@
license = lib.licenses.free;
};
}) {};
- mo-git-blame = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ mo-git-blame = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mo-git-blame";
version = "20160129.959";
- src = fetchFromGitHub {
+ src = fetchFromGitLab {
owner = "mbunkus";
repo = "mo-git-blame";
rev = "254a675eb794cdbbdef9fa2b4b7bb510b70089c0";
sha256 = "1dh92hzpicfvrlg6swrw4igwb771xbsmsf7hxp1a4iry4w8dk398";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/8b72b67897c349d48e8fd47a4b33055738ed5d89/recipes/mo-git-blame";
- sha256 = "1dp9pxhggappb70m5hyp8sxlnh06y996adabq7x6qvm745mk6f0x";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/a784f931849ca836557390999b179ef9f6e775f3/recipes/mo-git-blame";
+ sha256 = "14ngwwgzrnnysq1k1k681b5i06ad8r3phhgpvn5alp2fj3il03l3";
name = "mo-git-blame";
};
packageRequires = [];
@@ -46123,12 +45184,12 @@
mocha = callPackage ({ f, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
melpaBuild {
pname = "mocha";
- version = "20170813.1957";
+ version = "20171016.903";
src = fetchFromGitHub {
owner = "scottaj";
repo = "mocha.el";
- rev = "ce9e42adf9333c68967597c17272b3a3c7564cea";
- sha256 = "1cl4ncmynhrvmllbkkwnw3064vw93xalk4zzy4bpb2zf74vwl1gy";
+ rev = "0f74ecf500f833f7f959187a375dacdd33d4d569";
+ sha256 = "03ixygw28hzn00136747mv2r3vii3n0gif1wqgg3k7ajh7c45f5b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/39c26134ba95f277a4e9400e506433d96a695aa4/recipes/mocha";
@@ -46190,8 +45251,8 @@
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "modalka";
- rev = "7ee76939b9269c652f93065a8fcc7da24434a167";
- sha256 = "0drhrid8gb9rk9rl8afsf3ninjzs4p78lnrp285xkhwn7hlri4v9";
+ rev = "88935a26318a574adeeb2301ae8d010f0102b1d3";
+ sha256 = "1zibawwflf2wx7hzg2ld7qvmlpljfd6nb86998ckzbx75s5yb20a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fa0a02da851a603b81e183f461da55bf4c71f0e9/recipes/modalka";
@@ -46246,44 +45307,6 @@
license = lib.licenses.free;
};
}) {};
- modeline-char = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "modeline-char";
- version = "20170307.854";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/modeline-char.el?revision=8";
- sha256 = "1c6ij1c0d6r9chzwqcpgdjq1rb2h0m09fpck9rc9rg5jy7fgdc0d";
- name = "modeline-char.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/modeline-char";
- sha256 = "0ksi5vfcwbyhgpp59qdl7l536zw2rd33xf4r2gihcx2g2k52h2w9";
- name = "modeline-char";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/modeline-char";
- license = lib.licenses.free;
- };
- }) {};
- modeline-posn = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "modeline-posn";
- version = "20170307.856";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/modeline-posn.el?revision=43";
- sha256 = "1cpab6k0p65nmw78y5v4lbpxw6pczkzk46zmkc76pi55yjpw6pbm";
- name = "modeline-posn.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/c62008950ea27b5a47363810f57063c1915b7c39/recipes/modeline-posn";
- sha256 = "0dngfcbcdh22fl6nd47dhg9z9iivj67six67zjr9j1cbngp10dwk";
- name = "modeline-posn";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/modeline-posn";
- license = lib.licenses.free;
- };
- }) {};
modern-cpp-font-lock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "modern-cpp-font-lock";
@@ -46291,8 +45314,8 @@
src = fetchFromGitHub {
owner = "ludwigpacifici";
repo = "modern-cpp-font-lock";
- rev = "0a5a4ae4d3115eb95ab6047faf8d1734a238ab70";
- sha256 = "1ax7kvxj8z6ldfxr9017ws1lligjaxxdrcxb651i10m7jdw3bjd4";
+ rev = "b0a45dc1d7c49854988103c2570c783f46f44566";
+ sha256 = "1gh7l6c4xznpjialbmswhfm1cmmbzkl2s6acjcway0nb52rshgr6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4bfc2386049adfe7a8e20da9b69fb73d6cb71387/recipes/modern-cpp-font-lock";
@@ -46329,12 +45352,12 @@
moe-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "moe-theme";
- version = "20170111.1838";
+ version = "20170914.2111";
src = fetchFromGitHub {
owner = "kuanyui";
repo = "moe-theme.el";
- rev = "70e71ef7404cc5c38254771695eee221090d5110";
- sha256 = "1dpcffb6pyggg2lj7n9lnxyg2clwm4q7hnxvgc87r6b61vjr3a20";
+ rev = "b8f0206614ab40ffb75e50ce6c38675fb9c7cf2e";
+ sha256 = "0pn3a1rrj7ycxh91x3q008b6rmq7rbl8ir6diqzqfp6y465pn2w2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4efefd7edacf90620436ad4ef9ceb470618a8018/recipes/moe-theme";
@@ -46438,12 +45461,12 @@
src = fetchFromGitHub {
owner = "fxn";
repo = "monochrome-theme.el";
- rev = "58fb4cf28c407f059b78bfd72c4dbced07638dd6";
- sha256 = "1sxhpvxapzgrwvzibkg7zd3ppmfcz5rhrbvg73b8rggjg4m5snyf";
+ rev = "bfca67fe7365310bc47ae9ca96c417caada54896";
+ sha256 = "0jvsss38rgry37dnshxbqxcj7qh1q6iyza58kix47h5wbnrpvszn";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/bd753349134f4db6f80b6e86d4facd1704e87ccc/recipes/monochrome-theme";
- sha256 = "191ikqns1sxcz6ca6xp6mb2vyfj19x19cmcf17snrf46kmx60qk9";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/d00b78ead693e844e35c760fe2c39b8ed6cb0d81/recipes/monochrome-theme";
+ sha256 = "0cq2clliwcwnn1spz1w6y5qw1lgqznw212rcc4q6f1kslq0jyk5x";
name = "monochrome-theme";
};
packageRequires = [];
@@ -46476,12 +45499,12 @@
monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "monokai-theme";
- version = "20170731.504";
+ version = "20171013.236";
src = fetchFromGitHub {
owner = "oneKelvinSmith";
repo = "monokai-emacs";
- rev = "623083f05c381761a8cf2fd923e493bfa8762c28";
- sha256 = "02d759s4zh6a2yj2xq9cdfjyrsj3a3a5wngcwkl6bq0jgbjz5pvv";
+ rev = "019e07947426f0192fc3458f3f72c19031b607de";
+ sha256 = "0id35345zp0fchbcz8qk2lg71jyln91k56vfama27ss3nzy3f9kz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme";
@@ -46518,12 +45541,12 @@
moonscript = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "moonscript";
- version = "20160503.631";
+ version = "20170831.1526";
src = fetchFromGitHub {
owner = "k2052";
repo = "moonscript-mode";
- rev = "2278810a43ee41b760e84e48e54ffc48b11772b0";
- sha256 = "0bz35m0drjl12f9y42a79nnzxz5ahf5m7c2l2nfz8fyif270ph1y";
+ rev = "56f90471e2ced2b0a177aed4d8c2f854797e9cc7";
+ sha256 = "1v2phdpfngrb01x4qygpfgxdzpgvbprki2kbmpc83vlqxlmkvvjk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3046afee95277024830d7d372f2f1c84a0adcb00/recipes/moonscript";
@@ -46641,25 +45664,6 @@
license = lib.licenses.free;
};
}) {};
- mouse-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "mouse-plus";
- version = "20170307.859";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/mouse+.el";
- sha256 = "1f49b10i1iqh0q2s2fa309dc617dzavah7fw0k1rpjk84kb001bd";
- name = "mouse+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/01cbe9b5bb88f8c02fab67a269ac53c8aa4d8326/recipes/mouse+";
- sha256 = "1fv7jnqzskx9iv92dm2pf0mqy2accl0svjl2kkb6v273n1day3f8";
- name = "mouse-plus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/mouse+";
- license = lib.licenses.free;
- };
- }) {};
mouse-slider-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mouse-slider-mode";
@@ -46681,25 +45685,6 @@
license = lib.licenses.free;
};
}) {};
- mouse3 = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "mouse3";
- version = "20170324.1050";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/mouse3.el?revision=39";
- sha256 = "0rnpfz0d4spxkyssgf3j5kfajm54i1vism2q0giikd0savrh0a1c";
- name = "mouse3.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/mouse3";
- sha256 = "1rppn55axjpqwqm2lq4dvwi3z7xkd5jkyqi1x8jqgcsfc9w6m777";
- name = "mouse3";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/mouse3";
- license = lib.licenses.free;
- };
- }) {};
move-dup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "move-dup";
@@ -46724,12 +45709,12 @@
move-text = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "move-text";
- version = "20170213.2128";
+ version = "20170908.2030";
src = fetchFromGitHub {
owner = "emacsfodder";
repo = "move-text";
- rev = "ea57d20a49bcffbcd948ad2f6f6c710fdd71d689";
- sha256 = "0cc6cyqwm6nivnplr1226xz25vmjk6icsjp80kkwdwgfbiyj986j";
+ rev = "bdaf3e3a0d33cd528cad1d10facbdf0635232e4d";
+ sha256 = "06jxk5g23822gfmwrxhc34zand3dr8p2wjh1zs3j61ibz6n0nmz1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/82bfd0f41e42eed1d4c2361ec1d1685edebbac1b/recipes/move-text";
@@ -46770,8 +45755,8 @@
src = fetchFromGitHub {
owner = "bard";
repo = "mozrepl";
- rev = "57f278849e4246a992e731e188b221a2574fc81e";
- sha256 = "1g06i3d8xv8ja6nfww4k60l3467xr1s9xsk7i6dbicq0lf8559h9";
+ rev = "ab3e79914445039ceb62f7f2dc342358fec3492e";
+ sha256 = "1c7dsip5wmlf7x2hziwil5n3igvpnh17d7yg8lsg001y5sjl3mjv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6839c5e52364fb32f6d8a351e5c2f21fbd6669a1/recipes/moz";
@@ -46955,12 +45940,12 @@
mtg-deck-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mtg-deck-mode";
- version = "20170808.1745";
+ version = "20170925.1338";
src = fetchFromGitHub {
owner = "mattiasb";
repo = "mtg-deck-mode";
- rev = "316bd3a5916114e545d9ee26208cc82771cb7002";
- sha256 = "1ff249bvppw9dnjqawc48yhf1vyvq8a54xm8808pak2crpn44zix";
+ rev = "546a62ada70aa89d325cc3941c8c9379a4c21553";
+ sha256 = "1gbgsfd04jdw6jrsp13h13jkkac5ndrn684pl18q0wjgx9kk11b6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/425fa66cffe7bfda71de4ff2b49e951456bdeae1/recipes/mtg-deck-mode";
@@ -46997,12 +45982,12 @@
mu4e-alert = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }:
melpaBuild {
pname = "mu4e-alert";
- version = "20170429.816";
+ version = "20170901.1027";
src = fetchFromGitHub {
owner = "iqbalansari";
repo = "mu4e-alert";
- rev = "3453e25ff6c07c1b768b2a79fdb9fc5c97100e76";
- sha256 = "1nvsfbfsma59ilf7c3vjngnmx3aapwvvvaafdy5szm5r6lkicqvg";
+ rev = "ef90cd0f0fb6c841f326db5cad276567eb5f96b5";
+ sha256 = "0sym7mp1via65h883f5h45cbfxq58qck7ypcvcfdmnmn9jnl3j9d";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mu4e-alert";
@@ -47015,6 +46000,27 @@
license = lib.licenses.free;
};
}) {};
+ mu4e-jump-to-list = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "mu4e-jump-to-list";
+ version = "20171104.1248";
+ src = fetchFromGitHub {
+ owner = "wavexx";
+ repo = "mu4e-jump-to-list.el";
+ rev = "2aa995ddedc7634292b459a3ea2718eea39695cf";
+ sha256 = "0l4fnnmdb5xf99klviabyqkh3ywkwvphhf8darj42ygrhbs086pd";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/ca51179f5584c0eac626da7cda896b247d33fcae/recipes/mu4e-jump-to-list";
+ sha256 = "1k4ic476f6xzh6f1a9jaqy0248zz2q4xjygdvrsyrp1sxjbrwxvm";
+ name = "mu4e-jump-to-list";
+ };
+ packageRequires = [ cl-lib emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/mu4e-jump-to-list";
+ license = lib.licenses.free;
+ };
+ }) {};
mu4e-maildirs-extension = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mu4e-maildirs-extension";
@@ -47036,6 +46042,27 @@
license = lib.licenses.free;
};
}) {};
+ mu4e-query-fragments = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "mu4e-query-fragments";
+ version = "20170923.622";
+ src = fetchFromGitHub {
+ owner = "wavexx";
+ repo = "mu4e-query-fragments.el";
+ rev = "34ddad4e6785f575333efcc66153d892daa1c884";
+ sha256 = "0l5i3a88j9il2y0jq2sfzwi9q3czc1wi8n9nvgdysj5db5m4xsw6";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/21277a79a211b4d101809314bdb9963130a3d533/recipes/mu4e-query-fragments";
+ sha256 = "0h8rapfz9snvr722vr65gqa0xhgig81b2gvswjlzljwd2m98yzzn";
+ name = "mu4e-query-fragments";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/mu4e-query-fragments";
+ license = lib.licenses.free;
+ };
+ }) {};
multi = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "multi";
@@ -47078,34 +46105,15 @@
license = lib.licenses.free;
};
}) {};
- multi-eshell = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "multi-eshell";
- version = "20120608.1135";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/multi-eshell.el?revision=9";
- sha256 = "1w1jwfznpl214a1xx46zlgqbx9c5yjzpyqqrkn3xqjgnj485yhkl";
- name = "multi-eshell.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a9069a6eb1e57bccb06d26577cac70765de8e52f/recipes/multi-eshell";
- sha256 = "1i0mvgqxsc99dwp9qcdrijqxsxflrbxw846rgw89p1jfs8mp4l7d";
- name = "multi-eshell";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/multi-eshell";
- license = lib.licenses.free;
- };
- }) {};
multi-line = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }:
melpaBuild {
pname = "multi-line";
- version = "20170417.1856";
+ version = "20170821.1926";
src = fetchFromGitHub {
owner = "IvanMalison";
repo = "multi-line";
- rev = "ca151864e7ff7ade0e530e8eb2c26291d37a56b6";
- sha256 = "01dsnpfwkycmq3kiy76hz92bm1hq4rqqg3kp56scy05sz9biqzkc";
+ rev = "d3ce76b6aec62f96ef2c0409d8262fd39e67dccc";
+ sha256 = "0kysz7l18z3fkzygpdnqf2ancixrwyzh6n49jgk0c50lhhqj324x";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0f8eee6798a0ba71d437a1cbf82e360a5b60eafb/recipes/multi-line";
@@ -47225,12 +46233,12 @@
multiple-cursors = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "multiple-cursors";
- version = "20170813.38";
+ version = "20170908.1452";
src = fetchFromGitHub {
owner = "magnars";
repo = "multiple-cursors.el";
- rev = "18f992bff596609091afca128b51a7d2e919ac40";
- sha256 = "01xlbvnc74h450wm6falpj839nz04dmc2ll083zkndd3gfjk6g3d";
+ rev = "10752700084595bb24712c27ba70a2326302e45b";
+ sha256 = "1hg693xq45bjxdla4drn6qn0np417hyvw6x3bmhfykg6lpibslz6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a5f015e6b88be2a5ded363bd882a558e94d1f391/recipes/multiple-cursors";
@@ -47267,12 +46275,12 @@
mustache = callPackage ({ dash, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }:
melpaBuild {
pname = "mustache";
- version = "20131117.1407";
+ version = "20170923.533";
src = fetchFromGitHub {
owner = "Wilfred";
repo = "mustache.el";
- rev = "b0ea352813592424164520a49e86c04600242752";
- sha256 = "1n2ymd92qpvsby6ms0l3kjhdzzc47rri2aiscc6bs07hm4mjpr9q";
+ rev = "5e39654b933a18131146a0f3b3e3dc55c5058124";
+ sha256 = "0ilsdrvqy9zn0yb1c8zh1zidag32rfb9xhm43qpfcg6n5w6c7r82";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d1bcf9599ca6d2c29333071a80f96808d4ab52e2/recipes/mustache";
@@ -47369,25 +46377,6 @@
license = lib.licenses.free;
};
}) {};
- muttrc-mode = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "muttrc-mode";
- version = "20090804.1552";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/muttrc-mode.el?revision=7";
- sha256 = "1xihp3zdqs9054j3bfrd9wnahsvvxjk1ags1iy50ncv5850ppjis";
- name = "muttrc-mode.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/7d3fd45af3345742cff7be99ad8210d7f8fd2a2f/recipes/muttrc-mode";
- sha256 = "0ym6rfrhrmpnlqhkxv9ck5893qm0yhswslvgc9vb4nl9hyc1b5jn";
- name = "muttrc-mode";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/muttrc-mode";
- license = lib.licenses.free;
- };
- }) {};
mvn = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mvn";
@@ -47556,27 +46545,6 @@
license = lib.licenses.free;
};
}) {};
- n3-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "n3-mode";
- version = "20141027.1057";
- src = fetchFromGitHub {
- owner = "doriantaylor";
- repo = "n3-mode-for-emacs";
- rev = "0145e7938c30183edb03a55a4f16390dabd191ec";
- sha256 = "1lp1bx9110vqzjww94va8pdks39qvqzl8rf0p8na1q0qn06rnk9h";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a71e3a572cb2ff58c731df9ff6a65b69ebd8f6eb/recipes/n3-mode";
- sha256 = "0hasxq39phgyc259dgxskhqxjsp0yi98vx1bs8ynvwa26la4ddzh";
- name = "n3-mode";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/n3-mode";
- license = lib.licenses.free;
- };
- }) {};
n4js = callPackage ({ cypher-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "n4js";
@@ -47598,25 +46566,6 @@
license = lib.licenses.free;
};
}) {};
- naked = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "naked";
- version = "20170418.1822";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/naked.el?revision=23";
- sha256 = "1k3j6dyp8p47q43i4ba53krl06yx32rkjnh2f5x1zqk6nxnb1wf8";
- name = "naked.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/naked";
- sha256 = "06p6dzhn34dva3677mrvwq2a2x3bhw7f486y654hszla7i75pilq";
- name = "naked";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/naked";
- license = lib.licenses.free;
- };
- }) {};
name-this-color = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "name-this-color";
@@ -47708,8 +46657,8 @@
src = fetchFromGitHub {
owner = "Malabarba";
repo = "Nameless";
- rev = "ab1a5c589378334eafca105af1a17f73b9065423";
- sha256 = "107q1rximjnag9r9vgwh0iv687i3rsscbdnjc46f8l16j6vi4n7d";
+ rev = "108f16e743aecd35401c0e914c896572cf1d5082";
+ sha256 = "110bxdn2sqxlxqffaxp0yc6g2hglbv91az00mmgc01n6hjxcrc3h";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8e4ee4dae5f32a8d445dc0cc2455c1f7075c9b3d/recipes/nameless";
@@ -47725,12 +46674,12 @@
names = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "names";
- version = "20151201.404";
+ version = "20171012.1214";
src = fetchFromGitHub {
owner = "Malabarba";
repo = "names";
- rev = "65b577b1215c4cfaee1ed5e98b0545e9ef7b9964";
- sha256 = "13r1qmibjikx6hz36m6xf79wap6fci2x7jz7rac5s52hq2hdj2wk";
+ rev = "1d45ec50568eb2f5b55973f7ed0b48c68f9f13aa";
+ sha256 = "1z0zdi9r6x6pqy2qfj9krkmbmlw9rlrgdvgn4dppfzrmrig8libr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/names";
@@ -47847,25 +46796,6 @@
license = lib.licenses.free;
};
}) {};
- narrow-indirect = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "narrow-indirect";
- version = "20170307.921";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/narrow-indirect.el?revision=13";
- sha256 = "1sdyya2gmmd2h39kmijf514y3vln6ax5xdfsrkx1hcalw4l418gh";
- name = "narrow-indirect.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/38e5dd845c99acaae719562595059154a08a5f00/recipes/narrow-indirect";
- sha256 = "10aq4gssayh3adw8yz2lza1xbypyffi8r03lsc0kiis6gd9ibiyj";
- name = "narrow-indirect";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/narrow-indirect";
- license = lib.licenses.free;
- };
- }) {};
narrow-reindent = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "narrow-reindent";
@@ -48058,12 +46988,12 @@
ncl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ncl-mode";
- version = "20170121.231";
+ version = "20170903.2355";
src = fetchFromGitHub {
owner = "yyr";
repo = "ncl-mode";
- rev = "cfabbbf5e49a856c9b4cb32408f28ef4378731b5";
- sha256 = "1rq0snv7qxkh1l09ail3mjs2jjrxixryxy6z91maabj7qfp1yrqi";
+ rev = "84599a730169b9b19f9dcc532e20dcdc9648bbaa";
+ sha256 = "0sqbrvlx9n7abn71r4hb5fgps7nm6cfyg84hjwdbkrw0cgy2w1hc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2eea3936b8a3a7546450d1d7399e0f86d855fefd/recipes/ncl-mode";
@@ -48125,8 +47055,8 @@
src = fetchFromGitHub {
owner = "rsdn";
repo = "nemerle";
- rev = "d0777b677c50714415174e407a321efc1e9bfdae";
- sha256 = "19darrq975w11n4809f5blrc3paaxpdxmvwmsd96k8g5gwi0yf5m";
+ rev = "847d1343e63c0a2d25a43f8432c4d750e4e9e7d0";
+ sha256 = "0wriamdich72h1m0rmhx1s38ph6q8ak0rfd39kyycw7v8bvwgv08";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/nemerle";
@@ -48352,12 +47282,12 @@
niconama = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
melpaBuild {
pname = "niconama";
- version = "20160703.802";
+ version = "20170910.801";
src = fetchFromGitHub {
owner = "NOBUTOKA";
repo = "niconama.el";
- rev = "533559931670d49e930dfe4d19bc7a182dbbd3a8";
- sha256 = "0iwgfqwywlrgf3151619z7ppf39r5dq2891qhgk0vs76kz6frai2";
+ rev = "96e7553e50e6bf7b58aac50f52c9b0b8edb41c56";
+ sha256 = "1gihjzwl6309vgav5z7jzi8jb7is8vx8lr23kb6h373gwws4bi10";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ad8e7189e9c4c5d86cef268f45be0dda2d702805/recipes/niconama";
@@ -48370,43 +47300,22 @@
license = lib.licenses.free;
};
}) {};
- niflheim-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "niflheim-theme";
- version = "20150630.821";
- src = fetchFromGitHub {
- owner = "niflheim-theme";
- repo = "emacs";
- rev = "5265e89164132fbdbc13146a79f0abce78bd0c5e";
- sha256 = "147vw3qlsply5h8cjmjzqr5dv9jzf9xlmhjnmcpyb1r7krh1l8xm";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/36d82e64af02289f759239f24dd6d921a6eb3f0f/recipes/niflheim-theme";
- sha256 = "1dipxwaar7rghmz7s733v035vrbijcg1dla9f7cld1gkgiq9iq36";
- name = "niflheim-theme";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/niflheim-theme";
- license = lib.licenses.free;
- };
- }) {};
- nim-mode = callPackage ({ commenter, emacs, epc, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }:
+ nim-mode = callPackage ({ commenter, emacs, epc, fetchFromGitHub, fetchurl, flycheck-nimsuggest, let-alist, lib, melpaBuild }:
melpaBuild {
pname = "nim-mode";
- version = "20170805.1240";
+ version = "20171028.2219";
src = fetchFromGitHub {
owner = "nim-lang";
repo = "nim-mode";
- rev = "26a20424a087b0de16004b1e0186060d08d6baac";
- sha256 = "1m6kxhy6cvcwcv9j9l8wgkgqy56yqmnqdlwr3hp22vbancvqfl16";
+ rev = "10296ac3d9ee70bf31180b5158ac3b4a58f45d22";
+ sha256 = "0mswc1f141xif3h4zshza0ar64s99fp6j3l795c67a3yvmc7l50v";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/dc2ccb5f24b9d55c77eaa7952a9e6a2e0ed7be24/recipes/nim-mode";
sha256 = "1kzn3kkkj7jzs7fqhvib196sl3vp7kbhb4icqzmvvmv366lkaib6";
name = "nim-mode";
};
- packageRequires = [ commenter emacs epc flycheck let-alist ];
+ packageRequires = [ commenter emacs epc flycheck-nimsuggest let-alist ];
meta = {
homepage = "https://melpa.org/#/nim-mode";
license = lib.licenses.free;
@@ -48415,12 +47324,12 @@
nimbus-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "nimbus-theme";
- version = "20170811.646";
+ version = "20171026.504";
src = fetchFromGitHub {
owner = "m-cat";
repo = "nimbus-theme";
- rev = "26a5bd7d31d9c203aa4e1cc4961fb6cdf0ddc0f9";
- sha256 = "1m326skvvirkf938ymch135p2gxxdyqx4plpvivp09qpfzrj0b1d";
+ rev = "e78561a828e50b5bd0984723d9040620367180c8";
+ sha256 = "04cbr0a3kvk79lyrriblm4q7y00j0banwl7a4r9li4iq92rgcivh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fc0e6b456b76e2379c64a86ad844362c58146dc6/recipes/nimbus-theme";
@@ -48440,8 +47349,8 @@
src = fetchFromGitHub {
owner = "martine";
repo = "ninja";
- rev = "7bbc708ff08f5660f4cff4b3e8c675bec428a1f2";
- sha256 = "1iqv268yvvhs7nxf28105g3ya16js1ibzxl0is13i4hlkx9wiqw1";
+ rev = "e234a7bdb6c42f4539c0ab09b624f191287c2c10";
+ sha256 = "01hsabhvp1yilzdss3mkvrskkvxw41xxch6lkwlcrr6h5f70szi2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/aed2f32a02cb38c49163d90b1b503362e2e4a480/recipes/ninja-mode";
@@ -48475,22 +47384,22 @@
license = lib.licenses.free;
};
}) {};
- nix-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ nix-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "nix-mode";
- version = "20160502.637";
+ version = "20170831.1721";
src = fetchFromGitHub {
owner = "NixOS";
- repo = "nix";
- rev = "f76e85d8f581cc8f71b66386e86ed93c2c3d6992";
- sha256 = "0fh790mwr8q9ch0rvf3sp9mwrq5iya8w2dpbpazkl2lsll7d3nyi";
+ repo = "nix-mode";
+ rev = "3294f8a2f83ace2d71f16c274a262ff76be412dc";
+ sha256 = "1p1dka9v8fm6rklspkscj5rs5f21dwi3bq44d3hjqw6xva4q7bx4";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode";
- sha256 = "00rqawi8zs2x79c91gmk0anfyqbwalvfwmpak20i11lfzmdsza1s";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e1870d786dbfac3b14386c8030e06f2d13ab9da6/recipes/nix-mode";
+ sha256 = "10f3ly4860lkxzykw4fbvhn3i0c2hgj77jfjbhlk2c1jz9x4yyy5";
name = "nix-mode";
};
- packageRequires = [];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/nix-mode";
license = lib.licenses.free;
@@ -48499,12 +47408,12 @@
nix-sandbox = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "nix-sandbox";
- version = "20170131.241";
+ version = "20171004.1006";
src = fetchFromGitHub {
owner = "travisbhartwell";
repo = "nix-emacs";
- rev = "ace629f7645d12778c96ff7b5cf4b1e41a98af29";
- sha256 = "11infdrdjc30kxvfg5rh1zn4idvkhf9s0c6v60qn441m1d5bnavq";
+ rev = "7007363e773a419203a69798fb0e0731b2eb0f73";
+ sha256 = "00hv8fhyahkdh1vfy1qkahqvsik6d81c7mqh4gjiqxrmb2l1vbcb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/66be755a6566e8c0cfb5aafa50de29b434023c7a/recipes/nix-sandbox";
@@ -48524,8 +47433,8 @@
src = fetchFromGitHub {
owner = "travisbhartwell";
repo = "nix-emacs";
- rev = "ace629f7645d12778c96ff7b5cf4b1e41a98af29";
- sha256 = "11infdrdjc30kxvfg5rh1zn4idvkhf9s0c6v60qn441m1d5bnavq";
+ rev = "7007363e773a419203a69798fb0e0731b2eb0f73";
+ sha256 = "00hv8fhyahkdh1vfy1qkahqvsik6d81c7mqh4gjiqxrmb2l1vbcb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6846c7d86e70a9dd8300b89b61435aa7e146be96/recipes/nixos-options";
@@ -48604,15 +47513,15 @@
nnir-est = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "nnir-est";
- version = "20140301.602";
+ version = "20170818.746";
src = fetchFromGitHub {
owner = "kawabata";
repo = "nnir-est";
- rev = "ba263fbd872fe05cfa6b3d815c0d98cdbe24b687";
- sha256 = "0gzxcq0gki89dz9ad26683zhq1nif3wdz185cdplwy68z9szbdx1";
+ rev = "dc1fee4757725b8171b755313d7bafbf1364f49a";
+ sha256 = "054mzb1h7smvvpzkg59pb4fd5rnig9j937wwvdr9s9222akyvkma";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/9ad5bcd7e5cc71bb40803b9b39c40310574f3450/recipes/nnir-est";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/ca17de8cdd53bb32a9d3faaeb38f19f92b18ee38/recipes/nnir-est";
sha256 = "04ih47pipph8sl84nv6ka4xlpd8vhnpwhs5cchgk5k1zv3l5scxv";
name = "nnir-est";
};
@@ -48625,12 +47534,12 @@
no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "no-littering";
- version = "20170805.450";
+ version = "20171015.2358";
src = fetchFromGitHub {
owner = "emacscollective";
repo = "no-littering";
- rev = "d556a4cd3bfd3827c3d395ff6cd1e6086658589d";
- sha256 = "0ybkiwidrmrnmf7sgd8vdfh5nhdi02yfw330rqr7xw5vf0k9fsap";
+ rev = "79c18c7efffd80446d81201b4c7dd92dde6cac3a";
+ sha256 = "1xganpzb7sy5dlazjzrx9cif1r1n8lf3za0jwlq806w7601g5nym";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/no-littering";
@@ -48793,12 +47702,12 @@
nord-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "nord-theme";
- version = "20170506.2351";
+ version = "20171005.1039";
src = fetchFromGitHub {
owner = "arcticicestudio";
repo = "nord-emacs";
- rev = "eb7929e41606776a45817946b5d6f79426767a93";
- sha256 = "1cb7la2al8124i4xfmripfzhabpnzh929qi1266p4c7jchyz2gxw";
+ rev = "be32879416bbed1d6524f7c30ac53fbfa5a0e024";
+ sha256 = "0q347f9bjayfl8y8vz83kjamf1lp58386nhy0iacjxsq4riwpric";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/31cb60069825abe3998c8b43bc9177b39a7f3659/recipes/nord-theme";
@@ -48832,11 +47741,11 @@
}) {};
notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
pname = "notmuch";
- version = "20170720.301";
+ version = "20170927.415";
src = fetchgit {
url = "git://git.notmuchmail.org/git/notmuch";
- rev = "178d62cf9c9959fe603c9ffef9fa90f65b67dcd5";
- sha256 = "12f91c5a11f4sn27a259h5mv1jw4s71gh27caq5nk8ixr1ra9ikm";
+ rev = "7ac96b149f5a0e5c03b64856d7c20789dab3c628";
+ sha256 = "0l5j3605ihii40204jw9vyk96f3dmfvr7y9p9ag178wb5x2ab6cb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
@@ -48870,34 +47779,36 @@
license = lib.licenses.free;
};
}) {};
- novice-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "novice-plus";
- version = "20170307.925";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/novice+.el";
- sha256 = "1f49c0wv1zsi720g3a8ka3h17n7r81pzz7zfwalz0zxwxmh6jghb";
- name = "novice+.el";
+ nov = callPackage ({ dash, emacs, esxml, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "nov";
+ version = "20171104.1641";
+ src = fetchFromGitHub {
+ owner = "wasamasa";
+ repo = "nov.el";
+ rev = "7d14b6a2aa649e2213348883893a24a6a6083cb9";
+ sha256 = "0l8b4847rig76d974akpkbb43i7pnhx75wmlgczqscmripspdxyb";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/novice+";
- sha256 = "0r4w4c6y4fny8k0kipzqjsn7idwbi9jq6x9yw51d41ra3pkpvfzf";
- name = "novice-plus";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/cf543955ba2d5d0074fa2a5ba176f9415f6e006d/recipes/nov";
+ sha256 = "0hlcncpdazi4rn5yxd0zq85v7gpjhw7a6dl2i99zf4ymsan97lhq";
+ name = "nov";
};
- packageRequires = [];
+ packageRequires = [ dash emacs esxml ];
meta = {
- homepage = "https://melpa.org/#/novice+";
+ homepage = "https://melpa.org/#/nov";
license = lib.licenses.free;
};
}) {};
noxml-fold = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "noxml-fold";
- version = "20170520.545";
+ version = "20170823.657";
src = fetchFromGitHub {
owner = "paddymcall";
repo = "noXML-fold";
- rev = "41cd645531783982e03cb1af2fc2acd59c88f6cb";
- sha256 = "1bpakbwcs6qilx0j24xg01yarkyvv8wvcf6j5kxqmls3hq23i47s";
+ rev = "46c7f6a008672213238a9f8d7a416ce80916aa62";
+ sha256 = "0axr7n4wdrd009lz6sg4y9ggf4f5svgrsclwhs0hyn2ld34rvrax";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/13d2af88b292293cb5ab50819c63acfe936630c8/recipes/noxml-fold";
@@ -48913,12 +47824,12 @@
npm-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "npm-mode";
- version = "20160706.1129";
+ version = "20171103.1135";
src = fetchFromGitHub {
owner = "mojochao";
repo = "npm-mode";
- rev = "63a5c306f6e8d53f043471eb8ea734f00ca998c4";
- sha256 = "1ph680i24sga02r2w2r2rial4mi0czv0abz2jif3pypzxz3h1f15";
+ rev = "91b8a5ad9301a368e1ce051e625450d7fe3884a4";
+ sha256 = "1zzx9956mfrh91d84dpl4ij9b62iza4mflr9qjlh69b8allajngn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/22dd6b2f8a94f56a61f4b70bd7e44b1bcf96eb18/recipes/npm-mode";
@@ -48994,22 +47905,28 @@
license = lib.licenses.free;
};
}) {};
- nu-mode = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, transpose-frame, undo-tree }:
+ nu-mode = callPackage ({ ace-window, avy, fetchFromGitHub, fetchurl, lib, melpaBuild, transpose-frame, undo-tree, which-key }:
melpaBuild {
pname = "nu-mode";
- version = "20160520.614";
+ version = "20171103.1605";
src = fetchFromGitHub {
owner = "pyluyten";
repo = "emacs-nu";
- rev = "347f6c958f20d6e8e46bc7122556405b3a434242";
- sha256 = "17nj8bkqw34hsbb8b51rl6221hlpxw265h2cwxqf64cswm22y313";
+ rev = "8ebadeccda7aa97f5555abc9b45a174f62f0134c";
+ sha256 = "1bws17vnzp759x29n1aamd5scnrbrf4ckm51kdw08is9im4dzwxl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/230d5f8fdd965a24b8ff3cc94acf378d04815fca/recipes/nu-mode";
sha256 = "0nzv3p62k8yyyww6idlxyi94q4d07nis7ydypar8d01jfqlrybkn";
name = "nu-mode";
};
- packageRequires = [ helm transpose-frame undo-tree ];
+ packageRequires = [
+ ace-window
+ avy
+ transpose-frame
+ undo-tree
+ which-key
+ ];
meta = {
homepage = "https://melpa.org/#/nu-mode";
license = lib.licenses.free;
@@ -49039,12 +47956,12 @@
number = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "number";
- version = "20141127.1004";
+ version = "20170901.612";
src = fetchFromGitHub {
owner = "chrisdone";
repo = "number";
- rev = "f483365c330392b3e9362481b145acf3db040baf";
- sha256 = "045m83rdqryjpqh6y9s6x0yf9fw9xrwmxbm4qgg8ka164x9szv0n";
+ rev = "bbc278d34dbcca83e70e3be855ec98b23debfb99";
+ sha256 = "0a1r352zs58mdwkq58561qxrz3m5rwk3xqcaaqhkxc0h9jqs4a9r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/49d56b297ab729695249143dd65d3c67543cfcc6/recipes/number";
@@ -49183,24 +48100,24 @@
license = lib.licenses.free;
};
}) {};
- nyan-prompt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ nyx-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
- pname = "nyan-prompt";
- version = "20140809.2208";
+ pname = "nyx-theme";
+ version = "20170910.607";
src = fetchFromGitHub {
- owner = "PuercoPop";
- repo = "nyan-prompt";
- rev = "b5137f2ee9afe640f59786eed17b308df6356c73";
- sha256 = "0bgspjy8h3d7v12sfjnd2ghj4183pdf0z48g5xs129jwd3nycykp";
+ owner = "GuidoSchmidt";
+ repo = "emacs-nyx-theme";
+ rev = "afe2b8c3b5421b4c292d182dcf77079b278e93d8";
+ sha256 = "1qamw4x3yrygy8qkicy6smxksnsfkkp76hlnivswh7dm3fr23v6m";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/2e3bf5fe2adaf557146df6f4e13aa6ffedb5d1e3/recipes/nyan-prompt";
- sha256 = "1s0qyhpfpncsv9qfxy07rbp4gv8pp5xzb48rbd3r14nkjlnylnfb";
- name = "nyan-prompt";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/3440905a20bc91bb2637a87c04ff8410379f150d/recipes/nyx-theme";
+ sha256 = "17ajpsbwbal1rwgd38kckh1kvnd412h6fkvj2x4j5rqvjr9nhgr6";
+ name = "nyx-theme";
};
- packageRequires = [];
+ packageRequires = [ emacs ];
meta = {
- homepage = "https://melpa.org/#/nyan-prompt";
+ homepage = "https://melpa.org/#/nyx-theme";
license = lib.licenses.free;
};
}) {};
@@ -49274,8 +48191,8 @@
src = fetchFromGitHub {
owner = "astahlman";
repo = "ob-async";
- rev = "079dbcbfa229407ae2f53689a4d045f827adabd5";
- sha256 = "0jinxwv72yypns22iv2v4ll1wkg2ca5vbx1v36pgxgmjvawfilvr";
+ rev = "f0bfe88d6032e9ae8f4953e2569aeca5431a3e3d";
+ sha256 = "0ak23m2i24ix9443236zdvp3f3j27dis5k6pivic3whmb618g3v8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ob-async";
@@ -49288,18 +48205,18 @@
license = lib.licenses.free;
};
}) {};
- ob-axiom = callPackage ({ axiom-environment, emacs, fetchhg, fetchurl, lib, melpaBuild }:
+ ob-axiom = callPackage ({ axiom-environment, emacs, fetchgit, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ob-axiom";
- version = "20161122.1222";
- src = fetchhg {
- url = "https://bitbucket.com/pdo/axiom-environment";
- rev = "110e20a7a86c";
- sha256 = "0s18bbfw4kcv9iij1016pamq394rg8xr7016qp6cxyklp9hivcdm";
+ version = "20171103.1548";
+ src = fetchgit {
+ url = "https://bitbucket.org/pdo/axiom-environment.git";
+ rev = "33af42c1c3109f17d63c69cdca0319e424409a37";
+ sha256 = "1nv102jd07nrhkp4fci5n5f1l6z3qan1lb3ykhhvl90k9ygqbac5";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/ob-axiom";
- sha256 = "12cmzhgzk8314y6nvzdjwidalccz6h440lil83c1h4lz4ddlwmf6";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/9f07feb8686c76c330f282320b9f653dc16cadd5/recipes/ob-axiom";
+ sha256 = "0ks0q4ych3770gqds7kmccvx27fay7gfygi3a9n7c01p4snfai8l";
name = "ob-axiom";
};
packageRequires = [ axiom-environment emacs ];
@@ -49350,6 +48267,27 @@
license = lib.licenses.free;
};
}) {};
+ ob-cfengine3 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "ob-cfengine3";
+ version = "20170915.634";
+ src = fetchFromGitHub {
+ owner = "nickanderson";
+ repo = "ob-cfengine3";
+ rev = "f38f87256efcb2b02f5c7042900087be941c1ddc";
+ sha256 = "09xn84d2vy3kxk2xihjml8zzrhv2cz2jy20dg7w6ll9wn38gs33h";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/d068233c438e76cbcc6e9a97cbec9b2550a18ed6/recipes/ob-cfengine3";
+ sha256 = "1pp3mykc5k629qlqixpl2900m1j604xpp6agrngwagsvf7qkhnvl";
+ name = "ob-cfengine3";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/ob-cfengine3";
+ license = lib.licenses.free;
+ };
+ }) {};
ob-coffee = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "ob-coffee";
@@ -49392,22 +48330,22 @@
license = lib.licenses.free;
};
}) {};
- ob-crystal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ ob-crystal = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ob-crystal";
- version = "20170811.57";
+ version = "20171101.347";
src = fetchFromGitHub {
owner = "brantou";
repo = "ob-crystal";
- rev = "4bfd36c922d28e8a204218bde0e889cd1097ec04";
- sha256 = "00rlxm0gj2arcnjhy824id08gxpha73ikfipar780xm845ripm3j";
+ rev = "9d58b880b74e0ad83b37596bb44635e5d7ae5c3f";
+ sha256 = "11qly91h6cm0qdj2dx8lvmfgp7bakrvvwf106rqh4f98y1qv22xh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b9a7d43199a83ab6f672aaa69ef4e158c868f180/recipes/ob-crystal";
sha256 = "11mk2spwlddbrvcimhzw43b6d3gxzmi8br58bily1x4qkvl6zy4n";
name = "ob-crystal";
};
- packageRequires = [];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/ob-crystal";
license = lib.licenses.free;
@@ -49434,6 +48372,27 @@
license = lib.licenses.free;
};
}) {};
+ ob-dao = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+ melpaBuild {
+ pname = "ob-dao";
+ version = "20170816.858";
+ src = fetchFromGitHub {
+ owner = "xuchunyang";
+ repo = "ob-dao";
+ rev = "fa92f62a63c684d689f57e790e5dd614c5bba270";
+ sha256 = "18i2qwxcn5p1hj32svl54n0dv2j551n3nmgb4h8gbvs39rl49qkq";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/6284c73f1d0797fa2ed4d9a11d3198076cc5fff9/recipes/ob-dao";
+ sha256 = "0nj1qyac0lj5ljrqfqi9g2z0d7z5yihajkvjhlx5kg9zs3lgs5rs";
+ name = "ob-dao";
+ };
+ packageRequires = [ org ];
+ meta = {
+ homepage = "https://melpa.org/#/ob-dao";
+ license = lib.licenses.free;
+ };
+ }) {};
ob-dart = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ob-dart";
@@ -49542,12 +48501,12 @@
ob-http = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "ob-http";
- version = "20170411.1842";
+ version = "20170920.2251";
src = fetchFromGitHub {
owner = "zweifisch";
repo = "ob-http";
- rev = "5fd0e99630e07c5e64f2483c6d46aefdd37677d2";
- sha256 = "1i5la27m36xfc8jwmz5i0yiim9ddmfaqjpahxgpbf63zks555vpk";
+ rev = "c4da6d47b3f96c31c00f9eaaf712b59afe00daef";
+ sha256 = "0rhxp7gw4d5yp6yvjcp80in22wckj4zl9siykalj0jm97hkwqmzz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/950b02f76a04f453992b8720032e8c4cec9a039a/recipes/ob-http";
@@ -49560,15 +48519,36 @@
license = lib.licenses.free;
};
}) {};
+ ob-hy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "ob-hy";
+ version = "20171101.344";
+ src = fetchFromGitHub {
+ owner = "brantou";
+ repo = "ob-hy";
+ rev = "a3512f274709dc4ab6c18d7955d361f8715505f0";
+ sha256 = "1i796041svy7njjl3aqaxzjydmm24q688vpxvqd0pj5hyajqdgqw";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/12a7a7dba169010a3a047f961010236a203c16c2/recipes/ob-hy";
+ sha256 = "18a8fpda0f28wxmjprhd9dmz7bpk1j3iayl20lqffrcal6m4f1h7";
+ name = "ob-hy";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/ob-hy";
+ license = lib.licenses.free;
+ };
+ }) {};
ob-ipython = callPackage ({ dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "ob-ipython";
- version = "20170628.1116";
+ version = "20171021.839";
src = fetchFromGitHub {
owner = "gregsexton";
repo = "ob-ipython";
- rev = "a0ae4add0310d131c6b4b15139b929955cec93dd";
- sha256 = "019impk95mnplwzirllrrjjq17hczcq6aarqr959ca75jix8jysf";
+ rev = "c93d26342c28d1ba01ab46406f7f277128d85e6d";
+ sha256 = "08p7sm40s0sb4cplh92krp18jkjm62m5wsivcpzyln7ambb9ml3y";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/557c36e86844c211f2d2ee097ce51ee9db92ea8b/recipes/ob-ipython";
@@ -49689,12 +48669,12 @@
ob-php = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "ob-php";
- version = "20160505.219";
+ version = "20171017.2206";
src = fetchFromGitHub {
owner = "stardiviner";
repo = "ob-php";
- rev = "fd30c5e945a08b605725cf51808b3512ca885777";
- sha256 = "02vmy3nnk4yyjbp3r7zzv9sb3frv7kbj4a2a855iqa0isp8nhyfi";
+ rev = "c281c1e17f0fd7de4adb6c3e6029dc2bd76beca1";
+ sha256 = "1c0967cpimmr5j7ymr4654y62f615dfrv1h3385i7n57jsvqr6bs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/940a22790c9e5fd2f7729c71efad907683cc392c/recipes/ob-php";
@@ -49899,12 +48879,12 @@
ob-swift = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "ob-swift";
- version = "20151204.2311";
+ version = "20170921.625";
src = fetchFromGitHub {
owner = "zweifisch";
repo = "ob-swift";
- rev = "f376af0d86fb410e41289df59a0c2625954c9067";
- sha256 = "071rl0bvhwh5vqbl7n84shvzgqgwg2f5l9vb8wfs4y24hsqfgxmz";
+ rev = "ed478ddbbe41ce5373efde06b4dd0c3663c9055f";
+ sha256 = "1vwg10d33mwb32bpdbpghfihy3ryiqbc4yydpb5hfv3v5k83vs0x";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b401383966398d3223032c59baa920ce594e5fef/recipes/ob-swift";
@@ -50088,12 +49068,12 @@
occur-context-resize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "occur-context-resize";
- version = "20151227.2002";
+ version = "20170904.1609";
src = fetchFromGitHub {
owner = "dgtized";
repo = "occur-context-resize.el";
- rev = "36e69b9d3b7c6de884a8e8822d67856b78a07f4f";
- sha256 = "1v1c2481v2xgnw8kgbbqhqkdd41lzvki9hm3iypbf3n0jxz8nnzy";
+ rev = "cdee5a631ceed9337579d4090e0acf8140747f80";
+ sha256 = "0h7ypw45h5rcbwx4c4mn2ps9hp84dpjp3iay2nc9zaavv05n7ysa";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a2425d82b365784b17ab56af5f77c6095664c784/recipes/occur-context-resize";
@@ -50176,8 +49156,8 @@
src = fetchFromGitHub {
owner = "OCamlPro";
repo = "ocp-indent";
- rev = "5d83bc71d12c89850cb0fdff50d4830adb705b6c";
- sha256 = "0rcaa11mjqka032g94wgw9llqpflyk3ywr3lr6jyxbh1rjvnipnw";
+ rev = "002e047d848beb0e0b77538f0674dd171efc9d66";
+ sha256 = "1al44f7nrh4jbx4vdpbps92pk6px0my43b24brinck186j8d7vc4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e1af061328b15360ed25a232cc6b8fbce4a7b098/recipes/ocp-indent";
@@ -50274,6 +49254,27 @@
license = lib.licenses.free;
};
}) {};
+ old-norse-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "old-norse-input";
+ version = "20170816.1142";
+ src = fetchFromGitHub {
+ owner = "david-christiansen";
+ repo = "emacs-old-norse-input";
+ rev = "c2e21ee72c3768e9152aff6baf12a19cde1d0c53";
+ sha256 = "0zybr1v91884p4ncrpr962pr02qsns6hf7kc4c5gyad8sg4pbvxh";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/84780a6ebd1b2294b86ae8c6df5bd6521cf4e85a/recipes/old-norse-input";
+ sha256 = "1g00h6ykf61ckr6f3r17j72w3h04p5q65aa3rhr5llk3jk1wv331";
+ name = "old-norse-input";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/old-norse-input";
+ license = lib.licenses.free;
+ };
+ }) {};
oldlace-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "oldlace-theme";
@@ -50295,22 +49296,22 @@
license = lib.licenses.free;
};
}) {};
- olivetti = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ olivetti = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "olivetti";
- version = "20170806.2121";
+ version = "20171102.1906";
src = fetchFromGitHub {
owner = "rnkn";
repo = "olivetti";
- rev = "21f8356ce025a66125954ed372c8ace83bd279c4";
- sha256 = "0a3d5rsg4vmjzj8lwgj8i205ns526g66895ppx4az6x542yamr5x";
+ rev = "cd2fdca25935a47a5d3b0417a206f886579f8c45";
+ sha256 = "0cm630yvsdib868xl9x1ng3i64dcyzvq8pzhhaz99b7zc7wfayvh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/697334ca3cdb9630572ae267811bd5c2a67d2a95/recipes/olivetti";
sha256 = "0fkvw2y8r4ww2ar9505xls44j0rcrxc884p5srf1q47011v69mhd";
name = "olivetti";
};
- packageRequires = [];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/olivetti";
license = lib.licenses.free;
@@ -50340,12 +49341,12 @@
omni-kill = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "omni-kill";
- version = "20150526.2349";
+ version = "20171016.1440";
src = fetchFromGitHub {
owner = "AdrieanKhisbe";
repo = "omni-kill.el";
- rev = "4c8dbb6b2c9f1afc0f82077c04eab022e5387e85";
- sha256 = "1925mh47n4x9v780qp5l6cksl64v9mpyb87znsg93x6sxr0cvv4c";
+ rev = "904549c8fd6ac3cf22b5d7111ca8944e179cffea";
+ sha256 = "1mlnh5pdqdv1qb8jvi0wvkgbpy74zq807gmp04bp6cpxdns9j63f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c24df34d2fa5d908223379e909148423ba327ae2/recipes/omni-kill";
@@ -50361,12 +49362,12 @@
omni-log = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }:
melpaBuild {
pname = "omni-log";
- version = "20170420.407";
+ version = "20170930.535";
src = fetchFromGitHub {
owner = "AdrieanKhisbe";
repo = "omni-log.el";
- rev = "60fd1b7ba77bd82787e43ce1aee2832f53981c68";
- sha256 = "1s81qj4g8nhw6k4b7wi4ya9g51xbsqzyi659zs4zdxjxj7acdq8s";
+ rev = "11e959473c1bd9415d0cda785940c36ba6ad44ab";
+ sha256 = "081vq3wzl8w9yz1356np6h27d7yi5j8i3va9sc2flfwylmw1y9gr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/47bb19bb7b4713c3fd82c1035a2fe66588c069e3/recipes/omni-log";
@@ -50403,12 +49404,12 @@
omni-scratch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "omni-scratch";
- version = "20170416.329";
+ version = "20171009.1451";
src = fetchFromGitHub {
owner = "AdrieanKhisbe";
repo = "omni-scratch.el";
- rev = "0da549c1386f93ed4de201bf8779ba64ddc91347";
- sha256 = "0qfi54z2jqrkrdzriandwc9myzc27sxsx7nf20jf5qvcdgn13cl1";
+ rev = "9eee3161e5cb6df58618548a2173f4da7d194814";
+ sha256 = "1cppy9p5k8737jjgjlmfqqfdx048kpjn5cx7iw0dxal180y3i39g";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6ba3e128a7fe4476d82266506b18ba9984c37944/recipes/omni-scratch";
@@ -50466,12 +49467,12 @@
omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, s, shut-up }:
melpaBuild {
pname = "omnisharp";
- version = "20170813.2215";
+ version = "20171105.912";
src = fetchFromGitHub {
owner = "OmniSharp";
repo = "omnisharp-emacs";
- rev = "a9a66b047606c6b5dc48abdb0eb70a1f9dcd08f2";
- sha256 = "0m1f62cr0h426g66c7r36v3yr2bdakkjwxzdvpd0gh81xazn8yjz";
+ rev = "ad4a19c60f7dc3d52a5b11febdcc9b78930a1e7d";
+ sha256 = "0jc2ap9l0cc636kssld1bqalbriib57sw1rzz45s8r19jqa8w5gm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp";
@@ -50579,25 +49580,6 @@
license = lib.licenses.free;
};
}) {};
- oneonone = callPackage ({ fetchurl, hexrgb, lib, melpaBuild }: melpaBuild {
- pname = "oneonone";
- version = "20170416.858";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/oneonone.el?revision=129";
- sha256 = "0ag62z31mb5n50m9qph2ww945pr71j95c5xv7krna1iq01qr8ji1";
- name = "oneonone.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/oneonone";
- sha256 = "0v4nvhzgq97zbi18jd3ds57yh1fpv57b2a1cd7r8jbxwaaz3gpg9";
- name = "oneonone";
- };
- packageRequires = [ hexrgb ];
- meta = {
- homepage = "https://melpa.org/#/oneonone";
- license = lib.licenses.free;
- };
- }) {};
opam = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "opam";
@@ -50685,12 +49667,12 @@
opencl-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "opencl-mode";
- version = "20160220.909";
+ version = "20170816.549";
src = fetchFromGitHub {
owner = "salmanebah";
repo = "opencl-mode";
- rev = "bb39190bb4fdffa188ce4e6849853a07c682b999";
- sha256 = "094r6fx1s76m8anqqg2qrddidn1dp08kmv8p8md27yy9mm49d91n";
+ rev = "6e69434d0fa6e11a542acad370611bba18d3bc5c";
+ sha256 = "00vhmbfh51mncx5xnzv96kbb5r6r27xw6xwvi7gf454zbvcibrws";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d97575fdae88d55b55686aa6814f858813cad171/recipes/opencl-mode";
@@ -50806,6 +49788,27 @@
license = lib.licenses.free;
};
}) {};
+ orca = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "orca";
+ version = "20171030.1216";
+ src = fetchFromGitHub {
+ owner = "abo-abo";
+ repo = "orca";
+ rev = "5e1744afb793dda744ddc6fe342144b5e90bea08";
+ sha256 = "0gqgs3rmdzm5vqk8azgzwannxjifvrf5fj40n543d0066c2dfsfi";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/f4d9cf89c58a9b36b7c2a42de2aecb3b60001908/recipes/orca";
+ sha256 = "012ndbrgm58r09snhvi476rw0lq4m913y0slc0cxb688p9wgz5w3";
+ name = "orca";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/orca";
+ license = lib.licenses.free;
+ };
+ }) {};
org-ac = callPackage ({ auto-complete-pcmp, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }:
melpaBuild {
pname = "org-ac";
@@ -50893,12 +49896,12 @@
org-autolist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-autolist";
- version = "20150922.705";
+ version = "20170924.1201";
src = fetchFromGitHub {
owner = "calvinwyoung";
repo = "org-autolist";
- rev = "da332fadcd9be4c5eb21c5e98c392b89743750b2";
- sha256 = "0j6fqgzvbmvvdh0dgwsxq004wxys2zwnq9wa3idm087ynp2a2ani";
+ rev = "c82d1e83e982b5f0c106b8800e5b0cfd5f73fdc1";
+ sha256 = "0ykiafbdjb2iy0s1gr6l51gddjbk08iwj4v13hgm8b675bl0cw56";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ca8e2cdb282674b20881bf6b4fc49af42a5d09a7/recipes/org-autolist";
@@ -50935,12 +49938,12 @@
org-beautify-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-beautify-theme";
- version = "20161019.1524";
+ version = "20170908.1518";
src = fetchFromGitHub {
owner = "jonnay";
repo = "org-beautify-theme";
- rev = "7b7a7cbd4f25f77e8bd81783f517b2b182220fd9";
- sha256 = "0nqw4apv642vqbjjqbi960zim9lkbnaszrlasf25c9fnzdg1m134";
+ rev = "df6a1114fda313e1689363e196c8284fbe2a2738";
+ sha256 = "1lkz7736swimad12khwbbqc4gxjydgr1k45p4mx03s25pv1w920y";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f55f1ee9890f720e058401a052e14c7411252967/recipes/org-beautify-theme";
@@ -50998,12 +50001,12 @@
org-brain = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "org-brain";
- version = "20170814.404";
+ version = "20171004.1305";
src = fetchFromGitHub {
owner = "Kungsgeten";
repo = "org-brain";
- rev = "f572bf29d6592f587b671b215394cf459dd574b9";
- sha256 = "0f8nf4mljf2xfkwvn9n2d612sy02mk4m19lnx5pidjmm5a50id6j";
+ rev = "35d46695ceffff4069e66fa2a4f039509f1a3c7e";
+ sha256 = "0c0jps0gxsk3m8s78yp8141wh7g2nx8acd1jc0v4ffmlr8qi2csj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/47480fbae06e4110d50bc89db7df05fa80afc7d3/recipes/org-brain";
@@ -51082,12 +50085,12 @@
org-category-capture = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "org-category-capture";
- version = "20170731.2235";
+ version = "20170819.1047";
src = fetchFromGitHub {
owner = "IvanMalison";
repo = "org-projectile";
- rev = "480408737e8110a13ac5282588f1a4a5b86cd0e0";
- sha256 = "121gx8wp38j4j2sqcx5jb91l7pq5214h2cc9qs1sh293a481wl24";
+ rev = "8cec702f602b18da90b3d6207888a887b8e07750";
+ sha256 = "1prfkkfsbmprcq4irsj1qgixgwrsddz2zb9gwl8r3rq8qwfn9lhn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6760daac1ef9d9d7ba07e2fc9668873020f901f1/recipes/org-category-capture";
@@ -51100,27 +50103,6 @@
license = lib.licenses.free;
};
}) {};
- org-chinese-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "org-chinese-utils";
- version = "20170313.2148";
- src = fetchFromGitHub {
- owner = "tumashu";
- repo = "org-chinese-utils";
- rev = "f44d7114899102f1e1109bb7aeeab4330281ff94";
- sha256 = "127nnjdd7p3sy38pd39ivrpxgnzdhbh6sf99667s7qxryfx837y8";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-chinese-utils";
- sha256 = "0bxx81zigbv5vv3aficd65p03lgpp2iknj8qgvn2k4wgbv56j4q4";
- name = "org-chinese-utils";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/org-chinese-utils";
- license = lib.licenses.free;
- };
- }) {};
org-cliplink = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-cliplink";
@@ -51166,12 +50148,12 @@
org-clock-csv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }:
melpaBuild {
pname = "org-clock-csv";
- version = "20170813.1602";
+ version = "20170904.1745";
src = fetchFromGitHub {
owner = "atheriel";
repo = "org-clock-csv";
- rev = "e45d277a8811ee228119349f51af9788befb3b22";
- sha256 = "0fg1ky6aw0hmm6a6zv0i4f8h9xam4d65cnpm2k2a3p1zpn0yzdk7";
+ rev = "20ab6ee4395bedc0a7b8dfaf7b51f2c63dc8d2c6";
+ sha256 = "00lcvmls7zlkqmsi0yfiihyxv49803jlc9khcbqawxlkijvr65pm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e023cb898699f76f6c3d9ffe8162aacfc6a8c34f/recipes/org-clock-csv";
@@ -51334,12 +50316,12 @@
org-download = callPackage ({ async, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-download";
- version = "20170605.23";
+ version = "20170924.2309";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "org-download";
- rev = "131d2409b3639798ebac6d77c98eae446ea915dc";
- sha256 = "1l04vs47pl63daz9n0d2xby43kr2ynbykvdr7hjbyizcg9l9fzp7";
+ rev = "14261c2619be224fc4c499624abc2cba3663e7f5";
+ sha256 = "0d8lcg9gnzf5bpn1z83i5nni444mzy6mlqggadsrdav9bdf8cfy2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/edab283bc9ca736499207518b4c9f5e71e822bd9/recipes/org-download";
@@ -51436,22 +50418,22 @@
license = lib.licenses.free;
};
}) {};
- org-edit-latex = callPackage ({ auctex, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+ org-edit-latex = callPackage ({ auctex, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-edit-latex";
- version = "20170621.758";
+ version = "20170908.822";
src = fetchFromGitHub {
owner = "et2010";
repo = "org-edit-latex";
- rev = "4c22ff6d63f2126f2526b68201ecb5a379812534";
- sha256 = "0q20hz14pghlxi1df8qpdr3jkz3ph87c5qv1s264kkhjknip1yn3";
+ rev = "1f228310ef2f3f2959a527f6d99e42ce977384c8";
+ sha256 = "1zfimgnmn7nqaq8aglyly55k5dr548467masr2g4x3m0z1by1z6b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-edit-latex";
sha256 = "0nkiz4682qgk5dy4if3gij98738482ys8zwm8yx834za38xxbwry";
name = "org-edit-latex";
};
- packageRequires = [ auctex emacs org ];
+ packageRequires = [ auctex emacs ];
meta = {
homepage = "https://melpa.org/#/org-edit-latex";
license = lib.licenses.free;
@@ -51502,12 +50484,12 @@
org-evil = callPackage ({ dash, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, monitor, org }:
melpaBuild {
pname = "org-evil";
- version = "20170529.741";
+ version = "20171102.556";
src = fetchFromGitHub {
owner = "GuiltyDolphin";
repo = "org-evil";
- rev = "aff7bf3885e318287abf7d542916d21372496bdd";
- sha256 = "1z6rj7nrjdmkc7skx2si7s462228bpka96p0zzmkg7wa82j7ywv9";
+ rev = "90a82ec72fb688ef98d1343c02dc3c6da9e4bbee";
+ sha256 = "0fl9m1bgcmvxpdmb05lbna9snfrd8gbrn16c2w72b3asxx7acq94";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/17a4772d409aa5dbda5fb84d86c237fd2653c70b/recipes/org-evil";
@@ -51627,12 +50609,12 @@
org-iv = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, impatient-mode, lib, melpaBuild, org }:
melpaBuild {
pname = "org-iv";
- version = "20160609.1854";
+ version = "20171001.322";
src = fetchFromGitHub {
owner = "kuangdash";
repo = "org-iv";
- rev = "40fa39ae680794cd493dfa8624e5eff4d04c2363";
- sha256 = "1zn1bvk2kgd6a969m1d63v8ax52lanvb1h2w62ffpxlkap3kl6m8";
+ rev = "7f2bb1b32647655fd9d6684f6f09dcc66b61b0cd";
+ sha256 = "0s3fi8sk7jm5vr0fz20fbygm4alhpirv0j20jfi1pab14yhhf34h";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e7db0c34f0f6fb9c3b9e581a74304cc9a26ed342/recipes/org-iv";
@@ -51645,36 +50627,15 @@
license = lib.licenses.free;
};
}) {};
- org-jekyll = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
- melpaBuild {
- pname = "org-jekyll";
- version = "20130508.239";
- src = fetchFromGitHub {
- owner = "juanre";
- repo = "org-jekyll";
- rev = "66300a1a6676ab168663178e7a7c954541a39992";
- sha256 = "0whv8nsla93194jjpxrhlr6g230spdxbac8ibmzmyad075vx97z5";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/8e6059b532fc95e0251a1edb7b1e29d03477b3f2/recipes/org-jekyll";
- sha256 = "0jh3rla8s8prprvhnlg0psdrj7swz7v6vf2xy1m6ff66p9saiv8i";
- name = "org-jekyll";
- };
- packageRequires = [ org ];
- meta = {
- homepage = "https://melpa.org/#/org-jekyll";
- license = lib.licenses.free;
- };
- }) {};
org-jira = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
melpaBuild {
pname = "org-jira";
- version = "20170527.2154";
+ version = "20171105.2011";
src = fetchFromGitHub {
owner = "ahungry";
repo = "org-jira";
- rev = "4d8bda9b5207175ecd3ae647ebec42b3546efd49";
- sha256 = "0877klmy48ad0rpy7azd4xbm9d07wrhr3g96sixx35wgp216kvlm";
+ rev = "acad51a1efbdab58975aebe7cb69bdd6556bc44f";
+ sha256 = "1y183bsjdxlfi22xd7kd1w5xa3qnmgf7063083f977sf5z9afsyy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/730a585e5c9216a2428a134c09abcc20bc7c631d/recipes/org-jira";
@@ -51690,12 +50651,12 @@
org-journal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-journal";
- version = "20170712.657";
+ version = "20170928.231";
src = fetchFromGitHub {
owner = "bastibe";
repo = "org-journal";
- rev = "69b237d1b3c5cc0eb81fb5918df25d01e999b0f1";
- sha256 = "1ss1lxxilbr177mlp4iygg8q74qfw68v8iap9fpj6lvlm7vawins";
+ rev = "06402de02461338503bf034ceca44c3a5a898778";
+ sha256 = "1myrxs1s51vpv3a47fbprsh4b17ylglxqv2nak5i1g2834plhpgv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/org-journal";
@@ -51771,55 +50732,15 @@
license = lib.licenses.free;
};
}) {};
- org-mac-iCal = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "org-mac-iCal";
- version = "20140107.519";
- src = fetchgit {
- url = "git://orgmode.org/org-mode.git";
- rev = "39b7357eea3550a695ec36d2810e31e89d8d0953";
- sha256 = "0wch4wyn7k86xy7nc2rjszkkd73k80jl9dafhj0ihkvgf3za10bh";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal";
- sha256 = "1ilzvmw1x5incagp1vf8d9v9mz0krlv7bpv428gg3gpqzpm6kksw";
- name = "org-mac-iCal";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/org-mac-iCal";
- license = lib.licenses.free;
- };
- }) {};
- org-mac-link = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "org-mac-link";
- version = "20170105.1723";
- src = fetchgit {
- url = "git://orgmode.org/org-mode.git";
- rev = "39b7357eea3550a695ec36d2810e31e89d8d0953";
- sha256 = "0wch4wyn7k86xy7nc2rjszkkd73k80jl9dafhj0ihkvgf3za10bh";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link";
- sha256 = "02rmhrwikppppw8adnzvwj43kp9wsyk60csj5pygg7cd7wah7khw";
- name = "org-mac-link";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/org-mac-link";
- license = lib.licenses.free;
- };
- }) {};
org-mime = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-mime";
- version = "20170807.549";
+ version = "20171105.1440";
src = fetchFromGitHub {
owner = "org-mime";
repo = "org-mime";
- rev = "8067e76eb1fb6a9c15229cc93015aba923120a19";
- sha256 = "0r33y6l74i8n2fbqcazq4r2659lqva855mf5lm5yf7spjga2f9vw";
+ rev = "64a3f56651369b2a8b0a601abea1cf1216db2ded";
+ sha256 = "0jvknbiilik3dwkz1kpjf7ac1fqkdh74pljzpyxxyg3slqha0d50";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/521678fa13884dae69c2b4b7a2af718b2eea4b28/recipes/org-mime";
@@ -51832,6 +50753,27 @@
license = lib.licenses.free;
};
}) {};
+ org-mind-map = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+ melpaBuild {
+ pname = "org-mind-map";
+ version = "20171012.1834";
+ src = fetchFromGitHub {
+ owner = "theodorewiles";
+ repo = "org-mind-map";
+ rev = "cd5dbe2bded1294de1bdc881e53d691244e5c921";
+ sha256 = "0x7nbgcsf0nhda4m7qrxdaa0sffkndfd59nrr09vcxap84rfwacm";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/3c8683ee547a6a99f8d258561c3ae157b1f427f2/recipes/org-mind-map";
+ sha256 = "07wffzf4dzfj8bplwhr9yscm6l9wbz8y01j0jc8cw943z5b8pdgs";
+ name = "org-mind-map";
+ };
+ packageRequires = [ dash emacs org ];
+ meta = {
+ homepage = "https://melpa.org/#/org-mind-map";
+ license = lib.licenses.free;
+ };
+ }) {};
org-mobile-sync = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "org-mobile-sync";
@@ -51856,12 +50798,12 @@
org-mru-clock = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-mru-clock";
- version = "20170323.308";
+ version = "20171101.506";
src = fetchFromGitHub {
owner = "unhammer";
repo = "org-mru-clock";
- rev = "98691aac779001d50516b12679e2a53b5192f164";
- sha256 = "02v872vmvrda94s8gpv3ylss2fvj3ja6r70rvcmannjikmjdan5k";
+ rev = "10f6a7021c82dc6795f4020e89889a5a72eb8832";
+ sha256 = "00f4l5w6p0l1x5ghpvbp5934m9m012fabvzb7apazwdr5c7xbd7q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b36bf1c1faa4d7e38254416a293e56af96214136/recipes/org-mru-clock";
@@ -51919,12 +50861,12 @@
org-octopress = callPackage ({ ctable, fetchFromGitHub, fetchurl, lib, melpaBuild, org, orglue }:
melpaBuild {
pname = "org-octopress";
- version = "20170315.441";
+ version = "20170820.2115";
src = fetchFromGitHub {
owner = "yoshinari-nomura";
repo = "org-octopress";
- rev = "a8a251d6940623daae58453dd91630593c2536c0";
- sha256 = "14iqxg75x7iq0wbjsir6ijbmbkapzfcxjc64kzncwa5ixgdxph3j";
+ rev = "38598ef98d04076a8eb78d549907ddfde8d3a652";
+ sha256 = "0bmj5wkwidj1v3b8ipligr0nkfdaxm82717nz8fqidz967q4xbk6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fba6c3c645ba903f636814b5a2bb1baca0b5283b/recipes/org-octopress";
@@ -51937,6 +50879,27 @@
license = lib.licenses.free;
};
}) {};
+ org-onenote = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, org, request }:
+ melpaBuild {
+ pname = "org-onenote";
+ version = "20171007.2200";
+ src = fetchFromGitHub {
+ owner = "ifree";
+ repo = "org-onenote";
+ rev = "5ce5cf4edb143180e0b185ac26826d39ae5bc929";
+ sha256 = "1jlnnb04ichcl155lklvjw91l8j1dvg77bv1815chak226aq4xqj";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/7705ee9a8733733664b6214bf4eec15d640c6895/recipes/org-onenote";
+ sha256 = "0qgmizzryb6747yd80d3nic3546f4h8vjd6c30jr99vv2ildjsfk";
+ name = "org-onenote";
+ };
+ packageRequires = [ oauth2 org request ];
+ meta = {
+ homepage = "https://melpa.org/#/org-onenote";
+ license = lib.licenses.free;
+ };
+ }) {};
org-outlook = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-outlook";
@@ -51988,21 +50951,21 @@
license = lib.licenses.free;
};
}) {};
- org-parser = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild }:
+ org-parser = callPackage ({ dash, emacs, fetchhg, fetchurl, ht, lib, melpaBuild }:
melpaBuild {
pname = "org-parser";
- version = "20170811.2231";
+ version = "20171002.2136";
src = fetchhg {
url = "https://bitbucket.com/zck/org-parser.el";
- rev = "018959e57cf5";
- sha256 = "0xyw7k195bvx7c0cmhwfjc89v7b0gfybsl4hgaid71fz2czjhx6j";
+ rev = "105050acee08";
+ sha256 = "1y1ikk950awxhvx4d930ymqa8ds6a0wlywzx09jvrnkvbisd4l63";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/28d55005cbce276cda21021a8d9368568cb4bcc6/recipes/org-parser";
sha256 = "06yb78mf486b986dhvqg3avflfyi271vykyars465qpk0v8ahq8h";
name = "org-parser";
};
- packageRequires = [ dash emacs ];
+ packageRequires = [ dash emacs ht ];
meta = {
homepage = "https://melpa.org/#/org-parser";
license = lib.licenses.free;
@@ -52115,12 +51078,12 @@
org-projectile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org-category-capture, projectile, s }:
melpaBuild {
pname = "org-projectile";
- version = "20170812.1500";
+ version = "20171022.950";
src = fetchFromGitHub {
owner = "IvanMalison";
repo = "org-projectile";
- rev = "480408737e8110a13ac5282588f1a4a5b86cd0e0";
- sha256 = "121gx8wp38j4j2sqcx5jb91l7pq5214h2cc9qs1sh293a481wl24";
+ rev = "8cec702f602b18da90b3d6207888a887b8e07750";
+ sha256 = "1prfkkfsbmprcq4irsj1qgixgwrsddz2zb9gwl8r3rq8qwfn9lhn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9d7a7ab98f364d3d5e93f83f0cb3d80a95f28689/recipes/org-projectile";
@@ -52136,12 +51099,12 @@
org-projectile-helm = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, org-projectile }:
melpaBuild {
pname = "org-projectile-helm";
- version = "20170729.1153";
+ version = "20170819.826";
src = fetchFromGitHub {
owner = "IvanMalison";
repo = "org-projectile";
- rev = "480408737e8110a13ac5282588f1a4a5b86cd0e0";
- sha256 = "121gx8wp38j4j2sqcx5jb91l7pq5214h2cc9qs1sh293a481wl24";
+ rev = "8cec702f602b18da90b3d6207888a887b8e07750";
+ sha256 = "1prfkkfsbmprcq4irsj1qgixgwrsddz2zb9gwl8r3rq8qwfn9lhn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6760daac1ef9d9d7ba07e2fc9668873020f901f1/recipes/org-projectile-helm";
@@ -52223,22 +51186,22 @@
license = lib.licenses.free;
};
}) {};
- org-recent-headings = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+ org-recent-headings = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, frecency, lib, melpaBuild, org }:
melpaBuild {
pname = "org-recent-headings";
- version = "20170807.1014";
+ version = "20170907.2129";
src = fetchFromGitHub {
owner = "alphapapa";
repo = "org-recent-headings";
- rev = "a9f3fdf1cb3deb34103ea9f6f604bdf0edac1968";
- sha256 = "1kbba9x1x2jn1081zy8ync0vfsnj2cjflnlyycpb7lprsjbdq3zs";
+ rev = "a09c2670c400c7a4fbbf0ac05d2d9226aa10e8f4";
+ sha256 = "1m0v94zaz30c5p4k1s213dpg0kjs6nd92bph2zlbm37wq8znizmn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/668b79c179cbdb77c4049e7c620433255f63d808/recipes/org-recent-headings";
sha256 = "0b51pyxdk8fdbksx7h1c88sw1liwng8wkjfb1q7w7lglw6f8sjsa";
name = "org-recent-headings";
};
- packageRequires = [ dash emacs org ];
+ packageRequires = [ dash emacs frecency org ];
meta = {
homepage = "https://melpa.org/#/org-recent-headings";
license = lib.licenses.free;
@@ -52268,12 +51231,12 @@
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 = "20170808.625";
+ version = "20171019.724";
src = fetchFromGitHub {
owner = "jkitchin";
repo = "org-ref";
- rev = "0af19a6ed3ccde878c27c27f1413409fdc0de9f8";
- sha256 = "0prwvc3yywivhap6rrji25afcxc553nginzxgrr7fbkxy5vfprzg";
+ rev = "8fb1275b4c0e2dd46593754e497940c49fd9da6b";
+ sha256 = "0jha5qlab3gsyl8iysf1kqn2f15afvqjvnl2nyzh47llqng8yskj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref";
@@ -52426,12 +51389,12 @@
org-super-agenda = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, org, s }:
melpaBuild {
pname = "org-super-agenda";
- version = "20170805.1106";
+ version = "20170904.1516";
src = fetchFromGitHub {
owner = "alphapapa";
repo = "org-super-agenda";
- rev = "98684212cc0879b8c24b21d5047181fcca24bd9d";
- sha256 = "09zpyqgg2bcad793qi2kw2zb3dn03g7x8fx3a6mjyh0jvfqaaqz8";
+ rev = "00b0dbbc48b99e89f6e76e6a6b000f2f5716c40e";
+ sha256 = "126v1zc5cm1sbm56z2h8v5lvlbjsnccgf80x7zm3970q0rdf0qh4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fd27b2df7594a867529de4b84c8107f82dabe2e9/recipes/org-super-agenda";
@@ -52468,12 +51431,12 @@
org-sync-snippets = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "org-sync-snippets";
- version = "20170614.641";
+ version = "20170824.1128";
src = fetchFromGitHub {
owner = "abrochard";
repo = "org-sync-snippets";
- rev = "e96bc94ff8865b4d408d90c4f3e39cc7cbb6cec8";
- sha256 = "0913klrly2xb1pxh91yvvfpzpackxn7sqpsajf4q8adbnlkn0w96";
+ rev = "0f264a032d371d7dbb4a7cbaf0ea2f91b5a629ca";
+ sha256 = "0j680cla1zlxkwnslxwnxd5h6v1vvwr9byi1aawm9gxvz11x7vsj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/96aff3f39adfa0c68aca8ff8d3b11fbfd889327e/recipes/org-sync-snippets";
@@ -52531,12 +51494,12 @@
org-tfl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "org-tfl";
- version = "20161120.932";
+ version = "20170923.518";
src = fetchFromGitHub {
owner = "storax";
repo = "org-tfl";
- rev = "f0405e3ad62b90ea43489bdd6312adbd77edb9f3";
- sha256 = "0cznw60ivaz42ass35sf9i62x7mf9in6z8kr8wc5i1mb7hafy2hk";
+ rev = "f0d7d39106a1de5457f5160cddd98ab892b61066";
+ sha256 = "1rwdibiq0w4nzccmvdkpwnmfga70y35lfg2xlkqxd02x7bfl7j3m";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d9e97f2fee577c7e3fb42e4ca9d4f422c8907faf/recipes/org-tfl";
@@ -52682,8 +51645,8 @@
src = fetchFromGitHub {
owner = "org-trello";
repo = "org-trello";
- rev = "32dd866e830836a72a3b96b96e0d00d044d0eaf7";
- sha256 = "0m5hyhb6211hdmyp1bq6f3fklfgw3957knd96bfdafj727vdnlzm";
+ rev = "d7885038d7e160a64f561f8abc942206d582faa6";
+ sha256 = "091hznr9pznm26p5vm0kav69qkji6hihf6bil0a314d8k0kaj5bc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/188ed8dc1ce2704838f7a2883c41243598150a46/recipes/org-trello";
@@ -52699,12 +51662,12 @@
org-vcard = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-vcard";
- version = "20161001.2202";
+ version = "20170929.410";
src = fetchFromGitHub {
owner = "flexibeast";
repo = "org-vcard";
- rev = "58f83784c580da893c214bd729aae3ab5d285f33";
- sha256 = "122qxg0ji9c7zj52vqlf9d6276w7rdlxg4ippy6dayqs8bhkimbg";
+ rev = "dbe266b79df4fb31f1766010322bf4e383ce1c03";
+ sha256 = "1rcqcgxvjshbz3n1p376h618xapj03n6m7b3cxgv9gnryviyr6ax";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/df860814a09c376c9a6a2c5e7f528bbae29810b2/recipes/org-vcard";
@@ -52738,24 +51701,24 @@
license = lib.licenses.free;
};
}) {};
- org-webpage = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }:
+ org-web-tools = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }:
melpaBuild {
- pname = "org-webpage";
- version = "20170809.638";
+ pname = "org-web-tools";
+ version = "20171014.804";
src = fetchFromGitHub {
- owner = "tumashu";
- repo = "org2web";
- rev = "89a67c0e32e172613e6c46bffcd9537f9198067a";
- sha256 = "1b2a895z24yw0c8wr4lxjrgq9yc0s6wpa38vnk1icfn4g7qr1av8";
+ owner = "alphapapa";
+ repo = "org-web-tools";
+ rev = "e9583248e838806271643770102e786671fabaf5";
+ sha256 = "07kdgkkl3f7w1nxdw1j7vcm2f05sdpd06dlw7vpdd77pdbwafp3h";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/2864959163442165b9b1cd5471dc2649508decde/recipes/org-webpage";
- sha256 = "11zv1vbwd03dyk2ac8k8lh0x5f2b6vpxdib74qs8wdvvqi7pippm";
- name = "org-webpage";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/f082bfb480649d21f586b7eb331c19d57e7a84cf/recipes/org-web-tools";
+ sha256 = "19zpspap85fjqg5a20ps34rcigb0ws986pj6dzd7xik8s6ia29s7";
+ name = "org-web-tools";
};
- packageRequires = [ cl-lib dash ht htmlize mustache org simple-httpd ];
+ packageRequires = [ dash emacs org s ];
meta = {
- homepage = "https://melpa.org/#/org-webpage";
+ homepage = "https://melpa.org/#/org-web-tools";
license = lib.licenses.free;
};
}) {};
@@ -52780,27 +51743,48 @@
license = lib.licenses.free;
};
}) {};
- org2blog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, metaweblog, org, xml-rpc }:
+ org2blog = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, metaweblog, org, xml-rpc }:
melpaBuild {
pname = "org2blog";
- version = "20170804.2043";
+ version = "20170826.1843";
src = fetchFromGitHub {
owner = "punchagan";
repo = "org2blog";
- rev = "bc398e6bb529b6b0022c24d570f4d65bbfd70d5b";
- sha256 = "0fkms3hci43rb4dv74rfglwjgqiw23ggxr2pc1zcr29q0fra7hdf";
+ rev = "62a6400746847f246e12493271f0bb52f7465a92";
+ sha256 = "1xnb6yd5ny5i6hvzxfsnga5m75si5y8vc1j3vfs42r99s2ns8yid";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org2blog";
sha256 = "1xa03k9z8fq74w0w3vfkigz24i6c8s4vib077l16vqik7wg4yh40";
name = "org2blog";
};
- packageRequires = [ metaweblog org xml-rpc ];
+ packageRequires = [ htmlize metaweblog org xml-rpc ];
meta = {
homepage = "https://melpa.org/#/org2blog";
license = lib.licenses.free;
};
}) {};
+ org2ctex = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "org2ctex";
+ version = "20171016.2343";
+ src = fetchFromGitHub {
+ owner = "tumashu";
+ repo = "org2ctex";
+ rev = "1b74aa9cf45de224ffd6aa9b93f0debddc2b48bc";
+ sha256 = "17qkz3ja87hhq41hvlxvdzqipmi1gn38khd00dshsxhk5hg7i99a";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/8f77fe537ca8ee2ddb6e3efe71f3b3c560c52c7d/recipes/org2ctex";
+ sha256 = "0049zf3ls7vbbcz1hdwai57ih9gppk2j0gzwijzwkb23ccwaf64a";
+ name = "org2ctex";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/org2ctex";
+ license = lib.licenses.free;
+ };
+ }) {};
org2elcomment = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "org2elcomment";
@@ -52867,12 +51851,12 @@
org2web = callPackage ({ cl-lib ? null, dash, el2org, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }:
melpaBuild {
pname = "org2web";
- version = "20170809.411";
+ version = "20171005.1617";
src = fetchFromGitHub {
owner = "tumashu";
repo = "org2web";
- rev = "89a67c0e32e172613e6c46bffcd9537f9198067a";
- sha256 = "1b2a895z24yw0c8wr4lxjrgq9yc0s6wpa38vnk1icfn4g7qr1av8";
+ rev = "5243b399927a4c474bb3b8d1c8a00799df1f27d7";
+ sha256 = "0wsvfn409a2ivbich8b8zqza78sprirg4bl7igx536ydqclmi0n7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2864959163442165b9b1cd5471dc2649508decde/recipes/org2web";
@@ -52981,12 +51965,12 @@
orglue = callPackage ({ epic, fetchFromGitHub, fetchurl, lib, melpaBuild, org, org-mac-link }:
melpaBuild {
pname = "orglue";
- version = "20150430.513";
+ version = "20150503.114";
src = fetchFromGitHub {
owner = "yoshinari-nomura";
repo = "orglue";
- rev = "4732f8bfd6866e20230b36e5971f2492827c6944";
- sha256 = "1w0hadpslxcjn29yxl9i37sja4qf4kp7ffjpwij5hs73r518c2z6";
+ rev = "1274652d527cb6afe45d1acb79f41be5a2886ee4";
+ sha256 = "0qf2k89nldfm3njcnygh8ak8fz5m9ykmpzfx1cnfffxcyi139s9f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/orglue";
@@ -53090,8 +52074,8 @@
src = fetchFromGitHub {
owner = "DamienCassou";
repo = "orgtbl-show-header";
- rev = "0b63ab4425b6e2af8ffb1f0b94839918d1720d09";
- sha256 = "161bsmgrbdhb73k36gqb5b96mf0y0sl8q9sjg81vx86bs9sbkddw";
+ rev = "112d54a44682f065318ed0c9c89a8f5b8907342a";
+ sha256 = "1s2bgsm4s33w5275qghw1axdpmz6bbyhki53jr2giyk4f90822gi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9c5ea906b1d642405ca532d89dbb32cf79f53582/recipes/orgtbl-show-header";
@@ -53170,12 +52154,12 @@
osx-dictionary = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "osx-dictionary";
- version = "20170208.505";
+ version = "20171026.34";
src = fetchFromGitHub {
owner = "xuchunyang";
repo = "osx-dictionary.el";
- rev = "ec16c40cc4db0140db1cf6ad1fb1198c7c344b2b";
- sha256 = "0n09s09qaqwdrpd4dgxj16bh3lgc8nzdld49z8zkipf3cfh5v040";
+ rev = "b16630ecf69f87ac873486d8b9c8c03e6c9ea7fa";
+ sha256 = "06qsg8hlw1b725pzpsg5f194pxqcg1pjncsi8j0815yrlzfcg6sp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ae4467ad646d663f0266f39a76f9764004903424/recipes/osx-dictionary";
@@ -53216,8 +52200,8 @@
src = fetchFromGitHub {
owner = "purcell";
repo = "osx-location";
- rev = "84e9269f6c66e52e8bbe8a0cd55932e7b3e7977e";
- sha256 = "0yixzqx2b5pnc4qs2qas0jm7sxls511x9ahasqizsawcnqd43apg";
+ rev = "8bb3a94cc9f04b922d2d730fe08596cc6ee12bf2";
+ sha256 = "09hjcpmh0fxhsx63vcaz05w94xcc8q35vgffggjqaybs7hyzlx69";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8673dafb02a8d70c278bfd2c063f40992defe3a3/recipes/osx-location";
@@ -53419,15 +52403,36 @@
license = lib.licenses.free;
};
}) {};
+ outrespace = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "outrespace";
+ version = "20170904.511";
+ src = fetchFromGitHub {
+ owner = "articuluxe";
+ repo = "outrespace";
+ rev = "cf2a397971f82c87dcfbe3400e3e7c2de79fa68e";
+ sha256 = "1rxyyvax3f0fh3k8majkhpdrnlqg4pg7hl68q61csiccayx04213";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/2659a78181b8fe98ca4a80c75ec8c9b6dff44bb5/recipes/outrespace";
+ sha256 = "13xasp9vjb3n0smdhrh9pq1yhhrg3p6z14fmlvf6xqip52rx89hl";
+ name = "outrespace";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/outrespace";
+ license = lib.licenses.free;
+ };
+ }) {};
outshine = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, outorg }:
melpaBuild {
pname = "outshine";
- version = "20170721.521";
+ version = "20171005.955";
src = fetchFromGitHub {
owner = "alphapapa";
repo = "outshine";
- rev = "0fdd0cd619d20e71b3157f225bb117a7e21dc9b3";
- sha256 = "1hhvbfpbixh5s2s4h06f44p4h0kqnmbm9mlqfas3msq5m6m77h2r";
+ rev = "75389b7104692f4f6a97dc72020d145f03affd25";
+ sha256 = "0j99wx48xq5vpla69yj5w255n3acbgc4bbig4kmbvayr2871ls7n";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8edf78a0ecd2ff8e6e066b80751a31e11a068c3f/recipes/outshine";
@@ -53468,8 +52473,8 @@
src = fetchFromGitHub {
owner = "tonini";
repo = "overseer.el";
- rev = "3269801dc5145d41c11599430229340e6dfa6cc6";
- sha256 = "1zjp1bw7ipg4ibabrc0wzzsvd4jydjq571768v2hdpzcdw36d8f7";
+ rev = "6be1f2a4df1b7a20298865b85502ee89e327898d";
+ sha256 = "0ipq5gflymvznb8xzfl524l09sj90787bzga9ymjjpc4rn9zmqlb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/overseer";
@@ -53552,8 +52557,8 @@
src = fetchFromGitHub {
owner = "jkitchin";
repo = "ox-clip";
- rev = "649aa719c6cb3fab46d1ff20d8090b85503a771e";
- sha256 = "0n2s59668l9n9vz8qs4kmbmlf6cybd0zijkb65qvba5iz4lxsj08";
+ rev = "b596760aec2ab4e10b18807c01839047aa209d6e";
+ sha256 = "0bd5vbbz0p0dg5v7s54a88ba7aca53xwr8niirshfkm916lc8mpy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6d9ae1e58a1f214a9b88627a2d3254ce7de50740/recipes/ox-clip";
@@ -53569,12 +52574,12 @@
ox-epub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "ox-epub";
- version = "20170414.0";
+ version = "20171105.0";
src = fetchFromGitHub {
owner = "ofosos";
repo = "ox-epub";
- rev = "113300ed2c66cca10624e6d7bf5ff0a72e05653a";
- sha256 = "1xj643jybrd6idn6bazp0canj8pm9v3gs199fa17hlag7151ancw";
+ rev = "31ed40ad3f0b3166cb3e772f8689b12d7f2cfe1b";
+ sha256 = "1p9pdm3mhwf5ldl0g4c8kf8iqwzqg0f88qd0nmw33mm8mvikvv1h";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c3ac31dfef00e83fa6b716ea006f35afb5dc6cd5/recipes/ox-epub";
@@ -53629,6 +52634,27 @@
license = lib.licenses.free;
};
}) {};
+ ox-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+ melpaBuild {
+ pname = "ox-hugo";
+ version = "20171029.1929";
+ src = fetchFromGitHub {
+ owner = "kaushalmodi";
+ repo = "ox-hugo";
+ rev = "8de0bbd612af6b4dda5e9d5de1bd9d4bf1cc582f";
+ sha256 = "0kqrcyccf0b440325mp7yk9rfcrg5f6g0wkc107gbnc9s6h55q6d";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/1e1240bb7b5bb8773f804b987901566a20e3e8a9/recipes/ox-hugo";
+ sha256 = "1niarxj2y4a14lrv2nqcc36msw7k61h8fbjpcdrfbaw3n0kchd40";
+ name = "ox-hugo";
+ };
+ packageRequires = [ emacs org ];
+ meta = {
+ homepage = "https://melpa.org/#/ox-hugo";
+ license = lib.licenses.free;
+ };
+ }) {};
ox-impress-js = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "ox-impress-js";
@@ -53674,12 +52700,12 @@
ox-jira = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "ox-jira";
- version = "20170607.1513";
+ version = "20171001.216";
src = fetchFromGitHub {
owner = "stig";
repo = "ox-jira.el";
- rev = "a5e7c7166f5d4baf4b6487f44865f2636cda4698";
- sha256 = "14qybj34wvpn91m9hvfmcrsj5d9zzq5pyzjc61gd0zn482bklxz4";
+ rev = "db2ec528f46c9e611624ba28611c440a99bff255";
+ sha256 = "04zz6359xkn4w7jmmadxyvjd8pw21gw12mqwch1l9yxc4m9q474l";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e8a77d9c903acd6d7fdcb53f63384144e85589c9/recipes/ox-jira";
@@ -53695,12 +52721,12 @@
ox-latex-chinese = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ox-latex-chinese";
- version = "20170401.439";
+ version = "20171014.1532";
src = fetchFromGitHub {
owner = "tumashu";
repo = "ox-latex-chinese";
- rev = "f79d25443987a169a1234f5fbb2bc115cccea33e";
- sha256 = "1sw7wvsyp5z7jdijkc3lyfx7b0cq3c60fjdvmqlpygl9020md99w";
+ rev = "3af3872c5435b6d4feccd0fd2bac32cd156724dd";
+ sha256 = "06b3k3c407dvj0gx73w8wspy2mndl1q2s9wlq4g6hs2v4i2pd9dd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a679ebaedcb496f915b9338f9d5c003e1389594d/recipes/ox-latex-chinese";
@@ -53760,14 +52786,14 @@
pname = "ox-nikola";
version = "20151114.316";
src = fetchFromGitHub {
- owner = "masayuko";
+ owner = "msnoigrs";
repo = "ox-nikola";
rev = "5bcbc1a38f6619f62294194f13ca0cd4ca14dd48";
sha256 = "0cc14p6c3d4djfmrkac0abb2jq128vlmayv2a8cyvnyjffyvjbk7";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/3af3905e1ce36397645a54078280852a8a7eb1eb/recipes/ox-nikola";
- sha256 = "1amplnazs9igfd382djq23d8j7r0knr0hwlpasd01aypc25c82a4";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/4e3fa1b0728ad3058376800ec5e2e9e3847c1d2f/recipes/ox-nikola";
+ sha256 = "13k5wggz8bhnfgpsc09jnisk7xdb226d6imp7v6vmd1ax9m2xb0w";
name = "ox-nikola";
};
packageRequires = [ emacs org ox-rst ];
@@ -53779,15 +52805,15 @@
ox-pandoc = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, org }:
melpaBuild {
pname = "ox-pandoc";
- version = "20170706.431";
+ version = "20170829.1658";
src = fetchFromGitHub {
owner = "kawabata";
repo = "ox-pandoc";
- rev = "1dd4370f52b6db999f3b5edbb146c26034024ef4";
- sha256 = "0cm1a83jblrp76z5a9hmicsq2b3i5xwpyy1d08ahk0hffq0mbimq";
+ rev = "63a1e2b39049a95f6ad7f599561bcfea45086bc2";
+ sha256 = "0iw5imsf7qllkrh39p4pwp6ibwx08nfydfrzwc7bvck0qgzrs7fv";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/92f89a923d877c9dea9349a5c594209cb716bf18/recipes/ox-pandoc";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/ca17de8cdd53bb32a9d3faaeb38f19f92b18ee38/recipes/ox-pandoc";
sha256 = "0wy6yvwd4vyq6xalkrshnfjjxlh1p24y52z49894nz5fl63b74xc";
name = "ox-pandoc";
};
@@ -53863,16 +52889,16 @@
ox-rst = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "ox-rst";
- version = "20170418.758";
+ version = "20171004.1553";
src = fetchFromGitHub {
- owner = "masayuko";
+ owner = "msnoigrs";
repo = "ox-rst";
- rev = "70f15591715796b1d96af660481739f019c295cb";
- sha256 = "1q6qfgfajl103hsf5zp4zxpf4svypv0n1kiqkhjp12b0hy45n2l0";
+ rev = "6d1eab55ff7c8dc4bcf511c9483e69f2a840e928";
+ sha256 = "10z922lcg8hz517kg57knx2irfcac8plp9nsxayrbxpkjx7mmjlj";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/3af3905e1ce36397645a54078280852a8a7eb1eb/recipes/ox-rst";
- sha256 = "1vyj6frrl7328n2x7vc3qwv3ssdhi8bp6ja5h2q4bqalc6bl1pq0";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/85770d6e235217e98dda9d8b9f027a4ba3ebba96/recipes/ox-rst";
+ sha256 = "0447q0gvasii57rp391la9prz0w228jnzgi59s785vzswdryww0n";
name = "ox-rst";
};
packageRequires = [ emacs org ];
@@ -53884,12 +52910,12 @@
ox-textile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "ox-textile";
- version = "20151114.2025";
+ version = "20170907.351";
src = fetchFromGitHub {
owner = "yashi";
repo = "org-textile";
- rev = "0dfca070e35bc6f4a412319e2474bb88666c8c2d";
- sha256 = "1r9c4s9f7cvxxzf9h07rg75bil0295zq1inh5i4r6za5jabkr4dg";
+ rev = "04bcaa64a0c5a099bd7adae5e6584cfa685b2b67";
+ sha256 = "1z1574n6br5rabv9g5qcwk49lx05a4j1gzl3hc2axkxdrrm4m6kk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/02a68a7a99ecce8f1afa03e72ff1f636edaf5868/recipes/ox-textile";
@@ -53926,12 +52952,12 @@
ox-trac = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "ox-trac";
- version = "20151102.955";
+ version = "20171026.1123";
src = fetchFromGitHub {
owner = "JalapenoGremlin";
repo = "ox-trac";
- rev = "2f2f70eefb9679025ae5812e221f0c118da36012";
- sha256 = "0w6963jvz1sk732nh18735dxivd6nl59jd4m26ps6l4wqhqby0db";
+ rev = "03cc31efb1aa06991918f1071e250a9d58f96cfb";
+ sha256 = "0knrmq0sc8s9c6j0967jmrp2hq8jcwg281qqk89y8j9rpbmhbaj6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4b73753ef9229d0fdfbe237acc63126f1786a494/recipes/ox-trac";
@@ -54052,12 +53078,12 @@
package-build = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "package-build";
- version = "20170506.1759";
+ version = "20171020.1419";
src = fetchFromGitHub {
owner = "melpa";
repo = "package-build";
- rev = "940c991ccd0dab53bd7c120601b3db35669c5e73";
- sha256 = "18yr4qq3jyf9zhlwqrbfq616svsgn5spnj0s4gsni7kb2ijjh2bp";
+ rev = "e4d174870ea40275a8bc35996416326cf28051f9";
+ sha256 = "00p7hrcb2ivk6sjxqccbpswjsk5rj02nyd29d2nd6b8r3fskskzp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/948fb86b710aafe6bc71f95554655dfdfcab0cca/recipes/package-build";
@@ -54094,12 +53120,12 @@
package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "package-lint";
- version = "20170814.616";
+ version = "20171006.1846";
src = fetchFromGitHub {
owner = "purcell";
repo = "package-lint";
- rev = "c01d652cefa29df27139e52468f39fd98337746b";
- sha256 = "0l6lr4bmfcdr1mviyqiwzbkylag1avy0wja4il4x4ia2r92jw89h";
+ rev = "ff64e1171e8330972c26bf547042429927aed7c7";
+ sha256 = "11hsxvla2vq944zfd8kr0wynvkr7n90jv714ll6f7yhn10nrraks";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint";
@@ -54115,12 +53141,12 @@
package-plus = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "package-plus";
- version = "20170802.2039";
+ version = "20170815.1956";
src = fetchFromGitHub {
owner = "zenspider";
repo = "package";
- rev = "09338e859168b45f1eb7386da184c48d31473068";
- sha256 = "0wc21d33xlgnw8j5qiv4r1rp2wglk3qcqlr1xcs0rmb4i5cjwnrm";
+ rev = "9213f6134eabc2cff5826779ced437714324c066";
+ sha256 = "0b20mxr5xvkydxn9gv246xls52is3jyhm5ckmrhkb2dp9qc4hfa4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/49cfbbc4535aa7e175aa819d67b8aa52a6f94384/recipes/package+";
@@ -54175,22 +53201,22 @@
license = lib.licenses.free;
};
}) {};
- packed = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ packed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "packed";
- version = "20170805.449";
+ version = "20170819.942";
src = fetchFromGitHub {
owner = "emacscollective";
repo = "packed";
- rev = "e8b20e287222dbf08ebc46e405412c3213102a7e";
- sha256 = "1a02s0ssci6fywk4k8kq5prwz5j4y1270v05qw9wwxa0fx083rn5";
+ rev = "94ea12b9d44bfa42c28d0548199f2fcd19e4aa6a";
+ sha256 = "1n80y5pqaibix71fnw3cxmq66frmqfji2b2y170jszmrxi03kwxm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/packed";
sha256 = "103z6fas2fkvlhvwbv1rl6jcij5pfsv5vlqqsb4dkq1b0s7k11jd";
name = "packed";
};
- packageRequires = [ dash emacs ];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/packed";
license = lib.licenses.free;
@@ -54238,22 +53264,22 @@
license = lib.licenses.free;
};
}) {};
- page-break-lines = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ page-break-lines = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "page-break-lines";
- version = "20170517.235";
+ version = "20171020.108";
src = fetchFromGitHub {
owner = "purcell";
repo = "page-break-lines";
- rev = "82f9100312dcc922fb66ff289faf5d4795d8ca7a";
- sha256 = "1bwh5g63cg2iw3kmcwj4y2jdw46rxll9rgjn6ymx7hbw15s7m5yp";
+ rev = "ae1c0065984429c7364a667abb9180e80134c4c0";
+ sha256 = "1j2fw5p5cwyxpb3clym59jbma06r7la83n62xmz0q1z41llmwx4j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/page-break-lines";
sha256 = "0i5kx191wnq9763jyqxbyh33hvdaqbd98a1rhgqd97zhvg0hslz1";
name = "page-break-lines";
};
- packageRequires = [];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/page-break-lines";
license = lib.licenses.free;
@@ -54301,25 +53327,6 @@
license = lib.licenses.free;
};
}) {};
- palette = callPackage ({ fetchurl, hexrgb, lib, melpaBuild }: melpaBuild {
- pname = "palette";
- version = "20170307.936";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/palette.el?revision=84";
- sha256 = "112b91z1f4p0j4kzrn8110w9pk2fyndjqiiyh0vkwah2ihpsw3pj";
- name = "palette.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/2cdf2d07307007a95d1fe8dc8d2f105c34a26416/recipes/palette";
- sha256 = "1s9lklvr1b0a496q0ljbhkl8zdx80d7bqvkdjnfp35z2s37f1zz3";
- name = "palette";
- };
- packageRequires = [ hexrgb ];
- meta = {
- homepage = "https://melpa.org/#/palette";
- license = lib.licenses.free;
- };
- }) {};
palimpsest = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "palimpsest";
@@ -54365,12 +53372,12 @@
pamparam = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, lib, lispy, melpaBuild, worf }:
melpaBuild {
pname = "pamparam";
- version = "20170808.1219";
+ version = "20170927.1048";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "pamparam";
- rev = "33efb42525da0094a5338f6cae4013fddf550118";
- sha256 = "0r8c3njp24g1jsmypdvd7ax0hylk3igp0yfblszsz1ypafl4x2jv";
+ rev = "c840a8f941940bb8e694c635995566faee995c7b";
+ sha256 = "0wqnzgkcwhrgxdkrlk6i469gcas9477pbkv878cqq9ifsjwvf42n";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/067b5e3594641447478db8c1ffcb36d63018b1b2/recipes/pamparam";
@@ -54449,16 +53456,16 @@
paper-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, hexrgb, lib, melpaBuild }:
melpaBuild {
pname = "paper-theme";
- version = "20151231.932";
+ version = "20170924.1231";
src = fetchFromGitHub {
owner = "cadadr";
- repo = "paper-theme";
- rev = "15af5e31492f79dc0d47787150ef39d6318a2608";
- sha256 = "1xh614czldjvfl66vhkyaai5k4qsg1l3mz6wd5b1w6kd45qrc54i";
+ repo = "elisp";
+ rev = "b3d8b45c76134e2248448d719c840776e41b747a";
+ sha256 = "0fy0b04mf3brx86xjnidkwg4zs4nh123nc6pgrl4mp6d6552vv98";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a35a0888a7a27174b5de58d99b01554769041f46/recipes/paper-theme";
- sha256 = "04diqm2c9fm29zyms3hplkzb4kb7b2kyrxdsy0jxyjj5kabypd50";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/a7ea18a56370348715dec91f75adc162c800dd10/recipes/paper-theme";
+ sha256 = "1ph6c6g907cnxzl74byc754119qia8rs8y7wvaj8i6q3fz2658zr";
name = "paper-theme";
};
packageRequires = [ emacs hexrgb ];
@@ -54495,8 +53502,8 @@
src = fetchFromGitHub {
owner = "Malabarba";
repo = "paradox";
- rev = "c508a52aee7f10f5e9b750b4724e264a3e694757";
- sha256 = "1xbys48368a6vcyjqxn71lg6yf7zvb2k9dlf07dl6hvh0a7qlpqa";
+ rev = "dfdfbec8b4a3b71966c134f00c3f5edfa87b6245";
+ sha256 = "1l0rs49lbclq4ayhnx6vi6bxn37a0h2ylk73fjcbar2lbr1dhf9r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/paradox";
@@ -54738,22 +53745,22 @@
license = lib.licenses.free;
};
}) {};
- pass = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store }:
+ pass = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, password-store-otp }:
melpaBuild {
pname = "pass";
- version = "20170802.253";
+ version = "20171010.410";
src = fetchFromGitHub {
owner = "NicolasPetton";
repo = "pass";
- rev = "2bc78649614356eff88f8c826d08782f5f804378";
- sha256 = "19awdplirf1s4ajmcvw6b2wlkmrvx5v8i8m4b8glp4wchx27czgn";
+ rev = "0f4ff034fb31b18f387e67f1de4029826db6cd0b";
+ sha256 = "084497na8qql638qjhgad02rvhwyzz81xwh70p6rxxwfzj0i1p17";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/428c2d53db69bed8938ec3486dfcf7fc048cd4e8/recipes/pass";
sha256 = "1vvyvnqf6k7wm0p45scwi6ny86slkrcbr36lnxdlkf96cqyrqzfr";
name = "pass";
};
- packageRequires = [ emacs f password-store ];
+ packageRequires = [ emacs f password-store password-store-otp ];
meta = {
homepage = "https://melpa.org/#/pass";
license = lib.licenses.free;
@@ -54843,26 +53850,48 @@
license = lib.licenses.free;
};
}) {};
- password-store = callPackage ({ f, fetchgit, fetchurl, lib, melpaBuild, s, with-editor }:
+ password-store = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, with-editor }:
melpaBuild {
pname = "password-store";
- version = "20170726.2054";
- src = fetchgit {
- url = "https://git.zx2c4.com/password-store";
- rev = "8fa1be8cdff8f5278011616171d8095b8a46b287";
- sha256 = "0i9iqsrg5y2w694kx9wa4fv3syijdshripjl6wi83c2xi4cp6p8s";
+ version = "20170829.1633";
+ src = fetchFromGitHub {
+ owner = "zx2c4";
+ repo = "password-store";
+ rev = "7252e8b3cf829e908179913daad16ff2b8bdefdd";
+ sha256 = "1wmayp7wjlfxdjb0wlmjqyxqa95ssrhhxhkiy0ip3bgip77s7rbw";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/ceff76206bd44d92c00adc931236c4ae15db5583/recipes/password-store";
- sha256 = "06l4xlvrjswy5kndn6h6swliqcp007nh4fyvma3jaac4f3x2qi65";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/207f8ec84572176749d328cb2bbc4e87c36f202c/recipes/password-store";
+ sha256 = "03r8j14l12yc42b51fzvn1jh8j85nyl1rg6c80r0a7ihwkj27jv6";
name = "password-store";
};
- packageRequires = [ f s with-editor ];
+ packageRequires = [ emacs f s with-editor ];
meta = {
homepage = "https://melpa.org/#/password-store";
license = lib.licenses.free;
};
}) {};
+ password-store-otp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, s }:
+ melpaBuild {
+ pname = "password-store-otp";
+ version = "20170928.18";
+ src = fetchFromGitHub {
+ owner = "volrath";
+ repo = "password-store-otp.el";
+ rev = "a39a64a91de36e87b852339635bd3c5fb0e32441";
+ sha256 = "0gb48blvnn6ci2wl45z81p41ny7vbgl610hqy6b2hyr2171qjd60";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/fc89d02554a6ff150ad42634879073892f3e88be/recipes/password-store-otp";
+ sha256 = "0m3n4gjf6hmcs2kg80h1whzbl74zsj79ihliyqfcdfc4v31m32sg";
+ name = "password-store-otp";
+ };
+ packageRequires = [ emacs password-store s ];
+ meta = {
+ homepage = "https://melpa.org/#/password-store-otp";
+ license = lib.licenses.free;
+ };
+ }) {};
password-vault = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "password-vault";
@@ -54968,26 +53997,6 @@
license = lib.licenses.free;
};
}) {};
- pastels-on-dark-theme = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "pastels-on-dark-theme";
- version = "20120304.1022";
- src = fetchgit {
- url = "https://gist.github.com/1974259.git";
- rev = "854839a0b4bf8c3f6a7d947926bf41d690547002";
- sha256 = "1ar6rf2ykd252y8ahx0lca7xsgfs6ff287q9iij79gs9fhn4yfy5";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/ab432b0eac0bcf0d40c5b3c8a78475bc0fea47d2/recipes/pastels-on-dark-theme";
- sha256 = "0zdr29793gg229r47yjb3plagxc9pszqyy4sx81ffp3rpdf0nlbh";
- name = "pastels-on-dark-theme";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/pastels-on-dark-theme";
- license = lib.licenses.free;
- };
- }) {};
pastery = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
melpaBuild {
pname = "pastery";
@@ -55327,12 +54336,12 @@
pdf-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, tablist }:
melpaBuild {
pname = "pdf-tools";
- version = "20170813.731";
+ version = "20171012.2226";
src = fetchFromGitHub {
owner = "politza";
repo = "pdf-tools";
- rev = "0bff9727b7109f5303c4172f1f7b603e8e484c91";
- sha256 = "0gdxvmzsf7v621y32ir33rn26qs75i59jvi2b2ji18xh32znqmb1";
+ rev = "0f99f0c06514acf51445e7e4cb0f638fa0c75ee5";
+ sha256 = "1gc7n5r60ib65bnkgpac3bn71pxnm58sxajnwjfkwi9xzgw72acv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8e3d53913f4e8a618e125fa9c1efb3787fbf002d/recipes/pdf-tools";
@@ -55432,11 +54441,11 @@
pelican-mode = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "pelican-mode";
- version = "20170808.252";
+ version = "20171001.503";
src = fetchgit {
url = "https://git.korewanetadesu.com/pelican-mode.git";
- rev = "8b13c30c4ec38dd535eadf26e463f8616d5c089c";
- sha256 = "0rghcyp09ga95ag0pjbk4hdxxlsnr93dr6706z0xvfgmninbn5aw";
+ rev = "64d41f0ee5970b2d875880994eb287b97cad24a1";
+ sha256 = "0xivc8sdp6h3fajyj7g73xnyfqlkhfpm2cs9x3mpyr42502lmn2c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/aede5994c2e76c7fd860661c1e3252fb741f9228/recipes/pelican-mode";
@@ -55469,48 +54478,6 @@
license = lib.licenses.free;
};
}) {};
- perl-completion = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "perl-completion";
- version = "20090527.2336";
- src = fetchFromGitHub {
- owner = "imakado";
- repo = "perl-completion";
- rev = "f2ec91b88a8b7d97d40d6c90a89eaf8e595c2b89";
- sha256 = "0fzypcxxd5zlkcybz0xppf09l0vf4vsfisr2y3ijsmxhg7yrwzj5";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/987c14a2c4a31e27382d05cdbca18a3d2661d2e1/recipes/perl-completion";
- sha256 = "01p17mlkwjm60f14arda3ly8ng0r98nn3rly94ghn6jr7r7fv14b";
- name = "perl-completion";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/perl-completion";
- license = lib.licenses.free;
- };
- }) {};
- perl6-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
- melpaBuild {
- pname = "perl6-mode";
- version = "20160730.1455";
- src = fetchFromGitHub {
- owner = "hinrik";
- repo = "perl6-mode";
- rev = "14073feeb0f8ad2225616d550133f8f473a51b33";
- sha256 = "1j6zgr9vfyqpdya8975sjh2ny70rqqyj9zbl63kldkirppnw995i";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/d4bbb2171c70958d5ab3730f974db3b07561a81b/recipes/perl6-mode";
- sha256 = "0af1djypd8n0n1fq10sl8mrdg27354kg9g87d6xz4q5phvi48cqv";
- name = "perl6-mode";
- };
- packageRequires = [ emacs pkg-info ];
- meta = {
- homepage = "https://melpa.org/#/perl6-mode";
- license = lib.licenses.free;
- };
- }) {};
perlbrew = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "perlbrew";
@@ -55598,12 +54565,12 @@
persp-fr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, persp-mode }:
melpaBuild {
pname = "persp-fr";
- version = "20161226.1241";
+ version = "20170908.44";
src = fetchFromGitHub {
owner = "rocher";
repo = "persp-fr";
- rev = "ba989ad309c2023d1826e79446908bd1b881a56a";
- sha256 = "1l9yb14sqxxfxzh76yv415ifnmrdi5qqp4m0858drs9wcm9f23pm";
+ rev = "4d2d1a75019f520742da79f1aeed9c4a960677e0";
+ sha256 = "1waakbmxwm0xdnl0iznyk61ccwdjvwv5g1naml31r7q0cnk0jfz8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8e09213dddf003a1275eafb767431a507ecf7639/recipes/persp-fr";
@@ -55619,12 +54586,12 @@
persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "persp-mode";
- version = "20170509.829";
+ version = "20171014.111";
src = fetchFromGitHub {
owner = "Bad-ptr";
repo = "persp-mode.el";
- rev = "a33c91e3738996c058841ed1985c67bedd4875e1";
- sha256 = "10ycv3yb5xav7wslf1swcmbn9w2an5izkca8crmdgr566h9mk0gb";
+ rev = "ccf87da2c230c3a91e627105b0f034a954e6842a";
+ sha256 = "1dv3ghl9falw888bl1w0d5pzp0jz8qsbisd7kfd887bsyn7x7jqw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode";
@@ -55703,12 +54670,12 @@
perspeen = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }:
melpaBuild {
pname = "perspeen";
- version = "20170813.1754";
+ version = "20170916.404";
src = fetchFromGitHub {
owner = "seudut";
repo = "perspeen";
- rev = "6b3a3b0468199a8db10a73d119dfcd8833d181b6";
- sha256 = "13rivw5rafl4pb68l500ksbzpz00yp7lx9wi9vy8nz0hwr80jd0p";
+ rev = "525f2f25358f17c7269c3750d56bfb8a6d59b5e6";
+ sha256 = "17nv33nl60jdn6cz6abbj6jxnvjcshaq4a22lkssxczp968k1qn3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/perspeen";
@@ -55724,12 +54691,12 @@
pfuture = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "pfuture";
- version = "20170531.805";
+ version = "20170726.1502";
src = fetchFromGitHub {
owner = "Alexander-Miller";
repo = "pfuture";
- rev = "a6c32c69abdb9b91baf8036b88cc4f477f611bd5";
- sha256 = "0ly38dzg754n4s2xs09kaisxs14ikm42d9sjhw9p9xirzqm7zd5j";
+ rev = "8b5cd8dfb8769d2b24484a313d3d21938afd3dfb";
+ sha256 = "1d63sfwy7qmldhq2xda9dglg91cy2kpjdr2rlmqb48w95wf0am3m";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5fb70c9f56a58b5c7a2e8b69b191aa2fc7c9bcc8/recipes/pfuture";
@@ -55829,16 +54796,16 @@
phan = callPackage ({ composer, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "phan";
- version = "20170205.604";
+ version = "20171017.2045";
src = fetchFromGitHub {
- owner = "zonuexe";
+ owner = "emacs-php";
repo = "phan.el";
- rev = "6442663bf7618bc614b6c47b0ad7bc591c68f947";
- sha256 = "0s38vbnsbpazca0jsahjmms7qgq74gsvfn2zkrfkhx9y8cpfxrrb";
+ rev = "17b44a62580272bcf5ee91fb58098292e9de6f83";
+ sha256 = "002qak8jlim6pjj3ckikzzcc6n40mcqd5qvzakazi1q01z1ffsnd";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/d591d9ba70b1e32f25204ad9409aad78fd68a93c/recipes/phan";
- sha256 = "16r1d2bgbb2y7l141sw7nzhx0s50gzwq5ang00y7f4sfldqvshzf";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/phan";
+ sha256 = "17ar6nxy0plx5li49kgf4f0h99wwmnnp5kwmpf34jg9ygyhaglvb";
name = "phan";
};
packageRequires = [ composer emacs f ];
@@ -56144,12 +55111,12 @@
php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "php-mode";
- version = "20170729.1258";
+ version = "20171018.1236";
src = fetchFromGitHub {
owner = "ejmr";
repo = "php-mode";
- rev = "151ae717b03d6d5fcc2bc86e349175840bfbe079";
- sha256 = "00f2k41zmda299rj4lfpxisnrr9i5f0gg51cb8fri7lyjzrq829a";
+ rev = "0e87a708fb0cf7bb5ad88baf08bd60e061e8b63c";
+ sha256 = "13676hca2mdfawc61g3hp1m56wv45i37g8gxhjb3mvjyjrb10rkv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode";
@@ -56165,12 +55132,12 @@
php-plus--mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "php-plus--mode";
- version = "20170215.657";
+ version = "20171027.921";
src = fetchFromGitHub {
owner = "echosa";
repo = "phpplus-mode";
- rev = "8224e6aabc2e3d046d717b4c87c643aa98a8e203";
- sha256 = "041xv3c2gwcxlj9bnjx6hlrm2k7s7fyzqbp4c583is6jx1adjfn3";
+ rev = "523e7e50f9978ba74b8a324f9f896cd9b5dfd9de";
+ sha256 = "0xf79pxsrfr9bi3138hdq2ccrh391sci8lvmvzcs3vnzw0hrzbfh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d542e94471b9f601f1ee6f31e727bc4a31fa8f9e/recipes/php+-mode";
@@ -56204,6 +55171,27 @@
license = lib.licenses.free;
};
}) {};
+ php-runtime = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "php-runtime";
+ version = "20170901.1106";
+ src = fetchFromGitHub {
+ owner = "emacs-php";
+ repo = "php-runtime.el";
+ rev = "e1bca88ab5472e9b520b4ce915cd27d1e7803c2d";
+ sha256 = "1krnfzck9j5wmda1rkmzhl9lcdzxfw324xfy4lz92nwb92mgw8gq";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/615c9ac208d8c20082a8ac83e49e93d99e2cbc89/recipes/php-runtime";
+ sha256 = "0dvnwajrjsgyqzglzpkx9vwx3f55mrag6dsbdjqc9vvpvxhmgfwb";
+ name = "php-runtime";
+ };
+ packageRequires = [ cl-lib emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/php-runtime";
+ license = lib.licenses.free;
+ };
+ }) {};
php-scratch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, s }:
melpaBuild {
pname = "php-scratch";
@@ -56312,12 +55300,12 @@
picpocket = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "picpocket";
- version = "20170723.509";
+ version = "20170905.1133";
src = fetchFromGitHub {
owner = "johanclaesson";
repo = "picpocket";
- rev = "ab40afe0e13dff43518233f16e889b44a8a3819b";
- sha256 = "0snq5wdmdzpbxslixi1vzyi0sccqy9k7m3hwxn540352rsz8zxcz";
+ rev = "e0ca0f1fc03b4166ce2eab9d7532b9b29989e5bd";
+ sha256 = "0ldiwfysfwz6mr54j7rl1jccfx9lq31a4v9r6cm55js75mamhbw1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e88dc89311d4bfe82dc15f22b84c4b76abb3fd69/recipes/picpocket";
@@ -56459,12 +55447,12 @@
pinyinlib = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "pinyinlib";
- version = "20170424.1352";
+ version = "20170827.1442";
src = fetchFromGitHub {
owner = "cute-jumper";
repo = "pinyinlib.el";
- rev = "39943d226c2a42a9013421a0b4b6d5d3696bf234";
- sha256 = "1nwj4c3y0kdlkf3jqd2dnibaiazrq6qcj533xk2qw4wmx072yij0";
+ rev = "45f05d3dbb4fe957f7ab332ca6f94675848b6aa3";
+ sha256 = "0pmgb4y06dbffs4442aa92vn8ydwl45zqwzxzwhk6md1318fppvd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f4aa27985dcfaf24f1863667b89e13df4710546f/recipes/pinyinlib";
@@ -56503,14 +55491,14 @@
pname = "pippel";
version = "20170730.623";
src = fetchFromGitHub {
- owner = "brotzeitmacher";
+ owner = "brotzeit";
repo = "pippel";
rev = "3737d5934665b5059c1e858feeb4270262b37e53";
sha256 = "0k94y305c6abhxgq6birfvnrplsx5gadwsqwn8m87sh8ldsjnmgi";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/pippel";
- sha256 = "0w6qbjb1wpz8gn4gzifzzjbc3gckhgnqvrpszrrklqmd10rk5mrw";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/6d1796688ed0d6957557d960ca28e450f9bcb6cf/recipes/pippel";
+ sha256 = "1li4h0dff1n7njy2lk3d50ndrlw84fphmdg16j0srkbgy7xz90yn";
name = "pippel";
};
packageRequires = [ dash emacs s ];
@@ -56687,22 +55675,22 @@
license = lib.licenses.free;
};
}) {};
- plantuml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ plantuml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "plantuml-mode";
- version = "20161225.1142";
+ version = "20170819.1033";
src = fetchFromGitHub {
owner = "skuro";
repo = "plantuml-mode";
- rev = "c7e83c260778467be5f82500a5541ce76da662ac";
- sha256 = "0lf2438ia39idxbz2b7qaagajnlfgf74cgvwppdl53hsy12b421n";
+ rev = "fce628885b54635b0287b3337626752b2725369d";
+ sha256 = "1pcxl00iwhrsi57s6gbf3bch00pkdxbg46p8xryn1w5r16xzd9pm";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a658eb8085f2bf413c276af19c77597132cf569b/recipes/plantuml-mode";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/38e74bb9923044323f34473a5b13867fe39bed25/recipes/plantuml-mode";
sha256 = "03srbg34512vxcqn95q4r7h2aqbqq0sd5c9ffnbx2a75vsblqc6h";
name = "plantuml-mode";
};
- packageRequires = [ emacs ];
+ packageRequires = [];
meta = {
homepage = "https://melpa.org/#/plantuml-mode";
license = lib.licenses.free;
@@ -56855,25 +55843,6 @@
license = lib.licenses.free;
};
}) {};
- plsql = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "plsql";
- version = "20121115.243";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/plsql.el?revision=5";
- sha256 = "1v0wvy9fd1qq3aq83x5jv3953n0n51x7y2r2ql11j0h8xasy42p1";
- name = "plsql.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/eb457144c112a7a9de2fc4c634dfd6c2dda2e486/recipes/plsql";
- sha256 = "1jvppmfdll34b8dav5dvbabfxiapv92p7lciblj59a707bbdb7l1";
- name = "plsql";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/plsql";
- license = lib.licenses.free;
- };
- }) {};
plur = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "plur";
@@ -56919,8 +55888,8 @@
version = "20170419.303";
src = fetchgit {
url = "https://git.savannah.gnu.org/git/gettext.git";
- rev = "488bf1c3be5ebe66520f352bfb8d99917878ab42";
- sha256 = "1p81ljxxsxd5dp9xn46zia0sp8d095ib3aaby3yzar55nvdfpl6f";
+ rev = "981c523ddbd1462970335a1069573ca3bdd3df5e";
+ sha256 = "1aq95scp0lg5r1fsn62r54dqamm3174wzrr0h3vxx75m3iycsxxi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/po-mode";
@@ -56936,12 +55905,12 @@
pocket-api = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
melpaBuild {
pname = "pocket-api";
- version = "20170315.1934";
+ version = "20170818.533";
src = fetchFromGitHub {
owner = "lujun9972";
repo = "pocket-api.el";
- rev = "de4c14122ffe6a04c93590da0ad4b8411801c6f5";
- sha256 = "1f1frnxsi8pgbmiycssq1jh1qjp12yfy1hq6zqscj0v510c4kzcq";
+ rev = "26e4583311ebc472f7bba59a1189f04938f2c03e";
+ sha256 = "04cf97mwkp5rw0dvnspdbrycywjdv4mljl6lbjhbvlijj745d5xm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/04e3be76aef4d1b6d5bb3eda533b5deffcc8a5bc/recipes/pocket-api";
@@ -56954,6 +55923,27 @@
license = lib.licenses.free;
};
}) {};
+ pocket-lib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, kv, lib, melpaBuild, request }:
+ melpaBuild {
+ pname = "pocket-lib";
+ version = "20171026.1610";
+ src = fetchFromGitHub {
+ owner = "alphapapa";
+ repo = "pocket-lib.el";
+ rev = "52d4c3d9ca500acbf0a4cac4abfacc0641007abe";
+ sha256 = "1c59xzh2acrfmld0fg78h3kyzhgfcfcbk7nmvb584jr2qppkszgy";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/71f17ce28f4fc8c2c100848be8aec15526ef8697/recipes/pocket-lib";
+ sha256 = "0v619blifmvm36dr773wjf35fjji4dj3pyck9nkz0m8zmpz0fg78";
+ name = "pocket-lib";
+ };
+ packageRequires = [ dash emacs kv request ];
+ meta = {
+ homepage = "https://melpa.org/#/pocket-lib";
+ license = lib.licenses.free;
+ };
+ }) {};
pocket-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pocket-api }:
melpaBuild {
pname = "pocket-mode";
@@ -56975,6 +55965,36 @@
license = lib.licenses.free;
};
}) {};
+ pocket-reader = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, kv, lib, melpaBuild, org-web-tools, ov, pocket-lib, rainbow-identifiers, s }:
+ melpaBuild {
+ pname = "pocket-reader";
+ version = "20171023.737";
+ src = fetchFromGitHub {
+ owner = "alphapapa";
+ repo = "pocket-reader.el";
+ rev = "e65a7e7529ece4fb7a738c062e73d5c07ace9574";
+ sha256 = "0bqxsvhmwvf0gpjmmh7pmzyw4lpcarj2prm52bgncch8x1f0gvnp";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/835a7bf2f72987183e9d15ada7ae747fb5715c11/recipes/pocket-reader";
+ sha256 = "0gcgmz4mhjgvqbh2gmv8v09sy80cnfccjym455m0fbl31b8dczhf";
+ name = "pocket-reader";
+ };
+ packageRequires = [
+ dash
+ emacs
+ kv
+ org-web-tools
+ ov
+ pocket-lib
+ rainbow-identifiers
+ s
+ ];
+ meta = {
+ homepage = "https://melpa.org/#/pocket-reader";
+ license = lib.licenses.free;
+ };
+ }) {};
podcaster = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "podcaster";
@@ -57038,25 +56058,6 @@
license = lib.licenses.free;
};
}) {};
- point-undo = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "point-undo";
- version = "20100504.129";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/point-undo.el?revision=6";
- sha256 = "13c1iw77ccvrfrv4lyljg8fpm7xqhnv29yzvig8wr8b5j2vsd8bz";
- name = "point-undo.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/ce31bd8f9a1ad4f3252f8cd4ef15984495df18bd/recipes/point-undo";
- sha256 = "0by7ifj1lf0w9pp7v1j9liqjs40k8kk9yjnznxchq172816zbg3k";
- name = "point-undo";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/point-undo";
- license = lib.licenses.free;
- };
- }) {};
pointback = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "pointback";
@@ -57144,12 +56145,12 @@
pomidor = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "pomidor";
- version = "20170310.634";
+ version = "20170925.2301";
src = fetchFromGitHub {
owner = "TatriX";
repo = "pomidor";
- rev = "bac68f7a1c72da3db6020d3bda45e38576c9c488";
- sha256 = "13bq9cm9aclnlsjzw66kig2618xr2v5sfb12dff8ja5hmw0j2jla";
+ rev = "16bed77ff933cb5f8430b6eacf27509631d22072";
+ sha256 = "1w2ql67arjzzjakqm34gbs3vf6w9yzkw5kzi5vrvkcwajqq8qq56";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0d4f313081594df23f357c40feb456847d8bd0/recipes/pomidor";
@@ -57228,12 +56229,12 @@
ponylang-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ponylang-mode";
- version = "20170514.1419";
+ version = "20171028.1356";
src = fetchFromGitHub {
owner = "SeanTAllen";
repo = "ponylang-mode";
- rev = "88833317195f5ee2880e33a907861c6c2d3851da";
- sha256 = "0kzzf03m1jzkl9fxzivzh3536c0c9l7m9g5h7zycdz7nj5da38c0";
+ rev = "5e23459dc395eb77fa4c6cfa3d6c08b1b185a6df";
+ sha256 = "0iwdnv56200w53ba4f66vih7gha2nb36ajnvbqixc0byibwcsnc9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7d51adec3c6519d6ffe9b3f7f8a86b4dbc2c9817/recipes/ponylang-mode";
@@ -57249,12 +56250,12 @@
pophint = callPackage ({ fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }:
melpaBuild {
pname = "pophint";
- version = "20170403.701";
+ version = "20170917.1948";
src = fetchFromGitHub {
owner = "aki2o";
repo = "emacs-pophint";
- rev = "5d1db7c0b92862ba2cc5f3566b25840b8ce3ba59";
- sha256 = "09av2krrmm8g3f3f31kl4j4agmmf8hx9irzrqyvgshljflk0nq1q";
+ rev = "909025c5a871ca4b9ec7aed7f1a27c819a94dba1";
+ sha256 = "0qbb36qijkzbzxlmqsvvddm7x2gk9rkafnyjbkxsl76rz1ajy6nz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0055c2887acbbd8a2803bf3f81ac2cc444cc805a/recipes/pophint";
@@ -57543,12 +56544,12 @@
powerline = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "powerline";
- version = "20170708.1442";
+ version = "20171023.750";
src = fetchFromGitHub {
owner = "milkypostman";
repo = "powerline";
- rev = "8a246902e86a0c59015bb897a9c59be9729ef5c4";
- sha256 = "1q90y0l0vdach8irb9cigw8w5nllvzv5hg8hd8ljpb4j9jhc5y5n";
+ rev = "fda4fb96984607d4a6502b1d8c8898e56d10cf6c";
+ sha256 = "1lz3kr8w9z9xx5amqqvim85asjji13q84d4r1cb5x77wajmj1p21";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f805053cd4dd9ed53ee0df17ad69429bc62325bb/recipes/powerline";
@@ -57603,44 +56604,6 @@
license = lib.licenses.free;
};
}) {};
- pp-c-l = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "pp-c-l";
- version = "20170307.939";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/pp-c-l.el?revision=25";
- sha256 = "0q36bq82lp381jnzf8kapiiglqgibzkhsxlhpgfdg3ynbmw5i1cc";
- name = "pp-c-l.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/pp-c-l";
- sha256 = "0gbqxlrsh9lcdkrj8bqh1mpxyhdlwbaxz4ndp5s90inmisaqb83v";
- name = "pp-c-l";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/pp-c-l";
- license = lib.licenses.free;
- };
- }) {};
- pp-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "pp-plus";
- version = "20170307.938";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/pp+.el";
- sha256 = "0a1dj9n3n81xal17djj15hqa71cqphjnf9k9z03vnpw8zq0m93lh";
- name = "pp+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/pp+";
- sha256 = "1ng5x7dp85y6yqj6q43h08qdnapg2j1ab8rmc47w4w79d1pryniq";
- name = "pp-plus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/pp+";
- license = lib.licenses.free;
- };
- }) {};
ppd-sr-speedbar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, project-persist-drawer, sr-speedbar }:
melpaBuild {
pname = "ppd-sr-speedbar";
@@ -57728,12 +56691,12 @@
prettier-js = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "prettier-js";
- version = "20170712.2334";
+ version = "20170823.159";
src = fetchFromGitHub {
owner = "prettier";
repo = "prettier-emacs";
- rev = "9cac36f6b1c224e0772dc92d15a6105ec10d3f40";
- sha256 = "0iwriz14aj5ripnr2v4y96pdl092h93i8mq2qi5jdi31fgi97sjj";
+ rev = "6cc79cc933968f9ecae988ed79398d9dc97790e2";
+ sha256 = "01k1k68rwwpjdajc12dvpjr8jfncvj8lli2l6065jwbq8ldg2ja0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/968ac7bb98b385f8542dc150486982c0ded73187/recipes/prettier-js";
@@ -57767,25 +56730,6 @@
license = lib.licenses.free;
};
}) {};
- pretty-lambdada = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "pretty-lambdada";
- version = "20170307.940";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/pretty-lambdada.el?revision=15";
- sha256 = "0b8m96hbqmgyqmv5f890fnyl9vl2wcsaz8w4b11wdprh82ravp4r";
- name = "pretty-lambdada.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/pretty-lambdada";
- sha256 = "16v5fgifz672c37xyzv557mm6za4rldvdrb26vdymxqg4fy62fd6";
- name = "pretty-lambdada";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/pretty-lambdada";
- license = lib.licenses.free;
- };
- }) {};
pretty-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "pretty-mode";
@@ -57915,12 +56859,12 @@
processing-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "processing-mode";
- version = "20150217.432";
+ version = "20171022.1602";
src = fetchFromGitHub {
owner = "ptrv";
repo = "processing2-emacs";
- rev = "a57415e523c9c3faeef02fa62a2b749270c4cc33";
- sha256 = "1smw786dcjvdn2j6bwqn2rfzhw039rrhxiv7vlrgzm0fyy2v1q6h";
+ rev = "448aba82970c98322629eaf2746e73be6c30c98e";
+ sha256 = "1fv74k37yyrh6jzasgqj88lrbq152gs9gpbjpxn7fz424c38gq2q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ba59561e8a2f259fde170a79844af5e1ef5ed34f/recipes/processing-mode";
@@ -57940,8 +56884,8 @@
src = fetchFromGitHub {
owner = "ptrv";
repo = "processing2-emacs";
- rev = "a57415e523c9c3faeef02fa62a2b749270c4cc33";
- sha256 = "1smw786dcjvdn2j6bwqn2rfzhw039rrhxiv7vlrgzm0fyy2v1q6h";
+ rev = "448aba82970c98322629eaf2746e73be6c30c98e";
+ sha256 = "1fv74k37yyrh6jzasgqj88lrbq152gs9gpbjpxn7fz424c38gq2q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ba59561e8a2f259fde170a79844af5e1ef5ed34f/recipes/processing-snippets";
@@ -57957,12 +56901,12 @@
prodigy = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "prodigy";
- version = "20160929.2302";
+ version = "20170816.1114";
src = fetchFromGitHub {
owner = "rejeep";
repo = "prodigy.el";
- rev = "50a5d4e0c720e73ef0919cf8019a32d934e86616";
- sha256 = "1a9cbzfchbiv7kafmim1mbx38y2iscibbgg6i0aq3200b30mxk57";
+ rev = "94d4d2870b86af1185e6395dabf15b3695846f38";
+ sha256 = "017xw1havxq9v6vxwvarmvxwk41jsrjik1mak5habmpfpwv78k01";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/prodigy";
@@ -58059,26 +57003,6 @@
license = lib.licenses.free;
};
}) {};
- project-local-variables = callPackage ({ fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "project-local-variables";
- version = "20080502.952";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/project-local-variables.el?revision=1";
- sha256 = "1bb5b6hxg3gvwf0sqwkd97nnipsmr60py0rnsfhgvizn4cj3khhw";
- name = "project-local-variables.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/project-local-variables";
- sha256 = "1jys9nac2912jdv40fly1q4i30xa8b1v2ndbc50rk4ysarhbhdd9";
- name = "project-local-variables";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/project-local-variables";
- license = lib.licenses.free;
- };
- }) {};
project-persist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "project-persist";
@@ -58144,12 +57068,12 @@
project-shells = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
melpaBuild {
pname = "project-shells";
- version = "20170312.1912";
+ version = "20171106.450";
src = fetchFromGitHub {
owner = "hying-caritas";
repo = "project-shells";
- rev = "1baec678ff04c2970591a2cb477c00b0182d6db1";
- sha256 = "05x0i3zyqgx72r9mzs98anzwdy7l1v2p5m6k4sffp1fcsp78b80v";
+ rev = "d681cf9488f5b7fe76fc53572a8c62f1664f8315";
+ sha256 = "1mp2n5g952p91rv48p87ak3jydma4cisfzp413yr1d0lf833r3c7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/becf54de5ae9582d7c76382dff16d40b04b1a464/recipes/project-shells";
@@ -58165,12 +57089,12 @@
projectile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
melpaBuild {
pname = "projectile";
- version = "20170727.2351";
+ version = "20171102.55";
src = fetchFromGitHub {
owner = "bbatsov";
repo = "projectile";
- rev = "5e9249dd42245222b26779e50cf9d00cae80bcde";
- sha256 = "04zvr24dxzi1z70z0vq218x14mva3z6s4my7wx6c6c9fwma1vbx4";
+ rev = "48457fb32b7ff31e5dd30d38e576b8e6c8d3ceba";
+ sha256 = "096q8vmpwz48gkkms4ryddaa3vbf93m0gjik96c0hmag3fygz0cg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile";
@@ -58270,12 +57194,12 @@
projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }:
melpaBuild {
pname = "projectile-rails";
- version = "20170814.522";
+ version = "20171103.1004";
src = fetchFromGitHub {
owner = "asok";
repo = "projectile-rails";
- rev = "d1dbd67ebdee9405ac95b0fbd71210df54457fb1";
- sha256 = "06v3wix90y92rjp769hrl92p57p60acf1b9mpdllcy48l6q0p074";
+ rev = "ff5f63df4e1403f5ab1286f1099a072a5f6694d9";
+ sha256 = "0qxnpz0nmh3rxrqmw93abmxjf0fnhl0nyalywa8crhzfrd7qff79";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails";
@@ -58316,8 +57240,8 @@
src = fetchFromGitHub {
owner = "nlamirault";
repo = "sift.el";
- rev = "ef509ac4c579340e8d924c26d9e5858a9f4fb9de";
- sha256 = "0i8gqzvpl3drzp031dqdpsi1ssr3az8fzb7xpbxnamzscfz6pdyc";
+ rev = "4ce8878a0fc396ded7521ce38852d93e1d863065";
+ sha256 = "1x78i6svi4cwah9xw85imhpncvxsx4xim4fzykpnd328mxkk07h6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a730e1331b0486c4bd2d309b85d2f8810489eb47/recipes/projectile-sift";
@@ -58351,19 +57275,40 @@
license = lib.licenses.free;
};
}) {};
+ projectile-trailblazer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }:
+ melpaBuild {
+ pname = "projectile-trailblazer";
+ version = "20170928.924";
+ src = fetchFromGitHub {
+ owner = "micdahl";
+ repo = "projectile-trailblazer";
+ rev = "a37a4f7b7f727d98e4c74c0256e059e84263553d";
+ sha256 = "1njs2aps4mlbnnfjkfwrb8vy8lg6lyxzxkxpscv91la7yf3wpc3g";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/f9c6f2f92ff99e7a3241003dc396f978f3916c8a/recipes/projectile-trailblazer";
+ sha256 = "18cijb5c1ym5kn2g2apbijbfd3aqhrraki8vv9bk8rvi7wmm6qj4";
+ name = "projectile-trailblazer";
+ };
+ packageRequires = [ emacs f inf-ruby inflections projectile rake ];
+ meta = {
+ homepage = "https://melpa.org/#/projectile-trailblazer";
+ license = lib.licenses.free;
+ };
+ }) {};
projectile-variable = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "projectile-variable";
version = "20170208.918";
src = fetchFromGitHub {
- owner = "zonuexe";
+ owner = "emacs-php";
repo = "projectile-variable";
rev = "8d348ac70bdd6dc320c13a12941b32b38140e264";
sha256 = "0l38nldx6lwjb7mxixykiyj10xwb35249dxfg0k2wkmb2vy1fkxs";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/ff603b43235f546cd47f72e675aee88d5f41e855/recipes/projectile-variable";
- sha256 = "1cj8nwxf1jp5q5zzxp92fxla6jhwzd21gw649ar6mygi4hgymsji";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/projectile-variable";
+ sha256 = "15qc5n91nxyfvb100iyihfmrdr57qgw6098yv3nfqgw3zx1qchdw";
name = "projectile-variable";
};
packageRequires = [ cl-lib emacs ];
@@ -58375,12 +57320,12 @@
projector = callPackage ({ alert, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
melpaBuild {
pname = "projector";
- version = "20170717.1151";
+ version = "20171006.1258";
src = fetchFromGitHub {
owner = "waymondo";
repo = "projector.el";
- rev = "ec63167ee21d537f410c0971f82e2ffdfd6fa008";
- sha256 = "155wnks7i73c3kvgysnfy0379d1fp78qv2b8lhsaxwx7jh356dbm";
+ rev = "03751fca880c95cf47e560c78cfc2aaa056cd455";
+ sha256 = "1yg9pcs6pbwd7a35q0jqjwnqwjqz4v5jd24msr51xh0v8kbs2v61";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/420ffea4549f59677a16c1ee89c77b866487e302/recipes/projector";
@@ -58540,22 +57485,22 @@
license = lib.licenses.free;
};
}) {};
- proportional = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, use-package }:
+ proportional = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "proportional";
- version = "20170628.137";
+ version = "20171025.1637";
src = fetchFromGitHub {
owner = "ksjogo";
repo = "proportional";
- rev = "eb2bb2b3d1ca058365049271dc341b1180009f1a";
- sha256 = "1lc3xvkvy5lcy5zralbnwqlxmar443yq735pd023z6di54xm3991";
+ rev = "f671ffe8fd803e2fc462e2e1844aeeab1a13918e";
+ sha256 = "02sbrcb9c27djk64xv41vii6pbw83b6iljrd66w4ad9hgz2pkxzk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9e0a7f061df4cce44e5fe98f6e1c31bec4a7338f/recipes/proportional";
sha256 = "022lhbslzd67wyah8r0gl73vzxgjjwia08l3ssdd08jj3p56m3wx";
name = "proportional";
};
- packageRequires = [ emacs use-package ];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/proportional";
license = lib.licenses.free;
@@ -58589,8 +57534,8 @@
src = fetchFromGitHub {
owner = "google";
repo = "protobuf";
- rev = "e0d24cc84a81d236daf0bbf783037c8c8c24d814";
- sha256 = "1pw89g82cc7687n3ffap9pzj3af1zagpx2j880dayii1hrgk1p7i";
+ rev = "bcda919ceeae8bd854c07a8300d8996ef52315db";
+ sha256 = "1fgmv9z6crdmn9z2frm68cwp9jxc15hi8sif952b127sr2kr074l";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -58627,15 +57572,15 @@
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 = "20170711.511";
+ version = "20171031.129";
src = fetchFromGitHub {
owner = "epost";
repo = "psc-ide-emacs";
- rev = "0a0ead9f8098afbb2f5648bfbbd5c3b7646a1b77";
- sha256 = "0xfkj9kdd7i0jcca8nhsp7bv0x7wsxi03ncln9y8d7c2g72fjkdd";
+ rev = "d28c33f65318a475133afc2f42e103db9251d2a2";
+ sha256 = "19f9aw675d6crhd9j9jvqya39ddsf4f6hcwb03525k307syvg62y";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/8189f4e7d6742d72fb22acf61a9d7eb0bffb2d93/recipes/psc-ide";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/384ffc463cc6edb4806f8da68bd251e662718e65/recipes/psc-ide";
sha256 = "1f8bphrbksz7si9flyhz54brb7w1lcz19pmn92hjwx7kd4nl18i9";
name = "psc-ide";
};
@@ -58658,16 +57603,16 @@
psci = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, purescript-mode, s }:
melpaBuild {
pname = "psci";
- version = "20160717.1125";
+ version = "20171011.50";
src = fetchFromGitHub {
- owner = "ardumont";
+ owner = "purescript-emacs";
repo = "emacs-psci";
- rev = "d773b407f772e6ab3c40406c22824889e0fd14fe";
- sha256 = "1kvw5qj975s7r58858aiql9861rglz1xgj9n69g5li9mcdxk0v2f";
+ rev = "5360b244c588ed2f2a5bb86180cb5d4deb2216de";
+ sha256 = "0m9lpwwm29h0pms1rnwnh67ff1n1dmf25yy429g438zq98l94x9s";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a0f45269895b8e061c972da46f932c96eb0f5279/recipes/psci";
- sha256 = "0sgrz8byz2pcsad2pydinp4hh2xb48pdb03r93wg2vvyy8p15j9g";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/3451719ce5096383db082917716a5ed8346fc186/recipes/psci";
+ sha256 = "1iwkr58b910vrwwxyk00psy74vp201vmm3b0cm4k5fh3glr31vp9";
name = "psci";
};
packageRequires = [ dash f purescript-mode s ];
@@ -58721,16 +57666,16 @@
psysh = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "psysh";
- version = "20170610.2104";
+ version = "20171022.2229";
src = fetchFromGitHub {
- owner = "zonuexe";
+ owner = "emacs-php";
repo = "psysh.el";
- rev = "f72d6fe41af2d9566d41b167cda66e97efdf8cfa";
- sha256 = "0hr8nlxcqfas9wl5ahz9hmvpa8b6k35n4f7iv9dx6zwf5q48q7y7";
+ rev = "926af4ae0c068ed699fc939f4b3e642aaa6f7c9e";
+ sha256 = "0k6kb4xbfxcvd7dm3kb600mq56xyy086zi7nal04jkv9lc59bwn7";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/4b3131d9a0ad359f15bc3550868a12f02476449a/recipes/psysh";
- sha256 = "0ygnfmfx1ifppg6j3vfz10srbcpr5ird2bhw6pvydijxkyd75vy5";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/psysh";
+ sha256 = "00rzfw8nlbcmfbjnzbfl08136dhgvrrn9g1s9l623xgpbcay63sg";
name = "psysh";
};
packageRequires = [ emacs f s ];
@@ -58760,27 +57705,48 @@
license = lib.licenses.free;
};
}) {};
- pug-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ pug-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "pug-mode";
- version = "20170127.1949";
+ version = "20171018.829";
src = fetchFromGitHub {
owner = "hlissner";
repo = "emacs-pug-mode";
- rev = "83599129c0de6f9f5082d019373c3d9347150191";
- sha256 = "17fwl967kw0kykakvga9vk7i294y5iysff263ir4y6vsnca3syn8";
+ rev = "9dcebdb10c50620a3a5c6d71361d53bf482a482e";
+ sha256 = "1rkbk8apd612ixksyssmmkrhswks6gbxl9kxhrbaxszfrrhqx86v";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b3710aac9f3df3a23238af1f969c462b3692f260/recipes/pug-mode";
sha256 = "1njhr95y2rx7inpl9phxxz580844p2iadqlga1kj7xzvjz698x85";
name = "pug-mode";
};
- packageRequires = [ emacs ];
+ packageRequires = [ cl-lib emacs ];
meta = {
homepage = "https://melpa.org/#/pug-mode";
license = lib.licenses.free;
};
}) {};
+ pulseaudio-control = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "pulseaudio-control";
+ version = "20171024.2339";
+ src = fetchFromGitHub {
+ owner = "flexibeast";
+ repo = "pulseaudio-control";
+ rev = "08c59e1dc45ec96edb62f34036e82cf5f14c0e8b";
+ sha256 = "10cgg1r00kz2fsnnryvzay5pf8s1pwb1dzlds1fbjdnyfvdgammv";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/7964f226e12c3a27ff856e28f4b030ebf304aea2/recipes/pulseaudio-control";
+ sha256 = "1vdhg85lbdx7sj1xg2vhhfmhrrp5q2x560agnsb0gxi2akp6z9r0";
+ name = "pulseaudio-control";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/pulseaudio-control";
+ license = lib.licenses.free;
+ };
+ }) {};
punctuality-logger = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "punctuality-logger";
@@ -58847,12 +57813,12 @@
puppet-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
melpaBuild {
pname = "puppet-mode";
- version = "20170719.752";
+ version = "20170928.1007";
src = fetchFromGitHub {
owner = "voxpupuli";
repo = "puppet-mode";
- rev = "fb1b683191d767eab312ea424de3517062d86420";
- sha256 = "12kxxgm61myna4wf3hgai8dgrssc9dnv75fh2mbcgwqggbfv8wlv";
+ rev = "e04f041386ebfe29fc67c3407e85b577b820df4f";
+ sha256 = "0hcp7hmxri62qcx80zqphlhwrhzapzi0c07kk4l2cm75xfy20a2l";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1de94f0ab39ab18dfd0b050e337f502d894fb3ad/recipes/puppet-mode";
@@ -58868,12 +57834,12 @@
purescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "purescript-mode";
- version = "20161216.133";
+ version = "20170926.242";
src = fetchFromGitHub {
owner = "dysinger";
repo = "purescript-mode";
- rev = "c88126070c052d636f4dad5525846a1b200fce43";
- sha256 = "1ndclsywvh5x06gmvk44zjlgfamdn55lygdgxf3x1vrznvr0jawy";
+ rev = "e2d6519a9669a1443db1040cf098bc3ea30ec861";
+ sha256 = "1k8q32ipa684hvk7iwpdzqwikimw8g3j6gkmz9yi5fxflq6z1swr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/77175fa470e517fa134751fbb38e144eb5b979ff/recipes/purescript-mode";
@@ -58952,14 +57918,14 @@
pushover = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "pushover";
- version = "20160718.857";
+ version = "20170818.1403";
src = fetchgit {
url = "https://git.flintfam.org/swf-projects/emacs-pushover.git";
- rev = "c43f149eaef832f6af399723a5a59424aa093aaa";
- sha256 = "0vrx8m7jcxavbfsyh35mf289vfyal0yrfl6h2m2yfx81whbinb5j";
+ rev = "bbe3ac8df3c532a72da4552615af960b8a577588";
+ sha256 = "187bisngi37n66ik2dq7rg4hy4nlxl9pifqgqq08kf9238y8hd11";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/2e12638554a13ef49ab24da08fe20ed2a53dbd11/recipes/pushover";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e9553cd029bc0733c89d2c790cb173d9668a9eba/recipes/pushover";
sha256 = "0im5bf2r69s2jb6scm8xdk63y1xi5zm4kg9ghfixlvyvipfli4kl";
name = "pushover";
};
@@ -59014,15 +57980,15 @@
py-gnitset = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "py-gnitset";
- version = "20140224.2010";
+ version = "20170821.1032";
src = fetchFromGitHub {
owner = "quodlibetor";
repo = "py-gnitset";
- rev = "471eb99b83eb9f6915d8ca241e9770ddd6244a78";
- sha256 = "05803wi7rj73sy9ihkilr6pcn72szfsvgf2dgbdpnqra508rxyb6";
+ rev = "1e993cc29cbc31e06fe1e335dec198e21972fa55";
+ sha256 = "1hslq2bdk95cgza9qbskxf942ckhjb4bqi6nrhbmlnm9agmjqm59";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/187d97c797818c4e0f61073b9e24baf925c437ff/recipes/py-gnitset";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/d00b78ead693e844e35c760fe2c39b8ed6cb0d81/recipes/py-gnitset";
sha256 = "0f6ivq4ignb4gfxw2q8qvigvv3fbvvyr87x25wcaz6yipg1lr18r";
name = "py-gnitset";
};
@@ -59307,12 +58273,12 @@
pyim = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, pyim-basedict }:
melpaBuild {
pname = "pyim";
- version = "20170809.413";
+ version = "20170916.2024";
src = fetchFromGitHub {
owner = "tumashu";
repo = "pyim";
- rev = "1f40c4341a886ec952de14f642f07ccce90670b2";
- sha256 = "126h7cxy5gy8hpclfnkp1qfpjj18s5b4j15awm0n411jkccn2h55";
+ rev = "d44db4cb74c1c0cf6f814ff14d0be8e733f8404a";
+ sha256 = "02b2aknx127xvl8amf74krvd7z33kyr049iw5h0665zkzsli4g8w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/pyim";
@@ -59367,27 +58333,6 @@
license = lib.licenses.free;
};
}) {};
- pyim-greatdict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "pyim-greatdict";
- version = "20170724.1525";
- src = fetchFromGitHub {
- owner = "tumashu";
- repo = "pyim-greatdict";
- rev = "45fa4ff26f3444fb98c4dea460d84b740204d105";
- sha256 = "1j89mcfsqyclmllfqmsx8a55ihrn2kzay8qh2lyfm8dzd6mi1za0";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/pyim-greatdict";
- sha256 = "1bbindnklmmxdskv9vmjxhvlxxmaccgqn70prblhpg6n11bxjhl9";
- name = "pyim-greatdict";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/pyim-greatdict";
- license = lib.licenses.free;
- };
- }) {};
pyim-wbdict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pyim }:
melpaBuild {
pname = "pyim-wbdict";
@@ -59458,8 +58403,8 @@
src = fetchFromGitHub {
owner = "PyCQA";
repo = "pylint";
- rev = "8b4c0717fe6b73d329532ca74d408790c64a2b6e";
- sha256 = "08v7cskyq6l9d6idw0piz54gz1xw1dqhl21r0xnhh16nza0ihrvf";
+ rev = "12c954eef9ff3764fb3c281ba0ffd7ff85c7f3ca";
+ sha256 = "0jrklxvwqlq697psfxbn6jqhib997g7nz0irbv3x6dp147p7njlz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint";
@@ -59601,12 +58546,12 @@
python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "python-mode";
- version = "20170813.50";
+ version = "20171031.431";
src = fetchFromGitLab {
owner = "python-mode-devs";
repo = "python-mode";
- rev = "8c3d55344fecd2837a3f268472f89866365fb54b";
- sha256 = "0cnzj17wrs5590kc84kywdk5xbs2149kygb3ys74jcli7zvg8bbh";
+ rev = "06e1db1bb2f4d2da994387f2cbb1cfc6e5db242b";
+ sha256 = "019j22hmc1f1izc61l8hnasvs4vj9sb9pl9w3v63ck086h89jda1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode";
@@ -59664,12 +58609,12 @@
python-x = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, folding, lib, melpaBuild, python ? null }:
melpaBuild {
pname = "python-x";
- version = "20161029.531";
+ version = "20171006.336";
src = fetchFromGitHub {
owner = "wavexx";
repo = "python-x.el";
- rev = "ef749fe2d3e58d5f6d7f32453d06964786c085d5";
- sha256 = "1nncinrwh0nqy8wn1q8yzi15nf15gj576ccsp5l28951gjgkc6s9";
+ rev = "9bf0d16cfe7b5f24b98d6b33cbc8763edaceb174";
+ sha256 = "0x255lnfyv2i7yz6ipx5adazqmvgmf4mdcixzs1wv85gazmbgfc5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/87ed5ea4868945df1bf92d1eae5d3ebb83ece117/recipes/python-x";
@@ -59706,12 +58651,12 @@
pyvenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "pyvenv";
- version = "20170224.538";
+ version = "20171005.1106";
src = fetchFromGitHub {
owner = "jorgenschaefer";
repo = "pyvenv";
- rev = "91c47b8d2608ccbcac2eba91f0e36b422101ce55";
- sha256 = "09c0f7ln1in8h03idbzggvmqkxj6i9jdjbmg1nnyarhffmgbcvnh";
+ rev = "9f528449dfc35516647118689a2104603f23b49c";
+ sha256 = "11yznfndkbyl6cmi7blxrr5yw9b32qw01abhvsj8jz1g1wnxhn45";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e37236b89b9705ba7a9d134b1fb2c3c003953a9b/recipes/pyvenv";
@@ -59934,15 +58879,36 @@
license = lib.licenses.free;
};
}) {};
+ quick-shell-keybind = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "quick-shell-keybind";
+ version = "20171022.2313";
+ src = fetchFromGitHub {
+ owner = "eyeinsky";
+ repo = "quick-shell-keybind";
+ rev = "5f4541a5a5554d108bf16b5fd1713e962161ca1b";
+ sha256 = "19hqywwf80q6ay886xmcjjpr4pghkw78hzdg0mrpkpkqn2vj06gk";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e9bf4d78da24d88476545f97b2af0527dde73600/recipes/quick-shell-keybind";
+ sha256 = "1f66wk2m0yykcbq6qbalgscpq8s53qshyyqdnimlmdi0g0glif1b";
+ name = "quick-shell-keybind";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/quick-shell-keybind";
+ license = lib.licenses.free;
+ };
+ }) {};
quickref = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "quickref";
- version = "20160326.936";
+ version = "20170817.532";
src = fetchFromGitHub {
owner = "pd";
repo = "quickref.el";
- rev = "9cad569c6eaeacf0b393a2c520ba444f6521ff38";
- sha256 = "13svdvww8dbv75lg66xhca6xi08k7k44rsx2ckdf82j9i52y5lw6";
+ rev = "f368c8b8219bb90498c5ab84e26f00eedaa234cf";
+ sha256 = "0nalnfb816qk1dfxjk9j8r5lvzv2k4jf747xdjbj2mcvv07g2jd2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/quickref";
@@ -59997,6 +58963,27 @@
license = lib.licenses.free;
};
}) {};
+ quiz = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "quiz";
+ version = "20170818.415";
+ src = fetchFromGitHub {
+ owner = "davep";
+ repo = "quiz.el";
+ rev = "c43151212ead2330e7ec8e5ac6914c617a12e4f8";
+ sha256 = "09r3p6gw17xrsm0pk6yv4lg8i3yf03yx2mlj4mi9i0r765m01c27";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/23d547c0d69d8f5d1e9983e3669a63dffaede2b3/recipes/quiz";
+ sha256 = "0pcjfhk109ifi834jw8lndwhpfcv764wym1dhiqhp5qd2vf431kg";
+ name = "quiz";
+ };
+ packageRequires = [ cl-lib emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/quiz";
+ license = lib.licenses.free;
+ };
+ }) {};
r-autoyas = callPackage ({ ess, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
melpaBuild {
pname = "r-autoyas";
@@ -60042,12 +59029,12 @@
racket-mode = callPackage ({ emacs, faceup, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "racket-mode";
- version = "20170617.1942";
+ version = "20170913.534";
src = fetchFromGitHub {
owner = "greghendershott";
repo = "racket-mode";
- rev = "9c5bcb7b7db979b34c6e99ade84b443651d62ab7";
- sha256 = "1cxpjkds24afi5b9i13dkgzv0yy6cgg3r9vsrif8mfhhfrr7sx1y";
+ rev = "33877b1bb24faea68842e0396bd5718b84e47451";
+ sha256 = "0681mzwx08zwbh8qg3s26jw1jn4fw2ljp1akxqkhy08sxhafqvb1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7ad88d92cf02e718c9318d197dd458a2ecfc0f46/recipes/racket-mode";
@@ -60060,27 +59047,6 @@
license = lib.licenses.free;
};
}) {};
- railgun = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "railgun";
- version = "20121016.2257";
- src = fetchFromGitHub {
- owner = "mbriggs";
- repo = "railgun.el";
- rev = "66aaa1b091baef53a69d0d7425f48d184b865fb8";
- sha256 = "00x09vjd3jz5f73qkf5v1y402zn8vl8dsyfwlq9z646p18ba7gyh";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/f8ba60673f2cb04176ed734c6457a20211609118/recipes/railgun";
- sha256 = "1a3fplfipk1nv3py1sy0p2adf3w1h4api01h2j5rjlq2jw06kyr0";
- name = "railgun";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/railgun";
- license = lib.licenses.free;
- };
- }) {};
rails-log-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rails-log-mode";
@@ -60102,27 +59068,6 @@
license = lib.licenses.free;
};
}) {};
- rails-new = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "rails-new";
- version = "20141221.49";
- src = fetchFromGitHub {
- owner = "cheunghy";
- repo = "rails-new";
- rev = "b68055a99cde15f9d02ab36b8ad0ea7ab35b2283";
- sha256 = "0cqp2vns7gq377bm6q9n5q0ra1d5yy2x2aiw9q1hswk82xpibj9l";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/c9f86ccce9ea4ef3cb7e162d4572609d3a8216cc/recipes/rails-new";
- sha256 = "0wgbm6qxqkpsbzj9wccicsphajaii07dl27b8x2vidsyw6ambj5h";
- name = "rails-new";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/rails-new";
- license = lib.licenses.free;
- };
- }) {};
railscasts-reloaded-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "railscasts-reloaded-theme";
@@ -60168,12 +59113,12 @@
rainbow-blocks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rainbow-blocks";
- version = "20140306.1033";
+ version = "20171025.738";
src = fetchFromGitHub {
owner = "istib";
repo = "rainbow-blocks";
- rev = "8335993563aadd4290c5fa09dd7a6a81691b0690";
- sha256 = "02x5ciyafqwak06yk813kl8p92hq03wjsk1882q8axr9q231100c";
+ rev = "dd435d7bb34ff6f162a5f315df308b90b7e9f842";
+ sha256 = "06yfb3i7wzvqrhkb61zib9xvpb5i00s4frizkzff66im05k0n795";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/rainbow-blocks";
@@ -60189,12 +59134,12 @@
rainbow-delimiters = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rainbow-delimiters";
- version = "20160430.2358";
+ version = "20170929.432";
src = fetchFromGitHub {
owner = "Fanael";
repo = "rainbow-delimiters";
- rev = "93cd2dc873e7fedca7abc599cd97d46db4376ac7";
- sha256 = "0vs9pf8lqq5p5qz1770pxgw47ym4xj8axxmwamn66br59mykdhv0";
+ rev = "19b93892afa0494ba749c2ca9c154e04447ad778";
+ sha256 = "0c2a8pbhzzy0bxx8gxz320r106k69hvwkn43j06i6sidbgjwh786";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d2cf11dbff76f0e3581b865f48bb44a307aa7f23/recipes/rainbow-delimiters";
@@ -60231,12 +59176,12 @@
rake = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rake";
- version = "20161114.605";
+ version = "20170921.801";
src = fetchFromGitHub {
owner = "asok";
repo = "rake";
- rev = "e680f1a8f2591af7c80cad188340601b101b5ddc";
- sha256 = "1dk2clsnmjy3bfv6laxf8sslvdajjbwpk83ss8v9xm55dcxjvd7n";
+ rev = "a27322262ebcce7765574b577000f6f939400206";
+ sha256 = "1fzlll8s5vri5hmqsx5ilbrms73b0rsn3k6m5dgq6rhgn5z5k6r1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/bf0f84698dda02a5b84a244ee29a23a6faa9de68/recipes/rake";
@@ -60315,12 +59260,12 @@
ranger = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ranger";
- version = "20170703.2135";
+ version = "20170817.857";
src = fetchFromGitHub {
owner = "ralesi";
repo = "ranger.el";
- rev = "905bd8e17c48fc270e66b846e8ada81462623e81";
- sha256 = "1h299kk8w162f9k588a4c4ikl3276y47si81p7jbda2fhf9s5lck";
+ rev = "6bbff5df2e55f56047fca5058d9ca93ba4963aef";
+ sha256 = "000dqqy5fbic8rwyndchj5pjmzad2yfa7z3xzi84dla6vhv15q6p";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0207e754f424823fb48e9c065c3ed9112a0c445b/recipes/ranger";
@@ -60357,12 +59302,12 @@
rats = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild, s }:
melpaBuild {
pname = "rats";
- version = "20170505.245";
+ version = "20170818.313";
src = fetchFromGitHub {
owner = "ane";
repo = "rats.el";
- rev = "40aee473d369cd27593cb7709f4792d1006ca8f7";
- sha256 = "0aqs4xja66iwbk39m8w2dm9lcisvjkwym65vinj2ywnp5mkr6jg6";
+ rev = "a6d55aebcc54f669c6c6ffedf84364c4097903cc";
+ sha256 = "0cskw05jb7wckhfs2qs9pn5icxa93ay2mw2i1brsmdd0igz34lg3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a62cbae1b2d9af2322bb6a27949de8c8bfddc2b7/recipes/rats";
@@ -60480,27 +59425,6 @@
license = lib.licenses.free;
};
}) {};
- rcirc-color = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "rcirc-color";
- version = "20151130.758";
- src = fetchFromGitHub {
- owner = "kensanata";
- repo = "rcirc-color";
- rev = "a94c7811e6ab578a138eb582f7ce31d3568b5c4d";
- sha256 = "173lhi48dwfp9k7jmgivhcc9f38snz5xlciyjhrafpadq1pir497";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/146b31de03f1f588fda3f7e27a538f87e71077f1/recipes/rcirc-color";
- sha256 = "1a8qqwdc0gw6m1xsnwrj3xldp05p7pabyj6l4bccpg3vf5wbgkn5";
- name = "rcirc-color";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/rcirc-color";
- license = lib.licenses.free;
- };
- }) {};
rcirc-groups = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rcirc-groups";
@@ -60567,12 +59491,12 @@
rdf-prefix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rdf-prefix";
- version = "20170514.859";
+ version = "20170915.1200";
src = fetchFromGitHub {
owner = "simenheg";
repo = "rdf-prefix";
- rev = "35129521d5b6035e5dd75d5b3481ce4971f46034";
- sha256 = "1iy9385n8a2b7ph4wdf8p92n81slirsxxckrc3khbk5zrpp62z5k";
+ rev = "25cc3c8902f16191496b549705b00ffc7dff51f1";
+ sha256 = "00ycsqzgn5rq8r4r86z1j43i2a7wj4r3c2vcggdaizyf4parmgmy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a5f083bd629697038ea6391c7a4eeedc909a5231/recipes/rdf-prefix";
@@ -60714,12 +59638,12 @@
real-auto-save = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "real-auto-save";
- version = "20150701.815";
+ version = "20170918.730";
src = fetchFromGitHub {
owner = "chillaranand";
repo = "real-auto-save";
- rev = "81bf61742ea553ccdee0e22d3abb43fcf07f82cf";
- sha256 = "1kghhps8mqys5l59qwzv3fgy1fvb15cnyaxmk29v818a6khjc5l2";
+ rev = "780d6c1c219e1f1efde1159a99af97b1c54c005d";
+ sha256 = "1wcyvyc3nwr9a89v8i4wmqvy2fwf7x7f3kcj7a8kdnp2albkvwsa";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/525039a3dc29190829bf50d608ef09bc4a8557af/recipes/real-auto-save";
@@ -60735,12 +59659,12 @@
realgud = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, load-relative, loc-changes, melpaBuild, test-simple }:
melpaBuild {
pname = "realgud";
- version = "20170803.632";
+ version = "20171006.1840";
src = fetchFromGitHub {
owner = "rocky";
repo = "emacs-dbgr";
- rev = "3f1b98f7a92e68e087a9a2174e61ac723eb161d3";
- sha256 = "1xiw6aw31zmvqwa3vpbq1xnla8539rjdy5gfxlhrw1qah5fqxni8";
+ rev = "081f7edc79a8e510d47e10c6ce4306b2f850df1f";
+ sha256 = "0nj95w5jfck0lhnrrnrl6h31cvgnpizbhnr52k7mf360vwrsjil6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud";
@@ -60843,6 +59767,27 @@
license = lib.licenses.free;
};
}) {};
+ reason-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "reason-mode";
+ version = "20171027.2235";
+ src = fetchFromGitHub {
+ owner = "reasonml-editor";
+ repo = "reason-mode";
+ rev = "a9de59cced37b44db72ee248107021a660561d11";
+ sha256 = "04g3598ykczxkmj5gjd4airfl41b821agy6r4h2bnq5fcfdj0jnx";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/f9f1a18c13601f3a4fd7b1bbfe7d5da07746e492/recipes/reason-mode";
+ sha256 = "07sirgj8bs9yv7pbx1lahwslvjd2aadkzkz7lsyw6xflj5fxpggr";
+ name = "reason-mode";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/reason-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
rebecca-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rebecca-theme";
@@ -60850,8 +59795,8 @@
src = fetchFromGitHub {
owner = "vic";
repo = "rebecca-theme";
- rev = "ee0d8796eca831110b7084a2af96fb4184d0a418";
- sha256 = "138hs6lgql40cn86p7v2xhb7ck2zcvz1vi6jd7fk55l0xgj5w61k";
+ rev = "add349748d0f648587bf17d14036677570f081aa";
+ sha256 = "1932ga5j5cv3w32iwxjdjs2jdz20sw5ai10dnxb6bdzh68kkw4f3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/19f40f30113c7dabd76a2d0e52898e6d6be69a35/recipes/rebecca-theme";
@@ -60885,25 +59830,6 @@
license = lib.licenses.free;
};
}) {};
- recentf-ext = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "recentf-ext";
- version = "20161210.840";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/recentf-ext.el?revision=5";
- sha256 = "0pzimhqkrdg2s9zw7ysir740cmaycf6fjs08bmlfjads7vdbjfpg";
- name = "recentf-ext.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/5a36ac5e0fc3599d50d7926cacf16b7a315f0e76/recipes/recentf-ext";
- sha256 = "1m54w1n3ci5j7i1jhw6cs7dgzmxrj1hsrrarqlrd1d4iqhixjzbq";
- name = "recentf-ext";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/recentf-ext";
- license = lib.licenses.free;
- };
- }) {};
recompile-on-save = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "recompile-on-save";
@@ -60928,12 +59854,12 @@
recover-buffers = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "recover-buffers";
- version = "20150812.5";
+ version = "20171008.2137";
src = fetchFromGitHub {
owner = "tripleee";
repo = "recover-buffers";
- rev = "a1db7f084977697081da3497628e3514e032b966";
- sha256 = "114ssmby614xjs7mrpbbsdd4gj5ra6klfh8h6z8iij8xn3kii83q";
+ rev = "81a5cb53099955ebc2a411a44cba5a394ee3f2d1";
+ sha256 = "07dfdvz5rn5l13xdycd7h75zaq0pw2afb9n1yiq01fqk6gvrhc5b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/43b33cfb794c35de78fde6eabb71ffe01049d23d/recipes/recover-buffers";
@@ -61030,25 +59956,6 @@
license = lib.licenses.free;
};
}) {};
- redo-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "redo-plus";
- version = "20131117.351";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/redo+.el";
- sha256 = "1jc4n60spzssa57i3jwrqwy20f741hb271vmmx49riycx1ybx3d3";
- name = "redo+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/redo+";
- sha256 = "0v7nrn6fbjx4mb0xsnkvqxk2hp35wfy83si5bavwwym4jcb5pl2r";
- name = "redo-plus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/redo+";
- license = lib.licenses.free;
- };
- }) {};
redpen-paragraph = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
melpaBuild {
pname = "redpen-paragraph";
@@ -61073,12 +59980,12 @@
redprl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "redprl";
- version = "20170810.2004";
+ version = "20171030.1346";
src = fetchFromGitHub {
owner = "RedPRL";
repo = "sml-redprl";
- rev = "41370a8b7ae0d6273dd096d1f639485531f02859";
- sha256 = "1gp8lcavxg9v3wll2kk1gcd63p0zlcxg7vc9753k7nk741rc2m1q";
+ rev = "6ce431a3b537703e89981426368afbc64964ab36";
+ sha256 = "1bzl0zklb83ndxyi92py1zrlnxvv4w2rq8m37azmijigprad1mcz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl";
@@ -61091,26 +59998,6 @@
license = lib.licenses.free;
};
}) {};
- redshank = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "redshank";
- version = "20120510.1230";
- src = fetchgit {
- url = "http://www.foldr.org/~michaelw/projects/redshank.git";
- rev = "f98e68f532e622bcd464292ca4a9cf5fbea14ebb";
- sha256 = "1jdkgvd5xy9hl5q611jwah2n05abjp7qcy9sj4k1z11x0ii62b6p";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/f2cf21b79d47a4bc154ac15f8111794ca9eeac16/recipes/redshank";
- sha256 = "07s4gja1w8piabkajbzrgq77mkdkxr0jy9bmy2qb9w2svfsyns9b";
- name = "redshank";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/redshank";
- license = lib.licenses.free;
- };
- }) {};
redtick = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "redtick";
@@ -61132,27 +60019,6 @@
license = lib.licenses.free;
};
}) {};
- refheap = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
- melpaBuild {
- pname = "refheap";
- version = "20140902.1402";
- src = fetchFromGitHub {
- owner = "Raynes";
- repo = "refheap.el";
- rev = "d41f8efb8e913b29035f545914859e3f18287492";
- sha256 = "08kzi2jcfqnlanqzvbk5gq1if7k8qc9gmz5bmvd2mvmx6z436398";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/refheap";
- sha256 = "11w2pmkz56141gvyzyims9rd42djizni3g6dw4qa48bvlqc56klh";
- name = "refheap";
- };
- packageRequires = [ json ];
- meta = {
- homepage = "https://melpa.org/#/refheap";
- license = lib.licenses.free;
- };
- }) {};
refine = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }:
melpaBuild {
pname = "refine";
@@ -61411,8 +60277,8 @@
src = fetchFromGitHub {
owner = "willghatch";
repo = "emacs-repeatable-motion";
- rev = "77aa35b27c8a76dc8deef87c9f71ef7e6fd289ee";
- sha256 = "0pm9z0w402430j66167s1az37jxw89sck1b7lm9gjnc3gslh0lpm";
+ rev = "f29effdc4121c2dc7e3fec9b3a62debce29cda9d";
+ sha256 = "11s7r5g0djj0yc8ll7jfw5v3m9kyvaiscndnfnvvjw5lwgfyh0v3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0dd56ebaea098715b9c201f07e6196c38977f8e3/recipes/repeatable-motion";
@@ -61488,25 +60354,6 @@
license = lib.licenses.free;
};
}) {};
- replace-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "replace-plus";
- version = "20170801.1947";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/replace+.el";
- sha256 = "0vlk2sjszzzkf94vfgb52ck4qbqp9ll1kdlxnmxixjxxl8iciwzj";
- name = "replace+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/replace+";
- sha256 = "1imsgr3v8g2p2mnkzp92ga3nvckr758pblmlha8gh8mb80089krn";
- name = "replace-plus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/replace+";
- license = lib.licenses.free;
- };
- }) {};
replace-symbol = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "replace-symbol";
@@ -61528,6 +60375,27 @@
license = lib.licenses.free;
};
}) {};
+ replace-with-inflections = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, inflections, lib, melpaBuild, string-inflection }:
+ melpaBuild {
+ pname = "replace-with-inflections";
+ version = "20170911.245";
+ src = fetchFromGitHub {
+ owner = "knu";
+ repo = "replace-with-inflections.el";
+ rev = "e286036a5d1dbac06a72a1e831b2a8d9cad27238";
+ sha256 = "1szbps1k3na3w9djkqxm3s1anm12505ajr7ay9j7pmd00qf75379";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/7892eb506b8f4260bde4be2805bf3b2d594ab640/recipes/replace-with-inflections";
+ sha256 = "1pqpin5ipm3g74zjh1kh6s1gh0aan6202p0y2q00d4ywbz9kn5s0";
+ name = "replace-with-inflections";
+ };
+ packageRequires = [ cl-lib inflections string-inflection ];
+ meta = {
+ homepage = "https://melpa.org/#/replace-with-inflections";
+ license = lib.licenses.free;
+ };
+ }) {};
repo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "repo";
@@ -61552,12 +60420,12 @@
req-package = callPackage ({ dash, fetchFromGitHub, fetchurl, ht, lib, log4e, melpaBuild, use-package }:
melpaBuild {
pname = "req-package";
- version = "20170314.2342";
+ version = "20170826.2252";
src = fetchFromGitHub {
owner = "edvorg";
repo = "req-package";
- rev = "e7108177d05fc6f674b1766f1154d0652654b1af";
- sha256 = "1pv3yvglfq09rc2vxhy48hglppydsz0ji92564xba5kngqbbjw34";
+ rev = "179ab70bb3d4f7a94401dace64f695c50acfe389";
+ sha256 = "1j54l002vq8hz1pghyas4aalqhsnma5czjh4fh5s5cs4v7v6d7s8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f58a801f0791566d0c39493a5f82ff0d15d7ab41/recipes/req-package";
@@ -61682,8 +60550,8 @@
src = fetchFromGitHub {
owner = "iqbalansari";
repo = "restart-emacs";
- rev = "e6ac81464cce37b7ae3aea38dcf2720cc2750d31";
- sha256 = "19fh4hsnxb7jc0zhgrg01hn8vbcirjxny5w29gcq7xiighwrbap7";
+ rev = "98aa4efd2caeaf0f42ca385c24fa14a843b271b7";
+ sha256 = "00qh17m4q6a1d2ck1309hp4hcw528nzp60zp8vy6x6qx7shsibrm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b9faeb6d910d686cbcafe7d12e0bcf62a85689bd/recipes/restart-emacs";
@@ -61780,25 +60648,6 @@
license = lib.licenses.free;
};
}) {};
- reveal-next = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "reveal-next";
- version = "20170101.1120";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/reveal-next.el?revision=7";
- sha256 = "0vqacr3q9n772qmyyj35dxkqp79yqrpfhlf8zj70jzg04xzy6f0m";
- name = "reveal-next.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/38e5dd845c99acaae719562595059154a08a5f00/recipes/reveal-next";
- sha256 = "0fp6ssd4fad0s2pbxbw75bnx7fcgasig8xvcx7nls8m9p6zbbmh2";
- name = "reveal-next";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/reveal-next";
- license = lib.licenses.free;
- };
- }) {};
reverse-im = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "reverse-im";
@@ -61844,12 +60693,12 @@
review-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "review-mode";
- version = "20170804.545";
+ version = "20171029.650";
src = fetchFromGitHub {
owner = "kmuto";
repo = "review-el";
- rev = "e166efd9b8596a9abe14afae79b33eaa808c14ea";
- sha256 = "0cnwfb3q9xfsrzg5sf64y4p00wdcw0iiz5iard00siva0q0s5k9x";
+ rev = "115cd06558c01889f89feaa659e0d7513a2ad21e";
+ sha256 = "0162gg3hf633zhr5jwj222lx143xvph001qmpmlbbqdxc0sgw5hv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f2f9e2667389577d0703874ca69ebe4800ae3e01/recipes/review-mode";
@@ -61883,41 +60732,22 @@
license = lib.licenses.free;
};
}) {};
- rfringe = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "rfringe";
- version = "20110405.820";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/rfringe.el?revision=1";
- sha256 = "02i5znln0aphvmvaia3sz75bvjhqwyjq1blf5qkcbprnn95lm3yh";
- name = "rfringe.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/rfringe";
- sha256 = "16a647gvvn5nzgng7a8pam4ay6aifvhldaxg2xfz9fcafzkvw967";
- name = "rfringe";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/rfringe";
- license = lib.licenses.free;
- };
- }) {};
- rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }:
+ rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "rg";
- version = "20170809.1107";
+ version = "20171018.1317";
src = fetchFromGitHub {
owner = "dajva";
repo = "rg.el";
- rev = "081685a8c624220ece68d6dca8d60016585b04ff";
- sha256 = "094fy48h0mmih3g9dq7xhhdqq3dx3jbrg1x9qcq2szl3danndl6z";
+ rev = "5de611eae7787ecbc285fe7e31e412b9281a4e14";
+ sha256 = "18mhcipj5yywd5648pwm955wx3ipsnp9nwjyyl270qnn56hwkb6g";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg";
sha256 = "0i78qvqdznh1z3b0mnzihv07j8b9r86dc1lsa1qlzacv6a2i9sbm";
name = "rg";
};
- packageRequires = [ cl-lib emacs s seq ];
+ packageRequires = [ cl-lib emacs s ];
meta = {
homepage = "https://melpa.org/#/rg";
license = lib.licenses.free;
@@ -61972,8 +60802,8 @@
src = fetchFromGitHub {
owner = "Malabarba";
repo = "rich-minority";
- rev = "333e4669f76a0fb68b433117d377711e418a525e";
- sha256 = "0ms42fnfis6y2h717cqhngzv7ysgf8340rsfm2i7rx2gbdynr1ic";
+ rev = "3201f6e1769beb9f6cbbda392bef99fce337acf4";
+ sha256 = "1qa447k3qq2x1i2nxbm60wzr8kaysk3cifl09c13sv97n4yq3x2b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/rich-minority";
@@ -61989,12 +60819,12 @@
rigid-tabs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rigid-tabs";
- version = "20150807.856";
+ version = "20170903.859";
src = fetchFromGitHub {
owner = "wavexx";
repo = "rigid-tabs.el";
- rev = "c7c6b726806df7e8cb25a41b213a207850c91cb7";
- sha256 = "0p044wg9d4i6f5x7bdshmisgwvw424y16lixac93q6v5bh3xmab5";
+ rev = "eba84ceaba2e57e76ad2dfbb7a7154238a25d956";
+ sha256 = "18rba101m9vmjl4mf3x0k7wvbgn6qmay9la745vzpr3lx1f4nn98";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/689b0060ee5db505fc0ed4603aca204b2d3c63a2/recipes/rigid-tabs";
@@ -62010,12 +60840,12 @@
rimero-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rimero-theme";
- version = "20170813.556";
+ version = "20171001.821";
src = fetchFromGitHub {
owner = "yveszoundi";
repo = "emacs-rimero-theme";
- rev = "ed6ad6ac4c67366f7fbdcf94bfe74b2f6683b395";
- sha256 = "06ifk0i13zy915zv46wam3pyv92xn5sjil02kdgxzn68ry76xddz";
+ rev = "2c15da5a4d56f1b29db2fc178d387eb86e7abd39";
+ sha256 = "0pvykjz0a2jgq2dghhshc4w7852jrlk0vy35ppbn956yp7rq9sx3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c6d07b0c021001195e6e0951c890566a5a784ce1/recipes/rimero-theme";
@@ -62115,12 +60945,12 @@
rjsx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
melpaBuild {
pname = "rjsx-mode";
- version = "20170808.634";
+ version = "20171029.1156";
src = fetchFromGitHub {
owner = "felipeochoa";
repo = "rjsx-mode";
- rev = "4a24c86a1873289538134fe431e544fa3e12e788";
- sha256 = "0yv622nnbcjnnaki49f7cz8cvrg13d0h9higadp83bl1lczhgw8j";
+ rev = "4c10dcd764ade8e3d5dc235c26ba9299576a513d";
+ sha256 = "034hrzcvbnsrr9cxy2wzggnsax708hd231hfkixwffzrrwdlhwz8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b83be7efdef2457e1320fe3dec46484fbd20263c/recipes/rjsx-mode";
@@ -62157,16 +60987,16 @@
robots-txt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "robots-txt-mode";
- version = "20160820.202";
+ version = "20170908.642";
src = fetchFromGitHub {
- owner = "zonuexe";
+ owner = "emacs-php";
repo = "robots-txt-mode";
- rev = "edf1f8082c88cb2ff5a784ba00f92c535aaa1c7d";
- sha256 = "11ig771ck610glb6f3322ka026ikq0b072rlq5z6ymr3rbxagn6j";
+ rev = "4a77674ab2963b829d3b751741c4ce1169e87f6b";
+ sha256 = "1ynmb9gpryfrml80kkv71k11j7r91mgyzh1q8xx52s0b4mkd33zc";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/1669c7a0d89ea36d61bfa57ef54ee1f203daff5f/recipes/robots-txt-mode";
- sha256 = "1q3fqaf9nysy9bhx4h9idgshxr65hfwnx05vlwazx7jd6bq6kxfh";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/robots-txt-mode";
+ sha256 = "00hxz4mygcxg7d8m2i4cm0bl82v3hw8wb4m8vv7g7fqkjp32c9qc";
name = "robots-txt-mode";
};
packageRequires = [];
@@ -62199,12 +61029,12 @@
rope-read-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rope-read-mode";
- version = "20170620.237";
+ version = "20171003.719";
src = fetchFromGitHub {
owner = "marcowahl";
repo = "rope-read-mode";
- rev = "bbb67d54a31ce238e4a8b1aae677ef055aea27ba";
- sha256 = "1l00km1rrnybskv0rv0kqxdrqimmfwz4mmil64m2d6vl0nqickb0";
+ rev = "77b183a6f5450138388509f54a6a2ce442766e50";
+ sha256 = "0ddm7gwr51ip8mc79jxkvp52sxhlvs0kyy59v7r7pf5mbadbpsbz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/14a674559aa485e92357a8b941304ae8167b9c3e/recipes/rope-read-mode";
@@ -62264,14 +61094,14 @@
pname = "rpm-spec-mode";
version = "20160710.436";
src = fetchFromGitHub {
- owner = "bjorlykke";
+ owner = "stigbjorlykke";
repo = "rpm-spec-mode";
rev = "c1c38050c48ea330c7cea632b8785d66daeefb2b";
sha256 = "0427kcvf2ljhzwxskn3jzk0ncrl3f9zcz2sm83d9pmhh5jax2gch";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/f1ce736b8db53fea4935d195a0d07dc8141125a8/recipes/rpm-spec-mode";
- sha256 = "01vggdv8sac4p0szwk7xgxcglmd5a1hv5q0ylf8zcp1lsyyh8ypd";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/bb7e188fffda3d4e42690511775e5e32a11e1b34/recipes/rpm-spec-mode";
+ sha256 = "1ygk0pdhq1hvgzd173h79lxb04b9lmvq4hi70qf9244bqbm0m182";
name = "rpm-spec-mode";
};
packageRequires = [];
@@ -62325,12 +61155,12 @@
rspec-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, ruby-mode ? null }:
melpaBuild {
pname = "rspec-mode";
- version = "20170312.56";
+ version = "20171025.1606";
src = fetchFromGitHub {
owner = "pezra";
repo = "rspec-mode";
- rev = "1f468e443e7f2d8419eec29e42074edc400f8c0c";
- sha256 = "03wv1k3ppvdk2776bkbz8bhxw5n7h4b8zm3b2j2j6x7hrxfza5h4";
+ rev = "94a04f148922852b591957b0b3b22de5c4237448";
+ sha256 = "04qcicaklj9fhl0wbb8axi8zvd0az43cnrhf53vhgwsgnf7rjya2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cd83e61b10da20198de990aa081b47d3b0b44d43/recipes/rspec-mode";
@@ -62346,12 +61176,12 @@
rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rtags";
- version = "20170731.1057";
+ version = "20171027.1028";
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "de1f11e68f6752b3ee6738287d4dadb11bca8f8a";
- sha256 = "1jsx08pgwrz6n47a0zs05m0h6knpp9sgg8lrdwg792a93nrcqc5c";
+ rev = "e413e31d1e74fae1fc1bf86792013c3680be6580";
+ sha256 = "0hfibc1nllsp9zdb803ac6cwp6xx4xf8mvjszfq9vp5a63sgw0pl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags";
@@ -62406,18 +61236,19 @@
license = lib.licenses.free;
};
}) {};
- ruby-additional = callPackage ({ emacs, fetchsvn, fetchurl, lib, melpaBuild, ruby-mode ? null }:
+ ruby-additional = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, ruby-mode ? null }:
melpaBuild {
pname = "ruby-additional";
- version = "20161115.2259";
- src = fetchsvn {
- url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/";
- rev = "59588";
- sha256 = "05rkz2wvyr00rr6g5sc2jgx1v2m81cbf24gjazxw4i9b3sf55ykr";
+ version = "20171001.2106";
+ src = fetchFromGitHub {
+ owner = "emacsorphanage";
+ repo = "ruby-additional";
+ rev = "14f380893cb7c1d9ddbb4ed1a2fc280999c82fde";
+ sha256 = "07mbjnph72l52f0bgz6qn5pbnfiyjx5p1ranq5g4csbfpx9jcc3s";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ruby-additional";
- sha256 = "1x5574swmch89jz2jiq6g34igp94bivzld0lb1nhyb1i3v1msq6i";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/ruby-additional";
+ sha256 = "1ivxn787k64q5jl0dxmxbj240ykcyvfhfam5fdvrwvc3yysk2dx7";
name = "ruby-additional";
};
packageRequires = [ emacs ruby-mode ];
@@ -62426,25 +61257,6 @@
license = lib.licenses.free;
};
}) {};
- ruby-block = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "ruby-block";
- version = "20131210.1931";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/ruby-block.el?revision=12";
- sha256 = "0c4vy9xsw44g6q9nc8aaav5avgp34h24mvgcnww468afiimivdcq";
- name = "ruby-block.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/e2149ce3baef9ac01d5b2e8b1a933a3e1206015f/recipes/ruby-block";
- sha256 = "0jfimjq1xpwxkxya452kp27h0fdiy87aj713w3zsm04k7l6i12hm";
- name = "ruby-block";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/ruby-block";
- license = lib.licenses.free;
- };
- }) {};
ruby-compilation = callPackage ({ fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }:
melpaBuild {
pname = "ruby-compilation";
@@ -62466,27 +61278,6 @@
license = lib.licenses.free;
};
}) {};
- ruby-dev = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "ruby-dev";
- version = "20130811.151";
- src = fetchFromGitHub {
- owner = "Mon-Ouie";
- repo = "ruby-dev.el";
- rev = "3a6f6e489697916dd554852492bd325879be2e44";
- sha256 = "1cy5zmdfwsjw8jla8mxjm1cmvrv727fwq1kqhjr5nxj0flwsm4x1";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/b6e0c48ac1fa26e027c6a17f20eee7c084568cae/recipes/ruby-dev";
- sha256 = "0mf2ra3p5976qn4ryc2s20vi0nrzwcg3xvsgppsc0bsirjw2l0fh";
- name = "ruby-dev";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/ruby-dev";
- license = lib.licenses.free;
- };
- }) {};
ruby-electric = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ruby-electric";
@@ -62515,8 +61306,8 @@
src = fetchFromGitHub {
owner = "rejeep";
repo = "ruby-end.el";
- rev = "ea453f5ac6259f09667fa26b865b6afacd06aa97";
- sha256 = "1x4nvrq5nk50c1l3b5wcr4g1n5nmwafcz1zzc12qzsl5sya7si55";
+ rev = "a136f75abb6d5577ce40d61dfeb778c2e9bb09c0";
+ sha256 = "1f530gaiy010qln51g83m1llazhyfi8ws0lvsb982fhi4dh1xfk5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ruby-end";
@@ -62550,36 +61341,15 @@
license = lib.licenses.free;
};
}) {};
- ruby-guard = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "ruby-guard";
- version = "20160131.1752";
- src = fetchFromGitHub {
- owner = "cheunghy";
- repo = "ruby-guard";
- rev = "bc864cadb241be855ada148f07e5048cce0991a0";
- sha256 = "080hmrh7pgpaj33w1rkhcqb1yp70w4cap0rq9hsxaaajj0sn47z3";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/b9d47bb7eb0f6c56fa7fcf84478aab34f938d195/recipes/ruby-guard";
- sha256 = "0hwxhirdvaysw9hxcgfdf0l12wilr6b9f9w91pk1hfwfi1w0lfwr";
- name = "ruby-guard";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/ruby-guard";
- license = lib.licenses.free;
- };
- }) {};
ruby-hash-syntax = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ruby-hash-syntax";
- version = "20141010.839";
+ version = "20171013.50";
src = fetchFromGitHub {
owner = "purcell";
repo = "ruby-hash-syntax";
- rev = "13288a29478a9e45ab4fd2188aea8d4894e08848";
- sha256 = "1zx70bdyqabx03g813h76ks9agy66yf08z9x83yw1rsf713d1pg2";
+ rev = "bc05c3130a5d3237f04c6064297e56de5f73887d";
+ sha256 = "1jwvyj3kqchd40h37m75ydl0gjrbm873dhfn1grqg4sgk60hr414";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c7d21a43a4bf267507bdc746ec9d0fd82049c0af/recipes/ruby-hash-syntax";
@@ -62637,12 +61407,12 @@
ruby-test-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pcre2el, ruby-mode ? null }:
melpaBuild {
pname = "ruby-test-mode";
- version = "20170515.1008";
+ version = "20171016.931";
src = fetchFromGitHub {
owner = "r0man";
repo = "ruby-test-mode";
- rev = "740ff1a7c81eb8380fd0f0cdb7c32238acf13dd1";
- sha256 = "1a7lhx7ibh9rrxdamxwd107npnmsf9sxbksvy9rm8l3rnm8yjnvy";
+ rev = "87f6d770f8d2326c8d36099aeee5d577f3e2af69";
+ sha256 = "0qiwc2h5hyh6np16a2gfcchbnyh7v5wnzd8idr64cmd9blg3jh8d";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ruby-test-mode";
@@ -62697,6 +61467,27 @@
license = lib.licenses.free;
};
}) {};
+ run-stuff = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "run-stuff";
+ version = "20170813.1957";
+ src = fetchFromGitHub {
+ owner = "ideasman42";
+ repo = "emacs-run-stuff";
+ rev = "2e23a78c26f62141142c743febd57ec54c78c0e3";
+ sha256 = "04m7hpda5hbmr0dni4cnpdjxwzk3sygpr5m158gswhbwh2p4r0j4";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/0d6e9ce2acd859b887f7e161f4b9969be1a0b8ef/recipes/run-stuff";
+ sha256 = "0zx96m6cval5g4p0lhy9kpyycp2jygaq3y2njhkpij9gl4nb2ll2";
+ name = "run-stuff";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/run-stuff";
+ license = lib.licenses.free;
+ };
+ }) {};
runner = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "runner";
@@ -62763,12 +61554,12 @@
rust-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rust-mode";
- version = "20170813.2341";
+ version = "20171106.510";
src = fetchFromGitHub {
owner = "rust-lang";
repo = "rust-mode";
- rev = "6e9db4665036ca6f0fe8eecf55cd243eaebccc62";
- sha256 = "1j9zl6maz8glrr0ri4hsw56sdf8s93f2n908j43ix6hy2qnaxfi3";
+ rev = "04e3078ffc5f4b95e0a62960e36866d4bf1a9537";
+ sha256 = "1gj3wyb0bdz7a80bysji241pw47gy20k5f1jif3m2j186ki6f2s5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8f6e5d990d699d571dccbdeb13327b33389bb113/recipes/rust-mode";
@@ -62847,12 +61638,12 @@
s = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "s";
- version = "20170428.1026";
+ version = "20171102.227";
src = fetchFromGitHub {
owner = "magnars";
repo = "s.el";
- rev = "e61dee51474e61b777575b474459c582f3084f64";
- sha256 = "0yw23k8ix8v8sablqzn4802xxzf6b63q6hk3chypbx3y41363s8p";
+ rev = "5e9a6857d42015c67681616aa3519f599f97b8d8";
+ sha256 = "00g7nvcbf1291npid30pih72209l5hv2fpv6s6m5i1vg94z081fg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/s";
@@ -62886,6 +61677,27 @@
license = lib.licenses.free;
};
}) {};
+ s12cpuv2-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "s12cpuv2-mode";
+ version = "20171013.1351";
+ src = fetchFromGitHub {
+ owner = "AdamNiederer";
+ repo = "s12cpuv2-mode";
+ rev = "b17d4cf848dec1e20e66458e5c7ff77a2c051a8c";
+ sha256 = "1fc132gv48xwrxiw139kc9f5wkhjgsgqdfm6b7v97xj5025zg6hr";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/6c1b9bbdc4deb17636270c7f2be0b43b647c695a/recipes/s12cpuv2-mode";
+ sha256 = "0mrcf5s7vmkyrsdka7qd2vfcmdy8hzf6a6g14la88rxrv4chv29s";
+ name = "s12cpuv2-mode";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/s12cpuv2-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
sackspace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sackspace";
@@ -62910,12 +61722,12 @@
sage-shell-mode = callPackage ({ cl-lib ? null, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
melpaBuild {
pname = "sage-shell-mode";
- version = "20170806.2110";
+ version = "20171103.333";
src = fetchFromGitHub {
owner = "sagemath";
repo = "sage-shell-mode";
- rev = "15d32495acb7df9aeb1def6845332a1a72fd2a36";
- sha256 = "068x0dzknpxcjnvbp5wkg3i3bvr67dg7mns7r859mpr59q9gyh9j";
+ rev = "75b84fdba1e0f4511e518b7e56c816f1ace49024";
+ sha256 = "1mysq81xnwarcqvwda17n90fy25mp57gvijrccnxw91ni2wncyl4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/eb875c50c2f97919fd0027869c5d9970e1eaf373/recipes/sage-shell-mode";
@@ -62956,8 +61768,8 @@
src = fetchFromGitHub {
owner = "glynnforrest";
repo = "salt-mode";
- rev = "ea4980b9c9e8e7570086a2558fe7f66c62a528ad";
- sha256 = "0ygi9kzkfqzizygaqwqpymn8s7kr8ci38v61qmy4n58n9c19fdwx";
+ rev = "a41c07660199cfad3f9dd928d5674d2727508035";
+ sha256 = "0y7z4lfvhd1aiyhy0yhrx9jdjsy2k1di6y747rjmf0rlwcq2gb2q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9dcf1a93a06fc42581521c88cfd988b03bedc000/recipes/salt-mode";
@@ -63015,12 +61827,12 @@
sauron = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sauron";
- version = "20160501.1045";
+ version = "20171105.247";
src = fetchFromGitHub {
owner = "djcb";
repo = "sauron";
- rev = "3847b4be16ec3ba9675a230dab5adf029174b3cf";
- sha256 = "169mbr83zlawjnn2p9yzx7rrg33bb78gb1i7lklagn73ca2pr0b5";
+ rev = "50f09bfc6f5bf79e72a1223e345ee720b507e56a";
+ sha256 = "1k80vzgky4fcakxs3h0yb7g3zpn4382p8zz730kk1ibfd7i56a68";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9d30dcc4715422133e1bb00ad7a8e25b060387e4/recipes/sauron";
@@ -63141,12 +61953,12 @@
sbt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sbt-mode";
- version = "20170726.204";
+ version = "20170820.924";
src = fetchFromGitHub {
owner = "ensime";
repo = "emacs-sbt-mode";
- rev = "137845bffe904145c927a7f564bc9d6906e155ce";
- sha256 = "1q5d1ah178xq16945hni3gm8lp17hamnc2ac4jzshkj36gm1a9wq";
+ rev = "bdf31a1ffe637d1445b149804d5f5cc29333a1bd";
+ sha256 = "0ygp0c2hy4zp5x0ghplxf2fhrf16cn37sk2zf6i43zqz6gydzq8a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/364abdc3829fc12e19f00b534565227dbc30baad/recipes/sbt-mode";
@@ -63166,8 +61978,8 @@
src = fetchFromGitHub {
owner = "openscad";
repo = "openscad";
- rev = "9b0378836bd7af24fa67f93fa456c57cc3fdbbcb";
- sha256 = "19js3vyi52xz83419x1n1nrwqvqsa5p8rf33z99bdmy1rj4xrfgk";
+ rev = "069e95a4835e38e53d95ce7faf007ca77cd394d3";
+ sha256 = "0xmj9niia63pcb6nq06004nrxp22r3qgwzyjkl47nhlxp8jbd0mr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode";
@@ -63246,12 +62058,12 @@
scheme-complete = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "scheme-complete";
- version = "20170410.617";
+ version = "20170824.713";
src = fetchFromGitHub {
owner = "ashinn";
repo = "scheme-complete";
- rev = "6bf844202cb9e8490ce37a414374be3f04eefca4";
- sha256 = "16mbcwx1x6bg86qfgl6bhq5qjkz9xgd5f2jl993vvfk824qg4jgl";
+ rev = "4c77038048cbcf34b5907f0439c93058a71a2d2b";
+ sha256 = "14b1bajgvim48j7y4pss73lyxqfyazjnxn1dgvvmkvngm3k1a4y8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/scheme-complete";
@@ -63371,12 +62183,12 @@
scpaste = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild }:
melpaBuild {
pname = "scpaste";
- version = "20160613.1943";
+ version = "20171101.922";
src = fetchFromGitHub {
owner = "technomancy";
repo = "scpaste";
- rev = "eb415f7ca56d64c89cf99d5c6f8a442c4ec3912e";
- sha256 = "1fycdsa93bfiij72cwyc0rp85bwv3lv4r169p9czsph5ns466b65";
+ rev = "10559d6b0feb34dc60f039a237052adcca77b5d9";
+ sha256 = "10z8jpi6f3mhq8ymxcv1lc291sqr2kzvgwx8mlmck0bmlys12pqc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9007fb32097bc63731c3615dae9342fcef2558a2/recipes/scpaste";
@@ -63536,25 +62348,6 @@
license = lib.licenses.free;
};
}) {};
- screenshot = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "screenshot";
- version = "20120509.405";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/screenshot.el?revision=8";
- sha256 = "0q7yxaaa0fic4d2xwr0qk28clkinwz4xvw3wf8dv1g322s0xx2cw";
- name = "screenshot.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/24f113097db4cc27a2e9c7b9086af6d263e6fcb7/recipes/screenshot";
- sha256 = "0aw2343as38y26r2g7wpn1rq1n6xpw4y5c7ir8qh1crkc1y513hs";
- name = "screenshot";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/screenshot";
- license = lib.licenses.free;
- };
- }) {};
scribble-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "scribble-mode";
@@ -63621,12 +62414,12 @@
sdcv = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, showtip }:
melpaBuild {
pname = "sdcv";
- version = "20170801.2216";
+ version = "20171002.210";
src = fetchFromGitHub {
owner = "stardiviner";
repo = "sdcv.el";
- rev = "ebe45a5fb1e465cb4150e4dbe38a069b2a218219";
- sha256 = "0pcbrzii9x7v3qqygr29yi6pg1gvzjbsgcfziispsf24n01lrrly";
+ rev = "1aad9defb871dc07e27f603092bb81413be54cf2";
+ sha256 = "1ij7inm1f59hmn9s1iqnywk1acfm0pqiim2s36vwrljy9lnb4ls8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/173e233b2dacaaf54d92f3bcc06e54d068520dd4/recipes/sdcv";
@@ -63723,33 +62516,14 @@
license = lib.licenses.free;
};
}) {};
- second-sel = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "second-sel";
- version = "20170702.729";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/second-sel.el?revision=29";
- sha256 = "1yq06a04j44r019cjv2jb3kfpfqhnxdf3b4hhz4d3fz7v1hsicwg";
- name = "second-sel.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/second-sel";
- sha256 = "1nzy5ms5qf5big507kg3z5m6d6zgnsv2fswn359r2j59cval3fvr";
- name = "second-sel";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/second-sel";
- license = lib.licenses.free;
- };
- }) {};
secretaria = callPackage ({ alert, emacs, f, fetchgit, fetchurl, lib, melpaBuild, org, s }:
melpaBuild {
pname = "secretaria";
- version = "20170813.1107";
+ version = "20170828.945";
src = fetchgit {
url = "https://bitbucket.org/shackra/secretaria.el";
- rev = "7bd1cf591528b18a153e15a260d7817b72c900f2";
- sha256 = "0n9mj2g59yiqbg81rk0gglbgpvfs550r4y26n8nf5pyxpxfllv5s";
+ rev = "1cd32d957864be1ba5c44a3f505f662832169a28";
+ sha256 = "1xvwzmcfwfxsm9chbjnqjsipmv5pqpzk5d0ybw3rcdc47nag3jdg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7b4c9ccbf2eeaa290f3b9d1e5eaaeb5b5547b365/recipes/secretaria";
@@ -63811,8 +62585,8 @@
src = fetchFromGitHub {
owner = "kiyoka";
repo = "sekka";
- rev = "9197838617211c71a965aa4b009249d231249902";
- sha256 = "1zk0rf2iq14vssrj9p3ixcricm2lp8kwfxxj1x8vixk1kw118q3n";
+ rev = "61840b57d9ae32bf8e297b175942590a1319c7e7";
+ sha256 = "05vj12l88s29wnkpvgzlbypv9hkmy1hqgv9hvav6v4kmdykl5w1b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/350bbb5761b5ba69aeb4acf6d7cdf2256dba95a6/recipes/sekka";
@@ -63933,12 +62707,12 @@
sensitive = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sequences }:
melpaBuild {
pname = "sensitive";
- version = "20131015.635";
+ version = "20170818.551";
src = fetchFromGitHub {
owner = "timvisher";
repo = "sensitive.el";
- rev = "7f2c77811e983234e1a93055d78cc4480ae807c3";
- sha256 = "0g4jfcc5k26yh192bmmxnim9mqv993v2jjd9g9ssvnd42ihpx1n3";
+ rev = "69dd6125a41d8b55f4b6ba61daa4d1aa1f716fa8";
+ sha256 = "0nj71ds4frfi16hsfswmp89rfxkvvdvhdlsqizzi9cbvr49s0l1f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5e5468ce136fabe59e1434f8a7f265f41c5e64c1/recipes/sensitive";
@@ -63951,27 +62725,6 @@
license = lib.licenses.free;
};
}) {};
- sentence-highlight = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "sentence-highlight";
- version = "20170405.2352";
- src = fetchFromGitHub {
- owner = "sbelak";
- repo = "sentence-highlight";
- rev = "c7a501f38de5a9b52b1f30e21299fe1c374a27c7";
- sha256 = "13idmpw7nz75bpjbi85pv89annqqffc0gjizsazbzfdm21i8p7y6";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sentence-highlight";
- sha256 = "07pyyl74cvnz6dd85ghv3zdrir08317lvnzm5nf1n3p85aqjpcxm";
- name = "sentence-highlight";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/sentence-highlight";
- license = lib.licenses.free;
- };
- }) {};
sentence-navigation = callPackage ({ ample-regexps, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sentence-navigation";
@@ -64017,12 +62770,12 @@
sequences = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sequences";
- version = "20130908.1122";
+ version = "20170818.552";
src = fetchFromGitHub {
owner = "timvisher";
repo = "sequences.el";
- rev = "2bcc54a6738202fffb23e9579b9695337ba6ef26";
- sha256 = "1np6ip28ksms6fig67scwvwj43zgblny50ccvz8aclbl0z8nxswl";
+ rev = "564ebbd93b0beea4e75acfbf824350e90b5d5738";
+ sha256 = "0ym2bl9dpsglz35is0iwxfw5w7zs9398bkln8lgv28nr6kw0ym4s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4cf716df68fb2d6a41fe75fac0b41e356bddcf30/recipes/sequences";
@@ -64035,26 +62788,6 @@
license = lib.licenses.free;
};
}) {};
- sequential-command = callPackage ({ fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "sequential-command";
- version = "20151207.1403";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/sequential-command.el?revision=3";
- sha256 = "0vg8rqzzi29swznhra2mnf45czr2vb77dpcxn3j0fi7gynx3wcwk";
- name = "sequential-command.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/31db031dc8712e89042d4ce80438a4267a241739/recipes/sequential-command";
- sha256 = "03qybacgy5fs3lam73x0rds4f68s173mhbah6rr97272nikd50v1";
- name = "sequential-command";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/sequential-command";
- license = lib.licenses.free;
- };
- }) {};
servant = callPackage ({ ansi, commander, dash, epl, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up, web-server }:
melpaBuild {
pname = "servant";
@@ -64184,12 +62917,12 @@
sexy-monochrome-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sexy-monochrome-theme";
- version = "20170611.859";
+ version = "20171011.536";
src = fetchFromGitHub {
owner = "voloyev";
repo = "sexy-monochrome-theme";
- rev = "8def559784c9f3ebaad179caaff58a9c6afc83a5";
- sha256 = "043pplyjdvqz45q1vlnkh8j8a4fhiw4km3b2xb06bycgs3ysb42h";
+ rev = "9fb835606088a0d24600faa12fe24d85cb2c0731";
+ sha256 = "182wzr7lisrszivxpjp29m7vjxxi429mshp2labf2abqkfrb9jv4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/dfd5ae9a93e036d11899c7adffdf6b63c2b21381/recipes/sexy-monochrome-theme";
@@ -64205,12 +62938,12 @@
shackle = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "shackle";
- version = "20170213.1534";
+ version = "20171018.1120";
src = fetchFromGitHub {
owner = "wasamasa";
repo = "shackle";
- rev = "979b021077655ca38749a60c9752c0817e8fd93e";
- sha256 = "11qp4gqxfi5d6krvxlqxfn58b1kcgsnldpi54r8lx6mis8l0f4wl";
+ rev = "0cee957bc0bfbdee5ea3f3e430e94cdcd87ed0c3";
+ sha256 = "18zhrn18asbpanmlgasy271gfh6qywr947fx2svxz5b1w40hhyr0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/806e7d00f763f3fc4e3b8ebd483070ac6c5d0f21/recipes/shackle";
@@ -64580,17 +63313,19 @@
license = lib.licenses.free;
};
}) {};
- shimbun = callPackage ({ fetchcvs, fetchurl, lib, melpaBuild }: melpaBuild {
+ shimbun = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
pname = "shimbun";
- version = "20170503.1327";
- src = fetchcvs {
- cvsRoot = ":pserver:anonymous@cvs.namazu.org:/storage/cvsroot";
- module = "emacs-w3m";
- sha256 = "6ef1dd834a16cf3b8a0ec7a7412ae7410f0392d616eb3329f78011039384fc6d";
+ version = "20171018.131";
+ src = fetchFromGitHub {
+ owner = "emacsorphanage";
+ repo = "w3m";
+ rev = "e2e2c907f4fa575bec74803aab95af426cb37e6e";
+ sha256 = "13lzj1h6ib779fszmvlz3wamnjibivdrxl8hd5l3xhh7fkgbc8c8";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/8bbb18b0db057b9cca78ae7280674fd1beb56443/recipes/shimbun";
- sha256 = "05dxdyh8xvbpjmc19q733jmjd6kgv8rdahjd3bw5wwsb3smqig4x";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/shimbun";
+ sha256 = "1rjykr0y5jfd6r3shm8x23yyra6qjsb55jrfc45rhpb89klyg1nk";
name = "shimbun";
};
packageRequires = [];
@@ -64683,25 +63418,6 @@
license = lib.licenses.free;
};
}) {};
- showkey = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "showkey";
- version = "20170307.1528";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/showkey.el?revision=11";
- sha256 = "143889knvy6ifvq759869gbjfg10k10mi2by2hajcgzqhby72h61";
- name = "showkey.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/showkey";
- sha256 = "04lw32k1imvpfc4dr5pz11sx74982xr13hcyblvrz1zxhgixb1z1";
- name = "showkey";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/showkey";
- license = lib.licenses.free;
- };
- }) {};
showtip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "showtip";
@@ -64747,12 +63463,12 @@
shr-tag-pre-highlight = callPackage ({ emacs, fetchFromGitHub, fetchurl, language-detection, lib, melpaBuild }:
melpaBuild {
pname = "shr-tag-pre-highlight";
- version = "20170801.2201";
+ version = "20170820.2127";
src = fetchFromGitHub {
owner = "xuchunyang";
repo = "shr-tag-pre-highlight.el";
- rev = "8b102c4c42180b5e9fa9dbc776fb28f12afb38a0";
- sha256 = "0z00k3rxz26dmn55mhrbv0p39xk3lwd66vmw0dm8m1lrkjxpsq8v";
+ rev = "63eb0b2a4c1caf1004bac8e002ff8b7477871e36";
+ sha256 = "14b398k7rd0c2ymvg8wyq65fhggkm0camgvqr7j6ia2y0kairxba";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7be3c139bee02e8bd9a9830026cbfdd17629ac4d/recipes/shr-tag-pre-highlight";
@@ -64831,12 +63547,12 @@
shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "shx";
- version = "20170805.1619";
+ version = "20171103.1303";
src = fetchFromGitHub {
owner = "riscy";
repo = "shx-for-emacs";
- rev = "8166b02ebbab43d8a33d47b8221a94b69fc63487";
- sha256 = "0n97iys2xyg1lzkn8bqsx0sgqpzci1pxg69v42cpzmyrz3h54bwp";
+ rev = "2e91b8d58a493afabc2f2d820bd665ab58e43ed1";
+ sha256 = "0mqcx567cxc9h90q2zw350xhj9zn41dpbac3czm5l92cyd8wqrj7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx";
@@ -64873,15 +63589,15 @@
sicp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sicp";
- version = "20170124.1650";
+ version = "20171028.1523";
src = fetchFromGitHub {
owner = "webframp";
repo = "sicp-info";
- rev = "935da01b7aa782a1a7f9fd17b5512132b197da8c";
- sha256 = "0mgbhf5cp7z6yd5kl5x4whlc6nfm2lqq6khxcmilrbgv4was55sj";
+ rev = "8e13f7ff4695a05471486d37a6c5f979a5b965fb";
+ sha256 = "15krfnj2qz4j2ns4a05a4wwaknhx77m4jhazg7zvz9xm4b4j1qm8";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/sicp";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/1363d7b6e95375ac63f07eed2b3947f4f81bc9ba/recipes/sicp";
sha256 = "1q7pbhjk8qgwvj27ianrdbmj98pwf3xv10gmpchh7bypmbyir4wz";
name = "sicp";
};
@@ -64898,8 +63614,8 @@
src = fetchFromGitHub {
owner = "nlamirault";
repo = "sift.el";
- rev = "ef509ac4c579340e8d924c26d9e5858a9f4fb9de";
- sha256 = "0i8gqzvpl3drzp031dqdpsi1ssr3az8fzb7xpbxnamzscfz6pdyc";
+ rev = "4ce8878a0fc396ded7521ce38852d93e1d863065";
+ sha256 = "1x78i6svi4cwah9xw85imhpncvxsx4xim4fzykpnd328mxkk07h6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sift";
@@ -65041,12 +63757,12 @@
simple-httpd = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "simple-httpd";
- version = "20170125.1910";
+ version = "20171004.938";
src = fetchFromGitHub {
owner = "skeeto";
repo = "emacs-web-server";
- rev = "348483efea6ec2752bc5aa4028a16087d19b2809";
- sha256 = "191aq4zhg5a8g6ypkbh20rnqyk76lhxfhnq5ww0g5hzpig8srxaa";
+ rev = "e7775d3bc5c6b73255814d0a62dc954e23a12c15";
+ sha256 = "0pjhxhzzxrpcczwvd7b6a6q1nfmsr6m6mnlxn13nwf3r270grz87";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/simple-httpd";
@@ -65080,39 +63796,19 @@
license = lib.licenses.free;
};
}) {};
- simple-plus = callPackage ({ fetchurl, lib, melpaBuild, strings }:
- melpaBuild {
- pname = "simple-plus";
- version = "20170307.1529";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/simple+.el";
- sha256 = "061vw3w8gl1lcjy67ina4w496i91addsl5s3xbffk2q6k1qhjsdi";
- name = "simple+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/simple+";
- sha256 = "12fsgjk53fq2316j8nm6wvdckpyg9hq3v65j5c52i0g0cwmx62ra";
- name = "simple-plus";
- };
- packageRequires = [ strings ];
- meta = {
- homepage = "https://melpa.org/#/simple+";
- license = lib.licenses.free;
- };
- }) {};
- simple-rtm = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, rtm }:
+ simple-rtm = callPackage ({ dash, fetchFromGitLab, fetchurl, lib, melpaBuild, rtm }:
melpaBuild {
pname = "simple-rtm";
version = "20160222.734";
- src = fetchFromGitHub {
+ src = fetchFromGitLab {
owner = "mbunkus";
repo = "simple-rtm";
rev = "8c7cd96cf66ef112be5c363e3378e304f8f83999";
sha256 = "1kkhnsxr8zrb21k4ckyg69nsndwy4zdkvfw2drk4v1vnbgx8144f";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/fae2c5512242c39f9a1d806fafda85081e84cda3/recipes/simple-rtm";
- sha256 = "1aadzaf73clhyny2qiryg6z84k34yx3ghy6pyl0px9qhqc1ak271";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/a784f931849ca836557390999b179ef9f6e775f3/recipes/simple-rtm";
+ sha256 = "0v5f0vr8sh62yvb7znx00wgybb83dfnkvgl8afyk3ry8n9xkhf5b";
name = "simple-rtm";
};
packageRequires = [ dash rtm ];
@@ -65254,8 +63950,8 @@
src = fetchFromGitHub {
owner = "purcell";
repo = "skewer-less";
- rev = "4d4394418b70bd454efef1cb68129da05ab67891";
- sha256 = "0bf6w9wca8bkm23246cbf4dcb5y583xz8114a7xg0152hpfcg46q";
+ rev = "927d6848a1ea9428d4cc995f76bd42f7b8da6bc8";
+ sha256 = "11zaq1p04igg0hbmazsf5c0xz7aigx120rwg5iq7niaz2277j1k1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fb63f7417f39bd718972f54e57360708eb48b977/recipes/skewer-less";
@@ -65355,12 +64051,12 @@
slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }:
melpaBuild {
pname = "slack";
- version = "20170814.116";
+ version = "20171017.822";
src = fetchFromGitHub {
owner = "yuya373";
repo = "emacs-slack";
- rev = "b5ca813fa5c56f65fd1302d29f5babd0965a0751";
- sha256 = "128wggbny4z6zhr9ldw3blrj5mbgvdl5bfap7i7v8pnzz660z9wy";
+ rev = "c8f4c3312b574b8f4cd5ddaaa6ec7710893a9ff0";
+ sha256 = "01aibrnkzyi40b7bfz5wfl34wwjil4nylg6llkhrmzc6mfqabnjy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack";
@@ -65418,12 +64114,12 @@
slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }:
melpaBuild {
pname = "slime";
- version = "20170804.1113";
+ version = "20171102.1213";
src = fetchFromGitHub {
owner = "slime";
repo = "slime";
- rev = "84e5a99f5e8caf4d42076681b9befb1bf80493bb";
- sha256 = "1fw4biar85xy8as1smry8kzyfw0lbnbipzinbmpaliz2fljfnkqm";
+ rev = "158849d0b0960a41efd83e70087ef93b29029cb4";
+ sha256 = "03iqq3s6syd5bmy1wi7ics80l30dkkm045bq7dhj86c0p1azfmcl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime";
@@ -65436,27 +64132,6 @@
license = lib.licenses.free;
};
}) {};
- slime-annot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, slime }:
- melpaBuild {
- pname = "slime-annot";
- version = "20131230.1908";
- src = fetchFromGitHub {
- owner = "arielnetworks";
- repo = "cl-annot";
- rev = "c99e69c15d935eabc671b483349a406e0da9518d";
- sha256 = "1wq1gs9jjd5m6iwrv06c2d7i5dvqsfjcljgbspfbc93cg5xahk4n";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/498c938a9d5c51f0842fdae317f5b2fae33bb6d5/recipes/slime-annot";
- sha256 = "14x9lzpkgkc96jsbfpahl027qh6y5azwdk0cmk9pbd1xm95kxj6n";
- name = "slime-annot";
- };
- packageRequires = [ slime ];
- meta = {
- homepage = "https://melpa.org/#/slime-annot";
- license = lib.licenses.free;
- };
- }) {};
slime-company = callPackage ({ company, fetchFromGitHub, fetchurl, lib, melpaBuild, slime }:
melpaBuild {
pname = "slime-company";
@@ -65481,12 +64156,12 @@
slime-docker = callPackage ({ cl-lib ? null, docker-tramp, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, slime }:
melpaBuild {
pname = "slime-docker";
- version = "20170718.1157";
+ version = "20171004.1151";
src = fetchFromGitHub {
owner = "daewok";
repo = "slime-docker";
- rev = "dc41f7c33de497bc622f037f33ea2a1ecfa1069f";
- sha256 = "169vy9wjkf0vzqgdbm30rssl82xl2n73hipnaidncbw9sd8cpx1y";
+ rev = "13fa8be2fca516f3ff5fb70fa79dd8404bf86439";
+ sha256 = "005zkypg2hkyzpkcv1rzfrmg8amg1bp0534y13xjqq3rz1p602bx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/15ec3f7208287161571c8fc3b29369ceabb44e5f/recipes/slime-docker";
@@ -65499,27 +64174,6 @@
license = lib.licenses.free;
};
}) {};
- slime-ritz = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "slime-ritz";
- version = "20130218.1537";
- src = fetchFromGitHub {
- owner = "pallet";
- repo = "ritz";
- rev = "4003fdaa5657d4ed1eeb0e244c46658cbb981667";
- sha256 = "0rsh0bbhyx74yz1gjfqyi0bkqq5n3scpyh5mmc3d6dkpv8wa7bwz";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/669a4ae76deea86084307ac3c2d26072e4b8fe17/recipes/slime-ritz";
- sha256 = "1y1439y07l1a0sp9wn110hw4yyxj8n1cnd6h17rmsr549m2qbg1a";
- name = "slime-ritz";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/slime-ritz";
- license = lib.licenses.free;
- };
- }) {};
slime-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "slime-theme";
@@ -65607,12 +64261,12 @@
slstats = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "slstats";
- version = "20170802.413";
+ version = "20170823.149";
src = fetchFromGitHub {
owner = "davep";
repo = "slstats.el";
- rev = "5e86904ae3facafb3204607c08f8b14aa53fabec";
- sha256 = "05h5wsv2a4maqrsvr5klj1pqnhaj0cxlzyv7dvs5vb9wkd0mblzc";
+ rev = "e9696066abf3f2b7b818a57c062530dfd9377033";
+ sha256 = "1mjzr6lqcyx3clp3bxq77k2rpkaglnq407xdk05xkaqissirpc83";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fe7c8c241cc6920bbedb6711db63ea28ed633327/recipes/slstats";
@@ -65628,12 +64282,12 @@
sly = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sly";
- version = "20170413.557";
+ version = "20171011.809";
src = fetchFromGitHub {
owner = "capitaomorte";
repo = "sly";
- rev = "95519c4ef41988205bb642e534bf2bd2463b6170";
- sha256 = "1bvmmpk4xd954i6dmxjcqayd6apzabg732yhcmjyg633d8hmmiwr";
+ rev = "687942cb08525bb10abef0d0fdfb57dd69e988b8";
+ sha256 = "1hzc6cpndzc9lb82g6k8g65spnw09impgnfj6lfm9v25pbyg8y2m";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/79e7213183df892c5058a766b5805a1854bfbaec/recipes/sly";
@@ -65751,45 +64405,24 @@
license = lib.licenses.free;
};
}) {};
- sly-repl-ansi-color = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, sly }:
- melpaBuild {
- pname = "sly-repl-ansi-color";
- version = "20160214.18";
- src = fetchFromGitHub {
- owner = "PuercoPop";
- repo = "sly-repl-ansi-color";
- rev = "505d162d52219654b57a455e26c9e02c7254a8f2";
- sha256 = "194bdibpxpqsag86h583b62ybmfqmq4442a0czbijqwngbgjpj3l";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/e2fc906b674e1829e023e6a1c0e4cf87830216a8/recipes/sly-repl-ansi-color";
- sha256 = "0wz24kfjl6rp4qss0iq2ilav0mkg2spy2ziikypy7v0iqbssmssi";
- name = "sly-repl-ansi-color";
- };
- packageRequires = [ cl-lib sly ];
- meta = {
- homepage = "https://melpa.org/#/sly-repl-ansi-color";
- license = lib.licenses.free;
- };
- }) {};
- smali-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ smart-backspace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
- pname = "smali-mode";
- version = "20160406.1556";
+ pname = "smart-backspace";
+ version = "20171013.2226";
src = fetchFromGitHub {
- owner = "strazzere";
- repo = "Emacs-Smali";
- rev = "10437ab0b29994cf4bf67ec28ccf82a74b8c026b";
- sha256 = "1ircjz571q1sgjkxryc3rlcpdrh6ac7ydnvclr7ldh3nhz77pm7p";
+ owner = "itome";
+ repo = "smart-backspace";
+ rev = "a10ec44ff325ec8c4c98b1a6e44e89e60a9aa4ac";
+ sha256 = "0p19qikalmvs9y1lws08mxvh2k8s219mpm3nyi9aqq62ryyfwf1n";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/90182e5bbf79c570b3cb59f541636d4aad5d8652/recipes/smali-mode";
- sha256 = "17fcr66ky9hmj74i4wr3y9n1d9g8hib7l3gmr4jxj8vsjzfxy7h7";
- name = "smali-mode";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/88cd95cd623fb00d1bc6800c1dd3c665a0cce349/recipes/smart-backspace";
+ sha256 = "152xdxzrr91qiyq25ghvjlbpc627cw4s120axmz2p2d48pinwir9";
+ name = "smart-backspace";
};
packageRequires = [];
meta = {
- homepage = "https://melpa.org/#/smali-mode";
+ homepage = "https://melpa.org/#/smart-backspace";
license = lib.licenses.free;
};
}) {};
@@ -65814,17 +64447,19 @@
license = lib.licenses.free;
};
}) {};
- smart-compile = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+ smart-compile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
pname = "smart-compile";
- version = "20161118.403";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/smart-compile.el?revision=7";
- sha256 = "163s97h1a9pjz3pqyn2mhh4mf05b7yycp29k5wnk3c9zc71pafvp";
- name = "smart-compile.el";
+ version = "20171104.2333";
+ src = fetchFromGitHub {
+ owner = "zenitani";
+ repo = "elisp";
+ rev = "2a0c9b33bd97461d100e24df0103d4e5526a30d6";
+ sha256 = "1h0d1rbaprxrwgwi8pq2q93xf9j8q8qy7p42iyywav9ilc6sak6p";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/d2e6c3dd7b8e19193d070fd41c2be4bcd61f1022/recipes/smart-compile";
- sha256 = "0vgxqyzl7jw2j96rmjw75b5lmjwrvzajrdvfyabss4xmv96dy2r3";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/93562afd7b62d7535b8010179ba6ac7e8e6280d0/recipes/smart-compile";
+ sha256 = "1w3vyb6wz786ydrywkjmazyvgfl0qxamn0fgnqpn17d2c5jr9c4g";
name = "smart-compile";
};
packageRequires = [];
@@ -65961,12 +64596,12 @@
smart-mode-line = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rich-minority }:
melpaBuild {
pname = "smart-mode-line";
- version = "20170708.1317";
+ version = "20171013.849";
src = fetchFromGitHub {
owner = "Malabarba";
repo = "smart-mode-line";
- rev = "216475320fa43b3c261b8b13b7a1e3d304166a8e";
- sha256 = "1akph66w1xpjkvxpi6dgl1bi0nwx33l25cwyq08g1wbvkjqwib30";
+ rev = "1facbe9816b602c640ddb23602e30588d6d904ca";
+ sha256 = "1fgh4yss9brchnfphdijy23qknv30hxkgsbz6p2d5ck6w7xml4lc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/smart-mode-line";
@@ -65986,8 +64621,8 @@
src = fetchFromGitHub {
owner = "Malabarba";
repo = "smart-mode-line";
- rev = "216475320fa43b3c261b8b13b7a1e3d304166a8e";
- sha256 = "1akph66w1xpjkvxpi6dgl1bi0nwx33l25cwyq08g1wbvkjqwib30";
+ rev = "1facbe9816b602c640ddb23602e30588d6d904ca";
+ sha256 = "1fgh4yss9brchnfphdijy23qknv30hxkgsbz6p2d5ck6w7xml4lc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/60072b183151e519d141ec559b4902d20c87904c/recipes/smart-mode-line-powerline-theme";
@@ -66042,6 +64677,27 @@
license = lib.licenses.free;
};
}) {};
+ smart-semicolon = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "smart-semicolon";
+ version = "20171007.1833";
+ src = fetchFromGitHub {
+ owner = "iquiw";
+ repo = "smart-semicolon";
+ rev = "c11096679dbed3875c37413337ee490ee7951b63";
+ sha256 = "1v6z3a1f6nxc62n7595qnji39ywdsz7xy5bkl2218v3y7gkbc518";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/fe339b95636b02ceb157294055d2f5f4c4b0b8cf/recipes/smart-semicolon";
+ sha256 = "1vq6l3vc615w0p640wy226z5i7dky666sgzczkngv07kag0iwqp0";
+ name = "smart-semicolon";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/smart-semicolon";
+ license = lib.licenses.free;
+ };
+ }) {};
smart-shift = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "smart-shift";
@@ -66066,12 +64722,12 @@
smart-tab = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "smart-tab";
- version = "20150703.917";
+ version = "20170902.1407";
src = fetchFromGitHub {
owner = "genehack";
repo = "smart-tab";
- rev = "28918a72045811294ecb33f666ba23fe66c169af";
- sha256 = "0aighpby8khrljb67m533bwkzlsckyvv7d09cnzr1rfwxiil0ml4";
+ rev = "76a8ec13384975d39aa1b25e5384a02558dba574";
+ sha256 = "02mj2is05adq5v64aahivbkx2kzrxmmg2va650hsvl4izj3dr2x3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/smart-tab";
@@ -66129,12 +64785,12 @@
smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "smartparens";
- version = "20170723.1205";
+ version = "20171101.244";
src = fetchFromGitHub {
owner = "Fuco1";
repo = "smartparens";
- rev = "25508600c0f715c9cba68b1902b537386b27b97c";
- sha256 = "1r61pnf74x6faglyixfchzhpx8gp7k8aa1yq00vxpplj4flwyvpz";
+ rev = "9682ba930374a4d62b444950b008d2bca1cffba1";
+ sha256 = "1nsi3x9zizbxx95ka5cgl5rnsw5iz92acjcv6b4id0acaysq6mdm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens";
@@ -66189,27 +64845,6 @@
license = lib.licenses.free;
};
}) {};
- smartwin = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "smartwin";
- version = "20160513.56";
- src = fetchFromGitHub {
- owner = "jerryxgh";
- repo = "smartwin";
- rev = "61528c1cf6c8d913a44e60c40fa8773b7e400eac";
- sha256 = "1jcaspqrm23viigk0701711bmaqsyc5fbpkszf7bg7nvhkl4pfqy";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/29c5d92b518ad74f4dff2d83fb0230d49e76aaf1/recipes/smartwin";
- sha256 = "0rg92j0aa8qxhr91hjj2f4w8vj5w9b4d2nmkggng44nxk8zafdif";
- name = "smartwin";
- };
- packageRequires = [ emacs ];
- meta = {
- homepage = "https://melpa.org/#/smartwin";
- license = lib.licenses.free;
- };
- }) {};
smarty-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "smarty-mode";
@@ -66336,18 +64971,19 @@
license = lib.licenses.free;
};
}) {};
- sml-modeline = callPackage ({ fetchbzr, fetchurl, lib, melpaBuild }:
+ sml-modeline = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sml-modeline";
- version = "20120110.1240";
- src = fetchbzr {
- url = "https://code.launchpad.net/~nxhtml/nxhtml/main";
- rev = "835";
- sha256 = "1p10q1b5bvc8fvgfxynrq2kf1ygr6gad92x40zhaa5r1ksf6ryk4";
+ version = "20170614.1411";
+ src = fetchFromGitHub {
+ owner = "emacsorphanage";
+ repo = "sml-modeline";
+ rev = "d2f9f70174c4cf68c67eb3bb8088235735e34d9a";
+ sha256 = "18k2k213vgawxskp9m57r8qarg3pnza6nvbpyi6l03jnmf2kcw2b";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/sml-modeline";
- sha256 = "0fvdaby49q34sa83i3mgwyzaf1rflcary9pqi2gvbiibcwmkg82b";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/4728fce21f03c95bcc2b562648e99c537fb09cd8/recipes/sml-modeline";
+ sha256 = "00kz03ixkfnm4id8dd8aij2rhakzd4arzd790jdac1y3yyd5pp3y";
name = "sml-modeline";
};
packageRequires = [];
@@ -66485,12 +65121,12 @@
snakemake-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }:
melpaBuild {
pname = "snakemake-mode";
- version = "20170430.1436";
+ version = "20171030.1016";
src = fetchFromGitHub {
owner = "kyleam";
repo = "snakemake-mode";
- rev = "8a4da1125dd284e55139084d62fb29af5bcbcc20";
- sha256 = "1c85ycaqyrncp7pbax6mdnz1v91hpi1pc9jspd6irwhhs8b9jxfk";
+ rev = "990d6d8e98b96b9afe5b9b340507b1aecd8de1ce";
+ sha256 = "1bd6kwzkk8vfhfc7m384y40lh6rdw90g6624c0hlfrs9zwihmvs3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c3a5b51fee1c9e6ce7e21555faa355d118d34b8d/recipes/snakemake-mode";
@@ -66545,6 +65181,27 @@
license = lib.licenses.free;
};
}) {};
+ snazzy-theme = callPackage ({ base16-theme, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "snazzy-theme";
+ version = "20170823.1132";
+ src = fetchFromGitHub {
+ owner = "weijiangan";
+ repo = "emacs-snazzy";
+ rev = "479351a34cd7f754375ee45f161f83a19d0fd29c";
+ sha256 = "0lxxg6x5kb6ibwlywci9gw1bcdw2i23s07qd7k2lm86j5ixlpjgw";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/18c89a612418e0f49b7e6ae29a678d2fc1ffaf3d/recipes/snazzy-theme";
+ sha256 = "0srmhwhqrp1s01p1znhjzs254l3r2i6c91v7cnlwlvrls1sbh32k";
+ name = "snazzy-theme";
+ };
+ packageRequires = [ base16-theme emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/snazzy-theme";
+ license = lib.licenses.free;
+ };
+ }) {};
snippet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "snippet";
@@ -66566,22 +65223,22 @@
license = lib.licenses.free;
};
}) {};
- snoopy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ snoopy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "snoopy";
- version = "20170730.1951";
+ version = "20171008.1304";
src = fetchFromGitHub {
owner = "anmonteiro";
repo = "snoopy-mode";
- rev = "8adce636376812df99bd79f3fbb3d9ec19a02351";
- sha256 = "04sq37bpvg6lqsqmjvdm9jzwrq4xhbakfzl5b2rcm3mlhzwnhs88";
+ rev = "ec4123bdebfe0bb7bf4feaac2dc02b59caffe386";
+ sha256 = "01l44lshw0zvykay9886s1vqryanagkd4ciw3ramchn0baqz11vl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4a882cd92964ac195a09469006c9a44dc202f000/recipes/snoopy";
sha256 = "1wa8jykqyj6rxqfhwbiyli6yh8s7n0pqv7fc9sfaymarda93zbgi";
name = "snoopy";
};
- packageRequires = [ emacs ];
+ packageRequires = [ cl-lib emacs ];
meta = {
homepage = "https://melpa.org/#/snoopy";
license = lib.licenses.free;
@@ -66674,12 +65331,12 @@
solaire-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "solaire-mode";
- version = "20170809.1220";
+ version = "20170823.422";
src = fetchFromGitHub {
owner = "hlissner";
repo = "emacs-solaire-mode";
- rev = "8794f4d8fb63758d19e5a5f23e1d1118f0a1d10f";
- sha256 = "0vq01w4krj7l3qgqck2a1cz2d5xzkbx2giimkxqxzyb00820z41s";
+ rev = "c8da9d228003b88ea31f80e7223608b119d41848";
+ sha256 = "0v0vzxzfxh3pqq9hs52bkgyny3vwzas2qpk5pbpzim3zg3lia35r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/52c69070eef3003eb53e1436c538779c74670ce6/recipes/solaire-mode";
@@ -66695,12 +65352,12 @@
solarized-theme = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "solarized-theme";
- version = "20170430.800";
+ version = "20171103.52";
src = fetchFromGitHub {
owner = "bbatsov";
repo = "solarized-emacs";
- rev = "8aa2ce76327dc7081b1c9a310e858fe2b854d899";
- sha256 = "1a8hqagh4jjskyyc66s2xyspn9k4hvl430kfzgjcfzis889v19y7";
+ rev = "d06bf199f0e590708452ba32009d069dafa3d347";
+ sha256 = "0zpwf8gf72i74rnmr0ywaynyasj5a8bxqag1kj70pigb4jxdwwyn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/solarized-theme";
@@ -66716,12 +65373,12 @@
solidity-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "solidity-mode";
- version = "20170712.1442";
+ version = "20171001.926";
src = fetchFromGitHub {
owner = "ethereum";
repo = "emacs-solidity";
- rev = "e4aa0190145d5cfad7d3f052ba44c88a1ebb6c7f";
- sha256 = "1dh2av9grij2v179vfr2pric6bxibxbg34ij3488ki9crc2zpv4y";
+ rev = "d0a09c68912fcd03e384b0b2a9746f4e002d0df8";
+ sha256 = "0zs16af2j6l0vypgikvs78x82cq8m5yfdfpi550cymkv7mjydj4v";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/bb9df5ec0692352b6494d435d11166f4ea26c99e/recipes/solidity-mode";
@@ -66737,12 +65394,12 @@
sonic-pi = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, highlight, lib, melpaBuild, osc }:
melpaBuild {
pname = "sonic-pi";
- version = "20170313.810";
+ version = "20171011.503";
src = fetchFromGitHub {
owner = "repl-electric";
repo = "sonic-pi.el";
- rev = "494981aa8f7828392a930ef8533698944738090e";
- sha256 = "1x9qn6b4nbld9v0r7vi3mg6w7nsa76pzyn1fl118n14a8kkc0is7";
+ rev = "6b362bbdfacf7aabeb494c3e22f6fd3f48ca9738";
+ sha256 = "0xk03swaclhm41vnwzmwil05mgabkb23lrp28wvl6qxzhd3hmrwq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sonic-pi";
@@ -66821,12 +65478,12 @@
sotclojure = callPackage ({ cider, clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sotlisp }:
melpaBuild {
pname = "sotclojure";
- version = "20170512.612";
+ version = "20170921.1708";
src = fetchFromGitHub {
owner = "Malabarba";
repo = "speed-of-thought-clojure";
- rev = "84e2be5939c33d44f9518aea60cfccff4d6c9707";
- sha256 = "1jz3lscjq8xfkrx464a1s8vyggnh5sjl8jvq8dvx0w7blny2jvz8";
+ rev = "ceac82aa691e8d98946471be6aaff9c9a4603c32";
+ sha256 = "1a6riq7ksk5m76dsgc75d8b992nyr50l48l8cpms9064m6b0r9jv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3a2ccef8af91eada4449d9cd4bda6bd28272722e/recipes/sotclojure";
@@ -66993,27 +65650,6 @@
license = lib.licenses.free;
};
}) {};
- sourcetalk = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
- melpaBuild {
- pname = "sourcetalk";
- version = "20140823.739";
- src = fetchFromGitHub {
- owner = "malroc";
- repo = "sourcetalk_emacs";
- rev = "aced89fa8776e6d5e42dad4a863e159959f08de6";
- sha256 = "0j4qm1y7rhb95k1zbl3c60a46l9rchzslzq36mayyw61s6yysjnv";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/e51aed64ffd0d2583c54035bd3e822f8adbaedde/recipes/sourcetalk";
- sha256 = "0qaf2q784xgl1s3m88jpwdzghpi4f3nybga3lnr1w7sb7b3yvj3z";
- name = "sourcetalk";
- };
- packageRequires = [ request ];
- meta = {
- homepage = "https://melpa.org/#/sourcetalk";
- license = lib.licenses.free;
- };
- }) {};
sourcetrail = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sourcetrail";
@@ -67059,12 +65695,12 @@
spaceline = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline, s }:
melpaBuild {
pname = "spaceline";
- version = "20170630.2327";
+ version = "20171016.157";
src = fetchFromGitHub {
owner = "TheBB";
repo = "spaceline";
- rev = "e6ccec6c80ee2bbddbad5a88cb9d2cd2db8a1a33";
- sha256 = "0ga99imh00h0bnc4m2q335y0x8zp6xs1n47rqqhxp6iwmw2fz20z";
+ rev = "251d92ef77ed4daa798e3300e5c671052870827e";
+ sha256 = "13mnsvlncrzsh2q8xhx5ippvhlrk9sgsrbpcihk0m90d2bxj53qy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/46e4c876aeeb0bb0d0e81dcbb8363a5db9c3ff61/recipes/spaceline";
@@ -67080,12 +65716,12 @@
spaceline-all-the-icons = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize, spaceline }:
melpaBuild {
pname = "spaceline-all-the-icons";
- version = "20170719.131";
+ version = "20170829.120";
src = fetchFromGitHub {
owner = "domtronn";
repo = "spaceline-all-the-icons.el";
- rev = "84ee6d37b8e6d50763ca2977133684143fc61cf3";
- sha256 = "1w66rfp1kmhqhnqjz2j41i245fw6840q09bfhsaci6kbhvhd5fnm";
+ rev = "e2e195f64a541d72b6d0ba0451f1e3072234b820";
+ sha256 = "0lrf62gsss19z2ca4hg5c08b3nbkqaa33fqrbfa126v2c98bj583";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d039e057c1d441592da8f54e6d524b395b030375/recipes/spaceline-all-the-icons";
@@ -67101,12 +65737,12 @@
spacemacs-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "spacemacs-theme";
- version = "20170731.845";
+ version = "20171102.1009";
src = fetchFromGitHub {
owner = "nashamri";
repo = "spacemacs-theme";
- rev = "5bcac14ab4b99bc3bef20fd62ef981c4590c4021";
- sha256 = "0xx22mf4wskn9gv04farwyp3mpx2ab3lsmmxvd3k00x99637x6jq";
+ rev = "ce45974252536af726e67515271186f92d47e3cc";
+ sha256 = "16gkphggpkach7w1s4qx08i2p53g1w9ps0r0i8a0qfk6rv0myvgh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8ac39214856c1598beca0bd609e011b562346f/recipes/spacemacs-theme";
@@ -67185,12 +65821,12 @@
sparql-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sparql-mode";
- version = "20170731.542";
+ version = "20171030.528";
src = fetchFromGitHub {
owner = "ljos";
repo = "sparql-mode";
- rev = "25de49d5f587985d92c7fb56247d86fe06d53f0e";
- sha256 = "0y2z6n18xrfi9g2ar0xm825j39qwsydpndilk40gncwz0civd4fa";
+ rev = "e220a0c0c478fee0be3622442651981cdd82090c";
+ sha256 = "1k1ih6y9yq1fx13863yacx69v6f77b8xhkrx5i2dpm4h7wki1dg4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c3d729130a41903bb01465d0f01c34fbc508b56e/recipes/sparql-mode";
@@ -67203,25 +65839,6 @@
license = lib.licenses.free;
};
}) {};
- speck = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "speck";
- version = "20160717.951";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/speck.el?revision=12";
- sha256 = "0zn7gjrga1ly1za04jd4s61m1dwkyy960x7g3x9hn4szqvpcsvfa";
- name = "speck.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/speck";
- sha256 = "06x5543pwqazs4airj43208caw3sxw7zb148njbn33qgl09r1iv6";
- name = "speck";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/speck";
- license = lib.licenses.free;
- };
- }) {};
speech-tagger = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "speech-tagger";
@@ -67270,8 +65887,8 @@
src = fetchFromGitHub {
owner = "parkouss";
repo = "speed-type";
- rev = "5d691f57743304db63b6afdc5bd79dabd282d390";
- sha256 = "08qp2b80rh9k8h5vv141lfsg73rqqikhh7ygal789rr278ai1rjf";
+ rev = "9940383d94688e7f130b01f9872182ab59edf00f";
+ sha256 = "0gfiw3rmqyargc1prkrglmzvzxm03nszqqba1q9zd7cs0m315pmm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d6c33b5bd15875baea0fd2f24ee8ec9414a6f7aa/recipes/speed-type";
@@ -67350,12 +65967,12 @@
spice-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "spice-mode";
- version = "20160919.330";
+ version = "20171027.2343";
src = fetchFromGitHub {
owner = "stardiviner";
repo = "spice-mode";
- rev = "1dcaa4b4cd1527cf15bfc6dfc278c574359a5062";
- sha256 = "0ngfyxpvwgyqh99vjr2msqan0hma1qlljkx971qjxcpn0y80dj23";
+ rev = "702bf2d5c3561be44771ea77b476532d32068504";
+ sha256 = "1wqcy9nmhpl3vyasvc79msgd25xbbzva9nbxkdrsbpg07p1is9ik";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/spice-mode";
@@ -67662,25 +66279,6 @@
license = lib.licenses.free;
};
}) {};
- sqlplus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "sqlplus";
- version = "20170710.150";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/sqlplus.el?revision=26";
- sha256 = "19lrk1a9d9ljdnsiar5cgmp68c26b6aihi3rbgf3d5bcg9iqbp7q";
- name = "sqlplus.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/41b1fc299cf8eeba1916a58ad8f50eb4560f0252/recipes/sqlplus";
- sha256 = "1z9pf36b1581flykis9cjv7pynnp94fm4ijzjy6hvqyj81aikxpz";
- name = "sqlplus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/sqlplus";
- license = lib.licenses.free;
- };
- }) {};
sqlup-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sqlup-mode";
@@ -67747,12 +66345,12 @@
ssass-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ssass-mode";
- version = "20170310.2024";
+ version = "20170817.1216";
src = fetchFromGitHub {
owner = "AdamNiederer";
repo = "ssass-mode";
- rev = "c26852123436849367d826c370f24dd9f20cb501";
- sha256 = "05wk2jfvzpzjpqz5vmv8b1yz8nnnix6lv9rh66vgddm794j92dkd";
+ rev = "d17d2de381ffc96e62e77435fb7b387bf59aceec";
+ sha256 = "1vw2mzn8yczgyspgmv4f621d7h10qxa8hfzalb14bvwqn4h37spy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3137f98aaa871a52f477b63d9c3b7b63f7271344/recipes/ssass-mode";
@@ -67789,12 +66387,12 @@
ssh-agency = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ssh-agency";
- version = "20170205.1306";
+ version = "20170807.1152";
src = fetchFromGitHub {
owner = "magit";
repo = "ssh-agency";
- rev = "94abffa716aff963175196066526c7ee8b4efae7";
- sha256 = "1r41hgh0kaf9x56jllqjz7f9ypzgyf9pqqpm3r49xyi8fr1drbxc";
+ rev = "e572e031852561f98a7053afcdc9a3796dde2137";
+ sha256 = "0z2ywkiwv983vz4bk5vc62p3xapp15a4715l9sp5c8x70nlq02y3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b9a9e4bd0205908bfb99762c7daaf3be276bb03a/recipes/ssh-agency";
@@ -67831,12 +66429,12 @@
ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ssh-deploy";
- version = "20170801.2303";
+ version = "20171031.2204";
src = fetchFromGitHub {
owner = "cjohansson";
repo = "emacs-ssh-deploy";
- rev = "a7246531ab3d3c2d7cb3bd515353dfecbe5902c1";
- sha256 = "1ac10acyz0d3z5gmm79flxz7mmbww0xbr278qbwyzyr8h0hv2d5d";
+ rev = "5cd1f8080fefb64e6eaa1098cc191db6abb97e23";
+ sha256 = "0pn9wf4svka3rxzy09jarjp3ycz2bvm39898qaikjf0dwaydlqlw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy";
@@ -68041,12 +66639,12 @@
steam = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "steam";
- version = "20160427.231";
+ version = "20171102.541";
src = fetchFromGitHub {
owner = "Kungsgeten";
repo = "steam.el";
- rev = "a0547487ccf40aa582af3dd0d433a1b153d25246";
- sha256 = "142jamr8mi1nkjvivvkh2qgh5fch89xpg5wwi8q0b6hcqcsy8nqn";
+ rev = "9d57a055b0e20fa823542922580e43eb671944a5";
+ sha256 = "0592z17388qd9cakskw7wymxpz7svxqy5mdzi4add0nffdj51qxx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/25a45eb6297168cd0ce4c4db5574362addad5c69/recipes/steam";
@@ -68101,44 +66699,6 @@
license = lib.licenses.free;
};
}) {};
- stgit = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "stgit";
- version = "20140213.348";
- src = fetchgit {
- url = "git://repo.or.cz/stgit.git";
- rev = "f248e80ec7ed418d23d47c8a6c147a8a42855d29";
- sha256 = "1icm94ri23m66p0lmg0sdqi04m3vfwd2jcngym9gcg8p5gqq8j2g";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/4ed7cc025d22d8e1e63464e43f733c78421c91c7/recipes/stgit";
- sha256 = "102s9lllrcxsqs0lgbrcljwq1l3s8ri4276wck6rcypck5zgzj89";
- name = "stgit";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/stgit";
- license = lib.licenses.free;
- };
- }) {};
- sticky = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "sticky";
- version = "20101129.1852";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/sticky.el?revision=4";
- sha256 = "18izyia1j3w2c07qhkp9h6rnvw35m5k1brrrjhm51fpdv2xj65fy";
- name = "sticky.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/1c3a9689703b8c8edbffdc966cded9ea98fc8762/recipes/sticky";
- sha256 = "1xjkdwphq3m4jrazsfnzrrcrqikfdxzph3jdzkpbzk3grd4af96w";
- name = "sticky";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/sticky";
- license = lib.licenses.free;
- };
- }) {};
stickyfunc-enhance = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "stickyfunc-enhance";
@@ -68286,25 +66846,6 @@
license = lib.licenses.free;
};
}) {};
- strings = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "strings";
- version = "20170307.1533";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/strings.el?revision=49";
- sha256 = "08sq20ys4xkkg11jyrnlzibl5v73i7zlnj28ygivy3sqvp07z7iz";
- name = "strings.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/strings";
- sha256 = "0n3239y7biq3rlg74m7nqimhf654w4snnw2zm7z84isgwzz2dphk";
- name = "strings";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/strings";
- license = lib.licenses.free;
- };
- }) {};
stripe-buffer = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "stripe-buffer";
@@ -68492,88 +67033,27 @@
license = lib.licenses.free;
};
}) {};
- sublimity = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ sublimity = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sublimity";
- version = "20161214.2032";
+ version = "20170820.827";
src = fetchFromGitHub {
owner = "zk-phi";
repo = "sublimity";
- rev = "033c7c04e47e7666afd125a72467c3eb657732d9";
- sha256 = "073c4bbxkmq7cifzwn933qxkqvklcbg3gh9vm5hr3af9j7vpx2ac";
+ rev = "62b0c526c599a0178a16a75f16513fc1f93a0d53";
+ sha256 = "0kncjm6133a84z9rvygn5dqnwdj036sw6cf1pi595rk3f9r2ccg5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c1e78cd1e5366a9b6d04237e9bf6a7e73424be52/recipes/sublimity";
sha256 = "1xwggaalad65cxcfvmy30f141bxhpzc3fgvwziwbzi8fygbdv4nw";
name = "sublimity";
};
- packageRequires = [];
+ packageRequires = [ cl-lib ];
meta = {
homepage = "https://melpa.org/#/sublimity";
license = lib.licenses.free;
};
}) {};
- subr-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "subr-plus";
- version = "20170501.916";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/subr+.el";
- sha256 = "1vrs390vqcsjwzf6pzcvqjc3mliac66g7g5kifvz9zp0v3bq6x7d";
- name = "subr+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/subr+";
- sha256 = "17i5sgsv8clh3pzpkv5zvhmm584m1rvsypd6nh6ks2jpidwgs8x1";
- name = "subr-plus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/subr+";
- license = lib.licenses.free;
- };
- }) {};
- subshell-proc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "subshell-proc";
- version = "20130122.1322";
- src = fetchFromGitHub {
- owner = "andrewmains12";
- repo = "subshell-proc";
- rev = "d18b20e03fc89ee08e8c6a968aba31a16b53287f";
- sha256 = "09izm28jrzfaj469v6yd1xgjgvy6pmxarcy0rzn2ihn3c0z7mdg4";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/subshell-proc";
- sha256 = "1ma5i4ka48w46ksxyppjnyq2ka03b2ylsmw3jv1hp35f3ycqpbqp";
- name = "subshell-proc";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/subshell-proc";
- license = lib.licenses.free;
- };
- }) {};
- sudden-death = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "sudden-death";
- version = "20140829.538";
- src = fetchFromGitHub {
- owner = "yewton";
- repo = "sudden-death.el";
- rev = "beba6b4fb42b1e27575d3f722d23a0eb19666736";
- sha256 = "1007xz4x1wgvxilv1qwf0a4y7hd7sqnnzwk2bdr12kfk7vq9cw2b";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/24c94bff44029b6493575a9e09d7deb78db095a9/recipes/sudden-death";
- sha256 = "1wrhb3d27j07i64hvjggyajm752w4mhrhq09lfvyhz6ykp1ly3fh";
- name = "sudden-death";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/sudden-death";
- license = lib.licenses.free;
- };
- }) {};
sudo-edit = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sudo-edit";
@@ -68640,12 +67120,12 @@
suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }:
melpaBuild {
pname = "suggest";
- version = "20170806.1414";
+ version = "20171016.1420";
src = fetchFromGitHub {
owner = "Wilfred";
repo = "suggest.el";
- rev = "6ae090cab9bc16650c1788e83ccd2fe95a959de2";
- sha256 = "1rnp7zwr5j345l569zhpskf7g6bkg0jmplzjwy79rlv3h3d6rv4d";
+ rev = "345e00569333095eb24e61239a80b0f0c77b2d11";
+ sha256 = "0npqvhnfmrx7jq1slz489rh2l4rnfhqhbi6ybdzw5rism8r3jqwb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest";
@@ -68661,12 +67141,12 @@
suggestion-box = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
melpaBuild {
pname = "suggestion-box";
- version = "20160927.1530";
+ version = "20170830.107";
src = fetchFromGitHub {
owner = "yuutayamada";
repo = "suggestion-box-el";
- rev = "90452d71e4afe9f42ee975f2f7897835cf3dee87";
- sha256 = "1bcmhbx4l4x01n2vpcyw8wyp3cklzp65v5d4sx284qj5gd64i1p4";
+ rev = "50af0776c8caf3c79c4d37fd51cbf304ea34b68e";
+ sha256 = "01lx20kzay5504xcq6m6yhvayyd7wpzaa1r6i67xqjnr25lqyajw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b59be8dc0a1850d3e245957fd170e1d01f4e284/recipes/suggestion-box";
@@ -68679,22 +67159,24 @@
license = lib.licenses.free;
};
}) {};
- summarye = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "summarye";
- version = "20130328.327";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/summarye.el?revision=4";
- sha256 = "0q5m8d6p9aqbfx17zgznkqw2jgh027xix4894wrdz91670zxd3py";
- name = "summarye.el";
+ sunburn-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "sunburn-theme";
+ version = "20171101.1126";
+ src = fetchFromGitHub {
+ owner = "mvarela";
+ repo = "Sunburn-Theme";
+ rev = "c57190f87e2e6c5ef6c7fbfd40964eb8f11b32ca";
+ sha256 = "1b2d0iky9w8f0sww4wish55j2s2j1y2v4bjf3lk0yg2ysbspy3vq";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/85e28911e6b8173188f45331c6540681691223f2/recipes/summarye";
- sha256 = "1znd96ixg1n90yjiny84igb7m8qsbiibn7s6bky8g6n2k7zzmq65";
- name = "summarye";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/bfd68b90234222dbf5907a29d506b6c4e61a372b/recipes/sunburn-theme";
+ sha256 = "09shmaaii0lfd52v49cazn91sj4jz2siqbanw682vi7zsl79jx9f";
+ name = "sunburn-theme";
};
- packageRequires = [];
+ packageRequires = [ emacs ];
meta = {
- homepage = "https://melpa.org/#/summarye";
+ homepage = "https://melpa.org/#/sunburn-theme";
license = lib.licenses.free;
};
}) {};
@@ -68764,12 +67246,12 @@
super-save = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "super-save";
- version = "20160426.729";
+ version = "20171008.3";
src = fetchFromGitHub {
owner = "bbatsov";
repo = "super-save";
- rev = "701c98eef4b9b21cd6cfd31f190f9988d32353aa";
- sha256 = "1frm90kssrp4s6x0g4vq4jkssh8rnrfjbgwa05igsjnsbnnfxxd1";
+ rev = "1c8fbd5e18277e4af0ada2678a854b1c9072db38";
+ sha256 = "0mh7xp71l9xybbv17b1rsbpa60bwjw79ql9krj1kzy2c2pv9hmff";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9730b65787b26d3909952cf246a01bd349e5fbab/recipes/super-save";
@@ -68810,8 +67292,8 @@
src = fetchFromGitHub {
owner = "TheSuspiciousWombat";
repo = "SusColors-emacs";
- rev = "8f5cdf8de5e58db838ef0e803b60b7d74fc2a889";
- sha256 = "1wc4l7zvb8zmh48cgrl7bkbyfj0sflzq28sc8jssghkcl2735cbg";
+ rev = "b946e7924aa02fa7441c970026898f17fe97601f";
+ sha256 = "0553fgiyjy2n3wa2agwzvadf6il85waf2vjpsy75ljj6lw8glhka";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6f26b8281f9bd05e3c8f2ef21838275711e622c9/recipes/suscolors-theme";
@@ -68911,16 +67393,16 @@
swbuff = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "swbuff";
- version = "20160824.707";
+ version = "20041012.18";
src = fetchFromGitHub {
owner = "emacsorphanage";
repo = "swbuff";
- rev = "8d5b2bec12503509554f9dd83b97c198b259db2b";
- sha256 = "0h96pwvf1smd2kakd5ydsn6q59dv9sj706p1ak86aj82m028wzk5";
+ rev = "dcde4ddc7beafef3150e8c645724bdbbf8596028";
+ sha256 = "1hxwa3hdhdx3ikfkblda748assm0k5mgwpdjv3jif37n0lw0f435";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a44a6577740b98749fe2703b32d70f15a473eb46/recipes/swbuff";
- sha256 = "0pi816ljprpl8p2pigfyzm9ripvrc4hvnpkjdsg30mw8iyrk66yn";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/39e87d0e01a4a836671b6d6e22091df6ebecf566/recipes/swbuff";
+ sha256 = "1bqnq6zxkq4yyq3khnkbprgwq5k93rpcmmkjbr9wqf9drfld1bkk";
name = "swbuff";
};
packageRequires = [];
@@ -68929,25 +67411,6 @@
license = lib.licenses.free;
};
}) {};
- swbuff-x = callPackage ({ fetchurl, lib, melpaBuild, swbuff }: melpaBuild {
- pname = "swbuff-x";
- version = "20130607.314";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/swbuff-x.el?revision=9";
- sha256 = "1fkicyjvanh8yk2y27sq075sarcyqhsdz0r4xhillpnv34ji98r5";
- name = "swbuff-x.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/42bac16fa83eb3df693835326444f4bd4255cf1d/recipes/swbuff-x";
- sha256 = "1wglcxgfr839lynwsl8i7fm70sxxjidy3ib6ibz0kgiwr41rh49y";
- name = "swbuff-x";
- };
- packageRequires = [ swbuff ];
- meta = {
- homepage = "https://melpa.org/#/swbuff-x";
- license = lib.licenses.free;
- };
- }) {};
sweetgreen = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, request }:
melpaBuild {
pname = "sweetgreen";
@@ -68969,22 +67432,22 @@
license = lib.licenses.free;
};
}) {};
- swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
melpaBuild {
pname = "swift-mode";
- version = "20170716.2320";
+ version = "20170918.51";
src = fetchFromGitHub {
owner = "chrisbarrett";
repo = "swift-mode";
- rev = "98920962adaaf42698fc847fbe7d9edcd58e50e9";
- sha256 = "0npz0izw6dwiv1kmkbnf6hklmx4w2pqddzb2ijxasrrviyyyc83s";
+ rev = "e8d9a5d7af59e8be25997b8b048d7c3e257cd0b0";
+ sha256 = "035478shf1crb1qnhk5rmz08xgn0z2p6fsw0yii1a4q5f3h85xrc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode";
sha256 = "1imr53f8agfza9zxs1h1mwyhg7yaywqqffd1lsvm1m84nvxvri2d";
name = "swift-mode";
};
- packageRequires = [ emacs ];
+ packageRequires = [ emacs seq ];
meta = {
homepage = "https://melpa.org/#/swift-mode";
license = lib.licenses.free;
@@ -69014,12 +67477,12 @@
swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "swiper";
- version = "20170804.1038";
+ version = "20171105.42";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "swiper";
- rev = "a5cd13b9487007ba6cb3eb64575800ee14589691";
- sha256 = "00rmcd72hxcsvrkwqsqy9b0jr1rxh3ny3q1fh33zp61s82n1dkn0";
+ rev = "5d373be194e21f3e29a03fb498b901fcc5e128f9";
+ sha256 = "0ycch0gqhjxg9ffz5y942z908zy4y3yl242dnyskkv3vmkrziwsz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper";
@@ -69056,11 +67519,11 @@
switch-buffer-functions = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "switch-buffer-functions";
- version = "20160702.2157";
+ version = "20171011.1004";
src = fetchFromGitHub {
owner = "10sr";
repo = "switch-buffer-functions-el";
- rev = "4778a2bc9ecfb71bb2b6a65c7108260ec8f30a37";
+ rev = "651696ef9dec7affbe51c81d9318288376c35899";
sha256 = "0xv57imh6w6kbh1i1ib9k9x2h01l4vdxs2i667a76ym6dmsjbx2x";
};
recipeFile = fetchurl {
@@ -69161,12 +67624,12 @@
symbol-overlay = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "symbol-overlay";
- version = "20170615.1919";
+ version = "20171103.2306";
src = fetchFromGitHub {
owner = "wolray";
repo = "symbol-overlay";
- rev = "1c40cd921d573bbbd2cd9770c0bafc484b23a2ad";
- sha256 = "1npgjhjdky298n70n1lh1qi6d1km1d9vy82n2x4rjn45699gkrl8";
+ rev = "305ef1d283923d2b0f1cd751f57f71754ab714e6";
+ sha256 = "0j5542283mmdl30syk0k5p6ybb0w3xlnamjrrafdaj618v3anvgv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c2a468ebe1a3e5a35ef40c59a62befbf8960bd7b/recipes/symbol-overlay";
@@ -69284,25 +67747,6 @@
license = lib.licenses.free;
};
}) {};
- synonyms = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "synonyms";
- version = "20170307.1537";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/synonyms.el?revision=63";
- sha256 = "0456mmp3niljpghqcngknqkrxmpkba3n95ab4pf0b0021z2zjyxk";
- name = "synonyms.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/synonyms";
- sha256 = "1b000scgba310i7w27c8wj0iflqqgwik524ql084wpqvikwqnlzm";
- name = "synonyms";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/synonyms";
- license = lib.licenses.free;
- };
- }) {};
synosaurus = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "synosaurus";
@@ -69345,22 +67789,22 @@
license = lib.licenses.free;
};
}) {};
- syntactic-close = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ syntactic-close = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "syntactic-close";
- version = "20170510.2348";
+ version = "20171004.1037";
src = fetchFromGitHub {
owner = "emacs-berlin";
repo = "syntactic-close";
- rev = "83f6a212637175c8cfb1132eb40cdd4c3343040a";
- sha256 = "0r5zff8fb0gid84f62l88lfh1hp8nkgf9cldnhmmv3icrhc2r0kc";
+ rev = "e2cd1f332d111b0e90d9a72f35bc969c7638b7cf";
+ sha256 = "18fq9v1kb6bx0xxd1cic2f3gfwv82y4mjs5qg7q2ra1cz5d502w9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f2c15c0c8ee37a1de042a974c6daddbfa7f33f1d/recipes/syntactic-close";
sha256 = "19lrzxxyzdj1nrzdgzandjz3b8b4pw7akbv86yf0mdf023d9as1f";
name = "syntactic-close";
};
- packageRequires = [];
+ packageRequires = [ cl-lib emacs ];
meta = {
homepage = "https://melpa.org/#/syntactic-close";
license = lib.licenses.free;
@@ -69407,36 +67851,15 @@
license = lib.licenses.free;
};
}) {};
- syslog-mode = callPackage ({ fetchFromGitHub, fetchurl, hide-lines, lib, melpaBuild }:
- melpaBuild {
- pname = "syslog-mode";
- version = "20170107.1517";
- src = fetchFromGitHub {
- owner = "vapniks";
- repo = "syslog-mode";
- rev = "e2ade4f27672a644fcb69ceaa8a08f04eaa2ccf2";
- sha256 = "0b3p91f44ghzlma3vw607fsvzzgrfjq4k3zchv0drlga2kv771vw";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/478b307f885a06d9ced43758d8c117370152baae/recipes/syslog-mode";
- sha256 = "15kh2v8jsw04vyh2lmh1ndpxli3cwp6yq66hl8mwb1i3g429az19";
- name = "syslog-mode";
- };
- packageRequires = [ hide-lines ];
- meta = {
- homepage = "https://melpa.org/#/syslog-mode";
- license = lib.licenses.free;
- };
- }) {};
system-packages = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "system-packages";
- version = "20170710.612";
+ version = "20170831.1239";
src = fetchFromGitHub {
owner = "jabranham";
repo = "system-packages";
- rev = "ae993f994ed60a845c5752e90491cf127bb1c052";
- sha256 = "1dp8q82k7s2h3pp6qh4x2hbvq23ykn09mf6ymfy62p8jdavfvcx2";
+ rev = "ccc2a6b3794b6ada59905ee609fe9e1d973622aa";
+ sha256 = "0hs00y8wvsagnc8ckd8izxvigsli7230hgxf5xmrdknj9h4icrgw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8c423d8c1ff251bd34df20bdb8b425c2f55ae1b1/recipes/system-packages";
@@ -69473,12 +67896,12 @@
systemd = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "systemd";
- version = "20170727.504";
+ version = "20171006.1352";
src = fetchFromGitHub {
owner = "holomorph";
repo = "systemd-mode";
- rev = "2c71ec55291eca382305b1f31020e0396907534d";
- sha256 = "1fj7hh0p33kscjbcqkf91p2bg1fq1jgfq1i5wkgjdgwg6rg2rb62";
+ rev = "22f024fe8f433af7b6a6b99520cea1e766894fe5";
+ sha256 = "11h1nr9gz0mw2gwlplv00i06s9ziw77a7zfcrrzd01rmanz1m4fa";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ca810e512c357d1d0130aeeb9b46b38c595e3351/recipes/systemd";
@@ -69745,12 +68168,12 @@
tangotango-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "tangotango-theme";
- version = "20150702.104";
+ version = "20170924.809";
src = fetchFromGitHub {
owner = "juba";
repo = "color-theme-tangotango";
- rev = "08c3b9270547970dbce2cb1e35e66f6ae380c8b2";
- sha256 = "11xb7xpmxvgv7mrjd2vlbjz3h5fa541aydv6bdxngjq6y3qn6wsp";
+ rev = "e2f2ea9c35f06dfc43a29c91c14cf0cdb19f2144";
+ sha256 = "01gvsvha8z7pyr8c33gh3xmz47lh6b8g0nwf1gzdiw1gd0sfhs4z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ebfcfa3ba4ca77443667a9478d59214810cd8cc2/recipes/tangotango-theme";
@@ -69791,8 +68214,8 @@
src = fetchFromGitHub {
owner = "phillord";
repo = "tawny-owl";
- rev = "f103ace956d5e7039cf0785d93c2956bd7bea4f4";
- sha256 = "0w82lzig3fy4p59rjj5dgi15mlmx6v4s6vm3z58rj65ql7qfzf88";
+ rev = "a8fc8300481a1e033a3811ccda54e552392d1689";
+ sha256 = "1lkldr6rr21f97vp6kms2ha8hsszhmba4sn07is4k55lpvlnxd49";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ea9a114ff739f7d6f5d4c3167f5635ddf79bf60c/recipes/tawny-mode";
@@ -69955,12 +68378,12 @@
telephone-line = callPackage ({ cl-generic, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
melpaBuild {
pname = "telephone-line";
- version = "20170804.1057";
+ version = "20170831.1215";
src = fetchFromGitHub {
owner = "dbordak";
repo = "telephone-line";
- rev = "01a2be2798850519873fe7abc59d715a978e6f20";
- sha256 = "06g4vd4air0rflzi1yz9qh1zxnwh7x13ffcib5fk7b0h8ypl72wd";
+ rev = "c17c71ae18ad54b8c3d1eddbe78ed82816d06186";
+ sha256 = "1f5mlxjmyliz0ahcj6c3cypssrcp2ybhqpswzsqp5vqp75bc7ysz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9c998b70365fb0a210c3b9639db84034c7d45097/recipes/telephone-line";
@@ -70060,12 +68483,12 @@
term-manager = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "term-manager";
- version = "20170421.105";
+ version = "20171020.141";
src = fetchFromGitHub {
owner = "IvanMalison";
repo = "term-manager";
- rev = "7180f09078f89aadb83061420ca8fd58d929b629";
- sha256 = "1d1szcdpgmkp6r9qsvk7pv0swl626d5svna2xqr3lrpgqzmsjcnk";
+ rev = "13a0f1637a1f075d70211ccb8162e63a18a474da";
+ sha256 = "0hvn60wk3w27fjb023drnaw0gmys6ancha8blpl0r4vc5k203kcf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0b2f7d8c8fcbb535432f8e70729d69a572e49a1a/recipes/term-manager";
@@ -70148,8 +68571,8 @@
src = fetchFromGitHub {
owner = "IvanMalison";
repo = "term-manager";
- rev = "7180f09078f89aadb83061420ca8fd58d929b629";
- sha256 = "1d1szcdpgmkp6r9qsvk7pv0swl626d5svna2xqr3lrpgqzmsjcnk";
+ rev = "13a0f1637a1f075d70211ccb8162e63a18a474da";
+ sha256 = "0hvn60wk3w27fjb023drnaw0gmys6ancha8blpl0r4vc5k203kcf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5260876280148fae28a459f07932cebb059b560e/recipes/term-projectile";
@@ -70207,12 +68630,12 @@
terminal-here = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "terminal-here";
- version = "20170805.251";
+ version = "20171022.552";
src = fetchFromGitHub {
owner = "davidshepherd7";
repo = "terminal-here";
- rev = "5e440c33a1d24762477863af5c9b7a896df4be1b";
- sha256 = "0kqn3gzm5q37d2iz0wk2xcl7qlmqkblwy8zdc7plc6syldnh91aj";
+ rev = "b3659e13d3d41503b4fc59dd2c7ea622631fc3ec";
+ sha256 = "1z3ngwgv8ybwq42lkpavk51a25zdkl6v9xdfi41njpxdpbfcmx8z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f8df6f7e23476eb52e7fdfbf9de277d3b44db978/recipes/terminal-here";
@@ -70228,12 +68651,12 @@
tern = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
melpaBuild {
pname = "tern";
- version = "20161222.850";
+ version = "20170925.1333";
src = fetchFromGitHub {
owner = "ternjs";
repo = "tern";
- rev = "3f8a2bc7c2e9a4ac55e8c6f6c60c0634cbe71326";
- sha256 = "104s1mfn6cwi0iqq5ccaca5dzh29gfhfnif8a0mi4qy5ljsp9xng";
+ rev = "5c395b5d696aad5a185724f56c74a7f83349f3bd";
+ sha256 = "11sp1jz0fn8gnc28qvyrmc7qxr1gn5r3vxv6gp46p7cmgg9mflri";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern";
@@ -70253,8 +68676,8 @@
src = fetchFromGitHub {
owner = "ternjs";
repo = "tern";
- rev = "3f8a2bc7c2e9a4ac55e8c6f6c60c0634cbe71326";
- sha256 = "104s1mfn6cwi0iqq5ccaca5dzh29gfhfnif8a0mi4qy5ljsp9xng";
+ rev = "5c395b5d696aad5a185724f56c74a7f83349f3bd";
+ sha256 = "11sp1jz0fn8gnc28qvyrmc7qxr1gn5r3vxv6gp46p7cmgg9mflri";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern-auto-complete";
@@ -70414,6 +68837,27 @@
license = lib.licenses.free;
};
}) {};
+ tex-smart-umlauts = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "tex-smart-umlauts";
+ version = "20160427.58";
+ src = fetchFromGitHub {
+ owner = "emacsorphanage";
+ repo = "tex-smart-umlauts";
+ rev = "5261b931443558f4252489a1e6616034848aff02";
+ sha256 = "1rq1l52mgbasgwvjwpivjrfjf8l8r85wdkfpbw8213449qh9c9zh";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/tex-smart-umlauts";
+ sha256 = "05q5mzl0pya682hdmjyp09hh121dc5y4d5vgqjffx3yfd5kgsy5w";
+ name = "tex-smart-umlauts";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/tex-smart-umlauts";
+ license = lib.licenses.free;
+ };
+ }) {};
textile-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "textile-mode";
@@ -70519,25 +68963,6 @@
license = lib.licenses.free;
};
}) {};
- tfs = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "tfs";
- version = "20120508.1120";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/tfs.el?revision=9";
- sha256 = "16byw8ix7bjh5ldr8rymisq2bhc5sh7db6rhpf0x28yd6mmzn73v";
- name = "tfs.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/tfs";
- sha256 = "0h38qd1xhfd0my26i6w5j1jr91r5qal8x4bp7ij1cym72yxspna6";
- name = "tfs";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/tfs";
- license = lib.licenses.free;
- };
- }) {};
theme-changer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "theme-changer";
@@ -70601,64 +69026,6 @@
license = lib.licenses.free;
};
}) {};
- thesaurus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "thesaurus";
- version = "20121125.1137";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/thesaurus.el?revision=6";
- sha256 = "0zcyasdzb7dvmld8418cy2mg8mpdx01bv44cm0sp5950scrypsaq";
- name = "thesaurus.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/thesaurus";
- sha256 = "1cnna27dlragk4w3f59xbrwppp49r010qdn7n3n7wvhibv3cfyd7";
- name = "thesaurus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/thesaurus";
- license = lib.licenses.free;
- };
- }) {};
- thing-cmds = callPackage ({ fetchurl, hide-comnt, lib, melpaBuild }:
- melpaBuild {
- pname = "thing-cmds";
- version = "20170726.1355";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/thing-cmds.el?revision=58";
- sha256 = "07z49csdlrf08h8d8p9n8j492r22s7wgpzjwafppbsm4mvgshmq9";
- name = "thing-cmds.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/thing-cmds";
- sha256 = "133bm2cw9ar6m2amj0rrq4wbj9c3zl61gaprx0vlasxj2cyxs7yw";
- name = "thing-cmds";
- };
- packageRequires = [ hide-comnt ];
- meta = {
- homepage = "https://melpa.org/#/thing-cmds";
- license = lib.licenses.free;
- };
- }) {};
- thingatpt-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "thingatpt-plus";
- version = "20170307.1539";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/thingatpt+.el";
- sha256 = "1k9y354315gvhbdk0m9xpjx24w1bwrnzlnfiils8xgdwnw4py99a";
- name = "thingatpt+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/thingatpt+";
- sha256 = "0w031lzjl5phvzsmbbxn2fpziwkmdyxsn08h6b9lxbss1prhx7aa";
- name = "thingatpt-plus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/thingatpt+";
- license = lib.licenses.free;
- };
- }) {};
thingopt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "thingopt";
@@ -70704,12 +69071,12 @@
thread-dump = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "thread-dump";
- version = "20130323.1025";
+ version = "20170816.1150";
src = fetchFromGitHub {
owner = "nd";
repo = "thread-dump.el";
- rev = "1cee07775ac8c13bb52217be6c383562c617542b";
- sha256 = "0rjcrvw9v2y10ahycra53bwbccpwqxxwn2c21wjj1kfs0kdwhs9p";
+ rev = "204c9600242756d4b514bb5ff6293e052bf4b49d";
+ sha256 = "11qx194gwizqg7p2mqy7mdfii85bdayabxfd388dmrm916i4w47n";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/thread-dump";
@@ -70750,8 +69117,8 @@
src = fetchFromGitHub {
owner = "apache";
repo = "thrift";
- rev = "ec64f23d236d7874e3b28ae86c833f57c7aa3389";
- sha256 = "0b819jbs0318dap8nfvs6ljfiw5qiqbhgda3czq4vns728m0rqsa";
+ rev = "4f77ab8e296d64c57e6ea1c6e3f0f152bc7d6a3a";
+ sha256 = "1l94kmkhqrab0nigaafizxgc68msqaklc7wzdpxxxnfs2yh23idq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift";
@@ -70764,26 +69131,6 @@
license = lib.licenses.free;
};
}) {};
- thumb-frm = callPackage ({ fetchurl, frame-cmds, frame-fns, lib, melpaBuild }:
- melpaBuild {
- pname = "thumb-frm";
- version = "20170307.1540";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/thumb-frm.el?revision=62";
- sha256 = "1mfz4gkq71sp9q7pa8q0md36g7x0dpsqz0np507dx2kypzqhklpd";
- name = "thumb-frm.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/thumb-frm";
- sha256 = "1fjjd80drm8banni909lww9zqazr1kk9m40xwwa1ln2zicaf091c";
- name = "thumb-frm";
- };
- packageRequires = [ frame-cmds frame-fns ];
- meta = {
- homepage = "https://melpa.org/#/thumb-frm";
- license = lib.licenses.free;
- };
- }) {};
thumb-through = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "thumb-through";
@@ -70805,15 +69152,36 @@
license = lib.licenses.free;
};
}) {};
+ tickscript-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "tickscript-mode";
+ version = "20171101.108";
+ src = fetchFromGitHub {
+ owner = "msherry";
+ repo = "tickscript-mode";
+ rev = "45ce0b4f8f18ffa00a4fd2ab3823118f69b94653";
+ sha256 = "0w6gh6nb81c5jp4px6xx5d3wmwgkh6irzwgk42g0mkhjifzm83ip";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/c60ee1839f728c5041bde1fe4fa62c4d41c746ef/recipes/tickscript-mode";
+ sha256 = "0wnck6j377idx7h7csmfdhp6napv3zs4sd24lknfclafhslllp54";
+ name = "tickscript-mode";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/tickscript-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s, typescript-mode }:
melpaBuild {
pname = "tide";
- version = "20170806.2049";
+ version = "20171009.1142";
src = fetchFromGitHub {
owner = "ananthakumaran";
repo = "tide";
- rev = "77e4fe848dd664ead1f6980a9a99d82e2bee75d7";
- sha256 = "18n0w02h6wvp5gxnsm7lcwdg68sxcqz9sx6xpkxlidyhixk2iap9";
+ rev = "d4a86487475b08adcbc1974c3362ce247d65a381";
+ sha256 = "1f0l8s50ihhl4w00q5f101g9bfn9zssh4ippbchfdz4ialisyk2y";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide";
@@ -70826,25 +69194,6 @@
license = lib.licenses.free;
};
}) {};
- tidy = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "tidy";
- version = "20111222.956";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/tidy.el?revision=9";
- sha256 = "0psci55a3angwv45z9i8wz8jw634rxg1xawkrb57m878zcxxddwa";
- name = "tidy.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/bf079dbd04675ecd5f511b940d7cc5f80ccc94c4/recipes/tidy";
- sha256 = "09xb2k3k99hp3m725f31s6hlaxgl4fsaa1dylahxvdfddhbh290m";
- name = "tidy";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/tidy";
- license = lib.licenses.free;
- };
- }) {};
tile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, stream }:
melpaBuild {
pname = "tile";
@@ -70892,14 +69241,14 @@
pname = "timecop";
version = "20160520.352";
src = fetchFromGitHub {
- owner = "zonuexe";
+ owner = "emacs-php";
repo = "emacs-datetime";
rev = "e6427538b547cbe02e1bd6ed4b765c73620bdae8";
sha256 = "1573z8wq5m8qzbzmnsz2fmbwrj9c0ava0jjfchzmwm2b3jyvqh5r";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/c367c756a02e161a2f6ce6c422802c9f74102a07/recipes/timecop";
- sha256 = "0kcjx3silk9vwysaawhcvpb7c82dzb2y7ns8x50jznylqg8c4zh5";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/timecop";
+ sha256 = "1hnmxcc2hjx9a4jyavx2v9hxmqacmmg1xj86rxqx3ms32hgigji5";
name = "timecop";
};
packageRequires = [ cl-lib datetime-format ];
@@ -71004,12 +69353,12 @@
tinkerer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "tinkerer";
- version = "20161102.531";
+ version = "20170906.524";
src = fetchFromGitHub {
owner = "yyr";
repo = "tinkerer.el";
- rev = "713769e5f5eb90a87d515b7ba2dca71f2f297218";
- sha256 = "1dpf6s1mv8mvcr84hzawhjgz3fjpbr8qrlcvdsw3r2c6b9pdi4hw";
+ rev = "e34135555f3748b578c7f8706dfd0c888fb87581";
+ sha256 = "0lzrarqh965ysd7w0z5rbisl45j11fbibyxmgivgy9parvhg59hk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8a28e1dfe987287bac7c45f83ae6e754bc13e345/recipes/tinkerer";
@@ -71025,12 +69374,12 @@
tiny = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "tiny";
- version = "20160811.246";
+ version = "20170903.249";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "tiny";
- rev = "1766056dc768df6c981c301a2e7b8de7305acb73";
- sha256 = "0k3wmp0m4w77q00sk2i30zd23rjlwnj9r66xrl2gw55sapnayh77";
+ rev = "012b2e7a67b9f067bbfa0292479861ffbaa201fa";
+ sha256 = "13hwzq5ip9pb6nmsg3377haz5f45nm96khrwdls07mzni6gay8az";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d3029dab001fff5d12e8a2bace6ddbf897842c26/recipes/tiny";
@@ -71085,36 +69434,15 @@
license = lib.licenses.free;
};
}) {};
- tj-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, tern }:
- melpaBuild {
- pname = "tj-mode";
- version = "20150826.851";
- src = fetchFromGitHub {
- owner = "katspaugh";
- repo = "tj-mode";
- rev = "361f5b0baa90f9d0b3fd92a3d9d557a1224b4308";
- sha256 = "1zvykanmn065rlk9hlv85vary1l6y52bsnaa51fkpckpr6dicmcl";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/1b16dd25c0c1031923717d4fe23bbb9276f75885/recipes/tj-mode";
- sha256 = "1i7dvxgj00p4n2fh8irgdfsjl2dpvfjjnkkv0cw71441f79p79mf";
- name = "tj-mode";
- };
- packageRequires = [ emacs js2-mode tern ];
- meta = {
- homepage = "https://melpa.org/#/tj-mode";
- license = lib.licenses.free;
- };
- }) {};
tldr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "tldr";
- version = "20170702.1859";
+ version = "20171023.1929";
src = fetchFromGitHub {
owner = "kuanyui";
repo = "tldr.el";
- rev = "ebdeb08950823765bf58dc2aba3559a5ad1103f1";
- sha256 = "1aigfmp4ra9qfwyk151y0cxmgd3n42rcjawklfm6ch2g49vx559q";
+ rev = "fe1bd5cee3d30741c816f3ccc118b94105ceba4c";
+ sha256 = "1hdkrgv03w968qf8fm7c35k5pahk9wfwz5vy8xz6568ci1af47h3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/45af2c5d1a36fcbf739812594c5cc878bf319a26/recipes/tldr";
@@ -71151,12 +69479,12 @@
toc-org = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "toc-org";
- version = "20170518.451";
+ version = "20171009.156";
src = fetchFromGitHub {
owner = "snosov1";
repo = "toc-org";
- rev = "5a8a3f9b3a1440eb207a031685b7f4d77ef05b76";
- sha256 = "0cwc7l8vf6x62s7727a6zr099zxgbbgnqkb2y60js6bys2mxqv99";
+ rev = "4d259c9cea3f575e5210974c025ebe3d51cc317f";
+ sha256 = "04y7zib1wpxswkh7srxgh4bq25cpsybpi2aaynrwjms695ggh346";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1305d88eca984a66039444da1ea64f29f1950206/recipes/toc-org";
@@ -71172,12 +69500,12 @@
todotxt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "todotxt";
- version = "20160919.2238";
+ version = "20170919.1141";
src = fetchFromGitHub {
owner = "rpdillon";
repo = "todotxt.el";
- rev = "c0d0e8320ba9284710d46941eaf6847f909b589e";
- sha256 = "08fd5lk1gq9clxhz5i81qm5f0a20yrx49iy13bx1p59gj20f1z41";
+ rev = "afa4079f15f705a4fa34ea8e14b122e73028f285";
+ sha256 = "07rhjxl8kvsjf23kxyl6xj51a2z1r66h4bsdsfj7nncavvybzqn3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/todotxt";
@@ -71400,44 +69728,6 @@
license = lib.licenses.free;
};
}) {};
- tool-bar-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "tool-bar-plus";
- version = "20170307.1542";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/tool-bar+.el";
- sha256 = "09myj10ifjjc43invxbiinskv5xllkqvqfnzmc7893k2hp2miczm";
- name = "tool-bar+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/tool-bar+";
- sha256 = "07nsas600w5kxx7yzg52ax9avry8kq429mqlrs38jg5ycf3b1l6d";
- name = "tool-bar-plus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/tool-bar+";
- license = lib.licenses.free;
- };
- }) {};
- top-mode = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "top-mode";
- version = "20130605.1039";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/top-mode.el?revision=3";
- sha256 = "0a5rl1cgznycqwx4r48mh69lgm8ixbnlfzbqdyvclgm8fldbannn";
- name = "top-mode.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/top-mode";
- sha256 = "0hrjlbiz827v9yf4086wlghw64rhvvlsbzv8lzs6pprdwbpr9pdx";
- name = "top-mode";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/top-mode";
- license = lib.licenses.free;
- };
- }) {};
tornado-template-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "tornado-template-mode";
@@ -71545,12 +69835,12 @@
traad = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, request, request-deferred, virtualenvwrapper }:
melpaBuild {
pname = "traad";
- version = "20170713.2320";
+ version = "20171010.2353";
src = fetchFromGitHub {
owner = "abingham";
repo = "emacs-traad";
- rev = "7a443ad17643060f9b4c2897abe185bb9221e304";
- sha256 = "1n91a8bdrji0kca38bh6jzwjfsg90jqqa47vvazsqk072fjjbnkr";
+ rev = "5ee7a4411fa39601ff59873f1e129fdb64df4e97";
+ sha256 = "0h9hx5jpi0clmrj7sf0srisdp9h5zgakwrs7cyqs3hmw7z4ds5r2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2b3eb31c077fcaff94b74b757c1ce17650333943/recipes/traad";
@@ -71576,8 +69866,8 @@
src = fetchFromGitHub {
owner = "jorgenschaefer";
repo = "circe";
- rev = "47bbcf4268602688f90c08ce64ec93226fc3f894";
- sha256 = "1bi9hc1xcg5zjlzlrjgg3pwkdr9krgsyd5y87z57mxzmpndlxadr";
+ rev = "6b110d4c2c6447c4ed65cfa5b7e8676620081ee2";
+ sha256 = "01llr34y9mvgpbz3y10l7gmp40qvislwhm6jb2fvcb7vdn9k9gmz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/tracking";
@@ -71614,12 +69904,12 @@
tramp-hdfs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "tramp-hdfs";
- version = "20170809.1508";
+ version = "20170821.620";
src = fetchFromGitHub {
owner = "raghavgautam";
repo = "tramp-hdfs";
- rev = "c8eed61e56b06a23ec631ad3c29e61b230a0eda1";
- sha256 = "1k7mzs7mlixlf2v4h3s794b5b4r7pikdkq5b21zwhdmhgqhmrgcn";
+ rev = "b64f24d0419a80dffaa2c4ecec317aa2bba56e35";
+ sha256 = "1bfqzwn19w6fs5npslw0sjqrwdswsv5m3wcdnk438pz1lp199wfy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4c185553314a2a9fe18907fd9251077777b33538/recipes/tramp-hdfs";
@@ -71677,12 +69967,12 @@
transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
melpaBuild {
pname = "transmission";
- version = "20170807.823";
+ version = "20171029.1210";
src = fetchFromGitHub {
owner = "holomorph";
repo = "transmission";
- rev = "b165329a21b9d2693661372f4802208f52029c7a";
- sha256 = "1lksw9nxvaml4ykhr6m8na3dcwk13r1q86hncyk3ybrg5w9663bq";
+ rev = "d78ae51fdc9292cc0b77dfb18279b38b6ccbf480";
+ sha256 = "01k0nppxvkd2cy13hjcvihgh6j9c4by92yxv4jv8zvaz35fqf92n";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission";
@@ -71779,22 +70069,22 @@
license = lib.licenses.free;
};
}) {};
- treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pfuture, s }:
+ treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, pfuture, s }:
melpaBuild {
pname = "treemacs";
- version = "20170812.134";
+ version = "20171103.544";
src = fetchFromGitHub {
owner = "Alexander-Miller";
repo = "treemacs";
- rev = "a984df7da28625704544f9e344bc1653c7b35f87";
- sha256 = "1y6il029nj7s6ik1z92rcxg3vdnny4jx5zbjhqi0i62qrs44r58m";
+ rev = "96228f9e3051f13c14b1bc0799e925053c709965";
+ sha256 = "0y2w215mmv97pj60g42g5v5vadrznvdaifxadm78qplql4015m7b";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs";
- sha256 = "1sg3m9l9l1xww6an2210bghlby5cljw2jxh7q0w8cwmcga7rr4jh";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/486f21e99856a77f470d246f3c71cd32d2e61ad6/recipes/treemacs";
+ sha256 = "07npjnhn9a0b537h1wmvy57bmicd2cji7bslp4wbnrfmmg2jdc3a";
name = "treemacs";
};
- packageRequires = [ ace-window cl-lib dash emacs f pfuture s ];
+ packageRequires = [ ace-window cl-lib dash emacs f hydra pfuture s ];
meta = {
homepage = "https://melpa.org/#/treemacs";
license = lib.licenses.free;
@@ -71803,12 +70093,12 @@
treemacs-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, treemacs }:
melpaBuild {
pname = "treemacs-evil";
- version = "20170625.1401";
+ version = "20170925.2232";
src = fetchFromGitHub {
owner = "Alexander-Miller";
repo = "treemacs";
- rev = "a984df7da28625704544f9e344bc1653c7b35f87";
- sha256 = "1y6il029nj7s6ik1z92rcxg3vdnny4jx5zbjhqi0i62qrs44r58m";
+ rev = "96228f9e3051f13c14b1bc0799e925053c709965";
+ sha256 = "0y2w215mmv97pj60g42g5v5vadrznvdaifxadm78qplql4015m7b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs-evil";
@@ -71821,6 +70111,27 @@
license = lib.licenses.free;
};
}) {};
+ treemacs-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, treemacs }:
+ melpaBuild {
+ pname = "treemacs-projectile";
+ version = "20170903.1235";
+ src = fetchFromGitHub {
+ owner = "Alexander-Miller";
+ repo = "treemacs";
+ rev = "96228f9e3051f13c14b1bc0799e925053c709965";
+ sha256 = "0y2w215mmv97pj60g42g5v5vadrznvdaifxadm78qplql4015m7b";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/b694918c94e6311745776d451aa2519924beef2d/recipes/treemacs-projectile";
+ sha256 = "0y7mq466c9cigyd6imzjnh54aq9kcsikhr7llga5gsclf35fc5ld";
+ name = "treemacs-projectile";
+ };
+ packageRequires = [ projectile treemacs ];
+ meta = {
+ homepage = "https://melpa.org/#/treemacs-projectile";
+ license = lib.licenses.free;
+ };
+ }) {};
treepy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "treepy";
@@ -71863,27 +70174,6 @@
license = lib.licenses.free;
};
}) {};
- tronesque-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "tronesque-theme";
- version = "20150125.241";
- src = fetchFromGitHub {
- owner = "aurelienbottazini";
- repo = "tronesque";
- rev = "42093c08a50c860601c364c8a746c803458c10ba";
- sha256 = "06wm3qwxjhzwjn9nnrqm5wwj1z5gfghg9d2qbg8w3zyqzva5dmvm";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/c7e488c08c56a879d0c20f0e8c271b7179faee8a/recipes/tronesque-theme";
- sha256 = "1bk73zawl1922aq739r3rz30flxd6nq87k8ahzbix139g7gxf19j";
- name = "tronesque-theme";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/tronesque-theme";
- license = lib.licenses.free;
- };
- }) {};
trr = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "trr";
@@ -71950,12 +70240,12 @@
ts-comint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ts-comint";
- version = "20161006.1034";
+ version = "20171105.2247";
src = fetchFromGitHub {
owner = "josteink";
repo = "ts-comint";
- rev = "53e0326149d74ac13850f052dcdae4a070d63480";
- sha256 = "0jrl161lkjdk9appn42g8nybj7sdrpvr0h7c48kj4vvsfmlmrikp";
+ rev = "8817dc7b3a6eb78c3cad42e5677c2113274a1963";
+ sha256 = "17cw9710ib80d626vv6bx6vdjdin78h6pja1lsr4r6mz8c5ihwxj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/84e7004395083b66fce7ff4676af818bc798058a/recipes/ts-comint";
@@ -72032,12 +70322,12 @@
tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "tuareg";
- version = "20170813.1222";
+ version = "20171105.159";
src = fetchFromGitHub {
owner = "ocaml";
repo = "tuareg";
- rev = "94428c76d247e26e35964f68f9991e04f26007e8";
- sha256 = "1q76jv34xm12hn8n362mlh1j44rj020nyc2cy7s30ayk750lklbp";
+ rev = "8dc876c988ce76e3f2e794a68547bd1519b27bcd";
+ sha256 = "1sckf60xkjckh6yz56s44ymavsb4kgxcdc8qaaj4bf32i5a47c5x";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg";
@@ -72137,15 +70427,15 @@
turkish = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "turkish";
- version = "20160324.323";
+ version = "20170910.811";
src = fetchFromGitHub {
owner = "emres";
repo = "turkish-mode";
- rev = "237b696e2f513149f1a77ef58b5ba7d44b6f4661";
- sha256 = "1jb6par116mm5l4z27wk6m2sfh6j9nmgrya352sdagcvjbcpnzcl";
+ rev = "9831a316c176bb21a1b91226323ea4133163e00c";
+ sha256 = "0nrxi845gd24d5vymbmxz696jwld4rn6nw2dz1gzmdaks7bbv87m";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/4c305076082d17db90647577137d76128b15defa/recipes/turkish";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/12cdbdf404fa859a48d1bb69f058321d7595d2a2/recipes/turkish";
sha256 = "0pdapxjbpj3lg3hxvwjn9v51jqaiz7a8053z2bmk4485vzs34532";
name = "turkish";
};
@@ -72305,12 +70595,12 @@
typescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "typescript-mode";
- version = "20170813.1541";
+ version = "20171022.1029";
src = fetchFromGitHub {
owner = "ananthakumaran";
repo = "typescript.el";
- rev = "2c43dd034c156762589f80f7c6163a2bd35b51d0";
- sha256 = "1xyalhrv7d8fa32xsyx044bxcxk7shm44hcjrncghps9w21zfdwm";
+ rev = "56a1ea861f80979d376716629abfce45a8e5e2c7";
+ sha256 = "1lbfia8n2zwg9j8f9y1shjg88zmgr3cz03dk3277yrvh9djs8kcx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d3f534a1e2cee4ad2e32e32802c5080207417b3d/recipes/typescript-mode";
@@ -72323,25 +70613,6 @@
license = lib.licenses.free;
};
}) {};
- typing = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "typing";
- version = "20121026.1418";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/typing.el?revision=13";
- sha256 = "0mgvpdp3vlvjy32d163h2mzsf9j2ij2f542sdr3rsy8l80n6nx31";
- name = "typing.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/1bc0c7b53431a9d2bc41c9a7a755bdad0fa0f5cf/recipes/typing";
- sha256 = "0b72lbzji105wzvsi58l6pjc08qcwrm5ddf42irdxi956081pzp3";
- name = "typing";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/typing";
- license = lib.licenses.free;
- };
- }) {};
typing-game = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "typing-game";
@@ -72387,12 +70658,12 @@
typo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "typo";
- version = "20160121.330";
+ version = "20171005.1045";
src = fetchFromGitHub {
owner = "jorgenschaefer";
repo = "typoel";
- rev = "f7d07cedf90ce65f226a66c428c0788d2bd7b912";
- sha256 = "0bn1bvs334wb64bli9h613zf1vzjyi0pz8bgyq1wy12qmbwwmfwk";
+ rev = "73c8d960e9dcbb77a4ad6166b4685122a0f208ee";
+ sha256 = "1zlnfjav11842am9n043j3hk23134hp92k1pg86jvnsj5mwmp9ij";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/typo";
@@ -72447,25 +70718,6 @@
license = lib.licenses.free;
};
}) {};
- ucs-cmds = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "ucs-cmds";
- version = "20170308.1512";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/ucs-cmds.el?revision=23";
- sha256 = "072swg5iyx9n4xpdm65ydh2z7g11jqi3jjwkhcd7a389lavfqnbw";
- name = "ucs-cmds.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/ucs-cmds";
- sha256 = "1n0f0qf8w8ark78fs67aaxnqpk0km97hy59pnxwfyahgjl2qz6d1";
- name = "ucs-cmds";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/ucs-cmds";
- license = lib.licenses.free;
- };
- }) {};
ucs-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, list-utils, melpaBuild, pcache, persistent-soft }:
melpaBuild {
pname = "ucs-utils";
@@ -72511,12 +70763,12 @@
ujelly-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ujelly-theme";
- version = "20170607.206";
+ version = "20170905.1505";
src = fetchFromGitHub {
owner = "marktran";
repo = "color-theme-ujelly";
- rev = "3f9938f24d053ad21fbbc4773fc786f78a55d522";
- sha256 = "1x1ay6qwgmj9294shi8l7xr6x7sjrpdwrxgdjynzf4wwgl2ydz4p";
+ rev = "d08fe8e01db6df151b38c3001fba239a9a22369a";
+ sha256 = "1a93pd7c2fgdy4vhhwy0lm7plyrwfqa9177m2x5kfblz0q51n6y8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/ujelly-theme";
@@ -72550,25 +70802,6 @@
license = lib.licenses.free;
};
}) {};
- unbound = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "unbound";
- version = "20160505.2355";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/unbound.el?revision=11";
- sha256 = "0awmzz9cfr17ggpzsgxqqhz5946l7705vvkfaiz7qx9wg0pbch18";
- name = "unbound.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/118e8df30e4caf2a5ef668af8970cfbfc2327004/recipes/unbound";
- sha256 = "1ys6pgb3lhx4ihhv8i28vrchp1ad37md7lnana40macf5n72d77x";
- name = "unbound";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/unbound";
- license = lib.licenses.free;
- };
- }) {};
uncrustify-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "uncrustify-mode";
@@ -72701,8 +70934,8 @@
src = fetchFromGitHub {
owner = "purcell";
repo = "unfill";
- rev = "d1056ec5ce7bb18abe8933c1e4d5932fb98fb78e";
- sha256 = "0qbcm7qf33xlbj7wx3164q8m6b8qzgv6w13pk8568nrmb1f8qna8";
+ rev = "df0c4dee19a3874b11c7c7f04e8a2fba629fda9b";
+ sha256 = "0bdlr8kqzwzi7aggcn7cwwih19585wi6dd9lvwj4i966zr4w84yx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2ade389a20419b3e29a613409ac73a16b7c5bddb/recipes/unfill";
@@ -72918,12 +71151,12 @@
unify-opening = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "unify-opening";
- version = "20170215.657";
+ version = "20171011.201";
src = fetchFromGitHub {
owner = "DamienCassou";
repo = "unify-opening";
- rev = "2f0164328b9234c9083758349103be873cb65af8";
- sha256 = "0d7advfxfnx0v2y292fq4ynqm7ial6p0x7mh28l511b8b4qgpjgv";
+ rev = "fbe53b56e9629143a73c5da9e7797579508e0fbf";
+ sha256 = "0hr65nrywa9yijqymw902q02adyczbwzam2ahv8m2wzay5pcwg8a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0a2faab13744262ef4d12750f70b300b3afd2835/recipes/unify-opening";
@@ -73044,12 +71277,12 @@
uptimes = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "uptimes";
- version = "20170802.426";
+ version = "20170830.533";
src = fetchFromGitHub {
owner = "davep";
repo = "uptimes.el";
- rev = "c1e45ea728e5eaedea3e7974256fcfbcd20970f5";
- sha256 = "15qcii1cs7kyzn44b6np7lxflrszbf3n1wr7vhid6l71cnfgbz86";
+ rev = "c2c1b44b16a0fd873193b17c580ef3dfdacea580";
+ sha256 = "1rq4m77fydkawdwkbw8125ihmvv6aisr03nwb1857k3hxhrg0gwv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/72099e35ce3e34ec6afc6a3f87a4da07ec91499a/recipes/uptimes";
@@ -73104,34 +71337,15 @@
license = lib.licenses.free;
};
}) {};
- usage-memo = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "usage-memo";
- version = "20110722.851";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/usage-memo.el?revision=12";
- sha256 = "00g1zj5fjykdi6gh2wkswpwx132xa6jmwfnrgfg5r96zwb8pib4i";
- name = "usage-memo.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/ae8f3adf42300fc0d8f0c5474edf839614d84978/recipes/usage-memo";
- sha256 = "05n50adjnavl7ag24wfjwlnbv5x55qlhmplgsm8j57gjig01nd95";
- name = "usage-memo";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/usage-memo";
- license = lib.licenses.free;
- };
- }) {};
use-package = callPackage ({ bind-key, diminish, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "use-package";
- version = "20170812.2256";
+ version = "20171030.1428";
src = fetchFromGitHub {
owner = "jwiegley";
repo = "use-package";
- rev = "360df30683a711c443f87e495ba14cdd125a505d";
- sha256 = "0nz0gk6gf9060hbyqr5vgzwr620k6l5sk9n6jbhfyrwmcscnmilc";
+ rev = "82d15961a0f2dc7842a98030d6daee0061ef63dc";
+ sha256 = "0i9cqms0bm6vfn8mzkzv40dql2mzmp2jma1na6m8bf1z2ciszy6l";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3f9b52790e2a0bd579c24004873df5384e2ba549/recipes/use-package";
@@ -73228,27 +71442,6 @@
license = lib.licenses.free;
};
}) {};
- uzumaki = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "uzumaki";
- version = "20150119.1706";
- src = fetchFromGitHub {
- owner = "geyslan";
- repo = "uzumaki";
- rev = "afae141588ef9407ff86ce1ae9a0f1860843c4a4";
- sha256 = "0fx18m688wfflbzwv8h3051439fwql69v1ip5q6xn958rdq4pi3x";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/6d63f9408e3bb581a47c8ab1f729f9ee087933d6/recipes/uzumaki";
- sha256 = "1fvhzz2qpyc819rjvzyf42jmb70hlg7a9ybqwi81w7rydpabg61q";
- name = "uzumaki";
- };
- packageRequires = [ cl-lib ];
- meta = {
- homepage = "https://melpa.org/#/uzumaki";
- license = lib.licenses.free;
- };
- }) {};
v2ex-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, request }:
melpaBuild {
pname = "v2ex-mode";
@@ -73420,12 +71613,12 @@
vc-darcs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "vc-darcs";
- version = "20170409.623";
+ version = "20170904.2020";
src = fetchFromGitHub {
owner = "velkyel";
repo = "vc-darcs";
- rev = "9c5cbf6fd9b624a31e918dd1a516b24d8b7ffe9d";
- sha256 = "0g26hyjblxldqr5hhijqaclmk1p6a1kc5yh3hkflw6y7lgcrqxkx";
+ rev = "390fb1ebdda1ffac45b9be02626dde3b6d95ac11";
+ sha256 = "1fcqkavc7hlbhswx5nnaqhash42cjsbr72ijznx5cplr582g3mfq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/54f89c50ae45365e86bdadcf67b2411c0f4c5603/recipes/vc-darcs";
@@ -73441,16 +71634,16 @@
vc-fossil = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "vc-fossil";
- version = "20161030.842";
+ version = "20171018.2216";
src = fetchFromGitHub {
- owner = "emacsorphanage";
- repo = "vc-fossil";
- rev = "066a1c591c18102d199407e303ccdd0dd8c26be9";
- sha256 = "1z42y04h4649i1hn3lc0ydkmaps39357jy25hlcy07x5nxpklvxf";
+ owner = "venks1";
+ repo = "emacs-fossil";
+ rev = "abdb5487831e641c291c0dcb3848f539ca11f400";
+ sha256 = "024bf8cjf3srz0zrxk90c63yz9v525m83znb2fscwa1fwvnnpqkn";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/5c8f2a79d6ad9cac527db2d08f3ee6aa199152d1/recipes/vc-fossil";
- sha256 = "0fym5wnig3bdkj86x0n7milcxh3fbigpx42827aim6bm3ry7a081";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/31c5ee4b625b90c1af66d7d11a25af8e1aa307b1/recipes/vc-fossil";
+ sha256 = "11ps2wrkjrjm1d984mf80wwj1hzskw5qrn0nv7md21lp75kxsvxb";
name = "vc-fossil";
};
packageRequires = [];
@@ -73714,12 +71907,12 @@
vhdl-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, ggtags, helm, lib, melpaBuild, outshine }:
melpaBuild {
pname = "vhdl-tools";
- version = "20170701.1603";
+ version = "20171103.1356";
src = fetchFromGitHub {
owner = "csantosb";
repo = "vhdl-tools";
- rev = "c08343904835cbae12f48e0758b0a6a014d76a74";
- sha256 = "1skh9p5s9nbl6jvljj9bfn19fdzjx8lvx1q6rzldld07xwaif4qb";
+ rev = "ffd9342ee0d03f14c5bb459583a13c5181b232f1";
+ sha256 = "10jvi88sk7ai6bhgxsm3d0hf1asi3xknyw2ms9k0z7r6d7fkryaf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/69fe2f8fb98ac1af1d3185f62ae1c89e646cfebf/recipes/vhdl-tools";
@@ -73837,27 +72030,6 @@
license = lib.licenses.free;
};
}) {};
- vimgolf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "vimgolf";
- version = "20170323.600";
- src = fetchFromGitHub {
- owner = "timvisher";
- repo = "vimgolf.el";
- rev = "741e414ec24072af05471058a5719271bfcfe766";
- sha256 = "0fs0gimry8xzydh7m305j86h1rq7qivsda19ah48sxbxks6xq5ax";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/50dc1c26cb848986dda3c930c8d9b421cd3b1d17/recipes/vimgolf";
- sha256 = "15xq5vm82hy4pjw04m7xcqav7azsb3c65lp8cfxa29z7xg81w62f";
- name = "vimgolf";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/vimgolf";
- license = lib.licenses.free;
- };
- }) {};
vimish-fold = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "vimish-fold";
@@ -73882,12 +72054,12 @@
vimrc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "vimrc-mode";
- version = "20150607.913";
+ version = "20170814.1837";
src = fetchFromGitHub {
owner = "mcandre";
repo = "vimrc-mode";
- rev = "fae7604e5ea6eef104d8c68598c3bbf9d798aa74";
- sha256 = "02yhagnrq0zl19w7fh559fs6vm6b383k1r27alvixjfcm18p0fpg";
+ rev = "ba8140fba6e03a35b123acbd62fc8c6f0a03bf4a";
+ sha256 = "07pwmjaa24hh20bcanmxgnaf050c0j6190i0qfvpd0gpc4p80pxx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/vimrc-mode";
@@ -73924,12 +72096,12 @@
virtualenvwrapper = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "virtualenvwrapper";
- version = "20161002.1515";
+ version = "20171022.1831";
src = fetchFromGitHub {
owner = "porterjamesj";
repo = "virtualenvwrapper.el";
- rev = "5649028ea0c049cb7dfa2105285dee9c00d189fb";
- sha256 = "1xcjjs394vlaz94xh52kqaq94gkbmmjqmxlg7wly8vfn9vh34mws";
+ rev = "b4fd61aa5fddd47d33b147ffa1c873d8b20db724";
+ sha256 = "04qhxg2gghb9bbvabrjbwj89jl154hhk00s07mzgg93js75ipx6z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/virtualenvwrapper";
@@ -74071,12 +72243,12 @@
vlf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "vlf";
- version = "20170713.1652";
+ version = "20170830.1148";
src = fetchFromGitHub {
owner = "m00natic";
repo = "vlfi";
- rev = "b62bc046128df83c816a9b199ab5b4a7fcf93837";
- sha256 = "1gbl08dh172fv8xc0b737cybm3bac5hlm37f50qp0xk4kdbfv2sh";
+ rev = "df677c128f8abc764b51d2a0ed26071618e686de";
+ sha256 = "1fx2ngjh3y69ynih328jiy8132z9y7q7s91rzw8mgpf3hnfmaqly";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9116b11eb513dd9e1dc9542d274dd60f183b24c4/recipes/vlf";
@@ -74089,25 +72261,6 @@
license = lib.licenses.free;
};
}) {};
- vline = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "vline";
- version = "20120108.445";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/vline.el?revision=17";
- sha256 = "1ys6928fgk8mswa4gv10cxggir8acck27g78cw1z3pdz5gakbgnj";
- name = "vline.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/aa860c2ccbaeb19d8b866919cdc45549d9cf9537/recipes/vline";
- sha256 = "0p59xhyrv7fmcn3qi51sp8v9v2y71ray2s756zbhzgzg63h3nbjp";
- name = "vline";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/vline";
- license = lib.licenses.free;
- };
- }) {};
vmd-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "vmd-mode";
@@ -74195,12 +72348,12 @@
vue-html-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "vue-html-mode";
- version = "20170804.1723";
+ version = "20170928.1057";
src = fetchFromGitHub {
owner = "AdamNiederer";
repo = "vue-html-mode";
- rev = "cd76195b2bda28d247a79124334ffcc5124676cb";
- sha256 = "1flnn6gz5ihkdw6p3pkllqcd1v7j89hc225izv8x5v2i5biyndsv";
+ rev = "9218c61ff1ab2bdc6a6711d21ad760198d3511a8";
+ sha256 = "1xpbr2fajn0nk53abb2x9m0qs0ygxfl62gdxd2iqfcwj56fswj9y";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/48588b163ab76204b9054340071e758045480e19/recipes/vue-html-mode";
@@ -74213,22 +72366,22 @@
license = lib.licenses.free;
};
}) {};
- vue-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode, ssass-mode, vue-html-mode }:
+ vue-mode = callPackage ({ edit-indirect, fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode, ssass-mode, vue-html-mode }:
melpaBuild {
pname = "vue-mode";
- version = "20170712.930";
+ version = "20171029.1905";
src = fetchFromGitHub {
owner = "CodeFalling";
repo = "vue-mode";
- rev = "3a3eab579361351b78a87bb5710d3bbfe351b993";
- sha256 = "1b72vpg53whq3h85ck3c9if8km2rlzf8bvxkkv0j6zm66rvph0j3";
+ rev = "a34f8a14fe6a680bb18cfa4519f7984d8071a4e3";
+ sha256 = "08c3sgd80aszfpc4zbh0rsn7717nwwjhr38lfbsbxmgmlvqalxzk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2e5e0a9fff332aeec09f6d3d758e2b67dfdf8397/recipes/vue-mode";
sha256 = "0gy7a5sliaijq0666l55vbkg15anrw7k1828szdn1ppkraw14bn0";
name = "vue-mode";
};
- packageRequires = [ mmm-mode ssass-mode vue-html-mode ];
+ packageRequires = [ edit-indirect mmm-mode ssass-mode vue-html-mode ];
meta = {
homepage = "https://melpa.org/#/vue-mode";
license = lib.licenses.free;
@@ -74255,37 +72408,19 @@
license = lib.licenses.free;
};
}) {};
- w32browser-dlgopen = callPackage ({ fetchurl, lib, melpaBuild }:
+ w3m = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
- pname = "w32browser-dlgopen";
- version = "20170309.1433";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/w32browser-dlgopen.el?revision=25";
- sha256 = "1fkkrqwhkg58jjjsjf0fzwabaaxarjylp22zng1id6hqfsm7r1cd";
- name = "w32browser-dlgopen.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/w32browser-dlgopen";
- sha256 = "0dnvsnahnbnvjlhfmb0q6agzikv9d42fbnfrwsz6hni92937gz39";
- name = "w32browser-dlgopen";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/w32browser-dlgopen";
- license = lib.licenses.free;
- };
- }) {};
- w3m = callPackage ({ fetchcvs, fetchurl, lib, melpaBuild }: melpaBuild {
pname = "w3m";
- version = "20170503.1331";
- src = fetchcvs {
- cvsRoot = ":pserver:anonymous@cvs.namazu.org:/storage/cvsroot";
- module = "emacs-w3m";
- sha256 = "6ef1dd834a16cf3b8a0ec7a7412ae7410f0392d616eb3329f78011039384fc6d";
+ version = "20171019.1734";
+ src = fetchFromGitHub {
+ owner = "emacsorphanage";
+ repo = "w3m";
+ rev = "e2e2c907f4fa575bec74803aab95af426cb37e6e";
+ sha256 = "13lzj1h6ib779fszmvlz3wamnjibivdrxl8hd5l3xhh7fkgbc8c8";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/8bbb18b0db057b9cca78ae7280674fd1beb56443/recipes/w3m";
- sha256 = "17mzs126fvlnsvxgfpbil9wmka0i87psblq49phky7dywcwz27lc";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/w3m";
+ sha256 = "0a4jql7ky62ickccbr2xnyggix5wf726d4pfz7mi3yxlw6i8m79s";
name = "w3m";
};
packageRequires = [];
@@ -74380,12 +72515,12 @@
wand = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "wand";
- version = "20170412.1315";
+ version = "20171103.513";
src = fetchFromGitHub {
owner = "cmpitg";
repo = "wand";
- rev = "3674f2edaa6ac30c314a885b229204f978ddce14";
- sha256 = "1yylw7yn9k8li283d5r4x9i38wfdx24jmlzdivvffn0jkhjj6i4k";
+ rev = "83c0c723dae7d8a37e67a9d9f2d00e005b5486ca";
+ sha256 = "0wc1gmaz02bfbapwrmmc5r7rcfwqlfr52x3jqk6bhxpiav141yq4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/38be840bbb32094b753ec169b717a70817006655/recipes/wand";
@@ -74422,12 +72557,12 @@
wanderlust = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, semi }:
melpaBuild {
pname = "wanderlust";
- version = "20170627.2306";
+ version = "20171019.550";
src = fetchFromGitHub {
owner = "wanderlust";
repo = "wanderlust";
- rev = "770d54fafb1a0a140b449e6132db22e70b4d6aa9";
- sha256 = "1f6h5n42fwwby880wikh8fdlk2zqimkl7wdb8wvr5kq1nqfqpz3f";
+ rev = "15a8ca7a28d086066d148ca8bfbd454e32cc5f77";
+ sha256 = "1a7xm3x8zyax6crrj8fj932yicwds12774znv991yggjzw5kcwcd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/426172b72026d1adeb1bf3fcc6b0407875047333/recipes/wanderlust";
@@ -74653,12 +72788,12 @@
web-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "web-mode";
- version = "20170807.903";
+ version = "20171017.1214";
src = fetchFromGitHub {
owner = "fxbois";
repo = "web-mode";
- rev = "448c197fd78178bcf3e744c90b85a08f07bae3a0";
- sha256 = "0vmh9cqhcw32qliqrlmkb9jwhi3m4iy5x5a96sk3f75zx14ryjr8";
+ rev = "4754211f44e9fe1389e4378553ad538460282225";
+ sha256 = "0c1p8srr1zacpp697rwy83rjz51yhgff9w1sb4cv9wi5yzfsic56";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode";
@@ -74713,6 +72848,27 @@
license = lib.licenses.free;
};
}) {};
+ web-search = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "web-search";
+ version = "20170911.1246";
+ src = fetchFromGitHub {
+ owner = "xuchunyang";
+ repo = "web-search.el";
+ rev = "410c490ecf82a3693db3eb62003302233471ff84";
+ sha256 = "0hib0ffwikdydkm5asmvzj6l49pd9694psnn2c010j3ixw6i8gsl";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/503ef2042cc14dbe53e7121b8d0b5ccbdf6c882b/recipes/web-search";
+ sha256 = "08iflbp6rmsxsy2lahsdjj9ki70ixqhsas0vxzawz5pi5vk2x9gj";
+ name = "web-search";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/web-search";
+ license = lib.licenses.free;
+ };
+ }) {};
web-server = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "web-server";
@@ -74758,12 +72914,12 @@
webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
melpaBuild {
pname = "webpaste";
- version = "20170612.1352";
+ version = "20171025.956";
src = fetchFromGitHub {
owner = "etu";
repo = "webpaste.el";
- rev = "655a364fb1a6c9f3d49a0bbaf338bbf492b5b4d1";
- sha256 = "11dqcch0fcxkqnnfzk9hxmimxckimpj74fz7rx3b7bvkmrh9snyy";
+ rev = "f047313c656e0ea85033bacc564d02ae6f4605ff";
+ sha256 = "00mawa0n415dcnrldqmgwwjcj2rv59wblrbzkc2g9i388nl41rp5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/13847d91c1780783e516943adee8a3530c757e17/recipes/webpaste";
@@ -74776,22 +72932,22 @@
license = lib.licenses.free;
};
}) {};
- websocket = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ websocket = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "websocket";
- version = "20170610.2117";
+ version = "20170829.457";
src = fetchFromGitHub {
owner = "ahyatt";
repo = "emacs-websocket";
- rev = "ccbe93ac8b5858a85686b83642fbd6e828a47deb";
- sha256 = "18aw5pmvz91gv9wlmna1i5sli6z3f6dqk0bc4wkc15zbsi1dmdlw";
+ rev = "33d0406901f7306b326928190b6ad94247d01a5f";
+ sha256 = "0lw7s121jfqaqrl3b2w9jbx3adh3nq0mkh911c40s4ydxm6xcnk3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/websocket";
sha256 = "1v8jlpahp30lihz7mdznwl6pyrbsdbqznli2wb5gfblnlxil04lg";
name = "websocket";
};
- packageRequires = [];
+ packageRequires = [ cl-lib ];
meta = {
homepage = "https://melpa.org/#/websocket";
license = lib.licenses.free;
@@ -74825,8 +72981,8 @@
src = fetchFromGitHub {
owner = "the-kenny";
repo = "weechat.el";
- rev = "a0d81074088d313dd596af6602e51d4253a55ca5";
- sha256 = "08ibyabvdlmp74xa950al3axmzsqpcal30313ab5wgb746sh3dvm";
+ rev = "2edf75a8405680ba94528864668b226102dd37c5";
+ sha256 = "14p8q2bjpgka3mdfphllz13kp6l85aghn2l64fwbcpy0i4xgicbg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e38255a31a4ca31541c97a506a55f82e2670abe6/recipes/weechat";
@@ -75010,12 +73166,12 @@
which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "which-key";
- version = "20170530.526";
+ version = "20170817.1107";
src = fetchFromGitHub {
owner = "justbur";
repo = "emacs-which-key";
- rev = "3144b4c1fc774b63fc2350a0171e8ef01ab63298";
- sha256 = "1fyg4b5ngf4k30x9rb5n62w2y9awc1lasrszxp9bg6ydmigncans";
+ rev = "6d2e17c949ff7bfebfe0b0878a93d94b31585031";
+ sha256 = "03szbjp6j6rjj43k3vs2jay4y7bnhhh1ymgqv8vvdnqsf88pdg88";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key";
@@ -75098,8 +73254,8 @@
src = fetchFromGitHub {
owner = "purcell";
repo = "whitespace-cleanup-mode";
- rev = "d375bfb61cb70947a93004cba8ea17a0bc76f5a9";
- sha256 = "0w6jwg1lyz0hwkhbx3kx6yddakff6azj2ipyxw26rv886gx8a226";
+ rev = "6d0a35159ee04ef9f3b1a80c548f545643ddb397";
+ sha256 = "0pqvrhws49aqyfp25kcrk9q7ib0ckx9gi6avzmymnpxy9aicnb3r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b461cfe450d7ce6bd0c14be3460cacffc1a32e6f/recipes/whitespace-cleanup-mode";
@@ -75115,12 +73271,12 @@
whizzml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "whizzml-mode";
- version = "20170525.818";
+ version = "20171015.938";
src = fetchFromGitHub {
owner = "whizzml";
repo = "whizzml-mode";
- rev = "92986cbb260642c129b049950036b2b6698a8bd9";
- sha256 = "01mxjyan8bbjxl055f8zbsydsn01iszk3qi3668aa6i1m3vsz60h";
+ rev = "9060fdce07c137abc2c494cb72641b9b9d6fbe22";
+ sha256 = "10yi3n6pyqirlzxdkv7nvp0d0n1fkjrgwhn0kp5i27dnp3fi0i2b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/11f26b15c326c3b8541bac510579b32493916042/recipes/whizzml-mode";
@@ -75136,12 +73292,12 @@
whole-line-or-region = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "whole-line-or-region";
- version = "20170814.20";
+ version = "20170815.212";
src = fetchFromGitHub {
owner = "purcell";
repo = "whole-line-or-region";
- rev = "ef89af99009229af20a0a2f6c277138d92ed7085";
- sha256 = "0by8lfkpzpmms57fj9mjimxmg3an9q7iyl3nghzdfhcngp0bprvy";
+ rev = "1220974153b7eaca5192ed87f86182d121e228e4";
+ sha256 = "1n44nn0zkk55cnwlincv5i8s36nymnh3bm6jd85h6m97jssxd85l";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/whole-line-or-region";
@@ -75154,34 +73310,15 @@
license = lib.licenses.free;
};
}) {};
- wid-edit-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "wid-edit-plus";
- version = "20170309.1434";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/wid-edit+.el";
- sha256 = "0w2hjahcq68inabjbdyh3a0wcxd6pdgsp81iqcikxzfvwpzm35a9";
- name = "wid-edit+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/wid-edit+";
- sha256 = "1wwrsk14hc0wrvy7hm94aw6zg50n2smlqwr6frwpi7yp8y394wiv";
- name = "wid-edit-plus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/wid-edit+";
- license = lib.licenses.free;
- };
- }) {};
wide-column = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "wide-column";
- version = "20120814.112";
+ version = "20170925.913";
src = fetchFromGitHub {
owner = "phillord";
repo = "wide-column";
- rev = "0b382e7a3ceecafcea6c9e7e742fb6d11641b04b";
- sha256 = "0bq39sfipad16skh5q26gp7z24kk93hgnaxb378dzfq1306kmn8q";
+ rev = "ce9ef4675485a7bea381077866368ef875226b10";
+ sha256 = "0qh8hy4jl59bfg4323a8h4q4a78gn4hsglfk2h23hqssbv4mhsp2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8d29def44ae42dc4b60c1d254a57572bd09faf51/recipes/wide-column";
@@ -75222,8 +73359,8 @@
src = fetchFromGitHub {
owner = "foretagsplatsen";
repo = "emacs-js";
- rev = "caa51fb2a48d79609bbbd3a012e149e4998a98c4";
- sha256 = "0pky2xi1h3kzi0pykd5c568rhpq6bq2z2pknzw75rnd0h5j4sj59";
+ rev = "b05d584a4b3e0db168c3b920ce4a270b3908d842";
+ sha256 = "0shgxd08da8a7ij37k5ybmvyqbqzq4nqxdyfbbpgnh1vgw61gr6c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/78d7a15152f45a193384741fa00d0649c4bba91e/recipes/widgetjs";
@@ -75299,25 +73436,6 @@
license = lib.licenses.free;
};
}) {};
- wimpy-del = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "wimpy-del";
- version = "20170309.1436";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/wimpy-del.el?revision=26";
- sha256 = "0impy9kp1xnhs0834azzndx93p8q53dxdqd9hz0n1mg0h8331c13";
- name = "wimpy-del.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/wimpy-del";
- sha256 = "10qw5lfq2392fr5sdz5a9bc6rvsg0j4dkrwvdhip1kqvajznw49x";
- name = "wimpy-del";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/wimpy-del";
- license = lib.licenses.free;
- };
- }) {};
win-switch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "win-switch";
@@ -75465,34 +73583,15 @@
license = lib.licenses.free;
};
}) {};
- window-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "window-plus";
- version = "20170309.1437";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/window+.el";
- sha256 = "1l6fwrd2f58xpf7cprp354bq2fz0hvl9bz73hrbrzyqvnd9kix61";
- name = "window+.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/window+";
- sha256 = "0fhzb0ay9g9qgcaxpb2qaw15dh0lfmv3x4akyipi3zx11446d06j";
- name = "window-plus";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/window+";
- license = lib.licenses.free;
- };
- }) {};
window-purpose = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, imenu-list, let-alist, lib, melpaBuild }:
melpaBuild {
pname = "window-purpose";
- version = "20170722.655";
+ version = "20171018.821";
src = fetchFromGitHub {
owner = "bmag";
repo = "emacs-purpose";
- rev = "00ddafcf4802e7430ca709769b888656a6eb421b";
- sha256 = "1c3jf1cxfvja1v323wkxkd67n9nwzb57c79x4m010h2700xim8vs";
+ rev = "2b8059256a90caf578ca5ba62205ca7f0d67a740";
+ sha256 = "1pv5sjsvm3xmhfbf0j2581ifp7yykgzhd8bml9cav242r1m2dnh7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5813120ab674f6db7d0a486433d8faa6cfec1727/recipes/window-purpose";
@@ -75529,12 +73628,12 @@
windwow = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "windwow";
- version = "20170803.1748";
+ version = "20170815.1848";
src = fetchFromGitHub {
owner = "vijumathew";
repo = "windwow";
- rev = "717190e22aeb28130ce2a52470b7fb26b180e8dd";
- sha256 = "0n2b2jaaqwc8z8rmfc7rqnk2sf875gp3xyjfgayvq7ya9c9bnv7g";
+ rev = "77bad26f651744b68d31b389389147014d250f23";
+ sha256 = "0vbmmf8wm76k389g5ncs0grwlpwp3glpwvhdi5dfxaqcp2phaaad";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/12aba18872021ce0affa96c46a17353c7d073ca2/recipes/windwow";
@@ -75547,6 +73646,27 @@
license = lib.licenses.free;
};
}) {};
+ winnow = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "winnow";
+ version = "20170903.506";
+ src = fetchFromGitHub {
+ owner = "dgtized";
+ repo = "winnow.el";
+ rev = "18cb6b94338f3b7b4f2cd0331dad22f82dd9e0d3";
+ sha256 = "1wp00zxxcibvl6vjwmvhkgcbi76dyb2g8c30wy4kp7876cpc8hgv";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/58891c2057ec834f999e3bf82af15e0617a4d4cf/recipes/winnow";
+ sha256 = "07kwjdmvzgvg7gc53dv10jfi212m0pimzrhiga38lrqrnrw631m0";
+ name = "winnow";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/winnow";
+ license = lib.licenses.free;
+ };
+ }) {};
winpoint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "winpoint";
@@ -75589,22 +73709,22 @@
license = lib.licenses.free;
};
}) {};
- winum = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ winum = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "winum";
- version = "20170430.1629";
+ version = "20171028.702";
src = fetchFromGitHub {
owner = "deb0ch";
repo = "emacs-winum";
- rev = "e950370d82cbb90ba291fc1c32de5d6f35068932";
- sha256 = "1p4b9gdrifjndk0irv735f8spy541x78chibdnr1i3qil2ib8xms";
+ rev = "c56d1cdb8d1723eb4c0d7a7eb3ecd2697739146c";
+ sha256 = "09jd5srlnd4060hs719qil84ssmnvq196bz7ywaswgapv1gs1h6r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c1caa7a54a910a44322fdee300e8cce6ddcde071/recipes/winum";
sha256 = "0yyvjmvqif6glh9ri6049nxcmgib9mxdhy6816kjhsaqr570f9pw";
name = "winum";
};
- packageRequires = [ cl-lib ];
+ packageRequires = [ cl-lib dash ];
meta = {
homepage = "https://melpa.org/#/winum";
license = lib.licenses.free;
@@ -75616,8 +73736,8 @@
version = "20160419.1232";
src = fetchhg {
url = "https://bitbucket.com/ArneBab/wisp";
- rev = "70b4ccc031bc";
- sha256 = "1mbypvclk83lhwvdy6ancl4j9nysv47s8yp6baa8pi54zlc9w3i1";
+ rev = "7633b2a5133f";
+ sha256 = "0j6j9wkmq95dhx5cr3z2gpx5mvsqsgissp2060ij252ijc3l9k4a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode";
@@ -75654,12 +73774,12 @@
with-editor = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "with-editor";
- version = "20170803.917";
+ version = "20171006.352";
src = fetchFromGitHub {
owner = "magit";
repo = "with-editor";
- rev = "4d3d50b09dee3305a365d7eb005313d42dddd6ea";
- sha256 = "11416ic4nf04fgd7947lxfc4c8g6lb4r2ickr5mydqw4wqzanqi9";
+ rev = "ee39f232f2daf997498a4030d104c35ae397f457";
+ sha256 = "17m5b7g5sdh0iy6lpj2inv9akscyw83nyx9hl71disdk7diq15hn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor";
@@ -75696,12 +73816,12 @@
with-simulated-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }:
melpaBuild {
pname = "with-simulated-input";
- version = "20170810.1158";
+ version = "20170820.2317";
src = fetchFromGitHub {
owner = "DarwinAwardWinner";
repo = "with-simulated-input";
- rev = "5a0d3f039965667c6a8d36bd2cbfbd9c22299033";
- sha256 = "16dx6fzla7jzjxv7yzn8b9qwj2ja17x02rxzglyrg9mf4kd1y9yp";
+ rev = "af9a38ce28a741e6d8742750bef5d7b5afa13796";
+ sha256 = "0iann7zi9bgd3vmvxvg2n6x24hkyzbchbli1ymsmfrn8rif9byf7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e4ddf16e19f5018106a423327ddc7e7499cf9248/recipes/with-simulated-input";
@@ -75756,27 +73876,6 @@
license = lib.licenses.free;
};
}) {};
- wolfram-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "wolfram-mode";
- version = "20170221.120";
- src = fetchFromGitHub {
- owner = "kawabata";
- repo = "wolfram-mode";
- rev = "d27a0f23791abde2bdda22e50108b99f11c13ed7";
- sha256 = "0r82h3x1ggirgd0a03qr71pdcxgkc4s3307ggwy86j4asd308m79";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/299fe35d0a5a11d20f0b917bc8f406bd0f011c93/recipes/wolfram-mode";
- sha256 = "1bq95lamzz45macpklnq1kxw9ak4x4f41kx16f472dn650ff0zlf";
- name = "wolfram-mode";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/wolfram-mode";
- license = lib.licenses.free;
- };
- }) {};
wonderland = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, multi }:
melpaBuild {
pname = "wonderland";
@@ -75843,16 +73942,16 @@
wordsmith-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "wordsmith-mode";
- version = "20151117.236";
+ version = "20171025.730";
src = fetchFromGitHub {
owner = "istib";
repo = "wordsmith-mode";
- rev = "597e1e7c7ef89b06ed8280251ecd8f40ce55e1bf";
- sha256 = "0d2byl3si2r0zh5ih6xpsgcd9r114ry0lzg5vcf31rr2gqf0j06h";
+ rev = "589a97412138145bea70e0450eeddeb7f138d538";
+ sha256 = "1zm4grysjpynibldvic75awhcmmnjmlkkvslw8bvirmi58qwvwzj";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/d9f8f01f1807de24fb6e92b355d05b81be4bab07/recipes/wordsmith-mode";
- sha256 = "1570h1sjjaks6bnhd4xrbx6nna4v7hz6dmrzwjq37rwvallasg1n";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/3b5fda506e5b388cd6824d433b89032ed46858dc/recipes/wordsmith-mode";
+ sha256 = "0s6b6dfqn31jdcgs2mlmvwgpr5a4zs4xi8m002ly11c6sn035xb1";
name = "wordsmith-mode";
};
packageRequires = [];
@@ -75864,12 +73963,12 @@
worf = callPackage ({ ace-link, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, swiper, zoutline }:
melpaBuild {
pname = "worf";
- version = "20170724.1132";
+ version = "20171002.1118";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "worf";
- rev = "e66659923bd53be40a0f0ee1d7fe8a14d22f6973";
- sha256 = "155sz3hl2ly9m4i8nr2bxham5vzpa2bi9cvgna35gbkp1d34mm41";
+ rev = "cf2f382b368bcb3c8ba4785a7fac8ee9300e80b5";
+ sha256 = "0rnvmwdks8m4f6dwnyinv9rli58mlvlnrg7swpdjfh0g3bqgr7w5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f00f8765e35c21dd1a4b5c01c239ed4d15170ab7/recipes/worf";
@@ -75973,8 +74072,8 @@
src = fetchFromGitHub {
owner = "rejeep";
repo = "wrap-region.el";
- rev = "0eff3165db36464d28ed303ab25b715307cbdee0";
- sha256 = "09fzbbrdgq19c3gylj4i0c5g070k65w943wz28mzis8b403vzh3n";
+ rev = "fbae9b0f106187af19823f1a6260b5c68b7252e6";
+ sha256 = "1k5q925igdv5lnpbmy0c2f0j3rj7yh4l6bxbd61g9lcnyl0j3ym9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/wrap-region";
@@ -75990,12 +74089,12 @@
writegood-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "writegood-mode";
- version = "20160802.1405";
+ version = "20170925.647";
src = fetchFromGitHub {
owner = "bnbeckwith";
repo = "writegood-mode";
- rev = "a99896531a260db11acb931b68dbdc45030832d7";
- sha256 = "15g133ql8mgjchm6h255q77b6rks843lzva44kgjmfgwmgbfmc1b";
+ rev = "416453af5a44da52646052fa2ee3a63acfd7bf8a";
+ sha256 = "08z35gc3j25h02jmlkzsis4n7a6sy6zy2qykcnp8b3s8y51d0dg0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/75c5a4304999fc3f5a02235a1c2c904238d2ce4f/recipes/writegood-mode";
@@ -76176,6 +74275,27 @@
license = lib.licenses.free;
};
}) {};
+ x509-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "x509-mode";
+ version = "20170909.632";
+ src = fetchFromGitHub {
+ owner = "jobbflykt";
+ repo = "x509-mode";
+ rev = "240b5045dcce18190bdabd91d74f48d3610a6fe2";
+ sha256 = "0pi5hi0n6f2hif5hz1g04rk509rb4jlw6nrlhc8fg5k6x4n7ci3p";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/27145423eb4e68e006ef96868a35b99d119a3099/recipes/x509-mode";
+ sha256 = "15k3pxj3a2vaf64cl2xrzzlvzbqzqc29qyfd8brhq6yc69snr0vj";
+ name = "x509-mode";
+ };
+ packageRequires = [ cl-lib emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/x509-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
x86-lookup = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "x86-lookup";
@@ -76200,15 +74320,15 @@
xah-css-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "xah-css-mode";
- version = "20170811.2157";
+ version = "20170821.400";
src = fetchFromGitHub {
owner = "xahlee";
repo = "xah-css-mode";
- rev = "ed30c4530647de0016e3e03b8f2880591b901a05";
- sha256 = "1hfx3qy2wmxg75wfzjdglglpm1ai04jafqrv2qx4kh0q3ra7yzgq";
+ rev = "7167c7a9a0f0dcc167dafa833efd43a0c9ae4307";
+ sha256 = "1iychyj79g9mxpr688f2a9w8bbsgm2r88rr11b42gagal0kgk8q4";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/57c2e2112c4eb50ee6ebddef9c3d219cc5ced804/recipes/xah-css-mode";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-css-mode";
sha256 = "1kkwfyf94v3ni3d4szy28v49p6f3hy8ww9mlris2vvgc726wy6hr";
name = "xah-css-mode";
};
@@ -76221,15 +74341,15 @@
xah-elisp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "xah-elisp-mode";
- version = "20170811.2138";
+ version = "20170828.1";
src = fetchFromGitHub {
owner = "xahlee";
repo = "xah-elisp-mode";
- rev = "f9059b7a081da8981ed6ae4cb2f5a325e7775553";
- sha256 = "10f3dna1mpnjia87w5gkqkqrvkrg1h5zm33znsmgzwlqgzkhq94d";
+ rev = "6e94446566df206911afa107d06aec50ac3a56fc";
+ sha256 = "028y8dlb5b4vclg03imcipjp56l1m4klgj69f0n7ir0rr6xwl3f6";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/f2e996dd5b0061371662490e0b21d3c5bb506550/recipes/xah-elisp-mode";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-elisp-mode";
sha256 = "0cl07hw1hd3hj7wrzkh20m8vcs7mqsajxjmnlbnk2yg927yyijij";
name = "xah-elisp-mode";
};
@@ -76242,15 +74362,15 @@
xah-find = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "xah-find";
- version = "20170811.2149";
+ version = "20170821.358";
src = fetchFromGitHub {
owner = "xahlee";
repo = "xah-find";
- rev = "9783b74a5f3593db6c86e929b58f2cb9d5bc8624";
- sha256 = "1ssd9kzn7nfqr01mb7shzkwkz61028580dkvzgxxs80403gs373q";
+ rev = "6b7a60d6210d42559b46f0e17d7a0e4a2607f887";
+ sha256 = "11whm7cnz6z61lycm5w6qmvbbl5f2c2lpgmk5c5whks7v3bkq6n6";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/1d94ffd9c3380cd56770f253e43d566a95083e37/recipes/xah-find";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-find";
sha256 = "1d3x9yhm7my3yhvgqnjxr2v28g5w1h4ri40sy6dqcx09bjf3jhyq";
name = "xah-find";
};
@@ -76263,15 +74383,15 @@
xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "xah-fly-keys";
- version = "20170811.2147";
+ version = "20171101.1546";
src = fetchFromGitHub {
owner = "xahlee";
repo = "xah-fly-keys";
- rev = "90eee20efad8cd6902ca6ce7426f62c934f047d8";
- sha256 = "1wccz83nfig4i6xp8di1rvs678w9a20dbfd5j932hazvw3796gvj";
+ rev = "c007dee9faeae7b4ef1cfd21c97952768f520f8e";
+ sha256 = "1vkfff3w09h3gbwz9wqlrab29558ms03x5cgzzdxs0mjaq40pvnz";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/fc1683be70d1388efa3ce00adc40510e595aef2b/recipes/xah-fly-keys";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-fly-keys";
sha256 = "0bzfz8q7yd1jai0pgngxwjp82nsfx5ivn24cb20vc5r8hhzj17cs";
name = "xah-fly-keys";
};
@@ -76284,15 +74404,15 @@
xah-get-thing = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "xah-get-thing";
- version = "20170811.2155";
+ version = "20170821.353";
src = fetchFromGitHub {
owner = "xahlee";
repo = "xah-get-thing-or-selection";
- rev = "4e0782af230292b18e787bee43d3c94750383a1b";
- sha256 = "10xlxk95s7dxwmbylbhbwa3px5z6add8ash0gkgqjb4ibdfrclzi";
+ rev = "e3ef069ea9fea3a092689d45c94c6211b51d0ea4";
+ sha256 = "0z9pflz99p2i7czccpzvw7bkbshfycpb6js9n8a12yhc1ndbz6z0";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/9e8dc32a5317f0ff0e72fa87220243dd742eb1ef/recipes/xah-get-thing";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-get-thing";
sha256 = "0m61bmfgqy19h4ivw655mqj547ga8hrpaswcp48hx00hx8mqzcvg";
name = "xah-get-thing";
};
@@ -76305,15 +74425,15 @@
xah-lookup = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "xah-lookup";
- version = "20170811.2143";
+ version = "20170821.405";
src = fetchFromGitHub {
owner = "xahlee";
repo = "lookup-word-on-internet";
- rev = "feb480cdfd0b3e6751cc589fbf40538daa60b75b";
- sha256 = "1x1pdpngv6k1gwi7x2nsqni778wssicgsrddxaskri8axkxdiq65";
+ rev = "cd5d622140e78e01d0ab32fcb43edc49f4e7fbb5";
+ sha256 = "1i952mm0mxiaphnwimlr28swrk8b0k6rwx90f4s5s8idcp6wvp4y";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/38e6609a846a3c7781e0f03730b79bbf8d0355a9/recipes/xah-lookup";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-lookup";
sha256 = "0z0h1myw6wmybyd0z2lw4l59vgm6q6kh492q77kf3s0fssc0facc";
name = "xah-lookup";
};
@@ -76326,15 +74446,15 @@
xah-math-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "xah-math-input";
- version = "20170811.2145";
+ version = "20170905.849";
src = fetchFromGitHub {
owner = "xahlee";
repo = "xah-math-input";
- rev = "2575611505d057061938ca21df621c6f9cac4cc5";
- sha256 = "0mmbvyqihg0036cix3xh2phq68816zzcnp8cf4yc42hp1aksg770";
+ rev = "fcdfbed46ff81c8da84422611e0009c6b267e359";
+ sha256 = "01s4fhnp4zqh2cmqbp2sh1sbdcyq4i5hy1r8manqa26m041xk2z0";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/95d57e33e6d60dc20d6452b407ea1486604ba23a/recipes/xah-math-input";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-math-input";
sha256 = "1afikjk46sjf97fb5fc8h63h7b9af010wxhsbpnmabsb4j72rx5a";
name = "xah-math-input";
};
@@ -76347,15 +74467,15 @@
xah-reformat-code = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "xah-reformat-code";
- version = "20170706.339";
+ version = "20170821.411";
src = fetchFromGitHub {
owner = "xahlee";
repo = "xah-reformat-code";
- rev = "655cc8820118737db7b758ab72ad107d7fff091a";
- sha256 = "12zrgp76nq18anp7vc7pj0w9a688i7xylplqh55jv9q24xgmpyhs";
+ rev = "7fec8b28e46b8cc2813fac5149e3bbb56c0aa6b1";
+ sha256 = "0mz47laig0p7fwwiv66x60f5jg0kh8zvjd1vg3nnn3xvk37lv2cw";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/45e731ccee5ccbf97169e32a16300b5fb78e1155/recipes/xah-reformat-code";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-reformat-code";
sha256 = "1sj407nbh4x586hvsq4ycr0ahhxin0wgfwdj0551cz8793wvjpzp";
name = "xah-reformat-code";
};
@@ -76368,15 +74488,15 @@
xah-replace-pairs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "xah-replace-pairs";
- version = "20170811.2151";
+ version = "20170823.2028";
src = fetchFromGitHub {
owner = "xahlee";
repo = "xah-replace-pairs";
- rev = "fb72b406ae171e840798172321e72e32ba904276";
- sha256 = "01ilk5ic884nfili823zp05ylrnj9iqhwc2v8brc908f23mbdf79";
+ rev = "f051772e097723bafd05a7a05f283b900375ebd7";
+ sha256 = "0r85y1qaqvnj36c931cz4qzxwf86ai35xjaw6bwy7hjjdxp82cz0";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/0e7de2fe0e55b1a546f105aa1aac44fde46c8f44/recipes/xah-replace-pairs";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-replace-pairs";
sha256 = "0r4aq9davh3ypzcjixr3aw9g659dhiblwbmcyhm8iqhkavcpqr1x";
name = "xah-replace-pairs";
};
@@ -76389,15 +74509,15 @@
xahk-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "xahk-mode";
- version = "20170523.1946";
+ version = "20170821.407";
src = fetchFromGitHub {
owner = "xahlee";
repo = "xahk-mode.el";
- rev = "538b891a1565d109d079185b56332cd28dd846a7";
- sha256 = "1rm3sih1rciszs7m9d29r7vkgs8q2kwpn8sdwadlycgjmk9c38s1";
+ rev = "02012b20603c00e3b2ef32159a690ed1e05d12c3";
+ sha256 = "09nakcfczb95vd48f8z77igmi1kbcblmgpzfzm9i7df4jcfkkh3c";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/3d6422756b435f59ead15fa7e8081f5c88b2e93f/recipes/xahk-mode";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xahk-mode";
sha256 = "1bs12z7lnqlhm44hq0l98d0ka1bjgvm2yv97yivaj9akd53znca9";
name = "xahk-mode";
};
@@ -76449,6 +74569,27 @@
license = lib.licenses.free;
};
}) {};
+ xcode-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "xcode-project";
+ version = "20170922.612";
+ src = fetchFromGitHub {
+ owner = "nhojb";
+ repo = "xcode-project";
+ rev = "ec5d503a51430205daa6f5f382d921b6412b4b55";
+ sha256 = "0m3262mqqhjcpzw8m4n403kr75m561kxvwf8clzwmv0fvkf8aazk";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/49b866ebf7e707bc74525f83dd5038e6e860fcef/recipes/xcode-project";
+ sha256 = "0igp30f6ypmp4l8zmdfpa5bza4avm7mq2gj8v7b3ii655v91n6vi";
+ name = "xcode-project";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/xcode-project";
+ license = lib.licenses.free;
+ };
+ }) {};
xcscope = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "xcscope";
@@ -76893,12 +75034,12 @@
yahoo-weather = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "yahoo-weather";
- version = "20160703.2008";
+ version = "20170822.1544";
src = fetchFromGitHub {
owner = "lujun9972";
repo = "yahoo-weather-mode";
- rev = "5154c320400fc20a8deb1b43e21f790709c4af76";
- sha256 = "0f3jh0y14kkbflsdpf4c6qlzdc0jk5p3c6xxs4hd7mb8af32rrvh";
+ rev = "a74e29bc81b13efe285b87fa4d0694d75f8e2bb5";
+ sha256 = "1nimmv84q5zsv81ji3nmvpmi30f8xh0ypa88hpdpykc5iirj1m0x";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ae5ca93d48a2d24787c3d4ed7ab3a65aa8023f4f/recipes/yahoo-weather";
@@ -76914,12 +75055,12 @@
yahtzee = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "yahtzee";
- version = "20170617.20";
+ version = "20171022.712";
src = fetchFromGitHub {
owner = "drdv";
repo = "yahtzee";
- rev = "7652ce2c926084a893b26695a765ba8b8f4ba328";
- sha256 = "09mzglx049b2xcrz8g7iywxbr79haf1xbcs8qnj1ljypmdmkq89a";
+ rev = "5263fb8883d37d79a4ed34dd3216a8947d2ae4a0";
+ sha256 = "1qv8p3zpxkkp0ncq3cs8sq2bj4jrxs4s5jfc5hbs905a9z8bsnq9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/200169fdabce0ae3a2ecb6f4f3255c15ec3ed094/recipes/yahtzee";
@@ -77058,25 +75199,6 @@
license = lib.licenses.free;
};
}) {};
- yaoddmuse = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "yaoddmuse";
- version = "20170325.1752";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/yaoddmuse.el?revision=104";
- sha256 = "0vlllq3xmnlni0ws226pqxj68nshclbl5rgqv6y11i3yvzgiazr6";
- name = "yaoddmuse.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/yaoddmuse";
- sha256 = "1p68f3xjv55m8lnq5x27b8y87mq685hpm3n9kiga9qq8wxdf2rnf";
- name = "yaoddmuse";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/yaoddmuse";
- license = lib.licenses.free;
- };
- }) {};
yapfify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "yapfify";
@@ -77122,12 +75244,12 @@
yard-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "yard-mode";
- version = "20160310.850";
+ version = "20170817.537";
src = fetchFromGitHub {
owner = "pd";
repo = "yard-mode.el";
- rev = "78792f6a6fbff4f1bc955f494fdb11378e7f8095";
- sha256 = "096ay60hrd14b459cyxxcf9g7i1ivsxg6yhc0q162px6kl1x0m2y";
+ rev = "ba74a47463b0320ae152bd42a7dd7aeecd7b5748";
+ sha256 = "0zry3p66bvrk32icnd6kkk8y5rrr8crnqjp6wlp889c8c7wm00n1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/afad2677f901b8d27922389afb1d235d5c8edc39/recipes/yard-mode";
@@ -77206,12 +75328,12 @@
yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "yasnippet";
- version = "20170808.940";
+ version = "20170923.1646";
src = fetchFromGitHub {
owner = "joaotavora";
repo = "yasnippet";
- rev = "e371c119ecc9044c8ca2d6b93215121eb714d6b1";
- sha256 = "02md6332891fwwiqqf9x3sjd7568lg2lmjcx79cdjcl5hjik7qdc";
+ rev = "35a4df769cbdebd10d043f16d680bdb16ee858ed";
+ sha256 = "0rkk39bm12d3d4gf8r99a2ipjaf1yb0b57rpg44bsqz5jada4a86";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet";
@@ -77227,12 +75349,12 @@
yasnippet-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
melpaBuild {
pname = "yasnippet-snippets";
- version = "20170813.416";
+ version = "20171106.447";
src = fetchFromGitHub {
owner = "AndreaCrotti";
repo = "yasnippet-snippets";
- rev = "21fc956845bf7aff4a84511a813d3afd3a620a40";
- sha256 = "00balpdz6gpyngzir0ddvw492bbv045spchaxkf1lxc0pl0ldjh9";
+ rev = "6b6dcd9eca4d6d3e982bbc241b51cd6562ef600e";
+ sha256 = "07zblniw1rc24zyaw1xbam46yz8cac4wl6qf6l1ynkbpj5k0x1g5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/25b8d4efe2e7833eb95dfdf33aa3ecc34af7a687/recipes/yasnippet-snippets";
@@ -77252,8 +75374,8 @@
src = fetchFromGitHub {
owner = "mineo";
repo = "yatemplate";
- rev = "3854836489ce06bb65cf9aecbdc06aa5fc6801c5";
- sha256 = "051wwf802f00xk5gq5js1l0dd1ax0ls2jvlybz7xfy58dl8fbijx";
+ rev = "07da11de32feb6cbce0f8c140c0304e3ba1b42c0";
+ sha256 = "10af3pa8rh3rs0vpm436vm5wlwvqkfa3zpqyhdf2i3q4gaqfb902";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8ba3cdb74f121cbf36b6d9d5a434c363905ce526/recipes/yatemplate";
@@ -77268,14 +75390,14 @@
}) {};
yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
pname = "yatex";
- version = "20170723.1909";
+ version = "20171030.502";
src = fetchhg {
url = "https://www.yatex.org/hgrepos/yatex/";
- rev = "4f8551386af2";
- sha256 = "0qvp54pzc6m52j5xkwp25nwdlik6v879halmfvcpn3z0grhrslbn";
+ rev = "16763e5b7481";
+ sha256 = "1mrcc9amz0kflm570bd2cprhin0z8lr668k2s56mj6shixb61dwh";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e28710244a1bef8f56156fe1c271520896a9c694/recipes/yatex";
sha256 = "17np4am7yan1bh4706azf8in60c41158h3z591478j5b1w13y5a6";
name = "yatex";
};
@@ -77330,12 +75452,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 = "20170723.1458";
+ version = "20171027.1412";
src = fetchFromGitHub {
owner = "abingham";
repo = "emacs-ycmd";
- rev = "fd037efae08628e41480e9dad705dcc1f64e498d";
- sha256 = "06scz0d3jzgbr919lkjjfq9x1dyr5nqkhblvfpyk5bdp8l6j06d6";
+ rev = "d951afd8c1c2f25a5cbeef3acfcec5f72acfd6e4";
+ sha256 = "0k6z82a3xkk71lbnw3sxqmr8ixafglivmsb5y35q1jichzz6hail";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd";
@@ -77484,23 +75606,24 @@
license = lib.licenses.free;
};
}) {};
- zeitgeist = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
+ zel = callPackage ({ emacs, fetchFromGitHub, fetchurl, frecency, lib, melpaBuild }:
melpaBuild {
- pname = "zeitgeist";
- version = "20131228.1009";
- src = fetchgit {
- url = "https://anongit.freedesktop.org/git/zeitgeist/zeitgeist-datasources.git";
- rev = "cdd1c219ed3afa9500403c3c499f49583d599034";
- sha256 = "0xg67asvgav5js03i3bqmh7apndrn0jy5vai0bsh22pq8wgvq083";
+ pname = "zel";
+ version = "20171014.132";
+ src = fetchFromGitHub {
+ owner = "rudolfochrist";
+ repo = "zel";
+ rev = "9dae2d212224d1deae1f62561fa8e4d689fd09f2";
+ sha256 = "1518wp3zjfdvzz5r22cjgn735c4yxr345qzj40b5agww4dsxmwmp";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/zeitgeist";
- sha256 = "0zbpmdf7fq3qph70m13giir58y1n5z6q6kqixjll5j4fk98k6bkz";
- name = "zeitgeist";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/b48132eb4c0fd01b9fc31236c5c4701f8f83a806/recipes/zel";
+ sha256 = "14qf83n1wz8hg9wfmbh8b50c5xshc28x1xq6wh4g4lfqbfm7marh";
+ name = "zel";
};
- packageRequires = [];
+ packageRequires = [ emacs frecency ];
meta = {
- homepage = "https://melpa.org/#/zeitgeist";
+ homepage = "https://melpa.org/#/zel";
license = lib.licenses.free;
};
}) {};
@@ -77528,12 +75651,12 @@
zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "zenburn-theme";
- version = "20170511.1337";
+ version = "20171010.543";
src = fetchFromGitHub {
owner = "bbatsov";
repo = "zenburn-emacs";
- rev = "2f31ef9a954ec08202668a8d1b004db5a05831a2";
- sha256 = "0g4vgdzpbp0l734ajd1r9lj6qylljxaazk139lhzzyvmqd5dwaf9";
+ rev = "a26323ca3029d653f658b8236ae9528d242c885b";
+ sha256 = "0gx6yl3bl3z7rgl4m1np8bx8b53ywbni4wi2bhc716f4b96q658x";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/zenburn-theme";
@@ -77590,12 +75713,12 @@
zephir-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
melpaBuild {
pname = "zephir-mode";
- version = "20170810.2302";
+ version = "20170917.2125";
src = fetchFromGitHub {
owner = "sergeyklay";
repo = "zephir-mode";
- rev = "5c8fcf633709b70f87015073a5d48556fc930b76";
- sha256 = "1c671ncrb4dmrmbx5p7qqxv01wah63cjisn60mhrpzjcyg8w8hss";
+ rev = "c2c6b7451667e68e29c353616f54ef9195c3fffd";
+ sha256 = "1h5iv0ggh4jzv180mg8lz72d91b6kcqwy6ypgy3rn50bk6pz06kg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5bd901c93ce7f64de6082e801327adbd18fd4517/recipes/zephir-mode";
@@ -77611,15 +75734,15 @@
zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild }:
melpaBuild {
pname = "zerodark-theme";
- version = "20170721.214";
+ version = "20171016.59";
src = fetchFromGitHub {
owner = "NicolasPetton";
repo = "zerodark-theme";
- rev = "b187aee9351f0ec94d87156223e5b434b58aa2a8";
- sha256 = "1fidrmf2ljhzm9prk8a6y35djgzyj9bsla7pwacjknkqza3pjpbi";
+ rev = "ccadcfba1a708352508d4c0857359df7425e7574";
+ sha256 = "1mg1dhda9zvdinxizckvz454633lrl62a382vdm838295gvc40wm";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/72ef967a9bea2e100ae17aad1a88db95820f4f6a/recipes/zerodark-theme";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/d00b78ead693e844e35c760fe2c39b8ed6cb0d81/recipes/zerodark-theme";
sha256 = "1nqzswmnq6h0av4rivqm237h7ghp7asa2nvls7nz4ma467p9qhp9";
name = "zerodark-theme";
};
@@ -77632,15 +75755,15 @@
zig-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "zig-mode";
- version = "20170413.130";
+ version = "20170920.802";
src = fetchFromGitHub {
owner = "AndreaOrru";
repo = "zig-mode";
- rev = "9a252ebd4ccd8a30abef3d9ed0ecb510e3d88844";
- sha256 = "07ar5lijj3y62ynx1fj9qxabf0h82laxzyb60f6cgxpzgxfpn1b8";
+ rev = "814657c5b6b0600ace78a7bbd216c3e90d611cfd";
+ sha256 = "0nhx2wsk3qpdplvwxmdzwlka9255x46ca9vcjb58zbpb5wbfckzx";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/64d12e362a2490e85c8e7a66a5ed1ebff9ce95a6/recipes/zig-mode";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/33895b0ff559ffd18a62c04736597188f55419ee/recipes/zig-mode";
sha256 = "1rmvlsgx01h62imbksxl164d5p0caz49nlgg0z7spvvd9bmplr09";
name = "zig-mode";
};
@@ -77737,12 +75860,12 @@
zone-nyan = callPackage ({ esxml, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "zone-nyan";
- version = "20161014.154";
+ version = "20170818.944";
src = fetchFromGitHub {
owner = "wasamasa";
repo = "zone-nyan";
- rev = "0ec6328ee58d7d140c8c7be84822c07741f3ad2b";
- sha256 = "106sppnp1jd5qcp2ydb180fbhfld90jvfimy8316qvrgk5xc2q57";
+ rev = "4b1f8d95f130946718d52806489ffe2762aebfdc";
+ sha256 = "1axq4ch7garlfrybq9kgv6x7d8y4dw5y9pqbqlqvlwf4xmdrvzmm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/zone-nyan";
@@ -77818,63 +75941,24 @@
license = lib.licenses.free;
};
}) {};
- zones = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "zones";
- version = "20170802.1406";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/zones.el?revision=32";
- sha256 = "02vvkj2nx5ha1ad1zn5jd91jakxwx1pkrysj07a8y2sg657d7nkk";
- name = "zones.el";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/zones";
- sha256 = "1l4qilawlgvanrz4ny4aaqzg011dlqh65g06d44pf6ha586rvzp2";
- name = "zones";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/zones";
- license = lib.licenses.free;
- };
- }) {};
- zonokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ zoom = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
- pname = "zonokai-theme";
- version = "20160321.1925";
+ pname = "zoom";
+ version = "20171030.529";
src = fetchFromGitHub {
- owner = "ZehCnaS34";
- repo = "zonokai-emacs";
- rev = "38ee819b711e848437ba6d563594129a0ecac598";
- sha256 = "16ni0va1adpqdnrkiwmpxwrhyanxp5jwbknii2wnbhgq62s7gv43";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/80c7b1e01eb23f2f9b71fbeeea7d54ac36bae992/recipes/zonokai-theme";
- sha256 = "1hrpgh03mp7yynqamgzkw7fa70c5pmyjfmfblkfhspnsif8j4v29";
- name = "zonokai-theme";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/zonokai-theme";
- license = lib.licenses.free;
- };
- }) {};
- zoom-frm = callPackage ({ fetchurl, frame-cmds, frame-fns, lib, melpaBuild }:
- melpaBuild {
- pname = "zoom-frm";
- version = "20170309.1439";
- src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/zoom-frm.el?revision=44";
- sha256 = "03f3clivm7nfgg16k9pcshdwbwmjaqk0lcdm9d0180dl1c1z2wvs";
- name = "zoom-frm.el";
+ owner = "cyrus-and";
+ repo = "zoom";
+ rev = "d92ea444df6f6bb6cae92242f3269582d1b8ab40";
+ sha256 = "08riz3dd19c1dixm3c6j5dkkwjpgcib05pxq611w8z0mgsn0hsc5";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/zoom-frm";
- sha256 = "111lr29zhj8w8j7dbzl58iisqxjhccxpw4spfxx08zxh4623g5mk";
- name = "zoom-frm";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe094c99756ad29eda9bc51f31bb70c4ddc4131/recipes/zoom";
+ sha256 = "09bk0nnfj72an2b3rravd6qp21gdgcm1m55qnf2r8rzbgqymq5ls";
+ name = "zoom";
};
- packageRequires = [ frame-cmds frame-fns ];
+ packageRequires = [ emacs ];
meta = {
- homepage = "https://melpa.org/#/zoom-frm";
+ homepage = "https://melpa.org/#/zoom";
license = lib.licenses.free;
};
}) {};
@@ -78007,11 +76091,11 @@
zpresent = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild, org-parser, request }:
melpaBuild {
pname = "zpresent";
- version = "20170730.2055";
+ version = "20171008.2152";
src = fetchhg {
url = "https://bitbucket.com/zck/zpresent.el";
- rev = "bddebd64d652";
- sha256 = "1q7rhcsxr66fmhwmpbw35y8gdvlbfisvjy4xmh455ajy3126zyp2";
+ rev = "eb6f5bf71b00";
+ sha256 = "1q3xz4gwqb7ac49w0nq7zvl4n790wk6r97by1kldv54y2fj0ja9g";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3aae38ad54490fa650c832fb7d22e2c73b0fb060/recipes/zpresent";
diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index 7cb801673ec54012fe8d614181184de0ba6d454e..f2f8a4bda8b34d8269a8caf88318728e9fe34ac0 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -548,12 +548,12 @@
ac-php = callPackage ({ ac-php-core, auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
melpaBuild {
pname = "ac-php";
- version = "1.7.9";
+ version = "1.8.1";
src = fetchFromGitHub {
owner = "xcwen";
repo = "ac-php";
- rev = "e0aaae30e4e5f18390e5d00953db02c1f03c44f6";
- sha256 = "1mrk37w88b4843jbghr9i79rbwbzwk8b1wljvzmm6x0q7ldlxmsm";
+ rev = "317ad1d023db6b2fe67444a2c075e656c35f5094";
+ sha256 = "1wyf93faq6z6wgcs3lxc6gv75bmxchg6kd98dza61zdyc0rj60wa";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php";
@@ -569,12 +569,12 @@
ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }:
melpaBuild {
pname = "ac-php-core";
- version = "1.7.9";
+ version = "1.8.1";
src = fetchFromGitHub {
owner = "xcwen";
repo = "ac-php";
- rev = "e0aaae30e4e5f18390e5d00953db02c1f03c44f6";
- sha256 = "1mrk37w88b4843jbghr9i79rbwbzwk8b1wljvzmm6x0q7ldlxmsm";
+ rev = "317ad1d023db6b2fe67444a2c075e656c35f5094";
+ sha256 = "1wyf93faq6z6wgcs3lxc6gv75bmxchg6kd98dza61zdyc0rj60wa";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core";
@@ -611,12 +611,12 @@
ac-rtags = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, rtags }:
melpaBuild {
pname = "ac-rtags";
- version = "2.12";
+ version = "2.14";
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "db1244c1c14514324474f362c857112e89bbf0c6";
- sha256 = "1fcrlxk9z11vbarznfcpfyqzvj6v3ydbn5z6vbdmgf9cxb52kfma";
+ rev = "15ef9a8bab847773d6e247005be929422fc9c285";
+ sha256 = "0yq3c4ich0sffzd571drb7k4vs0bvblx6qcrb6zry75d9npggsyg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags";
@@ -692,22 +692,22 @@
license = lib.licenses.free;
};
}) {};
- ace-jump-buffer = callPackage ({ ace-jump-mode, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ ace-jump-buffer = callPackage ({ avy, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ace-jump-buffer";
- version = "0.3.1";
+ version = "0.4.1";
src = fetchFromGitHub {
owner = "waymondo";
repo = "ace-jump-buffer";
- rev = "41f8bb0744cdf9c219d25b417f2ffbd0883469e7";
- sha256 = "1z82a0lrb61msamqpsy7rxcgs2nfhhckkk4zw0aw49l248p2nrgs";
+ rev = "02797c22c10a817dbbdfbd8fddceeba6c4f0499a";
+ sha256 = "13wq92ia18q9vyhmvnz1grl1l18hxnaisb7hv13dhfc06alcsrw2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/31100b5b899e942de7796bcbf6365625d1b62574/recipes/ace-jump-buffer";
sha256 = "0hkxa0ps0v1hwmjafqbnyr6rc4s0w95igk8y3w53asl7f5sj5mpi";
name = "ace-jump-buffer";
};
- packageRequires = [ ace-jump-mode dash ];
+ packageRequires = [ avy dash ];
meta = {
homepage = "https://melpa.org/#/ace-jump-buffer";
license = lib.licenses.free;
@@ -926,12 +926,12 @@
add-node-modules-path = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "add-node-modules-path";
- version = "1.1.0";
+ version = "1.2.0";
src = fetchFromGitHub {
owner = "codesuki";
repo = "add-node-modules-path";
- rev = "8eef7fa6765af1716fc21db08f19f3d3e9b68998";
- sha256 = "1dm2gdhs9zy5jqhbqipdgzfj24mrzxz064ax9l2dg0lqylk1dc0q";
+ rev = "6f7801b2c41e3711406b7e1654257ad5557f5bb3";
+ sha256 = "1pfgy1k7vp34k4zb9835y3x4jmf81na60vsf80wlgvfafwk170z6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/63e99d8fc0678d7b1831cae8940e9e6547780861/recipes/add-node-modules-path";
@@ -989,12 +989,12 @@
aes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "aes";
- version = "0.8";
+ version = "0.9";
src = fetchFromGitHub {
owner = "Sauermann";
repo = "emacs-aes";
- rev = "d78796facc034b09f379cda5f27090f3139305ec";
- sha256 = "1y9bw2vkl952pha2dsi18swyr94mihgwlcg5m8hg4d5bfg2fzcb2";
+ rev = "b7d5da89c3443292e4f0b1c9d254d459933cf5af";
+ sha256 = "0nz1lf77qr3vm90rm02d4inw8glav722rxsiqds76m4xsjrq02m7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/33ca3106852f82624b36c7e3f03f5c0c620f304f/recipes/aes";
@@ -1031,12 +1031,12 @@
aggressive-indent = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "aggressive-indent";
- version = "1.8.3";
+ version = "1.9.0";
src = fetchFromGitHub {
owner = "Malabarba";
repo = "aggressive-indent-mode";
- rev = "998407f56009f441a7cb83d678118d4d8e68f661";
- sha256 = "0brggqlij0nacx0yjk10rkn045nk0z03r8llmnqkangjm47ffksr";
+ rev = "d6778ae89cd2d40949aa076a43e327f7acff59c3";
+ sha256 = "0xya19w1bwpqrrqvmms0lfhqb168iv7j6kvnn49zbynnf9dhgr9w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/aggressive-indent";
@@ -1073,12 +1073,12 @@
ahungry-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ahungry-theme";
- version = "1.4.0";
+ version = "1.8.0";
src = fetchFromGitHub {
owner = "ahungry";
repo = "color-theme-ahungry";
- rev = "e3d7e22cb10582a443b0e245be68aca936cd6abf";
- sha256 = "0fsip64bxs55kkqmpfcg4nr391b6wsd8hiq4fxvwww7n52lwsn5s";
+ rev = "32ce7765c95559f6a0552cdaeedb6eb97bb7a476";
+ sha256 = "0c1xwqknhjx6y29fwca949r8d2fqb17mca5qc79pdxdlp3l606fg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/520295978fd7de3f4266dd69cc30d0b4fdf09db0/recipes/ahungry-theme";
@@ -1292,12 +1292,12 @@
anaconda-mode = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }:
melpaBuild {
pname = "anaconda-mode";
- version = "0.1.8";
+ version = "0.1.9";
src = fetchFromGitHub {
owner = "proofit404";
repo = "anaconda-mode";
- rev = "95fdfab07600171daccb0e9e98fb91c11237fd48";
- sha256 = "0l5h6apjshr6drfak6j66m3rv26hkr2namj85k8isvalmn4dlrj2";
+ rev = "89fc16d50b889a17521084347b28f3011b84e113";
+ sha256 = "08wdci57vig88iy5kk57k5qjkzphbbzy8g7b87hxakfgdmcwpg3g";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode";
@@ -1692,14 +1692,14 @@
pname = "apache-mode";
version = "2.1";
src = fetchFromGitHub {
- owner = "zonuexe";
+ owner = "emacs-php";
repo = "apache-mode";
rev = "0906559e0cb2997405d98ea6b2195954e3935d3b";
sha256 = "0vfyi34qcwkz9975cq5hin1p2zyy3h05fni4f93xyrcs31zvmk22";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/b5216c40e60c5a69a6235c15b432b5e9bdda6fd3/recipes/apache-mode";
- sha256 = "0f8r3xnnidcm9ahj8c3s1vxk6yqk3ra34nrc19r76xyprbb2sjsm";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/apache-mode";
+ sha256 = "0wzfx3kaiwvya30ihq3vpdhy6znkzf25w5x43x457ifdn2vrh9zi";
name = "apache-mode";
};
packageRequires = [];
@@ -1732,12 +1732,12 @@
apiwrap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "apiwrap";
- version = "0.1.2";
+ version = "0.3";
src = fetchFromGitHub {
owner = "vermiculus";
repo = "apiwrap.el";
- rev = "2feb4a9c58a105867197f92c0b27f1de8d213f45";
- sha256 = "0yyl2zn02mnhpg6xfcywypg3yprabgkzi9spr407nia86ljrqqss";
+ rev = "5d25972192cd34553997ba193c09eab093a2b870";
+ sha256 = "1pp2gzw17k58s9akraf8p4jxbar8viym2a43rkc7agzy47qsybs0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0197fd3657e65e3826375d9b6f19da3058366c91/recipes/apiwrap";
@@ -2023,22 +2023,22 @@
license = lib.licenses.free;
};
}) {};
- auto-compile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, packed }:
+ auto-compile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, packed }:
melpaBuild {
pname = "auto-compile";
- version = "1.4.0";
+ version = "1.4.1";
src = fetchFromGitHub {
owner = "emacscollective";
repo = "auto-compile";
- rev = "0cbebd8fd22c88a57a834797e4841900ea1bae1c";
- sha256 = "1sngafab6sssidz6w1zsxw8i6k4j13m0073lbmp7gq3ixsqdxbr7";
+ rev = "a31819a1b75a2320edb0f7f25d6c6faf528bf41a";
+ sha256 = "17hzl03livgj49zb0knlfn6r020nvj41pjjz3acy82zwrjydsvxa";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/auto-compile";
sha256 = "08k9wqk4yysps8n5n50v7lpadwsnm553pv9p7m242fwbgbsgz6nf";
name = "auto-compile";
};
- packageRequires = [ dash emacs packed ];
+ packageRequires = [ emacs packed ];
meta = {
homepage = "https://melpa.org/#/auto-compile";
license = lib.licenses.free;
@@ -2662,12 +2662,12 @@
beacon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
melpaBuild {
pname = "beacon";
- version = "1.3.3";
+ version = "1.3.4";
src = fetchFromGitHub {
owner = "Malabarba";
repo = "beacon";
- rev = "f1a3ff5ea8fecf9bf250205de66aedf0bf49c35b";
- sha256 = "0wr2ffwbi5w23a7hbdmn5ijfy5gmizrmy75zj6m1bz4mbw23ccvn";
+ rev = "729338b02a0e331a4faf475da9f54771a3470106";
+ sha256 = "0mypzfasclq7bmw0i8hfyp8c1ycd3kdgd5h1faygzh9r0phh7ciy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d09cfab21be800831644218e9c8c4433087951c0/recipes/beacon";
@@ -2722,6 +2722,27 @@
license = lib.licenses.free;
};
}) {};
+ benchstat = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "benchstat";
+ version = "1.0.0";
+ src = fetchFromGitHub {
+ owner = "Quasilyte";
+ repo = "benchstat.el";
+ rev = "b39a97f3072c2d3c1d3f86790b9e134d05b8d7e6";
+ sha256 = "0j508n860dp4in1psnkcriqck6by1jvnscalyff5na8hx6xgyysm";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/d9180fbedf95f9b1f5810bbf4929dfee513f89e3/recipes/benchstat";
+ sha256 = "0h2zi4gh23bas1zfj7j2x994lwgd3xyys96ipg1vq7z2b06572k9";
+ name = "benchstat";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/benchstat";
+ license = lib.licenses.free;
+ };
+ }) {};
better-defaults = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "better-defaults";
@@ -2809,12 +2830,12 @@
bifocal = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bifocal";
- version = "0.0.1";
+ version = "0.0.3";
src = fetchFromGitHub {
owner = "riscy";
repo = "bifocal-mode";
- rev = "19b54d1de8938448c88afd495d749fc7b6f6d281";
- sha256 = "0mym4wqhfh58sr82z0w1z7kvj2p6s54b3j9davwpkj850j378x52";
+ rev = "a8b222b069a6bd64531b4780905989797bad8abe";
+ sha256 = "0c6vzh35lj3pg9wd4v2fy6xdmcg9kq3n5br6rp4lx257gxglzpwh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/79e71995bd8452bad2e717884f148ec74c9735fc/recipes/bifocal";
@@ -3124,12 +3145,12 @@
bshell = callPackage ({ buffer-manage, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bshell";
- version = "0.2";
+ version = "0.3";
src = fetchFromGitHub {
owner = "plandes";
repo = "bshell";
- rev = "b25907d531d18000f68534d2a97cf4c2ffa38e68";
- sha256 = "04j4gkiqbfmgqs18hwsbwdb3xrzk5laqpdxx6vsj5g3pc9k6d1cv";
+ rev = "884a8b906617d305e9d5d2c3750618d2f86f9aed";
+ sha256 = "16qh71yhpxs5cxjmkiqiia8xrxa0ym2n32znp4yc7xiv2xfw2ss4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cf0ed51304f752af3e1f56caf2856d1521d782a4/recipes/bshell";
@@ -3163,22 +3184,22 @@
license = lib.licenses.free;
};
}) {};
- buffer-manage = callPackage ({ choice-program, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ buffer-manage = callPackage ({ choice-program, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "buffer-manage";
- version = "0.2";
+ version = "0.6";
src = fetchFromGitHub {
owner = "plandes";
repo = "buffer-manage";
- rev = "1110217973afa1329c47a1f7e6962aad36a90134";
- sha256 = "0hb75npk1d9bdqpgdrin8vvfn64arhgq0h69xgvhwcdlm7xjg1bf";
+ rev = "44b26d5c17a4ecea3484727fa46c3d734569a018";
+ sha256 = "0c9hz2532vcbn69am7pd2zyraqgw0q139qsck9hs1vfxnsj4v8dc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/28f8f376df810e6ebebba9fb2c93eabbe3526cc9/recipes/buffer-manage";
sha256 = "0fwri332faybv2apjh8zajqpryi0g4kk3and8djibpvci40l42jb";
name = "buffer-manage";
};
- packageRequires = [ choice-program emacs ];
+ packageRequires = [ choice-program dash emacs ];
meta = {
homepage = "https://melpa.org/#/buffer-manage";
license = lib.licenses.free;
@@ -3226,6 +3247,27 @@
license = lib.licenses.free;
};
}) {};
+ buffer-watcher = callPackage ({ f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "buffer-watcher";
+ version = "0.1";
+ src = fetchFromGitHub {
+ owner = "NicolasPetton";
+ repo = "buffer-watcher";
+ rev = "353d76882c65d44341b6f28bd86279dda00c3440";
+ sha256 = "0x9bcnya47pf78p6ksdvs1ca5arvbgyi1q8b9yxq55fg3k9523ln";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/c8681776d467951d14d8247e6939bd9a6f2a80ec/recipes/buffer-watcher";
+ sha256 = "0v096021xk7k821bxb5zddw6sljqa6fs8f7s8j0w3pv6lmhra1ln";
+ name = "buffer-watcher";
+ };
+ packageRequires = [ f ];
+ meta = {
+ homepage = "https://melpa.org/#/buffer-watcher";
+ license = lib.licenses.free;
+ };
+ }) {};
bufshow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bufshow";
@@ -3289,6 +3331,27 @@
license = lib.licenses.free;
};
}) {};
+ build-status = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "build-status";
+ version = "0.0.2";
+ src = fetchFromGitHub {
+ owner = "sshaw";
+ repo = "build-status";
+ rev = "c29a0146c5d0be274f5e17921e01698f572c23a1";
+ sha256 = "03f0h7sp0sr9kjyhvcx7i34lvc26f5x8nikfidihgzhrqpprv2b6";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/23bbe012f313cf0cf4c45a66eb0bee9361ced564/recipes/build-status";
+ sha256 = "0ckyf0asll50gifx1v0qqzpimjms8i1rgw9bnqiyj861qn5hch92";
+ name = "build-status";
+ };
+ packageRequires = [ cl-lib ];
+ meta = {
+ homepage = "https://melpa.org/#/build-status";
+ license = lib.licenses.free;
+ };
+ }) {};
bundler = callPackage ({ fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }:
melpaBuild {
pname = "bundler";
@@ -3355,12 +3418,12 @@
buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "buttercup";
- version = "1.7";
+ version = "1.9";
src = fetchFromGitHub {
owner = "jorgenschaefer";
repo = "emacs-buttercup";
- rev = "d8dc80da12cc1e71fcf54b0f4deb8d229bc97beb";
- sha256 = "0zsf2qk41i1ay6h85d1ppj5qnzdrb9n09bzj9s9hk7ysag1rlqj1";
+ rev = "18a887957b0e22d3cc8873796bd27f06b2493a03";
+ sha256 = "0y0wg0yqmvqjyhjs4dx8yw44hl19k227krd9mds220w0dx8wmhay";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b187cb5b3cc5b546bfa6b94b6792e6363242d1/recipes/buttercup";
@@ -3625,6 +3688,27 @@
license = lib.licenses.free;
};
}) {};
+ caml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "caml";
+ version = "4.6.0";
+ src = fetchFromGitHub {
+ owner = "ocaml";
+ repo = "ocaml";
+ rev = "0d68080b95016f747b7cb63dd36ccdd42d40016e";
+ sha256 = "1dxg82xqjx4yh4sg2dy48ybn4czv9yq0q3zpr29sxp1grvwvrg2b";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/d5a3263cdcc229b11a3e96edbf632d56f32c47aa/recipes/caml";
+ sha256 = "1ixs0626nsg1ilqdwj5rd8kicjy7mprswwy0kprppmpmc8y7xf7c";
+ name = "caml";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/caml";
+ license = lib.licenses.free;
+ };
+ }) {};
cargo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }:
melpaBuild {
pname = "cargo";
@@ -3712,12 +3796,12 @@
cask-package-toolset = callPackage ({ ansi, cl-lib ? null, commander, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }:
melpaBuild {
pname = "cask-package-toolset";
- version = "0.9.1";
+ version = "0.9.2";
src = fetchFromGitHub {
owner = "AdrieanKhisbe";
repo = "cask-package-toolset.el";
- rev = "1e972739dbdf3af5b60a250c99414e76db238f78";
- sha256 = "0padb1zfjkmx9kbqnqh744qvpd3ln0khwxifxld9cpcpdp5k04vc";
+ rev = "2c74cd827e88c7f8360581a841e45f0b794510e7";
+ sha256 = "1hk5q6p1j7cqg5srr3v21xfyy7aas4hfj1a66h21c2xvfjra3hxw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ed71e45389626e700b93b29d5e2659b6706274d8/recipes/cask-package-toolset";
@@ -3751,6 +3835,25 @@
license = lib.licenses.free;
};
}) {};
+ catmacs = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
+ pname = "catmacs";
+ version = "0.1.1";
+ src = fetchgit {
+ url = "https://bitbucket.org/pymaximus/catmacs";
+ rev = "c6e8277bd2aab3f5fbf10d419111110f3b33564f";
+ sha256 = "0kdlmmqgpgmhbbvafywllqdwkkd5a41rf8zhfmxhs3ydza86hmlg";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e62e45ea234a574ed602f27c3c6bc240bcd4fa43/recipes/catmacs";
+ sha256 = "0ym1szmq9ib75yiyy5jw647fcs7gg0d5dkskqc293pg81qf3im50";
+ name = "catmacs";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/catmacs";
+ license = lib.licenses.free;
+ };
+ }) {};
cbm = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cbm";
@@ -3898,6 +4001,27 @@
license = lib.licenses.free;
};
}) {};
+ cframe = callPackage ({ buffer-manage, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "cframe";
+ version = "0.1";
+ src = fetchFromGitHub {
+ owner = "plandes";
+ repo = "cframe";
+ rev = "bb99672502046e87c8f029ce98c637f762a4fc54";
+ sha256 = "088px3wlvr4km913y7hajrjqnxnv6n325rk6353bkbah2d75vxq4";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/6e39555b2538cc8a955766c5533871396e8fe712/recipes/cframe";
+ sha256 = "0pngdaflk1pk2xmwbij4b520b3mlacnjab4r3jby0phah44ziv4l";
+ name = "cframe";
+ };
+ packageRequires = [ buffer-manage dash emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/cframe";
+ license = lib.licenses.free;
+ };
+ }) {};
chapel-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "chapel-mode";
@@ -4024,48 +4148,6 @@
license = lib.licenses.free;
};
}) {};
- chinese-fonts-setup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "chinese-fonts-setup";
- version = "0.1";
- src = fetchFromGitHub {
- owner = "tumashu";
- repo = "cnfonts";
- rev = "6f4423664e55d5470c4f239d04b88da5d6acb34d";
- sha256 = "0d9xx43ijxrp95j5bnxcsnfwn032ypy2c1lypak15772nk6i7s1w";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/0d5787ffeeee68ffa41f3e777071815084e0ed7a/recipes/chinese-fonts-setup";
- sha256 = "0fqj721zk57641wxnmk82wsj08ycnzj61z9i34x58d7c0k3424w1";
- name = "chinese-fonts-setup";
- };
- packageRequires = [ cl-lib ];
- meta = {
- homepage = "https://melpa.org/#/chinese-fonts-setup";
- license = lib.licenses.free;
- };
- }) {};
- chinese-pyim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pyim }:
- melpaBuild {
- pname = "chinese-pyim";
- version = "1.6.1";
- src = fetchFromGitHub {
- owner = "tumashu";
- repo = "pyim";
- rev = "f4dacfbac11d6d58f1fcbf766691e03b6983a9f6";
- sha256 = "0dy0y159fqcip805l86gmjbsgbcvj3hm5rfsc6slinmxsrl4nl9l";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/chinese-pyim";
- sha256 = "0chh4vnb2gh6ckf01w7xd1kw4454p1vkzmy17dvm0c7269rya9mn";
- name = "chinese-pyim";
- };
- packageRequires = [ pyim ];
- meta = {
- homepage = "https://melpa.org/#/chinese-pyim";
- license = lib.licenses.free;
- };
- }) {};
chinese-word-at-point = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "chinese-word-at-point";
@@ -4090,16 +4172,16 @@
choice-program = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "choice-program";
- version = "0.1";
+ version = "0.4";
src = fetchFromGitHub {
owner = "plandes";
repo = "choice-program";
- rev = "154c12ed7e2afc2d5dae031698be4787d7d647b0";
- sha256 = "1695pmz0j93pz3pkcyqk0ngajcf8cyzxihmpp2zfspya3ihxj4ia";
+ rev = "27607ec1fe241c58fbc1f861454a8e2ec1fd7b15";
+ sha256 = "0q8krgsydrc2xc29y60qljifdvxfmxnvbncxsh64xhrzsnrgwmq5";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/894357125db5035999a39514516852d7e957453e/recipes/choice-program";
- sha256 = "0hhp6qhrshqrw4978xq6biwddm7gv7yf4avbb64xvz66i3a2kgy1";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/6e39555b2538cc8a955766c5533871396e8fe712/recipes/choice-program";
+ sha256 = "0a21yd3b8sb15vms9mclaa7xnnk0as08p6q38mwdwjp9sgcfyh1b";
name = "choice-program";
};
packageRequires = [ cl-lib emacs ];
@@ -4111,12 +4193,12 @@
cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }:
melpaBuild {
pname = "cider";
- version = "0.15.0";
+ version = "0.15.1";
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "cider";
- rev = "e503f5628ef98bd768f08c698863e8e33a7af3b4";
- sha256 = "1bb0l06af7k7zzsig8kmn71krbm9mwdj7dc0s17rbhnm84cdfc8b";
+ rev = "8a9eab32646abcaaf31fe83b2d897c01971b98f1";
+ sha256 = "0ddkm87l9ann05a6j57r0x59qqgfavwrvlzhkc5xhak1nmk5556h";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider";
@@ -4171,15 +4253,36 @@
license = lib.licenses.free;
};
}) {};
+ circadian = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "circadian";
+ version = "0.3.0";
+ src = fetchFromGitHub {
+ owner = "GuidoSchmidt";
+ repo = "circadian.el";
+ rev = "feec308591b43e7869d7a018d5c6fc7e943d53ee";
+ sha256 = "0j8an9ny3jk9nmlpi360n064m20nhah9p8rj6wb9xbvnfrri5zjk";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/3440905a20bc91bb2637a87c04ff8410379f150d/recipes/circadian";
+ sha256 = "13797y1w1636bibisz5i5p2xp0smd3apnhc1nx8ijm75smx679id";
+ name = "circadian";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/circadian";
+ license = lib.licenses.free;
+ };
+ }) {};
circe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "circe";
- version = "2.5";
+ version = "2.6";
src = fetchFromGitHub {
owner = "jorgenschaefer";
repo = "circe";
- rev = "13c605e639194c3da0c2e685056fac685f8c76a0";
- sha256 = "0n7v0g332ml1ang2fjc8rjbi8h1f4bqazcqi8dlfn99vvv8kcd21";
+ rev = "59f1096238e6c30303a6fe9fc1c635f49e5946c6";
+ sha256 = "19h3983zy3f15cgs86irvbdzz55qyjm48qd7gjlzcxplr7vnnh0j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/circe";
@@ -4279,12 +4382,12 @@
cliphist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
melpaBuild {
pname = "cliphist";
- version = "0.5.3";
+ version = "0.5.4";
src = fetchFromGitHub {
owner = "redguardtoo";
repo = "cliphist";
- rev = "acbd9782d82d7ae6bfb22fb0955597b9c5fcbb6c";
- sha256 = "1gj5fqjyr4m4qim9qjsvzzk42rm3vw3yycvq3nj0wpj90zb1yh14";
+ rev = "2aceea0e16e2f18b8b51161423ef1c0f655c7c8d";
+ sha256 = "13vhm7dsqbaslml3a2hd3s39c7q494p5w2xznhdxvh8ig6w102lc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/82d86dae4ad8efc8ef342883c164c56e43079171/recipes/cliphist";
@@ -4501,12 +4604,12 @@
closql = callPackage ({ emacs, emacsql-sqlite, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "closql";
- version = "0.3.3";
+ version = "0.4.0";
src = fetchFromGitHub {
owner = "emacscollective";
repo = "closql";
- rev = "0bb0fa3dd1e545cbf025d42e253ddb00107156a3";
- sha256 = "1mpycmj88gi62rhzxdv4933l318j3llphbc00b7rvzms55sgpcz5";
+ rev = "66597831248bbe14ebc7bbf24b24cafebb5fd362";
+ sha256 = "0jxf7k95l2j6rjyafq3zj6bxaa2xn4zmi4zg1n04sachcdrcgh3l";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/closql";
@@ -4585,12 +4688,12 @@
cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cmake-mode";
- version = "3.9.1";
+ version = "3.10.0pre4";
src = fetchFromGitHub {
owner = "Kitware";
repo = "CMake";
- rev = "fca4423786ba2c4a5ab0ec6c1a1cbac8cd8600b4";
- sha256 = "08x5mqhrsm3y28hiy32h336n9ggn2snb56k242hqhij1lsg7iga3";
+ rev = "45da558742bad36be518e8d95dee0d0ec3793a64";
+ sha256 = "0qq7dhwcl290ymza5imc16cg3f9crxym1q6b4i7w9fax8x2vlc1m";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -4624,6 +4727,27 @@
license = lib.licenses.free;
};
}) {};
+ cnfonts = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "cnfonts";
+ version = "0.9.1";
+ src = fetchFromGitHub {
+ owner = "tumashu";
+ repo = "cnfonts";
+ rev = "cbe1ddd49e33b790a568c55351146aa5b909f173";
+ sha256 = "11d44lf0m0kbzq1mvyqkl4aprys0xqaarp08nij57xnynin1rynx";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/0d5787ffeeee68ffa41f3e777071815084e0ed7a/recipes/cnfonts";
+ sha256 = "1pryn08fkdrdj7w302205nj1qhfbk1jzqxx6717crrxakkdqmn9w";
+ name = "cnfonts";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/cnfonts";
+ license = lib.licenses.free;
+ };
+ }) {};
codic = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "codic";
@@ -4750,6 +4874,27 @@
license = lib.licenses.free;
};
}) {};
+ colormaps = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "colormaps";
+ version = "0.1.2";
+ src = fetchFromGitHub {
+ owner = "lepisma";
+ repo = "colormaps.el";
+ rev = "3a88961ba66b09a49ea5aa92b2b8776b2c92d68c";
+ sha256 = "083hks2zzalizdsgabiwc1kd114r748v5i3w3kfk8pv37i2gay35";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/f4c795d9e323b08bc8354a6933a061644705a2ec/recipes/colormaps";
+ sha256 = "16plhgpfz1wb58p6h8wxjhplhgv0mbj3f2xj34p6vydh44l8w8q2";
+ name = "colormaps";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/colormaps";
+ license = lib.licenses.free;
+ };
+ }) {};
commander = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "commander";
@@ -4792,6 +4937,27 @@
license = lib.licenses.free;
};
}) {};
+ comment-tags = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
+ melpaBuild {
+ pname = "comment-tags";
+ version = "0.1";
+ src = fetchFromGitHub {
+ owner = "vincekd";
+ repo = "comment-tags";
+ rev = "293a30026d7750f6657d6c2e6d6428abf1d7db5a";
+ sha256 = "06s0phgqpzkkv81gl0cm6x8rjs53lhs8b2j56xamflqiydq0fz7n";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/6ac71f4ffc19bce4f571001f9270d5be855dfc3c/recipes/comment-tags";
+ sha256 = "13slv150zch0b7zpxa2dbqjzpqh0iy559m6rc0zs0dwdagzryp3i";
+ name = "comment-tags";
+ };
+ packageRequires = [ emacs pkg-info ];
+ meta = {
+ homepage = "https://melpa.org/#/comment-tags";
+ license = lib.licenses.free;
+ };
+ }) {};
commenter = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
melpaBuild {
pname = "commenter";
@@ -4900,12 +5066,12 @@
company-cabal = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "company-cabal";
- version = "0.1.1";
+ version = "0.2.1";
src = fetchFromGitHub {
owner = "iquiw";
repo = "company-cabal";
- rev = "a570559ff92522598b5ed40e21c4539fffb3e976";
- sha256 = "1pja44g15d11kl47abzykrp28j782nkbmb0db0ilpc96xf1fjlsw";
+ rev = "f458de88cad16ed48a605e8347e56433e73dcef8";
+ sha256 = "0ll9dxzsgrpy4psz3dqhzny990lfccn63swcyfvl8mnqgwbrq8k0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ee888b1ba57b6af3a3330607898810cd248862db/recipes/company-cabal";
@@ -5065,22 +5231,22 @@
license = lib.licenses.free;
};
}) {};
- company-go = callPackage ({ company, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ company-go = callPackage ({ company, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
melpaBuild {
pname = "company-go";
- version = "20150303";
+ version = "20170907";
src = fetchFromGitHub {
owner = "nsf";
repo = "gocode";
- rev = "eef10fdde96a12528a6da32f51bf638b2863a3b1";
- sha256 = "03snnra31b5j6iy94gql240vhkynbjql9b4b5j8bsqp9inmbsia3";
+ rev = "c7fddb39ecbc9ebd1ebe7d2a3af473ed0fffffa1";
+ sha256 = "0qx8pq38faig41xkl1a4hrgp3ziyjyn6g53vn5wj7cdgm5kk67nb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/company-go";
sha256 = "1ncy5wlg3ywr17zrxb1d1bap4gdvwr35w9a8b0crz5h3l3y4cp29";
name = "company-go";
};
- packageRequires = [ company ];
+ packageRequires = [ company go-mode ];
meta = {
homepage = "https://melpa.org/#/company-go";
license = lib.licenses.free;
@@ -5089,12 +5255,12 @@
company-irony = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, irony, lib, melpaBuild }:
melpaBuild {
pname = "company-irony";
- version = "1.0.0";
+ version = "1.1.0";
src = fetchFromGitHub {
owner = "Sarcasm";
repo = "company-irony";
- rev = "cebd82506c59d21a9c436bd8e8a33dfa8be84955";
- sha256 = "09mzxyvp07qwdhxagyiggpccxsklkbhjg730q6wbqd13g1mlkryj";
+ rev = "52aca45bcd0f2cb0648fcafa2bbb4f8ad4b2fee7";
+ sha256 = "1qgyam2vyjw90kpxns5cd6bq3qiqjhzpwrlvmi18vyb69qcgqd8a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/company-irony";
@@ -5149,6 +5315,27 @@
license = lib.licenses.free;
};
}) {};
+ company-lsp = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, s }:
+ melpaBuild {
+ pname = "company-lsp";
+ version = "1.0.0";
+ src = fetchFromGitHub {
+ owner = "tigersoldier";
+ repo = "company-lsp";
+ rev = "86fda23d29b732ba3987bf20901034da1515b077";
+ sha256 = "068lg2yrpnzq8cg73irnx7i41giww7m0ysnl2inc7hikhmm3a95y";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/5125f53307c1af3d9ccf2bae3c25e7d23dfe1932/recipes/company-lsp";
+ sha256 = "09nbi6vxw8l26gfgsc1k3bx4m8i1px1b0jxaywszky5bv4fdy03l";
+ name = "company-lsp";
+ };
+ packageRequires = [ company emacs lsp-mode s ];
+ meta = {
+ homepage = "https://melpa.org/#/company-lsp";
+ license = lib.licenses.free;
+ };
+ }) {};
company-math = callPackage ({ company, fetchFromGitHub, fetchurl, lib, math-symbol-lists, melpaBuild }:
melpaBuild {
pname = "company-math";
@@ -5215,12 +5402,12 @@
company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "company-php";
- version = "1.7.9";
+ version = "1.8.1";
src = fetchFromGitHub {
owner = "xcwen";
repo = "ac-php";
- rev = "e0aaae30e4e5f18390e5d00953db02c1f03c44f6";
- sha256 = "1mrk37w88b4843jbghr9i79rbwbzwk8b1wljvzmm6x0q7ldlxmsm";
+ rev = "317ad1d023db6b2fe67444a2c075e656c35f5094";
+ sha256 = "1wyf93faq6z6wgcs3lxc6gv75bmxchg6kd98dza61zdyc0rj60wa";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php";
@@ -5284,12 +5471,12 @@
company-rtags = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rtags }:
melpaBuild {
pname = "company-rtags";
- version = "2.12";
+ version = "2.14";
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "db1244c1c14514324474f362c857112e89bbf0c6";
- sha256 = "1fcrlxk9z11vbarznfcpfyqzvj6v3ydbn5z6vbdmgf9cxb52kfma";
+ rev = "15ef9a8bab847773d6e247005be929422fc9c285";
+ sha256 = "0yq3c4ich0sffzd571drb7k4vs0bvblx6qcrb6zry75d9npggsyg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags";
@@ -5475,14 +5662,14 @@
pname = "composer";
version = "0.0.8";
src = fetchFromGitHub {
- owner = "zonuexe";
+ owner = "emacs-php";
repo = "composer.el";
rev = "2d16d3bb65c53e9e26f4b7b22ad38590a4a48ee1";
sha256 = "1zxqqd12p1db75icbwbdj51fvp8zzhivi8ssnxda1r5y5crbiqdv";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/39c5002f0688397a51b1b0c6c15f6ac07c3681bc/recipes/composer";
- sha256 = "1gwgfbb0fqn87s7jscr9xy47h239wy74n3hgpk4i16p2g6qinpza";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/composer";
+ sha256 = "01w9cywhfngkrl9az8kfpzm12nc0zwmax01pyxlbi2l2icmvp5s1";
name = "composer";
};
packageRequires = [ emacs f request s seq ];
@@ -5515,12 +5702,12 @@
conda = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }:
melpaBuild {
pname = "conda";
- version = "0.0.7";
+ version = "0.0.8";
src = fetchFromGitHub {
owner = "necaris";
repo = "conda.el";
- rev = "6ba9ef5d72ef613f478e07e2ebf57b47066beee7";
- sha256 = "0mp6jzyvz3m41vb4kwwikyvcjgc8qgryyx71n1m50jr2i23s9nk2";
+ rev = "526be691824f4a32299f560a883913697bc4d847";
+ sha256 = "1jix3md6b02fypjm4y05av7acjkqryd1vqqz9wgxyinydlagrvh7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fcf762e34837975f5440a1d81a7f09699778123e/recipes/conda";
@@ -5596,6 +5783,27 @@
license = lib.licenses.free;
};
}) {};
+ contextual-menubar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "contextual-menubar";
+ version = "1.0.0";
+ src = fetchFromGitHub {
+ owner = "aaronjensen";
+ repo = "contextual-menubar";
+ rev = "cc2e7c952b59401188b81d84be81dead9d0da3db";
+ sha256 = "01mk5xzsg52vfqjri1my193y6jczg2dp3pa2d0v0vw11m1k433h3";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/cba21d98f3abbf1f45d1fdd9164d4660b7d3e368/recipes/contextual-menubar";
+ sha256 = "0r9bsnvf45h7gsdfhsz7h02nskjvflfa2yjarjv9fcl7aipz8rr6";
+ name = "contextual-menubar";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/contextual-menubar";
+ license = lib.licenses.free;
+ };
+ }) {};
copy-as-format = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "copy-as-format";
@@ -5617,6 +5825,27 @@
license = lib.licenses.free;
};
}) {};
+ copy-file-on-save = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+ melpaBuild {
+ pname = "copy-file-on-save";
+ version = "0.0.2";
+ src = fetchFromGitHub {
+ owner = "emacs-php";
+ repo = "emacs-auto-deployment";
+ rev = "fe78b4c9fdc261ce22a771765702ebe4d9437c84";
+ sha256 = "0vf6qp7fxqvgd02vfsbmm38vc8n2wvrfwv4wnsr15gd8y8zldlgs";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/copy-file-on-save";
+ sha256 = "1mcwgkhd241aijnmzrrqqn9f7hiq5k1w4fj83v50aixrcs049gc3";
+ name = "copy-file-on-save";
+ };
+ packageRequires = [ cl-lib emacs f s ];
+ meta = {
+ homepage = "https://melpa.org/#/copy-file-on-save";
+ license = lib.licenses.free;
+ };
+ }) {};
copyit = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "copyit";
@@ -5701,22 +5930,22 @@
license = lib.licenses.free;
};
}) {};
- counsel-bbdb = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
+ counsel-bbdb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "counsel-bbdb";
- version = "0.0.1";
+ version = "0.0.2";
src = fetchFromGitHub {
owner = "redguardtoo";
repo = "counsel-bbdb";
- rev = "297d0c7e6e1eaafcd5e188724fea8e8f26b95555";
- sha256 = "14gw4d855v2nvqh06vs9rzs816pn1hp4rhfikb0wzg1ay6gdrwi7";
+ rev = "f95e4812cd17e5f8069c9209241396780d414680";
+ sha256 = "08zal6wyzxqqg9650xyj2gmhb5cr34zwjgpfmkiw610ypld1xr73";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0ed9bcdb1f25a6dd743c1dac2bb6cda73a5a5dc2/recipes/counsel-bbdb";
sha256 = "14d9mk44skpmyj0zkqwz97j80r630j7s5hfrrhlsafdpl5aafjxp";
name = "counsel-bbdb";
};
- packageRequires = [ emacs ivy ];
+ packageRequires = [];
meta = {
homepage = "https://melpa.org/#/counsel-bbdb";
license = lib.licenses.free;
@@ -5743,6 +5972,27 @@
license = lib.licenses.free;
};
}) {};
+ counsel-etags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "counsel-etags";
+ version = "1.2.0";
+ src = fetchFromGitHub {
+ owner = "redguardtoo";
+ repo = "counsel-etags";
+ rev = "5d7b51ce7806bbe7e1f75077b4dde2ac17a53c5d";
+ sha256 = "0v3b3gs4jy8cqkvchnakwpws3a0igiklchb9q3754lnmk8784dn8";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/87528349a3ab305bfe98f30c5404913272817a38/recipes/counsel-etags";
+ sha256 = "1h3dlczm1m21d4h41vz9ngg5fi02g6f95qalfxdnsvz0d4w4yxk0";
+ name = "counsel-etags";
+ };
+ packageRequires = [ counsel emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/counsel-etags";
+ license = lib.licenses.free;
+ };
+ }) {};
counsel-gtags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "counsel-gtags";
@@ -6121,6 +6371,27 @@
license = lib.licenses.free;
};
}) {};
+ cwl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yaml-mode }:
+ melpaBuild {
+ pname = "cwl-mode";
+ version = "0.2.4";
+ src = fetchFromGitHub {
+ owner = "tom-tan";
+ repo = "cwl-mode";
+ rev = "c5110c1e035535a1133a7107c0d2d55e5fe3c5b9";
+ sha256 = "088998r78bpy77pb2rhbr6a2fks5mcy3qyvyzlqwwl0v2gnscl59";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/2309764cd56d9631dd97981a78b50b9fe793a280/recipes/cwl-mode";
+ sha256 = "0x8akxxmphpgsc2m78h6b0fs6vvcfvmi1q2jrz8hwlmai8f7zi9j";
+ name = "cwl-mode";
+ };
+ packageRequires = [ emacs yaml-mode ];
+ meta = {
+ homepage = "https://melpa.org/#/cwl-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
cyberpunk-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cyberpunk-theme";
@@ -6166,12 +6437,12 @@
cython-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cython-mode";
- version = "0.26";
+ version = "0.27.3";
src = fetchFromGitHub {
owner = "cython";
repo = "cython";
- rev = "62f04f6766386893f5da6bee23d4de1e92a4148d";
- sha256 = "0rw22qa67ifrw7kd58wjs2bnrjzkpr75k1rbhdgba526mm4s0q0x";
+ rev = "8ad16fc871be075f889d5e7c2892db3e4c8ce978";
+ sha256 = "144mqqyaid6w9qx38m88snd3c8qm2k1a73vs21h9cmnp19gigfby";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@@ -6208,12 +6479,12 @@
dad-joke = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dad-joke";
- version = "1.2";
+ version = "1.4";
src = fetchFromGitHub {
owner = "davep";
repo = "dad-joke.el";
- rev = "98e5e5ed4c57f6076afb55d75af66e787867d9f9";
- sha256 = "017fdcbggnmnj9ri1a7id29l20pingw6mr1sk55xzkwgwf3v30fr";
+ rev = "bee47e7b746b403228fa7d7361cb095de19ac9ba";
+ sha256 = "14snnnjs28jg6k8x6g90m3dbcx10306ipcd256d3l6czk9p17vpd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/484d571b2737f7c613816333afdde6460c64e635/recipes/dad-joke";
@@ -6226,22 +6497,22 @@
license = lib.licenses.free;
};
}) {};
- dante = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+ dante = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild, s }:
melpaBuild {
pname = "dante";
- version = "1.2";
+ version = "1.3";
src = fetchFromGitHub {
owner = "jyp";
repo = "dante";
- rev = "385dd8114bb9eaba44943f00f9f7aea71af7bf34";
- sha256 = "1jkdq9li3vqzdmmznpaxak7mf9y9vlk0abdb7ffzvvlry19dvgs8";
+ rev = "6b260611dc08468fca9b9af132a00783dd2cf8d9";
+ sha256 = "0s5wi010sn3ng9fr7fqbc11kmjqirr28wya3rnnzzb3m5gyxs8id";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante";
sha256 = "1j0qwjshh2227k63vd06bvrsccymqssx26yfzams1xf7bp6y0krs";
name = "dante";
};
- packageRequires = [ dash emacs flycheck ];
+ packageRequires = [ dash emacs f flycheck haskell-mode s ];
meta = {
homepage = "https://melpa.org/#/dante";
license = lib.licenses.free;
@@ -6250,12 +6521,12 @@
darcula-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "darcula-theme";
- version = "1.1";
+ version = "2.0";
src = fetchFromGitLab {
owner = "fommil";
repo = "emacs-darcula-theme";
- rev = "834202004507221c3bdf49457219a56760b13d22";
- sha256 = "1j2g94cz9b3ivv0w88gw1hcf236kc0c7hnrf13yyspxjm5jfdmd5";
+ rev = "2ecd466ffa7a3157b9ddcd7545b6fb8ad308c976";
+ sha256 = "1h5lssnc1am54hkprnp61bsj5fnm8j556q2gbhljfjgrdwnqv8ky";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/23c8f10205187babb17e3abc3dc40eb1938e6640/recipes/darcula-theme";
@@ -6355,12 +6626,12 @@
dashboard = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, page-break-lines }:
melpaBuild {
pname = "dashboard";
- version = "1.2.3";
+ version = "1.2.4";
src = fetchFromGitHub {
owner = "rakanalh";
repo = "emacs-dashboard";
- rev = "f435fd394edc5ad9cf82065ef73b5821e3f93c58";
- sha256 = "0f0ipnij69z90qv9lzl6x9id3f6nayrgqxppbcf4gkxh25pi5nkw";
+ rev = "8594c4f55448148b720eda5b72d51667fb7a8a39";
+ sha256 = "1hhh1kfsz87qfmh45wjf2r93rz79rq0vbyxlfrsl02092zjbl1zr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e9a79341ccaa82a8c065e71c02fe6aee22007c66/recipes/dashboard";
@@ -6418,12 +6689,12 @@
datetime = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "datetime";
- version = "0.2.1";
+ version = "0.3";
src = fetchFromGitHub {
owner = "doublep";
repo = "datetime";
- rev = "3ecf9985250ecd441e91614b44cf12323af907c0";
- sha256 = "1x8kj6d9p42lffk15m0c955ibwxxvfxhihij43alwq5xab2l16bv";
+ rev = "082d2c7b0e38c26a8c46af9c9956a2e100d88e71";
+ sha256 = "0fdswqi53qx924lib7nd9dazn0916xf1ybrh3bcn3f8cn6b8ikg5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fff9f0748b0ef76130b24e85ed109325256f956e/recipes/datetime";
@@ -7045,6 +7316,27 @@
license = lib.licenses.free;
};
}) {};
+ diredfl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "diredfl";
+ version = "0.4";
+ src = fetchFromGitHub {
+ owner = "purcell";
+ repo = "diredfl";
+ rev = "45e9c46f58c655694758d4986b9195c8bb40ddf3";
+ sha256 = "1zb2lz7rp58zqvpniqcsmqabi7nqg2d8bfd0hgmq68bn2hd25b5z";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/3da86e18d423198766455929da1dcb3a9a3be381/recipes/diredfl";
+ sha256 = "0cybq15yq07x2mnrnwapy020d598yymcy8y9wwf1m7f59p3h9hvn";
+ name = "diredfl";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/diredfl";
+ license = lib.licenses.free;
+ };
+ }) {};
diredful = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "diredful";
@@ -7132,12 +7424,12 @@
disable-mouse = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "disable-mouse";
- version = "0.2";
+ version = "0.3";
src = fetchFromGitHub {
owner = "purcell";
repo = "disable-mouse";
- rev = "d1c52d80ed2149d0751afd948ffc2d9f80f589ac";
- sha256 = "1v1y5hf6k6ng7xsvgb27nh740d14m6l4krr0paccda8zgm4mw357";
+ rev = "81639930bcaeedadbcc19728e91719afcac84613";
+ sha256 = "0l6mai68ns3qw3rlvjvzsnqwdy7bxqiy0vdwflq0l1plxb1vazyc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/dbbc396373212fdf731e135cde391f27708ff015/recipes/disable-mouse";
@@ -7307,12 +7599,12 @@
docker-compose-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yaml-mode }:
melpaBuild {
pname = "docker-compose-mode";
- version = "0.3.1";
+ version = "1.0.0";
src = fetchFromGitHub {
owner = "meqif";
repo = "docker-compose-mode";
- rev = "37d8afb6a72f829fdbc77e76f18587530ff319b4";
- sha256 = "11283gl19iqm03a5l635qq36fpxlj05j7a6hlnv7v15n3h7d5512";
+ rev = "ae25b0e01394f94995f4b0ceaab1e04eb4b9acbd";
+ sha256 = "14xri92dcj52vw1vhrnicibrn9y010zv8w7jw6j3q9lrpmr073lr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/37dd4c1fc11d22598c6faf03ccc860503a68b950/recipes/docker-compose-mode";
@@ -7538,12 +7830,12 @@
drupal-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode }:
melpaBuild {
pname = "drupal-mode";
- version = "0.7.1";
+ version = "0.7.3";
src = fetchFromGitHub {
owner = "arnested";
repo = "drupal-mode";
- rev = "1e6f973ed5dfdbbfda96c4ab266bd8ef3d6436d7";
- sha256 = "1c3krir3l04rwlyadnhra6kmbnmvdm95aj7iwspa6dssnry4vflj";
+ rev = "49ce63c659aa0af7a2daf0c9e74e58fbce6deb71";
+ sha256 = "1l2xc24y037b3z62yxmq2bx1x3qqv56d15bf3qmb3mpgm4gh85j6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/13e16af340868048eb1f51f9865dfc707e57abe8/recipes/drupal-mode";
@@ -7580,12 +7872,12 @@
dtrt-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dtrt-indent";
- version = "0.2.1";
+ version = "0.3";
src = fetchFromGitHub {
owner = "jscheid";
repo = "dtrt-indent";
- rev = "a54871bedadabede505b3913ee1039f5ab36cad2";
- sha256 = "0ylch7q8lh2r10qzrb41bnrpnznvj5fjszazmxfcvj6ss8yrxjzi";
+ rev = "69d0c5e143453708dbf0ebec4e368bc26fff683c";
+ sha256 = "154m53hhzjawmrg2vlqjcg9npgq1igw9f0fz6gh7vscmbxl5dnjq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/61bcbcfa6c0f38a1d87f5b6913b8be6c50ef2994/recipes/dtrt-indent";
@@ -7622,12 +7914,12 @@
dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }:
melpaBuild {
pname = "dumb-jump";
- version = "0.5.0";
+ version = "0.5.1";
src = fetchFromGitHub {
owner = "jacktasia";
repo = "dumb-jump";
- rev = "c96467b3079495353350a6b00fd2e6052b3a3fd0";
- sha256 = "04jhbapf84if54d648mx1fk7b9vwrnd0apyarwjv7p1azasm6vwl";
+ rev = "64c0759432334465ccea115d83600b468f86e3be";
+ sha256 = "00vhxd7z7fw2cwdzgvfbdzfp668dfaw83c95kkicmmdzlabiz50i";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dumb-jump";
@@ -7646,8 +7938,8 @@
version = "0.7";
src = fetchhg {
url = "https://bitbucket.com/harsman/dyalog-mode";
- rev = "56fa34ea25d4";
- sha256 = "1hk7i557m0m42zdg59z278cylglnp49dr8wa3zbdwzk2xzdg0m00";
+ rev = "9e446540a794";
+ sha256 = "0gyip843fdqp6cwwaqcrnpngf5a3iqcbd9h7rl5lbvxpkqvm7shi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode";
@@ -7828,15 +8120,36 @@
license = lib.licenses.free;
};
}) {};
+ eacl = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
+ melpaBuild {
+ pname = "eacl";
+ version = "1.0.3";
+ src = fetchFromGitHub {
+ owner = "redguardtoo";
+ repo = "eacl";
+ rev = "ef58d13fbff4b5c49f934cfb9e3fd6ee219ef4b2";
+ sha256 = "0xxxzdr6iddxwx8z4lfay4n9r1ry8571lj2gadz5ycff6f6bxmhb";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/8223bec7eed97f0bad300af9caa4c8207322d39a/recipes/eacl";
+ sha256 = "16afsf3diz498jb63q85lm5ifvm487clfl838qzagl1l4aywhlwr";
+ name = "eacl";
+ };
+ packageRequires = [ emacs ivy ];
+ meta = {
+ homepage = "https://melpa.org/#/eacl";
+ license = lib.licenses.free;
+ };
+ }) {};
easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "easy-hugo";
- version = "1.5.7";
+ version = "2.0.16";
src = fetchFromGitHub {
owner = "masasam";
repo = "emacs-easy-hugo";
- rev = "55bac7a4ede3e14ac38a8dc4249df0a0d3ee6c1c";
- sha256 = "0j0vi3c6r8jqn4ijmg9xy55yccmjf3mza9ps8iz2s1d8qv8f2y3s";
+ rev = "d55472bdb08850fb3b2b27a373630c68f6cd2ac0";
+ sha256 = "168wz1638arypqz6i0mzj1pw6mzgp6x10i2wz2vpgkw5p79zw46i";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo";
@@ -8125,12 +8438,12 @@
edit-indirect = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "edit-indirect";
- version = "0.1.4";
+ version = "0.1.5";
src = fetchFromGitHub {
owner = "Fanael";
repo = "edit-indirect";
- rev = "1d1dae842505e5ff09644529deec87c056e1b14e";
- sha256 = "145knahvvxbm8qmcdb69ilrg14w7130vav2pqjd7anr1l8n2i6gz";
+ rev = "032ac0ec690d4999d564fd882588c7a197efe8dd";
+ sha256 = "0by1x53pji39fjrj5bd446kz831nv0vdgw2jqasbym4pc1p2947r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/edit-indirect";
@@ -8272,12 +8585,12 @@
eg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "eg";
- version = "1.0";
+ version = "1.1";
src = fetchFromGitHub {
owner = "davep";
repo = "eg.el";
- rev = "66c7bfd84151cac093090834919a615d5f824b42";
- sha256 = "0pk8rvfdybkkrxb80yhj831gr3sj075gair9g7p60jfnyxwsgqw2";
+ rev = "0791452498719afb7409d1f723dbea2ec26d56f1";
+ sha256 = "1y16pah8f4jp117vihvlcwvsw2i85gdk45h9y9r1w9mslb24faac";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3d2b6b92b2a71486f260571885bf149ad6afc551/recipes/eg";
@@ -8314,12 +8627,12 @@
egison-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "egison-mode";
- version = "3.6.4";
+ version = "3.7.0";
src = fetchFromGitHub {
owner = "egisatoshi";
repo = "egison3";
- rev = "62c99118f32dd23a088e2d9c0d6b7b755206cac6";
- sha256 = "1f0s9pvns4gq6xzp4vp74xxxbmzp06vdv0jgh0x1xy0mfklgll8x";
+ rev = "accb84375895946f0d0bed3917e0193074bd4131";
+ sha256 = "0adxbjbmph186amkyhyl9syypfawarxmyk80zz4c0b6bgxy15rc1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode";
@@ -8351,22 +8664,32 @@
license = lib.licenses.free;
};
}) {};
- ein = callPackage ({ cl-generic, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }:
+ ein = callPackage ({ auto-complete, cl-generic, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, request-deferred, s, skewer-mode, websocket }:
melpaBuild {
pname = "ein";
- version = "0.12.8";
+ version = "0.13.0";
src = fetchFromGitHub {
owner = "millejoh";
repo = "emacs-ipython-notebook";
- rev = "2dcec6a2c4d3258a92f77a35de1899cc00d2f537";
- sha256 = "0n8qvdj88d679ijjqs04cnnhz8prk8s3whijbp3lhlr5n034n8xa";
+ rev = "213cea559e7a8fb50e303ea25e1626fefddaf4bd";
+ sha256 = "18ysd78pfyymqd0f6ipma9p9x61pw21f0jwk118r5yi00wnry9za";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein";
sha256 = "14blq1cbrp00rq0ilk7z9qppqfj0r4n3jidw3abcpchvh5ln086r";
name = "ein";
};
- packageRequires = [ cl-generic dash deferred request websocket ];
+ packageRequires = [
+ auto-complete
+ cl-generic
+ dash
+ deferred
+ request
+ request-deferred
+ s
+ skewer-mode
+ websocket
+ ];
meta = {
homepage = "https://melpa.org/#/ein";
license = lib.licenses.free;
@@ -8564,12 +8887,12 @@
el2org = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "el2org";
- version = "0.5.0";
+ version = "0.6.0";
src = fetchFromGitHub {
owner = "tumashu";
repo = "el2org";
- rev = "c85837d56ed8fe1b31927755294db49ac46f443e";
- sha256 = "0znnvpngghd9z8a0cakpvrw261mnmxqa15lpjcxfm7w8wgb2d4f6";
+ rev = "4a33469cd305e581603d7ef63bc2a1f2156f2e2e";
+ sha256 = "0mzddqny6wpg1fv99xrvlv7rxmaifvmy5bvj4in4pldhm4cx4q1b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/el2org";
@@ -8690,12 +9013,12 @@
elisp-refs = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }:
melpaBuild {
pname = "elisp-refs";
- version = "1.1";
+ version = "1.2";
src = fetchFromGitHub {
owner = "Wilfred";
repo = "refs.el";
- rev = "e309c87a91012305ecb37124a758609c64e0ca4a";
- sha256 = "0wvz5ysaj2dnqhkp5xdqsm45fxwlhym5j8rn4g0h7g7zwdi3c6c6";
+ rev = "8f2da5ba5b728a8f278813c95d0fda3364cca40c";
+ sha256 = "0i0xjy4x3i349jbpbqhfz57frk8cdakwi78fw1mlycx4qinlx2n0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/60891099e241ebd32d39bdcfe4953529a5a3263e/recipes/elisp-refs";
@@ -8900,12 +9223,12 @@
elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }:
melpaBuild {
pname = "elpy";
- version = "1.16.0";
+ version = "1.17.0";
src = fetchFromGitHub {
owner = "jorgenschaefer";
repo = "elpy";
- rev = "c33794ae03fa787c7f93b93cc9427d864b63e25f";
- sha256 = "1q8zjsl9zbgwqcbvzkdlqy28z4h1qr0kkhhrq037vab0w0l0zi6l";
+ rev = "99f0b6401bff25d40b9f58123533271f7870a286";
+ sha256 = "06n0vr8y5s8y7q9v96z030l1i9n29p622p36biyi5cjcmgf5h09j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy";
@@ -8991,12 +9314,12 @@
elx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "elx";
- version = "1.1.0";
+ version = "1.1.1";
src = fetchFromGitHub {
owner = "emacscollective";
repo = "elx";
- rev = "6ce9a2f14ecf7263e71a699e058293f0343bfe4d";
- sha256 = "1i250nv416jmknb39a390bxvdsf0dlgwfjn67n5gn6sia99lgjhq";
+ rev = "9f5d593b65686e8da29ef79457c8f6fc061af7e5";
+ sha256 = "1vs7nmsi82gv9mw1mia6ri1vmn26ldwnj8akirqgq31rfgyfj4vh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/elx";
@@ -9201,12 +9524,12 @@
embrace = callPackage ({ cl-lib ? null, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "embrace";
- version = "0.1.3";
+ version = "0.1.4";
src = fetchFromGitHub {
owner = "cute-jumper";
repo = "embrace.el";
- rev = "a57b4be5d60daf8c176f9bd35770540c2d3963c9";
- sha256 = "0sn81a7f8g5i4q74byfkj0jlg4aj0rxpfvx9sqv8azcg6wq2f65l";
+ rev = "dd5da196e5bcc5e6d87e1937eca0c21da4334ef2";
+ sha256 = "1m0qyipkp5ydgcav8d0m58fbj1gilipbj7g8mg40iajr8wfqcjdc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e8f07e3b5ba4ec4b0b79fba5a2cca5a3986218b6/recipes/embrace";
@@ -9240,20 +9563,21 @@
license = lib.licenses.free;
};
}) {};
- emms = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
+ emms = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }:
+ melpaBuild {
pname = "emms";
- version = "4.3";
+ version = "4.4";
src = fetchgit {
url = "https://git.savannah.gnu.org/git/emms.git";
- rev = "4cb3ae341847e8e8586373a95a458a453469812d";
- sha256 = "0bmxlrk2p51bw5lgh2arkcz1v9bw6rpflwk778rdzn0rhzhvhp5b";
+ rev = "88fecd0234da595843ce6be4d3f9f2b755ff612d";
+ sha256 = "0ycm2lggljhzrb10r3c322c7bb580gk125x9nvpvjrvsp74p8im0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/emms";
sha256 = "1xpry8h96gvjnc0v8x0vk5dnmlq1r7m3ljpampdwv9pfwl95fh94";
name = "emms";
};
- packageRequires = [];
+ packageRequires = [ cl-lib ];
meta = {
homepage = "https://melpa.org/#/emms";
license = lib.licenses.free;
@@ -9461,12 +9785,12 @@
enh-ruby-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "enh-ruby-mode";
- version = "20170417";
+ version = "20171101";
src = fetchFromGitHub {
owner = "zenspider";
repo = "enhanced-ruby-mode";
- rev = "2e483fe316ff993c80eafcf4ce4defd87d97776d";
- sha256 = "1xzhgmbc9iplxmqm7gc4hqk6nfdhqcrxz8g9kkf5ww3dx1czhiv7";
+ rev = "9467cd7fc8b6bb3caf644b223e3046fc32013ccb";
+ sha256 = "0spsgfkka6sld8ac3m2biydyp8xj84vxa0w7apqvhhmfk3klbbhf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cd1ac1ce69b77b11f34c4175611a852e7ec0806c/recipes/enh-ruby-mode";
@@ -9524,12 +9848,12 @@
ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }:
melpaBuild {
pname = "ensime";
- version = "1.0.1";
+ version = "2.0.1";
src = fetchFromGitHub {
owner = "ensime";
repo = "ensime-emacs";
- rev = "2b4d4cd764b9fa4757738a6dae87f4d1e99686d6";
- sha256 = "0j7zd3qxh4m5gv5s8pvfacad2mkzwwz1xdrvg1sa035xaxahqsyx";
+ rev = "34c7719c9739d1e5d55c3f776e8f32a417b4eea6";
+ sha256 = "1dpj31krw0vwrb1pimpbpdm3k2ivqmr6kbgaw8p2dwwwqk1s6nbg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime";
@@ -9595,12 +9919,12 @@
epkg = callPackage ({ closql, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "epkg";
- version = "2.3.0";
+ version = "3.0.0";
src = fetchFromGitHub {
owner = "emacscollective";
repo = "epkg";
- rev = "deb9affaadce11c356df53b6b62ab376ef652d16";
- sha256 = "1515gv9bhjwbmkbz6sivq5zhpalvfb0ias4qia9anz9npqfx24y0";
+ rev = "1768e91e02a2d6441c2d82a711912a9498d2316e";
+ sha256 = "02fknkqxqxzqdqa2vj7ql6swrl83v1xs5iym5r6yr6mpj69di8bd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg";
@@ -9825,12 +10149,12 @@
erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "erlang";
- version = "20.0.2";
+ version = "20.1.4";
src = fetchFromGitHub {
owner = "erlang";
repo = "otp";
- rev = "6ede2da826335960037299d9f3b0e66d072ea5a0";
- sha256 = "1zxfyd711l13n6xhspa8l0k4l7hb8aq1q1j2b2yrzw9k1hx2lfyj";
+ rev = "3e8c1ff94c0a73df71daadd4eb782c21c49f22d9";
+ sha256 = "19vd6x20i3pc3ddrjalli937i44z6z2yrdg7ir3gpaghhx8fhcav";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -9992,12 +10316,12 @@
esh-help = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "esh-help";
- version = "1.0.0";
+ version = "1.0.1";
src = fetchFromGitHub {
owner = "tom-tan";
repo = "esh-help";
- rev = "03bf6fc7ef9ac46304e37524fdaf7ebfee317695";
- sha256 = "049nvd63jns3fawimwx9l7cbqw2gw84f8f9swpwd0a8z449mlj2m";
+ rev = "8a8a9d4d9852f8bd96da3b94e95ff57097ac8ec6";
+ sha256 = "02fybhmqm2qmy5qdig7xvwxazqi499pw32kh5mrsbdr14srg9fhs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ab94c66d1ed7cfdbc437ee239984ba70408fd28a/recipes/esh-help";
@@ -10031,6 +10355,27 @@
license = lib.licenses.free;
};
}) {};
+ eshell-bookmark = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "eshell-bookmark";
+ version = "2.0.0";
+ src = fetchFromGitHub {
+ owner = "Fuco1";
+ repo = "eshell-bookmark";
+ rev = "deda4b848b2fb979dbe73ead2cb866610e3596ed";
+ sha256 = "14dmsnixf9vqdhsixw693sml0fn80zcf0b37z049fb40cmppqxdw";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e7bf4702a907727990fcc676980f2b219e22ab0c/recipes/eshell-bookmark";
+ sha256 = "1bybxlq1h5chrjxqjb23kq8dmgw2xrjwkrnvpbphblqzpdy5ck0s";
+ name = "eshell-bookmark";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/eshell-bookmark";
+ license = lib.licenses.free;
+ };
+ }) {};
eshell-did-you-mean = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "eshell-did-you-mean";
@@ -10055,12 +10400,12 @@
eshell-git-prompt = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "eshell-git-prompt";
- version = "0.1.1";
+ version = "0.1.2";
src = fetchFromGitHub {
owner = "xuchunyang";
repo = "eshell-git-prompt";
- rev = "fb56e851c1baac68249c34043bd5db9c9420141e";
- sha256 = "08mhjps17w3kfmmbdws1lqzphr2ayl160i0ckd4552jdyzd28vvs";
+ rev = "b6bb2d7bd4e393b4170b29891cfefb72ae020aab";
+ sha256 = "02i00an9wa8ns66xq900la68m7pd4hwv95g83cvf22bypivx7p2y";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5272280b19579c302ba41b53c77e42bc5e8ccbda/recipes/eshell-git-prompt";
@@ -10073,6 +10418,27 @@
license = lib.licenses.free;
};
}) {};
+ eshell-prompt-extras = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "eshell-prompt-extras";
+ version = "0.96";
+ src = fetchFromGitHub {
+ owner = "hiddenlotus";
+ repo = "eshell-prompt-extras";
+ rev = "7581c109673c40aceff278cd524273f50ffe170d";
+ sha256 = "1m1jisjz974cfz89i6l2zq666yzhsqipc6dmqlrm8mw81fxsfm1h";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/eshell-prompt-extras";
+ sha256 = "0kh4lvjkayjdz5lqvdqmdcblxizxk9kwmigjwa68kx8z6ngmfwa5";
+ name = "eshell-prompt-extras";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/eshell-prompt-extras";
+ license = lib.licenses.free;
+ };
+ }) {};
eshell-up = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "eshell-up";
@@ -10220,27 +10586,6 @@
license = lib.licenses.free;
};
}) {};
- ess-R-object-popup = callPackage ({ ess, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
- melpaBuild {
- pname = "ess-R-object-popup";
- version = "1.0";
- src = fetchFromGitHub {
- owner = "myuhe";
- repo = "ess-R-object-popup.el";
- rev = "7e1f601bfba72de0fda44d9c82f96028ecbb9948";
- sha256 = "0q8pbaa6wahli6fh0kng5zmnypsxi1fr2bzs2mfk3h8vf4nikpv0";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/8783caab9019623ade5c369a4713eba996507bd0/recipes/ess-R-object-popup";
- sha256 = "1dxwgahfki6d6ywh85ifk3kq6f2a1114kkd8xcv4lcpzqykp93zj";
- name = "ess-R-object-popup";
- };
- packageRequires = [ ess popup ];
- meta = {
- homepage = "https://melpa.org/#/ess-R-object-popup";
- license = lib.licenses.free;
- };
- }) {};
ess-smart-underscore = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ess-smart-underscore";
@@ -10286,16 +10631,16 @@
esxml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "esxml";
- version = "0.3.2";
+ version = "0.3.3";
src = fetchFromGitHub {
owner = "tali713";
repo = "esxml";
- rev = "fd0f0185cd579b00c3d76d2c383cd33fe642bb93";
- sha256 = "0azwfxzxghxhzwal4al0lngm0w3q035jyvm3wj2aaml2dibsi3pb";
+ rev = "08fcc5d76abb90c194e181f267cf1d2a149b7a7c";
+ sha256 = "034lxfqn5yh78hz7i568vw8kyv3hlb699z2d1dffjiigc1lblgip";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/esxml";
- sha256 = "0v63ihgg2db3648s2xygcky9s0vx9byjjpbhlgjy5j159w2w53vh";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/db6556fe1b2403d1bcdade263986fd0faf0d9087/recipes/esxml";
+ sha256 = "1375gryii984l33gc8f8yhl3vncjmw1w9k6xpvjgmnpx2fwr1vbq";
name = "esxml";
};
packageRequires = [];
@@ -10388,22 +10733,22 @@
license = lib.licenses.free;
};
}) {};
- evil = callPackage ({ fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }:
+ evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }:
melpaBuild {
pname = "evil";
- version = "1.2.12";
+ version = "1.2.13";
src = fetchFromGitHub {
owner = "emacs-evil";
repo = "evil";
- rev = "0ad4c2dae1249558f7b59a78a685e4f8092009c9";
- sha256 = "1z7ysn0h62i674pw47k905713m4ch7hrisk4834rf53zq3c9sabn";
+ rev = "427cf5faa57e8794ac93f594dc3d1972e687a25a";
+ sha256 = "02xc9zgrabnlwk3wlsxbzbhdzi3fm5fk8kimvgdcp8vsnpdcrhql";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/440482c0edac8ee8bd4fe22f6bc5c1607f34c7ad/recipes/evil";
sha256 = "1d36r6mi5nvrwnk4a9338wmhr72fcbrwj0r8gmvivpjdngjy4k39";
name = "evil";
};
- packageRequires = [ goto-chg undo-tree ];
+ packageRequires = [ cl-lib emacs goto-chg undo-tree ];
meta = {
homepage = "https://melpa.org/#/evil";
license = lib.licenses.free;
@@ -10601,12 +10946,12 @@
evil-magit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
melpaBuild {
pname = "evil-magit";
- version = "0.4.1";
+ version = "0.4.2";
src = fetchFromGitHub {
owner = "emacs-evil";
repo = "evil-magit";
- rev = "077354f8ebd5da76937bf8f5df5d484f8a0ccc62";
- sha256 = "05llzcdbg84x04a98b6r7d0m8631hk83hjq33hwd4n8ixp85dg20";
+ rev = "a24186be7cc2cdab24b56f6dcc4665eeb8349c1a";
+ sha256 = "12hr2w5r2hgagb3hqbi59v73rxpjml5prc3m7dw3wzsm0rf1rwh3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/50315ec837d2951bf5b2bb75809a35dd7ffc8fe8/recipes/evil-magit";
@@ -10706,12 +11051,12 @@
evil-nerd-commenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-nerd-commenter";
- version = "3.0.2";
+ version = "3.1.2";
src = fetchFromGitHub {
owner = "redguardtoo";
repo = "evil-nerd-commenter";
- rev = "cac2f7945fc90f43d1282dfe4aca24ded9f7cd03";
- sha256 = "1zjnscnj0zrxpdjikxwg4fw7m6yb39060cmn24xzs0hmnmbxnw9m";
+ rev = "76fd0c5692e9852a2d6fc6c0ce0e782792c28ddd";
+ sha256 = "1bydqdk52q8777m234jxp03y2zz23204r1fyq39ks9h9bpglc561";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a3e1ff69e7cc95a5b5d628524ad836833f4ee736/recipes/evil-nerd-commenter";
@@ -10850,22 +11195,22 @@
license = lib.licenses.free;
};
}) {};
- evil-smartparens = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, smartparens }:
+ evil-smartparens = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, smartparens }:
melpaBuild {
pname = "evil-smartparens";
- version = "0.3.0";
+ version = "0.4.0";
src = fetchFromGitHub {
owner = "expez";
repo = "evil-smartparens";
- rev = "12521212b8e4a02cbec733882bb89c6fac37301f";
- sha256 = "0j2m3rsszivyjhv8bjid5fdqaf1vwp8rf55b27y4vc2489wrw415";
+ rev = "9fe4eed1c6327197afe6c13bb0771e18908aff00";
+ sha256 = "1di4qz5fbrlwbg16c2j0m7y8zqfxw027qd7zqmc3rwk9znbhg7wl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/850898fbfc8e0aeb779e8feae56476d989110e79/recipes/evil-smartparens";
sha256 = "1viwrd6gfqmwhlil80pk68dikn3cjf9ddsy0z781z3qfx0j35qza";
name = "evil-smartparens";
};
- packageRequires = [ cl-lib emacs evil smartparens ];
+ packageRequires = [ emacs evil smartparens ];
meta = {
homepage = "https://melpa.org/#/evil-smartparens";
license = lib.licenses.free;
@@ -10934,6 +11279,27 @@
license = lib.licenses.free;
};
}) {};
+ evil-test-helpers = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "evil-test-helpers";
+ version = "1.2.13";
+ src = fetchFromGitHub {
+ owner = "emacs-evil";
+ repo = "evil";
+ rev = "427cf5faa57e8794ac93f594dc3d1972e687a25a";
+ sha256 = "02xc9zgrabnlwk3wlsxbzbhdzi3fm5fk8kimvgdcp8vsnpdcrhql";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/87da8c50f9167ad9c3844b23becb6904f809611d/recipes/evil-test-helpers";
+ sha256 = "0l4skyznzgr76z518q22lf90ymlsfcs02w8vqkg8az1nfl3ch7fs";
+ name = "evil-test-helpers";
+ };
+ packageRequires = [ evil ];
+ meta = {
+ homepage = "https://melpa.org/#/evil-test-helpers";
+ license = lib.licenses.free;
+ };
+ }) {};
evil-text-object-python = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-text-object-python";
@@ -11021,12 +11387,12 @@
evil-visual-replace = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-visual-replace";
- version = "0.0.4";
+ version = "0.0.5";
src = fetchFromGitHub {
owner = "troyp";
repo = "evil-visual-replace";
- rev = "9bfbaf71898294e25d588a887fb4753641edfbe9";
- sha256 = "00mhqb9rn4hq90x5i44jyq51lg351bv8hdj4c443nxrbldi73k9s";
+ rev = "163fc827a1ffc106475da470c37fb26f4cc9b008";
+ sha256 = "1gfyrq7xfzmzh3x8k5f08n027dlbwi0pkkxf9c39fkxp4jngibsz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/evil-visual-replace";
@@ -11272,12 +11638,12 @@
eziam-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "eziam-theme";
- version = "0.4.1";
+ version = "0.4.5";
src = fetchFromGitHub {
owner = "thblt";
repo = "eziam-theme-emacs";
- rev = "df2ae56e1ee5cc41c335ca6fd7ead3b99b3c5edd";
- sha256 = "0nsch4zzqd64rq0y75knfp95nn5nq2hvvgcjhq0i075g2vwhf73w";
+ rev = "4a79230739cfaa607f39fbfe53339692b83c3933";
+ sha256 = "0cdaayp2ca6wcqh11snmc50p4gl6sika58jxvn5dklsipzxv75v8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0411583bd4fdbe425eb07de98851136fa1eeb0/recipes/eziam-theme";
@@ -11377,12 +11743,12 @@
fancy-narrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fancy-narrow";
- version = "0.9.4";
+ version = "0.9.5";
src = fetchFromGitHub {
owner = "Malabarba";
repo = "fancy-narrow";
- rev = "cd381c1acd5e0d9b6acd7f3e76c3b1de21e8b6df";
- sha256 = "10ds6nlzm1s5xsp53a52qlzrnph7in6gib67qhgnwpj33wp8gs91";
+ rev = "c0f70b4333d4764323b7154e37a378adb1610ab7";
+ sha256 = "0vcr1gnqawvc1yclqs23jvxm6bqix8kpflf1c7znb0wzxmz9kx7y";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/fancy-narrow";
@@ -11440,12 +11806,12 @@
faust-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "faust-mode";
- version = "0.1";
+ version = "0.3";
src = fetchFromGitHub {
owner = "magnetophon";
repo = "emacs-faust-mode";
- rev = "41379dd52a8be01cdfac06996ea1593877fdaf58";
- sha256 = "0q624nm9wfyg95wybi542bx8pdpqk9vibyb6b9fin4mw102nah9j";
+ rev = "5e7390479d6f4c12186b39fd5c642050e1c62e40";
+ sha256 = "1g3xzzcnswh03plmrhcn6ib68kcx5b37af3lqfbfa6s0rwwldxap";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/31f4177ce35313e0f40e9ef0e5a1043ecd181573/recipes/faust-mode";
@@ -11458,6 +11824,26 @@
license = lib.licenses.free;
};
}) {};
+ faustine = callPackage ({ emacs, faust-mode, fetchgit, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "faustine";
+ version = "0.3";
+ src = fetchgit {
+ url = "https://bitbucket.org/yassinphilip/faustine";
+ rev = "43cf31284eabf0d831f8185a5ed217e56fdc2023";
+ sha256 = "1v78raszh8scac5m04g10rrc9cdflhgmkpbbqpf28zxk3dxcjpxm";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/b298e399335efbbdbc6e9bb06ab915fc07909faa/recipes/faustine";
+ sha256 = "0pkjxfzgdhkjjx38d1c2kw8m5cw5ryhfj7lykpym79wsa471hf9s";
+ name = "faustine";
+ };
+ packageRequires = [ emacs faust-mode ];
+ meta = {
+ homepage = "https://melpa.org/#/faustine";
+ license = lib.licenses.free;
+ };
+ }) {};
fcitx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fcitx";
@@ -11503,12 +11889,12 @@
fill-column-indicator = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fill-column-indicator";
- version = "1.87";
+ version = "1.89";
src = fetchFromGitHub {
owner = "alpaker";
repo = "Fill-Column-Indicator";
- rev = "0e755319451dd9c6c99c2a2ef82c890ba93343b6";
- sha256 = "0gbqspqn4y7f2fwqq8210b6k5q22c0zr7b4ws8qgz9swav8g3vrq";
+ rev = "23ad25f2c2fddd32a1ea12a9e0f631e243e6a779";
+ sha256 = "010kf8jsly74y7m6mmkn1h6y205kz23zphs50zgy2nag2p88rz9y";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4ea0c00a7784621fcca0391a9c8ea85e9dd43852/recipes/fill-column-indicator";
@@ -11566,12 +11952,12 @@
find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "find-file-in-project";
- version = "5.4.0";
+ version = "5.4.3";
src = fetchFromGitHub {
owner = "technomancy";
repo = "find-file-in-project";
- rev = "2d3e8d095e0c36f927142e80c4330977be698568";
- sha256 = "1phj6a6ydc8hzv1f1881anyccg1jkd8dh6g229ln476i5y6wqs5j";
+ rev = "dcc0801c4781d76efd9ac0d86bab4084b4b93663";
+ sha256 = "0axk4a4b3s0x8wn4a4mj1i89kix88cv94iclhw4wigsscndpr03v";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project";
@@ -11822,6 +12208,27 @@
license = lib.licenses.free;
};
}) {};
+ flex-compile = callPackage ({ buffer-manage, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "flex-compile";
+ version = "0.1";
+ src = fetchFromGitHub {
+ owner = "plandes";
+ repo = "flex-compile";
+ rev = "4ca317883404a14c1b4920d7b3e6f0bffb04a8f2";
+ sha256 = "08ax91bdf4dwky8zp0cwmk53wqyqs893j7q1jah5cimnhgi82ksz";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/259caeebc317e81ab9d532a371ea85656c2b1619/recipes/flex-compile";
+ sha256 = "1hlh4k7qgln87xajnjjhf1yyg6bgdwd0iczhlfw8gdwfj5xpjd38";
+ name = "flex-compile";
+ };
+ packageRequires = [ buffer-manage dash emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/flex-compile";
+ license = lib.licenses.free;
+ };
+ }) {};
floobits = callPackage ({ fetchFromGitHub, fetchurl, highlight, json ? null, lib, melpaBuild }:
melpaBuild {
pname = "floobits";
@@ -11909,12 +12316,12 @@
flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }:
melpaBuild {
pname = "flycheck";
- version = "30";
+ version = "31";
src = fetchFromGitHub {
owner = "flycheck";
repo = "flycheck";
- rev = "9c063965e893f0cc7c97fabb810ac41ec22f82fb";
- sha256 = "1vyncqicafmy9av2nsawywn56ay50zdyjba9r55vv11baklabg8w";
+ rev = "401b115d10e202a1b31f57340438420081af21ce";
+ sha256 = "141i6wzqlb0dslmca6930cal7q4y5wbwzmxrpjk3hgm6nxz483p8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck";
@@ -12161,12 +12568,12 @@
flycheck-joker = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-joker";
- version = "1.0.0";
+ version = "1.1.0";
src = fetchFromGitHub {
owner = "candid82";
repo = "flycheck-joker";
- rev = "e7964140cbb0ee7badfc3d67c6412f5c3a461f76";
- sha256 = "0mqnhcpkf86dxqj0y7g5mnn91m81jdvrsbwikyqvx46z1jpi0y37";
+ rev = "c34c3922a2e8bc918f250602e0ddf655cdcad456";
+ sha256 = "0fp7h0pmxk02x1kisqvnb9wkjjn9bl91capmnllrb7qmb24w6pd5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/599bf33a5d4a4a590b355001e532cab4e1ee9ef6/recipes/flycheck-joker";
@@ -12263,15 +12670,36 @@
license = lib.licenses.free;
};
}) {};
+ flycheck-nimsuggest = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, nim-mode }:
+ melpaBuild {
+ pname = "flycheck-nimsuggest";
+ version = "0.8.1";
+ src = fetchFromGitHub {
+ owner = "yuutayamada";
+ repo = "flycheck-nimsuggest";
+ rev = "8b1c69e9aa924368bc4dadd4cde818ff158cd3f0";
+ sha256 = "0vnwy7b3xs2smbr6ah6yk8hq7vvsciq7d6m1qr91nfnazdgvxmvg";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/cb4170f002dbcd1906e81836f3ce035b1e81c379/recipes/flycheck-nimsuggest";
+ sha256 = "099mlzramm6z66zyjb6ypn7qb0hpvwbbgk9ydsanj8sni0dd66hv";
+ name = "flycheck-nimsuggest";
+ };
+ packageRequires = [ emacs flycheck nim-mode ];
+ meta = {
+ homepage = "https://melpa.org/#/flycheck-nimsuggest";
+ license = lib.licenses.free;
+ };
+ }) {};
flycheck-objc-clang = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-objc-clang";
- version = "1.1.0";
+ version = "2.0.0";
src = fetchFromGitHub {
owner = "GyazSquare";
repo = "flycheck-objc-clang";
- rev = "b16b77f95e4e53a8951ebee6209a5de311748447";
- sha256 = "0lda99wscj89vhzg9wq7akm3dx1zlf90m91ifr627vcw2mzj4wkh";
+ rev = "29a9eb320d62400564360986f7ad400b74070d8e";
+ sha256 = "0b4vwbxzhds9vb4nknfdywvfpr1gkk86vsbbq6f5ds0pfk75x022";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4ff4412f507371b93cfb85fc744e54110cd87338/recipes/flycheck-objc-clang";
@@ -12392,12 +12820,12 @@
flycheck-pycheckers = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-pycheckers";
- version = "0.2";
+ version = "0.4";
src = fetchFromGitHub {
owner = "msherry";
repo = "flycheck-pycheckers";
- rev = "220c551df591792d08fc9d149ab3329171743cb9";
- sha256 = "0q1sz28nlnamcm4l587q94b7cyak9d4wpgpr33a05m9lw4a6z74i";
+ rev = "a3d39139dbe5cdaa64dda90907bb8653f196c71e";
+ sha256 = "1i1kliy0n9b7b0rby419030n35f59xb8952widaszz4z8qb7xw9k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/af36dca316b318d25d65c9e842f15f736e19ea63/recipes/flycheck-pycheckers";
@@ -12434,12 +12862,12 @@
flycheck-rtags = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, rtags }:
melpaBuild {
pname = "flycheck-rtags";
- version = "2.12";
+ version = "2.14";
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "db1244c1c14514324474f362c857112e89bbf0c6";
- sha256 = "1fcrlxk9z11vbarznfcpfyqzvj6v3ydbn5z6vbdmgf9cxb52kfma";
+ rev = "15ef9a8bab847773d6e247005be929422fc9c285";
+ sha256 = "0yq3c4ich0sffzd571drb7k4vs0bvblx6qcrb6zry75d9npggsyg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags";
@@ -12497,12 +12925,12 @@
flycheck-swift3 = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-swift3";
- version = "1.1.0";
+ version = "2.0.0";
src = fetchFromGitHub {
owner = "GyazSquare";
repo = "flycheck-swift3";
- rev = "6b0b7c6fffc86809d0535afebd6b0972059992d5";
- sha256 = "0d411idv9ib1jhmdbjb8ycc8clmm1ygpwapaka3d50gkgrmfin4q";
+ rev = "756833425f51baa9eb0a2fa7493df6e68612c88d";
+ sha256 = "1hvrg717q0nlz4r8wby82gs3vdx8fdhf38rg4j77j3fqfmxdd3fi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f1fb8c731c118327dc0bbb726e046fec46bcfb82/recipes/flycheck-swift3";
@@ -13250,27 +13678,6 @@
license = lib.licenses.free;
};
}) {};
- forecast = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "forecast";
- version = "0.6.2";
- src = fetchFromGitHub {
- owner = "cadadr";
- repo = "forecast.el";
- rev = "1eb60db1760572e3b1b87f6d672e3aa0812d6d94";
- sha256 = "1imrn4wc744fdcm1pkfjk8gmilzcrjzawbcg6mhdkzsz5cnb7klb";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/e6ff6a4ee29b96bccb2e4bc0644f2bd2e51971ee/recipes/forecast";
- sha256 = "0whag2n1120384w304g0w4bqr7svdxxncdhnz4rznfpxlgiw2rsc";
- name = "forecast";
- };
- packageRequires = [ emacs ];
- meta = {
- homepage = "https://melpa.org/#/forecast";
- license = lib.licenses.free;
- };
- }) {};
foreman-mode = callPackage ({ dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "foreman-mode";
@@ -13355,6 +13762,27 @@
license = lib.licenses.free;
};
}) {};
+ frames-only-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
+ melpaBuild {
+ pname = "frames-only-mode";
+ version = "1.0.0";
+ src = fetchFromGitHub {
+ owner = "davidshepherd7";
+ repo = "frames-only-mode";
+ rev = "5a2947d797a5d6f74d3a9c97f8c0ab6cff115b28";
+ sha256 = "0y0sdjixaxvywrlp2sw51wnczhk51q1svl5aghbk9rkxpwv9ys9v";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/1e628416ad9420b3ac5bbfacf930a86d98958ac8/recipes/frames-only-mode";
+ sha256 = "17p04l16ghz9kk096xk37yjpi4rmla86gp7c8ysjf6q6nyh0608h";
+ name = "frames-only-mode";
+ };
+ packageRequires = [ emacs seq ];
+ meta = {
+ homepage = "https://melpa.org/#/frames-only-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
free-keys = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "free-keys";
@@ -13421,12 +13849,12 @@
fsharp-mode = callPackage ({ company, company-quickhelp, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, pos-tip, s }:
melpaBuild {
pname = "fsharp-mode";
- version = "1.9.8";
+ version = "1.9.11";
src = fetchFromGitHub {
owner = "rneatherway";
repo = "emacs-fsharp-mode-bin";
- rev = "9766952bd7830cb0d319736961af8e42e67d42fe";
- sha256 = "1krncbzdhp6kpypaqdn6fhvxhhc1pvy2ayn4w4ljmsd7wx6zazyi";
+ rev = "5504550605354146842c8f5c34482ece778b7b31";
+ sha256 = "0hjqgyjch8fdz54akcpw5kmx2z1yvck6k8qyc0mzzmb54iiayf5a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/dc45611e2b629d8bc5f74555368f964420b79541/recipes/fsharp-mode";
@@ -13492,12 +13920,12 @@
fullframe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fullframe";
- version = "0.4.0";
+ version = "0.5.0";
src = fetchFromGitHub {
owner = "tomterl";
repo = "fullframe";
- rev = "3c046dd4c27a5c96d9dc3bc50a44eb1e7fd68912";
- sha256 = "1narmlcd8ycwkmsrgk64l7q0ljsbq2fsikl8hjbrsc20nma032m4";
+ rev = "d6a5217f7f2a5a5edcb75140f3fa69b3a50f1cdd";
+ sha256 = "0m43qnhp6ibsskpjkxc86p3lrjsjc0ndqml3lbd65s79x4x7i3fi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/13d1dc5c39543b65c6bb4150c3690211872c00dc/recipes/fullframe";
@@ -13510,27 +13938,48 @@
license = lib.licenses.free;
};
}) {};
- function-args = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
+ function-args = callPackage ({ fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "function-args";
- version = "0.5.1";
+ version = "0.6.0";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "function-args";
- rev = "25e447d8a8930a8c515077de57a7693c6a642514";
- sha256 = "0m7fcw0cswypiwi5abg6vhw7a3agx9vhp10flbbbji6lblb0fya8";
+ rev = "0b07db81c0c1fa88d1ec763219ee57640858f79d";
+ sha256 = "0lg9bhwn3za4jvz38zld389gdl48qf34nqqqrzj0r119g1jqdrg1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/80688d85a34b77783140ad2b8a47ef60c762b084/recipes/function-args";
sha256 = "13yfscr993pll5yg019v9dwy71g123a166w114n2m78h0rbnzdak";
name = "function-args";
};
- packageRequires = [ swiper ];
+ packageRequires = [ ivy ];
meta = {
homepage = "https://melpa.org/#/function-args";
license = lib.licenses.free;
};
}) {};
+ futhark-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "futhark-mode";
+ version = "0.1.0";
+ src = fetchFromGitHub {
+ owner = "HIPERFIT";
+ repo = "futhark";
+ rev = "2a7d824f7265a35bb928bf4de8e46d02e0a56a12";
+ sha256 = "0dkx9xl39k0bcspyx37410rb5ngphw9svinwjw1kgq0pqhc2qxdf";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode";
+ sha256 = "1k22xkg6vd60hk58zkxhmsw2gs6ikzmidvxcdglnr46m6x7r7pnq";
+ name = "futhark-mode";
+ };
+ packageRequires = [ cl-lib ];
+ meta = {
+ homepage = "https://melpa.org/#/futhark-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
fuzzy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fuzzy";
@@ -13933,12 +14382,12 @@
ghub-plus = callPackage ({ apiwrap, emacs, fetchFromGitHub, fetchurl, ghub, lib, melpaBuild }:
melpaBuild {
pname = "ghub-plus";
- version = "0.1.4";
+ version = "0.2";
src = fetchFromGitHub {
owner = "vermiculus";
repo = "ghub-plus";
- rev = "44a5558eb299adee1463b7120c23b26b1d914ea8";
- sha256 = "0fn5rb7ba4p39if68alvxv321918pki010vfylpp6jk98kzzh487";
+ rev = "e04050f81106029c342deb7adbfc67b2a888ec58";
+ sha256 = "0ydd6aiy8x878jlzp88gi30yslhkcin0rbdjirj2vjs88cfvcjq6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/03a412fd25218ff6f302734e078a699ff0234e36/recipes/ghub+";
@@ -14059,12 +14508,12 @@
git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }:
melpaBuild {
pname = "git-commit";
- version = "2.10.3";
+ version = "2.11.0";
src = fetchFromGitHub {
owner = "magit";
repo = "magit";
- rev = "d5b747473ab0bf0f0034fca2f57f6497d476b67e";
- sha256 = "1cw1nrgmbh0jikr88di4na3f0m643v0p7x8cf7xya2lgqwkdravc";
+ rev = "4ad2ebfef0afa7e5f5fb85e8d1146da613804fe5";
+ sha256 = "1zvib46hn2c0g2zdnf4vcwjrs9dj5sb81hpqm7bqm8f97p9dv6ym";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
@@ -14311,12 +14760,12 @@
gitattributes-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "gitattributes-mode";
- version = "1.2.4";
+ version = "1.2.6";
src = fetchFromGitHub {
owner = "magit";
repo = "git-modes";
- rev = "af4ff3222f38daa0d352afdf3d20741b4fab2e79";
- sha256 = "0nn5mj29airjacckzxkh4q12wnk2pq6mp1wlzxzxdwijmkk52dbr";
+ rev = "9f18eca514d242816a4969e86c4cfd2cf4dfe401";
+ sha256 = "0k380f9ff15gg724c2spfd9qml97k24bhn3h9ipv1c7rn9qvhdhc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4b4e2ddd2a80875afc0fc654052e6cbff2f3777f/recipes/gitattributes-mode";
@@ -14353,12 +14802,12 @@
gitconfig-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "gitconfig-mode";
- version = "1.2.4";
+ version = "1.2.6";
src = fetchFromGitHub {
owner = "magit";
repo = "git-modes";
- rev = "af4ff3222f38daa0d352afdf3d20741b4fab2e79";
- sha256 = "0nn5mj29airjacckzxkh4q12wnk2pq6mp1wlzxzxdwijmkk52dbr";
+ rev = "9f18eca514d242816a4969e86c4cfd2cf4dfe401";
+ sha256 = "0k380f9ff15gg724c2spfd9qml97k24bhn3h9ipv1c7rn9qvhdhc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/44a37f59b87f59a587f6681e7aadfabf137c98d7/recipes/gitconfig-mode";
@@ -14479,12 +14928,12 @@
gitignore-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "gitignore-mode";
- version = "1.2.4";
+ version = "1.2.6";
src = fetchFromGitHub {
owner = "magit";
repo = "git-modes";
- rev = "af4ff3222f38daa0d352afdf3d20741b4fab2e79";
- sha256 = "0nn5mj29airjacckzxkh4q12wnk2pq6mp1wlzxzxdwijmkk52dbr";
+ rev = "9f18eca514d242816a4969e86c4cfd2cf4dfe401";
+ sha256 = "0k380f9ff15gg724c2spfd9qml97k24bhn3h9ipv1c7rn9qvhdhc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/44a37f59b87f59a587f6681e7aadfabf137c98d7/recipes/gitignore-mode";
@@ -14773,12 +15222,12 @@
go-autocomplete = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "go-autocomplete";
- version = "20150303";
+ version = "20170907";
src = fetchFromGitHub {
owner = "nsf";
repo = "gocode";
- rev = "eef10fdde96a12528a6da32f51bf638b2863a3b1";
- sha256 = "03snnra31b5j6iy94gql240vhkynbjql9b4b5j8bsqp9inmbsia3";
+ rev = "c7fddb39ecbc9ebd1ebe7d2a3af473ed0fffffa1";
+ sha256 = "0qx8pq38faig41xkl1a4hrgp3ziyjyn6g53vn5wj7cdgm5kk67nb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/go-autocomplete";
@@ -15085,15 +15534,36 @@
license = lib.licenses.free;
};
}) {};
+ gorepl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "gorepl-mode";
+ version = "1.0.0";
+ src = fetchFromGitHub {
+ owner = "manute";
+ repo = "gorepl-mode";
+ rev = "17e025951f5964a0542a4b353ddddbc734c01eed";
+ sha256 = "1abb78xxsggawl43hspl0cr0f7i1b3jd9r6xl1nl5jg97i4byg0b";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/gorepl-mode";
+ sha256 = "0xcjjh9hf3pv5jgv089c6bb00s215fc9qwn72fav1xbm5f49nkaq";
+ name = "gorepl-mode";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/gorepl-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
gotest = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild, s }:
melpaBuild {
pname = "gotest";
- version = "0.13.0";
+ version = "0.14.0";
src = fetchFromGitHub {
owner = "nlamirault";
repo = "gotest.el";
- rev = "2ae187078beb5d9672ca14cb636b6b4021de4230";
- sha256 = "1pq9zjfs7gp7bz3jq11fx75m4zcx9p772lja5jicz535khpgxw7f";
+ rev = "8a5ef7363f83edb3b77c5e23876f13dd8c23b2b9";
+ sha256 = "1ksi37kmy9mnrjr5lf9f0ga5nvi3r2kc85g6yvdfj0mbsjm1pnp7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0670b42c0c998daa7bf01080757976ac3589ec06/recipes/gotest";
@@ -15113,8 +15583,8 @@
src = fetchFromGitHub {
owner = "wasamasa";
repo = "gotham-theme";
- rev = "d9b00bd93ab3fed0e7fff99b0dc8773584f5207d";
- sha256 = "0vrz97w9yzkxl8pc9jmxkxvj5nagpnzqq9pvavwmvlh68wrh58gi";
+ rev = "417d61978d139cb5d089c5365fc8d3166d76d3ac";
+ sha256 = "0rc40cfj2mby1q7bk1pp1fxdi72nh9ip80spjdm1csvjjc4dbkwr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4b388de872be397864a1217a330ba80437c287c0/recipes/gotham-theme";
@@ -15127,6 +15597,27 @@
license = lib.licenses.free;
};
}) {};
+ goto-chg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "goto-chg";
+ version = "1.7";
+ src = fetchFromGitHub {
+ owner = "emacs-evil";
+ repo = "goto-chg";
+ rev = "171b1331022caf12d8c3593e9b5075f87ee958d4";
+ sha256 = "1jcnrin4j1x8p63fd9r37dq1vr5a7a1nvzk6kp0bdsgn9vbjmapc";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/cf1fc176430fe3ab55ce537a0efc59780bb812be/recipes/goto-chg";
+ sha256 = "1yd4jq4zql4av9nr1sdk4nsnnk54c3brgjhpczndy1ipiaxlnydy";
+ name = "goto-chg";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/goto-chg";
+ license = lib.licenses.free;
+ };
+ }) {};
goto-gem = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "goto-gem";
@@ -15453,6 +15944,27 @@
license = lib.licenses.free;
};
}) {};
+ green-is-the-new-black-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "green-is-the-new-black-theme";
+ version = "0.0.3";
+ src = fetchFromGitHub {
+ owner = "fredcamps";
+ repo = "green-is-the-new-black-emacs";
+ rev = "b9cdecd04691311c30c94ad4ec81124e63b9b122";
+ sha256 = "124q733rirc8a2d9xfparphcjrrbxhp4wxf070l8hqp3p2764bka";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/3e42528d5677fd90515cad47266c07ea3d4363fb/recipes/green-is-the-new-black-theme";
+ sha256 = "03q0vj409icmawffy2kd9yl04r453q80cy1p9y4i3xk368z0362g";
+ name = "green-is-the-new-black-theme";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/green-is-the-new-black-theme";
+ license = lib.licenses.free;
+ };
+ }) {};
green-screen-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "green-screen-theme";
@@ -15622,12 +16134,12 @@
gscholar-bibtex = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "gscholar-bibtex";
- version = "0.3.2";
+ version = "0.3.3";
src = fetchFromGitHub {
owner = "cute-jumper";
repo = "gscholar-bibtex";
- rev = "655bccf0b12c9d95ec992ee4bfb5c7c9a4d0c99b";
- sha256 = "1ivdq3mgym14v5hpv938248vifw1xk9z16d2f38d9xj01icik522";
+ rev = "ba4ce159e385d695d8560e8b06b3cbe48424861c";
+ sha256 = "0idnfhk17avp0r4706grjqqkz0xl98gs0bx7wrkvwym3y2gadlz2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9fa546d3dce59b07a623ee83e3befe139dc10481/recipes/gscholar-bibtex";
@@ -15685,12 +16197,12 @@
guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }:
melpaBuild {
pname = "guix";
- version = "0.3.2";
+ version = "0.3.3";
src = fetchFromGitHub {
owner = "alezost";
repo = "guix.el";
- rev = "6d4ccb3f7376d6326b58b25f3c94ab546418a030";
- sha256 = "13n8k5ak3y1x6i27x47sji49kdbqhnc3ywqkn4xwmxcnrs28kr25";
+ rev = "54bd174b514c5de11e82c4263ac2723addb0fe87";
+ sha256 = "1i5kwzwlb6lx65rgixm8mbdi6x03n0hb4hbc7j76lar4j58ypwz2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix";
@@ -15769,12 +16281,12 @@
hackernews = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
melpaBuild {
pname = "hackernews";
- version = "0.3.1";
+ version = "0.4.0";
src = fetchFromGitHub {
owner = "clarete";
repo = "hackernews.el";
- rev = "452e939211ebc0af7256a2f0e8cdad5c426694e6";
- sha256 = "1c49lfm5saafxks591qyy2nilymxz3aqlxpsmnad5d0kfhvjr47z";
+ rev = "22a15dc57dd6aab7793c0f9c2b72e161e0bee00c";
+ sha256 = "0bpbiadv4bf3lllsm0w1jcw8nc7c9zl97m972hbxb1dgv90gvs5b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c43a342e47e5ede468bcf51a60d4dea3926f51bd/recipes/hackernews";
@@ -15903,8 +16415,8 @@
sha256 = "0rqxi668wra1mfzq4fqscjghis5gqnwpazgidgix13brybaxydx4";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/b1dcfc8f0759792367ee49d2fe96e5bd7ca4105f/recipes/harvest";
- sha256 = "1qfhfzjwlnqpbq4kfxvs97fa3xks8zi02fnwv0ik8wb1ppbb77qd";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/c97d3f653057eab35c612109792884334be556fe/recipes/harvest";
+ sha256 = "1r6brld6iq03wsr1b3jhdkxwrcxa6g6fwa1jiy1kgjsr9dq1m51c";
name = "harvest";
};
packageRequires = [ hydra s swiper ];
@@ -16041,12 +16553,12 @@
hasky-extensions = callPackage ({ avy-menu, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "hasky-extensions";
- version = "0.1.1";
+ version = "0.2.0";
src = fetchFromGitHub {
owner = "hasky-mode";
repo = "hasky-extensions";
- rev = "3f1862989a2ca3b79761dccfa352a1b6d518ee77";
- sha256 = "10214654gvnyqimh4950jsw1r42p0y79pfl8h0x44mzll62bvz87";
+ rev = "65bf7bc3967cbda23789d6c505daf73eed9a43aa";
+ sha256 = "0r91hcm265xa8amdfi44pn0cqf4m9zigzqx1ldgg8qd6l9r2hbh7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e3f73e3df8476fa231d04211866671dd74911603/recipes/hasky-extensions";
@@ -16062,12 +16574,12 @@
hasky-stack = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }:
melpaBuild {
pname = "hasky-stack";
- version = "0.1.0";
+ version = "0.6.0";
src = fetchFromGitHub {
owner = "hasky-mode";
repo = "hasky-stack";
- rev = "a11d1e00f41407ec77ea9e6eab93949a18f58069";
- sha256 = "1bib7nic9by2vrqvrzpp62dk4apz2iyyprvk4hlgji2hkxyf2wpb";
+ rev = "a3f890fb8570369898ee9718b128d4e7123a6585";
+ sha256 = "0bc5i4s7aclwrsh8yrhfwwlfbcs5hdbzm31glikd487asv30jq9c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c3faf544872478c3bccf2fe7dc51d406031e4d80/recipes/hasky-stack";
@@ -16125,12 +16637,12 @@
helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
melpaBuild {
pname = "helm";
- version = "2.8.1";
+ version = "2.8.5";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm";
- rev = "c695a697461a48840f567bd5339909d4a80fa99f";
- sha256 = "02lmjv96l1nmjfmyn82fzlrcx3wq4xp9hjynqbb8b69xn60xnlv1";
+ rev = "2385b81edc706f7efc74f2aff4854399254cde17";
+ sha256 = "02qhjyaqxh18g23lbcfpygz1ng7skifbqb6xkgh5wii1qykqxy6m";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -16461,12 +16973,12 @@
helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "helm-core";
- version = "2.8.1";
+ version = "2.8.5";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm";
- rev = "c695a697461a48840f567bd5339909d4a80fa99f";
- sha256 = "02lmjv96l1nmjfmyn82fzlrcx3wq4xp9hjynqbb8b69xn60xnlv1";
+ rev = "2385b81edc706f7efc74f2aff4854399254cde17";
+ sha256 = "02qhjyaqxh18g23lbcfpygz1ng7skifbqb6xkgh5wii1qykqxy6m";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -16629,12 +17141,12 @@
helm-ext = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-ext";
- version = "0.1.1";
+ version = "0.1.2";
src = fetchFromGitHub {
owner = "cute-jumper";
repo = "helm-ext";
- rev = "115a3ca9a466fa84c1874ac6175fdf2256c3765c";
- sha256 = "19bcrgj531par1ayhgwxvzz28fyd7dx5flslxf1vl4qawhn173fz";
+ rev = "c8ac56918b200239b3f73a4e6a031deecc2c5646";
+ sha256 = "08c6n4zr6s3h7y0kk6g51xqs6hs29hkfmn55jfjw6hpimbk3vi1j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1ee74cb0aa3445bc9ae4226c2043ee4de3ac6cd3/recipes/helm-ext";
@@ -16839,12 +17351,12 @@
helm-hatena-bookmark = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-hatena-bookmark";
- version = "2.2.2";
+ version = "2.2.3";
src = fetchFromGitHub {
owner = "masutaka";
repo = "emacs-helm-hatena-bookmark";
- rev = "8350a600d3e03f1ec7dc899cc0b2e323b12518bb";
- sha256 = "0hmvyyhddpf831cad35c9z9fv5mpdq6qg4nzbdghlqs9pf7ik6h2";
+ rev = "d64833a5bbb4ae112ed176f6473232e526138572";
+ sha256 = "01b6nlbidk93arnnd2irm088qlws4i4p1sagsh9v153x6sk0r38k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3e9335ad16d4151dd4970c4a3ad1fee9a84404fa/recipes/helm-hatena-bookmark";
@@ -17070,12 +17582,12 @@
helm-notmuch = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, notmuch }:
melpaBuild {
pname = "helm-notmuch";
- version = "1.0";
+ version = "1.1";
src = fetchFromGitHub {
owner = "xuchunyang";
repo = "helm-notmuch";
- rev = "7d03cd9fed32b49a1f200c65ed38086c9f19cfaf";
- sha256 = "10nx6wnd2vfqxv9zr8brml0l9mfx8rrid3lbqgs8wr9313ra3360";
+ rev = "782c221bf293eee55990de5b54171f08d881dcee";
+ sha256 = "04mlsjqhh2nw2javxz8m1hbnsq0s70dw5pnwdbx8s9dk1p8ikxvw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/98667b3aa43d3e0f6174eeef82acaf71d7019aac/recipes/helm-notmuch";
@@ -17112,12 +17624,12 @@
helm-org-rifle = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
melpaBuild {
pname = "helm-org-rifle";
- version = "1.4.1";
+ version = "1.4.2";
src = fetchFromGitHub {
owner = "alphapapa";
repo = "helm-org-rifle";
- rev = "93df6808dda8f50da4f435c47763733703905119";
- sha256 = "1zyl8x03n9n9sc7bys2nqdmzadl5qrwi01qn1gy48jrkfhgiva6g";
+ rev = "26749ff9f34b2abddf7c47ff71b1046942e38398";
+ sha256 = "1q969rlqj706wdzd3s54pqpfpqkg18bzl5srl7xkw43cfzxpcpj2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle";
@@ -17364,12 +17876,12 @@
helm-qiita = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-qiita";
- version = "1.0.1";
+ version = "1.0.2";
src = fetchFromGitHub {
owner = "masutaka";
repo = "emacs-helm-qiita";
- rev = "45e38ae7b816da5db38412b2992c6d1c7a6cc30a";
- sha256 = "05394vf125qlgfrhkaqvly3340qp3zy7kldsnisms9gv0l1c60bq";
+ rev = "1eb97a44ba6fbfe61a0735b0c62171ee5217eda1";
+ sha256 = "1swkj65fhk48704ny3x6h95qqm2g21d94vzd8s8qqyjmnajj07i3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/37331f6cc8a95fd2b2ed5b20be0bcb604ea66dee/recipes/helm-qiita";
@@ -17448,12 +17960,12 @@
helm-rtags = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, rtags }:
melpaBuild {
pname = "helm-rtags";
- version = "2.12";
+ version = "2.14";
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "db1244c1c14514324474f362c857112e89bbf0c6";
- sha256 = "1fcrlxk9z11vbarznfcpfyqzvj6v3ydbn5z6vbdmgf9cxb52kfma";
+ rev = "15ef9a8bab847773d6e247005be929422fc9c285";
+ sha256 = "0yq3c4ich0sffzd571drb7k4vs0bvblx6qcrb6zry75d9npggsyg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags";
@@ -17511,12 +18023,12 @@
helm-smex = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, smex }:
melpaBuild {
pname = "helm-smex";
- version = "0.2";
+ version = "0.3";
src = fetchFromGitHub {
owner = "ptrv";
repo = "helm-smex";
- rev = "7af4e4b44671f739b39584fc50c20084700701ac";
- sha256 = "1dhzglpd48mb47iyii8igb1dldvnr4alg18m7g8xb529dx8z9wni";
+ rev = "2269375dfa452b88b5170d1a5d5849ebb2c1e413";
+ sha256 = "0n2ki7g0hygsq4bi5zkhp3v772ld7niiajfznxmv11dgn949a52s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/85568bd732da952053148e07b95e53f7caf5f62c/recipes/helm-smex";
@@ -17697,6 +18209,27 @@
license = lib.licenses.free;
};
}) {};
+ helpful = callPackage ({ dash, elisp-refs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+ melpaBuild {
+ pname = "helpful";
+ version = "0.2";
+ src = fetchFromGitHub {
+ owner = "Wilfred";
+ repo = "helpful";
+ rev = "b9a06978b6ffcd7f0ea213a6f534fa39318f0050";
+ sha256 = "1czqvmlca3w7n28c04dl3ljn8gbvfc565lysxlrhvgmv08iagnxm";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful";
+ sha256 = "17w9j5v1r2c8ka1fpzbr295cgnsbiw8fxlslh4zbjqzaazamchn2";
+ name = "helpful";
+ };
+ packageRequires = [ dash elisp-refs emacs s ];
+ meta = {
+ homepage = "https://melpa.org/#/helpful";
+ license = lib.licenses.free;
+ };
+ }) {};
hfst-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "hfst-mode";
@@ -17763,12 +18296,12 @@
hierarchy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "hierarchy";
- version = "0.6.0";
+ version = "0.7.0";
src = fetchFromGitHub {
owner = "DamienCassou";
repo = "hierarchy";
- rev = "a6a01cd4688fc9264fd36c279c0249f16704132b";
- sha256 = "0b6g9j76zd5wdqg4xkw34a6sijf8jsdvnnr7hbix7zf8cxrr2gqr";
+ rev = "4ab1372c252847c316f8978a81e2fe92ff79579e";
+ sha256 = "1kykbb1sil5cycfa5aj8dhsxc5yrx1641i2np5kwdjid6ahdlz5r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7aea238a2d14e9f58c0474251984b6c617b6854d/recipes/hierarchy";
@@ -17931,12 +18464,12 @@
hindent = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "hindent";
- version = "5.2.3";
+ version = "5.2.4";
src = fetchFromGitHub {
owner = "chrisdone";
repo = "hindent";
- rev = "abe2933e3d1f82e4eecfba11ffed27f7f52ca469";
- sha256 = "12f1mmkapjf5l6ka3k09s4i3qg5pk1cr0mv182657n0rvdn041d4";
+ rev = "e18ec3f55e288883f8042065190572e91651733d";
+ sha256 = "0iq4hs2r56rnsxfjda5acd0s2wrza7jd5jsawnzbyix1vnbgp98z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent";
@@ -18348,6 +18881,27 @@
license = lib.licenses.free;
};
}) {};
+ hy-mode = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+ melpaBuild {
+ pname = "hy-mode";
+ version = "1.0.2";
+ src = fetchFromGitHub {
+ owner = "hylang";
+ repo = "hy-mode";
+ rev = "267a3b163136d207d8d9ecd0d2aa14dc30fd0690";
+ sha256 = "11n60zzhad68vff7fqzkvbj04i3xc3xp9yc2v26v8y6zpqizhib0";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/fc9ab5cf16b61bb27559cd8ec5cf665a5aab2154/recipes/hy-mode";
+ sha256 = "1vxrqla3p82x7s3kn7x4h33vcdfms21srxgxzidr02k37f0vi82m";
+ name = "hy-mode";
+ };
+ packageRequires = [ dash dash-functional emacs s ];
+ meta = {
+ homepage = "https://melpa.org/#/hy-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
hyai = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "hyai";
@@ -18978,27 +19532,6 @@
license = lib.licenses.free;
};
}) {};
- imgix = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, ht, json ? null, lib, melpaBuild, s }:
- melpaBuild {
- pname = "imgix";
- version = "1.0.0";
- src = fetchFromGitHub {
- owner = "imgix";
- repo = "imgix-emacs";
- rev = "cf3994f69b34a36f627e9ceaf3e6f4309ee9ec30";
- sha256 = "19jqcbiwqknlpij9q63m1p69k4zb3v1qdx0858drprc2rl1p55cd";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/imgix";
- sha256 = "1480571q6qy7wv88398kxjhd96gsdhb6ar6pa1kr5y6il0s6d5lg";
- name = "imgix";
- };
- packageRequires = [ cl-lib dash ht json s ];
- meta = {
- homepage = "https://melpa.org/#/imgix";
- license = lib.licenses.free;
- };
- }) {};
immutant-server = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "immutant-server";
@@ -19044,12 +19577,12 @@
import-js = callPackage ({ emacs, fetchFromGitHub, fetchurl, grizzl, lib, melpaBuild }:
melpaBuild {
pname = "import-js";
- version = "1.0.0";
+ version = "2.0.0";
src = fetchFromGitHub {
owner = "Galooshi";
repo = "emacs-import-js";
- rev = "15d395126f57408d770a72db2e5f43271f90fa52";
- sha256 = "1ipbfacjx9vqqhvsf9sgfci8vqx0plks510w1gsjj0xwrpqn1f6l";
+ rev = "0a1032894445062b87dbe4e2c8cdba35ac25c250";
+ sha256 = "0vx2k4k8ig1k74ifxaxvhbkmfmba683qza7f9pp08daa43mgr1r3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6f26b8281f9bd05e3c8f2ef21838275711e622c9/recipes/import-js";
@@ -19125,22 +19658,22 @@
license = lib.licenses.free;
};
}) {};
- indium = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }:
melpaBuild {
pname = "indium";
- version = "0.28";
+ version = "1.0";
src = fetchFromGitHub {
owner = "NicolasPetton";
repo = "Indium";
- rev = "83ad172b96bb011bb705add136a7571b08f6c4c2";
- sha256 = "16l17sldq68492xa2nbkr956hcpncalmjr1spbf1avi9z910d17l";
+ rev = "db3b727c9deedcf9afa13e07cd25734cbf7305a2";
+ sha256 = "1cm6zm8d7rywvlhzf1vpblqb1kgn6c7bwk9q2mjz7f5gdcsx1jp5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium";
sha256 = "024ljx7v8xahmr8jm41fiy8i5jbg48ybqp5n67k4jwg819cz8wvl";
name = "indium";
};
- packageRequires = [];
+ packageRequires = [ company emacs js2-mode seq websocket ];
meta = {
homepage = "https://melpa.org/#/indium";
license = lib.licenses.free;
@@ -19191,12 +19724,12 @@
inflections = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "inflections";
- version = "2.4";
+ version = "2.5";
src = fetchFromGitHub {
owner = "eschulte";
repo = "jump.el";
- rev = "fb3dd59f21f77016742de40028aee92176c0917a";
- sha256 = "1alncmx4q2szvlzg57332zmqm6rsgzf12kfg9l1vb5s9vgd1ki5p";
+ rev = "40a7ffdf734ffe7d1968909663146255d7ba69c8";
+ sha256 = "1ig1wdjg914p9ng1nir2fid4mb3xz2dbpmkdnfy1klq2zp0xw2s3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/392c7616d27bf12b29ef3c2ea71e42ffaea81cc6/recipes/inflections";
@@ -19325,7 +19858,7 @@
sha256 = "0jipds844432a8m4d5gxbbkk2h1rsq9fg748g6bxy2q066kyzfz6";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/5bf7761c9091260d378621907a1689498aedc098/recipes/inline-crypt";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/b04fffe5e52f26e92930a112a64531228f94e340/recipes/inline-crypt";
sha256 = "04mcyyqa9h6g6wrzphzqalpqxsndmzxpavlpdc24z4a2c5s3yz8n";
name = "inline-crypt";
};
@@ -19359,12 +19892,12 @@
insert-shebang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "insert-shebang";
- version = "0.9.5";
+ version = "0.9.6";
src = fetchFromGitHub {
owner = "psachin";
repo = "insert-shebang";
- rev = "8b36eaa092e62002fe64162daf9d3ad1138b6ec2";
- sha256 = "1an7wzqnh9aj38bi9w0wsrs35h2z43lkaaw04lrz3a6zf797ac3x";
+ rev = "adfa473f07443b231914d277c20a3419b30399b6";
+ sha256 = "10zy3vg5fr30hhv0q3jldffhjacg1yrv5d9gfkdz55ry277l3xz1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c257f4f5011cd7d0b2a5ef3adf13f9871bf0be92/recipes/insert-shebang";
@@ -19400,12 +19933,12 @@
intellij-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "intellij-theme";
- version = "1.1";
+ version = "1.3";
src = fetchFromGitLab {
owner = "fommil";
repo = "emacs-intellij-theme";
- rev = "ad207c8c3d266d566fb1e4862df154096c059171";
- sha256 = "06slahp36mj39ri4v4k7sv3mly6cgk76m4zpc1why3h6dmd7hhyr";
+ rev = "1bbfff8e6742d18e9b77ed796f44da3b7bd10606";
+ sha256 = "0ml1gi2cn6h3xm5c78vxwv327r0rgimia1vqqi9jb09yb6lckbgj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cfe86071b2e84929476a771da99341f4a73cfd06/recipes/intellij-theme";
@@ -19442,12 +19975,12 @@
intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }:
melpaBuild {
pname = "intero";
- version = "0.1.21";
+ version = "0.1.23";
src = fetchFromGitHub {
owner = "commercialhaskell";
repo = "intero";
- rev = "4c8f3e7f4ad03179425c722d5072beae254da73b";
- sha256 = "0q377rpgszqixjbmwck6kcczfb3j8axx0pk6fqavzp8qyc3q121l";
+ rev = "3865aad923559bee140eaede20c3510890979930";
+ sha256 = "1q6q2hnqf78kxd61nic4zjx7crbv8p25p4aq0h4vihamm8r0v7vm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero";
@@ -19526,12 +20059,12 @@
irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
melpaBuild {
pname = "irony";
- version = "1.0.0";
+ version = "1.2.0";
src = fetchFromGitHub {
owner = "Sarcasm";
repo = "irony-mode";
- rev = "2424f57a3c0d320946c7ad32b44d296a91104201";
- sha256 = "13lg7ra4g3nbg96vbwk1giw2pjhqarpd72qi21x57w3lc44fwqld";
+ rev = "78b06aa2df5251adaabb6c749febc1f1bd2ad605";
+ sha256 = "0nhjrnlmss535jbshjjd30vydbr8py21vkx4p294w6d8vg2rssf8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony";
@@ -19565,6 +20098,27 @@
license = lib.licenses.free;
};
}) {};
+ iter2 = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "iter2";
+ version = "0.9.4";
+ src = fetchFromGitHub {
+ owner = "doublep";
+ repo = "iter2";
+ rev = "a0e41b2f55d50c08c59ffcc6e83a977c141bcc55";
+ sha256 = "0ccr9qjhc35wi07yckd9y26synihhsg8zwkxgqyzkx7avxkqfyhn";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/d94316660051ee0ba0c12e380e6203986440368f/recipes/iter2";
+ sha256 = "0kl3z2wwpvk2ddsb3798g41pv0xycsf9dclhv00snpzsr61d9v65";
+ name = "iter2";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/iter2";
+ license = lib.licenses.free;
+ };
+ }) {};
ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ivy";
@@ -19736,12 +20290,12 @@
ivy-rtags = callPackage ({ fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, rtags }:
melpaBuild {
pname = "ivy-rtags";
- version = "2.12";
+ version = "2.14";
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "db1244c1c14514324474f362c857112e89bbf0c6";
- sha256 = "1fcrlxk9z11vbarznfcpfyqzvj6v3ydbn5z6vbdmgf9cxb52kfma";
+ rev = "15ef9a8bab847773d6e247005be929422fc9c285";
+ sha256 = "0yq3c4ich0sffzd571drb7k4vs0bvblx6qcrb6zry75d9npggsyg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags";
@@ -19757,12 +20311,12 @@
ivy-youtube = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, request }:
melpaBuild {
pname = "ivy-youtube";
- version = "0.2.0";
+ version = "0.3.1";
src = fetchFromGitHub {
owner = "squiter";
repo = "ivy-youtube";
- rev = "32f609f1d1a3718739be5797e020d6266d8340d2";
- sha256 = "0vvqp6aw83bxk7j835w267m1xyl7a9a5m45h50267ahvhd9vn1sd";
+ rev = "9a9d584124bd9905b5a8a7e29cdafa3224770c9d";
+ sha256 = "0fircdxhfb9s6qmzic2hizhlwfkszw3was83nw09zf0zhab3vllh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ivy-youtube";
@@ -20025,6 +20579,27 @@
license = lib.licenses.free;
};
}) {};
+ jetbrains = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "jetbrains";
+ version = "0.0.2";
+ src = fetchFromGitHub {
+ owner = "emacs-php";
+ repo = "jetbrains.el";
+ rev = "38e136079f3f2ddbe0e8b7dec01cf6b515e897d8";
+ sha256 = "1ji64qip5raf0lbv7fv36rd4fwa33zn0xi7sa0zrgf0kcsr0qasb";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/00dd4626e261d9831fc62d866d50b7257ee418c4/recipes/jetbrains";
+ sha256 = "0254dkzf2x5dj3j549xjash0lsadkn0bdcyjkjlrv8hqvdr1f1m7";
+ name = "jetbrains";
+ };
+ packageRequires = [ cl-lib emacs f ];
+ meta = {
+ homepage = "https://melpa.org/#/jetbrains";
+ license = lib.licenses.free;
+ };
+ }) {};
jinja2-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "jinja2-mode";
@@ -20088,6 +20663,27 @@
license = lib.licenses.free;
};
}) {};
+ js-auto-format-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "js-auto-format-mode";
+ version = "1.0.2";
+ src = fetchFromGitHub {
+ owner = "ybiquitous";
+ repo = "js-auto-format-mode";
+ rev = "e0b7ae9d1d70fa74abd91bb6f901bd46db5a22eb";
+ sha256 = "1z5vi8681afm7jsqwifnb35sja1s4b2j123b3pn0bv1j6b8iaq9j";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/2d3be16771b5b5fde639da3ee97890620354ee7a/recipes/js-auto-format-mode";
+ sha256 = "1gxf7xz1j3ga2pk5w8cgny7l8kid59zap2a97lhb50w1qczfqqzs";
+ name = "js-auto-format-mode";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/js-auto-format-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
js-comint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "js-comint";
@@ -20112,12 +20708,12 @@
js2-closure = callPackage ({ fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
melpaBuild {
pname = "js2-closure";
- version = "2.1";
+ version = "2.2.1";
src = fetchFromGitHub {
owner = "jart";
repo = "js2-closure";
- rev = "6050abb334c228702c23fcb03bfdf1dfbd1d6b11";
- sha256 = "1b4d13kz7afr5a6wyhq6vmwz8gsabdi86scw3q3v6l56hl2rgy46";
+ rev = "74a75f001a8bc2b9c02b9e8b4557f7ee3c5f84fb";
+ sha256 = "1gapx656s4ngy8s8y1p56xxnclwf4qqg83l3jizknxky7yhayyl9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/61bf3e70ae38a78184f0b373ff6f0db234f51cb2/recipes/js2-closure";
@@ -20319,6 +20915,27 @@
license = lib.licenses.free;
};
}) {};
+ jsonnet-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "jsonnet-mode";
+ version = "0.0.1";
+ src = fetchFromGitHub {
+ owner = "mgyucht";
+ repo = "jsonnet-mode";
+ rev = "efe768fdcff25d746674fbbf229b9e1a7efea4f1";
+ sha256 = "1a52266y83z9i3sg7hhc8sw7rhjy5i9wdy2bv7s2fv00lnngaj29";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/ba17372732723f73e8eeb6e7c47abc0edeb20da4/recipes/jsonnet-mode";
+ sha256 = "1aadys887szlc924qr645lby9f8vzvxkwhq6byhppk1b01h911ia";
+ name = "jsonnet-mode";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/jsonnet-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
jsx-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "jsx-mode";
@@ -20340,22 +20957,22 @@
license = lib.licenses.free;
};
}) {};
- jump = callPackage ({ fetchFromGitHub, fetchurl, findr, inflections, lib, melpaBuild }:
+ jump = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, findr, inflections, lib, melpaBuild }:
melpaBuild {
pname = "jump";
- version = "2.4";
+ version = "2.5";
src = fetchFromGitHub {
owner = "eschulte";
repo = "jump.el";
- rev = "fb3dd59f21f77016742de40028aee92176c0917a";
- sha256 = "1alncmx4q2szvlzg57332zmqm6rsgzf12kfg9l1vb5s9vgd1ki5p";
+ rev = "40a7ffdf734ffe7d1968909663146255d7ba69c8";
+ sha256 = "1ig1wdjg914p9ng1nir2fid4mb3xz2dbpmkdnfy1klq2zp0xw2s3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f0c791aebccc08b770b3969ce5d2e82cbe26f80e/recipes/jump";
sha256 = "18g0fa9g8m9jscsm6pn7jwdq94l4aj0dfhrv2hqapq1q1x537364";
name = "jump";
};
- packageRequires = [ findr inflections ];
+ packageRequires = [ cl-lib findr inflections ];
meta = {
homepage = "https://melpa.org/#/jump";
license = lib.licenses.free;
@@ -20487,24 +21104,24 @@
license = lib.licenses.free;
};
}) {};
- kaolin-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ kaolin-themes = callPackage ({ autothemer, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
- pname = "kaolin-theme";
- version = "0.6";
+ pname = "kaolin-themes";
+ version = "1.0";
src = fetchFromGitHub {
- owner = "0rdy";
- repo = "kaolin-theme";
- rev = "041cc6637a58a3a24086d1c2b8c3eb113434127e";
- sha256 = "1qx6568s8wj6ha8wfy8hih1qwwcdiybdb83w3fr9lqwh0lyhjp0f";
+ owner = "ogdenwebb";
+ repo = "emacs-kaolin-themes";
+ rev = "720762a42ad4cb4b325f78a9d41af380b8783501";
+ sha256 = "104prgkjqnnv1bqgpcl0di1q9sqkfnj4ibqvrk6ls32hw75shvdh";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/d2abf9d914cdc210bbd47ea92d0dac76683e21f0/recipes/kaolin-theme";
- sha256 = "1316sn1xpli9aqbhn8sldyvsc2fwk1ql9aw4l0rgkfbivvcklp7c";
- name = "kaolin-theme";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes";
+ sha256 = "1pd2v54d578f1wbwvqzplkdz1qvy8w8s6na511b0v5y9sksgm2xw";
+ name = "kaolin-themes";
};
- packageRequires = [ emacs ];
+ packageRequires = [ autothemer cl-lib emacs ];
meta = {
- homepage = "https://melpa.org/#/kaolin-theme";
+ homepage = "https://melpa.org/#/kaolin-themes";
license = lib.licenses.free;
};
}) {};
@@ -20973,12 +21590,12 @@
latex-extra = callPackage ({ auctex, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "latex-extra";
- version = "1.13";
+ version = "1.14";
src = fetchFromGitHub {
owner = "Malabarba";
repo = "latex-extra";
- rev = "d5b759fa61da968c3ca998ba0d2ef4a73647e5fd";
- sha256 = "07aavdr1dlw8hca27l8a0i8cs5ga1wqqdf1v1iyvjz61vygld77a";
+ rev = "82d99b8b0c2db20e5270749582e03bcc2443ffb5";
+ sha256 = "15m7zvdhg5z7d8alrw66p703wdp5r57lxrgq3zz7xc4hscwghlb1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/latex-extra";
@@ -21484,12 +22101,12 @@
live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "live-py-mode";
- version = "2.16.0";
+ version = "2.18.1";
src = fetchFromGitHub {
owner = "donkirkby";
repo = "live-py-plugin";
- rev = "96f22fe5892775b8a9a081898e1a4f00fbb8a674";
- sha256 = "005g84acwjns587lawgms63b9840xswpqj0ccgdaqj6g9p0ynmqa";
+ rev = "145d21d65b5469e682ef464ae8f4e0e3d8c0f04b";
+ sha256 = "1h188cprka13bd1prfj1w86m5z8c1nfaz4dw18g88jf6b0gyazhz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode";
@@ -21502,6 +22119,27 @@
license = lib.licenses.free;
};
}) {};
+ lively = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "lively";
+ version = "0.2";
+ src = fetchFromGitHub {
+ owner = "purcell";
+ repo = "lively";
+ rev = "6ec648fcde85e81393db1ed1364860f960179c92";
+ sha256 = "06sdaj2akwjg1a7yvmm3gsip66iaq9bhm3gr45szwg6z622q4gvf";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/3e4b01286dbc84f01b43955b693ca08e675ffa07/recipes/lively";
+ sha256 = "1q8cbl3sr3dpvzk57985giy4xmz4lvg94jcw7shbhz1v9q05dr5g";
+ name = "lively";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/lively";
+ license = lib.licenses.free;
+ };
+ }) {};
lms = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "lms";
@@ -21630,12 +22268,12 @@
logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "logview";
- version = "0.8.1";
+ version = "0.8.2";
src = fetchFromGitHub {
owner = "doublep";
repo = "logview";
- rev = "134b41557ab539219d9e3a1b3c8939df93676726";
- sha256 = "1jfdm64r6rj7pl6270v084fvaga5csa4snvbfjdlhs5bshn1d0v2";
+ rev = "72b6c5349206172a146b2c730b8ac040a92ebc3f";
+ sha256 = "1f93iyxf8v0jazzh6jljrm7r28z00nn14wr90qrh9y9chyq72n63";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview";
@@ -21800,14 +22438,14 @@
pname = "magic-filetype";
version = "0.2.1";
src = fetchFromGitHub {
- owner = "zonuexe";
+ owner = "emacs-php";
repo = "magic-filetype.el";
rev = "0dfe3d9e0e22c7b06e34c8338f110e337306e3fd";
sha256 = "1yjn2w0ykczhlj4q3dnfw2z4q66201dn3jz31yw7hh8bxjlsvwfh";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/0d6027c5a66386f7140305a4cde12d66da4dfa09/recipes/magic-filetype";
- sha256 = "0gcys45cqn5ghppkn0rmyvfybprlfz1x6hqr21yv93mf79h75zhg";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/magic-filetype";
+ sha256 = "0f0j8fgh2gpkarz9308pns0d89wc2dchyim6hbixkdpqzg9gskc3";
name = "magic-filetype";
};
packageRequires = [ emacs s ];
@@ -21819,12 +22457,12 @@
magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
melpaBuild {
pname = "magit";
- version = "2.10.3";
+ version = "2.11.0";
src = fetchFromGitHub {
owner = "magit";
repo = "magit";
- rev = "d5b747473ab0bf0f0034fca2f57f6497d476b67e";
- sha256 = "1cw1nrgmbh0jikr88di4na3f0m643v0p7x8cf7xya2lgqwkdravc";
+ rev = "4ad2ebfef0afa7e5f5fb85e8d1146da613804fe5";
+ sha256 = "1zvib46hn2c0g2zdnf4vcwjrs9dj5sb81hpqm7bqm8f97p9dv6ym";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit";
@@ -21847,12 +22485,12 @@
magit-annex = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
melpaBuild {
pname = "magit-annex";
- version = "1.3.1";
+ version = "1.4.0";
src = fetchFromGitHub {
owner = "magit";
repo = "magit-annex";
- rev = "ae6250aead8f283eac8d6951a249cfc7d85e0b40";
- sha256 = "0n6dhc92z5w67rcfngjzprzbdn42ja263gdqa7fncqq9p66slccq";
+ rev = "895c229c2b0d822a4debb302d8638105ecb4ee20";
+ sha256 = "0316csgc95dalqmkxj6qlb7inzcg4csfs9n3im1ygswcswpdaajh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-annex";
@@ -21952,12 +22590,12 @@
magit-gitflow = callPackage ({ fetchFromGitHub, fetchurl, lib, magit, magit-popup, melpaBuild }:
melpaBuild {
pname = "magit-gitflow";
- version = "2.2.2";
+ version = "2.2.3";
src = fetchFromGitHub {
owner = "jtatarik";
repo = "magit-gitflow";
- rev = "5bdcfe0a7bf4f5bb9a927baa4880233bf11a4a6b";
- sha256 = "12pi6aw44lnzzcw0zgz5rxvcf4p700fkz4q2skbapwmds8gw3fg9";
+ rev = "cc41b561ec6eea947fe9a176349fb4f771ed865b";
+ sha256 = "0jz69wrrzvqadaphmjrr146nzvmphsbl7rmc3ccnpw1gw6gnz81f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/dfaeb33dec2c75d21733b6e51d063664c6544e4d/recipes/magit-gitflow";
@@ -21994,12 +22632,12 @@
magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "magit-popup";
- version = "2.10.3";
+ version = "2.11.0";
src = fetchFromGitHub {
owner = "magit";
repo = "magit";
- rev = "d5b747473ab0bf0f0034fca2f57f6497d476b67e";
- sha256 = "1cw1nrgmbh0jikr88di4na3f0m643v0p7x8cf7xya2lgqwkdravc";
+ rev = "4ad2ebfef0afa7e5f5fb85e8d1146da613804fe5";
+ sha256 = "1zvib46hn2c0g2zdnf4vcwjrs9dj5sb81hpqm7bqm8f97p9dv6ym";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup";
@@ -22015,12 +22653,12 @@
magit-rockstar = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
melpaBuild {
pname = "magit-rockstar";
- version = "1.0.5";
+ version = "1.0.6";
src = fetchFromGitHub {
owner = "tarsius";
repo = "magit-rockstar";
- rev = "bccce1ac8e012f52e29470c1c7d815f9bb1a192b";
- sha256 = "0z411x2w6ldy3b8qbavfvfgvkbjd1rl0m1plr44ynp55awrhj0k2";
+ rev = "a65042e3445008b55190f1258ae54bd78e12174b";
+ sha256 = "1wbbg9jr9kl69sbq9b9dgwvnplmdzjyanwfcncamw3lfcjfnw1bn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7a20b539cbd38ffa546c1b56b9fac78c0b9457f6/recipes/magit-rockstar";
@@ -22120,12 +22758,12 @@
magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub-plus, lib, magit, melpaBuild, s }:
melpaBuild {
pname = "magithub";
- version = "0.1.3";
+ version = "0.1.4";
src = fetchFromGitHub {
owner = "vermiculus";
repo = "magithub";
- rev = "959e7b259697c79ccf46b95827575d3e15e83d30";
- sha256 = "19m7qmp5pi5l3mak1j475qxgnpr4kc4dm7qj80qc4m844bkacc4h";
+ rev = "2fcd5eebf3e052234950b3b07e43d26ce632a794";
+ sha256 = "0k5bxxfj60vr58g7rnj562ls8ijb0ia66fdiqpyffi5sf0wan13i";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/magithub";
@@ -22309,12 +22947,12 @@
markdown-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "markdown-mode";
- version = "2.2";
+ version = "2.3";
src = fetchFromGitHub {
owner = "jrblevin";
repo = "markdown-mode";
- rev = "e9bb47d8d87ae8205ed935a3b485e12c12e43aa9";
- sha256 = "1lccxj18zhhhrc87dzm8fd4989pgkvbfkrlp53bjbrzzkh9bd6vs";
+ rev = "cde5c5d2bcce470c494b76e23cfe1364b6291c20";
+ sha256 = "1zm1j4w0f3h01bmmpsv4j4mh6i13nnl8fcqlj2hsa1ncy1lgi8q7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/74610ec93d4478e835f8b3b446279efc0c71d644/recipes/markdown-mode";
@@ -22351,12 +22989,12 @@
markdown-preview-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, uuidgen, web-server, websocket }:
melpaBuild {
pname = "markdown-preview-mode";
- version = "0.8";
+ version = "0.9";
src = fetchFromGitHub {
owner = "ancane";
repo = "markdown-preview-mode";
- rev = "65f48df07c87d37275cc6a135741df4b585f1836";
- sha256 = "0gkfwm7zxwdi7x7xd6m9sl9q1p5f2q8mxryq6cd4xldbvbcki71f";
+ rev = "134fd336750b8b3165bc906f0a7161c25eb6f589";
+ sha256 = "0j1jdvmn8psarjdl1j4d3rsjmnb3gcissh2l78xj2c8vckmp2g24";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d3c5d222cf0d7eca6a4e3eb914907f8ca58e40f0/recipes/markdown-preview-mode";
@@ -22442,12 +23080,12 @@
marshal = callPackage ({ eieio ? null, fetchFromGitHub, fetchurl, ht, json ? null, lib, melpaBuild }:
melpaBuild {
pname = "marshal";
- version = "0.7.0";
+ version = "0.8.2";
src = fetchFromGitHub {
owner = "sigma";
repo = "marshal.el";
- rev = "92caeddbb3c3de61707d12db62b9915e271807b7";
- sha256 = "0fajz4k3p2ki237jz0c3wfab5272fvvw9vzxzfivpmpcnws6gbn6";
+ rev = "d714219aeb388ded88582c47940f2c6febae333c";
+ sha256 = "1mr5p2yiad1k15byrlk0a784kj7rvibpn4li5phk4rnm0zg1xy9s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/203f2061c5c7d4aefab3175de5e0538f12158ee3/recipes/marshal";
@@ -22610,12 +23248,12 @@
mc-extras = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }:
melpaBuild {
pname = "mc-extras";
- version = "1.2.1";
+ version = "1.2.4";
src = fetchFromGitHub {
owner = "knu";
repo = "mc-extras.el";
- rev = "71cf966be06d9c74e781a87bb30fa4cf657ee852";
- sha256 = "0252wdq4sd6jhzfy0pn3gdm6aq2h13nnp8hvrn1mpml9x473a5n1";
+ rev = "f0ba639e9b18cc56e80ae45bbb2b694dbad9171a";
+ sha256 = "0d6ncj6zd0lfsdpffbh3l25ycjw5hn0rwi5znp5hpl06b1ycyk4s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/12747bb8603ebc09ce0873f3317a99e34d818313/recipes/mc-extras";
@@ -22736,12 +23374,12 @@
merlin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "merlin";
- version = "3.0.2";
+ version = "3.0.3";
src = fetchFromGitHub {
owner = "the-lambda-church";
repo = "merlin";
- rev = "b53e4beeeb8da6d7cb035990a7e805fea5da0de6";
- sha256 = "1lw0s78zwr8rd4q4pg34m9q8yd5swh1fff3c5p992a2qlzfb0hax";
+ rev = "a5dbf8e321ff162476555e62264468dd6f55c279";
+ sha256 = "0mq4ddr3g64dd4bhq812hb5xvlkswfmib1nw34f3m8sghmaxcd5z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b1b9bfd3164e62758dc0a3362d85c6627ed7cbf8/recipes/merlin";
@@ -22754,6 +23392,27 @@
license = lib.licenses.free;
};
}) {};
+ meson-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "meson-mode";
+ version = "0.1";
+ src = fetchFromGitHub {
+ owner = "wentasah";
+ repo = "meson-mode";
+ rev = "212d9f38a08074f1cb6e914e12b60bc52dcb8bee";
+ sha256 = "1kv7413y5530frs1nrp0nl40h9j0idwp7vlg761r260200m8sl3v";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/4702a31ffd6b9c34f96d151f2611a1bfb25baa88/recipes/meson-mode";
+ sha256 = "16yg217ghx6pvlxha2swznkg12c2a9hhyi0hnsbqdj2ijcdzca80";
+ name = "meson-mode";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/meson-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
meta-presenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "meta-presenter";
@@ -23260,12 +23919,12 @@
monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "monokai-theme";
- version = "3.3.0";
+ version = "3.4.0";
src = fetchFromGitHub {
owner = "oneKelvinSmith";
repo = "monokai-emacs";
- rev = "46fe076b5943ccc6fdc9cdacc7e8ad02b64bcd36";
- sha256 = "03aw9ab54a5fljhwygg62hr2n9kk82xfwcdq17ln5z0951gqi99r";
+ rev = "019e07947426f0192fc3458f3f72c19031b607de";
+ sha256 = "0id35345zp0fchbcz8qk2lg71jyln91k56vfama27ss3nzy3f9kz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme";
@@ -23365,12 +24024,12 @@
move-text = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "move-text";
- version = "2.0.5";
+ version = "2.0.8";
src = fetchFromGitHub {
owner = "emacsfodder";
repo = "move-text";
- rev = "58f66f9b62af776a6c3ebe1151b038b59b2c12d4";
- sha256 = "03rkqv8l98ximfw33972y2lsqzjvbdv9kvz38i9p8iva56cmkbki";
+ rev = "bdaf3e3a0d33cd528cad1d10facbdf0635232e4d";
+ sha256 = "06jxk5g23822gfmwrxhc34zand3dr8p2wjh1zs3j61ibz6n0nmz1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/82bfd0f41e42eed1d4c2361ec1d1685edebbac1b/recipes/move-text";
@@ -23677,6 +24336,27 @@
license = lib.licenses.free;
};
}) {};
+ mustache = callPackage ({ dash, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }:
+ melpaBuild {
+ pname = "mustache";
+ version = "0.23";
+ src = fetchFromGitHub {
+ owner = "Wilfred";
+ repo = "mustache.el";
+ rev = "b0ea352813592424164520a49e86c04600242752";
+ sha256 = "1n2ymd92qpvsby6ms0l3kjhdzzc47rri2aiscc6bs07hm4mjpr9q";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/d1bcf9599ca6d2c29333071a80f96808d4ab52e2/recipes/mustache";
+ sha256 = "1pjr00xx77mlfw1myxaz6i3y2gbivhbiq5hyjxxbjlfrkm1vxc8g";
+ name = "mustache";
+ };
+ packageRequires = [ dash ht s ];
+ meta = {
+ homepage = "https://melpa.org/#/mustache";
+ license = lib.licenses.free;
+ };
+ }) {};
mustache-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mustache-mode";
@@ -24097,15 +24777,36 @@
license = lib.licenses.free;
};
}) {};
+ nim-mode = callPackage ({ commenter, emacs, epc, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }:
+ melpaBuild {
+ pname = "nim-mode";
+ version = "0.4.1";
+ src = fetchFromGitHub {
+ owner = "nim-lang";
+ repo = "nim-mode";
+ rev = "86abed21b9b718ac65cc167f208e0bd5b92c79ed";
+ sha256 = "0h1paf9z6xvkay97ns74w2w9plwi46md5f2kik4jvjy74p57gxal";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/dc2ccb5f24b9d55c77eaa7952a9e6a2e0ed7be24/recipes/nim-mode";
+ sha256 = "1kzn3kkkj7jzs7fqhvib196sl3vp7kbhb4icqzmvvmv366lkaib6";
+ name = "nim-mode";
+ };
+ packageRequires = [ commenter emacs epc flycheck let-alist ];
+ meta = {
+ homepage = "https://melpa.org/#/nim-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
ninja-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ninja-mode";
- version = "1.7.2";
+ version = "1.8.2";
src = fetchFromGitHub {
owner = "martine";
repo = "ninja";
- rev = "717b7b4a31db6027207588c0fb89c3ead384747b";
- sha256 = "1pc4sr50wknwai33lqm92bm811yzvpyrvry9419p7wp3r6p3nmhw";
+ rev = "253e94c1fa511704baeb61cf69995bbf09ba435e";
+ sha256 = "16scq9hcq6c5ap6sy8j4qi75qps1zvrf3p79j1vbrvnqzp928i5f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/aed2f32a02cb38c49163d90b1b503362e2e4a480/recipes/ninja-mode";
@@ -24139,22 +24840,22 @@
license = lib.licenses.free;
};
}) {};
- nix-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ nix-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "nix-mode";
- version = "1.11.13";
+ version = "1.2.1";
src = fetchFromGitHub {
owner = "NixOS";
- repo = "nix";
- rev = "0ec723375bc6008a8a88024962b052c3fbbaf4b8";
- sha256 = "1wg622s0qvgdzry4mb6a7jjpql7la58kwhzpif0akyd689xf9d9s";
+ repo = "nix-mode";
+ rev = "d5e839692a1273b128003eaed543318e7e5965a7";
+ sha256 = "1zpqpq6hd83prk80921nbjrvcmk0dykqrrr1mw3b29ppjma5zjiz";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode";
- sha256 = "00rqawi8zs2x79c91gmk0anfyqbwalvfwmpak20i11lfzmdsza1s";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e1870d786dbfac3b14386c8030e06f2d13ab9da6/recipes/nix-mode";
+ sha256 = "10f3ly4860lkxzykw4fbvhn3i0c2hgj77jfjbhlk2c1jz9x4yyy5";
name = "nix-mode";
};
- packageRequires = [];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/nix-mode";
license = lib.licenses.free;
@@ -24184,12 +24885,12 @@
no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "no-littering";
- version = "0.5.9";
+ version = "0.5.11";
src = fetchFromGitHub {
owner = "emacscollective";
repo = "no-littering";
- rev = "8b689a1e16d4825d0221f4a41756b63bbc361c82";
- sha256 = "02cb5m1r5k1f6il79yv8fa5yiyz2m37awlbjjxmkv1av06kl0abn";
+ rev = "a4b42b185b65e78bc3bb6523e23aefb1213eb3b2";
+ sha256 = "1yzcawvz3vbq6pgr0b3sk0qg24jx1fpkinwcmsdl283ib8msbc7g";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/no-littering";
@@ -24286,11 +24987,11 @@
}) {};
notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
pname = "notmuch";
- version = "0.25";
+ version = "0.25.2";
src = fetchgit {
url = "git://git.notmuchmail.org/git/notmuch";
- rev = "9f648dfbb8e253dab1bc4a0e761ad46cec405f4d";
- sha256 = "17b2rwvfq5zqm4cw8zqqzns8jjld3bpb25ca4133ckgkwach4v1d";
+ rev = "83f266136369452b859393429b8530efac2e09fb";
+ sha256 = "0idim2yslpjzbzy5hh9qhw1gy0h9p92rs0jrr8d2l9y8nsnh6zzr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
@@ -24324,6 +25025,27 @@
license = lib.licenses.free;
};
}) {};
+ nov = callPackage ({ dash, emacs, esxml, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "nov";
+ version = "0.2.1";
+ src = fetchFromGitHub {
+ owner = "wasamasa";
+ repo = "nov.el";
+ rev = "19ab463864f137b43704b4f34173349c88e84d8e";
+ sha256 = "00f5hhw157nwdwy26yn6l3z2hgk6xxvx5xl0hasskj1l9rg0zgh2";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/cf543955ba2d5d0074fa2a5ba176f9415f6e006d/recipes/nov";
+ sha256 = "0hlcncpdazi4rn5yxd0zq85v7gpjhw7a6dl2i99zf4ymsan97lhq";
+ name = "nov";
+ };
+ packageRequires = [ dash emacs esxml ];
+ meta = {
+ homepage = "https://melpa.org/#/nov";
+ license = lib.licenses.free;
+ };
+ }) {};
noxml-fold = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "noxml-fold";
@@ -24492,27 +25214,6 @@
license = lib.licenses.free;
};
}) {};
- nyan-prompt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "nyan-prompt";
- version = "0.2.0";
- src = fetchFromGitHub {
- owner = "PuercoPop";
- repo = "nyan-prompt";
- rev = "b5137f2ee9afe640f59786eed17b308df6356c73";
- sha256 = "0bgspjy8h3d7v12sfjnd2ghj4183pdf0z48g5xs129jwd3nycykp";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/2e3bf5fe2adaf557146df6f4e13aa6ffedb5d1e3/recipes/nyan-prompt";
- sha256 = "1s0qyhpfpncsv9qfxy07rbp4gv8pp5xzb48rbd3r14nkjlnylnfb";
- name = "nyan-prompt";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/nyan-prompt";
- license = lib.licenses.free;
- };
- }) {};
o-blog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "o-blog";
@@ -24558,12 +25259,12 @@
ob-http = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "ob-http";
- version = "0.1.0";
+ version = "0.2.0";
src = fetchFromGitHub {
owner = "zweifisch";
repo = "ob-http";
- rev = "9155a413e41d918042e9839399e3940aa0f8499c";
- sha256 = "1b39g0nifw0000s0x8ir0cfr716jypq6b5n2l1i4mrby6aw3bw1k";
+ rev = "20393dd8130d21a3f06d8514da14c5ffdd88ae44";
+ sha256 = "0xa7rgsb0d1d96h5bb0n0sy1hgmd2fg6r6g2aqp1c29ld4hpi7r7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/950b02f76a04f453992b8720032e8c4cec9a039a/recipes/ob-http";
@@ -24810,12 +25511,12 @@
olivetti = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "olivetti";
- version = "1.5.7";
+ version = "1.5.8";
src = fetchFromGitHub {
owner = "rnkn";
repo = "olivetti";
- rev = "e5153850ab626699109d93ab0afb6e3aea48f8b8";
- sha256 = "1bg1j8wi8smsbf4qmpcy3j3ihkg3gpnxa5bqgysbj7j9n11rjgl4";
+ rev = "9bd41082a593ba90f3e9e34d3ffc29bbb276b674";
+ sha256 = "0j33wn2kda5fi906h6y0zd5d0ygw0jg576kdndc3zyb4pxby96dn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/697334ca3cdb9630572ae267811bd5c2a67d2a95/recipes/olivetti";
@@ -24831,12 +25532,12 @@
omni-kill = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "omni-kill";
- version = "0.2.3";
+ version = "0.6.0";
src = fetchFromGitHub {
owner = "AdrieanKhisbe";
repo = "omni-kill.el";
- rev = "8a1145b58b4736c9163bcd5b28c8fea80b2ea97b";
- sha256 = "07grj81alrr6qgs3jmqkjzphkvi26w6jm5hf1f5wyx7h6q293ady";
+ rev = "904549c8fd6ac3cf22b5d7111ca8944e179cffea";
+ sha256 = "1mlnh5pdqdv1qb8jvi0wvkgbpy74zq807gmp04bp6cpxdns9j63f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c24df34d2fa5d908223379e909148423ba327ae2/recipes/omni-kill";
@@ -24852,12 +25553,12 @@
omni-log = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }:
melpaBuild {
pname = "omni-log";
- version = "0.3.3";
+ version = "0.3.6";
src = fetchFromGitHub {
owner = "AdrieanKhisbe";
repo = "omni-log.el";
- rev = "e86c80065030306645e28badcb0c25c549560106";
- sha256 = "10nsl45z3a1mvagffcsqj501x8wk3avmsncyn9laq3k4z1hjgdz5";
+ rev = "20021eb788cbeec0371145468430b259686f519d";
+ sha256 = "1sf2zbhjaz5b9xmz6632338cga7d326ibgw8b8c6c6b4vk16yhqc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/47bb19bb7b4713c3fd82c1035a2fe66588c069e3/recipes/omni-log";
@@ -24894,12 +25595,12 @@
omni-scratch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "omni-scratch";
- version = "0.4.1";
+ version = "0.6.0";
src = fetchFromGitHub {
owner = "AdrieanKhisbe";
repo = "omni-scratch.el";
- rev = "0da549c1386f93ed4de201bf8779ba64ddc91347";
- sha256 = "0qfi54z2jqrkrdzriandwc9myzc27sxsx7nf20jf5qvcdgn13cl1";
+ rev = "636374c59c7d33c2f72c97ad8ba9fb4854f2324d";
+ sha256 = "0w62bk2m0gs4b605s691z4iap9baz1z6c8z4v9vb05917qlsx5xb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6ba3e128a7fe4476d82266506b18ba9984c37944/recipes/omni-scratch";
@@ -24940,8 +25641,8 @@
src = fetchFromGitHub {
owner = "OmniSharp";
repo = "omnisharp-emacs";
- rev = "a9a66b047606c6b5dc48abdb0eb70a1f9dcd08f2";
- sha256 = "0m1f62cr0h426g66c7r36v3yr2bdakkjwxzdvpd0gh81xazn8yjz";
+ rev = "ad4a19c60f7dc3d52a5b11febdcc9b78930a1e7d";
+ sha256 = "0jc2ap9l0cc636kssld1bqalbriib57sw1rzz45s8r19jqa8w5gm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp";
@@ -25136,12 +25837,12 @@
org-autolist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-autolist";
- version = "0.13";
+ version = "0.14";
src = fetchFromGitHub {
owner = "calvinwyoung";
repo = "org-autolist";
- rev = "da332fadcd9be4c5eb21c5e98c392b89743750b2";
- sha256 = "0j6fqgzvbmvvdh0dgwsxq004wxys2zwnq9wa3idm087ynp2a2ani";
+ rev = "c82d1e83e982b5f0c106b8800e5b0cfd5f73fdc1";
+ sha256 = "0ykiafbdjb2iy0s1gr6l51gddjbk08iwj4v13hgm8b675bl0cw56";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ca8e2cdb282674b20881bf6b4fc49af42a5d09a7/recipes/org-autolist";
@@ -25262,12 +25963,12 @@
org-category-capture = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "org-category-capture";
- version = "1.0.0";
+ version = "1.1.0";
src = fetchFromGitHub {
owner = "IvanMalison";
repo = "org-projectile";
- rev = "d72c56458bd3b0535fc97dccaa23bd85dead099f";
- sha256 = "0rn33pily979l7cmyr8az30kkv8yqdzvk3xwxjw4vivcbzrzd4j7";
+ rev = "48f621b595e748c5e03431f237facf258ffc9443";
+ sha256 = "00n2msmwcjjiibrhrvpawzgz6qcjjfy9qnii1iaass0038g4bd89";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6760daac1ef9d9d7ba07e2fc9668873020f901f1/recipes/org-category-capture";
@@ -25280,6 +25981,27 @@
license = lib.licenses.free;
};
}) {};
+ org-clock-csv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }:
+ melpaBuild {
+ pname = "org-clock-csv";
+ version = "1.1";
+ src = fetchFromGitHub {
+ owner = "atheriel";
+ repo = "org-clock-csv";
+ rev = "20ab6ee4395bedc0a7b8dfaf7b51f2c63dc8d2c6";
+ sha256 = "00lcvmls7zlkqmsi0yfiihyxv49803jlc9khcbqawxlkijvr65pm";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e023cb898699f76f6c3d9ffe8162aacfc6a8c34f/recipes/org-clock-csv";
+ sha256 = "02spjrzdf1kmvyvqkzg7nnmq9kqv75zwxn5ifqmg0f7a1gw28f0l";
+ name = "org-clock-csv";
+ };
+ packageRequires = [ org s ];
+ meta = {
+ homepage = "https://melpa.org/#/org-clock-csv";
+ license = lib.licenses.free;
+ };
+ }) {};
org-commentary = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "org-commentary";
@@ -25343,22 +26065,22 @@
license = lib.licenses.free;
};
}) {};
- org-edit-latex = callPackage ({ auctex, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+ org-edit-latex = callPackage ({ auctex, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-edit-latex";
- version = "0.8.0";
+ version = "0.8.3";
src = fetchFromGitHub {
owner = "et2010";
repo = "org-edit-latex";
- rev = "323d0b39d0284cef730b706dce7c0e58ed35530f";
- sha256 = "0zcllyhx9n9vcr5w87h0hfz25v52lvh5fi717cb7mf3jh89zh842";
+ rev = "39cbc9a99acb030f537c7269ab93958187321871";
+ sha256 = "1w0lyz71dq8x28ira4hig1b70bqn1dr53w3k5dgch9szcf6xa86y";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-edit-latex";
sha256 = "0nkiz4682qgk5dy4if3gij98738482ys8zwm8yx834za38xxbwry";
name = "org-edit-latex";
};
- packageRequires = [ auctex emacs org ];
+ packageRequires = [ auctex emacs ];
meta = {
homepage = "https://melpa.org/#/org-edit-latex";
license = lib.licenses.free;
@@ -25472,12 +26194,12 @@
org-journal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-journal";
- version = "1.12.1";
+ version = "1.12.2";
src = fetchFromGitHub {
owner = "bastibe";
repo = "org-journal";
- rev = "d9b5512994c54ebcbc0dcccbf1c779fbb8a89d3d";
- sha256 = "0s1b6lgr841iifznbwqn8r0chbfd0vph5v8n6cc0grak8n6nqgxr";
+ rev = "cda1980b013afabd299e7a2294517897f6442d98";
+ sha256 = "1y6idbp74vrr3g0r10n09znky8ih94kzf5fyil47sjkqyzzmpk3s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/org-journal";
@@ -25532,35 +26254,15 @@
license = lib.licenses.free;
};
}) {};
- org-mac-iCal = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "org-mac-iCal";
- version = "7.9.3.5";
- src = fetchgit {
- url = "git://orgmode.org/org-mode.git";
- rev = "592dc2ee7e4c80b9b61efb77117c8dc22d6cefd1";
- sha256 = "0rvsn085r1sgvv0gwvjlfgn7371bjd254hdzamc97m122pqr7cxr";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal";
- sha256 = "1ilzvmw1x5incagp1vf8d9v9mz0krlv7bpv428gg3gpqzpm6kksw";
- name = "org-mac-iCal";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/org-mac-iCal";
- license = lib.licenses.free;
- };
- }) {};
org-mime = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-mime";
- version = "0.0.7";
+ version = "0.0.9";
src = fetchFromGitHub {
owner = "org-mime";
repo = "org-mime";
- rev = "dd1b9881af705b9e78f79791c9f933cabe59c125";
- sha256 = "0ndyqz2hpvnx6kykjz4d8nmngdjfavlwchl2dasi6m98b585liqa";
+ rev = "62791db188fa6a9a6b4e53c5c29fb4fa46582b98";
+ sha256 = "1l1fyyyyyi8nj4vpkyhpvz1yyqa2vn7042kp9443kqcswdfc9660";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/521678fa13884dae69c2b4b7a2af718b2eea4b28/recipes/org-mime";
@@ -25573,6 +26275,27 @@
license = lib.licenses.free;
};
}) {};
+ org-mru-clock = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "org-mru-clock";
+ version = "0.1.2";
+ src = fetchFromGitHub {
+ owner = "unhammer";
+ repo = "org-mru-clock";
+ rev = "10f6a7021c82dc6795f4020e89889a5a72eb8832";
+ sha256 = "00f4l5w6p0l1x5ghpvbp5934m9m012fabvzb7apazwdr5c7xbd7q";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/b36bf1c1faa4d7e38254416a293e56af96214136/recipes/org-mru-clock";
+ sha256 = "1arww5x6vdyyn1bwxry91w88phbr9l6nk8xxrw40iqmmbhggahgm";
+ name = "org-mru-clock";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/org-mru-clock";
+ license = lib.licenses.free;
+ };
+ }) {};
org-multiple-keymap = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "org-multiple-keymap";
@@ -25701,12 +26424,12 @@
org-projectile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org-category-capture, projectile, s }:
melpaBuild {
pname = "org-projectile";
- version = "1.0.0";
+ version = "1.1.0";
src = fetchFromGitHub {
owner = "IvanMalison";
repo = "org-projectile";
- rev = "d72c56458bd3b0535fc97dccaa23bd85dead099f";
- sha256 = "0rn33pily979l7cmyr8az30kkv8yqdzvk3xwxjw4vivcbzrzd4j7";
+ rev = "48f621b595e748c5e03431f237facf258ffc9443";
+ sha256 = "00n2msmwcjjiibrhrvpawzgz6qcjjfy9qnii1iaass0038g4bd89";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9d7a7ab98f364d3d5e93f83f0cb3d80a95f28689/recipes/org-projectile";
@@ -25722,12 +26445,12 @@
org-projectile-helm = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, org-projectile }:
melpaBuild {
pname = "org-projectile-helm";
- version = "1.0.0";
+ version = "1.1.0";
src = fetchFromGitHub {
owner = "IvanMalison";
repo = "org-projectile";
- rev = "d72c56458bd3b0535fc97dccaa23bd85dead099f";
- sha256 = "0rn33pily979l7cmyr8az30kkv8yqdzvk3xwxjw4vivcbzrzd4j7";
+ rev = "48f621b595e748c5e03431f237facf258ffc9443";
+ sha256 = "00n2msmwcjjiibrhrvpawzgz6qcjjfy9qnii1iaass0038g4bd89";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6760daac1ef9d9d7ba07e2fc9668873020f901f1/recipes/org-projectile-helm";
@@ -25943,12 +26666,12 @@
org-tfl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "org-tfl";
- version = "0.3.4";
+ version = "0.4.0";
src = fetchFromGitHub {
owner = "storax";
repo = "org-tfl";
- rev = "f0405e3ad62b90ea43489bdd6312adbd77edb9f3";
- sha256 = "0cznw60ivaz42ass35sf9i62x7mf9in6z8kr8wc5i1mb7hafy2hk";
+ rev = "f0d7d39106a1de5457f5160cddd98ab892b61066";
+ sha256 = "1rwdibiq0w4nzccmvdkpwnmfga70y35lfg2xlkqxd02x7bfl7j3m";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d9e97f2fee577c7e3fb42e4ca9d4f422c8907faf/recipes/org-tfl";
@@ -26111,12 +26834,12 @@
org-vcard = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-vcard";
- version = "0.1.0";
+ version = "0.2.0";
src = fetchFromGitHub {
owner = "flexibeast";
repo = "org-vcard";
- rev = "5c4e17c166fb0406d5dfdc8876b0e182ba7af8fd";
- sha256 = "1qf4pqsg12y1qx7di0y5dp0f4slyp69h2q6y21hldzknhwxx4yy4";
+ rev = "a6ab82ab28fa78f7c985d3ea9c9fafdd17f7ea8b";
+ sha256 = "14l3xqahqmnfl3sskqcr33xpcsic8dm9cr9wmbv5la3xv14n10k7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/df860814a09c376c9a6a2c5e7f528bbae29810b2/recipes/org-vcard";
@@ -26171,6 +26894,36 @@
license = lib.licenses.free;
};
}) {};
+ org2web = callPackage ({ cl-lib ? null, dash, el2org, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }:
+ melpaBuild {
+ pname = "org2web";
+ version = "0.9.1";
+ src = fetchFromGitHub {
+ owner = "tumashu";
+ repo = "org2web";
+ rev = "5243b399927a4c474bb3b8d1c8a00799df1f27d7";
+ sha256 = "0wsvfn409a2ivbich8b8zqza78sprirg4bl7igx536ydqclmi0n7";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/2864959163442165b9b1cd5471dc2649508decde/recipes/org2web";
+ sha256 = "0lcqf0pgkd7jilasw1485fy45k269jxvyl7hl7qrcs94s6fy2vaf";
+ name = "org2web";
+ };
+ packageRequires = [
+ cl-lib
+ dash
+ el2org
+ ht
+ htmlize
+ mustache
+ org
+ simple-httpd
+ ];
+ meta = {
+ homepage = "https://melpa.org/#/org2web";
+ license = lib.licenses.free;
+ };
+ }) {};
orgbox = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "orgbox";
@@ -26195,12 +26948,12 @@
orgit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, org }:
melpaBuild {
pname = "orgit";
- version = "1.4.0";
+ version = "1.4.1";
src = fetchFromGitHub {
owner = "magit";
repo = "orgit";
- rev = "c91e662ace7e3ce992269cbf755f378bc6742511";
- sha256 = "0x7d8wjfg61gzi6ghq4cfkizzjcpiz56j797h6kmbri73yb7xf16";
+ rev = "022687eb02f0bf0d0151d0ad917b165bfef2d663";
+ sha256 = "1cddyns82a06ydbw8rhxzghkjav5vxmmc671pdnai50mql3cx9kf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/73b5f7c44c90540e4cbdc003d9881f0ac22cc7bc/recipes/orgit";
@@ -26510,12 +27263,12 @@
ox-epub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "ox-epub";
- version = "0.2.1";
+ version = "0.2.4";
src = fetchFromGitHub {
owner = "ofosos";
repo = "ox-epub";
- rev = "113300ed2c66cca10624e6d7bf5ff0a72e05653a";
- sha256 = "1xj643jybrd6idn6bazp0canj8pm9v3gs199fa17hlag7151ancw";
+ rev = "4b4585264a28152f2eda0f7e5ceed132f9d23e16";
+ sha256 = "1k3lv4qqkp87piwlwl3gahac1zpjzv397f65g4khbpby2kgg8dpi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c3ac31dfef00e83fa6b716ea006f35afb5dc6cd5/recipes/ox-epub";
@@ -26528,6 +27281,48 @@
license = lib.licenses.free;
};
}) {};
+ ox-gfm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "ox-gfm";
+ version = "1.0";
+ src = fetchFromGitHub {
+ owner = "larstvei";
+ repo = "ox-gfm";
+ rev = "99f93011b069e02b37c9660b8fcb45dab086a07f";
+ sha256 = "0drdypmgxk3238hmkqw9s3cw9wv94cyfqar5ar0bv0k69s92pxj8";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/10e90430f29ce213fe57c507f06371ea0b29b66b/recipes/ox-gfm";
+ sha256 = "065ngmzfd3g2h8n903hc4d363hz4z5rrdgizh2xpz03kf3plca6q";
+ name = "ox-gfm";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/ox-gfm";
+ license = lib.licenses.free;
+ };
+ }) {};
+ ox-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+ melpaBuild {
+ pname = "ox-hugo";
+ version = "0.4.1";
+ src = fetchFromGitHub {
+ owner = "kaushalmodi";
+ repo = "ox-hugo";
+ rev = "c32359c71e7926c7f13039069d8d7481dfb9bc82";
+ sha256 = "1nw2dp6rn3hnnzzffvpr6yz7c154338h9i5ixxgh5vjxm9phzdml";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/1e1240bb7b5bb8773f804b987901566a20e3e8a9/recipes/ox-hugo";
+ sha256 = "1niarxj2y4a14lrv2nqcc36msw7k61h8fbjpcdrfbaw3n0kchd40";
+ name = "ox-hugo";
+ };
+ packageRequires = [ emacs org ];
+ meta = {
+ homepage = "https://melpa.org/#/ox-hugo";
+ license = lib.licenses.free;
+ };
+ }) {};
ox-ioslide = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "ox-ioslide";
@@ -26560,7 +27355,7 @@
sha256 = "0h49pfl97vl796sm7r62rpv3slj0z5krm4zrqkgz0q6zlyrjay29";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/92f89a923d877c9dea9349a5c594209cb716bf18/recipes/ox-pandoc";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/ca17de8cdd53bb32a9d3faaeb38f19f92b18ee38/recipes/ox-pandoc";
sha256 = "0wy6yvwd4vyq6xalkrshnfjjxlh1p24y52z49894nz5fl63b74xc";
name = "ox-pandoc";
};
@@ -26615,12 +27410,12 @@
package-build = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "package-build";
- version = "1.0";
+ version = "1.1";
src = fetchFromGitHub {
owner = "melpa";
repo = "package-build";
- rev = "d70db33776cd52586e05e932915653ec54f41c9c";
- sha256 = "1hfbmh4gzgxdmv421bnpj8486fja7015sj7jrnp8bhvcxxxc3azd";
+ rev = "940c991ccd0dab53bd7c120601b3db35669c5e73";
+ sha256 = "18yr4qq3jyf9zhlwqrbfq616svsgn5spnj0s4gsni7kb2ijjh2bp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/948fb86b710aafe6bc71f95554655dfdfcab0cca/recipes/package-build";
@@ -26717,22 +27512,22 @@
license = lib.licenses.free;
};
}) {};
- packed = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ packed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "packed";
- version = "2.0.1";
+ version = "2.0.2";
src = fetchFromGitHub {
owner = "emacscollective";
repo = "packed";
- rev = "536f4a3bda06cc09759fed1aa0cdebb068ff75a1";
- sha256 = "1ayizqkhxjd3rv3chnl51sl12gsfhxcqqnz0p6r0xbwglx4n3vzi";
+ rev = "94ea12b9d44bfa42c28d0548199f2fcd19e4aa6a";
+ sha256 = "1n80y5pqaibix71fnw3cxmq66frmqfji2b2y170jszmrxi03kwxm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/packed";
sha256 = "103z6fas2fkvlhvwbv1rl6jcij5pfsv5vlqqsb4dkq1b0s7k11jd";
name = "packed";
};
- packageRequires = [ dash emacs ];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/packed";
license = lib.licenses.free;
@@ -26843,36 +27638,15 @@
license = lib.licenses.free;
};
}) {};
- paper-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, hexrgb, lib, melpaBuild }:
- melpaBuild {
- pname = "paper-theme";
- version = "1.0.0";
- src = fetchFromGitHub {
- owner = "cadadr";
- repo = "paper-theme";
- rev = "15af5e31492f79dc0d47787150ef39d6318a2608";
- sha256 = "1xh614czldjvfl66vhkyaai5k4qsg1l3mz6wd5b1w6kd45qrc54i";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a35a0888a7a27174b5de58d99b01554769041f46/recipes/paper-theme";
- sha256 = "04diqm2c9fm29zyms3hplkzb4kb7b2kyrxdsy0jxyjj5kabypd50";
- name = "paper-theme";
- };
- packageRequires = [ emacs hexrgb ];
- meta = {
- homepage = "https://melpa.org/#/paper-theme";
- license = lib.licenses.free;
- };
- }) {};
paradox = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, let-alist, lib, melpaBuild, seq, spinner }:
melpaBuild {
pname = "paradox";
- version = "2.5.1";
+ version = "2.5.2";
src = fetchFromGitHub {
owner = "Malabarba";
repo = "paradox";
- rev = "17a6690d42a1e854ec270ed930c7494077570fc8";
- sha256 = "1vg5i4cxgn4a8cgx43i75w3cf0d8sb6ig6xxxdj3pvpzc81i53bc";
+ rev = "dfdfbec8b4a3b71966c134f00c3f5edfa87b6245";
+ sha256 = "1l0rs49lbclq4ayhnx6vi6bxn37a0h2ylk73fjcbar2lbr1dhf9r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/paradox";
@@ -27093,18 +27867,19 @@
license = lib.licenses.free;
};
}) {};
- password-store = callPackage ({ f, fetchgit, fetchurl, lib, melpaBuild, s }:
+ password-store = callPackage ({ f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "password-store";
version = "1.7.1";
- src = fetchgit {
- url = "https://git.zx2c4.com/password-store";
+ src = fetchFromGitHub {
+ owner = "zx2c4";
+ repo = "password-store";
rev = "38ec1c72e29c872ec0cdde82f75490640d4019bf";
sha256 = "04rqph353qfhnrwji6fmvrbk4yag8brqpbpaysq5z0c9l4p9ci87";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/ceff76206bd44d92c00adc931236c4ae15db5583/recipes/password-store";
- sha256 = "06l4xlvrjswy5kndn6h6swliqcp007nh4fyvma3jaac4f3x2qi65";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/207f8ec84572176749d328cb2bbc4e87c36f202c/recipes/password-store";
+ sha256 = "03r8j14l12yc42b51fzvn1jh8j85nyl1rg6c80r0a7ihwkj27jv6";
name = "password-store";
};
packageRequires = [ f s ];
@@ -27113,6 +27888,27 @@
license = lib.licenses.free;
};
}) {};
+ password-store-otp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, s }:
+ melpaBuild {
+ pname = "password-store-otp";
+ version = "0.1.5";
+ src = fetchFromGitHub {
+ owner = "volrath";
+ repo = "password-store-otp.el";
+ rev = "a39a64a91de36e87b852339635bd3c5fb0e32441";
+ sha256 = "0gb48blvnn6ci2wl45z81p41ny7vbgl610hqy6b2hyr2171qjd60";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/fc89d02554a6ff150ad42634879073892f3e88be/recipes/password-store-otp";
+ sha256 = "0m3n4gjf6hmcs2kg80h1whzbl74zsj79ihliyqfcdfc4v31m32sg";
+ name = "password-store-otp";
+ };
+ packageRequires = [ emacs password-store s ];
+ meta = {
+ homepage = "https://melpa.org/#/password-store-otp";
+ license = lib.licenses.free;
+ };
+ }) {};
pastehub = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "pastehub";
@@ -27305,12 +28101,12 @@
pdf-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, tablist }:
melpaBuild {
pname = "pdf-tools";
- version = "0.70";
+ version = "0.80";
src = fetchFromGitHub {
owner = "politza";
repo = "pdf-tools";
- rev = "0107f80dcf268d08ac075b01729820062c0fbd67";
- sha256 = "19sy49r3ijh36m7hl4vspw5c4i8pnfqdn4ldm2sqchxigkw56ayl";
+ rev = "920e598c1ec6eb9a48dde32282d10adc9cc3b011";
+ sha256 = "1i4647vax5na73basc5dz4lh9kprir00fh8ps4i0l1y3ippnjs2s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8e3d53913f4e8a618e125fa9c1efb3787fbf002d/recipes/pdf-tools";
@@ -27426,6 +28222,27 @@
license = lib.licenses.free;
};
}) {};
+ persp-fr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, persp-mode }:
+ melpaBuild {
+ pname = "persp-fr";
+ version = "0.0.3";
+ src = fetchFromGitHub {
+ owner = "rocher";
+ repo = "persp-fr";
+ rev = "4d2d1a75019f520742da79f1aeed9c4a960677e0";
+ sha256 = "1waakbmxwm0xdnl0iznyk61ccwdjvwv5g1naml31r7q0cnk0jfz8";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/8e09213dddf003a1275eafb767431a507ecf7639/recipes/persp-fr";
+ sha256 = "0p4379yr1b32l8ghq1axyb8qhp28gnq5qxxvbk3mdzgbwwj8y4b2";
+ name = "persp-fr";
+ };
+ packageRequires = [ emacs persp-mode ];
+ meta = {
+ homepage = "https://melpa.org/#/persp-fr";
+ license = lib.licenses.free;
+ };
+ }) {};
persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "persp-mode";
@@ -27513,12 +28330,12 @@
pfuture = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "pfuture";
- version = "1.1";
+ version = "1.2";
src = fetchFromGitHub {
owner = "Alexander-Miller";
repo = "pfuture";
- rev = "a6c32c69abdb9b91baf8036b88cc4f477f611bd5";
- sha256 = "0ly38dzg754n4s2xs09kaisxs14ikm42d9sjhw9p9xirzqm7zd5j";
+ rev = "8b5cd8dfb8769d2b24484a313d3d21938afd3dfb";
+ sha256 = "1d63sfwy7qmldhq2xda9dglg91cy2kpjdr2rlmqb48w95wf0am3m";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5fb70c9f56a58b5c7a2e8b69b191aa2fc7c9bcc8/recipes/pfuture";
@@ -27555,16 +28372,16 @@
phan = callPackage ({ composer, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "phan";
- version = "0.0.2";
+ version = "0.0.3";
src = fetchFromGitHub {
- owner = "zonuexe";
+ owner = "emacs-php";
repo = "phan.el";
- rev = "4e3528f490e77d3aa6d81729b30b569434ef679f";
- sha256 = "1aif1hshwpzi353k2gcpwk9s76jlmz3s5dyf357qfv14b5ddhw6l";
+ rev = "17b44a62580272bcf5ee91fb58098292e9de6f83";
+ sha256 = "002qak8jlim6pjj3ckikzzcc6n40mcqd5qvzakazi1q01z1ffsnd";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/d591d9ba70b1e32f25204ad9409aad78fd68a93c/recipes/phan";
- sha256 = "16r1d2bgbb2y7l141sw7nzhx0s50gzwq5ang00y7f4sfldqvshzf";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/phan";
+ sha256 = "17ar6nxy0plx5li49kgf4f0h99wwmnnp5kwmpf34jg9ygyhaglvb";
name = "phan";
};
packageRequires = [ composer emacs f ];
@@ -27888,22 +28705,22 @@
license = lib.licenses.free;
};
}) {};
- plantuml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ plantuml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "plantuml-mode";
- version = "1.2.3";
+ version = "1.2.5";
src = fetchFromGitHub {
owner = "skuro";
repo = "plantuml-mode";
- rev = "eb380bac5663ec8e73482db6c6ba9d1394766eb3";
- sha256 = "19zxwmn5mjbzqgk7l444h57ninrlhi22l85l9zphryx2992plf0k";
+ rev = "5a2e8d0dd2ba9286fc3c82d8689d25050290f68d";
+ sha256 = "1gcv5gmps371wd2sjbq4g5p2yj2ip8lpn81lypwb5xavqa7gjhlv";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a658eb8085f2bf413c276af19c77597132cf569b/recipes/plantuml-mode";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/38e74bb9923044323f34473a5b13867fe39bed25/recipes/plantuml-mode";
sha256 = "03srbg34512vxcqn95q4r7h2aqbqq0sd5c9ffnbx2a75vsblqc6h";
name = "plantuml-mode";
};
- packageRequires = [ emacs ];
+ packageRequires = [];
meta = {
homepage = "https://melpa.org/#/plantuml-mode";
license = lib.licenses.free;
@@ -28054,6 +28871,36 @@
license = lib.licenses.free;
};
}) {};
+ pocket-reader = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, kv, lib, melpaBuild, org-web-tools, ov, pocket-lib, rainbow-identifiers, s }:
+ melpaBuild {
+ pname = "pocket-reader";
+ version = "0.1.1";
+ src = fetchFromGitHub {
+ owner = "alphapapa";
+ repo = "pocket-reader.el";
+ rev = "e65a7e7529ece4fb7a738c062e73d5c07ace9574";
+ sha256 = "0bqxsvhmwvf0gpjmmh7pmzyw4lpcarj2prm52bgncch8x1f0gvnp";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/835a7bf2f72987183e9d15ada7ae747fb5715c11/recipes/pocket-reader";
+ sha256 = "0gcgmz4mhjgvqbh2gmv8v09sy80cnfccjym455m0fbl31b8dczhf";
+ name = "pocket-reader";
+ };
+ packageRequires = [
+ dash
+ emacs
+ kv
+ org-web-tools
+ ov
+ pocket-lib
+ rainbow-identifiers
+ s
+ ];
+ meta = {
+ homepage = "https://melpa.org/#/pocket-reader";
+ license = lib.licenses.free;
+ };
+ }) {};
point-pos = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "point-pos";
@@ -28539,12 +29386,12 @@
projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }:
melpaBuild {
pname = "projectile-rails";
- version = "0.15.0";
+ version = "0.16.0";
src = fetchFromGitHub {
owner = "asok";
repo = "projectile-rails";
- rev = "19e3dc1236377de86147df8f3635fbbfe7558b2e";
- sha256 = "0n61npfg7hvybakn4nvsqyv2gmrwvf0jqwrh0nwzg9xg5hkbfmir";
+ rev = "31c9f90d472e07cb8e49fa8992b187b67c9c9a71";
+ sha256 = "0j38zbprkga3iq5wb77zvfa5r3sj3sqv8qh0ab62wm68qy60d6g3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails";
@@ -28599,19 +29446,40 @@
license = lib.licenses.free;
};
}) {};
+ projectile-trailblazer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }:
+ melpaBuild {
+ pname = "projectile-trailblazer";
+ version = "0.2.0";
+ src = fetchFromGitHub {
+ owner = "micdahl";
+ repo = "projectile-trailblazer";
+ rev = "79299498d74876f2ac3fe8075716b39a5bdd04cd";
+ sha256 = "1lkj9jdr3g7nl80fxvic6g5cn7vbkyxys7m3kcmd6xa9mq7nvci4";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/f9c6f2f92ff99e7a3241003dc396f978f3916c8a/recipes/projectile-trailblazer";
+ sha256 = "18cijb5c1ym5kn2g2apbijbfd3aqhrraki8vv9bk8rvi7wmm6qj4";
+ name = "projectile-trailblazer";
+ };
+ packageRequires = [ emacs f inf-ruby inflections projectile rake ];
+ meta = {
+ homepage = "https://melpa.org/#/projectile-trailblazer";
+ license = lib.licenses.free;
+ };
+ }) {};
projectile-variable = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "projectile-variable";
version = "0.0.2";
src = fetchFromGitHub {
- owner = "zonuexe";
+ owner = "emacs-php";
repo = "projectile-variable";
rev = "8d348ac70bdd6dc320c13a12941b32b38140e264";
sha256 = "0l38nldx6lwjb7mxixykiyj10xwb35249dxfg0k2wkmb2vy1fkxs";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/ff603b43235f546cd47f72e675aee88d5f41e855/recipes/projectile-variable";
- sha256 = "1cj8nwxf1jp5q5zzxp92fxla6jhwzd21gw649ar6mygi4hgymsji";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/projectile-variable";
+ sha256 = "15qc5n91nxyfvb100iyihfmrdr57qgw6098yv3nfqgw3zx1qchdw";
name = "projectile-variable";
};
packageRequires = [ cl-lib emacs ];
@@ -28686,12 +29554,12 @@
protobuf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "protobuf-mode";
- version = "3.4.0pre3";
+ version = "3.4.1";
src = fetchFromGitHub {
owner = "google";
repo = "protobuf";
- rev = "eaeca0d42b1fc4a8023a7f90d889631eda9360a3";
- sha256 = "02c360xhmnhcybl23fa0p7l3x3zn4mil1c7cnpilnv0bqxy5399n";
+ rev = "b04e5cba356212e4e8c66c61bbe0c3a20537c5b9";
+ sha256 = "1lzxmbqlnmi34kymnf399azv86gmdbrf71xiad6wc24bzpkzqybb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -28730,14 +29598,14 @@
pname = "psci";
version = "0.0.6";
src = fetchFromGitHub {
- owner = "ardumont";
+ owner = "purescript-emacs";
repo = "emacs-psci";
rev = "8c2d5a0ba604ec593f83f632b2830a87f41f84d4";
sha256 = "0wgxrwl7dpy084sc76wiwpixycb171g7xwc66m5gnlrv79qyac73";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a0f45269895b8e061c972da46f932c96eb0f5279/recipes/psci";
- sha256 = "0sgrz8byz2pcsad2pydinp4hh2xb48pdb03r93wg2vvyy8p15j9g";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/3451719ce5096383db082917716a5ed8346fc186/recipes/psci";
+ sha256 = "1iwkr58b910vrwwxyk00psy74vp201vmm3b0cm4k5fh3glr31vp9";
name = "psci";
};
packageRequires = [ dash deferred f purescript-mode s ];
@@ -28772,14 +29640,14 @@
pname = "psysh";
version = "0.0.4";
src = fetchFromGitHub {
- owner = "zonuexe";
+ owner = "emacs-php";
repo = "psysh.el";
rev = "f72d6fe41af2d9566d41b167cda66e97efdf8cfa";
sha256 = "0hr8nlxcqfas9wl5ahz9hmvpa8b6k35n4f7iv9dx6zwf5q48q7y7";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/4b3131d9a0ad359f15bc3550868a12f02476449a/recipes/psysh";
- sha256 = "0ygnfmfx1ifppg6j3vfz10srbcpr5ird2bhw6pvydijxkyd75vy5";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/psysh";
+ sha256 = "00rzfw8nlbcmfbjnzbfl08136dhgvrrn9g1s9l623xgpbcay63sg";
name = "psysh";
};
packageRequires = [ emacs f s ];
@@ -28809,22 +29677,22 @@
license = lib.licenses.free;
};
}) {};
- pug-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ pug-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "pug-mode";
- version = "1.0.4";
+ version = "1.0.7";
src = fetchFromGitHub {
owner = "hlissner";
repo = "emacs-pug-mode";
- rev = "bff32a818ccc9e400210b942bd5e67fa21551148";
- sha256 = "1ad5n8v40acj17qficbzrnixbmg5wplmbd8h1z9hdxhbrkwy5323";
+ rev = "96718f802dad3acd5a3f770b1452b81e39f77d92";
+ sha256 = "1jqj3qfc4686v09am869ls1k3jwy397646cql4a8dg7crjdpf023";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b3710aac9f3df3a23238af1f969c462b3692f260/recipes/pug-mode";
sha256 = "1njhr95y2rx7inpl9phxxz580844p2iadqlga1kj7xzvjz698x85";
name = "pug-mode";
};
- packageRequires = [ cl-lib ];
+ packageRequires = [ cl-lib emacs ];
meta = {
homepage = "https://melpa.org/#/pug-mode";
license = lib.licenses.free;
@@ -29064,12 +29932,12 @@
pyim = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, pyim-basedict }:
melpaBuild {
pname = "pyim";
- version = "1.6.1";
+ version = "1.6.4";
src = fetchFromGitHub {
owner = "tumashu";
repo = "pyim";
- rev = "f4dacfbac11d6d58f1fcbf766691e03b6983a9f6";
- sha256 = "0dy0y159fqcip805l86gmjbsgbcvj3hm5rfsc6slinmxsrl4nl9l";
+ rev = "d44db4cb74c1c0cf6f814ff14d0be8e733f8404a";
+ sha256 = "02b2aknx127xvl8amf74krvd7z33kyr049iw5h0665zkzsli4g8w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/pyim";
@@ -29085,7 +29953,7 @@
pyim-basedict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "pyim-basedict";
- version = "0.2";
+ version = "0.3.1";
src = fetchFromGitHub {
owner = "tumashu";
repo = "pyim-basedict";
@@ -29103,27 +29971,6 @@
license = lib.licenses.free;
};
}) {};
- pyim-greatdict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "pyim-greatdict";
- version = "0.2";
- src = fetchFromGitHub {
- owner = "tumashu";
- repo = "pyim-greatdict";
- rev = "45fa4ff26f3444fb98c4dea460d84b740204d105";
- sha256 = "1j89mcfsqyclmllfqmsx8a55ihrn2kzay8qh2lyfm8dzd6mi1za0";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/pyim-greatdict";
- sha256 = "1bbindnklmmxdskv9vmjxhvlxxmaccgqn70prblhpg6n11bxjhl9";
- name = "pyim-greatdict";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/pyim-greatdict";
- license = lib.licenses.free;
- };
- }) {};
pyim-wbdict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pyim }:
melpaBuild {
pname = "pyim-wbdict";
@@ -29376,6 +30223,27 @@
license = lib.licenses.free;
};
}) {};
+ quiz = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "quiz";
+ version = "1.4";
+ src = fetchFromGitHub {
+ owner = "davep";
+ repo = "quiz.el";
+ rev = "69629937eaf994a51dad39c26355e1a56b9dcb95";
+ sha256 = "06k1kv9ijg9gx8c5jid8ckbmjkviyzh59rygp9drbkpihwdwyfmj";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/23d547c0d69d8f5d1e9983e3669a63dffaede2b3/recipes/quiz";
+ sha256 = "0pcjfhk109ifi834jw8lndwhpfcv764wym1dhiqhp5qd2vf431kg";
+ name = "quiz";
+ };
+ packageRequires = [ cl-lib emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/quiz";
+ license = lib.licenses.free;
+ };
+ }) {};
r-autoyas = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "r-autoyas";
@@ -29652,12 +30520,12 @@
rdf-prefix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rdf-prefix";
- version = "1.8";
+ version = "1.9";
src = fetchFromGitHub {
owner = "simenheg";
repo = "rdf-prefix";
- rev = "35129521d5b6035e5dd75d5b3481ce4971f46034";
- sha256 = "1iy9385n8a2b7ph4wdf8p92n81slirsxxckrc3khbk5zrpp62z5k";
+ rev = "25cc3c8902f16191496b549705b00ffc7dff51f1";
+ sha256 = "00ycsqzgn5rq8r4r86z1j43i2a7wj4r3c2vcggdaizyf4parmgmy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a5f083bd629697038ea6391c7a4eeedc909a5231/recipes/rdf-prefix";
@@ -29733,6 +30601,27 @@
license = lib.licenses.free;
};
}) {};
+ reason-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "reason-mode";
+ version = "0.3.0";
+ src = fetchFromGitHub {
+ owner = "reasonml-editor";
+ repo = "reason-mode";
+ rev = "6b53815a0405be1f364a082d22fe5c900409a01a";
+ sha256 = "1433bgakbfyf5d5vq69rwj4zg1h0xwjy9qsryvd9r1ssax2hzi7r";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/f9f1a18c13601f3a4fd7b1bbfe7d5da07746e492/recipes/reason-mode";
+ sha256 = "07sirgj8bs9yv7pbx1lahwslvjd2aadkzkz7lsyw6xflj5fxpggr";
+ name = "reason-mode";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/reason-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
rebecca-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rebecca-theme";
@@ -30006,6 +30895,27 @@
license = lib.licenses.free;
};
}) {};
+ replace-with-inflections = callPackage ({ fetchFromGitHub, fetchurl, inflections, lib, melpaBuild, string-inflection }:
+ melpaBuild {
+ pname = "replace-with-inflections";
+ version = "0.3.0";
+ src = fetchFromGitHub {
+ owner = "knu";
+ repo = "replace-with-inflections.el";
+ rev = "e0486653abf7c248024800132df23993cd617892";
+ sha256 = "1fygsr3vjpy0crxlyawwk6k21h1w3svgk79rm7fqg5xzilg6kf25";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/7892eb506b8f4260bde4be2805bf3b2d594ab640/recipes/replace-with-inflections";
+ sha256 = "1pqpin5ipm3g74zjh1kh6s1gh0aan6202p0y2q00d4ywbz9kn5s0";
+ name = "replace-with-inflections";
+ };
+ packageRequires = [ inflections string-inflection ];
+ meta = {
+ homepage = "https://melpa.org/#/replace-with-inflections";
+ license = lib.licenses.free;
+ };
+ }) {};
repo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "repo";
@@ -30216,22 +31126,22 @@
license = lib.licenses.free;
};
}) {};
- rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }:
+ rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "rg";
- version = "1.3.0";
+ version = "1.4.0";
src = fetchFromGitHub {
owner = "dajva";
repo = "rg.el";
- rev = "09a5919d8982cfdb8496f0db7deccfb510a7f000";
- sha256 = "1jvinpid3w4p6s4ni0fhg4g8xc3m0c7rd3db2al214xfcn4mbbgr";
+ rev = "5de611eae7787ecbc285fe7e31e412b9281a4e14";
+ sha256 = "18mhcipj5yywd5648pwm955wx3ipsnp9nwjyyl270qnn56hwkb6g";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg";
sha256 = "0i78qvqdznh1z3b0mnzihv07j8b9r86dc1lsa1qlzacv6a2i9sbm";
name = "rg";
};
- packageRequires = [ cl-lib emacs s seq ];
+ packageRequires = [ cl-lib emacs s ];
meta = {
homepage = "https://melpa.org/#/rg";
license = lib.licenses.free;
@@ -30261,12 +31171,12 @@
rich-minority = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rich-minority";
- version = "1.0.1";
+ version = "1.0.2";
src = fetchFromGitHub {
owner = "Malabarba";
repo = "rich-minority";
- rev = "311ac8ee54078f95b7279e532da6cf5a2afb4125";
- sha256 = "11hwf9y5ax207w6rwrsmi3pmn7pn7ap6iys0z8hni2f5zzxjrmx3";
+ rev = "3201f6e1769beb9f6cbbda392bef99fce337acf4";
+ sha256 = "1qa447k3qq2x1i2nxbm60wzr8kaysk3cifl09c13sv97n4yq3x2b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/rich-minority";
@@ -30345,12 +31255,12 @@
rjsx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
melpaBuild {
pname = "rjsx-mode";
- version = "0.2.0";
+ version = "0.3.0";
src = fetchFromGitHub {
owner = "felipeochoa";
repo = "rjsx-mode";
- rev = "4a24c86a1873289538134fe431e544fa3e12e788";
- sha256 = "0yv622nnbcjnnaki49f7cz8cvrg13d0h9higadp83bl1lczhgw8j";
+ rev = "79bedb1d188e209be5cfef3bea8906df9c509ab8";
+ sha256 = "1dh76r9hy1d1f9xhdywslgv0w3c9nhsbwvpd8icgp300x5c6a3zh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b83be7efdef2457e1320fe3dec46484fbd20263c/recipes/rjsx-mode";
@@ -30389,14 +31299,14 @@
pname = "robots-txt-mode";
version = "0.0.2";
src = fetchFromGitHub {
- owner = "zonuexe";
+ owner = "emacs-php";
repo = "robots-txt-mode";
rev = "edf1f8082c88cb2ff5a784ba00f92c535aaa1c7d";
sha256 = "11ig771ck610glb6f3322ka026ikq0b072rlq5z6ymr3rbxagn6j";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/1669c7a0d89ea36d61bfa57ef54ee1f203daff5f/recipes/robots-txt-mode";
- sha256 = "1q3fqaf9nysy9bhx4h9idgshxr65hfwnx05vlwazx7jd6bq6kxfh";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/robots-txt-mode";
+ sha256 = "00hxz4mygcxg7d8m2i4cm0bl82v3hw8wb4m8vv7g7fqkjp32c9qc";
name = "robots-txt-mode";
};
packageRequires = [];
@@ -30492,12 +31402,12 @@
rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rtags";
- version = "2.12";
+ version = "2.14";
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "db1244c1c14514324474f362c857112e89bbf0c6";
- sha256 = "1fcrlxk9z11vbarznfcpfyqzvj6v3ydbn5z6vbdmgf9cxb52kfma";
+ rev = "15ef9a8bab847773d6e247005be929422fc9c285";
+ sha256 = "0yq3c4ich0sffzd571drb7k4vs0bvblx6qcrb6zry75d9npggsyg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags";
@@ -30597,12 +31507,12 @@
ruby-hash-syntax = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ruby-hash-syntax";
- version = "0.4";
+ version = "0.5";
src = fetchFromGitHub {
owner = "purcell";
repo = "ruby-hash-syntax";
- rev = "a0362c2dc449a1e67ef75ad736bcf8b03b083226";
- sha256 = "01n9j7sag49m4bdl6065jklnxnc5kck51izg884s1is459qgy86k";
+ rev = "bc05c3130a5d3237f04c6064297e56de5f73887d";
+ sha256 = "1jwvyj3kqchd40h37m75ydl0gjrbm873dhfn1grqg4sgk60hr414";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c7d21a43a4bf267507bdc746ec9d0fd82049c0af/recipes/ruby-hash-syntax";
@@ -30786,12 +31696,12 @@
s = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "s";
- version = "1.11.0";
+ version = "1.12.0";
src = fetchFromGitHub {
owner = "magnars";
repo = "s.el";
- rev = "a56f0d0fedf9754e1728067ac868100f2499357d";
- sha256 = "08vf62fcrnbmf2ppb759kzznjdz8x72fqdwbc4n8nbswrwgm2ikl";
+ rev = "12f116d58ac03706496bd682c6449b452681874e";
+ sha256 = "1g8mqd13llj007al4nlxxx4z2lcsg3wk970mgjn0avwrhjjgdmmv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/s";
@@ -30951,22 +31861,22 @@
license = lib.licenses.free;
};
}) {};
- sbt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ sbt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sbt-mode";
- version = "0.2";
+ version = "0.3";
src = fetchFromGitHub {
owner = "ensime";
repo = "emacs-sbt-mode";
- rev = "217d56bc2ec93a77a9e644233f4fb1815e437c61";
- sha256 = "1lvf7y1n63p8jvnp6ppwmxq2s6h9sk45319576f3s28ixsfa6cp2";
+ rev = "bdf31a1ffe637d1445b149804d5f5cc29333a1bd";
+ sha256 = "0ygp0c2hy4zp5x0ghplxf2fhrf16cn37sk2zf6i43zqz6gydzq8a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/364abdc3829fc12e19f00b534565227dbc30baad/recipes/sbt-mode";
sha256 = "0v0n70czgkdijnw5jd4na41vlrmqcshvr8gdpv0bv55ilqhiihc8";
name = "sbt-mode";
};
- packageRequires = [];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/sbt-mode";
license = lib.licenses.free;
@@ -30975,7 +31885,7 @@
scala-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "scala-mode";
- version = "0.23";
+ version = "1.0.0";
src = fetchFromGitHub {
owner = "ensime";
repo = "emacs-scala-mode";
@@ -31079,11 +31989,11 @@
secretaria = callPackage ({ alert, emacs, f, fetchgit, fetchurl, lib, melpaBuild, org, s }:
melpaBuild {
pname = "secretaria";
- version = "0.2.5";
+ version = "0.2.7";
src = fetchgit {
url = "https://bitbucket.org/shackra/secretaria.el";
- rev = "7bd1cf591528b18a153e15a260d7817b72c900f2";
- sha256 = "0n9mj2g59yiqbg81rk0gglbgpvfs550r4y26n8nf5pyxpxfllv5s";
+ rev = "1cd32d957864be1ba5c44a3f505f662832169a28";
+ sha256 = "1xvwzmcfwfxsm9chbjnqjsipmv5pqpzk5d0ybw3rcdc47nag3jdg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7b4c9ccbf2eeaa290f3b9d1e5eaaeb5b5547b365/recipes/secretaria";
@@ -31159,27 +32069,6 @@
license = lib.licenses.free;
};
}) {};
- sentence-highlight = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "sentence-highlight";
- version = "0.1";
- src = fetchFromGitHub {
- owner = "sbelak";
- repo = "sentence-highlight";
- rev = "6f2bc989207ec8cf641e44924ef530a2e436eedb";
- sha256 = "0740swhm3kzjx58a6nr9992p05q4kzvyham8g7kds4ydd7xsd9am";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sentence-highlight";
- sha256 = "07pyyl74cvnz6dd85ghv3zdrir08317lvnzm5nf1n3p85aqjpcxm";
- name = "sentence-highlight";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/sentence-highlight";
- license = lib.licenses.free;
- };
- }) {};
servant = callPackage ({ ansi, commander, dash, epl, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up, web-server }:
melpaBuild {
pname = "servant";
@@ -31288,12 +32177,12 @@
sexy-monochrome-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sexy-monochrome-theme";
- version = "2.1";
+ version = "3.1";
src = fetchFromGitHub {
owner = "voloyev";
repo = "sexy-monochrome-theme";
- rev = "d74cf7a50852c469ad13c634df74be2fcb3f3a96";
- sha256 = "14va3sy94vpkn4fc9g7gsxk3anl25jvp9a92c8ppndqzfisy7vgg";
+ rev = "f64714a176d9212c9fa82355dd8ec89587ce13f0";
+ sha256 = "17ahrdyk2v7vz13b4934xn8xjza4b7bfrkq8n42frq3pc8mgwqfd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/dfd5ae9a93e036d11899c7adffdf6b63c2b21381/recipes/sexy-monochrome-theme";
@@ -31309,12 +32198,12 @@
shackle = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "shackle";
- version = "0.9.2";
+ version = "1.0.0";
src = fetchFromGitHub {
owner = "wasamasa";
repo = "shackle";
- rev = "979b021077655ca38749a60c9752c0817e8fd93e";
- sha256 = "11qp4gqxfi5d6krvxlqxfn58b1kcgsnldpi54r8lx6mis8l0f4wl";
+ rev = "55df581cdb3cfaf9ebf9c54d8849f8f5775cf74b";
+ sha256 = "1s59v6fnyzvgnbjcd1gpll4xp8316dqmdpi77382w0vjfcrsvbih";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/806e7d00f763f3fc4e3b8ebd483070ac6c5d0f21/recipes/shackle";
@@ -31603,12 +32492,12 @@
shr-tag-pre-highlight = callPackage ({ emacs, fetchFromGitHub, fetchurl, language-detection, lib, melpaBuild }:
melpaBuild {
pname = "shr-tag-pre-highlight";
- version = "1";
+ version = "2";
src = fetchFromGitHub {
owner = "xuchunyang";
repo = "shr-tag-pre-highlight.el";
- rev = "bc1bff471cf4adcd86d87b8c045623aff3b20889";
- sha256 = "1lyam12wilvv8ir3x0ylyfinjh9g65aq6ia1s314fr0gc8hjk5z6";
+ rev = "63eb0b2a4c1caf1004bac8e002ff8b7477871e36";
+ sha256 = "14b398k7rd0c2ymvg8wyq65fhggkm0camgvqr7j6ia2y0kairxba";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7be3c139bee02e8bd9a9830026cbfdd17629ac4d/recipes/shr-tag-pre-highlight";
@@ -31687,12 +32576,12 @@
shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "shx";
- version = "0.0.9";
+ version = "0.0.11";
src = fetchFromGitHub {
owner = "riscy";
repo = "shx-for-emacs";
- rev = "8166b02ebbab43d8a33d47b8221a94b69fc63487";
- sha256 = "0n97iys2xyg1lzkn8bqsx0sgqpzci1pxg69v42cpzmyrz3h54bwp";
+ rev = "dfeb23f99673479b17b5817aeb5641e7cc0e5a2d";
+ sha256 = "1zljrvanwn37jkc9jpqj8c11dfbqxjz9ivzbpqr0ipskw9gaay7k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx";
@@ -31981,12 +32870,12 @@
slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }:
melpaBuild {
pname = "slime";
- version = "2.19";
+ version = "2.20";
src = fetchFromGitHub {
owner = "slime";
repo = "slime";
- rev = "6e20d01e446334848ea31ace0ce041cec25647ab";
- sha256 = "1ywlbdk9ywfkv8z6pb69r29nh03krfdg676d086i8qjaas7ly2yp";
+ rev = "f223388c78ea51ce7717e9bbae14c50ad2386c2c";
+ sha256 = "07jks9fnqjv2i9sjfpgj7r3a7g5aha4aipsffjbnw1qd930ygw83";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime";
@@ -32041,27 +32930,6 @@
license = lib.licenses.free;
};
}) {};
- slime-ritz = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "slime-ritz";
- version = "0.6.0";
- src = fetchFromGitHub {
- owner = "pallet";
- repo = "ritz";
- rev = "1cc6faedae26323994ea8dd1a4f555db8acbf244";
- sha256 = "0lp584k35asqlvbhglv124jazdgp3h7pzl0akfwbdmby9zayqk96";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/669a4ae76deea86084307ac3c2d26072e4b8fe17/recipes/slime-ritz";
- sha256 = "1y1439y07l1a0sp9wn110hw4yyxj8n1cnd6h17rmsr549m2qbg1a";
- name = "slime-ritz";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/slime-ritz";
- license = lib.licenses.free;
- };
- }) {};
slime-volleyball = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "slime-volleyball";
@@ -32086,12 +32954,12 @@
slstats = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "slstats";
- version = "1.9";
+ version = "1.10";
src = fetchFromGitHub {
owner = "davep";
repo = "slstats.el";
- rev = "3c22a8e5cf022d4eca840fefe7960d7ae6dcf167";
- sha256 = "0ay7319ijqqcan1ijycrz4006r1a50wpnss37rrbiq23nkzjmks4";
+ rev = "e9696066abf3f2b7b818a57c062530dfd9377033";
+ sha256 = "1mjzr6lqcyx3clp3bxq77k2rpkaglnq407xdk05xkaqissirpc83";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fe7c8c241cc6920bbedb6711db63ea28ed633327/recipes/slstats";
@@ -32188,6 +33056,27 @@
license = lib.licenses.free;
};
}) {};
+ smart-semicolon = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "smart-semicolon";
+ version = "0.2.1";
+ src = fetchFromGitHub {
+ owner = "iquiw";
+ repo = "smart-semicolon";
+ rev = "c11096679dbed3875c37413337ee490ee7951b63";
+ sha256 = "1v6z3a1f6nxc62n7595qnji39ywdsz7xy5bkl2218v3y7gkbc518";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/fe339b95636b02ceb157294055d2f5f4c4b0b8cf/recipes/smart-semicolon";
+ sha256 = "1vq6l3vc615w0p640wy226z5i7dky666sgzczkngv07kag0iwqp0";
+ name = "smart-semicolon";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/smart-semicolon";
+ license = lib.licenses.free;
+ };
+ }) {};
smart-tabs-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "smart-tabs-mode";
@@ -32440,22 +33329,43 @@
license = lib.licenses.free;
};
}) {};
- snoopy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ snazzy-theme = callPackage ({ base16-theme, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "snazzy-theme";
+ version = "1.0";
+ src = fetchFromGitHub {
+ owner = "weijiangan";
+ repo = "emacs-snazzy";
+ rev = "578d7ebc4ed91c0a630b652c4b6fdd54d9ae16cd";
+ sha256 = "0gykymah4ap7zgjr7fkir21avcdhgy6n88nwxl1iynim3vkq441v";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/18c89a612418e0f49b7e6ae29a678d2fc1ffaf3d/recipes/snazzy-theme";
+ sha256 = "0srmhwhqrp1s01p1znhjzs254l3r2i6c91v7cnlwlvrls1sbh32k";
+ name = "snazzy-theme";
+ };
+ packageRequires = [ base16-theme emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/snazzy-theme";
+ license = lib.licenses.free;
+ };
+ }) {};
+ snoopy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "snoopy";
- version = "0.1.1";
+ version = "0.2.0";
src = fetchFromGitHub {
owner = "anmonteiro";
repo = "snoopy-mode";
- rev = "8d2b7b1354414f261b237f2fed0d472803ba3909";
- sha256 = "05q407dg6jppmqdxpp1ba8xs6yjilsa74hga46dbhcc9nzj9850a";
+ rev = "ec4123bdebfe0bb7bf4feaac2dc02b59caffe386";
+ sha256 = "01l44lshw0zvykay9886s1vqryanagkd4ciw3ramchn0baqz11vl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4a882cd92964ac195a09469006c9a44dc202f000/recipes/snoopy";
sha256 = "1wa8jykqyj6rxqfhwbiyli6yh8s7n0pqv7fc9sfaymarda93zbgi";
name = "snoopy";
};
- packageRequires = [ emacs ];
+ packageRequires = [ cl-lib emacs ];
meta = {
homepage = "https://melpa.org/#/snoopy";
license = lib.licenses.free;
@@ -32548,12 +33458,12 @@
sotclojure = callPackage ({ cider, clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sotlisp }:
melpaBuild {
pname = "sotclojure";
- version = "1.2";
+ version = "1.3.1";
src = fetchFromGitHub {
owner = "Malabarba";
repo = "speed-of-thought-clojure";
- rev = "8d879ef41c004726cca3c27a81b7543cc273c19b";
- sha256 = "13yn2yadkpmykaly3l3xsq1bhm4sxyk8k1px555y11qi0mfdcjhh";
+ rev = "ceac82aa691e8d98946471be6aaff9c9a4603c32";
+ sha256 = "1a6riq7ksk5m76dsgc75d8b992nyr50l48l8cpms9064m6b0r9jv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3a2ccef8af91eada4449d9cd4bda6bd28272722e/recipes/sotclojure";
@@ -32650,27 +33560,6 @@
license = lib.licenses.free;
};
}) {};
- sourcetalk = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
- melpaBuild {
- pname = "sourcetalk";
- version = "1.2.0";
- src = fetchFromGitHub {
- owner = "malroc";
- repo = "sourcetalk_emacs";
- rev = "aced89fa8776e6d5e42dad4a863e159959f08de6";
- sha256 = "0j4qm1y7rhb95k1zbl3c60a46l9rchzslzq36mayyw61s6yysjnv";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/e51aed64ffd0d2583c54035bd3e822f8adbaedde/recipes/sourcetalk";
- sha256 = "0qaf2q784xgl1s3m88jpwdzghpi4f3nybga3lnr1w7sb7b3yvj3z";
- name = "sourcetalk";
- };
- packageRequires = [ request ];
- meta = {
- homepage = "https://melpa.org/#/sourcetalk";
- license = lib.licenses.free;
- };
- }) {};
spaceline = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline, s }:
melpaBuild {
pname = "spaceline";
@@ -32695,12 +33584,12 @@
spaceline-all-the-icons = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize, spaceline }:
melpaBuild {
pname = "spaceline-all-the-icons";
- version = "1.3.5";
+ version = "1.4.0";
src = fetchFromGitHub {
owner = "domtronn";
repo = "spaceline-all-the-icons.el";
- rev = "255e89303bb706b42057504e72caeb2764f3d413";
- sha256 = "0y3gv664crng4vibbh0pfh9w0ys9m5gny2b1mrqb7ma6xa78xiv2";
+ rev = "7eafe2d7a81f8d10e03498bdcc3bec0ea50f905d";
+ sha256 = "186v71d8n1iy73drayyf57pyzlz973q74mazkyvb8w3fj8bb3llm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d039e057c1d441592da8f54e6d524b395b030375/recipes/spaceline-all-the-icons";
@@ -32737,12 +33626,12 @@
sparql-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sparql-mode";
- version = "2.1.0";
+ version = "3.0.0";
src = fetchFromGitHub {
owner = "ljos";
repo = "sparql-mode";
- rev = "25de49d5f587985d92c7fb56247d86fe06d53f0e";
- sha256 = "0y2z6n18xrfi9g2ar0xm825j39qwsydpndilk40gncwz0civd4fa";
+ rev = "e220a0c0c478fee0be3622442651981cdd82090c";
+ sha256 = "1k1ih6y9yq1fx13863yacx69v6f77b8xhkrx5i2dpm4h7wki1dg4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c3d729130a41903bb01465d0f01c34fbc508b56e/recipes/sparql-mode";
@@ -33031,12 +33920,12 @@
ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ssh-deploy";
- version = "1.2";
+ version = "1.3";
src = fetchFromGitHub {
owner = "cjohansson";
repo = "emacs-ssh-deploy";
- rev = "dbd8608551bc9e05280415b7b3937b1a151c7718";
- sha256 = "1045snp3xdfa9nf34b1f0w4ql8kjl5m2jl7imxj5n46g579g9dhr";
+ rev = "5cd1f8080fefb64e6eaa1098cc191db6abb97e23";
+ sha256 = "0pn9wf4svka3rxzy09jarjp3ycz2bvm39898qaikjf0dwaydlqlw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy";
@@ -33133,25 +34022,6 @@
license = lib.licenses.free;
};
}) {};
- stgit = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "stgit";
- version = "0.17.1";
- src = fetchgit {
- url = "git://repo.or.cz/stgit.git";
- rev = "48e5cef14cea5c810833d119900cd484c2a6ca85";
- sha256 = "0hgqxhqnc93pnh6j3hyi92hfx1cbdjylzqb2nl6ldsz1g2wdcw9r";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/4ed7cc025d22d8e1e63464e43f733c78421c91c7/recipes/stgit";
- sha256 = "102s9lllrcxsqs0lgbrcljwq1l3s8ri4276wck6rcypck5zgzj89";
- name = "stgit";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/stgit";
- license = lib.licenses.free;
- };
- }) {};
string-edit = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "string-edit";
@@ -33340,57 +34210,15 @@
license = lib.licenses.free;
};
}) {};
- subshell-proc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "subshell-proc";
- version = "0.1";
- src = fetchFromGitHub {
- owner = "andrewmains12";
- repo = "subshell-proc";
- rev = "bf475eb7b0684af967755e91c9cabd19f953b03b";
- sha256 = "0mx892vn4a32df30iqmf2vsz1gdl3i557fw0194g6a66n9w2q7xf";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/subshell-proc";
- sha256 = "1ma5i4ka48w46ksxyppjnyq2ka03b2ylsmw3jv1hp35f3ycqpbqp";
- name = "subshell-proc";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/subshell-proc";
- license = lib.licenses.free;
- };
- }) {};
- sudden-death = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "sudden-death";
- version = "0.2";
- src = fetchFromGitHub {
- owner = "yewton";
- repo = "sudden-death.el";
- rev = "c58fb9a672f306604dde4fbb0ff079e65a5e40be";
- sha256 = "1kmyivsyxr6gb2k36ssyr779rpk8qsrb27q5rjsir9fgc95qhvjb";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/24c94bff44029b6493575a9e09d7deb78db095a9/recipes/sudden-death";
- sha256 = "1wrhb3d27j07i64hvjggyajm752w4mhrhq09lfvyhz6ykp1ly3fh";
- name = "sudden-death";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/sudden-death";
- license = lib.licenses.free;
- };
- }) {};
suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }:
melpaBuild {
pname = "suggest";
- version = "0.4";
+ version = "0.5";
src = fetchFromGitHub {
owner = "Wilfred";
repo = "suggest.el";
- rev = "5cb70e500df430cb9ffc8ae0ab67976c1d7d226f";
- sha256 = "1001z5zaj4ln05js08cz13lgc11dqxc6sgp1s35g19sfhip4xyim";
+ rev = "05beef9ecf94107d72d0070fa092a8392505b012";
+ sha256 = "008d9kk8vb90n8j5dvw1rslfny66q012022na03dzbnmq3f73k7a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest";
@@ -33498,8 +34326,8 @@
sha256 = "0h96pwvf1smd2kakd5ydsn6q59dv9sj706p1ak86aj82m028wzk5";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a44a6577740b98749fe2703b32d70f15a473eb46/recipes/swbuff";
- sha256 = "0pi816ljprpl8p2pigfyzm9ripvrc4hvnpkjdsg30mw8iyrk66yn";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/39e87d0e01a4a836671b6d6e22091df6ebecf566/recipes/swbuff";
+ sha256 = "1bqnq6zxkq4yyq3khnkbprgwq5k93rpcmmkjbr9wqf9drfld1bkk";
name = "swbuff";
};
packageRequires = [];
@@ -33529,22 +34357,22 @@
license = lib.licenses.free;
};
}) {};
- swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
melpaBuild {
pname = "swift-mode";
- version = "2.3.0";
+ version = "3.0";
src = fetchFromGitHub {
owner = "chrisbarrett";
repo = "swift-mode";
- rev = "98920962adaaf42698fc847fbe7d9edcd58e50e9";
- sha256 = "0npz0izw6dwiv1kmkbnf6hklmx4w2pqddzb2ijxasrrviyyyc83s";
+ rev = "e8d9a5d7af59e8be25997b8b048d7c3e257cd0b0";
+ sha256 = "035478shf1crb1qnhk5rmz08xgn0z2p6fsw0yii1a4q5f3h85xrc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode";
sha256 = "1imr53f8agfza9zxs1h1mwyhg7yaywqqffd1lsvm1m84nvxvri2d";
name = "swift-mode";
};
- packageRequires = [ emacs ];
+ packageRequires = [ emacs seq ];
meta = {
homepage = "https://melpa.org/#/swift-mode";
license = lib.licenses.free;
@@ -33825,12 +34653,12 @@
systemd = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "systemd";
- version = "1.5";
+ version = "1.6";
src = fetchFromGitHub {
owner = "holomorph";
repo = "systemd-mode";
- rev = "4c1b2befd0c853dcc7bca52d9b084933c3a08254";
- sha256 = "1sdrga3mmajai2jcf4zpcii0l2b9wch8rhdsbjlzx76ia5snp23l";
+ rev = "1e7567a9973bf80cab0d7e0355656a84bee7ca96";
+ sha256 = "0ylgnvpfindg4cxccbqy02ic7p0i9rygf1w16dm1filwhbqvjplq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ca810e512c357d1d0130aeeb9b46b38c595e3351/recipes/systemd";
@@ -34473,22 +35301,43 @@
license = lib.licenses.free;
};
}) {};
- tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }:
+ tickscript-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "tickscript-mode";
+ version = "0.4";
+ src = fetchFromGitHub {
+ owner = "msherry";
+ repo = "tickscript-mode";
+ rev = "9acf389dd055ae77c92170802769838810472490";
+ sha256 = "1v60y244papzrirwqk9c2wcwgz4qp9h7m3887kvgr5ffn5imjss8";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/c60ee1839f728c5041bde1fe4fa62c4d41c746ef/recipes/tickscript-mode";
+ sha256 = "0wnck6j377idx7h7csmfdhp6napv3zs4sd24lknfclafhslllp54";
+ name = "tickscript-mode";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/tickscript-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
+ tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s, typescript-mode }:
melpaBuild {
pname = "tide";
- version = "2.4.2";
+ version = "2.5.3";
src = fetchFromGitHub {
owner = "ananthakumaran";
repo = "tide";
- rev = "f8b4752dfe7fde7b90c65895c47943231af3237d";
- sha256 = "1hy0jzk457nz9rz7s4hq6b5asv9g9wrrs1fdsisz7jzy6hzw4pqp";
+ rev = "e5d1d3852aaf63cbfb0abaec1792a62bed024a72";
+ sha256 = "1kwssyzbjwl2vyll0p49l57z41yv6k1jnzbsdnh0d1h81nixg5wk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide";
sha256 = "1z2xr25s23sz6nrzzw2xg1l2j8jvjhxi53qh7nvxmmq6n6jjpwg1";
name = "tide";
};
- packageRequires = [ cl-lib dash flycheck typescript-mode ];
+ packageRequires = [ cl-lib dash flycheck s typescript-mode ];
meta = {
homepage = "https://melpa.org/#/tide";
license = lib.licenses.free;
@@ -34622,12 +35471,12 @@
tracking = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "tracking";
- version = "2.5";
+ version = "2.6";
src = fetchFromGitHub {
owner = "jorgenschaefer";
repo = "circe";
- rev = "13c605e639194c3da0c2e685056fac685f8c76a0";
- sha256 = "0n7v0g332ml1ang2fjc8rjbi8h1f4bqazcqi8dlfn99vvv8kcd21";
+ rev = "59f1096238e6c30303a6fe9fc1c635f49e5946c6";
+ sha256 = "19h3983zy3f15cgs86irvbdzz55qyjm48qd7gjlzcxplr7vnnh0j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/tracking";
@@ -34643,12 +35492,12 @@
transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
melpaBuild {
pname = "transmission";
- version = "0.11";
+ version = "0.12";
src = fetchFromGitHub {
owner = "holomorph";
repo = "transmission";
- rev = "541f73c779e72eb6ebcc6814a75771e91679875a";
- sha256 = "1rjxn5pfryxbxsgfmmzidcs83azvzvzq0nnphbxmlxybp97wzimx";
+ rev = "0de5a5fa2438890ae9c2ca61999042ab175df3e9";
+ sha256 = "1wqlbbm71s1hvglsdp1qs7nvj6gnkjkai4rr8hhp1lliiyd5vmia";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission";
@@ -34682,22 +35531,22 @@
license = lib.licenses.free;
};
}) {};
- treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pfuture, s }:
+ treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, pfuture, s }:
melpaBuild {
pname = "treemacs";
- version = "1.8.5";
+ version = "1.11.8";
src = fetchFromGitHub {
owner = "Alexander-Miller";
repo = "treemacs";
- rev = "79ddef38dc06d7e22717326968d7cad403ffd8f4";
- sha256 = "1ymddfbcpqs8ny83651jaclb0khzkk2w9djfn97lmhfyy9wx7zf1";
+ rev = "4213045d59e19d0aac6246d5df5fc0a9b104d5bd";
+ sha256 = "0iwfk42l8wlwnbd6c2l201gfn0k4k0h5whbr21dp8ngr54p5w95z";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs";
- sha256 = "1sg3m9l9l1xww6an2210bghlby5cljw2jxh7q0w8cwmcga7rr4jh";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/486f21e99856a77f470d246f3c71cd32d2e61ad6/recipes/treemacs";
+ sha256 = "07npjnhn9a0b537h1wmvy57bmicd2cji7bslp4wbnrfmmg2jdc3a";
name = "treemacs";
};
- packageRequires = [ ace-window cl-lib dash emacs f pfuture s ];
+ packageRequires = [ ace-window cl-lib dash emacs f hydra pfuture s ];
meta = {
homepage = "https://melpa.org/#/treemacs";
license = lib.licenses.free;
@@ -34706,12 +35555,12 @@
treemacs-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, treemacs }:
melpaBuild {
pname = "treemacs-evil";
- version = "1.8.5";
+ version = "1.11.8";
src = fetchFromGitHub {
owner = "Alexander-Miller";
repo = "treemacs";
- rev = "79ddef38dc06d7e22717326968d7cad403ffd8f4";
- sha256 = "1ymddfbcpqs8ny83651jaclb0khzkk2w9djfn97lmhfyy9wx7zf1";
+ rev = "4213045d59e19d0aac6246d5df5fc0a9b104d5bd";
+ sha256 = "0iwfk42l8wlwnbd6c2l201gfn0k4k0h5whbr21dp8ngr54p5w95z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs-evil";
@@ -34724,6 +35573,27 @@
license = lib.licenses.free;
};
}) {};
+ treemacs-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, treemacs }:
+ melpaBuild {
+ pname = "treemacs-projectile";
+ version = "1.11.8";
+ src = fetchFromGitHub {
+ owner = "Alexander-Miller";
+ repo = "treemacs";
+ rev = "4213045d59e19d0aac6246d5df5fc0a9b104d5bd";
+ sha256 = "0iwfk42l8wlwnbd6c2l201gfn0k4k0h5whbr21dp8ngr54p5w95z";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/b694918c94e6311745776d451aa2519924beef2d/recipes/treemacs-projectile";
+ sha256 = "0y7mq466c9cigyd6imzjnh54aq9kcsikhr7llga5gsclf35fc5ld";
+ name = "treemacs-projectile";
+ };
+ packageRequires = [ projectile treemacs ];
+ meta = {
+ homepage = "https://melpa.org/#/treemacs-projectile";
+ license = lib.licenses.free;
+ };
+ }) {};
trr = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "trr";
@@ -34808,22 +35678,22 @@
license = lib.licenses.free;
};
}) {};
- tuareg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "tuareg";
- version = "2.0.10";
+ version = "2.1.0";
src = fetchFromGitHub {
owner = "ocaml";
repo = "tuareg";
- rev = "93b9c6cdba3a8f333cc817c3822fc76b71ff4dcd";
- sha256 = "14l0y7gahbz1l4ag5nvswj7cl4skchvzr6r7zc1a5k000skdmv69";
+ rev = "64537bc753094b2adc2e3e97625fa9c0a01f9ae6";
+ sha256 = "03d0n49p6d77p221majmbh0gjyrmh2z4cb2l2vi5xxfwc1fsxzmp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg";
sha256 = "0wx723dmjlpm86xdabl9n8p22zbbxpapyfn6ifz0b0pvhh49ip7q";
name = "tuareg";
};
- packageRequires = [];
+ packageRequires = [ caml ];
meta = {
homepage = "https://melpa.org/#/tuareg";
license = lib.licenses.free;
@@ -35258,12 +36128,12 @@
unify-opening = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "unify-opening";
- version = "1.1.0";
+ version = "2.0.0";
src = fetchFromGitHub {
owner = "DamienCassou";
repo = "unify-opening";
- rev = "2812e43029cab7183197ce5e3c9577856bfd22c5";
- sha256 = "1vbx10s2zmhpxjg26ik947bcg9f7w3g2w45wmm0shjp743fsdq8p";
+ rev = "fbe53b56e9629143a73c5da9e7797579508e0fbf";
+ sha256 = "0hr65nrywa9yijqymw902q02adyczbwzam2ahv8m2wzay5pcwg8a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0a2faab13744262ef4d12750f70b300b3afd2835/recipes/unify-opening";
@@ -35360,27 +36230,6 @@
license = lib.licenses.free;
};
}) {};
- uzumaki = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "uzumaki";
- version = "0.1";
- src = fetchFromGitHub {
- owner = "geyslan";
- repo = "uzumaki";
- rev = "a75956e1757f4b98aad3384a4616481aede70cb1";
- sha256 = "0z53n9qsglp87f6q1pa3sixrjni9k46j31zg15gcwrmflmfrw8ds";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/6d63f9408e3bb581a47c8ab1f729f9ee087933d6/recipes/uzumaki";
- sha256 = "1fvhzz2qpyc819rjvzyf42jmb70hlg7a9ybqwi81w7rydpabg61q";
- name = "uzumaki";
- };
- packageRequires = [ cl-lib ];
- meta = {
- homepage = "https://melpa.org/#/uzumaki";
- license = lib.licenses.free;
- };
- }) {};
v2ex-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, request }:
melpaBuild {
pname = "v2ex-mode";
@@ -35594,12 +36443,12 @@
vhdl-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, ggtags, helm, lib, melpaBuild, outshine }:
melpaBuild {
pname = "vhdl-tools";
- version = "5.6";
+ version = "5.7";
src = fetchFromGitHub {
owner = "csantosb";
repo = "vhdl-tools";
- rev = "c08343904835cbae12f48e0758b0a6a014d76a74";
- sha256 = "1skh9p5s9nbl6jvljj9bfn19fdzjx8lvx1q6rzldld07xwaif4qb";
+ rev = "40d5e1020b1a2b6e8ff04cbd8c84bf7959e4e7af";
+ sha256 = "1ndrvwjgfjnmaw71y4452ck9aqlwnpxa7379ldsn7gfl0r67qhsi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/69fe2f8fb98ac1af1d3185f62ae1c89e646cfebf/recipes/vhdl-tools";
@@ -35822,6 +36671,27 @@
license = lib.licenses.free;
};
}) {};
+ vue-mode = callPackage ({ edit-indirect, fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode, ssass-mode, vue-html-mode }:
+ melpaBuild {
+ pname = "vue-mode";
+ version = "0.3.1";
+ src = fetchFromGitHub {
+ owner = "CodeFalling";
+ repo = "vue-mode";
+ rev = "fe501dba780025066dcdcd2055e772d06c2abdbc";
+ sha256 = "0k67kzrh2fjhjiqcy1yq5cmcwjpx85yd2xxvkqvv4791q58f7c4z";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/2e5e0a9fff332aeec09f6d3d758e2b67dfdf8397/recipes/vue-mode";
+ sha256 = "0gy7a5sliaijq0666l55vbkg15anrw7k1828szdn1ppkraw14bn0";
+ name = "vue-mode";
+ };
+ packageRequires = [ edit-indirect mmm-mode ssass-mode vue-html-mode ];
+ meta = {
+ homepage = "https://melpa.org/#/vue-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
w32-browser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "w32-browser";
@@ -36053,15 +36923,36 @@
license = lib.licenses.free;
};
}) {};
+ web-search = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "web-search";
+ version = "0.1.1";
+ src = fetchFromGitHub {
+ owner = "xuchunyang";
+ repo = "web-search.el";
+ rev = "72fea0e7429ed3d6932a497b568335316d8ef283";
+ sha256 = "1f2g6r24482k1dra1z92yahwvqiryc8p5p1v2naxv16ysa461a34";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/503ef2042cc14dbe53e7121b8d0b5ccbdf6c882b/recipes/web-search";
+ sha256 = "08iflbp6rmsxsy2lahsdjj9ki70ixqhsas0vxzawz5pi5vk2x9gj";
+ name = "web-search";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/web-search";
+ license = lib.licenses.free;
+ };
+ }) {};
webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
melpaBuild {
pname = "webpaste";
- version = "1.5.0";
+ version = "2.0.0";
src = fetchFromGitHub {
owner = "etu";
repo = "webpaste.el";
- rev = "77e6154ece15ffcc58db80dca48fe342376831aa";
- sha256 = "0zj1hhz7m0fxaj03aqjfd6jhcg2khi87l6742miwkdxxggwhdijj";
+ rev = "aed3e00b6332a068d53ce482f5139a95c3dcd245";
+ sha256 = "1p4sgn0rh8a5f0f6f1njq329zwgs6yp8j3zqs0yfz4kaikw1xw10";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/13847d91c1780783e516943adee8a3530c757e17/recipes/webpaste";
@@ -36098,12 +36989,12 @@
weechat = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, tracking }:
melpaBuild {
pname = "weechat";
- version = "0.3.1";
+ version = "0.4.0";
src = fetchFromGitHub {
owner = "the-kenny";
repo = "weechat.el";
- rev = "41f06299b2a691473b6b26c15dc46367542c79f0";
- sha256 = "0vg3w18xj6i320jsivsml3mi1fdxr8dgxmn7qy2780ajy5ndxnw1";
+ rev = "a1bda40513f0ea94a8a85ee122a475475a03f6ef";
+ sha256 = "05jnfrjrf1da038jkypvx3slyk39xlpak4n9s5vwmx7mgf4zg06y";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e38255a31a4ca31541c97a506a55f82e2670abe6/recipes/weechat";
@@ -36245,12 +37136,12 @@
which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "which-key";
- version = "3.0.1";
+ version = "3.0.2";
src = fetchFromGitHub {
owner = "justbur";
repo = "emacs-which-key";
- rev = "3ff303b50495d492cfac70cc9f7321971928bdb1";
- sha256 = "1q0rg13lq31fqnkpkss61pfyx7ib7i4r1jbcavpjyr5gqcb08fzm";
+ rev = "6d2e17c949ff7bfebfe0b0878a93d94b31585031";
+ sha256 = "03szbjp6j6rjj43k3vs2jay4y7bnhhh1ymgqv8vvdnqsf88pdg88";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key";
@@ -36308,12 +37199,12 @@
whizzml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "whizzml-mode";
- version = "0.2.1";
+ version = "0.2.2";
src = fetchFromGitHub {
owner = "whizzml";
repo = "whizzml-mode";
- rev = "662c60173cdb396fcb2386d7d7c774d26f16cd9f";
- sha256 = "1nyl1whhi3zrzb5b4vkmqdaggnxrqmzmw1amf7hbw0mvx5mpy9pa";
+ rev = "9060fdce07c137abc2c494cb72641b9b9d6fbe22";
+ sha256 = "10yi3n6pyqirlzxdkv7nvp0d0n1fkjrgwhn0kp5i27dnp3fi0i2b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/11f26b15c326c3b8541bac510579b32493916042/recipes/whizzml-mode";
@@ -36515,22 +37406,22 @@
license = lib.licenses.free;
};
}) {};
- winum = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ winum = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "winum";
- version = "1.0.2";
+ version = "2.0.0";
src = fetchFromGitHub {
owner = "deb0ch";
repo = "emacs-winum";
- rev = "8e886302c7e1d8fd521a95e0f00d6efab295a883";
- sha256 = "19rf806v3yv6qy6p8mf54g1whdrh7vc107z31kqaqdwq681fhi37";
+ rev = "c56d1cdb8d1723eb4c0d7a7eb3ecd2697739146c";
+ sha256 = "09jd5srlnd4060hs719qil84ssmnvq196bz7ywaswgapv1gs1h6r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c1caa7a54a910a44322fdee300e8cce6ddcde071/recipes/winum";
sha256 = "0yyvjmvqif6glh9ri6049nxcmgib9mxdhy6816kjhsaqr570f9pw";
name = "winum";
};
- packageRequires = [ cl-lib ];
+ packageRequires = [ cl-lib dash ];
meta = {
homepage = "https://melpa.org/#/winum";
license = lib.licenses.free;
@@ -36539,11 +37430,11 @@
wisp-mode = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "wisp-mode";
- version = "0.9.1";
+ version = "0.9.7";
src = fetchhg {
url = "https://bitbucket.com/ArneBab/wisp";
- rev = "70b4ccc031bc";
- sha256 = "1mbypvclk83lhwvdy6ancl4j9nysv47s8yp6baa8pi54zlc9w3i1";
+ rev = "7633b2a5133f";
+ sha256 = "0j6j9wkmq95dhx5cr3z2gpx5mvsqsgissp2060ij252ijc3l9k4a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode";
@@ -36577,22 +37468,22 @@
license = lib.licenses.free;
};
}) {};
- with-editor = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ with-editor = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "with-editor";
- version = "2.5.11";
+ version = "2.7.0";
src = fetchFromGitHub {
owner = "magit";
repo = "with-editor";
- rev = "3385ffdc6faed5a283e26a7ebf89825c700dd395";
- sha256 = "1kznr0zv1y6lwsllpksqjzq2f4bc5a99lg19fmifn7w0dhv6fn0m";
+ rev = "99d3278b1c79718de16dd4f57dcc8c4aa31a4051";
+ sha256 = "1mcfinr1wv87hqn2787dcyn7lkgfni4xfgsji50pwj3zfgg0yqyr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor";
sha256 = "1wsl1vwvywlc32r5pcc9jqd0pbzq1sn4fppxk3vwl0s5h40v8rnb";
name = "with-editor";
};
- packageRequires = [ async dash emacs ];
+ packageRequires = [ async emacs ];
meta = {
homepage = "https://melpa.org/#/with-editor";
license = lib.licenses.free;
@@ -36714,8 +37605,8 @@
sha256 = "0s3mjmfjiidn3spklndw0dvcwbb9x034xyphp60aad8vjaflbchs";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/d9f8f01f1807de24fb6e92b355d05b81be4bab07/recipes/wordsmith-mode";
- sha256 = "1570h1sjjaks6bnhd4xrbx6nna4v7hz6dmrzwjq37rwvallasg1n";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/3b5fda506e5b388cd6824d433b89032ed46858dc/recipes/wordsmith-mode";
+ sha256 = "0s6b6dfqn31jdcgs2mlmvwgpr5a4zs4xi8m002ly11c6sn035xb1";
name = "wordsmith-mode";
};
packageRequires = [];
@@ -36913,6 +37804,27 @@
license = lib.licenses.free;
};
}) {};
+ xcode-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "xcode-project";
+ version = "1.0.0";
+ src = fetchFromGitHub {
+ owner = "nhojb";
+ repo = "xcode-project";
+ rev = "f5548a26a1afc0b0d873556c25f6d8b6b9c2aa8c";
+ sha256 = "0xb1cvjaw7zjnw6c5aq315vvlc3cncris62jis44jb8s5r8gxcrv";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/49b866ebf7e707bc74525f83dd5038e6e860fcef/recipes/xcode-project";
+ sha256 = "0igp30f6ypmp4l8zmdfpa5bza4avm7mq2gj8v7b3ii655v91n6vi";
+ name = "xcode-project";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/xcode-project";
+ license = lib.licenses.free;
+ };
+ }) {};
xcscope = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "xcscope";
@@ -37186,6 +38098,27 @@
license = lib.licenses.free;
};
}) {};
+ yard-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "yard-mode";
+ version = "0.1";
+ src = fetchFromGitHub {
+ owner = "pd";
+ repo = "yard-mode.el";
+ rev = "78792f6a6fbff4f1bc955f494fdb11378e7f8095";
+ sha256 = "096ay60hrd14b459cyxxcf9g7i1ivsxg6yhc0q162px6kl1x0m2y";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/afad2677f901b8d27922389afb1d235d5c8edc39/recipes/yard-mode";
+ sha256 = "0jmlcba8qapjwaaliz9gzs99if3wglkhmlpjzcdy3icx18sw8kzx";
+ name = "yard-mode";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/yard-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
yarn-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "yarn-mode";
@@ -37231,12 +38164,12 @@
yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "yasnippet";
- version = "0.12.1";
+ version = "0.12.2";
src = fetchFromGitHub {
owner = "joaotavora";
repo = "yasnippet";
- rev = "0463c75b636fe02273c2b8ca85f36b56a206c5c5";
- sha256 = "1l8h681x5v78k6wkcmhb5kdw9mc13kcmq3aiqg0r9dn493ifj1v1";
+ rev = "89eb7ab64d67e96646576dc0d551e8c23d50438a";
+ sha256 = "1wr0d14yl3440hkdr436zxl9pk7nqhl76n9m3b3ia4lp6z5aj4jc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet";
@@ -37272,14 +38205,14 @@
}) {};
yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
pname = "yatex";
- version = "1.78";
+ version = "1.80";
src = fetchhg {
url = "https://www.yatex.org/hgrepos/yatex/";
- rev = "4f8551386af2";
- sha256 = "0qvp54pzc6m52j5xkwp25nwdlik6v879halmfvcpn3z0grhrslbn";
+ rev = "16763e5b7481";
+ sha256 = "1mrcc9amz0kflm570bd2cprhin0z8lr668k2s56mj6shixb61dwh";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e28710244a1bef8f56156fe1c271520896a9c694/recipes/yatex";
sha256 = "17np4am7yan1bh4706azf8in60c41158h3z591478j5b1w13y5a6";
name = "yatex";
};
@@ -37478,7 +38411,7 @@
sha256 = "0nnlxzsmhsbszqigcyxak9i1a0digrd13gv6v18ck4h760mihh1m";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/72ef967a9bea2e100ae17aad1a88db95820f4f6a/recipes/zerodark-theme";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/d00b78ead693e844e35c760fe2c39b8ed6cb0d81/recipes/zerodark-theme";
sha256 = "1nqzswmnq6h0av4rivqm237h7ghp7asa2nvls7nz4ma467p9qhp9";
name = "zerodark-theme";
};
@@ -37530,6 +38463,27 @@
license = lib.licenses.free;
};
}) {};
+ zoom = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "zoom";
+ version = "0.2.0";
+ src = fetchFromGitHub {
+ owner = "cyrus-and";
+ repo = "zoom";
+ rev = "d92ea444df6f6bb6cae92242f3269582d1b8ab40";
+ sha256 = "08riz3dd19c1dixm3c6j5dkkwjpgcib05pxq611w8z0mgsn0hsc5";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe094c99756ad29eda9bc51f31bb70c4ddc4131/recipes/zoom";
+ sha256 = "09bk0nnfj72an2b3rravd6qp21gdgcm1m55qnf2r8rzbgqymq5ls";
+ name = "zoom";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/zoom";
+ license = lib.licenses.free;
+ };
+ }) {};
zoom-window = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "zoom-window";
diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix
index c3153b06e267ffb4f384ea4575cd81f2722550ee..3d8a4d9232159bce3e5fad5fd65b000985c8acb1 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 = "20170814";
+ version = "20171106";
src = fetchurl {
- url = "http://orgmode.org/elpa/org-20170814.tar";
- sha256 = "1r55vfjbll18h1nb5a48293x9lwmcmxgpx8h20n77n3inqmc6yli";
+ url = "http://orgmode.org/elpa/org-20171106.tar";
+ sha256 = "080zkrbivd0y67ydcqj97c672q6d9d33qgb5z723niy8a8xjrp20";
};
packageRequires = [];
meta = {
@@ -14,10 +14,10 @@
}) {};
org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org-plus-contrib";
- version = "20170814";
+ version = "20171106";
src = fetchurl {
- url = "http://orgmode.org/elpa/org-plus-contrib-20170814.tar";
- sha256 = "15v3944p1vnjqmy6il6gr1ipqw32cjzdq6w43rniwv2vr5lmh6iz";
+ url = "http://orgmode.org/elpa/org-plus-contrib-20171106.tar";
+ sha256 = "1ckh7q7kc72qc1wh4xypfadj9dpnn4xzc6ap4gg428q85bi091h1";
};
packageRequires = [];
meta = {
diff --git a/pkgs/applications/editors/emacs/clean-env.patch b/pkgs/applications/editors/emacs/clean-env.patch
new file mode 100644
index 0000000000000000000000000000000000000000..f80efeeef706b1779ca4f07dbcc9e865d750190a
--- /dev/null
+++ b/pkgs/applications/editors/emacs/clean-env.patch
@@ -0,0 +1,15 @@
+Dump temacs in an empty environment to prevent -dev paths from ending
+up in the dumped image.
+
+diff -ru -x '*~' emacs-25.3/src/Makefile.in emacs-25.3-new/src/Makefile.in
+--- emacs-25.3/src/Makefile.in 2017-04-14 17:02:47.000000000 +0200
++++ emacs-25.3-new/src/Makefile.in 2017-09-25 19:03:02.173861038 +0200
+@@ -532,7 +532,7 @@
+ ifeq ($(CANNOT_DUMP),yes)
+ ln -f temacs$(EXEEXT) $@
+ else
+- LC_ALL=C $(RUN_TEMACS) -batch -l loadup dump
++ env -i LC_ALL=C $(RUN_TEMACS) -batch -l loadup dump
+ ifneq ($(PAXCTL_dumped),)
+ $(PAXCTL_dumped) $@
+ endif
diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix
index c51227bbc6f77b05486d820ae0f0e038a81f2f12..af3298a5883ea3abdb800c0fd7d021358c0689df 100644
--- a/pkgs/applications/editors/emacs/default.nix
+++ b/pkgs/applications/editors/emacs/default.nix
@@ -26,15 +26,19 @@ let
in
stdenv.mkDerivation rec {
name = "emacs-${version}${versionModifier}";
- version = "25.2";
+ version = "25.3";
versionModifier = "";
src = fetchurl {
url = "mirror://gnu/emacs/${name}.tar.xz";
- sha256 = "1ykkq0xl28ljdg61bm6gzy04ww86ajms98gix72qg6cpr6a53dar";
+ sha256 = "02y00y9q42g1iqgz5qhmsja75hwxd88yrn9zp14lanay0zkwafi5";
};
- patches = (lib.optional stdenv.isDarwin ./at-fdcwd.patch);
+ enableParallelBuilding = true;
+
+ patches =
+ [ ./clean-env.patch ]
+ ++ lib.optional stdenv.isDarwin ./at-fdcwd.patch;
nativeBuildInputs = [ pkgconfig ]
++ lib.optionals srcRepo [ autoconf automake texinfo ]
diff --git a/pkgs/applications/editors/emacs/macport.nix b/pkgs/applications/editors/emacs/macport.nix
index f38839a5abcacb06e323f2bad2733c961c8cf22d..70c723b40dae4ac3e0300ebaf68beb70100b3841 100644
--- a/pkgs/applications/editors/emacs/macport.nix
+++ b/pkgs/applications/editors/emacs/macport.nix
@@ -4,21 +4,21 @@
}:
stdenv.mkDerivation rec {
- emacsVersion = "25.2";
+ emacsVersion = "25.3";
emacsName = "emacs-${emacsVersion}";
- macportVersion = "6.3";
+ macportVersion = "6.8";
name = "emacs-mac-${emacsVersion}-${macportVersion}";
builder = ./builder.sh;
src = fetchurl {
url = "mirror:///gnu/emacs/${emacsName}.tar.xz";
- sha256 = "1ykkq0xl28ljdg61bm6gzy04ww86ajms98gix72qg6cpr6a53dar";
+ sha256 = "02y00y9q42g1iqgz5qhmsja75hwxd88yrn9zp14lanay0zkwafi5";
};
macportSrc = fetchurl {
url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${emacsName}-mac-${macportVersion}.tar.gz";
- sha256 = "1dz11frk3ya3842lb89ixzpns9bz5f9njxdkyvjy75gfymqfhhzv";
+ sha256 = "167lgl76jz1bq6whb9ajshhw5v9bbw9ci4lji4qlmd5nrwnb7kqg";
};
hiresSrc = fetchurl {
diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/applications/editors/focuswriter/default.nix
index 28106cf876bd0b627e3d8c4d705cfc0b65c9e72a..10816e0a283fef44bb2c51e120905c54d7d8a045 100644
--- a/pkgs/applications/editors/focuswriter/default.nix
+++ b/pkgs/applications/editors/focuswriter/default.nix
@@ -1,25 +1,27 @@
-{ stdenv, fetchurl, qt4, qmake4Hook, pkgconfig, hunspell }:
+{ stdenv, fetchurl, pkgconfig, qmake, qttools, hunspell, qtbase, qtmultimedia }:
stdenv.mkDerivation rec {
name = "focuswriter-${version}";
- version = "1.5.3";
+ version = "1.6.7";
src = fetchurl {
- url = http://gottcode.org/focuswriter/focuswriter-1.5.3-src.tar.bz2;
- sha256 = "1i58jxbiy95ijf81g8c3gwxhcg3irzssna3wv7vhrd57g4lcfj0w";
+ url = "https://gottcode.org/focuswriter/focuswriter-${version}-src.tar.bz2";
+ sha256 = "10rqzinr6yd6ca06rklg34kdc08a3xgygfzmprsfg7gdsybfay5z";
};
- buildInputs = [ qt4 qmake4Hook pkgconfig hunspell ];
-
- qmakeFlags = [ "PREFIX=/" ];
+ nativeBuildInputs = [ pkgconfig qmake qttools ];
+ buildInputs = [ hunspell qtbase qtmultimedia ];
+
+ enableParallelBuilding = true;
+ qmakeFlags = [ "PREFIX=/" ];
installFlags = [ "INSTALL_ROOT=$(out)" ];
- meta = {
+ meta = with stdenv.lib; {
description = "Simple, distraction-free writing environment";
- license = stdenv.lib.licenses.gpl2;
- maintainers = [ stdenv.lib.maintainers.madjar ];
- platforms = stdenv.lib.platforms.all;
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ madjar ];
+ platforms = platforms.all;
homepage = https://gottcode.org/focuswriter/;
};
}
diff --git a/pkgs/applications/editors/gobby/default.nix b/pkgs/applications/editors/gobby/default.nix
index 32998700c23e12c9936321b3aba23632e183b53b..de1e5e4c64bce4710a987fb7fc62559b476e94ed 100644
--- a/pkgs/applications/editors/gobby/default.nix
+++ b/pkgs/applications/editors/gobby/default.nix
@@ -15,7 +15,8 @@ in stdenv.mkDerivation rec {
sha256 = "165x0r668ma5blziisvbr8qig3jw9hf7i6w8r7wwvz3wsac3bswc";
};
- buildInputs = [ pkgconfig gtkmm2 gsasl gtksourceview libxmlxx libinf intltool ]
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gtkmm2 gsasl gtksourceview libxmlxx libinf intltool ]
++ stdenv.lib.optional gnomeSupport gnome_vfs;
configureFlags = ''
diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 08fc25fe9c14a0d76ddd134a634b96467d6fb6c9..41ad3164d6a6718227c5a6851b9526f2fb7ffd8d 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -53,6 +53,9 @@ let
patchelf --set-interpreter $interp \
--set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib zlib ]}:$lldbLibPath" \
bin/clang/clang-tidy
+
+ wrapProgram $out/bin/clion \
+ --set CL_JDK "${jdk}"
)
'';
});
@@ -75,7 +78,7 @@ let
});
buildGogland = { name, version, src, license, description, wmClass, update-channel }:
- (mkJetBrainsProduct {
+ lib.overrideDerivation (mkJetBrainsProduct {
inherit name version src wmClass jdk;
product = "Gogland";
meta = with stdenv.lib; {
@@ -90,6 +93,13 @@ let
maintainers = [ maintainers.miltador ];
platforms = platforms.linux;
};
+ }) (attrs: {
+ postFixup = (attrs.postFixup or "") + ''
+ interp="$(cat $NIX_CC/nix-support/dynamic-linker)"
+ patchelf --set-interpreter $interp $out/gogland*/plugins/intellij-go-plugin/lib/dlv/linux/dlv
+
+ chmod +x $out/gogland*/plugins/intellij-go-plugin/lib/dlv/linux/dlv
+ '';
});
buildIdea = { name, version, src, license, description, wmClass, update-channel }:
@@ -216,12 +226,12 @@ in
clion = buildClion rec {
name = "clion-${version}";
- version = "2017.2"; /* updated by script */
+ version = "2017.2.3"; /* updated by script */
description = "C/C++ IDE. New. Intelligent. Cross-platform";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz";
- sha256 = "de7f47ec959be9653aa4d2028fb27f8327800d8370daa0ab2d1093f3469f4b49"; /* updated by script */
+ sha256 = "02hyndyfcrvfbi4q8vmmj0xh2bggwc2azggm24g3m03iffa7j6fx"; /* updated by script */
};
wmClass = "jetbrains-clion";
update-channel = "CLion_Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml
@@ -229,90 +239,51 @@ in
datagrip = buildDataGrip rec {
name = "datagrip-${version}";
- version = "2017.1.5"; /* updated by script */
+ version = "2017.2.2"; /* updated by script */
description = "Your Swiss Army Knife for Databases and SQL";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/datagrip/${name}.tar.gz";
- sha256 = "8847c35761fcf6fc7a1d3f2bed0fa3971fbf28721c144f41d21feb473bb212dc"; /* updated by script */
+ sha256 = "1l8y65fw9g5ckzwpcgigm2qwy8fhpw2hil576rphsnx6qvnh4swn"; /* updated by script */
};
wmClass = "jetbrains-datagrip";
- update-channel = "datagrip_2017_1";
+ update-channel = "datagrip_2017_2";
};
gogland = buildGogland rec {
name = "gogland-${version}";
- version = "171.4694.61"; /* updated by script */
+ version = "173.2696.28"; /* updated by script */
description = "Up and Coming Go IDE";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/go/${name}.tar.gz";
- sha256 = "8e9462fc7c5cc7dc110ea2257b920a55d7d52ea874a53567e5d19381a1fcb269"; /* updated by script */
+ sha256 = "07nz2pf7fnjxsvc82vihk2i880cji349czxzshr1dk50ixlydq7n"; /* updated by script */
};
wmClass = "jetbrains-gogland";
update-channel = "gogland_1.0_EAP";
};
- idea14-community = buildIdea rec {
- name = "idea-community-${version}";
- version = "14.1.7";
- description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
- license = stdenv.lib.licenses.asl20;
- src = fetchurl {
- url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
- sha256 = "1i4mdjm9dd6zvxlpdgd3bqg45ir0cfc9hl55cdc0hg5qwbz683fz";
- };
- wmClass = "jetbrains-idea-ce";
- update-channel = "IDEA14.1";
- };
-
idea-community = buildIdea rec {
name = "idea-community-${version}";
- version = "2017.2.1";
+ version = "2017.2.5"; /* updated by script */
description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
license = stdenv.lib.licenses.asl20;
src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
- sha256 = "1z8gp209jpjzvllnrpxzmbhgaxkklxw8nkm3g2drb7nal2hhs113";
+ sha256 = "01p63wsy60icy4673ci435rmzpjfkyz7a8w413vw45i2bm76skhr"; /* updated by script */
};
wmClass = "jetbrains-idea-ce";
update-channel = "IDEA_Release";
};
- idea14-ultimate = buildIdea rec {
- name = "idea-ultimate-${version}";
- version = "14.1.7";
- description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
- license = stdenv.lib.licenses.unfree;
- src = fetchurl {
- url = "https://download.jetbrains.com/idea/ideaIU-${version}.tar.gz";
- sha256 = "1hhga1i2zbsipgq283gn19kv9n94inhr1bxh2yx19gz7yr4r49d2";
- };
- wmClass = "jetbrains-idea";
- update-channel = "IDEA14.1";
- };
-
- idea15-ultimate = buildIdea rec {
- name = "idea-ultimate-${version}";
- version = "15.0.6";
- description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
- license = stdenv.lib.licenses.unfree;
- src = fetchurl {
- url = "https://download.jetbrains.com/idea/ideaIU-${version}.tar.gz";
- sha256 = "012aap2qn0jx4x34bdv9ivrsr86vvf683srb5vpj27hc4l6rw6ll";
- };
- wmClass = "jetbrains-idea";
- update-channel = null;
- };
-
idea-ultimate = buildIdea rec {
name = "idea-ultimate-${version}";
- version = "2017.2.1";
+ version = "2017.2.5"; /* updated by script */
description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jdk.tar.gz";
- sha256 = "0y3r82i229d7lywixyifv4kkrwivixl75flagaqbkzw3j9wklg3k";
+ sha256 = "0pp49nck1cad6pz81bd95v4v55vmnvj7cbdzybmldglka1afqjb6"; /* updated by script */
};
wmClass = "jetbrains-idea";
update-channel = "IDEA_Release";
@@ -320,38 +291,25 @@ in
phpstorm = buildPhpStorm rec {
name = "phpstorm-${version}";
- version = "2017.1.4";
+ version = "2017.2.4"; /* updated by script */
description = "Professional IDE for Web and PHP developers";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
- sha256 = "0zrbcziznz6dwh56snr27752xcsnl2gsxzi6jiraplkd92f2xlaf";
+ sha256 = "0hn3x5wid2z7s2mhnxfqh2yhdkscccpbz7qgsxkjvmkxcynazrvy"; /* updated by script */
};
wmClass = "jetbrains-phpstorm";
- update-channel = "PS2017.1";
- };
-
- phpstorm10 = buildPhpStorm rec {
- name = "phpstorm-${version}";
- version = "10.0.4";
- description = "Professional IDE for Web and PHP developers";
- license = stdenv.lib.licenses.unfree;
- src = fetchurl {
- url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
- sha256 = "0fi042zvjpg5pn2mnhj3bbrdkl1b9vmhpf2l6ca4nr0rhjjv7dsm";
- };
- wmClass = "jetbrains-phpstorm";
- update-channel = "WI10";
+ update-channel = "PS2017.2";
};
pycharm-community = buildPycharm rec {
name = "pycharm-community-${version}";
- version = "2017.1.5"; /* updated by script */
+ version = "2017.2.3"; /* updated by script */
description = "PyCharm Community Edition";
license = stdenv.lib.licenses.asl20;
src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz";
- sha256 = "1a0bbf0d881527e08aad7a5adaa3ad44e8754c3eb2c3a8ed5ab113491549679b"; /* updated by script */
+ sha256 = "1aik3jhggxfxnfv4kg9716gwsi013511jf9n20f2mqzdq8w2jmp8"; /* updated by script */
};
wmClass = "jetbrains-pycharm-ce";
update-channel = "PyCharm_Release";
@@ -359,12 +317,12 @@ in
pycharm-professional = buildPycharm rec {
name = "pycharm-professional-${version}";
- version = "2017.1.5"; /* updated by script */
+ version = "2017.2.3"; /* updated by script */
description = "PyCharm Professional Edition";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/python/${name}.tar.gz";
- sha256 = "52519dfd0e913b5ccb8767155cd4d1fd413967d5010e8474cdc9a1fa688016ce"; /* updated by script */
+ sha256 = "0ib96yaj7l0igiv2bcrqqpbfn2xn3ic7lxyjn99k6dh8ika1qvry"; /* updated by script */
};
wmClass = "jetbrains-pycharm";
update-channel = "PyCharm_Release";
@@ -372,15 +330,15 @@ in
rider = buildRider rec {
name = "rider-${version}";
- version = "171.4456.1432"; /* updated by script */
+ version = "2017.1.2"; /* updated by script */
description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
- url = "https://download.jetbrains.com/resharper/Rider-RC-${version}.tar.gz";
- sha256 = "37bad69cdfcc4f297b2500a7bb673af7ef8f1fd45baa4eb2fa388d2c4bcb41ee"; /* updated by script */
+ url = "https://download.jetbrains.com/resharper/JetBrains.Rider-${version}.tar.gz";
+ sha256 = "0kphjxibrs4ss6hpxbssvs3n35xh9zzw7a1q09x79ibvvk73gwqh"; /* updated by script */
};
wmClass = "jetbrains-rider";
- update-channel = "rider_2017_1_eap";
+ update-channel = "rider_2017_1";
};
ruby-mine = buildRubyMine rec {
@@ -396,68 +354,17 @@ in
update-channel = "rm2017.1";
};
- ruby-mine7 = buildRubyMine rec {
- name = "ruby-mine-${version}";
- version = "7.1.5";
- description = "The Most Intelligent Ruby and Rails IDE";
- license = stdenv.lib.licenses.unfree;
- src = fetchurl {
- url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz";
- sha256 = "04fcxj1xlap9mxmwf051s926p2darlj5kwl4lms2gy5d8b2lhd5l";
- };
- wmClass = "jetbrains-rubymine";
- update-channel = null;
- };
-
- ruby-mine8 = buildRubyMine rec {
- name = "ruby-mine-${version}";
- version = "8.0.4";
- description = "The Most Intelligent Ruby and Rails IDE";
- license = stdenv.lib.licenses.unfree;
- src = fetchurl {
- url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz";
- sha256 = "0hipxib7377232w1jbf8h98bmh0djkllsrq3lq0w3fdxqglma43a";
- };
- wmClass = "jetbrains-rubymine";
- update-channel = null;
- };
-
webstorm = buildWebStorm rec {
name = "webstorm-${version}";
- version = "2017.1.4";
+ version = "2017.2.4"; /* updated by script */
description = "Professional IDE for Web and JavaScript development";
license = stdenv.lib.licenses.unfree;
src = fetchurl {
url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz";
- sha256 = "0aw2728wknss5vn2fkgz8rkm5vwk031305f32dirfrh51bvmq2zm";
+ sha256 = "1dd2fbsyra4fm39w1kz2biljbrmcqwd866hvzsidigmjplhlzan0"; /* updated by script */
};
wmClass = "jetbrains-webstorm";
update-channel = "WS_Release";
};
- webstorm10 = buildWebStorm rec {
- name = "webstorm-${version}";
- version = "10.0.5";
- description = "Professional IDE for Web and JavaScript development";
- license = stdenv.lib.licenses.unfree;
- src = fetchurl {
- url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz";
- sha256 = "0a5s6f99wyql5pgjl94pf4ljdbviik3b8dbr1s6b7c6jn1gk62ic";
- };
- wmClass = "jetbrains-webstorm";
- update-channel = null;
- };
-
- webstorm11 = buildWebStorm rec {
- name = "webstorm-${version}";
- version = "11.0.4";
- description = "Professional IDE for Web and JavaScript development";
- license = stdenv.lib.licenses.unfree;
- src = fetchurl {
- url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz";
- sha256 = "17agyqdyz6naxyx6p0y240ar93gja0ypw01nm2qmfzvh7ch03r24";
- };
- wmClass = "jetbrains-webstorm";
- update-channel = null;
- };
}
diff --git a/pkgs/applications/editors/jetbrains/update.pl b/pkgs/applications/editors/jetbrains/update.pl
index fecdeb0cae845acd6d948b105f8cc9b3b2a5f8bf..a0479fc911250c1baf5868210864511e53547b85 100755
--- a/pkgs/applications/editors/jetbrains/update.pl
+++ b/pkgs/applications/editors/jetbrains/update.pl
@@ -27,43 +27,61 @@ sub get_latest_versions {
next unless $latest_build;
# version as in download url
+ my ($version) = $latest_build =~ /^]*version="([^"]+)"/;
+ my ($fullNumber) = $latest_build =~ /^]*fullNumber="([^"]+)"/;
+ my $latest_version_full1 = "$version-$fullNumber";
+ $latest_version_full1 =~ s/\s*EAP//;
+
my ($latest_version) = $latest_build =~ /^]*version="([^"]+)"/;
($latest_version) = $latest_build =~ /^]*fullNumber="([^"]+)"/ if $latest_version =~ / /;
$h{$id} = $latest_version;
+ $h{"full1_" . $id} = $latest_version_full1;
}
return %h;
}
my %latest_versions = get_latest_versions();
-#for my $ch (sort keys %latest_versions) {
+# for my $ch (sort keys %latest_versions) {
# print("$ch $latest_versions{$ch}\n");
-#}
+# }
sub update_nix_block {
my ($block) = @_;
my ($channel) = $block =~ /update-channel\s*=\s*"([^"]+)"/;
if ($channel) {
- die "unknown update-channel $channel" unless $latest_versions{$channel};
- my ($version) = $block =~ /version\s*=\s*"([^"]+)"/;
- die "no version in $block" unless $version;
- if ($version eq $latest_versions{$channel}) {
- print("$channel is up to date at $version\n");
+ if ($latest_versions{$channel}) {
+ my ($version) = $block =~ /version\s*=\s*"([^"]+)"/;
+ die "no version in $block" unless $version;
+ if ($version eq $latest_versions{$channel}) {
+ print("$channel is up to date at $version\n");
+ } else {
+ print("updating $channel: $version -> $latest_versions{$channel}\n");
+ my ($url) = $block =~ /url\s*=\s*"([^"]+)"/;
+ # try to interpret some nix
+ my ($name) = $block =~ /name\s*=\s*"([^"]+)"/;
+ $name =~ s/\$\{version\}/$latest_versions{$channel}/;
+ $url =~ s/\$\{name\}/$name/;
+ $url =~ s/\$\{version\}/$latest_versions{$channel}/;
+ die "$url still has some interpolation" if $url =~ /\$/;
+ my ($sha256) = get("$url.sha256") =~ /^([0-9a-f]{64})/;
+ my $version_string = $latest_versions{$channel};
+ unless ( $sha256 ) {
+ my $full_version = $latest_versions{"full1_" . $channel};
+ $url =~ s/$version_string/$full_version/;
+ ($sha256) = get("$url.sha256") =~ /^([0-9a-f]{64})/;
+ $version_string = $full_version;
+ }
+ die "invalid sha256 in $url.sha256" unless $sha256;
+ my ($sha256Base32) = readpipe("nix-hash --type sha256 --to-base32 $sha256");
+ chomp $sha256Base32;
+ print "Jetbrains published SHA256: $sha256\n";
+ print "Conversion into base32 yields: $sha256Base32\n";
+ $block =~ s#version\s*=\s*"([^"]+)".+$#version = "$version_string"; /* updated by script */#m;
+ $block =~ s#sha256\s*=\s*"([^"]+)".+$#sha256 = "$sha256Base32"; /* updated by script */#m;
+ }
} else {
- print("updating $channel: $version -> $latest_versions{$channel}\n");
- my ($url) = $block =~ /url\s*=\s*"([^"]+)"/;
- # try to interpret some nix
- my ($name) = $block =~ /name\s*=\s*"([^"]+)"/;
- $name =~ s/\$\{version\}/$latest_versions{$channel}/;
- $url =~ s/\$\{name\}/$name/;
- $url =~ s/\$\{version\}/$latest_versions{$channel}/;
- die "$url still has some interpolation" if $url =~ /\$/;
-
- my ($sha256) = get("$url.sha256") =~ /^([0-9a-f]{64})/;
- die "invalid sha256 in $url.sha256" unless $sha256;
-
- $block =~ s#version\s*=\s*"([^"]+)".+$#version = "$latest_versions{$channel}"; /* updated by script */#m;
- $block =~ s#sha256\s*=\s*"([^"]+)".+$#sha256 = "$sha256"; /* updated by script */#m;
+ warn "unknown update-channel $channel";
}
}
return $block;
diff --git a/pkgs/applications/editors/jucipp/default.nix b/pkgs/applications/editors/jucipp/default.nix
index ae4f1e6ad5253cc26ceb4cd8d0050cf6d5ce5226..3d623d3f3bda0c0da5e637a7dd408abda735a260 100644
--- a/pkgs/applications/editors/jucipp/default.nix
+++ b/pkgs/applications/editors/jucipp/default.nix
@@ -1,7 +1,7 @@
{ config, stdenv, fetchgit, makeWrapper, gnome3, at_spi2_core, libcxx,
boost, epoxy, cmake, aspell, llvmPackages, libgit2, pkgconfig, pcre,
libXdmcp, libxkbcommon, libpthreadstubs, wrapGAppsHook, aspellDicts,
- coreutils, glibc, dbus_libs, openssl, libxml2, gnumake, binutils, ctags }:
+ coreutils, glibc, dbus_libs, openssl, libxml2, gnumake, ctags }:
with stdenv.lib;
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
postInstall = ''
mv $out/bin/juci $out/bin/.juci
makeWrapper "$out/bin/.juci" "$out/bin/juci" \
- --set PATH "${stdenv.lib.makeBinPath [ ctags coreutils llvmPackages.clang.cc cmake gnumake binutils llvmPackages.clang ]}" \
+ --set PATH "${stdenv.lib.makeBinPath [ ctags coreutils llvmPackages.clang.cc cmake gnumake llvmPackages.clang.bintools llvmPackages.clang ]}" \
--set NO_AT_BRIDGE 1 \
--set ASPELL_CONF "dict-dir ${aspellDicts.en}/lib/aspell"
'';
diff --git a/pkgs/applications/editors/jupp/default.nix b/pkgs/applications/editors/jupp/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..14fdcce1c8e583cf9476d8526bf61abf0fd45918
--- /dev/null
+++ b/pkgs/applications/editors/jupp/default.nix
@@ -0,0 +1,44 @@
+{ stdenv, fetchurl
+, ncurses, gpm
+}:
+
+stdenv.mkDerivation rec {
+
+ name = "jupp-${version}";
+ version = "3.1";
+ srcName = "joe-3.1jupp31";
+
+ src = fetchurl {
+ urls = [
+ "https://www.mirbsd.org/MirOS/dist/jupp/${srcName}.tgz"
+ "http://pub.allbsd.org/MirOS/dist/jupp/${srcName}.tgz" ];
+ sha256 = "1fnf9jsd6p4jyybkhjjs328qx38ywy8w029ngc7j7kqp0ixn0l0s";
+ };
+
+ preConfigure = "chmod +x ./configure";
+
+ buildInputs = [ ncurses gpm ];
+
+ configureFlags = [
+ "--enable-curses"
+ "--enable-termcap"
+ "--enable-termidx"
+ "--enable-getpwnam"
+ "--enable-largefile"
+ ];
+
+ meta = with stdenv.lib; {
+ description = "A portable fork of Joe's editor";
+ longDescription = ''
+ This is the portable version of JOE's Own Editor, which is currently
+ developed at sourceforge, licenced under the GNU General Public License,
+ Version 1, using autoconf/automake. This version has been enhanced by
+ several functions intended for programmers or other professional users,
+ and has a lot of bugs fixed. It is based upon an older version of joe
+ because these behave better overall.
+ '';
+ homepage = http://mirbsd.de/jupp;
+ license = licenses.gpl1;
+ maintainers = with maintainers; [ AndersonTorres ];
+ };
+}
diff --git a/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix b/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix
index c8aae34e6c48e7793e96f7e312f6fa3948feeb99..fac18c0b12943b78925888bb597ed2bbd2eb51f7 100644
--- a/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix
+++ b/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix
@@ -2,16 +2,15 @@
let
pname = "kdevelop-pg-qt";
- version = "2.0";
- dirVersion = "2.0.0";
+ version = "2.1.0";
in
stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchurl {
- url = "mirror://kde/stable/${pname}/${dirVersion}/src/${name}.tar.xz";
- sha256 = "2f778d324b7c0962e8bb5f62dd2643bac1a6f3ac971d145b6aace7cd61878993";
+ url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
+ sha256 = "20d84d25bd40610bd6c0964e4fe0642e56c41b76a65575122dc5196649621e5d";
};
nativeBuildInputs = [ cmake pkgconfig extra-cmake-modules ];
diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix
index bbd9be22074432130343eaf4f98e4d65fb03ecf6..1a164ec08de973a39e31abe1db9616d22730e77e 100644
--- a/pkgs/applications/editors/kdevelop5/kdevelop.nix
+++ b/pkgs/applications/editors/kdevelop5/kdevelop.nix
@@ -2,14 +2,14 @@
, qtquickcontrols, qtwebkit, qttools, kde-cli-tools
, kconfig, kdeclarative, kdoctools, kiconthemes, ki18n, kitemmodels, kitemviews
, kjobwidgets, kcmutils, kio, knewstuff, knotifyconfig, kparts, ktexteditor
-, threadweaver, kxmlgui, kwindowsystem, grantlee
+, threadweaver, kxmlgui, kwindowsystem, grantlee, kcrash, karchive, kguiaddons
, plasma-framework, krunner, kdevplatform, kdevelop-pg-qt, shared_mime_info
, libksysguard, konsole, llvmPackages, makeWrapper
}:
let
pname = "kdevelop";
- version = "5.1.1";
+ version = "5.1.2";
in
mkDerivation rec {
@@ -17,7 +17,7 @@ mkDerivation rec {
src = fetchurl {
url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
- sha256 = "0a01a4ffb2f01802cf4945521a3149a8f82c21fa8a97935991f1854b7db5d754";
+ sha256 = "af54e807847d145fe5f3eb55962ed0d22e6363c2bc6c32167e51ca4823c00ac7";
};
nativeBuildInputs = [
@@ -34,12 +34,12 @@ mkDerivation rec {
kconfig kdeclarative kdoctools kiconthemes ki18n kitemmodels kitemviews
kjobwidgets kcmutils kio knewstuff knotifyconfig kparts ktexteditor
threadweaver kxmlgui kwindowsystem grantlee plasma-framework krunner
- kdevplatform shared_mime_info libksysguard konsole
+ kdevplatform shared_mime_info libksysguard konsole kcrash karchive kguiaddons
];
postInstall = ''
# The kdevelop! script (shell environment) needs qdbus and kioclient5 in PATH.
- wrapProgram "$out/bin/kdevelop!" --prefix PATH ":" "${qttools}/bin:${kde-cli-tools}/bin"
+ wrapProgram "$out/bin/kdevelop!" --prefix PATH ":" "${lib.makeBinPath [ qttools kde-cli-tools ]}"
# Fix the (now wrapped) kdevelop! to find things in right places:
# - Make KDEV_BASEDIR point to bin directory of kdevplatform.
diff --git a/pkgs/applications/editors/kdevelop5/kdevplatform.nix b/pkgs/applications/editors/kdevelop5/kdevplatform.nix
index b7c0d0cf8554b63b348e5d2df4917d1c619f9790..78881b21018ccb244e0cf830ac8daf7cc71aab99 100644
--- a/pkgs/applications/editors/kdevelop5/kdevplatform.nix
+++ b/pkgs/applications/editors/kdevelop5/kdevplatform.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, cmake, gettext, pkgconfig, extra-cmake-modules
+{ stdenv, fetchurl, cmake, gettext, pkgconfig, extra-cmake-modules
, boost, subversion, apr, aprutil, kwindowsystem
, qtscript, qtwebkit, grantlee, karchive, kconfig, kcoreaddons, kguiaddons, kiconthemes, ki18n
, kitemmodels, kitemviews, kio, kparts, sonnet, kcmutils, knewstuff, knotifications
@@ -6,7 +6,7 @@
let
pname = "kdevplatform";
- version = "5.1.1";
+ version = "5.1.2";
in
stdenv.mkDerivation rec {
@@ -14,17 +14,9 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://kde/stable/kdevelop/${version}/src/${name}.tar.xz";
- sha256 = "3159440512b1373c1a4b35f401ba1f81217de9578372b45137af141eeda6e726";
+ sha256 = "e622ddad552a678baaf1166d5cbdc5fd1192d2324300c52ef2d25f1c6778664a";
};
- patches = [
- (fetchpatch {
- name = "kdevplatform-project-selection.patch";
- url = "https://cgit.kde.org/kdevplatform.git/patch/?id=da4c0fdfcf21dc2a8f48a2b1402213a32effd47a";
- sha256 = "16ws8l6dciy2civjnsaj03ml2bzvg4a9g7gd4iyx4hprw65zrcxm";
- })
- ];
-
nativeBuildInputs = [ cmake gettext pkgconfig extra-cmake-modules ];
buildInputs = [
diff --git a/pkgs/applications/editors/leafpad/default.nix b/pkgs/applications/editors/leafpad/default.nix
index 055816a798d34f9960aaad0c729d060ac678393f..dd3fb542da7c404ca4de4396b4541a2ed96eb45b 100644
--- a/pkgs/applications/editors/leafpad/default.nix
+++ b/pkgs/applications/editors/leafpad/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "0b0az2wvqgvam7w0ns1j8xp2llslm1rx6h7zcsy06a7j0yp257cm";
};
- buildInputs = [ intltool pkgconfig gtk2 ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ intltool gtk2 ];
hardeningDisable = [ "format" ];
diff --git a/pkgs/applications/editors/mg/default.nix b/pkgs/applications/editors/mg/default.nix
index b8bfd40c079ba2ea3ec26a763ba7c710d4ed3286..f4bdee830e199ffc79f6de19385c00878d58a292 100644
--- a/pkgs/applications/editors/mg/default.nix
+++ b/pkgs/applications/editors/mg/default.nix
@@ -1,33 +1,30 @@
-{ fetchurl, stdenv, ncurses, pkgconfig, libbsd }:
+{ stdenv, fetchurl, pkgconfig, libbsd, ncurses }:
+
stdenv.mkDerivation rec {
name = "mg-${version}";
- version = "20161005";
+ version = "20170828";
src = fetchurl {
url = "http://homepage.boetes.org/software/mg/${name}.tar.gz";
- sha256 = "0qaydk2cy765n9clghmi5gdnpwn15y2v0fj6r0jcm0v7d89vbz5p";
+ sha256 = "139nc58l5ifj3d3478nhqls0lic52skmxfxggznzxaz9camqd20z";
};
- NIX_CFLAGS_COMPILE = "-Wno-error";
-
- preConfigure = ''
- substituteInPlace GNUmakefile \
- --replace /usr/bin/pkg-config ${pkgconfig}/bin/pkg-config
- '';
+ enableParallelBuilding = true;
+
+ makeFlags = [ "PKG_CONFIG=${pkgconfig}/bin/pkg-config" ];
installPhase = ''
- mkdir -p $out/bin
- cp mg $out/bin
- mkdir -p $out/share/man/man1
- cp mg.1 $out/share/man/man1
+ install -m 555 -Dt $out/bin mg
+ install -m 444 -Dt $out/share/man/man1 mg.1
'';
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ ncurses libbsd ];
+
+ buildInputs = [ libbsd ncurses ];
meta = with stdenv.lib; {
- homepage = http://homepage.boetes.org/software/mg/;
description = "Micro GNU/emacs, a portable version of the mg maintained by the OpenBSD team";
+ homepage = "https://homepage.boetes.org/software/mg";
license = licenses.publicDomain;
platforms = platforms.all;
};
diff --git a/pkgs/applications/editors/moe/default.nix b/pkgs/applications/editors/moe/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..a1506eb9d6ccf3e0299992aa097dd79f4c4aaf72
--- /dev/null
+++ b/pkgs/applications/editors/moe/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl
+, lzip, ncurses
+}:
+
+with stdenv.lib;
+stdenv.mkDerivation rec {
+
+ name = "moe-${version}";
+ version = "1.9";
+
+ src = fetchurl {
+ url = "mirror://gnu/moe/${name}.tar.lz";
+ sha256 = "1wsfzy0iia0c89wnx1ilzw54wqcmlp2nz8mkpvc393z0zagrx48q";
+ };
+
+ nativeBuildInputs = [ lzip ];
+ buildInputs = [ ncurses ];
+
+ meta = {
+ description = "A small, 8-bit clean editor";
+ longDescription = ''
+ GNU moe is a powerful, 8-bit clean, console text editor for ISO-8859 and
+ ASCII character encodings. It has a modeless, user-friendly interface,
+ online help, multiple windows, unlimited undo/redo capability, unlimited
+ line length, unlimited buffers, global search/replace (on all buffers at
+ once), block operations, automatic indentation, word wrapping, file name
+ completion, directory browser, duplicate removal from prompt histories,
+ delimiter matching, text conversion from/to UTF-8, romanization, etc.
+ '';
+ homepage = http://www.gnu.org/software/moe/;
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ AndersonTorres ];
+ platforms = platforms.linux;
+ };
+}
+# TODO: a configurable, global moerc file
diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix
index 44c61d16ec8db7d25d7267837b89f6d892c7f492..53ea9741c03ca831b79c35ef779a08cee5adf10b 100644
--- a/pkgs/applications/editors/monodevelop/default.nix
+++ b/pkgs/applications/editors/monodevelop/default.nix
@@ -34,10 +34,10 @@ stdenv.mkDerivation rec {
patchFlags = [ "-p2" ];
patches = [ ./git-revert-12d610fb3f6dce121df538e36f21d8c2eeb0a6e3.patch ];
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- autoconf automake pkgconfig shared_mime_info intltool
+ autoconf automake shared_mime_info intltool
mono gtk-sharp-2_0 gnome-sharp unzip
- pkgconfig
dotnetPackages.NUnit
dotnetPackages.NUnitRunners
dotnetPackages.Nuget
diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix
index 3cb53a6116b681eb30d7ef81d13b29533211c5bb..441c157a34980bdd155f67d335a9129b409908f7 100644
--- a/pkgs/applications/editors/nano/default.nix
+++ b/pkgs/applications/editors/nano/default.nix
@@ -20,11 +20,11 @@ let
in stdenv.mkDerivation rec {
name = "nano-${version}";
- version = "2.8.6";
+ version = "2.8.7";
src = fetchurl {
url = "mirror://gnu/nano/${name}.tar.xz";
- sha256 = "0xjpm2ka56x5ycrgjh06v110na13xlbm42bs8qibk7g578m9cils";
+ sha256 = "0nhns59smd43mad2w6lnaxqnj4h6ifnlivi6cwydg646jm31gqzv";
};
nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext;
diff --git a/pkgs/applications/editors/nedit/default.nix b/pkgs/applications/editors/nedit/default.nix
index a15b557f0e57452f7a88f201e40d20d0a459744d..39d96775ebcd2e6b55f5a65daffdefffc00f8972 100644
--- a/pkgs/applications/editors/nedit/default.nix
+++ b/pkgs/applications/editors/nedit/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- homepage = http://sourceforge.net/projects/nedit;
+ homepage = https://sourceforge.net/projects/nedit;
platforms = with platforms; linux ++ darwin;
};
}
diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix
index ca915b3e6d1b315f9536d6d336748a0c8338a9cc..dafd4e6f1204fbc6fa793b57cbfbfb32b51678d7 100644
--- a/pkgs/applications/editors/neovim/default.nix
+++ b/pkgs/applications/editors/neovim/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, cmake, gettext, libmsgpack, libtermkey
-, libtool, libuv, luajit, luaPackages, ncurses, perl, pkgconfig
+, libtool, libuv, luajit, luajitPackages, luaPackages, ncurses, perl, pkgconfig
, unibilium, makeWrapper, vimUtils, xsel, gperf
, withPython ? true, pythonPackages, extraPythonPackages ? []
@@ -115,7 +115,7 @@ let
LUA_PATH = stdenv.lib.concatStringsSep ";" (map luaPackages.getLuaPath lualibs);
LUA_CPATH = stdenv.lib.concatStringsSep ";" (map luaPackages.getLuaCPath lualibs);
- lualibs = [ luaPackages.mpack luaPackages.lpeg luaPackages.luabitop ];
+ lualibs = [ luaPackages.mpack luaPackages.lpeg luajitPackages.lpeg luaPackages.luabitop ];
cmakeFlags = [
"-DLUA_PRG=${luaPackages.lua}/bin/lua"
diff --git a/pkgs/applications/editors/neovim/qt.nix b/pkgs/applications/editors/neovim/qt.nix
index e24ca50a02478c19cdc5a0919ee59d80a70d1633..48f7b29f407fc7cc236ef2796caf5aa8bdb13da3 100644
--- a/pkgs/applications/editors/neovim/qt.nix
+++ b/pkgs/applications/editors/neovim/qt.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "neovim-qt-${version}";
- version = "0.2.7";
+ version = "0.2.8";
src = fetchFromGitHub {
owner = "equalsraf";
repo = "neovim-qt";
rev = "v${version}";
- sha256 = "1bfni38l7cs0wbd9c6hgz2jfc8h3ixmg94izdvydm8j7amdz0cb6";
+ sha256 = "190yg6kkw953h8wajlqr2hvs2fz65y6z0blmywlg1nff724allaq";
};
cmakeFlags = [
@@ -17,14 +17,6 @@ stdenv.mkDerivation rec {
"-DMSGPACK_LIBRARIES=${libmsgpack}/lib/libmsgpackc.so"
];
- # The following tests FAILED:
- # 2 - tst_neovimconnector (Failed)
- # 3 - tst_callallmethods (Failed)
- # 4 - tst_encoding (Failed)
- #
- # Tests failed when upgraded to neovim 0.2.0
- doCheck = false;
-
buildInputs = with pythonPackages; [
neovim qtbase libmsgpack
] ++ (with pythonPackages; [
@@ -38,10 +30,18 @@ stdenv.mkDerivation rec {
preConfigure = ''
# avoid cmake trying to download libmsgpack
echo "" > third-party/CMakeLists.txt
- # we rip out the gui test as spawning a GUI fails in our build environment
- sed -i '/^add_xtest_gui/d' test/CMakeLists.txt
+ # we rip out a number of tests that fail in the build env
+ # the GUI tests will never work but the others should - they did before neovim 0.2.0
+ # was released
+ sed -i test/CMakeLists.txt \
+ -e '/^add_xtest_gui/d' \
+ -e '/tst_neovimconnector/d' \
+ -e '/tst_callallmethods/d' \
+ -e '/tst_encoding/d'
'';
+ doCheck = true;
+
postInstall = ''
wrapProgram "$out/bin/nvim-qt" \
--prefix PATH : "${neovim}/bin"
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Neovim client library and GUI, in Qt5";
- license = licenses.isc;
+ license = licenses.isc;
maintainers = with maintainers; [ peterhoeg ];
inherit (neovim.meta) platforms;
inherit version;
diff --git a/pkgs/applications/editors/notepadqq/default.nix b/pkgs/applications/editors/notepadqq/default.nix
index 9b3896e32d65540888960d531342809f0a9f9947..6d1bba8c4d5dd3d4d46df014e5be7cbad3152918 100644
--- a/pkgs/applications/editors/notepadqq/default.nix
+++ b/pkgs/applications/editors/notepadqq/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, fetchgit, pkgconfig, which, qtbase, qtsvg, qttools, qtwebkit }:
+{ stdenv, fetchgit, pkgconfig, which, qtbase, qtsvg, qttools, qtwebkit}:
let
- version = "0.53.0";
+ version = "1.2.0";
in stdenv.mkDerivation {
name = "notepadqq-${version}";
src = fetchgit {
url = "https://github.com/notepadqq/notepadqq.git";
- rev = "3b0751277fb268ec72b466b37d0f0977c536bc1b";
- sha256 = "0hw94mn2xg2r58afvz1xg990jinv9aa33942zgwq54qwj61r93hi";
+ rev = "ab074d30e02d49e0fe6957c1523e7fed239aff7d";
+ sha256 = "0j8vqsdw314qpk5lrgccm9n7gbyr14ac3s65sl1qn87pxhrz1hpg";
fetchSubmodules = true;
};
diff --git a/pkgs/applications/editors/rednotebook/default.nix b/pkgs/applications/editors/rednotebook/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..1a0e6e54fb3e7ff83a45377b6b39330f34fdf1a4
--- /dev/null
+++ b/pkgs/applications/editors/rednotebook/default.nix
@@ -0,0 +1,37 @@
+{ lib, buildPythonApplication, fetchFromGitHub
+, gdk_pixbuf, glib, gtk3, pango, webkitgtk
+, pygobject3, pyyaml
+}:
+
+buildPythonApplication rec {
+ name = "rednotebook-${version}";
+ version = "2.3";
+
+ src = fetchFromGitHub {
+ owner = "jendrikseipp";
+ repo = "rednotebook";
+ rev = "v${version}";
+ sha256 = "0zkfid104hcsf20r6829v11wxdghqkd3j1zbgyvd1s7q4nxjn5lj";
+ };
+
+ # We have not packaged tests.
+ doCheck = false;
+
+ propagatedBuildInputs = [
+ gdk_pixbuf glib gtk3 pango webkitgtk
+ pygobject3 pyyaml
+ ];
+
+ makeWrapperArgs = [
+ "--set GI_TYPELIB_PATH $GI_TYPELIB_PATH"
+ "--prefix XDG_DATA_DIRS : $out/share"
+ "--suffix XDG_DATA_DIRS : $XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+ ];
+
+ meta = with lib; {
+ homepage = http://rednotebook.sourceforge.net/;
+ description = "A modern journal that includes a calendar navigation, customizable templates, export functionality and word clouds";
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ orivej tstrobel ];
+ };
+}
diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix
index 9ac91e7086abe14e29123f9e13f681b6680b6cec..b508521790bf4f8662e3931c50986fb8a0ba14eb 100644
--- a/pkgs/applications/editors/rstudio/default.nix
+++ b/pkgs/applications/editors/rstudio/default.nix
@@ -1,25 +1,33 @@
-{ stdenv, fetchurl, makeDesktopItem, cmake, boost163, zlib, openssl,
-R, qt5, libuuid, hunspellDicts, unzip, ant, jdk, gnumake, makeWrapper, pandoc
+{ stdenv, fetchurl, fetchpatch, makeDesktopItem, cmake, boost, zlib, openssl
+, R, qtbase, qtwebkit, qtwebchannel, libuuid, hunspellDicts, unzip, ant, jdk
+, gnumake, makeWrapper, pandoc
}:
let
- version = "1.1.216";
+ version = "1.1.383";
ginVer = "1.5";
gwtVer = "2.7.0";
in
stdenv.mkDerivation rec {
name = "RStudio-${version}";
- buildInputs = [ cmake boost163 zlib openssl R qt5.full qt5.qtwebkit libuuid unzip ant jdk makeWrapper pandoc ];
- nativeBuildInputs = [ qt5.qmake ];
+ nativeBuildInputs = [ cmake unzip ant jdk makeWrapper pandoc ];
+
+ buildInputs = [ boost zlib openssl R qtbase qtwebkit qtwebchannel libuuid ];
src = fetchurl {
url = "https://github.com/rstudio/rstudio/archive/v${version}.tar.gz";
- sha256 = "07lp2ybvj7ippdrp7fv7j54dp0mm6k19j1vqdvjdk95acg3xgcjf";
+ sha256 = "06680l9amq03b4jarmzfr605bijhb79fip9rk464zab6hgwqbp3f";
};
# Hack RStudio to only use the input R.
- patches = [ ./r-location.patch ];
+ patches = [
+ ./r-location.patch
+ (fetchpatch {
+ url = https://aur.archlinux.org/cgit/aur.git/plain/socketproxy-openssl.patch?h=rstudio-desktop-git;
+ sha256 = "0ywq9rk14s5961l6hvd3cw70jsm73r16h0bsh4yp52vams7cwy9d";
+ })
+ ];
postPatch = "substituteInPlace src/cpp/core/r_util/REnvironmentPosix.cpp --replace '@R@' ${R}";
inherit ginVer;
@@ -91,7 +99,9 @@ stdenv.mkDerivation rec {
cp ${pandoc}/bin/pandoc dependencies/common/pandoc/
'';
- cmakeFlags = [ "-DRSTUDIO_TARGET=Desktop" "-DQT_QMAKE_EXECUTABLE=${qt5.qmake}/bin/qmake" ];
+ enableParallelBuilding = true;
+
+ cmakeFlags = [ "-DRSTUDIO_TARGET=Desktop" "-DQT_QMAKE_EXECUTABLE=$NIX_QT5_TMP/bin/qmake" ];
desktopItem = makeDesktopItem {
name = name;
@@ -116,7 +126,7 @@ stdenv.mkDerivation rec {
{ description = "Set of integrated tools for the R language";
homepage = http://www.rstudio.com/;
license = licenses.agpl3;
- maintainers = [ maintainers.ehmry maintainers.changlinli ];
+ maintainers = with maintainers; [ ehmry changlinli ciil ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/editors/sublime3/default.nix b/pkgs/applications/editors/sublime3/default.nix
index c295313621e37ad11bbf737c2b8ebfd2973c102d..1ec24325460ae109f8bac3036aa737a3a9d3d1c5 100644
--- a/pkgs/applications/editors/sublime3/default.nix
+++ b/pkgs/applications/editors/sublime3/default.nix
@@ -6,7 +6,7 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
assert gksuSupport -> gksu != null;
let
- build = "3126";
+ build = "3143";
libPath = stdenv.lib.makeLibraryPath [glib xorg.libX11 gtk2 cairo pango];
redirects = [ "/usr/bin/pkexec=${pkexecPath}" ]
++ stdenv.lib.optional gksuSupport "/usr/bin/gksudo=${gksu}/bin/gksudo";
@@ -20,13 +20,13 @@ in let
fetchurl {
name = "sublimetext-${build}.tar.bz2";
url = "https://download.sublimetext.com/sublime_text_3_build_${build}_x32.tar.bz2";
- sha256 = "0acff4wj1s61x3xszdd93lkhaqa26lb7ryqdxnbphxzhf2jfzzwj";
+ sha256 = "0dgpx4wij2m77f478p746qadavab172166bghxmj7fb61nvw9v5i";
}
else
fetchurl {
name = "sublimetext-${build}.tar.bz2";
url = "https://download.sublimetext.com/sublime_text_3_build_${build}_x64.tar.bz2";
- sha256 = "0ykj33fq86iv7f9zx76h90pl9y86iri0idhlj09a6prhk8p17nqq";
+ sha256 = "06b554d2cvpxc976rvh89ix3kqc7klnngvk070xrs8wbyb221qcw";
};
dontStrip = true;
diff --git a/pkgs/applications/editors/supertux-editor/default.nix b/pkgs/applications/editors/supertux-editor/default.nix
index a9f236a57ae7b755d29ba114c6d17eed5c2259ec..a6d624d4b1ec282d71ab26ed605db728f54eed22 100644
--- a/pkgs/applications/editors/supertux-editor/default.nix
+++ b/pkgs/applications/editors/supertux-editor/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "08y5haclgxvcii3hpdvn1ah8qd0f3n8xgxxs8zryj02b8n7cz3vx";
};
- buildInputs = [mono gtk-sharp-2_0 pkgconfig makeWrapper gnome2.libglade gtk2 ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [mono gtk-sharp-2_0 makeWrapper gnome2.libglade gtk2 ];
installPhase = ''
mkdir -p $out/bin $out/lib/supertux-editor
diff --git a/pkgs/applications/editors/tecoc/default.nix b/pkgs/applications/editors/tecoc/default.nix
index a3f58012e534bf39406a8bb6d8decce4346a96d0..1c5730838ff1f3d805aed104308a8abe4fb9a969 100644
--- a/pkgs/applications/editors/tecoc/default.nix
+++ b/pkgs/applications/editors/tecoc/default.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
'';
homepage = https://github.com/blakemcbride/TECOC;
maintainers = [ maintainers.AndersonTorres ];
- platforms = platforms.unix;
+ platforms = platforms.linux;
};
}
# TODO: test in other platforms - especially Darwin
diff --git a/pkgs/applications/editors/textadept/default.nix b/pkgs/applications/editors/textadept/default.nix
index d1fa03c54796f5b7a1c6de6e1589513bc7e833c7..4f1a29278be927f334ffcb946adcbbf301d25f20 100644
--- a/pkgs/applications/editors/textadept/default.nix
+++ b/pkgs/applications/editors/textadept/default.nix
@@ -32,7 +32,7 @@ let
build_dir=$PWD
cd $TMPDIR
- local_path=$(basename ${store_path} .zip | sed -e 's/^[a-z0-9]*-//')
+ local_path=$(basename ${url} .zip)
cp -r ${store_path} $local_path
chmod u+rwX -R $local_path
@@ -112,8 +112,9 @@ stdenv.mkDerivation rec {
version = "9.3";
name = "textadept-${version}";
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- gtk2 glib pkgconfig unzip ncurses zip
+ gtk2 glib unzip ncurses zip
];
src = fetchhg {
diff --git a/pkgs/applications/editors/texworks/default.nix b/pkgs/applications/editors/texworks/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..fe90250d415276a90530d3bb23b6ffc3282fcbb3
--- /dev/null
+++ b/pkgs/applications/editors/texworks/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig
+, qt5, libsForQt5, hunspell
+, withLua ? true, lua
+, withPython ? true, python }:
+
+stdenv.mkDerivation rec {
+ name = "texworks-${version}";
+ version = "0.6.2";
+
+ src = fetchFromGitHub {
+ owner = "TeXworks";
+ repo = "texworks";
+ rev = "release-${version}";
+ sha256 = "0kj4pq5h4vs2wwg6cazxjlv83x6cwdfsa76winfkdddaqzpdklsj";
+ };
+
+ nativeBuildInputs = [ cmake pkgconfig ];
+ buildInputs = [ qt5.qtscript libsForQt5.poppler hunspell lua python ]
+ ++ lib.optional withLua lua
+ ++ lib.optional withPython python;
+
+ cmakeFlags = lib.optional withLua "-DWITH_LUA=ON"
+ ++ lib.optional withPython "-DWITH_PYTHON=ON";
+
+ meta = with stdenv.lib; {
+ description = "Simple TeX front-end program inspired by TeXShop";
+ homepage = http://www.tug.org/texworks/;
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ dotlambda ];
+ platforms = with platforms; linux;
+ };
+}
diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix
index 7e8a85cf48a65dea0db5165441353e4418d5e5bb..d1c0ab274f061d006bb108d0f189979c70ee9914 100644
--- a/pkgs/applications/editors/tiled/default.nix
+++ b/pkgs/applications/editors/tiled/default.nix
@@ -5,13 +5,13 @@ let
# qtEnv = with qt5; env "qt-${qtbase.version}" [ qtbase qttools ];
in stdenv.mkDerivation rec {
name = "tiled-${version}";
- version = "1.0.1";
+ version = "1.0.3";
src = fetchFromGitHub {
owner = "bjorn";
repo = "tiled";
rev = "v${version}";
- sha256 = "062ja3j84v5s4qslp01gqif8c6i1klkkxpxyyrrvjhxmbyn6nmgd";
+ sha256 = "1j8307h7xkxqwr8rpr9fn1svm5h10k61w6zxr4sgph1hiv8x33aa";
};
nativeBuildInputs = [ pkgconfig qmake ];
diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix
index 0733bd796656ca1c54f47342067d75ffb3de72f4..b20a6e5ec45ce6c42318196dea69e935c9b32471 100644
--- a/pkgs/applications/editors/typora/default.nix
+++ b/pkgs/applications/editors/typora/default.nix
@@ -3,18 +3,18 @@
stdenv.mkDerivation rec {
name = "typora-${version}";
- version = "0.9.31";
+ version = "0.9.38";
src =
if stdenv.system == "x86_64-linux" then
fetchurl {
url = "https://www.typora.io/linux/typora_${version}_amd64.deb";
- sha256 = "786b5164d9c63ecc23eb427c5ff393285ce8fd540c5bfdd5c1464655fac87a42";
+ sha256 = "bf6a069c5da4a7dc289bdb3c8d27e7a81daeaee99488d4d3b512c6b673780557";
}
else
fetchurl {
url = "https://www.typora.io/linux/typora_${version}_i386.deb";
- sha256 = "a8fe53f8984d9f8c4e06c14affbb616be58a91cd2b475b9681fb18a6e21930d1";
+ sha256 = "edd092e96ebf69503cf6b39b77a61ec5e3185f8a1447da0bed063fa11861c1b9";
}
;
@@ -57,8 +57,10 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out
dpkg -x $src $out
- cp -av $out/usr/* $out
+ mv $out/usr/bin $out
+ mv $out/usr/share $out
rm $out/bin/typora
+ rmdir $out/usr
# Otherwise it looks "suspicious"
chmod -R g-w $out
@@ -81,9 +83,8 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A minimal Markdown reading & writing app";
homepage = https://typora.io;
- license = licenses.free;
- maintainers = with stdenv.lib.maintainers; [ jensbin ];
+ license = licenses.unfree;
+ maintainers = with maintainers; [ jensbin ];
platforms = [ "x86_64-linux" "i686-linux" ];
};
}
-
diff --git a/pkgs/applications/editors/vanubi/default.nix b/pkgs/applications/editors/vanubi/default.nix
index 876bd145b725f8eb1ba2a32231b473a3717673ee..273ef33250fc0e496a3cd926da28841d6c10d4d7 100644
--- a/pkgs/applications/editors/vanubi/default.nix
+++ b/pkgs/applications/editors/vanubi/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "145zxgaky5bcq5bxm4z7h0pvviq7k1nrgnf40q6nax6ik616ybjq";
};
- buildInputs = [ pkgconfig vala_0_26 which autoconf automake
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ vala_0_26 which autoconf automake
libtool glib gtk3 libwnck3 asciidoc
gnome3.gtksourceview gnome3.vte_290 python3Packages.pygments ];
diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix
index 1d661014c772a9fe51653b7302ae541822f56fb1..417f2d805163d600c4a6365a274f29869bae0b07 100644
--- a/pkgs/applications/editors/vim/common.nix
+++ b/pkgs/applications/editors/vim/common.nix
@@ -1,12 +1,12 @@
{ lib, fetchFromGitHub }:
rec {
- version = "8.0.0442";
+ version = "8.0.1257";
src = fetchFromGitHub {
owner = "vim";
repo = "vim";
rev = "v${version}";
- sha256 = "1pyyrkb7k5vhm1ijrh4v2f50lxhrgga5mm0gvmz4v704z0h585yg";
+ sha256 = "1y4c7wn5gr7n4c2ni36kadr26aldydxlf06yj7nsmw22ywwg78ig";
};
enableParallelBuilding = true;
diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix
index 4eefb207fd756c661ac6bae2d38bd2bae1dd932d..2f110749277cc43a04f0eea36b53079885365647 100644
--- a/pkgs/applications/editors/vim/default.nix
+++ b/pkgs/applications/editors/vim/default.nix
@@ -18,9 +18,9 @@ stdenv.mkDerivation rec {
inherit (common) version src postPatch hardeningDisable enableParallelBuilding meta;
- buildInputs = [ ncurses pkgconfig ]
+ nativeBuildInputs = [ gettext pkgconfig ];
+ buildInputs = [ ncurses ]
++ stdenv.lib.optionals hostPlatform.isDarwin [ Carbon Cocoa ];
- nativeBuildInputs = [ gettext ];
configureFlags = [
"--enable-multibyte"
diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix
index bb265e90b77008c34deab28e722cbe6cf3fbd2d2..144fb5428a51ed4a012a133a9a964158bbf828d1 100644
--- a/pkgs/applications/editors/vim/macvim.nix
+++ b/pkgs/applications/editors/vim/macvim.nix
@@ -17,8 +17,9 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- gettext ncurses pkgconfig luajit ruby tcl perl python
+ gettext ncurses luajit ruby tcl perl python
];
patches = [ ./macvim.patch ];
diff --git a/pkgs/applications/editors/vscode-with-extensions/default.nix b/pkgs/applications/editors/vscode-with-extensions/default.nix
index 983acbbac197887f7cd9f99a1e2271440a7ec0be..c54c8a4277f1ecc584eaaccf330586ac132055d9 100644
--- a/pkgs/applications/editors/vscode-with-extensions/default.nix
+++ b/pkgs/applications/editors/vscode-with-extensions/default.nix
@@ -2,7 +2,7 @@
, vscodeExtensions ? [] }:
/*
- `vsixExtensions`
+ `vscodeExtensions`
: A set of vscode extensions to be installed alongside the editor. Here's a an
example:
@@ -10,12 +10,12 @@
vscode-with-extensions.override {
# When the extension is already available in the default extensions set.
- vscodeExtensions = with vscodeExtensions; [
- nix
+ vscodeExtensions = with vscode-extensions; [
+ bbenoist.Nix
]
# Concise version from the vscode market place when not available in the default set.
- ++ vscodeUtils.extensionsFromVscodeMarketplace [
+ ++ vscode-utils.extensionsFromVscodeMarketplace [
{
name = "code-runner";
publisher = "formulahendry";
diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix
index 5db2a1aaece4b1d1596397885ff0f7a94c488f5b..23bcdae5fb21b22258154a66fcf899f4c06453fd 100644
--- a/pkgs/applications/editors/vscode/default.nix
+++ b/pkgs/applications/editors/vscode/default.nix
@@ -1,8 +1,8 @@
{ stdenv, lib, callPackage, fetchurl, unzip, atomEnv, makeDesktopItem,
- makeWrapper, libXScrnSaver, libxkbfile }:
+ makeWrapper, libXScrnSaver, libxkbfile, libsecret }:
let
- version = "1.15.1";
+ version = "1.17.2";
channel = "stable";
plat = {
@@ -12,15 +12,16 @@ let
}.${stdenv.system};
sha256 = {
- "i686-linux" = "09vvq02bsq6fdb0ibshn97kll43dpfmyq2dahl9gj02jlwardq27";
- "x86_64-linux" = "1kg25i4kavmgivnk4w3dsbsnn9vncl5d2m0ds93f8qvmxpizwg21";
- "x86_64-darwin" = "1fgjg7c9appp8v0ir7m2r3a3x4z0gx4na0p3d8j1x4pcs0kqy0qp";
+ "i686-linux" = "04mnj74pqkgfgdacq4643qrd7ybka1366lr7mwn0f70lk05wb2h2";
+ "x86_64-linux" = "0y37wwvq6flaa2fh2r6b9cplbcszq726zrx6b8slzq6s5wl2lgmr";
+ "x86_64-darwin" = "1cqyir7ijwafy68d5vbw47cs1x2lqs1wjnvhhw15yi2d7c14fq7q";
}.${stdenv.system};
archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz";
rpath = lib.concatStringsSep ":" [
atomEnv.libPath
+ "${lib.makeLibraryPath [libsecret]}/libsecret-1.so.0"
"${lib.makeLibraryPath [libXScrnSaver]}/libXss.so.1"
"${lib.makeLibraryPath [libxkbfile]}/libxkbfile.so.1"
"$out/lib/vscode"
@@ -47,8 +48,8 @@ in
};
buildInputs = if stdenv.system == "x86_64-darwin"
- then [ unzip makeWrapper libXScrnSaver ]
- else [ makeWrapper libXScrnSaver libxkbfile ];
+ then [ unzip makeWrapper libXScrnSaver libsecret ]
+ else [ makeWrapper libXScrnSaver libxkbfile libsecret ];
installPhase =
if stdenv.system == "x86_64-darwin" then ''
@@ -58,6 +59,9 @@ in
'' else ''
mkdir -p $out/lib/vscode $out/bin
cp -r ./* $out/lib/vscode
+
+ substituteInPlace $out/lib/vscode/bin/code --replace '"$CLI" "$@"' '"$CLI" "--skip-getting-started" "$@"'
+
ln -s $out/lib/vscode/bin/code $out/bin
mkdir -p $out/share/applications
@@ -72,6 +76,12 @@ in
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "${rpath}" \
$out/lib/vscode/code
+
+ patchelf \
+ --set-rpath "${rpath}" \
+ $out/lib/vscode/resources/app/node_modules/keytar/build/Release/keytar.node
+
+ ln -s ${lib.makeLibraryPath [libsecret]}/libsecret-1.so.0 $out/lib/vscode/libsecret-1.so.0
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/editors/zed/default.nix b/pkgs/applications/editors/zed/default.nix
index 0170319871f063e32f7aaee6b9fe8052636bf536..bcf262957bc5216e97784ab041ff9139722f342c 100644
--- a/pkgs/applications/editors/zed/default.nix
+++ b/pkgs/applications/editors/zed/default.nix
@@ -5,22 +5,16 @@ let
name = "zed-${version}";
version = "1.1.0";
- # When upgrading node.nix / node packages:
- # fetch package.json from Zed's repository
- # run `npm2nix package.json node.nix`
- # and replace node.nix with new one
- nodePackages = import ../../../../pkgs/top-level/node-packages.nix {
+ nodePackages = import ./node.nix {
inherit pkgs;
- inherit (pkgs) stdenv nodejs fetchurl fetchgit;
- neededNatives = [ pkgs.python ] ++ pkgs.lib.optional pkgs.stdenv.isLinux pkgs.utillinux;
- self = nodePackages;
- generated = ./node.nix;
+ system = stdenv.system;
};
node_env = buildEnv {
name = "node_env";
- paths = [ nodePackages."body-parser" nodePackages.express
- nodePackages.request nodePackages.tar nodePackages.ws ];
+ paths = [ nodePackages."body-parser-~1.6.3" nodePackages."express-~4.8.3"
+ nodePackages."request-~2.34.0" nodePackages."tar-~0.1.19"
+ nodePackages."ws-~0.4.32" ];
pathsToLink = [ "/lib" ];
ignoreCollisions = true;
};
@@ -78,11 +72,11 @@ in stdenv.mkDerivation rec {
ln -s ${zed_script} $out/bin/zed
'';
- meta = {
+ meta = with stdenv.lib; {
description = "A fully offline-capable, open source, keyboard-focused, text and code editor for power users";
- license = stdenv.lib.licenses.mit;
+ license = licenses.mit;
homepage = http://zedapp.org/;
- maintainers = [ stdenv.lib.maintainers.matejc ];
- platforms = stdenv.lib.platforms.linux;
+ maintainers = with maintainers; [ matejc ma27 ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/editors/zed/deps.json b/pkgs/applications/editors/zed/deps.json
new file mode 100644
index 0000000000000000000000000000000000000000..d3a7708d156f3cc432f400c7506f840bb1da9d8d
--- /dev/null
+++ b/pkgs/applications/editors/zed/deps.json
@@ -0,0 +1,6 @@
+[ { "body-parser": "~1.6.3" }
+, { "express": "~4.8.3" }
+, { "request": "~2.34.0" }
+, { "tar": "~0.1.19" }
+, { "ws": "~0.4.32" }
+]
diff --git a/pkgs/applications/editors/zed/deps.sh b/pkgs/applications/editors/zed/deps.sh
new file mode 100755
index 0000000000000000000000000000000000000000..6d2bf29532e9dfa19074e62ab05cd6e8869f70f3
--- /dev/null
+++ b/pkgs/applications/editors/zed/deps.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env nix-shell
+#! nix-shell -i bash -p nodePackages.node2nix
+
+node2nix -6 -i deps.json \
+ -e ../../../development/node-packages/node-env.nix \
+ --no-copy-node-env \
+ -c node.nix
diff --git a/pkgs/applications/editors/zed/node-packages.nix b/pkgs/applications/editors/zed/node-packages.nix
new file mode 100644
index 0000000000000000000000000000000000000000..5aaa75b6c914898f0cd049b0dce9cf7a3a4e527e
--- /dev/null
+++ b/pkgs/applications/editors/zed/node-packages.nix
@@ -0,0 +1,877 @@
+# This file has been generated by node2nix 1.3.0. Do not edit!
+
+{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}:
+
+let
+ sources = {
+ "bytes-1.0.0" = {
+ name = "bytes";
+ packageName = "bytes";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz";
+ sha1 = "3569ede8ba34315fab99c3e92cb04c7220de1fa8";
+ };
+ };
+ "depd-0.4.4" = {
+ name = "depd";
+ packageName = "depd";
+ version = "0.4.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/depd/-/depd-0.4.4.tgz";
+ sha1 = "07091fae75f97828d89b4a02a2d4778f0e7c0662";
+ };
+ };
+ "iconv-lite-0.4.4" = {
+ name = "iconv-lite";
+ packageName = "iconv-lite";
+ version = "0.4.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.4.tgz";
+ sha1 = "e95f2e41db0735fc21652f7827a5ee32e63c83a8";
+ };
+ };
+ "media-typer-0.2.0" = {
+ name = "media-typer";
+ packageName = "media-typer";
+ version = "0.2.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/media-typer/-/media-typer-0.2.0.tgz";
+ sha1 = "d8a065213adfeaa2e76321a2b6dda36ff6335984";
+ };
+ };
+ "on-finished-2.1.0" = {
+ name = "on-finished";
+ packageName = "on-finished";
+ version = "2.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/on-finished/-/on-finished-2.1.0.tgz";
+ sha1 = "0c539f09291e8ffadde0c8a25850fb2cedc7022d";
+ };
+ };
+ "qs-2.2.2" = {
+ name = "qs";
+ packageName = "qs";
+ version = "2.2.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/qs/-/qs-2.2.2.tgz";
+ sha1 = "dfe783f1854b1ac2b3ade92775ad03e27e03218c";
+ };
+ };
+ "raw-body-1.3.0" = {
+ name = "raw-body";
+ packageName = "raw-body";
+ version = "1.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/raw-body/-/raw-body-1.3.0.tgz";
+ sha1 = "978230a156a5548f42eef14de22d0f4f610083d1";
+ };
+ };
+ "type-is-1.3.2" = {
+ name = "type-is";
+ packageName = "type-is";
+ version = "1.3.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/type-is/-/type-is-1.3.2.tgz";
+ sha1 = "4f2a5dc58775ca1630250afc7186f8b36309d1bb";
+ };
+ };
+ "ee-first-1.0.5" = {
+ name = "ee-first";
+ packageName = "ee-first";
+ version = "1.0.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ee-first/-/ee-first-1.0.5.tgz";
+ sha1 = "8c9b212898d8cd9f1a9436650ce7be202c9e9ff0";
+ };
+ };
+ "mime-types-1.0.2" = {
+ name = "mime-types";
+ packageName = "mime-types";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz";
+ sha1 = "995ae1392ab8affcbfcb2641dd054e943c0d5dce";
+ };
+ };
+ "accepts-1.0.7" = {
+ name = "accepts";
+ packageName = "accepts";
+ version = "1.0.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/accepts/-/accepts-1.0.7.tgz";
+ sha1 = "5b501fb4f0704309964ccdb048172541208dab1a";
+ };
+ };
+ "buffer-crc32-0.2.3" = {
+ name = "buffer-crc32";
+ packageName = "buffer-crc32";
+ version = "0.2.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.3.tgz";
+ sha1 = "bb54519e95d107cbd2400e76d0cab1467336d921";
+ };
+ };
+ "debug-1.0.4" = {
+ name = "debug";
+ packageName = "debug";
+ version = "1.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz";
+ sha1 = "5b9c256bd54b6ec02283176fa8a0ede6d154cbf8";
+ };
+ };
+ "escape-html-1.0.1" = {
+ name = "escape-html";
+ packageName = "escape-html";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz";
+ sha1 = "181a286ead397a39a92857cfb1d43052e356bff0";
+ };
+ };
+ "finalhandler-0.1.0" = {
+ name = "finalhandler";
+ packageName = "finalhandler";
+ version = "0.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.1.0.tgz";
+ sha1 = "da05bbc4f5f4a30c84ce1d91f3c154007c4e9daa";
+ };
+ };
+ "methods-1.1.0" = {
+ name = "methods";
+ packageName = "methods";
+ version = "1.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/methods/-/methods-1.1.0.tgz";
+ sha1 = "5dca4ee12df52ff3b056145986a8f01cbc86436f";
+ };
+ };
+ "parseurl-1.3.2" = {
+ name = "parseurl";
+ packageName = "parseurl";
+ version = "1.3.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz";
+ sha1 = "fc289d4ed8993119460c156253262cdc8de65bf3";
+ };
+ };
+ "path-to-regexp-0.1.3" = {
+ name = "path-to-regexp";
+ packageName = "path-to-regexp";
+ version = "0.1.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.3.tgz";
+ sha1 = "21b9ab82274279de25b156ea08fd12ca51b8aecb";
+ };
+ };
+ "proxy-addr-1.0.1" = {
+ name = "proxy-addr";
+ packageName = "proxy-addr";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.1.tgz";
+ sha1 = "c7c566d5eb4e3fad67eeb9c77c5558ccc39b88a8";
+ };
+ };
+ "range-parser-1.0.0" = {
+ name = "range-parser";
+ packageName = "range-parser";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/range-parser/-/range-parser-1.0.0.tgz";
+ sha1 = "a4b264cfe0be5ce36abe3765ac9c2a248746dbc0";
+ };
+ };
+ "send-0.8.5" = {
+ name = "send";
+ packageName = "send";
+ version = "0.8.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/send/-/send-0.8.5.tgz";
+ sha1 = "37f708216e6f50c175e74c69fec53484e2fd82c7";
+ };
+ };
+ "serve-static-1.5.4" = {
+ name = "serve-static";
+ packageName = "serve-static";
+ version = "1.5.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/serve-static/-/serve-static-1.5.4.tgz";
+ sha1 = "819fb37ae46bd02dd520b77fcf7fd8f5112f9782";
+ };
+ };
+ "vary-0.1.0" = {
+ name = "vary";
+ packageName = "vary";
+ version = "0.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/vary/-/vary-0.1.0.tgz";
+ sha1 = "df0945899e93c0cc5bd18cc8321d9d21e74f6176";
+ };
+ };
+ "cookie-0.1.2" = {
+ name = "cookie";
+ packageName = "cookie";
+ version = "0.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/cookie/-/cookie-0.1.2.tgz";
+ sha1 = "72fec3d24e48a3432073d90c12642005061004b1";
+ };
+ };
+ "fresh-0.2.2" = {
+ name = "fresh";
+ packageName = "fresh";
+ version = "0.2.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/fresh/-/fresh-0.2.2.tgz";
+ sha1 = "9731dcf5678c7faeb44fb903c4f72df55187fa77";
+ };
+ };
+ "cookie-signature-1.0.4" = {
+ name = "cookie-signature";
+ packageName = "cookie-signature";
+ version = "1.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.4.tgz";
+ sha1 = "0edd22286e3a111b9a2a70db363e925e867f6aca";
+ };
+ };
+ "merge-descriptors-0.0.2" = {
+ name = "merge-descriptors";
+ packageName = "merge-descriptors";
+ version = "0.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-0.0.2.tgz";
+ sha1 = "c36a52a781437513c57275f39dd9d317514ac8c7";
+ };
+ };
+ "utils-merge-1.0.0" = {
+ name = "utils-merge";
+ packageName = "utils-merge";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz";
+ sha1 = "0294fb922bb9375153541c4f7096231f287c8af8";
+ };
+ };
+ "negotiator-0.4.7" = {
+ name = "negotiator";
+ packageName = "negotiator";
+ version = "0.4.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/negotiator/-/negotiator-0.4.7.tgz";
+ sha1 = "a4160f7177ec806738631d0d3052325da42abdc8";
+ };
+ };
+ "ms-0.6.2" = {
+ name = "ms";
+ packageName = "ms";
+ version = "0.6.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz";
+ sha1 = "d89c2124c6fdc1353d65a8b77bf1aac4b193708c";
+ };
+ };
+ "ipaddr.js-0.1.2" = {
+ name = "ipaddr.js";
+ packageName = "ipaddr.js";
+ version = "0.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-0.1.2.tgz";
+ sha1 = "6a1fd3d854f5002965c34d7bbcd9b4a8d4b0467e";
+ };
+ };
+ "destroy-1.0.3" = {
+ name = "destroy";
+ packageName = "destroy";
+ version = "1.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz";
+ sha1 = "b433b4724e71fd8551d9885174851c5fc377e2c9";
+ };
+ };
+ "mime-1.2.11" = {
+ name = "mime";
+ packageName = "mime";
+ version = "1.2.11";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz";
+ sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10";
+ };
+ };
+ "qs-0.6.6" = {
+ name = "qs";
+ packageName = "qs";
+ version = "0.6.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/qs/-/qs-0.6.6.tgz";
+ sha1 = "6e015098ff51968b8a3c819001d5f2c89bc4b107";
+ };
+ };
+ "json-stringify-safe-5.0.1" = {
+ name = "json-stringify-safe";
+ packageName = "json-stringify-safe";
+ version = "5.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz";
+ sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
+ };
+ };
+ "forever-agent-0.5.2" = {
+ name = "forever-agent";
+ packageName = "forever-agent";
+ version = "0.5.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz";
+ sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130";
+ };
+ };
+ "node-uuid-1.4.8" = {
+ name = "node-uuid";
+ packageName = "node-uuid";
+ version = "1.4.8";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz";
+ sha1 = "b040eb0923968afabf8d32fb1f17f1167fdab907";
+ };
+ };
+ "tough-cookie-2.3.3" = {
+ name = "tough-cookie";
+ packageName = "tough-cookie";
+ version = "2.3.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz";
+ sha1 = "0b618a5565b6dea90bf3425d04d55edc475a7561";
+ };
+ };
+ "form-data-0.1.4" = {
+ name = "form-data";
+ packageName = "form-data";
+ version = "0.1.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz";
+ sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12";
+ };
+ };
+ "tunnel-agent-0.3.0" = {
+ name = "tunnel-agent";
+ packageName = "tunnel-agent";
+ version = "0.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.3.0.tgz";
+ sha1 = "ad681b68f5321ad2827c4cfb1b7d5df2cfe942ee";
+ };
+ };
+ "http-signature-0.10.1" = {
+ name = "http-signature";
+ packageName = "http-signature";
+ version = "0.10.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz";
+ sha1 = "4fbdac132559aa8323121e540779c0a012b27e66";
+ };
+ };
+ "oauth-sign-0.3.0" = {
+ name = "oauth-sign";
+ packageName = "oauth-sign";
+ version = "0.3.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz";
+ sha1 = "cb540f93bb2b22a7d5941691a288d60e8ea9386e";
+ };
+ };
+ "hawk-1.0.0" = {
+ name = "hawk";
+ packageName = "hawk";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz";
+ sha1 = "b90bb169807285411da7ffcb8dd2598502d3b52d";
+ };
+ };
+ "aws-sign2-0.5.0" = {
+ name = "aws-sign2";
+ packageName = "aws-sign2";
+ version = "0.5.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz";
+ sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63";
+ };
+ };
+ "punycode-1.4.1" = {
+ name = "punycode";
+ packageName = "punycode";
+ version = "1.4.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz";
+ sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e";
+ };
+ };
+ "combined-stream-0.0.7" = {
+ name = "combined-stream";
+ packageName = "combined-stream";
+ version = "0.0.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz";
+ sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f";
+ };
+ };
+ "async-0.9.2" = {
+ name = "async";
+ packageName = "async";
+ version = "0.9.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/async/-/async-0.9.2.tgz";
+ sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d";
+ };
+ };
+ "delayed-stream-0.0.5" = {
+ name = "delayed-stream";
+ packageName = "delayed-stream";
+ version = "0.0.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz";
+ sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f";
+ };
+ };
+ "assert-plus-0.1.5" = {
+ name = "assert-plus";
+ packageName = "assert-plus";
+ version = "0.1.5";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz";
+ sha1 = "ee74009413002d84cec7219c6ac811812e723160";
+ };
+ };
+ "asn1-0.1.11" = {
+ name = "asn1";
+ packageName = "asn1";
+ version = "0.1.11";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz";
+ sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7";
+ };
+ };
+ "ctype-0.5.3" = {
+ name = "ctype";
+ packageName = "ctype";
+ version = "0.5.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz";
+ sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f";
+ };
+ };
+ "hoek-0.9.1" = {
+ name = "hoek";
+ packageName = "hoek";
+ version = "0.9.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz";
+ sha1 = "3d322462badf07716ea7eb85baf88079cddce505";
+ };
+ };
+ "boom-0.4.2" = {
+ name = "boom";
+ packageName = "boom";
+ version = "0.4.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz";
+ sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b";
+ };
+ };
+ "cryptiles-0.2.2" = {
+ name = "cryptiles";
+ packageName = "cryptiles";
+ version = "0.2.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz";
+ sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c";
+ };
+ };
+ "sntp-0.2.4" = {
+ name = "sntp";
+ packageName = "sntp";
+ version = "0.2.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz";
+ sha1 = "fb885f18b0f3aad189f824862536bceeec750900";
+ };
+ };
+ "block-stream-0.0.9" = {
+ name = "block-stream";
+ packageName = "block-stream";
+ version = "0.0.9";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz";
+ sha1 = "13ebfe778a03205cfe03751481ebb4b3300c126a";
+ };
+ };
+ "fstream-0.1.31" = {
+ name = "fstream";
+ packageName = "fstream";
+ version = "0.1.31";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz";
+ sha1 = "7337f058fbbbbefa8c9f561a28cab0849202c988";
+ };
+ };
+ "inherits-2.0.3" = {
+ name = "inherits";
+ packageName = "inherits";
+ version = "2.0.3";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz";
+ sha1 = "633c2c83e3da42a502f52466022480f4208261de";
+ };
+ };
+ "graceful-fs-3.0.11" = {
+ name = "graceful-fs";
+ packageName = "graceful-fs";
+ version = "3.0.11";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.11.tgz";
+ sha1 = "7613c778a1afea62f25c630a086d7f3acbbdd818";
+ };
+ };
+ "mkdirp-0.5.1" = {
+ name = "mkdirp";
+ packageName = "mkdirp";
+ version = "0.5.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
+ sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
+ };
+ };
+ "rimraf-2.6.2" = {
+ name = "rimraf";
+ packageName = "rimraf";
+ version = "2.6.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz";
+ sha512 = "3kmrqh8xli7rzfm8wc6j9lp0c6vml172iv3z088an9xlwl1xvkvh3fn92za66ms4c9yww80qa5kan31k1z1ypqvkchmh1mznb09xdwn";
+ };
+ };
+ "natives-1.1.0" = {
+ name = "natives";
+ packageName = "natives";
+ version = "1.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/natives/-/natives-1.1.0.tgz";
+ sha1 = "e9ff841418a6b2ec7a495e939984f78f163e6e31";
+ };
+ };
+ "minimist-0.0.8" = {
+ name = "minimist";
+ packageName = "minimist";
+ version = "0.0.8";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
+ sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
+ };
+ };
+ "glob-7.1.2" = {
+ name = "glob";
+ packageName = "glob";
+ version = "7.1.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz";
+ sha512 = "08vjxzixc9dwc1hn5pd60yyij98krk2pr758aiga97r02ncvaqx1hidi95wk470k1v84gg4alls9bm52m77174z128bgf13b61x951h";
+ };
+ };
+ "fs.realpath-1.0.0" = {
+ name = "fs.realpath";
+ packageName = "fs.realpath";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz";
+ sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f";
+ };
+ };
+ "inflight-1.0.6" = {
+ name = "inflight";
+ packageName = "inflight";
+ version = "1.0.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz";
+ sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9";
+ };
+ };
+ "minimatch-3.0.4" = {
+ name = "minimatch";
+ packageName = "minimatch";
+ version = "3.0.4";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz";
+ sha512 = "1879a3j85h92ypvb7lpv1dqpcxl49rqnbgs5la18zmj1yqhwl60c2m74254wbr5pp3znckqpkg9dvjyrz6hfz8b9vag5a3j910db4f8";
+ };
+ };
+ "once-1.4.0" = {
+ name = "once";
+ packageName = "once";
+ version = "1.4.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz";
+ sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1";
+ };
+ };
+ "path-is-absolute-1.0.1" = {
+ name = "path-is-absolute";
+ packageName = "path-is-absolute";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz";
+ sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f";
+ };
+ };
+ "wrappy-1.0.2" = {
+ name = "wrappy";
+ packageName = "wrappy";
+ version = "1.0.2";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz";
+ sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f";
+ };
+ };
+ "brace-expansion-1.1.8" = {
+ name = "brace-expansion";
+ packageName = "brace-expansion";
+ version = "1.1.8";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz";
+ sha1 = "c07b211c7c952ec1f8efd51a77ef0d1d3990a292";
+ };
+ };
+ "balanced-match-1.0.0" = {
+ name = "balanced-match";
+ packageName = "balanced-match";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz";
+ sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767";
+ };
+ };
+ "concat-map-0.0.1" = {
+ name = "concat-map";
+ packageName = "concat-map";
+ version = "0.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz";
+ sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b";
+ };
+ };
+ "commander-2.1.0" = {
+ name = "commander";
+ packageName = "commander";
+ version = "2.1.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/commander/-/commander-2.1.0.tgz";
+ sha1 = "d121bbae860d9992a3d517ba96f56588e47c6781";
+ };
+ };
+ "nan-1.0.0" = {
+ name = "nan";
+ packageName = "nan";
+ version = "1.0.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/nan/-/nan-1.0.0.tgz";
+ sha1 = "ae24f8850818d662fcab5acf7f3b95bfaa2ccf38";
+ };
+ };
+ "tinycolor-0.0.1" = {
+ name = "tinycolor";
+ packageName = "tinycolor";
+ version = "0.0.1";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/tinycolor/-/tinycolor-0.0.1.tgz";
+ sha1 = "320b5a52d83abb5978d81a3e887d4aefb15a6164";
+ };
+ };
+ "options-0.0.6" = {
+ name = "options";
+ packageName = "options";
+ version = "0.0.6";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/options/-/options-0.0.6.tgz";
+ sha1 = "ec22d312806bb53e731773e7cdaefcf1c643128f";
+ };
+ };
+ };
+in
+{
+ "body-parser-~1.6.3" = nodeEnv.buildNodePackage {
+ name = "body-parser";
+ packageName = "body-parser";
+ version = "1.6.7";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/body-parser/-/body-parser-1.6.7.tgz";
+ sha1 = "82306becadf44543e826b3907eae93f0237c4e5c";
+ };
+ dependencies = [
+ sources."bytes-1.0.0"
+ sources."depd-0.4.4"
+ sources."iconv-lite-0.4.4"
+ sources."media-typer-0.2.0"
+ sources."on-finished-2.1.0"
+ sources."qs-2.2.2"
+ sources."raw-body-1.3.0"
+ sources."type-is-1.3.2"
+ sources."ee-first-1.0.5"
+ sources."mime-types-1.0.2"
+ ];
+ buildInputs = globalBuildInputs;
+ meta = {
+ description = "Node.js body parsing middleware";
+ homepage = https://github.com/expressjs/body-parser;
+ license = "MIT";
+ };
+ production = true;
+ };
+ "express-~4.8.3" = nodeEnv.buildNodePackage {
+ name = "express";
+ packageName = "express";
+ version = "4.8.8";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/express/-/express-4.8.8.tgz";
+ sha1 = "6aba348ccdfa87608040b12ca0010107a0aac28e";
+ };
+ dependencies = [
+ sources."accepts-1.0.7"
+ sources."buffer-crc32-0.2.3"
+ sources."debug-1.0.4"
+ sources."depd-0.4.4"
+ sources."escape-html-1.0.1"
+ sources."finalhandler-0.1.0"
+ sources."media-typer-0.2.0"
+ sources."methods-1.1.0"
+ sources."parseurl-1.3.2"
+ sources."path-to-regexp-0.1.3"
+ sources."proxy-addr-1.0.1"
+ sources."qs-2.2.2"
+ sources."range-parser-1.0.0"
+ sources."send-0.8.5"
+ sources."serve-static-1.5.4"
+ sources."type-is-1.3.2"
+ sources."vary-0.1.0"
+ sources."cookie-0.1.2"
+ sources."fresh-0.2.2"
+ sources."cookie-signature-1.0.4"
+ sources."merge-descriptors-0.0.2"
+ sources."utils-merge-1.0.0"
+ sources."mime-types-1.0.2"
+ sources."negotiator-0.4.7"
+ sources."ms-0.6.2"
+ sources."ipaddr.js-0.1.2"
+ sources."destroy-1.0.3"
+ sources."mime-1.2.11"
+ sources."on-finished-2.1.0"
+ sources."ee-first-1.0.5"
+ ];
+ buildInputs = globalBuildInputs;
+ meta = {
+ description = "Fast, unopinionated, minimalist web framework";
+ homepage = http://expressjs.com/;
+ license = "MIT";
+ };
+ production = true;
+ };
+ "request-~2.34.0" = nodeEnv.buildNodePackage {
+ name = "request";
+ packageName = "request";
+ version = "2.34.0";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/request/-/request-2.34.0.tgz";
+ sha1 = "b5d8b9526add4a2d4629f4d417124573996445ae";
+ };
+ dependencies = [
+ sources."qs-0.6.6"
+ sources."json-stringify-safe-5.0.1"
+ sources."forever-agent-0.5.2"
+ sources."node-uuid-1.4.8"
+ sources."mime-1.2.11"
+ sources."tough-cookie-2.3.3"
+ sources."form-data-0.1.4"
+ sources."tunnel-agent-0.3.0"
+ sources."http-signature-0.10.1"
+ sources."oauth-sign-0.3.0"
+ sources."hawk-1.0.0"
+ sources."aws-sign2-0.5.0"
+ sources."punycode-1.4.1"
+ sources."combined-stream-0.0.7"
+ sources."async-0.9.2"
+ sources."delayed-stream-0.0.5"
+ sources."assert-plus-0.1.5"
+ sources."asn1-0.1.11"
+ sources."ctype-0.5.3"
+ sources."hoek-0.9.1"
+ sources."boom-0.4.2"
+ sources."cryptiles-0.2.2"
+ sources."sntp-0.2.4"
+ ];
+ buildInputs = globalBuildInputs;
+ meta = {
+ description = "Simplified HTTP request client.";
+ homepage = https://github.com/mikeal/request;
+ license = "Apache, Version 2.0";
+ };
+ production = true;
+ };
+ "tar-~0.1.19" = nodeEnv.buildNodePackage {
+ name = "tar";
+ packageName = "tar";
+ version = "0.1.20";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/tar/-/tar-0.1.20.tgz";
+ sha1 = "42940bae5b5f22c74483699126f9f3f27449cb13";
+ };
+ dependencies = [
+ sources."block-stream-0.0.9"
+ sources."fstream-0.1.31"
+ sources."inherits-2.0.3"
+ sources."graceful-fs-3.0.11"
+ sources."mkdirp-0.5.1"
+ sources."rimraf-2.6.2"
+ sources."natives-1.1.0"
+ sources."minimist-0.0.8"
+ sources."glob-7.1.2"
+ sources."fs.realpath-1.0.0"
+ sources."inflight-1.0.6"
+ sources."minimatch-3.0.4"
+ sources."once-1.4.0"
+ sources."path-is-absolute-1.0.1"
+ sources."wrappy-1.0.2"
+ sources."brace-expansion-1.1.8"
+ sources."balanced-match-1.0.0"
+ sources."concat-map-0.0.1"
+ ];
+ buildInputs = globalBuildInputs;
+ meta = {
+ description = "tar for node";
+ homepage = https://github.com/isaacs/node-tar;
+ license = "BSD";
+ };
+ production = true;
+ };
+ "ws-~0.4.32" = nodeEnv.buildNodePackage {
+ name = "ws";
+ packageName = "ws";
+ version = "0.4.32";
+ src = fetchurl {
+ url = "https://registry.npmjs.org/ws/-/ws-0.4.32.tgz";
+ sha1 = "787a6154414f3c99ed83c5772153b20feb0cec32";
+ };
+ dependencies = [
+ sources."commander-2.1.0"
+ sources."nan-1.0.0"
+ sources."tinycolor-0.0.1"
+ sources."options-0.0.6"
+ ];
+ buildInputs = globalBuildInputs;
+ meta = {
+ description = "simple to use, blazing fast and thoroughly tested websocket client, server and console for node.js, up-to-date against RFC-6455";
+ homepage = https://github.com/einaros/ws;
+ };
+ production = true;
+ };
+}
\ No newline at end of file
diff --git a/pkgs/applications/editors/zed/node.nix b/pkgs/applications/editors/zed/node.nix
index e74ff1ec45f46d8982d161dc0f840e7708ef43d9..ff0bf1eb80565698dc31daca06c665a3234f76ce 100644
--- a/pkgs/applications/editors/zed/node.nix
+++ b/pkgs/applications/editors/zed/node.nix
@@ -1,1825 +1,16 @@
-{ self, fetchurl, fetchgit ? null, lib }:
+# This file has been generated by node2nix 1.3.0. Do not edit!
-{
- by-spec."accepts"."~1.2.7" =
- self.by-version."accepts"."1.2.7";
- by-version."accepts"."1.2.7" = lib.makeOverridable self.buildNodePackage {
- name = "accepts-1.2.7";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/accepts/-/accepts-1.2.7.tgz";
- name = "accepts-1.2.7.tgz";
- sha1 = "efea24e36e0b5b93d001a7598ac441c32ef56003";
- })
- ];
- buildInputs =
- (self.nativeDeps."accepts" or []);
- deps = {
- "mime-types-2.0.12" = self.by-version."mime-types"."2.0.12";
- "negotiator-0.5.3" = self.by-version."negotiator"."0.5.3";
- };
- peerDependencies = [
- ];
- passthru.names = [ "accepts" ];
- };
- by-spec."asn1"."0.1.11" =
- self.by-version."asn1"."0.1.11";
- by-version."asn1"."0.1.11" = lib.makeOverridable self.buildNodePackage {
- name = "asn1-0.1.11";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz";
- name = "asn1-0.1.11.tgz";
- sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7";
- })
- ];
- buildInputs =
- (self.nativeDeps."asn1" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "asn1" ];
- };
- by-spec."assert-plus"."^0.1.5" =
- self.by-version."assert-plus"."0.1.5";
- by-version."assert-plus"."0.1.5" = lib.makeOverridable self.buildNodePackage {
- name = "assert-plus-0.1.5";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz";
- name = "assert-plus-0.1.5.tgz";
- sha1 = "ee74009413002d84cec7219c6ac811812e723160";
- })
- ];
- buildInputs =
- (self.nativeDeps."assert-plus" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "assert-plus" ];
- };
- by-spec."async"."~0.9.0" =
- self.by-version."async"."0.9.2";
- by-version."async"."0.9.2" = lib.makeOverridable self.buildNodePackage {
- name = "async-0.9.2";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/async/-/async-0.9.2.tgz";
- name = "async-0.9.2.tgz";
- sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d";
- })
- ];
- buildInputs =
- (self.nativeDeps."async" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "async" ];
- };
- by-spec."aws-sign2"."~0.5.0" =
- self.by-version."aws-sign2"."0.5.0";
- by-version."aws-sign2"."0.5.0" = lib.makeOverridable self.buildNodePackage {
- name = "aws-sign2-0.5.0";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz";
- name = "aws-sign2-0.5.0.tgz";
- sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63";
- })
- ];
- buildInputs =
- (self.nativeDeps."aws-sign2" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "aws-sign2" ];
- };
- by-spec."balanced-match"."^0.2.0" =
- self.by-version."balanced-match"."0.2.0";
- by-version."balanced-match"."0.2.0" = lib.makeOverridable self.buildNodePackage {
- name = "balanced-match-0.2.0";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz";
- name = "balanced-match-0.2.0.tgz";
- sha1 = "38f6730c03aab6d5edbb52bd934885e756d71674";
- })
- ];
- buildInputs =
- (self.nativeDeps."balanced-match" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "balanced-match" ];
- };
- by-spec."block-stream"."*" =
- self.by-version."block-stream"."0.0.8";
- by-version."block-stream"."0.0.8" = lib.makeOverridable self.buildNodePackage {
- name = "block-stream-0.0.8";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/block-stream/-/block-stream-0.0.8.tgz";
- name = "block-stream-0.0.8.tgz";
- sha1 = "0688f46da2bbf9cff0c4f68225a0cb95cbe8a46b";
- })
- ];
- buildInputs =
- (self.nativeDeps."block-stream" or []);
- deps = {
- "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
- };
- peerDependencies = [
- ];
- passthru.names = [ "block-stream" ];
- };
- by-spec."body-parser"."^1.6.3" =
- self.by-version."body-parser"."1.12.4";
- by-version."body-parser"."1.12.4" = lib.makeOverridable self.buildNodePackage {
- name = "body-parser-1.12.4";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/body-parser/-/body-parser-1.12.4.tgz";
- name = "body-parser-1.12.4.tgz";
- sha1 = "090700c4ba28862a8520ef378395fdee5f61c229";
- })
- ];
- buildInputs =
- (self.nativeDeps."body-parser" or []);
- deps = {
- "bytes-1.0.0" = self.by-version."bytes"."1.0.0";
- "content-type-1.0.1" = self.by-version."content-type"."1.0.1";
- "debug-2.2.0" = self.by-version."debug"."2.2.0";
- "depd-1.0.1" = self.by-version."depd"."1.0.1";
- "iconv-lite-0.4.8" = self.by-version."iconv-lite"."0.4.8";
- "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1";
- "qs-2.4.2" = self.by-version."qs"."2.4.2";
- "raw-body-2.0.1" = self.by-version."raw-body"."2.0.1";
- "type-is-1.6.2" = self.by-version."type-is"."1.6.2";
- };
- peerDependencies = [
- ];
- passthru.names = [ "body-parser" ];
- };
- "body-parser" = self.by-version."body-parser"."1.12.4";
- by-spec."boom"."0.4.x" =
- self.by-version."boom"."0.4.2";
- by-version."boom"."0.4.2" = lib.makeOverridable self.buildNodePackage {
- name = "boom-0.4.2";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/boom/-/boom-0.4.2.tgz";
- name = "boom-0.4.2.tgz";
- sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b";
- })
- ];
- buildInputs =
- (self.nativeDeps."boom" or []);
- deps = {
- "hoek-0.9.1" = self.by-version."hoek"."0.9.1";
- };
- peerDependencies = [
- ];
- passthru.names = [ "boom" ];
- };
- by-spec."brace-expansion"."^1.0.0" =
- self.by-version."brace-expansion"."1.1.0";
- by-version."brace-expansion"."1.1.0" = lib.makeOverridable self.buildNodePackage {
- name = "brace-expansion-1.1.0";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz";
- name = "brace-expansion-1.1.0.tgz";
- sha1 = "c9b7d03c03f37bc704be100e522b40db8f6cfcd9";
- })
- ];
- buildInputs =
- (self.nativeDeps."brace-expansion" or []);
- deps = {
- "balanced-match-0.2.0" = self.by-version."balanced-match"."0.2.0";
- "concat-map-0.0.1" = self.by-version."concat-map"."0.0.1";
- };
- peerDependencies = [
- ];
- passthru.names = [ "brace-expansion" ];
- };
- by-spec."bytes"."1.0.0" =
- self.by-version."bytes"."1.0.0";
- by-version."bytes"."1.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "bytes-1.0.0";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz";
- name = "bytes-1.0.0.tgz";
- sha1 = "3569ede8ba34315fab99c3e92cb04c7220de1fa8";
- })
- ];
- buildInputs =
- (self.nativeDeps."bytes" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "bytes" ];
- };
- by-spec."bytes"."2.0.1" =
- self.by-version."bytes"."2.0.1";
- by-version."bytes"."2.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "bytes-2.0.1";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/bytes/-/bytes-2.0.1.tgz";
- name = "bytes-2.0.1.tgz";
- sha1 = "673743059be43d929f9c225dd7363ee0f8b15d97";
- })
- ];
- buildInputs =
- (self.nativeDeps."bytes" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "bytes" ];
- };
- by-spec."combined-stream"."~0.0.4" =
- self.by-version."combined-stream"."0.0.7";
- by-version."combined-stream"."0.0.7" = lib.makeOverridable self.buildNodePackage {
- name = "combined-stream-0.0.7";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz";
- name = "combined-stream-0.0.7.tgz";
- sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f";
- })
- ];
- buildInputs =
- (self.nativeDeps."combined-stream" or []);
- deps = {
- "delayed-stream-0.0.5" = self.by-version."delayed-stream"."0.0.5";
- };
- peerDependencies = [
- ];
- passthru.names = [ "combined-stream" ];
- };
- by-spec."commander"."~2.1.0" =
- self.by-version."commander"."2.1.0";
- by-version."commander"."2.1.0" = lib.makeOverridable self.buildNodePackage {
- name = "commander-2.1.0";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/commander/-/commander-2.1.0.tgz";
- name = "commander-2.1.0.tgz";
- sha1 = "d121bbae860d9992a3d517ba96f56588e47c6781";
- })
- ];
- buildInputs =
- (self.nativeDeps."commander" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "commander" ];
- };
- by-spec."concat-map"."0.0.1" =
- self.by-version."concat-map"."0.0.1";
- by-version."concat-map"."0.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "concat-map-0.0.1";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz";
- name = "concat-map-0.0.1.tgz";
- sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b";
- })
- ];
- buildInputs =
- (self.nativeDeps."concat-map" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "concat-map" ];
- };
- by-spec."content-disposition"."0.5.0" =
- self.by-version."content-disposition"."0.5.0";
- by-version."content-disposition"."0.5.0" = lib.makeOverridable self.buildNodePackage {
- name = "content-disposition-0.5.0";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/content-disposition/-/content-disposition-0.5.0.tgz";
- name = "content-disposition-0.5.0.tgz";
- sha1 = "4284fe6ae0630874639e44e80a418c2934135e9e";
- })
- ];
- buildInputs =
- (self.nativeDeps."content-disposition" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "content-disposition" ];
- };
- by-spec."content-type"."~1.0.1" =
- self.by-version."content-type"."1.0.1";
- by-version."content-type"."1.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "content-type-1.0.1";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/content-type/-/content-type-1.0.1.tgz";
- name = "content-type-1.0.1.tgz";
- sha1 = "a19d2247327dc038050ce622b7a154ec59c5e600";
- })
- ];
- buildInputs =
- (self.nativeDeps."content-type" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "content-type" ];
- };
- by-spec."cookie"."0.1.2" =
- self.by-version."cookie"."0.1.2";
- by-version."cookie"."0.1.2" = lib.makeOverridable self.buildNodePackage {
- name = "cookie-0.1.2";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/cookie/-/cookie-0.1.2.tgz";
- name = "cookie-0.1.2.tgz";
- sha1 = "72fec3d24e48a3432073d90c12642005061004b1";
- })
- ];
- buildInputs =
- (self.nativeDeps."cookie" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "cookie" ];
- };
- by-spec."cookie-signature"."1.0.6" =
- self.by-version."cookie-signature"."1.0.6";
- by-version."cookie-signature"."1.0.6" = lib.makeOverridable self.buildNodePackage {
- name = "cookie-signature-1.0.6";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz";
- name = "cookie-signature-1.0.6.tgz";
- sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c";
- })
- ];
- buildInputs =
- (self.nativeDeps."cookie-signature" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "cookie-signature" ];
- };
- by-spec."crc"."3.2.1" =
- self.by-version."crc"."3.2.1";
- by-version."crc"."3.2.1" = lib.makeOverridable self.buildNodePackage {
- name = "crc-3.2.1";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/crc/-/crc-3.2.1.tgz";
- name = "crc-3.2.1.tgz";
- sha1 = "5d9c8fb77a245cd5eca291e5d2d005334bab0082";
- })
- ];
- buildInputs =
- (self.nativeDeps."crc" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "crc" ];
- };
- by-spec."cryptiles"."0.2.x" =
- self.by-version."cryptiles"."0.2.2";
- by-version."cryptiles"."0.2.2" = lib.makeOverridable self.buildNodePackage {
- name = "cryptiles-0.2.2";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz";
- name = "cryptiles-0.2.2.tgz";
- sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c";
- })
- ];
- buildInputs =
- (self.nativeDeps."cryptiles" or []);
- deps = {
- "boom-0.4.2" = self.by-version."boom"."0.4.2";
- };
- peerDependencies = [
- ];
- passthru.names = [ "cryptiles" ];
- };
- by-spec."ctype"."0.5.3" =
- self.by-version."ctype"."0.5.3";
- by-version."ctype"."0.5.3" = lib.makeOverridable self.buildNodePackage {
- name = "ctype-0.5.3";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz";
- name = "ctype-0.5.3.tgz";
- sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f";
- })
- ];
- buildInputs =
- (self.nativeDeps."ctype" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "ctype" ];
- };
- by-spec."debug"."~2.2.0" =
- self.by-version."debug"."2.2.0";
- by-version."debug"."2.2.0" = lib.makeOverridable self.buildNodePackage {
- name = "debug-2.2.0";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/debug/-/debug-2.2.0.tgz";
- name = "debug-2.2.0.tgz";
- sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da";
- })
- ];
- buildInputs =
- (self.nativeDeps."debug" or []);
- deps = {
- "ms-0.7.1" = self.by-version."ms"."0.7.1";
- };
- peerDependencies = [
- ];
- passthru.names = [ "debug" ];
- };
- by-spec."delayed-stream"."0.0.5" =
- self.by-version."delayed-stream"."0.0.5";
- by-version."delayed-stream"."0.0.5" = lib.makeOverridable self.buildNodePackage {
- name = "delayed-stream-0.0.5";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz";
- name = "delayed-stream-0.0.5.tgz";
- sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f";
- })
- ];
- buildInputs =
- (self.nativeDeps."delayed-stream" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "delayed-stream" ];
- };
- by-spec."depd"."~1.0.1" =
- self.by-version."depd"."1.0.1";
- by-version."depd"."1.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "depd-1.0.1";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/depd/-/depd-1.0.1.tgz";
- name = "depd-1.0.1.tgz";
- sha1 = "80aec64c9d6d97e65cc2a9caa93c0aa6abf73aaa";
- })
- ];
- buildInputs =
- (self.nativeDeps."depd" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "depd" ];
- };
- by-spec."destroy"."1.0.3" =
- self.by-version."destroy"."1.0.3";
- by-version."destroy"."1.0.3" = lib.makeOverridable self.buildNodePackage {
- name = "destroy-1.0.3";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz";
- name = "destroy-1.0.3.tgz";
- sha1 = "b433b4724e71fd8551d9885174851c5fc377e2c9";
- })
- ];
- buildInputs =
- (self.nativeDeps."destroy" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "destroy" ];
- };
- by-spec."ee-first"."1.1.0" =
- self.by-version."ee-first"."1.1.0";
- by-version."ee-first"."1.1.0" = lib.makeOverridable self.buildNodePackage {
- name = "ee-first-1.1.0";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz";
- name = "ee-first-1.1.0.tgz";
- sha1 = "6a0d7c6221e490feefd92ec3f441c9ce8cd097f4";
- })
- ];
- buildInputs =
- (self.nativeDeps."ee-first" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "ee-first" ];
- };
- by-spec."escape-html"."1.0.1" =
- self.by-version."escape-html"."1.0.1";
- by-version."escape-html"."1.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "escape-html-1.0.1";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz";
- name = "escape-html-1.0.1.tgz";
- sha1 = "181a286ead397a39a92857cfb1d43052e356bff0";
- })
- ];
- buildInputs =
- (self.nativeDeps."escape-html" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "escape-html" ];
- };
- by-spec."etag"."~1.6.0" =
- self.by-version."etag"."1.6.0";
- by-version."etag"."1.6.0" = lib.makeOverridable self.buildNodePackage {
- name = "etag-1.6.0";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/etag/-/etag-1.6.0.tgz";
- name = "etag-1.6.0.tgz";
- sha1 = "8bcb2c6af1254c481dfc8b997c906ef4e442c207";
- })
- ];
- buildInputs =
- (self.nativeDeps."etag" or []);
- deps = {
- "crc-3.2.1" = self.by-version."crc"."3.2.1";
- };
- peerDependencies = [
- ];
- passthru.names = [ "etag" ];
- };
- by-spec."express"."^4.8.3" =
- self.by-version."express"."4.12.4";
- by-version."express"."4.12.4" = lib.makeOverridable self.buildNodePackage {
- name = "express-4.12.4";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/express/-/express-4.12.4.tgz";
- name = "express-4.12.4.tgz";
- sha1 = "8fec2510255bc6b2e58107c48239c0fa307c1aa2";
- })
- ];
- buildInputs =
- (self.nativeDeps."express" or []);
- deps = {
- "accepts-1.2.7" = self.by-version."accepts"."1.2.7";
- "content-disposition-0.5.0" = self.by-version."content-disposition"."0.5.0";
- "content-type-1.0.1" = self.by-version."content-type"."1.0.1";
- "cookie-0.1.2" = self.by-version."cookie"."0.1.2";
- "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6";
- "debug-2.2.0" = self.by-version."debug"."2.2.0";
- "depd-1.0.1" = self.by-version."depd"."1.0.1";
- "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
- "etag-1.6.0" = self.by-version."etag"."1.6.0";
- "finalhandler-0.3.6" = self.by-version."finalhandler"."0.3.6";
- "fresh-0.2.4" = self.by-version."fresh"."0.2.4";
- "merge-descriptors-1.0.0" = self.by-version."merge-descriptors"."1.0.0";
- "methods-1.1.1" = self.by-version."methods"."1.1.1";
- "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1";
- "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
- "path-to-regexp-0.1.3" = self.by-version."path-to-regexp"."0.1.3";
- "proxy-addr-1.0.8" = self.by-version."proxy-addr"."1.0.8";
- "qs-2.4.2" = self.by-version."qs"."2.4.2";
- "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
- "send-0.12.3" = self.by-version."send"."0.12.3";
- "serve-static-1.9.3" = self.by-version."serve-static"."1.9.3";
- "type-is-1.6.2" = self.by-version."type-is"."1.6.2";
- "vary-1.0.0" = self.by-version."vary"."1.0.0";
- "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
- };
- peerDependencies = [
- ];
- passthru.names = [ "express" ];
- };
- "express" = self.by-version."express"."4.12.4";
- by-spec."finalhandler"."0.3.6" =
- self.by-version."finalhandler"."0.3.6";
- by-version."finalhandler"."0.3.6" = lib.makeOverridable self.buildNodePackage {
- name = "finalhandler-0.3.6";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.3.6.tgz";
- name = "finalhandler-0.3.6.tgz";
- sha1 = "daf9c4161b1b06e001466b1411dfdb6973be138b";
- })
- ];
- buildInputs =
- (self.nativeDeps."finalhandler" or []);
- deps = {
- "debug-2.2.0" = self.by-version."debug"."2.2.0";
- "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
- "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1";
- };
- peerDependencies = [
- ];
- passthru.names = [ "finalhandler" ];
- };
- by-spec."forever-agent"."~0.5.0" =
- self.by-version."forever-agent"."0.5.2";
- by-version."forever-agent"."0.5.2" = lib.makeOverridable self.buildNodePackage {
- name = "forever-agent-0.5.2";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz";
- name = "forever-agent-0.5.2.tgz";
- sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130";
- })
- ];
- buildInputs =
- (self.nativeDeps."forever-agent" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "forever-agent" ];
- };
- by-spec."form-data"."~0.1.0" =
- self.by-version."form-data"."0.1.4";
- by-version."form-data"."0.1.4" = lib.makeOverridable self.buildNodePackage {
- name = "form-data-0.1.4";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz";
- name = "form-data-0.1.4.tgz";
- sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12";
- })
- ];
- buildInputs =
- (self.nativeDeps."form-data" or []);
- deps = {
- "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7";
- "mime-1.2.11" = self.by-version."mime"."1.2.11";
- "async-0.9.2" = self.by-version."async"."0.9.2";
- };
- peerDependencies = [
- ];
- passthru.names = [ "form-data" ];
- };
- by-spec."forwarded"."~0.1.0" =
- self.by-version."forwarded"."0.1.0";
- by-version."forwarded"."0.1.0" = lib.makeOverridable self.buildNodePackage {
- name = "forwarded-0.1.0";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz";
- name = "forwarded-0.1.0.tgz";
- sha1 = "19ef9874c4ae1c297bcf078fde63a09b66a84363";
- })
- ];
- buildInputs =
- (self.nativeDeps."forwarded" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "forwarded" ];
- };
- by-spec."fresh"."0.2.4" =
- self.by-version."fresh"."0.2.4";
- by-version."fresh"."0.2.4" = lib.makeOverridable self.buildNodePackage {
- name = "fresh-0.2.4";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz";
- name = "fresh-0.2.4.tgz";
- sha1 = "3582499206c9723714190edd74b4604feb4a614c";
- })
- ];
- buildInputs =
- (self.nativeDeps."fresh" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "fresh" ];
- };
- by-spec."fstream"."~0.1.28" =
- self.by-version."fstream"."0.1.31";
- by-version."fstream"."0.1.31" = lib.makeOverridable self.buildNodePackage {
- name = "fstream-0.1.31";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz";
- name = "fstream-0.1.31.tgz";
- sha1 = "7337f058fbbbbefa8c9f561a28cab0849202c988";
- })
- ];
- buildInputs =
- (self.nativeDeps."fstream" or []);
- deps = {
- "graceful-fs-3.0.7" = self.by-version."graceful-fs"."3.0.7";
- "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
- "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
- "rimraf-2.3.4" = self.by-version."rimraf"."2.3.4";
- };
- peerDependencies = [
- ];
- passthru.names = [ "fstream" ];
- };
- by-spec."glob"."^4.4.2" =
- self.by-version."glob"."4.5.3";
- by-version."glob"."4.5.3" = lib.makeOverridable self.buildNodePackage {
- name = "glob-4.5.3";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/glob/-/glob-4.5.3.tgz";
- name = "glob-4.5.3.tgz";
- sha1 = "c6cb73d3226c1efef04de3c56d012f03377ee15f";
- })
- ];
- buildInputs =
- (self.nativeDeps."glob" or []);
- deps = {
- "inflight-1.0.4" = self.by-version."inflight"."1.0.4";
- "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
- "minimatch-2.0.8" = self.by-version."minimatch"."2.0.8";
- "once-1.3.2" = self.by-version."once"."1.3.2";
- };
- peerDependencies = [
- ];
- passthru.names = [ "glob" ];
- };
- by-spec."graceful-fs"."~3.0.2" =
- self.by-version."graceful-fs"."3.0.7";
- by-version."graceful-fs"."3.0.7" = lib.makeOverridable self.buildNodePackage {
- name = "graceful-fs-3.0.7";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.7.tgz";
- name = "graceful-fs-3.0.7.tgz";
- sha1 = "e935be4b3e57892d289dc3bef7be8c02779d2b54";
- })
- ];
- buildInputs =
- (self.nativeDeps."graceful-fs" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "graceful-fs" ];
- };
- by-spec."hawk"."~1.0.0" =
- self.by-version."hawk"."1.0.0";
- by-version."hawk"."1.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "hawk-1.0.0";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz";
- name = "hawk-1.0.0.tgz";
- sha1 = "b90bb169807285411da7ffcb8dd2598502d3b52d";
- })
- ];
- buildInputs =
- (self.nativeDeps."hawk" or []);
- deps = {
- "hoek-0.9.1" = self.by-version."hoek"."0.9.1";
- "boom-0.4.2" = self.by-version."boom"."0.4.2";
- "cryptiles-0.2.2" = self.by-version."cryptiles"."0.2.2";
- "sntp-0.2.4" = self.by-version."sntp"."0.2.4";
- };
- peerDependencies = [
- ];
- passthru.names = [ "hawk" ];
- };
- by-spec."hoek"."0.9.x" =
- self.by-version."hoek"."0.9.1";
- by-version."hoek"."0.9.1" = lib.makeOverridable self.buildNodePackage {
- name = "hoek-0.9.1";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz";
- name = "hoek-0.9.1.tgz";
- sha1 = "3d322462badf07716ea7eb85baf88079cddce505";
- })
- ];
- buildInputs =
- (self.nativeDeps."hoek" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "hoek" ];
- };
- by-spec."http-signature"."~0.10.0" =
- self.by-version."http-signature"."0.10.1";
- by-version."http-signature"."0.10.1" = lib.makeOverridable self.buildNodePackage {
- name = "http-signature-0.10.1";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz";
- name = "http-signature-0.10.1.tgz";
- sha1 = "4fbdac132559aa8323121e540779c0a012b27e66";
- })
- ];
- buildInputs =
- (self.nativeDeps."http-signature" or []);
- deps = {
- "assert-plus-0.1.5" = self.by-version."assert-plus"."0.1.5";
- "asn1-0.1.11" = self.by-version."asn1"."0.1.11";
- "ctype-0.5.3" = self.by-version."ctype"."0.5.3";
- };
- peerDependencies = [
- ];
- passthru.names = [ "http-signature" ];
- };
- by-spec."iconv-lite"."0.4.8" =
- self.by-version."iconv-lite"."0.4.8";
- by-version."iconv-lite"."0.4.8" = lib.makeOverridable self.buildNodePackage {
- name = "iconv-lite-0.4.8";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.8.tgz";
- name = "iconv-lite-0.4.8.tgz";
- sha1 = "c6019a7595f2cefca702eab694a010bcd9298d20";
- })
- ];
- buildInputs =
- (self.nativeDeps."iconv-lite" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "iconv-lite" ];
- };
- by-spec."inflight"."^1.0.4" =
- self.by-version."inflight"."1.0.4";
- by-version."inflight"."1.0.4" = lib.makeOverridable self.buildNodePackage {
- name = "inflight-1.0.4";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz";
- name = "inflight-1.0.4.tgz";
- sha1 = "6cbb4521ebd51ce0ec0a936bfd7657ef7e9b172a";
- })
- ];
- buildInputs =
- (self.nativeDeps."inflight" or []);
- deps = {
- "once-1.3.2" = self.by-version."once"."1.3.2";
- "wrappy-1.0.1" = self.by-version."wrappy"."1.0.1";
- };
- peerDependencies = [
- ];
- passthru.names = [ "inflight" ];
- };
- by-spec."inherits"."2" =
- self.by-version."inherits"."2.0.1";
- by-version."inherits"."2.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "inherits-2.0.1";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz";
- name = "inherits-2.0.1.tgz";
- sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1";
- })
- ];
- buildInputs =
- (self.nativeDeps."inherits" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "inherits" ];
- };
- by-spec."inherits"."~2.0.0" =
- self.by-version."inherits"."2.0.1";
- by-spec."ipaddr.js"."1.0.1" =
- self.by-version."ipaddr.js"."1.0.1";
- by-version."ipaddr.js"."1.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "ipaddr.js-1.0.1";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.0.1.tgz";
- name = "ipaddr.js-1.0.1.tgz";
- sha1 = "5f38801dc73e0400fc7076386f6ed5215fbd8f95";
- })
- ];
- buildInputs =
- (self.nativeDeps."ipaddr.js" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "ipaddr.js" ];
- };
- by-spec."json-stringify-safe"."~5.0.0" =
- self.by-version."json-stringify-safe"."5.0.1";
- by-version."json-stringify-safe"."5.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "json-stringify-safe-5.0.1";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz";
- name = "json-stringify-safe-5.0.1.tgz";
- sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
- })
- ];
- buildInputs =
- (self.nativeDeps."json-stringify-safe" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "json-stringify-safe" ];
- };
- by-spec."media-typer"."0.3.0" =
- self.by-version."media-typer"."0.3.0";
- by-version."media-typer"."0.3.0" = lib.makeOverridable self.buildNodePackage {
- name = "media-typer-0.3.0";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz";
- name = "media-typer-0.3.0.tgz";
- sha1 = "8710d7af0aa626f8fffa1ce00168545263255748";
- })
- ];
- buildInputs =
- (self.nativeDeps."media-typer" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "media-typer" ];
- };
- by-spec."merge-descriptors"."1.0.0" =
- self.by-version."merge-descriptors"."1.0.0";
- by-version."merge-descriptors"."1.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "merge-descriptors-1.0.0";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.0.tgz";
- name = "merge-descriptors-1.0.0.tgz";
- sha1 = "2169cf7538e1b0cc87fb88e1502d8474bbf79864";
- })
- ];
- buildInputs =
- (self.nativeDeps."merge-descriptors" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "merge-descriptors" ];
- };
- by-spec."methods"."~1.1.1" =
- self.by-version."methods"."1.1.1";
- by-version."methods"."1.1.1" = lib.makeOverridable self.buildNodePackage {
- name = "methods-1.1.1";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/methods/-/methods-1.1.1.tgz";
- name = "methods-1.1.1.tgz";
- sha1 = "17ea6366066d00c58e375b8ec7dfd0453c89822a";
- })
- ];
- buildInputs =
- (self.nativeDeps."methods" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "methods" ];
- };
- by-spec."mime"."1.3.4" =
- self.by-version."mime"."1.3.4";
- by-version."mime"."1.3.4" = lib.makeOverridable self.buildNodePackage {
- name = "mime-1.3.4";
- bin = true;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/mime/-/mime-1.3.4.tgz";
- name = "mime-1.3.4.tgz";
- sha1 = "115f9e3b6b3daf2959983cb38f149a2d40eb5d53";
- })
- ];
- buildInputs =
- (self.nativeDeps."mime" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "mime" ];
- };
- by-spec."mime"."~1.2.11" =
- self.by-version."mime"."1.2.11";
- by-version."mime"."1.2.11" = lib.makeOverridable self.buildNodePackage {
- name = "mime-1.2.11";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz";
- name = "mime-1.2.11.tgz";
- sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10";
- })
- ];
- buildInputs =
- (self.nativeDeps."mime" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "mime" ];
- };
- by-spec."mime"."~1.2.9" =
- self.by-version."mime"."1.2.11";
- by-spec."mime-db"."~1.10.0" =
- self.by-version."mime-db"."1.10.0";
- by-version."mime-db"."1.10.0" = lib.makeOverridable self.buildNodePackage {
- name = "mime-db-1.10.0";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/mime-db/-/mime-db-1.10.0.tgz";
- name = "mime-db-1.10.0.tgz";
- sha1 = "e6308063c758ebd12837874c3d1ea9170766b03b";
- })
- ];
- buildInputs =
- (self.nativeDeps."mime-db" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "mime-db" ];
- };
- by-spec."mime-types"."~2.0.11" =
- self.by-version."mime-types"."2.0.12";
- by-version."mime-types"."2.0.12" = lib.makeOverridable self.buildNodePackage {
- name = "mime-types-2.0.12";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/mime-types/-/mime-types-2.0.12.tgz";
- name = "mime-types-2.0.12.tgz";
- sha1 = "87ae9f124e94f8e440c93d1a72d0dccecdb71135";
- })
- ];
- buildInputs =
- (self.nativeDeps."mime-types" or []);
- deps = {
- "mime-db-1.10.0" = self.by-version."mime-db"."1.10.0";
- };
- peerDependencies = [
- ];
- passthru.names = [ "mime-types" ];
- };
- by-spec."minimatch"."^2.0.1" =
- self.by-version."minimatch"."2.0.8";
- by-version."minimatch"."2.0.8" = lib.makeOverridable self.buildNodePackage {
- name = "minimatch-2.0.8";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/minimatch/-/minimatch-2.0.8.tgz";
- name = "minimatch-2.0.8.tgz";
- sha1 = "0bc20f6bf3570a698ef0ddff902063c6cabda6bf";
- })
- ];
- buildInputs =
- (self.nativeDeps."minimatch" or []);
- deps = {
- "brace-expansion-1.1.0" = self.by-version."brace-expansion"."1.1.0";
- };
- peerDependencies = [
- ];
- passthru.names = [ "minimatch" ];
- };
- by-spec."minimist"."0.0.8" =
- self.by-version."minimist"."0.0.8";
- by-version."minimist"."0.0.8" = lib.makeOverridable self.buildNodePackage {
- name = "minimist-0.0.8";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
- name = "minimist-0.0.8.tgz";
- sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
- })
- ];
- buildInputs =
- (self.nativeDeps."minimist" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "minimist" ];
- };
- by-spec."mkdirp"."0.5" =
- self.by-version."mkdirp"."0.5.1";
- by-version."mkdirp"."0.5.1" = lib.makeOverridable self.buildNodePackage {
- name = "mkdirp-0.5.1";
- bin = true;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
- name = "mkdirp-0.5.1.tgz";
- sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
- })
- ];
- buildInputs =
- (self.nativeDeps."mkdirp" or []);
- deps = {
- "minimist-0.0.8" = self.by-version."minimist"."0.0.8";
- };
- peerDependencies = [
- ];
- passthru.names = [ "mkdirp" ];
- };
- by-spec."ms"."0.7.1" =
- self.by-version."ms"."0.7.1";
- by-version."ms"."0.7.1" = lib.makeOverridable self.buildNodePackage {
- name = "ms-0.7.1";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/ms/-/ms-0.7.1.tgz";
- name = "ms-0.7.1.tgz";
- sha1 = "9cd13c03adbff25b65effde7ce864ee952017098";
- })
- ];
- buildInputs =
- (self.nativeDeps."ms" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "ms" ];
- };
- by-spec."nan"."~1.0.0" =
- self.by-version."nan"."1.0.0";
- by-version."nan"."1.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "nan-1.0.0";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/nan/-/nan-1.0.0.tgz";
- name = "nan-1.0.0.tgz";
- sha1 = "ae24f8850818d662fcab5acf7f3b95bfaa2ccf38";
- })
- ];
- buildInputs =
- (self.nativeDeps."nan" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "nan" ];
- };
- by-spec."negotiator"."0.5.3" =
- self.by-version."negotiator"."0.5.3";
- by-version."negotiator"."0.5.3" = lib.makeOverridable self.buildNodePackage {
- name = "negotiator-0.5.3";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/negotiator/-/negotiator-0.5.3.tgz";
- name = "negotiator-0.5.3.tgz";
- sha1 = "269d5c476810ec92edbe7b6c2f28316384f9a7e8";
- })
- ];
- buildInputs =
- (self.nativeDeps."negotiator" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "negotiator" ];
- };
- by-spec."node-uuid"."~1.4.0" =
- self.by-version."node-uuid"."1.4.3";
- by-version."node-uuid"."1.4.3" = lib.makeOverridable self.buildNodePackage {
- name = "node-uuid-1.4.3";
- bin = true;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz";
- name = "node-uuid-1.4.3.tgz";
- sha1 = "319bb7a56e7cb63f00b5c0cd7851cd4b4ddf1df9";
- })
- ];
- buildInputs =
- (self.nativeDeps."node-uuid" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "node-uuid" ];
- };
- by-spec."oauth-sign"."~0.3.0" =
- self.by-version."oauth-sign"."0.3.0";
- by-version."oauth-sign"."0.3.0" = lib.makeOverridable self.buildNodePackage {
- name = "oauth-sign-0.3.0";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz";
- name = "oauth-sign-0.3.0.tgz";
- sha1 = "cb540f93bb2b22a7d5941691a288d60e8ea9386e";
- })
- ];
- buildInputs =
- (self.nativeDeps."oauth-sign" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "oauth-sign" ];
- };
- by-spec."on-finished"."~2.2.1" =
- self.by-version."on-finished"."2.2.1";
- by-version."on-finished"."2.2.1" = lib.makeOverridable self.buildNodePackage {
- name = "on-finished-2.2.1";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/on-finished/-/on-finished-2.2.1.tgz";
- name = "on-finished-2.2.1.tgz";
- sha1 = "5c85c1cc36299f78029653f667f27b6b99ebc029";
- })
- ];
- buildInputs =
- (self.nativeDeps."on-finished" or []);
- deps = {
- "ee-first-1.1.0" = self.by-version."ee-first"."1.1.0";
- };
- peerDependencies = [
- ];
- passthru.names = [ "on-finished" ];
- };
- by-spec."once"."^1.3.0" =
- self.by-version."once"."1.3.2";
- by-version."once"."1.3.2" = lib.makeOverridable self.buildNodePackage {
- name = "once-1.3.2";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/once/-/once-1.3.2.tgz";
- name = "once-1.3.2.tgz";
- sha1 = "d8feeca93b039ec1dcdee7741c92bdac5e28081b";
- })
- ];
- buildInputs =
- (self.nativeDeps."once" or []);
- deps = {
- "wrappy-1.0.1" = self.by-version."wrappy"."1.0.1";
- };
- peerDependencies = [
- ];
- passthru.names = [ "once" ];
- };
- by-spec."options".">=0.0.5" =
- self.by-version."options"."0.0.6";
- by-version."options"."0.0.6" = lib.makeOverridable self.buildNodePackage {
- name = "options-0.0.6";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/options/-/options-0.0.6.tgz";
- name = "options-0.0.6.tgz";
- sha1 = "ec22d312806bb53e731773e7cdaefcf1c643128f";
- })
- ];
- buildInputs =
- (self.nativeDeps."options" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "options" ];
- };
- by-spec."parseurl"."~1.3.0" =
- self.by-version."parseurl"."1.3.0";
- by-version."parseurl"."1.3.0" = lib.makeOverridable self.buildNodePackage {
- name = "parseurl-1.3.0";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz";
- name = "parseurl-1.3.0.tgz";
- sha1 = "b58046db4223e145afa76009e61bac87cc2281b3";
- })
- ];
- buildInputs =
- (self.nativeDeps."parseurl" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "parseurl" ];
- };
- by-spec."path-to-regexp"."0.1.3" =
- self.by-version."path-to-regexp"."0.1.3";
- by-version."path-to-regexp"."0.1.3" = lib.makeOverridable self.buildNodePackage {
- name = "path-to-regexp-0.1.3";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.3.tgz";
- name = "path-to-regexp-0.1.3.tgz";
- sha1 = "21b9ab82274279de25b156ea08fd12ca51b8aecb";
- })
- ];
- buildInputs =
- (self.nativeDeps."path-to-regexp" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "path-to-regexp" ];
- };
- by-spec."proxy-addr"."~1.0.8" =
- self.by-version."proxy-addr"."1.0.8";
- by-version."proxy-addr"."1.0.8" = lib.makeOverridable self.buildNodePackage {
- name = "proxy-addr-1.0.8";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.8.tgz";
- name = "proxy-addr-1.0.8.tgz";
- sha1 = "db54ec878bcc1053d57646609219b3715678bafe";
- })
- ];
- buildInputs =
- (self.nativeDeps."proxy-addr" or []);
- deps = {
- "forwarded-0.1.0" = self.by-version."forwarded"."0.1.0";
- "ipaddr.js-1.0.1" = self.by-version."ipaddr.js"."1.0.1";
- };
- peerDependencies = [
- ];
- passthru.names = [ "proxy-addr" ];
- };
- by-spec."qs"."2.4.2" =
- self.by-version."qs"."2.4.2";
- by-version."qs"."2.4.2" = lib.makeOverridable self.buildNodePackage {
- name = "qs-2.4.2";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/qs/-/qs-2.4.2.tgz";
- name = "qs-2.4.2.tgz";
- sha1 = "f7ce788e5777df0b5010da7f7c4e73ba32470f5a";
- })
- ];
- buildInputs =
- (self.nativeDeps."qs" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "qs" ];
- };
- by-spec."qs"."~0.6.0" =
- self.by-version."qs"."0.6.6";
- by-version."qs"."0.6.6" = lib.makeOverridable self.buildNodePackage {
- name = "qs-0.6.6";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/qs/-/qs-0.6.6.tgz";
- name = "qs-0.6.6.tgz";
- sha1 = "6e015098ff51968b8a3c819001d5f2c89bc4b107";
- })
- ];
- buildInputs =
- (self.nativeDeps."qs" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "qs" ];
- };
- by-spec."range-parser"."~1.0.2" =
- self.by-version."range-parser"."1.0.2";
- by-version."range-parser"."1.0.2" = lib.makeOverridable self.buildNodePackage {
- name = "range-parser-1.0.2";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/range-parser/-/range-parser-1.0.2.tgz";
- name = "range-parser-1.0.2.tgz";
- sha1 = "06a12a42e5131ba8e457cd892044867f2344e549";
- })
- ];
- buildInputs =
- (self.nativeDeps."range-parser" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "range-parser" ];
- };
- by-spec."raw-body"."~2.0.1" =
- self.by-version."raw-body"."2.0.1";
- by-version."raw-body"."2.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "raw-body-2.0.1";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/raw-body/-/raw-body-2.0.1.tgz";
- name = "raw-body-2.0.1.tgz";
- sha1 = "2b70a3ffd1681c0521bae73454e0ccbc785d378e";
- })
- ];
- buildInputs =
- (self.nativeDeps."raw-body" or []);
- deps = {
- "bytes-2.0.1" = self.by-version."bytes"."2.0.1";
- "iconv-lite-0.4.8" = self.by-version."iconv-lite"."0.4.8";
- };
- peerDependencies = [
- ];
- passthru.names = [ "raw-body" ];
- };
- by-spec."request"."~2.34.0" =
- self.by-version."request"."2.34.0";
- by-version."request"."2.34.0" = lib.makeOverridable self.buildNodePackage {
- name = "request-2.34.0";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/request/-/request-2.34.0.tgz";
- name = "request-2.34.0.tgz";
- sha1 = "b5d8b9526add4a2d4629f4d417124573996445ae";
- })
- ];
- buildInputs =
- (self.nativeDeps."request" or []);
- deps = {
- "qs-0.6.6" = self.by-version."qs"."0.6.6";
- "json-stringify-safe-5.0.1" = self.by-version."json-stringify-safe"."5.0.1";
- "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2";
- "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
- "mime-1.2.11" = self.by-version."mime"."1.2.11";
- "tough-cookie-1.1.0" = self.by-version."tough-cookie"."1.1.0";
- "form-data-0.1.4" = self.by-version."form-data"."0.1.4";
- "tunnel-agent-0.3.0" = self.by-version."tunnel-agent"."0.3.0";
- "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1";
- "oauth-sign-0.3.0" = self.by-version."oauth-sign"."0.3.0";
- "hawk-1.0.0" = self.by-version."hawk"."1.0.0";
- "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0";
- };
- peerDependencies = [
- ];
- passthru.names = [ "request" ];
- };
- "request" = self.by-version."request"."2.34.0";
- by-spec."rimraf"."2" =
- self.by-version."rimraf"."2.3.4";
- by-version."rimraf"."2.3.4" = lib.makeOverridable self.buildNodePackage {
- name = "rimraf-2.3.4";
- bin = true;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/rimraf/-/rimraf-2.3.4.tgz";
- name = "rimraf-2.3.4.tgz";
- sha1 = "82d9bc1b2fcf31e205ac7b28138a025d08e9159a";
- })
- ];
- buildInputs =
- (self.nativeDeps."rimraf" or []);
- deps = {
- "glob-4.5.3" = self.by-version."glob"."4.5.3";
- };
- peerDependencies = [
- ];
- passthru.names = [ "rimraf" ];
- };
- by-spec."send"."0.12.3" =
- self.by-version."send"."0.12.3";
- by-version."send"."0.12.3" = lib.makeOverridable self.buildNodePackage {
- name = "send-0.12.3";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/send/-/send-0.12.3.tgz";
- name = "send-0.12.3.tgz";
- sha1 = "cd12dc58fde21e4f91902b39b2fda05a7a6d9bdc";
- })
- ];
- buildInputs =
- (self.nativeDeps."send" or []);
- deps = {
- "debug-2.2.0" = self.by-version."debug"."2.2.0";
- "depd-1.0.1" = self.by-version."depd"."1.0.1";
- "destroy-1.0.3" = self.by-version."destroy"."1.0.3";
- "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
- "etag-1.6.0" = self.by-version."etag"."1.6.0";
- "fresh-0.2.4" = self.by-version."fresh"."0.2.4";
- "mime-1.3.4" = self.by-version."mime"."1.3.4";
- "ms-0.7.1" = self.by-version."ms"."0.7.1";
- "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1";
- "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
- };
- peerDependencies = [
- ];
- passthru.names = [ "send" ];
- };
- by-spec."serve-static"."~1.9.3" =
- self.by-version."serve-static"."1.9.3";
- by-version."serve-static"."1.9.3" = lib.makeOverridable self.buildNodePackage {
- name = "serve-static-1.9.3";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/serve-static/-/serve-static-1.9.3.tgz";
- name = "serve-static-1.9.3.tgz";
- sha1 = "5f8da07323ad385ff3dc541f1a7917b2e436eb57";
- })
- ];
- buildInputs =
- (self.nativeDeps."serve-static" or []);
- deps = {
- "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
- "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
- "send-0.12.3" = self.by-version."send"."0.12.3";
- "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
- };
- peerDependencies = [
- ];
- passthru.names = [ "serve-static" ];
- };
- by-spec."sntp"."0.2.x" =
- self.by-version."sntp"."0.2.4";
- by-version."sntp"."0.2.4" = lib.makeOverridable self.buildNodePackage {
- name = "sntp-0.2.4";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz";
- name = "sntp-0.2.4.tgz";
- sha1 = "fb885f18b0f3aad189f824862536bceeec750900";
- })
- ];
- buildInputs =
- (self.nativeDeps."sntp" or []);
- deps = {
- "hoek-0.9.1" = self.by-version."hoek"."0.9.1";
- };
- peerDependencies = [
- ];
- passthru.names = [ "sntp" ];
- };
- by-spec."tar"."~0.1.19" =
- self.by-version."tar"."0.1.20";
- by-version."tar"."0.1.20" = lib.makeOverridable self.buildNodePackage {
- name = "tar-0.1.20";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/tar/-/tar-0.1.20.tgz";
- name = "tar-0.1.20.tgz";
- sha1 = "42940bae5b5f22c74483699126f9f3f27449cb13";
- })
- ];
- buildInputs =
- (self.nativeDeps."tar" or []);
- deps = {
- "block-stream-0.0.8" = self.by-version."block-stream"."0.0.8";
- "fstream-0.1.31" = self.by-version."fstream"."0.1.31";
- "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
- };
- peerDependencies = [
- ];
- passthru.names = [ "tar" ];
- };
- "tar" = self.by-version."tar"."0.1.20";
- by-spec."tinycolor"."0.x" =
- self.by-version."tinycolor"."0.0.1";
- by-version."tinycolor"."0.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "tinycolor-0.0.1";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/tinycolor/-/tinycolor-0.0.1.tgz";
- name = "tinycolor-0.0.1.tgz";
- sha1 = "320b5a52d83abb5978d81a3e887d4aefb15a6164";
- })
- ];
- buildInputs =
- (self.nativeDeps."tinycolor" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "tinycolor" ];
- };
- by-spec."tough-cookie".">=0.12.0" =
- self.by-version."tough-cookie"."1.1.0";
- by-version."tough-cookie"."1.1.0" = lib.makeOverridable self.buildNodePackage {
- name = "tough-cookie-1.1.0";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-1.1.0.tgz";
- name = "tough-cookie-1.1.0.tgz";
- sha1 = "126d2490e66ae5286b6863debd4a341076915954";
- })
- ];
- buildInputs =
- (self.nativeDeps."tough-cookie" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "tough-cookie" ];
- };
- by-spec."tunnel-agent"."~0.3.0" =
- self.by-version."tunnel-agent"."0.3.0";
- by-version."tunnel-agent"."0.3.0" = lib.makeOverridable self.buildNodePackage {
- name = "tunnel-agent-0.3.0";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.3.0.tgz";
- name = "tunnel-agent-0.3.0.tgz";
- sha1 = "ad681b68f5321ad2827c4cfb1b7d5df2cfe942ee";
- })
- ];
- buildInputs =
- (self.nativeDeps."tunnel-agent" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "tunnel-agent" ];
- };
- by-spec."type-is"."~1.6.2" =
- self.by-version."type-is"."1.6.2";
- by-version."type-is"."1.6.2" = lib.makeOverridable self.buildNodePackage {
- name = "type-is-1.6.2";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/type-is/-/type-is-1.6.2.tgz";
- name = "type-is-1.6.2.tgz";
- sha1 = "694e83e5d110417e681cea278227f264ae406e33";
- })
- ];
- buildInputs =
- (self.nativeDeps."type-is" or []);
- deps = {
- "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0";
- "mime-types-2.0.12" = self.by-version."mime-types"."2.0.12";
- };
- peerDependencies = [
- ];
- passthru.names = [ "type-is" ];
- };
- by-spec."utils-merge"."1.0.0" =
- self.by-version."utils-merge"."1.0.0";
- by-version."utils-merge"."1.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "utils-merge-1.0.0";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz";
- name = "utils-merge-1.0.0.tgz";
- sha1 = "0294fb922bb9375153541c4f7096231f287c8af8";
- })
- ];
- buildInputs =
- (self.nativeDeps."utils-merge" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "utils-merge" ];
- };
- by-spec."vary"."~1.0.0" =
- self.by-version."vary"."1.0.0";
- by-version."vary"."1.0.0" = lib.makeOverridable self.buildNodePackage {
- name = "vary-1.0.0";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/vary/-/vary-1.0.0.tgz";
- name = "vary-1.0.0.tgz";
- sha1 = "c5e76cec20d3820d8f2a96e7bee38731c34da1e7";
- })
- ];
- buildInputs =
- (self.nativeDeps."vary" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "vary" ];
- };
- by-spec."wrappy"."1" =
- self.by-version."wrappy"."1.0.1";
- by-version."wrappy"."1.0.1" = lib.makeOverridable self.buildNodePackage {
- name = "wrappy-1.0.1";
- bin = false;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz";
- name = "wrappy-1.0.1.tgz";
- sha1 = "1e65969965ccbc2db4548c6b84a6f2c5aedd4739";
- })
- ];
- buildInputs =
- (self.nativeDeps."wrappy" or []);
- deps = {
- };
- peerDependencies = [
- ];
- passthru.names = [ "wrappy" ];
- };
- by-spec."ws"."~0.4.32" =
- self.by-version."ws"."0.4.32";
- by-version."ws"."0.4.32" = lib.makeOverridable self.buildNodePackage {
- name = "ws-0.4.32";
- bin = true;
- src = [
- (fetchurl {
- url = "http://registry.npmjs.org/ws/-/ws-0.4.32.tgz";
- name = "ws-0.4.32.tgz";
- sha1 = "787a6154414f3c99ed83c5772153b20feb0cec32";
- })
- ];
- buildInputs =
- (self.nativeDeps."ws" or []);
- deps = {
- "commander-2.1.0" = self.by-version."commander"."2.1.0";
- "nan-1.0.0" = self.by-version."nan"."1.0.0";
- "tinycolor-0.0.1" = self.by-version."tinycolor"."0.0.1";
- "options-0.0.6" = self.by-version."options"."0.0.6";
- };
- peerDependencies = [
- ];
- passthru.names = [ "ws" ];
- };
- "ws" = self.by-version."ws"."0.4.32";
-}
+{pkgs ? import {
+ inherit system;
+ }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}:
+
+let
+ nodeEnv = import ../../../development/node-packages/node-env.nix {
+ inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
+ inherit nodejs;
+ };
+in
+import ./node-packages.nix {
+ inherit (pkgs) fetchurl fetchgit;
+ inherit nodeEnv;
+}
\ No newline at end of file
diff --git a/pkgs/applications/editors/zile/default.nix b/pkgs/applications/editors/zile/default.nix
index 58971b3199bfa26e8aa8df2683d73020deabf36c..7213b22c949b89561e2c846249d59d14e47472ee 100644
--- a/pkgs/applications/editors/zile/default.nix
+++ b/pkgs/applications/editors/zile/default.nix
@@ -1,25 +1,27 @@
{ fetchurl, stdenv, pkgconfig, ncurses, boehmgc, perl, help2man }:
stdenv.mkDerivation rec {
- name = "zile-2.4.13";
+ name = "zile-2.4.14";
src = fetchurl {
url = "mirror://gnu/zile/${name}.tar.gz";
- sha256 = "03mcg0bxkzprlsx8y6h22w924pzx4a9zr7zm3g11j8j3x9lz75f7";
+ sha256 = "0x3byaddms8l3g7igx6njycqsq98wgapysdb5c7lhcnajlkp8y3s";
};
- buildInputs = [ pkgconfig ncurses boehmgc ];
- nativeBuildInputs = [ help2man perl ];
-
- # `help2man' wants to run Zile, which fails when cross-compiling.
- crossAttrs.nativeBuildInputs = [];
+ buildInputs = [ ncurses boehmgc ];
+ nativeBuildInputs = [ perl pkgconfig ]
+ # `help2man' wants to run Zile, which won't work when the
+ # newly-produced binary can't be run at build-time.
+ ++ stdenv.lib.optional
+ (stdenv.hostPlatform == stdenv.buildPlatform)
+ help2man;
# Tests can't be run because most of them rely on the ability to
# fiddle with the terminal.
doCheck = false;
# XXX: Work around cross-compilation-unfriendly `gl_FUNC_FSTATAT' macro.
- preConfigure = "export gl_cv_func_fstatat_zero_flag=yes";
+ gl_cv_func_fstatat_zero_flag="yes";
meta = with stdenv.lib; {
description = "Lightweight Emacs clone";
diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix
index 790997e328b4bad861470f0ffd66a77b735ce54d..3382bb3e56d7d8d3f0d897a96fd218c874af9e2e 100644
--- a/pkgs/applications/gis/grass/default.nix
+++ b/pkgs/applications/gis/grass/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation {
sha256 = "02qrdgn46gxr60amxwax4b8fkkmhmjxi6qh4yfvpbii6ai6diarf";
};
- buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite pkgconfig cairo
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite cairo
readline ffmpeg makeWrapper wxGTK30 netcdf geos postgresql mysql.client blas ]
++ (with python2Packages; [ python dateutil wxPython30 numpy ]);
@@ -71,5 +72,6 @@ stdenv.mkDerivation {
description = "GIS software suite used for geospatial data management and analysis, image processing, graphics and maps production, spatial modeling, and visualization";
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.all;
+ broken = true;
};
}
diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix
index 10c2ab9ebf99e2d8c396f9d611de26850412233b..a008835f59fff35f1aef8ff089a4fca2b0050521 100644
--- a/pkgs/applications/gis/qgis/default.nix
+++ b/pkgs/applications/gis/qgis/default.nix
@@ -5,7 +5,7 @@
}:
stdenv.mkDerivation rec {
- name = "qgis-2.18.10";
+ name = "qgis-2.18.13";
buildInputs = [ gdal qt4 flex openssl bison proj geos xlibsWrapper sqlite gsl qwt qscintilla
fcgi libspatialindex libspatialite postgresql qjson qca2 txt2tags ] ++
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://qgis.org/downloads/${name}.tar.bz2";
- sha256 = "1vrzxhnpzd75iia4xmhbxy90x0wlvj2w4210f0r8203hd2m4sxdj";
+ sha256 = "033l3wg3l7hv4642wmsdycjca1dw8p89sk9xyc51wpb3id17vgv2";
};
cmakeFlags = stdenv.lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}";
diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix
index 83f725622d7af2a35fc1286f29b30a4c1dbdcc68..4d229450a4a72e7b0c29439e84ec3f4dba47be52 100644
--- a/pkgs/applications/gis/saga/default.nix
+++ b/pkgs/applications/gis/saga/default.nix
@@ -2,15 +2,15 @@
libharu, opencv, vigra, postgresql }:
stdenv.mkDerivation rec {
- name = "saga-2.3.1";
+ name = "saga-5.0.0";
buildInputs = [ gdal wxGTK30 proj libharu opencv vigra postgresql libiodbc lzma jasper ];
enableParallelBuilding = true;
src = fetchurl {
- url = "mirror://sourceforge/project/saga-gis/SAGA%20-%202.3/SAGA%202.3.1/saga_2.3.1.tar.gz";
- sha256 = "1h4zkfid9z02mqm1f8az9j0pzmm95f83ra57c4r7bvrrz21w3xaq";
+ url = "mirror://sourceforge/project/saga-gis/SAGA%20-%205/SAGA%20-%205.0.0/saga-5.0.0.tar.gz";
+ sha256 = "9be997209737e80262d9f13fd9b9797194a9f2facb10e5b9bd756d8cda675089";
};
meta = {
diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix
index 5524f12077f93a3a13f575c0781a11d2f9024f14..973e7f88e800972ca743a5247ca59dd33a159b68 100644
--- a/pkgs/applications/graphics/ImageMagick/7.0.nix
+++ b/pkgs/applications/graphics/ImageMagick/7.0.nix
@@ -10,11 +10,12 @@ let
if stdenv.system == "i686-linux" then "i686"
else if stdenv.system == "x86_64-linux" || stdenv.system == "x86_64-darwin" then "x86-64"
else if stdenv.system == "armv7l-linux" then "armv7l"
+ else if stdenv.system == "aarch64-linux" then "aarch64"
else throw "ImageMagick is not supported on this platform.";
cfg = {
- version = "7.0.6-4";
- sha256 = "0fvkx9lf8g0sa9bccd9s5qyhcy0g1mqnkbpqly55ryxyg1ywxqaz";
+ version = "7.0.7-9";
+ sha256 = "0p0879chcfrghcamwgxxcmaaj04xv0z91ris7hxi37qdw8c7836w";
patches = [];
};
in
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index e31c249bb93bf5e0e9501d6d6eebb6735a2cc1dd..507912ee43eae462c3bb5c55ce4c58071e12c477 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -10,11 +10,12 @@ let
if stdenv.system == "i686-linux" then "i686"
else if stdenv.system == "x86_64-linux" || stdenv.system == "x86_64-darwin" then "x86-64"
else if stdenv.system == "armv7l-linux" then "armv7l"
+ else if stdenv.system == "aarch64-linux" then "aarch64"
else throw "ImageMagick is not supported on this platform.";
cfg = {
- version = "6.9.9-7";
- sha256 = "1lwsz9b8clygdppgawv2hsry4aykgmawjlwhg3fj70rndv4a8rw4";
+ version = "6.9.9-21";
+ sha256 = "0241g3c207rawn61bz8rc5gz55k5mi2b0n3zlwa0jv9xczlkd6a9";
patches = [];
}
# Freeze version on mingw so we don't need to port the patch too often.
diff --git a/pkgs/applications/graphics/PythonMagick/default.nix b/pkgs/applications/graphics/PythonMagick/default.nix
index b1f64afd9aee3443d1b7a05e63a94414a6547757..f0b4a991f74ae42a60607fa241ea75db724970b3 100644
--- a/pkgs/applications/graphics/PythonMagick/default.nix
+++ b/pkgs/applications/graphics/PythonMagick/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://imagemagick/python/releases/PythonMagick-${version}.tar.xz";
- sha256 = "0vkgpmrdz530nyvmjahpdrvcj7fd7hvsp15d485hq6103qycisv8";
+ sha256 = "137278mfb5079lns2mmw73x8dhpzgwha53dyl00mmhj2z25varpn";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/pkgs/applications/graphics/ahoviewer/default.nix
index 986e16834f76b68eb77304f07b2cdc826725a22e..2d42a479999ba65a10d53952dcfe70bbdadd2864 100644
--- a/pkgs/applications/graphics/ahoviewer/default.nix
+++ b/pkgs/applications/graphics/ahoviewer/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "ahoviewer-${version}";
- version = "1.4.8";
+ version = "1.4.9";
src = fetchFromGitHub {
owner = "ahodesuka";
repo = "ahoviewer";
rev = version;
- sha256 = "0fsak22hpi2r8zqysswdyngaf3n635qvclqh1p0g0wrkfza4dbc4";
+ sha256 = "194h3k5zvd8gjrbs91qba7d9h7i30yh4rjk4w3aa1vwvv0qm2amx";
};
enableParallelBuilding = true;
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = https://github.com/ahodesuka/ahoviewer;
description = "A GTK2 image viewer, manga reader, and booru browser";
- maintainers = [ maintainers.skrzyp ];
+ maintainers = with maintainers; [ skrzyp xzfc ];
license = licenses.mit;
platforms = platforms.allBut [ "darwin" "cygwin" ];
};
diff --git a/pkgs/applications/graphics/ao/default.nix b/pkgs/applications/graphics/ao/default.nix
index 2bba73fae1a7b187f7f4e6f10c244500dd6847f8..990fee8cc37c94f85036264c2abff1a1da2a1ca5 100644
--- a/pkgs/applications/graphics/ao/default.nix
+++ b/pkgs/applications/graphics/ao/default.nix
@@ -5,11 +5,13 @@
stdenv.mkDerivation rec {
version = "0.0pre20160820";
name = "ao-${version}";
+
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- cmake ninja boost libpng glfw3 epoxy guile pkgconfig mesa libX11
+ cmake ninja boost libpng glfw3 epoxy guile mesa libX11
libpthreadstubs libXau libXdmcp libXrandr libXext libXinerama libXxf86vm
libXcursor libXfixes
- ];
+ ];
src = fetchgit {
url = https://github.com/mkeeter/ao;
@@ -18,7 +20,6 @@ stdenv.mkDerivation rec {
};
cmakeFlags = "-G Ninja";
- buildPhase = "ninja";
installPhase = ''
ninja install
cd ..
diff --git a/pkgs/applications/graphics/astah-community/default.nix b/pkgs/applications/graphics/astah-community/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..72d367d8fea212f3017379c89b2dd028efbe6092
--- /dev/null
+++ b/pkgs/applications/graphics/astah-community/default.nix
@@ -0,0 +1,63 @@
+{ stdenv, fetchurl, makeWrapper, makeDesktopItem, unzip, jre }:
+
+let
+
+ name = "astah-community";
+ version = "7.2.0";
+ postfix = "1ff236";
+ desktopIcon = fetchurl {
+ name = "${name}.png";
+ url = "https://aur.archlinux.org/cgit/aur.git/plain/astah_community.png?h=astah-community&id=94710b5a6aadcaf489022b0f0e61f8832ae6fa87";
+ sha256 = "0knlknwfqqnhg63sxxpia5ykn397id31gzr956wnn6yjj58k3ckm";
+ };
+ mimeXml = fetchurl {
+ name = "${name}.xml";
+ url = "https://aur.archlinux.org/cgit/aur.git/plain/astah_community.xml?h=astah-community&id=94710b5a6aadcaf489022b0f0e61f8832ae6fa87";
+ sha256 = "096n2r14ddm97r32i4sbp7v4qdmwn9sxy7lwphcx1nydppb0m97b";
+ };
+ desktopItem = makeDesktopItem {
+ name = name;
+ exec = "astah %U";
+ icon = "${desktopIcon}";
+ comment = "Lightweight, easy-to-use, and free UML2.x modeler";
+ desktopName = "Astah* Community";
+ genericName = "Astah* Community";
+ mimeType = "application/x-astah";
+ categories = "Application;Development;";
+ extraEntries = "NoDisplay=false";
+ };
+
+in
+
+stdenv.mkDerivation {
+ name = "${name}-${version}";
+
+ src = fetchurl {
+ url = "http://cdn.change-vision.com/files/${name}-${stdenv.lib.replaceStrings ["."] ["_"] version}-${postfix}.zip";
+ sha256 = "1lkl30jdjiarvh2ap9rjabvrq9qhrlmfrasv3vvkag22y9w4l499";
+ };
+
+ nativeBuildInputs = [ unzip makeWrapper ];
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out/{bin,share}
+ cp -r . $out/share/astah
+ cp -r ${desktopItem}/share/applications $out/share/applications
+
+ install -D ${desktopIcon} $out/share/pixmaps/${name}.png
+ install -D ${mimeXml} $out/share/mime/packages/${name}.xml
+
+ makeWrapper ${jre}/bin/java $out/bin/astah \
+ --add-flags "-jar $out/share/astah/astah-community.jar"
+
+ runHook postInstall
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Lightweight, easy-to-use, and free UML2.x modeler";
+ homepage = http://astah.net/editions/community;
+ license = licenses.unfree;
+ };
+}
diff --git a/pkgs/applications/graphics/autotrace/default.nix b/pkgs/applications/graphics/autotrace/default.nix
index 2131589339c0974db275b6bf8c60ca01f392e7cc..7af7c8986f2fdbaeeca1197ebc7f2df57e7a1e42 100644
--- a/pkgs/applications/graphics/autotrace/default.nix
+++ b/pkgs/applications/graphics/autotrace/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, callPackage, libpng12, imagemagick,
- autoreconfHook, glib, pstoedit, pkgconfig, gettext, darwin }:
+ autoreconfHook, glib, pstoedit, pkgconfig, gettext, gd, darwin }:
# TODO: Figure out why the resultant binary is somehow linked against
# libpng16.so.16 rather than libpng12.
@@ -36,8 +36,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook glib autofig pkgconfig gettext ];
buildInputs = [ libpng12 imagemagick pstoedit ]
++ stdenv.lib.optionals stdenv.isDarwin
- (with darwin.apple_sdk.frameworks; [ApplicationServices]);
-
+ (with darwin.apple_sdk.frameworks; [ gd ApplicationServices ]);
+
postUnpack = ''
pushd $sourceRoot
autofig autotrace-config.af
@@ -66,5 +66,59 @@ stdenv.mkDerivation rec {
platforms = platforms.unix;
maintainers = with maintainers; [ hodapp ];
license = licenses.gpl2;
+ knownVulnerabilities = [
+ "CVE-2013-1953"
+ "CVE-2016-7392"
+ "CVE-2017-9151"
+ "CVE-2017-9152"
+ "CVE-2017-9153"
+ "CVE-2017-9154"
+ "CVE-2017-9155"
+ "CVE-2017-9156"
+ "CVE-2017-9157"
+ "CVE-2017-9158"
+ "CVE-2017-9159"
+ "CVE-2017-9160"
+ "CVE-2017-9161"
+ "CVE-2017-9162"
+ "CVE-2017-9163"
+ "CVE-2017-9164"
+ "CVE-2017-9165"
+ "CVE-2017-9166"
+ "CVE-2017-9167"
+ "CVE-2017-9168"
+ "CVE-2017-9169"
+ "CVE-2017-9170"
+ "CVE-2017-9171"
+ "CVE-2017-9172"
+ "CVE-2017-9173"
+ "CVE-2017-9174"
+ "CVE-2017-9175"
+ "CVE-2017-9176"
+ "CVE-2017-9177"
+ "CVE-2017-9178"
+ "CVE-2017-9179"
+ "CVE-2017-9180"
+ "CVE-2017-9181"
+ "CVE-2017-9182"
+ "CVE-2017-9183"
+ "CVE-2017-9184"
+ "CVE-2017-9185"
+ "CVE-2017-9186"
+ "CVE-2017-9187"
+ "CVE-2017-9188"
+ "CVE-2017-9189"
+ "CVE-2017-9190"
+ "CVE-2017-9191"
+ "CVE-2017-9192"
+ "CVE-2017-9193"
+ "CVE-2017-9194"
+ "CVE-2017-9195"
+ "CVE-2017-9196"
+ "CVE-2017-9197"
+ "CVE-2017-9198"
+ "CVE-2017-9199"
+ "CVE-2017-9200"
+ ];
};
}
diff --git a/pkgs/applications/graphics/awesomebump/default.nix b/pkgs/applications/graphics/awesomebump/default.nix
index 9e0916bab9cf998009223b47674989e286706754..f190b421b0566588832d991c2f1ece550dc07e71 100644
--- a/pkgs/applications/graphics/awesomebump/default.nix
+++ b/pkgs/applications/graphics/awesomebump/default.nix
@@ -1,32 +1,50 @@
-{ lib, stdenv, fetchurl, qtbase, qmake, makeWrapper }:
+{ lib, stdenv, fetchgit, qtbase, qmake, makeWrapper, qtscript, gcc, flex, bison, qtdeclarative, gnutar }:
-stdenv.mkDerivation {
- name = "awesomebump-4.0";
- src = fetchurl {
- url = https://github.com/kmkolasinski/AwesomeBump/archive/Linuxv4.0.tar.gz;
- sha256 = "1rp4m4y2ld49hibzwqwy214cbiin80i882d9l0y1znknkdcclxf2";
+let
+ version = "5.1";
+
+ src = fetchgit {
+ url = "https://github.com/kmkolasinski/AwesomeBump.git";
+ rev = "Winx32v${version}";
+ sha256 = "1c8b9jki0v8kzkvsvyv7q1w3s7j40br6ph15hh2xi0a1mpwckq56";
+ fetchSubmodules = true;
+ };
+
+ qtnproperty = stdenv.mkDerivation {
+ name = "qtnproperty";
+ inherit src;
+ sourceRoot = "AwesomeBump/Sources/utils/QtnProperty";
+ buildInputs = [ qtscript qtbase qtdeclarative ];
+ nativeBuildInputs = [ qmake flex bison ];
+ postInstall = ''
+ install -D bin-linux/QtnPEG $out/bin/QtnPEG
+ '';
};
+in stdenv.mkDerivation rec {
+ name = "awesomebump-${version}";
- setSourceRoot = "sourceRoot=$(echo */Sources)";
+ inherit src;
- nativeBuildInputs = [ makeWrapper qmake ];
- buildInputs = [ qtbase ];
+ buildInputs = [ qtbase qtscript qtdeclarative ];
- enableParallelBuilding = true;
+ nativeBuildInputs = [ qmake makeWrapper ];
- installPhase =
- ''
- d=$out/libexec/AwesomeBump
- mkdir -p $d $out/bin
- cp AwesomeBump $d/
- cp -prd ../Bin/Configs ../Bin/Core $d/
+ preBuild = ''
+ ln -sf ${qtnproperty}/bin/QtnPEG Sources/utils/QtnProperty/bin-linux/QtnPEG
+ '';
- # AwesomeBump expects to find Core and Configs in its current
- # directory.
- makeWrapper $d/AwesomeBump $out/bin/AwesomeBump \
+ postInstall = ''
+ d=$out/libexec/AwesomeBump
+
+ mkdir -p $d
+ cp -vr workdir/`cat workdir/current`/bin/AwesomeBump $d/
+ cp -prd Bin/Configs Bin/Core $d/
+
+ # AwesomeBump expects to find Core and Configs in its current directory.
+ makeWrapper $d/AwesomeBump $out/bin/AwesomeBump \
--run "cd $d"
- '';
+ '';
meta = {
homepage = https://github.com/kmkolasinski/AwesomeBump;
diff --git a/pkgs/applications/graphics/c3d/default.nix b/pkgs/applications/graphics/c3d/default.nix
index a254993a016b6df17dbfd91055f54b3896b47609..74631e88ebfb611b14e66b0453c73a42ef39c851 100644
--- a/pkgs/applications/graphics/c3d/default.nix
+++ b/pkgs/applications/graphics/c3d/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchgit, cmake, itk }:
+{ stdenv, fetchgit, cmake, itk, Cocoa }:
stdenv.mkDerivation rec {
- _name = "c3d";
- _version = "1.1.0";
- name = "${_name}-${_version}";
+ name = "${pname}-${version}";
+ pname = "c3d";
+ version = "1.1.0";
src = fetchgit {
url = "https://git.code.sf.net/p/c3d/git";
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ cmake ];
- buildInputs = [ itk ];
+ buildInputs = [ itk ]
+ ++ stdenv.lib.optional stdenv.isDarwin Cocoa;
meta = with stdenv.lib; {
homepage = http://www.itksnap.org/c3d;
diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix
index 8d8e36a8bc892065e7f7569c3ccfb152cb081a08..73362588a57eb9fb1fd7d3563ca6613d14b27113 100644
--- a/pkgs/applications/graphics/dia/default.nix
+++ b/pkgs/applications/graphics/dia/default.nix
@@ -1,50 +1,43 @@
-{stdenv, fetchurl, gtk2, pkgconfig, perl, perlXMLParser, libxml2, gettext
-, python, libxml2Python, docbook5, docbook_xsl, libxslt, intltool, libart_lgpl
-, withGNOME ? false, libgnomeui }:
+{ stdenv, fetchgit, autoconf, automake, libtool, gtk2, pkgconfig, perl,
+perlXMLParser, libxml2, gettext, python, libxml2Python, docbook5, docbook_xsl,
+libxslt, intltool, libart_lgpl, withGNOME ? false, libgnomeui,
+gtk-mac-integration }:
stdenv.mkDerivation rec {
- name = "dia-${minVer}.3";
- minVer = "0.97";
+ name = "dia-${version}";
+ version = "0.97.3.20170622";
- src = fetchurl {
- url = "mirror://gnome/sources/dia/${minVer}/${name}.tar.xz";
- sha256 = "0d3x6w0l6fwd0l8xx06y1h56xf8ss31yzia3a6xr9y28xx44x492";
- };
-
- correctPersistence = fetchurl {
- url = https://launchpadlibrarian.net/132677658/persistence;
- sha256 = "1rv6zv9i03bna4bdp1wzn72lg7kdwi900y1izdq0imibi54nxjsk";
+ src = fetchgit {
+ url = git://git.gnome.org/dia;
+ rev = "b86085dfe2b048a2d37d587adf8ceba6fb8bc43c";
+ sha256 = "1fyxfrzdcs6blxhkw3bcgkksaf3byrsj4cbyrqgb4869k3ynap96";
};
buildInputs =
[ gtk2 perlXMLParser libxml2 gettext python libxml2Python docbook5
- libxslt docbook_xsl libart_lgpl
- ] ++ stdenv.lib.optional withGNOME libgnomeui;
+ libxslt docbook_xsl libart_lgpl ]
+ ++ stdenv.lib.optional withGNOME libgnomeui
+ ++ stdenv.lib.optional stdenv.isDarwin gtk-mac-integration;
- nativeBuildInputs = [ pkgconfig intltool perl ];
+ nativeBuildInputs = [ autoconf automake libtool pkgconfig intltool perl ];
+ preConfigure = ''
+ NOCONFIGURE=1 ./autogen.sh # autoreconfHook is not enough
+ '';
configureFlags = stdenv.lib.optionalString withGNOME "--enable-gnome";
- patches = [ ];
+ hardeningDisable = [ "format" ];
# This file should normally require a gtk-update-icon-cache -q /usr/share/icons/hicolor command
# It have no reasons to exist in a redistribuable package
postInstall = ''
rm $out/share/icons/hicolor/icon-theme.cache
-
- cd "$out"/bin/
- mv dia .dia-wrapped
- echo '#! ${stdenv.shell}' >> dia
- echo 'test -f "$HOME/.dia/persistence" || cp ${correctPersistence} "$HOME/.dia/persistence" ' >> dia
- echo 'chmod u+rw "$HOME/.dia/persistence" ' >> dia
- echo "\"$out/bin/"'.dia-wrapped" "$@"' >> dia
- chmod a+x dia
'';
meta = {
description = "Gnome Diagram drawing software";
homepage = http://live.gnome.org/Dia;
maintainers = with stdenv.lib.maintainers; [raskin];
- platforms = stdenv.lib.platforms.linux;
+ platforms = stdenv.lib.platforms.unix;
};
}
diff --git a/pkgs/applications/graphics/digikam/0001-Disable-fno-operator-names.patch b/pkgs/applications/graphics/digikam/0001-Disable-fno-operator-names.patch
deleted file mode 100644
index 149a2b2b1aca80a860adc6cb10c6296036e9f8b4..0000000000000000000000000000000000000000
--- a/pkgs/applications/graphics/digikam/0001-Disable-fno-operator-names.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From beb9ad0149adfe448acfa650fb3e171d5fdd7e27 Mon Sep 17 00:00:00 2001
-From: Moritz Ulrich
-Date: Wed, 22 Feb 2017 15:28:11 +0100
-Subject: [PATCH] Disable `-fno-operator-names`
-
----
- core/CMakeLists.txt | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
-index 89e06827e6..01d0c88ea9 100644
---- a/core/CMakeLists.txt
-+++ b/core/CMakeLists.txt
-@@ -98,6 +98,8 @@ include(MacroOpenCV)
- include(MacroJPEG)
- include(MacroBoolTo01)
-
-+string(REPLACE "-fno-operator-names" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-+
- # ==================================================================================================
-
- option(ENABLE_OPENCV3 "Build digiKam with OpenCV3 instead OpenCV2 (default=OFF)" OFF)
---
-2.11.1
-
diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix
index 96b1ca54d558369e4548ae0841da164158b5f5d1..a62940ff7038528420fa1215ff92f182fd92412c 100644
--- a/pkgs/applications/graphics/digikam/default.nix
+++ b/pkgs/applications/graphics/digikam/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, fetchurl, cmake, extra-cmake-modules, wrapGAppsHook
+{ mkDerivation, lib, fetchurl, cmake, doxygen, extra-cmake-modules, wrapGAppsHook
# For `digitaglinktree`
, perl, sqlite
@@ -8,6 +8,7 @@
, qtsvg
, qtwebkit
+, kcalcore
, kconfigwidgets
, kcoreaddons
, kdoctools
@@ -28,12 +29,15 @@
, lensfun
, libgphoto2
, libkipi
+, libksane
, liblqr1
, libqtav
, libusb1
, marble
+, mesa
, mysql
-, opencv
+, opencv3
+, pcre
, threadweaver
# For panorama and focus stacking
@@ -46,16 +50,14 @@
mkDerivation rec {
name = "digikam-${version}";
- version = "5.4.0";
+ version = "5.7.0";
src = fetchurl {
- url = "http://download.kde.org/stable/digikam/${name}.tar.xz";
- sha256 = "0dgsgji14l5zvxny36hrfsp889fsfrsbbn9bg57m18404xp903kg";
+ url = "mirror://kde/stable/digikam/${name}.tar.xz";
+ sha256 = "1xah079g47fih8l9qy1ifppfvmq5yms5y1z54nvxdyz8nsszy19n";
};
- nativeBuildInputs = [ cmake extra-cmake-modules kdoctools wrapGAppsHook ];
-
- patches = [ ./0001-Disable-fno-operator-names.patch ];
+ nativeBuildInputs = [ cmake doxygen extra-cmake-modules kdoctools wrapGAppsHook ];
buildInputs = [
bison
@@ -68,19 +70,21 @@ mkDerivation rec {
lensfun
libgphoto2
libkipi
+ libksane
liblqr1
libqtav
libusb1
+ mesa
mysql
- opencv
- ];
+ opencv3
+ pcre
- propagatedBuildInputs = [
qtbase
qtxmlpatterns
qtsvg
qtwebkit
+ kcalcore
kconfigwidgets
kcoreaddons
kfilemetadata
@@ -98,8 +102,6 @@ mkDerivation rec {
enableParallelBuilding = true;
cmakeFlags = [
- "-DLIBUSB_LIBRARIES=${libusb1.out}/lib"
- "-DLIBUSB_INCLUDE_DIR=${libusb1.dev}/include/libusb-1.0"
"-DENABLE_MYSQLSUPPORT=1"
"-DENABLE_INTERNALMYSQL=1"
"-DENABLE_MEDIAPLAYER=1"
diff --git a/pkgs/applications/graphics/draftsight/default.nix b/pkgs/applications/graphics/draftsight/default.nix
index a1cf91989ebee6d4079d5e89ee615365321cd4ba..17334c5b366c4da003b08d648ccac25dbddc8ea8 100644
--- a/pkgs/applications/graphics/draftsight/default.nix
+++ b/pkgs/applications/graphics/draftsight/default.nix
@@ -6,7 +6,7 @@
assert stdenv.system == "x86_64-linux";
-let version = "2017-SP1"; in
+let version = "2017-SP2"; in
stdenv.mkDerivation {
name = "draftsight-${version}";
@@ -56,7 +56,7 @@ stdenv.mkDerivation {
src = requireFile {
name = "draftSight.deb";
url = "https://www.3ds.com/?eID=3ds_brand_download&uid=41&pidDown=13426&L=0";
- sha256 = "0s7b74685r0961kd59hxpdp9s5yhvzx8307imsxm66f99s8rswdv";
+ sha256 = "04i3dqza6y4p2059pqg5inp3qzr5jmiqplzzk7h1a6gh380v1rbr";
};
libPath = stdenv.lib.makeLibraryPath [ gcc.cc mesa xdg_utils
diff --git a/pkgs/applications/graphics/exrdisplay/default.nix b/pkgs/applications/graphics/exrdisplay/default.nix
index f15730874744a0b370b604b53c1f09ce0a4291c6..3386d75e81e19b4625ac7f7b08b232d1881ba709 100644
--- a/pkgs/applications/graphics/exrdisplay/default.nix
+++ b/pkgs/applications/graphics/exrdisplay/default.nix
@@ -18,7 +18,8 @@ stdenv.mkDerivation {
make LDFLAGS="`fltk-config --ldflags` -lGL -lfltk_gl"
'';
- buildInputs = [ openexr fltk pkgconfig mesa openexr_ctl ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ openexr fltk mesa openexr_ctl ];
meta = {
description = "Application for viewing OpenEXR images on a display at various exposure settings";
diff --git a/pkgs/applications/graphics/exrtools/default.nix b/pkgs/applications/graphics/exrtools/default.nix
index d49110d006934e5692835921ad4dec50c4ae53dc..097062a8258a7dc62a04c8a1fa9ba1aeb3f7d6bb 100644
--- a/pkgs/applications/graphics/exrtools/default.nix
+++ b/pkgs/applications/graphics/exrtools/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0jpkskqs1yjiighab4s91jy0c0qxcscwadfn94xy2mm2bx2qwp4z";
};
- buildInputs = [ stdenv pkgconfig openexr libpng12 libjpeg ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ stdenv openexr libpng12 libjpeg ];
meta = with stdenv.lib; {
description = "Collection of utilities for manipulating OpenEXR images";
diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix
index aace37601b55ce791aef482fff13d4a09da8b9f5..b447fa7810f449cf02ec9e955ef80fc9a2804f88 100644
--- a/pkgs/applications/graphics/feh/default.nix
+++ b/pkgs/applications/graphics/feh/default.nix
@@ -6,11 +6,11 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "feh-${version}";
- version = "2.19.1";
+ version = "2.22.2";
src = fetchurl {
- url = "http://feh.finalrewind.org/${name}.tar.bz2";
- sha256 = "1d4ycmai3dpajl0bdr9i56646g4h5j1lb95jjn0nckwcddcj927c";
+ url = "https://feh.finalrewind.org/${name}.tar.bz2";
+ sha256 = "1kcflv4jb4250g94nqn28i98xqvvci8w7vqpfr62gxlp16z1za05";
};
outputs = [ "out" "man" "doc" ];
@@ -44,9 +44,9 @@ stdenv.mkDerivation rec {
meta = {
description = "A light-weight image viewer";
- homepage = https://derf.homelinux.org/projects/feh/;
+ homepage = "https://feh.finalrewind.org/";
license = licenses.mit;
- maintainers = [ maintainers.viric ];
+ maintainers = [ maintainers.viric maintainers.willibutz ];
platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/graphics/freepv/default.nix b/pkgs/applications/graphics/freepv/default.nix
index 6d82db4bac1ac4b0ebfca5a599ced170adebc859..e6d8a06a5193020b32d3f57717f7ec1be07761ae 100644
--- a/pkgs/applications/graphics/freepv/default.nix
+++ b/pkgs/applications/graphics/freepv/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, libjpeg, mesa, freeglut, zlib, cmake, libX11, libxml2, libpng,
- libXxf86vm, gcc6 }:
+ libXxf86vm }:
stdenv.mkDerivation {
name = "freepv-0.3.0";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
};
buildInputs = [ libjpeg mesa freeglut zlib cmake libX11 libxml2 libpng
- libXxf86vm gcc6 ];
+ libXxf86vm ];
postPatch = ''
sed -i -e '/GECKO/d' CMakeLists.txt
diff --git a/pkgs/applications/graphics/gcolor2/default.nix b/pkgs/applications/graphics/gcolor2/default.nix
index b9cf229e8c8671c9cc389580fb2dab203cbb5c2f..3747b802e2316c0e057f378e8bcf0cdd8c6d7200 100644
--- a/pkgs/applications/graphics/gcolor2/default.nix
+++ b/pkgs/applications/graphics/gcolor2/default.nix
@@ -20,7 +20,8 @@ stdenv.mkDerivation {
[ ./gcolor2-amd64.patch ] else
[ ];
-buildInputs = [ gtk2 perl perlXMLParser pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ];
+buildInputs = [ gtk2 perl perlXMLParser ];
meta = {
description = "Simple GTK+2 color selector";
diff --git a/pkgs/applications/graphics/gcolor3/default.nix b/pkgs/applications/graphics/gcolor3/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..afad1e6c3af07cdaf7fa6fa97a116917be7c3712
--- /dev/null
+++ b/pkgs/applications/graphics/gcolor3/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, gnome3, libtool, intltool, pkgconfig, gtk3, hicolor_icon_theme, wrapGAppsHook } :
+
+let
+ version = "2.2";
+in stdenv.mkDerivation {
+ name = "gcolor3-${version}";
+
+ src = fetchFromGitHub {
+ owner = "hjdskes";
+ repo = "gcolor3";
+ rev = "v${version}";
+ sha256 = "1rbahsi33pfggpj5cigy6wy5333g3rpm8v2q0b35c6m7pwhmf2gr";
+ };
+
+ nativeBuildInputs = [ gnome3.gnome_common libtool intltool pkgconfig hicolor_icon_theme wrapGAppsHook ];
+
+ buildInputs = [ gtk3 ];
+
+ configureScript = "./autogen.sh";
+
+ # clang-4.0: error: argument unused during compilation: '-pthread'
+ NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.cc.isClang "-Wno-error=unused-command-line-argument";
+
+ meta = {
+ description = "A simple color chooser written in GTK3";
+ homepage = https://hjdskes.github.io/projects/gcolor3/;
+ license = stdenv.lib.licenses.gpl2;
+ maintainers = with stdenv.lib.maintainers; [ jtojnar ];
+ platforms = stdenv.lib.platforms.unix;
+ };
+}
diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix
index 9149e19819ffa88ce19c674d6aa8f269282ebe98..1e8f0e209c06f24cfe9c2b72987031ee7b405517 100644
--- a/pkgs/applications/graphics/geeqie/default.nix
+++ b/pkgs/applications/graphics/geeqie/default.nix
@@ -15,8 +15,9 @@ stdenv.mkDerivation rec {
configureFlags = [ "--enable-gps" ];
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig autoconf automake gtk2 libpng exiv2 lcms intltool gettext
+ autoconf automake gtk2 libpng exiv2 lcms intltool gettext
];
postInstall = ''
diff --git a/pkgs/applications/graphics/giv/build.patch b/pkgs/applications/graphics/giv/build.patch
index ec343c9023861fc623b42b87e71810c8df1a7b43..f57689fd3fa9ef64dfc7bc100a466b31f9a51eec 100644
--- a/pkgs/applications/graphics/giv/build.patch
+++ b/pkgs/applications/graphics/giv/build.patch
@@ -2,16 +2,21 @@ Get the environment propagated to scons forked childs, and correct the dicom plu
a typedef of size_t that failed at least on x86_64-linux.
diff --git a/SConstruct b/SConstruct
-index 16eccd9..603e931 100644
+index 9e752d6..f93f27f 100644
--- a/SConstruct
+++ b/SConstruct
-@@ -7,8 +7,7 @@ else:
- cppflags = ['-O2']
- variant = 'Release'
+@@ -9,13 +9,7 @@ else:
+
+ commit_id = os.popen('git rev-parse HEAD').read().replace('\n','')
-env = Environment(LIBPATH=[],
-- CPPFLAGS = cppflags)
+- CPPFLAGS = cppflags + ['-Wno-deprecated-declarations',
+- '-Wno-reorder',
+- '-Wno-unused-but-set-variable',
+- '-Wno-unused-function'],
+- CXXFLAGS=['-std=c++1y']
+- )
+env = Environment(ENV = os.environ)
env['SBOX'] = False
-
+ env['COMMITIDSHORT'] = commit_id[0:6]
diff --git a/pkgs/applications/graphics/giv/default.nix b/pkgs/applications/graphics/giv/default.nix
index 6c892f1bfd4e3f5f9d63e49fae59b26bd29f6d7e..92e6084ce673a506b2275bcce9cdb98d9a6b15ab 100644
--- a/pkgs/applications/graphics/giv/default.nix
+++ b/pkgs/applications/graphics/giv/default.nix
@@ -2,13 +2,14 @@
pcre, cfitsio, perl, gob2, vala_0_23, libtiff, json_glib }:
stdenv.mkDerivation rec {
- name = "giv-20150811-git";
+ name = "giv-${version}";
+ version = "0.9.26";
src = fetchFromGitHub {
owner = "dov";
repo = "giv";
- rev = "64648bfbbf10ec4a9adfbc939c96c7d1dbdce57a";
- sha256 = "1sz2n7jbmg3g97bs613xxjpzqbsl5rvpg6v7g3x3ycyd35r8vsfp";
+ rev = "v${version}";
+ sha256 = "1sfm8j3hvqij6z3h8xz724d7hjqqbzljl2a6pp4yjpnnrxksnic2";
};
hardeningDisable = [ "format" ];
@@ -24,7 +25,8 @@ stdenv.mkDerivation rec {
installPhase = "scons install";
- buildInputs = [ gdk_pixbuf pkgconfig gtk2 glib scons pcre cfitsio perl gob2 vala_0_23 libtiff
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gdk_pixbuf gtk2 glib scons pcre cfitsio perl gob2 vala_0_23 libtiff
json_glib ];
meta = {
diff --git a/pkgs/applications/graphics/gocr/default.nix b/pkgs/applications/graphics/gocr/default.nix
index 4b45e44e22d59b1e4d6efd029e7113d5920af102..6fe37d605ae1239ea7414b4b66cbc61e14c98654 100644
--- a/pkgs/applications/graphics/gocr/default.nix
+++ b/pkgs/applications/graphics/gocr/default.nix
@@ -8,7 +8,18 @@ stdenv.mkDerivation rec {
sha256 = "1dgmcpapy7h68d53q2c5d0bpgzgfb2nw2blndnx9qhc7z12149mw";
};
+ buildFlags = [ "all" "libs" ];
+ installFlags = [ "libdir=/lib/" ]; # Specify libdir so Makefile will also install library.
+
+ preInstall = "mkdir -p $out/lib";
+
postInstall = ''
+ for i in pgm2asc.h gocr.h; do
+ install -D -m644 src/$i $out/include/gocr/$i
+ done
+ '';
+
+ preFixup = ''
sed -i -e 's|exec wish|exec ${tk}/bin/wish|' $out/bin/gocr.tcl
'';
diff --git a/pkgs/applications/graphics/gpicview/default.nix b/pkgs/applications/graphics/gpicview/default.nix
index 7e11c9dea3a70fddb612a7d2afcac75e355c0892..86867cd1cca739eae0b26200205cc3edf6ca0341 100644
--- a/pkgs/applications/graphics/gpicview/default.nix
+++ b/pkgs/applications/graphics/gpicview/default.nix
@@ -24,5 +24,6 @@ stdenv.mkDerivation {
platforms = platforms.unix;
};
- buildInputs = [ intltool pkgconfig gtk2 ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ intltool gtk2 ];
}
diff --git a/pkgs/applications/graphics/gqview/default.nix b/pkgs/applications/graphics/gqview/default.nix
index 801e9c5f502b077ca97a0af34da78bedc8f12553..a892f98ac4753e34eff96d199803d580a4d8dd4d 100644
--- a/pkgs/applications/graphics/gqview/default.nix
+++ b/pkgs/applications/graphics/gqview/default.nix
@@ -13,7 +13,8 @@ stdenv.mkDerivation {
sha256 = "0ilm5s7ps9kg4f5hzgjhg0xhn6zg0v9i7jnd67zrx9h7wsaa9zhj";
};
- buildInputs = [pkgconfig gtk2 libpng];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gtk2 libpng];
hardeningDisable = [ "format" ];
diff --git a/pkgs/applications/graphics/grafx2/default.nix b/pkgs/applications/graphics/grafx2/default.nix
index ee9df683c0a2d20e7947ecea26b2191807b13965..fd17ef69c99227fbf2f28c385d339550e2cc3d50 100644
--- a/pkgs/applications/graphics/grafx2/default.nix
+++ b/pkgs/applications/graphics/grafx2/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "0svsy6rqmdj11b400c242i2ixihyz0hds0dgicqz6g6dcgmcl62q";
};
- buildInputs = [ SDL SDL_image SDL_ttf libpng zlib lua5 pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ SDL SDL_image SDL_ttf libpng zlib lua5 ];
preBuild = "cd src";
diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix
index 93894d0c6cb8d4bb4dc91cea8cbe811c4cbd3923..d9e0f42e53e385050d2fcefd6ddadb00c2ff6d88 100644
--- a/pkgs/applications/graphics/gthumb/default.nix
+++ b/pkgs/applications/graphics/gthumb/default.nix
@@ -6,12 +6,12 @@
stdenv.mkDerivation rec {
name = "${pname}-${version}";
pname = "gthumb";
- version = "${major}.1";
+ version = "${major}.3";
major = "3.5";
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${major}/${name}.tar.xz";
- sha256 = "1hxnjskrq57d5ycn2fyif7363n1bav931pkjvq1fr2r4yrj0d202";
+ sha256 = "0hka1b3l8mf94zsk7jff87wsb8bz4pj5pixjrs0w2j8jbsa9sggk";
};
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix
index 29e43a93c985543b5e6d64dacc1945cee114c243..9acd8357cb714243b45ced6d6a815bdd98b55715 100644
--- a/pkgs/applications/graphics/hugin/default.nix
+++ b/pkgs/applications/graphics/hugin/default.nix
@@ -5,11 +5,11 @@
}:
stdenv.mkDerivation rec {
- name = "hugin-2016.2.0";
+ name = "hugin-2017.0.0";
src = fetchurl {
url = "mirror://sourceforge/hugin/${name}.tar.bz2";
- sha256 = "058zd63vx29yrx2pphbbll7kzcxkai22q26lpw13rn4lvp41pasl";
+ sha256 = "02a6rlwp20jdn5jdsyg3c7liljr10c3jfdkxiv9mkf9jgyi6wr46";
};
buildInputs = [
diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index a3a58bc87ee4a7778c17ae114faee9cdb1cc548a..889d710f043fa09c0810cd2148a63e5d4776f635 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -10,11 +10,11 @@ let
in
stdenv.mkDerivation rec {
- name = "inkscape-0.92.1";
+ name = "inkscape-0.92.2";
src = fetchurl {
- url = "https://media.inkscape.org/dl/resources/file/${name}.tar_XlpI7qT.bz2";
- sha256 = "01chr3vh728dkg7l7lilwgmh5nrp784khdhjgpqjbq9dh2zhax15";
+ url = "https://media.inkscape.org/dl/resources/file/${name}.tar.bz2";
+ sha256 = "1lyghk6yarcv9nwkh6k366p6hb7rfilqcvbyji09hki59khd0a56";
};
unpackPhase = ''
@@ -33,8 +33,9 @@ stdenv.mkDerivation rec {
--replace '"python-interpreter", "python"' '"python-interpreter", "${python2Env}/bin/python"'
'';
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig perl perlXMLParser libXft libpng zlib popt boehmgc
+ perl perlXMLParser libXft libpng zlib popt boehmgc
libxml2 libxslt glib gtkmm2 glibmm libsigcxx lcms boost gettext
makeWrapper gsl poppler imagemagick libwpg librevenge
libvisio libcdr libexif potrace cmake python2Env
@@ -52,7 +53,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
license = "GPL";
- homepage = http://www.inkscape.org;
+ homepage = https://www.inkscape.org;
description = "Vector graphics editor";
platforms = platforms.all;
longDescription = ''
diff --git a/pkgs/applications/graphics/jbrout/default.nix b/pkgs/applications/graphics/jbrout/default.nix
index 705d983c83aab454f8c813bd4e5a761e90aaabde..f120f8b13d40516c75fd6ea53cdd1c877cce3ca9 100644
--- a/pkgs/applications/graphics/jbrout/default.nix
+++ b/pkgs/applications/graphics/jbrout/default.nix
@@ -34,7 +34,7 @@ in pythonPackages.buildPythonApplication rec {
propagatedBuildInputs = with pythonPackages; [ pillow lxml pyGtkGlade pyexiv2 fbida ];
meta = {
- homepage = http://code.google.com/p/jbrout;
+ homepage = http://manatlan.com/jbrout/;
description = "Photo manager";
platforms = stdenv.lib.platforms.linux;
};
diff --git a/pkgs/applications/graphics/kgraphviewer/default.nix b/pkgs/applications/graphics/kgraphviewer/default.nix
index ea0fe51cc85a3fe5fc76d7ccbb0af6706897cfda..8f043816ba06d6087ae93ab34a230a3a96702aa1 100644
--- a/pkgs/applications/graphics/kgraphviewer/default.nix
+++ b/pkgs/applications/graphics/kgraphviewer/default.nix
@@ -1,24 +1,38 @@
-{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
-, kdelibs4, boost, graphviz
+{ stdenv, mkDerivation, fetchurl, cmake, extra-cmake-modules, pkgconfig, wrapGAppsHook
+, kconfig, kcrash, kinit, kdoctools, kiconthemes, kio, kparts, kwidgetsaddons
+, qtbase, qtsvg
+, boost, graphviz
}:
-stdenv.mkDerivation rec {
+mkDerivation rec {
name = "kgraphviewer-${version}";
- version = "2.1.90";
+ version = "2.4.2";
src = fetchurl {
- url = "mirror://kde/unstable/kgraphviewer/${version}/src/${name}.tar.xz";
- sha256 = "13zhjs57xavzrj4nrlqs35n35ihvzij7hgbszf5fhlp2a4d4rrqs";
+ url = "mirror://kde/stable/kgraphviewer/${version}/${name}.tar.xz";
+ sha256 = "1jc5zfgy4narwgn7rscfwz7l5pjy0jghal6yb3kd4sfadi78nhs9";
};
- buildInputs = [ kdelibs4 boost graphviz ];
- nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
+ buildInputs = [
+ qtbase qtsvg
+ boost graphviz
+ ];
+
+ nativeBuildInputs = [
+ cmake extra-cmake-modules pkgconfig wrapGAppsHook
+ kdoctools
+ ];
+
+ propagatedBuildInputs = [
+ kconfig kinit kio kparts kwidgetsaddons
+ ];
+
+ enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "A Graphviz dot graph viewer for KDE";
- license = licenses.gpl2;
- platforms = platforms.linux;
- maintainers = [ maintainers.lethalman ];
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ lethalman ];
+ platforms = platforms.linux;
};
}
-
diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix
index c8fb295044add4d9b3df58b7cb1ee5afb87534c9..a9c238ead3c15350df40402db1cc4cba6f41a5b1 100644
--- a/pkgs/applications/graphics/krita/default.nix
+++ b/pkgs/applications/graphics/krita/default.nix
@@ -9,11 +9,11 @@
mkDerivation rec {
name = "krita-${version}";
- version = "3.1.4";
+ version = "3.3.2";
src = fetchurl {
- url = "http://download.kde.org/stable/krita/${version}/${name}.tar.gz";
- sha256 = "1al27v17s70hihk2mcmz3l2g6rl9qzpxaifapdfpkyias6q3f63l";
+ url = https://download.kde.org/stable/krita/3.3.2/krita-3.3.2.1.tar.xz;
+ sha256 = "0i3l27cfi1h486m74xf4ynk0pwx32xaqraa91a0g1bpj1jxf2mg5";
};
nativeBuildInputs = [ cmake extra-cmake-modules ];
@@ -26,13 +26,6 @@ mkDerivation rec {
qtmultimedia qtx11extras
];
- patches = [
- (fetchpatch {
- url = "https://github.com/KDE/krita/commit/2f59d0d1.patch";
- sha256 = "0sdlcjn6i3faln3c0aczw3pg4pvmccgszmy8n914mgsccrqrazlr";
- })
- ];
-
NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev}/include/OpenEXR" ];
meta = with lib; {
diff --git a/pkgs/applications/graphics/ktikz/default.nix b/pkgs/applications/graphics/ktikz/default.nix
index 5d0bbcad54fd41a18c7b6f2a212c2eba79e5e18c..8817071e9843100d9a803fe961edfae317767443 100644
--- a/pkgs/applications/graphics/ktikz/default.nix
+++ b/pkgs/applications/graphics/ktikz/default.nix
@@ -63,7 +63,8 @@ stdenv.mkDerivation rec {
qmake PREFIX="$out" ./qtikz.pro
'';
- buildInputs = [ gettext qt5.full poppler_qt5 pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gettext qt5.full poppler_qt5 ];
enableParallelBuilding = true;
}
diff --git a/pkgs/applications/graphics/mcomix/default.nix b/pkgs/applications/graphics/mcomix/default.nix
index 20c01f77bbf8c26e55e63ae4d05809839d0865fb..eea0e501cb8e495f2241aef10ca7db97bffb1fc5 100644
--- a/pkgs/applications/graphics/mcomix/default.nix
+++ b/pkgs/applications/graphics/mcomix/default.nix
@@ -11,9 +11,10 @@ python27Packages.buildPythonApplication rec {
propagatedBuildInputs = with python27Packages; [ pygtk pillow ];
+ doCheck = false;
+
meta = {
description = "Image viewer designed to handle comic books";
-
longDescription = ''
MComix is an user-friendly, customizable image viewer. It is specifically
designed to handle comic books, but also serves as a generic viewer.
@@ -24,9 +25,10 @@ python27Packages.buildPythonApplication rec {
MComix is a fork of the Comix project, and aims to add bug fixes and
stability improvements after Comix development came to a halt in late 2009.
'';
-
homepage = http://mcomix.sourceforge.net/;
license = stdenv.lib.licenses.gpl2;
- maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+ maintainers = with stdenv.lib.maintainers; [ fuuzetsu AndersonTorres ];
};
}
+# TODO:
+# - error in check phase
diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix
index 07789fce3a92bd67769f5494434f250ace7df8cc..d73697673bfe2a840b735c49b050b3a2bf45f271 100644
--- a/pkgs/applications/graphics/meshlab/default.nix
+++ b/pkgs/applications/graphics/meshlab/default.nix
@@ -46,6 +46,6 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.gpl2Plus;
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
- broken = stdenv.isLinux && stdenv.isi686;
+ broken = true;
};
}
diff --git a/pkgs/applications/graphics/mozjpeg/default.nix b/pkgs/applications/graphics/mozjpeg/default.nix
index 0ca997adb78353c179890ef5d0e7237092921b16..33785a279c7b4aad0ccc934f821ecbcf8a7d7eb4 100644
--- a/pkgs/applications/graphics/mozjpeg/default.nix
+++ b/pkgs/applications/graphics/mozjpeg/default.nix
@@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
sed -i -e "s!/usr/bin/file!${file}/bin/file!g" configure
'';
- buildInputs = [ libpng pkgconfig nasm ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ libpng nasm ];
meta = {
description = "Mozilla JPEG Encoder Project";
diff --git a/pkgs/applications/graphics/mtpaint/default.nix b/pkgs/applications/graphics/mtpaint/default.nix
index 51bfa603a055e6e5a5c0ac2dfb3c2053bbff6887..8a2a218d9891c2149efe2ef39fe5e594b9ac5132 100644
--- a/pkgs/applications/graphics/mtpaint/default.nix
+++ b/pkgs/applications/graphics/mtpaint/default.nix
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
sha256 = "0bvf623g0n2ifijcxv1nw0z3wbs2vhhdky4n04ywsbjlykm44nd1";
};
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig
freetype giflib gtk2 lcms2 libjpeg libpng libtiff openjpeg gifsicle
];
diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix
index 669e46c6a8423d9a313a3d23de9b51fe85669e52..ac0060ec7f8e5916d411bef285a3dadefdbd8292 100644
--- a/pkgs/applications/graphics/nomacs/default.nix
+++ b/pkgs/applications/graphics/nomacs/default.nix
@@ -30,7 +30,9 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- sourceRoot = "${name}-src/ImageLounge";
+ setSourceRoot = ''
+ sourceRoot=$(echo */ImageLounge)
+ '';
patches = [./fix-appdata-install.patch];
diff --git a/pkgs/applications/graphics/openimageio/default.nix b/pkgs/applications/graphics/openimageio/default.nix
index 44faeea007d6bab44c5f3aadaa02b23e2ff020e4..b4402c7d1043382ccc3c461be895213537828933 100644
--- a/pkgs/applications/graphics/openimageio/default.nix
+++ b/pkgs/applications/graphics/openimageio/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "openimageio-${version}";
- version = "1.7.12";
+ version = "1.7.17";
src = fetchFromGitHub {
owner = "OpenImageIO";
repo = "oiio";
rev = "Release-${version}";
- sha256 = "1ganx4f7zis5lkxxrwc83dbgngaxww2846bsc4vrg5dhjnns6n4y";
+ sha256 = "0vx2pndgyfbnziwn36aylvq4jd889dvibzhw9ajzkm378l43lly9";
};
outputs = [ "bin" "out" "dev" "doc" ];
diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix
index 8736721b43d5f954f105b5aec15630e614741ecb..730f809eef404bf183b7080dbd7eb36bde08133f 100644
--- a/pkgs/applications/graphics/paraview/default.nix
+++ b/pkgs/applications/graphics/paraview/default.nix
@@ -1,40 +1,46 @@
-{ fetchurl, stdenv, cmake, qt4
-, hdf5
-, mpich2
-, python
-, libxml2
-, mesa, libXt
-}:
+{stdenv, fetchFromGitHub, cmake
+,full, python, mesa, libXt }:
stdenv.mkDerivation rec {
- name = "paraview-4.0.1";
- src = fetchurl {
- url = "http://paraview.org/files/v4.0/ParaView-v4.0.1-source.tgz";
- sha256 = "1qj8dq8gqpsw75sv4sdc7xm1xcpv0ilsddnrcfhha0zfhp0gq10y";
+ name = "paraview-${version}";
+ version = "5.4.0";
+
+ # fetching from GitHub instead of taking an "official" source
+ # tarball because of missing submodules there
+ src = fetchFromGitHub {
+ owner = "Kitware";
+ repo = "ParaView";
+ rev = "v${version}";
+ sha256 = "0h1vkgwm10mc5mnr3djp81lxr5pi0hyj776z77hiib6xm5596q9n";
+ fetchSubmodules = true;
};
- # [ 5%] Generating vtkGLSLShaderLibrary.h
- # ../../../bin/ProcessShader: error while loading shared libraries: libvtksys.so.pv3.10: cannot open shared object file: No such file or directory
- preConfigure = ''
- export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/paraview-3.98 -rpath ../../../../../../lib -rpath ../../../../../lib -rpath ../../../../lib -rpath ../../../lib -rpath ../../lib -rpath ../lib"
+ cmakeFlags = [
+ "-DPARAVIEW_ENABLE_PYTHON=ON"
+ "-DPARAVIEW_INSTALL_DEVELOPMENT_FILES=ON"
+ ];
+
+ # During build, binaries are called that rely on freshly built
+ # libraries. These reside in build/lib, and are not found by
+ # default.
+ preBuild = ''
+ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib
'';
- cmakeFlags = [
- "-DPARAVIEW_USE_SYSTEM_HDF5:BOOL=ON"
- "-DVTK_USE_SYSTEM_LIBXML2:BOOL=ON"
- "-DPARAVIEW_ENABLE_PYTHON:BOOL=ON"
-# use -DPARAVIEW_INSTALL_THIRD_PARTY_LIBRARIES:BOOL=OFF \ to fix make install error: http://www.cmake.org/pipermail/paraview/2011-February/020268.html
- "-DPARAVIEW_INSTALL_THIRD_PARTY_LIBRARIES:BOOL=OFF"
- "-DCMAKE_SKIP_BUILD_RPATH=ON"
- "-DVTK_USE_RPATH:BOOL=ON"
- "-DPARAVIEW_INSTALL_DEVELOPMENT=ON"
- ];
-
- # https://bugzilla.redhat.com/show_bug.cgi?id=1138466
- NIX_CFLAGS_COMPILE = "-DGLX_GLXEXT_LEGACY";
enableParallelBuilding = true;
- buildInputs = [ cmake qt4 hdf5 mpich2 python libxml2 mesa libXt ];
+ buildInputs = [ cmake
+ python
+ mesa
+ libXt
+
+ # theoretically the following should be fine, but there is an error
+ # due to missing libqminimal when not using qt5.full
+
+ # qtbase qtx11extras qttools
+ full
+ ];
+
meta = {
homepage = http://www.paraview.org/;
diff --git a/pkgs/applications/graphics/photivo/default.nix b/pkgs/applications/graphics/photivo/default.nix
index 69bc36dea61c0af7ded2e7f9b8e81f2b56015f10..0d1adcff6e8345f825a99fbe00556f87a224d53f 100644
--- a/pkgs/applications/graphics/photivo/default.nix
+++ b/pkgs/applications/graphics/photivo/default.nix
@@ -18,6 +18,7 @@ stdenv.mkDerivation rec {
name = "lensfun-0.3.patch";
sha256 = "0ys45x4r4bjjlx0zpd5d56rgjz7k8gxili4r4k8zx3zfka4a3zwv";
})
+ ./gcc6.patch
];
postPatch = '' # kinda icky
diff --git a/pkgs/applications/graphics/photivo/gcc6.patch b/pkgs/applications/graphics/photivo/gcc6.patch
new file mode 100644
index 0000000000000000000000000000000000000000..e2eb795fc8e2c144b91efda94927c364284b9eff
--- /dev/null
+++ b/pkgs/applications/graphics/photivo/gcc6.patch
@@ -0,0 +1,13 @@
+diff --git c/Sources/ptImage.cpp i/Sources/ptImage.cpp
+index 9c95093..623c157 100755
+--- c/Sources/ptImage.cpp
++++ i/Sources/ptImage.cpp
+@@ -5291,7 +5291,7 @@ ptImage* ptImage::Box(const uint16_t MaxRadius, float* Mask) {
+ NewRow = NewRow < 0? -NewRow : NewRow > Height1? Height1_2-NewRow : NewRow ;
+ NewRow *= m_Width;
+ for(j = -IntRadius; j <= IntRadius; j++) {
+- if (Dist[abs(i)][abs(j)] < Radius) {
++ if (Dist[int16_t(abs(i))][int16_t(abs(j))] < Radius) {
+ NewCol = Col+j;
+ NewCol = NewCol < 0? -NewCol : NewCol > Width1? Width1_2-NewCol : NewCol ;
+
diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix
index 22db78b812546a8156105098d2a9b1677a6b525a..a3c8d805b234836b82fa0cac066d38d60fc5a6be 100644
--- a/pkgs/applications/graphics/photoqt/default.nix
+++ b/pkgs/applications/graphics/photoqt/default.nix
@@ -1,21 +1,20 @@
-{ stdenv, fetchurl, cmake, exiv2, graphicsmagick
-, qtbase, qtdeclarative, qtmultimedia, qtquickcontrols, qttools
+{ stdenv, fetchurl, cmake, exiv2, graphicsmagick, libraw
+, qtbase, qtdeclarative, qtmultimedia, qtquickcontrols, qttools, qtgraphicaleffects
}:
-let
- version = "1.3";
-in
stdenv.mkDerivation rec {
name = "photoqt-${version}";
+ version = "1.5.1";
+
src = fetchurl {
url = "http://photoqt.org/pkgs/photoqt-${version}.tar.gz";
- sha256 = "0j2kvxfb5pd9abciv161nkcsyam6n8kfqs8ymwj2mxiqflwbmfl1";
+ sha256 = "17kkpzkmzfnigs26jjyd75iy58qffjsclif81cmviq73lzmqy0b1";
};
nativeBuildInputs = [ cmake ];
buildInputs = [
qtbase qtquickcontrols qttools exiv2 graphicsmagick
- qtmultimedia qtdeclarative
+ qtmultimedia qtdeclarative libraw qtgraphicaleffects
];
preConfigure = ''
diff --git a/pkgs/applications/graphics/phototonic/default.nix b/pkgs/applications/graphics/phototonic/default.nix
index 8ce9d407aade71e877be33a2d442a7c7968d01b3..ce300eaf9f6de77f84c03b5e458f23dcd5bc8d5c 100644
--- a/pkgs/applications/graphics/phototonic/default.nix
+++ b/pkgs/applications/graphics/phototonic/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "An image viewer and organizer";
- homepage = http://oferkv.github.io/phototonic/;
+ homepage = https://sourceforge.net/projects/phototonic/;
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ pSub ];
diff --git a/pkgs/applications/graphics/potrace/default.nix b/pkgs/applications/graphics/potrace/default.nix
index 82fa4d5ee95bad365e2bc5b59e42a171bdd18aac..132136da658b761f9c11dda2ce5fbfe81bbf6cb4 100644
--- a/pkgs/applications/graphics/potrace/default.nix
+++ b/pkgs/applications/graphics/potrace/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "potrace-${version}";
- version = "1.14";
+ version = "1.15";
src = fetchurl {
url = "http://potrace.sourceforge.net/download/${version}/potrace-${version}.tar.gz";
- sha256 = "0znr9i0ljb818qiwm22zw63g11a4v08gc5xkh0wbdp6g259vcwnv";
+ sha256 = "17ajildjp14shsy339xarh1lw1p0k60la08ahl638a73mh23kcx9";
};
configureFlags = [ "--with-libpotrace" ];
diff --git a/pkgs/applications/graphics/pqiv/default.nix b/pkgs/applications/graphics/pqiv/default.nix
index 7e375367a2d200c84064a9b0d5d1473f2b1eb05b..202bbb5b13f4d371aca77fc3ab1b29d963bf6250 100644
--- a/pkgs/applications/graphics/pqiv/default.nix
+++ b/pkgs/applications/graphics/pqiv/default.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation (rec {
homepage = http://www.pberndt.com/Programme/Linux/pqiv;
license = licenses.gpl3;
maintainers = [ maintainers.ndowens ];
- platforms = platforms.unix;
+ platforms = platforms.linux;
};
})
diff --git a/pkgs/applications/graphics/qiv/default.nix b/pkgs/applications/graphics/qiv/default.nix
index 9d147a635f3b9101e41504b81d91cc52ac96f7e1..f1a58d4e21b8ef5e39825b448322ec355b6c6a15 100644
--- a/pkgs/applications/graphics/qiv/default.nix
+++ b/pkgs/applications/graphics/qiv/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation (rec {
sha256 = "1rlf5h67vhj7n1y7jqkm9k115nfnzpwngj3kzqsi2lg676srclv7";
};
- buildInputs = [ pkgconfig gtk2 imlib2 file lcms2 libexif ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gtk2 imlib2 file lcms2 libexif ];
preBuild=''
substituteInPlace Makefile --replace /usr/local "$out"
diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix
index 97d04b0362287d09f8a6acdf498b9834d8f1eed9..91a34a505f2fb26c17f6bd0bb7e9e182761bbbd5 100644
--- a/pkgs/applications/graphics/rawtherapee/default.nix
+++ b/pkgs/applications/graphics/rawtherapee/default.nix
@@ -1,27 +1,29 @@
{ stdenv, fetchFromGitHub, pkgconfig, cmake, pixman, libpthreadstubs, gtkmm3, libXau
, libXdmcp, lcms2, libiptcdata, libcanberra_gtk3, fftw, expat, pcre, libsigcxx, wrapGAppsHook
+, lensfun
}:
stdenv.mkDerivation rec {
- version = "5.0-r1";
+ version = "5.3";
name = "rawtherapee-" + version;
src = fetchFromGitHub {
owner = "Beep6581";
repo = "RawTherapee";
- rev = version + "-gtk3";
- sha256 = "06v3ir5562yg4zk9z8kc8a7sw7da88193sizjlk74gh5d3smgr4q";
+ rev = version;
+ sha256 = "1r6sx9zl1wkykgfx6k26268xadair6hzl15v5hmiri9sdhrn33q7";
};
+ nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
+
buildInputs = [
- pkgconfig cmake pixman libpthreadstubs gtkmm3 libXau libXdmcp
- lcms2 libiptcdata libcanberra_gtk3 fftw expat pcre libsigcxx
+ cmake pixman libpthreadstubs gtkmm3 libXau libXdmcp
+ lcms2 libiptcdata libcanberra_gtk3 fftw expat pcre libsigcxx lensfun
];
- nativeBuildInputs = [ wrapGAppsHook ];
-
cmakeFlags = [
"-DPROC_TARGET_NUMBER=2"
+ "-DCACHE_NAME_SUFFIX=\"\""
];
CMAKE_CXX_FLAGS = "-std=c++11 -Wno-deprecated-declarations -Wno-unused-result";
diff --git a/pkgs/applications/graphics/rawtherapee/dev.nix b/pkgs/applications/graphics/rawtherapee/dev.nix
index 71e41faaaef56e2e4024fbf1875de4d192c6f1ef..fb73feb4a09971b9784e1c1b88ad60218c70e081 100644
--- a/pkgs/applications/graphics/rawtherapee/dev.nix
+++ b/pkgs/applications/graphics/rawtherapee/dev.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
sha256 = "1nwb6b1qrpdyigwig7bvr42lf7na1ngm0q2cislcvb2v1nmk6nlz";
};
- buildInputs = [ pkgconfig cmake pixman libpthreadstubs gtkmm2 libXau libXdmcp
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ cmake pixman libpthreadstubs gtkmm2 libXau libXdmcp
lcms2 libiptcdata libcanberra_gtk2 fftw expat pcre libsigcxx ];
NIX_CFLAGS_COMPILE = "-std=gnu++11 -Wno-deprecated-declarations -Wno-unused-result";
diff --git a/pkgs/applications/graphics/sane/backends/brscan4/default.nix b/pkgs/applications/graphics/sane/backends/brscan4/default.nix
index 7037e944f3f94dcec7df34abdcb8d4cccd87cdc8..42d129e53887992d5189b56136bf37cbdbf88626 100644
--- a/pkgs/applications/graphics/sane/backends/brscan4/default.nix
+++ b/pkgs/applications/graphics/sane/backends/brscan4/default.nix
@@ -10,17 +10,17 @@ let
udevRules = callPackage ./udev_rules_type1.nix {};
in stdenv.mkDerivation rec {
- name = "brscan4-0.4.4-2";
+ name = "brscan4-0.4.4-4";
src =
if stdenv.system == "i686-linux" then
fetchurl {
url = "http://download.brother.com/welcome/dlf006646/${name}.i386.deb";
- sha256 = "1rd6qmg49lvack8rg9kkqs3vxfvvqf2x45h93pkrhk8a4aj5c8ll";
+ sha256 = "13mhjbzf9nvpdzrc2s98684r7likg76zxs1wlz2h8w59fsqgx4k2";
}
else if stdenv.system == "x86_64-linux" then
fetchurl {
url = "http://download.brother.com/welcome/dlf006645/${name}.amd64.deb";
- sha256 = "1r3cq1k2a2bghibkckmk00x7y59ic31gv7jcsw7380szf1j3la59";
+ sha256 = "0xy5px96y1saq9l80vwvfn6anr2q42qlxdhm6ci2a0diwib5q9fd";
}
else throw "${name} is not supported on ${stdenv.system} (only i686-linux and x86_64 linux are supported)";
diff --git a/pkgs/applications/graphics/sane/backends/default.nix b/pkgs/applications/graphics/sane/backends/default.nix
index a3ca7fdd55df66edba899c7ec0a5469d2675fc1e..20d5629b83a90f1d819156f5c2f9a059a93b73cf 100644
--- a/pkgs/applications/graphics/sane/backends/default.nix
+++ b/pkgs/applications/graphics/sane/backends/default.nix
@@ -1,13 +1,11 @@
{ callPackage, fetchurl, ... } @ args:
callPackage ./generic.nix (args // rec {
- version = "1.0.25";
+ version = "1.0.27";
src = fetchurl {
- sha256 = "0b3fvhrxl4l82bf3v0j47ypjv6a0k5lqbgknrq1agpmjca6vmmx4";
+ sha256 = "1j9nbqspaj0rlgalafb5z6r606k0i22kz0rcpd744p176yzlfdr9";
urls = [
- "http://pkgs.fedoraproject.org/repo/pkgs/sane-backends/sane-backends-${version}.tar.gz/f9ed5405b3c12f07c6ca51ee60225fe7/sane-backends-${version}.tar.gz"
- "https://alioth.debian.org/frs/download.php/file/4146/sane-backends-${version}.tar.gz"
+ "https://alioth.debian.org/frs/download.php/latestfile/176/sane-backends-${version}.tar.gz"
];
- curlOpts = "--insecure";
};
})
diff --git a/pkgs/applications/graphics/sane/backends/generic.nix b/pkgs/applications/graphics/sane/backends/generic.nix
index ff3ebfad484a279882edc338a7627daeb0ad3c1b..3ef23142b2ed5ef49c4ef0bd536a6b4f00ee89b5 100644
--- a/pkgs/applications/graphics/sane/backends/generic.nix
+++ b/pkgs/applications/graphics/sane/backends/generic.nix
@@ -20,12 +20,13 @@ stdenv.mkDerivation {
outputs = [ "out" "doc" "man" ];
configureFlags = []
- ++ stdenv.lib.optional (avahi != null) "--enable-avahi"
+ ++ stdenv.lib.optional (avahi != null) "--enable-avahi"
++ stdenv.lib.optional (libusb1 != null) "--enable-libusb_1_0"
;
buildInputs = [ avahi libusb1 libv4l net_snmp ];
nativeBuildInputs = [ gettext pkgconfig ];
+ enableParallelBuilding = true;
postInstall = let
diff --git a/pkgs/applications/graphics/sane/frontends.nix b/pkgs/applications/graphics/sane/frontends.nix
index a956db4005219824204601e4260a9e7ee6d64660..f6994db81e4b01940e777ce0c3ba8b329460265d 100644
--- a/pkgs/applications/graphics/sane/frontends.nix
+++ b/pkgs/applications/graphics/sane/frontends.nix
@@ -1,10 +1,11 @@
-{ stdenv, fetchurl, sane-backends, libX11, gtk2, pkgconfig, libusb ? null}:
+{ stdenv, fetchurl, sane-backends, libX11, gtk2, pkgconfig, libusb ? null }:
stdenv.mkDerivation rec {
- name = "sane-frontends-1.0.14";
+ name = "sane-frontends-${version}";
+ version = "1.0.14";
src = fetchurl {
- url = "https://alioth.debian.org/frs/download.php/file/1140/${name}.tar.gz";
+ url = "https://alioth.debian.org/frs/download.php/latestfile/175/${name}.tar.gz";
sha256 = "1ad4zr7rcxpda8yzvfkq1rfjgx9nl6lan5a628wvpdbh3fn9v0z7";
};
@@ -12,15 +13,17 @@ stdenv.mkDerivation rec {
sed -e '/SANE_CAP_ALWAYS_SETTABLE/d' -i src/gtkglue.c
'';
- buildInputs = [sane-backends libX11 gtk2 pkgconfig] ++
- (if libusb != null then [libusb] else []);
+ buildInputs = [ sane-backends libX11 gtk2 ]
+ ++ stdenv.lib.optional (libusb != null) libusb;
+ nativeBuildInputs = [ pkgconfig ];
- meta = {
- homepage = http://www.sane-project.org/;
- description = "Scanner Access Now Easy";
- license = stdenv.lib.licenses.gpl2Plus;
+ enableParallelBuilding = true;
- maintainers = [ stdenv.lib.maintainers.peti ];
- platforms = stdenv.lib.platforms.linux;
+ meta = with stdenv.lib; {
+ description = "Scanner Access Now Easy";
+ homepage = http://www.sane-project.org/;
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ peti ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/graphics/sane/xsane.nix b/pkgs/applications/graphics/sane/xsane.nix
index de07a4f1a896c90f71bfd953a78e6bb6a7cd340d..ad02e1a80231a71d07573da2cf3760148fb4ecf0 100644
--- a/pkgs/applications/graphics/sane/xsane.nix
+++ b/pkgs/applications/graphics/sane/xsane.nix
@@ -18,7 +18,8 @@ stdenv.mkDerivation rec {
chmod a+rX -R .
'';
- buildInputs = [libpng sane-backends sane-frontends libX11 gtk2 pkgconfig ]
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [libpng sane-backends sane-frontends libX11 gtk2 ]
++ (if libusb != null then [libusb] else [])
++ stdenv.lib.optional gimpSupport gimp_2_8;
diff --git a/pkgs/applications/graphics/screencloud/default.nix b/pkgs/applications/graphics/screencloud/default.nix
index 6f2b0e34cbb34b00c1eabc2fcca4a7fdfee93720..cffe485711f639640e925d83bdf37accd9b87cb1 100644
--- a/pkgs/applications/graphics/screencloud/default.nix
+++ b/pkgs/applications/graphics/screencloud/default.nix
@@ -43,7 +43,9 @@ stdenv.mkDerivation rec {
"-DCONSUMER_SECRET_SCREENCLOUD=${consumerSecret}"
];
- sourceRoot = "screencloud-v${version}-src/screencloud";
+ setSourceRoot = ''
+ sourceRoot=$(echo */screencloud)
+ '';
preConfigure = ''
# This needs to be set in preConfigure instead of cmakeFlags in order to
diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix
index 3f31b86fe49235bcc96d8e660d5281fca9dce657..b0a6f7caf8852e3219205af0457e7da2c1083a93 100644
--- a/pkgs/applications/graphics/shotwell/default.nix
+++ b/pkgs/applications/graphics/shotwell/default.nix
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
version = "${major}.${minor}";
- major = "0.26";
- minor = "2";
+ major = "0.27";
+ minor = "1";
name = "shotwell-${version}";
src = fetchurl {
url = "mirror://gnome/sources/shotwell/${major}/${name}.tar.xz";
- sha256 = "0frjqa6nmh025clwnb74z2rzbdq65wjcp2lf9csgcbkpahyjhrag";
+ sha256 = "1jav7qv0s1v6wvd7x2ri85hjqnbswq883pnd228qhd6bhjbryp89";
};
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include";
diff --git a/pkgs/applications/graphics/shutter/default.nix b/pkgs/applications/graphics/shutter/default.nix
index 3d4e8c592abb0cdb19f7b965c56e87aa6cd87e62..a8b4973203d1897e19448e99ba33ccbff658a486 100644
--- a/pkgs/applications/graphics/shutter/default.nix
+++ b/pkgs/applications/graphics/shutter/default.nix
@@ -11,21 +11,13 @@ let
];
in
stdenv.mkDerivation rec {
- name = "shutter-0.93.1";
+ name = "shutter-0.94";
src = fetchurl {
- url = "http://shutter-project.org/wp-content/uploads/releases/tars/${name}.tar.gz";
- sha256 = "09cn3scwy98wqxkrjhnmxhpfnnynlbb41856yn5m3zwzqrxiyvak";
+ url = "https://launchpad.net/shutter/0.9x/0.94/+download/shutter-0.94.tar.gz";
+ sha256 = "943152cdf9e1b2096d38e3da9622d8bf97956a08eda747c3e7fcc564a3f0f40d";
};
- patches = [
- (fetchpatch {
- url = "http://svnweb.mageia.org/packages/cauldron/shutter/current/SOURCES/CVE-2015-0854.patch?revision=880308&view=co";
- name = "CVE-2015-0854.patch";
- sha256 = "14r18sxz3ylf39cn9b85snjhjxdk6ngq4vnpljwghw2q5430nb12";
- })
- ];
-
buildInputs = [ perl makeWrapper gdk_pixbuf librsvg ] ++ perlModules;
installPhase = ''
diff --git a/pkgs/applications/graphics/solvespace/default.nix b/pkgs/applications/graphics/solvespace/default.nix
index f8db30675b159a01e38cce469727dd9d63775efe..43d6229ab2bc90c57334dd593b4d58aaf01602c2 100644
--- a/pkgs/applications/graphics/solvespace/default.nix
+++ b/pkgs/applications/graphics/solvespace/default.nix
@@ -11,8 +11,9 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- cmake pkgconfig zlib libpng cairo freetype
+ cmake zlib libpng cairo freetype
json_c fontconfig gtkmm3 pangomm glew mesa_glu
xlibs.libpthreadstubs xlibs.libXdmcp pcre
];
@@ -34,7 +35,7 @@ stdenv.mkDerivation rec {
postInstall = ''
substituteInPlace $out/share/applications/solvespace.desktop \
- --replace /usr/bin/ $out/bin/ \
+ --replace /usr/bin/ $out/bin/
'';
meta = {
diff --git a/pkgs/applications/graphics/sxiv/default.nix b/pkgs/applications/graphics/sxiv/default.nix
index 93bb5f151d948ca3d25d0eaebe287135dffca1f9..68597a23ca650996dffeea2aa94db098b8b0bd69 100644
--- a/pkgs/applications/graphics/sxiv/default.nix
+++ b/pkgs/applications/graphics/sxiv/default.nix
@@ -23,6 +23,11 @@ stdenv.mkDerivation rec {
buildInputs = [ libX11 imlib2 giflib libexif ];
+ postInstall = ''
+ mkdir -p $out/share/applications/
+ cp -v sxiv.desktop $out/share/applications/
+ '';
+
meta = {
description = "Simple X Image Viewer";
homepage = https://github.com/muennich/sxiv;
diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix
index ea0d2338252afd05c6104c50ff0934be83890765..930a7e686f8f1c5164029cb36fae565573494c9f 100644
--- a/pkgs/applications/graphics/synfigstudio/default.nix
+++ b/pkgs/applications/graphics/synfigstudio/default.nix
@@ -18,7 +18,7 @@ let
postUnpack = "sourceRoot=\${sourceRoot}/ETL/";
- buildInputs = [ autoreconfHook ];
+ nativeBuildInputs = [ autoreconfHook ];
};
synfig = stdenv.mkDerivation rec {
@@ -38,10 +38,12 @@ let
"--with-boost-libdir=${boost.out}/lib"
];
+ nativeBuildInputs = [ pkgconfig autoreconfHook gettext ];
buildInputs = [
- ETL boost cairo gettext glibmm mlt-qt5 libsigcxx libxmlxx pango
- pkgconfig autoreconfHook
+ ETL boost cairo glibmm mlt-qt5 libsigcxx libxmlxx pango
];
+
+ meta.broken = true;
};
in
stdenv.mkDerivation rec {
@@ -99,10 +101,11 @@ stdenv.mkDerivation rec {
preConfigure = "./bootstrap.sh";
+ nativeBuildInputs = [ pkgconfig autoreconfHook gettext ];
buildInputs = [
- ETL boost cairo gettext glibmm gtk3 gtkmm3 imagemagick intltool
- libjack2 libsigcxx libxmlxx makeWrapper mlt-qt5 pkgconfig
- synfig autoreconfHook which defaultIconTheme
+ ETL boost cairo glibmm gtk3 gtkmm3 imagemagick intltool
+ libjack2 libsigcxx libxmlxx makeWrapper mlt-qt5
+ synfig which defaultIconTheme
];
postInstall = ''
diff --git a/pkgs/applications/graphics/tesseract/4.x.nix b/pkgs/applications/graphics/tesseract/4.x.nix
index 577bff91e353441a836b7a3089d7207db941cd78..156c911b9b8637101d8867e18155c0fc92713972 100644
--- a/pkgs/applications/graphics/tesseract/4.x.nix
+++ b/pkgs/applications/graphics/tesseract/4.x.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
meta = {
description = "OCR engine";
- homepage = http://code.google.com/p/tesseract-ocr/;
+ homepage = https://github.com/tesseract-ocr/tesseract;
license = stdenv.lib.licenses.asl20;
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
diff --git a/pkgs/applications/graphics/tesseract/default.nix b/pkgs/applications/graphics/tesseract/default.nix
index a5643da8c3a8260fa7e22103a166b20e809ba754..eb9a638386124cf580777246c98c3d33ad368da0 100644
--- a/pkgs/applications/graphics/tesseract/default.nix
+++ b/pkgs/applications/graphics/tesseract/default.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
meta = {
description = "OCR engine";
- homepage = http://code.google.com/p/tesseract-ocr/;
+ homepage = https://github.com/tesseract-ocr/tesseract;
license = stdenv.lib.licenses.asl20;
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux ++ darwin;
diff --git a/pkgs/applications/graphics/xournal/default.nix b/pkgs/applications/graphics/xournal/default.nix
index 38573989266d853921732e944a17c3e1237a26e2..cfad449fb0283b4b3a30f0973ae1d06b3e570d87 100644
--- a/pkgs/applications/graphics/xournal/default.nix
+++ b/pkgs/applications/graphics/xournal/default.nix
@@ -9,11 +9,11 @@ let
in
stdenv.mkDerivation rec {
- version = "0.4.8";
+ version = "0.4.8.2016";
name = "xournal-" + version;
src = fetchurl {
url = "mirror://sourceforge/xournal/${name}.tar.gz";
- sha256 = "0c7gjcqhygiyp0ypaipdaxgkbivg6q45vhsj8v5jsi9nh6iqff13";
+ sha256 = "09i88v3wacmx7f96dmq0l3afpyv95lh6jrx16xzm0jd1szdrhn5j";
};
buildInputs = [
@@ -26,10 +26,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoconf automake libtool pkgconfig ];
- patches = stdenv.lib.optionals isGdkQuartzBackend [
- ./gdk-quartz-backend.patch
- ];
-
NIX_LDFLAGS = [ "-lz" ]
++ stdenv.lib.optionals (!isGdkQuartzBackend) [ "-lX11" ];
diff --git a/pkgs/applications/graphics/xournal/gdk-quartz-backend.patch b/pkgs/applications/graphics/xournal/gdk-quartz-backend.patch
deleted file mode 100644
index d1a42443a88b938aacdee1affebdaa6484a1583b..0000000000000000000000000000000000000000
--- a/pkgs/applications/graphics/xournal/gdk-quartz-backend.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-diff -rup xournal-0.4.8-orig/src/Makefile.am xournal-0.4.8/src/Makefile.am
---- xournal-0.4.8-orig/src/Makefile.am 2012-07-04 23:12:47.000000000 +0200
-+++ xournal-0.4.8/src/Makefile.am 2016-12-25 03:04:00.000000000 +0100
-@@ -31,6 +31,5 @@ if WIN32
- xournal_LDFLAGS = -mwindows
- xournal_LDADD = win32/xournal.res ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS) -lz
- else
-- xournal_LDADD = ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS) -lX11 -lz -lm
-+ xournal_LDADD = ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS) -lz -lm
- endif
--
-diff -rup xournal-0.4.8-orig/src/xo-file.c xournal-0.4.8/src/xo-file.c
---- xournal-0.4.8-orig/src/xo-file.c 2014-06-28 21:52:25.000000000 +0200
-+++ xournal-0.4.8/src/xo-file.c 2016-12-25 03:07:19.000000000 +0100
-@@ -31,11 +31,6 @@
- #include
- #include
-
--#ifndef WIN32
-- #include
-- #include
--#endif
--
- #include "xournal.h"
- #include "xo-interface.h"
- #include "xo-support.h"
-@@ -1275,50 +1270,8 @@ GList *attempt_load_gv_bg(char *filename
-
- struct Background *attempt_screenshot_bg(void)
- {
--#ifndef WIN32
-- struct Background *bg;
-- GdkPixbuf *pix;
-- XEvent x_event;
-- GdkWindow *window;
-- GdkColormap *cmap;
-- int x,y,w,h;
-- Window x_root, x_win;
--
-- x_root = gdk_x11_get_default_root_xwindow();
--
-- if (!XGrabButton(GDK_DISPLAY(), AnyButton, AnyModifier, x_root,
-- False, ButtonReleaseMask, GrabModeAsync, GrabModeSync, None, None))
-- return NULL;
--
-- XWindowEvent (GDK_DISPLAY(), x_root, ButtonReleaseMask, &x_event);
-- XUngrabButton(GDK_DISPLAY(), AnyButton, AnyModifier, x_root);
--
-- x_win = x_event.xbutton.subwindow;
-- if (x_win == None) x_win = x_root;
--
-- window = gdk_window_foreign_new_for_display(gdk_display_get_default(), x_win);
--
-- gdk_window_get_geometry(window, &x, &y, &w, &h, NULL);
-- cmap = gdk_drawable_get_colormap(window);
-- if (cmap == NULL) cmap = gdk_colormap_get_system();
--
-- pix = gdk_pixbuf_get_from_drawable(NULL, window,
-- cmap, 0, 0, 0, 0, w, h);
--
-- if (pix == NULL) return NULL;
--
-- bg = g_new(struct Background, 1);
-- bg->type = BG_PIXMAP;
-- bg->canvas_item = NULL;
-- bg->pixbuf = pix;
-- bg->pixbuf_scale = DEFAULT_ZOOM;
-- bg->filename = new_refstring(NULL);
-- bg->file_domain = DOMAIN_ATTACH;
-- return bg;
--#else
- // not implemented under WIN32
- return FALSE;
--#endif
- }
-
- /************** pdf annotation ***************/
-diff -rup xournal-0.4.8-orig/src/xo-misc.c xournal-0.4.8/src/xo-misc.c
---- xournal-0.4.8-orig/src/xo-misc.c 2014-06-28 15:17:44.000000000 +0200
-+++ xournal-0.4.8/src/xo-misc.c 2016-12-25 03:05:50.000000000 +0100
-@@ -2288,9 +2288,7 @@ void hide_unimplemented(void)
- }
-
- /* screenshot feature doesn't work yet in Win32 */
--#ifdef WIN32
- gtk_widget_hide(GET_COMPONENT("journalScreenshot"));
--#endif
- }
-
- // toggle fullscreen mode
diff --git a/pkgs/applications/graphics/xzgv/default.nix b/pkgs/applications/graphics/xzgv/default.nix
index 9993144294527703a91fea71602bbd5798e4e7b7..69ab67dffb73d5d646d3478c6e47e4ae63abdb8f 100644
--- a/pkgs/applications/graphics/xzgv/default.nix
+++ b/pkgs/applications/graphics/xzgv/default.nix
@@ -1,24 +1,25 @@
-{ stdenv, fetchurl, gtk2, pkgconfig, texinfo }:
+{ stdenv, fetchurl, gtk2, libexif, pkgconfig, texinfo }:
stdenv.mkDerivation rec {
name = "xzgv-${version}";
- version = "0.9.1";
+ version = "0.9.2";
src = fetchurl {
url = "mirror://sourceforge/xzgv/xzgv-${version}.tar.gz";
- sha256 = "1rh432wnvzs434knzbda0fslhfx0gngryrrnqkfm6gwd2g5mxcph";
+ sha256 = "17l1xr9v07ggwga3vn0z1i4lnwjrr20rr8z1kjbw71aaijxl18i5";
};
- buildInputs = [ gtk2 pkgconfig texinfo ];
- patches = [ ./fix-linker-paths.patch ];
+ nativeBuildInputs = [ pkgconfig texinfo ];
+ buildInputs = [ gtk2 libexif ];
postPatch = ''
substituteInPlace config.mk \
--replace /usr/local $out
- substituteInPlace config.mk \
- --replace "CFLAGS=-O2 -Wall" "CFLAGS=-Wall"
substituteInPlace Makefile \
--replace "all: src man" "all: src man info"
'';
+ preInstall = ''
+ mkdir -p $out/share/{app-install/desktop,applications,info,pixmaps}
+ '';
meta = with stdenv.lib; {
- homepage = http://sourceforge.net/projects/xzgv/;
+ homepage = https://sourceforge.net/projects/xzgv/;
description = "Picture viewer for X with a thumbnail-based selector";
license = licenses.gpl2;
maintainers = [ maintainers.womfoo ];
diff --git a/pkgs/applications/graphics/xzgv/fix-linker-paths.patch b/pkgs/applications/graphics/xzgv/fix-linker-paths.patch
deleted file mode 100644
index c5b1ae0879b5bb3fac4590850e0c3ea98398ba3b..0000000000000000000000000000000000000000
--- a/pkgs/applications/graphics/xzgv/fix-linker-paths.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-taken from http://sourceforge.net/p/xzgv/code/53/tree//trunk/xzgv/src/Makefile?diff=514dada434309d2ec11f5eff:52
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -9,8 +9,10 @@
- # This gets definitions for CC, CFLAGS, BINDIR etc.
- include ../config.mk
-
--CFLAGS+=`pkg-config --cflags gtk+-2.0` `pkg-config --cflags gdk-pixbuf-2.0`
--LDFLAGS+=`pkg-config --libs gtk+-2.0` `pkg-config --libs gdk-pixbuf-2.0`
-+CFLAGS+=`pkg-config --cflags gtk+-2.0` `pkg-config --cflags gdk-pixbuf-2.0` \
-+ `pkg-config --cflags x11`
-+LDFLAGS+=`pkg-config --libs gtk+-2.0` `pkg-config --libs gdk-pixbuf-2.0` \
-+ `pkg-config --libs x11` -lm
-
- all: xzgv
-
-@@ -23,7 +25,7 @@
- backend.o
-
- xzgv: $(OBJS)
-- $(CC) $(LDFLAGS) -o xzgv $(OBJS)
-+ $(CC) -o xzgv $(OBJS) $(LDFLAGS)
-
- installdirs:
- /bin/sh ../mkinstalldirs $(BINDIR)
diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix
index fa85d44a4980a58244da3127dd3c48c819b54569..dcb7c512ddef508c59d646faca87860e8f44b0df 100644
--- a/pkgs/applications/graphics/yed/default.nix
+++ b/pkgs/applications/graphics/yed/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
name = "yEd-${version}";
- version = "3.17";
+ version = "3.17.1";
src = requireFile {
name = "${name}.zip";
url = "https://www.yworks.com/en/products/yfiles/yed/";
- sha256 = "1wk58cql90y3i5l7jlxqfjjgf26i0zrv5cn0p9npgagaw6aiw2za";
+ sha256 = "0fk1gai7yghfmfvx1rfzdnpwihbq6hqzncyk6zkpqdrf6zz576nl";
};
nativeBuildInputs = [ unzip makeWrapper ];
diff --git a/pkgs/applications/graphics/zgv/default.nix b/pkgs/applications/graphics/zgv/default.nix
index e06b76e35b12379b39ae785ce168148f43e37581..1af165368363bc380d3768b2aa8c5de8a2f5489d 100644
--- a/pkgs/applications/graphics/zgv/default.nix
+++ b/pkgs/applications/graphics/zgv/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "1fk4i9x0cpnpn3llam0zy2pkmhlr2hy3iaxhxg07v9sizd4dircj";
};
- buildInputs = [ SDL SDL_image pkgconfig libjpeg libpng libtiff ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ SDL SDL_image libjpeg libpng libtiff ];
hardeningDisable = [ "format" ];
diff --git a/pkgs/applications/kde/akonadiconsole.nix b/pkgs/applications/kde/akonadiconsole.nix
index 844cbc7d17f2c5a633e80d17afe74fa872801e6c..3d7bf26c794e3778f1e6fd0dd36c365fa60ca347 100644
--- a/pkgs/applications/kde/akonadiconsole.nix
+++ b/pkgs/applications/kde/akonadiconsole.nix
@@ -2,7 +2,7 @@
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
akonadi, akonadi-contacts, calendarsupport, kcalcore, kcompletion,
- kconfigwidgets, kcontacts, kdbusaddons, kitemmodels, kpimtextedit,
+ kconfigwidgets, kcontacts, kdbusaddons, kitemmodels, kpimtextedit, libkdepim,
ktextwidgets, kxmlgui, messagelib, qtbase,
}:
@@ -16,6 +16,6 @@ mkDerivation {
buildInputs = [
akonadi akonadi-contacts calendarsupport kcalcore kcompletion kconfigwidgets
kcontacts kdbusaddons kitemmodels kpimtextedit ktextwidgets kxmlgui
- messagelib qtbase
+ messagelib qtbase libkdepim
];
}
diff --git a/pkgs/applications/kde/ark/default.nix b/pkgs/applications/kde/ark/default.nix
index 013e2e63f599c0fb8570a07a1fee914f01a82426..fb631414838cd36005c2e72df63b48131825e4a1 100644
--- a/pkgs/applications/kde/ark/default.nix
+++ b/pkgs/applications/kde/ark/default.nix
@@ -27,7 +27,7 @@ mkDerivation {
lib.makeBinPath
([ p7zip unzip zip ] ++ lib.optional unfreeEnableUnrar unrar);
in ''
- wrapProgram "$out/bin/ark" --prefix PATH: "${PATH}"
+ wrapProgram "$out/bin/ark" --prefix PATH : "${PATH}"
'';
meta = {
license = with lib.licenses;
diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 24b73f415ad9062916262a58082e8f81aedccad6..54a834cba002a0d2e7d33c142c8f727b82387078 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -101,6 +101,7 @@ let
kdepim-runtime = callPackage ./kdepim-runtime.nix {};
kdepim-apps-libs = callPackage ./kdepim-apps-libs {};
kdf = callPackage ./kdf.nix {};
+ keditbookmarks = callPackage ./keditbookmarks.nix {};
kgpg = callPackage ./kgpg.nix {};
khelpcenter = callPackage ./khelpcenter.nix {};
kholidays = callPackage ./kholidays.nix {};
@@ -124,6 +125,7 @@ let
korganizer = callPackage ./korganizer.nix {};
kpimtextedit = callPackage ./kpimtextedit.nix {};
kqtquickcharts = callPackage ./kqtquickcharts.nix {};
+ krdc = callPackage ./krdc.nix {};
krfb = callPackage ./krfb.nix {};
ktnef = callPackage ./ktnef.nix {};
kwalletmanager = callPackage ./kwalletmanager.nix {};
@@ -135,15 +137,18 @@ let
libkipi = callPackage ./libkipi.nix {};
libkleo = callPackage ./libkleo.nix {};
libkomparediff2 = callPackage ./libkomparediff2.nix {};
+ libksane = callPackage ./libksane.nix {};
libksieve = callPackage ./libksieve.nix {};
mailcommon = callPackage ./mailcommon.nix {};
mailimporter = callPackage ./mailimporter.nix {};
marble = callPackage ./marble.nix {};
mbox-importer = callPackage ./mbox-importer.nix {};
messagelib = callPackage ./messagelib.nix {};
+ minuet = callPackage ./minuet.nix {};
okteta = callPackage ./okteta.nix {};
okular = callPackage ./okular.nix {};
pimcommon = callPackage ./pimcommon.nix {};
+ pim-data-exporter = callPackage ./pim-data-exporter.nix {};
pim-sieve-editor = callPackage ./pim-sieve-editor.nix {};
print-manager = callPackage ./print-manager.nix {};
spectacle = callPackage ./spectacle.nix {};
diff --git a/pkgs/applications/kde/dolphin-plugins.nix b/pkgs/applications/kde/dolphin-plugins.nix
index eb823641ae446755abfdbaf862c910307d3f8083..5580952f40a0e0fc4dd277b67ba32f28034aab5f 100644
--- a/pkgs/applications/kde/dolphin-plugins.nix
+++ b/pkgs/applications/kde/dolphin-plugins.nix
@@ -14,4 +14,5 @@ mkDerivation {
propagatedBuildInputs = [
dolphin kdelibs4support ki18n kio kxmlgui
];
+ outputs = [ "out" "dev" ];
}
diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh
index 929771ed5fafa47a885bcba0726056dc754e9880..1542b9c25190a865385b76c9c85c5976d3a9259b 100644
--- a/pkgs/applications/kde/fetch.sh
+++ b/pkgs/applications/kde/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/applications/17.04.3/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/applications/17.08.3/ -A '*.tar.xz' )
diff --git a/pkgs/applications/kde/filelight.nix b/pkgs/applications/kde/filelight.nix
index 6eb219d8da9668b0ed6af40acc38e88a19fb487f..a3be5be7f0a2932187f37b99fb8a33129b0a964b 100644
--- a/pkgs/applications/kde/filelight.nix
+++ b/pkgs/applications/kde/filelight.nix
@@ -14,4 +14,5 @@ mkDerivation {
propagatedBuildInputs = [
kio kparts kxmlgui qtscript solid
];
+ outputs = [ "out" "dev" ];
}
diff --git a/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch b/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch
index 76b65a4447527646aa5ba7325a7ac3b2a73d5df2..6275bb84c17b08ba15460d127ec53a3ad9451d23 100644
--- a/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch
+++ b/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch
@@ -44,17 +44,6 @@ Index: grantleetheme-17.04.0/src/grantleetheme.cpp
loader->setTheme(dirName);
if (!sEngine) {
-@@ -102,9 +105,7 @@ QString ThemePrivate::errorTemplate(cons
- Grantlee::Context ctx = createContext();
- ctx.insert(QStringLiteral("error"), reason);
- ctx.insert(QStringLiteral("templateName"), origTemplateName);
-- const QString errorString = failedTemplate
-- ? failedTemplate->errorString()
-- : QStringLiteral("(null template)");
-+ const QString errorString = failedTemplate->errorString();
- ctx.insert(QStringLiteral("errorMessage"), errorString);
- return tpl->render(&ctx);
- }
@@ -122,7 +123,7 @@ Theme::Theme(const QString &themePath, c
KConfigGroup group(&config, QStringLiteral("Desktop Entry"));
if (group.isValid()) {
diff --git a/pkgs/applications/kde/grantleetheme/grantleetheme_check_null.patch b/pkgs/applications/kde/grantleetheme/grantleetheme_check_null.patch
deleted file mode 100644
index 730d5b0fe26126123090e19862330add29ff07fe..0000000000000000000000000000000000000000
--- a/pkgs/applications/kde/grantleetheme/grantleetheme_check_null.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/src/grantleetheme.cpp b/src/grantleetheme.cpp
-index b86fc3a..8af72f4 100644
---- a/src/grantleetheme.cpp
-+++ b/src/grantleetheme.cpp
-@@ -102,7 +102,10 @@ QString ThemePrivate::errorTemplate(const QString &reason,
- Grantlee::Context ctx = createContext();
- ctx.insert(QStringLiteral("error"), reason);
- ctx.insert(QStringLiteral("templateName"), origTemplateName);
-- ctx.insert(QStringLiteral("errorMessage"), failedTemplate->errorString());
-+ const QString errorString = failedTemplate
-+ ? failedTemplate->errorString()
-+ : QStringLiteral("(null template)");
-+ ctx.insert(QStringLiteral("errorMessage"), errorString);
- return tpl->render(&ctx);
- }
-
-@@ -208,7 +211,7 @@ QString Theme::render(const QString &templateName, const QVariantHash &data, con
- }
-
- Grantlee::Template tpl = d->loader->loadByName(templateName, ThemePrivate::sEngine);
-- if (tpl->error()) {
-+ if (!tpl || tpl->error()) {
- return d->errorTemplate(i18n("Template parsing error"), templateName, tpl);
- }
-
diff --git a/pkgs/applications/kde/grantleetheme/series b/pkgs/applications/kde/grantleetheme/series
index 5c38848de71345de306442cb4be02e7b2d51f18c..9095599ea56b13b08bb275d874efacd713951661 100644
--- a/pkgs/applications/kde/grantleetheme/series
+++ b/pkgs/applications/kde/grantleetheme/series
@@ -1,2 +1 @@
-grantleetheme_check_null.patch
grantlee-merge-theme-dirs.patch
diff --git a/pkgs/applications/kde/k3b.nix b/pkgs/applications/kde/k3b.nix
index c70c3ea877b97f30dec7a824c3713db52e909be7..b032de8487943c09e21869b9634f1c8e35db615f 100644
--- a/pkgs/applications/kde/k3b.nix
+++ b/pkgs/applications/kde/k3b.nix
@@ -1,11 +1,11 @@
{ mkDerivation, lib
-, extra-cmake-modules, kdoctools, makeWrapper
+, extra-cmake-modules, kdoctools, makeWrapper, shared_mime_info
, qtwebkit
, libkcddb, karchive, kcmutils, kfilemetadata, knewstuff, knotifyconfig, solid, kxmlgui
, flac, lame, libmad, libmpcdec, libvorbis
, libsamplerate, libsndfile, taglib
, cdparanoia, cdrdao, cdrtools, dvdplusrwtools, libburn, libdvdcss, libdvdread, vcdimager
-, ffmpeg, libmusicbrainz2, normalize, sox, transcode, shared_mime_info, kinit
+, ffmpeg, libmusicbrainz3, normalize, sox, transcode, kinit
}:
mkDerivation {
@@ -15,7 +15,7 @@ mkDerivation {
maintainers = with maintainers; [ sander phreedom ];
platforms = platforms.linux;
};
- nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper shared_mime_info ];
+ nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ];
propagatedBuildInputs = [
# qt
qtwebkit
@@ -28,7 +28,7 @@ mkDerivation {
# cd/dvd
cdparanoia libdvdcss libdvdread
# others
- ffmpeg libmusicbrainz2 shared_mime_info
+ ffmpeg libmusicbrainz3 shared_mime_info
];
propagatedUserEnvPkgs = [ (lib.getBin kinit) ];
postFixup =
diff --git a/pkgs/applications/kde/kde-locale-5.nix b/pkgs/applications/kde/kde-locale-5.nix
deleted file mode 100644
index 76d601cbdc0f1805e6003e5d2912f02eef9776dc..0000000000000000000000000000000000000000
--- a/pkgs/applications/kde/kde-locale-5.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-name: args:
-
-{ mkDerivation, cmake, extra-cmake-modules, gettext, kdoctools }:
-
-mkDerivation (args // {
- sname = "kde-l10n-${name}";
- name = "kde-l10n-${name}-qt5";
-
- outputs = [ "out" ];
-
- nativeBuildInputs =
- [ cmake extra-cmake-modules gettext kdoctools ]
- ++ (args.nativeBuildInputs or []);
-
- preConfigure = ''
- sed -e 's/add_subdirectory(4)//' -i CMakeLists.txt
- ${args.preConfigure or ""}
- '';
-
- preFixup = ''
- propagatedBuildInputs=
- propagatedNativeBuildInputs=
- '';
-})
diff --git a/pkgs/applications/kde/kdenlive.nix b/pkgs/applications/kde/kdenlive.nix
index 854e346e2909e1b39e0d689ca3644136cad3cfca..17d7da7b702c537715ad29909f38f7ce138dec47 100644
--- a/pkgs/applications/kde/kdenlive.nix
+++ b/pkgs/applications/kde/kdenlive.nix
@@ -2,7 +2,6 @@
, lib
, extra-cmake-modules
, kdoctools
-, qtscript
, kactivities
, kconfig
, kcrash
@@ -27,7 +26,10 @@
, kfilemetadata
, ffmpeg
, phonon-backend-gstreamer
+, qtdeclarative
, qtquickcontrols
+, qtscript
+, qtwebkit
}:
mkDerivation {
@@ -56,8 +58,10 @@ mkDerivation {
ktextwidgets
mlt
phonon-backend-gstreamer
+ qtdeclarative
qtquickcontrols
qtscript
+ qtwebkit
shared_mime_info
libv4l
ffmpeg
diff --git a/pkgs/applications/kde/kdepim-runtime.nix b/pkgs/applications/kde/kdepim-runtime.nix
index 01683a6315c1e5716eeac0bc9a991a13b1604940..0fde861a023783a9bdb113e3a9fc208eeccd50c3 100644
--- a/pkgs/applications/kde/kdepim-runtime.nix
+++ b/pkgs/applications/kde/kdepim-runtime.nix
@@ -5,7 +5,7 @@
akonadi, akonadi-calendar, akonadi-contacts, akonadi-mime, akonadi-notes,
kalarmcal, kcalutils, kcontacts, kdav, kdelibs4support, kidentitymanagement,
kimap, kmailtransport, kmbox, kmime, knotifications, knotifyconfig,
- qtwebengine,
+ pimcommon, qtwebengine,
}:
mkDerivation {
@@ -19,6 +19,7 @@ mkDerivation {
akonadi akonadi-calendar akonadi-contacts akonadi-mime akonadi-notes
kalarmcal kcalutils kcontacts kdav kdelibs4support kidentitymanagement kimap
kmailtransport kmbox kmime knotifications knotifyconfig qtwebengine
+ pimcommon
];
# Attempts to build some files before dependencies have been generated
enableParallelBuilding = false;
diff --git a/pkgs/applications/kde/keditbookmarks.nix b/pkgs/applications/kde/keditbookmarks.nix
new file mode 100644
index 0000000000000000000000000000000000000000..57741c03ad54773ad7c2232b5b6ab192823558f6
--- /dev/null
+++ b/pkgs/applications/kde/keditbookmarks.nix
@@ -0,0 +1,17 @@
+{
+ mkDerivation, lib,
+ extra-cmake-modules, kdoctools,
+ kio, kparts, kwindowsystem
+}:
+
+mkDerivation {
+ name = "keditbookmarks";
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ buildInputs = [ kio kparts kwindowsystem ];
+ meta = with lib; {
+ homepage = http://www.kde.org;
+ license = with licenses; [ gpl2 lgpl21 fdl12 bsd3 ];
+ maintainers = with maintainers; [ peterhoeg ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/kde/kmail.nix b/pkgs/applications/kde/kmail.nix
index ec8c989277954aedb0f4b0406bb483feb3fcdbd3..acb200c59708c80df5b717464a161f16e200f6dc 100644
--- a/pkgs/applications/kde/kmail.nix
+++ b/pkgs/applications/kde/kmail.nix
@@ -2,7 +2,7 @@
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
akonadi-search, kbookmarks, kcalutils, kcmutils, kcompletion, kconfig,
- kconfigwidgets, kcoreaddons, kdelibs4support, kdepim-apps-libs,
+ kconfigwidgets, kcoreaddons, kdelibs4support, kdepim-apps-libs, libkdepim,
kdepim-runtime, kguiaddons, ki18n, kiconthemes, kinit, kio, kldap,
kmail-account-wizard, kmailtransport, knotifications, knotifyconfig,
kontactinterface, kparts, kpty, kservice, ktextwidgets, ktnef, kwallet,
@@ -20,7 +20,7 @@ mkDerivation {
buildInputs = [
akonadi-search kbookmarks kcalutils kcmutils kcompletion kconfig
kconfigwidgets kcoreaddons kdelibs4support kdepim-apps-libs kguiaddons ki18n
- kiconthemes kinit kio kldap kmail-account-wizard kmailtransport
+ kiconthemes kinit kio kldap kmail-account-wizard kmailtransport libkdepim
knotifications knotifyconfig kontactinterface kparts kpty kservice
ktextwidgets ktnef kwidgetsaddons kwindowsystem kxmlgui libgravatar
libksieve mailcommon messagelib pim-sieve-editor qtscript qtwebengine
diff --git a/pkgs/applications/kde/kontact.nix b/pkgs/applications/kde/kontact.nix
index 4bbee9c3ffa61359194e3189adc05c4450ea5939..bb44762e65c5e8c5620ceb751ad0fef3ab64f6b6 100644
--- a/pkgs/applications/kde/kontact.nix
+++ b/pkgs/applications/kde/kontact.nix
@@ -4,7 +4,7 @@
qtwebengine,
kcmutils, kcrash, kdbusaddons, kwindowsystem,
akonadi, grantleetheme, kdepim-apps-libs, kontactinterface, kpimtextedit,
- mailcommon,
+ mailcommon, libkdepim
}:
mkDerivation {
@@ -18,6 +18,6 @@ mkDerivation {
qtwebengine
kcmutils kcrash kdbusaddons kwindowsystem
akonadi grantleetheme kdepim-apps-libs kontactinterface kpimtextedit
- mailcommon
+ mailcommon libkdepim
];
}
diff --git a/pkgs/applications/kde/krdc.nix b/pkgs/applications/kde/krdc.nix
new file mode 100644
index 0000000000000000000000000000000000000000..87204c1fe9fc244c1f72b7c23bb886c14d25c0ab
--- /dev/null
+++ b/pkgs/applications/kde/krdc.nix
@@ -0,0 +1,25 @@
+{
+ mkDerivation, lib,
+ extra-cmake-modules, kdoctools, makeWrapper,
+ kcmutils, kcompletion, kconfig, kdnssd, knotifyconfig, kwallet, kwidgetsaddons,
+ libvncserver, freerdp
+}:
+
+mkDerivation {
+ name = "krdc";
+ nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ];
+ buildInputs = [
+ kcmutils kcompletion kconfig kdnssd knotifyconfig kwallet kwidgetsaddons
+ freerdp libvncserver
+ ];
+ postFixup = ''
+ wrapProgram $out/bin/krdc \
+ --prefix PATH : ${lib.makeBinPath [ freerdp ]}
+ '';
+ meta = with lib; {
+ homepage = http://www.kde.org;
+ license = with licenses; [ gpl2 lgpl21 fdl12 bsd3 ];
+ maintainers = with maintainers; [ peterhoeg ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/kde/l10n.nix b/pkgs/applications/kde/l10n.nix
index 403db98c0f352acdb46ad7351013804244744598..10a8472d5a9ed4c6208984d387c3f78cf9a99771 100644
--- a/pkgs/applications/kde/l10n.nix
+++ b/pkgs/applications/kde/l10n.nix
@@ -3,7 +3,6 @@
let
kdeLocale4 = import ./kde-locale-4.nix;
- kdeLocale5 = import ./kde-locale-5.nix;
in
diff --git a/pkgs/applications/kde/libksane.nix b/pkgs/applications/kde/libksane.nix
new file mode 100644
index 0000000000000000000000000000000000000000..f92f21de7fb8a94948753bdb3b346824a8d8ac35
--- /dev/null
+++ b/pkgs/applications/kde/libksane.nix
@@ -0,0 +1,16 @@
+{
+ mkDerivation, lib,
+ extra-cmake-modules, qtbase,
+ ki18n, ktextwidgets, kwallet, kwidgetsaddons,
+ sane-backends
+}:
+
+mkDerivation {
+ name = "libksane";
+ meta = with lib; {
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ pshendry ];
+ };
+ nativeBuildInputs = [ extra-cmake-modules ];
+ buildInputs = [ qtbase ki18n ktextwidgets kwallet kwidgetsaddons sane-backends ];
+}
diff --git a/pkgs/applications/kde/mailcommon.nix b/pkgs/applications/kde/mailcommon.nix
index ee958d701b34edc98c7e13ae346826ec32a989d7..44edea8f55e90bcc21f43f9c360aefcebeb2dbd4 100644
--- a/pkgs/applications/kde/mailcommon.nix
+++ b/pkgs/applications/kde/mailcommon.nix
@@ -3,7 +3,7 @@
extra-cmake-modules, kdoctools,
akonadi, akonadi-mime, karchive, kcodecs, kcompletion, kconfigwidgets,
kdbusaddons, kdesignerplugin, kiconthemes, kio, kitemmodels, kldap,
- kmailtransport, kwindowsystem, mailimporter, messagelib, phonon,
+ kmailtransport, kwindowsystem, mailimporter, messagelib, phonon, libkdepim
}:
mkDerivation {
@@ -16,7 +16,7 @@ mkDerivation {
buildInputs = [
akonadi akonadi-mime karchive kcodecs kcompletion kconfigwidgets kdbusaddons
kdesignerplugin kiconthemes kio kitemmodels kldap kmailtransport
- kwindowsystem mailimporter messagelib phonon
+ kwindowsystem mailimporter messagelib phonon libkdepim
];
outputs = [ "out" "dev" ];
}
diff --git a/pkgs/applications/kde/minuet.nix b/pkgs/applications/kde/minuet.nix
new file mode 100644
index 0000000000000000000000000000000000000000..fd628a7aacfd48880e6fd31e1ca723c383999ad7
--- /dev/null
+++ b/pkgs/applications/kde/minuet.nix
@@ -0,0 +1,22 @@
+{ mkDerivation
+, lib, extra-cmake-modules
+, drumstick, fluidsynth
+, kcoreaddons, kcrash, kdoctools
+, qtquickcontrols2, qtsvg, qttools
+}:
+
+mkDerivation {
+ name = "minuet";
+ meta = with lib; {
+ license = with licenses; [ lgpl21 gpl3 ];
+ maintainers = with maintainers; [ peterhoeg ];
+ };
+
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ propagatedBuildInputs = [
+ drumstick fluidsynth
+ kcoreaddons kcrash
+ qtquickcontrols2 qtsvg qttools
+ ];
+ enableParallelBuilding = true;
+}
diff --git a/pkgs/applications/kde/okteta.nix b/pkgs/applications/kde/okteta.nix
index b985d7170d9efbccb45a792b691789b633791811..422968be35a53fd749212701ad800876169f5f47 100644
--- a/pkgs/applications/kde/okteta.nix
+++ b/pkgs/applications/kde/okteta.nix
@@ -1,7 +1,9 @@
{
mkDerivation, lib,
- extra-cmake-modules, kdoctools, shared_mime_info,
- kconfig, kinit, kcmutils, kconfigwidgets, knewstuff, kparts, qca-qt5, qtscript
+ extra-cmake-modules, kdoctools,
+ qtscript, kconfig, kinit, karchive, kcrash,
+ kcmutils, kconfigwidgets, knewstuff, kparts, qca-qt5,
+ shared_mime_info
}:
mkDerivation {
@@ -10,8 +12,10 @@ mkDerivation {
license = with lib.licenses; [ gpl2 ];
maintainers = with lib.maintainers; [ peterhoeg ];
};
- nativeBuildInputs = [ extra-cmake-modules kdoctools shared_mime_info ];
- buildInputs = [
- kconfig kinit kcmutils kconfigwidgets knewstuff kparts qca-qt5 qtscript
+ nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ];
+ buildInputs = [ shared_mime_info ];
+ propagatedBuildInputs = [
+ kconfig kinit kcmutils kconfigwidgets knewstuff kparts qca-qt5
+ karchive kcrash
];
}
diff --git a/pkgs/applications/kde/pim-data-exporter.nix b/pkgs/applications/kde/pim-data-exporter.nix
new file mode 100644
index 0000000000000000000000000000000000000000..10123944e3a6929a040203803c67b997eb81263b
--- /dev/null
+++ b/pkgs/applications/kde/pim-data-exporter.nix
@@ -0,0 +1,22 @@
+{
+ mkDerivation, lib, kdepimTeam,
+ extra-cmake-modules, kdoctools,
+ akonadi, kcmutils, kcrash, kdbusaddons, kidentitymanagement, kldap,
+ kmailtransport, knewstuff, knotifications, knotifyconfig, kparts, kross, ktexteditor,
+ kwallet, libkdepim, libkleo, pimcommon, qttools,
+ karchive, mailcommon, messagelib, pim-data-exporter
+}:
+
+mkDerivation {
+ name = "pim-data-exporter";
+ meta = {
+ license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+ maintainers = kdepimTeam;
+ };
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ buildInputs = [
+ akonadi kcmutils kcrash kdbusaddons kidentitymanagement kldap kmailtransport
+ knewstuff knotifications knotifyconfig kparts kross ktexteditor kwallet libkdepim
+ libkleo pimcommon qttools karchive mailcommon messagelib
+ ];
+}
diff --git a/pkgs/applications/kde/print-manager.nix b/pkgs/applications/kde/print-manager.nix
index 085b53de0f393ba3b80e495696f0da4027ad83f4..8ace4562cbd7123106845314b44e7b6861b0e5f7 100644
--- a/pkgs/applications/kde/print-manager.nix
+++ b/pkgs/applications/kde/print-manager.nix
@@ -19,4 +19,5 @@ mkDerivation {
kconfig kconfigwidgets kdbusaddons kiconthemes kcmutils knotifications
kwidgetsaddons kitemviews kio kwindowsystem plasma-framework qtdeclarative
];
+ outputs = [ "out" "dev" ];
}
diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix
index ec3628abef22ba6a398d01b8ca17c41993799e10..2edfb0d79bb3926acbd4f627f01ef39cbed0f8c4 100644
--- a/pkgs/applications/kde/srcs.nix
+++ b/pkgs/applications/kde/srcs.nix
@@ -3,2235 +3,2235 @@
{
akonadi = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/akonadi-17.04.3.tar.xz";
- sha256 = "0cddlz5v25ak9x1f682rjm3vlaqfm9n9y1bfd3h3md59j9l4gq49";
- name = "akonadi-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/akonadi-17.08.3.tar.xz";
+ sha256 = "01sn0c5b679v76djpd7rx3cgzn3idpsjc3m3wgrvjzfyqs18f2al";
+ name = "akonadi-17.08.3.tar.xz";
};
};
akonadi-calendar = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/akonadi-calendar-17.04.3.tar.xz";
- sha256 = "0543wixfwy80sx0lsy8jwlbyr3cxl3jyf04n644zyrkl461lv637";
- name = "akonadi-calendar-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/akonadi-calendar-17.08.3.tar.xz";
+ sha256 = "1w14a27k0hw4i9vnv2bkh12jpvb6jh31i6jd4hxaxvvmmjwl68b6";
+ name = "akonadi-calendar-17.08.3.tar.xz";
};
};
akonadi-calendar-tools = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/akonadi-calendar-tools-17.04.3.tar.xz";
- sha256 = "1yzfv80lyair5nkyql17ijnbcp9iyidhwrff6if9kn87sv5i9b4v";
- name = "akonadi-calendar-tools-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/akonadi-calendar-tools-17.08.3.tar.xz";
+ sha256 = "19b5my6svq32nwagkq5p0al7mzf844d4pp0764irgdcfk6ciakkw";
+ name = "akonadi-calendar-tools-17.08.3.tar.xz";
};
};
akonadiconsole = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/akonadiconsole-17.04.3.tar.xz";
- sha256 = "1v449q0d1ld84jjy0bshnf99ss5qq9mg2vp9c2wl2i8f640k7f0v";
- name = "akonadiconsole-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/akonadiconsole-17.08.3.tar.xz";
+ sha256 = "1ccmdarzb60f22ypnfmr1gzrc7byw08c2h3zhni9g1jab327i2vk";
+ name = "akonadiconsole-17.08.3.tar.xz";
};
};
akonadi-contacts = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/akonadi-contacts-17.04.3.tar.xz";
- sha256 = "03sffvybravzmg8qjqylgvfrn7ajvahkm7qnr8k44b9i9cy676ak";
- name = "akonadi-contacts-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/akonadi-contacts-17.08.3.tar.xz";
+ sha256 = "0fh9rja4dlvambx6ig4gszgr26rrxfhmgdn0541fsg5hpkpifsx9";
+ name = "akonadi-contacts-17.08.3.tar.xz";
};
};
akonadi-import-wizard = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/akonadi-import-wizard-17.04.3.tar.xz";
- sha256 = "0gb2vzvznmyc3qvrzaka5q43qp982izm4yf7i340yi780qaixz18";
- name = "akonadi-import-wizard-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/akonadi-import-wizard-17.08.3.tar.xz";
+ sha256 = "1hza7bl6anzxp32dpw79v73lgqssmdw32qhkinnacws7x9kcvpag";
+ name = "akonadi-import-wizard-17.08.3.tar.xz";
};
};
akonadi-mime = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/akonadi-mime-17.04.3.tar.xz";
- sha256 = "050kn3shqnzk22bx2h83b6qymn3npscnjqd2vrrwvbwh1b2ww2si";
- name = "akonadi-mime-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/akonadi-mime-17.08.3.tar.xz";
+ sha256 = "1374wvyh29ba5s60m8przch5rmxvxzc2kjfw1gxhkrl7k8hfi4k8";
+ name = "akonadi-mime-17.08.3.tar.xz";
};
};
akonadi-notes = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/akonadi-notes-17.04.3.tar.xz";
- sha256 = "1l8rhfvl8fh04igldggcq1fz1f6s595c89hzzza75qqbcs2azfps";
- name = "akonadi-notes-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/akonadi-notes-17.08.3.tar.xz";
+ sha256 = "0bnr6j8pqqx6hg8hq51yzaky5hyym5lxyj9rwcsmm75x2c29wxb7";
+ name = "akonadi-notes-17.08.3.tar.xz";
};
};
akonadi-search = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/akonadi-search-17.04.3.tar.xz";
- sha256 = "0b4magnl3lrlnfsnsw46vkbhkp1bbxf2fgjfm84vndmwyglj1605";
- name = "akonadi-search-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/akonadi-search-17.08.3.tar.xz";
+ sha256 = "16d6v2d1irh02kd4dcvjhv17sqkps4xq4dpa4x1wb3q5qzxhmqcr";
+ name = "akonadi-search-17.08.3.tar.xz";
};
};
akregator = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/akregator-17.04.3.tar.xz";
- sha256 = "12wajdwn3pp2prl9b2wlx1326b9w75j04yhg6q3082nrhlgmcnm2";
- name = "akregator-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/akregator-17.08.3.tar.xz";
+ sha256 = "1jd48yj9sl4z46qfk3qkm98q33f1qblsyjdr7ff8znxkg2pw5xg6";
+ name = "akregator-17.08.3.tar.xz";
};
};
analitza = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/analitza-17.04.3.tar.xz";
- sha256 = "0scz8qi25gk1p8n6134wbcrknvxihyjkwvs6x22606nnrghlfc1b";
- name = "analitza-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/analitza-17.08.3.tar.xz";
+ sha256 = "1j0z63sfah2ypjb3szcr7dqndw18lcy8l9440q8kzq0gyl83cn3v";
+ name = "analitza-17.08.3.tar.xz";
};
};
ark = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/ark-17.04.3.tar.xz";
- sha256 = "1b9kadiz91d86q3hrailzd56pbaxzh7jmvy317nfiqrflw541sin";
- name = "ark-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/ark-17.08.3.tar.xz";
+ sha256 = "1qz333nd23x4ldx675cxs7ka2vz45xmkfsakdg8m3x26i7jnl86x";
+ name = "ark-17.08.3.tar.xz";
};
};
artikulate = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/artikulate-17.04.3.tar.xz";
- sha256 = "0axc54cqyhmb28rzxlflmms4cfv2539wwb4lmgm99z8kgg7634g6";
- name = "artikulate-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/artikulate-17.08.3.tar.xz";
+ sha256 = "13hg9cjdwhfya57xan96ma55msani0lx7v55zh0hv0jab9fxgv1n";
+ name = "artikulate-17.08.3.tar.xz";
};
};
audiocd-kio = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/audiocd-kio-17.04.3.tar.xz";
- sha256 = "1q1zlp2p94044p0gb6vwzybvj3g2c1lwnyj4x2kim6wkj2x9pqrf";
- name = "audiocd-kio-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/audiocd-kio-17.08.3.tar.xz";
+ sha256 = "0n1xfypn2m56iw65p52yfbbqn17c6kc1x8syh35ifg9c1147y8ar";
+ name = "audiocd-kio-17.08.3.tar.xz";
};
};
baloo-widgets = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/baloo-widgets-17.04.3.tar.xz";
- sha256 = "1awhqv8gqjkdcblsq9sn6wd2f2693niyk59x0vhf3ml87sqmhki4";
- name = "baloo-widgets-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/baloo-widgets-17.08.3.tar.xz";
+ sha256 = "031yhv8ivqzr63maylsin60hfv45awry6xigfy0kfqj06q63944g";
+ name = "baloo-widgets-17.08.3.tar.xz";
};
};
blinken = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/blinken-17.04.3.tar.xz";
- sha256 = "13m0854d4bahhcpfq7v04ydhvxs79x9h0rhhvp9zapzq8kvhc6s0";
- name = "blinken-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/blinken-17.08.3.tar.xz";
+ sha256 = "15nnsyqy73inqqys1r8khh1vvl24ljmgjpxlqg8vlfb6d8dsc8yx";
+ name = "blinken-17.08.3.tar.xz";
};
};
blogilo = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/blogilo-17.04.3.tar.xz";
- sha256 = "1ziipi55hwmkmf7pr9j64qhc0px3v4pzd3b4b2gqz4fjg2sggp12";
- name = "blogilo-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/blogilo-17.08.3.tar.xz";
+ sha256 = "18vbvs5cih9vcxfqsia35q8bzc4ldzaajvnv9iqmisg060fxfwi9";
+ name = "blogilo-17.08.3.tar.xz";
};
};
bomber = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/bomber-17.04.3.tar.xz";
- sha256 = "13z4zs9mvcwlidxx17nx6qzbdcc7r15adh5awxnjxnqv0akmqj7p";
- name = "bomber-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/bomber-17.08.3.tar.xz";
+ sha256 = "1rmjlhyc46jxjsc303zl56c3k15q1qvp4yfl78v5l2pwmk8vdxzn";
+ name = "bomber-17.08.3.tar.xz";
};
};
bovo = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/bovo-17.04.3.tar.xz";
- sha256 = "0a27n64krkj6nmkzyi5vww6nsc2bzjlfzh8k32r8fjix500263i1";
- name = "bovo-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/bovo-17.08.3.tar.xz";
+ sha256 = "1npzzjgzhgbv7pnz3j9if2c5qa5b9ghzj7llp8yndf6dz31qibps";
+ name = "bovo-17.08.3.tar.xz";
};
};
calendarsupport = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/calendarsupport-17.04.3.tar.xz";
- sha256 = "1xv8n8hc5kp0cvbj7fpd065sb329ps3sazfmrf4h4gkh1zj5i8wi";
- name = "calendarsupport-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/calendarsupport-17.08.3.tar.xz";
+ sha256 = "1ii3h42jkskrizg29ii17jkdxgsqs3lwzsd7ypgw1k8gk9fyyqxh";
+ name = "calendarsupport-17.08.3.tar.xz";
};
};
cantor = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/cantor-17.04.3.tar.xz";
- sha256 = "0lcvhc2pyhyzlj9px6cni99l0zddyv32gk32s3wg7pz71msaw91w";
- name = "cantor-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/cantor-17.08.3.tar.xz";
+ sha256 = "0yz71lxwzl5r9k2fzs4iyhyx811rc77m6n1lqagd2c29hnnchn9w";
+ name = "cantor-17.08.3.tar.xz";
};
};
cervisia = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/cervisia-17.04.3.tar.xz";
- sha256 = "1hrik6r87sx2d99fnn89k48mf76xnrq4wgh2zg03hmf327ydviq2";
- name = "cervisia-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/cervisia-17.08.3.tar.xz";
+ sha256 = "0272zf51rn1a9k796fspp456zq6j21bddfn7r350pd6ra19ay7j8";
+ name = "cervisia-17.08.3.tar.xz";
};
};
dolphin = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/dolphin-17.04.3.tar.xz";
- sha256 = "1q8pj2wh186l76cg5ir3l9f6xma1kjgbrk9kfd9br400dx2pz62a";
- name = "dolphin-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/dolphin-17.08.3.tar.xz";
+ sha256 = "02bb66411jy03s4wicalnsl6sxmslhdb3wxsqh7sdyh63llna5b5";
+ name = "dolphin-17.08.3.tar.xz";
};
};
dolphin-plugins = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/dolphin-plugins-17.04.3.tar.xz";
- sha256 = "1is11ja2lzqxnsmj6kkr1q9l9csjy4ymv869yrgsbid0xjc2krj3";
- name = "dolphin-plugins-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/dolphin-plugins-17.08.3.tar.xz";
+ sha256 = "1s2rjrvfs5i87gx3fsz0mqdr7106ds5747wq6n2sfzjkvippygay";
+ name = "dolphin-plugins-17.08.3.tar.xz";
};
};
dragon = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/dragon-17.04.3.tar.xz";
- sha256 = "1raki9yp51s73ca6fv093pbhwjfw3hbiazbhfwf6f3dqag24w11w";
- name = "dragon-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/dragon-17.08.3.tar.xz";
+ sha256 = "0fxzwfg0l7lnsswb51h8gmh4wngmng9sgm5nhn6wmwhfbhbzgagq";
+ name = "dragon-17.08.3.tar.xz";
};
};
eventviews = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/eventviews-17.04.3.tar.xz";
- sha256 = "18j8xikfxn2mpx61d4ynahai9s6gwi0x5xsfvnyrc2v43a69w7ks";
- name = "eventviews-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/eventviews-17.08.3.tar.xz";
+ sha256 = "0j1r833kzf9sparvqnfn8r7klf4j0z8jwrgclf87rggmx0dn2v4y";
+ name = "eventviews-17.08.3.tar.xz";
};
};
ffmpegthumbs = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/ffmpegthumbs-17.04.3.tar.xz";
- sha256 = "1f8xrga8v045g5drcls87m9w5d00887sglk274gi1jmf60sy55jk";
- name = "ffmpegthumbs-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/ffmpegthumbs-17.08.3.tar.xz";
+ sha256 = "19bkpc316wlhswgrbszpj65lrzsdp443c1174hqknm0srvp6fbvv";
+ name = "ffmpegthumbs-17.08.3.tar.xz";
};
};
filelight = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/filelight-17.04.3.tar.xz";
- sha256 = "0srwhi3zi3gv8iid21f9gk709w59r4l7z560piywfgdmpp9spmgg";
- name = "filelight-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/filelight-17.08.3.tar.xz";
+ sha256 = "06j6api909shraflfpn0cyvxaa57s2dq178kshkfv5yppxjpfpja";
+ name = "filelight-17.08.3.tar.xz";
};
};
granatier = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/granatier-17.04.3.tar.xz";
- sha256 = "1gv4xikxkqfw54pcgrkj5l2m84fc39pckyg495aid3fbh73pgi7i";
- name = "granatier-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/granatier-17.08.3.tar.xz";
+ sha256 = "1z2gs73k8ymz09x72hvyylwqs6pxbnivz86hbb9pb1mlb7x5fgvs";
+ name = "granatier-17.08.3.tar.xz";
};
};
grantlee-editor = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/grantlee-editor-17.04.3.tar.xz";
- sha256 = "0lm97icf22gbrq9pgj8cmwcgpqb5nsgwv78ldz8hp1s9x05qck2v";
- name = "grantlee-editor-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/grantlee-editor-17.08.3.tar.xz";
+ sha256 = "1cb77qmzzk64mkbzvywksvpfqw88mwmg7sqrni4apsasvg9mvygx";
+ name = "grantlee-editor-17.08.3.tar.xz";
};
};
grantleetheme = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/grantleetheme-17.04.3.tar.xz";
- sha256 = "0jbgxjlsih2alc5ylbkrwwc2ij11ywsynlz1vsm0qzrfb7j534si";
- name = "grantleetheme-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/grantleetheme-17.08.3.tar.xz";
+ sha256 = "0zag5gmaqi068hw8s71ascj7s8clg1sickrfpzjf3nhcf6y669rp";
+ name = "grantleetheme-17.08.3.tar.xz";
};
};
gwenview = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/gwenview-17.04.3.tar.xz";
- sha256 = "12dy8hicrbns40gjnz2j60cqyjmrz5ci8sq2npblq5gr3avhdgla";
- name = "gwenview-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/gwenview-17.08.3.tar.xz";
+ sha256 = "05c96y5yrdgh7228bw3agn344g02hylnb2fw8crjcdapsiya4v1w";
+ name = "gwenview-17.08.3.tar.xz";
};
};
incidenceeditor = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/incidenceeditor-17.04.3.tar.xz";
- sha256 = "1xjgmz23q45s5m3kzfdr3k94l711i672m8cp5lfv9sczv4lgi45y";
- name = "incidenceeditor-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/incidenceeditor-17.08.3.tar.xz";
+ sha256 = "0qfcycivlgzjx8j4b2bd4qjp3x8wbiax477bmz56sfv7q0vp1dgm";
+ name = "incidenceeditor-17.08.3.tar.xz";
};
};
jovie = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/jovie-17.04.3.tar.xz";
- sha256 = "0v9ndwp7phd62vnp3qv3ax9khrzbqwhs0mv2glf8r8w4qqv39gsq";
- name = "jovie-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/jovie-17.08.3.tar.xz";
+ sha256 = "1a4v97p3yfwr5zn5qkfkw1ln7liz47f3bnhdb6yzzi03s5xfrk1z";
+ name = "jovie-17.08.3.tar.xz";
};
};
juk = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/juk-17.04.3.tar.xz";
- sha256 = "1kff1rcipw1m19w7dij3fjzqm4xkgzzy3qanhwhbicy77pkmcwjp";
- name = "juk-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/juk-17.08.3.tar.xz";
+ sha256 = "0735rdrn80akfb8viq8y77kxa28y1rg5infp26q7cy5cd4r6fvsi";
+ name = "juk-17.08.3.tar.xz";
};
};
k3b = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/k3b-17.04.3.tar.xz";
- sha256 = "0a1hk0is5iswbvrq1zlj8fgr02dg94nm1393s3j1ashgvxsfzmfk";
- name = "k3b-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/k3b-17.08.3.tar.xz";
+ sha256 = "0kshb3j4djb9npkia0m0ffyrwja3drsyxw7hpgyxxswik6kwbvgk";
+ name = "k3b-17.08.3.tar.xz";
};
};
kaccessible = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kaccessible-17.04.3.tar.xz";
- sha256 = "1iik3dbdxqr9702mcrvij56j3w5wr4vmylnpkr9lm46pf0kpxyby";
- name = "kaccessible-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kaccessible-17.08.3.tar.xz";
+ sha256 = "0sfrs57npp4y1yyw16chgrvyp6bnf4jymffblj5h7pb4bv0xlsmk";
+ name = "kaccessible-17.08.3.tar.xz";
};
};
kaccounts-integration = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kaccounts-integration-17.04.3.tar.xz";
- sha256 = "0s67vgk2sh11gf2icg5syk3zy66ilkdnjspahhfsmvqkgpgcr3w7";
- name = "kaccounts-integration-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kaccounts-integration-17.08.3.tar.xz";
+ sha256 = "0cir87m7f8sf70vvr8sxfhklgxigvv6npijphbbim7fnzc4z37m0";
+ name = "kaccounts-integration-17.08.3.tar.xz";
};
};
kaccounts-providers = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kaccounts-providers-17.04.3.tar.xz";
- sha256 = "0j3w66gvvaa1fsncr2h15lw3fk4m1qzkhzaxp13yg5cig3mkg3bb";
- name = "kaccounts-providers-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kaccounts-providers-17.08.3.tar.xz";
+ sha256 = "1y3ykj4q6m14q2lskliv0qy0ml0j9i9svhq06g2j25zd5wwlhbp5";
+ name = "kaccounts-providers-17.08.3.tar.xz";
};
};
kaddressbook = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kaddressbook-17.04.3.tar.xz";
- sha256 = "0gr3g0vi2h9qy4fw82g997wq2snam71qivqg5fk7bdgvzi3qm2d0";
- name = "kaddressbook-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kaddressbook-17.08.3.tar.xz";
+ sha256 = "1dq3lgrvg7s65mc2x2sgkwpz623ygb0by0y571dqjaz219j03955";
+ name = "kaddressbook-17.08.3.tar.xz";
};
};
kajongg = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kajongg-17.04.3.tar.xz";
- sha256 = "0clq9gvxn8lma5s1qxl2j56nylbs1vijqlw1xplxi4pfwzv2d09g";
- name = "kajongg-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kajongg-17.08.3.tar.xz";
+ sha256 = "00xb764nxzihz9kh7a82cm7slrj78zjl3s5qb90s03y375q4bha6";
+ name = "kajongg-17.08.3.tar.xz";
};
};
kalarm = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kalarm-17.04.3.tar.xz";
- sha256 = "00h90n9r05ffgca34fz1f5vr4c95xgq6ay6a0y7p7bda2kvl2rwg";
- name = "kalarm-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kalarm-17.08.3.tar.xz";
+ sha256 = "0rmdxx59iykn6f746dw9p0dyk96wds4kqr6w2y8fscp889i05g2a";
+ name = "kalarm-17.08.3.tar.xz";
};
};
kalarmcal = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kalarmcal-17.04.3.tar.xz";
- sha256 = "1qn9idrjql02fzbvjdk70jqp1c4npjmbjgfbnjg2m4jnd98xd7yr";
- name = "kalarmcal-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kalarmcal-17.08.3.tar.xz";
+ sha256 = "0g4vxkjkc38p2aigmfr2q2qd6x8pr4fj53jkvjq314vqg9sbak9c";
+ name = "kalarmcal-17.08.3.tar.xz";
};
};
kalgebra = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kalgebra-17.04.3.tar.xz";
- sha256 = "0hcybpy7bjmxym09xlv4mi4fidl8l130c0ghbigw8774f11k6vp5";
- name = "kalgebra-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kalgebra-17.08.3.tar.xz";
+ sha256 = "0hcrl205z2m5108g1kgxnmkrrg6x2m2p59cmdkbsd0ly0jnfc9w2";
+ name = "kalgebra-17.08.3.tar.xz";
};
};
kalzium = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kalzium-17.04.3.tar.xz";
- sha256 = "0pwxbb1qgkbx9y3320hwx96ymy91p6ycarvx731cyinp6v9lizld";
- name = "kalzium-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kalzium-17.08.3.tar.xz";
+ sha256 = "142lcm1d7v8xknmqg00cgdz3iaydr6c9wblpij3wykffd53x7ind";
+ name = "kalzium-17.08.3.tar.xz";
};
};
kamera = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kamera-17.04.3.tar.xz";
- sha256 = "0gjxv55lzdfwxk7cm8s9yzk5z6lqb64irx57682l76an3azkjwsf";
- name = "kamera-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kamera-17.08.3.tar.xz";
+ sha256 = "0zrny1f27z0drsna2lpw9sr4y7z479lys3vzcysgf1fv8b8jdjdh";
+ name = "kamera-17.08.3.tar.xz";
};
};
kanagram = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kanagram-17.04.3.tar.xz";
- sha256 = "01479ryshlaf9kqd3nlhdrx02i8xp7sn7n1ir4cdxpnm8jg28x0c";
- name = "kanagram-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kanagram-17.08.3.tar.xz";
+ sha256 = "1v5k67dw47i3n8635w1sc63n7f63hd9wvb44yxaw88clk46acn0k";
+ name = "kanagram-17.08.3.tar.xz";
};
};
kapman = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kapman-17.04.3.tar.xz";
- sha256 = "0llrh5g52gzvyxa5l3ardjv17msy2zj83in2g4cy094g1zciyk40";
- name = "kapman-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kapman-17.08.3.tar.xz";
+ sha256 = "0gici0v3ya16nk0b33cm5n95gdfhjqpy8wjg5y8bj12dby1d0n2w";
+ name = "kapman-17.08.3.tar.xz";
};
};
kapptemplate = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kapptemplate-17.04.3.tar.xz";
- sha256 = "0r4s5lfggv3nbqgi2y5y9zbyqp3fc7hlhlbdfr24cyljagmi8hgw";
- name = "kapptemplate-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kapptemplate-17.08.3.tar.xz";
+ sha256 = "16j1lx6rp0lqmcd8fyaishc0i2670v0map270z9575101338cyvm";
+ name = "kapptemplate-17.08.3.tar.xz";
};
};
kate = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kate-17.04.3.tar.xz";
- sha256 = "1p6sfn80f8hvkgrg6z2yk7h23v403695sp39fb7s3q4cn5a0sch8";
- name = "kate-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kate-17.08.3.tar.xz";
+ sha256 = "1yjzhf0a1skxz6iipac3z1p2wswn8bfjfr3k8qb6lhwlhbapc33x";
+ name = "kate-17.08.3.tar.xz";
};
};
katomic = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/katomic-17.04.3.tar.xz";
- sha256 = "0rm2alxjmr74m2nxf5vwg3j5ynajz4c5z57cnpmzwvxgdh2c49p0";
- name = "katomic-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/katomic-17.08.3.tar.xz";
+ sha256 = "0y00la43lc1352fipzglyvaf1cqalf0vkygg8r9vizm8vycp7hp9";
+ name = "katomic-17.08.3.tar.xz";
};
};
kblackbox = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kblackbox-17.04.3.tar.xz";
- sha256 = "183yvajbg8h48h4zwzm55zdajjan84dsnndg1db4n8gyibkv3f9d";
- name = "kblackbox-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kblackbox-17.08.3.tar.xz";
+ sha256 = "18lz0nb8zp95higssscgcr2cj1ni71bckk1wazyryxkmmmqk2rdn";
+ name = "kblackbox-17.08.3.tar.xz";
};
};
kblocks = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kblocks-17.04.3.tar.xz";
- sha256 = "0j66756d66ravgiq4ybfyhm4hacmys9snjyadr035103j26z89pw";
- name = "kblocks-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kblocks-17.08.3.tar.xz";
+ sha256 = "1nf3ws0dzzwqc87v6jqi1x5zm7w56cgfingr5plpp3cj8wv8jnvw";
+ name = "kblocks-17.08.3.tar.xz";
};
};
kblog = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kblog-17.04.3.tar.xz";
- sha256 = "10ngg2b83mczd937ikwzbwdqlrvlxsqzgrz95454x3s3j649hcy9";
- name = "kblog-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kblog-17.08.3.tar.xz";
+ sha256 = "0cnbn0wmva8xm2i05w5pdikw5mbx3z6mim3k98v2r954qml7xqdk";
+ name = "kblog-17.08.3.tar.xz";
};
};
kbounce = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kbounce-17.04.3.tar.xz";
- sha256 = "1f9np47ddhybnmm0m98fwpy51d9c8zgl7qrlj8g3diia45hy1s39";
- name = "kbounce-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kbounce-17.08.3.tar.xz";
+ sha256 = "12yj5jmpvhj5cxr4i818lp9cbcrdrvq9r7s202nzx5znxs11bbf6";
+ name = "kbounce-17.08.3.tar.xz";
};
};
kbreakout = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kbreakout-17.04.3.tar.xz";
- sha256 = "0s7khwg6sl709gjzf5ymq5l79iilnfx14jp5bnck0ir568vhybkf";
- name = "kbreakout-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kbreakout-17.08.3.tar.xz";
+ sha256 = "14d4cx91vv8bvvpjwbrwcvjczzs8j58yzazsfgqwhrj47cwhya43";
+ name = "kbreakout-17.08.3.tar.xz";
};
};
kbruch = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kbruch-17.04.3.tar.xz";
- sha256 = "11r50x5yp7s749prqwkxf3k5pm93pmk0h3b0i9c5507nbh2b2x9b";
- name = "kbruch-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kbruch-17.08.3.tar.xz";
+ sha256 = "0jxlybkmzs24482fmy7hhk2apyq26fpdblpnpdbqnydz95707475";
+ name = "kbruch-17.08.3.tar.xz";
};
};
kcachegrind = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kcachegrind-17.04.3.tar.xz";
- sha256 = "0wcjvmdsqg27b2d4rzvrl98nqj5k7hp02d1w136fklfsh5mzxbxn";
- name = "kcachegrind-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kcachegrind-17.08.3.tar.xz";
+ sha256 = "0xmnpbli7ndlv0532hpnqgvbkpw8y176jydhs6hy73ywwm416mvs";
+ name = "kcachegrind-17.08.3.tar.xz";
};
};
kcalc = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kcalc-17.04.3.tar.xz";
- sha256 = "1zshisq51vwsd04fxc5pw7lywrimpz04v2c9ad6lxwppmxcjr177";
- name = "kcalc-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kcalc-17.08.3.tar.xz";
+ sha256 = "0ck1hjv1v9fj7ckl4blpmfxzjx61ihc6av71m710nk7iv6gncsfm";
+ name = "kcalc-17.08.3.tar.xz";
};
};
kcalcore = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kcalcore-17.04.3.tar.xz";
- sha256 = "17i7d29yq06his3qjn5jblbdzf04500q9sdh7cr7xffdr3rpahdc";
- name = "kcalcore-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kcalcore-17.08.3.tar.xz";
+ sha256 = "0iy6dwzrcwzhjcz8yajp4mvbxr6vkxp4bnbnh9k2zvxgmg4y63h5";
+ name = "kcalcore-17.08.3.tar.xz";
};
};
kcalutils = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kcalutils-17.04.3.tar.xz";
- sha256 = "07k0vx3rdn1dvg16b3ipwng87aibr9g1jv9wg0hnk0fydsrpf99n";
- name = "kcalutils-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kcalutils-17.08.3.tar.xz";
+ sha256 = "1vs6qnv31s01i7wb7kz86v17z0wrymcclmwx2hj7vl4jqr532zdq";
+ name = "kcalutils-17.08.3.tar.xz";
};
};
kcharselect = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kcharselect-17.04.3.tar.xz";
- sha256 = "1cy3ljdmip0zqqmyqjj2d5jd5q0hyxiqkl8pcgl2hb7ypx5c06sx";
- name = "kcharselect-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kcharselect-17.08.3.tar.xz";
+ sha256 = "1ib3rqd43yprnp07vvmg029a44dimisycv030j3qd87r3yw06phs";
+ name = "kcharselect-17.08.3.tar.xz";
};
};
kcolorchooser = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kcolorchooser-17.04.3.tar.xz";
- sha256 = "0jc7cynzbvc1r743fzqlfl5ck0cdd7m63lh27i033c4fpvvi4f6k";
- name = "kcolorchooser-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kcolorchooser-17.08.3.tar.xz";
+ sha256 = "17aa2k8z7i7ds2s3ampkci4n0003rsbx4fj3l773ylb11fyl3b2f";
+ name = "kcolorchooser-17.08.3.tar.xz";
};
};
kcontacts = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kcontacts-17.04.3.tar.xz";
- sha256 = "0y0vnpk09bk8w5dx8a2zpng2phdzlrs2s380saf06h01n0ni9g01";
- name = "kcontacts-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kcontacts-17.08.3.tar.xz";
+ sha256 = "0dsx0bgf6rcqrl31xcklh368lr93pn2ylipw81svpnqya1ry31dk";
+ name = "kcontacts-17.08.3.tar.xz";
};
};
kcron = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kcron-17.04.3.tar.xz";
- sha256 = "11sbb1wvl1v6z0059hkmg3p29p8b77ij51kvkv3dicyvh7xzc4f8";
- name = "kcron-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kcron-17.08.3.tar.xz";
+ sha256 = "0xmd25dfhpkaa6zzmc7xdfn4fv0awfqjv2r166hmqd32gnx70bry";
+ name = "kcron-17.08.3.tar.xz";
};
};
kdav = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kdav-17.04.3.tar.xz";
- sha256 = "1yv8jhfak671k1s0fsy3j4bj7y64shhipp9k67v34q5cgg0q4hwl";
- name = "kdav-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kdav-17.08.3.tar.xz";
+ sha256 = "1v7xclq8qz4pmvp1asavammlfwi2pg1y0fabapqpnglx194rbwic";
+ name = "kdav-17.08.3.tar.xz";
};
};
kdebugsettings = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kdebugsettings-17.04.3.tar.xz";
- sha256 = "1l2jg75jfvbf9ixs2spg4b284vimsf0hz04yhfcqicljykrwlwq4";
- name = "kdebugsettings-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kdebugsettings-17.08.3.tar.xz";
+ sha256 = "1gfcnwpmx6dd12d9kycf0khi5s85932b1wvyw1mr5dhlqyyqf1s4";
+ name = "kdebugsettings-17.08.3.tar.xz";
};
};
kde-dev-scripts = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kde-dev-scripts-17.04.3.tar.xz";
- sha256 = "0cshxm7s2ivvj1baciy3il8vbk9qby9ybdclrhkq6n7a7li5w1lm";
- name = "kde-dev-scripts-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-dev-scripts-17.08.3.tar.xz";
+ sha256 = "1dydd198jfcjm58m5qk071kx18gbgnbwf9mcx20ibanq17cdh3px";
+ name = "kde-dev-scripts-17.08.3.tar.xz";
};
};
kde-dev-utils = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kde-dev-utils-17.04.3.tar.xz";
- sha256 = "02d0fm4dv5vl5zi3xp608m9c8rnv00x7wk3hkv4mdvi7li5h62j4";
- name = "kde-dev-utils-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-dev-utils-17.08.3.tar.xz";
+ sha256 = "184sx4i5k8rnx5572460v2jnd0abdr2i5gp74khbjlgagkdvcj07";
+ name = "kde-dev-utils-17.08.3.tar.xz";
};
};
kdeedu-data = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kdeedu-data-17.04.3.tar.xz";
- sha256 = "01vv6x600hpqpvg25aa07mbsjsnv83jqghna1bwqxgwrx1p3z8nd";
- name = "kdeedu-data-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kdeedu-data-17.08.3.tar.xz";
+ sha256 = "12vy656ng14gq93cw30bwdg15jvwr6qvlsjk0vfmljvcbc9171ww";
+ name = "kdeedu-data-17.08.3.tar.xz";
};
};
kdegraphics-mobipocket = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kdegraphics-mobipocket-17.04.3.tar.xz";
- sha256 = "1nir7k3sf8q0k8ancs5mhp4qs5v405mjdiwnqf92mpmpfv6gw7ba";
- name = "kdegraphics-mobipocket-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kdegraphics-mobipocket-17.08.3.tar.xz";
+ sha256 = "1rfi44lh25knc0jf02fazh6s4wy1h8m76i9njcjxbjrz7x518cfj";
+ name = "kdegraphics-mobipocket-17.08.3.tar.xz";
};
};
kdegraphics-thumbnailers = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kdegraphics-thumbnailers-17.04.3.tar.xz";
- sha256 = "041bd8in0kwma5xkdwv9304r49rim4sxc977l7dnpyf306dx48rr";
- name = "kdegraphics-thumbnailers-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kdegraphics-thumbnailers-17.08.3.tar.xz";
+ sha256 = "0irsa4x6pi5jq36yz1kgkdv8946w05mr19afydpz1jpa2knhkc6i";
+ name = "kdegraphics-thumbnailers-17.08.3.tar.xz";
};
};
kde-l10n-ar = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-ar-17.04.3.tar.xz";
- sha256 = "1z72mz94c95m2fq4k1aaqga8j9pnf4735radlny9ybfvv3wyliyb";
- name = "kde-l10n-ar-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ar-17.08.3.tar.xz";
+ sha256 = "0j06r39gam92bxm25vc8x7bxm6143pww42d9ala13akh3gh56wmy";
+ name = "kde-l10n-ar-17.08.3.tar.xz";
};
};
kde-l10n-ast = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-ast-17.04.3.tar.xz";
- sha256 = "0r4srnzb30c0616zl15qbadb9rpkskvdhrqhxmy5pj0vaq349y8p";
- name = "kde-l10n-ast-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ast-17.08.3.tar.xz";
+ sha256 = "1kmv0ajbd9dws1al4qx9k2hnsqf2dwkj2ww12xn3flrqg71kgnpb";
+ name = "kde-l10n-ast-17.08.3.tar.xz";
};
};
kde-l10n-bg = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-bg-17.04.3.tar.xz";
- sha256 = "15ffbpsynzqinjvirn4aa7ij87awq4b2kv8bx6bbnpv727b34cm8";
- name = "kde-l10n-bg-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-bg-17.08.3.tar.xz";
+ sha256 = "0dv2hdki9mbc6kq6b1gzpqijgq31ffz4la9aprzj57mk4l14vkp1";
+ name = "kde-l10n-bg-17.08.3.tar.xz";
};
};
kde-l10n-bs = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-bs-17.04.3.tar.xz";
- sha256 = "0hc9gsw7i1wmvxd5lg3xd14njsdnfpf82km3hny46lyiqki1riyd";
- name = "kde-l10n-bs-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-bs-17.08.3.tar.xz";
+ sha256 = "0makcag2kjns6528ldrjr52r412yi1y947lqq5db8ya6i8bxlsl2";
+ name = "kde-l10n-bs-17.08.3.tar.xz";
};
};
kde-l10n-ca = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-ca-17.04.3.tar.xz";
- sha256 = "0h6aj2hi1gyjq7prza9v207ipcis32hr2a76i5rrbnf5c8hpih1r";
- name = "kde-l10n-ca-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ca-17.08.3.tar.xz";
+ sha256 = "13n0y9rmcnaka5hnmjp6x99pdvx19bb5f7m0wmnkkq0v8xs0cr53";
+ name = "kde-l10n-ca-17.08.3.tar.xz";
};
};
kde-l10n-ca_valencia = {
- version = "ca_valencia-17.04.3";
+ version = "ca_valencia-17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-ca@valencia-17.04.3.tar.xz";
- sha256 = "1bvl1v9niqb9h2ilji70qfcybx7lraszkimbi6zawvimj5y68jfg";
- name = "kde-l10n-ca_valencia-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ca@valencia-17.08.3.tar.xz";
+ sha256 = "0h4iznjvzy4lvb91vpb4f7jlrvi3a9z56i7j3xm0ihf1qmgxxzmj";
+ name = "kde-l10n-ca_valencia-17.08.3.tar.xz";
};
};
kde-l10n-cs = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-cs-17.04.3.tar.xz";
- sha256 = "0miqxwhbcqzds8lgq5g7zb2w0gkx3y7g45vq989641jaqqlfca1c";
- name = "kde-l10n-cs-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-cs-17.08.3.tar.xz";
+ sha256 = "0dadsgmg7pvagpq0nj4hs889zvk2lw085wlv2mw6jfminjav4c2d";
+ name = "kde-l10n-cs-17.08.3.tar.xz";
};
};
kde-l10n-da = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-da-17.04.3.tar.xz";
- sha256 = "0j7j9b9i81984fyh7g5yv9j0gasws9hz648ycqi96k43zs80cahb";
- name = "kde-l10n-da-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-da-17.08.3.tar.xz";
+ sha256 = "04w1clqk3p0zkv01406iwkwp572vwfpn94x8g7hxraaz2rzs2qnf";
+ name = "kde-l10n-da-17.08.3.tar.xz";
};
};
kde-l10n-de = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-de-17.04.3.tar.xz";
- sha256 = "0ra0idakfiggiw8x67iw4jbv9g2g0ypcskgcjzvwm61q9dqnr6hy";
- name = "kde-l10n-de-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-de-17.08.3.tar.xz";
+ sha256 = "1cxpdwvpymf1yqgs54v6f8hgxwyblv0i0zpm5w5wrimmg8lnbrc8";
+ name = "kde-l10n-de-17.08.3.tar.xz";
};
};
kde-l10n-el = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-el-17.04.3.tar.xz";
- sha256 = "1lmxrx7vkdpa9m730his0z9ry6nvycp4428waz0r4wxqqfz1acwr";
- name = "kde-l10n-el-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-el-17.08.3.tar.xz";
+ sha256 = "1csskz68dsrlvkr5iri8w0wx2g5h7db18dpnlcmbl076l9ds9nmv";
+ name = "kde-l10n-el-17.08.3.tar.xz";
};
};
kde-l10n-en_GB = {
- version = "en_GB-17.04.3";
+ version = "en_GB-17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-en_GB-17.04.3.tar.xz";
- sha256 = "1mr9rgxklfnmhd7yb5h3hddjjn1qxxbqw16sn5d1d077p3wz6896";
- name = "kde-l10n-en_GB-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-en_GB-17.08.3.tar.xz";
+ sha256 = "1vf6h68biiqr9vzqlig34z47clkdk6ncr3mhan7rajsk1dlp6qwy";
+ name = "kde-l10n-en_GB-17.08.3.tar.xz";
};
};
kde-l10n-eo = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-eo-17.04.3.tar.xz";
- sha256 = "1aq501z6mnpp8h354p45wwxs4fbfawm0dj67xh74xcr6sh0nj3ap";
- name = "kde-l10n-eo-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-eo-17.08.3.tar.xz";
+ sha256 = "0a7wk6xfhq7zj02zjadnp7ml97r5vvgjvlm5yajz6l4q5l0vsdnn";
+ name = "kde-l10n-eo-17.08.3.tar.xz";
};
};
kde-l10n-es = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-es-17.04.3.tar.xz";
- sha256 = "1hk8731avlmirzhv2sckrqaf4ykgvy2brnq0a86dr4n95138hhmw";
- name = "kde-l10n-es-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-es-17.08.3.tar.xz";
+ sha256 = "1b7jzccicb58s3v796x0k2fwyfq8qmqyb5b26y5x9xknk7mv3fkz";
+ name = "kde-l10n-es-17.08.3.tar.xz";
};
};
kde-l10n-et = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-et-17.04.3.tar.xz";
- sha256 = "0cdy7mmjg8q5s19lqjsbhn64h3fk6f8y0j3ldvnmc4wj24gfnc5n";
- name = "kde-l10n-et-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-et-17.08.3.tar.xz";
+ sha256 = "1d10yq8d5fjhgc0zvz3izl1c15i9g8vw5kgs2mvciwhaj6sqgk78";
+ name = "kde-l10n-et-17.08.3.tar.xz";
};
};
kde-l10n-eu = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-eu-17.04.3.tar.xz";
- sha256 = "06c2940qsqf03acly35jpcnsljzq20mljmlzx9234i7gqr88g74r";
- name = "kde-l10n-eu-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-eu-17.08.3.tar.xz";
+ sha256 = "1r6nyjibagqfk4s1c2sylxlsq3jv7vhc01bbwpdl314rhcv67lkq";
+ name = "kde-l10n-eu-17.08.3.tar.xz";
};
};
kde-l10n-fa = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-fa-17.04.3.tar.xz";
- sha256 = "1q3a2dyvrk22azj0rngb8h0dh88aczsxys7aaf4yvvwsdm7zbj8k";
- name = "kde-l10n-fa-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-fa-17.08.3.tar.xz";
+ sha256 = "0slrrsp8wgh33zv779mqdf3km4h88mzqfzdds08g8hr3mimp8ibj";
+ name = "kde-l10n-fa-17.08.3.tar.xz";
};
};
kde-l10n-fi = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-fi-17.04.3.tar.xz";
- sha256 = "0hfzs1g5ikz6cgjss7kibxx2vd0zxn9rny7br4ysp1x89nz5qb34";
- name = "kde-l10n-fi-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-fi-17.08.3.tar.xz";
+ sha256 = "10axj320my3bgfqn1rpwpn4nii3bh39afsvqkbz6xh01sci4z47w";
+ name = "kde-l10n-fi-17.08.3.tar.xz";
};
};
kde-l10n-fr = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-fr-17.04.3.tar.xz";
- sha256 = "14i752qqdzdgbxh8r9rmjmjjsmhhh6vpcna3gp8g577r7y8rqpwk";
- name = "kde-l10n-fr-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-fr-17.08.3.tar.xz";
+ sha256 = "0gqmq0hwxmj2awjyhhy81nwrks4mlqdnbfinxsrsj1kmklsx8pdg";
+ name = "kde-l10n-fr-17.08.3.tar.xz";
};
};
kde-l10n-ga = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-ga-17.04.3.tar.xz";
- sha256 = "164jc111sgj8mqcvvqx8yccjjinvk5h7g5z4a964dwhh587xir1h";
- name = "kde-l10n-ga-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ga-17.08.3.tar.xz";
+ sha256 = "0p7jy5sh2x1fc6mfacs1f5brq86hw6xk7bccc30k5c8b0kfbvdf4";
+ name = "kde-l10n-ga-17.08.3.tar.xz";
};
};
kde-l10n-gl = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-gl-17.04.3.tar.xz";
- sha256 = "1c5vz652fd91pxx8p5savcfjg40ks96qay8djjvjznhs8rpkmxf9";
- name = "kde-l10n-gl-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-gl-17.08.3.tar.xz";
+ sha256 = "185yw84i04llag4kpi3lmmy9niis2z3rd5ch2x7y4jyq3kdpwhi4";
+ name = "kde-l10n-gl-17.08.3.tar.xz";
};
};
kde-l10n-he = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-he-17.04.3.tar.xz";
- sha256 = "142np920w44jwrkkrbplnfdyxpf72c0r86zwfdps7cc2giycj793";
- name = "kde-l10n-he-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-he-17.08.3.tar.xz";
+ sha256 = "0dx0mvl4vapkyir8a0a1dgv2h1hjsr5n2ykjihk21ykf7axvqqd4";
+ name = "kde-l10n-he-17.08.3.tar.xz";
};
};
kde-l10n-hi = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-hi-17.04.3.tar.xz";
- sha256 = "17r2rfzk7773zxj454zm33fysd0jfc0kaji2pcpi27skypxcrsl7";
- name = "kde-l10n-hi-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-hi-17.08.3.tar.xz";
+ sha256 = "0f6p7bwvvqj7jdaqsn4nxjsb5cdna9q4cp59wfy05ppi685qqp4v";
+ name = "kde-l10n-hi-17.08.3.tar.xz";
};
};
kde-l10n-hr = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-hr-17.04.3.tar.xz";
- sha256 = "08fak1f5f5228djl28l8xx026mxq5khklvklss8fi42l57091azv";
- name = "kde-l10n-hr-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-hr-17.08.3.tar.xz";
+ sha256 = "0yd4sqfa59ca57ig55x46fp59pjxby6ha5bhkzhcd1d2baa4a672";
+ name = "kde-l10n-hr-17.08.3.tar.xz";
};
};
kde-l10n-hu = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-hu-17.04.3.tar.xz";
- sha256 = "0i5lgkdxs81kjhjrhzjdk0ayp28vdigrsfv1n6k0aqj3jzfpbhbz";
- name = "kde-l10n-hu-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-hu-17.08.3.tar.xz";
+ sha256 = "1s3vgjslnffxivrx69dnz4c2iyjf2awv51k8bbbfjw271422wvfg";
+ name = "kde-l10n-hu-17.08.3.tar.xz";
};
};
kde-l10n-ia = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-ia-17.04.3.tar.xz";
- sha256 = "18bgdyazgqcslyajz97g0s96linx89ngr916zqknz64xqhxdhvdy";
- name = "kde-l10n-ia-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ia-17.08.3.tar.xz";
+ sha256 = "1jpvla8h5ji9lcdhk7rinixkyr6wax30wp9wvqqqd8p9dp18i0cp";
+ name = "kde-l10n-ia-17.08.3.tar.xz";
};
};
kde-l10n-id = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-id-17.04.3.tar.xz";
- sha256 = "0dncq9p12bgn4d6zra4skk6mb1ivnswn0z51llqrma90271ibflr";
- name = "kde-l10n-id-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-id-17.08.3.tar.xz";
+ sha256 = "191x45jv4bzkglyng7fp3fblcbirp9k94h9r54sk32idwqkiwngx";
+ name = "kde-l10n-id-17.08.3.tar.xz";
};
};
kde-l10n-is = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-is-17.04.3.tar.xz";
- sha256 = "1pkp87di1da6f2f9jjsj7li19d8pcn5ljhk1fhbrqc9b3whaansm";
- name = "kde-l10n-is-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-is-17.08.3.tar.xz";
+ sha256 = "1h3pw9rnssf6wh1n5r01gqnz7riqz6hismndd67xw4pnq7vqpjkm";
+ name = "kde-l10n-is-17.08.3.tar.xz";
};
};
kde-l10n-it = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-it-17.04.3.tar.xz";
- sha256 = "0n468q4z29mfl9b4a4clmv643p6fhlhf5mhsfl6dsi4l0v9a15mk";
- name = "kde-l10n-it-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-it-17.08.3.tar.xz";
+ sha256 = "0n4ivcyjcb47h3455wnzhnlkf26h29r2f9j1dgw9rw32aczb8l68";
+ name = "kde-l10n-it-17.08.3.tar.xz";
};
};
kde-l10n-ja = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-ja-17.04.3.tar.xz";
- sha256 = "00q937jdq6c2q2x75ky2xyfij0654xfzjm904j6kimvmpkyc33xk";
- name = "kde-l10n-ja-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ja-17.08.3.tar.xz";
+ sha256 = "0qxf7c8l61xwkhn81phyw4849frzrc032fnbphlgq1nc9kqygara";
+ name = "kde-l10n-ja-17.08.3.tar.xz";
};
};
kde-l10n-kk = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-kk-17.04.3.tar.xz";
- sha256 = "1srjbxg969rhzqw81vy8kab9pkasp061i4r5ark8rg8k7agjdcml";
- name = "kde-l10n-kk-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-kk-17.08.3.tar.xz";
+ sha256 = "0wlzv9kgpa2ah2j8dd4vn5gr9jkbmzl6ph3lm5mr7rf0pl14qws2";
+ name = "kde-l10n-kk-17.08.3.tar.xz";
};
};
kde-l10n-km = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-km-17.04.3.tar.xz";
- sha256 = "1szigmhybhfa70lg2wzpkzja73c20szzr8wawjzy869ql8fcip3w";
- name = "kde-l10n-km-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-km-17.08.3.tar.xz";
+ sha256 = "07arvlwxq59xjlgmf348rdrm1gfbzx9yds6qj667mrbk7h1n5ibr";
+ name = "kde-l10n-km-17.08.3.tar.xz";
};
};
kde-l10n-ko = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-ko-17.04.3.tar.xz";
- sha256 = "1j9zgf9pl3nns5a8jdd2ggragq2ln3x11h7y2apkffihyd0kz40v";
- name = "kde-l10n-ko-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ko-17.08.3.tar.xz";
+ sha256 = "0cw6v0iqq79hc4llw37s630gf36npc7ngsihqlia4y3pn4mzabwf";
+ name = "kde-l10n-ko-17.08.3.tar.xz";
};
};
kde-l10n-lt = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-lt-17.04.3.tar.xz";
- sha256 = "1rpia72cz2a3knxzzanhhpqp3r89mj5dn4yh9ym81xw6s4acz5fg";
- name = "kde-l10n-lt-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-lt-17.08.3.tar.xz";
+ sha256 = "0mv31nqdxp9wcnwch0sqrgz5pp1y3gmv25p8jvbrfrivpbkmhwv3";
+ name = "kde-l10n-lt-17.08.3.tar.xz";
};
};
kde-l10n-lv = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-lv-17.04.3.tar.xz";
- sha256 = "1vpdgq90ph7c6yjvn0ijdq7ry699m03i7857sxq9vsgy4hi7xi14";
- name = "kde-l10n-lv-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-lv-17.08.3.tar.xz";
+ sha256 = "0lyh2lj1h5ihhy22hh0is3s3qd8x88wgbwrqkq9802vksy7f587l";
+ name = "kde-l10n-lv-17.08.3.tar.xz";
};
};
kde-l10n-mr = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-mr-17.04.3.tar.xz";
- sha256 = "1rfp5bi6xpdc503id328h8jl6z8alzjvg24dspaj209390hvldqv";
- name = "kde-l10n-mr-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-mr-17.08.3.tar.xz";
+ sha256 = "1zpciw63xk0s6jpkw4fpw0d17fcc4h1fdl6v1d3w3c1rs7dmmw9y";
+ name = "kde-l10n-mr-17.08.3.tar.xz";
};
};
kde-l10n-nb = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-nb-17.04.3.tar.xz";
- sha256 = "1d25ffix6pakdcpcr2qz1h6729550l9ba93z545n0psjgqpwvmmr";
- name = "kde-l10n-nb-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-nb-17.08.3.tar.xz";
+ sha256 = "024ii25iz8lf2g6k1nrr1lmian3wzq4ljx3y8ss1vz244m047xss";
+ name = "kde-l10n-nb-17.08.3.tar.xz";
};
};
kde-l10n-nds = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-nds-17.04.3.tar.xz";
- sha256 = "0pvx1rm6bx9xwyl4zfcw52mwif06350i9wmwz0kxxg3zs7lqb7h3";
- name = "kde-l10n-nds-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-nds-17.08.3.tar.xz";
+ sha256 = "0bp9ap276z86mxldasq6cdskrwkh48z9yfrblgffhh94941i0gcn";
+ name = "kde-l10n-nds-17.08.3.tar.xz";
};
};
kde-l10n-nl = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-nl-17.04.3.tar.xz";
- sha256 = "1ivm2qsl0dmkrgmddnp3cjmcjc6jag0wawhklacp1c9iscfcrppm";
- name = "kde-l10n-nl-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-nl-17.08.3.tar.xz";
+ sha256 = "00mzrk682r30i8x3navpad3b9jm15h5mp81v92q5cmcmblvvaw0l";
+ name = "kde-l10n-nl-17.08.3.tar.xz";
};
};
kde-l10n-nn = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-nn-17.04.3.tar.xz";
- sha256 = "0jsx980g7zn8m9xd7ljiqz1w9cvlgy84bl6hjhi0a89mfwkd27lg";
- name = "kde-l10n-nn-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-nn-17.08.3.tar.xz";
+ sha256 = "0d45g2n7hvk7p2n84674fqdnsz26hk0scczr6w3kzb2zk95x5734";
+ name = "kde-l10n-nn-17.08.3.tar.xz";
};
};
kde-l10n-pa = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-pa-17.04.3.tar.xz";
- sha256 = "149d7pdxb0543c36gyxidd7z4j2jw5nbilv7c561j3zazbbcg4nm";
- name = "kde-l10n-pa-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-pa-17.08.3.tar.xz";
+ sha256 = "0sg35fmw0rs3nzyrhkfvh8b5nm86w5qkjgic4ymrib0grjxbdjcj";
+ name = "kde-l10n-pa-17.08.3.tar.xz";
};
};
kde-l10n-pl = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-pl-17.04.3.tar.xz";
- sha256 = "04zxzx8586328v9dw6w5igxa95i7raqzpvdxshphv3wfnjgbzad5";
- name = "kde-l10n-pl-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-pl-17.08.3.tar.xz";
+ sha256 = "0sk19zh9ykldm66d51k8pkmyql5cfxvgpzp8q3c3n9g60cdx510x";
+ name = "kde-l10n-pl-17.08.3.tar.xz";
};
};
kde-l10n-pt = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-pt-17.04.3.tar.xz";
- sha256 = "009dnijcznzaf6p85mg3j7s4zhjfmk4smk8bkns6pjn1r2wdpfbi";
- name = "kde-l10n-pt-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-pt-17.08.3.tar.xz";
+ sha256 = "135g0wq2cfkgvwv1y1w9wnnz2bsdf5sdijqnvazkb6j3is4fz2pw";
+ name = "kde-l10n-pt-17.08.3.tar.xz";
};
};
kde-l10n-pt_BR = {
- version = "pt_BR-17.04.3";
+ version = "pt_BR-17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-pt_BR-17.04.3.tar.xz";
- sha256 = "07ird1j382m8c9459nvhmw0jy8i8ri5wmh6h7m36b8m4i7cbfdcx";
- name = "kde-l10n-pt_BR-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-pt_BR-17.08.3.tar.xz";
+ sha256 = "0ww3rhijqs1h9ihszkqvxdi0d4185zpm336837741nwqg601dik0";
+ name = "kde-l10n-pt_BR-17.08.3.tar.xz";
};
};
kde-l10n-ro = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-ro-17.04.3.tar.xz";
- sha256 = "1zs9yxv7566yi7rz9z9zk7mzq2rkh50y6s92sp52wyzsr3q4pl9j";
- name = "kde-l10n-ro-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ro-17.08.3.tar.xz";
+ sha256 = "1d45j7xx1mzzgjwqw5svhkcb5v0hqbbzcwg1x1j7xqcggdlx4075";
+ name = "kde-l10n-ro-17.08.3.tar.xz";
};
};
kde-l10n-ru = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-ru-17.04.3.tar.xz";
- sha256 = "12a5s73rwnx25vvwdgqis24q26x8kg6zrin3gili4kdmfxr0x27i";
- name = "kde-l10n-ru-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ru-17.08.3.tar.xz";
+ sha256 = "10py3cz4mpgcaskrsbbr26arg01c3im26zqmjcdwjnkgp8s780pj";
+ name = "kde-l10n-ru-17.08.3.tar.xz";
};
};
kde-l10n-sk = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-sk-17.04.3.tar.xz";
- sha256 = "0s3s94nb7dl7pdfm5pa7cw66q4vvjqqmv6rrzriia3z1dgg0n9y4";
- name = "kde-l10n-sk-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-sk-17.08.3.tar.xz";
+ sha256 = "01607982ms2smr05nslp79x6fjqhvlpjdkkv8fs4vwxvii9wd77w";
+ name = "kde-l10n-sk-17.08.3.tar.xz";
};
};
kde-l10n-sl = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-sl-17.04.3.tar.xz";
- sha256 = "1n0bj63inj5j9zxqfimza7frqikzyxjr7cyfaqa46ck2wcawhmwm";
- name = "kde-l10n-sl-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-sl-17.08.3.tar.xz";
+ sha256 = "10ljgz3jrgbgb06ijq1sp46qc3d7dbyz8dql56zcgz1pbv6pyxqz";
+ name = "kde-l10n-sl-17.08.3.tar.xz";
};
};
kde-l10n-sr = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-sr-17.04.3.tar.xz";
- sha256 = "0cs5rab87yydwpg6pql67x05802yzdj28y6rfzc0z0kr4diay34h";
- name = "kde-l10n-sr-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-sr-17.08.3.tar.xz";
+ sha256 = "1m12x7w0m4n97crmy9ad6szx92z3cqsvm6fbh99naaaf033962jn";
+ name = "kde-l10n-sr-17.08.3.tar.xz";
};
};
kde-l10n-sv = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-sv-17.04.3.tar.xz";
- sha256 = "01f8zr3rf8zvsd0v69vyy45nn7bq9zlxf6f5lgr0i1yd4xjz6fvn";
- name = "kde-l10n-sv-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-sv-17.08.3.tar.xz";
+ sha256 = "1qqry4xakc4qp140jr5306xfp58d33rxp44mrvmdngzh30bqs6g2";
+ name = "kde-l10n-sv-17.08.3.tar.xz";
};
};
kde-l10n-tr = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-tr-17.04.3.tar.xz";
- sha256 = "082xrk31hajdq9hhnxh7z6ngn56q2adn8xjwkfizjyl3frf8ksya";
- name = "kde-l10n-tr-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-tr-17.08.3.tar.xz";
+ sha256 = "1as31vjsig32s31qxnx6ykfgpyya3s362ml576ndiyrj84znzby0";
+ name = "kde-l10n-tr-17.08.3.tar.xz";
};
};
kde-l10n-ug = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-ug-17.04.3.tar.xz";
- sha256 = "01k9mchkkwyka0sgwg1mx0j1sax227s4mnm74vmpshj651nxqm3r";
- name = "kde-l10n-ug-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-ug-17.08.3.tar.xz";
+ sha256 = "1jx2g5xczybfz9915py30g9rqds0191bsaywnj241nzqizy20csz";
+ name = "kde-l10n-ug-17.08.3.tar.xz";
};
};
kde-l10n-uk = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-uk-17.04.3.tar.xz";
- sha256 = "1nwlqbr8cxcs2ny85bmzn549j66b1d7fiswlwgrvjlqj4mav3cwz";
- name = "kde-l10n-uk-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-uk-17.08.3.tar.xz";
+ sha256 = "14c30x7j8inswccjfb3yslwxjp0ispp1wzq6j4nl5zzj24lkicf8";
+ name = "kde-l10n-uk-17.08.3.tar.xz";
};
};
kde-l10n-wa = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-wa-17.04.3.tar.xz";
- sha256 = "13flih2ca2r8l3favp0xw1hcvwd07dsj64rmg6s2ysk3pcizy3i8";
- name = "kde-l10n-wa-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-wa-17.08.3.tar.xz";
+ sha256 = "0mz0g6hf4z59vb4i0zkvmyx85mxz7fpwi6yyng03iqzlbpdq0qj7";
+ name = "kde-l10n-wa-17.08.3.tar.xz";
};
};
kde-l10n-zh_CN = {
- version = "zh_CN-17.04.3";
+ version = "zh_CN-17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-zh_CN-17.04.3.tar.xz";
- sha256 = "02gzlwbq1zqaa1kqk7pd55yv7agg7igbb2147yvdj9462igpzjyi";
- name = "kde-l10n-zh_CN-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-zh_CN-17.08.3.tar.xz";
+ sha256 = "1l60z9wicf5ka9ik5b85qh0z3n7g9msjv3ckwzm2kj41q9r30559";
+ name = "kde-l10n-zh_CN-17.08.3.tar.xz";
};
};
kde-l10n-zh_TW = {
- version = "zh_TW-17.04.3";
+ version = "zh_TW-17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kde-l10n/kde-l10n-zh_TW-17.04.3.tar.xz";
- sha256 = "0x1nwahmh6142g21a949hibmx2slgbvrp5iwq137zmzmxffp7y9h";
- name = "kde-l10n-zh_TW-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-l10n/kde-l10n-zh_TW-17.08.3.tar.xz";
+ sha256 = "1br778qbxnbsrdpvd34g2m3xc1v725ib4689kw5g36pm1jlf55h0";
+ name = "kde-l10n-zh_TW-17.08.3.tar.xz";
};
};
kdelibs = {
- version = "4.14.34";
+ version = "4.14.38";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kdelibs-4.14.34.tar.xz";
- sha256 = "1yxwz6dln7km22cwxsns2rxxmw5p1c126xqnczz5fcjvalrk8zbp";
- name = "kdelibs-4.14.34.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kdelibs-4.14.38.tar.xz";
+ sha256 = "1zn3yb09sd22bm54is0rn98amj0398zybl550dp406419sil7z9p";
+ name = "kdelibs-4.14.38.tar.xz";
};
};
kdenetwork-filesharing = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kdenetwork-filesharing-17.04.3.tar.xz";
- sha256 = "0r16jgsp45cf7gyjii04gq12wm68j86mrz4502szq0c02hfnmrsd";
- name = "kdenetwork-filesharing-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kdenetwork-filesharing-17.08.3.tar.xz";
+ sha256 = "0vy2cyd9ifxrqw9zk4hyidiprd7730q7hm1gc44l6b4siimxyb4x";
+ name = "kdenetwork-filesharing-17.08.3.tar.xz";
};
};
kdenlive = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kdenlive-17.04.3.tar.xz";
- sha256 = "1n4x12pri0kw0lk3376l2059rnabi4c54ax8bdmx39hhn7lqxv45";
- name = "kdenlive-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kdenlive-17.08.3.tar.xz";
+ sha256 = "1nh6cmxkr47zlpvcrjm8dfylsdmncb5qhyvb86rypr1qqmbifg5x";
+ name = "kdenlive-17.08.3.tar.xz";
};
};
kdepim-addons = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kdepim-addons-17.04.3.tar.xz";
- sha256 = "118n8jdpjr50wgf45y2gzbqljbyichg4a6df014cdi0qcc55mcdl";
- name = "kdepim-addons-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kdepim-addons-17.08.3.tar.xz";
+ sha256 = "1r0qgrliw2g82vgj63l00x0visjclxh2fafngl8ga4dk411nfg4x";
+ name = "kdepim-addons-17.08.3.tar.xz";
};
};
kdepim-apps-libs = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kdepim-apps-libs-17.04.3.tar.xz";
- sha256 = "154057mxhkhm4lwlm49lx2m02qkddv0w96ikani7prb5p0kdw09i";
- name = "kdepim-apps-libs-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kdepim-apps-libs-17.08.3.tar.xz";
+ sha256 = "0706ndzw315szab2qg30x7a6f50iv439rrpdpy321q7ay5fm0f2p";
+ name = "kdepim-apps-libs-17.08.3.tar.xz";
};
};
kdepim-runtime = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kdepim-runtime-17.04.3.tar.xz";
- sha256 = "07fcrvs9aqjxn7big60hh9hcd6mg211cmk69wdhhi455arjsfpzq";
- name = "kdepim-runtime-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kdepim-runtime-17.08.3.tar.xz";
+ sha256 = "0qc6kkc5rsg9l5plciass6p1ym7arlp6yk7x5ycy53k7fbsh4ak7";
+ name = "kdepim-runtime-17.08.3.tar.xz";
};
};
kde-runtime = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kde-runtime-17.04.3.tar.xz";
- sha256 = "05dshxx8bx872c4vp42i9n0dv19zq79p5m1lpd9kvmfpk3cvpxin";
- name = "kde-runtime-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kde-runtime-17.08.3.tar.xz";
+ sha256 = "15nfkfz2wwlr1rp93sl1kmxl35wpnlf86225ihl43nhwn6pihb38";
+ name = "kde-runtime-17.08.3.tar.xz";
};
};
kdesdk-kioslaves = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kdesdk-kioslaves-17.04.3.tar.xz";
- sha256 = "1j9m08r8jpdq5fqp9irvbqyb37maah1wz2xg4byinrn9qqp76dfl";
- name = "kdesdk-kioslaves-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kdesdk-kioslaves-17.08.3.tar.xz";
+ sha256 = "11akksc09mzxnjiqcsxwgwcxzcjpw50cr277lp7p6rx1hdbwlk7a";
+ name = "kdesdk-kioslaves-17.08.3.tar.xz";
};
};
kdesdk-thumbnailers = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kdesdk-thumbnailers-17.04.3.tar.xz";
- sha256 = "0jjaajz3yxghm7phzhw3cgc0y4kgsc1vs0yc1w4cn8kmipal0x1q";
- name = "kdesdk-thumbnailers-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kdesdk-thumbnailers-17.08.3.tar.xz";
+ sha256 = "1hhsskrhkq3z6phjkvc43gzsmx0apcpr4sjr9zqqfy847zqsvfm2";
+ name = "kdesdk-thumbnailers-17.08.3.tar.xz";
};
};
kdf = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kdf-17.04.3.tar.xz";
- sha256 = "1d5nrp3x7r5fvghj7acrjhbz6n2cvd2qr60s6i0za7703b5iflyr";
- name = "kdf-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kdf-17.08.3.tar.xz";
+ sha256 = "1s291c4g51y92wplrqkl528py83xfviyvv1qjyp3c7nyf6g2jvwq";
+ name = "kdf-17.08.3.tar.xz";
};
};
kdialog = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kdialog-17.04.3.tar.xz";
- sha256 = "15b5qhxy387wpv2hx6hw31r3lyh7j30vwzn9q474vsmp6jj2zq5m";
- name = "kdialog-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kdialog-17.08.3.tar.xz";
+ sha256 = "1n6n06sqgq1s2781pnsbfyczc68l5xx6l0idymj3pmniz3q4svp8";
+ name = "kdialog-17.08.3.tar.xz";
};
};
kdiamond = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kdiamond-17.04.3.tar.xz";
- sha256 = "0ri611bmqa81qlsfqmza4n5m14hlcrljhi4xlq2h5pcmg3j8ihyj";
- name = "kdiamond-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kdiamond-17.08.3.tar.xz";
+ sha256 = "1czhmxs3k7mx82r1k88h8riwn9jxlz6w60mi4jx8b29qcm532f53";
+ name = "kdiamond-17.08.3.tar.xz";
};
};
keditbookmarks = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/keditbookmarks-17.04.3.tar.xz";
- sha256 = "0pxrf18rml40lh2z3l8kk1nlzpdbwf3jdlzjy745fdc9x9q3phhm";
- name = "keditbookmarks-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/keditbookmarks-17.08.3.tar.xz";
+ sha256 = "115ys7703m611dw6ap2kqv4rgzxp15dsscg1y2gx09afc8fg2i62";
+ name = "keditbookmarks-17.08.3.tar.xz";
};
};
kfilereplace = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kfilereplace-17.04.3.tar.xz";
- sha256 = "115p6kjax7rhz646pvfi1av7pbllh42fmykzk4ld4mblgs56nj1j";
- name = "kfilereplace-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kfilereplace-17.08.3.tar.xz";
+ sha256 = "1ksv9igzq65wgsam6ynbbzzyriacbk7y48dzh190p8k2bdf6gij6";
+ name = "kfilereplace-17.08.3.tar.xz";
};
};
kfind = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kfind-17.04.3.tar.xz";
- sha256 = "12iaj6f1b1w3b8jnhdh0gg9k57qxmicsxw68bi0ha4i8lw6dmfc5";
- name = "kfind-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kfind-17.08.3.tar.xz";
+ sha256 = "16f27ykh52vphq6wjyi1vy6vrzshj0cawmc8fy7y1j5yzzdkx1hk";
+ name = "kfind-17.08.3.tar.xz";
};
};
kfloppy = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kfloppy-17.04.3.tar.xz";
- sha256 = "0ayaslvnfhf3v082dfv62ml5ss185jkm1cx7jlqqvpn84l6vykmk";
- name = "kfloppy-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kfloppy-17.08.3.tar.xz";
+ sha256 = "1d5xn0rxc92k60hc1860mji8dzq932gg4by42gylwldcvgdija14";
+ name = "kfloppy-17.08.3.tar.xz";
};
};
kfourinline = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kfourinline-17.04.3.tar.xz";
- sha256 = "00ci1vbnqvr84ihdh6dcp7dw5pjqx3s40j5fafym0q2mji1q0cwj";
- name = "kfourinline-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kfourinline-17.08.3.tar.xz";
+ sha256 = "1bxzlx55i6vbk8cmpx38g1xdx0swqwd73lw5z584affw464ps1n9";
+ name = "kfourinline-17.08.3.tar.xz";
};
};
kgeography = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kgeography-17.04.3.tar.xz";
- sha256 = "0l9923fzpq5dxjvhsbxb03fh717yrys1najqdfyw1f9vs3fmkws9";
- name = "kgeography-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kgeography-17.08.3.tar.xz";
+ sha256 = "19k39rjm9lwbv3p6iifam80li5bhw4xf2g4i4hj0h7gyrj9gb1mp";
+ name = "kgeography-17.08.3.tar.xz";
};
};
kget = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kget-17.04.3.tar.xz";
- sha256 = "1fffkpnzhi9gl9xib398l8az16wyysjlphqga0a9a0bfkk6h884k";
- name = "kget-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kget-17.08.3.tar.xz";
+ sha256 = "01z3ij4iv3kgwy0fcnrf4qpfgapflx1pgv2hiaykgsj6ij24fx6a";
+ name = "kget-17.08.3.tar.xz";
};
};
kgoldrunner = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kgoldrunner-17.04.3.tar.xz";
- sha256 = "15sjikgk1qr36r5z6fbx535i6dj1l08klihrzyymmnr1vl5s02pr";
- name = "kgoldrunner-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kgoldrunner-17.08.3.tar.xz";
+ sha256 = "1k09pw7lm17702p0lliyl767zwk4n3gkkzj441cq3fqjnwm93lx4";
+ name = "kgoldrunner-17.08.3.tar.xz";
};
};
kgpg = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kgpg-17.04.3.tar.xz";
- sha256 = "1xdnpmrb6kd48ppvim2bs9c2abhr55f5ha25xr3r89blawmw16w0";
- name = "kgpg-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kgpg-17.08.3.tar.xz";
+ sha256 = "1g06n6i9qqvalmpg2zan7qg7j7dp4rn152pashs3jxij29n1bw7h";
+ name = "kgpg-17.08.3.tar.xz";
};
};
khangman = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/khangman-17.04.3.tar.xz";
- sha256 = "0n49zhwcsb8mgn416kzvq0x97b3x8mnln480wf8nd58f63hd4hdn";
- name = "khangman-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/khangman-17.08.3.tar.xz";
+ sha256 = "1fny78d3vaaz67css4i14pnvkm5p586ib8mwrs2rglc931c89dqq";
+ name = "khangman-17.08.3.tar.xz";
};
};
khelpcenter = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/khelpcenter-17.04.3.tar.xz";
- sha256 = "1sri5vb730k5n03kiykds024kl2hyw4bhzclxy5v0x36sjdqyz1z";
- name = "khelpcenter-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/khelpcenter-17.08.3.tar.xz";
+ sha256 = "089aahdr1yibff4y0l78m0wzz7m0mc090g4fp4aj4gp56wz6i5jn";
+ name = "khelpcenter-17.08.3.tar.xz";
};
};
kholidays = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kholidays-17.04.3.tar.xz";
- sha256 = "1hljhvlk6z3a4injfafwazai25qicmbdazj12pxb0wn5s538m9nw";
- name = "kholidays-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kholidays-17.08.3.tar.xz";
+ sha256 = "17razwvskf6i5hidlfp98bmfrijp8hn5gxrqcjxc49wpkhlj70jm";
+ name = "kholidays-17.08.3.tar.xz";
};
};
kidentitymanagement = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kidentitymanagement-17.04.3.tar.xz";
- sha256 = "17n7shm642jxnbzz11k9xrb7c3lmhzi3dabrl4qwxam1vf4zli6a";
- name = "kidentitymanagement-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kidentitymanagement-17.08.3.tar.xz";
+ sha256 = "0k926vwdhrk4ilpn0zhkcn26j1h7nqlzzi9mimybz1sp4fzxa83v";
+ name = "kidentitymanagement-17.08.3.tar.xz";
};
};
kig = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kig-17.04.3.tar.xz";
- sha256 = "1r8w0b99fi0jj8ah2sxgzpz93b1324d4vrrjvgz1wjcwskwqmbld";
- name = "kig-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kig-17.08.3.tar.xz";
+ sha256 = "0wf03fm7fpph52ilxckz02ikn6mq486ps8p8byq2vvfwh6z0w6wg";
+ name = "kig-17.08.3.tar.xz";
};
};
kigo = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kigo-17.04.3.tar.xz";
- sha256 = "0qx4bccniavbsy4icy98r4i3rgqcq3vw4fim9ad1ibmwsakzwrb9";
- name = "kigo-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kigo-17.08.3.tar.xz";
+ sha256 = "1k850vmsifvab14aaqkivgrw8794yhvn7d10c5ib2zf6447cl8m5";
+ name = "kigo-17.08.3.tar.xz";
};
};
killbots = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/killbots-17.04.3.tar.xz";
- sha256 = "0hjpzkdc0rgqiawy8vqh54bb693lhps9h2x9gxjsdhmk225l44b1";
- name = "killbots-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/killbots-17.08.3.tar.xz";
+ sha256 = "0ds391xx2d792069kl998f84qym26964ph5bja6bwkhgvws84r9g";
+ name = "killbots-17.08.3.tar.xz";
};
};
kimagemapeditor = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kimagemapeditor-17.04.3.tar.xz";
- sha256 = "1c1gv3bac40a4ix45ydxbn5rys1z33c3ycxvii17cgv591yqrana";
- name = "kimagemapeditor-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kimagemapeditor-17.08.3.tar.xz";
+ sha256 = "0clzk2d63hy1vvkdpxa1j5pp7y28x467wd9zfvv6k2vw703ghqlx";
+ name = "kimagemapeditor-17.08.3.tar.xz";
};
};
kimap = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kimap-17.04.3.tar.xz";
- sha256 = "0bdcxlwlr8k2ydmaimm4ja2kgg93qp0bjfl2cpsrzsfrp7fky5q2";
- name = "kimap-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kimap-17.08.3.tar.xz";
+ sha256 = "0c5inldmlwc5x2q1vhvj0wv61h6986m068a2k4xrrbirpb4pcwls";
+ name = "kimap-17.08.3.tar.xz";
};
};
kio-extras = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kio-extras-17.04.3.tar.xz";
- sha256 = "10zr3gafwswnk9qzb2f0ysllzbxfzq3l482f75sfzn8i2ripd3z1";
- name = "kio-extras-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kio-extras-17.08.3.tar.xz";
+ sha256 = "0gq187435yd0251znqicpcn0r89aar7a64bjpf6x0zhdlli8n9jc";
+ name = "kio-extras-17.08.3.tar.xz";
};
};
kiriki = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kiriki-17.04.3.tar.xz";
- sha256 = "1a4bnxv7y55fgkb0p0x7i09sqajsxg599zxqdfhsrm4ak6cqgkrg";
- name = "kiriki-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kiriki-17.08.3.tar.xz";
+ sha256 = "1cbijn0358gpr21yfab84gybf5vqxwilwbhfl6nj8qmppp2bpjqd";
+ name = "kiriki-17.08.3.tar.xz";
};
};
kiten = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kiten-17.04.3.tar.xz";
- sha256 = "1bxj013cb9jbahjghrdiq544zm7z4l4m1yd0zm0g9in9kp7rimzz";
- name = "kiten-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kiten-17.08.3.tar.xz";
+ sha256 = "0v00q9hs94p5r6x7s7i12814pfydd5y1bzp6sm5x0vx1ixdnkx89";
+ name = "kiten-17.08.3.tar.xz";
};
};
kjumpingcube = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kjumpingcube-17.04.3.tar.xz";
- sha256 = "0n1lpp6mvhj65zdw19hqsi21fwmfrxng570w1sbc4nr2xq5axibn";
- name = "kjumpingcube-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kjumpingcube-17.08.3.tar.xz";
+ sha256 = "13ifm6drw4m1dzssfalazmnsr5f8z9gla3aypb9ny1xm9ahlgfwh";
+ name = "kjumpingcube-17.08.3.tar.xz";
};
};
kldap = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kldap-17.04.3.tar.xz";
- sha256 = "03ynbrf5slmkdigp4wpwys1gn6iyd9n6b2ki3adcff9vb6k636kc";
- name = "kldap-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kldap-17.08.3.tar.xz";
+ sha256 = "0bnx5fc48ppsykpqwjgsqjd7s4azgzk82k9xgaw566nxqqvgpzsv";
+ name = "kldap-17.08.3.tar.xz";
};
};
kleopatra = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kleopatra-17.04.3.tar.xz";
- sha256 = "08v1gldjk0f6d3card84ml4654irxswmvcizg5zbd8cbqb3mxzpw";
- name = "kleopatra-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kleopatra-17.08.3.tar.xz";
+ sha256 = "0vglphfxq37pxdrrchgzkdlzlzr18qlfwy9g64njyddnsv48pfx8";
+ name = "kleopatra-17.08.3.tar.xz";
};
};
klettres = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/klettres-17.04.3.tar.xz";
- sha256 = "1gc1haxgx380q5chzm6l7hwf9laimjff3j2dvlfcqjq6hjjdasfw";
- name = "klettres-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/klettres-17.08.3.tar.xz";
+ sha256 = "14jxbvil45hc2kqky7yhxrgzpv4094lk9ri0j05i1av6784s9555";
+ name = "klettres-17.08.3.tar.xz";
};
};
klickety = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/klickety-17.04.3.tar.xz";
- sha256 = "1622y0ijw9y28i7fqbxlxj7hi1g1p5ff8dgn9f7bz02a67pdpxxz";
- name = "klickety-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/klickety-17.08.3.tar.xz";
+ sha256 = "01hqf41m8pviziq1x562rd85357kkfgd0x0ba1vasimjddg6v6qa";
+ name = "klickety-17.08.3.tar.xz";
};
};
klines = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/klines-17.04.3.tar.xz";
- sha256 = "1rzp34309ay7hrrjh6ya0ghr167dkxpkizvhz7l7dzrqv9r216wg";
- name = "klines-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/klines-17.08.3.tar.xz";
+ sha256 = "1s0krcqbqii9fqrymm4bb9ssznzyv8bijk5lcngwgxs24igl0g4d";
+ name = "klines-17.08.3.tar.xz";
};
};
klinkstatus = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/klinkstatus-17.04.3.tar.xz";
- sha256 = "0lx9f382nsl008r796bpck5f6q8iw6kh46kzkbxn6ygcc6fxz4nk";
- name = "klinkstatus-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/klinkstatus-17.08.3.tar.xz";
+ sha256 = "0bv5ahcnss6ziccx9mmvf5bdsff9drjqpmq9ln51524bjn4x58ic";
+ name = "klinkstatus-17.08.3.tar.xz";
};
};
kmag = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kmag-17.04.3.tar.xz";
- sha256 = "0frj2nzmkc0k8vmhhan0qb5qq519msjyz8g16yxip2wgw98n7z8w";
- name = "kmag-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kmag-17.08.3.tar.xz";
+ sha256 = "0dadzzrmd982y7apjk783wm5q302y03ydai74pzyqy0awnjdm09d";
+ name = "kmag-17.08.3.tar.xz";
};
};
kmahjongg = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kmahjongg-17.04.3.tar.xz";
- sha256 = "14afsfnnkdwhwqlyxvi16aldwanvn6s5nip6dy6k6aprap03y600";
- name = "kmahjongg-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kmahjongg-17.08.3.tar.xz";
+ sha256 = "09j2pmqc66zi851fsl4ijrcgq3y35arx9272p6z07bg0z9ja5vgb";
+ name = "kmahjongg-17.08.3.tar.xz";
};
};
kmail = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kmail-17.04.3.tar.xz";
- sha256 = "0ml3vkk8d8hhhl3ir09dfn17vnkc94m8vr7fln3246w8rajzcnxb";
- name = "kmail-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kmail-17.08.3.tar.xz";
+ sha256 = "1ibpq0alnk70ha1smfyw8gc91k5q4x1gw7zddwgzw1pjr4v1bqdc";
+ name = "kmail-17.08.3.tar.xz";
};
};
kmail-account-wizard = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kmail-account-wizard-17.04.3.tar.xz";
- sha256 = "1d03kvjx92bqqh7b57kpfcy5viwkxwv4f113hw57bm6myfbv430z";
- name = "kmail-account-wizard-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kmail-account-wizard-17.08.3.tar.xz";
+ sha256 = "0mkw6skpf9kc2h34ww85g18cljln77n5dsg5cyfyqc3i52m1halk";
+ name = "kmail-account-wizard-17.08.3.tar.xz";
};
};
kmailtransport = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kmailtransport-17.04.3.tar.xz";
- sha256 = "0d8w2xq0zjmk3h0hawsbacfvwb3s5qkzqns5hsdrf1dv7mx4w76r";
- name = "kmailtransport-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kmailtransport-17.08.3.tar.xz";
+ sha256 = "0cfyzvsn5x03i6kprqm7y6j6qsfys4yz2s3f4wb5igpdm25nclq1";
+ name = "kmailtransport-17.08.3.tar.xz";
};
};
kmbox = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kmbox-17.04.3.tar.xz";
- sha256 = "1r457xa9s30hpm92cd5lga89g1y256macfmi9kj4l0vjvjphligh";
- name = "kmbox-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kmbox-17.08.3.tar.xz";
+ sha256 = "0mf0005fs15vgmmikdsa44ig4hxrnysl13mrn168crk96h3sk8qi";
+ name = "kmbox-17.08.3.tar.xz";
};
};
kmime = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kmime-17.04.3.tar.xz";
- sha256 = "107ylqgnc63l4a554c4rxp4ckyq33bgy6rwmgihysyy8ff4gfa9a";
- name = "kmime-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kmime-17.08.3.tar.xz";
+ sha256 = "17ziw8g1wdys4iy2yqavqy7wj4kw617m80fg77zlf1cscswhg23d";
+ name = "kmime-17.08.3.tar.xz";
};
};
kmines = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kmines-17.04.3.tar.xz";
- sha256 = "0m42zmfy51qricg9k1rf3b0bcl4cg982iazrh85qcgvpjlgba70n";
- name = "kmines-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kmines-17.08.3.tar.xz";
+ sha256 = "14b0klnlbxkvln3q9fliw6cijc2xmsfmvm6sfikdzzgj59jcylzp";
+ name = "kmines-17.08.3.tar.xz";
};
};
kmix = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kmix-17.04.3.tar.xz";
- sha256 = "1q5pk99hn4shfrbcfab8d1bh79i77v16q3ss2cfa6y8xkrny05rd";
- name = "kmix-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kmix-17.08.3.tar.xz";
+ sha256 = "0fd38banrbgpp8g5gz09w6wny8mdi9szvddl1rv7yx67zf112g67";
+ name = "kmix-17.08.3.tar.xz";
};
};
kmousetool = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kmousetool-17.04.3.tar.xz";
- sha256 = "08f7lvvqks75g0bcjd0cylixa93fr85rnc5jni0ygvi02b9fiy5a";
- name = "kmousetool-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kmousetool-17.08.3.tar.xz";
+ sha256 = "0y2zavs442wpz438p1kyzrqlv9qgvxd4l5gw1pmmx8lkvjjdi91v";
+ name = "kmousetool-17.08.3.tar.xz";
};
};
kmouth = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kmouth-17.04.3.tar.xz";
- sha256 = "1x1g29ipq8v6zshhybwsm9ib8f0ks8rxyc0wjn0ncyirvrwr1ka3";
- name = "kmouth-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kmouth-17.08.3.tar.xz";
+ sha256 = "0gzc6apskfpvih7aap5mfv45q3pg70nfis1vh5ywidia36wbf26i";
+ name = "kmouth-17.08.3.tar.xz";
};
};
kmplot = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kmplot-17.04.3.tar.xz";
- sha256 = "0v8v2bqarn34xahnprpyi66szaq0kjp16cqz90kk8d4ch4xnvhjv";
- name = "kmplot-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kmplot-17.08.3.tar.xz";
+ sha256 = "1ann38zzzd5pds889mc5vw8xw80qlpm9l9nmkczkqyhkfvwxd605";
+ name = "kmplot-17.08.3.tar.xz";
};
};
knavalbattle = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/knavalbattle-17.04.3.tar.xz";
- sha256 = "1qkpzd0fdnz6cdd308xsrk2g6s5lfpq8v5nl6rd6h6ksv599017n";
- name = "knavalbattle-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/knavalbattle-17.08.3.tar.xz";
+ sha256 = "1zj6pki0v3p4xg25ivl45mb877p5xh47d066442pahkf8l3wnsh5";
+ name = "knavalbattle-17.08.3.tar.xz";
};
};
knetwalk = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/knetwalk-17.04.3.tar.xz";
- sha256 = "16p7lxc4qzs4r2yjgshc8pcgpdi714rll6x0mzgsb0fdpdk3wrjg";
- name = "knetwalk-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/knetwalk-17.08.3.tar.xz";
+ sha256 = "0i32f54z5hinafy1v5s1j8ahnbw30721lxa2mvh5qcbr21fan3mc";
+ name = "knetwalk-17.08.3.tar.xz";
};
};
knotes = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/knotes-17.04.3.tar.xz";
- sha256 = "0x6ymg6x3yiaz3gz9kaj88clw7ra0bbmyh230hi0s9v0x085slp3";
- name = "knotes-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/knotes-17.08.3.tar.xz";
+ sha256 = "0ly9gpji3nl3i53nzqd5z27li8qnc1asfv1d1kawchz077da02xy";
+ name = "knotes-17.08.3.tar.xz";
};
};
kolf = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kolf-17.04.3.tar.xz";
- sha256 = "15l4pgidr6r4hh6q6c7gslh7027j1f5xxzwh5w76vlx3j0spzm7l";
- name = "kolf-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kolf-17.08.3.tar.xz";
+ sha256 = "1wc6x1hgkniwzb53bcph3alk0fxlb91s6j39blhync6713x8b4g0";
+ name = "kolf-17.08.3.tar.xz";
};
};
kollision = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kollision-17.04.3.tar.xz";
- sha256 = "0wlwyayrcjrlgzvci3ih2as6dw38jm0j4s15c13ssr545r7mdd4m";
- name = "kollision-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kollision-17.08.3.tar.xz";
+ sha256 = "14ama8cfi4d7whgck0gywm7869gpargq1lrkq8ik4k914pharkzi";
+ name = "kollision-17.08.3.tar.xz";
};
};
kolourpaint = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kolourpaint-17.04.3.tar.xz";
- sha256 = "1xy95vmwajlzvmaqg02ywd8ar8j0ncv0qr5gm49qc57kxnylixhj";
- name = "kolourpaint-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kolourpaint-17.08.3.tar.xz";
+ sha256 = "1y44q14f6brdmccnmf8143kjjqais8ps15z31dpx2935qzjxw8sc";
+ name = "kolourpaint-17.08.3.tar.xz";
};
};
kompare = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kompare-17.04.3.tar.xz";
- sha256 = "16wvfb337prnd9ncq1076hg3fz83lykpmaxmhznrjbiw8plc11n2";
- name = "kompare-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kompare-17.08.3.tar.xz";
+ sha256 = "0fi3s02rsaa3xl7j69lq2qvg9jn9hxdp44ns89q94s06rqkbjyr1";
+ name = "kompare-17.08.3.tar.xz";
};
};
konqueror = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/konqueror-17.04.3.tar.xz";
- sha256 = "08dv4w507zm1qhzis543jamggpsl2rardcvkqanlrh24v83q9zl8";
- name = "konqueror-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/konqueror-17.08.3.tar.xz";
+ sha256 = "1b2hs0fp0a51y87dl8rnv47b8kzjylsps9nczgi8zsipg03z9ja7";
+ name = "konqueror-17.08.3.tar.xz";
};
};
konquest = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/konquest-17.04.3.tar.xz";
- sha256 = "0slnjkzlp0sk3sc5mjg27n918g4l4dsmz4ikz0cwbp46dbfz5y4c";
- name = "konquest-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/konquest-17.08.3.tar.xz";
+ sha256 = "1k5s9cvlsx3j2774i6p6xx2sfg75aafj9a4imvm7mzvn3gvmkm3q";
+ name = "konquest-17.08.3.tar.xz";
};
};
konsole = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/konsole-17.04.3.tar.xz";
- sha256 = "1dhjadpcfh4d7h3ll2sr387c3hgskx8as9p6rksjwkp05mkbgh79";
- name = "konsole-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/konsole-17.08.3.tar.xz";
+ sha256 = "07v9nbikzpanpggglp07slkbn6h0cl2anz7735f9b0lg55fydv42";
+ name = "konsole-17.08.3.tar.xz";
};
};
kontact = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kontact-17.04.3.tar.xz";
- sha256 = "148b86fd192nfc8yp9x5h4wwv7cnlyci1y3fb0wfl85h96d8sa5n";
- name = "kontact-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kontact-17.08.3.tar.xz";
+ sha256 = "1hj6vgvn73bzf43ckk4cm24m1n0a4c9c6p14q95hbfbcp5bdra1i";
+ name = "kontact-17.08.3.tar.xz";
};
};
kontactinterface = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kontactinterface-17.04.3.tar.xz";
- sha256 = "0qlm7mfbhzbhfab0l9rfn5krnxlgbj9yny9bbn4isiyj8csjxmjy";
- name = "kontactinterface-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kontactinterface-17.08.3.tar.xz";
+ sha256 = "1ncy0fz0jyklckimm9jjfv2j88aibk49ismz5z6xlasn44vn7l9c";
+ name = "kontactinterface-17.08.3.tar.xz";
};
};
kopete = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kopete-17.04.3.tar.xz";
- sha256 = "0gz47c9i9ziamh8295r407yamlwx3lqi6f2h9xrapsac8qm4cj7c";
- name = "kopete-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kopete-17.08.3.tar.xz";
+ sha256 = "1v5gmh521si3zbxgcm9m4rcp0csqy52xgvpjpb8j7iq9m0fcqv7q";
+ name = "kopete-17.08.3.tar.xz";
};
};
korganizer = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/korganizer-17.04.3.tar.xz";
- sha256 = "1z3vqlj1jhzvn9kq08hfpnw760yy8j4y82r151rb04c3k3x33mr7";
- name = "korganizer-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/korganizer-17.08.3.tar.xz";
+ sha256 = "1nsj03h1r5mnz2dvdmydvqz2fspgw2ybs5z05gg0f903sq1gz80l";
+ name = "korganizer-17.08.3.tar.xz";
};
};
kpat = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kpat-17.04.3.tar.xz";
- sha256 = "0j39nvb9nvgmg9lxw70q11vj1v08zy3dpbdrzx73v2grp7mvlc14";
- name = "kpat-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kpat-17.08.3.tar.xz";
+ sha256 = "0l5s5rrn67lbf8hjqyyxvxij935pb1fd9x9dlskxyc2w7n6acmn2";
+ name = "kpat-17.08.3.tar.xz";
};
};
kpimtextedit = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kpimtextedit-17.04.3.tar.xz";
- sha256 = "011y7f5aarznqs9ngbvi75h1z10avz1sp0286zmsi00g9733ap7h";
- name = "kpimtextedit-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kpimtextedit-17.08.3.tar.xz";
+ sha256 = "1xyfzvmsfikx2xnhgwx9wkdhvfq72f3mz67hlw2jsbm3ir889ysb";
+ name = "kpimtextedit-17.08.3.tar.xz";
};
};
kppp = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kppp-17.04.3.tar.xz";
- sha256 = "158zgjjlmnk2lh048c271ac9a1h70x0ihm77xr5bgnjg1yyp8lwj";
- name = "kppp-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kppp-17.08.3.tar.xz";
+ sha256 = "00y19x306r3pnax1b2cv8bndd6vq1qp30r1hrgw8npy5mm4mn8jw";
+ name = "kppp-17.08.3.tar.xz";
};
};
kqtquickcharts = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kqtquickcharts-17.04.3.tar.xz";
- sha256 = "1v7cllvz4bhkqnqfib723psvd053wvazvvniw1w6g69lv9a6kn88";
- name = "kqtquickcharts-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kqtquickcharts-17.08.3.tar.xz";
+ sha256 = "0w8hlnhdgqrmad4ii07f9hsyx6vlaqnvlc54prnah1bqzymvc2ms";
+ name = "kqtquickcharts-17.08.3.tar.xz";
};
};
krdc = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/krdc-17.04.3.tar.xz";
- sha256 = "0xi4s5w9wyrgcyqs4xixs8mcprnn3dp4p22fbgi8z8i25znd20d0";
- name = "krdc-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/krdc-17.08.3.tar.xz";
+ sha256 = "13rmn1p495dzx49d1y22na25vrpzk9mcc2axg412pv038iphf8id";
+ name = "krdc-17.08.3.tar.xz";
};
};
kremotecontrol = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kremotecontrol-17.04.3.tar.xz";
- sha256 = "1m1yh4knmj5llrgv043j50azq5s7clfmlg8b86nasz78svbdhxwg";
- name = "kremotecontrol-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kremotecontrol-17.08.3.tar.xz";
+ sha256 = "1p23q7bvppv8fabvpwi793zplb4kry8njczma7c4nya4mkdk9370";
+ name = "kremotecontrol-17.08.3.tar.xz";
};
};
kreversi = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kreversi-17.04.3.tar.xz";
- sha256 = "0splganr60x9nz59jj4ysl8dk867c54k68d3pc8ac2yxhgb7qg0i";
- name = "kreversi-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kreversi-17.08.3.tar.xz";
+ sha256 = "0ma0y1n38hw5rawzazlaqfa4vsawgvaq8j2pa5n7z23nwckh19wd";
+ name = "kreversi-17.08.3.tar.xz";
};
};
krfb = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/krfb-17.04.3.tar.xz";
- sha256 = "0yx19gf8mh6l5k4apfim48jw61hcllwb2nbk9d7k08nl635lxd7i";
- name = "krfb-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/krfb-17.08.3.tar.xz";
+ sha256 = "1k7rziw0l0bdjxi5i92w1zsjbakzbklc95dyn2jsnm36jljjqpv1";
+ name = "krfb-17.08.3.tar.xz";
};
};
kross-interpreters = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kross-interpreters-17.04.3.tar.xz";
- sha256 = "1z7xnd4l1ksi0m4281pg9p0l2qv46acr1yijhrkg82va67y13r81";
- name = "kross-interpreters-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kross-interpreters-17.08.3.tar.xz";
+ sha256 = "1pqlm14xr9p18dfh8pczg8fjskpvzxh5s5n7nxj9q31yz6kbxzrb";
+ name = "kross-interpreters-17.08.3.tar.xz";
};
};
kruler = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kruler-17.04.3.tar.xz";
- sha256 = "01pab2j5jpkqxmymhkkwlaw63idmbi9pdv0974ypg209lp51nw9i";
- name = "kruler-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kruler-17.08.3.tar.xz";
+ sha256 = "1qizjvysfnh5x3fa8hav3y9pyaiq8hpwi1grw9dd921cbb16cww4";
+ name = "kruler-17.08.3.tar.xz";
};
};
ksaneplugin = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/ksaneplugin-17.04.3.tar.xz";
- sha256 = "0iyxzgxfvw8wk18bbhif5is8nj421rnf6hrm6jz8s1gzlamnmfkm";
- name = "ksaneplugin-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/ksaneplugin-17.08.3.tar.xz";
+ sha256 = "0y7f269wv0alcvx906nill92nzlld5b1sg6q3xki89b6b9fgliig";
+ name = "ksaneplugin-17.08.3.tar.xz";
};
};
kscd = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kscd-17.04.3.tar.xz";
- sha256 = "1c2w5kjm020930460iyq3q9jb1m3lz8cld4zmd2q7vr68ga31756";
- name = "kscd-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kscd-17.08.3.tar.xz";
+ sha256 = "08r9zhp7d7xf8iyi56hvlm5vyjqrjpj9dc8ynda0n7hyngxrbvm0";
+ name = "kscd-17.08.3.tar.xz";
};
};
kshisen = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kshisen-17.04.3.tar.xz";
- sha256 = "14dswml5cgjr0q27gv7wgkl3mn3z2dvwa847k59s3mzpy7q45zyy";
- name = "kshisen-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kshisen-17.08.3.tar.xz";
+ sha256 = "18nwnxn7i0p2b78cxv8ppsl4lrzdm4ck6hqqdf738npli271shq0";
+ name = "kshisen-17.08.3.tar.xz";
};
};
ksirk = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/ksirk-17.04.3.tar.xz";
- sha256 = "16hibmv3697wzy62p51s5nkps942dav2wk7hllaykx3qzcr3dflf";
- name = "ksirk-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/ksirk-17.08.3.tar.xz";
+ sha256 = "1601fh93jcy7x622hpvdrb9ddb262n9ivakxli054cz2bq3dbpim";
+ name = "ksirk-17.08.3.tar.xz";
};
};
ksnakeduel = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/ksnakeduel-17.04.3.tar.xz";
- sha256 = "08v2yr8n9px55c467wyji2lmiyl1d7m7qm5ll7vynxsdzz6g02wq";
- name = "ksnakeduel-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/ksnakeduel-17.08.3.tar.xz";
+ sha256 = "1a7xki783799ala0zx1jngvhsky994sk32xyza2lfir5ym1w0pkm";
+ name = "ksnakeduel-17.08.3.tar.xz";
};
};
kspaceduel = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kspaceduel-17.04.3.tar.xz";
- sha256 = "0y5c4hbxyl7pi4fp2zkkjmzqy27mazyh4capjnyjckqy91n3cfwa";
- name = "kspaceduel-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kspaceduel-17.08.3.tar.xz";
+ sha256 = "1wskg788mc51dh3hv0d7hrqyy14gnzzw2sqhc0pd65jj8hra7kh2";
+ name = "kspaceduel-17.08.3.tar.xz";
};
};
ksquares = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/ksquares-17.04.3.tar.xz";
- sha256 = "04531lg5xz9rk81l0xqvy8wlh1jmpgfc74i0drv4s712v0bvjixb";
- name = "ksquares-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/ksquares-17.08.3.tar.xz";
+ sha256 = "04bc3ppiai39v8dq02r7nzr4nvpzjj90glg6qssxqyxwrz18kk20";
+ name = "ksquares-17.08.3.tar.xz";
};
};
kstars = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kstars-17.04.3.tar.xz";
- sha256 = "011ncpkly5x6js9vx5d8pnrd3z9iz3zqxivx7cibjbgmwrl80dn8";
- name = "kstars-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kstars-17.08.3.tar.xz";
+ sha256 = "0i165snb4wnw2kzbhcawgwwqppgq5fmw23rqa4q2k3alaz9smcdn";
+ name = "kstars-17.08.3.tar.xz";
};
};
ksudoku = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/ksudoku-17.04.3.tar.xz";
- sha256 = "0x54jmzjz01nlsxrn1hr6my54rb58v1qdibz03a8nl7pfndq6qhi";
- name = "ksudoku-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/ksudoku-17.08.3.tar.xz";
+ sha256 = "1dmqss272z7s7vbh71zg7s5drn66a2yyrv53f34yk3d93mhk8dq2";
+ name = "ksudoku-17.08.3.tar.xz";
};
};
ksystemlog = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/ksystemlog-17.04.3.tar.xz";
- sha256 = "00g7cw2g2450x2m8wip62aajs2r6knw359s5lr5cl2llzasp297i";
- name = "ksystemlog-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/ksystemlog-17.08.3.tar.xz";
+ sha256 = "0smhbdpj2xf9q8l8cjhk4x80qq6apn6mmf7dna9hznp6nd6jrsgv";
+ name = "ksystemlog-17.08.3.tar.xz";
};
};
kteatime = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kteatime-17.04.3.tar.xz";
- sha256 = "1cm5bmb0n8b6pxq0zbdl01mhrzh50ccrywzn2zjscbsnasnbynxk";
- name = "kteatime-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kteatime-17.08.3.tar.xz";
+ sha256 = "0pp08b2rjz329kdaqq5a490r353n346ah0ag6wfxmpchqy11lr3r";
+ name = "kteatime-17.08.3.tar.xz";
};
};
ktimer = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/ktimer-17.04.3.tar.xz";
- sha256 = "0s5xvm2fk0i5lyj2420c561xbf536508l1basv3dn12l9xixmbm4";
- name = "ktimer-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/ktimer-17.08.3.tar.xz";
+ sha256 = "15k1rfih9k7zpcsdyiwl60jmp1w1svwb8c6cykjzqpc9acyfpba5";
+ name = "ktimer-17.08.3.tar.xz";
};
};
ktnef = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/ktnef-17.04.3.tar.xz";
- sha256 = "06gyfz2xil0p9y1442dcwj3ymi1py3wrdbgkccc9vy4zpmaqmk68";
- name = "ktnef-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/ktnef-17.08.3.tar.xz";
+ sha256 = "0fh0ybb3nijhxhkwcmcygw413blkmra83az1jhkmlpp6q5459jin";
+ name = "ktnef-17.08.3.tar.xz";
};
};
ktouch = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/ktouch-17.04.3.tar.xz";
- sha256 = "0ms1cbmf21w0ypwkxi3flazkkx790kciblk1izwn3p6ywqdig0ih";
- name = "ktouch-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/ktouch-17.08.3.tar.xz";
+ sha256 = "0z21wb82m3sds4sjkkadb48zxcfj1qbab07i3cs3g3a730zdj5ld";
+ name = "ktouch-17.08.3.tar.xz";
};
};
ktp-accounts-kcm = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/ktp-accounts-kcm-17.04.3.tar.xz";
- sha256 = "065gx0k28qialw41iqx3m25l1qppp77qssmhywb158pryy1v2clz";
- name = "ktp-accounts-kcm-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/ktp-accounts-kcm-17.08.3.tar.xz";
+ sha256 = "17h75xkavyl2920j57nm6zp81l70ksyjndrrrqxv8clig1bqfc89";
+ name = "ktp-accounts-kcm-17.08.3.tar.xz";
};
};
ktp-approver = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/ktp-approver-17.04.3.tar.xz";
- sha256 = "11694778gg47fjq76rwxjibrcga7fqmnv88pmqvrb6hhskbnriav";
- name = "ktp-approver-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/ktp-approver-17.08.3.tar.xz";
+ sha256 = "0dvwwpy50ixylacrxnfh4aqpsbc4nfsqkwr358917w5mambfji42";
+ name = "ktp-approver-17.08.3.tar.xz";
};
};
ktp-auth-handler = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/ktp-auth-handler-17.04.3.tar.xz";
- sha256 = "0m3s8piyhi9r11pq202ky14drhm45gxvvvy30w2x57qz9k013c67";
- name = "ktp-auth-handler-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/ktp-auth-handler-17.08.3.tar.xz";
+ sha256 = "0pm0bvivwlaq083sql74qq5wrlm7wix1k9i4cr3fck73am9h526b";
+ name = "ktp-auth-handler-17.08.3.tar.xz";
};
};
ktp-call-ui = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/ktp-call-ui-17.04.3.tar.xz";
- sha256 = "16zz91kiyz1mnipl6sqxqrak6cfhcp195in45cvlpcm5pn7gn0x6";
- name = "ktp-call-ui-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/ktp-call-ui-17.08.3.tar.xz";
+ sha256 = "1kwprh9g97hraywjcv2ppddaxh7cw6gsy4zs8mjvh0zpnn3cy7xm";
+ name = "ktp-call-ui-17.08.3.tar.xz";
};
};
ktp-common-internals = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/ktp-common-internals-17.04.3.tar.xz";
- sha256 = "12mwfd60f7iyb0f0y3yzscw38dygakhv9xlidwy4yxj6n7xylr0k";
- name = "ktp-common-internals-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/ktp-common-internals-17.08.3.tar.xz";
+ sha256 = "10r5flyy4vph1x39dp2mskqksnf5h0qvskl31ln65vz9m8zrhq3w";
+ name = "ktp-common-internals-17.08.3.tar.xz";
};
};
ktp-contact-list = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/ktp-contact-list-17.04.3.tar.xz";
- sha256 = "068m2nd969qrzsip4ks1zgcdardl4gzsdxm6jic04gxfhygrkllk";
- name = "ktp-contact-list-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/ktp-contact-list-17.08.3.tar.xz";
+ sha256 = "04j2swlqwzppxsbqnwyrz60lgi9l8d7x8hf4xmmhrv1al6vzmb5q";
+ name = "ktp-contact-list-17.08.3.tar.xz";
};
};
ktp-contact-runner = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/ktp-contact-runner-17.04.3.tar.xz";
- sha256 = "0qq1x1ip7vrjapq6aq8a7lbfcd6gn9cmal8g8247hilcjbmzlab2";
- name = "ktp-contact-runner-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/ktp-contact-runner-17.08.3.tar.xz";
+ sha256 = "1sh0arsy3z413ng0b89sc6a4rh2rnh50k2mhkrdzcvfbwlf74bhw";
+ name = "ktp-contact-runner-17.08.3.tar.xz";
};
};
ktp-desktop-applets = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/ktp-desktop-applets-17.04.3.tar.xz";
- sha256 = "0jsza9vaz7vn108j9c49fyqwyy2v7yjrmn3kpxn9kd4jmz81z74s";
- name = "ktp-desktop-applets-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/ktp-desktop-applets-17.08.3.tar.xz";
+ sha256 = "03m834rh9v6ash8vm1cs2jpyxma6jaag61h5a51s3ykp0rgv984c";
+ name = "ktp-desktop-applets-17.08.3.tar.xz";
};
};
ktp-filetransfer-handler = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/ktp-filetransfer-handler-17.04.3.tar.xz";
- sha256 = "15bp0lrdingxz0sm9cxrjb3zhc1a56van2jl809v7703r3q6fliv";
- name = "ktp-filetransfer-handler-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/ktp-filetransfer-handler-17.08.3.tar.xz";
+ sha256 = "0vpl977p9lv58p04v6f9v0g4fda7xkhdggf3n4sjnwhis3n0nnx6";
+ name = "ktp-filetransfer-handler-17.08.3.tar.xz";
};
};
ktp-kded-module = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/ktp-kded-module-17.04.3.tar.xz";
- sha256 = "14jksyvl41179fm53834finmmh7pg5lyhgalvaa88dch62f3s6r7";
- name = "ktp-kded-module-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/ktp-kded-module-17.08.3.tar.xz";
+ sha256 = "0mzzbi50ad2z11wi77957fhmwmqnqhfwjll4s7bj4fq6i3kpncmb";
+ name = "ktp-kded-module-17.08.3.tar.xz";
};
};
ktp-send-file = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/ktp-send-file-17.04.3.tar.xz";
- sha256 = "10h7y12z4l05yblh4drngqzb77yijik28iilj619491w865kia90";
- name = "ktp-send-file-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/ktp-send-file-17.08.3.tar.xz";
+ sha256 = "1al9w5n0w6i3x0izylx2jviakj3j19izlys9j7phc2gnm99g8mfa";
+ name = "ktp-send-file-17.08.3.tar.xz";
};
};
ktp-text-ui = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/ktp-text-ui-17.04.3.tar.xz";
- sha256 = "1ggac4v9wiqdqihnp9ddfh20p7kli2yhikdkiv8wb2ia3836j6y1";
- name = "ktp-text-ui-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/ktp-text-ui-17.08.3.tar.xz";
+ sha256 = "1ib9hskw3qdrpnb0caj12wqkzg0vh2i9wlx582zchn4k4hqkwsxw";
+ name = "ktp-text-ui-17.08.3.tar.xz";
};
};
ktuberling = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/ktuberling-17.04.3.tar.xz";
- sha256 = "0h66d6jhp9p47pb177hrjjkp0agwa4vzgjl53rib8lgv3ifyxq1d";
- name = "ktuberling-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/ktuberling-17.08.3.tar.xz";
+ sha256 = "1jvyg09c5458m066sd0x6p2z41rpgbdvkgmw1f6wiybqwxg82h43";
+ name = "ktuberling-17.08.3.tar.xz";
};
};
kturtle = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kturtle-17.04.3.tar.xz";
- sha256 = "04sykc7bsvc20i0nq8h1w89gafz6cli9x1iphf0l6v8whvb7avmn";
- name = "kturtle-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kturtle-17.08.3.tar.xz";
+ sha256 = "1ral1y1s2jsc8zm1bwiliblywlpsb7q79cjqafz31r6cb72rkcs4";
+ name = "kturtle-17.08.3.tar.xz";
};
};
kubrick = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kubrick-17.04.3.tar.xz";
- sha256 = "1zkjwsl7bsb170qac59psjkvdbqypfkp0s4snqvqw07jicbq75ss";
- name = "kubrick-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kubrick-17.08.3.tar.xz";
+ sha256 = "02hzlkqrb55dc45zgqx3r58r7syb3kr2dfwws3s96j5i4q1bp5p8";
+ name = "kubrick-17.08.3.tar.xz";
};
};
kwalletmanager = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kwalletmanager-17.04.3.tar.xz";
- sha256 = "1wz27vg9h2g7q26ii1m358b3qdnra96zp3kwlz5yn5jkgv6500cr";
- name = "kwalletmanager-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kwalletmanager-17.08.3.tar.xz";
+ sha256 = "1ggrswys6ip3lxj6qjy32i36rlmzn2cxddjildlb2b2hk6c3k36r";
+ name = "kwalletmanager-17.08.3.tar.xz";
};
};
kwave = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kwave-17.04.3.tar.xz";
- sha256 = "1mps4fq351fxqpsrv74hchn64qm5407jr9vlh169khvrcjbj72xn";
- name = "kwave-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kwave-17.08.3.tar.xz";
+ sha256 = "0gxmmz5ry6gjfrxwksrxvqyff8f3p807q5s4rcpfh975f10ixqqi";
+ name = "kwave-17.08.3.tar.xz";
};
};
kwordquiz = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/kwordquiz-17.04.3.tar.xz";
- sha256 = "0kacbsr56a063586vs4if4mcqp9fwics4344ha12zh2j2clr20h3";
- name = "kwordquiz-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/kwordquiz-17.08.3.tar.xz";
+ sha256 = "0bzfil8pml6jmc0zgszxybyxvkdgzzq37l97z2qvhmjw8pfk0zsr";
+ name = "kwordquiz-17.08.3.tar.xz";
};
};
libgravatar = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/libgravatar-17.04.3.tar.xz";
- sha256 = "0mdnvr7k67v2j9x5zwfsy2d3hw6j83npcv7546yqxfv6myb0ffvc";
- name = "libgravatar-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/libgravatar-17.08.3.tar.xz";
+ sha256 = "0xx9xik5xcg9gs2hjf0z24v7bqqf5qk8x0743qlspyc35i8jq7hx";
+ name = "libgravatar-17.08.3.tar.xz";
};
};
libkcddb = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/libkcddb-17.04.3.tar.xz";
- sha256 = "01mmll75l2lv0djahfaikq5nc52z3k7zlc2hx3djw9xrhhvmd63k";
- name = "libkcddb-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/libkcddb-17.08.3.tar.xz";
+ sha256 = "0yhs9acv87i8635dw79hpsiywgxcbnaa4vx0l95v50r3v2pknx7h";
+ name = "libkcddb-17.08.3.tar.xz";
};
};
libkcompactdisc = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/libkcompactdisc-17.04.3.tar.xz";
- sha256 = "0zr581qyf81v9sfh3qvhkjh0krzs35y0gpi4wp07df071hiddmvj";
- name = "libkcompactdisc-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/libkcompactdisc-17.08.3.tar.xz";
+ sha256 = "0r0w7qwi1pqcs9fv5rnpf7d2zjvaqd3yj2x12z2vc81qz4vrdr19";
+ name = "libkcompactdisc-17.08.3.tar.xz";
};
};
libkdcraw = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/libkdcraw-17.04.3.tar.xz";
- sha256 = "1w0zhz20vf2i55wywzf7ar5sp2paflbxjg3r35p6wpfrlafzvnjw";
- name = "libkdcraw-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/libkdcraw-17.08.3.tar.xz";
+ sha256 = "0hnbphkdmz3yd0callcwk2bqnkr2i9ljck63rz6yn4adnfdclkad";
+ name = "libkdcraw-17.08.3.tar.xz";
};
};
libkdegames = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/libkdegames-17.04.3.tar.xz";
- sha256 = "02j5kmbnxnmgf0vnmz6hzmkz5jc4aw2vm8gnjvs4l2hzcf7f82p8";
- name = "libkdegames-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/libkdegames-17.08.3.tar.xz";
+ sha256 = "1sc6y01z0alxdgrm3rlki6n5a3gblrim7cbxj9xbsghy6s8s3pn0";
+ name = "libkdegames-17.08.3.tar.xz";
};
};
libkdepim = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/libkdepim-17.04.3.tar.xz";
- sha256 = "0a0kxx99swyw31bf9npbfa5smavpar2qg593dvg1basdy102lpcv";
- name = "libkdepim-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/libkdepim-17.08.3.tar.xz";
+ sha256 = "19njszdhca7lk6cmkj4nnvj8zk7nakb9gq8bg34dqhhiq3nc6si5";
+ name = "libkdepim-17.08.3.tar.xz";
};
};
libkeduvocdocument = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/libkeduvocdocument-17.04.3.tar.xz";
- sha256 = "1z138s14cd7cfgv442i848m4w71f6442rjm8cghbd8m4kbd3m8yg";
- name = "libkeduvocdocument-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/libkeduvocdocument-17.08.3.tar.xz";
+ sha256 = "0q978wn4brcszlf47iqnc93fqgcsvfcw2292n2hapf0cv8j8vzbm";
+ name = "libkeduvocdocument-17.08.3.tar.xz";
};
};
libkexiv2 = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/libkexiv2-17.04.3.tar.xz";
- sha256 = "035akzr9f7f9k86j1ihx9ql574vjfm3ai792k8h46xh9d7xn385q";
- name = "libkexiv2-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/libkexiv2-17.08.3.tar.xz";
+ sha256 = "0j906k63j30sajb70kqglhz9lhai98bh9x2bcwma711b2f30q2r2";
+ name = "libkexiv2-17.08.3.tar.xz";
};
};
libkface = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/libkface-17.04.3.tar.xz";
- sha256 = "081ghj31f39xxq692ad5a32w8kaks7xyl3xmcmgl0sp7yac102ar";
- name = "libkface-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/libkface-17.08.3.tar.xz";
+ sha256 = "0im9k72rxpk17m8ckl06rvylsxwjhgh3yxji1visvxljwkdscbmx";
+ name = "libkface-17.08.3.tar.xz";
};
};
libkgapi = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/libkgapi-17.04.3.tar.xz";
- sha256 = "1j6lg6mdd7bhapdkfpicksbd9y9b4qh0f9m3k3yddx318n49nl8r";
- name = "libkgapi-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/libkgapi-17.08.3.tar.xz";
+ sha256 = "1yw00c16g2h59x5wzaaicv8b9dvdhbp0mqv49m8krnw07awh7isz";
+ name = "libkgapi-17.08.3.tar.xz";
};
};
libkgeomap = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/libkgeomap-17.04.3.tar.xz";
- sha256 = "1zc4ja631f54xk1mycda1h4c3wdhq9ggn67xn68jrlv4wrsm3ly1";
- name = "libkgeomap-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/libkgeomap-17.08.3.tar.xz";
+ sha256 = "0k0ndgwwm78z8hybyi0clfpkvmrpaj9b3xyda57c410m73fbdr0m";
+ name = "libkgeomap-17.08.3.tar.xz";
};
};
libkipi = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/libkipi-17.04.3.tar.xz";
- sha256 = "1qf1qpq1q65fk96c6rvq4avlbqnfa7cr58fkcv8c620j7fkhh3iv";
- name = "libkipi-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/libkipi-17.08.3.tar.xz";
+ sha256 = "0c0bhw0wpm6y21wj15cs73150dh0vxddl4lypj3xjpknxspiv32x";
+ name = "libkipi-17.08.3.tar.xz";
};
};
libkleo = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/libkleo-17.04.3.tar.xz";
- sha256 = "1jk0qlsx6k77vg85xp1fjvz3b2h6f08zmwgjfh24gz9jacdps2bq";
- name = "libkleo-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/libkleo-17.08.3.tar.xz";
+ sha256 = "1nyf7c1q7dngk28852lkhz3h1cvi5xy4ydshkm376h32ps905yb7";
+ name = "libkleo-17.08.3.tar.xz";
};
};
libkmahjongg = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/libkmahjongg-17.04.3.tar.xz";
- sha256 = "1bwgrvzzwqd1zp9qskss8l20ihxd8z7mn4ap7xr2snr7m6bzandx";
- name = "libkmahjongg-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/libkmahjongg-17.08.3.tar.xz";
+ sha256 = "1w7fzvp44dl74m5pl206mrwxpj3fh4fd0fwfinxps616jx1q76fd";
+ name = "libkmahjongg-17.08.3.tar.xz";
};
};
libkomparediff2 = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/libkomparediff2-17.04.3.tar.xz";
- sha256 = "0jfhvp1dxbrblaqizflbs2c2r5ar1nd41rzhnrm4iwgafnpsa9av";
- name = "libkomparediff2-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/libkomparediff2-17.08.3.tar.xz";
+ sha256 = "01bd04av3jnsc2kxirfi4d8k2baaskdk2kasmbih1gml2mw9sbff";
+ name = "libkomparediff2-17.08.3.tar.xz";
};
};
libksane = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/libksane-17.04.3.tar.xz";
- sha256 = "0wvqdbi7a2ji2fhvxqn5iyab8qwq9ycb5lngj1wlyzp96c3lyz40";
- name = "libksane-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/libksane-17.08.3.tar.xz";
+ sha256 = "1skmqiw3j8jsdaj2haridslkx27wf55swjkzgjk4cxsk96j7y4ib";
+ name = "libksane-17.08.3.tar.xz";
};
};
libksieve = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/libksieve-17.04.3.tar.xz";
- sha256 = "107bcfb3nvlwxhcwqdy90yki69xz2r7ipisb0dasxc70yvlkax83";
- name = "libksieve-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/libksieve-17.08.3.tar.xz";
+ sha256 = "1nphwghis0mmmb92nr4f5d364nd5jyi1has9dc1hx6qz8p0wphwg";
+ name = "libksieve-17.08.3.tar.xz";
};
};
lokalize = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/lokalize-17.04.3.tar.xz";
- sha256 = "0v9q0xs6vgwxk6cpirpv41y49r7c74fwlqvrr23m70252781gx7a";
- name = "lokalize-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/lokalize-17.08.3.tar.xz";
+ sha256 = "0d4ym1vif1ggdlbs2k3ralc6lsm81xnlfp3z3mlkvg0vv77sfbra";
+ name = "lokalize-17.08.3.tar.xz";
};
};
lskat = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/lskat-17.04.3.tar.xz";
- sha256 = "1bzrfb51aq0ir0kjsmzfvdfvjsj81xrn3sv6vsp0wmq1510dz0qq";
- name = "lskat-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/lskat-17.08.3.tar.xz";
+ sha256 = "07vhmk03z2jw6mlfv5mdhzafcqa06skzm6ssk70y3whkwkck385b";
+ name = "lskat-17.08.3.tar.xz";
};
};
mailcommon = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/mailcommon-17.04.3.tar.xz";
- sha256 = "1zyjcdn2x70304l2gyijwyv5p1p3wqvvlx9b6aj2xmhm0yvsfibk";
- name = "mailcommon-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/mailcommon-17.08.3.tar.xz";
+ sha256 = "1zgy8sjng40w8m0b8fdy62p9sng7nld84py1k8zjw8mzhqqzqxs5";
+ name = "mailcommon-17.08.3.tar.xz";
};
};
mailimporter = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/mailimporter-17.04.3.tar.xz";
- sha256 = "0f5nipzfz505c3bibsw6v4qnqd7bkv4fy61dyapka0dy0sxlmgdk";
- name = "mailimporter-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/mailimporter-17.08.3.tar.xz";
+ sha256 = "0h3wsbca2lhw1zjv2l1q6fhdwnx9kznyiykcn7jgzsh6f7grzqa8";
+ name = "mailimporter-17.08.3.tar.xz";
};
};
marble = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/marble-17.04.3.tar.xz";
- sha256 = "0mlhngwscikcayi71kdsd6wbz2nj6gpzcib2gax32lnjdhx3zml3";
- name = "marble-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/marble-17.08.3.tar.xz";
+ sha256 = "0qmzy9b1gd40xzw4i978315dxf1ay1937wplb9nc670gmlrqnzy2";
+ name = "marble-17.08.3.tar.xz";
};
};
mbox-importer = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/mbox-importer-17.04.3.tar.xz";
- sha256 = "03mah1djrmks8zvqhzds9r6gx4z6z9ngqc0ki4524pf1yshg4bic";
- name = "mbox-importer-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/mbox-importer-17.08.3.tar.xz";
+ sha256 = "1nlzjvzwp4jalqbql39q9lszfxg9cba5bcbi4wgiv580pyq38h28";
+ name = "mbox-importer-17.08.3.tar.xz";
};
};
messagelib = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/messagelib-17.04.3.tar.xz";
- sha256 = "15jvx0f4dmkl7sp8qpijisamqvvz70x3xfk3q7n0cr81pdbc5s2k";
- name = "messagelib-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/messagelib-17.08.3.tar.xz";
+ sha256 = "1nxi79dyavjvgn83bjjrdwg0ry298ib126dxyl7inx7qgc4nhddn";
+ name = "messagelib-17.08.3.tar.xz";
};
};
minuet = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/minuet-17.04.3.tar.xz";
- sha256 = "16x4rbckwbiv77wvqyd60p34lds9pm5zhllzhzhlllz21m041z2p";
- name = "minuet-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/minuet-17.08.3.tar.xz";
+ sha256 = "1jg47mb5wnpw60is5zmdrqhjwsq6bnd5vw0pfiiw1arws50rv2h6";
+ name = "minuet-17.08.3.tar.xz";
};
};
okteta = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/okteta-17.04.3.tar.xz";
- sha256 = "01x9rp2h5ca85rriw8hz5qcmv4xm9isxvm8yc8b806kd08kwmhrv";
- name = "okteta-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/okteta-17.08.3.tar.xz";
+ sha256 = "1zs0g5mnlj2fd0wipxgajnvbl5s24a37v6zdkixck5fmvlj6g14v";
+ name = "okteta-17.08.3.tar.xz";
};
};
okular = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/okular-17.04.3.tar.xz";
- sha256 = "0c05ma4yi6yhibxqfl26y32792cv21kvxdxs2yxbhm1xy3b397iv";
- name = "okular-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/okular-17.08.3.tar.xz";
+ sha256 = "1zalj2v9fgxc50b339i3j4n3gpf87pjnnqbgvkmd041apsv6jbnk";
+ name = "okular-17.08.3.tar.xz";
};
};
palapeli = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/palapeli-17.04.3.tar.xz";
- sha256 = "1ixp23cp5qsil4dhvkq9q0d6cl3qyh6jard1zrd6qv3cz3586jsc";
- name = "palapeli-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/palapeli-17.08.3.tar.xz";
+ sha256 = "1i689gycqlpi83wfy9l2dqzdypaizdx7cx069fbm4akv8r4xfjfz";
+ name = "palapeli-17.08.3.tar.xz";
};
};
parley = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/parley-17.04.3.tar.xz";
- sha256 = "1i4l18c5vndx6i3f4l6yyhgr4bmnvfwiqgjj01bicxzawnknv75m";
- name = "parley-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/parley-17.08.3.tar.xz";
+ sha256 = "0crrf7k8p9rz72q4zfbyxxfza5dm0z4nhhc4jqafra8vvbjyja2j";
+ name = "parley-17.08.3.tar.xz";
};
};
picmi = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/picmi-17.04.3.tar.xz";
- sha256 = "0n1wrbscjdqs4cks9igxdhqh583ksdqsi339cnlqdnazcpjrb96n";
- name = "picmi-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/picmi-17.08.3.tar.xz";
+ sha256 = "0zj3ang96rwzpjr3y8lig1dhqxd2ipcs3q873plra0lxmlhnzq6b";
+ name = "picmi-17.08.3.tar.xz";
};
};
pimcommon = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/pimcommon-17.04.3.tar.xz";
- sha256 = "02wzindfacgj3f7a71h7wqa0jk0096xidw9bwdb5nvjnaigxxnx3";
- name = "pimcommon-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/pimcommon-17.08.3.tar.xz";
+ sha256 = "0d1avdhm78kfjvl8sybjqsmp7k1wl961bqlzgbxk9wq6411p9r8r";
+ name = "pimcommon-17.08.3.tar.xz";
};
};
pim-data-exporter = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/pim-data-exporter-17.04.3.tar.xz";
- sha256 = "1q4vjynfbwrdn9j7ggxfsrilzb3g5s1yqr51siiw17jr11xca3cb";
- name = "pim-data-exporter-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/pim-data-exporter-17.08.3.tar.xz";
+ sha256 = "0afn6rjz7vmz9q16a487ssns6nj7sbqbz4ydbhh1i3c8xhlnxg1m";
+ name = "pim-data-exporter-17.08.3.tar.xz";
};
};
pim-sieve-editor = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/pim-sieve-editor-17.04.3.tar.xz";
- sha256 = "1dfksp7ric5na75i6hyj4q2sgzz7zdc9a0izpzhwzqbx86m56zd8";
- name = "pim-sieve-editor-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/pim-sieve-editor-17.08.3.tar.xz";
+ sha256 = "0fw976hdrvw68025bs1bff47d4cs95ws7p4viacmz4na9m0cag7n";
+ name = "pim-sieve-editor-17.08.3.tar.xz";
};
};
poxml = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/poxml-17.04.3.tar.xz";
- sha256 = "18rpy9l1blmgzjhl0pw3gjfngzjylwkqiwzilb2pdijs1121sjhv";
- name = "poxml-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/poxml-17.08.3.tar.xz";
+ sha256 = "0vgh77rdqp8pq5k20794fl8m12azx6r2pkl0rijmwar2ln5k0k25";
+ name = "poxml-17.08.3.tar.xz";
};
};
print-manager = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/print-manager-17.04.3.tar.xz";
- sha256 = "0w51wkh2rlbwsna4amfiav0pi89si5cx8g0krfr12hiji05w4van";
- name = "print-manager-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/print-manager-17.08.3.tar.xz";
+ sha256 = "0ncda47pk225hn45rv1wwibn0s974mm4s5fpi54hyanba6ganll5";
+ name = "print-manager-17.08.3.tar.xz";
};
};
rocs = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/rocs-17.04.3.tar.xz";
- sha256 = "078451k2vx4pryxs93hry41jd6w6i8nd9lifwivgs8nrrbk4pf5b";
- name = "rocs-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/rocs-17.08.3.tar.xz";
+ sha256 = "1nvwjxsfqccrig25m9qkivrjn302g6blb6h2p3q1qnlszcw8b9wd";
+ name = "rocs-17.08.3.tar.xz";
};
};
signon-kwallet-extension = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/signon-kwallet-extension-17.04.3.tar.xz";
- sha256 = "0ahfzsr7xpnps14fwajc2fvgxd6jh18w9da40hc47pm5n8wwwbb0";
- name = "signon-kwallet-extension-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/signon-kwallet-extension-17.08.3.tar.xz";
+ sha256 = "0hpalgz4xfd9qh5mxgrs638v0as4x0a5133caci6lwaydrhgwrxg";
+ name = "signon-kwallet-extension-17.08.3.tar.xz";
};
};
spectacle = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/spectacle-17.04.3.tar.xz";
- sha256 = "0xjclcvi5fq3aq0dz34cf4w6yvi9bjr3mwc0ywqfliw0j35r4iqv";
- name = "spectacle-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/spectacle-17.08.3.tar.xz";
+ sha256 = "18z0sqd38146nc73kmwvshjxl0wgm1fh4zzxai1hcp7yiipndzm6";
+ name = "spectacle-17.08.3.tar.xz";
};
};
step = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/step-17.04.3.tar.xz";
- sha256 = "111pqn908khirr66d9l4va2blcm2zcksb3w11lvwz7dfidag0bks";
- name = "step-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/step-17.08.3.tar.xz";
+ sha256 = "1gnsfn2iz2lax30pdyqvm6s5b8zjsn4gs031dlr1xgsd98c1xq87";
+ name = "step-17.08.3.tar.xz";
};
};
svgpart = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/svgpart-17.04.3.tar.xz";
- sha256 = "101kll7q53qwhgjll4vrqdapag9bc5nwqnq14gxbmmyknpjpgxqh";
- name = "svgpart-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/svgpart-17.08.3.tar.xz";
+ sha256 = "07i3ny0bl1fjfia2rbrb7n4qycdpz4gjpvx6v540ghq58dy7nfgw";
+ name = "svgpart-17.08.3.tar.xz";
};
};
sweeper = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/sweeper-17.04.3.tar.xz";
- sha256 = "1ai6bhfq7g80y7w3jaqzhlq8z3krmpjjg9ap1p358485d6ja9i0k";
- name = "sweeper-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/sweeper-17.08.3.tar.xz";
+ sha256 = "0jymkz024ywss8y2xpyndpr7pk89v7bbgr5anpnywfkgx3lv06xn";
+ name = "sweeper-17.08.3.tar.xz";
};
};
syndication = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/syndication-17.04.3.tar.xz";
- sha256 = "1d3nfzz2f0n31ivzrhld5gi1bk486i5dpp0v0b1wlnacm8z0ddy5";
- name = "syndication-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/syndication-17.08.3.tar.xz";
+ sha256 = "0yakzq927prd9pd1g7gld90pz1cxjwzic2c2cw9bw17x19yr748h";
+ name = "syndication-17.08.3.tar.xz";
};
};
umbrello = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/umbrello-17.04.3.tar.xz";
- sha256 = "1v1694j5crffmy12qij1hrikrsn2irasjra11jcc4rx2klfhv2bs";
- name = "umbrello-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/umbrello-17.08.3.tar.xz";
+ sha256 = "1g149nkp02b1sgsq83r0p3vfii8jsc4kx79znglcjlf20dg89j70";
+ name = "umbrello-17.08.3.tar.xz";
};
};
zeroconf-ioslave = {
- version = "17.04.3";
+ version = "17.08.3";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.3/src/zeroconf-ioslave-17.04.3.tar.xz";
- sha256 = "04k2mc2kl3raiirpfq150zdxb4w86cg5m70xcw711qddw1fv0g3y";
- name = "zeroconf-ioslave-17.04.3.tar.xz";
+ url = "${mirror}/stable/applications/17.08.3/src/zeroconf-ioslave-17.08.3.tar.xz";
+ sha256 = "14prm7qjqh4xrgdxzbs8z8a8p2jjf2amcx7r1qx62fkhfbh6gw01";
+ name = "zeroconf-ioslave-17.08.3.tar.xz";
};
};
}
diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix
index 50af18ca1fca8c918f9af2dedfa94ae96e671a8c..153e29a56144e4725347edcb852b7aa56c3d4689 100644
--- a/pkgs/applications/misc/alacritty/default.nix
+++ b/pkgs/applications/misc/alacritty/default.nix
@@ -1,5 +1,5 @@
{ stdenv,
- fetchFromGitHub,
+ fetchgit,
rustPlatform,
cmake,
makeWrapper,
@@ -29,16 +29,19 @@ let
in
buildRustPackage rec {
- name = "alacritty-unstable-2017-07-25";
+ name = "alacritty-unstable-${version}";
+ version = "2017-10-31";
- src = fetchFromGitHub {
- owner = "jwilm";
- repo = "alacritty";
- rev = "49c73f6d55e5a681a0e0f836cd3e9fe6af30788f";
- sha256 = "0h5hrb2g0fpc6xn94hmvxjj21cqbj4vgqkznvd64jl84qbyh1xjl";
+ # At the moment we cannot handle git dependencies in buildRustPackage.
+ # This fork only replaces rust-fontconfig/libfontconfig with a git submodules.
+ src = fetchgit {
+ url = https://github.com/Mic92/alacritty.git;
+ rev = "rev-${version}";
+ sha256 = "1yybx23smwdkzb6byvxd6zxi7asmrzvp9h1ihmy6xlzwjfbsalj0";
+ fetchSubmodules = true;
};
- depsSha256 = "1pbb0swgpsbd6x3avxz6fv3q31dg801li47jibz721a4n9c0rssx";
+ cargoSha256 = "14bmm1f7hqh8i4mpb6ljh7szrm4g6mplzpq9zbgjrgxnc01w3s0i";
buildInputs = [
cmake
@@ -46,17 +49,20 @@ buildRustPackage rec {
pkgconfig
] ++ rpathLibs;
- patchPhase = ''
+ postPatch = ''
substituteInPlace copypasta/src/x11.rs \
--replace Command::new\(\"xclip\"\) Command::new\(\"${xclip}/bin/xclip\"\)
'';
installPhase = ''
- mkdir -p $out/bin
- for f in $(find target/release -maxdepth 1 -type f); do
- cp $f $out/bin
- done;
+ runHook preInstall
+
+ install -D target/release/alacritty $out/bin/alacritty
patchelf --set-rpath "${stdenv.lib.makeLibraryPath rpathLibs}" $out/bin/alacritty
+
+ install -D Alacritty.desktop $out/share/applications/alacritty.desktop
+
+ runHook postInstall
'';
dontPatchELF = true;
diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix
index dd4858cfe2add606a5d979e1618d61f86740fe41..5abd8953a4439ea93e7cacfea89ea59ce44a2442 100644
--- a/pkgs/applications/misc/albert/default.nix
+++ b/pkgs/applications/misc/albert/default.nix
@@ -1,25 +1,30 @@
-{ mkDerivation, lib, fetchFromGitHub, makeWrapper, qtbase, qtsvg, qtx11extras, muparser, cmake }:
+{ mkDerivation, lib, fetchFromGitHub, makeWrapper, qtbase, qtdeclarative, qtsvg, qtx11extras, muparser,
+ cmake, python3 }:
mkDerivation rec {
name = "albert-${version}";
- version = "0.12.0";
+ version = "0.14.7";
src = fetchFromGitHub {
owner = "albertlauncher";
repo = "albert";
rev = "v${version}";
- sha256 = "120l7hli2l4qj2s126nawc4dsy4qvwvb0svc42hijry4l8imdhkq";
+ sha256 = "1ryjrbrbgignhkvsv4021l4am8ml7g8v4bs5cp5jj288k4p2rf4n";
+ fetchSubmodules = true;
};
nativeBuildInputs = [ cmake makeWrapper ];
- buildInputs = [ qtbase qtsvg qtx11extras muparser ];
+ buildInputs = [ qtbase qtdeclarative qtsvg qtx11extras muparser python3 ];
enableParallelBuilding = true;
+ # We don't have virtualbox sdk so disable plugin
+ cmakeFlags = [ "-DBUILD_VIRTUALBOX=OFF" "-DCMAKE_INSTALL_LIBDIR=libs" ];
+
postPatch = ''
- sed -i "/QStringList dirs = {/a \"$out/lib\"," \
- src/lib/albert/src/albert/extensionmanager.cpp
+ sed -i "/QStringList dirs = {/a \"$out/libs\"," \
+ lib/albertcore/src/core/albert.cpp
'';
preBuild = ''
diff --git a/pkgs/applications/misc/apvlv/default.nix b/pkgs/applications/misc/apvlv/default.nix
index 350a64ba3e41273fb20d4e4ec82ef98ef1212356..f1d84a91972436639685a7f56eb81d0e21a91081 100644
--- a/pkgs/applications/misc/apvlv/default.nix
+++ b/pkgs/applications/misc/apvlv/default.nix
@@ -15,17 +15,18 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-I${poppler.dev}/include/poppler";
+ nativeBuildInputs = [
+ pkgconfig
+ wrapGAppsHook
+ ];
+
buildInputs = [
- pkgconfig cmake
+ cmake
poppler pcre libxkbcommon epoxy
freetype gtk3
libpthreadstubs libXdmcp libxshmfence # otherwise warnings in compilation
];
- nativeBuildInputs = [
- wrapGAppsHook
- ];
-
patches = [
(fetchpatch {
url = "https://github.com/naihe2010/apvlv/commit/d432635b9c5ea6c052a2ae1fb71aedec5c4ad57a.patch";
diff --git a/pkgs/applications/misc/artha/default.nix b/pkgs/applications/misc/artha/default.nix
index 3294d18e70b86ac35f96d4e21f6cf90a4c9faf8a..cfd4d6b32de35c5e13c144e0eabc76e4ee5126fe 100644
--- a/pkgs/applications/misc/artha/default.nix
+++ b/pkgs/applications/misc/artha/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0qr4ihl7ma3cq82xi1fpzvf74mm9vsg0j035xvmcp3r6rmw2fycx";
};
- buildInputs = [ dbus_glib gtk2 pkgconfig wordnet ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ dbus_glib gtk2 wordnet ];
meta = with stdenv.lib; {
description = "An offline thesaurus based on WordNet";
diff --git a/pkgs/applications/misc/avrdudess/default.nix b/pkgs/applications/misc/avrdudess/default.nix
index 6cc6cc5d9b935c5c801b346237f80ef9aab16579..c803eb37ad6f655c2ec3084c5bc914de8cb44f22 100644
--- a/pkgs/applications/misc/avrdudess/default.nix
+++ b/pkgs/applications/misc/avrdudess/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, mono, avrgcclibc, avrdude, gtk2, xdg_utils }:
+{ stdenv, fetchurl, unzip, mono, avrbinutils, avrgcc, avrdude, gtk2, xdg_utils }:
stdenv.mkDerivation rec {
name = "avrdudess-2.2.20140102";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
export LD_LIBRARY_PATH="${stdenv.lib.makeLibraryPath [gtk2 mono]}"
# We need PATH from user env for xdg-open to find its tools, which
# typically depend on the currently running desktop environment.
- export PATH="${stdenv.lib.makeBinPath [ avrgcclibc avrdude xdg_utils ]}:\$PATH"
+ export PATH="${stdenv.lib.makeBinPath [ avrgcc avrbinutils avrdude xdg_utils ]}:\$PATH"
# avrdudess must have its resource files in its current working directory
cd $out/avrdudess && exec ${mono}/bin/mono "$out/avrdudess/avrdudess.exe" "\$@"
diff --git a/pkgs/applications/misc/bb/default.nix b/pkgs/applications/misc/bb/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..71196e919915c639d4b6902d11941c5c7188c14c
--- /dev/null
+++ b/pkgs/applications/misc/bb/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, aalib, ncurses, xorg, libmikmod }:
+
+stdenv.mkDerivation rec {
+ name = "bb-${version}";
+ version = "1.3rc1";
+
+ src = fetchurl {
+ url = "mirror://sourceforge/aa-project/bb/${version}/${name}.tar.gz";
+ sha256 = "1i411glxh7g4pfg4gw826lpwngi89yrbmxac8jmnsfvrfb48hgbr";
+ };
+
+ buildInputs = [
+ aalib ncurses libmikmod
+ xorg.libXau xorg.libXdmcp xorg.libX11
+ ];
+
+ meta = with stdenv.lib; {
+ homepage = http://aa-project.sourceforge.net/bb;
+ description = "AA-lib demo";
+ license = licenses.gpl2;
+ maintainers = maintainers.rnhmjoj;
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/applications/misc/bitcoinarmory/default.nix b/pkgs/applications/misc/bitcoinarmory/default.nix
index 78ac55088a4c2e60d7bfedd546909420683b0830..a9d32d4b2522d15650b28ba215c11fa9ce4a67bb 100644
--- a/pkgs/applications/misc/bitcoinarmory/default.nix
+++ b/pkgs/applications/misc/bitcoinarmory/default.nix
@@ -7,9 +7,9 @@ let
version = "0.96.1";
sitePackages = pythonPackages.python.sitePackages;
- inherit (pythonPackages) mkPythonDerivation pyqt4 psutil twisted;
+ inherit (pythonPackages) buildPythonApplication pyqt4 psutil twisted;
-in mkPythonDerivation {
+in buildPythonApplication {
name = "bitcoinarmory-${version}";
@@ -21,11 +21,13 @@ in mkPythonDerivation {
sha256 = "0pjk5qx16n3kvs9py62666qkwp2awkgd87by4karbj7vk6p1l14h"; fetchSubmodules = true;
};
+ format = "other";
+
# FIXME bitcoind doesn't die on shutdown. Need some sort of patch to fix that.
#patches = [ ./shutdown-fix.patch ];
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig
autoreconfHook
swig
qt4
diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index b831924d9cdfabe699a0de29614321e6473e97a2..b348f253b3503e29c8b47eb9d602c1ce76171374 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -11,11 +11,11 @@
with lib;
stdenv.mkDerivation rec {
- name = "blender-2.78c";
+ name = "blender-2.79";
src = fetchurl {
url = "http://download.blender.org/source/${name}.tar.gz";
- sha256 = "0f6k3m9yd5yhn7fq9srgzwh2gachlxm03bdrvn2r7xq00grqzab4";
+ sha256 = "16f84mdzkmwjmqahjj64kbyk4kagdj4mcr8qjazs1952d7kh7pm9";
};
buildInputs =
@@ -57,14 +57,17 @@ stdenv.mkDerivation rec {
++ optional jackaudioSupport "-DWITH_JACK=ON"
++ optionals cudaSupport
[ "-DWITH_CYCLES_CUDA_BINARIES=ON"
- # Disable the sm_20 architecture to work around a segfault in
- # ptxas, as suggested on #blendercoders.
- "-DCYCLES_CUDA_BINARIES_ARCH=sm_21;sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61"
+ # Disable architectures before sm_30 to support new CUDA toolkits.
+ "-DCYCLES_CUDA_BINARIES_ARCH=sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61"
]
++ optional colladaSupport "-DWITH_OPENCOLLADA=ON";
NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR -I${python}/include/${python.libPrefix}m";
+ # Since some dependencies are built with gcc 6, we need gcc 6's
+ # libstdc++ in our RPATH. Sigh.
+ NIX_LDFLAGS = optionalString cudaSupport "-rpath ${stdenv.cc.cc.lib}/lib";
+
enableParallelBuilding = true;
meta = with stdenv.lib; {
diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix
index ea3ca107d24d6fdb47dbf52ba943e25bfa65b9ec..8aa191c0f3c25f78871ec89bc30031432733510e 100644
--- a/pkgs/applications/misc/buku/default.nix
+++ b/pkgs/applications/misc/buku/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, pythonPackages, fetchFromGitHub }:
+{ stdenv, python3, fetchFromGitHub }:
-with pythonPackages; buildPythonApplication rec {
- version = "3.0"; # When updating to 3.1, make sure to remove the marked line in preCheck
+with python3.pkgs; buildPythonApplication rec {
+ version = "3.4";
name = "buku-${version}";
src = fetchFromGitHub {
owner = "jarun";
repo = "buku";
rev = "v${version}";
- sha256 = "1a33x3197vi5s8rq5fvhy021jdlsc8ww8zc4kysss6r9mvdlk7ax";
+ sha256 = "0v0wvsxw78g6yl606if25k1adghr5764chwy1kl7dsxvchqwvmg0";
};
nativeBuildInputs = [
@@ -16,6 +16,8 @@ with pythonPackages; buildPythonApplication rec {
pytest-catchlog
hypothesis
pytest
+ pylint
+ flake8
];
propagatedBuildInputs = [
@@ -29,11 +31,6 @@ with pythonPackages; buildPythonApplication rec {
# Fixes two tests for wrong encoding
export PYTHONIOENCODING=utf-8
- ### Remove this for 3.1 ###
- # See https://github.com/jarun/Buku/pull/167 (merged)
- substituteInPlace setup.py \
- --replace "hypothesis==3.7.0" "hypothesis>=3.7.0"
-
# Disables a test which requires internet
substituteInPlace tests/test_bukuDb.py \
--replace "@pytest.mark.slowtest" "@unittest.skip('skipping')"
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 6ca457cc1d3771b55c4cf93d68822c0024c9c09c..d81e9ed4bbef91189679cce1893af68de2739582 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -5,12 +5,12 @@
}:
stdenv.mkDerivation rec {
- version = "3.5.0";
+ version = "3.12.0";
name = "calibre-${version}";
src = fetchurl {
url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz";
- sha256 = "1al0vy11zvlxlrf03i631p6b419hy47pbzmgydswrii4prndj4xv";
+ sha256 = "0l7r5ny9a36yg22fqzz3as6wh1xqpa3hrlx2gy25yp649sbkd9vq";
};
patches = [
diff --git a/pkgs/applications/misc/cataract/build.nix b/pkgs/applications/misc/cataract/build.nix
index 05c058f8a83eb4c331c3a4b76e86de80dd4782a4..e48b32a783d729a62a811b404cccda50ffa9dc95 100644
--- a/pkgs/applications/misc/cataract/build.nix
+++ b/pkgs/applications/misc/cataract/build.nix
@@ -19,7 +19,8 @@ stdenv.mkDerivation rec {
inherit sha256 rev;
};
- buildInputs = [ autoreconfHook glib pkgconfig libxml2 exiv2 imagemagick ];
+ nativeBuildInputs = [ autoreconfHook pkgconfig ];
+ buildInputs = [ glib libxml2 exiv2 imagemagick ];
installPhase = ''
mkdir $out/{bin,share} -p
diff --git a/pkgs/applications/misc/cbatticon/default.nix b/pkgs/applications/misc/cbatticon/default.nix
index 1aeb45f1e206db5f268bb8c02c995865badeb5ab..0c71b3ffb0addb9ae2416950e963c9d0a098855b 100644
--- a/pkgs/applications/misc/cbatticon/default.nix
+++ b/pkgs/applications/misc/cbatticon/default.nix
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
name = "cbatticon-${version}";
- version = "1.6.6";
+ version = "1.6.7";
src = fetchFromGitHub {
owner = "valr";
repo = "cbatticon";
rev = version;
- sha256 = "0gphijkjmg5q349ffhnx12dppg6hajkr90n0x5b6s9cad5b4q0kq";
+ sha256 = "0rm1rpq81cxjwd4f11c3ivg5hwsd08qm47vdn16yr1cmm2cw4r2d";
};
makeFlags = "PREFIX=$(out)";
diff --git a/pkgs/applications/misc/cgminer/default.nix b/pkgs/applications/misc/cgminer/default.nix
index d4884bb1709e303ecf8082e307d9d63abb979b9d..acd38d74dca4a4c2ed7fe2b303bd1b2399d3154e 100644
--- a/pkgs/applications/misc/cgminer/default.nix
+++ b/pkgs/applications/misc/cgminer/default.nix
@@ -11,8 +11,9 @@ stdenv.mkDerivation rec {
sha256 = "1xfzx91dpwjj1vmhas3v9ybs0p2i74lrhinijmpav15acfggm9fq";
};
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- autoconf automake pkgconfig libtool curl ncurses amdappsdk amdadlsdk
+ autoconf automake libtool curl ncurses amdappsdk amdadlsdk
xorg.libX11 xorg.libXext xorg.libXinerama jansson
];
configureScript = "./autogen.sh";
diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix
index 93d7717fa5c9b13c9a8b43efdce4d65ba35fdf3a..a46485c5ef732f5972a2ca01f0eb930c4161bff9 100644
--- a/pkgs/applications/misc/cheat/default.nix
+++ b/pkgs/applications/misc/cheat/default.nix
@@ -1,22 +1,24 @@
-{ python3Packages, fetchurl, lib }:
+{ stdenv, python3Packages, fetchurl }:
-python3Packages.buildPythonApplication rec {
- version = "2.2.0";
- name = "cheat-${version}";
+with python3Packages;
+buildPythonApplication rec {
+ name = "${pname}-${version}";
+ pname = "cheat";
+ version = "2.2.1";
propagatedBuildInputs = with python3Packages; [ docopt pygments ];
- src = fetchurl {
- url = "mirror://pypi/c/cheat/${name}.tar.gz";
- sha256 = "16pg1bgyfjvzpm2rbi411ckf3gljg9v1vzd5qhp23g69ch6yr138";
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0w4k1h02p2gjv5wcr1c7r0ynb7v50qajx4hpyxz0ndh96f6x30pl";
};
# no tests available
doCheck = false;
- meta = {
+ meta = with stdenv.lib; {
description = "cheat allows you to create and view interactive cheatsheets on the command-line";
- maintainers = with lib.maintainers; [ mic92 ];
- license = with lib.licenses; [gpl3 mit];
+ maintainers = with maintainers; [ mic92 ];
+ license = with licenses; [gpl3 mit];
homepage = https://github.com/chrisallenlane/cheat;
};
}
diff --git a/pkgs/applications/misc/chirp/default.nix b/pkgs/applications/misc/chirp/default.nix
index 67d37489feb0787a4346f17ed952364a8d6739e0..673ecdc85496e0a28dceb0b748ee425e0fddab08 100644
--- a/pkgs/applications/misc/chirp/default.nix
+++ b/pkgs/applications/misc/chirp/default.nix
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "chirp-daily-${version}";
- version = "20170311";
+ version = "20170714";
src = fetchurl {
url = "http://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${name}.tar.gz";
- sha256 = "0mvj650vm3bfk94b174gl99fj4jigrx38f1iciz1cp3gn8hcrcpj";
+ sha256 = "1pglsmc0pf50w7df4vv30z5hmdxy4aqjl3qrv8kfiax7rld21gcy";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/misc/cli-visualizer/default.nix b/pkgs/applications/misc/cli-visualizer/default.nix
index 860a1d186f713152ab1073ff1f2409479242947d..8b24df1bee92775b0c21591e7ba5a5c54e209f50 100644
--- a/pkgs/applications/misc/cli-visualizer/default.nix
+++ b/pkgs/applications/misc/cli-visualizer/default.nix
@@ -1,27 +1,29 @@
-{ stdenv, fetchFromGitHub, fftw, ncurses, libpulseaudio }:
+{ stdenv, fetchFromGitHub, fftw, ncurses5, libpulseaudio, makeWrapper }:
stdenv.mkDerivation rec {
- version = "1.5";
+ version = "1.6";
name = "cli-visualizer-${version}";
src = fetchFromGitHub {
owner = "dpayne";
repo = "cli-visualizer";
rev = version;
- sha256 = "18qv4ya64qmczq94dnynrnzn7pwhmzbn14r05qcvbbwv7r8gclzs";
+ sha256 = "0mirp8bk398di5xyq95iprmdyvplfghxqmrfj7jdnpy554vx7ppc";
};
postPatch = ''
sed '1i#include ' -i src/Transformer/SpectrumCircleTransformer.cpp
'';
- buildInputs = [ fftw ncurses libpulseaudio ];
+ buildInputs = [ fftw ncurses5 libpulseaudio makeWrapper ];
buildFlags = [ "ENABLE_PULSE=1" ];
installPhase = ''
mkdir -p $out/bin
cp build/vis $out/bin/vis
+ # See https://github.com/dpayne/cli-visualizer/issues/62#issuecomment-330738075
+ wrapProgram $out/bin/vis --set TERM rxvt-256color
'';
meta = {
diff --git a/pkgs/applications/misc/clipit/default.nix b/pkgs/applications/misc/clipit/default.nix
index 06ebaa7c12dd9301bad4e690755d1c71ff2a8f2b..d9ea487a83bb6974caf3269ce028162848f9256c 100644
--- a/pkgs/applications/misc/clipit/default.nix
+++ b/pkgs/applications/misc/clipit/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0jrwn8qfgb15rwspdp1p8hb1nc0ngmpvgr87d4k3lhlvqg2cfqva";
};
- buildInputs = [ intltool pkgconfig gtk2 xdotool hicolor_icon_theme ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ intltool gtk2 xdotool hicolor_icon_theme ];
meta = with stdenv.lib; {
description = "Lightweight GTK+ Clipboard Manager";
diff --git a/pkgs/applications/misc/cmatrix/default.nix b/pkgs/applications/misc/cmatrix/default.nix
index c7a76ef00a6a7595ad4a2148af1a02f33759bc10..28f14cc1435f3284bbfe6c03d9d9c4957ea385ef 100644
--- a/pkgs/applications/misc/cmatrix/default.nix
+++ b/pkgs/applications/misc/cmatrix/default.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
sha256 = "0k06fw2n8nzp1pcdynhajp5prba03gfgsbj91bknyjr5xb5fd9hz";
};
- buildInputs = [ pkgconfig ncurses ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ ncurses ];
meta = {
description = "Simulates the falling characters theme from The Matrix movie";
diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix
index 7461f6853f47f5734d0b855945ba8ad120767692..37afea2bb6f600a2ea2781924dbb246b3a7a1f15 100644
--- a/pkgs/applications/misc/copyq/default.nix
+++ b/pkgs/applications/misc/copyq/default.nix
@@ -1,19 +1,23 @@
-{ stdenv, fetchFromGitHub, cmake, qt4, libXfixes, libXtst}:
+{ stdenv, fetchFromGitHub, cmake, qtbase, qtscript, qtwebkit, libXfixes, libXtst, git
+, webkitSupport ? true
+}:
stdenv.mkDerivation rec {
name = "CopyQ-${version}";
- version = "2.9.0";
+ version = "3.1.2";
src = fetchFromGitHub {
owner = "hluk";
repo = "CopyQ";
rev = "v${version}";
- sha256 = "1gnqsfh50w3qcnbghkpjr5qs42fgl6643lmg4mg4wam8a852s64f";
+ sha256 = "0gdx1bqqqr4fk6wcrxqm9li6z48j1w84wjwyjpzp2cjzg96bp6bl";
};
nativeBuildInputs = [ cmake ];
-
- buildInputs = [ qt4 libXfixes libXtst ];
+
+ buildInputs = [
+ git qtbase qtscript libXfixes libXtst
+ ] ++ stdenv.lib.optional webkitSupport qtwebkit;
meta = with stdenv.lib; {
homepage = https://hluk.github.io/CopyQ;
diff --git a/pkgs/applications/misc/ctodo/default.nix b/pkgs/applications/misc/ctodo/default.nix
index fefa45760d5c449f145dd3cd4439cf9d4bf70e48..0123e0c38d74a6f493deedc137cbf73b6f0899fd 100644
--- a/pkgs/applications/misc/ctodo/default.nix
+++ b/pkgs/applications/misc/ctodo/default.nix
@@ -1,17 +1,15 @@
-{ stdenv, cmake, fetchurl, ncurses }:
+{ stdenv, cmake, fetchurl, ncurses, readline }:
-let
- version = "1.2";
-in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
name = "ctodo-${version}";
+ version = "1.3";
src = fetchurl {
url = "https://github.com/Acolarh/ctodo/archive/v${version}.tar.gz";
- sha256 = "0kjd84q8aw238z09yz9n1p732fh08vijaf8bk1xqlx544cgyfcjm";
+ sha256 = "1k3raigcgpwa0h8zkv5x9rycnn2iqkb9qim4q9ydqy9wbv3m32jb";
};
- buildInputs = [ stdenv cmake ncurses ];
+ buildInputs = [ stdenv cmake ncurses readline ];
configurePhase = ''
cmake -DCMAKE_INSTALL_PREFIX=$out .
diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix
index 3fb669072955cd9b11a2a9a7212d924c624284a1..1012f187497ac19b82032b06ea6fd5fd60d0c4ea 100644
--- a/pkgs/applications/misc/cura/default.nix
+++ b/pkgs/applications/misc/cura/default.nix
@@ -1,18 +1,18 @@
-{ mkDerivation, lib, fetchFromGitHub, cmake, python3, qtbase, curaengine }:
+{ mkDerivation, lib, fetchFromGitHub, cmake, python3, qtbase, qtquickcontrols, curaengine }:
mkDerivation rec {
name = "cura-${version}";
- version = "2.6.1";
+ version = "3.0.3";
src = fetchFromGitHub {
owner = "Ultimaker";
repo = "Cura";
rev = version;
- sha256 = "03rsw6nafg3y9if2dlnzsj6c9x3x7cv6gs4a1w84jaq4p1f8fcsd";
+ sha256 = "0ks8bb3mif6kyvb01ddhpn1c2l31s8fxivi70kmpm743sqv4kjaa";
};
- buildInputs = [ qtbase ];
- propagatedBuildInputs = with python3.pkgs; [ uranium zeroconf pyserial ];
+ buildInputs = [ qtbase qtquickcontrols ];
+ propagatedBuildInputs = with python3.pkgs; [ uranium zeroconf pyserial numpy-stl ];
nativeBuildInputs = [ cmake python3.pkgs.wrapPython ];
cmakeFlags = [ "-DURANIUM_DIR=${python3.pkgs.uranium.src}" ];
@@ -28,7 +28,7 @@ mkDerivation rec {
meta = with lib; {
description = "3D printer / slicing GUI built on top of the Uranium framework";
- homepage = https://github.com/Ultimaker/Cura;
+ homepage = "https://github.com/Ultimaker/Cura";
license = licenses.agpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix
index ce7109dd6fcd4ea185ea09bb00302d4a6dfd7e80..575889ad2c6f031df75c7cff9ecb25e148f7e28b 100644
--- a/pkgs/applications/misc/curaengine/default.nix
+++ b/pkgs/applications/misc/curaengine/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "curaengine-${version}";
- version = "2.6.1";
+ version = "3.0.3";
src = fetchFromGitHub {
owner = "Ultimaker";
repo = "CuraEngine";
rev = version;
- sha256 = "1vixxxpwrprcrma0v5ckjvcy45pj32rkf5pk4w7rans9k2ig66ic";
+ sha256 = "0x1ss3hppw6062rmmxh0dpnm5cg6r2mp01k0nxyw5riiljj59ydy";
};
nativeBuildInputs = [ cmake ];
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A powerful, fast and robust engine for processing 3D models into 3D printing instruction";
- homepage = https://github.com/Ultimaker/CuraEngine;
+ homepage = "https://github.com/Ultimaker/CuraEngine";
license = licenses.agpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/applications/misc/deepin-terminal/default.nix b/pkgs/applications/misc/deepin-terminal/default.nix
index 1e024a16e81c000ec4e04965da3d3129f411c814..0ee52b740f2476c68aa6d922e9120bbdbeb6bc3b 100644
--- a/pkgs/applications/misc/deepin-terminal/default.nix
+++ b/pkgs/applications/misc/deepin-terminal/default.nix
@@ -14,7 +14,8 @@ stdenv.mkDerivation rec {
patchPhase = ''
substituteInPlace project_path.c --replace __FILE__ \"$out/share/deepin-terminal/\"
'';
- buildInputs = [ unzip gtk3 pkgconfig vala cmake vte gee wnck gettext libsecret json_glib ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ unzip gtk3 vala cmake vte gee wnck gettext libsecret json_glib ];
meta = {
description = "The default terminal emulation for Deepin";
diff --git a/pkgs/applications/misc/direwolf/default.nix b/pkgs/applications/misc/direwolf/default.nix
index d4c8b1ada6c359ec1446acc15a3d4cef7371f3bd..f1e33ea53571faee25764af26e714374f37f2fe3 100644
--- a/pkgs/applications/misc/direwolf/default.nix
+++ b/pkgs/applications/misc/direwolf/default.nix
@@ -6,35 +6,36 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "direwolf-${version}";
- version = "1.3";
+ version = "1.4";
src = fetchFromGitHub {
owner = "wb2osz";
repo = "direwolf";
rev = version;
- sha256 = "1x6vvl3fy70ic5pqvqsyr0bkqwim8m9jaqnm5ls8z8i66rwq23fg";
+ sha256 = "033sffjs2dz48077hc58jr4lxxs8md1fyfh4lig6ib7pyigiv1y0";
};
buildInputs = [
espeak perl python
] ++ (optional stdenv.isLinux alsaLib);
- patchPhase = ''
- substituteInPlace Makefile.* \
- --replace /usr/share $out/share
+ postPatch = ''
+ for i in Makefile.*; do
+ substituteInPlace "$i" \
+ --replace /usr/share $out/share
+ done
- substituteInPlace dwespeak.sh \
- --replace espeak ${espeak}/bin/espeak
- '';
+ substituteInPlace dwespeak.sh \
+ --replace espeak ${espeak}/bin/espeak
+ '';
- installPhase = ''
- mkdir -p $out/bin
- make INSTALLDIR=$out install
- '';
+ preInstall = ''
+ mkdir -p $out/bin
+ '';
+ installFlags = [ "INSTALLDIR=$(out)" ];
meta = {
description = "A Soundcard Packet TNC, APRS Digipeater, IGate, APRStt gateway";
- # On the page: This page will be disappearing on October 8, 2015.
homepage = https://github.com/wb2osz/direwolf/;
license = licenses.gpl2;
platforms = platforms.unix;
diff --git a/pkgs/applications/misc/dmenu/wayland.nix b/pkgs/applications/misc/dmenu/wayland.nix
index 9a13da677456d80a8844171710ae5b290907f013..340e8f161647bee40aedf579cf6a6b584abcc76f 100644
--- a/pkgs/applications/misc/dmenu/wayland.nix
+++ b/pkgs/applications/misc/dmenu/wayland.nix
@@ -6,12 +6,12 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "dmenu-wayland-${version}";
- version = "git-2014-11-02";
- rev = "6e08b77428cc3c406ed2e90d4cae6c41df76341e";
+ version = "git-2017-04-07";
+ rev = "f385d9d18813071b4b4257bf8d4d572daeda0e70";
src = fetchurl {
url = "https://github.com/michaelforney/dmenu/archive/${rev}.tar.gz";
- sha256 = "d0f73e442baf44a93a3b9d41a72e9cfa14f54af6049c90549f516722e3f88019";
+ sha256 = "0y1jvh2815c005ns0bsjxsmz82smw22n6jsfg2g03a1pacakp6ys";
};
buildInputs = [ swc wld wayland libxkbcommon pixman fontconfig ];
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
'';
preConfigure = [
- ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g; s@/usr/share/swc@$(echo "$nativeBuildInputs" | grep -o '[^ ]*-swc-[^ ]*')/share/swc@g" config.mk''
+ ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g; s@/usr/share/swc@${swc}/share/swc@g" config.mk''
];
meta = {
diff --git a/pkgs/applications/misc/doomseeker/default.nix b/pkgs/applications/misc/doomseeker/default.nix
index 61b0357bb9d0a9cb3ab662db2bebdc2665bb1585..1393af67bf8c539f0225493cf6fe9660d7de03fb 100644
--- a/pkgs/applications/misc/doomseeker/default.nix
+++ b/pkgs/applications/misc/doomseeker/default.nix
@@ -1,11 +1,11 @@
{ stdenv, cmake, fetchurl, pkgconfig, qt4, zlib, bzip2 }:
stdenv.mkDerivation rec {
- name = "doomseeker-1.0";
+ name = "doomseeker-1.1";
src = fetchurl {
url = "http://doomseeker.drdteam.org/files/${name}_src.tar.bz2";
- sha256 = "172ybxg720r64hp6aah0hqvxklqv1cf8v7kwx0ng5ap0h20jydbw";
+ sha256 = "0nmq8s842z30ngzikrmfx0xpnk4klxdv37y26chs002rnj010r7h";
};
buildInputs = [ qt4 zlib bzip2 ];
diff --git a/pkgs/applications/misc/dotfiles/default.nix b/pkgs/applications/misc/dotfiles/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..1d3c405b7038e953088437ac8a53130ed50ffb37
--- /dev/null
+++ b/pkgs/applications/misc/dotfiles/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, pythonPackages }:
+
+pythonPackages.buildPythonApplication rec {
+ pname = "dotfiles";
+ name = "${pname}-${version}";
+ version = "0.6.4";
+
+ src = pythonPackages.fetchPypi {
+ inherit version pname;
+ sha256 = "03qis6m9r2qh00sqbgwsm883s4bj1ibwpgk86yh4l235mdw8jywv";
+ };
+
+ # No tests in archive
+ doCheck = false;
+
+ checkInputs = with pythonPackages; [ pytest ];
+ propagatedBuildInputs = with pythonPackages; [ click ];
+
+ meta = with stdenv.lib; {
+ description = "Easily manage your dotfiles";
+ homepage = https://github.com/jbernard/dotfiles;
+ license = licenses.isc;
+ };
+}
diff --git a/pkgs/applications/misc/dump1090/default.nix b/pkgs/applications/misc/dump1090/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..3e9fe133d93c07a469e25d1f2c7d4bf5eaf5e5a0
--- /dev/null
+++ b/pkgs/applications/misc/dump1090/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchFromGitHub, pkgconfig, libusb, rtl-sdr }:
+
+stdenv.mkDerivation rec {
+ name = "dump1090-${version}";
+ version = "2014-10-31";
+
+ src = fetchFromGitHub {
+ owner = "MalcolmRobb";
+ repo = "dump1090";
+ rev = "bff92c4ad772a0a8d433f788d39dae97e00e4dbe";
+ sha256 = "06aaj9gpz5v4qzvnp8xf18wdfclp0jvn3hflls79ly46gz2dh9hy";
+ };
+
+ nativeBuildInputs = [ pkgconfig ];
+
+ buildInputs = [ libusb rtl-sdr ];
+
+ makeFlags = [ "PREFIX=$out" ];
+
+ installPhase = ''
+ mkdir -p $out/bin $out/share
+ cp -v dump1090 $out/bin/dump1090
+ cp -vr public_html $out/share/dump1090
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A simple Mode S decoder for RTLSDR devices";
+ homepage = https://github.com/MalcolmRobb/dump1090;
+ license = licenses.bsd3;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ earldouglas ];
+ };
+}
diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/applications/misc/eaglemode/default.nix
index 4b81bfd53f500f1d690cb85407059a457e44aaff..d83eb1ed86a746c727b822c9e095443c69cb1d46 100644
--- a/pkgs/applications/misc/eaglemode/default.nix
+++ b/pkgs/applications/misc/eaglemode/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1a2hzyck95g740qg4p4wd4fjwsmlknh75i9sbx5r5v9pyr4i3m4f";
};
- buildInputs = [ perl libX11 libjpeg libpng libtiff pkgconfig
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ perl libX11 libjpeg libpng libtiff
librsvg glib gtk2 libXxf86vm libXext poppler xineLib ];
# The program tries to dlopen both Xxf86vm and Xext, so we use the
@@ -37,6 +38,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl3;
maintainers = with maintainers; [ viric ];
platforms = platforms.linux;
- hydraPlatforms = [];
+ broken = true;
};
}
diff --git a/pkgs/applications/misc/ebook2cw/configfile.patch b/pkgs/applications/misc/ebook2cw/configfile.patch
new file mode 100644
index 0000000000000000000000000000000000000000..c7aafe5227a53e82b5626e21f32e5610a07eb493
--- /dev/null
+++ b/pkgs/applications/misc/ebook2cw/configfile.patch
@@ -0,0 +1,11 @@
+--- a/ebook2cw.c 2017-11-08 19:52:58.298131348 -0700
++++ b/ebook2cw.c 2017-11-08 19:53:02.588231067 -0700
+@@ -136,7 +136,7 @@
+ char isomap[256][4]; /* by these strings */
+ char utf8map[256][8];
+
+- char configfile[1025];
++ char configfile[2048];
+
+ char id3_author[80],
+ id3_title[80],
diff --git a/pkgs/applications/misc/ebook2cw/default.nix b/pkgs/applications/misc/ebook2cw/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..cce10258cf3bb1ae855766e1e149c753b5037a5e
--- /dev/null
+++ b/pkgs/applications/misc/ebook2cw/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchsvn, lame, libvorbis }:
+
+stdenv.mkDerivation rec {
+
+ name = "ebook2cw-${version}";
+ version = "0.8.2";
+
+ src = fetchsvn {
+ url = "svn://svn.fkurz.net/ebook2cw/tags/${name}";
+ sha256 = "1mvp3nz3k76v757792n9b7fcm5jm3jcwarl1k7cila9fi0c2rsiw";
+ };
+
+ buildInputs = [ lame libvorbis ];
+
+ patches = [ ./configfile.patch ];
+
+ postPatch = ''
+ substituteInPlace Makefile --replace gcc cc
+ '';
+
+ makeFlags = [ "DESTDIR=$(out)" ];
+
+ meta = with stdenv.lib; {
+ description = "Convert ebooks to Morse MP3s/OGGs";
+ homepage = http://fkurz.net/ham/ebook2cw.html;
+ license = licenses.gpl2;
+ platforms = platforms.all;
+ maintainers = with maintainers; [ earldouglas ];
+ };
+
+}
diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..56c1a8168a820262b10a589514bd240df7383f03
--- /dev/null
+++ b/pkgs/applications/misc/electron-cash/default.nix
@@ -0,0 +1,66 @@
+{ stdenv, fetchurl, python2Packages }:
+
+python2Packages.buildPythonApplication rec {
+ version = "2.9.4";
+ name = "electron-cash-${version}";
+
+ src = fetchurl {
+ url = "https://electroncash.org/downloads/${version}/win-linux/Electron-Cash-${version}.tar.gz";
+ # Verified using official SHA-1 and signature from
+ # https://github.com/fyookball/keys-n-hashes
+ sha256 = "1y8mzwa6bb8zj4l92wm4c2icnr42wmhbfz6z5ymh356gwll914vh";
+ };
+
+ propagatedBuildInputs = with python2Packages; [
+ dns
+ ecdsa
+ jsonrpclib
+ pbkdf2
+ pyaes
+ pycrypto
+ pyqt4
+ pysocks
+ qrcode
+ requests
+ tlslite
+
+ # plugins
+ keepkey
+ trezor
+ ];
+
+ preBuild = ''
+ sed -i 's,usr_share = .*,usr_share = "'$out'/share",g' setup.py
+ pyrcc4 icons.qrc -o gui/qt/icons_rc.py
+ # Recording the creation timestamps introduces indeterminism to the build
+ sed -i '/Created: .*/d' gui/qt/icons_rc.py
+ '';
+
+ postInstall = ''
+ # Despite setting usr_share above, these files are installed under
+ # $out/nix ...
+ mv $out/lib/python2.7/site-packages/nix/store"/"*/share $out
+ rm -rf $out/lib/python2.7/site-packages/nix
+
+ substituteInPlace $out/share/applications/electron-cash.desktop \
+ --replace "Exec=electron-cash %u" "Exec=$out/bin/electron-cash %u"
+ '';
+
+ doInstallCheck = true;
+ installCheckPhase = ''
+ $out/bin/electrum help >/dev/null
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A lightweight Bitcoin wallet";
+ longDescription = ''
+ An easy-to-use Bitcoin client featuring wallets generated from
+ mnemonic seeds (in addition to other, more advanced, wallet options)
+ and the ability to perform transactions without downloading a copy
+ of the blockchain.
+ '';
+ homepage = https://www.electroncash.org/;
+ maintainers = with maintainers; [ lassulus ];
+ license = licenses.mit;
+ };
+}
diff --git a/pkgs/applications/misc/electrum-dash/default.nix b/pkgs/applications/misc/electrum-dash/default.nix
index 8752bafbe731c3cb676979e3476c18825db9efec..e7a5a1be1979b52b3edc5cb994ad5cceefcec7cc 100644
--- a/pkgs/applications/misc/electrum-dash/default.nix
+++ b/pkgs/applications/misc/electrum-dash/default.nix
@@ -13,7 +13,7 @@ python2Packages.buildPythonApplication rec {
dns
ecdsa
pbkdf2
- protobuf3_2
+ protobuf
pyasn1
pyasn1-modules
pycrypto
diff --git a/pkgs/applications/misc/electrum-ltc/default.nix b/pkgs/applications/misc/electrum-ltc/default.nix
index 25c96322378916c31b92dc8de285004d4afb2a3c..bb41f8665e57886cd1ddcf55c842073b363a6be7 100644
--- a/pkgs/applications/misc/electrum-ltc/default.nix
+++ b/pkgs/applications/misc/electrum-ltc/default.nix
@@ -20,7 +20,7 @@ python2Packages.buildPythonApplication rec {
requests
qrcode
ltc_scrypt
- protobuf3_2
+ protobuf
dns
jsonrpclib
];
diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index 4aaa5f1ff67d22b84dfa4eb21ca0ceb02a305dbf..abe8d0dde84b081594ccc5ed957c4a769f8fc53d 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -2,19 +2,20 @@
python2Packages.buildPythonApplication rec {
name = "electrum-${version}";
- version = "2.9.0";
+ version = "2.9.3";
src = fetchurl {
url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
- sha256 = "1lida5phq0c1lxnk75d9jsps0vw4zy7saaxhv0q4kv76rk2b3fhv";
+ sha256 = "0d0fzb653g7b8ka3x90nl21md4g3n1fv11czdxpdq3s9yr6js6f2";
};
propagatedBuildInputs = with python2Packages; [
dns
ecdsa
jsonrpclib
+ matplotlib
pbkdf2
- protobuf3_2
+ protobuf
pyaes
pycrypto
pyqt4
@@ -30,7 +31,6 @@ python2Packages.buildPythonApplication rec {
# TODO plugins
# amodem
# btchip
- # matplotlib
];
preBuild = ''
diff --git a/pkgs/applications/misc/et/default.nix b/pkgs/applications/misc/et/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..40631b0a0dbf6fcedc96ec1b70d959de4d64c476
--- /dev/null
+++ b/pkgs/applications/misc/et/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, pkgconfig, libnotify, gdk_pixbuf }:
+
+stdenv.mkDerivation rec {
+ name = "et-${version}";
+ version = "0.1";
+
+ src = fetchFromGitHub {
+ owner = "geistesk";
+ repo = "et";
+ rev = "${version}";
+ sha256 = "1d2hq6p1y2ynk0a3l35lwbm1fcl9kg7rpjcin8bx4xcdpbw42y94";
+ };
+
+ buildInputs = [ libnotify gdk_pixbuf ];
+ nativeBuildInputs = [ pkgconfig ];
+
+ installPhase = ''
+ mkdir -p $out/bin
+ cp et $out/bin
+ cp et-status.sh $out/bin/et-status
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Minimal libnotify-based (egg) timer";
+ homepage = https://github.com/geistesk/et;
+ license = licenses.gpl3;
+ platforms = platforms.unix;
+ maintainers = with maintainers; [ geistesk ];
+ };
+}
diff --git a/pkgs/applications/misc/eterm/default.nix b/pkgs/applications/misc/eterm/default.nix
index 6344f40a291105fb26c47e89663e386e0832c3d7..98b47990314db386f0e568da641d4dbbe0df0b46 100644
--- a/pkgs/applications/misc/eterm/default.nix
+++ b/pkgs/applications/misc/eterm/default.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
sha256 = "0g71szjklkiczxwzbjjfm59y6v9w4hp8mg7cy99z1g7qcjm0gfbj";
};
- buildInputs = [ libX11 libXext libXaw pkgconfig imlib2 ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ libX11 libXext libXaw imlib2 ];
propagatedBuildInputs = [ libast ];
meta = with stdenv.lib; {
diff --git a/pkgs/applications/misc/evtest/default.nix b/pkgs/applications/misc/evtest/default.nix
index 10605b8b18dabe99506b45dd53d6b1b828534c35..73911bab6f66bccc2058b24471ba5dfc3a51dc72 100644
--- a/pkgs/applications/misc/evtest/default.nix
+++ b/pkgs/applications/misc/evtest/default.nix
@@ -3,7 +3,8 @@
stdenv.mkDerivation rec {
name = "evtest-1.33";
- buildInputs = [ autoreconfHook pkgconfig libxml2 ];
+ nativeBuildInputs = [ autoreconfHook pkgconfig ];
+ buildInputs = [ libxml2 ];
src = fetchgit {
url = "git://anongit.freedesktop.org/evtest";
diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix
index 1097780723ec8c8df37c675d65a83831f31824ac..7bd876f1d4aa0312f675e41d9d096af52be6a107 100644
--- a/pkgs/applications/misc/far2l/default.nix
+++ b/pkgs/applications/misc/far2l/default.nix
@@ -1,29 +1,34 @@
{ stdenv, fetchFromGitHub, makeWrapper, cmake, pkgconfig, wxGTK30, glib, pcre, m4, bash,
- xdg_utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick }:
+ xdg_utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick, darwin }:
+with stdenv.lib;
stdenv.mkDerivation rec {
- rev = "de5554dbc0ec69329b75777d4a3b2f01851fc5ed";
- build = "unstable-2017-07-13.git${builtins.substring 0 7 rev}";
+ rev = "1ecd3a37c7b866a4599c547ea332541de2a2af26";
+ build = "unstable-2017-09-30.git${builtins.substring 0 7 rev}";
name = "far2l-2.1.${build}";
src = fetchFromGitHub {
owner = "elfmz";
repo = "far2l";
rev = rev;
- sha256 = "07l8w9p6zxm9qgh9wlci584lgv8gd4aw742jaqh9acgkxy9caih8";
+ sha256 = "0mavg9z1n81b1hbkj320m36r8lpw28j07rl1d2hpg69y768yyq05";
};
nativeBuildInputs = [ cmake pkgconfig m4 makeWrapper imagemagick ];
- buildInputs = [ wxGTK30 glib pcre ];
+ buildInputs = [ wxGTK30 glib pcre ]
+ ++ optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa;
patches = [ ./add-nix-syntax-highlighting.patch ];
- postPatch = ''
- echo 'echo ${build}' > far2l/bootstrap/scripts/vbuild.sh
-
- substituteInPlace far2l/bootstrap/open.sh \
+ postPatch = optionalString stdenv.isLinux ''
+ substituteInPlace far2l/bootstrap/open.sh \
--replace 'gvfs-trash' '${gvfs}/bin/gvfs-trash'
+ '' + optionalString stdenv.isDarwin ''
+ substituteInPlace far2l/CMakeLists.txt \
+ --replace "-framework System" -lSystem
+ '' + ''
+ echo 'echo ${build}' > far2l/bootstrap/scripts/vbuild.sh
substituteInPlace far2l/bootstrap/open.sh \
--replace 'xdg-open' '${xdg_utils}/bin/xdg-open'
substituteInPlace far2l/vtcompletor.cpp \
@@ -62,7 +67,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- meta = with stdenv.lib; {
+ meta = {
description = "An orthodox file manager";
homepage = https://github.com/elfmz/far2l;
license = licenses.gpl2;
diff --git a/pkgs/applications/misc/fbreader/default.nix b/pkgs/applications/misc/fbreader/default.nix
index 2b193ef42cd23576e8c1e48f50d792c78c0f35d4..80f76bc27c89509186bc3b922da2e2af62ca24e3 100644
--- a/pkgs/applications/misc/fbreader/default.nix
+++ b/pkgs/applications/misc/fbreader/default.nix
@@ -9,18 +9,21 @@ stdenv.mkDerivation {
sha256 = "1sdq3vvwkq4bkyrvh0p884d66gaddz8hlab3m798ji9ixbak2z1x";
};
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig bzip2 curl expat fribidi libunibreak
+ bzip2 curl expat fribidi libunibreak
qt4 sqlite zlib
];
makeFlags = "INSTALLDIR=$(out)";
+ NIX_CFLAGS_COMPILE = [ "-Wno-error=narrowing" ]; # since gcc-6
+
patchPhase = ''
# don't try to use ccache
substituteInPlace makefiles/arch/desktop.mk \
--replace "CCACHE = " "# CCACHE = "
-
+
substituteInPlace fbreader/desktop/Makefile \
--replace "/usr/share" "$out/share"
'';
diff --git a/pkgs/applications/misc/fehlstart/default.nix b/pkgs/applications/misc/fehlstart/default.nix
index 548679e4b47c403c7a552d50d47f59ce7061b060..db78f2ec92043c3df91f1a927fb7b1ecf87d9231 100644
--- a/pkgs/applications/misc/fehlstart/default.nix
+++ b/pkgs/applications/misc/fehlstart/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation {
};
patches = [ ./use-nix-profiles.patch ];
- buildInputs = [ pkgconfig gtk2 keybinder ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gtk2 keybinder ];
preConfigure = ''
export PREFIX=$out
diff --git a/pkgs/applications/misc/fme/default.nix b/pkgs/applications/misc/fme/default.nix
index 301695885016b15d7dc2b82b38861d3fbcdc03d7..4e786bfb36f858d6cb14744c24feab8fd009ca86 100644
--- a/pkgs/applications/misc/fme/default.nix
+++ b/pkgs/applications/misc/fme/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec{
sha256 = "d1c81a6a38c0faad02943ad65d6d0314bd205c6de841669a2efe43e4c503e63d";
};
- buildInputs = [ pkgconfig autoconf automake gettext fluxbox bc gtkmm2 glibmm libglademm libsigcxx ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ autoconf automake gettext fluxbox bc gtkmm2 glibmm libglademm libsigcxx ];
preConfigure = ''
./autogen.sh
diff --git a/pkgs/applications/misc/garmin-plugin/default.nix b/pkgs/applications/misc/garmin-plugin/default.nix
index db954a254630ca76c6b9da8e6e7556abcf4a1f75..b97b079ab663d84ca95deb77529a545b12e3b696 100644
--- a/pkgs/applications/misc/garmin-plugin/default.nix
+++ b/pkgs/applications/misc/garmin-plugin/default.nix
@@ -6,7 +6,8 @@ stdenv.mkDerivation {
sha256 = "15gads1fj4sj970m5960dgnhys41ksi4cm53ldkf67wn8dc9i4k0";
};
sourceRoot = "GarminPlugin-0.3.26/src";
- buildInputs = [ garmintools libusb libgcrypt pkgconfig tinyxml zlib ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ garmintools libusb libgcrypt tinyxml zlib ];
configureFlags = [
"--with-libgcrypt-prefix=${libgcrypt.dev}"
"--with-garmintools-incdir=${garmintools}/include"
diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix
index cef8640d958f7a3c65507844d0b3f61489440070..b6bb3c2fd83d40a99d3fdd4d836b1e73107e8908 100644
--- a/pkgs/applications/misc/girara/default.nix
+++ b/pkgs/applications/misc/girara/default.nix
@@ -18,7 +18,8 @@ stdenv.mkDerivation rec {
--replace 'ifdef TPUT_AVAILABLE' 'ifneq ($(TPUT_AVAILABLE), 0)'
'';
- buildInputs = [ pkgconfig gtk gettext libintlOrEmpty ]
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gtk gettext libintlOrEmpty ]
++ stdenv.lib.optional stdenv.isDarwin libiconv;
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
diff --git a/pkgs/applications/misc/gmrun/default.nix b/pkgs/applications/misc/gmrun/default.nix
index 3be2704896ed25a6075d39cc531a72896336e0f5..053da375ab152a82301d2e1cf3a2182796947d31 100644
--- a/pkgs/applications/misc/gmrun/default.nix
+++ b/pkgs/applications/misc/gmrun/default.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
sha256 = "180z6hbax1qypy5cyy2z6nn7fzxla4ib47ck8mqwr714ag77na8p";
};
- buildInputs = [ glib gtk2 pkgconfig popt ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ glib gtk2 popt ];
doCheck = true;
diff --git a/pkgs/applications/misc/gnuradio-ais/default.nix b/pkgs/applications/misc/gnuradio-ais/default.nix
index eda95bc0c5e78521275883f6a61f916f8ff90ab7..a67a8a44fcedbc85d4d730e55de52b85d635a135 100644
--- a/pkgs/applications/misc/gnuradio-ais/default.nix
+++ b/pkgs/applications/misc/gnuradio-ais/default.nix
@@ -16,8 +16,9 @@ stdenv.mkDerivation rec {
sha256 = "1vl3kk8xr2mh5lf31zdld7yzmwywqffffah8iblxdzblgsdwxfl6";
};
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- cmake pkgconfig boost gnuradio makeWrapper cppunit gnuradio-osmosdr
+ cmake boost gnuradio makeWrapper cppunit gnuradio-osmosdr
] ++ stdenv.lib.optionals pythonSupport [ python swig ];
postInstall = ''
diff --git a/pkgs/applications/misc/gnuradio-gsm/default.nix b/pkgs/applications/misc/gnuradio-gsm/default.nix
index a47925cab90dc2e01849d7602534f132b28291d9..bbdc74510eaa8c1c95e00c87e0d381b9421617ff 100644
--- a/pkgs/applications/misc/gnuradio-gsm/default.nix
+++ b/pkgs/applications/misc/gnuradio-gsm/default.nix
@@ -16,8 +16,9 @@ stdenv.mkDerivation rec {
sha256 = "13nnq927kpf91iqccr8db9ripy5czjl5jiyivizn6bia0bam2pvx";
};
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- cmake pkgconfig boost gnuradio makeWrapper cppunit libosmocore gnuradio-osmosdr
+ cmake boost gnuradio makeWrapper cppunit libosmocore gnuradio-osmosdr
] ++ stdenv.lib.optionals pythonSupport [ python swig ];
postInstall = ''
diff --git a/pkgs/applications/misc/gnuradio-nacl/default.nix b/pkgs/applications/misc/gnuradio-nacl/default.nix
index 6298e083617f7443e5cb1e1441405fa92cc60e75..cd3630c842c30c253b789e93d071738d3cba6ef8 100644
--- a/pkgs/applications/misc/gnuradio-nacl/default.nix
+++ b/pkgs/applications/misc/gnuradio-nacl/default.nix
@@ -16,8 +16,9 @@ stdenv.mkDerivation rec {
sha256 = "0q28lgkndcw9921hm6cw5ilxd83n65hjajwl78j50mh6yc3bim35";
};
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- cmake pkgconfig boost gnuradio uhd makeWrapper libsodium cppunit
+ cmake boost gnuradio uhd makeWrapper libsodium cppunit
] ++ stdenv.lib.optionals pythonSupport [ python swig ];
postInstall = ''
diff --git a/pkgs/applications/misc/gnuradio-osmosdr/default.nix b/pkgs/applications/misc/gnuradio-osmosdr/default.nix
index 5fc6eb2c2744aa08ee53c42164c1a2e6d0138ffb..e2d3e808476e75ebe823a03bb7ed5911c0873581 100644
--- a/pkgs/applications/misc/gnuradio-osmosdr/default.nix
+++ b/pkgs/applications/misc/gnuradio-osmosdr/default.nix
@@ -15,8 +15,9 @@ stdenv.mkDerivation rec {
sha256 = "0vyzr4fhkblf2v3d7m0ch5hws4c493jw3ydl4y6b2dfbfzchhsz8";
};
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- cmake pkgconfig boost gnuradio rtl-sdr uhd makeWrapper hackrf
+ cmake boost gnuradio rtl-sdr uhd makeWrapper hackrf
] ++ stdenv.lib.optionals pythonSupport [ python swig ];
postInstall = ''
diff --git a/pkgs/applications/misc/gnuradio-rds/default.nix b/pkgs/applications/misc/gnuradio-rds/default.nix
index 5e729a75557ed8b51574b9cd1cd3992c5e9aaebd..3d09441a7f0359d188641c620d0943156a7aed82 100644
--- a/pkgs/applications/misc/gnuradio-rds/default.nix
+++ b/pkgs/applications/misc/gnuradio-rds/default.nix
@@ -15,8 +15,9 @@ stdenv.mkDerivation rec {
sha256 = "008284ya464q4h4fd0zvcn6g7bym231p8fl3kdxncz9ks4zsbsxs";
};
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- cmake pkgconfig boost gnuradio makeWrapper
+ cmake boost gnuradio makeWrapper
] ++ stdenv.lib.optionals pythonSupport [ python swig ];
postInstall = ''
diff --git a/pkgs/applications/misc/gnuradio/default.nix b/pkgs/applications/misc/gnuradio/default.nix
index e10cb30d1874d93849af0e0ad6523758cd9b4495..0156122ec79a54b98fb7439d3ef0d7c43d84953f 100644
--- a/pkgs/applications/misc/gnuradio/default.nix
+++ b/pkgs/applications/misc/gnuradio/default.nix
@@ -30,8 +30,9 @@ stdenv.mkDerivation rec {
sha256 = "1m2jf8lafr6pr2dlm40nbvr6az8gwjfkzpbs4fxzv3l5hcqvmnc7";
};
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- cmake pkgconfig git boost cppunit fftw python swig2 orc lxml qt4
+ cmake git boost cppunit fftw python swig2 orc lxml qt4
qwt alsaLib SDL libusb1 uhd gsl makeWrapper
];
@@ -41,8 +42,14 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
+ postPatch = ''
+ substituteInPlace \
+ gr-fec/include/gnuradio/fec/polar_decoder_common.h \
+ --replace BOOST_CONSTEXPR_OR_CONST const
+ '';
+
preConfigure = ''
- export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-unused-variable"
+ export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-unused-variable -std=c++11"
'';
# - Ensure we get an interactive backend for matplotlib. If not the gr_plot_*
diff --git a/pkgs/applications/misc/goldendict/default.nix b/pkgs/applications/misc/goldendict/default.nix
index 278c685b7cf7bb1d72b161a4435b70f423048e80..f552a74f4c11798b51f6f0827b34f507b7b324f5 100644
--- a/pkgs/applications/misc/goldendict/default.nix
+++ b/pkgs/applications/misc/goldendict/default.nix
@@ -9,13 +9,12 @@ stdenv.mkDerivation rec {
sha256 = "1pizz39l61rbps0wby75fkvzyrah805257j33siqybwhsfiy1kmw";
};
+ nativeBuildInputs = [ pkgconfig qmake ];
buildInputs = [
- pkgconfig qtbase qtsvg qtwebkit qtx11extras qttools
+ qtbase qtsvg qtwebkit qtx11extras qttools
libXtst libvorbis hunspell libao ffmpeg libeb lzo xz libtiff
];
- nativeBuildInputs = [ qmake ];
-
qmakeFlags = [ "CONFIG+=zim_support" ];
meta = {
diff --git a/pkgs/applications/misc/googler/default.nix b/pkgs/applications/misc/googler/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..026457fb8571ae8a051a560d27ba2e3c82cfa76c
--- /dev/null
+++ b/pkgs/applications/misc/googler/default.nix
@@ -0,0 +1,25 @@
+{stdenv, fetchFromGitHub, python}:
+
+stdenv.mkDerivation rec {
+ version = "3.3";
+ name = "googler-${version}";
+
+ src = fetchFromGitHub {
+ owner = "jarun";
+ repo = "googler";
+ rev = "v${version}";
+ sha256 = "0gkzgcf0qss7fskgswryk835vivlv1f99ym1pbxy3vv9wcwx6a43";
+ };
+
+ propagatedBuildInputs = [ python ];
+
+ makeFlags = "PREFIX=$(out)";
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/jarun/googler;
+ description = "Google Search, Google Site Search, Google News from the terminal";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ koral ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/applications/misc/gosmore/default.nix b/pkgs/applications/misc/gosmore/default.nix
index 5d13c18edc3ebc3e200109cae89f06c203033d02..8936d3f222f38549aecd32fb463d3ee26e61fda1 100644
--- a/pkgs/applications/misc/gosmore/default.nix
+++ b/pkgs/applications/misc/gosmore/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
description = "Open Street Map viewer";
- homepage = http://sourceforge.net/projects/gosmore/;
+ homepage = https://sourceforge.net/projects/gosmore/;
maintainers = with maintainers; [
raskin
];
diff --git a/pkgs/applications/misc/gphoto2/gphotofs.nix b/pkgs/applications/misc/gphoto2/gphotofs.nix
index 230e0ff74142f9d3a0b958f07bb2dafd045c3c13..6fa11667cf333eaa1fb390eee752eabecf5d4067 100644
--- a/pkgs/applications/misc/gphoto2/gphotofs.nix
+++ b/pkgs/applications/misc/gphoto2/gphotofs.nix
@@ -8,8 +8,9 @@ stdenv.mkDerivation rec {
sha256 = "1k23ncbsbh64r7kz050bg31jqamchyswgg9izhzij758d7gc8vk7";
};
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- libgphoto2 fuse pkgconfig glib libtool
+ libgphoto2 fuse glib libtool
];
meta = {
diff --git a/pkgs/applications/misc/gpx-viewer/default.nix b/pkgs/applications/misc/gpx-viewer/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..a7485c4ee6815ca17bb9aa196a2d5331fc52b38f
--- /dev/null
+++ b/pkgs/applications/misc/gpx-viewer/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, intltool, pkgconfig, gnome3, shared_mime_info, desktop_file_utils, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+ name = "gpx-viewer-${version}";
+ version = "0.4.0";
+
+ src = fetchurl {
+ url = "https://launchpad.net/gpx-viewer/trunk/${version}/+download/${name}.tar.gz";
+ sha256 = "956acfaf870ac436300cd9953dece630df7fd7dff8e4ae2577a6002884466f80";
+ };
+
+ patches = fetchurl {
+ url = "https://code.launchpad.net/~chkr/gpx-viewer/gtk3-bugfix/+merge/260766/+preview-diff/628965/+files/preview.diff";
+ sha256 = "1yl7jk7skkcx10nny5zdixswcymjd9s9c1zhm1i5y3aqhchvmfs7";
+ };
+ patchFlags = [ "-p0" ];
+
+ nativeBuildInputs = [
+ intltool pkgconfig
+ shared_mime_info # For update-mime-database
+ desktop_file_utils # For update-desktop-database
+ wrapGAppsHook # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system
+ ];
+ buildInputs = with gnome3; [ gdl libchamplain defaultIconTheme ];
+
+ meta = with stdenv.lib; {
+ homepage = https://blog.sarine.nl/tag/gpxviewer/;
+ description = "Simple tool to visualize tracks and waypoints stored in a gpx file";
+ platforms = with platforms; linux;
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ dotlambda ];
+ };
+}
diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix
index 6da16545aa715456bed863f722f0e9de30535117..00735624ad96732458b497573d4a80b52b447417 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.9";
+ version = "4.14";
src = fetchFromGitHub {
owner = "tumic0";
repo = "GPXSee";
rev = version;
- sha256 = "0jk99yhrms1wzqpcnsjydcl2nysidv639s2j7l53yp60g0zz8174";
+ sha256 = "0yv3hcs5b8a88mp24h8r2sn69phwrahdff5pp74lz24270il3jgb";
};
nativeBuildInputs = [ qmake qttools ];
diff --git a/pkgs/applications/misc/gqrx/default.nix b/pkgs/applications/misc/gqrx/default.nix
index 5ad03c88c64f48857f798b9179125942de4202d7..27bda1e209285761fe23c05e2e2e0e27b42225e2 100644
--- a/pkgs/applications/misc/gqrx/default.nix
+++ b/pkgs/applications/misc/gqrx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qt4, qmake4Hook, gnuradio, boost, gnuradio-osmosdr
+{ stdenv, fetchFromGitHub, cmake, qtbase, qtsvg, gnuradio, boost, gnuradio-osmosdr
# drivers (optional):
, rtl-sdr, hackrf
, pulseaudioSupport ? true, libpulseaudio
@@ -8,29 +8,25 @@ assert pulseaudioSupport -> libpulseaudio != null;
stdenv.mkDerivation rec {
name = "gqrx-${version}";
- version = "2.5.3";
+ version = "2.8";
src = fetchFromGitHub {
owner = "csete";
repo = "gqrx";
rev = "v${version}";
- sha256 = "02pavd1kc0gsnrl18bfa01r2f3j4j05zly4a8zwss9yrsgf8432x";
+ sha256 = "0niy4c05886mhbfmix93j2bnj4kzdh9bvrmymawl6z28glyz5d3c";
};
- nativeBuildInputs = [ qmake4Hook ];
-
+ nativeBuildInputs = [ cmake ];
buildInputs = [
- qt4 gnuradio boost gnuradio-osmosdr rtl-sdr hackrf
+ qtbase qtsvg gnuradio boost gnuradio-osmosdr rtl-sdr hackrf
] ++ stdenv.lib.optionals pulseaudioSupport [ libpulseaudio ];
enableParallelBuilding = true;
postInstall = ''
- mkdir -p "$out/share/applications"
- mkdir -p "$out/share/icons"
-
- cp gqrx.desktop "$out/share/applications/"
- cp resources/icons/gqrx.svg "$out/share/icons/"
+ install -vD $src/gqrx.desktop -t "$out/share/applications/"
+ install -vD $src/resources/icons/gqrx.svg -t "$out/share/icons/"
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix
index 4dcb5be8a21d11413ee0d9b62a5b4661c9fc8d73..8b66b23df01a3993692b264f17fe21551dde7e73 100644
--- a/pkgs/applications/misc/gramps/default.nix
+++ b/pkgs/applications/misc/gramps/default.nix
@@ -1,23 +1,31 @@
-{ stdenv, fetchurl, gtk3, pythonPackages, intltool,
- pango, gsettings_desktop_schemas }:
+{ stdenv, fetchFromGitHub, gtk3, pythonPackages, intltool,
+ pango, gsettings_desktop_schemas,
+# Optional packages:
+ enableOSM ? true, osm-gps-map
+ }:
let
inherit (pythonPackages) python buildPythonApplication;
in buildPythonApplication rec {
- version = "4.1.1";
+ version = "4.2.6";
name = "gramps-${version}";
- buildInputs = [ intltool gtk3 ];
+ buildInputs = [ intltool gtk3 ]
+ # Map support
+ ++ stdenv.lib.optional enableOSM osm-gps-map
+ ;
# Currently broken
doCheck = false;
- src = fetchurl {
- url = "mirror://sourceforge/gramps/Stable/${version}/${name}.tar.gz";
- sha256 = "0jdps7yx2mlma1hdj64wssvnqd824xdvw0bmn2dnal5fn3h7h060";
+ src = fetchFromGitHub {
+ owner = "gramps-project";
+ repo = "gramps";
+ rev = "v${version}";
+ sha256 = "0k0bx6msc2kvkg0nwa9v2mp3qy7lmnxjd97n6a1zdzlq8yzw29f1";
};
- pythonPath = with pythonPackages; [ pygobject3 pycairo ] ++ [ pango ];
+ pythonPath = with pythonPackages; [ bsddb3 PyICU pygobject3 pycairo ] ++ [ pango ];
# Same installPhase as in buildPythonApplication but without --old-and-unmanageble
# install flag.
diff --git a/pkgs/applications/misc/green-pdfviewer/default.nix b/pkgs/applications/misc/green-pdfviewer/default.nix
index 623cb12f9323bbb3c6ecd4f32b56e4882bfced10..00421a2e03341a9e70cd74f94f9c8a21ea44bf2f 100644
--- a/pkgs/applications/misc/green-pdfviewer/default.nix
+++ b/pkgs/applications/misc/green-pdfviewer/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "0d0lv33flhgsxhc77kfp2avdz5gvml04r8l1j95yjz2rr096lzlj";
};
- buildInputs = [ poppler pkgconfig gdk_pixbuf SDL gtk2 ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ poppler gdk_pixbuf SDL gtk2 ];
patches = [
./gdk-libs.patch
diff --git a/pkgs/applications/misc/grip/default.nix b/pkgs/applications/misc/grip/default.nix
index 85d95c7b3f92249605ac72af98bab29c0d253ae3..cb407fca66cbc0f1190b26412844e6bf34750adc 100644
--- a/pkgs/applications/misc/grip/default.nix
+++ b/pkgs/applications/misc/grip/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1zb6zpq7qmn6bflbgfwisyg3vrjr23yi1c1kqvwndl1f0shr8qyl";
};
- buildInputs = [ gtk2 glib pkgconfig libgnome libgnomeui vte curl cdparanoia
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gtk2 glib libgnome libgnomeui vte curl cdparanoia
libid3tag ncurses libtool ];
hardeningDisable = [ "format" ];
diff --git a/pkgs/applications/misc/gsimplecal/default.nix b/pkgs/applications/misc/gsimplecal/default.nix
index 9115fe026daae7a5479181c0f88213b9c2c5d5e9..7f3b3a8d6dc547c92418be09a00ec7c8aff49bb2 100644
--- a/pkgs/applications/misc/gsimplecal/default.nix
+++ b/pkgs/applications/misc/gsimplecal/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- buildInputs = [ pkgconfig automake autoconf gtk3 ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ automake autoconf gtk3 ];
preConfigure = "./autogen.sh";
diff --git a/pkgs/applications/misc/gtk2fontsel/default.nix b/pkgs/applications/misc/gtk2fontsel/default.nix
index ea3f4b8f2b92b9efc12b52da85da383572890cd8..347d76860ef111f72bad89bf543182b81be6d440 100644
--- a/pkgs/applications/misc/gtk2fontsel/default.nix
+++ b/pkgs/applications/misc/gtk2fontsel/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "0s2sj19n8ys92q9832hkn36ld91bb4qavicc6nygkry6qdpkkmjw";
};
- buildInputs = [ stdenv pkgconfig gtk ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ stdenv gtk ];
preferLocalBuild = true;
diff --git a/pkgs/applications/misc/gummi/default.nix b/pkgs/applications/misc/gummi/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..5fdb8985bbbbd39916c355fb783c356e8e76677f
--- /dev/null
+++ b/pkgs/applications/misc/gummi/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchFromGitHub, pkgs, makeWrapper
+, glib, gnome2, gnome3, gtk2-x11, gtkspell2, poppler
+, pkgconfig, intltool, autoreconfHook, wrapGAppsHook
+}:
+
+stdenv.mkDerivation rec {
+ version = "0.6.6";
+ name = "gummi-${version}";
+
+ src = pkgs.fetchFromGitHub {
+ owner = "alexandervdm";
+ repo = "gummi";
+ rev = "${version}";
+ sha256 = "1vw8rhv8qj82l6l22kpysgm9mxilnki2kjmvxsnajbqcagr6s7cn";
+ };
+
+ nativeBuildInputs = [
+ pkgconfig intltool autoreconfHook makeWrapper wrapGAppsHook
+ ];
+ buildInputs = [
+ glib gnome2.gtksourceview gnome2.pango gtk2-x11 gtkspell2 poppler
+ gnome3.defaultIconTheme
+ ];
+
+ preConfigure = ''
+ gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${pkgs.gnome2.gtksourceview}/share")
+ '';
+
+ postInstall = ''
+ install -Dpm644 COPYING $out/share/licenses/$name/COPYING
+ '';
+
+ meta = {
+ homepage = http://gummi.midnightcoding.org/;
+ description = "Simple LaTex editor for GTK users";
+ license = stdenv.lib.licenses.mit;
+ maintainers = with stdenv.lib.maintainers; [ flokli ];
+ platforms = with stdenv.lib.platforms; linux;
+ inherit version;
+ };
+}
diff --git a/pkgs/applications/misc/gxmessage/default.nix b/pkgs/applications/misc/gxmessage/default.nix
index 08ae34f97055485be397f6d0e9bf7b9cd369d209..a61d532f1f8e18080ad9c05234c3328c048ff90c 100644
--- a/pkgs/applications/misc/gxmessage/default.nix
+++ b/pkgs/applications/misc/gxmessage/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "db4e1655fc58f31e5770a17dfca4e6c89028ad8b2c8e043febc87a0beedeef05";
};
- buildInputs = [ intltool gnome3.gtk pkgconfig texinfo ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ intltool gnome3.gtk texinfo ];
meta = {
description = "A GTK enabled dropin replacement for xmessage";
homepage = "http://homepages.ihug.co.nz/~trmusson/programs.html#gxmessage";
diff --git a/pkgs/applications/misc/gxneur/default.nix b/pkgs/applications/misc/gxneur/default.nix
index 1132f6b12f9b1f91d3e63e43d4630504a39f2807..f581b302c3f4213308acca3e9ff4c148f1a375ce 100644
--- a/pkgs/applications/misc/gxneur/default.nix
+++ b/pkgs/applications/misc/gxneur/default.nix
@@ -8,8 +8,9 @@ stdenv.mkDerivation {
sha256 = "f093428a479158247a7ff8424f0aec9af9f7b1d05b191cf30b7c534965a6839f";
};
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- xorg.libX11 pkgconfig glib gtk2 xorg.libXpm xorg.libXt xorg.libXext xneur_0_13
+ xorg.libX11 glib gtk2 xorg.libXpm xorg.libXt xorg.libXext xneur_0_13
libglade GConf pcre
];
diff --git a/pkgs/applications/misc/hackrf/default.nix b/pkgs/applications/misc/hackrf/default.nix
index 1b8257ca5e59840a4caaf6603283d46eb5d26a91..6186ed6f8f4125be0970b393d07c174c4bfbcd15 100644
--- a/pkgs/applications/misc/hackrf/default.nix
+++ b/pkgs/applications/misc/hackrf/default.nix
@@ -10,8 +10,9 @@ stdenv.mkDerivation rec {
sha256 = "16hd61icvzaciv7s9jpgm9c8q6m4mwvj97gxrb20sc65p5gjb7hv";
};
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- cmake pkgconfig libusb fftwSinglePrec
+ cmake libusb fftwSinglePrec
];
cmakeFlags = [ "-DUDEV_RULES_GROUP=plugdev" "-DUDEV_RULES_PATH=lib/udev/rules.d" ];
diff --git a/pkgs/applications/misc/hamster-time-tracker/default.nix b/pkgs/applications/misc/hamster-time-tracker/default.nix
index b8bd514c9ff3bca13a0bc2b828938c2b301f9f0f..51a14fb20d0b0f86b8ae528ce11937d69210609a 100644
--- a/pkgs/applications/misc/hamster-time-tracker/default.nix
+++ b/pkgs/applications/misc/hamster-time-tracker/default.nix
@@ -31,6 +31,10 @@ pythonPackages.buildPythonApplication rec {
python waf build
'';
+ postFixup = ''
+ wrapPythonProgramsIn $out/lib/hamster-time-tracker "$out $pythonPath"
+ '';
+
installPhase = ''
python waf install
'';
diff --git a/pkgs/applications/misc/hello/default.nix b/pkgs/applications/misc/hello/default.nix
index 8a31c591b29bfa054e7cb091753a4157cdac5fdd..c542fbde56eb19524dc1430d8cbee49fbd8132f1 100644
--- a/pkgs/applications/misc/hello/default.nix
+++ b/pkgs/applications/misc/hello/default.nix
@@ -1,11 +1,12 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchipfs, fetchurl }:
stdenv.mkDerivation rec {
name = "hello-2.10";
- src = fetchurl {
- url = "mirror://gnu/hello/${name}.tar.gz";
- sha256 = "0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i";
+ src = fetchipfs {
+ url = "https://ftp.gnu.org/gnu/hello/hello-2.10.tar.gz";
+ ipfs = "QmWyj65ak3wd8kG2EvPCXKd6Tij15m4SwJz6g2yG2rQ7w8";
+ sha256 = "1im1gglfm4k10bh4mdaqzmx3lm3kivnsmxrvl6vyvmfqqzljq75l";
};
doCheck = true;
@@ -21,4 +22,9 @@ stdenv.mkDerivation rec {
maintainers = [ stdenv.lib.maintainers.eelco ];
platforms = stdenv.lib.platforms.all;
};
+
+ passthru.srcTarball = fetchurl {
+ inherit (src) url;
+ sha256 = "0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i";
+ };
}
diff --git a/pkgs/applications/misc/hstr/default.nix b/pkgs/applications/misc/hstr/default.nix
index ba04bd5c39de0ae4ce560804b107e7c06b21ede3..3c4f409d18f18a3c52a7923ace1147b0da4da036 100644
--- a/pkgs/applications/misc/hstr/default.nix
+++ b/pkgs/applications/misc/hstr/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, readline, ncurses }:
let
- version = "1.22";
+ version = "1.23";
in
stdenv.mkDerivation rec {
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://github.com/dvorka/hstr/releases/download/${version}/hh-${version}-src.tgz";
- sha256 = "09rh510x8qc5jbpnfzazbv9wc3bqmf5asydcl2wijpqm5bi21iqp";
+ sha256 = "1hnira256p7sdilx34mnkji7gi2jcl98zz4izqxsqmnzj8ghhzkv";
};
buildInputs = [ readline ncurses ];
diff --git a/pkgs/applications/misc/hubstaff/default.nix b/pkgs/applications/misc/hubstaff/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..91cf494d2574a555b9b2b74d47ee74464e63013b
--- /dev/null
+++ b/pkgs/applications/misc/hubstaff/default.nix
@@ -0,0 +1,64 @@
+{ stdenv, fetchurl, unzip, makeWrapper, libX11, zlib, libSM, libICE, libXext
+, freetype, libXrender, fontconfig, libXft, libXinerama, libnotify, glib
+, gtk3, libappindicator-gtk3, curl }:
+
+let
+
+ version = "1.2.14-36df5e3";
+
+ rpath = stdenv.lib.makeLibraryPath
+ [ libX11 zlib libSM libICE libXext freetype libXrender fontconfig libXft
+ libXinerama stdenv.cc.cc.lib libnotify glib gtk3 libappindicator-gtk3
+ curl ];
+
+in
+
+stdenv.mkDerivation {
+ name = "hubstaff-${version}";
+
+ src = fetchurl {
+ url = "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/${version}/Hubstaff-${version}.sh";
+ sha256 = "0yzhxk9zppj94llnf8naa6ca61f7c8jaj6b1m25zffnnz37m1sdb";
+ };
+
+ nativeBuildInputs = [ unzip makeWrapper ];
+
+ unpackCmd = ''
+ # MojoSetups have a ZIP file at the end. ZIP’s magic string is
+ # most often PK\x03\x04. This *should* work for future updates,
+ # but feel free to come up with something more reasonable.
+ dataZipOffset=$(grep --max-count=1 --byte-offset --only-matching --text $'PK\x03\x04' $curSrc | cut -d: -f1)
+ dd bs=$dataZipOffset skip=1 if=$curSrc of=data.zip 2>/dev/null
+ unzip -q data.zip "data/*"
+ rm data.zip
+ '';
+
+ dontBuild = true;
+
+ installPhase = ''
+ # TODO: handle 32-bit arch?
+ rm -r x86
+
+ opt=$out/opt/hubstaff
+ mkdir -p $out/bin $opt
+ cp -r . $opt/
+
+ prog=$opt/x86_64/HubstaffClient.bin.x86_64
+
+ patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) $prog
+ wrapProgram $prog --prefix LD_LIBRARY_PATH : ${rpath}
+
+ ln -s $prog $out/bin/HubstaffClient
+
+ # Why is this needed? SEGV otherwise.
+ ln -s $opt/data/resources $opt/x86_64/resources
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Time tracking software";
+ homepage = https://hubstaff.com/;
+ license = licenses.unfree;
+ platforms = [ "x86_64-linux" ];
+ maintainers = [ maintainers.michalrus ];
+ };
+}
diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index 2b0be1c9030db726fe010b21e2a486890353bdf3..0dfc725b9ea67ac58d618227c550011975adf1f7 100644
--- a/pkgs/applications/misc/hugo/default.nix
+++ b/pkgs/applications/misc/hugo/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "hugo-${version}";
- version = "0.26";
+ version = "0.29";
goPackagePath = "github.com/gohugoio/hugo";
@@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "gohugoio";
repo = "hugo";
rev = "v${version}";
- sha256 = "1g2brxhc6lyl2qa41lrqw2hadl601inmshsxlpmv99ax67sa19d1";
+ sha256 = "1vklws05534ig9rj55cqnxpqfsvns64kfdg6zjyrcpz7l0z07a33";
};
goDeps = ./deps.nix;
diff --git a/pkgs/applications/misc/hugo/deps.nix b/pkgs/applications/misc/hugo/deps.nix
index 240983b3c716c063746ea03abef6cae77db5a54e..35faf6b5704774b27eeb1d20ffefdbf6caa4b95e 100644
--- a/pkgs/applications/misc/hugo/deps.nix
+++ b/pkgs/applications/misc/hugo/deps.nix
@@ -26,6 +26,15 @@
sha256 = "13r896yy71i6jj1cwv2pjp53wjfxkg7bh884fggv6y79ly0qr63j";
};
}
+ {
+ goPackagePath = "github.com/alecthomas/chroma";
+ fetch = {
+ type = "git";
+ url = "https://github.com/alecthomas/chroma";
+ rev = "b0295f66bdb7c61d54906003d7649185794e21b4";
+ sha256 = "1hnvv13nphbzr9xm21fys7lgm0kd6qlbk58vc8fi802lxzsfmdis";
+ };
+ }
{
goPackagePath = "github.com/bep/gitmap";
fetch = {
@@ -40,8 +49,8 @@
fetch = {
type = "git";
url = "https://github.com/chaseadamsio/goorgeous";
- rev = "677defd0e024333503d8c946dd4ba3f32ad3e5d2";
- sha256 = "1mcncs3qdb62m9xwhkxy743ddvgsjfbmbl2djnhqmz1va05njna1";
+ rev = "098da33fde5f9220736531b3cb26a2dec86a8367";
+ sha256 = "1cwag5vzgrzy22rvcp12whzgqbgrmdmaxar0fl4nwqxdhy90s67k";
};
}
{
@@ -53,6 +62,15 @@
sha256 = "1a87v4cnd5y5whcdkjcqjpg1s5pxqhrspdxrsk2af49zsw9fsj9f";
};
}
+ {
+ goPackagePath = "github.com/danwakefield/fnmatch";
+ fetch = {
+ type = "git";
+ url = "https://github.com/danwakefield/fnmatch";
+ rev = "cbb64ac3d964b81592e64f957ad53df015803288";
+ sha256 = "0cbf511ppsa6hf59mdl7nbyn2b2n71y0bpkzbmfkdqjhanqh1lqz";
+ };
+ }
{
goPackagePath = "github.com/dchest/cssmin";
fetch = {
@@ -62,6 +80,15 @@
sha256 = "09sdijfx5d05z4cd5k6lhl7k3kbpdf2amzlngv15h5v0fff9qw4s";
};
}
+ {
+ goPackagePath = "github.com/dlclark/regexp2";
+ fetch = {
+ type = "git";
+ url = "https://github.com/dlclark/regexp2";
+ rev = "487489b64fb796de2e55f4e8a4ad1e145f80e957";
+ sha256 = "144s81ndviwhyy20ipxvvfvap8phv5p762glxrz6aqxprkxfarj5";
+ };
+ }
{
goPackagePath = "github.com/eknkc/amber";
fetch = {
@@ -206,15 +233,6 @@
sha256 = "0fxjgmwn9927wckl2xx8byv64cxgc0yxdwpfzval5n3wm5l5ij1i";
};
}
- {
- goPackagePath = "github.com/pelletier/go-buffruneio";
- fetch = {
- type = "git";
- url = "https://github.com/pelletier/go-buffruneio";
- rev = "c37440a7cf42ac63b919c752ca73a85067e05992";
- sha256 = "0l83p1gg6g5mmhmxjisrhfimhbm71lwn1r2w7d6siwwqm9q08sd2";
- };
- }
{
goPackagePath = "github.com/pelletier/go-toml";
fetch = {
diff --git a/pkgs/applications/misc/hyper/default.nix b/pkgs/applications/misc/hyper/default.nix
index 2202dd8c4c42de7205a547c7dc8db1d5bb484dec..9349c07a62e9614f065fce38136057f9c6b59045 100644
--- a/pkgs/applications/misc/hyper/default.nix
+++ b/pkgs/applications/misc/hyper/default.nix
@@ -1,21 +1,22 @@
{ stdenv, lib, fetchurl, dpkg, gtk2, atk, glib, pango, gdk_pixbuf, cairo
, freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr
, libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver
+, libxcb
, GConf, nss, nspr, alsaLib, cups, expat, libudev, libpulseaudio }:
let
libPath = stdenv.lib.makeLibraryPath [
stdenv.cc.cc gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
- libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes
+ libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb
libXrender libX11 libXtst libXScrnSaver GConf nss nspr alsaLib cups expat libudev libpulseaudio
];
in
stdenv.mkDerivation rec {
- version = "1.3.3";
+ version = "1.4.8";
name = "hyper-${version}";
src = fetchurl {
- url = "https://github.com/zeit/hyper/releases/download/${version}/hyper_${version}.deb";
- sha256 = "1i68n77yv1g4dfx4xfmcb06mfpwhf0gnb3wmldg2gxkhs0fn19zg";
+ url = "https://github.com/zeit/hyper/releases/download/${version}/hyper_${version}_amd64.deb";
+ sha256 = "0v31z3p5h3qr8likifbq9kk08fpfyf8g1hrz6f6v90z4b2yhkf51";
};
buildInputs = [ dpkg ];
unpackPhase = ''
@@ -36,6 +37,6 @@ stdenv.mkDerivation rec {
homepage = https://hyper.is/;
maintainers = with maintainers; [ puffnfresh ];
license = licenses.mit;
- platforms = [ "i686-linux" "x86_64-linux" ];
+ platforms = [ "x86_64-linux" ];
};
}
diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix
index e27b9dc43eb7b3df6d2eed98d631f1bd98432312..6e4fc2065885987534cb0c3106962c5d0f646530 100644
--- a/pkgs/applications/misc/ikiwiki/default.nix
+++ b/pkgs/applications/misc/ikiwiki/default.nix
@@ -84,8 +84,8 @@ stdenv.mkDerivation {
description = "Wiki compiler, storing pages and history in a RCS";
homepage = http://ikiwiki.info/;
license = stdenv.lib.licenses.gpl2Plus;
-
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.peti ];
+ broken = true; # https://ikiwiki.info/bugs/imagemagick_6.9.8_test_suite_failure/
};
}
diff --git a/pkgs/applications/misc/inspectrum/default.nix b/pkgs/applications/misc/inspectrum/default.nix
index 5097496d3992278e0a35c217375dae4fea564468..e2232c4b2ec824b0289d65cd50c0d8121840306b 100644
--- a/pkgs/applications/misc/inspectrum/default.nix
+++ b/pkgs/applications/misc/inspectrum/default.nix
@@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
sha256 = "1fvnr8gca25i6s9mg9b2hyqs0zzr4jicw13mimc9dhrgxklrr1yv";
};
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig
cmake
qt5.qtbase
fftwFloat
diff --git a/pkgs/applications/misc/ipmicfg/default.nix b/pkgs/applications/misc/ipmicfg/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..af67db3f654a194b6a410994b6e8e1206415b7ff
--- /dev/null
+++ b/pkgs/applications/misc/ipmicfg/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchzip }:
+
+stdenv.mkDerivation rec {
+ name = "ipmicfg-${version}";
+ version = "1.27.0";
+ buildVersion = "170620";
+
+ src = fetchzip {
+ url = "ftp://ftp.supermicro.com/utility/IPMICFG/IPMICFG_${version}_build.${buildVersion}.zip";
+ sha256 = "0jr2vih4hzymb62mbqyykwcrjhbhazf6wr1g0cq8ji586i3z3vw5";
+ };
+
+ installPhase = ''
+ mkdir -p "$out/bin" "$out/opt/ipmicfg"
+ cp Linux/64bit/* "$out/opt/ipmicfg"
+
+ patchelf "$out/opt/ipmicfg/IPMICFG-Linux.x86_64" \
+ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+ --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}"
+
+ ln -s "$out/opt/ipmicfg/IPMICFG-Linux.x86_64" "$out/bin/ipmicfg"
+ '';
+
+ dontPatchShebangs = true; # There are no scripts and it complains about null bytes.
+
+ meta = with stdenv.lib; {
+ description = "Supermicro IPMI configuration tool";
+ homepage = "http://www.supermicro.com/products/nfo/ipmi.cfm";
+ license = licenses.unfree;
+ platforms = [ "x86_64-linux" ];
+ maintainers = with maintainers; [ sorki ];
+ };
+}
diff --git a/pkgs/applications/misc/jigdo/default.nix b/pkgs/applications/misc/jigdo/default.nix
index 8e5c5d6206c9ec9f925a8a04809da9f0f0e5d423..d8b1253ac2763ec84d4e07f451b07fe7f15d0fd0 100644
--- a/pkgs/applications/misc/jigdo/default.nix
+++ b/pkgs/applications/misc/jigdo/default.nix
@@ -9,10 +9,13 @@ stdenv.mkDerivation {
sha256 = "1qvqzgzb0dzq82fa1ffs6hyij655rajnfwkljk1y0mnkygnha1xv";
};
- patches = fetchurl {
- url = http://ftp.de.debian.org/debian/pool/main/j/jigdo/jigdo_0.7.3-3.diff.gz;
- sha256 = "0cp4jz3sg9g86vprh90pmwpcfla79f0dr50w14yh01k0yaq70fs8";
- };
+ patches = [
+ (fetchurl {
+ url = http://ftp.de.debian.org/debian/pool/main/j/jigdo/jigdo_0.7.3-4.diff.gz;
+ sha256 = "03zsh57fijciiv23lf55k6fbfhhzm866xjhx83x54v5s1g2h6m8y";
+ })
+ ./sizewidth.patch
+ ];
buildInputs = [ db gtk2 bzip2 ];
diff --git a/pkgs/applications/misc/jigdo/sizewidth.patch b/pkgs/applications/misc/jigdo/sizewidth.patch
new file mode 100644
index 0000000000000000000000000000000000000000..17b1749fcf777d6722bf51a279bdf9666443c203
--- /dev/null
+++ b/pkgs/applications/misc/jigdo/sizewidth.patch
@@ -0,0 +1,40 @@
+diff --git i/src/mkimage.cc w/src/mkimage.cc
+index 02e65b1..b263796 100755
+--- i/src/mkimage.cc
++++ w/src/mkimage.cc
+@@ -285,27 +285,27 @@ bostream& JigdoDescVec::put(bostream& file, MD5Sum* md) const {
+ //______________________________________________________________________
+
+ namespace {
+- const int SIZE_WIDTH = 12;
++ const int MKIMAGE_SIZE_WIDTH = 12;
+ }
+
+ ostream& JigdoDesc::ImageInfo::put(ostream& s) const {
+- s << "image-info " << setw(SIZE_WIDTH) << size() << " "
++ s << "image-info " << setw(MKIMAGE_SIZE_WIDTH) << size() << " "
+ << md5() << ' ' << blockLength() << '\n';
+ return s;
+ }
+ ostream& JigdoDesc::UnmatchedData::put(ostream& s) const {
+- s << "in-template " << setw(SIZE_WIDTH) << offset() << ' '
+- << setw(SIZE_WIDTH) << size() << '\n';
++ s << "in-template " << setw(MKIMAGE_SIZE_WIDTH) << offset() << ' '
++ << setw(MKIMAGE_SIZE_WIDTH) << size() << '\n';
+ return s;
+ }
+ ostream& JigdoDesc::MatchedFile::put(ostream& s) const {
+- s << "need-file " << setw(SIZE_WIDTH) << offset() << ' '
+- << setw(SIZE_WIDTH) << size() << ' ' << md5() << ' ' << rsync() << '\n';
++ s << "need-file " << setw(MKIMAGE_SIZE_WIDTH) << offset() << ' '
++ << setw(MKIMAGE_SIZE_WIDTH) << size() << ' ' << md5() << ' ' << rsync() << '\n';
+ return s;
+ }
+ ostream& JigdoDesc::WrittenFile::put(ostream& s) const {
+- s << "have-file " << setw(SIZE_WIDTH) << offset() << ' '
+- << setw(SIZE_WIDTH) << size() << ' ' << md5() << ' ' << rsync() << '\n';
++ s << "have-file " << setw(MKIMAGE_SIZE_WIDTH) << offset() << ' '
++ << setw(MKIMAGE_SIZE_WIDTH) << size() << ' ' << md5() << ' ' << rsync() << '\n';
+ return s;
+ }
+
diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix
index e03abb8bf95aa394f043f23a76a320f4bd29e0e6..46263f7d83b8717e54030baa2bb9a04e395469a6 100644
--- a/pkgs/applications/misc/josm/default.nix
+++ b/pkgs/applications/misc/josm/default.nix
@@ -1,17 +1,15 @@
-{ fetchurl, stdenv, makeDesktopItem, unzip, bash, jre8 }:
+{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, bash, jre8 }:
stdenv.mkDerivation rec {
name = "josm-${version}";
- version = "12545";
+ version = "13053";
src = fetchurl {
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
- sha256 = "0817mjc4118b5hhfvx67bib1lhcg8mdkzibrpa2mb7hrv38q56y4";
+ sha256 = "0czsmx0gsml3vqzx6940jw2xpmh16idypydw0d4147k4fi9gzyz6";
};
- phases = [ "installPhase" ];
-
- buildInputs = [ jre8 ];
+ buildInputs = [ jre8 makeWrapper ];
desktopItem = makeDesktopItem {
name = "josm";
@@ -23,14 +21,12 @@ stdenv.mkDerivation rec {
categories = "Education;Geoscience;Maps;";
};
- installPhase = ''
+ buildCommand = ''
mkdir -p $out/bin $out/share/java
cp -v $src $out/share/java/josm.jar
- cat > $out/bin/josm <= 2.3.9), libjbig2dec0, libjpeg8 (>= 8c), libx11-6, libxext6, zlib1g (>= 1:1.2.0)
+@@ -80,7 +85,7 @@ if(MUPDF_FOUND)
+ include_directories(SYSTEM ${MUPDF_INCLUDEDIR})
+ message(STATUS "mupdf libraries: ${MUPDF_LDFLAGS}")
+ set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${MUPDF_LDFLAGS}
+- -lmupdf-js-none -lopenjpeg -ljbig2dec -ljpeg -lfreetype
++
+ )
+ endif(MUPDF_FOUND)
+@@ -91,9 +96,25 @@ if(DJVU_FOUND)
+ set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${DJVU_LDFLAGS})
+ endif(DJVU_FOUND)
--void sort(float *x,int n)
-+void willus_sort(float *x,int n)
+-# HAVE_GOCR_LIB
+-# HAVE_LEPTONICA_LIB
+-# HAVE_TESSERACT_LIB
++find_library(GOCR_LIB NAMES Pgm2asc)
++if(GOCR_LIB)
++ set(HAVE_GOCR_LIB 1)
++ set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${GOCR_LIB})
++endif(GOCR_LIB)
++
++pkg_check_modules(LEPTONICA lept)
++if(LEPTONICA_FOUND)
++ set(HAVE_LEPTONICA_LIB 1)
++ include_directories(SYSTEM ${LEPTONICA_INCLUDEDIR})
++ set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${LEPTONICA_LDFLAGS})
++endif(LEPTONICA_FOUND)
++
++pkg_check_modules(TESSERACT tesseract)
++if(TESSERACT_FOUND)
++ set(HAVE_TESSERACT_LIB 1)
++ include_directories(SYSTEM ${TESSERACT_INCLUDEDIR})
++ set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${TESSERACT_LDFLAGS})
++endif(TESSERACT_FOUND)
- {
- int top,n1;
-diff -aur k2pdfopt_v2.21/willuslib/ocrjocr.c k2pdfopt_v2.21.new/willuslib/ocrjocr.c
---- k2pdfopt_v2.21/willuslib/ocrjocr.c 2012-11-12 13:09:42.000000000 -0300
-+++ k2pdfopt_v2.21.new/willuslib/ocrjocr.c 2014-07-26 11:36:46.699837185 -0300
+ # ---- Describe project
+
+diff --git a/willuslib/CMakeLists.txt b/willuslib/CMakeLists.txt
+index 463bbc9..8043db5 100644
+--- a/willuslib/CMakeLists.txt
++++ b/willuslib/CMakeLists.txt
+@@ -6,7 +6,7 @@ include_directories(..)
+ set(WILLUSLIB_SRC
+ ansi.c array.c bmp.c bmpdjvu.c bmpmupdf.c dtcompress.c filelist.c
+ fontdata.c fontrender.c gslpolyfit.c linux.c math.c mem.c ocr.c
+- ocrjocr.c ocrtess.c pdfwrite.c point2d.c render.c strbuf.c string.c
++ ocrgocr.c ocrtess.c pdfwrite.c point2d.c render.c strbuf.c string.c
+ token.c wfile.c wgs.c wgui.c willusversion.c win.c winbmp.c
+ wincomdlg.c winmbox.c winshell.c wmupdf.c wmupdfinfo.c wpdf.c wsys.c
+ wzfile.c wleptonica.c
+diff --git a/willuslib/ocrgocr.c b/willuslib/ocrgocr.c
+index 6027e9a..fbe10f0 100644
+--- a/willuslib/ocrgocr.c
++++ b/willuslib/ocrgocr.c
@@ -29,6 +29,8 @@
#ifdef HAVE_GOCR_LIB
#include
-+job_t *JOB;
++job_t *OCR_JOB;
+
/*
** bmp8 must be grayscale
** (x1,y1) and (x2,y2) from top left of bitmap
-@@ -66,6 +68,7 @@
+@@ -63,6 +65,7 @@ void gocr_single_word_from_bmp8(char *text,int maxlen,WILLUSBITMAP *bmp8,
h=y2-y1+1;
dh=h+bw*2;
job=&_job;
-+ JOB=job;
++ OCR_JOB=job;
job_init(job);
job_init_image(job);
// willus_mem_alloc_warn((void **)&job->src.p.p,w*h,funcname,10);
-diff -aur k2pdfopt_v2.21/willuslib/string.c k2pdfopt_v2.21.new/willuslib/string.c
---- k2pdfopt_v2.21/willuslib/string.c 2014-02-03 00:37:44.000000000 -0300
-+++ k2pdfopt_v2.21.new/willuslib/string.c 2014-07-26 11:37:01.766506277 -0300
-@@ -81,7 +81,7 @@
- ** Returns NULL if EOF, otherwise returns pointer to the string.
- **
- */
--char *get_line(char *buf,int max,FILE *f)
-+char *willus_get_line(char *buf,int max,FILE *f)
-
- {
- int i;
-diff -aur k2pdfopt_v2.21/willuslib/willus.h k2pdfopt_v2.21.new/willuslib/willus.h
---- k2pdfopt_v2.21/willuslib/willus.h 2014-07-25 15:03:51.000000000 -0300
-+++ k2pdfopt_v2.21.new/willuslib/willus.h 2014-07-26 11:37:56.316506038 -0300
-@@ -214,9 +214,6 @@
- ** CMAKE handles the defines, not this source
- ** (Mod from Dirk Thierbach, 31-Dec-2013)
- */
--#ifdef USE_CMAKE
--#include "config.h"
--#else /* USE_CMAKE */
-
- #ifndef HAVE_Z_LIB
- #define HAVE_Z_LIB
-@@ -268,7 +265,6 @@
- #undef HAVE_GSL_LIB
- #endif
-
--#endif /* USE_CMAKE */
- /*
- ** Consistency check
- */
-@@ -533,7 +529,7 @@
- int *n,FILE *err);
- int readxyz_ex (char *filename,double **x,double **y,double **z,
- int *n,FILE *err,int ignore_after_semicolon);
--void sort (float *x,int n);
-+void willus_sort (float *x,int n);
- void sortd (double *x,int n);
- void sorti (int *x,int n);
- void sortxy (float *x,float *y,int n);
-@@ -602,7 +598,7 @@
- /* string.c */
- void clean_line (char *buf);
- void clean_line_end(char *buf);
--char *get_line (char *buf,int max,FILE *f);
-+char *willus_get_line (char *buf,int max,FILE *f);
- char *get_line_cf (char *buf,int max,FILE *f);
- int mem_get_line_cf(char *buf,int maxlen,char *cptr,long *cindex,long csize);
- int in_string (char *buffer,char *pattern);
diff --git a/pkgs/applications/misc/k2pdfopt/tesseract.patch b/pkgs/applications/misc/k2pdfopt/tesseract.patch
index 5cb6e0fe3176b1a4f07673481870bf5ee5208da8..4827daa1a9054d26d63cd7acecd46c819511014f 100644
--- a/pkgs/applications/misc/k2pdfopt/tesseract.patch
+++ b/pkgs/applications/misc/k2pdfopt/tesseract.patch
@@ -1,12 +1,13 @@
-diff -aur tesseract-ocr/api/Makefile.am tesseract-ocr.new/api/Makefile.am
---- tesseract-ocr/api/Makefile.am 2012-10-09 14:18:39.000000000 -0300
-+++ tesseract-ocr.new/api/Makefile.am 2014-03-20 18:43:13.926030341 -0300
-@@ -36,7 +36,7 @@
+diff --git a/api/Makefile.am b/api/Makefile.am
+index d8c1e54..46ead13 100644
+--- a/api/Makefile.am
++++ b/api/Makefile.am
+@@ -42,7 +42,7 @@ libtesseract_api_la_CPPFLAGS = $(AM_CPPFLAGS)
if VISIBILITY
libtesseract_api_la_CPPFLAGS += -DTESS_EXPORTS
endif
--libtesseract_api_la_SOURCES = baseapi.cpp capi.cpp
-+libtesseract_api_la_SOURCES = baseapi.cpp capi.cpp tesscapi.cpp
+-libtesseract_api_la_SOURCES = baseapi.cpp capi.cpp renderer.cpp pdfrenderer.cpp
++libtesseract_api_la_SOURCES = baseapi.cpp capi.cpp renderer.cpp pdfrenderer.cpp tesscapi.cpp
lib_LTLIBRARIES += libtesseract.la
libtesseract_la_LDFLAGS =
diff --git a/pkgs/applications/misc/kanboard/default.nix b/pkgs/applications/misc/kanboard/default.nix
index b37d12c362f5e779d910b742df004b0052265b76..7995c8875b829e565fb5757ccdb712b20e5ce64f 100644
--- a/pkgs/applications/misc/kanboard/default.nix
+++ b/pkgs/applications/misc/kanboard/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "kanboard-${version}";
- version = "1.0.46";
+ version = "1.0.48";
src = fetchzip {
- url = "https://kanboard.net/${name}.zip";
- sha256 = "00fzzijibj7x8pz8xwc601fcrzvdwz5fv45f2zzmbygl86khp82a";
+ url = "https://github.com/kanboard/kanboard/releases/download/v${version}/${name}.zip";
+ sha256 = "0ipyijlfcnfqlz9n20wcnaf9pw404a675x404pm9h2n4ld8x6m5v";
};
dontBuild = true;
diff --git a/pkgs/applications/misc/kdeconnect/default.nix b/pkgs/applications/misc/kdeconnect/default.nix
index 0d8db33bc17805a2ee6c4903b1060084783f188c..a95dd6adbce632bc154f804b6fb0d672a7044d95 100644
--- a/pkgs/applications/misc/kdeconnect/default.nix
+++ b/pkgs/applications/misc/kdeconnect/default.nix
@@ -5,6 +5,7 @@
, kcmutils
, kconfigwidgets
, kdbusaddons
+, kdoctools
, kiconthemes
, ki18n
, knotifications
@@ -15,34 +16,29 @@
}:
stdenv.mkDerivation rec {
- name = "kdeconnect-${version}";
- version = "1.0.3";
+ pname = "kdeconnect";
+ version = "1.2";
+ name = "${pname}-${version}";
src = fetchurl {
- url = "http://download.kde.org/stable/kdeconnect/${version}/src/kdeconnect-kde-${version}.tar.xz";
- sha256 = "0b40402adw7cqz19fh8zw70f6l7b5p400mw668n3wic4favn27r2";
+ url = "mirror://kde/stable/${pname}/${version}/src/${pname}-kde-${version}.tar.xz";
+ sha256 = "0w3rdldnr6md70r4ch255vk712d37vy63ml7ly2fhr4cfnk2i1ay";
};
buildInputs = [
- kcmutils
- kconfigwidgets
- kdbusaddons
- qca-qt5
- ki18n
- kiconthemes
- knotifications
- libfakekey
- libXtst
- qtx11extras
+ libfakekey libXtst
+ ki18n kiconthemes kcmutils kconfigwidgets kdbusaddons knotifications
+ qca-qt5 qtx11extras
];
- nativeBuildInputs = [ extra-cmake-modules ];
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
- meta = {
+ enableParallelBuilding = true;
+
+ meta = with lib; {
description = "KDE Connect provides several features to integrate your phone and your computer";
- license = with lib.licenses; [ gpl2 ];
- maintainers = with lib.maintainers; [ fridh ];
- homepage = https://community.kde.org/KDEConnect;
+ homepage = https://community.kde.org/KDEConnect;
+ license = with licenses; [ gpl2 ];
+ maintainers = with maintainers; [ fridh ];
};
-
}
diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix
index e36fbfa0f3f9e221bf1f144a35cb9109fb8353dd..49e4711550dae870f609d5f05260d7d43e508228 100644
--- a/pkgs/applications/misc/keepass/default.nix
+++ b/pkgs/applications/misc/keepass/default.nix
@@ -8,11 +8,11 @@
# plugin derivations in the Nix store and nowhere else.
with builtins; buildDotnetPackage rec {
baseName = "keepass";
- version = "2.36";
+ version = "2.37";
src = fetchurl {
url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip";
- sha256 = "1j6qhy8h3z6higbpq3q9v04amvgbn90yj3kbsvj17azdkffkwzny";
+ sha256 = "1wfbpfjng1blzkbjnxsdnny544297bm9869ianbr6l0hrvcgv3qx";
};
sourceRoot = ".";
@@ -98,7 +98,7 @@ with builtins; buildDotnetPackage rec {
meta = {
description = "GUI password manager with strong cryptography";
homepage = http://www.keepass.info/;
- maintainers = with stdenv.lib.maintainers; [ amorsillo obadz jraygauthier ];
+ maintainers = with stdenv.lib.maintainers; [ amorsillo obadz joncojonathan jraygauthier ];
platforms = with stdenv.lib.platforms; all;
license = stdenv.lib.licenses.gpl2;
};
diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix
index 6ae86486b47b0ad550442a1273f264d536337705..72d9c7d2fb5d107cae2ad7bf8484f8b1ebaf1e18 100644
--- a/pkgs/applications/misc/keepassx/community.nix
+++ b/pkgs/applications/misc/keepassx/community.nix
@@ -6,14 +6,14 @@
with stdenv.lib;
stdenv.mkDerivation rec {
- name = "keepassx-community-${version}";
- version = "2.2.0";
+ name = "keepassxc-${version}";
+ version = "2.2.2";
src = fetchFromGitHub {
owner = "keepassxreboot";
repo = "keepassxc";
rev = "${version}";
- sha256 = "0gg75mjy2p7lyh8nnivmyn7bjp1zyx26zm8s1fak7d2di2r0mnjc";
+ sha256 = "01pqpa3vzk2q1vrj2lqayr7a3nzpnj176yhnqbrwlm3s9rga4wzn";
};
cmakeFlags = [
diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix
index 98dbb0cbf911f84211880f26baaf5989247cffb2..91e583e2af4e41bd3c3d25637bfba12b7e04dbcf 100644
--- a/pkgs/applications/misc/khal/default.nix
+++ b/pkgs/applications/misc/khal/default.nix
@@ -1,14 +1,15 @@
-{ stdenv, fetchurl, pkgs, python3Packages }:
+{ stdenv, pkgs, python3Packages }:
with python3Packages;
buildPythonApplication rec {
- version = "0.9.5";
- name = "khal-${version}";
+ name = "${pname}-${version}";
+ pname = "khal";
+ version = "0.9.8";
- src = fetchurl {
- url = "mirror://pypi/k/khal/khal-${version}.tar.gz";
- sha256 = "0fvv0kjym9q8v20zbpr5m8ig65b8hva4p0c935qsdvgdni68jidr";
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1blx3gxnv7sj302biqphfw7i6ilzl2xlmvzp130n3113scg9w17y";
};
LC_ALL = "en_US.UTF-8";
diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..e1afac735d8e29f905009419c67c113bd112ad56
--- /dev/null
+++ b/pkgs/applications/misc/kitty/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchFromGitHub, pkgs, python3Packages, glfw, libunistring, glew, fontconfig, zlib, pkgconfig, ncurses, imagemagick, makeWrapper }:
+
+with python3Packages;
+buildPythonApplication rec {
+ version = "0.4.2";
+ name = "kitty-${version}";
+ format = "other";
+
+ src = fetchFromGitHub {
+ owner = "kovidgoyal";
+ repo = "kitty";
+ rev = "v${version}";
+ sha256 = "058676r2b83mjggbfc701v3vlviaslf7qciz8sm8lcda82k01wfp";
+ };
+
+ buildInputs = [ glew fontconfig glfw ncurses libunistring ];
+
+ nativeBuildInputs = [ pkgconfig ];
+
+ buildPhase = ''
+ python3 setup.py linux-package
+ '';
+
+ installPhase = ''
+ runHook preInstall
+ mkdir -p $out
+ cp -r linux-package/{bin,share,lib} $out
+ wrapProgram "$out/bin/kitty" --prefix PATH : "$out/bin:${stdenv.lib.makeBinPath [ imagemagick ]}"
+ runHook postInstall
+ '';
+
+ meta = with stdenv.lib; {
+ homepage = https://github.com/kovidgoyal/kitty;
+ description = "A modern, hackable, featureful, OpenGL based terminal emulator";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ tex ];
+ };
+}
diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix
index b0590fdc38f7a66a0006ede28f6b5f58771bab04..8479c4e16ace59b96b74ff6a96b3e1eec86e50fe 100644
--- a/pkgs/applications/misc/kiwix/default.nix
+++ b/pkgs/applications/misc/kiwix/default.nix
@@ -29,10 +29,6 @@ let
then { tar = xulrunner64_tar; sdk = xulrunnersdk64_tar; }
else { tar = xulrunner32_tar; sdk = xulrunnersdk32_tar; };
- ctpp2_ = ctpp2.override { inherit stdenv; };
- xapian_ = xapian.override { inherit stdenv; };
- zimlib_ = zimlib.override { inherit stdenv; };
-
pugixml = stdenv.mkDerivation rec {
version = "1.2";
name = "pugixml-${version}";
@@ -66,9 +62,10 @@ stdenv.mkDerivation rec {
sha256 = "0577phhy2na59cpcqjgldvksp0jwczyg0l6c9ghnr19i375l7yqc";
};
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- zip pkgconfig python zlib xapian_ which icu libmicrohttpd
- lzma zimlib_ ctpp2_ aria2 wget bc libuuid makeWrapper pugixml
+ zip python zlib xapian which icu libmicrohttpd
+ lzma zimlib ctpp2 aria2 wget bc libuuid makeWrapper pugixml
];
postUnpack = ''
diff --git a/pkgs/applications/misc/kupfer/default.nix b/pkgs/applications/misc/kupfer/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..f3bb825cbf7430466b169122989e662849d4cc38
--- /dev/null
+++ b/pkgs/applications/misc/kupfer/default.nix
@@ -0,0 +1,66 @@
+{ stdenv
+, makeWrapper
+, fetchurl
+, intltool
+, python3Packages
+, gtk3
+, dbus
+, libwnck3
+, keybinder3
+, hicolor_icon_theme
+, wrapGAppsHook
+}:
+
+with python3Packages;
+
+buildPythonApplication rec {
+ name = "kupfer-${version}";
+ version = "319";
+
+ src = fetchurl {
+ url = "https://github.com/kupferlauncher/kupfer/releases/download/v${version}/kupfer-v${version}.tar.xz";
+ sha256 = "0c9xjx13r8ckfr4az116bhxsd3pk78v04c3lz6lqhraak0rp4d92";
+ };
+
+ nativeBuildInputs = [ wrapGAppsHook intltool ];
+ buildInputs = [ hicolor_icon_theme docutils libwnck3 keybinder3 ];
+ propagatedBuildInputs = [ pygobject3 gtk3 pyxdg dbus-python pycairo ];
+
+ configurePhase = ''
+ runHook preConfigure
+ python ./waf configure --prefix=$prefix
+ runHook postConfigure
+ '';
+
+ buildPhase = ''
+ runHook preBuild
+ python ./waf
+ runHook postBuild
+ '';
+
+ installPhase = let
+ pythonPath = (stdenv.lib.concatMapStringsSep ":"
+ (m: "${m}/lib/${python.libPrefix}/site-packages")
+ propagatedBuildInputs);
+ in ''
+ runHook preInstall
+ python ./waf install
+
+ gappsWrapperArgs+=(
+ "--prefix" "PYTHONPATH" : "${pythonPath}"
+ "--set" "PYTHONNOUSERSITE" "1"
+ )
+
+ runHook postInstall
+ '';
+
+ doCheck = false; # no tests
+
+ meta = with stdenv.lib; {
+ description = "A smart, quick launcher";
+ homepage = "https://kupferlauncher.github.io/";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ cobbal ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/misc/latte-dock/default.nix b/pkgs/applications/misc/latte-dock/default.nix
index 1b2cf94d173d47105c922c843563b3c8727d121e..2695ac1ef7d51d3977d675fbf1af4c39d3b6bd3d 100644
--- a/pkgs/applications/misc/latte-dock/default.nix
+++ b/pkgs/applications/misc/latte-dock/default.nix
@@ -1,6 +1,7 @@
-{ mkDerivation, lib, cmake, xorg, plasma-framework, fetchFromGitHub }:
+{ mkDerivation, lib, cmake, xorg, plasma-framework, fetchFromGitHub
+, extra-cmake-modules, karchive, kwindowsystem, qtx11extras, kcrash }:
-let version = "0.6.0"; in
+let version = "0.7.1"; in
mkDerivation {
name = "latte-dock-${version}";
@@ -9,12 +10,13 @@ mkDerivation {
owner = "psifidotos";
repo = "Latte-Dock";
rev = "v${version}";
- sha256 = "1967hx4lavy96vvik8d5m2c6ycd2mlf9cmhrv40zr0784ni0ikyv";
+ sha256 = "0vdmsjj1qqlzz26mznb56znv5x7akbvw65ybbzakclp4q1xrsrm2";
};
- buildInputs = [ plasma-framework xorg.libpthreadstubs xorg.libXdmcp ];
+ buildInputs = [ plasma-framework xorg.libpthreadstubs xorg.libXdmcp xorg.libSM ];
- nativeBuildInputs = [ cmake ];
+ nativeBuildInputs = [ extra-cmake-modules cmake karchive kwindowsystem
+ qtx11extras kcrash ];
meta = with lib; {
description = "Dock-style app launcher based on Plasma frameworks";
diff --git a/pkgs/applications/misc/lenmus/default.nix b/pkgs/applications/misc/lenmus/default.nix
index f0c86fb67dbe62df4cd9b4f4daaafe02fc7ae221..9018a5926424d929b5db7e9fc1c48632b3c49e1a 100644
--- a/pkgs/applications/misc/lenmus/default.nix
+++ b/pkgs/applications/misc/lenmus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgconfig, fetchFromGitHub
+{ stdenv, pkgconfig, fetchFromGitHub, fetchpatch
, cmake, boost
, portmidi, sqlite
, freetype, libpng, pngpp, zlib
@@ -16,14 +16,21 @@ stdenv.mkDerivation rec {
sha256 = "1n639xr1qxx6rhqs0c6sjxp3bv8cwkmw1vfk1cji7514gj2a9v3p";
};
- cmakeFlags = [
- "-DCMAKE_INSALL_PREFIX=$out"
- ];
-
enableParallelBuilding = true;
+ patches = [
+ (fetchpatch {
+ url = "https://github.com/lenmus/lenmus/commit/421760d84694a0e6e72d0e9b1d4fd30a7e129c6f.patch";
+ sha256 = "1z1wwh0pcr8w1zlr8swx99si9y2kxx5bmavgwvy6bvdhxgm58yqs";
+ })
+ (fetchpatch {
+ url = "https://github.com/lenmus/lenmus/commit/6613d20d4051effc782203c9c6d92962a3f66b5f.patch";
+ sha256 = "01vvzzpamv90jpqbbq1f2m2b4gb9xab9z70am8i41d90nqvg6agn";
+ })
+ ];
+
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig
cmake boost
portmidi sqlite
freetype libpng pngpp zlib
diff --git a/pkgs/applications/misc/libosmocore/default.nix b/pkgs/applications/misc/libosmocore/default.nix
index 7a0eadf74e5aa0180707ee50231aff4c0d7c4f36..47bcbb6fce915566ca8597f641392f0d4f426ff6 100644
--- a/pkgs/applications/misc/libosmocore/default.nix
+++ b/pkgs/applications/misc/libosmocore/default.nix
@@ -12,8 +12,9 @@ stdenv.mkDerivation rec {
sha256 = "08mcpy9ljwb1i3l4cmlwn024q2psk5gg9f0ylgh99hy1ffx0n7am";
};
+ nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [
- autoreconfHook pcsclite pkgconfig
+ pcsclite
];
preConfigure = ''
diff --git a/pkgs/applications/misc/lighthouse/default.nix b/pkgs/applications/misc/lighthouse/default.nix
index f6bfe61e5aa2f91d6e2ffdc673a77da0c2371555..7b5b40d65a363494ba1a19ea4b089da5f217be4b 100644
--- a/pkgs/applications/misc/lighthouse/default.nix
+++ b/pkgs/applications/misc/lighthouse/default.nix
@@ -13,8 +13,9 @@ stdenv.mkDerivation rec {
sha256 = "0v6ylm49f1b44zwq1y1gqxp2csyqblplr24ajllc2q3r0sc9m1ys";
};
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig libX11 libxcb cairo gtk2 pango python27 python3
+ libX11 libxcb cairo gtk2 pango python27 python3
];
makeFlags = [ "PREFIX=\${out}" ];
diff --git a/pkgs/applications/misc/lilyterm/default.nix b/pkgs/applications/misc/lilyterm/default.nix
index 2fa4ba9ae644753fdd15facaa89130ab2a7c20f9..3729978dddb0007d9fa0923ccf59abda6650a579 100644
--- a/pkgs/applications/misc/lilyterm/default.nix
+++ b/pkgs/applications/misc/lilyterm/default.nix
@@ -35,7 +35,8 @@ stdenv.mkDerivation rec {
inherit (stuff) src version;
- buildInputs = [ pkgconfig autoconf automake intltool gettext gtk vte ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ autoconf automake intltool gettext gtk vte ];
preConfigure = "sh autogen.sh";
diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix
index ee06ea1ad6cfabbad713cc152d6b137487f9d51e..837a221be946cde6cd877b8fda6da626182de2ca 100644
--- a/pkgs/applications/misc/llpp/default.nix
+++ b/pkgs/applications/misc/llpp/default.nix
@@ -6,18 +6,17 @@ assert lib.versionAtLeast (lib.getVersion ocaml) "4.02";
let ocamlVersion = (builtins.parseDrvName (ocaml.name)).version;
in stdenv.mkDerivation rec {
name = "llpp-${version}";
- version = "25-git-2017-01-18";
+ version = "26b";
src = fetchgit {
url = "git://repo.or.cz/llpp.git";
- rev = "22740b9bca1c60ef18cf90538994ce4981539901";
- sha256 = "0yg8z2zwhg2f5il2i1clx3b7hl088ncpk686rfxlvwyjg3qs3mv4";
+ rev = "v${version}";
+ sha256 = "1w8g1fp1c20sl34cx20plhnbghbsx2fwgp4vyhd1x0za29lw62nj";
fetchSubmodules = false;
};
nativeBuildInputs = [ pkgconfig makeWrapper ninja ];
- buildInputs = [ ocaml findlib mupdf gtk3 jbig2dec # lablgl
- openjpeg mujs openssl freetype ncurses ];
+ buildInputs = [ ocaml findlib mupdf gtk3 jbig2dec openjpeg mujs openssl freetype ncurses ];
dontStrip = true;
@@ -32,7 +31,6 @@ in stdenv.mkDerivation rec {
buildPhase = ''
sh ./build.sh build
'';
-# --prefix CAML_LD_LIBRARY_PATH ":" "${lablgl}/lib/ocaml/${ocamlVersion}/site-lib/lablgl" \
installPhase = ''
install -d $out/bin $out/lib
diff --git a/pkgs/applications/misc/ltwheelconf/default.nix b/pkgs/applications/misc/ltwheelconf/default.nix
index 5450f5f2fc84dc51fbebf2590b0afc2e6bfc59c0..4972aa28e5892eb7b5eb7912612ddd055b8726b5 100644
--- a/pkgs/applications/misc/ltwheelconf/default.nix
+++ b/pkgs/applications/misc/ltwheelconf/default.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
sha256 = "1fsz7k73yln987gcx1jvb5irxfbp1x2c457a60a8yap27nkp5y2w";
};
- buildInputs = [ libusb1 pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ libusb1 ];
installPhase = ''
mkdir -p $out/bin
diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix
index 964617e20f1e8c86d52668858f9d5302991f68c0..e3c4943cb2fee835b0ba94e3c15cb9f7ebe49ac2 100644
--- a/pkgs/applications/misc/lyx/default.nix
+++ b/pkgs/applications/misc/lyx/default.nix
@@ -12,16 +12,12 @@ stdenv.mkDerivation rec {
};
# LaTeX is used from $PATH, as people often want to have it with extra pkgs
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig qtbase qtsvg python file/*for libmagic*/ bc
+ qtbase qtsvg python file/*for libmagic*/ bc
hunspell makeWrapper # enchant
];
- # bogus configure script tests
- preConfigure = ''
- NIX_CFLAGS_COMPILE+=" $(pkg-config --cflags Qt5Core)"
- '';
-
configureFlags = [
"--enable-qt5"
#"--without-included-boost"
diff --git a/pkgs/applications/misc/makeself/default.nix b/pkgs/applications/misc/makeself/default.nix
index 361ced02b7edb707a08852056355d7fc62f55eab..8a752bbaf86ec15cf65b054c45f4fcf574d16f61 100644
--- a/pkgs/applications/misc/makeself/default.nix
+++ b/pkgs/applications/misc/makeself/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, fetchgit }:
+{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
- name = "makeself-2.2.0";
+ version = "2.3.1";
+ name = "makeself-${version}";
- src = fetchgit {
- url = "https://github.com/megastep/makeself.git";
- rev = "b836b9281ae99abe1865608b065551da56c80719";
- sha256 = "f7c97f0f8ad8128f2f1b54383319f2cc44cbb05b60ced222784debdf326f23ad";
+ src = fetchFromGitHub {
+ owner = "megastep";
+ repo = "makeself";
+ rev = "release-${version}";
+ sha256 = "01r7vb9vyb99s3g5cw0c04s1ahcingynk3ki17wknlk2asjrbc4p";
};
patchPhase = ''
diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..76d23f1a8f08cbc36fdf2676bea65a4607fac53b
--- /dev/null
+++ b/pkgs/applications/misc/masterpdfeditor/default.nix
@@ -0,0 +1,52 @@
+{ stdenv, fetchurl, glibc, sane-backends, qtbase, qtsvg, libXext, libX11, libXdmcp, libXau, libxcb }:
+ let
+ version = "4.3.61";
+ in
+ stdenv.mkDerivation {
+ name = "masterpdfeditor-${version}";
+ src = fetchurl {
+ url = "http://get.code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz";
+ sha256 = "1g6mx8nch6ypf78h6xsb673wim19wn5ni5840armzg0pvi3sfknm";
+ };
+ libPath = stdenv.lib.makeLibraryPath [
+ stdenv.cc.cc
+ glibc
+ sane-backends
+ qtbase
+ qtsvg
+ libXext
+ libX11
+ libXdmcp
+ libXau
+ libxcb
+ ];
+ dontStrip = true;
+ installPhase = ''
+ p=$out/opt/masterpdfeditor
+ mkdir -p $out/bin $p $out/share/applications $out/share/pixmaps
+
+ substituteInPlace masterpdfeditor4.desktop \
+ --replace 'Exec=/opt/master-pdf-editor-4' "Exec=$out/bin" \
+ --replace 'Path=/opt/master-pdf-editor-4' "Path=$out/bin" \
+ --replace 'Icon=/opt/master-pdf-editor-4' "Icon=$out/share/pixmaps"
+ cp -v masterpdfeditor4.png $out/share/pixmaps/
+ cp -v masterpdfeditor4.desktop $out/share/applications
+
+ cp -v masterpdfeditor4 $p/
+ ln -s $p/masterpdfeditor4 $out/bin/masterpdfeditor4
+ cp -v -r stamps templates lang fonts $p
+
+ install -D license.txt $out/share/$name/LICENSE
+
+ patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+ --set-rpath $libPath \
+ $p/masterpdfeditor4
+ '';
+ meta = with stdenv.lib; {
+ description = "Master PDF Editor";
+ homepage = "https://code-industry.net/free-pdf-editor/";
+ license = licenses.unfreeRedistributable;
+ platforms = with platforms; [ "x86_64-linux" ];
+ maintainers = with maintainers; [ cmcdragonkai flokli ];
+ };
+ }
diff --git a/pkgs/applications/misc/mdp/default.nix b/pkgs/applications/misc/mdp/default.nix
index 5206feb215c98411acda062b4455e03a136bfae9..f627a3cda22f6f7b2b675785dfc2805ca178e1f5 100644
--- a/pkgs/applications/misc/mdp/default.nix
+++ b/pkgs/applications/misc/mdp/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, ncurses }:
stdenv.mkDerivation rec {
- version = "1.0.9";
+ version = "1.0.10";
name = "mdp-${version}";
src = fetchFromGitHub {
owner = "visit1985";
repo = "mdp";
rev = version;
- sha256 = "183flp52zfady4f8f3vgapr5f5k6cvanmj2hw293v6pw71qnafmd";
+ sha256 = "1swp1hqryai84c8dpzsvjpgg5rz2vnn2vrp0dhwy8r0qgpmby2nn";
};
makeFlags = [ "PREFIX=$(out)" ];
diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix
index 787f97ac1b110bdd29cccef258cd654bc0f2e0a3..0167132db7897b7c8bf8f95c8291f39a592982f3 100644
--- a/pkgs/applications/misc/mediainfo-gui/default.nix
+++ b/pkgs/applications/misc/mediainfo-gui/default.nix
@@ -2,11 +2,11 @@
, desktop_file_utils, libSM, imagemagick }:
stdenv.mkDerivation rec {
- version = "0.7.97";
+ version = "17.10";
name = "mediainfo-gui-${version}";
src = fetchurl {
- url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
- sha256 = "10hp23a9hdlqvrhskssd9g15f4n55yq48cmbpjwdqwzfrblj598n";
+ url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
+ sha256 = "1yvh4r19kk3bzzgnr4ikrjxqldr6860s35sh4bqr51c7l77k048c";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
@@ -15,13 +15,15 @@ stdenv.mkDerivation rec {
sourceRoot = "./MediaInfo/Project/GNU/GUI/";
+ enableParallelBuilding = true;
+
meta = with stdenv.lib; {
description = "Supplies technical and tag information about a video or audio file (GUI version)";
longDescription = ''
MediaInfo is a convenient unified display of the most relevant technical
and tag data for video and audio files.
'';
- homepage = http://mediaarea.net/;
+ homepage = https://mediaarea.net/;
license = licenses.bsd2;
platforms = platforms.linux;
maintainers = [ maintainers.devhell ];
diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix
index 38888b0ebdc6d961549c6ab3e6edc454d946e1c5..e6175356348f39545805a36c3e7bcfdeee90ddcd 100644
--- a/pkgs/applications/misc/mediainfo/default.nix
+++ b/pkgs/applications/misc/mediainfo/default.nix
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, zlib }:
stdenv.mkDerivation rec {
- version = "0.7.97";
+ version = "17.10";
name = "mediainfo-${version}";
src = fetchurl {
- url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
- sha256 = "10hp23a9hdlqvrhskssd9g15f4n55yq48cmbpjwdqwzfrblj598n";
+ url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
+ sha256 = "1yvh4r19kk3bzzgnr4ikrjxqldr6860s35sh4bqr51c7l77k048c";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
@@ -15,13 +15,15 @@ stdenv.mkDerivation rec {
configureFlags = [ "--with-libmediainfo=${libmediainfo}" ];
+ enableParallelBuilding = true;
+
meta = with stdenv.lib; {
description = "Supplies technical and tag information about a video or audio file";
longDescription = ''
MediaInfo is a convenient unified display of the most relevant technical
and tag data for video and audio files.
'';
- homepage = http://mediaarea.net/;
+ homepage = https://mediaarea.net/;
license = licenses.bsd2;
platforms = platforms.unix;
maintainers = [ maintainers.devhell ];
diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix
index a1744f7a2c033d16583ca90340af197ce37142b3..d1befec34082d22cc749103765a6b2eaba649070 100644
--- a/pkgs/applications/misc/merkaartor/default.nix
+++ b/pkgs/applications/misc/merkaartor/default.nix
@@ -1,25 +1,27 @@
-{ stdenv, fetchFromGitHub, qt4, qmake4Hook, boost, proj, gdal, sqlite, pkgconfig }:
+{ stdenv, fetchFromGitHub, qmake, pkgconfig, boost, gdal, proj
+, qtbase, qtsvg, qtwebkit }:
stdenv.mkDerivation rec {
name = "merkaartor-${version}";
- version = "0.18.2";
+ version = "0.18.3";
src = fetchFromGitHub {
owner = "openstreetmap";
repo = "merkaartor";
rev = version;
- sha256 = "1a8kzrc9w0b2a2zgw9dbbi15jy9ynv6nf2sg3k4dbh7f1s2ajx9l";
+ sha256 = "0ls3q8m1hxiwyrypy6qca8wczhl4969ncl0sszfdwfv70rzxjk88";
};
- buildInputs = [ qt4 boost proj gdal sqlite ];
+ nativeBuildInputs = [ qmake pkgconfig ];
- nativeBuildInputs = [ qmake4Hook pkgconfig ];
+ buildInputs = [ boost gdal proj qtbase qtsvg qtwebkit ];
- meta = {
- description = "An openstreetmap editor";
- homepage = http://merkaartor.org/;
- license = stdenv.lib.licenses.gpl2Plus;
- maintainers = with stdenv.lib.maintainers; [viric];
- inherit (qt4.meta) platforms;
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ description = "OpenStreetMap editor";
+ homepage = http://merkaartor.be/;
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ viric ];
};
}
diff --git a/pkgs/applications/misc/milu/default.nix b/pkgs/applications/misc/milu/default.nix
index 9f98376a51bcb5eb6ddd098533c58ed6a5ce6db7..d8d1cff6040b261c14ab76c8f9ba9aa9c674d914 100644
--- a/pkgs/applications/misc/milu/default.nix
+++ b/pkgs/applications/misc/milu/default.nix
@@ -24,8 +24,8 @@ stdenv.mkDerivation rec {
cp bin/milu $out/bin
'';
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig
glib
unzip
clang
diff --git a/pkgs/applications/misc/monero/default.nix b/pkgs/applications/misc/monero/default.nix
index 09f343483dfb3a25ef77395f423deaae344aad84..0c83e206bb33c0257daa5f1102091562e8f6931e 100644
--- a/pkgs/applications/misc/monero/default.nix
+++ b/pkgs/applications/misc/monero/default.nix
@@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, cmake, boost, miniupnpc, openssl, pkgconfig, unbound }:
let
- version = "0.10.3.1";
+ version = "0.11.0.0";
in
stdenv.mkDerivation {
name = "monero-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
owner = "monero-project";
repo = "monero";
rev = "v${version}";
- sha256 = "1x6qjqijdbjyfb0dcjn46gp38hkb419skxansf9w2cjf58c2055n";
+ sha256 = "041xxk9gznfpgn8f07m7sddr74cwm1sdyf9i85k10ndja87xc6y4";
};
nativeBuildInputs = [ cmake pkgconfig ];
@@ -30,7 +30,6 @@ stdenv.mkDerivation {
bin/monerod \
bin/monero-blockchain-export \
bin/monero-blockchain-import \
- bin/monero-utils-deserialize \
bin/monero-wallet-cli \
bin/monero-wallet-rpc
'';
diff --git a/pkgs/applications/misc/mqtt-bench/default.nix b/pkgs/applications/misc/mqtt-bench/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..eea166d8df7596f7a2b69fb918e4e98222fb726b
--- /dev/null
+++ b/pkgs/applications/misc/mqtt-bench/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }:
+
+buildGoPackage rec {
+ name = "mqtt-bench-${version}";
+ version = "0.3.0";
+ rev = "v${version}";
+
+ goPackagePath = "github.com/takanorig/mqtt-bench";
+
+ src = fetchFromGitHub {
+ inherit rev;
+ owner = "takanorig";
+ repo = "mqtt-bench";
+ sha256 = "03b9ak2j303iwq6abd7j10f2cs2ianwnbflwmyx9g96i7zd74f5m";
+ };
+
+ patches = [
+ (fetchpatch {
+ url = "https://patch-diff.githubusercontent.com/raw/takanorig/mqtt-bench/pull/13.patch";
+ name = "mqtt-paho-changes.patch";
+ sha256 = "17c8ajrp5dmbsasj6njxrlhy0x08b65fignzm3yccqbhb4ijcvha";
+ })
+ ];
+
+ goDeps = ./deps.nix;
+
+ meta = with stdenv.lib; {
+ description = "Mosquitto benchmark tool";
+ homepage = https://github.com/takanorig/mqtt-bench;
+ maintainers = with maintainers; [ disassembler ];
+ };
+}
diff --git a/pkgs/applications/misc/mqtt-bench/deps.nix b/pkgs/applications/misc/mqtt-bench/deps.nix
new file mode 100644
index 0000000000000000000000000000000000000000..d93d3c46814587b24a7ec627de5182077bddc0ae
--- /dev/null
+++ b/pkgs/applications/misc/mqtt-bench/deps.nix
@@ -0,0 +1,21 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+[
+ {
+ goPackagePath = "github.com/eclipse/paho.mqtt.golang";
+ fetch = {
+ type = "git";
+ url = "https://github.com/eclipse/paho.mqtt.golang";
+ rev = "65f43bda5f7edbbf6b7533d3a5a13b2c67cf3545";
+ sha256 = "1ad136xf78br599ya43j45f8dycjip1k0hkplayy1slg8ckwrhdr";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/net";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/net";
+ rev = "8351a756f30f1297fe94bbf4b767ec589c6ea6d0";
+ sha256 = "0b6m579i3wrx1m69mqkdng5gjfssprxx0pg45kzrdi68sh0zr5d1";
+ };
+ }
+]
diff --git a/pkgs/applications/misc/mrxvt/default.nix b/pkgs/applications/misc/mrxvt/default.nix
index 06f8b78c2bc924e5e2a0f14e2b3e08e4e3581230..3f7ce3cc5d5b9ba9d6dd6bfc74002a1701dc1603 100644
--- a/pkgs/applications/misc/mrxvt/default.nix
+++ b/pkgs/applications/misc/mrxvt/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
Multitabbed lightweight terminal emulator based on rxvt.
Supports transparency, backgroundimages, freetype fonts, ...
";
- homepage = http://sourceforge.net/projects/materm;
+ homepage = https://sourceforge.net/projects/materm;
license = "GPL";
platforms = stdenv.lib.platforms.linux;
};
diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix
index da5f3c3bf12850dfa81fb71c21f15ef6def76af4..b50d99466f89d772bef359702567776972afa5b0 100644
--- a/pkgs/applications/misc/mupdf/default.nix
+++ b/pkgs/applications/misc/mupdf/default.nix
@@ -1,6 +1,8 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig
-, zlib, freetype, libjpeg, jbig2dec, openjpeg
-, libX11, libXcursor, libXrandr, libXinerama, libXext, harfbuzz, mesa }:
+{ stdenv, lib, fetchurl, fetchpatch, pkgconfig
+, freetype, harfbuzz, openjpeg, jbig2dec, libjpeg
+, enableX11 ? true, libX11, libXext
+, enableCurl ? true, curl, openssl
+}:
stdenv.mkDerivation rec {
version = "1.11";
@@ -24,11 +26,43 @@ stdenv.mkDerivation rec {
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";
})
+
+ (fetchpatch {
+ name = "mupdf-1.11-shared_libs-1.patch";
+ url = "https://ftp.osuosl.org/pub/blfs/conglomeration/mupdf/mupdf-1.11-shared_libs-1.patch";
+ sha256 = "127x8jhyj3i9cn3mxw9mm5barw2yk43rvmghg54bhn4rjalx857j";
+ })
+
+ (fetchurl {
+ name = "mupdf-1.11-CVE-2017-14685.patch";
+ url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=ab1a420613dec93c686acbee2c165274e922f82a";
+ sha256 = "120xapwj0af333n3a32ypxk0jmjv2ia476jg8pzsfqk9a5qqkx46";
+ })
+
+ (fetchurl {
+ name = "mupdf-1.11-CVE-2017-14686.patch";
+ url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=0f0fbc07d9be31f5e83ec5328d7311fdfd8328b1";
+ sha256 = "0pkn7mfqhmnsyia4rh4mw4q435bzvlc22crqa1bxpaa0gcyky51c";
+ })
+
+ (fetchurl {
+ name = "mupdf-1.11-CVE-2017-14687.patch";
+ url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=2b16dbd8f73269cb15ca61ece75cf8d2d196ed28";
+ sha256 = "01v41cwrdnz3k32fcadk2gk4knqrm3mavzp6pxhn19nwgmqkshjd";
+ })
+
+ (fetchurl {
+ name = "mupdf-1.11-CVE-2017-15587.patch";
+ url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=82df2631d7d0446b206ea6b434ea609b6c28b0e8";
+ sha256 = "04kfww7y0wazg6372g44fa2k5kiiigq4616ihkvmp18rz86903n9";
+ })
];
makeFlags = [ "prefix=$(out)" ];
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ zlib libX11 libXcursor libXext harfbuzz mesa libXrandr libXinerama freetype libjpeg jbig2dec openjpeg ];
+ buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg ]
+ ++ lib.optionals enableX11 [ libX11 libXext ]
+ ++ lib.optionals enableCurl [ curl openssl ];
outputs = [ "bin" "dev" "out" "man" "doc" ];
preConfigure = ''
@@ -37,13 +71,6 @@ stdenv.mkDerivation rec {
'';
postInstall = ''
- for i in $out/lib/*.a; do
- so="''${i%.a}.so"
- gcc -shared -o $so.${version} -Wl,--whole-archive $i -Wl,--no-whole-archive
- ln -s $so.${version} $so
- rm $i
- done
-
mkdir -p "$out/lib/pkgconfig"
cat >"$out/lib/pkgconfig/mupdf.pc" <=[^"]*,psutil,g' \
-e 's,requests>=[^"]*,requests,g' \
-e 's,future>=[^"]*,future,g' \
+ -e 's,pyserial>=[^"]*,pyserial,g' \
+ -e 's,semantic_version>=[^"]*,semantic_version,g' \
setup.py
'';
diff --git a/pkgs/applications/misc/octoprint/m33-fio-one-library.patch b/pkgs/applications/misc/octoprint/m33-fio-one-library.patch
index 87b00f3ab705d19978192c4e7afe85bf3b7f1081..24c9c4a80f5d115b920c5ea5b1aa16bec6699d54 100644
--- a/pkgs/applications/misc/octoprint/m33-fio-one-library.patch
+++ b/pkgs/applications/misc/octoprint/m33-fio-one-library.patch
@@ -1,18 +1,18 @@
-From 0defcf6ec155899c414f66524b7df629f59327f0 Mon Sep 17 00:00:00 2001
+From 314bcebfcd1759981ce12255be29d8ae68cd400b Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov
Date: Wed, 23 Nov 2016 00:40:48 +0300
Subject: [PATCH] Build and use one version of preprocessor library
---
- octoprint_m33fio/__init__.py | 67 ++----------------------------------------
- shared library source/Makefile | 62 +++-----------------------------------
- 2 files changed, 6 insertions(+), 123 deletions(-)
+ octoprint_m33fio/__init__.py | 73 ++----------------------------------------
+ shared library source/Makefile | 62 +++--------------------------------
+ 2 files changed, 6 insertions(+), 129 deletions(-)
diff --git a/octoprint_m33fio/__init__.py b/octoprint_m33fio/__init__.py
-index 4b43c59..d1259e4 100755
+index 054870a..4d5ecc1 100755
--- a/octoprint_m33fio/__init__.py
+++ b/octoprint_m33fio/__init__.py
-@@ -1062,71 +1062,8 @@ class M33FioPlugin(
+@@ -1189,78 +1189,9 @@ class M33FioPlugin(
# Check if using shared library or checking if it is usable
if self._settings.get_boolean(["UseSharedLibrary"]) or isUsable :
@@ -54,7 +54,9 @@ index 4b43c59..d1259e4 100755
-
- # Otherwise check if running on Windows and using an i386 or x86-64 device
- elif platform.uname()[0].startswith("Windows") and (platform.uname()[4].endswith("86") or platform.uname()[4].endswith("64")) :
--
++ # Set shared library
++ self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/libpreprocessor.so")
+
- # Check if Python is running as 32-bit
- if platform.architecture()[0].startswith("32") :
-
@@ -81,11 +83,16 @@ index 4b43c59..d1259e4 100755
-
- # Set shared library
- self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace("\\", "/") + "/static/libraries/preprocessor_x86-64.dylib")
-+ # Set shared library
-+ self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/libpreprocessor.so")
-
+-
+- # Otherwise check if running FreeBSD
+- elif platform.uname()[0].startswith("FreeBSD") :
+-
+- # TODO: Compile FreeBSD shared library pre-processors
+- pass
+-
# Check if shared library was set
if self.sharedLibrary :
+
diff --git a/shared library source/Makefile b/shared library source/Makefile
index 792b4f4..4c74f5c 100755
--- a/shared library source/Makefile
@@ -164,5 +171,5 @@ index 792b4f4..4c74f5c 100755
clean:
rm -f ../octoprint_m33fio/static/libraries/$(PROG)
--
-2.11.0
+2.14.1
diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix
index c09e8d2f5e6629a6a0a3026a12ebf5984516b0d9..0a1d26012a8020afbe901c1d666116060507b813 100644
--- a/pkgs/applications/misc/octoprint/plugins.nix
+++ b/pkgs/applications/misc/octoprint/plugins.nix
@@ -12,13 +12,13 @@ let
m33-fio = buildPlugin rec {
name = "M33-Fio-${version}";
- version = "1.20";
+ version = "1.21";
src = fetchFromGitHub {
owner = "donovan6000";
repo = "M33-Fio";
rev = "V${version}";
- sha256 = "1ng7lzlkqsjcr1w7wgzwsqkkvcvpajcj2cwqlffh95916sw8n767";
+ sha256 = "1la3611kkqn8yiwjn6cizc45ri8pnk6ckld1na4nk6mqk88jvjq7";
};
patches = [
diff --git a/pkgs/applications/misc/ola/default.nix b/pkgs/applications/misc/ola/default.nix
index 0aba5106387d89ef40cb19f2b2b947388e74a41f..9db6042e60f6df699f214d69ff442baae3c16518 100644
--- a/pkgs/applications/misc/ola/default.nix
+++ b/pkgs/applications/misc/ola/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, autoreconfHook, bison, flex, pkgconfig
-, libuuid, cppunit, protobuf, zlib, avahi, libmicrohttpd
+, libuuid, cppunit, protobuf3_1, zlib, avahi, libmicrohttpd
, perl, python3, python3Packages
}:
@@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ autoreconfHook bison flex pkgconfig perl ];
- buildInputs = [ libuuid cppunit protobuf zlib avahi libmicrohttpd python3 ];
- propagatedBuildInputs = with python3Packages; [ protobuf3_2 numpy ];
+ buildInputs = [ libuuid cppunit protobuf3_1 zlib avahi libmicrohttpd python3 ];
+ propagatedBuildInputs = [ python3Packages.protobuf3_1 python3Packages.numpy ];
configureFlags = [ "--enable-python-libs" ];
diff --git a/pkgs/applications/misc/openbox-menu/default.nix b/pkgs/applications/misc/openbox-menu/default.nix
index 000af950bf12e64b1949314781e21085cd3de495..8ff9a2f44d55a018f77f1cf53c837638902f3836 100644
--- a/pkgs/applications/misc/openbox-menu/default.nix
+++ b/pkgs/applications/misc/openbox-menu/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1hi4b6mq97y6ajq4hhsikbkk23aha7ikaahm92djw48mgj2f1w8l";
};
- buildInputs = [ pkgconfig glib gtk2 menu-cache ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ glib gtk2 menu-cache ];
patches = [ ./with-svg.patch ];
diff --git a/pkgs/applications/misc/openbrf/default.nix b/pkgs/applications/misc/openbrf/default.nix
index be355652ecea149d5b2c27b3aafaa30674bd572a..4aebd3bb2a96b3fb1f29b4db1b999ddee85f6401 100644
--- a/pkgs/applications/misc/openbrf/default.nix
+++ b/pkgs/applications/misc/openbrf/default.nix
@@ -31,6 +31,7 @@ stdenv.mkDerivation {
--set-rpath "${stdenv.lib.makeLibraryPath [ qtbase glew stdenv.cc.cc mesa ]}" \
$out/share/openBrf/openBrf
+ mkdir -p "$out/bin"
ln -s "$out/share/openBrf/openBrf" "$out/bin/openBrf"
'';
diff --git a/pkgs/applications/misc/opencpn/default.nix b/pkgs/applications/misc/opencpn/default.nix
index 056649ad3d268d0d5438f2a56c0526c82c9e5509..3420d6365b4bc46b0a0d2f6a16d6b1514b61a747 100644
--- a/pkgs/applications/misc/opencpn/default.nix
+++ b/pkgs/applications/misc/opencpn/default.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
sha256 = "1m6fp9lf9ki9444h0dq6bj0vr7d0pcxkbjv3j2v76p0ksk2l8kw3";
};
- buildInputs = [ pkgconfig cmake gtk2 wxGTK30 libpulseaudio curl gettext
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ cmake gtk2 wxGTK30 libpulseaudio curl gettext
glib portaudio ];
cmakeFlags = [
diff --git a/pkgs/applications/misc/pcmanx-gtk2/default.nix b/pkgs/applications/misc/pcmanx-gtk2/default.nix
index 65366607c50cb219f7253a703b71a6a076db3ecc..060d4899f4c73b6c16db7cca9fc43be67351e1ec 100644
--- a/pkgs/applications/misc/pcmanx-gtk2/default.nix
+++ b/pkgs/applications/misc/pcmanx-gtk2/default.nix
@@ -7,7 +7,8 @@ stdenv.mkDerivation {
sha256 = "2e5c59f6b568036f2ad6ac67ca2a41dfeeafa185451e507f9fb987d4ed9c4302";
};
- buildInputs = [ gtk2 libXft intltool automake autoconf libtool pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gtk2 libXft intltool automake autoconf libtool ];
preConfigure = ''
./autogen.sh
@@ -17,7 +18,7 @@ stdenv.mkDerivation {
homepage = http://pcman.ptt.cc;
license = licenses.gpl2;
description = "Telnet BBS browser with GTK+ interface";
- maintainers = [ maintainers.mingchuan ];
+ maintainers = [ maintainers.sifmelcara ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/misc/pdfmod/default.nix b/pkgs/applications/misc/pdfmod/default.nix
index ba4a57a191c3e2d429f729981e3f05c997c23379..691f3188b08c59ff92f13a90d168eab1bebdc814 100644
--- a/pkgs/applications/misc/pdfmod/default.nix
+++ b/pkgs/applications/misc/pdfmod/default.nix
@@ -18,8 +18,9 @@ stdenv.mkDerivation rec {
sha256 = "0fpz9ifr6476lqhd5rkb94dm68vlrwdq5w1aaxzgyjgdax9hxx81";
}) ];
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig gnome_doc_utils intltool mono gtk-sharp-2_0 gnome-sharp
+ gnome_doc_utils intltool mono gtk-sharp-2_0 gnome-sharp
hyena which makeWrapper wrapGAppsHook
];
diff --git a/pkgs/applications/misc/pell/default.nix b/pkgs/applications/misc/pell/default.nix
index f79d71ca250588d289a31b0a7260b47914c71b1b..ad2ab147340ea3c8d64b9cab04520b1efb2c7ad5 100644
--- a/pkgs/applications/misc/pell/default.nix
+++ b/pkgs/applications/misc/pell/default.nix
@@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "pell";
- version = "0.0.1";
+ version = "0.0.2";
name = "${pname}-${version}";
src = fetchFromGitHub {
owner = "ebzzry";
repo = pname;
- rev = "3f95341eb9439c7a6be1f3c6366c0552ab8208f0";
- sha256 = "183aj3ys080g2kahl8x8rkhzlsb6h5ls9xm1v2kasfbn1pi5i6nn";
+ rev = "ec14de0a9b666433954184167bf3b82cf21193f8";
+ sha256 = "0r2gbb4l9rr5x99m62zicknsp1gf9fr124xpyd8ak9izr5hvskn9";
};
installPhase = ''
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
homepage = https://github.com/ebzzry/pell;
- description = "A simple periodic host monitor using ping";
+ description = "A simple host availability monitor";
license = licenses.mit;
maintainers = [ maintainers.ebzzry ];
platforms = platforms.unix;
diff --git a/pkgs/applications/misc/pgadmin/default.nix b/pkgs/applications/misc/pgadmin/default.nix
index 968071e454e26eb8c5ac1cdabd8aad58072ab17a..889f516f00b7a399b5025a1d06baa4e5936acab6 100644
--- a/pkgs/applications/misc/pgadmin/default.nix
+++ b/pkgs/applications/misc/pgadmin/default.nix
@@ -1,30 +1,39 @@
-{ stdenv, fetchurl, postgresql, wxGTK, libxml2, libxslt, openssl, zlib, makeDesktopItem }:
+{ stdenv, fetchurl, fetchpatch, postgresql, wxGTK, libxml2, libxslt, openssl, zlib, makeDesktopItem }:
stdenv.mkDerivation rec {
name = "pgadmin3-${version}";
- version = "1.22.1";
+ version = "1.22.2";
src = fetchurl {
- url = "http://ftp.postgresql.org/pub/pgadmin3/release/v${version}/src/pgadmin3-${version}.tar.gz";
- sha256 = "0gkqpj8cg6jd6yhssrij1cbh960rg9fkjbdzcpryi6axwv0ag7ki";
+ url = "http://ftp.postgresql.org/pub/pgadmin/pgadmin3/v${version}/src/pgadmin3-${version}.tar.gz";
+ sha256 = "1b24b356h8z188nci30xrb57l7kxjqjnh6dq9ws638phsgiv0s4v";
};
enableParallelBuilding = true;
buildInputs = [ postgresql wxGTK openssl zlib ];
+ patches = [
+ (fetchpatch {
+ sha256 = "09hp7s3zjz80rpx2j3xyznwswwfxzi70z7c05dzrdk74mqjjpkfk";
+ name = "843344.patch";
+ url = "https://sources.debian.net/data/main/p/pgadmin3/1.22.2-1/debian/patches/843344";
+ })
+ ];
+
preConfigure = ''
substituteInPlace pgadmin/ver_svn.sh --replace "bin/bash" "$shell"
'';
configureFlags = [
+ "--with-pgsql=${postgresql}"
"--with-libxml2=${libxml2.dev}"
"--with-libxslt=${libxslt.dev}"
];
- meta = with stdenv.lib; {
+ meta = with stdenv.lib; {
description = "PostgreSQL administration GUI tool";
- homepage = http://www.pgadmin.org;
+ homepage = https://www.pgadmin.org;
license = licenses.gpl2;
maintainers = with maintainers; [ domenkozar wmertens ];
platforms = platforms.unix;
diff --git a/pkgs/applications/misc/postage/default.nix b/pkgs/applications/misc/pgmanage/default.nix
similarity index 63%
rename from pkgs/applications/misc/postage/default.nix
rename to pkgs/applications/misc/pgmanage/default.nix
index 17f718182e2e85ef8611dece99d6c65d4be33f99..fd66ce8fc31cf644bc35d12fb936809fed5b7559 100644
--- a/pkgs/applications/misc/postage/default.nix
+++ b/pkgs/applications/misc/pgmanage/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, runCommand, postgresql, openssl } :
stdenv.mkDerivation rec {
- name = "postage-${version}";
- version = "3.2.17";
+ name = "pgmanage-${version}";
+ version = "10.0.2";
src = fetchFromGitHub {
- owner = "workflowproducts";
- repo = "postage";
- rev = "eV${version}";
- sha256 = "1c9ss5vx8s05cgw68z7y224qq8z8kz8rxfgcayd2ny200kqyn5bl";
+ owner = "pgManage";
+ repo = "pgManage";
+ rev = "v${version}";
+ sha256 = "0g9kvhs9b6kc1s7j90fqv71amiy9v0w5p906yfvl0j7pf3ayq35a";
};
buildInputs = [ postgresql openssl ];
@@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
the style of NGINX and Node.js. This heart makes Postage as fast as any
PostgreSQL interface can hope to be.
'';
- homepage = http://www.workflowproducts.com/postage.html;
- license = licenses.asl20;
+ homepage = https://github.com/pgManage/pgManage;
+ license = licenses.postgresql;
maintainers = [ maintainers.basvandijk ];
};
}
diff --git a/pkgs/applications/misc/pinfo/default.nix b/pkgs/applications/misc/pinfo/default.nix
index 86dbfc0c5fe13ac5a935b8a93ea30f16b2ef83b5..6d0a348b1f76e9ce1a1d8f8b3955d1d23e5c4ec2 100644
--- a/pkgs/applications/misc/pinfo/default.nix
+++ b/pkgs/applications/misc/pinfo/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation {
sha256 = "0p8wyrpz9npjcbx6c973jspm4c3xz4zxx939nngbq49xqah8088j";
};
- buildInputs = [ autoreconfHook gettext texinfo ncurses readline ];
+ nativeBuildInputs = [ autoreconfHook ];
+ buildInputs = [ gettext texinfo ncurses readline ];
configureFlags = [ "--with-curses=${ncurses.dev}" "--with-readline=${readline.dev}" ];
diff --git a/pkgs/applications/misc/pitz/default.nix b/pkgs/applications/misc/pitz/default.nix
deleted file mode 100644
index dcb36082231f77318488cecbab3e60ed209bdec7..0000000000000000000000000000000000000000
--- a/pkgs/applications/misc/pitz/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, fetchurl, buildPythonApplication, tempita, jinja2, pyyaml, clepy, mock
-, nose, decorator, docutils
-}:
-
-# TODO: pitz has a pitz-shell utility that depends on ipython, but it just
-# errors out and dies (it probably depends on an old ipython version):
-#
-# from IPython.Shell import IPShellEmbed
-# ImportError: No module named Shell
-#
-# pitz-shell is not the primary interface, so it is not critical to have it
-# working. Concider fixing pitz upstream.
-
-buildPythonApplication rec {
- name = "pitz-1.2.4";
- namePrefix = "";
-
- src = fetchurl {
- url = "mirror://pypi/p/pitz/${name}.tar.gz";
- sha256 = "1k7f3h4acllzqy3mjqnjd4w5jskp03s79b7dx3c85vlmd7824smr";
- };
-
- # propagatedBuildInputs is needed for pitz to find its dependencies at
- # runtime. If we use buildInputs it would just build, not run.
- propagatedBuildInputs = [ tempita jinja2 pyyaml clepy mock nose decorator docutils ];
-
- meta = with stdenv.lib; {
- description = "Distributed bugtracker";
- license = licenses.bsd3;
- homepage = http://pitz.tplus1.com/;
- platforms = platforms.linux;
- maintainers = [ maintainers.bjornfor ];
- };
-}
diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix
index b604905320b2acbf6b79ba21ea2e62982698d67d..3f39a356312eb76675b427e02ae413e0071117ff 100644
--- a/pkgs/applications/misc/playonlinux/default.nix
+++ b/pkgs/applications/misc/playonlinux/default.nix
@@ -24,7 +24,7 @@
assert stdenv.isLinux;
let
- version = "4.2.10";
+ version = "4.2.12";
binpath = stdenv.lib.makeBinPath
[ cabextract
@@ -57,7 +57,7 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "https://www.playonlinux.com/script_files/PlayOnLinux/${version}/PlayOnLinux_${version}.tar.gz";
- sha256 = "0ws94hgxajaww450q8ivrp28ypv39mashs29ak41faxf29cr097m";
+ sha256 = "03k8v9dknc5hfrfzqw1nkpifz7wkixv3mvjl1vnp4fx8rj2xrjrq";
};
nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix
index 026a1289fb6191e4431673458c6738104249e877..e88a49740745bce341d09ab0117b050105249c61 100644
--- a/pkgs/applications/misc/polybar/default.nix
+++ b/pkgs/applications/misc/polybar/default.nix
@@ -1,6 +1,6 @@
{ cairo, cmake, fetchgit, libXdmcp, libpthreadstubs, libxcb, pcre, pkgconfig
, python2 , stdenv, xcbproto, xcbutil, xcbutilimage, xcbutilrenderutil
-, xcbutilwm, xcbutilxrm
+, xcbutilwm, xcbutilxrm, fetchpatch
# optional packages-- override the variables ending in 'Support' to enable or
# disable modules
@@ -32,13 +32,21 @@ stdenv.mkDerivation rec {
description = "A fast and easy-to-use tool for creatin status bars.";
longDescription = ''
Polybar aims to help users build beautiful and highly customizable
- status bars for their desktop environment, without the need of
+ status bars for their desktop environment, without the need of
having a black belt in shell scripting.
- '';
+ '';
license = licenses.mit;
maintainers = [ maintainers.afldcr ];
platforms = platforms.unix;
};
+ # This patch should be removed with next stable release.
+ patches = [
+ (fetchpatch {
+ name = "polybar-remove-curlbuild.patch";
+ url = "https://github.com/jaagr/polybar/commit/d35abc7620c8f06618b4708d9a969dfa2f309e96.patch";
+ sha256 = "14xr65vsjvd51hzg9linj09w0nnixgn26dh9lqxy25bxachcyzxy";
+ })
+ ];
buildInputs = [
cairo libXdmcp libpthreadstubs libxcb pcre python2 xcbproto xcbutil
diff --git a/pkgs/applications/misc/posterazor/default.nix b/pkgs/applications/misc/posterazor/default.nix
index 0cd0d29e2f3aebb48f98405dee580918c583f59a..1347840ee674cedcb21ca25ce4ae5a5c21bd8a02 100644
--- a/pkgs/applications/misc/posterazor/default.nix
+++ b/pkgs/applications/misc/posterazor/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
- buildInputs = [ cmake unzip pkgconfig libXpm fltk13 freeimage ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ cmake unzip libXpm fltk13 freeimage ];
unpackPhase = ''
unzip $src -d posterazor
diff --git a/pkgs/applications/misc/pytrainer/default.nix b/pkgs/applications/misc/pytrainer/default.nix
index bc6b4e16a37850d715751d3076c9085995b60aea..ecc4c341a686707b2c9688b5d315b52680e6b540 100644
--- a/pkgs/applications/misc/pytrainer/default.nix
+++ b/pkgs/applications/misc/pytrainer/default.nix
@@ -1,38 +1,45 @@
-{ stdenv, fetchurl, pythonPackages, sqlite, gpsbabel }:
+{ stdenv, fetchFromGitHub, perl, python2Packages, sqlite, gpsbabel
+, withWebKit ? false }:
let
# Pytrainer needs a matplotlib with GTK backend. Also ensure we are
# using the pygtk with glade support as needed by pytrainer.
- matplotlibGtk = pythonPackages.matplotlib.override {
+ matplotlibGtk = python2Packages.matplotlib.override {
enableGtk2 = true;
- pygtk = pythonPackages.pyGtkGlade;
+ pygtk = python2Packages.pyGtkGlade;
};
in
-pythonPackages.buildPythonApplication rec {
+python2Packages.buildPythonApplication rec {
name = "pytrainer-${version}";
- version = "1.10.0";
+ version = "1.11.0";
- src = fetchurl {
- url = "https://github.com/pytrainer/pytrainer/archive/v${version}.tar.gz";
- sha256 = "0l42p630qhymgrcvxgry8chrpzcp6nr3d1vd7vhifh2npfq9l09y";
+ src = fetchFromGitHub {
+ owner = "pytrainer";
+ repo = "pytrainer";
+ rev = "v${version}";
+ sha256 = "1x4f1ydjql0aisvxs5kyi9lx35b4q3768dx42fyzq1nxdwzaqyvy";
};
namePrefix = "";
- # The existing use of pywebkitgtk shows raw HTML text instead of
- # map. This patch solves the problems by showing the file from a
- # string, which allows setting an explicit MIME type.
- patches = [ ./pytrainer-webkit.patch ];
+ patches = [
+ # The test fails in the UTC timezone and C locale.
+ ./fix-test-tz.patch
- propagatedBuildInputs = with pythonPackages; [
- dateutil lxml matplotlibGtk pyGtkGlade pywebkitgtk
- sqlalchemy_migrate
+ # The existing use of pywebkitgtk shows raw HTML text instead of
+ # map. This patch solves the problems by showing the file from a
+ # string, which allows setting an explicit MIME type.
+ ./pytrainer-webkit.patch
];
- buildInputs = [ gpsbabel sqlite ];
+ propagatedBuildInputs = with python2Packages; [
+ dateutil lxml matplotlibGtk pyGtkGlade sqlalchemy_migrate
+ ] ++ stdenv.lib.optional withWebKit [ pywebkitgtk ];
+
+ buildInputs = [ perl gpsbabel sqlite ];
# This package contains no binaries to patch or strip.
dontPatchELF = true;
diff --git a/pkgs/applications/misc/pytrainer/fix-test-tz.patch b/pkgs/applications/misc/pytrainer/fix-test-tz.patch
new file mode 100644
index 0000000000000000000000000000000000000000..359e28c41c34f4ec9d1e15238f6a264e6c618aa1
--- /dev/null
+++ b/pkgs/applications/misc/pytrainer/fix-test-tz.patch
@@ -0,0 +1,33 @@
+diff -Nurp pytrainer-v1.11.0-a/pytrainer/test/core/test_activity.py pytrainer-v1.11.0-b/pytrainer/test/core/test_activity.py
+--- pytrainer-v1.11.0-a/pytrainer/test/core/test_activity.py 1980-01-02 00:00:00.000000000 +0100
++++ pytrainer-v1.11.0-b/pytrainer/test/core/test_activity.py 2017-09-30 18:56:43.127016847 +0200
+@@ -69,7 +69,7 @@ class ActivityTest(unittest.TestCase):
+ self.assertEquals(self.activity.time, self.activity.duration)
+
+ def test_activity_starttime(self):
+- self.assertEquals(self.activity.starttime, '12:58:23 PM')
++ self.assertEquals(self.activity.starttime, '12:58:23')
+
+ def test_activity_time_tuple(self):
+ self.assertEquals(self.activity.time_tuple, (2, 3, 46))
+diff -Nurp pytrainer-v1.11.0-a/pytrainer/test/imports/test_garmintcxv2.py pytrainer-v1.11.0-b/pytrainer/test/imports/test_garmintcxv2.py
+--- pytrainer-v1.11.0-a/pytrainer/test/imports/test_garmintcxv2.py 1980-01-02 00:00:00.000000000 +0100
++++ pytrainer-v1.11.0-b/pytrainer/test/imports/test_garmintcxv2.py 2017-09-30 18:55:45.078128980 +0200
+@@ -23,7 +23,7 @@ class GarminTCXv2Test(unittest.TestCase)
+ self.fail()
+
+ def test_workout_summary(self):
+- summary = [(0, False, '2012-10-14T12:02:42', '10.12', '00:39:51', 'Running')]
++ summary = [(0, False, '2012-10-14T10:02:42', '10.12', '00:39:51', 'Running')]
+ try:
+ current_path = os.path.dirname(os.path.abspath(__file__))
+ data_path = os.path.dirname(os.path.dirname(os.path.dirname(current_path))) + "/"
+diff -Nurp pytrainer-v1.11.0-a/pytrainer/test/lib/test_date.py pytrainer-v1.11.0-b/pytrainer/test/lib/test_date.py
+--- pytrainer-v1.11.0-a/pytrainer/test/lib/test_date.py 1980-01-02 00:00:00.000000000 +0100
++++ pytrainer-v1.11.0-b/pytrainer/test/lib/test_date.py 2017-09-30 18:56:23.448720166 +0200
+@@ -45,4 +45,4 @@ class DateFunctionTest(unittest.TestCase
+ def test_getDateTime(self):
+ utctime, localtime = getDateTime('Tue Nov 24 17:29:05 UTC 2015')
+ self.assertEqual(datetime.datetime(2015, 11, 24, 17, 29, 5, tzinfo=tzutc()), utctime)
+- self.assertEqual(datetime.datetime(2015, 11, 24, 19, 29, 5, tzinfo=tzlocal()), localtime)
++ self.assertEqual(datetime.datetime(2015, 11, 24, 17, 29, 5, tzinfo=tzlocal()), localtime)
diff --git a/pkgs/applications/misc/qmapshack/default.nix b/pkgs/applications/misc/qmapshack/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..7330dfa4f1998080395821d1403582d38dad8996
--- /dev/null
+++ b/pkgs/applications/misc/qmapshack/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchFromBitbucket, cmake, qtscript, qtwebkit, gdal, proj, routino, quazip }:
+
+stdenv.mkDerivation rec {
+ name = "qmapshack-${version}";
+ version = "1.9.1";
+
+ src = fetchFromBitbucket {
+ owner = "maproom";
+ repo = "qmapshack";
+ rev = "V%20${version}";
+ sha256 = "1yswdq1s9jjhwb3wfiy3kkiiaqzagw28vjqvl13jxcnmq7y763sr";
+ };
+
+ nativeBuildInputs = [ cmake ];
+
+ buildInputs = [ qtscript qtwebkit gdal proj routino quazip ];
+
+ cmakeFlags = [
+ "-DROUTINO_XML_PATH=${routino}/share/routino"
+ "-DQUAZIP_INCLUDE_DIR=${quazip}/include/quazip"
+ "-DLIBQUAZIP_LIBRARY=${quazip}/lib/libquazip.so"
+ ];
+
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
+ homepage = https://bitbucket.org/maproom/qmapshack/wiki/Home;
+ description = "Plan your next outdoor trip";
+ license = licenses.gpl3;
+ maintainter = with maintainers; [ dotlambda ];
+ platforms = with platforms; linux;
+ };
+}
diff --git a/pkgs/applications/misc/qpdfview/default.nix b/pkgs/applications/misc/qpdfview/default.nix
index 5cbf94114357bad2c7ecd61d0d4d39c359376fd1..e3e7ff950b0c82c9c53e595b8df8a8cf01afd7da 100644
--- a/pkgs/applications/misc/qpdfview/default.nix
+++ b/pkgs/applications/misc/qpdfview/default.nix
@@ -10,13 +10,14 @@ let
url="https://launchpad.net/qpdfview/trunk/${version}/+download/qpdfview-${version}.tar.gz";
sha256 = "0zysjhr58nnmx7ba01q3zvgidkgcqxjdj4ld3gx5fc7wzvl1dm7s";
};
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- qt4 poppler_qt4 pkgconfig djvulibre libspectre cups file ghostscript
+ qt4 poppler_qt4 djvulibre libspectre cups file ghostscript
];
in
stdenv.mkDerivation {
inherit (s) name version;
- inherit buildInputs;
+ inherit nativeBuildInputs buildInputs;
src = fetchurl {
inherit (s) url sha256;
};
diff --git a/pkgs/applications/misc/quicksynergy/default.nix b/pkgs/applications/misc/quicksynergy/default.nix
index bed1d1fc97c495fabffad5a138e3d8c7d64da417..b2616bf7b778549809cd01833e093b085a43d1f0 100644
--- a/pkgs/applications/misc/quicksynergy/default.nix
+++ b/pkgs/applications/misc/quicksynergy/default.nix
@@ -7,8 +7,9 @@ stdenv.mkDerivation rec {
url = "mirror://sourceforge/project/quicksynergy/Linux/${version}/quicksynergy-${version}.tar.gz";
sha256 = "1pi8503bg8q1psw50y6d780i33nnvfjqiy9vnr3v52pdcfip8pix";
};
+
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig
gtk2
synergy
];
@@ -28,7 +29,7 @@ stdenv.mkDerivation rec {
Remember to open port 24800 (used by synergys program) if you want to
host mouse and keyboard.";
- homepage = https://code.google.com/p/quicksynergy/;
+ homepage = https://sourceforge.net/projects/quicksynergy/;
license = stdenv.lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.spinus ];
platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/misc/redis-desktop-manager/default.nix b/pkgs/applications/misc/redis-desktop-manager/default.nix
index 8bbfbaf7cf0efa11bfb88f683e4411f80281b1e6..59d22b967b57db77fea780ac749c42ee5fdfd3f0 100644
--- a/pkgs/applications/misc/redis-desktop-manager/default.nix
+++ b/pkgs/applications/misc/redis-desktop-manager/default.nix
@@ -24,10 +24,9 @@ stdenv.mkDerivation rec {
sha256 = "0a7xa39qp1q32zkypw32mm3wi8wbhxhvrm6l3xsa3k1jzih7hzxr";
};
- nativeBuildInputs = [ qmake ];
-
+ nativeBuildInputs = [ pkgconfig qmake ];
buildInputs = [
- pkgconfig libssh2 qtbase qtdeclarative qtgraphicaleffects qtimageformats
+ libssh2 qtbase qtdeclarative qtgraphicaleffects qtimageformats
qtquick1 qtquickcontrols qtsvg qttools
];
diff --git a/pkgs/applications/misc/redshift-plasma-applet/default.nix b/pkgs/applications/misc/redshift-plasma-applet/default.nix
index 18e49176edc64b07854497021a8cb3805a1d7c2c..03b8d709fce2d11575a1e19277bee6c7a9d19c81 100644
--- a/pkgs/applications/misc/redshift-plasma-applet/default.nix
+++ b/pkgs/applications/misc/redshift-plasma-applet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, cmake, extra-cmake-modules, plasma-framework, redshift, fetchFromGitHub, }:
+{ stdenv, cmake, extra-cmake-modules, plasma-framework, kwindowsystem, redshift, fetchFromGitHub, }:
let version = "1.0.18"; in
@@ -29,7 +29,10 @@ stdenv.mkDerivation {
extra-cmake-modules
];
- buildInputs = [ plasma-framework ];
+ buildInputs = [
+ plasma-framework
+ kwindowsystem
+ ];
meta = with stdenv.lib; {
description = "KDE Plasma 5 widget for controlling Redshift";
diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix
index 03d058783b23bde5d5ac9101d91989f4d3eb446b..8b93dd51406b3087dad5cfd2c3d69a8cfb449a9c 100644
--- a/pkgs/applications/misc/rescuetime/default.nix
+++ b/pkgs/applications/misc/rescuetime/default.nix
@@ -9,14 +9,14 @@ let
} else fetchurl {
name = "rescuetime-installer.deb";
url = "https://www.rescuetime.com/installers/rescuetime_current_amd64.deb";
- sha256 = "161f71kvcrilv9qxldwn8xsqs2g9c2f2g9wb5brbfc0lqbbc8n89";
+ sha256 = "1xjwaqz0gs12ndgw7c2f1nkvj0nqcl0bxhd54pwk0dwrx9pn9avz";
};
in
stdenv.mkDerivation {
# https://www.rescuetime.com/updates/linux_release_notes.html
- name = "rescuetime-2.9.11.1285";
+ name = "rescuetime-2.9.11.1300";
inherit src;
buildInputs = [ dpkg makeWrapper ];
unpackPhase = ''
diff --git a/pkgs/applications/misc/robo3t/default.nix b/pkgs/applications/misc/robo3t/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..fc7ff48423948be9e51600c895220e1689712374
--- /dev/null
+++ b/pkgs/applications/misc/robo3t/default.nix
@@ -0,0 +1,77 @@
+{ stdenv, fetchurl, zlib, glib, xorg, dbus, fontconfig,
+ freetype, xkeyboard_config, makeDesktopItem, makeWrapper }:
+
+stdenv.mkDerivation rec {
+ name = "robo3t-${version}";
+ version = "1.1.1";
+
+ src = fetchurl {
+ url = "https://download.robomongo.org/1.1.1/linux/robo3t-${version}-linux-x86_64-c93c6b0.tar.gz";
+ sha256 = "140cn80vg7c8vpdjasqi4b3kyqj4n033lcm3ikz5674x3jr7r5zs";
+ };
+
+ icon = fetchurl {
+ url = "https://github.com/Studio3T/robomongo/raw/${version}/trash/install/linux/robomongo.png";
+ sha256 = "15li8536x600kkfkb3h6mw7y0f2ljkv951pc45dpiw036vldibv2";
+ };
+
+ desktopItem = makeDesktopItem {
+ name = "robo3t";
+ exec = "robo3t";
+ icon = icon;
+ comment = "Query GUI for mongodb";
+ desktopName = "Robo3T";
+ genericName = "MongoDB management tool";
+ categories = "Development;IDE;mongodb;";
+ };
+
+ nativeBuildInputs = [makeWrapper];
+
+ ldLibraryPath = stdenv.lib.makeLibraryPath [
+ stdenv.cc.cc
+ zlib
+ glib
+ xorg.libXi
+ xorg.libxcb
+ xorg.libXrender
+ xorg.libX11
+ xorg.libSM
+ xorg.libICE
+ xorg.libXext
+ dbus
+ fontconfig
+ freetype
+ ];
+
+ installPhase = ''
+ BASEDIR=$out/lib/robo3t
+
+ mkdir -p $BASEDIR/bin
+ cp bin/* $BASEDIR/bin
+
+ mkdir -p $BASEDIR/lib
+ cp -r lib/* $BASEDIR/lib
+
+ mkdir -p $out/share/applications
+ cp $desktopItem/share/applications/* $out/share/applications
+
+ mkdir -p $out/share/icons
+ cp ${icon} $out/share/icons/robomongo.png
+
+ patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 $BASEDIR/bin/robo3t
+
+ mkdir $out/bin
+
+ makeWrapper $BASEDIR/bin/robo3t $out/bin/robo3t \
+ --suffix LD_LIBRARY_PATH : ${ldLibraryPath} \
+ --suffix QT_XKB_CONFIG_ROOT : ${xkeyboard_config}/share/X11/xkb
+ '';
+
+ meta = {
+ homepage = https://robomongo.org/;
+ description = "Query GUI for mongodb";
+ platforms = stdenv.lib.intersectLists stdenv.lib.platforms.linux stdenv.lib.platforms.x86_64;
+ license = stdenv.lib.licenses.gpl3;
+ maintainers = [ stdenv.lib.maintainers.eperuffo ];
+ };
+}
diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix
index 3c4cf27308bbb6a8b9b543bbf54b3ad01e55dea9..bdf14c03bcc2feb29ee120e836215b28120abe56 100644
--- a/pkgs/applications/misc/rofi/default.nix
+++ b/pkgs/applications/misc/rofi/default.nix
@@ -1,14 +1,15 @@
{ stdenv, fetchurl, autoreconfHook, pkgconfig, libxkbcommon, pango, which, git
, cairo, glib, libxcb, xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification
+, bison, flex, librsvg, check
}:
stdenv.mkDerivation rec {
- version = "1.3.1";
+ version = "1.4.2";
name = "rofi-${version}";
src = fetchurl {
url = "https://github.com/DaveDavenport/rofi/releases/download/${version}/${name}.tar.gz";
- sha256 = "09i3vd8k6zqphrm382fglsmxc4q6dg00xddzl96kakszgvdd4qfs";
+ sha256 = "0ys7grazqz5hw3nx2393df54ykcd5gw0zn66kik5fvzijpg3qfcx";
};
preConfigure = ''
@@ -17,7 +18,8 @@ stdenv.mkDerivation rec {
sed -i 's/~root/~nobody/g' test/helper-expand.c
'';
- buildInputs = [ autoreconfHook pkgconfig libxkbcommon pango cairo git
+ nativeBuildInputs = [ autoreconfHook pkgconfig ];
+ buildInputs = [ libxkbcommon pango cairo git bison flex librsvg check
libstartup_notification libxcb xcbutil xcbutilwm xcbutilxrm which
];
doCheck = true;
diff --git a/pkgs/applications/misc/rtl-sdr/default.nix b/pkgs/applications/misc/rtl-sdr/default.nix
index fb6e9e86e5995e3fdf8e554d4bc32cab44d11bb4..652dd9d5e650696ca9b907398437a7ddc09885e1 100644
--- a/pkgs/applications/misc/rtl-sdr/default.nix
+++ b/pkgs/applications/misc/rtl-sdr/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "1dh52xcvxkjb3mj80wlm20grz8cqf5wipx2ksi91ascz12b5pym6";
};
- buildInputs = [ cmake pkgconfig libusb1 ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ cmake libusb1 ];
# TODO: get these fixes upstream:
# * Building with -DINSTALL_UDEV_RULES=ON tries to install udev rules to
diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix
index fbf9a9335675a01d2f1853623fc494f5608424b3..02af4c28d593b1324846ca8ea52994444ef3ee60 100644
--- a/pkgs/applications/misc/rtv/default.nix
+++ b/pkgs/applications/misc/rtv/default.nix
@@ -2,16 +2,19 @@
with pythonPackages;
buildPythonApplication rec {
- version = "1.15.1";
+ version = "1.19.0";
name = "rtv-${version}";
src = fetchFromGitHub {
owner = "michael-lazar";
repo = "rtv";
rev = "v${version}";
- sha256 = "037dhds1prxj7vsq15dr46wk3pfk3ixr0d60m3h796b6nbc1spya";
+ sha256 = "19rnw9cac06ns10vqn2cj0v61ycrj9g1ysa3hncamwxxibmkycp7";
};
+ # Tests try to access network
+ doCheck = false;
+
checkPhase = ''
py.test
'';
diff --git a/pkgs/applications/misc/rxvt/default.nix b/pkgs/applications/misc/rxvt/default.nix
index e8914b75b8a5b210ca7ba290a62be4f3cb59a500..8e63cdb6d16cb16c640ea17052700610d8b645d1 100644
--- a/pkgs/applications/misc/rxvt/default.nix
+++ b/pkgs/applications/misc/rxvt/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "0jfl71gz3k7zh3kxdb8lxi06kajjnx7bq1rxjgk680l209jxask1";
};
- buildInputs = [ pkgconfig libtool libX11 libXt libXpm ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ libtool libX11 libXt libXpm ];
configurePhase = ''
LIBTOOL=${libtool}/bin/libtool ./configure --prefix=$out --enable-everything --enable-smart-resize --enable-256-color
diff --git a/pkgs/applications/misc/sc-im/default.nix b/pkgs/applications/misc/sc-im/default.nix
index 1ed6e4d70c9366d31c6494092021600665257c66..c093a75160315c9ad2e0639f347314f16214ea7a 100644
--- a/pkgs/applications/misc/sc-im/default.nix
+++ b/pkgs/applications/misc/sc-im/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "02ak3b0vv72mv38cwvy7qp0y6hgrzcgahkv1apgks3drpnz5w1sj";
};
- buildInputs = [ yacc ncurses libxml2 libzip libxls pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ yacc ncurses libxml2 libzip libxls ];
buildPhase = ''
cd src
diff --git a/pkgs/applications/misc/sdcv/default.nix b/pkgs/applications/misc/sdcv/default.nix
index f808ec611a33c642c512cdeb84b950b2c6853996..bf2de3a5f1b95e8039afd37e6e00d6c51f605330 100644
--- a/pkgs/applications/misc/sdcv/default.nix
+++ b/pkgs/applications/misc/sdcv/default.nix
@@ -1,34 +1,32 @@
-{ stdenv, fetchurl, pkgconfig, glib, gettext }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, glib, gettext, readline }:
stdenv.mkDerivation rec {
- name= "sdcv-0.4.2";
-
- meta = {
- homepage = http://sdcv.sourceforge.net/;
- description = "Console version of StarDict program";
- maintainers = with stdenv.lib.maintainers; [ lovek323 ];
- license = stdenv.lib.licenses.gpl2;
- platforms = stdenv.lib.platforms.linux;
- };
-
- src = fetchurl {
- url = "mirror://sourceforge/sdcv/${name}.tar.bz2";
- sha256 = "1cnyv7gd1qvz8ma8545d3aq726wxrx4km7ykl97831irx5wz0r51";
+ name = "sdcv-${version}";
+ version = "0.5.2";
+
+ src = fetchFromGitHub {
+ owner = "Dushistov";
+ repo = "sdcv";
+ rev = "v${version}";
+ sha256 = "1b67s4nj0s5fh3cjk7858qvhiisc557xx72xwzrb8hq6ijpwx5k0";
};
hardeningDisable = [ "format" ];
+ nativeBuildInputs = [ cmake pkgconfig ];
+ buildInputs = [ glib gettext readline ];
- patches = ( if stdenv.isDarwin
- then [ ./sdcv.cpp.patch-darwin ./utils.hpp.patch ]
- else [ ./sdcv.cpp.patch ] );
-
- buildInputs = [ pkgconfig glib gettext ];
-
- preBuild = ''
- sed -i 's/guint32 page_size/size_t page_size/' src/lib/lib.cpp
+ preInstall = ''
+ touch locale
'';
NIX_CFLAGS_COMPILE = "-D__GNU_LIBRARY__"
+ stdenv.lib.optionalString stdenv.isDarwin " -lintl";
-}
+ meta = with stdenv.lib; {
+ homepage = https://dushistov.github.io/sdcv/;
+ description = "Console version of StarDict";
+ maintainers = with maintainers; [ lovek323 ];
+ license = licenses.gpl2;
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/misc/sdcv/sdcv.cpp.patch b/pkgs/applications/misc/sdcv/sdcv.cpp.patch
deleted file mode 100644
index 6f835f16e4583d33ca91d3a472f45527b589638d..0000000000000000000000000000000000000000
--- a/pkgs/applications/misc/sdcv/sdcv.cpp.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/utils.hpp
-+++ b/src/utils.hpp
-@@ -2,6 +2,9 @@
- #define _UTILS_HPP_
-
- #include
-+#include
-+#include
-+
- using std::string;
-
- extern bool stdio_getline(FILE *in, string &str);
diff --git a/pkgs/applications/misc/sdcv/sdcv.cpp.patch-darwin b/pkgs/applications/misc/sdcv/sdcv.cpp.patch-darwin
deleted file mode 100644
index 2ee9a24e03477c35f8d2415d3b128cba22d18cee..0000000000000000000000000000000000000000
--- a/pkgs/applications/misc/sdcv/sdcv.cpp.patch-darwin
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/src/sdcv.cpp
-+++ b/src/sdcv.cpp
-@@ -27,13 +27,13 @@
- #include
- #include
- #include
-+#include
-+#include
-+#include
- #include
- #include
- #include
- #include
--#include
--#include
--#include
-
- #include "libwrapper.hpp"
- #include "readline.hpp"
diff --git a/pkgs/applications/misc/sdcv/utils.hpp.patch b/pkgs/applications/misc/sdcv/utils.hpp.patch
deleted file mode 100644
index c08641abd6b936ceee6d1ac8699dfe32f28be8b5..0000000000000000000000000000000000000000
--- a/pkgs/applications/misc/sdcv/utils.hpp.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/utils.hpp
-+++ b/src/utils.hpp
-@@ -2,6 +2,7 @@
- #define _UTILS_HPP_
-
- #include
-+#include
- using std::string;
-
- extern bool stdio_getline(FILE *in, string &str);
diff --git a/pkgs/applications/misc/sent/default.nix b/pkgs/applications/misc/sent/default.nix
index c6430af55608d10d5d07bde98fdda23bf95a738b..24e76500a6a5c9daee93d0fe1d31d5d20ed14e84 100644
--- a/pkgs/applications/misc/sent/default.nix
+++ b/pkgs/applications/misc/sent/default.nix
@@ -1,15 +1,18 @@
-{ stdenv, fetchurl, libpng, libX11, libXft
+{ stdenv, fetchurl, farbfeld, libX11, libXft
, patches ? [] }:
stdenv.mkDerivation rec {
- name = "sent-0.2";
+ name = "sent-1";
src = fetchurl {
- url = "http://dl.suckless.org/tools/${name}.tar.gz";
- sha256 = "0xhh752hwaa26k4q6wvrb9jnpbnylss2aw6z11j7l9rav7wn3fak";
+ url = "https://dl.suckless.org/tools/${name}.tar.gz";
+ sha256 = "0cxysz5lp25mgww73jl0mgip68x7iyvialyzdbriyaff269xxwvv";
};
- buildInputs = [ libpng libX11 libXft ];
+ buildInputs = [ farbfeld libX11 libXft ];
+
+ # unpacking doesn't create a directory
+ sourceRoot = ".";
inherit patches;
@@ -17,8 +20,8 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A simple plaintext presentation tool";
- homepage = http://tools.suckless.org/sent/;
- license = licenses.mit;
+ homepage = https://tools.suckless.org/sent/;
+ license = licenses.isc;
platforms = platforms.linux;
maintainers = with maintainers; [ pSub ];
};
diff --git a/pkgs/applications/misc/slic3r/default.nix b/pkgs/applications/misc/slic3r/default.nix
index 64bcb0e192108faafc419f31cdae473ee593c7e9..8624cc9dda589ad4c46ca9e29f81c83f2380b850 100644
--- a/pkgs/applications/misc/slic3r/default.nix
+++ b/pkgs/applications/misc/slic3r/default.nix
@@ -12,6 +12,10 @@ stdenv.mkDerivation rec {
sha256 = "1z8h11k29b7z49z5k8ikyfiijyycy1q3krlzi8hfd0vdybvymw21";
};
+ patches = [
+ ./gcc6.patch
+ ];
+
buildInputs = with perlPackages; [ perl makeWrapper which
EncodeLocale MathClipper ExtUtilsXSpp threads
MathConvexHullMonotoneChain MathGeometryVoronoi MathPlanePath Moo
@@ -31,6 +35,7 @@ stdenv.mkDerivation rec {
buildPhase = ''
export SLIC3R_NO_AUTO=true
+ export LD=$CXX
export PERL5LIB="./xs/blib/arch/:./xs/blib/lib:$PERL5LIB"
substituteInPlace Build.PL \
diff --git a/pkgs/applications/misc/slic3r/gcc6.patch b/pkgs/applications/misc/slic3r/gcc6.patch
new file mode 100644
index 0000000000000000000000000000000000000000..f382a252f0d0794952a7362fb41c677742ee42a1
--- /dev/null
+++ b/pkgs/applications/misc/slic3r/gcc6.patch
@@ -0,0 +1,40 @@
+diff --git i/xs/src/libslic3r/Config.hpp w/xs/src/libslic3r/Config.hpp
+index 49e999b..d9b65d8 100644
+--- i/xs/src/libslic3r/Config.hpp
++++ w/xs/src/libslic3r/Config.hpp
+@@ -65,7 +65,7 @@ class ConfigOptionFloat : public ConfigOption
+
+ bool deserialize(std::string str) {
+ std::istringstream iss(str);
+- return iss >> this->value;
++ return bool(iss >> this->value);
+ };
+ };
+
+@@ -124,7 +124,7 @@ class ConfigOptionInt : public ConfigOption
+
+ bool deserialize(std::string str) {
+ std::istringstream iss(str);
+- return iss >> this->value;
++ return bool(iss >> this->value);
+ };
+ };
+
+@@ -249,7 +249,7 @@ class ConfigOptionPercent : public ConfigOption
+ bool deserialize(std::string str) {
+ // don't try to parse the trailing % since it's optional
+ std::istringstream iss(str);
+- return iss >> this->value;
++ return bool(iss >> this->value);
+ };
+ };
+
+@@ -279,7 +279,7 @@ class ConfigOptionFloatOrPercent : public ConfigOption
+ bool deserialize(std::string str) {
+ this->percent = str.find_first_of("%") != std::string::npos;
+ std::istringstream iss(str);
+- return iss >> this->value;
++ return bool(iss >> this->value);
+ };
+ };
+
diff --git a/pkgs/applications/misc/spacefm/default.nix b/pkgs/applications/misc/spacefm/default.nix
index f4e1eef283633f80c9adadc57bebb07ea4e5f763..5fffa6681cb213cd8a7c92124afcf5525941a97d 100644
--- a/pkgs/applications/misc/spacefm/default.nix
+++ b/pkgs/applications/misc/spacefm/default.nix
@@ -26,8 +26,9 @@ stdenv.mkDerivation rec {
ln -s /etc/spacefm/spacefm.conf $out/etc/spacefm/spacefm.conf
'';
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- gtk3 udev desktop_file_utils shared_mime_info intltool pkgconfig
+ gtk3 udev desktop_file_utils shared_mime_info intltool
wrapGAppsHook ffmpegthumbnailer jmtpfs lsof udisks
] ++ (if ifuseSupport then [ ifuse ] else []);
# Introduced because ifuse doesn't build due to CVEs in libplist
diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix
index 16d6ca2e26fa672e5d26f0018587da36f480f7fa..59e67fc65e2e70a498398f5ab3747278a23b4679 100644
--- a/pkgs/applications/misc/st/default.nix
+++ b/pkgs/applications/misc/st/default.nix
@@ -17,14 +17,16 @@ in stdenv.mkDerivation rec {
configFile = optionalString (conf!=null) (writeText "config.def.h" conf);
preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h";
- buildInputs = [ pkgconfig libX11 ncurses libXext libXft fontconfig ] ++ extraLibs;
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ libX11 ncurses libXext libXft fontconfig ] ++ extraLibs;
installPhase = ''
TERMINFO=$out/share/terminfo make install PREFIX=$out
'';
meta = {
- homepage = http://st.suckless.org/;
+ homepage = https://st.suckless.org/;
+ description = "Simple Terminal for X from Suckless.org Community";
license = licenses.mit;
maintainers = with maintainers; [viric andsild];
platforms = platforms.linux;
diff --git a/pkgs/applications/misc/st/wayland.nix b/pkgs/applications/misc/st/wayland.nix
index ab890c8db718703d219167c17e366365fd7cb423..69794b1cffbdff52b8fe319c98b31b7a752a36b5 100644
--- a/pkgs/applications/misc/st/wayland.nix
+++ b/pkgs/applications/misc/st/wayland.nix
@@ -19,7 +19,8 @@ stdenv.mkDerivation rec {
configFile = optionalString (conf!=null) (writeText "config.def.h" conf);
preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h";
- buildInputs = [ pkgconfig ncurses wayland wld libxkbcommon fontconfig pixman ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ ncurses wayland wld libxkbcommon fontconfig pixman ];
NIX_LDFLAGS = "-lfontconfig";
diff --git a/pkgs/applications/misc/st/xst.nix b/pkgs/applications/misc/st/xst.nix
index 05e34cc5c305ae75c47408cf119d412cb90f3db6..877990861fd7997fb0cd35dba25cf783358aa172 100644
--- a/pkgs/applications/misc/st/xst.nix
+++ b/pkgs/applications/misc/st/xst.nix
@@ -15,7 +15,8 @@ in stdenv.mkDerivation {
sha256 = "1fh4y2w0icaij99kihl3w8j5d5b38d72afp17c81pi57f43ss6pc";
};
- buildInputs = [ pkgconfig libX11 ncurses libXext libXft fontconfig ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ libX11 ncurses libXext libXft fontconfig ];
installPhase = ''
TERMINFO=$out/share/terminfo make install PREFIX=$out
diff --git a/pkgs/applications/misc/stupidterm/default.nix b/pkgs/applications/misc/stupidterm/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..5701997fd299ec8580e9028d31e97c53c40a950e
--- /dev/null
+++ b/pkgs/applications/misc/stupidterm/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitHub, pkgconfig, vte, gtk }:
+
+stdenv.mkDerivation rec {
+ name = "stupidterm-2017-03-15";
+
+ nativeBuildInputs = [ pkgconfig ];
+
+ buildInputs = [ vte gtk ];
+
+ src = fetchFromGitHub {
+ owner = "esmil";
+ repo = "stupidterm";
+ rev = "752316a783f52317ffd9f05d32e208dbcafc5ba6";
+ sha256 = "1d8fyhr9sgpxgkwzkyiws0kvhmqfwwyycvcr1qf2wjldiax222lv";
+ };
+
+ makeFlags = "PKGCONFIG=${pkgconfig}/bin/pkg-config binary=stupidterm";
+
+ installPhase = ''
+ mkdir -p $out/bin $out/share/applications $out/share/stupidterm
+ cp stupidterm $out/bin
+ substituteAll ${./stupidterm.desktop} $out/share/applications/stupidterm.desktop
+ substituteAll stupidterm.ini $out/share/stupidterm/stupidterm.ini
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Simple wrapper around the VTE terminal emulator widget for GTK+";
+ longDescription = ''
+ Simple wrapper around the VTE terminal emulator widget for GTK+
+ '';
+ homepage = https://github.com/esmil/stupidterm;
+ license = licenses.lgpl3Plus;
+ maintainers = [ maintainers.etu ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/misc/stupidterm/stupidterm.desktop b/pkgs/applications/misc/stupidterm/stupidterm.desktop
new file mode 100644
index 0000000000000000000000000000000000000000..c26d46060183f1cee61b8e38356f933f6f4e1361
--- /dev/null
+++ b/pkgs/applications/misc/stupidterm/stupidterm.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Version=20170315
+Name=stupidterm
+Comment=VTE based terminal emulator
+Exec=stupidterm
+Icon=utilities-terminal
+Terminal=false
+Type=Application
+Categories=System;TerminalEmulator;
diff --git a/pkgs/applications/misc/styx/default.nix b/pkgs/applications/misc/styx/default.nix
index 8e3b0e747ae18765f3afe6d0f2ee918b66a93538..2cdf047a10fc7236db97779e5579c0429262b8ba 100644
--- a/pkgs/applications/misc/styx/default.nix
+++ b/pkgs/applications/misc/styx/default.nix
@@ -4,22 +4,22 @@
stdenv.mkDerivation rec {
name = "styx-${version}";
- version = "0.6.0";
+ version = "0.7.0";
src = fetchFromGitHub {
owner = "styx-static";
repo = "styx";
rev = "v${version}";
- sha256 = "1dl6zmic8bv17f3ib8by66c2fj7izlnv9dh2cfa2m0ipkxk930vk";
+ sha256 = "044zpj92w96csaddf1qnnc2w2w9iq4b7rzlqqsqnd1s0a87lm1qd";
};
- setSourceRoot = "cd styx-*/src; export sourceRoot=`pwd`";
-
server = "${caddy.bin}/bin/caddy";
linkcheck = "${linkchecker}/bin/linkchecker";
nativeBuildInputs = [ asciidoctor ];
+ outputs = [ "out" "lib" "themes" ];
+
propagatedBuildInputs = [
file
lessc
@@ -30,39 +30,42 @@ stdenv.mkDerivation rec {
(python27.withPackages (ps: [ ps.parsimonious ]))
];
- outputs = [ "out" "lib" ];
-
installPhase = ''
mkdir $out
- install -D -m 777 styx.sh $out/bin/styx
+ install -D -m 777 src/styx.sh $out/bin/styx
- mkdir -p $out/share/styx
- cp -r scaffold $out/share/styx
- cp -r nix $out/share/styx
+ mkdir -p $out/share/styx-src
+ cp -r ./* $out/share/styx-src
mkdir -p $out/share/doc/styx
- asciidoctor doc/index.adoc -o $out/share/doc/styx/index.html
- asciidoctor doc/styx-themes.adoc -o $out/share/doc/styx/styx-themes.html
- asciidoctor doc/library.adoc -o $out/share/doc/styx/library.html
- cp -r doc/highlight $out/share/doc/styx/
- cp -r doc/imgs $out/share/doc/styx/
- cp -r tools $out/share
+ asciidoctor src/doc/index.adoc -o $out/share/doc/styx/index.html
+ asciidoctor src/doc/styx-themes.adoc -o $out/share/doc/styx/styx-themes.html
+ asciidoctor src/doc/library.adoc -o $out/share/doc/styx/library.html
+ cp -r src/doc/highlight $out/share/doc/styx/
+ cp -r src/doc/imgs $out/share/doc/styx/
substituteAllInPlace $out/bin/styx
substituteAllInPlace $out/share/doc/styx/index.html
substituteAllInPlace $out/share/doc/styx/styx-themes.html
substituteAllInPlace $out/share/doc/styx/library.html
+ mkdir -p $out/share/styx/scaffold
+ cp -r src/scaffold $out/share/styx
+ cp -r src/tools $out/share/styx
+
mkdir $lib
- cp -r lib/* $lib
+ cp -r src/lib/* $lib
+
+ mkdir $themes
+ cp -r themes/* $themes
'';
meta = with stdenv.lib; {
- description = "Nix based static site generator";
- maintainers = with maintainers; [ ericsagnes ];
- homepage = https://styx-static.github.io/styx-site/;
+ description = "Nix based static site generator";
+ maintainers = with maintainers; [ ericsagnes ];
+ homepage = https://styx-static.github.io/styx-site/;
downloadPage = https://github.com/styx-static/styx/;
- platforms = platforms.all;
- license = licenses.mit;
+ platforms = platforms.all;
+ license = licenses.mit;
};
}
diff --git a/pkgs/applications/misc/styx/themes.nix b/pkgs/applications/misc/styx/themes.nix
deleted file mode 100644
index e0bea3b23b6b20f14ac6e83cb6c835b2c7e4c024..0000000000000000000000000000000000000000
--- a/pkgs/applications/misc/styx/themes.nix
+++ /dev/null
@@ -1,104 +0,0 @@
-{ fetchFromGitHub, stdenv }:
-
-let
-
- mkThemeDrv = args: stdenv.mkDerivation {
- name = "styx-theme-${args.themeName}-${args.version}";
-
- src = fetchFromGitHub ({
- owner = "styx-static";
- repo = "styx-theme-${args.themeName}";
- } // args.src);
-
- installPhase = ''
- mkdir $out
- cp -r * $out/
- '';
-
- preferLocalBuild = true;
-
- meta = with stdenv.lib; {
- maintainer = with maintainers; [ ericsagnes ];
- description = "${args.themeName} theme for styx";
- platforms = platforms.all;
- } // args.meta;
- };
-
-in
-{
- agency = mkThemeDrv rec {
- themeName = "agency";
- version = "0.6.0";
- src = {
- rev = "v${version}";
- sha256 = "1i9bajzgmxd3ffvgic6wwnqijsgkfr2mfdijkgw9yf3bxcdq5cb6";
- };
- meta = {
- license = stdenv.lib.licenses.asl20;
- longDescription = ''
- Agency Theme is a one page portfolio for companies and freelancers.
- This theme features several content sections, a responsive portfolio
- grid with hover effects, full page portfolio item modals, a timeline,
- and a contact form.
- '';
- };
- };
-
- generic-templates = mkThemeDrv rec {
- themeName = "generic-templates";
- version = "0.6.0";
- src = {
- rev = "v${version}";
- sha256 = "0wr2687pffczn0sns1xvqxr2gpf5v9j64zbj6q9f7km6bq0zpiiy";
- };
- meta = {
- license = stdenv.lib.licenses.mit;
- };
- };
-
- hyde = mkThemeDrv rec {
- themeName = "hyde";
- version = "0.6.0";
- src = {
- rev = "v${version}";
- sha256 = "0yca76p297ymxd049fkcpw8bca5b9yvv36707z31jbijriy50zxb";
- };
- meta = {
- license = stdenv.lib.licenses.mit;
- longDescription = ''
- Port of the Jekyll Hyde theme to styx; Hyde is a brazen two-column
- Styx theme that pairs a prominent sidebar with uncomplicated content.
- '';
- };
- };
-
- orbit = mkThemeDrv rec {
- themeName = "orbit";
- version = "0.6.0";
- src = {
- rev = "v${version}";
- sha256 = "0qdx1r7dcycr5hzl9ix70pl4xf0426ghpi1lgh61zdpdhcch0xfi";
- };
- meta = {
- license = stdenv.lib.licenses.cc-by-30;
- longDescription = ''
- Orbit is a free resume/CV template designed for developers.
- '';
- };
- };
-
- showcase = mkThemeDrv rec {
- themeName = "showcase";
- version = "0.6.0";
- src = {
- rev = "v${version}";
- sha256 = "1jfhw49yag8l1zr69l01y1p4p88waig3xv3b6c3mfxc8jrchp7pb";
- };
- meta = {
- license = stdenv.lib.licenses.mit;
- longDescription = ''
- Theme that show most of styx functionalities with a basic design.
- '';
- };
- };
-}
diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix
index 950f8da7860564a5282427112ea6964571fb2765..051b67bc972c83cbdc0bc7bc1a96bc59b18e719a 100644
--- a/pkgs/applications/misc/subsurface/default.nix
+++ b/pkgs/applications/misc/subsurface/default.nix
@@ -1,71 +1,65 @@
-{
- stdenv,
- cmake, doxygen, pkgconfig, autoreconfHook,
- curl,
- fetchgit,
- grantlee,
- libgit2,
- libusb,
- libssh2,
- libxml2,
- libxslt,
- libzip,
- qtbase, qtconnectivity, qtquickcontrols, qtscript, qtsvg, qttools, qtwebkit,
- sqlite
+{ stdenv, fetchurl, fetchFromGitHub, autoreconfHook, cmake, makeWrapper, pkgconfig, qmake
+, curl, grantlee, libgit2, libusb, libssh2, libxml2, libxslt, libzip, zlib
+, qtbase, qtconnectivity, qtlocation, qtsvg, qttools, qtwebkit
}:
let
- version = "4.6.0";
+ version = "4.7.2";
- libmarble = stdenv.mkDerivation rec {
- name = "libmarble-ssrf-${version}";
+ libdc = stdenv.mkDerivation rec {
+ name = "libdivecomputer-ssrf-${version}";
- src = fetchgit {
- url = "git://git.subsurface-divelog.org/marble";
- rev = "refs/tags/v${version}";
- sha256 = "1dm2hdk6y36ls7pxbzkqmyc46hdy2cd5f6pkxa6nfrbhvk5f31zd";
+ src = fetchurl {
+ url = "https://subsurface-divelog.org/downloads/libdivecomputer-subsurface-branch-${version}.tgz";
+ sha256 = "04wadhhva1bfnwk0kl359kcv0f83mgym2fzs441spw5llcl7k52r";
};
- buildInputs = [ qtbase qtquickcontrols qtscript qtwebkit ];
- nativeBuildInputs = [ doxygen pkgconfig cmake ];
+ nativeBuildInputs = [ autoreconfHook ];
+
+ buildInputs = [ zlib ];
enableParallelBuilding = true;
- cmakeFlags = [
- "-DQTONLY=TRUE"
- "-DQT5BUILD=ON"
- "-DBUILD_MARBLE_TESTS=NO"
- "-DWITH_DESIGNER_PLUGIN=NO"
- "-DBUILD_MARBLE_APPS=NO"
- ];
-
meta = with stdenv.lib; {
- description = "Qt library for a slippy map with patches from the Subsurface project";
- homepage = http://subsurface-divelog.org;
- license = licenses.lgpl21;
+ homepage = http://www.libdivecomputer.org;
+ description = "A cross-platform and open source library for communication with dive computers from various manufacturers";
maintainers = with maintainers; [ mguentner ];
+ license = licenses.lgpl21;
platforms = platforms.all;
};
};
- libdc = stdenv.mkDerivation rec {
- name = "libdivecomputer-ssrf-${version}";
+ googlemaps = stdenv.mkDerivation rec {
+ name = "googlemaps-${version}";
+
+ version = "2017-09-17";
- src = fetchgit {
- url = "git://subsurface-divelog.org/libdc";
- rev = "refs/tags/v${version}";
- sha256 = "0s82c8bvqph9c9chwzd76iwrw968w7lgjm3pj4hmad1jim67bs6n";
+ src = fetchFromGitHub {
+ owner = "vladest";
+ repo = "googlemaps";
+ rev = "1b857c02504dd52b1aa442418b8dcea78ced3f35";
+ sha256 = "14icmc925g4abwwdrldjc387aiyvcp3ia5z7mfh9qa09bv829a84";
};
- nativeBuildInputs = [ autoreconfHook ];
+ nativeBuildInputs = [ qmake ];
+
+ buildInputs = [ qtbase qtlocation ];
+
+ pluginsSubdir = "lib/qt-${qtbase.qtCompatVersion}/plugins";
+
+ installPhase = ''
+ mkdir $out $(dirname ${pluginsSubdir})
+ mv plugins ${pluginsSubdir}
+ mv lib $out/
+ '';
enableParallelBuilding = true;
meta = with stdenv.lib; {
- homepage = http://www.libdivecomputer.org;
- description = "A cross-platform and open source library for communication with dive computers from various manufacturers";
- maintainers = with maintainers; [ mguentner ];
- license = licenses.lgpl21;
+ inherit (src.meta) homepage;
+ description = "QtLocation plugin for Google maps tile API";
+ maintainers = with maintainers; [ orivej ];
+ license = licenses.mit;
platforms = platforms.all;
};
};
@@ -73,28 +67,35 @@ let
in stdenv.mkDerivation rec {
name = "subsurface-${version}";
- src = fetchgit {
- url = "git://git.subsurface-divelog.org/subsurface";
- rev = "refs/tags/v${version}";
- sha256 = "1rk5n52p6cnyjrgi7ybhmvh7y31zxrjny0mqpnc1wql69f90h94c";
+ src = fetchurl {
+ url = "https://subsurface-divelog.org/downloads/Subsurface-${version}.tgz";
+ sha256 = "06f215xx1nc2q2qff2ihcl86fkrlnkvacl1swi3fw9iik6nq3bjp";
};
buildInputs = [
- libdc libmarble
+ libdc googlemaps
curl grantlee libgit2 libssh2 libusb libxml2 libxslt libzip
qtbase qtconnectivity qtsvg qttools qtwebkit
];
- nativeBuildInputs = [ cmake pkgconfig ];
- enableParallelBuilding = false; # subsurfacewebservices.h dependency on ui_webservices.h
+ nativeBuildInputs = [ cmake makeWrapper pkgconfig ];
cmakeFlags = [
- "-DMARBLE_LIBRARIES=${libmarble}/lib/libssrfmarblewidget.so"
+ "-DLIBDC_FROM_PKGCONFIG=ON"
"-DNO_PRINTING=OFF"
];
+ postInstall = ''
+ wrapProgram $out/bin/subsurface \
+ --prefix QT_PLUGIN_PATH : "${googlemaps}/${googlemaps.pluginsSubdir}"
+ '';
+
+ enableParallelBuilding = true;
+
+ passthru = { inherit version libdc googlemaps; };
+
meta = with stdenv.lib; {
- description = "Subsurface is an open source divelog program that runs on Windows, Mac and Linux";
+ description = "A divelog program";
longDescription = ''
Subsurface can track single- and multi-tank dives using air, Nitrox or TriMix.
It allows tracking of dive locations including GPS coordinates (which can also
diff --git a/pkgs/applications/misc/synapse/default.nix b/pkgs/applications/misc/synapse/default.nix
index e7d2a595684b6e851acc78e64e788c8015bcdd18..2533014c56079990663fd1bc386eafaf22864b0e 100644
--- a/pkgs/applications/misc/synapse/default.nix
+++ b/pkgs/applications/misc/synapse/default.nix
@@ -12,8 +12,9 @@ stdenv.mkDerivation rec {
sha256 = "846d8a5130580bb47c754bb7f20dc76311e589c00a18b02370a5d78b52409220";
};
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- intltool pkgconfig glib libnotify gtk3 libgee keybinder3 json_glib zeitgeist
+ intltool glib libnotify gtk3 libgee keybinder3 json_glib zeitgeist
vala_0_23 hicolor_icon_theme
];
diff --git a/pkgs/applications/misc/syncthing-tray/default.nix b/pkgs/applications/misc/syncthing-tray/default.nix
index f9d1039a292e59c149c4b68d5e1578139c2cc87f..f16a0d29c40d915d2ffbdfc91fae4792dc1555c4 100644
--- a/pkgs/applications/misc/syncthing-tray/default.nix
+++ b/pkgs/applications/misc/syncthing-tray/default.nix
@@ -15,7 +15,8 @@ buildGoPackage rec {
goDeps = ./deps.nix;
- buildInputs = [ pkgconfig libappindicator-gtk3 ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ libappindicator-gtk3 ];
meta = with stdenv.lib; {
description = "Simple application tray for syncthing";
diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix
index 89d493bcd016d446c7968224d1d716425c49dcbe..ee3cb9cd8ed4d5efb76abeaa2d126bb07f8d822b 100644
--- a/pkgs/applications/misc/synergy/default.nix
+++ b/pkgs/applications/misc/synergy/default.nix
@@ -9,16 +9,22 @@ stdenv.mkDerivation rec {
src = fetchFromGitHub {
owner = "symless";
- repo = "synergy";
+ repo = "synergy-core";
rev = "v${version}-stable";
sha256 = "0ksgr9hkf09h54572p7k7b9zkfhcdb2g2d5x7ixxn028y8i3jyp3";
};
patches = [ ./openssl-1.1.patch ];
+ patch_gcc6 = fetchpatch {
+ url = https://raw.githubusercontent.com/gentoo/gentoo/20e2bff3697ebf5f291e9907b34aae3074a36b53/dev-cpp/gmock/files/gmock-1.7.0-gcc6.patch;
+ sha256 = "0j3f381x1lf8qci9pfv6mliggl8qs2w05v5lw3rs3gn7aibg174d";
+ };
+
postPatch = ''
${unzip}/bin/unzip -d ext/gmock-1.6.0 ext/gmock-1.6.0.zip
${unzip}/bin/unzip -d ext/gtest-1.6.0 ext/gtest-1.6.0.zip
+ patch -d ext/gmock-1.6.0 -p1 -i ${patch_gcc6}
''
# We have XRRNotifyEvent (libXrandr), but with the upstream CMakeLists.txt
# it's not able to find it (it's trying to search the store path of libX11
diff --git a/pkgs/applications/misc/tangogps/default.nix b/pkgs/applications/misc/tangogps/default.nix
index 584b8f6a2966207219e40f2f7ca50c894b1f1ec6..bde30d9041aebcb99b3e7f04974c9bd384c2971a 100644
--- a/pkgs/applications/misc/tangogps/default.nix
+++ b/pkgs/applications/misc/tangogps/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "15q2kkrv4mfsivfdzjgpxr7s2amw7d501q2ayjl3ff4vmvfn5516";
};
- buildInputs = [ pkgconfig gettext gtk2 gconf curl libexif sqlite libxml2 ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gettext gtk2 gconf curl libexif sqlite libxml2 ];
# bogus includes fail with newer library version
postPatch = ''
diff --git a/pkgs/applications/misc/tasksh/default.nix b/pkgs/applications/misc/tasksh/default.nix
index 8c7bd107c8ae50aa93b439a0cab117bbe2dbb218..11bc7620368901672fc1b3de0de1ec8725eb3f65 100644
--- a/pkgs/applications/misc/tasksh/default.nix
+++ b/pkgs/applications/misc/tasksh/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, libuuid, gnutls }:
+{ stdenv, fetchurl, cmake, libuuid, gnutls, readline }:
stdenv.mkDerivation rec {
name = "tasksh-${version}";
@@ -11,6 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1z8zw8lld62fjafjvy248dncjk0i4fwygw0ahzjdvyyppx4zjhkf";
};
+ buildInputs = [ readline ];
nativeBuildInputs = [ cmake ];
meta = with stdenv.lib; {
diff --git a/pkgs/applications/misc/taskwarrior/default.nix b/pkgs/applications/misc/taskwarrior/default.nix
index 841e0a494e48289be3da4ce2502bbf6e7a32b14f..74ef55ee8cc8d9bdc5bf806c27d7b0b1ad28fa38 100644
--- a/pkgs/applications/misc/taskwarrior/default.nix
+++ b/pkgs/applications/misc/taskwarrior/default.nix
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
postInstall = ''
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/"
+ mkdir -p "$out/share/fish/vendor_completions.d"
+ ln -s "../../../share/doc/task/scripts/fish/task.fish" "$out/share/fish/vendor_completions.d/"
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/misc/terminal-notifier/default.nix b/pkgs/applications/misc/terminal-notifier/default.nix
index 47cea34d4a54ef13f72e50b869a18fcb0f051394..c838eca50659eb33ca829cce0e6d2719eab621fd 100644
--- a/pkgs/applications/misc/terminal-notifier/default.nix
+++ b/pkgs/applications/misc/terminal-notifier/default.nix
@@ -3,11 +3,12 @@
stdenv.mkDerivation rec {
name = "terminal-notifier-${version}";
- version = "1.5.0";
+ version = "2.0.0";
src = fetchzip {
url = "https://github.com/alloy/terminal-notifier/releases/download/${version}/terminal-notifier-${version}.zip";
- sha256 = "09x7vl0kddivqq3pyrk6sg1f0sv5l7nj0bmblq222zk3b09bgg8p";
+ sha256 = "0gi54v92hi1fkryxlz3k5s5d8h0s66cc57ds0vbm1m1qk3z4xhb0";
+ stripRoot = false;
};
dontBuild = true;
diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/misc/termite/default.nix
index 837d736d10ddba4709a0bbb6955d2ecf1aea138c..cf99304473c1120f5cd34a23b462dd1c1fcf4b44 100644
--- a/pkgs/applications/misc/termite/default.nix
+++ b/pkgs/applications/misc/termite/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchgit, pkgconfig, vte, gtk3, ncurses, makeWrapper, symlinkJoin
+{ stdenv, fetchgit, pkgconfig, vte, gtk3, ncurses, makeWrapper, wrapGAppsHook, symlinkJoin
, configFile ? null
}:
-let
+let
version = "12";
termite = stdenv.mkDerivation {
name = "termite-${version}";
@@ -17,7 +17,9 @@ let
makeFlags = [ "VERSION=v${version}" "PREFIX=" "DESTDIR=$(out)" ];
- buildInputs = [ pkgconfig vte gtk3 ncurses ];
+ buildInputs = [ vte gtk3 ncurses ];
+
+ nativeBuildInputs = [ wrapGAppsHook pkgconfig ];
outputs = [ "out" "terminfo" ];
diff --git a/pkgs/applications/misc/tilda/default.nix b/pkgs/applications/misc/tilda/default.nix
index a64ab0ea2ca384eb14880477e97c2f5f9d6abf10..7378950b189b4fb779b6c1298ca84136b7131341 100644
--- a/pkgs/applications/misc/tilda/default.nix
+++ b/pkgs/applications/misc/tilda/default.nix
@@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
sha256 = "1cc4qbg1m3i04lj5p6i6xbd0zvy1320pxdgmjhz5p3j95ibsbfki";
};
- buildInputs = [ pkgconfig autoreconfHook gettext confuse vte gtk makeWrapper ];
+ nativeBuildInputs = [ autoreconfHook pkgconfig ];
+ buildInputs = [ gettext confuse vte gtk makeWrapper ];
LD_LIBRARY_PATH = "${expat.out}/lib"; # ugly hack for xgettext to work during build
diff --git a/pkgs/applications/misc/tilix/default.nix b/pkgs/applications/misc/tilix/default.nix
index 2128c260b8059f97f8ed77452190fdc61b405c7b..c7ee4fb1c4cd38dc48d75d81fff575b6a9e3b2d9 100644
--- a/pkgs/applications/misc/tilix/default.nix
+++ b/pkgs/applications/misc/tilix/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "tilix-${version}";
- version = "1.6.4";
+ version = "1.7.1";
src = fetchFromGitHub {
owner = "gnunn1";
repo = "tilix";
rev = "${version}";
- sha256 = "1vqi68jlbbaky1569kd4lr6p02zsiv7v2rfb8j1pzwj7gydblaac";
+ sha256 = "0x0bnb26hjvxmvvd7c9k8fw97gcm3z5ssr6r8x90xbyyw6h58hhh";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/misc/tint2/default.nix b/pkgs/applications/misc/tint2/default.nix
index 3edc9b73bb54faf63b61365a6a22787489bb5a42..2c23ab9261f692c48da3d7a420e5c1834d3ae2dc 100644
--- a/pkgs/applications/misc/tint2/default.nix
+++ b/pkgs/applications/misc/tint2/default.nix
@@ -1,18 +1,18 @@
{ stdenv, fetchFromGitLab, pkgconfig, cmake, gettext, cairo, pango, pcre
-, glib , imlib2, gtk2, libXinerama , libXrender, libXcomposite, libXdamage
-, libX11 , libXrandr, librsvg, libpthreadstubs , libXdmcp
-, libstartup_notification , hicolor_icon_theme, wrapGAppsHook
+, glib, imlib2, gtk2, libXinerama, libXrender, libXcomposite, libXdamage
+, libX11, libXrandr, librsvg, libpthreadstubs, libXdmcp
+, libstartup_notification, hicolor_icon_theme, wrapGAppsHook
}:
stdenv.mkDerivation rec {
name = "tint2-${version}";
- version = "0.14.6";
+ version = "15.3";
src = fetchFromGitLab {
owner = "o9000";
repo = "tint2";
rev = version;
- sha256 = "0v7i8araj85cbl45icinvmsz5741cx2ybjgkx72m3xfcb9fqg69l";
+ sha256 = "1d83ppwckc2yix1grw8w31rlkyz6naa40pd3dg7n6nidx00zwn91";
};
enableParallelBuilding = true;
@@ -23,11 +23,8 @@ stdenv.mkDerivation rec {
libXcomposite libXdamage libX11 libXrandr librsvg libpthreadstubs
libXdmcp libstartup_notification hicolor_icon_theme ];
- preConfigure = ''
+ postPatch = ''
substituteInPlace CMakeLists.txt --replace /etc $out/etc
- '';
-
- prePatch = ''
for f in ./src/launcher/apps-common.c \
./src/launcher/icon-theme-common.c \
./themes/*tint2rc
@@ -40,7 +37,7 @@ stdenv.mkDerivation rec {
homepage = https://gitlab.com/o9000/tint2;
description = "Simple panel/taskbar unintrusive and light (memory, cpu, aestetic)";
license = stdenv.lib.licenses.gpl2;
- platforms = stdenv.lib.platforms.unix;
+ platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.romildo ];
};
}
diff --git a/pkgs/applications/misc/tnef/default.nix b/pkgs/applications/misc/tnef/default.nix
index 63d68bbbea4a910aaa7f3f05e1416bdb57b28e5a..eebab6643a68bd905d2ed30b668f100420885f3a 100644
--- a/pkgs/applications/misc/tnef/default.nix
+++ b/pkgs/applications/misc/tnef/default.nix
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub, autoreconfHook }:
stdenv.mkDerivation rec {
- version = "1.4.14";
+ version = "1.4.15";
name = "tnef-${version}";
src = fetchFromGitHub {
owner = "verdammelt";
repo = "tnef";
rev = version;
- sha256 = "0p7yji5hqq7k4pcba1cnv4jkl0fkg7jd77c1q164wk0vwinpmsc2";
+ sha256 = "0wm5ylppkjg518ldb9kzlx58a9l8z66gpz9ljalmyq6a77khd7pj";
};
doCheck = true;
diff --git a/pkgs/applications/misc/tomboy/default.nix b/pkgs/applications/misc/tomboy/default.nix
index 357713df384589739fe38fd75db212d99cceee13..ba6e97d61fb3ca5724c26b280f99159f98887e77 100644
--- a/pkgs/applications/misc/tomboy/default.nix
+++ b/pkgs/applications/misc/tomboy/default.nix
@@ -15,7 +15,8 @@ stdenv.mkDerivation {
sha256 = "0j5jmd079bm2fydqaic5ymbfdxna3qlx6fkp2mqhgcdr7prsbl3q";
};
- buildInputs = [ itstool intltool pkgconfig
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ itstool intltool
libxml2 gnome2.GConf atk gtk2
mono mono-addins dbus-sharp-2_0 dbus-sharp-glib-2_0 gnome-sharp gtk-sharp-2_0
makeWrapper ];
diff --git a/pkgs/applications/misc/toot/default.nix b/pkgs/applications/misc/toot/default.nix
index 4f66d7167e108b058211ec1007212ba1e328dc8b..d1b1daa26d6fd0580e87eecbcda96fc91447d151 100644
--- a/pkgs/applications/misc/toot/default.nix
+++ b/pkgs/applications/misc/toot/default.nix
@@ -1,19 +1,25 @@
{ stdenv, fetchFromGitHub, pythonPackages }:
pythonPackages.buildPythonApplication rec {
- version = "0.8.0";
+ version = "0.15.0";
name = "toot-${version}";
src = fetchFromGitHub {
owner = "ihabunek";
repo = "toot";
rev = "${version}";
- sha256 = "1y1jz4f53njq94zab0icf7jhd4jp10ywm508l4lw6spb69wr7rdy";
+ sha256 = "08k913gw0ip2q686z9k63bcn1n5s4w6b7jj6jmmamm427xmibkph";
};
+ checkInputs = with pythonPackages; [ pytest ];
+
propagatedBuildInputs = with pythonPackages;
[ requests beautifulsoup4 future ];
+ checkPhase = ''
+ py.test
+ '';
+
meta = with stdenv.lib; {
description = "Mastodon CLI interface";
homepage = "https://github.com/ihabunek/toot";
diff --git a/pkgs/applications/misc/topydo/default.nix b/pkgs/applications/misc/topydo/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..34952b9c0f4dcae789db4edde46559cd08ef79db
--- /dev/null
+++ b/pkgs/applications/misc/topydo/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, python3Packages, fetchFromGitHub, glibcLocales }:
+
+with python3Packages;
+
+buildPythonApplication rec {
+ pname = "topydo";
+ version = "0.13";
+ name = "${pname}-${version}";
+
+ src = fetchFromGitHub {
+ owner = "bram85";
+ repo = pname;
+ rev = version;
+ sha256 = "0b3dz137lpbvpjvfy42ibqvj3yk526x4bpn819fd11lagn77w69r";
+ };
+
+ propagatedBuildInputs = [
+ arrow
+ icalendar
+ glibcLocales
+ prompt_toolkit
+ urwid
+ watchdog
+ ];
+
+ checkInputs = [ mock freezegun coverage green pylint ];
+
+ LC_ALL="en_US.UTF-8";
+
+ meta = with stdenv.lib; {
+ description = "A cli todo application compatible with the todo.txt format";
+ homepage = "https://github.com/bram85/topydo";
+ license = licenses.gpl3;
+ };
+}
diff --git a/pkgs/applications/misc/tqsl/cmake_lib_path.patch b/pkgs/applications/misc/tqsl/cmake_lib_path.patch
new file mode 100644
index 0000000000000000000000000000000000000000..5eed93834632fdd0c01994244430dde8ac02ccc4
--- /dev/null
+++ b/pkgs/applications/misc/tqsl/cmake_lib_path.patch
@@ -0,0 +1,12 @@
+diff -dur tqsl-2.3.1/src/CMakeLists.txt tqsl-2.3.1b/src/CMakeLists.txt
+--- tqsl-2.3.1/src/CMakeLists.txt 2017-04-17 20:53:22.000000000 -0400
++++ tqsl-2.3.1b/src/CMakeLists.txt 2017-10-05 21:14:39.048329343 -0400
+@@ -54,7 +54,7 @@
+ if(NOT APPLE AND NOT WIN32)
+ set_source_files_properties(location.cpp PROPERTIES COMPILE_DEFINITIONS CONFDIR="${CMAKE_INSTALL_PREFIX}/share/TrustedQSL/")
+ set(HEADERS_TO_INSTALL tqsllib.h tqslerrno.h cabrillo.h adif.h tqslconvert.h)
+-install(TARGETS tqsllib DESTINATION lib$(LIB_SUFFIX))
++install(TARGETS tqsllib DESTINATION lib${LIB_SUFFIX})
+ install(FILES config.xml DESTINATION share/TrustedQSL)
+ install(FILES ${HEADERS_TO_INSTALL} DESTINATION include)
+ endif()
diff --git a/pkgs/applications/misc/tqsl/default.nix b/pkgs/applications/misc/tqsl/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..829ed2585627f6e562f2ae0c32d7564325516ab2
--- /dev/null
+++ b/pkgs/applications/misc/tqsl/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchurl, makeWrapper, cmake, expat, openssl, zlib, db, curl, wxGTK }:
+
+let
+ lib_suffix =
+ if stdenv.system == "x86_64-linux" then
+ "64"
+ else
+ "";
+in
+stdenv.mkDerivation rec {
+ name = "tqsl-${version}";
+ version = "2.3.1";
+
+ src = fetchurl {
+ url = "http://www.arrl.org/files/file/LoTW%20Instructions/${name}.tar.gz";
+ sha256 = "10cjlilampwl10hwb7m28m5z9gyrscvvc1rryfjnhj9q2x4ppgxv";
+ };
+
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [
+ cmake
+ expat
+ openssl
+ zlib
+ db
+ curl
+ wxGTK
+ ];
+
+ patches = [ ./cmake_lib_path.patch ];
+
+ meta = with stdenv.lib; {
+ description = "Software for using the ARRL Logbook of the World";
+ homepage = https://lotw.arrl.org/;
+ license = licenses.bsd3;
+ platforms = platforms.linux;
+ maintainers = [ maintainers.dpflug ];
+ };
+}
diff --git a/pkgs/applications/misc/truecrypt/builder.sh b/pkgs/applications/misc/truecrypt/builder.sh
deleted file mode 100644
index 88820d4cad21d03e64a485477caae5691ba62d8d..0000000000000000000000000000000000000000
--- a/pkgs/applications/misc/truecrypt/builder.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-source $stdenv/setup
-
-tar xvfz $src
-cd truecrypt-*
-
-cp $pkcs11h pkcs11.h
-cp $pkcs11th pkcs11t.h
-cp $pkcs11fh pkcs11f.h
-
-make PKCS11_INC="`pwd`"
-
-mkdir -p $out/bin
-cp Main/truecrypt $out/bin
-mkdir -p $out/share/$name
-cp License.txt $out/share/$name/LICENSE
diff --git a/pkgs/applications/misc/truecrypt/default.nix b/pkgs/applications/misc/truecrypt/default.nix
index 2b66dd41a2a835b30fe04dd4900e4c46f9c2297e..9df2a2dde76509c8dc9c9be40c8c1885c3283e76 100644
--- a/pkgs/applications/misc/truecrypt/default.nix
+++ b/pkgs/applications/misc/truecrypt/default.nix
@@ -46,7 +46,24 @@ library, use the 'NOGUI' parameter:
stdenv.mkDerivation {
name = "truecrypt-7.1a";
- builder = ./builder.sh;
+
+ patchPhase = "patch -p0 < ${./gcc6.patch}";
+
+ preBuild = ''
+ cp $pkcs11h pkcs11.h
+ cp $pkcs11th pkcs11t.h
+ cp $pkcs11fh pkcs11f.h
+ '';
+
+ makeFlags = [
+ ''PKCS11_INC="`pwd`"''
+ (if wxGUI then "" else "NOGUI=1")
+ ];
+
+ installPhase = ''
+ install -D -t $out/bin Main/truecrypt
+ install -D License.txt $out/share/$name/LICENSE
+ '';
src = fetchurl {
url = https://fossies.org/linux/misc/old/TrueCrypt-7.1a-Source.tar.gz;
@@ -68,14 +85,14 @@ stdenv.mkDerivation {
sha256 = "5ae6a4f32ca737e02def3bf314c9842fb89be82bf00b6f4022a97d8d565522b8";
};
- buildInputs = [ pkgconfig fuse devicemapper wxGTK nasm ];
- makeFlags = if wxGUI then "" else "NOGUI=1";
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ fuse devicemapper wxGTK nasm ];
meta = {
description = "Free Open-Source filesystem on-the-fly encryption";
homepage = http://www.truecrypt.org/;
license = "TrueCrypt License Version 2.6";
- maintainers = with stdenv.lib.maintainers; [viric];
+ maintainers = with stdenv.lib.maintainers; [ viric ryantm ];
platforms = with stdenv.lib.platforms; linux;
};
}
diff --git a/pkgs/applications/misc/truecrypt/gcc6.patch b/pkgs/applications/misc/truecrypt/gcc6.patch
new file mode 100644
index 0000000000000000000000000000000000000000..6e8c7da69e878c8f4c2b6c34683b79f748282b15
--- /dev/null
+++ b/pkgs/applications/misc/truecrypt/gcc6.patch
@@ -0,0 +1,61 @@
+--- Main/Resources.cpp 2016-05-16 16:47:35.846462041 +0200
++++ Main/Resources.cpp 2016-05-16 17:12:21.838202520 +0200
+@@ -45,13 +45,13 @@
+ strBuf.CopyFrom (res);
+ return string (reinterpret_cast (strBuf.Ptr()));
+ #else
+- static const char LanguageXml[] =
++ static byte LanguageXml[] =
+ {
+ # include "Common/Language.xml.h"
+ , 0
+ };
+
+- return string (LanguageXml);
++ return string ((const char*) LanguageXml);
+ #endif
+ }
+
+@@ -64,13 +64,13 @@
+ strBuf.CopyFrom (res);
+ return string (reinterpret_cast (strBuf.Ptr()));
+ #else
+- static const char License[] =
++ static byte License[] =
+ {
+ # include "License.txt.h"
+ , 0
+ };
+
+- return string (License);
++ return string ((const char*) License);
+ #endif
+ }
+
+--- Main/Forms/PreferencesDialog.cpp 2016-05-16 17:14:47.704707908 +0200
++++ Main/Forms/PreferencesDialog.cpp 2016-05-16 17:15:56.927964437 +0200
+@@ -414,11 +414,11 @@
+ libExtension = wxDynamicLibrary::CanonicalizeName (L"x");
+
+ #ifdef TC_MACOSX
+- extensions.push_back (make_pair (L"dylib", LangString["DLL_FILES"]));
++ extensions.push_back (make_pair (L"dylib", static_cast(LangString["DLL_FILES"].wc_str())));
+ #endif
+ if (!libExtension.empty())
+ {
+- extensions.push_back (make_pair (libExtension.Mid (libExtension.find (L'.') + 1), LangString["DLL_FILES"]));
++ extensions.push_back (make_pair (static_cast(libExtension.Mid (libExtension.find (L'.') + 1).wc_str()), static_cast(LangString["DLL_FILES"].wc_str())));
+ extensions.push_back (make_pair (L"*", L""));
+ }
+
+--- Main/GraphicUserInterface.cpp 2016-05-16 17:16:38.724591342 +0200
++++ Main/GraphicUserInterface.cpp 2016-05-16 17:17:09.854562653 +0200
+@@ -1445,7 +1445,7 @@
+ FilePath GraphicUserInterface::SelectVolumeFile (wxWindow *parent, bool saveMode, const DirectoryPath &directory) const
+ {
+ list < pair > extensions;
+- extensions.push_back (make_pair (L"tc", LangString["TC_VOLUMES"]));
++ extensions.push_back (make_pair (L"tc", static_cast(LangString["TC_VOLUMES"].wc_str())));
+
+ FilePathList selFiles = Gui->SelectFiles (parent, LangString[saveMode ? "OPEN_NEW_VOLUME" : "OPEN_VOL_TITLE"], saveMode, false, extensions, directory);
+
diff --git a/pkgs/applications/misc/tzupdate/default.nix b/pkgs/applications/misc/tzupdate/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..7eb0f2d41b55160d82faf78013eda56a0cb4f4e5
--- /dev/null
+++ b/pkgs/applications/misc/tzupdate/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, python }:
+
+let
+ inherit (python.pkgs) buildPythonApplication fetchPypi requests;
+in
+buildPythonApplication rec {
+ name = "${pname}-${version}";
+ pname = "tzupdate";
+ version = "1.2.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "1wj2r1wirnn5kllaasdldimvp3cc3w7w890iqrjksz5wwjbnj8pk";
+ };
+
+ propagatedBuildInputs = [ requests ];
+
+ meta = with stdenv.lib; {
+ description = "Update timezone information based on geoip.";
+ homepage = https://github.com/cdown/tzupdate;
+ maintainers = [ maintainers.michaelpj ];
+ license = licenses.unlicense;
+ };
+}
diff --git a/pkgs/applications/misc/udevil/default.nix b/pkgs/applications/misc/udevil/default.nix
index 9a4b795061b58bca6bdeb45e814e911a7d6bdc36..3cc4fcc1517b5583b8ee52a742f5da9ffac48aad 100644
--- a/pkgs/applications/misc/udevil/default.nix
+++ b/pkgs/applications/misc/udevil/default.nix
@@ -5,7 +5,8 @@ stdenv.mkDerivation {
url = https://github.com/IgnorantGuru/udevil/archive/0.4.4.tar.gz;
sha256 = "0z1bhaayambrcn7bgnrqk445k50ifabmw8q4i9qj49nnbcvxhbxd";
};
- buildInputs = [ intltool glib pkgconfig udev ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ intltool glib udev ];
configurePhase = ''
substituteInPlace src/Makefile.in --replace "-o root -g root" ""
# do not set setuid bit in nix store
diff --git a/pkgs/applications/misc/udiskie/default.nix b/pkgs/applications/misc/udiskie/default.nix
index 84ecf18c5ae5282c989545480a242c8bb1616afe..bcf43514f45e54fff1d467befc95a8a7f5e3ec18 100644
--- a/pkgs/applications/misc/udiskie/default.nix
+++ b/pkgs/applications/misc/udiskie/default.nix
@@ -4,13 +4,13 @@
pythonPackages.buildPythonApplication rec {
name = "udiskie-${version}";
- version = "1.7.0";
+ version = "1.7.2";
src = fetchFromGitHub {
owner = "coldfix";
repo = "udiskie";
rev = version;
- sha256 = "1dvfhf0d79al0vnrwdknfiy2297m3f7fgn7syr85p29hd6260jnv";
+ sha256 = "1p732gi6lhwcqxvsa0pknb6jmhy3kgv3yzz7xzmdzhy47m312965";
};
buildInputs = [
diff --git a/pkgs/applications/misc/urlview/default.nix b/pkgs/applications/misc/urlview/default.nix
index f745bf3ad601f458daf373e22a47f9795349aeb1..0a651906cd8ffe861d14f6bce29329d8cb035cf9 100644
--- a/pkgs/applications/misc/urlview/default.nix
+++ b/pkgs/applications/misc/urlview/default.nix
@@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
sha256 = "746ff540ccf601645f500ee7743f443caf987d6380e61e5249fc15f7a455ed42";
};
- buildInputs = [ ncurses autoreconfHook ];
+ nativeBuildInputs = [ autoreconfHook ];
+ buildInputs = [ ncurses ];
preAutoreconf = ''
touch NEWS
diff --git a/pkgs/applications/misc/valauncher/default.nix b/pkgs/applications/misc/valauncher/default.nix
index 7d35f1f64a8ea26bcb5e369fdf064999ac15066e..f780e5469d0279d4c04b6462177db60cf6270230 100644
--- a/pkgs/applications/misc/valauncher/default.nix
+++ b/pkgs/applications/misc/valauncher/default.nix
@@ -1,17 +1,18 @@
-{ stdenv, fetchFromGitHub, cmake, gtk3, vala_0_26, pkgconfig, gnome3 }:
+{ stdenv, fetchFromGitHub, cmake, gtk3, vala, pkgconfig, gnome3 }:
stdenv.mkDerivation rec {
- version = "1.2";
+ version = "1.3.1";
name = "valauncher-${version}";
src = fetchFromGitHub {
owner = "Mic92";
repo = "valauncher";
rev = "v${version}";
- sha256 = "1d1gfmzmr5ra2rnjc6rbz31mf3hk7q04lh4i1hljgk7fh90dacb6";
+ sha256 = "18969v870737jg1q0l3d05pb9mxsrcpdi0mnyz94rwkspszvxxqi";
};
- buildInputs = [ cmake gtk3 vala_0_26 pkgconfig gnome3.libgee ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ cmake gtk3 vala gnome3.libgee ];
meta = with stdenv.lib; {
description = "A fast dmenu-like gtk3 application launcher";
diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/applications/misc/viking/default.nix
index 1e7c7f654b5f96211c3ee590256b54fc5aadbeb8..5af675a82acf7186c755ff21e55dfc0818b62f65 100644
--- a/pkgs/applications/misc/viking/default.nix
+++ b/pkgs/applications/misc/viking/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "09kq0sxs2czps0d6xzgkkp41746v44ip63m72qvfs7rsrnqj7qnz";
};
- buildInputs = [ makeWrapper pkgconfig intltool gettext gtk2 expat curl gpsd bc file gnome_doc_utils
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ makeWrapper intltool gettext gtk2 expat curl gpsd bc file gnome_doc_utils
libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412 gexiv2 sqlite
];
@@ -40,7 +41,7 @@ stdenv.mkDerivation rec {
on the map, make new tracks and waypoints, see real-time GPS
position, etc.
'';
- homepage = http://viking.sourceforge.net/;
+ homepage = https://sourceforge.net/projects/viking/;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ pSub ];
platforms = with platforms; linux;
diff --git a/pkgs/applications/misc/vym/default.nix b/pkgs/applications/misc/vym/default.nix
index 8e1514583a253a56f16a40a5711323de6f238206..e06242f7a02406261d0e6566d62dabfd9ce08cd2 100644
--- a/pkgs/applications/misc/vym/default.nix
+++ b/pkgs/applications/misc/vym/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
- buildInputs = [ pkgconfig qt4 qmake4Hook ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ qt4 qmake4Hook ];
meta = with stdenv.lib; {
description = "A mind-mapping software";
diff --git a/pkgs/applications/misc/wordnet/default.nix b/pkgs/applications/misc/wordnet/default.nix
index f1bc06d395c727b7a3aff936517461b706d2b33f..b93295850bcd6ebc4141f7ef044c8d5d18af4ea6 100644
--- a/pkgs/applications/misc/wordnet/default.nix
+++ b/pkgs/applications/misc/wordnet/default.nix
@@ -1,7 +1,7 @@
{stdenv, fetchurl, tcl, tk, xlibsWrapper, makeWrapper}:
-let version = "3.0"; in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
+ version = "3.0";
name = "wordnet-${version}";
src = fetchurl {
url = "http://wordnetcode.princeton.edu/${version}/WordNet-${version}.tar.bz2";
diff --git a/pkgs/applications/misc/xautoclick/default.nix b/pkgs/applications/misc/xautoclick/default.nix
index 32daf108c1ca27efa0c4a76ef1334f9237b8ccd1..bb18da4d4ada3897b520a079b97eb873f326dc4b 100644
--- a/pkgs/applications/misc/xautoclick/default.nix
+++ b/pkgs/applications/misc/xautoclick/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
url = "mirror://sourceforge/project/xautoclick/xautoclick/xautoclick-0.31/xautoclick-0.31.tar.gz";
sha256 = "0h522f12a7v2b89411xm51iwixmjp2mp90rnizjgiakx9ajnmqnm";
};
- buildInputs = [ xorg.libX11 xorg.libXtst xorg.xinput xorg.libXi xorg.libXext pkgconfig ]
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ xorg.libX11 xorg.libXtst xorg.xinput xorg.libXi xorg.libXext ]
++ stdenv.lib.optionals gtkSupport [ gtk2 ]
++ stdenv.lib.optionals qtSupport [ qt4 ];
patchPhase = ''
diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix
index 80ecbdeba77fc37e647427842a634583b6b033d5..2d2c2e2bff25784bef54cb39489e0cc57700ff52 100644
--- a/pkgs/applications/misc/xca/default.nix
+++ b/pkgs/applications/misc/xca/default.nix
@@ -20,12 +20,6 @@ mkDerivation rec {
configureFlags = [ "CXXFLAGS=-std=c++11" ];
- preBuild = ''
- substituteInPlace Local.mak \
- --replace ${qtbase}/bin/moc ${qtbase.dev}/bin/moc \
- --replace ${qtbase}/bin/uic ${qtbase.dev}/bin/uic
- '';
-
meta = with lib; {
description = "Interface for managing asymetric keys like RSA or DSA";
homepage = http://xca.sourceforge.net/;
diff --git a/pkgs/applications/misc/xfe/default.nix b/pkgs/applications/misc/xfe/default.nix
index ad642ecec5eee35bdc79e8e14f5d78570b00457a..78e1d15481ba276fa5a96d2c1269438fab5a3ca1 100644
--- a/pkgs/applications/misc/xfe/default.nix
+++ b/pkgs/applications/misc/xfe/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "1g9a0bpny2m7ixgxpqjh0wvh2x6d0lpj6682zn5dfqwan4j2xfsd";
};
- buildInputs = [ fox pkgconfig gettext xlibsWrapper gcc intltool file libpng ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ fox gettext xlibsWrapper gcc intltool file libpng ];
preConfigure = ''
sed -i s,/usr/share/xfe,$out/share/xfe, src/xfedefs.h
@@ -23,7 +24,7 @@ stdenv.mkDerivation rec {
It is based on the popular, but discontinued, X Win Commander, which was developed by Maxim Baranov.
Xfe aims to be the filemanager of choice for all the Unix addicts!
'';
- homepage = http://sourceforge.net/projects/xfe/;
+ homepage = https://sourceforge.net/projects/xfe/;
license = stdenv.lib.licenses.gpl2;
maintainers = [];
platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/misc/xfontsel/default.nix b/pkgs/applications/misc/xfontsel/default.nix
index 15d054c2be2afbbbf2b23899c3eb69d7da6c0dcd..7d22a160574095c0947d78fa19445fb9a8ec82fe 100644
--- a/pkgs/applications/misc/xfontsel/default.nix
+++ b/pkgs/applications/misc/xfontsel/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "1grir464hy52a71r3mpm9mzvkf7nwr3vk0b1vc27pd3gp588a38p";
};
- buildInputs = [libX11 makeWrapper pkgconfig libXaw];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [libX11 makeWrapper libXaw];
# Without this, it gets Xmu as a dependency, but without rpath entry
NIX_LDFLAGS = "-lXmu";
diff --git a/pkgs/applications/misc/xiphos/default.nix b/pkgs/applications/misc/xiphos/default.nix
index a9f786a2a084cb9ebd1034bf5830ffa23618e75c..54d61a047a78b90d82f2e5a4927da46cbe3f4831 100644
--- a/pkgs/applications/misc/xiphos/default.nix
+++ b/pkgs/applications/misc/xiphos/default.nix
@@ -1,27 +1,30 @@
-{stdenv, fetchurl, pkgconfig
+{stdenv, fetchFromGitHub, pkgconfig
, python
, intltool
, docbook2x, docbook_xml_dtd_412, libxslt
, sword, clucene_core, biblesync
, gnome_doc_utils
, libgsf, gconf
-, gtkhtml, libgtkhtml, libglade, scrollkeeper
+, gtkhtml, libglade, scrollkeeper
, webkitgtk
-, dbus_glib, enchant, isocodes, libuuid
+, dbus_glib, enchant, isocodes, libuuid, icu
}:
stdenv.mkDerivation rec {
name = "xiphos-${version}";
- version = "4.0.3-20150806";
+ version = "4.0.6";
- src = fetchurl {
- url = "mirror://sourceforge/project/gnomesword/Xiphos/4.0.3/${name}.tar.gz";
- sha256 = "1xkvhpasdlda2rp0874znz158z4rjh1hpynwy13d96kjxq4npiqv";
+ src = fetchFromGitHub {
+ owner = "crosswire";
+ repo = "xiphos";
+ rev = "${version}";
+ sha256 = "02xyy6rxxxaqbjbhdp813f0vp1jpfzqscjdbdc0qcd4yvi3baj5f";
};
- buildInputs = [ pkgconfig python intltool docbook2x docbook_xml_dtd_412 libxslt
- sword clucene_core biblesync gnome_doc_utils libgsf gconf gtkhtml libgtkhtml
- libglade scrollkeeper webkitgtk dbus_glib enchant isocodes libuuid ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ python intltool docbook2x docbook_xml_dtd_412 libxslt
+ sword clucene_core biblesync gnome_doc_utils libgsf gconf gtkhtml
+ libglade scrollkeeper webkitgtk dbus_glib enchant isocodes libuuid icu ];
prePatch = ''
patchShebangs .;
@@ -33,7 +36,7 @@ stdenv.mkDerivation rec {
'';
configurePhase = ''
- python waf configure --prefix=$out
+ python waf configure --prefix=$out --enable-webkit2
'';
buildPhase = ''
diff --git a/pkgs/applications/misc/xpad/default.nix b/pkgs/applications/misc/xpad/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..01df5d32ab1a8096e72af5666acad958a2805871
--- /dev/null
+++ b/pkgs/applications/misc/xpad/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl
+, autoreconfHook, pkgconfig, wrapGAppsHook
+, glib, intltool, gtk3, gtksourceview }:
+
+stdenv.mkDerivation rec {
+ name = "xpad-${version}";
+ version = "5.0.0";
+
+ src = fetchurl {
+ url = "https://launchpad.net/xpad/trunk/${version}/+download/xpad-${version}.tar.bz2";
+ sha256 = "02yikxg6z9bwla09ka001ppjlpbv5kbza3za9asazm5aiz376mkb";
+ };
+
+ nativeBuildInputs = [ autoreconfHook pkgconfig wrapGAppsHook ];
+
+ buildInputs = [ glib intltool gtk3 gtksourceview ];
+
+ autoreconfPhase = ''
+ ./autogen.sh
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A sticky note application for jotting down things to remember";
+ homepage = https://launchpad.net/xpad;
+ license = licenses.gpl3;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ michalrus ];
+ };
+}
diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix
index d2283c329201e6c352876fceee40936f61c935e0..ef031c4b9f4de558cd51ad08287123c20db86a4d 100644
--- a/pkgs/applications/misc/xpdf/default.nix
+++ b/pkgs/applications/misc/xpdf/default.nix
@@ -1,24 +1,28 @@
{ enableGUI ? true, enablePDFtoPPM ? true, useT1Lib ? false
-, stdenv, fetchurl, zlib, libpng, xlibsWrapper ? null, motif ? null, freetype ? null, t1lib ? null
-, base14Fonts ? null
+, stdenv, fetchurl, zlib, libpng, freetype ? null, t1lib ? null
+, cmake, qtbase ? null
}:
-assert enableGUI -> xlibsWrapper != null && motif != null && freetype != null;
+assert enableGUI -> qtbase != null && freetype != null;
assert enablePDFtoPPM -> freetype != null;
assert useT1Lib -> t1lib != null;
assert !useT1Lib; # t1lib has multiple unpatched security vulnerabilities
stdenv.mkDerivation {
- name = "xpdf-3.04";
+ name = "xpdf-4.00";
- src = fetchurl {
- url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.04.tar.gz;
- sha256 = "1rbp54mr3z2x3a3a1qmz8byzygzi223vckfam9ib5g1sfds0qf8i";
+ src = fetchurl {
+ url = http://www.xpdfreader.com/dl/xpdf-4.00.tar.gz;
+ sha256 = "1mhn89738vjva14xr5gblc2zrdgzmpqbbjdflqdmpqv647294ggz";
};
+ nativeBuildInputs = [ cmake ];
+
+ cmakeFlags = ["-DSYSTEM_XPDFRC=/etc/xpdfrc" "-DA4_PAPER=ON"];
+
buildInputs = [ zlib libpng ] ++
- stdenv.lib.optionals enableGUI [xlibsWrapper motif] ++
+ stdenv.lib.optional enableGUI qtbase ++
stdenv.lib.optional useT1Lib t1lib ++
stdenv.lib.optional enablePDFtoPPM freetype;
@@ -27,14 +31,6 @@ stdenv.mkDerivation {
hardeningDisable = [ "format" ];
- configureFlags = "--enable-a4-paper";
-
- postInstall = stdenv.lib.optionalString (base14Fonts != null) ''
- substituteInPlace $out/etc/xpdfrc \
- --replace /usr/local/share/ghostscript/fonts ${base14Fonts} \
- --replace '#fontFile' fontFile
- '';
-
meta = {
homepage = http://www.foolabs.com/xpdf/;
description = "Viewer for Portable Document Format (PDF) files";
diff --git a/pkgs/applications/misc/xsw/default.nix b/pkgs/applications/misc/xsw/default.nix
index b3a57e1cef21b79944a8d5bb2798e14acc6096be..3e8acff00f893d70375d1214cc453e553b7d2cfe 100644
--- a/pkgs/applications/misc/xsw/default.nix
+++ b/pkgs/applications/misc/xsw/default.nix
@@ -14,9 +14,9 @@ in stdenv.mkDerivation rec {
sha256 = "092vp61ngd2vscsvyisi7dv6qrk5m1i81gg19hyfl5qvjq5p0p8g";
};
- nativeBuildInputs = [ SDL SDL_image SDL_ttf SDL_gfx flex bison ];
+ nativeBuildInputs = [ pkgconfig flex bison ];
- buildInputs = [ pkgconfig ];
+ buildInputs = [ SDL SDL_image SDL_ttf SDL_gfx ];
NIX_CFLAGS_COMPILE = makeSDLFlags [ SDL SDL_image SDL_ttf SDL_gfx ];
diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix
index 22e0466df368491999689b49224403946df9c5c8..9e64557838eb7dfdd26cac4356d36ecb449e122c 100644
--- a/pkgs/applications/misc/xterm/default.nix
+++ b/pkgs/applications/misc/xterm/default.nix
@@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
- name = "xterm-327";
+ name = "xterm-330";
src = fetchurl {
- url = "ftp://invisible-island.net/xterm/${name}.tgz";
- sha256 = "02qmfr1y24y5vq6kddksw84b8gxalc96n9wwaj7i8hmk6mn2zyv6";
+ url = "http://invisible-mirror.net/archives/xterm/${name}.tgz";
+ sha256 = "1psnfmqd23v9gxj8a98nzrgvymrk0p1whwqi92gy15bbkzrgkvks";
};
buildInputs =
diff --git a/pkgs/applications/misc/yakuake/default.nix b/pkgs/applications/misc/yakuake/default.nix
index 8db48a7b3e61fbf0ed89428137e8d32bf2a31c0c..0eb33c845c39ed1c18d7d6a58c07b0317e0e4629 100644
--- a/pkgs/applications/misc/yakuake/default.nix
+++ b/pkgs/applications/misc/yakuake/default.nix
@@ -18,15 +18,14 @@
, qtx11extras
}:
-let
+mkDerivation rec {
pname = "yakuake";
- version = "3.0.3";
-in mkDerivation rec {
+ version = "3.0.4";
name = "${pname}-${version}";
src = fetchurl {
url = "http://download.kde.org/stable/${pname}/${version}/src/${name}.tar.xz";
- sha256 = "ef51aa3325916d352fde17870cf706397e41105103e4c9289cc4032a1b8609a7";
+ sha256 = "1q31p1cqhz8b2bikqjrr7fww86kaq723ib4ys2zwablfa1ybbqhh";
};
buildInputs = [
diff --git a/pkgs/applications/misc/yate/default.nix b/pkgs/applications/misc/yate/default.nix
index dd3903cde27100e7ff8e817de7d6b720701f2333..bd891ff8493f7c4220faffa542cced38e35ea600 100644
--- a/pkgs/applications/misc/yate/default.nix
+++ b/pkgs/applications/misc/yate/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
};
# TODO zaptel ? postgres ?
- buildInputs = [ qt4 openssl autoconf automake pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ qt4 openssl autoconf automake ];
# /dev/null is used when linking which is a impure path for the wrapper
preConfigure =
diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix
index a646cd10b6dfc4eefe5bb7704da5e9dd9ed3e855..8a460f890167132183a9c29e162b19cb126aaed1 100644
--- a/pkgs/applications/misc/zathura/core/default.nix
+++ b/pkgs/applications/misc/zathura/core/default.nix
@@ -19,8 +19,9 @@ stdenv.mkDerivation rec {
icon = ./icon.xpm;
+ nativeBuildInputs = [ pkgconfig ];
buildInputs = [
- pkgconfig file gtk girara
+ file gtk girara
gettext makeWrapper sqlite glib
] ++ optional synctexSupport texlive.bin.core;
diff --git a/pkgs/applications/misc/zathura/djvu/default.nix b/pkgs/applications/misc/zathura/djvu/default.nix
index 2e644453dcb985a85569ec7aeb8be842b96752c1..34508da0e371c89f38b757657bd41b635db710aa 100644
--- a/pkgs/applications/misc/zathura/djvu/default.nix
+++ b/pkgs/applications/misc/zathura/djvu/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "03cw54d2fipvbrnbqy0xccqkx6s77dyhyymx479aj5ryy4513dq8";
};
- buildInputs = [ pkgconfig djvulibre gettext zathura_core gtk girara ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ djvulibre gettext zathura_core gtk girara ];
patches = [ ./gtkflags.patch ];
diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
index 23a654b4d51047b0d1456f3613c9114042c77ac9..c9472f35667270eb898257c1bc0658d8a462aae4 100644
--- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
+++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "06zqn8z6a0hfsx3s1kzqvqzb73afgcl6z5r062sxv7kv570fvffr";
};
- buildInputs = [ pkgconfig zathura_core gtk girara openssl mupdf libjpeg jbig2dec openjpeg ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ zathura_core gtk girara openssl mupdf libjpeg jbig2dec openjpeg ];
makeFlags = [ "PREFIX=$(out)" "PLUGINDIR=$(out)/lib" ];
diff --git a/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/pkgs/applications/misc/zathura/pdf-poppler/default.nix
index 4912489d6b358e50a5ff63bb9d0f585445ac2c0d..2dda88f409b50992d72be81d181ad357d2a5cb3e 100644
--- a/pkgs/applications/misc/zathura/pdf-poppler/default.nix
+++ b/pkgs/applications/misc/zathura/pdf-poppler/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "1maqiv7yv8d8hymlffa688c5z71v85kbzmx2j88i8z349xx0rsyi";
};
- buildInputs = [ pkgconfig poppler zathura_core girara ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ poppler zathura_core girara ];
makeFlags = [ "PREFIX=$(out)" "PLUGINDIR=$(out)/lib" ];
diff --git a/pkgs/applications/misc/zathura/ps/default.nix b/pkgs/applications/misc/zathura/ps/default.nix
index 89d8d5badb0a032f482c6be4732cbb288ed7388e..a415cde3c7ee9ea1e894c6f53c1a87bc0d8f1144 100644
--- a/pkgs/applications/misc/zathura/ps/default.nix
+++ b/pkgs/applications/misc/zathura/ps/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "18wsfy8pqficdgj8wy2aws7j4fy8z78157rhqk17mj5f295zgvm9";
};
- buildInputs = [ pkgconfig libspectre gettext zathura_core gtk girara ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ libspectre gettext zathura_core gtk girara ];
patches = [ ./gtkflags.patch ];
diff --git a/pkgs/applications/networking/browsers/arora/default.nix b/pkgs/applications/networking/browsers/arora/default.nix
index 8bcefe4fe7b03dba9ea27863f6cc4a3376978038..f9d5f01be201ff40e3c129aa3b0d6f6358f68e56 100644
--- a/pkgs/applications/networking/browsers/arora/default.nix
+++ b/pkgs/applications/networking/browsers/arora/default.nix
@@ -1,21 +1,25 @@
-{ stdenv, fetchurl, qt4, qmake4Hook }:
+{ stdenv, fetchFromGitHub, qt4, qmake4Hook }:
stdenv.mkDerivation rec {
name = "arora-${version}";
version = "0.11.0";
- src = fetchurl {
- url = "http://arora.googlecode.com/files/${name}.tar.gz";
- sha256 = "1ffkranxi93lrg5r7a90pix9j8xqmf0z1mb1m8579v9m34cyypvg";
+ src = fetchFromGitHub {
+ owner = "Arora";
+ repo = "arora";
+ rev = version;
+ sha256 = "0wmivgx3mw51rghi6q8fgivpkqc98z2mqmllf7c98ln0wd8rkf3c";
};
buildInputs = [ qt4 ];
nativeBuildInputs = [ qmake4Hook ];
+ enableParallelBuilding = true;
+
meta = with stdenv.lib; {
platforms = qt4.meta.platforms;
maintainers = [ maintainers.phreedom ];
description = "A cross-platform Qt4 Webkit browser";
- homepage = http://arora.googlecode.com;
+ homepage = https://github.com/Arora/arora;
};
}
diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix
index 993d81ff96e41a6d83e7df1ce548d0174144bb52..54fee5847e18f8b0e6d49c80a77f26676c3a9b2b 100644
--- a/pkgs/applications/networking/browsers/chromium/browser.nix
+++ b/pkgs/applications/networking/browsers/chromium/browser.nix
@@ -12,11 +12,10 @@ mkChromiumDerivation (base: rec {
sandboxExecutableName = "__chromium-suid-sandbox";
installPhase = ''
- mkdir -p "$libExecPath/swiftshader"
+ mkdir -p "$libExecPath"
cp -v "$buildPath/"*.pak "$buildPath/"*.bin "$libExecPath/"
cp -v "$buildPath/icudtl.dat" "$libExecPath/"
cp -vLR "$buildPath/locales" "$buildPath/resources" "$libExecPath/"
- cp -v "$buildPath/swiftshader/"*.so "$libExecPath/swiftshader/"
cp -v "$buildPath/chrome" "$libExecPath/$packageName"
if [ -e "$buildPath/libwidevinecdmadapter.so" ]; then
@@ -48,7 +47,7 @@ mkChromiumDerivation (base: rec {
meta = {
description = "An open source web browser from Google";
homepage = http://www.chromium.org/;
- maintainers = with maintainers; [ chaoflow ];
+ maintainers = with maintainers; [ chaoflow bendlas ];
license = licenses.bsd3;
platforms = platforms.linux;
hydraPlatforms = if channel == "stable" then ["x86_64-linux"] else [];
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 7802e1bf1b56500ac523d8b91b2a35648a8cc46c..82c2c6aa53fc74f76efe4d57e7491369b479658a 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -60,10 +60,13 @@ let
in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs));
gnSystemLibraries = [
- "flac" "harfbuzz-ng" "libwebp" "libxslt" "yasm" "opus" "snappy" "libpng" "zlib"
+ "flac" "libwebp" "libxslt" "yasm" "opus" "snappy" "libpng" "zlib"
# "libjpeg" # fails with multiple undefined references to chromium_jpeg_*
# "re2" # fails with linker errors
# "ffmpeg" # https://crbug.com/731766
+ ] ++ optionals (versionRange "62" "63") [
+ "harfbuzz-ng" # in versions over 63 harfbuzz and freetype are being built together
+ # so we can't build with one from system and other from source
];
opusWithCustomModes = libopus.override {
@@ -76,7 +79,10 @@ let
libpng libcap
xdg_utils yasm minizip libwebp
libusb1 re2 zlib
- ffmpeg harfbuzz-icu libxslt libxml2
+ ffmpeg libxslt libxml2
+ ] ++ optionals (versionRange "62" "63") [
+ harfbuzz-icu # in versions over 63 harfbuzz and freetype are being built together
+ # so we can't build with one from system and other from source
];
# build paths and release info
@@ -90,6 +96,15 @@ let
sha256 = "1vhslc4xg0d6wzlsi99zpah2xzjziglccrxn55k7qna634wyxg77";
};
+ versionRange = min-version: upto-version:
+ let inherit (upstream-info) version;
+ result = versionAtLeast version min-version && versionOlder version upto-version;
+ stable-version = (import ./upstream-info.nix).stable.version;
+ in if versionAtLeast stable-version upto-version
+ then warn "chromium: stable version ${stable-version} is newer than a patchset bounded at ${upto-version}. You can safely delete it."
+ result
+ else result;
+
base = rec {
name = "${packageName}-${version}";
inherit (upstream-info) version;
@@ -117,12 +132,26 @@ let
patches = [
./patches/nix_plugin_paths_52.patch
- ./patches/chromium-gn-bootstrap-r8.patch
# To enable ChromeCast, go to chrome://flags and set "Load Media Router Component Extension" to Enabled
# Fixes Chromecast: https://bugs.chromium.org/p/chromium/issues/detail?id=734325
./patches/fix_network_api_crash.patch
-
- ] ++ optional enableWideVine ./patches/widevine.patch;
+ ] # As major versions are added, you can trawl the gentoo and arch repos at
+ # https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/
+ # https://git.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/chromium
+ # for updated patches and hints about build flags
+ ++ optionals (versionRange "62" "63") [
+ ./patches/chromium-gn-bootstrap-r17.patch
+ ./patches/chromium-gcc5-r3.patch
+ ./patches/chromium-glibc2.26-r1.patch
+ ]
+ ++ optionals (versionRange "63" "64") [
+ ./patches/chromium-gcc5-r4.patch
+ ./patches/include-math-for-round.patch
+ ]
+ ++ optionals (versionAtLeast version "64") [
+ ./patches/gn_bootstrap_observer.patch
+ ]
+ ++ optional enableWideVine ./patches/widevine.patch;
postPatch = ''
# We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX
@@ -131,6 +160,9 @@ let
'return sandbox_binary;' \
'return base::FilePath(GetDevelSandboxPath());'
+ sed -i -e 's@"\(#!\)\?.*xdg-@"\1${xdg_utils}/bin/xdg-@' \
+ chrome/browser/shell_integration_linux.cc
+
sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${systemd.lib}/lib/\1!' \
device/udev_linux/udev?_loader.cc
@@ -228,12 +260,24 @@ let
'';
buildPhase = let
+ # Build paralelism: on Hydra the build was frequently running into memory
+ # exhaustion, and even other users might be running into similar issues.
+ # -j is halved to avoid memory problems, and -l is slightly increased
+ # so that the build gets slight preference before others
+ # (it will often be on "critical path" and at risk of timing out)
buildCommand = target: ''
ninja -C "${buildPath}" \
- -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES \
+ -j$(( ($NIX_BUILD_CORES+1) / 2 )) -l$(( $NIX_BUILD_CORES+1 )) \
"${target}"
'' + optionalString (target == "mksnapshot" || target == "chrome") ''
paxmark m "${buildPath}/${target}"
+ '' + optionalString (versionAtLeast version "63") ''
+ (
+ source chrome/installer/linux/common/installer.include
+ PACKAGE=$packageName
+ MENUNAME="Chromium"
+ process_template chrome/app/resources/manpage.1.in "${buildPath}/chrome.1"
+ )
'';
targets = extraAttrs.buildTargets or [];
commands = map buildCommand targets;
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 7aa02e2c57452cccf8546f115ac19bd6841ab89c..911b55b115f9fde03c4c6b05a5098f7b225b4afb 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -35,7 +35,7 @@ let
};
desktopItem = makeDesktopItem {
- name = "chromium";
+ name = "chromium-browser";
exec = "chromium %U";
icon = "chromium";
comment = "An open source web browser from Google";
diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r3.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r3.patch
new file mode 100644
index 0000000000000000000000000000000000000000..7605df6b145afcd08fd342186ce794eaaf8c5906
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r3.patch
@@ -0,0 +1,98 @@
+--- a/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h
++++ b/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h
+@@ -63,7 +63,7 @@ class WTF_EXPORT ArrayBufferContents {
+ allocation_length_(0),
+ data_(data),
+ data_length_(0),
+- kind_(AllocationKind::kNormal),
++ kind_(WTF::ArrayBufferContents::AllocationKind::kNormal),
+ deleter_(deleter) {}
+ DataHandle(void* allocation_base,
+ size_t allocation_length,
+@@ -94,11 +94,11 @@ class WTF_EXPORT ArrayBufferContents {
+ reinterpret_cast(allocation_base_) +
+ allocation_length_);
+ switch (kind_) {
+- case AllocationKind::kNormal:
++ case WTF::ArrayBufferContents::AllocationKind::kNormal:
+ DCHECK(deleter_);
+ deleter_(data_);
+ return;
+- case AllocationKind::kReservation:
++ case WTF::ArrayBufferContents::AllocationKind::kReservation:
+ ReleaseReservedMemory(allocation_base_, allocation_length_);
+ return;
+ }
+--- a/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.orig 2017-08-15 12:45:59.433532111 +0000
++++ b/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc 2017-08-15 17:52:59.691328825 +0000
+@@ -10,7 +10,7 @@
+
+ #include "webrtc/modules/audio_processing/aec3/aec_state.h"
+
+-#include
++#include
+ #include
+ #include
+
+--- a/gpu/ipc/common/mailbox_struct_traits.h
++++ b/gpu/ipc/common/mailbox_struct_traits.h
+@@ -15,7 +15,7 @@ namespace mojo {
+ template <>
+ struct StructTraits {
+ static base::span name(const gpu::Mailbox& mailbox) {
+- return mailbox.name;
++ return base::make_span(mailbox.name);
+ }
+ static bool Read(gpu::mojom::MailboxDataView data, gpu::Mailbox* out);
+ };
+--- a/services/viz/public/cpp/compositing/filter_operation_struct_traits.h
++++ b/services/viz/public/cpp/compositing/filter_operation_struct_traits.h
+@@ -134,7 +134,7 @@ struct StructTraits {
+ static base::span matrix(const cc::FilterOperation& operation) {
+ if (operation.type() != cc::FilterOperation::COLOR_MATRIX)
+ return base::span();
+- return operation.matrix();
++ return base::make_span(operation.matrix());
+ }
+
+ static base::span shape(
+--- a/services/viz/public/cpp/compositing/quads_struct_traits.h
++++ b/services/viz/public/cpp/compositing/quads_struct_traits.h
+@@ -284,7 +284,7 @@
+
+ static base::span vertex_opacity(const cc::DrawQuad& input) {
+ const cc::TextureDrawQuad* quad = cc::TextureDrawQuad::MaterialCast(&input);
+- return quad->vertex_opacity;
++ return base::make_span(quad->vertex_opacity);
+ }
+
+ static bool y_flipped(const cc::DrawQuad& input) {
+--- a/third_party/WebKit/Source/platform/exported/WebCORS.cpp
++++ b/third_party/WebKit/Source/platform/exported/WebCORS.cpp
+@@ -480,7 +480,7 @@ WebString AccessControlErrorString(
+ }
+ default:
+ NOTREACHED();
+- return "";
++ return WebString();
+ }
+ }
+
+@@ -512,7 +512,7 @@ WebString PreflightErrorString(const PreflightStatus status,
+ }
+ default:
+ NOTREACHED();
+- return "";
++ return WebString();
+ }
+ }
+
+@@ -533,7 +533,7 @@ WebString RedirectErrorString(const RedirectStatus status,
+ }
+ default:
+ NOTREACHED();
+- return "";
++ return WebString();
+ }
+ }
+
diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r4.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r4.patch
new file mode 100644
index 0000000000000000000000000000000000000000..cb978d58a060bb7302a13a9c66c63e2f5690400a
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r4.patch
@@ -0,0 +1,98 @@
+--- a/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h
++++ b/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h
+@@ -63,7 +63,7 @@ class WTF_EXPORT ArrayBufferContents {
+ allocation_length_(0),
+ data_(data),
+ data_length_(0),
+- kind_(AllocationKind::kNormal),
++ kind_(WTF::ArrayBufferContents::AllocationKind::kNormal),
+ deleter_(deleter) {}
+ DataHandle(void* allocation_base,
+ size_t allocation_length,
+@@ -94,11 +94,11 @@ class WTF_EXPORT ArrayBufferContents {
+ reinterpret_cast(allocation_base_) +
+ allocation_length_);
+ switch (kind_) {
+- case AllocationKind::kNormal:
++ case WTF::ArrayBufferContents::AllocationKind::kNormal:
+ DCHECK(deleter_);
+ deleter_(data_);
+ return;
+- case AllocationKind::kReservation:
++ case WTF::ArrayBufferContents::AllocationKind::kReservation:
+ ReleaseReservedMemory(allocation_base_, allocation_length_);
+ return;
+ }
+--- a/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.orig 2017-08-15 12:45:59.433532111 +0000
++++ b/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc 2017-08-15 17:52:59.691328825 +0000
+@@ -10,7 +10,7 @@
+
+ #include "webrtc/modules/audio_processing/aec3/aec_state.h"
+
+-#include
++#include
+ #include
+ #include
+
+--- a/gpu/ipc/common/mailbox_struct_traits.h
++++ b/gpu/ipc/common/mailbox_struct_traits.h
+@@ -15,7 +15,7 @@ namespace mojo {
+ template <>
+ struct StructTraits {
+ static base::span name(const gpu::Mailbox& mailbox) {
+- return mailbox.name;
++ return base::make_span(mailbox.name);
+ }
+ static bool Read(gpu::mojom::MailboxDataView data, gpu::Mailbox* out);
+ };
+--- a/services/viz/public/cpp/compositing/filter_operation_struct_traits.h
++++ b/services/viz/public/cpp/compositing/filter_operation_struct_traits.h
+@@ -134,7 +134,7 @@ struct StructTraits {
+ static base::span matrix(const cc::FilterOperation& operation) {
+ if (operation.type() != cc::FilterOperation::COLOR_MATRIX)
+ return base::span();
+- return operation.matrix();
++ return base::make_span(operation.matrix());
+ }
+
+ static base::span shape(
+--- a/services/viz/public/cpp/compositing/quads_struct_traits.h
++++ b/services/viz/public/cpp/compositing/quads_struct_traits.h
+@@ -303,7 +303,7 @@ struct StructTraits {
+ static base::span vertex_opacity(const viz::DrawQuad& input) {
+ const viz::TextureDrawQuad* quad =
+ viz::TextureDrawQuad::MaterialCast(&input);
+- return quad->vertex_opacity;
++ return base::make_span(quad->vertex_opacity);
+ }
+
+ static bool y_flipped(const viz::DrawQuad& input) {
+--- a/third_party/WebKit/Source/platform/exported/WebCORS.cpp
++++ b/third_party/WebKit/Source/platform/exported/WebCORS.cpp
+@@ -480,7 +480,7 @@ WebString AccessControlErrorString(
+ }
+ default:
+ NOTREACHED();
+- return "";
++ return WebString();
+ }
+ }
+
+@@ -512,7 +512,7 @@ WebString PreflightErrorString(const PreflightStatus status,
+ }
+ default:
+ NOTREACHED();
+- return "";
++ return WebString();
+ }
+ }
+
+@@ -533,7 +533,7 @@ WebString RedirectErrorString(const RedirectStatus status,
+ }
+ default:
+ NOTREACHED();
+- return "";
++ return WebString();
+ }
+ }
+
diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-glibc2.26-r1.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-glibc2.26-r1.patch
new file mode 100644
index 0000000000000000000000000000000000000000..ec37a2816d5194553f4aae0184fa502ea12530e6
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/patches/chromium-glibc2.26-r1.patch
@@ -0,0 +1,220 @@
+diff --git a/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc b/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
+index c80724d..052ce37 100644
+--- a/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
++++ b/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
+@@ -36,19 +36,19 @@ namespace google_breakpad {
+
+ // Minidump defines register structures which are different from the raw
+ // structures which we get from the kernel. These are platform specific
+-// functions to juggle the ucontext and user structures into minidump format.
++// functions to juggle the ucontext_t and user structures into minidump format.
+
+ #if defined(__i386__)
+
+-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
+ return uc->uc_mcontext.gregs[REG_ESP];
+ }
+
+-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
+ return uc->uc_mcontext.gregs[REG_EIP];
+ }
+
+-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
++void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
+ const struct _libc_fpstate* fp) {
+ const greg_t* regs = uc->uc_mcontext.gregs;
+
+@@ -88,15 +88,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
+
+ #elif defined(__x86_64)
+
+-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
+ return uc->uc_mcontext.gregs[REG_RSP];
+ }
+
+-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
+ return uc->uc_mcontext.gregs[REG_RIP];
+ }
+
+-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
++void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
+ const struct _libc_fpstate* fpregs) {
+ const greg_t* regs = uc->uc_mcontext.gregs;
+
+@@ -145,15 +145,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
+
+ #elif defined(__ARM_EABI__)
+
+-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
+ return uc->uc_mcontext.arm_sp;
+ }
+
+-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
+ return uc->uc_mcontext.arm_pc;
+ }
+
+-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) {
++void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) {
+ out->context_flags = MD_CONTEXT_ARM_FULL;
+
+ out->iregs[0] = uc->uc_mcontext.arm_r0;
+@@ -184,15 +184,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) {
+
+ #elif defined(__aarch64__)
+
+-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
+ return uc->uc_mcontext.sp;
+ }
+
+-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
+ return uc->uc_mcontext.pc;
+ }
+
+-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
++void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
+ const struct fpsimd_context* fpregs) {
+ out->context_flags = MD_CONTEXT_ARM64_FULL;
+
+@@ -210,15 +210,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
+
+ #elif defined(__mips__)
+
+-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
+ return uc->uc_mcontext.gregs[MD_CONTEXT_MIPS_REG_SP];
+ }
+
+-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
++uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
+ return uc->uc_mcontext.pc;
+ }
+
+-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) {
++void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) {
+ #if _MIPS_SIM == _ABI64
+ out->context_flags = MD_CONTEXT_MIPS64_FULL;
+ #elif _MIPS_SIM == _ABIO32
+diff --git a/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h b/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
+index b6e77b4..2de80b7 100644
+--- a/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
++++ b/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
+@@ -39,23 +39,23 @@
+
+ namespace google_breakpad {
+
+-// Wraps platform-dependent implementations of accessors to ucontext structs.
++// Wraps platform-dependent implementations of accessors to ucontext_t structs.
+ struct UContextReader {
+- static uintptr_t GetStackPointer(const struct ucontext* uc);
++ static uintptr_t GetStackPointer(const ucontext_t* uc);
+
+- static uintptr_t GetInstructionPointer(const struct ucontext* uc);
++ static uintptr_t GetInstructionPointer(const ucontext_t* uc);
+
+- // Juggle a arch-specific ucontext into a minidump format
++ // Juggle a arch-specific ucontext_t into a minidump format
+ // out: the minidump structure
+ // info: the collection of register structures.
+ #if defined(__i386__) || defined(__x86_64)
+- static void FillCPUContext(RawContextCPU *out, const ucontext *uc,
++ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
+ const struct _libc_fpstate* fp);
+ #elif defined(__aarch64__)
+- static void FillCPUContext(RawContextCPU *out, const ucontext *uc,
++ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
+ const struct fpsimd_context* fpregs);
+ #else
+- static void FillCPUContext(RawContextCPU *out, const ucontext *uc);
++ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc);
+ #endif
+ };
+
+diff --git a/breakpad/src/client/linux/handler/exception_handler.cc b/breakpad/src/client/linux/handler/exception_handler.cc
+index 586d84e..05936d2 100644
+--- a/breakpad/src/client/linux/handler/exception_handler.cc
++++ b/breakpad/src/client/linux/handler/exception_handler.cc
+@@ -457,9 +457,9 @@ bool ExceptionHandler::HandleSignal(int /*sig*/, siginfo_t* info, void* uc) {
+ // Fill in all the holes in the struct to make Valgrind happy.
+ memset(&g_crash_context_, 0, sizeof(g_crash_context_));
+ memcpy(&g_crash_context_.siginfo, info, sizeof(siginfo_t));
+- memcpy(&g_crash_context_.context, uc, sizeof(struct ucontext));
++ memcpy(&g_crash_context_.context, uc, sizeof(ucontext_t));
+ #if defined(__aarch64__)
+- struct ucontext* uc_ptr = (struct ucontext*)uc;
++ ucontext_t* uc_ptr = (ucontext_t*)uc;
+ struct fpsimd_context* fp_ptr =
+ (struct fpsimd_context*)&uc_ptr->uc_mcontext.__reserved;
+ if (fp_ptr->head.magic == FPSIMD_MAGIC) {
+@@ -468,9 +468,9 @@ bool ExceptionHandler::HandleSignal(int /*sig*/, siginfo_t* info, void* uc) {
+ }
+ #elif !defined(__ARM_EABI__) && !defined(__mips__)
+ // FP state is not part of user ABI on ARM Linux.
+- // In case of MIPS Linux FP state is already part of struct ucontext
++ // In case of MIPS Linux FP state is already part of ucontext_t
+ // and 'float_state' is not a member of CrashContext.
+- struct ucontext* uc_ptr = (struct ucontext*)uc;
++ ucontext_t* uc_ptr = (ucontext_t*)uc;
+ if (uc_ptr->uc_mcontext.fpregs) {
+ memcpy(&g_crash_context_.float_state, uc_ptr->uc_mcontext.fpregs,
+ sizeof(g_crash_context_.float_state));
+@@ -494,7 +494,7 @@ bool ExceptionHandler::SimulateSignalDelivery(int sig) {
+ // ExceptionHandler::HandleSignal().
+ siginfo.si_code = SI_USER;
+ siginfo.si_pid = getpid();
+- struct ucontext context;
++ ucontext_t context;
+ getcontext(&context);
+ return HandleSignal(sig, &siginfo, &context);
+ }
+diff --git a/breakpad/src/client/linux/handler/exception_handler.h b/breakpad/src/client/linux/handler/exception_handler.h
+index daba57e..25598a2 100644
+--- a/breakpad/src/client/linux/handler/exception_handler.h
++++ b/breakpad/src/client/linux/handler/exception_handler.h
+@@ -191,11 +191,11 @@ class ExceptionHandler {
+ struct CrashContext {
+ siginfo_t siginfo;
+ pid_t tid; // the crashing thread.
+- struct ucontext context;
++ ucontext_t context;
+ #if !defined(__ARM_EABI__) && !defined(__mips__)
+ // #ifdef this out because FP state is not part of user ABI for Linux ARM.
+ // In case of MIPS Linux FP state is already part of struct
+- // ucontext so 'float_state' is not required.
++ // ucontext_t so 'float_state' is not required.
+ fpstate_t float_state;
+ #endif
+ };
+diff --git a/breakpad/src/client/linux/microdump_writer/microdump_writer.cc b/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
+index 3764eec..80ad5c4 100644
+--- a/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
++++ b/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
+@@ -593,7 +593,7 @@ class MicrodumpWriter {
+
+ void* Alloc(unsigned bytes) { return dumper_->allocator()->Alloc(bytes); }
+
+- const struct ucontext* const ucontext_;
++ const ucontext_t* const ucontext_;
+ #if !defined(__ARM_EABI__) && !defined(__mips__)
+ const google_breakpad::fpstate_t* const float_state_;
+ #endif
+diff --git a/breakpad/src/client/linux/minidump_writer/minidump_writer.cc b/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
+index d11ba6e..c716143 100644
+--- a/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
++++ b/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
+@@ -1323,7 +1323,7 @@ class MinidumpWriter {
+ const int fd_; // File descriptor where the minidum should be written.
+ const char* path_; // Path to the file where the minidum should be written.
+
+- const struct ucontext* const ucontext_; // also from the signal handler
++ const ucontext_t* const ucontext_; // also from the signal handler
+ #if !defined(__ARM_EABI__) && !defined(__mips__)
+ const google_breakpad::fpstate_t* const float_state_; // ditto
+ #endif
diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r17.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r17.patch
new file mode 100644
index 0000000000000000000000000000000000000000..6cfd08d58c237c5bc4f2a20f426a3d45bbf32302
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r17.patch
@@ -0,0 +1,68 @@
+--- a/tools/gn/bootstrap/bootstrap.py
++++ b/tools/gn/bootstrap/bootstrap.py
+@@ -179,6 +179,7 @@ def build_gn_with_ninja_manually(tempdir, options):
+
+ write_buildflag_header_manually(root_gen_dir, 'base/debug/debugging_flags.h',
+ {
++ 'ENABLE_LOCATION_SOURCE': 'false',
+ 'ENABLE_PROFILING': 'false',
+ 'CAN_UNWIND_WITH_FRAME_POINTERS': 'false'
+ })
+@@ -204,7 +205,7 @@ def build_gn_with_ninja_manually(tempdir, options):
+
+ write_gn_ninja(os.path.join(tempdir, 'build.ninja'),
+ root_gen_dir, options)
+- cmd = ['ninja', '-C', tempdir]
++ cmd = ['ninja', '-C', tempdir, '-w', 'dupbuild=err']
+ if options.verbose:
+ cmd.append('-v')
+
+@@ -458,6 +459,7 @@ def write_gn_ninja(path, root_gen_dir, options):
+ 'base/metrics/bucket_ranges.cc',
+ 'base/metrics/field_trial.cc',
+ 'base/metrics/field_trial_param_associator.cc',
++ 'base/metrics/field_trial_params.cc',
+ 'base/metrics/histogram.cc',
+ 'base/metrics/histogram_base.cc',
+ 'base/metrics/histogram_functions.cc',
+@@ -507,6 +509,7 @@ def write_gn_ninja(path, root_gen_dir, options):
+ 'base/task_scheduler/scheduler_lock_impl.cc',
+ 'base/task_scheduler/scheduler_single_thread_task_runner_manager.cc',
+ 'base/task_scheduler/scheduler_worker.cc',
++ 'base/task_scheduler/scheduler_worker_pool.cc',
+ 'base/task_scheduler/scheduler_worker_pool_impl.cc',
+ 'base/task_scheduler/scheduler_worker_pool_params.cc',
+ 'base/task_scheduler/scheduler_worker_stack.cc',
+@@ -523,6 +526,7 @@ def write_gn_ninja(path, root_gen_dir, options):
+ 'base/third_party/icu/icu_utf.cc',
+ 'base/third_party/nspr/prtime.cc',
+ 'base/threading/post_task_and_reply_impl.cc',
++ 'base/threading/scoped_blocking_call.cc',
+ 'base/threading/sequence_local_storage_map.cc',
+ 'base/threading/sequenced_task_runner_handle.cc',
+ 'base/threading/sequenced_worker_pool.cc',
+@@ -579,7 +583,6 @@ def write_gn_ninja(path, root_gen_dir, options):
+ 'base/unguessable_token.cc',
+ 'base/value_iterators.cc',
+ 'base/values.cc',
+- 'base/value_iterators.cc',
+ 'base/vlog.cc',
+ ])
+
+@@ -652,7 +655,6 @@ def write_gn_ninja(path, root_gen_dir, options):
+ static_libraries['base']['sources'].extend([
+ 'base/memory/shared_memory_handle_posix.cc',
+ 'base/memory/shared_memory_posix.cc',
+- 'base/memory/shared_memory_tracker.cc',
+ 'base/nix/xdg_util.cc',
+ 'base/process/internal_linux.cc',
+ 'base/process/memory_linux.cc',
+@@ -827,7 +829,7 @@ def build_gn_with_gn(temp_gn, build_dir, options):
+ cmd = [temp_gn, 'gen', build_dir, '--args=%s' % gn_gen_args]
+ check_call(cmd)
+
+- cmd = ['ninja', '-C', build_dir]
++ cmd = ['ninja', '-C', build_dir, '-w', 'dupbuild=err']
+ if options.verbose:
+ cmd.append('-v')
+ cmd.append('gn')
diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r8.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r8.patch
deleted file mode 100644
index d9f389aaf588cfcafae7d5481a6ffe6fe0740875..0000000000000000000000000000000000000000
--- a/pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r8.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: tools/gn/bootstrap/bootstrap.py
-diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
-index 6f2f5b1264519ea38cc36fb0b7e2cc24c378ca7a..0b03d2626b358fb90ab39d737679ee47bd60303b 100755
---- a/tools/gn/bootstrap/bootstrap.py
-+++ b/tools/gn/bootstrap/bootstrap.py
-@@ -487,6 +487,7 @@ def write_gn_ninja(path, root_gen_dir, options):
- 'base/sys_info.cc',
- 'base/task_runner.cc',
- 'base/task_scheduler/delayed_task_manager.cc',
-+ 'base/task_scheduler/environment_config.cc',
- 'base/task_scheduler/post_task.cc',
- 'base/task_scheduler/priority_queue.cc',
- 'base/task_scheduler/scheduler_lock_impl.cc',
diff --git a/pkgs/applications/networking/browsers/chromium/patches/constexpr-fix.patch b/pkgs/applications/networking/browsers/chromium/patches/constexpr-fix.patch
new file mode 100644
index 0000000000000000000000000000000000000000..9f187752ea675096bae8b5f52892f0682010f52c
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/patches/constexpr-fix.patch
@@ -0,0 +1,98 @@
+From aab2cc3a20af9ebe9ddb8dfd15089f131f95817f Mon Sep 17 00:00:00 2001
+From: Tomas Popela
+Date: Fri, 20 Oct 2017 14:06:42 +0200
+Subject: [PATCH] Fix the build of base/numerics with GCC
+
+Initialize the uninitialized variables where the build is failing.
+
+BUG=776705
+
+Change-Id: I5782e18086a752b3676f8738930bf0553f3f97ad
+---
+ base/numerics/checked_math_impl.h | 6 +++---
+ base/numerics/clamped_math_impl.h | 10 +++++-----
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/base/numerics/checked_math_impl.h b/base/numerics/checked_math_impl.h
+index 2926b37b5e..e083389ebf 100644
+--- a/base/numerics/checked_math_impl.h
++++ b/base/numerics/checked_math_impl.h
+@@ -67,7 +67,7 @@ struct CheckedAddOp::value) {
+ presult = static_cast(x) + static_cast(y);
+@@ -127,7 +127,7 @@ struct CheckedSubOp::value) {
+ presult = static_cast(x) - static_cast(y);
+@@ -183,7 +183,7 @@ struct CheckedMulOp::is_supported) {
+ // The fast op may be available with the promoted type.
+diff --git a/base/numerics/clamped_math_impl.h b/base/numerics/clamped_math_impl.h
+index 7b5e4346f2..303a7e945a 100644
+--- a/base/numerics/clamped_math_impl.h
++++ b/base/numerics/clamped_math_impl.h
+@@ -87,7 +87,7 @@ struct ClampedAddOp(IsValueNegative(y));
+- V result;
++ V result = {};
+ return BASE_NUMERICS_LIKELY((CheckedAddOp::Do(x, y, &result)))
+ ? result
+ : saturated;
+@@ -114,7 +114,7 @@ struct ClampedSubOp(!IsValueNegative(y));
+- V result;
++ V result = {};
+ return BASE_NUMERICS_LIKELY((CheckedSubOp::Do(x, y, &result)))
+ ? result
+ : saturated;
+@@ -136,7 +136,7 @@ struct ClampedMulOp::is_supported)
+ return ClampedMulFastOp::template Do(x, y);
+
+- V result;
++ V result = {};
+ const V saturated =
+ CommonMaxOrMin(IsValueNegative(x) ^ IsValueNegative(y));
+ return BASE_NUMERICS_LIKELY((CheckedMulOp::Do(x, y, &result)))
+@@ -156,7 +156,7 @@ struct ClampedDivOp::type;
+ template
+ static constexpr V Do(T x, U y) {
+- V result;
++ V result = {};
+ if (BASE_NUMERICS_LIKELY((CheckedDivOp::Do(x, y, &result))))
+ return result;
+ // Saturation goes to max, min, or NaN (if x is zero).
+@@ -176,7 +176,7 @@ struct ClampedModOp::type;
+ template
+ static constexpr V Do(T x, U y) {
+- V result;
++ V result = {};
+ return BASE_NUMERICS_LIKELY((CheckedModOp::Do(x, y, &result)))
+ ? result
+ : x;
+--
+2.14.2
+
diff --git a/pkgs/applications/networking/browsers/chromium/patches/gn_bootstrap_observer.patch b/pkgs/applications/networking/browsers/chromium/patches/gn_bootstrap_observer.patch
new file mode 100644
index 0000000000000000000000000000000000000000..f1207439bb4da7d04016b984e7a2b79f1d775255
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/patches/gn_bootstrap_observer.patch
@@ -0,0 +1,11 @@
+--- a/tools/gn/bootstrap/bootstrap.py 2017-11-07 23:06:09.000000000 +0000
++++ b/tools/gn/bootstrap/bootstrap.py 2017-11-08 12:17:16.569216182 +0000
+@@ -481,6 +481,7 @@
+ 'base/metrics/sample_vector.cc',
+ 'base/metrics/sparse_histogram.cc',
+ 'base/metrics/statistics_recorder.cc',
++ 'base/observer_list_threadsafe.cc',
+ 'base/path_service.cc',
+ 'base/pending_task.cc',
+ 'base/pickle.cc',
+
diff --git a/pkgs/applications/networking/browsers/chromium/patches/include-math-for-round.patch b/pkgs/applications/networking/browsers/chromium/patches/include-math-for-round.patch
new file mode 100644
index 0000000000000000000000000000000000000000..530493dcd0f6e70974925b0db1bd68c975c64cec
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/patches/include-math-for-round.patch
@@ -0,0 +1,34 @@
+From 7f90e2cceda0458cf56026eb6ccffb961a47804b Mon Sep 17 00:00:00 2001
+From: Raphael Kubo da Costa
+Date: Fri, 13 Oct 2017 15:49:32 +0200
+Subject: [PATCH] IWYU: Include math.h for round(3).
+
+math.h was being implicitly included, which can break the build with
+alternative libc implementations.
+
+Bug: None
+Change-Id: I969b320b65d0f44abb33d3e1036cfbcb859a4952
+Reviewed-on: https://webrtc-review.googlesource.com/9384
+Reviewed-by: Tommi
+Commit-Queue: Raphael Kubo da Costa (rakuco)
+Cr-Commit-Position: refs/heads/master@{#20292}
+---
+ p2p/base/port.cc | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/third_party/webrtc/p2p/base/port.cc b/third_party/webrtc/p2p/base/port.cc
+index a1b478d11..81aa0aadb 100644
+--- a/third_party/webrtc/p2p/base/port.cc
++++ b/third_party/webrtc/p2p/base/port.cc
+@@ -10,6 +10,8 @@
+
+ #include "p2p/base/port.h"
+
++#include
++
+ #include
+ #include
+
+--
+2.15.0
+
diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix
index c20ce2cca306cd3fa1d3d0fda6b81f302955e10a..639425477c9e16077ef268f2cc18b0e7ea7057f4 100644
--- a/pkgs/applications/networking/browsers/chromium/plugins.nix
+++ b/pkgs/applications/networking/browsers/chromium/plugins.nix
@@ -94,12 +94,12 @@ let
flash = stdenv.mkDerivation rec {
name = "flashplayer-ppapi-${version}";
- version = "26.0.0.151";
+ version = "27.0.0.183";
src = fetchzip {
url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/"
+ "${version}/flash_player_ppapi_linux.x86_64.tar.gz";
- sha256 = "0l15k2ws3256zyvbfx66j8p1liqv4k2m8hhw2jz8nzza7q6il35p";
+ sha256 = "012fhsjfp71vaarjhi3dd4qpb41n4510zmid38hl2hsjz7qrj5aj";
stripRoot = false;
};
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index e80cfdbc904e34653bed72f196bd754e9ab596ee..8f87fe7ddddd688565ddc703136c70f950783027 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 = "1sh3rq36sh4g7blajvqfvs06fs5sbrbdp50qq0cvcj4k3fmb4bd8";
- sha256bin64 = "1w67y4z57qm5fwniayncly7a4mjmwqir7gfd54ny8lwlf247d43m";
- version = "60.0.3112.78";
+ sha256 = "068jaws7lqwlw3g62d2cv7i44p6zvdnizdqd56hfs4wj08k068db";
+ sha256bin64 = "009ckf3gh039dwdf8rj494ra4qp0kijgzkrxianda1r7cqz1c3ys";
+ version = "63.0.3239.30";
};
dev = {
- sha256 = "0yan2dzx1854f3xslif5682rkb82a1li6vxj12z5s5fxqijhj1jq";
- sha256bin64 = "0ddva2rqnid2gcx3qh72p41wc15869w2w9n0rbdpn662rpl041v1";
- version = "61.0.3163.25";
+ sha256 = "0kpn5w1qvjlkxqhsc7lz269mxp7i0z9k92ay178kgsph3ygncm0x";
+ sha256bin64 = "1pvnkhvks3yvpdh2qg9iqg6xmi5bxrl1n6mp9akywv1d5wsba7kg";
+ version = "64.0.3260.2";
};
stable = {
- sha256 = "1rirhwvccidza4q4z1gqdwcd9v1bymh1m9r2cq8jhiabfrjpjbxl";
- sha256bin64 = "1lw349ips0sgyls3arv864yq5xykfn9jilwkalvllaq6yvdvcvlk";
- version = "60.0.3112.90";
+ sha256 = "0sclvs11kn60ibc66wfan0xdcsr2s8vkvbq759h86w9gq86pcycz";
+ sha256bin64 = "05lbrzd37q57mx9rii995l9z42a4aa0jh55ia615sqmzr56a7fdr";
+ version = "62.0.3202.89";
};
}
diff --git a/pkgs/applications/networking/browsers/dwb/default.nix b/pkgs/applications/networking/browsers/dwb/default.nix
index 0aacbd2565b91028c89b4feda2985578ab1d800d..137b463a1e1d54cf4ae15245b05b9897ddbfd4f0 100644
--- a/pkgs/applications/networking/browsers/dwb/default.nix
+++ b/pkgs/applications/networking/browsers/dwb/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation {
sha256 = "1wg7pslcx7z4fw595a3nbnygxy2bwfj0h377i48mxhddvl3wzzbq";
};
- buildInputs = [ pkgconfig makeWrapper gsettings_desktop_schemas libsoup
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ makeWrapper gsettings_desktop_schemas libsoup
webkitgtk24x-gtk2 gtk2 gnutls json_c m4 ];
# There are Xlib and gtk warnings therefore I have set Wno-error
diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix
index cc34318edf3cd49d5770900e1a64be13a37fbfd4..b60454c4a42dec7c1e1261327f2b70e4f1ea75d3 100644
--- a/pkgs/applications/networking/browsers/elinks/default.nix
+++ b/pkgs/applications/networking/browsers/elinks/default.nix
@@ -1,7 +1,10 @@
-{ stdenv, fetchurl, perl, ncurses, xlibsWrapper, bzip2, zlib, openssl
-, spidermonkey_1_8_5, gpm
-, enableGuile ? false, guile ? null # Incompatible licenses, LGPLv3 - GPLv2
-, enablePython ? false, python ? null
+{ stdenv, fetchurl, ncurses, xlibsWrapper, bzip2, zlib, openssl
+, gpm
+, # Incompatible licenses, LGPLv3 - GPLv2
+ enableGuile ? false, guile ? null
+, enablePython ? false, python ? null
+, enablePerl ? (stdenv.hostPlatform == stdenv.buildPlatform), perl ? null
+, enableSpidermonkey ? (stdenv.hostPlatform == stdenv.buildPlatform), spidermonkey_1_8_5 ? null
}:
assert enableGuile -> guile != null;
@@ -17,28 +20,26 @@ stdenv.mkDerivation rec {
patches = [ ./gc-init.patch ];
- buildInputs = [ perl ncurses xlibsWrapper bzip2 zlib openssl spidermonkey_1_8_5 gpm ]
+ buildInputs = [ ncurses xlibsWrapper bzip2 zlib openssl spidermonkey_1_8_5 gpm ]
++ stdenv.lib.optional enableGuile guile
- ++ stdenv.lib.optional enablePython python;
-
- configureFlags =
- ''
- --enable-finger --enable-html-highlight
- --with-perl --enable-gopher --enable-cgi --enable-bittorrent
- --with-spidermonkey=${spidermonkey_1_8_5}
- --enable-nntp --with-openssl=${openssl.dev}
- '' + stdenv.lib.optionalString enableGuile " --with-guile"
- + stdenv.lib.optionalString enablePython " --with-python";
-
- crossAttrs = {
- propagatedBuildInputs = [ ncurses.crossDrv zlib.crossDrv openssl.crossDrv ];
- configureFlags = ''
- --enable-finger --enable-html-highlight
- --enable-gopher --enable-cgi --enable-bittorrent --enable-nntp
- --with-openssl=${openssl.crossDrv}
- --with-bzip2=${bzip2.crossDrv}
- '';
- };
+ ++ stdenv.lib.optional enablePython python
+ ++ stdenv.lib.optional enablePerl perl
+ ;
+
+ configureFlags = [
+ "--enable-finger"
+ "--enable-html-highlight"
+ "--enable-gopher"
+ "--enable-cgi"
+ "--enable-bittorrent"
+ "--enable-nntp"
+ "--with-openssl=${openssl.dev}"
+ "--with-bzip2=${bzip2.dev}"
+ ] ++ stdenv.lib.optional enableGuile "--with-guile"
+ ++ stdenv.lib.optional enablePython "--with-python"
+ ++ stdenv.lib.optional enablePerl "--with-perl"
+ ++ stdenv.lib.optional enableSpidermonkey "--with-spidermonkey=${spidermonkey_1_8_5}"
+ ;
meta = {
description = "Full-featured text-mode web browser";
diff --git a/pkgs/applications/networking/browsers/falkon/default.nix b/pkgs/applications/networking/browsers/falkon/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..9356794bb5d69f63d4e2ae83436bc0eba53189ff
--- /dev/null
+++ b/pkgs/applications/networking/browsers/falkon/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, lib, fetchFromGitHub, cmake, extra-cmake-modules, pkgconfig, qmake
+, libpthreadstubs, libxcb, libXdmcp, qtsvg, qttools, qtwebengine, qtx11extras, kwallet, openssl }:
+
+stdenv.mkDerivation rec {
+ # Last qupvilla release is 2.1.2 so we add the .1 although it isn't actually a
+ # release but it is basically 2.1.2 with the falkon name
+ name = "falkon-${version}.1";
+ version = "2.1.2";
+
+ src = fetchFromGitHub {
+ owner = "KDE";
+ repo = "falkon";
+ rev = "eecaf2e9d6b572a7f7d2e6dc324e3d79b61c31db";
+ sha256 = "01r5aw10jd0qz7xvad0cqzjbnsj7vwblh54wbq4x1m6xbkp6xcgy";
+ };
+
+ preConfigure = ''
+ export NONBLOCK_JS_DIALOGS=true
+ export KDE_INTEGRATION=true
+ export GNOME_INTEGRATION=false
+ export FALKON_PREFIX=$out
+ '';
+
+ dontUseCmakeConfigure = true;
+
+ buildInputs = [
+ libpthreadstubs libxcb libXdmcp
+ kwallet
+ qtsvg qtwebengine qtx11extras
+ ];
+
+ nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qmake qttools ];
+
+ # on 2.1.2: RCC: Error in 'autoscroll.qrc': Cannot find file 'locale/ar_SA.qm'
+ enableParallelBuilding = false;
+
+ meta = with stdenv.lib; {
+ description = "QtWebEngine based cross-platform web browser";
+ homepage = https://community.kde.org/Incubator/Projects/Falkon;
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ peterhoeg ];
+ platforms = platforms.unix;
+ broken = true;
+ };
+}
diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
index 967fd1e1595ceac3afc1c16abedd55ae862b7f07..16b59debdd424f8ccc8a22dbca39bfb8ccff62f8 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
@@ -1,955 +1,955 @@
{
- version = "55.0b2";
+ version = "57.0b14";
sources = [
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ach/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ach/firefox-57.0b14.tar.bz2";
locale = "ach";
arch = "linux-x86_64";
- sha512 = "7164db8b579c12976ab86770f3c238d8b4b4334a41107f995d03b87c77e7998e1c7d48b36b2305d67f1eddb4d3cbe0b9bfb9c27169abaac00839d90a0e80d38f";
+ sha512 = "07c3398805092ba5d252adcdb690a144f8143a8827e70e3be3cb71175735c9c37c9d0edb93936f8cd1af16ad7a6f988b8e8fe9eaed7e36bbb85abab0137893b6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/af/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/af/firefox-57.0b14.tar.bz2";
locale = "af";
arch = "linux-x86_64";
- sha512 = "994024e45c16b1dda3680ad4d73fa7a2a84bf43ce3be8df4fa61a695b9041fcdf88ae750c0ab34bf9dd814cbcde10b14832d5b03682e8c83e4dc43a316b6c75f";
+ sha512 = "fd954a1ddae090d6bd2c76922d4ec53ef249749c27996fbeb1276d2d82284540a000ad4fe6efbd690bb5e73b6923016d5c9c98d34ac5748c29791187417dd8c6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/an/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/an/firefox-57.0b14.tar.bz2";
locale = "an";
arch = "linux-x86_64";
- sha512 = "dc4a8db0c9bd87ef140d8c2fa2e4deb63e664a97353d88f94f99fd10ed358091a6215b62f8a441ef65dfa6774989ede451e55749bdffb0f670904959f5e8bb70";
+ sha512 = "c57c10028a99df1694897966f54aa6f8b85a6b2d0ed23699542a7a2bbe458e26d622e2de398bf7559bc33e7e4172d23d5aff8402048174a39804247dd8516e0d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ar/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ar/firefox-57.0b14.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha512 = "94d018fe2116733bd14daf51d9d9f09022a745b3797773422ac79511a8fd1e14e9fea879f7873c1043e0b63d2df4425c806645467764325400f71600a2f1cc1c";
+ sha512 = "a4417b95c1bec25f148c57c42895e84024153065536a303f8eef7a0d9a7d39d4de8bf287f3af815e8ccb7ec7ec797f098416f78775acc8d778c91975d6268014";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/as/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/as/firefox-57.0b14.tar.bz2";
locale = "as";
arch = "linux-x86_64";
- sha512 = "6b5811c9ec50be18a34e0102438e95fea58c8667a0a19c9c4c5f4ac93c8ae8b9cd929252c81de7f19a15b82ed6a01e8fe37fda7aafc63cac223cc09b1d9dbd11";
+ sha512 = "5b624b9d0a4ee345d5c7b79913a8cdb48acebae32f088479c0745acee925d58c826b5125186ffa7c017ff3524983bfa06fe5061ee9423c37fb6f0e7323cac85c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ast/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ast/firefox-57.0b14.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha512 = "4deb4aff290277f870d5c3148e375a9bd2071b455ff93f10e28c9afe149a8f11689bef936db8a87c0fd4cda5bdda70aced4580395343916e7510ab7970269fdd";
+ sha512 = "efb5ac3daa79a88425401f2bf5df6c0fba90fefd21840723cedc8ebae149816198b727dae67c3f74406c47e01dd2365d1eeb92c39a549f1acba4ba65dab704b4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/az/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/az/firefox-57.0b14.tar.bz2";
locale = "az";
arch = "linux-x86_64";
- sha512 = "3cf69626fbcd8667c83978e540cf0e8e0123408dd080073e95f543a0c98085320bd95caf77fb814002e45694cefa5542c6d436d258c66abb8435d52ce85f111c";
+ sha512 = "703332727a0db4a51a39859209ce76120cbdde5a00d32a931e118e478dbb5f4a4e8f3d06abfa9bc97bf66a411f533c23b7375599fc0a7f0c13c9d7f518cb8990";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/be/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/be/firefox-57.0b14.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha512 = "0318b4bbf69fda1586665dbe7626d4ba1c4768acf310b5bcb0d49c1212199704d4f0c0da6dcd99f75dd7871d39a4725497c47ec2f980b1c458b101a4e18531e5";
+ sha512 = "d8ad4ba538e2e3f86ad8564e2418cbd34f33d4e89233fa6638acf10a3e10eafc0b81d6c20b585b872c5c00bb6fa2af1ea4097c19de01446a6811e4843c99fbf2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/bg/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/bg/firefox-57.0b14.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha512 = "0de32e72eba0fae0e19c1d1cf8e8f8f99926d66df6831317742a74bd0e90f909cd4a55432f9fde3e25c33e37160f5e92d0ca97b2236089d4059c5789e89823f7";
+ sha512 = "cb6af38306ab8bcd9229cf1dbcfaaf310108c31e28dbae6b9fc21a4cbdd82baf9fa785a9a94bdacb779c8679721903bc721a0e7ca2a1a09995fa97f1486a8232";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/bn-BD/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/bn-BD/firefox-57.0b14.tar.bz2";
locale = "bn-BD";
arch = "linux-x86_64";
- sha512 = "333b28b03e6a4612b0e5636e14bc83d6e152237fbcd4129acf25767f3049835bf262040caacba1976d2791ec06fa89e3c70ed1abea414bbf4289729296099993";
+ sha512 = "1739ab1c4c1a7387dab56fb89762b26d8cf279c14a7bbfb1f7f888e9c2c714eaec84aba12f1384defc7974e207b506e206f980a8a68be7f274cccf7232f30e32";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/bn-IN/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/bn-IN/firefox-57.0b14.tar.bz2";
locale = "bn-IN";
arch = "linux-x86_64";
- sha512 = "ba989a0555fdc40e9ce9d834eef26b19c30b19616d85b5864d26253572fd79bf02b7a0b9bfd00dddaa192950c7f9d52c20887569b7cad8b03622ac0df55baadb";
+ sha512 = "358f8e3c1e9774fabd6bd8faff4cd2903c0e0cae6e5e6ee6f2ceb228ce7d489ed9112eb729a4f7d0ea25c377a2a54772279ea1343cec449b949688dfe19a69a0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/br/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/br/firefox-57.0b14.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha512 = "e43ec7e1ba0d977938e5a1bc3f985196211fb6587c44018958f750b35fea78f2dd94a8fbd1b91f70e41c3f3cc0da194bed76306d4b63bca3dfde7a65a6a7532a";
+ sha512 = "df0c34c951d81d500a0720c2a9cfda76831564dc45d2e34d37b677702414b2f53710fe4eb7f63257658fd058ffa648a904aaad4d864a325a1b1e1ddfee2faf32";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/bs/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/bs/firefox-57.0b14.tar.bz2";
locale = "bs";
arch = "linux-x86_64";
- sha512 = "7ed042ecf92e7f873f93e0f6a7ab27418e960adcc2417e18fe9ee8b468157af85dfbd8e56df7f0dba97027b3a38aeb6279d81451579cc97a9fec814064b74e58";
+ sha512 = "091cffc15f609bfab74061f13c526d4c13946e7b79d3a190ced0ffe2fb9aed457e1e1780d9c152699f4b42aa920d9bc77701eb944d9f9671b70da3278fabde8d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ca/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ca/firefox-57.0b14.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha512 = "0953320dfdebfda3b2f135fb5277ebbdcae1c13f431b4452e0398515d990fd6faa8137dd4f49bf4336b385c70422f340e0bd8a466c07f76146d9ff32655cbe1d";
+ sha512 = "cd485d1202daeee2e24ca812350ce348ba93a0bf389741b13ad6aa6a81ae4c57007ea0b312e401fed8c268c8a86b5ccbf62ee25d2c1d8d787f16e92467f3c136";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/cak/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/cak/firefox-57.0b14.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha512 = "e79e1e6a2784e3e61637624ddd8b628b784090c61daa35d36a3ebbb68db1801ead01b86bb04d7b2bb3037fb53b42197a50de78013afcc2443136b65df6f0b9dc";
+ sha512 = "c5573576cc70d776f3d40a2451295ad8a6230b0de280b0a2a3dae7ecc2c1fcc2eee5fd5e4df91a2b1c9a63411263a4a55f0bfa605a0688cbfb10c341dfe4eaa0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/cs/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/cs/firefox-57.0b14.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha512 = "c48991f37c786982f90ba12d43120dbefdc046d30c9ccbba630224b1f08dbce2b73eb4456e1b588f5ca0518ad19b8148e9dd5cf4a9f47f8d4ca0e90e2988f18d";
+ sha512 = "771141fa3d846651448b158d8ad583a45dd2fc05ca5e3ff2ca19687431a140744707260b3ad9e304bb2062757ef333815f69e10a48e72308a802f9088e24b22b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/cy/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/cy/firefox-57.0b14.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha512 = "a01937ba6f1e56b34ed4d16acbfa336338391c8fe4e33e5f06ec2a35c3c6010a35f20f7949ef1f6d50c9d6f6d9db115eb95cac50762d7d6a3b642f78192a6b4c";
+ sha512 = "7fd6f5eb9473b3ee68a7a2a98128c205df6654bab21e4c19f6ecc1e427dcdca3b93e9ff22239ebb652a545a3cb8892782e34cb876ada78d604bc48816960f897";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/da/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/da/firefox-57.0b14.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha512 = "d7861e3765acac1e8e5a1b302986fcfbdc262a22308ead2239e7acb3617534f1b8bc101c2ca6d5aa1758bc13a6cac5f31fa062dd31ef239113cc815c9d4d22a5";
+ sha512 = "30df907a7e99f41f9291d2e677e124363a8c2f702e90db870e2ccc1bbabec2266f0c64fa3daac66c5da1543056d1e3e1e8458dd4627cecfc0a9090ab0aee13ae";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/de/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/de/firefox-57.0b14.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha512 = "2b6efac1ab738f42fe52a6c8e4bd20fea1e044577a4dd82fea54ef403adf2ea9f7cb64268de68dc55799afd3f5e90f724c98b9f705affc704e1a58118c674dac";
+ sha512 = "bce375636ad043e2a9e331ecf84154f5e329217b6c1697ddcf17301115f39c6f35b88083cbec132f92fc30d93b414a8a913ddf02ff0c406295047d5d11a7a3e1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/dsb/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/dsb/firefox-57.0b14.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha512 = "c5de911eea687279d6d14b8dc745597c6450c733cc332e104de6ebd9a7a64b877474fb0da0bbe59ef4c8424549eff4fc6b57a93379c09df00fda761bc7347e54";
+ sha512 = "0b75a555b9b02759b4315d3f77d78e71f2106db1b2901457b54e7a487b9f35a0aed3b6f47e7363257b2bbcd42104783fe14bc4171d658515b72fb61bdf9b0fd4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/el/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/el/firefox-57.0b14.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha512 = "b531426207bf42f74f87ba8807441926f9476f0f15caf8a21594d099992c7c91d2cda6d71d318d899863185bdf776f4bf46820fff77b37f8a95c52f570f9247d";
+ sha512 = "f4592a580dd7fa207943d071c92816c1f6583f579e8a8fb6564da6e95c0edff1c7dac24c581e25f874b354b55aabdb8fba17a2f4d9677b653e957a66360fabc0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/en-GB/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/en-GB/firefox-57.0b14.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha512 = "4c1c99501cf1ff1320d27c7709d9572837a1a1fb7d8dea4578075836e013b5fd79c84afababb45bbb5cf95655b51b0503ac45023746ff6d4831bda93c493e539";
+ sha512 = "56731ee2e83a591201471bd6236a247a3a5713607344ae8a5c03efcad4f69eeec010dd89c1fdd6329325768a4b9a83ecbc278fc503a8d61244523748d0a8fd06";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/en-US/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/en-US/firefox-57.0b14.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha512 = "82678293b35fe73c27c5842589de97858a8cb5186d7f1309693f16a516ddd62a59bd96e84358571367b706354625a98bec7fff9f7c598c96f025594baad44aa2";
+ sha512 = "cbe3a6ae2dc8d89ebd935d2c58d3f735ce08f45418c31f1faa9f75d75255a07fa87d9b7d53f571bfd876701b566e27cb8bd761cd167749e2019b1f3bc1fb569f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/en-ZA/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/en-ZA/firefox-57.0b14.tar.bz2";
locale = "en-ZA";
arch = "linux-x86_64";
- sha512 = "ded063ef65018cb0b138298b9e9df9a2aedaadf92d5c77248120cee6504542d18967b01c1bf497e264a9aeac7c119c8bc9885fb202dd0abcb0ba00344ad30397";
+ sha512 = "f5c32cbea6753f4325c7cfdc99bacc4565b58b0ffb7cdc8db6d559922b8402493b502e7a05fda4e08746d48dfa50ca7b70ac27e152ceed3fadb9d2af2ac0f639";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/eo/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/eo/firefox-57.0b14.tar.bz2";
locale = "eo";
arch = "linux-x86_64";
- sha512 = "205dc910f37c5501b27ff044f5bbb197fd4bbc3d8a5512ea01b0b4c155cd8b2f19eb6c400cb999a6136f2534ac0ede511ddf827ffd59f97ba00b538852c9a0a7";
+ sha512 = "89d278965fb4c7899abdf17f2fd1dbde201c959b623c46ba4db51628a3a09c5e054a614b8657f7f190ca5e9cdecced24f126978425bb38d14c84770958466bb0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/es-AR/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/es-AR/firefox-57.0b14.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha512 = "95a026ce800722d1e89237a675a58fee8243e5b4a900d1ce42a4f139dbb43e940478660f78d9c4593b9d09af7c3dc843984b7a362b465d99317aba9bb213b371";
+ sha512 = "d21ed37e2d6461f31519d08040b271e9a6d476e7132f5db406fa3eb3fdce67384af376a89d740426fba12a5602c20a4d315c0e337f0707ed7b91d739b648ad63";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/es-CL/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/es-CL/firefox-57.0b14.tar.bz2";
locale = "es-CL";
arch = "linux-x86_64";
- sha512 = "42f0703824210feedd7da2f78a4d0823d1d0f3b23d4edaa07d63a5021847ba55871fec33676915b9f2b411ebd9cdf31de155f2de0a47586428bf0e1a3fe7457e";
+ sha512 = "bd0dd077e732c996de27e5fabd22933aa1c1ff448425bc757be909ccfdf7a8a2f32944721a248e4998bf9d455fcce13c22a89dbb780c3a61d8fb06745075b122";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/es-ES/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/es-ES/firefox-57.0b14.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha512 = "d11dd1264e4692da710d18ef5c18d7f5bc1db36214cfd28a7f567d56a35ac6e56f838a58ef6ebfc2d68b115417cdd19fd49ae2f6a13f1a57bb2eacd122945f1c";
+ sha512 = "7abe774d7c2baa9e055c382fbe4612244e9ce5c778185e86c1b4e8422ab8af4f99a949bc8560109e6995d8101f8563e6251643a5c6e4ff1ca9675b064e1da580";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/es-MX/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/es-MX/firefox-57.0b14.tar.bz2";
locale = "es-MX";
arch = "linux-x86_64";
- sha512 = "ab33b21aaacb43f4676856e74f4d93e2d449b67095500907669db42f678fe0d7448f2205f42c3f85885cef0a2c262818368808ecc336205411dc27b99e42f272";
+ sha512 = "4f4c6a5cb3fb25a030a44f3b7c60d6a1af77b083ca4cd04711ed4663e276f03ac92f4b8be697554af7a4721641fc7588b005e27f2ed2c5c1efb947a64cfae8a1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/et/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/et/firefox-57.0b14.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha512 = "2a87e6a9bd6c3aa22d278f114d0bd18779c7847cab2e6257c4e601f3749df703f2d0a25f5646ad91802a2cd093bd1734305fb350aa2be269c1fc5fd2d621d4db";
+ sha512 = "f23d6cdaac6a412c28c633fcd304833bb341c159090575b8f8cd7bed6068a3ca3497cae072d831b1ac40ebc98853fec978a09009d3eaa5c1f6aa6bd4f8c3b956";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/eu/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/eu/firefox-57.0b14.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha512 = "9017cc8bed387b103f78870b157a50c18f8e36858eca1bcbce8ac5ceb06f6d7b178760f7dc733ce570cdbdc3204d277a98a4b4324a0d3691d1fe3f6b1e9725df";
+ sha512 = "1f7f209e1faafd254e607c7bfceb5b1913c59361d55bfde394d2af4f745e0be54b7d119cf71a88c577dc76f0ca9a96fa52cdb38b27ed5dd6d270eef5efca2501";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/fa/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/fa/firefox-57.0b14.tar.bz2";
locale = "fa";
arch = "linux-x86_64";
- sha512 = "d70f1a793d67f1b52f740bbcdc4fb01056495fdc5b14672b35a48a500c71ac7cd0cc6272e7f6b4b4fcac65874f32ee64338435f76131c1d74ef82ca7a512eab7";
+ sha512 = "e175dfa91bda0daac8854d999cf3770332d61dc11ba338ba8a9c42718e7d470e07dab656a3a13ff25f4295df648196549b4a3f4b273061c278f03e0a76815213";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ff/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ff/firefox-57.0b14.tar.bz2";
locale = "ff";
arch = "linux-x86_64";
- sha512 = "c16463456725b2f0263b8fee2d0729bd4951a352b1dfdee819bc2af0e138cda73d169eec63a27ed2900a0703648db0c784969a41df874336b1a84170ddaa71a4";
+ sha512 = "243c09586248988625ae347ad10b691cb5f93ad78562c3223a244403a5ad41b138289a992edfce91a8744f45ff8a2feb008ef3dfeca608fa2cf44e39746bf794";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/fi/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/fi/firefox-57.0b14.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha512 = "00bf17dab47261470f57b94a18fcd5fcca0344be1b1d6352968e132c7f3fdfc5b5229c80eaca1a9802e75d432e09bb6e0dd3dbd40ee9f0c783ca007da61b52de";
+ sha512 = "66ac96ceef9d36ab4c16a288da714c9bb9dd72b12cd814dcdb3740135ce6d19f18ee564c31050b619a1af207d086674ea4f60ee01de3a18eb854f35af5d3fb8c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/fr/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/fr/firefox-57.0b14.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha512 = "7599fed77975a7b4667c9d3456a5536e3b7eb1725acd624c504d061330ea84c3a19dd72914a0f7644068972b94a7a058708e3b1e3618e084315b920e8f671f13";
+ sha512 = "7a9398f8753c0b3d6777a5dab4c28fbacc493883e5326fcac0cb0a0f62509169768355a5c5db377afa6a1ec79676b8de53ccabc49666ac9830d588ad2c8bd8eb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/fy-NL/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/fy-NL/firefox-57.0b14.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha512 = "c665bb33f04b7d3b9790580b0db992ce223e75fdd3915b16f79125a72bac91cec098b1ae73b1223f5b03597c1e19522b46fe11c5c05a7cfe0c932a21bf94f90c";
+ sha512 = "b309d91af97a94246c9450eea61f81cd8f6e8564bd089caab7e1238df4855aea54568ae8d40c3c59e09729779623f1f488e2b18f05094ad79d7d773a82196eee";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ga-IE/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ga-IE/firefox-57.0b14.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha512 = "c775e3e6858732104ba3251de42a0e9ba5031ade5f89207b357e93c6f6e4acd07bcc91a5fa558a9884f07438ca0de6bf10065ff7e37d980914da392428bc57e9";
+ sha512 = "f3b699c8cddca58a8610aade833b470e006a804606ecf13f166239f32ec7fdf0ae57e6f91d3a104efd08fa9cb34c7d78026753d0cc235cabad8aed8ae85ccb22";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/gd/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/gd/firefox-57.0b14.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha512 = "c8df95449757099a7c8d50c04f42aace7ce25297c78622296feb336352cecb53726f3873210af6cab96d90f65e21daa084b08f6b943e1130c75f68e6de1168a3";
+ sha512 = "261b14e52513485a14d4c92f580a9deb228dd730f77911dde25785b8eb7974a1fc6d39b6d377a3dabf3f488f9d29892aed86c38a115aa4c9660b27a229a512f7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/gl/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/gl/firefox-57.0b14.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha512 = "4488db080b8bbf7e437a684d1d7cbe219d1d730db055cd9988706cd71deb110b9496a87684ca32d172f3eeb3308ec1ee2ad0ab3b1e206d012c62311db45db911";
+ sha512 = "6028afc50364a4bc0e21fcf82181b3d6ab44a985d7ed55fc090544d25c0bd65ba8737e1b653e9cf860f201c6c3aded33693c2ee7cb7229b899007e9a607a39fd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/gn/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/gn/firefox-57.0b14.tar.bz2";
locale = "gn";
arch = "linux-x86_64";
- sha512 = "272c43aabe7c63b769df2aea4eac5350c9cf90326ece8ac2f096db421f7785e630cbdcfdb84e41c516e36165f1a67d9b22ee0090d84ca9d58fef275d119c2dad";
+ sha512 = "a189db0e527b1a69d1f42b23b5898224313f73b269ece12bcafdaa9204cecc2424660ff3543098cd6036ca17c724436fc6cce9fa7f38376dbd35c943f56cb559";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/gu-IN/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/gu-IN/firefox-57.0b14.tar.bz2";
locale = "gu-IN";
arch = "linux-x86_64";
- sha512 = "415b1ff89552f6bb83458a96905c2c6b7b6b25a974b72ab4a4d4a0a1a5b1e431b82e519466393bd6a8e8031954eacbca97529cb0e4513d722563e13eb97a8fbd";
+ sha512 = "59c9e99ce0da07aefa433b76a961cf8b9294b30c4c3198ac7c8cee5d430c89a10058f614f0955ef768d1e0c12e583fb98612caad4cd48389454b9878bbb08667";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/he/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/he/firefox-57.0b14.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha512 = "1110e4c1c6121a00fd76f25bc513f0c877bfdc7751af2b5958f38f2a7892d8a00c9b5eaa6adab34213535480228a4e0b3aef3ec3a3ab4adde74bfa2fc7dbde94";
+ sha512 = "101f7135364f544517674f8c0bae2d16aa600798ec7755f4e02d0827df6920a60c19fb0d2ab3dc20febe1e9dfecd192a64fddfb2697b825ac940de530383ad7c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/hi-IN/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/hi-IN/firefox-57.0b14.tar.bz2";
locale = "hi-IN";
arch = "linux-x86_64";
- sha512 = "b1279b0f0a97413799598fbd3c6efca475b8aef7a0b05c401cddf283722ba423ad2524341962360845951798d9083019a5b8b431e658513001c3046b6a3fedff";
+ sha512 = "dfabec31fc6170e3390a313a6f201ee51930c1e1c884a5e1b0b2107a2a3c1d19753c91404146dbbad9dc572f9828e3196e6fc1002a9b318b3648b1dffe2a9cf8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/hr/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/hr/firefox-57.0b14.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha512 = "77474e40120fd4ad50a109c6b46fa93c070bfaf899e187bd4bac0ad4a53fc12c7f7d9d2a2003a871e8666dcfc60de4f3ea26b79008f4fe7ee1c5a358307b2eb4";
+ sha512 = "2dec6c07adeda8008e3d85b6552f29f882b1bb9b89a5e03422126067ebf9eda03e0272f31464c42f8b9deaea174c26b1571c1c416f1fab63a7e67cc0bfc2c136";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/hsb/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/hsb/firefox-57.0b14.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha512 = "b1e440f25ef20da7fd6e3d6a403b7c448e5493bfa410e09c3b9d59b32450883a938967b167a8e84cbfcaee546d36e28c8152a6c048070b543479072bb8df6189";
+ sha512 = "b5dce6117e1c964a612708263adc5533d8a063ad6586030fda1a214c6df887995f7ae7782039f063786bb332732857781392c16c646c29d9ffc53fc3c8cac8fe";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/hu/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/hu/firefox-57.0b14.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha512 = "7ce8bedd243fb6d8cfe28eea17aafda028d1b85d96dd60c734f239f258dad8e7c132439614d48494e58088f99903f8a2a8824fc4878366400d9affffed203b84";
+ sha512 = "fe5654e089d50c099aa3cc9279c0a4a3e975a3e10d15b9b832249d082f95d461cbaa51f5851c3f4a680419e293fc9137b1ddf275ad376e073090db37ed92d888";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/hy-AM/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/hy-AM/firefox-57.0b14.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha512 = "ab5054bc6cbc515af08763e61351275411edb2507b7013152185c49e3c7bad0263def5ad187cfe5fc4bb0f93e86a1596e131746646b25e452293f24216116543";
+ sha512 = "9678679c8bdd32131fb7397a88098028a955624a68d59746d073671298a3ecbd8d2933675ba564fed0650f44add7fc1135f441a3edf2ea932cfe6fe5b2ef5d13";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/id/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/id/firefox-57.0b14.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha512 = "122b20868a4ee4d1bd42efb3bd281f137bda130d4328e830b3b21176777c6b993f562948671fd8e020d039b5e5798b150f1fbcf734f245615a2a3beda8d44e85";
+ sha512 = "c863c503ecbd71f17c311f99d94a86af12a57bc1ce0beed6fd0d0ccc5c814c25e5636de9127610b768fb947a0ee48ea585e1a205e1646ab20d2f6c2044b67618";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/is/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/is/firefox-57.0b14.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha512 = "033451b816392acf472f6f62f3367f929e4d4c2b749629138120580b7bb854c5409251c49650d3359e6f48929eeb62bb9a475ff46a8b57cf11c34d6035c67f70";
+ sha512 = "7fe2398dfc0da2bd215867414d765729e2b30620930ee1f50b98a348f6e6fc098c952d0c5ee200dbb51a84ec82f4ee2fe8b01c4a6fc879d2ebebd95f39f825ba";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/it/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/it/firefox-57.0b14.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha512 = "99bccadd7b8994c20ade9907301ac695ef01542407032588bb17cd3353e4941ed70944c8f9a28aa0fee5b49990d2bfbc5ac37d9c3d4fb88d13c473d50ecaf849";
+ sha512 = "043b409173d097ce49eda0e16144b3f50ba7f7a83ed679f8fd09c26d18914681e15b68308ec6c65aa09f26afd195b6f8e5afb4e2276a5717b716280450dc403b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ja/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ja/firefox-57.0b14.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha512 = "ec7193a6eb610bf1ee67791f1f7ed9ab951cc8a53bdcbddffb1078479919d5a70c43235e3b4ec4c20eb89514f283dc8223a4f61835f039f347744d07727058ce";
+ sha512 = "9c4391e27831ae034624f22e8643922324b7940f2b6c739d1c6b5c47449b83f2c8756b11efca47a42820a867248efc023876e1218327f1c8e80cda0c960734a5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ka/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ka/firefox-57.0b14.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha512 = "753c48c6dc9de12787705574fe0319ca9e4d5f9db67166d62fe0391fe5b8867d7f5da9d21f829420bee034444762a6ac3166c109a36e0001e6e7752c93304f77";
+ sha512 = "490c43518d3cf1320d9a3e8f28c70908b31a5f9ed01b211f4e53aef67baa279eaf129f06ec6c21efe2fd4a89364f55ccda95847f058cb2f83fd1f92c466263dd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/kab/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/kab/firefox-57.0b14.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha512 = "a64d1b1f69d18d06810d72ad10aaae40153e696a29efaba4327d44e45d167a4526cc00811cfb764288df8971576c281fee1d8b737597f1de0f0755a4d2e78126";
+ sha512 = "bffa144bd5c6c0d3fcf9c8d44c679f22af1127734ac8934a5cad4d5e6726978133cc99c61dde870143fcfa0b07c146c4d7a84117178e01083a0c37d9b4810184";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/kk/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/kk/firefox-57.0b14.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha512 = "e95905b00476f33a8e5c39b427e592f844f04d267263dec65f9edee3e2a91790382cfde6731e2eec0193d535267d041d2254c4645a7f8cb6b1e3ecbaa40f37aa";
+ sha512 = "5b49760338013954ffcc3ae2c9c79b0d9ebd92f1a148188249559723bf23338a7b606b26f5326b48e2acb15e7ce023f4dd2a536c0cbf5b7af8eacfc33f3be670";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/km/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/km/firefox-57.0b14.tar.bz2";
locale = "km";
arch = "linux-x86_64";
- sha512 = "3dd5c83d82e6a47aebecee97c49e94018169a06a9f81ac61bcfa7d6ff337b5c4ca66d10ae552f5642cda20ce545752ffa0f2589163fd1e01bd7e61c24c88e7fb";
+ sha512 = "7ea92ede74eda15d9a77b6b22a02a634364b60bff135da5356991644f474a47c16283670d24f2cc28d112c97f3b49fcfacb1c618f9caa16fb013c3c650b50feb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/kn/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/kn/firefox-57.0b14.tar.bz2";
locale = "kn";
arch = "linux-x86_64";
- sha512 = "cfcc5d048fbfa18aa0030114c445b40ada42064ac56194add35d51340173b3f6dffa1c9faca87fe4ca2f5aee608d7d05903ac8540095236d19aed3f939f88914";
+ sha512 = "e3d3ad10a374421603068c420e2c5c28ee8a9f9b822df556a1237eccc54a778ca572e09795aa9022cfa373652cf2913c621c2fab82484f7eba77f56305ed6aab";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ko/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ko/firefox-57.0b14.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha512 = "9e7b63568e745d5299fa0315dac87478bef0a30cdad42b05e33acdf188f8346e23ccac0ca3c544f1284e4cd216d8b5c792ef448d6cac31318ad711ec21ec4b05";
+ sha512 = "a681d5e49952f1e671e0c86854102979e052b84140002b968f791f4a325858985751a3872446ae2495802ea0c1df884291c8559a573cdb236cadb7cd706ce718";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/lij/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/lij/firefox-57.0b14.tar.bz2";
locale = "lij";
arch = "linux-x86_64";
- sha512 = "1c8ffd773a5c259d32a6bb6ed6472c041f5337f01f21f6e5e18f774ddb04480cf0772ccc6bac7710e9c22f760d7bd2b234d6d21e1281d9ce2a26483ccd6e928b";
+ sha512 = "b33522bc78b07958a3b5b80bc0833673b1516652de2a165f5bc7ef54575a21af20a922e207be02c4531f64503e97279dca4ad4833d2eb86a6c04f3fd1fdae7f7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/lt/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/lt/firefox-57.0b14.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha512 = "2f087692eba683bb0e865b5d4abc712edff5cffae647e8bfe382b2c15acfca481bb56c20f6b14742e7f16dedaf27848e8ae4d5078492762185d36c040c7e33ef";
+ sha512 = "ec27a8aabc0736b410509a9fb9706627e06316b34a241639ae27108ba3c4945b4ae675fd85da390ae053603a0a13a124c0638c11c0750c665c8226446435bfec";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/lv/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/lv/firefox-57.0b14.tar.bz2";
locale = "lv";
arch = "linux-x86_64";
- sha512 = "0f6869d9528ba56a8e03e2dd85d8b76d74a359a17eb84c575a94580f965fa8c3d253933b798e2c426f742fe5d8d0d7709a7280e21e7eb41ce3799ee98cdd3af1";
+ sha512 = "bc4b125320ba7033946a290e0d974cd4a4f517ae9c9e2a24d86d28307476fbcb4372ec0cfc567d984e90d105cf692a08100bcec81e4ab615fff19ec0ced0096f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/mai/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/mai/firefox-57.0b14.tar.bz2";
locale = "mai";
arch = "linux-x86_64";
- sha512 = "31c2449b7127b4b537d407330cb618e1ffc24259f9bb455f95e2b535a4ca17aff8249c77e98e8f36375671390d4225552b18ba21346e3f1062482e8b8d3cc288";
+ sha512 = "2aca4d6ce673fcb71a8c6228e243157e597573d152d05bebdf8b9df3bdb479dcce1708cdaf2462902c5ed0b7eac83a9dca523bc55a6bf6b2a9fd1d4582a3d68b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/mk/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/mk/firefox-57.0b14.tar.bz2";
locale = "mk";
arch = "linux-x86_64";
- sha512 = "0722b24e72fb8d0423e37d47035be6c2e90db45d99590961dea6cd5be6dbc7f1851234f20e4d8d741c4a36b82c31675b2e39884d2949f5134954b53ae6db6ac5";
+ sha512 = "22fd8e59aad75508702ea3fd37af4261f864a76e943cf6d07789d4f1d094d7e0d5e76e5d4c92b6dc642e0f30047d4515d8520bab667c05c16aa4ffb60f0fa168";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ml/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ml/firefox-57.0b14.tar.bz2";
locale = "ml";
arch = "linux-x86_64";
- sha512 = "4944473b377fabc233f30a6269ebf02aff87ecdd02a75e528b8f0c737dba37ad9eb322f99b1ffae1392a67144b737307bfedf0c6d45e65562f964bcb9dd3fdc0";
+ sha512 = "f96568186cf49bde7ceaf36805277c0cf4d75da2d5930227e625e2abddd5b740df4207ce53abac24c77dc755f52132204b945fcd7706de4e3075505635eae9fe";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/mr/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/mr/firefox-57.0b14.tar.bz2";
locale = "mr";
arch = "linux-x86_64";
- sha512 = "5b2bf5731f4a988d1bdcdac74abf00b0633b4f9b63c1b999309d5c4eb5390d0e823d170b7cedc278b49d018d74e6eaa83373ad5c2a26151b78e9e831bf38f14c";
+ sha512 = "82fbe7593e52299dbebe38fb97126b91f57e48968c7235d8adba93776ea6c6883dd8eb5df3345cae55d156a7bde2004f1f446339e46de90c85f1525eb1334147";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ms/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ms/firefox-57.0b14.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha512 = "e96483b5e5800a6a33a9e9d065a90476ad76c94b6e75fe006881c209469e2f37173ef6d67b4f2b2cb216c46ad44bd0db9dcfb9d2e5afe864297e26eee93898d8";
+ sha512 = "3ece240f01f8322a86d1b8861be25e895fdbfc9a024406727400e0d6cee8efe88a11cbd6799e4b7d0d8396cad80a6a7438d4f0e3b641f94396a7d2e80be06e02";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/my/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/my/firefox-57.0b14.tar.bz2";
locale = "my";
arch = "linux-x86_64";
- sha512 = "4d145815f5cdd37666a60b0db476925b89495b1add8bfba42cd15580a294610f20fa340c449c04fa9cd2714a62e09c61e742037cbe26b5f11671eb72dc8a5008";
+ sha512 = "9e670ecd9628c8822f634031dc7b6ea2610687df8967591ff44a3fc2922fc11bf84575811e9e0f51997764d67c357de5020619e3f637e31c3421e64b533930dc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/nb-NO/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/nb-NO/firefox-57.0b14.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha512 = "3763bbc87d2ff21b6db0d45b684b91f1080e3dd9fa1b2240edd56c2db1100b66ae04748c67df410cc9c0802e83fcb2a6661fa35fce6e8615a787c280ded8ebd6";
+ sha512 = "298d7d24c92a5f56f00d7d615ffcaa1b483882f5845f3de4bc8be2811ec6b5808a2bb813ee9d9b8aaac84a6c6f7bc600b45b7c22480e6c4c111fbe815d46e70f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/nl/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/nl/firefox-57.0b14.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha512 = "eaaccd4746477ff10af5ee15b6e18020e8e1bf36bea7176cd3ca92903d983b97cea4d73a516a976827ad46dc4a03b000935f1d1d353af90ae205df435cdc3004";
+ sha512 = "c59787d50bb14ecee498e9c454e3ab79571656160761e95a53b41ae8196093f6dec3f435d9a69f064b9c4aff0bef332e2d5334153d98c8984041e26c82ef04a6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/nn-NO/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/nn-NO/firefox-57.0b14.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha512 = "7df043f3e917978b9d2c3ec6128275daed830d1402a4bcb98160b2bbdb98012e5db116b7ae6537206de95f65b3c7472326b7739979a12e452bc045e738071ffa";
+ sha512 = "c7c9965a5810bcaac0f1b0d08ab6a9d660a00e40368369998101c2cf043837459e6e65078906c0278564412655a76987f30b671bd90edb25820362c3a846b1eb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/or/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/or/firefox-57.0b14.tar.bz2";
locale = "or";
arch = "linux-x86_64";
- sha512 = "04e46a2cc75b662404fd5c107a7df37761c6cde2bbe93f040d2b1b745ca6e3fad978ae868536aeb526e26b4af1f7b961e9327a3a9660e1ae9823c9688a8ab3fc";
+ sha512 = "bbdad4aa7743a1af3c31eb81003612d0729ceeea5a0303f129f24e352219007b55f40a931a0140fe1b1b4cff694572d1141779238881376e77f30a3f3675512f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/pa-IN/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/pa-IN/firefox-57.0b14.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha512 = "a5a7a0ce8df208b595f895428030fab8e19eca9b88ae2484e915766376d249e0455986b3a79fb4314889b35f52abb6aeca7e7b979ee86672b85ec777f8ad9a5e";
+ sha512 = "99f5ba6937e08c2cb0f05be9b8f2e87e1f27d5ad610540b3011cc2fcd11c2a7a84a1cdaea9b6133d1c9a38311eaa13221ba57bdb444c9aa343c446abc41c986b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/pl/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/pl/firefox-57.0b14.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha512 = "427a76174ed62b38ab83fdca0c64eab60c8d8626bf350d15c269056d126a3eb2263ce75f6cdd476ffed3c59b27a77119bc28317640d3407e54a2d17497207a5e";
+ sha512 = "956648b1f331356f8ee31158758fa0ca7cc7685aa7b20c1833d87828f5f4d695fb3fdbebc55f4862c0f76afe72ea6035261c9ebaaec2561d728d61a4bf53ca9c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/pt-BR/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/pt-BR/firefox-57.0b14.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha512 = "6f93c44b4e3990680eb37af208a1040de5a77008485e7163db861443334cd8fbc86ce387341737699dd0f9197df4ec9aa7668a2b3862c133f0df983d1abab0c7";
+ sha512 = "528a30c7ec5c7485d0a64b6787e0c14c66f832b2289884ff234799631f4e9c6d620c3312ca3d1872e28c80c7a192b8e0e4d0b9d88dbad610268e9d3fb37b3a05";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/pt-PT/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/pt-PT/firefox-57.0b14.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha512 = "255a1297cd0c2c8c3f872173276a81a0847f9991d1dd4180555e3299379740a1a65318596c66c8d464dd74bb2b4c6a395fba3f905c98eac3a97a0b0cb4ebf45d";
+ sha512 = "c70eb4dd653d035fbcb7de8bcc78cc1855f7d6dde8296a825d733a26e9c44e38c8e77ad54c63f806f12b90c601508bd6376aa620a1e0948c0b265dde3c2443ce";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/rm/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/rm/firefox-57.0b14.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha512 = "69c0e8248a17c54879e3e50b6bbf2054afa8d2f85a7006e6201d6dadf5112ba558d4f8e2839bf65c622dfc55f537aeaaf6fe267e6861317cda6bcf86eb9a3ddc";
+ sha512 = "c9b9f0e3ea90fe7e2d5c2907d82e7ea5abd5f30212f1fc5e726dfe72adbe3835107cc836e310ee4bcbbcb6ed6a08bc8bea06d3bda08d1fe7a08ae20b6a22bbdf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ro/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ro/firefox-57.0b14.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha512 = "dd696d3f948e3fc5a6330fef299c93d2958daf96eb688826d58f76457931cd69b0a68cd9e1366e52407a2bcc650542c42f592c0b10c682d07faeaae968b0d74c";
+ sha512 = "6246be75562143b57f27de69e39f9c82c7aea3e60d515cbab0ed5e32228f5b33abd61cb2fa7f3c4e73c65a6dab5ed446a0eaaa94767e0196d5b337e6b5a410a6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ru/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ru/firefox-57.0b14.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha512 = "5c788e031ab302a82cc4b7d51f7f2c7d1aeb9a32be241f4001fc8bb64c2331db391b5013480b15ae9426d970eb80fb95d72e3e2819c3ede8d54f9e47c6bfc76b";
+ sha512 = "467a4adb72e27ea95d324f52007e18c3ea307b7ff158a4e58bba69859f5369fca8e7243329e2bacf590f35315402af10d8071c34886a7fdc3cfd6e0548653aba";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/si/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/si/firefox-57.0b14.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha512 = "2a87bd1040627364b6830604b9148df4b9c826ff9c8d6a9b8709ffa491503ea25ba32f8e186946021358d66129f0b84be98561be9682369a701bd56ca13d990a";
+ sha512 = "47b11ccc3bdc373f3591ee73b84edcb9afe915f1bdf5b7abe65eb2ea675da44316a4ee5087c0c4e69a90dc337d43e201ac15b98d04a0ad970f8017d737e4f738";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/sk/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/sk/firefox-57.0b14.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha512 = "defa6ba4b5f00922a45d173fd85982e13a099760ef025c202cd3096366e6fa236ecda704ab97fdc3460f1c66c83e3e8cccfaa313a752f6a038118e2420626039";
+ sha512 = "c7696394b76668733814f1b2cc1c41cbfd962d4d58e424c041fd419b3da2559b1f4057a8aee328e0698ec8b350e7909ce5da3770f287ba485dfbcbeb3d1de9ea";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/sl/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/sl/firefox-57.0b14.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha512 = "adf3e6886f3e500e62f3706ef79e03924e6e9390775b16fe20799d5f7fd6618e5d0c520a8b409b3ee4eb737d8bd2e0f87e1aa8c2b34ee2e0cae1651913215593";
+ sha512 = "aea6c90fe73f9aa1340de0ba8207089deebdfea21d5fbd5d5c0ada6df26a4acb4349eee4a7ce09f9088439cf059fb7fcd6169cb1c34c83a33c909bdb3ed7af43";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/son/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/son/firefox-57.0b14.tar.bz2";
locale = "son";
arch = "linux-x86_64";
- sha512 = "d6e1e6b2b0fda67a38eb9f7eb8c3bc50f1274fe81118491974372b46fe323419ddb990549c74be040900b372fd52c2cfc193e417714215f8a1b3b07259f2dd79";
+ sha512 = "6d3a9b05ea14ad1281c51d99757475b6642a5411b7b409f2acba695c3c0a5719f4feaecd0c56713899475501fad3413fe46f4a3efd482111aae2395df22b1e25";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/sq/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/sq/firefox-57.0b14.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha512 = "a787b2df5b1fd9ba57bfe5cc66bc4b774dd4a4b81d11c0d5f0b9c54e1c72590e58d11688ca0ea64d9775a3e4f65524cbfa9740d990197a0b6972034bd4bac9b2";
+ sha512 = "9e7639f9fce27b4c3b3fa265e0662b31360313569f1fad798c89ad1eca1944827c3aae23c283f4e153d3f81a73d235b5fac56598cc02dfe2dcb38aca806203a7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/sr/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/sr/firefox-57.0b14.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha512 = "3127231295510a1681808d4c65735f2581991ef04fc7af8ee705ccf57b556f3e085a3abf0fe105533c608a27273bc659b8ac8941f2b044a1ec8a9b085b0a2124";
+ sha512 = "d84980d2b454f33a33fdd9b44ea7e2c41a73a351492fa7bd951a8e4ec288a7aa4d12ae362443a664abfb554693e8a8f5428843b28ed48429de3d32575f94ea74";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/sv-SE/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/sv-SE/firefox-57.0b14.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha512 = "a1bcf79292ddd3efa08d2382a35ca00022e7be2930d832523a4f94db9f25b7ca45054d6d6b6c456f3793038fe4167d8659496f4b0bc812ddc8c58a1e83e279c4";
+ sha512 = "b26deb242735a3fa662687efbb8a293e76561821540ad701091a8b7033c9c1047459fac955815790ed026e4f69a51d2b0396a21102a79623b72f5ef8cbbd06e4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ta/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ta/firefox-57.0b14.tar.bz2";
locale = "ta";
arch = "linux-x86_64";
- sha512 = "c3ce64381471908f7aa7d4004c8c00d1b05d852c200343ce48cf7d428558d0182c4b13b23190e266269c556165c6f51ed55baa1bad9f55f3c355935c09bc9f3d";
+ sha512 = "1e98d86b9df418542dd15a204ed70732dc8111d8fdf34edbfee8217460e04467a822b66804e9876e28f15e9167ec5a6dc1551c4159c136006392feb7ca218009";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/te/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/te/firefox-57.0b14.tar.bz2";
locale = "te";
arch = "linux-x86_64";
- sha512 = "9427ada27b5ad79a556f4e0f7d1fccecec7bafcb44ee19af9257c16e4235bc2078af94acf9e0c0240d11a32a59176040ac54721fa7b934ba12320a67c3207183";
+ sha512 = "d22b7c8b45d37631434007b196c63044a860912826cb301a218b0aebab5ae8283370924a703cebb16a98a589336e024b31ad580b6fb57ccf3ed53f238e361704";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/th/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/th/firefox-57.0b14.tar.bz2";
locale = "th";
arch = "linux-x86_64";
- sha512 = "83276f41443e931b7e55914fbf32547ab01d58f9d5bce5335cb931b783fd9845f20514b76889f82e357e489b65afa3dd0894544d4004625df08bd2021aeba8e0";
+ sha512 = "8a806b68e3e5d4ba884bb9f72bf07c2bcdcf33a8111236fe837a41738e997116d092ffe73e4028dd7429c4bb0f097270fec7a20ff3b5bb316fde0a90af92d22e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/tr/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/tr/firefox-57.0b14.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha512 = "c93877ccb3a0d4ba9164363b869577a5cd36d85cb05a8d1ff882fac21e333b7ff8c4597647243de753c037525f1ad7fba21dc1acb2ad212802b514af9402896d";
+ sha512 = "9b1e73d28f5f1fc352f830aa59612170b72dffd7ae060a8f2422ce14ec46f9e646fe625ce36dc4d380fb58ba0300c68a83f2d8aa8282100f6ff33a43ca79d807";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/uk/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/uk/firefox-57.0b14.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha512 = "1512592dc0ec9a19e2e92fd39db30b50fb5b26886c1683038885c9d7b18a863182dbe1cef7b8265aaa82e60dcf94c45b84892ae19a25a8a9339382ddab13e327";
+ sha512 = "96d471b413e980ced87be210faccd8cb6b796c17b871cf785c34f10ebc04c4c76ce4756bec0dbe121b689bab2f777e54eef6ea43750e31c1c83524d0825d0fc7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ur/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/ur/firefox-57.0b14.tar.bz2";
locale = "ur";
arch = "linux-x86_64";
- sha512 = "3a90c751054ce848aae996641133e2aa573c4d6329d3dc58465562e45ff450bdbe820828c551de71f0719210458cc71aaa4d0d3745a7feb27731f91befcff3d3";
+ sha512 = "0724b881cd4aa040b249882d41cf55260d6aca1f4876c89a42f717f00cecf40b32fa60451685b7a182d2ebb11dd08af7e0327bb5c9fe94b2a6f03ba8c9b4d02c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/uz/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/uz/firefox-57.0b14.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha512 = "33d3c67687b235c231e09b6564fa525049e1d99c37c3a5fd6905feee5674c305af313d381eef5af990e878fca36f6af0cddbb399a5a297affa4e3aab5f3c103d";
+ sha512 = "bedf1751786c828779fb719edfaec466a299ec706e40dda5f886bffe911d425b82e9f9a3cbf5a0deadff7ee77fd63c73f38ce3462aa7203316fc0569a4423927";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/vi/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/vi/firefox-57.0b14.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha512 = "8dc83c33bf9e27dd0605c945a746035bf16a189b6d5f0e52a9d65e4f45964d8fadead1b539d9b906ab13cd43a7b2157b4c7040c1d155f4eb7aa67dc987819a3a";
+ sha512 = "3ed1b4f71d75d0e863da048edf60ee3cbcc5239d4a8ebaf69fa6d3a8e8be20e556dc838155d7b99ab2776ffed60e578ce253c8e6f57491dc84ef3b68049cf929";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/xh/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/xh/firefox-57.0b14.tar.bz2";
locale = "xh";
arch = "linux-x86_64";
- sha512 = "b0535a8704b8879b86d27cb4867f13269395ffafd54a5acdf49124808f9c606f52cdf9e64a6378fc0cc37a6eb4f955b3613af07076567a6bde71a5e61a521c9a";
+ sha512 = "23db4e5df5432094b7f31a688b84d23304c7890d0ef99cd9c992d7a108a08199b6f6f94bf3574668b9b0a915ac49d2c0e8c6b0c37ecb145da3f5e2a5660d6d9f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/zh-CN/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/zh-CN/firefox-57.0b14.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha512 = "17c5996c8002cdfd0b07ac796be9b437582cb0c5401fbe0f405dd0f8b4aa3f45aab24bb5a8f364320d62550eba7d228e1c20bc7805e741a86666c225db3046cd";
+ sha512 = "bf08e65cf257f789dee34891818f94368fe89bb500138ffc72855da7acc62cc08a4eec3f4d32a637f59fd0eaf072994ba4d5691da300d75738e3274e4db3ff45";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/zh-TW/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-x86_64/zh-TW/firefox-57.0b14.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha512 = "68d9b507ac39d9e175285e5bb4f4f24396687e57622ff31448cf77d73ea8e8817230b65e70c493121b40f4ae91b145be59eda2ab9d572be3d48c14ddacfb28d8";
+ sha512 = "6b924c8ad6b86cf07b6b2f01a6138636391acc519c469b7c1dd96ee5c707e1b81c656fe87df31519413ad60e56e06da46c0f762b26249426428dafa0420a5b97";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ach/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ach/firefox-57.0b14.tar.bz2";
locale = "ach";
arch = "linux-i686";
- sha512 = "e6b59ce7c5c6289d57edbf019e74d2529b2d38f09552110a50d94eb82e7470103791c69c59066405b8e5d1cbf5058730c3bef780cab7b95444eee756b593eabc";
+ sha512 = "56d847a9417a134af10f53ac5630f7b4a7108b177444327df97511494e2a28a279990ad37d48fe1fc482f34b45db66f1c8d458162f253faef3ea2e66e42e7166";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/af/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/af/firefox-57.0b14.tar.bz2";
locale = "af";
arch = "linux-i686";
- sha512 = "38393317412a3310ce7984e77a5dd12a70edc3da8691ca38b5133355c1c60e2ee61a12ecd5af7ea7b47d20f2718da2bce56c9b6b8b056fd75f9b93d1e196f52f";
+ sha512 = "98d55bc29423eaa62b1c5f179887ac95e8aa228ded6e077cc645660a048ee3e42da7966adb9dad5f168477262638456bd9509aeaabfb2a754f0435b60e9b3a46";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/an/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/an/firefox-57.0b14.tar.bz2";
locale = "an";
arch = "linux-i686";
- sha512 = "584ffa243d0d070aa642d3b0e5fa4b7db553f68032d1f0f251034f4c636529f382451930217da9a3fcfa62e7912108f41e280a2f277b5ca9faa2b05ee0a86487";
+ sha512 = "0478d738826d3d9b0898ab93e25527b4dae789652a65a7b16ec5796b8e48e575387fa3b7474d7092ad851e107c03f9c58d8dbe738277371f2e881c56c9f727f3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ar/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ar/firefox-57.0b14.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha512 = "b04ec9e9698e2c70149c772818a8c4ba2e0516e3049b31ea8fe9db3b1f69724094bd2c05685a864f3364978362eb89a51b0e15e7931c61ab3cd4693dfa8d7517";
+ sha512 = "4c884b86e8ef6b554d85151f1eb780edbee0bee6b60f2ae3b30ff9be74591c4f4df07e5834d0ca5cad456c574abac712a8e856e07892df652f7db510618d231a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/as/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/as/firefox-57.0b14.tar.bz2";
locale = "as";
arch = "linux-i686";
- sha512 = "2f76402d2333572483ac9441faf070bf55f39bc22a7d995c6e6f06e7f478e54209b1b61fdea9a350f1466b508c35a5640a3db0c4f5f0451de14e535dbc4760e5";
+ sha512 = "a58c8f47fea197a5b9a397f8e58f73e381ffae3426c83872407481f079b62a585230d2f389245d5eca6308e8832fc95d8dbb7da97d25551faa44c20f6e032bfc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ast/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ast/firefox-57.0b14.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha512 = "1b5c6de905494d0773a7089df87987435b70b5c734de77a6ec44ffb941709d0e8713c54de8293c0f84a77a96fc3b7ca11e9ad892c870236c24a86031e62e35e2";
+ sha512 = "fa4f10093602f03b759502d76ed1d7636ca2fb0f83174869e3cdaec3503fae625e6d49a07c011dfdf6964aca7e8ba81861677cb387ab8c638a5a671864451dd9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/az/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/az/firefox-57.0b14.tar.bz2";
locale = "az";
arch = "linux-i686";
- sha512 = "d1ed01e6854e3ab1f8e8f339e7d4c3bbe4941ccda88090e09a44eb8828a62e59749218072fa248358c073ab76e84b18d59cbb3cd39550834de9e8c91b81a8477";
+ sha512 = "8560bb32c0c3aec695d86d1c0ab6491ba0c2dfd0a936e7cddfb8d3cd35890db31ea233afc74d19974fa693614bfe7728e69b8d1ee47a34331b07674b0b57f118";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/be/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/be/firefox-57.0b14.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha512 = "807a7bbdfe7e556c4f8071ea8e148cd3cdf2cc32c6c00d91a0563ebbb378599debd0d3e0a5f96f75f4ef0bde552c5050c8e798f6d1bb65a37019aa0b1b61b55b";
+ sha512 = "026e1ecbddc4972cbf1a2a930fa1488b4e649ca7c811ad243a3c068f8cd6b57e5a73d193a3feb4cb49f012dfe3b5af9002f30609cd1551abc1ccc5e89476440f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/bg/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/bg/firefox-57.0b14.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha512 = "fe499058210285f65d81397d182b7e37ede56e60ee21cc7e0680fba8c9dff58a0e8747d6c99e789cc2b7578bba62b5a04b83d1cd1f8e533213ee3ece4957acba";
+ sha512 = "9d145f71f46e12f071e8e181f6511d20a6ca5f1f1950cb076ca25b929893da7546b950450f7fcb41021c4591238738f9b8797395a86c599a907f0df687cf0282";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/bn-BD/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/bn-BD/firefox-57.0b14.tar.bz2";
locale = "bn-BD";
arch = "linux-i686";
- sha512 = "df14ba0acae51673edcee4e2da4ebcbde1f44e615a56777712b4bf1261c49a1007249b4b547d378906b64e4b97959b53285bd5d0c074fd3e0080537a5ef24c1c";
+ sha512 = "846001c844e9ee3d9305eb5be18438af65d5920363f19935a60b503d4a31c0fecf1d7e6fd286cb7ee4b7e26455496b1d27fbf6ccdf2d2a432ec2e2472ebc9c75";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/bn-IN/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/bn-IN/firefox-57.0b14.tar.bz2";
locale = "bn-IN";
arch = "linux-i686";
- sha512 = "5db62ceaf945411c01066e244fd08a95ac72134867619c488f54df05659e6e335af77c6a5341370cbcdfc7c9142a5654aa843b1a392a1531c10062052cf97c5a";
+ sha512 = "712ae023c09681b1ee9f41240d12a1641df5c4fd7eeff15d157c379e5b5779c65b93719b238fb121fdb9e5ce10809b21125a6eae23a77e1806daa0b2b13e4372";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/br/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/br/firefox-57.0b14.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha512 = "02d4f4a010cc1ec71d93c1b6236bf891b290bddfca87ce9502f12f530033b26b94a1ea993f591911cb48d52145f2351a34be8b63b67a74498f6a10ee7744cc75";
+ sha512 = "b99c48b8971dfdd0e642cf76cf890706402079122311b1b6af77d658b03acf87feb67918cb83e5435cbf0746e2c2a7c49bf7283969685d0b4bd616d4ec3066b4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/bs/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/bs/firefox-57.0b14.tar.bz2";
locale = "bs";
arch = "linux-i686";
- sha512 = "458d234394e79ffb87fa3181c6722c63eecf19af4e6c10eaba372f01f4209db60ee01d932fddb335f0f1dfd2781cb3e651e98ab4e69b71974316be78693d05e2";
+ sha512 = "2203e66bcf453f22848df010cade83d6982178c8ccc023e05ff8fa60aa3f7e583f9d8e33a313fb70a696e149773d567be8228084708ca8d01b3cabc431a7576d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ca/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ca/firefox-57.0b14.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha512 = "cb0e2dce6a8dc0c211a72bb4e868bc3d04c2baf19478ddb4af6f6adf6c97b7a0ac334017d7faca08d51185e3352140b13c818b2a64f1c74956dca8aaba1edda4";
+ sha512 = "75ce6cb2bd7c1d79b4260dfc19237a1344fbefdff9775a7e557f9a31dd9fc6235f58ca8bb8430b80bf0f25c14be5dc2509e86b41b7ff7814e2fc1baa63f187a9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/cak/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/cak/firefox-57.0b14.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha512 = "984b28925fdf204b1d0dfb4080f503a520ae38288370ab2e36ac1f32e579b5fcfbce3106896a351472dad078de42656c566bdd56b32088b52fe4bc6ffbada247";
+ sha512 = "b4f0a11030bad0cd177db357bc49b6f745cd429d3a8dd9bb09e99db1dffd32ce8c21a94c0b98b6db703fdbe16750b4574b3378dfd40a358bc0c7957fd2cbbe2a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/cs/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/cs/firefox-57.0b14.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha512 = "18bfdd25f92324a7ca00183f47ec0c43eebf582ba4493a36b6b39b7f178974333df29a2238fec5974baeba271a3f83ff3f274ffc15488c24e89cc2d17766ef64";
+ sha512 = "5ee1dbd826801dc5b029c8eadcfe8d040f000527a6ff7f2a40713a137c59a144456adbb35cb202d7883d831486a0ad56079d07f681ce294a5e97825b7effd69c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/cy/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/cy/firefox-57.0b14.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha512 = "1aad954d11eb33704782e1ae502d86fe9c428c9cd0d7dfad020e7510348443adcdc7db789fbcffe96691e68880da2dde1ee331d5f51503dc90b839f14aa44ebe";
+ sha512 = "7116bf1dbec5603d22546b1927a6038812c2abe1e9e7e1ae556919e62f04af422950efd808e28eb7f8b349a9d79bf01b9280d6a6aab94bda8c0f6e2a8968b841";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/da/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/da/firefox-57.0b14.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha512 = "0dd9a02adc2aa39fe5ec4ebbd0b6cfa0968b0daf50b558d088f1f0680cb06a8baa526ebf96fe63babdd8dc85561910a5a6645ac11e02e641361491a2c9185738";
+ sha512 = "538ddf539a6d9dd22bc2dbf9f712773c1d7896ce2a49632d4acc2e5716dda95dc9d10393bacdf2fb7d24342c8a93c39eee139f32edfb429b0bbf7053b7bb3240";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/de/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/de/firefox-57.0b14.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha512 = "a3f13abc0d8ccc445a495cd87cc690e5875c9c79aebdf6adb04f469483a5870d45fe7a61231bcb3ce07eb64c38ef04ff6e16e75c4852864a3ed1f385d3dfb79d";
+ sha512 = "ff33af1ffb0549951baa32e423eac3828b15bbce18ee03cfcdffb57504fb0e592db2721f7008e84562e5c1ad297311a1b3d4fd5ab41e3d8346a2d1ca50e54c35";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/dsb/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/dsb/firefox-57.0b14.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha512 = "e5bcf46a200adfa34191063503dc5875bcad0cc298f9ccecee7a1346c15b22dad5aeffee2ab7d17b98bd3cd659544422c05ee9f79ff8a0702e592b7d1b8e5b32";
+ sha512 = "6dce022b035bf9c5d76c45492e29617668e0000f5f3981e3f132ca1595bb54b504cffa92d220e118fbefe8088f3749f4d077c591a12657ce9266b88aab8019c1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/el/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/el/firefox-57.0b14.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha512 = "eefcc3ebb84bd75472ee0614d386a5bfe718a77b2fcb7e4296dae1131415e6541f3158b072314e8aaf46851ab718d0bef12339cdfcbf1ce4d1ae19004fc82153";
+ sha512 = "b917927c48189bd26289fabe3a51f59965c8a421aa941732a50aa9aa3769ce085ee69bb04202c21699f5ebd6ec2cff75ea2446246d89916127be9418bb00f47b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/en-GB/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/en-GB/firefox-57.0b14.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha512 = "c03a785ece38365eb69893ff4346f468199ce8753329c781241bf6ed96f595696c0927285db41fb00a15cb548eb74c66696e3962560c5add5b0be7a29936c8a5";
+ sha512 = "17257657f8366c5efab1a0c47aeb6129e624c883222a6bc3bbb097bb49b531894cdbfd39898d0d83981a1609fd3ea5dd101419819a1f156668fd3cdb3758b8d9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/en-US/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/en-US/firefox-57.0b14.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha512 = "26d4b175dd8ce02cee25c2f8d6eea4e60ec3ebbf4858a185d38d3593f4397131fbb60208043f4c53affbd075299c69d5916b4ad55b910cbc8cc15952c78d9b2e";
+ sha512 = "c86cce7893fbaaf4d3b00b961b07a2f2d680ec07451b735449a501b2d9fcfb2fcbc0cb29150866805ad38f6a4aa1b6c4cd87f5872b8c735791953f3646600703";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/en-ZA/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/en-ZA/firefox-57.0b14.tar.bz2";
locale = "en-ZA";
arch = "linux-i686";
- sha512 = "f99136eb3831a304ec84044cda5d5fdcdefd1a4814f6372c9edfbffb98d93b551d0cbc8fb45e8386f251eeb0f0a4aebcc12013267a901c2533bcca197ca6b5d7";
+ sha512 = "0b278c62b2185a4a6cafb7015062693a0dad610ada1123d07e162456e4d942f02a0566ce525e68b639fd152c420b925ee3e934fd3c42ba25524b18cdeeb9af5b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/eo/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/eo/firefox-57.0b14.tar.bz2";
locale = "eo";
arch = "linux-i686";
- sha512 = "3ede053c3018b41f113d64f5d5dc14ee1d2bf219e1d7b37ae7ae8b36aab349b1364331d7364850cf40f7913294119c85468a8441f524cfa6f18fbb55c4bb2644";
+ sha512 = "a681db144a631e6584340febc3de05803921b757f7c1d39ad5b8ff3d119ed8b71a4d70a43ac1e3a121e04102770d2796103aa127886753b2bbea723e22df7000";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/es-AR/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/es-AR/firefox-57.0b14.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha512 = "51736e77004f5c9cbe4f303f00ac6c32c9459e55a1cdcab958ece590ae8d575f119ded5bb013600f077fe388e3572d01f31a41f462defc5407d9bcb6da743fde";
+ sha512 = "40f5a7d9ba055f7eef155601f8a57e566c0829f32c92df48ea2ecebf6e10dd80885881a98d18a693643e2c00f8734218a7ef8908652eba1c4d4288f95a34cde3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/es-CL/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/es-CL/firefox-57.0b14.tar.bz2";
locale = "es-CL";
arch = "linux-i686";
- sha512 = "9ea21d6a5b9d0eab81eafa1a5757aa566b806fd16a925609e46002ad126a633d2373fa8ef27db9388c3f6f4680dc76b946b5ad9f71afa8dc69382323cf1dae22";
+ sha512 = "be1e5b8c6e184519d0b10fe67736d7635b6fe8ad71ab78014e53ce9a1f1342a83aa1b18f535ecde2406e8be7a8633ea58af9adb355ad2b19ce0879c62f70bd40";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/es-ES/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/es-ES/firefox-57.0b14.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha512 = "3d77e61ddb1738c24af8edfd8a2b9905732626ffb51d1c64b2a27c229121ec8df0e7ad61389ffc0c78ed545a6ce8ad9deb424f65c6d6fcad427753f9cee6f1fd";
+ sha512 = "be0d2b2cb5f82fbaf10be63aa76a5ff9b9111b4caf0ef5222b3ad7d67d39f25dafc125352c00bd91bb1eef50a6f57e996f6a10618d50c5d1340604883bffecd0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/es-MX/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/es-MX/firefox-57.0b14.tar.bz2";
locale = "es-MX";
arch = "linux-i686";
- sha512 = "155eae1468c3f4ad4a38e3ab135f79e352da4e96b1f1bd2a20771d9eca6e4ee89a0bf6db92c2a3aa4ea92df8fa41cc63f35d3b78c3f14fa4ccb4521d7fddf102";
+ sha512 = "439f679ddd8169d51e1c1f9ad32185fc9b33df0a1301af7bdf8982dbfc5410cf82edb4dfce3dedc214ab258d714da91661882e45b8220895aafcca171fa9bb02";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/et/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/et/firefox-57.0b14.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha512 = "08f8ff1dfc92fbf4d26eef4ed6b05caa6b911fc8a2ef1c655fd6a6216a5469e3086a514deed1b6722e6207a439feac717d3df851caa08f71a9796033b6292a90";
+ sha512 = "2b80629eba503ca034fc4e9d873707aaa7668b2d4563792e3500acf89b35153fbd7f6406d12497b1ff1423e7ddc3bb4e0f3f63cc759758e544145f31aaea5a03";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/eu/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/eu/firefox-57.0b14.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha512 = "407844c56a06d6464446390d35cba2b0ef983084beecd03f4cb9ea93607e0571be882b4ebd35bb25c6f2fc4f65bc64321c1e6f522838c1dd68bab46ea9bee779";
+ sha512 = "03047624365bb4fc5bae68a5bec91a396da7d404731cbe09d89baf3079be0c4a9a2c7ff73d231f39e98689d5c4dc7290d2401fe14cb564ea53d063f79d7c151c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/fa/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/fa/firefox-57.0b14.tar.bz2";
locale = "fa";
arch = "linux-i686";
- sha512 = "f5c27b8987623ce46979083aeb2c7cbe0efb9e92c2df6909fefb54e78a25ac3792d78605fcbd50fcf71dca8d09b60c5e92dc4ffce22f3a24130a0e1e5fc13918";
+ sha512 = "8758735d6bce447b8492f9a395da6f58c63537fcc946b17b8173554b6eaf32a41137011bbd44842b16e8053d55642feb880e9cd52dbe75fbd55dc592724a98a0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ff/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ff/firefox-57.0b14.tar.bz2";
locale = "ff";
arch = "linux-i686";
- sha512 = "12367b1f896f88a06c3eb906a10a5b288fa6b3d689fb1a452ae93677e37ed89957499937025d50f29ed808b93c359bc9cffced49e013e95a588e2828a4bd3d65";
+ sha512 = "5d6a1b45f69135dce282fc411237db713538830b00f6361f86a95da199d56f2bb351de9e59fb1d61a4b617c79e8a80adce3c3e57ba837187d4c368b79e414dad";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/fi/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/fi/firefox-57.0b14.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha512 = "40ccce97079cc5ca9a7db1ab2aba581c4e92d10c83748c654e48d922ca14d28632bec850d138b97c847e9325162bc34a20d4e672aab9b191aed7f5784dbdf814";
+ sha512 = "f35de96ff1b8542206fb8e9942333397050a6e88bd0e6bca3c1e56fc4dc754dfac0b554b74188d316e6c820881ded2812efd9221b2c3d6497826ff29b89382ec";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/fr/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/fr/firefox-57.0b14.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha512 = "5639d6800f4e8265bae4b3b49fac10312fceb04be944a51c11b37c33b49c4f418f0c2a6481ff0860652adfd7a0259612be93d784a802769465fb29cf02780c6b";
+ sha512 = "118d6ae69eb686ed1d791463bb2ba025749068017de94a9d002d22b195ccb9e0cf0d042e613ca88c310e685070612a070308971e12eeb318b26b2335b13a6a33";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/fy-NL/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/fy-NL/firefox-57.0b14.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha512 = "f73acd20403e4cf38d365f9b49de1879a750f73ec2842a3ee91da657c5fdb6eaf0695540efdbf3e67cd72234cb9007c2620b3d146a5bee72e30453c9fc6264b7";
+ sha512 = "79a22424fddf0add63c3a3528a63ea4c0c9d39f3bf9e35e18fc9ad4a57be7e7f675087f1a491698868d5ce57cdd149aabddc224b7b3078ad3a81e6ee6dc35b2b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ga-IE/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ga-IE/firefox-57.0b14.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha512 = "b588a3a9782621b33d9b43e252311e78bee1a49b290bbe055cb01b45eed1ecaa79c8cbe326a4a462a632a4452978a2978d6ac73f7d56d9b4b51aac479bcc5c0c";
+ sha512 = "04b87f564be35d19135973a0e17c2db1670aa804ad8c76b40c8f3ccd670e0c64456d84cfec276dfc55dfa29db5fc0bc70826752bba756cdb597c7fc12da1d30e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/gd/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/gd/firefox-57.0b14.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha512 = "ecc2d97c4713a3646a3c38ea5cc1245ca7a0bc690305bbe0ac3d9b09d903e27265cf87b73f1baf98b50547b321ae4ff984bcb4f9afc788efef9b17962c9ac28b";
+ sha512 = "f2a66ee64ef80dfaf2c16af952be22ba9c11b3a2859b6a861e04ccc2e7863ed5bb1421338c1ce30ad9ca4506d6223190ab5feb194ee445e9fb09a11aa99a465f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/gl/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/gl/firefox-57.0b14.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha512 = "0715dd37ac757f9c70d41bdd0faa26cb6f45745ed17b9e627d51bfc040d9d637f236546cf1eae77c8cabad59f82bf2bf95758e5eb675dd9fb6813eb43214163c";
+ sha512 = "f59b462819ee53e8727863b3e4cc240b83ec5828860e3a0428b012eb4047ac837760157a7db60bd85486cfb9945185a2b8f637581e489d90bf140bef873dd9f4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/gn/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/gn/firefox-57.0b14.tar.bz2";
locale = "gn";
arch = "linux-i686";
- sha512 = "7617f00ec13a6a672b80fda28108e467124d0ee22b5e0dc366e2bc04d5be5eab91c9ec4edc275df7bc7ccf45197629fea909e945c633f58f88c8165ef2628b37";
+ sha512 = "17499a923e6f7d0e63e4ff0ebee17f02c99f614da02d0ff8a737a37ecdcf69ba1798139c1b824d187b67b443e54701b1046b59fc6bac3757f86fd6303a778c57";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/gu-IN/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/gu-IN/firefox-57.0b14.tar.bz2";
locale = "gu-IN";
arch = "linux-i686";
- sha512 = "15e94de3500b185668ee87880667ebebeccb23bf69c324cd64c9a5f94e6ad1844861c773eb0a7b7479c169de63c8612845902c8c468ff670b37684b1d6059d1e";
+ sha512 = "605ef03bab50ab1438be938bd8aadd917c742a5ac0bebd14dc8388a6e5cd844b52e0ef23670537dc50c2f3b4ca20814a9e559e667f3baaf292ce3fa16ded26a4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/he/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/he/firefox-57.0b14.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha512 = "86a94619d93861ad797bd9457a768f62472f980076d0d526a95e1caff52cbb0136abad76825e191003ec55611429f2b35bab9dcf4a1d62aa226db89261e234f2";
+ sha512 = "51bb0b64426ed0d46bb2265b18138dd0d5fdc58c2782d3bff4dd8ae13bbfb354648b346e07bfe2795a4fc31cff2df54d94ceb42ba0342a59218eb5444e9fc12f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/hi-IN/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/hi-IN/firefox-57.0b14.tar.bz2";
locale = "hi-IN";
arch = "linux-i686";
- sha512 = "639469d7c987b366a5be59b45058f8aaa2e5322e0534a4784c19f434d48ba5cc7e6d2da824de48d49e09a56085521e16680e1cc29261c97cf18cd4dcdfc79c27";
+ sha512 = "74c921e0bcefd0c81616b8685ac3a0fc85129a950a917ec37c724fbd92df8099e79726639cf18235379ebd345f78de754e4b4e87d859e696aec6e780c607839d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/hr/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/hr/firefox-57.0b14.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha512 = "8c4021a8591de29704240d152bfe3283901b405e8b4296196eda3f0b9591b33fe8c08871c3248afa82c3967c7d025896d584478d1ec3b761ec5f97cff498e098";
+ sha512 = "8c4b634cbacfe34a2031c1edf196201fbbf13f7bf22be2910f27788e56b0647598d805953b888869644f4ec3547a0813377d517676e732770684b057e5f76028";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/hsb/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/hsb/firefox-57.0b14.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha512 = "7316554b2d0d3b1cd559057374b67e9cf805bc827a40652e70d00bbddbc892f68c7e65fff08af2d4742115df124185c3e3ca862901a85ef56ccd658f799ac757";
+ sha512 = "59ed77d9722413d8d75c8474de28660fe59d8990deb3c1743fca4fb1c18529173e0e7bb171cdd98df961792ca6368b91db26d6ebeb461543473ee5ce8eb7da82";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/hu/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/hu/firefox-57.0b14.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha512 = "1365f7b1e55eed2fb7d579fb2d9a2efb57d93a4e78051d57980e7b1bf3213b2f577eef6c0f1c53dcb47a7af92ea0b0ba9558e25e84c72e0f32e573c393dc8d4e";
+ sha512 = "de8d917b533941220763d011fc9b38f0c0f8f32f09d999fdbe985017a002c3375b592865420e58fdc4a3d56f73206ddbbac568fb506ccd2e3cf4d2507e8ed315";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/hy-AM/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/hy-AM/firefox-57.0b14.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha512 = "14e0a798b4fd9af769a464ff8c2fc87ea69116f7ec66326cb623f4fbdcf4c99f285bb8e65492e9b65cbb86dcf66a52669bd81df37ed00359546072a3709f20f7";
+ sha512 = "ea76bd2eff30277dd06d606b0568dedb0f01c6330118da99fd6952f9bd5c8060a621687c66853b46554560b56f1ad2401e87e66bd44d1a85831805caf7ccebe2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/id/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/id/firefox-57.0b14.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha512 = "dc15d01a33d3fbd10f26bb9a1758df13f53aeb9f6b0a62abfe8bca1e7a3e233aa0a06981d04085e79e91c629a1cb51510bdb744ff34a6522f374444c9bbb84ca";
+ sha512 = "024ba211754ca36470ff316d626f46cfc2763b94dbfe027fec9dd628a0c617fbc9050ce7af336d22c962bcbb9190f1980b1381c5d3509485b4f7bb5780c6d15b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/is/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/is/firefox-57.0b14.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha512 = "13761e766b5fede7eb123f304bca45bc3a7cf5ffa4661e2a961ece5653c2986a61aee742cca3dc0cdc8bef54b38a66b08e9a45223e42cce9c0a99a857d6bf45b";
+ sha512 = "d53d4d7545bca63ce99dc691481b890846c33f5efb802734514ba493e1b31e3b4ee9632a4389dc388c77692ceefa9eab4e9f85de1298d0337a6756ceb27d55a7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/it/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/it/firefox-57.0b14.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha512 = "23dc06fc36ef32c148990692ea5bc5266f1ae61aab4a3853034f85f3debee5ea5a5a71d741ffa29136db54d63857edeeca75805f9c7f75c278f06a6c930ac248";
+ sha512 = "960bdeabd29fd9bfe72f9e2b5dcefc1c9577490636e9cacee964b8646ee29ce2cc4c9cb87a93f057e2a6371cb734920928bbab90e6c6738a19098e9e5a4dab75";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ja/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ja/firefox-57.0b14.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha512 = "f33b38709a7c4701debf19a901e36302b364c911405d96f952c0510fbf95fc4e24869a34e3a336718a0e0f26b5c7fc88fd1a3955c329a352bc1077b73cede937";
+ sha512 = "f9d889ff8a25259bcc28b1178ca511ad7cb0ad9d0882c8b3f6a04e98d5f4b63ad9b190cc66c184f93fc96e0f869bdb10cdabaeb7b9807d49c3f72b7c62efe3c0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ka/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ka/firefox-57.0b14.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha512 = "7b684624e52e189ccfd31d6d910b18148f9040eddfe0518710388dbc1160c2ac068f0de39faa42eccfba7823372290f932d3693ad898a0c7ce20f6368e696f1c";
+ sha512 = "1ece76f8237065e712b9835d0ea15f2b7318f420f8e4d6f73496bd1dd9cc5fbbb4125a04b4b4cc5c36bedaac39fb844a101653efbb5d0555bd13c3a4ea3e9d28";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/kab/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/kab/firefox-57.0b14.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha512 = "9a9f8ec3cb7b86866dfca4a4f5ac25e13135896144af816ed2242091fa8719535a7d2c225be6650cdbe17a9bdc7bd2bdb962e40abd16428702c2570cd06a798f";
+ sha512 = "67d22ff37a79716869d7b59e95806c4a9b89bb2e256e0f1549fe5d3bc9fb3909f7d1c23111e8bb84a9cdfb4e029414908a79a8512c49847fb1d4b20263ccb43c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/kk/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/kk/firefox-57.0b14.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha512 = "c7aa9195a8bf39d65deeb4233139c6941433a7bef77797532fa346b509cf91c8e2041a24569996f7a5e7d2fb0e4a108bb40337cf1283195b257a5526d89b3bf0";
+ sha512 = "b9cc2b1c31ea4bfbf17c2c7b0452bebb830cd3b8cedfcf2739360dba562119e0eede3b660a403420f367287e94e0bb34f072ea13b1cd1b58681302267f299464";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/km/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/km/firefox-57.0b14.tar.bz2";
locale = "km";
arch = "linux-i686";
- sha512 = "45a5dbd1ecbfbc69a4ff99327a234e9b26f06b9e280cdb2e0689b4378a84eefc4fe3a511bf8b111db873ccf39f7b99c1d256218accf190975d53ed574d565747";
+ sha512 = "afb6985ad592ad2d634c3f84b1d573bb87c59bad892f066ddc1bafb5cce7109c59403f3c1394b2f65da0fcd29ec897a3144ce1ed410f623354410c27e386ce06";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/kn/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/kn/firefox-57.0b14.tar.bz2";
locale = "kn";
arch = "linux-i686";
- sha512 = "75574a88816ff42e8f20555a55f41bacb9d33d2535843b38d3079d0487bd1190b392e07e7d97f288c51f38c053bbbacc7acb34a835a7ae39814d6ff2ebfb1510";
+ sha512 = "cc85e9d276e4833fc962554e44a54ba8f5d56c387c37ea78f2f8deb1b845eae8ecaba1761726e209275d24c4192bd61e409c9d87320c1315665c095fb5231a9f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ko/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ko/firefox-57.0b14.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha512 = "2bbe4f990e2265e1d210c52987759486e6127a875ee55707bdd8fbceb44943215c28faa5f6c06161db7b7f18c2c2c3864882ffcc1eda286edc59aec7e33aca0d";
+ sha512 = "3934a012853c70b77fb02689141efcba7679e87d115d80d1c7f5945027f082986e679f146a6acbc97ff5b5be6b0d057e3b3f8dc292c4e66a37d5c3972fe865c9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/lij/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/lij/firefox-57.0b14.tar.bz2";
locale = "lij";
arch = "linux-i686";
- sha512 = "9c3580a05057f7e04f6efbf60b281c50b64970064dac547cf6a84ed305c8dab5d014f96719e70c87e67124f61afa3e1a44ecc3627fd6a3181e3dbfc28ed175c4";
+ sha512 = "571334620261a36127ae1e7a03c6142ed22fe49a95e28534030882c47a7325ba8200b8350904fa0e501cbe0801c2bb1968b456e9982bef165d3db0e82ad34b89";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/lt/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/lt/firefox-57.0b14.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha512 = "37b30fdf603cd41617db37cc9ba7e546c58a6bb58833b461fdced4caaf128bbc1a36ed774370548b8249da884302bfedf52681af61348313c5599628576e9c57";
+ sha512 = "3a7a0f09b52991a4d8cc6009c2fb91f3f908989d8178b4b9909bfd90f29db6ba11f29ffb35f3f1e578f96d6be10eb0fb337d28188dc792e6d024e42a5a16af8a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/lv/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/lv/firefox-57.0b14.tar.bz2";
locale = "lv";
arch = "linux-i686";
- sha512 = "7d075198482100a338105bb80d2d40d97d24460f2a6b15b72b349d249ebb638112e69bcecbf32578375d5621f3a46e6267401629d2fbe1ab6dc5d72dba454086";
+ sha512 = "7e5153caca960317e039f8ad44f6eee4ac8f582ff2b957f70c9eb3d6967d62fb94e4b13611006d746bcb4611ec1b0a003bbf610d412f9e41f86a8ea19096b70c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/mai/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/mai/firefox-57.0b14.tar.bz2";
locale = "mai";
arch = "linux-i686";
- sha512 = "7e052470a133931183439deba29a16097ad50383b63f97d5a1c03b7a3ce0c6485811c1afa2ea78bf9f03def2b0678bb43acefb2c1b944d8c12ee18e44b5d520c";
+ sha512 = "07cbb84ad4537482ae8b1ddb00a86197552d3a80f6432779952bc9b1577c920de07e60f78272b1ee3889b031fff1c5a34e1c1a69d3fa0621fc53413242f80242";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/mk/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/mk/firefox-57.0b14.tar.bz2";
locale = "mk";
arch = "linux-i686";
- sha512 = "ef6b8ad5fdeb7300c9676a2232accca1cac1b47896987455ec93ae8b8cf46dc092e224b417f922bc4cc0c41ce941d607c4c3fde6e305e274750af72b8c405389";
+ sha512 = "230ba5c56d60d1ec08092e9f6ae396fa836df56dff1aaed933a706014318fb13328db5d6b0bc3dcc030daab5f906d7760bb3a6af3c03422f724d627ab8b9d48d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ml/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ml/firefox-57.0b14.tar.bz2";
locale = "ml";
arch = "linux-i686";
- sha512 = "79dd88442e22ec9b98d432985deafc68b6b5c3dcadf6fa0a04292b019b3245c24b2fd08784d4c4d804c3b913bdf379753df4ba24ec69cdfcf9fdd659c8a18e4b";
+ sha512 = "e4aff215ab6b3bbdbe08f7cc698f11b12bfdab232ddcf995681ef62dd9808789541e8ac7b9b71c003775b78451c06f79ebc45d5a85562385a2e449679db346f4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/mr/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/mr/firefox-57.0b14.tar.bz2";
locale = "mr";
arch = "linux-i686";
- sha512 = "d474b05fc960f2c12319bbf994027945ed655bb8b6e766e1ba04f9c863e4d5b6d1ab8d632e0051d1191bbaab87e4793e8c1240372b9b0e0f170da03856c5d8d0";
+ sha512 = "b2b44d4a205e39d82b453a35569da1a3f428610551d322a1c57e64da42d96ca2f199e8e01769a24628506cbf3b621cd734923f9760305de8e480d51f360f79e0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ms/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ms/firefox-57.0b14.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha512 = "c5372584abf3c3ccf858c50927d26099504efa43feecf487639ab7a73e87da6137e29f31a440d7b6eae43092701e68c02325a39207f95c73fa2db303c3b402d6";
+ sha512 = "3646303c3858e4c2a7dbb555495f5f06b1867a04a37cb8ce95bdfd998e7bc96d8afb8c83b1df7d945bdc8327cc8d7be3f3bd7199efbe23e58cc3e38608ff8313";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/my/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/my/firefox-57.0b14.tar.bz2";
locale = "my";
arch = "linux-i686";
- sha512 = "e5374a80b05eab9dd8b4a279ac96edc52930ee730a9108f76a022e3908f5d81c3e5db9ffedcad492edee532c2606982a6c76733a971cb5d8f64ce68d04b113ea";
+ sha512 = "afbcd9f8dce81267614855d4d59da02f87d369c2c0af78e28ebf25de18ea4eaa1412999fcf3d414ebd030f9448d71e48500a4e90aae03b3905ba69f2670b17d6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/nb-NO/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/nb-NO/firefox-57.0b14.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha512 = "5077c2c497fda39bca53fd140241fd9bd3cde4f4e1ce3e7fbb101fed4a24d61df81d99db40453d4745750e24499382afd83e78cb67e82bbbf91158505472472f";
+ sha512 = "747dbaa1919c1cec14d4e085f8c8f284fc49508ce82cdf9a97538a85aeb9b901eb9e160e03346a769ef760bdb2108b33a25a967a527dfd3758f25cf11bad2e31";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/nl/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/nl/firefox-57.0b14.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha512 = "9eb8e46b9ea30e2865a009beed1c4c515830b1acddf79c2a0c035e8005dc646f2ec1d011474cfe53c07f3bbc73071765e7a88aaf0ce24378b1501cf5f246b106";
+ sha512 = "d882e7c1a49ba670535f17fc9ea99e7be4505d6dbd5d90855e4614cef319c38718da445afc411f1951ec3fc5d9a3b8799c64459a7adb588a29a126d1cd16d8fa";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/nn-NO/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/nn-NO/firefox-57.0b14.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha512 = "afe2b9c41cdd692b9166ddfecdb78ab94a3bb91d60b91e3e79a203a1f928a92d40eaf7889ceef19427dda1464155f85d0e166e98bd9eace6b071d3b30f954071";
+ sha512 = "8bc137f953b13a447dfd419b9ee0e4005134437892f214e49e18f98e080d5413d1dc655bf0bf417cd7c8a09811d3e7850967662b9d0be0d3b72cbc92db7e2307";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/or/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/or/firefox-57.0b14.tar.bz2";
locale = "or";
arch = "linux-i686";
- sha512 = "5eb2662445fa000b626e5f4a0195a44d8e00c630e09fe386eb7d77fb514b2ea939c07c23f299ae050260c06e6e68abda8e32a2ca8c5155e5f1d5e223add04e48";
+ sha512 = "34bbba4bf288f62654f88afc461155a27cc0316a920d7b8e42198054d5800360401c933624140cd569bb9864f9eeaa5616fe2530888e4717c964506ce66cce0d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/pa-IN/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/pa-IN/firefox-57.0b14.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha512 = "7e6ab9ace1aff3de1209992336567da167a3d6681af81354b05e36012545df1ff06e1a825668de7146e843a56c4e3a110ea530351ed83b129f9989d24bf86a2b";
+ sha512 = "1403e23fb95cf8449a149ecd698e768897a3733718dc1f6eb4590685263e2a1b54aaa3e557a968cfe71c5172bbdf7d24f3eb9fcdbeb431e31a1a26c0b9738e9e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/pl/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/pl/firefox-57.0b14.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha512 = "fbddea93b51eb530f26de74d16a1d373ca9b86a8fc89b7f12c8ee4e2f3c3af8be22560ec11ee4afc7d93c305eb8f352931a06b2e7dcc11eb1e9ec755a2afc2a4";
+ sha512 = "a2d99c00bdb839e4ce89d1bd6a0334bee4b6c6d426c3054257824c46abb1eb3c1f283aa0a4a030f1865fea350a7032cfcba86e231d11ce06ec3066f5ac4d47fa";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/pt-BR/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/pt-BR/firefox-57.0b14.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha512 = "6ae90c6b37258ef9e9b93fdad261c7b2522ee3b251c36f03dc6bf964d91da86a05937b0a65c75bb3531b7c10be6d5ada3a88b2240dbcf1c64c5b3f624acedcb7";
+ sha512 = "5768a805aa0b7780b55fecbd9bd349c6cd78efcbb3595acc7cab18d3356835e53e63e58e352c30c79b349e0b0c80be59509fa684be21f541cc67aa320e654f44";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/pt-PT/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/pt-PT/firefox-57.0b14.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha512 = "0f1d035f72a3f0739f843e97e1ab27c3b5b5901e88eb8adb9d8b343f6b5f571133fb8e9f40b3df14e4d7e1144aa7f1af86e7100df5786602185e4ebe425c8f97";
+ sha512 = "ca4dc2c76af2db4d9a44f8ce9f29adf7188a799d00d2e8cb1bac807dc90930b06cc5329097ef771e4f070969cf42c3cfd65b32dfd3112f59efdb0071bc6292e2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/rm/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/rm/firefox-57.0b14.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha512 = "7ec0f5792e812fb2d57d420ecdca006f5242f6c3599b58da01e3ee65df896d1853fb61ae0413ff59834a669690ab40b74244a31be5033ca215bbe784a7a8cb3c";
+ sha512 = "86af2317c04244c63f8182f46eb95abb1a113223c6d503c6b85c2fa9b596f44959e86323da0ad3a708f6c94aea4180246bb562f26c64a8c9b27d9a490d65a291";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ro/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ro/firefox-57.0b14.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha512 = "653e8942d04dc440d998229ad8a10ec8a1098ef85331abd8e1676c05398dd4b514f5fbdfd15c1b20ab0fa83216d7ad0b0e4d20b6555aab9a02f7fdf139d11e35";
+ sha512 = "2120d05bdf2dd8a702726e232fb3f94838befaedeedcb7c651d8d07047759b885904220173bfaaaa6d55b71e52085ce23156ad030992e8ae3981d47b41de046e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ru/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ru/firefox-57.0b14.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha512 = "66c45ddea853348cf0084fb64710ce0b077dc6521767a27a83eadfc237becf05e26335d85fd1701ba4790e80a2f5f971986c1a3847cc84efa2aaa8623d0b3556";
+ sha512 = "221b4170254ed9acd7edb256ae560060f640c7e6c02236e1925e38489e387f839c14b5cdfa2a0e4a0173e8b98a2ab57b7733a6fa361172166097fc84b260bba3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/si/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/si/firefox-57.0b14.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha512 = "69bc89b863e9a4ffde9ff478331a88b93a42a2cc5d51114acc995189c63301144093b4cd156864e6094940d64285797f83ef920b3231a427a149c5f6dac37dc9";
+ sha512 = "ea216290852677ae93bdbfee42b65473f9e00797175b7e36f4766a251fb302fd69009888f36efca7d04ef29fb0d66e75bbfddbf25f7f59dbe1d6767ffeb0c543";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/sk/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/sk/firefox-57.0b14.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha512 = "6b36b64b3edd9a16ba7051727a8ef326473859a07006159cd2b8a6fff25b0cd9649511dad03e5286e384ed74fca4b80d257cb0e754ee4ecd6eaa7c589478a5b9";
+ sha512 = "92071604add2392aa144caf61ad747d98be52c3fbb82c86f903772d470928f71748d8def2f367a8b6bfe04ac6769fc57f8de29210ae50bc45b75b94f5005b564";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/sl/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/sl/firefox-57.0b14.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha512 = "19a6c7c7d7f8cc2a2f03bbb23f28c4691152ffda292399b6e438dbc3afe89dee98be86ea4d7f27d9d4f736e68a6ff21db1cbb746bcbcb9cd6ba9d7e23155cc21";
+ sha512 = "94341abe0210c9632ebabc47325c55577e9e6a5f54b4cfb0ba9d19298dea1b3d6f70a68c3f82f6a4c371f8ddd6e088b18ea56282faeda0c824040e6c4cee0db1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/son/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/son/firefox-57.0b14.tar.bz2";
locale = "son";
arch = "linux-i686";
- sha512 = "df598c9156ba76218f4f0d87ff301a3220979abb3a4f5af19d0545b6a3ad48719a8267da22a31f646e6d20ad1f6f090579c9587e949be91559aa58455502a156";
+ sha512 = "537a57fb00d61b0566d9fd344919b65486f7c767c93d0aec9595467cf9a081d63c8ee7d3c7c3a3409ddb08d57f36ae078e3defc79826779954641c895079c1da";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/sq/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/sq/firefox-57.0b14.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha512 = "e8d53fa58ce1d34d22c7460c9b9d9111233047148e503e5a628d8d8e1c689b2c4a302048931dab44ee33ba2c4831362d3e74c294e907f1c5eee23d464007343d";
+ sha512 = "a4ad413f8bf4ea8333b3c182a5c02283886e395e58b6ac5a53a298afba0938ec38648b67af3009a44468ab6fa89b6684d86b4d83525f0dcbb470f078584b6dea";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/sr/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/sr/firefox-57.0b14.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha512 = "5d3e8d3741ee0ab535479ded3035379858ba092a8cebbd5ac8bcc525e88159594f5cef90894bb0fdc5eb9c349c435913b89a030ebf942054110d37e57bcc50cd";
+ sha512 = "15990e14d69bc0f043f7bcba54c5c27b7562c8fa68c5c14e7df695382303ee6ad40eb6b22319e8f9110b59f51209e0c8a6357e257862a50d8d515ea7f414ae74";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/sv-SE/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/sv-SE/firefox-57.0b14.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha512 = "98da270b0da5091cff599cfdc9a0d241ab8463c1c9e2771f81e8c0dd7ecf567e2cf4ea536b81cfd6b1679e449d7f1d4157b8927f1b1b0a03f3cb7dbfbd267d65";
+ sha512 = "690e94fc46c94710e488b1a8cd096927756026d0d6ea49f983883092e32f9dc0d2fdbaf6efe4c236cf750873b7907807fcec6826d2ce8b2473d0c4ef5461a1e3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ta/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ta/firefox-57.0b14.tar.bz2";
locale = "ta";
arch = "linux-i686";
- sha512 = "63287a39d325111c7e18b62a9b76cf0e7564709846cad78a946852fce761475edc61e292e31491821215b0cd2f392e8c41b7ecf0ba78ac3440cdd4f7f9b52d21";
+ sha512 = "839ac81dd6cde69b05e934a4bfb943fa5c65f86d4c7d64c58eb86e7911f81d93a85abc3ad732ae0baa9c7df76a906826a109ea15cb4ee85e802248b99b9ef1fb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/te/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/te/firefox-57.0b14.tar.bz2";
locale = "te";
arch = "linux-i686";
- sha512 = "476840816b36816b967f86c9796f6df4afdb3d7524f4268cd867393eac83ff868645eb14ed5766aec87ba3c226e593099e15d44aa63a01bf422a12a4bb5c77ea";
+ sha512 = "58b1225e50a0d3aef4b1d2da5d494b41e5ee41f53e2878a4945daf308d452348deed4cf87641aa51e9c061393c239109d02523596efb8ef7c675c885d80298aa";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/th/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/th/firefox-57.0b14.tar.bz2";
locale = "th";
arch = "linux-i686";
- sha512 = "b5dd1a09db20a788261a2f6812a6b35be7164d14cce7c700af51dc1cb187801c2ecc0d0b035386ec4340af25c8cf651f9dd4c679bd61b335866fd2d7a531f7ef";
+ sha512 = "6d0cd2b6cd315ca50445f3f87d1d2d2977bc34246481a58239f06a90253bbb810c0de488d064e80d3d2bcc475d34481c1f59ef0499ff59057b77c0cd67e71c7f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/tr/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/tr/firefox-57.0b14.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha512 = "08a002ec452956730d02985e74c9c1c615783d19fde6c1ee3da3adaeb1ea021c05c865e72d8dd7c930f9351ee376cd42b20fb90916d276344e7b2d17eda6f458";
+ sha512 = "291f0c8f1241120a4fe4c2754ac82f443ef6f0d354f8b71b25b2020948a4de5b7ddbc87bbe2fc08b09ab1ec491a34fbbc69e6d472dc0114e369a99f967bf27c7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/uk/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/uk/firefox-57.0b14.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha512 = "7c75010a3a15f2208774f3e92317dd88c2a821c468a84a5855e4db193c5fa6d639d4b6969d3ef72bbc90c47212854abd0002295f163b06998285d439f50ccde4";
+ sha512 = "a6db7a4daa79d614b2d7c94372aacc50b4068ad437b38aab72cce99aba668fb230d5b81691678e09efb645282118dedf25e0c94e9d9cd9ef6a692c43a288e119";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ur/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/ur/firefox-57.0b14.tar.bz2";
locale = "ur";
arch = "linux-i686";
- sha512 = "2d94f170a3eb66ef776c0c78c53d16716aef47218122bd5a9c7910fc6f821a5ae54192cee0314c48c7d6c5336f442532594c31e4e0821cb427f617590b8b7ae7";
+ sha512 = "cb69cf2aab416490b866e9b15b3706dfb81b003887456ad83907047424285f46d1a4b727766b78a633b33c6418c3f24dd9b53a90b151a1752709191328c0e227";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/uz/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/uz/firefox-57.0b14.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha512 = "21880c1a14e339e7b716f742c2910451662712a3870605db9eac00729b6cf9c2043cc49035c86044af8512239fbf05ea51ef476aebd234a7fa9317cefbd43a29";
+ sha512 = "bb29f30171804b14aed28e5953bdda7bc94e2e1d23eb9af54c36937f90ff7bfd068abe4c065690aeab2ea61df08a59a5ed808e1f41e7d055b81235f8662d35ac";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/vi/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/vi/firefox-57.0b14.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha512 = "5efca9a9fac37440d41c444497ecb2a5eb56b47881b46c66cf65b3b78353fd8a18d37c93d83400be1207193c7dc3a901402d679c50ebe55ddb93687439d4874e";
+ sha512 = "b91dade05c291572c257be0a33d685fb48079c4c1dceb95d6b51601430717c5bdd4f962b9047c2f2a22dad38578a041025ad59b424efd1260ddf6f9d9e4d92b8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/xh/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/xh/firefox-57.0b14.tar.bz2";
locale = "xh";
arch = "linux-i686";
- sha512 = "03927d0b8bf3c261fd00a043d8499e3686c7abc51eedac63f049d100095da2b858a2cea582c8aa2e3f65e1269b7094559709c22fd633a0cda29c6b21f3987eb7";
+ sha512 = "771335861bfdb99f17ae6c8607e784e3901f637d8e4a06385bd2bab4797589377e8c1b875600e9d8434d6ce5a7003ba4ca154dced98228b85c6f70272c0b8616";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/zh-CN/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/zh-CN/firefox-57.0b14.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha512 = "75a77fff929aa72700b9af9452e2d0fa93f21136cd7651a32970fec24332d3c9a7afd58a823e3dffe1aa63ca49057c62ba5ce579021a783a096733c23c71bbfb";
+ sha512 = "d48c546975b92cc5c130e50b9fb3c84116235aaaed6ae8e04e975d8ed3605540b9ad640bc995fed23e42d271b9b2b598613b14822358c7487852030c5802dca6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/zh-TW/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/57.0b14/linux-i686/zh-TW/firefox-57.0b14.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha512 = "d83bb672b5587b6fc8e2c4028f144821282b1596ca88f1aa889f4a2601d46fac44c7302d30f23179db6540e84e878244c4291dceadb56045f3edbdd41bc42a19";
+ sha512 = "9e731700c738f0db2390478ba293f78a98496c374cd871a0ae483c3911685f0cca1b89531c06177f739fda77ee94fba03f2d93ad4669ce219d215cac8429819a";
}
];
}
diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index f59cb402720dcf87034dfb6c9e970ed1bed284a7..347ceba9ab4ab1c332d49ccebf0a3edf4592606e 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -16,6 +16,7 @@
, gstreamer
, gtk2
, gtk3
+, kerberos
, libX11
, libXScrnSaver
, libxcb
@@ -53,9 +54,12 @@ let
inherit (generated) version sources;
- arch = if stdenv.system == "i686-linux"
- then "linux-i686"
- else "linux-x86_64";
+ mozillaPlatforms = {
+ "i686-linux" = "linux-i686";
+ "x86_64-linux" = "linux-x86_64";
+ };
+
+ arch = mozillaPlatforms.${stdenv.system};
isPrefixOf = prefix: string:
builtins.substring 0 (builtins.stringLength prefix) string == prefix;
@@ -100,6 +104,7 @@ stdenv.mkDerivation {
gstreamer
gtk2
gtk3
+ kerberos
libX11
libXScrnSaver
libXcomposite
@@ -168,6 +173,7 @@ stdenv.mkDerivation {
'';
passthru.ffmpegSupport = true;
+ passthru.gssSupport = true;
passthru.updateScript = import ./update.nix {
inherit name channel writeScript xidel coreutils gnused gnugrep gnupg curl;
baseUrl =
@@ -182,7 +188,7 @@ stdenv.mkDerivation {
free = false;
url = http://www.mozilla.org/en-US/foundation/trademarks/policy/;
};
- platforms = platforms.linux;
+ platforms = builtins.attrNames mozillaPlatforms;
maintainers = with maintainers; [ garbas ];
};
}
diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
index a436cd46a11e88456e5fa77376b186290bd9d9f8..2f3e8c40a3e56ca5210d2dd49b9b6676eb309784 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
@@ -1,955 +1,965 @@
{
- version = "55.0b2";
+ version = "58.0b2";
sources = [
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ach/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ach/firefox-58.0b2.tar.bz2";
locale = "ach";
arch = "linux-x86_64";
- sha512 = "003297708bc29bdfd471ae4af99a39f3c4732a067ad56e7f5a49fe8caff7a88dbff9245a4e8843f504f80c0defd2c2fa62819e6b71c176da6cd0cfe9d1c614d2";
+ sha512 = "6ffa1c861a68b6bd7e65b0883c734baa1161c3ff827cff2fabd2e38b5de64bf973034f40958471c12fbaec806978a74b3e2a5a4c2e23caf87dbe747cf75d0a1a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/af/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/af/firefox-58.0b2.tar.bz2";
locale = "af";
arch = "linux-x86_64";
- sha512 = "4f32ca70b0891bf25fe68196f5e78fc9368cef5dd2016f8cb0c0b099fca34b154bbc6b8faee831320fd0bbfd35f81ad379e44c7778d78b1b517175b3d5a42dd4";
+ sha512 = "4bf2e416ff864e6062a76c14d70d60da9c3c3261b2d401e4e0cb1abdec77f0c21878b36b863f3d11316e6114e358af200b762c4f1c7cb7cc84cb12c8c95d240e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/an/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/an/firefox-58.0b2.tar.bz2";
locale = "an";
arch = "linux-x86_64";
- sha512 = "01d1d9df2c24c6e41ab6a29028ef0c38630c7a786cb310eefa93adbd334d8b1e65335225b3fdb9f21bd8740d4d9710085d750144b2670b4a30e326bae0d96d78";
+ sha512 = "d1136b831820dd7f9bcd2d5d20d68ba66bdccc610bc9d26b59937b2ba017fff7fa1be1d616ff5586e136a16d1a2023255eb430d78ab7c97f35bad2b6172056b9";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ar/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ar/firefox-58.0b2.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha512 = "731ab03cf719f8181c097a40436c5123c2fac528a4c420b5564d79d094bd506dfe58c8718d7fa1a0d3e3223b67173de1826046fe09c763248bea79b7e1485c4b";
+ sha512 = "ab9dc901df22fe84d01cfbc7b251ffb50eea784c2cff1a38c404b75ac58349f312ca7b602c107ea8b08bab7dee292b99ca33d3651fe43479357b57ef2d36a07f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/as/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/as/firefox-58.0b2.tar.bz2";
locale = "as";
arch = "linux-x86_64";
- sha512 = "78f9203b0cae15830ee289b540d56e6664a486f107f99b42020809375ead3193da2e4e1bc7bc25ac20256ac07c55e4c619302615220b0a1ae742ded4f4d6afe7";
+ sha512 = "f7af5fc1e80cbca6227266c5f7945c665499f5be36436e7135721d67efcfb3d2b101e1749c03101ef491c231f96cc746a6bbae25fc5818f1790d61f59e4fdf2c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ast/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ast/firefox-58.0b2.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha512 = "401afbb8c2945724b0754d95b0385822d77a9018874c067b83864546c5565735d403ccd1a9f999af0be10b806ec2b64bda5f28306f90e5171406b8a79dfe5975";
+ sha512 = "ac9fe13f073358dd71f81583e6d831617be46b65781da099fac48db37a942c31bfad3b72422ef8a14e65c5de28939cdfbb1c580f3db5cdd54819a0da0257e151";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/az/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/az/firefox-58.0b2.tar.bz2";
locale = "az";
arch = "linux-x86_64";
- sha512 = "953b91a7681e033219fe80d63ec41ed50025f1bda91cde9f6124bee46ed89e38c8470257e1791878443adfda94a579c9261c2ada6c8d415a62dc27b38cf6cb66";
+ sha512 = "05e30463e29723157815f91c02f7d6e323fad0443d59ef9b6abe2110998170894aa95467d5f05f78daa43fdf05f3e72af5c9656134529aadc9cf165b201acbe1";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/be/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/be/firefox-58.0b2.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha512 = "366f951b05f62a0f158bd1a345fe1540647c3a1d5b91c49c2d104f76974a64030e830dda3afc15828309f88100c4f12d5dfee98827565c96acd62a4e0db24e74";
+ sha512 = "5aeac6d316409651180bb00de74ceb48bf8bffeb027491c1d42830390aa11d64d13e6748a6bd5519c5132d902e0bdb06dab35ae76d6ecf2a8e769503587c7660";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/bg/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/bg/firefox-58.0b2.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha512 = "51542bf88583b2f2dba75e1abfc892c0595737e74ccc6844cb470513bbad7c337e1ccfaa628f08a8d5ce09b91812ea07758831d5bab54ac961652f905c9b216b";
+ sha512 = "6cce86d49c53498611c85505b5996c6db92b5a5aca9319b18ea0e5ab19dee2842cc4ca036ccd9b1bb7131aa539e38037c0363281e170182ad81e59141150f20f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/bn-BD/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/bn-BD/firefox-58.0b2.tar.bz2";
locale = "bn-BD";
arch = "linux-x86_64";
- sha512 = "9f41fae202b3a38115b1efccb0358f3b8896d8f44730f4e53896fc48c9048d6a1ca8904217312c6bd9f9ebeee1514a85c1723acae8e293559289aaa6b63661ac";
+ sha512 = "b177f5531f887bea5a8b47da45a4ec1477a9adfe48de02ede1aa49761fedaff4ab06603ea004ccfc0991e9598982077dc2f30945e1042ad8098d8cd6eed7fa41";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/bn-IN/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/bn-IN/firefox-58.0b2.tar.bz2";
locale = "bn-IN";
arch = "linux-x86_64";
- sha512 = "6c617687ee2e1460addc86c383a9967803a6900845a2c98d4ef67f2007d3cbe82e6e8b046e4d990b59b8a001f60eaaaa34a50494cc1c8b9d5bfdf3951494022b";
+ sha512 = "5475cc9261e666aa11915f70599a281dc5bbba7a88527646fc932b6272b70a936186077254d147c68bec28fee4f79859567256c327043ffa5504feedc76e3eb9";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/br/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/br/firefox-58.0b2.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha512 = "23cc36ad34c20003cd3a4c11eb22e6b35ba1fc43ec81fbbef0ca3c7aee445920d66620d355b60e6439296ff19805d29f7266060c2abc5937b266fe45f5af251c";
+ sha512 = "ace1027ea7d5115ce7654a8b12609c4c78da5a6dbf8a08544d467d4a8766f39df557659c9c54fd2ee613c403ac523cf4fa8fe241544112e7c7999c572f45d656";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/bs/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/bs/firefox-58.0b2.tar.bz2";
locale = "bs";
arch = "linux-x86_64";
- sha512 = "97b1bac5f6637c07578e689011721e261feef2535feabef4a86856a45c3a48c34da692dcff7aedd4c381159ce016eaec0b6c50acf21f9e045a4679e494c01a3e";
+ sha512 = "d8256bcaca634f53c60fa8fc4189c68fc14dc1aa7941beeb28692f76e4ed62465290fb0234236a684ac489634f71577dfd5d5e613d710f1e191cb3021b2971a0";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ca/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ca/firefox-58.0b2.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha512 = "e188a8de2f0fb240655f88176a138a7816929a5acc708fd66960b8f51798fb240e63932498eb7db64868eab95d2b9c95935eb6475a0752e1525c5c6403a78616";
+ sha512 = "0fee3a02c437015679460682325c7fadb211bd5d4a3f5f1ee04c978eefb0694ccae7b840801a9453f8ca0d383079fc0481cc157741281ba09be32a1012ceb2d0";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/cak/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/cak/firefox-58.0b2.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha512 = "f98825c86e87c3010a48e2e71752b4b61d118e72fc4ef16f2c3eecba54e6af37671ba18c4a7564157b8f65eb552c92c461ca190b80b344103714946dec00da3b";
+ sha512 = "ece5f44da4de5370701ca57f6d3bfa68df19568ef07ad515a2937a49b77e63ab9752ac9d31b1da837e914ccf9805528e7727e04765cb77909e33c576358c6912";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/cs/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/cs/firefox-58.0b2.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha512 = "b5e007f882126d7c1e40d9750c9016dcf98674177cec15185ee340ac779cfb81efca0d23486bf7bcada25654e7bc15dd2cc78ad948981e668d0a00a5f138f62f";
+ sha512 = "48fea82e0062a91b89e868c0f3baef3869987b9465314d40f9df109b573c24d826bd87a474e81d43b5aa9dd02cc1968f438c4c93924c06ddc133dcca592ab095";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/cy/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/cy/firefox-58.0b2.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha512 = "ceb4f5eff71192a8be67ca79feb3a42390501e11c2c2d2c3a9bbda42a6fcb71362665e991a84fae660442269eb4b91ce1cd8c860a6b801eeda2569a1e7800291";
+ sha512 = "15cf8a4ee6016f4dc81cc1a4287ec1b7d26fe8eab613087bb3b95c7feac4adf89fc25777961682e5f85a158a5c1afe3d41d8c5bdc455a0ce0739c59885d0a2ee";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/da/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/da/firefox-58.0b2.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha512 = "c0cf7ef6fcad94ba4ac44ca8b4d272fb88c0e63a477b4829a675585204e19c88086b8f21f89c52c1954624dfc1f0f9a836d3333ad8c6989fd398afe2eb92234a";
+ sha512 = "7e66d426d4837999faef4f8259c30720a39448b81ccaced2698be4051311cd7b7fec08eb0ebd738af7bef3474ad4059e2e90e9c8d12d829c8cbe7d758296343d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/de/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/de/firefox-58.0b2.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha512 = "fb4423b8f154f0f124ad0a36ae692ad8962564aa9ff7747d412a73ca983e1164bec45d8ae6f983f91f2e657701bb268b96d4ddbe8261d68bd41e07d4f7c9fd5a";
+ sha512 = "cda87407ecd86d825dcc15dfea4c1dd2f56d3bcaa6af2cbdbb8b209ea280c60dbb72b68db71f84e94783f7c263ad4dec503603b650411c72b38c1a5a470deefa";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/dsb/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/dsb/firefox-58.0b2.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha512 = "f17bcbd5885a0caa72380f1dafc65c4e104897abaa03f89703501af9dce33ab9e9dd133ea8fd518809e02f99ef6c10a9c5f516b56e05d700b6324b3a101de18d";
+ sha512 = "db9da2c7397d64d1d5944f6dab29b29325b6773f85af1a4d5e87d06dcc580cc1157b4f7092e7fd9bde250f332d26983b7ac2c7662b240f4e97f2ee1404ad4b1d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/el/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/el/firefox-58.0b2.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha512 = "cf0304640af1f3b27b992b32e59a215d5cf95e8b0744266a86ac7738988faa8e2fcbe6b22a50990298cd7a6512747a0000e9788e50b1c32684fa616a7159cbcf";
+ sha512 = "51c02952a6a1f94f25dae1de9138a9a39203eec9b02c3f90084e319f8e3e17c436937dc5525709229db22a27de5f79abc1cdd8502631b6ba280770d91151d5d5";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/en-GB/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/en-GB/firefox-58.0b2.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha512 = "dde0c233b45cd72b63b39a4a99e0d3c0a2f0a63999fb6ba9bf8bddeb686afe6b03a441215e5f2d5d192a19e49b63dc3cb14555c2aaac4efe196e7d58ee83fb27";
+ sha512 = "b5925d08497647afb8f6cb6bfe5ea5fd899e55ed77f3709ae007e2359d1b7c38fd5e7cedc56f12d68e660b5d9f10c56bd65cccb92a645d25cc617f188da88a65";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/en-US/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/en-US/firefox-58.0b2.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha512 = "d5e35480eac87eb0f073e0ca413eec6ba6f54c7b14b0ffbaace7a130e07703215d5f7ed3c6f7356154f6a0388f4ddd695419a4d84e4ea42a85c967202110016c";
+ sha512 = "b40a42713892b760d659c4fe5ca002b8ccb5309319b57d89b5f9af37c84a021ad67601f5c7f5b02a445dec7a00d671a28df6ab701775f59b1a7be7dda93d673e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/en-ZA/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/en-ZA/firefox-58.0b2.tar.bz2";
locale = "en-ZA";
arch = "linux-x86_64";
- sha512 = "3831f3003fa5376b88fa216dc309a15b2332d4a9ba332d78b0067a38b774f7db40cb86d82daf7e0dbe5785ed72f603feb3542a84fe219bd4798cfeef1c46a268";
+ sha512 = "1765b79663475ff97dacaf441cf127256be5097205f52f3ecd5648b5d15087a9e43fc97e165cec714d452a3c802d798b89650eb3e9b33c00e739a1ca2684dfd2";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/eo/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/eo/firefox-58.0b2.tar.bz2";
locale = "eo";
arch = "linux-x86_64";
- sha512 = "5dddcc0fefb98d0364097fc374f033b8063cfe07ed77b0ef0f8f3c58cd907b27c860ee2776952d3900b99f0084494c304aa38eb07f659dd60765d991f86ff69b";
+ sha512 = "e1d30c41b6ba56604539a5b527effd16c7a40f85691fafc04d8e006f2d09c9531f70f5e3305aea8eff8840487acd87657a0aae66a3275d5b64ce84ee151ba3e8";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/es-AR/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/es-AR/firefox-58.0b2.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha512 = "4c1f58fb03e85a96ae339447135712ac59a5280643035f2b1ad684858d58147e62dccb9d793829a30160056891538c56df5f8a73b3342b8aaceca8a8c8b7ec40";
+ sha512 = "6830e829c86a4860a3ae461e16d4d63feeb141cdf65fdeb29c4cdd4e4fbd1887a5425b81eae9a34a28d750fbe27e70f065acd70d0cffa6c9d1cfede023e43f07";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/es-CL/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/es-CL/firefox-58.0b2.tar.bz2";
locale = "es-CL";
arch = "linux-x86_64";
- sha512 = "b96414975770592a829fa95c46dbd9c14cf1509bcbd8787442d23b55765dc3abf406cbd3fd100ad3f8ba243103798e1b060a6bbc1deabcdce24d52401b6e065a";
+ sha512 = "ea55c8fda45368ab7adc12891c3cc19d27124e8740ccbcda6b2b7edecd3310dfe068344f856d97b5c8cff066427dd21baf2d242397ef249a7590d01989be274b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/es-ES/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/es-ES/firefox-58.0b2.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha512 = "bb5d87a32d9c9c10a54273cab014caee57a68d5b1ad3de3ea10ccfd9517118a97d351b789e171514720d684e4d1c5fd89554f3c776f832d69e546d729bffa01b";
+ sha512 = "ba2776ad1a474183d828fc73c4a3e3f8036159c8ba08ea8b6bcfe562aac0808adc015c94f4375dab850fa61df6ce94d6bb684e028db07385486ecc2964f9834e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/es-MX/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/es-MX/firefox-58.0b2.tar.bz2";
locale = "es-MX";
arch = "linux-x86_64";
- sha512 = "5136699c8ec08604d1b8040bea67477dc021a50af8eaf7cb30dc9d5462fd1fbf6be2e418ad531056a033c5a661d47e9c8841e3087b8ebca3f9b1eee24d0cc20a";
+ sha512 = "14b755e01ce982a3aacab5cc70c086c877f16df8b46e46aca46faf0950eeab61e2cbc90de0f9dc452c6f27f8e4367e4fd70209491721c04a88af9fe8edf92b10";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/et/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/et/firefox-58.0b2.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha512 = "77b0dc7274c941efb10f25ef80d2cbc70c3d3243e6ecc07459bba933fbb01382e6d8757c77c0fc26fa42f39be0761cf07d783a1e2cf5064a73910adb420556ba";
+ sha512 = "d211c2958e9927c2852801331ced3986a5a9f75b9fe3d734a5b380e807a6f91e3c328c48817e21b43ca2b6fc48986f80f5d5f3cf4c0bd03257c046b5a930c985";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/eu/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/eu/firefox-58.0b2.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha512 = "f842af2f0b7e1894d49da17dcfa910df6976976cc59e58603d119adbc1fd7e4a4316ade167896b57a40e6480acf54f168a5630d3b30a7136360b3e9a6dd10d05";
+ sha512 = "d9f53b988a86a48df41a691742975096343a3b4905e5ae78ec9bfe5580ff71cc56457fbfad2fa8512d3a3124989532f21caddfb920d886c6891b2a1d82e26b6f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/fa/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/fa/firefox-58.0b2.tar.bz2";
locale = "fa";
arch = "linux-x86_64";
- sha512 = "37899d6ed1c16785d9b41dd2593f504c5fd9169210b6f4bf79e4f8c3a7f00dbce74e88eca4884fbf08c28191408d886d0762f2d79928bac1820181321a53ebd8";
+ sha512 = "43ad5afa9cca9944203c33ef053bc86cc36e50497992ecbb7959edce25d54d588b736f56684af04fba8f10750b450a613ca4008715ec5edc2cc70d31a5288296";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ff/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ff/firefox-58.0b2.tar.bz2";
locale = "ff";
arch = "linux-x86_64";
- sha512 = "3a0a3cb965822ccfe51c662986fe2acea2802a72bdb9506f48c3b58e70e55f7c283ef590946e4c5c6b9aeec026980a43846dbe2fbe41744d4c9cadfabfef79f6";
+ sha512 = "64a11c61a3104e5fa06c802e25ebb293e9fbe58b3d4af50a36a9919d213d75ecb1e1aff8d164f111398b0e4efb46a2574d05f23f39ffe845729e0fe18ec27720";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/fi/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/fi/firefox-58.0b2.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha512 = "a1d3bb077e396caa2df99a1b95a8eebb32d929980273c8f748958b7ffa6f1f7eabbf486afb195cad613d2012f3af0a355152a631066215d717bb7e270c05b72b";
+ sha512 = "0c739ae31197dc3c9c10a40ee97eb4bd623ac3551f67bd2dd0527a4e6efabb47bab6c31c15925925d5670611b82de921e0d068491819b9a580c8062cd0a794cb";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/fr/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/fr/firefox-58.0b2.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha512 = "012bb9748fa46c6a61d958bdcbce045ae050b1571ba4cc19a91314468f2144976a804183340f3ec0c249eb548ea323db872529a0a3cae391b840069ab43ef397";
+ sha512 = "7fa98e4e5fd8174043d6d85ee63aa22130a9191dabd40ad8935f233559eeb2dc46bdf27047975251f4d843770f900eb1756161e2d5dfd91e95c4b03b0841af82";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/fy-NL/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/fy-NL/firefox-58.0b2.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha512 = "f78c749867899de82295aa928a4afd256f5749f1a02b149eb2bb26660b9073e3bc4ba6a7acbb02a050ca54a1961541b2b9458e5827cbf7cc4a31e813234940ef";
+ sha512 = "412827dd52dc04d0a342bc0ae0871108264048b13f3476af0295b9304efea3eb24719b5ed034407dd25f7d7faef635ed08056b12de78d6fb1ec0a30acc1a1392";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ga-IE/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ga-IE/firefox-58.0b2.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha512 = "88652cc3006f731ffa9549cce2ed3d21553753105eacd7260e0274bd63acc4f77b5ee60ee2967cf963c37779e27290f95f61731701666d22d5ca3dcee257cf5f";
+ sha512 = "02272dfcf04b9ee4bf6ea5f1b03f59892526e0df14cab0dfa1b090678e9ea45a76962bbbb35ab5ee13a6bc919bb5849d5e401f8157f0e5119c265a53759177d4";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/gd/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/gd/firefox-58.0b2.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha512 = "a0eb1f4e1ba442deeffee4cf074ced94844e167fe58ecb2985555ae233f22990b11ea5eed9a219f407adfcd8fc18ca6c21f191802cbb12fbf767a0d2742154a1";
+ sha512 = "64a89548064d36cbca0a0572319e979a565470b4cc63aef5005f520e58f37e7a54e7ab5380ee5e0947d1a1b051825a5fe223a8ad5cfc833636ae9f9653b33779";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/gl/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/gl/firefox-58.0b2.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha512 = "51363ace7df993022052162a5eb6b1ad65bf66eb48e1cb713deac1594f3883401f42f0a2f5c1bd7a73eef1d45f34df7a8d1976bc1d115bec134d9c7cd671b1f3";
+ sha512 = "b69ab34709258444c957dc55f55bfcfe5965b31e984fb911d2fb8b8499a62044c5d24e68e93880454b09888f68e3e80c68c0e37a424de53786fcbe1ea8142ab0";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/gn/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/gn/firefox-58.0b2.tar.bz2";
locale = "gn";
arch = "linux-x86_64";
- sha512 = "93549b7a3ffdb275a4f4dba8a80f292cae039506990085484a9f6a54665a7588ff04c29ff5746f8c76e9d387272e18312ca58313cc255327b0fbfab53598515b";
+ sha512 = "25f3c7753bfe47a5198e770def91596f904f5b4de0658ee49c2209afbcf53fda35c8058465ae21876aa733daf35bf58c14f464f2e125996e27952759671cf351";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/gu-IN/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/gu-IN/firefox-58.0b2.tar.bz2";
locale = "gu-IN";
arch = "linux-x86_64";
- sha512 = "5da0acb3b9c1588f971cfd3b40041a46cd32102b619984e3e9b16ce9f6b950c37ccd16990cd6b912bdc5af42e9cbbdf6849fd7b3716a85b2217f890b5241233c";
+ sha512 = "f20a7cf31dca9f635b96b5a95b24fef039f3a856e64a34b681d75e19e1f997bf41f7a8a49163ec1a63ea2d2a500eba174a3e8f5c931e4b7b9ec0857c908c5aca";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/he/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/he/firefox-58.0b2.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha512 = "f5e703361f106f63d101df3c591c0f63930df88b72bcaa0a93ca1ab0709c325edb1680d1955eb678103343c97719fa0b38b1ab8f12458538087f4a5f31080060";
+ sha512 = "c2de1b8b8cd2af04efb78b432b865df564fdb70e41b3ae7ee17bd66f438bd8ae60b49774265ae9efc3e5e17d8ff947f50de4872e6004e497b3ad073c096d5110";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/hi-IN/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/hi-IN/firefox-58.0b2.tar.bz2";
locale = "hi-IN";
arch = "linux-x86_64";
- sha512 = "237e1fb08f8dba0bf72cfa32de252af6cde28820ae0f46d4756fa4a82893752a343d9cabfa4c719a4e39897fd6e41a32349ce2fdce61824a0dcc101cf9254681";
+ sha512 = "9f513d17bc01dd34b1a07939d8d4858b5c525d99a0bab1eb7ed5f205de3442e3f9dea90e5bf2a7743f6b624757dd3b182ad976d5b32771e99b8c62b016aab594";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/hr/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/hr/firefox-58.0b2.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha512 = "908dc023c384b447af89b7dda7c60d2d2cdac3f386d1c4005d78490b4df5b69400b72ac743e9cbd0c700e4989583945cc2da0f2b8c0e1a87917ab1d37c842f4d";
+ sha512 = "0f43806af6aca2980e358fb7bb39b2970d9d7c32175ff9dd4a3af5765866fb68a1e4a5ea7071aaaeef4a70b502c5df86dd88e9a4fb5e6db00f5e11f9d99b324e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/hsb/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/hsb/firefox-58.0b2.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha512 = "c4a91ab0f38eb0f565d021e798c30dd07e4d259624a50ba1f51969b46e257396b9faf8a0676675799f476ed9c71fab540d0bede002e4ff6e63d3114a7114c47b";
+ sha512 = "4397b1ff3a113f7591ea8c2211fb7b15edc3af9d2d8883a720eb68d5f19024488262818795d9f14b67c91649337e8884ea12d6dff6fcd0650c31d2f917cef493";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/hu/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/hu/firefox-58.0b2.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha512 = "cc8d632d7b9aa675f60780d0d16bc5da2f9853813917d6e89a7e0f47db288092fd2da94bbe28c0959d4589c23422df1d15101ed340059a3e5ebb9c622aaf9c46";
+ sha512 = "d7dd0be61fe7ac795817b7e2eca9f9ce1c312e49e851e068b410fb9076fb83bfb82928eaf7e1bb11f7647890a0b74dd16b93ede8e8672f7a70e9d0482a859646";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/hy-AM/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/hy-AM/firefox-58.0b2.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha512 = "aa37883c2b1b880f807ab3bf2ce4cdc99e83cd8a80e5856055f33a0eed68eed21a3f8b5d20394ad706b0ae707d2469918bfc70c52e270b2b0303953d560e34b5";
+ sha512 = "a924053e4df4b5e036dd25e3f663239bce6e6879e0cd0060fe62a5f06c573bfbd25ded2be37940c14a13c493ff421127245dea88ef183ca9f496bc8a89d1eeb9";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/id/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/id/firefox-58.0b2.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha512 = "cad8f320178124b82fa27947908191b02536691e9129fbfe9b782ca0a15a6d7adbfeccd2b6bf2bdbb4aa1d4b3d4949cb55b4188b49078685e4d07ce2a90eac20";
+ sha512 = "cd83da2536a067120783df1a5a04ef3e16aa87a47fbfc4c50d0009983652506e10688f05e2da66034051fbe8518754e025489b29e013cb07b9829dfb2c70cff6";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/is/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/is/firefox-58.0b2.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha512 = "7f64839be67ff5709d4ee08838a4c15e9e7971032a89390335e27781176c9d1fe555a070968f23a9cf786c3515ef028cb4911b4fb6615c38f94fdc700d35c169";
+ sha512 = "87e6c6111b9a30de82235201e9d341cf2ceed3d4599d94815d807edb252dea937d7870cfd229d7fb47af8c822201567f3ab990b15731f9fef243edbbb5ff918c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/it/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/it/firefox-58.0b2.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha512 = "bd1f6c79c108f1fa1c01b445acd9f9ecb0a9f088cda0a113b48e1ebeb7503fdf36789881643cef359407e587eaad6d0dbe27298554b5025602f90d11e3c9ae0b";
+ sha512 = "bfded5c6a7aabd2120cc56c756d900b2b71766d4ea6cc6c5cc9905ec14068cc98f10a8ee54862f8223b6d7ae43b09346dae87e5b146df8bae1a63dc84686ec69";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ja/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ja/firefox-58.0b2.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha512 = "2f9eb69e4f1db37c46a63eb3f71edd461727ab98e5fd2ea6925cab501c2f7aa81b8870bd42af2d4e30410e8d6083cd103baa83f07177ab7370a0d96afeaf424a";
+ sha512 = "e74df1de9adccd46ac36675084a16c7d07bfa48025802ef3c932b291bba76955de14f52282bf2cce2d69a355393e97aea946cbd3314c5cc97e699afa610c2afe";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ka/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ka/firefox-58.0b2.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha512 = "b6b2728e9b74bf6c1eec3859c1dd8ee7d2ee98ccbc45fc28e2caaf45f1bb71e05b42361a25e3c4e5d71138b5b23b764d9e8e5288874cfc7b96b8b0db33088147";
+ sha512 = "fd729433c08e2c569e0c72859d38f70fd62293b5f1a97bb41ee01950845c4480c6f48e80cec6ffd9fd81d34e357d2fbfd67515a44c9db02acd5f79acb55886f7";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/kab/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/kab/firefox-58.0b2.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha512 = "a4c3dd17640fff69deff932488c7322c687263c28d8bb352af37f7bec8ae442aa821782f011953e07b34c37ebd62f55c1b913a6fe6d634af41a41137c57e89ac";
+ sha512 = "edb999b2b27885422defea989e41c845b0f7a50d47e4f6e7ff2690fae9b911b9c0dd93e40a7420b1920790b5443800990836999e3044457acddb55781fb8a7a7";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/kk/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/kk/firefox-58.0b2.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha512 = "ddda306e1944d9ed37f9372ee247a2008c362235eacdc1f85ee2b875b88c968736e111b8db8d9954a3c6b0d31b76822b69968bf54394269f426ab3d4a3b11e50";
+ sha512 = "21eba1ee7a9fa51cb9967ecb4250fa305e3e516d0d69285a90b1ccecda6add2793fa035ef434626f4d9620374e91f1db4d8489a1454e4d611a529e693e46d09b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/km/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/km/firefox-58.0b2.tar.bz2";
locale = "km";
arch = "linux-x86_64";
- sha512 = "651cb45d7efbf85dfd081c0358def68cf1b98f9ac0025a00a112ea43c034d974a8caddc07460ffa2bf4638cf2e9c8730408cc2d5907e74645f3509861f2ee5eb";
+ sha512 = "565028e6aa408c734684518d7f3d033639ebf6ab3dbc74b682f291933f1141fbb7b758b0c1e8fed555067db0981e8a4f5d5c4e2e9c53d2ad066b8df269ff489f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/kn/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/kn/firefox-58.0b2.tar.bz2";
locale = "kn";
arch = "linux-x86_64";
- sha512 = "ace13edd7b784ae7496e6c6e7959e8c343cca43ef77cf9cb9fc43895720db85989b794228296af05068c6326e8704929bd2d3568b475429a839765c9c9bb18b2";
+ sha512 = "1f6dd3187c140ece200c16a4e80ff848131165603fcb38385842e8feeec5fd13db3d1ae415a8f428f2d22f20289a856bb3afc96d853cb9e31c5d1445a1a63dda";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ko/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ko/firefox-58.0b2.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha512 = "4cc11703b836f50e5797638922bd5c3fd79dcce4b200c1eb2036876569d317733dbc38dfaf10eaa3fbd4309a1a131dddb62ce360608f82aa08c78b1a383981df";
+ sha512 = "103a51778565afbd6423a043340e9bad47156fad51776106aa0342fca022ca6481f7b13b8f2a51d2e9e8b1982f50f377ade1d73bf6b152dd61c329fd3456a1ba";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/lij/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/lij/firefox-58.0b2.tar.bz2";
locale = "lij";
arch = "linux-x86_64";
- sha512 = "4f57f8ebb8a2d2d2237b23f703e791daa92f4692c0801fd63a1079c82f658c96b33d4c64be5b05c976f05cce74321d3cc0a3d09350461830fe89361b23a71916";
+ sha512 = "4c92f4803f094bb5d64c58c6d8315e51e764fc80c1886e9c18a58f93a93f8794a00a4319ed90ba60ecc9ec4dbcc37f3e8960a8b67261673806a19c8bfac8d989";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/lt/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/lt/firefox-58.0b2.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha512 = "1dc3fedf53e70e5a299ea925484e3c995a670fba7227b56767a4887422aa4da7d536baad2655432fee86b89404fad7cd239b4c814a545e7be27db6a2ed91b725";
+ sha512 = "83dcc50c0f7eb41ca6fb41a1b036b80a8ab4993334a632e60b9523eb8a4306db427beaf2527bc4bdd1143ebe6c0f4b406b1b9768ef8f3c03ce375e33cae6cc11";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/lv/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/lv/firefox-58.0b2.tar.bz2";
locale = "lv";
arch = "linux-x86_64";
- sha512 = "c97cdde91fe876bfb5da846e486d1f34ac9ba9f14d39ecdd53bd397c37fbe44254df3110d0854b3598c3a6e89883c220afc69293e09877fdaa49d7c286be5cdf";
+ sha512 = "27daf42869ae64f31d8d83f52e9d3f951e1277352276eb8436c2885e1a1de023b3985a0057687dca48ba69aed0ef03cf27770099e45a0fed5461de8cbaa0205c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/mai/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/mai/firefox-58.0b2.tar.bz2";
locale = "mai";
arch = "linux-x86_64";
- sha512 = "afe506e36a228dbf1c8a3918077bade8a69d51c801cbb274209055e6062c9cbca340e153842d9a24637c62cb6833f99e69fcf3b92b82ec16afa882d566cf44c0";
+ sha512 = "9b7c38d7d23f6604963f280132b16c0a949530d7df88f47a5328d1ced1bfe4cf8f12fd6540b54a4608aa0efe09f35f870f18c49d4a8cf1a95e800b541f534b79";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/mk/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/mk/firefox-58.0b2.tar.bz2";
locale = "mk";
arch = "linux-x86_64";
- sha512 = "b9cbec5c7f75d6dd2fc69aea6f182bd8682cc2974425973b5d7f42982fa7f69b384bafae1bdab4fa225f7965f9d2a37c0e127ff12d7ad1991f998b19deaded63";
+ sha512 = "1cb4b8304888fb9a4adadcf23b0c624c1ece8fb96a972f6d788f1b8936f05f8ab331df7bb949a4883673d193238a80919f728b985e0a9601f7c59c519fcf9501";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ml/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ml/firefox-58.0b2.tar.bz2";
locale = "ml";
arch = "linux-x86_64";
- sha512 = "2e7cffa6991ee2ee8018dfbed50163c6c905e1e9394ec880d92f12bde8d180ef6445a8f20c217f620b3ed19efc5505ab2b158a679adc97a904b83d46561ba0e1";
+ sha512 = "e801dbb5f71922d09563149bb12461d4661eb877bb862f04fea418b9fd488dfb871deb97c131aa680d551de5d46e2801545d01f17fde06179290e12288e5f74f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/mr/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/mr/firefox-58.0b2.tar.bz2";
locale = "mr";
arch = "linux-x86_64";
- sha512 = "9e3ffcb028a9809dc34969587585fec94c31e3f8561c969bec5a1f6d9c436ac02648185a56c4cb95a16b400d6abcb1c01293505c51b8e9149625bdd910523aca";
+ sha512 = "41eff5af28b452069fed8c8408dfe47b46ce192b6d0a996c6c5b0600e862424580c50251fbfbaaeed64d387367413f69ee2ed9819bebebf9fa67b2ff50e4417d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ms/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ms/firefox-58.0b2.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha512 = "29f08c10050013832f709bb0b42ea1f6a3ed191ba979efaeffba44e5ff27220c7bae9717d68a9478c2a452eaf0ef1e8da390eced1f5f7a37ce1ae5ee6f4bfa6a";
+ sha512 = "544e03a7a03b26a5b2f9da0284325234149faa5bafda74895f6ea29743471e302cc33b5398bb5d3e0f2d14dc82b6e8a8d02927e2a2e2c2364b3e2d1f20bc3354";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/my/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/my/firefox-58.0b2.tar.bz2";
locale = "my";
arch = "linux-x86_64";
- sha512 = "5f58e403b72cff6963a51a4e32ae55f94680460a658ff5ede90e859aa1de849c89abab33036cc194b9a3eded23b61d53ff9e9f98bb653785a1e60848e32533dc";
+ sha512 = "28dc75be5d3eccdff87eb738a909195b5832cd4deeab9f4f29915e372462e24c9160e0dad4ec9fc80cd14179bd1eb08e79ed96afed74ce053a43731b0a95ffbf";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/nb-NO/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/nb-NO/firefox-58.0b2.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha512 = "2e6c4cbc3a73c4669e7703b9847a52849bdde3a5cf332ff0aa76cf5336f21f62177daf050d655250e552c7beb4a05043cfddc276896feae1e03b5dade016e0c7";
+ sha512 = "6c9dbe11b53af3ef09b9520df28c2ae606fc8ef552518b8bbe3816a871333a061f504b113e05086ecf590041182e3baa134bf6d84a45b6a5eb3c2fa43cbeaf8f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/nl/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ne-NP/firefox-58.0b2.tar.bz2";
+ locale = "ne-NP";
+ arch = "linux-x86_64";
+ sha512 = "80b819ade71f4ba3034d04d3f5178b1f4221ef5930d5f5429c5cf255ade70ccfeda42d87da3f4e227446576405362dcade34db285addf1bc2474404d98f96a94";
+ }
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/nl/firefox-58.0b2.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha512 = "bd0afc4ef24c68e1a503ac93ecdb969a29427548d5991f47b86583941d2a1bd8d9af88e3a46b74b52b5957cc80d05a2dde659cae2c33028f87fc48beea637366";
+ sha512 = "a617fcf15d972552b2cb659fadf695ab5ef6953c7c81273ca7cfb5ef02d681c80d245ffa62c25a0ef6a894c9f1413245c50bff375c97e34b8a16ae30fcdf217d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/nn-NO/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/nn-NO/firefox-58.0b2.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha512 = "c342102835e18d7d14e18e1f7185547d1b2385ce4157554ee65e76766885edc62d1d7e4a911af206d2bf34caa0377b6e256e18c06c41082074a868c5a6367f45";
+ sha512 = "e124e1b983dae9ce9b595423949767980289169b9b3609033c34176bd8d6fec9e7cb13504a8d03c0d42359aaf045fbe0ba66aadf0566acbc80840861676ae9ec";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/or/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/or/firefox-58.0b2.tar.bz2";
locale = "or";
arch = "linux-x86_64";
- sha512 = "154b729897c7fa4e243eb42c7e365f658f3857b0b799a633e446ed1ef7257e6387d755c0534ce2cf81e0008caaa205c18ba512a3b3c4e6f31f6a5789674e16f7";
+ sha512 = "f7b8643f83ef6ccc0d6d3de8629808372625d7cd75d0bed8d8993d4fcfbf37764bb29ab1b2a2d3519cb6e5fe2d43af33e407a6295b1f770cef4672f20f1aa9ec";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/pa-IN/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/pa-IN/firefox-58.0b2.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha512 = "39cb1b7546ba00c9f2a7f5794c7920f6a110ccddc20605b829945cd85dd5172465f03fff0dfd3d22f67769c15f43130d5f034fe48e52659b864bed7cd5e869a5";
+ sha512 = "f3cfeb091d875fa35f2b76d5fd33c4766fc3d37dd4041b23e400e223d6be4e791a797cf95f534b935e6f40c28ba58b4394fed28c3beca7a097eb5616feb02924";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/pl/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/pl/firefox-58.0b2.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha512 = "a5d30cc38ec170a5d23fc721a91802c09ce913356217c34684887b292c523f9da5b0d2a16e882d324a38cac871f541e08c86446c36f8dd69cf2c6a60d0a2dfd0";
+ sha512 = "a0f5e040ce4614d82f5ff7fb5b6e16920299290840a961b8e71c5fcf9c9aad88092d519739b21bbd330d03aefeb25cb0c8ddb9d75792297b970ec741043c6ff5";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/pt-BR/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/pt-BR/firefox-58.0b2.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha512 = "0ac69c4cd827cb724507202bb88ef00cddebc10e7785a23ed3adfc0fc537e981c45d8141d299f6d6e6c84017cb16361022357750b69c5cf70e643d14e12c99a8";
+ sha512 = "d9de5bd80a4658a4b7fbda8b22dcea6104a77034e62ac66ee4906c2f71f9048c9f8f3b85bce38a0a4c6f9d0243e23ad4ccd6db8ccadcd3a1d79a034554b5035c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/pt-PT/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/pt-PT/firefox-58.0b2.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha512 = "34ce2df0f0501610a73b4faff1fee7cc60c0c0d675c60a769b99362c7ea82a5f780804f1fd5d1b010063b0ec5fa67db5d6dcf661b0638274563c0af588c86238";
+ sha512 = "ee24357ea59c9936f8bd4f2ccab32d73012b9bdc0f6416350a30a0c3a726a817eff5a275f689dce78c0256816f644b56e68ce8642632ff2394bb89719873962d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/rm/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/rm/firefox-58.0b2.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha512 = "8053d904c427dbe66837445b471793c80e23fcabc673f2df5090b9acde7f29ba38f74d786183b8d4a1808c5af0c7ec147a02735a0aab3a8d812c7e8d541e2167";
+ sha512 = "3fc05929e41b1da505831fd29ddc590b11c8cc68d656e6a29ceb36a8d4f1718d3e2c651bbe57dc6587d6cce08a71b2131e6310e3ea688f2950a5edf4dda5f14f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ro/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ro/firefox-58.0b2.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha512 = "6faf8c31b8457e11e627309c851ffac67821966e7d2f363ea54e133f25195fe35eb593de6b8f6698b01940604b4b5ba13b37259de6e24a817fc4cb402cebb52f";
+ sha512 = "8d204165cb4a8b4861f2bdfdee197a621db698c767443ecfe25751345fb651be01d3d2d18de8cba10e684f203a6276ee71ed5b1b99a43d1df943a9b5147e2fd6";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ru/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ru/firefox-58.0b2.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha512 = "1ef8163cbffdc6887cbc5bc26e999adeecb43d9ce45bc805da9c3d307659100a83038038cac411aaae384cf20c45be081ad1fc1211110a68d023ec1551e52b2b";
+ sha512 = "7b12852be30cba66d33b345fb8976d1edca871eac490d3c49f0ed89c48a772d48a4094dc1e52a32e103a3196f6bb12264b3fe46bf53a14ca0e5ed3eb49164d0c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/si/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/si/firefox-58.0b2.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha512 = "556eded9643cd1f482e6b4f83fb52e73d2a182065df441e7244256472dca276903a76e19ede5bdcd02c9facdbd09c7c2d533163e3165c68e54087b592dec4fc5";
+ sha512 = "7079174fdf891f983d0415cb802470899af11e792e3abdc00f8503116a007cec1177fc71f96f8b0b8d15576d2046690824d152cf7b5577f5cfbe0aece16c36d3";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/sk/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/sk/firefox-58.0b2.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha512 = "8b1cb4342ed920bba9e3770b6679817475205e9b18f94892cf86af0348a10530616622ace83173ad71b7889917dd0e6fdfce391b5a4c667230bcc63ee14f5050";
+ sha512 = "820e8465d6b9bae28a572cf7ee3d2b8594fdb6fe54879151ab327f93a1313cb2019687ac335ecdb64c5047421832db50c05b01b0b52303a0cf71d4a320900557";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/sl/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/sl/firefox-58.0b2.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha512 = "69aa0ed87116ab8c1d0b0ef1c086d014b55b7e1441c1c41a10377eab81ae0ff66516dff7be201faec156e541d17262aa1f46d82f4041eda791086906c7795826";
+ sha512 = "d1e55e5cb55c1894a39ec3eb11657c1ffb491f165af8e645f28d2af6e3ae481a04177345a76e91b769a68fcb2a84dc425363c153820be564ad015eaf27ba77d8";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/son/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/son/firefox-58.0b2.tar.bz2";
locale = "son";
arch = "linux-x86_64";
- sha512 = "4bd0d7510c9977013a9fdfd3453361380b497dc600b1418856a0652ead5625c67b1aaa554d75fa8c10dc1ff4c3e60fe2218a421c623ace151e8ad078c63fdb74";
+ sha512 = "1b46e24fab45edf3aa81535f282b73c8b7e5975b6f329f751a3f3300c7bb01fc77e08660eb01158473bc1c8ce2c1cb831da316d39ef4e89370b26d6fddd68fd3";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/sq/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/sq/firefox-58.0b2.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha512 = "37c7bbeaff9004b3facad06afdaffb2ce75e1a49147a3801113124f1e6827e96ccd41b38b59f5230e97c1f9060e9db4cbfd399b362bc8d3619e9f4c4786e7f65";
+ sha512 = "3e6ac70fb3f1c7dd7617caf254abd3f4c725019d56d6ccb15a8dffb6d5e5046ade6e6b50be8cf8239208a4c4458063c435de63ba7e9c6de4b93ebf3d3b7a8ca5";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/sr/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/sr/firefox-58.0b2.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha512 = "ca2f26e74b20fa6e1d9d43517a26426817bfd40f0d73fc487f7341485bc1ffec6a722cd1c3212fee03f0584fb7807b554465979bf8d8228f1870eca139baf752";
+ sha512 = "fe2164cd54ec4ae280432e26310be2ff167a990a578ec1b6ddbdbdc14563c0e49f87dcd6358b745aaf6acb258b385dae97afb2a1fd6106e5dc269a0845740114";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/sv-SE/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/sv-SE/firefox-58.0b2.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha512 = "9233da6de53b4304e19b27a8188314ee42ebccf49c65b48c3bfc5a06f9ffcd2cabc4843f2995f881eaa2262a9a0d8f1e6b68943d5e1d81c1290dc1d21adf3e14";
+ sha512 = "c79e3ff3c3a2cecde79e2e5b24bb9806df816a4a1fc3d0f0aae67471e4b107bbdcf6686414fad8e3626799f12f8d818023f0b71bb393b1770eff38d6169d70c9";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ta/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ta/firefox-58.0b2.tar.bz2";
locale = "ta";
arch = "linux-x86_64";
- sha512 = "12ada3e1b3816c257538deacb8138819b4924a900f71397c95286f37e2e941c3705db504ae4f5a964d6af142a39305cb9ab5a63cd2a3060047aa55fb6c288f4f";
+ sha512 = "8266408b1f4e0fc2b96c0cde463619675f7038824c3ebb2c97186e79736431b77b35e0ae62fe09064fe631f07b77eb19becf6e435d4fbc096f41020bec291384";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/te/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/te/firefox-58.0b2.tar.bz2";
locale = "te";
arch = "linux-x86_64";
- sha512 = "cf2bd733d492edefe19af9ab68f36298e825d66cdfb89995bd20ffc3a405e078af26e6a7f07bdb1b04bd09daa516b9dfced7fe524cbeace8b9aec324b8826ba9";
+ sha512 = "110dcbd4c13f9d917f78094914a25c8f7d80d44aee9553421130dc526c0d6c29bbead1e5fb2f778d955bf65436d983fea429de6f73b9328066541841f7475e02";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/th/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/th/firefox-58.0b2.tar.bz2";
locale = "th";
arch = "linux-x86_64";
- sha512 = "dd6c976d58a61a50bd6f6ab3773c43f778ddb08b2dbef7ca3709219ec4ddf14db479fa8b9a9136d28875bb71c493b085b9e668c5f4d02dc307c0e350be2b81f3";
+ sha512 = "1533d96c6f0e23f38c113515e7fff3caf99915035050cddab0ca021b176d7184b80e9bd5ac79d809a0d31b3be987f9e31367874b4c35adbcf62a2ce685d41338";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/tr/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/tr/firefox-58.0b2.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha512 = "6bcb6a25b985261506e47bf984302153074811c88f2134987a15651f96d2e373ca6867c3509eddd34690e2731ea0552c575097b3e083e9fed8d9aaf03b95da75";
+ sha512 = "da6ce35769007f140b9732d7d429def5267f733d8674a7a80b11aa89aaa7514743a61d1f22210bb7368416f570d7f0748609b31ac72ab80ffe0ef7fea3397bb3";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/uk/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/uk/firefox-58.0b2.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha512 = "403ab45582319cc2ded9c5f6c39791cc35e040cba808ab416a4d6104accfa75df56f858597c714bb5087f41471e4dac54d0f6ab62ee767de6925ccf0a10097a7";
+ sha512 = "df03b9d2bc39c4d620d1886dc1d22eb70289fe8d6fd7ef429beb8170a95b5fb1fa15526b9b68bf774a3f09170d0573f642173a6302f8dc9acc41bd9f2604773b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ur/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/ur/firefox-58.0b2.tar.bz2";
locale = "ur";
arch = "linux-x86_64";
- sha512 = "4dcd348076640ae39ee104cde115e6b207aca400cf9fdfc65d00334271e18ba78fd185136ff54211a162f32f0eec46d696f3c5a02ae969addcce95b839f45260";
+ sha512 = "a0914042713f9fb91e52e35eafe4b6a666b670e951b4e6c3ed3945804a5640d06c5634eda943927a84ba274871242a4495b754280e4c601fd69c9e054f1b8175";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/uz/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/uz/firefox-58.0b2.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha512 = "f6d38f2de149b4fb2494582e6ee3a562d4c7af71aa957ba30fedc9c1cfea314d11849fc1c8a11d19cc43045d73c1939845f1fb3e334c4d32eeb0c2881b9ca724";
+ sha512 = "22eb91f33b22b43a81cb0039aa2f11bccf6d83433897d0607d5a52c127366a3b75c18d1df2ab985090a724b278bc703e80370b8ac765bd891981620b0ae36a4c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/vi/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/vi/firefox-58.0b2.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha512 = "277f09e65c5d07539346282b9f70a662494a2c5640c78ad56089e0c50c651ab0c0fadabfb67148bdcc5de190ea83d1abe70c3aa5fc50ae1cb870937d10d95be4";
+ sha512 = "e6801f622d134be7811212ee8ed47bec259eea1463baeac098ec59e5687cd2ebe42d77d42fa0b18f4a054c7a392efcb6121ddba000323998901f46ace3a7fe4a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/xh/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/xh/firefox-58.0b2.tar.bz2";
locale = "xh";
arch = "linux-x86_64";
- sha512 = "e541a068ccd072724fb19a0bd830a2a95665a20a08ad9e398be02545a0a6ae8488d3f30f8dfa25c1149df2a90eca5f586fbe116740cfe630efbe00f002d3278b";
+ sha512 = "0c0ec3f3112ba5cb7a8df9c9c69714dfc585539b4a13632bba94c8e58b7e5a44a25ec4206c7d656fb31c883454a337e5c3cf24ba67d758fbe9841207c4b84249";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/zh-CN/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/zh-CN/firefox-58.0b2.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha512 = "3f9163e25fd67048456bcae71c86c287d5052c45caedbb19d6fc65e421d1dbc66cafd61582137b7e3a6a5535fb19be110f93d11ea1cd6462f5e4a16ac2bac182";
+ sha512 = "789602749a56379b7edba5bf5ea9acd1d950782408f07f0ecf505575ef5cc94f580a601d26c4225c40d49eced4d844fe4213be2df52c83db7788b4a42fc10952";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/zh-TW/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-x86_64/zh-TW/firefox-58.0b2.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha512 = "12508fd22dc5ec22cb272ad8c62150ca2d7ed680e91d398e304ea07633b55eba1b44ef7668e3b0510f0ef2bd21c8d83c28ae07d2f519e138b4100c5f8fb35ae1";
+ sha512 = "44b7d87e066ffd2cb83c33dda0ea3edb18cb0439c3ffb45d78fc07109e370b6b8cb7e95379423162928e9f81d5be773377716af774f8b3378d9214049bc73917";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ach/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ach/firefox-58.0b2.tar.bz2";
locale = "ach";
arch = "linux-i686";
- sha512 = "de723b9dca94cc4f35c329e2e31596df20e8d873b54cfc0c4d0cba1ce27b25bbe7af37f50cb360e933b4ae69b1e9d9d2874a84d4357d39d7ec06dbd62fbe9187";
+ sha512 = "586c8cb8baaea42e694dd5f9886df52c4a34ec8224863127bd3b87bbe2594420b90a644c7b414b85db98714eaaecae88d8b91fe78351cf0e113dcef89d3e0087";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/af/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/af/firefox-58.0b2.tar.bz2";
locale = "af";
arch = "linux-i686";
- sha512 = "ff3da99e585bcf41f1205e62e2d2a0f7aeaf09a8d06472d6d26c74555ffbb8600fff7266730459cd2596766029ef968f613dd2e793f444ece9967a793754de14";
+ sha512 = "5d66112bd0b361b7a064efc184bf51d498a61a58ac97ff4a6d542b7c6be6f1802ec7da9cf89fc554f8d3e8ecea28d3d1c694cf47b628a15ddce6bb24589be525";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/an/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/an/firefox-58.0b2.tar.bz2";
locale = "an";
arch = "linux-i686";
- sha512 = "8c9d07c589a2fd0f6fb6229a3c83ebf26d07e4535b915fbc737e8a54c64985731a7101e6474023e03c048d30c34c57e6d0a47c530a642072167093671a67f144";
+ sha512 = "3726fa3ebc4d21b02a7165d12b0ef8fe2c3ab5b204fdcf6e8b71994ff48897631dfd220708da0365cb875de8b6e20ea0db416654d0de471989f8cc57f427e64a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ar/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ar/firefox-58.0b2.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha512 = "f8242f8bbfd54bef69d9480c1a3b78811c91332ed26b1ab3db731e9a2b4633b4db1e5dace3f8351210f38f383d9396d6372dde7b1c3c20a99a4631d095c387ea";
+ sha512 = "ba99e30e7cd10dad54df7331087a2667d8ee1397c1b184f7deee3ed15f7c6d6b111592e74be320808bf67846d1cb7278270a47cdaf9db1d0fd671387371a203c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/as/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/as/firefox-58.0b2.tar.bz2";
locale = "as";
arch = "linux-i686";
- sha512 = "830cd3edabf5584fad8e5f77201b0980859b2fe8a2c6ec5c0ec886a5b7fe1c81c3513d93a9e99b6ad350d3d699376ba3a027caea1b8b092137f580379cc34d59";
+ sha512 = "db6035cc1b2a6c04ae79e4179dc5f1a64a910a0c8646e8cb93af63460b5d8bb5a07369b93dd4c703d09a39693a07c3bfb913e4ba6d45aaf3e125c407b38f6d6b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ast/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ast/firefox-58.0b2.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha512 = "5ef46e285b2c7015f8c0de1a4cbf59883f1ad0a98ae9bd4fe2a5ebbaf9f27ca5522233517d7a50281cf75375a3cba0036a0d77d493e28fa8230e4af3b888456d";
+ sha512 = "42496b6755ef735527419453fab12497a8d6762d176faa8b0af7338c2e62cba2f2560ba0f7a22d6eaf10badeb2caeb6367773b19d2717c1bdad64149d74d0f98";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/az/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/az/firefox-58.0b2.tar.bz2";
locale = "az";
arch = "linux-i686";
- sha512 = "6db4270e17b883c6970988287a365497a5905f12c581ed40e442712cc61f61cb78f82dc67c5d1806f61d31302f6e914df95f3116c96404c09c07945de13e6556";
+ sha512 = "c16fe3c909a0793cd91f320f94fe309e1f0b559cc84fb01ece5bfe455a1854701b259821f79fa6db8cdb6dd630a477e55e51793947661e0b3fb8aa26f3c4e22b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/be/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/be/firefox-58.0b2.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha512 = "779561717f27e6090de5d63646ae0ee7de5b029422889a9b8701f30cee2ab1e1c7737f6d61a6f8bfb7106b7f05cccb060a7cb30f8bb593210ed7a04d72137c98";
+ sha512 = "5bc3b984ad38f105a922d1c614e1783d32a84956848f51797d4f1b3b5b9daafeff0730d103bb27313840b07ee97be73c30d6674a527f57ea7d95542742a06a00";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/bg/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/bg/firefox-58.0b2.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha512 = "889172aef9743e4a38cbbca387528e03b3a3c9882b2a2459acb0da697bec2080a51491cc0998955921ebbfad4b272f0f82ae7029313209a887984a768552fcb5";
+ sha512 = "50f64269f264fe1c31970b43d6a0a8860a563154b8913b9a6d186398a6e6d80baf37bc0f091a6ff49115d44d01fca550cf1d65c16dc77d6498a236595be2779e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/bn-BD/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/bn-BD/firefox-58.0b2.tar.bz2";
locale = "bn-BD";
arch = "linux-i686";
- sha512 = "0b93d432172814b44e5d879f044799c0d6002e8c631766a43e892d76fee156614fb64ec5333ade7bb65451c73d04443d30202d054b8c7dc2d82d3e63b196d472";
+ sha512 = "be9cf4bfba0a65d491a586a1ea2ed6a2dd1946bfa715401763b3067c3388b02a86a1d53a7295ea6ed6b47cabdfa342d0f0ac6598e62f396baff74db5858f0c8f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/bn-IN/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/bn-IN/firefox-58.0b2.tar.bz2";
locale = "bn-IN";
arch = "linux-i686";
- sha512 = "708637cca38914670df1a237fb5b3d30cc6fa93f75c9b13585fc1d80b11b986511139aac1a984e0ce27143e554092be538d91a9e54841ea44fb5feec9128eeee";
+ sha512 = "f448f52a639102c82396633f62741861cb2a3a0434a0e7185c8ed6e70b24153e606a5ed22ff003ea7ac2aaf6996135e7094e5d0226bbb8f143f0f3871daf5ad1";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/br/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/br/firefox-58.0b2.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha512 = "0343c096b3b9c98ca65a4934aaeff8d08166a2b6c806ed81cf89cd1942cea9bfd2464a42cd54037c5bd78b3c05951f29710894e852ba65f24c5f7bb0cff3f885";
+ sha512 = "f52471ee4b82c820813accebfd6563494d41ce7949449ecfbb86da45c0a4f36c0894b830ac33f96894b02e6785cb8389a965d638f75cdd04018730cbae41c7d2";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/bs/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/bs/firefox-58.0b2.tar.bz2";
locale = "bs";
arch = "linux-i686";
- sha512 = "00d309e92d80941318ac41a56ad41ffe3fce590ab084974bf2745ed7be2637192829c4cebf230a86d77d2eebf9aebd19495b4674a5d469563ba00b124f526a9e";
+ sha512 = "9df7d37a1cd531c43cdba491ac5fb844c20f335058858cda88bd9934bea097d9d170e18b3b29ef0fbe5ca2808469b75a4eab767b37ed2e29ac7cf2141ade8f38";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ca/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ca/firefox-58.0b2.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha512 = "ad25a897f3d9a58156f1ad95bb17da94a3fef84603da874cbd12db8b0f51868b95e8157b71cc8c1b88253b043bcfb5f58897f052c20f4ee703afcdcf3279a15b";
+ sha512 = "43fb2e6b9945a4586070d433fe080cd2b9b8c0923c12ca084d6d21dc3e22164f470a3c791b5af181aedbe1d76e78cee3981c7fd1872f45815a8db267a9ccd74c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/cak/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/cak/firefox-58.0b2.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha512 = "d10a6222212fac4f69b2cbf5fd82954160dc6495a901f2e790fb5dfdbac5548f017d611df93b5ee74d688b53a0002f8927c2d360a7c2a907e2ce72d3961c06f9";
+ sha512 = "7a76be4291a5d3f6bf150f09701df4390d7f74c0046694a220f4511468a815404713062ad560f75d35643548065a2340bc70c439e23ae14272fbc20375f5901d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/cs/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/cs/firefox-58.0b2.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha512 = "f18dff7152d0b83955ad8221f1b3e46ad0b34c082f0be17296eb459639addd076060b26036548b79aa1da73ac11a53ad82ea2e6069e12babc90570e23ea8681a";
+ sha512 = "d0a8c61960d2289b5402f718db28a6ff355fcdbcda77124949c420c3023b57595559305dc763165550f0453ae0e4a01cbbd3fc37e6af9540c80f857c8b4da00a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/cy/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/cy/firefox-58.0b2.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha512 = "04aeeac12aa2ea1ee0064daba05f33147c376c3f6acec38abd64e794ec78f72783ae865ec17b855c165c80990812ee3e0555ec55e24592806cfb02854379e32d";
+ sha512 = "85d9dd9fbaa72ff350d464015f2ca2e810a66d2917f19a7830ef50548ea3b5de1a4e818fcdacaaf9e5c7009cef391bfd3818e196d89483abc43a1badadcfd41b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/da/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/da/firefox-58.0b2.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha512 = "53034182c7115b8f2a24662823571b290f86977e2be663dfd40c02d9a8f2cd5db3d3563873af5cfff89bdb67e7a2e60c14c21e755b070bea0a5942c2821140ec";
+ sha512 = "f7a87024c27c0b7fcdaf5cee4c31235043c1c506003e04c71e60792dbc9a4cb3fdb972b335c3b6eb10fc9774b36dbb2f6b415ca90f4547c6979bf4568876075b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/de/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/de/firefox-58.0b2.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha512 = "9a1ee91fa95b6ca8e0618dfd84930c2e41cb03a1daf33b03ac8ac9a92e113d43ab41e922537eee477bb5e706c7f018a817dd640460df5cf10288684811eb9585";
+ sha512 = "b4f1fabe3de50583afcdc27a3599dfe9d2a08f2e8b1942aa0045df6059e9686d2f2f1fb3462c2e21d9e6fa1ef5a7849bffe2cbfe1d18bc70879a98ce8fad8718";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/dsb/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/dsb/firefox-58.0b2.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha512 = "935e7ee75c34045393dde791d14be3f4f7c5d57bcef5c4b8a6e291941acdb21550e6b5aa54bb559f3deb64cc6922f4709bec360fd62273b4b693718b69de532b";
+ sha512 = "0d85cd11ad6c28c87d6df4dd9f5f16dfc37f885b1686ff85ea051bddd6f5b2db43db0a6b2f71998eed707533416b6af5e4dba209b43586a76e74c03ba26cecdf";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/el/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/el/firefox-58.0b2.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha512 = "371d5b023d63923bb65acfdf3d4d7efb5acfff3b2b6de7ba94e0b475b7e45b268612303373e7b10b420ca2c398e9eaf340dd481390f36c5a0b50beb54ddcfc1e";
+ sha512 = "014ff2a89bd240bd32399732647b4c0cbb47ddb9e5a7705be56eee3df8c8b2c95339be61ed35893c4a4fe03afbff3e48c9e03d44f0cedd5c3694ead76d4ddd19";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/en-GB/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/en-GB/firefox-58.0b2.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha512 = "c99cfd1283ab71d78ab8311616ea6645cc1d492dfb5091d2bee19299ecaa9455228639f85ea366e7b4ebd28270f06446897b1a99c9c9b54bb2c69b4f4d3fec1d";
+ sha512 = "e8746eac5d253cb2e5968b0d2da6b596a3b14baa967622528d03db684f9b507cbcde59fc0ed6ceb64d4eaf5e1767abf1fd8e8b651bfbec1beb9b7a5019c8ae4a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/en-US/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/en-US/firefox-58.0b2.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha512 = "7a81c06e4b85e7e839aba4ea4fb41f1da871c3de705a843c013965648b1bedea86f0ab73a616b7b864da10da0c47624819178063f2894508fefd34d7971e3714";
+ sha512 = "ad0b071d92c3a882f81b7ac3e295e4234b9912bdca1ab70cae0d79f17b3f5fe04d30c70e91f5639b8c8e0f6759988f0f7bca3a0d4771ba3b60c63b08bbc71c8b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/en-ZA/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/en-ZA/firefox-58.0b2.tar.bz2";
locale = "en-ZA";
arch = "linux-i686";
- sha512 = "4f0b171169b73fa526e25a7c7c9dfa1a0fd557fec07b69e761a948de71172f733bc2a1d2e3d1f44d6deed0f42568279e78541e32352ba1a27fb45274d76768e0";
+ sha512 = "4434b81ad8cba0b9c380a73feef18eeb1f1c043842b24a13dbe1059285dd0d4c6168f358a38a31a143e2b0f7c2d19bea08734d02a5f7deecd2a185226ae6d694";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/eo/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/eo/firefox-58.0b2.tar.bz2";
locale = "eo";
arch = "linux-i686";
- sha512 = "d992ef007b02ec7c33b8efb7d69f71a9656d410dbb30ddd3c2a7e39ec6f358ea02fa9404af84bde1bf0da524d5a359655847d729f10a877e81b3846c77a74a15";
+ sha512 = "1f3ab8f6e3969cb9aafb4fc8ec1e8af9d2f883e4013851d822bce47153a1d06fd689e0e2230ebb0fb3eea81f140f4cf984a4b5286325a576bbf5668d5c247346";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/es-AR/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/es-AR/firefox-58.0b2.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha512 = "5e4303d24df249bf07a84e6f76bedefb906e8846db787c12422890240faa3c231e9b87afb1fc210ccb1e8b3abc7aafa84f1896d535d7e1c24854d87971be8bb3";
+ sha512 = "b609c22e7cab67feb44be92f8ea3cdc86a512ee96c56c82273013a02c795bcd8da4ef40f586c94133118ef5ccc7968f21a27cbfef499bcd61be069e55c6f9567";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/es-CL/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/es-CL/firefox-58.0b2.tar.bz2";
locale = "es-CL";
arch = "linux-i686";
- sha512 = "0be7306ad2da4072abebea8e93ae7a826e7f4be78855400fadd930e9d7d4f114b7c0e6d830a571da17d3c67d9fd3ba7b0d3fb861ed8f61c7681b3f23dd8bf381";
+ sha512 = "b6bdd2abeff665239e8f246940ee65bfcb54f1831d34aee5264b3e7714ad6819a5dbe9e3107d169cbf8f2532bef1d68bc40d185c281977efd8a3f8d918b06388";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/es-ES/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/es-ES/firefox-58.0b2.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha512 = "df9e70df387da42984bd27e5f032e2194eaac20605c2c50be0b41bfbba2a1b71237380e7ad68ba02da3ab426575f5dcdcaa7a31b3871b9e565239571699d9fcd";
+ sha512 = "672afad688d5a03a1aba52d9ca29073dd2e7636ad049f98552978cc98285b5794b5ab854c78d169a14825455933413e5dea5d4779f5ef24447c1a414361fba37";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/es-MX/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/es-MX/firefox-58.0b2.tar.bz2";
locale = "es-MX";
arch = "linux-i686";
- sha512 = "cb021bb04ed655c92120a6dee9f65109ce5951d1496c5acd2aee2ff0e8204e36e3b226cc08a1aa947cebc693e84b41c87de91edddcd47265835c883f6078dbb4";
+ sha512 = "d10de0d07161e4cca3a7ca42fa7ec3941062db191f2d80325770f55ebc080be2c8ff9b3b8b52c47cd8422f6811696fd6dcad51cf1c2c4fd6c976bd197dd39251";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/et/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/et/firefox-58.0b2.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha512 = "c3199f20eb4db23791bc7ce076b97bf08bffa447efb15542c34f2e6def2ee64bc6e2bdaf9de094eac35ace1bab6693bfab4f0ea0bccb2754948cc9fb13a99989";
+ sha512 = "c3ea53b3422a9cf101eb737d2cb511270fa4b0370453dee86c74f6cf9f36f6d7a2c4f36b85b760ddd089bf655f540f8d12a1d59c259e8beb26b69ab345569785";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/eu/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/eu/firefox-58.0b2.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha512 = "8c168058d15a7b0f7fcb72bf8e25de041a6c8ff8b70744645dc03c57b7380a273d419090779ca755ee114b997e6beabea060542df53adf6b4dbb32527425b15f";
+ sha512 = "1221a19d5fb265cc86fbe3a1f03d99d0d5a5088432d89624ce7c00f26dcaca5571f8b136be8fa65f4c829e6b5a371d22d49dc7bfd0c31f3c168a4abd7d49e8ba";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/fa/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/fa/firefox-58.0b2.tar.bz2";
locale = "fa";
arch = "linux-i686";
- sha512 = "2c263b26f64e565fc4873201e21cc2cae483ae691f628b4252928f3277d919eda1a5b3b0504da04a6da3df8875dbfd86d2aca440c9fd65fdf31992d87842a3b5";
+ sha512 = "575757d295a420921db0528a8833cc69a7aafb13e4a51c63804b8c76517497f63e84aeb4972bdae0e7139233be50613c26179b6d7cd066beaec2d8ecdf429d95";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ff/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ff/firefox-58.0b2.tar.bz2";
locale = "ff";
arch = "linux-i686";
- sha512 = "089903272e4245ac8cc4b3a2f60809a2b11affeee2ba1befe03031bf05c8cbef239189f2a729d0489cf5593ceb9ea5356a21039b464b25c8f4613bb7ac787e17";
+ sha512 = "a729c190bb3579ef4fca48c837c886f152bfcb550c29fe01a65f6f1186b7e80b71dde3a4f45ab80f282b04868cbc1291e1949a908b7075752fe0af7409c3fdfd";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/fi/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/fi/firefox-58.0b2.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha512 = "a9f5bcded43b63766ec18f2a846b3c4c57fdfab15a0a570eaa10b9b09b817abe63eb7e9ed67bd6e1bc31805582b8458ecb3249c125aaae1803ed5036a66460c6";
+ sha512 = "ac7a6844df3a0183d9516e3f526d6e8729b831f241926add256eb790be4d05ab58c62726940eece24b0be6dde8530c62280c744b00117312e937bc024b16d197";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/fr/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/fr/firefox-58.0b2.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha512 = "4689fba26647f5ba64eef2e8b188366747df8c2e957fc903845de131969e25aeb25b8f4528210be0c6d4a6a5db8a21079e1627aa8edcf087a5eafc8f9b0f8f2a";
+ sha512 = "f46400d33f72dc888ce686e270c981b0fb11b68207d89297288010df325a71b29f48200c34322a5d9ff493d9540aadcf5f30282fc1da0dff75cc63548534378e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/fy-NL/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/fy-NL/firefox-58.0b2.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha512 = "c9ccaf00b75d0032f3fa7c79bad37e672b944dddcf07cb6783b401a4115e283ef11c90684f3a1a589a745e08f2dff9e27456509fb78a6f894e83c24cab141185";
+ sha512 = "17e6da89a57a34e4609acbffdda18679fb446c3d931bf5277e10099f3ceaade22bd9db41e9d38da6db09d9150888544c6619a818a50737b429a6f03def94479b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ga-IE/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ga-IE/firefox-58.0b2.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha512 = "a62af4ccedf1b6c443a13efd6c41b6d6f492f31d1d7701946871ffbbf00df000eef59eac69292f6ea8be64d9512d064ea86d7cdf07656b8ab2bc234106468db2";
+ sha512 = "5671564000d63a401e40db275a9ac2f131c9a0811b0165cf1f1d3769324eb481b2de95a29f4b3cb8935ba9808ece9bae4e7760c14764c8521cba1517bfa69626";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/gd/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/gd/firefox-58.0b2.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha512 = "177f3584b81bd03ceceb0f7083114b38ba826974b115e962d8c6065c001aefda7c65c273c1a833cf7dabd24b69e0c42079ccd6842f882f196de1a2fdb7ce8605";
+ sha512 = "f7c280869b2468c173f0c45a92301c16252365e5cd1fac0b3ec7a3e779325f0cb6a31bb89761e37b697dc5f1a5dcd8160d935769a683dc656f89ffc29995e782";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/gl/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/gl/firefox-58.0b2.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha512 = "6dd9fc8420093f8faf0eaafbb1cf4326360d610593fc8642e488a3850d9f94a249e27c89123eb3a25e476100b63fff1a88dc85f3e5714080ebc9078dc9309ca4";
+ sha512 = "75e161834e33a4d9e761f85b2cf1de2da88113503c1235d26a2db0a0ebd815ec12e6d5673aeffb368dc6f75877c52d67e59f27ee44e9eddea8f7efa17b4b040a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/gn/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/gn/firefox-58.0b2.tar.bz2";
locale = "gn";
arch = "linux-i686";
- sha512 = "3badcdbd0642ac510cf978e978ea7a9fbd1d6a0de7ca541aa2eba16bd2b788b5616fbdaec06a3d29975c6b4fbe8894b6f38e2522a6495b4d8d1564efd4c2c656";
+ sha512 = "5aeffab6468ba08c15d74cbbda355a8c51132d8f09f5d603e61c6caa04f1c57a3cd659463454d967a8fd68a17bda9185a0d281368381bed772d1b7e8c5722fad";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/gu-IN/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/gu-IN/firefox-58.0b2.tar.bz2";
locale = "gu-IN";
arch = "linux-i686";
- sha512 = "85b254c78925a8f30798e37afe5e452c50bbdfdac683a16cb0407c8cdeb1a9dfc23be4f7bedd44c8f434d2d1b16b65603448e356e5d82ca41bd698bc275da80b";
+ sha512 = "89d204f7b931897a9a782eaf99b5cda7a049d35f7e4f3336b3f941d6234ae3984130c59a352052878a72602d6fd21e9725ec51fc2bf990ab395bfccc1ce202cb";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/he/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/he/firefox-58.0b2.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha512 = "49c6aad468a893d77f9b158883095fa0429e4acc0a18aff2b284cc90036f11a04de9951a2fc18ba87ecf1d3fa6c55673e9e0e69428bce980638fc270356e11c3";
+ sha512 = "7e3bfa2d8fc1ab1640bd2310c596451afc25ebdbf5b0827e218afcc7144b126220bd4cc94c8c769c20b6f00c6ab338adf4602dc271a3480caa1db69b28e41409";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/hi-IN/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/hi-IN/firefox-58.0b2.tar.bz2";
locale = "hi-IN";
arch = "linux-i686";
- sha512 = "6f64ce83bfd5156c6fef02fbd0e7bac47f8a04848ba5da619c9809510b1f1eefba396c3c9f48ad6f9d0ee700e2b19a6edf1f0b104ec05bc798c22b8dd2b4a6e7";
+ sha512 = "803312f7e912059d05c88a1a6f448fdeede2aee53532fd67d685ad64c4961dd125c81ca9792a2ee781269221da738fdd7c76119a3b9d4ce6b9a5cf579af90388";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/hr/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/hr/firefox-58.0b2.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha512 = "0c4f520f2da27b1a5a59bfef7fc9648b9794bf0e4e471082f0527471bc824ce999ca668ac6cfe39566eee81cdcc66d5a09a15dc4aaa528345786288fc4ee4531";
+ sha512 = "bd4c68ee7fd5d7ae80907111f184825b94b1f12d02019cdf1511ec76ea98098b1935953b5c5759f28538f110a71cc7804b2161d29b8b3835a481f6f025b70448";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/hsb/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/hsb/firefox-58.0b2.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha512 = "b7753e082c93d169aa559bbb9314de29cedfb3bed336e9b2bf2f4514269fca3ffef52e5298322c9f5d354aea160bf0e1538cb51f570a2c29d504d398c6fbe262";
+ sha512 = "6d9d67e98cb39884b54e068b471d5e16e38897105ed890f14d322568a910fa29c5a3a927a31215133a8635e47800f8863afcfb7d88243b8cf9414b450c70f44e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/hu/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/hu/firefox-58.0b2.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha512 = "84642ded2af2d558cf93960af568cd224ebff05f13f26d4fca84425df14f6ea8ad3ff459df16b0f035f28697723a264d2f3ecf8121022ba9659ed47163faee7f";
+ sha512 = "2f07c74f085e7490ba851448db019d7e0d5deef9a74e53c7e0e3bc13d4be5ba341032b9c63d5f2a7f631883858046d84eae5612166e966c330bd14777015a6ff";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/hy-AM/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/hy-AM/firefox-58.0b2.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha512 = "fbb79684d496b4780bfeedd2d682fda002bd190f5148343d3f3720673d2dc26609fdafe402feb96093de0db960135293dada87218612bec562a6be2760514a77";
+ sha512 = "91440eb5832be50208473b6474c0f13d794cc24a37b2f9a160b2f173fadba946b934fe0c0867b7e3bab605da6011f32fe834825f2ef229e0a20813f58097ef7f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/id/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/id/firefox-58.0b2.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha512 = "405635feea5949d6ef58632809fc69ade5f77f6dd19f0c190059698558c429f28f94fdf08612c0346ffac4e54bbe806dd6c01ebceb9202a4c7911f86ccb1f747";
+ sha512 = "b0a2504f562b902bf0ff11363c44bc6fece5c327d0acf9eb8f0b17d5750846df1ad1414c17387a39bae5f1ac33de9198b05c55b0f2a97590a29e6b9c243ff20b";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/is/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/is/firefox-58.0b2.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha512 = "5c6e9021355b7e9bf4d13db20d7bbb09dbcb94c4c8213e2aa313b6a451ace1bb394e31ded52d36ac80770b64bbd7b9cee93c7df233338a6ca9e4e5a8f0a8fa80";
+ sha512 = "e3518d927758c3e6c0bf73026b3896ec44cd5bb0abc3e0a8e280e458c66b70a32b15d53a27b97671335fa3a00cc7a88032f11458962e48cb1e984aec6c22dea5";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/it/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/it/firefox-58.0b2.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha512 = "2fc8eb314a9328cd91029aa28234acded5ee1318b2708fc167171f4ea8cbe25a87e0130ce3c13300fb15bc5e8d09ce504da9ea5ab46cb5b01498b083d067499a";
+ sha512 = "617dacd7122d8920c9b51974136b7834c079adf0486e9476f4e203805621864c47138a6bb79f05496f075071d37e45baf6279815e17a3640a805e80b7489b61a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ja/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ja/firefox-58.0b2.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha512 = "5cd5fe41c714f9efcd7a0d4aef259c01ff4a3a0ac05ebfd6b011fb2984f1399803199f7f91703fb55e3e4cd8d0032bc6469065dade99a4290dc2af1109fce044";
+ sha512 = "a0e21fe3a2eb933ebbf379294eebcf3c9f59f5331d4ad7959f5a1241aa4c0a90aa018c901d715274b12b2bde9533571ff164bdf71f081024dc0810e838f73fc0";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ka/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ka/firefox-58.0b2.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha512 = "1e84b3d9fd78c884a125a18b003dd03834b6ffc8cffae93644bac3d78e6041cddb831ceda58d5d4d461e3fe900204d3916a917d5e5056e12684a8ec471df9d20";
+ sha512 = "1f33af1629bd806aea449d429d7348362dcce82a5a02ed4930375e9701c700eebfe5773ef492fd303f68d86dd3ce47cd7c3f73e1a5bbf3d82bda1095e696cb55";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/kab/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/kab/firefox-58.0b2.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha512 = "a650cdebc1c89f5f65d60f36449650ed36f9ab79b4e5bd084717f88c089312a105388bc6cf6cb6b05aaa05ef4168225ec1378d574f82b0c7ae2fcadd9ba549b6";
+ sha512 = "84f8b464d56f70ece330d6cb5dcc9d7c65b201b4365bc030c02c4b9892ba8641e8686e0f0419da40d620397842c4dcf0de58e9cc6776108e99e9659fe0997a75";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/kk/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/kk/firefox-58.0b2.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha512 = "901a7f524fb6cab92a6f686ae2951ac4668b2373f0306572b4214b9dff76762e36372afb6d5eb319eafb0c1595a62a8020078938a650531dedf26e4951f7e519";
+ sha512 = "83774a6b52db454e9a8b18b1ca7199f52ff215e5e35fe7cf0d86de6ae61af3846eb25510fdc7dbe670fc227688ee97b1ac6f25fb6860575431500a0b02eeb4ae";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/km/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/km/firefox-58.0b2.tar.bz2";
locale = "km";
arch = "linux-i686";
- sha512 = "a86ad7c74e87ebe0e4885914a07e352349d353507708e79e37be2af57653f4778f0203b1d72580909a725aa696e8e8f491fc817237f553f526400aa47da0f03c";
+ sha512 = "6d64e1ad6f6ae88c4d32b6ce96c7f72c03cdb1d13fd25c819e8aabfed07b16bc1ea308f991c8671b6812ae2f91114ca14ef8049bf0a95dfa4b79d11a38bc8afa";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/kn/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/kn/firefox-58.0b2.tar.bz2";
locale = "kn";
arch = "linux-i686";
- sha512 = "6f8e697482ac61565c2030164ea08fb92803e91cbd3f562ba70f982b2db7c0d9effea7347acf3a4cdaa7c7cbe393a3455b4a7333957ac2ee707f5b542ecefabf";
+ sha512 = "46bc7f686d971754d1ca3040fafa5573c1b4c6df63d91511beed6848b15717e4820b1a1ef842ef5704dac42e51cd6102102f0566807a2b1ed86f8fc5d8e1cf2e";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ko/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ko/firefox-58.0b2.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha512 = "83a7ce342c38ee014142e60590d59e42373a38475a36f4c9e03dfd12890e4649e34a0ab5c3153c93ee9eeab9810c78ddb5332e4bd92c891c462e1df2a2305bfe";
+ sha512 = "1eecec7d2ba6c2052f26177082384a48505ea2b88fbc5a3880166b11ca061ce77f9e08055776b9904d1d677ce072a87bd9f703dda51667f3fb50b62b42d6bc03";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/lij/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/lij/firefox-58.0b2.tar.bz2";
locale = "lij";
arch = "linux-i686";
- sha512 = "8a8b686894ac4c211381e31e29d0020f43b11c92edf8158c89838e73713576e21e3d25349d8f3bfa1da3a9b232a1c058f6252af15e0f2181a77cc24fd046ef7e";
+ sha512 = "20a4f1a52da9e853a40049d7fbed2435ddd48f748a453ae94c9ea14bfae3082aebf032c8f573104eb07317db4ebb970992db667010d0d8e0af6eef995c6481ad";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/lt/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/lt/firefox-58.0b2.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha512 = "141f50e9bcb95e456204620f25e670ba3299b3cc06f86afe7bda652dc59745d09e9014737f70caf12c5f6a52c8b5f0777405969b92efe272a579d2eca817e22b";
+ sha512 = "b427ef0a9af8c10b52d4ad55da69d314a55da4de8c68572c57a0983f3e8d566f1604f28c06267736e1d3921cf81912a8829bceddd0cf72b60c08cbb49a190c6f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/lv/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/lv/firefox-58.0b2.tar.bz2";
locale = "lv";
arch = "linux-i686";
- sha512 = "c51ff24bf9ecf43e49064aede96d9487240e3a14bf5b6e61da1c83de01b5d5e974432e43b93d28fef0c473311f528cd06ea2d2a3fb09cc7a7e8fbbcc07c7e4f7";
+ sha512 = "ff70e130c43b3a5e6b378aa4c048e5b92488a75b8c22a4df4a08ff1a100d63f02dd1bcfa5d4713dec79f65bbac31d3078f786143497c6b0a3d49b545ff43613a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/mai/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/mai/firefox-58.0b2.tar.bz2";
locale = "mai";
arch = "linux-i686";
- sha512 = "2307008568c8140d7b90ff4dce3d4c6fa6bf5f1776d93fd7979b14ffc384916f15261f611dfd3c0e83e5d1e8980bff9c551ae9978ed16540a399f6cc7ff64c84";
+ sha512 = "cfb436e43c1eaa7c5d7b0e4102b79a4e68833591a3c3b09df084533c0ac445bc6ad9a7f4e6f3e3fd0c4ef10c5c177ed7149c992742aa3512c0761a15a64e808c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/mk/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/mk/firefox-58.0b2.tar.bz2";
locale = "mk";
arch = "linux-i686";
- sha512 = "b6746b827a3c45e0f8a7bdf4423f63197ae728fe0bcaf0a6781e44fc42dc6c31cbe1e4ec4f1b97f96f1534550aa6921f453ad9732e62ea8fa0737a36a10e3479";
+ sha512 = "59c02906c3ae7f810d53b04d8eb1ff6255d62dc3062d5938453a37d50bd35565215e6df9cd13eedd552d9121c415ea94f6a7b507c50b510433c41b6451f1f61d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ml/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ml/firefox-58.0b2.tar.bz2";
locale = "ml";
arch = "linux-i686";
- sha512 = "7f1a44de725ba6ae31eb21e005fccf6434e7987acd8a480493fe872163ceb5d7052e9fed2475ce65ff487f0824b3a090c917b2a8119b4b9b47a3c6e5f7fc43a1";
+ sha512 = "84c005fa8b3310ee98ec57e882205a465349481bf4cdd3d2daaecc7104ed82882d93df133f6945a2bab2e0b03ef444435438670674d426f7902ef55ead3ad4d8";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/mr/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/mr/firefox-58.0b2.tar.bz2";
locale = "mr";
arch = "linux-i686";
- sha512 = "e751aebda7834a0532fb0885da223316e19f4c0606a88b5a70956d0a72bf37069370d0478c2809400ac09f76822b34706d776f5ee6237b7b33ad4237ee4f7fd8";
+ sha512 = "0bd928955589fe29d3801cd4995d9b20c816262549f96e894d06aea026dfcb621aea12abd161af991ee533491408660e38dd8c95af2cb91f24ae1cd6de949c07";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ms/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ms/firefox-58.0b2.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha512 = "ceaf89d467075799f95ebbf7b93bddf4c1961fead16fb86962bc857caf3ace620c42e2d11152b9cb2819f9a8a16625e5e276263ebe9066dba0840696a2a0a052";
+ sha512 = "b9486a558d50b1afd2f7b2dce4a932f233635c2c15c08ca39ca80e83b1319ee1db59aeba679cedee109e4bebe8082017aa7c61ab79bb39238e3c231435a24399";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/my/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/my/firefox-58.0b2.tar.bz2";
locale = "my";
arch = "linux-i686";
- sha512 = "d7d6ca947e04fc99d28abfa9d9fb07e85f4f71b71b381cda0c8587460c6274a860ae26b60432566ac9af25c752e8d5edbf8cda515cd523521958e2f3bae4cbe4";
+ sha512 = "d3caac45f5923c01c5c2f7515f2d813351fc8941b8ab11e856b69353f7147bc8c8b06c535642b8c04945c50f923533ac06f87fe3b3a5a818024cd42c08b71a03";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/nb-NO/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/nb-NO/firefox-58.0b2.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha512 = "4d5f7c260011e00a202c841f2ef103aa9fb6b6e329a51175656bf9cc3952664da5c0e90de571f9bb6c0886363e1988b8a81a8fe3ce0daddcd1ae284b68b8be34";
+ sha512 = "56dd91a54b47451bebbd2fdddd5550ee2f8d4339bf46a38d16598e68d54bb853bcc03bd5db946fb800d501c1aa4630f8ed35cd0d8789ce260c78dac0823d7308";
+ }
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ne-NP/firefox-58.0b2.tar.bz2";
+ locale = "ne-NP";
+ arch = "linux-i686";
+ sha512 = "93667ea20de391de78cb8d2a0e06c9015998d00fd4a9fd112912ba93855cae49ce0456fb562bba8b2a32875d4e891ed5e5253517d05ef2b8e6a48bb884f55dc2";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/nl/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/nl/firefox-58.0b2.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha512 = "994ee217f580dd8bf8eb06cea6f9ab509f7a430e8f74946d518465ec26b6b2d7c61e775374a9c1c3101c3a7c663326903226af0b585b01b40cd57151aa909a39";
+ sha512 = "9255942bc49f5fd871b4d1c701175a4b74cf555ebba1b89bc8d5d78b9d1db9fc5409c162c2434b78f3094062eb204765a55f235695e6a8c2dfefd70c14cf9fc9";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/nn-NO/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/nn-NO/firefox-58.0b2.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha512 = "ae39cb50182999233a46c6a5326ead7b5e2f363cfc10505f246d14e70fa52bab5f51804a03a7f20485b9761dbc4dfba3596feefe27e6026dc530646da0cc4b14";
+ sha512 = "1a72ee04194b5fd4c0799363eb55bba6f993ec51fd920f5a7fe68c06622aa8d92ab7e014275b66fe4406c1f44276d01b34c843c84d16e523632fe2697661a228";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/or/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/or/firefox-58.0b2.tar.bz2";
locale = "or";
arch = "linux-i686";
- sha512 = "9b8346e09115651b58a2aca7a7ee2f4346155fbe6d77dda6c06f3a3e92ad4956ee5775dfcdd9c193a36a00407132aa2041311ba92e7b59c10cab287f8c8c4716";
+ sha512 = "8b0230279f6d2563e43a0fce11b86c302d852c8acf72a1d27e77d6480d63252518ff5b83ee94b7e5188f687f75bf8929118d01e42e4a7335c0fb5c721bc991af";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/pa-IN/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/pa-IN/firefox-58.0b2.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha512 = "64bda267943ca748f6151498d477687bfe06f52110ef10e5bb2a744548878f3cbdbb5dd707bda4607c45e8ea1037981a2ced01143ffa596a3847792db4849371";
+ sha512 = "d7feaf16ea00a77ab91a9b1017f3589e6ddca518cfdf09634fd74142d0a4ce0a87c06ce373a7dd356236aaed6673b3d274bb59fad6113a10cb285abc663ef6a2";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/pl/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/pl/firefox-58.0b2.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha512 = "dd38f64466c58cd4aee750d4489e598c0e934c6eb904ca8eccf1c2c1c092bb87af739a624f5f210e6c4ed25a6ac3dff233f13f1de5abf7a9bc831e02b4630f60";
+ sha512 = "4da447f1beb6eefab3af199090382a1305332802a9e466532a3237271540dc8d1d7b32795196c17a7b41e9884276beef294159db35ca52e3a289e171844838d5";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/pt-BR/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/pt-BR/firefox-58.0b2.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha512 = "b1265e3274779c415db96c6a8c2518b159311d4f7aa638c030d90ec4169db70b6388df9b5c94fe31c4e41417cce2e65a227a6f6e9c47322a365fc6941d50e1e5";
+ sha512 = "77bd9d6d893f9c89bbfd6feed241155ce1b6b2d6c3e31985e64fbecac7b254dcae3c4ec7418752d2dc0a9dd820b4358e77011087a61414f320bbf18e93d0ec74";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/pt-PT/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/pt-PT/firefox-58.0b2.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha512 = "30e5d4ed87cc28fd51340d407e506b56fcda3cc23fc382d1c471af2c3b990222a5d2fb7b645373c1f067825df56875ec6c2f9bd7b2b259bcf0e466f5070bbb2e";
+ sha512 = "29c6bb56aa2652aec25bc46f46aef5743ea6023106a109e50878528755e31ddcb6e641841729415453161c6c3ffea1a2888fddc046077a76aa723b393ae1c90f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/rm/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/rm/firefox-58.0b2.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha512 = "c3d31a0e8704bd7dbf6aab569aaba68df60489ee38001905f445849fc9bd1eb4666cfba8bef959a8559dd0dd9c16222429f64b398a55502b4d8dfd7fbc8d614d";
+ sha512 = "0d28de9c90068bcf336959588e2f202fedc2e5ff47d08fc15b4baf127ea79162d89080ad933cc7e57c03270a5d86100073a403229ccefe590369df4b085eeda2";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ro/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ro/firefox-58.0b2.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha512 = "d9833be482f828da584c2d30480230e5f79432bf3479f05b5be978d7068e11d76f07f697f85ab8c84b68f49e78593cd1a3fd9067b888f11657e96ca8a2dc3872";
+ sha512 = "a31114b63d5570327302cad0c1e77d7e6ade42a65f53dda70434e3043d1d5188d96791572433d9fb2acbaa1ff5110c9c24cd022c1696867ff6c2999571568076";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ru/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ru/firefox-58.0b2.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha512 = "e1f1778d4e7d019f2a945a8c83338bd3af7b6db0277af921e869c6c94fa22579240570f6d7edbf5f42c28044b6537f724bd33719d4d7cbaedca77ca7e17dfc20";
+ sha512 = "ee8aaa73834322c22b239297738eb2ced76a1c2eb7431288ebfcf100966599eacac11ba7e00fa9211fad6c8e624a0f0988552ff1674ac0395ce96c755228cc1a";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/si/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/si/firefox-58.0b2.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha512 = "63580c6e8820bdc3ea48dca090ab3ba2393d02051ce26905fc3097a36dd9e76efbd19b704145a0d3960a86d52462c7c58497591fbe50f6351e7d727871ec77c3";
+ sha512 = "22bdfb93f5f153d5ec5556fb8c0e04183c892bffd616eac296d2f2b0bd8ff32bc04bd204e1e62a56a52c1fa00c9d8a309bccbc353179cf3ef1b8d74a4e0c7168";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/sk/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/sk/firefox-58.0b2.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha512 = "9df80f36ecb8607613f30254aa8c3af5b6d417575c937dd6f428b5e62989ba9bf9237d7244b0ea598127ccd4bd2aa35db31a54412506022fbe4f2e65eb603d4b";
+ sha512 = "3a3cf394d15b11dd95fc0e597fd327d391f06d7a0731b3b57f7a9bea1a05c39b6b65b8a1092f44edd16f08ad2ca8cbd63730650531d1697fdd3fc55a1dcb6c01";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/sl/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/sl/firefox-58.0b2.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha512 = "820cebffee19a05c2c03ab25b5c86ac7468989dd2a1118d3324dd7be5d3827675a791e3ec0b92ec32907fc585666b5b1050c81c5e16f57ffadc11da3b6de013b";
+ sha512 = "cc27b4356c292b41756eba6debad5b4b18e24435d90c4d2b8afa622328ab96fcc0c854cca03d6ff6fd648d3322bf01a57f9a83fdf5966a7467575dfb1c227db9";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/son/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/son/firefox-58.0b2.tar.bz2";
locale = "son";
arch = "linux-i686";
- sha512 = "b70dc6963e44a225254aa8b9487c40abd03ba1e1cb96cc2ab4a8b24908b26f5093bc715ae2dfc727257465ef8cd01bb5b15628a328a9cf5fd6b78b7f35771855";
+ sha512 = "7dd44cfdd59e0e1bb71aa3b2ae8243751bafad89e6639d13d0efe4a3ab99ef34d87ac27f249d768c457e6ddd01d574beaa8ba689a7b85e9c1ce841f2506c55f2";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/sq/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/sq/firefox-58.0b2.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha512 = "ce2d445084c4db468e1a116fa9e4b741ff44ba994ebe5c575295bb6cd69cb72e5305b8a0326f7b43ee620a5e219279696b862ef512f3c4bfc32d3b6b2ab2321b";
+ sha512 = "60d7b94a02b6eed876aa7d8cdad849bf384d0f62efaa0590d19907d18d9f42cab2b77b0ac93ba2eaa721d44237e1256fe092429f7c95de4c38c97e8e3d7cd2e3";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/sr/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/sr/firefox-58.0b2.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha512 = "4a5b4f4e8e9aa944d7dff5e1bc40f44141b04672666663c8c4a1b7844faf2289d3323427efec373f5f4fdc7ef5c79494dba416db8ced23b1a5f387b462d609b5";
+ sha512 = "268fe1e88100cd55fe5ca1b3c2a028e436de0360e0c9e95ae2f77176e67f975f1609e97447eb98eefe82d188a804ffb04c05eae69ef9f6e405296f99794e5f33";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/sv-SE/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/sv-SE/firefox-58.0b2.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha512 = "56ca783a26d7c4c022001c72c96f02f79fc78bea625a73e3fb2be7602c96cb3753a718a184b7c1c5d154a755fdb4862a53137e4f8d1795345d6e5855cfe3faf5";
+ sha512 = "39c049e89a7e48f9f1d965d8fe43499856c3cd1ff5d86005d90d486b1cd04adddc5ef5246c71908ea38aae995456aae22124386b5a45d53e86e3e74380193bd8";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ta/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ta/firefox-58.0b2.tar.bz2";
locale = "ta";
arch = "linux-i686";
- sha512 = "9fe7f93308392fe970aeca2fa72fc7d709c592ebab1bbae768a511c6928c914c4679eadf3832f416dad9e23cadb241de6fba3345739b419d8118523b0c35aec9";
+ sha512 = "bc4fc2ea66fb0701d77ebc31c92d0a72775af52ed8ea7273a470783f972576349db571c861835d78fd201cb28d80fe4ccc5fc566af61502e74cc8e72cc1ac3a5";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/te/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/te/firefox-58.0b2.tar.bz2";
locale = "te";
arch = "linux-i686";
- sha512 = "0d1333de541d617aa61741b03368c82ec8c76374741c086866d1d53832d97b9b0ad115d406914bed8061d348c0ea1bb5ce84a61e57596afd5ae318022b8f50b6";
+ sha512 = "73090fb7df13733d6dee28cb6b9bf40aedf19ffa85149a5d0afb24732b9420f13b8d9860494f83a908c54db9d6e864eb73ca80cac549333f6e3a24b87c8f7337";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/th/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/th/firefox-58.0b2.tar.bz2";
locale = "th";
arch = "linux-i686";
- sha512 = "cb607b0394cb81e6db0f52b080866fb26f4776d3f81ba9b040553fcb087817795049b4c12128b9c00bc17d9d0554dc428f680de531f80cadcf24fc3dc1f15a89";
+ sha512 = "d6f9e42773736a179ed85ab2767f74270d868adb749286c1221484296f269c5087074e40678bf3abd5b420de3487d934982e53f7d094b98b1faf84ae9b19b7ed";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/tr/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/tr/firefox-58.0b2.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha512 = "3549abe03ea546bbdb0c0837829c7c9402a2d791f1fecfd7d8b9f3a3c14f496c26f758096cef959f9f9e5538397526b8d500e4d97062363f6c370cb7b8ea2b95";
+ sha512 = "f9714e0d2340ed9c76a67c733936485810cdf2e3b38c32e1958fabdefcca989102c175c77a34eab30fce1270076a81127ae14b68b8371aa86bc2be2051db4a0c";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/uk/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/uk/firefox-58.0b2.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha512 = "f65108c24e28daa73d79d52bb2c58c0d590c6bee90f4a57202954d556ea04cb082ab61f588747bdbdd7d1c752272d83e47708bb5a2c7e346f6bbd5f1bc8e5746";
+ sha512 = "784692df6d887e23480cc66730a2e487440d22812398415e412e2d8bdd1f1f9f0235a85be0f1dc55037d3c964996f57a1739f1ae54fc8857d211715a20a40c5d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ur/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/ur/firefox-58.0b2.tar.bz2";
locale = "ur";
arch = "linux-i686";
- sha512 = "f138ec6164a608d03d7873af6f4ee8fd51f553912c06841e41214b24890f232bb342c2c33df388a58a958d932ca803ac671f2daf139ceba4f46c8fe5cd038bf0";
+ sha512 = "103d50b878d74827f11c79005f008fb8291cfb8c062e136e2d965bc61200fb6c82998ef3bd9c186a7ce5ae1371e5f21ee6cc6d664fbd60f737b7d05a85abad2f";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/uz/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/uz/firefox-58.0b2.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha512 = "7c427f89f4aa7462a2e3a35755c5dd82cfc5ced2d82fbfbfaf8804d152326d02e88fec8230d4905f89eaf27020f522c4096cdb844d38fbb0ef4c5c54c250745f";
+ sha512 = "869230cc3f649a9ab78a2de7dd68cd6c0d416de0f27640c1b2bdd80c88acf71b653bb9ad51a8cc7a8c2be9bcd7cbf5ebe5574577ad00cdec542a85e19902ecfa";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/vi/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/vi/firefox-58.0b2.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha512 = "6bd2810d6683ff537aa47b97dd8e4778604a8aa58e7cd8f5a1aeea7cebdabc8f7111c025131ad6255428711a5a6ae69bd1118b3636f6f4ab3ce4022aef293de0";
+ sha512 = "f80a57dc3d505701ba4a79819988133a74913918ba96692ed6e6d4479672e28b5c4acb06b978be3e7494ff868737992b8a34223964b737a7346fecf2a93eec5d";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/xh/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/xh/firefox-58.0b2.tar.bz2";
locale = "xh";
arch = "linux-i686";
- sha512 = "d23be8509fc11f3726efdcad75847390055e2d4d9fe775e9ea007290e21e9e9583dbe5a2a74dca0866f7d0cc2d3066f9afc4bb1e6665e94cb808b3e9f3250439";
+ sha512 = "662b14f48738d32b88c14bab1730e73ab208e85317a4abe8215419642299020a491d22299196091b40af41e88fa4fdd6794385152d9eea49f2aa9d6cf800c8bf";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/zh-CN/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/zh-CN/firefox-58.0b2.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha512 = "42361dd8de84b011d860b0fd4a7f7ae59b3cd8297c57275283f61ecf51275e8263a67af9730e82251c1c9f19c5216b0e2d65adde5987c4dfa88f3f95eea8086f";
+ sha512 = "42562df31b9f69b0370c01f281f289bb7bde34f5c82e43d46cf22084dfd12ecfea7a340116ac16744d5f6af04bbb9eb48d31b610dde34def50860327b9caa9fa";
}
- { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/zh-TW/firefox-55.0b2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b2/linux-i686/zh-TW/firefox-58.0b2.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha512 = "44735872e5600fbfe03a5ecafc0f25b8f193572b067a8a18a598ea4972952747023a93c10727887e6f598922691bbf2bd90a76c8a966abc69ae946ab09aa0c81";
+ sha512 = "71965696cd645d00cc0c2f212e89bc63e023f6c36c3182ed0169839550752559d8c1a04ad47c832e5113c321a54209e00ff598dae7cf5a46edb169176f3cd86d";
}
];
}
diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index cba850e33d5e787e962e9c0a5164470ca31d1a8c..1dd7f67c0907eff75ffa86f30348ecefe0929d0c 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1,955 +1,955 @@
{
- version = "55.0.2";
+ version = "56.0.2";
sources = [
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/ach/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/ach/firefox-56.0.2.tar.bz2";
locale = "ach";
arch = "linux-x86_64";
- sha512 = "3824d633f5aec2bf1f9c6809ddde44a85081dcceee05898275b8c4c6dc26113e453ad701d4c05b5a81c81fe2ac42baf37fa2fa9c22129451435eb78791df51b1";
+ sha512 = "1488a8d46bcd28b1f70d3338361adc2a7c1c38fb418884d6e0741a269e40be49c1e0d9424fd910c37cd18df2354e02e6f95d26beada0216f71d02f6b1ed08cd6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/af/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/af/firefox-56.0.2.tar.bz2";
locale = "af";
arch = "linux-x86_64";
- sha512 = "e3ad3df3469ced1f12fad5a6cc16c7be6754867bbd2871aaa07a9f49a26c3d8c07363892cfae0e8245d9020c5448e82d01d4d2b6c7fd93a7083b2d6480aec689";
+ sha512 = "f04bae02532785fae3cb95a0c8f9708b3ce86a30dd9b560c14c5a58a9f5af1be014a36127933b9b7dcd450f116597ffac1d8dcd1bb1b0d8318197201d1577900";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/an/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/an/firefox-56.0.2.tar.bz2";
locale = "an";
arch = "linux-x86_64";
- sha512 = "1ace2fbf01cc30f70ba7dba7803f4052ec8c05f93e174225e9aff14a67e8b7214dfba43080b4c50c761b80801a9e16a92c0f753734cdc34dd7b482cf023ff0b1";
+ sha512 = "11920a51c909a6ed72cff80dfcbd90f5133e264a2725fbf48df8c27264271c6f24e1f0ab2233e37d458e8fd7f1415b4bd999a270575508c0205fe46d96e8c394";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/ar/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/ar/firefox-56.0.2.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha512 = "a1dd8e128bec748c37b849c8c480c9f106c614440bc4f8d3b17b28cbf0558b8e6524a0b459d2ed5f6031133056f0f73826691b9ccc1a9efd216ffbc3f64a6eb2";
+ sha512 = "e9200a8808be69271e10158ad77e87672478e31d4941448f612beb5ab7fc83a23f809eb928e64c4ee4399c6f59f994ac23ee67181c0ba1fc22991281a377c5a2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/as/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/as/firefox-56.0.2.tar.bz2";
locale = "as";
arch = "linux-x86_64";
- sha512 = "995993ac28d2ef309e025d15f75ce29c3cd028f79bcbc4aab65d1e10efda2887faaabc6beb8277baf81ef256d8365c062e6362f2dfa91b37a65930ba5cb59c0f";
+ sha512 = "a3c8711dbdfbc0633df658dc1b5b740f216ed3127b37f255a3aa13b6240c42bfc23fb08dbc9006bc6a3832d58c0aa30a0351d4fdbf6cfdb18875abacbd5b2c76";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/ast/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/ast/firefox-56.0.2.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha512 = "8bd9c1dbc549b7b8024c28f026e2b9b5a099b80904938955372e157016b4ddc729a378502fb7973a9352bbdd09646942241eb23d8a7528874ff500b0aaade77b";
+ sha512 = "4202d5cd25cd33b169560d3a7fae3a999a692ab5caf3ff9695f20337931c940c4583d20549c60e345cc0b2e23e16094379241c766ed7d089f103c7e0065b0153";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/az/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/az/firefox-56.0.2.tar.bz2";
locale = "az";
arch = "linux-x86_64";
- sha512 = "38ba0acf054195274043470d4c71c8f2800ea543806ab0d6f39b0545fe634c742072900075c319593e5a75b8403dc2228c049cd9c359497a71627d74bb750bbb";
+ sha512 = "3414600e12fb48b1055149799c3e5659ffe97e7bf53962db89de3f35c9b82072a307e42a11e4e0d14f12e471d8ca965974ffd3401035bb3619f6036cb77184f7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/be/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/be/firefox-56.0.2.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha512 = "dde5852d9d000b81ef460e49c540fdf2731ba836d5df50771c551b96f857263552389dbe97289b6d95019630774c1e8b8a85a90ca94ac275410c1ea18bcde833";
+ sha512 = "eca58b4e948394d04a55bf0efa4a200d4cb3111aa3e45ee915389faeae78b9a70357f43baaafb81b57df0170a82c972cd991c05dd5825a41aec12adeb0c7d57d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/bg/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/bg/firefox-56.0.2.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha512 = "e0e642f9a7e6c1968f77cd34722acc77de84994b92745048093abb123d79ce9206945c9eea519b10a293ea349c7922937c27e6d9e7b6709b6aef388058f6e6ef";
+ sha512 = "4632a66be47c512451f3c36be34240ae3d9ff86d42dd03a65a9a360c71457085984560c53671af531e22877939f8aab298b623f822b696659413b9b27d12a00b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/bn-BD/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/bn-BD/firefox-56.0.2.tar.bz2";
locale = "bn-BD";
arch = "linux-x86_64";
- sha512 = "49834af50d8f8e547f504a504d6161c07675cdcd98bb8d964d5f6c72c76d22925865677e64a90175ddb3312c8a9efc1d113e76aaa914e9d6315f635dc3095bac";
+ sha512 = "08a0c899b12159d0e253d0937e1efbf1d2197e724d243f7feae09d0ec97891c6d2d2e8c26ac0a473fb62d274f612b4231d8ce31fc3b411ca24e35b302aa3a2ef";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/bn-IN/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/bn-IN/firefox-56.0.2.tar.bz2";
locale = "bn-IN";
arch = "linux-x86_64";
- sha512 = "664692ced004e94e61ff9c44618931f62b316ddf0b56eb83dab7d4fe69a5016b3b5efd5a02c49e3ba41cb51b2298096c74ff2fa8131731bf79708a23203ce350";
+ sha512 = "37947b6d1a55847c9fc94e7d20b90b5367453450c6e572179e4be7459e6c6b926f2f6528c10cad168ee1b8ec9f7643f5b46a4602aefdad77911d2fa0b661b7f9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/br/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/br/firefox-56.0.2.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha512 = "e9ba0f8bfff1929820ca0cca3de5c377c8c483e4ba46b3064cb210f971aebbf2f5cc67d13a05e1c19e988006ff37dfee607d00317162f5146dd8a1b7e167ee83";
+ sha512 = "8464ccfc3f56786e0614449b82a79b4ac4cbffa6860050e09e9c179b2ac95109d8f016cab4c847c70d2d897c15979b9d53691431d3cf505948437aa439301e8b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/bs/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/bs/firefox-56.0.2.tar.bz2";
locale = "bs";
arch = "linux-x86_64";
- sha512 = "41fc17c916c3c23cbbcccdad686ebbbee3ff9d68b0b72f8e8e8819e438df2fda7aa954be3a0076d91fb5c05b507873a2bca90e2b661542b86ffb0bee3cf6bb77";
+ sha512 = "090697aa8355450f2f8329cc7d1c33ae9490cee06597c14c8a14b699b448b989565d96cf6c6a06e1ebed9485adc283f6a3480c190de17d6a4400377f4938bc8b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/ca/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/ca/firefox-56.0.2.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha512 = "d0880ef0357a3e8d9f3d419390b8bbd95c75d6f50469a63e7c1e0182cf98e85c942d75dd1c3736c856deace3f49c6751f9e8e1b320fb0aa73a78129340e5467e";
+ sha512 = "c898dcad4eedd480968a2404206e94a46937092bcb35377a75b291aee92a5e8250c84698ab43cd509f4f87899be0aa16e060c13ae0a2a561355faa400678f19c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/cak/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/cak/firefox-56.0.2.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha512 = "62a6e53dd82ef2bc2881c1aa912bdcd9628123b13a769f43d640c05c1a02dde9ad5d69f486c2858c68ddac7dcd2275fd3970e56d48f4e842a3757f453e6843fd";
+ sha512 = "e05d885e2e1ec9396a6d6d204bd5e94af6e5a02e534b57c5cadcf39e30c7753fb57e05507b2fce5600ca9d815d0be332eac0b3e5d53aa8f0fac1813aef375575";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/cs/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/cs/firefox-56.0.2.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha512 = "719e052b32b1e080b4627f286bacd9b3bc2b8f40cf8b79ba2643f08220a05201e649fa98f679c4fb926a23355a12ef744ff7b5ef819d9b825d5a5ae790f7a6ec";
+ sha512 = "a1d7615ce0369274e6109e1b7915c926863554863b8703838b145c662213fc0e2229117de511cd2a35b08cfd3870f480660e45a2cd72f8c65acd800698d951c6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/cy/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/cy/firefox-56.0.2.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha512 = "ffbb24e8720f354c2a20d5d13d6b3f003a0b3d1606da231cc9c4750d837efeedb4a789fc4b787463d0e6f0fd9492583fc24b791de6ab4eeff6f2258dc2206f93";
+ sha512 = "c4d3b5825a7e27f0ef77001e793de91abce40fc39e2a8743fce3273ba616915b1be6b50223220fca91e3ece47bb3b125965ea50b4d728316865699a7d1c30c15";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/da/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/da/firefox-56.0.2.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha512 = "62a53b150f4dce8d09e63c44bc4ec5d3657b8db624a71415b666101b5a4ff2c98da3ab4e0587bef824ad0303da78060c6ac5409747291dd021d2d62437417928";
+ sha512 = "13f28b2d0b7043d50156f452abf0786a86f98d63b844a481d3425d6f8ea3f926d5911ef0407f7585929478adc0cc6a538df92f0f8715686cf5b5596b91d55796";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/de/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/de/firefox-56.0.2.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha512 = "feddf89febf177d83e816900cdfcfc03c119c4aebb026586cee127d541db7d7c37c6d47e989402a657e51d66d7564e13016926f16cd3510ae0cbf6b4f767aeba";
+ sha512 = "fde8ace2a67dc8966eb25c0b7eaa6417114999d9f5969d8a846c76c203e6452e91d86639c3419d7dbaf628c4aa79efc3b9bb62b3582e141aba6f674e89f395f9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/dsb/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/dsb/firefox-56.0.2.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha512 = "ceb9fe65ef661d721c43879082c1d99c90f293ff38137c7ff2994f0a7b53086452f139f3ccd2c15fdba1b09a16abe560d4a81499926830f06b5311eb05746157";
+ sha512 = "5ddc2d792d4fb555b5623ca8a7b214cd3f1e3279fb1b7f261641ebc2268a659ac9b6620a306cad19f7443c87279dd1908fa15d13eea2efcb0e8bfb036680f367";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/el/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/el/firefox-56.0.2.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha512 = "13c7ffaa22e1b9968b643d4cd6e4b46310476592ec894293be1f0179e9c16c02944c34e2b25fb5a0dcea5d374c8bd5258a370df1539b967b96b6781fdfbde753";
+ sha512 = "d0d22198853cb65fb48eb15d7fd709a8f377de92f39491d53859df7372740eb34b731de6f83bd9511e51ab80ab2d1c98f9e7ef52249265728038c9bbfc9d15b9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/en-GB/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/en-GB/firefox-56.0.2.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha512 = "566ff317b62ad2158866ca7f50509eed0272e00029686719c1843ea742d252c45137f9d6f867b0ca88e63e84a7f46444b9f6d669bca31f6bb2566edffa167f75";
+ sha512 = "a628f43bc48ea39e921363c820e59d8000890a550032a7fdf0e536ea912ce53055946591af6fb5028af58845297861e76fff9d6d75a888fab44052f4a392dbe5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/en-US/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/en-US/firefox-56.0.2.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha512 = "93092a136943c8901a1d62d34582dc3d6c5a71629a274e54650901eddde89287d489572605a0d937f16d3ff9cf2b0e95ec8dd90acaf7da979f599623d1b9ff99";
+ sha512 = "0aa78818b8eeb8033554b970c31835efb6eb5c9c12d313b0bdfeef8d54136830a66b78acc96cbdd99e8505a078fee84f4ed1dbb315b45471987c8fc6c52dd08c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/en-ZA/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/en-ZA/firefox-56.0.2.tar.bz2";
locale = "en-ZA";
arch = "linux-x86_64";
- sha512 = "5898f88d188daed37bd8b5bf523d94bc3ae8064a3a020b463658f333140c4cbdecc24f053bc898dd2e81f3e945a2d0ae63a05bbeaf27f8ac94a7477f697e354a";
+ sha512 = "2bf77e13acda72da29302b1107b744a9977019bb58e2795e42feb60a363f2156738a9992172f263c12a70258e5c336534255a44daa52b1ffcc81923dc2d12c12";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/eo/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/eo/firefox-56.0.2.tar.bz2";
locale = "eo";
arch = "linux-x86_64";
- sha512 = "ca234eba852ce9ed736490e3db9185baba4d190fc631133747219dce7b24fdcb4fc3bf348de21bc81cc02cd818660158a94f0d2129a6869e9dc88f0b7a426c95";
+ sha512 = "67f3d380000c6901d6a3f35de6c49392deb209702619ba54ff4a6f1299685d7bad556e659116153a9b2bd84af0c683a558431e9b20b66cbac7b32172efaa123c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/es-AR/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/es-AR/firefox-56.0.2.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha512 = "c86897d532114b6e9039e4eff546e724177b9de1049af2634580e8ed8f2de54484fc9573fca1640ad544b8db092a477f3d855227ae1ddf2766fb5c453cfea876";
+ sha512 = "1dbe15c98158091d8b58e16e35a8edc7e4f9c2519d36d20e973ac1e89e10de7f5d8797f4c282f8bffc386d58aeeb7ed51432dae853c439a54ee5729b918c6e96";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/es-CL/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/es-CL/firefox-56.0.2.tar.bz2";
locale = "es-CL";
arch = "linux-x86_64";
- sha512 = "868ab44893d60c66da1389dd36c8b84bb44a52f0daae20a7de247bd22aa4fe3b9c5d22dd75fcfaf3b36933fdfd91f694d9758ec9ea6cd40f1882a3a721889742";
+ sha512 = "e6cbbdb9e2cbcac69d678932836bed72c9268ebffbb7d85003de6e71578aa980248173bef5468e28473422060ef57f8a18bd973d92685a13cd77976f6b75ca7c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/es-ES/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/es-ES/firefox-56.0.2.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha512 = "39c9841c7a1f6e1bd9028410b49f83d57193a6995053e7056d2f1884ac6706bc54972a531031b8e14a2aabeb0c8cc1f297bb580676b4c6e0b33edd5dbd6e43eb";
+ sha512 = "610cf7f14595edc7b7c99740ae284382be2d5e3f9a0cc505705392eb9cd9cfad732ee7dc7cbc6be74f9056b12762d51e6ccd74db17545dd2e92b8276a37a0ae9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/es-MX/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/es-MX/firefox-56.0.2.tar.bz2";
locale = "es-MX";
arch = "linux-x86_64";
- sha512 = "d20bf48f886f739215fe2e46c30b355fb6113859ddc6c917c6936c119e3aa105161174f74d77e63f7bd59619b85f21353dba19be4f98d114551d585eccb70004";
+ sha512 = "a4c4e98c2af1bc272cabc444184bb8fadd6645e3fc99a3423581d3ea7ebe59429d2e7be5235e0c62ee9ce46380a997a32269f1b851aaf128c133846a22b1f7cf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/et/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/et/firefox-56.0.2.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha512 = "a794a793a7e430c643007d20898ff21f25a364d0629c022073747d15882f1470ee6b50c1bc6ba2d4830d09598044086d81f6f81555e23c7f3492eb8ee7b29835";
+ sha512 = "ccc077554338fb011d5e64ee198d61abd16f750c834aa59abf90146b66801d2c7069ac294abdea824d5511976a5ab5d4c0f00af9cfa01f28ffba9d58b50958cd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/eu/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/eu/firefox-56.0.2.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha512 = "ae8b65527a12e8db514dcdea7d533edb52a39426e96f50707374395cc88f427e6370e864c9d55da93b02e2c92443c2f06dcda4aacb882be0a4982408678a05c2";
+ sha512 = "7a15e0a070cfbfa03592702afc28e75fac4de34b4568fa78b516d9330bac6fe9f909cfbe3b77dc7aefe24543e7e5cc719c4af69431487b27ca6672aaf26c693a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/fa/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/fa/firefox-56.0.2.tar.bz2";
locale = "fa";
arch = "linux-x86_64";
- sha512 = "ce8df8ad73cb30195a444dc9ca9f1514081315fa4a927af79eda41ea1b2fe22c67825157cae641f80b3dd8760bf8d3d26a538a211c5828b41458ff60337c6166";
+ sha512 = "652641ab4d7df5fc2f519bea1daf6503d17f36f6772bbaf511e99ac8d5907d9797f2d01291a31c8517076a34fb7b4c60eec817ea4e3c86903dcd84b559bb0ed3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/ff/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/ff/firefox-56.0.2.tar.bz2";
locale = "ff";
arch = "linux-x86_64";
- sha512 = "d896277ff916832466ae58f567cac018d259b08df13b59433707bcf60f5e75975678a25fb8bc138d3e705310e10d0cce06118f6581760fc9c1e8e076e4a5c355";
+ sha512 = "b988505e4ade02ebf594692ec66d9946da91261a386ae484d5171dc42e992ac18bed1e7982cbcb9508364f3f9a656c267c7bb05912eb51f14f0ab68507393175";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/fi/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/fi/firefox-56.0.2.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha512 = "adc3dce086ea0113b8daf96e1ebc5d292d35007ef59b0febdf72868350e98696c4efc25ad9dc9cbee908a0721829a106ca4d72690f5e9295077e7971bc9950d8";
+ sha512 = "7d19b048d6c09f87b4b3419a53c5b25e5e2c17db13c830c13b79d536a2425833cb4b55271e878466b4558ed95f43a68db05f86812411b0926df38addcf2f0c93";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/fr/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/fr/firefox-56.0.2.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha512 = "2446635b7fc3b76e3fdd15634c7563483fe6bdb3c26e98cbcfb0f025567a5a003bddeca68fb87a6119e46da7325b50bb429444a30b92137f7e7aac8a57ed382b";
+ sha512 = "42cecceb791e7275e140fb9087702a0e6b55dc4b693d206112199545c9aa1411ea222a58de12a1d0d705a6332496090fb6fb208a91ed02f88b5c2111cbbdfc96";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/fy-NL/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/fy-NL/firefox-56.0.2.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha512 = "fb02a7d115c00f36680d9b33a65b8ce459a2607e8c9bfc9ecb70b6712a59185e990415b4998583da70996331fe3ac7230b5f2c540d27e0d04c193940b398585a";
+ sha512 = "53f9d33b8f7eb6ba590a5096e23176b373bd8359ad209c9052add4ddf112d9b4374f3a0be0d83b0cdb679f07cea3d553b2649a6b03f0f09150b63719d7d54092";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/ga-IE/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/ga-IE/firefox-56.0.2.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha512 = "02f16ddfede728b0a1b103266805263414b2ffa959ee5e5b41d4d542c747ec2b819e4e4b1b6d30173f76d91eba388572ff4a84433b05ec7d02b7ea3d351232c9";
+ sha512 = "f405c2609cb06538647776e7294121995f9b5a1e49ac4bca52c52fc772d6cb3f54d67f983becfed2284f8d283074f1a5e6b1ca91b5c188a53131f653c6f44560";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/gd/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/gd/firefox-56.0.2.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha512 = "e1e25afce2d91f582a2cd93cab594f08f47ea5bebf273db47b79950a674e39b580e8efc477611e5f0e288593508e9cc583c6a9509f08357e9c717c84fa54acb5";
+ sha512 = "9307cd40b64fc2a3daab44fb01b61aaf55989ed86cbfae47d47d4fd2556de9de0176aa976f3e85f5904e7e19d0c0ea06df3682144c3c418381c38e5196316ded";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/gl/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/gl/firefox-56.0.2.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha512 = "f077016885b4780b91e9be185fce08398be4b34e496afba3b41c9dadea4d191d4c93a36f31ec094b0e57fe0636bcf1b38c67ad5180bd63086fc07800e90f076a";
+ sha512 = "077d3329036e67877aafe852719c6efa9a9b35580de0f66ab2f01757d4a8a114067f2ea78e78fac6cba8a96cb0e2865c3faed830b68624a23d3c63339c31f40d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/gn/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/gn/firefox-56.0.2.tar.bz2";
locale = "gn";
arch = "linux-x86_64";
- sha512 = "c935d587a2d5d5ef9278d265fe6d7225c4568e2f9058bddef99c677e9b89ab286bece8b066a44bc4ca6d155d83ccc14382e80f2fba4a44aaaf272cfce178f5f6";
+ sha512 = "aa35ce7696847882ffba9db3ffc63c8ca827bc70902ad86716bbbed1d1e9bf8cbaa89a7795cbc430e7adab0987ced12ae950bfd395267bd440b8b5d94d9e9349";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/gu-IN/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/gu-IN/firefox-56.0.2.tar.bz2";
locale = "gu-IN";
arch = "linux-x86_64";
- sha512 = "9afa840dcf0de2386923186f6f3b2da1c78d3a31eb794b3aa1caa0092e90a8f7594b729970de8bb410457ec88b681abd99bb9be7eaabd8496bcfcd521ed0f14e";
+ sha512 = "15d0e2275e4d411ab1bc82f04e6d0d70e49e61a46f1360fa3594669b526f1ea546d1e95268484bc36361dc7c2af8202fd41b40601fdc9cfed42a5920a7040f75";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/he/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/he/firefox-56.0.2.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha512 = "41eefbde51929a1642310b62fc61881a16643372a94b9109dec6668e28ee71d3acfc154ff26052cf4702504523ea39e5e14679b14956dfaa21628717f66a5f10";
+ sha512 = "d193df19e352f9ee34af4069e1296f4ec36cb92528ba2ec090aff1bd5d781d071fc7887ae7abbdb302bb1f98b736a3bc06fdf96ee70c36abb2a005fbfd108165";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/hi-IN/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/hi-IN/firefox-56.0.2.tar.bz2";
locale = "hi-IN";
arch = "linux-x86_64";
- sha512 = "4ab94bfa479c1dc703206fd5529ba9821afe9f388cc18a80512c5beb9411c3476ba4db7b859df4556e8382c1fa5a521e6f6682021daa46510c3497deeaad1ec4";
+ sha512 = "749bab51a40077f180f37876fd2418ef228275976d15b533c45c1c3054e112754f58a7f16244b9b9036f3a9d6b0dafe66d4cade45960450f98fc17866e8c0949";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/hr/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/hr/firefox-56.0.2.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha512 = "7a0048bef5a50588220be7145a2449e2f2f16a2542e5e2af17bdf5fab10a7ca9f9441ee52bf8c274fa462d4590be6269129db5dbf3f55574b8e3257f80d2604c";
+ sha512 = "6e2c09245f5d317d60ca51601f3a75f6f873407f64b778fc9a27bb446830a7c4b067860c5dfba5bc7d33e03ef57fc2ab9a6ce58e05fec55b13728e9561a915e4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/hsb/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/hsb/firefox-56.0.2.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha512 = "d21ba3b5344ab0f105cc6f6c426dffb553f4b98d1b6c125266d8f53209ebb58011e41d72b431945656a2c619347e309ab57252c4ed7189f6160d61379017e062";
+ sha512 = "a485e38f7de4cb83b28a518028853d2166ef61a3dcbfbb519f308bed16b849ab6b1d2f7658c43d7f103ffb773beeb28eec2d599f11607ff7e1d465a39e519804";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/hu/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/hu/firefox-56.0.2.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha512 = "5bb2e9c79cc08ca3b9e4c47e85daf351e411899318abd6f97bc715a1c4134ff271f7c1830eab1da9465c975d2c1abaaac0c490b7c2504f175b3b468b7824b622";
+ sha512 = "7092c3791312583d7984f36c132700a9e7233948d6769ed5e179ab334297904ab8125ddcb675193d8fc201506a46e35e36860c339d1824513b266412d3393e68";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/hy-AM/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/hy-AM/firefox-56.0.2.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha512 = "25191d401eabab8adf1d603b4838ef5fd42630e5109cdc7fbdd638cb9537f91c16fc559dead9084ebc703f3ea0b3282c9ba72bc579466ac501b2d9446e398e21";
+ sha512 = "50b0858fcf05524bbf54af6f2d1f0f283e20b73c79037aace88af7168d2854f65aa74db95d01b8c97937fdd76070ce113cf44af9b749c47ac07253192ea21745";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/id/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/id/firefox-56.0.2.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha512 = "0c681e3f08b80e94b8b3c3c8fc2408e6161c3c8a665c6eaa29d5c33eaf508bcb8426dfdb0a3218d15c88b6a414e55d27468aaed43c2b87f8ccfb1ccd26f07817";
+ sha512 = "dfbf714329453c41833b3ccada9184e6c016038e9a07b351ad6ef191c760f74b7ac45981f7ecee6a1e2de1a37ac64cb116fc7cfd6973a4d111fd5c58f8eaecae";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/is/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/is/firefox-56.0.2.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha512 = "6bd3b4233ed6efa88b32047705ae9f5250cbf58f93e134924a0adb0ae7f569123b5d085011c35c0f022f37096fb812811f0fec0bf781e355a5342650820b269c";
+ sha512 = "694b5c1a45f98550cf9ab4253ff536b8d6fd00232255e18f7920cdddca1dfc2ea4a5348baaedb4dea671d09ea4afd57ea6c116963776875a2aa92401d8f92bd1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/it/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/it/firefox-56.0.2.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha512 = "cf8bfaeef210cc2f94fc9405a9dcb8dda331fedb82e4743cbe6b75eb0eeca13b77a30fec648806057e0e8ec95bd957a4003e4210e38e9d122df50ee6c0c31b79";
+ sha512 = "cb313f84266093ca3c959ab40391df4ce8f5d0975ce190090d97b4db4ab7402b9ebbf0b34b7281ce44d7e8d8fe989c86515f757aed66a7f356045ad953876b5a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/ja/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/ja/firefox-56.0.2.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha512 = "ed12eef067d9505266b27bbf856be093bd3f6bd2b82c355a3c75db0d964ba3a86838cfc976cd142c142dd77b90d5a878615577c57e7861b41a4ae6ba69bb9933";
+ sha512 = "e09e2cf8686aef0d96eb4bccff75694dc799247b35ff4cfefdf8b0ddf650224138994ee9a6904ba4634837883b64317ea90dcf791481b7eb9ada9d978479de2a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/ka/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/ka/firefox-56.0.2.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha512 = "594f2a455ec525956e92e77e5de1f54f8cd7bc615567ebb4bb9b938d1978df1bd87f9865e6311cb4280d0b1d435cc8a522b7d7b5fe6279aa3f387a288df81d60";
+ sha512 = "21d1920ab8a21ef93d74e47ad4d6dae81a721867dcdbf2205b0e2c09c13d0850525cda123cd2f38a418f9127204e8f31baaf49f0a0bf76e43d9b5e916e2f0d52";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/kab/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/kab/firefox-56.0.2.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha512 = "b7d3d54e7bff659074bfbab859acc3bb6c2141e9111fd0b207ec3ae81179356942f48ecae75a8f87af0514a79179e77f088be810cafe23eb234e85bebfffc798";
+ sha512 = "4e7cfa3a7786158df33605e2c516c29019adb90f1fbf783ddc539acc43784920859936a29d55583c2a2ba4c464ffe062c9780bc6da2f4a2bfea3848b1f27ea2c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/kk/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/kk/firefox-56.0.2.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha512 = "0cabe96911784264c984e23831b8e8170fa27af03b15c85706c20059f5e935910deab728e2e8b68e00b62d4f073f4d8e156e302bccaef6794de07fce48f99255";
+ sha512 = "8cf851ad7a4d13655f63f83c136b87aab6b002ca4865601098694cde08a85a2fea8d6b2a9f68560f52fb8f70f964ba3ba5d68491de92cae7396027d3efedad17";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/km/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/km/firefox-56.0.2.tar.bz2";
locale = "km";
arch = "linux-x86_64";
- sha512 = "e62980ea8f48280dfa8123e4ba8bfbf7627bcab855e2869ffc947c9538377721fa6ab52b9bb209f7e2db859a5f606232e39248d7da3020693f4d7de1125b8a2a";
+ sha512 = "d1d73336758269c7de6741ad88e8d4428030fe8f48cea98f931ab35d8df96f3b2924eec09a32ce16759de3156d8434c7818bb70a0534be297da86a4d46d5f712";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/kn/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/kn/firefox-56.0.2.tar.bz2";
locale = "kn";
arch = "linux-x86_64";
- sha512 = "b5bd9a15cb1526dc39bfe15c9bf5c8624eb919f85c0f61f83da0477afed65aaa3a2af71a0118fd48fdcc7a73da778b9781d56f41d70971e52799ac04f3a8ee78";
+ sha512 = "bb05c04ab39115420a912efd25de8fa3c68eed6402313ec8a52115631d62560752f8d0aed51413d8e4aab7ea0020065c5d17e93f9f5408911b95c3ae84e3fa4d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/ko/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/ko/firefox-56.0.2.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha512 = "59462a1891d08c109827b1e92a267c28427222e62b945194d4c5610f823489e645714bc6a1975b42b3aed3b809c46f01670484ba8043538465a20c21b6519263";
+ sha512 = "9714993754262e9a39d8c29e515b019bdaf94b77e7965ac374df415a524d5ba1ef1fe74be56c4629ba3065c256e108ee7f03fb0f1ee847eb9746b6887f530da3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/lij/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/lij/firefox-56.0.2.tar.bz2";
locale = "lij";
arch = "linux-x86_64";
- sha512 = "b0c1dfacb6a1333306dca3b16bc815d707ede40b96511c6e130ec76572e0ebef264537b458c4040d45790868114f8f652c84b525e1cf92b05785631a67de2196";
+ sha512 = "eb9ec79213968585b9578da6aa939a62aad98c58575c69ed7f81baa2a1b2c5f0ad5b0854d24ab1b5ddeaedbf2d71cae5c8f68b6c1f509a4bfb89fb158c7985ee";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/lt/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/lt/firefox-56.0.2.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha512 = "ea0f17e1b5f28e5ed0033ea5bdf8ef8461cb861123688dacc908e37670b22be9d115c3dbe8e92543a7b5234c3a45d159aa0c486eddb3348acd21f7430e5b3cdd";
+ sha512 = "b1ed129e96fe0e27363bb1f26163fa3c4acd973dbd43f52f92ee7b1682a3761e9858c70c39216e3ad847759b4d5584399dcbf4756034029c9ceaa4168f8f52ac";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/lv/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/lv/firefox-56.0.2.tar.bz2";
locale = "lv";
arch = "linux-x86_64";
- sha512 = "2a6a5ede69b3280b43de68ad3c1082a4f46d606cd0e78a1968ab984b8b3aa8a455b809b3a6ecd9f8ffb2c296206e68446b2139a1739fdbc4f3fe8e6a736091a5";
+ sha512 = "83055b9a4fd2218696988ad248b041f352884bd3522bcbcf8933bcc44f31c7fdea6a6c7e4c8160b6ced6ac6ac2fd34a120708667e543cf5f6c2dfdafeba882b8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/mai/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/mai/firefox-56.0.2.tar.bz2";
locale = "mai";
arch = "linux-x86_64";
- sha512 = "178d8d1446287d0f163166851f7ec2d404d4328fe6b901c6227cf4d195de7e97e5097477d0f2a9cd4c2c492ac27fb15d3dbc90b798d3ea05c3e2d2a017ab3ae5";
+ sha512 = "349fb2d38a82a7cbf561cfb92fd439a9dc6114656d9f6e63e810bdda434840db43fece5d14488ecf50fa07bd4beb2adbb1b13092d6eeaddfc691961f901f793f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/mk/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/mk/firefox-56.0.2.tar.bz2";
locale = "mk";
arch = "linux-x86_64";
- sha512 = "52673259ddf45b072037c28f872a03b75a3a948517a27514b6623bc5a975c0d745340638b04a5c9d16503bb0ab62e08795d1e387ea37a69e796fe0842c3957d6";
+ sha512 = "48b67c7e258169c58ff476b6af1b4a07cc3b8f52e3f74cf3f039453679aba943305c3e7ebab589abf6db7520f1ea096c55397f748f896947e9057719dcedd5f9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/ml/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/ml/firefox-56.0.2.tar.bz2";
locale = "ml";
arch = "linux-x86_64";
- sha512 = "a58262f6788002550220861c1a501fd9d15b7967bb538da738b831be91787e04c2f42ce5dcb045910ee022556af9330df4d0b985702995ec40f3368a3a52eb7f";
+ sha512 = "30520236e653bef324badb0e4acb63ec9f027ff5c8fed22e256d609791c8c0d923e7b55b1ed69d66a1c6a554f271c9ebf1086ebd8b818c683d2499f6b41e6800";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/mr/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/mr/firefox-56.0.2.tar.bz2";
locale = "mr";
arch = "linux-x86_64";
- sha512 = "c927b197ed833cb3beece57d247107865d6c1d9ddcf01292f28927ec4ad8cb325c8b75cc50e1bf9b31eaffef31a3d472c55338667c64425f80934534bd6b6f3d";
+ sha512 = "04bfb26407b529d15880c5b4fc1c20fbd87ec5818d1713fd93241f055eb6206de2ba80e6ed2589e292ec1aa325ceaf891424477c435bd8a353aebb9606e6e05b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/ms/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/ms/firefox-56.0.2.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha512 = "1b0227782120185c60cfc18f60fa592340fe5ff875d130d0d786b055c475dea9210e98867b8ac2c9c63273f138763cd73c2fc5e5085000af06aacfdcc9d69179";
+ sha512 = "18c4ff0297dfbf69aa376d21afb3a870c8d121749ad88fd361aec35b426386e3659a7bda48caa030a2ef8f5c4d591c54ec205d22fde27b2eb3343eca9e48e289";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/my/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/my/firefox-56.0.2.tar.bz2";
locale = "my";
arch = "linux-x86_64";
- sha512 = "a18326b32fd45e968dfdb4800209ad76265e8c72237fe3e0d799c7a66456d3020722a1ef702a349a0d19411c5645e7d286a2c523cdd826d474d40f02faffb129";
+ sha512 = "09a61232686acb110da288d5e473b6c28ba0f01ff1a17338ddfc10efa7b60a6400a5c29f81da113655285f63be7fc673b68fb390888046b29752f73461d1dd42";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/nb-NO/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/nb-NO/firefox-56.0.2.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha512 = "6652b0cc7aef35e81e0bf1a4aa3ee26516a874338d23a9d216e4c8003bf86f4f73b1872d39969f77e878e9894f66c23f930cc133b666a4b1cb5490668153d653";
+ sha512 = "ec583cd909bbdfc85b6cb59573e34d5299283328fad02f0ff69392e969ed2c5064a7349dbbeaebb0b87fbacdfb28b2919502b2a5e2a2ea288c6097e82d25c47d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/nl/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/nl/firefox-56.0.2.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha512 = "d6bb770bf841f7882ea61a2e780247d94333a8df7e72e99ce3574d9216b149fbf2d1c87cd385436492680c5c0e4d1cf897ce0987c43a15bb2776c4a80799229f";
+ sha512 = "7254a36511c7f1e1fe1f6fce9eed847482238ac178f6c8730edde61c86395fb0bd4938ab0e2ddec77ec2d22d9a1c0e69c2e00a5040acce25cf5aa5cf79cc087f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/nn-NO/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/nn-NO/firefox-56.0.2.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha512 = "117ae9c5939cd7f4eaf6b353b2e14b2680114be27066782b2348f56f8ab7b72bc37f48043e382adc40f6315167035afb33a40437b86560100563f1e5e752abef";
+ sha512 = "545f40ffd96bbd6c285994888d9a8f4622a7075e5f306effe5b4430a7aad69f670b91167e7b5cc0196250fb330d133fb1787df041f77ada58c14f16fa7340741";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/or/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/or/firefox-56.0.2.tar.bz2";
locale = "or";
arch = "linux-x86_64";
- sha512 = "c58300fe25da662c6227c89189a6e17666a8d0482d56fabf5a3bc1a3001a1d9b62e0c7ad55c8eac7b8294153ef12adcf1a61067a697011b7ea74e23060449ccb";
+ sha512 = "c76e512c201c27fc39347950ab4fdbc14bfbe6e3ed8fb7d7893119222edb02c56ff313a3263e14418c319a75236c74f74ad5aabf51e4867d9ba0123476b0e7d2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/pa-IN/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/pa-IN/firefox-56.0.2.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha512 = "b2c5f59305be66f6c3bb4bc2bd67e787e56461ae1be29efebf4880bee2378f567cb719f6cbce90502cb0df6645239d2abaf101bf4c171efb226c28821544bd16";
+ sha512 = "336598460b71d9e019ffd190b7839887a6cc1db01625c182c1d483ef5bd2593534ba5c34b1cf424ec689b36295263cfaa2aff7275f7900fedd544b8f2f5f0d0a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/pl/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/pl/firefox-56.0.2.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha512 = "c7e062eac501d08bda55d0e2f642dcae3a3fff8e228521719999386e6b910ac9a0f101e36845a0cda326970aa7c6ada16d56a44ea27d5ce7deac773328272710";
+ sha512 = "d2a955085b4f3f7d7c44553932aad0d7f943656d173fd10024993e59fe97be38c60e8dbf9350f43ff91fb4a27f6fc849a3951f1f790238b642b418267eca0e50";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/pt-BR/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/pt-BR/firefox-56.0.2.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha512 = "854054e7a77ae695f0344fa19d2c16afd112dd965f511c4d3d0a22d3e52e790e8adc1f86fe951f1daba7c390c851607af87a1886b6ca2970f4b4d921d7ee3998";
+ sha512 = "06eaafd16dd5d9cfd960c1f485de6d41409a50a25ba79e792a9d377f69665be62a36754e7d4e570840a63c6e877e6459d35bc503751b6cbf29481444ad098738";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/pt-PT/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/pt-PT/firefox-56.0.2.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha512 = "e490aaac75a1d7022ed79ec888963730cbe995a31755c62d431eed9cd7573cf607d361d190452fb1bbbcdf0e246fc52c0132637a2b58b6934e3564e221692efe";
+ sha512 = "8f3641797eb0053525278af741254d380b51679d1f7caf262bd519fff72ec0cf0242d03c65e94e758076dd7c5420a8eb8c5563cdecab1313b57556411c12c59a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/rm/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/rm/firefox-56.0.2.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha512 = "010c815bc7ff3b779f1d393e593eab21cb4740cf1ffa2eef670b508fa0915ad65bec15cdd916f6c4a6c1823fc800aa6f70c0c004e6c6910645e5dc9c109705f2";
+ sha512 = "00b426505507935c4664437e6ad159acd272d99d6a674611add7466a8e0f1689d2f557d09cbab1604ef1b45fab4dbb814049cd6a806e0515b7a9633a434c4003";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/ro/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/ro/firefox-56.0.2.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha512 = "970a35a149c512d30efc1842748a26febe4c323c8682791396354c80d5b9e71a1e6a1d2c918a4552229dffdd26982665f8c339f483a179002edcce05d6ef3fe1";
+ sha512 = "17f8ede2c98f5496e8ec3027fd6b35c2a3d8b4c3b3644bb6f2120ee75ad3aded59497df34a91f355fd00ed0f0f08cbf0ee7d22905c9eafdaca73a4dc4f67ee71";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/ru/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/ru/firefox-56.0.2.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha512 = "02ece7c9664416da2be2042676d60e6dbfcc27568d74bf23f64517255675e19fd52f031c6579a9ef08f7ebf3d94b92426f3f8dc74fdb3843634e958597bb30c2";
+ sha512 = "706da80de603e54843631225b4a4a5a8e1c3ad3277230cbfc0aae932cc87858935b6ad4472f6aef366be5dd06eb7e87abcdfd6958740d0f3c61ef89d46863ad7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/si/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/si/firefox-56.0.2.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha512 = "0f2f273b7912f73e8b022e5101ca40603a272914deb49159529fd96ac627fc106f039454941b902e5d9fdbf6aede57f38f263c93ea561fa9bd933acc21c329c2";
+ sha512 = "5c4fb75c7fdf6c1af7e20b724abd3590ee5a891374dad9ca52a4a3f66a8be094be1e7ea7f7fef492ce507cf02a17432c593cbd7419de653f81e247003b52e4c9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/sk/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/sk/firefox-56.0.2.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha512 = "fa95f13fc3cc513fa22012598a6bbd82b23b8e0d19d19aff100dddc1b0f123098db8306582b8ff27bc2e6188b579a2fa22d7205aa04e718f622c723df0ae78dc";
+ sha512 = "5c72b34e74d7df2dc939d34ed82199232c985ad3125e8244785c081637f43a1b9cc0aa788b881d6749ff64749ac1cbf19a62aea078e5cb972bffc48e28c452fd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/sl/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/sl/firefox-56.0.2.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha512 = "eddc485ee09e45685a99715ed62921453f3d647e4f2c10b152d6e3faf626c4e1e12cc5ca76403c10cc94ebdee7dd999faf35b3e4e6d544628fabc760c07e7fd4";
+ sha512 = "f205e1b81d3fa145cfbc960ef97161af098b2607059f0279d94b24dc26fc06172891da20c5f6630b120216033486df19fd866a29182ddb16a176fa7605e45a77";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/son/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/son/firefox-56.0.2.tar.bz2";
locale = "son";
arch = "linux-x86_64";
- sha512 = "0a6b22284b2f65ce7cf8911b05a00df7675b042f7db31f8cbd9440929f4bd32a05b463a8c26399495847dd14881fa3fa1fd00309fa404b0cd12ffd24eb97131f";
+ sha512 = "789ba111b0ee5843fc2296430bed5d609476666e4b7b7981e18323f0651c8f3882e45b972f13540d5cb72f7c1c3700ee70c293936b2cd2758c0dc4f8f7ecd70e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/sq/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/sq/firefox-56.0.2.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha512 = "fce71fb0cefa5d975d0eb22a0a32cf99e3a6448b206170b260b68f6bc08957ee5fe7fc83fe3bd29a3ccefebb5faf731e9fbef2b642a99adb48deb9c0fa934374";
+ sha512 = "2e899d0223dcaa283941e50ae6bfd866a6ac26f3451a76c482379ecb886c6d13ea5084fc2127300473f4fc1f6ce36b4167cd2811971e89c27a950e2dbd753619";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/sr/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/sr/firefox-56.0.2.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha512 = "21667d882d2065d7106077fe280dd07afbbfffef1cd5625f830fc76ba8798ff45c4af9bab382af3eb390f63cb94de108aa113caeb3cb07bbea3ccd6c51333aa8";
+ sha512 = "a50e3c6cb8b0b4b2ab4201b613a0aa0d6c2b8d5b1ea934736681415aba3d2a8a9d4c4dca16b5bb479e0273137ab3b30315b5b2077907adb114bba07da9a413e5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/sv-SE/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/sv-SE/firefox-56.0.2.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha512 = "691cb5961830be2a7813a3e5c67af793e1f716f916fdebadd4031f288d8439403b3f49abedb4410a30317fa4fc51446638e7f18d4b33bbe0f94a93ee9c4dcb21";
+ sha512 = "5a81f87d54f0b6bed0372dff02461bf85b6d29045c1e1cf57ccf625fc79ad02831a00d64ad3e3506f2c98b64efd8257a9955653efa14510ce2a56df2eadb5102";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/ta/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/ta/firefox-56.0.2.tar.bz2";
locale = "ta";
arch = "linux-x86_64";
- sha512 = "bed2f31f934f5feca3189e6064490c7e90401fc0373b8a46f9e3f19fc5245830fbec1bf84de63a5cda2c71577fc8e0cd834e60c722b2e6a4634f9cec3bb3912a";
+ sha512 = "d486a95034ae5671ab0c65992a0bd4d53cc015f3a89a7c90a7aa2534bc98823428daadf2c72ce891fdf9fa84a6492c61a0ffdb36ca28e05060a020989b3c9f7b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/te/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/te/firefox-56.0.2.tar.bz2";
locale = "te";
arch = "linux-x86_64";
- sha512 = "6a43c634e534daf172ad8847e442c577172eae5478896bb01e34ef941156664ec55c633195e1fe82677fc0cf481ddaf847229f7029d279bb0a0bab256fb3b239";
+ sha512 = "22b04c05ee13140cab8196e218d6d2756fd8b108d0511ebb15d19260a20b3a153bac792bd7ce153d816139429fb1039ead270e80196aae801db9e0ff65c37b93";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/th/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/th/firefox-56.0.2.tar.bz2";
locale = "th";
arch = "linux-x86_64";
- sha512 = "9c91a5c6d2304b92111c392fd3d7b017b38c1c686df5f55073237a6655c4780d6c90100ddd13d6a7569f1b82797be8452aa6df0a4a22ceb3320d69bc902641c7";
+ sha512 = "a57bcad31e7682742756cb1b53eb4cd31d531305b0e7bf51ff49c1eb6be0e0c1a9ad054056cc5afde2f4fdf4e4094a558fa0fccb1d2e763dc841708e21c91eda";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/tr/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/tr/firefox-56.0.2.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha512 = "d38f8e7097164075bc5e6866968403acd5dd91d67782eee968065ee5f2eb0a6204d207b8249d97efcf955f52d510410b6b868712a3796796c0eeefebb0f6e5d2";
+ sha512 = "af694bb0faec36e3406f238f9726179ca6f2c5273f46a689f36f32d4b8baccdd69ce096446f0e09c88c065d86bb23058edc4900a96a2d14ed583c83eb0b86e61";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/uk/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/uk/firefox-56.0.2.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha512 = "bf10105b97b89bb8ddd4769ec0428d938843b9d2ceab2d63851fa0a6698c6d10241b65a3f2068503a4a41bf9d50811a7aaf01105918b8afa92879be96f043dfb";
+ sha512 = "8aca0e9be3162dbcd8e9cdcb67cd8eba77bda79f140f5d7aa06902e78d2e3933d5e4e3d0419cc665800505321c55b29d1714d72ed95978dabe39442f35ab2c56";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/ur/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/ur/firefox-56.0.2.tar.bz2";
locale = "ur";
arch = "linux-x86_64";
- sha512 = "b241c882c867a5ee808e9ac37cd14dffd17d8eabd241e4e01ef4573f7d4641007d58fbaa8875284ac640d1ec8f013b7a7278f19768b07d388b5f30c4d943955d";
+ sha512 = "effca2a2cab3972c2f521ec435c6fe1a5830cf7ad51e6fa3e533841961d55a6ef23ba96057fd82f5b9e34ef4e6936c5a18359969c6d25165267f7c8ae10b5d76";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/uz/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/uz/firefox-56.0.2.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha512 = "357ef3d85e8174e765682b9bd99b5865994119c73d41eafe3c6ce17e3430a1eabe358a1ae8c4af6d2d9562673a6ee65e469ca423ef7e0b135b8f79df4643112f";
+ sha512 = "6521181bbb32ad0edab639465842d29442871697f22ff566e30959213f34750ee2b77f48ef862b1e60fcb348309c0e2d7211f77005391d6455ec160d113823aa";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/vi/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/vi/firefox-56.0.2.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha512 = "606c28e1777af2364c4a85557f6b173baa2f07ae198da154655d949b4999289e1a9de3ccf8086c771167abf70d74c576a4440a73cd1a34c3d1bb5e13f91da307";
+ sha512 = "fd4de5b14e6855f68a7a5e6fbf8f3def7bc81d8e63f26c98af0e06143f9f8b50375dd24c9f0104c7ca62a916f3921160f1326a862763fdc37205abe8f91e4db9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/xh/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/xh/firefox-56.0.2.tar.bz2";
locale = "xh";
arch = "linux-x86_64";
- sha512 = "2dd2317e3cf7a487730cba41d24db990844fac4b5f5c2b93e70fa5cf635478e26a60aa2ec60a98f670419c72564dde487050c1bf1d662cf7bc8440654cab2ca7";
+ sha512 = "5a7fc7aede910ddffe3f15815091469b558b5a94dea2a1961442ebe3afe206825d182143a971c6603257760d959c133329418f319a3138833ac6e3a21ad29d81";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/zh-CN/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/zh-CN/firefox-56.0.2.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha512 = "714ef62fb08db12559e20d1bb6c7e253c4a12b275ad1db8279982ef5df9854e647241d9cfa15085620f12e894cc84a8d60da9b150cac222ca4b454e048e6ee68";
+ sha512 = "8080545c283f17964bdd08a10160633568dbbb3bed79e320f738a4fc1b01c67996d9f286faecf6327df7d28926186a80ef29f8ca1bce4cf049939282858e87af";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-x86_64/zh-TW/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-x86_64/zh-TW/firefox-56.0.2.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha512 = "ca5852892d7ab49bb1473425bc5b1e158b045f647ed33fda1b22d0e25267f45a87cd4ea296c58a4f1b502e6e0ca8c82ecca25720e61596e49508a550ba43f9bd";
+ sha512 = "d5d4dd2ec14a5982ed77306cd257f76710e5d4191f0f30dc57150c5c6f6f37ad8fbf5521dc81fe66df8d22e70a7bc7e0f9d621f6ef82e8b3c3f7c831eba7c360";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/ach/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/ach/firefox-56.0.2.tar.bz2";
locale = "ach";
arch = "linux-i686";
- sha512 = "3819fa366f4f5ca40276a30cc5a7e90325d40ddd281160948c06e9db8eba05b51b5e0f230a3c5113eb21e9638374d383b318df3905877d14b654874c83db0934";
+ sha512 = "bbad76abb597478e4e7b7cd5bfc6a94b430fcfa5565eb8e4a2acfd01cb5502a883e0823df78567879010126fcebc193e44dee74773fff9a0c66a0adac13d5234";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/af/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/af/firefox-56.0.2.tar.bz2";
locale = "af";
arch = "linux-i686";
- sha512 = "eb7b48ee9ce0b7c08f96f5d09b51e1819d38fccf7c71cfcfae72e3189ebc928ec4692a7a10964d6dbb42fc2ff04da13d5f058084e6376b67b0a1f4818922ab45";
+ sha512 = "0dba3b898cf46397336dacb56c2e7e14584ff5da95e0217516697c1b028a1b62a5f62c3875e41e5cecb9f1e1e1008103cdd2f46ee2038f0553459c65d703f094";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/an/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/an/firefox-56.0.2.tar.bz2";
locale = "an";
arch = "linux-i686";
- sha512 = "956bf6e053fb566f4a6506f672e7102c37548af41807797078b2cd7560fa4dc17cefde0b21939a5fad75005a98adcc58893ef01d170c312065c2fb1904102bb3";
+ sha512 = "f5c7086004df5fa239d2f845bbba19ef7f2a1bfc2d81a42147aed859dc6f94fd0df134eef155b1a55899c2c8e4610d5384e51619e3dfd874b1010dbc5568f7a6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/ar/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/ar/firefox-56.0.2.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha512 = "a05cfaf18d92d8b0a43587cb685e192c69cae3603c94bb60f9b7d5c3380d498dd050559fc1d041860893fa52651fd30f7a734cb98699348587f3211625e880df";
+ sha512 = "710f15ee9fec1cbe7fbed9482c4f4593043626a90be783b63b923cff1bb51417f03240f0feaa605f42a0c0c1984b0a643f3924a1f6ba7f32abd1a4539de13fe4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/as/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/as/firefox-56.0.2.tar.bz2";
locale = "as";
arch = "linux-i686";
- sha512 = "b855da6d338d80a58aa9dc6f4a39ee9a5d21c92b25f5a4b349f83070fca7e27cda8c7d070b2c543723f6cd061949e6c91f79979edc45c0dba9dab3dbc81fe4bb";
+ sha512 = "39b2c110d3eadff569de5a11e32fd1bd487c2318eac97c7a5add79d7734754141c788e5d90a3ad1936e204bee386d082f5af6ef75931b07a682e06ca2300407e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/ast/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/ast/firefox-56.0.2.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha512 = "57f498045089ee3e96b5f3f80caf3919d39c3a40ebf68b1b578e1bfb14555635fc216956387ee417cc1bd05cfee7bba3260890d161fc1ea8471bd73399a0ad41";
+ sha512 = "d064c858258404e8facba40daf6b033d7a99caea2405d369d4cb8864f5baad9ace9ca808a7ed3f5c6a87553e3ffe654c6a34d081e4948a76df9a743099af1638";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/az/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/az/firefox-56.0.2.tar.bz2";
locale = "az";
arch = "linux-i686";
- sha512 = "38399cf0c73942f96df9a4a599092fcac64956353d14e6395a1c0507fd0c7cadd566f571c12bfe06275446a5412e69c29bae95dd86aec42b97acf960026b16f0";
+ sha512 = "fab2a1283b4f2588c44f5866f2dd8ecff3b9fe22e32bdacfcd825aa8994bd70f6067331946cbec755831bc13de2f97e82685d684a68012b33ee4f1de7e1c9165";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/be/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/be/firefox-56.0.2.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha512 = "047c06fb4ec91013521b237592af85715140ae17a10f095f5b8d54516f6b62a4dd90c262294702258161bf781a6babdf7ead4b2c5f7211cb5e87a332c552ed0d";
+ sha512 = "d366fce83eceea67e3fee81d4dbfd607f2afd2ece13125ee0334e23e238fb2cb7bd2f6071abfa3103284aa035cb1d85c3613674709321dc073a5a7f02999b16c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/bg/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/bg/firefox-56.0.2.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha512 = "9a823d322edb570bc53c07eb63414b65baf82df2f37c7d2a6d52221b6b23d0804c890af9c3ecf66032035505ec246e096864754930426aef4be008f5969fee67";
+ sha512 = "3c2cf88be4ad5862cd04fa81fefa2334aa20221fd3ce1ac505bbee2be6adf84e9fcc78db6818d5f7013ad9f3c72ca9a8da71eb98e9a39127d0be85025125bf10";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/bn-BD/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/bn-BD/firefox-56.0.2.tar.bz2";
locale = "bn-BD";
arch = "linux-i686";
- sha512 = "a5f8b004170993b4317044df0c65711597b5eb8f046cc1115cd047835b90045bd16740c47901b8e261a037be9592493c11cd527f80465d46d19c06b692139103";
+ sha512 = "4af8e284f17919064ad630e32d0c0fddb0ca2d12ae5134c4d3354dcd23a7677d7e4a6223958f1097b47cfdb78afc81909b118130aca94ed491038786289c3842";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/bn-IN/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/bn-IN/firefox-56.0.2.tar.bz2";
locale = "bn-IN";
arch = "linux-i686";
- sha512 = "2f161b15a10577a48386cf3277c027d2c0103c881ec33b57e87824b4e40f000348356ca0a6caaf20d50263c5d203ce02a6a734059ae477b72dd8b55e17bcbbbc";
+ sha512 = "5ccd06a65c6c164bfa5fe766a6644fbfcf3852daef8a0d052e446ef78d20c96bb738f62556d83c6c4f72a107f2038636f3db7a4b34c58d456938d13634122841";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/br/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/br/firefox-56.0.2.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha512 = "1a99b157661a90607af89117321f1fbda167bc6804ac95434c6a17859c8c66d86bc957cc95d46e47c69f42b5f513dd39a876881ca69221adba9f7790da7e965f";
+ sha512 = "8ce3cbbaf04799ea97bc4721572b90f82d8de839d2787925d45045571d46f6f7a97f0e6a42c484e486e01e78e937425eaf9a1ac26d74fb7fca173510dfb43313";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/bs/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/bs/firefox-56.0.2.tar.bz2";
locale = "bs";
arch = "linux-i686";
- sha512 = "f850f28cfb54798e0305dfc2525ae59f1568ae93133fef2fcaa5e30063d980263e47324a3bb038ba3a9512aa621d2232475d5c0098d4d5914d661d5f36e9b51a";
+ sha512 = "0eaca44c8f3bda580d58d26d089dab50d232553d3218226e5476b470501dc6d53ad8351043f14686ef77f4534d69d3df9af67fad99d702314c187ac22e15bb78";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/ca/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/ca/firefox-56.0.2.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha512 = "5b67953d4fd2ef7235fab59b83a17814d9edf106183983dde21746ae1330c9a9169cffaba21b7cb9623d93a82b67c9c249800892601db58b4e42efb8323cb7e0";
+ sha512 = "810d5d81cbf07a2c62beacd97d1ad602a492d1d0a2ecbaa9cdd328f17fdb98657cccc1764cad9ac1bc71624c9f217c02cb8d3c48f6a7f5b0872e02f6418e75c2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/cak/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/cak/firefox-56.0.2.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha512 = "05ac251aae543a91755b927db98ae44aa07b06ba824d784e72c91c8aed741eb54d0e4b27167dc11a96bbdb765c6daffefe6ad16982812664070d07b5b6a8dfc8";
+ sha512 = "14df3c2cab46957dcca106999948b00edc2b570a06aed6091d8c544aa838e7993ed655e8baa41d0c84cab68bf2758816b8216af8bd2789fafe7fc1a0d1741acc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/cs/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/cs/firefox-56.0.2.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha512 = "c0789840e6a3bcc626ce99bc94db727c09d9b6e3b750dbe3c7e2310d00f3d3ef06d2dd3c755daf7e7081f7fa6d059a4e5b0982b513ce5cd4f4dcb2a63630743d";
+ sha512 = "baac4efbaeba22c651b625becd24867ccf39acdb744559e1b113811b35503eb5deaf2249565d936983d88f382135bdd28fcbf518c79203fae29730f962b2bcc5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/cy/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/cy/firefox-56.0.2.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha512 = "8b8c1d7f561649f37b589cb11f4117a762e704a7374ff4f6aac1594d95482f13c7dc00924ffef76b41ad9c00780592c16f38fdecb60975de6d45f6d1b5e6a97f";
+ sha512 = "ec2687e49101b76c787dedb4c21d886195a0a14aa5e653bb335675c300ae2c69f1cc07d71dd70145c1c52f6dff47d8e75bf9b7006f8e861b86b97df07e4667f5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/da/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/da/firefox-56.0.2.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha512 = "42312ed0a97b2bc03a37cbbefb8027d373c0e1894a3b37e78a6bb8ee5f72a846d4e14835507ad771fbf4be60ef34768d5e866a4f691a0af827d3667f7b1c01e2";
+ sha512 = "c0f9e29b66ed0eb7c47e1fc633a5dd3793d2f843827c2b37f51e48cccccd909031855c0f1d0acb8f3e796a0f74f847b019f01a207261c9c043a8ea6b2c4d3fe4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/de/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/de/firefox-56.0.2.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha512 = "9a228c3e177b11539666b9c5f0a4ec19ff86da023f5a302c81266d85ade1c8e39be861e43e143bc0247f09af85863aed224011bfdb4c64bc2dac267fa1e548f3";
+ sha512 = "6d079b71b7743c6cdf7f11e0768c122a957ecee5e8ca7094b0b71fda937560480de8222440e160e1b9a4987f4615347dcfd445fa7819efb32ae2985b3f106ae7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/dsb/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/dsb/firefox-56.0.2.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha512 = "d8c791da0654bd46fb52c866ca89399a65186d63e0262536ede7263ca3fb7af852281e50faff750e2d3020f16d4f85caef8e5d33629ff0019e249bfdd87bf439";
+ sha512 = "701205540952a95e43b6b45e517f7013f04ecf4565e1fb8eb2d856b590b7249cc9f212c10c711350f030ec4197e53037da812aca15af7429a1376a9f354dbb12";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/el/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/el/firefox-56.0.2.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha512 = "9e466913d7d84dae64d0e537093cfcd46128f3ef9fef10f8ba675195e83e2fd0a32a4602231206cde599ee8be7e246e64e0858dba36c6e283649c59ac990db5b";
+ sha512 = "41bee5f59c100d6a5d66ff509286c3c694ed7de2d576a33d9ba1b555c44b75e1174344841f017b6ff86e467d9b5ae1e0318eac3a87dab36bfde8300fd8ffd71e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/en-GB/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/en-GB/firefox-56.0.2.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha512 = "5f4199493fc4c55c1b247cb729c65b83ed668c65704284dbe2206178e4264df852a73925a1adf1d079f77560c9538427544826af8ec311bfb604bc7a5c691073";
+ sha512 = "35d159cd9eb069eebe84919cc2c29a2b962ebc62a28b0e6d8913e9dc98405b86f5433def34d14bc6da1eaf7cebd778ea1074e91f09a183c661768ac9bf306451";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/en-US/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/en-US/firefox-56.0.2.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha512 = "51cbedf391e4b2b33c4bf4882a6183084291136064d2125e14da6cd86cbed8f979e20adbe386848d1a22c2a4c567b99cb68bff51668e53b6dcb85e92c73e47f5";
+ sha512 = "8bd6cb9e4762f4f5085a790ac1235a88e5b6610d4dc1e34c5bae13a3219b05a35f57b40483b6078ae93d60467ed728d75dce2355c913530974aa47884595a8e7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/en-ZA/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/en-ZA/firefox-56.0.2.tar.bz2";
locale = "en-ZA";
arch = "linux-i686";
- sha512 = "33b6fcefc6d4867a670531e3de4d4a926c934a297b890fc60b3c4e6acb6237d2c2fc1d0655b8da42406ee4ed62fa98bac0a94fa7cdd3f70a918232e95df3a317";
+ sha512 = "5fa8d2f8186c35d8e6a01e90cf763e35b9a8f99b272bc6dc9d87f80b8ba252b48d0e51e8a60bdb0aafde34dd50c1be374844c87a79917e2b521db1eda4f60a67";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/eo/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/eo/firefox-56.0.2.tar.bz2";
locale = "eo";
arch = "linux-i686";
- sha512 = "64d93eff3cb4f19185975b830e4f956d2d76e8bb600176a322a57f873e7bf8856582149b9c86d7af7652e2e0ee2a355f821607810713bd95e5738ef1b436a7d5";
+ sha512 = "7beca78e35798d3f0f24c8c87e2e464aa2cead0fb64d5c0ae4a93caa831da4509ffaaf0cc84d0624d389f7f846a6033ef067b2d2c7c5b7be2b276dfc0f2012d0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/es-AR/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/es-AR/firefox-56.0.2.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha512 = "6ac236b635ecdafd0864711c56bb3a4d339cb9540d5cfb4836c437f8df9c9fe9d6b65c4c8b1bcd68e2e04ae86f3e70edb5e704042c2ba00611b7f60fe0b3d071";
+ sha512 = "80110dc1761d36c02ba6d42e11b104c54056fba3b00788398f09ad83444968700487af348ac1d275ec0f303b63264fd0b4782fea02021dee63be044163a2c9da";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/es-CL/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/es-CL/firefox-56.0.2.tar.bz2";
locale = "es-CL";
arch = "linux-i686";
- sha512 = "0ba857c7d7f1ed986110ec356cb4db75f7ac6291ba0684add7cc56f4505fb946ddac3c603f3bda2a9fe91b2a3031a7cf4dac59bd781dc148c09dfce4d4837e3b";
+ sha512 = "64c69b812b0fed858aae85f17baa5acabcacbdcf494c164575bdfe18fce25cd26afa8d843003785883fdf3ada347d42cee3f2379692d81cedf841fe1605b47fb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/es-ES/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/es-ES/firefox-56.0.2.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha512 = "0440a2e9eea08a43431c377bb4e8f4e747dcc8b608b68a2289ada27bd4b3950feb4ed2946845d725be15fb6fb910f984e791229631100d3cdfb39f9ab398780f";
+ sha512 = "40ff4bc3cd70c2891825a6f68dcd356291957c45d064537fdcc95119235a7764fdb786d586504db1b6fcd92c010ea4559162344d69ccb085883634c4376e0170";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/es-MX/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/es-MX/firefox-56.0.2.tar.bz2";
locale = "es-MX";
arch = "linux-i686";
- sha512 = "7c9ef5df8bf96ac277e7488c2ac0743afb72165ffdc5723b4bc4c64e1c4f7d338f453fb50a7d938bec39cf04217b903a56b86ffe3856f8437ddb17f53a48f32d";
+ sha512 = "2a05d20aab08a4f8745f93f011b1e1ecbef0920ef80204802c8dab7290ece35d4f351b68c1f417de3d547bd26523bb05cf62dba3d118c21a56b4e2f06433e4bb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/et/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/et/firefox-56.0.2.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha512 = "297fa442fbdc2042b3b7756de00f2573da9c5544a4d83a6409808ee929d441bbb7fafefa023f4d858f0fe55f08e6cf6397ad2732ee197d01d4a03ac504e62087";
+ sha512 = "8a18de633eeb34b34c198c28b03914bf885cebe4e3ce15874b4fd99609d5931e703b82683450ab36ef732c99b974c0bb9d757717a3acf51c5567400a8a712e9c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/eu/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/eu/firefox-56.0.2.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha512 = "fc79272cb8d9c22607fdf0075681abfa34ccc78bcba8801e1181dc46ac9ce420dc3b789a4964fac37bd89fc9e8b03af8b09bf5353f7b3784014c8327deca28f4";
+ sha512 = "795683399a11c7e2ffb33566be6e087c8e499f2d7a8511aa36268a5c3372e1cfffa7f6b23402dcd40ea384f4231167fa3408d680e6de1cbb0a0371f2e477c6af";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/fa/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/fa/firefox-56.0.2.tar.bz2";
locale = "fa";
arch = "linux-i686";
- sha512 = "ec6429c1d78e9b5e1e174c7e13d8d99a8358289f67c76d2ba3c3bf096d9fef7558969df37693b86d7ff077206d35934187906f82edefa0634a3b2b111f42cc1e";
+ sha512 = "dcf0c1f5d58826d05d7eef3a7dc9f50590dba939d1ae3f4f1509be246ea1dc7c1c65b5cd642368ca0857db5c31311112d3770f1144c2319c29a4dd93dc1bdbf4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/ff/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/ff/firefox-56.0.2.tar.bz2";
locale = "ff";
arch = "linux-i686";
- sha512 = "fc7287c16143ce71075b2f0bd5724cc6568e4c7ccd08ef81d1f46f945b6af18615c0b465bdbd358919af03ee956437cdb912e41c94741ad916d5e0ed993fb37c";
+ sha512 = "ccb5d1924c730ec816442fc4627680c1638464c42865252834572b7f0c6b163c773750a9885f711b523c119c11cee2049374fe61beb7115bd2ae51d3b7f6beca";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/fi/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/fi/firefox-56.0.2.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha512 = "2a73b783ac0c9728385d7a47e94a430bb04c3d8d50f7d35fc8256551788f2b23156e0d8cd73595c2d11af26060a4f5caf9c711a2542d9d68197e5773fcd03cae";
+ sha512 = "e3422e1f91a9009e2bf29cb034a2ed001c3c2b32db7af4b55414a5db4979e8b7ab4ce415ba23c015e4fa86ff7c87bea8dc7e4d9372c4680923c24068cf0b9ccc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/fr/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/fr/firefox-56.0.2.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha512 = "c8c0fd587e0947793c734e8b8a71f50f8d9321e8ea5214290bfe721a95e7ddb5904a7254a39d1ce395cd674c47ee34e613e09174528fb5c5a94323018d03faed";
+ sha512 = "22fbf62da966b0f922bbc549eac956b74de8057c5acc4d6278f32c643268b809ecc117eb623ec937adb26be78e1f081f1e0eba025597937a613b0ddca085385d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/fy-NL/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/fy-NL/firefox-56.0.2.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha512 = "965e29af8153a239da08de82ce52acf78a76a02634daafdb8919c2c8c82c553ad989c7d893c6e9c0f9c10b9540762997c2ecb4d41f0411593588edef34eeae22";
+ sha512 = "20439b3d0826fb166bf928a1b9e509d570b342ff3449a9c6ba5c402537b766ca75522f65cb5f1670b147038a98a5e7fe4d2aaecdd93e1c2b8c6db2d7dd83cdbb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/ga-IE/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/ga-IE/firefox-56.0.2.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha512 = "7abe283e1898c11bfe5df5a5ef629a0d08887e12606648c39a21eac4c96235c2ea5e2493ac1515d4ed8aaba638cd14f85c929fd08d8f79d933428823e7096266";
+ sha512 = "00ece6e619eb647a4ee6643f8f174309b81ffe25c1b491610d0dd25fd3b294db79270cb2791d9818d5629206dac1a003859bf6dfcbbc180650c1ea1c7203c512";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/gd/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/gd/firefox-56.0.2.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha512 = "f980334b4576c3ffabcc41431a90379ac8d13e1bc493d39928f30faaf343bfeff9cdf897551b21548b4556df43eb27103f2836b9797331304be2dea536b63a57";
+ sha512 = "c20d2cf4fe1748cedd3ea3c38d2b7bfdc72dfdb57009b47146bb0e01ddeae03bc48ed20e4f86c489044da8f06af7e3f67bc07c9149da346f142aef1eddd79a27";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/gl/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/gl/firefox-56.0.2.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha512 = "5fb1d134a6ad89556880d3df3208c796a14773e1c7a62f4191726d6eb24c13c2e76c9a4aba3927032da4865786b936667dd6f96b8ca49224494ceb0f08ee759e";
+ sha512 = "bf06db4a9871174d59fa5d53bd854fd0c3fcbb48e27614e626860fb4e2c248fc65be7047396b4c002c978bf8eb39ecb94d3cda0b80f583aa84aff16acfb4e6e9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/gn/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/gn/firefox-56.0.2.tar.bz2";
locale = "gn";
arch = "linux-i686";
- sha512 = "508a04bef58c1042cf04f47134e615cafe26497ebe1ec0401f9d12c3fb21f87386a01859ba26226c9d0267c40cf6e5843349035c1a3e2f49c7c9f9d1439abd25";
+ sha512 = "a7c89f53425a614ce8ed10a7cb5f78a4da581f088ebdd9a7b685779bbeaf1daa26879442c0569b7370f7db38f1db90a894ad22af094653b9cf337bdb5efa403b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/gu-IN/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/gu-IN/firefox-56.0.2.tar.bz2";
locale = "gu-IN";
arch = "linux-i686";
- sha512 = "5d44ee3027a37c8251a8c612a08d8f6916f809cc0d86f8906295a82efc6d98f475bb80c0f961bf95871e7b2dfed8faf151ecf43136a022a2f7796070625ac71d";
+ sha512 = "5beab230f4b7eddc9c7c1818e732a5a3dc3f182112ad8b0149534e6a2a4a948f02e3c8de1a0c4d8512c050a0897abf1f89b52cb085b71426015051510eb03e41";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/he/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/he/firefox-56.0.2.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha512 = "62d08c2ee0b7015808883e66e5c54ed09a5ecf3a0b730efd5a89bc8d4cd35aea9ad6dd9fbfe394f12c2846923f47fb66e393c41cf4c273590a890ef1701fb7a0";
+ sha512 = "d5250c04dfd43b154d9a4b2f56912bae0a65c8eda8c393440659ed341d4371ddb543c75ddf254da96bcfbc873ff9d5d685701b0842e80b4e134f1631b7cfe7b2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/hi-IN/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/hi-IN/firefox-56.0.2.tar.bz2";
locale = "hi-IN";
arch = "linux-i686";
- sha512 = "b6b21ed97830233ce22658e4bd7637a6449f53e095cc92b7381afa30f4d74c8df5b1082bcf1704aa75b53c0dcd75ad509774e818ee4073bfe6986ae4e93538a0";
+ sha512 = "e3e8a6e5376f566190d9f25527eeae195d54d91c3d213a1d20464c2da197678a31de74030fde8c365b91ac032a711e57ce7a2d4a84a087800bc0c1db16d188a5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/hr/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/hr/firefox-56.0.2.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha512 = "124965251c04b4db521b79102be73b88d747d0ab47898b2929ab867b24cce50768f62b61afcd3e03d338c958065c429524ef61ccaa0ae80fa1ad7c3def20e1d5";
+ sha512 = "44d5ee009da2735a042510c197e810116d13d82cf4662c34c44b651890065e4f0a8d1cf515c0a39bb9444764ee8312200e17887786cf5f970f4f02a07a9803fa";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/hsb/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/hsb/firefox-56.0.2.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha512 = "aa08c3616051ff566576776977af5a5827c5dcb68472ca48af5adcf0a107325395f9fae8a51f824e126b74fc9f6816401acedc0bc61783a8416e6ea3431fdf85";
+ sha512 = "5e0388ca340c6273bdef0b2b616c0788de6f0535fc6b25fa1b5c74008bb06b42e8a086655361248716f0d1ef001d27da4ee336bc3ae6851ba282915071ed071f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/hu/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/hu/firefox-56.0.2.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha512 = "5b7e3c318657e20bc012f1324928c43b950cb1fc860ecad40fe6a64e4cf8ce30e4a32bf617b02e397dda7a1f8bfc40c8709ba09144ae1bf5676104fad1763798";
+ sha512 = "04bba88955f56737153409553fe52d66bea6d2b0f22d0da520fe40d706d3463ec19c9462b6245a4e6346aa1cfcce583b49efa8089c8db329e4756b1c5875404f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/hy-AM/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/hy-AM/firefox-56.0.2.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha512 = "31e5389d610ccc05d387ae23676bead9176d87ada142fc545e571ddf296a4bfe396725982f011a2c0b35dec8f8d06e97aad8b42235cb98aa9db5f0352356b3fa";
+ sha512 = "e4515485db9d85291028c06bbe19aff4fa894a7b82d1f826cf2cca91bdf08586009bbbe7b8f4df6f6a20a7a931f8ecad4fda970e01af7ec4f68574b3e99889ab";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/id/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/id/firefox-56.0.2.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha512 = "b037671a6d63e0a55564987dfcd1b3bee1347c180e29a6e6df80db0d6cda284e08a6eb5b31a37a1eff208030aea3cd3d4ef0ed711ec1c936c746efa870e5bd46";
+ sha512 = "5cc82fbd44b61cb1d48c7b51c91874de20b42b3249efb1b34cb69720a39e08dc52d814efe73be13d1f0a25be9640dbce5fcabcc83a212f1e0e887ebe47a9b7f4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/is/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/is/firefox-56.0.2.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha512 = "6a681a05885574a163d7603edf61a0d075728c7eb50d8e78690c0828d5189ee757cc225913f060b27a254f2a19d03eb63525fd5f305377e45ee4ce5c729ba397";
+ sha512 = "65d1236d88ef3ea9f4f9b8f86d59dbc4e2dc2522e5485542dff2d747989e7013f8ff1b7cacea00514bd3510ccc145b0a96224d48947b0fd916bd0742354e958a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/it/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/it/firefox-56.0.2.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha512 = "5e37dde84cd5b7a162438d2d418fa80f8529cc3ff3b28bd37b0826d8f5981ffec6fcfbe7b41cbba92d7c921bdb1249e6b0f5188ef983187e7b60bde08e80bb24";
+ sha512 = "cad3506e98ec810aec450755090217b85145ac0b4bd2faacba35d1051a5a5419f0b8ea2d497040c6f05579875a2f727938be5f964dd6d5d2973cd681ba6a8716";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/ja/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/ja/firefox-56.0.2.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha512 = "f59fe7957981b362d01f33483bb43ade19894c0f80fc2a1b889e3348b27876f54b7de20e9a67915bf8a4e0c4d89cefc87911841637c63f987b0aea183bba4ed4";
+ sha512 = "fc8f6a902b8151479f427f58464acb8bed25dab2ddaa5ad21703cd79f74867c829b9b6838d0fc35f6471d6b0e59f005158bf80946ab8b3abbff9f71e13b10fcf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/ka/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/ka/firefox-56.0.2.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha512 = "381f250da469df0245bf6a41165955b0dbac3a14268b9a9bd59836d3094695ac6ae434eaafd41138b24fec3507a6d020ec2bcde740865ec3605a554a1c7ca0e1";
+ sha512 = "783043bf2a638a5280a72dafcf96b7a4d2870dc91d07e85f7fe4fae7f66dea60def9ed5fac28b7923c5ab3328aea1c9eca38967f3daec57e5de53f501d6c7ce1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/kab/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/kab/firefox-56.0.2.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha512 = "5f33d95c60567e02fd4f721a5a0084a255a16bb130737c7dc8e4ee3334f2eab33d4a415ef306bedf55f7f0aaca7e615bd5cc175a08edcbfd770c035ce928bca1";
+ sha512 = "605761315426f05a5cd138804c205ed4e1c6d9ec8e78480f97f2f46e48ab4e040be237086af4dc63fa198ce9364972151d819e7de3add8243426c162b107454d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/kk/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/kk/firefox-56.0.2.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha512 = "ba2006d6b797fb63bdeb285d7eb5f91374f2b8df7593f712a6b5fd185bfbf8af082f7e2db1f7a79a15cc34a95458ed114b78daf89b362dffc7238a253421ddd5";
+ sha512 = "ce10569378e0b8b6f77da7534fd60a613a3bfc64726e2c7ce22042439d69e4f6819164029d8ef6e691031d263a0033c42e0921124286dc04afa7c81353b5645a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/km/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/km/firefox-56.0.2.tar.bz2";
locale = "km";
arch = "linux-i686";
- sha512 = "ff67a4724bd50795aa8161b74382f9b53caab3b98f6950b4d3285c0f8ea636c4b6626a4d3e8ed03c633f756ed9738b4ce69e6cffdd034aece4515ab7bb9ece07";
+ sha512 = "e4ef8fc7ad18550ca93f679ec79b4a8e16cc34379ed52917dddcb7bcbdbeb6b82cff2dd16c31001dbe8232bf49cec6eb605ddba059f71c109079e4fea679c81c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/kn/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/kn/firefox-56.0.2.tar.bz2";
locale = "kn";
arch = "linux-i686";
- sha512 = "42eae0cb137fecfadc72dcbb0e7ff62e7b6701d1ebbf4190e1d20a1211d200b54989f15889f260566002a83d672b105453cdf23c2094af0f55cf4300381e9c81";
+ sha512 = "9e841f2b2161feebc643956f92b3562db4842528b37180e0ba5d4c1357b6a23d11fed6a2a00f0b252d609a5a43a15dfad21b97e3ce012dc9f30dfc20ba23549d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/ko/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/ko/firefox-56.0.2.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha512 = "8fcb7965e550c9fd510bf782f54a60bdc38f3707874c6f24d1a24de7ddd5eec2736490c6cdc2ed1206e99a75b3d7267a216bd6003652375841789c0d0e0ed71d";
+ sha512 = "d5fd6d0826d7a28b69f05cf620cfd45f66223fca21f2642228a4e3475623c34bc4d57bfef513348e96dfee1b7c5b47e994147b7004dfb5efc60d8261aa278651";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/lij/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/lij/firefox-56.0.2.tar.bz2";
locale = "lij";
arch = "linux-i686";
- sha512 = "0dc0d54b31816be522fda4572347f6c4f1c244b0a919650500cc66beb39da1e46637db089cb595228213cd4e99262bfe4689f6315f25f6e359ad299bd9d202db";
+ sha512 = "150f06608d1f7942277e30f7ba5dbd046dd826152183e30cef8438a7ffefa4297b4476e5fd4c4a2b4f376a1e8f1fe11381df36d41c6705e0ff1f14dd4b90fdd2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/lt/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/lt/firefox-56.0.2.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha512 = "9b498e3adc4d069e219af0034a69fddff2d70e7a28dee522448a2c4586e26b6b905ba8f501f5c9b83b9ff8a2888d7025171aefa002a815fb6d352889cad95016";
+ sha512 = "47fc24786499a5eb770a9d949df4f7b6a0726e7f74a45fb767aaa30e1535d30583e5353223bc3cecafa89284626a5ea03c2633d1a264ec044e51b001b598ee91";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/lv/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/lv/firefox-56.0.2.tar.bz2";
locale = "lv";
arch = "linux-i686";
- sha512 = "2246366ee92a315330a4e8d1e77e21cbf875d599c169bffdcf32eace63b5794ca106d5801523bcf547dbb26ed24aab3ad108e461a8cfce0254b6389f6b1df077";
+ sha512 = "3863b8bbfe87f6ae9787f009a7c3694454d410140a138693ad1419185f398c6d2b5f74111484cc97b5c61217d3af904ceb876efc16d03238901c858840f69338";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/mai/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/mai/firefox-56.0.2.tar.bz2";
locale = "mai";
arch = "linux-i686";
- sha512 = "ca5bc8eee4fe7643c98a3c93381a7156373b1ec94c86d8601d1529daf8cb225ee12d813fa2d310384d99cfd130dc3480ff243017a15739533d7cf7552052f12c";
+ sha512 = "7a0a97c9ed2ba31e05eb33790f53e1d9d2d4752ed7c556bf7af74b76828d0de2ff36b89a9e4e77fbb8dae5198b142a62e09465210e62c0d23c4fe93fa726ffbd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/mk/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/mk/firefox-56.0.2.tar.bz2";
locale = "mk";
arch = "linux-i686";
- sha512 = "ca81a90c97feedc7bda3ce61f5dccc0e3c2563d284a8e10c4ddd16a3d93042e3fa38f10dfbb0218df9fa83051b778ffa629d5f57735de85e44b74b820d180018";
+ sha512 = "9328d9a5151b6833f594f4ca8c523797a4f75d11f9c5f77cbcfddd7c99f6c3e792903c26d059f4025fd9d5b5e76175d52214963e541b5f01c6f3abdcb667873f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/ml/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/ml/firefox-56.0.2.tar.bz2";
locale = "ml";
arch = "linux-i686";
- sha512 = "7668eff72251028c9392774cb84742ed5027d4e0b617b4864b0e3d079061c95ab81c0a2471466a1b69a8e0e5d331b6b75c6a63be2411ff90bab48b3acab28ca6";
+ sha512 = "53a52a6e4999f116158c2043b2dace9711946ae2ed2638189c38af9677f70afe2b0e2434054b12ac34da531e40d58673b8be78b7dd6b7ef090b1fc8c26d16d41";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/mr/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/mr/firefox-56.0.2.tar.bz2";
locale = "mr";
arch = "linux-i686";
- sha512 = "27f6410bd1da1e7360cd86c493aaf7ec406a30957fa41b35c5ac8b7a5c32eae2da0b5197a018379215bfed60032c8291446d9e3a10f5b371675154cb54b8d0bd";
+ sha512 = "90ff4ce1a1fb75fcfc0a2d5a38df9a095108b83cf3e6958793c962683668f5ec95c72274cc330e7bff616a313d1c267b3b55cc7be231f0bcbbb58764dee5e06e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/ms/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/ms/firefox-56.0.2.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha512 = "cb1718ed34f2e1a48a2ac2f69a00d477cd3aacab7a6b0d149f240ddaacf04993c44403f68c9d5cbac95e03db893c8b713208466784f867d4b00b0122b9de5c39";
+ sha512 = "cd5c44219bea96b2b1d02dbfd80ed6b84fb40b19d1d0c170716484ddd6e07acda961b824631235f9f300017531e02e12433c39d90799acc2725bdd93cfc524b9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/my/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/my/firefox-56.0.2.tar.bz2";
locale = "my";
arch = "linux-i686";
- sha512 = "9fa2f51c3666a7536dcfb8fa769645117c98eff0af9969bd0e54853c42345ad407b102db952ae2a9cbf286c221b0a821f56f3f67caf114fb62990b0564aacba8";
+ sha512 = "f9f17da2d15b9f9850b97762b6cd6a7981ef9a64afcf659b280c23f6bc7c741e73537191dbdec90f89fae8ac7a552fac90039820b227b59ebeb197dd6ea63fac";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/nb-NO/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/nb-NO/firefox-56.0.2.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha512 = "230afe8420be9daeb270fbc836de70ae2eb197c2b1b9f8d7606d16c73c718190ebde135bdb8a78ef29b1b271a30bca3f5438434c54e76dd3f86076dc77fc5b6c";
+ sha512 = "61875cea3c200d84a65f2cdbdacd438d6b9437d27f62f903b2f46735c2be5a36385bd2276572244da64ae77be785b268a54db9590c2d375e8205b87b0b859d0d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/nl/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/nl/firefox-56.0.2.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha512 = "8d8ba124d9efd39a2faee19d2e37fa11506a135aaf70fa780471a7ff763c943e943ff970a70023d4431da50f5e7f842382bef66eea6ddd07f3deac05850761ba";
+ sha512 = "a769956109ce7867b7cab41720051afafc32fd9579b23fe2c2e79e389cc193b7f8521cf27e5e3be805fe3b7347f2f0ccb552e46e140391c800b66bae515f61da";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/nn-NO/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/nn-NO/firefox-56.0.2.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha512 = "ee7125a2cbb47d1ad7b541ccd4480eae05ce5b94d8a280f8f99cc45a29e23480f3ba5610d5f97e2b5ad677a2d6b79b72162707fda851f5930b8f38ba030abdc4";
+ sha512 = "84d13b0ecdfd3db9b8b72266a5a3a5fd300170cfb00aa116c006cf29a123d3e6ec87594125dee9f28a5c4a5effadb3a9a5c0ecfdafb32a221a72c043b28e958f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/or/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/or/firefox-56.0.2.tar.bz2";
locale = "or";
arch = "linux-i686";
- sha512 = "f7dee58fa33c741aeb0a85e5d9a2787e6af7a74e48cf41f76fb381f8761ce5883b639e023246ad94efa42c51da88dbc1bf5c1af25832c01e71915a9156e07a42";
+ sha512 = "61a95eb0ab54afa990a809d53039d887e477633462226de9c41f77474fcbbb85ba8ff253f0399cb1fe9a545c38d0a63e03669d34f5e0d34c94d781490c6235d4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/pa-IN/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/pa-IN/firefox-56.0.2.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha512 = "28f22dacd509e904a61c915f40abfe315f724f919a1ef31d338173ba92df4e7977f77b48f7aac999a89b170f845d0bd1e21e07090189193a10568ed14749213a";
+ sha512 = "f27f374a770dee7b91751993b15e86c818a8c4d6758b3e9498e14f81fd7b3a5fb0397b99e87b2a4f95141d4ad788c120d32a94f37a70b5aa30b6d64dd7c92c08";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/pl/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/pl/firefox-56.0.2.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha512 = "712433bd8d4cc1d1a29adfd2c3de423f355dfe92ea9c341b1315272f22ae4c1a1b7cb34a9320e8ba2479652e99401b0d449824fca23b4a61bd2763265ccf401a";
+ sha512 = "ace6225fefc5149ade7ac1bc30992847529183c6aa903220ad2b366c0e233b9304322cf0fa546891d9ee040c3cc6e8d3ee769f0290130aafefbb2a4606c48fe9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/pt-BR/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/pt-BR/firefox-56.0.2.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha512 = "50701c3deac2821de87dde0858804bfe2e5ed25eaff5ab599a5a6fd03fc94ccbcae781f4b127bf4eee2cd068415d78535dc6f029ba472ab6060b803b815c33af";
+ sha512 = "84876999b3f0717f34212d01014b2a3b2a4f95e73e7364fa53ad5366030df5c7dea65da6a468f7017f25a22dd659f314cae9ddf0167f413eacd2eb6e7ffd3501";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/pt-PT/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/pt-PT/firefox-56.0.2.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha512 = "4a03a6ee97a7576475c47c1eb9f4148fc242dab79f80013cc720f3e4f31a176d59ebbba9aa53e0ef72a3b890ac3c8d3905e22eabbac61b0c95bb50e8fd4aa2c1";
+ sha512 = "5d720a2d2bd56d6dcff128c267815a6c65af5f34011965f04ea1b789ed2e0a6b03cf682bdc9e3e1cd4a69aec45191eae32c7ed1e1d905b3c288dd68cd7f2e8c4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/rm/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/rm/firefox-56.0.2.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha512 = "868cf77f91cfba14156e5e053891407a831aa6e24c8050d20e7772a0e7d8f06b831d83134f177fa7fa1fe2fafa815036e7b9a6a5c3b1814d191aec9ffeede3a6";
+ sha512 = "9a0e915233bd0465fb8d336b1c54ac330d7d994d51018d9b28877f45d8c22a2d7f6ce0ad0d308967ff09789e7870c2954b570a552ed050e6ba3566b2b1f6743e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/ro/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/ro/firefox-56.0.2.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha512 = "a30d9ee09a94830d1196ea2ce0e92e304a28c696a8b8ccc9066ab67b03452fec4f93bd3c5975f9db22a8dba0cffd115000efad815fd9ae1a1a892cd5a3d87bc2";
+ sha512 = "dfde4ed0df604a0c62b177b3c6579236d75568551b9c522ea128fa3117ef2ded531a7b83982e618dc111620de9eec47931a89429b56a5a6b301433f325b1d695";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/ru/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/ru/firefox-56.0.2.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha512 = "de5678325845a719fdadc26928a6691887711e08a3067f2ad2c658db19e68a019b567e6916673ba6b869b8174cf9729015400feb7aae5cd9f7ea55e85d085348";
+ sha512 = "82011e90e588f6e1bd75fa9caf388ca928615ad21424c4f3ed4dde363a8ae90e96f520b8bafa66922a921ab81571f31582a695c10a29f9b57156e5113495eda4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/si/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/si/firefox-56.0.2.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha512 = "0942c285a4e4a5dee08bca7709337f01d03624287a0ff8030309d1f503da4ac13c0df8314c2eac4be3a13a9842ba8e9fc2b3ebaf6a7d405e733afb8ff1bc3d8e";
+ sha512 = "d9e1618815b1ab5f166a4d11c3744dc89ead59b1fff58bd2ae866074fa31cac52204ca086f5ada9466103e7a3d97feeb777f4eef65a706c15c27db322298cc51";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/sk/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/sk/firefox-56.0.2.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha512 = "881bf74e210e0b3430060644429bb77447014381e6aacee6901dfc35dfcd260e719e39dcd158fb7624261ca62c68587c12fc178ee62548f4a1f0844c8a9c1eea";
+ sha512 = "93e44d8a94ed21c314a932e37acbfc7431231cec2660fc8301263e928000a4be6ff43966c0394587d5d1a0434a9467dfa87416c1554797d457ab835c8b12e39a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/sl/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/sl/firefox-56.0.2.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha512 = "f813a8dbef0506e281c3e347d8a240da65940c7fcb0609a9510ab3c83f2fd13462d1ad749bbe768ca65b92ae1d9dab72880f5592b430d796fd377748291ba41e";
+ sha512 = "810bc5d5a2cc55de6360cbd0837d1f301c3e02757f5607abb93e7bb0155a1a4a724b175a4e837580ff28c2329d861ce4440e3787237395b41abd03872da6d2c4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/son/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/son/firefox-56.0.2.tar.bz2";
locale = "son";
arch = "linux-i686";
- sha512 = "61c75236138087ba7b56eaa5fcf4360fb869dcee60dd1f431b92a613ca00a64172bb48e9ff3a649e5e616566967ea0f254517ac1c98875efe2972bc9d2075b96";
+ sha512 = "9f5596fb8f6b341cbdc7a9989d4c1cb3a177228c478028d5d1463224dbbb0ed9a234a5c900760fad64428a5c44602d410032f1c7d60afb24ee23165995739c4f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/sq/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/sq/firefox-56.0.2.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha512 = "072fc33249af1ffe150ef5ab2ccf79322227844e1adc4928947b43b7956b98812ed80b1995e06d5e731f107e58cd1bb1d26eba1b9695fff7a69e00010c364e0e";
+ sha512 = "53c3ccd14572fea76a4e0fd7bd25c3dab69b7f0c920c4bd880124f127dd95815500917368f6930b2869338bc8010224bc0f8d5fb4fa52e8349ef99c6ef01ea94";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/sr/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/sr/firefox-56.0.2.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha512 = "bac3cfc1adf91712b58777b26fc506e1db025a58f94aef8016904d957cd8dbb2f91950ae652e076b27d4e6624458c1f10d60ca0e2906440663bfb9e239916e04";
+ sha512 = "6dfe740e959ec3e9fc3276d47f21fccf7f7c1c316b8b597fd2820a9928d62eda046701fda74c5ffc2c661f15cfe5e96f1677ca8ea36746925becddf4cd514d8d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/sv-SE/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/sv-SE/firefox-56.0.2.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha512 = "57499d98d877bbe491737ebf1b799ffef61ea41f7c903b3fc298c7006fb3a1d791cb716487f4b4fcd32d230f0fe8466ee1f36cdfd3832d920928bcdc62586ef5";
+ sha512 = "7cfab1450c3524cd9201eb9b99620dad1941c03ffe5f428f444e688d87d76d348185870e5bfd6d123dd6b3a45ac5687ed4e405bd541b07060952806c9df1d437";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/ta/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/ta/firefox-56.0.2.tar.bz2";
locale = "ta";
arch = "linux-i686";
- sha512 = "dfc1348f2239d917c19aee05f2b0d181b8028ab14b5b60fef2d8eba955fe1cb50a1400f8b5639f86c2aa8b82cc3a248224dd126d3313a5dc2f2f16014db1d0dd";
+ sha512 = "6542059db48fddfbe40b57fd14ceab40481f9452e8450c3ca3708a9eabf480750b908526a7ea9d52dd085825ca9f6ebd1220718c7ac686628ca6eb3e460e830e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/te/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/te/firefox-56.0.2.tar.bz2";
locale = "te";
arch = "linux-i686";
- sha512 = "50e89852e7799661c506f313440c7ef10ce96fa7562452cf9f6685a93d8d2f8ec15b8984d6fe971e9fe16b4ab916b665c1e4343e37a5cd4b75f0227dd2530915";
+ sha512 = "a455b8b07ef4525d99901eaffd475d172bd78b45322b300ca9281f4be3394d6bd4e86ee6c0b09dfc68ec78497accd892c1008d9744408e71840137554f683fa2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/th/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/th/firefox-56.0.2.tar.bz2";
locale = "th";
arch = "linux-i686";
- sha512 = "d1538447ed93bc652131e6d608a784294cf5f6b828e88109ff452d8f8e537dd76f9fca95b29c7eb3874c1e0b284b8ff45680783282945820fce1609c2c1cd116";
+ sha512 = "b9096450cacc6c959a4cba831f85bde93c99f78eb0840296522f294edd4d671ab51a6426901630dd950687557cc66499188d2fb255cdeda1683baa6c05a97248";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/tr/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/tr/firefox-56.0.2.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha512 = "7e6984a3364c1da09ada8f4aff6c2e1c371b5a4a6ee64b13afd3144d8e221081248aad6baf0d5399c3dc8a9891b184ac9fb74c9572b66007b1f1fc29642c16d3";
+ sha512 = "ab70b6887618fff2be785a46a886acce9daa2a7729016aba55e0b20dfae5bfbf6c2a6489956f2e753d8ee6984096d11551dd3b742933bd85bdadce0d2ebc10ad";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/uk/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/uk/firefox-56.0.2.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha512 = "98ffd7e12a77387cb503d8c91cad07385d6d151319afd6c109712638e83ff2391555906c762c4127455487d5d9dc0ee68a20a0865791b4ebad3deb1bf9bae04a";
+ sha512 = "14c81a64dd663e5244cee0846a36d0bdbd75c1abbf6155cf96f3eae999a9c487dbf4326ed1a7bc5f9cba7ad8fe40c5acf1e44a6811611195043e62bbc1350d0a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/ur/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/ur/firefox-56.0.2.tar.bz2";
locale = "ur";
arch = "linux-i686";
- sha512 = "2e1de51b606d155bb05c6e6f51dbfa0932ec0d9d521e3904859e0c3a98ecdcd174efe865ccf44f54814530c8a979d00508d7edd25fd3d8b2e2824dc2576898fd";
+ sha512 = "9b8d3387406d36a299716eceed02ea5e61456b3ff5f51071ca4411873fc2904713c7e7719d92199b112476aa27d477e818a696d406edf1b09502f66ec5359e58";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/uz/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/uz/firefox-56.0.2.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha512 = "850fed3fbca540e717bfc6941f1d41067e596b338173924cfd2bb4109f6c52d0eb83d0f5c405f3aa3074e853dc1f1cce205f1e599ea5a2dd1422ee37fc40b691";
+ sha512 = "22ba14001b2b19362c9a89911152154c72212e557ea557f8092287d3f3e56d2b7d532557ec4725338f54926a990a866a3c1ce5765740593cfccfa909c5ade974";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/vi/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/vi/firefox-56.0.2.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha512 = "aa512af12c17bf2703798b3e4bd846fcaaac2230be4062f1804b73461b78f9ea8fadec137783c8f7c6ecdb11d1a1f324c57884dd3e3deb7591c4203603887d73";
+ sha512 = "a21554b9e20b626896e3af8032911a9fdd67fa459bd20f068c2e7d6682187ecfd613c53616e048360786e786f77eb63d52dbee3553abc2ce58da5bc00b567168";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/xh/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/xh/firefox-56.0.2.tar.bz2";
locale = "xh";
arch = "linux-i686";
- sha512 = "72273bedebc546a1fcb1869154cefe7cd542348e20d01a23a3cefa8eb8bd0766159d46d69759a7d444b8d28f9769d1ef693b9f16e4fded27eca2b1a93ace6ffd";
+ sha512 = "751a8257df614c570c215c8888e593de84182087c3bf1c339b573872d3289498fcb05290cb6f819eb4f691a239291d475a26a05fcf2d98e2f4bf99088846a7d9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/zh-CN/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/zh-CN/firefox-56.0.2.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha512 = "ef38cb84527c941be98315db0f9f6dd6c30a7eaf2ab8830429d79341e6af3ed919ae046b6e42d08e07990d2255b2600cb7dd3b3f24c36cb985d57e7828ab7f53";
+ sha512 = "49fd08071f5bdc5ad425ea3be8cb6526342bebfa648c75f735982266d2e7aef0bcea23b492a70b1c99cdd6c38e934146d222b28ce136d22e9f45366a99328c49";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.2/linux-i686/zh-TW/firefox-55.0.2.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/56.0.2/linux-i686/zh-TW/firefox-56.0.2.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha512 = "b7aa08e3e983c0453ae2d4482ab3d15c7a0a814cef78cb2103539a2771555e0c2c8675e3f8bebcbfb7c801bb2b1399e321b805d99aa28dcb3aee104d887cd6ac";
+ sha512 = "09c61ea179a2b8331eae57dd3f435edf72d9b3afdc2892953ef3ce80d7f96ee59258e984d1d70e96d9994affac2062a5c552d4236027a38c4dd6c2e5dfab8eec";
}
];
}
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index 7c9ffc0f47844fb4b7a460a50817e89751751dd1..b8f57eb2edb884a612f07cbc3aa886383f19c87b 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -1,5 +1,5 @@
{ pname, version, updateScript ? null
-, src, patches ? [], overrides ? {}, meta
+, src, patches ? [], extraConfigureFlags ? [], extraMakeFlags ? [], overrides ? {}, meta
, isTorBrowserLike ? false }:
{ lib, stdenv, pkgconfig, pango, perl, python, zip, libIDL
@@ -8,8 +8,7 @@
, yasm, mesa, sqlite, unzip, makeWrapper
, hunspell, libevent, libstartup_notification, libvpx
, cairo, icu, libpng, jemalloc
-, autoconf213, which, gnused, cargo, rustc
-
+, autoconf213, which, gnused, cargo, rustc, llvmPackages
, debugBuild ? false
### optionals
@@ -20,6 +19,7 @@
, pulseaudioSupport ? true, libpulseaudio
, ffmpegSupport ? true, gstreamer, gst-plugins-base
, gtk3Support ? !isTorBrowserLike, gtk2, gtk3, wrapGAppsHook
+, gssSupport ? true, kerberos
## privacy-related options
@@ -29,7 +29,6 @@
# Set to `privacySupport` or `false`.
, webrtcSupport ? !privacySupport
-, loopSupport ? !privacySupport || !isTorBrowserLike
, geolocationSupport ? !privacySupport
, googleAPISupport ? geolocationSupport
, crashreporterSupport ? false
@@ -44,14 +43,14 @@
# option. However, in Firefox's case, those binaries may not be
# distributed without permission from the Mozilla Foundation, see
# http://www.mozilla.org/foundation/trademarks/.
-, enableOfficialBranding ? false
+, enableOfficialBranding ? isTorBrowserLike
}:
assert stdenv.cc ? libc && stdenv.cc.libc != null;
-assert !isTorBrowserLike -> loopSupport; # can't be disabled on firefox :(
let
flag = tf: x: [(if tf then "--enable-${x}" else "--disable-${x}")];
+ gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
in
stdenv.mkDerivation (rec {
@@ -74,7 +73,10 @@ stdenv.mkDerivation (rec {
++ lib.optional alsaSupport alsaLib
++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed
++ lib.optionals ffmpegSupport [ gstreamer gst-plugins-base ]
- ++ lib.optional gtk3Support gtk3;
+ ++ lib.optional gtk3Support gtk3
+ ++ lib.optional gssSupport kerberos;
+
+ NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss";
nativeBuildInputs =
[ autoconf213 which gnused pkgconfig perl python cargo rustc ]
@@ -90,6 +92,12 @@ stdenv.mkDerivation (rec {
make -f client.mk configure-files
configureScript="$(realpath ./configure)"
+
+ cxxLib=$( echo -n ${gcc}/include/c++/* )
+ archLib=$cxxLib/$( ${gcc}/bin/gcc -dumpmachine )
+
+ test -f layout/style/ServoBindings.toml && sed -i -e '/"-DMOZ_STYLO"/ a , "-cxx-isystem", "'$cxxLib'", "-isystem", "'$archLib'"' layout/style/ServoBindings.toml
+
cd obj-*
'' + lib.optionalString googleAPISupport ''
# Google API key used by Chromium and Firefox.
@@ -122,6 +130,11 @@ stdenv.mkDerivation (rec {
"--disable-gconf"
"--enable-default-toolkit=cairo-gtk${if gtk3Support then "3" else "2"}"
]
+ ++ lib.optionals (stdenv.lib.versionAtLeast version "56" && !stdenv.hostPlatform.isi686) [
+ # on i686-linux: --with-libclang-path is not available in this configuration
+ "--with-libclang-path=${llvmPackages.clang-unwrapped}/lib"
+ "--with-clang-path=${llvmPackages.clang}/bin/clang"
+ ]
# TorBrowser patches these
++ lib.optionals (!isTorBrowserLike) [
@@ -145,10 +158,9 @@ stdenv.mkDerivation (rec {
++ flag alsaSupport "alsa"
++ flag pulseaudioSupport "pulseaudio"
++ flag ffmpegSupport "ffmpeg"
+ ++ flag gssSupport "negotiateauth"
++ lib.optional (!ffmpegSupport) "--disable-gstreamer"
++ flag webrtcSupport "webrtc"
- ++ lib.optionals isTorBrowserLike
- (flag loopSupport "loop")
++ flag geolocationSupport "mozril-geoloc"
++ lib.optional googleAPISupport "--with-google-api-keyfile=ga"
++ flag crashreporterSupport "crashreporter"
@@ -159,7 +171,18 @@ stdenv.mkDerivation (rec {
else [ "--disable-debug" "--enable-release"
"--enable-optimize"
"--enable-strip" ])
- ++ lib.optional enableOfficialBranding "--enable-official-branding";
+ ++ lib.optional enableOfficialBranding "--enable-official-branding"
+ ++ extraConfigureFlags;
+
+ preBuild = lib.optionalString (enableOfficialBranding && isTorBrowserLike) ''
+ buildFlagsArray=("MOZ_APP_DISPLAYNAME=Tor Browser")
+ '';
+
+ makeFlags = lib.optionals enableOfficialBranding [
+ "MOZILLA_OFFICIAL=1"
+ "BUILD_OFFICIAL=1"
+ ]
+ ++ extraMakeFlags;
enableParallelBuilding = true;
@@ -200,6 +223,7 @@ stdenv.mkDerivation (rec {
gtk = gtk2;
inherit nspr;
inherit ffmpegSupport;
+ inherit gssSupport;
} // lib.optionalAttrs gtk3Support { inherit gtk3; };
} // overrides)
diff --git a/pkgs/applications/networking/browsers/firefox/no-buildconfig.patch b/pkgs/applications/networking/browsers/firefox/no-buildconfig.patch
new file mode 100644
index 0000000000000000000000000000000000000000..83f9a1329bea2f8524f258346368564e3854a990
--- /dev/null
+++ b/pkgs/applications/networking/browsers/firefox/no-buildconfig.patch
@@ -0,0 +1,25 @@
+diff -ru -x '*~' firefox-55.0.3-orig/docshell/base/nsAboutRedirector.cpp firefox-55.0.3/docshell/base/nsAboutRedirector.cpp
+--- firefox-55.0.3-orig/docshell/base/nsAboutRedirector.cpp 2017-07-31 18:20:51.000000000 +0200
++++ firefox-55.0.3/docshell/base/nsAboutRedirector.cpp 2017-09-26 22:02:00.814151731 +0200
+@@ -40,10 +40,6 @@
+ nsIAboutModule::ALLOW_SCRIPT
+ },
+ {
+- "buildconfig", "chrome://global/content/buildconfig.html",
+- nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT
+- },
+- {
+ "checkerboard", "chrome://global/content/aboutCheckerboard.xhtml",
+ nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
+ nsIAboutModule::ALLOW_SCRIPT
+diff -ru -x '*~' firefox-55.0.3-orig/toolkit/content/jar.mn firefox-55.0.3/toolkit/content/jar.mn
+--- firefox-55.0.3-orig/toolkit/content/jar.mn 2017-07-31 18:20:52.000000000 +0200
++++ firefox-55.0.3/toolkit/content/jar.mn 2017-09-26 22:01:42.383350314 +0200
+@@ -40,7 +40,6 @@
+ content/global/plugins.css
+ content/global/browser-child.js
+ content/global/browser-content.js
+-* content/global/buildconfig.html
+ content/global/contentAreaUtils.js
+ #ifndef MOZ_FENNEC
+ content/global/customizeToolbar.css
diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index a0a1b304d6cc1a3b7b0b2e1b4f4e74c4bb8f1c7b..a1d5df5029c1b3ae3c16b76e606ca10dd1fbbbdd 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -1,4 +1,4 @@
-{ lib, callPackage, stdenv, fetchurl, fetchFromGitHub, fetchpatch }:
+{ lib, callPackage, stdenv, overrideCC, gcc5, fetchurl, fetchFromGitHub, fetchpatch }:
let common = opts: callPackage (import ./common.nix opts); in
@@ -6,16 +6,18 @@ rec {
firefox = common rec {
pname = "firefox";
- version = "55.0.2";
+ version = "56.0.2";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
- sha512 = "a27722cb5840aac89752fea0880a7e093e84b50dc78a36dc8c4bd493ffda10fa61446007f680bfe65db7a0debe4c21e6f0bf9f0de9876bba067abdda6fed7be4";
+ sha512 = "35f81e8163a254b7e134fc073acbcff63aa1025b9c6392377650a8f2d0a5f0c77211adb0ae3d8ac85f036bb387246934b8847f14a03fceb7fcbc5b3cf94c9392";
};
- patches = lib.optional stdenv.isi686 (fetchpatch {
- url = "https://hg.mozilla.org/mozilla-central/raw-rev/15517c5a5d37";
- sha256 = "1ba487p3hk4w2w7qqfxgv1y57vp86b8g3xhav2j20qd3j3phbbn7";
- });
+ patches =
+ [ ./no-buildconfig.patch ]
+ ++ lib.optional stdenv.isi686 (fetchpatch {
+ url = "https://hg.mozilla.org/mozilla-central/raw-rev/15517c5a5d37";
+ sha256 = "1ba487p3hk4w2w7qqfxgv1y57vp86b8g3xhav2j20qd3j3phbbn7";
+ });
meta = {
description = "A web browser built from Firefox source tree";
@@ -30,10 +32,10 @@ rec {
firefox-esr = common rec {
pname = "firefox-esr";
- version = "52.3.0esr";
+ version = "52.4.1esr";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
- sha512 = "36da8f14b50334e36fca06e09f15583101cadd10e510268255587ea9b09b1fea918da034d6f1d439ab8c34612f6cebc409a0b8d812dddb3f997afebe64d09fe9";
+ sha512 = "d80c7219548391d8a47b6e404662ea41e6acfa264a67d69365e76dd8943077e388ab24b030850919f8fc6681c11486bdbaaf170d441c861f4a12cedbe08955ab";
};
meta = firefox.meta // {
@@ -45,25 +47,14 @@ rec {
};
} {};
- tor-browser = common rec {
- pname = "tor-browser";
- version = "6.5.2";
- isTorBrowserLike = true;
-
- # FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb
- src = fetchFromGitHub {
- owner = "SLNOS";
- repo = "tor-browser";
- rev = "tor-browser-45.8.0esr-6.5-2";
- sha256 = "0vbcp1qlxjlph0dqibylsyvb8iah3lnzdxc56hllpvbn51vrp39j";
- };
+} // (let
+ commonAttrs = {
overrides = {
unpackPhase = ''
# fetchFromGitHub produces ro sources, root dir gets a name that
# is too long for shebangs. fixing
- cp -a $src .
- mv *-src tor-browser
+ cp -a $src tor-browser
chmod -R +w tor-browser
cd tor-browser
@@ -101,8 +92,44 @@ rec {
homepage = https://www.torproject.org/projects/torbrowser.html;
platforms = lib.platforms.linux;
};
- } {
+ };
+
+in rec {
+
+ tor-browser-6-5 = common (rec {
+ pname = "tor-browser";
+ version = "6.5.2";
+ isTorBrowserLike = true;
+ extraConfigureFlags = [ "--disable-loop" ];
+
+ # FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb
+ src = fetchFromGitHub {
+ owner = "SLNOS";
+ repo = "tor-browser";
+ # branch "tor-browser-45.8.0esr-6.5-2"
+ rev = "e4140ea01b9906934f0347e95f860cec207ea824";
+ sha256 = "0a1qk3a9a3xxrl56bp4zbknbchv5x17k1w5kgcf4j3vklcv6av60";
+ };
+ } // commonAttrs) {
+ stdenv = overrideCC stdenv gcc5;
ffmpegSupport = false;
+ gssSupport = false;
};
-}
+ tor-browser-7-0 = common (rec {
+ pname = "tor-browser";
+ version = "7.0.1";
+ isTorBrowserLike = true;
+
+ # FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb
+ src = fetchFromGitHub {
+ owner = "SLNOS";
+ repo = "tor-browser";
+ rev = "tor-browser-52.3.0esr-7.0-1-slnos";
+ sha256 = "0szbf8gjbl4dnrb4igy4mq5858i1y6ki4skhdw63iqqdd8w9v4yv";
+ };
+ } // commonAttrs) {};
+
+ tor-browser = tor-browser-7-0;
+
+})
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index 1dd5c9191f009bb1bec27c93fb89355aca368915..7a7d1368cb230e5060509b1627de0c4f2e55aad6 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -9,6 +9,7 @@
, esteidfirefoxplugin
, vlc_npapi
, libudev
+, kerberos
}:
## configurability of the wrapper itself
@@ -25,6 +26,7 @@ let
cfg = stdenv.lib.attrByPath [ browserName ] {} config;
enableAdobeFlash = cfg.enableAdobeFlash or false;
ffmpegSupport = browser.ffmpegSupport or false;
+ gssSupport = browser.gssSupport or false;
jre = cfg.jre or false;
icedtea = cfg.icedtea or false;
@@ -46,6 +48,7 @@ let
++ lib.optional (cfg.enableVLC or false) vlc_npapi
);
libs = (if ffmpegSupport then [ ffmpeg ] else with gst_all; [ gstreamer gst-plugins-base ])
+ ++ lib.optional gssSupport kerberos
++ lib.optionals (cfg.enableQuakeLive or false)
(with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib libudev ])
++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash
@@ -129,6 +132,8 @@ in stdenv.mkDerivation {
passthru = { unwrapped = browser; };
+ disallowedRequisites = [ stdenv.cc ];
+
meta = browser.meta // {
description =
browser.meta.description
diff --git a/pkgs/applications/networking/browsers/jumanji/default.nix b/pkgs/applications/networking/browsers/jumanji/default.nix
index 7383e0ec0445447ce9f954c6335eefef21eab894..e013f54a39ea73edf27b6f68395d5d813c855694 100644
--- a/pkgs/applications/networking/browsers/jumanji/default.nix
+++ b/pkgs/applications/networking/browsers/jumanji/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "1dsbyz489fx7dp07i29q1rjkl7nhrfscc8ks8an2rdyhx3457asg";
};
- buildInputs = [ girara pkgconfig gtk webkitgtk makeWrapper gsettings_desktop_schemas ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ girara gtk webkitgtk makeWrapper gsettings_desktop_schemas ];
makeFlags = [ "PREFIX=$(out)" ];
diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix
index f504c3c2b33305c450e950a1b306a99a3c7adfa2..f097d748d48c161e1ec87159f700eacb332787e2 100644
--- a/pkgs/applications/networking/browsers/links2/default.nix
+++ b/pkgs/applications/networking/browsers/links2/default.nix
@@ -30,12 +30,6 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional enableFB "--with-fb"
++ stdenv.lib.optional enableDirectFB "--with-directfb";
- crossAttrs = {
- preConfigure = ''
- export CC=$crossConfig-gcc
- '';
- };
-
meta = with stdenv.lib; {
homepage = http://links.twibright.com/;
description = "A small browser with some graphics support";
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/esteidfirefoxplugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/esteidfirefoxplugin/default.nix
index 1a0752c33c62b9d77adc6bb007230ac4c64a8b33..48d06d644dda85b06eeaacd2ec03605165f73cfa 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/esteidfirefoxplugin/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/esteidfirefoxplugin/default.nix
@@ -15,7 +15,8 @@ stdenv.mkDerivation rec {
cd src
'';
- buildInputs = [ gtk2 openssl pcsclite pkgconfig opensc ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ gtk2 openssl pcsclite opensc ];
buildPhase = ''
sed -i "s|opensc-pkcs11.so|${opensc}/lib/pkcs11/opensc-pkcs11.so|" Makefile
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
index 0452e7486e6f0dfe914221dc8eb6888e4495c849..8e24a3fb619ad305fc8e01c54b1db2b37b8c9743 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
@@ -73,25 +73,25 @@ let
in
stdenv.mkDerivation rec {
name = "flashplayer-${version}";
- version = "26.0.0.151";
+ version = "27.0.0.183";
src = fetchurl {
url =
if debug then
- "https://fpdownload.macromedia.com/pub/flashplayer/updaters/26/flash_player_npapi_linux_debug.${arch}.tar.gz"
+ "https://fpdownload.macromedia.com/pub/flashplayer/updaters/27/flash_player_npapi_linux_debug.${arch}.tar.gz"
else
"https://fpdownload.adobe.com/get/flashplayer/pdc/${version}/flash_player_npapi_linux.${arch}.tar.gz";
sha256 =
if debug then
if arch == "x86_64" then
- "0dlgardgrd8a18b48b0l6xk68dqi39yndv05phrypsxzr00p23q8"
+ "1qn9hm9c303jihksfc8sb5yjpcasj711s66lhqlqmj5hd0r8bzya"
else
- "0dbvsww4v6hlqn4yhdmzs335inim5iq0ym998x8zpavilqq51y0d"
+ "19d0d4fn2p2wvh27gshybgc4xpjp0ibgm2gg8g0jzrvbc3cqdz0j"
else
if arch == "x86_64" then
- "1yywffslh5px15w62wck1rnlp317jr6a334r409q7hxqc3x90z8l"
+ "0df8lbbvr226k9z6p2jwxandjb6yy0bqz5kaz79hpj0dwkiqwax1"
else
- "1f1czbx14nvgr1qlzcp03nhj6c55wra8l6f4bsig691n3hfpb6hp";
+ "0vs63rlra5ccm24j908zrcxhffjlmvjr6pb2bb7a4fmnfjrk4idf";
};
nativeBuildInputs = [ unzip ];
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
index 9a805eb55e4f8d0caeaf44cbce92b08f5e03a59a..cf00f303e99383ea634301dde597d6cb03b2ef60 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
@@ -55,19 +55,19 @@ let
in
stdenv.mkDerivation rec {
name = "flashplayer-standalone-${version}";
- version = "26.0.0.151";
+ version = "27.0.0.183";
src = fetchurl {
url =
if debug then
- "https://fpdownload.macromedia.com/pub/flashplayer/updaters/26/flash_player_sa_linux_debug.x86_64.tar.gz"
+ "https://fpdownload.macromedia.com/pub/flashplayer/updaters/27/flash_player_sa_linux_debug.x86_64.tar.gz"
else
- "https://fpdownload.macromedia.com/pub/flashplayer/updaters/26/flash_player_sa_linux.x86_64.tar.gz";
+ "https://fpdownload.macromedia.com/pub/flashplayer/updaters/27/flash_player_sa_linux.x86_64.tar.gz";
sha256 =
if debug then
- "0pfb217bg0v9hq0cbyndhmhkba16nhz2rasl7kk4ppxcfcjhr5pb"
+ "0vf28qdhb1ly5w3hhy3n20r4nyvwsxj5csb969s0r328nf1xaflj"
else
- "0a9ayylkpjprad1al7ddplxrpymd181a9gmw9hhk78s11v2zvwn8";
+ "0jqbnbpdrmxh2jnai0bv4c8jzsvqmcnhsp1hzaygsvp0ri4vncs8";
};
nativeBuildInputs = [ unzip ];
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix
index 81a05b36016291b6bbd0ef3b9aeada2bddbdfd15..30bae8792c2e053a0914a4b7dbed9ab8e17cebfc 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "a679f3a0534d5f05fac10b16b49630a898c0b721cfa24d2c827fa45485476649";
};
- buildInputs = [ pkgconfig openssl libX11 gtk2 glib gettext intltool ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ openssl libX11 gtk2 glib gettext intltool ];
patches = [
./translation-xgettext-to-intltool.patch
./plugin-linkfix.patch
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix
index 07e152e91dbc63c1bca6245ba5a8241ccf7e3b5e..a5bfda9f26c97ecc6b275d6c594b82461e9cf531 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix
@@ -17,7 +17,8 @@ stdenv.mkDerivation rec {
''
else "");
- buildInputs = [ pkgconfig browser (browser.gtk) libXpm gettext ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ browser (browser.gtk) libXpm gettext ];
installPhase = ''
mkdir -p $out/lib/mozilla/plugins
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix
index b3382ef051271a58bee8d0e661c6891e3df44be1..008c359648322826e709ead570417f195966cf8f 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix
@@ -24,7 +24,8 @@ stdenv.mkDerivation rec {
export configureFlags="$configureFlags --target-cpu=$(uname -m)"
'';
- buildInputs = [which pkgconfig file glib gtk2 gtk3 curl libXt];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [which file glib gtk2 gtk3 curl libXt];
preferLocalBuild = true;
diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix
index 52a2ce9164c98a8c95fa5b5f0691f45d2f3a2c81..0852b5c9d43490064b57fc603b46ae5c3b0ef00f 100644
--- a/pkgs/applications/networking/browsers/opera/default.nix
+++ b/pkgs/applications/networking/browsers/opera/default.nix
@@ -37,7 +37,7 @@
let
mirror = https://get.geo.opera.com/pub/opera/desktop;
- version = "46.0.2597.39";
+ version = "48.0.2685.52";
rpath = stdenv.lib.makeLibraryPath [
@@ -87,19 +87,10 @@ in stdenv.mkDerivation {
name = "opera-${version}";
- src =
- #if stdenv.system == "i686-linux" then
- # fetchurl {
- # url = "${mirror}/${version}/linux/opera-stable_${version}_i386.deb";
- # sha256 = "...";
- # }
- #else
- if stdenv.system == "x86_64-linux" then
- fetchurl {
- url = "${mirror}/${version}/linux/opera-stable_${version}_amd64.deb";
- sha256 = "1ladvqilm5rr222wjybvribnyii2l0p8jbsd10xr06wps63g1kia";
- }
- else throw "Opera is not supported on ${stdenv.system} (only x86_64 linux is supported)";
+ src = fetchurl {
+ url = "${mirror}/${version}/linux/opera-stable_${version}_amd64.deb";
+ sha256 = "027njqh2as4d0xsnvzamqiplghb8cxqnc19y0vqkvjnsw57v828p";
+ };
unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc .";
@@ -123,6 +114,7 @@ in stdenv.mkDerivation {
meta = {
homepage = http://www.opera.com;
description = "Web browser";
+ platforms = [ "x86_64-linux" ];
license = stdenv.lib.licenses.unfree;
};
}
diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix
index bd841ba8110f3fecd803c5cc8c9cd434a54b62cc..e24c21b535bf8393315ca13ae87bbe9a7ba58cb9 100644
--- a/pkgs/applications/networking/browsers/palemoon/default.nix
+++ b/pkgs/applications/networking/browsers/palemoon/default.nix
@@ -5,19 +5,19 @@
, gtk2, hunspell, icu, libevent, libjpeg, libnotify
, libstartup_notification, libvpx, makeWrapper, mesa
, nspr, nss, pango, perl, python, libpulseaudio, sqlite
-, unzip, xlibs, which, yasm, zip, zlib, gcc
+, unzip, xlibs, which, yasm, zip, zlib
}:
stdenv.mkDerivation rec {
name = "palemoon-${version}";
- version = "27.4.1";
+ version = "27.6.0";
src = fetchFromGitHub {
name = "palemoon-src";
owner = "MoonchildProductions";
repo = "Pale-Moon";
rev = version + "_Release";
- sha256 = "0sgy0iq038pj676w6k5nwbavrdmrznhydjibdpj6irdz5qxxdgjn";
+ sha256 = "1v5rbam93fcc7c1l69clr9chi2l0zv0dhjq12v535n8vv9lhahhl";
};
desktopItem = makeDesktopItem {
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
gst-plugins-base gstreamer gst_all_1.gst-plugins-base gtk2
hunspell icu libevent libjpeg libnotify libstartup_notification
libvpx makeWrapper mesa nspr nss pango perl pkgconfig python
- libpulseaudio sqlite unzip which yasm zip zlib gcc
+ libpulseaudio sqlite unzip which yasm zip zlib
] ++ (with xlibs; [
libX11 libXext libXft libXi libXrender libXScrnSaver
libXt pixman scrnsaverproto xextproto
diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index 025e4522f065a56b8ee5ca5c2a510df7afdbdfc4..4f0e891dc496bf353a46df22020376cbe6ab9e22 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -2,10 +2,13 @@
, qtbase, pyqt5, jinja2, pygments, pyyaml, pypeg2, pyopengl, cssutils, glib_networking
, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2, libxslt
, gst-plugins-base, gst-plugins-good, gst-plugins-bad, gst-plugins-ugly, gst-libav
-, qtwebkit-plugins
-, withWebEngineDefault ? false
+, qtwebkit-plugins ? null
+, attrs
+, withWebEngineDefault ? true
}:
+assert (! withWebEngineDefault) -> qtwebkit-plugins != null;
+
let
pdfjs = stdenv.mkDerivation rec {
name = "pdfjs-${version}";
@@ -25,30 +28,32 @@ let
};
in buildPythonApplication rec {
- name = "qutebrowser-${version}";
- version = "0.11.0";
+ name = "qutebrowser-${version}${fix_postfix}";
+ fix_postfix = "-1";
+ version = "1.0.3";
namePrefix = "";
src = fetchurl {
- url = "https://github.com/The-Compiler/qutebrowser/releases/download/v${version}/${name}.tar.gz";
- sha256 = "13ihx66jm1dd6vx8px7pm0kbzf2sf9x43hhivc1rp17kahnxxdyv";
+ url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${name}.tar.gz";
+ sha256 = "04d6hg2yf2wjwn0sd05bpx3zngnb93g7rizbdq17bbpmnwxchzap";
};
# Needs tox
doCheck = false;
buildInputs = [
- qtbase qtwebkit-plugins
+ qtbase
gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav
glib_networking
- ];
+ ]
+ ++ lib.optional (! withWebEngineDefault) qtwebkit-plugins;
nativeBuildInputs = [
makeWrapper wrapGAppsHook asciidoc docbook_xml_dtd_45 docbook_xsl libxml2 libxslt
];
propagatedBuildInputs = [
- pyyaml pyqt5 jinja2 pygments pypeg2 cssutils pyopengl
+ pyyaml pyqt5 jinja2 pygments pypeg2 cssutils pyopengl attrs
];
postPatch = ''
@@ -62,7 +67,7 @@ in buildPythonApplication rec {
postInstall = ''
install -Dm644 doc/qutebrowser.1 "$out/share/man/man1/qutebrowser.1"
- install -Dm644 qutebrowser.desktop \
+ install -Dm644 misc/qutebrowser.desktop \
"$out/share/applications/qutebrowser.desktop"
for i in 16 24 32 48 64 128 256 512; do
install -Dm644 "icons/qutebrowser-''${i}x''${i}.png" \
@@ -73,8 +78,8 @@ in buildPythonApplication rec {
install -Dm755 -t "$out/share/qutebrowser/userscripts/" misc/userscripts/*
'';
- postFixup = lib.optionalString withWebEngineDefault ''
- wrapProgram $out/bin/qutebrowser --add-flags "--backend webengine"
+ postFixup = lib.optionalString (! withWebEngineDefault) ''
+ wrapProgram $out/bin/qutebrowser --add-flags "--backend webkit"
'';
meta = {
diff --git a/pkgs/applications/networking/browsers/surf/default.nix b/pkgs/applications/networking/browsers/surf/default.nix
index 04d475f36f070214dc990ba449bea5290d17ab1d..1aa9bf044b05bff5f82cf6b7476319ce27c64ac0 100644
--- a/pkgs/applications/networking/browsers/surf/default.nix
+++ b/pkgs/applications/networking/browsers/surf/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
version = "2.0";
src = fetchurl {
- url = "http://dl.suckless.org/surf/surf-${version}.tar.gz";
+ url = "https://dl.suckless.org/surf/surf-${version}.tar.gz";
sha256 = "07cmajyafljigy10d21kkyvv5jf3hxkx06pz3rwwk3y3c9x4rvps";
};
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
possible to embed it in another application. Furthermore, one can point
surf to another URI by setting its XProperties.
'';
- homepage = http://surf.suckless.org;
+ homepage = https://surf.suckless.org;
license = licenses.mit;
platforms = webkitgtk.meta.platforms;
maintainers = with maintainers; [ joachifm ];
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 980c90a91ee7aa210e31a4bc37a74a69d6c9cdfb..4af725d3c958779c55b954d9e32de6718c4517bd 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -23,10 +23,11 @@
, pango
, audioSupport ? mediaSupport
-, pulseaudioSupport ? audioSupport
+, pulseaudioSupport ? false
, libpulseaudio
+, apulse
-# Media support (implies pulseaudio support)
+# Media support (implies audio support)
, mediaSupport ? false
, gstreamer
, gst-plugins-base
@@ -38,6 +39,16 @@
# Pluggable transport dependencies
, python27
+# Wrapper runtime
+, coreutils
+, glibcLocales
+, hicolor_icon_theme
+, shared_mime_info
+
+# Whether to disable multiprocess support to work around crashing tabs
+# TODO: fix the underlying problem instead of this terrible work-around
+, disableContentSandbox ? true
+
# Extra preferences
, extraPrefs ? ""
}:
@@ -45,7 +56,9 @@
with stdenv.lib;
let
- libPath = makeLibraryPath ([
+ libPath = makeLibraryPath libPkgs;
+
+ libPkgs = [
atk
cairo
dbus
@@ -62,6 +75,7 @@ let
libXt
pango
stdenv.cc.cc
+ stdenv.cc.libc
zlib
]
++ optionals pulseaudioSupport [ libpulseaudio ]
@@ -70,7 +84,7 @@ let
gst-plugins-base
gmp
ffmpeg
- ]);
+ ];
gstPluginsPath = concatMapStringsSep ":" (x:
"${x}/lib/gstreamer-0.10") [
@@ -84,7 +98,7 @@ let
fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
# Upstream source
- version = "7.0.4";
+ version = "7.0.9";
lang = "en-US";
@@ -94,7 +108,7 @@ let
"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 = "17hz6nv7py80zbksk1dypmj8agr5jzsfrpjncphpsrflvbqzs2bx";
+ sha256 = "0ykbpp0qr3glygmnnc6ac41kkvrxn52472z6kbpf7i6qzvk4ba0d";
};
"i686-linux" = fetchurl {
@@ -102,7 +116,7 @@ let
"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 = "0g8m5x891f4kdvb3fhmh98xfw569sbqd9wcadflabf9vc9bqv3al";
+ sha256 = "02alpzmvm3ldlp51sqppz41d12lx93n5qj6i3gqz6din96swm7j8";
};
};
in
@@ -145,6 +159,11 @@ stdenv.mkDerivation rec {
# and torLibPath for accuracy, but this is more convenient ...
libPath=${libPath}:$TBB_IN_STORE:$TBB_IN_STORE/TorBrowser/Tor
+ # apulse uses a non-standard library path. For now special-case it.
+ ${optionalString (audioSupport && !pulseaudioSupport) ''
+ libPath=${apulse}/lib/apulse:$libPath
+ ''}
+
# Fixup paths to pluggable transports.
sed -i TorBrowser/Data/Tor/torrc-defaults \
-e "s,./TorBrowser,$TBB_IN_STORE/TorBrowser,g"
@@ -201,6 +220,17 @@ stdenv.mkDerivation rec {
lockPref("extensions.torlauncher.control_port_use_ipc", true);
lockPref("extensions.torlauncher.socks_port_use_ipc", true);
+ // Optionally disable multiprocess support. We always set this to ensure that
+ // toggling the pref takes effect.
+ lockPref("browser.tabs.remote.autostart.2", ${if disableContentSandbox then "false" else "true"});
+
+ // Allow sandbox access to sound devices if using ALSA directly
+ ${if (audioSupport && !pulseaudioSupport) then ''
+ pref("security.sandbox.content.write_path_whitelist", "/dev/snd/");
+ '' else ''
+ clearPref("security.sandbox.content.write_path_whitelist");
+ ''}
+
${optionalString (extraPrefs != "") ''
${extraPrefs}
''}
@@ -216,6 +246,11 @@ stdenv.mkDerivation rec {
# having to synchronize between local state and store.
mv TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js defaults/pref/torbrowser.js
+ # Preload extensions by moving into the runtime instead of storing under the
+ # user's profile directory.
+ mv "$TBB_IN_STORE/TorBrowser/Data/Browser/profile.default/extensions/"* \
+ "$TBB_IN_STORE/browser/extensions"
+
# Hard-code paths to geoip data files. TBB resolves the geoip files
# relative to torrc-defaults_path but if we do not hard-code them
# here, these paths end up being written to the torrc in the user's
@@ -225,12 +260,21 @@ stdenv.mkDerivation rec {
GeoIPv6File $TBB_IN_STORE/TorBrowser/Data/Tor/geoip6
EOF
+ WRAPPER_XDG_DATA_DIRS=${concatMapStringsSep ":" (x: "${x}/share") [
+ hicolor_icon_theme
+ shared_mime_info
+ ]}
+
# Generate wrapper
mkdir -p $out/bin
cat > "$out/bin/tor-browser" << EOF
#! ${stdenv.shell}
set -o errexit -o nounset
+ PATH=${makeBinPath [ coreutils ]}
+ export LC_ALL=C
+ export LOCALE_ARCHIVE=${glibcLocales}/lib/locale/locale-archive
+
# Enter local state directory.
REAL_HOME=\$HOME
TBB_HOME=\''${TBB_HOME:-''${XDG_DATA_HOME:-\$REAL_HOME/.local/share}/tor-browser}
@@ -262,10 +306,6 @@ stdenv.mkDerivation rec {
# easily generated by firefox at startup.
rm -f "\$HOME/TorBrowser/Data/Browser/profile.default"/{compatibility.ini,extensions.ini,extensions.json}
- # Ensure that we're always using the up-to-date extensions.
- ln -snf "$TBB_IN_STORE/TorBrowser/Data/Browser/profile.default/extensions" \
- "\$HOME/TorBrowser/Data/Browser/profile.default/extensions"
-
${optionalString pulseaudioSupport ''
# Figure out some envvars for pulseaudio
: "\''${XDG_RUNTIME_DIR:=/run/user/\$(id -u)}"
@@ -291,15 +331,31 @@ stdenv.mkDerivation rec {
# Setting FONTCONFIG_FILE is required to make fontconfig read the TBB
# fonts.conf; upstream uses FONTCONFIG_PATH, but FC_DEBUG=1024
# indicates the system fonts.conf being used instead.
+ #
+ # XDG_DATA_DIRS is set to prevent searching system dirs (looking for .desktop & icons)
exec env -i \
+ TZ=":" \
+ TZDIR="\''${TZDIR:-}" \
+ LOCALE_ARCHIVE="\$LOCALE_ARCHIVE" \
+ \
+ TMPDIR="\''${TMPDIR:-/tmp}" \
HOME="\$HOME" \
XAUTHORITY="\$XAUTHORITY" \
DISPLAY="\$DISPLAY" \
DBUS_SESSION_BUS_ADDRESS="\$DBUS_SESSION_BUS_ADDRESS" \
\
+ XDG_DATA_HOME="\$HOME/.local/share" \
+ XDG_DATA_DIRS="$WRAPPER_XDG_DATA_DIRS" \
+ \
PULSE_SERVER="\''${PULSE_SERVER:-}" \
PULSE_COOKIE="\''${PULSE_COOKIE:-}" \
\
+ APULSE_PLAYBACK_DEVICE="\''${APULSE_PLAYBACK_DEVICE:-plug:dmix}" \
+ \
+ TOR_SKIP_LAUNCH="\''${TOR_SKIP_LAUNCH:-}" \
+ TOR_CONTROL_PORT="\''${TOR_CONTROL_PORT:-}" \
+ TOR_SOCKS_PORT="\''${TOR_SOCKS_PORT:-}" \
+ \
GST_PLUGIN_SYSTEM_PATH="${optionalString mediaSupport gstPluginsPath}" \
GST_REGISTRY="/dev/null" \
GST_REGISTRY_UPDATE="no" \
@@ -324,7 +380,8 @@ stdenv.mkDerivation rec {
mkdir -p $out/share/applications
cp $desktopItem/share/applications"/"* $out/share/applications
sed -i $out/share/applications/torbrowser.desktop \
- -e "s,Exec=.*,Exec=$out/bin/tor-browser,"
+ -e "s,Exec=.*,Exec=$out/bin/tor-browser," \
+ -e "s,Icon=.*,Icon=$out/share/pixmaps/torbrowser.png,"
# Install icons
mkdir -p $out/share/pixmaps
diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..508ab6ec432eec58030343d0ee23b374d932f970
--- /dev/null
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix
@@ -0,0 +1,348 @@
+{ stdenv
+, fetchgit
+, fetchurl
+, symlinkJoin
+
+, tor
+, tor-browser-unwrapped
+
+# Wrapper runtime
+, coreutils
+, hicolor_icon_theme
+, shared_mime_info
+, noto-fonts
+, noto-fonts-emoji
+
+# Audio support
+, audioSupport ? mediaSupport
+, apulse
+
+# Media support (implies audio support)
+, mediaSupport ? false
+, gstreamer
+, gst-plugins-base
+, gst-plugins-good
+, gst-ffmpeg
+, gmp
+, ffmpeg
+
+# Extensions, common
+, zip
+
+# HTTPS Everywhere
+, git
+, libxml2 # xmllint
+, python27
+, python27Packages
+, rsync
+
+# Pluggable transports
+, obfsproxy
+
+# Customization
+, extraPrefs ? ""
+, extraExtensions ? [ ]
+}:
+
+with stdenv.lib;
+
+let
+ tor-browser-build_src = fetchgit {
+ url = "https://git.torproject.org/builders/tor-browser-build.git";
+ rev = "refs/tags/tbb-7.5a5-build5";
+ sha256 = "0j37mqldj33fnzghxifvy6v8vdwkcz0i4z81prww64md5s8qcsa9";
+ };
+
+ firefoxExtensions = import ./extensions.nix {
+ inherit stdenv fetchurl fetchgit zip
+ git libxml2 python27 python27Packages rsync;
+ };
+
+ bundledExtensions = with firefoxExtensions; [
+ https-everywhere
+ noscript
+ torbutton
+ tor-launcher
+ ] ++ extraExtensions;
+
+ fontsEnv = symlinkJoin {
+ name = "tor-browser-fonts";
+ paths = [ noto-fonts noto-fonts-emoji ];
+ };
+
+ fontsDir = "${fontsEnv}/share/fonts";
+
+ gstPluginsPath = concatMapStringsSep ":" (x:
+ "${x}/lib/gstreamer-0.10") [
+ gstreamer
+ gst-plugins-base
+ gst-plugins-good
+ gst-ffmpeg
+ ];
+
+ gstLibPath = makeLibraryPath [
+ gstreamer
+ gst-plugins-base
+ gmp
+ ffmpeg
+ ];
+in
+stdenv.mkDerivation rec {
+ name = "tor-browser-bundle-${version}";
+ version = tor-browser-unwrapped.version;
+
+ buildInputs = [ tor-browser-unwrapped tor ];
+
+ unpackPhase = ":";
+
+ buildPhase = ":";
+
+ # The following creates a customized firefox distribution. For
+ # simplicity, we copy the entire base firefox runtime, to work around
+ # firefox's annoying insistence on resolving the installation directory
+ # relative to the real firefox executable. A little tacky and
+ # inefficient but it works.
+ installPhase = ''
+ TBBUILD=${tor-browser-build_src}/projects/tor-browser
+ TBDATA_PATH=TorBrowser-Data
+
+ self=$out/lib/tor-browser
+ mkdir -p $self && cd $self
+
+ TBDATA_IN_STORE=$self/$TBDATA_PATH
+
+ cp -dR ${tor-browser-unwrapped}/lib"/"*"/"* .
+ chmod -R +w .
+
+ # Prepare for autoconfig
+ cat >defaults/pref/autoconfig.js <mozilla.cfg <> $TBDATA_PATH/torrc-defaults
+ cat \
+ $bundleData/$bundlePlatform/Data/Browser/profile.default/preferences/extension-overrides.js \
+ $bundleData/PTConfigs/bridge_prefs.js \
+ >> defaults/pref/extension-overrides.js
+
+ # Configure geoip
+ #
+ # tor-launcher insists on resolving geoip data relative to torrc-defaults
+ # (and passes them directly on the tor command-line).
+ #
+ # Write the paths into torrc-defaults anyway, otherwise they'll be
+ # captured in the runtime torrc.
+ ln -s -t $TBDATA_PATH ${tor.geoip}/share/tor/geoip{,6}
+ cat >>$TBDATA_PATH/torrc-defaults <>$TBDATA_PATH/torrc-defaults <fonts,${fontsDir}," \
+ > $TBDATA_PATH/fonts.conf
+
+ # Generate a suitable wrapper
+ wrapper_PATH=${makeBinPath [ coreutils ]}
+ wrapper_XDG_DATA_DIRS=${concatMapStringsSep ":" (x: "${x}/share") [
+ hicolor_icon_theme
+ shared_mime_info
+ ]}
+
+ ${optionalString audioSupport ''
+ # apulse uses a non-standard library path ...
+ wrapper_LD_LIBRARY_PATH=${apulse}/lib/apulse''${wrapper_LD_LIBRARY_PATH:+:$wrapper_LD_LIBRARY_PATH}
+ ''}
+
+ ${optionalString mediaSupport ''
+ wrapper_LD_LIBRARY_PATH=${gstLibPath}''${wrapper_LD_LIBRARY_PATH:+:$wrapper_LD_LIBRARY_PATH}
+ ''}
+
+ mkdir -p $out/bin
+ cat >$out/bin/tor-browser <&2
+ exit 1
+ fi
+
+ mkdir -p "\$TBB_HOME"
+
+ HOME=\$TBB_HOME
+ cd "\$HOME"
+
+ # Re-init XDG basedir envvars
+ XDG_CACHE_HOME=\$HOME/.cache
+ XDG_CONFIG_HOME=\$HOME/.config
+ XDG_DATA_HOME=\$HOME/.local/share
+
+ # Initialize empty TBB runtime state directory hierarchy. Mirror the
+ # layout used by the official TBB, to avoid the hassle of working
+ # against the assumptions made by tor-launcher & co.
+ mkdir -p "\$HOME/TorBrowser" "\$HOME/TorBrowser/Data"
+
+ # Initialize the Tor data directory.
+ mkdir -p "\$HOME/TorBrowser/Data/Tor"
+
+ # TBB fails if ownership is too permissive
+ chmod 0700 "\$HOME/TorBrowser/Data/Tor"
+
+ # Initialize the browser profile state. Expect TBB to generate all data.
+ mkdir -p "\$HOME/TorBrowser/Data/Browser/profile.default"
+
+ # Files that capture store paths; re-generated by firefox at startup
+ rm -rf "\$HOME/TorBrowser/Data/Browser/profile.default"/{compatibility.ini,extensions.ini,extensions.json,startupCache}
+
+ # Clear out fontconfig caches
+ rm -f "\$HOME/.cache/fontconfig/"*.cache-*
+
+ # Lift-off!
+ #
+ # TZ is set to avoid stat()ing /etc/localtime over and over ...
+ #
+ # DBUS_SESSION_BUS_ADDRESS is inherited to avoid auto-launching a new
+ # dbus instance; to prevent using the session bus, set the envvar to
+ # an empty/invalid value prior to running tor-browser.
+ #
+ # FONTCONFIG_FILE is required to make fontconfig read the TBB
+ # fonts.conf; upstream uses FONTCONFIG_PATH, but FC_DEBUG=1024
+ # indicates the system fonts.conf being used instead.
+ #
+ # HOME, TMPDIR, XDG_*_HOME are set as a form of soft confinement;
+ # ideally, tor-browser should not write to any path outside TBB_HOME
+ # and should run even under strict confinement to TBB_HOME.
+ #
+ # XDG_DATA_DIRS is set to prevent searching system directories for
+ # mime and icon data.
+ #
+ # PULSE_{SERVER,COOKIE} is necessary for audio playback w/pulseaudio
+ #
+ # APULSE_PLAYBACK_DEVICE is for audio playback w/o pulseaudio (no capture yet)
+ #
+ # GST_PLUGIN_SYSTEM_PATH is for HD video playback
+ #
+ # GST_REGISTRY is set to devnull to minimize disk writes
+ #
+ # TOR_* is for using an external tor instance
+ #
+ # Parameters lacking a default value below are *required* (enforced by
+ # -o nounset).
+ exec env -i \
+ LD_LIBRARY_PATH=$wrapper_LD_LIBRARY_PATH \
+ \
+ TZ=":" \
+ \
+ DISPLAY="\$DISPLAY" \
+ XAUTHORITY="\$XAUTHORITY" \
+ DBUS_SESSION_BUS_ADDRESS="\$DBUS_SESSION_BUS_ADDRESS" \
+ \
+ HOME="\$HOME" \
+ TMPDIR="\$XDG_CACHE_HOME/tmp" \
+ XDG_CONFIG_HOME="\$XDG_CONFIG_HOME" \
+ XDG_DATA_HOME="\$XDG_DATA_HOME" \
+ XDG_CACHE_HOME="\$XDG_CACHE_HOME" \
+ XDG_RUNTIME_DIR="\$HOME/run" \
+ \
+ XDG_DATA_DIRS="$wrapper_XDG_DATA_DIRS" \
+ \
+ FONTCONFIG_FILE="$TBDATA_IN_STORE/fonts.conf" \
+ \
+ APULSE_PLAYBACK_DEVICE="\''${APULSE_PLAYBACK_DEVICE:-plug:dmix}" \
+ \
+ GST_PLUGIN_SYSTEM_PATH="${optionalString mediaSupport gstPluginsPath}" \
+ GST_REGISTRY="/dev/null" \
+ GST_REGISTRY_UPDATE="no" \
+ \
+ TOR_SKIP_LAUNCH="\''${TOR_SKIP_LAUNCH:-}" \
+ TOR_CONTROL_PORT="\''${TOR_CONTROL_PORT:-}" \
+ TOR_SOCKS_PORT="\''${TOR_SOCKS_PORT:-}" \
+ \
+ $self/firefox \
+ -no-remote \
+ -profile "\$HOME/TorBrowser/Data/Browser/profile.default" \
+ "\$@"
+ EOF
+ chmod +x $out/bin/tor-browser
+
+ echo "Syntax checking wrapper ..."
+ bash -n $out/bin/tor-browser
+
+ echo "Checking wrapper ..."
+ DISPLAY="" XAUTHORITY="" DBUS_SESSION_BUS_ADDRESS="" TBB_HOME=$(mktemp -d) \
+ $out/bin/tor-browser -version >/dev/null
+ '';
+
+ meta = with stdenv.lib; {
+ description = "An unofficial version of the tor browser bundle, built from source";
+ homepage = https://torproject.org/;
+ license = licenses.unfreeRedistributable; # TODO: check this
+ platforms = [ "x86_64-linux" ];
+ hydraPlatforms = [ ];
+ maintainers = with maintainers; [ joachifm ];
+ };
+}
diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix
new file mode 100644
index 0000000000000000000000000000000000000000..86c2f53b9adde7e3cb2698b0725a157ac1665c48
--- /dev/null
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix
@@ -0,0 +1,111 @@
+{ stdenv
+, fetchgit
+, fetchurl
+
+# common
+, zip
+
+# HTTPS Everywhere
+, git
+, libxml2 # xmllint
+, python27
+, python27Packages
+, rsync
+}:
+
+{
+ https-everywhere = stdenv.mkDerivation rec {
+ name = "https-everywhere-${version}";
+ version = "2017.10.4";
+
+ extid = "https-everywhere-eff@eff.org";
+
+ src = fetchgit {
+ url = "https://git.torproject.org/https-everywhere.git";
+ rev = "refs/tags/${version}";
+ sha256 = "1g7971xygnhagnb25xjdf6mli6091ai9igx42d0ww88g8i0cqfzj";
+ fetchSubmodules = true; # for translations, TODO: remove
+ };
+
+ nativeBuildInputs = [
+ git
+ libxml2 # xmllint
+ python27
+ python27Packages.lxml
+ rsync
+ zip
+ ];
+
+ buildPhase = ''
+ $shell ./makexpi.sh ${version} --no-recurse
+ '';
+
+ installPhase = ''
+ install -m 444 -D pkg/https-everywhere-$version-eff.xpi "$out/$extid.xpi"
+ '';
+ };
+
+ noscript = stdenv.mkDerivation rec {
+ name = "noscript-${version}";
+ version = "5.1.2";
+
+ extid = "{73a6fe31-595d-460b-a920-fcc0f8843232}";
+
+ src = fetchurl {
+ url = "https://secure.informaction.com/download/releases/noscript-${version}.xpi";
+ sha256 = "1fzspdiwhjabwz1yxb3gzj7giz9jbc1xxm65i93rvhzcp537cs42";
+ };
+
+ unpackPhase = ":";
+
+ installPhase = ''
+ install -m 444 -D $src "$out/$extid.xpi"
+ '';
+ };
+
+ torbutton = stdenv.mkDerivation rec {
+ name = "torbutton-${version}";
+ version = "1.9.8.1";
+
+ extid = "torbutton@torproject.org";
+
+ src = fetchgit {
+ url = "https://git.torproject.org/torbutton.git";
+ rev = "refs/tags/${version}";
+ sha256 = "1amp0c9ky0a7fsa0bcbi6n6ginw7s2g3an4rj7kvc1lxmrcsm65l";
+ };
+
+ nativeBuildInputs = [ zip ];
+
+ buildPhase = ''
+ $shell ./makexpi.sh
+ '';
+
+ installPhase = ''
+ install -m 444 -D pkg/torbutton-$version.xpi "$out/$extid.xpi"
+ '';
+ };
+
+ tor-launcher = stdenv.mkDerivation rec {
+ name = "tor-launcher-${version}";
+ version = "0.2.13";
+
+ extid = "tor-launcher@torproject.org";
+
+ src = fetchgit {
+ url = "https://git.torproject.org/tor-launcher.git";
+ rev = "refs/tags/${version}";
+ sha256 = "1f98v88y2clwvjiw77kxqc9cacp5h0489a540nc2wmsx7vnskrq0";
+ };
+
+ nativeBuildInputs = [ zip ];
+
+ buildPhase = ''
+ make package
+ '';
+
+ installPhase = ''
+ install -m 444 -D pkg/tor-launcher-$version.xpi "$out/$extid.xpi"
+ '';
+ };
+}
diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix
index 28a4de16ea05dd52fdd3ca10df60ef51dc42efee..c654723f4c2c0fecd7a05af378aa7ef76922dd98 100644
--- a/pkgs/applications/networking/browsers/vimb/default.nix
+++ b/pkgs/applications/networking/browsers/vimb/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "0d9rankzgmnx5423pyfkbxy0qxw3ck2vrdjdnlhddy15wkk87i9f";
};
- buildInputs = [ makeWrapper gtk2 libsoup pkgconfig webkit gsettings_desktop_schemas ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ makeWrapper gtk2 libsoup webkit gsettings_desktop_schemas ];
makeFlags = [ "PREFIX=$(out)" ];
diff --git a/pkgs/applications/networking/browsers/vimprobable2/default.nix b/pkgs/applications/networking/browsers/vimprobable2/default.nix
index 162ad8533bdc547588fba40ca627129bf4f47472..e6275b2f9592d141c9b3b514337f407c938b70a3 100644
--- a/pkgs/applications/networking/browsers/vimprobable2/default.nix
+++ b/pkgs/applications/networking/browsers/vimprobable2/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "13jdximksh9r3cgd2f8vms0pbsn3x0gxvyqdqiw16xp5fmdx5kzr";
};
- buildInputs = [ makeWrapper gtk2 libsoup libX11 perl pkgconfig webkit gsettings_desktop_schemas ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ makeWrapper gtk2 libsoup libX11 perl webkit gsettings_desktop_schemas ];
hardeningDisable = [ "format" ];
@@ -34,7 +35,7 @@ stdenv.mkDerivation rec {
featureset might be considered "minimalistic", but not as minimalistic as
being completely featureless.
'';
- homepage = http://sourceforge.net/apps/trac/vimprobable;
+ homepage = https://sourceforge.net/apps/trac/vimprobable;
license = stdenv.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.aforemny ];
platforms = with stdenv.lib.platforms; linux;
diff --git a/pkgs/applications/networking/browsers/vivaldi/chromium-gcc-r1.patch b/pkgs/applications/networking/browsers/vivaldi/chromium-gcc-r1.patch
new file mode 100644
index 0000000000000000000000000000000000000000..036d57b601daa45fcd401771017fceca8c43d8a2
--- /dev/null
+++ b/pkgs/applications/networking/browsers/vivaldi/chromium-gcc-r1.patch
@@ -0,0 +1,14 @@
+diff --git a/base/numerics/safe_math_shared_impl.h b/base/numerics/safe_math_shared_impl.h
+index 99f230ce7e9a..de2415d402f5 100644
+--- a/base/numerics/safe_math_shared_impl.h
++++ b/base/numerics/safe_math_shared_impl.h
+@@ -21,8 +21,7 @@
+ #if !defined(__native_client__) && \
+ ((defined(__clang__) && \
+ ((__clang_major__ > 3) || \
+- (__clang_major__ == 3 && __clang_minor__ >= 4))) || \
+- (defined(__GNUC__) && __GNUC__ >= 5))
++ (__clang_major__ == 3 && __clang_minor__ >= 4))))
+ #include "base/numerics/safe_math_clang_gcc_impl.h"
+ #define BASE_HAS_OPTIMIZED_SAFE_MATH (1)
+ #else
\ No newline at end of file
diff --git a/pkgs/applications/networking/browsers/vivaldi/chromium-gcc5-r1.patch b/pkgs/applications/networking/browsers/vivaldi/chromium-gcc5-r1.patch
new file mode 100644
index 0000000000000000000000000000000000000000..8d2886fbfa944a3004d7740be9fc60d896fd9798
--- /dev/null
+++ b/pkgs/applications/networking/browsers/vivaldi/chromium-gcc5-r1.patch
@@ -0,0 +1,66 @@
+--- a/chrome/browser/devtools/devtools_file_system_indexer.cc
++++ b/chrome/browser/devtools/devtools_file_system_indexer.cc
+@@ -34,7 +34,6 @@ using base::TimeDelta;
+ using base::TimeTicks;
+ using content::BrowserThread;
+ using std::map;
+-using std::set;
+ using std::string;
+ using std::vector;
+
+@@ -191,7 +190,7 @@ vector Index::Search(const string& query) {
+ if (trigram != kUndefinedTrigram)
+ trigrams.push_back(trigram);
+ }
+- set file_ids;
++ std::set file_ids;
+ bool first = true;
+ vector::const_iterator it = trigrams.begin();
+ for (; it != trigrams.end(); ++it) {
+@@ -203,7 +202,7 @@ vector Index::Search(const string& query) {
+ first = false;
+ continue;
+ }
+- set intersection = base::STLSetIntersection >(
++ std::set intersection = base::STLSetIntersection >(
+ file_ids, index_[trigram]);
+ file_ids.swap(intersection);
+ }
+diff --git a/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h b/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h
+index 94bb9161ec85..e40c6387f72e 100644
+--- a/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h
++++ b/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h
+@@ -63,7 +63,7 @@ class WTF_EXPORT ArrayBufferContents {
+ allocation_length_(0),
+ data_(data),
+ data_length_(0),
+- kind_(AllocationKind::kNormal),
++ kind_(WTF::ArrayBufferContents::AllocationKind::kNormal),
+ deleter_(deleter) {}
+ DataHandle(void* allocation_base,
+ size_t allocation_length,
+@@ -94,11 +94,11 @@ class WTF_EXPORT ArrayBufferContents {
+ reinterpret_cast(allocation_base_) +
+ allocation_length_);
+ switch (kind_) {
+- case AllocationKind::kNormal:
++ case WTF::ArrayBufferContents::AllocationKind::kNormal:
+ DCHECK(deleter_);
+ deleter_(data_);
+ return;
+- case AllocationKind::kReservation:
++ case WTF::ArrayBufferContents::AllocationKind::kReservation:
+ ReleaseReservedMemory(allocation_base_, allocation_length_);
+ return;
+ }
+--- a/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.orig 2017-08-15 12:45:59.433532111 +0000
++++ b/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc 2017-08-15 17:52:59.691328825 +0000
+@@ -10,7 +10,7 @@
+
+ #include "webrtc/modules/audio_processing/aec3/aec_state.h"
+
+-#include
++#include
+ #include
+ #include
+
\ No newline at end of file
diff --git a/pkgs/applications/networking/browsers/vivaldi/chromium-gn-bootstrap-r14.patch b/pkgs/applications/networking/browsers/vivaldi/chromium-gn-bootstrap-r14.patch
new file mode 100644
index 0000000000000000000000000000000000000000..6242671536695b2dd0f114d62c1f5d78676e93cc
--- /dev/null
+++ b/pkgs/applications/networking/browsers/vivaldi/chromium-gn-bootstrap-r14.patch
@@ -0,0 +1,27 @@
+commit 96c271f8ab2be7ea4199078ea65ac50c6ada4685
+Author: Pawel Hajdan, Jr
+Date: Wed Jul 26 21:51:54 2017 +0000
+
+ wip
+
+diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
+index 1390560f8e37..ff2ae57c46b0 100755
+--- a/tools/gn/bootstrap/bootstrap.py
++++ b/tools/gn/bootstrap/bootstrap.py
+@@ -449,6 +449,7 @@ def write_gn_ninja(path, root_gen_dir, options):
+ 'base/metrics/histogram_base.cc',
+ 'base/metrics/histogram_functions.cc',
+ 'base/metrics/histogram_samples.cc',
++ 'base/metrics/histogram_snapshot_manager.cc',
+ 'base/metrics/metrics_hashes.cc',
+ 'base/metrics/persistent_histogram_allocator.cc',
+ 'base/metrics/persistent_memory_allocator.cc',
+@@ -534,7 +535,7 @@ def write_gn_ninja(path, root_gen_dir, options):
+ 'base/trace_event/heap_profiler_allocation_context_tracker.cc',
+ 'base/trace_event/heap_profiler_allocation_register.cc',
+ 'base/trace_event/heap_profiler_event_filter.cc',
+- 'base/trace_event/heap_profiler_event_writer.cc',
++ 'base/trace_event/heap_profiler_heap_dump_writer.cc',
+ 'base/trace_event/heap_profiler_serialization_state.cc',
+ 'base/trace_event/heap_profiler_stack_frame_deduplicator.cc',
+ 'base/trace_event/heap_profiler_type_name_deduplicator.cc',
\ No newline at end of file
diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index a1238cb5964fc871d2faecac50c4699892d83ef6..410e886636083c7567c4d7855d90683cd1199546 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -7,17 +7,17 @@
, glib, gtk3, pango, gdk_pixbuf, cairo, atk, gnome3
, nss, nspr
, patchelf, makeWrapper
-, proprietaryCodecs ? true, vivaldi-ffmpeg-codecs ? null
+, proprietaryCodecs ? false, vivaldi-ffmpeg-codecs ? null
}:
stdenv.mkDerivation rec {
name = "${product}-${version}";
product = "vivaldi";
- version = "1.11.917.39-1";
+ version = "1.12.955.38-1";
src = fetchurl {
url = "https://downloads.vivaldi.com/stable/${product}-stable_${version}_amd64.deb";
- sha256 = "0rsggp4ayj462g217zb9y9grhvbrcxa51a77l8l4qzhd9lg7zvx6";
+ sha256 = "1bq1ss6vkpr6rw5n0sw9zipxx19vficvxys1lra9symcxk1b4gqw";
};
unpackPhase = ''
diff --git a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
index 1a1b7ae142c508d9197b66d0ef51e9e2d6bf1ff3..542bcbc41b0d7b9e1ab46f43966b54aff92f26d9 100644
--- a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
@@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
name = "${product}-${version}";
product = "vivaldi-ffmpeg-codecs";
- version = "60.0.3112.90";
+ version = "61.0.3163.91";
src = fetchurl {
url = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${version}.tar.xz";
- sha512 = "2p7pjjsxpglxjmh0asyykagqh33ccrjwj4b2aski4h31wkxv9b9najy8aqk6j1bi06n9wd35vis4hz4fr6kvgckllg1pjqrb3bpwmq5";
+ sha512 = "3f07vwbxllrwy3agqxa6ndcix23vai18i178zscmk0y68flhzffyjdvrwlg7dzlwgiqypj2cyl21qb4qmcay2ilgw9vnr9fql2x0w7p";
};
buildInputs = [ ];
@@ -21,7 +21,9 @@ stdenv.mkDerivation rec {
];
patches = [
- ../chromium/patches/chromium-gn-bootstrap-r8.patch
+ ./chromium-gn-bootstrap-r14.patch
+ ./chromium-gcc-r1.patch
+ ./chromium-gcc5-r1.patch
];
configurePhase = ''
@@ -51,5 +53,6 @@ stdenv.mkDerivation rec {
license = licenses.lgpl21;
maintainers = with maintainers; [ lluchs ];
platforms = [ "x86_64-linux" ];
+ broken = true;
};
}
diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix
index e7641eb773dcb008919a3e23108400e5a3b9e85f..f65e2fe1851b3802a0ce1c4b6240b5510e1de96d 100644
--- a/pkgs/applications/networking/browsers/w3m/default.nix
+++ b/pkgs/applications/networking/browsers/w3m/default.nix
@@ -40,7 +40,8 @@ stdenv.mkDerivation rec {
})
] ++ optional (graphicsSupport && !x11Support) [ ./no-x11.patch ];
- buildInputs = [ pkgconfig ncurses boehmgc gettext zlib ]
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ ncurses boehmgc gettext zlib ]
++ optional sslSupport openssl
++ optional mouseSupport gpm-ncurses
++ optional graphicsSupport imlib2
diff --git a/pkgs/applications/networking/cluster/cni/default.nix b/pkgs/applications/networking/cluster/cni/default.nix
index bdff04cb0738d226301ff3a1a8ffb2018e17a6db..a7205f1bc7af8030b98fc40d2907c68aea812ead 100644
--- a/pkgs/applications/networking/cluster/cni/default.nix
+++ b/pkgs/applications/networking/cluster/cni/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "cni-${version}";
- version = "0.3.0";
+ version = "0.5.2";
src = fetchFromGitHub {
owner = "containernetworking";
repo = "cni";
rev = "v${version}";
- sha256 = "1nvixvf5slnsdrfpfs2km64x680wf83jbyp7il12bcim37q2az7m";
+ sha256 = "0n2sc5xf1h0i54am80kj7imrvawddn0kxvgi65w0194dpmyrg5al";
};
buildInputs = [ go ];
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
outputs = ["out" "plugins"];
buildPhase = ''
- patchShebangs build
- ./build
+ patchShebangs build.sh
+ ./build.sh
'';
installPhase = ''
diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm.nix b/pkgs/applications/networking/cluster/docker-machine/kvm.nix
index a73ec99cb9fb94daf37eeec5e815b8ae6abc3222..5d47302960f76770a0427938adb8aa98cf50d064 100644
--- a/pkgs/applications/networking/cluster/docker-machine/kvm.nix
+++ b/pkgs/applications/networking/cluster/docker-machine/kvm.nix
@@ -15,7 +15,8 @@ buildGoPackage rec {
sha256 = "1p7s340wlcjvna3xa2x13nsnixfhbn5b7dhf9cqvxds2slizlm3p";
};
- buildInputs = [ libvirt pkgconfig ];
+ nativeBuildInputs = [ pkgconfig ];
+ buildInputs = [ libvirt ];
meta = with stdenv.lib; {
homepage = https://github.com/dhiltgen/docker-machine-kvm;
diff --git a/pkgs/applications/networking/cluster/habitat/chroot-env.nix b/pkgs/applications/networking/cluster/habitat/chroot-env.nix
deleted file mode 100644
index 7d6b3749904bc660dd155c57eee4dbda83166ab0..0000000000000000000000000000000000000000
--- a/pkgs/applications/networking/cluster/habitat/chroot-env.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-# TODO: Drop once https://github.com/habitat-sh/habitat/issues/994
-# is resolved.
-{ habitat, libsodium, libarchive, openssl, buildFHSUserEnv }:
-
-buildFHSUserEnv {
- name = "habitat-sh";
- targetPkgs = pkgs: [ habitat libsodium libarchive openssl ];
- runScript = "bash";
-}
diff --git a/pkgs/applications/networking/cluster/habitat/default.nix b/pkgs/applications/networking/cluster/habitat/default.nix
index da82dac001916a96d8427863b0e4072b2666e404..1656e5a09a6b69d549df256179a704beb33a4400 100644
--- a/pkgs/applications/networking/cluster/habitat/default.nix
+++ b/pkgs/applications/networking/cluster/habitat/default.nix
@@ -5,28 +5,36 @@ with rustPlatform;
buildRustPackage rec {
name = "habitat-${version}";
- version = "0.8.0";
+ version = "0.30.2";
src = fetchFromGitHub {
owner = "habitat-sh";
repo = "habitat";
rev = version;
- sha256 = "1h9wv2v4hcv79jkkjf8j96lzxni9d51755zfflfr5s3ayaip7rzj";
+ sha256 = "0pqrm85pd9hqn5fwqjbyyrrfh4k7q9mi9qy9hm8yigk5l8mw44y1";
};
- sourceRoot = "habitat-${version}-src/components/hab";
-
- depsSha256 = "1612jaw3zdrgrb56r755bb18l8szdmf1wi7p9lpv3d2gklqcb7l1";
+ cargoSha256 = "1ahfm5agvabqqqgjsyjb95xxbc7mng1mdyclcakwp1m1qdkxx9p0";
buildInputs = [ libsodium libarchive openssl ];
nativeBuildInputs = [ pkgconfig ];
+ cargoBuildFlags = ["--package hab"];
+
+ checkPhase = ''
+ runHook preCheck
+ echo "Running cargo test"
+ cargo test --package hab
+ runHook postCheck
+ '';
+
meta = with lib; {
description = "An application automation framework";
homepage = https://www.habitat.sh;
license = licenses.asl20;
maintainers = [ maintainers.rushmorem ];
platforms = [ "x86_64-linux" "x86_64-darwin" ];
+ broken = true; # mark temporary as broken due git dependencies
};
}
diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix
index 0ac872c35c90ae20e45cfbb39bb6ce2032e92eb8..6767a0bd724064e648a9a96e753e4b410e0dd510 100644
--- a/pkgs/applications/networking/cluster/helm/default.nix
+++ b/pkgs/applications/networking/cluster/helm/default.nix
@@ -4,10 +4,10 @@ let
then "linux-amd64"
else "darwin-amd64";
checksum = if stdenv.isLinux
- then "1hkr5s1c72sqf156lk6gsnbfs75jnpqs42f64a7mz046c06kv98f"
- else "00xw0c66x58g915989fc72mwliysxi5glrkdafi3gcfmlhrnc68i";
+ then "1i22givr52kgr76dd2azcg9avgh70wiw5dcpmmyychms2ynxi42y"
+ else "0phhy3si86ilc6051zfgn8jnniy5lygf1r2gysjpcyfbrc5pw3hj";
pname = "helm";
- version = "2.5.1";
+ version = "2.6.1";
in
stdenv.mkDerivation {
name = "${pname}-${version}";
diff --git a/pkgs/applications/networking/cluster/kanif/default.nix b/pkgs/applications/networking/cluster/kanif/default.nix
index bac0cc37af337ca51da1d7ce44f87bd80a4a418c..5b543854473dda84e01fc6af982e539139bfc9d9 100644
--- a/pkgs/applications/networking/cluster/kanif/default.nix
+++ b/pkgs/applications/networking/cluster/kanif/default.nix
@@ -4,8 +4,6 @@ stdenv.mkDerivation rec {
version = "1.2.2";
name = "kanif-${version}";
- propagateBuildInputs = [ perl taktuk ];
-
src = fetchurl {
url = "http://gforge.inria.fr/frs/download.php/26773/${name}.tar.gz";
sha256 = "3f0c549428dfe88457c1db293cfac2a22b203f872904c3abf372651ac12e5879";
diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix
index e036fb2f38bda8709d91711f8bf4c4be7fd271bb..ff7cb245ae2a083aaa1ae63690a5854aa1fb0ea4 100644
--- a/pkgs/applications/networking/cluster/kops/default.nix
+++ b/pkgs/applications/networking/cluster/kops/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "kops-${version}";
- version = "1.6.2";
+ version = "1.7.1";
goPackagePath = "k8s.io/kops";
@@ -10,7 +10,7 @@ buildGoPackage rec {
rev = version;
owner = "kubernetes";
repo = "kops";
- sha256 = "0bxknjhzj9xiws6sjw9knwqma3fjh496vnm90skl766bk4pafq9l";
+ sha256 = "0wii6w6hs9hjz3vvgqwa5ilwdi8a3qknmqsg3izazmgmnhl712wd";
};
buildInputs = [go-bindata];
@@ -39,7 +39,7 @@ buildGoPackage rec {
description = "Easiest way to get a production Kubernetes up and running";
homepage = https://github.com/kubernetes/kops;
license = licenses.asl20;
- maintainers = with maintainers; [offline];
+ maintainers = with maintainers; [offline zimbatm];
platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/networking/cluster/kubecfg/default.nix b/pkgs/applications/networking/cluster/kubecfg/default.nix
new file mode 100644
index 0000000000000000000000000000000000000000..7f17bd57c19469c56a58f146449ccbecff6a7912
--- /dev/null
+++ b/pkgs/applications/networking/cluster/kubecfg/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildGoPackage, fetchFromGitHub, ... }:
+
+let version = "0.5.0"; in
+
+buildGoPackage {
+ name = "kubecfg-${version}";
+
+ src = fetchFromGitHub {
+ owner = "ksonnet";
+ repo = "kubecfg";
+ rev = "v${version}";
+ sha256 = "1s8w133p8qkj3dr73jimajm9ddp678lw9k9symj8rjw5p35igr93";
+ };
+
+ goPackagePath = "github.com/ksonnet/kubecfg";
+
+ meta = {
+ description = "A tool for managing Kubernetes resources as code";
+ homepage = https://github.com/ksonnet/kubecfg;
+ license = lib.licenses.asl20;
+ maintainers = with lib.maintainers; [ benley ];
+ platforms = lib.platforms.unix;
+ };
+}
diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index 69fe6a1730aacb172bd78954b7b5ce4bab7a6612..e8686ade59008e88a01189e59fe35bf25d1a8d18 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -8,9 +8,9 @@
"cmd/kube-controller-manager"
"cmd/kube-proxy"
"plugin/cmd/kube-scheduler"
- "cmd/kube-dns"
"federation/cmd/federation-apiserver"
"federation/cmd/federation-controller-manager"
+ "test/e2e/e2e.test"
]
}:
@@ -18,13 +18,13 @@ with lib;
stdenv.mkDerivation rec {
name = "kubernetes-${version}";
- version = "1.5.6";
+ version = "1.7.9";
src = fetchFromGitHub {
owner = "kubernetes";
repo = "kubernetes";
rev = "v${version}";
- sha256 = "0mkg4vgz9szgq1k5ignkdr5gmg703xlq8zsrr422a1qfqb8zp15w";
+ sha256 = "0lxagvv8mysw6n0vp5vsccl87b628dgsjrf298dx2dqx7wn7zjgi";
};
buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ];
@@ -55,6 +55,10 @@ stdenv.mkDerivation rec {
cp build/pause/pause "$pause/bin/pause"
cp -R docs/man/man1 "$man/share/man"
+ cp cluster/addons/addon-manager/kube-addons.sh $out/bin/kube-addons
+ patchShebangs $out/bin/kube-addons
+ wrapProgram $out/bin/kube-addons --set "KUBECTL_BIN" "$out/bin/kubectl"
+
$out/bin/kubectl completion bash > $out/share/bash-completion/completions/kubectl
'';
diff --git a/pkgs/applications/networking/cluster/marathon/default.nix b/pkgs/applications/networking/cluster/marathon/default.nix
index 6bceeefc37a907e61a158f229ebe36d9bcadc7a0..49cac6d50635e2df67e4b650d1259742100a3da3 100644
--- a/pkgs/applications/networking/cluster/marathon/default.nix
+++ b/pkgs/applications/networking/cluster/marathon/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
homepage = https://mesosphere.github.io/marathon;
description = "Cluster-wide init and control system for services in cgroups or Docker containers";
license = licenses.asl20;
- maintainers = with maintainers; [ rushmorem kamilchm kevincox pradeepchhetri ];
+ maintainers = with maintainers; [ kamilchm kevincox pradeepchhetri ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix
index 65758fca600036094164144cdcd0ee4883103ce1..9092422739301956d41985e734b4708d357d0a0b 100644
--- a/pkgs/applications/networking/cluster/mesos/default.nix
+++ b/pkgs/applications/networking/cluster/mesos/default.nix
@@ -1,14 +1,13 @@
-{ stdenv, lib, makeWrapper, fetchurl, curl, sasl, openssh, autoconf
-, automake, libtool, unzip, gnutar, jdk, maven, python, wrapPython
+{ stdenv, lib, makeWrapper, fetchurl, curl, sasl, openssh
+, unzip, gnutar, jdk, python, wrapPython
, setuptools, boto, pythonProtobuf, apr, subversion, gzip, systemd
, leveldb, glog, perf, utillinux, libnl, iproute, openssl, libevent
-, ethtool, coreutils, which, iptables
-, bash
+, ethtool, coreutils, which, iptables, maven
+, bash, autoreconfHook
}:
let
mavenRepo = import ./mesos-deps.nix { inherit stdenv curl; };
- soext = if stdenv.system == "x86_64-darwin" then "dylib" else "so";
# `tar -z` requires gzip on $PATH, so wrap tar.
# At some point, we should try to patch mesos so we add gzip to the PATH when
# tar is invoked. I think that only needs to be done here:
@@ -22,7 +21,7 @@ let
});
in stdenv.mkDerivation rec {
- version = "1.1.1";
+ version = "1.4.0";
name = "mesos-${version}";
enableParallelBuilding = true;
@@ -30,7 +29,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://apache/mesos/${version}/${name}.tar.gz";
- sha256 = "0f46ebb130d2d4a9732f95d0a71d80c8c5967f3c172b110f2ece316e05922115";
+ sha256 = "0c08kd226nrjwm2z2drpq4vi97h9r8b1xkdvkgh1114fxg7cyvys";
};
patches = [
@@ -41,11 +40,13 @@ in stdenv.mkDerivation rec {
# see https://github.com/cstrahan/mesos/tree/nixos-${version}
./nixos.patch
];
-
+ nativeBuildInputs = [
+ autoreconfHook
+ ];
buildInputs = [
- makeWrapper autoconf automake libtool curl sasl jdk maven
+ makeWrapper curl sasl jdk
python wrapPython boto setuptools leveldb
- subversion apr glog openssl libevent
+ subversion apr glog openssl libevent maven
] ++ lib.optionals stdenv.isLinux [
libnl
];
@@ -53,27 +54,24 @@ in stdenv.mkDerivation rec {
propagatedBuildInputs = [
pythonProtobuf
];
-
- # note that we *must* statically link libprotobuf.
- # if we dynamically link the lib, we get these errors:
- # https://github.com/NixOS/nixpkgs/pull/19064#issuecomment-255082684
preConfigure = ''
# https://issues.apache.org/jira/browse/MESOS-6616
configureFlagsArray+=(
"CXXFLAGS=-O2 -Wno-error=strict-aliasing"
)
+ substituteInPlace 3rdparty/stout/include/stout/jsonify.hpp \
+ --replace '' ''
# Fix cases where makedev(),major(),minor() are referenced through
# instead of
sed 1i'#include ' -i src/linux/fs.cpp
sed 1i'#include ' -i src/slave/containerizer/mesos/isolators/gpu/isolator.cpp
-
substituteInPlace 3rdparty/stout/include/stout/os/posix/chown.hpp \
--subst-var-by chown ${coreutils}/bin/chown
substituteInPlace 3rdparty/stout/Makefile.am \
--replace "-lprotobuf" \
- "${pythonProtobuf.protobuf.lib}/lib/libprotobuf.a"
+ "${pythonProtobuf.protobuf}/lib/libprotobuf.a"
substituteInPlace 3rdparty/stout/include/stout/os/posix/fork.hpp \
--subst-var-by sh ${bash}/bin/bash
@@ -101,7 +99,7 @@ in stdenv.mkDerivation rec {
substituteInPlace src/python/native_common/ext_modules.py.in \
--replace "-lprotobuf" \
- "${pythonProtobuf.protobuf.lib}/lib/libprotobuf.a"
+ "${pythonProtobuf.protobuf}/lib/libprotobuf.a"
substituteInPlace src/slave/containerizer/mesos/isolators/gpu/volume.cpp \
--subst-var-by cp ${coreutils}/bin/cp \
@@ -126,7 +124,7 @@ in stdenv.mkDerivation rec {
substituteInPlace src/Makefile.am \
--subst-var-by mavenRepo ${mavenRepo} \
--replace "-lprotobuf" \
- "${pythonProtobuf.protobuf.lib}/lib/libprotobuf.a"
+ "${pythonProtobuf.protobuf}/lib/libprotobuf.a"
'' + lib.optionalString stdenv.isLinux ''
@@ -180,7 +178,7 @@ in stdenv.mkDerivation rec {
"--enable-libevent"
"--with-libevent=${libevent.dev}"
"--with-protobuf=${pythonProtobuf.protobuf}"
- "PROTOBUF_JAR=${mavenRepo}/com/google/protobuf/protobuf-java/2.6.1/protobuf-java-2.6.1.jar"
+ "PROTOBUF_JAR=${mavenRepo}/com/google/protobuf/protobuf-java/3.3.0/protobuf-java-3.3.0.jar"
] ++ lib.optionals stdenv.isLinux [
"--with-network-isolator"
"--with-nl=${libnl.dev}"
@@ -193,7 +191,7 @@ in stdenv.mkDerivation rec {
mkdir -p $out/share/java
cp src/java/target/mesos-*.jar $out/share/java
- MESOS_NATIVE_JAVA_LIBRARY=$out/lib/libmesos.${soext}
+ MESOS_NATIVE_JAVA_LIBRARY=$out/lib/libmesos${stdenv.hostPlatform.extensions.sharedLibrary}
mkdir -p $out/nix-support
touch $out/nix-support/setup-hook
@@ -247,7 +245,7 @@ in stdenv.mkDerivation rec {
homepage = "http://mesos.apache.org";
license = licenses.asl20;
description = "A cluster manager that provides efficient resource isolation and sharing across distributed applications, or frameworks";
- maintainers = with maintainers; [ cstrahan kevincox offline rushmorem ];
+ maintainers = with maintainers; [ cstrahan kevincox offline ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/networking/cluster/mesos/fetch-mesos-deps.sh b/pkgs/applications/networking/cluster/mesos/fetch-mesos-deps.sh
index f4a4588dbe41798a6129a2b697e8170e1321d346..cf7318ecb27398f348f911580559ec9f06b041e2 100644
--- a/pkgs/applications/networking/cluster/mesos/fetch-mesos-deps.sh
+++ b/pkgs/applications/networking/cluster/mesos/fetch-mesos-deps.sh
@@ -1127,10 +1127,12 @@ fetchArtifact org/vafer/jdependency/0.7/jdependency-0.7.pom
fetchArtifact org/vafer/jdependency/0.7/jdependency-0.7.pom.sha1
fetchArtifact org/vafer/jdependency/0.7/jdependency-0.7.jar
fetchArtifact org/vafer/jdependency/0.7/jdependency-0.7.jar.sha1
-fetchArtifact com/google/protobuf/protobuf-java/2.6.1/protobuf-java-2.6.1.pom
-fetchArtifact com/google/protobuf/protobuf-java/2.6.1/protobuf-java-2.6.1.pom.sha1
-fetchArtifact com/google/protobuf/protobuf-java/2.6.1/protobuf-java-2.6.1.jar
-fetchArtifact com/google/protobuf/protobuf-java/2.6.1/protobuf-java-2.6.1.jar.sha1
+fetchArtifact com/google/protobuf/protobuf-java/3.3.0/protobuf-java-3.3.0.pom
+fetchArtifact com/google/protobuf/protobuf-java/3.3.0/protobuf-java-3.3.0.pom.sha1
+fetchArtifact com/google/protobuf/protobuf-java/3.3.0/protobuf-java-3.3.0.jar
+fetchArtifact com/google/protobuf/protobuf-java/3.3.0/protobuf-java-3.3.0.jar.sha1
+fetchArtifact com/google/protobuf/protobuf-parent/3.3.0/protobuf-parent-3.3.0.pom
+fetchArtifact com/google/protobuf/protobuf-parent/3.3.0/protobuf-parent-3.3.0.pom.sha1
fetchArtifact com/google/google/1/google-1.pom
fetchArtifact com/google/google/1/google-1.pom.sha1
fetchArtifact com/google/guava/guava/11.0.2/guava-11.0.2.pom
diff --git a/pkgs/applications/networking/cluster/mesos/mesos-deps.nix b/pkgs/applications/networking/cluster/mesos/mesos-deps.nix
index 1edb4a755d8912c171b4421a6cadfe333a0163b2..642c660edb69e4385a7968f5322626210397693d 100644
--- a/pkgs/applications/networking/cluster/mesos/mesos-deps.nix
+++ b/pkgs/applications/networking/cluster/mesos/mesos-deps.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
outputHashAlgo = "sha256";
outputHashMode = "recursive";
- outputHash = "066ikswavq3l37x1s3pfdncyj77pvpa0kj14ax5dqb9njmsg0s11";
+ outputHash = "10h0qs7svw0cqjkyxs8z6s3qraa8ga920zfrr59rdlanbwg4klly";
buildInputs = [ curl ];
diff --git a/pkgs/applications/networking/cluster/mesos/nixos.patch b/pkgs/applications/networking/cluster/mesos/nixos.patch
index 78e374b8d6bcd9eb67ca50e877bdf33ae5676b21..a6fea024b087e775589f2133a9eb47d102e05f39 100644
--- a/pkgs/applications/networking/cluster/mesos/nixos.patch
+++ b/pkgs/applications/networking/cluster/mesos/nixos.patch
@@ -1,20 +1,7 @@
-diff --git a/3rdparty/stout/include/stout/os/posix/chown.hpp b/3rdparty/stout/include/stout/os/posix/chown.hpp
-index c82e2e574..15d332107 100644
---- a/3rdparty/stout/include/stout/os/posix/chown.hpp
-+++ b/3rdparty/stout/include/stout/os/posix/chown.hpp
-@@ -34,7 +34,7 @@ inline Try chown(
- // TODO(bmahler): Consider walking the file tree instead. We would need
- // to be careful to not miss dotfiles.
- std::string command =
-- "chown -R " + stringify(uid) + ':' + stringify(gid) + " '" + path + "'";
-+ "@chown@ -R " + stringify(uid) + ':' + stringify(gid) + " '" + path + "'";
-
- int status = os::system(command);
- if (status != 0) {
-diff --git a/3rdparty/stout/include/stout/os/posix/fork.hpp b/3rdparty/stout/include/stout/os/posix/fork.hpp
-index a29967dcb..290b98b50 100644
---- a/3rdparty/stout/include/stout/os/posix/fork.hpp
-+++ b/3rdparty/stout/include/stout/os/posix/fork.hpp
+diff --git i/3rdparty/stout/include/stout/os/posix/fork.hpp w/3rdparty/stout/include/stout/os/posix/fork.hpp
+index a29967d..290b98b 100644
+--- i/3rdparty/stout/include/stout/os/posix/fork.hpp
++++ w/3rdparty/stout/include/stout/os/posix/fork.hpp
@@ -369,7 +369,7 @@ private:
if (exec.isSome()) {
// Execute the command (via '/bin/sh -c command').
@@ -24,11 +11,11 @@ index a29967dcb..290b98b50 100644
EXIT(EXIT_FAILURE)
<< "Failed to execute '" << command << "': " << os::strerror(errno);
} else if (wait.isSome()) {
-diff --git a/3rdparty/stout/include/stout/posix/os.hpp b/3rdparty/stout/include/stout/posix/os.hpp
-index c37e64db6..d3d87b7f0 100644
---- a/3rdparty/stout/include/stout/posix/os.hpp
-+++ b/3rdparty/stout/include/stout/posix/os.hpp
-@@ -375,7 +375,7 @@ inline Option getenv(const std::string& key)
+diff --git i/3rdparty/stout/include/stout/posix/os.hpp w/3rdparty/stout/include/stout/posix/os.hpp
+index 8511dfd..1e7be01 100644
+--- i/3rdparty/stout/include/stout/posix/os.hpp
++++ w/3rdparty/stout/include/stout/posix/os.hpp
+@@ -366,7 +366,7 @@ inline Try> pids(Option group, Option session)
inline Try tar(const std::string& path, const std::string& archive)
{
Try tarOut =
@@ -37,11 +24,11 @@ index c37e64db6..d3d87b7f0 100644
if (tarOut.isError()) {
return Error("Failed to archive " + path + ": " + tarOut.error());
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 3bcc0f2df..e5cbc57e8 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -1545,7 +1545,7 @@ if HAS_JAVA
+diff --git i/src/Makefile.am w/src/Makefile.am
+index 68fff14..c572f92 100644
+--- i/src/Makefile.am
++++ w/src/Makefile.am
+@@ -1775,7 +1775,7 @@ if HAS_JAVA
$(MESOS_JAR): $(MESOS_JAR_SOURCE) $(MESOS_JAR_GENERATED) java/mesos.pom
@echo "Building mesos-$(PACKAGE_VERSION).jar ..."
@@ -50,10 +37,10 @@ index 3bcc0f2df..e5cbc57e8 100644
# Convenience library for JNI bindings.
# TODO(Charles Reiss): We really should be building the Java library
-diff --git a/src/cli/mesos-scp b/src/cli/mesos-scp
-index a71ab0708..1043d1b3c 100755
---- a/src/cli/mesos-scp
-+++ b/src/cli/mesos-scp
+diff --git i/src/cli/mesos-scp w/src/cli/mesos-scp
+index a71ab07..1043d1b 100755
+--- i/src/cli/mesos-scp
++++ w/src/cli/mesos-scp
@@ -19,7 +19,8 @@ if sys.version_info < (2,6,0):
@@ -64,11 +51,11 @@ index a71ab0708..1043d1b3c 100755
try:
process = subprocess.Popen(
cmd,
-diff --git a/src/common/command_utils.cpp b/src/common/command_utils.cpp
-index 09e805140..90bf65896 100644
---- a/src/common/command_utils.cpp
-+++ b/src/common/command_utils.cpp
-@@ -140,7 +140,7 @@ Future tar(
+diff --git i/src/common/command_utils.cpp w/src/common/command_utils.cpp
+index c50be76..388cc53 100644
+--- i/src/common/command_utils.cpp
++++ w/src/common/command_utils.cpp
+@@ -142,7 +142,7 @@ Future tar(
argv.emplace_back(input);
@@ -77,7 +64,7 @@ index 09e805140..90bf65896 100644
.then([]() { return Nothing(); });
}
-@@ -162,7 +162,7 @@ Future untar(
+@@ -164,7 +164,7 @@ Future untar(
argv.emplace_back(directory.get());
}
@@ -86,7 +73,7 @@ index 09e805140..90bf65896 100644
.then([]() { return Nothing(); });
}
-@@ -170,7 +170,7 @@ Future untar(
+@@ -172,7 +172,7 @@ Future untar(
Future sha512(const Path& input)
{
#ifdef __linux__
@@ -95,7 +82,7 @@ index 09e805140..90bf65896 100644
vector argv = {
cmd,
input // Input file to compute shasum.
-@@ -206,7 +206,7 @@ Future gzip(const Path& input)
+@@ -208,7 +208,7 @@ Future gzip(const Path& input)
input
};
@@ -104,7 +91,7 @@ index 09e805140..90bf65896 100644
.then([]() { return Nothing(); });
}
-@@ -219,7 +219,7 @@ Future decompress(const Path& input)
+@@ -221,7 +221,7 @@ Future decompress(const Path& input)
input
};
@@ -113,41 +100,45 @@ index 09e805140..90bf65896 100644
.then([]() { return Nothing(); });
}
-diff --git a/src/launcher/fetcher.cpp b/src/launcher/fetcher.cpp
-index 4456c2813..e22c8fc03 100644
---- a/src/launcher/fetcher.cpp
-+++ b/src/launcher/fetcher.cpp
-@@ -68,13 +68,13 @@ static Try extract(
+diff --git i/src/launcher/fetcher.cpp w/src/launcher/fetcher.cpp
+index 42980f5..3aebeed 100644
+--- i/src/launcher/fetcher.cpp
++++ w/src/launcher/fetcher.cpp
+@@ -80,17 +80,17 @@ static Try extract(
strings::endsWith(sourcePath, ".tar.bz2") ||
strings::endsWith(sourcePath, ".txz") ||
strings::endsWith(sourcePath, ".tar.xz")) {
-- command = "tar -C '" + destinationDirectory + "' -xf";
-+ command = "@tar@ -C '" + destinationDirectory + "' -xf";
+- command = {"tar", "-C", destinationDirectory, "-xf", sourcePath};
++ command = {"@tar@", "-C", destinationDirectory, "-xf", sourcePath};
} else if (strings::endsWith(sourcePath, ".gz")) {
string pathWithoutExtension = sourcePath.substr(0, sourcePath.length() - 3);
string filename = Path(pathWithoutExtension).basename();
-- command = "gzip -dc > '" + destinationDirectory + "/" + filename + "' <";
-+ command = "@gzip@ -dc > '" + destinationDirectory + "/" + filename + "' <";
+ string destinationPath = path::join(destinationDirectory, filename);
+
+- command = {"gunzip", "-d", "-c"};
++ command = {"@gunzip@", "-d", "-c"};
+ in = Subprocess::PATH(sourcePath);
+ out = Subprocess::PATH(destinationPath);
} else if (strings::endsWith(sourcePath, ".zip")) {
-- command = "unzip -o -d '" + destinationDirectory + "'";
-+ command = "@unzip@ -o -d '" + destinationDirectory + "'";
+- command = {"unzip", "-o", "-d", destinationDirectory, sourcePath};
++ command = {"@unzip@", "-o", "-d", destinationDirectory, sourcePath};
} else {
return false;
}
-@@ -162,7 +162,7 @@ static Try copyFile(
+@@ -193,7 +193,7 @@ static Try copyFile(
const string& sourcePath,
const string& destinationPath)
{
-- const string command = "cp '" + sourcePath + "' '" + destinationPath + "'";
-+ const string command = "@cp@ '" + sourcePath + "' '" + destinationPath + "'";
-
- LOG(INFO) << "Copying resource with command:" << command;
-
-diff --git a/src/linux/perf.cpp b/src/linux/perf.cpp
-index aa31982eb..8b5331b17 100644
---- a/src/linux/perf.cpp
-+++ b/src/linux/perf.cpp
-@@ -127,7 +127,7 @@ private:
+- int status = os::spawn("cp", {"cp", sourcePath, destinationPath});
++ int status = os::spawn("cp", {"@cp@", sourcePath, destinationPath});
+
+ if (status == -1) {
+ return ErrnoError("Failed to copy '" + sourcePath + "'");
+diff --git i/src/linux/perf.cpp w/src/linux/perf.cpp
+index b301e25..356a2cf 100644
+--- i/src/linux/perf.cpp
++++ w/src/linux/perf.cpp
+@@ -128,7 +128,7 @@ private:
// NOTE: The supervisor childhook places perf in its own process group
// and will kill the perf process when the parent dies.
Try _perf = subprocess(
@@ -156,19 +147,10 @@ index aa31982eb..8b5331b17 100644
argv,
Subprocess::PIPE(),
Subprocess::PIPE(),
-@@ -319,7 +319,7 @@ bool valid(const set& events)
- ostringstream command;
-
- // Log everything to stderr which is then redirected to /dev/null.
-- command << "perf stat --log-fd 2";
-+ command << "@perf@ stat --log-fd 2";
- foreach (const string& event, events) {
- command << " --event " << event;
- }
-diff --git a/src/linux/systemd.cpp b/src/linux/systemd.cpp
-index 6318f48fc..394d88d47 100644
---- a/src/linux/systemd.cpp
-+++ b/src/linux/systemd.cpp
+diff --git i/src/linux/systemd.cpp w/src/linux/systemd.cpp
+index 6318f48..394d88d 100644
+--- i/src/linux/systemd.cpp
++++ w/src/linux/systemd.cpp
@@ -196,13 +196,21 @@ bool exists()
// This is static as the init system should not change while we are running.
static const bool exists = []() -> bool {
@@ -209,10 +191,10 @@ index 6318f48fc..394d88d47 100644
Try daemonReload = os::shell("systemctl daemon-reload");
if (daemonReload.isError()) {
return Error("Failed to reload systemd daemon: " + daemonReload.error());
-diff --git a/src/python/cli/src/mesos/cli.py b/src/python/cli/src/mesos/cli.py
-index f342992e0..354abf443 100644
---- a/src/python/cli/src/mesos/cli.py
-+++ b/src/python/cli/src/mesos/cli.py
+diff --git i/src/python/cli/src/mesos/cli.py w/src/python/cli/src/mesos/cli.py
+index 4a9b558..c08a8b9 100644
+--- i/src/python/cli/src/mesos/cli.py
++++ w/src/python/cli/src/mesos/cli.py
@@ -40,7 +40,7 @@ def resolve(master):
import subprocess
@@ -222,10 +204,10 @@ index f342992e0..354abf443 100644
stdin=None,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
-diff --git a/src/slave/containerizer/mesos/isolators/docker/volume/isolator.cpp b/src/slave/containerizer/mesos/isolators/docker/volume/isolator.cpp
-index af9f3736b..f8554d414 100644
---- a/src/slave/containerizer/mesos/isolators/docker/volume/isolator.cpp
-+++ b/src/slave/containerizer/mesos/isolators/docker/volume/isolator.cpp
+diff --git i/src/slave/containerizer/mesos/isolators/docker/volume/isolator.cpp w/src/slave/containerizer/mesos/isolators/docker/volume/isolator.cpp
+index 5b630c1..d63ad69 100644
+--- i/src/slave/containerizer/mesos/isolators/docker/volume/isolator.cpp
++++ w/src/slave/containerizer/mesos/isolators/docker/volume/isolator.cpp
@@ -499,7 +499,7 @@ Future> DockerVolumeIsolatorProcess::_prepare(
// unsafe arbitrary commands).
CommandInfo* command = launchInfo.add_pre_exec_commands();
@@ -235,11 +217,11 @@ index af9f3736b..f8554d414 100644
command->add_arguments("mount");
command->add_arguments("-n");
command->add_arguments("--rbind");
-diff --git a/src/slave/containerizer/mesos/isolators/filesystem/linux.cpp b/src/slave/containerizer/mesos/isolators/filesystem/linux.cpp
-index df16b8fee..4a17475bd 100644
---- a/src/slave/containerizer/mesos/isolators/filesystem/linux.cpp
-+++ b/src/slave/containerizer/mesos/isolators/filesystem/linux.cpp
-@@ -159,9 +159,9 @@ Try LinuxFilesystemIsolatorProcess::create(const Flags& flags)
+diff --git i/src/slave/containerizer/mesos/isolators/filesystem/linux.cpp w/src/slave/containerizer/mesos/isolators/filesystem/linux.cpp
+index d7fe9a8..1361a4e 100644
+--- i/src/slave/containerizer/mesos/isolators/filesystem/linux.cpp
++++ w/src/slave/containerizer/mesos/isolators/filesystem/linux.cpp
+@@ -154,9 +154,9 @@ Try LinuxFilesystemIsolatorProcess::create(const Flags& flags)
// here because 'create' will only be invoked during
// initialization.
Try mount = os::shell(
@@ -252,7 +234,7 @@ index df16b8fee..4a17475bd 100644
workDir->c_str(),
workDir->c_str(),
workDir->c_str(),
-@@ -180,8 +180,8 @@ Try LinuxFilesystemIsolatorProcess::create(const Flags& flags)
+@@ -175,8 +175,8 @@ Try LinuxFilesystemIsolatorProcess::create(const Flags& flags)
LOG(INFO) << "Making '" << workDir.get() << "' a shared mount";
Try mount = os::shell(
@@ -263,7 +245,7 @@ index df16b8fee..4a17475bd 100644
workDir->c_str(),
workDir->c_str());
-@@ -404,7 +404,7 @@ Try> LinuxFilesystemIsolatorProcess::getPreExecCommands(
+@@ -422,7 +422,7 @@ Try> LinuxFilesystemIsolatorProcess::getPreExecCommands(
CommandInfo command;
command.set_shell(false);
@@ -272,7 +254,7 @@ index df16b8fee..4a17475bd 100644
command.add_arguments("mount");
command.add_arguments("-n");
command.add_arguments("--rbind");
-@@ -569,7 +569,7 @@ Try> LinuxFilesystemIsolatorProcess::getPreExecCommands(
+@@ -610,7 +610,7 @@ Try> LinuxFilesystemIsolatorProcess::getPreExecCommands(
// TODO(jieyu): Consider the mode in the volume.
CommandInfo command;
command.set_shell(false);
@@ -281,11 +263,11 @@ index df16b8fee..4a17475bd 100644
command.add_arguments("mount");
command.add_arguments("-n");
command.add_arguments("--rbind");
-diff --git a/src/slave/containerizer/mesos/isolators/filesystem/shared.cpp b/src/slave/containerizer/mesos/isolators/filesystem/shared.cpp
-index a1283e5ee..a918427bf 100644
---- a/src/slave/containerizer/mesos/isolators/filesystem/shared.cpp
-+++ b/src/slave/containerizer/mesos/isolators/filesystem/shared.cpp
-@@ -207,7 +207,7 @@ Future> SharedFilesystemIsolatorProcess::prepare(
+diff --git i/src/slave/containerizer/mesos/isolators/filesystem/shared.cpp w/src/slave/containerizer/mesos/isolators/filesystem/shared.cpp
+index 927d95b..576dc63 100644
+--- i/src/slave/containerizer/mesos/isolators/filesystem/shared.cpp
++++ w/src/slave/containerizer/mesos/isolators/filesystem/shared.cpp
+@@ -208,7 +208,7 @@ Future> SharedFilesystemIsolatorProcess::prepare(
}
launchInfo.add_pre_exec_commands()->set_value(
@@ -294,11 +276,11 @@ index a1283e5ee..a918427bf 100644
}
return launchInfo;
-diff --git a/src/slave/containerizer/mesos/isolators/gpu/isolator.cpp b/src/slave/containerizer/mesos/isolators/gpu/isolator.cpp
-index e3756c920..cfe458b59 100644
---- a/src/slave/containerizer/mesos/isolators/gpu/isolator.cpp
-+++ b/src/slave/containerizer/mesos/isolators/gpu/isolator.cpp
-@@ -355,7 +355,7 @@ Future> NvidiaGpuIsolatorProcess::_prepare(
+diff --git i/src/slave/containerizer/mesos/isolators/gpu/isolator.cpp w/src/slave/containerizer/mesos/isolators/gpu/isolator.cpp
+index 25636b5..33ec315 100644
+--- i/src/slave/containerizer/mesos/isolators/gpu/isolator.cpp
++++ w/src/slave/containerizer/mesos/isolators/gpu/isolator.cpp
+@@ -401,7 +401,7 @@ Future> NvidiaGpuIsolatorProcess::_prepare(
}
launchInfo.add_pre_exec_commands()->set_value(
@@ -307,11 +289,11 @@ index e3756c920..cfe458b59 100644
volume.HOST_PATH() + " " + target);
}
-diff --git a/src/slave/containerizer/mesos/isolators/gpu/volume.cpp b/src/slave/containerizer/mesos/isolators/gpu/volume.cpp
-index 478752f37..ab527f0cd 100644
---- a/src/slave/containerizer/mesos/isolators/gpu/volume.cpp
-+++ b/src/slave/containerizer/mesos/isolators/gpu/volume.cpp
-@@ -281,7 +281,7 @@ Try NvidiaVolume::create()
+diff --git i/src/slave/containerizer/mesos/isolators/gpu/volume.cpp w/src/slave/containerizer/mesos/isolators/gpu/volume.cpp
+index 536a3c7..e2819dd 100644
+--- i/src/slave/containerizer/mesos/isolators/gpu/volume.cpp
++++ w/src/slave/containerizer/mesos/isolators/gpu/volume.cpp
+@@ -274,7 +274,7 @@ Try NvidiaVolume::create()
string path = path::join(hostPath, "bin", binary);
if (!os::exists(path)) {
@@ -320,7 +302,7 @@ index 478752f37..ab527f0cd 100644
Try which = os::shell(command);
if (which.isSome()) {
-@@ -295,7 +295,7 @@ Try NvidiaVolume::create()
+@@ -288,7 +288,7 @@ Try NvidiaVolume::create()
: "No such file or directory"));
}
@@ -329,7 +311,7 @@ index 478752f37..ab527f0cd 100644
Try cp = os::shell(command);
if (cp.isError()) {
return Error("Failed to os::shell '" + command + "': " + cp.error());
-@@ -367,7 +367,7 @@ Try NvidiaVolume::create()
+@@ -360,7 +360,7 @@ Try NvidiaVolume::create()
Path(realpath.get()).basename());
if (!os::exists(libraryPath)) {
@@ -338,11 +320,11 @@ index 478752f37..ab527f0cd 100644
Try cp = os::shell(command);
if (cp.isError()) {
return Error("Failed to os::shell '" + command + "':"
-diff --git a/src/slave/containerizer/mesos/isolators/namespaces/pid.cpp b/src/slave/containerizer/mesos/isolators/namespaces/pid.cpp
-index 0d9ec57d9..a177e4476 100644
---- a/src/slave/containerizer/mesos/isolators/namespaces/pid.cpp
-+++ b/src/slave/containerizer/mesos/isolators/namespaces/pid.cpp
-@@ -94,7 +94,7 @@ Future> NamespacesPidIsolatorProcess::prepare(
+diff --git i/src/slave/containerizer/mesos/isolators/namespaces/pid.cpp w/src/slave/containerizer/mesos/isolators/namespaces/pid.cpp
+index 42bc2e1..2f9066e 100644
+--- i/src/slave/containerizer/mesos/isolators/namespaces/pid.cpp
++++ w/src/slave/containerizer/mesos/isolators/namespaces/pid.cpp
+@@ -131,7 +131,7 @@ Future> NamespacesPidIsolatorProcess::prepare(
//
// TOOD(jieyu): Consider unmount the existing /proc.
launchInfo.add_pre_exec_commands()->set_value(
@@ -351,11 +333,11 @@ index 0d9ec57d9..a177e4476 100644
return launchInfo;
}
-diff --git a/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp b/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp
-index c87e6715a..6601cd1b3 100644
---- a/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp
-+++ b/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp
-@@ -262,9 +262,9 @@ Try NetworkCniIsolatorProcess::create(const Flags& flags)
+diff --git i/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp w/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp
+index fc68f04..267b040 100644
+--- i/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp
++++ w/src/slave/containerizer/mesos/isolators/network/cni/cni.cpp
+@@ -205,9 +205,9 @@ Try NetworkCniIsolatorProcess::create(const Flags& flags)
// here because 'create' will only be invoked during
// initialization.
Try mount = os::shell(
@@ -368,7 +350,7 @@ index c87e6715a..6601cd1b3 100644
rootDir->c_str(),
rootDir->c_str(),
rootDir->c_str(),
-@@ -284,8 +284,8 @@ Try NetworkCniIsolatorProcess::create(const Flags& flags)
+@@ -227,8 +227,8 @@ Try NetworkCniIsolatorProcess::create(const Flags& flags)
LOG(INFO) << "Making '" << rootDir.get() << "' a shared mount";
Try mount = os::shell(
@@ -379,11 +361,11 @@ index c87e6715a..6601cd1b3 100644
rootDir->c_str(),
rootDir->c_str());
-diff --git a/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp b/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp
-index b470f0c82..6110a43ee 100644
---- a/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp
-+++ b/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp
-@@ -303,7 +303,7 @@ Try PortMapper::addPortMapping(
+diff --git i/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp w/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp
+index 43cf3e4..94bad8b 100644
+--- i/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp
++++ w/src/slave/containerizer/mesos/isolators/network/cni/plugins/port_mapper/port_mapper.cpp
+@@ -301,7 +301,7 @@ Try PortMapper::addPortMapping(
# Check if the `chain` exists in the iptable. If it does not
# exist go ahead and install the chain in the iptables NAT
# table.
@@ -392,7 +374,7 @@ index b470f0c82..6110a43ee 100644
if [ $? -ne 0 ]; then
# NOTE: When we create the chain, there is a possibility of a
# race due to which a container launch can fail. This can
-@@ -317,25 +317,25 @@ Try PortMapper::addPortMapping(
+@@ -315,25 +315,25 @@ Try PortMapper::addPortMapping(
# since it can happen only when the chain is created the first
# time and two commands for creation of the chain are executed
# simultaneously.
@@ -422,7 +404,7 @@ index b470f0c82..6110a43ee 100644
chain,
chain,
chain,
-@@ -362,7 +362,7 @@ Try PortMapper::delPortMapping()
+@@ -360,7 +360,7 @@ Try PortMapper::delPortMapping()
# The iptables command searches for the DNAT rules with tag
# "container_id: ", and if it exists goes ahead
# and deletes it.
@@ -431,11 +413,11 @@ index b470f0c82..6110a43ee 100644
chain,
getIptablesRuleTag()).get();
-diff --git a/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp b/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp
-index 20fb6ab35..46c160977 100644
---- a/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp
-+++ b/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp
-@@ -1393,19 +1393,19 @@ Try PortMappingIsolatorProcess::create(const Flags& flags)
+diff --git i/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp w/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp
+index 57d4ccd..68c9577 100644
+--- i/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp
++++ w/src/slave/containerizer/mesos/isolators/network/port_mapping.cpp
+@@ -1394,19 +1394,19 @@ Try PortMappingIsolatorProcess::create(const Flags& flags)
// Check the availability of a few Linux commands that we will use.
// We use the blocking os::shell here because 'create' will only be
// invoked during initialization.
@@ -458,7 +440,7 @@ index 20fb6ab35..46c160977 100644
if (checkCommandIp.isError()) {
return Error("Check command 'ip' failed: " + checkCommandIp.error());
}
-@@ -1925,9 +1925,9 @@ Try PortMappingIsolatorProcess::create(const Flags& flags)
+@@ -1940,9 +1940,9 @@ Try PortMappingIsolatorProcess::create(const Flags& flags)
// visible. It's OK to use the blocking os::shell here because
// 'create' will only be invoked during initialization.
Try mount = os::shell(
@@ -471,7 +453,7 @@ index 20fb6ab35..46c160977 100644
bindMountRoot->c_str(),
bindMountRoot->c_str(),
bindMountRoot->c_str(),
-@@ -1944,8 +1944,8 @@ Try PortMappingIsolatorProcess::create(const Flags& flags)
+@@ -1959,8 +1959,8 @@ Try PortMappingIsolatorProcess::create(const Flags& flags)
// shared mount yet (possibly due to slave crash while preparing
// the work directory mount). It's safe to re-do the following.
Try mount = os::shell(
@@ -482,7 +464,7 @@ index 20fb6ab35..46c160977 100644
bindMountRoot->c_str(),
bindMountRoot->c_str());
-@@ -1964,8 +1964,8 @@ Try PortMappingIsolatorProcess::create(const Flags& flags)
+@@ -1979,8 +1979,8 @@ Try PortMappingIsolatorProcess::create(const Flags& flags)
// so that they are in different peer groups.
if (entry.shared() == bindMountEntry->shared()) {
Try mount = os::shell(
@@ -493,7 +475,7 @@ index 20fb6ab35..46c160977 100644
bindMountRoot->c_str(),
bindMountRoot->c_str());
-@@ -3911,6 +3911,8 @@ Try PortMappingIsolatorProcess::removeHostIPFilters(
+@@ -3927,6 +3927,8 @@ Try PortMappingIsolatorProcess::removeHostIPFilters(
// TODO(jieyu): Use the Subcommand abstraction to remove most of the
// logic here. Completely remove this function once we can assume a
// newer kernel where 'setns' works for mount namespaces.
@@ -502,7 +484,7 @@ index 20fb6ab35..46c160977 100644
string PortMappingIsolatorProcess::scripts(Info* info)
{
ostringstream script;
-@@ -3921,7 +3923,7 @@ string PortMappingIsolatorProcess::scripts(Info* info)
+@@ -3937,7 +3939,7 @@ string PortMappingIsolatorProcess::scripts(Info* info)
// Mark the mount point PORT_MAPPING_BIND_MOUNT_ROOT() as slave
// mount so that changes in the container will not be propagated to
// the host.
@@ -511,7 +493,7 @@ index 20fb6ab35..46c160977 100644
// Disable IPv6 when IPv6 module is loaded as IPv6 packets won't be
// forwarded anyway.
-@@ -3929,7 +3931,7 @@ string PortMappingIsolatorProcess::scripts(Info* info)
+@@ -3945,7 +3947,7 @@ string PortMappingIsolatorProcess::scripts(Info* info)
<< " echo 1 > /proc/sys/net/ipv6/conf/all/disable_ipv6\n";
// Configure lo and eth0.
@@ -520,7 +502,7 @@ index 20fb6ab35..46c160977 100644
<< " mtu " << hostEth0MTU << " up\n";
// NOTE: This is mostly a kernel issue: in veth_xmit() the kernel
-@@ -3938,12 +3940,12 @@ string PortMappingIsolatorProcess::scripts(Info* info)
+@@ -3954,12 +3956,12 @@ string PortMappingIsolatorProcess::scripts(Info* info)
// when we receive a packet with a bad checksum. Disabling rx
// checksum offloading ensures the TCP layer will checksum and drop
// it.
@@ -537,7 +519,7 @@ index 20fb6ab35..46c160977 100644
// Restrict the ephemeral ports that can be used by the container.
script << "echo " << info->ephemeralPorts.lower() << " "
-@@ -3972,19 +3974,19 @@ string PortMappingIsolatorProcess::scripts(Info* info)
+@@ -3988,19 +3990,19 @@ string PortMappingIsolatorProcess::scripts(Info* info)
}
// Set up filters on lo and eth0.
@@ -561,7 +543,7 @@ index 20fb6ab35..46c160977 100644
<< " protocol ip"
<< " prio " << Priority(IP_FILTER_PRIORITY, NORMAL).get() << " u32"
<< " flowid ffff:0"
-@@ -3995,7 +3997,7 @@ string PortMappingIsolatorProcess::scripts(Info* info)
+@@ -4011,7 +4013,7 @@ string PortMappingIsolatorProcess::scripts(Info* info)
foreach (const PortRange& range,
getPortRanges(info->nonEphemeralPorts + info->ephemeralPorts)) {
// Local traffic inside a container will not be redirected to eth0.
@@ -570,7 +552,7 @@ index 20fb6ab35..46c160977 100644
<< " protocol ip"
<< " prio " << Priority(IP_FILTER_PRIORITY, HIGH).get() << " u32"
<< " flowid ffff:0"
-@@ -4004,7 +4006,7 @@ string PortMappingIsolatorProcess::scripts(Info* info)
+@@ -4020,7 +4022,7 @@ string PortMappingIsolatorProcess::scripts(Info* info)
// Traffic going to host loopback IP and ports assigned to this
// container will be redirected to lo.
@@ -579,7 +561,7 @@ index 20fb6ab35..46c160977 100644
<< " protocol ip"
<< " prio " << Priority(IP_FILTER_PRIORITY, NORMAL).get() << " u32"
<< " flowid ffff:0"
-@@ -4016,14 +4018,14 @@ string PortMappingIsolatorProcess::scripts(Info* info)
+@@ -4032,14 +4034,14 @@ string PortMappingIsolatorProcess::scripts(Info* info)
}
// Do not forward the ICMP packet if the destination IP is self.
@@ -596,8 +578,8 @@ index 20fb6ab35..46c160977 100644
<< " protocol ip"
<< " prio " << Priority(ICMP_FILTER_PRIORITY, NORMAL).get() << " u32"
<< " flowid ffff:0"
-@@ -4032,9 +4034,9 @@ string PortMappingIsolatorProcess::scripts(Info* info)
- << net::IPNetwork::LOOPBACK_V4().address() << "\n";
+@@ -4048,9 +4050,9 @@ string PortMappingIsolatorProcess::scripts(Info* info)
+ << net::IP::Network::LOOPBACK_V4().address() << "\n";
// Display the filters created on eth0 and lo.
- script << "tc filter show dev " << eth0
@@ -608,7 +590,7 @@ index 20fb6ab35..46c160977 100644
<< " parent " << ingress::HANDLE << "\n";
// If throughput limit for container egress traffic exists, use HTB
-@@ -4046,9 +4048,9 @@ string PortMappingIsolatorProcess::scripts(Info* info)
+@@ -4062,9 +4064,9 @@ string PortMappingIsolatorProcess::scripts(Info* info)
// throughput. TBF requires other parameters such as 'burst' that
// HTB already has default values for.
if (egressRateLimitPerContainer.isSome()) {
@@ -620,7 +602,7 @@ index 20fb6ab35..46c160977 100644
<< CONTAINER_TX_HTB_HANDLE << " classid "
<< CONTAINER_TX_HTB_CLASS_ID << " htb rate "
<< egressRateLimitPerContainer.get().bytes() * 8 << "bit\n";
-@@ -4059,12 +4061,12 @@ string PortMappingIsolatorProcess::scripts(Info* info)
+@@ -4075,12 +4077,12 @@ string PortMappingIsolatorProcess::scripts(Info* info)
// fq_codel, which has a larger buffer and better control on
// buffer bloat.
// TODO(cwang): Verity that fq_codel qdisc is available.
@@ -636,24 +618,24 @@ index 20fb6ab35..46c160977 100644
}
return script.str();
-diff --git a/src/slave/containerizer/mesos/isolators/posix/disk.cpp b/src/slave/containerizer/mesos/isolators/posix/disk.cpp
-index db0583386..542586370 100644
---- a/src/slave/containerizer/mesos/isolators/posix/disk.cpp
-+++ b/src/slave/containerizer/mesos/isolators/posix/disk.cpp
-@@ -540,7 +540,7 @@ private:
+diff --git i/src/slave/containerizer/mesos/isolators/posix/disk.cpp w/src/slave/containerizer/mesos/isolators/posix/disk.cpp
+index eb23025..db268ea 100644
+--- i/src/slave/containerizer/mesos/isolators/posix/disk.cpp
++++ w/src/slave/containerizer/mesos/isolators/posix/disk.cpp
+@@ -572,7 +572,7 @@ private:
// NOTE: The supervisor childhook will watch the parent process and kill
// the 'du' process in case that the parent die.
Try s = subprocess(
- "du",
+ "@du@",
command,
- Subprocess::PATH("/dev/null"),
+ Subprocess::PATH(os::DEV_NULL),
Subprocess::PIPE(),
-diff --git a/src/slave/containerizer/mesos/isolators/volume/image.cpp b/src/slave/containerizer/mesos/isolators/volume/image.cpp
-index 210e67ad0..60b3a15e4 100644
---- a/src/slave/containerizer/mesos/isolators/volume/image.cpp
-+++ b/src/slave/containerizer/mesos/isolators/volume/image.cpp
-@@ -214,7 +214,7 @@ Future> VolumeImageIsolatorProcess::_prepare(
+diff --git i/src/slave/containerizer/mesos/isolators/volume/image.cpp w/src/slave/containerizer/mesos/isolators/volume/image.cpp
+index 35966aa..b62fc86 100644
+--- i/src/slave/containerizer/mesos/isolators/volume/image.cpp
++++ w/src/slave/containerizer/mesos/isolators/volume/image.cpp
+@@ -231,7 +231,7 @@ Future> VolumeImageIsolatorProcess::_prepare(
CommandInfo* command = launchInfo.add_pre_exec_commands();
command->set_shell(false);
@@ -662,11 +644,11 @@ index 210e67ad0..60b3a15e4 100644
command->add_arguments("mount");
command->add_arguments("-n");
command->add_arguments("--rbind");
-diff --git a/src/slave/containerizer/mesos/isolators/volume/sandbox_path.cpp b/src/slave/containerizer/mesos/isolators/volume/sandbox_path.cpp
-index 7b976d292..474dcd486 100644
---- a/src/slave/containerizer/mesos/isolators/volume/sandbox_path.cpp
-+++ b/src/slave/containerizer/mesos/isolators/volume/sandbox_path.cpp
-@@ -240,7 +240,7 @@ Future> VolumeSandboxPathIsolatorProcess::prepare(
+diff --git i/src/slave/containerizer/mesos/isolators/volume/sandbox_path.cpp w/src/slave/containerizer/mesos/isolators/volume/sandbox_path.cpp
+index b321b86..8ed3e78 100644
+--- i/src/slave/containerizer/mesos/isolators/volume/sandbox_path.cpp
++++ w/src/slave/containerizer/mesos/isolators/volume/sandbox_path.cpp
+@@ -265,7 +265,7 @@ Future> VolumeSandboxPathIsolatorProcess::prepare(
CommandInfo* command = launchInfo.add_pre_exec_commands();
command->set_shell(false);
@@ -675,58 +657,60 @@ index 7b976d292..474dcd486 100644
command->add_arguments("mount");
command->add_arguments("-n");
command->add_arguments("--rbind");
-diff --git a/src/slave/containerizer/mesos/provisioner/backends/copy.cpp b/src/slave/containerizer/mesos/provisioner/backends/copy.cpp
-index 9c5354e5f..a73a9692e 100644
---- a/src/slave/containerizer/mesos/provisioner/backends/copy.cpp
-+++ b/src/slave/containerizer/mesos/provisioner/backends/copy.cpp
-@@ -147,7 +147,7 @@ Future CopyBackendProcess::_provision(
+diff --git i/src/slave/containerizer/mesos/provisioner/backends/copy.cpp w/src/slave/containerizer/mesos/provisioner/backends/copy.cpp
+index 69faa03..01a3ed6 100644
+--- i/src/slave/containerizer/mesos/provisioner/backends/copy.cpp
++++ w/src/slave/containerizer/mesos/provisioner/backends/copy.cpp
+@@ -266,7 +266,7 @@ Future CopyBackendProcess::_provision(
#endif // __APPLE__ || __FreeBSD__
Try s = subprocess(
- "cp",
+ "@cp@",
args,
- Subprocess::PATH("/dev/null"),
- Subprocess::PATH("/dev/null"),
-@@ -180,7 +180,7 @@ Future CopyBackendProcess::destroy(const string& rootfs)
+ Subprocess::PATH(os::DEV_NULL),
+ Subprocess::PATH(os::DEV_NULL),
+@@ -313,7 +313,7 @@ Future CopyBackendProcess::destroy(const string& rootfs)
vector argv{"rm", "-rf", rootfs};
Try s = subprocess(
- "rm",
+ "@rm@",
argv,
- Subprocess::PATH("/dev/null"),
+ Subprocess::PATH(os::DEV_NULL),
Subprocess::FD(STDOUT_FILENO),
-diff --git a/src/uri/fetchers/copy.cpp b/src/uri/fetchers/copy.cpp
-index 2cfef5ab0..8a62f7699 100644
---- a/src/uri/fetchers/copy.cpp
-+++ b/src/uri/fetchers/copy.cpp
-@@ -97,7 +97,7 @@ Future CopyFetcherPlugin::fetch(
- const vector argv = {"cp", "-a", uri.path(), directory};
-
- Try s = subprocess(
-- "cp",
-+ "@cp@",
- argv,
- Subprocess::PATH("/dev/null"),
- Subprocess::PIPE(),
-diff --git a/src/uri/fetchers/curl.cpp b/src/uri/fetchers/curl.cpp
-index 7b746d619..12bbb04df 100644
---- a/src/uri/fetchers/curl.cpp
-+++ b/src/uri/fetchers/curl.cpp
-@@ -107,7 +107,7 @@ Future CurlFetcherPlugin::fetch(
+diff --git i/src/uri/fetchers/copy.cpp w/src/uri/fetchers/copy.cpp
+index 17f69be..831b08a 100644
+--- i/src/uri/fetchers/copy.cpp
++++ w/src/uri/fetchers/copy.cpp
+@@ -97,8 +97,8 @@ Future CopyFetcherPlugin::fetch(
+ VLOG(1) << "Copying '" << uri.path() << "' to '" << directory << "'";
+
+ #ifndef __WINDOWS__
+- const char* copyCommand = "cp";
+- const vector argv = {"cp", "-a", uri.path(), directory};
++ const char* copyCommand = "@cp@";
++ const vector argv = {"@cp@", "-a", uri.path(), directory};
+ #else // __WINDOWS__
+ const char* copyCommand = os::Shell::name;
+ const vector argv =
+diff --git i/src/uri/fetchers/curl.cpp w/src/uri/fetchers/curl.cpp
+index f34daf2..6a50341 100644
+--- i/src/uri/fetchers/curl.cpp
++++ w/src/uri/fetchers/curl.cpp
+@@ -109,7 +109,7 @@ Future CurlFetcherPlugin::fetch(
};
Try