diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 00000000000..6a1cf6e4ee8
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1,52 @@
+# CODEOWNERS file
+#
+# This file is used to describe who owns what in this repository. This file does not
+# replace `meta.maintainers` but is instead used for other things than derivations
+# and modules, like documentation, package sets, and other assets.
+#
+# For documentation on this file, see https://help.github.com/articles/about-codeowners/
+# Mentioned users will get code review requests.
+
+# This file
+.github/CODEOWNERS @edolstra
+
+# Boostraping and core infra
+pkgs/stdenv/ @edolstra
+pkgs/build-support/cc-wrapper/ @edolstra
+
+# Libraries
+lib/ @edolstra
+
+# 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
+
+# Darwin-related
+pkgs/stdenv/darwin/* @copumpkin @LnL7
+pkgs/os-specific/darwin/* @LnL7
+pkgs/os-specific/darwin/apple-source-releases/* @copumpkin
+
+# 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
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index b77ca7eefb9..f7fac647f41 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.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 3247b158342..280c9807e58 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -3,12 +3,9 @@
###### Things done
-Please check what applies. Note that these are not hard requirements but mereley serve as information for reviewers.
+
-- [ ] 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
diff --git a/.mention-bot b/.mention-bot
deleted file mode 100644
index 33c7e41c1dc..00000000000
--- a/.mention-bot
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "userBlacklist": [
- "civodul",
- "jhasse",
- "shlevy",
- "bbenoist"
- ],
- "alwaysNotifyForPaths": [
- { "name": "FRidh", "files": ["pkgs/top-level/python-packages.nix", "pkgs/development/interpreters/python/*", "pkgs/development/python-modules/*" ] },
- { "name": "LnL7", "files": ["pkgs/stdenv/darwin/*", "pkgs/os-specific/darwin/*"] },
- { "name": "copumpkin", "files": ["pkgs/stdenv/darwin/*", "pkgs/os-specific/darwin/apple-source-releases/*"] }
- ],
- "fileBlacklist": ["pkgs/top-level/all-packages.nix"]
-}
diff --git a/.travis.yml b/.travis.yml
index 8ecd12642a7..e746d390e76 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,15 +12,21 @@ matrix:
script:
- ./maintainers/scripts/travis-nox-review-pr.sh nixpkgs-verify nixpkgs-manual nixpkgs-tarball nixpkgs-unstable
- ./maintainers/scripts/travis-nox-review-pr.sh nixos-options nixos-manual
+ env:
+ - BUILD_TYPE="Test Nixpkgs evaluation & NixOS manual build"
- os: linux
sudo: required
dist: trusty
before_script:
- sudo mount -o remount,exec,size=2G,mode=755 /run/user
script: ./maintainers/scripts/travis-nox-review-pr.sh nox pr
+ env:
+ - BUILD_TYPE="Build affected packages (Linux)"
- os: osx
osx_image: xcode7.3
script: ./maintainers/scripts/travis-nox-review-pr.sh nox pr
+ env:
+ - BUILD_TYPE="Build affected packages (macOS)"
env:
global:
- GITHUB_TOKEN=5edaaf1017f691ed34e7f80878f8f5fbd071603f
diff --git a/.version b/.version
index 2fdad9f4058..a88d2ca3231 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-17.09
+18.03
diff --git a/doc/coding-conventions.xml b/doc/coding-conventions.xml
index f89437af445..0776e70f14e 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/functions.xml b/doc/functions.xml
index 4a9015602af..52bdf13eba9 100644
--- a/doc/functions.xml
+++ b/doc/functions.xml
@@ -358,8 +358,8 @@
pkgs.dockerTools is a set of functions for creating and
manipulating Docker images according to the
-
- Docker Image Specification v1.0.0
+
+ Docker Image Specification v1.2.0
. Docker itself is not used to perform any of the operations done by these
functions.
@@ -493,8 +493,8 @@
config is used to specify the configuration of the
containers that will be started off the built image in Docker.
The available options are listed in the
-
- Docker Image Specification v1.0.0
+
+ Docker Image Specification v1.2.0
.
diff --git a/doc/languages-frameworks/haskell.md b/doc/languages-frameworks/haskell.md
index ce2889f744f..da3fd770ce7 100644
--- a/doc/languages-frameworks/haskell.md
+++ b/doc/languages-frameworks/haskell.md
@@ -698,33 +698,6 @@ rm /nix/var/nix/manifests/*
rm /nix/var/nix/channel-cache/*
```
-### How to use the Haste Haskell-to-Javascript transpiler
-
-Open a shell with `haste-compiler` and `haste-cabal-install` (you don't actually need
-`node`, but it can be useful to test stuff):
-```shell
-nix-shell \
- -p "haskellPackages.ghcWithPackages (self: with self; [haste-cabal-install haste-compiler])" \
- -p nodejs
-```
-You may not need the following step but if `haste-boot` fails to compile all the
-packages it needs, this might do the trick
-```shell
-haste-cabal update
-```
-`haste-boot` builds a set of core libraries so that they can be used from Javascript
-transpiled programs:
-```shell
-haste-boot
-```
-Transpile and run a "Hello world" program:
-```
-$ echo 'module Main where main = putStrLn "Hello world"' > hello-world.hs
-$ hastec --onexec hello-world.hs
-$ node hello-world.js
-Hello world
-```
-
### Builds on Darwin fail with `math.h` not found
Users of GHC on Darwin have occasionally reported that builds fail, because the
@@ -854,7 +827,7 @@ the work to be licensed" under the terms of the LGPL (including for free).
The LGPL licensing for GMP is a problem for the overall licensing of binary
programs compiled with GHC because most distributions (and builds) of GHC use
-static libraries. (Dynamic libraries are currently distributed only for OS X.)
+static libraries. (Dynamic libraries are currently distributed only for macOS.)
The LGPL licensing situation may be worse: even though
[The Glasgow Haskell Compiler License](https://www.haskell.org/ghc/license)
is essentially a "free software" license (BSD3), according to
@@ -894,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 3c9df2e6e82..298da8f9f0d 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
```
+The other method, which is not recommended, does not create an environment and requires you to list the packages directly,
-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
+```sh
+$ 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?
+
+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"
```
-
-This way you can use the `--run` option also to directly run a script
-
+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.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
+you will want to test a Nix expression outside of the Nixpkgs tree.
-```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.
-
-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";
+ my_toolz = python35.pkgs.buildPythonPackage rec {
+ pname = "toolz";
+ version = "0.7.4";
+ name = "${pname}-${version}";
- src = pkgs.fetchurl {
- url = "mirror://pypi/t/toolz/toolz-${version}.tar.gz";
- sha256 = "e8451af61face57b7c5d09e71c0d27b8005f001ead56e9fdf470417e5cc6d479";
+ 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
@@ -340,7 +403,7 @@ other packages we like to have in the environment, all specified with `propagate
Indeed, we can just add any package we like to have in our environment to `propagatedBuildInputs`.
```nix
-with import ;
+with import {};
with pkgs.python35Packages;
buildPythonPackage rec {
@@ -423,7 +486,7 @@ and in this case the `python35` interpreter is automatically used.
### Interpreters
Versions 2.7, 3.3, 3.4, 3.5 and 3.6 of the CPython interpreter are available as
-respectively `python27`, `python33`, `python34`, `python35` and `python36`. The PyPy interpreter
+respectively `python27`, `python34`, `python35` and `python36`. The PyPy interpreter
is available as `pypy`. The aliases `python2` and `python3` correspond to respectively `python27` and
`python35`. The default interpreter, `python`, maps to `python2`.
The Nix expressions for the interpreters can be found in
@@ -469,7 +532,6 @@ sets are
* `pkgs.python26Packages`
* `pkgs.python27Packages`
-* `pkgs.python33Packages`
* `pkgs.python34Packages`
* `pkgs.python35Packages`
* `pkgs.python36Packages`
@@ -528,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
@@ -546,6 +608,35 @@ All parameters from `mkDerivation` function are still supported.
* `catchConflicts` If `true`, abort package build if a package name appears more than once in dependency tree. Default is `true`.
* `checkInputs` Dependencies needed for running the `checkPhase`. These are added to `buildInputs` when `doCheck = true`.
+##### Overriding Python packages
+
+The `buildPythonPackage` function has a `overridePythonAttrs` method that
+can be used to override the package. In the following example we create an
+environment where we have the `blaze` package using an older version of `pandas`.
+We override first the Python interpreter and pass
+`packageOverrides` which contains the overrides for packages in the package set.
+
+```nix
+with import {};
+
+(let
+ python = let
+ packageOverrides = self: super: {
+ pandas = super.pandas.overridePythonAttrs(old: rec {
+ version = "0.19.1";
+ name = "pandas-${version}";
+ src = super.fetchPypi {
+ pname = "pandas";
+ inherit version;
+ sha256 = "08blshqj9zj1wyjhhw3kl2vas75vhhicvv72flvf1z3jvapgw295";
+ };
+ });
+ };
+ in pkgs.python3.override {inherit packageOverrides;};
+
+in python.withPackages(ps: [ps.blaze])).env
+```
+
#### `buildPythonApplication` function
The `buildPythonApplication` function is practically the same as `buildPythonPackage`.
@@ -622,7 +713,7 @@ attribute. The `shell.nix` file from the previous section can thus be also writt
```nix
with import {};
-(python33.withPackages (ps: [ps.numpy ps.requests])).env
+(python36.withPackages (ps: [ps.numpy ps.requests])).env
```
In contrast to `python.buildEnv`, `python.withPackages` does not support the more advanced options
@@ -683,65 +774,23 @@ The `buildPythonPackage` function sets `DETERMINISTIC_BUILD=1` and
Both are also exported in `nix-shell`.
+### Automatic tests
+
+It is recommended to test packages as part of the build process.
+Source distributions (`sdist`) often include test files, but not always.
+
+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.
+
+#### Common issues
+
+- Non-working tests can often be deselected. In the case of `py.test`: `py.test -k 'not function_name and not other_function'`.
+- 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)`
+
## FAQ
-### How can I install a working Python environment?
-
-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`).
-
-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.
-
-#### Environment defined in separate `.nix` file
-
-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
-{ # ...
-
- environment.systemPackages = with pkgs; [
- (python35.withPackages(ps: with ps; [ numpy ipython ]))
- ];
-}
-```
-
### How to solve circular dependencies?
Consider the packages `A` and `B` that depend on each other. When packaging `B`,
@@ -755,17 +804,17 @@ In the following example we rename the `pandas` package and build it.
```nix
with import {};
-let
+(let
python = let
packageOverrides = self: super: {
- pandas = super.pandas.override {name="foo";};
+ pandas = super.pandas.overridePythonAttrs(old: {name="foo";});
};
in pkgs.python35.override {inherit packageOverrides;};
-in python.pkgs.pandas
+in python.withPackages(ps: [ps.pandas])).env
```
-Using `nix-build` on this expression will build the package `pandas`
-but with the new name `foo`.
+Using `nix-build` on this expression will build an environment that contains the
+package `pandas` but with the new name `foo`.
All packages in the package set will use the renamed package.
A typical use case is to switch to another version of a certain package.
@@ -951,8 +1000,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/ruby.xml b/doc/languages-frameworks/ruby.xml
index b13da92dcc4..6bb809192f8 100644
--- a/doc/languages-frameworks/ruby.xml
+++ b/doc/languages-frameworks/ruby.xml
@@ -4,10 +4,14 @@
Ruby
- There currently is support to bundle applications that are packaged as Ruby gems. The utility "bundix" allows you to write a Gemfile, let bundler create a Gemfile.lock, and then convert
- this into a nix expression that contains all Gem dependencies automatically.
+There currently is support to bundle applications that are packaged as
+Ruby gems. The utility "bundix" allows you to write a
+Gemfile, let bundler create a
+Gemfile.lock, and then convert this into a nix
+expression that contains all Gem dependencies automatically.
+
- For example, to package sensu, we did:
+For example, to package sensu, we did:
Gemfile
source 'https://rubygems.org'
gem 'sensu'
-$ $(nix-build '' -A bundix)/bin/bundix --magic
+$ $(nix-build '' -A bundix --no-out-link)/bin/bundix --magic
$ cat > default.nix
{ lib, bundlerEnv, ruby }:
@@ -38,15 +42,61 @@ bundlerEnv rec {
}]]>
-Please check in the Gemfile, Gemfile.lock and the gemset.nix so future updates can be run easily.
+Please check in the Gemfile,
+Gemfile.lock and the
+gemset.nix so future updates can be run easily.
-Resulting derivations also have two helpful items, env and wrapper. The first one allows one to quickly drop into
-nix-shell with the specified environment present. E.g. nix-shell -A sensu.env would give you an environment with Ruby preset
-so it has all the libraries necessary for sensu in its paths. The second one can be used to make derivations from custom Ruby scripts which have
-Gemfiles with their dependencies specified. It is a derivation with ruby wrapped so it can find all the needed dependencies.
-For example, to make a derivation my-script for a my-script.rb (which should be placed in bin) you should
-run bundix as specified above and then use bundlerEnv like this:
+For tools written in Ruby - i.e. where the desire is to install
+a package and then execute e.g. rake at the command
+line, there is an alternative builder called bundlerApp.
+Set up the gemset.nix the same way, and then, for
+example:
+
+
+
+
+
+
+The chief advantage of bundlerApp over
+bundlerEnv is the executables introduced in the
+environment are precisely those selected in the exes
+list, as opposed to bundlerEnv which adds all the
+executables made available by gems in the gemset, which can mean e.g.
+rspec or rake in unpredictable
+versions available from various packages.
+
+
+Resulting derivations for both builders also have two helpful
+attributes, env and wrappedRuby.
+The first one allows one to quickly drop into
+nix-shell with the specified environment present.
+E.g. nix-shell -A sensu.env would give you an
+environment with Ruby preset so it has all the libraries necessary
+for sensu in its paths. The second one can be
+used to make derivations from custom Ruby scripts which have
+Gemfiles with their dependencies specified. It is
+a derivation with ruby wrapped so it can find all
+the needed dependencies. For example, to make a derivation
+my-script for a my-script.rb
+(which should be placed in bin) you should run
+bundix as specified above and then use
+bundlerEnv like this:
+
bundix as specified above and then use bundlerEn
in stdenv.mkDerivation {
name = "my-script";
-
- buildInputs = [ env.wrapper ];
-
+ buildInputs = [ env.wrappedRuby ];
script = ./my-script.rb;
-
buildCommand = ''
- mkdir -p $out/bin
install -D -m755 $script $out/bin/my-script
patchShebangs $out/bin/my-script
'';
@@ -74,4 +120,3 @@ in stdenv.mkDerivation {
-
diff --git a/doc/languages-frameworks/rust.md b/doc/languages-frameworks/rust.md
index ef6ebc392b3..481b76fb78f 100644
--- a/doc/languages-frameworks/rust.md
+++ b/doc/languages-frameworks/rust.md
@@ -17,7 +17,7 @@ into the `environment.systemPackages` or bring them into scope with
`nix-shell -p rustStable.rustc -p rustStable.cargo`.
There are also `rustBeta` and `rustNightly` package sets available.
-These are not updated very regulary. For daily builds use either rustup from
+These are not updated very regularly. For daily builds use either rustup from
nixpkgs or use the [Rust nightlies overlay](#using-the-rust-nightlies-overlay).
## Packaging Rust applications
diff --git a/doc/multiple-output.xml b/doc/multiple-output.xml
index a81ad6ca9eb..a2acc91e55a 100644
--- a/doc/multiple-output.xml
+++ b/doc/multiple-output.xml
@@ -73,7 +73,7 @@
$outputMan
- is for man pages (except for section 3). They go to man or doc or $outputBin by default.
+ is for man pages (except for section 3). They go to man or $outputBin by default.
@@ -83,7 +83,7 @@
$outputInfo
- is for info pages. They go to info or doc or $outputMan by default.
+ is for info pages. They go to info or $outputBin by default.
diff --git a/doc/overlays.xml b/doc/overlays.xml
index f8f554bb556..cc0aef447d2 100644
--- a/doc/overlays.xml
+++ b/doc/overlays.xml
@@ -8,59 +8,88 @@
overlays. Overlays are used to add layers in the fix-point used by Nixpkgs
to compose the set of all packages.
+Nixpkgs can be configured with a list of overlays, which are
+applied in order. This means that the order of the overlays can be significant
+if multiple layers override the same package.
+
-Installing Overlays
+Installing overlays
-The set of overlays is looked for in the following places. The
-first one present is considered, and all the rest are ignored:
+The list of overlays is determined as follows.
+
+If the overlays argument is not provided explicitly, we look for overlays in a path. The path
+is determined as follows:
+ First, if an overlays argument to the nixpkgs function itself is given,
+ then that is used.
- As an argument of the imported attribute set. When importing Nixpkgs,
- the overlays attribute argument can be set to a list of
- functions, which is described in .
-
+ This can be passed explicitly when importing nipxkgs, for example
+ import <nixpkgs> { overlays = [ overlay1 overlay2 ]; }.
+ Otherwise, if the Nix path entry <nixpkgs-overlays> exists, we look for overlays
+ at that path, as described below.
- In the directory pointed to by the Nix search path entry
- <nixpkgs-overlays>.
+ See the section on NIX_PATH in the Nix manual for more details on how to
+ set a value for <nixpkgs-overlays>.
-
- In the directory ~/.config/nixpkgs/overlays/.
+ If one of ~/.config/nixpkgs/overlays.nix and
+ ~/.config/nixpkgs/overlays/ exists, then we look for overlays at that path, as
+ described below. It is an error if both exist.
-For the second and third options, the directory should contain Nix expressions defining the
-overlays. Each overlay can be a file, a directory containing a
-default.nix, or a symlink to one of those. The expressions should follow
-the syntax described in .
+If we are looking for overlays at a path, then there are two cases:
+
+
+ If the path is a file, then the file is imported as a Nix expression and used as the list of
+ overlays.
+
-The order of the overlay layers can influence the recipe of packages if multiple layers override
-the same recipe. In the case where overlays are loaded from a directory, they are loaded in
-alphabetical order.
+
+ If the path is a directory, then we take the content of the directory, order it
+ lexicographically, and attempt to interpret each as an overlay by:
+
+
+ Importing the file, if it is a .nix file.
+
+
+ Importing a top-level default.nix file, if it is a directory.
+
+
+
+
+
+
-To install an overlay using the last option, you can clone the overlay's repository and add
-a symbolic link to it in ~/.config/nixpkgs/overlays/ directory.
+On a NixOS system the value of the nixpkgs.overlays option, if present,
+is passed to the system Nixpkgs directly as an argument. Note that this does not affect the overlays for
+non-NixOS operations (e.g. nix-env), which are looked up independently.
+
+The overlays.nix option therefore provides a convenient way to use the same
+overlays for a NixOS system configuration and user configuration: the same file can be used
+as overlays.nix and imported as the value of nixpkgs.overlays.
-
-Overlays Layout
+
+Defining overlays
-Overlays are expressed as Nix functions which accept 2 arguments and return a set of
-packages.
+Overlays are Nix functions which accept two arguments,
+conventionally called self and super,
+and return a set of packages. For example, the following is a valid overlay.
self: super:
@@ -75,25 +104,31 @@ self: super:
}
-The first argument, usually named self, corresponds to the final package
+The first argument (self) corresponds to the final package
set. You should use this set for the dependencies of all packages specified in your
overlay. For example, all the dependencies of rr in the example above come
from self, as well as the overridden dependencies used in the
boost override.
-The second argument, usually named super,
+The second argument (super)
corresponds to the result of the evaluation of the previous stages of
Nixpkgs. It does not contain any of the packages added by the current
-overlay nor any of the following overlays. This set should be used either
+overlay, nor any of the following overlays. This set should be used either
to refer to packages you wish to override, or to access functions defined
in Nixpkgs. For example, the original recipe of boost
in the above example, comes from super, as well as the
callPackage function.
The value returned by this function should be a set similar to
-pkgs/top-level/all-packages.nix, which contains
+pkgs/top-level/all-packages.nix, containing
overridden and/or new packages.
+Overlays are similar to other methods for customizing Nixpkgs, in particular
+the packageOverrides attribute described in .
+Indeed, packageOverrides acts as an overlay with only the
+super argument. It is therefore appropriate for basic use,
+but overlays are more powerful and easier to distribute.
+
diff --git a/doc/package-notes.xml b/doc/package-notes.xml
index 33a61f31938..e1aea62f784 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
-
+
-
+
@@ -366,15 +366,33 @@ it. Place the resulting package.nix file into
-
+
-Autojump
+Interactive shell helpers
- autojump needs the shell integration to be useful but unlike other systems,
- nix doesn't have a standard share directory location. This is why a
- autojump-share script is shipped that prints the location
- of the shared folder. This can then be used in the .bashrc like this:
+ Some packages provide the shell integration to be more useful. But
+ unlike other systems, nix doesn't have a standard share directory
+ location. This is why a bunch PACKAGE-share
+ scripts are shipped that print the location of the corresponding
+ shared folder.
+
+ Current list of such packages is as following:
+
+
+
+
+ autojump: autojump-share
+
+
+
+
+ fzf: fzf-share
+
+
+
+
+ E.g. autojump can then used in the .bashrc like this:
source "$(autojump-share)/autojump.bash"
@@ -391,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.
@@ -428,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 = ''
@@ -452,23 +470,31 @@ 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
+ Using the FOSS Radeon or nouveau (nvidia) 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
+ Both the open source radeon drivers as well as the nouveau drivers (nvidia)
+ 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
+ or
+
+libGL error: unable to load driver: nouveau_dri.so
+libGL error: driver pointer missing
+libGL error: failed to load driver: nouveau
+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
@@ -486,7 +512,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.
@@ -501,14 +527,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
diff --git a/doc/stdenv.xml b/doc/stdenv.xml
index e637962fbb7..dac53bc2b80 100644
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@@ -1,3 +1,4 @@
+
@@ -1153,7 +1154,7 @@ makeWrapper $out/bin/foo $wrapperfile --prefix PATH : ${lib.makeBinPath [ hello
-
+
substitute
@@ -1312,7 +1313,7 @@ someVar=$(stripHash $name)
-
+
wrapProgram
@@ -1342,12 +1343,34 @@ someVar=$(stripHash $name)
- GCC wrapper
- Adds the include subdirectory
- of each build input to the NIX_CFLAGS_COMPILE
- environment variable, and the lib and
- lib64 subdirectories to
- NIX_LDFLAGS.
+ CC Wrapper
+
+
+ CC Wrapper wraps a C toolchain for a bunch of miscellaneous purposes.
+ Specifically, a C compiler (GCC or Clang), Binutils (or the CCTools + binutils mashup when targetting Darwin), and a C standard library (glibc or Darwin's libSystem) are all fed in, and dependency finding, hardening (see below), and purity checks for each are handled by CC Wrapper.
+ Packages typically depend on only CC Wrapper, instead of those 3 inputs directly.
+
+
+ Dependency finding is undoubtedly the main task of CC wrapper.
+ It is currently accomplished by collecting directories of host-platform dependencies (i.e. buildInputs and nativeBuildInputs) in environment variables.
+ CC wrapper's setup hook causes any include subdirectory of such a dependency to be added to NIX_CFLAGS_COMPILE, and any lib and lib64 subdirectories to NIX_LDFLAGS.
+ The setup hook itself contains some lengthy comments describing the exact convoluted mechanism by which this is accomplished.
+
+
+ A final task of the setup hook is defining a number of standard environment variables to tell build systems which executables full-fill which purpose.
+ They are defined to just be the base name of the tools, under the assumption that CC Wrapper's binaries will be on the path.
+ Firstly, this helps poorly-written packages, e.g. ones that look for just gcc when CC isn't defined yet clang is to be used.
+ Secondly, this helps packages not get confused when cross-compiling, in which case multiple CC wrappers may be simultaneous in use (targeting different platforms).
+ BUILD_- and TARGET_-prefixed versions of the normal environment variable are defined for the additional CC Wrappers, properly disambiguating them.
+
+
+ A problem with this final task is that CC Wrapper is honest and defines LD as ld.
+ Most packages, however, firstly use the C compiler for linking, secondly use LD anyways, defining it as the C compiler, and thirdly, only so define LD when it is undefined as a fallback.
+ This triple-threat means CC Wrapper will break those packages, as LD is already defined as the actually linker which the package won't override yet doesn't want to use.
+ The workaround is to define, just for the problematic package, LD as the C compiler.
+ A good way to do this would be preConfigure = "LD=$CC".
+
+
diff --git a/doc/submitting-changes.xml b/doc/submitting-changes.xml
index 0b09dffbb2d..f65b2898262 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 d2946f6ca9c..19218cfe8ec 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 98a46ca6c61..483ef6fd486 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 925e0d405a7..646ef220ad0 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 3893e349db3..3e30ec515fc 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;
+ callLibs = file: import file { inherit lib; };
- # datatypes
- attrsets = import ./attrsets.nix;
- lists = import ./lists.nix;
- strings = import ./strings.nix;
- stringsWithDeps = import ./strings-with-deps.nix;
+ lib = rec {
- # packaging
- customisation = import ./customisation.nix;
- maintainers = import ./maintainers.nix;
- meta = import ./meta.nix;
- sources = import ./sources.nix;
+ # often used, or depending on very little
+ trivial = callLibs ./trivial.nix;
+ fixedPoints = callLibs ./fixed-points.nix;
- # module system
- modules = import ./modules.nix;
- options = import ./options.nix;
- types = import ./types.nix;
+ # datatypes
+ attrsets = callLibs ./attrsets.nix;
+ lists = callLibs ./lists.nix;
+ strings = callLibs ./strings.nix;
+ stringsWithDeps = callLibs ./strings-with-deps.nix;
- # constants
- licenses = import ./licenses.nix;
- systems = import ./systems;
+ # packaging
+ customisation = callLibs ./customisation.nix;
+ maintainers = callLibs ./maintainers.nix;
+ meta = callLibs ./meta.nix;
+ sources = callLibs ./sources.nix;
- # misc
- debug = import ./debug.nix;
- generators = import ./generators.nix;
- misc = import ./deprecated.nix;
- # domain-specific
- sandbox = import ./sandbox.nix;
- fetchers = import ./fetchers.nix;
+ # module system
+ modules = callLibs ./modules.nix;
+ options = callLibs ./options.nix;
+ types = callLibs ./types.nix;
- # Eval-time filesystem handling
- filesystem = import ./filesystem.nix;
+ # constants
+ licenses = callLibs ./licenses.nix;
+ systems = callLibs ./systems;
-in
- { inherit trivial fixedPoints
- attrsets lists strings stringsWithDeps
- customisation maintainers meta sources
- modules options types
- licenses systems
- debug generators misc
- sandbox fetchers filesystem;
+ # 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 d4e78c39250..2a0f5a55bf1 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 {
@@ -309,48 +310,6 @@ rec {
mergeAttrsByFuncDefaults = foldl mergeAttrByFunc { inherit mergeAttrBy; };
mergeAttrsByFuncDefaultsClean = list: removeAttrs (mergeAttrsByFuncDefaults list) ["mergeAttrBy"];
- # merge attrs based on version key into mkDerivation args, see mergeAttrBy to learn about smart merge defaults
- #
- # This function is best explained by an example:
- #
- # {version ? "2.x"}:
- #
- # mkDerivation (mergeAttrsByVersion "package-name" version
- # { # version specific settings
- # "git" = { src = ..; preConfigre = "autogen.sh"; buildInputs = [automake autoconf libtool]; };
- # "2.x" = { src = ..; };
- # }
- # { // shared settings
- # buildInputs = [ common build inputs ];
- # meta = { .. }
- # }
- # )
- #
- # Please note that e.g. Eelco Dolstra usually prefers having one file for
- # each version. On the other hand there are valuable additional design goals
- # - readability
- # - do it once only
- # - try to avoid duplication
- #
- # Marc Weber and Michael Raskin sometimes prefer keeping older
- # versions around for testing and regression tests - as long as its cheap to
- # do so.
- #
- # Very often it just happens that the "shared" code is the bigger part.
- # Then using this function might be appropriate.
- #
- # Be aware that its easy to cause recompilations in all versions when using
- # this function - also if derivations get too complex splitting into multiple
- # files is the way to go.
- #
- # See misc.nix -> versionedDerivation
- # discussion: nixpkgs: pull/310
- mergeAttrsByVersion = name: version: attrsByVersion: base:
- mergeAttrsByFuncDefaultsClean [ { name = "${name}-${version}"; }
- base
- (maybeAttr version (throw "bad version ${version} for ${name}") attrsByVersion)
- ];
-
# sane defaults (same name as attr name so that inherit can be used)
mergeAttrBy = # { buildInputs = concatList; [...]; passthru = mergeAttr; [..]; }
listToAttrs (map (n: nameValuePair n lib.concat)
diff --git a/lib/fetchers.nix b/lib/fetchers.nix
index 21f28c32ef7..1107353b51d 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 3925beb2134..fc35a1a72c6 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 a11b5a6f4bd..13e053b5aa7 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 4419c3c8891..5f9da234f44 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 8dd1c210b7f..a790b576032 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,11 @@ 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 = {
fullName = "Unspecified free software license";
};
@@ -282,9 +292,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 +374,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
};
miros = {
- fullname = "MirOS License";
+ fullName = "MirOS License";
url = https://opensource.org/licenses/MirOS;
};
@@ -408,7 +419,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";
@@ -546,12 +557,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
fullName = "zlib License";
};
- zpt20 = spdx { # FIXME: why zpt* instead of zpl*
+ zpl20 = spdx {
spdxId = "ZPL-2.0";
fullName = "Zope Public License 2.0";
};
- zpt21 = spdx {
+ zpl21 = spdx {
spdxId = "ZPL-2.1";
fullName = "Zope Public License 2.1";
};
diff --git a/lib/lists.nix b/lib/lists.nix
index 6a8fd8a1840..8f67c6bb0ca 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 e10136bf070..32ec8be0a68 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -1,3 +1,4 @@
+{ ...}:
/* List of NixOS maintainers. The format is:
handle = "Real Name ";
@@ -33,6 +34,7 @@
algorith = "Dries Van Daele ";
alibabzo = "Alistair Bill ";
all = "Nix Committers ";
+ alunduil = "Alex Brandt ";
ambrop72 = "Ambroz Bizjak ";
amiddelk = "Arie Middelkoop ";
amiloradovsky = "Andrew Miloradovsky ";
@@ -75,6 +77,7 @@
berdario = "Dario Bertini ";
bergey = "Daniel Bergey ";
bhipple = "Benjamin Hipple ";
+ binarin = "Alexey Lebedeff ";
bjg = "Brian Gough ";
bjornfor = "Bjørn Forsman ";
bluescreen303 = "Mathijs Kwik ";
@@ -88,11 +91,14 @@
bstrik = "Berno Strik ";
bzizou = "Bruno Bzeznik ";
c0dehero = "CodeHero ";
+ calbrecht = "Christian Albrecht ";
calrama = "Moritz Maxeiner ";
calvertvl = "Victor Calvert ";
campadrenalin = "Philip Horger ";
canndrew = "Andrew Cann ";
carlsverre = "Carl Sverre ";
+ casey = "Casey Rodarmor ";
+ caugner = "Claas Augner ";
cdepillabout = "Dennis Gosnell ";
cfouche = "Chaddaï Fouché ";
changlinli = "Changlin Li ";
@@ -101,6 +107,7 @@
choochootrain = "Hurshal Patel ";
chris-martin = "Chris Martin ";
chrisjefferson = "Christopher Jefferson ";
+ chrisrosset = "Christopher Rosset ";
christopherpoole = "Christopher Mark Poole ";
ciil = "Simon Lackerbauer ";
ckampka = "Christian Kampka ";
@@ -108,6 +115,7 @@
cleverca22 = "Michael Bishop ";
cmcdragonkai = "Roger Qiu ";
cmfwyp = "cmfwyp ";
+ cobbal = "Andrew Cobb ";
coconnor = "Corey O'Connor ";
codsl = "codsl ";
codyopel = "Cody Opel ";
@@ -135,12 +143,14 @@
dbrock = "Daniel Brockman ";
deepfire = "Kosyrev Serge <_deepfire@feelingofgreen.ru>";
demin-dmitriy = "Dmitriy Demin ";
+ derchris = "Christian Gerbrandt ";
DerGuteMoritz = "Moritz Heidkamp ";
dermetfan = "Robin Stumm ";
DerTim1 = "Tim Digel ";
desiderius = "Didier J. Devroye ";
devhell = "devhell <\"^\"@regexmail.net>";
dezgeg = "Tuomas Tynkkynen ";
+ dfordivam = "Divam ";
dfoxfranke = "Daniel Fox Franke ";
dgonyeo = "Derek Gonyeo ";
dipinhora = "Dipin Hora ";
@@ -177,6 +187,7 @@
ellis = "Ellis Whitehead ";
eperuffo = "Emanuele Peruffo ";
epitrochoid = "Mabry Cervin ";
+ eqyiel = "Ruben Maher ";
ericbmerritt = "Eric Merritt ";
ericsagnes = "Eric Sagnes ";
erikryb = "Erik Rybakken ";
@@ -204,15 +215,18 @@
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 ";
gleber = "Gleb Peregud ";
+ glenns = "Glenn Searby ";
globin = "Robin Gloster ";
gnidorah = "Alex Ivanov ";
goibhniu = "Cillian de Róiste ";
@@ -226,6 +240,7 @@
guillaumekoenig = "Guillaume Koenig ";
guyonvarch = "Joris Guyonvarch ";
hakuch = "Jesse Haber-Kucharsky ";
+ hamhut1066 = "Hamish Hutchings ";
havvy = "Ryan Scheel ";
hbunke = "Hendrik Bunke ";
hce = "Hans-Christian Esperer ";
@@ -241,14 +256,15 @@
ianwookim = "Ian-Woo Kim ";
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 a7dcd3f1e1c..62c6a978af9 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.
+{ lib }:
+with lib.lists;
+with lib.attrsets;
+with lib.options;
+with lib.trivial;
+with lib.strings;
+let
-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
-
+ 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";
};
@@ -291,7 +291,7 @@ rec {
submodule = opts:
let
opts' = toList opts;
- inherit (import ./modules.nix) evalModules;
+ inherit (lib.modules) evalModules;
in
mkOptionType rec {
name = "submodule";
@@ -395,5 +395,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 a6f0dca2b82..f77dc5a9e64 100755
--- a/maintainers/scripts/gnome.sh
+++ b/maintainers/scripts/gnome.sh
@@ -2,26 +2,24 @@
set -o pipefail
-GNOME_FTP="ftp.gnome.org/pub/GNOME/sources"
+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"
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"
+action=$1
# curl -l ftp://... doesn't work from my office in HSE, and I don't want to have
# any conversations with sysadmin. Somehow lftp works.
@@ -36,18 +34,18 @@ else
fi
find_project() {
- exec find "$GNOME_TOP" -mindepth 2 -maxdepth 2 -type d $@
+ exec find "$GNOME_TOP" -mindepth 2 -maxdepth 2 -type d "$@"
}
show_project() {
- local project="$1"
- local majorVersion="$2"
- local version=""
+ local project=$1
+ local majorVersion=$2
+ local version=
if [ -z "$majorVersion" ]; then
echo "Looking for available versions..." >&2
- local available_baseversions=( `ls_ftp ftp://${GNOME_FTP}/${project} | grep '[0-9]\.[0-9]' | sort -t. -k1,1n -k 2,2n` )
- if [ "$?" -ne "0" ]; then
+ local available_baseversions=$(ls_ftp ftp://${GNOME_FTP}/${project} | grep '[0-9]\.[0-9]' | sort -t. -k1,1n -k 2,2n)
+ if [ "$?" -ne 0 ]; then
echo "Project $project not found" >&2
return 1
fi
@@ -59,11 +57,11 @@ show_project() {
if echo "$majorVersion" | grep -q "[0-9]\+\.[0-9]\+\.[0-9]\+"; then
# not a major version
- version="$majorVersion"
+ version=$majorVersion
majorVersion=$(echo "$majorVersion" | cut -d '.' -f 1,2)
fi
- local FTPDIR="${GNOME_FTP}/${project}/${majorVersion}"
+ local FTPDIR=${GNOME_FTP}/${project}/${majorVersion}
#version=`curl -l ${FTPDIR}/ 2>/dev/null | grep LATEST-IS | sed -e s/LATEST-IS-//`
# gnome's LATEST-IS is broken. Do not trust it.
@@ -92,7 +90,7 @@ show_project() {
esac
done
echo "Found versions ${!versions[@]}" >&2
- version=`echo ${!versions[@]} | sed -e 's/ /\n/g' | sort -t. -k1,1n -k 2,2n -k 3,3n | tail -n1`
+ version=$(echo ${!versions[@]} | sed -e 's/ /\n/g' | sort -t. -k1,1n -k 2,2n -k 3,3n | tail -n1)
if [ -z "$version" ]; then
echo "No version available for major $majorVersion" >&2
return 1
@@ -103,7 +101,7 @@ show_project() {
local name=${project}-${version}
echo "Fetching .sha256 file" >&2
- local sha256out=$(curl -s -f http://${FTPDIR}/${name}.sha256sum)
+ local sha256out=$(curl -s -f http://"${FTPDIR}"/"${name}".sha256sum)
if [ "$?" -ne "0" ]; then
echo "Version not found" >&2
@@ -136,8 +134,8 @@ fetchurl: {
}
update_project() {
- local project="$1"
- local majorVersion="$2"
+ local project=$1
+ local majorVersion=$2
# find project in nixpkgs tree
projectPath=$(find_project -name "$project" -print)
@@ -150,14 +148,14 @@ update_project() {
if [ "$?" -eq "0" ]; then
echo "Updating $projectPath/src.nix" >&2
- echo -e "$src" > "$projectPath/src.nix"
+ echo -e "$src" > "$projectPath"/src.nix
fi
return 0
}
-if [ "$action" == "update-all" ]; then
- majorVersion="$2"
+if [ "$action" = "update-all" ]; then
+ majorVersion=$2
if [ -z "$majorVersion" ]; then
echo "No major version specified" >&2
usage
@@ -170,23 +168,23 @@ if [ "$action" == "update-all" ]; then
echo "Skipping $project"
else
echo "= Updating $project to $majorVersion" >&2
- update_project $project $majorVersion
+ update_project "$project" "$majorVersion"
echo >&2
fi
done
else
- project="$2"
- majorVersion="$3"
+ project=$2
+ majorVersion=$3
if [ -z "$project" ]; then
echo "No project specified, exiting" >&2
usage
fi
- if [ "$action" == "show" ]; then
- show_project $project $majorVersion
- elif [ "$action" == "update" ]; then
- update_project $project $majorVersion
+ if [ "$action" = show ]; then
+ show_project "$project" "$majorVersion"
+ elif [ "$action" = update ]; then
+ update_project "$project" "$majorVersion"
else
echo "Unknown action $action" >&2
usage
diff --git a/maintainers/scripts/hydra-eval-failures.py b/maintainers/scripts/hydra-eval-failures.py
index 6bbc0a45e44..5233e062445 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,18 +29,21 @@ 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()
diff --git a/maintainers/scripts/travis-nox-review-pr.sh b/maintainers/scripts/travis-nox-review-pr.sh
index 649798ec76b..4da4f7dacfa 100755
--- a/maintainers/scripts/travis-nox-review-pr.sh
+++ b/maintainers/scripts/travis-nox-review-pr.sh
@@ -53,8 +53,8 @@ while test -n "$1"; do
nox)
echo "=== Fetching Nox from binary cache"
- # build nox silently so it's not in the log
- nix-build "" -A nox -A stdenv
+ # build nox (+ a basic nix-shell env) silently so it's not in the log
+ nix-shell -p nox stdenv --command true
;;
pr)
diff --git a/nixos/doc/manual/administration/declarative-containers.xml b/nixos/doc/manual/administration/declarative-containers.xml
index f3f65edcec2..94f03a2ee11 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 6ff0390c0ed..be1f2263149 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 00000000000..d3434e1f112
--- /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 d20c2d1aa2e..be793152f9e 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 441393c9827..7b86e518aaf 100644
--- a/nixos/doc/manual/development/option-types.xml
+++ b/nixos/doc/manual/development/option-types.xml
@@ -157,27 +157,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 +185,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 +205,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 +242,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 +271,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 01c3dbc22f1..afcb970ed70 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.
@@ -32,64 +32,6 @@
At beta release time
-
-
- Rename rl-unstable.xml ->
- rl-1509.xml.
-
-
-
-
- git tag -a -m "Release 15.09-beta" 15.09-beta && git push --tags
-
-
-
-
- From the master branch run git checkout -B release-15.09.
-
-
-
-
-
- Make sure channel is created at http://nixos.org/channels/.
-
-
-
-
-
-
- Lock the branch on github (so developers can’t force push)
-
-
-
-
-
- bump
- system.defaultChannel attribute in
- nixos/modules/misc/version.nix
-
-
-
-
- update
- versionSuffix in
- nixos/release.nix, use
- git log --format=%an|wc -l to get commit
- count
-
-
-
-
- echo -n "16.03" > .version in
- master.
-
-
-
-
- pick
- a new name for unstable branch.
-
-
Create
@@ -99,26 +41,81 @@
- Use https://lwn.net/Vulnerabilities/ and
- triage vulnerabilities in an issue.
+ git tag -a -s -m "Release 17.09-beta" 17.09-beta && git push --tags
- Create two Hydra jobsets: release-15.09 and release-15.09-small with stableBranch set to false
+ From the master branch run git checkout -B release-17.09.
+
+
+
+
+
+ Make sure a channel is created at http://nixos.org/channels/.
+
+
+
+
+
+
+ Let a GitHub nixpkgs admin lock the branch on github for you.
+ (so developers can’t force push)
+
+
+
+
+
+
+ Bump the system.defaultChannel attribute in
+ nixos/modules/misc/version.nix
+
+
+
+
+
+
+ Update versionSuffix in
+ nixos/release.nix, use
+ git log --format=%an|wc -l to get the commit
+ count
+
+
+
+
+ echo -n "18.03" > .version on
+ master.
+
+
+
+
+
+ Pick a new name for the unstable branch.
+
+
+
+
+
+ Create a new release notes file for the upcoming release + 1, in this
+ case rl-1803.xml.
+
+
+
+
+ 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 5bdcad5ceb5..cb363b45675 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 4a74e406b14..b97f989d902 100644
--- a/nixos/doc/manual/installation/installing-usb.xml
+++ b/nixos/doc/manual/installation/installing-usb.xml
@@ -11,7 +11,7 @@ a USB stick. You can use the dd utility to write the image:
dd if=path-to-image
of=/dev/sdb. Be careful about specifying the
correct drive; you can use the lsblk command to get a list of
-block devices. If you're on OS X you can run diskutil list
+block devices. If you're on macOS you can run diskutil list
to see the list of devices; the device you'll use for the USB must be ejected
before writing the image.
diff --git a/nixos/doc/manual/man-nixos-option.xml b/nixos/doc/manual/man-nixos-option.xml
index 6be8bc780f1..d2b2d5b7965 100644
--- a/nixos/doc/manual/man-nixos-option.xml
+++ b/nixos/doc/manual/man-nixos-option.xml
@@ -17,11 +17,16 @@
nixos-option
- option.name
+
+
+ path
+
+
+
+ option.name
-
Description
This command evaluates the configuration specified in
@@ -33,6 +38,45 @@ attributes contained in the attribute set.
+Options
+
+This command accepts the following options:
+
+
+
+
+ path
+
+
+ This option is passed to the underlying
+ nix-instantiate invocation.
+
+
+
+
+
+
+
+
+ This option enables verbose mode, which currently is just
+ the Bash set debug mode.
+
+
+
+
+
+
+
+
+ This option causes the output to be rendered as XML.
+
+
+
+
+
+
+
+
Environment
diff --git a/nixos/doc/manual/release-notes/rl-1609.xml b/nixos/doc/manual/release-notes/rl-1609.xml
index 3abafac9737..893f894f42f 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 72dfd60bedd..55b39209f0d 100644
--- a/nixos/doc/manual/release-notes/rl-1709.xml
+++ b/nixos/doc/manual/release-notes/rl-1709.xml
@@ -10,6 +10,11 @@
has the following highlights:
+
+
+ The GNOME version is now 3.24.
+
+
The user handling now keeps track of deallocated UIDs/GIDs. When a user
@@ -101,6 +106,9 @@ rmdir /var/lib/ipfs/.ipfs
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.
+
@@ -130,6 +138,70 @@ rmdir /var/lib/ipfs/.ipfs
instead. Refer to the description of the options for more details.
+
+
+ tlsdate package and module were removed. This is due to the project
+ being dead and not building with openssl 1.1.
+
+
+
+
+ wvdial package and module were removed. This is due to the project
+ being dead and not building with openssl 1.1.
+
+
+
+
+ cc-wrapper's setup-hook now exports a number of
+ environment variables corresponding to binutils binaries,
+ (e.g. LD, STRIP, RANLIB,
+ etc). This is done to prevent packages' build systems guessing, which is
+ harder to predict, especially when cross-compiling. However, some packages
+ have broken due to this—their build systems either not supporting, or
+ claiming to support without adequate testing, taking such environment
+ 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.
+
+
+
+
+ The gnupg package used to suffix its programs
+ with 2, like gpg2 and
+ gpgv2. This suffix has since been dropped,
+ and the programs are now simply gpg,
+ gpgv, etc.
+
+
Other notable improvements:
@@ -157,6 +229,41 @@ rmdir /var/lib/ipfs/.ipfs
module where user Fontconfig settings are available.
+
+
+ ZFS/SPL have been updated to 0.7.0, zfsUnstable, splUnstable
+ have therefore been removed.
+
+
+
+
+ The option now allows the value
+ null in addition to timezone strings. This value
+ allows changing the timezone of a system imperatively using
+ timedatectl set-timezone. The default timezone
+ is still UTC.
+
+
+
+
+ Nixpkgs overlays may now be specified with a file as well as a directory. The
+ value of <nixpkgs-overlays> may be a file, and
+ ~/.config/nixpkgs/overlays.nix can be used instead of the
+ ~/.config/nixpkgs/overalys directory.
+
+
+ See the overlays chapter of the Nixpkgs manual for more details.
+
+
+
+
+ sha256 argument value of
+ dockerTools.pullImage expression must be
+ updated since the mechanism to download the image has been
+ changed. Skopeo is now used to pull the image instead of the
+ Docker daemon.
+
+
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 00000000000..ce05cde7b08
--- /dev/null
+++ b/nixos/doc/manual/release-notes/rl-1803.xml
@@ -0,0 +1,46 @@
+
+
+Release 18.03 (“Impala”, 2018/03/??)
+
+In addition to numerous new and upgraded packages, this release
+has the following highlights:
+
+
+
+
+
+
+
+
+The following new services were added since the last release:
+
+
+
+
+
+
+
+When upgrading from a previous release, please be aware of the
+following incompatible changes:
+
+
+
+
+
+
+
+
+Other notable improvements:
+
+
+
+
+
+
+
+
+
diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix
index 56766ec9047..d4b2e338c3e 100644
--- a/nixos/lib/make-disk-image.nix
+++ b/nixos/lib/make-disk-image.nix
@@ -39,19 +39,13 @@
with lib;
let
- # Copied from https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/installer/cd-dvd/channel.nix
- # TODO: factor out more cleanly
+ extensions = {
+ qcow2 = "qcow2";
+ vpc = "vhd";
+ raw = "img";
+ };
- # 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 = lib.cleanSource pkgs.path;
channelSources = pkgs.runCommand "nixos-${config.system.nixosVersion}" {} ''
mkdir -p $out
@@ -142,8 +136,8 @@ in pkgs.vmTools.runInLinuxVM (
mv $diskImage $out/nixos.img
diskImage=$out/nixos.img
'' else ''
- ${pkgs.qemu}/bin/qemu-img convert -f raw -O qcow2 $diskImage $out/nixos.qcow2
- diskImage=$out/nixos.qcow2
+ ${pkgs.qemu}/bin/qemu-img convert -f raw -O ${format} $diskImage $out/nixos.${extensions.${format}}
+ diskImage=$out/nixos.${extensions.${format}}
''}
${postVM}
'';
diff --git a/nixos/lib/make-ext4-fs.nix b/nixos/lib/make-ext4-fs.nix
index 23839ea487d..f06649e1991 100644
--- a/nixos/lib/make-ext4-fs.nix
+++ b/nixos/lib/make-ext4-fs.nix
@@ -33,7 +33,7 @@ pkgs.stdenv.mkDerivation {
echo "Creating an EXT4 image of $bytes bytes (numInodes=$numInodes, numDataBlocks=$numDataBlocks)"
truncate -s $bytes $out
- faketime "1970-01-01 00:00:00" mkfs.ext4 -L ${volumeLabel} -U 44444444-4444-4444-8888-888888888888 $out
+ faketime -f "1970-01-01 00:00:01" mkfs.ext4 -L ${volumeLabel} -U 44444444-4444-4444-8888-888888888888 $out
# Populate the image contents by piping a bunch of commands to the `debugfs` tool from e2fsprogs.
# For example, to copy /nix/store/abcd...efg-coreutils-8.23/bin/sleep:
@@ -76,7 +76,7 @@ pkgs.stdenv.mkDerivation {
echo sif $file gid 30000 # chgrp to nixbld
done
- ) | faketime "1970-01-01 00:00:00" debugfs -w $out -f /dev/stdin > errorlog 2>&1
+ ) | faketime -f "1970-01-01 00:00:01" debugfs -w $out -f /dev/stdin > errorlog 2>&1
# The debugfs tool doesn't terminate on error nor exit with a non-zero status. Check manually.
if egrep -q 'Could not allocate|File not found' errorlog; then
diff --git a/nixos/maintainers/option-usages.nix b/nixos/maintainers/option-usages.nix
index 854ecf7eac5..7be0255b35a 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 cdfac71634d..d76fb644d02 100644
--- a/nixos/maintainers/scripts/ec2/amazon-image.nix
+++ b/nixos/maintainers/scripts/ec2/amazon-image.nix
@@ -22,15 +22,26 @@ in {
generated image. Glob patterns work.
'';
};
+
+ sizeMB = mkOption {
+ type = types.int;
+ default = if config.ec2.hvm then 2048 else 8192;
+ description = "The size in MB of the image";
+ };
+
+ format = mkOption {
+ type = types.enum [ "raw" "qcow2" "vpc" ];
+ default = "qcow2";
+ description = "The image format to output";
+ };
};
config.system.build.amazonImage = import ../../../lib/make-disk-image.nix {
inherit lib config;
- inherit (cfg) contents;
+ inherit (cfg) contents format;
pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package
partitioned = config.ec2.hvm;
- diskSize = if config.ec2.hvm then 2048 else 8192;
- format = "qcow2";
+ diskSize = cfg.sizeMB;
configFile = pkgs.writeText "configuration.nix"
''
{
@@ -41,5 +52,4 @@ in {
}
'';
};
-
}
diff --git a/nixos/maintainers/scripts/openstack/nova-image.nix b/nixos/maintainers/scripts/openstack/nova-image.nix
index fa9cfb74bd6..b6f3a5b1520 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/fonts/fontconfig-ultimate.nix b/nixos/modules/config/fonts/fontconfig-ultimate.nix
index 1bf9fdb1984..c7654ca78c3 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 65ef9512780..46b22fc1285 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/networking.nix b/nixos/modules/config/networking.nix
index cc967947dff..619f36cd515 100644
--- a/nixos/modules/config/networking.nix
+++ b/nixos/modules/config/networking.nix
@@ -20,12 +20,26 @@ in
options = {
+ networking.hosts = lib.mkOption {
+ type = types.attrsOf ( types.listOf types.str );
+ default = {};
+ example = literalExample ''
+ {
+ "127.0.0.1" = [ "foo.bar.baz" ];
+ "192.168.0.2" = [ "fileserver.local" "nameserver.local" ];
+ };
+ '';
+ description = ''
+ Locally defined maps of hostnames to IP addresses.
+ '';
+ };
+
networking.extraHosts = lib.mkOption {
type = types.lines;
default = "";
example = "192.168.0.1 lanlocalhost";
description = ''
- Additional entries to be appended to /etc/hosts.
+ Additional verbatim entries to be appended to /etc/hosts.
'';
};
@@ -188,11 +202,22 @@ in
# /etc/hosts: Hostname-to-IP mappings.
"hosts".text =
+ let oneToString = set : ip : ip + " " + concatStringsSep " " ( getAttr ip set );
+ allToString = set : concatMapStringsSep "\n" ( oneToString set ) ( attrNames set );
+ userLocalHosts = optionalString
+ ( builtins.hasAttr "127.0.0.1" cfg.hosts )
+ ( concatStringsSep " " ( remove "localhost" cfg.hosts."127.0.0.1" ));
+ userLocalHosts6 = optionalString
+ ( builtins.hasAttr "::1" cfg.hosts )
+ ( concatStringsSep " " ( remove "localhost" cfg.hosts."::1" ));
+ otherHosts = allToString ( removeAttrs cfg.hosts [ "127.0.0.1" "::1" ]);
+ in
''
- 127.0.0.1 localhost
+ 127.0.0.1 ${userLocalHosts} localhost
${optionalString cfg.enableIPv6 ''
- ::1 localhost
+ ::1 ${userLocalHosts6} localhost
''}
+ ${otherHosts}
${cfg.extraHosts}
'';
diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix
index 13477337bda..ae3e17ac27b 100644
--- a/nixos/modules/config/no-x-libs.nix
+++ b/nixos/modules/config/no-x-libs.nix
@@ -26,7 +26,16 @@ with lib;
fonts.fontconfig.enable = false;
- nixpkgs.config.packageOverrides = pkgs:
- { dbus = pkgs.dbus.override { x11Support = false; }; };
+ nixpkgs.config.packageOverrides = pkgs: {
+ dbus = pkgs.dbus.override { x11Support = false; };
+ networkmanager_fortisslvpn = pkgs.networkmanager_fortisslvpn.override { withGnome = false; };
+ networkmanager_l2tp = pkgs.networkmanager_l2tp.override { withGnome = false; };
+ networkmanager_openconnect = pkgs.networkmanager_openconnect.override { withGnome = false; };
+ 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 16c43a99ad5..97278238dcd 100644
--- a/nixos/modules/config/nsswitch.nix
+++ b/nixos/modules/config/nsswitch.nix
@@ -28,7 +28,8 @@ let
passwdArray = [ "files" ]
++ optional sssd "sss"
++ optionals ldap [ "ldap" ]
- ++ optionals mymachines [ "mymachines" ];
+ ++ optionals mymachines [ "mymachines" ]
+ ++ [ "systemd" ];
shadowArray = [ "files" ]
++ optional sssd "sss"
diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix
index b12ef2fe861..8b9c3570476 100644
--- a/nixos/modules/config/pulseaudio.nix
+++ b/nixos/modules/config/pulseaudio.nix
@@ -224,7 +224,7 @@ in {
# Allow PulseAudio to get realtime priority using rtkit.
security.rtkit.enable = true;
- systemd.packages = [ cfg.package ];
+ systemd.packages = [ overriddenPackage ];
})
(mkIf hasZeroconf {
diff --git a/nixos/modules/config/swap.nix b/nixos/modules/config/swap.nix
index e57ed2565a1..fed3fa3bc7c 100644
--- a/nixos/modules/config/swap.nix
+++ b/nixos/modules/config/swap.nix
@@ -5,6 +5,52 @@ with lib;
let
+ randomEncryptionCoerce = enable: { inherit enable; };
+
+ randomEncryptionOpts = { ... }: {
+
+ options = {
+
+ enable = mkOption {
+ default = false;
+ type = types.bool;
+ description = ''
+ Encrypt swap device with a random key. This way you won't have a persistent swap device.
+
+ WARNING: Don't try to hibernate when you have at least one swap partition with
+ this option enabled! We have no way to set the partition into which hibernation image
+ is saved, so if your image ends up on an encrypted one you would lose it!
+
+ WARNING #2: Do not use /dev/disk/by-uuid/… or /dev/disk/by-label/… as your swap device
+ when using randomEncryption as the UUIDs and labels will get erased on every boot when
+ the partition is encrypted. Best to use /dev/disk/by-partuuid/…
+ '';
+ };
+
+ cipher = mkOption {
+ default = "aes-xts-plain64";
+ example = "serpent-xts-plain64";
+ type = types.str;
+ description = ''
+ Use specified cipher for randomEncryption.
+
+ Hint: Run "cryptsetup benchmark" to see which one is fastest on your machine.
+ '';
+ };
+
+ source = mkOption {
+ default = "/dev/urandom";
+ example = "/dev/random";
+ type = types.str;
+ description = ''
+ Define the source of randomness to obtain a random key for encryption.
+ '';
+ };
+
+ };
+
+ };
+
swapCfg = {config, options, ...}: {
options = {
@@ -47,10 +93,17 @@ let
randomEncryption = mkOption {
default = false;
- type = types.bool;
+ example = {
+ enable = true;
+ cipher = "serpent-xts-plain64";
+ source = "/dev/random";
+ };
+ type = types.coercedTo types.bool randomEncryptionCoerce (types.submodule randomEncryptionOpts);
description = ''
Encrypt swap device with a random key. This way you won't have a persistent swap device.
+ HINT: run "cryptsetup benchmark" to test cipher performance on your machine.
+
WARNING: Don't try to hibernate when you have at least one swap partition with
this option enabled! We have no way to set the partition into which hibernation image
is saved, so if your image ends up on an encrypted one you would lose it!
@@ -77,7 +130,7 @@ let
device = mkIf options.label.isDefined
"/dev/disk/by-label/${config.label}";
deviceName = lib.replaceChars ["\\"] [""] (escapeSystemdPath config.device);
- realDevice = if config.randomEncryption then "/dev/mapper/${deviceName}" else config.device;
+ realDevice = if config.randomEncryption.enable then "/dev/mapper/${deviceName}" else config.device;
};
};
@@ -125,14 +178,14 @@ in
createSwapDevice = sw:
assert sw.device != "";
- assert !(sw.randomEncryption && lib.hasPrefix "/dev/disk/by-uuid" sw.device);
- assert !(sw.randomEncryption && lib.hasPrefix "/dev/disk/by-label" sw.device);
+ assert !(sw.randomEncryption.enable && lib.hasPrefix "/dev/disk/by-uuid" sw.device);
+ assert !(sw.randomEncryption.enable && lib.hasPrefix "/dev/disk/by-label" sw.device);
let realDevice' = escapeSystemdPath sw.realDevice;
in nameValuePair "mkswap-${sw.deviceName}"
{ description = "Initialisation of swap device ${sw.device}";
wantedBy = [ "${realDevice'}.swap" ];
before = [ "${realDevice'}.swap" ];
- path = [ pkgs.utillinux ] ++ optional sw.randomEncryption pkgs.cryptsetup;
+ path = [ pkgs.utillinux ] ++ optional sw.randomEncryption.enable pkgs.cryptsetup;
script =
''
@@ -145,13 +198,11 @@ in
truncate --size "${toString sw.size}M" "${sw.device}"
fi
chmod 0600 ${sw.device}
- ${optionalString (!sw.randomEncryption) "mkswap ${sw.realDevice}"}
+ ${optionalString (!sw.randomEncryption.enable) "mkswap ${sw.realDevice}"}
fi
''}
- ${optionalString sw.randomEncryption ''
- echo "secretkey" | cryptsetup luksFormat --batch-mode ${sw.device}
- echo "secretkey" | cryptsetup luksOpen ${sw.device} ${sw.deviceName}
- cryptsetup luksErase --batch-mode ${sw.device}
+ ${optionalString sw.randomEncryption.enable ''
+ cryptsetup plainOpen -c ${sw.randomEncryption.cipher} -d ${sw.randomEncryption.source} ${sw.device} ${sw.deviceName}
mkswap ${sw.realDevice}
''}
'';
@@ -159,12 +210,12 @@ in
unitConfig.RequiresMountsFor = [ "${dirOf sw.device}" ];
unitConfig.DefaultDependencies = false; # needed to prevent a cycle
serviceConfig.Type = "oneshot";
- serviceConfig.RemainAfterExit = sw.randomEncryption;
- serviceConfig.ExecStop = optionalString sw.randomEncryption "${pkgs.cryptsetup}/bin/cryptsetup luksClose ${sw.deviceName}";
+ serviceConfig.RemainAfterExit = sw.randomEncryption.enable;
+ serviceConfig.ExecStop = optionalString sw.randomEncryption.enable "${pkgs.cryptsetup}/bin/cryptsetup luksClose ${sw.deviceName}";
restartIfChanged = false;
};
- in listToAttrs (map createSwapDevice (filter (sw: sw.size != null || sw.randomEncryption) config.swapDevices));
+ in listToAttrs (map createSwapDevice (filter (sw: sw.size != null || sw.randomEncryption.enable) config.swapDevices));
};
diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix
index cf3cc2f2262..5d339eaea48 100644
--- a/nixos/modules/config/system-path.nix
+++ b/nixos/modules/config/system-path.nix
@@ -118,6 +118,9 @@ in
"/share/themes"
"/share/vim-plugins"
"/share/vulkan"
+ "/share/kservices5"
+ "/share/kservicetypes5"
+ "/share/kxmlgui5"
];
system.path = pkgs.buildEnv {
diff --git a/nixos/modules/config/timezone.nix b/nixos/modules/config/timezone.nix
index 39a45042c6c..aa030a816d0 100644
--- a/nixos/modules/config/timezone.nix
+++ b/nixos/modules/config/timezone.nix
@@ -14,13 +14,16 @@ in
time = {
timeZone = mkOption {
- default = "UTC";
- type = types.str;
+ default = null;
+ type = types.nullOr types.str;
example = "America/New_York";
description = ''
The time zone used when displaying times and dates. See
for a comprehensive list of possible values for this setting.
+
+ If null, the timezone will default to UTC and can be set imperatively
+ using timedatectl.
'';
};
@@ -40,13 +43,14 @@ in
# This way services are restarted when tzdata changes.
systemd.globalEnvironment.TZDIR = tzdir;
- environment.etc.localtime =
- { source = "/etc/zoneinfo/${config.time.timeZone}";
- mode = "direct-symlink";
+ systemd.services.systemd-timedated.environment = lib.optionalAttrs (config.time.timeZone != null) { NIXOS_STATIC_TIMEZONE = "1"; };
+
+ environment.etc = {
+ zoneinfo.source = tzdir;
+ } // lib.optionalAttrs (config.time.timeZone != null) {
+ localtime.source = "/etc/zoneinfo/${config.time.timeZone}";
+ localtime.mode = "direct-symlink";
};
-
- environment.etc.zoneinfo.source = tzdir;
-
};
}
diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix
index 0e7ffbd3c2e..a4715175cc9 100644
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@@ -527,7 +527,7 @@ in {
input.gid = ids.gids.input;
};
- system.activationScripts.users = stringAfter [ "etc" ]
+ system.activationScripts.users = stringAfter [ "stdio" ]
''
${pkgs.perl}/bin/perl -w \
-I${pkgs.perlPackages.FileSlurp}/lib/perl5/site_perl \
diff --git a/nixos/modules/hardware/mcelog.nix b/nixos/modules/hardware/mcelog.nix
index e4ac7d39053..13ad238870c 100644
--- a/nixos/modules/hardware/mcelog.nix
+++ b/nixos/modules/hardware/mcelog.nix
@@ -3,7 +3,7 @@
with lib;
{
- meta.maintainers = [ maintainers.grahamc ];
+ meta.maintainers = with maintainers; [ grahamc ];
options = {
hardware.mcelog = {
@@ -19,19 +19,17 @@ with lib;
};
config = mkIf config.hardware.mcelog.enable {
- systemd.services.mcelog = {
- description = "Machine Check Exception Logging Daemon";
- wantedBy = [ "multi-user.target" ];
+ systemd = {
+ packages = [ pkgs.mcelog ];
- serviceConfig = {
- ExecStart = "${pkgs.mcelog}/bin/mcelog --daemon --foreground";
- SuccessExitStatus = [ 0 15 ];
-
- ProtectHome = true;
- PrivateNetwork = true;
- PrivateTmp = true;
+ services.mcelog = {
+ wantedBy = [ "multi-user.target" ];
+ serviceConfig = {
+ ProtectHome = true;
+ PrivateNetwork = true;
+ PrivateTmp = true;
+ };
};
};
};
-
}
diff --git a/nixos/modules/hardware/raid/hpsa.nix b/nixos/modules/hardware/raid/hpsa.nix
new file mode 100644
index 00000000000..1b4b1fa1954
--- /dev/null
+++ b/nixos/modules/hardware/raid/hpsa.nix
@@ -0,0 +1,61 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ hpssacli = pkgs.stdenv.mkDerivation rec {
+ name = "hpssacli-${version}";
+ version = "2.40-13.0";
+
+ src = pkgs.fetchurl {
+ url = "http://downloads.linux.hpe.com/SDR/downloads/MCP/Ubuntu/pool/non-free/${name}_amd64.deb";
+ sha256 = "11w7fwk93lmfw0yya4jpjwdmgjimqxx6412sqa166g1pz4jil4sw";
+ };
+
+ nativeBuildInputs = [ pkgs.dpkg ];
+
+ unpackPhase = "dpkg -x $src ./";
+
+ installPhase = ''
+ mkdir -p $out/bin $out/share/doc $out/share/man
+ mv opt/hp/hpssacli/bld/{hpssascripting,hprmstr,hpssacli} $out/bin/
+ mv opt/hp/hpssacli/bld/*.{license,txt} $out/share/doc/
+ mv usr/man $out/share/
+
+ for file in $out/bin/*; do
+ chmod +w $file
+ patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+ --set-rpath ${lib.makeLibraryPath [ pkgs.stdenv.cc.cc ]} \
+ $file
+ done
+ '';
+
+ dontStrip = true;
+
+ meta = with lib; {
+ description = "HP Smart Array CLI";
+ homepage = http://downloads.linux.hpe.com/SDR/downloads/MCP/Ubuntu/pool/non-free/;
+ license = licenses.unfreeRedistributable;
+ platforms = [ "x86_64-linux" ];
+ maintainers = with maintainers; [ volth ];
+ };
+ };
+in {
+ ###### interface
+
+ options = {
+ hardware.raid.HPSmartArray = {
+ enable = mkEnableOption "HP Smart Array kernel modules and CLI utility";
+ };
+ };
+
+ ###### implementation
+
+ config = mkIf config.hardware.raid.HPSmartArray.enable {
+
+ boot.initrd.kernelModules = [ "sg" ]; /* hpssacli wants it */
+ boot.initrd.availableKernelModules = [ "hpsa" ];
+
+ environment.systemPackages = [ hpssacli ];
+ };
+}
diff --git a/nixos/modules/installer/cd-dvd/channel.nix b/nixos/modules/installer/cd-dvd/channel.nix
index 663ff24c81f..ddb00f174d1 100644
--- a/nixos/modules/installer/cd-dvd/channel.nix
+++ b/nixos/modules/installer/cd-dvd/channel.nix
@@ -6,16 +6,7 @@
with lib;
let
- # 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 = lib.cleanSource pkgs.path;
# We need a copy of the Nix expressions for Nixpkgs and NixOS on the
# CD. These are installed into the "nixos" channel of the root
diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix
index 8891ce0b666..96f7aac1d59 100644
--- a/nixos/modules/installer/cd-dvd/iso-image.nix
+++ b/nixos/modules/installer/cd-dvd/iso-image.nix
@@ -46,17 +46,24 @@ let
# A variant to boot with 'nomodeset'
LABEL boot-nomodeset
- MENU LABEL NixOS ${config.system.nixosVersion}${config.isoImage.appendToMenuLabel} (with nomodeset)
+ MENU LABEL NixOS ${config.system.nixosVersion}${config.isoImage.appendToMenuLabel} (nomodeset)
LINUX /boot/bzImage
APPEND init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} nomodeset
INITRD /boot/initrd
# A variant to boot with 'copytoram'
LABEL boot-copytoram
- MENU LABEL NixOS ${config.system.nixosVersion}${config.isoImage.appendToMenuLabel} (with copytoram)
+ MENU LABEL NixOS ${config.system.nixosVersion}${config.isoImage.appendToMenuLabel} (copytoram)
LINUX /boot/bzImage
APPEND init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} copytoram
INITRD /boot/initrd
+
+ # A variant to boot with verbose logging to the console
+ LABEL boot-nomodeset
+ MENU LABEL NixOS ${config.system.nixosVersion}${config.isoImage.appendToMenuLabel} (debug)
+ LINUX /boot/bzImage
+ APPEND init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} loglevel=7
+ INITRD /boot/initrd
'';
isolinuxMemtest86Entry = ''
@@ -74,25 +81,43 @@ let
cp -v ${pkgs.systemd}/lib/systemd/boot/efi/systemd-boot${targetArch}.efi $out/EFI/boot/boot${targetArch}.efi
mkdir -p $out/loader/entries
- echo "title NixOS Live CD" > $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
+ 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
- echo "default nixos-livecd" > $out/loader/loader.conf
- echo "timeout ${builtins.toString config.boot.loader.timeout}" >> $out/loader/loader.conf
+ # 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 ]; }
diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
index 063ffb191ee..8d80ceff84e 100644
--- a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
@@ -27,7 +27,8 @@ in
boot.loader.generic-extlinux-compatible.enable = true;
boot.kernelPackages = pkgs.linuxPackages_latest;
- boot.kernelParams = ["console=ttyS0,115200n8" "console=tty0"];
+ # Increase the amount of CMA to ensure the virtual console on the RPi3 works.
+ boot.kernelParams = ["cma=32M" "console=ttyS0,115200n8" "console=tty0"];
boot.consoleLogLevel = 7;
# FIXME: this probably should be in installation-device.nix
diff --git a/nixos/modules/installer/tools/auto-upgrade.nix b/nixos/modules/installer/tools/auto-upgrade.nix
index a4d4f16d1d9..7b756b70e2f 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 4568a20e778..321fb9a2030 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 29b447912e7..4ec48b77335 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -583,9 +583,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 +611,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 +624,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 087fbcd4512..79ed18c923c 100644
--- a/nixos/modules/installer/tools/nixos-install.sh
+++ b/nixos/modules/installer/tools/nixos-install.sh
@@ -106,8 +106,11 @@ extraBuildFlags+=(--option "build-users-group" "$buildUsersGroup")
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?
@@ -123,6 +126,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 +138,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 "")"
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 84d89510679..508a76d3cab 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -214,7 +214,7 @@
plex = 193;
grafana = 196;
skydns = 197;
- ripple-rest = 198;
+ # ripple-rest = 198; # unused, removed 2017-08-12
nix-serve = 199;
tvheadend = 200;
uwsgi = 201;
@@ -254,7 +254,6 @@
hydra-queue-runner = 235;
hydra-www = 236;
syncthing = 237;
- mfi = 238;
caddy = 239;
taskd = 240;
factorio = 241;
@@ -335,7 +334,7 @@
dialout = 27;
#polkituser = 28; # currently unused, polkitd doesn't need a group
utmp = 29;
- #ddclient = 30; # unused
+ ddclient = 30;
davfs2 = 31;
disnix = 33;
osgi = 34;
@@ -427,7 +426,7 @@
teamspeak = 124;
influxdb = 125;
nsd = 126;
- #gitolite = 127; # unused
+ gitolite = 127;
znc = 128;
polipo = 129;
mopidy = 130;
@@ -489,7 +488,7 @@
sabnzbd = 194;
#grafana = 196; #unused
#skydns = 197; #unused
- #ripple-rest = 198; #unused
+ # ripple-rest = 198; # unused, removed 2017-08-12
#nix-serve = 199; #unused
#tvheadend = 200; #unused
uwsgi = 201;
@@ -522,7 +521,6 @@
octoprint = 230;
radicale = 234;
syncthing = 237;
- #mfi = 238; # unused
caddy = 239;
taskd = 240;
factorio = 241;
diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix
index 315c33a462c..48cde2ebbc8 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 b97c3b0d816..ce6fea445c3 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -43,6 +43,7 @@
./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
@@ -91,6 +92,7 @@
./programs/mosh.nix
./programs/mtr.nix
./programs/nano.nix
+ ./programs/npm.nix
./programs/oblogout.nix
./programs/qt5ct.nix
./programs/screen.nix
@@ -105,7 +107,6 @@
./programs/venus.nix
./programs/vim.nix
./programs/wireshark.nix
- ./programs/wvdial.nix
./programs/xfs_quota.nix
./programs/xonsh.nix
./programs/zsh/oh-my-zsh.nix
@@ -121,7 +122,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
@@ -157,7 +157,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
@@ -166,6 +168,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
@@ -186,6 +189,7 @@
./services/databases/neo4j.nix
./services/databases/openldap.nix
./services/databases/opentsdb.nix
+ ./services/databases/postage.nix
./services/databases/postgresql.nix
./services/databases/redis.nix
./services/databases/riak.nix
@@ -203,6 +207,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 +229,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
@@ -268,6 +274,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
@@ -297,10 +304,12 @@
./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/irkerd.nix
./services/misc/jackett.nix
+ ./services/misc/logkeys.nix
./services/misc/leaps.nix
./services/misc/mantisbt.nix
./services/misc/mathics.nix
@@ -324,7 +333,6 @@
./services/misc/radarr.nix
./services/misc/redmine.nix
./services/misc/rippled.nix
- ./services/misc/ripple-rest.nix
./services/misc/ripple-data-api.nix
./services/misc/rogue.nix
./services/misc/siproxd.nix
@@ -356,9 +364,11 @@
./services/monitoring/munin.nix
./services/monitoring/nagios.nix
./services/monitoring/netdata.nix
+ ./services/monitoring/osquery.nix
./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/nginx-exporter.nix
@@ -416,15 +426,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 +465,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 +516,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,8 +527,8 @@
./services/networking/tcpcrypt.nix
./services/networking/teamspeak3.nix
./services/networking/tinc.nix
+ ./services/networking/tinydns.nix
./services/networking/tftpd.nix
- ./services/networking/tlsdated.nix
./services/networking/tox-bootstrapd.nix
./services/networking/toxvpn.nix
./services/networking/tvheadend.nix
@@ -548,7 +560,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
@@ -557,10 +568,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
@@ -584,6 +597,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
@@ -626,7 +641,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
@@ -676,6 +690,7 @@
./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/exfat.nix
diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix
index 687cd9d80d3..39b8553976e 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 e2337537518..fe9851e79a6 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 0a0838431da..456538742f5 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;
@@ -59,4 +66,20 @@ with lib;
# the feature at runtime. Attempting to create a user namespace
# with unshare will then fail with "no space left on device".
boot.kernel.sysctl."user.max_user_namespaces" = mkDefault 0;
+
+ # Raise ASLR entropy for 64bit & 32bit, respectively.
+ #
+ # 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 a24fa75e01d..506a6ee3eaa 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/gnupg.nix b/nixos/modules/programs/gnupg.nix
index 8af55f38992..addc9dcca87 100644
--- a/nixos/modules/programs/gnupg.nix
+++ b/nixos/modules/programs/gnupg.nix
@@ -92,7 +92,7 @@ in
'');
assertions = [
- { assertion = cfg.agent.enableSSHSupport && !config.programs.ssh.startAgent;
+ { assertion = cfg.agent.enableSSHSupport -> !config.programs.ssh.startAgent;
message = "You can't use ssh-agent and GnuPG agent with SSH support enabled at the same time!";
}
];
diff --git a/nixos/modules/programs/mtr.nix b/nixos/modules/programs/mtr.nix
index 927fe68be87..1fdec4c04f6 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 00000000000..7ef172355c1
--- /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 79a8ddb7ce3..720c29b1eae 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/qt5ct.nix b/nixos/modules/programs/qt5ct.nix
index 550634e65be..aeb7fc50849 100644
--- a/nixos/modules/programs/qt5ct.nix
+++ b/nixos/modules/programs/qt5ct.nix
@@ -26,6 +26,6 @@ with lib;
###### implementation
config = mkIf config.programs.qt5ct.enable {
environment.variables.QT_QPA_PLATFORMTHEME = "qt5ct";
- environment.systemPackages = [ pkgs.qt5ct ];
+ environment.systemPackages = with pkgs; [ qt5ct libsForQt5.qtstyleplugins ];
};
}
diff --git a/nixos/modules/programs/thefuck.nix b/nixos/modules/programs/thefuck.nix
index 433a0ca95fe..eb913477cf0 100644
--- a/nixos/modules/programs/thefuck.nix
+++ b/nixos/modules/programs/thefuck.nix
@@ -3,7 +3,12 @@
with lib;
let
- cfg = config.programs.thefuck;
+ prg = config.programs;
+ cfg = prg.thefuck;
+
+ initScript = ''
+ eval $(${pkgs.thefuck}/bin/thefuck --alias ${cfg.alias})
+ '';
in
{
options = {
@@ -24,8 +29,11 @@ in
config = mkIf cfg.enable {
environment.systemPackages = with pkgs; [ thefuck ];
- environment.shellInit = ''
- eval $(${pkgs.thefuck}/bin/thefuck --alias ${cfg.alias})
+ environment.shellInit = initScript;
+
+ programs.zsh.shellInit = mkIf prg.zsh.enable initScript;
+ programs.fish.shellInit = mkIf prg.fish.enable ''
+ ${pkgs.thefuck}/bin/thefuck --alias | source
'';
};
}
diff --git a/nixos/modules/programs/wvdial.nix b/nixos/modules/programs/wvdial.nix
deleted file mode 100644
index 1ed929ed4af..00000000000
--- a/nixos/modules/programs/wvdial.nix
+++ /dev/null
@@ -1,71 +0,0 @@
-# Global configuration for wvdial.
-
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-
- configFile = ''
- [Dialer Defaults]
- PPPD PATH = ${pkgs.ppp}/sbin/pppd
- ${config.environment.wvdial.dialerDefaults}
- '';
-
- cfg = config.environment.wvdial;
-
-in
-{
- ###### interface
-
- options = {
-
- environment.wvdial = {
-
- dialerDefaults = mkOption {
- default = "";
- type = types.str;
- example = ''Init1 = AT+CGDCONT=1,"IP","internet.t-mobile"'';
- description = ''
- Contents of the "Dialer Defaults" section of
- /etc/wvdial.conf.
- '';
- };
-
- pppDefaults = mkOption {
- default = ''
- noipdefault
- usepeerdns
- defaultroute
- persist
- noauth
- '';
- type = types.str;
- description = "Default ppp settings for wvdial.";
- };
-
- };
-
- };
-
- ###### implementation
-
- config = mkIf (cfg.dialerDefaults != "") {
-
- environment = {
-
- etc =
- [
- { source = pkgs.writeText "wvdial.conf" configFile;
- target = "wvdial.conf";
- }
- { source = pkgs.writeText "wvdial" cfg.pppDefaults;
- target = "ppp/peers/wvdial";
- }
- ];
-
- };
-
- };
-
-}
diff --git a/nixos/modules/programs/xonsh.nix b/nixos/modules/programs/xonsh.nix
index c0be2d8884b..49cc4906e03 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.nix b/nixos/modules/programs/zsh/zsh.nix
index a055291282c..615e54c326b 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 c3fb5758ede..deff4067957 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -1,4 +1,4 @@
-{ lib, ... }:
+{ lib, pkgs, ... }:
with lib;
@@ -14,17 +14,23 @@ with lib;
(mkRenamedOptionModule [ "networking" "enableRT73Firmware" ] [ "networking" "enableRalinkFirmware" ])
(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" ])
@@ -118,26 +124,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 +181,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" ] "")
diff --git a/nixos/modules/security/auditd.nix b/nixos/modules/security/auditd.nix
index 319dce9a6c5..6abac244dac 100644
--- a/nixos/modules/security/auditd.nix
+++ b/nixos/modules/security/auditd.nix
@@ -13,6 +13,7 @@ with lib;
unitConfig = {
ConditionVirtualization = "!container";
ConditionSecurity = [ "audit" ];
+ DefaultDependencies = false;
};
path = [ pkgs.audit ];
diff --git a/nixos/modules/security/chromium-suid-sandbox.nix b/nixos/modules/security/chromium-suid-sandbox.nix
index 0458ffb6c46..be6acb3f1f5 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 d23c7f2e86d..00000000000
--- 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 0a884b3f9b5..00000000000
--- 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 260ec3fc946..c81521ed9b0 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 5632500df2e..ede4ace5ed0 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")}
'');
};
diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix
index a6dc8faaae9..1f64213accd 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/services/amqp/rabbitmq.nix b/nixos/modules/services/amqp/rabbitmq.nix
index 61545a5acba..f536d56d7c6 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/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix
index bd6c316243c..5f379b392ea 100644
--- a/nixos/modules/services/audio/mpd.nix
+++ b/nixos/modules/services/audio/mpd.nix
@@ -10,11 +10,9 @@ let
gid = config.ids.gids.mpd;
cfg = config.services.mpd;
- playlistDir = "${cfg.dataDir}/playlists";
-
mpdConf = pkgs.writeText "mpd.conf" ''
music_directory "${cfg.musicDirectory}"
- playlist_directory "${playlistDir}"
+ playlist_directory "${cfg.playlistDirectory}"
db_file "${cfg.dbFile}"
state_file "${cfg.dataDir}/state"
sticker_file "${cfg.dataDir}/sticker.sql"
@@ -57,11 +55,21 @@ in {
musicDirectory = mkOption {
type = types.path;
default = "${cfg.dataDir}/music";
+ defaultText = ''''${dataDir}/music'';
description = ''
The directory where mpd reads music from.
'';
};
+ playlistDirectory = mkOption {
+ type = types.path;
+ default = "${cfg.dataDir}/playlists";
+ defaultText = ''''${dataDir}/playlists'';
+ description = ''
+ The directory where mpd stores playlists.
+ '';
+ };
+
extraConfig = mkOption {
type = types.lines;
default = "";
@@ -120,6 +128,7 @@ in {
dbFile = mkOption {
type = types.str;
default = "${cfg.dataDir}/tag_cache";
+ defaultText = ''''${dataDir}/tag_cache'';
description = ''
The path to MPD's database.
'';
@@ -153,7 +162,7 @@ in {
preStart = ''
mkdir -p "${cfg.dataDir}" && chown -R ${cfg.user}:${cfg.group} "${cfg.dataDir}"
- mkdir -p "${playlistDir}" && chown -R ${cfg.user}:${cfg.group} "${playlistDir}"
+ mkdir -p "${cfg.playlistDirectory}" && chown -R ${cfg.user}:${cfg.group} "${cfg.playlistDirectory}"
'';
serviceConfig = {
User = "${cfg.user}";
diff --git a/nixos/modules/services/backup/znapzend.nix b/nixos/modules/services/backup/znapzend.nix
index 8c5af80c8fb..baf99930e3e 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 00000000000..482cbd939cb
--- /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 = "0b5v7xa3s91yi9yfsw2b8wijiprnicbb02f5kqa579h4yndb3gfz";
+ };
+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 4c9d9aad0e2..077953e4d4f 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;
};
- registerSchedulable = mkOption {
- description = "Register the node as schedulable. No-op if register-node is false.";
+ seedDockerImages = mkOption {
+ description = "List of docker images to preload on system";
+ default = [];
+ type = types.listOf types.package;
+ };
+
+ 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;
- };
-
- extraOpts = mkOption {
- description = "Kubernetes dns extra command line options.";
- default = "";
- 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; };
+ '';
};
};
+
+ 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 {
- 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}
+ 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
- ${concatMapStringsSep "\n" (p: "ln -fs ${p.plugins}/* /opt/cni/bin") cfg.kubelet.cni.packages}
+ ${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" "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 00000000000..d70663fa5d7
--- /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 = "0g64jc2076ng28xl4w3w9svf7hc6s9h8rq9mhvvwpfy2p6lgj6gy";
+ };
+
+ k8s-dns-dnsmasq-nanny = pkgs.dockerTools.pullImage {
+ imageName = "gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64";
+ imageTag = version;
+ sha256 = "0sdpsbj1vismihy7ass1cn96nwmav6sf3r5h6i4k2dxha0y0jsh5";
+ };
+
+ k8s-dns-sidecar = pkgs.dockerTools.pullImage {
+ imageName = "gcr.io/google_containers/k8s-dns-sidecar-amd64";
+ imageTag = version;
+ sha256 = "01zpi189hpy2z62awl38fap908s8rrhc3v5gb6m90y2pycl4ad6q";
+ };
+
+ 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/gitlab-runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner.nix
index b11bc031b3f..6d5cea4f77a 100644
--- a/nixos/modules/services/continuous-integration/gitlab-runner.nix
+++ b/nixos/modules/services/continuous-integration/gitlab-runner.nix
@@ -4,15 +4,65 @@ with lib;
let
cfg = config.services.gitlab-runner;
- configFile = pkgs.writeText "config.toml" cfg.configText;
+ 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;
hasDocker = config.virtualisation.docker.enable;
in
{
options.services.gitlab-runner = {
enable = mkEnableOption "Gitlab Runner";
- configText = mkOption {
- description = "Verbatim config.toml to use";
+ configFile = mkOption {
+ default = null;
+ description = ''
+ Configuration file for gitlab-runner.
+ Use this option in favor of configOptions to avoid placing CI tokens in the nix store.
+
+ takes precedence over .
+
+ Warning: Not using will potentially result in secrets
+ leaking into the WORLD-READABLE nix store.
+ '';
+ type = types.nullOr types.path;
+ };
+
+ configOptions = mkOption {
+ description = ''
+ Configuration for gitlab-runner
+ will take precedence over this option.
+
+ Warning: all Configuration, especially CI token, will be stored in a
+ WORLD-READABLE file in the Nix Store.
+
+ If you want to protect your CI token use instead.
+ '';
+ type = types.attrs;
+ example = {
+ concurrent = 2;
+ runners = [{
+ name = "docker-nix-1.11";
+ url = "https://CI/";
+ token = "TOKEN";
+ executor = "docker";
+ builds_dir = "";
+ docker = {
+ host = "";
+ image = "nixos/nix:1.11";
+ privileged = true;
+ disable_cache = true;
+ cache_dir = "";
+ };
+ }];
+ };
};
gracefulTermination = mkOption {
@@ -46,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 00000000000..5d0c3f7b4ab
--- /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 fcc0f58637c..43fec5ff5bb 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/databases/influxdb.nix b/nixos/modules/services/databases/influxdb.nix
index dd88624f406..15b711f57b1 100644
--- a/nixos/modules/services/databases/influxdb.nix
+++ b/nixos/modules/services/databases/influxdb.nix
@@ -68,9 +68,9 @@ let
collectd = [{
enabled = false;
- typesdb = "${pkgs.collectd}/share/collectd/types.db";
+ typesdb = "${pkgs.collectd-data}/share/collectd/types.db";
database = "collectd_db";
- port = 25826;
+ bind-address = ":25826";
}];
opentsdb = [{
@@ -149,7 +149,6 @@ in
type = types.attrs;
};
};
-
};
@@ -171,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/mongodb.nix b/nixos/modules/services/databases/mongodb.nix
index c56564f57f3..78dbf0d784c 100644
--- a/nixos/modules/services/databases/mongodb.nix
+++ b/nixos/modules/services/databases/mongodb.nix
@@ -108,7 +108,7 @@ in
after = [ "network.target" ];
serviceConfig = {
- ExecStart = "${mongodb}/bin/mongod --quiet --config ${mongoCnf} --fork --pidfilepath ${cfg.pidFile}";
+ ExecStart = "${mongodb}/bin/mongod --config ${mongoCnf} --fork --pidfilepath ${cfg.pidFile}";
User = cfg.user;
PIDFile = cfg.pidFile;
Type = "forking";
diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix
index 6027f109285..845e6d4c22e 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}
'';
@@ -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/postage.nix
new file mode 100644
index 00000000000..d49c9a83a46
--- /dev/null
+++ b/nixos/modules/services/databases/postage.nix
@@ -0,0 +1,205 @@
+{ lib, pkgs, config, ... } :
+
+with lib;
+
+let
+ cfg = config.services.postage;
+
+ confFile = pkgs.writeTextFile {
+ name = "postage.conf";
+ text = ''
+ connection_file = ${postageConnectionsFile}
+
+ allow_custom_connections = ${builtins.toJSON cfg.allowCustomConnections}
+
+ postage_port = ${toString cfg.port}
+
+ super_only = ${builtins.toJSON cfg.superOnly}
+
+ ${optionalString (!isNull cfg.loginGroup) "login_group = ${cfg.loginGroup}"}
+
+ login_timeout = ${toString cfg.loginTimeout}
+
+ web_root = ${cfg.package}/etc/postage/web_root
+
+ data_root = ${cfg.dataRoot}
+
+ ${optionalString (!isNull cfg.tls) ''
+ tls_cert = ${cfg.tls.cert}
+ tls_key = ${cfg.tls.key}
+ ''}
+
+ log_level = ${cfg.logLevel}
+ '';
+ };
+
+ postageConnectionsFile = pkgs.writeTextFile {
+ name = "postage-connections.conf";
+ text = concatStringsSep "\n"
+ (mapAttrsToList (name : conn : "${name}: ${conn}") cfg.connections);
+ };
+
+ postage = "postage";
+in {
+
+ options.services.postage = {
+ enable = mkEnableOption "PostgreSQL Administration for the web";
+
+ package = mkOption {
+ type = types.package;
+ default = pkgs.postage;
+ defaultText = "pkgs.postage";
+ description = ''
+ The postage package to use.
+ '';
+ };
+
+ connections = mkOption {
+ type = types.attrsOf types.str;
+ default = {};
+ example = {
+ "nuc-server" = "hostaddr=192.168.0.100 port=5432 dbname=postgres";
+ "mini-server" = "hostaddr=127.0.0.1 port=5432 dbname=postgres sslmode=require";
+ };
+ description = ''
+ Postage 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
+ connect to a database.
+ '';
+ };
+
+ allowCustomConnections = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ This tells Postage whether or not to allow anyone to use a custom
+ connection from the login screen.
+ '';
+ };
+
+ port = mkOption {
+ type = types.int;
+ default = 8080;
+ description = ''
+ This tells Postage what port to listen on for browser requests.
+ '';
+ };
+
+ localOnly = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ This tells Postage whether or not to set the listening socket to local
+ addresses only.
+ '';
+ };
+
+ superOnly = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ This tells Postage 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
+ test if the user is a superuser.
+ '';
+ };
+
+ loginGroup = mkOption {
+ 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
+ order to test if the user is a member of the login group.
+ '';
+ };
+
+ loginTimeout = mkOption {
+ type = types.int;
+ default = 3600;
+ description = ''
+ Number of seconds of inactivity before user is automatically logged
+ out.
+ '';
+ };
+
+ dataRoot = mkOption {
+ type = types.str;
+ default = "/var/lib/postage";
+ 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
+ don't lose your work.
+ '';
+ };
+
+ tls = mkOption {
+ type = types.nullOr (types.submodule {
+ options = {
+ cert = mkOption {
+ type = types.str;
+ description = "TLS certificate";
+ };
+ key = mkOption {
+ type = types.str;
+ description = "TLS key";
+ };
+ };
+ });
+ default = null;
+ description = ''
+ These options tell Postage 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
+ configuration. This allows your web server to terminate the secure
+ connection and pass on the request to Postage. You can find help to set
+ up this configuration in:
+
+ '';
+ };
+
+ logLevel = mkOption {
+ type = types.enum ["error" "warn" "notice" "info"];
+ default = "error";
+ description = ''
+ Verbosity of logs
+ '';
+ };
+ };
+
+ 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;
+ };
+ groups."${postage}" = {
+ name = postage;
+ };
+ };
+ };
+}
diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index d06e03a5297..a23a0ebc736 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/gnome3/evolution-data-server.nix b/nixos/modules/services/desktops/gnome3/evolution-data-server.nix
index 2db2e2fe1c3..86a47488d86 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 33c4bc49f98..139534cdb89 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 88bbdadfcbd..f6efb668424 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 a36643a1cfb..2a68af5a7dd 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 82d04c62c70..0da4aca73ec 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 6acd633b62c..d406bf6f5e3 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 384cede679c..3ac767bfa00 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 e5c94cff7c8..1f6ce2ae968 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 00000000000..5a8258775e0
--- /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 6bbabe8d3c5..4e99d191f18 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 45925aaca9b..e9ad738269e 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 ff7f484602c..7a4389038b2 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 dcaa60103a3..c061f789049 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/editors/emacs.xml b/nixos/modules/services/editors/emacs.xml
index 9d6395ebd74..dd66bac442c 100644
--- a/nixos/modules/services/editors/emacs.xml
+++ b/nixos/modules/services/editors/emacs.xml
@@ -24,7 +24,7 @@
Emacs runs within a graphical desktop environment using the X
Window System, but works equally well on a text terminal. Under
- OS X, a "Mac port" edition is
+ macOS, a "Mac port" edition is
available, which uses Apple's native GUI frameworks.
@@ -84,7 +84,7 @@
Emacs 25 with the "Mac port" patches, providing a more
- native look and feel under OS X.
+ native look and feel under macOS.
diff --git a/nixos/modules/services/hardware/interception-tools.nix b/nixos/modules/services/hardware/interception-tools.nix
new file mode 100644
index 00000000000..fadcb19a016
--- /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 3b108c87edd..68425822a88 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/logging/fluentd.nix b/nixos/modules/services/logging/fluentd.nix
index 9fbec245737..95825705d9d 100644
--- a/nixos/modules/services/logging/fluentd.nix
+++ b/nixos/modules/services/logging/fluentd.nix
@@ -4,6 +4,8 @@ with lib;
let
cfg = config.services.fluentd;
+
+ pluginArgs = concatStringsSep " " (map (x: "-p ${x}") cfg.plugins);
in {
###### interface
@@ -28,6 +30,15 @@ in {
defaultText = "pkgs.fluentd";
description = "The fluentd package to use.";
};
+
+ plugins = mkOption {
+ type = types.listOf types.path;
+ default = [];
+ description = ''
+ A list of plugin paths to pass into fluentd. It will make plugins defined in ruby files
+ there available in your config.
+ '';
+ };
};
};
@@ -39,7 +50,7 @@ in {
description = "Fluentd Daemon";
wantedBy = [ "multi-user.target" ];
serviceConfig = {
- ExecStart = "${cfg.package}/bin/fluentd -c ${pkgs.writeText "fluentd.conf" cfg.config}";
+ ExecStart = "${cfg.package}/bin/fluentd -c ${pkgs.writeText "fluentd.conf" cfg.config} ${pluginArgs}";
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
};
};
diff --git a/nixos/modules/services/logging/graylog.nix b/nixos/modules/services/logging/graylog.nix
index 9f0fb11f025..a0dc0d6d089 100644
--- a/nixos/modules/services/logging/graylog.nix
+++ b/nixos/modules/services/logging/graylog.nix
@@ -11,9 +11,7 @@ let
password_secret = ${cfg.passwordSecret}
root_username = ${cfg.rootUsername}
root_password_sha2 = ${cfg.rootPasswordSha2}
- elasticsearch_cluster_name = ${cfg.elasticsearchClusterName}
- elasticsearch_discovery_zen_ping_multicast_enabled = ${boolToString cfg.elasticsearchDiscoveryZenPingMulticastEnabled}
- elasticsearch_discovery_zen_ping_unicast_hosts = ${cfg.elasticsearchDiscoveryZenPingUnicastHosts}
+ elasticsearch_hosts = ${concatStringsSep "," cfg.elasticsearchHosts}
message_journal_dir = ${cfg.messageJournalDir}
mongodb_uri = ${cfg.mongodbUri}
plugin_dir = /var/lib/graylog/plugins
@@ -91,22 +89,10 @@ in
'';
};
- elasticsearchClusterName = mkOption {
- type = types.str;
- example = "graylog";
- description = "This must be the same as for your Elasticsearch cluster";
- };
-
- elasticsearchDiscoveryZenPingMulticastEnabled = mkOption {
- type = types.bool;
- default = false;
- description = "Whether to use elasticsearch multicast discovery";
- };
-
- elasticsearchDiscoveryZenPingUnicastHosts = mkOption {
- type = types.str;
- default = "127.0.0.1:9300";
- description = "Tells Graylogs Elasticsearch client how to find other cluster members. See Elasticsearch documentation for details";
+ elasticsearchHosts = mkOption {
+ type = types.listOf types.str;
+ example = literalExample ''[ "http://node1:9200" "http://user:password@node2:19200" ]'';
+ description = "List of valid URIs of the http ports of your elastic nodes. If one or more of your elasticsearch hosts require authentication, include the credentials in each node URI that requires authentication";
};
messageJournalDir = mkOption {
diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix
index 3b25e41edb1..6057acc531a 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/postfix.nix b/nixos/modules/services/mail/postfix.nix
index 845c6acc7fe..d88a38def82 100644
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@@ -76,7 +76,7 @@ let
// optionalAttrs (cfg.relayDomains != null) { relay_domains = cfg.relayDomains; }
// optionalAttrs (cfg.recipientDelimiter != "") { recipient_delimiter = cfg.recipientDelimiter; }
// optionalAttrs haveAliases { alias_maps = "${cfg.aliasMapType}:/etc/postfix/aliases"; }
- // optionalAttrs haveTransport { transport_maps = "hash:/etc/postfx/transport"; }
+ // 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.enableHeaderChecks { header_checks = "regexp:/etc/postfix/header_checks"; }
@@ -213,8 +213,8 @@ let
wakeupDefined = options.wakeup.isDefined;
wakeupUCDefined = options.wakeupUnusedComponent.isDefined;
finalValue = toString config.wakeup
- + optionalString (!config.wakeupUnusedComponent) "?";
- in if wakeupDefined && wakeupUCDefined then finalValue else "-";
+ + optionalString (wakeupUCDefined && !config.wakeupUnusedComponent) "?";
+ in if wakeupDefined then finalValue else "-";
in [
config.name
@@ -267,7 +267,7 @@ let
lines = [ sep (formatLine labels) (formatLine labelDefaults) sep ];
in concatStringsSep "\n" lines;
- in formattedLabels + "\n" + concatMapStringsSep "\n" formatLine masterCf + "\n";
+ in formattedLabels + "\n" + concatMapStringsSep "\n" formatLine masterCf + "\n" + cfg.extraMasterConf;
headerCheckOptions = { ... }:
{
@@ -836,8 +836,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." ];
- })
]);
}
diff --git a/nixos/modules/services/misc/airsonic.nix b/nixos/modules/services/misc/airsonic.nix
new file mode 100644
index 00000000000..b92104787a5
--- /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/autofs.nix b/nixos/modules/services/misc/autofs.nix
index 40b48f70f7e..f1742177326 100644
--- a/nixos/modules/services/misc/autofs.nix
+++ b/nixos/modules/services/misc/autofs.nix
@@ -20,10 +20,10 @@ in
enable = mkOption {
default = false;
- description = "
+ description = ''
Mount filesystems on demand. Unmount them automatically.
You may also be interested in afuse.
- ";
+ '';
};
autoMaster = mkOption {
@@ -45,10 +45,9 @@ in
/auto file:''${mapConf}
'''
'';
- description = "
- file contents of /etc/auto.master. See man auto.master
- See man 5 auto.master and man 5 autofs.
- ";
+ description = ''
+ Contents of /etc/auto.master file. See auto.master(5) and autofs(5).
+ '';
};
timeout = mkOption {
@@ -58,9 +57,9 @@ in
debug = mkOption {
default = false;
- description = "
- pass -d and -7 to automount and write log to /var/log/autofs
- ";
+ description = ''
+ Pass -d and -7 to automount and write log to the system journal.
+ '';
};
};
diff --git a/nixos/modules/services/misc/autorandr.nix b/nixos/modules/services/misc/autorandr.nix
index 792a4c8375d..3020130ad1f 100644
--- a/nixos/modules/services/misc/autorandr.nix
+++ b/nixos/modules/services/misc/autorandr.nix
@@ -30,4 +30,5 @@ in {
};
+ meta.maintainers = with maintainers; [ gnidorah ];
}
diff --git a/nixos/modules/services/misc/bepasty.nix b/nixos/modules/services/misc/bepasty.nix
index 4d78cddcb54..c499e428af3 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 a920aa22ccd..6b19f780ec0 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/exhibitor.nix b/nixos/modules/services/misc/exhibitor.nix
index 1db42275867..600bd780e7b 100644
--- a/nixos/modules/services/misc/exhibitor.nix
+++ b/nixos/modules/services/misc/exhibitor.nix
@@ -15,9 +15,12 @@ let
election-port=${toString cfg.zkElectionPort}
cleanup-period-ms=${toString cfg.zkCleanupPeriod}
servers-spec=${concatStringsSep "," cfg.zkServersSpec}
- auto-manage-instances=${lib.boolToString cfg.autoManageInstances}
+ auto-manage-instances=${toString cfg.autoManageInstances}
${cfg.extraConf}
'';
+ # NB: toString rather than lib.boolToString on cfg.autoManageInstances is intended.
+ # Exhibitor tests if it's an integer not equal to 0, so the empty string (toString false)
+ # will operate in the same fashion as a 0.
configDir = pkgs.writeTextDir "exhibitor.properties" exhibitorConfig;
cliOptionsCommon = {
configtype = cfg.configType;
diff --git a/nixos/modules/services/misc/fstrim.nix b/nixos/modules/services/misc/fstrim.nix
index e89366cbafe..15f283f093c 100644
--- a/nixos/modules/services/misc/fstrim.nix
+++ b/nixos/modules/services/misc/fstrim.nix
@@ -42,4 +42,5 @@ in {
};
+ meta.maintainers = with maintainers; [ gnidorah ];
}
diff --git a/nixos/modules/services/misc/geoip-updater.nix b/nixos/modules/services/misc/geoip-updater.nix
index 5135fac8f7d..760fa66e80d 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/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index ccc1854d254..d6c8ac54724 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 2048openssl genpkey -algorithm RSA -out - -pkeyopt rsa_keygen_bits: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,12 +565,11 @@ 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
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
@@ -499,7 +577,8 @@ in {
# 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
chown -R ${cfg.user}:${cfg.group} /run/gitlab
@@ -507,7 +586,6 @@ in {
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 +610,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 gitlab -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 +626,15 @@ 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
# 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}
'';
serviceConfig = {
@@ -566,7 +645,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/gitolite.nix b/nixos/modules/services/misc/gitolite.nix
index 5012bed0c42..6bb8adeccf7 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
{
@@ -48,6 +49,35 @@ 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.
+ '';
+ };
+
user = mkOption {
type = types.str;
default = "gitolite";
@@ -55,41 +85,119 @@ 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 {
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 ];
- };
+ });
}
diff --git a/nixos/modules/services/misc/gogs.nix b/nixos/modules/services/misc/gogs.nix
index ad2e36d04d5..d6e827a53fd 100644
--- a/nixos/modules/services/misc/gogs.nix
+++ b/nixos/modules/services/misc/gogs.nix
@@ -257,7 +257,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 00000000000..81fb024f909
--- /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 00000000000..6051c884465
--- /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/redmine.nix b/nixos/modules/services/misc/redmine.nix
index e3f1ec67cbb..3997b3f0dca 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/ripple-rest.nix b/nixos/modules/services/misc/ripple-rest.nix
deleted file mode 100644
index 49520f68a50..00000000000
--- a/nixos/modules/services/misc/ripple-rest.nix
+++ /dev/null
@@ -1,110 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-with lib;
-
-let
- cfg = config.services.rippleRest;
-
- configFile = pkgs.writeText "ripple-rest-config.json" (builtins.toJSON {
- config_version = "2.0.3";
- debug = cfg.debug;
- port = cfg.port;
- host = cfg.host;
- ssl_enabled = cfg.ssl.enable;
- ssl = {
- key_path = cfg.ssl.keyPath;
- cert_path = cfg.ssl.certPath;
- reject_unathorized = cfg.ssl.rejectUnathorized;
- };
- db_path = cfg.dbPath;
- max_transaction_fee = cfg.maxTransactionFee;
- rippled_servers = cfg.rippleds;
- });
-
-in {
- options.services.rippleRest = {
- enable = mkEnableOption "ripple rest";
-
- debug = mkEnableOption "debug for ripple-rest";
-
- host = mkOption {
- description = "Ripple rest host.";
- default = "localhost";
- type = types.str;
- };
-
- port = mkOption {
- description = "Ripple rest port.";
- default = 5990;
- type = types.int;
- };
-
- ssl = {
- enable = mkEnableOption "ssl";
-
- keyPath = mkOption {
- description = "Path to the ripple rest key file.";
- default = null;
- type = types.nullOr types.path;
- };
-
-
- certPath = mkOption {
- description = "Path to the ripple rest cert file.";
- default = null;
- type = types.nullOr types.path;
- };
-
- rejectUnathorized = mkOption {
- description = "Whether to reject unatohroized.";
- default = true;
- type = types.bool;
- };
- };
-
- dbPath = mkOption {
- description = "Ripple rest database path.";
- default = "${cfg.dataDir}/ripple-rest.db";
- type = types.path;
- };
-
- maxTransactionFee = mkOption {
- description = "Ripple rest max transaction fee.";
- default = 1000000;
- type = types.int;
- };
-
- rippleds = mkOption {
- description = "List of rippled servers.";
- default = [
- "wss://s1.ripple.com:443"
- ];
- type = types.listOf types.str;
- };
-
- dataDir = mkOption {
- description = "Ripple rest data directory.";
- default = "/var/lib/ripple-rest";
- type = types.path;
- };
- };
-
- config = mkIf (cfg.enable) {
- systemd.services.ripple-rest = {
- wantedBy = [ "multi-user.target"];
- after = ["network.target" ];
- environment.NODE_PATH="${pkgs.ripple-rest}/lib/node_modules/ripple-rest/node_modules";
- serviceConfig = {
- ExecStart = "${pkgs.nodejs}/bin/node ${pkgs.ripple-rest}/lib/node_modules/ripple-rest/server/server.js --config ${configFile}";
- User = "ripple-rest";
- };
- };
-
- users.extraUsers.postgres = {
- name = "ripple-rest";
- uid = config.ids.uids.ripple-rest;
- createHome = true;
- home = cfg.dataDir;
- };
- };
-}
diff --git a/nixos/modules/services/misc/zookeeper.nix b/nixos/modules/services/misc/zookeeper.nix
index b7bca8b56b2..d85b5e4ec50 100644
--- a/nixos/modules/services/misc/zookeeper.nix
+++ b/nixos/modules/services/misc/zookeeper.nix
@@ -4,7 +4,7 @@ with lib;
let
cfg = config.services.zookeeper;
-
+
zookeeperConfig = ''
dataDir=${cfg.dataDir}
clientPort=${toString cfg.port}
@@ -49,7 +49,7 @@ in {
default = 1;
type = types.int;
};
-
+
extraConf = mkOption {
description = "Extra configuration for Zookeeper.";
type = types.lines;
@@ -119,7 +119,7 @@ in {
ExecStart = ''
${pkgs.jre}/bin/java \
-cp "${pkgs.zookeeper}/lib/*:${pkgs.zookeeper}/${pkgs.zookeeper.name}.jar:${configDir}" \
- ${toString cfg.extraCmdLineOptions} \
+ ${escapeShellArgs cfg.extraCmdLineOptions} \
-Dzookeeper.datadir.autocreate=false \
${optionalString cfg.preferIPv4 "-Djava.net.preferIPv4Stack=true"} \
org.apache.zookeeper.server.quorum.QuorumPeerMain \
diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix
index b26bcba6405..723b04dc0fe 100644
--- a/nixos/modules/services/monitoring/munin.nix
+++ b/nixos/modules/services/monitoring/munin.nix
@@ -26,7 +26,9 @@ let
for file in $out/*; do
case "$file" in
- plugin.sh) continue;;
+ */plugin.sh|*/plugins.history)
+ chmod +x "$file"
+ continue;;
esac
# read magic makers from the file
diff --git a/nixos/modules/services/monitoring/osquery.nix b/nixos/modules/services/monitoring/osquery.nix
new file mode 100644
index 00000000000..ba0dc4c2176
--- /dev/null
+++ b/nixos/modules/services/monitoring/osquery.nix
@@ -0,0 +1,91 @@
+{ config, lib, pkgs, ... }:
+
+with builtins;
+with lib;
+
+let
+ cfg = config.services.osquery;
+
+in
+
+{
+
+ options = {
+
+ services.osquery = {
+
+ enable = mkEnableOption "osquery";
+
+ loggerPath = mkOption {
+ type = types.path;
+ description = "Base directory used for logging.";
+ default = "/var/log/osquery";
+ };
+
+ pidfile = mkOption {
+ type = types.path;
+ description = "Path used for pid file.";
+ default = "/var/osquery/osqueryd.pidfile";
+ };
+
+ utc = mkOption {
+ type = types.bool;
+ description = "Attempt to convert all UNIX calendar times to UTC.";
+ default = true;
+ };
+
+ databasePath = mkOption {
+ type = types.path;
+ description = "Path used for database file.";
+ default = "/var/osquery/osquery.db";
+ };
+
+ extraConfig = mkOption {
+ type = types.attrs // {
+ merge = loc: foldl' (res: def: recursiveUpdate res def.value) {};
+ };
+ description = "Extra config to be recursively merged into the JSON config file.";
+ default = { };
+ };
+ };
+
+ };
+
+ config = mkIf cfg.enable {
+
+ environment.systemPackages = [ pkgs.osquery ];
+
+ environment.etc."osquery/osquery.conf".text = toJSON (
+ recursiveUpdate {
+ options = {
+ config_plugin = "filesystem";
+ logger_plugin = "filesystem";
+ logger_path = cfg.loggerPath;
+ database_path = cfg.databasePath;
+ utc = cfg.utc;
+ };
+ } cfg.extraConfig
+ );
+
+ systemd.services.osqueryd = {
+ description = "The osquery Daemon";
+ after = [ "network.target" "syslog.service" ];
+ wantedBy = [ "multi-user.target" ];
+ path = [ pkgs.osquery ];
+ preStart = ''
+ mkdir -p ${escapeShellArg cfg.loggerPath}
+ mkdir -p "$(dirname ${escapeShellArg cfg.pidfile})"
+ mkdir -p "$(dirname ${escapeShellArg cfg.databasePath})"
+ '';
+ serviceConfig = {
+ TimeoutStartSec = 0;
+ ExecStart = "${pkgs.osquery}/bin/osqueryd --logger_path ${escapeShellArg cfg.loggerPath} --pidfile ${escapeShellArg cfg.pidfile} --database_path ${escapeShellArg cfg.databasePath}";
+ KillMode = "process";
+ KillSignal = "SIGTERM";
+ Restart = "on-failure";
+ };
+ };
+
+ };
+
+}
diff --git a/nixos/modules/services/monitoring/prometheus/blackbox-exporter.nix b/nixos/modules/services/monitoring/prometheus/blackbox-exporter.nix
index 388e4d4ac01..ce2e1cf2d74 100644
--- a/nixos/modules/services/monitoring/prometheus/blackbox-exporter.nix
+++ b/nixos/modules/services/monitoring/prometheus/blackbox-exporter.nix
@@ -57,8 +57,8 @@ in {
AmbientCapabilities = [ "CAP_NET_RAW" ]; # for ping probes
ExecStart = ''
${pkgs.prometheus-blackbox-exporter}/bin/blackbox_exporter \
- -web.listen-address :${toString cfg.port} \
- -config.file ${cfg.configFile} \
+ --web.listen-address :${toString cfg.port} \
+ --config.file ${cfg.configFile} \
${concatStringsSep " \\\n " cfg.extraFlags}
'';
ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
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 00000000000..f8a5b9576a1
--- /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/node-exporter.nix b/nixos/modules/services/monitoring/prometheus/node-exporter.nix
index 0cf0b85afb5..b5b852438d7 100644
--- a/nixos/modules/services/monitoring/prometheus/node-exporter.nix
+++ b/nixos/modules/services/monitoring/prometheus/node-exporter.nix
@@ -33,7 +33,7 @@ in {
default = [];
example = ''[ "systemd" ]'';
description = ''
- Collectors to enable, additionally to the defaults.
+ Collectors to enable. Only collectors explicitly listed here will be enabled.
'';
};
diff --git a/nixos/modules/services/monitoring/prometheus/unifi-exporter.nix b/nixos/modules/services/monitoring/prometheus/unifi-exporter.nix
index e3059e48509..0a56d6ae95a 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 f7fed793066..e7f52bc4a7d 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
@@ -30,6 +46,41 @@ in
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.";
+ };
+ };
+ });
+ };
};
};
@@ -40,7 +91,14 @@ in
services.rpcbind.enable = true;
+ 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";
@@ -50,11 +108,21 @@ in
after = [ "rpcbind.service" "network.target" "local-fs.target" ];
before = [ "network-online.target" ];
- # The copying of hooks is due to upstream bug https://bugzilla.redhat.com/show_bug.cgi?id=1452761
preStart = ''
install -m 0755 -d /var/log/glusterfs
+ ''
+ # 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 = {
@@ -67,6 +135,7 @@ in
};
systemd.services.glustereventsd = {
+ inherit restartTriggers;
description = "Gluster Events Notifier";
diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix
index 10c1d751ac5..36e5efecf43 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,49 @@ 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" ];
+ 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 {
@@ -90,6 +170,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;
+ };
+
};
};
@@ -97,6 +185,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 = {
@@ -109,82 +200,57 @@ 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 = {
+ # 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 = [ "multi-user.target" ];
+ wantedBy = mkIf (cfg.defaultMode == "online") [ "multi-user.target" ];
after = [ "network.target" "local-fs.target" "ipfs-init.service" ];
-
- conflicts = [ "ipfs-offline.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;
- };
+ conflicts = [ "ipfs-offline.service" "ipfs-norouting.service"];
};
- 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" ];
- 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;
- };
+ conflicts = [ "ipfs.service" "ipfs-norouting.service"];
};
+
+ 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"];
+ };
+
};
}
diff --git a/nixos/modules/services/network-filesystems/nfsd.nix b/nixos/modules/services/network-filesystems/nfsd.nix
index 7d127145101..1a78f9a76a3 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 f7c58c92863..94f93162cfe 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" {} ''
diff --git a/nixos/modules/services/network-filesystems/rsyncd.nix b/nixos/modules/services/network-filesystems/rsyncd.nix
index 2018bfa14a5..054057d52ab 100644
--- a/nixos/modules/services/network-filesystems/rsyncd.nix
+++ b/nixos/modules/services/network-filesystems/rsyncd.nix
@@ -8,22 +8,21 @@ let
motdFile = builtins.toFile "rsyncd-motd" cfg.motd;
- moduleConfig = name:
- let module = getAttr name cfg.modules; in
- "[${name}]\n " + (toString (
- map
- (key: "${key} = ${toString (getAttr key module)}\n")
- (attrNames module)
- ));
+ foreach = attrs: f:
+ concatStringsSep "\n" (mapAttrsToList f attrs);
- cfgFile = builtins.toFile "rsyncd.conf"
- ''
+ cfgFile = ''
${optionalString (cfg.motd != "") "motd file = ${motdFile}"}
${optionalString (cfg.address != "") "address = ${cfg.address}"}
${optionalString (cfg.port != 873) "port = ${toString cfg.port}"}
${cfg.extraConfig}
- ${toString (map moduleConfig (attrNames cfg.modules))}
- '';
+ ${foreach cfg.modules (name: module: ''
+ [${name}]
+ ${foreach module (k: v:
+ "${k} = ${v}"
+ )}
+ '')}
+ '';
in
{
@@ -84,6 +83,24 @@ in
};
};
+ user = mkOption {
+ type = types.str;
+ default = "root";
+ description = ''
+ The user to run the daemon as.
+ By default the daemon runs as root.
+ '';
+ };
+
+ group = mkOption {
+ type = types.str;
+ default = "root";
+ description = ''
+ The group to run the daemon as.
+ By default the daemon runs as root.
+ '';
+ };
+
};
};
@@ -91,16 +108,17 @@ in
config = mkIf cfg.enable {
- environment.etc = singleton {
- source = cfgFile;
- target = "rsyncd.conf";
- };
+ environment.etc."rsyncd.conf".text = cfgFile;
systemd.services.rsyncd = {
description = "Rsync daemon";
wantedBy = [ "multi-user.target" ];
- serviceConfig.ExecStart = "${pkgs.rsync}/bin/rsync --daemon --no-detach";
+ restartTriggers = [ config.environment.etc."rsyncd.conf".source ];
+ serviceConfig = {
+ ExecStart = "${pkgs.rsync}/bin/rsync --daemon --no-detach";
+ User = cfg.user;
+ Group = cfg.group;
+ };
};
-
};
}
diff --git a/nixos/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix
index 87c4f7a8ebc..9b9c91a4f16 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}
@@ -243,7 +243,7 @@ in
};
};
- security.pam.services.sambda = {};
+ security.pam.services.samba = {};
})
];
diff --git a/nixos/modules/services/network-filesystems/tahoe.nix b/nixos/modules/services/network-filesystems/tahoe.nix
index 9815a5434ee..80b34c48f1d 100644
--- a/nixos/modules/services/network-filesystems/tahoe.nix
+++ b/nixos/modules/services/network-filesystems/tahoe.nix
@@ -237,13 +237,13 @@ in
# arguments to $(tahoe start). The node directory must come first,
# and arguments which alter Twisted's behavior come afterwards.
ExecStart = ''
- ${settings.package}/bin/tahoe start ${nodedir} -n -l- --pidfile=${pidfile}
+ ${settings.package}/bin/tahoe start ${lib.escapeShellArg nodedir} -n -l- --pidfile=${lib.escapeShellArg pidfile}
'';
};
preStart = ''
- if [ \! -d ${nodedir} ]; then
+ if [ ! -d ${lib.escapeShellArg nodedir} ]; then
mkdir -p /var/db/tahoe-lafs
- tahoe create-introducer ${nodedir}
+ tahoe create-introducer ${lib.escapeShellArg nodedir}
fi
# Tahoe has created a predefined tahoe.cfg which we must now
@@ -252,7 +252,7 @@ in
# we must do this on every prestart. Fixes welcome.
# rm ${nodedir}/tahoe.cfg
# ln -s /etc/tahoe-lafs/introducer-${node}.cfg ${nodedir}/tahoe.cfg
- cp /etc/tahoe-lafs/introducer-${node}.cfg ${nodedir}/tahoe.cfg
+ cp /etc/tahoe-lafs/introducer-"${node}".cfg ${lib.escapeShellArg nodedir}/tahoe.cfg
'';
});
users.extraUsers = flip mapAttrs' cfg.introducers (node: _:
@@ -337,13 +337,13 @@ in
# arguments to $(tahoe start). The node directory must come first,
# and arguments which alter Twisted's behavior come afterwards.
ExecStart = ''
- ${settings.package}/bin/tahoe start ${nodedir} -n -l- --pidfile=${pidfile}
+ ${settings.package}/bin/tahoe start ${lib.escapeShellArg nodedir} -n -l- --pidfile=${lib.escapeShellArg pidfile}
'';
};
preStart = ''
- if [ \! -d ${nodedir} ]; then
+ if [ ! -d ${lib.escapeShellArg nodedir} ]; then
mkdir -p /var/db/tahoe-lafs
- tahoe create-node --hostname=localhost ${nodedir}
+ tahoe create-node --hostname=localhost ${lib.escapeShellArg nodedir}
fi
# Tahoe has created a predefined tahoe.cfg which we must now
@@ -351,8 +351,8 @@ in
# XXX I thought that a symlink would work here, but it doesn't, so
# we must do this on every prestart. Fixes welcome.
# rm ${nodedir}/tahoe.cfg
- # ln -s /etc/tahoe-lafs/${node}.cfg ${nodedir}/tahoe.cfg
- cp /etc/tahoe-lafs/${node}.cfg ${nodedir}/tahoe.cfg
+ # ln -s /etc/tahoe-lafs/${lib.escapeShellArg node}.cfg ${nodedir}/tahoe.cfg
+ cp /etc/tahoe-lafs/${lib.escapeShellArg node}.cfg ${lib.escapeShellArg nodedir}/tahoe.cfg
'';
});
users.extraUsers = flip mapAttrs' cfg.nodes (node: _:
diff --git a/nixos/modules/services/networking/avahi-daemon.nix b/nixos/modules/services/networking/avahi-daemon.nix
index f4d0fc822de..9ccdacb20e9 100644
--- a/nixos/modules/services/networking/avahi-daemon.nix
+++ b/nixos/modules/services/networking/avahi-daemon.nix
@@ -22,6 +22,7 @@ let
${optionalString (interfaces!=null) "allow-interfaces=${concatStringsSep "," interfaces}"}
${optionalString (domainName!=null) "domain-name=${domainName}"}
allow-point-to-point=${yesNo allowPointToPoint}
+ ${optionalString (cacheEntriesMax!=null) "cache-entries-max=${toString cacheEntriesMax}"}
[wide-area]
enable-wide-area=${yesNo wideArea}
@@ -166,6 +167,15 @@ in
'';
};
+ cacheEntriesMax = mkOption {
+ default = null;
+ type = types.nullOr types.int;
+ description = ''
+ Number of resource records to be cached per interface. Use 0 to
+ disable caching. Avahi daemon defaults to 4096 if not set.
+ '';
+ };
+
};
};
diff --git a/nixos/modules/services/networking/coturn.nix b/nixos/modules/services/networking/coturn.nix
index 65273a4bf93..b3c64490d97 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/ddclient.nix b/nixos/modules/services/networking/ddclient.nix
index 28c96a9baef..9e56545f746 100644
--- a/nixos/modules/services/networking/ddclient.nix
+++ b/nixos/modules/services/networking/ddclient.nix
@@ -1,17 +1,33 @@
{ config, pkgs, lib, ... }:
let
+ cfg = config.services.ddclient;
+ boolToStr = bool: if bool then "yes" else "no";
- inherit (lib) mkOption mkIf singleton;
- inherit (pkgs) ddclient;
-
- stateDir = "/var/spool/ddclient";
- ddclientUser = "ddclient";
- ddclientFlags = "-foreground -file ${config.services.ddclient.configFile}";
- ddclientPIDFile = "${stateDir}/ddclient.pid";
+ configText = ''
+ # This file can be used as a template for configFile or is automatically generated by Nix options.
+ daemon=${toString cfg.interval}
+ cache=${cfg.homeDir}/ddclient.cache
+ pid=/run/ddclient/ddclient.pid
+ foreground=NO
+ use=${cfg.use}
+ login=${cfg.username}
+ password=${cfg.password}
+ protocol=${cfg.protocol}
+ ${let server = cfg.server; in
+ lib.optionalString (server != "") "server=${server}"}
+ ssl=${boolToStr cfg.ssl}
+ wildcard=YES
+ quiet=${boolToStr cfg.quiet}
+ verbose=${boolToStr cfg.verbose}
+ ${cfg.domain}
+ ${cfg.extraConfig}
+ '';
in
+with lib;
+
{
###### interface
@@ -28,6 +44,12 @@ in
'';
};
+ homeDir = mkOption {
+ default = "/var/lib/ddclient";
+ type = str;
+ description = "Home directory for the daemon user.";
+ };
+
domain = mkOption {
default = "";
type = str;
@@ -52,6 +74,12 @@ in
'';
};
+ interval = mkOption {
+ default = 600;
+ type = int;
+ description = "The interval at which to run the check and update.";
+ };
+
configFile = mkOption {
default = "/etc/ddclient.conf";
type = path;
@@ -126,37 +154,24 @@ in
config = mkIf config.services.ddclient.enable {
- environment.systemPackages = [ ddclient ];
+ users = {
+ extraGroups.ddclient.gid = config.ids.gids.ddclient;
- users.extraUsers = singleton {
- name = ddclientUser;
- uid = config.ids.uids.ddclient;
- description = "ddclient daemon user";
- home = stateDir;
+ extraUsers.ddclient = {
+ uid = config.ids.uids.ddclient;
+ description = "ddclient daemon user";
+ group = "ddclient";
+ home = cfg.homeDir;
+ createHome = true;
+ };
};
environment.etc."ddclient.conf" = {
- enable = config.services.ddclient.configFile == "/etc/ddclient.conf";
+ enable = cfg.configFile == "/etc/ddclient.conf";
uid = config.ids.uids.ddclient;
+ gid = config.ids.gids.ddclient;
mode = "0600";
- text = ''
- # This file can be used as a template for configFile or is automatically generated by Nix options.
- daemon=600
- cache=${stateDir}/ddclient.cache
- pid=${ddclientPIDFile}
- use=${config.services.ddclient.use}
- login=${config.services.ddclient.username}
- password=${config.services.ddclient.password}
- protocol=${config.services.ddclient.protocol}
- ${let server = config.services.ddclient.server; in
- lib.optionalString (server != "") "server=${server}"}
- ssl=${if config.services.ddclient.ssl then "yes" else "no"}
- wildcard=YES
- quiet=${if config.services.ddclient.quiet then "yes" else "no"}
- verbose=${if config.services.ddclient.verbose then "yes" else "no"}
- ${config.services.ddclient.domain}
- ${config.services.ddclient.extraConfig}
- '';
+ text = configText;
};
systemd.services.ddclient = {
@@ -166,17 +181,14 @@ in
restartTriggers = [ config.environment.etc."ddclient.conf".source ];
serviceConfig = {
- # Uncomment this if too many problems occur:
- # Type = "forking";
- User = ddclientUser;
- Group = "nogroup"; #TODO get this to work
- PermissionsStartOnly = "true";
- PIDFile = ddclientPIDFile;
- ExecStartPre = ''
- ${pkgs.stdenv.shell} -c "${pkgs.coreutils}/bin/mkdir -m 0755 -p ${stateDir} && ${pkgs.coreutils}/bin/chown ${ddclientUser} ${stateDir}"
- '';
- ExecStart = "${ddclient}/bin/ddclient ${ddclientFlags}";
- #ExecStartPost = "${pkgs.coreutils}/bin/rm -r ${stateDir}"; # Should we have this?
+ RuntimeDirectory = "ddclient";
+ # we cannot run in forking mode as it swallows all the program output
+ Type = "simple";
+ User = "ddclient";
+ Group = "ddclient";
+ ExecStart = "${lib.getBin pkgs.ddclient}/bin/ddclient -foreground -file ${cfg.configFile}";
+ ProtectSystem = "full";
+ PrivateTmp = true;
};
};
};
diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix
index cdba14be21f..d283c762433 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 00000000000..f782be97f6f
--- /dev/null
+++ b/nixos/modules/services/networking/dnscache.nix
@@ -0,0 +1,86 @@
+{ 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)}
+
+ # djbdns contains an outdated list of root servers;
+ # if one was not provided in config, provide a current list
+ if [ ! -e servers/@ ]; then
+ awk '/^.?.ROOT-SERVERS.NET/ { print $4 }' ${pkgs.dns-root-data}/root.hints > $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/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix
index 077aeca457e..ed658258c7f 100644
--- a/nixos/modules/services/networking/dnscrypt-proxy.nix
+++ b/nixos/modules/services/networking/dnscrypt-proxy.nix
@@ -82,14 +82,13 @@ in
};
resolverName = mkOption {
- default = "dnscrypt.eu-nl";
+ default = "random";
+ example = "dnscrypt.eu-nl";
type = types.nullOr types.str;
description = ''
The name of the DNSCrypt resolver to use, taken from
- ${resolverList}. The default
- resolver is located in Holland, supports DNS security
- extensions, and claims to not
- keep logs.
+ ${resolverList}. The default is to
+ pick a random non-logging resolver that supports DNSSEC.
'';
};
diff --git a/nixos/modules/services/networking/dnscrypt-wrapper.nix b/nixos/modules/services/networking/dnscrypt-wrapper.nix
index 85fac660d52..23cc92946e4 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/fan.nix b/nixos/modules/services/networking/fan.nix
deleted file mode 100644
index 7f4e3647832..00000000000
--- 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 3a95b9c4ec9..a9f3fd65d76 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
@@ -119,22 +136,52 @@ in
config = mkIf cfg.enable {
- systemd.services.syncserver = {
+ systemd.services.syncserver = let
+ syncServerEnv = pkgs.python.withPackages(ps: with ps; [ syncserver pasteScript ]);
+ in {
after = [ "network.target" ];
description = "Firefox Sync Server";
wantedBy = [ "multi-user.target" ];
- path = [ pkgs.pythonPackages.pasteScript pkgs.coreutils ];
- environment.PYTHONPATH = "${pkgs.pythonPackages.syncserver}/lib/${pkgs.pythonPackages.python.libPrefix}/site-packages";
+ 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 = "${pkgs.pythonPackages.pasteScript}/bin/paster serve ${syncServerIni}";
+ 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 00000000000..0b34f0b6b8b
--- /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/i2pd.nix b/nixos/modules/services/networking/i2pd.nix
index 7622f030f83..ca2e2a065dc 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}"}
+ i2pdConf = pkgs.writeText "i2pd.conf" ''
+ # DO NOT EDIT -- this file has been generated automatically.
+ loglevel = ${cfg.logLevel}
- [limits]
- transittunnels = ${toString cfg.limits.transittunnels}
+ 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}"}
- [upnp]
- enabled = ${boolToString cfg.upnp.enable}
- name = ${cfg.upnp.name}
+ [limits]
+ transittunnels = ${toString cfg.limits.transittunnels}
- [precomputation]
- elgamal = ${boolToString cfg.precomputation.elgamal}
+ [upnp]
+ enabled = ${boolToString cfg.upnp.enable}
+ name = ${cfg.upnp.name}
- [reseed]
- verify = ${boolToString cfg.reseed.verify}
- file = ${cfg.reseed.file}
- urls = ${builtins.concatStringsSep "," cfg.reseed.urls}
+ [precomputation]
+ elgamal = ${boolToString cfg.precomputation.elgamal}
- [addressbook]
- defaulturl = ${cfg.addressbook.defaulturl}
- subscriptions = ${builtins.concatStringsSep "," cfg.addressbook.subscriptions}
- ${flip concatMapStrings
+ [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/lldpd.nix b/nixos/modules/services/networking/lldpd.nix
index 4f951d843e2..ba4e1b1542f 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 00000000000..5526e2ba23a
--- /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 775564a2c44..00000000000
--- 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/mosquitto.nix b/nixos/modules/services/networking/mosquitto.nix
index 5451500b56f..81915b5a2ef 100644
--- a/nixos/modules/services/networking/mosquitto.nix
+++ b/nixos/modules/services/networking/mosquitto.nix
@@ -125,8 +125,8 @@ in
description = ''
Specifies the hashed password for the MQTT User.
overrides .
- To generate hashed password install mkpasswd
- package and run mkpasswd -m sha-512.
+ To generate hashed password install mosquitto
+ package and use mosquitto_passwd.
'';
};
diff --git a/nixos/modules/services/networking/namecoind.nix b/nixos/modules/services/networking/namecoind.nix
index 9df9f67cde8..11f7d7e5cae 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/nat.nix b/nixos/modules/services/networking/nat.nix
index 08ba2fdb164..366bb2ed7a8 100644
--- a/nixos/modules/services/networking/nat.nix
+++ b/nixos/modules/services/networking/nat.nix
@@ -48,7 +48,7 @@ let
# NAT from external ports to internal ports.
${concatMapStrings (fwd: ''
iptables -w -t nat -A nixos-nat-pre \
- -i ${cfg.externalInterface} -p tcp \
+ -i ${cfg.externalInterface} -p ${fwd.proto} \
--dport ${builtins.toString fwd.sourcePort} \
-j DNAT --to-destination ${fwd.destination}
'') cfg.forwardPorts}
@@ -133,12 +133,19 @@ in
destination = mkOption {
type = types.str;
example = "10.0.0.1:80";
- description = "Forward tcp connection to destination ip:port";
+ description = "Forward connection to destination ip:port";
+ };
+
+ proto = mkOption {
+ type = types.str;
+ default = "tcp";
+ example = "udp";
+ description = "Protocol of forwarded connection";
};
};
});
default = [];
- example = [ { sourcePort = 8080; destination = "10.0.0.1:80"; } ];
+ example = [ { sourcePort = 8080; destination = "10.0.0.1:80"; proto = "tcp"; } ];
description =
''
List of forwarded ports from the external interface to
@@ -151,38 +158,41 @@ in
###### implementation
- config = mkIf config.networking.nat.enable {
+ config = mkMerge [
+ { networking.firewall.extraCommands = mkBefore flushNat; }
+ (mkIf config.networking.nat.enable {
- environment.systemPackages = [ pkgs.iptables ];
+ environment.systemPackages = [ pkgs.iptables ];
- boot = {
- kernelModules = [ "nf_nat_ftp" ];
- kernel.sysctl = {
- "net.ipv4.conf.all.forwarding" = mkOverride 99 true;
- "net.ipv4.conf.default.forwarding" = mkOverride 99 true;
- };
- };
-
- networking.firewall = mkIf config.networking.firewall.enable {
- extraCommands = mkMerge [ (mkBefore flushNat) setupNat ];
- extraStopCommands = flushNat;
- };
-
- systemd.services = mkIf (!config.networking.firewall.enable) { nat = {
- description = "Network Address Translation";
- wantedBy = [ "network.target" ];
- after = [ "network-pre.target" "systemd-modules-load.service" ];
- path = [ pkgs.iptables ];
- unitConfig.ConditionCapability = "CAP_NET_ADMIN";
-
- serviceConfig = {
- Type = "oneshot";
- RemainAfterExit = true;
+ boot = {
+ kernelModules = [ "nf_nat_ftp" ];
+ kernel.sysctl = {
+ "net.ipv4.conf.all.forwarding" = mkOverride 99 true;
+ "net.ipv4.conf.default.forwarding" = mkOverride 99 true;
+ };
};
- script = flushNat + setupNat;
+ networking.firewall = mkIf config.networking.firewall.enable {
+ extraCommands = setupNat;
+ extraStopCommands = flushNat;
+ };
- postStop = flushNat;
- }; };
- };
+ systemd.services = mkIf (!config.networking.firewall.enable) { nat = {
+ description = "Network Address Translation";
+ wantedBy = [ "network.target" ];
+ after = [ "network-pre.target" "systemd-modules-load.service" ];
+ path = [ pkgs.iptables ];
+ unitConfig.ConditionCapability = "CAP_NET_ADMIN";
+
+ serviceConfig = {
+ Type = "oneshot";
+ RemainAfterExit = true;
+ };
+
+ script = flushNat + setupNat;
+
+ postStop = flushNat;
+ }; };
+ })
+ ];
}
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index ab161b7e772..e03309c8729 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -12,6 +12,7 @@ let
dns =
if cfg.useDnsmasq then "dnsmasq"
else if config.services.resolved.enable then "systemd-resolved"
+ else if config.services.unbound.enable then "unbound"
else "default";
configFile = writeText "NetworkManager.conf" ''
@@ -129,7 +130,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;
};
@@ -254,6 +256,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";
@@ -277,6 +282,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 ef860e7e5df..391f4bdebba 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/searx.nix b/nixos/modules/services/networking/searx.nix
index e0eef9ed96f..c7a128ae212 100644
--- a/nixos/modules/services/networking/searx.nix
+++ b/nixos/modules/services/networking/searx.nix
@@ -33,8 +33,8 @@ in
package = mkOption {
type = types.package;
- default = pkgs.pythonPackages.searx;
- defaultText = "pkgs.pythonPackages.searx";
+ default = pkgs.searx;
+ defaultText = "pkgs.searx";
description = "searx package to use.";
};
diff --git a/nixos/modules/services/networking/squid.nix b/nixos/modules/services/networking/squid.nix
new file mode 100644
index 00000000000..b220c21b604
--- /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 0f58536b4b7..8828429a817 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/supplicant.nix b/nixos/modules/services/networking/supplicant.nix
index 31d11548f19..dc90a4bcc62 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 7376d2d24a0..d5db328310c 100644
--- a/nixos/modules/services/networking/tinc.nix
+++ b/nixos/modules/services/networking/tinc.nix
@@ -131,7 +131,7 @@ in
(flip mapAttrsToList cfg.networks (network: data:
flip mapAttrs' data.hosts (host: text: nameValuePair
("tinc/${network}/hosts/${host}")
- ({ mode = "0444"; inherit text; })
+ ({ mode = "0644"; user = "tinc.${network}"; inherit text; })
) // {
"tinc/${network}/tinc.conf" = {
mode = "0444";
@@ -164,15 +164,14 @@ in
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
path = [ data.package ];
- restartTriggers = [ config.environment.etc."tinc/${network}/tinc.conf".source ]
- ++ mapAttrsToList (host: _ : config.environment.etc."tinc/${network}/hosts/${host}".source) data.hosts;
serviceConfig = {
Type = "simple";
- PIDFile = "/run/tinc.${network}.pid";
- Restart = "on-failure";
+ Restart = "always";
+ RestartSec = "3";
};
preStart = ''
mkdir -p /etc/tinc/${network}/hosts
+ chown tinc.${network} /etc/tinc/${network}/hosts
# Determine how we should generate our keys
if type tinc >/dev/null 2>&1; then
@@ -194,6 +193,21 @@ in
})
);
+ environment.systemPackages = let
+ cli-wrappers = pkgs.stdenv.mkDerivation {
+ name = "tinc-cli-wrappers";
+ buildInputs = [ pkgs.makeWrapper ];
+ buildCommand = ''
+ mkdir -p $out/bin
+ ${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)}
+ '';
+ };
+ in [ cli-wrappers ];
+
users.extraUsers = flip mapAttrs' cfg.networks (network: _:
nameValuePair ("tinc.${network}") ({
description = "Tinc daemon user for ${network}";
diff --git a/nixos/modules/services/networking/tinydns.nix b/nixos/modules/services/networking/tinydns.nix
new file mode 100644
index 00000000000..184888ef05d
--- /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/tlsdated.nix b/nixos/modules/services/networking/tlsdated.nix
deleted file mode 100644
index 757cce28760..00000000000
--- a/nixos/modules/services/networking/tlsdated.nix
+++ /dev/null
@@ -1,111 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
- inherit (pkgs) coreutils tlsdate;
-
- cfg = config.services.tlsdated;
-in
-
-{
-
- ###### interface
-
- options = {
-
- services.tlsdated = {
-
- enable = mkOption {
- type = types.bool;
- default = false;
- description = ''
- Enable tlsdated daemon.
- '';
- };
-
- extraOptions = mkOption {
- type = types.string;
- default = "";
- description = ''
- Additional command line arguments to pass to tlsdated.
- '';
- };
-
- sources = mkOption {
- type = types.listOf (types.submodule {
- options = {
- host = mkOption {
- type = types.string;
- description = ''
- Remote hostname.
- '';
- };
- port = mkOption {
- type = types.int;
- description = ''
- Remote port.
- '';
- };
- proxy = mkOption {
- type = types.nullOr types.string;
- default = null;
- description = ''
- The proxy argument expects HTTP, SOCKS4A or SOCKS5 formatted as followed:
-
- http://127.0.0.1:8118
- socks4a://127.0.0.1:9050
- socks5://127.0.0.1:9050
-
- The proxy support should not leak DNS requests and is suitable for use with Tor.
- '';
- };
- };
- });
- default = [
- {
- host = "encrypted.google.com";
- port = 443;
- proxy = null;
- }
- ];
- description = ''
- You can list one or more sources to fetch time from.
- '';
- };
-
- };
-
- };
-
- ###### implementation
-
- config = mkIf cfg.enable {
-
- # Make tools such as tlsdate available in the system path
- environment.systemPackages = [ tlsdate ];
-
- systemd.services.tlsdated = {
- description = "tlsdated daemon";
- wantedBy = [ "multi-user.target" ];
- serviceConfig = {
- # XXX because pkgs.tlsdate is compiled to run as nobody:nogroup, we
- # hard-code base-path to /tmp and use PrivateTmp.
- ExecStart = "${tlsdate}/bin/tlsdated -f ${pkgs.writeText "tlsdated.confg" ''
- base-path /tmp
-
- ${concatMapStrings (src: ''
- source
- host ${src.host}
- port ${toString src.port}
- proxy ${if src.proxy == null then "none" else src.proxy}
- end
- '') cfg.sources}
- ''} ${cfg.extraOptions}";
- PrivateTmp = "yes";
- };
- };
-
- };
-
-}
diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix
index a8cff638d3b..8e5f0bfc070 100644
--- a/nixos/modules/services/networking/unifi.nix
+++ b/nixos/modules/services/networking/unifi.nix
@@ -3,7 +3,12 @@ with lib;
let
cfg = config.services.unifi;
stateDir = "/var/lib/unifi";
- cmd = "@${pkgs.jre}/bin/java java -jar ${stateDir}/lib/ace.jar";
+ cmd = ''
+ @${pkgs.jre}/bin/java java \
+ ${optionalString (cfg.initialJavaHeapSize != null) "-Xms${(toString cfg.initialJavaHeapSize)}m"} \
+ ${optionalString (cfg.maximumJavaHeapSize != null) "-Xmx${(toString cfg.maximumJavaHeapSize)}m"} \
+ -jar ${stateDir}/lib/ace.jar
+ '';
mountPoints = [
{
what = "${pkgs.unifi}/dl";
@@ -58,6 +63,26 @@ in
'';
};
+ services.unifi.initialJavaHeapSize = mkOption {
+ type = types.nullOr types.int;
+ default = null;
+ example = 1024;
+ description = ''
+ Set the initial heap size for the JVM in MB. If this option isn't set, the
+ JVM will decide this value at runtime.
+ '';
+ };
+
+ services.unifi.maximumJavaHeapSize = mkOption {
+ type = types.nullOr types.int;
+ default = null;
+ example = 4096;
+ description = ''
+ Set the maximimum heap size for the JVM in MB. If this option isn't set, the
+ JVM will decide this value at runtime.
+ '';
+ };
+
};
config = mkIf cfg.enable {
@@ -121,8 +146,8 @@ in
serviceConfig = {
Type = "simple";
- ExecStart = "${cmd} start";
- ExecStop = "${cmd} stop";
+ ExecStart = "${(removeSuffix "\n" cmd)} start";
+ ExecStop = "${(removeSuffix "\n" cmd)} stop";
User = "unifi";
PermissionsStartOnly = true;
UMask = "0077";
diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix
index be832ea45d8..4f54b45639f 100644
--- a/nixos/modules/services/networking/wireguard.nix
+++ b/nixos/modules/services/networking/wireguard.nix
@@ -79,6 +79,16 @@ let
description = "A list of commands called after shutting down the interface.";
};
+ table = mkOption {
+ default = "main";
+ type = types.str;
+ description = ''The kernel routing table to add this interface's
+ associated routes to. Setting this is useful for e.g. policy routing
+ ("ip rule") or virtual routing and forwarding ("ip vrf"). Both numeric
+ table IDs and table names (/etc/rt_tables) can be used. Defaults to
+ "main".'';
+ };
+
peers = mkOption {
default = [];
description = "Peers linked to the interface.";
@@ -207,9 +217,11 @@ let
"${ipCommand} link set up dev ${name}"
- (map (peer: (map (ip:
- "${ipCommand} route replace ${ip} dev ${name}"
- ) peer.allowedIPs)) values.peers)
+ (map (peer:
+ (map (allowedIP:
+ "${ipCommand} route replace ${allowedIP} dev ${name} table ${values.table}"
+ ) peer.allowedIPs)
+ ) values.peers)
values.postSetup
]);
diff --git a/nixos/modules/services/networking/znc.nix b/nixos/modules/services/networking/znc.nix
index 2b9867ade10..763843fdec0 100644
--- a/nixos/modules/services/networking/znc.nix
+++ b/nixos/modules/services/networking/znc.nix
@@ -261,7 +261,7 @@ in
"freenode" = {
server = "chat.freenode.net";
port = 6697;
- ssl = true;
+ useSSL = true;
modules = [ "simple_away" ];
};
};
@@ -276,6 +276,14 @@ in
'';
};
+ openFirewall = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether to open ports in the firewall for ZNC.
+ '';
+ };
+
passBlock = mkOption {
example = defaultPassBlock;
type = types.string;
@@ -350,6 +358,10 @@ in
config = mkIf cfg.enable {
+ networking.firewall = mkIf cfg.openFirewall {
+ allowedTCPPorts = [ cfg.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 855c8930384..4c7f58d1d8b 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/cron.nix b/nixos/modules/services/scheduling/cron.nix
index 7b1a1599e14..6f6977b38a1 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/security/frandom.nix b/nixos/modules/services/security/frandom.nix
deleted file mode 100644
index 2d43d12e541..00000000000
--- 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 49b5c935267..6c53a2df630 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/physlock.nix b/nixos/modules/services/security/physlock.nix
index 0881483967c..30224d7fc6b 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 00000000000..62308428f32
--- /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/tor.nix b/nixos/modules/services/security/tor.nix
index 10596d6431d..bc79d9f2a59 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,19 +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
+ ''}
''}
''
+ # 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;
torRcFile = pkgs.writeText "torrc" torRc;
+
in
{
options = {
@@ -84,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
@@ -121,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.
'';
};
@@ -133,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.
+ .
'';
};
@@ -164,45 +179,147 @@ in
description = ''
Whether to enable relaying TOR traffic for others.
- See https://www.torproject.org/docs/tor-doc-relay for details.
+ See
+ for details.
+
+ Setting this to true requires setting
+
+ and
+
+ options.
'';
};
- isBridge = mkOption {
- type = types.bool;
- default = false;
+ role = mkOption {
+ type = types.enum [ "exit" "relay" "bridge" "private-bridge" ];
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.
+ Your role in Tor network. There're several options:
- A bridge relay can't be an exit relay.
+
+
+ exit
+
+
+ An exit relay. This allows Tor users to access regular
+ Internet services through your public IP.
+
- You need to set relay.enable to true for this option to
- take effect.
+
+ Running an exit relay may expose you to abuse
+ complaints. See
+
+ for more info.
+
- The bridge is set up with an obfuscated transport proxy.
+
+ You can specify which services Tor users may access via
+ your exit relay using option.
+
+
+
- See https://www.torproject.org/bridges.html.en for more info.
- '';
- };
+
+ relay
+
+
+ Regular relay. This allows Tor users to relay onion
+ traffic to other Tor nodes, but not to public
+ Internet.
+
- isExit = mkOption {
- type = types.bool;
- default = false;
- description = ''
- An exit relay allows Tor users to access regular Internet
- services.
+
+ 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.
- 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.
+ 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!).
+
- You can specify which services Tor users may access via
- your exit relay using exitPolicy option.
+
+ 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.
+
+
+
+
'';
};
@@ -229,11 +346,11 @@ in
default = null;
example = "450 GBytes";
description = ''
- Specify maximum bandwidth allowed during an accounting
- period. This allows you to limit overall tor bandwidth
- over some time period. See the
- AccountingMax option by looking at the
- tor manual (man tor) for more.
+ Specify maximum bandwidth allowed during an accounting period. This
+ allows you to limit overall tor bandwidth over some time period.
+ See the AccountingMax option by looking at the
+ tor manual tor
+ 1 for more.
Note this limit applies individually to upload and
download; if you specify "500 GBytes"
@@ -247,16 +364,17 @@ in
default = null;
example = "month 1 1:00";
description = ''
- Specify length of an accounting period. This allows you to
- limit overall tor bandwidth over some time period. See the
- AccountingStart option by looking at
- the tor manual (man tor) for more.
+ Specify length of an accounting period. This allows you to limit
+ overall tor bandwidth over some time period. See the
+ AccountingStart option by looking at the tor
+ manual tor
+ 1 for more.
'';
};
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)
@@ -265,7 +383,7 @@ in
};
bandwidthBurst = mkOption {
- type = types.int;
+ type = types.nullOr types.int;
default = cfg.relay.bandwidthRate;
example = 200;
description = ''
@@ -275,13 +393,24 @@ in
'';
};
- portSpec = mkOption {
- type = types.str;
- example = "143";
+ address = mkOption {
+ type = types.nullOr types.str;
+ default = null;
+ example = "noname.example.com";
description = ''
- What port to advertise for Tor connections. This corresponds
- to the ORPort section in the Tor manual; see
- man tor for more details.
+ 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
+ tor
+ 1 for more details.
At a minimum, you should just specify the port for the
relay to listen on; a common one like 143, 22, 80, or 443
@@ -299,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
@@ -314,15 +445,124 @@ in
'';
};
};
+
+ hiddenServices = mkOption {
+ 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 = 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}";
+ };
+ }));
+ };
+
+ };
+
+ 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 =
@@ -342,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 00000000000..1f2c56a9efa
--- /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 2534f09b555..ec1e97f4125 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 1f319df794b..dd6b585b7e2 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/agetty.nix b/nixos/modules/services/ttys/agetty.nix
index 051d54e932f..3429397d2cc 100644
--- a/nixos/modules/services/ttys/agetty.nix
+++ b/nixos/modules/services/ttys/agetty.nix
@@ -68,24 +68,35 @@ in
services.mingetty.greetingLine = mkDefault ''<<< Welcome to NixOS ${config.system.nixosLabel} (\m) - \l >>>'';
systemd.services."getty@" =
- { serviceConfig.ExecStart = gettyCmd "--noclear --keep-baud %I 115200,38400,9600 $TERM";
+ { serviceConfig.ExecStart = [
+ "" # override upstream default with an empty ExecStart
+ (gettyCmd "--noclear --keep-baud %I 115200,38400,9600 $TERM")
+ ];
restartIfChanged = false;
};
systemd.services."serial-getty@" =
- { serviceConfig.ExecStart =
- let speeds = concatStringsSep "," (map toString config.services.mingetty.serialSpeed);
- in gettyCmd "%I ${speeds} $TERM";
+ let speeds = concatStringsSep "," (map toString config.services.mingetty.serialSpeed); in
+ { serviceConfig.ExecStart = [
+ "" # override upstream default with an empty ExecStart
+ (gettyCmd "%I ${speeds} $TERM")
+ ];
restartIfChanged = false;
};
systemd.services."container-getty@" =
- { serviceConfig.ExecStart = gettyCmd "--noclear --keep-baud pts/%I 115200,38400,9600 $TERM";
+ { serviceConfig.ExecStart = [
+ "" # override upstream default with an empty ExecStart
+ (gettyCmd "--noclear --keep-baud pts/%I 115200,38400,9600 $TERM")
+ ];
restartIfChanged = false;
};
systemd.services."console-getty" =
- { serviceConfig.ExecStart = gettyCmd "--noclear --keep-baud console 115200,38400,9600 $TERM";
+ { serviceConfig.ExecStart = [
+ "" # override upstream default with an empty ExecStart
+ (gettyCmd "--noclear --keep-baud console 115200,38400,9600 $TERM")
+ ];
serviceConfig.Restart = "always";
restartIfChanged = false;
enable = mkDefault config.boot.isContainer;
diff --git a/nixos/modules/services/ttys/kmscon.nix b/nixos/modules/services/ttys/kmscon.nix
index 8bad42927e3..88e488425bc 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 c1d7d4ea06d..2344b9922d0 100644
--- a/nixos/modules/services/web-apps/atlassian/confluence.nix
+++ b/nixos/modules/services/web-apps/atlassian/confluence.nix
@@ -6,7 +6,22 @@ let
cfg = config.services.confluence;
- pkg = pkgs.atlassian-confluence;
+ pkg = pkgs.atlassian-confluence.override (optionalAttrs cfg.sso.enable {
+ enableSSO = cfg.sso.enable;
+ crowdProperties = ''
+ application.name ${cfg.sso.applicationName}
+ application.password ${cfg.sso.applicationPassword}
+ application.login.url ${cfg.sso.crowd}/console/
+
+ crowd.server.url ${cfg.sso.crowd}/services/
+ crowd.base.url ${cfg.sso.crowd}/
+
+ session.isauthenticated session.isauthenticated
+ session.tokenkey session.tokenkey
+ session.validationinterval ${toString cfg.sso.validationInterval}
+ session.lastvalidation session.lastvalidation
+ '';
+ });
in
@@ -76,6 +91,42 @@ in
};
};
+ sso = {
+ enable = mkEnableOption "SSO with Atlassian Crowd";
+
+ crowd = mkOption {
+ type = types.str;
+ example = "http://localhost:8095/crowd";
+ description = "Crowd Base URL without trailing slash";
+ };
+
+ applicationName = mkOption {
+ type = types.str;
+ example = "jira";
+ description = "Exact name of this Confluence instance in Crowd";
+ };
+
+ applicationPassword = mkOption {
+ type = types.str;
+ description = "Application password of this Confluence instance in Crowd";
+ };
+
+ validationInterval = mkOption {
+ type = types.int;
+ default = 2;
+ example = 0;
+ description = ''
+ Set to 0, if you want authentication checks to occur on each
+ request. Otherwise set to the number of minutes between request
+ to validate if the user is logged in or out of the Crowd SSO
+ server. Setting this value to 1 or higher will increase the
+ performance of Crowd's integration.
+ '';
+ };
+ };
+
+
+
jrePackage = let
jreSwitch = unfree: free: if config.nixpkgs.config.allowUnfree or false then unfree else free;
in mkOption {
diff --git a/nixos/modules/services/web-apps/atlassian/jira.nix b/nixos/modules/services/web-apps/atlassian/jira.nix
index 0ab94d95eee..19b6a8d3085 100644
--- a/nixos/modules/services/web-apps/atlassian/jira.nix
+++ b/nixos/modules/services/web-apps/atlassian/jira.nix
@@ -6,7 +6,22 @@ let
cfg = config.services.jira;
- pkg = pkgs.atlassian-jira;
+ pkg = pkgs.atlassian-jira.override {
+ enableSSO = cfg.sso.enable;
+ crowdProperties = ''
+ application.name ${cfg.sso.applicationName}
+ application.password ${cfg.sso.applicationPassword}
+ application.login.url ${cfg.sso.crowd}/console/
+
+ crowd.server.url ${cfg.sso.crowd}/services/
+ crowd.base.url ${cfg.sso.crowd}/
+
+ session.isauthenticated session.isauthenticated
+ session.tokenkey session.tokenkey
+ session.validationinterval ${toString cfg.sso.validationInterval}
+ session.lastvalidation session.lastvalidation
+ '';
+ };
in
@@ -82,6 +97,40 @@ in
};
};
+ sso = {
+ enable = mkEnableOption "SSO with Atlassian Crowd";
+
+ crowd = mkOption {
+ type = types.str;
+ example = "http://localhost:8095/crowd";
+ description = "Crowd Base URL without trailing slash";
+ };
+
+ applicationName = mkOption {
+ type = types.str;
+ example = "jira";
+ description = "Exact name of this JIRA instance in Crowd";
+ };
+
+ applicationPassword = mkOption {
+ type = types.str;
+ description = "Application password of this JIRA instance in Crowd";
+ };
+
+ validationInterval = mkOption {
+ type = types.int;
+ default = 2;
+ example = 0;
+ description = ''
+ Set to 0, if you want authentication checks to occur on each
+ request. Otherwise set to the number of minutes between request
+ to validate if the user is logged in or out of the Crowd SSO
+ server. Setting this value to 1 or higher will increase the
+ performance of Crowd's integration.
+ '';
+ };
+ };
+
jrePackage = let
jreSwitch = unfree: free: if config.nixpkgs.config.allowUnfree or false then unfree else free;
in mkOption {
diff --git a/nixos/modules/services/web-apps/mattermost.nix b/nixos/modules/services/web-apps/mattermost.nix
index be9af78da18..bc88a808abc 100644
--- a/nixos/modules/services/web-apps/mattermost.nix
+++ b/nixos/modules/services/web-apps/mattermost.nix
@@ -185,7 +185,7 @@ in
'' + 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}'"
+ "CREATE ROLE ${cfg.localDatabaseUser} WITH LOGIN NOCREATEDB NOCREATEROLE ENCRYPTED PASSWORD '${cfg.localDatabasePassword}'"
${config.services.postgresql.package}/bin/createdb \
--owner ${cfg.localDatabaseUser} ${cfg.localDatabaseName}
touch ${cfg.statePath}/.db-created
diff --git a/nixos/modules/services/web-apps/nexus.nix b/nixos/modules/services/web-apps/nexus.nix
new file mode 100644
index 00000000000..a750aa66b27
--- /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 00000000000..93f69bd1265
--- /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 a1d8a5b7556..a393a182d36 100644
--- a/nixos/modules/services/web-apps/piwik-doc.xml
+++ b/nixos/modules/services/web-apps/piwik-doc.xml
@@ -23,16 +23,24 @@
and enter those credentials in your browser.
You can use passwordless database authentication via the UNIX_SOCKET authentication plugin
with the following SQL commands:
+
+ # For MariaDB
INSTALL PLUGIN unix_socket SONAME 'auth_socket';
- ALTER USER root IDENTIFIED VIA unix_socket;
CREATE DATABASE piwik;
- CREATE USER 'piwik'@'localhost' IDENTIFIED VIA unix_socket;
+ CREATE USER 'piwik'@'localhost' IDENTIFIED WITH unix_socket;
+ GRANT ALL PRIVILEGES ON piwik.* TO 'piwik'@'localhost';
+
+ # For MySQL
+ INSTALL PLUGIN auth_socket SONAME 'auth_socket.so';
+ CREATE DATABASE piwik;
+ CREATE USER 'piwik'@'localhost' IDENTIFIED WITH auth_socket;
GRANT ALL PRIVILEGES ON piwik.* TO 'piwik'@'localhost';
+
Then fill in piwik as database user and database name, and leave the password field blank.
- This works with MariaDB and MySQL. This authentication works by allowing only the piwik unix
- user to authenticate as piwik database (without needing a password), but no other users.
+ This authentication works by allowing only the piwik unix user to authenticate as the
+ piwik database user (without needing a password), but no other users.
For more information on passwordless login, see
.
@@ -71,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 26342a9c5f0..ce86c6873dd 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/caddy.nix b/nixos/modules/services/web-servers/caddy.nix
index ee32a1c86d4..d8efa24bc6d 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 8c3f7b219ac..45a65965112 100644
--- a/nixos/modules/services/web-servers/lighttpd/default.nix
+++ b/nixos/modules/services/web-servers/lighttpd/default.nix
@@ -37,8 +37,10 @@ let
"mod_rrdtool"
"mod_accesslog"
# Remaining list of modules, order assumed to be unimportant.
+ "mod_authn_file"
+ "mod_authn_mysql"
"mod_cml"
- "mod_dirlisting"
+ "mod_deflate"
"mod_evasive"
"mod_extforward"
"mod_flv_streaming"
@@ -47,6 +49,7 @@ let
"mod_scgi"
"mod_setenv"
"mod_trigger_b4_dl"
+ "mod_uploadprogress"
"mod_webdav"
];
@@ -86,14 +89,9 @@ let
accesslog.use-syslog = "enable"
server.errorlog-use-syslog = "enable"
- mimetype.assign = (
- ".html" => "text/html",
- ".htm" => "text/html",
- ".txt" => "text/plain",
- ".jpg" => "image/jpeg",
- ".png" => "image/png",
- ".css" => "text/css"
- )
+ ${lib.optionalString cfg.enableUpstreamMimeTypes ''
+ include "${pkgs.lighttpd}/share/lighttpd/doc/config/conf.d/mime.conf"
+ ''}
static-file.exclude-extensions = ( ".fcgi", ".php", ".rb", "~", ".inc" )
index-file.names = ( "index.html" )
@@ -165,6 +163,17 @@ in
'';
};
+ enableUpstreamMimeTypes = mkOption {
+ type = types.bool;
+ default = true;
+ description = ''
+ Whether to include the list of mime types bundled with lighttpd
+ (upstream). If you disable this, no mime types will be added by
+ NixOS and you will have to add your own mime types in
+ .
+ '';
+ };
+
mod_status = mkOption {
default = false;
type = types.bool;
diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index 2310912d0fd..97511aac973 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;
@@ -36,6 +54,12 @@ let
http {
include ${cfg.package}/conf/mime.types;
include ${cfg.package}/conf/fastcgi.conf;
+ include ${cfg.package}/conf/uwsgi_params;
+
+ ${optionalString (cfg.resolver.addresses != []) ''
+ resolver ${toString cfg.resolver.addresses} ${optionalString (cfg.resolver.valid != "") "valid=${cfg.resolver.valid}"};
+ ''}
+ ${upstreamConfig}
${optionalString (cfg.recommendedOptimisation) ''
# optimisation
@@ -69,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"};
@@ -116,6 +138,7 @@ let
http {
include ${cfg.package}/conf/mime.types;
include ${cfg.package}/conf/fastcgi.conf;
+ include ${cfg.package}/conf/uwsgi_params;
${cfg.httpConfig}
}''}
@@ -123,18 +146,32 @@ let
'';
vhosts = concatStringsSep "\n" (mapAttrsToList (vhostName: vhost:
- let
- ssl = vhost.enableSSL || vhost.forceSSL;
- defaultPort = if ssl then 443 else 80;
+ let
+ onlySSL = vhost.onlySSL || vhost.enableSSL;
+ hasSSL = onlySSL || vhost.addSSL || vhost.forceSSL;
- listenString = { addr, port, ... }:
- "listen ${addr}:${toString (if port != null then port else defaultPort)} "
+ 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 filter (x: x.ssl) defaultListen
+ else defaultListen;
+
+ listenString = { addr, port, ssl, ... }:
+ "listen ${addr}:${toString port} "
+ optionalString ssl "ssl http2 "
- + optionalString vhost.default "default_server"
+ + optionalString vhost.default "default_server "
+ ";";
- redirectListenString = { addr, ... }:
- "listen ${addr}:80 ${optionalString vhost.default "default_server"};";
+ redirectListen = filter (x: !x.ssl) defaultListen;
acmeLocation = ''
location /.well-known/acme-challenge {
@@ -153,7 +190,7 @@ let
in ''
${optionalString vhost.forceSSL ''
server {
- ${concatMapStringsSep "\n" redirectListenString vhost.listen}
+ ${concatMapStringsSep "\n" listenString redirectListen}
server_name ${vhost.serverName} ${concatStringsSep " " vhost.serverAliases};
${optionalString vhost.enableACME acmeLocation}
@@ -164,14 +201,14 @@ let
''}
server {
- ${concatMapStringsSep "\n" listenString vhost.listen}
+ ${concatMapStringsSep "\n" listenString hostListen}
server_name ${vhost.serverName} ${concatStringsSep " " vhost.serverAliases};
${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};
''}
@@ -186,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
@@ -383,6 +432,71 @@ 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 = {
+ addresses = mkOption {
+ type = types.listOf types.str;
+ default = [];
+ example = literalExample ''[ "[::1]" "127.0.0.1:5353" ]'';
+ description = "List of resolvers to use";
+ };
+ valid = mkOption {
+ type = types.str;
+ default = "";
+ example = "30s";
+ description = ''
+ By default, nginx caches answers using the TTL value of a response.
+ An optional valid parameter allows overriding it
+ '';
+ };
+ };
+ };
+ description = ''
+ Configures name servers used to resolve names of upstream servers into addresses
+ '';
+ 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;
@@ -409,11 +523,37 @@ in
config = mkIf cfg.enable {
# TODO: test user supplied config file pases syntax test
- assertions = let hostOrAliasIsNull = l: l.root == null || l.alias == null; in [
+ warnings =
+ let
+ deprecatedSSL = name: config: optional config.enableSSL
+ ''
+ config.services.nginx.virtualHosts..enableSSL is deprecated,
+ use config.services.nginx.virtualHosts..onlySSL instead.
+ '';
+
+ in flatten (mapAttrsToList deprecatedSSL virtualHosts);
+
+ assertions =
+ let
+ hostOrAliasIsNull = l: l.root == null || l.alias == null;
+ in [
{
assertion = all (host: all hostOrAliasIsNull (attrValues host.locations)) (attrValues virtualHosts);
message = "Only one of nginx root or alias can be specified on a location.";
}
+
+ {
+ assertion = all (conf: with conf;
+ !(addSSL && (onlySSL || enableSSL)) &&
+ !(forceSSL && (onlySSL || enableSSL)) &&
+ !(addSSL && forceSSL)
+ ) (attrValues virtualHosts);
+ message = ''
+ Options services.nginx.service.virtualHosts..addSSL,
+ services.nginx.virtualHosts..onlySSL and services.nginx.virtualHosts..forceSSL
+ are mutually exclusive.
+ '';
+ }
];
systemd.services.nginx = {
diff --git a/nixos/modules/services/web-servers/nginx/location-options.nix b/nixos/modules/services/web-servers/nginx/location-options.nix
index 83ce0f71734..4c772734a74 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 60260512bc2..8a04e07eeea 100644
--- a/nixos/modules/services/web-servers/nginx/vhost-options.nix
+++ b/nixos/modules/services/web-servers/nginx/vhost-options.nix
@@ -27,25 +27,21 @@ with lib;
};
listen = mkOption {
- type = with types; listOf (submodule {
- options = {
- addr = mkOption { type = str; description = "IP address."; };
- port = mkOption { type = nullOr int; description = "Port number."; };
- };
- });
- default =
- [ { addr = "0.0.0.0"; port = null; } ]
- ++ optional config.networking.enableIPv6
- { addr = "[::]"; port = null; };
+ type = with types; listOf (submodule { options = {
+ addr = mkOption { type = str; description = "IP address."; };
+ port = mkOption { type = int; description = "Port number."; default = 80; };
+ ssl = mkOption { type = bool; description = "Enable SSL."; default = false; };
+ }; });
+ default = [];
example = [
- { addr = "195.154.1.1"; port = 443; }
- { addr = "192.168.1.2"; port = 443; }
+ { addr = "195.154.1.1"; port = 443; ssl = true;}
+ { addr = "192.154.1.1"; port = 80; }
];
description = ''
Listen addresses and ports for this virtual host.
IPv6 addresses must be enclosed in square brackets.
- Setting the port to null defaults
- to 80 for http and 443 for https (i.e. when enableSSL is set).
+ Note: this option overrides addSSL
+ and onlySSL.
'';
};
@@ -70,16 +66,40 @@ with lib;
'';
};
- enableSSL = mkOption {
+ addSSL = mkOption {
type = types.bool;
default = false;
- description = "Whether to enable SSL (https) support.";
+ description = ''
+ Whether to enable HTTPS in addition to plain HTTP. This will set defaults for
+ listen to listen on all interfaces on the respective default
+ ports (80, 443).
+ '';
+ };
+
+ onlySSL = mkOption {
+ type = types.bool;
+ default = false;
+ description = ''
+ Whether to enable HTTPS and reject plain HTTP connections. This will set
+ defaults for listen to listen on all interfaces on port 443.
+ '';
+ };
+
+ enableSSL = mkOption {
+ type = types.bool;
+ visible = false;
+ default = false;
};
forceSSL = mkOption {
type = types.bool;
default = false;
- description = "Whether to always redirect to https.";
+ description = ''
+ Whether to add a separate nginx server block that permanently redirects (301)
+ 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.
+ '';
};
sslCertificate = mkOption {
diff --git a/nixos/modules/services/web-servers/phpfpm/default.nix b/nixos/modules/services/web-servers/phpfpm/default.nix
index 26f54602203..e1f4ff5db7f 100644
--- a/nixos/modules/services/web-servers/phpfpm/default.nix
+++ b/nixos/modules/services/web-servers/phpfpm/default.nix
@@ -150,8 +150,8 @@ in {
PrivateDevices = true;
ProtectSystem = "full";
ProtectHome = true;
- NoNewPrivileges = 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/varnish/default.nix b/nixos/modules/services/web-servers/varnish/default.nix
index 5433db3b91c..c3bc065d465 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/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix
index c207aab5de0..13f339e3fbf 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 c043884f8e0..ecf0abb1efd 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 = [ "${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/mate.nix b/nixos/modules/services/x11/desktop-managers/mate.nix
new file mode 100644
index 00000000000..7a95ac6549d
--- /dev/null
+++ b/nixos/modules/services/x11/desktop-managers/mate.nix
@@ -0,0 +1,79 @@
+{ 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;
+
+ 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 00000000000..d7bd2fc5eb0
--- /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/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index 6c63fede857..b0a3ff1bb75 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
@@ -103,16 +102,31 @@ 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.display-manager.path = [ gnome3.gnome_session ];
+ 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 = [ pkgs.gnome3.gnome_session ];
services.dbus.packages = [ gdm ];
@@ -171,7 +185,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 +205,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 +213,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 +232,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/xpra.nix b/nixos/modules/services/x11/display-managers/xpra.nix
index e60dd876526..8f5ce3dccc6 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/synaptics.nix b/nixos/modules/services/x11/hardware/synaptics.nix
index 54454c736c1..f032c593885 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/window-managers/compiz.nix b/nixos/modules/services/x11/window-managers/compiz.nix
deleted file mode 100644
index 539a83f9906..00000000000
--- 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 32ef34bdad2..d12003768a6 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/window-managers/xmonad.nix b/nixos/modules/services/x11/window-managers/xmonad.nix
index e25a8ae2282..43de746ab1f 100644
--- a/nixos/modules/services/x11/window-managers/xmonad.nix
+++ b/nixos/modules/services/x11/window-managers/xmonad.nix
@@ -29,6 +29,7 @@ in
extraPackages = mkOption {
default = self: [];
+ defaultText = "self: []";
example = literalExample ''
haskellPackages: [
haskellPackages.xmonad-contrib
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index 638509e710b..3ce124d3da2 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -648,51 +648,11 @@ in
services.xserver.xkbDir = mkDefault "${pkgs.xkeyboard_config}/etc/X11/xkb";
- system.extraDependencies = singleton (pkgs.runCommand "xkb-layouts-exist" {
- inherit (cfg) layout xkbDir;
+ system.extraDependencies = singleton (pkgs.runCommand "xkb-validated" {
+ inherit (cfg) xkbModel layout xkbVariant xkbOptions;
+ nativeBuildInputs = [ pkgs.xkbvalidate ];
} ''
- # We can use the default IFS here, because the layouts won't contain
- # spaces or tabs and are ruled out by the sed expression below.
- availableLayouts="$(
- sed -n -e ':i /^! \(layout\|variant\) *$/ {
- # Loop through all of the layouts/variants until we hit another ! at
- # the start of the line or the line is empty ('t' branches only if
- # the last substitution was successful, so if the line is empty the
- # substition will fail).
- :l; n; /^!/bi; s/^ *\([^ ]\+\).*/\1/p; tl
- }' "$xkbDir/rules/base.lst" | sort -u
- )"
-
- layoutNotFound() {
- echo >&2
- echo "The following layouts and variants are available:" >&2
- echo >&2
-
- # While an output width of 80 is more desirable for small terminals, we
- # really don't know the amount of columns of the terminal from within
- # the builder. The content in $availableLayouts however is pretty
- # large, so let's opt for a larger width here, because it will print a
- # smaller amount of lines on modern KMS/framebuffer terminals and won't
- # lose information even in smaller terminals (it only will look a bit
- # ugly).
- echo "$availableLayouts" | ${pkgs.utillinux}/bin/column -c 150 >&2
-
- echo >&2
- echo "However, the keyboard layout definition in" \
- "\`services.xserver.layout' contains the layout \`$1', which" \
- "isn't a valid layout or variant." >&2
- echo >&2
- exit 1
- }
-
- # Again, we don't need to take care of IFS, see the comment for
- # $availableLayouts.
- for l in ''${layout//,/ }; do
- if ! echo "$availableLayouts" | grep -qxF "$l"; then
- layoutNotFound "$l"
- fi
- done
-
+ validate "$xkbModel" "$layout" "$xkbVariant" "$xkbOptions"
touch "$out"
'');
diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl
index 88e7847cf8c..29cc60b0032 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/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix
index e9897cc01b6..67cb2264e3f 100644
--- a/nixos/modules/system/activation/top-level.nix
+++ b/nixos/modules/system/activation/top-level.nix
@@ -141,6 +141,7 @@ in
system.build = mkOption {
internal = true;
default = {};
+ type = types.attrs;
description = ''
Attribute set of derivations used to setup the system.
'';
diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index 1edb9e0d229..82b5bcda921 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";
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 779005c0df5..3333569c36b 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 3ca679b479a..06f004fb06e 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/networkd.nix b/nixos/modules/system/boot/networkd.nix
index b151b568892..9d2cea3ad16 100644
--- a/nixos/modules/system/boot/networkd.nix
+++ b/nixos/modules/system/boot/networkd.nix
@@ -142,6 +142,18 @@ let
(assertValueOneOf "EmitTimezone" boolValues)
];
+ # .network files have a [Link] section with different options than in .netlink files
+ checkNetworkLink = checkUnitConfig "Link" [
+ (assertOnlyFields [
+ "MACAddress" "MTUBytes" "ARP" "Unmanaged"
+ ])
+ (assertMacAddress "MACAddress")
+ (assertByteFormat "MTUBytes")
+ (assertValueOneOf "ARP" boolValues)
+ (assertValueOneOf "Unmanaged" boolValues)
+ ];
+
+
commonNetworkOptions = {
enable = mkOption {
@@ -371,6 +383,18 @@ let
'';
};
+ linkConfig = mkOption {
+ default = {};
+ example = { Unmanaged = true; };
+ type = types.addCheck (types.attrsOf unitOption) checkNetworkLink;
+ description = ''
+ Each attribute in this set specifies an option in the
+ [Link] section of the unit. See
+ systemd.network
+ 5 for details.
+ '';
+ };
+
name = mkOption {
type = types.nullOr types.str;
default = null;
@@ -581,6 +605,12 @@ let
{ inherit (def) enable;
text = commonMatchText def +
''
+ ${optionalString (def.linkConfig != { }) ''
+ [Link]
+ ${attrsToSection def.linkConfig}
+
+ ''}
+
[Network]
${attrsToSection def.networkConfig}
${concatStringsSep "\n" (map (s: "Address=${s}") def.address)}
diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh
index 1f4ab3eae07..b442386914a 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/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index 02870878c0f..d6e3e3a87d0 100644
--- a/nixos/modules/system/boot/stage-1.nix
+++ b/nixos/modules/system/boot/stage-1.nix
@@ -207,7 +207,7 @@ let
preLVMCommands preDeviceCommands postDeviceCommands postMountCommands preFailCommands kernelModules;
resumeDevices = map (sd: if sd ? device then sd.device else "/dev/disk/by-label/${sd.label}")
- (filter (sd: hasPrefix "/dev/" sd.device && !sd.randomEncryption
+ (filter (sd: hasPrefix "/dev/" sd.device && !sd.randomEncryption.enable
# Don't include zram devices
&& !(hasPrefix "/dev/zram" sd.device)
) config.swapDevices);
diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix
index 9be10a8283e..43a9c28bb69 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 46761fdc0e9..ed1f5d20afb 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -593,7 +593,7 @@ in
services.logind.extraConfig = mkOption {
default = "";
type = types.lines;
- example = "HandleLidSwitch=ignore";
+ example = "IdleAction=lock";
description = ''
Extra config options for systemd-logind. See man logind.conf for
available options.
@@ -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.
'';
};
diff --git a/nixos/modules/system/etc/etc.nix b/nixos/modules/system/etc/etc.nix
index fd6e58cd5b4..7d43ba07ca5 100644
--- a/nixos/modules/system/etc/etc.nix
+++ b/nixos/modules/system/etc/etc.nix
@@ -20,8 +20,8 @@ let
sources = map (x: x.source) etc';
targets = map (x: x.target) etc';
modes = map (x: x.mode) etc';
- uids = map (x: x.uid) etc';
- gids = map (x: x.gid) etc';
+ users = map (x: x.user) etc';
+ groups = map (x: x.group) etc';
};
in
@@ -108,6 +108,26 @@ in
'';
};
+ user = mkOption {
+ default = "+${toString config.uid}";
+ type = types.str;
+ description = ''
+ User name of created file.
+ Only takes affect when the file is copied (that is, the mode is not 'symlink').
+ Changing this option takes precedence over uid.
+ '';
+ };
+
+ group = mkOption {
+ default = "+${toString config.gid}";
+ type = types.str;
+ description = ''
+ Group name of created file.
+ Only takes affect when the file is copied (that is, the mode is not 'symlink').
+ Changing this option takes precedence over gid.
+ '';
+ };
+
};
config = {
@@ -130,7 +150,7 @@ in
system.build.etc = etc;
- system.activationScripts.etc = stringAfter [ "stdio" ]
+ system.activationScripts.etc = stringAfter [ "users" "groups" ]
''
# Set up the statically computed bits of /etc.
echo "setting up /etc..."
diff --git a/nixos/modules/system/etc/make-etc.sh b/nixos/modules/system/etc/make-etc.sh
index 60d4ba1301a..1ca4c3046f0 100644
--- a/nixos/modules/system/etc/make-etc.sh
+++ b/nixos/modules/system/etc/make-etc.sh
@@ -6,8 +6,8 @@ set -f
sources_=($sources)
targets_=($targets)
modes_=($modes)
-uids_=($uids)
-gids_=($gids)
+users_=($users)
+groups_=($groups)
set +f
for ((i = 0; i < ${#targets_[@]}; i++)); do
@@ -36,9 +36,9 @@ for ((i = 0; i < ${#targets_[@]}; i++)); do
fi
if test "${modes_[$i]}" != symlink; then
- echo "${modes_[$i]}" > $out/etc/$target.mode
- echo "${uids_[$i]}" > $out/etc/$target.uid
- echo "${gids_[$i]}" > $out/etc/$target.gid
+ echo "${modes_[$i]}" > $out/etc/$target.mode
+ echo "${users_[$i]}" > $out/etc/$target.uid
+ echo "${groups_[$i]}" > $out/etc/$target.gid
fi
fi
diff --git a/nixos/modules/system/etc/setup-etc.pl b/nixos/modules/system/etc/setup-etc.pl
index efda74161ff..eed20065087 100644
--- a/nixos/modules/system/etc/setup-etc.pl
+++ b/nixos/modules/system/etc/setup-etc.pl
@@ -108,6 +108,8 @@ sub link {
my $uid = read_file("$_.uid"); chomp $uid;
my $gid = read_file("$_.gid"); chomp $gid;
copy "$static/$fn", "$target.tmp" or warn;
+ $uid = getpwnam $uid unless $uid =~ /^\+/;
+ $gid = getgrnam $gid unless $gid =~ /^\+/;
chown int($uid), int($gid), "$target.tmp" or warn;
chmod oct($mode), "$target.tmp" or warn;
rename "$target.tmp", $target or warn;
diff --git a/nixos/modules/tasks/encrypted-devices.nix b/nixos/modules/tasks/encrypted-devices.nix
index b1a7711ddcb..fa0abb43c0c 100644
--- a/nixos/modules/tasks/encrypted-devices.nix
+++ b/nixos/modules/tasks/encrypted-devices.nix
@@ -56,11 +56,19 @@ in
};
config = mkIf anyEncrypted {
+ assertions = map (dev: {
+ assertion = dev.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 3951d617f6f..6ceb36714b2 100644
--- a/nixos/modules/tasks/filesystems.nix
+++ b/nixos/modules/tasks/filesystems.nix
@@ -217,7 +217,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 +294,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 00000000000..227707173a3
--- /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/nfs.nix b/nixos/modules/tasks/filesystems/nfs.nix
index 73cf18384bd..d3a558738f4 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 2de3a3d8a33..145fae432c6 100644
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
@@ -72,7 +72,7 @@ in
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 {
diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix
index f6f104ce7a6..7ede8752bcc 100644
--- a/nixos/modules/tasks/network-interfaces-scripted.nix
+++ b/nixos/modules/tasks/network-interfaces-scripted.nix
@@ -71,7 +71,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" ];
@@ -85,7 +88,7 @@ let
before = [ "network.target" "shutdown.target" ];
wants = [ "network.target" ];
conflicts = [ "shutdown.target" ];
- wantedBy = [ "multi-user.target" ];
+ wantedBy = [ "multi-user.target" ] ++ optional hasDefaultGatewaySet "network-online.target";
unitConfig.ConditionCapability = "CAP_NET_ADMIN";
diff --git a/nixos/modules/testing/minimal-kernel.nix b/nixos/modules/testing/minimal-kernel.nix
index a463cb803ad..7c2b9c05cf9 100644
--- a/nixos/modules/testing/minimal-kernel.nix
+++ b/nixos/modules/testing/minimal-kernel.nix
@@ -6,7 +6,7 @@ let
);
origKernel = pkgs.buildLinux {
- inherit (pkgs.linux) src version;
+ inherit (pkgs.linux) src version stdenv;
inherit configfile;
allowImportFromDerivation = true;
kernelPatches = [ pkgs.kernelPatches.cifs_timeout_2_6_38 ];
diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 6adb2c1681a..82dfc1c9f1c 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 \
@@ -596,7 +595,7 @@ in
{ config =
{ config, pkgs, ... }:
{ services.postgresql.enable = true;
- services.postgresql.package = pkgs.postgresql92;
+ services.postgresql.package = pkgs.postgresql96;
};
};
}
diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix
index 5a8a0e27436..a9a2095499a 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/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix
index 4a8dadaa281..e3b3e6a5f4a 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/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix
index b24ea0f33c9..8aa7ad8e391 100644
--- a/nixos/modules/virtualisation/libvirtd.nix
+++ b/nixos/modules/virtualisation/libvirtd.nix
@@ -15,7 +15,7 @@ let
'';
qemuConfigFile = pkgs.writeText "qemu.conf" ''
${optionalString cfg.qemuOvmf ''
- nvram = ["${pkgs.OVMF.fd}/FV/OVMF_CODE.fd:${pkgs.OVMF.fd}/FV/OVMF_VARS.fd"]
+ nvram = ["/run/libvirt/nix-ovmf/OVMF_CODE.fd:/run/libvirt/nix-ovmf/OVMF_VARS.fd"]
''}
${cfg.qemuVerbatimConfig}
'';
@@ -102,9 +102,7 @@ in {
config = mkIf cfg.enable {
- environment.systemPackages = with pkgs;
- [ libvirt netcat-openbsd ]
- ++ optional cfg.enableKVM qemu_kvm;
+ environment.systemPackages = with pkgs; [ libvirt netcat-openbsd qemu_kvm ];
boot.kernelModules = [ "tun" ];
@@ -129,7 +127,6 @@ in {
dnsmasq
ebtables
]
- ++ optional cfg.enableKVM qemu_kvm
++ optional vswitch.enable vswitch.package;
preStart = ''
@@ -155,34 +152,31 @@ in {
# Copy generated qemu config to libvirt directory
cp -f ${qemuConfigFile} /var/lib/libvirt/qemu.conf
- # libvirtd puts the full path of the emulator binary in the machine
- # config file. But this path can unfortunately be garbage collected
- # while still being used by the virtual machine. So update the
- # emulator path on each startup to something valid (re-scan $PATH).
- for file in /var/lib/libvirt/qemu/*.xml /var/lib/libvirt/lxc/*.xml; do
- test -f "$file" || continue
- # get (old) emulator path from config file
- emulator=$("${pkgs.xmlstarlet}/bin/xmlstarlet" select --template --value-of "/domain/devices/emulator" "$file")
- # get a (definitely) working emulator path by re-scanning $PATH
- new_emulator=$(PATH=${pkgs.libvirt}/libexec:$PATH command -v $(basename "$emulator"))
- # write back
- "${pkgs.xmlstarlet}/bin/xmlstarlet" edit --inplace --update "/domain/devices/emulator" -v "$new_emulator" "$file"
+ # stable (not GC'able as in /nix/store) paths for using in section of xml configs
+ mkdir -p /run/libvirt/nix-emulators
+ ln -s --force ${pkgs.libvirt}/libexec/libvirt_lxc /run/libvirt/nix-emulators/
+ ${optionalString pkgs.stdenv.isAarch64 "ln -s --force ${pkgs.qemu}/bin/qemu-system-aarch64 /run/libvirt/nix-emulators/"}
+ ${optionalString cfg.enableKVM "ln -s --force ${pkgs.qemu_kvm}/bin/qemu-kvm /run/libvirt/nix-emulators/"}
- # Also refresh the OVMF path. Files with no matches are ignored.
- "${pkgs.xmlstarlet}/bin/xmlstarlet" edit --inplace --update "/domain/os/loader" -v "${pkgs.OVMF.fd}/FV/OVMF_CODE.fd" "$file"
- done
- ''; # */
+ ${optionalString cfg.qemuOvmf ''
+ mkdir -p /run/libvirt/nix-ovmf
+ ln -s --force ${pkgs.OVMF.fd}/FV/OVMF_CODE.fd /run/libvirt/nix-ovmf/
+ ln -s --force ${pkgs.OVMF.fd}/FV/OVMF_VARS.fd /run/libvirt/nix-ovmf/
+ ''}
+ '';
serviceConfig = {
Type = "notify";
KillMode = "process"; # when stopping, leave the VMs alone
- Restart = "on-failure";
+ Restart = "no";
};
+ restartIfChanged = false;
};
systemd.services.libvirt-guests = {
wantedBy = [ "multi-user.target" ];
path = with pkgs; [ coreutils libvirt gawk ];
+ restartIfChanged = false;
};
systemd.sockets.virtlogd = {
@@ -194,6 +188,7 @@ in {
systemd.services.virtlogd = {
description = "Virtual machine log manager";
serviceConfig.ExecStart = "@${pkgs.libvirt}/sbin/virtlogd virtlogd";
+ restartIfChanged = false;
};
systemd.sockets.virtlockd = {
@@ -205,6 +200,7 @@ in {
systemd.services.virtlockd = {
description = "Virtual machine lock manager";
serviceConfig.ExecStart = "@${pkgs.libvirt}/sbin/virtlockd virtlockd";
+ restartIfChanged = false;
};
};
}
diff --git a/nixos/modules/virtualisation/nova-config.nix b/nixos/modules/virtualisation/nova-config.nix
index aac11ec8a17..c865cf451e4 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/vmware-guest.nix b/nixos/modules/virtualisation/vmware-guest.nix
index ce1224a8f13..68930a0e325 100644
--- a/nixos/modules/virtualisation/vmware-guest.nix
+++ b/nixos/modules/virtualisation/vmware-guest.nix
@@ -33,7 +33,7 @@ in
serviceConfig.ExecStart = "${open-vm-tools}/bin/vmtoolsd";
};
- environment.etc."vmware-tools".source = "${pkgs.open-vm-tools}/etc/vmware-tools/*";
+ environment.etc."vmware-tools".source = "${open-vm-tools}/etc/vmware-tools/*";
services.xserver = mkIf (!cfg.headless) {
videoDrivers = mkOverride 50 [ "vmware" ];
diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix
index 5239652d407..c7656bc309c 100644
--- a/nixos/modules/virtualisation/xen-dom0.nix
+++ b/nixos/modules/virtualisation/xen-dom0.nix
@@ -16,6 +16,7 @@ in
virtualisation.xen.enable =
mkOption {
default = false;
+ type = types.bool;
description =
''
Setting this option enables the Xen hypervisor, a
diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index ecbd317cb9a..f61d80f5599 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -4,7 +4,8 @@
{ nixpkgs ? { outPath = ./..; revCount = 56789; shortRev = "gfedcba"; }
, stableBranch ? false
-, supportedSystems ? [ "x86_64-linux" "i686-linux" ]
+, supportedSystems ? [ "x86_64-linux" ]
+, limitedSupportedSystems ? [ "i686-linux" ]
}:
let
@@ -19,10 +20,16 @@ let
else pkgs.lib.mapAttrs (n: v: removeMaintainers v) set
else set;
+ allSupportedNixpkgs = builtins.removeAttrs (removeMaintainers (import ../pkgs/top-level/release.nix {
+ supportedSystems = supportedSystems ++ limitedSupportedSystems;
+ nixpkgs = nixpkgsSrc;
+ })) [ "unstable" ];
+
in rec {
nixos = removeMaintainers (import ./release.nix {
- inherit stableBranch supportedSystems;
+ inherit stableBranch;
+ supportedSystems = supportedSystems ++ limitedSupportedSystems;
nixpkgs = nixpkgsSrc;
});
@@ -38,8 +45,11 @@ in rec {
maintainers = [ pkgs.lib.maintainers.eelco ];
};
constituents =
- let all = x: map (system: x.${system}) supportedSystems; in
- [ nixos.channel
+ let
+ all = x: map (system: x.${system})
+ (supportedSystems ++ limitedSupportedSystems);
+ in [
+ nixos.channel
(all nixos.dummy)
(all nixos.manual)
@@ -60,6 +70,7 @@ in rec {
(all nixos.tests.installer.simple)
(all nixos.tests.installer.simpleLabels)
(all nixos.tests.installer.simpleProvided)
+ (all nixos.tests.installer.simpleUefiSystemdBoot)
(all nixos.tests.installer.swraid)
(all nixos.tests.installer.btrfsSimple)
(all nixos.tests.installer.btrfsSubvols)
@@ -70,7 +81,10 @@ in rec {
(all nixos.tests.boot.uefiUsb)
(all nixos.tests.boot-stage1)
nixos.tests.hibernate.x86_64-linux # i686 is flaky, see #23107
+ nixos.tests.docker
+ nixos.tests.docker-edge
(all nixos.tests.ecryptfs)
+ (all nixos.tests.env)
(all nixos.tests.ipv6)
(all nixos.tests.i3wm)
(all nixos.tests.keymap.azerty)
@@ -79,7 +93,7 @@ in rec {
(all nixos.tests.keymap.dvp)
(all nixos.tests.keymap.neo)
(all nixos.tests.keymap.qwertz)
- (all nixos.tests.plasma5)
+ nixos.tests.plasma5.x86_64-linux # avoid big build on i686
#(all nixos.tests.lightdm)
(all nixos.tests.login)
(all nixos.tests.misc)
@@ -106,8 +120,8 @@ in rec {
(all nixos.tests.xfce)
nixpkgs.tarball
- (all nixpkgs.emacs)
- (all nixpkgs.jdk)
+ (all allSupportedNixpkgs.emacs)
+ (all allSupportedNixpkgs.jdk)
];
});
diff --git a/nixos/release.nix b/nixos/release.nix
index 0dbdadf9781..ac7755a160f 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -1,6 +1,6 @@
{ nixpkgs ? { outPath = ./..; revCount = 56789; shortRev = "gfedcba"; }
, stableBranch ? false
-, supportedSystems ? [ "x86_64-linux" "i686-linux" ]
+, supportedSystems ? [ "x86_64-linux" ]
}:
with import ../lib;
@@ -214,6 +214,7 @@ 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.acme = callTest tests/acme.nix {};
tests.avahi = callTest tests/avahi.nix {};
tests.bittorrent = callTest tests/bittorrent.nix {};
tests.blivet = callTest tests/blivet.nix {};
@@ -234,11 +235,15 @@ 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 {};
@@ -249,10 +254,12 @@ in rec {
tests.gocd-server = callTest tests/gocd-server.nix {};
tests.gnome3 = callTest tests/gnome3.nix {};
tests.gnome3-gdm = callTest tests/gnome3-gdm.nix {};
+ tests.grafama = callTest tests/grafana.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,8 +267,11 @@ in rec {
tests.plasma5 = callTest tests/plasma5.nix {};
tests.keymap = callSubTests tests/keymap.nix {};
tests.initrdNetwork = callTest tests/initrd-network.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 {};
@@ -297,6 +307,7 @@ in rec {
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,6 +321,7 @@ 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 {};
/* Build a bunch of typical closures so that Hydra can keep track of
diff --git a/nixos/tests/acme.nix b/nixos/tests/acme.nix
new file mode 100644
index 00000000000..d7452744e17
--- /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/common/letsencrypt.nix b/nixos/tests/common/letsencrypt.nix
new file mode 100644
index 00000000000..5a2a266d4da
--- /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 00000000000..a1901c5c816
--- /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 00000000000..b5867c6f6ab
--- /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 00000000000..38d25daff19
--- /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 9096a5868f6..c6c8f4cdb5f 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 00000000000..3814855ed8e
--- /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 00000000000..c6b0424e97b
--- /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/gnome3.nix b/nixos/tests/gnome3.nix
index 4787d42d695..492fa61484a 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 00000000000..16b8181498a
--- /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/hardened.nix b/nixos/tests/hardened.nix
index 1d9a9043e03..cb33b69e719 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 db58a2f5c85..a95235887e8 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 00000000000..6abd7a5ad30
--- /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 00000000000..59661049392
--- /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 a6afe8a4b72..c1dae2a34fa 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
@@ -270,7 +273,7 @@ in {
};
# Simple GPT/UEFI configuration using systemd-boot with 3 partitions: ESP, swap & root filesystem
- simpleUefiGummiboot = makeInstallerTest "simpleUefiGummiboot"
+ simpleUefiSystemdBoot = makeInstallerTest "simpleUefiSystemdBoot"
{ createPartitions =
''
$machine->succeed(
diff --git a/nixos/tests/ipfs.nix b/nixos/tests/ipfs.nix
index 92d742e4f37..c6bc6154524 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/kernel-copperhead.nix b/nixos/tests/kernel-copperhead.nix
new file mode 100644
index 00000000000..07427d7f2a8
--- /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 00000000000..1350426654d
--- /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 00000000000..2aab4ce0b49
--- /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/keymap.nix b/nixos/tests/keymap.nix
index 55a0e760388..c431c1a3417 100644
--- a/nixos/tests/keymap.nix
+++ b/nixos/tests/keymap.nix
@@ -49,6 +49,38 @@ let
machine.i18n.consoleKeyMap = mkOverride 900 layout;
machine.services.xserver.layout = mkOverride 900 layout;
machine.imports = [ ./common/x11.nix extraConfig ];
+ machine.services.xserver.displayManager.slim = {
+ enable = true;
+
+ # Use a custom theme in order to get best OCR results
+ theme = pkgs.runCommand "slim-theme-ocr" {
+ nativeBuildInputs = [ pkgs.imagemagick ];
+ } ''
+ mkdir "$out"
+ convert -size 1x1 xc:white "$out/background.jpg"
+ convert -size 200x100 xc:white "$out/panel.jpg"
+ cat > "$out/slim.theme" <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 00000000000..acf2e025081
--- /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 00000000000..f108e35b98c
--- /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 00000000000..a801759bf58
--- /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 00000000000..74d98dabec8
--- /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 00000000000..d9d7ba9bb2c
--- /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 00000000000..00a5c9aba4e
--- /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 00000000000..1966fed3a5f
--- /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/misc.nix b/nixos/tests/misc.nix
index 1b24551009c..79290861cb0 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/nat.nix b/nixos/tests/nat.nix
index 74e20bff8d8..a12b7645bc2 100644
--- a/nixos/tests/nat.nix
+++ b/nixos/tests/nat.nix
@@ -6,6 +6,20 @@
import ./make-test.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ? false, ... }:
let
unit = if withFirewall then "firewall" else "nat";
+
+ routerBase =
+ lib.mkMerge [
+ { virtualisation.vlans = [ 2 1 ];
+ networking.firewall.enable = withFirewall;
+ networking.firewall.allowPing = true;
+ networking.nat.internalIPs = [ "192.168.1.0/24" ];
+ networking.nat.externalInterface = "eth1";
+ }
+ (lib.optionalAttrs withConntrackHelpers {
+ networking.firewall.connectionTrackingModules = [ "ftp" ];
+ networking.firewall.autoLoadConntrackHelpers = true;
+ })
+ ];
in
{
name = "nat" + (if withFirewall then "WithFirewall" else "Standalone")
@@ -30,20 +44,16 @@ import ./make-test.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ? false,
];
router =
- { config, pkgs, ... }:
- lib.mkMerge [
- { virtualisation.vlans = [ 2 1 ];
- networking.firewall.enable = withFirewall;
- networking.firewall.allowPing = true;
- networking.nat.enable = true;
- networking.nat.internalIPs = [ "192.168.1.0/24" ];
- networking.nat.externalInterface = "eth1";
- }
- (lib.optionalAttrs withConntrackHelpers {
- networking.firewall.connectionTrackingModules = [ "ftp" ];
- networking.firewall.autoLoadConntrackHelpers = true;
- })
- ];
+ { config, pkgs, ... }: lib.mkMerge [
+ routerBase
+ { networking.nat.enable = true; }
+ ];
+
+ routerDummyNoNat =
+ { config, pkgs, ... }: lib.mkMerge [
+ routerBase
+ { networking.nat.enable = false; }
+ ];
server =
{ config, pkgs, ... }:
@@ -57,9 +67,13 @@ import ./make-test.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ? false,
};
testScript =
- { nodes, ... }:
- ''
- startAll;
+ { nodes, ... }: let
+ routerDummyNoNatClosure = nodes.routerDummyNoNat.config.system.build.toplevel;
+ routerClosure = nodes.router.config.system.build.toplevel;
+ in ''
+ $client->start;
+ $router->start;
+ $server->start;
# The router should have access to the server.
$server->waitForUnit("network.target");
@@ -87,13 +101,18 @@ import ./make-test.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ? false,
$router->succeed("ping -c 1 client >&2");
# If we turn off NAT, the client shouldn't be able to reach the server.
- $router->succeed("iptables -t nat -D PREROUTING -j nixos-nat-pre");
- $router->succeed("iptables -t nat -D POSTROUTING -j nixos-nat-post");
+ $router->succeed("${routerDummyNoNatClosure}/bin/switch-to-configuration test 2>&1");
$client->fail("curl --fail --connect-timeout 5 http://server/ >&2");
$client->fail("ping -c 1 server >&2");
# And make sure that reloading the NAT job works.
- $router->succeed("systemctl restart ${unit}");
+ $router->succeed("${routerClosure}/bin/switch-to-configuration test 2>&1");
+ # FIXME: this should not be necessary, but nat.service is not started because
+ # network.target is not triggered
+ # (https://github.com/NixOS/nixpkgs/issues/16230#issuecomment-226408359)
+ ${lib.optionalString (!withFirewall) ''
+ $router->succeed("systemctl start nat.service");
+ ''}
$client->succeed("curl --fail http://server/ >&2");
$client->succeed("ping -c 1 server >&2");
'';
diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix
index 6a7e628d8ef..7708775f73f 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 00000000000..1f19fc0867a
--- /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/nginx.nix b/nixos/tests/nginx.nix
index c2beb5590ef..7f7bc0f0b4f 100644
--- a/nixos/tests/nginx.nix
+++ b/nixos/tests/nginx.nix
@@ -3,7 +3,7 @@
# generated virtual hosts config.
import ./make-test.nix ({ pkgs, ...} : {
- name = "jenkins";
+ name = "nginx";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ mbbx6spp ];
};
diff --git a/nixos/tests/plasma5.nix b/nixos/tests/plasma5.nix
index f97544b5ea5..f3bd4c5915b 100644
--- a/nixos/tests/plasma5.nix
+++ b/nixos/tests/plasma5.nix
@@ -16,17 +16,10 @@ import ./make-test.nix ({ pkgs, ...} :
# fontconfig-penultimate-0.3.3 -> 0.3.4 broke OCR apparently, but no idea why.
nixpkgs.config.packageOverrides = superPkgs: {
- fontconfig-penultimate = superPkgs.fontconfig-penultimate.overrideAttrs
- (_attrs: rec {
- version = "0.3.3";
- name = "fontconfig-penultimate-${version}";
- src = pkgs.fetchFromGitHub {
- owner = "ttuegel";
- repo = "fontconfig-penultimate";
- rev = version;
- sha256 = "0392lw31jps652dcjazln77ihb6bl7gk201gb7wb9i223avp86w9";
- };
- });
+ fontconfig-penultimate = superPkgs.fontconfig-penultimate.override {
+ version = "0.3.3";
+ sha256 = "1z76jbkb0nhf4w7fy647yyayqr4q02fgk6w58k0yi700p0m3h4c9";
+ };
};
};
diff --git a/nixos/tests/radicale.nix b/nixos/tests/radicale.nix
index 4c2ed8456dd..f694fc75ef7 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 ];
- 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/');
- }
- '';
+ 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";
+ };
+ };
+
+ # 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/timezone.nix b/nixos/tests/timezone.nix
new file mode 100644
index 00000000000..2204649a3fc
--- /dev/null
+++ b/nixos/tests/timezone.nix
@@ -0,0 +1,45 @@
+{
+ timezone-static = import ./make-test.nix ({ pkgs, ... }: {
+ name = "timezone-static";
+ meta.maintainers = with pkgs.lib.maintainers; [ lheckemann ];
+
+ machine.time.timeZone = "Europe/Amsterdam";
+
+ testScript = ''
+ $machine->waitForUnit("dbus.socket");
+ $machine->fail("timedatectl set-timezone Asia/Tokyo");
+ my @dateResult = $machine->execute('date -d @0 "+%Y-%m-%d %H:%M:%S"');
+ $dateResult[1] eq "1970-01-01 01:00:00\n" or die "Timezone seems to be wrong";
+ '';
+ });
+
+ timezone-imperative = import ./make-test.nix ({ pkgs, ... }: {
+ name = "timezone-imperative";
+ meta.maintainers = with pkgs.lib.maintainers; [ lheckemann ];
+
+ machine.time.timeZone = null;
+
+ testScript = ''
+ $machine->waitForUnit("dbus.socket");
+
+ # Should default to UTC
+ my @dateResult = $machine->execute('date -d @0 "+%Y-%m-%d %H:%M:%S"');
+ print $dateResult[1];
+ $dateResult[1] eq "1970-01-01 00:00:00\n" or die "Timezone seems to be wrong";
+
+ $machine->succeed("timedatectl set-timezone Asia/Tokyo");
+
+ # Adjustment should be taken into account
+ my @dateResult = $machine->execute('date -d @0 "+%Y-%m-%d %H:%M:%S"');
+ print $dateResult[1];
+ $dateResult[1] eq "1970-01-01 09:00:00\n" or die "Timezone was not adjusted";
+
+ # Adjustment should persist across a reboot
+ $machine->shutdown;
+ $machine->waitForUnit("dbus.socket");
+ my @dateResult = $machine->execute('date -d @0 "+%Y-%m-%d %H:%M:%S"');
+ print $dateResult[1];
+ $dateResult[1] eq "1970-01-01 09:00:00\n" or die "Timezone adjustment was not persisted";
+ '';
+ });
+}
diff --git a/nixos/tests/trac.nix b/nixos/tests/trac.nix
index d426bbde68d..5da5717d7f8 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 4f7cb176d96..a1ab7614871 100644
--- a/nixos/tests/virtualbox.nix
+++ b/nixos/tests/virtualbox.nix
@@ -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 00000000000..3ea455c393c
--- /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/pkgs/applications/altcoins/bitcoin-classic.nix b/pkgs/applications/altcoins/bitcoin-classic.nix
index 5f17eb3a1cf..d2878a17fb3 100644
--- a/pkgs/applications/altcoins/bitcoin-classic.nix
+++ b/pkgs/applications/altcoins/bitcoin-classic.nix
@@ -7,13 +7,13 @@ 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";
};
nativeBuildInputs = [ pkgconfig autoreconfHook ];
diff --git a/pkgs/applications/altcoins/bitcoin-xt.nix b/pkgs/applications/altcoins/bitcoin-xt.nix
index be4ea1fd6b6..38867619804 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 ];
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec{
Core release, applying a series of patches, and then doing deterministic
builds so anyone can check the downloads correspond to the source code.
'';
- homepage = "https://bitcoinxt.software/";
+ homepage = https://bitcoinxt.software/;
maintainers = with maintainers; [ jefdaj ];
license = licenses.mit;
platforms = platforms.unix;
diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix
index ddbe7104f1d..23c9ffe3a09 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 ];
@@ -31,7 +29,7 @@ stdenv.mkDerivation rec{
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.
'';
- homepage = "http://www.bitcoin.org/";
+ homepage = http://www.bitcoin.org/;
maintainers = with maintainers; [ roconnor AndersonTorres ];
license = licenses.mit;
platforms = platforms.unix;
diff --git a/pkgs/applications/altcoins/btc1.nix b/pkgs/applications/altcoins/btc1.nix
new file mode 100644
index 00000000000..8ade6fb5251
--- /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/cryptop/default.nix b/pkgs/applications/altcoins/cryptop/default.nix
new file mode 100644
index 00000000000..0136ab18cea
--- /dev/null
+++ b/pkgs/applications/altcoins/cryptop/default.nix
@@ -0,0 +1,24 @@
+{ lib, python2}:
+
+python2.pkgs.buildPythonApplication rec {
+ pname = "cryptop";
+ version = "0.1.0";
+ name = "${pname}-${version}";
+
+ src = python2.pkgs.fetchPypi {
+ inherit pname version;
+ sha256 = "00glnlyig1aajh30knc5rnfbamwfxpg29js2db6mymjmfka8lbhh";
+ };
+
+ propagatedBuildInputs = [ python2.pkgs.requests ];
+
+ # No tests in archive
+ doCheck = false;
+
+ meta = {
+ homepage = https://github.com/huwwp/cryptop;
+ description = "Command line Cryptocurrency Portfolio";
+ license = with lib.licenses; [ mit ];
+ maintainers = with lib.maintainers; [ bhipple ];
+ };
+}
diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix
index 1fbabc338f2..31dcc78d3d7 100644
--- a/pkgs/applications/altcoins/default.nix
+++ b/pkgs/applications/altcoins/default.nix
@@ -1,4 +1,4 @@
-{ callPackage, pkgs }:
+{ callPackage, boost155, boost162, boost163, openssl_1_1_0, haskellPackages }:
rec {
@@ -14,12 +14,15 @@ rec {
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; };
+ freicoin = callPackage ./freicoin.nix { boost = boost155; };
go-ethereum = callPackage ./go-ethereum.nix { };
go-ethereum-classic = callPackage ./go-ethereum-classic { };
@@ -32,15 +35,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 {});
+ hsevm = (haskellPackages.callPackage ./hsevm.nix {});
primecoin = callPackage ./primecoin.nix { withGui = true; };
primecoind = callPackage ./primecoin.nix { withGui = false; };
@@ -49,7 +52,7 @@ rec {
zcash = callPackage ./zcash {
withGui = false;
- openssl = pkgs.openssl_1_1_0;
- boost = pkgs.boost163;
+ openssl = openssl_1_1_0;
+ boost = boost163;
};
}
diff --git a/pkgs/applications/altcoins/freicoin.nix b/pkgs/applications/altcoins/freicoin.nix
index e8a26365361..a44dbbd62ce 100644
--- a/pkgs/applications/altcoins/freicoin.nix
+++ b/pkgs/applications/altcoins/freicoin.nix
@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
# I think that openssl and zlib are required, but come through other
# packages
+ preBuild = "unset AR";
+
installPhase = ''
mkdir -p $out/bin
cp freicoin-qt $out/bin
diff --git a/pkgs/applications/altcoins/go-ethereum-classic/default.nix b/pkgs/applications/altcoins/go-ethereum-classic/default.nix
index b7585b2f109..37d6264d82f 100644
--- a/pkgs/applications/altcoins/go-ethereum-classic/default.nix
+++ b/pkgs/applications/altcoins/go-ethereum-classic/default.nix
@@ -2,23 +2,23 @@
buildGoPackage rec {
name = "go-ethereum-classic-${version}";
- version = "3.5.0";
- rev = "402c1700fbefb9512e444b32fe12c2d674638ddb";
+ version = "3.5.86";
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 = "1k59hl3qvx4422zqlp259566fnxq5bs67jhm0v6a1zfr1k8iqzwh";
};
goDeps = ./deps.nix;
meta = {
description = "Golang implementation of Ethereum Classic";
- homepage = "https://github.com/ethereumproject/go-ethereum";
+ 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 7f7c3f304c2..4cf68fb76fd 100644
--- a/pkgs/applications/altcoins/go-ethereum.nix
+++ b/pkgs/applications/altcoins/go-ethereum.nix
@@ -1,23 +1,32 @@
-{ stdenv, lib, clang, buildGoPackage, fetchgit }:
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
name = "go-ethereum-${version}";
- version = "1.6.6";
- rev = "refs/tags/v${version}";
+ version = "1.7.0";
goPackagePath = "github.com/ethereum/go-ethereum";
- buildInputs = [ clang ];
- preBuild = "export CC=clang";
+ # Fixes Cgo related build failures (see https://github.com/NixOS/nixpkgs/issues/25959 )
+ hardeningDisable = [ "fortify" ];
- src = fetchgit {
- inherit rev;
- url = "https://${goPackagePath}";
- sha256 = "066s7fp9pbyq670xwnib4p7zaxs941r9kpvj2hm6bkr28yrpvp1a";
+ src = fetchFromGitHub {
+ owner = "ethereum";
+ repo = "go-ethereum";
+ rev = "v${version}";
+ sha256 = "0ybjaiyrfb320rab6a5r9iiqvkrcd8b2qvixzx0kjmc4a7l1q5zh";
};
- meta = {
- homepage = "https://ethereum.github.io/go-ethereum/";
+ # Fix cyclic referencing on Darwin
+ postInstall = stdenv.lib.optionalString (stdenv.isDarwin) ''
+ for file in $bin/bin/*; do
+ # Not all files are referencing $out/lib so consider this step non-critical
+ install_name_tool -delete_rpath $out/lib $file || true
+ done
+ '';
+
+ 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/hivemind.nix b/pkgs/applications/altcoins/hivemind.nix
index 1b2682f7d4c..208a2d3915f 100644
--- a/pkgs/applications/altcoins/hivemind.nix
+++ b/pkgs/applications/altcoins/hivemind.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
into a blockchain so that Bitcoin-users can speculate in Prediction
Markets.
'';
- homepage = "https://bitcoinhivemind.com";
+ homepage = https://bitcoinhivemind.com;
maintainers = with maintainers; [ canndrew ];
license = licenses.mit;
platforms = platforms.unix;
diff --git a/pkgs/applications/altcoins/hsevm.nix b/pkgs/applications/altcoins/hsevm.nix
index 6db55e9ab07..173ac83a6db 100644
--- a/pkgs/applications/altcoins/hsevm.nix
+++ b/pkgs/applications/altcoins/hsevm.nix
@@ -1,23 +1,24 @@
-{ 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
+{ mkDerivation, abstract-par, aeson, ansi-wl-pprint, 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
+, unordered-containers, vector, vty
+, fetchFromGitHub, lib, makeWrapper
+, ncurses, zlib, bzip2, solc, coreutils
}:
lib.overrideDerivation (mkDerivation rec {
pname = "hsevm";
- version = "0.3.2";
+ version = "0.6.4";
src = fetchFromGitHub {
owner = "dapphub";
repo = "hsevm";
rev = "v${version}";
- sha256 = "1c6zpphs03yfvyfbv1cjf04qh5q2miq7rpd7kx2cil77msi8hxw4";
+ sha256 = "01b67k9cam4gvsi07q3vx527m1w6p6xll64k1nl27bc8ik6jh8l9";
};
isLibrary = false;
@@ -26,15 +27,16 @@ lib.overrideDerivation (mkDerivation rec {
postInstall = ''
rm -rf $out/{lib,share}
+ wrapProgram $out/bin/hsevm --add-flags '+RTS -N$((`${coreutils}/bin/nproc` - 1)) -RTS'
'';
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
+ 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
];
executableHaskellDepends = [
readline zlib bzip2
@@ -44,10 +46,11 @@ lib.overrideDerivation (mkDerivation rec {
tasty tasty-hunit tasty-quickcheck text vector
];
- homepage = "https://github.com/dapphub/hsevm";
+ 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];
+ nativeBuildInputs = attrs.nativeBuildInputs ++ [makeWrapper];
})
diff --git a/pkgs/applications/altcoins/litecoin.nix b/pkgs/applications/altcoins/litecoin.nix
index 9b19d2f2996..ac42caa8099 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 2723bf9dabd..9efab9a8bab 100644
--- a/pkgs/applications/altcoins/memorycoin.nix
+++ b/pkgs/applications/altcoins/memorycoin.nix
@@ -22,7 +22,8 @@ stdenv.mkDerivation rec{
configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]
++ optionals withGui [ "--with-gui=qt4" ];
- preBuild = optional (!withGui) "cd src; cp makefile.unix Makefile";
+ preBuild = "unset AR;"
+ + (toString (optional (!withGui) "cd src; cp makefile.unix Makefile"));
installPhase =
if withGui
@@ -42,7 +43,7 @@ stdenv.mkDerivation rec{
Memorycoin is based on the Bitcoin code, but with some key
differences.
'';
- homepage = "http://www.bitcoin.org/";
+ homepage = http://www.bitcoin.org/;
maintainers = with maintainers; [ AndersonTorres ];
license = licenses.mit;
platforms = platforms.unix;
diff --git a/pkgs/applications/altcoins/namecoin.nix b/pkgs/applications/altcoins/namecoin.nix
index 563363b8baf..83bead0adac 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 5b393330147..00000000000
--- 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 31183670212..e6ed05dd27f 100644
--- a/pkgs/applications/altcoins/primecoin.nix
+++ b/pkgs/applications/altcoins/primecoin.nix
@@ -22,7 +22,8 @@ stdenv.mkDerivation rec{
configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]
++ optionals withGui [ "--with-gui=qt4" ];
- preBuild = optional (!withGui) "cd src; cp makefile.unix Makefile";
+ preBuild = "unset AR;"
+ + (toString (optional (!withGui) "cd src; cp makefile.unix Makefile"));
installPhase =
if withGui
diff --git a/pkgs/applications/altcoins/zcash/default.nix b/pkgs/applications/altcoins/zcash/default.nix
index 0146bad6f86..456ed41931c 100644
--- a/pkgs/applications/altcoins/zcash/default.nix
+++ b/pkgs/applications/altcoins/zcash/default.nix
@@ -1,27 +1,27 @@
{ 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.11";
src = fetchFromGitHub {
owner = "zcash";
repo = "zcash";
- rev = "f630519d865ce22a6cf72a29785f2a876902f8e1";
- sha256 = "1zjxg3dp0amjfs67469yp9b223v9hx29lkxid9wz2ivxj3paq7bv";
+ rev = "v${version}";
+ sha256 = "09474jdhsg30maqrwfxigbw3llqi8axhh82lz3a23ii2gj68ni55";
};
enableParallelBuilding = true;
buildInputs = [ pkgconfig gtest gmock gmp libsnark autoreconfHook openssl wget db62 boost zlib
- miniupnpc protobuf libevent libsodium librustzcash ]
+ protobuf libevent libsodium librustzcash ]
++ optionals stdenv.isLinux [ utillinux ]
++ optionals withGui [ qt4 qrencode ];
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec{
meta = {
description = "Peer-to-peer, anonymous electronic cash system";
- homepage = "https://z.cash/";
+ homepage = https://z.cash/;
maintainers = with maintainers; [ rht ];
license = licenses.mit;
platforms = platforms.unix;
diff --git a/pkgs/applications/altcoins/zcash/librustzcash/default.nix b/pkgs/applications/altcoins/zcash/librustzcash/default.nix
index 4ce9a279d91..2b2094c8401 100644
--- a/pkgs/applications/altcoins/zcash/librustzcash/default.nix
+++ b/pkgs/applications/altcoins/zcash/librustzcash/default.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
meta = with stdenv.lib; {
description = "Rust-language assets for Zcash";
- homepage = "https://github.com/zcash/librustzcash";
+ homepage = https://github.com/zcash/librustzcash;
maintainers = with maintainers; [ rht ];
license = with licenses; [ mit asl20 ];
platforms = platforms.unix;
diff --git a/pkgs/applications/altcoins/zcash/libsnark/ate-pairing.nix b/pkgs/applications/altcoins/zcash/libsnark/ate-pairing.nix
index c5a824cd17d..303b3bc171e 100644
--- a/pkgs/applications/altcoins/zcash/libsnark/ate-pairing.nix
+++ b/pkgs/applications/altcoins/zcash/libsnark/ate-pairing.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Optimal Ate Pairing over Barreto-Naehrig Curves";
- homepage = "https://github.com/herumi/ate-pairing";
+ homepage = https://github.com/herumi/ate-pairing;
maintainers = with maintainers; [ rht ];
license = licenses.bsd3;
platforms = platforms.unix;
diff --git a/pkgs/applications/altcoins/zcash/libsnark/default.nix b/pkgs/applications/altcoins/zcash/libsnark/default.nix
index 9dd3f6886c8..be885493dcd 100644
--- a/pkgs/applications/altcoins/zcash/libsnark/default.nix
+++ b/pkgs/applications/altcoins/zcash/libsnark/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec{
meta = with stdenv.lib; {
description = "a C++ library for zkSNARK proofs";
- homepage = "https://github.com/zcash/libsnark";
+ homepage = https://github.com/zcash/libsnark;
maintainers = with maintainers; [ rht ];
license = licenses.mit;
platforms = platforms.unix;
diff --git a/pkgs/applications/altcoins/zcash/libsnark/mie.nix b/pkgs/applications/altcoins/zcash/libsnark/mie.nix
index c92c113a27a..a66ff128293 100644
--- a/pkgs/applications/altcoins/zcash/libsnark/mie.nix
+++ b/pkgs/applications/altcoins/zcash/libsnark/mie.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- homepage = "https://github.com/herumi/mie";
+ homepage = https://github.com/herumi/mie;
maintainers = with maintainers; [ rht ];
license = licenses.bsd3;
platforms = platforms.unix;
diff --git a/pkgs/applications/altcoins/zcash/libsnark/xbyak.nix b/pkgs/applications/altcoins/zcash/libsnark/xbyak.nix
index c0b36ab9344..88d432fd163 100644
--- a/pkgs/applications/altcoins/zcash/libsnark/xbyak.nix
+++ b/pkgs/applications/altcoins/zcash/libsnark/xbyak.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1rc2nx8kj2lj13whxb9chhh79f4hmjjj4j1hpqsd0lbdb60jikrn";
};
- phases = ["unpackPhase" "installPhase"];
+ dontBuild = true;
installPhase = ''
mkdir -p $out/include
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "JIT assembler for x86, x64";
- homepage = "https://github.com/herumi/xbyak";
+ homepage = https://github.com/herumi/xbyak;
maintainers = with maintainers; [ rht ];
license = licenses.bsd3;
platforms = platforms.unix;
diff --git a/pkgs/applications/audio/a2jmidid/default.nix b/pkgs/applications/audio/a2jmidid/default.nix
index ddd34f1bfeb..efb69d4c481 100644
--- a/pkgs/applications/audio/a2jmidid/default.nix
+++ b/pkgs/applications/audio/a2jmidid/default.nix
@@ -8,8 +8,8 @@ in stdenv.mkDerivation rec {
version = "8";
src = fetchurl {
- url = "http://download.gna.org/a2jmidid/${name}.tar.bz2";
- sha256 = "0pzm0qk5ilqhwz74pydg1jwrds27vm47185dakdrxidb5bv3b5ia";
+ url = "http://repo.or.cz/a2jmidid.git/snapshot/7383d268c4bfe85df9f10df6351677659211d1ca.tar.gz";
+ sha256 = "06dgf5655znbvrd7fhrv8msv6zw8vk0hjqglcqkh90960mnnmwz7";
};
buildInputs = [ makeWrapper pkgconfig alsaLib dbus libjack2 python dbus-python ];
@@ -24,7 +24,6 @@ in stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- homepage = http://home.gna.org/a2jmidid;
description = "Daemon for exposing legacy ALSA sequencer applications in JACK MIDI system";
license = licenses.gpl2;
maintainers = [ maintainers.goibhniu ];
diff --git a/pkgs/applications/audio/abcde/default.nix b/pkgs/applications/audio/abcde/default.nix
index 6cb1ae6de71..a23af5b5caf 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/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix
index 3b675cd9020..022e33991f9 100644
--- a/pkgs/applications/audio/amarok/default.nix
+++ b/pkgs/applications/audio/amarok/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
repositories.git = git://anongit.kde.org/amarok.git;
description = "Popular music player for KDE";
license = "GPL";
- homepage = http://amarok.kde.org;
+ homepage = https://amarok.kde.org;
inherit (kdelibs4.meta) platforms;
};
}
diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix
index c447863e149..a4debfe3744 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.10";
+ tag = "5.11";
in
@@ -25,12 +25,12 @@ stdenv.mkDerivation rec {
src = fetchgit {
url = "git://git.ardour.org/ardour/ardour.git";
- rev = "9c629c0c76808cc3e8f05e43bc760f849566dce6";
- sha256 = "062igiaaj18kbismrpzbafyq1ryyqj3lh0ajqqs2s8ms675x33sl";
+ rev = "bd40b9132cbac2d2b79ba0ef480bd41d837f8f71";
+ sha256 = "0xxxjg90jzj5cj364mlhk8srkgaghxif2jj1015bra25pffk41ay";
};
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 3840d06dd46..29d0241fa02 100644
--- a/pkgs/applications/audio/ario/default.nix
+++ b/pkgs/applications/audio/ario/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
meta = {
description = "GTK2 client for MPD (Music player daemon)";
- homepage = "http://ario-player.sourceforge.net/";
+ homepage = http://ario-player.sourceforge.net/;
license = stdenv.lib.licenses.gpl2Plus;
maintainers = [ stdenv.lib.maintainers.garrison ];
platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix
index 92e6adbaa96..3fb9faa2667 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.1.3";
name = "audacity-${version}";
src = fetchurl {
url = "https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz";
- sha256 = "1ggr6g0mk36rqj7ahsg8b0b1r9kphwajzvxgn43md263rm87n04h";
+ sha256 = "11mx7gb4dbqrgfp7hm0154x3m76ddnmhf2675q5zkxn7jc5qfc6b";
};
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 \
@@ -63,6 +55,7 @@ stdenv.mkDerivation rec {
pkgconfig 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 e6addd6c4fd..ac13371dd93 100644
--- a/pkgs/applications/audio/audio-recorder/default.nix
+++ b/pkgs/applications/audio/audio-recorder/default.nix
@@ -8,20 +8,18 @@ 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 gnome3.dconf
+ 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
] ++ optional pulseaudioSupport libpulseaudio;
@@ -34,9 +32,9 @@ stdenv.mkDerivation rec {
'';
preFixup = ''
- gappsWrapperArgs+=('--prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"'
- '--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0"'
- '--prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules"')
+ gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : $out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH
+ --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : $GST_PLUGIN_SYSTEM_PATH_1_0
+ --prefix GIO_EXTRA_MODULES : ${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules)
'';
meta = with stdenv.lib; {
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 28f21799166..00000000000
--- 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/baudline/default.nix b/pkgs/applications/audio/baudline/default.nix
index e3cef30ccda..deaa3f98e52 100644
--- a/pkgs/applications/audio/baudline/default.nix
+++ b/pkgs/applications/audio/baudline/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchurl, libXmu, libXt, libX11, libXext, libXxf86vm, jack
+{ stdenv, fetchurl, libXmu, libXt, libX11, libXext, libXxf86vm, libjack2
, makeWrapper
}:
let
rpath = stdenv.lib.makeLibraryPath
- [ libXmu libXt libX11 libXext libXxf86vm jack ];
+ [ libXmu libXt libX11 libXext libXxf86vm libjack2 ];
in
stdenv.mkDerivation rec {
name = "baudline-${version}";
diff --git a/pkgs/applications/audio/bitwig-studio/default.nix b/pkgs/applications/audio/bitwig-studio/default.nix
index af0d2bbd0e9..c597e42eaa6 100644
--- a/pkgs/applications/audio/bitwig-studio/default.nix
+++ b/pkgs/applications/audio/bitwig-studio/default.nix
@@ -6,11 +6,11 @@
stdenv.mkDerivation rec {
name = "bitwig-studio-${version}";
- version = "2.0";
+ version = "2.1.3";
src = fetchurl {
url = "https://downloads.bitwig.com/stable/${version}/bitwig-studio-${version}.deb";
- sha256 = "1m7wdr0f9xi9s7q8vd66hy7fj1k0j3y5ln2yqbjwr76r9g6gkzas";
+ sha256 = "0blfw7dayl1wzys11mdixlkbr1p1d5rnwrvim1hblfpnw2zmlslb";
};
nativeBuildInputs = [ dpkg makeWrapper ];
@@ -80,6 +80,9 @@ stdenv.mkDerivation rec {
ln -s $out/libexec/bitwig-studio $out/bin/bitwig-studio
cp -r usr/share $out/share
+ substitute usr/share/applications/bitwig-studio.desktop \
+ $out/share/applications/bitwig-studio.desktop \
+ --replace /usr/bin/bitwig-studio $out/bin/bitwig-studio
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/audio/bs1770gain/default.nix b/pkgs/applications/audio/bs1770gain/default.nix
index 0241e38281b..2401a610156 100644
--- a/pkgs/applications/audio/bs1770gain/default.nix
+++ b/pkgs/applications/audio/bs1770gain/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A audio/video loudness scanner implementing ITU-R BS.1770";
license = licenses.gpl2Plus;
- homepage = "http://bs1770gain.sourceforge.net/";
+ homepage = http://bs1770gain.sourceforge.net/;
platforms = platforms.all;
};
}
diff --git a/pkgs/applications/audio/calf/default.nix b/pkgs/applications/audio/calf/default.nix
index e133df564d7..15fca59deee 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 82a6d44f643..f09791d9aa1 100644
--- a/pkgs/applications/audio/cantata/default.nix
+++ b/pkgs/applications/audio/cantata/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, cmake, vlc
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, vlc
, withQt4 ? false, qt4
-, withQt5 ? true, qtbase, qtsvg, qttools
+, withQt5 ? true, qtbase, qtmultimedia, qtsvg, qttools
# Cantata doesn't build with cdparanoia enabled so we disable that
# default for now until I (or someone else) figure it out.
@@ -34,7 +34,7 @@ assert withOnlineServices -> withTaglib;
assert withReplaygain -> withTaglib;
let
- version = "2.0.1";
+ version = "2.1.0";
pname = "cantata";
fstat = x: fn: "-DENABLE_" + fn + "=" + (if x then "ON" else "OFF");
fstats = x: map (fstat x);
@@ -44,24 +44,27 @@ stdenv.mkDerivation rec {
name = "${pname}-${version}";
src = fetchFromGitHub {
- owner = "CDrummond";
- repo = "cantata";
- rev = "v${version}";
- sha256 = "18fiz3cav41dpap42qwj9hwxf2k9fmhyg2r34yggxqi2cjlsil36";
+ owner = "CDrummond";
+ repo = "cantata";
+ rev = "v${version}";
+ sha256 = "1mwc3cyrvg8qxjn70h4i6kdkvz85xspb3wi8wrb56jrhil409fkh";
};
- buildInputs =
- [ cmake vlc ]
- ++ stdenv.lib.optional withQt4 qt4
- ++ stdenv.lib.optionals withQt5 [ qtbase qtsvg qttools ]
+ buildInputs = [ vlc ]
+ ++ stdenv.lib.optional withQt4 qt4
+ ++ stdenv.lib.optionals withQt5 [ qtbase qtmultimedia qtsvg qttools ]
++ stdenv.lib.optionals withTaglib [ taglib taglib_extras ]
++ stdenv.lib.optionals withReplaygain [ ffmpeg speex mpg123 ]
- ++ stdenv.lib.optional withCdda cdparanoia
- ++ stdenv.lib.optional withCddb libcddb
- ++ stdenv.lib.optional withLame lame
- ++ stdenv.lib.optional withMtp libmtp
- ++ stdenv.lib.optional withMusicbrainz libmusicbrainz5
- ++ stdenv.lib.optional (withTaglib && withDevices) udisks2;
+ ++ stdenv.lib.optional withCdda cdparanoia
+ ++ stdenv.lib.optional withCddb libcddb
+ ++ stdenv.lib.optional withLame lame
+ ++ stdenv.lib.optional withMtp libmtp
+ ++ stdenv.lib.optional withMusicbrainz libmusicbrainz5
+ ++ stdenv.lib.optional (withTaglib && withDevices) udisks2;
+
+ nativeBuildInputs = [ cmake pkgconfig ];
+
+ enableParallelBuilding = true;
cmakeFlags = stdenv.lib.flatten [
(fstat withQt5 "QT5")
@@ -94,6 +97,6 @@ stdenv.mkDerivation rec {
# Technically Cantata can run on Windows so if someone wants to
# bother figuring that one out, be my guest.
platforms = platforms.linux;
- maintainers = [ maintainers.fuuzetsu ];
+ maintainers = with maintainers; [ fuuzetsu ];
};
}
diff --git a/pkgs/applications/audio/caps/default.nix b/pkgs/applications/audio/caps/default.nix
index b5004291271..27724bc28e9 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/clementine-1.2.1-include-paths.patch b/pkgs/applications/audio/clementine/clementine-1.2.1-include-paths.patch
deleted file mode 100644
index 4c17846b99d..00000000000
--- a/pkgs/applications/audio/clementine/clementine-1.2.1-include-paths.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ur clementine-1.2.1-a/CMakeLists.txt clementine-1.2.1-b/CMakeLists.txt
---- clementine-1.2.1-a/CMakeLists.txt 2013-11-25 15:16:24.000000000 -0600
-+++ clementine-1.2.1-b/CMakeLists.txt 2013-12-30 17:01:48.470011058 -0600
-@@ -158,6 +158,10 @@
- include_directories(${TAGLIB_INCLUDE_DIRS})
- include_directories(${QJSON_INCLUDE_DIRS})
- include_directories(${GSTREAMER_INCLUDE_DIRS})
-+include_directories(${GSTREAMER_APP_INCLUDE_DIRS})
-+include_directories(${GSTREAMER_BASE_INCLUDE_DIRS})
-+include_directories(${GSTREAMER_CDDA_INCLUDE_DIRS})
-+include_directories(${GSTREAMER_TAG_INCLUDE_DIRS})
- include_directories(${GLIB_INCLUDE_DIRS})
- include_directories(${GLIBCONFIG_INCLUDE_DIRS})
- include_directories(${LIBXML_INCLUDE_DIRS})
diff --git a/pkgs/applications/audio/clementine/clementine-dbus-namespace.patch b/pkgs/applications/audio/clementine/clementine-dbus-namespace.patch
deleted file mode 100644
index 2240debd0e4..00000000000
--- a/pkgs/applications/audio/clementine/clementine-dbus-namespace.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From ec580cb815c16ec1ab43a469d5af7d51d8d03082 Mon Sep 17 00:00:00 2001
-From: Chocobozzz
-Date: Wed, 16 Jul 2014 15:57:25 +0200
-Subject: [PATCH] No namespaces for DBus interfaces. Fixes #4401
-
----
- src/CMakeLists.txt | 9 ++++-----
- 1 file changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 650fa74..775b0a5 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -892,11 +892,6 @@ optional_source(LINUX SOURCES widgets/osd_x11.cpp)
- if(HAVE_DBUS)
- file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/dbus)
-
-- # Hack to get it to generate interfaces without namespaces - required
-- # because otherwise org::freedesktop::UDisks and
-- # org::freedesktop::UDisks::Device conflict.
-- list(APPEND QT_DBUSXML2CPP_EXECUTABLE -N)
--
- # MPRIS DBUS interfaces
- qt4_add_dbus_adaptor(SOURCES
- dbus/org.freedesktop.MediaPlayer.player.xml
-@@ -964,6 +959,10 @@ if(HAVE_DBUS)
-
- # DeviceKit DBUS interfaces
- if(HAVE_DEVICEKIT)
-+ set_source_files_properties(dbus/org.freedesktop.UDisks.xml
-+ PROPERTIES NO_NAMESPACE dbus/udisks)
-+ set_source_files_properties(dbus/org.freedesktop.UDisks.Device.xml
-+ PROPERTIES NO_NAMESPACE dbus/udisksdevice)
- qt4_add_dbus_interface(SOURCES
- dbus/org.freedesktop.UDisks.xml
- dbus/udisks)
diff --git a/pkgs/applications/audio/clementine/clementine-spotify-blob-remove-from-build.patch b/pkgs/applications/audio/clementine/clementine-spotify-blob-remove-from-build.patch
new file mode 100644
index 00000000000..226536a13ba
--- /dev/null
+++ b/pkgs/applications/audio/clementine/clementine-spotify-blob-remove-from-build.patch
@@ -0,0 +1,21 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 23070d9..83b6772 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -275,8 +275,6 @@ optional_component(LIBPULSE ON "Pulse audio integration"
+ optional_component(VISUALISATIONS ON "Visualisations")
+
+ if(NOT HAVE_SPOTIFY_BLOB AND NOT CRYPTOPP_FOUND)
+- message(FATAL_ERROR "Either crypto++ must be available or the non-GPL Spotify "
+- "code must be compiled in")
+ elseif(CRYPTOPP_FOUND)
+ set(HAVE_CRYPTOPP ON)
+ set(HAVE_SPOTIFY_DOWNLOADER ON)
+@@ -434,7 +432,6 @@ if(HAVE_BREAKPAD)
+ endif(HAVE_BREAKPAD)
+
+ if(HAVE_SPOTIFY_BLOB)
+- add_subdirectory(ext/clementine-spotifyblob)
+ endif(HAVE_SPOTIFY_BLOB)
+
+ if(HAVE_MOODBAR)
diff --git a/pkgs/applications/audio/clementine/clementine-spotify-blob.patch b/pkgs/applications/audio/clementine/clementine-spotify-blob.patch
index d41720c9021..344fc31d70d 100644
--- a/pkgs/applications/audio/clementine/clementine-spotify-blob.patch
+++ b/pkgs/applications/audio/clementine/clementine-spotify-blob.patch
@@ -1,25 +1,13 @@
-From d9ebe7ec09a48b1ea505ccc33686b72642f083f4 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel
-Date: Mon, 4 May 2015 19:59:38 -0500
-Subject: [PATCH] Runtime selection of Spotify blob
-
----
- src/internet/spotifyservice.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/internet/spotifyservice.cpp b/src/internet/spotifyservice.cpp
-index 543744e..d987a36 100644
---- a/src/internet/spotifyservice.cpp
-+++ b/src/internet/spotifyservice.cpp
-@@ -65,7 +65,7 @@ SpotifyService::SpotifyService(Application* app, InternetModel* parent)
+diff --git a/src/internet/spotify/spotifyservice.cpp b/src/internet/spotify/spotifyservice.cpp
+index 88c7383..6e0893c 100644
+--- a/src/internet/spotify/spotifyservice.cpp
++++ b/src/internet/spotify/spotifyservice.cpp
+@@ -94,7 +94,7 @@ SpotifyService::SpotifyService(Application* app, InternetModel* parent)
system_blob_path_ = QCoreApplication::applicationDirPath() +
- "/../PlugIns/clementine-spotifyblob";
+ "/../PlugIns/clementine-spotifyblob";
#else
- system_blob_path_ = QCoreApplication::applicationDirPath() +
+ system_blob_path_ = qgetenv("CLEMENTINE_SPOTIFYBLOB") +
- "/clementine-spotifyblob" CMAKE_EXECUTABLE_SUFFIX;
+ "/clementine-spotifyblob" CMAKE_EXECUTABLE_SUFFIX;
#endif
---
-2.3.6
-
diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix
index 78841da46c5..affddd90784 100644
--- a/pkgs/applications/audio/clementine/default.nix
+++ b/pkgs/applications/audio/clementine/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, boost, cmake, gettext, gstreamer, gst-plugins-base
-, liblastfm, qt4, taglib, fftw, glew, qjson, sqlite, libgpod, libplist
-, usbmuxd, libmtp, gvfs, libcdio, libspotify, protobuf, qca2, pkgconfig
-, sparsehash, config, makeWrapper, runCommand, gst_plugins }:
+{ 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, projectm, protobuf
+, qca2, pkgconfig, sparsehash, config, makeWrapper, runCommand, gst_plugins }:
let
withSpotify = config.clementine.spotify or false;
@@ -10,32 +10,38 @@ let
withCD = config.clementine.cd or true;
withCloud = config.clementine.cloud or true;
- version = "1.2.3";
+ version = "1.3.1";
exeName = "clementine";
src = fetchurl {
- url = https://github.com/clementine-player/Clementine/archive/1.2.3.tar.gz;
- sha256 = "1gx1109i4pylz6x7gvp4rdzc6dvh0w6in6hfbygw01d08l26bxbx";
+ url = https://github.com/clementine-player/Clementine/archive/1.3.1.tar.gz;
+ sha256 = "0z7k73wyz54c3020lb6x2dgw0vz4ri7wcl3vs03qdj5pk8d971gq";
};
patches = [
- ./clementine-1.2.1-include-paths.patch
- ./clementine-dbus-namespace.patch
./clementine-spotify-blob.patch
+ # Required so as to avoid adding libspotify as a build dependency (as it is
+ # unfree and thus would prevent us from having a free package).
+ ./clementine-spotify-blob-remove-from-build.patch
];
+ nativeBuildInputs = [ cmake pkgconfig ];
+
buildInputs = [
boost
- cmake
+ chromaprint
fftw
gettext
glew
- gst-plugins-base
- gstreamer
+ gst_all_1.gst-plugins-base
+ gst_all_1.gstreamer
gvfs
+ libechonest
liblastfm
- pkgconfig
+ libpulseaudio
+ pcre
+ projectm
protobuf
qca2
qjson
@@ -48,18 +54,25 @@ 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";
+ homepage = http://www.clementine-player.org;
description = "A multiplatform music player";
license = licenses.gpl3Plus;
platforms = platforms.linux;
@@ -71,7 +84,12 @@ let
blob = stdenv.mkDerivation {
name = "clementine-blob-${version}";
# Use the same patches and sources as Clementine
- inherit patches src;
+ inherit src nativeBuildInputs postPatch;
+
+ patches = [
+ ./clementine-spotify-blob.patch
+ ];
+
buildInputs = buildInputs ++ [ libspotify ];
# Only build and install the Spotify blob
preBuild = ''
@@ -84,7 +102,7 @@ let
'';
enableParallelBuilding = true;
meta = with stdenv.lib; {
- homepage = "http://www.clementine-player.org";
+ homepage = http://www.clementine-player.org;
description = "Spotify integration for Clementine";
# The blob itself is Apache-licensed, although libspotify is unfree.
license = licenses.asl20;
@@ -104,22 +122,20 @@ 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;
};
}
''
mkdir -p $out/bin
makeWrapper "$free/bin/${exeName}" "$out/bin/${exeName}" \
${optionalString withSpotify "--set CLEMENTINE_SPOTIFYBLOB \"$blob/libexec/clementine\""} \
- --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH"
+ --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0"
mkdir -p $out/share
for dir in applications icons kde4; do
diff --git a/pkgs/applications/audio/clerk/default.nix b/pkgs/applications/audio/clerk/default.nix
index babbcc51e40..4da2228c6c1 100644
--- a/pkgs/applications/audio/clerk/default.nix
+++ b/pkgs/applications/audio/clerk/default.nix
@@ -13,13 +13,11 @@ stdenv.mkDerivation {
buildInputs = [ makeWrapper pythonPackages.mpd2 ];
- buildPhase = ''
- echo skipping build phase...
- '';
+ dontBuild = true;
installPhase = ''
DESTDIR=$out PREFIX=/ make install
- wrapProgram $out/bin/clerk $out/bin/clerk \
+ wrapProgram $out/bin/clerk \
--prefix PATH : "${stdenv.lib.makeBinPath [ rofi mpc_cli perl utillinux libnotify ]}"
'';
diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix
index c9346248438..633ba3832c2 100644
--- a/pkgs/applications/audio/cmus/default.nix
+++ b/pkgs/applications/audio/cmus/default.nix
@@ -121,6 +121,8 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optionals stdenv.isDarwin [ libiconv CoreAudio ]
++ concatMap (a: a.deps) opts;
+ makeFlags = [ "LD=$(CC)" ];
+
meta = with stdenv.lib; {
description = "Small, fast and powerful console music player for Linux and *BSD";
homepage = https://cmus.github.io/;
diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix
index 07f9e565c2a..1552982cf1a 100644
--- a/pkgs/applications/audio/deadbeef/default.nix
+++ b/pkgs/applications/audio/deadbeef/default.nix
@@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Ultimate Music Player for GNU/Linux";
- homepage = "http://deadbeef.sourceforge.net/";
+ homepage = http://deadbeef.sourceforge.net/;
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = [ maintainers.abbradar ];
diff --git a/pkgs/applications/audio/deadbeef/plugins/mpris2.nix b/pkgs/applications/audio/deadbeef/plugins/mpris2.nix
index 871621d3bb1..c6509b5f460 100644
--- a/pkgs/applications/audio/deadbeef/plugins/mpris2.nix
+++ b/pkgs/applications/audio/deadbeef/plugins/mpris2.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "MPRISv2 plugin for the DeaDBeeF music player";
- homepage = "https://github.com/Serranya/deadbeef-mpris2-plugin/";
+ homepage = https://github.com/Serranya/deadbeef-mpris2-plugin/;
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = [ maintainers.abbradar ];
diff --git a/pkgs/applications/audio/dirt/default.nix b/pkgs/applications/audio/dirt/default.nix
index bb317ca7a40..740d6d8d7e0 100644
--- a/pkgs/applications/audio/dirt/default.nix
+++ b/pkgs/applications/audio/dirt/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "An unimpressive thingie for playing bits of samples with some level of accuracy";
- homepage = "https://github.com/tidalcycles/Dirt";
+ homepage = https://github.com/tidalcycles/Dirt;
license = licenses.gpl3;
maintainers = with maintainers; [ anderspapitto ];
platforms = with platforms; linux;
diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix
index 5d4e19700d8..9d157833c0d 100644
--- a/pkgs/applications/audio/distrho/default.nix
+++ b/pkgs/applications/audio/distrho/default.nix
@@ -2,12 +2,12 @@
, libxslt, lv2, pkgconfig, premake3, xorg, ladspa-sdk }:
stdenv.mkDerivation rec {
- name = "distrho-ports-unstable-2016-06-26";
+ name = "distrho-ports-unstable-2017-08-04";
src = fetchgit {
url = "https://github.com/DISTRHO/DISTRHO-Ports.git";
- rev = "e3969853ec9ba897c50ac060f0167313e2a18b29";
- sha256 = "0id4p8dlnlv5271yvmyawfr754nzah7xhvjkj633lw5yr3mq707m";
+ rev = "f591a1066cd3929536699bb516caa4b5efd9d025";
+ sha256 = "1qjnmpmwbq2zpwn8v1dmqn3bjp2ykj5p89fkjax7idgpx1cg7pp9";
};
patchPhase = ''
diff --git a/pkgs/applications/audio/drumgizmo/default.nix b/pkgs/applications/audio/drumgizmo/default.nix
index 7a2e2a6da45..c42d290c599 100644
--- a/pkgs/applications/audio/drumgizmo/default.nix
+++ b/pkgs/applications/audio/drumgizmo/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "An LV2 sample based drum plugin";
- homepage = http://www.drumgizmo.org;
+ homepage = https://www.drumgizmo.org;
license = licenses.lgpl3;
platforms = platforms.linux;
maintainers = [ maintainers.goibhniu maintainers.nico202 ];
diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix
index 064feeb02a3..fb62b6ea3de 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/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix
index e9186cd3242..f9c9dc2faef 100644
--- a/pkgs/applications/audio/easytag/default.nix
+++ b/pkgs/applications/audio/easytag/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
preFixup = ''
wrapProgram $out/bin/easytag \
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share" \
- --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules"
+ --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules"
'';
NIX_LDFLAGS = "-lid3tag -lz";
@@ -24,12 +24,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper pkgconfig intltool ];
buildInputs = [
gtk3 glib libid3tag id3lib taglib libvorbis libogg flac
- itstool libxml2 gsettings_desktop_schemas gnome3.defaultIconTheme gnome3.dconf
+ itstool libxml2 gsettings_desktop_schemas gnome3.defaultIconTheme (stdenv.lib.getLib gnome3.dconf)
];
meta = with stdenv.lib; {
description = "View and edit tags for various audio files";
- homepage = "http://projects.gnome.org/easytag/";
+ homepage = http://projects.gnome.org/easytag/;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ fuuzetsu ];
platforms = platforms.linux;
diff --git a/pkgs/applications/audio/espeak-ng/default.nix b/pkgs/applications/audio/espeak-ng/default.nix
index cb2e15bc5b2..889506deb76 100644
--- a/pkgs/applications/audio/espeak-ng/default.nix
+++ b/pkgs/applications/audio/espeak-ng/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Open source speech synthesizer that supports over 70 languages, based on eSpeak";
- homepage = "https://github.com/espeak-ng/espeak-ng";
+ homepage = https://github.com/espeak-ng/espeak-ng;
license = licenses.gpl3;
maintainers = with maintainers; [ aske ];
platforms = platforms.linux;
diff --git a/pkgs/applications/audio/espeak/default.nix b/pkgs/applications/audio/espeak/default.nix
index 0faf4841c71..6b5101b50b5 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 524a95bcca0..11a0576bf43 100644
--- a/pkgs/applications/audio/espeak/edit.nix
+++ b/pkgs/applications/audio/espeak/edit.nix
@@ -20,9 +20,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 00000000000..1e0cb20bbf7
--- /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 00000000000..58036ecbe50
--- /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/flac/default.nix b/pkgs/applications/audio/flac/default.nix
index 52e29e3da4c..425b2b866a5 100644
--- a/pkgs/applications/audio/flac/default.nix
+++ b/pkgs/applications/audio/flac/default.nix
@@ -12,10 +12,10 @@ stdenv.mkDerivation rec {
#doCheck = true; # takes lots of time
- outputs = [ "bin" "dev" "out" "doc" ];
+ outputs = [ "bin" "dev" "out" "man" "doc" ];
meta = with stdenv.lib; {
- homepage = http://xiph.org/flac/;
+ homepage = https://xiph.org/flac/;
description = "Library and tools for encoding and decoding the FLAC lossless audio file format";
platforms = platforms.all;
maintainers = [ maintainers.mornfall ];
diff --git a/pkgs/applications/audio/fldigi/default.nix b/pkgs/applications/audio/fldigi/default.nix
index 2ee03a3f399..545e7c5047a 100644
--- a/pkgs/applications/audio/fldigi/default.nix
+++ b/pkgs/applications/audio/fldigi/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Digital modem program";
- homepage = http://sourceforge.net/projects/fldigi/;
+ homepage = https://sourceforge.net/projects/fldigi/;
license = stdenv.lib.licenses.gpl3Plus;
maintainers = with stdenv.lib.maintainers; [ relrod ftrvxmtrx ];
platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/audio/freewheeling/default.nix b/pkgs/applications/audio/freewheeling/default.nix
index 6b4913d30dc..25704d26280 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" ];
@@ -37,11 +39,11 @@ stdenv.mkDerivation rec {
improv. We leave mice and menus, and dive into our own process
of making sound.
- Freewheeling runs under Mac OS X and Linux, and is open source
+ Freewheeling runs under macOS and Linux, and is open source
software, released under the GNU GPL license.
'' ;
- homepage = "http://freewheeling.sourceforge.net";
+ homepage = http://freewheeling.sourceforge.net;
license = stdenv.lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.sepi ];
platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/audio/game-music-emu/default.nix b/pkgs/applications/audio/game-music-emu/default.nix
index 4f22ca62c1a..a0a79785283 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/google-play-music-desktop-player/default.nix b/pkgs/applications/audio/google-play-music-desktop-player/default.nix
index 47b85af724a..9d9af631183 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.3.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 = "0mbrfnsnajmpwyqyrjmcv84ywzimjmm2b8faxqiwfcikdgpm9amb";
+ sha256 = "0jqgawgij6jxf3zy3glviqj6s34mq7d756syg2c7kk1gkqkwgdpw";
};
dontBuild = true;
diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix
index 5a10d1262f4..f49962450a0 100644
--- a/pkgs/applications/audio/gpodder/default.nix
+++ b/pkgs/applications/audio/gpodder/default.nix
@@ -61,7 +61,7 @@ python2Packages.buildPythonApplication rec {
gPodder downloads and manages free audio and video content (podcasts)
for you. Listen directly on your computer or on your mobile devices.
'';
- homepage = "http://gpodder.org/";
+ homepage = http://gpodder.org/;
license = licenses.gpl3;
platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ skeidel mic92 ];
diff --git a/pkgs/applications/audio/gtklick/default.nix b/pkgs/applications/audio/gtklick/default.nix
index c0a137d7de9..fae8d3e4b60 100644
--- a/pkgs/applications/audio/gtklick/default.nix
+++ b/pkgs/applications/audio/gtklick/default.nix
@@ -28,7 +28,7 @@ pythonPackages.buildPythonApplication rec {
'';
meta = {
- homepage = "http://das.nasophon.de/gtklick/";
+ homepage = http://das.nasophon.de/gtklick/;
description = "Simple metronome with an easy-to-use GTK interface";
license = stdenv.lib.licenses.gpl2Plus;
};
diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix
index 6073008d541..b149aab06e1 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/i-score/default.nix b/pkgs/applications/audio/i-score/default.nix
index 1a47b74e21c..69fc4b419c0 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 d72a2b13c42..d56ac753405 100644
--- a/pkgs/applications/audio/iannix/default.nix
+++ b/pkgs/applications/audio/iannix/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Graphical open-source sequencer,";
- homepage = http://www.iannix.org/;
+ homepage = https://www.iannix.org/;
license = stdenv.lib.licenses.lgpl3;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.nico202 ];
diff --git a/pkgs/applications/audio/jackmix/default.nix b/pkgs/applications/audio/jackmix/default.nix
index e9e3fd53e54..f0cd3bd0427 100644
--- a/pkgs/applications/audio/jackmix/default.nix
+++ b/pkgs/applications/audio/jackmix/default.nix
@@ -7,6 +7,8 @@ stdenv.mkDerivation rec {
sha256 = "18f5v7g66mgarhs476frvayhch7fy4nyjf2xivixc061ipn0m82j";
};
+ patches = [ ./no_error.patch ];
+
buildInputs = [
pkgconfig
scons
@@ -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 00000000000..d1a714ded9c
--- /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/klick/default.nix b/pkgs/applications/audio/klick/default.nix
index 1b31eed0699..c51795e756c 100644
--- a/pkgs/applications/audio/klick/default.nix
+++ b/pkgs/applications/audio/klick/default.nix
@@ -11,6 +11,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ scons pkgconfig libsamplerate libsndfile liblo libjack2 boost ];
+ NIX_CFLAGS_COMPILE = "-fpermissive";
buildPhase = ''
mkdir -p $out
@@ -20,7 +21,7 @@ stdenv.mkDerivation rec {
installPhase = "scons install";
meta = {
- homepage = "http://das.nasophon.de/klick/";
+ homepage = http://das.nasophon.de/klick/;
description = "Advanced command-line metronome for JACK";
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/audio/lastfmsubmitd/default.nix b/pkgs/applications/audio/lastfmsubmitd/default.nix
index ea182d73a5b..01b450ab7dd 100644
--- a/pkgs/applications/audio/lastfmsubmitd/default.nix
+++ b/pkgs/applications/audio/lastfmsubmitd/default.nix
@@ -15,7 +15,7 @@ pythonPackages.buildPythonApplication rec {
installCommand = "python setup.py install --prefix=$out";
meta = {
- homepage = "http://www.red-bean.com/decklin/lastfmsubmitd/";
+ homepage = http://www.red-bean.com/decklin/lastfmsubmitd/;
description = "An last.fm audio scrobbler and daemon";
};
}
diff --git a/pkgs/applications/audio/lastwatch/default.nix b/pkgs/applications/audio/lastwatch/default.nix
index 0e4e1a5a8a3..fff16649333 100644
--- a/pkgs/applications/audio/lastwatch/default.nix
+++ b/pkgs/applications/audio/lastwatch/default.nix
@@ -18,7 +18,7 @@ python2Packages.buildPythonApplication rec {
];
meta = {
- homepage = "https://github.com/aszlig/LastWatch";
+ homepage = https://github.com/aszlig/LastWatch;
description = "An inotify-based last.fm audio scrobbler";
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix
index 5bd8068cd4c..dcefbb06436 100644
--- a/pkgs/applications/audio/lmms/default.nix
+++ b/pkgs/applications/audio/lmms/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Linux MultiMedia Studio";
- homepage = "http://lmms.sourceforge.net";
+ homepage = https://lmms.io;
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = [ maintainers.goibhniu ];
diff --git a/pkgs/applications/audio/milkytracker/default.nix b/pkgs/applications/audio/milkytracker/default.nix
index f22ccd08a8e..6a71971c5fd 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/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix
index d7cdfcf0d08..6d353344b07 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,6 +13,18 @@ stdenv.mkDerivation rec {
sha256 = "0vb71w1yq0xwwsclrn2jj9bk8w4n14rfv5c0aw46c11mp8xz7f71";
};
+ 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
libusb1 libvorbis pkgconfig portaudio portmidi protobuf qt4
@@ -40,7 +52,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- homepage = http://mixxx.org;
+ homepage = https://mixxx.org;
description = "Digital DJ mixing software";
license = licenses.gpl2Plus;
maintainers = [ maintainers.aszlig maintainers.goibhniu ];
diff --git a/pkgs/applications/audio/monkeys-audio/buildfix.diff b/pkgs/applications/audio/monkeys-audio/buildfix.diff
index 3c48f6ad828..9684e5bf8e4 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 ab2a23b1994..b792ec3428e 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 a39c6327763..6e2312c3390 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.0.5";
+ version = "3.4.1";
src = pythonPackages.fetchPypi {
inherit version;
pname = "Mopidy-Iris";
- sha256 = "0rabpzmiis13z4qz3vqlsfc9xjkwracafckahnq2cq97qawyq9y9";
+ sha256 = "04fjj2n5v53ykxnjgna1y8bvk7g3x0yiqisvzrdva693lfz9cbgx";
};
propagatedBuildInputs = [
@@ -19,7 +19,7 @@ pythonPackages.buildPythonApplication rec {
];
meta = with stdenv.lib; {
- homepage = "https://github.com/jaedb/Iris";
+ homepage = https://github.com/jaedb/Iris;
description = "A fully-functional Mopidy web client encompassing Spotify and many other backends";
license = licenses.asl20;
maintainers = [ maintainers.rvolosatovs ];
diff --git a/pkgs/applications/audio/mopidy-local-images/default.nix b/pkgs/applications/audio/mopidy-local-images/default.nix
index e9538273568..b09db88bbcb 100644
--- a/pkgs/applications/audio/mopidy-local-images/default.nix
+++ b/pkgs/applications/audio/mopidy-local-images/default.nix
@@ -19,7 +19,7 @@ pythonPackages.buildPythonApplication rec {
];
meta = with stdenv.lib; {
- homepage = "https://github.com/mopidy/mopidy-local-images";
+ homepage = https://github.com/mopidy/mopidy-local-images;
description = "Mopidy local library proxy extension for handling embedded album art";
license = licenses.asl20;
maintainers = [ maintainers.rvolosatovs ];
diff --git a/pkgs/applications/audio/mopidy-local-sqlite/default.nix b/pkgs/applications/audio/mopidy-local-sqlite/default.nix
index 54501895e31..7aebc43dabb 100644
--- a/pkgs/applications/audio/mopidy-local-sqlite/default.nix
+++ b/pkgs/applications/audio/mopidy-local-sqlite/default.nix
@@ -18,7 +18,7 @@ pythonPackages.buildPythonApplication rec {
];
meta = with stdenv.lib; {
- homepage = "https://github.com/mopidy/mopidy-local-sqlite";
+ homepage = https://github.com/mopidy/mopidy-local-sqlite;
description = "Mopidy SQLite local library extension";
license = licenses.asl20;
maintainers = [ maintainers.rvolosatovs ];
diff --git a/pkgs/applications/audio/mp3info/default.nix b/pkgs/applications/audio/mp3info/default.nix
index 5f1d2bfa93d..1a1ebc56a84 100644
--- a/pkgs/applications/audio/mp3info/default.nix
+++ b/pkgs/applications/audio/mp3info/default.nix
@@ -39,6 +39,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/mp3splt/default.nix b/pkgs/applications/audio/mp3splt/default.nix
index 0fa9022f67b..f2922e7eecf 100644
--- a/pkgs/applications/audio/mp3splt/default.nix
+++ b/pkgs/applications/audio/mp3splt/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Utility to split mp3, ogg vorbis and FLAC files without decoding";
- homepage = http://sourceforge.net/projects/mp3splt/;
+ homepage = https://sourceforge.net/projects/mp3splt/;
license = licenses.gpl2;
maintainers = [ maintainers.bosu ];
platforms = platforms.unix;
diff --git a/pkgs/applications/audio/padthv1/default.nix b/pkgs/applications/audio/padthv1/default.nix
new file mode 100644
index 00000000000..820ff385c10
--- /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/paprefs/default.nix b/pkgs/applications/audio/paprefs/default.nix
index 7cce08e733d..f21c171ef60 100644
--- a/pkgs/applications/audio/paprefs/default.nix
+++ b/pkgs/applications/audio/paprefs/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
dialog for the PulseAudio sound server.
'';
- homepage = "http://freedesktop.org/software/pulseaudio/paprefs/";
+ homepage = http://freedesktop.org/software/pulseaudio/paprefs/;
license = licenses.gpl2Plus;
diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix
index f218767c55e..69db9d74ee3 100644
--- a/pkgs/applications/audio/pavucontrol/default.nix
+++ b/pkgs/applications/audio/pavucontrol/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
easily control the volume of all clients, sinks, etc.
'';
- homepage = "http://freedesktop.org/software/pulseaudio/pavucontrol/";
+ homepage = http://freedesktop.org/software/pulseaudio/pavucontrol/;
license = stdenv.lib.licenses.gpl2Plus;
diff --git a/pkgs/applications/audio/pd-plugins/zexy/default.nix b/pkgs/applications/audio/pd-plugins/zexy/default.nix
index 7cd244c9ea4..8b7c2121bd7 100644
--- a/pkgs/applications/audio/pd-plugins/zexy/default.nix
+++ b/pkgs/applications/audio/pd-plugins/zexy/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
buildInputs = [ autoconf automake puredata ];
- patchPhase = ''
+ preBuild = ''
+ export LD=$CXX
cd src/
for i in ${puredata}/include/pd/*; do
ln -s $i .
diff --git a/pkgs/applications/audio/pianobar/default.nix b/pkgs/applications/audio/pianobar/default.nix
index 87f79583c3b..7dc3e00ebf7 100644
--- a/pkgs/applications/audio/pianobar/default.nix
+++ b/pkgs/applications/audio/pianobar/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A console front-end for Pandora.com";
- homepage = "http://6xq.net/projects/pianobar/";
+ homepage = http://6xq.net/projects/pianobar/;
platforms = platforms.linux;
license = licenses.mit; # expat version
maintainers = with maintainers; [ eduarrrd ];
diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix
index 886a77bb714..66f68c066c8 100644
--- a/pkgs/applications/audio/picard/default.nix
+++ b/pkgs/applications/audio/picard/default.nix
@@ -27,7 +27,7 @@ in pythonPackages.buildPythonApplication {
doCheck = false;
meta = with stdenv.lib; {
- homepage = "http://musicbrainz.org/doc/MusicBrainz_Picard";
+ homepage = http://musicbrainz.org/doc/MusicBrainz_Picard;
description = "The official MusicBrainz tagger";
maintainers = with maintainers; [ ehmry ];
license = licenses.gpl2;
diff --git a/pkgs/applications/audio/playbar2/default.nix b/pkgs/applications/audio/playbar2/default.nix
new file mode 100644
index 00000000000..16d5eb69cb9
--- /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/ponymix/default.nix b/pkgs/applications/audio/ponymix/default.nix
index ced5262f5d2..5cfbb7bf5a4 100644
--- a/pkgs/applications/audio/ponymix/default.nix
+++ b/pkgs/applications/audio/ponymix/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "CLI PulseAudio Volume Control";
- homepage = "http://github.com/falconindy/ponymix";
+ homepage = https://github.com/falconindy/ponymix;
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ ericsagnes ];
diff --git a/pkgs/applications/audio/projectm/default.nix b/pkgs/applications/audio/projectm/default.nix
index 764ee629dbf..e7aace763a1 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
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
meta = {
description = "Music Visualizer";
- homepage = "http://projectm.sourceforge.net/";
+ homepage = http://projectm.sourceforge.net/;
license = stdenv.lib.licenses.lgpl21Plus;
platforms = stdenv.lib.platforms.linux;
};
@@ -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/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix
index b28f66aaad7..77c82f1737c 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/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix
index fa582d85215..2e6d61b693d 100644
--- a/pkgs/applications/audio/quodlibet/default.nix
+++ b/pkgs/applications/audio/quodlibet/default.nix
@@ -75,6 +75,6 @@ in buildPythonApplication {
'';
maintainers = [ stdenv.lib.maintainers.coroa ];
- homepage = http://code.google.com/p/quodlibet/;
+ homepage = https://quodlibet.readthedocs.io/en/latest/;
};
}
diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix
index 91e8f1be6ec..d02c551be8a 100644
--- a/pkgs/applications/audio/renoise/default.nix
+++ b/pkgs/applications/audio/renoise/default.nix
@@ -1,36 +1,35 @@
-{ stdenv, lib, requireFile, demo, fetchurl, libX11, libXext, libXcursor, libXrandr, libjack2, alsaLib, ... }:
+{ stdenv, lib, fetchurl, libX11, libXext, libXcursor, libXrandr, libjack2, alsaLib, releasePath ? null }:
+# To use the full release version:
+# 1) Sign into https://backstage.renoise.com and download the appropriate (x86 or x86_64) version
+# for your machine to some stable location.
+# 2) Override the releasePath attribute to point to the location of the newly downloaded bundle.
+# Note: Renoise creates an individual build for each license which screws somewhat with the
+# use of functions like requireFile as the hash will be different for every user.
+let fileversion = "3_1_0";
+in
stdenv.mkDerivation rec {
name = "renoise";
-
buildInputs = [ libX11 libXext libXcursor libXrandr alsaLib libjack2 ];
src =
if stdenv.system == "x86_64-linux" then
- if demo then
+ if builtins.isNull releasePath then
fetchurl {
- url = "http://files.renoise.com/demo/Renoise_3_0_1_Demo_x86_64.tar.bz2";
- sha256 = "1q7f94wz2dbz659kpp53a3n1qyndsk0pkb29lxdff4pc3ddqwykg";
+ url = "http://files.renoise.com/demo/Renoise_${fileversion}_Demo_x86_64.tar.bz2";
+ sha256 = "0pan68fr22xbj7a930y29527vpry3f07q3i9ya4fp6g7aawffsga";
}
else
- requireFile {
- url = "http://backstage.renoise.com/frontend/app/index.html#/login";
- name = "rns_3_0_1_linux_x86_64.tar.gz";
- sha256 = "1yb5w5jrg9dk9fg5rfvfk6p0rxn4r4i32vxp2l9lzhbs02pv15wd";
- }
+ releasePath
else if stdenv.system == "i686-linux" then
- if demo then
+ if builtins.isNull releasePath then
fetchurl {
- url = "http://files.renoise.com/demo/Renoise_3_0_1_Demo_x86.tar.bz2";
- sha256 = "0dgqvib4xh2yhgh2wajj11wsb6xiiwgfkhyz32g8vnyaij5q8f58";
+ url = "http://files.renoise.com/demo/Renoise_${fileversion}_Demo_x86.tar.bz2";
+ sha256 = "1lccjj4k8hpqqxxham5v01v2rdwmx3c5kgy1p9lqvzqma88k4769";
}
else
- requireFile {
- url = "http://backstage.renoise.com/frontend/app/index.html#/login";
- name = "rns_3_0_1_reg_x86.tar.gz";
- sha256 = "1swax2jz0gswdpzz8alwjfd8rhigc2yfspj7p8wvdvylqrf7n8q7";
- }
- else throw "platform is not suppored by Renoise";
+ releasePath
+ else throw "Platform is not supported by Renoise";
installPhase = ''
cp -r Resources $out
diff --git a/pkgs/applications/audio/rosegarden/default.nix b/pkgs/applications/audio/rosegarden/default.nix
index 00d7559cd58..4fec0d0c37b 100644
--- a/pkgs/applications/audio/rosegarden/default.nix
+++ b/pkgs/applications/audio/rosegarden/default.nix
@@ -1,24 +1,26 @@
-{ stdenv, fetchurl, qt4, pkgconfig, ladspaPlugins, ladspaH,
+{ stdenv, fetchurl, cmake, qt4, pkgconfig, ladspaPlugins, ladspaH,
dssi, liblo, liblrdf, fftwSinglePrec, libsndfile,
libsamplerate, perl, makedepend, libjack2,
withLirc ? false, lirc ? null } :
stdenv.mkDerivation (rec {
- version = "15.08";
+ version = "17.04";
name = "rosegarden-${version}";
+
src = fetchurl {
url = "mirror://sourceforge/rosegarden/${name}.tar.bz2";
- sha256 = "1pk24bhpsmvn6rkqgll31na44w03banra1y7kiqd0gajlnw7wlls";
+ 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
-
+ QTDIR = qt4;
+
+ buildInputs = [
+ cmake qt4 pkgconfig ladspaPlugins ladspaH dssi liblo liblrdf fftwSinglePrec
+ libsndfile libsamplerate perl makedepend libjack2
+ ] ++ stdenv.lib.optional withLirc [ lirc ];
+
+ enableParallelBuilding = true;
+
meta = with stdenv.lib; {
homepage = http://www.rosegardenmusic.com/;
description = "Music composition and editing environment";
diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix
index 10f06e16cf4..1eb366d6bbd 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/schismtracker/default.nix b/pkgs/applications/audio/schismtracker/default.nix
index 1a448c74b47..2b2fd161ede 100644
--- a/pkgs/applications/audio/schismtracker/default.nix
+++ b/pkgs/applications/audio/schismtracker/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Music tracker application, free reimplementation of Impulse Tracker";
- homepage = "http://schismtracker.org/";
+ homepage = http://schismtracker.org/;
license = stdenv.lib.licenses.gpl2;
platforms = [ "x86_64-linux" "i686-linux" ];
maintainers = [ stdenv.lib.maintainers.ftrvxmtrx ];
diff --git a/pkgs/applications/audio/seq24/default.nix b/pkgs/applications/audio/seq24/default.nix
index eafa0980b4b..ebeef301e10 100644
--- a/pkgs/applications/audio/seq24/default.nix
+++ b/pkgs/applications/audio/seq24/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Minimal loop based midi sequencer";
- homepage = "http://www.filter24.org/seq24";
+ homepage = http://www.filter24.org/seq24;
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ goibhniu nckx ];
diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix
index 2acafb0be63..9f8ad3e649b 100644
--- a/pkgs/applications/audio/sonata/default.nix
+++ b/pkgs/applications/audio/sonata/default.nix
@@ -62,7 +62,7 @@ in buildPythonApplication rec {
- Commandline control
- Available in 24 languages
'';
- homepage = "http://www.nongnu.org/sonata/";
+ homepage = http://www.nongnu.org/sonata/;
license = stdenv.lib.licenses.gpl3;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.rvl ];
diff --git a/pkgs/applications/audio/sooperlooper/default.nix b/pkgs/applications/audio/sooperlooper/default.nix
index e4d9541673a..bf4d96c6fc4 100644
--- a/pkgs/applications/audio/sooperlooper/default.nix
+++ b/pkgs/applications/audio/sooperlooper/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
'';
version = "${version}";
- homepage = "http://essej.net/sooperlooper/index.html";
+ homepage = http://essej.net/sooperlooper/index.html;
license = stdenv.lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.magnetophon ];
platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/pkgs/applications/audio/sound-juicer/default.nix
index 02a97dde4e2..ba550580cba 100644
--- a/pkgs/applications/audio/sound-juicer/default.nix
+++ b/pkgs/applications/audio/sound-juicer/default.nix
@@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
buildInputs = [ pkgconfig gtk3 intltool itstool libxml2 brasero libcanberra_gtk3
gnome3.gsettings_desktop_schemas libmusicbrainz5 libdiscid isocodes
- makeWrapper gnome3.dconf
+ makeWrapper (stdenv.lib.getLib gnome3.dconf)
gst_all_1.gstreamer gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad
gst_all_1.gst-libav
@@ -28,7 +28,7 @@ in stdenv.mkDerivation rec {
wrapProgram "$f" \
--prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \
- --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules"
+ --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules"
done
'';
diff --git a/pkgs/applications/audio/ssrc/default.nix b/pkgs/applications/audio/ssrc/default.nix
index fa2b54d0e8a..19386b47794 100644
--- a/pkgs/applications/audio/ssrc/default.nix
+++ b/pkgs/applications/audio/ssrc/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
'';
version = "${version}";
- homepage = "http://shibatch.sourceforge.net/";
+ homepage = http://shibatch.sourceforge.net/;
license = licenses.gpl2;
maintainers = with maintainers; [ leenaars];
platforms = with platforms; [ linux ] ;
diff --git a/pkgs/applications/audio/svox/default.nix b/pkgs/applications/audio/svox/default.nix
index d7072e96163..5e26b6c1cdb 100644
--- a/pkgs/applications/audio/svox/default.nix
+++ b/pkgs/applications/audio/svox/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
name = "svox-${version}";
- version = "2016-10-20";
+ version = "2017-07-18";
src = fetchgit {
url = "https://android.googlesource.com/platform/external/svox";
- rev = "2dd8f16e4436520b93e93aa72b92acad92c0127d";
- sha256 = "064h3zb9bn1z6xbv15iy6l4rlxx8fqzy54s898qvafjhz6kawj9g";
+ rev = "7e68d0e9aac1b5d2ad15e92ddaa3bceb27973fcb";
+ sha256 = "1bqj12w23nn27x64ianm2flrqvkskpvgrnly7ah8gv6k8s8chh3r";
};
postPatch = ''
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Text-to-speech engine";
- homepage = "https://android.googlesource.com/platform/external/svox";
+ homepage = https://android.googlesource.com/platform/external/svox;
platforms = platforms.linux;
license = licenses.asl20;
maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix
index c7932a132d7..2f5a4ebb43f 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/tomahawk/default.nix b/pkgs/applications/audio/tomahawk/default.nix
index ca9f514eace..2787c65fc54 100644
--- a/pkgs/applications/audio/tomahawk/default.nix
+++ b/pkgs/applications/audio/tomahawk/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A multi-source music player";
- homepage = "http://tomahawk-player.org/";
+ homepage = http://tomahawk-player.org/;
license = licenses.gpl3Plus;
platforms = platforms.all;
maintainers = [ maintainers.aszlig ];
diff --git a/pkgs/applications/audio/yasr/default.nix b/pkgs/applications/audio/yasr/default.nix
index 1008d3e8e98..ca6d6240688 100644
--- a/pkgs/applications/audio/yasr/default.nix
+++ b/pkgs/applications/audio/yasr/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
]; # taken from the debian yasr package
meta = {
- homepage = "http://yasr.sourceforge.net";
+ homepage = http://yasr.sourceforge.net;
description = "A general-purpose console screen reader";
longDescription = "Yasr is a general-purpose console screen reader for GNU/Linux and other Unix-like operating systems.";
platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/audio/ympd/default.nix b/pkgs/applications/audio/ympd/default.nix
index 54d07e71f42..672237a8462 100644
--- a/pkgs/applications/audio/ympd/default.nix
+++ b/pkgs/applications/audio/ympd/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
buildInputs = [ cmake pkgconfig mpd_clientlib openssl ];
meta = {
- homepage = "http://www.ympd.org";
+ homepage = http://www.ympd.org;
description = "Standalone MPD Web GUI written in C, utilizing Websockets and Bootstrap/JS";
maintainers = [ stdenv.lib.maintainers.siddharthist ];
platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix
index ef10bfed9b6..2b79718809f 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/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix
index 42fe3e34cd4..52b9a57c00b 100644
--- a/pkgs/applications/audio/zynaddsubfx/default.nix
+++ b/pkgs/applications/audio/zynaddsubfx/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "zynaddsubfx-${version}";
- version = "3.0.1";
+ version = "3.0.2";
src = fetchurl {
url = "mirror://sourceforge/zynaddsubfx/zynaddsubfx-${version}.tar.bz2";
- sha256 = "1qijvlbv41lnqaqbp6gh1i42xzf1syviyxz8wr39xbz55cw7y0d8";
+ sha256 = "09mr23lqc51r7gskry5b7hk84pghdpgn1s4vnrzvx7xpa21gvplm";
};
buildInputs = [ alsaLib cairo libjack2 fftw fltk13 lash libjpeg libXpm minixml ntk zlib liblo ];
diff --git a/pkgs/applications/backup/crashplan/default.nix b/pkgs/applications/backup/crashplan/default.nix
index 3bfee48b8cd..e840c6eeda0 100644
--- a/pkgs/applications/backup/crashplan/default.nix
+++ b/pkgs/applications/backup/crashplan/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "An online/offline backup solution";
- homepage = "http://www.crashplan.org";
+ homepage = http://www.crashplan.org;
license = licenses.unfree;
maintainers = with maintainers; [ sztupi domenkozar jerith666 ];
};
diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix
index 191ec84f87b..452cb38f126 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
}:
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
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 d54fb455fcb..97f05f6a433 100644
--- a/pkgs/applications/display-managers/sddm/default.nix
+++ b/pkgs/applications/display-managers/sddm/default.nix
@@ -5,27 +5,20 @@
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.15.0";
in mkDerivation rec {
- name = "sddm-unwrapped-${version}";
+ name = "sddm-${version}";
src = fetchFromGitHub {
owner = "sddm";
repo = "sddm";
rev = "v${version}";
- sha256 = "0wwid23kw0725zpw67zchalg9mmharr7sn4yzhijq7wqpsczjfxj";
+ sha256 = "1wissgl7wd7fblq8ghz8n2fr6wqip7h88p9fiarfpvi1918fgng8";
};
patches =
- copyPathsToStore (lib.readPathsFromFile ./. ./series)
- ++ [ patchFixUserAvatars ];
+ copyPathsToStore (lib.readPathsFromFile ./. ./series);
postPatch =
# Module Qt5::Test must be included in `find_package` before it is used.
@@ -36,11 +29,7 @@ in mkDerivation rec {
nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qttools ];
buildInputs = [
- libxcb libpthreadstubs libXdmcp libXau pam systemd
- ];
-
- propagatedBuildInputs = [
- qtbase qtdeclarative
+ libxcb libpthreadstubs libXdmcp libXau pam qtbase qtdeclarative systemd
];
cmakeFlags = [
@@ -65,7 +54,7 @@ in mkDerivation rec {
meta = with lib; {
description = "QML based X11 display manager";
- homepage = "https://github.com/sddm/sddm";
+ homepage = https://github.com/sddm/sddm;
platforms = platforms.linux;
maintainers = with maintainers; [ abbradar ttuegel ];
};
diff --git a/pkgs/applications/editors/aewan/default.nix b/pkgs/applications/editors/aewan/default.nix
index a46b52436a3..214b435429a 100644
--- a/pkgs/applications/editors/aewan/default.nix
+++ b/pkgs/applications/editors/aewan/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Ascii-art Editor Without A Name";
- homepage = "http://aewan.sourceforge.net/";
+ homepage = http://aewan.sourceforge.net/;
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.unix;
};
diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix
index e74d04218f4..360d373f070 100644
--- a/pkgs/applications/editors/android-studio/common.nix
+++ b/pkgs/applications/editors/android-studio/common.nix
@@ -1,4 +1,4 @@
-{ pname, version, build, src, meta }:
+{ pname, version, build, sha256Hash, meta }:
{ bash
, buildFHSUserEnv
, coreutils
@@ -34,8 +34,13 @@
let
androidStudio = stdenv.mkDerivation {
- inherit src meta;
name = "${pname}";
+
+ src = fetchurl {
+ url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.zip";
+ sha256 = sha256Hash;
+ };
+
buildInputs = [
makeWrapper
unzip
@@ -103,12 +108,13 @@ let
name = "${pname}-fhs-env";
};
-in writeTextFile {
- name = "${pname}-${version}";
- destination = "/bin/${pname}";
- executable = true;
- text = ''
- #!${bash}/bin/bash
- ${fhsEnv}/bin/${pname}-fhs-env ${androidStudio}/bin/studio.sh
- '';
-}
+in
+ writeTextFile {
+ name = "${pname}-${version}";
+ destination = "/bin/${pname}";
+ executable = true;
+ text = ''
+ #!${bash}/bin/bash
+ ${fhsEnv}/bin/${pname}-fhs-env ${androidStudio}/bin/studio.sh
+ '';
+ } // { inherit meta; }
diff --git a/pkgs/applications/editors/android-studio/packages.nix b/pkgs/applications/editors/android-studio/packages.nix
index 860f1e53297..6d7ed2e489b 100644
--- a/pkgs/applications/editors/android-studio/packages.nix
+++ b/pkgs/applications/editors/android-studio/packages.nix
@@ -1,47 +1,40 @@
{ stdenv, callPackage, fetchurl, makeFontsConf }:
let
- mkStudio = opts: callPackage (import ./common.nix opts);
+ mkStudio = opts: callPackage (import ./common.nix opts) {
+ fontsConf = makeFontsConf {
+ fontDirectories = [];
+ };
+ };
in rec {
stable = mkStudio rec {
pname = "android-studio";
version = "2.3.3.0";
build = "162.4069837";
-
- src = fetchurl {
- url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.zip";
- sha256 = "0zzis9m2xp44xwkj0zvcqw5rh3iyd3finyi5nqhgira1fkacz0qk";
- };
+ sha256Hash = "0zzis9m2xp44xwkj0zvcqw5rh3iyd3finyi5nqhgira1fkacz0qk";
meta = with stdenv.lib; {
- description = "The Official IDE for Android";
+ description = "The Official IDE for Android (stable version)";
+ longDescription = ''
+ Android Studio is the official IDE for Android app development, based on
+ IntelliJ IDEA.
+ '';
homepage = https://developer.android.com/studio/index.html;
license = licenses.asl20;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ primeos ];
};
- } {
- fontsConf = makeFontsConf {
- fontDirectories = [];
- };
};
preview = mkStudio rec {
pname = "android-studio-preview";
- version = "3.0.0.6";
- build = "171.4182969";
-
- src = fetchurl {
- url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.zip";
- sha256 = "0s26k5qr0qg6az77yw2mvnhavwi4aza4ifvd45ljank8aqr6sp5i";
- };
+ version = "3.0.0.14"; # "Android Studio 3.0 Beta 6"
+ build = "171.4333198";
+ sha256Hash = "071a3j0bnsspvhvhh10h9ygay3bi66glriiy8gl8vrwx1dnv55zk";
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; [ tomsmeets ];
- };
- } {
- fontsConf = makeFontsConf {
- fontDirectories = [];
+ maintainers = with stdenv.lib.maintainers; [ primeos tomsmeets ];
};
};
}
diff --git a/pkgs/applications/editors/aseprite/default.nix b/pkgs/applications/editors/aseprite/default.nix
index 15230a7a000..9a0d1bb5e72 100644
--- a/pkgs/applications/editors/aseprite/default.nix
+++ b/pkgs/applications/editors/aseprite/default.nix
@@ -1,47 +1,77 @@
-{ 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
}:
-stdenv.mkDerivation rec {
- name = "aseprite-0.9.5";
+# Unfree version is not redistributable:
+# https://dev.aseprite.org/2016/09/01/new-source-code-license/
+# Consider supporting the developer: https://aseprite.org/#buy
- src = fetchurl {
- url = "http://aseprite.googlecode.com/files/${name}.tar.xz";
- sha256 = "0m7i6ybj2bym4w9rybacnnaaq2jjn76vlpbp932xcclakl6kdq41";
+stdenv.mkDerivation rec {
+ name = "aseprite-${version}";
+ version = if unfree then "1.2-beta12" else "1.1.7";
+
+ src = fetchFromGitHub {
+ owner = "aseprite";
+ repo = "aseprite";
+ rev = "v${version}";
+ fetchSubmodules = true;
+ sha256 = if unfree
+ then "1zgsr03d4vwdj2qyiwfwfqsbqngp85n13i3xwbkfkbja036c5yhc"
+ 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 ];
+
+ 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"
];
- 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
+ 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
'';
- 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
- '';
+ enableParallelBuilding = true;
- NIX_LDFLAGS = "-lX11";
-
- meta = {
+ meta = with lib; {
+ homepage = https://www.aseprite.org/;
description = "Animated sprite editor & pixel art tool";
- homepage = "http://www.aseprite.org/";
- license = stdenv.lib.licenses.gpl2Plus;
- platforms = stdenv.lib.platforms.linux;
+ 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 00000000000..41a68656d00
--- /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-${version}";
+ version = "1.21.0-beta0";
+
+ src = fetchurl {
+ url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
+ sha256 = "1syxlyb62vp9hmjdiazhmvq8w52b90l8mvf502xkdav4vi3yxzfz";
+ 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 39fe8fcb77e..65df31aaa22 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.18.0";
+ version = "1.20.0";
src = fetchurl {
url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
- sha256 = "07hssch8sfyp5sji91lx4v62m8zmy9j971i968p747dwfp6g0my6";
+ sha256 = "1jzpa44ny78djdxc8d2w4jz1m68xmi8bzq87q3wmdffa4g9z4aa0";
name = "${name}.deb";
};
@@ -32,7 +32,13 @@ stdenv.mkDerivation rec {
--set-rpath "${atomEnv.libPath}" \
$out/share/atom/resources/app/apm/bin/node
+ rm -f $out/share/atom/resources/app/node_modules/dugite/git/bin/git
+ ln -s ${pkgs.git}/bin/git $out/share/atom/resources/app/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
+ paxmark m $out/share/atom/resources/app/apm/bin/node
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index c0c96d9e1a4..a3b4193edc6 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -106,16 +106,16 @@ rec {
anyedittools = buildEclipsePlugin rec {
name = "anyedit-${version}";
- version = "2.6.0.201511291145";
+ version = "2.7.0.201705171641";
srcFeature = fetchurl {
url = "http://andrei.gmxhome.de/eclipse/features/AnyEditTools_${version}.jar";
- sha256 = "1vllci75qcd28b6hn2jz29l6cabxx9ql5i6l9cwq9rxp49dhc96b";
+ sha256 = "07k029nw5ibxpjc0siy06ihylbqrxllf59yz8c544gra8lc079c9";
};
srcPlugin = fetchurl {
- url = "https://github.com/iloveeclipse/anyedittools/releases/download/2.6.0/de.loskutov.anyedit.AnyEditTools_${version}.jar";
- sha256 = "0mgq0ylfa7srjf7azyx0kbahlsjf0sdpazqphzx4f0bfn1l328s4";
+ url = "https://github.com/iloveeclipse/anyedittools/releases/download/2.7.0/de.loskutov.anyedit.AnyEditTools_${version}.jar";
+ sha256 = "0wbm8zfjh7gxrw5sy9m3siddiazh5czgxp7zyzxwzkdqyqzqs70h";
};
meta = with stdenv.lib; {
@@ -129,16 +129,16 @@ rec {
autodetect-encoding = buildEclipsePlugin rec {
name = "autodetect-encoding-${version}";
- version = "1.8.3.201610171338";
+ version = "1.8.4.201708052053";
srcFeature = fetchurl {
url = "https://cypher256.github.io/eclipse-encoding-plugin/features/eclipse.encoding.plugin.feature_${version}.jar";
- sha256 = "09xfn5j6vr9r7n0riqs5ja5ms98ax9pyi3f7irnv80flhzagdv7f";
+ sha256 = "1gbvib5dd75pp5mr17ckj2y66gnxjvpc067im5nsl9fyljdw867c";
};
srcPlugin = fetchurl {
url = "https://cypher256.github.io/eclipse-encoding-plugin/plugins/mergedoc.encoding_${version}.jar";
- sha256 = "0l2zw4whx1a7j0jl7i6n6igr2ki6jh6nwggx53n3ipzg7cgdcg0y";
+ sha256 = "0728zsbfs1mc4qvx2p92hkxpnknckqk0xvqlmzivsnr62b5qd5im";
};
meta = with stdenv.lib; {
@@ -416,7 +416,7 @@ rec {
};
meta = with stdenv.lib; {
- homepage = "http://scala-ide.org/";
+ homepage = http://scala-ide.org/;
description = "The Scala IDE for Eclipse";
license = licenses.bsd3;
platforms = platforms.all;
diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix
index 2404405c307..9d5848f0263 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/bbdb/3.nix b/pkgs/applications/editors/emacs-modes/bbdb/3.nix
index 556bf83fab7..44116fbac0c 100644
--- a/pkgs/applications/editors/emacs-modes/bbdb/3.nix
+++ b/pkgs/applications/editors/emacs-modes/bbdb/3.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
'';
meta = {
- homepage = "http://savannah.nongnu.org/projects/bbdb/";
+ homepage = http://savannah.nongnu.org/projects/bbdb/;
description = "The Insidious Big Brother Database (BBDB), a contact management utility for Emacs, version 3";
license = "GPL";
};
diff --git a/pkgs/applications/editors/emacs-modes/bbdb/default.nix b/pkgs/applications/editors/emacs-modes/bbdb/default.nix
index ed96e689283..0ab11b5bf20 100644
--- a/pkgs/applications/editors/emacs-modes/bbdb/default.nix
+++ b/pkgs/applications/editors/emacs-modes/bbdb/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
'';
meta = {
- homepage = "http://bbdb.sourceforge.net/";
+ homepage = http://bbdb.sourceforge.net/;
description = "The Insidious Big Brother Database (BBDB), a contact management utility for Emacs";
license = "GPL";
};
diff --git a/pkgs/applications/editors/emacs-modes/cask/default.nix b/pkgs/applications/editors/emacs-modes/cask/default.nix
index 56ba5ba9710..673b590f56e 100644
--- a/pkgs/applications/editors/emacs-modes/cask/default.nix
+++ b/pkgs/applications/editors/emacs-modes/cask/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
building, packaging and more. Cask can also be used to manage
dependencies for your local Emacs configuration.
'';
- homepage = "https://github.com/cask/cask";
+ homepage = https://github.com/cask/cask;
license = licenses.gpl3Plus;
platforms = platforms.all;
maintainers = [ maintainers.jgeerds ];
diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index 7d8d01aafd6..7cd57642aad 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -175,10 +175,10 @@
}) {};
auctex = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "auctex";
- version = "11.90.2";
+ version = "11.91.0";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/auctex-11.90.2.tar";
- sha256 = "1hid8srj64nwbxcjvdma1xy07bh0v8ndhhsi3nmx9vdi3167khz6";
+ url = "https://elpa.gnu.org/packages/auctex-11.91.0.tar";
+ sha256 = "1yh182mxgngjmwpkyv2n9km3vyq95bqfq8mnly3dbv78nwk7f2l3";
};
packageRequires = [];
meta = {
@@ -199,6 +199,19 @@
license = lib.licenses.free;
};
}) {};
+ auto-correct = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+ pname = "auto-correct";
+ version = "1.1";
+ src = fetchurl {
+ url = "https://elpa.gnu.org/packages/auto-correct-1.1.el";
+ sha256 = "19i84dqqnxc5v36lsmj9zj8wbmg267c50jvq2i9bb66i9pzd0s53";
+ };
+ 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";
@@ -266,6 +279,19 @@
license = lib.licenses.free;
};
}) {};
+ captain = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+ pname = "captain";
+ version = "1.0.1";
+ src = fetchurl {
+ url = "https://elpa.gnu.org/packages/captain-1.0.1.el";
+ sha256 = "1jqbgzcgq4kxpcsma9ia6w6rjy9sdn51lz2f4rfjjy3qgy4fqjx5";
+ };
+ 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.3.1";
+ src = fetchurl {
+ url = "https://elpa.gnu.org/packages/ebdb-0.3.1.tar";
+ sha256 = "1g8chkw302nhjj8n6v7j3xfcw24wpn43pcp8f3bh4s4haw1l75q3";
+ };
+ 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.1";
+ src = fetchurl {
+ url = "https://elpa.gnu.org/packages/ebdb-i18n-chn-1.1.el";
+ sha256 = "0pf7qp15z9wp41dazvi4bhdz7y13h9k5nnghhsb0nvknn6if0k4m";
+ };
+ 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";
@@ -752,10 +848,10 @@
}) {};
exwm = callPackage ({ elpaBuild, fetchurl, lib, xelb }: elpaBuild {
pname = "exwm";
- version = "0.14";
+ version = "0.15";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/exwm-0.14.tar";
- sha256 = "14hjjpbasm84p54fxy73fg7g1fdwqkvisdw8dwwgzkflmd647mkx";
+ url = "https://elpa.gnu.org/packages/exwm-0.15.tar";
+ sha256 = "1y7nqry9y0a99bsdqkk9f554vczfw4sz6raadw3138835qy697jg";
};
packageRequires = [ xelb ];
meta = {
@@ -822,10 +918,10 @@
gited = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "gited";
- version = "0.3.2";
+ version = "0.3.3";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/gited-0.3.2.tar";
- sha256 = "1y40zn1w5m2srrqffkpvvzk3j5zzq21smsqychyx2diggn4c0hgi";
+ url = "https://elpa.gnu.org/packages/gited-0.3.3.tar";
+ sha256 = "0h3ps26sy4wp1s9vpsj066fpqjqacjlprz3kb09macgsg88k2c1p";
};
packageRequires = [ cl-lib emacs ];
meta = {
@@ -849,10 +945,10 @@
gnorb = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "gnorb";
- version = "1.2.3";
+ version = "1.2.4";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/gnorb-1.2.3.tar";
- sha256 = "1bqm08i2aam4v4gfzyxfmic0rg0ka7cns38khwj42vhwgv045xc7";
+ url = "https://elpa.gnu.org/packages/gnorb-1.2.4.tar";
+ sha256 = "013sdzpix9mc7d99mmpqv0r80zr50l1c7jld09p6767f86j6vahi";
};
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";
@@ -930,10 +1040,10 @@
hydra = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "hydra";
- version = "0.13.5";
+ version = "0.14.0";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/hydra-0.13.5.tar";
- sha256 = "0vq1pjyq6ddbikbh0vzdigbs0zlldgwad0192s7v9npg8qlwi668";
+ url = "https://elpa.gnu.org/packages/hydra-0.14.0.tar";
+ sha256 = "1r2vl2cpzqzayfzc0bijigxc7c0mkgcv96g4p65gnw99jk8d78kb";
};
packageRequires = [ cl-lib ];
meta = {
@@ -1023,10 +1133,10 @@
js2-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "js2-mode";
- version = "20170116";
+ version = "20170721";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/js2-mode-20170116.tar";
- sha256 = "1z4k7710yz1fbm2w8m17q81yyp8sxllld0zmgfnc336iqrc07hmk";
+ url = "https://elpa.gnu.org/packages/js2-mode-20170721.tar";
+ sha256 = "02w2hgk8qbmwkksqf1dmslpr3xn9zjp3srl3qh8730w8r8s8czni";
};
packageRequires = [ cl-lib emacs ];
meta = {
@@ -1446,10 +1556,10 @@
}) {};
org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org";
- version = "20170717";
+ version = "20170911";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/org-20170717.tar";
- sha256 = "0jrkfclwlbfcdkf56awnmvyw5vb9qwbfyyf2z4ilwx29zps9mxnh";
+ url = "https://elpa.gnu.org/packages/org-20170911.tar";
+ sha256 = "0w91f5lx64klwbpym0b73z919dagzakykkmx6g13iscsh7fflx06";
};
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.2";
+ version = "1.4.6";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/sokoban-1.4.2.tar";
- sha256 = "0sciv7rl1p1ar1jris1py2slrd8kr4q6a4plmb0jq6lv9dlqyvc6";
+ 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 = {
@@ -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";
@@ -2198,10 +2360,10 @@
yasnippet = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "yasnippet";
- version = "0.11.0";
+ version = "0.12.2";
src = fetchurl {
- url = "https://elpa.gnu.org/packages/yasnippet-0.11.0.tar";
- sha256 = "1m0hchhianl69sb1iqa8av513qvz6krjg4b5ppwfx1sjlai9xj2y";
+ 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-clang-complete-async/default.nix b/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix
index 9849b65c8c5..9585f327821 100644
--- a/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix
+++ b/pkgs/applications/editors/emacs-modes/emacs-clang-complete-async/default.nix
@@ -23,7 +23,7 @@ clangStdenv.mkDerivation {
'';
meta = {
- homepage = "https://github.com/Golevka/emacs-clang-complete-async";
+ homepage = https://github.com/Golevka/emacs-clang-complete-async;
description = "An emacs plugin to complete C and C++ code using libclang";
license = clangStdenv.lib.licenses.gpl3Plus;
};
diff --git a/pkgs/applications/editors/emacs-modes/erlang/default.nix b/pkgs/applications/editors/emacs-modes/erlang/default.nix
index 84a52d169a3..463d7fc7e15 100644
--- a/pkgs/applications/editors/emacs-modes/erlang/default.nix
+++ b/pkgs/applications/editors/emacs-modes/erlang/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
# emacs highlighting */
meta = with stdenv.lib; {
- homepage = "http://github.com/erlang/otp";
+ homepage = https://github.com/erlang/otp;
description = "Erlang mode for Emacs";
license = licenses.asl20;
platforms = platforms.unix;
diff --git a/pkgs/applications/editors/emacs-modes/ess/default.nix b/pkgs/applications/editors/emacs-modes/ess/default.nix
index a2c73907115..ce335a5d482 100644
--- a/pkgs/applications/editors/emacs-modes/ess/default.nix
+++ b/pkgs/applications/editors/emacs-modes/ess/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Emacs Speaks Statistics";
- homepage = "http://ess.r-project.org/";
+ homepage = http://ess.r-project.org/;
license = stdenv.lib.licenses.gpl2Plus;
hydraPlatforms = stdenv.lib.platforms.linux;
};
diff --git a/pkgs/applications/editors/emacs-modes/graphviz-dot/default.nix b/pkgs/applications/editors/emacs-modes/graphviz-dot/default.nix
index c1291126a1e..ce552257133 100644
--- a/pkgs/applications/editors/emacs-modes/graphviz-dot/default.nix
+++ b/pkgs/applications/editors/emacs-modes/graphviz-dot/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
'';
meta = {
- homepage = "http://www.graphviz.org/";
+ homepage = http://www.graphviz.org/;
description = "An emacs mode for the DOT Language, used by graphviz";
};
}
diff --git a/pkgs/applications/editors/emacs-modes/haskell/default.nix b/pkgs/applications/editors/emacs-modes/haskell/default.nix
index df34a47a6b3..6f998300290 100644
--- a/pkgs/applications/editors/emacs-modes/haskell/default.nix
+++ b/pkgs/applications/editors/emacs-modes/haskell/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
installCheckTarget = "check";
meta = {
- homepage = "http://github.com/haskell/haskell-mode";
+ homepage = https://github.com/haskell/haskell-mode;
description = "Haskell mode for Emacs";
platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/applications/editors/emacs-modes/icicles/default.nix b/pkgs/applications/editors/emacs-modes/icicles/default.nix
index d70b9955c98..11ccff3df01 100644
--- a/pkgs/applications/editors/emacs-modes/icicles/default.nix
+++ b/pkgs/applications/editors/emacs-modes/icicles/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
installPhase = "mkdir -p $out/share/emacs/site-lisp; cp *.el *.elc $out/share/emacs/site-lisp/";
meta = {
- homepage = "http://www.emacswiki.org/emacs/Icicles";
+ homepage = http://www.emacswiki.org/emacs/Icicles;
description = "Enhance Emacs minibuffer input with cycling and powerful completion";
license = stdenv.lib.licenses.gpl2Plus;
};
diff --git a/pkgs/applications/editors/emacs-modes/let-alist/default.nix b/pkgs/applications/editors/emacs-modes/let-alist/default.nix
index e90d6cf210d..05ddfbf6c16 100644
--- a/pkgs/applications/editors/emacs-modes/let-alist/default.nix
+++ b/pkgs/applications/editors/emacs-modes/let-alist/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
'';
meta = {
- homepage = "http://elpa.gnu.org/packages/let-alist.html";
+ homepage = http://elpa.gnu.org/packages/let-alist.html;
description = "Easily let-bind values of an assoc-list by their names";
license = stdenv.lib.licenses.gpl3Plus;
};
diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index 53035f2415e..b0449cc7c42 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -82,6 +82,27 @@
license = lib.licenses.free;
};
}) {};
+ a = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "a";
+ version = "20170720.553";
+ src = fetchFromGitHub {
+ owner = "plexus";
+ repo = "a.el";
+ rev = "3af0122abac723f0d3dc21ee50eeb81afa26d361";
+ sha256 = "0grwpy4ssmn2m8aihfkxb7ifl7ql2hgicw16wzl0crpy5fndh1mp";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/a226f1d81cd1ae81b91c1102fbe40aac2eddcaa8/recipes/a";
+ sha256 = "1xqja47iw1c78kiv4854z47iblvvzrc1l35zjdhmhkh9hh10z886";
+ name = "a";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/a";
+ license = lib.licenses.free;
+ };
+ }) {};
aa-edit-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, navi2ch }:
melpaBuild {
pname = "aa-edit-mode";
@@ -148,12 +169,12 @@
abyss-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "abyss-theme";
- version = "20160420.512";
+ version = "20170808.645";
src = fetchFromGitHub {
owner = "mgrbyte";
repo = "emacs-abyss-theme";
- rev = "e860499a0b2ae0d6d2a27eab12b67dec896a7afc";
- sha256 = "1yr6cqycd7ljkqzfp4prz9ilcpjq8wxg5yf645m24gy9v4w365ia";
+ rev = "18791c6e8d9cc2b4815c9f08627a2e94fc0eeb14";
+ sha256 = "07z0djv7h3yrv4iw9n633j6dxzxb4nnzijsqkmz22ik6fbwxg5mh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f390e5153b6360a27abc74983f5fef11226634f3/recipes/abyss-theme";
@@ -738,8 +759,8 @@
src = fetchFromGitHub {
owner = "xcwen";
repo = "ac-php";
- rev = "e0aaae30e4e5f18390e5d00953db02c1f03c44f6";
- sha256 = "1mrk37w88b4843jbghr9i79rbwbzwk8b1wljvzmm6x0q7ldlxmsm";
+ rev = "9e9c126397c3d2c7160e38eb72b9317c515678f3";
+ sha256 = "14qnbfxm9k870qi53krg6lmmfzcbhnv0yslhv66p40rwh9wjslwd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php";
@@ -755,12 +776,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 = "20170831.802";
src = fetchFromGitHub {
owner = "xcwen";
repo = "ac-php";
- rev = "e0aaae30e4e5f18390e5d00953db02c1f03c44f6";
- sha256 = "1mrk37w88b4843jbghr9i79rbwbzwk8b1wljvzmm6x0q7ldlxmsm";
+ rev = "9e9c126397c3d2c7160e38eb72b9317c515678f3";
+ sha256 = "14qnbfxm9k870qi53krg6lmmfzcbhnv0yslhv66p40rwh9wjslwd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core";
@@ -801,8 +822,8 @@
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "65c8f03ff0112ce5c5e11aff6867ad0eb9019e63";
- sha256 = "0xlacwjmvx5xd8m7yi8l8mqi0lqs2gr2hmjag2frvmxcn4cpb4gc";
+ rev = "2af4d6a32e8194f8fbcc23fd94395e3d595a3c25";
+ sha256 = "0091w529lvbjlw1fdb3qjgb8fd5fcwxhqyr4ps5cvxl5bqnwlw39";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags";
@@ -860,12 +881,12 @@
ac-sly = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, sly }:
melpaBuild {
pname = "ac-sly";
- version = "20150421.1322";
+ version = "20170728.327";
src = fetchFromGitHub {
owner = "qoocku";
repo = "ac-sly";
- rev = "b37a1ecfaab10a6d81c6d894417176d3bb4c5285";
- sha256 = "0mif35chyj4ai1bj4gq8qi38dyfsp72yi1xchhzy9zi2plpvqa7a";
+ rev = "bf69c687c4ecf1994349d20c182e9b567399912e";
+ sha256 = "09g6v2yp3wl566488zsb79lklqpai9dgz6xwv1y5h6zkghxvkhpy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/bb26741e841d4886c14f0a059a52805732f179b1/recipes/ac-sly";
@@ -923,12 +944,12 @@
ace-jump-buffer = callPackage ({ avy, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ace-jump-buffer";
- version = "20160229.1458";
+ version = "20170828.2153";
src = fetchFromGitHub {
owner = "waymondo";
repo = "ace-jump-buffer";
- rev = "9224e279a53fba06ed5561e22bf89ab94f74b9e7";
- sha256 = "1y2rl4faj1nfjqbh393yp460cbv24simllak31ag1ischpcbqjy4";
+ rev = "02797c22c10a817dbbdfbd8fddceeba6c4f0499a";
+ sha256 = "13wq92ia18q9vyhmvnz1grl1l18hxnaisb7hv13dhfc06alcsrw2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/31100b5b899e942de7796bcbf6365625d1b62574/recipes/ace-jump-buffer";
@@ -986,12 +1007,12 @@
ace-jump-zap = callPackage ({ ace-jump-mode, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ace-jump-zap";
- version = "20150330.1342";
+ version = "20170717.1149";
src = fetchFromGitHub {
owner = "waymondo";
repo = "ace-jump-zap";
- rev = "c60af83a857955b68c568c274a3c80cbe93f3150";
- sha256 = "0z0rblr41r94l4b2gh9fcw50nk82ifxrr3ilxqzbb8wmvil54gh4";
+ rev = "52b5d4c6c73bd0fc833a0dcb4e803a5287d8cae8";
+ sha256 = "1iw90mk6hdrbskxgv67xj27qd26w5dlh4s6a6xqqsj8ld56nzbvr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3b435db3b79333a20aa27a72f33c431f0a019ba1/recipes/ace-jump-zap";
@@ -1007,12 +1028,12 @@
ace-link = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ace-link";
- version = "20170528.1158";
+ version = "20170904.340";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "ace-link";
- rev = "8af476ac323e56d3c69ec2ecd1c095de56ecd18e";
- sha256 = "0218qfmpjw57842w1wn6p5bkn1qmn39scnnsnc0a1xn8ywz1ivw0";
+ rev = "34eefe3c94042a20abf4d340fdae71955a087926";
+ sha256 = "02lh4kmjwf8d67b33ha4shwkkfvy9igvg88v5xq7282wxp6y3lx7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/68032f40c0ce4170a22db535be4bfa7099f61f85/recipes/ace-link";
@@ -1074,8 +1095,8 @@
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "ace-popup-menu";
- rev = "e7cc8bace9dda5c9fbe545c6fbd41c12679c3d7d";
- sha256 = "1khqh5b9c7ass3q2gc04ayc8idanabkyfpaqvfnag063x16fv40c";
+ rev = "15ee28a9dcf025f30626313ebd376c0586013c8e";
+ sha256 = "187j3ixxrxkbja8xy7xgxpsx0ngwmn55gw0rnvlpj2pyz8vl192q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/53742e2242101c4b3b3901f5c74e24facf62c7d6/recipes/ace-popup-menu";
@@ -1091,12 +1112,12 @@
ace-window = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ace-window";
- version = "20170421.428";
+ version = "20170801.1334";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "ace-window";
- rev = "0a59342b7aafa9f89b477b0cc28f41a1abb8096c";
- sha256 = "05wkd93lm7mp5s3bgjqg6cq70dz5429cj27bj0pmls8nbzmyc5bw";
+ rev = "6aaf1e634414e7485b47ff94aac6c34588f2a371";
+ sha256 = "1dmb4q1xgf5mk4riihk2mmn7k182y9j1amcr8m2dmdw0hrgvsfcd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe131d3c2ea498e4df30ba539a6b91c00f5b07/recipes/ace-window";
@@ -1115,11 +1136,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";
};
@@ -1178,8 +1199,8 @@
src = fetchFromGitHub {
owner = "nickmccurdy";
repo = "add-hooks";
- rev = "edd4cb032a509b576d88f4cc0521ebfe66a9e6c7";
- sha256 = "1qg1ifkds84xv07ibz4sqp34ks60w4c7dvrq9dch4gvg040hal82";
+ rev = "5e18cc3887477aeec41a34f608d9aa55bfa92d0e";
+ sha256 = "05a0ayqjldl53s3zmfgmdqq8jf1qw1m2a2sj4qzn2bci0dgsakcp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/901f846aef46d512dc0a1770bab7f07c0ae330cd/recipes/add-hooks";
@@ -1304,8 +1325,8 @@
src = fetchFromGitHub {
owner = "Wilfred";
repo = "ag.el";
- rev = "2efb3ea5c3f3b4de79a6f21fa8dbcf90afb758f5";
- sha256 = "06aagmalpxvic285v0ipvir6777ipj6l9izfqsblbb7j70klw0dm";
+ rev = "74d00c48a98211001c844ab4386d00420ccc850a";
+ sha256 = "1mjgl1pwaf0wl8hmzcwxq1g58mbi63ajbvhxljlysyfdkw15lvlq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/67f410ac3a58a038e194bcf174bc0a8ceceafb9a/recipes/ag";
@@ -1321,12 +1342,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 = "c5185ad673c01e5103ab4a078095c3e2ce7ab039";
+ sha256 = "11dppmpdv26m9l5cnnnylihiss2a09zyyb7kqdrk3djdqvqplqb4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/982f5936f2d83222263df2886ca0b629076366bb/recipes/aggressive-fill-paragraph";
@@ -1428,8 +1449,8 @@
src = fetchFromGitHub {
owner = "AnthonyDiGirolamo";
repo = "airline-themes";
- rev = "40cb03bbb56f09cfbfae07ff9ff97f3aaf8324be";
- sha256 = "0pngxrs1zz0vr0m7sbrl11a5gnxsgbqk1kp9566nj79h02y81sd7";
+ rev = "0c0f8efbeaefa49ef04c0c4405b1ef79ecc5433e";
+ sha256 = "08hkx5wf9qyh4d5s5z4v57d43qkzw6p8zsqijw92wy4kngv1gl78";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/addeb923176132a52807308fa5e71d41c9511802/recipes/airline-themes";
@@ -1466,12 +1487,12 @@
alchemist = callPackage ({ company, dash, elixir-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }:
melpaBuild {
pname = "alchemist";
- version = "20170614.218";
+ version = "20170803.414";
src = fetchFromGitHub {
owner = "tonini";
repo = "alchemist.el";
- rev = "38c0d2a21e3fedf71eda5f21f51aa79a0fddeb3b";
- sha256 = "1hvkx35hjnpj8jfl41b510mcqfcxbv5msc8zmvd7jmdfx5gcn2d7";
+ rev = "8ea2db4781e367c1cf8ce2eec4222daa7d1b7b57";
+ sha256 = "0gq4l95krvirv2rb4l52gka39588k817g4kl483hj2ii9il32gd0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6616dc61d17c5bd89bc4d226baab24a1f8e49b3e/recipes/alchemist";
@@ -1487,12 +1508,12 @@
alda-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "alda-mode";
- version = "20170629.2153";
+ version = "20170803.1852";
src = fetchFromGitHub {
owner = "jgkamat";
repo = "alda-mode";
- rev = "24f2495ab209f8f00b7883285637e207b6f07201";
- sha256 = "1rg3gvlqq4jjpmj5k0pd1796c4qii3l595kdg0jvkf6vgf1544rm";
+ rev = "08556b3050c0bfc2d8f0a6d918610dbb2b85958f";
+ sha256 = "1f2m7pz3l62gk5ndfh49hm87ihz0lfk28izps9j3i68h4zclk3ls";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2612c494a2b6bd43ffbbaef88ce9ee6327779158/recipes/alda-mode";
@@ -1508,12 +1529,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";
@@ -1529,12 +1550,12 @@
alert = callPackage ({ fetchFromGitHub, fetchurl, gntp, lib, log4e, melpaBuild }:
melpaBuild {
pname = "alert";
- version = "20170503.1714";
+ version = "20170824.1140";
src = fetchFromGitHub {
owner = "jwiegley";
repo = "alert";
- rev = "affbbc5f359a7abcf50f4509b712fc7a80843f51";
- sha256 = "04zxhxkk8dnq07m2cidn9mw05m2wyvix6vvbj1jaaawb60b1ic7q";
+ rev = "08f42ced409b6edd70e4b13ed648f16240dc1ec1";
+ sha256 = "13my3m81binijaz9r113k1xll6p86qrcxacppzm20r71gpa1iifb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/113953825ac4ff98d90a5375eb48d8b7bfa224e7/recipes/alert";
@@ -1592,12 +1613,12 @@
all-the-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild, memoize }:
melpaBuild {
pname = "all-the-icons";
- version = "20170713.146";
+ version = "20170817.642";
src = fetchFromGitHub {
owner = "domtronn";
repo = "all-the-icons.el";
- rev = "84514026e342aa3cc98d8b6492175e1bdf788e5c";
- sha256 = "0s5cll8sq5hg1jm7g1nkcpbcz0n6f84ax9drzghv9y0m86v819mq";
+ rev = "d3550f8e0f8df6509e7f29a1ffbffc0f17144704";
+ sha256 = "09y1g4dphkhzrxym1bwxgx5f3hzvh1v4shbrr59bvdqymv93dagl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons";
@@ -1634,12 +1655,12 @@
all-the-icons-gnus = callPackage ({ all-the-icons, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "all-the-icons-gnus";
- version = "20170711.241";
+ version = "20170726.619";
src = fetchFromGitHub {
owner = "nlamirault";
repo = "all-the-icons-gnus";
- rev = "fe2080fe78c28b140be4ee2018cdf3c72b87fa31";
- sha256 = "1lxq6fqrwxzd2cr8a7nvapaaf9pd1mfyqqk0rhg50fp3i16z5nkk";
+ rev = "45560293e42d02c17c332894f3764dd624d25444";
+ sha256 = "1j0s3m54gyrl50bqss6xaijja1hdbm5285py750dn4ykrj5m3d3r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f8ed74d39d165343c81c2a21aa47e3d3895d8119/recipes/all-the-icons-gnus";
@@ -1766,6 +1787,27 @@
license = lib.licenses.free;
};
}) {};
+ amx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "amx";
+ version = "20170810.1842";
+ src = fetchFromGitHub {
+ owner = "DarwinAwardWinner";
+ repo = "amx";
+ rev = "ba09f5ecf451d278a6cf5721b6942ad8d81ab911";
+ sha256 = "0xilab0v5qzvz6g8n10jdb9vz2pmlhgz6pc9cc3qsgg54r3igsv2";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/c55bfad05343b2b0f3150fd2b4adb07a1768c1c0/recipes/amx";
+ sha256 = "1ikhjvkca0lsb9j719yf6spg6nwc0qaydkd8aax162sis7kp9fap";
+ name = "amx";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/amx";
+ license = lib.licenses.free;
+ };
+ }) {};
anaconda-mode = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }:
melpaBuild {
pname = "anaconda-mode";
@@ -1773,8 +1815,8 @@
src = fetchFromGitHub {
owner = "proofit404";
repo = "anaconda-mode";
- rev = "1e7c9322c1ef395c4c4585bb29f5a421f2aa3077";
- sha256 = "1bb090n8nz8vacspihvnq37dx8knjgnarjbx5r4mqy9bp1v8i52p";
+ rev = "0f9576791b86e0b315447e6823b3a7db131cd826";
+ sha256 = "1qqh1gg4sanh0vi624gys9wdncmvc92kly4zlwl6a9jhi3sr7w3s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode";
@@ -2268,27 +2310,6 @@
license = lib.licenses.free;
};
}) {};
- anything-project = callPackage ({ anything, fetchFromGitHub, fetchurl, imakado, lib, melpaBuild }:
- melpaBuild {
- pname = "anything-project";
- version = "20141024.227";
- src = fetchFromGitHub {
- owner = "imakado";
- repo = "anything-project";
- rev = "9f6f04bc1911474e97e99faf52e204cf159add83";
- sha256 = "16a7i01q8qqkgph1s3jnwdr2arjq3cm3jpv5bk5sqs29c003q0pp";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/e842d55882ec4d689d279fb80490db60a1f32fd6/recipes/anything-project";
- sha256 = "10crwm34igb4kjh97alni15xzhsb2s0d4ghva86f2gpjidka9fhr";
- name = "anything-project";
- };
- packageRequires = [ anything imakado ];
- meta = {
- homepage = "https://melpa.org/#/anything-project";
- license = lib.licenses.free;
- };
- }) {};
anything-prosjekt = callPackage ({ anything, fetchFromGitHub, fetchurl, lib, melpaBuild, prosjekt }:
melpaBuild {
pname = "anything-prosjekt";
@@ -2439,14 +2460,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 = [];
@@ -2500,12 +2521,12 @@
apiwrap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "apiwrap";
- version = "20170506.2356";
+ version = "20170908.1740";
src = fetchFromGitHub {
owner = "vermiculus";
repo = "apiwrap.el";
- rev = "8b60f9e9082583aa537369499506c70f192467ab";
- sha256 = "13pr2hkn2jmg85299lga9rvllghkc0khfdgl3d8g2al9ib0il8pk";
+ rev = "db7a2abbbb74719dfd0867612a9a3bde4c574cc7";
+ sha256 = "133mgzks4ig2z67bk63gligg45zj82mra99m9qdz7d3qpx7c9027";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0197fd3657e65e3826375d9b6f19da3058366c91/recipes/apiwrap";
@@ -2604,12 +2625,12 @@
apropospriate-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "apropospriate-theme";
- version = "20170418.1352";
+ version = "20170829.754";
src = fetchFromGitHub {
owner = "waymondo";
repo = "apropospriate-theme";
- rev = "98c548917bb696d541a58bfcf85f02572d8f7ebd";
- sha256 = "0kr6p1kf0sb036w9pb20xlfs7ynw357fv0zifsb8g7q1va7m5vs7";
+ rev = "68145a891348cb74db5209548c74dbc8a80e6902";
+ sha256 = "1r46810dn99cnbv3railbw79k42sz1pmhx2fbx60c4g80w2kcjy6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1da33013f15825ab656260ce7453b8127e0286f4/recipes/apropospriate-theme";
@@ -2641,22 +2662,22 @@
license = lib.licenses.free;
};
}) {};
- arch-packer = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+ arch-packer = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "arch-packer";
- version = "20170506.1005";
+ version = "20170730.621";
src = fetchFromGitHub {
- owner = "brotzeitmacher";
+ owner = "brotzeit";
repo = "arch-packer";
- rev = "e195c4f30da2a756f6e14715f436ff22826b5e82";
- sha256 = "0xxgnavpcimkb9adlbpcv96pp829x41nv744c8yl8rl8lb4f9xdl";
+ 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 emacs s ];
+ packageRequires = [ async dash emacs s ];
meta = {
homepage = "https://melpa.org/#/arch-packer";
license = lib.licenses.free;
@@ -2852,12 +2873,12 @@
asn1-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "asn1-mode";
- version = "20160626.2240";
+ version = "20170728.1926";
src = fetchFromGitHub {
owner = "kawabata";
repo = "asn1-mode";
- rev = "c244717529229d7ecc2b2c160992f28dcb755d2c";
- sha256 = "0r004sli3ggkhsdi61m8p32l227h5wligzph0mfhsy39fkhmva34";
+ rev = "d5d4a8259daf708411699bcea85d322f18beb972";
+ sha256 = "067khpi4ghzyifrk1vhi57n3alp67qks4k4km11hasiavi5gsjmp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b694baceceb54810be8f8c7152b2ac0b4063f01c/recipes/asn1-mode";
@@ -2894,12 +2915,12 @@
async = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "async";
- version = "20170610.2241";
+ version = "20170823.2116";
src = fetchFromGitHub {
owner = "jwiegley";
repo = "emacs-async";
- rev = "d6222c2959caaca5c4980038756097da8a51e505";
- sha256 = "1w7crkgi2k97zxdqv2k6a88kmz75s5v7p7n8bw8v18dvxx9sfisn";
+ rev = "5863eefbcd445f0fe917646f1326a9c86f067865";
+ sha256 = "16m1ykbjawia3nh6qkmp38yrdg58pc7k3vpfq364gf31qpsq6rwg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/async";
@@ -2978,12 +2999,12 @@
atom-one-dark-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "atom-one-dark-theme";
- version = "20170117.1905";
+ version = "20170803.916";
src = fetchFromGitHub {
owner = "jonathanchu";
repo = "atom-one-dark-theme";
- rev = "44903ab7c349ef225499d642f249b6dfef5c5161";
- sha256 = "0cjp2p018xsj3sx46adrlsc3zksph4hgkn2gdqb3w8illgzp9nyp";
+ rev = "6ad96e25f8b46942380afbc33e3659a5e9fa09b1";
+ sha256 = "06gf26r00yq1whrws9ilra8l2xfg2x89vxbgx3vgbwlvwx9wcsm6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3ba1c4625c9603372746a6c2edb69d65f0ef79f5/recipes/atom-one-dark-theme";
@@ -3101,27 +3122,6 @@
license = lib.licenses.free;
};
}) {};
- aurora-config-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "aurora-config-mode";
- version = "20140520.203";
- src = fetchFromGitHub {
- owner = "bdd";
- repo = "aurora-config-mode.el";
- rev = "0a7ca7987c3a0824e25470389c7d25c337a81593";
- sha256 = "0ns1xhpk1awbj3kv946dv11a99p84dhm54vjk72kslxwx42nia28";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/aurora-config-mode";
- sha256 = "1hpjwidqmjxanijsc1imc7ww9abbylmkin1p0846fbz1hz3a603c";
- name = "aurora-config-mode";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/aurora-config-mode";
- license = lib.licenses.free;
- };
- }) {};
auth-password-store = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, seq }:
melpaBuild {
pname = "auth-password-store";
@@ -3129,8 +3129,8 @@
src = fetchFromGitHub {
owner = "DamienCassou";
repo = "auth-password-store";
- rev = "e8d8733b1af67e4ea088d1ed015c554171feecb9";
- sha256 = "05yzqrdk2d6mqyapgnfflfvm2pqifmb6fprf5si8n6wb8gmi2idw";
+ rev = "b9fb3ef8d4ebe7bef939a3cf574f9caa833347c9";
+ sha256 = "1rzqz560zqsymdpv84n1z17jyf7k75797y4bkzhk5grd3ry77x9j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0f4d2a28373ba93da5b280ebf40c5a3fa758ea11/recipes/auth-password-store";
@@ -3204,22 +3204,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 = "20170130.1017";
+ version = "20170817.1437";
src = fetchFromGitHub {
- owner = "tarsius";
+ owner = "emacscollective";
repo = "auto-compile";
- rev = "0cbebd8fd22c88a57a834797e4841900ea1bae1c";
- sha256 = "1sngafab6sssidz6w1zsxw8i6k4j13m0073lbmp7gq3ixsqdxbr7";
+ rev = "a31819a1b75a2320edb0f7f25d6c6faf528bf41a";
+ sha256 = "17hzl03livgj49zb0knlfn6r020nvj41pjjz3acy82zwrjydsvxa";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/e00dcd4f8c59c748cc3c85af1607dd19b85d7813/recipes/auto-compile";
- sha256 = "1cdv41hg71mi5ixxi4kiizyg03xai2gyhk0vz7gw59d9a7482yks";
+ 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;
@@ -3501,12 +3501,12 @@
auto-dim-other-buffers = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "auto-dim-other-buffers";
- version = "20161004.539";
+ version = "20170911.307";
src = fetchFromGitHub {
owner = "mina86";
repo = "auto-dim-other-buffers.el";
- rev = "31c13e7ed87dd862c73b836d11c127164edb1458";
- sha256 = "0snkc7pkiv8iiy7xb64mg8ja7ig0rzkp5b6qkbalgxk9m4l8nmcb";
+ rev = "90f6a6f0fba8dac1cfd5e4140638eceebc88bfab";
+ sha256 = "1z1d7gzfv573rw1kr3bb6viybj63zbfwad15gvgha9fld2jhmakz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/auto-dim-other-buffers";
@@ -3625,12 +3625,12 @@
auto-package-update = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "auto-package-update";
- version = "20151025.2311";
+ version = "20170803.1005";
src = fetchFromGitHub {
owner = "rranelli";
repo = "auto-package-update.el";
- rev = "cdef79f9fc6f8347fdd05664978fb9a948ea0410";
- sha256 = "05llpa6g4nb4qswmcn7j3bs7hnmkrkax7hsk7wvklr0wrljyg9a2";
+ rev = "0b296970d09d7deb7f780cb041fcbc313d39aa5d";
+ sha256 = "1nicx2sjnmf3i7dlzi788rh2kjc7mj9q69knp3g2x72zxqy8x07d";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/78f549a299a06941edce13381f597f3a61e8c723/recipes/auto-package-update";
@@ -4020,36 +4020,15 @@
license = lib.licenses.free;
};
}) {};
- avk-emacs-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "avk-emacs-themes";
- version = "20170110.1046";
- src = fetchFromGitHub {
- owner = "avkoval";
- repo = "avk-emacs-themes";
- rev = "c75079ec9a84116c84c884c3bf258c95afcce7a7";
- sha256 = "1s9hn4y918h1ly1s8gfkidlwqijdzpbkfx1px8xfkia3b35qinvv";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/b986c7c981ccc5c7169930908543f2a515edaefa/recipes/avk-emacs-themes";
- sha256 = "0yimnfm50qsq505fc67b3qnxx2aiyz5a7bw87zkjrdnar12vv144";
- name = "avk-emacs-themes";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/avk-emacs-themes";
- license = lib.licenses.free;
- };
- }) {};
avy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "avy";
- version = "20170702.237";
+ version = "20170819.1039";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "avy";
- rev = "228ed97d07d51e369eb6ad27bf408c5b3218a23b";
- sha256 = "0qrqlinjp57sd9a2k77cxqll1d97zi1f328nv3ghs8r9jrds7sj7";
+ rev = "245b5d62feb6f276971be53e63311de4a243bfbc";
+ sha256 = "0r2p01hnflaa7dc0xfrrd5hgwgx530m4cxzpw3p1nmdajlk4mbyy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/77fac7a702d4086fb860514e377037acedc60412/recipes/avy";
@@ -4090,8 +4069,8 @@
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "avy-menu";
- rev = "71b71e64900d0637e17013781042e086e9bf56e7";
- sha256 = "1mxrq2fpx3qa9vy121wnv02r43sb7djc2j8z7c2vh8x56h8bpial";
+ rev = "c36e28cabbcea8fdd2ada723b9a28ecc35a2d6c0";
+ sha256 = "14ci1saksmhnnk5a7dy2v9dbsw7c030524vwb3y1wpw0vv863zjh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2f0b4cfb30c405d44803b36ebcaccef0cf87fe2d/recipes/avy-menu";
@@ -4107,12 +4086,12 @@
avy-migemo = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, migemo }:
melpaBuild {
pname = "avy-migemo";
- version = "20170411.858";
+ version = "20170907.955";
src = fetchFromGitHub {
owner = "momomo5717";
repo = "avy-migemo";
- rev = "97020c34176538480cfd28004f16f9b5494315e6";
- sha256 = "1dgjkhcsb1iyjcwbjyccr7550lczg74jl7w1g7kif8g0df0mc5g6";
+ rev = "0074b70fda731169888571013b4b618a6f0914e7";
+ sha256 = "153xv2k0v86k8c2w7cm68d6vs3xbrbhc660ka1dywprr7q1l3jrk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6a02db29eb3e4b76b4a9cdbc966df5a1bd35dec0/recipes/avy-migemo";
@@ -4424,12 +4403,12 @@
base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "base16-theme";
- version = "20170713.1237";
+ version = "20170824.1656";
src = fetchFromGitHub {
owner = "belak";
repo = "base16-emacs";
- rev = "f701a8e191ae9c0bd6ab93926ce993bb18a9e98c";
- sha256 = "026a5frqvd2j09zzbf83mw3hmcj1ps7nsia87k0yn13sk62rd5bk";
+ rev = "bb4f204f51439fcf8ae45429d150861523d1f1d0";
+ sha256 = "1vkv5kqs9crbk2j4jynyrx2fzijhimnhm2fvgwcxsb6hx3g257id";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme";
@@ -4445,12 +4424,12 @@
bash-completion = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bash-completion";
- version = "20170716.629";
+ version = "20170909.650";
src = fetchFromGitHub {
owner = "szermatt";
repo = "emacs-bash-completion";
- rev = "d673bf1ed020cf1378fe3d90e1308f555cb0d1af";
- sha256 = "18ql2k8zh2znl4lnks5r0k1b5l7x0hl1w9mhkp0anld2p2bv9f14";
+ rev = "a789093cd32b2007cb64943de30aca51d5b3106b";
+ sha256 = "1fqkslxjdfqcwq1dj4fhw80naq58gpz3d50xar4wrxn76z7vkbcz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/bash-completion";
@@ -4568,11 +4547,11 @@
}) {};
bbdb = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
pname = "bbdb";
- version = "20170129.2224";
+ version = "20170725.300";
src = fetchgit {
url = "https://git.savannah.nongnu.org/git/bbdb.git";
- rev = "8998b3416b36873f4e49454879f2eed20c31b384";
- sha256 = "086ivc9j7vninb46kzparg7zjmdsv346gqig6ki73889wym1m7xn";
+ rev = "c951e15cd01d84193937ae5e347143321c3a2da9";
+ sha256 = "1m19f74zkyh0zyigv807rlznvf2l72kdg6gfizf8pan85qvk949l";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/bbdb";
@@ -4606,48 +4585,6 @@
license = lib.licenses.free;
};
}) {};
- bbdb-android = callPackage ({ bbdb-vcard, fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "bbdb-android";
- version = "20150705.2224";
- src = fetchFromGitHub {
- owner = "tumashu";
- repo = "bbdb-android";
- rev = "60641acf8b90e34b70f783b3d6e7789a4272f2b4";
- sha256 = "0m80k87dahzdpfa4snbl4p9zm5d5anc8s91535mwzsnfbr98qmhm";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/1296e9ffe3a49022a9480b398fbfa311121a1020/recipes/bbdb-android";
- sha256 = "0v3njygqkcrwjkf7jrqmza6bwk2jp3956cx1qvf9ph7dfxsq7rn3";
- name = "bbdb-android";
- };
- packageRequires = [ bbdb-vcard ];
- meta = {
- homepage = "https://melpa.org/#/bbdb-android";
- license = lib.licenses.free;
- };
- }) {};
- bbdb-china = callPackage ({ bbdb-vcard, chinese-pyim, fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "bbdb-china";
- version = "20150615.1856";
- src = fetchFromGitHub {
- owner = "tumashu";
- repo = "bbdb-china";
- rev = "a64725ca6dbb5ec1825f3a9112df9aa54bb14f6c";
- sha256 = "07plwm5nh58qya03l8z0iaqh8bmyhywx7qiffkf803n8wwjb3kdn";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/bbdb-china";
- sha256 = "1clrl3gk036w8q3p2f189jp6wv1y3xv037v77rg87dyz0yjs61py";
- name = "bbdb-china";
- };
- packageRequires = [ bbdb-vcard chinese-pyim ];
- meta = {
- homepage = "https://melpa.org/#/bbdb-china";
- license = lib.licenses.free;
- };
- }) {};
bbdb-csv-import = callPackage ({ bbdb, dash, fetchFromGitLab, fetchurl, lib, melpaBuild, pcsv }:
melpaBuild {
pname = "bbdb-csv-import";
@@ -4690,27 +4627,6 @@
license = lib.licenses.free;
};
}) {};
- bbdb-handy = callPackage ({ bbdb, fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "bbdb-handy";
- version = "20150707.1752";
- src = fetchFromGitHub {
- owner = "tumashu";
- repo = "bbdb-handy";
- rev = "67936204488b539fac9b4a7bfbf11546f3b13de2";
- sha256 = "04yxky7qxh0s4y4addry85qd1074l97frhp0hw77xd1bc7n5zzg0";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/bbdb-handy";
- sha256 = "16wjnsw4p7y21zmpa69vpwydsv5i479czk3y79cnn7s4ap69jmm8";
- name = "bbdb-handy";
- };
- packageRequires = [ bbdb ];
- meta = {
- homepage = "https://melpa.org/#/bbdb-handy";
- license = lib.licenses.free;
- };
- }) {};
bbdb-vcard = callPackage ({ bbdb, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bbdb-vcard";
@@ -4756,16 +4672,16 @@
bbyac = callPackage ({ browse-kill-ring, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bbyac";
- version = "20170127.516";
+ version = "20170815.28";
src = fetchFromGitHub {
owner = "baohaojun";
repo = "bbyac";
- rev = "4dfb1f7c7f0402a0abf45e00007edc2c7f98a25a";
- sha256 = "0vm83ccr9q93z4cvnrzz0al5rpxm8zh9yysn5lja6g2474nm01wy";
+ rev = "e748e07bd77ef93f3c3110b5cde4e68f50b04efb";
+ sha256 = "1030gs02hb6kjd4w5iw0li8k7lcpklya37ybl62mkqhrzfri61bh";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/4409df77dca17b3f9556666a62ee924cb8794364/recipes/bbyac";
- sha256 = "19s9fqcdyqz22m981vr0p8jwghbs267yrlxsv9xkfzd7fccnx170";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/92c10c13a1bd19c8bdbca128852d1c91b76f7002/recipes/bbyac";
+ sha256 = "1pb12b8xrcgyniwqc90z3kr3rq9kkzxjawwcz7xwzymq39fx0897";
name = "bbyac";
};
packageRequires = [ browse-kill-ring cl-lib ];
@@ -4840,12 +4756,12 @@
beginend = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "beginend";
- version = "20170714.709";
+ version = "20170810.624";
src = fetchFromGitHub {
owner = "DamienCassou";
repo = "beginend";
- rev = "a06a479c2279da9e852cf42628b6dfa466fff0bd";
- sha256 = "1jbhg73g1rrkbwql5vi2b0ys9avfazmwzwgd90gkzwavw0ch9cvl";
+ rev = "bc608ef0735e5b7e34b320b899fd2b3ce2156d1b";
+ sha256 = "1vb9505lkzkl9ipczs3q0vmf70mzf9l1wk703g9b5aiss81r5w4i";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/31c1157d4fd9e47a780bbd91075252acdc7899dd/recipes/beginend";
@@ -5048,12 +4964,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";
@@ -5090,12 +5006,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";
@@ -5111,12 +5027,12 @@
bifocal = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bifocal";
- version = "20170625.1258";
+ version = "20170906.1948";
src = fetchFromGitHub {
owner = "riscy";
repo = "bifocal-mode";
- rev = "05d1076069d0a19292a38e835c32137e43ee9708";
- sha256 = "1fvr8vvpdd2xawv1j58wpxakbia31rzy513dakd78mlfkih2ixvg";
+ rev = "5e89ad1a9a47e890ce080a79fd32c71eb128d1c4";
+ sha256 = "1rwxw1wniws31gbmpxgglxbc2g4jag19dvsjrym0f43yy4w2mbpw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/79e71995bd8452bad2e717884f148ec74c9735fc/recipes/bifocal";
@@ -5132,12 +5048,12 @@
binclock = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "binclock";
- version = "20170418.812";
+ version = "20170802.416";
src = fetchFromGitHub {
owner = "davep";
repo = "binclock.el";
- rev = "38ef6531fed16eb2fa69824fbdafac998cf201ac";
- sha256 = "13s4j04b60l44xs381v4padhdyqs8625ssqph24qral6iizwry8d";
+ rev = "87042230d7f3fe3e9a77fae0dbab7d8f7e7794ad";
+ sha256 = "0bbcn3aif3qvmgbga7znivcbgn1n79278x7xvbha52zpj584xp8d";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/95dfa38d795172dca6a09cd02e21630747723949/recipes/binclock";
@@ -5153,12 +5069,12 @@
bind-chord = callPackage ({ bind-key, fetchFromGitHub, fetchurl, key-chord, lib, melpaBuild }:
melpaBuild {
pname = "bind-chord";
- version = "20160530.1042";
+ version = "20170717.1152";
src = fetchFromGitHub {
owner = "waymondo";
repo = "use-package-chords";
- rev = "e8551ce8a514d865831d3a889acece79103fc627";
- sha256 = "0500pqsszg7h7923i0kyjirdyhj8aza3a2h5wbqzdpli2aqra5a5";
+ rev = "f47b2dc8d79f02e5fe39de1f63c78a6c09be2026";
+ sha256 = "0nwcs3akf1cy7dv36n5s5hsr67djfcn7w499vamn0yh16bs7r5ds";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/92fbae4e0bcc1d5ad9f3f42d01f08ab4c3450f1f/recipes/bind-chord";
@@ -5178,8 +5094,8 @@
src = fetchFromGitHub {
owner = "jwiegley";
repo = "use-package";
- rev = "7b055494e39efba8b237202b7c97f40aa19e2579";
- sha256 = "0dzvnz8s60gsrmhfrdr121ji7xw67bmfdwfd8vhffa87wyibrh2n";
+ rev = "360df30683a711c443f87e495ba14cdd125a505d";
+ sha256 = "0nz0gk6gf9060hbyqr5vgzwr620k6l5sk9n6jbhfyrwmcscnmilc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key";
@@ -5424,12 +5340,12 @@
bliss-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bliss-theme";
- version = "20141115.2301";
+ version = "20170808.607";
src = fetchFromGitHub {
owner = "emacsfodder";
repo = "emacs-bliss-theme";
- rev = "2c6922cb24118722819bea79a981f066039d34a3";
- sha256 = "0dn0i3nxrqd82b9d17p1v0ddlpxnlfclkc8sqzrwq6cf19wcrmdr";
+ rev = "c3cf6d8a666ab26909b7da158f9e94df71a5fbbf";
+ sha256 = "1bpyhsjfdjfa1iw9kv7fsl30vz48qllqgjg1rsxdl3vcripcbc9z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/bliss-theme";
@@ -5449,8 +5365,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";
@@ -5529,12 +5445,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";
@@ -5634,12 +5550,12 @@
boogie-friends = callPackage ({ cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
melpaBuild {
pname = "boogie-friends";
- version = "20170621.1207";
+ version = "20170907.922";
src = fetchFromGitHub {
owner = "boogie-org";
repo = "boogie-friends";
- rev = "27c372592e19678bda5012f1ec3c60bcf9df78d4";
- sha256 = "1qcjbmkx6qim2j1sbzjjidqhrakjsipay9bdssyfyi4bwwp8mnq2";
+ rev = "c30b229fb765b42d059c15e76029379ed3fc7202";
+ sha256 = "1cdl0sxa4rwr162cg8qhlwhvav4i0pv0njkfca7dg6xwfjkq6g8l";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5bdd06b82d002677c046876642efe1dc01bc3e77/recipes/boogie-friends";
@@ -5654,7 +5570,7 @@
}) {};
bookmark-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
pname = "bookmark-plus";
- version = "20170703.1431";
+ version = "20170731.1658";
src = fetchurl {
url = "https://www.emacswiki.org/emacs/download/bookmark+.el";
sha256 = "0iqvlwqilwpqlymj8iynw2miifl28h1g7z10q08rly2430fnmi37";
@@ -5695,12 +5611,12 @@
boon = callPackage ({ dash, emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }:
melpaBuild {
pname = "boon";
- version = "20170709.1244";
+ version = "20170825.416";
src = fetchFromGitHub {
owner = "jyp";
repo = "boon";
- rev = "2b7a41491df809e425b81a574fea64e9d6f7f011";
- sha256 = "1haxw4xccalkwmrln5whd0lgfrq7lhdfyip2firlnrkaq8zw741w";
+ rev = "13fca1929639e2239e9b4be060cbd4befd7921b4";
+ sha256 = "0nbwmb4l2f6y58gx8bm42688y6sqc33l5sf0gh1vmn2ki2mq7jvh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/boon";
@@ -5737,12 +5653,12 @@
boron-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "boron-theme";
- version = "20150117.952";
+ version = "20170808.608";
src = fetchFromGitHub {
owner = "emacsfodder";
repo = "emacs-boron-theme";
- rev = "ea5873139424d6ca013b915876daf0399432015b";
- sha256 = "1gys5ri56s2s525wdji3m72sxzswmb8cmhmw5iha84v7hlqkrahb";
+ rev = "87ae1a765e07429fec25d2f29b004f84b52d2e0a";
+ sha256 = "1kdf71af1s67vshgwkdgi7swxx942i605awhmhrhdjbkra29v4yn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/boron-theme";
@@ -5758,12 +5674,12 @@
boxquote = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "boxquote";
- version = "20170418.835";
+ version = "20170802.417";
src = fetchFromGitHub {
owner = "davep";
repo = "boxquote.el";
- rev = "b6a4ad3ee5b327bd3b1bf65f8733bd301fe59883";
- sha256 = "1f61k3sw9zvn6jq60ygi6p66blr52497fadimzcaspa79k9y1cfm";
+ rev = "7e47e0e2853bc1215739b2e28f260e9eed93b2c5";
+ sha256 = "1aqhg24gajvllbqxb0zxrnx6sddas37k2ldfinqyszd856sjhsg3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d2148f8f17b16154bfc337df69a5ad31e25a9b05/recipes/boxquote";
@@ -5800,15 +5716,15 @@
bpr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bpr";
- version = "20160514.458";
+ version = "20170823.1636";
src = fetchFromGitHub {
owner = "ilya-babanov";
repo = "emacs-bpr";
- rev = "8efa52363ae8f86ff06f2677e2e0fb963aa4c186";
- sha256 = "10178l56ryfxsrxysy9qb6vg71q1xavfw1sbchh0mrb90x12vilz";
+ rev = "392de473664fbf319e3585a15f7f8abd34b3dbb6";
+ sha256 = "1ngz76j9mf9a1gvmwdy1r1jqxl8g4d3md95lqxq5dqbwz9076im2";
};
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";
};
@@ -5884,12 +5800,12 @@
browse-at-remote = callPackage ({ cl-lib ? null, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "browse-at-remote";
- version = "20170624.309";
+ version = "20170720.1518";
src = fetchFromGitHub {
owner = "rmuslimov";
repo = "browse-at-remote";
- rev = "e8b7533f6c37c4660e4ba97cd4856383f4e4ce32";
- sha256 = "0650c2401qidw5zprgvnkvqbar9vs9yyj58njiwc394xf5xwzsmb";
+ rev = "b5cff7971ca8bbb966e3acd9b7e5c4c007f94215";
+ sha256 = "16ms9703m15dfxg6ap4mdw7msf8z5rzsdhba51dwivfpjxg7n52c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/browse-at-remote";
@@ -5986,12 +5902,12 @@
bshell = callPackage ({ buffer-manage, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bshell";
- version = "20170116.1117";
+ version = "20170903.1137";
src = fetchFromGitHub {
owner = "plandes";
repo = "bshell";
- rev = "0abd93439895851c1ad3037b0df7443e577ed1ba";
- sha256 = "1frs3m44m4jjl3rxkahkyss2gnijpdpsbqvx0vwbl637gcap1slw";
+ rev = "884a8b906617d305e9d5d2c3750618d2f86f9aed";
+ sha256 = "16qh71yhpxs5cxjmkiqiia8xrxa0ym2n32znp4yc7xiv2xfw2ss4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cf0ed51304f752af3e1f56caf2856d1521d782a4/recipes/bshell";
@@ -6130,22 +6046,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 = "20170109.1220";
+ version = "20170912.1621";
src = fetchFromGitHub {
owner = "plandes";
repo = "buffer-manage";
- rev = "e320ae7e05803551d8b534aaee84cae6e53155e2";
- sha256 = "1dns2ngvmyyyr2a0ww9af0s8yzhbgm1gqqlc6686b04wnj8gdphf";
+ rev = "7a37c2ffa3d8ff446fe9cb5adc693095696b8341";
+ sha256 = "0shxy0apdmyajlhssxkgpzcch02c1ffbpgajddbr68m8npilq6p5";
};
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;
@@ -6175,15 +6091,15 @@
buffer-sets = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "buffer-sets";
- version = "20170505.829";
+ version = "20170717.2040";
src = fetchgit {
url = "https://git.flintfam.org/swf-projects/buffer-sets.git";
- rev = "dd47af82f6cd5c4bab304e41518d4dc06bd6e353";
- sha256 = "1wsx7m9wmzc6yiiyvsjmlqzazcss4vaq8qcdm3r1gybli32llraw";
+ rev = "4a4ccb0d6916c3e9fba737bb7b48e8aac921954e";
+ sha256 = "1rg6iwswi82w8938pavwhvvr2z3ismb42asam2fkad47h2sgn0gz";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/2e12638554a13ef49ab24da08fe20ed2a53dbd11/recipes/buffer-sets";
- sha256 = "0r8mr53bd5cml5gsvq1hbl9894xsq0wwv4p1pp2q4zlcyxlwf4fl";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/61d07bbe7201fc991c7ab7ee6299a89d63ddb5e5/recipes/buffer-sets";
+ sha256 = "1xj9fn2x4kbx8kp999wvz1j68znp7j81zl6rnbaipbx7hjpqrsin";
name = "buffer-sets";
};
packageRequires = [ cl-lib ];
@@ -6232,6 +6148,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";
@@ -6424,12 +6361,12 @@
busybee-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "busybee-theme";
- version = "20130920.942";
+ version = "20170719.228";
src = fetchFromGitHub {
owner = "mswift42";
repo = "busybee-theme";
- rev = "70850d1781ff91c4ce125a31ed451d080f8da643";
- sha256 = "11z987frzswnsym8g3l0s9wwdly1zn5inl2l558m6kcvfy7g59cx";
+ rev = "66b2315b030582d0ebee605cf455d386d8c30fcd";
+ sha256 = "1cvj5m45f5ky3w86khh6crvdqrdjxg2z6b34jlm32qpgmn0s5g45";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/36e2089b998d98575aa6dd3cc79fb7f6847f7aa3/recipes/busybee-theme";
@@ -6466,12 +6403,12 @@
buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "buttercup";
- version = "20170701.429";
+ version = "20170901.422";
src = fetchFromGitHub {
owner = "jorgenschaefer";
repo = "emacs-buttercup";
- rev = "b6deeffe032527696e32623b69bdf07b538a315e";
- sha256 = "0ldc26wpgx01i1sfy9kc52dh3lmy53dr3pxxrn841rb37yc4h1rh";
+ rev = "11d7fdce9f46eec62ed86f4f9617e04d2c204b3a";
+ sha256 = "0vaq5dgajilysn720sgd294rhzvxbr7q2nyf71m74gf42pxf791d";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b187cb5b3cc5b546bfa6b94b6792e6363242d1/recipes/buttercup";
@@ -6909,7 +6846,7 @@
version = "20151009.845";
src = fetchsvn {
url = "https://caml.inria.fr/svn/ocaml/trunk/emacs/";
- rev = "16560";
+ rev = "16561";
sha256 = "16qw82m87i1fcnsccqcvr9l6p2cy0jdhljsgaivq0q10hdmbgqdw";
};
recipeFile = fetchurl {
@@ -6947,12 +6884,12 @@
cargo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }:
melpaBuild {
pname = "cargo";
- version = "20170621.1316";
+ version = "20170807.607";
src = fetchFromGitHub {
owner = "kwrooijen";
repo = "cargo.el";
- rev = "b0487f95a7de7a1d6f03cdd05220f633977d65a2";
- sha256 = "0r9v7q7hkdw2q3iifyrb6n9jrssz2rcv2xcc7n1nmg1v40av3ijd";
+ rev = "61f4673b2b4d76ed6404f2c905e5de57c41ccc97";
+ sha256 = "0nkrqmylyv2c7zrfy12p7j161mkg91zm9fb1gjjyq0k7ixad677q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e997b356b009b3d2ab467fe49b79d728a8cfe24b/recipes/cargo";
@@ -7014,8 +6951,8 @@
src = fetchFromGitHub {
owner = "cask";
repo = "cask";
- rev = "0a2e8436e02af6ca688b25ba90a19505a6113296";
- sha256 = "1fjsss678dj6vikm0ig5jqksjlwgnwhpaqfy3dk56gnjc49nl29v";
+ rev = "07d8c963a4d349d856c51a471c60689734ebeda0";
+ sha256 = "15fyfzd0ssjyq8n77s8h8n0by33j5q0m4hs0v5k7m8zb3ca0w7mc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/cask";
@@ -7091,6 +7028,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";
@@ -7119,8 +7076,8 @@
src = fetchFromGitHub {
owner = "skk-dev";
repo = "ddskk";
- rev = "78798134af82a300e54a5d22d2f10c2885cd11ae";
- sha256 = "1svdv0c9c0q68d0ad65kvaxvkafb15gv62yhxb02a4h4g4w9n4vs";
+ rev = "16d156562aef72f02ced58087335ed72d520d878";
+ sha256 = "0rz49i2yqs1yalqqnwgk2zvsga6qav4hc2dhf8p2kfkzrcbpzgxx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7375cab750a67ede1a021b6a4371b678a7b991b0/recipes/ccc";
@@ -7161,8 +7118,8 @@
src = fetchFromGitHub {
owner = "skk-dev";
repo = "ddskk";
- rev = "78798134af82a300e54a5d22d2f10c2885cd11ae";
- sha256 = "1svdv0c9c0q68d0ad65kvaxvkafb15gv62yhxb02a4h4g4w9n4vs";
+ rev = "16d156562aef72f02ced58087335ed72d520d878";
+ sha256 = "0rz49i2yqs1yalqqnwgk2zvsga6qav4hc2dhf8p2kfkzrcbpzgxx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b48fe069ecd95ea0f9768ecad969e0838344e45d/recipes/cdb";
@@ -7345,12 +7302,12 @@
ceylon-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ceylon-mode";
- version = "20170626.1403";
+ version = "20170806.919";
src = fetchFromGitHub {
owner = "lucaswerkmeister";
repo = "ceylon-mode";
- rev = "cd027d71a6cd29b94ba46919b4e067b86f267fc6";
- sha256 = "06knyp3blini231ahlmkml3r0ypdajlz1dm41mwnzgcmg04x0s2h";
+ rev = "1267447a38648502627005bfad0a3aef3572ef7d";
+ sha256 = "1qj0dxfwh4yn9q01j22nq3ssg8l0s9v437l685gfly3ac5fp83ry";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/09cd1a2ccf33b209a470780a66d54e1b1d597a86/recipes/ceylon-mode";
@@ -7370,8 +7327,8 @@
src = fetchFromGitHub {
owner = "cfengine";
repo = "core";
- rev = "28484409e8f64f976bf3d80f10081b18f7724cf5";
- sha256 = "0zvxrbf30hy511jmlfvmqj5yiysfbs73x064w1px7ghavczdjvx5";
+ rev = "83fd2b5014d2eb5d685941bed1ee64bf750e4f94";
+ sha256 = "1ffdscvp624gh8vgb01nsdbafynw7b2r83mr1nqf356jpn43ah7a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style";
@@ -7405,13 +7362,76 @@
license = lib.licenses.free;
};
}) {};
+ cfml-mode = callPackage ({ cftag-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode }:
+ melpaBuild {
+ pname = "cfml-mode";
+ version = "20170903.1949";
+ src = fetchFromGitHub {
+ owner = "am2605";
+ repo = "cfml-mode";
+ rev = "86e77dcbb583191a3e755bdc29534f33d82bfc56";
+ sha256 = "0b0261ap0jiys9d0x31xg7x36kpq06fni2c0cjhi58wpcykq3s1p";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/0d28507e1109195004a371fa201d914b995c2b4e/recipes/cfml-mode";
+ sha256 = "0q88lxhkzzab4jjihk0livdpn6lsmd8l2s4brcbl8402m285sylp";
+ name = "cfml-mode";
+ };
+ packageRequires = [ cftag-mode emacs mmm-mode ];
+ meta = {
+ homepage = "https://melpa.org/#/cfml-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
+ cframe = callPackage ({ buffer-manage, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "cframe";
+ version = "20170828.919";
+ src = fetchFromGitHub {
+ owner = "plandes";
+ repo = "cframe";
+ rev = "8b60c482a5888464caf6d05b2a0079340bdd7be8";
+ sha256 = "0skms8cwniddpns1fmpqjnhyrn1fjvv6zknzjfganpv0h10gypgk";
+ };
+ 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";
+ version = "20170811.2240";
+ src = fetchFromGitHub {
+ owner = "am2605";
+ repo = "cfml-mode";
+ rev = "86e77dcbb583191a3e755bdc29534f33d82bfc56";
+ sha256 = "0b0261ap0jiys9d0x31xg7x36kpq06fni2c0cjhi58wpcykq3s1p";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/0914d33ebf58847fa3906b1f0d53e97ac335b334/recipes/cftag-mode";
+ sha256 = "0qnq8h5nwhw464ax8qpbsvflpaar44zw0mh2y7kc358v27n3qy6c";
+ name = "cftag-mode";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/cftag-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
cg = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild }: melpaBuild {
pname = "cg";
- version = "20170201.347";
+ version = "20170911.610";
src = fetchsvn {
url = "https://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs";
- rev = "12270";
- sha256 = "0lv9lsh1dnsmida4hhj04ysq48v4m12nj9yq621xn3i6s2qz7s1k";
+ rev = "12362";
+ sha256 = "0bmydpv3slv5fvy1admgsm1qlkfp4sdsd0caik48dn7bnghifggz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/cg";
@@ -7494,8 +7514,8 @@
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "char-menu";
- rev = "f4d8bf8fa6787e2aaca2ccda5223646541d7a4b2";
- sha256 = "0zyi1ha17jk3zz7nirasrrx43j3jkrsfz7ypbc4mk44w7hsvx2hj";
+ rev = "b4542123e8c9bc40de1328f9a8078a0704a9a98d";
+ sha256 = "101r6gryj5ic3mbv400klcjw8zfpn1rwi8ayyki93a53pali5g96";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f6676747e853045b3b19e7fc9524c793c6a08303/recipes/char-menu";
@@ -7553,12 +7573,12 @@
cheat-sh = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cheat-sh";
- version = "20170707.757";
+ version = "20170802.418";
src = fetchFromGitHub {
owner = "davep";
repo = "cheat-sh.el";
- rev = "f61dc1ab9f0d6933dfda5366b8051217f1e9b491";
- sha256 = "028xyflii2ah6ijhq4fpmzsaj1nhps90kprpy7x7a9v4s85yvadx";
+ rev = "e90445124f3f145a047779e42d070a3c5e150f70";
+ sha256 = "06avap8w833syhz7pdpsm73nbsgbwzmpagd7f3khzaf6r6c90jmn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ebac62fb3828d81e30145b9948d60e781e20eda2/recipes/cheat-sh";
@@ -7721,12 +7741,12 @@
chinese-conv = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "chinese-conv";
- version = "20160218.1315";
+ version = "20170807.1428";
src = fetchFromGitHub {
owner = "gucong";
repo = "emacs-chinese-conv";
- rev = "2e5ba28b24c32d8d1da81cf9877c79abbf2e9bbb";
- sha256 = "1vfyb8gfrvfrvaaw0p7c6xji2kz6cqm6km2cmjixw0qjikxxlkv1";
+ rev = "b56815bbb163d642e97fa73093b5a7e87cc32574";
+ sha256 = "1bc3yn8y60y6a4vpqv39arn1pkcpl4s4n0sz9446f6m1lcal4c3r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a798158829f8fd84dd3e5e3ec5987d98ff54e641/recipes/chinese-conv";
@@ -7739,27 +7759,6 @@
license = lib.licenses.free;
};
}) {};
- chinese-fonts-setup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "chinese-fonts-setup";
- version = "20170512.1";
- src = fetchFromGitHub {
- owner = "tumashu";
- repo = "chinese-fonts-setup";
- rev = "a88f45239ca73e95eb6bac923590f1d108b822ca";
- sha256 = "1h0nwrnh0krn9p0x1cj67gjdlzr82xml76ycn6745f943sn6d5ah";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/c536882e613e83a4a2baf86479bfb3efb86d916a/recipes/chinese-fonts-setup";
- sha256 = "141ri6a6mnxf7fn17gw48kxk8pvl3khdxkb4pw8brxwrr9rx0xd5";
- name = "chinese-fonts-setup";
- };
- packageRequires = [ cl-lib ];
- meta = {
- homepage = "https://melpa.org/#/chinese-fonts-setup";
- license = lib.licenses.free;
- };
- }) {};
chinese-number = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "chinese-number";
@@ -7781,111 +7780,6 @@
license = lib.licenses.free;
};
}) {};
- chinese-pyim = callPackage ({ async, chinese-pyim-basedict, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip }:
- melpaBuild {
- pname = "chinese-pyim";
- version = "20170512.735";
- src = fetchFromGitHub {
- owner = "tumashu";
- repo = "chinese-pyim";
- rev = "d57d0fd47565dc087724a68c6b3abd16a58625ae";
- sha256 = "10ir2452rj6f48qfgwps6y1mn5afrsa04z0xl2f31j5463j4b4mx";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/157a264533124ba05c161aa93a32c7209f002fba/recipes/chinese-pyim";
- sha256 = "0zdx5zhgj1ly89pl48vigjzd8g74fxnxcd9bxrqykcn7y5qvim8l";
- name = "chinese-pyim";
- };
- packageRequires = [ async chinese-pyim-basedict cl-lib popup pos-tip ];
- meta = {
- homepage = "https://melpa.org/#/chinese-pyim";
- license = lib.licenses.free;
- };
- }) {};
- chinese-pyim-basedict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "chinese-pyim-basedict";
- version = "20160723.438";
- src = fetchFromGitHub {
- owner = "tumashu";
- repo = "chinese-pyim-basedict";
- rev = "3bca2760d78fd1195dbd4c2d570db955023a5623";
- sha256 = "07dd90bhmayacgvv5k6j079wk3zhlh83zw471rd37n2hmw8557mv";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/e2315ffe7d13928eddaf217a5f67a3e0dd5e62a1/recipes/chinese-pyim-basedict";
- sha256 = "1qmr71lnpn06mcbb6gfr3dh78pav0sk9mld956cvnkg82vg7nmpv";
- name = "chinese-pyim-basedict";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/chinese-pyim-basedict";
- license = lib.licenses.free;
- };
- }) {};
- chinese-pyim-greatdict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "chinese-pyim-greatdict";
- version = "20170513.1833";
- src = fetchFromGitHub {
- owner = "tumashu";
- repo = "chinese-pyim-greatdict";
- rev = "8efd9321d21d5daabdb32cb3696bc7c7b83ce991";
- sha256 = "05ap9d2kk9dyj85zm581nwizbdqx8fqa0yjswk4df0y6mgz4g0q9";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/03234f7a1abe7423c5a9bcb4c100957c8eece351/recipes/chinese-pyim-greatdict";
- sha256 = "1xqr2fcsb45khavqx06ry2sm8db790zlggk61civbdyafvlz8ikc";
- name = "chinese-pyim-greatdict";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/chinese-pyim-greatdict";
- license = lib.licenses.free;
- };
- }) {};
- chinese-pyim-wbdict = callPackage ({ chinese-pyim, fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "chinese-pyim-wbdict";
- version = "20170217.15";
- src = fetchFromGitHub {
- owner = "tumashu";
- repo = "chinese-pyim-wbdict";
- rev = "59856a7199dde278c33f6f8d8e21df4944ba996a";
- sha256 = "1aahff6r0liil7nx1pprmkmb5c39kwywblj3n6zs80ikwy4759xb";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/7c77ba5562e8bd8b8f532e7745edcdf3489584ac/recipes/chinese-pyim-wbdict";
- sha256 = "0y9hwn9rjplb69vi4s9bvf6fkvns2rlpkqm0qvv44mxq7g61lm5c";
- name = "chinese-pyim-wbdict";
- };
- packageRequires = [ chinese-pyim ];
- meta = {
- homepage = "https://melpa.org/#/chinese-pyim-wbdict";
- license = lib.licenses.free;
- };
- }) {};
- chinese-remote-input = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "chinese-remote-input";
- version = "20150110.2103";
- src = fetchFromGitHub {
- owner = "tumashu";
- repo = "chinese-remote-input";
- rev = "d05d0bd116421e6fd19f52e9e576431ee5de0858";
- sha256 = "06k13wk659qw40aczq3i9gj0nyz6vb9z1nwsz7c1bgjbl2lh6hcv";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/b639a9d3b258afe6637055e75a2939f2df18366a/recipes/chinese-remote-input";
- sha256 = "0nnccm6w9i0qsgiif22hi1asr0xqdivk8fgg76mp26a2fv8d3dag";
- name = "chinese-remote-input";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/chinese-remote-input";
- license = lib.licenses.free;
- };
- }) {};
chinese-wbim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "chinese-wbim";
@@ -7910,12 +7804,12 @@
chinese-word-at-point = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "chinese-word-at-point";
- version = "20150618.1838";
+ version = "20170811.241";
src = fetchFromGitHub {
owner = "xuchunyang";
repo = "chinese-word-at-point.el";
- rev = "36a03cce32fe059d2b581cb2e029715c0be81074";
- sha256 = "1jsy43avingxxccs0zw2qm5ysx8g76xhhh1mnyypxskl9m60qb4j";
+ rev = "8223d7439e005555b86995a005b225ae042f0538";
+ sha256 = "13gva1ld4f9wwb2m4fpk6bd9342qvvmaf5i1r3x3h84czmk0nq1r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c9b7785eca577218feade982c979694389f37ec3/recipes/chinese-word-at-point";
@@ -7928,22 +7822,22 @@
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 = "20170827.1650";
src = fetchFromGitHub {
owner = "tumashu";
repo = "chinese-yasdcv";
- rev = "92231de8771f2ffc9f5bb9b4ee08700fdb1a9dcb";
- sha256 = "0viihcrnf7psqkfj2izdaah2w5bkz2cm46bgbhygzfqx8424vqh7";
+ rev = "fe14df025491530680529c98df3e3239ff44f57f";
+ sha256 = "0vcm381i2zvpjcq8jcxldk7dn2c7pbszmb8j3qwrw038hx0lbi3i";
};
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;
@@ -7971,16 +7865,16 @@
choice-program = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "choice-program";
- version = "20161230.1721";
+ version = "20170828.616";
src = fetchFromGitHub {
owner = "plandes";
repo = "choice-program";
- rev = "691ced104adc6dbb3ddf8c28563c1cd36eb165b1";
- sha256 = "1jd0zj8g9nnzdfy76z9565sz6sd6690nbbi4zg71pxssmsqgkc3w";
+ rev = "5a803216d1d7a7ac6fd0f89f04ba4c126182a852";
+ sha256 = "0iah71kcrzi22mi1jvyyaiflsx0ry24hqb0wd2w0nbgzc8s5ycqb";
};
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 ];
@@ -8034,12 +7928,12 @@
cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }:
melpaBuild {
pname = "cider";
- version = "20170717.303";
+ version = "20170913.434";
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "cider";
- rev = "7daf4e968de21e7eb7bb2dc1b6ca30ae4e990532";
- sha256 = "00y8d8gz0nfqr9dfd1nrkm32ckaln4cg6l6k3jbjzc0la673ljfr";
+ rev = "8a9eab32646abcaaf31fe83b2d897c01971b98f1";
+ sha256 = "0ddkm87l9ann05a6j57r0x59qqgfavwrvlzhkc5xhak1nmk5556h";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider";
@@ -8223,12 +8117,12 @@
circe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "circe";
- version = "20170528.731";
+ version = "20170728.638";
src = fetchFromGitHub {
owner = "jorgenschaefer";
repo = "circe";
- rev = "13c605e639194c3da0c2e685056fac685f8c76a0";
- sha256 = "0n7v0g332ml1ang2fjc8rjbi8h1f4bqazcqi8dlfn99vvv8kcd21";
+ rev = "452dfb407b640ba6eb288ff25a9de27446a409c4";
+ sha256 = "1yqnpvk5ib754bkb8gcd8skf0d3rqxkqwcsbibr052ilrp5ampcl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/circe";
@@ -8309,13 +8203,13 @@
pname = "clang-format";
version = "20170120.137";
src = fetchsvn {
- url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format";
- rev = "308172";
- sha256 = "0qyhvjb3pf0qp7ag2wav4wxrxfgk1zga0dy4kzw8lm32ajzjjavk";
+ url = "https://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format";
+ rev = "313143";
+ sha256 = "0zldh5nk5i3y41q70kwlhf576xmv0baim3q4jam01d41p4p040mq";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/69e56114948419a27f06204f6fe5326cc250ae28/recipes/clang-format";
- sha256 = "19qaihb0lqnym2in4465lv8scw6qba6fdn8rcbkpsq09hpzikbah";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/clang-format";
+ sha256 = "1s7xbq1xczzz24gi6wlv9ihzs7cbsn3g16rrhdpxwaadagbasgk7";
name = "clang-format";
};
packageRequires = [ cl-lib ];
@@ -8432,12 +8326,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";
@@ -8495,12 +8389,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";
@@ -8516,12 +8410,12 @@
clj-refactor = callPackage ({ cider, clojure-mode, edn, emacs, fetchFromGitHub, fetchurl, hydra, inflections, lib, melpaBuild, multiple-cursors, paredit, s, seq, yasnippet }:
melpaBuild {
pname = "clj-refactor";
- version = "20170608.320";
+ version = "20170720.712";
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "clj-refactor.el";
- rev = "769eb06ac82dff8aa0239b9ca47cf3240ff0857f";
- sha256 = "17g6rq30dvvhr3lljzn5gg6v9bdxw31fw6b20sgcp7gx4xspc42w";
+ rev = "f5295df68955c23fffd60718039fd386d13c77f5";
+ sha256 = "14lp3jxxpjfm31rbrf2rb988fzh4xfacqdcwp15b87pixziln08x";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3a2db268e55d10f7d1d5a5f02d35b2c27b12b78e/recipes/clj-refactor";
@@ -8612,12 +8506,12 @@
cloc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cloc";
- version = "20151007.201";
+ version = "20170728.1124";
src = fetchFromGitHub {
owner = "cosmicexplorer";
repo = "cloc-emacs";
- rev = "15e63b83dd6261f543d25aac4c72e764e3274d53";
- sha256 = "1rflc00yrbb7xzfh8c54ajf4qnhsp3mq07gkr257gjyrwsdw762v";
+ rev = "f30f0472e465cc8d433d2473e9d3b8dfe2c94491";
+ sha256 = "0g8hklc0914dsi3ks7g251w58ixa78qsh87dx914cc8sahpc0ws2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0dd7a641efd13aa0bd7509d8a5b0a28e3a0493c8/recipes/cloc";
@@ -8696,12 +8590,12 @@
clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "clojure-mode";
- version = "20170712.349";
+ version = "20170819.2159";
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "clojure-mode";
- rev = "276dad92886d7a3c7edb95be3e9fb2c17ea8b2a4";
- sha256 = "1hk0pyiz2nfmlh1xziqsjkdzjk7m4hlc4ki62pwyv4f1izajrrdd";
+ rev = "a6f0592e9cabeb4e039e654bd30890a20208950e";
+ sha256 = "0sr34679371b89qz93z88b6l0ii4lfh8lm91clpl6in4lp4daj93";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode";
@@ -8721,8 +8615,8 @@
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "clojure-mode";
- rev = "276dad92886d7a3c7edb95be3e9fb2c17ea8b2a4";
- sha256 = "1hk0pyiz2nfmlh1xziqsjkdzjk7m4hlc4ki62pwyv4f1izajrrdd";
+ rev = "a6f0592e9cabeb4e039e654bd30890a20208950e";
+ sha256 = "0sr34679371b89qz93z88b6l0ii4lfh8lm91clpl6in4lp4daj93";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking";
@@ -8780,12 +8674,12 @@
clomacs = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "clomacs";
- version = "20170705.719";
+ version = "20170726.436";
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "clomacs";
- rev = "7af6fa717f08fda930641a27f3a07743c2042514";
- sha256 = "1diavwmjgaz0jxjbkzhlca9klqd7kmpih98clp8wiavhms80ykds";
+ rev = "8d3e12a2f73e81499fa18f30adaea8c861e4a9b1";
+ sha256 = "01wpzbv4vjad0nvbydc0rwb3jdqbncwajs5xrng88n1xxhrajh1x";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/345f9797e87e3f5f957c167a5e3d33d1e31b50a3/recipes/clomacs";
@@ -8801,12 +8695,12 @@
closql = callPackage ({ emacs, emacsql-sqlite, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "closql";
- version = "20161130.925";
+ version = "20170629.921";
src = fetchFromGitHub {
owner = "emacscollective";
repo = "closql";
- rev = "0bb0fa3dd1e545cbf025d42e253ddb00107156a3";
- sha256 = "1mpycmj88gi62rhzxdv4933l318j3llphbc00b7rvzms55sgpcz5";
+ rev = "73e68bcfbe076e152beed1b8e5f894ca438f9770";
+ sha256 = "0vj18784x6cdl39sbfpsksmxln5yj31ah250q5n7ivh54vk2hvjl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/closql";
@@ -8927,12 +8821,12 @@
cmake-ide = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, levenshtein, lib, melpaBuild, s, seq }:
melpaBuild {
pname = "cmake-ide";
- version = "20170712.809";
+ version = "20170818.907";
src = fetchFromGitHub {
owner = "atilaneves";
repo = "cmake-ide";
- rev = "a20bf1a6b3c0c70f3637f5a8f4280ff3479ec180";
- sha256 = "07m1z36823pzlf4d0wf3v053svgyi2r8wk7rxjmnzrz717y6xj9h";
+ rev = "6489aabba8d124445ba72f55db9ef3bb2212b1b0";
+ sha256 = "0wh0z28nfb5kpm3jlkkgkxbhzyc8akyc6hs1fm8i7bxrslrj6ll0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/17e8a8a5205d222950dc8e9245549a48894b864a/recipes/cmake-ide";
@@ -8952,8 +8846,8 @@
src = fetchFromGitHub {
owner = "Kitware";
repo = "CMake";
- rev = "2d5e494637f9dad13fd0206ac3420e7d26f8b778";
- sha256 = "0wsljwpd0ld4c0qxfn1x1a7xvcq8ik5dmxcys94cb2cw8xxgzbz2";
+ rev = "a763cffd6b65bbe5572527e39969981bf31d5aca";
+ sha256 = "1jrvsqcb123z1r84c074qz1z6ljz6psc7ysabzsxkrkcs3f66v58";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -8969,12 +8863,12 @@
cmake-project = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cmake-project";
- version = "20150720.1359";
+ version = "20170725.912";
src = fetchFromGitHub {
owner = "alamaison";
repo = "emacs-cmake-project";
- rev = "5212063b6276f8b9af8b48b4052e5ec97721c08b";
- sha256 = "0fyzi8xac80wnhnwwm1j6yxpvpg1n4diq2lcl3qkj8klvk5gpxr6";
+ rev = "ae763397663fbd35de0541a5d9f2de18a5de3305";
+ sha256 = "0ynxcbf0jbn6b4dxswhk9qhijmhp05q6v925nglq67j0xjm8bicw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0857c4db1027981ea73bc32bcaa15e5df53edea3/recipes/cmake-project";
@@ -9069,6 +8963,27 @@
license = lib.licenses.free;
};
}) {};
+ cnfonts = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "cnfonts";
+ version = "20170731.1611";
+ 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;
+ };
+ }) {};
cobra-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cobra-mode";
@@ -9281,12 +9196,12 @@
colonoscopy-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "colonoscopy-theme";
- version = "20141115.2301";
+ version = "20170808.609";
src = fetchFromGitHub {
owner = "emacsfodder";
repo = "emacs-colonoscopy-theme";
- rev = "7b873d7e7e091b71bf4fdd23ded19e261a1e3936";
- sha256 = "1k3sd07ffgpfhzg7d9mb1gc3n02zsvilxc30bgiycbjrbjgqq0i6";
+ rev = "64bbb322b13dae91ce9f1e3581f836f94f800ead";
+ sha256 = "1r0is6zjkzikm565fvmj0gx8ms5ig9l5xihnka4fig7jy6ak33z5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/colonoscopy-theme";
@@ -9302,12 +9217,12 @@
color-identifiers-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "color-identifiers-mode";
- version = "20170615.1338";
+ version = "20170814.1121";
src = fetchFromGitHub {
owner = "ankurdave";
repo = "color-identifiers-mode";
- rev = "d57e162c2dcb926291ded21cbe46b98ad0ca32c8";
- sha256 = "1n12z7qfwgsdvdzzi5gkgkmdaazbrg5064s08xsc6gsfs4rb5d17";
+ rev = "5750ee9e1ab8a6890381bb461982113b1eb98879";
+ sha256 = "17ry98s4lcl6g63bj8a0wd1rmh8whlxlmzfdjhp8mapdybqplcql";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5c735755e414fdf169aca5ec6f742533d21472e0/recipes/color-identifiers-mode";
@@ -9431,8 +9346,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";
@@ -9448,12 +9363,12 @@
color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "color-theme-sanityinc-tomorrow";
- version = "20170626.1417";
+ version = "20170908.216";
src = fetchFromGitHub {
owner = "purcell";
repo = "color-theme-sanityinc-tomorrow";
- rev = "ffcec9177c8b4393f036acb5ca51b33b53916ea8";
- sha256 = "0w59yfg7chx6srxpxsnwz7qrgyy35pdswv44j6lbh33hylxmclrh";
+ rev = "6c9b01bb5268f00d0e65fb8351a7ad87abbfb127";
+ sha256 = "1gr1iab6dyyx47v2fbx7g1lf8x1hm9vppra9ypf8957fxzi99l2n";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-tomorrow";
@@ -9618,8 +9533,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";
@@ -9635,12 +9550,12 @@
comment-dwim-2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "comment-dwim-2";
- version = "20150825.1549";
+ version = "20170809.1354";
src = fetchFromGitHub {
owner = "remyferre";
repo = "comment-dwim-2";
- rev = "8cedecde018b5872195bfead6511af822776a430";
- sha256 = "0kzlv2my0cc7d3nki2rlm32nmb2nyjb38inmvlf13z0m2kybg2ps";
+ rev = "8da8aba4cab4a0a1eef3aea2de219227526876e4";
+ sha256 = "1bvgdm52bp39gdcqxb02bnxssmih887jgr82m3c09yfwkpnr2qry";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4ac6ac97875117013515a36c9a4452fbd6c0d74c/recipes/comment-dwim-2";
@@ -9719,12 +9634,12 @@
company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "company";
- version = "20170715.1035";
+ version = "20170828.414";
src = fetchFromGitHub {
owner = "company-mode";
repo = "company-mode";
- rev = "a197b072dc93dbad238f1dc70da01e3775ebfb56";
- sha256 = "0is65adahvfgfjamnr8dmnh5xnijcwzhbzsvvi6ixkkfm2xvs5aa";
+ rev = "c0098afab0719c633ea9984e62a240f542ab8c49";
+ sha256 = "0vm4rl7xkqpbi1dh2ds45smbyk25x16w0x99ri1nzvfbana5w7j5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company";
@@ -10154,12 +10069,12 @@
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 = "c7fddb39ecbc9ebd1ebe7d2a3af473ed0fffffa1";
+ sha256 = "0qx8pq38faig41xkl1a4hrgp3ziyjyn6g53vn5wj7cdgm5kk67nb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/company-go";
@@ -10196,12 +10111,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";
@@ -10280,12 +10195,12 @@
company-math = callPackage ({ company, fetchFromGitHub, fetchurl, lib, math-symbol-lists, melpaBuild }:
melpaBuild {
pname = "company-math";
- version = "20170221.751";
+ version = "20170804.1202";
src = fetchFromGitHub {
owner = "vspinu";
repo = "company-math";
- rev = "34b4b52f67e5c1ffaf807e4be1512fca4695eea8";
- sha256 = "0xl2am7kwbdfaxysjamq0b9slcdmlqqprb23zf07i4b28qa72qca";
+ rev = "7e7f8c71f57b12f9bcbbf01f2bbcc59343ad76d4";
+ sha256 = "0akqhhjvzsg0lbqx4bbkfkzijidwgi3bb32sxl3yxz7zfm9pbhn2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fadff01600d57f5b9ea9c0c47ed109e058114998/recipes/company-math";
@@ -10368,8 +10283,8 @@
src = fetchFromGitHub {
owner = "xcwen";
repo = "ac-php";
- rev = "e0aaae30e4e5f18390e5d00953db02c1f03c44f6";
- sha256 = "1mrk37w88b4843jbghr9i79rbwbzwk8b1wljvzmm6x0q7ldlxmsm";
+ rev = "9e9c126397c3d2c7160e38eb72b9317c515678f3";
+ sha256 = "14qnbfxm9k870qi53krg6lmmfzcbhnv0yslhv66p40rwh9wjslwd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php";
@@ -10496,12 +10411,12 @@
company-rtags = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rtags }:
melpaBuild {
pname = "company-rtags";
- version = "20170522.2154";
+ version = "20170829.2022";
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "65c8f03ff0112ce5c5e11aff6867ad0eb9019e63";
- sha256 = "0xlacwjmvx5xd8m7yi8l8mqi0lqs2gr2hmjag2frvmxcn4cpb4gc";
+ rev = "2af4d6a32e8194f8fbcc23fd94395e3d595a3c25";
+ sha256 = "0091w529lvbjlw1fdb3qjgb8fd5fcwxhqyr4ps5cvxl5bqnwlw39";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags";
@@ -10598,6 +10513,27 @@
license = lib.licenses.free;
};
}) {};
+ company-terraform = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, terraform-mode }:
+ melpaBuild {
+ pname = "company-terraform";
+ version = "20170812.722";
+ src = fetchFromGitHub {
+ owner = "rafalcieslak";
+ repo = "emacs-company-terraform";
+ rev = "bd97342fa1b3b77bd19a3ff202a5ce5cbead36d4";
+ sha256 = "0yv0hiskdxx2653g5crmb9yq6c8azrvdja56wnhm8i9kvhnhkggh";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/1d9732da975dcf59d3b311b19e20abbb29c33656/recipes/company-terraform";
+ sha256 = "198ppqn6f7y9bg582z5s4cl9gg1q9ibsr7mmn68b50zvma7ankzh";
+ name = "company-terraform";
+ };
+ packageRequires = [ company emacs terraform-mode ];
+ meta = {
+ homepage = "https://melpa.org/#/company-terraform";
+ license = lib.licenses.free;
+ };
+ }) {};
company-try-hard = callPackage ({ company, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "company-try-hard";
@@ -10668,8 +10604,8 @@
src = fetchFromGitHub {
owner = "abingham";
repo = "emacs-ycmd";
- rev = "35e8a31e32d0de890547612db8373d7333db8d8a";
- sha256 = "023bkmviaqb85kwwlpmzfc5gycf4i7w8a43zhbmvasfjjb962yzd";
+ rev = "fd037efae08628e41480e9dad705dcc1f64e498d";
+ sha256 = "06scz0d3jzgbr919lkjjfq9x1dyr5nqkhblvfpyk5bdp8l6j06d6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-ycmd";
@@ -10685,12 +10621,12 @@
composable = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "composable";
- version = "20170426.459";
+ version = "20170723.2347";
src = fetchFromGitHub {
owner = "paldepind";
repo = "composable.el";
- rev = "09020605ee7f4e52ff2fa2f6d68d826db1ee7565";
- sha256 = "0vhvgn0ybdnh8c71sbjxh6bb05w5ivm3rmkj4f255zqfkjyddl7q";
+ rev = "ac981974f89607393cc61314aaa19672d45b0650";
+ sha256 = "0xg46r6ibga27cdycbysm80n2ayi8vmxcff1b6bqjjrsc0wbdnac";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1fc0f076198e4be46a33a26eea9f2d273dda12b8/recipes/composable";
@@ -10708,14 +10644,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 ];
@@ -10731,8 +10667,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";
@@ -10752,8 +10688,8 @@
src = fetchFromGitHub {
owner = "necaris";
repo = "conda.el";
- rev = "0257cd83796c3bdc357b69c1ecaf6d7eb6e2bf53";
- sha256 = "035srwyx94fp80f6rgkvx1vxlvaznsgp7zy5gcddvyazx1a1yj0s";
+ rev = "468a9090f3a41e4c14d23a3b7987defd27ccd799";
+ sha256 = "0bcjvqs3m5vwmixm745mp19sy0fkdpv080issqf97jqxh3arqh1k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fcf762e34837975f5440a1d81a7f09699778123e/recipes/conda";
@@ -10769,12 +10705,12 @@
config-general-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "config-general-mode";
- version = "20170715.733";
+ version = "20170719.446";
src = fetchFromGitHub {
owner = "tlinden";
repo = "config-general-mode";
- rev = "dd018f96f631a3fc6230ce5011d6357cf9720ef1";
- sha256 = "15xvp40b3sbwjf492j0abaknwc5f0cz0f7hydy7mdqdlha20qahs";
+ rev = "8927fd1c359275dc4236c5f48fea0e3ce8349bed";
+ sha256 = "04f6608ndhan6xmipzylzwzx2asx0bsqx8a9rnxfab3bza756c99";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6c06831528e4bbc44aae1cc5cd6bec60150ae087/recipes/config-general-mode";
@@ -10891,6 +10827,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";
@@ -10954,6 +10911,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 = "20170817.2319";
+ src = fetchFromGitHub {
+ owner = "emacs-php";
+ repo = "emacs-auto-deployment";
+ rev = "7b8e13cd3dcc12b247089a4530e08fd0ab3bc487";
+ sha256 = "0nx9qlp1jl7hmwf19ifac8r0955vkdkscf0nmm92hdqbj83jdmv9";
+ };
+ 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";
@@ -10999,16 +10977,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 ];
@@ -11041,12 +11019,12 @@
counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
melpaBuild {
pname = "counsel";
- version = "20170710.1111";
+ version = "20170911.1121";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "swiper";
- rev = "dc146d9f1435b79fbfbfa702f0172b9de05f631d";
- sha256 = "09cfs0rhhb72b12pic2w9chbc000pqnafrl2x0g8v5r065pzp64n";
+ rev = "0a1d361b926291874124f8c63a653d83ead64a36";
+ sha256 = "0ssbsllpv0lyr7dhnipwd7zgpxvfm36rldr7vkxh5maajdkamls7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel";
@@ -11146,12 +11124,12 @@
counsel-projectile = callPackage ({ counsel, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
melpaBuild {
pname = "counsel-projectile";
- version = "20170216.1426";
+ version = "20170911.1304";
src = fetchFromGitHub {
owner = "ericdanan";
repo = "counsel-projectile";
- rev = "aefd25c74718e66f180127c0d273eade887325b0";
- sha256 = "10d29mpvsav19m9x51w8bjv0r9agxdwsvhk1ql62lj7rcy4256jq";
+ rev = "20557b47a963cc5304ac2bc3ea4800c3a7da7feb";
+ sha256 = "0cszbczgpsm6l2pwh8pci3md0aranilqw6j0519vr6aaj5j6g15p";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/389f16f886a385b02f466540f042a16eea8ba792/recipes/counsel-projectile";
@@ -11293,12 +11271,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";
@@ -11332,27 +11310,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";
@@ -11461,12 +11418,12 @@
cricbuzz = callPackage ({ dash, enlive, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "cricbuzz";
- version = "20161130.2036";
+ version = "20170726.504";
src = fetchFromGitHub {
owner = "lepisma";
repo = "cricbuzz.el";
- rev = "5fe51347f5d6e7636ece5e904e4bdec0be21db45";
- sha256 = "1x29garhp1x5h1mwbamwjnfw52w45b39aqxsvcdxmcf730w9pq63";
+ rev = "62c86b1aa6e0779c4f6d8fb9d31d75bf81994f69";
+ sha256 = "1k8n65scj3frafy1fk25j3kzpp0q8r98ydibryv48izndpck03h3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cricbuzz";
@@ -11500,27 +11457,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";
@@ -11544,12 +11480,12 @@
crux = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
melpaBuild {
pname = "crux";
- version = "20170626.632";
+ version = "20170801.1334";
src = fetchFromGitHub {
owner = "bbatsov";
repo = "crux";
- rev = "e805ab780a4a1ce22a4436bde09b95e97d150e51";
- sha256 = "007mhf60w8385ki2bqhsfjhhc4zq8k21ivgzpw15z83y641nyjp5";
+ rev = "4f5c8fefd5a6aa52e128c4a0401cc86410d6ac8f";
+ sha256 = "1fdxvv25cs01sg6fmvmzxpzvs50i6v8n2jya60lbavxqqhi0sbxd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/575e3442a925500a5806e0b900208c1e6bfd11ae/recipes/crux";
@@ -11649,16 +11585,16 @@
csound-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, multi, shut-up }:
melpaBuild {
pname = "csound-mode";
- version = "20170715.650";
+ version = "20170911.1412";
src = fetchFromGitHub {
owner = "hlolli";
repo = "csound-mode";
- rev = "9c96406bbda815a4c8068d9c4a2a0dd5bd8f3325";
- sha256 = "14k2qbdn4l47kal647b8fy1lrcnivydnk651m02y3d6w41vgp7pq";
+ rev = "c5243852d20e54e43a4a7fc19c58bbd10fa8570b";
+ sha256 = "1wa4356xykkfmfp8pkk72r2s18l9vhv9mdhrq827fh6cgz64p4s8";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/34dc8853f5978789212cb7983615202c498d4d25/recipes/csound-mode";
- sha256 = "0k4p9w19yxhfccr9zgg51ppl9jf3m4pwwnqiq25yv6qsxmh9q24l";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/c940d29de11e43b4abf2901c466c94d426a21818/recipes/csound-mode";
+ sha256 = "047a78nhkn6qycsz8w9a0r1xyz5wyf4rds3z5yx9sn5wkv54w95d";
name = "csound-mode";
};
packageRequires = [ emacs multi shut-up ];
@@ -11794,12 +11730,12 @@
ctags-update = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ctags-update";
- version = "20170120.2313";
+ version = "20170728.58";
src = fetchFromGitHub {
owner = "jixiuf";
repo = "ctags-update";
- rev = "9c58084395bd5c62c3fe500cd56d62bfc1dcee51";
- sha256 = "0cgq31ivhhr32pz17yfy7sja81bhxjh7fn502fa8mc9c3msgflwn";
+ rev = "783bf91eba1cd27cbb739067a24e15e5e04564e6";
+ sha256 = "1navj3cm5gmp0h8wyk281i1gjry1kj0i73wlz1fjwkqm6awxfz4w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e5d0c347ff8cf6e0ade80853775fd6b84f387fa5/recipes/ctags-update";
@@ -11857,12 +11793,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 = "e1e158d2103f0b441ed27ad4b2c0c123d7d710d7";
- sha256 = "0mbqdnbd6rqhsfdn5rijp9siyp5720s1gj6sadpqp55qi9r1hnpx";
+ rev = "c920475b9f9b50559d81d39ad177dbe22b258a35";
+ sha256 = "0s7az1j0dpi306j01wzw5ldy6cvpz56fk0x4jhb7bsnq01lkm7jy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1be42b49c206fc4f0df6fb50fed80b3d9b76710b/recipes/cubicaltt";
@@ -11979,12 +11915,12 @@
cyberpunk-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cyberpunk-theme";
- version = "20170712.2110";
+ version = "20170724.924";
src = fetchFromGitHub {
owner = "n3mo";
repo = "cyberpunk-theme.el";
- rev = "c5ad3a1815ba25b91aced8232b6f6268a10379d7";
- sha256 = "1l8m5mk7qdvw9cc6ypqahrrzxfzdx7n5yp1j82dgli9gy0sq027v";
+ rev = "88eff8a42d6ed8ba7782ae003ec9597aed4fd019";
+ sha256 = "0pzdm5nbhykssc633injz6jw422ksy632fhz0szd03a6kfx49iby";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4c632d1e501d48dab54432ab111ce589aa229125/recipes/cyberpunk-theme";
@@ -12086,8 +12022,8 @@
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "cyphejor";
- rev = "d7842388a1872b165489624a1a68f536de97e28d";
- sha256 = "1gi7rp0vf3iahljzjhs3rj9c0rvfcfs93hr8a3hl0ch3h9qq8ng2";
+ rev = "2d421507afead407f9daae694df254b160c4ff65";
+ sha256 = "0rshg8b2wvw285j4b8f68hp4ilfsk324yh4inshj19c9lkbgqp39";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ad7cacfa39d8f85e26372ef21898663aebb68e43/recipes/cyphejor";
@@ -12124,12 +12060,12 @@
cython-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cython-mode";
- version = "20140705.1229";
+ version = "20170907.1648";
src = fetchFromGitHub {
owner = "cython";
repo = "cython";
- rev = "a2db27bb85d0daa4cc4b4b7d65c0e6a7cda5ec2a";
- sha256 = "101gdyvhkb5lzsa69slaq0l81sjmrr34sb5sxbjxrbx5pk5wh9gz";
+ rev = "e6315294395ad44e667a804710938ee799575296";
+ sha256 = "07lgc3g66w8ggmnhqn7vrck3vl9jcvwmg67mlb772kz9d5v4kn5x";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@@ -12208,12 +12144,12 @@
dad-joke = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dad-joke";
- version = "20170626.252";
+ version = "20170814.824";
src = fetchFromGitHub {
owner = "davep";
repo = "dad-joke.el";
- rev = "98e5e5ed4c57f6076afb55d75af66e787867d9f9";
- sha256 = "017fdcbggnmnj9ri1a7id29l20pingw6mr1sk55xzkwgwf3v30fr";
+ rev = "92641503c7e93309db12380d5228f99dbe64a53c";
+ sha256 = "063cz5k264qbkb5g87xr6z68fjjnw3j1hpckdn6nqy8cin4qhagc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/484d571b2737f7c613816333afdde6460c64e635/recipes/dad-joke";
@@ -12229,12 +12165,12 @@
dakrone-light-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dakrone-light-theme";
- version = "20170501.654";
+ version = "20170808.1440";
src = fetchFromGitHub {
owner = "dakrone";
repo = "dakrone-light-theme";
- rev = "4b3f3ba8e2ffc35e537507894620245c96ff8965";
- sha256 = "1191iyjc5pw6jy9kqmjgr1s4n88ndjdsys7hwzc8c18glv411r69";
+ rev = "06f198dc8b4ca7421990b30a23d89c8e0b8c5de4";
+ sha256 = "01vqlsv44h2ah79c8jqv8vkqvgmhqx2w3qbq07l7fx3zkpgjfmpy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f3a88022a5f68d2fe01e08c2e99cfe380e3697b7/recipes/dakrone-light-theme";
@@ -12250,12 +12186,12 @@
dakrone-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dakrone-theme";
- version = "20140211.2045";
+ version = "20170801.1233";
src = fetchFromGitHub {
owner = "dakrone";
repo = "dakrone-theme";
- rev = "281ac9f9080a94bf9dada2f40cdba58e50f94235";
- sha256 = "0fd0h07m42q2h1ggsjra20kzv209rpb4apjv408h2dxqm8sy0jiy";
+ rev = "232ad1be5f3572dcbdf528f1655109aa355a6937";
+ sha256 = "0p51zni42hv090vv6mk9v0v88achmgxlsmlr40y8y6ng57w51r4s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/dcc07077b47d7c710c7f2d4919d791ed16ed5b26/recipes/dakrone-theme";
@@ -12289,22 +12225,22 @@
license = lib.licenses.free;
};
}) {};
- dante = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s }:
+ dante = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild, s }:
melpaBuild {
pname = "dante";
- version = "20170708.421";
+ version = "20170901.525";
src = fetchFromGitHub {
owner = "jyp";
repo = "dante";
- rev = "bf5d2bfc9a1696b97b1658a8090fdf80b6e9a730";
- sha256 = "0y5gg85sp73xzn6hj54w19di4d9x5w0nzl6h7lfp7l9kg94v0dsv";
+ rev = "203dcd8b748d485d1c78d04d81db22fd00cb71d7";
+ sha256 = "1ywx46mm1zrj0hnx2zwyxlxlq7ysg46hsy5vi6hmfppwbrfmkyzv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante";
sha256 = "1j0qwjshh2227k63vd06bvrsccymqssx26yfzams1xf7bp6y0krs";
name = "dante";
};
- packageRequires = [ dash emacs f flycheck s ];
+ packageRequires = [ dash emacs f flycheck haskell-mode s ];
meta = {
homepage = "https://melpa.org/#/dante";
license = lib.licenses.free;
@@ -12313,12 +12249,12 @@
darcula-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "darcula-theme";
- version = "20161004.2218";
+ version = "20170905.941";
src = fetchFromGitLab {
owner = "fommil";
repo = "emacs-darcula-theme";
- rev = "834202004507221c3bdf49457219a56760b13d22";
- sha256 = "1j2g94cz9b3ivv0w88gw1hcf236kc0c7hnrf13yyspxjm5jfdmd5";
+ rev = "da9852867ac115a54ee350a750d4dae182706117";
+ sha256 = "03059ydiw73a7kdvgn3namfqz87pqm2xfrnf87irkiv5pl9h482s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/23c8f10205187babb17e3abc3dc40eb1938e6640/recipes/darcula-theme";
@@ -12334,12 +12270,12 @@
dark-krystal-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dark-krystal-theme";
- version = "20141115.2301";
+ version = "20170808.600";
src = fetchFromGitHub {
owner = "emacsfodder";
repo = "emacs-dark-krystal-theme";
- rev = "bcb3c4ccf17db541e319d60e2eca38a5b22d5664";
- sha256 = "07w5aycgaps904q8lk52d0g28wxq41c82xgl5mw2q56n3s5iixfx";
+ rev = "79084b99665dc9ffb0ec62cc092349a5ecebebbc";
+ sha256 = "1d3cdsaba71qxdqrbj1jrlq8a0iw3h50l5grcdjvxixdnf5nsa4c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/dark-krystal-theme";
@@ -12394,27 +12330,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";
@@ -12460,12 +12375,12 @@
darkokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "darkokai-theme";
- version = "20170711.403";
+ version = "20170728.339";
src = fetchFromGitHub {
owner = "sjrmanning";
repo = "darkokai";
- rev = "94f845d0194bfd45e6a3c17222bba19aece9dd63";
- sha256 = "1zdzwjn3qcgxp7azz3sb5nfnmfd5mh9frvjlq5k013syy2p6xh44";
+ rev = "d881d51acf0a7f806ae68d48305e30941a741a0e";
+ sha256 = "008kn8gllhzlv49br0bs3469insjpcgr3r7iijz1frgy6wrpmdjp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/81387a5a70f7c42fbae16b52db765136795a37e1/recipes/darkokai-theme";
@@ -12523,12 +12438,12 @@
dash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dash";
- version = "20170613.151";
+ version = "20170810.137";
src = fetchFromGitHub {
owner = "magnars";
repo = "dash.el";
- rev = "0468a3137c9e0d49121213f416fc7e2547d46a77";
- sha256 = "1ax99zbzbrjm1i94wpwgxqisrinxbk12mgd9admrfhsg180qvlhg";
+ rev = "dcb0ec1623517e54551b801846a272dd07fd55b2";
+ sha256 = "1wfky9gq0qw4x8i8wnssh2zn18i953pypw23j35ra03rfknha1zc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash";
@@ -12569,8 +12484,8 @@
src = fetchFromGitHub {
owner = "magnars";
repo = "dash.el";
- rev = "0468a3137c9e0d49121213f416fc7e2547d46a77";
- sha256 = "1ax99zbzbrjm1i94wpwgxqisrinxbk12mgd9admrfhsg180qvlhg";
+ rev = "dcb0ec1623517e54551b801846a272dd07fd55b2";
+ sha256 = "1wfky9gq0qw4x8i8wnssh2zn18i953pypw23j35ra03rfknha1zc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash-functional";
@@ -12586,12 +12501,12 @@
dashboard = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, page-break-lines }:
melpaBuild {
pname = "dashboard";
- version = "20170419.2358";
+ version = "20170901.2";
src = fetchFromGitHub {
owner = "rakanalh";
repo = "emacs-dashboard";
- rev = "27c559952483301cc92539f68a89a047a0cc69ad";
- sha256 = "0hl97zc5wvxnpizp29rri7nbpklgx7fvb3idmghckinpgg3gnz2x";
+ rev = "8a555de891a83a9cd080c940dde183a8806479a9";
+ sha256 = "1w7f2fvnhqzcr6az4fkgb11k8qjzg81vwzx96qhym8d70sabahzh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e9a79341ccaa82a8c065e71c02fe6aee22007c66/recipes/dashboard";
@@ -12672,14 +12587,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 = [];
@@ -12779,8 +12694,8 @@
src = fetchFromGitHub {
owner = "skk-dev";
repo = "ddskk";
- rev = "78798134af82a300e54a5d22d2f10c2885cd11ae";
- sha256 = "1svdv0c9c0q68d0ad65kvaxvkafb15gv62yhxb02a4h4g4w9n4vs";
+ rev = "16d156562aef72f02ced58087335ed72d520d878";
+ sha256 = "0rz49i2yqs1yalqqnwgk2zvsga6qav4hc2dhf8p2kfkzrcbpzgxx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6eccccb79881eaa04af3ed6395cd2ab981d9c894/recipes/ddskk";
@@ -12793,46 +12708,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";
@@ -12962,12 +12837,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";
@@ -12983,12 +12858,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";
@@ -13043,17 +12918,19 @@
license = lib.licenses.free;
};
}) {};
- deft = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
+ deft = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
pname = "deft";
version = "20160610.1739";
- src = fetchgit {
- url = "git://jblevins.org/git/deft.git";
+ src = fetchFromGitHub {
+ owner = "jrblevin";
+ repo = "deft";
rev = "86825cd420985112d9dd38060e0edb72b08c6dab";
sha256 = "0jz8ikh143n9byidh675jyd76bymbwijs0xi2y141982s69r2n0l";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/deft";
- sha256 = "1c9kps0lw97nl567ynlzk4w719a86a18q697rcmrbrg5imdx4y5p";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/deft";
+ sha256 = "0f6z9hsigbwdsmg0abk1ddl9j19d0rpj4gzkl0d5arcpqbla26hp";
name = "deft";
};
packageRequires = [];
@@ -13191,12 +13068,12 @@
devdocs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "devdocs";
- version = "20160607.540";
+ version = "20170731.150";
src = fetchFromGitHub {
owner = "xuchunyang";
repo = "devdocs.el";
- rev = "1bff4bd406fc71199d9dcac503269f7aa8fcebe6";
- sha256 = "0qxy4i9438jmbxbj980civ8csh507gri3q3bszg3s1wv966k69rz";
+ rev = "a2d51e824f0cc48a9dd611cc740bc8b86143e611";
+ sha256 = "0nzh7pgvj4cs5d29lrrmbas29xdslgqzsqjmpapzqzbnrgprnbx8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a54ff5faeefabf484ef175433cfc2b8317993f74/recipes/devdocs";
@@ -13212,12 +13089,12 @@
dfmt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dfmt";
- version = "20160911.228";
+ version = "20170728.323";
src = fetchFromGitHub {
owner = "qsimpleq";
repo = "elisp-dfmt";
- rev = "f07512fc8555ecd592d8a44722baf922f9f77aaf";
- sha256 = "1ph8z4hazz71k8zsv4gfhpsbysj4d3rinb68fmhp842n00ds6fk4";
+ rev = "21b9094e907b7ac53f5ecb4ff4539613a9d12434";
+ sha256 = "11r1i8nlz98z49fqb447abg1pv6838q54ly19wyg82k52875ms7m";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a343a752d25185b30b10805c4012f3b21a03651e/recipes/dfmt";
@@ -13233,11 +13110,11 @@
dic-lookup-w3m = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild, stem, w3m }:
melpaBuild {
pname = "dic-lookup-w3m";
- version = "20170427.732";
+ version = "20170803.354";
src = fetchsvn {
url = "https://svn.osdn.jp/svnroot/dic-lookup-w3m/";
- rev = "97";
- sha256 = "077iz1fsw22rhzlsigslx5k6hsk1xny3kikr4gcwdmjd28yh7nvg";
+ rev = "99";
+ sha256 = "18l2s37bnnzbgw22mivgw5isxck2y0n3nk7735r4ir5y5wqx88mr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/dic-lookup-w3m";
@@ -13529,8 +13406,8 @@
src = fetchFromGitHub {
owner = "Fuco1";
repo = "dired-hacks";
- rev = "bca0522bf225bb7e82b783aad936ff8703812fdf";
- sha256 = "195cll5l54l10l6gdxp491nm2m1fhmrb227p26b5q115bpdxq8ci";
+ rev = "325e2c5300b9acccf786c0cc46637c18d39790e7";
+ sha256 = "1p6m02d4j2wrnx7nlj5zqzc5q34d62ffc56hjhiw4r01vvvzm65j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-avfs";
@@ -13543,22 +13420,22 @@
license = lib.licenses.free;
};
}) {};
- dired-collapse = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ dired-collapse = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dired-collapse";
- version = "20170717.208";
+ version = "20170910.1522";
src = fetchFromGitHub {
owner = "Fuco1";
repo = "dired-hacks";
- rev = "bca0522bf225bb7e82b783aad936ff8703812fdf";
- sha256 = "195cll5l54l10l6gdxp491nm2m1fhmrb227p26b5q115bpdxq8ci";
+ rev = "325e2c5300b9acccf786c0cc46637c18d39790e7";
+ sha256 = "1p6m02d4j2wrnx7nlj5zqzc5q34d62ffc56hjhiw4r01vvvzm65j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6aab23df1451682ff18d9ad02c35cb7ec612bc38/recipes/dired-collapse";
sha256 = "1k8h5cl8r68rnr1a3jnbc0ydflzm5mad7v7f1q60wks5hv61dsd1";
name = "dired-collapse";
};
- packageRequires = [ dash ];
+ packageRequires = [ dash f ];
meta = {
homepage = "https://melpa.org/#/dired-collapse";
license = lib.licenses.free;
@@ -13586,10 +13463,10 @@
dired-details-plus = callPackage ({ dired-details, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dired-details-plus";
- version = "20170221.1629";
+ version = "20170903.1237";
src = fetchurl {
url = "https://www.emacswiki.org/emacs/download/dired-details+.el";
- sha256 = "0821swa6qp2bs16r1pfamc7n62002rp8v0vimamw33cqxn2d0h6x";
+ sha256 = "03r7afjp376d0c34r1nj5hz914lbrk9y5ripar1w697bqk8kaxy3";
name = "dired-details+.el";
};
recipeFile = fetchurl {
@@ -13711,12 +13588,12 @@
dired-filter = callPackage ({ cl-lib ? null, dash, dired-hacks-utils, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dired-filter";
- version = "20161009.530";
+ version = "20170718.1145";
src = fetchFromGitHub {
owner = "Fuco1";
repo = "dired-hacks";
- rev = "bca0522bf225bb7e82b783aad936ff8703812fdf";
- sha256 = "195cll5l54l10l6gdxp491nm2m1fhmrb227p26b5q115bpdxq8ci";
+ rev = "325e2c5300b9acccf786c0cc46637c18d39790e7";
+ sha256 = "1p6m02d4j2wrnx7nlj5zqzc5q34d62ffc56hjhiw4r01vvvzm65j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-filter";
@@ -13736,8 +13613,8 @@
src = fetchFromGitHub {
owner = "Fuco1";
repo = "dired-hacks";
- rev = "bca0522bf225bb7e82b783aad936ff8703812fdf";
- sha256 = "195cll5l54l10l6gdxp491nm2m1fhmrb227p26b5q115bpdxq8ci";
+ rev = "325e2c5300b9acccf786c0cc46637c18d39790e7";
+ sha256 = "1p6m02d4j2wrnx7nlj5zqzc5q34d62ffc56hjhiw4r01vvvzm65j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-hacks-utils";
@@ -13841,8 +13718,8 @@
src = fetchFromGitHub {
owner = "thomp";
repo = "dired-launch";
- rev = "9dea31574dcf006d5247b488a1942faaac434362";
- sha256 = "03dim1ca332882i08r19k4vjzw3hwwg132n2mrxhniyzgkk7g891";
+ rev = "75745f2e40d060cae909f9e6f6ca2e5f725180b8";
+ sha256 = "1amsqbbjzjw07s40v8c63iw59qf5r1x7rqq2iq1jiybwsrp9s7v0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/31c9a4945d65aa6afc371c447a572284d38d4d71/recipes/dired-launch";
@@ -13862,8 +13739,8 @@
src = fetchFromGitHub {
owner = "Fuco1";
repo = "dired-hacks";
- rev = "bca0522bf225bb7e82b783aad936ff8703812fdf";
- sha256 = "195cll5l54l10l6gdxp491nm2m1fhmrb227p26b5q115bpdxq8ci";
+ rev = "325e2c5300b9acccf786c0cc46637c18d39790e7";
+ sha256 = "1p6m02d4j2wrnx7nlj5zqzc5q34d62ffc56hjhiw4r01vvvzm65j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8994330f90a925df17ae425ccdc87865df8e19cd/recipes/dired-narrow";
@@ -13883,8 +13760,8 @@
src = fetchFromGitHub {
owner = "Fuco1";
repo = "dired-hacks";
- rev = "bca0522bf225bb7e82b783aad936ff8703812fdf";
- sha256 = "195cll5l54l10l6gdxp491nm2m1fhmrb227p26b5q115bpdxq8ci";
+ rev = "325e2c5300b9acccf786c0cc46637c18d39790e7";
+ sha256 = "1p6m02d4j2wrnx7nlj5zqzc5q34d62ffc56hjhiw4r01vvvzm65j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-open";
@@ -13899,10 +13776,10 @@
}) {};
dired-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
pname = "dired-plus";
- version = "20170630.752";
+ version = "20170818.1411";
src = fetchurl {
url = "https://www.emacswiki.org/emacs/download/dired+.el";
- sha256 = "1jl14z15ilkwl45xv34akabnx4430siqkjv14sqi33g3qmnln90y";
+ sha256 = "04yr4gwg5y6qjbjx2klharzf7s9n1akx2n14yddjrv7hr6rkxlrs";
name = "dired+.el";
};
recipeFile = fetchurl {
@@ -13944,8 +13821,8 @@
src = fetchFromGitHub {
owner = "Fuco1";
repo = "dired-hacks";
- rev = "bca0522bf225bb7e82b783aad936ff8703812fdf";
- sha256 = "195cll5l54l10l6gdxp491nm2m1fhmrb227p26b5q115bpdxq8ci";
+ rev = "325e2c5300b9acccf786c0cc46637c18d39790e7";
+ sha256 = "1p6m02d4j2wrnx7nlj5zqzc5q34d62ffc56hjhiw4r01vvvzm65j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-rainbow";
@@ -13965,8 +13842,8 @@
src = fetchFromGitHub {
owner = "Fuco1";
repo = "dired-hacks";
- rev = "bca0522bf225bb7e82b783aad936ff8703812fdf";
- sha256 = "195cll5l54l10l6gdxp491nm2m1fhmrb227p26b5q115bpdxq8ci";
+ rev = "325e2c5300b9acccf786c0cc46637c18d39790e7";
+ sha256 = "1p6m02d4j2wrnx7nlj5zqzc5q34d62ffc56hjhiw4r01vvvzm65j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c03f6f8c779c8784f52adb20b266404cb537113a/recipes/dired-ranger";
@@ -13979,15 +13856,36 @@
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 = "9ac42bb6663e6c0c5e4e3dd2258b63e24cf33c90";
+ sha256 = "0x6gmpjm1rv38h6w5zv98vk86d7s0qvsa3pl5sab268dbhw0l9w2";
+ };
+ 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";
- version = "20151230.1758";
+ version = "20170804.544";
src = fetchFromGitHub {
owner = "crocket";
repo = "dired-single";
- rev = "71ffc5decd048d3c420d9cdd5ac66e72ca18e934";
- sha256 = "01xvaqckyr31ywsn1fp9sz9wq4h4dd1hgghfqypc9s4akrxmgnf2";
+ rev = "0dcc645de6397bf12c33229de67a503e4490c618";
+ sha256 = "16073xjfx7cvv9g8dlyxwa4ca6x35vwarqq43mrl05nxcq0rfzv3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/41669decbb7ad5c4dbe152a863f16d87e7bba493/recipes/dired-single";
@@ -14061,12 +13959,12 @@
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 = "bca0522bf225bb7e82b783aad936ff8703812fdf";
- sha256 = "195cll5l54l10l6gdxp491nm2m1fhmrb227p26b5q115bpdxq8ci";
+ rev = "325e2c5300b9acccf786c0cc46637c18d39790e7";
+ sha256 = "1p6m02d4j2wrnx7nlj5zqzc5q34d62ffc56hjhiw4r01vvvzm65j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d6a947ac9476f10b95a3c153ec784d2a8330dd4c/recipes/dired-subtree";
@@ -14145,12 +14043,12 @@
direnv = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }:
melpaBuild {
pname = "direnv";
- version = "20170622.1128";
+ version = "20170717.1049";
src = fetchFromGitHub {
owner = "wbolster";
repo = "emacs-direnv";
- rev = "3c632dd1fdf0ad1edb6d9b0a4a09cdbb420c27aa";
- sha256 = "0jajqf7ad0x6ca7i051svrc37mr3ww8pvd1832i0k7nf3i8cv867";
+ rev = "d181475192138b256e124a42660ac60ae62d11d0";
+ sha256 = "09pcssxas9aqdnn2n9y61f016fip9qgxsr16nzljh66dk0lnbgrw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5419809ee62b920463e359c8e1314cd0763657c1/recipes/direnv";
@@ -14254,8 +14152,8 @@
src = fetchFromGitHub {
owner = "purcell";
repo = "disable-mouse";
- rev = "3b8681b099eb0c3af6078fa0e479d0d0ce6686ad";
- sha256 = "0k65jddjd0xbm91fzjll8j69qd4ql9qz47x2mdhb2xc344kdwp9x";
+ rev = "f7d6f70a3c0a751a946613f997330fbc95a38c3e";
+ sha256 = "0d2hmaiz8v8kzkbdi281hyf3yfjwr03ngxr2qphgm7xk9298351v";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/dbbc396373212fdf731e135cde391f27708ff015/recipes/disable-mouse";
@@ -14772,12 +14670,12 @@
dna-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dna-mode";
- version = "20130821.1105";
+ version = "20170804.114";
src = fetchFromGitHub {
owner = "jhgorrell";
repo = "dna-mode-el";
- rev = "c3fed6b9d98deafbc1525d445a920b969120fe6a";
- sha256 = "0z28j7x7wgkc1cg1q1kz1lhdx1v1n6s88ixgkm8hn458h9bfnr3n";
+ rev = "471d374de22c33eaddd8e41dd8ae29753fab2f6a";
+ sha256 = "05zsaypyavyn7gs0jk63chkxkm2rl4nbrqgv6zxrbqcar7gv86am";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dna-mode";
@@ -14835,12 +14733,12 @@
docker = callPackage ({ dash, docker-tramp, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s, tablist }:
melpaBuild {
pname = "docker";
- version = "20170601.1345";
+ version = "20170718.303";
src = fetchFromGitHub {
owner = "Silex";
repo = "docker.el";
- rev = "d3bdb09af10c7aa466b25e0c65a3d21fdf44514e";
- sha256 = "097nrhnc668yclvisq5hc3j8jgpk7w7k7clrlp5a1r1gd5472sj7";
+ rev = "8070936871e0fbb20fb04c28630288ebe314b8b9";
+ sha256 = "0gk4ykvsv8wgfiym0z635a3n3jaw4wnvfmf78ppfinrzybg85r76";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker";
@@ -14882,6 +14780,27 @@
license = lib.licenses.free;
};
}) {};
+ docker-compose-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yaml-mode }:
+ melpaBuild {
+ pname = "docker-compose-mode";
+ version = "20170910.1034";
+ src = fetchFromGitHub {
+ owner = "meqif";
+ repo = "docker-compose-mode";
+ rev = "372df2f0de34a4bd44d4a7274b9ab85117ac7392";
+ sha256 = "14vgjhy2j60xhf38zm5nlkr4d3r455kw6paw0wff4mqmdjcg3pds";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/37dd4c1fc11d22598c6faf03ccc860503a68b950/recipes/docker-compose-mode";
+ sha256 = "1hldddl86h0i1ysxklkr1kyz44lzic1zr68x3vb0mha4n5d6bl5g";
+ name = "docker-compose-mode";
+ };
+ packageRequires = [ dash emacs yaml-mode ];
+ meta = {
+ homepage = "https://melpa.org/#/docker-compose-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
docker-tramp = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "docker-tramp";
@@ -15011,12 +14930,12 @@
doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "doom-themes";
- version = "20170717.426";
+ version = "20170912.726";
src = fetchFromGitHub {
owner = "hlissner";
repo = "emacs-doom-themes";
- rev = "a00ee6cc48179dfeb8836726d9faa9b4f119783a";
- sha256 = "0f1szgr7xz2bg222x8b9h6kmi6diipc2r4j4yafjpsgkniv6c93c";
+ rev = "f7185cf7536e1f96e7cede2ce81c2b51205df850";
+ sha256 = "1wqa5b9ni8rci4h8m78h7cb3387gi45v1w6z5dbya4zvaw1gwx8p";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes";
@@ -15128,6 +15047,27 @@
license = lib.licenses.free;
};
}) {};
+ dotnet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "dotnet";
+ version = "20170827.838";
+ src = fetchFromGitHub {
+ owner = "julienXX";
+ repo = "dotnet.el";
+ rev = "e22fd23bf2bfab980d4802b10c4d872b800f90d4";
+ sha256 = "1qq0gkdr0h4b9h6l14wfk3zmw62sa2i5in23bvs6jp6y6hmffr2m";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/6ef473594ec57a747ad7d9d57d7287bcacf4b446/recipes/dotnet";
+ sha256 = "06k1ikwg9bis9kk4r41bm0a0d8a31wscqyr6n99d7836p1h4jfki";
+ name = "dotnet";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/dotnet";
+ license = lib.licenses.free;
+ };
+ }) {};
download-region = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "download-region";
@@ -15282,8 +15222,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";
@@ -15446,7 +15386,7 @@
version = "20130120.1257";
src = fetchsvn {
url = "https://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/";
- rev = "1802135";
+ rev = "1808231";
sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq";
};
recipeFile = fetchurl {
@@ -15484,12 +15424,12 @@
dtrt-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dtrt-indent";
- version = "20160620.329";
+ version = "20170825.847";
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";
@@ -15547,12 +15487,12 @@
dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }:
melpaBuild {
pname = "dumb-jump";
- version = "20170627.1309";
+ version = "20170911.1951";
src = fetchFromGitHub {
owner = "jacktasia";
repo = "dumb-jump";
- rev = "0328d922da4b1bbbb8f41848585c920608f6e9d3";
- sha256 = "1l3s42y90d2canslkjvfs4n5zlpdxp0h4b1yrip9825gh2k4fan7";
+ rev = "67928ef6449318a8653812167540aa5919301260";
+ sha256 = "0i7jyh0zzk4ifkqwi89bnnwgvaaphnf4n5z299mg0fj4walzx3rz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dumb-jump";
@@ -15607,6 +15547,27 @@
license = lib.licenses.free;
};
}) {};
+ dut-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "dut-mode";
+ version = "20170729.1411";
+ src = fetchFromGitHub {
+ owner = "dut-lang";
+ repo = "dut-mode";
+ rev = "9235c7acaa6690942e9de8b7acd1e4be0c859dc1";
+ sha256 = "0fpqsm6y23anyx57gp4c6whzxrn8x03cp76iwx27c4gkq6ph1z8n";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/ecf49ceab8b25591fab2ed6574cba0e6634d1539/recipes/dut-mode";
+ sha256 = "0hlr5qvqcqdh2k1nyq621z6vq2yiflj4jy0pgg6lbiy3j6819mai";
+ name = "dut-mode";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/dut-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
dyalog-mode = callPackage ({ cl-lib ? null, emacs, fetchhg, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dyalog-mode";
@@ -15882,15 +15843,15 @@
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";
};
@@ -15924,12 +15885,12 @@
easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "easy-hugo";
- version = "20170708.307";
+ version = "20170819.347";
src = fetchFromGitHub {
owner = "masasam";
repo = "emacs-easy-hugo";
- rev = "226fa5c661391c7f8317a24c9f757396e1900371";
- sha256 = "0g63ajpxr2a42nw5ri14icvwwdc9hs8al91plcjxjs7q7rbkhwp6";
+ rev = "108cc2347507ff8c92b10a817de0850e9eb99ab2";
+ sha256 = "1fcq6693cjl0lx67gwsk53lm20zznq9cc9widb3rzpwifns4x8ac";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo";
@@ -15984,27 +15945,6 @@
license = lib.licenses.free;
};
}) {};
- easy-lentic = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lentic, lib, melpaBuild }:
- melpaBuild {
- pname = "easy-lentic";
- version = "20170309.2143";
- src = fetchFromGitHub {
- owner = "tumashu";
- repo = "easy-lentic";
- rev = "d2b600cc3bd3166c3e4543435070b511ae9bf148";
- sha256 = "1p99yf1nlial254dyy9i30lfx2v4jwpahvi9pfjm5sv64212vp33";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/7e098e70214e85e1c583a4976f895941c13de75f/recipes/easy-lentic";
- sha256 = "1j141lncgcgfpa42m505xndiy6lh848xymfvb3cz4d6h73421khg";
- name = "easy-lentic";
- };
- packageRequires = [ cl-lib lentic ];
- meta = {
- homepage = "https://melpa.org/#/easy-lentic";
- license = lib.licenses.free;
- };
- }) {};
easy-repeat = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "easy-repeat";
@@ -16026,22 +15966,22 @@
license = lib.licenses.free;
};
}) {};
- ebal = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }:
+ ebal = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ebal";
- version = "20170520.130";
+ version = "20170810.631";
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "ebal";
- rev = "2d274ee56d5a61152e846f9a759ebccd70dc8eb1";
- sha256 = "15hygzw52w5c10hh3gq0hzs499h8zkn1ns80hb2q02cn9hyy962q";
+ rev = "65a131b95a1e934c0cab384ef533b0ac58961f0c";
+ sha256 = "1b8i7qh743lhmkrmw1ac486i8nk8fdxl0ayxjs2sfb8fk4621rfr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/629aa451162a0085488caad4052a56366b7ce392/recipes/ebal";
sha256 = "1kqnlp5n1aig1qbqdq9q50wgqkzd1l6h9wi1gv43cif8qa1kxhwg";
name = "ebal";
};
- packageRequires = [ emacs f ido-completing-read-plus ];
+ packageRequires = [ emacs f ];
meta = {
homepage = "https://melpa.org/#/ebal";
license = lib.licenses.free;
@@ -16092,12 +16032,12 @@
ecb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ecb";
- version = "20160101.933";
+ version = "20170728.1221";
src = fetchFromGitHub {
owner = "ecb-home";
repo = "ecb";
- rev = "661edbfcddcdb75331cf28870e6a5fb4ba9ca27f";
- sha256 = "1ac9b6k10kniqkiadzfa7mjhy1nf6ypd3fl6yvmr8yigc2phszny";
+ rev = "1330a44cf3c171781083b0b926ab7622f64e6e81";
+ sha256 = "0nx1blkvnzrxd2l7ckdihm9fvq5vkcghf6qccagkjzk4zbdalz30";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4db5183f35bedbc459843ad9f442f9cb6608c5fc/recipes/ecb";
@@ -16174,12 +16114,12 @@
ecukes = callPackage ({ ansi, commander, dash, espuds, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "ecukes";
- version = "20170104.1041";
+ version = "20170810.305";
src = fetchFromGitHub {
owner = "ecukes";
repo = "ecukes";
- rev = "277d25cf8fc9548239599244ab15a2268a55b31b";
- sha256 = "0jh7l4lhbjd7qxqdi8d8mk5j3qxx70x3jdzpw2xw6szcx67lvd3s";
+ rev = "65f29ff764c3742cc1190371b1ac91f0812535f3";
+ sha256 = "16dypiczds89kpwqj7p29n5qcqpc1d7faci2f4glw1m60gnkgvqq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/14cf66e6929db2a0f377612e786aaed9eb12b799/recipes/ecukes";
@@ -16413,8 +16353,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 = [];
@@ -16510,12 +16450,12 @@
edit-server = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "edit-server";
- version = "20141231.1358";
+ version = "20170725.859";
src = fetchFromGitHub {
owner = "stsquad";
repo = "emacs_chrome";
- rev = "f7cf37c3f605812d429fd90699d6d33f6ac9db8d";
- sha256 = "1i4fvw7703pr505mzspkc7sphh3mbg4pvbpfcr847lrg66pdw419";
+ rev = "462c57be72b3a8652f705bde0d3b7cd2f79644fa";
+ sha256 = "0s4s90sbk82yp08my8jdmn4kn5cx8xc9cf02asrq4b4jvljynwvj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d98d69008b5ca8b92fa7a6045b9d1af86f269386/recipes/edit-server";
@@ -16552,12 +16492,12 @@
editorconfig = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "editorconfig";
- version = "20170607.713";
+ version = "20170912.2223";
src = fetchFromGitHub {
owner = "editorconfig";
repo = "editorconfig-emacs";
- rev = "1543835ce00412c3cd34a61497af5f68ead250a6";
- sha256 = "1c516972gx1rvlixdl6mgknx6vx1m4hbzbz3x43pzlg0mn31yn01";
+ rev = "f527731c0d24a094f6fc784366558e2bf3d0e201";
+ sha256 = "0im24f2h2n4ijdmkjkkphngk2sgj1g2rg0ygppq03rbzmqg0r6sm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig";
@@ -16657,12 +16597,12 @@
edts = callPackage ({ auto-complete, auto-highlight-symbol, dash, erlang, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }:
melpaBuild {
pname = "edts";
- version = "20170421.55";
+ version = "20170821.149";
src = fetchFromGitHub {
owner = "tjarvstrand";
repo = "edts";
- rev = "3f90f4484ac03f06286b15b0c33ff0e5aeed2bb5";
- sha256 = "0wpr7h7vl1pi05sxyivk1a22qhcm74iacnra9h1d2jcf6as1h5x4";
+ rev = "8a737e0601ab4a3fbe2f1252f8b1474ca39df94c";
+ sha256 = "0dbha339yp7jd8nmz38g9igmj5bi03l9fz9gqy2z8j367br3afxs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/782db7fba2713bfa17d9305ae15b0a9e1985445b/recipes/edts";
@@ -16704,6 +16644,27 @@
license = lib.licenses.free;
};
}) {};
+ eg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "eg";
+ version = "20170830.115";
+ src = fetchFromGitHub {
+ owner = "davep";
+ repo = "eg.el";
+ rev = "1c7f1613d2aaae728ef540305f6ba030616f86bd";
+ sha256 = "1g2ha6q9k6dmi63i2p4aypwf5mha699wr7yy5dsck39mqk15hx0f";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/3d2b6b92b2a71486f260571885bf149ad6afc551/recipes/eg";
+ sha256 = "1ic6qzk0zmay3vvbb8jg35irqkc0k68dmgbq4j9isiawy449zvp7";
+ name = "eg";
+ };
+ packageRequires = [ cl-lib emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/eg";
+ license = lib.licenses.free;
+ };
+ }) {};
egg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "egg";
@@ -16732,8 +16693,8 @@
src = fetchFromGitHub {
owner = "egisatoshi";
repo = "egison3";
- rev = "c06b457113a7e9484f8f4ae079cb257d8eb65396";
- sha256 = "16gij5kc4r4x85d8pnpyfkb2z7fjlmfxc73vhd0hf76740kgnnxy";
+ rev = "170be423c79e8e28b99e5745bf7135ce3bf2de52";
+ sha256 = "1hi2ch08m48lpkhqz05ry736qj1mjva4krbqn2wkhcfdfrxpzhx6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode";
@@ -16769,11 +16730,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";
@@ -16807,15 +16768,15 @@
license = lib.licenses.free;
};
}) {};
- ein = callPackage ({ auto-complete, cl-generic, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, 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 = "20170714.1753";
+ version = "20170903.829";
src = fetchFromGitHub {
owner = "millejoh";
repo = "emacs-ipython-notebook";
- rev = "08d2792d690cefb9ef2e00a14d3bbb1da55252a9";
- sha256 = "0fw56v0xx4axw24wzy8rk69zy0nhajk4y3fqi1305acfgn6hnnvg";
+ rev = "213cea559e7a8fb50e303ea25e1626fefddaf4bd";
+ sha256 = "18ysd78pfyymqd0f6ipma9p9x61pw21f0jwk118r5yi00wnry9za";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein";
@@ -16828,6 +16789,8 @@
dash
deferred
request
+ request-deferred
+ s
skewer-mode
websocket
];
@@ -16860,12 +16823,12 @@
eink-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "eink-theme";
- version = "20161207.410";
+ version = "20170717.807";
src = fetchFromGitHub {
owner = "maio";
repo = "eink-emacs";
- rev = "40e7a7d31ee160175aa89583609d3f953fb066c6";
- sha256 = "0701c7x8wwr99d5l50k8n2a6zx7dh067d702v032g5axh7lqsn2j";
+ rev = "4c990bb3428f725735fa1f733ef4c5ad61f632b0";
+ sha256 = "0jxs36qdsx58ni5185qyi1c7gchyla3dpv4v9drj1n072ls82ld4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a1349c3f93ab60983f77c28f97048fa258b612a6/recipes/eink-theme";
@@ -16881,12 +16844,12 @@
ejc-sql = callPackage ({ auto-complete, cider, clomacs, dash, direx, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spinner }:
melpaBuild {
pname = "ejc-sql";
- version = "20170621.348";
+ version = "20170810.221";
src = fetchFromGitHub {
owner = "kostafey";
repo = "ejc-sql";
- rev = "438e4f5995285d28fe7dddceacac212c2250dfe2";
- sha256 = "01nxgv2yz9clbqr35kdl36zmip0nkqa45ab6b06npdxpcs4438nq";
+ rev = "72adcdfb5d12d49429a1c655f0b02fe657445c4f";
+ sha256 = "1y10xzvmxqj61r0sq3hcd6zq6x2ird1z54draaa0wpafgq8610g9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8f2cd74717269ef7f10362077a91546723a72104/recipes/ejc-sql";
@@ -16931,12 +16894,12 @@
el-get = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "el-get";
- version = "20170701.1607";
+ version = "20170813.1436";
src = fetchFromGitHub {
owner = "dimitri";
repo = "el-get";
- rev = "4a1dde57e8a4d4c22ed279bac8253f5f16da9197";
- sha256 = "19570r8y2cs8y51rmihk5hk5sqavck4bf0zanajnplhxw52h0fji";
+ rev = "07c75d259d89dabb34878d6085a94fb11aef1947";
+ sha256 = "1b1cgfh7wzcw5m32mhn9w6gzllr09hfv2ghdb4wwaw567xcqd4qh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get";
@@ -16994,12 +16957,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";
@@ -17015,12 +16978,12 @@
el-patch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "el-patch";
- version = "20170706.936";
+ version = "20170729.1712";
src = fetchFromGitHub {
owner = "raxod502";
repo = "el-patch";
- rev = "979ea29884f54c5ac4a6a5b2873547c0964e3dd3";
- sha256 = "021ld1cs7swmrlbvnakwwx6xlyg95g8cnc6d1vk03a81p7s897il";
+ rev = "f598a7537710f929c6f7592d8c543768361ba0de";
+ sha256 = "1ijnj8ldqhcv3bq22gw1knaasj08yk9vm0nyvnfca3p6w3zv65cm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2f4f57e0edbae35597aa4a7744d22d2f971d5de5/recipes/el-patch";
@@ -17033,27 +16996,6 @@
license = lib.licenses.free;
};
}) {};
- el-pocket = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, web }:
- melpaBuild {
- pname = "el-pocket";
- version = "20160528.951";
- src = fetchFromGitHub {
- owner = "pterygota";
- repo = "el-pocket";
- rev = "eb356e013c71903f2e946631ff58a1d0c2372389";
- sha256 = "01dqksnz0nbfmp10sd3wwv1gffs60rk5v9rf2j3q2z13qsh8l2yy";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/c3b8857bc84888a3f8566fab6288966e07d4201f/recipes/el-pocket";
- sha256 = "0fgylpfixsx5l1nrgz6n1c2ayf52p60f9q290hmkn36siyx5hixw";
- name = "el-pocket";
- };
- packageRequires = [ emacs web ];
- meta = {
- homepage = "https://melpa.org/#/el-pocket";
- license = lib.licenses.free;
- };
- }) {};
el-spec = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "el-spec";
@@ -17202,12 +17144,12 @@
el2org = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "el2org";
- version = "20170502.550";
+ version = "20170804.2142";
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";
@@ -17260,22 +17202,22 @@
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;
@@ -17309,8 +17251,8 @@
src = fetchFromGitHub {
owner = "davidshepherd7";
repo = "electric-operator";
- rev = "13b5c19049bd7ac9529ee6fb6171f9141311f277";
- sha256 = "0xpqynnl1dxylxgg7h42pamxn7iwa4jwcy355l0sxmra951j22wq";
+ rev = "9aa71d7b6b780242e4659fedfdb186d4ee422366";
+ sha256 = "03py67msf3cshg60zs6bdk71ksswi3vjf0nl88jhlgnzb3kjg4wm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/906cdf8647524bb76f644373cf8b65397d9053a5/recipes/electric-operator";
@@ -17389,12 +17331,12 @@
elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "elfeed";
- version = "20170709.954";
+ version = "20170910.1453";
src = fetchFromGitHub {
owner = "skeeto";
repo = "elfeed";
- rev = "79077efc34aad25bb43cf46a28a69a308196c972";
- sha256 = "1xsy7qr9k9ad5ig9vvf9bbxc5ik5xi1kpmq87q9iq3g321idcwnl";
+ rev = "b62a2d0040f1a8ad0a23a48e3843d2ed5cbc2a8c";
+ sha256 = "1fxxcdrm7138pb06wxk9k519kag03jllkwf2fyxh755x6fnxlgin";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed";
@@ -17463,8 +17405,8 @@
src = fetchFromGitHub {
owner = "skeeto";
repo = "elfeed";
- rev = "79077efc34aad25bb43cf46a28a69a308196c972";
- sha256 = "1xsy7qr9k9ad5ig9vvf9bbxc5ik5xi1kpmq87q9iq3g321idcwnl";
+ rev = "b62a2d0040f1a8ad0a23a48e3843d2ed5cbc2a8c";
+ sha256 = "1fxxcdrm7138pb06wxk9k519kag03jllkwf2fyxh755x6fnxlgin";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web";
@@ -17585,12 +17527,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";
@@ -17631,8 +17573,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";
@@ -17690,12 +17632,12 @@
elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }:
melpaBuild {
pname = "elm-mode";
- version = "20170714.1600";
+ version = "20170903.221";
src = fetchFromGitHub {
owner = "jcollard";
repo = "elm-mode";
- rev = "4155f4333545189901ce574601ef34dada07b672";
- sha256 = "1q5qgjmmwnhgq4ckpkzy3wvmnj3cgzcggwm9q9jsdfmz0j1dgwn4";
+ rev = "ece63376b2a7a8f5e6d708bdb2061e13d6afb731";
+ sha256 = "1109si17ph8w90jcmzz72i0ha5va8ylh2y5jinabvsc3qs667bgy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode";
@@ -17900,12 +17842,12 @@
elpa-mirror = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "elpa-mirror";
- version = "20160917.10";
+ version = "20170722.422";
src = fetchFromGitHub {
owner = "redguardtoo";
repo = "elpa-mirror";
- rev = "dcadffd331ac70c59e1960d34b7f998302c616d6";
- sha256 = "08dz6zy9fqj7qd1g1igvr28q2znrd5pwxxqjlrkzs994ypfj1vzq";
+ rev = "5c793f6df944b7f1a68893438696c12240f0b930";
+ sha256 = "0p5q44p6jl306qns4xf7f03pq091zczvjnh9bjax6z6sx54yadsd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d64ce7042c45f29fb394be25ce415912182bac8b/recipes/elpa-mirror";
@@ -17918,15 +17860,15 @@
license = lib.licenses.free;
};
}) {};
- elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }:
+ elpy = callPackage ({ cl-generic, company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }:
melpaBuild {
pname = "elpy";
- version = "20170701.1412";
+ version = "20170903.143";
src = fetchFromGitHub {
owner = "jorgenschaefer";
repo = "elpy";
- rev = "6b654b5fdc4e8f09cd842a0dde83ded284223c2f";
- sha256 = "02z965inkp3bxg9nyqscjs14dfzx7s18s3kx7ry50j2yi0iki6rg";
+ rev = "d1cfe9c87031a9fd4c9754afdc4c4d0b3b3128a6";
+ sha256 = "1zy24fp888i7xaplfnxznlw8hldfpcgh9ni0053m9sq8z28nld6j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy";
@@ -17934,6 +17876,7 @@
name = "elpy";
};
packageRequires = [
+ cl-generic
company
find-file-in-project
highlight-indentation
@@ -17991,12 +17934,12 @@
elscreen-buffer-group = callPackage ({ cl-lib ? null, elscreen, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "elscreen-buffer-group";
- version = "20160105.803";
+ version = "20170808.1825";
src = fetchFromGitHub {
owner = "jeffgran";
repo = "elscreen-buffer-group";
- rev = "06ea9384a642ff5c3a93f36aee9f5d6b5c17657e";
- sha256 = "0bbashrqpyhs282w5i15rzravvj0fjnydbh9vfnfnfnk8a9sssxz";
+ rev = "a3cd4d7eae3cca87bede4b39a46d3c0641f8cd06";
+ sha256 = "0flja2j5xqhxc0qrclnxcpyzvn7gyjynfpa3mp1hb250c313igy5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9c6fedb7b6ef58089da4b35ad115f699b4b24ff2/recipes/elscreen-buffer-group";
@@ -18037,8 +17980,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";
@@ -18072,27 +18015,6 @@
license = lib.licenses.free;
};
}) {};
- elscreen-persist = callPackage ({ elscreen, fetchFromGitHub, fetchurl, lib, melpaBuild, revive }:
- melpaBuild {
- pname = "elscreen-persist";
- version = "20160505.1829";
- src = fetchFromGitHub {
- owner = "robario";
- repo = "elscreen-persist";
- rev = "79cb33909a9c66bb183432b956edffbc6b12ace3";
- sha256 = "0p0zphl3ylrbs3mz12y40hphslxd1hlszk1pqi151xrfgc2r0pp8";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/c30ec71dcc29d1d0fd6c54de512c8c4636a7e0a6/recipes/elscreen-persist";
- sha256 = "1rjfvpsx0y5l9b76wa1ilj5lx39jd0m78nb1a4bqn81z0rkfpl4k";
- name = "elscreen-persist";
- };
- packageRequires = [ elscreen revive ];
- meta = {
- homepage = "https://melpa.org/#/elscreen-persist";
- license = lib.licenses.free;
- };
- }) {};
elscreen-separate-buffer-list = callPackage ({ elscreen, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "elscreen-separate-buffer-list";
@@ -18114,6 +18036,27 @@
license = lib.licenses.free;
};
}) {};
+ elvish-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "elvish-mode";
+ version = "20170815.625";
+ src = fetchFromGitHub {
+ owner = "ALSchwalm";
+ repo = "elvish-mode";
+ rev = "d78a560b0aeba76ae09fb0885ca0cff2ee5b0d0d";
+ sha256 = "0fxmy0qfcapskbakin6p1hv9763yh4bxanlnak7p6dfmmw7mvz33";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/0fc724072702a565af471f9ae523a1e6e48e3f04/recipes/elvish-mode";
+ sha256 = "1f5pyadmbh2ldd51srvlhbjq2849f1f0s8qmpjnsz9bc986yga34";
+ name = "elvish-mode";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/elvish-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
elwm = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "elwm";
@@ -18138,16 +18081,16 @@
elx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "elx";
- version = "20170712.510";
+ version = "20170805.449";
src = fetchFromGitHub {
- owner = "tarsius";
+ owner = "emacscollective";
repo = "elx";
- rev = "6ce9a2f14ecf7263e71a699e058293f0343bfe4d";
- sha256 = "1i250nv416jmknb39a390bxvdsf0dlgwfjn67n5gn6sia99lgjhq";
+ rev = "9f5d593b65686e8da29ef79457c8f6fc061af7e5";
+ sha256 = "1vs7nmsi82gv9mw1mia6ri1vmn26ldwnj8akirqgq31rfgyfj4vh";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/91430562ecea439af020e96405ec3f21d768cf9f/recipes/elx";
- sha256 = "02nq66c0sds61k2p8cn2l0p2l8ysb38ibr038qn41l9hg1dq065x";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/elx";
+ sha256 = "008nwa2gn3d2ayr8023pxyvph52gh9m56f77h41hp8hcw6hbdwrz";
name = "elx";
};
packageRequires = [ emacs ];
@@ -18163,8 +18106,8 @@
src = fetchFromGitHub {
owner = "echosa";
repo = "emacs-setup";
- rev = "cc36ad5318c6c0e65d1b9ff8dff5ea2437675de2";
- sha256 = "15l3ab11vcmzqibkd6h5zqw5a83k8dmgcp4n26px29c0gv6bkpy8";
+ rev = "c783ec13e3b39093fffb6f6d64dccdce8ce4d375";
+ sha256 = "1crpjcxwanbrd1yd4lbb5lmqwvx1mczya7ff2qr3phk497czpsqm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/abb7101b2d48af56af09d1dc85c540300dba7b3c/recipes/emacs-setup";
@@ -18243,12 +18186,12 @@
emacsql = callPackage ({ cl-generic, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, finalize, lib, melpaBuild }:
melpaBuild {
pname = "emacsql";
- version = "20170410.1218";
+ version = "20170807.1901";
src = fetchFromGitHub {
owner = "skeeto";
repo = "emacsql";
- rev = "1b37570bf5813e160fa18a766e20dfa690910519";
- sha256 = "1pq6316c2kn9idmdyq44khb1r2zj46kkclkqbrrcf7w2505wvkm0";
+ rev = "e3bc9b105f6f2de514dd689c8fa8f74f1d610a04";
+ sha256 = "03258c2lqrl8c2jy3dvxsbbhrgsysbciq9bay4iazgcvgwg2l2my";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql";
@@ -18268,8 +18211,8 @@
src = fetchFromGitHub {
owner = "skeeto";
repo = "emacsql";
- rev = "1b37570bf5813e160fa18a766e20dfa690910519";
- sha256 = "1pq6316c2kn9idmdyq44khb1r2zj46kkclkqbrrcf7w2505wvkm0";
+ rev = "e3bc9b105f6f2de514dd689c8fa8f74f1d610a04";
+ sha256 = "03258c2lqrl8c2jy3dvxsbbhrgsysbciq9bay4iazgcvgwg2l2my";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-mysql";
@@ -18289,8 +18232,8 @@
src = fetchFromGitHub {
owner = "skeeto";
repo = "emacsql";
- rev = "1b37570bf5813e160fa18a766e20dfa690910519";
- sha256 = "1pq6316c2kn9idmdyq44khb1r2zj46kkclkqbrrcf7w2505wvkm0";
+ rev = "e3bc9b105f6f2de514dd689c8fa8f74f1d610a04";
+ sha256 = "03258c2lqrl8c2jy3dvxsbbhrgsysbciq9bay4iazgcvgwg2l2my";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-psql";
@@ -18306,12 +18249,12 @@
emacsql-sqlite = callPackage ({ cl-generic, cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "emacsql-sqlite";
- version = "20170410.1218";
+ version = "20170806.1551";
src = fetchFromGitHub {
owner = "skeeto";
repo = "emacsql";
- rev = "1b37570bf5813e160fa18a766e20dfa690910519";
- sha256 = "1pq6316c2kn9idmdyq44khb1r2zj46kkclkqbrrcf7w2505wvkm0";
+ rev = "e3bc9b105f6f2de514dd689c8fa8f74f1d610a04";
+ sha256 = "03258c2lqrl8c2jy3dvxsbbhrgsysbciq9bay4iazgcvgwg2l2my";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-sqlite";
@@ -18516,11 +18459,11 @@
emms = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "emms";
- version = "20170715.907";
+ version = "20170901.1328";
src = fetchgit {
url = "https://git.savannah.gnu.org/git/emms.git";
- rev = "e790730a4e258440184bc8ce5d3015efe09f8984";
- sha256 = "0rh3hsggfw0yp5ssdwjpp0fdnc57cpcw02hxn80mrq16ylpj2zy9";
+ rev = "79793c0bb32620ad5b4db490c6e80ff8e5a20233";
+ sha256 = "13mk66vbrnzsy8bcz2wahn4hcqyiia6j0srpfffxsg49x9bssvff";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/emms";
@@ -18830,12 +18773,12 @@
emr = callPackage ({ cl-lib ? null, clang-format, dash, emacs, fetchFromGitHub, fetchurl, iedit, lib, list-utils, melpaBuild, paredit, popup, projectile, redshank, s }:
melpaBuild {
pname = "emr";
- version = "20170109.1526";
+ version = "20170811.1057";
src = fetchFromGitHub {
owner = "chrisbarrett";
repo = "emacs-refactor";
- rev = "07e0b41fe080536e8a69301ff1c692f2871bee2f";
- sha256 = "1ckbc2ziw31cqal9hmc6n6gmncwficzw5rwwdcy4wj7f7w3xkr5z";
+ rev = "d7009b30be810af6bb33c7d99a9b320e2aaeb698";
+ sha256 = "1hx5bv1banrnsb9wrnn57b4wj981qpvnx66px7h304yr95x8bls4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2cd2ebec5bd6465bffed284130e1d534f52169a9/recipes/emr";
@@ -18902,22 +18845,22 @@
license = lib.licenses.free;
};
}) {};
- engine-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ engine-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "engine-mode";
- version = "20170508.828";
+ version = "20170812.2007";
src = fetchFromGitHub {
owner = "hrs";
repo = "engine-mode";
- rev = "59f1d463fada670895b00bab406160570fb8bc35";
- sha256 = "1j8jym795k59lhsckvnh06mykz7b2f54v52n0dwvhyy2aaq0bnhl";
+ rev = "408932727bb723017eaf6338e50cb6d1266b8df8";
+ sha256 = "1wl172ldmdw6gcdzbbf7dln7m55112kq42jzs42xbihm0v1x8xlb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ea1b5dfb6628cf17e77369f25341835aad425f54/recipes/engine-mode";
sha256 = "1gg7i93163m7k7lr3pnal1svymnhzwrfpfcdc0798d7ybv26gg8c";
name = "engine-mode";
};
- packageRequires = [];
+ packageRequires = [ cl-lib ];
meta = {
homepage = "https://melpa.org/#/engine-mode";
license = lib.licenses.free;
@@ -18926,12 +18869,12 @@
enh-ruby-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "enh-ruby-mode";
- version = "20170417.2356";
+ version = "20170822.1647";
src = fetchFromGitHub {
owner = "zenspider";
repo = "enhanced-ruby-mode";
- rev = "71ba417baea4c4e1ac814854638cbeb4b0b383fd";
- sha256 = "1hbmjbk6xs1r0kqh5ci7jfr6905ipa7xz0kgypqrlg0zap52gayz";
+ rev = "c1462183573258edfd8134581417d3c95f1c9c4c";
+ sha256 = "1xyg52qf8zpkrgifw1lxk8h91acrg1n7nw59mxmwq8f122lmllx7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cd1ac1ce69b77b11f34c4175611a852e7ec0806c/recipes/enh-ruby-mode";
@@ -18947,12 +18890,12 @@
enlive = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "enlive";
- version = "20150824.549";
+ version = "20170725.717";
src = fetchFromGitHub {
owner = "zweifisch";
repo = "enlive";
- rev = "0f6646adda3974e7fe9a42339a4ec3daa532eda5";
- sha256 = "0vd7zy06nqb1ayjlnf2wl0bfv1cqv2qcb3cgy3zr9k9c4whcd8jh";
+ rev = "604a8ca272b6889f114e2b5a13adb5b1dc4bae86";
+ sha256 = "1iwfb5hxhnp4rl3rh5yayik0xl2lg82klxkvqf29536pk8ip710m";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/388fa2580e687d9608b11cdc069841831b414b29/recipes/enlive";
@@ -18976,8 +18919,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 ];
@@ -19010,12 +18953,12 @@
ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }:
melpaBuild {
pname = "ensime";
- version = "20170710.347";
+ version = "20170817.2325";
src = fetchFromGitHub {
owner = "ensime";
repo = "ensime-emacs";
- rev = "aaaa9e34f5ea023621bc8123064d3183b35339a7";
- sha256 = "11nxhzy4qc4y1gfi0m5c78jv2ib5gpsqdr1p84q0yqkzdc9wvcmd";
+ rev = "fe816d36bce96151f90b76887a69f44100bd12da";
+ sha256 = "19id9s3wvwlqvcfngw32rd9fnq74nwyl5zlmyvr6i268rk4gm4lq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime";
@@ -19085,8 +19028,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";
@@ -19123,12 +19066,12 @@
epkg = callPackage ({ closql, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "epkg";
- version = "20170702.59";
+ version = "20170905.1210";
src = fetchFromGitHub {
owner = "emacscollective";
repo = "epkg";
- rev = "d9c43561d8d50066c1774e3cf3df12e168c9fc92";
- sha256 = "145zn11l9i0lmjr83zvn8snviqqn6kw24dm5ihlllgxycclsvcrm";
+ rev = "42528f4f1d3310361d84bb557c4b7270adb5fd5b";
+ sha256 = "1d14160l1w65a3klhd71972a726kzhcn07bljp5q57y1qxbq648m";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg";
@@ -19148,8 +19091,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";
@@ -19332,12 +19275,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";
@@ -19542,12 +19485,12 @@
ereader = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, xml-plus }:
melpaBuild {
pname = "ereader";
- version = "20170529.1408";
+ version = "20170809.2201";
src = fetchFromGitHub {
owner = "bddean";
repo = "emacs-ereader";
- rev = "ef3cd7b9ced044bbd9a3e7cce0c78a970a483288";
- sha256 = "0n0n7600zwa9z8srafq0gp6d17lkr4pkrsql50rl2qa1fr44zi7z";
+ rev = "f3bbd3f13195f8fba3e3c880aab0e4c60430dcf3";
+ sha256 = "18yqqqxsivnq2m8mxz7ifp0bfmn3q9m11w3abryxg2snh4vb5sy6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ereader";
@@ -19605,12 +19548,12 @@
ergoemacs-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, undo-tree }:
melpaBuild {
pname = "ergoemacs-mode";
- version = "20170509.1202";
+ version = "20170723.1921";
src = fetchFromGitHub {
owner = "ergoemacs";
repo = "ergoemacs-mode";
- rev = "3e6fea941af18415b520f2fabc45349c4a148a8f";
- sha256 = "1b0whc2llfff6wggiran0df7wrh06mygca0cqpps6ljfniqcxl5y";
+ rev = "7b0600620fc64cdb92bb9a69144c68eaa088db5b";
+ sha256 = "05ihafhhjlq7b4zs58jaqssgqdha5kqv65hvk7946ba7l845fi83";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/02920517987c7fc698de9952cbb09dfd41517c40/recipes/ergoemacs-mode";
@@ -19647,12 +19590,12 @@
erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "erlang";
- version = "20170509.742";
+ version = "20170912.58";
src = fetchFromGitHub {
owner = "erlang";
repo = "otp";
- rev = "de5cfabdad61d45a112d95e24ac44e3f51a4bd18";
- sha256 = "14mi9qj2q0h21jy9zj4gqjz2205013d5s5l02asq6iid747jhx3j";
+ rev = "b36f0b6d381746a16c8d8c2bb3767d9ffb44c3f8";
+ sha256 = "1i0aqq3vwy10jbky6ahka2vqk55iqanq1liqj81r76l5v55flcz6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -19734,8 +19677,8 @@
version = "20161018.1217";
src = fetchgit {
url = "https://bitbucket.org/olanilsson/ert-junit";
- rev = "e1d7b795176dceae40adb15c28717276c00269e4";
- sha256 = "0d6ab0f22sing9cimpc86yydvyzb3z3s36372x082pg62ilrj0pi";
+ rev = "b8e23617bbd5228dfa37fdc00e7b5227fd6382df";
+ sha256 = "1f5r1ns2h53q5qmrr31xbwrsinnk4ialh4a7siz2n513znq6dq8w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/27c627eacab54896a1363dbabc56250a65343dd8/recipes/ert-junit";
@@ -19772,12 +19715,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";
@@ -19814,12 +19757,12 @@
es-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s, spark }:
melpaBuild {
pname = "es-mode";
- version = "20170705.2002";
+ version = "20170823.957";
src = fetchFromGitHub {
owner = "dakrone";
repo = "es-mode";
- rev = "61a8bf7d6cc6881e5555922eb36eecc6733a2b87";
- sha256 = "0anc7bdar2q5c41ilah3p04p4z3mxkqlv91nkky72i58sgrw6za6";
+ rev = "82c9d0e47f7f224d1248e3455ee10c0adea327bf";
+ sha256 = "1jb4b2cww6y3y0j3gf9n5v2hcmb9zsf1cz9rhr0x6vh169yvhjvr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9912193f73c4beae03b295822bf41cb2298756e2/recipes/es-mode";
@@ -19919,12 +19862,12 @@
esh-help = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "esh-help";
- version = "20170702.1912";
+ version = "20170829.2111";
src = fetchFromGitHub {
owner = "tom-tan";
repo = "esh-help";
- rev = "15994c0d1c36f6209547742690c6d8f2ef505393";
- sha256 = "0a0n05mhgp8gvxkld0510k4kq4m81aq2jdrgmfyafm5am5abz6lp";
+ rev = "8a8a9d4d9852f8bd96da3b94e95ff57097ac8ec6";
+ sha256 = "02fybhmqm2qmy5qdig7xvwxazqi499pw32kh5mrsbdr14srg9fhs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ab94c66d1ed7cfdbc437ee239984ba70408fd28a/recipes/esh-help";
@@ -19982,12 +19925,12 @@
eshell-fixed-prompt = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "eshell-fixed-prompt";
- version = "20170108.1301";
+ version = "20170804.635";
src = fetchFromGitHub {
owner = "mallt";
repo = "eshell-fixed-prompt-mode";
- rev = "0b1d7cc05a7f59e8c06c321401cea86c6cb068af";
- sha256 = "0kr9nv9dd2i4ar6mx4bjhid4sxsvvgx713bajia4jsby34jbgfi2";
+ rev = "4351b214de6d4e8e45279930448e2f93b491848e";
+ sha256 = "1zx3zn28m5dnvsnkpqd26szv9yzplnb6wyp9vfjfs3hnasrizbxc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/eshell-fixed-prompt";
@@ -20024,12 +19967,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";
@@ -20175,8 +20118,8 @@
src = fetchFromGitHub {
owner = "ecukes";
repo = "espuds";
- rev = "7fc312184348df55d19d06914605356885674354";
- sha256 = "1vx1b1pyi2xpfl822mskzvh943rxp9pyr915fnx5pjp58hjwwf3h";
+ rev = "31ffd83f6deccddfb8378fa2298d90d3fc5fdda1";
+ sha256 = "1l8c8g050av0hi5snini7igfrjaq8q0nb3g114ai1i8frzsrxgzn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/14cf66e6929db2a0f377612e786aaed9eb12b799/recipes/espuds";
@@ -20234,12 +20177,12 @@
ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }:
melpaBuild {
pname = "ess";
- version = "20170710.118";
+ version = "20170911.149";
src = fetchFromGitHub {
owner = "emacs-ess";
repo = "ESS";
- rev = "064174931f0cbf91ad24fda883909a06eee10f6e";
- sha256 = "0f6ikmgcakaa74p271nfkg55gbq2wxdjq978h8kp7x7vaczfjz0n";
+ rev = "23e6d3ef5b314223043c9f03301b3e7018141385";
+ sha256 = "1fih6rphz5bsd2kvwblygaymp1mvz710xjvcqg52l9awlawgvbwb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess";
@@ -20273,27 +20216,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";
@@ -20360,12 +20282,12 @@
esup = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "esup";
- version = "20170508.1536";
+ version = "20170729.1742";
src = fetchFromGitHub {
owner = "jschaf";
repo = "esup";
- rev = "efaf44d0739391aed48c77b5cd3013b50027ed36";
- sha256 = "1ddff6scpnljl9h957zx7nahxd6si0gcznkg5da09sa7vpds0732";
+ rev = "94e0d2bef2bcdbd9477e702f63148cc2de75ecb3";
+ sha256 = "0rz2a8ydr7jrsgz1mxgjk4wyf7rkz0w3qvx6jy8mygzhzhmniy24";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b9d2948a42da5d4864404d2d11a924a4f235fc3b/recipes/esup";
@@ -20381,16 +20303,16 @@
esxml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "esxml";
- version = "20160703.1417";
+ version = "20170903.150";
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 = [];
@@ -20479,22 +20401,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 = "20170621.945";
+ version = "20170830.1229";
src = fetchFromGitHub {
owner = "iory";
repo = "euslisp-mode";
- rev = "16ee25d6d84d0e0b1b153791c51acedafd8d572b";
- sha256 = "1a496xzw6vs6rv7pp6yv3zmjdxbypjz132r6s6595gjcvwrfisr5";
+ 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;
@@ -20524,12 +20446,12 @@
eval-in-repl = callPackage ({ ace-window, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }:
melpaBuild {
pname = "eval-in-repl";
- version = "20170217.1432";
+ version = "20170730.1445";
src = fetchFromGitHub {
owner = "kaz-yos";
repo = "eval-in-repl";
- rev = "d96a134abe65c736bfaf0a78d1f899ea7cf0fee5";
- sha256 = "00ilv46ybpw5arfqi3pk7gjabkac76siqpgj3ca47s6vlmz41anv";
+ rev = "7e2b42570b449b2a3c2922f3036a027d1e393a60";
+ sha256 = "0x97flv356kd7j6wbhacz0lmsrdd9as87b0n6nliq5n0y30my8dy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0bee5fb7a7874dd20babd1de7f216c5bda3e0115/recipes/eval-in-repl";
@@ -20605,15 +20527,36 @@
license = lib.licenses.free;
};
}) {};
+ eve-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, polymode }:
+ melpaBuild {
+ pname = "eve-mode";
+ version = "20170822.1531";
+ src = fetchFromGitHub {
+ owner = "witheve";
+ repo = "emacs-eve-mode";
+ rev = "a4661114d9c18725691b76321d72167ca5a9070a";
+ sha256 = "19s6cid42q0lm2w94a7f6sxvmy3zpjdj5r5dbwcxxp5n3qfs7nip";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e0f197adfe64ef88d90d24dfd6532bf52a5bce0d/recipes/eve-mode";
+ sha256 = "1ch50bm452g8k1xnqcbpmpwkmg8amzv7bq0hphk3y0kiqkwd1gdh";
+ name = "eve-mode";
+ };
+ packageRequires = [ emacs markdown-mode polymode ];
+ meta = {
+ homepage = "https://melpa.org/#/eve-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }:
melpaBuild {
pname = "evil";
- version = "20170712.2350";
+ version = "20170904.1346";
src = fetchFromGitHub {
owner = "emacs-evil";
repo = "evil";
- rev = "dc936936666595afdbdbb4cc44c1f82e74c6802c";
- sha256 = "0l0sjrfpp5xk5c74gryh1sf9hpv8qkykdwg59vzsmn0w9ii217p5";
+ rev = "485bf5399bbad17ff0cbb3787de67b9a5a5665dd";
+ sha256 = "02zd9pk2x44lz9cb8cqy0apvdbb8vwlxgvrgfkfswvx34ww4rqmc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/440482c0edac8ee8bd4fe22f6bc5c1607f34c7ad/recipes/evil";
@@ -20692,12 +20635,12 @@
evil-cleverparens = callPackage ({ dash, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, paredit, smartparens }:
melpaBuild {
pname = "evil-cleverparens";
- version = "20160611.904";
+ version = "20170717.2113";
src = fetchFromGitHub {
owner = "luxbock";
repo = "evil-cleverparens";
- rev = "82c920ba04accfd31fa292e11c454d5112b4fd51";
- sha256 = "0ajy5kp2asrg070vzyzgyqs9jnzglm7lvx8fqvgdhpmhzzfckhbi";
+ rev = "8c45879d49bfa6d4e414b6c1df700a4a51cbb869";
+ sha256 = "0lhnybpnk4n2yhlcnj9zxn0vi5hpjfaqfhvyfy7ckzz74g8v7iyw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e3b3637d6527b16ea0d606fd87b01004be446b09/recipes/evil-cleverparens";
@@ -20818,12 +20761,12 @@
evil-ediff = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-ediff";
- version = "20170623.707";
+ version = "20170724.1223";
src = fetchFromGitHub {
owner = "emacs-evil";
repo = "evil-ediff";
- rev = "862310e244d406751cdc7eae8e8c0d88414a48c7";
- sha256 = "0088xgvzsy3rmdkw6r90vnxgsxr9mmqkwaw18m9bm4fivday75b0";
+ rev = "67b0e69f65c196eff5b39dacb7a9ec05bb919c74";
+ sha256 = "0f8g07fyzyc8pdwizyj62v0dy65ap885asph83529y0j8wnni8ps";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/50315ec837d2951bf5b2bb75809a35dd7ffc8fe8/recipes/evil-ediff";
@@ -20965,12 +20908,12 @@
evil-goggles = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-goggles";
- version = "20170710.724";
+ version = "20170913.59";
src = fetchFromGitHub {
owner = "edkolev";
repo = "evil-goggles";
- rev = "902270eea80594577d9af26298998406f79e59a0";
- sha256 = "11v1zpi3jnsxdwhxv441rvbkyb6v1sg4zyk74aw14l5cf38f0d55";
+ rev = "221a5ed8ea0455e4274ef9ba14fe852cc512112d";
+ sha256 = "0qjzkg1cms6ska213n1ldm511ivdawxwpvn8qzl8l75yf3whzw05";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/811b1261705b4c525e165fa9ee23ae191727a623/recipes/evil-goggles";
@@ -21067,15 +21010,36 @@
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";
- version = "20170523.450";
+ version = "20170810.2314";
src = fetchFromGitHub {
owner = "edkolev";
repo = "evil-lion";
- rev = "79766bfb8cbaa82af92eb9c90ea370e10ff74ea4";
- sha256 = "1799gjd1qj6hdzdy88x7lw0xwygkh70zm0y5gkhlmn4rzkdka9j1";
+ rev = "aaa3874ad54c31b4322ac5bbc63e331498b11d61";
+ sha256 = "1aq3ip93sxk05gfgh2zw6zckmkir0viqaqz674fcmsd2rc2051zn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8a7a0691775afec6d2c7be3d6739b55bd1d2053d/recipes/evil-lion";
@@ -21175,12 +21139,12 @@
evil-matchit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-matchit";
- version = "20170713.647";
+ version = "20170727.1741";
src = fetchFromGitHub {
owner = "redguardtoo";
repo = "evil-matchit";
- rev = "2fc961d94b27e528df1fc4b88d297dd9af8ed6d6";
- sha256 = "16fk050q8ibdp4n5fflcz2scsbky7dg1kf97c28f1gszixp6yng0";
+ rev = "dbaae2b7537aadb2e44a8915745ee190768b4b2a";
+ sha256 = "1y386wjz23kqfqbbgrwg4fnv2ma21dzk5ppnqd0y5245v388q69n";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/aeab4a998bffbc784e8fb23927d348540baf9951/recipes/evil-matchit";
@@ -21238,12 +21202,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";
@@ -21280,12 +21244,12 @@
evil-nerd-commenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-nerd-commenter";
- version = "20170309.49";
+ version = "20170905.653";
src = fetchFromGitHub {
owner = "redguardtoo";
repo = "evil-nerd-commenter";
- rev = "cac2f7945fc90f43d1282dfe4aca24ded9f7cd03";
- sha256 = "1zjnscnj0zrxpdjikxwg4fw7m6yb39060cmn24xzs0hmnmbxnw9m";
+ rev = "92bee71aa6fbb36299a4e69e710da786f3694637";
+ sha256 = "1sxwiar17jvqj7plf7jdpwx9kymabr0dsfl7mbkcxpzvrfdlmp12";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a3e1ff69e7cc95a5b5d628524ad836833f4ee736/recipes/evil-nerd-commenter";
@@ -21343,12 +21307,12 @@
evil-org = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "evil-org";
- version = "20170622.1310";
+ version = "20170911.1135";
src = fetchFromGitHub {
owner = "Somelauw";
repo = "evil-org-mode";
- rev = "975109dc665f53cef221b3c668612664340b7940";
- sha256 = "0fr0wxd53a0lv2akvayi844fncn8klj88hmld73x2d1igig38p4q";
+ rev = "1b0cb009fcc593ba851d243d2e3291a8cfeb2fb0";
+ sha256 = "0qnb5vbsrwxsn2zjl6dy6gvc1y77ac9c8nqrhpzyvjbkby2gkwzh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1768558ed0a0249421437b66fe45018dd768e637/recipes/evil-org";
@@ -21473,8 +21437,8 @@
src = fetchFromGitHub {
owner = "naclander";
repo = "evil-search-highlight-persist";
- rev = "6e04a8c075f5fd62526d222447048faab8bfa187";
- sha256 = "1ni1bila3kjqrjcn1sm6g6h2cmf1chrh4d8nj4qfjvkb12fkw6j6";
+ rev = "979d2dec58d3b9c5ca5fdf4bb802a0209913794e";
+ sha256 = "0ak8r7cgz5xnjyfg3w9mwxhvaw8ny3hy0i2bqn3vf5dps649iy7i";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f2e91974ddb219c88229782b70ade7e14f20c0b5/recipes/evil-search-highlight-persist";
@@ -21511,12 +21475,12 @@
evil-snipe = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-snipe";
- version = "20170702.302";
+ version = "20170903.603";
src = fetchFromGitHub {
owner = "hlissner";
repo = "evil-snipe";
- rev = "c50372d152b123fbf7bc26b49504505a22e82635";
- sha256 = "1xvpjs91wr351gl0xb3fbbm4yhv2rcgbqcn8srw022a2snhrdw27";
+ rev = "69adb46546a871beb54a445cb22652ac276555c1";
+ sha256 = "1g6whd2zg880wxxyn269q4b0697aybj1lc936gi7nrxvm6fnaiwc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6748f3febbe2f098761e967b4dc67791186d0aa7/recipes/evil-snipe";
@@ -21553,12 +21517,12 @@
evil-surround = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-surround";
- version = "20170124.1110";
+ version = "20170910.1952";
src = fetchFromGitHub {
owner = "emacs-evil";
repo = "evil-surround";
- rev = "43a266461517d2eb715338da0a31dc6616073116";
- sha256 = "04pzlkblziir91g38kmlmr7p1q5cxjw4q7difwhly3iz567minkq";
+ rev = "7839abe0e04740e2928a6b799557d1b16460fa5f";
+ sha256 = "03lfn8clcbcmax5nzn6awzfd895inavzrn45n07hrq6abw98yjrd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2c9dc47a4c837c44429a74fd998fe468c00639f2/recipes/evil-surround";
@@ -21571,22 +21535,22 @@
license = lib.licenses.free;
};
}) {};
- evil-swap-keys = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ evil-swap-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-swap-keys";
- version = "20170221.444";
+ version = "20170726.1120";
src = fetchFromGitHub {
owner = "wbolster";
repo = "evil-swap-keys";
- rev = "6a2f4db944076439c2cb481c4e9e4e5d736a5ab8";
- sha256 = "0ymxmlx6dfczxkdgsm8g8pz6dhdnb3ay74s2a70jgwqns8yaqv7k";
+ rev = "56bc201e265a6bd482a7c41a7c81d2238341ef3a";
+ sha256 = "0n0hl0plaghz9rjssabxwfzm46kr6564hpfh6hn8lzla4rf1q5zs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2abff8e3d54ac13c4fe90692a56437844accca25/recipes/evil-swap-keys";
sha256 = "12cx95mjm4ymggidvf41gh3a364z32h655jmhk417v0ga9jk9fv6";
name = "evil-swap-keys";
};
- packageRequires = [ emacs evil ];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/evil-swap-keys";
license = lib.licenses.free;
@@ -21634,6 +21598,27 @@
license = lib.licenses.free;
};
}) {};
+ evil-test-helpers = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "evil-test-helpers";
+ version = "20170719.1445";
+ src = fetchFromGitHub {
+ owner = "emacs-evil";
+ repo = "evil";
+ rev = "485bf5399bbad17ff0cbb3787de67b9a5a5665dd";
+ sha256 = "02zd9pk2x44lz9cb8cqy0apvdbb8vwlxgvrgfkfswvx34ww4rqmc";
+ };
+ 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";
@@ -21658,12 +21643,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";
@@ -21679,12 +21664,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";
@@ -21910,11 +21895,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";
@@ -21927,6 +21912,27 @@
license = lib.licenses.free;
};
}) {};
+ exotica-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "exotica-theme";
+ version = "20170828.357";
+ src = fetchFromGitHub {
+ owner = "jbharat";
+ repo = "exotica-theme";
+ rev = "0fcb6f3e5ef7d97a4ec049867a8d703ec60a89f5";
+ sha256 = "0i7pgdxrx2ijf67sy4x2xab416s458mgac261ng2522z87szddah";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/9182f92dd62e2f1775a76699a6c8f9c3e71e9030/recipes/exotica-theme";
+ sha256 = "1fzf1zpllkddkq02hvabbi2bh6rnanlyinb6fjwsyh39wvzhsfhs";
+ name = "exotica-theme";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/exotica-theme";
+ license = lib.licenses.free;
+ };
+ }) {};
expand-line = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "expand-line";
@@ -22053,22 +22059,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 = "20170708.1735";
+ version = "20170903.2138";
src = fetchFromGitHub {
owner = "tumashu";
repo = "exwm-x";
- rev = "e50edd9e4174b729fdbc5750221c5e49b772e9c5";
- sha256 = "0kx4db5mdm295d4gyx88xjgivhsnl6f5p24smvwi1wf3jv35rnds";
+ rev = "cee7cc0e6dd6d1c481480f1978b6487287b4f637";
+ sha256 = "0kwrm2bz09i8dj0zz7pznpv0hy08pxl4kzl46c470abvs2dzrp67";
};
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;
@@ -22116,22 +22130,22 @@
license = lib.licenses.free;
};
}) {};
- ez-query-replace = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ ez-query-replace = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "ez-query-replace";
- version = "20170311.139";
+ version = "20170814.621";
src = fetchFromGitHub {
owner = "Wilfred";
repo = "ez-query-replace.el";
- rev = "66381226da00cc4a87c7d5962aaabbc0eb325cb7";
- sha256 = "1p5qg5pz87ym1gd0jmakkpkskmffl69694pkxbhhfxp10pyshzmc";
+ rev = "f5dbd2d3e5e62e6b7e7cc1a98fc4d0cd411e5afa";
+ sha256 = "14mikpxrsmjwdpya45cf47v2gjwxmql10xjk907x27iqqxmfif74";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c40808c7687ace84e4c59bf8c25332c94b6fdd76/recipes/ez-query-replace";
sha256 = "1h9ijr1qagwp9vvikh7ajby0dqgfypjgc45s7d93zb9jrg2n5cgx";
name = "ez-query-replace";
};
- packageRequires = [ dash ];
+ packageRequires = [ dash s ];
meta = {
homepage = "https://melpa.org/#/ez-query-replace";
license = lib.licenses.free;
@@ -22140,12 +22154,12 @@
eziam-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "eziam-theme";
- version = "20170517.847";
+ version = "20170906.821";
src = fetchFromGitHub {
owner = "thblt";
repo = "eziam-theme-emacs";
- rev = "6c7e6ac20e27a26e7b27761f11a3a959ea815b5c";
- sha256 = "1jzqb1w8ax5h6g9nwqwnagalag2kj7mabq889vl59ka5lvccac0f";
+ rev = "63395a2367d1d48983a9363d2d0bf518177297bd";
+ sha256 = "15vgv0z4vzdnc3vb98j2hy4bv5x83f4c1dzgx49r61vka7p5is0q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0411583bd4fdbe425eb07de98851136fa1eeb0/recipes/eziam-theme";
@@ -22182,12 +22196,12 @@
f3 = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "f3";
- version = "20160628.1601";
+ version = "20170728.1120";
src = fetchFromGitHub {
owner = "cosmicexplorer";
repo = "f3";
- rev = "114fec094c4ea063724c05404a2ece53f510b3e3";
- sha256 = "0fh69qhvdks1hclwhr9nv6bgbsjwdk0mwqhw3dmlv2jb5yip308m";
+ rev = "1ed0ac4368a9f631f6dfad7ad17e9f7434a42bd6";
+ sha256 = "03crpcb1jbbc12nz912qdkipmm94xlrpzr2cgckya0cj8sdgv9fz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b40de62a82d6895a37ff795d56f7d0f783461e6/recipes/f3";
@@ -22533,12 +22547,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";
@@ -22551,15 +22565,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 = "feb938af3a5363e0e0210aa98a447e1896ceca47";
+ sha256 = "1c0xc1nk9djjk39ksysszliphibnpm7c472p4lvgkmrsmg28i23k";
+ };
+ 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 = "20170615.1143";
+ version = "20170812.1131";
src = fetchFromGitHub {
owner = "cute-jumper";
repo = "fcitx.el";
- rev = "cddd216402c9a9b4228b5f82afa1bd637b2e0c37";
- sha256 = "0kvn9ikxnv9ahz0cqal3drxv95slwbf758sp37irih6fqh3ybgbl";
+ rev = "6d552ab44234ed78ce9a50f2412f56197266bc9f";
+ sha256 = "08l859rw1lwj6hdxrlxqlxf1cfxv8yv9h1jsgs5zfis3hp7nq39j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e8c40f09d9397b3ca32a7ed37203f490497dc984/recipes/fcitx";
@@ -22596,12 +22630,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";
@@ -22737,12 +22771,12 @@
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";
@@ -22783,8 +22817,8 @@
src = fetchFromGitHub {
owner = "skeeto";
repo = "elisp-finalize";
- rev = "0f7d47c4d50f1c76fc3b43bfc2d4886dd3e8ca27";
- sha256 = "1gvlm4i62af5jscwz0jccc8ra0grprxpg2rlq91d5nn8dn5lpy79";
+ rev = "0496a7b8f2f8b197010d8602b5fc529f5104704a";
+ sha256 = "1canhfvqjkm0bbr9g50pi0cibhq3mf7g79k2m18d8zarc9jljrjm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1b55869b5183644de02687d2e56f9b68854ccda3/recipes/finalize";
@@ -22840,12 +22874,12 @@
find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "find-file-in-project";
- version = "20170531.2054";
+ version = "20170906.2011";
src = fetchFromGitHub {
owner = "technomancy";
repo = "find-file-in-project";
- rev = "a6e59891973f3e40ca2e414ca66799cc686d8626";
- sha256 = "16wxw5bxb3nmw6glx2iqcfr75fsya1a9kxd6khv46zy5z85n1bng";
+ rev = "dcc0801c4781d76efd9ac0d86bab4084b4b93663";
+ sha256 = "0axk4a4b3s0x8wn4a4mj1i89kix88cv94iclhw4wigsscndpr03v";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project";
@@ -23003,36 +23037,15 @@
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";
- version = "20141115.2302";
+ version = "20170808.611";
src = fetchFromGitHub {
owner = "emacsfodder";
repo = "emacs-firecode-theme";
- rev = "73573192e5e9d14d94dfc5131dd2b7a780b89626";
- sha256 = "0v8liv6aq10f8dxbl3d4rph1qk891dlxm9wqdc6w8aj318750hfm";
+ rev = "8b7b03ecdd41e70dab145b98906017e1392eaef4";
+ sha256 = "1vrpnv7555mbsksflgdkg7hc65fjcyzvzv2261y043rlh2qrn0sy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/firecode-theme";
@@ -23155,8 +23168,8 @@
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "fix-input";
- rev = "a70edfa7880ff9b082f358607d2a9ad6a8dcc8f3";
- sha256 = "121m0h0nwxr27f9d2llbgl63ni1makcg66lnvg24wx07wggf0n8z";
+ rev = "a0fd233bba6206854c5d7365d7182aaae842f210";
+ sha256 = "1zwbysh9fq6dbdi93cdzgrsp2azy8b3j0gz32ih0vbs9xyysbhlz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7d31f907997d1d07ec794a4f09824f43818f035c/recipes/fix-input";
@@ -23197,8 +23210,8 @@
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "fix-word";
- rev = "91552cbceac8e2b7c23036f044fc84f5c6f8e338";
- sha256 = "1pilsd3hkryyl4sd6s4nvmraszkdmcn3qdqi939yjgzp4lz3q412";
+ rev = "7df98ac9f9b0e6e09d7999d83e678cb22248be77";
+ sha256 = "13i604lmx30r0kk0s998dp4czzazqavyqqi3kx6lh6mj2csgkgda";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/22636390e8a15c09293a1506a901286dd72e565f/recipes/fix-word";
@@ -23250,8 +23263,8 @@
sha256 = "07hv6l80ka10qszm16fpan8sas4b0qvl5s6qixxlz02fm7m0s7m5";
};
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 = [];
@@ -23284,12 +23297,12 @@
flatland-black-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "flatland-black-theme";
- version = "20141115.2230";
+ version = "20170808.612";
src = fetchFromGitHub {
owner = "emacsfodder";
repo = "emacs-flatland-black-theme";
- rev = "75fc4f1815feb23563a60477c02d70326b45c59e";
- sha256 = "0ib6r6q4wbkkxdwgqsd25nx7ccxhk16lqkvwikign80j9n11g7s1";
+ rev = "348c5d5fe615e6ea13cadc17f046e506e789ce07";
+ sha256 = "1g5jqxdk35ahx8qk4vi7whhcpi1qp7rbbjgiih974fs59cg5iki0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/flatland-black-theme";
@@ -23470,12 +23483,12 @@
floobits = callPackage ({ fetchFromGitHub, fetchurl, highlight, json ? null, lib, melpaBuild }:
melpaBuild {
pname = "floobits";
- version = "20170416.1718";
+ version = "20170802.1500";
src = fetchFromGitHub {
owner = "Floobits";
repo = "floobits-emacs";
- rev = "fdac635ecc57ac7743f74678147aca2e956561de";
- sha256 = "134b5ss249x06bgqvsxnlcfys7nl8aid42s7ln8pamxrc3prfcc1";
+ rev = "ed5586d1bf94f36354091648e824ccb6fcaf807f";
+ sha256 = "08m9snmkhdjmvw1pqww9l39xqas9f6yxksjxvfjjfnad8ak80x9b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/95c859e8440049579630b4c2bcc31e7eaa13b1f1/recipes/floobits";
@@ -23491,12 +23504,12 @@
flow-minor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "flow-minor-mode";
- version = "20170418.1253";
+ version = "20170729.1008";
src = fetchFromGitHub {
owner = "an-sh";
repo = "flow-minor-mode";
- rev = "b05d59f387133249e03004b79bf16d6fe6c38217";
- sha256 = "0kw001kcdqjj3ymk9vn9giiv18icp3yrys8xdvszkhlby99y74h5";
+ rev = "75067baceed7d699dda43944da49dc58d22baeff";
+ sha256 = "0r1xs3vff3ng0h2w8nn7mxssdnipnrzwk9dh5f5v7prwk2q60byb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/66504f789069922ea56f268f4da90fac52b601ff/recipes/flow-minor-mode";
@@ -23596,12 +23609,12 @@
flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }:
melpaBuild {
pname = "flycheck";
- version = "20170715.1345";
+ version = "20170911.127";
src = fetchFromGitHub {
owner = "flycheck";
repo = "flycheck";
- rev = "b78d5a6f48c2ebd4298cf33c3364c63d86ae32cc";
- sha256 = "14mp95k9365869fikzsvxha74121kbcrwp0pavv17calf29ycxck";
+ rev = "eeb915b51f2fe9f7afe125b1028737b8c2b44712";
+ sha256 = "13dsjngb5lbhzrlcw3skk7v6j7c2k3vn596msin9f6ssjwmgc94k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck";
@@ -23932,12 +23945,12 @@
flycheck-cython = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-cython";
- version = "20160327.1228";
+ version = "20170724.258";
src = fetchFromGitHub {
owner = "lbolla";
repo = "emacs-flycheck-cython";
- rev = "45097658a16eeabf2bd5e0464355f8f37a1aeffc";
- sha256 = "0994346iyp7143476i3y6pc5m1n6z7g1r6n1rldivsj0qr4gjh01";
+ rev = "ecc4454d35ab5317ab66a04406f36f0c1dbc0b76";
+ sha256 = "1v17skw0wn7a7nkc1vrs0bbzihnjw0dwvyyd0lydsihzxl5z2r5g";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2d963eb1b8f8f863b37a96803b00d395e9d85e94/recipes/flycheck-cython";
@@ -24058,12 +24071,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";
@@ -24226,12 +24239,12 @@
flycheck-haskell = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, let-alist, lib, melpaBuild, seq }:
melpaBuild {
pname = "flycheck-haskell";
- version = "20170622.1248";
+ version = "20170815.44";
src = fetchFromGitHub {
owner = "flycheck";
repo = "flycheck-haskell";
- rev = "2aeb2ed5cdde7770cd5da9950981390d7b44f74c";
- sha256 = "0h7zb1f0j3b44ad7ikdyv3mhddvh9hfg61g2aic3x3ms8rph86q5";
+ rev = "b313b62866b8a28cadc7331749e51eb32e4ddac2";
+ sha256 = "1r94y0wj0ssmamyqfxv0gm0l5qbfrfka8qgsd5mbsaw1lzk5ikfb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6ca601613788ae830655e148a222625035195f55/recipes/flycheck-haskell";
@@ -24265,6 +24278,27 @@
license = lib.licenses.free;
};
}) {};
+ flycheck-inline = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, flycheck, inline-docs, lib, melpaBuild }:
+ melpaBuild {
+ pname = "flycheck-inline";
+ version = "20170728.2328";
+ src = fetchFromGitHub {
+ owner = "stardiviner";
+ repo = "flycheck-inline";
+ rev = "624957ec04164f03656bf2d0a5ccd6d2b013f545";
+ sha256 = "1qrwci7d5g3c3s2z888hydsa22hhiwlarq3im8w2crlzx5lhnbz8";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/6ad3925576719f34682f65867fd5bbbc97818870/recipes/flycheck-inline";
+ sha256 = "1yas4csz0xv0h61nzlywrp9z665gcmwr8vjrkm2psh04rfqhx3wg";
+ name = "flycheck-inline";
+ };
+ packageRequires = [ cl-lib emacs flycheck inline-docs ];
+ meta = {
+ homepage = "https://melpa.org/#/flycheck-inline";
+ license = lib.licenses.free;
+ };
+ }) {};
flycheck-irony = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, irony, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-irony";
@@ -24310,12 +24344,12 @@
flycheck-julia = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-julia";
- version = "20170715.945";
+ version = "20170729.1441";
src = fetchFromGitHub {
owner = "gdkrmr";
repo = "flycheck-julia";
- rev = "0eaa3216dc35679d72c0d107127d48915516df08";
- sha256 = "091zjabzrw1f194pmz60ij3ys8sw54dxj9q3vpl3sigr1jd1qq7v";
+ rev = "213b60a5a9a1cb7887260e1d159b5bb27167cbb6";
+ sha256 = "0wk8mc8j67dmc3mxzrhypgxmyywwrjh5q5llj4m2mgf0j7yp2576";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4e964e3c6f737d0102b4fd7440fa9d434e6382bf/recipes/flycheck-julia";
@@ -24356,8 +24390,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";
@@ -24499,12 +24533,12 @@
flycheck-ocaml = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, merlin }:
melpaBuild {
pname = "flycheck-ocaml";
- version = "20151103.212";
+ version = "20170730.1453";
src = fetchFromGitHub {
owner = "flycheck";
repo = "flycheck-ocaml";
- rev = "e4412025f27850918762237fa80b33e285a63e7c";
- sha256 = "0fm8w7126vf04n76qhh33rzybvl1n7va2whbqzafbvmv2nny3v94";
+ rev = "8707a7bf545a8639a6a5c600a98d9a2ea1487dc9";
+ sha256 = "13vzxkjq6v1f1i9zgxgjbwpiba04k9frkcl2wx6a9h3vgd7jyay0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8ce9283eb1285953a2578eb7c4d280b4d98c801f/recipes/flycheck-ocaml";
@@ -24524,8 +24558,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";
@@ -24622,6 +24656,27 @@
license = lib.licenses.free;
};
}) {};
+ flycheck-popup-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup }:
+ melpaBuild {
+ pname = "flycheck-popup-tip";
+ version = "20170812.1651";
+ src = fetchFromGitHub {
+ owner = "flycheck";
+ repo = "flycheck-popup-tip";
+ rev = "ef86aad907f27ca076859d8d9416f4f7727619c6";
+ sha256 = "1bi6f9nm4bylsbjv4qnkar35s6xzdf2cc2cxi3g691p9527apdz6";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/9b2269ee9532bb092756ae0c0693cb44b73820e8/recipes/flycheck-popup-tip";
+ sha256 = "1j8pgljnxcbfh08qpbr9jkw56l7d6k8lmdcsjbi6jd7jmyqbqvnx";
+ name = "flycheck-popup-tip";
+ };
+ packageRequires = [ emacs flycheck popup ];
+ meta = {
+ homepage = "https://melpa.org/#/flycheck-popup-tip";
+ license = lib.licenses.free;
+ };
+ }) {};
flycheck-pos-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, pos-tip }:
melpaBuild {
pname = "flycheck-pos-tip";
@@ -24664,6 +24719,27 @@
license = lib.licenses.free;
};
}) {};
+ flycheck-pycheckers = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+ melpaBuild {
+ pname = "flycheck-pycheckers";
+ version = "20170810.1143";
+ src = fetchFromGitHub {
+ owner = "msherry";
+ repo = "flycheck-pycheckers";
+ rev = "220c551df591792d08fc9d149ab3329171743cb9";
+ sha256 = "0q1sz28nlnamcm4l587q94b7cyak9d4wpgpr33a05m9lw4a6z74i";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/af36dca316b318d25d65c9e842f15f736e19ea63/recipes/flycheck-pycheckers";
+ sha256 = "18ski3bp8x33589pc273i5ia3hffvlb4czrd97wkfgr4k59ww6yq";
+ name = "flycheck-pycheckers";
+ };
+ packageRequires = [ flycheck ];
+ meta = {
+ homepage = "https://melpa.org/#/flycheck-pycheckers";
+ license = lib.licenses.free;
+ };
+ }) {};
flycheck-pyflakes = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-pyflakes";
@@ -24713,8 +24789,8 @@
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "65c8f03ff0112ce5c5e11aff6867ad0eb9019e63";
- sha256 = "0xlacwjmvx5xd8m7yi8l8mqi0lqs2gr2hmjag2frvmxcn4cpb4gc";
+ rev = "2af4d6a32e8194f8fbcc23fd94395e3d595a3c25";
+ sha256 = "0091w529lvbjlw1fdb3qjgb8fd5fcwxhqyr4ps5cvxl5bqnwlw39";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags";
@@ -24797,8 +24873,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";
@@ -24835,12 +24911,12 @@
flycheck-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup }:
melpaBuild {
pname = "flycheck-tip";
- version = "20160908.1953";
+ version = "20170729.1411";
src = fetchFromGitHub {
owner = "yuutayamada";
repo = "flycheck-tip";
- rev = "53e812ae6d517e8d35907eed8ddcee95c2922e91";
- sha256 = "180c9q273k8167kfkfkvgsadprr34irnmb4qx8ksr3dmg77ghpc8";
+ rev = "cbdff9a574fab1222ed50d7c1359ffb820f30934";
+ sha256 = "0ic9cdsi30mx5ldrbzc2i9y4q69fpa9s19zrdk10i3wxs6mmgl8l";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/024f1e588e94014734fa252ee7bdb00b4991ede9/recipes/flycheck-tip";
@@ -24923,8 +24999,8 @@
src = fetchFromGitHub {
owner = "abingham";
repo = "emacs-ycmd";
- rev = "35e8a31e32d0de890547612db8373d7333db8d8a";
- sha256 = "023bkmviaqb85kwwlpmzfc5gycf4i7w8a43zhbmvasfjjb962yzd";
+ rev = "fd037efae08628e41480e9dad705dcc1f64e498d";
+ sha256 = "06scz0d3jzgbr919lkjjfq9x1dyr5nqkhblvfpyk5bdp8l6j06d6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flycheck-ycmd";
@@ -24940,12 +25016,12 @@
flymake-coffee = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
melpaBuild {
pname = "flymake-coffee";
- version = "20140809.324";
+ version = "20170722.1846";
src = fetchFromGitHub {
owner = "purcell";
repo = "flymake-coffee";
- rev = "325ab379592fdf9017d7c19625c7a978f6f3af3b";
- sha256 = "10i0rbvk6vyifgbgskdyspmw9q64x99fzi8i1h8bgv58xhfx6pm7";
+ rev = "dee295acf30820ed15fe0de17137d50bc27fc80c";
+ sha256 = "0706jbi3jcmffxmcpvh8w3007q8sh48kgrcjip5c9hhfqpagayld";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/flymake-coffee";
@@ -24982,12 +25058,12 @@
flymake-css = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
melpaBuild {
pname = "flymake-css";
- version = "20121104.1104";
+ version = "20170722.1846";
src = fetchFromGitHub {
owner = "purcell";
repo = "flymake-css";
- rev = "4649fc209836498d709bb627e8aa6e50189a06ec";
- sha256 = "00cnz3snhs44aknq6wmf19hq9bzb5pj0hvfzz93l6n7ngd8vvpzy";
+ rev = "de090163ba289910ceeb61b13368ce42d0f2dfd8";
+ sha256 = "18rqzah8p7mqwkddaav1d4r146amvn8jppazvsvc5vs01syj83m9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/flymake-css";
@@ -25129,12 +25205,12 @@
flymake-haml = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
melpaBuild {
pname = "flymake-haml";
- version = "20130324.351";
+ version = "20170722.1846";
src = fetchFromGitHub {
owner = "purcell";
repo = "flymake-haml";
- rev = "3117d94ecad908710502e8def42dbae5748e9c1d";
- sha256 = "08rcsg76qdq2l6z8q339yw770kv1q657ywqvq6a20pxxz2158a8l";
+ rev = "22a81e8484734552d461e7ae7305664dc244447e";
+ sha256 = "0pgp2gl3wdwrzcik5b5csn4qp8iv6pc51brx8p7jrwn7bz4lkb82";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/flymake-haml";
@@ -25150,12 +25226,12 @@
flymake-haskell-multi = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
melpaBuild {
pname = "flymake-haskell-multi";
- version = "20130620.422";
+ version = "20170722.1846";
src = fetchFromGitHub {
owner = "purcell";
repo = "flymake-haskell-multi";
- rev = "6183620ffee429b33c886fffd6106b876245ea47";
- sha256 = "0hwcgas83wwhk0szwgw7abf70400knb8dfabknwv0qrcsk4gqffd";
+ rev = "b564a94312259885b1380272eb867bf52a164020";
+ sha256 = "1h21hy5fjwa5qxl31rq3jjp3wwkipdwaliq0ci184rw48kw51xjh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e879eca5eb11b2ae77ee2cb8d8150d85e9e93ebd/recipes/flymake-haskell-multi";
@@ -25171,12 +25247,12 @@
flymake-hlint = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
melpaBuild {
pname = "flymake-hlint";
- version = "20130309.145";
+ version = "20170722.1846";
src = fetchFromGitHub {
owner = "purcell";
repo = "flymake-hlint";
- rev = "fae0c16f938129fb933e4c4625287816e8e160f0";
- sha256 = "003fdrgxlyhs595ndcdzhmdkcpsf9bpw53hrlrrrh07qlnqxwrvp";
+ rev = "f910736b26784efc9a2fa29503f45c1f1dd0aa38";
+ sha256 = "157f2l6hllwl12h8f502rq2kl33s202k9bcyfy2cmnn6vhky1b8s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/17820f32d46e845cc44b237d0bfd5c2d898721de/recipes/flymake-hlint";
@@ -25213,12 +25289,12 @@
flymake-jslint = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
melpaBuild {
pname = "flymake-jslint";
- version = "20130613.202";
+ version = "20170722.1846";
src = fetchFromGitHub {
owner = "purcell";
repo = "flymake-jslint";
- rev = "68ca28a88cffdd317f50c712b09abd2ccda8d7bc";
- sha256 = "0y01albwwcnhj4pnpvcry0zw7z2g9py9q2p3sw5zhgw3g0v5p9ls";
+ rev = "8edb82be605542b0ef62d38d818adcdde335eecb";
+ sha256 = "0i6bqpbibsbqhpqfy9zl0awiqkmddi3q8xlrslcjd429f0g5f1ad";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/flymake-jslint";
@@ -25234,12 +25310,12 @@
flymake-json = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
melpaBuild {
pname = "flymake-json";
- version = "20130423.2357";
+ version = "20170722.1846";
src = fetchFromGitHub {
owner = "purcell";
repo = "flymake-json";
- rev = "36084b67830bdc6c226115ea8287ea88d14b05dd";
- sha256 = "1qn15pr7c07fmki484z5xpqyn8546qb5dr9gcp5n1172wnh2a534";
+ rev = "d43e62fab69c4c39f54f1057c9801a3e645de619";
+ sha256 = "1zlhxl7x754p4bxipklvz0gjqlwg9c8fiyv7rxdkfaxdzpf9a6zm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/acb0a4d29159aa6d74f754911f63152dac3425bd/recipes/flymake-json";
@@ -25318,12 +25394,12 @@
flymake-php = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
melpaBuild {
pname = "flymake-php";
- version = "20121104.1102";
+ version = "20170722.1846";
src = fetchFromGitHub {
owner = "purcell";
repo = "flymake-php";
- rev = "93abe12d62b13f1d035a0df01e53e4bacdac2c66";
- sha256 = "09mibjdji5mf3qvngspv1zmik1zd9jwp4mb4c1w4256202359sf4";
+ rev = "c045d01e002ba5e09b05f40e25bf5068d02126bc";
+ sha256 = "03fk8kzlwbs9k91ra91r7djxlpv5mhbha33dnyz50sqwa52cg8ck";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/flymake-php";
@@ -25360,12 +25436,12 @@
flymake-puppet = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
melpaBuild {
pname = "flymake-puppet";
- version = "20141006.1855";
+ version = "20170731.2254";
src = fetchFromGitHub {
owner = "benprew";
repo = "flymake-puppet";
- rev = "fc4cd25aeac37ed5722bc586d5350fd06ee3067c";
- sha256 = "1r3yjqxig2j7l50l787qsi96mkvjcgqll9vb4ci51j7b43d53c5m";
+ rev = "9579e5c736cb890195464fabf51df113313de88d";
+ sha256 = "1bk16l8rbvrwmcd0zd2yg8xmfn7b036716niy21wfizmar0pk7p7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/302dbe34e7949da9c65e9c7bf2ab924db91b968f/recipes/flymake-puppet";
@@ -25381,12 +25457,12 @@
flymake-python-pyflakes = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
melpaBuild {
pname = "flymake-python-pyflakes";
- version = "20131127.6";
+ version = "20170722.1846";
src = fetchFromGitHub {
owner = "purcell";
repo = "flymake-python-pyflakes";
- rev = "f09ec573d7580a69f8bd49778c26da9ab6d5ec5a";
- sha256 = "1aijapvpw4skfhfmz09v5kpaxay6b0bp77bbjkrvgyizsqdd39vp";
+ rev = "1d65c26bf65a5dcbd29fcd967e2feb90e1e7a33d";
+ sha256 = "0hsvw6rxg3k1ymrav0bf5q3siqr9v2jp4c4h1f98szrj2lp200fm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/49091c0eca4158b80269b6ff5f7f3fc8e981420b/recipes/flymake-python-pyflakes";
@@ -25402,12 +25478,12 @@
flymake-ruby = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
melpaBuild {
pname = "flymake-ruby";
- version = "20121104.1059";
+ version = "20170722.1846";
src = fetchFromGitHub {
owner = "purcell";
repo = "flymake-ruby";
- rev = "8dc4ca44ec2acfaab25f5501fca1bd687fae94f2";
- sha256 = "13yk9cncp3zw6d7zkgdpgprpw6wrirk2gxgjvkr15dwcyx1g3109";
+ rev = "6c320c6fb686c5223bf975cc35178ad6b195e073";
+ sha256 = "0hzyxhg6y1rknvgj2ycivwrlrw7fznw9jrin5n9z627mzpjpfcnk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/flymake-ruby";
@@ -25423,12 +25499,12 @@
flymake-rust = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
melpaBuild {
pname = "flymake-rust";
- version = "20141004.1552";
+ version = "20170729.1439";
src = fetchFromGitHub {
owner = "jxs";
repo = "flymake-rust";
- rev = "72ec92c261670b7384ee2593d0f1946ea29f429a";
- sha256 = "1qxb3vhh83ikhmm89ms7irdip2l03hnjcq5ncmgywkaqkpslaacv";
+ rev = "2f42d1f2dad73ec9de460eda6176e3ab25c446f0";
+ sha256 = "02fgkv9hxwrv8n5h6izb5jyjcpazlf86pjjj4zkv1ycpa6gyzzwn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/flymake-rust";
@@ -25444,12 +25520,12 @@
flymake-sass = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
melpaBuild {
pname = "flymake-sass";
- version = "20140308.325";
+ version = "20170722.1846";
src = fetchFromGitHub {
owner = "purcell";
repo = "flymake-sass";
- rev = "748f13caa399c27c41ba797da9e214b814f5a30f";
- sha256 = "0rwjiplpqw3rrh76llnx2fn78f6avxsg0la5br46q1rgw4n8r1w1";
+ rev = "2de28148e92deb93bff3d55fe14e7c67ac476056";
+ sha256 = "05v83l05knqv2inharmhjvzmjskjlany7dnwp5dz44bvy0jhnm39";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/flymake-sass";
@@ -25465,12 +25541,12 @@
flymake-shell = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
melpaBuild {
pname = "flymake-shell";
- version = "20121104.1100";
+ version = "20170722.1846";
src = fetchFromGitHub {
owner = "purcell";
repo = "flymake-shell";
- rev = "ec097bd77db5523a04ceb15a128e01689d36fb90";
- sha256 = "0c2lz1p91yhprmlbmp0756d96yiy0w92zf0c9vlp0i9abvd0cvkc";
+ rev = "a16cf453056b9849cc7c912bb127fb0b08fc6dab";
+ sha256 = "1ki0zk5ijfkf4blavl62b55jnjzxw2b7blaxg51arpvvbflqmmlh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/flymake-shell";
@@ -25486,12 +25562,12 @@
flymake-solidity = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
melpaBuild {
pname = "flymake-solidity";
- version = "20160424.720";
+ version = "20170804.2344";
src = fetchFromGitHub {
owner = "kootenpv";
repo = "flymake-solidity";
- rev = "07f33ed52aac5d958fc0f50026a9bf111e1a5308";
- sha256 = "1rq47qhp3jdrw1n22cnhvhcxqzbi6v9r94kgf3200vrfp435rvkn";
+ rev = "48bfe9525f764d8a68cc0270905dbf45bfd00bb8";
+ sha256 = "0v8sf5m0mygqahjyadxgffdf7p59wb0qnghyxajhc69sbg58hnnd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3b13f57b77f6648336a049a8dda37757d4dafd90/recipes/flymake-solidity";
@@ -26072,12 +26148,12 @@
foreman-mode = callPackage ({ dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "foreman-mode";
- version = "20160520.737";
+ version = "20170725.722";
src = fetchFromGitHub {
owner = "zweifisch";
repo = "foreman-mode";
- rev = "bc6e2aca5a66847b13200b85172f7d7a36807d32";
- sha256 = "0pp68kqg2impar6rhlpifixx0lqgkcrj6ncjn5jlids6vfhq23nd";
+ rev = "22b3bb13134b617870ed1e888af739f4818be929";
+ sha256 = "01qanhif24czcmhpdfkcjs019ss4r79f7y2wfbzmj6w4z7g3rikk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/edeeb2b52ac70f8bdad38d3af62a7e434853c504/recipes/foreman-mode";
@@ -26219,12 +26295,12 @@
fountain-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fountain-mode";
- version = "20161207.141";
+ version = "20170728.507";
src = fetchFromGitHub {
owner = "rnkn";
repo = "fountain-mode";
- rev = "37289bb68f01dd49b1192032ade6b0741d024a54";
- sha256 = "06bqnyx2h0ypyxy5vxrh3v75qqfcmfgx31xkip7w6sj6pbfc8dq5";
+ rev = "be10ce90ede2d76b67abb5eff9c09294fe189f1e";
+ sha256 = "17zipwazcqqbbsb7p9j2jcid2m0knlah56vbw71yxqb3qbpq7fcz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/913386ac8d5049d37154da3ab32bde408a226511/recipes/fountain-mode";
@@ -26261,10 +26337,10 @@
frame-cmds = callPackage ({ fetchurl, frame-fns, lib, melpaBuild }:
melpaBuild {
pname = "frame-cmds";
- version = "20170506.945";
+ version = "20170819.1358";
src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/frame-cmds.el?revision=93";
- sha256 = "1ax9hcrhhwll4m4xi0dvsv4q498cngq5xzib6n2ka706fmnjj0rj";
+ url = "https://www.emacswiki.org/emacs/download/frame-cmds.el?revision=95";
+ sha256 = "169g11vs3d5gr8y1lwg7lgl21dpfca33m1c6w24mfmga4xr9042w";
name = "frame-cmds.el";
};
recipeFile = fetchurl {
@@ -26358,22 +26434,22 @@
license = lib.licenses.free;
};
}) {};
- frames-only-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
+ frames-only-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "frames-only-mode";
- version = "20170129.120";
+ version = "20170802.455";
src = fetchFromGitHub {
owner = "davidshepherd7";
repo = "frames-only-mode";
- rev = "5a2947d797a5d6f74d3a9c97f8c0ab6cff115b28";
- sha256 = "0y0sdjixaxvywrlp2sw51wnczhk51q1svl5aghbk9rkxpwv9ys9v";
+ rev = "dbe2725846ab9d90b309fe0f5e303e600a7d1661";
+ sha256 = "0c6xq2l9hzw2gavnwzwp5gg7nzvf7dl1x8qh7aabchd4a8c050rb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e628416ad9420b3ac5bbfacf930a86d98958ac8/recipes/frames-only-mode";
sha256 = "17p04l16ghz9kk096xk37yjpi4rmla86gp7c8ysjf6q6nyh0608h";
name = "frames-only-mode";
};
- packageRequires = [ emacs seq ];
+ packageRequires = [ dash emacs s ];
meta = {
homepage = "https://melpa.org/#/frames-only-mode";
license = lib.licenses.free;
@@ -26400,6 +26476,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";
@@ -26516,12 +26613,12 @@
fstar-mode = callPackage ({ company, company-quickhelp, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, quick-peek, yasnippet }:
melpaBuild {
pname = "fstar-mode";
- version = "20170531.1958";
+ version = "20170824.31";
src = fetchFromGitHub {
owner = "FStarLang";
repo = "fstar-mode.el";
- rev = "c9a9d722848dfc3f37ac9e0e91603340e5f5df1e";
- sha256 = "0faf8796vvfi2g4kmh7xsnc08m3iyldgcivslq0xy86ndh682f06";
+ rev = "9ffad30f11e97aeec4c8dcd353da8e14f1d3a9f3";
+ sha256 = "15ij1i4a0g7vmb312cdsq70i76accijrjha6lr8bq9a4r167axcr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c58ace42342c3d3ff5a56d86a16206f2ecb45f77/recipes/fstar-mode";
@@ -26542,18 +26639,19 @@
license = lib.licenses.free;
};
}) {};
- fuel = callPackage ({ cl-lib ? null, emacs, fetchgit, fetchurl, lib, melpaBuild }:
+ fuel = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fuel";
- version = "20170709.139";
- src = fetchgit {
- url = "git://factorcode.org/git/factor.git";
- rev = "9adddfc5e5666febc2f98b230e4a7d2b4c02ce0b";
- sha256 = "1ya7ghnclgcwha2cgi37z627q257xxd8c3igfl12k22ix4l5wr37";
+ version = "20170805.2030";
+ src = fetchFromGitHub {
+ owner = "factor";
+ repo = "factor";
+ rev = "705e7018c824e8160ecd8f0e81117dbebf6e90a0";
+ sha256 = "16j855qg046q8p8dbsry1nr4ljfn90wk36yqrbcklb93m1g0f9ny";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel";
- sha256 = "0m24p2788r4xzm56hm9kmpzcskwh82vgbs3hqfb9xygpl4isp756";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/fuel";
+ sha256 = "08hzzg5dhqkl5c5lfhwcwmx8m8z3k1nxshn2wlpqf5gch8f2nj6z";
name = "fuel";
};
packageRequires = [ cl-lib emacs ];
@@ -26607,12 +26705,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";
@@ -26625,22 +26723,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 = "20170303.515";
+ version = "20170822.1002";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "function-args";
- rev = "a559041e5fed851c889bcfed7553a4dcd855ffae";
- sha256 = "0cc9djbsr3i5w9zsiblk1f9y45czkiwjmn32kzf3fni4rxwvc8xk";
+ rev = "f4d2d1692f38f5acf6d209610371e008856357b5";
+ sha256 = "1s5ajgig4na5mvymbxk4ncs6nfa8qirzgkp15x8rjx5kj1m22rxa";
};
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;
@@ -26674,8 +26772,8 @@
src = fetchFromGitHub {
owner = "HIPERFIT";
repo = "futhark";
- rev = "dbc4ae1b8c977435d5369b18e1b624a62f8e8b13";
- sha256 = "0h7244567anfrfm2wpkvy0g6bnczisv03rz2ipr35pqm3gf7hyh8";
+ rev = "d4a741d1e87123c1691c3fcf9842895ba7d692f6";
+ sha256 = "1zvk5mp1hk6lq0bmisl3nzmqclm00qjr74j3zl66q56sxn4sgxwf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode";
@@ -26792,12 +26890,12 @@
fxrd-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "fxrd-mode";
- version = "20170125.228";
+ version = "20170728.1101";
src = fetchFromGitHub {
owner = "msherry";
repo = "fxrd-mode";
- rev = "8a1a0d5a08527ec8dee9bbe135803ed7ad297d9d";
- sha256 = "1yzw0fnlqilpx4xl84hpr75l86y9iiqyh13r1hskmwb79s2niw1m";
+ rev = "18a603474abb5a786a8d9f20c283d5f7beed3540";
+ sha256 = "1yprlpxxh7bbxg8filgb00lqqlavbz03h7hqf4280aiypkwi0y86";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/796eb6b2126ec616c0de6af6abb7598900557c12/recipes/fxrd-mode";
@@ -26834,12 +26932,12 @@
fzf = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "fzf";
- version = "20170527.2120";
+ version = "20170908.945";
src = fetchFromGitHub {
owner = "bling";
repo = "fzf.el";
- rev = "8d75f98cf904c3ab62e8cc54f2b8701c215620d7";
- sha256 = "1rr0d937j078xyhlx5i305l5wavd3fcmvfqmdnbfwah8mfnp4kip";
+ rev = "cbcc56c372ec2d907c690a05cb420a4bf643c355";
+ sha256 = "046hwfnn787c7q5y2pvqxzs5a67my2zmbg5l5rnw1g9swhfh9rfw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1671e17c99ef1932c6a2e83fc4fa2e4eb6674bc8/recipes/fzf";
@@ -26899,11 +26997,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";
};
@@ -26937,12 +27035,12 @@
geben = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "geben";
- version = "20170620.2012";
+ version = "20170801.551";
src = fetchFromGitHub {
owner = "ahungry";
repo = "geben";
- rev = "003abd23a7468daa133dfbc7ef85d0d61a0410dc";
- sha256 = "15ck23xv3dz9i4w5xd9lkg0c6rlsyxdz465xrpkr77fq9qw0c4dg";
+ rev = "ec3f5e9376cf1ea5615990bd8c212543d57f033b";
+ sha256 = "0860nnarbm76jp40v7p5d2wdnq12p03paiw17g3h5p27wnaj611d";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6f8648609e160f7dcefe4a963e8b00475f2fff78/recipes/geben";
@@ -27000,12 +27098,12 @@
geiser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "geiser";
- version = "20170704.1044";
+ version = "20170827.1755";
src = fetchFromGitHub {
owner = "jaor";
repo = "geiser";
- rev = "49a9e902e404d030e4b4ad22f75548a1b855a8fd";
- sha256 = "0xf0y4qp2cf3zzx8azh8jz4qpqdgp67y445sk8v9g55ns118hv77";
+ rev = "9581e61f9d8839281fe42344dd5fe885ea7359ea";
+ sha256 = "0nx86pzncab0b7700m8sc7k3nzml4v9frrq77lljjcjhw71gnvnn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b0fe32d24cedd5307b4cccfb08a7095d81d639a0/recipes/geiser";
@@ -27126,12 +27224,12 @@
ggtags = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ggtags";
- version = "20170711.1806";
+ version = "20170827.510";
src = fetchFromGitHub {
owner = "leoliu";
repo = "ggtags";
- rev = "8579025b9b89c53221c6c608b92a85734ffb0116";
- sha256 = "1fr12adssldynjayylqck85nnlcjx6pf15vp0hhvdnl689imbg3l";
+ rev = "9d1ecf961dd964cbe8ea183eac23572bb4f8f4ee";
+ sha256 = "1iy7n39kjl8n5qhs2vc9vszq3ff8h883zd380d3g7zs9nw0xx7jf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b158bb1bc2fbe3de61a6b21174eac7b1457edda2/recipes/ggtags";
@@ -27193,8 +27291,8 @@
src = fetchFromGitHub {
owner = "DanielG";
repo = "ghc-mod";
- rev = "d867cd0fee3fdb4e93440d96506c522de743aec6";
- sha256 = "0k615c7fvabs2y28kf0w3j8y3chqsbcdizv5z9jyf3519svb5sxn";
+ rev = "0d13786a4cc413cf12de0ace9ba6f43ddd7a032b";
+ sha256 = "1i6xjnkhkx406lia4f8qgyn27x20ridxkd4199wmdlf2w44fvpac";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ghc";
@@ -27256,8 +27354,8 @@
src = fetchFromGitHub {
owner = "candera";
repo = "gherkin-mode";
- rev = "d84a2977a536f2f8bf4836aebc33a4e86925673d";
- sha256 = "0lcbyw6yrl6c8py5v2hqghcbsf9cbiplzil90al4lwqps7rw09a8";
+ rev = "ff9e47350c5ba319feb6b87fe20695519681fa64";
+ sha256 = "0dbdms3ddsfhscwy7jj0cfpn3jdxnzynrfz5jps2l91adx2g011y";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/82d80becedead8db441eed6f7856ca64d78815e2/recipes/gherkin-mode";
@@ -27270,27 +27368,6 @@
license = lib.licenses.free;
};
}) {};
- ghost-blog = callPackage ({ fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }:
- melpaBuild {
- pname = "ghost-blog";
- version = "20160526.257";
- src = fetchFromGitHub {
- owner = "javaguirre";
- repo = "ghost-blog-emacs";
- rev = "d4e66d114ff7b846b967af4cff64dcafa381ead3";
- sha256 = "174swf066vcf99g38c9x5lxp14fyh59cy9lriywhm6hk7mcaakng";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ghost-blog";
- sha256 = "0289hgvrx96bfpvpbidwi2761kmscg5nzny7g5gxmy3xzzm9bqkj";
- name = "ghost-blog";
- };
- packageRequires = [ markdown-mode ];
- meta = {
- homepage = "https://melpa.org/#/ghost-blog";
- license = lib.licenses.free;
- };
- }) {};
ghq = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ghq";
@@ -27315,16 +27392,16 @@
ghub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ghub";
- version = "20170702.512";
+ version = "20170803.601";
src = fetchFromGitHub {
- owner = "tarsius";
+ owner = "magit";
repo = "ghub";
- rev = "16c3300bb5d82b141aefa94c47ad9f97a58b0011";
- sha256 = "1w1cqz32rx4i4hcjkz2znlchp5h4xg74znm9819k4anlf635lshd";
+ rev = "7c52e9063ad10f76d45d816a92c65cf1f6c7b9af";
+ sha256 = "1iynfqza146mnkvsgfjnfmja4m42m71s0nw015iks428nzrrkf1j";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/9375cbae3ffe5bf4ba5606358860050f3005d9b7/recipes/ghub";
- sha256 = "01kzziqv5y798rps52w45kkdcn0shhb6mrina2iawab4rlvlmnd8";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/d5db83957187c9b65f697eba7e4c3320567cf4ab/recipes/ghub";
+ sha256 = "15kjyi8ialpr1zjqvw68w9pa5sigcwy2szq21yvcy295z7ylzy4i";
name = "ghub";
};
packageRequires = [ emacs ];
@@ -27336,12 +27413,12 @@
ghub-plus = callPackage ({ apiwrap, emacs, fetchFromGitHub, fetchurl, ghub, lib, melpaBuild }:
melpaBuild {
pname = "ghub-plus";
- version = "20170517.1445";
+ version = "20170819.1806";
src = fetchFromGitHub {
owner = "vermiculus";
repo = "ghub-plus";
- rev = "07bd117a77d2f2de88facfa18b839c5c8bd5a423";
- sha256 = "04k3xvs33vv3g01ah16bc4l6f3ym4w16i9bk5q2s4f1xh4lad3jn";
+ rev = "d6ee1158676f6fb62601fc20f02f4cbb7f090085";
+ sha256 = "1r4zm1frbm2dwsnrfnsghfplxj81grwhhyjc421kjnfavkkflxnq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/03a412fd25218ff6f302734e078a699ff0234e36/recipes/ghub+";
@@ -27357,12 +27434,12 @@
gift-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "gift-mode";
- version = "20170603.906";
+ version = "20170809.130";
src = fetchFromGitHub {
owner = "csrhodes";
repo = "gift-mode";
- rev = "0d6adae976ee0831877d4bf237090ff67fb76e1d";
- sha256 = "1ld367qvyn7700mry24j4ywmanaknpwgfmq18h72sn408z9vsalc";
+ rev = "573e4a8001e9585d347a99323a1649c2055ae5ff";
+ sha256 = "0qhhgwhj5nghlq5nrz7ycy2y5s1q10xzsahlh41fm5givm0rb650";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c4c9081a60bdbf4e5fe1ccc4809c0f6f396d11e4/recipes/gift-mode";
@@ -27424,8 +27501,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";
@@ -27525,12 +27602,12 @@
git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }:
melpaBuild {
pname = "git-commit";
- version = "20170609.2310";
+ version = "20170913.343";
src = fetchFromGitHub {
owner = "magit";
repo = "magit";
- rev = "33201f76c27d21e91c2137aa5f19db18b2adb2e5";
- sha256 = "0749yvycd66ddg1wzzyzv8d2z6rxhlrizn83q0gm1zbz296s7rkb";
+ rev = "ae72710292a94d9af92799d3ddeb86f365f34a56";
+ sha256 = "1344dcngdk899xi9wjipvngq50xggbv06fb1w09zjzs8ckpsh8gf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
@@ -28008,12 +28085,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";
@@ -28110,6 +28187,27 @@
license = lib.licenses.free;
};
}) {};
+ gitpatch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "gitpatch";
+ version = "20170721.2110";
+ src = fetchFromGitHub {
+ owner = "tumashu";
+ repo = "gitpatch";
+ rev = "577d5adf65c8133caa325c10e89e1e2fc323c907";
+ sha256 = "1jj12pjwza6cq8a3kr8nqnmm3vxs0wam8h983irry4xr4ifywsn4";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e1746d87f65dc4b0d8f47c7d6ba4c7e0dfa35953/recipes/gitpatch";
+ sha256 = "0qaswkk06z24v40nkjkv7f6gfv0dlsjd6wchkn0ppqw95883vhv1";
+ name = "gitpatch";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/gitpatch";
+ license = lib.licenses.free;
+ };
+ }) {};
gitter = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
melpaBuild {
pname = "gitter";
@@ -28327,8 +28425,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";
@@ -28365,12 +28463,12 @@
gnuplot-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "gnuplot-mode";
- version = "20151122.2339";
+ version = "20170727.1339";
src = fetchFromGitHub {
owner = "mkmcc";
repo = "gnuplot-mode";
- rev = "296ff8d263513cdfb8e85b06e2441c751565b793";
- sha256 = "1pss9a60dh6i277pkp8j5g1v5h7qlh11w2fki50qcp0zglyw1kaq";
+ rev = "eafa9395771a5ceace503cf5922efac1df0f5ec5";
+ sha256 = "03799c7gwblpwpinbahbp5l510lg6yi85cmpsahsncfvkwirp2rm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d801a2e0ba5ae7c65b5d312fbf41261278a8b1ba/recipes/gnuplot-mode";
@@ -28425,6 +28523,27 @@
license = lib.licenses.free;
};
}) {};
+ gnus-select-account = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "gnus-select-account";
+ version = "20170721.2211";
+ src = fetchFromGitHub {
+ owner = "tumashu";
+ repo = "gnus-select-account";
+ rev = "ddc8c135eeaf90f5b6692a033af2badae36e68ce";
+ sha256 = "0csq8cqv028g3mrvk88l0nlj3dk5fh67c10hdjwvxbf7winv0391";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e1746d87f65dc4b0d8f47c7d6ba4c7e0dfa35953/recipes/gnus-select-account";
+ sha256 = "1yini6kif7vp5msmhnnpfkab5m5px8y4wgvc0f0k79kdd17gvpsx";
+ name = "gnus-select-account";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/gnus-select-account";
+ license = lib.licenses.free;
+ };
+ }) {};
gnus-spotlight = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
pname = "gnus-spotlight";
version = "20130901.735";
@@ -28535,8 +28654,8 @@
src = fetchFromGitHub {
owner = "nsf";
repo = "gocode";
- rev = "f1eef9a6ba005abb145d7b58fdd225e83a3c6a05";
- sha256 = "1hkr46ikrprx203i2yr6xds1bzxggblh7bg026m2cda6dxgpnsgw";
+ rev = "c7fddb39ecbc9ebd1ebe7d2a3af473ed0fffffa1";
+ sha256 = "0qx8pq38faig41xkl1a4hrgp3ziyjyn6g53vn5wj7cdgm5kk67nb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/go-autocomplete";
@@ -28678,12 +28797,12 @@
go-guru = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
melpaBuild {
pname = "go-guru";
- version = "20170501.1058";
+ version = "20170718.1046";
src = fetchFromGitHub {
owner = "dominikh";
repo = "go-mode.el";
- rev = "bfe7a14e9bf957d050e3c429156e697bb3670f21";
- sha256 = "1w4bwwvpfiw84cr6fxbgl2j8shd9i1lzsfbvvq16cm4dd0q23snn";
+ rev = "99b06da201afb91e8db0c525c0f3c3590fd92fa6";
+ sha256 = "0ss6fpjnz3h3g4d1rjv50sknzr112c2r5zwzy2aqp7sw24cz10r2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-guru";
@@ -28720,12 +28839,12 @@
go-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "go-mode";
- version = "20170308.1512";
+ version = "20170726.555";
src = fetchFromGitHub {
owner = "dominikh";
repo = "go-mode.el";
- rev = "bfe7a14e9bf957d050e3c429156e697bb3670f21";
- sha256 = "1w4bwwvpfiw84cr6fxbgl2j8shd9i1lzsfbvvq16cm4dd0q23snn";
+ rev = "99b06da201afb91e8db0c525c0f3c3590fd92fa6";
+ sha256 = "0ss6fpjnz3h3g4d1rjv50sknzr112c2r5zwzy2aqp7sw24cz10r2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-mode";
@@ -28808,8 +28927,8 @@
src = fetchFromGitHub {
owner = "dominikh";
repo = "go-mode.el";
- rev = "bfe7a14e9bf957d050e3c429156e697bb3670f21";
- sha256 = "1w4bwwvpfiw84cr6fxbgl2j8shd9i1lzsfbvvq16cm4dd0q23snn";
+ rev = "99b06da201afb91e8db0c525c0f3c3590fd92fa6";
+ sha256 = "0ss6fpjnz3h3g4d1rjv50sknzr112c2r5zwzy2aqp7sw24cz10r2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d806abe90da9a8951fdb0c31e2167bde13183c5c/recipes/go-rename";
@@ -28846,12 +28965,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";
@@ -29081,8 +29200,8 @@
src = fetchFromGitHub {
owner = "google";
repo = "styleguide";
- rev = "d75bd35c8fd1c32aab86ea47e7ef4d3c776faa0a";
- sha256 = "0s1q9qw6azzbzr7k4c58m6d83cbz3srn63mi73jlh5fmad1w8g4p";
+ rev = "520cd9f88cc4bb6fa47345d566fffd8dd95c7450";
+ sha256 = "1xghwnjl2wi78bcn4nhjdxhann18r1nczq47yia2rxl0yg61wwxk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/google-c-style";
@@ -29140,12 +29259,12 @@
google-this = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "google-this";
- version = "20160710.1720";
+ version = "20170810.515";
src = fetchFromGitHub {
owner = "Malabarba";
repo = "emacs-google-this";
- rev = "4713c93d4c45458a7320b5e2af9b1edd43fd5e0b";
- sha256 = "0q8d10ihvqvnbp7gn19ixgi37cvpgyc5a8ls9nkr6w7valc4c0rz";
+ rev = "8a2e3ca5da6a8c89bfe99a21486c6c7db125dc84";
+ sha256 = "1dbra309w8awmi0g0pp7r2dm9nwrj2j9lpl7md8wa89rnzazwahl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/google-this";
@@ -29221,22 +29340,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;
@@ -29245,12 +29364,12 @@
gotest = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild, s }:
melpaBuild {
pname = "gotest";
- version = "20170522.53";
+ version = "20170823.141";
src = fetchFromGitHub {
owner = "nlamirault";
repo = "gotest.el";
- rev = "c15bdcb78a46167e7a3fbaf5f71cbeddf2f13b78";
- sha256 = "0pzzcjc41k3by534ii11jxfind4fq1cv3pqa3scisv4pvyj6lha6";
+ rev = "8a5ef7363f83edb3b77c5e23876f13dd8c23b2b9";
+ sha256 = "1ksi37kmy9mnrjr5lf9f0ga5nvi3r2kc85g6yvdfj0mbsjm1pnp7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0670b42c0c998daa7bf01080757976ac3589ec06/recipes/gotest";
@@ -29266,12 +29385,12 @@
gotham-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "gotham-theme";
- version = "20170521.417";
+ version = "20170822.1030";
src = fetchFromGitHub {
owner = "wasamasa";
repo = "gotham-theme";
- rev = "df428b477eb84f2ccd791c4310587cfd72644692";
- sha256 = "0ph5h08cx61nh70hafmnqzdcxb799fss0pl2d36hhimkf866zvln";
+ rev = "417d61978d139cb5d089c5365fc8d3166d76d3ac";
+ sha256 = "0rc40cfj2mby1q7bk1pp1fxdi72nh9ip80spjdm1csvjjc4dbkwr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4b388de872be397864a1217a330ba80437c287c0/recipes/gotham-theme";
@@ -29348,12 +29467,12 @@
govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }:
melpaBuild {
pname = "govc";
- version = "20170629.1129";
+ version = "20170801.942";
src = fetchFromGitHub {
owner = "vmware";
repo = "govmomi";
- rev = "0b533caa1ca0c4412748bde65753fa8c55ba4511";
- sha256 = "14lkhny4s6kmybx7w9hi11bnyvg7imyxnirdk28rb19krj2n7b36";
+ rev = "17b8c9ccb7f8c7b015d44c4ea39305c970a7bf31";
+ sha256 = "0g1vd8g6kbmz5ni0hdqg4yjlisf1lcxnfhrzcnwim5pw8zj549k2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc";
@@ -29369,12 +29488,12 @@
govet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "govet";
- version = "20150428.1159";
+ version = "20170808.1024";
src = fetchFromGitHub {
owner = "meshelton";
repo = "govet";
- rev = "736f11850f2d1d62bd417fb57d4f8bb55a176b70";
- sha256 = "1fzf43my7qs4n37yh1jm6fyp76dfgknc5g4zin7x5b5lc63g0wxb";
+ rev = "1c05817cf8b96589076c7ac4e52ee58a860a0cbf";
+ sha256 = "1n223i87xmk8p8h8dswnhhvazy0z53dzl36gmk9y7ck8bd9vz706";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7e4a5f5031c76056d8f1b64b27a39a512c7c59cd/recipes/govet";
@@ -29390,12 +29509,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";
@@ -29478,8 +29597,8 @@
src = fetchFromGitHub {
owner = "Groovy-Emacs-Modes";
repo = "groovy-emacs-modes";
- rev = "1ddbda527268b33f506b50254234fec9bfdcbc9c";
- sha256 = "0qm73a87cydffyqkvjv34k7yss010czl861dhf3cnabvsz0bsp7v";
+ rev = "36cd834c9fb1e438dfae4ad15a3580c963dba29f";
+ sha256 = "0rkxchxjgpgbhng15knwxfv0bcysdbc6nlh61x8z793aj2m0whi9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode";
@@ -29534,15 +29653,15 @@
license = lib.licenses.free;
};
}) {};
- graphene = callPackage ({ company, dash, exec-path-from-shell, fetchFromGitHub, fetchurl, flycheck, graphene-meta-theme, ido-ubiquitous, lib, melpaBuild, ppd-sr-speedbar, smartparens, smex, sr-speedbar, web-mode }:
+ graphene = callPackage ({ company, dash, exec-path-from-shell, fetchFromGitHub, fetchurl, flycheck, graphene-meta-theme, ido-completing-read-plus, lib, melpaBuild, ppd-sr-speedbar, smartparens, smex, sr-speedbar, web-mode }:
melpaBuild {
pname = "graphene";
- version = "20161120.938";
+ version = "20170810.640";
src = fetchFromGitHub {
owner = "rdallasgray";
repo = "graphene";
- rev = "bf77248e49b116a241bd5856df918ed63f89e195";
- sha256 = "1rn498l25vjy1wg45iskry8hh2afvd09cmg8dxppphjislw9pwch";
+ rev = "89bbdaa465b3440f46f588664eada0f091ed6bfe";
+ sha256 = "1xrk26v9d3njydwab7drqg4p3qd8rw2diicfr7bfwd0d21bs5ykz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0206d6adcb7855c2174c3cd506b71c21def1209b/recipes/graphene";
@@ -29555,7 +29674,7 @@
exec-path-from-shell
flycheck
graphene-meta-theme
- ido-ubiquitous
+ ido-completing-read-plus
ppd-sr-speedbar
smartparens
smex
@@ -29671,6 +29790,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 = "20170828.1056";
+ src = fetchFromGitHub {
+ owner = "fredcamps";
+ repo = "green-is-the-new-black-emacs";
+ rev = "2b1011836fc04940d542e9a783b99670a08b308b";
+ sha256 = "16v7l4ynj4p1hq243rqckfgppmj8cvm0lyybjjqaqblqjd1ki90d";
+ };
+ 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";
@@ -29695,12 +29835,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";
@@ -29838,12 +29978,12 @@
groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "groovy-mode";
- version = "20170712.224";
+ version = "20170828.1026";
src = fetchFromGitHub {
owner = "Groovy-Emacs-Modes";
repo = "groovy-emacs-modes";
- rev = "1ddbda527268b33f506b50254234fec9bfdcbc9c";
- sha256 = "0qm73a87cydffyqkvjv34k7yss010czl861dhf3cnabvsz0bsp7v";
+ rev = "36cd834c9fb1e438dfae4ad15a3580c963dba29f";
+ sha256 = "0rkxchxjgpgbhng15knwxfv0bcysdbc6nlh61x8z793aj2m0whi9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode";
@@ -29859,12 +29999,12 @@
gruber-darker-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "gruber-darker-theme";
- version = "20170716.647";
+ version = "20170719.2229";
src = fetchFromGitHub {
owner = "rexim";
repo = "gruber-darker-theme";
- rev = "3e5d5d67f8b004db288d6c2e1a0b02c3844ab5c5";
- sha256 = "1az7fndm19wy8s3p6wxa0ps55amwmmpbschayzy3g3g26a4swcxi";
+ rev = "8e6bb26ce0abe20e6129ae8c8ad5c41e0832334e";
+ sha256 = "1dxlpyc4w6ys08ir2bivv9lhjpwfjlh3wczmr0r03pc1fqx0w2ap";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/87ade74553c04cb9dcfe16d03f263cc6f1fed046/recipes/gruber-darker-theme";
@@ -29901,12 +30041,12 @@
gruvbox-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "gruvbox-theme";
- version = "20170712.1607";
+ version = "20170828.144";
src = fetchFromGitHub {
owner = "Greduan";
repo = "emacs-theme-gruvbox";
- rev = "a3aafd33d9b027e6c0d5ef81ebb04a2bb8545cf2";
- sha256 = "1d9330yd2lch7yqlfvpv7gxyy00p4w9h6f0imn7bgj3y7wab20dw";
+ rev = "4e1c2616a31f33191daf20c0f9f744af5dd14468";
+ sha256 = "1cgc8amxbj1839zx6vhpk96r1iag8mwnkdzd4wj6xabb59lvbjld";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd48c87919f64ced9f3add4860751bb34cb5ecb/recipes/gruvbox-theme";
@@ -30048,12 +30188,12 @@
guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }:
melpaBuild {
pname = "guix";
- version = "20170702.724";
+ version = "20170902.1128";
src = fetchFromGitHub {
owner = "alezost";
repo = "guix.el";
- rev = "8d07a89736b72021b1a4739a0811f716a61b0b8f";
- sha256 = "0mjcjzsbqnc83ca3wg1wxsz63a864gmhflvx47p97gdg1snnz5fi";
+ rev = "54bd174b514c5de11e82c4263ac2723addb0fe87";
+ sha256 = "1i5kwzwlb6lx65rgixm8mbdi6x03n0hb4hbc7j76lar4j58ypwz2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix";
@@ -30069,12 +30209,12 @@
gulp-task-runner = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "gulp-task-runner";
- version = "20161103.1523";
+ version = "20170718.1341";
src = fetchFromGitHub {
owner = "NicolasPetton";
repo = "gulp-task-runner";
- rev = "f13da9e619c1838571df0a0462c273ed6e76defc";
- sha256 = "1xai81v7c58hy9rh63kxybzmlyfkv0m7qfdp7zia60ml5xhib31r";
+ rev = "877990e956b1d71e2d9c7c3e5a129ad199b9debb";
+ sha256 = "13qy4x4ap43qm5w2vrsy6w01z2s2kymfr9qvlj2yri4xk3r4vrps";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/34a2bede5ea70cf9df623c32e789d78205f9ebb0/recipes/gulp-task-runner";
@@ -30090,12 +30230,12 @@
guru-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "guru-mode";
- version = "20160415.1921";
+ version = "20170730.31";
src = fetchFromGitHub {
owner = "bbatsov";
repo = "guru-mode";
- rev = "81db5611dd29f2c3d9ea91fb7f086a2cf9847553";
- sha256 = "1jymhjjpn600svd5jbj42m3vnpaza838zby507ynbwc95nja29vs";
+ rev = "c180e05ebc1484764aad245c85b69de779826e4e";
+ sha256 = "0qb6yr6vbic0rh8ayrpbz5byq7jxmwm1fc9l4alpz7dhyb11z07v";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e60af6ccb902d8ef00cfecbb13cafebbe3b00d89/recipes/guru-mode";
@@ -30216,12 +30356,12 @@
hackernews = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
melpaBuild {
pname = "hackernews";
- version = "20160627.1651";
+ version = "20170829.1044";
src = fetchFromGitHub {
owner = "clarete";
repo = "hackernews.el";
- rev = "629fe18abbef6674821876ed089c4fa83b709d1b";
- sha256 = "1s3ybiifbszp7v3gznh9f78dzwb1smdq3hb8np9swjr2fzcshwl4";
+ rev = "62442f76a0936047b5f66457298811c4f724a4f5";
+ sha256 = "0pz3w726485yqww674ydrc3ffd0wrm9w0dgan0qyg3ggjj1fvjvs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c43a342e47e5ede468bcf51a60d4dea3926f51bd/recipes/hackernews";
@@ -30468,16 +30608,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 ];
@@ -30552,12 +30692,12 @@
haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "haskell-mode";
- version = "20170704.1445";
+ version = "20170907.903";
src = fetchFromGitHub {
owner = "haskell";
repo = "haskell-mode";
- rev = "00ca4d935e80707e18c17e40630ea9e36b39592c";
- sha256 = "049q8igjx4y9jancqv0bibd2jhz02llm1v6xfl9379v5p6nkfm3b";
+ rev = "9ced44c934e9d02dc41ab2f47686cc041f7ae5f5";
+ sha256 = "1j10irax6h67wz76zlbhkylmmn4qnb9padwld9fk43n98cismbix";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode";
@@ -30614,12 +30754,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 = "5a57a6401f6625640f46d8f8d540ecddf52bb12d";
- sha256 = "1262kddcn3jr758s6wv15q3bh8j160q4m8nz2pbv2prabg0csz5n";
+ rev = "65bf7bc3967cbda23789d6c505daf73eed9a43aa";
+ sha256 = "0r91hcm265xa8amdfi44pn0cqf4m9zigzqx1ldgg8qd6l9r2hbh7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e3f73e3df8476fa231d04211866671dd74911603/recipes/hasky-extensions";
@@ -30632,6 +30772,27 @@
license = lib.licenses.free;
};
}) {};
+ hasky-stack = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }:
+ melpaBuild {
+ pname = "hasky-stack";
+ version = "20170901.154";
+ src = fetchFromGitHub {
+ owner = "hasky-mode";
+ repo = "hasky-stack";
+ rev = "38a33e2ed02d57afb6b38bf36741f5bf7e38e45b";
+ sha256 = "03zg58hrka2q7sqm3f14xgcs2mjxhlyybkf9w6pp8icr4wdsih4z";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/c3faf544872478c3bccf2fe7dc51d406031e4d80/recipes/hasky-stack";
+ sha256 = "08ds0v5p829s47lbhibswnbn1aqfnwf6xx7p5bc5062wxdvqahw8";
+ name = "hasky-stack";
+ };
+ packageRequires = [ emacs f magit-popup ];
+ meta = {
+ homepage = "https://melpa.org/#/hasky-stack";
+ license = lib.licenses.free;
+ };
+ }) {};
haste = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
melpaBuild {
pname = "haste";
@@ -30821,12 +30982,12 @@
helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
melpaBuild {
pname = "helm";
- version = "20170714.3";
+ version = "20170912.523";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm";
- rev = "07f8f705f54506da537b1f615ee2e95e9033defb";
- sha256 = "0g7fn2aqwh0ynsridrmf8gs5bl09s7pwpwawgmbwdb7rzyvrl97c";
+ rev = "20fd1fdc80c05b1b2c03a9dd02f4a8358d2ed883";
+ sha256 = "08rli1i3k1kvv7bavdb9s1y333cldxla9v0k3g7x72lyqncl25pr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -30902,6 +31063,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";
@@ -30989,12 +31171,12 @@
helm-backup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
melpaBuild {
pname = "helm-backup";
- version = "20170625.328";
+ version = "20170807.1239";
src = fetchFromGitHub {
owner = "antham";
repo = "helm-backup";
- rev = "b6f930a370f6339988e79e0c85e9deee98c7b9f4";
- sha256 = "0cawlad5jy6kn2mg72ivjg3gs2h6g067h910xlbir01k9wlk3mfg";
+ rev = "3f39d296ddc77df758b812c50e3c267dd03db8bb";
+ sha256 = "05528ajhmvkc50i65wcb3bi1w4i3y1vvr56dvq6yp7cbyw9r7b8w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5e6eba7b201e91211e43c39e501f6066f0afeb8b/recipes/helm-backup";
@@ -31031,12 +31213,12 @@
helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }:
melpaBuild {
pname = "helm-bibtex";
- version = "20170321.1306";
+ version = "20170808.1124";
src = fetchFromGitHub {
owner = "tmalsburg";
repo = "helm-bibtex";
- rev = "13f27f3cfdf137bdb22addfc0c832ba1c8572c25";
- sha256 = "02b9hb7nmh75qwkmanw6ci6pyann71ag8mp4fd5agrlwq6rrlgl4";
+ rev = "8ed898fb5a68f18e9bb9973832a5c1f8abcfc463";
+ sha256 = "14lyx0vbqr97p3anzrsp7m3q0kqclyjcdwplpraim403fcklzbnz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex";
@@ -31140,8 +31322,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";
@@ -31199,12 +31381,12 @@
helm-charinfo = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-charinfo";
- version = "20170611.1746";
+ version = "20170810.531";
src = fetchFromGitHub {
owner = "mandoku";
repo = "helm-charinfo";
- rev = "a4902a90bd9f012468ad8186e2548c7814847613";
- sha256 = "024pqnw87whwa7zpld8bcz1izaymqk0vajhbf9m173hlfw6x7wmp";
+ rev = "91798a49dc115342a7e01e48b264e9a0bf5ea414";
+ sha256 = "1ifj6zz5k7qjalg06fvfc7rdmlha0n9hll2hiq7mrcj7lfac6jga";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6667774bba495c45703ef75261f1f14d89684e3a/recipes/helm-charinfo";
@@ -31430,12 +31612,12 @@
helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "helm-core";
- version = "20170717.520";
+ version = "20170906.141";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm";
- rev = "07f8f705f54506da537b1f615ee2e95e9033defb";
- sha256 = "0g7fn2aqwh0ynsridrmf8gs5bl09s7pwpwawgmbwdb7rzyvrl97c";
+ rev = "20fd1fdc80c05b1b2c03a9dd02f4a8358d2ed883";
+ sha256 = "08rli1i3k1kvv7bavdb9s1y333cldxla9v0k3g7x72lyqncl25pr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -31490,36 +31672,15 @@
license = lib.licenses.free;
};
}) {};
- helm-ctest = callPackage ({ dash, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, s }:
- melpaBuild {
- pname = "helm-ctest";
- version = "20150823.408";
- src = fetchFromGitHub {
- owner = "danlamanna";
- repo = "helm-ctest";
- rev = "973a138aa8ff4c6a1cd798779e8d0dd80522354d";
- sha256 = "18d96alik66nw3rkk7k8740b4rx2bnh3pwn27ahpgj5yf51wm0ry";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/03e17f3700cc531133990bc78ade09132f439664/recipes/helm-ctest";
- sha256 = "1mphc9fsclbw19p5i1xf52qg6ljljbajvbcsl95hisrnvhg89vpm";
- name = "helm-ctest";
- };
- packageRequires = [ dash helm-core s ];
- meta = {
- homepage = "https://melpa.org/#/helm-ctest";
- license = lib.licenses.free;
- };
- }) {};
helm-dash = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-dash";
- version = "20170531.135";
+ version = "20170913.345";
src = fetchFromGitHub {
owner = "areina";
repo = "helm-dash";
- rev = "9a230125a7a11f5fa90aa048b61abd95eb78ddfe";
- sha256 = "0xs3nq86qmvkiazn5w564npdgbcfjlnpw2f48g2jd43yznblz7ly";
+ rev = "3d215210191c61b775f7f63f3f5306ddfefc7e33";
+ sha256 = "1vnkvlyg6br0a5a002il4fr0r819kl7nsff6l1zbiay75sgnj93d";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-dash";
@@ -31602,8 +31763,8 @@
src = fetchFromGitHub {
owner = "masasam";
repo = "emacs-helm-directory";
- rev = "2c6d45404506ba744888dcdb65e9f63878f2da16";
- sha256 = "1a5j4zzn249jdm4kcri64x1dxazhhk7g5dmgnhflrnbrc2kdwm8h";
+ rev = "29f05c87046f9a04329f817e9d7489a290a2592a";
+ sha256 = "0dp9s5yicjn91mmrzb15hidf05c8lffpgk2sq23d9x6b9ddnlcl1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d0c066d6f285ab6d572dab4549781101547cb704/recipes/helm-directory";
@@ -32001,8 +32162,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";
@@ -32022,8 +32183,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";
@@ -32186,12 +32347,12 @@
helm-google = callPackage ({ fetchFromGitHub, fetchurl, google, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-google";
- version = "20170509.244";
+ version = "20170722.710";
src = fetchFromGitHub {
owner = "steckerhalter";
repo = "helm-google";
- rev = "b24de3240b2a46fdf6124e91aa4f684b2370454b";
- sha256 = "1w48ag2pd462hf238hkdl0i6csvchcsdf3021lnkdy41vwxj1rdg";
+ rev = "4530a375a46880d53e5d7e906028f71c040de946";
+ sha256 = "1xj3q6hyjcqbr3dglcba4impsdgb707zi9w7prpn1m735xhsis01";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/88ed6db7b53d1ac75c40d12c21de1dec6d717fbe/recipes/helm-google";
@@ -32270,12 +32431,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";
@@ -32540,6 +32701,27 @@
license = lib.licenses.free;
};
}) {};
+ helm-lastpass = callPackage ({ csv, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
+ melpaBuild {
+ pname = "helm-lastpass";
+ version = "20170808.511";
+ src = fetchFromGitHub {
+ owner = "xuchunyang";
+ repo = "helm-lastpass";
+ rev = "3d07a1d68586980ae33dd7f84be00eaace31f7d2";
+ sha256 = "1rn19hql62fgz1kiyxyw11h3h9m38nnhba9sghlrxj3wk11fm8gs";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/a39f1b0a5b22e91eb9e298949def6c29e7bc5755/recipes/helm-lastpass";
+ sha256 = "0zgq3szds5l3ah39wiacqcc1j0dlbhwm0cjx64j28jx93300kx57";
+ name = "helm-lastpass";
+ };
+ packageRequires = [ csv emacs helm-core ];
+ meta = {
+ homepage = "https://melpa.org/#/helm-lastpass";
+ license = lib.licenses.free;
+ };
+ }) {};
helm-lobsters = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-lobsters";
@@ -32547,8 +32729,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";
@@ -32564,11 +32746,11 @@
helm-ls-git = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-ls-git";
- version = "20170716.109";
+ version = "20170727.1238";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm-ls-git";
- rev = "47981a8d80e1d464a7cddde5a391b35626929f00";
+ rev = "d116bb96b6ea946f633ed7735fbf38a63e611a3a";
sha256 = "0z09qvb6yyz2vnxkcg6xhaawja1ynxfwzx5j2aqyiicwqbyf3kvg";
};
recipeFile = fetchurl {
@@ -32773,12 +32955,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";
@@ -32815,12 +32997,12 @@
helm-org-rifle = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
melpaBuild {
pname = "helm-org-rifle";
- version = "20170518.312";
+ version = "20170807.611";
src = fetchFromGitHub {
owner = "alphapapa";
repo = "helm-org-rifle";
- rev = "61adb8ec3af0b7b87b2f9245510dc8b014d026ed";
- sha256 = "05zqp6yifc87i22q0p37jl90cfyh5v1bq9ifhpkdy1rs3sgcmnif";
+ rev = "502ea1285b8ce858a3acbc39dd4f54ff1af5b7e3";
+ sha256 = "1j87fd9qv7pl7s52ksj7iy023lw76qy4mkgjc4w5rljvm5bdnrgp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle";
@@ -33130,12 +33312,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";
@@ -33319,12 +33501,12 @@
helm-rtags = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, rtags }:
melpaBuild {
pname = "helm-rtags";
- version = "20170522.2154";
+ version = "20170812.2111";
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "65c8f03ff0112ce5c5e11aff6867ad0eb9019e63";
- sha256 = "0xlacwjmvx5xd8m7yi8l8mqi0lqs2gr2hmjag2frvmxcn4cpb4gc";
+ rev = "2af4d6a32e8194f8fbcc23fd94395e3d595a3c25";
+ sha256 = "0091w529lvbjlw1fdb3qjgb8fd5fcwxhqyr4ps5cvxl5bqnwlw39";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags";
@@ -33676,12 +33858,12 @@
helm-w3m = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, w3m }:
melpaBuild {
pname = "helm-w3m";
- version = "20170710.1238";
+ version = "20170904.711";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm-w3m";
- rev = "0af89108183ac11dcf75be06fe23a60ae072463f";
- sha256 = "0cjnlml9k1ak26v5j7qghpk2yj4rs37jlkpbn1m5y1j8231m472j";
+ rev = "57b8b0d3cad39abd02fab569ddd1c96336bbbad5";
+ sha256 = "059jlyljlp5g7jh6bjdjd157l35apnwvxal1r18pipwfk1fcscxq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f683fc9c7990e9ecb8a94808a7d03eb90c5569b1/recipes/helm-w3m";
@@ -33760,16 +33942,16 @@
helm-xref = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-xref";
- version = "20170425.1440";
+ version = "20170822.1708";
src = fetchFromGitHub {
- owner = "brotzeitmacher";
+ owner = "brotzeit";
repo = "helm-xref";
- rev = "cd458044be2cec95f31f0ac318b0f80f4b92785b";
- sha256 = "0lx2xrkwrbzkbs26gwksdqpywcsfsi3d4g2mw1h8aabd12hnr4my";
+ 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 ];
@@ -33880,12 +34062,12 @@
helpful = callPackage ({ dash, elisp-refs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "helpful";
- version = "20170625.1441";
+ version = "20170910.1046";
src = fetchFromGitHub {
owner = "Wilfred";
repo = "helpful";
- rev = "da7d479c89090155996bf568bd89fa8a8859eac7";
- sha256 = "1vpfb6n1k7j8wmzsn3j2a8g2hf6lxc8jp77xgzi3kd0wwdyjmqg2";
+ rev = "62ede4c121c0a0a9917682f28adf746e21bbfa45";
+ sha256 = "1kp61f18l0ll9k1r72id2xgfdc857d5qhhh5pamp5ps6kjfpz6h6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful";
@@ -34191,8 +34373,8 @@
src = fetchFromGitHub {
owner = "DamienCassou";
repo = "hierarchy";
- rev = "3f5d0d932fb6d2152f4c269df10bcc435a5ac764";
- sha256 = "1qj2sf3x2bq54n0xqllis3abikjgbp18qn1i4vff5cs6n2an69cb";
+ rev = "98ba6d3d7744d536aee714e1284ffecfe8f590cc";
+ sha256 = "1y8jj0xgj6hqqshcfr406216bpni5sj0bh9q52ds9mn5plmh4asa";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7aea238a2d14e9f58c0474251984b6c617b6854d/recipes/hierarchy";
@@ -34366,6 +34548,27 @@
license = lib.licenses.free;
};
}) {};
+ highlight-function-calls = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "highlight-function-calls";
+ version = "20170907.2200";
+ src = fetchFromGitHub {
+ owner = "alphapapa";
+ repo = "highlight-function-calls";
+ rev = "f7a1eaf95fc64cc0db4d0567f9ff79ec4ae04787";
+ sha256 = "1gbj1awjp69352a5p49ldimvij5mj8cngjp2sh45qw1cm5dpq653";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/2d1eed3f9af218d21ea8db37ee91888e23e59bd5/recipes/highlight-function-calls";
+ sha256 = "0wmxijkhx74da3ygnvzsdvbh2iii4f7424wmm01b5skbr7qva690";
+ name = "highlight-function-calls";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/highlight-function-calls";
+ license = lib.licenses.free;
+ };
+ }) {};
highlight-indent-guides = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "highlight-indent-guides";
@@ -34432,12 +34635,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";
@@ -34473,12 +34676,12 @@
highlight-parentheses = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "highlight-parentheses";
- version = "20151107.2316";
+ version = "20170809.1151";
src = fetchFromGitHub {
owner = "tsdh";
repo = "highlight-parentheses.el";
- rev = "a821a314942f409cd69660d816cd9a0aebd1ae8f";
- sha256 = "0kzqx1y6rr4ryxi2md9087saad4g4bzysckmp8272k521d46xa1r";
+ rev = "c38885bba4f174c0a2cad3a60fe12b7cf8699aa1";
+ sha256 = "0j3rv7cpvckbsdl7lppgdyxbbznqzds5hvjl1qfwip1plbc8vcb2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/highlight-parentheses";
@@ -34657,6 +34860,27 @@
license = lib.licenses.free;
};
}) {};
+ himp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, vimish-fold }:
+ melpaBuild {
+ pname = "himp";
+ version = "20170814.1215";
+ src = fetchFromGitHub {
+ owner = "mkcms";
+ repo = "himp";
+ rev = "140234b7f7cde03cf858c5011a2ab63e3bc802ec";
+ sha256 = "1g3ivash185anw8i67di1mxdfxa9py51prdy5ixl95vpqk5nmwbw";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/51b31fb1fa7052d16d659313d249eef01ca3ee88/recipes/himp";
+ sha256 = "1igzlvm4g4rcnlvnwi5kn1jfvyrw2vnmp1kpvfnv7w9n6d8kflla";
+ name = "himp";
+ };
+ packageRequires = [ emacs vimish-fold ];
+ meta = {
+ homepage = "https://melpa.org/#/himp";
+ license = lib.licenses.free;
+ };
+ }) {};
hindent = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "hindent";
@@ -34664,8 +34888,8 @@
src = fetchFromGitHub {
owner = "chrisdone";
repo = "hindent";
- rev = "0721221ede01d6a3468e562fd7ea0df114de34e2";
- sha256 = "09cyzvk1ixbmnd6wl8idxn0263mgsvcnh1742flvxa5wsbqm9f08";
+ rev = "dde17a134ae99bd3c6e9b98ed04ad1740c2cd00b";
+ sha256 = "1piyzinjz0khfpl96rgxg0f5yy4han16zqj7lcjd9xfzdx9rg4yg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent";
@@ -34702,12 +34926,12 @@
hippie-expand-slime = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "hippie-expand-slime";
- version = "20170317.0";
+ version = "20170722.1846";
src = fetchFromGitHub {
owner = "purcell";
repo = "hippie-expand-slime";
- rev = "ed6c91a0600550788dc78a3ab32040ac28f7c8d4";
- sha256 = "0nqrz1wmg84xk08mi5w8h9mrymr23v8i39s2kdqsrmn6qpw37fpl";
+ rev = "39bbae94896a62854d31754debdfae71d35fec62";
+ sha256 = "1l2j5k4jk8jpm1vdf0z5zwa287859afsgd3gda778sdsiy38l6r7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/hippie-expand-slime";
@@ -34744,12 +34968,12 @@
historian = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "historian";
- version = "20170715.2142";
+ version = "20170722.1714";
src = fetchFromGitHub {
owner = "PythonNut";
repo = "historian.el";
- rev = "d42321d2af89c6f9f932b70944dd315a6bb42bfa";
- sha256 = "04lpnm56kkbs388z61sil0zmb1zxzkh1svzbhghcw3836fgm24kd";
+ rev = "78ec5632e4f4fd005014bd762c4a5ccdeabbd33d";
+ sha256 = "1ag9hpxrzg5add4nj2j08ymxrggnzdzqb8k1vcpkd8rg72138k3w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f16dacf64c52767c0c8aef653ac5d1a7a3bd0883/recipes/historian";
@@ -34929,12 +35153,12 @@
hl-sentence = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "hl-sentence";
- version = "20140802.920";
+ version = "20170812.646";
src = fetchFromGitHub {
owner = "milkypostman";
repo = "hl-sentence";
- rev = "45e3cc525ba636c0f22baa6d0938d9808622bc89";
- sha256 = "0pjfbm8p077frk475bx8xkygn8r4vdsvnx4rcqbjlpjawj0ndgxs";
+ rev = "1235ec94af083c3e43559ce0cac6db485aa938e0";
+ sha256 = "1b58d79pkakfz2l31lg8nfkb1dfzrnbw4p5cs8mlxpfa5j4z13af";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/hl-sentence";
@@ -35011,12 +35235,12 @@
hledger-mode = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, popup }:
melpaBuild {
pname = "hledger-mode";
- version = "20170716.116";
+ version = "20170807.1130";
src = fetchFromGitHub {
owner = "narendraj9";
repo = "hledger-mode";
- rev = "2412435e53c4f739a7aa93c9b9d80d861a1aa764";
- sha256 = "0l5fw1c1dilsiiw82a1lwaa2xjq4dlfm51rvnkf2iay1ndr7l11x";
+ rev = "fb314edbb193a1c640ae8f13c0373c7de26e2c8e";
+ sha256 = "1gq6f1dhfwsm1xk5952nxv8j67bz230pnswf9s1zp21drxwgdk20";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hledger-mode";
@@ -35032,15 +35256,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";
};
@@ -35408,12 +35632,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";
@@ -35573,22 +35797,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 = "20170908.922";
src = fetchFromGitHub {
owner = "hylang";
repo = "hy-mode";
- rev = "f34bc19e9a58c7014c1f672d0655d2edee997ad2";
- sha256 = "049f3746dfg9jh29904qnk2asym2rjqqgzn1zimk4bs3v8xnys1c";
+ rev = "d44dce8475cd1e8d14a533c604c3c32fcdcd4a9f";
+ sha256 = "19zv3xj4lzwv9vvlqsnn4nqxjhnq1hvl81qin1kr7z6bmhmidhns";
};
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;
@@ -35660,12 +35884,12 @@
hydra = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "hydra";
- version = "20170325.815";
+ version = "20170903.218";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "hydra";
- rev = "38ce88a9c3be11b0431080078095159b2211ca7a";
- sha256 = "0hja61lxhnkl0mpq3fj46pmd9pp85ncdzvgzc1dy82a48sib92dj";
+ rev = "b12d37ac00d4f677b7684ed1af7d04d996167dbb";
+ sha256 = "1aw0zca0xrqig7pj5gqfsrz8cblplb4ljh7k3k1hqsl1wpxav9kg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a4375d8ae519290fd5018626b075c226016f951d/recipes/hydra";
@@ -35701,11 +35925,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";
@@ -35763,12 +35987,12 @@
ibuffer-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
melpaBuild {
pname = "ibuffer-projectile";
- version = "20170410.1452";
+ version = "20170721.1823";
src = fetchFromGitHub {
owner = "purcell";
repo = "ibuffer-projectile";
- rev = "a004cd0121ab15a00311631289fc6a8c7a86a897";
- sha256 = "013yx94q2ffhiqbx9dara7kq76yfmigj4y00zc48rdinclnzb6az";
+ rev = "431e29d6cf12fc333fc8dc16ceeba54b9416a4aa";
+ sha256 = "1z5a4ygqmp4yjyfpcqlb846vsxvv5s2awhd3r63whw1hs9h6qqah";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/363a6a888945f2c8b02f5715539439ba744d737d/recipes/ibuffer-projectile";
@@ -35830,8 +36054,8 @@
src = fetchFromGitHub {
owner = "purcell";
repo = "ibuffer-vc";
- rev = "de75fb3345384fe13d0500435241ca4a056f5fc7";
- sha256 = "0c8y53aim35v88w5h4zn49187j6v8j7frxlhcw8crfxi1v6i7wdh";
+ rev = "e504f9233a9a15834562b6646883b6bf81986674";
+ sha256 = "04a9y4kgbzw5s34rl3xidv21h35vs2rsy061vjsppglggyp1jpl5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/ibuffer-vc";
@@ -35846,10 +36070,10 @@
}) {};
icicles = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
pname = "icicles";
- version = "20170707.610";
+ version = "20170910.1711";
src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/icicles.el?revision=1088";
- sha256 = "0lckab25irgpm7y2wdg00v31514m6aw6n0wf9gz1v21zzc5ij6cz";
+ url = "https://www.emacswiki.org/emacs/download/icicles.el?revision=1089";
+ sha256 = "10w1lghh9jqxxm5cszi2qyk24vnvazfywmyyz1v7zf6cyiwbndrz";
name = "icicles.el";
};
recipeFile = fetchurl {
@@ -36050,22 +36274,22 @@
license = lib.licenses.free;
};
}) {};
- ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize, s }:
melpaBuild {
pname = "ido-completing-read-plus";
- version = "20170708.1116";
+ version = "20170819.1045";
src = fetchFromGitHub {
owner = "DarwinAwardWinner";
- repo = "ido-ubiquitous";
- rev = "7b7136532ee4af0380f667f19700b53853bbbd7a";
- sha256 = "0zswh103bynq9fxpspb3ibn9vriw1m4qnp9i44b8a27k3rvbmmjn";
+ repo = "ido-completing-read-plus";
+ rev = "02f21215ce5ef2234c0e58dac9ec181cfc0900c1";
+ sha256 = "1hvimcd3wh5xbmj9awgv4imvmvjigpysrlgsbjxk6j848gll0ll3";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-completing-read+";
- sha256 = "034j1q47d57ia5bwbf1w66gw6c7aqbhscpy3dg2a71lwjzfmshwh";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-completing-read+";
+ sha256 = "0rxdv3cd0bg0p8c1bck5vichdq941dki934k23qf5p6cfgw8gw4z";
name = "ido-completing-read-plus";
};
- packageRequires = [ cl-lib emacs ];
+ packageRequires = [ cl-lib emacs memoize s ];
meta = {
homepage = "https://melpa.org/#/ido-completing-read+";
license = lib.licenses.free;
@@ -36095,12 +36319,12 @@
ido-exit-target = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ido-exit-target";
- version = "20150904.737";
+ version = "20170717.1151";
src = fetchFromGitHub {
owner = "waymondo";
repo = "ido-exit-target";
- rev = "322520c665284ce6547eb9dcd3aa888a02a51489";
- sha256 = "1s93q47cadanynvm1y4y08s68yq0l8q8vfasdk7w39vrjsxxsj3x";
+ rev = "e56fc6928649c87ccf39d56d84ab53ebaced1f73";
+ sha256 = "1a1bcvmihf22kr8rpv6kyp4b7x79hla5qdys48d6kl06m53gyckp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b815e7492eb0bd39c5d1be5a95784f9fe5612b62/recipes/ido-exit-target";
@@ -36368,16 +36592,16 @@
ido-ubiquitous = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }:
melpaBuild {
pname = "ido-ubiquitous";
- version = "20170705.1656";
+ version = "20170819.1045";
src = fetchFromGitHub {
owner = "DarwinAwardWinner";
- repo = "ido-ubiquitous";
- rev = "7b7136532ee4af0380f667f19700b53853bbbd7a";
- sha256 = "0zswh103bynq9fxpspb3ibn9vriw1m4qnp9i44b8a27k3rvbmmjn";
+ repo = "ido-completing-read-plus";
+ rev = "02f21215ce5ef2234c0e58dac9ec181cfc0900c1";
+ sha256 = "1hvimcd3wh5xbmj9awgv4imvmvjigpysrlgsbjxk6j848gll0ll3";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-ubiquitous";
- sha256 = "143pzpix9aqpzjy8akrxfsxmwlzc9bmaqzp9fyhjgzrhq7zchjsp";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-ubiquitous";
+ sha256 = "11sdk0ymsqnsw1gycvq2wj4j0g502fp23qk6q9d95lm98nz68frz";
name = "ido-ubiquitous";
};
packageRequires = [ cl-lib emacs ido-completing-read-plus ];
@@ -36452,12 +36676,12 @@
idris-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, prop-menu }:
melpaBuild {
pname = "idris-mode";
- version = "20170703.2038";
+ version = "20170722.1339";
src = fetchFromGitHub {
owner = "idris-hackers";
repo = "idris-mode";
- rev = "7de2809515cfb413a7be5fab71d6814d2699e1e3";
- sha256 = "0v6as33dpqmggmprpimv5rrm7vpfakka5hszz5f5p2k5v212yvk8";
+ rev = "5c01039112a8c52a0275560575f1f542f3966cf5";
+ sha256 = "0r3fbp2c8qhmsnpd63r9fjz1vxjsa054x69d9716pbp1jk3qsjsv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/17a86efca3bdebef7c92ba6ece2de214d283c627/recipes/idris-mode";
@@ -36473,15 +36697,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";
};
@@ -36494,12 +36718,12 @@
iedit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "iedit";
- version = "20161228.2111";
+ version = "20170909.423";
src = fetchFromGitHub {
owner = "victorhge";
repo = "iedit";
- rev = "03b647be8bd35ca82916f2ace27a95d5b85e8ecf";
- sha256 = "1pbbkizaa2f8lazpsc1j7qs3snvwkmw7schzhminzxrvdx15yids";
+ rev = "796ee5298dd3f4b7c51fbbcd9510a8631c5cbb4b";
+ sha256 = "0k70i4k8rrgcj3cl6k4nki3k55fsd4yz8fnwaazhckjr6pvrwz8w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/iedit";
@@ -36721,12 +36945,12 @@
imenu-anywhere = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "imenu-anywhere";
- version = "20160831.356";
+ version = "20170805.1155";
src = fetchFromGitHub {
owner = "vspinu";
repo = "imenu-anywhere";
- rev = "94bab9136e1264e98a10d9325ad53d735307f8f3";
- sha256 = "1ffdh0izdd22av85rizk38fidfp8f6lk6phr549fzaspn11hvd8j";
+ rev = "fc7f0fd2f19e5ebee70156a99bf87393123893e3";
+ sha256 = "0g2gb7jrys81kphmhlvhvzwl8l75j36y6pqjawh9wmzzwad876q5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/imenu-anywhere";
@@ -36742,12 +36966,12 @@
imenu-list = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "imenu-list";
- version = "20170215.125";
+ version = "20170728.632";
src = fetchFromGitHub {
owner = "bmag";
repo = "imenu-list";
- rev = "999fc0ec7f03b56be8e2a6e673d9473f51e5a92f";
- sha256 = "0py4sc5a5hjdijavymjmvipkm9z4jy1l8yb35d8rl7mfzr5cz3l7";
+ rev = "27170d27c9594989587c03c23f753a809f6a0e10";
+ sha256 = "13xh9bdl3k6ccfq83wjmkpi4269qahv4davki4wq18dr4amrzhlx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/86dea881a5b2d0458449f08b82c2614ad9abd068/recipes/imenu-list";
@@ -36800,27 +37024,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";
@@ -36953,8 +37156,8 @@
src = fetchFromGitHub {
owner = "anachronic";
repo = "importmagic.el";
- rev = "ab9e5c260a2044578597a467eff59e5598a7ef1c";
- sha256 = "1ifv6zfrknivjsgk0p8wh0n2bqqs1zfy8551216dfvigqs20wvq4";
+ rev = "c0360a8146ca65565a7fa66c6d72986edd916dd5";
+ sha256 = "0s6hp62kmhvmgj3m5jr3cfqc8yv3p8jfxk0piq8xbf2chr1hp6l5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/importmagic";
@@ -36991,12 +37194,12 @@
indent-tools = callPackage ({ fetchFromGitLab, fetchurl, hydra, lib, melpaBuild, s, yafolding }:
melpaBuild {
pname = "indent-tools";
- version = "20170608.647";
+ version = "20170907.715";
src = fetchFromGitLab {
owner = "emacs-stuff";
repo = "indent-tools";
- rev = "8d2072eef1fdc87e35f7495adfbfa0beb9faf6b7";
- sha256 = "1hrsmv25q9rpmj8paf3gggw7sp28z1m4gwlx50s64k5mxqa99iy8";
+ rev = "5605fee418287bf13d2e132fa7f90a6b7ec08584";
+ sha256 = "0ps3n6m3il7gj1v04fq1a0fmw8wz32jcxrf2ig6qvxyx0q12672k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/indent-tools";
@@ -37030,22 +37233,30 @@
license = lib.licenses.free;
};
}) {};
- indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }:
+ indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, memoize, seq, sourcemap, websocket }:
melpaBuild {
pname = "indium";
- version = "20170626.312";
+ version = "20170829.637";
src = fetchFromGitHub {
owner = "NicolasPetton";
repo = "Indium";
- rev = "4747a94cf823deb5623368f71f2012f8c5fdc156";
- sha256 = "11hsyqiy5lcvk721xrv1ihzp9ghdgk46n3qlaviy9alapl0v55d5";
+ rev = "d98a9e0cd11d8230c4c3d0b59c4ac60520e34ebb";
+ sha256 = "1q3yf45fmbjppv3ahb1gdb95pa3kyn18x5m23ihpxz1pziz3a074";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium";
sha256 = "024ljx7v8xahmr8jm41fiy8i5jbg48ybqp5n67k4jwg819cz8wvl";
name = "indium";
};
- packageRequires = [ company emacs js2-mode seq websocket ];
+ packageRequires = [
+ company
+ emacs
+ js2-mode
+ memoize
+ seq
+ sourcemap
+ websocket
+ ];
meta = {
homepage = "https://melpa.org/#/indium";
license = lib.licenses.free;
@@ -37075,12 +37286,12 @@
inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "inf-clojure";
- version = "20170710.708";
+ version = "20170910.30";
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "inf-clojure";
- rev = "f7ec13ab2fbc36e99df196eb863a75baf3b92fd6";
- sha256 = "01j4prrs78sq4w7cv15rdilxrqmjam2s1hrwijf6718c0s7dbpd0";
+ rev = "864356a543cac50b24c67901d1d04c4e6160070a";
+ sha256 = "07z131rxmwz3gwdy40qczz4is20jqdjylky7rsrxij5da3g017si";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure";
@@ -37114,27 +37325,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";
@@ -37142,8 +37332,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";
@@ -37180,12 +37370,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";
@@ -37221,10 +37411,10 @@
}) {};
info-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
pname = "info-plus";
- version = "20170303.1500";
+ version = "20170830.1104";
src = fetchurl {
url = "https://www.emacswiki.org/emacs/download/info+.el";
- sha256 = "0xpgry9bzjwmdj0j0pcsr2a37gp8yqbcpl06linv0hjxcwca9nsz";
+ sha256 = "0zxcqcd53fr0rf1s2fhax2a8kymk2mvg7vf7k92g8afvm888jnzj";
name = "info+.el";
};
recipeFile = fetchurl {
@@ -37238,27 +37428,6 @@
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";
@@ -37308,8 +37477,8 @@
src = fetchFromGitHub {
owner = "emacs-jp";
repo = "init-loader";
- rev = "287da99eadfa3dd85492506db43d68324069b593";
- sha256 = "03a655qzcwizv9hvfcp47466axsrq0h049fdd79xk6zmans5s6fj";
+ rev = "5d3cea1004c11ff96b33020e337b03b925c67c42";
+ sha256 = "17bg4s8yz7yz28m04fp2ff6ld0y01yl99wkn2k5rkg4j441xg3n2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e46e6ec79ff4c76fc85e13321e6dabd5797c5f45/recipes/init-loader";
@@ -37409,15 +37578,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";
};
@@ -37472,12 +37641,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";
@@ -37534,12 +37703,12 @@
intellij-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "intellij-theme";
- version = "20170416.359";
+ version = "20170905.941";
src = fetchFromGitLab {
owner = "fommil";
repo = "emacs-intellij-theme";
- rev = "ad207c8c3d266d566fb1e4862df154096c059171";
- sha256 = "06slahp36mj39ri4v4k7sv3mly6cgk76m4zpc1why3h6dmd7hhyr";
+ rev = "2bbabe3f2f87716b10ccdfcacbf51016ecc32d54";
+ sha256 = "0b3615lbm8fv4svv3g72dz62h9rv18m68b656lwl2ba9sn465rsl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cfe86071b2e84929476a771da99341f4a73cfd06/recipes/intellij-theme";
@@ -37597,12 +37766,12 @@
intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }:
melpaBuild {
pname = "intero";
- version = "20170711.1415";
+ version = "20170912.648";
src = fetchFromGitHub {
owner = "commercialhaskell";
repo = "intero";
- rev = "d03b3cb0cbc8d059a223366c4f7a2be85672c22f";
- sha256 = "0zga7p2hazcwxjyzgrvq77d3j6q9mz7wz7mkqk0hzf00sdb1gpg9";
+ rev = "7176857391c064e1f16a4f9fd0a51775cfedd42b";
+ sha256 = "10w2jgr4nq2iff9jlk2kjbjf3hpbhlwgjvnnpvxnrkz4y4ap0bdi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero";
@@ -37660,12 +37829,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";
@@ -37825,6 +37994,27 @@
license = lib.licenses.free;
};
}) {};
+ iqa = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "iqa";
+ version = "20170722.834";
+ src = fetchFromGitHub {
+ owner = "a13";
+ repo = "iqa.el";
+ rev = "08e3f70d0a3ed95a0c5675ae88e7966474ecc45a";
+ sha256 = "1n7ghcixk16n6x8p7128mqjfcsalxfyp3asydnijw7qp358l7f9r";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/a9bd2e952d98f7ac2dc823581b07b65e951e9e45/recipes/iqa";
+ sha256 = "02yrkizk4ssip44s6r62finsrf45hxj9cpil1xrvh8g4jbsmfsw4";
+ name = "iqa";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/iqa";
+ license = lib.licenses.free;
+ };
+ }) {};
ir-black-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ir-black-theme";
@@ -37889,12 +38079,12 @@
irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
melpaBuild {
pname = "irony";
- version = "20170627.1045";
+ version = "20170905.1316";
src = fetchFromGitHub {
owner = "Sarcasm";
repo = "irony-mode";
- rev = "bf21cf4c442a930e6007b3ff5bd8af094318991f";
- sha256 = "02fm2nwhglpb42qa5z2mrfkwqvwc3xvfdi0marlxbg3ramhn4s4i";
+ rev = "72e1e73f3c9da2ad04286e13bfc8fc401626b7a9";
+ sha256 = "155wvzsmhb8vz30jcd3xj91z74268pq7szax7jwd725ndx6x7ny8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony";
@@ -37951,10 +38141,10 @@
}) {};
isearch-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
pname = "isearch-plus";
- version = "20170614.928";
+ version = "20170723.1826";
src = fetchurl {
url = "https://www.emacswiki.org/emacs/download/isearch+.el";
- sha256 = "19jk4c39bqbqbfwmhkiwqfij556nv82syy99g07s7gz1bqkrm7pl";
+ sha256 = "0d7xsr71iadqzg81mv17dqyd0bdzkmljxlrpdlpycjyaf3z59aqr";
name = "isearch+.el";
};
recipeFile = fetchurl {
@@ -38050,6 +38240,27 @@
license = lib.licenses.free;
};
}) {};
+ isortify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "isortify";
+ version = "20170726.1254";
+ src = fetchFromGitHub {
+ owner = "proofit404";
+ repo = "isortify";
+ rev = "28699f29cfc0d9d78b636d0ecadcf9139173bc6f";
+ sha256 = "0r7hbvsnn590wfydwibvpdihcah5jj6ylqhqq7w1a1nljzwk6d4h";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/9d4ad18492e7f4a56a1515873bc0b66fa49829bb/recipes/isortify";
+ sha256 = "0nlpjd6mrhv8iccdny0x5lb41dpyp6l7kiax4xqra0rb2vq0chcs";
+ name = "isortify";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/isortify";
+ license = lib.licenses.free;
+ };
+ }) {};
iss-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "iss-mode";
@@ -38074,12 +38285,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";
@@ -38137,15 +38348,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";
};
@@ -38158,15 +38369,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";
};
@@ -38179,12 +38390,12 @@
ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ivy";
- version = "20170716.1104";
+ version = "20170911.1034";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "swiper";
- rev = "dc146d9f1435b79fbfbfa702f0172b9de05f631d";
- sha256 = "09cfs0rhhb72b12pic2w9chbc000pqnafrl2x0g8v5r065pzp64n";
+ rev = "0a1d361b926291874124f8c63a653d83ead64a36";
+ sha256 = "0ssbsllpv0lyr7dhnipwd7zgpxvfm36rldr7vkxh5maajdkamls7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy";
@@ -38200,12 +38411,12 @@
ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }:
melpaBuild {
pname = "ivy-bibtex";
- version = "20170321.1306";
+ version = "20170808.1124";
src = fetchFromGitHub {
owner = "tmalsburg";
repo = "helm-bibtex";
- rev = "13f27f3cfdf137bdb22addfc0c832ba1c8572c25";
- sha256 = "02b9hb7nmh75qwkmanw6ci6pyann71ag8mp4fd5agrlwq6rrlgl4";
+ rev = "8ed898fb5a68f18e9bb9973832a5c1f8abcfc463";
+ sha256 = "14lyx0vbqr97p3anzrsp7m3q0kqclyjcdwplpraim403fcklzbnz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex";
@@ -38288,8 +38499,8 @@
src = fetchFromGitHub {
owner = "PythonNut";
repo = "historian.el";
- rev = "d42321d2af89c6f9f932b70944dd315a6bb42bfa";
- sha256 = "04lpnm56kkbs388z61sil0zmb1zxzkh1svzbhghcw3836fgm24kd";
+ rev = "78ec5632e4f4fd005014bd762c4a5ccdeabbd33d";
+ sha256 = "1ag9hpxrzg5add4nj2j08ymxrggnzdzqb8k1vcpkd8rg72138k3w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fb79cbc9af6cd443b9de97817d24bcc9050d5940/recipes/ivy-historian";
@@ -38309,8 +38520,8 @@
src = fetchFromGitHub {
owner = "abo-abo";
repo = "swiper";
- rev = "dc146d9f1435b79fbfbfa702f0172b9de05f631d";
- sha256 = "09cfs0rhhb72b12pic2w9chbc000pqnafrl2x0g8v5r065pzp64n";
+ rev = "0a1d361b926291874124f8c63a653d83ead64a36";
+ sha256 = "0ssbsllpv0lyr7dhnipwd7zgpxvfm36rldr7vkxh5maajdkamls7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra";
@@ -38323,6 +38534,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";
@@ -38344,6 +38576,27 @@
license = lib.licenses.free;
};
}) {};
+ ivy-pass = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, password-store }:
+ melpaBuild {
+ pname = "ivy-pass";
+ version = "20170812.1255";
+ src = fetchFromGitHub {
+ owner = "ecraven";
+ repo = "ivy-pass";
+ rev = "5b523de1151f2109fdd6a8114d0af12eef83d3c5";
+ sha256 = "18crb4zh2pjf0cmv3b913m9vfng27girjwfqc3mk7vqd1r5a49yk";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/7bfef855e071442d2b9d1e0ce9b5706937bffc53/recipes/ivy-pass";
+ sha256 = "1sb29q22fsjqfxqznf73xcqhzy132bjd45w7r27sfmf825vcysci";
+ name = "ivy-pass";
+ };
+ packageRequires = [ emacs ivy password-store ];
+ meta = {
+ homepage = "https://melpa.org/#/ivy-pass";
+ license = lib.licenses.free;
+ };
+ }) {};
ivy-purpose = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, window-purpose }:
melpaBuild {
pname = "ivy-purpose";
@@ -38393,8 +38646,8 @@
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "65c8f03ff0112ce5c5e11aff6867ad0eb9019e63";
- sha256 = "0xlacwjmvx5xd8m7yi8l8mqi0lqs2gr2hmjag2frvmxcn4cpb4gc";
+ rev = "2af4d6a32e8194f8fbcc23fd94395e3d595a3c25";
+ sha256 = "0091w529lvbjlw1fdb3qjgb8fd5fcwxhqyr4ps5cvxl5bqnwlw39";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags";
@@ -38452,12 +38705,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";
@@ -38515,12 +38768,12 @@
j-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "j-mode";
- version = "20140702.809";
+ version = "20170911.823";
src = fetchFromGitHub {
owner = "zellio";
repo = "j-mode";
- rev = "caa55dfaae01d1875380929826952c2b3ef8a653";
- sha256 = "07kbicf760nw4qlb2lkf1ns8yzqy0r5jqqwqjbsnqxx4sm52hml9";
+ rev = "cf27446120c779f90aeb0b14aae24d55d2a4fe36";
+ sha256 = "1f61finp605k7bii7g0gm92vpjrl5q3w28nykc0w95lm36hmg7qv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/410134ab2145adad3648b1024bfe4f6801df82c9/recipes/j-mode";
@@ -38762,27 +39015,6 @@
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";
@@ -38912,12 +39144,12 @@
jbeans-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "jbeans-theme";
- version = "20170413.901";
+ version = "20170816.754";
src = fetchFromGitHub {
owner = "synic";
repo = "jbeans-emacs";
- rev = "ee3c3b95e4a8697438d48757c604f9491b395417";
- sha256 = "10zgdc4619y7w80w41jvr63s3wms52kfz011gaxwhzdgm2mdjqav";
+ rev = "19a09bebc20fc981e77950e8495162de49c824ae";
+ sha256 = "06my9qmj936f80gc9nn1akjr6fjal23125zkllz8csm1j83vqcvk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6dd4bd78795ec7509d8744fec1e80426ce0557ec/recipes/jbeans-theme";
@@ -39080,12 +39312,12 @@
jenkins = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
melpaBuild {
pname = "jenkins";
- version = "20170713.702";
+ version = "20170721.236";
src = fetchFromGitHub {
owner = "rmuslimov";
repo = "jenkins.el";
- rev = "b30d4ef658963b913ca02726f99755c10736fd9d";
- sha256 = "15yl1j3lrag19vy5k5qymmf6ij0myaiwl5k7z1ij0b70y2qmfx7k";
+ rev = "1ec967973db685c9d84133ec6a5e06489ce06b62";
+ sha256 = "1ai5adv46van2g029x9idj394ycczfacyhyv291sasf8mv9i7j4b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2ed2da33db5eaea1a37f86057da174a45cd37ea5/recipes/jenkins";
@@ -39122,12 +39354,12 @@
jg-quicknav = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "jg-quicknav";
- version = "20160216.2035";
+ version = "20170808.1830";
src = fetchFromGitHub {
owner = "jeffgran";
repo = "jg-quicknav";
- rev = "1b598ee3d691b68dc64f1727a959eab538893d07";
- sha256 = "164wm83av3p2c9dkhpmqrb7plq9ngmnsa5aly3a1xam1cds22hp4";
+ rev = "c8d53e774d63e68a944092c08a026b57da741038";
+ sha256 = "0rdrryfppgj5smrds5gyyhc4z8x36aq3gxdpckq80rbl4s729chy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/jg-quicknav";
@@ -39351,12 +39583,12 @@
js-comint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "js-comint";
- version = "20170627.1952";
+ version = "20170808.527";
src = fetchFromGitHub {
owner = "redguardtoo";
repo = "js-comint";
- rev = "2c19fafed953ea0972ff086614f86614f4d5dc13";
- sha256 = "1ljsq02g8jcv98c8zc5307g2pqvgpbgj9g0a5gzpz27m440b85sp";
+ rev = "eb4744122724b24e492c2171fff438e3ee2045a8";
+ sha256 = "1bbzbv1dasqxkljq06qngb4l22x7gpgncz7jmn0pqixnhqj5k66y";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/bc9d20b95e369e5a73c85a4a9385d3a8f9edd4ca/recipes/js-comint";
@@ -39435,12 +39667,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";
@@ -39477,12 +39709,12 @@
js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "js2-mode";
- version = "20170716.1313";
+ version = "20170815.1415";
src = fetchFromGitHub {
owner = "mooz";
repo = "js2-mode";
- rev = "b176925c4d8a21e0ed375e13cf6aa04cdf3b4a0e";
- sha256 = "0ffr8wjqqs7p54hi8wgnd61dm4cs7112j56d8q9ycfmnw0fswyxk";
+ rev = "df51992a648c7fb3e441106defdbffa2ef2f020d";
+ sha256 = "08k0szwbwsgx2q1qm356f88jif36yqz8lnpylib24jy2plx24j5s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode";
@@ -39502,8 +39734,8 @@
src = fetchFromGitHub {
owner = "magnars";
repo = "js2-refactor.el";
- rev = "17dff6480c8d0b8e4daf44d65181ebc1371d3bdf";
- sha256 = "0fs9w3110cc62a8g6dasfmxi5zsmhhvhviw8r17p63f3snga6xi7";
+ rev = "924936b42777f2513ec6893c68a41756bcfeba83";
+ sha256 = "00p4yvlc0bcwrcr203my4i737fbsv42iz92pfgxwq6p47c42nq2a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8935264dfea9bacc89fef312215624d1ad9fc437/recipes/js2-refactor";
@@ -39582,12 +39814,12 @@
json-mode = callPackage ({ fetchFromGitHub, fetchurl, json-reformat, json-snatcher, lib, melpaBuild }:
melpaBuild {
pname = "json-mode";
- version = "20170619.1701";
+ version = "20170719.2205";
src = fetchFromGitHub {
owner = "joshwnj";
repo = "json-mode";
- rev = "39ba450ba5dcc72e317e679a0b61d8aa94383966";
- sha256 = "19qklwzad6qj27jbsms88bbnva4pvl64c89arpf66yjby3hnqbg3";
+ rev = "32d5a9b3319e6797c4d52e7d61a65e5638102ef4";
+ sha256 = "04n68ppxdga5r7mbahiqjkykf3i5simpx91aa8x9h197y5wwi4ww";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/03d0ff6c8d724cf39446fa27f52aa5cc1a3cefb6/recipes/json-mode";
@@ -39832,12 +40064,12 @@
jumblr = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "jumblr";
- version = "20140908.1352";
+ version = "20170727.1343";
src = fetchFromGitHub {
owner = "mkmcc";
repo = "jumblr";
- rev = "705c7286e09a307b2b7f60072a12ed45325657c0";
- sha256 = "1f0kai4cz3r25fqlnryyvnyf80cf57xa655dvv1rx8si3xd20x4j";
+ rev = "34533dfb9db8538c005f4eaffafeff7ed193729f";
+ sha256 = "0nn2m27c70nykin4iakrna0c61qd1hr09czrfmfpk06k70iifjky";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b47000c35a181c03263e85e8955eb4b4c9e69e4d/recipes/jumblr";
@@ -39857,8 +40089,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";
@@ -39913,6 +40145,27 @@
license = lib.licenses.free;
};
}) {};
+ jump-tree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "jump-tree";
+ version = "20170819.2137";
+ src = fetchFromGitHub {
+ owner = "yangwen0228";
+ repo = "jump-tree";
+ rev = "70db2bed56e6e3433ae1f57df4aaa128e644faa7";
+ sha256 = "1w0a33mrg4dqkq7rfs182d57lg9r15ab48m7hzb9zm0i6c79aqzy";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/fe6b08848929c83e3cdea623b331176c0f20cbe9/recipes/jump-tree";
+ sha256 = "1gknpwd1vjpd1jqpi2axhyi6sg4clarr32rfrfz6hi6kmzr848mj";
+ name = "jump-tree";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/jump-tree";
+ license = lib.licenses.free;
+ };
+ }) {};
jumplist = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "jumplist";
@@ -40039,6 +40292,48 @@
license = lib.licenses.free;
};
}) {};
+ kaleidoscope = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+ melpaBuild {
+ pname = "kaleidoscope";
+ version = "20170808.117";
+ src = fetchFromGitHub {
+ owner = "algernon";
+ repo = "kaleidoscope.el";
+ rev = "e932103e043bd1503bf5d98dd117ff6737b852bc";
+ sha256 = "1vz4f3w9630dpr4ba4gdiwza29dacakm9h9vzyjrg643wcsgi6v1";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/148d47626879be1608f35827ef82a28274ff4de3/recipes/kaleidoscope";
+ sha256 = "0nfz207rzpnni7jyzvdvz5lr0zcpzy278a86821cmw8d5l81a3yp";
+ name = "kaleidoscope";
+ };
+ packageRequires = [ s ];
+ meta = {
+ homepage = "https://melpa.org/#/kaleidoscope";
+ license = lib.licenses.free;
+ };
+ }) {};
+ kaleidoscope-evil-state-flash = callPackage ({ evil, fetchFromGitHub, fetchurl, kaleidoscope, lib, melpaBuild, s }:
+ melpaBuild {
+ pname = "kaleidoscope-evil-state-flash";
+ version = "20170728.320";
+ src = fetchFromGitHub {
+ owner = "algernon";
+ repo = "kaleidoscope.el";
+ rev = "e932103e043bd1503bf5d98dd117ff6737b852bc";
+ sha256 = "1vz4f3w9630dpr4ba4gdiwza29dacakm9h9vzyjrg643wcsgi6v1";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/148d47626879be1608f35827ef82a28274ff4de3/recipes/kaleidoscope-evil-state-flash";
+ sha256 = "17a4nmdi6h0z4va3kiw4ivaywiisblz6cicypk9d3g9sl92drcvq";
+ name = "kaleidoscope-evil-state-flash";
+ };
+ packageRequires = [ evil kaleidoscope s ];
+ meta = {
+ homepage = "https://melpa.org/#/kaleidoscope-evil-state-flash";
+ license = lib.licenses.free;
+ };
+ }) {};
kanban = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
pname = "kanban";
version = "20170418.110";
@@ -40082,12 +40377,12 @@
kaolin-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "kaolin-theme";
- version = "20170710.1014";
+ version = "20170905.1243";
src = fetchFromGitHub {
owner = "0rdy";
repo = "kaolin-theme";
- rev = "f2df1b80dfef88d38c5fbf1b9fad96e2091126c3";
- sha256 = "0anfz9npizaghhvpcvplxsymvv9q3sl7bpiis281p8c7yhrl93h5";
+ rev = "7bf265de58fe412d7f445ee84c460e6b90d7e0cf";
+ sha256 = "1zd8vgg54hj8jycixh3vr34pf8grb02hhk10y1xh0ddpxw3mpb1s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d2abf9d914cdc210bbd47ea92d0dac76683e21f0/recipes/kaolin-theme";
@@ -40485,8 +40780,8 @@
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "kill-or-bury-alive";
- rev = "51daf55565034b8cb6aa3ca2aa0a827e31751041";
- sha256 = "1qbdxjni1brhsw6m4cvd2jjaf3y8v3fkbxxf0pvsb089mkpi7mpq";
+ rev = "415de48695efd30163a015063873b03f4ca5b743";
+ sha256 = "1jsgvwi3zy22wirxgzkbbjzk4q6f6mxf3223cf5pkk7x2prv6fcn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/25016ed09b6333bd79b989a8f6b7b03cd92e08b3/recipes/kill-or-bury-alive";
@@ -40590,8 +40885,8 @@
src = fetchFromGitHub {
owner = "kivy";
repo = "kivy";
- rev = "e4a8a4b17cb1ae073afc5df54d9fed9333f1cc72";
- sha256 = "09z298s699jk76i6yrflplhvdc77flb2qfkzbb55ngmx0ajcf2h6";
+ rev = "f32bb16e5b477f5b54f3dc23ff048b490e906590";
+ sha256 = "05lr10wnwghzsi59y7spy8a2jps11dmpm7wndzaj62nkx0d09a73";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode";
@@ -40670,12 +40965,12 @@
kodi-remote = callPackage ({ elnode, fetchFromGitHub, fetchurl, json ? null, let-alist, lib, melpaBuild, request }:
melpaBuild {
pname = "kodi-remote";
- version = "20170716.1331";
+ version = "20170818.2206";
src = fetchFromGitHub {
owner = "spiderbit";
repo = "kodi-remote.el";
- rev = "700ea18fdc471ce351d7e2a443572746e8b93496";
- sha256 = "09qznjadbmspm8n56rk3giyxcf79sxfxpimgn3vkdv09la1mdbb2";
+ rev = "a032d13a3f39f260d7d00d62f32dce0f8a5927ab";
+ sha256 = "0c883yprblda22jq3jjdz9nd6ha6dbwfn6n8y448qln8dzj9sd7p";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/08f06dd824e67250afafdecc25128ba794ca971f/recipes/kodi-remote";
@@ -40838,12 +41133,12 @@
ksp-cfg-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ksp-cfg-mode";
- version = "20160521.1333";
+ version = "20170724.1127";
src = fetchFromGitHub {
owner = "lashtear";
repo = "ksp-cfg-mode";
- rev = "07a957512e66030e1b9f8ac0f259051386acb5b5";
- sha256 = "1kbmlhfxbp704mky8v69lzqd20bbnqijfnv110yigsy3kxi7hdrr";
+ rev = "713a22ee28688e581ec3ad60228c853b516a14b6";
+ sha256 = "04r8mfsc349wdhx1brlf2l54v4dn58y69fqv3glhvml12962lwy3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d49db5938fa4e3ab1176a955a4788b15c63d9e69/recipes/ksp-cfg-mode";
@@ -40901,12 +41196,12 @@
kurecolor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "kurecolor";
- version = "20161016.1827";
+ version = "20170808.602";
src = fetchFromGitHub {
owner = "emacsfodder";
repo = "kurecolor";
- rev = "2b2c6778d75ef90f42fdffbe3ba7e58fa661946a";
- sha256 = "0zcqjphz2vad6jccw9z7fds8xmvv0vmgp7fi0d8i0i5fbhpwpfz7";
+ rev = "3e8b63e89e294179e42a14a4a357c29a72669a22";
+ sha256 = "0pj8252x5s61bwsfrhi5qvwk8jia3kc67r82v5m4a900zpmx3a7k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/58a5ebdbf82e83e6602161bca049d468887abe02/recipes/kurecolor";
@@ -41088,12 +41383,12 @@
lastpass = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
melpaBuild {
pname = "lastpass";
- version = "20170418.1102";
+ version = "20170801.1214";
src = fetchFromGitHub {
owner = "storvik";
repo = "emacs-lastpass";
- rev = "ff05ae82b1073759989616caf362c85575fdfc58";
- sha256 = "1wsnb1w3q2b0lj6087njy0r5nnlyddrnqyxkbv6p6mbqin1zkahs";
+ rev = "264250725b3ba23412919ec10cfa7390473b534c";
+ sha256 = "1qqmg59vbwb31nx3vi88d53484gy3sg8wnq45xrra45drpjka3ry";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/46e5e8735baab7728bddce2693cea6bcee0e6360/recipes/lastpass";
@@ -41109,12 +41404,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";
@@ -41276,12 +41571,12 @@
lavender-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "lavender-theme";
- version = "20141115.2302";
+ version = "20170808.613";
src = fetchFromGitHub {
owner = "emacsfodder";
repo = "emacs-lavender-theme";
- rev = "d9e4d7838167a0e07fb5d04877a7b34c4b4cc1ee";
- sha256 = "1mg923rs2dk104bcr461dif3mg42r081ii8ipnnr588w7il0xh7k";
+ rev = "ef5e959b95d7fb8152137bc186c4c24e986c1e3c";
+ sha256 = "0pbpns387fmalkakbdl2q7d2y720m7ai7mnydsinjwlkdrshvj4g";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/lavender-theme";
@@ -41360,12 +41655,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";
@@ -41511,8 +41806,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";
@@ -41546,15 +41841,36 @@
license = lib.licenses.free;
};
}) {};
+ letterbox-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "letterbox-mode";
+ version = "20170701.1825";
+ src = fetchFromGitHub {
+ owner = "pacha64";
+ repo = "letterbox-mode";
+ rev = "88c67a51d67216d569a28e8423200883fde096dd";
+ sha256 = "1xzzfr525pn2mj7x6xnvccxhls79bfpi5mqhl9ivisnlgj1bvdjw";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/1512e20962ea354e4311c0a2696a22576a099ba9/recipes/letterbox-mode";
+ sha256 = "117dj5xzf6givwjyqsciz6axhlcj7xbx0zj91ximm81kb5fswgda";
+ name = "letterbox-mode";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/letterbox-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
leuven-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "leuven-theme";
- version = "20170508.1319";
+ version = "20170907.413";
src = fetchFromGitHub {
owner = "fniessen";
repo = "emacs-leuven-theme";
- rev = "185e19f49ad05e9d813c10d24381f3e35b8c719e";
- sha256 = "1vxfw5nqvbv12wp0015fg5cm8z1zirya4sbr1xbakc758fq5q8j3";
+ rev = "b6889c336fc4f046138334ed700c5c9a13e39992";
+ sha256 = "0j8d6h61nvz2gpkbf73v246srjg6wm93giijc7f0rks9g0nlp1rc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b09451f4eb2be820e94d3fecbf4ec7cecd2cabdc/recipes/leuven-theme";
@@ -41616,8 +41932,8 @@
src = fetchFromGitHub {
owner = "rvirding";
repo = "lfe";
- rev = "446f61280f984f17d4b923150f3b5c58f520ecaa";
- sha256 = "1vnck52yj8h0zahqgxlx70h7pqk9dnd5sy3jdl92rkj0bimhqr9s";
+ rev = "71d8e5bafc59424bacd23c8af4b368d5a6db686c";
+ sha256 = "1wdxi1fbhw6k4dyq91vg7j33hcxjbhb1ydb5qaq292iach525wrq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode";
@@ -41757,12 +42073,12 @@
link-hint = callPackage ({ avy, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "link-hint";
- version = "20170313.1945";
+ version = "20170904.1442";
src = fetchFromGitHub {
owner = "noctuid";
repo = "link-hint.el";
- rev = "6b926a6fbb7288eb062b28747a32644c5c8fea4f";
- sha256 = "047y75wkqiv1vlrgg6fy78xsfms14drfwmil2sb7j5p5p0cw5xc7";
+ rev = "366bce32f8cb1aa5f0f1ce4eceb4d60cc802abd6";
+ sha256 = "09k1cz3l2ql2fdn3kx43q3bjlwqcz67fw2as6m59951lyd8fnmxp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d24b48fe0bc127ae6ac4084be8059aacb8445afd/recipes/link-hint";
@@ -41931,12 +42247,12 @@
lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }:
melpaBuild {
pname = "lispy";
- version = "20170707.949";
+ version = "20170911.1138";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "lispy";
- rev = "7cf7bda344f015750e89719209a49f5991bfdffa";
- sha256 = "1h4129la499b3x3bz72s5c6bc8i7nvyh2kzxg7ff1h8xnwf1rcp1";
+ rev = "134d815c843813950cbffc4516cabafd8ae75ed4";
+ sha256 = "1xw8j3hjahp6vl3qnfab0kyl20zxclnbfpy9x1zp344zic61n02m";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy";
@@ -41952,12 +42268,12 @@
lispyscript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "lispyscript-mode";
- version = "20130828.719";
+ version = "20170720.1217";
src = fetchFromGitHub {
owner = "krisajenkins";
repo = "lispyscript-mode";
- rev = "d0e67ee734919d7ff14c72712e909149cb9604bd";
- sha256 = "0n0mk01h9c3f24gzpws5xf6syrdwkq4kzs9mgwl74x9l0x904rgf";
+ rev = "def632e3335b0c481fbcf5a17f18b0a8c58dd12f";
+ sha256 = "042nndsrv7kyq20v3lahrpr0x89xyayvhx59i0hx6pvkc9wgk5b6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/bf912fa20edc9cff12645381b303e37f2de14976/recipes/lispyscript-mode";
@@ -41973,12 +42289,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";
@@ -42081,8 +42397,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";
@@ -42266,12 +42582,12 @@
live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "live-py-mode";
- version = "20170716.827";
+ version = "20170906.2104";
src = fetchFromGitHub {
owner = "donkirkby";
repo = "live-py-plugin";
- rev = "d4a0708e2bac6492355c675717e458f88b7fab63";
- sha256 = "1fr8kwm6m3k57s55gfn3sjh6zb9hj57rqnygwq8klyvi5ydh9w9f";
+ rev = "4d972a859e6a56d969b075688b425ac246b40962";
+ sha256 = "0qzg5i9x9f5skp2bk5avxw30nhs44z4didk69prli6p6sfd4bgqg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode";
@@ -42287,16 +42603,16 @@
lively = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "lively";
- version = "20160208.1035";
+ version = "20170820.407";
src = fetchFromGitHub {
- owner = "emacsorphanage";
+ owner = "purcell";
repo = "lively";
- rev = "12df5ccaec03670de87c01b0b4cd3e2b96e0738a";
- sha256 = "1qxw7i23z6c4yimrzpaqna8j39rashgbswdv4m0x4qg4sqc7szdp";
+ rev = "49cf43815c04f0b84d20b527f5d712544a13a4db";
+ sha256 = "02in5dj50c82h2bb7l47b00w3hpn3c2788aiyq2bln06vpj1qq4n";
};
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 = [];
@@ -42373,13 +42689,13 @@
pname = "llvm-mode";
version = "20150910.644";
src = fetchgit {
- url = "http://llvm.org/git/llvm";
- rev = "325ccf1c3d92533f8bc5c48d741d3aa23a6b2542";
- sha256 = "05cz8jwkidwkzggifccl51daw6vbcy1fgnlwm27ppy933y306xyy";
+ url = "https://llvm.org/git/llvm";
+ rev = "ae7945dc893db824632135ea16929e14ca185595";
+ sha256 = "0vsj8i29qkfl2a6fsdplzdh2kb9vrc2rkbbh7hak81ngn19q41l8";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode";
- sha256 = "0j3zsd0shd7kbi65a2ha7kmr0zy3my05378swx6m5m9x7miyr4y7";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/llvm-mode";
+ sha256 = "0jxwa7gaxv9kkgjp87ggzlfqbf6xs19z0s9ycnv2h5hlxpnzrlnb";
name = "llvm-mode";
};
packageRequires = [];
@@ -42388,6 +42704,26 @@
license = lib.licenses.free;
};
}) {};
+ lms = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "lms";
+ version = "20170804.922";
+ src = fetchhg {
+ url = "https://bitbucket.com/inigoserna/lms.el";
+ rev = "f07ac3678e27";
+ sha256 = "15l3nfrddblfzqxgvf0dmmsk4h5l80l6r2kgxcfk8s01msjka3sl";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/b8be8497494b8543a8257c9ea92444baf7674951/recipes/lms";
+ sha256 = "1ckrh6qbh5y2y3yzl2iyq8nqlpy4qp6vzc72ijcgayvcflb01vr1";
+ name = "lms";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/lms";
+ license = lib.licenses.free;
+ };
+ }) {};
load-relative = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "load-relative";
@@ -42747,12 +43083,12 @@
love-minor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, lua-mode, melpaBuild }:
melpaBuild {
pname = "love-minor-mode";
- version = "20130429.1459";
+ version = "20170726.2236";
src = fetchFromGitHub {
owner = "ejmr";
repo = "love-minor-mode";
- rev = "31c3fc1ecd31f72f0f736014a4ff905eb3742e74";
- sha256 = "179r4pz3hlb5p6bjfhdikkx1zvh09ln5dbw3c3rmlyww1q7v26yl";
+ rev = "3ca8f3405338f2d6f4fbcdd5e89342a46378543a";
+ sha256 = "1hwm7yxbwvb27pa35cgcxyjfjdjhk2a33i417q2akc7vppdbcmzh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0f224c4c7519b3668b1270c957227e486896b7b6/recipes/love-minor-mode";
@@ -42789,12 +43125,12 @@
lsp-haskell = callPackage ({ fetchFromGitHub, fetchurl, haskell-mode, lib, lsp-mode, melpaBuild }:
melpaBuild {
pname = "lsp-haskell";
- version = "20170421.328";
+ version = "20170814.1358";
src = fetchFromGitHub {
owner = "emacs-lsp";
repo = "lsp-haskell";
- rev = "c22e6f4a70156e615e303d623e75362d3b14bcf4";
- sha256 = "1iv1y1pri313m5h59a06cydj8kkzy6ig4mi3hnzz5nxkcynd2whz";
+ rev = "7c4caf7f87392146203ecd0616a059280deecd15";
+ sha256 = "1i5rpmz8kzcjgxwvy1g3mlxd4y1bnnjzlk6j2sz4i7c75g2aprn4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-haskell";
@@ -42814,8 +43150,8 @@
src = fetchFromGitHub {
owner = "emacs-lsp";
repo = "lsp-java";
- rev = "ba797f9588944ae917ccbfa15c40ee1e427ea6e5";
- sha256 = "0plccx57j85b53s8nmhkcw8h1hznm147v3ajhzx2j1adbb2j0h3f";
+ rev = "350c48ff4bde3c19b02b14ee519cd6ac7514d94c";
+ sha256 = "07392bkq5b1jymplxm76yskyf2d55s4hd46zf890jxrjzybk0ffp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-java";
@@ -42831,12 +43167,12 @@
lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "lsp-mode";
- version = "20170629.33";
+ version = "20170905.1130";
src = fetchFromGitHub {
owner = "emacs-lsp";
repo = "lsp-mode";
- rev = "3e93b3fd754931cfd122855659afbd070d844bac";
- sha256 = "0g45zrch41041axpi5j6jbng1dbjqhpysr38cv2f1kqdmw9ybg9a";
+ rev = "d69692651742b65398b4c1f9ee06d1670d9443d0";
+ sha256 = "1f09shdirq81c37sg2hdgj1wqqvwmg5m7bkprz28fych76xi8jgr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-mode";
@@ -42856,8 +43192,8 @@
src = fetchFromGitHub {
owner = "emacs-lsp";
repo = "lsp-python";
- rev = "5e032b39d74e63dee9157bf967f3902caa8524fa";
- sha256 = "1rhk6hlcvvg9yqy3x9fx8qdvhyf2aih2k6m4x5cr80mzvczmxl31";
+ rev = "7057d3797ecfafab21f3365fd55ba14d44b278ec";
+ sha256 = "1gw8zfxd9chln8z8sdxy9xjzs74q5zbhsgl9zc3sl8d0ml027qar";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-python";
@@ -42873,12 +43209,12 @@
lsp-rust = callPackage ({ fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild, rust-mode }:
melpaBuild {
pname = "lsp-rust";
- version = "20170421.326";
+ version = "20170829.142";
src = fetchFromGitHub {
owner = "emacs-lsp";
repo = "lsp-rust";
- rev = "bd9b1f5d9195067decc496e61ad383d615b7f054";
- sha256 = "1nai41wv3wfxx2lslkpm0qas73j6hachiqwbvhvvcfz34h9nnc5l";
+ rev = "613a379e8cf62597181c72b3e4a69893852c60a6";
+ sha256 = "19p8cw38kmj0kjw0kknicd8zva9f7vai9rjk3xbli5cwpmwvizy8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-rust";
@@ -43024,8 +43360,8 @@
src = fetchFromGitHub {
owner = "phillord";
repo = "m-buffer-el";
- rev = "e2d5a416ce47b36da10a9815ff5702f28c716d57";
- sha256 = "0nm8ljciim7wjc4r021jv8xrsk7jffmagzbllbvd5cab4zxvs4ik";
+ rev = "8681342aaffa187e5c54945ab91b812965a96d19";
+ sha256 = "040g7l0r4bxz4ynp4zxy80jsa6x2f48z8rylc41fqxiblasmh0af";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c34d02682e87c9978a3583bd903dcac5da5b41d5/recipes/m-buffer";
@@ -43038,6 +43374,48 @@
license = lib.licenses.free;
};
}) {};
+ mac-pseudo-daemon = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "mac-pseudo-daemon";
+ version = "20170728.1240";
+ src = fetchFromGitHub {
+ owner = "DarwinAwardWinner";
+ repo = "mac-pseudo-daemon";
+ rev = "d235680a72677f11925b912428ad1a57b664e3e8";
+ sha256 = "0gqknrwhfzr7cf5pgs33a5xh79y0yzxghs6wsvavvqkmf4cvck40";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/mac-pseudo-daemon";
+ sha256 = "12fwrcnwzsfms42rzv4wif5yzx3gnsz8yzdcgkpl37kkx85iy8v0";
+ name = "mac-pseudo-daemon";
+ };
+ packageRequires = [ cl-lib ];
+ meta = {
+ homepage = "https://melpa.org/#/mac-pseudo-daemon";
+ 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";
@@ -43146,14 +43524,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 ];
@@ -43186,12 +43564,12 @@
magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
melpaBuild {
pname = "magit";
- version = "20170711.1307";
+ version = "20170913.343";
src = fetchFromGitHub {
owner = "magit";
repo = "magit";
- rev = "33201f76c27d21e91c2137aa5f19db18b2adb2e5";
- sha256 = "0749yvycd66ddg1wzzyzv8d2z6rxhlrizn83q0gm1zbz296s7rkb";
+ rev = "ae72710292a94d9af92799d3ddeb86f365f34a56";
+ sha256 = "1344dcngdk899xi9wjipvngq50xggbv06fb1w09zjzs8ckpsh8gf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit";
@@ -43337,6 +43715,27 @@
license = lib.licenses.free;
};
}) {};
+ magit-imerge = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
+ melpaBuild {
+ pname = "magit-imerge";
+ version = "20170805.819";
+ src = fetchFromGitHub {
+ owner = "magit";
+ repo = "magit-imerge";
+ rev = "1cd0fa843095f4ce8aa4eae89476c116414d060c";
+ sha256 = "1h9m0miiv44az4bigg5gjgkpdgdy4hh114kavzjgjhmw5zsg6qfg";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e78a5c27eedfc9b1d79e37e8d333c5d253f31a3c/recipes/magit-imerge";
+ sha256 = "0rycmbsi2s7rjqfpcv794vhkybav7d8ikzdaxai36szxpg9pzhj4";
+ name = "magit-imerge";
+ };
+ packageRequires = [ emacs magit ];
+ meta = {
+ homepage = "https://melpa.org/#/magit-imerge";
+ license = lib.licenses.free;
+ };
+ }) {};
magit-lfs = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
melpaBuild {
pname = "magit-lfs";
@@ -43365,8 +43764,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";
@@ -43382,12 +43781,12 @@
magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "magit-popup";
- version = "20170709.510";
+ version = "20170913.343";
src = fetchFromGitHub {
owner = "magit";
repo = "magit";
- rev = "33201f76c27d21e91c2137aa5f19db18b2adb2e5";
- sha256 = "0749yvycd66ddg1wzzyzv8d2z6rxhlrizn83q0gm1zbz296s7rkb";
+ rev = "ae72710292a94d9af92799d3ddeb86f365f34a56";
+ sha256 = "1344dcngdk899xi9wjipvngq50xggbv06fb1w09zjzs8ckpsh8gf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup";
@@ -43466,12 +43865,12 @@
magit-tbdiff = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
melpaBuild {
pname = "magit-tbdiff";
- version = "20170627.2023";
+ version = "20170725.1850";
src = fetchFromGitHub {
owner = "magit";
repo = "magit-tbdiff";
- rev = "c9522a98bcdafc2d8ef3f3beb9ebe05daa42e577";
- sha256 = "1nv5a8wfrsh41rvgzi1clwjdr9nc0g5rpgcjs1rvgncn7pjd5pi9";
+ rev = "1d1333af9d76b9e832212e9da152397df65f7205";
+ sha256 = "1rhjqvdg43n0qa9qdq9rlq4v8msy48y912m9dcjdvsaw45hh8062";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ad97eea866c8732e3adc17551d37a6d1ae511e6c/recipes/magit-tbdiff";
@@ -43508,12 +43907,12 @@
magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub-plus, lib, magit, melpaBuild, s }:
melpaBuild {
pname = "magithub";
- version = "20170516.612";
+ version = "20170901.1234";
src = fetchFromGitHub {
owner = "vermiculus";
repo = "magithub";
- rev = "7fd7343c3c87df56c7c7dd6c41a80b14291b1ac4";
- sha256 = "0a0q94lvk0rzj4r7hchypp197rj561d2a28jfzrfvvhq6x9vb4im";
+ rev = "7051c1bf8e316b116430be63c55b3010578c3eb4";
+ sha256 = "0jga49kwp47m39nsp2a12vwaj5n54zgcjnfq214fjjdcdrqcl3n7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/magithub";
@@ -43575,8 +43974,8 @@
src = fetchFromGitHub {
owner = "emacsfodder";
repo = "emacs-mainline";
- rev = "0e88f91e49ef27cb77d74f6a8d8140063549d67f";
- sha256 = "06sjwl0bk648wnnrmyh6qgnlqmxypjmy0gkfl6kpv01r8vh7x2q5";
+ rev = "2ef3175854f5b6c85f2e1bed26507cdca2f6ad16";
+ sha256 = "1zkm51gp1lkaz6n8ixf31rwjqms49mi8qdq10a7nibdzivpj8mg7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/main-line";
@@ -43673,22 +44072,22 @@
license = lib.licenses.free;
};
}) {};
- makefile-executor = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, s }:
+ makefile-executor = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "makefile-executor";
- version = "20170626.533";
+ version = "20170913.56";
src = fetchFromGitHub {
owner = "thiderman";
repo = "makefile-executor.el";
- rev = "5502f07a13b7d6860715faf70966721a11506b22";
- sha256 = "1727i7nmm1i0cc8i2c1912irhb9vvk82xb0ac3ypjzi0s22k2fnf";
+ rev = "90872c2e2ab05da7e8a9dd195fc696b4388c0f35";
+ sha256 = "03505bzrlz8jxp5fda5zqn58860xbhhz5xy33wvnh1w9632ljdg9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/08f8b4d680e4907dbd8ea46a75d98aa0e93c2bb9/recipes/makefile-executor";
sha256 = "0889rq2a7ks2ynyq91xsa2kpzgd72kzbjxx0b34w8faknpj3b6hi";
name = "makefile-executor";
};
- packageRequires = [ dash emacs f projectile s ];
+ packageRequires = [ dash emacs f s ];
meta = {
homepage = "https://melpa.org/#/makefile-executor";
license = lib.licenses.free;
@@ -43739,12 +44138,12 @@
malinka = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, rtags, s }:
melpaBuild {
pname = "malinka";
- version = "20170628.151";
+ version = "20170723.1635";
src = fetchFromGitHub {
owner = "LefterisJP";
repo = "malinka";
- rev = "b8ec090cb57a78265650586f71f00c4c9e054e27";
- sha256 = "0wii0ylgdci69r1zjcrk7bh68dl25ry63cfwgdii9x217lmbn9qw";
+ rev = "8072d159dae04f0f1a87b117ff03f9f1eb33f6cb";
+ sha256 = "0s5dcm11nw88j1n4asqpm92z0csjv3jvh06f4qqghfvcym8qv44h";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/malinka";
@@ -43865,12 +44264,12 @@
mandm-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mandm-theme";
- version = "20170304.1401";
+ version = "20170903.306";
src = fetchFromGitHub {
owner = "choppsv1";
repo = "emacs-mandm-theme";
- rev = "cd1505c8bcff0a3de821f0b419f897f4b0378b01";
- sha256 = "1spj3mlydwnngccrny27p8s3m75n039hipqvzqskdg7p1hvr6m59";
+ rev = "889cdcb8ea7234d2e6d9dad663e39bd5f872c28d";
+ sha256 = "0x7fhzsx7pcbyy5dkx9aa2qvpnn7psc3nf8mqv96mvnzr5q1xg53";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mandm-theme";
@@ -43886,12 +44285,12 @@
mandoku = callPackage ({ fetchFromGitHub, fetchurl, git, github-clone, lib, magit, melpaBuild, org }:
melpaBuild {
pname = "mandoku";
- version = "20170614.306";
+ version = "20170908.247";
src = fetchFromGitHub {
owner = "mandoku";
repo = "mandoku";
- rev = "01255150a80ada47bf3708daa93069ac3011831f";
- sha256 = "1djlzcg6dl29rifdss3cy0g3xmscblqvkfwzykiqs2y7vl51r60b";
+ rev = "14e2d3f7586001ae4b44582ef03728eaf8326643";
+ sha256 = "0c1n5lnllm9mqar68jxm9sr5kyzl4v4ckrdmms68a9rvcfrbn6lg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1aac4ae2c908de2c44624fb22a3f5ccf0b7a4912/recipes/mandoku";
@@ -43907,15 +44306,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";
};
@@ -44062,12 +44461,12 @@
markdown-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "markdown-mode";
- version = "20170712.1703";
+ version = "20170830.2131";
src = fetchFromGitHub {
owner = "jrblevin";
repo = "markdown-mode";
- rev = "ea5549233b3ce1536dae3a4793df79971a3781da";
- sha256 = "1gm76j4w0fv7194dkhky5pxrrwysi4n0n0v0dnl6wp079irc7kcj";
+ rev = "2d790a7c72546b96b3fdf57e7b7d6af1663fb721";
+ sha256 = "0jfldbw7wpy05rq7xzxm5w49pwcnsz97l1ajh3g526lbj76p2rnl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/74610ec93d4478e835f8b3b446279efc0c71d644/recipes/markdown-mode";
@@ -44125,12 +44524,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";
@@ -44363,12 +44762,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";
@@ -44528,12 +44927,12 @@
mbo70s-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mbo70s-theme";
- version = "20141122.642";
+ version = "20170808.615";
src = fetchFromGitHub {
owner = "emacsfodder";
repo = "emacs-mbo70s-theme";
- rev = "d50414697760896dbe6b06d2a00c271c16e0e4a2";
- sha256 = "1vr85fdlb4zwgid1v00ndppla9fqqk25g2x2f5alm69pfqssr75z";
+ rev = "bed3db8965708ed4e9482b224a9b084765c052f2";
+ sha256 = "19hha9xwfqvdgsws69x0mcm93yfllp44hdl1xw9zlhj8f4ihizh5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b8d0c1050b3319e136fe75903ae3612a52790189/recipes/mbo70s-theme";
@@ -44570,12 +44969,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";
@@ -44612,12 +45011,12 @@
mediawiki = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mediawiki";
- version = "20170418.1035";
+ version = "20170812.2255";
src = fetchFromGitHub {
owner = "hexmode";
repo = "mediawiki-el";
- rev = "e1adf088e621c3446d04cb2222756edcb03eb363";
- sha256 = "00yh92g9if4vgh2qzgf9ji8k88gj9k2k9ap055r4mlg3fcyf1r4n";
+ rev = "8473e12d1839f5287a4227586bf117dad820f867";
+ sha256 = "03rpj3yrk3i1l9yjnamnx38idn6y4zi9zg53bc83sx3g2b4m5v04";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/865e0ba1dbace58784181d214000d090478173bd/recipes/mediawiki";
@@ -44633,12 +45032,12 @@
meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
melpaBuild {
pname = "meghanada";
- version = "20170628.2045";
+ version = "20170723.1724";
src = fetchFromGitHub {
owner = "mopemope";
repo = "meghanada-emacs";
- rev = "b507fc0e6fa4b6f1b05c46ecf563ad0af69e263a";
- sha256 = "0kiib5wchqhxm8rsxp3mfp3zdbgg57gbn8y70j5msa2sxdz26mm7";
+ rev = "af65a0c60bbdda051e0d8ab0b7213249eb6703c5";
+ sha256 = "08sxy81arypdj22bp6pdniwxxbhakay4ndvyvl7a6vjvn38ppzw8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
@@ -44675,12 +45074,12 @@
mellow-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mellow-theme";
- version = "20141115.2302";
+ version = "20170808.617";
src = fetchFromGitHub {
owner = "emacsfodder";
repo = "emacs-mellow-theme";
- rev = "ab72898824af6452d0cefea16e49491e42b660d1";
- sha256 = "0bilwhvprzk634sk5hnxilrvrl0yv593swzznch0p38hqxl585ld";
+ rev = "2bdf18f05f5212b6f269d9a94afe2cf201766891";
+ sha256 = "0cj9lkqgiaq1s2k9ky93jgv5pfbmjznsd54r3iqkiy1zshpkir68";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/mellow-theme";
@@ -44714,36 +45113,15 @@
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";
- version = "20130421.1234";
+ version = "20170720.1802";
src = fetchFromGitHub {
owner = "skeeto";
repo = "emacs-memoize";
- rev = "b55eab0cb6ab05d941e07b8c01f1655c0cf1dd75";
- sha256 = "0fjwlrdm270qcrqffvarw5yhijk656q4lam79ybhaznzj0dq3xpw";
+ rev = "636defefa9168f90bce6fc27431352ac7d01a890";
+ sha256 = "04qgnlg4x6va7x364dhj1wbjmz8p5iq2vk36mn9198k2vxmijwzk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6cc9be5bbcff04de5e6d3bb8c47d202fd350989b/recipes/memoize";
@@ -44800,10 +45178,10 @@
}) {};
menu-bar-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
pname = "menu-bar-plus";
- version = "20170618.1417";
+ version = "20170720.710";
src = fetchurl {
url = "https://www.emacswiki.org/emacs/download/menu-bar+.el";
- sha256 = "1ah2yjagpkvwahki81ixviq9pgwnjna8z893xad31rj0qmwr8bzw";
+ sha256 = "0yq995jyfw3a1dj49a4wnavfb29amw575dajps6nbv0g1q0rnwkf";
name = "menu-bar+.el";
};
recipeFile = fetchurl {
@@ -44820,12 +45198,12 @@
merlin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "merlin";
- version = "20170204.628";
+ version = "20170731.907";
src = fetchFromGitHub {
owner = "the-lambda-church";
repo = "merlin";
- rev = "957e551140587f0cd83d9186a06fba10a38c6084";
- sha256 = "1df6cx7y5i35cmfi5c4b48iys21cszrvlh039cdbkmy6d0pdbvi7";
+ rev = "b53e4beeeb8da6d7cb035990a7e805fea5da0de6";
+ sha256 = "1lw0s78zwr8rd4q4pg34m9q8yd5swh1fff3c5p992a2qlzfb0hax";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b1b9bfd3164e62758dc0a3362d85c6627ed7cbf8/recipes/merlin";
@@ -44841,12 +45219,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";
@@ -44990,8 +45368,8 @@
src = fetchFromGitHub {
owner = "kazu-yamamoto";
repo = "Mew";
- rev = "7ea2baefff668263bf011c72879c2aa88125f2de";
- sha256 = "1i7i600hj76ggn1jwlj8r60kf157pxj88a4wwp1lasz91wp6msdv";
+ rev = "36b36a154dab22e112cc19675cfd73478f2a5956";
+ sha256 = "01wqa5pf6zjxgsgzqw0pnp278vfd7livfgyqvc24xfqr519k2ifq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/362dfc4d0fdb3e5cb39564160de62c3440ce182e/recipes/mew";
@@ -45049,16 +45427,16 @@
mic-paren = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mic-paren";
- version = "20150110.1816";
+ version = "20170731.1207";
src = fetchFromGitHub {
- owner = "emacsmirror";
+ owner = "emacsattic";
repo = "mic-paren";
- rev = "d0332fae515af2fa461d19afa7f933588afc327f";
- sha256 = "0l7xfana2cb894w5qi6wwx7w9k89c3i8k40fpsd93sm3hgi5ryii";
+ rev = "d0410c7d805c9aaf51a1bcefaaef092bed5824c4";
+ sha256 = "0f24ibzgra94bwal8b0dpjxa11n42gkmanqswfnjhlvx052v9dxr";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/mic-paren";
- sha256 = "042dzp0nal18nxq94qlwwksh0nnypsyc0yykmc6l3kayp9pv4hw7";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0e54eac31fbbce9a778fb654f07e11aaaa46ca/recipes/mic-paren";
+ sha256 = "17j0b8jyr0zx6zds2dz5fzvarm2wh8l5hxds2s90kh5z0kk23r07";
name = "mic-paren";
};
packageRequires = [];
@@ -45091,12 +45469,12 @@
midje-mode = callPackage ({ cider, clojure-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "midje-mode";
- version = "20150921.1750";
+ version = "20170808.2103";
src = fetchFromGitHub {
owner = "dnaumov";
repo = "midje-mode";
- rev = "07fc6cee4f5d6aa4187636266b9681a3e455ab6b";
- sha256 = "1cigsr0hkbi1860w38k2j8fw6j4w43pgv2bpkmdsifbqy6l8grpg";
+ rev = "10ad5b6084cd03d5cd268b486a7c3c246d85535f";
+ sha256 = "0nag9ks7qbg40h9z954v42x8zi65wbgfhviwvxvb2bmbzv4m4pbs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/midje-mode";
@@ -45346,8 +45724,8 @@
src = fetchFromGitHub {
owner = "arthurnn";
repo = "minitest-emacs";
- rev = "e5c82aac7542c5648881bb612fa20fe2b99ffb15";
- sha256 = "09iqbmmvi28sn5c6iaq6r6q4a4003cy6bb4zihajq0di55zls3aa";
+ rev = "1aadb7865c1dc69c201cecee275751ecec33a182";
+ sha256 = "1l18zqpdzbnqj2qawq8hj7z7pl8hr8z9d8ihy8jaiqma915hmhj1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/41b2e55c0fe48267dc4f55924c782c6f934d8ca4/recipes/minitest";
@@ -45444,10 +45822,10 @@
}) {};
misc-cmds = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
pname = "misc-cmds";
- version = "20170307.847";
+ version = "20170823.842";
src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/misc-cmds.el?revision=103";
- sha256 = "1w58z2j95sycgkakgb9anlc3q73v77whspi9a4j1kf6lmcbpyms8";
+ url = "https://www.emacswiki.org/emacs/download/misc-cmds.el?revision=104";
+ sha256 = "1spds0fkbvk1br3lpaq3ifyvq0vk5rvyyx5x3cmrvpd0m5s01h87";
name = "misc-cmds.el";
};
recipeFile = fetchurl {
@@ -45480,6 +45858,27 @@
license = lib.licenses.free;
};
}) {};
+ mixed-pitch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "mixed-pitch";
+ version = "20170723.955";
+ src = fetchFromGitHub {
+ owner = "jabranham";
+ repo = "mixed-pitch";
+ rev = "6a4fbb9c48fc345d4d40228e8b686f6f2e585f8a";
+ sha256 = "14hpcx75rb41fya8i8qk6cg388wgkhhxnj64ywar3pycngm8jwl9";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/20e85b11dc864500d44b25e36c5e7c4c67c1ebe2/recipes/mixed-pitch";
+ sha256 = "1910x5mssxmzzdmllmbqd3ihx0x8s50qf5dx86wal7aja9rris1z";
+ name = "mixed-pitch";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/mixed-pitch";
+ license = lib.licenses.free;
+ };
+ }) {};
mkdown = callPackage ({ fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }:
melpaBuild {
pname = "mkdown";
@@ -45545,12 +45944,12 @@
mmm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mmm-mode";
- version = "20170220.1548";
+ version = "20170808.1814";
src = fetchFromGitHub {
owner = "purcell";
repo = "mmm-mode";
- rev = "631e7f12d1641cb40e650134f35f2680a1a310a1";
- sha256 = "0lwvh7f6hmjfdgidshqz25pihyd5bg87y23mbhkjb7qkdjas07wb";
+ rev = "c68cee0beaeb99c5bd178fab6fec995bce4e501f";
+ sha256 = "1k13q5hwb2p2bq5j84pln9kx18bs2x9zfnzgqm4acrxjp9hnknlc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/mmm-mode";
@@ -45570,8 +45969,8 @@
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "mmt";
- rev = "1d89502ea4b0f6a7da327a95f104f5c11e662493";
- sha256 = "1pqarm9gpzc5qyiqr2713q1xn1p20kl5shrmm77m150z4qfhxzhx";
+ rev = "5cc5d1ee3efe675fa49d62fe0ae6b483d7ad9392";
+ sha256 = "1vkj28351si30l3szjpkdgjlmp2vfjp6jxk3dvlbxicfqd1k823p";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d1137bb53ecd92b1a8537abcd2635602c5ab3277/recipes/mmt";
@@ -45584,19 +45983,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 = [];
@@ -45650,12 +46049,12 @@
mocha = callPackage ({ f, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
melpaBuild {
pname = "mocha";
- version = "20170712.907";
+ version = "20170813.1957";
src = fetchFromGitHub {
owner = "scottaj";
repo = "mocha.el";
- rev = "60189c67a4800059411f71ca800d911240e8d22e";
- sha256 = "1hqyy7piaara1hgba2jys923y395kpcf6i312zaw472ksixqhw7y";
+ rev = "ce9e42adf9333c68967597c17272b3a3c7564cea";
+ sha256 = "1cl4ncmynhrvmllbkkwnw3064vw93xalk4zzy4bpb2zf74vwl1gy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/39c26134ba95f277a4e9400e506433d96a695aa4/recipes/mocha";
@@ -45717,8 +46116,8 @@
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "modalka";
- rev = "f2b2e206105332620b97c1f3bfd6cb03469db98f";
- sha256 = "09wg7hbigk3084nvjw0ikfs9hgdp1ip0spmrsx70iq18xgv5fm37";
+ rev = "7ee76939b9269c652f93065a8fcc7da24434a167";
+ sha256 = "0drhrid8gb9rk9rl8afsf3ninjzs4p78lnrp285xkhwn7hlri4v9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fa0a02da851a603b81e183f461da55bf4c71f0e9/recipes/modalka";
@@ -45818,8 +46217,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";
@@ -45944,8 +46343,8 @@
src = fetchFromGitHub {
owner = "ananthakumaran";
repo = "monky";
- rev = "190079ea4d22a4e875a3b2892e58737344cb2b26";
- sha256 = "01d7mbpkkb36lk6g9gkxlj3b58c23nqfmh7m5qq7xz90kd42316g";
+ rev = "62fc907cb541aef1c253d6bcd60447156e6f064c";
+ sha256 = "1qxykx8ccm4k95ncnzy8pspqgmz29pvqha5dg8al4zq20bms98s5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9b33d35e3004f3cc8a5c17aa1ee07dd21d2d46dc/recipes/monky";
@@ -45965,12 +46364,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 = [];
@@ -46003,12 +46402,12 @@
monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "monokai-theme";
- version = "20170705.1152";
+ version = "20170731.504";
src = fetchFromGitHub {
owner = "oneKelvinSmith";
repo = "monokai-emacs";
- rev = "71bcced6da1033822ea52e4ac9f312f9d6b5e062";
- sha256 = "1kwngvpih9q7wkdv6ayisi2c22xi9jh9jffd4qzc652p26yhmzq6";
+ rev = "8dacce10f3c2d362c4fb39485a3f33c3b911b8b3";
+ sha256 = "1j6zz9lkr4n5k758qqmk3n0w69fi9grgcv8zqvhxx7yvpk9c8nvs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme";
@@ -46045,12 +46444,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";
@@ -46251,12 +46650,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";
@@ -46297,8 +46696,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";
@@ -46437,27 +46836,6 @@
license = lib.licenses.free;
};
}) {};
- mpg123 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "mpg123";
- version = "20170313.715";
- src = fetchFromGitHub {
- owner = "emacsmirror";
- repo = "mpg123";
- rev = "d1dd8c56428ae55df9e23ba26f102588001d55be";
- sha256 = "1faqz3svh9l14617d39b8c7gfgf7kxf4q6d0k2q6y8whfljnbyvm";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/714d40891ab697b6303a3e25df2cb8adf04942f3/recipes/mpg123";
- sha256 = "184ip9pvv4zkfxnrzxbfajjadc9f4dz4psn33f9x3sfh7s1y4nw8";
- name = "mpg123";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/mpg123";
- license = lib.licenses.free;
- };
- }) {};
mpv = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, names, org }:
melpaBuild {
pname = "mpv";
@@ -46503,12 +46881,12 @@
mtg-deck-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mtg-deck-mode";
- version = "20170506.1701";
+ version = "20170904.2002";
src = fetchFromGitHub {
owner = "mattiasb";
repo = "mtg-deck-mode";
- rev = "55d493b2e4ad0d931659d1785bcdacc6f16bed07";
- sha256 = "1fp9q094glk4m2l6hf51ryj1qi4g3q7134hf6qjf707xv2vjcihm";
+ rev = "c1ab6dbfbe83d0c90f2c9ba4dfeb31b09f1fb875";
+ sha256 = "1xyd827b6wfdbhzj2ba4mywikfjwjs9xspn2aksbsl2bcby0n6zn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/425fa66cffe7bfda71de4ff2b49e951456bdeae1/recipes/mtg-deck-mode";
@@ -46545,12 +46923,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";
@@ -46648,12 +47026,12 @@
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 = "7e99fd560b15a6176a5ccfcac0af4ef9e8dd0656";
- sha256 = "01dsnpfwkycmq3kiy76hz92bm1hq4rqqg3kp56scy05sz9biqzkc";
+ rev = "d3ce76b6aec62f96ef2c0409d8262fd39e67dccc";
+ sha256 = "0kysz7l18z3fkzygpdnqf2ancixrwyzh6n49jgk0c50lhhqj324x";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0f8eee6798a0ba71d437a1cbf82e360a5b60eafb/recipes/multi-line";
@@ -46773,12 +47151,12 @@
multiple-cursors = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "multiple-cursors";
- version = "20170713.1847";
+ version = "20170908.1452";
src = fetchFromGitHub {
owner = "magnars";
repo = "multiple-cursors.el";
- rev = "c94566597a80c07a1782a75644fe1a2ca4f29bad";
- sha256 = "0g4w3xcwazdm6f07n00jgdkv5blrd9aaqmwbx28lm1qq3v6w0xqp";
+ rev = "10752700084595bb24712c27ba70a2326302e45b";
+ sha256 = "1hg693xq45bjxdla4drn6qn0np417hyvw6x3bmhfykg6lpibslz6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a5f015e6b88be2a5ded363bd882a558e94d1f391/recipes/multiple-cursors";
@@ -46857,12 +47235,12 @@
mustang-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mustang-theme";
- version = "20141017.1623";
+ version = "20170719.246";
src = fetchFromGitHub {
owner = "mswift42";
repo = "mustang-theme";
- rev = "79c3381dd50601775402fe2fddd16fffa9218837";
- sha256 = "19qd34dcfspv621p4y07zhq2pr8pwss3lcssm9sfhr6w2vmvgcr4";
+ rev = "dda6d04803f1c9b196b620ef564e7768fee15de2";
+ sha256 = "0pg3iay0iinf361v4ay8kizdxs5rm23ir556cwwgz3m3gbs0mgsh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2ed3691edd1cba6abc0c30d2aab732e2ba51bf00/recipes/mustang-theme";
@@ -46878,12 +47256,12 @@
mustard-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mustard-theme";
- version = "20141115.2302";
+ version = "20170808.619";
src = fetchFromGitHub {
owner = "emacsfodder";
repo = "emacs-mustard-theme";
- rev = "33bc6e3a0e2abc5668afdb349bca7e8b5730582c";
- sha256 = "170qhbbvcv9dg6jzfd9r95in5m8z1k647mn0gaqflfj0hvq5hwgf";
+ rev = "3b15d992c79590d7ea2503004e2a863b57e274b5";
+ sha256 = "01ak4ayk46jqawlbb9cqliiqhnn68cq27kryamibdpds8sq0ch83";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/mustard-theme";
@@ -46957,27 +47335,6 @@
license = lib.licenses.free;
};
}) {};
- mwe-log-commands = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "mwe-log-commands";
- version = "20100703.541";
- src = fetchFromGitHub {
- owner = "emacsmirror";
- repo = "mwe-log-commands";
- rev = "8253f2a311f35b03f72a035744f0cbdd776ea17e";
- sha256 = "0qdlbyq47gr65yq5ri8s9lxw4wp9fmyqc2prkh560d4hkvw60aw3";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mwe-log-commands";
- sha256 = "1nf3rd5i4r61z64apkqi5wx60fpshx5px0y53jqf0rk86708l6wx";
- name = "mwe-log-commands";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/mwe-log-commands";
- license = lib.licenses.free;
- };
- }) {};
mwim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mwim";
@@ -47086,12 +47443,12 @@
mysql2sqlite = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "mysql2sqlite";
- version = "20151123.1339";
+ version = "20170725.1516";
src = fetchFromGitHub {
owner = "echosa";
repo = "emacs-mysql2sqlite";
- rev = "07415c5fcd895ebccf1b774d0eab175f2700652f";
- sha256 = "0q5809hq22hyzxx5xr2hwwf3jh3qlpf3mkbl3fxqq93gm16plh1i";
+ rev = "8e6e74451c942e2e92f90dc13222b95a7dbb285e";
+ sha256 = "18jriaj391n4wr0qiva68jf482yx9v9l4xagbzl9vw125lszkngb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9841d3cfd1ee954eb0ab9b2ca3a3f605eb0fd22a/recipes/mysql2sqlite";
@@ -47125,27 +47482,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";
@@ -47418,10 +47754,10 @@
}) {};
narrow-indirect = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
pname = "narrow-indirect";
- version = "20170307.921";
+ version = "20170820.1748";
src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/narrow-indirect.el?revision=13";
- sha256 = "1sdyya2gmmd2h39kmijf514y3vln6ax5xdfsrkx1hcalw4l418gh";
+ url = "https://www.emacswiki.org/emacs/download/narrow-indirect.el?revision=14";
+ sha256 = "16knfw5h15f7al6sn1n40bcw2ahqsy9ipkvfk0h7r1vlpb92w2fq";
name = "narrow-indirect.el";
};
recipeFile = fetchurl {
@@ -47627,12 +47963,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";
@@ -47666,6 +48002,27 @@
license = lib.licenses.free;
};
}) {};
+ neato-graph-bar = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "neato-graph-bar";
+ version = "20170731.2341";
+ src = fetchFromGitLab {
+ owner = "RobertCochran";
+ repo = "neato-graph-bar";
+ rev = "3ebd5168c9b8cc56cc4163206c03864b9b802f27";
+ sha256 = "133k1lwmb7ky91ij03nd4vipkivvx4bz56m4waf1pdmaynsidy6j";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/49c5bd4e1506a28ada9856e5f70e520890123d16/recipes/neato-graph-bar";
+ sha256 = "1p4jmla75ny443cv7djk3nvl3ikchllnsivxx9yds14ynk4jxhgb";
+ name = "neato-graph-bar";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/neato-graph-bar";
+ license = lib.licenses.free;
+ };
+ }) {};
nemerle = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "nemerle";
@@ -47673,8 +48030,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";
@@ -47900,12 +48257,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";
@@ -47918,56 +48275,15 @@
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;
- };
- }) {};
- nikola = callPackage ({ async, emacs, fetchgit, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "nikola";
- version = "20170703.1321";
- src = fetchgit {
- url = "https://git.daemons.cf/drymer/nikola.el/";
- rev = "964715ac30943c9d6976999cad208dc60d09def0";
- sha256 = "0b0bpw9r2xi1avzq76pl58bbk1shb57d3bmzd9d53d07gj5c9399";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/89354d06dddc3be4b952e3f0b86d11824064dd97/recipes/nikola";
- sha256 = "1i6z4gkh52fr9s506dqr3ccczank7c8zr0q1bg8ik5gbna0jv705";
- name = "nikola";
- };
- packageRequires = [ async emacs ];
- meta = {
- homepage = "https://melpa.org/#/nikola";
- license = lib.licenses.free;
- };
- }) {};
nim-mode = callPackage ({ commenter, emacs, epc, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }:
melpaBuild {
pname = "nim-mode";
- version = "20170716.948";
+ version = "20170830.2113";
src = fetchFromGitHub {
owner = "nim-lang";
repo = "nim-mode";
- rev = "05ac362f97874d50131ea38277cf95a5cfecb250";
- sha256 = "0phxkvi1s49grc717iprg96dalb5w2jcj1dfyrh339xny11f2hqb";
+ rev = "bc3af5a44f4272a8afa6e6c09f95f1cdd205c70e";
+ sha256 = "1spyz9n1p6n4npm6j4ngr89n7y2f33kp2xj6jwvd4y4340g62m49";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/dc2ccb5f24b9d55c77eaa7952a9e6a2e0ed7be24/recipes/nim-mode";
@@ -47983,12 +48299,12 @@
nimbus-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "nimbus-theme";
- version = "20170412.758";
+ version = "20170909.1336";
src = fetchFromGitHub {
owner = "m-cat";
repo = "nimbus-theme";
- rev = "ce999b8d152b9b15d75f66fe22b84827167c8311";
- sha256 = "08bfp2xm8ylkmb4rby15f6xx51qppd2g01i3mg2wwb8kvlwz6s4w";
+ rev = "71b3a560e6d017907f43f7dd074d300653c1588b";
+ sha256 = "0ip330ylvy6rwgvqravm58qh8ssbrd8nw2rbd3gbhcwiqakawsjl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fc0e6b456b76e2379c64a86ad844362c58146dc6/recipes/nimbus-theme";
@@ -48008,8 +48324,8 @@
src = fetchFromGitHub {
owner = "martine";
repo = "ninja";
- rev = "7bbc708ff08f5660f4cff4b3e8c675bec428a1f2";
- sha256 = "1iqv268yvvhs7nxf28105g3ya16js1ibzxl0is13i4hlkx9wiqw1";
+ rev = "87111bff382655075f2577c591745a335f0103c7";
+ sha256 = "1rmh2a2q3lw3wmnlh5y7g06nzhcgnhz5libgsjfl3jvpxzdlck76";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/aed2f32a02cb38c49163d90b1b503362e2e4a480/recipes/ninja-mode";
@@ -48025,12 +48341,12 @@
nix-buffer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "nix-buffer";
- version = "20170520.553";
+ version = "20170809.1128";
src = fetchFromGitHub {
owner = "shlevy";
repo = "nix-buffer";
- rev = "749f48b510d0fd47dac67850f4089119fbff142a";
- sha256 = "1iav1s2vc2ivkah9v42961vpk74z8961ybyxq0cnswzjb1xi5n25";
+ rev = "b922497ea0af39fdf1a7e856d0cd2ce81d98d76f";
+ sha256 = "1db0cjsq99b1z6786g3j8y39vj3gga7x6yzkilxdp7z6scs1qdwr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/nix-buffer";
@@ -48043,22 +48359,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 = "4ec6eb1fdf513d93090d5898762d1186eb6feb0d";
- sha256 = "01vfj61rgfk0cyh1c4ai0ys0wjnjaqz6hdbg3b1dcfk4b09ydyjx";
+ repo = "nix-mode";
+ rev = "eb7623fb3b23afec25619a76adab6bab5e338bf2";
+ sha256 = "1shgbh2iawml605qhr1s8bcmy0by7d455lm70wb2wkznsdlwv6wp";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode";
- sha256 = "00rqawi8zs2x79c91gmk0anfyqbwalvfwmpak20i11lfzmdsza1s";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/4c885d9d9f1a37f05c715f89fae51efb580faced/recipes/nix-mode";
+ sha256 = "15xgqgrkypcplnfvl5j6w8abayzz8q0nw2wav01sdyx39ym005k3";
name = "nix-mode";
};
- packageRequires = [];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/nix-mode";
license = lib.licenses.free;
@@ -48172,15 +48488,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";
};
@@ -48193,16 +48509,16 @@
no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "no-littering";
- version = "20170702.457";
+ version = "20170906.558";
src = fetchFromGitHub {
- owner = "tarsius";
+ owner = "emacscollective";
repo = "no-littering";
- rev = "8b689a1e16d4825d0221f4a41756b63bbc361c82";
- sha256 = "02cb5m1r5k1f6il79yv8fa5yiyz2m37awlbjjxmkv1av06kl0abn";
+ rev = "d1d649711c4ba63e458b229afdc64ed4639cf988";
+ sha256 = "0416i7gv89r46x30swvqhqf7na9rkpm0w9lw1v49kxqdrqqdci67";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering";
- sha256 = "129nyml8jx3nwdskcr2favbi3x6f74dblc6yw8vijw32w8z14k2l";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/no-littering";
+ sha256 = "15w784ir48v8biiaar8ip19s9y3wn5831m815kcw02mgzy3bfjmh";
name = "no-littering";
};
packageRequires = [ cl-lib ];
@@ -48211,6 +48527,27 @@
license = lib.licenses.free;
};
}) {};
+ noaa = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
+ melpaBuild {
+ pname = "noaa";
+ version = "20170719.1136";
+ src = fetchFromGitHub {
+ owner = "thomp";
+ repo = "noaa";
+ rev = "a4ec583275450d718334238d2813579420229f65";
+ sha256 = "0ah6b31x9f4lc6q984nilj4g0aqzam5rhb3s61jgx9k4x7jmdks1";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/1272203f85375e50d951451bd5fd3baffd57bbfa/recipes/noaa";
+ sha256 = "11hzpmgapmf6dc5imvj5jvzcy7hfddyz74lqmrq8128i72q1sj0v";
+ name = "noaa";
+ };
+ packageRequires = [ cl-lib emacs request ];
+ meta = {
+ homepage = "https://melpa.org/#/noaa";
+ license = lib.licenses.free;
+ };
+ }) {};
noccur = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "noccur";
@@ -48298,12 +48635,12 @@
nodejs-repl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "nodejs-repl";
- version = "20170607.1303";
+ version = "20170722.443";
src = fetchFromGitHub {
owner = "abicky";
repo = "nodejs-repl.el";
- rev = "f72a537700b08e14db28e6bcc1d6244bbeaefca4";
- sha256 = "1wha680gklq974wl2si3q024qhcdkqgicr6x3qrb9fhfkfr1nbjx";
+ rev = "4a4104dbf2cd314e90f35d200f28bd93c34708d0";
+ sha256 = "1hcvi4nhgfrjalq8nw20kjjpcf4xmjid70qpqdv8dsgfann5i3wl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/14f22f97416111fcb02e299ff2b20c44fb75f049/recipes/nodejs-repl";
@@ -48379,11 +48716,11 @@
}) {};
notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
pname = "notmuch";
- version = "20170715.511";
+ version = "20170912.1817";
src = fetchgit {
url = "git://git.notmuchmail.org/git/notmuch";
- rev = "4c6e3d83fb2d5d3ce04710d92b97ef6a59a11051";
- sha256 = "145313a0krav6lcalbpq6skyf2iw96c97v6cd7s6bci5i93w0mp3";
+ rev = "f2ed177e6260d835b8a13d2a53e1c8d5fa76edf2";
+ sha256 = "0d4110cai0z2h2gggx93wfm8fj2av4dwk57gf835crsmv8y3wkj7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
@@ -48417,6 +48754,27 @@
license = lib.licenses.free;
};
}) {};
+ nov = callPackage ({ dash, emacs, esxml, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "nov";
+ version = "20170910.1145";
+ src = fetchFromGitHub {
+ owner = "wasamasa";
+ repo = "nov.el";
+ rev = "91c4329f64ddc9a598fa6c58e1d9264aee073e72";
+ sha256 = "0x3ijjhjg2q8gdqf4hgr2d8wy32qhxy48kbz0slibkn9yik3pvlz";
+ };
+ 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;
+ };
+ }) {};
novice-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
pname = "novice-plus";
version = "20170307.925";
@@ -48439,12 +48797,12 @@
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";
@@ -48541,22 +48899,22 @@
license = lib.licenses.free;
};
}) {};
- nu-mode = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, transpose-frame, undo-tree }:
+ nu-mode = callPackage ({ fetchFromGitHub, fetchurl, helm, help-fns-plus, lib, melpaBuild, transpose-frame, undo-tree }:
melpaBuild {
pname = "nu-mode";
- version = "20160520.614";
+ version = "20170825.1300";
src = fetchFromGitHub {
owner = "pyluyten";
repo = "emacs-nu";
- rev = "347f6c958f20d6e8e46bc7122556405b3a434242";
- sha256 = "17nj8bkqw34hsbb8b51rl6221hlpxw265h2cwxqf64cswm22y313";
+ rev = "711b5bd53c77ba66987fe9807a4442084f67789e";
+ sha256 = "11iymqm51ky7k8ylwvcq770y8anaqn8giki63kf2a96f4rdglb1x";
};
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 = [ helm help-fns-plus transpose-frame undo-tree ];
meta = {
homepage = "https://melpa.org/#/nu-mode";
license = lib.licenses.free;
@@ -48586,12 +48944,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";
@@ -48628,12 +48986,12 @@
numbers = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "numbers";
- version = "20170712.238";
+ version = "20170802.434";
src = fetchFromGitHub {
owner = "davep";
repo = "numbers.el";
- rev = "74be68b94143f042ce461b2a69202f515acaf20c";
- sha256 = "0b4bgc4hkndia8zg4d23l1w78iwzj1l46ifrhz5z1p97qldalb0x";
+ rev = "dd02508b788a13b7d4dbcc4923fa23134b783ab3";
+ sha256 = "0bgha85j5f9lpk1h3siiw28v5sy6z52n7d7xi3m301r9hdlccc39";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5c77353d3a2b0d360bb28e528ef2707227081c72/recipes/numbers";
@@ -48716,8 +49074,8 @@
src = fetchFromGitHub {
owner = "TeMPOraL";
repo = "nyan-mode";
- rev = "4195cd368aca8f05a71cbff4e60cfa9dde10319a";
- sha256 = "1bnfxw6cnhsqill3n32j9bc6adl437ia9ivbwvwjpz1ay928yxm7";
+ rev = "3447aa114575230cb230862ac0ac9b065f789ecd";
+ sha256 = "1nlsgkll6gagn4bs092ad1glkcihlcac9ai4cbj63l8x9x346yqg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4d8c3000df5f2ee2493a54dee6f9b65008add753/recipes/nyan-mode";
@@ -48730,27 +49088,6 @@
license = lib.licenses.free;
};
}) {};
- nyan-prompt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "nyan-prompt";
- version = "20140809.2208";
- 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";
@@ -48858,12 +49195,12 @@
ob-blockdiag = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ob-blockdiag";
- version = "20170524.1605";
+ version = "20170727.1801";
src = fetchFromGitHub {
owner = "corpix";
repo = "ob-blockdiag.el";
- rev = "715e7d41124a98d3f1e38e430e3a7f31b52704e4";
- sha256 = "0mqi9hm00apq43mmabai05x96q4x0l29n9gvdhphzjrhvjabmm6l";
+ rev = "634fcf64a4ae735afe7001d865b03f5d71e23046";
+ sha256 = "0xr3bv4wxz13b1grfyl2qnrszzab3n9735za837nf4lxh527ksaj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/261b77a3fd07644d1c250b16857de70cc1bbf478/recipes/ob-blockdiag";
@@ -48879,12 +49216,12 @@
ob-browser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "ob-browser";
- version = "20150101.710";
+ version = "20170720.1218";
src = fetchFromGitHub {
owner = "krisajenkins";
repo = "ob-browser";
- rev = "9271453d28d0912093ab5f91807745ada69ada0c";
- sha256 = "1nzli8wk3nd05j2z2fw511857qbawirhg8mfw21wqclkz8zqn813";
+ rev = "a347d9df1c87b7eb660be8723982c7ad2563631a";
+ sha256 = "0q2amf2kh2gkn65132q9nvn87pws5mmnr3wm1ajk23c01kcjf29c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c51529213c15d42a7a7b76771f07dd73c036a51f/recipes/ob-browser";
@@ -48900,12 +49237,12 @@
ob-coffee = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "ob-coffee";
- version = "20160415.2036";
+ version = "20170725.724";
src = fetchFromGitHub {
owner = "zweifisch";
repo = "ob-coffee";
- rev = "dbfa5827df91ed1cdc5b0f3247da6b93fa632507";
- sha256 = "01l8zvnfpc1vihnpqj75xlvjkk2hkvxpb1872jdzv2k1na2ajfxm";
+ rev = "7f0b330273e8af7777de87a75fe52a89798e4548";
+ sha256 = "1w3fw3ka46d7vcsdq03l0wlviwsk52asfjiy9zfk4qabhpqwj9mz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e23d7f1d021b07053acb57e2668ece0eaed0f817/recipes/ob-coffee";
@@ -48921,12 +49258,12 @@
ob-coffeescript = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ob-coffeescript";
- version = "20170713.2356";
+ version = "20170719.121";
src = fetchFromGitHub {
owner = "brantou";
repo = "ob-coffeescript";
- rev = "6baabf3104e32ed151b0b9555db903a93a44db54";
- sha256 = "08mmwy69h7dihi120c9agv8v5c6y6ghc94gmpb0rfxdjim1lrkmq";
+ rev = "b70f3d822c707cb02333fcb739ba4874614cad2a";
+ sha256 = "0284v3km41427q7dr0wmvf3zhbsgzj0j2r9zny0g3n85qvyk0rgd";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ba1a808c77653bac1948d6c44bd1db09301ffeff/recipes/ob-coffeescript";
@@ -48939,15 +49276,36 @@
license = lib.licenses.free;
};
}) {};
+ ob-crystal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "ob-crystal";
+ version = "20170811.57";
+ src = fetchFromGitHub {
+ owner = "brantou";
+ repo = "ob-crystal";
+ rev = "4bfd36c922d28e8a204218bde0e889cd1097ec04";
+ sha256 = "00rlxm0gj2arcnjhy824id08gxpha73ikfipar780xm845ripm3j";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/b9a7d43199a83ab6f672aaa69ef4e158c868f180/recipes/ob-crystal";
+ sha256 = "11mk2spwlddbrvcimhzw43b6d3gxzmi8br58bily1x4qkvl6zy4n";
+ name = "ob-crystal";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/ob-crystal";
+ license = lib.licenses.free;
+ };
+ }) {};
ob-cypher = callPackage ({ cypher-mode, dash, dash-functional, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "ob-cypher";
- version = "20150224.1837";
+ version = "20170725.720";
src = fetchFromGitHub {
owner = "zweifisch";
repo = "ob-cypher";
- rev = "b3511df05f175c1947996802e9e199432ea9ced8";
- sha256 = "1xbczyqfqdig5w6jvx2kg57mk16sbiz5ysv445v83wqk0sz6nc9n";
+ rev = "114bdf6db20ee0ade060bb5df379ddee48ff4f26";
+ sha256 = "142d91jvf7nr7q2sj61njy5hv6ljhsq2qkvkdbkfqj07rgpwfgn3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/dc05c833f64e7974cf5a2ad60a053a04267251cb/recipes/ob-cypher";
@@ -48960,6 +49318,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";
@@ -49005,12 +49384,12 @@
ob-elixir = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "ob-elixir";
- version = "20151021.447";
+ version = "20170725.719";
src = fetchFromGitHub {
owner = "zweifisch";
repo = "ob-elixir";
- rev = "d0e8007efa0b99ab7a6e4cb7160a87d6cb60d210";
- sha256 = "0qknm1h2ijnzs1km51hqwpnv5083m9ngi3nbxd90r7d6vva5fhhk";
+ rev = "8990a8178b2f7bd93504a9ab136622aab6e82e32";
+ sha256 = "19awvfbjsnd5la14ad8cfd20pdwwlf3d2wxmz7kz6x6rf48x38za";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/287e4758f6f1df0152d68577abd91478c4a3f4ab/recipes/ob-elixir";
@@ -49047,12 +49426,12 @@
ob-go = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ob-go";
- version = "20170324.932";
+ version = "20170731.1057";
src = fetchFromGitHub {
owner = "pope";
repo = "ob-go";
- rev = "28183e10581fa5fe0f5b5a885cbde32cb4b053ba";
- sha256 = "1liggd9nbl90c6mc0iccchckwm1pw2lb23nn61y2p9c1hj9myhm8";
+ rev = "28a0250cd969974936e44dfdccb0265632d25f84";
+ sha256 = "1g595miqn7wdmphvgi06ijqzjy801nal226kbghk9p002s3xzzn0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3afb687d6d3d1e52336ca9a7343278a9f37c3d54/recipes/ob-go";
@@ -49089,12 +49468,12 @@
ob-ipython = callPackage ({ dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "ob-ipython";
- version = "20170628.1116";
+ version = "20170902.1253";
src = fetchFromGitHub {
owner = "gregsexton";
repo = "ob-ipython";
- rev = "a0ae4add0310d131c6b4b15139b929955cec93dd";
- sha256 = "019impk95mnplwzirllrrjjq17hczcq6aarqr959ca75jix8jysf";
+ rev = "ed1c2d580037c0592066e1f33c0581890dd09e2e";
+ sha256 = "0ciacp8llx0njkrcbzgs13srhjm2nxx0pr7v8ladlx0sfdsxj078";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/557c36e86844c211f2d2ee097ce51ee9db92ea8b/recipes/ob-ipython";
@@ -49110,12 +49489,12 @@
ob-kotlin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "ob-kotlin";
- version = "20170624.2050";
+ version = "20170725.718";
src = fetchFromGitHub {
owner = "zweifisch";
repo = "ob-kotlin";
- rev = "ebbd3fcd52a80c0579e896ad3cbb1484d0a55d00";
- sha256 = "037msvgvw42nl2wi335q4pfi8bqh3d1a5a6rdvzvpm1vh2fwywab";
+ rev = "3b2f57e9944cfc36f2714dc550db42159904929a";
+ sha256 = "1fgfl4j0jgz56a1w8h2mvnzisz123c1xz7ga380bg1hmy44dbv5j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7aa74d349eb55aafddfc4327b6160ae2da80d689/recipes/ob-kotlin";
@@ -49131,12 +49510,12 @@
ob-lfe = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "ob-lfe";
- version = "20150701.655";
+ version = "20170725.720";
src = fetchFromGitHub {
owner = "zweifisch";
repo = "ob-lfe";
- rev = "d50a5d76e389501504e060a7005f20b96c895594";
- sha256 = "1mk7qcf4svf4yk4mimcyhbw5imq3zps2vh2zzq9gwjcn17jnplhn";
+ rev = "f7780f58e650b4d29dfd834c662b1d354b620a8e";
+ sha256 = "1ricvb2wxsmsd4jr0301pk30mswx41msy07fjgwhsq8dimxzmngp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d595d3b93e6b25ece1cdffc9d1502e8a868eb538/recipes/ob-lfe";
@@ -49173,12 +49552,12 @@
ob-mongo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "ob-mongo";
- version = "20161130.152";
+ version = "20170720.1219";
src = fetchFromGitHub {
owner = "krisajenkins";
repo = "ob-mongo";
- rev = "d64a507c2f9e2a1f8062acae50199541fc23be65";
- sha256 = "0xlddh28z9afqj8j9brcncrbwsyqzmv432zayn9ajjj1vk1avsxg";
+ rev = "371bf19c7c10eab2f86424f8db8ab685997eb5aa";
+ sha256 = "02k4gvh1nqhn0h36h77vvms7xwwak8rdddibbidsrwwspbr4qr1s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e020ea3ef89a3787d498c2f698c82c5073c9ee32/recipes/ob-mongo";
@@ -49194,12 +49573,12 @@
ob-nim = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ob-nim";
- version = "20160830.220";
+ version = "20170809.1130";
src = fetchFromGitHub {
owner = "lompik";
repo = "ob-nim";
- rev = "050b165817e62067b0d686d96e25bc12fb9c7d84";
- sha256 = "18v4f23rxbl76ldzxmga1dlkammdy87aslk2p6x9l5gjr9w1xz3a";
+ rev = "bf1642cb93f0a898804dc13fd9408d2964403bd2";
+ sha256 = "1xgi863wn1pvlsajmldd706k1dk7d7pa6b9nbgsh34kzchvhd75s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7263ebadeabe36359c14ffb36deda2bc75f2ca61/recipes/ob-nim";
@@ -49215,12 +49594,12 @@
ob-php = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "ob-php";
- version = "20160505.219";
+ version = "20170819.245";
src = fetchFromGitHub {
owner = "stardiviner";
repo = "ob-php";
- rev = "fd30c5e945a08b605725cf51808b3512ca885777";
- sha256 = "02vmy3nnk4yyjbp3r7zzv9sb3frv7kbj4a2a855iqa0isp8nhyfi";
+ rev = "ffbda1f7df86778e3209ffeef832433f0eb25a69";
+ sha256 = "00ca5m6rmrxzy1aldmavv7f5i4pjfcyivrlgv2ri6dm8amvbk72r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/940a22790c9e5fd2f7729c71efad907683cc392c/recipes/ob-php";
@@ -49299,12 +49678,12 @@
ob-rust = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ob-rust";
- version = "20170619.802";
+ version = "20170730.759";
src = fetchFromGitHub {
owner = "micanzhang";
repo = "ob-rust";
- rev = "126ee38c6f560cac2ea6bbef034f92ff948d2664";
- sha256 = "1szayb60ibihjfd5ihij0cvjdmvcays1701h5ak0wpvqirdmyc60";
+ rev = "f23d93725c21ab95a44cb4d2c0c4ab0489bd55d9";
+ sha256 = "0indljqh6idfwza286gi9dkqwrndbnny4a5f7csz8gssmn0x3i30";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/843affc2fd481647c5377bf9a96b636b39718034/recipes/ob-rust";
@@ -49383,12 +49762,12 @@
ob-spice = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, spice-mode }:
melpaBuild {
pname = "ob-spice";
- version = "20160815.2249";
+ version = "20170801.2222";
src = fetchFromGitHub {
owner = "stardiviner";
repo = "ob-spice";
- rev = "0ea589f852de4b1eb239c985be9f960367aa5c1a";
- sha256 = "10cyqjqbv87n3d1m3v6vxlyk3xzazms6876ay30nhkd4dbsw8kak";
+ rev = "b296232e28f61366265084fafb2f47876d987069";
+ sha256 = "1s2jyx75xkqbkm9g4i3h1f0rz9ms5dbs7zqavdiswq9mr8qx1kwq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ob-spice";
@@ -49446,12 +49825,12 @@
ob-translate = callPackage ({ fetchFromGitHub, fetchurl, google-translate, lib, melpaBuild, org }:
melpaBuild {
pname = "ob-translate";
- version = "20160411.124";
+ version = "20170720.1219";
src = fetchFromGitHub {
owner = "krisajenkins";
repo = "ob-translate";
- rev = "bba3bd1e2dbb5c672543129460c2713f78b26120";
- sha256 = "086z3smcfn5g599967vmxj3akppyqk9d64acm8zzj76zj29xfk1k";
+ rev = "9d9054a51bafd5a29a8135964069b4fa3a80b169";
+ sha256 = "143dq3wp3h1zzk8ihj8yjw9ydqnf48q7y8yxxa0ly7f2v1li84bc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4d89e4006afc51bd44e23f87a1d1ef1140489ab3/recipes/ob-translate";
@@ -49530,12 +49909,12 @@
obfusurl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "obfusurl";
- version = "20170325.802";
+ version = "20170809.824";
src = fetchFromGitHub {
owner = "davep";
repo = "obfusurl.el";
- rev = "96c619fe4753062af93a12f44b67ba8aed22f2fb";
- sha256 = "176a8r4y4glrjssywvc2xzdbk987fs796zsj892xcamcmzc688na";
+ rev = "7a5a41905000ce2ec1fd72509a5567e5fd9f47e5";
+ sha256 = "0jbrxlpx0cxg8jzqrssk3y3ab7v62ymi6ys24542a8vpk522vqxk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/201fe11682cb06b26775a52c81b6a1258b74b4d0/recipes/obfusurl";
@@ -49572,12 +49951,12 @@
obsidian-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "obsidian-theme";
- version = "20140420.943";
+ version = "20170719.248";
src = fetchFromGitHub {
owner = "mswift42";
repo = "obsidian-theme";
- rev = "0f92ce87245529d5c75d6e5f7862ebbc54bdbc92";
- sha256 = "00v21iw9wwxap8jhg9035cp47fm5v2djmldq6nprv860m01xlwh1";
+ rev = "f45efb2ebe9942466c1db6abbe2d0e6847b785ea";
+ sha256 = "1d36mdq8b1q1x84a2nb93bwnzlpdldiafh7q7qfjjm9dsgbij73b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e90227252eb69d3eac81f5a6bd5e3a582d33f335/recipes/obsidian-theme";
@@ -49614,12 +49993,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";
@@ -49698,12 +50077,12 @@
ocp-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ocp-indent";
- version = "20170412.12";
+ version = "20170803.222";
src = fetchFromGitHub {
owner = "OCamlPro";
repo = "ocp-indent";
- rev = "d3f250b6029a7afec0d7ddd8770d9c4a7e5b9c7c";
- sha256 = "1h8w7vcaykhgf4vmrkp1c7y566bzi7av4cfvkp4l01817chrhyaz";
+ rev = "5d83bc71d12c89850cb0fdff50d4830adb705b6c";
+ sha256 = "0rcaa11mjqka032g94wgw9llqpflyk3ywr3lr6jyxbh1rjvnipnw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e1af061328b15360ed25a232cc6b8fbce4a7b098/recipes/ocp-indent";
@@ -49761,12 +50140,12 @@
octopress = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "octopress";
- version = "20161222.343";
+ version = "20170813.615";
src = fetchFromGitHub {
owner = "aaronbieber";
repo = "octopress.el";
- rev = "85bab12adbd985767233eb1622c4b8f7c1fe7e1a";
- sha256 = "012g0mf8g602f53x3bc35ahy4bq31s3m7cv13hm46zj8syvdckvq";
+ rev = "b4c25df9e3ccf49ac27c0a152daa4e27d1247d56";
+ sha256 = "0zidh929sc1wi695ibzglbybfvxz2rj1365mij97088wwdk5dyz8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7205d3d43797755077f19f57f531b4b39e77bae3/recipes/octopress";
@@ -49800,6 +50179,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";
@@ -49824,12 +50224,12 @@
olivetti = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "olivetti";
- version = "20160912.1758";
+ version = "20170823.1754";
src = fetchFromGitHub {
owner = "rnkn";
repo = "olivetti";
- rev = "de2716cfb1f4dc82a08093cdd00200e9bb1f07ef";
- sha256 = "0gfjrfhmjvq2zkyp0bgxymdv6r7p4x40aicvv1r61z29nz4dbyn2";
+ rev = "da7955aaea2a3f3ad07b457b9737a24534674e33";
+ sha256 = "11qvlwsy6l4v9jcdnf7g3yxy85g1qii4hmrpv6s85vbfsn9rxxw0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/697334ca3cdb9630572ae267811bd5c2a67d2a95/recipes/olivetti";
@@ -49992,12 +50392,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 = "20170716.926";
+ version = "20170909.319";
src = fetchFromGitHub {
owner = "OmniSharp";
repo = "omnisharp-emacs";
- rev = "ab4c6bb04cda35510fe751e546b5c0bb4dc3371d";
- sha256 = "0zkd5hp5xk0wjlv6nqi38dnhrzk7jzcd8546wqfw0my10kb1ycs2";
+ rev = "b425270bed93b427ff519d6f51ad1d97531a0a92";
+ sha256 = "0l9dk9idfsr21q0icx9fpgqyi4qlhnqal6sypak5zh8dgchrqif9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp";
@@ -50187,15 +50587,36 @@
license = lib.licenses.free;
};
}) {};
+ opencc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "opencc";
+ version = "20170722.116";
+ src = fetchFromGitHub {
+ owner = "xuchunyang";
+ repo = "emacs-opencc";
+ rev = "8c539f72669ba9a99d8b5198db5ea930897ad1b9";
+ sha256 = "140s88z0rsiylm8g1mzgc50ai38x79j004advin6lil5zcggxq3i";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/71bc5476b3670a9f5c3d3682c2e7852fc6c5fe60/recipes/opencc";
+ sha256 = "1dd62x0h3imil4g3psndxykp45jf83fm4afxcvvyayj45z099f4r";
+ name = "opencc";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/opencc";
+ license = lib.licenses.free;
+ };
+ }) {};
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";
@@ -50356,12 +50777,12 @@
org-alert = callPackage ({ alert, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "org-alert";
- version = "20170701.1855";
+ version = "20170724.2116";
src = fetchFromGitHub {
owner = "groksteve";
repo = "org-alert";
- rev = "169acc082643b6b793aab17ab7e0de3694e74698";
- sha256 = "0khk1jyy4vxsfalf27f53d1g9w41qq6i6c9xm670pj6xrf38hxj9";
+ rev = "3b7417ac12f2710e88f8dff538670621064ef8bc";
+ sha256 = "1hyl4b2r7wzdfr2m7x8pgpylia3z15fihn679xdiyc32rzy7k5vk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2976b7f9271bc46679a5774ff5f388b81a9f0cf8/recipes/org-alert";
@@ -50440,12 +50861,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";
@@ -50503,12 +50924,12 @@
org-brain = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "org-brain";
- version = "20170706.447";
+ version = "20170908.634";
src = fetchFromGitHub {
owner = "Kungsgeten";
repo = "org-brain";
- rev = "497c18f517074629394c4c30de03d985e0c5ca8c";
- sha256 = "1p1920f99ma3m2h0if3h9inlb8xgbb54mav0jn3jy8nfa9w7pch8";
+ rev = "9a84111f759c264bd6ab435995803d0f6234b78a";
+ sha256 = "00a92064bjlrjrmy7xcfc5ajajxviar82pjisdm4pxd3jcab8qcw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/47480fbae06e4110d50bc89db7df05fa80afc7d3/recipes/org-brain";
@@ -50584,6 +51005,27 @@
license = lib.licenses.free;
};
}) {};
+ org-category-capture = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+ melpaBuild {
+ pname = "org-category-capture";
+ version = "20170819.1047";
+ src = fetchFromGitHub {
+ owner = "IvanMalison";
+ repo = "org-projectile";
+ rev = "48f621b595e748c5e03431f237facf258ffc9443";
+ sha256 = "00n2msmwcjjiibrhrvpawzgz6qcjjfy9qnii1iaass0038g4bd89";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/6760daac1ef9d9d7ba07e2fc9668873020f901f1/recipes/org-category-capture";
+ sha256 = "0l5n71h9lc8q9k0sb5ghzwb81lah4l1ykc06shfl9zw5lqqvahav";
+ name = "org-category-capture";
+ };
+ packageRequires = [ emacs org ];
+ meta = {
+ homepage = "https://melpa.org/#/org-category-capture";
+ license = lib.licenses.free;
+ };
+ }) {};
org-chinese-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-chinese-utils";
@@ -50608,12 +51050,12 @@
org-cliplink = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-cliplink";
- version = "20160819.900";
+ version = "20170724.413";
src = fetchFromGitHub {
owner = "rexim";
repo = "org-cliplink";
- rev = "6c134fdda7bb56cc960af87d06a81a6885f6ab0e";
- sha256 = "1x339lg1q1aq57jycfxwdmipl05wjb0d1b5psqbn37xvmkm3imgg";
+ rev = "16c2cad9c3bafb71fea70f70c1e584307a6dee01";
+ sha256 = "1k3vcr4fr290pg00gvb9q9wpvq1fk6pzgw95x12fdrig5lp48hih";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7ddb13c59441fdf4eb1ba3816e147279dea7d429/recipes/org-cliplink";
@@ -50650,12 +51092,12 @@
org-clock-csv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }:
melpaBuild {
pname = "org-clock-csv";
- version = "20170326.1041";
+ version = "20170904.1745";
src = fetchFromGitHub {
owner = "atheriel";
repo = "org-clock-csv";
- rev = "0bae215df11e5602b07294e83b595447ae73ca0d";
- sha256 = "17im4njl1w5wm0rxvib2g7v0ibg1p6n0ibq480wwz204jd98q4gv";
+ rev = "20ab6ee4395bedc0a7b8dfaf7b51f2c63dc8d2c6";
+ sha256 = "00lcvmls7zlkqmsi0yfiihyxv49803jlc9khcbqawxlkijvr65pm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e023cb898699f76f6c3d9ffe8162aacfc6a8c34f/recipes/org-clock-csv";
@@ -50920,22 +51362,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 = "323d0b39d0284cef730b706dce7c0e58ed35530f";
- sha256 = "0zcllyhx9n9vcr5w87h0hfz25v52lvh5fi717cb7mf3jh89zh842";
+ 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;
@@ -51129,27 +51571,6 @@
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";
@@ -51195,12 +51616,12 @@
org-link-minor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "org-link-minor-mode";
- version = "20170616.516";
+ version = "20170805.1152";
src = fetchFromGitHub {
owner = "seanohalpin";
repo = "org-link-minor-mode";
- rev = "f7d986b4c63673e0e81ad87e9109237abc667893";
- sha256 = "0i7xj6hp0mxc42y2yjv8cwgsflfyx47d63b9v4dmkjbs9fda06mj";
+ rev = "7b92df60f3fee7f609d649d80ef243b45771ebea";
+ sha256 = "1lz7qj57s391ssawmccvhgxv1w99fj1m9rg3g4pymdl3sgdcz4g4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b1d2add7baf96c9a18671766d61c8aa028756796/recipes/org-link-minor-mode";
@@ -51261,8 +51682,8 @@
version = "20140107.519";
src = fetchgit {
url = "git://orgmode.org/org-mode.git";
- rev = "4214211675bfa5c4dbe1dd5147eeeb9789aeb023";
- sha256 = "19v9nnlr3h9ci30az6s9fq8jkg7mnhalrifaybph6465yfd0p9iv";
+ rev = "657302b97e222abb262070586c56fe5d64355035";
+ sha256 = "0myi67sdr62q0qxjijkxbpmyhxvnrxwjwpq2al1cds0bk8q7nzq4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal";
@@ -51281,8 +51702,8 @@
version = "20170105.1723";
src = fetchgit {
url = "git://orgmode.org/org-mode.git";
- rev = "4214211675bfa5c4dbe1dd5147eeeb9789aeb023";
- sha256 = "19v9nnlr3h9ci30az6s9fq8jkg7mnhalrifaybph6465yfd0p9iv";
+ rev = "657302b97e222abb262070586c56fe5d64355035";
+ sha256 = "0myi67sdr62q0qxjijkxbpmyhxvnrxwjwpq2al1cds0bk8q7nzq4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link";
@@ -51298,12 +51719,12 @@
org-mime = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-mime";
- version = "20170506.2244";
+ version = "20170807.549";
src = fetchFromGitHub {
owner = "org-mime";
repo = "org-mime";
- rev = "c0e99cfdfa645300a0c114fa6825efdf797da7c0";
- sha256 = "1rk7w0qsa824sfm1f3djg7vr6kxnvz3znn6vrzb9kcsmrf1y3k2z";
+ rev = "8067e76eb1fb6a9c15229cc93015aba923120a19";
+ sha256 = "0r33y6l74i8n2fbqcazq4r2659lqva855mf5lm5yf7spjga2f9vw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/521678fa13884dae69c2b4b7a2af718b2eea4b28/recipes/org-mime";
@@ -51316,6 +51737,27 @@
license = lib.licenses.free;
};
}) {};
+ org-mind-map = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+ melpaBuild {
+ pname = "org-mind-map";
+ version = "20170912.1411";
+ src = fetchFromGitHub {
+ owner = "theodorewiles";
+ repo = "org-mind-map";
+ rev = "73026279191516396637e6e33628be9c0314545b";
+ sha256 = "04v5gdmprga75y9yqx2ism28vnwsy5ky7hfzzdi44mq2gd3m8hfl";
+ };
+ 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";
@@ -51340,12 +51782,12 @@
org-mru-clock = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-mru-clock";
- version = "20170323.308";
+ version = "20170901.444";
src = fetchFromGitHub {
owner = "unhammer";
repo = "org-mru-clock";
- rev = "98691aac779001d50516b12679e2a53b5192f164";
- sha256 = "02v872vmvrda94s8gpv3ylss2fvj3ja6r70rvcmannjikmjdan5k";
+ rev = "cb239b5704b742029145e7f15e928351e4e8dd9d";
+ sha256 = "0h25w6i4qrbigcwpnwkz8wak5mh3kzh29nayzsf85jlq9vd2x5hq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b36bf1c1faa4d7e38254416a293e56af96214136/recipes/org-mru-clock";
@@ -51403,12 +51845,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";
@@ -51445,12 +51887,12 @@
org-page = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, git, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }:
melpaBuild {
pname = "org-page";
- version = "20170607.442";
+ version = "20170806.1924";
src = fetchFromGitHub {
owner = "kelvinh";
repo = "org-page";
- rev = "fa4e86621a63033148f8fe295a11b4721ba17462";
- sha256 = "123b0cf47c5gnj3yakhjr2q7kc8nmhim9c2ngdls6g944ig07l0d";
+ rev = "50430ababf73a2d090881a952e9770badaf7478b";
+ sha256 = "1xph0pdcbzlxfnbhhad2jgkznrl2vs76yl3jd29ny4xsl0n3gglw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/872f163d4da58760009001472e2240f00d4d2d89/recipes/org-page";
@@ -51475,11 +51917,11 @@
org-parser = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-parser";
- version = "20170703.1738";
+ version = "20170814.2016";
src = fetchhg {
url = "https://bitbucket.com/zck/org-parser.el";
- rev = "e8c81e633595";
- sha256 = "1zwwn0xwpq8iscl0cznq3cxcr7kpwrxl6w9v2nrxjs3lffzyzl7a";
+ rev = "f568dd98a8b2";
+ sha256 = "15lbanb14ip0xwcd3ddq5a0099f299blvf6j3g03hmnzfa4pm7cy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/28d55005cbce276cda21021a8d9368568cb4bcc6/recipes/org-parser";
@@ -51498,8 +51940,8 @@
version = "20170701.919";
src = fetchgit {
url = "https://git.leafac.com/org-password-manager";
- rev = "b2814d26287f2b6295a39098da9f5e2fbc5f2de2";
- sha256 = "1pzlmy5vry9q898r4chgn6qp6s1ajlkv946lhn6z7qpdspvy9kyy";
+ rev = "3e7058586b2ab96b12e9b1195b1db1e66e704f20";
+ sha256 = "0ac0nd84y8lckapyckbdvc1wdflwz5nxm7isxcc8cp92pgqy49r2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/02ef86ffe6923921cc1246e51ad8db87faa00ecb/recipes/org-password-manager";
@@ -51596,27 +52038,48 @@
license = lib.licenses.free;
};
}) {};
- org-projectile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
+ org-projectile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org-category-capture, projectile, s }:
melpaBuild {
pname = "org-projectile";
- version = "20170520.2310";
+ version = "20170819.1047";
src = fetchFromGitHub {
owner = "IvanMalison";
repo = "org-projectile";
- rev = "0ca3b80a46d8c541d36f161506ac8d8dc36d8e80";
- sha256 = "0r5h6ibq73b84w82382ld5dbihhvff4pj2bind68i5isam7pxlbh";
+ rev = "48f621b595e748c5e03431f237facf258ffc9443";
+ sha256 = "00n2msmwcjjiibrhrvpawzgz6qcjjfy9qnii1iaass0038g4bd89";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-projectile";
- sha256 = "1kkgi49bvdwz50x32lqdj2ii02mxv8i4dr1asr8zk6mdg0fwlqpf";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/9d7a7ab98f364d3d5e93f83f0cb3d80a95f28689/recipes/org-projectile";
+ sha256 = "0xdkd5pkyi6yfqi4przgp5mpklyxfxv0cww285zdlh00rzl935cw";
name = "org-projectile";
};
- packageRequires = [ dash emacs projectile ];
+ packageRequires = [ dash emacs org-category-capture projectile s ];
meta = {
homepage = "https://melpa.org/#/org-projectile";
license = lib.licenses.free;
};
}) {};
+ org-projectile-helm = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, org-projectile }:
+ melpaBuild {
+ pname = "org-projectile-helm";
+ version = "20170819.826";
+ src = fetchFromGitHub {
+ owner = "IvanMalison";
+ repo = "org-projectile";
+ rev = "48f621b595e748c5e03431f237facf258ffc9443";
+ sha256 = "00n2msmwcjjiibrhrvpawzgz6qcjjfy9qnii1iaass0038g4bd89";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/6760daac1ef9d9d7ba07e2fc9668873020f901f1/recipes/org-projectile-helm";
+ sha256 = "0x79j5yr9wsgzjf1dpp7d4xiji8hgyhr79vb973an5z2r02vnaf4";
+ name = "org-projectile-helm";
+ };
+ packageRequires = [ emacs helm org-projectile ];
+ meta = {
+ homepage = "https://melpa.org/#/org-projectile-helm";
+ license = lib.licenses.free;
+ };
+ }) {};
org-protocol-jekyll = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-protocol-jekyll";
@@ -51686,22 +52149,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 = "20170703.1625";
+ version = "20170907.2129";
src = fetchFromGitHub {
owner = "alphapapa";
repo = "org-recent-headings";
- rev = "b3d6e3514b57aba7be4de676d1aa92c19e08cd42";
- sha256 = "0367kkyxnkbgk3w0qvbl9xqxn5mbwpsj7qxf4s0c4jhdw2sk3k20";
+ 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;
@@ -51731,12 +52194,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 = "20170714.808";
+ version = "20170808.625";
src = fetchFromGitHub {
owner = "jkitchin";
repo = "org-ref";
- rev = "208a7beb0f8d4f7830d1d801776acd99c723e87d";
- sha256 = "0vf75sk3ik9vfqbr30yn9fn8ab7rc60y5vaiipvx9p6mgh6vhcad";
+ rev = "0af19a6ed3ccde878c27c27f1413409fdc0de9f8";
+ sha256 = "0prwvc3yywivhap6rrji25afcxc553nginzxgrr7fbkxy5vfprzg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref";
@@ -51886,6 +52349,27 @@
license = lib.licenses.free;
};
}) {};
+ org-super-agenda = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, org, s }:
+ melpaBuild {
+ pname = "org-super-agenda";
+ version = "20170904.1516";
+ src = fetchFromGitHub {
+ owner = "alphapapa";
+ repo = "org-super-agenda";
+ rev = "00b0dbbc48b99e89f6e76e6a6b000f2f5716c40e";
+ sha256 = "126v1zc5cm1sbm56z2h8v5lvlbjsnccgf80x7zm3970q0rdf0qh4";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/fd27b2df7594a867529de4b84c8107f82dabe2e9/recipes/org-super-agenda";
+ sha256 = "1h3kqvpjq2w0n8qiqwb8wcpdy2g4ac7j6kin0943g7p5gm5yf0ra";
+ name = "org-super-agenda";
+ };
+ packageRequires = [ dash emacs ht org s ];
+ meta = {
+ homepage = "https://melpa.org/#/org-super-agenda";
+ license = lib.licenses.free;
+ };
+ }) {};
org-sync = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "org-sync";
@@ -51893,8 +52377,8 @@
src = fetchFromGitHub {
owner = "arbox";
repo = "org-sync";
- rev = "1e9045e38cd6f12dc0d60e2f7bd2d414a49a5722";
- sha256 = "14zn0b8qs740ls1069kg2lwm0b9yc4qv525fg8km0hgi0yp8qw7z";
+ rev = "7f02167ef805cd76def274be4d3bd0c6e41d9af8";
+ sha256 = "18v56lrscpzxq5prigd1pjkx990xf57pzf1d2yj6r1grqfz235yy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/923ddbaf1a158caac5e666a396a8dc66969d204a/recipes/org-sync";
@@ -51910,12 +52394,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";
@@ -52162,16 +52646,16 @@
org-wc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-wc";
- version = "20160204.1715";
+ version = "20170727.1911";
src = fetchFromGitHub {
- owner = "dato";
+ owner = "tesujimath";
repo = "org-wc";
- rev = "7735d5111f779a84c40b1eb3783631e6048fb6fe";
- sha256 = "08yww77697kck1ld9xcrcx8amqdh28rdc4fsavp5d3my78qk7rac";
+ rev = "d294ad7117c150445e6166fc0d88c14a8386f34e";
+ sha256 = "1ijmdir2csvrmfqh9b5h57x0v3jcla5xzjamb4c7hhd87a6qd9wl";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/e2f0d29fb0c046d9f7c32215ea58897147f3b291/recipes/org-wc";
- sha256 = "1sa9fcy0bnn06swwq2gfrgmppd6dsbmw2mq0v73mizg3l6has1zb";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/852e0a5cee285cc9b5e2cd9e18061fc0fe91d5a6/recipes/org-wc";
+ sha256 = "1yk2py4bzm2yr8vw6rbgl2hfpd21hf4fga0d5q6y779631klp6wl";
name = "org-wc";
};
packageRequires = [];
@@ -52180,24 +52664,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 = "20170318.450";
+ pname = "org-web-tools";
+ version = "20170906.102";
src = fetchFromGitHub {
- owner = "tumashu";
- repo = "org-webpage";
- rev = "c71042f16bf33120d0d3d40e107f3f4de044ae53";
- sha256 = "1jy55qapc8fqf6r3wz4v489iyw4pxzj2hadkwsgsv1m1ha1sdvyk";
+ owner = "alphapapa";
+ repo = "org-web-tools";
+ rev = "9ae976aedacefdbe4a827bd66a4642f40bc878d4";
+ sha256 = "18hbcjg30fd342mvab3h7v8y5mja90g54823mnvmffhrp657z7qc";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/1428ef6b2291d415ae2114de123652d9e378398e/recipes/org-webpage";
- sha256 = "0ndvv5kw65p5shgg0gn3rpxz3zbxgcpa6an4m4yxms0ma72xw124";
- 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;
};
}) {};
@@ -52222,22 +52706,22 @@
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 = "20170627.1750";
+ version = "20170826.1843";
src = fetchFromGitHub {
owner = "punchagan";
repo = "org2blog";
- rev = "e266ff4296661de520b73e6e18f201fb6378ba05";
- sha256 = "030fwgwn2xsi6nnnn4k32479hhmbr4n819yarr3n367b29al2461";
+ 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;
@@ -52306,15 +52790,45 @@
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 = "20170809.411";
+ src = fetchFromGitHub {
+ owner = "tumashu";
+ repo = "org2web";
+ rev = "b14aaecd9e51b3cc4fa4530bfc6f07dd47c80616";
+ sha256 = "04f85kw7d5s8yszbm0270yyb49i3k5a9q35a6zdfhpmpfap48h90";
+ };
+ 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;
+ };
+ }) {};
organic-green-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "organic-green-theme";
- version = "20170125.606";
+ version = "20170720.1111";
src = fetchFromGitHub {
owner = "kostafey";
repo = "organic-green-theme";
- rev = "5f8ce452d16f1acbd18a6963f2c042851968dd8d";
- sha256 = "0irkcjb6vxb7kf9fr4s4ap6lighhh7h6mwfamcwcacgwfvs4zs7y";
+ rev = "eea6b77b7ee26310fd6741b9affc3f2c43be2820";
+ sha256 = "1zaxvc1j6lfdg8wi80pfjywr6nfr7qc27j4ahzz59giba3bb7azp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9383ef5f0372724b34f4bb9173ef8ccbb773e19e/recipes/organic-green-theme";
@@ -52351,12 +52865,12 @@
orgit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, org }:
melpaBuild {
pname = "orgit";
- version = "20170403.1323";
+ version = "20170731.1003";
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";
@@ -52393,12 +52907,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";
@@ -52628,8 +53142,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";
@@ -52687,16 +53201,16 @@
osx-pseudo-daemon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "osx-pseudo-daemon";
- version = "20131026.1730";
+ version = "20170721.2307";
src = fetchFromGitHub {
owner = "DarwinAwardWinner";
- repo = "osx-pseudo-daemon";
- rev = "0b9f330a66b4e8d2ff9bcd57e09b8d304dfb5841";
- sha256 = "1j601gzizxjsvkw6bvih4a49iq05yfkw0ni77xbc5klc7x7s80hk";
+ repo = "mac-pseudo-daemon";
+ rev = "d235680a72677f11925b912428ad1a57b664e3e8";
+ sha256 = "0gqknrwhfzr7cf5pgs33a5xh79y0yzxghs6wsvavvqkmf4cvck40";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/25a3562788b541e8682500911d7da89d209ab84f/recipes/osx-pseudo-daemon";
- sha256 = "150fxj2phj5axnh5i8ws5fv2qzzmpyisch452wgxb604p56j7vy8";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/osx-pseudo-daemon";
+ sha256 = "1sch7bb8hl96fji2ayw2ah5cjgsga08wj44vddjxskyway8ykf0z";
name = "osx-pseudo-daemon";
};
packageRequires = [];
@@ -52768,6 +53282,27 @@
license = lib.licenses.free;
};
}) {};
+ outline-toc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "outline-toc";
+ version = "20170730.430";
+ src = fetchFromGitHub {
+ owner = "abingham";
+ repo = "outline-toc.el";
+ rev = "31f04bea19cfcfb01a94d1fd2b72391cb02b7463";
+ sha256 = "1pqz2ynw51n3f7d9hknz80d42017lccsggkg13zqmn51wkjpc48j";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/64b07ee55e87c4a1125ce18a8ae0a44661380ffe/recipes/outline-toc";
+ sha256 = "13hy9ahla68qcbfbm7b5d0yy774qfc3byb6pn9c66k2wg4xh6pxb";
+ name = "outline-toc";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/outline-toc";
+ license = lib.licenses.free;
+ };
+ }) {};
outlined-elisp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "outlined-elisp-mode";
@@ -52810,15 +53345,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 = "20170414.1217";
+ version = "20170904.1524";
src = fetchFromGitHub {
owner = "alphapapa";
repo = "outshine";
- rev = "399ccd20cd65c758bbbd5563bd804d2bccfd0279";
- sha256 = "03jd3gyqrmrnykcv7p6fv53f32li7gkvd61zbhp483n8a8n3yy5j";
+ rev = "a695215b47ca4a950c47a69a5c6e4c695892b1b3";
+ sha256 = "18c1iqfw2q9if6yhvgspcw5arhd549gcvwyphnsl9cl6q40q2vly";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8edf78a0ecd2ff8e6e066b80751a31e11a068c3f/recipes/outshine";
@@ -52918,16 +53474,16 @@
ox-bibtex-chinese = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ox-bibtex-chinese";
- version = "20160510.506";
+ version = "20170722.2009";
src = fetchFromGitHub {
owner = "tumashu";
repo = "ox-bibtex-chinese";
- rev = "7771304977f921ff0596b17520289c984116f1a1";
- sha256 = "1d463d7mdlr65yrq7x16nk9124fw1iphf5g238mlh4abbl6kz241";
+ rev = "2ad2364399229144110db7ef6365ad0461d6a38c";
+ sha256 = "06lp56na1fv87296hhaxgb6gfnzln39p4v245gfxhk0k27589vxj";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/a679ebaedcb496f915b9338f9d5c003e1389594d/recipes/ox-bibtex-chinese";
- sha256 = "0h02jlzk97rd3jmdni5mggbkij61d7zn1n1ibz1jg6zb0000cj7a";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/6c09c708c4372451502923cd3cb756f4f98ba97b/recipes/ox-bibtex-chinese";
+ sha256 = "0f3xigrkhc86vv23f76fdd4rjsspsd2ck5c65biq2ds247f4gm61";
name = "ox-bibtex-chinese";
};
packageRequires = [ emacs ];
@@ -52939,16 +53495,16 @@
ox-clip = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, org }:
melpaBuild {
pname = "ox-clip";
- version = "20170108.1348";
+ version = "20170805.505";
src = fetchFromGitHub {
owner = "jkitchin";
- repo = "scimax";
- rev = "7ae7bc8bc84ffe0351e23a8a5dc72a18874bee61";
- sha256 = "0pzpy02rffgydgbdq6khk4y2hxwx744nvi84i95h98hb1ld1ydk2";
+ repo = "ox-clip";
+ rev = "b596760aec2ab4e10b18807c01839047aa209d6e";
+ sha256 = "0bd5vbbz0p0dg5v7s54a88ba7aca53xwr8niirshfkm916lc8mpy";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/222ccf4480395bda8c582ad5faf8c7902a69370e/recipes/ox-clip";
- sha256 = "0vkw8r34wnax08kkdgwzm62srp9avvza1jaj582l8nn0a75284yg";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/6d9ae1e58a1f214a9b88627a2d3254ce7de50740/recipes/ox-clip";
+ sha256 = "1sm0ivd8rypnl0z901anjsnbfjwhxqcaagqav82ybdb1z6x1qicv";
name = "ox-clip";
};
packageRequires = [ htmlize org ];
@@ -53020,6 +53576,27 @@
license = lib.licenses.free;
};
}) {};
+ ox-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+ melpaBuild {
+ pname = "ox-hugo";
+ version = "20170912.1322";
+ src = fetchFromGitHub {
+ owner = "kaushalmodi";
+ repo = "ox-hugo";
+ rev = "a486141e4e2c3f9f67e799e20af150611d77f850";
+ sha256 = "1srrkc0bajmhp614avk4yr51zsp0gnmn47r1wi7qxkr6ybxwx8k1";
+ };
+ 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";
@@ -53170,15 +53747,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 = "7a7635ceb3e6c6050e1a932dc91b639c41572b51";
+ sha256 = "1fr33hljpb9f8035ghqrrw14ybqjnc8w0m714yx8jp6hbvjvgkdn";
};
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";
};
@@ -53275,12 +53852,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";
@@ -53300,8 +53877,8 @@
src = fetchFromGitHub {
owner = "dfeich";
repo = "org8-wikiexporters";
- rev = "57538ada07d1c631cfd07410cd8f47523be54c9a";
- sha256 = "05rlfykwvfir177bvqa7nvwmzn1amhpaizfmyjzi73d78h062vcl";
+ rev = "970bb8ed0e4c4426c37a929b1fe08f944c1cf74f";
+ sha256 = "14k9jsz7vkjqxn2xpj71qg54w0laqr99178bzsmbapkfp5yxrib5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ox-tiddly";
@@ -53380,12 +53957,12 @@
ox-twiki = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
melpaBuild {
pname = "ox-twiki";
- version = "20160306.915";
+ version = "20170803.1339";
src = fetchFromGitHub {
owner = "dfeich";
repo = "org8-wikiexporters";
- rev = "57538ada07d1c631cfd07410cd8f47523be54c9a";
- sha256 = "05rlfykwvfir177bvqa7nvwmzn1amhpaizfmyjzi73d78h062vcl";
+ rev = "970bb8ed0e4c4426c37a929b1fe08f944c1cf74f";
+ sha256 = "14k9jsz7vkjqxn2xpj71qg54w0laqr99178bzsmbapkfp5yxrib5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/084da2cc725cc23b02657e7adb14ec31532ad25a/recipes/ox-twiki";
@@ -53443,12 +54020,12 @@
package-build = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "package-build";
- version = "20170506.1759";
+ version = "20170910.124";
src = fetchFromGitHub {
owner = "melpa";
repo = "package-build";
- rev = "940c991ccd0dab53bd7c120601b3db35669c5e73";
- sha256 = "18yr4qq3jyf9zhlwqrbfq616svsgn5spnj0s4gsni7kb2ijjh2bp";
+ rev = "46055de8792a1c7c01d06f74148dae6d700b00d6";
+ sha256 = "1x1kln1bdqxxgan1pkjs98a9d3737j4qfpza4r70va7wvsy3ndhj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/948fb86b710aafe6bc71f95554655dfdfcab0cca/recipes/package-build";
@@ -53468,8 +54045,8 @@
src = fetchFromGitHub {
owner = "milkypostman";
repo = "package-filter";
- rev = "c8e2531227c02c4c5e9d593f2cdb6a4ab4a6849b";
- sha256 = "001h92jchz6x6pm8bj90law0yzc5xd84f703z7fcwan4k0g1iwl7";
+ rev = "bc73b41aea1d65ca44ef1593ca13126df9bbb39e";
+ sha256 = "0fq31zcz5j0n29p3zmx2k2w0xvay24zs34mbq8nb0y0jr7ycm184";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/89312eaf69f3d7ac46647255c847fcb45415e78d/recipes/package-filter";
@@ -53485,12 +54062,12 @@
package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "package-lint";
- version = "20170709.120";
+ version = "20170907.201";
src = fetchFromGitHub {
owner = "purcell";
repo = "package-lint";
- rev = "4e4b34fc4f12ef2f7965fa959c5809aacdb6af63";
- sha256 = "036gvgh97ng8l8srq4jgjil6na15fy4h7w7aljxx6wkmaik7nvg7";
+ rev = "2fc3bc9530caea437a55e23c13d31d8803193107";
+ sha256 = "076da92vc86kdc7gdh8id7w8qadh0fbiz068qzk8kr8w5bw6zkr6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint";
@@ -53506,12 +54083,12 @@
package-plus = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "package-plus";
- version = "20150319.1455";
+ version = "20170815.1956";
src = fetchFromGitHub {
owner = "zenspider";
repo = "package";
- rev = "4a9618a44ec4f26a14e0136cd9d3c4855fceb25b";
- sha256 = "1xv0ra130qg0ksgqi4npspnv0ckq77k7f5kcibavj030h578kj97";
+ rev = "9213f6134eabc2cff5826779ced437714324c066";
+ sha256 = "0b20mxr5xvkydxn9gv246xls52is3jyhm5ckmrhkb2dp9qc4hfa4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/49cfbbc4535aa7e175aa819d67b8aa52a6f94384/recipes/package+";
@@ -53566,22 +54143,22 @@
license = lib.licenses.free;
};
}) {};
- packed = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ packed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "packed";
- version = "20170314.1340";
+ version = "20170819.942";
src = fetchFromGitHub {
- owner = "tarsius";
+ owner = "emacscollective";
repo = "packed";
- rev = "536f4a3bda06cc09759fed1aa0cdebb068ff75a1";
- sha256 = "1ayizqkhxjd3rv3chnl51sl12gsfhxcqqnz0p6r0xbwglx4n3vzi";
+ rev = "94ea12b9d44bfa42c28d0548199f2fcd19e4aa6a";
+ sha256 = "1n80y5pqaibix71fnw3cxmq66frmqfji2b2y170jszmrxi03kwxm";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/1ee9e95c00f791010f77720068a7f3cd76133a1c/recipes/packed";
- sha256 = "0sw7d2l17bq471i4isrf2xf0z85nqqiciw25whw0c0chdzwzai6z";
+ 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;
@@ -53632,12 +54209,12 @@
page-break-lines = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "page-break-lines";
- version = "20170517.235";
+ version = "20170829.157";
src = fetchFromGitHub {
owner = "purcell";
repo = "page-break-lines";
- rev = "82f9100312dcc922fb66ff289faf5d4795d8ca7a";
- sha256 = "1bwh5g63cg2iw3kmcwj4y2jdw46rxll9rgjn6ymx7hbw15s7m5yp";
+ rev = "c82759f267a81a07ed7aafffbbbfaa3e94941b59";
+ sha256 = "17kly423l5fyqzmhbxqwd9fvn191bzq6pn3ng1ynla51cg47zskl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/page-break-lines";
@@ -53753,6 +54330,27 @@
license = lib.licenses.free;
};
}) {};
+ pamparam = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, lib, lispy, melpaBuild, worf }:
+ melpaBuild {
+ pname = "pamparam";
+ version = "20170910.537";
+ src = fetchFromGitHub {
+ owner = "abo-abo";
+ repo = "pamparam";
+ rev = "d452c3baa19d51fb04c5a52f550b560fe695eb0a";
+ sha256 = "02qrc3qxajzxm9lfrd33i9sbawh9nf4gz9i3drzhv11ca549paaq";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/067b5e3594641447478db8c1ffcb36d63018b1b2/recipes/pamparam";
+ sha256 = "0xwz1il9ldkfprin3rva407m4wm7c48blwfn4mgaxmqafy4p0g9f";
+ name = "pamparam";
+ };
+ packageRequires = [ emacs hydra lispy worf ];
+ meta = {
+ homepage = "https://melpa.org/#/pamparam";
+ license = lib.licenses.free;
+ };
+ }) {};
pandoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "pandoc";
@@ -53777,12 +54375,12 @@
pandoc-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }:
melpaBuild {
pname = "pandoc-mode";
- version = "20170503.606";
+ version = "20170720.127";
src = fetchFromGitHub {
owner = "joostkremers";
repo = "pandoc-mode";
- rev = "72aa0c2abad0ecca689adcf93dd4e9109c9fc737";
- sha256 = "0hrnd46anfq8vzanax7qzq5fl9kdw26aprally9kjqbr5xdjik2h";
+ rev = "58f893d54c0916ad832097a579288ef8ce405da5";
+ sha256 = "03nh5ivcwknnsw9khz196n6s3pa1392jk7pm2mr4yjjs24izyz1i";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/pandoc-mode";
@@ -54090,12 +54688,12 @@
pasp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "pasp-mode";
- version = "20170711.516";
+ version = "20170803.1301";
src = fetchFromGitHub {
owner = "santifa";
repo = "pasp-mode";
- rev = "2d7307b7483eaf6030497c83dea39207cf843638";
- sha256 = "1nxrad0mg1ywcjhh7npbnz69bxf44ih51f74m040mnvmmd15jw3q";
+ rev = "6511193677d6113fec1171f476c0db3be242ee15";
+ sha256 = "1fk87iiqnyfwblw8fgqhw2mg61w2pl7id1dm8lb75pqrjq8kvjbg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f3c1bbfc6b3a60f8bb4f0ee77ec4108e9d3f458b/recipes/pasp-mode";
@@ -54111,12 +54709,12 @@
pass = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store }:
melpaBuild {
pname = "pass";
- version = "20170717.145";
+ version = "20170911.456";
src = fetchFromGitHub {
owner = "NicolasPetton";
repo = "pass";
- rev = "888bd9593f9239f28adab6d93fcdeec69bdf63ed";
- sha256 = "0z1j3cfsh8cksv6l5fbzp6f72d5874kmg7i6agmab9ixjvgg0izc";
+ rev = "f811120c33279fb6881c0a70ae26862adefcd659";
+ sha256 = "07m80mscxfi5wmf0cvymlnpcp4aprzn8ynaxs6vxgpr11gwr8zvm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/428c2d53db69bed8938ec3486dfcf7fc048cd4e8/recipes/pass";
@@ -54213,26 +54811,47 @@
license = lib.licenses.free;
};
}) {};
- password-store = callPackage ({ f, fetchgit, fetchurl, lib, melpaBuild, s }:
+ password-store = callPackage ({ emacs, f, fetchgit, fetchurl, lib, melpaBuild, s, with-editor }:
melpaBuild {
pname = "password-store";
- version = "20151027.1449";
+ version = "20170829.1633";
src = fetchgit {
- url = "http://git.zx2c4.com/password-store";
- rev = "38ec1c72e29c872ec0cdde82f75490640d4019bf";
- sha256 = "04rqph353qfhnrwji6fmvrbk4yag8brqpbpaysq5z0c9l4p9ci87";
+ url = "https://git.zx2c4.com/password-store";
+ rev = "65cead8c0fdb07ce3821f6b97bdcb32684d0c3f7";
+ sha256 = "0rm364l9mg2gl16ng5zd02gkfq8592mhrp81sk1v0wwh8wlyrzrh";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/e204fb4d672220ee1a4a49975fd3999916e60f8c/recipes/password-store";
- sha256 = "1jh24737l4hccr1k0b9fnq45ag2dsk84fnfs86hcgsadl94d6kss";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/ceff76206bd44d92c00adc931236c4ae15db5583/recipes/password-store";
+ sha256 = "06l4xlvrjswy5kndn6h6swliqcp007nh4fyvma3jaac4f3x2qi65";
name = "password-store";
};
- packageRequires = [ f s ];
+ 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 = "20170912.349";
+ src = fetchFromGitHub {
+ owner = "volrath";
+ repo = "password-store-otp.el";
+ rev = "2965da7d8edd32bd4ef62f487ea6bcd08c599c89";
+ sha256 = "1svm6rlh4f0rjcl0fjy3x4bfakdn9npi8w7ak217ad2k08j44bzd";
+ };
+ 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";
@@ -54338,26 +54957,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";
@@ -54697,12 +55296,12 @@
pdf-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, tablist }:
melpaBuild {
pname = "pdf-tools";
- version = "20170417.150";
+ version = "20170912.711";
src = fetchFromGitHub {
owner = "politza";
repo = "pdf-tools";
- rev = "f314597b2e391f6564e4f9e5cc3af0b4b53f19e9";
- sha256 = "15m7x61m63zxz2jdz52brm9qjzmx1gy24rq8ilmc4drmb0vfmrr2";
+ rev = "c1b183f71e618693ac6ec20f051ca41270be3bce";
+ sha256 = "059fmrakfzwq4xqf246ksi9h7gfm37f29565w9mvlq4z7hhbf5z3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8e3d53913f4e8a618e125fa9c1efb3787fbf002d/recipes/pdf-tools";
@@ -54718,12 +55317,12 @@
peacock-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "peacock-theme";
- version = "20141115.2302";
+ version = "20170808.620";
src = fetchFromGitHub {
owner = "emacsfodder";
repo = "emacs-peacock-theme";
- rev = "268a2a7eb48ac750fc939657169ec65f2ac0f4f7";
- sha256 = "1clvrmvijwpffigh5f29vnwcvffqk0nrvlz26158hip1z9x7nah3";
+ rev = "9e46fbfb562b6e26c6e3d6d618b044b3694da4c8";
+ sha256 = "0w4dzdsv2cdldss5jwmdbjb5a62k5j1szwdim4gv8ldifhj7fy22";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/peacock-theme";
@@ -54799,6 +55398,26 @@
license = lib.licenses.free;
};
}) {};
+ pelican-mode = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "pelican-mode";
+ version = "20170818.1352";
+ src = fetchgit {
+ url = "https://git.korewanetadesu.com/pelican-mode.git";
+ rev = "9b2a64b9d57ee4eb95e40a309fbab4bcfa5b5fef";
+ sha256 = "19gqg2p56r0iz5l3p5y421c107f3jggwi60xk2wamx5jv9rbrn2d";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/aede5994c2e76c7fd860661c1e3252fb741f9228/recipes/pelican-mode";
+ sha256 = "0z6w5j3qwb58pndqbmpsvy1l77w9jv90bss9qq9hicil8nlk4pvi";
+ name = "pelican-mode";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/pelican-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
per-buffer-theme = callPackage ({ cl-lib ? null, fetchhg, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "per-buffer-theme";
@@ -54948,12 +55567,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";
@@ -54969,12 +55588,12 @@
persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "persp-mode";
- version = "20170509.829";
+ version = "20170908.648";
src = fetchFromGitHub {
owner = "Bad-ptr";
repo = "persp-mode.el";
- rev = "a33c91e3738996c058841ed1985c67bedd4875e1";
- sha256 = "10ycv3yb5xav7wslf1swcmbn9w2an5izkca8crmdgr566h9mk0gb";
+ rev = "fd57484756b7a7e34895bf55238413005ab35959";
+ sha256 = "1f7qcy5swiqx17835dvwb89x0ndhviyxi5bqk2gn14c1z8fmld5a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode";
@@ -55053,12 +55672,12 @@
perspeen = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }:
melpaBuild {
pname = "perspeen";
- version = "20170711.2304";
+ version = "20170813.1754";
src = fetchFromGitHub {
owner = "seudut";
repo = "perspeen";
- rev = "d69a7bb554d6eb003b7c5c222cbdbaacc7e01df0";
- sha256 = "1r3c352i4vkzqi5rcyniaa2x05jjpq9x8j43bbs4m63lczik75mz";
+ rev = "6b3a3b0468199a8db10a73d119dfcd8833d181b6";
+ sha256 = "13rivw5rafl4pb68l500ksbzpz00yp7lx9wi9vy8nz0hwr80jd0p";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/perspeen";
@@ -55181,14 +55800,14 @@
pname = "phan";
version = "20170205.604";
src = fetchFromGitHub {
- owner = "zonuexe";
+ owner = "emacs-php";
repo = "phan.el";
rev = "6442663bf7618bc614b6c47b0ad7bc591c68f947";
sha256 = "0s38vbnsbpazca0jsahjmms7qgq74gsvfn2zkrfkhx9y8cpfxrrb";
};
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 ];
@@ -55347,12 +55966,12 @@
phoenix-dark-mono-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "phoenix-dark-mono-theme";
- version = "20130306.1215";
+ version = "20170729.706";
src = fetchFromGitHub {
owner = "j0ni";
repo = "phoenix-dark-mono";
- rev = "dafb65c542605145d6b1702aae5b195b70f98285";
- sha256 = "1fg63g1cm9mp50sf3ldcb0pr4bvlfxx010arisxdkj102pmib2ri";
+ rev = "a54f515d162148bcb38676980bc2316adb3d7b8b";
+ sha256 = "1zr334qsjrajd2vrrlc1rfm4b4kdw15jfh5d102vj5bp7z7ajhb4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/87e3b036fbcc96b047bbb141345a7b51f19d6951/recipes/phoenix-dark-mono-theme";
@@ -55368,12 +55987,12 @@
phoenix-dark-pink-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "phoenix-dark-pink-theme";
- version = "20170324.1144";
+ version = "20170729.703";
src = fetchFromGitHub {
owner = "j0ni";
repo = "phoenix-dark-pink";
- rev = "219edf69adb7e911394c5849c310ca0f4201a917";
- sha256 = "0i7m9iqnglirwfdibskz2alk8bzkffp8gaa38yqg6bxwb46x67nq";
+ rev = "4defbb76b00c1a29f060813898578152d6be623d";
+ sha256 = "03d7ak4ia3fifp0c8fm4qdydizsfsxvcvbzwfxlsk66s28p5wglc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/87e3b036fbcc96b047bbb141345a7b51f19d6951/recipes/phoenix-dark-pink-theme";
@@ -55494,12 +56113,12 @@
php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "php-mode";
- version = "20170621.2242";
+ version = "20170729.1258";
src = fetchFromGitHub {
owner = "ejmr";
repo = "php-mode";
- rev = "3a9076b6f6146326c1314c580acddce9cbb5a290";
- sha256 = "11ily856xk6i00hqfvfxwjch77sigb5lym10dj0zj689gp8jd0wc";
+ rev = "151ae717b03d6d5fcc2bc86e349175840bfbe079";
+ sha256 = "00f2k41zmda299rj4lfpxisnrr9i5f0gg51cb8fri7lyjzrq829a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode";
@@ -55519,8 +56138,8 @@
src = fetchFromGitHub {
owner = "echosa";
repo = "phpplus-mode";
- rev = "963eb19c06a7237879ae7b7a111c83abcfe9ca36";
- sha256 = "06ffbw66zw5ssavgbllcb9a0syi5asy6wq8yqxdyw66nj941kjbr";
+ rev = "8224e6aabc2e3d046d717b4c87c643aa98a8e203";
+ sha256 = "041xv3c2gwcxlj9bnjx6hlrm2k7s7fyzqbp4c583is6jx1adjfn3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d542e94471b9f601f1ee6f31e727bc4a31fa8f9e/recipes/php+-mode";
@@ -55554,6 +56173,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";
@@ -55662,12 +56302,12 @@
picpocket = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "picpocket";
- version = "20170305.259";
+ version = "20170905.1133";
src = fetchFromGitHub {
owner = "johanclaesson";
repo = "picpocket";
- rev = "3404de0e6ed1b46f3b873472e34ea9342445f43e";
- sha256 = "044p26x76i5x0921f8b8zl51k0wfkygdwdiwyhqmmnxzb54qj74l";
+ rev = "e0ca0f1fc03b4166ce2eab9d7532b9b29989e5bd";
+ sha256 = "0ldiwfysfwz6mr54j7rl1jccfx9lq31a4v9r6cm55js75mamhbw1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e88dc89311d4bfe82dc15f22b84c4b76abb3fd69/recipes/picpocket";
@@ -55809,12 +56449,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";
@@ -55848,22 +56488,22 @@
license = lib.licenses.free;
};
}) {};
- pippel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+ pippel = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "pippel";
- version = "20170325.649";
+ version = "20170730.623";
src = fetchFromGitHub {
- owner = "brotzeitmacher";
+ owner = "brotzeit";
repo = "pippel";
- rev = "764c8ec30ad14288accd05c7f8a1c9425d6aab7f";
- sha256 = "0plpjjyhn1rz8pwyldshwa61r7pfz310j4qciw55smjizz4hfjx8";
+ 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 = [ emacs s ];
+ packageRequires = [ dash emacs s ];
meta = {
homepage = "https://melpa.org/#/pippel";
license = lib.licenses.free;
@@ -55872,12 +56512,12 @@
pivotal-tracker = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "pivotal-tracker";
- version = "20161028.618";
+ version = "20170720.816";
src = fetchFromGitHub {
owner = "jxa";
repo = "pivotal-tracker";
- rev = "87b4e3cce343519b54a8ff4fef5d7b7745e27c3c";
- sha256 = "08rj1nimxrz5g1gj231f9d6p8al1svvwv1782h8hyxi87fzmw9sw";
+ rev = "0311d117037c74512149a4a78b269c2e46d7dfba";
+ sha256 = "0g3xzh8jr9lbg6h2hk81cdyxkxx3l79qhxrp4g34rc0dml79rzf9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/pivotal-tracker";
@@ -56037,22 +56677,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;
@@ -56269,8 +56909,8 @@
version = "20170419.303";
src = fetchgit {
url = "https://git.savannah.gnu.org/git/gettext.git";
- rev = "488bf1c3be5ebe66520f352bfb8d99917878ab42";
- sha256 = "1p81ljxxsxd5dp9xn46zia0sp8d095ib3aaby3yzar55nvdfpl6f";
+ rev = "5ad8c92742daaf4434fded196ff23638cdaa621b";
+ sha256 = "1z3cy6n727lrsm8smksb48hbj2ckh4wri44c0423hdf84qp5ifg8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/po-mode";
@@ -56286,12 +56926,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";
@@ -56370,12 +57010,12 @@
point-stack = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "point-stack";
- version = "20141225.2110";
+ version = "20170808.958";
src = fetchFromGitHub {
owner = "dgutov";
repo = "point-stack";
- rev = "86b37666882398f4db93f3aba0ebb7b7965032cd";
- sha256 = "0nqv63yy0qpxhblzmkyvla90p9a7729fqxvhkfld9jxfqpgv1xyp";
+ rev = "76e17311e3a810314c7d31ac46dc55450ff30fa2";
+ sha256 = "1sp3djnyg3f5ci43m4pi0f6clblrz5lrnzc415r87csbavqqgv2z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/bb3c9e6b3c583f098f75462b4d48cd137a1bcb76/recipes/point-stack";
@@ -56452,12 +57092,12 @@
poly-ruby = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, polymode }:
melpaBuild {
pname = "poly-ruby";
- version = "20170710.220";
+ version = "20170802.648";
src = fetchFromGitHub {
owner = "knu";
repo = "poly-ruby.el";
- rev = "acc0c3cc8d0607edc769b35e19fcd39e8f57d903";
- sha256 = "1gq7rz9s44cf4m9bdapr7rnvincxsp16yci7g3ljq0mpiyl1l2b0";
+ rev = "e6f50a92d29a5ff567d70cafa6621c4f89056d11";
+ sha256 = "1pdimvcrjq0k6a9kijcl6zmsmmvssdqsdkgcz14qs4444qly4l9b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/68213703359324d09553a2164f1f6ecca7c16854/recipes/poly-ruby";
@@ -56494,12 +57134,12 @@
pomidor = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "pomidor";
- version = "20170310.634";
+ version = "20170817.2253";
src = fetchFromGitHub {
owner = "TatriX";
repo = "pomidor";
- rev = "bac68f7a1c72da3db6020d3bda45e38576c9c488";
- sha256 = "13bq9cm9aclnlsjzw66kig2618xr2v5sfb12dff8ja5hmw0j2jla";
+ rev = "58a4368d91d472aa47a83f498be82db8929cf41a";
+ sha256 = "1g6mwx6gq6zlzn06izic81qf2ppqprfmap5hgsksx1xbickkmwdx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0d4f313081594df23f357c40feb456847d8bd0/recipes/pomidor";
@@ -56536,12 +57176,12 @@
pony-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "pony-mode";
- version = "20151028.302";
+ version = "20170807.822";
src = fetchFromGitHub {
owner = "davidmiller";
repo = "pony-mode";
- rev = "d319b0317bfbdac12d28cfd83abe31cc35f3cdd7";
- sha256 = "1g1yw0ykwswl9dnicyi7kxskqqry40wjykshgrqhs4k09j3jnacr";
+ rev = "760684d30b6c234d1b88c9a4673a808f36f7f341";
+ sha256 = "1y4gxn25i2nszdhqq8jxf9h65mqfgcwbypx5p4wkan5i1v2i3yr1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a1fd64317610fb6ef5b14e8bf15e727680d5ff09/recipes/pony-mode";
@@ -57057,12 +57697,12 @@
preseed-generic-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "preseed-generic-mode";
- version = "20150119.1241";
+ version = "20170802.1753";
src = fetchFromGitHub {
owner = "suntong";
repo = "preseed-generic-mode";
- rev = "19bce980d41607bef8af4b1901343abfca0f0855";
- sha256 = "1dyi9nc2q43jf87xiz9xw42irrbla2vyixifdiibh6nm9misnfj0";
+ rev = "341d85f8ecdc8834956a0352ece542f45def88db";
+ sha256 = "1p486absi0mlcangpbh6hs36wvlmm9s6f4ag0lzmw7w3ikhp88kn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/preseed-generic-mode";
@@ -57078,12 +57718,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";
@@ -57307,12 +57947,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";
@@ -57515,12 +58155,12 @@
projectile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
melpaBuild {
pname = "projectile";
- version = "20170416.148";
+ version = "20170827.2053";
src = fetchFromGitHub {
owner = "bbatsov";
repo = "projectile";
- rev = "56e262dd3b5998d0dc6a590d06bc11058839c588";
- sha256 = "0sq0w5fi4zrxccabnh78vjb7drw05ay2lpw7wvnrfv97xkywzr4z";
+ rev = "adf6ae2dbfbdca96aec49115ca35867006f326b1";
+ sha256 = "1x39v7lb63k2nfa4xyvkgvgxbd88jcqnwdmd78a86p5zc3m42zk9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile";
@@ -57620,12 +58260,12 @@
projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }:
melpaBuild {
pname = "projectile-rails";
- version = "20170704.2358";
+ version = "20170901.47";
src = fetchFromGitHub {
owner = "asok";
repo = "projectile-rails";
- rev = "c917c6e188de27331815f39511ed45a408de22d0";
- sha256 = "11f52g8r5zb34nigm68gm8hwgkw184psknd7zqya0l1ipwkhhrif";
+ rev = "31c9f90d472e07cb8e49fa8992b187b67c9c9a71";
+ sha256 = "0j38zbprkga3iq5wb77zvfa5r3sj3sqv8qh0ab62wm68qy60d6g3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails";
@@ -57645,8 +58285,8 @@
src = fetchFromGitHub {
owner = "nlamirault";
repo = "ripgrep.el";
- rev = "5af6a0b2ee8a639cf857724ce4328f1f0955c99e";
- sha256 = "05jkj7c9ha09gp74j7k4bhcxq8ypxz922ghwv5bjpxg4czn5s0w9";
+ rev = "c47a2da4668ca338e7fadc3d8c095e075caaa17d";
+ sha256 = "0x2rkm1yf03qfzylx6pk32cq7mmydila2iwiq40k5nl4wgfia5vx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/195f340855b403128645b59c8adce1b45e90cd18/recipes/projectile-ripgrep";
@@ -57706,14 +58346,14 @@
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 ];
@@ -57725,12 +58365,12 @@
projector = callPackage ({ alert, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
melpaBuild {
pname = "projector";
- version = "20170410.905";
+ version = "20170717.1151";
src = fetchFromGitHub {
owner = "waymondo";
repo = "projector.el";
- rev = "bd9e5b5c4727c0facd9d45a4b6a46ffddaf6a131";
- sha256 = "1fx5wg5lnb59z0y25bmysf6a2wld333iihrb9jhcab4hicdqsh9s";
+ rev = "ec63167ee21d537f410c0971f82e2ffdfd6fa008";
+ sha256 = "155wnks7i73c3kvgysnfy0379d1fp78qv2b8lhsaxwx7jh356dbm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/420ffea4549f59677a16c1ee89c77b866487e302/recipes/projector";
@@ -57939,8 +58579,8 @@
src = fetchFromGitHub {
owner = "google";
repo = "protobuf";
- rev = "c78dbd7c895b8c80cd2f2401d73acf890edf82c6";
- sha256 = "136l13mq0yki95lra6bvzzq602vhp48nnvw741gf7x34rd4k5kwg";
+ rev = "06aa8dc9e730cc39c67d0ff9c0c95e645ccf03c9";
+ sha256 = "0na3apgapd78z57jfdwns35mflqgwjwbcj2lmspg9ipg0x191378";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -57956,12 +58596,12 @@
protocols = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "protocols";
- version = "20170327.758";
+ version = "20170802.432";
src = fetchFromGitHub {
owner = "davep";
repo = "protocols.el";
- rev = "1c93a48d4173635a7b742248797f424e7ce851e3";
- sha256 = "1hbk7ikcp041m7g2nfbbvsyj15d7p3dhsv0yvyy1n6bm5azh30zr";
+ rev = "d0f7c4acb05465f1a0d4be54363bbd2802647e77";
+ sha256 = "1xg3pwsnzn795bz299x273ral2jrz2v3p9r6gjm4dcx5pm3348mj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9c9a75671a00e9196d00b08911232aac87fd8c83/recipes/protocols";
@@ -57977,15 +58617,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 = "20170817.1206";
src = fetchFromGitHub {
owner = "epost";
repo = "psc-ide-emacs";
- rev = "0a0ead9f8098afbb2f5648bfbbd5c3b7646a1b77";
- sha256 = "0xfkj9kdd7i0jcca8nhsp7bv0x7wsxi03ncln9y8d7c2g72fjkdd";
+ rev = "fb3040a1204c4a6f7a54abc499fb88074627cb3e";
+ sha256 = "0fh2xv0rz5mkhqvcaj55wpx39f953qalz5v46v35nzmhc0fpmzab";
};
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";
};
@@ -58008,16 +58648,16 @@
psci = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, purescript-mode, s }:
melpaBuild {
pname = "psci";
- version = "20160717.1125";
+ version = "20170818.1301";
src = fetchFromGitHub {
- owner = "ardumont";
+ owner = "purescript-emacs";
repo = "emacs-psci";
- rev = "d773b407f772e6ab3c40406c22824889e0fd14fe";
- sha256 = "1kvw5qj975s7r58858aiql9861rglz1xgj9n69g5li9mcdxk0v2f";
+ rev = "875ea3231e4aceadf7718daef75a1426ff8e87e5";
+ sha256 = "11yihnlm7cawyhgava70xja8rf0gi6j1jf3z4x8ylf5wjj6fbbfc";
};
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 ];
@@ -58073,14 +58713,14 @@
pname = "psysh";
version = "20170610.2104";
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 ];
@@ -58113,12 +58753,12 @@
pug-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "pug-mode";
- version = "20170127.1949";
+ version = "20170913.348";
src = fetchFromGitHub {
owner = "hlissner";
repo = "emacs-pug-mode";
- rev = "83599129c0de6f9f5082d019373c3d9347150191";
- sha256 = "17fwl967kw0kykakvga9vk7i294y5iysff263ir4y6vsnca3syn8";
+ rev = "3a3bdf96e64dc6f5d031bf0ed2b6002a600187ad";
+ sha256 = "02mx4gs8hlinrxm8jas9jy83kvglaqjz3sxn4m4hrrj07gz0si96";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b3710aac9f3df3a23238af1f969c462b3692f260/recipes/pug-mode";
@@ -58197,12 +58837,12 @@
puppet-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
melpaBuild {
pname = "puppet-mode";
- version = "20170614.2215";
+ version = "20170719.752";
src = fetchFromGitHub {
owner = "voxpupuli";
repo = "puppet-mode";
- rev = "3ffc2de8416b4ea389d5800a4a05d0885d9a8608";
- sha256 = "0dlss3brh4654avq361yma4xbxsv6q5s8qlhp7v470ix88wx4v8r";
+ rev = "fb1b683191d767eab312ea424de3517062d86420";
+ sha256 = "12kxxgm61myna4wf3hgai8dgrssc9dnv75fh2mbcgwqggbfv8wlv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1de94f0ab39ab18dfd0b050e337f502d894fb3ad/recipes/puppet-mode";
@@ -58302,14 +58942,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";
};
@@ -58364,15 +59004,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";
};
@@ -58515,8 +59155,8 @@
src = fetchFromGitHub {
owner = "mattharrison";
repo = "pycoverage.el";
- rev = "dbc152a807efcaac4e50bedb64c026674009a279";
- sha256 = "0qap6iz865l43mixga7541c2z9kdx8zkkdcgdlgn6n8pyv8iz7qs";
+ rev = "4f5451f4d6e1e2ddd5878fc7d18f5fc4fc92a83d";
+ sha256 = "0xhkzskxnj4lmf4152c3n1vp68l1xgwa277f3yg8sslg6ixkd2p0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/eb0310bbe8427abdcba2b30414ec26475b0b7440/recipes/pycoverage";
@@ -58536,8 +59176,8 @@
src = fetchFromGitHub {
owner = "statmobile";
repo = "pydoc";
- rev = "84133eefce0e52a861894815f0c414f1f276f6e1";
- sha256 = "1j5cjfak8rak8rp1cijjfyndpxjkr2vqw22av3386pbwdm6fzamg";
+ rev = "916153516382e5546b59b46342c58ed76cf27faf";
+ sha256 = "18ba5mcp030l6ywdq70ryvbwn7af28kp0xi8h1bma5mwcxj2sg2c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5c4988a66040ddf659492bdb0ae2b9617c342c69/recipes/pydoc";
@@ -58573,12 +59213,12 @@
pyenv-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic }:
melpaBuild {
pname = "pyenv-mode";
- version = "20160221.1123";
+ version = "20170801.1648";
src = fetchFromGitHub {
owner = "proofit404";
repo = "pyenv-mode";
- rev = "560614d47e3b0331f5c0e136763be69ef052048d";
- sha256 = "049wgwygdaa0p8p4pl37wkc06nam9ph17i9gzcg7w0hfwghjrc5j";
+ rev = "215b7f0ed3847e0c844adbff7d9b19057aa7c820";
+ sha256 = "0wb9xgpp9bc045kkw0jg14qnxa1y7ydsv1zw4nmy0mw7acxpcjgn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/pyenv-mode";
@@ -58654,15 +59294,99 @@
license = lib.licenses.free;
};
}) {};
+ pyim = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, pyim-basedict }:
+ melpaBuild {
+ pname = "pyim";
+ version = "20170901.2053";
+ src = fetchFromGitHub {
+ owner = "tumashu";
+ repo = "pyim";
+ rev = "54c05392e5a9523e34c7d54f8999632358f0ed89";
+ sha256 = "0cxyz8b1djsdd0pxy15aamxx8j4vxvakinmrrwm3k6saqx8frmr9";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/pyim";
+ sha256 = "1ly4xhfr3irlrwvv20j3kyz98g7barridi9n8jppc0brh2dlv98j";
+ name = "pyim";
+ };
+ packageRequires = [ async cl-lib emacs popup pos-tip pyim-basedict ];
+ meta = {
+ homepage = "https://melpa.org/#/pyim";
+ license = lib.licenses.free;
+ };
+ }) {};
+ pyim-basedict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "pyim-basedict";
+ version = "20170726.1959";
+ src = fetchFromGitHub {
+ owner = "tumashu";
+ repo = "pyim-basedict";
+ rev = "3196cb210e056702c5a4ea1dac1d8e1e27740fab";
+ sha256 = "03jbjc5a1h22vpcybg0gmbyibaa85w2ml1pjk646qb28ljywd5aw";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/pyim-basedict";
+ sha256 = "1y8cmccli3im5bvws2h582z7k4nj6p8brgypl8h09y3na6yjy2z9";
+ name = "pyim-basedict";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/pyim-basedict";
+ license = lib.licenses.free;
+ };
+ }) {};
+ pyim-cangjie5dict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pyim }:
+ melpaBuild {
+ pname = "pyim-cangjie5dict";
+ version = "20170729.1946";
+ src = fetchFromGitHub {
+ owner = "erstern";
+ repo = "pyim-cangjie5dict";
+ rev = "c8618590780b818db1a67a29bc47c5d25903517a";
+ sha256 = "0p49h2kn8wy3b51zahzyc1cy24h3b44cg5yjpmv4w23dhsr4zlz8";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/27a58729115b038abe813601bf16bba1524cdb2c/recipes/pyim-cangjie5dict";
+ sha256 = "0k2nxdlrj3m09javv599ajwd8cd5mjz0hj1j51zpv4y0l1n801bn";
+ name = "pyim-cangjie5dict";
+ };
+ packageRequires = [ pyim ];
+ meta = {
+ homepage = "https://melpa.org/#/pyim-cangjie5dict";
+ license = lib.licenses.free;
+ };
+ }) {};
+ pyim-wbdict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pyim }:
+ melpaBuild {
+ pname = "pyim-wbdict";
+ version = "20170724.1527";
+ src = fetchFromGitHub {
+ owner = "tumashu";
+ repo = "pyim-wbdict";
+ rev = "114489ed97e825ae11a8d09da6e873820cf23106";
+ sha256 = "187wx418pj4h8p8baf4943v9dsb6mfbn0n19r8xiil1z2cmm4ygc";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/ab1cb8bc623d1f12f78fa42ce8b16514e5b07c51/recipes/pyim-wbdict";
+ sha256 = "1s0i9xcnpy8kxqhsv7rqxabv5vnxsciyng398mn32mknib03315i";
+ name = "pyim-wbdict";
+ };
+ packageRequires = [ pyim ];
+ meta = {
+ homepage = "https://melpa.org/#/pyim-wbdict";
+ license = lib.licenses.free;
+ };
+ }) {};
pyimport = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }:
melpaBuild {
pname = "pyimport";
- version = "20170303.732";
+ version = "20170808.346";
src = fetchFromGitHub {
owner = "Wilfred";
repo = "pyimport";
- rev = "2482c8efee8edab9f26ea278848d786323fcff9d";
- sha256 = "091ilax7vs34mh907rxfi2hm140ipa39nwrs27w8nllx2qsrbljv";
+ rev = "50789ef8c5e19997bd5b0d4c47acb7660d128e76";
+ sha256 = "1g4kp6m9bqpvyp0wy1bjx8246mqvdy5jznl1ash1qn7gr07kb34s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/71bc39b06cee37814960ef31c6a2056261b802fb/recipes/pyimport";
@@ -58703,8 +59427,8 @@
src = fetchFromGitHub {
owner = "PyCQA";
repo = "pylint";
- rev = "9f7797ae15bd5e4e5c4ad320afcc15eeb4cdae82";
- sha256 = "0p3zmaq0vk5z4ia2i54rjdw4a1d4s9ljb28l48xbb82jmjlgniw7";
+ rev = "e231a409a83a23c24c8b7dbbaca79314eee6d4c6";
+ sha256 = "0xkbhd2cgsmqkbkscaa758ngfg01cdym7qgh809wsa0j6xf058lp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint";
@@ -58846,12 +59570,12 @@
python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "python-mode";
- version = "20170716.1133";
+ version = "20170825.20";
src = fetchFromGitLab {
owner = "python-mode-devs";
repo = "python-mode";
- rev = "4846252fb81c309eb5f7a6aa2dcc04804412c684";
- sha256 = "0zcy7afvyzqmgsn88v5m73bkglnfavhqb4b7fviz355i3waiyfx5";
+ rev = "e0fab065042a7e35b73928e94f32f649eac6a3af";
+ sha256 = "0vpzzfdr85zp2gsh148yp1b1aynwcgvva69r3qjj0cwm13f28492";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode";
@@ -58951,12 +59675,12 @@
pyvenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "pyvenv";
- version = "20170224.538";
+ version = "20170826.812";
src = fetchFromGitHub {
owner = "jorgenschaefer";
repo = "pyvenv";
- rev = "91c47b8d2608ccbcac2eba91f0e36b422101ce55";
- sha256 = "09c0f7ln1in8h03idbzggvmqkxj6i9jdjbmg1nnyarhffmgbcvnh";
+ rev = "fc1e9c1fbac00460a32435390b94a8ce4f5542ce";
+ sha256 = "0ckam3mkx44hrdykrhvm147xvw09rn328byl6dcpd3ygdqamwpdk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e37236b89b9705ba7a9d134b1fb2c3c003953a9b/recipes/pyvenv";
@@ -59077,12 +59801,12 @@
quelpa = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, package-build }:
melpaBuild {
pname = "quelpa";
- version = "20170620.2318";
+ version = "20170727.557";
src = fetchFromGitHub {
owner = "quelpa";
repo = "quelpa";
- rev = "dbb57da3eba3b5a04ab9b5184634ec139d68ddcd";
- sha256 = "1jszkgf9rkkjscfaijbz84kpbpw46p15zvlvfmvil30gs5vp2pk4";
+ rev = "c095fa14046c1313b97df4ec102bdea5a981ff1d";
+ sha256 = "159pkv7q0kz3slc34489gnfbyw07g3iphkx6mvzqkxql8k2iw0v7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7dc3ba4f3efbf66142bf946d9cd31ff0c7a0b60e/recipes/quelpa";
@@ -59182,12 +59906,12 @@
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";
@@ -59242,6 +59966,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";
@@ -59287,12 +60032,12 @@
racket-mode = callPackage ({ emacs, faceup, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "racket-mode";
- version = "20170617.1942";
+ version = "20170913.509";
src = fetchFromGitHub {
owner = "greghendershott";
repo = "racket-mode";
- rev = "9c5bcb7b7db979b34c6e99ade84b443651d62ab7";
- sha256 = "1cxpjkds24afi5b9i13dkgzv0yy6cgg3r9vsrif8mfhhfrr7sx1y";
+ rev = "d57b3a6c64835fe334501bb2b1f8e370be777d90";
+ sha256 = "11mh94lcmwh0qb68lyqmdkannq9p9y3j32mmwc23q88z1z7vvbf6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7ad88d92cf02e718c9318d197dd458a2ecfc0f46/recipes/racket-mode";
@@ -59305,27 +60050,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";
@@ -59347,27 +60071,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";
@@ -59560,12 +60263,12 @@
ranger = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ranger";
- version = "20170522.2331";
+ version = "20170817.857";
src = fetchFromGitHub {
owner = "ralesi";
repo = "ranger.el";
- rev = "e371cdc2d6065099fe7c68583597b1d0abea792b";
- sha256 = "1c0jlykxkl46qimr60crac4j7nvzr0jixjiv4m6zzk93pn12y3g1";
+ rev = "6bbff5df2e55f56047fca5058d9ca93ba4963aef";
+ sha256 = "000dqqy5fbic8rwyndchj5pjmzad2yfa7z3xzi84dla6vhv15q6p";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0207e754f424823fb48e9c065c3ed9112a0c445b/recipes/ranger";
@@ -59602,12 +60305,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";
@@ -59725,36 +60428,15 @@
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";
- version = "20160115.431";
+ version = "20170731.1401";
src = fetchFromGitHub {
owner = "dimitri";
repo = "rcirc-groups";
- rev = "e858084e5956ba32a84046616326c0903de6d59f";
- sha256 = "0d99x7dfw5xrn62knvs65lvn6xyy7399xwqyy47bs4n81v25aqbh";
+ rev = "b68ece9d219b909244d4e3c0d8bf6a746d6fead7";
+ sha256 = "196x3qg22rhh917diml1q0hszqrqwg0klzp96q1c7c744mlq82fx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/35b9c9e877c686df0ac9f96855d733a240063829/recipes/rcirc-groups";
@@ -59875,12 +60557,12 @@
react-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
melpaBuild {
pname = "react-snippets";
- version = "20160712.1521";
+ version = "20170803.1550";
src = fetchFromGitHub {
owner = "johnmastro";
repo = "react-snippets.el";
- rev = "3216134ee98b0ac39454d11d19b1508d3e7ca709";
- sha256 = "1j89pzx5karfh37gp0s9mnsq72h9628fihjqhra5h4qpj1irmkld";
+ rev = "bfc4b68b81374a6a080240592641091a7e8a6d61";
+ sha256 = "1wna4v8l3j0ppjv4nj72lhp0yh6vbka6bvl1paqqfvay300kiqjb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3720192fdfa45f9b83259ab39356f469c5ac85b4/recipes/react-snippets";
@@ -59900,8 +60582,8 @@
src = fetchFromGitHub {
owner = "gromnitsky";
repo = "read-aloud.el";
- rev = "d5f80ab72054a957aed25224639c1779cae5f4d1";
- sha256 = "1hbb6diz96jabajxrnancjfpyd9div8vzbwys1f5bddi9z8l2jyy";
+ rev = "c662366226abfb07204ab442b4f853ed85438d8a";
+ sha256 = "0wmfjbk3s45wj8j6xwfdldxwkrxsfcby2a242r2p88y3f8pp30i1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/20452bf3112276a7e1c880bfab259150fc70b47a/recipes/read-aloud";
@@ -59980,12 +60662,12 @@
realgud = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, load-relative, loc-changes, melpaBuild, test-simple }:
melpaBuild {
pname = "realgud";
- version = "20170712.334";
+ version = "20170907.916";
src = fetchFromGitHub {
owner = "rocky";
repo = "emacs-dbgr";
- rev = "ad333ac5e95f7e0c98cb4bc4c924ca9fff97cc88";
- sha256 = "1yng0fj9zr57jwmaxk71vxlwpxahyc4iadyyj5v8c09a4ljvlfs6";
+ rev = "f41b7a7f8eac0be5c4d8780af1d461f9e51e9cad";
+ sha256 = "1k3xsidc05dls9scsi7vvrrqlfgqk343crgh89amg066s5p55s6y";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud";
@@ -60091,12 +60773,12 @@
rebecca-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rebecca-theme";
- version = "20170406.2136";
+ version = "20170730.943";
src = fetchFromGitHub {
owner = "vic";
repo = "rebecca-theme";
- rev = "cf8c45993ed4e0a49dcbda71827dbe5835bda077";
- sha256 = "15v688mnr0vg7pj8mcwqpwbw896xrfjpcbwhgfhq2bd0z0j0shbk";
+ rev = "ee0d8796eca831110b7084a2af96fb4184d0a418";
+ sha256 = "138hs6lgql40cn86p7v2xhb7ck2zcvz1vi6jd7fk55l0xgj5w61k";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/19f40f30113c7dabd76a2d0e52898e6d6be69a35/recipes/rebecca-theme";
@@ -60318,12 +61000,12 @@
redprl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "redprl";
- version = "20170712.903";
+ version = "20170903.911";
src = fetchFromGitHub {
owner = "RedPRL";
repo = "sml-redprl";
- rev = "a2f8c5612a055882db5c01b8160c0ae1bd44f1e1";
- sha256 = "0glnribgqg6hg3ghb5saf26hwydmsg51aq45wj8mdf5dfncimqq8";
+ rev = "f96a5a50354cdc8a83b8fe347fafc49ad6c303a0";
+ sha256 = "0pq0730b8nxm4xhb3dilnmp7lhv8vb83q7860dc64mds3fl12fg0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl";
@@ -60377,27 +61059,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";
@@ -60635,8 +61296,8 @@
src = fetchFromGitHub {
owner = "anler";
repo = "remember-last-theme";
- rev = "57e8e2a475ea89316dbb5c4d2ea047f56a2cbcdf";
- sha256 = "0sb110rb6pnjnvyqn0kji19bhbn8mk4x32yps00aq2g2v9pc1jzr";
+ rev = "0973f1aa6b96355fa376fffe8b45733b6e963c51";
+ sha256 = "11kcqpw1wrhghbw2dx3pqndmq9a1rbqir3k71ggaj1x2y2arzvm7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/26edcdddaf8dc8c9a18d6b007e0d49d04fe4ccca/recipes/remember-last-theme";
@@ -60656,8 +61317,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";
@@ -60735,10 +61396,10 @@
}) {};
replace-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
pname = "replace-plus";
- version = "20170307.942";
+ version = "20170801.1947";
src = fetchurl {
url = "https://www.emacswiki.org/emacs/download/replace+.el";
- sha256 = "0bbqmgz4grbg9g4kd5c85wn1icfgqapdkb2v7jmqwg4mc8s7piv5";
+ sha256 = "0vlk2sjszzzkf94vfgb52ck4qbqp9ll1kdlxnmxixjxxl8iciwzj";
name = "replace+.el";
};
recipeFile = fetchurl {
@@ -60773,6 +61434,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";
@@ -60797,12 +61479,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";
@@ -60927,8 +61609,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";
@@ -60944,12 +61626,12 @@
restclient = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "restclient";
- version = "20170715.440";
+ version = "20170727.825";
src = fetchFromGitHub {
owner = "pashky";
repo = "restclient.el";
- rev = "afcd8dbd6adc6f7cecea4e5489b5dfe392e7cd8c";
- sha256 = "1q3ipirc6prhgha23jy1w4kd2bmcj9qsy5d5q0q4qxmqnbzwlcpn";
+ rev = "ef6d756e2013843f7afcbea42b69ad54aa5de518";
+ sha256 = "0a44hyfi55khripys7spml7xnz8yp8v7cbj01q9q0vsips6gqpra";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/59303304fe1f724596245556dd90f6afffba425d/recipes/restclient";
@@ -60969,8 +61651,8 @@
src = fetchFromGitHub {
owner = "pashky";
repo = "restclient.el";
- rev = "afcd8dbd6adc6f7cecea4e5489b5dfe392e7cd8c";
- sha256 = "1q3ipirc6prhgha23jy1w4kd2bmcj9qsy5d5q0q4qxmqnbzwlcpn";
+ rev = "ef6d756e2013843f7afcbea42b69ad54aa5de518";
+ sha256 = "0a44hyfi55khripys7spml7xnz8yp8v7cbj01q9q0vsips6gqpra";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/59303304fe1f724596245556dd90f6afffba425d/recipes/restclient-helm";
@@ -61047,12 +61729,12 @@
reverse-im = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "reverse-im";
- version = "20170623.640";
+ version = "20170721.940";
src = fetchFromGitHub {
owner = "a13";
repo = "reverse-im.el";
- rev = "da6a4d2fdc1019e7fcd050db6c5344fdad1e2286";
- sha256 = "1vsfxy4scknn5142mn4v1hkj2qbphmwdj175prd1aj1gk8cbzw9v";
+ rev = "63fb1edee017177c44f8b663a707201b3dd78345";
+ sha256 = "1ha4ldfcnw57rg15mbxspymgs6b2b50f6s0fcb6d7k9xai5idmnp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f282ebbed8ad01b63b0e708ab273db51bf65fdbb/recipes/reverse-im";
@@ -61089,12 +61771,12 @@
review-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "review-mode";
- version = "20170105.2156";
+ version = "20170804.545";
src = fetchFromGitHub {
owner = "kmuto";
repo = "review-el";
- rev = "fc7a2f152be63874da4211ec0b49ff1fadb6465e";
- sha256 = "1fg18kb5y8rsxnh166r0yj5wb0927rsdhpwmfwq3i9kgycgpznix";
+ rev = "e166efd9b8596a9abe14afae79b33eaa808c14ea";
+ sha256 = "0cnwfb3q9xfsrzg5sf64y4p00wdcw0iiz5iard00siva0q0s5k9x";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f2f9e2667389577d0703874ca69ebe4800ae3e01/recipes/review-mode";
@@ -61107,27 +61789,6 @@
license = lib.licenses.free;
};
}) {};
- revive = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "revive";
- version = "20150417.1555";
- src = fetchFromGitHub {
- owner = "emacsmirror";
- repo = "revive";
- rev = "16e1ac7cfa2fdccddf60d4a0e15731fc7448d818";
- sha256 = "037sac5fvz6l2zgzlf8ykk4jf9zhj7ybzyz013jqzjj47a6sn1r1";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/965891688e94839e63fcc7c22dae317bb56d1ff6/recipes/revive";
- sha256 = "1l7c6zq3ga2k1488qb0hgxlk08p3vrcf0sx116c1f8z8nf4c8ny5";
- name = "revive";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/revive";
- license = lib.licenses.free;
- };
- }) {};
reykjavik-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "reykjavik-theme";
@@ -61171,12 +61832,12 @@
rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }:
melpaBuild {
pname = "rg";
- version = "20170622.1135";
+ version = "20170908.2359";
src = fetchFromGitHub {
owner = "dajva";
repo = "rg.el";
- rev = "09a5919d8982cfdb8496f0db7deccfb510a7f000";
- sha256 = "1jvinpid3w4p6s4ni0fhg4g8xc3m0c7rd3db2al214xfcn4mbbgr";
+ rev = "adfdf6230f02f469a1b508922b6837f95f6434d2";
+ sha256 = "0bk0caadn3wq2ck2acyvdssllw45l455binpm5i3i63nzs73v8r2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg";
@@ -61210,15 +61871,36 @@
license = lib.licenses.free;
};
}) {};
+ rib-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "rib-mode";
+ version = "20170726.748";
+ src = fetchFromGitHub {
+ owner = "blezek";
+ repo = "rib-mode";
+ rev = "97470158784c3c212e22e2c20b8471ee65ba59af";
+ sha256 = "0hln0hympmxmsci82ivc2rw289j1bmgdxns96m1ng1bl668bwag7";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/c38c18f3eb75d559752fcd9956464fef890be728/recipes/rib-mode";
+ sha256 = "0qgbzrwbbgg4mzjb7yw85qs83b6hpldazip1cigywr46w7f81587";
+ name = "rib-mode";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/rib-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
rich-minority = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rich-minority";
- version = "20160725.1255";
+ version = "20170813.622";
src = fetchFromGitHub {
owner = "Malabarba";
repo = "rich-minority";
- rev = "478f0fbc0dbba6619a96a471b9b295f2f436475f";
- sha256 = "1n07bvjaz468zbd7am3rmw98a97clz8p4x6ryhbd4riqmfh845wi";
+ rev = "333e4669f76a0fb68b433117d377711e418a525e";
+ sha256 = "0ms42fnfis6y2h717cqhngzv7ysgf8340rsfm2i7rx2gbdynr1ic";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/rich-minority";
@@ -61234,12 +61916,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 = "d48ba58acbe8934700cd23db2acb574b09306238";
+ sha256 = "03dmyn5lnw0mj4ymgyxz6gksl2byw31plxn61qcggkj6gk8g500d";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/689b0060ee5db505fc0ed4603aca204b2d3c63a2/recipes/rigid-tabs";
@@ -61252,6 +61934,27 @@
license = lib.licenses.free;
};
}) {};
+ rimero-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "rimero-theme";
+ version = "20170819.648";
+ src = fetchFromGitHub {
+ owner = "yveszoundi";
+ repo = "emacs-rimero-theme";
+ rev = "451b9d30f7ef711ee8c9c304677c7dcac6c57cfb";
+ sha256 = "0442s4pj8v4ympf8nk1zgrvk3d16djgdhknlvkwi296db3zixbc4";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/c6d07b0c021001195e6e0951c890566a5a784ce1/recipes/rimero-theme";
+ sha256 = "0jbknrp9hc8s956cy2gqffxnx0fgnhmjqp2i4vyp0ywh45wrls5r";
+ name = "rimero-theme";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/rimero-theme";
+ license = lib.licenses.free;
+ };
+ }) {};
rinari = callPackage ({ fetchFromGitHub, fetchurl, inf-ruby, jump, lib, melpaBuild, ruby-compilation, ruby-mode ? null }:
melpaBuild {
pname = "rinari";
@@ -61297,12 +62000,12 @@
ripgrep = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ripgrep";
- version = "20170602.152";
+ version = "20170810.1118";
src = fetchFromGitHub {
owner = "nlamirault";
repo = "ripgrep.el";
- rev = "5af6a0b2ee8a639cf857724ce4328f1f0955c99e";
- sha256 = "05jkj7c9ha09gp74j7k4bhcxq8ypxz922ghwv5bjpxg4czn5s0w9";
+ rev = "c47a2da4668ca338e7fadc3d8c095e075caaa17d";
+ sha256 = "0x2rkm1yf03qfzylx6pk32cq7mmydila2iwiq40k5nl4wgfia5vx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e8d789818876e959a1a59690f1dd7d4efa6d608b/recipes/ripgrep";
@@ -61318,12 +62021,12 @@
riscv-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "riscv-mode";
- version = "20161001.1838";
+ version = "20170804.821";
src = fetchFromGitHub {
owner = "AdamNiederer";
repo = "riscv-mode";
- rev = "e8425b71443a2decbe70cc5892e72ce2ceb17570";
- sha256 = "035hv8dpc6rk4b22mw4ch9yzf4wq14h8bba765fxg87grpi0mwg4";
+ rev = "99febf97d1fa9441e8dada94fe30c2aa439c9749";
+ sha256 = "119p926ypz525xdh82m2d1saky1qh5va224fxyqisfbwfrc17arh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0853b4b678be7d1906a2f7946bfa1072590faf72/recipes/riscv-mode";
@@ -61339,12 +62042,12 @@
rjsx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
melpaBuild {
pname = "rjsx-mode";
- version = "20170710.711";
+ version = "20170808.634";
src = fetchFromGitHub {
owner = "felipeochoa";
repo = "rjsx-mode";
- rev = "a0a9cfd532f05f9ccb42919b9105d8e902d971fd";
- sha256 = "1gbgm00arfkgvp8gihpn1zf69lp4a5glhvrawnma6kraf5ldx0fs";
+ rev = "39474fe464d76112e278445996cfd4ff84c39af8";
+ sha256 = "11wz3gqdyb4ffsy9qdria0515ry643g3yjzidvaqccx6g59g4d5x";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b83be7efdef2457e1320fe3dec46484fbd20263c/recipes/rjsx-mode";
@@ -61381,16 +62084,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 = [];
@@ -61570,12 +62273,12 @@
rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rtags";
- version = "20170714.1944";
+ version = "20170903.1710";
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "65c8f03ff0112ce5c5e11aff6867ad0eb9019e63";
- sha256 = "0xlacwjmvx5xd8m7yi8l8mqi0lqs2gr2hmjag2frvmxcn4cpb4gc";
+ rev = "2af4d6a32e8194f8fbcc23fd94395e3d595a3c25";
+ sha256 = "0091w529lvbjlw1fdb3qjgb8fd5fcwxhqyr4ps5cvxl5bqnwlw39";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags";
@@ -61636,8 +62339,8 @@
version = "20161115.2259";
src = fetchsvn {
url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/";
- rev = "59350";
- sha256 = "18fkx4a8jarznczv3h36663dqprwh6pyf76s3f210cqqy8c5y5yi";
+ rev = "59866";
+ sha256 = "05rkz2wvyr00rr6g5sc2jgx1v2m81cbf24gjazxw4i9b3sf55ykr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ruby-additional";
@@ -61690,39 +62393,19 @@
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 ({ fetchsvn, fetchurl, lib, melpaBuild }:
+ ruby-electric = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ruby-electric";
- version = "20150424.752";
- src = fetchsvn {
- url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/";
- rev = "59350";
- sha256 = "18fkx4a8jarznczv3h36663dqprwh6pyf76s3f210cqqy8c5y5yi";
+ version = "20170810.430";
+ src = fetchFromGitHub {
+ owner = "knu";
+ repo = "ruby-electric.el";
+ rev = "3553448a780a1ea5c3b0e9becd820d4762876593";
+ sha256 = "0h47lfgxjcyyl8gb1w7l8j8h65s3lp1hsq742sl7a1gf5y6bbm3v";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/ruby-electric";
- sha256 = "0abi1hqjscz2wj4n5habjb6rksxkhwv0cvpw68irkj4fas92qhk8";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/5fd5fa797a813e02a6433ecbe2bca1270a383753/recipes/ruby-electric";
+ sha256 = "02xskivi917l8xyhrij084dmzwjq3knjcn65l2iwz34s767fbwl2";
name = "ruby-electric";
};
packageRequires = [];
@@ -61738,8 +62421,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";
@@ -61773,27 +62456,6 @@
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";
@@ -61801,8 +62463,8 @@
src = fetchFromGitHub {
owner = "purcell";
repo = "ruby-hash-syntax";
- rev = "13288a29478a9e45ab4fd2188aea8d4894e08848";
- sha256 = "1zx70bdyqabx03g813h76ks9agy66yf08z9x83yw1rsf713d1pg2";
+ rev = "f3270274a9d12537263d9ae0b8f4e60c542cf77f";
+ sha256 = "1ck3xhavilq5qdcc9libd6dyzqz7b0cxd3q5nd7kaxicc28h9p80";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c7d21a43a4bf267507bdc746ec9d0fd82049c0af/recipes/ruby-hash-syntax";
@@ -61902,12 +62564,12 @@
rufo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rufo";
- version = "20170712.824";
+ version = "20170718.716";
src = fetchFromGitHub {
owner = "danielma";
repo = "rufo.el";
- rev = "e827b44c8093715a204ed0e4a64ade34441f9355";
- sha256 = "14qf3napgx8vycr0igrr8534yymgaqh2cb09iz7gbf65cmk86pq8";
+ rev = "85a6d80fb05fef396a8029b8f944c92a53faf8fe";
+ sha256 = "11klircrdc9z9jfksd6rjgwbb775mziss67mw74673b8iva8n1y7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/123b89e06a44ef45150ca7243afc41302dfb6c6e/recipes/rufo";
@@ -61986,12 +62648,12 @@
rust-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rust-mode";
- version = "20170712.1214";
+ version = "20170827.1300";
src = fetchFromGitHub {
owner = "rust-lang";
repo = "rust-mode";
- rev = "60a1f36f4111e825d20d9c3aed561981c470806a";
- sha256 = "0p09j3y90i0ninyr3alxra17r09ps4sj9klww638l9csk2cgw80f";
+ rev = "c8280aea1d02ae84bff2a6f02f8dc7701309c8b6";
+ sha256 = "105ayzqkcd8q2zhny1x84gdry6mfp92zfa8ihfqlfvva6ax6v1vp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8f6e5d990d699d571dccbdeb13327b33389bb113/recipes/rust-mode";
@@ -62070,12 +62732,12 @@
s = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "s";
- version = "20170428.1026";
+ version = "20170906.1304";
src = fetchFromGitHub {
owner = "magnars";
repo = "s.el";
- rev = "e61dee51474e61b777575b474459c582f3084f64";
- sha256 = "0yw23k8ix8v8sablqzn4802xxzf6b63q6hk3chypbx3y41363s8p";
+ rev = "3a95064647d1f39b90e65a56f1fdfceb7c329f75";
+ sha256 = "0n2c6islny418pfmaz1bjij1j2s1qailga0vha32qanx4fx7yf3v";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/s";
@@ -62133,12 +62795,12 @@
sage-shell-mode = callPackage ({ cl-lib ? null, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
melpaBuild {
pname = "sage-shell-mode";
- version = "20170218.1829";
+ version = "20170823.1809";
src = fetchFromGitHub {
owner = "sagemath";
repo = "sage-shell-mode";
- rev = "db99da9189002f3a95e9dc24038f73fc3a3f0499";
- sha256 = "1bbkfwnqlr68qkzdcjs3gjm3lfvbcw7vwx9bvrfx6rhl8k9a2i15";
+ rev = "5ba8a40c38c71c813a9d6dc79036f71a7a47e013";
+ sha256 = "04f11yp1rc5zi31hn9imz1z4nli2i5pzllx8niiibff82kw8dvip";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/eb875c50c2f97919fd0027869c5d9970e1eaf373/recipes/sage-shell-mode";
@@ -62364,12 +63026,12 @@
sbt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sbt-mode";
- version = "20170708.1211";
+ version = "20170820.924";
src = fetchFromGitHub {
owner = "ensime";
repo = "emacs-sbt-mode";
- rev = "cee28b5e6121e6c85bb647b709c7a8c9e3883700";
- sha256 = "1f5xkcr9kj5nwqh77hfxbs2i9zzsikbksa56lg9vw67pc78rs7vi";
+ rev = "bdf31a1ffe637d1445b149804d5f5cc29333a1bd";
+ sha256 = "0ygp0c2hy4zp5x0ghplxf2fhrf16cn37sk2zf6i43zqz6gydzq8a";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/364abdc3829fc12e19f00b534565227dbc30baad/recipes/sbt-mode";
@@ -62389,8 +63051,8 @@
src = fetchFromGitHub {
owner = "openscad";
repo = "openscad";
- rev = "a6e98831985be670148c527747b0e91330d0307b";
- sha256 = "0yyacg09p74r4q56kqw3km6sqwnk2hpzxqi9jvbw10x2q2c618bk";
+ rev = "5fbb1060ad967ac8af34687c7e7bcac69c7381e0";
+ sha256 = "1gfpkqhqw9n0x325ar7ln9j2052r8hk65ilhz3dp7x865mqdm2wn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode";
@@ -62427,12 +63089,12 @@
scala-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "scala-mode";
- version = "20170611.806";
+ version = "20170802.432";
src = fetchFromGitHub {
owner = "ensime";
repo = "emacs-scala-mode";
- rev = "6f49104c182ec1cc8b30314dc92d02f4752106cf";
- sha256 = "0ahhhsg095rixiy9j49854mmrkd92vvmqnms0f6msrl4jgdf6vpw";
+ rev = "56cba2903cf6e12c715dbb5c99b34c97b2679379";
+ sha256 = "13miqdn426cw9y1wqaz5smmf0wi3bzls95z6shcxzdz8cg50zmpg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/564aa1637485192a97803af46b3a1f8e0d042c9a/recipes/scala-mode";
@@ -62469,12 +63131,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";
@@ -62802,12 +63464,12 @@
scrooge = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, thrift }:
melpaBuild {
pname = "scrooge";
- version = "20160718.1735";
+ version = "20170728.1106";
src = fetchFromGitHub {
owner = "cosmicexplorer";
repo = "emacs-scrooge";
- rev = "5e8a301919ec88a7aa48a9c66cafb1bddd9f6100";
- sha256 = "0ndv9j7n9z53f7q0w7cgb4wsh7vyb8f4bga723cm7j0gipx8fjnf";
+ rev = "fb55c64eb2ae4db57b14bc99d2e411d81b2c5c2a";
+ sha256 = "1hhbm7jmngv69l81vaj0fhpzkvw4sf7q5mdf9mm27mwd2jk70prl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7e3623181fa771dc94a7026eb58ac81fe9d9fc68/recipes/scrooge";
@@ -62844,12 +63506,12 @@
sdcv = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, showtip }:
melpaBuild {
pname = "sdcv";
- version = "20170501.2155";
+ version = "20170801.2216";
src = fetchFromGitHub {
owner = "stardiviner";
repo = "sdcv.el";
- rev = "cf7aa835360a1cb93b2b5fedaf5b816ff7410f0f";
- sha256 = "05bcgfzl23v8hkj395pp0gwl088smyx36i82sx5yjgygpg2i5dif";
+ rev = "ebe45a5fb1e465cb4150e4dbe38a069b2a218219";
+ sha256 = "0pcbrzii9x7v3qqygr29yi6pg1gvzjbsgcfziispsf24n01lrrly";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/173e233b2dacaaf54d92f3bcc06e54d068520dd4/recipes/sdcv";
@@ -62968,11 +63630,11 @@
secretaria = callPackage ({ alert, emacs, f, fetchgit, fetchurl, lib, melpaBuild, org, s }:
melpaBuild {
pname = "secretaria";
- version = "20170430.1724";
+ version = "20170828.945";
src = fetchgit {
url = "https://bitbucket.org/shackra/secretaria.el";
- rev = "7551dfa21a4a796e0306041145c32c2ec8738028";
- sha256 = "1wiqk8ja3wjv7kmnnd93fg9rync08wjyhy1ssxan5csqfg89vw5a";
+ rev = "1cd32d957864be1ba5c44a3f505f662832169a28";
+ sha256 = "1xvwzmcfwfxsm9chbjnqjsipmv5pqpzk5d0ybw3rcdc47nag3jdg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7b4c9ccbf2eeaa290f3b9d1e5eaaeb5b5547b365/recipes/secretaria";
@@ -63030,12 +63692,12 @@
sekka = callPackage ({ cl-lib ? null, concurrent, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
melpaBuild {
pname = "sekka";
- version = "20170618.500";
+ version = "20170803.547";
src = fetchFromGitHub {
owner = "kiyoka";
repo = "sekka";
- rev = "282bb04ed524ceff2a7a13cee118ec6df55b2323";
- sha256 = "1g15lrx3ik6539vc5f8v3x0va6k02zz5l13jnqlzs1fl4inxk35v";
+ rev = "61840b57d9ae32bf8e297b175942590a1319c7e7";
+ sha256 = "05vj12l88s29wnkpvgzlbypv9hkmy1hqgv9hvav6v4kmdykl5w1b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/350bbb5761b5ba69aeb4acf6d7cdf2256dba95a6/recipes/sekka";
@@ -63156,12 +63818,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";
@@ -63174,27 +63836,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 = "f47839853455d0f4ffe50b3b0f9d3e7a15ace1fa";
- sha256 = "11s5zvwklf5vzwiiwmcw5c93qjvf5nxclbbk8hlj8fg88c5ssbzd";
- };
- 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";
@@ -63240,12 +63881,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";
@@ -63323,12 +63964,12 @@
services = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "services";
- version = "20170327.835";
+ version = "20170802.430";
src = fetchFromGitHub {
owner = "davep";
repo = "services.el";
- rev = "87d65bf9fd8b02101f751846c650fc518355d1ea";
- sha256 = "01wlknj97jrmhji3c3dyc6cm8pp0rj93knfrg3l7zimr7crx3rg3";
+ rev = "04c7986041a33dfa0b0ae57c7d6fbd600548c596";
+ sha256 = "0ycfkskkdlmc0l75z5a8f66wq5mvb24c4kz19a6kqs8rwm2ygz35";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/beb91b4397f6e35a1d5c73a127d8cd7fc9201935/recipes/services";
@@ -63970,12 +64611,12 @@
shr-tag-pre-highlight = callPackage ({ emacs, fetchFromGitHub, fetchurl, language-detection, lib, melpaBuild }:
melpaBuild {
pname = "shr-tag-pre-highlight";
- version = "20170525.902";
+ version = "20170820.2127";
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";
@@ -63988,6 +64629,27 @@
license = lib.licenses.free;
};
}) {};
+ shrink-path = callPackage ({ dash, emacs, f, fetchFromGitLab, fetchurl, lib, melpaBuild, s }:
+ melpaBuild {
+ pname = "shrink-path";
+ version = "20170812.1947";
+ src = fetchFromGitLab {
+ owner = "bennya";
+ repo = "shrink-path.el";
+ rev = "9d06c453d1537df46a4b703a29213cc7f7857aa0";
+ sha256 = "021bpgpzysag1s11m9pyq2bk6a0mf9ayx10yxhf5cw56x3d0jj1b";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/86b0d105e8a57d5f0bcde779441dc80b85e170ea/recipes/shrink-path";
+ sha256 = "0fq13c6g7qbq6f2ry9dzdyg1f6p41wimkjcdaj177rnilz77alzb";
+ name = "shrink-path";
+ };
+ packageRequires = [ dash emacs f s ];
+ meta = {
+ homepage = "https://melpa.org/#/shrink-path";
+ license = lib.licenses.free;
+ };
+ }) {};
shrink-whitespace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "shrink-whitespace";
@@ -64033,12 +64695,12 @@
shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "shx";
- version = "20170714.1041";
+ version = "20170805.1619";
src = fetchFromGitHub {
owner = "riscy";
repo = "shx-for-emacs";
- rev = "fc98dd68f1562cf9c10a0245274c24f280f59da2";
- sha256 = "16d2l0vfrsv878w908mfi0m0raab96zxi4559a1589y7lzah2nrd";
+ rev = "8166b02ebbab43d8a33d47b8221a94b69fc63487";
+ sha256 = "0n97iys2xyg1lzkn8bqsx0sgqpzci1pxg69v42cpzmyrz3h54bwp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx";
@@ -64072,27 +64734,6 @@
license = lib.licenses.free;
};
}) {};
- sicp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "sicp";
- version = "20170124.1650";
- src = fetchFromGitHub {
- owner = "webframp";
- repo = "sicp-info";
- rev = "935da01b7aa782a1a7f9fd17b5512132b197da8c";
- sha256 = "0mgbhf5cp7z6yd5kl5x4whlc6nfm2lqq6khxcmilrbgv4was55sj";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/sicp";
- sha256 = "1q7pbhjk8qgwvj27ianrdbmj98pwf3xv10gmpchh7bypmbyir4wz";
- name = "sicp";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/sicp";
- license = lib.licenses.free;
- };
- }) {};
sift = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sift";
@@ -64302,19 +64943,19 @@
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 ];
@@ -64347,12 +64988,12 @@
simpleclip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "simpleclip";
- version = "20170603.1542";
+ version = "20170803.540";
src = fetchFromGitHub {
owner = "rolandwalker";
repo = "simpleclip";
- rev = "7deff873b79910496b4baf647cdb8dd5de63465a";
- sha256 = "12f853vm18y22sd22wmwqyzp5f5vmb67i33iiaw6mqqcp6qwbyqz";
+ rev = "d461c462c237cd896553adb468cd77499d0d26ad";
+ sha256 = "1dfa1sa7rbadj36nbzyxbpbvkdlh1s5n0mx6hxn52psqin1ra6yn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7c921e27d6aafc1b82d37f6beb8407840034377a/recipes/simpleclip";
@@ -64456,8 +65097,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";
@@ -64473,12 +65114,12 @@
skewer-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, simple-httpd }:
melpaBuild {
pname = "skewer-mode";
- version = "20170709.939";
+ version = "20170730.1241";
src = fetchFromGitHub {
owner = "skeeto";
repo = "skewer-mode";
- rev = "51f3bbeafea6701de78190a395f6376a9974f1e5";
- sha256 = "0k8yc75d7hly4qiqxvg027cwmcck63nmbyr75qyjq8kc0vk0x5mr";
+ rev = "7df248a4b7ec2eb0f3cabcbdfb052593d1f86590";
+ sha256 = "07l90cqcngwy8vxx4yxx7i72lp10wzv44ypn07zwyrl69bcmf2q8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/10fba4f7935c78c4fc5eee7dbb161173dea884ba/recipes/skewer-mode";
@@ -64557,12 +65198,12 @@
slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }:
melpaBuild {
pname = "slack";
- version = "20170712.2328";
+ version = "20170903.2004";
src = fetchFromGitHub {
owner = "yuya373";
repo = "emacs-slack";
- rev = "f89362f31d8c1ee752bfd9d3cc8a6b5766c94bd6";
- sha256 = "0b2j0vvsm6psljdkyybjh5ki6drhvq98xwakifk0li220rsi3lkp";
+ rev = "5df0ea55257b2c1f3a4e4352af4854fb81dee5cc";
+ sha256 = "0xrmsfi1nzm5yhmsxhn7xq87z70jkb68c3il4xf8r4lz6a0d8m4p";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack";
@@ -64599,12 +65240,12 @@
slim-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "slim-mode";
- version = "20140611.950";
+ version = "20170728.648";
src = fetchFromGitHub {
owner = "slim-template";
repo = "emacs-slim";
- rev = "869c84821cf3e556b380c5c35d8ad62287c4df58";
- sha256 = "0vgyc2ny9qmn8f5r149y4g398mh4gnwsp4yim85z4vmdikqg8vi1";
+ rev = "3636d18ab1c8b316eea71c4732eb44743e2ded87";
+ sha256 = "1sqylm6ipmlh9249mmwfb16b4pv94cvzdwvi3zakdpz713phyjw5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6a3b59bdbc53d7c0b4c4d6434689f7aab2546678/recipes/slim-mode";
@@ -64620,12 +65261,12 @@
slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }:
melpaBuild {
pname = "slime";
- version = "20170705.643";
+ version = "20170828.451";
src = fetchFromGitHub {
owner = "slime";
repo = "slime";
- rev = "d0fd5c50135c20f172a0d7c69250c2d80d2f51e6";
- sha256 = "0k5s75gmgvnpz07nab55k2fi8whgjqkjr08ym0s57dghhv1qrr5v";
+ rev = "f223388c78ea51ce7717e9bbae14c50ad2386c2c";
+ sha256 = "07jks9fnqjv2i9sjfpgj7r3a7g5aha4aipsffjbnw1qd930ygw83";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime";
@@ -64638,27 +65279,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";
@@ -64683,12 +65303,12 @@
slime-docker = callPackage ({ cl-lib ? null, docker-tramp, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, slime }:
melpaBuild {
pname = "slime-docker";
- version = "20160817.2344";
+ version = "20170718.1157";
src = fetchFromGitHub {
owner = "daewok";
repo = "slime-docker";
- rev = "f90fc274c2f764a5962a3cbcf0ea00622ee5bfe6";
- sha256 = "0wknygb8gnr49xc5wyyalgs97zk0qj33wwcw1kcxah4nmvzgqg7f";
+ rev = "dc41f7c33de497bc622f037f33ea2a1ecfa1069f";
+ sha256 = "169vy9wjkf0vzqgdbm30rssl82xl2n73hipnaidncbw9sd8cpx1y";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/15ec3f7208287161571c8fc3b29369ceabb44e5f/recipes/slime-docker";
@@ -64701,36 +65321,15 @@
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";
- version = "20141115.2302";
+ version = "20170808.622";
src = fetchFromGitHub {
owner = "emacsfodder";
repo = "emacs-slime-theme";
- rev = "441288a5791d24e79ada2698888653ef3cf2ac6f";
- sha256 = "13rm9pmshgssmydhpirri38s38z3kvkhqama40qdzqq96dsxlnjx";
+ rev = "8e5880ac69e0b6a079103001cc3a90bdb688998f";
+ sha256 = "0g90ypwyvpdzilvhj0rgfrp78a5gflply3rix2wx8rncw569qb6g";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/641d1959bd31598fcdacd39a3d1bb077dcccfa5c/recipes/slime-theme";
@@ -64809,12 +65408,12 @@
slstats = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "slstats";
- version = "20170629.235";
+ version = "20170823.149";
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";
@@ -64830,12 +65429,12 @@
sly = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sly";
- version = "20170413.557";
+ version = "20170912.445";
src = fetchFromGitHub {
owner = "capitaomorte";
repo = "sly";
- rev = "95519c4ef41988205bb642e534bf2bd2463b6170";
- sha256 = "1bvmmpk4xd954i6dmxjcqayd6apzabg732yhcmjyg633d8hmmiwr";
+ rev = "ac50082050df5274a5d71e182abca0d0b0fe71d1";
+ sha256 = "14cknfz1nnk82svdp92sq6cdpndd5d25l7fgd5zi2l4j5i57rj0b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/79e7213183df892c5058a766b5805a1854bfbaec/recipes/sly";
@@ -64953,48 +65552,6 @@
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 }:
- melpaBuild {
- pname = "smali-mode";
- version = "20160406.1556";
- src = fetchFromGitHub {
- owner = "strazzere";
- repo = "Emacs-Smali";
- rev = "10437ab0b29994cf4bf67ec28ccf82a74b8c026b";
- sha256 = "1ircjz571q1sgjkxryc3rlcpdrh6ac7ydnvclr7ldh3nhz77pm7p";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/90182e5bbf79c570b3cb59f541636d4aad5d8652/recipes/smali-mode";
- sha256 = "17fcr66ky9hmj74i4wr3y9n1d9g8hib7l3gmr4jxj8vsjzfxy7h7";
- name = "smali-mode";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/smali-mode";
- license = lib.licenses.free;
- };
- }) {};
smart-comment = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "smart-comment";
@@ -65016,17 +65573,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 = "20170827.1050";
+ src = fetchFromGitHub {
+ owner = "zenitani";
+ repo = "elisp";
+ rev = "64258b424e471c749a3399d32aa35b39dfb05222";
+ sha256 = "08hk3kdz2mkp6lmx1fvgax862ibw99yji12c12n23ksjv1qz261z";
};
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 = [];
@@ -65268,12 +65827,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";
@@ -65331,12 +65890,12 @@
smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "smartparens";
- version = "20170716.1328";
+ version = "20170913.130";
src = fetchFromGitHub {
owner = "Fuco1";
repo = "smartparens";
- rev = "d4445621b88f36a391fc8bfabbed4db08dc88f33";
- sha256 = "0rsnc5b49n3s6k9a1vr1by1iq1ns9ba2l04k3siqr0hjr8jjwa7b";
+ rev = "7d368051dec40e8e129d84bca5070bb7e83ad72a";
+ sha256 = "1rbwjmp71wh234qrjss00xgcnh8jcha19lmz15nwrrwvpmmspg0c";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens";
@@ -65391,27 +65950,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";
@@ -65538,18 +66076,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 = "lp:~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/3438977c0bf907b7a3480e6b88b277109c663385/recipes/sml-modeline";
- sha256 = "086hslzznv6fmlhkf28mcl8nh4xk802mv6w0a4zwd5px2wyyaysd";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/4728fce21f03c95bcc2b562648e99c537fb09cd8/recipes/sml-modeline";
+ sha256 = "00kz03ixkfnm4id8dd8aij2rhakzd4arzd790jdac1y3yyd5pp3y";
name = "sml-modeline";
};
packageRequires = [];
@@ -65747,6 +66286,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";
@@ -65768,6 +66328,27 @@
license = lib.licenses.free;
};
}) {};
+ snoopy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "snoopy";
+ version = "20170730.1951";
+ src = fetchFromGitHub {
+ owner = "anmonteiro";
+ repo = "snoopy-mode";
+ rev = "8adce636376812df99bd79f3fbb3d9ec19a02351";
+ sha256 = "04sq37bpvg6lqsqmjvdm9jzwrq4xhbakfzl5b2rcm3mlhzwnhs88";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/4a882cd92964ac195a09469006c9a44dc202f000/recipes/snoopy";
+ sha256 = "1wa8jykqyj6rxqfhwbiyli6yh8s7n0pqv7fc9sfaymarda93zbgi";
+ name = "snoopy";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/snoopy";
+ license = lib.licenses.free;
+ };
+ }) {};
socyl = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }:
melpaBuild {
pname = "socyl";
@@ -65855,12 +66436,12 @@
solaire-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "solaire-mode";
- version = "20170610.442";
+ version = "20170823.422";
src = fetchFromGitHub {
owner = "hlissner";
repo = "emacs-solaire-mode";
- rev = "d2744f8d2d8e1af5d5784021bcb8772e163be800";
- sha256 = "0zsm00lggvmps0krlhyb5vvs0m0kikzmamj9mq5hw3k372jv4djm";
+ rev = "c8da9d228003b88ea31f80e7223608b119d41848";
+ sha256 = "0v0vzxzfxh3pqq9hs52bkgyny3vwzas2qpk5pbpzim3zg3lia35r";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/52c69070eef3003eb53e1436c538779c74670ce6/recipes/solaire-mode";
@@ -65876,12 +66457,12 @@
solarized-theme = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "solarized-theme";
- version = "20170430.800";
+ version = "20170831.1159";
src = fetchFromGitHub {
owner = "bbatsov";
repo = "solarized-emacs";
- rev = "8aa2ce76327dc7081b1c9a310e858fe2b854d899";
- sha256 = "1a8hqagh4jjskyyc66s2xyspn9k4hvl430kfzgjcfzis889v19y7";
+ rev = "ae7bc3f102cff597092dad7fc0bfd49e1865b0cf";
+ sha256 = "0d4cs7s2k5plf2ya0df72pvpf30xdhdbfybm0179dma4fw9fx0is";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/solarized-theme";
@@ -66174,27 +66755,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";
@@ -66261,12 +66821,12 @@
spaceline-all-the-icons = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize, spaceline }:
melpaBuild {
pname = "spaceline-all-the-icons";
- version = "20170711.102";
+ version = "20170829.120";
src = fetchFromGitHub {
owner = "domtronn";
repo = "spaceline-all-the-icons.el";
- rev = "88661813baefece9899588cb34c633eda606f2ac";
- sha256 = "1qb26ya4f3qd3rh9cpdb02qyqqz6yhgv05b095i9fvwlcbvr4v51";
+ rev = "e2e195f64a541d72b6d0ba0451f1e3072234b820";
+ sha256 = "0lrf62gsss19z2ca4hg5c08b3nbkqaa33fqrbfa126v2c98bj583";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d039e057c1d441592da8f54e6d524b395b030375/recipes/spaceline-all-the-icons";
@@ -66282,12 +66842,12 @@
spacemacs-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "spacemacs-theme";
- version = "20170713.1156";
+ version = "20170823.1658";
src = fetchFromGitHub {
owner = "nashamri";
repo = "spacemacs-theme";
- rev = "11d6958364271e11c920015c24d509f9bdcce6c9";
- sha256 = "1z6l85459fbfyn266qdz09c57ns8d1650ksicl3li442ffh5s75i";
+ rev = "30b198ce87a92777f74e34ddee775b99d05b46c3";
+ sha256 = "0a77y9njks44xx1c5j0cxpgkqwlz6lrzkbph3qwnbzkydnbyxgiy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8ac39214856c1598beca0bd609e011b562346f/recipes/spacemacs-theme";
@@ -66303,12 +66863,12 @@
spaces = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "spaces";
- version = "20130610.49";
+ version = "20170809.1508";
src = fetchFromGitHub {
owner = "chumpage";
repo = "chumpy-windows";
- rev = "164be41b588b615864258c502583100d3ccfe13e";
- sha256 = "069aqyqzjp5ljqfzm7lxkh8j8firk7041wc2jwzqha8jn9zpvbxs";
+ rev = "6bdb51e9a346907d60a9625f6180bddd06be6674";
+ sha256 = "1wkyvfqmf24c8kb162pwi6wcm88bzf0x9mxljzkx0s8bq9aliny6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fa5d57074f73cf11607f2f1610f92a0c77367f2a/recipes/spaces";
@@ -66366,12 +66926,12 @@
sparql-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sparql-mode";
- version = "20170619.255";
+ version = "20170831.832";
src = fetchFromGitHub {
owner = "ljos";
repo = "sparql-mode";
- rev = "c06eac2abae29ae55794e61ebd06890909edda7c";
- sha256 = "08w88wv3yd1l87zzwlrfj586hh3l2k1xq80f1mzskr7vkzi2ailx";
+ rev = "397a0d5b6da3f60ca52bebd5e698b0a764956cd2";
+ sha256 = "1z9w4cn5lanxl24ws4km816dfx4fszvgvrlb2ih3wsbc13710h1l";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c3d729130a41903bb01465d0f01c34fbc508b56e/recipes/sparql-mode";
@@ -66406,12 +66966,12 @@
speech-tagger = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "speech-tagger";
- version = "20160224.2";
+ version = "20170728.1129";
src = fetchFromGitHub {
owner = "cosmicexplorer";
repo = "speech-tagger";
- rev = "60ce97b0fc34eb32f507957646679fff77b5f0fd";
- sha256 = "0v4v2nr680zgljr9k7rgf7mhy49bv5ixc8ksba3g1bbrz0qv5ny6";
+ rev = "61955b40d4e8b09e66a3e8033e82893f81657c06";
+ sha256 = "07rgs1f9z2ayphv04jdjk9v1s2s47qvksf64z6qn1zss2alc0y0v";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/db80aa5d95846ee02a9d762aa68325ab5e37dcf7/recipes/speech-tagger";
@@ -66594,12 +67154,12 @@
splitter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "splitter";
- version = "20130705.50";
+ version = "20170809.1508";
src = fetchFromGitHub {
owner = "chumpage";
repo = "chumpy-windows";
- rev = "164be41b588b615864258c502583100d3ccfe13e";
- sha256 = "069aqyqzjp5ljqfzm7lxkh8j8firk7041wc2jwzqha8jn9zpvbxs";
+ rev = "6bdb51e9a346907d60a9625f6180bddd06be6674";
+ sha256 = "1wkyvfqmf24c8kb162pwi6wcm88bzf0x9mxljzkx0s8bq9aliny6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/129f0d20616226c449bdaf672c43a06e8f281869/recipes/splitter";
@@ -66822,27 +67382,6 @@
license = lib.licenses.free;
};
}) {};
- sql-mssql = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "sql-mssql";
- version = "20160512.137";
- src = fetchFromGitHub {
- owner = "tumashu";
- repo = "sql-mssql";
- rev = "f8a7f16720fbc7480a7ae83e21958860f66c1ccf";
- sha256 = "02jsz69j1mi082s0xfk99qrm6wskdfz20na3jc7c35f564l493hs";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/f4df28e4f5fe01a7c4e02744c4a335047779fe1d/recipes/sql-mssql";
- sha256 = "15z60d2244mxhigr52g332qzjj5ygqyl1i6c19q6vfv2z2vcvy7x";
- name = "sql-mssql";
- };
- packageRequires = [ emacs ];
- meta = {
- homepage = "https://melpa.org/#/sql-mssql";
- license = lib.licenses.free;
- };
- }) {};
sqlite = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sqlite";
@@ -66949,12 +67488,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";
@@ -66991,12 +67530,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";
@@ -67012,12 +67551,12 @@
ssh-config-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ssh-config-mode";
- version = "20170711.1433";
+ version = "20170803.1039";
src = fetchFromGitHub {
owner = "jhgorrell";
repo = "ssh-config-mode-el";
- rev = "8ce61a22d07cdcb96aa31fa9e5493875f00ad516";
- sha256 = "03lpfj2gq0wl8zsjwdkwk5i6ih2cwcmya55cyw8fs8i19y3zhcyb";
+ rev = "c6dc66b6678605f0df8eb61778b10ae21eb7caf5";
+ sha256 = "05pdz6117m78zfvxi9mskw8svx4bs5k3bpv9nk9mzg9n0zw8algy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/750b16ee631b4c2014f2ebf767609bab4b8ee421/recipes/ssh-config-mode";
@@ -67033,12 +67572,12 @@
ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ssh-deploy";
- version = "20170711.725";
+ version = "20170907.305";
src = fetchFromGitHub {
owner = "cjohansson";
repo = "emacs-ssh-deploy";
- rev = "ec4661059109f25df41db1800cac7ffc168fdbbc";
- sha256 = "1nqf8nwwb188mlyn8xy8v9qzq3xin2pz6synldf0yr8gac8b7bll";
+ rev = "72a503394ee43023100a6f2624ad40a4325f5938";
+ sha256 = "0ss1q3ywznkj180rndpi3zrcxz3bgm3a87wx194xyq5dzijaydw5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy";
@@ -67303,25 +67842,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 = "90d50ad4a78c06f99fbf185aeb3322d1502a016e";
- sha256 = "0gh15q04dl0cgnabxjr3sgzkm31m9ls3r0d9ha7vs710wiffpbqx";
- };
- 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";
@@ -67694,22 +68214,22 @@
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;
@@ -67734,57 +68254,15 @@
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";
- version = "20170605.1710";
+ version = "20170803.2052";
src = fetchFromGitHub {
owner = "nflath";
repo = "sudo-edit";
- rev = "57d49eafd53868d3c86b20fa51e1889e621872c0";
- sha256 = "1gxyy1z8qq610g2x0zzlccqq33gd54wwl1akhnw5xg4mvwhjvidf";
+ rev = "bcb12aaa0da0c56d851cfa2f1b3ea4afdd2a755b";
+ sha256 = "1k6sx8k304dw9dlidnxcln9ip9cj3b6i196z98g9n0kcd1js9f99";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3b08d4bbdb23b988db5ed7cb5a2a925b7c2e242e/recipes/sudo-edit";
@@ -67842,12 +68320,12 @@
suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }:
melpaBuild {
pname = "suggest";
- version = "20170703.1433";
+ version = "20170806.1414";
src = fetchFromGitHub {
owner = "Wilfred";
repo = "suggest.el";
- rev = "59e140248a667127771aa7aa49ee0511c55e8817";
- sha256 = "0j0lrphg97lvyxlchgws7l0n0c76hxh6sbm0c98dvsnki6jgfj72";
+ rev = "6ae090cab9bc16650c1788e83ccd2fe95a959de2";
+ sha256 = "1rnp7zwr5j345l569zhpskf7g6bkg0jmplzjwy79rlv3h3d6rv4d";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest";
@@ -67863,12 +68341,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";
@@ -67945,12 +68423,12 @@
suomalainen-kalenteri = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "suomalainen-kalenteri";
- version = "20170528.801";
+ version = "20170801.126";
src = fetchFromGitHub {
owner = "tlikonen";
repo = "suomalainen-kalenteri";
- rev = "d380321ce7b7a5650847a7866bd98226af51d4b4";
- sha256 = "1fcyh26zd7rpp0519kswgr9ps67flwwypw2ic3nwgjdhxb41kmzs";
+ rev = "c702e33cb6e13cb28bd761844e95be112a3c04f3";
+ sha256 = "13avc3ba6vhysmhrcxfpkamggfpal479gn7k9n7509dpwp06dv8h";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/181adf1b16253481674663fd28b195172231b7da/recipes/suomalainen-kalenteri";
@@ -68113,16 +68591,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 = [];
@@ -68171,22 +68649,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 = "20170909.430";
src = fetchFromGitHub {
owner = "chrisbarrett";
repo = "swift-mode";
- rev = "98920962adaaf42698fc847fbe7d9edcd58e50e9";
- sha256 = "0npz0izw6dwiv1kmkbnf6hklmx4w2pqddzb2ijxasrrviyyyc83s";
+ rev = "59dcd603848656c691f76cc5095ea354c307dbcf";
+ sha256 = "127xx6qmxlh81pylrvx60d280ginms09qv24xv5g8lg08bi9zmkx";
};
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;
@@ -68216,12 +68694,12 @@
swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "swiper";
- version = "20170609.938";
+ version = "20170911.1036";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "swiper";
- rev = "dc146d9f1435b79fbfbfa702f0172b9de05f631d";
- sha256 = "09cfs0rhhb72b12pic2w9chbc000pqnafrl2x0g8v5r065pzp64n";
+ rev = "0a1d361b926291874124f8c63a653d83ead64a36";
+ sha256 = "0ssbsllpv0lyr7dhnipwd7zgpxvfm36rldr7vkxh5maajdkamls7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper";
@@ -68279,12 +68757,12 @@
switch-window = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "switch-window";
- version = "20170701.246";
+ version = "20170718.1932";
src = fetchFromGitHub {
owner = "dimitri";
repo = "switch-window";
- rev = "f4e3fde4d4717b75716f287577e84b7ee4f33d8d";
- sha256 = "15ks1x62rn0q8lgy4x749mizvanzl9lkzgrsasrdx0v4ydmj3n7c";
+ rev = "67113287ba61ce1951363a49f54148743dcea51e";
+ sha256 = "06s1zdy2mlw63w3rnyja9jkvq4m5b46mvi8qjwxcpgqjdihj6f6m";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7d2204e3b53ade1e400e143ac219f3c7ab63a1e9/recipes/switch-window";
@@ -68363,12 +68841,12 @@
symbol-overlay = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "symbol-overlay";
- version = "20170615.1919";
+ version = "20170825.2047";
src = fetchFromGitHub {
owner = "wolray";
repo = "symbol-overlay";
- rev = "1c40cd921d573bbbd2cd9770c0bafc484b23a2ad";
- sha256 = "1npgjhjdky298n70n1lh1qi6d1km1d9vy82n2x4rjn45699gkrl8";
+ rev = "6c7ec584b62b7922a5398a552a1bf60f8144306c";
+ sha256 = "0haflm6b8aqjbs54h3khax62rwlky3y8py4jq4m664r1nb91ni57";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c2a468ebe1a3e5a35ef40c59a62befbf8960bd7b/recipes/symbol-overlay";
@@ -68550,12 +69028,12 @@
syntactic-close = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "syntactic-close";
- version = "20170510.2348";
+ version = "20170907.6";
src = fetchFromGitHub {
owner = "emacs-berlin";
repo = "syntactic-close";
- rev = "83f6a212637175c8cfb1132eb40cdd4c3343040a";
- sha256 = "0r5zff8fb0gid84f62l88lfh1hp8nkgf9cldnhmmv3icrhc2r0kc";
+ rev = "143faf5ecd6388f4ea76d668b4814415befcf883";
+ sha256 = "0dwanswsyxhi7izah9qm6jzl5yvfany62f5m80r9kfkhcq68hyx9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f2c15c0c8ee37a1de042a974c6daddbfa7f33f1d/recipes/syntactic-close";
@@ -68609,36 +69087,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";
@@ -68675,12 +69132,12 @@
systemd = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "systemd";
- version = "20170708.1534";
+ version = "20170911.625";
src = fetchFromGitHub {
owner = "holomorph";
repo = "systemd-mode";
- rev = "9cfd31533742859fa081b79aceafac315444a4b3";
- sha256 = "0gckwjzqlqyl740r73bh3x5x4wina0irc7krgj2xp68xh4x7nw8y";
+ rev = "a3d39214b70c3dde0be12a53260e3fa470530ad6";
+ sha256 = "1wvf7m6j73y0aavz14f0xjmqs7hxbw0ifzxw5hdvhsw8bsvagbmi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ca810e512c357d1d0130aeeb9b46b38c595e3351/recipes/systemd";
@@ -68968,12 +69425,12 @@
tao-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "tao-theme";
- version = "20170624.1300";
+ version = "20170718.2306";
src = fetchFromGitHub {
owner = "11111000000";
repo = "tao-theme-emacs";
- rev = "bf6d718955d56b7cf824f7a60803c94a676ccb95";
- sha256 = "0hkni0dm4s7sgx7zzk88kls8qzmz47b5g1gskp3kxg88b1nbghcw";
+ rev = "321dad4278776b63f8dcd1e67ad387531c472ed4";
+ sha256 = "0w78ssd5qj5a1l3yhi2r2dhmls5jfw2p3ic1iinsqwimkwmvh8aa";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/94b70f11655944080507744fd06464607727ecef/recipes/tao-theme";
@@ -69157,12 +69614,12 @@
telephone-line = callPackage ({ cl-generic, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
melpaBuild {
pname = "telephone-line";
- version = "20170611.1115";
+ version = "20170831.1215";
src = fetchFromGitHub {
owner = "dbordak";
repo = "telephone-line";
- rev = "743614f372598597282efd29a18e624d5ef80bc1";
- sha256 = "0jl4kdmid2jy5gys9q1r58x41q4srh7hinhzr3q1f6f47lpcpvkf";
+ rev = "c17c71ae18ad54b8c3d1eddbe78ed82816d06186";
+ sha256 = "1f5mlxjmyliz0ahcj6c3cypssrcp2ybhqpswzsqp5vqp75bc7ysz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9c998b70365fb0a210c3b9639db84034c7d45097/recipes/telephone-line";
@@ -69262,12 +69719,12 @@
term-manager = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "term-manager";
- version = "20170421.105";
+ version = "20170903.1212";
src = fetchFromGitHub {
owner = "IvanMalison";
repo = "term-manager";
- rev = "7180f09078f89aadb83061420ca8fd58d929b629";
- sha256 = "1d1szcdpgmkp6r9qsvk7pv0swl626d5svna2xqr3lrpgqzmsjcnk";
+ rev = "f4291eae7a18d7f1737c71c609f50398b1a962b3";
+ sha256 = "0brvpayi7bigcri95958w0zin84dpqw80rqg047p07mc8833nkqg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0b2f7d8c8fcbb535432f8e70729d69a572e49a1a/recipes/term-manager";
@@ -69350,8 +69807,8 @@
src = fetchFromGitHub {
owner = "IvanMalison";
repo = "term-manager";
- rev = "7180f09078f89aadb83061420ca8fd58d929b629";
- sha256 = "1d1szcdpgmkp6r9qsvk7pv0swl626d5svna2xqr3lrpgqzmsjcnk";
+ rev = "f4291eae7a18d7f1737c71c609f50398b1a962b3";
+ sha256 = "0brvpayi7bigcri95958w0zin84dpqw80rqg047p07mc8833nkqg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5260876280148fae28a459f07932cebb059b560e/recipes/term-projectile";
@@ -69409,12 +69866,12 @@
terminal-here = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "terminal-here";
- version = "20170426.48";
+ version = "20170805.251";
src = fetchFromGitHub {
owner = "davidshepherd7";
repo = "terminal-here";
- rev = "26e7c8d180dcc62d8802762ba738eb2ee02fd16c";
- sha256 = "06hqqjj8fl32mxiws6jqnii6cnbds2686y2hfv7v83rj6fy31vgc";
+ rev = "5e440c33a1d24762477863af5c9b7a896df4be1b";
+ sha256 = "0kqn3gzm5q37d2iz0wk2xcl7qlmqkblwy8zdc7plc6syldnh91aj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f8df6f7e23476eb52e7fdfbf9de277d3b44db978/recipes/terminal-here";
@@ -69434,8 +69891,8 @@
src = fetchFromGitHub {
owner = "ternjs";
repo = "tern";
- rev = "3f8a2bc7c2e9a4ac55e8c6f6c60c0634cbe71326";
- sha256 = "104s1mfn6cwi0iqq5ccaca5dzh29gfhfnif8a0mi4qy5ljsp9xng";
+ rev = "cbbc2167cabc185c151fcfb32b2094b93b387422";
+ sha256 = "02vwq91ra4yrx0davi6sri0hh7p3fbwwz8flqrk5kaxz1rwqgq20";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern";
@@ -69455,8 +69912,8 @@
src = fetchFromGitHub {
owner = "ternjs";
repo = "tern";
- rev = "3f8a2bc7c2e9a4ac55e8c6f6c60c0634cbe71326";
- sha256 = "104s1mfn6cwi0iqq5ccaca5dzh29gfhfnif8a0mi4qy5ljsp9xng";
+ rev = "cbbc2167cabc185c151fcfb32b2094b93b387422";
+ sha256 = "02vwq91ra4yrx0davi6sri0hh7p3fbwwz8flqrk5kaxz1rwqgq20";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern-auto-complete";
@@ -69825,10 +70282,10 @@
thing-cmds = callPackage ({ fetchurl, hide-comnt, lib, melpaBuild }:
melpaBuild {
pname = "thing-cmds";
- version = "20170331.1338";
+ version = "20170726.1355";
src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/thing-cmds.el?revision=57";
- sha256 = "0zi7hbdb5w0lry09rdsxmb0kqnfp6s72kn0z5npfhvwalkcpywbq";
+ url = "https://www.emacswiki.org/emacs/download/thing-cmds.el?revision=58";
+ sha256 = "07z49csdlrf08h8d8p9n8j492r22s7wgpzjwafppbsm4mvgshmq9";
name = "thing-cmds.el";
};
recipeFile = fetchurl {
@@ -69885,12 +70342,12 @@
thinks = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "thinks";
- version = "20170607.144";
+ version = "20170802.428";
src = fetchFromGitHub {
owner = "davep";
repo = "thinks.el";
- rev = "7bdc418ff946d0cc9ea4cc73d38b3c71ffaa838d";
- sha256 = "0wf3nikpnn0yivlmp6plyaiydm56mp3f91lljb1kay64nqgnfq65";
+ rev = "c02f236abc8c2025d9f01460b09b89ebdc96e28d";
+ sha256 = "0g4ls668kyqnh4xkvz1s1z9j6n0a1gkgrzgl98hys7hny6zrk7aa";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/439957cabf379651dc243219a83c3c96bae6f8cf/recipes/thinks";
@@ -69906,12 +70363,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";
@@ -69952,8 +70409,8 @@
src = fetchFromGitHub {
owner = "apache";
repo = "thrift";
- rev = "0dd823580c78a79ae9696eb9b3650e400fff140f";
- sha256 = "1j6pq0gxlfbcfkh9pmfgqpfvdmsd1q4jx384jib12y4g0maxnf2b";
+ rev = "1744cdcb674a20c554ae9f23cb95c0c8eff63b90";
+ sha256 = "12zclwdqr1v2pbp0i4d5m2bgr7s20bm5yyjpakg61sx5nld2j9sg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift";
@@ -70007,22 +70464,22 @@
license = lib.licenses.free;
};
}) {};
- tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }:
+ tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s, typescript-mode }:
melpaBuild {
pname = "tide";
- version = "20170712.638";
+ version = "20170911.521";
src = fetchFromGitHub {
owner = "ananthakumaran";
repo = "tide";
- rev = "329d4541b1aa5f90689e84c925562d3bda708755";
- sha256 = "10rn2lxwir488x1d43bqvsg7la818si0w1qqsf59q79hllzjclg7";
+ rev = "af6adf6170e23a44ba773e07899ec602ae659663";
+ sha256 = "0y8kfibip9saa9mh1bhgnqjzkx0yyss1z1ssxq1qvndnq8sp4rpz";
};
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;
@@ -70094,14 +70551,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 ];
@@ -70206,12 +70663,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";
@@ -70227,12 +70684,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";
@@ -70287,27 +70744,6 @@
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";
@@ -70726,12 +71162,12 @@
tql-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "tql-mode";
- version = "20170402.1846";
+ version = "20170723.1954";
src = fetchFromGitHub {
owner = "tiros-dev";
repo = "tql-mode";
- rev = "2c4827652b4b9b640f3c55e27e1b1856ec9e2018";
- sha256 = "08vsg5y2bg9gxzfcm630vv95d9kwzxqhzz5dzbbi3g71nlgcclk2";
+ rev = "488add79eb3fc8ec02aedaa997fe1ed9e5c3e638";
+ sha256 = "09vkqr5n66w1q5f7m1vgiv0555v23wg6j46ri52lnnslsxpxhlyv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6a7c3dec5d970a4e819c0166a4b9846d74484b08/recipes/tql-mode";
@@ -70778,8 +71214,8 @@
src = fetchFromGitHub {
owner = "jorgenschaefer";
repo = "circe";
- rev = "13c605e639194c3da0c2e685056fac685f8c76a0";
- sha256 = "0n7v0g332ml1ang2fjc8rjbi8h1f4bqazcqi8dlfn99vvv8kcd21";
+ rev = "452dfb407b640ba6eb288ff25a9de27446a409c4";
+ sha256 = "1yqnpvk5ib754bkb8gcd8skf0d3rqxkqwcsbibr052ilrp5ampcl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/tracking";
@@ -70813,22 +71249,22 @@
license = lib.licenses.free;
};
}) {};
- tramp-hdfs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ tramp-hdfs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "tramp-hdfs";
- version = "20151028.2036";
+ version = "20170821.620";
src = fetchFromGitHub {
owner = "raghavgautam";
repo = "tramp-hdfs";
- rev = "82683b45eabc09f327ea45a9e8faba0524eada29";
- sha256 = "0llzfn9y3yyz2wwdbv8whx8vy2lazbnww6hjj0r621gkfxjml7wd";
+ rev = "b64f24d0419a80dffaa2c4ecec317aa2bba56e35";
+ sha256 = "1bfqzwn19w6fs5npslw0sjqrwdswsv5m3wcdnk438pz1lp199wfy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4c185553314a2a9fe18907fd9251077777b33538/recipes/tramp-hdfs";
sha256 = "1l7s2z8yk3cbnffig9fds75jkjlkng76qglx5ankzva61dz1kf2b";
name = "tramp-hdfs";
};
- packageRequires = [];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/tramp-hdfs";
license = lib.licenses.free;
@@ -70879,12 +71315,12 @@
transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
melpaBuild {
pname = "transmission";
- version = "20170715.2304";
+ version = "20170906.1911";
src = fetchFromGitHub {
owner = "holomorph";
repo = "transmission";
- rev = "2c033fb7a2614a21920d1cb06665f590b97694da";
- sha256 = "1ark2lcms43kk24352k1jbmgv5bcymmbfqhpbzrribagm5n9qr2h";
+ rev = "de23122e2c1d0c184e2439dd142ddedb0eb043b3";
+ sha256 = "0wa89zppxvr6cbaxn8qjdcqvnfsgq3bdzb45rbab8hwc4p8fv76f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission";
@@ -70984,16 +71420,16 @@
treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pfuture, s }:
melpaBuild {
pname = "treemacs";
- version = "20170705.1153";
+ version = "20170911.819";
src = fetchFromGitHub {
owner = "Alexander-Miller";
repo = "treemacs";
- rev = "bbff57809095f4fb8578ca9ee28a3bac81f203b0";
- sha256 = "12hqgxj9jfxq5wbnxpb941g4m47dyhah6kvs91x637jc8mlsdvbq";
+ rev = "b967e5ac38625992a19e42eb680892f4fa18e88f";
+ sha256 = "18i9aj6ajl41mn2456g48wdpqm188vsc5cqiqsj27gqvpnqkkns3";
};
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 ];
@@ -71009,8 +71445,8 @@
src = fetchFromGitHub {
owner = "Alexander-Miller";
repo = "treemacs";
- rev = "bbff57809095f4fb8578ca9ee28a3bac81f203b0";
- sha256 = "12hqgxj9jfxq5wbnxpb941g4m47dyhah6kvs91x637jc8mlsdvbq";
+ rev = "b967e5ac38625992a19e42eb680892f4fa18e88f";
+ sha256 = "18i9aj6ajl41mn2456g48wdpqm188vsc5cqiqsj27gqvpnqkkns3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs-evil";
@@ -71023,6 +71459,48 @@
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 = "b967e5ac38625992a19e42eb680892f4fa18e88f";
+ sha256 = "18i9aj6ajl41mn2456g48wdpqm188vsc5cqiqsj27gqvpnqkkns3";
+ };
+ 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";
+ version = "20170721.913";
+ src = fetchFromGitHub {
+ owner = "volrath";
+ repo = "treepy.el";
+ rev = "b2191139d67d024e4666b6039e39a23b15b1aba2";
+ sha256 = "170xgvwgnnqkr259d0wv6l4kcp62mb1y1wq6rnk8gp39djsqw01q";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/63c94a703841f8c11948200d86d98145bc62162c/recipes/treepy";
+ sha256 = "0jfah4vywi1b6c86h7vh8fspmklhs790qzkl51i9p7yckfggwp72";
+ name = "treepy";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/treepy";
+ license = lib.licenses.free;
+ };
+ }) {};
trident-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, skewer-mode, slime }:
melpaBuild {
pname = "trident-mode";
@@ -71044,27 +71522,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";
@@ -71213,12 +71670,12 @@
tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "tuareg";
- version = "20170531.557";
+ version = "20170912.206";
src = fetchFromGitHub {
owner = "ocaml";
repo = "tuareg";
- rev = "79bca7dc9254da190d821b504da4946df8c3d548";
- sha256 = "02zjjq3nmmawmialhj95bz032a3ycyvzl5sgp7g37l7q3l0s63bc";
+ rev = "928ed2a5153094d772ad5a0831f4bd84e819755d";
+ sha256 = "1844cqykzik3cn9wqas56h2mfh0wlxq53srdl6inx7j27mm1v7ga";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg";
@@ -71318,15 +71775,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";
};
@@ -71486,12 +71943,12 @@
typescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "typescript-mode";
- version = "20170710.427";
+ version = "20170831.619";
src = fetchFromGitHub {
owner = "ananthakumaran";
repo = "typescript.el";
- rev = "1cea84486f937946a90caacf2a7c86ca855d1c9d";
- sha256 = "0s9gnlm52rsdda0qzfn89sjawd5r5qxdc878y11cak9zz4h6d706";
+ rev = "0f41709e1525403767bd4889cb913900c68448dd";
+ sha256 = "038fya0gd3vy5rpf2b4ynksc1alb8va0zw7flh4y4azrmgmpxwi0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d3f534a1e2cee4ad2e32e32802c5080207417b3d/recipes/typescript-mode";
@@ -71551,8 +72008,8 @@
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "typit";
- rev = "a4e3147dedac5535bdc8b06aca00f34f14f26e35";
- sha256 = "0hbnwrhxj9wwjvxsk372ffgjqfkb3ljxhgi5h7wps2r15dxfvf3w";
+ rev = "bf6e72d76c0f3a68d7cd53c6580e92aa15d28dc5";
+ sha256 = "0qf2599x60nipmr78cmlnswid0lj552b0fjcw2lbyg7mnhxlnkmj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d17d019155e19c156f123dcd702f18cfba488701/recipes/typit";
@@ -71692,12 +72149,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 = "e3a343991c0175092f27665fce9474e240f3f1f7";
- sha256 = "0wmyym7aj0wr80ya1wif1ywmsy4pln4khyzcnfhd0xrp62pya2cv";
+ rev = "d08fe8e01db6df151b38c3001fba239a9a22369a";
+ sha256 = "1a93pd7c2fgdy4vhhwy0lm7plyrwfqa9177m2x5kfblz0q51n6y8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/ujelly-theme";
@@ -71795,12 +72252,12 @@
underline-with-char = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "underline-with-char";
- version = "20170714.1511";
+ version = "20170814.223";
src = fetchFromGitHub {
owner = "marcowahl";
repo = "underline-with-char";
- rev = "f0d7fad3f5472909f52c7928192f137d2f52c255";
- sha256 = "1qpqsspvvrfmzy93gj9h5zcj1gzf2fmw2kpl457cllvrks7yb8ry";
+ rev = "6daeba77e17dc11558ca3ccb0495524f5104d581";
+ sha256 = "1i6qgkzn8rlv44mjc4b9sksr4wpnj9a1b6p1y3g6fqpvhy5pmygg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e24888ccf61ac05eba5c30a47d35653f2badf019/recipes/underline-with-char";
@@ -71878,12 +72335,12 @@
unfill = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "unfill";
- version = "20160816.2300";
+ version = "20170722.1846";
src = fetchFromGitHub {
owner = "purcell";
repo = "unfill";
- rev = "88186dce0de69e8f4aeaf2bfdc77d62210f19cd8";
- sha256 = "0wyradin5igp25nsd3n22i2ppxhmy49ac1iq1w2715v8pfmiydnc";
+ rev = "df0c4dee19a3874b11c7c7f04e8a2fba629fda9b";
+ sha256 = "0bdlr8kqzwzi7aggcn7cwwih19585wi6dd9lvwj4i966zr4w84yx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2ade389a20419b3e29a613409ac73a16b7c5bddb/recipes/unfill";
@@ -72225,12 +72682,12 @@
uptimes = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "uptimes";
- version = "20170425.331";
+ version = "20170830.533";
src = fetchFromGitHub {
owner = "davep";
repo = "uptimes.el";
- rev = "07bcd6517243c9c9f61172202d33718bd9b2a850";
- sha256 = "0n416p47j4cl84lq8wcgmkagkws7a9n4g9307v1s91s2gqmfia3n";
+ rev = "c2c1b44b16a0fd873193b17c580ef3dfdacea580";
+ sha256 = "1rq4m77fydkawdwkbw8125ihmvv6aisr03nwb1857k3hxhrg0gwv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/72099e35ce3e34ec6afc6a3f87a4da07ec91499a/recipes/uptimes";
@@ -72246,12 +72703,12 @@
url-shortener = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "url-shortener";
- version = "20160404.1959";
+ version = "20170804.1942";
src = fetchFromGitHub {
owner = "yuyang0";
repo = "url-shortener";
- rev = "817ac58f6fd2190f688619a91cdc28654b211df9";
- sha256 = "1nah3vjg7966ssh2iwz8fingmcni867ksj2bjrvkgzmqbxqdxz9r";
+ rev = "06db8270213b9e352d6c335b0663059a1353d05e";
+ sha256 = "1ndcajgvfl46zw2iwgghvcldsy9p778pifkhlanivc6azajhpjhh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/url-shortener";
@@ -72307,12 +72764,12 @@
use-package = callPackage ({ bind-key, diminish, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "use-package";
- version = "20170710.1234";
+ version = "20170812.2256";
src = fetchFromGitHub {
owner = "jwiegley";
repo = "use-package";
- rev = "7b055494e39efba8b237202b7c97f40aa19e2579";
- sha256 = "0dzvnz8s60gsrmhfrdr121ji7xw67bmfdwfd8vhffa87wyibrh2n";
+ rev = "360df30683a711c443f87e495ba14cdd125a505d";
+ sha256 = "0nz0gk6gf9060hbyqr5vgzwr620k6l5sk9n6jbhfyrwmcscnmilc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3f9b52790e2a0bd579c24004873df5384e2ba549/recipes/use-package";
@@ -72328,12 +72785,12 @@
use-package-chords = callPackage ({ bind-chord, bind-key, fetchFromGitHub, fetchurl, key-chord, lib, melpaBuild, use-package }:
melpaBuild {
pname = "use-package-chords";
- version = "20170208.1035";
+ version = "20170717.1152";
src = fetchFromGitHub {
owner = "waymondo";
repo = "use-package-chords";
- rev = "e8551ce8a514d865831d3a889acece79103fc627";
- sha256 = "0500pqsszg7h7923i0kyjirdyhj8aza3a2h5wbqzdpli2aqra5a5";
+ rev = "f47b2dc8d79f02e5fe39de1f63c78a6c09be2026";
+ sha256 = "0nwcs3akf1cy7dv36n5s5hsr67djfcn7w499vamn0yh16bs7r5ds";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/92fbae4e0bcc1d5ad9f3f42d01f08ab4c3450f1f/recipes/use-package-chords";
@@ -72353,8 +72810,8 @@
src = fetchFromGitHub {
owner = "diml";
repo = "utop";
- rev = "4fcf11ae5f3ddc5ebc8f8f973fcf3f995c29c38d";
- sha256 = "1pw8h6bwjmr61l7ncl36w9lqxsq4z9pbsi93nc0sfr67ram5ri47";
+ rev = "5ca193128c10f6af877c174ec0a9029782f0ef50";
+ sha256 = "1m8ccx4hnncwd5hhi46ghprk9cdljw0qlyy4ya05fgvxl7yz8b4s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/30489fe52b4031184e54f994770aa3291257bc9d/recipes/utop";
@@ -72409,27 +72866,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";
@@ -72601,12 +73037,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";
@@ -72622,16 +73058,16 @@
vc-fossil = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "vc-fossil";
- version = "20161030.842";
+ version = "20170811.1453";
src = fetchFromGitHub {
owner = "emacsorphanage";
repo = "vc-fossil";
- rev = "066a1c591c18102d199407e303ccdd0dd8c26be9";
- sha256 = "1z42y04h4649i1hn3lc0ydkmaps39357jy25hlcy07x5nxpklvxf";
+ rev = "0aceef306726815a84e304253711bb6d3bdf497b";
+ sha256 = "1i50nyhb3qc404xilm5j31ifyrlh98mjxk98fl0gz1cpbygvklds";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/5c8f2a79d6ad9cac527db2d08f3ee6aa199152d1/recipes/vc-fossil";
- sha256 = "0fym5wnig3bdkj86x0n7milcxh3fbigpx42827aim6bm3ry7a081";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/91f2e615c887f353a82deee75990609d0dc66bbe/recipes/vc-fossil";
+ sha256 = "09pslw9gamjn1hly4l3bfci6rf4xw2xq42cr7na2rj0k8c1lvxcx";
name = "vc-fossil";
};
packageRequires = [];
@@ -72640,6 +73076,27 @@
license = lib.licenses.free;
};
}) {};
+ vc-msg = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
+ melpaBuild {
+ pname = "vc-msg";
+ version = "20170725.7";
+ src = fetchFromGitHub {
+ owner = "redguardtoo";
+ repo = "vc-msg";
+ rev = "6f1b788a58d2b64ac0c4648039ecd40b3989a489";
+ sha256 = "1xay9h16vr9pm1csfaqy71m9rsphh77r2rmk1sxpdasr5aa00vq1";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/59ad4e80b49c78decd7b5794565313f65550384e/recipes/vc-msg";
+ sha256 = "16pgx8pg3djhkmhf1fihgjk7c6nb2nsqj58888bwg7385mlwc7g9";
+ name = "vc-msg";
+ };
+ packageRequires = [ emacs popup ];
+ meta = {
+ homepage = "https://melpa.org/#/vc-msg";
+ license = lib.licenses.free;
+ };
+ }) {};
vc-osc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "vc-osc";
@@ -72997,36 +73454,15 @@
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";
- version = "20170606.539";
+ version = "20170730.2206";
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "vimish-fold";
- rev = "527a1d9b9e031713c29f12d1a82f1fdac50c5610";
- sha256 = "1k8m7b0h3qb5w0wvvjz8047xz71ljfj7kj4z5sv26rhsh5bsdb2s";
+ rev = "5e2875c18e2d8ef27f594e0ea1ca15a2f759be42";
+ sha256 = "1a24diw5xwk10d9y8dr1bgpc78d36f3swvlll0igl5b91q4x86dn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b4862b0a3d43f073e645803cbbf11d973a4b51d5/recipes/vimish-fold";
@@ -73042,12 +73478,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";
@@ -73231,12 +73667,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";
@@ -73355,12 +73791,12 @@
vue-html-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "vue-html-mode";
- version = "20170225.2301";
+ version = "20170904.1017";
src = fetchFromGitHub {
owner = "AdamNiederer";
repo = "vue-html-mode";
- rev = "e9708b80a319af14266562d8bf920747e94f1cf8";
- sha256 = "073vygm04x4gf150ibarz2qxbl37k6jzd907ydbq8nyq6hm1z1wj";
+ rev = "7358de66280435531dda4dd29dfbcef397edb628";
+ sha256 = "0pqjlszacpwrkr41l27d8zlyjm25b38l94plqjy4qk4p5r2zivvg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/48588b163ab76204b9054340071e758045480e19/recipes/vue-html-mode";
@@ -73380,8 +73816,8 @@
src = fetchFromGitHub {
owner = "CodeFalling";
repo = "vue-mode";
- rev = "e256f432b9cec9a0294fe3edf1c4965e1de28570";
- sha256 = "11nrzdqwzd7ib8gv52vplcafiwmv5nm6ql3ahw512zkkb2w3bkza";
+ rev = "a680998d5e597e91be2e7e15e88bd83856a13c84";
+ sha256 = "1hmqwv4xdjmly1l4s1hkx1n28navnqy5nplas39pwywik2dlh2cs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2e5e0a9fff332aeec09f6d3d758e2b67dfdf8397/recipes/vue-mode";
@@ -73645,12 +74081,12 @@
wavefront-obj-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "wavefront-obj-mode";
- version = "20150501.1116";
+ version = "20170808.1016";
src = fetchFromGitHub {
owner = "abend";
repo = "wavefront-obj-mode";
- rev = "75eedad052848e82cdd94064764956b906e6d6b2";
- sha256 = "0zw8z2r82986likz0b0zy37bywicrvz9dizzw9p52gs1lx0is1fy";
+ rev = "34027915de6496460d8e68b5991dd24d47d54859";
+ sha256 = "0yj4wb5sdsbh3gp0sh2ajrrn6s8vg492809g4gxkxp30jhr6xc9q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d48e4fdc6c7079a1ca70c1e879473a98c11bbe6c/recipes/wavefront-obj-mode";
@@ -73813,12 +74249,12 @@
web-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "web-mode";
- version = "20170709.922";
+ version = "20170906.214";
src = fetchFromGitHub {
owner = "fxbois";
repo = "web-mode";
- rev = "e4304bcfa0c5121522ba2a5db75af8a2e4e81246";
- sha256 = "1pyhipazvhqflpxxdaqjyp7l5vpcp3cbc4qqb5fy1zxnlb5yj62l";
+ rev = "80e6de3b249c565506e29b2f1eca4104867f989d";
+ sha256 = "127z1968znc6m1c5b819wjhiaxq6l6wkdhra5cwxfic4wzghdvbi";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode";
@@ -73873,6 +74309,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";
@@ -73936,22 +74393,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;
@@ -73985,8 +74442,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";
@@ -74170,12 +74627,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";
@@ -74258,8 +74715,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";
@@ -74296,12 +74753,12 @@
whole-line-or-region = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "whole-line-or-region";
- version = "20110901.130";
+ version = "20170815.212";
src = fetchFromGitHub {
owner = "purcell";
repo = "whole-line-or-region";
- rev = "a60e022b30c2f4d3118bcaef1adb77b90e0ca941";
- sha256 = "0ip0vkqb4dm88xqzgwc9yaxzf4sc4x006m6z73a3lbfmrncy2c1d";
+ rev = "1220974153b7eaca5192ed87f86182d121e228e4";
+ sha256 = "1n44nn0zkk55cnwlincv5i8s36nymnh3bm6jd85h6m97jssxd85l";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/whole-line-or-region";
@@ -74382,8 +74839,8 @@
src = fetchFromGitHub {
owner = "foretagsplatsen";
repo = "emacs-js";
- rev = "2b3ba6dcc3e99cea75d4bf2b4e6cf0898d9a2615";
- sha256 = "0yga1vf54lf35my64ixw5ssq6jr6ph914afqv5r2gri007bi2zvw";
+ rev = "7bc9ba691c838650bd74848c7ebf0bc1ed6c3f2b";
+ sha256 = "18wwp5pp6s18f253xy9z2dhkxv7z3fxkgc8ayr3ypp8fskv78l34";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/78d7a15152f45a193384741fa00d0649c4bba91e/recipes/widgetjs";
@@ -74544,12 +75001,12 @@
window-jump = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "window-jump";
- version = "20150213.1236";
+ version = "20170809.1508";
src = fetchFromGitHub {
owner = "chumpage";
repo = "chumpy-windows";
- rev = "164be41b588b615864258c502583100d3ccfe13e";
- sha256 = "069aqyqzjp5ljqfzm7lxkh8j8firk7041wc2jwzqha8jn9zpvbxs";
+ rev = "6bdb51e9a346907d60a9625f6180bddd06be6674";
+ sha256 = "1wkyvfqmf24c8kb162pwi6wcm88bzf0x9mxljzkx0s8bq9aliny6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d44fc32e12f00bbaa799b4054e9ff0fc0d3bfbfb/recipes/window-jump";
@@ -74586,12 +75043,12 @@
window-number = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "window-number";
- version = "20141106.1829";
+ version = "20170731.1851";
src = fetchFromGitHub {
owner = "nikolas";
repo = "window-number";
- rev = "1d222f0b48c8d51bad956c3000ff0635b883a355";
- sha256 = "0n6a4kriwx7c8shvns3fcdp8l1i66bsca5mgd00p7nllnxvldhn3";
+ rev = "d41722de646ffeb3f70d26e4a86a5a1ba5c6be87";
+ sha256 = "1ifs7zp8c5m9da5dz0y4cq7pgqgdkz63v00ib07xdycnfjp4w17i";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/74523af6e22ebae2f5fe7c4da4e8af8fac5fa074/recipes/window-number";
@@ -74647,12 +75104,12 @@
window-purpose = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, imenu-list, let-alist, lib, melpaBuild }:
melpaBuild {
pname = "window-purpose";
- version = "20161017.433";
+ version = "20170722.655";
src = fetchFromGitHub {
owner = "bmag";
repo = "emacs-purpose";
- rev = "67ecaa2b52c113f92913c3beb9fb7f302bd50318";
- sha256 = "0jvihc94iwrb2zxr1qg9yc5fypd1a028d2wfhvg68ipmngcf4q2g";
+ rev = "00ddafcf4802e7430ca709769b888656a6eb421b";
+ sha256 = "1c3jf1cxfvja1v323wkxkd67n9nwzb57c79x4m010h2700xim8vs";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5813120ab674f6db7d0a486433d8faa6cfec1727/recipes/window-purpose";
@@ -74686,6 +75143,48 @@
license = lib.licenses.free;
};
}) {};
+ windwow = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "windwow";
+ version = "20170815.1848";
+ src = fetchFromGitHub {
+ owner = "vijumathew";
+ repo = "windwow";
+ rev = "77bad26f651744b68d31b389389147014d250f23";
+ sha256 = "0vbmmf8wm76k389g5ncs0grwlpwp3glpwvhdi5dfxaqcp2phaaad";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/12aba18872021ce0affa96c46a17353c7d073ca2/recipes/windwow";
+ sha256 = "0cbkp98pwzj484akdbidvdz4kqxv6ix6paimpxnag6fffciq245h";
+ name = "windwow";
+ };
+ packageRequires = [ cl-lib dash emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/windwow";
+ 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 = "cbc06fb51883212a5169d33a689d14cd7b0a7c34";
+ sha256 = "1hprii3da7y758ihlv308hg9sbcn42jn2f6g4dzb30ql5g2vxcnr";
+ };
+ 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";
@@ -74755,8 +75254,8 @@
version = "20160419.1232";
src = fetchhg {
url = "https://bitbucket.com/ArneBab/wisp";
- rev = "f94ec5fed665";
- sha256 = "0k66dxxc8k2snzmw385a78xqfgbpjzsfg3jm0gk5wqyn185ab50n";
+ rev = "7ce954278aef";
+ sha256 = "116cspnc4lhf6gk73yr9sy7013jp88vq5zayghzgnkbdlaw6zmz3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode";
@@ -74772,12 +75271,12 @@
wispjs-mode = callPackage ({ clojure-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "wispjs-mode";
- version = "20140103.1432";
+ version = "20170720.1219";
src = fetchFromGitHub {
owner = "krisajenkins";
repo = "wispjs-mode";
- rev = "be094c3c3223c07b26b5d8bb8fa7aa6866369b3f";
- sha256 = "188h1sy4mxzrkwi3zgiw108c5f71rkj5agdkf9yy9v8c1bkawm4x";
+ rev = "60f9f5fd9d1556e2d008939f67eb1b1d0f325fa8";
+ sha256 = "1hhd8ixb2wr06vrd1kw0cd5jh08zm86h2clbvzv9wmqpawwxfm5f";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a628330ee8deeab2bd5c2d4b61b33f119c4549d8/recipes/wispjs-mode";
@@ -74790,22 +75289,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 = "20170707.1401";
+ version = "20170817.1240";
src = fetchFromGitHub {
owner = "magit";
repo = "with-editor";
- rev = "791f985f63abe7f10de3fbd6fd49f9efac05a285";
- sha256 = "0nh12j3bf247q1ikb2apcpbx8nxvvi9rpj4fbsjbnrs0v65n0v4v";
+ rev = "241726118dee067a8d9880d53c6a781d580ba8a1";
+ sha256 = "0q06qfir64nib604f23gdmbzl23mcsnysfd0x36cx9nwik95wl0x";
};
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;
@@ -74832,6 +75331,27 @@
license = lib.licenses.free;
};
}) {};
+ with-simulated-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }:
+ melpaBuild {
+ pname = "with-simulated-input";
+ version = "20170820.2317";
+ src = fetchFromGitHub {
+ owner = "DarwinAwardWinner";
+ repo = "with-simulated-input";
+ rev = "d0f779594243fe85e330fd3f47caeb80068f7134";
+ sha256 = "1iadgd99n1ilrdvybbrxj0f8n50sz76j3bji2nfpn3w32krj90w4";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e4ddf16e19f5018106a423327ddc7e7499cf9248/recipes/with-simulated-input";
+ sha256 = "0113la76nbp18vaffsd7w7wcw5k2sqwgnjq1gslf4khdfqghrkwk";
+ name = "with-simulated-input";
+ };
+ packageRequires = [ emacs s seq ];
+ meta = {
+ homepage = "https://melpa.org/#/with-simulated-input";
+ license = lib.licenses.free;
+ };
+ }) {};
wn-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "wn-mode";
@@ -74919,12 +75439,12 @@
wordgen = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "wordgen";
- version = "20161104.944";
+ version = "20170803.1120";
src = fetchFromGitHub {
owner = "Fanael";
repo = "wordgen.el";
- rev = "c46d8da6dae8c82d3a5d8b903a12dd5f2ae94939";
- sha256 = "0gcbj64dkzwa2xfp6y9lwb5m678g7lf9jrkr9whdrm9mgpifmdmi";
+ rev = "aacad928ae99a953e034a831dfd0ebdf7d52ac1d";
+ sha256 = "06vbc9ycz1nbjwjkg99y3lj6jwb6lnwnmkqf09yr00jjrrfhfash";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5cfdc64a9aa79575dad8057c4cd747d2cdd460aa/recipes/wordgen";
@@ -74944,8 +75464,8 @@
src = fetchFromGitHub {
owner = "gromnitsky";
repo = "wordnut";
- rev = "bcdb86f1f7ee91f721a427b19492ee9578ae74fc";
- sha256 = "0p8nl5ccic8jx0dzy2976v5mkwb5sq4165qnhq4i26741qbalb62";
+ rev = "6e223dced5b865e9d38af6f9b7e57b3a56d362bb";
+ sha256 = "1w4037jplkl8sr6b7qj4cb5qcrjwz6vnfxfshdjimilwgc3ihs16";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/321c5e171eb4da85980968ac3c8ef4300101c0b1/recipes/wordnut";
@@ -74958,36 +75478,15 @@
license = lib.licenses.free;
};
}) {};
- wordsmith-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "wordsmith-mode";
- version = "20151117.236";
- src = fetchFromGitHub {
- owner = "istib";
- repo = "wordsmith-mode";
- rev = "597e1e7c7ef89b06ed8280251ecd8f40ce55e1bf";
- sha256 = "0d2byl3si2r0zh5ih6xpsgcd9r114ry0lzg5vcf31rr2gqf0j06h";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/d9f8f01f1807de24fb6e92b355d05b81be4bab07/recipes/wordsmith-mode";
- sha256 = "1570h1sjjaks6bnhd4xrbx6nna4v7hz6dmrzwjq37rwvallasg1n";
- name = "wordsmith-mode";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/wordsmith-mode";
- license = lib.licenses.free;
- };
- }) {};
worf = callPackage ({ ace-link, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, swiper, zoutline }:
melpaBuild {
pname = "worf";
- version = "20170427.8";
+ version = "20170818.1105";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "worf";
- rev = "8b0de0d0896aa82a31d13972baf15de56ca5516e";
- sha256 = "14jk3sinxrb2685y5dslrik10cwjwjc76pgwj3w47h4s6ykarwn8";
+ rev = "bf812a47e44dfbf4e166dbdbed7a97197bc1fc1d";
+ sha256 = "11miqpdg0v27fi6ksrqkqfyi2qrsgsv8jsqfw15nyhqmi3sgxzqh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f00f8765e35c21dd1a4b5c01c239ed4d15170ab7/recipes/worf";
@@ -75091,8 +75590,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";
@@ -75171,12 +75670,12 @@
wsd-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "wsd-mode";
- version = "20160930.236";
+ version = "20170731.837";
src = fetchFromGitHub {
owner = "josteink";
repo = "wsd-mode";
- rev = "cdbdf48f60900cedca2805a8b0875327a3a81f19";
- sha256 = "1ms30d1vz4nd90q6nypz5vixw1s3x6c68lm3l9zgq2ls6bw3kz93";
+ rev = "566ae4b45b4a34b985f1b363d6cdbd463ab6aba6";
+ sha256 = "0k30i1gq6ljxwf97f6nlz8b6blh6hg0b4syfx64lzf0zc22di2l4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/wsd-mode";
@@ -75294,6 +75793,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 = "a34584f310f3d8afe57dc1950db52b2d079242b8";
+ sha256 = "07z0iyz7zgypqjv6izpdccllwrp7jgc86279rk0blf0vazj2927h";
+ };
+ 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";
@@ -75318,15 +75838,15 @@
xah-css-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "xah-css-mode";
- version = "20170713.629";
+ version = "20170821.400";
src = fetchFromGitHub {
owner = "xahlee";
repo = "xah-css-mode";
- rev = "df1906547f51f50c7e61ffa6c518a6ffb23d4770";
- sha256 = "0q93nz5z4awasllnnqs6pzi83mrx8nl7d3mi13ppqhd50sjm0166";
+ 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";
};
@@ -75339,15 +75859,15 @@
xah-elisp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "xah-elisp-mode";
- version = "20170713.629";
+ version = "20170828.1";
src = fetchFromGitHub {
owner = "xahlee";
repo = "xah-elisp-mode";
- rev = "e28f16121619f1a929803ef1274d2853d1b43656";
- sha256 = "1l7yf3k5gdz7flm8qqzkcdpj3cx9q1kklbl2znkxiyb6rvgh7qf2";
+ 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";
};
@@ -75360,15 +75880,15 @@
xah-find = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "xah-find";
- version = "20170713.624";
+ version = "20170821.358";
src = fetchFromGitHub {
owner = "xahlee";
repo = "xah-find";
- rev = "d5f12b6185af9674d236a758df16649bfafadf2c";
- sha256 = "19cg18gh18pp1z862aykfhn44vhnbggr32rrs7smy33nq2h6q512";
+ 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";
};
@@ -75381,15 +75901,15 @@
xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "xah-fly-keys";
- version = "20170713.626";
+ version = "20170905.840";
src = fetchFromGitHub {
owner = "xahlee";
repo = "xah-fly-keys";
- rev = "23dae1d6d14d238227e1ee0afeef6ef1561b0c31";
- sha256 = "1mlqhmk9qpa34p30f8m0ylfajzyvq49qvl3hklgrzqgc9xx4yhxd";
+ rev = "0d0b3b96401af0d1e4ddea2713218bee08ab6a04";
+ sha256 = "09iyf2xrp3scxr67jm3gl067kb8vsrnrqdwz2sv6la41n04s9lm3";
};
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";
};
@@ -75402,15 +75922,15 @@
xah-get-thing = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "xah-get-thing";
- version = "20170713.628";
+ version = "20170821.353";
src = fetchFromGitHub {
owner = "xahlee";
repo = "xah-get-thing-or-selection";
- rev = "29a82b1a291ad6625b0da152ff1de10455d1831a";
- sha256 = "1si443vicgq7swr79lc9jv7fxm8x273xajrm6xqahkxzyly2751q";
+ 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";
};
@@ -75423,15 +75943,15 @@
xah-lookup = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "xah-lookup";
- version = "20170713.615";
+ version = "20170821.405";
src = fetchFromGitHub {
owner = "xahlee";
repo = "lookup-word-on-internet";
- rev = "91645ba91772bf4a1a20765722b72f7e374feacc";
- sha256 = "0hrs77qllpa77964bwjdmq4bzr47bgc0n57jsaagcdbs7wc6bmc0";
+ 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";
};
@@ -75444,15 +75964,15 @@
xah-math-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "xah-math-input";
- version = "20170707.2324";
+ version = "20170905.849";
src = fetchFromGitHub {
owner = "xahlee";
repo = "xah-math-input";
- rev = "b944092474e5c9194860dbb6d007a8f2ce98c94c";
- sha256 = "04ffknah3gmnjkk4wzhbzwj40mxzgwzxqq7cxrg4k86l9wq50pjb";
+ 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";
};
@@ -75465,15 +75985,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";
};
@@ -75486,15 +76006,15 @@
xah-replace-pairs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "xah-replace-pairs";
- version = "20170713.628";
+ version = "20170823.2028";
src = fetchFromGitHub {
owner = "xahlee";
repo = "xah-replace-pairs";
- rev = "62ac5be31f6b2e2ce10f695122e9cb7a9411e1ba";
- sha256 = "1j3qq54v68nal60zxnc89a7cy5bbsnn1bp97n3giwdk03rla4yk6";
+ 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";
};
@@ -75507,15 +76027,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";
};
@@ -75612,12 +76132,12 @@
xml-plus = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "xml-plus";
- version = "20160210.1942";
+ version = "20170727.1651";
src = fetchFromGitHub {
owner = "bddean";
repo = "xml-plus";
- rev = "1b728dda31dd13506aa4e1220f925bb43c93847b";
- sha256 = "0c30xh7qxg3y2p5jqkbssz5z53rx0yp64qqyy9f87qzgkcd2jd8k";
+ rev = "232fa863c08fc159b21dd58c39ea45dce3334895";
+ sha256 = "0b7v59dya346ds1wad0avrqhjimx5n9r3pcgqafagzf34hdcv3jy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/244388d158efda6fe8c1362a65b89b352c444422/recipes/xml+";
@@ -75805,8 +76325,8 @@
src = fetchFromGitHub {
owner = "CQQL";
repo = "xresources-theme";
- rev = "09a0bfc1684161dd1cdc899c027808a99646a652";
- sha256 = "171vffga2yzxqmgh77vila6x96bz1i6818f1pfaxblw1hz2ga341";
+ rev = "feb0552d31cb54210eabbc1abe32c8ea62841b6f";
+ sha256 = "1dfksid7dc27dz43lrriyr724qs7pf7dqhkmcai6b5qbi893ib8y";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4cef3a5683ea572f823d915ec2a94d591ac915d6/recipes/xresources-theme";
@@ -76011,12 +76531,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";
@@ -76036,8 +76556,8 @@
src = fetchFromGitHub {
owner = "drdv";
repo = "yahtzee";
- rev = "1b6d6cc5651a02547415cd571658efcafd9d36fa";
- sha256 = "0xzw5inzpd2djqx8q276vhiw5j19irkaygnmjn5m5kh2xpzb6aah";
+ rev = "09b18f248c957f74d219a6d1127923e9c786d650";
+ sha256 = "05hg6andy8wxrsxf939g77v6ml4rac239vkkfk0fh6723wgiz144";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/200169fdabce0ae3a2ecb6f4f3255c15ec3ed094/recipes/yahtzee";
@@ -76074,12 +76594,12 @@
yaml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "yaml-mode";
- version = "20170406.241";
+ version = "20170727.1531";
src = fetchFromGitHub {
owner = "yoshiki";
repo = "yaml-mode";
- rev = "64b28913bfe910b147d6ee16488dbaedb1452ca6";
- sha256 = "0c4c9qa8avqnkd0qp88wdc1jpp674bghma4x0bvbi147g224ybp7";
+ rev = "28c34033194130d452d5c958b5241c88d42ca02b";
+ sha256 = "1m3fr19sfkr7d94qzqkl7x1jmhpar2hnhq6mjscd3lfcqkifh6kv";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/yaml-mode";
@@ -76219,12 +76739,12 @@
yara-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "yara-mode";
- version = "20170713.2206";
+ version = "20170719.2351";
src = fetchFromGitHub {
owner = "binjo";
repo = "yara-mode";
- rev = "e3eb352a2e295a8a0955bc3e853f1edfd93cbf81";
- sha256 = "1dn2ssshwj94nmhd2pnvqdwj0za3iri9ky4kd4w50kj9jz18d1wz";
+ rev = "af5c05b34a29fc1bd73a6d21c82cc76320b33e5c";
+ sha256 = "1v8z3cwwla42d3r317091g5i7bj1hlbr9sd1p9s9b7y134gpd1xp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ef22d2dad1bae62721710bbff4b7228204d7c425/recipes/yara-mode";
@@ -76240,12 +76760,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";
@@ -76286,8 +76806,8 @@
src = fetchFromGitHub {
owner = "anachronic";
repo = "yarn-mode";
- rev = "99891000efe31214b065fa9446cd5e68c5c42ed8";
- sha256 = "0cg06ba9yfgjzprq78cvhvvl06av0p2vhnmynddzbpgjgjnwskfy";
+ rev = "998b408d6be05fd1c3a9fd8db6ffaab3bf86d06b";
+ sha256 = "09mrcv30n6zmgnwgl5pb2cyk6122a0ng1xg20grpmlwbq3qlr424";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/860fa2a8fdb22be374fa64a5277af3ab484a047a/recipes/yarn-mode";
@@ -76324,12 +76844,12 @@
yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "yasnippet";
- version = "20170716.1223";
+ version = "20170828.1908";
src = fetchFromGitHub {
owner = "joaotavora";
repo = "yasnippet";
- rev = "2a3a0cd2b18c21fc5f391273045f466c41da743c";
- sha256 = "09s7ad3wl4rrmdyi0cxmn6vnpkcf97x0g0csy8a8lijsjnrvk4r9";
+ rev = "89eb7ab64d67e96646576dc0d551e8c23d50438a";
+ sha256 = "1wr0d14yl3440hkdr436zxl9pk7nqhl76n9m3b3ia4lp6z5aj4jc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet";
@@ -76342,6 +76862,27 @@
license = lib.licenses.free;
};
}) {};
+ yasnippet-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
+ melpaBuild {
+ pname = "yasnippet-snippets";
+ version = "20170908.435";
+ src = fetchFromGitHub {
+ owner = "AndreaCrotti";
+ repo = "yasnippet-snippets";
+ rev = "5c3bb7ad8f659cb6651cc9c90709528672dd2ad0";
+ sha256 = "1nbkgmqgrih99jgpzvmy0h8vdjgkrml9ck9wi19vw80d62b8m9p8";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/25b8d4efe2e7833eb95dfdf33aa3ecc34af7a687/recipes/yasnippet-snippets";
+ sha256 = "0i6rk50a9l26r47v9xsnx35ziz4spx5pml3ys8y30n0r0xjdsj51";
+ name = "yasnippet-snippets";
+ };
+ packageRequires = [ yasnippet ];
+ meta = {
+ homepage = "https://melpa.org/#/yasnippet-snippets";
+ license = lib.licenses.free;
+ };
+ }) {};
yatemplate = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
melpaBuild {
pname = "yatemplate";
@@ -76349,8 +76890,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";
@@ -76363,25 +76904,6 @@
license = lib.licenses.free;
};
}) {};
- yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "yatex";
- version = "20170611.1642";
- src = fetchhg {
- url = "https://www.yatex.org/hgrepos/yatex/";
- rev = "e9299b77df1f";
- sha256 = "0nnpzcj23q964v4rfxzdll1r95zd6zzqvzcgxh7h603a41r3w1wm";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex";
- sha256 = "17np4am7yan1bh4706azf8in60c41158h3z591478j5b1w13y5a6";
- name = "yatex";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/yatex";
- license = lib.licenses.free;
- };
- }) {};
yaxception = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "yaxception";
@@ -76427,12 +76949,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 = "20170710.103";
+ version = "20170723.1458";
src = fetchFromGitHub {
owner = "abingham";
repo = "emacs-ycmd";
- rev = "35e8a31e32d0de890547612db8373d7333db8d8a";
- sha256 = "023bkmviaqb85kwwlpmzfc5gycf4i7w8a43zhbmvasfjjb962yzd";
+ rev = "fd037efae08628e41480e9dad705dcc1f64e498d";
+ sha256 = "06scz0d3jzgbr919lkjjfq9x1dyr5nqkhblvfpyk5bdp8l6j06d6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd";
@@ -76586,13 +77108,13 @@
pname = "zeitgeist";
version = "20131228.1009";
src = fetchgit {
- url = "git://anongit.freedesktop.org/zeitgeist/zeitgeist-datasources";
+ url = "https://anongit.freedesktop.org/git/zeitgeist/zeitgeist-datasources.git";
rev = "cdd1c219ed3afa9500403c3c499f49583d599034";
sha256 = "0xg67asvgav5js03i3bqmh7apndrn0jy5vai0bsh22pq8wgvq083";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/fb5f96d92b33fe97573334038f2fe4f984f37cca/recipes/zeitgeist";
- sha256 = "0m6drp3c6hp70ypbva3ji2dndl9an1jm2zlhnpwmjxsmw47cd732";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/zeitgeist";
+ sha256 = "0zbpmdf7fq3qph70m13giir58y1n5z6q6kqixjll5j4fk98k6bkz";
name = "zeitgeist";
};
packageRequires = [];
@@ -76684,18 +77206,39 @@
license = lib.licenses.free;
};
}) {};
+ zephir-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
+ melpaBuild {
+ pname = "zephir-mode";
+ version = "20170906.320";
+ src = fetchFromGitHub {
+ owner = "sergeyklay";
+ repo = "zephir-mode";
+ rev = "6b54967c76244ba18040deffd52c03caa8fff49d";
+ sha256 = "0a48p08m1kdz1wxmwdcvv8lbph0by3lmxz4ccr6jrfsw3gxnixff";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/5bd901c93ce7f64de6082e801327adbd18fd4517/recipes/zephir-mode";
+ sha256 = "0nxm6w7z89q2vvf3bp1p6hb6f2axv9ha85jyiv4k02l46sjprf4j";
+ name = "zephir-mode";
+ };
+ packageRequires = [ cl-lib emacs pkg-info ];
+ meta = {
+ homepage = "https://melpa.org/#/zephir-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild }:
melpaBuild {
pname = "zerodark-theme";
- version = "20170709.1248";
+ version = "20170830.57";
src = fetchFromGitHub {
owner = "NicolasPetton";
repo = "zerodark-theme";
- rev = "379df55b3ea6f217e0187fb8cb6df70d02236cec";
- sha256 = "0nj7qvr0z3gq31db8r3jsdljj93r0cijssbwxgqscvm945jpxc6x";
+ rev = "37ec068e6a744274daf1ecd1a64b75db6a7b8a0c";
+ sha256 = "1yh1n6647a3fppjhhbs6ir7vgqn6nqhpghwnhlrl3amp74h6di78";
};
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";
};
@@ -76705,27 +77248,6 @@
license = lib.licenses.free;
};
}) {};
- zig-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "zig-mode";
- version = "20170413.130";
- src = fetchFromGitHub {
- owner = "AndreaOrru";
- repo = "zig-mode";
- rev = "9a252ebd4ccd8a30abef3d9ed0ecb510e3d88844";
- sha256 = "07ar5lijj3y62ynx1fj9qxabf0h82laxzyb60f6cgxpzgxfpn1b8";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/64d12e362a2490e85c8e7a66a5ed1ebff9ce95a6/recipes/zig-mode";
- sha256 = "1rmvlsgx01h62imbksxl164d5p0caz49nlgg0z7spvvd9bmplr09";
- name = "zig-mode";
- };
- packageRequires = [ emacs ];
- meta = {
- homepage = "https://melpa.org/#/zig-mode";
- license = lib.licenses.free;
- };
- }) {};
zlc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "zlc";
@@ -76813,12 +77335,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";
@@ -76896,10 +77418,10 @@
}) {};
zones = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
pname = "zones";
- version = "20170605.1046";
+ version = "20170802.1406";
src = fetchurl {
- url = "https://www.emacswiki.org/emacs/download/zones.el?revision=30";
- sha256 = "05my99nn7pj5alswfhd11kkyibivqh65bhjfalbfv7flfmvg6pcz";
+ url = "https://www.emacswiki.org/emacs/download/zones.el?revision=32";
+ sha256 = "02vvkj2nx5ha1ad1zn5jd91jakxwx1pkrysj07a8y2sg657d7nkk";
name = "zones.el";
};
recipeFile = fetchurl {
@@ -77062,12 +77584,12 @@
zoutline = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "zoutline";
- version = "20160915.503";
+ version = "20170722.651";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "zoutline";
- rev = "714c10a25112b3da62696585bea289c3f8e74158";
- sha256 = "1z45p9i89lhqak993kq7rdji84rxrdcsnz1yz9xa2l758mnq5gp1";
+ rev = "e86e739b53a1c8a0a2cf6de43dffabb15d465507";
+ sha256 = "0ycri5d61pbwhwpwh9qx9m22mb4ab7bgniwgdbi9s8rzqs4q1p91";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4a26341f491145938aee9b531cd861200bfa2f6d/recipes/zoutline";
@@ -77080,21 +77602,21 @@
license = lib.licenses.free;
};
}) {};
- zpresent = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild, org-parser }:
+ zpresent = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild, org-parser, request }:
melpaBuild {
pname = "zpresent";
- version = "20170710.2029";
+ version = "20170730.2055";
src = fetchhg {
url = "https://bitbucket.com/zck/zpresent.el";
- rev = "96131375ac74";
- sha256 = "1p19yy0xyf962rc0j3k4jxl9vyjjyd1ar61wmp6mf6jplj7sxyfl";
+ rev = "33b840f663b7";
+ sha256 = "1g9x257bg9mgg1impyk5s8lfhr4qmqf1fzc7iwfdzizvzmgdlas1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3aae38ad54490fa650c832fb7d22e2c73b0fb060/recipes/zpresent";
sha256 = "0316qyspmdbg94aw620133ilh8kfpr3db1p2cifgccgcacjv3v5j";
name = "zpresent";
};
- packageRequires = [ dash emacs org-parser ];
+ packageRequires = [ dash emacs org-parser request ];
meta = {
homepage = "https://melpa.org/#/zpresent";
license = lib.licenses.free;
@@ -77170,8 +77692,8 @@
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "zzz-to-char";
- rev = "b62414b155fe2e09d91b70059a909d1403d89acf";
- sha256 = "07a086s3fpncr4plkmr89vghn7xwji9k69m64ri7i1vhnnl6q4zj";
+ rev = "96dfe16a990474267cd290498cf9ac6dd6b3e7c0";
+ sha256 = "1jvysrq9ya77x2xg0wqy1q27y0r43578d10bdhihpj2281nxng1y";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7063cbc1f1501ce81552d7ef1d42d1309f547c42/recipes/zzz-to-char";
diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index 8f1bf8ff38d..0eeeb5f97fd 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -20,6 +20,27 @@
license = lib.licenses.free;
};
}) {};
+ a = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "a";
+ version = "0.1.0alpha4";
+ src = fetchFromGitHub {
+ owner = "plexus";
+ repo = "a.el";
+ rev = "3af0122abac723f0d3dc21ee50eeb81afa26d361";
+ sha256 = "0grwpy4ssmn2m8aihfkxb7ifl7ql2hgicw16wzl0crpy5fndh1mp";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/a226f1d81cd1ae81b91c1102fbe40aac2eddcaa8/recipes/a";
+ sha256 = "1xqja47iw1c78kiv4854z47iblvvzrc1l35zjdhmhkh9hh10z886";
+ name = "a";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/a";
+ license = lib.licenses.free;
+ };
+ }) {};
aa-edit-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, navi2ch }:
melpaBuild {
pname = "aa-edit-mode";
@@ -65,12 +86,12 @@
abyss-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "abyss-theme";
- version = "0.5";
+ version = "0.7";
src = fetchFromGitHub {
owner = "mgrbyte";
repo = "emacs-abyss-theme";
- rev = "e860499a0b2ae0d6d2a27eab12b67dec896a7afc";
- sha256 = "1yr6cqycd7ljkqzfp4prz9ilcpjq8wxg5yf645m24gy9v4w365ia";
+ rev = "18791c6e8d9cc2b4815c9f08627a2e94fc0eeb14";
+ sha256 = "07z0djv7h3yrv4iw9n633j6dxzxb4nnzijsqkmz22ik6fbwxg5mh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f390e5153b6360a27abc74983f5fef11226634f3/recipes/abyss-theme";
@@ -527,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";
src = fetchFromGitHub {
owner = "xcwen";
repo = "ac-php";
- rev = "e0aaae30e4e5f18390e5d00953db02c1f03c44f6";
- sha256 = "1mrk37w88b4843jbghr9i79rbwbzwk8b1wljvzmm6x0q7ldlxmsm";
+ rev = "7a50b7debd149a30b84f0e2e57a4662926d96a24";
+ sha256 = "15kmzkkgrhwind66kiyc2kpl27jrbzcs79i3w5s7fzzjjg9h18lb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php";
@@ -548,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";
src = fetchFromGitHub {
owner = "xcwen";
repo = "ac-php";
- rev = "e0aaae30e4e5f18390e5d00953db02c1f03c44f6";
- sha256 = "1mrk37w88b4843jbghr9i79rbwbzwk8b1wljvzmm6x0q7ldlxmsm";
+ rev = "7a50b7debd149a30b84f0e2e57a4662926d96a24";
+ sha256 = "15kmzkkgrhwind66kiyc2kpl27jrbzcs79i3w5s7fzzjjg9h18lb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core";
@@ -590,12 +611,12 @@
ac-rtags = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, rtags }:
melpaBuild {
pname = "ac-rtags";
- version = "2.10";
+ version = "2.14";
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "3b3ace901f53827daef81d4c13658ec4feb318b4";
- sha256 = "1lm0s1918zsnd4hmfzf3xfrd68ip2zjnr9ciyf4bwpd66y0zfrbk";
+ rev = "15ef9a8bab847773d6e247005be929422fc9c285";
+ sha256 = "0yq3c4ich0sffzd571drb7k4vs0bvblx6qcrb6zry75d9npggsyg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags";
@@ -671,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;
@@ -1115,12 +1136,12 @@
alda-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "alda-mode";
- version = "0.1.0";
+ version = "0.2.0";
src = fetchFromGitHub {
owner = "jgkamat";
repo = "alda-mode";
- rev = "921b1d39ee1122c0f6935598dc17aaa904e74819";
- sha256 = "01zz3h6q3djqmb3l6s9jld8x1zx2m0x1qskxzywnyfh8hcvbqy6f";
+ rev = "97c20b1fd9ad3f138e1100e3a837d05108c4c564";
+ sha256 = "1wsvs756cbwbxlaxij352kman7196m39684m6sqnfb685cfrwzdj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2612c494a2b6bd43ffbbaef88ce9ee6327779158/recipes/alda-mode";
@@ -1247,6 +1268,27 @@
license = lib.licenses.free;
};
}) {};
+ amx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "amx";
+ version = "1.1.1";
+ src = fetchFromGitHub {
+ owner = "DarwinAwardWinner";
+ repo = "amx";
+ rev = "7d5d7974057a36a332f8b30e99fe464f25b6e0ae";
+ sha256 = "0jqvah4i2r5di8k3rx6hyjnxdr3alzqmlv6iab5wdhkafyvwl0dq";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/c55bfad05343b2b0f3150fd2b4adb07a1768c1c0/recipes/amx";
+ sha256 = "1ikhjvkca0lsb9j719yf6spg6nwc0qaydkd8aax162sis7kp9fap";
+ name = "amx";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/amx";
+ license = lib.licenses.free;
+ };
+ }) {};
anaconda-mode = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }:
melpaBuild {
pname = "anaconda-mode";
@@ -1650,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 = [];
@@ -1690,12 +1732,12 @@
apiwrap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "apiwrap";
- version = "0.1.2";
+ version = "0.2.1";
src = fetchFromGitHub {
owner = "vermiculus";
repo = "apiwrap.el";
- rev = "2feb4a9c58a105867197f92c0b27f1de8d213f45";
- sha256 = "0yyl2zn02mnhpg6xfcywypg3yprabgkzi9spr407nia86ljrqqss";
+ rev = "74b27a95429b3207d0005610d11223728039ba81";
+ sha256 = "1vp5crdjk3pswn6ip3vgkkc49kqnpayfjgzivfi6fplvhz8klrr1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0197fd3657e65e3826375d9b6f19da3058366c91/recipes/apiwrap";
@@ -1960,27 +2002,6 @@
license = lib.licenses.free;
};
}) {};
- aurora-config-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "aurora-config-mode";
- version = "0.0.2";
- src = fetchFromGitHub {
- owner = "bdd";
- repo = "aurora-config-mode.el";
- rev = "0a7ca7987c3a0824e25470389c7d25c337a81593";
- sha256 = "0ns1xhpk1awbj3kv946dv11a99p84dhm54vjk72kslxwx42nia28";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/aurora-config-mode";
- sha256 = "1hpjwidqmjxanijsc1imc7ww9abbylmkin1p0846fbz1hz3a603c";
- name = "aurora-config-mode";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/aurora-config-mode";
- license = lib.licenses.free;
- };
- }) {};
auth-password-store = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, seq }:
melpaBuild {
pname = "auth-password-store";
@@ -2002,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 = "tarsius";
+ owner = "emacscollective";
repo = "auto-compile";
- rev = "0cbebd8fd22c88a57a834797e4841900ea1bae1c";
- sha256 = "1sngafab6sssidz6w1zsxw8i6k4j13m0073lbmp7gq3ixsqdxbr7";
+ rev = "a31819a1b75a2320edb0f7f25d6c6faf528bf41a";
+ sha256 = "17hzl03livgj49zb0knlfn6r020nvj41pjjz3acy82zwrjydsvxa";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/e00dcd4f8c59c748cc3c85af1607dd19b85d7813/recipes/auto-compile";
- sha256 = "1cdv41hg71mi5ixxi4kiizyg03xai2gyhk0vz7gw59d9a7482yks";
+ 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;
@@ -2788,12 +2809,12 @@
bifocal = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bifocal";
- version = "0.0.1";
+ version = "0.0.2";
src = fetchFromGitHub {
owner = "riscy";
repo = "bifocal-mode";
- rev = "19b54d1de8938448c88afd495d749fc7b6f6d281";
- sha256 = "0mym4wqhfh58sr82z0w1z7kvj2p6s54b3j9davwpkj850j378x52";
+ rev = "5e89ad1a9a47e890ce080a79fd32c71eb128d1c4";
+ sha256 = "1rwxw1wniws31gbmpxgglxbc2g4jag19dvsjrym0f43yy4w2mbpw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/79e71995bd8452bad2e717884f148ec74c9735fc/recipes/bifocal";
@@ -2809,12 +2830,12 @@
binclock = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "binclock";
- version = "1.10";
+ version = "1.11";
src = fetchFromGitHub {
owner = "davep";
repo = "binclock.el";
- rev = "2e529ace67a04e6872a2328769782ef33b0e463a";
- sha256 = "0ldyx90lrhfn7qypxsmaf2yhpamjiqzvsk0b0jlgg09ars1fvhns";
+ rev = "b964e437311e5406a31c0ec7038b3bf1fd02b876";
+ sha256 = "0ljxb70vx7x0yn8y1ilf4phk0hamprl43dh23fm3njqqgw60hzbk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/95dfa38d795172dca6a09cd02e21630747723949/recipes/binclock";
@@ -3103,12 +3124,12 @@
bshell = callPackage ({ buffer-manage, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "bshell";
- version = "0.1";
+ version = "0.3";
src = fetchFromGitHub {
owner = "plandes";
repo = "bshell";
- rev = "0abd93439895851c1ad3037b0df7443e577ed1ba";
- sha256 = "1frs3m44m4jjl3rxkahkyss2gnijpdpsbqvx0vwbl637gcap1slw";
+ rev = "884a8b906617d305e9d5d2c3750618d2f86f9aed";
+ sha256 = "16qh71yhpxs5cxjmkiqiia8xrxa0ym2n32znp4yc7xiv2xfw2ss4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cf0ed51304f752af3e1f56caf2856d1521d782a4/recipes/bshell";
@@ -3142,22 +3163,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.1";
+ version = "0.5";
src = fetchFromGitHub {
owner = "plandes";
repo = "buffer-manage";
- rev = "09c7e652010ce84ea43c0ac20a943e7733bea0af";
- sha256 = "0dhqx4zlqznl4kn8cqp2a4a7c8nsw58pxss2852pfaz11pyv22ma";
+ rev = "1c63a3267bc7b790cebcea6308b64ca7ae08ef98";
+ sha256 = "1g4qchgf7gcy8mhynxklz3bh2nlrhshczpq6yzh7gpvgcaf2zg32";
};
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;
@@ -3205,6 +3226,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";
@@ -3334,12 +3376,12 @@
buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "buttercup";
- version = "1.7";
+ version = "1.8";
src = fetchFromGitHub {
owner = "jorgenschaefer";
repo = "emacs-buttercup";
- rev = "d8dc80da12cc1e71fcf54b0f4deb8d229bc97beb";
- sha256 = "0zsf2qk41i1ay6h85d1ppj5qnzdrb9n09bzj9s9hk7ysag1rlqj1";
+ rev = "e6f97d0ee4da1d061c2ff5f3e3984a30956a9fbc";
+ sha256 = "1qizbnychsjv42h9r33l1jm0rylvkgddcwgwxxcckfkj6r75k9p5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b187cb5b3cc5b546bfa6b94b6792e6363242d1/recipes/buttercup";
@@ -3730,6 +3772,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";
@@ -3859,12 +3920,12 @@
cfengine-code-style = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cfengine-code-style";
- version = "3.10.1";
+ version = "3.11.0";
src = fetchFromGitHub {
owner = "cfengine";
repo = "core";
- rev = "99e8b116e779f97e96866891362817c1c5c6534c";
- sha256 = "1ckk6jvmwrrlfd4ja8n5q99ajasgvbdkzkba9mswhq9dvk6avvn0";
+ rev = "520851447dba901097b121b58b1a0da370481a2c";
+ sha256 = "0sz4zqw2s7f5rhqad4kmrfdsl24xqflfsm4hzfbwzvsrlp7ndis7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style";
@@ -4003,90 +4064,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 = "chinese-fonts-setup";
- rev = "6f4423664e55d5470c4f239d04b88da5d6acb34d";
- sha256 = "0d9xx43ijxrp95j5bnxcsnfwn032ypy2c1lypak15772nk6i7s1w";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/c536882e613e83a4a2baf86479bfb3efb86d916a/recipes/chinese-fonts-setup";
- sha256 = "141ri6a6mnxf7fn17gw48kxk8pvl3khdxkb4pw8brxwrr9rx0xd5";
- name = "chinese-fonts-setup";
- };
- packageRequires = [ cl-lib ];
- meta = {
- homepage = "https://melpa.org/#/chinese-fonts-setup";
- license = lib.licenses.free;
- };
- }) {};
- chinese-pyim = callPackage ({ async, chinese-pyim-basedict, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip }:
- melpaBuild {
- pname = "chinese-pyim";
- version = "1.5.3";
- src = fetchFromGitHub {
- owner = "tumashu";
- repo = "chinese-pyim";
- rev = "ed2ccea3d827084b3c80afbd5d7b9345f31243d1";
- sha256 = "03nvmrwvkadab9yp74d5msfxd01xjj1jhqxymisj6jnhgv421yi0";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/157a264533124ba05c161aa93a32c7209f002fba/recipes/chinese-pyim";
- sha256 = "0zdx5zhgj1ly89pl48vigjzd8g74fxnxcd9bxrqykcn7y5qvim8l";
- name = "chinese-pyim";
- };
- packageRequires = [ async chinese-pyim-basedict cl-lib popup pos-tip ];
- meta = {
- homepage = "https://melpa.org/#/chinese-pyim";
- license = lib.licenses.free;
- };
- }) {};
- chinese-pyim-basedict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "chinese-pyim-basedict";
- version = "0.1";
- src = fetchFromGitHub {
- owner = "tumashu";
- repo = "chinese-pyim-basedict";
- rev = "f13b6d20629a0b691ead626cca249b227622fa83";
- sha256 = "1ddld5jkhqarm31p6qjdvdha36k6yqaz3jzg3lyzd0nkavcmdq57";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/e2315ffe7d13928eddaf217a5f67a3e0dd5e62a1/recipes/chinese-pyim-basedict";
- sha256 = "1qmr71lnpn06mcbb6gfr3dh78pav0sk9mld956cvnkg82vg7nmpv";
- name = "chinese-pyim-basedict";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/chinese-pyim-basedict";
- license = lib.licenses.free;
- };
- }) {};
- chinese-pyim-greatdict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "chinese-pyim-greatdict";
- version = "0.1";
- src = fetchFromGitHub {
- owner = "tumashu";
- repo = "chinese-pyim-greatdict";
- rev = "11cf5145710349e9d928eb9197bebb426025fd58";
- sha256 = "1pza690b31ynyj31f1gp7y2d29ri3swcblpzd2pcpj3ynmnbsy3f";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/03234f7a1abe7423c5a9bcb4c100957c8eece351/recipes/chinese-pyim-greatdict";
- sha256 = "1xqr2fcsb45khavqx06ry2sm8db790zlggk61civbdyafvlz8ikc";
- name = "chinese-pyim-greatdict";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/chinese-pyim-greatdict";
- license = lib.licenses.free;
- };
- }) {};
chinese-word-at-point = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "chinese-word-at-point";
@@ -4111,16 +4088,16 @@
choice-program = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "choice-program";
- version = "0.1";
+ version = "0.2";
src = fetchFromGitHub {
owner = "plandes";
repo = "choice-program";
- rev = "154c12ed7e2afc2d5dae031698be4787d7d647b0";
- sha256 = "1695pmz0j93pz3pkcyqk0ngajcf8cyzxihmpp2zfspya3ihxj4ia";
+ rev = "5a803216d1d7a7ac6fd0f89f04ba4c126182a852";
+ sha256 = "0iah71kcrzi22mi1jvyyaiflsx0ry24hqb0wd2w0nbgzc8s5ycqb";
};
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 ];
@@ -4132,12 +4109,12 @@
cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }:
melpaBuild {
pname = "cider";
- version = "0.14.0";
+ version = "0.15.1";
src = fetchFromGitHub {
owner = "clojure-emacs";
repo = "cider";
- rev = "f3c396ff8cf4baf331b0e19e18e33b795b66ee3e";
- sha256 = "1np4bh7fxv6xkvdg1nyd596p2yjkrh5msw2wsfyidl0xb1jdnj9c";
+ rev = "8a9eab32646abcaaf31fe83b2d897c01971b98f1";
+ sha256 = "0ddkm87l9ann05a6j57r0x59qqgfavwrvlzhkc5xhak1nmk5556h";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider";
@@ -4300,12 +4277,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";
@@ -4606,12 +4583,12 @@
cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cmake-mode";
- version = "3.9.0pre6";
+ version = "3.9.2";
src = fetchFromGitHub {
owner = "Kitware";
repo = "CMake";
- rev = "25b72e9097260d1faf254155a1199886c808a58f";
- sha256 = "0rzy8fpagsqfln1x27mq89dh819jc8h2dlf7axmxq63g830c029q";
+ rev = "ffa164736ec78f27583ca4515ff3dfc7a82fc702";
+ sha256 = "09m6hwlzdrd884h8wcq8pfac098smk1xqjpqm3003bqs4aynm49p";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -5086,22 +5063,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;
@@ -5110,12 +5087,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";
@@ -5173,12 +5150,12 @@
company-math = callPackage ({ company, fetchFromGitHub, fetchurl, lib, math-symbol-lists, melpaBuild }:
melpaBuild {
pname = "company-math";
- version = "1.2";
+ version = "1.3";
src = fetchFromGitHub {
owner = "vspinu";
repo = "company-math";
- rev = "2cb03c48f44a5b3cbbbbe05e9841b2c61bd8ed81";
- sha256 = "1i13w1pziv8c1d9gi6pg50v60z7jyx2grpamrbnazvd6rci88paf";
+ rev = "7e7f8c71f57b12f9bcbbf01f2bbcc59343ad76d4";
+ sha256 = "0akqhhjvzsg0lbqx4bbkfkzijidwgi3bb32sxl3yxz7zfm9pbhn2";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fadff01600d57f5b9ea9c0c47ed109e058114998/recipes/company-math";
@@ -5236,12 +5213,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";
src = fetchFromGitHub {
owner = "xcwen";
repo = "ac-php";
- rev = "e0aaae30e4e5f18390e5d00953db02c1f03c44f6";
- sha256 = "1mrk37w88b4843jbghr9i79rbwbzwk8b1wljvzmm6x0q7ldlxmsm";
+ rev = "7a50b7debd149a30b84f0e2e57a4662926d96a24";
+ sha256 = "15kmzkkgrhwind66kiyc2kpl27jrbzcs79i3w5s7fzzjjg9h18lb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php";
@@ -5305,12 +5282,12 @@
company-rtags = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rtags }:
melpaBuild {
pname = "company-rtags";
- version = "2.10";
+ version = "2.14";
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "3b3ace901f53827daef81d4c13658ec4feb318b4";
- sha256 = "1lm0s1918zsnd4hmfzf3xfrd68ip2zjnr9ciyf4bwpd66y0zfrbk";
+ rev = "15ef9a8bab847773d6e247005be929422fc9c285";
+ sha256 = "0yq3c4ich0sffzd571drb7k4vs0bvblx6qcrb6zry75d9npggsyg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags";
@@ -5407,6 +5384,27 @@
license = lib.licenses.free;
};
}) {};
+ company-terraform = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, terraform-mode }:
+ melpaBuild {
+ pname = "company-terraform";
+ version = "1.1";
+ src = fetchFromGitHub {
+ owner = "rafalcieslak";
+ repo = "emacs-company-terraform";
+ rev = "b08ced5bac44c0253e3725a7f7a6246bdf1cf2b6";
+ sha256 = "10922ykv6ii28rnhg4vri2g1fs5897xjxw6a5pk1rw2mld5kx57r";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/1d9732da975dcf59d3b311b19e20abbb29c33656/recipes/company-terraform";
+ sha256 = "198ppqn6f7y9bg582z5s4cl9gg1q9ibsr7mmn68b50zvma7ankzh";
+ name = "company-terraform";
+ };
+ packageRequires = [ company emacs terraform-mode ];
+ meta = {
+ homepage = "https://melpa.org/#/company-terraform";
+ license = lib.licenses.free;
+ };
+ }) {};
company-web = callPackage ({ cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, web-completion-data }:
melpaBuild {
pname = "company-web";
@@ -5475,14 +5473,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 ];
@@ -5596,6 +5594,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 +5636,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.1";
+ src = fetchFromGitHub {
+ owner = "emacs-php";
+ repo = "emacs-auto-deployment";
+ rev = "7b8e13cd3dcc12b247089a4530e08fd0ab3bc487";
+ sha256 = "0nx9qlp1jl7hmwf19ifac8r0955vkdkscf0nmm92hdqbj83jdmv9";
+ };
+ 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";
@@ -5872,12 +5912,12 @@
cricbuzz = callPackage ({ dash, enlive, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "cricbuzz";
- version = "0.2.8";
+ version = "0.2.10";
src = fetchFromGitHub {
owner = "lepisma";
repo = "cricbuzz.el";
- rev = "5fe51347f5d6e7636ece5e904e4bdec0be21db45";
- sha256 = "1x29garhp1x5h1mwbamwjnfw52w45b39aqxsvcdxmcf730w9pq63";
+ rev = "62c86b1aa6e0779c4f6d8fb9d31d75bf81994f69";
+ sha256 = "1k8n65scj3frafy1fk25j3kzpp0q8r98ydibryv48izndpck03h3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cricbuzz";
@@ -5977,16 +6017,16 @@
csound-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, multi, shut-up }:
melpaBuild {
pname = "csound-mode";
- version = "0.1";
+ version = "0.1.2";
src = fetchFromGitHub {
owner = "hlolli";
repo = "csound-mode";
- rev = "b0e74f149a15118e8d85bf073b2ff5e0dd3cba7f";
- sha256 = "0c73xjhqgp1f7bplm47cgpssm8kpj3vda9n0fqcyq5i38ncfqwva";
+ rev = "877c7c9d5bdc6a2acf4ac1a10e9e24ba1bd3cc76";
+ sha256 = "1vsngs42n8xp72701ppvmwyy6b90vnj39fq12yvp7x9zqf29lmq1";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/34dc8853f5978789212cb7983615202c498d4d25/recipes/csound-mode";
- sha256 = "0k4p9w19yxhfccr9zgg51ppl9jf3m4pwwnqiq25yv6qsxmh9q24l";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/c940d29de11e43b4abf2901c466c94d426a21818/recipes/csound-mode";
+ sha256 = "047a78nhkn6qycsz8w9a0r1xyz5wyf4rds3z5yx9sn5wkv54w95d";
name = "csound-mode";
};
packageRequires = [ emacs multi shut-up ];
@@ -6166,12 +6206,12 @@
cython-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cython-mode";
- version = "0.26pre1";
+ version = "0.26.1";
src = fetchFromGitHub {
owner = "cython";
repo = "cython";
- rev = "85a2dfe76a2bc28d4c8c1a760ef04e614f61be73";
- sha256 = "0gcdwzw952kddvxxgzsj93rqlvh2gs8bghz605zgm97baadvrizy";
+ rev = "39c71d912af541229d24da17987d65e65731d2bf";
+ sha256 = "02alpsgmm0csp9yfa4bhsf8yyhf0q9rc44yrss0020qg8n92xs06";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@@ -6208,12 +6248,12 @@
dad-joke = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "dad-joke";
- version = "1.2";
+ version = "1.3";
src = fetchFromGitHub {
owner = "davep";
repo = "dad-joke.el";
- rev = "98e5e5ed4c57f6076afb55d75af66e787867d9f9";
- sha256 = "017fdcbggnmnj9ri1a7id29l20pingw6mr1sk55xzkwgwf3v30fr";
+ rev = "92641503c7e93309db12380d5228f99dbe64a53c";
+ sha256 = "063cz5k264qbkb5g87xr6z68fjjnw3j1hpckdn6nqy8cin4qhagc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/484d571b2737f7c613816333afdde6460c64e635/recipes/dad-joke";
@@ -6226,22 +6266,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 +6290,12 @@
darcula-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "darcula-theme";
- version = "1.1";
+ version = "1.2";
src = fetchFromGitLab {
owner = "fommil";
repo = "emacs-darcula-theme";
- rev = "834202004507221c3bdf49457219a56760b13d22";
- sha256 = "1j2g94cz9b3ivv0w88gw1hcf236kc0c7hnrf13yyspxjm5jfdmd5";
+ rev = "da9852867ac115a54ee350a750d4dae182706117";
+ sha256 = "03059ydiw73a7kdvgn3namfqz87pqm2xfrnf87irkiv5pl9h482s";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/23c8f10205187babb17e3abc3dc40eb1938e6640/recipes/darcula-theme";
@@ -6355,12 +6395,12 @@
dashboard = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, page-break-lines }:
melpaBuild {
pname = "dashboard";
- version = "1.0.3";
+ version = "1.2.3";
src = fetchFromGitHub {
owner = "rakanalh";
repo = "emacs-dashboard";
- rev = "cd9899342bc94e59aa42275554810e50d045aaa4";
- sha256 = "1klmjdym4w3cbarabzvkxddjdcisfk62wkpys3z4nclp4g91p8as";
+ rev = "f435fd394edc5ad9cf82065ef73b5821e3f93c58";
+ sha256 = "0f0ipnij69z90qv9lzl6x9id3f6nayrgqxppbcf4gkxh25pi5nkw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e9a79341ccaa82a8c065e71c02fe6aee22007c66/recipes/dashboard";
@@ -6562,17 +6602,19 @@
license = lib.licenses.free;
};
}) {};
- deft = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
+ deft = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
pname = "deft";
version = "0.7";
- src = fetchgit {
- url = "git://jblevins.org/git/deft.git";
+ src = fetchFromGitHub {
+ owner = "jrblevin";
+ repo = "deft";
rev = "4001a55cf5f79cdbfa00f1405e8a4645af4acd40";
sha256 = "157c6ck6gb59i7dikbdnaq7cwlh3nnk0vqgil4v1294s2xbpp46n";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/deft";
- sha256 = "1c9kps0lw97nl567ynlzk4w719a86a18q697rcmrbrg5imdx4y5p";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/deft";
+ sha256 = "0f6z9hsigbwdsmg0abk1ddl9j19d0rpj4gzkl0d5arcpqbla26hp";
name = "deft";
};
packageRequires = [];
@@ -7302,6 +7344,27 @@
license = lib.licenses.free;
};
}) {};
+ docker-compose-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yaml-mode }:
+ melpaBuild {
+ pname = "docker-compose-mode";
+ version = "0.3.5";
+ src = fetchFromGitHub {
+ owner = "meqif";
+ repo = "docker-compose-mode";
+ rev = "372df2f0de34a4bd44d4a7274b9ab85117ac7392";
+ sha256 = "14vgjhy2j60xhf38zm5nlkr4d3r455kw6paw0wff4mqmdjcg3pds";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/37dd4c1fc11d22598c6faf03ccc860503a68b950/recipes/docker-compose-mode";
+ sha256 = "1hldddl86h0i1ysxklkr1kyz44lzic1zr68x3vb0mha4n5d6bl5g";
+ name = "docker-compose-mode";
+ };
+ packageRequires = [ dash emacs yaml-mode ];
+ meta = {
+ homepage = "https://melpa.org/#/docker-compose-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
docker-tramp = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "docker-tramp";
@@ -7557,12 +7620,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";
@@ -7808,12 +7871,12 @@
easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "easy-hugo";
- version = "1.0.0";
+ version = "1.7.7";
src = fetchFromGitHub {
owner = "masasam";
repo = "emacs-easy-hugo";
- rev = "226fa5c661391c7f8317a24c9f757396e1900371";
- sha256 = "0g63ajpxr2a42nw5ri14icvwwdc9hs8al91plcjxjs7q7rbkhwp6";
+ rev = "108cc2347507ff8c92b10a817de0850e9eb99ab2";
+ sha256 = "1fcq6693cjl0lx67gwsk53lm20zznq9cc9widb3rzpwifns4x8ac";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo";
@@ -7889,22 +7952,22 @@
license = lib.licenses.free;
};
}) {};
- ebal = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }:
+ ebal = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ebal";
- version = "0.2.1";
+ version = "0.3.1";
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "ebal";
- rev = "2d274ee56d5a61152e846f9a759ebccd70dc8eb1";
- sha256 = "15hygzw52w5c10hh3gq0hzs499h8zkn1ns80hb2q02cn9hyy962q";
+ rev = "4d19565516785348894c4911e757e33a270b3efd";
+ sha256 = "1wj9h8ypi70az387c7pcrpc59lpf89dkp2q4df2ighxw3l648mb7";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/629aa451162a0085488caad4052a56366b7ce392/recipes/ebal";
sha256 = "1kqnlp5n1aig1qbqdq9q50wgqkzd1l6h9wi1gv43cif8qa1kxhwg";
name = "ebal";
};
- packageRequires = [ emacs f ido-completing-read-plus ];
+ packageRequires = [ emacs f ];
meta = {
homepage = "https://melpa.org/#/ebal";
license = lib.licenses.free;
@@ -8246,6 +8309,27 @@
license = lib.licenses.free;
};
}) {};
+ eg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "eg";
+ version = "1.1";
+ src = fetchFromGitHub {
+ owner = "davep";
+ repo = "eg.el";
+ rev = "0791452498719afb7409d1f723dbea2ec26d56f1";
+ sha256 = "1y16pah8f4jp117vihvlcwvsw2i85gdk45h9y9r1w9mslb24faac";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/3d2b6b92b2a71486f260571885bf149ad6afc551/recipes/eg";
+ sha256 = "1ic6qzk0zmay3vvbb8jg35irqkc0k68dmgbq4j9isiawy449zvp7";
+ name = "eg";
+ };
+ packageRequires = [ cl-lib emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/eg";
+ license = lib.licenses.free;
+ };
+ }) {};
egg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "egg";
@@ -8307,22 +8391,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;
@@ -8457,12 +8551,12 @@
el-patch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "el-patch";
- version = "1.1.2";
+ version = "1.2";
src = fetchFromGitHub {
owner = "raxod502";
repo = "el-patch";
- rev = "ad6a64e9f24f6b58f0a08e11f76b5152da46c74c";
- sha256 = "0n0zrjij9mcbv08x1m5hjbz6hcwy0c0j2d03swywnhl4c00pwfkp";
+ rev = "cc26f37e19ebc60ca75067115d3794cda88003c5";
+ sha256 = "0b8yy51dy5280y7yvq0ylm20m9bvzi7lzs3c9m1i2gb3ssx7267w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2f4f57e0edbae35597aa4a7744d22d2f971d5de5/recipes/el-patch";
@@ -8517,6 +8611,27 @@
license = lib.licenses.free;
};
}) {};
+ el2org = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "el2org";
+ version = "0.5.0";
+ src = fetchFromGitHub {
+ owner = "tumashu";
+ repo = "el2org";
+ rev = "c85837d56ed8fe1b31927755294db49ac46f443e";
+ sha256 = "0znnvpngghd9z8a0cakpvrw261mnmxqa15lpjcxfm7w8wgb2d4f6";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/el2org";
+ sha256 = "02kyvzpjws2mrp414i4zm4fmrnzgkaax6bnrlyhp17a8aqaggbnh";
+ name = "el2org";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/el2org";
+ license = lib.licenses.free;
+ };
+ }) {};
eldoc-eval = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "eldoc-eval";
@@ -8625,12 +8740,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";
@@ -8835,12 +8950,12 @@
elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }:
melpaBuild {
pname = "elpy";
- version = "1.15.1";
+ version = "1.16.0";
src = fetchFromGitHub {
owner = "jorgenschaefer";
repo = "elpy";
- rev = "55ee3d57872c87cb640abd5d63ac1887f9e8dc5d";
- sha256 = "0866l17sqq2p7bla2krg10y70wgsxf158kashcgschfr0h2f7r1i";
+ rev = "c33794ae03fa787c7f93b93cc9427d864b63e25f";
+ sha256 = "1q8zjsl9zbgwqcbvzkdlqy28z4h1qr0kkhhrq037vab0w0l0zi6l";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy";
@@ -8902,27 +9017,6 @@
license = lib.licenses.free;
};
}) {};
- elscreen-persist = callPackage ({ elscreen, fetchFromGitHub, fetchurl, lib, melpaBuild, revive }:
- melpaBuild {
- pname = "elscreen-persist";
- version = "0.2.0";
- src = fetchFromGitHub {
- owner = "robario";
- repo = "elscreen-persist";
- rev = "652b4c738f92c518ead69343ebfcf66bc2a0254c";
- sha256 = "06g7fl2c7cvwsrgi462wf6j13ny56y6zvgkizz9f256xjjq77ymf";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/c30ec71dcc29d1d0fd6c54de512c8c4636a7e0a6/recipes/elscreen-persist";
- sha256 = "1rjfvpsx0y5l9b76wa1ilj5lx39jd0m78nb1a4bqn81z0rkfpl4k";
- name = "elscreen-persist";
- };
- packageRequires = [ elscreen revive ];
- meta = {
- homepage = "https://melpa.org/#/elscreen-persist";
- license = lib.licenses.free;
- };
- }) {};
elwm = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "elwm";
@@ -8947,16 +9041,16 @@
elx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "elx";
- version = "1.1.0";
+ version = "1.1.1";
src = fetchFromGitHub {
- owner = "tarsius";
+ owner = "emacscollective";
repo = "elx";
- rev = "6ce9a2f14ecf7263e71a699e058293f0343bfe4d";
- sha256 = "1i250nv416jmknb39a390bxvdsf0dlgwfjn67n5gn6sia99lgjhq";
+ rev = "9f5d593b65686e8da29ef79457c8f6fc061af7e5";
+ sha256 = "1vs7nmsi82gv9mw1mia6ri1vmn26ldwnj8akirqgq31rfgyfj4vh";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/91430562ecea439af020e96405ec3f21d768cf9f/recipes/elx";
- sha256 = "02nq66c0sds61k2p8cn2l0p2l8ysb38ibr038qn41l9hg1dq065x";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/elx";
+ sha256 = "008nwa2gn3d2ayr8023pxyvph52gh9m56f77h41hp8hcw6hbdwrz";
name = "elx";
};
packageRequires = [ emacs ];
@@ -9781,12 +9875,12 @@
erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "erlang";
- version = "20.0.1";
+ version = "20.0.4";
src = fetchFromGitHub {
owner = "erlang";
repo = "otp";
- rev = "a01de6873844ba510084090abec734c4166d71fa";
- sha256 = "0bni9rchblp3n7lh07wq3rpf5xykh79jm6bl6f2dk2j24wwrhjqs";
+ rev = "a230f26086b3db9097f06d4bb91fb3b2e9379c77";
+ sha256 = "1g26vf7ab18r9knxa2ykn3j6vrhhiyqbg6jf3gfjxw2c94z51a9m";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -9948,12 +10042,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";
@@ -10011,12 +10105,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";
@@ -10176,27 +10270,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";
@@ -10221,12 +10294,12 @@
esup = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "esup";
- version = "0.5";
+ version = "0.6";
src = fetchFromGitHub {
owner = "jschaf";
repo = "esup";
- rev = "6faef1fe1b5ff2fb761722ef1972a16395d9a10b";
- sha256 = "18igz3gcdp42wk89y59d4gxkbv0zvs8i4lg1b0qsrf90knasfjc9";
+ rev = "53355b13dc9f1636ba681ffff830162ebbd3b223";
+ sha256 = "1a4b8390azimlrr5ayxvaks1w7009vfbm56q11ybx00xxrd26v43";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b9d2948a42da5d4864404d2d11a924a4f235fc3b/recipes/esup";
@@ -10242,16 +10315,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 = [];
@@ -10284,12 +10357,12 @@
eval-in-repl = callPackage ({ ace-window, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }:
melpaBuild {
pname = "eval-in-repl";
- version = "0.9.4";
+ version = "0.9.6";
src = fetchFromGitHub {
owner = "kaz-yos";
repo = "eval-in-repl";
- rev = "674873139ebde439fbeecaf0fb217d54f470bc14";
- sha256 = "1fzsq6fkkrsxg6mimrnls0kn59rq7w332b94gg04j0khl61s1v1s";
+ rev = "7e2b42570b449b2a3c2922f3036a027d1e393a60";
+ sha256 = "0x97flv356kd7j6wbhacz0lmsrdd9as87b0n6nliq5n0y30my8dy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0bee5fb7a7874dd20babd1de7f216c5bda3e0115/recipes/eval-in-repl";
@@ -10599,12 +10672,12 @@
evil-matchit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-matchit";
- version = "2.2.2";
+ version = "2.2.3";
src = fetchFromGitHub {
owner = "redguardtoo";
repo = "evil-matchit";
- rev = "0b0e6d61a6462fc6fff7000b739ce5b31acd0d4c";
- sha256 = "13qxsbvmi0dkzmf59j0xyjwwcspyhymm6swsagqy4b57ypis5hxh";
+ rev = "bed39041b1181ec26cf2601a8a7aa4afe2510f5b";
+ sha256 = "0b1gl5mhl8w63rhx4bbr69cklgz630038lxpjb4nl6h8yl41pcrp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/aeab4a998bffbc784e8fb23927d348540baf9951/recipes/evil-matchit";
@@ -10662,12 +10735,12 @@
evil-nerd-commenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "evil-nerd-commenter";
- version = "3.0.2";
+ version = "3.1.1";
src = fetchFromGitHub {
owner = "redguardtoo";
repo = "evil-nerd-commenter";
- rev = "cac2f7945fc90f43d1282dfe4aca24ded9f7cd03";
- sha256 = "1zjnscnj0zrxpdjikxwg4fw7m6yb39060cmn24xzs0hmnmbxnw9m";
+ rev = "92bee71aa6fbb36299a4e69e710da786f3694637";
+ sha256 = "1sxwiar17jvqj7plf7jdpwx9kymabr0dsfl7mbkcxpzvrfdlmp12";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a3e1ff69e7cc95a5b5d628524ad836833f4ee736/recipes/evil-nerd-commenter";
@@ -11228,12 +11301,12 @@
eziam-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "eziam-theme";
- version = "0.4.1";
+ version = "0.4.4";
src = fetchFromGitHub {
owner = "thblt";
repo = "eziam-theme-emacs";
- rev = "df2ae56e1ee5cc41c335ca6fd7ead3b99b3c5edd";
- sha256 = "0nsch4zzqd64rq0y75knfp95nn5nq2hvvgcjhq0i075g2vwhf73w";
+ rev = "63395a2367d1d48983a9363d2d0bf518177297bd";
+ sha256 = "15vgv0z4vzdnc3vb98j2hy4bv5x83f4c1dzgx49r61vka7p5is0q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0411583bd4fdbe425eb07de98851136fa1eeb0/recipes/eziam-theme";
@@ -11396,12 +11469,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";
@@ -11414,15 +11487,35 @@
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";
- version = "0.2.2";
+ version = "0.2.3";
src = fetchFromGitHub {
owner = "cute-jumper";
repo = "fcitx.el";
- rev = "77f1e187b9cecb6975bedcfe91c8c81f1b133686";
- sha256 = "0n0v9jwswcc16cigyffvy3m9y7qqrs8qzjs11sq3d420zrv16b39";
+ rev = "6d552ab44234ed78ce9a50f2412f56197266bc9f";
+ sha256 = "08l859rw1lwj6hdxrlxqlxf1cfxv8yv9h1jsgs5zfis3hp7nq39j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e8c40f09d9397b3ca32a7ed37203f490497dc984/recipes/fcitx";
@@ -11459,12 +11552,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";
@@ -11522,12 +11615,12 @@
find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "find-file-in-project";
- version = "5.3.2";
+ version = "5.4.3";
src = fetchFromGitHub {
owner = "technomancy";
repo = "find-file-in-project";
- rev = "99801cd730d579ed3b05d084ad254b6a73b259aa";
- sha256 = "0pqg6iib5ns6k5is0bv8riwficadi64dinzdjibk94h8i7cmp54h";
+ rev = "dcc0801c4781d76efd9ac0d86bab4084b4b93663";
+ sha256 = "0axk4a4b3s0x8wn4a4mj1i89kix88cv94iclhw4wigsscndpr03v";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project";
@@ -11781,12 +11874,12 @@
floobits = callPackage ({ fetchFromGitHub, fetchurl, highlight, json ? null, lib, melpaBuild }:
melpaBuild {
pname = "floobits";
- version = "1.9.0";
+ version = "1.9.2";
src = fetchFromGitHub {
owner = "Floobits";
repo = "floobits-emacs";
- rev = "fdac635ecc57ac7743f74678147aca2e956561de";
- sha256 = "134b5ss249x06bgqvsxnlcfys7nl8aid42s7ln8pamxrc3prfcc1";
+ rev = "ed5586d1bf94f36354091648e824ccb6fcaf807f";
+ sha256 = "08m9snmkhdjmvw1pqww9l39xqas9f6yxksjxvfjjfnad8ak80x9b";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/95c859e8440049579630b4c2bcc31e7eaa13b1f1/recipes/floobits";
@@ -12138,12 +12231,12 @@
flycheck-julia = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-julia";
- version = "0.0.3";
+ version = "0.1.1";
src = fetchFromGitHub {
owner = "gdkrmr";
repo = "flycheck-julia";
- rev = "67cdef277741f06c884525636a1cf1349efebbb4";
- sha256 = "1qn2i643nbvb94vgdwc94himwh3z984cmg2fklvmlw8xyyxm7ny2";
+ rev = "213b60a5a9a1cb7887260e1d159b5bb27167cbb6";
+ sha256 = "0wk8mc8j67dmc3mxzrhypgxmyywwrjh5q5llj4m2mgf0j7yp2576";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4e964e3c6f737d0102b4fd7440fa9d434e6382bf/recipes/flycheck-julia";
@@ -12303,6 +12396,27 @@
license = lib.licenses.free;
};
}) {};
+ flycheck-popup-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup }:
+ melpaBuild {
+ pname = "flycheck-popup-tip";
+ version = "0.12.2";
+ src = fetchFromGitHub {
+ owner = "flycheck";
+ repo = "flycheck-popup-tip";
+ rev = "ef86aad907f27ca076859d8d9416f4f7727619c6";
+ sha256 = "1bi6f9nm4bylsbjv4qnkar35s6xzdf2cc2cxi3g691p9527apdz6";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/9b2269ee9532bb092756ae0c0693cb44b73820e8/recipes/flycheck-popup-tip";
+ sha256 = "1j8pgljnxcbfh08qpbr9jkw56l7d6k8lmdcsjbi6jd7jmyqbqvnx";
+ name = "flycheck-popup-tip";
+ };
+ packageRequires = [ emacs flycheck popup ];
+ meta = {
+ homepage = "https://melpa.org/#/flycheck-popup-tip";
+ license = lib.licenses.free;
+ };
+ }) {};
flycheck-pos-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, pos-tip }:
melpaBuild {
pname = "flycheck-pos-tip";
@@ -12324,6 +12438,27 @@
license = lib.licenses.free;
};
}) {};
+ flycheck-pycheckers = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+ melpaBuild {
+ pname = "flycheck-pycheckers";
+ version = "0.2";
+ src = fetchFromGitHub {
+ owner = "msherry";
+ repo = "flycheck-pycheckers";
+ rev = "220c551df591792d08fc9d149ab3329171743cb9";
+ sha256 = "0q1sz28nlnamcm4l587q94b7cyak9d4wpgpr33a05m9lw4a6z74i";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/af36dca316b318d25d65c9e842f15f736e19ea63/recipes/flycheck-pycheckers";
+ sha256 = "18ski3bp8x33589pc273i5ia3hffvlb4czrd97wkfgr4k59ww6yq";
+ name = "flycheck-pycheckers";
+ };
+ packageRequires = [ flycheck ];
+ meta = {
+ homepage = "https://melpa.org/#/flycheck-pycheckers";
+ license = lib.licenses.free;
+ };
+ }) {};
flycheck-rebar3 = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-rebar3";
@@ -12348,12 +12483,12 @@
flycheck-rtags = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, rtags }:
melpaBuild {
pname = "flycheck-rtags";
- version = "2.10";
+ version = "2.14";
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "3b3ace901f53827daef81d4c13658ec4feb318b4";
- sha256 = "1lm0s1918zsnd4hmfzf3xfrd68ip2zjnr9ciyf4bwpd66y0zfrbk";
+ rev = "15ef9a8bab847773d6e247005be929422fc9c285";
+ sha256 = "0yq3c4ich0sffzd571drb7k4vs0bvblx6qcrb6zry75d9npggsyg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags";
@@ -13269,6 +13404,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";
@@ -13382,25 +13538,6 @@
license = lib.licenses.free;
};
}) {};
- fuel = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "fuel";
- version = "0.96";
- src = fetchgit {
- url = "git://factorcode.org/git/factor.git";
- rev = "905ec06d864537fb6be9c46ad98f1b6d101dfbf0";
- sha256 = "0ip7azxi5nvp8vvi15ds46mgs0fmi7gq97f2iz1c7m67ml5wi2g7";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel";
- sha256 = "0m24p2788r4xzm56hm9kmpzcskwh82vgbs3hqfb9xygpl4isp756";
- name = "fuel";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/fuel";
- license = lib.licenses.free;
- };
- }) {};
full-ack = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "full-ack";
@@ -13425,12 +13562,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";
@@ -13443,22 +13580,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 = "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;
@@ -13530,12 +13667,12 @@
fxrd-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "fxrd-mode";
- version = "0.8";
+ version = "1.0";
src = fetchFromGitHub {
owner = "msherry";
repo = "fxrd-mode";
- rev = "8a1a0d5a08527ec8dee9bbe135803ed7ad297d9d";
- sha256 = "1yzw0fnlqilpx4xl84hpr75l86y9iiqyh13r1hskmwb79s2niw1m";
+ rev = "795b969346982b75e24b5c8619b46197982fbb4d";
+ sha256 = "0aha13vqj6ygyr7bflrxll837g4z6wrmrhh5rhcd0vphqg70frgn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/796eb6b2126ec616c0de6af6abb7598900557c12/recipes/fxrd-mode";
@@ -13782,12 +13919,12 @@
ghc = callPackage ({ fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }:
melpaBuild {
pname = "ghc";
- version = "5.7.0.0";
+ version = "5.8.0.0";
src = fetchFromGitHub {
owner = "DanielG";
repo = "ghc-mod";
- rev = "c3d0a681a19261817cf928685f7b96878fe51e91";
- sha256 = "1d2hsfmshh29g5bvd701py9n421hmz49hk0zjx5m09s8znjkvgx3";
+ rev = "35690941aadbe44d9401102ab44a39753e0bb2b5";
+ sha256 = "0fcaxj2lhkhkm2h91d9fdqas2b99wblwl74l2y6ckpf05hrc4w1q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ghc";
@@ -13847,14 +13984,14 @@
pname = "ghub";
version = "1.2.0";
src = fetchFromGitHub {
- owner = "tarsius";
+ owner = "magit";
repo = "ghub";
rev = "da60fa2316bf829cab18676afd5a43088ac06b60";
sha256 = "0aj0ayh4jvpxwqss5805qnklqbp9krzbh689syyz65ja6r0r2bgs";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/9375cbae3ffe5bf4ba5606358860050f3005d9b7/recipes/ghub";
- sha256 = "01kzziqv5y798rps52w45kkdcn0shhb6mrina2iawab4rlvlmnd8";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/d5db83957187c9b65f697eba7e4c3320567cf4ab/recipes/ghub";
+ sha256 = "15kjyi8ialpr1zjqvw68w9pa5sigcwy2szq21yvcy295z7ylzy4i";
name = "ghub";
};
packageRequires = [ emacs ];
@@ -13866,12 +14003,12 @@
ghub-plus = callPackage ({ apiwrap, emacs, fetchFromGitHub, fetchurl, ghub, lib, melpaBuild }:
melpaBuild {
pname = "ghub-plus";
- version = "0.1.4";
+ version = "0.1.5";
src = fetchFromGitHub {
owner = "vermiculus";
repo = "ghub-plus";
- rev = "44a5558eb299adee1463b7120c23b26b1d914ea8";
- sha256 = "0fn5rb7ba4p39if68alvxv321918pki010vfylpp6jk98kzzh487";
+ rev = "f315677e3d35951021e1f10cc7b4f629814a13f0";
+ sha256 = "1k2583dnj9did2pnd3ma4rfrd2n6r83yjccf403sgxzi1p054yl4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/03a412fd25218ff6f302734e078a699ff0234e36/recipes/ghub+";
@@ -13992,12 +14129,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";
@@ -14244,12 +14381,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";
@@ -14286,12 +14423,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";
@@ -14412,12 +14549,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";
@@ -14451,6 +14588,27 @@
license = lib.licenses.free;
};
}) {};
+ gitpatch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "gitpatch";
+ version = "0.5.1";
+ src = fetchFromGitHub {
+ owner = "tumashu";
+ repo = "gitpatch";
+ rev = "94d40a2ee2b7cd7b209546ea02568079176b0034";
+ sha256 = "1drf4fvmak7brf16axkh4nfz8pg44i7pjhfjz3dbkycbpp8y5vig";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e1746d87f65dc4b0d8f47c7d6ba4c7e0dfa35953/recipes/gitpatch";
+ sha256 = "0qaswkk06z24v40nkjkv7f6gfv0dlsjd6wchkn0ppqw95883vhv1";
+ name = "gitpatch";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/gitpatch";
+ license = lib.licenses.free;
+ };
+ }) {};
gitter = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
melpaBuild {
pname = "gitter";
@@ -14685,12 +14843,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";
@@ -14958,12 +15116,12 @@
google-this = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "google-this";
- version = "1.11";
+ version = "1.12";
src = fetchFromGitHub {
owner = "Malabarba";
repo = "emacs-google-this";
- rev = "22cff810e7ed3b3c9dae066588508864c25c6d99";
- sha256 = "14dz9wjp8ym86a03pw5y1sd51zw83d6485hpq8mh8zm0j1fba0y0";
+ rev = "8a2e3ca5da6a8c89bfe99a21486c6c7db125dc84";
+ sha256 = "1dbra309w8awmi0g0pp7r2dm9nwrj2j9lpl7md8wa89rnzazwahl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/google-this";
@@ -14997,15 +15155,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";
@@ -15025,8 +15204,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";
@@ -15249,15 +15428,15 @@
license = lib.licenses.free;
};
}) {};
- graphene = callPackage ({ company, dash, exec-path-from-shell, fetchFromGitHub, fetchurl, flycheck, graphene-meta-theme, ido-ubiquitous, lib, melpaBuild, ppd-sr-speedbar, smartparens, smex, sr-speedbar, web-mode }:
+ graphene = callPackage ({ company, dash, exec-path-from-shell, fetchFromGitHub, fetchurl, flycheck, graphene-meta-theme, ido-completing-read-plus, lib, melpaBuild, ppd-sr-speedbar, smartparens, smex, sr-speedbar, web-mode }:
melpaBuild {
pname = "graphene";
- version = "0.9.7";
+ version = "0.9.8";
src = fetchFromGitHub {
owner = "rdallasgray";
repo = "graphene";
- rev = "b25707ae82e286aefa5a66087b12c9cb3b7bf2ed";
- sha256 = "1h21fv8plxydydm509immp0kpkf24ba6j3wrbpvp5w4nkx49mlkl";
+ rev = "89bbdaa465b3440f46f588664eada0f091ed6bfe";
+ sha256 = "1xrk26v9d3njydwab7drqg4p3qd8rw2diicfr7bfwd0d21bs5ykz";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0206d6adcb7855c2174c3cd506b71c21def1209b/recipes/graphene";
@@ -15270,7 +15449,7 @@
exec-path-from-shell
flycheck
graphene-meta-theme
- ido-ubiquitous
+ ido-completing-read-plus
ppd-sr-speedbar
smartparens
smex
@@ -15365,6 +15544,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.1";
+ src = fetchFromGitHub {
+ owner = "fredcamps";
+ repo = "green-is-the-new-black-emacs";
+ rev = "2b1011836fc04940d542e9a783b99670a08b308b";
+ sha256 = "16v7l4ynj4p1hq243rqckfgppmj8cvm0lyybjjqaqblqjd1ki90d";
+ };
+ 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";
@@ -15597,12 +15797,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";
@@ -15815,8 +16015,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 ];
@@ -15953,12 +16153,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";
@@ -15971,6 +16171,27 @@
license = lib.licenses.free;
};
}) {};
+ hasky-stack = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }:
+ melpaBuild {
+ pname = "hasky-stack";
+ version = "0.5.0";
+ src = fetchFromGitHub {
+ owner = "hasky-mode";
+ repo = "hasky-stack";
+ rev = "38a33e2ed02d57afb6b38bf36741f5bf7e38e45b";
+ sha256 = "03zg58hrka2q7sqm3f14xgcs2mjxhlyybkf9w6pp8icr4wdsih4z";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/c3faf544872478c3bccf2fe7dc51d406031e4d80/recipes/hasky-stack";
+ sha256 = "08ds0v5p829s47lbhibswnbn1aqfnwf6xx7p5bc5062wxdvqahw8";
+ name = "hasky-stack";
+ };
+ packageRequires = [ emacs f magit-popup ];
+ meta = {
+ homepage = "https://melpa.org/#/hasky-stack";
+ license = lib.licenses.free;
+ };
+ }) {};
haxor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "haxor-mode";
@@ -16016,12 +16237,12 @@
helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
melpaBuild {
pname = "helm";
- version = "2.8.1";
+ version = "2.8.4";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm";
- rev = "c695a697461a48840f567bd5339909d4a80fa99f";
- sha256 = "02lmjv96l1nmjfmyn82fzlrcx3wq4xp9hjynqbb8b69xn60xnlv1";
+ rev = "0fc89c212b8a90ea8de0401f8d1b446ef9a24d93";
+ sha256 = "0yava3cn0g382mgnczgqmc1fhd2nbdr16n48vjlvk8bsb3n4va1m";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -16100,12 +16321,12 @@
helm-backup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
melpaBuild {
pname = "helm-backup";
- version = "0.2.2";
+ version = "1.0.0";
src = fetchFromGitHub {
owner = "antham";
repo = "helm-backup";
- rev = "b6f930a370f6339988e79e0c85e9deee98c7b9f4";
- sha256 = "0cawlad5jy6kn2mg72ivjg3gs2h6g067h910xlbir01k9wlk3mfg";
+ rev = "3f39d296ddc77df758b812c50e3c267dd03db8bb";
+ sha256 = "05528ajhmvkc50i65wcb3bi1w4i3y1vvr56dvq6yp7cbyw9r7b8w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5e6eba7b201e91211e43c39e501f6066f0afeb8b/recipes/helm-backup";
@@ -16352,12 +16573,12 @@
helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "helm-core";
- version = "2.8.1";
+ version = "2.8.4";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm";
- rev = "c695a697461a48840f567bd5339909d4a80fa99f";
- sha256 = "02lmjv96l1nmjfmyn82fzlrcx3wq4xp9hjynqbb8b69xn60xnlv1";
+ rev = "0fc89c212b8a90ea8de0401f8d1b446ef9a24d93";
+ sha256 = "0yava3cn0g382mgnczgqmc1fhd2nbdr16n48vjlvk8bsb3n4va1m";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -16394,12 +16615,12 @@
helm-dash = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild {
pname = "helm-dash";
- version = "1.2.0";
+ version = "1.3.0";
src = fetchFromGitHub {
owner = "areina";
repo = "helm-dash";
- rev = "a0f5d6539da873cd0c51d8ef714930c970a66aa0";
- sha256 = "0s503q56acv70i5qahrdgk3nhvdpb3wa22a8jh1kvb7lykaw74ai";
+ rev = "9a230125a7a11f5fa90aa048b61abd95eb78ddfe";
+ sha256 = "0xs3nq86qmvkiazn5w564npdgbcfjlnpw2f48g2jd43yznblz7ly";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-dash";
@@ -16730,12 +16951,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";
@@ -16961,12 +17182,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";
@@ -17255,12 +17476,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";
@@ -17339,12 +17560,12 @@
helm-rtags = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, rtags }:
melpaBuild {
pname = "helm-rtags";
- version = "2.10";
+ version = "2.14";
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "3b3ace901f53827daef81d4c13658ec4feb318b4";
- sha256 = "1lm0s1918zsnd4hmfzf3xfrd68ip2zjnr9ciyf4bwpd66y0zfrbk";
+ rev = "15ef9a8bab847773d6e247005be929422fc9c285";
+ sha256 = "0yq3c4ich0sffzd571drb7k4vs0bvblx6qcrb6zry75d9npggsyg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags";
@@ -17588,6 +17809,27 @@
license = lib.licenses.free;
};
}) {};
+ helpful = callPackage ({ dash, elisp-refs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+ melpaBuild {
+ pname = "helpful";
+ version = "0.1";
+ src = fetchFromGitHub {
+ owner = "Wilfred";
+ repo = "helpful";
+ rev = "a5d8bc41e43177953d8ba3972a83755ddd4e1073";
+ sha256 = "0sr31df42cbrhzqxjvx1fcbafwq30jslqf715scrzyiziddf83zq";
+ };
+ 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";
@@ -18239,6 +18481,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";
@@ -18305,12 +18568,12 @@
hydra = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "hydra";
- version = "0.13.6";
+ version = "0.14.0";
src = fetchFromGitHub {
owner = "abo-abo";
repo = "hydra";
- rev = "91f8e7c13bcd9629ad1678588e58576ca6806b58";
- sha256 = "1czdar4yv5c9996wvj887d0c1knlrpcjj0aq2dily2x074gdzh4j";
+ rev = "943636fe4a35298d9d234222bc4520dec9ef2305";
+ sha256 = "0ln4z2796ycy33g5jcxkqvm7638qxy4sipsab7d2864hh700cikg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a4375d8ae519290fd5018626b075c226016f951d/recipes/hydra";
@@ -18449,22 +18712,22 @@
license = lib.licenses.free;
};
}) {};
- ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize, s }:
melpaBuild {
pname = "ido-completing-read-plus";
- version = "3.16";
+ version = "4.5";
src = fetchFromGitHub {
owner = "DarwinAwardWinner";
- repo = "ido-ubiquitous";
- rev = "2bd3a2722d8df0db9dfe25f5763f7dfaf0734624";
- sha256 = "1zz0k5ddcwkg0wjdzihklgnxq5f6rlsxldhn7h9jzyss5bsgykhj";
+ repo = "ido-completing-read-plus";
+ rev = "e8cfebac1df2bfca52003f28ed84cb1a39dc8345";
+ sha256 = "14g5v823wsr0sgrawqw9kwilm68w0k4plz3b00jd7z903np9cxih";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-completing-read+";
- sha256 = "034j1q47d57ia5bwbf1w66gw6c7aqbhscpy3dg2a71lwjzfmshwh";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-completing-read+";
+ sha256 = "0rxdv3cd0bg0p8c1bck5vichdq941dki934k23qf5p6cfgw8gw4z";
name = "ido-completing-read-plus";
};
- packageRequires = [ cl-lib emacs ];
+ packageRequires = [ cl-lib emacs memoize s ];
meta = {
homepage = "https://melpa.org/#/ido-completing-read+";
license = lib.licenses.free;
@@ -18557,16 +18820,16 @@
ido-ubiquitous = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }:
melpaBuild {
pname = "ido-ubiquitous";
- version = "3.16";
+ version = "4.5";
src = fetchFromGitHub {
owner = "DarwinAwardWinner";
- repo = "ido-ubiquitous";
- rev = "2bd3a2722d8df0db9dfe25f5763f7dfaf0734624";
- sha256 = "1zz0k5ddcwkg0wjdzihklgnxq5f6rlsxldhn7h9jzyss5bsgykhj";
+ repo = "ido-completing-read-plus";
+ rev = "e8cfebac1df2bfca52003f28ed84cb1a39dc8345";
+ sha256 = "14g5v823wsr0sgrawqw9kwilm68w0k4plz3b00jd7z903np9cxih";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-ubiquitous";
- sha256 = "143pzpix9aqpzjy8akrxfsxmwlzc9bmaqzp9fyhjgzrhq7zchjsp";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-ubiquitous";
+ sha256 = "11sdk0ymsqnsw1gycvq2wj4j0g502fp23qk6q9d95lm98nz68frz";
name = "ido-ubiquitous";
};
packageRequires = [ cl-lib emacs ido-completing-read-plus ];
@@ -18809,12 +19072,12 @@
imenu-anywhere = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "imenu-anywhere";
- version = "1.1.3";
+ version = "1.1.4";
src = fetchFromGitHub {
owner = "vspinu";
repo = "imenu-anywhere";
- rev = "94bab9136e1264e98a10d9325ad53d735307f8f3";
- sha256 = "1ffdh0izdd22av85rizk38fidfp8f6lk6phr549fzaspn11hvd8j";
+ rev = "fc7f0fd2f19e5ebee70156a99bf87393123893e3";
+ sha256 = "0g2gb7jrys81kphmhlvhvzwl8l75j36y6pqjawh9wmzzwad876q5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/imenu-anywhere";
@@ -18830,12 +19093,12 @@
imenu-list = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "imenu-list";
- version = "0.7";
+ version = "0.8";
src = fetchFromGitHub {
owner = "bmag";
repo = "imenu-list";
- rev = "999fc0ec7f03b56be8e2a6e673d9473f51e5a92f";
- sha256 = "0py4sc5a5hjdijavymjmvipkm9z4jy1l8yb35d8rl7mfzr5cz3l7";
+ rev = "27170d27c9594989587c03c23f753a809f6a0e10";
+ sha256 = "13xh9bdl3k6ccfq83wjmkpi4269qahv4davki4wq18dr4amrzhlx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/86dea881a5b2d0458449f08b82c2614ad9abd068/recipes/imenu-list";
@@ -18869,27 +19132,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";
@@ -18977,12 +19219,12 @@
importmagic = callPackage ({ emacs, epc, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "importmagic";
- version = "1.0";
+ version = "1.1";
src = fetchFromGitHub {
owner = "anachronic";
repo = "importmagic.el";
- rev = "135e049d763ceb4cabd0bab068c4c71452459065";
- sha256 = "1fzd3m0zwgyh3qmkhzcvgsgbnjv8nzy30brsbsa081djj5d2dagq";
+ rev = "c0360a8146ca65565a7fa66c6d72986edd916dd5";
+ sha256 = "0s6hp62kmhvmgj3m5jr3cfqc8yv3p8jfxk0piq8xbf2chr1hp6l5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/importmagic";
@@ -19082,12 +19324,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";
@@ -19216,7 +19458,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";
};
@@ -19250,12 +19492,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";
@@ -19291,12 +19533,12 @@
intellij-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "intellij-theme";
- version = "1.1";
+ version = "1.2";
src = fetchFromGitLab {
owner = "fommil";
repo = "emacs-intellij-theme";
- rev = "ad207c8c3d266d566fb1e4862df154096c059171";
- sha256 = "06slahp36mj39ri4v4k7sv3mly6cgk76m4zpc1why3h6dmd7hhyr";
+ rev = "2bbabe3f2f87716b10ccdfcacbf51016ecc32d54";
+ sha256 = "0b3615lbm8fv4svv3g72dz62h9rv18m68b656lwl2ba9sn465rsl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cfe86071b2e84929476a771da99341f4a73cfd06/recipes/intellij-theme";
@@ -19333,12 +19575,12 @@
intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }:
melpaBuild {
pname = "intero";
- version = "0.1.20";
+ version = "0.1.23";
src = fetchFromGitHub {
owner = "commercialhaskell";
repo = "intero";
- rev = "402722b5ad035b87fc08bc73343f05610a5fcb3c";
- sha256 = "143y94b4spslh06x4klvsvil7ywn3cmrad4mg1qc0y0h0d9ksd4v";
+ rev = "3865aad923559bee140eaede20c3510890979930";
+ sha256 = "1q6q2hnqf78kxd61nic4zjx7crbv8p25p4aq0h4vihamm8r0v7vm";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero";
@@ -19417,12 +19659,12 @@
irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
melpaBuild {
pname = "irony";
- version = "1.0.0";
+ version = "1.1.0";
src = fetchFromGitHub {
owner = "Sarcasm";
repo = "irony-mode";
- rev = "2424f57a3c0d320946c7ad32b44d296a91104201";
- sha256 = "13lg7ra4g3nbg96vbwk1giw2pjhqarpd72qi21x57w3lc44fwqld";
+ rev = "72e1e73f3c9da2ad04286e13bfc8fc401626b7a9";
+ sha256 = "155wvzsmhb8vz30jcd3xj91z74268pq7szax7jwd725ndx6x7ny8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony";
@@ -19522,12 +19764,12 @@
ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild {
pname = "ivy-erlang-complete";
- version = "0.2.4";
+ version = "0.3.0";
src = fetchFromGitHub {
owner = "s-kostyaev";
repo = "ivy-erlang-complete";
- rev = "117369f882f81fb9cc88459a4072a2789138c136";
- sha256 = "0cy02idvhw459a3rlw2aj8hfmxmy7hx9x5d6g3x9nkv1lxkckn9f";
+ rev = "acd6322571cb0820868a6febdc5326782a29b729";
+ sha256 = "158cmxhky8nng43jj0d7w8126phx6zlr6r0kf9g2in5nkmbcbd33";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete";
@@ -19627,12 +19869,12 @@
ivy-rtags = callPackage ({ fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, rtags }:
melpaBuild {
pname = "ivy-rtags";
- version = "2.10";
+ version = "2.14";
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "3b3ace901f53827daef81d4c13658ec4feb318b4";
- sha256 = "1lm0s1918zsnd4hmfzf3xfrd68ip2zjnr9ciyf4bwpd66y0zfrbk";
+ rev = "15ef9a8bab847773d6e247005be929422fc9c285";
+ sha256 = "0yq3c4ich0sffzd571drb7k4vs0bvblx6qcrb6zry75d9npggsyg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags";
@@ -19648,12 +19890,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";
@@ -20003,12 +20245,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";
@@ -20045,12 +20287,12 @@
js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "js2-mode";
- version = "20170116";
+ version = "20170721";
src = fetchFromGitHub {
owner = "mooz";
repo = "js2-mode";
- rev = "03c679eb9914d58d7d9b7afc2036c482a9a01236";
- sha256 = "1kgmljgh71f2sljdsr134jrj1i6kgj9bwyh4pl1lrz0v4ahwgd6g";
+ rev = "cb57d9b67390ae3ff70ab64169bbc4f1264244bc";
+ sha256 = "0z7ya533ap6lm5qwfsbhn1k4jh1k1p5xyk5r27wd40rfzvd2x2gy";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode";
@@ -20231,22 +20473,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;
@@ -20612,12 +20854,12 @@
kill-or-bury-alive = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "kill-or-bury-alive";
- version = "0.1.2";
+ version = "0.1.3";
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "kill-or-bury-alive";
- rev = "b488c3dbba657bbd524402f48fde16ab6b1211db";
- sha256 = "1c5al7cyfnb0p5ya2aa5afadzbrrc079jx3r6zpkr64psskrhdv5";
+ rev = "51daf55565034b8cb6aa3ca2aa0a827e31751041";
+ sha256 = "1qbdxjni1brhsw6m4cvd2jjaf3y8v3fkbxxf0pvsb089mkpi7mpq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/25016ed09b6333bd79b989a8f6b7b03cd92e08b3/recipes/kill-or-bury-alive";
@@ -20738,12 +20980,12 @@
ksp-cfg-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ksp-cfg-mode";
- version = "0.4";
+ version = "0.5";
src = fetchFromGitHub {
owner = "lashtear";
repo = "ksp-cfg-mode";
- rev = "07a957512e66030e1b9f8ac0f259051386acb5b5";
- sha256 = "1kbmlhfxbp704mky8v69lzqd20bbnqijfnv110yigsy3kxi7hdrr";
+ rev = "713a22ee28688e581ec3ad60228c853b516a14b6";
+ sha256 = "04r8mfsc349wdhx1brlf2l54v4dn58y69fqv3glhvml12962lwy3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d49db5938fa4e3ab1176a955a4788b15c63d9e69/recipes/ksp-cfg-mode";
@@ -20864,12 +21106,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";
@@ -21393,6 +21635,47 @@
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";
+ version = "0.7";
+ src = fetchhg {
+ url = "https://bitbucket.com/inigoserna/lms.el";
+ rev = "f07ac3678e27";
+ sha256 = "15l3nfrddblfzqxgvf0dmmsk4h5l80l6r2kgxcfk8s01msjka3sl";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/b8be8497494b8543a8257c9ea92444baf7674951/recipes/lms";
+ sha256 = "1ckrh6qbh5y2y3yzl2iyq8nqlpy4qp6vzc72ijcgayvcflb01vr1";
+ name = "lms";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/lms";
+ license = lib.licenses.free;
+ };
+ }) {};
load-relative = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "load-relative";
@@ -21540,22 +21823,22 @@
license = lib.licenses.free;
};
}) {};
- love-minor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ love-minor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, lua-mode, melpaBuild }:
melpaBuild {
pname = "love-minor-mode";
- version = "1.1";
+ version = "1.2";
src = fetchFromGitHub {
owner = "ejmr";
repo = "love-minor-mode";
- rev = "1634ff3a8b657c63a5cffd9a937812a289f2c954";
- sha256 = "11y5jyq4xg9zlm1qi2y97nh05vhva9pai9yyr4x2pr41xz3s8fpk";
+ rev = "3ca8f3405338f2d6f4fbcdd5e89342a46378543a";
+ sha256 = "1hwm7yxbwvb27pa35cgcxyjfjdjhk2a33i417q2akc7vppdbcmzh";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0f224c4c7519b3668b1270c957227e486896b7b6/recipes/love-minor-mode";
sha256 = "1skg039h2hn8dh47ww6n9l776s2yda8ariab4v9f56kb21bncr4m";
name = "love-minor-mode";
};
- packageRequires = [];
+ packageRequires = [ lua-mode ];
meta = {
homepage = "https://melpa.org/#/love-minor-mode";
license = lib.licenses.free;
@@ -21603,6 +21886,27 @@
license = lib.licenses.free;
};
}) {};
+ mac-pseudo-daemon = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "mac-pseudo-daemon";
+ version = "2.1";
+ src = fetchFromGitHub {
+ owner = "DarwinAwardWinner";
+ repo = "mac-pseudo-daemon";
+ rev = "4d10e327cd8ee5bb7f006d68744be21c7097c1fc";
+ sha256 = "0rjdjddlkaps9cfyc23kcr3cdh08c12jfgkz7ca2j141mm89pyp2";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/mac-pseudo-daemon";
+ sha256 = "12fwrcnwzsfms42rzv4wif5yzx3gnsz8yzdcgkpl37kkx85iy8v0";
+ name = "mac-pseudo-daemon";
+ };
+ packageRequires = [ cl-lib ];
+ meta = {
+ homepage = "https://melpa.org/#/mac-pseudo-daemon";
+ license = lib.licenses.free;
+ };
+ }) {};
macro-math = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "macro-math";
@@ -21650,14 +21954,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 ];
@@ -21669,12 +21973,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";
@@ -21820,15 +22124,36 @@
license = lib.licenses.free;
};
}) {};
+ magit-imerge = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
+ melpaBuild {
+ pname = "magit-imerge";
+ version = "0.2.0";
+ src = fetchFromGitHub {
+ owner = "magit";
+ repo = "magit-imerge";
+ rev = "1cd0fa843095f4ce8aa4eae89476c116414d060c";
+ sha256 = "1h9m0miiv44az4bigg5gjgkpdgdy4hh114kavzjgjhmw5zsg6qfg";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e78a5c27eedfc9b1d79e37e8d333c5d253f31a3c/recipes/magit-imerge";
+ sha256 = "0rycmbsi2s7rjqfpcv794vhkybav7d8ikzdaxai36szxpg9pzhj4";
+ name = "magit-imerge";
+ };
+ packageRequires = [ emacs magit ];
+ meta = {
+ homepage = "https://melpa.org/#/magit-imerge";
+ license = lib.licenses.free;
+ };
+ }) {};
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";
@@ -21844,12 +22169,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";
@@ -21946,22 +22271,22 @@
license = lib.licenses.free;
};
}) {};
- magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit, melpaBuild, s, with-editor }:
+ magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub-plus, lib, magit, melpaBuild, s }:
melpaBuild {
pname = "magithub";
- version = "0.1.2";
+ version = "0.1.3";
src = fetchFromGitHub {
owner = "vermiculus";
repo = "magithub";
- rev = "283bde94b3fe5cd8f4634887812c58eaf55aef60";
- sha256 = "0nd9q3x60pydigyrp7b00xgnw7pgb0plh6mry7pj1532z3xxz1d7";
+ rev = "959e7b259697c79ccf46b95827575d3e15e83d30";
+ sha256 = "19m7qmp5pi5l3mak1j475qxgnpr4kc4dm7qj80qc4m844bkacc4h";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/magithub";
sha256 = "11par5rncsa866gazdw98d4902rvyjnnwbiwpndlyh06ak0lryab";
name = "magithub";
};
- packageRequires = [ emacs git-commit magit s with-editor ];
+ packageRequires = [ emacs ghub-plus magit s ];
meta = {
homepage = "https://melpa.org/#/magithub";
license = lib.licenses.free;
@@ -22138,12 +22463,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";
@@ -22180,12 +22505,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";
@@ -22439,12 +22764,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";
@@ -22481,12 +22806,12 @@
meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
melpaBuild {
pname = "meghanada";
- version = "0.8.2";
+ version = "0.8.3";
src = fetchFromGitHub {
owner = "mopemope";
repo = "meghanada-emacs";
- rev = "b507fc0e6fa4b6f1b05c46ecf563ad0af69e263a";
- sha256 = "0kiib5wchqhxm8rsxp3mfp3zdbgg57gbn8y70j5msa2sxdz26mm7";
+ rev = "af65a0c60bbdda051e0d8ab0b7213249eb6703c5";
+ sha256 = "08sxy81arypdj22bp6pdniwxxbhakay4ndvyvl7a6vjvn38ppzw8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
@@ -22520,6 +22845,27 @@
license = lib.licenses.free;
};
}) {};
+ memoize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "memoize";
+ version = "1.1";
+ src = fetchFromGitHub {
+ owner = "skeeto";
+ repo = "emacs-memoize";
+ rev = "636defefa9168f90bce6fc27431352ac7d01a890";
+ sha256 = "04qgnlg4x6va7x364dhj1wbjmz8p5iq2vk36mn9198k2vxmijwzk";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/6cc9be5bbcff04de5e6d3bb8c47d202fd350989b/recipes/memoize";
+ sha256 = "0mzz3hghnbkmxf9wgjqv3sbyxyqqzvvscazq9ybb0b41qrzm73s6";
+ name = "memoize";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/memoize";
+ license = lib.licenses.free;
+ };
+ }) {};
mentor = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, seq, xml-rpc }:
melpaBuild {
pname = "mentor";
@@ -22544,12 +22890,12 @@
merlin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "merlin";
- version = "2.5.5";
+ version = "3.0.2";
src = fetchFromGitHub {
owner = "the-lambda-church";
repo = "merlin";
- rev = "957e551140587f0cd83d9186a06fba10a38c6084";
- sha256 = "1df6cx7y5i35cmfi5c4b48iys21cszrvlh039cdbkmy6d0pdbvi7";
+ rev = "b53e4beeeb8da6d7cb035990a7e805fea5da0de6";
+ sha256 = "1lw0s78zwr8rd4q4pg34m9q8yd5swh1fff3c5p992a2qlzfb0hax";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b1b9bfd3164e62758dc0a3362d85c6627ed7cbf8/recipes/merlin";
@@ -22646,27 +22992,6 @@
license = lib.licenses.free;
};
}) {};
- mic-paren = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
- melpaBuild {
- pname = "mic-paren";
- version = "3.10";
- src = fetchFromGitHub {
- owner = "emacsmirror";
- repo = "mic-paren";
- rev = "e4cf6e1a0ee91e849a9d42ecdcd6ed0287f8a521";
- sha256 = "1cdjpqrsv2vhpdmv67krsds7wz19z9ajkabawr3yhxqii4myl4ik";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/mic-paren";
- sha256 = "042dzp0nal18nxq94qlwwksh0nnypsyc0yykmc6l3kayp9pv4hw7";
- name = "mic-paren";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/mic-paren";
- license = lib.licenses.free;
- };
- }) {};
migemo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "migemo";
@@ -23194,12 +23519,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";
@@ -23929,12 +24254,12 @@
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";
@@ -23968,22 +24293,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.12";
+ version = "1.2.1";
src = fetchFromGitHub {
owner = "NixOS";
- repo = "nix";
- rev = "04e071a5e4cdf7f5396a0e36874e0a023b7af232";
- sha256 = "1hzp70sm4bwlbqnd7mmzan10wsgb03a1zfiqmwxnc61jgjxd5jva";
+ 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/4c885d9d9f1a37f05c715f89fae51efb580faced/recipes/nix-mode";
+ sha256 = "15xgqgrkypcplnfvl5j6w8abayzz8q0nw2wav01sdyx39ym005k3";
name = "nix-mode";
};
- packageRequires = [];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/nix-mode";
license = lib.licenses.free;
@@ -24013,16 +24338,16 @@
no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "no-littering";
- version = "0.5.9";
+ version = "0.5.10";
src = fetchFromGitHub {
- owner = "tarsius";
+ owner = "emacscollective";
repo = "no-littering";
- rev = "8b689a1e16d4825d0221f4a41756b63bbc361c82";
- sha256 = "02cb5m1r5k1f6il79yv8fa5yiyz2m37awlbjjxmkv1av06kl0abn";
+ rev = "227c2d175e95dbed6a5c6e37b12bb9a3fcf2de94";
+ sha256 = "1wgfcghzhsa0siz1vf3rq69h1ilyblj5rsmijnyymp9fhxgyyll6";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering";
- sha256 = "129nyml8jx3nwdskcr2favbi3x6f74dblc6yw8vijw32w8z14k2l";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/no-littering";
+ sha256 = "15w784ir48v8biiaar8ip19s9y3wn5831m815kcw02mgzy3bfjmh";
name = "no-littering";
};
packageRequires = [ cl-lib ];
@@ -24055,12 +24380,12 @@
nodejs-repl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "nodejs-repl";
- version = "0.1.1";
+ version = "0.1.6";
src = fetchFromGitHub {
owner = "abicky";
repo = "nodejs-repl.el";
- rev = "d821ef49a8eae0e405fd2a000246f0475542a575";
- sha256 = "1fwz6wpair617p9l2wdx923zpbbklfcdrygsryjx5gpnnm649mmy";
+ rev = "16770656a4072f8fbbd29d0cace4893a3d5541b1";
+ sha256 = "1hcvi4nhgfrjalq8nw20kjjpcf4xmjid70qpqdv8dsgfann5i3wl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/14f22f97416111fcb02e299ff2b20c44fb75f049/recipes/nodejs-repl";
@@ -24115,11 +24440,11 @@
}) {};
notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
pname = "notmuch";
- version = "0.25pre0";
+ version = "0.25.1";
src = fetchgit {
url = "git://git.notmuchmail.org/git/notmuch";
- rev = "952a0f0cda7d1a12432d1c9ad71b41401cb1615c";
- sha256 = "1mj3946sg2lxamcz16jkys88scx1fyhky3amwxnl5iszd15lhvxz";
+ rev = "949c27144e0b9294267511993a109c29d319a23d";
+ sha256 = "088f6f5696v8zrgbipshns6gla4zmfpj8n4jm66slgip9fcrbpvb";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
@@ -24153,6 +24478,27 @@
license = lib.licenses.free;
};
}) {};
+ nov = callPackage ({ dash, emacs, esxml, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "nov";
+ version = "0.1.7";
+ src = fetchFromGitHub {
+ owner = "wasamasa";
+ repo = "nov.el";
+ rev = "91c4329f64ddc9a598fa6c58e1d9264aee073e72";
+ sha256 = "0x3ijjhjg2q8gdqf4hgr2d8wy32qhxy48kbz0slibkn9yik3pvlz";
+ };
+ 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";
@@ -24321,27 +24667,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";
@@ -24366,12 +24691,12 @@
ob-blockdiag = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ob-blockdiag";
- version = "20170501.112";
+ version = "20170728.113";
src = fetchFromGitHub {
owner = "corpix";
repo = "ob-blockdiag.el";
- rev = "e6532af46dcea8e79f3ad3cb2863cbbe516efbf6";
- sha256 = "059jcl1qpfxwsykbj1sf7r1fpg7wix4fbdhhghrhbhgf5w165hsv";
+ rev = "634fcf64a4ae735afe7001d865b03f5d71e23046";
+ sha256 = "0xr3bv4wxz13b1grfyl2qnrszzab3n9735za837nf4lxh527ksaj";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/261b77a3fd07644d1c250b16857de70cc1bbf478/recipes/ob-blockdiag";
@@ -24534,12 +24859,12 @@
obfusurl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "obfusurl";
- version = "2.0";
+ version = "2.1";
src = fetchFromGitHub {
owner = "davep";
repo = "obfusurl.el";
- rev = "fb7524fe8432bf58f0c4f637e5a12565ae81134e";
- sha256 = "15w8cnwl4hpcslfbmb3j81gbr2dvp0xra2z841503b26s5w91961";
+ rev = "7a5a41905000ce2ec1fd72509a5567e5fd9f47e5";
+ sha256 = "0jbrxlpx0cxg8jzqrssk3y3ab7v62ymi6ys24542a8vpk522vqxk";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/201fe11682cb06b26775a52c81b6a1258b74b4d0/recipes/obfusurl";
@@ -24576,12 +24901,12 @@
ocp-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ocp-indent";
- version = "1.6.0";
+ version = "1.6.1";
src = fetchFromGitHub {
owner = "OCamlPro";
repo = "ocp-indent";
- rev = "032599b162624a4b65c82c20be06433f24b00e8f";
- sha256 = "1h9y597s3ag8w1z32zzv4dfk3ppq557s55bnlfw5a5wqwvia911f";
+ rev = "5d83bc71d12c89850cb0fdff50d4830adb705b6c";
+ sha256 = "0rcaa11mjqka032g94wgw9llqpflyk3ywr3lr6jyxbh1rjvnipnw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e1af061328b15360ed25a232cc6b8fbce4a7b098/recipes/ocp-indent";
@@ -24639,12 +24964,12 @@
olivetti = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "olivetti";
- version = "1.5.6";
+ version = "1.5.7";
src = fetchFromGitHub {
owner = "rnkn";
repo = "olivetti";
- rev = "de2716cfb1f4dc82a08093cdd00200e9bb1f07ef";
- sha256 = "0gfjrfhmjvq2zkyp0bgxymdv6r7p4x40aicvv1r61z29nz4dbyn2";
+ rev = "e5153850ab626699109d93ab0afb6e3aea48f8b8";
+ sha256 = "1bg1j8wi8smsbf4qmpcy3j3ihkg3gpnxa5bqgysbj7j9n11rjgl4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/697334ca3cdb9630572ae267811bd5c2a67d2a95/recipes/olivetti";
@@ -24765,12 +25090,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 = "4.0";
+ version = "4.1";
src = fetchFromGitHub {
owner = "OmniSharp";
repo = "omnisharp-emacs";
- rev = "ab4c6bb04cda35510fe751e546b5c0bb4dc3371d";
- sha256 = "0zkd5hp5xk0wjlv6nqi38dnhrzk7jzcd8546wqfw0my10kb1ycs2";
+ rev = "b425270bed93b427ff519d6f51ad1d97531a0a92";
+ sha256 = "0l9dk9idfsr21q0icx9fpgqyi4qlhnqal6sypak5zh8dgchrqif9";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp";
@@ -25088,6 +25413,48 @@
license = lib.licenses.free;
};
}) {};
+ org-category-capture = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+ melpaBuild {
+ pname = "org-category-capture";
+ version = "1.1.0";
+ src = fetchFromGitHub {
+ owner = "IvanMalison";
+ repo = "org-projectile";
+ rev = "48f621b595e748c5e03431f237facf258ffc9443";
+ sha256 = "00n2msmwcjjiibrhrvpawzgz6qcjjfy9qnii1iaass0038g4bd89";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/6760daac1ef9d9d7ba07e2fc9668873020f901f1/recipes/org-category-capture";
+ sha256 = "0l5n71h9lc8q9k0sb5ghzwb81lah4l1ykc06shfl9zw5lqqvahav";
+ name = "org-category-capture";
+ };
+ packageRequires = [ emacs org ];
+ meta = {
+ homepage = "https://melpa.org/#/org-category-capture";
+ 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";
@@ -25151,22 +25518,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;
@@ -25381,6 +25748,27 @@
license = lib.licenses.free;
};
}) {};
+ org-mru-clock = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "org-mru-clock";
+ version = "0.1.1";
+ src = fetchFromGitHub {
+ owner = "unhammer";
+ repo = "org-mru-clock";
+ rev = "096a7c514ab8487ec63def6281cf4dce24e3a626";
+ sha256 = "1hmyqvi1dj5yrlish8kw4sdh3yy0b0w33smw4cbjagp4rs29p3fp";
+ };
+ 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";
@@ -25506,27 +25894,48 @@
license = lib.licenses.free;
};
}) {};
- org-projectile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
+ org-projectile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org-category-capture, projectile, s }:
melpaBuild {
pname = "org-projectile";
- version = "0.2.6";
+ version = "1.1.0";
src = fetchFromGitHub {
owner = "IvanMalison";
repo = "org-projectile";
- rev = "e2b78ca7fbd2e3b873d3ab9bb7196be4d7613f92";
- sha256 = "03zy2bb1ha22xpx29d8610yrqfyaiaa8vgplpx6bmixaw85mcv58";
+ rev = "48f621b595e748c5e03431f237facf258ffc9443";
+ sha256 = "00n2msmwcjjiibrhrvpawzgz6qcjjfy9qnii1iaass0038g4bd89";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org-projectile";
- sha256 = "1kkgi49bvdwz50x32lqdj2ii02mxv8i4dr1asr8zk6mdg0fwlqpf";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/9d7a7ab98f364d3d5e93f83f0cb3d80a95f28689/recipes/org-projectile";
+ sha256 = "0xdkd5pkyi6yfqi4przgp5mpklyxfxv0cww285zdlh00rzl935cw";
name = "org-projectile";
};
- packageRequires = [ dash emacs projectile ];
+ packageRequires = [ dash emacs org-category-capture projectile s ];
meta = {
homepage = "https://melpa.org/#/org-projectile";
license = lib.licenses.free;
};
}) {};
+ org-projectile-helm = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, org-projectile }:
+ melpaBuild {
+ pname = "org-projectile-helm";
+ version = "1.1.0";
+ src = fetchFromGitHub {
+ owner = "IvanMalison";
+ repo = "org-projectile";
+ rev = "48f621b595e748c5e03431f237facf258ffc9443";
+ sha256 = "00n2msmwcjjiibrhrvpawzgz6qcjjfy9qnii1iaass0038g4bd89";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/6760daac1ef9d9d7ba07e2fc9668873020f901f1/recipes/org-projectile-helm";
+ sha256 = "0x79j5yr9wsgzjf1dpp7d4xiji8hgyhr79vb973an5z2r02vnaf4";
+ name = "org-projectile-helm";
+ };
+ packageRequires = [ emacs helm org-projectile ];
+ meta = {
+ homepage = "https://melpa.org/#/org-projectile-helm";
+ license = lib.licenses.free;
+ };
+ }) {};
org-protocol-jekyll = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "org-protocol-jekyll";
@@ -25982,12 +26391,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";
@@ -26147,6 +26556,27 @@
license = lib.licenses.free;
};
}) {};
+ osx-pseudo-daemon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "osx-pseudo-daemon";
+ version = "2.1";
+ src = fetchFromGitHub {
+ owner = "DarwinAwardWinner";
+ repo = "mac-pseudo-daemon";
+ rev = "4d10e327cd8ee5bb7f006d68744be21c7097c1fc";
+ sha256 = "0rjdjddlkaps9cfyc23kcr3cdh08c12jfgkz7ca2j141mm89pyp2";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/osx-pseudo-daemon";
+ sha256 = "1sch7bb8hl96fji2ayw2ah5cjgsga08wj44vddjxskyway8ykf0z";
+ name = "osx-pseudo-daemon";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/osx-pseudo-daemon";
+ license = lib.licenses.free;
+ };
+ }) {};
osx-trash = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "osx-trash";
@@ -26294,6 +26724,27 @@
license = lib.licenses.free;
};
}) {};
+ ox-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+ melpaBuild {
+ pname = "ox-hugo";
+ version = "0.1.2";
+ src = fetchFromGitHub {
+ owner = "kaushalmodi";
+ repo = "ox-hugo";
+ rev = "a486141e4e2c3f9f67e799e20af150611d77f850";
+ sha256 = "1srrkc0bajmhp614avk4yr51zsp0gnmn47r1wi7qxkr6ybxwx8k1";
+ };
+ 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";
@@ -26326,7 +26777,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";
};
@@ -26381,12 +26832,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";
@@ -26483,22 +26934,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 = "tarsius";
+ owner = "emacscollective";
repo = "packed";
- rev = "536f4a3bda06cc09759fed1aa0cdebb068ff75a1";
- sha256 = "1ayizqkhxjd3rv3chnl51sl12gsfhxcqqnz0p6r0xbwglx4n3vzi";
+ rev = "94ea12b9d44bfa42c28d0548199f2fcd19e4aa6a";
+ sha256 = "1n80y5pqaibix71fnw3cxmq66frmqfji2b2y170jszmrxi03kwxm";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/1ee9e95c00f791010f77720068a7f3cd76133a1c/recipes/packed";
- sha256 = "0sw7d2l17bq471i4isrf2xf0z85nqqiciw25whw0c0chdzwzai6z";
+ 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;
@@ -26570,12 +27021,12 @@
pandoc-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }:
melpaBuild {
pname = "pandoc-mode";
- version = "2.22";
+ version = "2.23";
src = fetchFromGitHub {
owner = "joostkremers";
repo = "pandoc-mode";
- rev = "b4e03ab345043fa7447dd59e59234dd33395e3cc";
- sha256 = "08yxi878l1hibcsq0bb93g2rjwlc0xw415rgn1rzs3zib2hqj1qc";
+ rev = "58f893d54c0916ad832097a579288ef8ce405da5";
+ sha256 = "03nh5ivcwknnsw9khz196n6s3pa1392jk7pm2mr4yjjs24izyz1i";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/pandoc-mode";
@@ -26864,13 +27315,13 @@
pname = "password-store";
version = "1.7.1";
src = fetchgit {
- url = "http://git.zx2c4.com/password-store";
+ url = "https://git.zx2c4.com/password-store";
rev = "38ec1c72e29c872ec0cdde82f75490640d4019bf";
sha256 = "04rqph353qfhnrwji6fmvrbk4yag8brqpbpaysq5z0c9l4p9ci87";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/e204fb4d672220ee1a4a49975fd3999916e60f8c/recipes/password-store";
- sha256 = "1jh24737l4hccr1k0b9fnq45ag2dsk84fnfs86hcgsadl94d6kss";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/ceff76206bd44d92c00adc931236c4ae15db5583/recipes/password-store";
+ sha256 = "06l4xlvrjswy5kndn6h6swliqcp007nh4fyvma3jaac4f3x2qi65";
name = "password-store";
};
packageRequires = [ f s ];
@@ -26879,6 +27330,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.3";
+ src = fetchFromGitHub {
+ owner = "volrath";
+ repo = "password-store-otp.el";
+ rev = "2965da7d8edd32bd4ef62f487ea6bcd08c599c89";
+ sha256 = "1svm6rlh4f0rjcl0fjy3x4bfakdn9npi8w7ak217ad2k08j44bzd";
+ };
+ 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";
@@ -27071,12 +27543,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";
@@ -27110,6 +27582,26 @@
license = lib.licenses.free;
};
}) {};
+ pelican-mode = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "pelican-mode";
+ version = "20170808";
+ src = fetchgit {
+ url = "https://git.korewanetadesu.com/pelican-mode.git";
+ rev = "8b13c30c4ec38dd535eadf26e463f8616d5c089c";
+ sha256 = "0rghcyp09ga95ag0pjbk4hdxxlsnr93dr6706z0xvfgmninbn5aw";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/aede5994c2e76c7fd860661c1e3252fb741f9228/recipes/pelican-mode";
+ sha256 = "0z6w5j3qwb58pndqbmpsvy1l77w9jv90bss9qq9hicil8nlk4pvi";
+ name = "pelican-mode";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/pelican-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
per-buffer-theme = callPackage ({ cl-lib ? null, fetchhg, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "per-buffer-theme";
@@ -27172,6 +27664,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";
@@ -27303,14 +27816,14 @@
pname = "phan";
version = "0.0.2";
src = fetchFromGitHub {
- owner = "zonuexe";
+ owner = "emacs-php";
repo = "phan.el";
rev = "4e3528f490e77d3aa6d81729b30b569434ef679f";
sha256 = "1aif1hshwpzi353k2gcpwk9s76jlmz3s5dyf357qfv14b5ddhw6l";
};
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 ];
@@ -27634,22 +28147,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;
@@ -28285,12 +28798,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";
@@ -28350,14 +28863,14 @@
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 ];
@@ -28432,12 +28945,12 @@
protobuf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "protobuf-mode";
- version = "3.3.2";
+ version = "3.4.0";
src = fetchFromGitHub {
owner = "google";
repo = "protobuf";
- rev = "5532abc15b97f3489183b266b41844306052a3fa";
- sha256 = "1a2s66i3ampwa0yc2mj3b743hcryixqhk1vvskzgyzvglv048cn4";
+ rev = "80a37e0782d2d702d52234b62dd4b9ec74fd2c95";
+ sha256 = "0385j54kgr71h0cxh5vqr81qs57ack2g2k9mcdbq188v4ckjacyx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -28476,14 +28989,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 ];
@@ -28518,14 +29031,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 ];
@@ -28555,22 +29068,22 @@
license = lib.licenses.free;
};
}) {};
- pug-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ pug-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "pug-mode";
- version = "1.0.4";
+ version = "1.0.5";
src = fetchFromGitHub {
owner = "hlissner";
repo = "emacs-pug-mode";
- rev = "bff32a818ccc9e400210b942bd5e67fa21551148";
- sha256 = "1ad5n8v40acj17qficbzrnixbmg5wplmbd8h1z9hdxhbrkwy5323";
+ rev = "2f22d9c2e3ebb0230cee8836c5f5186e05a038dd";
+ sha256 = "1fvq1vx7sg3dqc9zcqbsp0iq1y7c2cjag0ng3snssyj0qh8q6ib1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b3710aac9f3df3a23238af1f969c462b3692f260/recipes/pug-mode";
sha256 = "1njhr95y2rx7inpl9phxxz580844p2iadqlga1kj7xzvjz698x85";
name = "pug-mode";
};
- packageRequires = [ cl-lib ];
+ packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/pug-mode";
license = lib.licenses.free;
@@ -28807,6 +29320,69 @@
license = lib.licenses.free;
};
}) {};
+ pyim = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, pyim-basedict }:
+ melpaBuild {
+ pname = "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/pyim";
+ sha256 = "1ly4xhfr3irlrwvv20j3kyz98g7barridi9n8jppc0brh2dlv98j";
+ name = "pyim";
+ };
+ packageRequires = [ async cl-lib emacs popup pos-tip pyim-basedict ];
+ meta = {
+ homepage = "https://melpa.org/#/pyim";
+ license = lib.licenses.free;
+ };
+ }) {};
+ pyim-basedict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "pyim-basedict";
+ version = "0.2";
+ src = fetchFromGitHub {
+ owner = "tumashu";
+ repo = "pyim-basedict";
+ rev = "f71d0ffd9d2421f2b51cd0ccb89fd9eb43c09585";
+ sha256 = "0576r8ap9gp91ycjf1d47pn13kxp0f9fysn09zlq44hr0s1y2y5d";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/pyim-basedict";
+ sha256 = "1y8cmccli3im5bvws2h582z7k4nj6p8brgypl8h09y3na6yjy2z9";
+ name = "pyim-basedict";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/pyim-basedict";
+ license = lib.licenses.free;
+ };
+ }) {};
+ pyim-wbdict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pyim }:
+ melpaBuild {
+ pname = "pyim-wbdict";
+ version = "0.1";
+ src = fetchFromGitHub {
+ owner = "tumashu";
+ repo = "pyim-wbdict";
+ rev = "114489ed97e825ae11a8d09da6e873820cf23106";
+ sha256 = "187wx418pj4h8p8baf4943v9dsb6mfbn0n19r8xiil1z2cmm4ygc";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/ab1cb8bc623d1f12f78fa42ce8b16514e5b07c51/recipes/pyim-wbdict";
+ sha256 = "1s0i9xcnpy8kxqhsv7rqxabv5vnxsciyng398mn32mknib03315i";
+ name = "pyim-wbdict";
+ };
+ packageRequires = [ pyim ];
+ meta = {
+ homepage = "https://melpa.org/#/pyim-wbdict";
+ license = lib.licenses.free;
+ };
+ }) {};
pyimport = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild {
pname = "pyimport";
@@ -29038,6 +29614,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";
@@ -29332,6 +29929,27 @@
license = lib.licenses.free;
};
}) {};
+ react-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
+ melpaBuild {
+ pname = "react-snippets";
+ version = "0.1";
+ src = fetchFromGitHub {
+ owner = "johnmastro";
+ repo = "react-snippets.el";
+ rev = "bfc4b68b81374a6a080240592641091a7e8a6d61";
+ sha256 = "1wna4v8l3j0ppjv4nj72lhp0yh6vbka6bvl1paqqfvay300kiqjb";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/3720192fdfa45f9b83259ab39356f469c5ac85b4/recipes/react-snippets";
+ sha256 = "0chs0h41nb2fdz02hdsaynz7ma8fg66a8m1q1np0464skrsdaj73";
+ name = "react-snippets";
+ };
+ packageRequires = [ yasnippet ];
+ meta = {
+ homepage = "https://melpa.org/#/react-snippets";
+ license = lib.licenses.free;
+ };
+ }) {};
real-auto-save = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "real-auto-save";
@@ -29647,6 +30265,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";
@@ -29860,12 +30499,12 @@
rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }:
melpaBuild {
pname = "rg";
- version = "1.3.0";
+ version = "1.3.1";
src = fetchFromGitHub {
owner = "dajva";
repo = "rg.el";
- rev = "09a5919d8982cfdb8496f0db7deccfb510a7f000";
- sha256 = "1jvinpid3w4p6s4ni0fhg4g8xc3m0c7rd3db2al214xfcn4mbbgr";
+ rev = "081685a8c624220ece68d6dca8d60016585b04ff";
+ sha256 = "094fy48h0mmih3g9dq7xhhdqq3dx3jbrg1x9qcq2szl3danndl6z";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg";
@@ -29878,6 +30517,27 @@
license = lib.licenses.free;
};
}) {};
+ rib-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "rib-mode";
+ version = "1.0.2";
+ src = fetchFromGitHub {
+ owner = "blezek";
+ repo = "rib-mode";
+ rev = "4172e902fd66f235184c0eb6db7fd4a73dbd0866";
+ sha256 = "0s9dyqv4yh0zxngay951g98g07029h51m4r2fc7ib2arw6srfram";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/c38c18f3eb75d559752fcd9956464fef890be728/recipes/rib-mode";
+ sha256 = "0qgbzrwbbgg4mzjb7yw85qs83b6hpldazip1cigywr46w7f81587";
+ name = "rib-mode";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/rib-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
rich-minority = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rich-minority";
@@ -29965,12 +30625,12 @@
rjsx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
melpaBuild {
pname = "rjsx-mode";
- version = "0.1.4";
+ version = "0.2.0";
src = fetchFromGitHub {
owner = "felipeochoa";
repo = "rjsx-mode";
- rev = "b41de6c1b2f6668b674f8e5bf880f697c9ffb749";
- sha256 = "1irc26kg5f22x3g48pmb1mwchivwyn41khphpgwqfjnvasz1idw9";
+ rev = "4a24c86a1873289538134fe431e544fa3e12e788";
+ sha256 = "0yv622nnbcjnnaki49f7cz8cvrg13d0h9higadp83bl1lczhgw8j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b83be7efdef2457e1320fe3dec46484fbd20263c/recipes/rjsx-mode";
@@ -30009,14 +30669,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 = [];
@@ -30112,12 +30772,12 @@
rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "rtags";
- version = "2.10";
+ version = "2.14";
src = fetchFromGitHub {
owner = "Andersbakken";
repo = "rtags";
- rev = "3b3ace901f53827daef81d4c13658ec4feb318b4";
- sha256 = "1lm0s1918zsnd4hmfzf3xfrd68ip2zjnr9ciyf4bwpd66y0zfrbk";
+ rev = "15ef9a8bab847773d6e247005be929422fc9c285";
+ sha256 = "0yq3c4ich0sffzd571drb7k4vs0bvblx6qcrb6zry75d9npggsyg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags";
@@ -30172,6 +30832,27 @@
license = lib.licenses.free;
};
}) {};
+ ruby-electric = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "ruby-electric";
+ version = "2.3.1";
+ src = fetchFromGitHub {
+ owner = "knu";
+ repo = "ruby-electric.el";
+ rev = "3553448a780a1ea5c3b0e9becd820d4762876593";
+ sha256 = "0h47lfgxjcyyl8gb1w7l8j8h65s3lp1hsq742sl7a1gf5y6bbm3v";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/5fd5fa797a813e02a6433ecbe2bca1270a383753/recipes/ruby-electric";
+ sha256 = "02xskivi917l8xyhrij084dmzwjq3knjcn65l2iwz34s767fbwl2";
+ name = "ruby-electric";
+ };
+ packageRequires = [];
+ meta = {
+ homepage = "https://melpa.org/#/ruby-electric";
+ license = lib.licenses.free;
+ };
+ }) {};
ruby-end = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ruby-end";
@@ -30578,8 +31259,8 @@
src = fetchFromGitHub {
owner = "ensime";
repo = "emacs-scala-mode";
- rev = "6f49104c182ec1cc8b30314dc92d02f4752106cf";
- sha256 = "0ahhhsg095rixiy9j49854mmrkd92vvmqnms0f6msrl4jgdf6vpw";
+ rev = "56cba2903cf6e12c715dbb5c99b34c97b2679379";
+ sha256 = "13miqdn426cw9y1wqaz5smmf0wi3bzls95z6shcxzdz8cg50zmpg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/564aa1637485192a97803af46b3a1f8e0d042c9a/recipes/scala-mode";
@@ -30678,11 +31359,11 @@
secretaria = callPackage ({ alert, emacs, f, fetchgit, fetchurl, lib, melpaBuild, org, s }:
melpaBuild {
pname = "secretaria";
- version = "0.2.4";
+ version = "0.2.7";
src = fetchgit {
url = "https://bitbucket.org/shackra/secretaria.el";
- rev = "aae30bfc93fa5ea846bce086b22321c46b94ff7b";
- sha256 = "18ad7q2a131gpvjj8923vp06zh0zfdy1589vs3f09v16aazbcfqc";
+ rev = "1cd32d957864be1ba5c44a3f505f662832169a28";
+ sha256 = "1xvwzmcfwfxsm9chbjnqjsipmv5pqpzk5d0ybw3rcdc47nag3jdg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7b4c9ccbf2eeaa290f3b9d1e5eaaeb5b5547b365/recipes/secretaria";
@@ -30698,12 +31379,12 @@
sekka = callPackage ({ cl-lib ? null, concurrent, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
melpaBuild {
pname = "sekka";
- version = "1.6.6";
+ version = "1.8.0";
src = fetchFromGitHub {
owner = "kiyoka";
repo = "sekka";
- rev = "987c1cce65c8f30b12cdb5991e1b1ad9da766916";
- sha256 = "03930cfqq97f7m6z9da2y9388iyymc56b1vdrl5a6mpggv3wifn7";
+ rev = "d1fd5d47aacba723631d5d374169a45ff2051c41";
+ sha256 = "035rx863cj3hs1lhayff0810cpp6kv8nwc1c0y54gvdk1bb333x0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/350bbb5761b5ba69aeb4acf6d7cdf2256dba95a6/recipes/sekka";
@@ -30758,27 +31439,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";
@@ -31202,12 +31862,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";
@@ -31220,6 +31880,27 @@
license = lib.licenses.free;
};
}) {};
+ shrink-path = callPackage ({ dash, f, fetchFromGitLab, fetchurl, lib, melpaBuild, s }:
+ melpaBuild {
+ pname = "shrink-path";
+ version = "0.3.1";
+ src = fetchFromGitLab {
+ owner = "bennya";
+ repo = "shrink-path.el";
+ rev = "9b8cfb59a2dcee8b39b680ab9adad5ecb1f53c0b";
+ sha256 = "0kx0c4syd7k6ff9j463bib32pz4wq0rzjlg6b0yqnymlzfr1mbki";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/86b0d105e8a57d5f0bcde779441dc80b85e170ea/recipes/shrink-path";
+ sha256 = "0fq13c6g7qbq6f2ry9dzdyg1f6p41wimkjcdaj177rnilz77alzb";
+ name = "shrink-path";
+ };
+ packageRequires = [ dash f s ];
+ meta = {
+ homepage = "https://melpa.org/#/shrink-path";
+ license = lib.licenses.free;
+ };
+ }) {};
shrink-whitespace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "shrink-whitespace";
@@ -31265,12 +31946,12 @@
shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "shx";
- version = "0.0.8";
+ version = "0.0.9";
src = fetchFromGitHub {
owner = "riscy";
repo = "shx-for-emacs";
- rev = "fc98dd68f1562cf9c10a0245274c24f280f59da2";
- sha256 = "16d2l0vfrsv878w908mfi0m0raab96zxi4559a1589y7lzah2nrd";
+ rev = "8166b02ebbab43d8a33d47b8221a94b69fc63487";
+ sha256 = "0n97iys2xyg1lzkn8bqsx0sgqpzci1pxg69v42cpzmyrz3h54bwp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx";
@@ -31370,12 +32051,12 @@
simpleclip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "simpleclip";
- version = "1.0.2";
+ version = "1.0.4";
src = fetchFromGitHub {
owner = "rolandwalker";
repo = "simpleclip";
- rev = "7deff873b79910496b4baf647cdb8dd5de63465a";
- sha256 = "12f853vm18y22sd22wmwqyzp5f5vmb67i33iiaw6mqqcp6qwbyqz";
+ rev = "d461c462c237cd896553adb468cd77499d0d26ad";
+ sha256 = "1dfa1sa7rbadj36nbzyxbpbvkdlh1s5n0mx6hxn52psqin1ra6yn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7c921e27d6aafc1b82d37f6beb8407840034377a/recipes/simpleclip";
@@ -31559,12 +32240,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";
@@ -31619,27 +32300,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";
@@ -31664,12 +32324,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";
@@ -32018,6 +32678,48 @@
license = lib.licenses.free;
};
}) {};
+ 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 ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "snoopy";
+ version = "0.1.1";
+ src = fetchFromGitHub {
+ owner = "anmonteiro";
+ repo = "snoopy-mode";
+ rev = "8d2b7b1354414f261b237f2fed0d472803ba3909";
+ sha256 = "05q407dg6jppmqdxpp1ba8xs6yjilsa74hga46dbhcc9nzj9850a";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/4a882cd92964ac195a09469006c9a44dc202f000/recipes/snoopy";
+ sha256 = "1wa8jykqyj6rxqfhwbiyli6yh8s7n0pqv7fc9sfaymarda93zbgi";
+ name = "snoopy";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/snoopy";
+ license = lib.licenses.free;
+ };
+ }) {};
socyl = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }:
melpaBuild {
pname = "socyl";
@@ -32039,6 +32741,27 @@
license = lib.licenses.free;
};
}) {};
+ solaire-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "solaire-mode";
+ version = "1.0.2";
+ src = fetchFromGitHub {
+ owner = "hlissner";
+ repo = "emacs-solaire-mode";
+ rev = "0f467e5f309e5a36280e06b40c0e6bbe90e06358";
+ sha256 = "1jka6213sw3rqan6s31s1ndyd0h2gwxvl0rcfm4jqc68mfyikzma";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/52c69070eef3003eb53e1436c538779c74670ce6/recipes/solaire-mode";
+ sha256 = "0pvgip12xl16rwz4wqmqjd8nhh3a299aknfsghazmxigamlmlsl5";
+ name = "solaire-mode";
+ };
+ packageRequires = [ cl-lib emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/solaire-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
solarized-theme = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "solarized-theme";
@@ -32186,27 +32909,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";
@@ -32231,12 +32933,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";
@@ -32273,12 +32975,12 @@
sparql-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "sparql-mode";
- version = "2.0.1";
+ version = "2.1.1";
src = fetchFromGitHub {
owner = "ljos";
repo = "sparql-mode";
- rev = "a51d4e57974e8d06f7d49ada0fdca656b7470642";
- sha256 = "0ywhqk6n5k0l85zjwbnrivnvxjzqipqrggv06lify6yv18qmyl6s";
+ rev = "262c46a282ce54ca4745b863cf323d9bf69e2faa";
+ sha256 = "02ai86c15x0fbgg2bw6a9k3k825gkhl3hy9abq62dfgdwc0cqxmn";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c3d729130a41903bb01465d0f01c34fbc508b56e/recipes/sparql-mode";
@@ -32567,12 +33269,12 @@
ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ssh-deploy";
- version = "1.1";
+ version = "1.2";
src = fetchFromGitHub {
owner = "cjohansson";
repo = "emacs-ssh-deploy";
- rev = "3569e5ea6892d6d7f4ef36bf41462af011e1a114";
- sha256 = "0l3h6w13xc81i6vavfsg617ly8m2y8yjzbwa6zwwkfqi301kgpij";
+ rev = "dbd8608551bc9e05280415b7b3937b1a151c7718";
+ sha256 = "1045snp3xdfa9nf34b1f0w4ql8kjl5m2jl7imxj5n46g579g9dhr";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy";
@@ -32669,25 +33371,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";
@@ -32876,57 +33559,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.3";
+ version = "0.4";
src = fetchFromGitHub {
owner = "Wilfred";
repo = "suggest.el";
- rev = "26e8b0615def4f0531682b8a849f55d330616ac1";
- sha256 = "0ql9ab6wnpww033jnfa3iwvz73h4szbwyfjvfavjlllzwk0f38np";
+ rev = "5cb70e500df430cb9ffc8ae0ab67976c1d7d226f";
+ sha256 = "1001z5zaj4ln05js08cz13lgc11dqxc6sgp1s35g19sfhip4xyim";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest";
@@ -32942,12 +33583,12 @@
suomalainen-kalenteri = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "suomalainen-kalenteri";
- version = "2015.11.29";
+ version = "2017.8.1";
src = fetchFromGitHub {
owner = "tlikonen";
repo = "suomalainen-kalenteri";
- rev = "b7991cb35624ebc04a89bbe759d40f186c9c097e";
- sha256 = "1b637p2cyc8a83qv9vba4yamzhk08f62zykqh5p35jwvym8wkann";
+ rev = "c702e33cb6e13cb28bd761844e95be112a3c04f3";
+ sha256 = "13avc3ba6vhysmhrcxfpkamggfpal479gn7k9n7509dpwp06dv8h";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/181adf1b16253481674663fd28b195172231b7da/recipes/suomalainen-kalenteri";
@@ -33034,8 +33675,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 = [];
@@ -33068,12 +33709,12 @@
swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "swift-mode";
- version = "2.3.0";
+ version = "2.4.0";
src = fetchFromGitHub {
owner = "chrisbarrett";
repo = "swift-mode";
- rev = "98920962adaaf42698fc847fbe7d9edcd58e50e9";
- sha256 = "0npz0izw6dwiv1kmkbnf6hklmx4w2pqddzb2ijxasrrviyyyc83s";
+ rev = "50394e4ffa80cb395ddd3c3128f995644820e2bc";
+ sha256 = "1dwrfbdfgndvv2rv4vl4vr82lzbkvk46z5fxbngd66yrx21rav24";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode";
@@ -34009,22 +34650,22 @@
license = lib.licenses.free;
};
}) {};
- tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }:
+ tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s, typescript-mode }:
melpaBuild {
pname = "tide";
- version = "2.3.1";
+ version = "2.5.2";
src = fetchFromGitHub {
owner = "ananthakumaran";
repo = "tide";
- rev = "669ce39bcd93ca6353d24a72a358272d7b0e2268";
- sha256 = "1sbvkgrdf6s8bkg38rfyj677dq3x4pry84hv30dgqhll7h8ja72w";
+ rev = "f1daf10e931858ac8d6ff676cf02ca73d3c62558";
+ sha256 = "1hj5mfpkfczy09ghmivkkzwmn6nawwv0ydm4ckz4mggps42hn0j1";
};
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;
@@ -34179,12 +34820,12 @@
transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
melpaBuild {
pname = "transmission";
- version = "0.10";
+ version = "0.11.1";
src = fetchFromGitHub {
owner = "holomorph";
repo = "transmission";
- rev = "fc0af768454f7964ba0c8b6934fc0cae24b8ebe8";
- sha256 = "05zrdgv0b7a3y89phg66y8cfpmshm34yg7ahhc861k6wh4kvkv89";
+ rev = "d465378a59e2eb91372564a56e60a9ab00e48f9c";
+ sha256 = "0al0xz59lrqj97fxmyxiphblg1bvbzahc6srd8klg7s0378ybblw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission";
@@ -34221,16 +34862,16 @@
treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pfuture, s }:
melpaBuild {
pname = "treemacs";
- version = "1.7.6";
+ version = "1.10";
src = fetchFromGitHub {
owner = "Alexander-Miller";
repo = "treemacs";
- rev = "53f0e0c562ba28b9738d05cd730728e983d2917f";
- sha256 = "13v8pydbyzl4h53xad93sfqa3aa4p8k4b8k53cqjv7mgd87pdvcw";
+ rev = "19723297eefdc9d3afef546f1839c88acfbeef9c";
+ sha256 = "117644jkyfi0p050hqpy6x4rk85jxnnnldmslzvvr7yprpc04hbw";
};
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 ];
@@ -34242,12 +34883,12 @@
treemacs-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, treemacs }:
melpaBuild {
pname = "treemacs-evil";
- version = "1.7.6";
+ version = "1.10";
src = fetchFromGitHub {
owner = "Alexander-Miller";
repo = "treemacs";
- rev = "53f0e0c562ba28b9738d05cd730728e983d2917f";
- sha256 = "13v8pydbyzl4h53xad93sfqa3aa4p8k4b8k53cqjv7mgd87pdvcw";
+ rev = "19723297eefdc9d3afef546f1839c88acfbeef9c";
+ sha256 = "117644jkyfi0p050hqpy6x4rk85jxnnnldmslzvvr7yprpc04hbw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs-evil";
@@ -34260,6 +34901,27 @@
license = lib.licenses.free;
};
}) {};
+ treemacs-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, treemacs }:
+ melpaBuild {
+ pname = "treemacs-projectile";
+ version = "1.10";
+ src = fetchFromGitHub {
+ owner = "Alexander-Miller";
+ repo = "treemacs";
+ rev = "19723297eefdc9d3afef546f1839c88acfbeef9c";
+ sha256 = "117644jkyfi0p050hqpy6x4rk85jxnnnldmslzvvr7yprpc04hbw";
+ };
+ 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";
@@ -34896,27 +35558,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";
@@ -34980,6 +35621,27 @@
license = lib.licenses.free;
};
}) {};
+ vc-msg = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
+ melpaBuild {
+ pname = "vc-msg";
+ version = "0.0.4";
+ src = fetchFromGitHub {
+ owner = "redguardtoo";
+ repo = "vc-msg";
+ rev = "091f3cf15ecb35bb4dc5de1ef7229f78735d9aee";
+ sha256 = "0s129fzxhrr8pp4h0hkmxapnman67r0bdmbj8ys6r361na7h16hf";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/59ad4e80b49c78decd7b5794565313f65550384e/recipes/vc-msg";
+ sha256 = "16pgx8pg3djhkmhf1fihgjk7c6nb2nsqj58888bwg7385mlwc7g9";
+ name = "vc-msg";
+ };
+ packageRequires = [ emacs popup ];
+ meta = {
+ homepage = "https://melpa.org/#/vc-msg";
+ license = lib.licenses.free;
+ };
+ }) {};
vcomp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "vcomp";
@@ -35151,12 +35813,12 @@
vimish-fold = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "vimish-fold";
- version = "0.2.2";
+ version = "0.2.3";
src = fetchFromGitHub {
owner = "mrkkrp";
repo = "vimish-fold";
- rev = "5c9ae8018002c10a034de60b527c42f3665f6b67";
- sha256 = "01wxjvbq3i1ji9fpff7fbk20pzmr52z6fycqfi7malgwq05is1bm";
+ rev = "e631352fbf910f692807afe38a2b6a7882a403a8";
+ sha256 = "152w1wqxj7yzm3d12lknzz1aix4h8cb571sjns3m1s7azsr3vfbq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b4862b0a3d43f073e645803cbbf11d973a4b51d5/recipes/vimish-fold";
@@ -35568,6 +36230,27 @@
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";
@@ -35613,12 +36296,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";
@@ -35760,12 +36443,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";
@@ -36054,11 +36737,11 @@
wisp-mode = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "wisp-mode";
- version = "0.9.1";
+ version = "0.9.2";
src = fetchhg {
url = "https://bitbucket.com/ArneBab/wisp";
- rev = "f94ec5fed665";
- sha256 = "0k66dxxc8k2snzmw385a78xqfgbpjzsfg3jm0gk5wqyn185ab50n";
+ rev = "7ce954278aef";
+ sha256 = "116cspnc4lhf6gk73yr9sy7013jp88vq5zayghzgnkbdlaw6zmz3";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode";
@@ -36092,27 +36775,48 @@
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.6.0";
src = fetchFromGitHub {
owner = "magit";
repo = "with-editor";
- rev = "3385ffdc6faed5a283e26a7ebf89825c700dd395";
- sha256 = "1kznr0zv1y6lwsllpksqjzq2f4bc5a99lg19fmifn7w0dhv6fn0m";
+ rev = "241726118dee067a8d9880d53c6a781d580ba8a1";
+ sha256 = "0q06qfir64nib604f23gdmbzl23mcsnysfd0x36cx9nwik95wl0x";
};
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;
};
}) {};
+ with-simulated-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }:
+ melpaBuild {
+ pname = "with-simulated-input";
+ version = "2.2";
+ src = fetchFromGitHub {
+ owner = "DarwinAwardWinner";
+ repo = "with-simulated-input";
+ rev = "9efeb236c8f6887a8591d6241962c37266d8e726";
+ sha256 = "1v8c85ahsk9pz3zndh0c9xba4c78f4b1j97hbv62jirvr75b079g";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/e4ddf16e19f5018106a423327ddc7e7499cf9248/recipes/with-simulated-input";
+ sha256 = "0113la76nbp18vaffsd7w7wcw5k2sqwgnjq1gslf4khdfqghrkwk";
+ name = "with-simulated-input";
+ };
+ packageRequires = [ emacs s seq ];
+ meta = {
+ homepage = "https://melpa.org/#/with-simulated-input";
+ license = lib.licenses.free;
+ };
+ }) {};
wn-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "wn-mode";
@@ -36176,24 +36880,24 @@
license = lib.licenses.free;
};
}) {};
- wordsmith-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ wordgen = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
- pname = "wordsmith-mode";
- version = "1.0.0";
+ pname = "wordgen";
+ version = "0.1.4";
src = fetchFromGitHub {
- owner = "istib";
- repo = "wordsmith-mode";
- rev = "41b10f2fe3589da9812395cb417c3dcf906f0969";
- sha256 = "0s3mjmfjiidn3spklndw0dvcwbb9x034xyphp60aad8vjaflbchs";
+ owner = "Fanael";
+ repo = "wordgen.el";
+ rev = "aacad928ae99a953e034a831dfd0ebdf7d52ac1d";
+ sha256 = "06vbc9ycz1nbjwjkg99y3lj6jwb6lnwnmkqf09yr00jjrrfhfash";
};
recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/d9f8f01f1807de24fb6e92b355d05b81be4bab07/recipes/wordsmith-mode";
- sha256 = "1570h1sjjaks6bnhd4xrbx6nna4v7hz6dmrzwjq37rwvallasg1n";
- name = "wordsmith-mode";
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/5cfdc64a9aa79575dad8057c4cd747d2cdd460aa/recipes/wordgen";
+ sha256 = "0vlrplm3pmpwwa8p8j6lck97b875gzzm7vxxc8l9l18vs237cz1m";
+ name = "wordgen";
};
- packageRequires = [];
+ packageRequires = [ cl-lib emacs ];
meta = {
- homepage = "https://melpa.org/#/wordsmith-mode";
+ homepage = "https://melpa.org/#/wordgen";
license = lib.licenses.free;
};
}) {};
@@ -36659,6 +37363,48 @@
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";
+ version = "1.0";
+ src = fetchFromGitHub {
+ owner = "anachronic";
+ repo = "yarn-mode";
+ rev = "99891000efe31214b065fa9446cd5e68c5c42ed8";
+ sha256 = "0cg06ba9yfgjzprq78cvhvvl06av0p2vhnmynddzbpgjgjnwskfy";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/860fa2a8fdb22be374fa64a5277af3ab484a047a/recipes/yarn-mode";
+ sha256 = "08a3lrz670jsf531mn1hwhh7fg5dby6i749cscd6d4dyvkzpz5dg";
+ name = "yarn-mode";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/yarn-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
yascroll = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "yascroll";
@@ -36683,12 +37429,12 @@
yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "yasnippet";
- version = "0.11.0";
+ version = "0.12.2";
src = fetchFromGitHub {
owner = "joaotavora";
repo = "yasnippet";
- rev = "e6b865127783f498b61fa99ad0f5413200ac09d0";
- sha256 = "0djj2gi0s0jyxpqgfk2818xnj5ykwhzy5k9yi65klsw2nanhh8y9";
+ rev = "89eb7ab64d67e96646576dc0d551e8c23d50438a";
+ sha256 = "1wr0d14yl3440hkdr436zxl9pk7nqhl76n9m3b3ia4lp6z5aj4jc";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet";
@@ -36722,25 +37468,6 @@
license = lib.licenses.free;
};
}) {};
- yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
- pname = "yatex";
- version = "1.78";
- src = fetchhg {
- url = "https://www.yatex.org/hgrepos/yatex/";
- rev = "e9299b77df1f";
- sha256 = "0nnpzcj23q964v4rfxzdll1r95zd6zzqvzcgxh7h603a41r3w1wm";
- };
- recipeFile = fetchurl {
- url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex";
- sha256 = "17np4am7yan1bh4706azf8in60c41158h3z591478j5b1w13y5a6";
- name = "yatex";
- };
- packageRequires = [];
- meta = {
- homepage = "https://melpa.org/#/yatex";
- license = lib.licenses.free;
- };
- }) {};
yaxception = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "yaxception";
@@ -36898,6 +37625,27 @@
license = lib.licenses.free;
};
}) {};
+ zephir-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+ melpaBuild {
+ pname = "zephir-mode";
+ version = "0.3.3";
+ src = fetchFromGitHub {
+ owner = "sergeyklay";
+ repo = "zephir-mode";
+ rev = "243f0fb7fd1dfebf0f0bdf94046b72d1bea4f66c";
+ sha256 = "0jydy2zcbksi7db7bvfhgdh08np8k4a1yd6q2wq6m3ll2y3zd0w2";
+ };
+ recipeFile = fetchurl {
+ url = "https://raw.githubusercontent.com/milkypostman/melpa/5bd901c93ce7f64de6082e801327adbd18fd4517/recipes/zephir-mode";
+ sha256 = "0nxm6w7z89q2vvf3bp1p6hb6f2axv9ha85jyiv4k02l46sjprf4j";
+ name = "zephir-mode";
+ };
+ packageRequires = [ emacs ];
+ meta = {
+ homepage = "https://melpa.org/#/zephir-mode";
+ license = lib.licenses.free;
+ };
+ }) {};
zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild }:
melpaBuild {
pname = "zerodark-theme";
@@ -36909,7 +37657,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";
};
diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix
index 29b793825c4..a1cb0b7d4ed 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 = "20170717";
+ version = "20170911";
src = fetchurl {
- url = "http://orgmode.org/elpa/org-20170717.tar";
- sha256 = "1cbk01awnyan1jap184v2bxsk97k0p2qn19z7gnid6wiblybgs89";
+ url = "http://orgmode.org/elpa/org-20170911.tar";
+ sha256 = "16d69g1qnfcj7d2q9ni5dz5wh9pid9mzhwyfg4z93s9xizzlnw64";
};
packageRequires = [];
meta = {
@@ -14,10 +14,10 @@
}) {};
org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org-plus-contrib";
- version = "20170717";
+ version = "20170911";
src = fetchurl {
- url = "http://orgmode.org/elpa/org-plus-contrib-20170717.tar";
- sha256 = "0710ba6gq04cg8d87b5wi7bz9gq9yqvqmkmgscawfm2ynfw2q8sa";
+ url = "http://orgmode.org/elpa/org-plus-contrib-20170911.tar";
+ sha256 = "0bgrsccar4v9viq99w2h4rjavql14zgdwkwaa1bprga3af78jr82";
};
packageRequires = [];
meta = {
diff --git a/pkgs/applications/editors/emacs-modes/prolog/default.nix b/pkgs/applications/editors/emacs-modes/prolog/default.nix
index 237b1ac1483..b01c526aa8e 100644
--- a/pkgs/applications/editors/emacs-modes/prolog/default.nix
+++ b/pkgs/applications/editors/emacs-modes/prolog/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
'';
meta = {
- homepage = "http://bruda.ca/emacs/prolog_mode_for_emacs/";
+ homepage = http://bruda.ca/emacs/prolog_mode_for_emacs/;
description = "Prolog mode for Emacs";
license = stdenv.lib.licenses.gpl2Plus;
};
diff --git a/pkgs/applications/editors/emacs-modes/rudel/default.nix b/pkgs/applications/editors/emacs-modes/rudel/default.nix
index f830b16da98..0031ffee4d4 100644
--- a/pkgs/applications/editors/emacs-modes/rudel/default.nix
+++ b/pkgs/applications/editors/emacs-modes/rudel/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation
'';
meta = {
- homepage = "http://rudel.sourceforge.net/";
+ homepage = http://rudel.sourceforge.net/;
description = "A collaborative editing environment for GNU Emacs";
license = "GPL";
};
diff --git a/pkgs/applications/editors/emacs-modes/sbt-mode/default.nix b/pkgs/applications/editors/emacs-modes/sbt-mode/default.nix
index 092026aca88..835cf8081af 100644
--- a/pkgs/applications/editors/emacs-modes/sbt-mode/default.nix
+++ b/pkgs/applications/editors/emacs-modes/sbt-mode/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
'';
meta = {
- homepage = "https://github.com/hvesalai/scala-mode2";
+ homepage = https://github.com/hvesalai/scala-mode2;
description = "An Emacs mode for editing Scala code";
license = "permissive";
};
diff --git a/pkgs/applications/editors/emacs-modes/scala-mode/v2.nix b/pkgs/applications/editors/emacs-modes/scala-mode/v2.nix
index ed3ac0e3da0..0a44deb8ced 100644
--- a/pkgs/applications/editors/emacs-modes/scala-mode/v2.nix
+++ b/pkgs/applications/editors/emacs-modes/scala-mode/v2.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
'';
meta = {
- homepage = "https://github.com/hvesalai/scala-mode2";
+ homepage = https://github.com/hvesalai/scala-mode2;
description = "An Emacs mode for editing Scala code";
license = "permissive";
};
diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix
index c51227bbc6f..a00826b9821 100644
--- a/pkgs/applications/editors/emacs/default.nix
+++ b/pkgs/applications/editors/emacs/default.nix
@@ -26,12 +26,12 @@ 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);
diff --git a/pkgs/applications/editors/emacs/macport.nix b/pkgs/applications/editors/emacs/macport.nix
index f38839a5abc..421d0ddd9f6 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.7";
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 = "0fivrasvigszr31w8wg8kb808hmqv2cc8klrm9n0hdxwg5fs5d0y";
};
hiresSrc = fetchurl {
diff --git a/pkgs/applications/editors/flpsed/default.nix b/pkgs/applications/editors/flpsed/default.nix
index 9334b7820fa..bd00045bca9 100644
--- a/pkgs/applications/editors/flpsed/default.nix
+++ b/pkgs/applications/editors/flpsed/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "WYSIWYG PostScript annotator";
- homepage = "http://http://flpsed.org/flpsed.html";
+ homepage = http://http://flpsed.org/flpsed.html;
license = licenses.gpl3;
platforms = platforms.mesaPlatforms;
maintainers = with maintainers; [ fuuzetsu ];
diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/applications/editors/focuswriter/default.nix
index eedb674b472..28106cf876b 100644
--- a/pkgs/applications/editors/focuswriter/default.nix
+++ b/pkgs/applications/editors/focuswriter/default.nix
@@ -20,6 +20,6 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.madjar ];
platforms = stdenv.lib.platforms.all;
- homepage = "http://gottcode.org/focuswriter/";
+ homepage = https://gottcode.org/focuswriter/;
};
}
diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix
index 89235514bb8..b2cf9c6d68d 100644
--- a/pkgs/applications/editors/geany/default.nix
+++ b/pkgs/applications/editors/geany/default.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
let
- version = "1.30.1";
+ version = "1.31";
in
stdenv.mkDerivation rec {
@@ -11,11 +11,11 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://download.geany.org/${name}.tar.bz2";
- sha256 = "0ac360f1f3d6c28790a81d570252a7d40421f6e1d8e5a8d653756bd041d88491";
+ sha256 = "30fdb906bb76c4251a8bcf83ee267db28c26ef6ab867668a782cec1164a3aba5";
};
NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
-
+
nativeBuildInputs = [ pkgconfig intltool ];
buildInputs = [ gtk2 which file ];
diff --git a/pkgs/applications/editors/heme/default.nix b/pkgs/applications/editors/heme/default.nix
index c74e47a5243..dce02b56890 100644
--- a/pkgs/applications/editors/heme/default.nix
+++ b/pkgs/applications/editors/heme/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
description = "Portable and fast console hex editor for unix operating systems";
- homepage = "http://heme.sourceforge.net/";
+ homepage = http://heme.sourceforge.net/;
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ cstrahan ];
diff --git a/pkgs/applications/editors/hexcurse/default.nix b/pkgs/applications/editors/hexcurse/default.nix
index 17bb9739b9b..5c0f2ee18e1 100644
--- a/pkgs/applications/editors/hexcurse/default.nix
+++ b/pkgs/applications/editors/hexcurse/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "ncurses-based console hexeditor written in C";
- homepage = "https://github.com/LonnyGomes/hexcurse";
+ homepage = https://github.com/LonnyGomes/hexcurse;
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ cstrahan ];
diff --git a/pkgs/applications/editors/hexedit/default.nix b/pkgs/applications/editors/hexedit/default.nix
index 24282b9ac8e..4671df77554 100644
--- a/pkgs/applications/editors/hexedit/default.nix
+++ b/pkgs/applications/editors/hexedit/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
meta = {
description = "View and edit files in hexadecimal or in ASCII";
- homepage = "http://prigaux.chez.com/hexedit.html";
+ homepage = http://prigaux.chez.com/hexedit.html;
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.unix;
};
diff --git a/pkgs/applications/editors/ht/default.nix b/pkgs/applications/editors/ht/default.nix
index 4455c70d71a..112eebfaf6f 100644
--- a/pkgs/applications/editors/ht/default.nix
+++ b/pkgs/applications/editors/ht/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "File editor/viewer/analyzer for executables";
- homepage = "http://hte.sourceforge.net";
+ homepage = http://hte.sourceforge.net;
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ cstrahan ];
diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 28a75befba8..65721361cd6 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -17,11 +17,11 @@ let
inherit name version src wmClass jdk;
product = "CLion";
meta = with stdenv.lib; {
- homepage = "https://www.jetbrains.com/clion/";
+ homepage = https://www.jetbrains.com/clion/;
inherit description license;
longDescription = ''
Enhancing productivity for every C and C++
- developer on Linux, OS X and Windows.
+ developer on Linux, macOS and Windows.
'';
maintainers = with maintainers; [ edwtjo mic92 ];
platforms = platforms.linux;
@@ -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}"
)
'';
});
@@ -62,7 +65,7 @@ let
inherit name version src wmClass jdk;
product = "DataGrip";
meta = with stdenv.lib; {
- homepage = "https://www.jetbrains.com/datagrip/";
+ homepage = https://www.jetbrains.com/datagrip/;
inherit description license;
longDescription = ''
DataGrip is a new IDE from JetBrains built for database admins.
@@ -79,7 +82,7 @@ let
inherit name version src wmClass jdk;
product = "Gogland";
meta = with stdenv.lib; {
- homepage = "https://www.jetbrains.com/go/";
+ homepage = https://www.jetbrains.com/go/;
inherit description license;
longDescription = ''
Gogland is the codename for a new commercial IDE by JetBrains
@@ -97,7 +100,7 @@ let
inherit name version src wmClass jdk;
product = "IDEA";
meta = with stdenv.lib; {
- homepage = "https://www.jetbrains.com/idea/";
+ homepage = https://www.jetbrains.com/idea/;
inherit description license;
longDescription = ''
IDE for Java SE, Groovy & Scala development Powerful
@@ -114,7 +117,7 @@ let
inherit name version src wmClass jdk;
product = "PhpStorm";
meta = with stdenv.lib; {
- homepage = "https://www.jetbrains.com/phpstorm/";
+ homepage = https://www.jetbrains.com/phpstorm/;
inherit description license;
longDescription = ''
PhpStorm provides an editor for PHP, HTML and JavaScript
@@ -131,7 +134,7 @@ let
inherit name version src wmClass jdk;
product = "PyCharm";
meta = with stdenv.lib; {
- homepage = "https://www.jetbrains.com/pycharm/";
+ homepage = https://www.jetbrains.com/pycharm/;
inherit description license;
longDescription = ''
Python IDE with complete set of tools for productive
@@ -158,7 +161,7 @@ let
inherit name version src wmClass jdk;
product = "Rider";
meta = with stdenv.lib; {
- homepage = "https://www.jetbrains.com/rider/";
+ homepage = https://www.jetbrains.com/rider/;
inherit description license;
longDescription = ''
JetBrains Rider is a new .NET IDE based on the IntelliJ
@@ -184,7 +187,7 @@ let
inherit name version src wmClass jdk;
product = "RubyMine";
meta = with stdenv.lib; {
- homepage = "https://www.jetbrains.com/ruby/";
+ homepage = https://www.jetbrains.com/ruby/;
inherit description license;
longDescription = description;
maintainers = with maintainers; [ edwtjo ];
@@ -197,7 +200,7 @@ let
inherit name version src wmClass jdk;
product = "WebStorm";
meta = with stdenv.lib; {
- homepage = "https://www.jetbrains.com/webstorm/";
+ homepage = https://www.jetbrains.com/webstorm/;
inherit description license;
longDescription = ''
WebStorm provides an editor for HTML, JavaScript (incl. Node.js),
@@ -216,12 +219,12 @@ in
clion = buildClion rec {
name = "clion-${version}";
- version = "2017.2"; /* updated by script */
+ version = "2017.2.2"; /* 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 = "1rnncii7z44186jv9xl3ax179ws9wfwd6yndyf9pvnpcd4jcs6d0"; /* updated by script */
};
wmClass = "jetbrains-clion";
update-channel = "CLion_Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml
@@ -229,90 +232,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 = "172.3968.45"; /* 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 = "0nk9g28l414yp5ldyx1yl38qpp9s1pxkfxfwmw9yvlff3bi0kkyw"; /* 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";
+ version = "2017.2.4"; /* 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 = "0z5abj41f5l9ilznr34lm4fsivrl2yjdxb2kdcis5abij6zl0g3f";
+ sha256 = "179nqzgbb76pyr48faca6k69v32m5kvx66i2apih95g54sd1xgva"; /* 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.1.5";
+ version = "2017.2.4"; /* 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 = "0gjj2g9fcrbbbp3v4clg0kj48qdw0gqcn9im4h8p3z2zscpg16ag";
+ sha256 = "1qwqk1r42llh8py0w2iq4w1ks3ipzsxkbdz0zkrd1572zngpk90m"; /* updated by script */
};
wmClass = "jetbrains-idea";
update-channel = "IDEA_Release";
@@ -320,38 +284,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 +310,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 +323,15 @@ in
rider = buildRider rec {
name = "rider-${version}";
- version = "171.4456.1432"; /* updated by script */
+ version = "2017.1.1"; /* 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 = "1h6p847izddard3227ifg3q5klwvdfixir63i6adkd2fvsqn5935"; /* updated by script */
};
wmClass = "jetbrains-rider";
- update-channel = "rider_2017_1_eap";
+ update-channel = "rider_2017_1";
};
ruby-mine = buildRubyMine rec {
@@ -396,68 +347,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 fecdeb0cae8..a0479fc9112 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/jupp/default.nix b/pkgs/applications/editors/jupp/default.nix
new file mode 100644
index 00000000000..14fdcce1c8e
--- /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 c8aae34e6c4..fac18c0b129 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 bbd9be22074..9efe6a44716 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,7 +34,7 @@ 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 = ''
diff --git a/pkgs/applications/editors/kdevelop5/kdevplatform.nix b/pkgs/applications/editors/kdevelop5/kdevplatform.nix
index b7c0d0cf855..78881b21018 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/moe/default.nix b/pkgs/applications/editors/moe/default.nix
new file mode 100644
index 00000000000..a1506eb9d6c
--- /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/nano/default.nix b/pkgs/applications/editors/nano/default.nix
index d924532eb34..441c157a349 100644
--- a/pkgs/applications/editors/nano/default.nix
+++ b/pkgs/applications/editors/nano/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub
+{ stdenv, hostPlatform, fetchurl, fetchFromGitHub
, ncurses
, texinfo
, gettext ? null
@@ -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/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix
index ca915b3e6d1..dafd4e6f120 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 e24ca50a024..48f7b29f407 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 b553e09ed5e..9b3896e32d6 100644
--- a/pkgs/applications/editors/notepadqq/default.nix
+++ b/pkgs/applications/editors/notepadqq/default.nix
@@ -24,7 +24,7 @@ in stdenv.mkDerivation {
'';
meta = {
- homepage = "http://notepadqq.altervista.org/";
+ homepage = http://notepadqq.altervista.org/;
description = "Notepad++-like editor for the Linux desktop";
license = stdenv.lib.licenses.gpl3;
platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/editors/nvpy/default.nix b/pkgs/applications/editors/nvpy/default.nix
index c9d86561fe2..0bcbad58b3a 100644
--- a/pkgs/applications/editors/nvpy/default.nix
+++ b/pkgs/applications/editors/nvpy/default.nix
@@ -30,7 +30,7 @@ in pythonPackages.buildPythonApplication rec {
meta = with pkgs.lib; {
description = "A simplenote-syncing note-taking tool inspired by Notational Velocity";
- homepage = "https://github.com/cpbotha/nvpy";
+ homepage = https://github.com/cpbotha/nvpy;
platforms = platforms.linux;
license = licenses.bsd3;
};
diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix
index 9ac91e7086a..930a18e39a6 100644
--- a/pkgs/applications/editors/rstudio/default.nix
+++ b/pkgs/applications/editors/rstudio/default.nix
@@ -1,25 +1,30 @@
-{ stdenv, fetchurl, makeDesktopItem, cmake, boost163, zlib, openssl,
+{ stdenv, fetchurl, fetchpatch, makeDesktopItem, cmake, boost163, zlib, openssl,
R, qt5, libuuid, hunspellDicts, unzip, ant, jdk, gnumake, makeWrapper, pandoc
}:
let
- version = "1.1.216";
+ version = "1.1.351";
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 ];
+ buildInputs = [ cmake boost163 zlib openssl R qt5.full qt5.qtwebkit qt5.qtwebchannel libuuid unzip ant jdk makeWrapper pandoc ];
src = fetchurl {
url = "https://github.com/rstudio/rstudio/archive/v${version}.tar.gz";
- sha256 = "07lp2ybvj7ippdrp7fv7j54dp0mm6k19j1vqdvjdk95acg3xgcjf";
+ sha256 = "0dpzmkq7jkdndidmmgdcr849q33ypmzkqwx22fraaqcy7w4f0pcn";
};
# 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 +96,7 @@ stdenv.mkDerivation rec {
cp ${pandoc}/bin/pandoc dependencies/common/pandoc/
'';
- cmakeFlags = [ "-DRSTUDIO_TARGET=Desktop" "-DQT_QMAKE_EXECUTABLE=${qt5.qmake}/bin/qmake" ];
+ cmakeFlags = [ "-DRSTUDIO_TARGET=Desktop" "-DQT_QMAKE_EXECUTABLE=$NIX_QT5_TMP/bin/qmake" ];
desktopItem = makeDesktopItem {
name = name;
@@ -116,7 +121,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/scite/default.nix b/pkgs/applications/editors/scite/default.nix
index 05cf21fcc53..61b28e02949 100644
--- a/pkgs/applications/editors/scite/default.nix
+++ b/pkgs/applications/editors/scite/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- homepage = "http://www.scintilla.org/SciTE.html";
+ homepage = http://www.scintilla.org/SciTE.html;
description = "SCIntilla based Text Editor";
license = licenses.mit;
platforms = platforms.linux;
diff --git a/pkgs/applications/editors/sublime3/default.nix b/pkgs/applications/editors/sublime3/default.nix
index 0b8ecda6230..1ec24325460 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,31 +20,30 @@ 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;
dontPatchELF = true;
- buildInputs = [ makeWrapper ];
+ buildInputs = [ makeWrapper zip unzip ];
# make exec.py in Default.sublime-package use own bash with
# an LD_PRELOAD instead of "/bin/bash"
patchPhase = ''
mkdir Default.sublime-package-fix
( cd Default.sublime-package-fix
- ${unzip}/bin/unzip ../Packages/Default.sublime-package > /dev/null
+ unzip -q ../Packages/Default.sublime-package
substituteInPlace "exec.py" --replace \
"[\"/bin/bash\"" \
"[\"$out/sublime_bash\""
+ zip -q ../Packages/Default.sublime-package **/*
)
- ${zip}/bin/zip -j Default.sublime-package.zip Default.sublime-package-fix/* > /dev/null
- mv Default.sublime-package.zip Packages/Default.sublime-package
rm -r Default.sublime-package-fix
'';
@@ -85,14 +84,17 @@ in stdenv.mkDerivation {
name = "sublimetext3-${build}";
phases = [ "installPhase" ];
+
+ inherit sublime;
+
installPhase = ''
mkdir -p $out/bin
- ln -s ${sublime}/sublime_text $out/bin/subl
- ln -s ${sublime}/sublime_text $out/bin/sublime
- ln -s ${sublime}/sublime_text $out/bin/sublime3
+ ln -s $sublime/sublime_text $out/bin/subl
+ ln -s $sublime/sublime_text $out/bin/sublime
+ ln -s $sublime/sublime_text $out/bin/sublime3
mkdir -p $out/share/applications
- ln -s ${sublime}/sublime_text.desktop $out/share/applications/sublime_text.desktop
- ln -s ${sublime}/Icon/256x256/ $out/share/icons
+ ln -s $sublime/sublime_text.desktop $out/share/applications/sublime_text.desktop
+ ln -s $sublime/Icon/256x256/ $out/share/icons
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/editors/tecoc/default.nix b/pkgs/applications/editors/tecoc/default.nix
index a3f58012e53..1c5730838ff 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/texmaker/default.nix b/pkgs/applications/editors/texmaker/default.nix
index eb6e1baccb5..76c8e4ae0e4 100644
--- a/pkgs/applications/editors/texmaker/default.nix
+++ b/pkgs/applications/editors/texmaker/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
LaTeX editing with completion, structure viewer, preview,
spell checking and support of any compilation chain.
'';
- homepage = "http://www.xm1math.net/texmaker/";
+ homepage = http://www.xm1math.net/texmaker/;
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ cfouche ];
diff --git a/pkgs/applications/editors/texworks/default.nix b/pkgs/applications/editors/texworks/default.nix
new file mode 100644
index 00000000000..fe90250d415
--- /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 7e8a85cf48a..d1c0ab274f0 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/tweak/default.nix b/pkgs/applications/editors/tweak/default.nix
index eb0be39e7c1..e55bcb48787 100644
--- a/pkgs/applications/editors/tweak/default.nix
+++ b/pkgs/applications/editors/tweak/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "An efficient hex editor";
- homepage = "http://www.chiark.greenend.org.uk/~sgtatham/tweak";
+ homepage = http://www.chiark.greenend.org.uk/~sgtatham/tweak;
license = licenses.mit;
platforms = platforms.linux;
};
diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix
index 442a2e2224e..0733bd79665 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.29";
+ version = "0.9.31";
src =
if stdenv.system == "x86_64-linux" then
fetchurl {
url = "https://www.typora.io/linux/typora_${version}_amd64.deb";
- sha256 = "1d7a02ee603be871d6f8c25b5c11069267ec11644a4f513635c0769ce46a44a7";
+ sha256 = "786b5164d9c63ecc23eb427c5ff393285ce8fd540c5bfdd5c1464655fac87a42";
}
else
fetchurl {
url = "https://www.typora.io/linux/typora_${version}_i386.deb";
- sha256 = "79834b0ccd2257c030aec850ebc81fe115f46891b482f1ffa41fcc19c5f29659";
+ sha256 = "a8fe53f8984d9f8c4e06c14affbb616be58a91cd2b475b9681fb18a6e21930d1";
}
;
@@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A minimal Markdown reading & writing app";
- homepage = "https://typora.io";
+ homepage = https://typora.io;
license = licenses.free;
maintainers = with stdenv.lib.maintainers; [ jensbin ];
platforms = [ "x86_64-linux" "i686-linux" ];
diff --git a/pkgs/applications/editors/vbindiff/default.nix b/pkgs/applications/editors/vbindiff/default.nix
index 97bf0d5c237..becb5ccc29a 100644
--- a/pkgs/applications/editors/vbindiff/default.nix
+++ b/pkgs/applications/editors/vbindiff/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
meta = {
description = "A terminal visual binary diff viewer";
- homepage = "http://www.cjmweb.net/vbindiff/";
+ homepage = http://www.cjmweb.net/vbindiff/;
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.unix;
};
diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix
index 3f588fdde58..0f81b0bdd64 100644
--- a/pkgs/applications/editors/vim/configurable.nix
+++ b/pkgs/applications/editors/vim/configurable.nix
@@ -24,6 +24,10 @@ let
let pluginname = substitute(d, ".*/", "", "")
if !has_key(seen, pluginname)
exec 'set runtimepath^='.d
+ let after = d."/after"
+ if isdirectory(after)
+ exec 'set runtimepath^='.after
+ endif
let seen[pluginname] = 1
endif
endfor
@@ -85,7 +89,7 @@ composableDerivation {
NIX_LDFLAGS = stdenv.lib.optional stdenv.isDarwin
"/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation";
};
- } #Disable Darwin (Mac OS X) support.
+ } #Disable Darwin (macOS) support.
// edf { name = "xsmp"; } #Disable XSMP session management
// edf { name = "xsmp_interact"; } #Disable XSMP interaction
// edf { name = "mzscheme"; feat = "mzschemeinterp";} #Include MzScheme interpreter.
diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix
index 4eefb207fd7..2f110749277 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 a688170b8ad..bb265e90b77 100644
--- a/pkgs/applications/editors/vim/macvim.nix
+++ b/pkgs/applications/editors/vim/macvim.nix
@@ -102,7 +102,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- description = "Vim - the text editor - for Mac OS X";
+ description = "Vim - the text editor - for macOS";
homepage = https://github.com/b4winckler/macvim;
license = licenses.vim;
maintainers = with maintainers; [ cstrahan ];
diff --git a/pkgs/applications/editors/vim/qvim.nix b/pkgs/applications/editors/vim/qvim.nix
index 5e98b3c9a78..c23bf360daf 100644
--- a/pkgs/applications/editors/vim/qvim.nix
+++ b/pkgs/applications/editors/vim/qvim.nix
@@ -43,7 +43,7 @@ composableDerivation {
'';
};
}
- // edf { name = "darwin"; } #Disable Darwin (Mac OS X) support.
+ // edf { name = "darwin"; } #Disable Darwin (macOS) support.
// edf { name = "xsmp"; } #Disable XSMP session management
// edf { name = "xsmp_interact"; } #Disable XSMP interaction
// edf { name = "mzscheme"; } #Include MzScheme interpreter.
diff --git a/pkgs/applications/editors/vis/default.nix b/pkgs/applications/editors/vis/default.nix
index 291c7b1b412..eef1746ff38 100644
--- a/pkgs/applications/editors/vis/default.nix
+++ b/pkgs/applications/editors/vis/default.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A vim like editor";
- homepage = http://github.com/martanne/vis;
+ homepage = https://github.com/martanne/vis;
license = licenses.isc;
maintainers = with maintainers; [ vrthra ramkromberg ];
platforms = platforms.unix;
diff --git a/pkgs/applications/editors/vscode-with-extensions/default.nix b/pkgs/applications/editors/vscode-with-extensions/default.nix
new file mode 100644
index 00000000000..c54c8a4277f
--- /dev/null
+++ b/pkgs/applications/editors/vscode-with-extensions/default.nix
@@ -0,0 +1,82 @@
+{ stdenv, lib, fetchurl, runCommand, buildEnv, vscode, which, writeScript
+, vscodeExtensions ? [] }:
+
+/*
+ `vscodeExtensions`
+ : A set of vscode extensions to be installed alongside the editor. Here's a an
+ example:
+
+ ~~~
+ vscode-with-extensions.override {
+
+ # When the extension is already available in the default extensions set.
+ vscodeExtensions = with vscode-extensions; [
+ bbenoist.Nix
+ ]
+
+ # Concise version from the vscode market place when not available in the default set.
+ ++ vscode-utils.extensionsFromVscodeMarketplace [
+ {
+ name = "code-runner";
+ publisher = "formulahendry";
+ version = "0.6.33";
+ sha256 = "166ia73vrcl5c9hm4q1a73qdn56m0jc7flfsk5p5q41na9f10lb0";
+ }
+ ];
+ }
+ ~~~
+
+ This expression should fetch
+ - the *nix* vscode extension from whatever source defined in the
+ default nixpkgs extensions set `vscodeExtensions`.
+
+ - the *code-runner* vscode extension from the marketplace using the
+ following url:
+
+ ~~~
+ https://bbenoist.gallery.vsassets.io/_apis/public/gallery/publisher/bbenoist/extension/nix/1.0.1/assetbyname/Microsoft.VisualStudio.Services.VSIXPackage
+ ~~~
+
+ The original `code` executable will be wrapped so that it uses the set of pre-installed / unpacked
+ extensions as its `--extensions-dir`.
+*/
+
+let
+
+ wrappedPkgVersion = lib.getVersion vscode;
+ wrappedPkgName = lib.removeSuffix "-${wrappedPkgVersion}" vscode.name;
+
+ combinedExtensionsDrv = buildEnv {
+ name = "${wrappedPkgName}-extensions-${wrappedPkgVersion}";
+ paths = vscodeExtensions;
+ };
+
+ wrappedExeName = "code";
+ exeName = wrappedExeName;
+
+ wrapperExeFile = writeScript "${exeName}" ''
+ #!${stdenv.shell}
+ exec ${vscode}/bin/${wrappedExeName} \
+ --extensions-dir "${combinedExtensionsDrv}/share/${wrappedPkgName}/extensions" \
+ "$@"
+ '';
+
+in
+
+# When no extensions are requested, we simply redirect to the original
+# non-wrapped vscode executable.
+runCommand "${wrappedPkgName}-with-extensions-${wrappedPkgVersion}" {
+ buildInputs = [ vscode which ];
+ dontPatchELF = true;
+ dontStrip = true;
+ meta = vscode.meta;
+} ''
+ mkdir -p "$out/bin"
+ ${if [] == vscodeExtensions
+ then ''
+ ln -sT "${vscode}/bin/${wrappedExeName}" "$out/bin/${exeName}"
+ ''
+ else ''
+ ln -sT "${wrapperExeFile}" "$out/bin/${exeName}"
+ ''}
+''
diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix
index 18eb1803fd6..f72af1908c5 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.14.2";
+ version = "1.16.1";
channel = "stable";
plat = {
@@ -12,15 +12,16 @@ let
}.${stdenv.system};
sha256 = {
- "i686-linux" = "0ladqwgy37imq957mmbdfslaxcnx8gcl9nb1q5p8r91vldvf31zd";
- "x86_64-linux" = "1nb9n6511v2p1nwcwh6kbpxgydfs66yn7q2nf1rmh42ha5yzqkja";
- "x86_64-darwin" = "0yk2yd8rzhmsh276xfgywp1gjjkvxypgnjhs8jaxvrgsj7aw1s39";
+ "i686-linux" = "1k06rish1a1hqrkvzy21lg05vmzd345aa65g3d08ikh6508mp100";
+ "x86_64-linux" = "1l2xbdvjfmf05cqcjcj3w2450vi7wvkm5zdwkmfhh01fnvbrygnw";
+ "x86_64-darwin" = "0bxv3qlhcqn5sb5l5pjhi5560vi1sl844hx3r5x48gmmgd8yziaj";
}.${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,16 +76,22 @@ 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; {
description = ''
Open source source code editor developed by Microsoft for Windows,
- Linux and OS X
+ Linux and macOS
'';
longDescription = ''
Open source source code editor developed by Microsoft for Windows,
- Linux and OS X. It includes support for debugging, embedded Git
+ Linux and macOS. It includes support for debugging, embedded Git
control, syntax highlighting, intelligent code completion, snippets,
and code refactoring. It is also customizable, so users can change the
editor's theme, keyboard shortcuts, and preferences
diff --git a/pkgs/applications/editors/wxhexeditor/default.nix b/pkgs/applications/editors/wxhexeditor/default.nix
index de423987c02..ad294480e60 100644
--- a/pkgs/applications/editors/wxhexeditor/default.nix
+++ b/pkgs/applications/editors/wxhexeditor/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
a good reverse engineer tool like a good hex editor, you welcome.
wxHexEditor could edit HDD/SDD disk devices or partitions in raw up to exabyte sizes.
'';
- homepage = "http://www.wxhexeditor.org/";
+ homepage = http://www.wxhexeditor.org/;
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
};
diff --git a/pkgs/applications/editors/zile/default.nix b/pkgs/applications/editors/zile/default.nix
index 58971b3199b..fc2e8aa03de 100644
--- a/pkgs/applications/editors/zile/default.nix
+++ b/pkgs/applications/editors/zile/default.nix
@@ -9,10 +9,12 @@ stdenv.mkDerivation rec {
};
buildInputs = [ pkgconfig ncurses boehmgc ];
- nativeBuildInputs = [ help2man perl ];
-
- # `help2man' wants to run Zile, which fails when cross-compiling.
- crossAttrs.nativeBuildInputs = [];
+ nativeBuildInputs = [ perl ]
+ # `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.
diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix
index 10c2ab9ebf9..a3ea89e2668 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.12";
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 = "0fh256j2d2kh9hjx6q1zdzxfqsgifg9dvgk214sv6zxzhsn0kxvs";
};
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 83f725622d7..4d229450a4a 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 1a854a82bf0..cd99861ea7b 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-1";
- sha256 = "1i3gsc0ps7cbvfmnk6fbi5hng18jwh4x4dqbz90a45x85023w9vs";
+ version = "7.0.6-4";
+ sha256 = "0fvkx9lf8g0sa9bccd9s5qyhcy0g1mqnkbpqly55ryxyg1ywxqaz";
patches = [];
};
in
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index a9223749f39..1cf08f286ef 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-0";
- sha256 = "02xnvgjnmz2d4yv4iy1kh7an5w631p1s319jw23c8zpmqhfhk2ha";
+ version = "6.9.9-7";
+ sha256 = "1lwsz9b8clygdppgawv2hsry4aykgmawjlwhg3fj70rndv4a8rw4";
patches = [];
}
# Freeze version on mingw so we don't need to port the patch too often.
@@ -85,7 +86,9 @@ stdenv.mkDerivation rec {
moveToOutput "bin/*-config" "$dev"
moveToOutput "lib/ImageMagick-*/config-Q16" "$dev" # includes configure params
for file in "$dev"/bin/*-config; do
- substituteInPlace "$file" --replace pkg-config \
+ substituteInPlace "$file" --replace "${pkgconfig}/bin/pkg-config -config" \
+ ${pkgconfig}/bin/pkg-config
+ substituteInPlace "$file" --replace ${pkgconfig}/bin/pkg-config \
"PKG_CONFIG_PATH='$dev/lib/pkgconfig' '${pkgconfig}/bin/pkg-config'"
done
'' + lib.optionalString (ghostscript != null) ''
diff --git a/pkgs/applications/graphics/PythonMagick/default.nix b/pkgs/applications/graphics/PythonMagick/default.nix
index b1f64afd9ae..f0b4a991f74 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 dc974aed057..986e16834f7 100644
--- a/pkgs/applications/graphics/ahoviewer/default.nix
+++ b/pkgs/applications/graphics/ahoviewer/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- homepage = "https://github.com/ahodesuka/ahoviewer";
+ homepage = https://github.com/ahodesuka/ahoviewer;
description = "A GTK2 image viewer, manga reader, and booru browser";
maintainers = [ maintainers.skrzyp ];
license = licenses.mit;
diff --git a/pkgs/applications/graphics/ao/default.nix b/pkgs/applications/graphics/ao/default.nix
index 2bba73fae1a..7396fdc045f 100644
--- a/pkgs/applications/graphics/ao/default.nix
+++ b/pkgs/applications/graphics/ao/default.nix
@@ -18,7 +18,6 @@ stdenv.mkDerivation rec {
};
cmakeFlags = "-G Ninja";
- buildPhase = "ninja";
installPhase = ''
ninja install
cd ..
diff --git a/pkgs/applications/graphics/autotrace/default.nix b/pkgs/applications/graphics/autotrace/default.nix
index 2131589339c..c0ce81b3b42 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
diff --git a/pkgs/applications/graphics/awesomebump/default.nix b/pkgs/applications/graphics/awesomebump/default.nix
index 9e0916bab9c..f1958ca35be 100644
--- a/pkgs/applications/graphics/awesomebump/default.nix
+++ b/pkgs/applications/graphics/awesomebump/default.nix
@@ -28,6 +28,11 @@ stdenv.mkDerivation {
--run "cd $d"
'';
+ # RPATH in /tmp hack
+ preFixup = ''
+ rm -r $NIX_BUILD_TOP/__nix_qt5__
+ '';
+
meta = {
homepage = https://github.com/kmkolasinski/AwesomeBump;
description = "A program to generate normal, height, specular or ambient occlusion textures from a single image";
diff --git a/pkgs/applications/graphics/c3d/default.nix b/pkgs/applications/graphics/c3d/default.nix
index a254993a016..74631e88ebf 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 8d8e36a8bc8..73362588a57 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/draftsight/default.nix b/pkgs/applications/graphics/draftsight/default.nix
index a1cf91989eb..17334c5b366 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 4aeb7a4a567..f1573087474 100644
--- a/pkgs/applications/graphics/exrdisplay/default.nix
+++ b/pkgs/applications/graphics/exrdisplay/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
meta = {
description = "Application for viewing OpenEXR images on a display at various exposure settings";
- homepage = "http://openexr.com";
+ homepage = http://openexr.com;
platforms = stdenv.lib.platforms.linux;
license = stdenv.lib.licenses.bsd3;
};
diff --git a/pkgs/applications/graphics/exrtools/default.nix b/pkgs/applications/graphics/exrtools/default.nix
index 310f81961cb..d49110d0069 100644
--- a/pkgs/applications/graphics/exrtools/default.nix
+++ b/pkgs/applications/graphics/exrtools/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Collection of utilities for manipulating OpenEXR images";
- homepage = "http://scanline.ca/exrtools";
+ homepage = http://scanline.ca/exrtools;
platforms = platforms.linux;
license = licenses.mit;
maintainers = [ maintainers.juliendehos ];
diff --git a/pkgs/applications/graphics/fbida/default.nix b/pkgs/applications/graphics/fbida/default.nix
index d06c3eb5ec1..2943b5ef94c 100644
--- a/pkgs/applications/graphics/fbida/default.nix
+++ b/pkgs/applications/graphics/fbida/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libexif libjpeg libpng libungif freetype fontconfig libtiff
libwebp imagemagick curl sane-backends libdrm libXpm epoxy poppler lirc ];
- makeFlags = [ "prefix=$(out)" "verbose=yes" ];
+ makeFlags = [ "prefix=$(out)" "verbose=yes" "STRIP=" ];
patchPhase =
''
diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix
index 5de8e7892ab..f1b992bea1a 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";
+ version = "2.20";
src = fetchurl {
- url = "http://feh.finalrewind.org/${name}.tar.bz2";
- sha256 = "1sfhr6628xpj9p6bqihdq35y139x2gmrpydjlrwsl1rs77c2bgnf";
+ url = "https://feh.finalrewind.org/${name}.tar.bz2";
+ sha256 = "02vhdv16nf4kjna4inpbfy4k3p40bhl7xpc4kh4xvily14146l2b";
};
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/fontmatrix/default.nix b/pkgs/applications/graphics/fontmatrix/default.nix
index ced6a5f7258..8ca093b90c3 100644
--- a/pkgs/applications/graphics/fontmatrix/default.nix
+++ b/pkgs/applications/graphics/fontmatrix/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Fontmatrix is a free/libre font explorer for Linux, Windows and Mac";
- homepage = http://github.com/fontmatrix/fontmatrix;
+ homepage = https://github.com/fontmatrix/fontmatrix;
license = licenses.gpl2;
platforms = platforms.linux;
};
diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix
index c58d9e0bda1..80f893e7c3c 100644
--- a/pkgs/applications/graphics/freecad/default.nix
+++ b/pkgs/applications/graphics/freecad/default.nix
@@ -5,11 +5,11 @@ let
pythonPackages = python27Packages;
in stdenv.mkDerivation rec {
name = "freecad-${version}";
- version = "0.16";
+ version = "0.16.6712";
src = fetchurl {
url = "https://github.com/FreeCAD/FreeCAD/archive/${version}.tar.gz";
- sha256 = "02cfw5wlb04j0ymhk4skrm7rvbz13hpv995asf9v8q6wn2s1mivc";
+ sha256 = "14hs26gvv7gbg9misxq34v4nrds2sbxjhj4yyw5kq3zbvl517alp";
};
buildInputs = with pythonPackages; [ cmake coin3d xercesc ode eigen qt4 opencascade gts boost
@@ -36,7 +36,7 @@ in stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "General purpose Open Source 3D CAD/MCAD/CAx/CAE/PLM modeler";
- homepage = http://www.freecadweb.org/;
+ homepage = https://www.freecadweb.org/;
license = licenses.lgpl2Plus;
maintainers = [ maintainers.viric ];
platforms = platforms.linux;
diff --git a/pkgs/applications/graphics/freepv/default.nix b/pkgs/applications/graphics/freepv/default.nix
index 6d82db4bac1..e6d8a06a519 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/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix
index 47004a02500..ff87b70a0c1 100644
--- a/pkgs/applications/graphics/gimp/2.8.nix
+++ b/pkgs/applications/graphics/gimp/2.8.nix
@@ -51,7 +51,7 @@ in stdenv.mkDerivation rec {
meta = {
description = "The GNU Image Manipulation Program";
- homepage = http://www.gimp.org/;
+ homepage = https://www.gimp.org/;
license = stdenv.lib.licenses.gpl3Plus;
platforms = stdenv.lib.platforms.unix;
};
diff --git a/pkgs/applications/graphics/giv/build.patch b/pkgs/applications/graphics/giv/build.patch
index ec343c90238..f57689fd3fa 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 6c892f1bfd4..5c15c98e482 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" ];
diff --git a/pkgs/applications/graphics/gocr/default.nix b/pkgs/applications/graphics/gocr/default.nix
index 0a1059c6a47..6fe37d605ae 100644
--- a/pkgs/applications/graphics/gocr/default.nix
+++ b/pkgs/applications/graphics/gocr/default.nix
@@ -8,12 +8,23 @@ 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
'';
meta = {
- homepage = "http://jocr.sourceforge.net/";
+ homepage = http://jocr.sourceforge.net/;
description = "GPL Optical Character Recognition";
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/graphics/guetzli/default.nix b/pkgs/applications/graphics/guetzli/default.nix
index c96ddc98795..061dc2b69a6 100644
--- a/pkgs/applications/graphics/guetzli/default.nix
+++ b/pkgs/applications/graphics/guetzli/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
meta = {
description = "Perceptual JPEG encoder";
longDescription = "Guetzli is a JPEG encoder that aims for excellent compression density at high visual quality.";
- homepage = "https://github.com/google/guetzli";
+ homepage = https://github.com/google/guetzli;
license = stdenv.lib.licenses.asl20;
platforms = stdenv.lib.platforms.x86_64;
maintainers = [ stdenv.lib.maintainers.seppeljordan ];
diff --git a/pkgs/applications/graphics/imlibsetroot/default.nix b/pkgs/applications/graphics/imlibsetroot/default.nix
index 4fdfb87f134..90f8eec5993 100644
--- a/pkgs/applications/graphics/imlibsetroot/default.nix
+++ b/pkgs/applications/graphics/imlibsetroot/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A Xinerama Aware Background Changer";
- homepage = "http://robotmonkeys.net/2010/03/30/imlibsetroot/";
+ homepage = http://robotmonkeys.net/2010/03/30/imlibsetroot/;
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ lucas8 ];
diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index f48ce6a4ce4..678ee79459b 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -1,8 +1,8 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, perl, perlXMLParser, libXft
, libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm2
-, glibmm, libsigcxx, lcms, boost, gettext, makeWrapper, intltool
+, glibmm, libsigcxx, lcms, boost, gettext, makeWrapper
, gsl, python2, poppler, imagemagick, libwpg, librevenge
-, libvisio, libcdr, libexif, automake114x, potrace, cmake
+, libvisio, libcdr, libexif, potrace, cmake
}:
let
@@ -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 = ''
@@ -36,8 +36,8 @@ stdenv.mkDerivation rec {
buildInputs = [
pkgconfig perl perlXMLParser libXft libpng zlib popt boehmgc
libxml2 libxslt glib gtkmm2 glibmm libsigcxx lcms boost gettext
- makeWrapper intltool gsl poppler imagemagick libwpg librevenge
- libvisio libcdr libexif automake114x potrace cmake python2Env
+ makeWrapper gsl poppler imagemagick libwpg librevenge
+ libvisio libcdr libexif potrace cmake python2Env
];
enableParallelBuilding = true;
@@ -52,7 +52,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 c9587b222d9..f120f8b13d4 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 ea0fe51cc85..6c2be6ea73c 100644
--- a/pkgs/applications/graphics/kgraphviewer/default.nix
+++ b/pkgs/applications/graphics/kgraphviewer/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "kgraphviewer-${version}";
- version = "2.1.90";
+ version = "2.2.0";
src = fetchurl {
- url = "mirror://kde/unstable/kgraphviewer/${version}/src/${name}.tar.xz";
- sha256 = "13zhjs57xavzrj4nrlqs35n35ihvzij7hgbszf5fhlp2a4d4rrqs";
+ url = "mirror://kde/stable/kgraphviewer/${version}/src/${name}.tar.xz";
+ sha256 = "1vs5x539mx26xqdljwzkh2bj7s3ydw4cb1wm9nlhgs18siw4gjl5";
};
buildInputs = [ kdelibs4 boost graphviz ];
diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix
index ccac9dd0ed1..98f92413a76 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.2.1";
src = fetchurl {
url = "http://download.kde.org/stable/krita/${version}/${name}.tar.gz";
- sha256 = "1al27v17s70hihk2mcmz3l2g6rl9qzpxaifapdfpkyias6q3f63l";
+ sha256 = "0fafy5ggplgq2rz85sqa42vmkzs2r9dq47qfrbnn2n6pfzkcw1pg";
};
nativeBuildInputs = [ cmake extra-cmake-modules ];
@@ -26,18 +26,11 @@ 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; {
description = "A free an open source painting application";
- homepage = "https://krita.org/";
+ homepage = https://krita.org/;
maintainers = with maintainers; [ abbradar ];
platforms = platforms.linux;
license = licenses.gpl2;
diff --git a/pkgs/applications/graphics/mcomix/default.nix b/pkgs/applications/graphics/mcomix/default.nix
index 20c01f77bbf..eea0e501cb8 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/meh/default.nix b/pkgs/applications/graphics/meh/default.nix
index 1b5fbc2271b..ac2a194b7ca 100644
--- a/pkgs/applications/graphics/meh/default.nix
+++ b/pkgs/applications/graphics/meh/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
make PREFIX=$out install
'';
- outputs = [ "out" "doc" ];
+ outputs = [ "out" "man" ];
buildInputs = [ libXext libX11 libjpeg libpng giflib ];
diff --git a/pkgs/applications/graphics/mtpaint/default.nix b/pkgs/applications/graphics/mtpaint/default.nix
index e8c22b37638..51bfa603a05 100644
--- a/pkgs/applications/graphics/mtpaint/default.nix
+++ b/pkgs/applications/graphics/mtpaint/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
Due to its simplicity and lack of dependencies it runs well on
GNU/Linux, Windows and older PC hardware.
'';
- homepage = "http://mtpaint.sourceforge.net/";
+ homepage = http://mtpaint.sourceforge.net/;
license = stdenv.lib.licenses.gpl3;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.vklquevs ];
diff --git a/pkgs/applications/graphics/openimageio/default.nix b/pkgs/applications/graphics/openimageio/default.nix
index 44faeea007d..b4402c7d104 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/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix
index f3b16a30460..e7a05c522ca 100644
--- a/pkgs/applications/graphics/openscad/default.nix
+++ b/pkgs/applications/graphics/openscad/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
description = "3D parametric model compiler";
longDescription = ''
OpenSCAD is a software for creating solid 3D CAD objects. It is free
- software and available for Linux/UNIX, MS Windows and Mac OS X.
+ software and available for Linux/UNIX, MS Windows and macOS.
Unlike most free software for creating 3D models (such as the famous
application Blender) it does not focus on the artistic aspects of 3D
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
machine parts but pretty sure is not what you are looking for when you are more
interested in creating computer-animated movies.
'';
- homepage = "http://openscad.org/";
+ homepage = http://openscad.org/;
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers;
diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix
index 0973893bbec..730f809eef4 100644
--- a/pkgs/applications/graphics/paraview/default.nix
+++ b/pkgs/applications/graphics/paraview/default.nix
@@ -1,43 +1,49 @@
-{ 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_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"
- ];
+ cmakeFlags = [
+ "-DPARAVIEW_ENABLE_PYTHON=ON"
+ "-DPARAVIEW_INSTALL_DEVELOPMENT_FILES=ON"
+ ];
- # https://bugzilla.redhat.com/show_bug.cgi?id=1138466
- NIX_CFLAGS_COMPILE = "-DGLX_GLXEXT_LEGACY";
+ # 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
+ '';
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/";
+ homepage = http://www.paraview.org/;
description = "3D Data analysis and visualization application";
license = stdenv.lib.licenses.free;
maintainers = with stdenv.lib.maintainers; [viric guibert];
diff --git a/pkgs/applications/graphics/pbrt/default.nix b/pkgs/applications/graphics/pbrt/default.nix
index 894667597d8..1c582df50de 100644
--- a/pkgs/applications/graphics/pbrt/default.nix
+++ b/pkgs/applications/graphics/pbrt/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
buildInputs = [ git flex bison cmake zlib ];
meta = with stdenv.lib; {
- homepage = "http://pbrt.org";
+ homepage = http://pbrt.org;
description = "The renderer described in the third edition of the book 'Physically Based Rendering: From Theory To Implementation'";
platforms = platforms.linux ;
license = licenses.bsd2;
diff --git a/pkgs/applications/graphics/pencil/default.nix b/pkgs/applications/graphics/pencil/default.nix
index 5b1f79a6c4f..f7175f9d2b8 100644
--- a/pkgs/applications/graphics/pencil/default.nix
+++ b/pkgs/applications/graphics/pencil/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "GUI prototyping/mockup tool";
- homepage = http://github.com/prikhi/pencil;
+ homepage = https://github.com/prikhi/pencil;
license = licenses.gpl2; # Commercial license is also available
maintainers = with maintainers; [ bjornfor prikhi ];
platforms = platforms.linux;
diff --git a/pkgs/applications/graphics/photivo/default.nix b/pkgs/applications/graphics/photivo/default.nix
index 69bc36dea61..0d1adcff6e8 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 00000000000..e2eb795fc8e
--- /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 d6bcdee4137..a3c8d805b23 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 = ''
@@ -23,7 +22,7 @@ stdenv.mkDerivation rec {
'';
meta = {
- homepage = "http://photoqt.org/";
+ homepage = http://photoqt.org/;
description = "Simple, yet powerful and good looking image viewer";
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/applications/graphics/potrace/default.nix b/pkgs/applications/graphics/potrace/default.nix
index 82fa4d5ee95..132136da658 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 7e375367a2d..202bbb5b13f 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/processing/default.nix b/pkgs/applications/graphics/processing/default.nix
index a66e9163142..12ff5c77240 100644
--- a/pkgs/applications/graphics/processing/default.nix
+++ b/pkgs/applications/graphics/processing/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A language and IDE for electronic arts";
- homepage = http://processing.org;
+ homepage = https://processing.org;
license = licenses.gpl2Plus;
maintainers = [ maintainers.goibhniu ];
platforms = platforms.linux;
diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix
index 97d04b03622..3edb97e3e20 100644
--- a/pkgs/applications/graphics/rawtherapee/default.nix
+++ b/pkgs/applications/graphics/rawtherapee/default.nix
@@ -3,14 +3,14 @@
}:
stdenv.mkDerivation rec {
- version = "5.0-r1";
+ version = "5.2";
name = "rawtherapee-" + version;
src = fetchFromGitHub {
owner = "Beep6581";
repo = "RawTherapee";
- rev = version + "-gtk3";
- sha256 = "06v3ir5562yg4zk9z8kc8a7sw7da88193sizjlk74gh5d3smgr4q";
+ rev = version;
+ sha256 = "0i3cr3335bw8yxxzn6kcdx6ccinlnxzrdbgl3ld1kym1w2n5449k";
};
buildInputs = [
@@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
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/sane/backends/default.nix b/pkgs/applications/graphics/sane/backends/default.nix
index a3ca7fdd55d..20d5629b83a 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 4bd80c01c93..3ef23142b2e 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
@@ -67,7 +68,7 @@ stdenv.mkDerivation {
video- and still-cameras, frame-grabbers, etc. For a list of supported
scanners, see http://www.sane-project.org/sane-backends.html.
'';
- homepage = "http://www.sane-project.org/";
+ homepage = http://www.sane-project.org/;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ nckx peti ];
diff --git a/pkgs/applications/graphics/sane/frontends.nix b/pkgs/applications/graphics/sane/frontends.nix
index bd19ef3c43b..f6994db81e4 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/";
+ enableParallelBuilding = true;
+
+ meta = with stdenv.lib; {
description = "Scanner Access Now Easy";
- license = stdenv.lib.licenses.gpl2Plus;
-
- maintainers = [ stdenv.lib.maintainers.peti ];
- platforms = stdenv.lib.platforms.linux;
+ homepage = http://www.sane-project.org/;
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ peti ];
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/graphics/smartdeblur/default.nix b/pkgs/applications/graphics/smartdeblur/default.nix
index 083fde35902..55c856c1912 100644
--- a/pkgs/applications/graphics/smartdeblur/default.nix
+++ b/pkgs/applications/graphics/smartdeblur/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
cmakeFlags = "-DUSE_SYSTEM_FFTW=ON";
meta = {
- homepage = "https://github.com/Y-Vladimir/SmartDeblur";
+ homepage = https://github.com/Y-Vladimir/SmartDeblur;
description = "Tool for restoring blurry and defocused images";
license = stdenv.lib.licenses.gpl3;
maintainers = with stdenv.lib.maintainers; [ viric ];
diff --git a/pkgs/applications/graphics/solvespace/default.nix b/pkgs/applications/graphics/solvespace/default.nix
index 9026fc5d7cb..f8db30675b1 100644
--- a/pkgs/applications/graphics/solvespace/default.nix
+++ b/pkgs/applications/graphics/solvespace/default.nix
@@ -1,19 +1,19 @@
{ stdenv, fetchgit, cmake, pkgconfig, zlib, libpng, cairo, freetype
-, json_c, fontconfig, gtkmm2, pangomm, glew, mesa_glu, xlibs, pcre
+, json_c, fontconfig, gtkmm3, pangomm, glew, mesa_glu, xlibs, pcre
}:
stdenv.mkDerivation rec {
- name = "solvespace-2.3-20170416";
- rev = "b1d87bf284b32e875c8edba592113e691ea10bcd";
+ name = "solvespace-2.3-20170808";
+ rev = "16540b1b2c540a4b44500ac02aaa4493bccfba7e";
src = fetchgit {
url = https://github.com/solvespace/solvespace;
inherit rev;
- sha256 = "160qam04pfrwkh9qskfmjkj01wrjwhl09xi6jjxi009yqg3cff9l";
+ sha256 = "1z10i21xf3yagd984lp1hwasnsizx2s3faq3wdzzjngrikr2zn70";
fetchSubmodules = true;
};
buildInputs = [
cmake pkgconfig zlib libpng cairo freetype
- json_c fontconfig gtkmm2 pangomm glew mesa_glu
+ json_c fontconfig gtkmm3 pangomm glew mesa_glu
xlibs.libpthreadstubs xlibs.libXdmcp pcre
];
enableParallelBuilding = true;
diff --git a/pkgs/applications/graphics/sxiv/default.nix b/pkgs/applications/graphics/sxiv/default.nix
index 843352b2791..93bb5f151d9 100644
--- a/pkgs/applications/graphics/sxiv/default.nix
+++ b/pkgs/applications/graphics/sxiv/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Simple X Image Viewer";
- homepage = "https://github.com/muennich/sxiv";
+ homepage = https://github.com/muennich/sxiv;
license = stdenv.lib.licenses.gpl2Plus;
platforms = stdenv.lib.platforms.linux;
maintainers = with maintainers; [ jfrankenau fuuzetsu ];
diff --git a/pkgs/applications/graphics/tesseract/4.x.nix b/pkgs/applications/graphics/tesseract/4.x.nix
index 577bff91e35..156c911b9b8 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 a5643da8c3a..eb9a6383861 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/unigine-valley/default.nix b/pkgs/applications/graphics/unigine-valley/default.nix
index dc896e0b0d9..31908dcfd9f 100644
--- a/pkgs/applications/graphics/unigine-valley/default.nix
+++ b/pkgs/applications/graphics/unigine-valley/default.nix
@@ -104,7 +104,7 @@ in
meta = {
description = "The Unigine Valley GPU benchmarking tool";
- homepage = "http://unigine.com/products/benchmarks/valley/";
+ homepage = http://unigine.com/products/benchmarks/valley/;
license = stdenv.lib.licenses.unfree; # see also: $out/$instPath/documentation/License.pdf
maintainers = [ stdenv.lib.maintainers.kierdavis ];
platforms = ["x86_64-linux" "i686-linux"];
diff --git a/pkgs/applications/graphics/vimiv/default.nix b/pkgs/applications/graphics/vimiv/default.nix
index 023008183ff..38f63bdb383 100644
--- a/pkgs/applications/graphics/vimiv/default.nix
+++ b/pkgs/applications/graphics/vimiv/default.nix
@@ -64,7 +64,7 @@ python3Packages.buildPythonApplication rec {
postInstall = "make DESTDIR=\"$out\" install";
meta = {
- homepage = "https://github.com/karlch/vimiv";
+ homepage = https://github.com/karlch/vimiv;
description = "An image viewer with Vim-like keybindings";
license = lib.licenses.mit;
platforms = lib.platforms.linux;
diff --git a/pkgs/applications/graphics/xfractint/default.nix b/pkgs/applications/graphics/xfractint/default.nix
index 4b1040ce765..2269f1c18f1 100644
--- a/pkgs/applications/graphics/xfractint/default.nix
+++ b/pkgs/applications/graphics/xfractint/default.nix
@@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.unfree;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
- homepage = "https://www.fractint.net/";
+ homepage = https://www.fractint.net/;
};
}
diff --git a/pkgs/applications/graphics/xournal/default.nix b/pkgs/applications/graphics/xournal/default.nix
index 38573989266..cfad449fb02 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 d1a42443a88..00000000000
--- 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/yed/default.nix b/pkgs/applications/graphics/yed/default.nix
index 9af46f5cb35..dcb7c512dde 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 ];
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
license = licenses.unfree;
- homepage = "http://www.yworks.com/en/products/yfiles/yed/";
+ homepage = http://www.yworks.com/en/products/yfiles/yed/;
description = "A powerful desktop application that can be used to quickly and effectively generate high-quality diagrams";
platforms = jre.meta.platforms;
maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/applications/inferno/default.nix b/pkgs/applications/inferno/default.nix
index b1574ea6963..3f3c2a32e68 100644
--- a/pkgs/applications/inferno/default.nix
+++ b/pkgs/applications/inferno/default.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
meta = {
description = "A compact distributed operating system for building cross-platform distributed systems";
- homepage = "http://inferno-os.org/";
+ homepage = http://inferno-os.org/;
license = stdenv.lib.licenses.gpl2;
maintainers = with stdenv.lib.maintainers; [ doublec kovirobi ];
platforms = with stdenv.lib.platforms; linux;
diff --git a/pkgs/applications/kde/akonadi-calendar.nix b/pkgs/applications/kde/akonadi-calendar.nix
new file mode 100644
index 00000000000..ce6b6f75f93
--- /dev/null
+++ b/pkgs/applications/kde/akonadi-calendar.nix
@@ -0,0 +1,20 @@
+{
+ mkDerivation, lib, kdepimTeam,
+ extra-cmake-modules, kdoctools,
+ akonadi, akonadi-contacts, kcalcore, kcalutils, kcontacts,
+ kidentitymanagement, kio, kmailtransport,
+}:
+
+mkDerivation {
+ name = "akonadi-calendar";
+ meta = {
+ license = with lib.licenses; [ gpl2 lgpl21 ];
+ maintainers = kdepimTeam;
+ };
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ propagatedBuildInputs = [
+ akonadi akonadi-contacts kcalcore kcalutils kcontacts kidentitymanagement
+ kio kmailtransport
+ ];
+ outputs = [ "out" "dev" ];
+}
diff --git a/pkgs/applications/kde/akonadi-contacts.nix b/pkgs/applications/kde/akonadi-contacts.nix
index 3f410b7b8b9..b09058b60be 100644
--- a/pkgs/applications/kde/akonadi-contacts.nix
+++ b/pkgs/applications/kde/akonadi-contacts.nix
@@ -1,20 +1,24 @@
{
- mkDerivation, lib,
+ mkDerivation, lib, kdepimTeam,
extra-cmake-modules,
- akonadi, akonadi-mime, grantlee, kcontacts, kdbusaddons, ki18n, kiconthemes,
- kio, kitemmodels, kmime, ktextwidgets, qtwebengine,
+ qtwebengine,
+ grantlee,
+ kdbusaddons, ki18n, kiconthemes, kio, kitemmodels, ktextwidgets, prison,
+ akonadi, akonadi-mime, kcontacts, kmime,
}:
mkDerivation {
name = "akonadi-contacts";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 ];
- maintainers = [ lib.maintainers.ttuegel ];
+ maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
- akonadi-mime grantlee kcontacts kdbusaddons ki18n kiconthemes kio
- kitemmodels kmime ktextwidgets qtwebengine
+ qtwebengine
+ grantlee
+ kdbusaddons ki18n kiconthemes kio kitemmodels ktextwidgets prison
+ akonadi-mime kcontacts kmime
];
propagatedBuildInputs = [ akonadi ];
outputs = [ "out" "dev" ];
diff --git a/pkgs/applications/kde/akonadi-mime.nix b/pkgs/applications/kde/akonadi-mime.nix
index 98a341da6b6..52a17f5cbeb 100644
--- a/pkgs/applications/kde/akonadi-mime.nix
+++ b/pkgs/applications/kde/akonadi-mime.nix
@@ -1,18 +1,16 @@
{
- mkDerivation, lib,
- extra-cmake-modules,
- akonadi, kdbusaddons, ki18n, kio, kitemmodels, kmime,
- shared_mime_info
+ mkDerivation, lib, kdepimTeam,
+ extra-cmake-modules, shared_mime_info,
+ akonadi, kdbusaddons, ki18n, kio, kitemmodels, kmime
}:
mkDerivation {
name = "akonadi-mime";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 ];
- maintainers = [ lib.maintainers.ttuegel ];
+ maintainers = kdepimTeam;
};
- nativeBuildInputs = [ extra-cmake-modules ];
- buildInputs = [ akonadi shared_mime_info
- kdbusaddons ki18n kio kitemmodels kmime ];
+ nativeBuildInputs = [ extra-cmake-modules shared_mime_info ];
+ buildInputs = [ akonadi kdbusaddons ki18n kio kitemmodels kmime ];
outputs = [ "out" "dev" ];
}
diff --git a/pkgs/applications/kde/akonadi-notes.nix b/pkgs/applications/kde/akonadi-notes.nix
new file mode 100644
index 00000000000..72c4d799239
--- /dev/null
+++ b/pkgs/applications/kde/akonadi-notes.nix
@@ -0,0 +1,18 @@
+{
+ mkDerivation, lib, kdepimTeam,
+ extra-cmake-modules, kdoctools,
+ akonadi, kcompletion, ki18n, kitemmodels, kmime, kxmlgui
+}:
+
+mkDerivation {
+ name = "akonadi-notes";
+ meta = {
+ license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+ maintainers = kdepimTeam;
+ };
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ buildInputs = [
+ akonadi kcompletion ki18n kitemmodels kmime kxmlgui
+ ];
+ outputs = [ "out" "dev" ];
+}
diff --git a/pkgs/applications/kde/akonadi-search.nix b/pkgs/applications/kde/akonadi-search.nix
new file mode 100644
index 00000000000..617c086ad9c
--- /dev/null
+++ b/pkgs/applications/kde/akonadi-search.nix
@@ -0,0 +1,20 @@
+{
+ mkDerivation, lib, kdepimTeam,
+ extra-cmake-modules, kdoctools,
+ akonadi, akonadi-mime, kcalcore, kcmutils, kcontacts, kcoreaddons, kmime,
+ krunner, qtbase, xapian
+}:
+
+mkDerivation {
+ name = "akonadi-search";
+ meta = {
+ license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+ maintainers = kdepimTeam;
+ };
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ buildInputs = [ kcmutils krunner xapian ];
+ propagatedBuildInputs = [
+ akonadi akonadi-mime kcalcore kcontacts kcoreaddons kmime qtbase
+ ];
+ outputs = [ "out" "dev" ];
+}
diff --git a/pkgs/applications/kde/akonadi/akonadi-paths.patch b/pkgs/applications/kde/akonadi/akonadi-paths.patch
index f1ae1f23cc9..91fd934b1ec 100644
--- a/pkgs/applications/kde/akonadi/akonadi-paths.patch
+++ b/pkgs/applications/kde/akonadi/akonadi-paths.patch
@@ -33,7 +33,7 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp
- }
- const QString mysqladminPath = XdgBaseDirs::findExecutableFile(QStringLiteral("mysqladmin"), mysqldSearchPath);
-+ const QString mysqladminPath = QStringLiteral(NIXPKGS_MYSQL_MYSQLADMIN);
++ const QString mysqladminPath = QLatin1String(NIXPKGS_MYSQL_MYSQLADMIN);
if (!mysqladminPath.isEmpty()) {
#ifndef Q_OS_WIN
defaultCleanShutdownCommand = QStringLiteral("%1 --defaults-file=%2/mysql.conf --socket=%3/mysql.socket shutdown")
@@ -42,11 +42,11 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp
}
- mMysqlInstallDbPath = XdgBaseDirs::findExecutableFile(QStringLiteral("mysql_install_db"), mysqldSearchPath);
-+ mMysqlInstallDbPath = QStringLiteral(NIXPKGS_MYSQL_MYSQL_INSTALL_DB);
++ mMysqlInstallDbPath = QLatin1String(NIXPKGS_MYSQL_MYSQL_INSTALL_DB);
qCDebug(AKONADISERVER_LOG) << "Found mysql_install_db: " << mMysqlInstallDbPath;
- mMysqlCheckPath = XdgBaseDirs::findExecutableFile(QStringLiteral("mysqlcheck"), mysqldSearchPath);
-+ mMysqlCheckPath = QStringLiteral(NIXPKGS_MYSQL_MYSQLCHECK);
++ mMysqlCheckPath = QLatin1String(NIXPKGS_MYSQL_MYSQLCHECK);
qCDebug(AKONADISERVER_LOG) << "Found mysqlcheck: " << mMysqlCheckPath;
mInternalServer = settings.value(QStringLiteral("QMYSQL/StartServer"), defaultInternalServer).toBool();
@@ -55,7 +55,7 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp
mPassword = settings.value(QStringLiteral("Password")).toString();
mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString();
- mMysqldPath = settings.value(QStringLiteral("ServerPath"), defaultServerPath).toString();
-+ mMysqldPath = QStringLiteral(NIXPKGS_MYSQL_MYSQLD);
++ mMysqldPath = QLatin1String(NIXPKGS_MYSQL_MYSQLD);
mCleanServerShutdownCommand = settings.value(QStringLiteral("CleanServerShutdownCommand"), defaultCleanShutdownCommand).toString();
settings.endGroup();
@@ -84,7 +84,7 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp
// generate config file
- const QString globalConfig = XdgBaseDirs::findResourceFile("config", QStringLiteral("akonadi/mysql-global.conf"));
-+ const QString globalConfig = QStringLiteral(NIX_OUT "/etc/xdg/akonadi/mysql-global.conf");
++ const QString globalConfig = QLatin1String(NIX_OUT "/etc/xdg/akonadi/mysql-global.conf");
const QString localConfig = XdgBaseDirs::findResourceFile("config", QStringLiteral("akonadi/mysql-local.conf"));
const QString actualConfig = StandardDirs::saveDir("data") + QLatin1String("/mysql.conf");
if (globalConfig.isEmpty()) {
@@ -133,7 +133,7 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigpostgresql.cpp
-
- defaultServerPath = XdgBaseDirs::findExecutableFile(QStringLiteral("pg_ctl"), postgresSearchPath);
- defaultInitDbPath = XdgBaseDirs::findExecutableFile(QStringLiteral("initdb"), postgresSearchPath);
-+ defaultInitDbPath = QStringLiteral(NIXPKGS_POSTGRES_INITDB);
++ defaultInitDbPath = QLatin1String(NIXPKGS_POSTGRES_INITDB);
defaultHostName = Utils::preferredSocketDirectory(StandardDirs::saveDir("data", QStringLiteral("db_misc")));
defaultPgData = StandardDirs::saveDir("data", QStringLiteral("db_data"));
}
@@ -145,7 +145,7 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigpostgresql.cpp
- if (mInternalServer && mServerPath.isEmpty()) {
- mServerPath = defaultServerPath;
- }
-+ mServerPath = QStringLiteral(NIXPKGS_POSTGRES_PG_CTL);
++ mServerPath = QLatin1String(NIXPKGS_POSTGRES_PG_CTL);
qCDebug(AKONADISERVER_LOG) << "Found pg_ctl:" << mServerPath;
mInitDbPath = settings.value(QStringLiteral("InitDbPath"), defaultInitDbPath).toString();
if (mInternalServer && mInitDbPath.isEmpty()) {
@@ -166,7 +166,7 @@ Index: akonadi-17.04.0/src/akonadicontrol/agentprocessinstance.cpp
Q_ASSERT(agentInfo.launchMethod == AgentType::Launcher);
const QStringList arguments = QStringList() << executable << identifier();
- const QString agentLauncherExec = XdgBaseDirs::findExecutableFile(QStringLiteral("akonadi_agent_launcher"));
-+ const QString agentLauncherExec = QStringLiteral(NIX_OUT "/bin/akonadi_agent_launcher");
++ const QString agentLauncherExec = QLatin1String(NIX_OUT "/bin/akonadi_agent_launcher");
mController->start(agentLauncherExec, arguments);
}
return true;
@@ -179,13 +179,13 @@ Index: akonadi-17.04.0/src/akonadicontrol/agentmanager.cpp
mStorageController->setShutdownTimeout(15 * 1000); // the server needs more time for shutdown if we are using an internal mysqld
connect(mStorageController, &Akonadi::ProcessControl::unableToStart, this, &AgentManager::serverFailure);
- mStorageController->start(QStringLiteral("akonadiserver"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);
-+ mStorageController->start(QStringLiteral(NIX_OUT "/bin/akonadiserver"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);
++ mStorageController->start(QLatin1String(NIX_OUT "/bin/akonadiserver"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);
if (mAgentServerEnabled) {
mAgentServer = new Akonadi::ProcessControl;
connect(mAgentServer, &Akonadi::ProcessControl::unableToStart, this, &AgentManager::agentServerFailure);
- mAgentServer->start(QStringLiteral("akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);
-+ mAgentServer->start(QStringLiteral(NIX_OUT "/bin/akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);
++ mAgentServer->start(QLatin1String(NIX_OUT "/bin/akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);
}
#ifndef QT_NO_DEBUG
diff --git a/pkgs/applications/kde/akonadi/default.nix b/pkgs/applications/kde/akonadi/default.nix
index c2e34428474..bb7dac1b62a 100644
--- a/pkgs/applications/kde/akonadi/default.nix
+++ b/pkgs/applications/kde/akonadi/default.nix
@@ -1,28 +1,24 @@
{
- mkDerivation, copyPathsToStore, lib,
- extra-cmake-modules,
- kcompletion, kconfigwidgets, kdbusaddons, kdesignerplugin, kiconthemes,
- kwindowsystem, kcrash, kio,
- boost, kitemmodels, shared_mime_info,
- mysql
+ mkDerivation, copyPathsToStore, lib, kdepimTeam,
+ extra-cmake-modules, shared_mime_info,
+ boost, kcompletion, kconfigwidgets, kcrash, kdbusaddons, kdesignerplugin,
+ ki18n, kiconthemes, kio, kitemmodels, kwindowsystem, mysql, qttools,
}:
mkDerivation {
name = "akonadi";
meta = {
license = [ lib.licenses.lgpl21 ];
- maintainers = [ lib.maintainers.ttuegel ];
+ maintainers = kdepimTeam;
};
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
- nativeBuildInputs = [ extra-cmake-modules ];
+ nativeBuildInputs = [ extra-cmake-modules shared_mime_info ];
buildInputs = [
- kcompletion kconfigwidgets kdbusaddons kdesignerplugin kiconthemes kio
- kwindowsystem kcrash shared_mime_info
+ kcompletion kconfigwidgets kcrash kdbusaddons kdesignerplugin ki18n
+ kiconthemes kio kwindowsystem qttools
];
propagatedBuildInputs = [ boost kitemmodels ];
- cmakeFlags = [
- "-DMYSQLD_EXECUTABLE=${lib.getBin mysql}/bin/mysqld"
- ];
+ outputs = [ "out" "dev" ];
NIX_CFLAGS_COMPILE = [
''-DNIXPKGS_MYSQL_MYSQLD="${lib.getBin mysql}/bin/mysqld"''
''-DNIXPKGS_MYSQL_MYSQLADMIN="${lib.getBin mysql}/bin/mysqladmin"''
diff --git a/pkgs/applications/kde/akonadiconsole.nix b/pkgs/applications/kde/akonadiconsole.nix
new file mode 100644
index 00000000000..3d7bf26c794
--- /dev/null
+++ b/pkgs/applications/kde/akonadiconsole.nix
@@ -0,0 +1,21 @@
+{
+ mkDerivation, lib, kdepimTeam,
+ extra-cmake-modules, kdoctools,
+ akonadi, akonadi-contacts, calendarsupport, kcalcore, kcompletion,
+ kconfigwidgets, kcontacts, kdbusaddons, kitemmodels, kpimtextedit, libkdepim,
+ ktextwidgets, kxmlgui, messagelib, qtbase,
+}:
+
+mkDerivation {
+ name = "akonadiconsole";
+ meta = {
+ license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+ maintainers = kdepimTeam;
+ };
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ buildInputs = [
+ akonadi akonadi-contacts calendarsupport kcalcore kcompletion kconfigwidgets
+ kcontacts kdbusaddons kitemmodels kpimtextedit ktextwidgets kxmlgui
+ messagelib qtbase libkdepim
+ ];
+}
diff --git a/pkgs/applications/kde/akregator.nix b/pkgs/applications/kde/akregator.nix
new file mode 100644
index 00000000000..98d53bc8083
--- /dev/null
+++ b/pkgs/applications/kde/akregator.nix
@@ -0,0 +1,30 @@
+{
+ mkDerivation, lib, kdepimTeam,
+ extra-cmake-modules, kdoctools,
+ qtwebengine,
+ grantlee,
+ kcmutils, kcrash, kiconthemes, knotifyconfig, kparts, ktexteditor,
+ kwindowsystem,
+ akonadi, akonadi-mime, grantleetheme, kontactinterface, libkdepim, libkleo,
+ messagelib, syndication
+}:
+
+mkDerivation {
+ name = "akregator";
+ meta = {
+ license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+ maintainers = kdepimTeam;
+ };
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ buildInputs = [
+ qtwebengine
+
+ grantlee
+
+ kcmutils kcrash kiconthemes knotifyconfig kparts ktexteditor kwindowsystem
+
+ akonadi akonadi-mime grantleetheme kontactinterface libkdepim libkleo
+ messagelib syndication
+ ];
+ outputs = [ "out" "dev" ];
+}
diff --git a/pkgs/applications/kde/ark/default.nix b/pkgs/applications/kde/ark/default.nix
index df15f6b0f18..013e2e63f59 100644
--- a/pkgs/applications/kde/ark/default.nix
+++ b/pkgs/applications/kde/ark/default.nix
@@ -7,7 +7,7 @@
khtml, kio, kparts, kpty, kservice, kwidgetsaddons, libarchive,
# Archive tools
- p7zip, unzipNLS, zip,
+ p7zip, unzip, zip,
# Unfree tools
unfreeEnableUnrar ? false, unrar,
@@ -25,7 +25,7 @@ mkDerivation {
let
PATH =
lib.makeBinPath
- ([ p7zip unzipNLS zip ] ++ lib.optional unfreeEnableUnrar unrar);
+ ([ p7zip unzip zip ] ++ lib.optional unfreeEnableUnrar unrar);
in ''
wrapProgram "$out/bin/ark" --prefix PATH: "${PATH}"
'';
diff --git a/pkgs/applications/kde/build-support/application.nix b/pkgs/applications/kde/build-support/application.nix
deleted file mode 100644
index 892d82fb51e..00000000000
--- a/pkgs/applications/kde/build-support/application.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ mkDerivation, lib, srcs }:
-
-args:
-
-let
- inherit (args) name;
- sname = args.sname or name;
- inherit (srcs."${sname}") src version;
-in
-mkDerivation (args // {
- name = "${name}-${version}";
- inherit src;
-
- outputs = args.outputs or [ "out" "dev" ];
-
- meta = {
- platforms = lib.platforms.linux;
- homepage = "http://www.kde.org";
- } // (args.meta or {});
-})
diff --git a/pkgs/applications/kde/calendarsupport.nix b/pkgs/applications/kde/calendarsupport.nix
new file mode 100644
index 00000000000..485397ec4aa
--- /dev/null
+++ b/pkgs/applications/kde/calendarsupport.nix
@@ -0,0 +1,20 @@
+{
+ mkDerivation, lib, kdepimTeam,
+ extra-cmake-modules, kdoctools,
+ akonadi, akonadi-calendar, akonadi-mime, kcalutils, kdepim-apps-libs,
+ kholidays, kidentitymanagement, kmime, pimcommon, qttools,
+}:
+
+mkDerivation {
+ name = "calendarsupport";
+ meta = {
+ license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+ maintainers = kdepimTeam;
+ };
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ buildInputs = [
+ akonadi akonadi-mime kcalutils kdepim-apps-libs kholidays pimcommon qttools
+ ];
+ propagatedBuildInputs = [ akonadi-calendar kidentitymanagement kmime ];
+ outputs = [ "out" "dev" ];
+}
diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 207228a65b0..2053d183ff1 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -33,63 +33,123 @@ still shows most of the available features is in `./gwenview.nix`.
let
mirror = "mirror://kde";
srcs = import ./srcs.nix { inherit fetchurl mirror; };
-in
-let
+ mkDerivation = args:
+ let
+ inherit (args) name;
+ sname = args.sname or name;
+ inherit (srcs."${sname}") src version;
+ mkDerivation =
+ libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {};
+ in
+ mkDerivation (args // {
+ name = "${name}-${version}";
+ inherit src;
+
+ outputs = args.outputs or [ "out" ];
+
+ meta = {
+ platforms = lib.platforms.linux;
+ homepage = "http://www.kde.org";
+ } // (args.meta or {});
+ });
packages = self: with self;
let
callPackage = self.newScope {
- mkDerivation = import ./build-support/application.nix {
- inherit lib;
- inherit srcs;
- mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {};
- };
+ inherit mkDerivation;
+
+ # Team of maintainers assigned to the KDE PIM suite
+ kdepimTeam = with lib.maintainers; [ ttuegel vandenoever ];
};
in {
kdelibs = callPackage ./kdelibs { inherit attica phonon; };
akonadi = callPackage ./akonadi {};
+ akonadi-calendar = callPackage ./akonadi-calendar.nix {};
akonadi-contacts = callPackage ./akonadi-contacts.nix {};
akonadi-mime = callPackage ./akonadi-mime.nix {};
- ark = callPackage ./ark/default.nix {};
+ akonadi-notes = callPackage ./akonadi-notes.nix {};
+ akonadi-search = callPackage ./akonadi-search.nix {};
+ akonadiconsole = callPackage ./akonadiconsole.nix {};
+ akregator = callPackage ./akregator.nix {};
+ ark = callPackage ./ark {};
baloo-widgets = callPackage ./baloo-widgets.nix {};
+ calendarsupport = callPackage ./calendarsupport.nix {};
dolphin = callPackage ./dolphin.nix {};
dolphin-plugins = callPackage ./dolphin-plugins.nix {};
+ eventviews = callPackage ./eventviews.nix {};
ffmpegthumbs = callPackage ./ffmpegthumbs.nix { };
filelight = callPackage ./filelight.nix {};
+ grantleetheme = callPackage ./grantleetheme {};
gwenview = callPackage ./gwenview.nix {};
+ incidenceeditor = callPackage ./incidenceeditor.nix {};
k3b = callPackage ./k3b.nix {};
+ kaddressbook = callPackage ./kaddressbook.nix {};
+ kalarmcal = callPackage ./kalarmcal.nix {};
kate = callPackage ./kate.nix {};
- kdenlive = callPackage ./kdenlive.nix {};
- kcalc = callPackage ./kcalc.nix {};
kcachegrind = callPackage ./kcachegrind.nix {};
+ kcalc = callPackage ./kcalc.nix {};
+ kcalcore = callPackage ./kcalcore.nix {};
+ kcalutils = callPackage ./kcalutils.nix {};
kcolorchooser = callPackage ./kcolorchooser.nix {};
kcontacts = callPackage ./kcontacts.nix {};
+ kdav = callPackage ./kdav.nix {};
kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket.nix {};
kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {};
kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {};
+ kdenlive = callPackage ./kdenlive.nix {};
+ kdepim-runtime = callPackage ./kdepim-runtime.nix {};
+ kdepim-apps-libs = callPackage ./kdepim-apps-libs {};
kdf = callPackage ./kdf.nix {};
kgpg = callPackage ./kgpg.nix {};
khelpcenter = callPackage ./khelpcenter.nix {};
+ kholidays = callPackage ./kholidays.nix {};
+ kidentitymanagement = callPackage ./kidentitymanagement.nix {};
kig = callPackage ./kig.nix {};
+ kimap = callPackage ./kimap.nix {};
kio-extras = callPackage ./kio-extras.nix {};
+ kldap = callPackage ./kldap.nix {};
+ kleopatra = callPackage ./kleopatra.nix {};
+ kmail = callPackage ./kmail.nix {};
+ kmail-account-wizard = callPackage ./kmail-account-wizard.nix {};
+ kmailtransport = callPackage ./kmailtransport.nix {};
+ kmbox = callPackage ./kmbox.nix {};
kmime = callPackage ./kmime.nix {};
kmix = callPackage ./kmix.nix {};
kolourpaint = callPackage ./kolourpaint.nix {};
kompare = callPackage ./kompare.nix {};
konsole = callPackage ./konsole.nix {};
+ kontact = callPackage ./kontact.nix {};
+ kontactinterface = callPackage ./kontactinterface.nix {};
+ korganizer = callPackage ./korganizer.nix {};
+ kpimtextedit = callPackage ./kpimtextedit.nix {};
+ kqtquickcharts = callPackage ./kqtquickcharts.nix {};
krfb = callPackage ./krfb.nix {};
+ ktnef = callPackage ./ktnef.nix {};
kwalletmanager = callPackage ./kwalletmanager.nix {};
+ libgravatar = callPackage ./libgravatar.nix {};
libkcddb = callPackage ./libkcddb.nix {};
libkdcraw = callPackage ./libkdcraw.nix {};
+ libkdepim = callPackage ./libkdepim.nix {};
libkexiv2 = callPackage ./libkexiv2.nix {};
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 {};
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 {};
+ syndication = callPackage ./syndication.nix {};
l10n = recurseIntoAttrs (import ./l10n.nix { inherit callPackage lib recurseIntoAttrs; });
};
diff --git a/pkgs/applications/kde/eventviews.nix b/pkgs/applications/kde/eventviews.nix
new file mode 100644
index 00000000000..cc1e83f6581
--- /dev/null
+++ b/pkgs/applications/kde/eventviews.nix
@@ -0,0 +1,18 @@
+{
+ mkDerivation, lib, kdepimTeam,
+ extra-cmake-modules, kdoctools,
+ akonadi, calendarsupport, kcalutils, kdiagram, libkdepim, qtbase, qttools,
+}:
+
+mkDerivation {
+ name = "eventviews";
+ meta = {
+ license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+ maintainers = kdepimTeam;
+ };
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ buildInputs = [
+ akonadi calendarsupport kcalutils kdiagram libkdepim qtbase qttools
+ ];
+ outputs = [ "out" "dev" ];
+}
diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh
index ad521a2b038..11cbfcfe538 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.2/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/applications/17.08.1/ -A '*.tar.xz' )
diff --git a/pkgs/applications/kde/ffmpegthumbs.nix b/pkgs/applications/kde/ffmpegthumbs.nix
index 4e915422d14..aa03425f36a 100644
--- a/pkgs/applications/kde/ffmpegthumbs.nix
+++ b/pkgs/applications/kde/ffmpegthumbs.nix
@@ -11,5 +11,5 @@ mkDerivation {
maintainers = [ lib.maintainers.ttuegel ];
};
nativeBuildInputs = [ extra-cmake-modules ];
- propagatedBuildInputs = [ ffmpeg kio ];
+ buildInputs = [ ffmpeg kio ];
}
diff --git a/pkgs/applications/kde/grantleetheme/default.nix b/pkgs/applications/kde/grantleetheme/default.nix
new file mode 100644
index 00000000000..5035685c64f
--- /dev/null
+++ b/pkgs/applications/kde/grantleetheme/default.nix
@@ -0,0 +1,20 @@
+{
+ mkDerivation, copyPathsToStore, lib, kdepimTeam,
+ extra-cmake-modules, kdoctools,
+ grantlee5, ki18n, kiconthemes, knewstuff, kservice, kxmlgui, qtbase,
+}:
+
+mkDerivation {
+ name = "grantleetheme";
+ meta = {
+ license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+ maintainers = kdepimTeam;
+ };
+ output = [ "out" "dev" ];
+ patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ buildInputs = [
+ grantlee5 ki18n kiconthemes knewstuff kservice kxmlgui qtbase
+ ];
+ propagatedBuildInputs = [ grantlee5 kiconthemes knewstuff ];
+}
diff --git a/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch b/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch
new file mode 100644
index 00000000000..6275bb84c17
--- /dev/null
+++ b/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch
@@ -0,0 +1,155 @@
+Index: grantleetheme-17.04.0/src/grantleetheme_p.h
+===================================================================
+--- grantleetheme-17.04.0.orig/src/grantleetheme_p.h
++++ grantleetheme-17.04.0/src/grantleetheme_p.h
+@@ -47,7 +47,7 @@ public:
+ QString description;
+ QString name;
+ QString dirName;
+- QString absolutePath;
++ QStringList absolutePaths;
+ QString author;
+ QString email;
+
+Index: grantleetheme-17.04.0/src/grantleetheme.cpp
+===================================================================
+--- grantleetheme-17.04.0.orig/src/grantleetheme.cpp
++++ grantleetheme-17.04.0/src/grantleetheme.cpp
+@@ -45,7 +45,7 @@ ThemePrivate::ThemePrivate(const ThemePr
+ , description(other.description)
+ , name(other.name)
+ , dirName(other.dirName)
+- , absolutePath(other.absolutePath)
++ , absolutePaths(other.absolutePaths)
+ , author(other.author)
+ , email(other.email)
+ , loader(other.loader)
+@@ -63,12 +63,15 @@ void ThemePrivate::setupEngine()
+
+ void ThemePrivate::setupLoader()
+ {
+- // Get the parent dir with themes, we set the theme directory separately
+- QDir dir(absolutePath);
+- dir.cdUp();
++ QStringList templateDirs;
++ for (const QString& path : absolutePaths) {
++ QDir dir(path);
++ dir.cdUp();
++ templateDirs << dir.absolutePath();
++ }
+
+ loader = QSharedPointer::create();
+- loader->setTemplateDirs({ dir.absolutePath() });
++ loader->setTemplateDirs(templateDirs);
+ loader->setTheme(dirName);
+
+ if (!sEngine) {
+@@ -122,7 +123,7 @@ Theme::Theme(const QString &themePath, c
+ KConfigGroup group(&config, QStringLiteral("Desktop Entry"));
+ if (group.isValid()) {
+ d->dirName = dirName;
+- d->absolutePath = themePath;
++ d->absolutePaths = QStringList(themePath);
+ d->name = group.readEntry("Name", QString());
+ d->description = group.readEntry("Description", QString());
+ d->themeFileName = group.readEntry("FileName", QString());
+@@ -141,7 +142,7 @@ Theme::~Theme()
+
+ bool Theme::operator==(const Theme &other) const
+ {
+- return isValid() && other.isValid() && d->absolutePath == other.absolutePath();
++ return isValid() && other.isValid() && d->absolutePaths == other.absolutePaths();
+ }
+
+ Theme &Theme::operator=(const Theme &other)
+@@ -185,7 +186,12 @@ QString Theme::dirName() const
+
+ QString Theme::absolutePath() const
+ {
+- return d->absolutePath;
++ return d->absolutePaths.first();
++}
++
++QStringList Theme::absolutePaths() const
++{
++ return d->absolutePaths;
+ }
+
+ QString Theme::author() const
+@@ -224,6 +230,13 @@ QString Theme::render(const QString &tem
+ return result;
+ }
+
++void Theme::addThemeDir(const QString& path)
++{
++ QDir dir(path);
++ dir.cdUp();
++ d->absolutePaths << dir.absolutePath();
++}
++
+ void Theme::addPluginPath(const QString &path)
+ {
+ if (!ThemePrivate::sEngine) {
+Index: grantleetheme-17.04.0/src/grantleetheme.h
+===================================================================
+--- grantleetheme-17.04.0.orig/src/grantleetheme.h
++++ grantleetheme-17.04.0/src/grantleetheme.h
+@@ -50,11 +50,14 @@ public:
+ QStringList displayExtraVariables() const;
+ QString dirName() const;
+ QString absolutePath() const;
++ QStringList absolutePaths() const;
+ QString author() const;
+ QString authorEmail() const;
+
+ QString render(const QString &templateName, const QVariantHash &data, const QByteArray &applicationDomain = QByteArray());
+
++ void addThemeDir(const QString&);
++
+ static void addPluginPath(const QString &path);
+
+ private:
+Index: grantleetheme-17.04.0/src/grantleethememanager.cpp
+===================================================================
+--- grantleetheme-17.04.0.orig/src/grantleethememanager.cpp
++++ grantleetheme-17.04.0/src/grantleethememanager.cpp
+@@ -142,25 +142,18 @@ public:
+
+ for (const QString &directory : qAsConst(themesDirectories)) {
+ QDirIterator dirIt(directory, QStringList(), QDir::AllDirs | QDir::NoDotAndDotDot);
+- QStringList alreadyLoadedThemeName;
+ while (dirIt.hasNext()) {
+ dirIt.next();
+ const QString dirName = dirIt.fileName();
+ GrantleeTheme::Theme theme = q->loadTheme(dirIt.filePath(), dirName, defaultDesktopFileName);
+ if (theme.isValid()) {
+ QString themeName = theme.name();
+- if (alreadyLoadedThemeName.contains(themeName)) {
+- int i = 2;
+- const QString originalName(theme.name());
+- while (alreadyLoadedThemeName.contains(themeName)) {
+- themeName = originalName + QStringLiteral(" (%1)").arg(i);
+- ++i;
+- }
+- theme.d->name = themeName;
++ QMap::iterator i = themes.find(dirName);
++ if (i != themes.end()) {
++ i.value().addThemeDir(dirIt.filePath());
++ } else {
++ themes.insert(dirName, theme);
+ }
+- alreadyLoadedThemeName << themeName;
+- themes.insert(dirName, theme);
+- //qDebug()<<" theme.name()"<addDir(directory);
+@@ -374,7 +367,7 @@ QString ThemeManager::pathFromThemes(con
+ GrantleeTheme::Theme theme = loadTheme(dirIt.filePath(), dirName, defaultDesktopFileName);
+ if (theme.isValid()) {
+ if (dirName == themeName) {
+- return theme.absolutePath();
++ return theme.absolutePaths().first();
+ }
+ }
+ }
diff --git a/pkgs/applications/kde/grantleetheme/series b/pkgs/applications/kde/grantleetheme/series
new file mode 100644
index 00000000000..9095599ea56
--- /dev/null
+++ b/pkgs/applications/kde/grantleetheme/series
@@ -0,0 +1 @@
+grantlee-merge-theme-dirs.patch
diff --git a/pkgs/applications/kde/gwenview.nix b/pkgs/applications/kde/gwenview.nix
index 233566c1bda..3d03d1dea3e 100644
--- a/pkgs/applications/kde/gwenview.nix
+++ b/pkgs/applications/kde/gwenview.nix
@@ -3,7 +3,7 @@
extra-cmake-modules, kdoctools,
exiv2, lcms2,
baloo, kactivities, kdelibs4support, kio, kipi-plugins, libkdcraw, libkipi,
- phonon, qtimageformats, qtsvg, qtx11extras
+ phonon, qtimageformats, qtsvg, qtx11extras, kinit
}:
mkDerivation {
@@ -17,5 +17,5 @@ mkDerivation {
baloo exiv2 kactivities kdelibs4support kio libkdcraw lcms2 libkipi phonon
qtimageformats qtsvg qtx11extras
];
- propagatedUserEnvPkgs = [ kipi-plugins ];
+ propagatedUserEnvPkgs = [ kipi-plugins libkipi (lib.getBin kinit) ];
}
diff --git a/pkgs/applications/kde/incidenceeditor.nix b/pkgs/applications/kde/incidenceeditor.nix
new file mode 100644
index 00000000000..8224b98253b
--- /dev/null
+++ b/pkgs/applications/kde/incidenceeditor.nix
@@ -0,0 +1,20 @@
+{
+ mkDerivation, lib, kdepimTeam,
+ extra-cmake-modules, kdoctools,
+ akonadi, akonadi-mime, calendarsupport, eventviews, kdepim-apps-libs,
+ kdiagram, kldap, kmime, qtbase,
+}:
+
+mkDerivation {
+ name = "incidenceeditor";
+ meta = {
+ license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+ maintainers = kdepimTeam;
+ };
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ buildInputs = [
+ akonadi akonadi-mime calendarsupport eventviews kdepim-apps-libs kdiagram
+ kldap kmime qtbase
+ ];
+ outputs = [ "out" "dev" ];
+}
diff --git a/pkgs/applications/kde/k3b.nix b/pkgs/applications/kde/k3b.nix
index 79806dc93fb..b032de84879 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
+, ffmpeg, libmusicbrainz3, normalize, sox, transcode, kinit
}:
mkDerivation {
@@ -28,8 +28,9 @@ mkDerivation {
# cd/dvd
cdparanoia libdvdcss libdvdread
# others
- ffmpeg libmusicbrainz2 shared_mime_info
+ ffmpeg libmusicbrainz3 shared_mime_info
];
+ propagatedUserEnvPkgs = [ (lib.getBin kinit) ];
postFixup =
let k3bPath = lib.makeBinPath [
cdrdao cdrtools dvdplusrwtools libburn normalize sox transcode
diff --git a/pkgs/applications/kde/kaddressbook.nix b/pkgs/applications/kde/kaddressbook.nix
new file mode 100644
index 00000000000..b4b0450e78b
--- /dev/null
+++ b/pkgs/applications/kde/kaddressbook.nix
@@ -0,0 +1,22 @@
+{
+ mkDerivation, lib, kdepimTeam,
+ extra-cmake-modules, kdoctools,
+ akonadi, akonadi-search, grantlee, grantleetheme, kcmutils, kcompletion,
+ kcrash, kdbusaddons, kdepim-apps-libs, ki18n, kontactinterface, kparts,
+ kpimtextedit, kxmlgui, libkdepim, libkleo, mailcommon, pimcommon, prison,
+ qgpgme, qtbase,
+}:
+
+mkDerivation {
+ name = "kaddressbook";
+ meta = {
+ license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+ maintainers = kdepimTeam;
+ };
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ buildInputs = [
+ akonadi akonadi-search grantlee grantleetheme kcmutils kcompletion kcrash
+ kdbusaddons kdepim-apps-libs ki18n kontactinterface kparts kpimtextedit
+ kxmlgui libkdepim libkleo mailcommon pimcommon prison qgpgme qtbase
+ ];
+}
diff --git a/pkgs/applications/kde/kalarmcal.nix b/pkgs/applications/kde/kalarmcal.nix
new file mode 100644
index 00000000000..f2fb6f4d8bb
--- /dev/null
+++ b/pkgs/applications/kde/kalarmcal.nix
@@ -0,0 +1,19 @@
+{
+ mkDerivation, lib, kdepimTeam,
+ extra-cmake-modules, kdoctools,
+ akonadi, kcalcore, kdelibs4support, kholidays, kidentitymanagement,
+ kpimtextedit,
+}:
+
+mkDerivation {
+ name = "kalarmcal";
+ meta = {
+ license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+ maintainers = kdepimTeam;
+ };
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ propagatedBuildInputs = [
+ akonadi kcalcore kdelibs4support kholidays kidentitymanagement kpimtextedit
+ ];
+ outputs = [ "out" "dev" ];
+}
diff --git a/pkgs/applications/kde/kcachegrind.nix b/pkgs/applications/kde/kcachegrind.nix
index 19e01aeebe9..91faaef623a 100644
--- a/pkgs/applications/kde/kcachegrind.nix
+++ b/pkgs/applications/kde/kcachegrind.nix
@@ -1,8 +1,7 @@
{
mkDerivation, lib,
extra-cmake-modules, kdoctools,
- kio, ki18n, karchive, qttools,
- perl, python, php
+ karchive, ki18n, kio, perl, python, php, qttools,
}:
mkDerivation {
@@ -12,6 +11,5 @@ mkDerivation {
maintainers = with lib.maintainers; [ orivej ];
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
- propagatedBuildInputs = [ kio ];
- buildInputs = [ perl python php ki18n karchive qttools ];
+ buildInputs = [ karchive ki18n kio perl python php qttools ];
}
diff --git a/pkgs/applications/kde/kcalc.nix b/pkgs/applications/kde/kcalc.nix
index 856da42c835..2d902c220af 100644
--- a/pkgs/applications/kde/kcalc.nix
+++ b/pkgs/applications/kde/kcalc.nix
@@ -1,7 +1,8 @@
{
mkDerivation, lib,
extra-cmake-modules, kdoctools,
- kconfig, kconfigwidgets, kguiaddons, kinit, knotifications, gmp
+ gmp, kconfig, kconfigwidgets, kguiaddons, ki18n, kinit, knotifications,
+ kxmlgui,
}:
mkDerivation {
@@ -11,8 +12,7 @@ mkDerivation {
maintainers = [ lib.maintainers.fridh ];
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
- buildInputs = [ gmp ];
- propagatedBuildInputs = [
- kconfig kconfigwidgets kguiaddons kinit knotifications
+ buildInputs = [
+ gmp kconfig kconfigwidgets kguiaddons ki18n kinit knotifications kxmlgui
];
}
diff --git a/pkgs/applications/kde/kcalcore.nix b/pkgs/applications/kde/kcalcore.nix
new file mode 100644
index 00000000000..4ac9c9b925a
--- /dev/null
+++ b/pkgs/applications/kde/kcalcore.nix
@@ -0,0 +1,16 @@
+{
+ mkDerivation, lib, kdepimTeam,
+ extra-cmake-modules, kdoctools,
+ kdelibs4support, libical
+}:
+
+mkDerivation {
+ name = "kcalcore";
+ meta = {
+ license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+ maintainers = kdepimTeam;
+ };
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ propagatedBuildInputs = [ kdelibs4support libical ];
+ outputs = [ "out" "dev" ];
+}
diff --git a/pkgs/applications/kde/kcalutils.nix b/pkgs/applications/kde/kcalutils.nix
new file mode 100644
index 00000000000..3f6821e08ea
--- /dev/null
+++ b/pkgs/applications/kde/kcalutils.nix
@@ -0,0 +1,20 @@
+{
+ mkDerivation, lib, kdepimTeam,
+ extra-cmake-modules, kdoctools,
+ grantlee5, kcalcore, kconfig, kontactinterface, kcoreaddons, kdelibs4support,
+ kidentitymanagement, kpimtextedit,
+}:
+
+mkDerivation {
+ name = "kcalutils";
+ meta = {
+ license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+ maintainers = kdepimTeam;
+ };
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ buildInputs = [
+ grantlee5 kcalcore kconfig kontactinterface kcoreaddons kdelibs4support
+ kidentitymanagement kpimtextedit
+ ];
+ outputs = [ "out" "dev" ];
+}
diff --git a/pkgs/applications/kde/kcolorchooser.nix b/pkgs/applications/kde/kcolorchooser.nix
index 186505a050c..45b32fbe832 100644
--- a/pkgs/applications/kde/kcolorchooser.nix
+++ b/pkgs/applications/kde/kcolorchooser.nix
@@ -11,6 +11,5 @@ mkDerivation {
maintainers = [ lib.maintainers.ttuegel ];
};
nativeBuildInputs = [ extra-cmake-modules ];
- buildInputs = [ ki18n ];
- propagatedBuildInputs = [ kwidgetsaddons kxmlgui ];
+ buildInputs = [ ki18n kwidgetsaddons kxmlgui ];
}
diff --git a/pkgs/applications/kde/kcontacts.nix b/pkgs/applications/kde/kcontacts.nix
index 96828af9d17..12b3198a26b 100644
--- a/pkgs/applications/kde/kcontacts.nix
+++ b/pkgs/applications/kde/kcontacts.nix
@@ -1,5 +1,5 @@
{
- mkDerivation, lib,
+ mkDerivation, lib, kdepimTeam,
extra-cmake-modules,
kcoreaddons, kconfig, kcodecs, ki18n, qtbase,
}:
@@ -8,8 +8,9 @@ mkDerivation {
name = "kcontacts";
meta = {
license = [ lib.licenses.lgpl21 ];
- maintainers = [ lib.maintainers.ttuegel ];
+ maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ kcoreaddons kconfig kcodecs ki18n qtbase ];
+ outputs = [ "out" "dev" ];
}
diff --git a/pkgs/applications/kde/kdav.nix b/pkgs/applications/kde/kdav.nix
new file mode 100644
index 00000000000..800c92511de
--- /dev/null
+++ b/pkgs/applications/kde/kdav.nix
@@ -0,0 +1,16 @@
+{
+ mkDerivation, lib, kdepimTeam,
+ extra-cmake-modules, kdoctools,
+ kcoreaddons, kio, qtxmlpatterns,
+}:
+
+mkDerivation {
+ name = "kdav";
+ meta = {
+ license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+ maintainers = kdepimTeam;
+ };
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ buildInputs = [ kcoreaddons kio qtxmlpatterns ];
+ outputs = [ "out" "dev" ];
+}
diff --git a/pkgs/applications/kde/kdegraphics-mobipocket.nix b/pkgs/applications/kde/kdegraphics-mobipocket.nix
index 09f761df851..e5f5b88ec44 100644
--- a/pkgs/applications/kde/kdegraphics-mobipocket.nix
+++ b/pkgs/applications/kde/kdegraphics-mobipocket.nix
@@ -12,4 +12,5 @@ mkDerivation {
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ kio ];
+ outputs = [ "out" "dev" ];
}
diff --git a/pkgs/applications/kde/kdegraphics-thumbnailers.nix b/pkgs/applications/kde/kdegraphics-thumbnailers.nix
index 3302681bd85..2e43e946d7f 100644
--- a/pkgs/applications/kde/kdegraphics-thumbnailers.nix
+++ b/pkgs/applications/kde/kdegraphics-thumbnailers.nix
@@ -10,5 +10,5 @@ mkDerivation {
maintainers = [ lib.maintainers.ttuegel ];
};
nativeBuildInputs = [ extra-cmake-modules ];
- propagatedBuildInputs = [ kio libkexiv2 libkdcraw ];
+ buildInputs = [ kio libkexiv2 libkdcraw ];
}
diff --git a/pkgs/applications/kde/kdelibs/default.nix b/pkgs/applications/kde/kdelibs/default.nix
index e3abe89eade..31e578e228a 100644
--- a/pkgs/applications/kde/kdelibs/default.nix
+++ b/pkgs/applications/kde/kdelibs/default.nix
@@ -42,7 +42,7 @@ mkDerivation {
meta = {
platforms = lib.platforms.linux;
- homepage = "http://www.kde.org";
+ homepage = http://www.kde.org;
license = with lib.licenses; [ gpl2 fdl12 lgpl21 ];
maintainers = [ lib.maintainers.ttuegel ];
};
diff --git a/pkgs/applications/kde/kdenetwork-filesharing.nix b/pkgs/applications/kde/kdenetwork-filesharing.nix
index 62176f3f3bb..d251eb74f27 100644
--- a/pkgs/applications/kde/kdenetwork-filesharing.nix
+++ b/pkgs/applications/kde/kdenetwork-filesharing.nix
@@ -11,5 +11,5 @@ mkDerivation {
maintainers = [ lib.maintainers.ttuegel ];
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
- propagatedBuildInputs = [ kcoreaddons ki18n kio kwidgetsaddons samba ];
+ buildInputs = [ kcoreaddons ki18n kio kwidgetsaddons samba ];
}
diff --git a/pkgs/applications/kde/kdepim-apps-libs/default.nix b/pkgs/applications/kde/kdepim-apps-libs/default.nix
new file mode 100644
index 00000000000..6189e8706db
--- /dev/null
+++ b/pkgs/applications/kde/kdepim-apps-libs/default.nix
@@ -0,0 +1,21 @@
+{
+ mkDerivation, copyPathsToStore, lib, kdepimTeam,
+ extra-cmake-modules, kdoctools,
+ akonadi, akonadi-contacts, grantlee, grantleetheme, kconfig, kconfigwidgets,
+ kcontacts, ki18n, kiconthemes, kio, libkleo, pimcommon, prison,
+}:
+
+mkDerivation {
+ name = "kdepim-apps-libs";
+ meta = {
+ license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+ maintainers = kdepimTeam;
+ };
+ patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ buildInputs = [
+ akonadi akonadi-contacts grantlee grantleetheme kconfig kconfigwidgets
+ kcontacts ki18n kiconthemes kio libkleo pimcommon prison
+ ];
+ outputs = [ "out" "dev" ];
+}
diff --git a/pkgs/applications/kde/kdepim-apps-libs/kdepim-apps-libs-grantlee-merge-theme-dirs.patch b/pkgs/applications/kde/kdepim-apps-libs/kdepim-apps-libs-grantlee-merge-theme-dirs.patch
new file mode 100644
index 00000000000..02c369cc4ee
--- /dev/null
+++ b/pkgs/applications/kde/kdepim-apps-libs/kdepim-apps-libs-grantlee-merge-theme-dirs.patch
@@ -0,0 +1,62 @@
+Index: kdepim-apps-libs-17.04.0/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.cpp
+===================================================================
+--- kdepim-apps-libs-17.04.0.orig/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.cpp
++++ kdepim-apps-libs-17.04.0/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.cpp
+@@ -50,9 +50,9 @@ public:
+ mTemplateLoader.clear();
+ }
+
+- void changeGrantleePath(const QString &path)
++ void changeGrantleePath(const QStringList &paths)
+ {
+- mTemplateLoader->setTemplateDirs(QStringList() << path);
++ mTemplateLoader->setTemplateDirs(paths);
+ mEngine->addTemplateLoader(mTemplateLoader);
+
+ mSelfcontainedTemplate = mEngine->loadByName(QStringLiteral("contactgroup.html"));
+@@ -86,12 +86,12 @@ GrantleeContactGroupFormatter::~Grantlee
+
+ void GrantleeContactGroupFormatter::setAbsoluteThemePath(const QString &path)
+ {
+- d->changeGrantleePath(path);
++ d->changeGrantleePath(QStringList(path));
+ }
+
+ void GrantleeContactGroupFormatter::setGrantleeTheme(const GrantleeTheme::Theme &theme)
+ {
+- d->changeGrantleePath(theme.absolutePath());
++ d->changeGrantleePath(theme.absolutePaths());
+ }
+
+ inline static void setHashField(QVariantHash &hash, const QString &name, const QString &value)
+Index: kdepim-apps-libs-17.04.0/kaddressbookgrantlee/src/formatter/grantleecontactformatter.cpp
+===================================================================
+--- kdepim-apps-libs-17.04.0.orig/kaddressbookgrantlee/src/formatter/grantleecontactformatter.cpp
++++ kdepim-apps-libs-17.04.0/kaddressbookgrantlee/src/formatter/grantleecontactformatter.cpp
+@@ -74,9 +74,9 @@ public:
+ mTemplateLoader.clear();
+ }
+
+- void changeGrantleePath(const QString &path)
++ void changeGrantleePath(const QStringList &paths)
+ {
+- mTemplateLoader->setTemplateDirs(QStringList() << path);
++ mTemplateLoader->setTemplateDirs(paths);
+ mEngine->addTemplateLoader(mTemplateLoader);
+
+ mSelfcontainedTemplate = mEngine->loadByName(QStringLiteral("contact.html"));
+@@ -112,12 +112,12 @@ GrantleeContactFormatter::~GrantleeConta
+
+ void GrantleeContactFormatter::setAbsoluteThemePath(const QString &path)
+ {
+- d->changeGrantleePath(path);
++ d->changeGrantleePath(QStringList(path));
+ }
+
+ void GrantleeContactFormatter::setGrantleeTheme(const GrantleeTheme::Theme &theme)
+ {
+- d->changeGrantleePath(theme.absolutePath());
++ d->changeGrantleePath(theme.absolutePaths());
+ }
+
+ void GrantleeContactFormatter::setForceDisableQRCode(bool b)
diff --git a/pkgs/applications/kde/kdepim-apps-libs/series b/pkgs/applications/kde/kdepim-apps-libs/series
new file mode 100644
index 00000000000..1e8a52b55e9
--- /dev/null
+++ b/pkgs/applications/kde/kdepim-apps-libs/series
@@ -0,0 +1 @@
+kdepim-apps-libs-grantlee-merge-theme-dirs.patch
diff --git a/pkgs/applications/kde/kdepim-runtime.nix b/pkgs/applications/kde/kdepim-runtime.nix
new file mode 100644
index 00000000000..0fde861a023
--- /dev/null
+++ b/pkgs/applications/kde/kdepim-runtime.nix
@@ -0,0 +1,26 @@
+{
+ mkDerivation, lib, kdepimTeam,
+ extra-cmake-modules, kdoctools,
+ shared_mime_info,
+ akonadi, akonadi-calendar, akonadi-contacts, akonadi-mime, akonadi-notes,
+ kalarmcal, kcalutils, kcontacts, kdav, kdelibs4support, kidentitymanagement,
+ kimap, kmailtransport, kmbox, kmime, knotifications, knotifyconfig,
+ pimcommon, qtwebengine,
+}:
+
+mkDerivation {
+ name = "kdepim-runtime";
+ meta = {
+ license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+ maintainers = kdepimTeam;
+ };
+ nativeBuildInputs = [ extra-cmake-modules kdoctools shared_mime_info ];
+ buildInputs = [
+ 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/kdf.nix b/pkgs/applications/kde/kdf.nix
index 333fea3df53..eef94fd5eb2 100644
--- a/pkgs/applications/kde/kdf.nix
+++ b/pkgs/applications/kde/kdf.nix
@@ -1,7 +1,7 @@
{
mkDerivation, lib,
extra-cmake-modules, kdoctools,
- kcmutils
+ kcmutils, ki18n, kiconthemes, kio, knotifications, kxmlgui,
}:
mkDerivation {
@@ -11,5 +11,5 @@ mkDerivation {
maintainers = [ lib.maintainers.peterhoeg ];
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
- propagatedBuildInputs = [ kcmutils ];
+ buildInputs = [ kcmutils ki18n kiconthemes kio knotifications kxmlgui ];
}
diff --git a/pkgs/applications/kde/kgpg.nix b/pkgs/applications/kde/kgpg.nix
index ca495a1ae26..33813f376a5 100644
--- a/pkgs/applications/kde/kgpg.nix
+++ b/pkgs/applications/kde/kgpg.nix
@@ -1,19 +1,18 @@
{
mkDerivation, lib,
extra-cmake-modules, kdoctools, ki18n, makeWrapper,
- akonadi-contacts, gnupg1, gpgme, karchive, kcodecs, kcontacts, kcoreaddons,
+ akonadi-contacts, gnupg1, karchive, kcodecs, kcontacts, kcoreaddons,
kcrash, kdbusaddons, kiconthemes, kjobwidgets, kio, knotifications, kservice,
- ktextwidgets, kxmlgui, kwidgetsaddons, kwindowsystem
+ ktextwidgets, kxmlgui, kwidgetsaddons, kwindowsystem, qgpgme,
}:
mkDerivation {
name = "kgpg";
nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ];
- buildInputs = [ gnupg1 gpgme ki18n ];
- propagatedBuildInputs = [
- akonadi-contacts karchive kcodecs kcontacts kcoreaddons kcrash kdbusaddons
- kiconthemes kjobwidgets kio knotifications kservice ktextwidgets kxmlgui
- kwidgetsaddons kwindowsystem
+ buildInputs = [
+ akonadi-contacts gnupg1 karchive kcodecs kcontacts kcoreaddons kcrash
+ kdbusaddons ki18n kiconthemes kjobwidgets kio knotifications kservice
+ ktextwidgets kxmlgui kwidgetsaddons kwindowsystem qgpgme
];
postFixup = ''
wrapProgram "$out/bin/kgpg" --prefix PATH : "${lib.makeBinPath [ gnupg1 ]}"
diff --git a/pkgs/applications/kde/khelpcenter.nix b/pkgs/applications/kde/khelpcenter.nix
index db68cec976e..69b629bbeb9 100644
--- a/pkgs/applications/kde/khelpcenter.nix
+++ b/pkgs/applications/kde/khelpcenter.nix
@@ -1,16 +1,15 @@
{
mkDerivation,
extra-cmake-modules, kdoctools,
- grantlee, kconfig, kcoreaddons, kdbusaddons, ki18n, kinit, kcmutils,
- kdelibs4support, khtml, kservice, xapian
+ grantlee, kcmutils, kconfig, kcoreaddons, kdbusaddons, kdelibs4support, ki18n,
+ kinit, khtml, kservice, xapian
}:
mkDerivation {
name = "khelpcenter";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
- buildInputs = [ ki18n xapian ];
- propagatedBuildInputs = [
- grantlee kdelibs4support khtml kconfig kcoreaddons kdbusaddons
- kinit kcmutils kservice
+ buildInputs = [
+ grantlee kcmutils kconfig kcoreaddons kdbusaddons kdelibs4support khtml
+ ki18n kinit kservice xapian
];
}
diff --git a/pkgs/applications/kde/kholidays.nix b/pkgs/applications/kde/kholidays.nix
new file mode 100644
index 00000000000..352bec09492
--- /dev/null
+++ b/pkgs/applications/kde/kholidays.nix
@@ -0,0 +1,16 @@
+{
+ mkDerivation, lib, kdepimTeam,
+ extra-cmake-modules, kdoctools,
+ qtbase, qtdeclarative, qttools,
+}:
+
+mkDerivation {
+ name = "kholidays";
+ meta = {
+ license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+ maintainers = kdepimTeam;
+ };
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ buildInputs = [ qtbase qtdeclarative qttools ];
+ outputs = [ "out" "dev" ];
+}
diff --git a/pkgs/applications/kde/kidentitymanagement.nix b/pkgs/applications/kde/kidentitymanagement.nix
new file mode 100644
index 00000000000..92fcc238779
--- /dev/null
+++ b/pkgs/applications/kde/kidentitymanagement.nix
@@ -0,0 +1,20 @@
+{
+ mkDerivation, lib, kdepimTeam,
+ extra-cmake-modules, kdoctools,
+ kcompletion, kcoreaddons, kemoticons, kiconthemes, kio, kpimtextedit,
+ ktextwidgets, kxmlgui
+}:
+
+mkDerivation {
+ name = "kidentitymanagement";
+ meta = {
+ license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+ maintainers = kdepimTeam;
+ };
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ buildInputs = [
+ kcompletion kemoticons kiconthemes kio ktextwidgets kxmlgui
+ ];
+ propagatedBuildInputs = [ kcoreaddons kpimtextedit ];
+ outputs = [ "out" "dev" ];
+}
diff --git a/pkgs/applications/kde/kig.nix b/pkgs/applications/kde/kig.nix
index 34b32896209..7b858907795 100644
--- a/pkgs/applications/kde/kig.nix
+++ b/pkgs/applications/kde/kig.nix
@@ -1,8 +1,8 @@
{
mkDerivation, lib,
extra-cmake-modules, kdoctools,
- kparts, qtsvg, qtxmlpatterns, ktexteditor, boost,
- karchive, kcrash
+ boost, karchive, kcrash, kiconthemes, kparts, ktexteditor, qtsvg,
+ qtxmlpatterns,
}:
mkDerivation {
@@ -12,9 +12,8 @@ mkDerivation {
maintainers = with lib.maintainers; [ raskin ];
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
- buildInputs = [ boost ];
- propagatedBuildInputs = [
- kparts qtsvg qtxmlpatterns ktexteditor karchive kcrash
+ buildInputs = [
+ boost karchive kcrash kiconthemes kparts ktexteditor qtsvg qtxmlpatterns
];
}
diff --git a/pkgs/applications/kde/kimap.nix b/pkgs/applications/kde/kimap.nix
new file mode 100644
index 00000000000..9e42c571058
--- /dev/null
+++ b/pkgs/applications/kde/kimap.nix
@@ -0,0 +1,17 @@
+{
+ mkDerivation, lib, kdepimTeam,
+ extra-cmake-modules, kdoctools,
+ cyrus_sasl, kcoreaddons, ki18n, kio, kmime
+}:
+
+mkDerivation {
+ name = "kimap";
+ meta = {
+ license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+ maintainers = kdepimTeam;
+ };
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ buildInputs = [ ki18n kio ];
+ propagatedBuildInputs = [ cyrus_sasl kcoreaddons kmime ];
+ outputs = [ "out" "dev" ];
+}
diff --git a/pkgs/applications/kde/kio-extras.nix b/pkgs/applications/kde/kio-extras.nix
index 50709a7ddef..a78da6f48ca 100644
--- a/pkgs/applications/kde/kio-extras.nix
+++ b/pkgs/applications/kde/kio-extras.nix
@@ -13,7 +13,7 @@ mkDerivation {
maintainers = [ lib.maintainers.ttuegel ];
};
nativeBuildInputs = [ extra-cmake-modules kdoctools shared_mime_info ];
- propagatedBuildInputs = [
+ buildInputs = [
exiv2 kactivities karchive kbookmarks kconfig kconfigwidgets kcoreaddons
kdbusaddons kguiaddons kdnssd kiconthemes ki18n kio khtml kdelibs4support
kpty libmtp libssh openexr openslp phonon qtsvg samba solid
diff --git a/pkgs/applications/kde/kldap.nix b/pkgs/applications/kde/kldap.nix
new file mode 100644
index 00000000000..14a8aea5e67
--- /dev/null
+++ b/pkgs/applications/kde/kldap.nix
@@ -0,0 +1,17 @@
+{
+ mkDerivation, lib, kdepimTeam,
+ extra-cmake-modules, kdoctools,
+ cyrus_sasl, ki18n, kio, kmbox, openldap
+}:
+
+mkDerivation {
+ name = "kldap";
+ meta = {
+ license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+ maintainers = kdepimTeam;
+ };
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ buildInputs = [ ki18n kio kmbox ];
+ propagatedBuildInputs = [ cyrus_sasl openldap ];
+ outputs = [ "out" "dev" ];
+}
diff --git a/pkgs/applications/kde/kleopatra.nix b/pkgs/applications/kde/kleopatra.nix
new file mode 100644
index 00000000000..a19fef9c9ed
--- /dev/null
+++ b/pkgs/applications/kde/kleopatra.nix
@@ -0,0 +1,19 @@
+{
+ mkDerivation, lib, kdepimTeam,
+ extra-cmake-modules, kdoctools,
+ boost, gpgme, kcmutils, kdbusaddons, kiconthemes, kitemmodels, kmime,
+ knotifications, kwindowsystem, kxmlgui, libkleo
+}:
+
+mkDerivation {
+ name = "kleopatra";
+ meta = {
+ license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+ maintainers = kdepimTeam;
+ };
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ buildInputs = [
+ boost gpgme kcmutils kdbusaddons kiconthemes kitemmodels kmime
+ knotifications kwindowsystem kxmlgui libkleo
+ ];
+}
diff --git a/pkgs/applications/kde/kmail-account-wizard.nix b/pkgs/applications/kde/kmail-account-wizard.nix
new file mode 100644
index 00000000000..9f3d5e2ea01
--- /dev/null
+++ b/pkgs/applications/kde/kmail-account-wizard.nix
@@ -0,0 +1,21 @@
+{
+ mkDerivation, lib, kdepimTeam,
+ extra-cmake-modules, kdoctools, shared_mime_info,
+ akonadi, kcmutils, kcrash, kdbusaddons, kidentitymanagement, kldap,
+ kmailtransport, knewstuff, knotifications, knotifyconfig, kparts, kross, ktexteditor,
+ kwallet, libkdepim, libkleo, pimcommon, qttools,
+}:
+
+mkDerivation {
+ name = "kmail-account-wizard";
+ meta = {
+ license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+ maintainers = kdepimTeam;
+ };
+ nativeBuildInputs = [ extra-cmake-modules kdoctools shared_mime_info ];
+ buildInputs = [
+ akonadi kcmutils kcrash kdbusaddons kidentitymanagement kldap kmailtransport
+ knewstuff knotifications knotifyconfig kparts kross ktexteditor kwallet libkdepim
+ libkleo pimcommon qttools
+ ];
+}
diff --git a/pkgs/applications/kde/kmail.nix b/pkgs/applications/kde/kmail.nix
new file mode 100644
index 00000000000..acb200c5970
--- /dev/null
+++ b/pkgs/applications/kde/kmail.nix
@@ -0,0 +1,29 @@
+{
+ mkDerivation, lib, kdepimTeam,
+ extra-cmake-modules, kdoctools,
+ akonadi-search, kbookmarks, kcalutils, kcmutils, kcompletion, kconfig,
+ 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,
+ kwidgetsaddons, kwindowsystem, kxmlgui, libgravatar, libksieve, mailcommon,
+ messagelib, pim-sieve-editor, qtscript, qtwebengine,
+}:
+
+mkDerivation {
+ name = "kmail";
+ meta = {
+ license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+ maintainers = kdepimTeam;
+ };
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ buildInputs = [
+ akonadi-search kbookmarks kcalutils kcmutils kcompletion kconfig
+ kconfigwidgets kcoreaddons kdelibs4support kdepim-apps-libs kguiaddons ki18n
+ 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
+ ];
+ propagatedUserEnvPkgs = [ kdepim-runtime kwallet ];
+}
diff --git a/pkgs/applications/kde/kmailtransport.nix b/pkgs/applications/kde/kmailtransport.nix
new file mode 100644
index 00000000000..19ce2ba94f3
--- /dev/null
+++ b/pkgs/applications/kde/kmailtransport.nix
@@ -0,0 +1,17 @@
+{
+ mkDerivation, lib, kdepimTeam,
+ extra-cmake-modules, kdoctools,
+ akonadi, akonadi-mime, cyrus_sasl, kcmutils, ki18n, kio, kmime, kwallet,
+}:
+
+mkDerivation {
+ name = "kmailtransport";
+ meta = {
+ license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+ maintainers = kdepimTeam;
+ };
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ buildInputs = [ akonadi kcmutils ki18n kio ];
+ propagatedBuildInputs = [ akonadi-mime cyrus_sasl kmime kwallet ];
+ outputs = [ "out" "dev" ];
+}
diff --git a/pkgs/applications/kde/kmbox.nix b/pkgs/applications/kde/kmbox.nix
new file mode 100644
index 00000000000..4b6b72a3734
--- /dev/null
+++ b/pkgs/applications/kde/kmbox.nix
@@ -0,0 +1,16 @@
+{
+ mkDerivation, lib, kdepimTeam,
+ extra-cmake-modules, kdoctools,
+ kmime, qtbase,
+}:
+
+mkDerivation {
+ name = "kmbox";
+ meta = {
+ license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+ maintainers = kdepimTeam;
+ };
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ buildInputs = [ kmime qtbase ];
+ outputs = [ "out" "dev" ];
+}
diff --git a/pkgs/applications/kde/kmime.nix b/pkgs/applications/kde/kmime.nix
index b14e0abcc3f..b18a3f7fdc1 100644
--- a/pkgs/applications/kde/kmime.nix
+++ b/pkgs/applications/kde/kmime.nix
@@ -1,5 +1,5 @@
{
- mkDerivation, lib,
+ mkDerivation, lib, kdepimTeam,
extra-cmake-modules, ki18n,
kcodecs, qtbase,
}:
@@ -8,8 +8,9 @@ mkDerivation {
name = "kmime";
meta = {
license = [ lib.licenses.lgpl21 ];
- maintainers = [ lib.maintainers.ttuegel ];
+ maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules ki18n ];
buildInputs = [ kcodecs qtbase ];
+ outputs = [ "out" "dev" ];
}
diff --git a/pkgs/applications/kde/kmix.nix b/pkgs/applications/kde/kmix.nix
index 058fd8178c4..8010c57d927 100644
--- a/pkgs/applications/kde/kmix.nix
+++ b/pkgs/applications/kde/kmix.nix
@@ -12,12 +12,9 @@ mkDerivation {
maintainers = [ lib.maintainers.rongcuid ];
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
- buildInputs = [ libpulseaudio alsaLib libcanberra_kde ];
- propagatedBuildInputs = [
- kglobalaccel kxmlgui kcoreaddons kdelibs4support
- plasma-framework
- ];
- cmakeFlags = [
- "-DKMIX_KF5_BUILD=1"
+ buildInputs = [
+ alsaLib kglobalaccel kxmlgui kcoreaddons kdelibs4support
+ libcanberra_kde libpulseaudio plasma-framework
];
+ cmakeFlags = [ "-DKMIX_KF5_BUILD=1" ];
}
diff --git a/pkgs/applications/kde/kolourpaint.nix b/pkgs/applications/kde/kolourpaint.nix
index db4cb75cc35..4501324a871 100644
--- a/pkgs/applications/kde/kolourpaint.nix
+++ b/pkgs/applications/kde/kolourpaint.nix
@@ -9,7 +9,7 @@
mkDerivation {
name = "kolourpaint";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
- propagatedBuildInputs = [ kdelibs4support libkexiv2 ];
+ buildInputs = [ kdelibs4support libkexiv2 ];
meta = {
maintainers = [ lib.maintainers.fridh ];
license = with lib.licenses; [ gpl2 ];
diff --git a/pkgs/applications/kde/kompare.nix b/pkgs/applications/kde/kompare.nix
index cf2fa2e6a10..bbaad3a02f8 100644
--- a/pkgs/applications/kde/kompare.nix
+++ b/pkgs/applications/kde/kompare.nix
@@ -1,14 +1,15 @@
{
mkDerivation, lib,
extra-cmake-modules, kdoctools,
- kparts, ktexteditor, kwidgetsaddons, libkomparediff2
+ kiconthemes, kparts, ktexteditor, kwidgetsaddons, libkomparediff2
}:
mkDerivation {
name = "kompare";
meta = { license = with lib.licenses; [ gpl2 ]; };
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
- propagatedBuildInputs = [
- kparts ktexteditor kwidgetsaddons libkomparediff2
+ buildInputs = [
+ kiconthemes kparts ktexteditor kwidgetsaddons libkomparediff2
];
+ outputs = [ "out" "dev" ];
}
diff --git a/pkgs/applications/kde/konsole.nix b/pkgs/applications/kde/konsole.nix
index bd026c6f039..5269941fa11 100644
--- a/pkgs/applications/kde/konsole.nix
+++ b/pkgs/applications/kde/konsole.nix
@@ -14,10 +14,10 @@ mkDerivation {
maintainers = [ lib.maintainers.ttuegel ];
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
- buildInputs = [ ki18n ];
- propagatedBuildInputs = [
+ buildInputs = [
kbookmarks kcompletion kconfig kconfigwidgets kcoreaddons kdelibs4support
- kguiaddons kiconthemes kinit kio knotifications knotifyconfig kparts kpty
+ kguiaddons ki18n kiconthemes kinit kio knotifications knotifyconfig kparts kpty
kservice ktextwidgets kwidgetsaddons kwindowsystem kxmlgui qtscript
];
+ propagatedUserEnvPkgs = [ (lib.getBin kinit) ];
}
diff --git a/pkgs/applications/kde/kontact.nix b/pkgs/applications/kde/kontact.nix
new file mode 100644
index 00000000000..bb44762e65c
--- /dev/null
+++ b/pkgs/applications/kde/kontact.nix
@@ -0,0 +1,23 @@
+{
+ mkDerivation, lib, kdepimTeam,
+ extra-cmake-modules, kdoctools,
+ qtwebengine,
+ kcmutils, kcrash, kdbusaddons, kwindowsystem,
+ akonadi, grantleetheme, kdepim-apps-libs, kontactinterface, kpimtextedit,
+ mailcommon, libkdepim
+}:
+
+mkDerivation {
+ name = "kontact";
+ meta = {
+ license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+ maintainers = kdepimTeam;
+ };
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ buildInputs = [
+ qtwebengine
+ kcmutils kcrash kdbusaddons kwindowsystem
+ akonadi grantleetheme kdepim-apps-libs kontactinterface kpimtextedit
+ mailcommon libkdepim
+ ];
+}
diff --git a/pkgs/applications/kde/kontactinterface.nix b/pkgs/applications/kde/kontactinterface.nix
new file mode 100644
index 00000000000..f2df628f301
--- /dev/null
+++ b/pkgs/applications/kde/kontactinterface.nix
@@ -0,0 +1,17 @@
+{
+ mkDerivation, lib, kdepimTeam,
+ extra-cmake-modules, kdoctools,
+ kiconthemes, kparts, kwindowsystem, kxmlgui
+}:
+
+mkDerivation {
+ name = "kontactinterface";
+ meta = {
+ license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+ maintainers = kdepimTeam;
+ };
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ buildInputs = [
+ kiconthemes kparts kwindowsystem kxmlgui
+ ];
+}
diff --git a/pkgs/applications/kde/korganizer.nix b/pkgs/applications/kde/korganizer.nix
new file mode 100644
index 00000000000..2f37a1bac0f
--- /dev/null
+++ b/pkgs/applications/kde/korganizer.nix
@@ -0,0 +1,29 @@
+{
+ mkDerivation, lib, kdepimTeam,
+ extra-cmake-modules, kdoctools,
+ qtbase, qttools,
+ phonon,
+ knewstuff,
+ akonadi-calendar, akonadi-contacts, akonadi-notes, akonadi-search,
+ calendarsupport, eventviews, incidenceeditor, kcalutils, kdepim-apps-libs,
+ kholidays, kidentitymanagement, kldap, kmailtransport, kontactinterface,
+ kpimtextedit, pimcommon,
+}:
+
+mkDerivation {
+ name = "korganizer";
+ meta = {
+ license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+ maintainers = kdepimTeam;
+ };
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ propagatedBuildInputs = [
+ qtbase qttools
+ phonon
+ knewstuff
+ akonadi-calendar akonadi-contacts akonadi-notes akonadi-search
+ calendarsupport eventviews incidenceeditor kcalutils kdepim-apps-libs
+ kholidays kidentitymanagement kldap kmailtransport kontactinterface
+ kpimtextedit pimcommon
+ ];
+}
diff --git a/pkgs/applications/kde/kpimtextedit.nix b/pkgs/applications/kde/kpimtextedit.nix
new file mode 100644
index 00000000000..17c960d1762
--- /dev/null
+++ b/pkgs/applications/kde/kpimtextedit.nix
@@ -0,0 +1,21 @@
+{
+ mkDerivation, lib, kdepimTeam,
+ extra-cmake-modules, kdoctools,
+ grantlee5, kcodecs, kconfigwidgets, kemoticons, ki18n, kiconthemes, kio,
+ kdesignerplugin, ktextwidgets, sonnet, syntax-highlighting, qttools,
+}:
+
+mkDerivation {
+ name = "kpimtextedit";
+ meta = {
+ license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+ maintainers = kdepimTeam;
+ };
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ buildInputs = [
+ grantlee5 kcodecs kconfigwidgets kemoticons ki18n kiconthemes kio kdesignerplugin
+ sonnet syntax-highlighting qttools
+ ];
+ propagatedBuildInputs = [ ktextwidgets ];
+ outputs = [ "out" "dev" ];
+}
diff --git a/pkgs/applications/kde/kqtquickcharts.nix b/pkgs/applications/kde/kqtquickcharts.nix
new file mode 100644
index 00000000000..2b3dc5313d9
--- /dev/null
+++ b/pkgs/applications/kde/kqtquickcharts.nix
@@ -0,0 +1,15 @@
+{
+ mkDerivation, lib,
+ extra-cmake-modules,
+ qtbase, qtdeclarative,
+}:
+
+mkDerivation {
+ name = "kqtquickcharts";
+ meta = {
+ license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+ maintainers = [ lib.maintainers.ttuegel ];
+ };
+ nativeBuildInputs = [ extra-cmake-modules ];
+ propagatedBuildInputs = [ qtbase qtdeclarative ];
+}
diff --git a/pkgs/applications/kde/ktnef.nix b/pkgs/applications/kde/ktnef.nix
new file mode 100644
index 00000000000..b5a3834869d
--- /dev/null
+++ b/pkgs/applications/kde/ktnef.nix
@@ -0,0 +1,18 @@
+{
+ mkDerivation, lib, kdepimTeam,
+ extra-cmake-modules, kdoctools,
+ kcalcore, kcalutils, kcontacts, kdelibs4support
+}:
+
+mkDerivation {
+ name = "ktnef";
+ meta = {
+ license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+ maintainers = kdepimTeam;
+ };
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ propagatedBuildInputs = [
+ kcalcore kcalutils kcontacts kdelibs4support
+ ];
+ outputs = [ "out" "dev" ];
+}
diff --git a/pkgs/applications/kde/libgravatar.nix b/pkgs/applications/kde/libgravatar.nix
new file mode 100644
index 00000000000..69a1b9e99cb
--- /dev/null
+++ b/pkgs/applications/kde/libgravatar.nix
@@ -0,0 +1,18 @@
+{
+ mkDerivation, lib, kdepimTeam,
+ extra-cmake-modules, kdoctools,
+ kconfig, kio, ktextwidgets, kwidgetsaddons, pimcommon
+}:
+
+mkDerivation {
+ name = "libgravatar";
+ meta = {
+ license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+ maintainers = kdepimTeam;
+ };
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ propagatedBuildInputs = [
+ kconfig kio ktextwidgets kwidgetsaddons pimcommon
+ ];
+ outputs = [ "out" "dev" ];
+}
diff --git a/pkgs/applications/kde/libkdcraw.nix b/pkgs/applications/kde/libkdcraw.nix
index 383bd3b6703..70e3cb0e195 100644
--- a/pkgs/applications/kde/libkdcraw.nix
+++ b/pkgs/applications/kde/libkdcraw.nix
@@ -9,4 +9,5 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qtbase ];
propagatedBuildInputs = [ libraw ];
+ outputs = [ "out" "dev" ];
}
diff --git a/pkgs/applications/kde/libkdepim.nix b/pkgs/applications/kde/libkdepim.nix
new file mode 100644
index 00000000000..92716e40a34
--- /dev/null
+++ b/pkgs/applications/kde/libkdepim.nix
@@ -0,0 +1,21 @@
+{
+ mkDerivation, lib, kdepimTeam,
+ extra-cmake-modules, kdoctools,
+ akonadi, akonadi-contacts, akonadi-search, kcmutils, kcodecs, kcompletion,
+ kconfigwidgets, kcontacts, ki18n, kiconthemes, kio, kitemviews, kjobwidgets,
+ kldap, kwallet,
+}:
+
+mkDerivation {
+ name = "libkdepim";
+ meta = {
+ license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+ maintainers = kdepimTeam;
+ };
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ buildInputs = [
+ akonadi akonadi-contacts akonadi-search kcmutils kcodecs kcompletion
+ kconfigwidgets kcontacts ki18n kiconthemes kio kitemviews kjobwidgets kldap
+ kwallet
+ ];
+}
diff --git a/pkgs/applications/kde/libkexiv2.nix b/pkgs/applications/kde/libkexiv2.nix
index 816d4168967..8c8d244d6f6 100644
--- a/pkgs/applications/kde/libkexiv2.nix
+++ b/pkgs/applications/kde/libkexiv2.nix
@@ -9,4 +9,5 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qtbase ];
propagatedBuildInputs = [ exiv2 ];
+ outputs = [ "out" "dev" ];
}
diff --git a/pkgs/applications/kde/libkipi.nix b/pkgs/applications/kde/libkipi.nix
index 3a28d8c2e8c..c70d8407fc7 100644
--- a/pkgs/applications/kde/libkipi.nix
+++ b/pkgs/applications/kde/libkipi.nix
@@ -7,5 +7,6 @@ mkDerivation {
maintainers = [ lib.maintainers.ttuegel ];
};
nativeBuildInputs = [ extra-cmake-modules ];
- propagatedBuildInputs = [ kconfig ki18n kservice kxmlgui ];
+ buildInputs = [ kconfig ki18n kservice kxmlgui ];
+ outputs = [ "out" "dev" ];
}
diff --git a/pkgs/applications/kde/libkleo.nix b/pkgs/applications/kde/libkleo.nix
new file mode 100644
index 00000000000..0958a0e605f
--- /dev/null
+++ b/pkgs/applications/kde/libkleo.nix
@@ -0,0 +1,21 @@
+{
+ mkDerivation, lib, kdepimTeam,
+ extra-cmake-modules, kdoctools,
+ boost, qgpgme, kcodecs, kcompletion, kconfig, kcoreaddons, ki18n, kitemmodels,
+ kpimtextedit, kwidgetsaddons, kwindowsystem
+}:
+
+mkDerivation {
+ name = "libkleo";
+ meta = {
+ license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+ maintainers = kdepimTeam;
+ };
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ buildInputs = [
+ boost kcodecs kcompletion kconfig kcoreaddons ki18n kitemmodels
+ kpimtextedit kwidgetsaddons kwindowsystem
+ ];
+ propagatedBuildInputs = [ qgpgme ];
+ outputs = [ "out" "dev" ];
+}
diff --git a/pkgs/applications/kde/libksane.nix b/pkgs/applications/kde/libksane.nix
new file mode 100644
index 00000000000..f92f21de7fb
--- /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/libksieve.nix b/pkgs/applications/kde/libksieve.nix
new file mode 100644
index 00000000000..dd33f759c31
--- /dev/null
+++ b/pkgs/applications/kde/libksieve.nix
@@ -0,0 +1,23 @@
+{
+ mkDerivation, lib, kdepimTeam,
+ extra-cmake-modules, kdoctools,
+ akonadi, karchive, kcompletion, kiconthemes, kidentitymanagement, kio,
+ kmailtransport, knewstuff, kwindowsystem, kxmlgui, libkdepim, pimcommon,
+ qtwebengine, syntax-highlighting,
+}:
+
+mkDerivation {
+ name = "libksieve";
+ meta = {
+ license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+ maintainers = kdepimTeam;
+ };
+ outputs = [ "out" "dev" ];
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ buildInputs = [
+ akonadi karchive kcompletion kiconthemes kidentitymanagement kio
+ kmailtransport knewstuff kwindowsystem kxmlgui libkdepim pimcommon
+ qtwebengine
+ ];
+ propagatedBuildInputs = [ syntax-highlighting ];
+}
diff --git a/pkgs/applications/kde/mailcommon.nix b/pkgs/applications/kde/mailcommon.nix
new file mode 100644
index 00000000000..44edea8f55e
--- /dev/null
+++ b/pkgs/applications/kde/mailcommon.nix
@@ -0,0 +1,22 @@
+{
+ mkDerivation, lib, kdepimTeam,
+ extra-cmake-modules, kdoctools,
+ akonadi, akonadi-mime, karchive, kcodecs, kcompletion, kconfigwidgets,
+ kdbusaddons, kdesignerplugin, kiconthemes, kio, kitemmodels, kldap,
+ kmailtransport, kwindowsystem, mailimporter, messagelib, phonon, libkdepim
+}:
+
+mkDerivation {
+ name = "mailcommon";
+ meta = {
+ license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+ maintainers = kdepimTeam;
+ };
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ buildInputs = [
+ akonadi akonadi-mime karchive kcodecs kcompletion kconfigwidgets kdbusaddons
+ kdesignerplugin kiconthemes kio kitemmodels kldap kmailtransport
+ kwindowsystem mailimporter messagelib phonon libkdepim
+ ];
+ outputs = [ "out" "dev" ];
+}
diff --git a/pkgs/applications/kde/mailimporter.nix b/pkgs/applications/kde/mailimporter.nix
new file mode 100644
index 00000000000..f002ff0f340
--- /dev/null
+++ b/pkgs/applications/kde/mailimporter.nix
@@ -0,0 +1,19 @@
+{
+ mkDerivation, lib, kdepimTeam,
+ extra-cmake-modules, kdoctools,
+ akonadi, akonadi-mime, karchive, kcompletion, kconfig, kcoreaddons, ki18n,
+ kmime, kxmlgui, libkdepim
+}:
+
+mkDerivation {
+ name = "mailimporter";
+ meta = {
+ license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+ maintainers = kdepimTeam;
+ };
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ buildInputs = [
+ akonadi akonadi-mime karchive kcompletion kconfig kcoreaddons ki18n kmime
+ kxmlgui libkdepim
+ ];
+}
diff --git a/pkgs/applications/kde/mbox-importer.nix b/pkgs/applications/kde/mbox-importer.nix
new file mode 100644
index 00000000000..aa637d440bd
--- /dev/null
+++ b/pkgs/applications/kde/mbox-importer.nix
@@ -0,0 +1,20 @@
+{
+ mkDerivation, lib, kdepimTeam,
+ extra-cmake-modules, kdoctools,
+ akonadi, akonadi-search, kconfig, kservice, kio, mailcommon, mailimporter, messagelib
+}:
+
+mkDerivation {
+ name = "mbox-importer";
+ meta = {
+ license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+ maintainers = kdepimTeam;
+ };
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ buildInputs = [
+ akonadi akonadi-search kconfig kservice kio mailcommon mailimporter messagelib
+ ];
+ preHook = ''
+ set -x
+ '';
+}
diff --git a/pkgs/applications/kde/messagelib.nix b/pkgs/applications/kde/messagelib.nix
new file mode 100644
index 00000000000..f12158a1f71
--- /dev/null
+++ b/pkgs/applications/kde/messagelib.nix
@@ -0,0 +1,29 @@
+{
+ mkDerivation, lib, kdepimTeam,
+ extra-cmake-modules, kdoctools,
+ akonadi, akonadi-mime, akonadi-notes, akonadi-search, gpgme, grantlee5,
+ grantleetheme, karchive, kcodecs, kconfig, kconfigwidgets, kcontacts,
+ kdepim-apps-libs, kiconthemes, kidentitymanagement, kio, kjobwidgets, kldap,
+ kmailtransport, kmbox, kmime, kwindowsystem, libgravatar, libkdepim, libkleo,
+ pimcommon, qtwebengine, qtwebkit, syntax-highlighting
+}:
+
+mkDerivation {
+ name = "messagelib";
+ meta = {
+ license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+ maintainers = kdepimTeam;
+ };
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ buildInputs = [
+ akonadi-notes akonadi-search gpgme grantlee5 grantleetheme karchive kcodecs
+ kconfig kconfigwidgets kdepim-apps-libs kiconthemes kio kjobwidgets kldap
+ kmailtransport kmbox kmime kwindowsystem libgravatar libkdepim qtwebkit
+ syntax-highlighting
+ ];
+ propagatedBuildInputs = [
+ akonadi akonadi-mime kcontacts kidentitymanagement kmime libkleo pimcommon
+ qtwebengine
+ ];
+ outputs = [ "out" "dev" ];
+}
diff --git a/pkgs/applications/kde/okteta.nix b/pkgs/applications/kde/okteta.nix
index 1d44bb27fa3..422968be35a 100644
--- a/pkgs/applications/kde/okteta.nix
+++ b/pkgs/applications/kde/okteta.nix
@@ -1,7 +1,7 @@
{
mkDerivation, lib,
extra-cmake-modules, kdoctools,
- qtscript, kconfig, kinit, karchive,
+ qtscript, kconfig, kinit, karchive, kcrash,
kcmutils, kconfigwidgets, knewstuff, kparts, qca-qt5,
shared_mime_info
}:
@@ -16,6 +16,6 @@ mkDerivation {
buildInputs = [ shared_mime_info ];
propagatedBuildInputs = [
kconfig kinit kcmutils kconfigwidgets knewstuff kparts qca-qt5
- karchive
+ karchive kcrash
];
}
diff --git a/pkgs/applications/kde/okular.nix b/pkgs/applications/kde/okular.nix
index 99b69f45e1e..64511aabf7c 100644
--- a/pkgs/applications/kde/okular.nix
+++ b/pkgs/applications/kde/okular.nix
@@ -18,7 +18,7 @@ mkDerivation {
];
meta = {
platforms = lib.platforms.linux;
- homepage = "http://www.kde.org";
+ homepage = http://www.kde.org;
license = with lib.licenses; [ gpl2 lgpl21 fdl12 bsd3 ];
maintainers = [ lib.maintainers.ttuegel ];
};
diff --git a/pkgs/applications/kde/pim-data-exporter.nix b/pkgs/applications/kde/pim-data-exporter.nix
new file mode 100644
index 00000000000..10123944e3a
--- /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/pim-sieve-editor.nix b/pkgs/applications/kde/pim-sieve-editor.nix
new file mode 100644
index 00000000000..c83df2e0e49
--- /dev/null
+++ b/pkgs/applications/kde/pim-sieve-editor.nix
@@ -0,0 +1,19 @@
+{
+ mkDerivation, lib, kdepimTeam,
+ extra-cmake-modules, kdoctools,
+ kdbusaddons, kcrash, kbookmarks, kiconthemes, kio, kpimtextedit,
+ kmailtransport, pimcommon, libksieve
+}:
+
+mkDerivation {
+ name = "pim-sieve-editor";
+ meta = {
+ license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+ maintainers = kdepimTeam;
+ };
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ buildInputs = [
+ kdbusaddons kcrash kbookmarks kiconthemes kio kpimtextedit kmailtransport
+ pimcommon libksieve
+ ];
+}
diff --git a/pkgs/applications/kde/pimcommon.nix b/pkgs/applications/kde/pimcommon.nix
new file mode 100644
index 00000000000..02e9a47274b
--- /dev/null
+++ b/pkgs/applications/kde/pimcommon.nix
@@ -0,0 +1,26 @@
+{
+ mkDerivation, lib, kdepimTeam,
+ extra-cmake-modules, kdoctools,
+ akonadi, akonadi-contacts, akonadi-mime, grantlee, karchive, kcodecs,
+ kcompletion, kconfig, kconfigwidgets, kcontacts, kdbusaddons, kdesignerplugin,
+ kiconthemes, kimap, kio, kitemmodels, kjobwidgets, knewstuff, kpimtextedit,
+ kwallet, kwindowsystem, libkdepim, qtwebengine
+}:
+
+mkDerivation {
+ name = "pimcommon";
+ meta = {
+ license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+ maintainers = kdepimTeam;
+ };
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ buildInputs = [
+ akonadi-mime grantlee karchive kcodecs kcompletion kconfigwidgets
+ kdbusaddons kiconthemes kio kitemmodels kjobwidgets knewstuff kpimtextedit
+ kwallet kwindowsystem libkdepim qtwebengine
+ ];
+ propagatedBuildInputs = [
+ akonadi akonadi-contacts kconfig kcontacts kimap
+ ];
+ outputs = [ "out" "dev" ];
+}
diff --git a/pkgs/applications/kde/spectacle.nix b/pkgs/applications/kde/spectacle.nix
index db1bf2aee65..6deec6aaabb 100644
--- a/pkgs/applications/kde/spectacle.nix
+++ b/pkgs/applications/kde/spectacle.nix
@@ -11,10 +11,9 @@ mkDerivation {
name = "spectacle";
meta = with lib; { maintainers = with maintainers; [ ttuegel ]; };
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
- buildInputs = [ ki18n xcb-util-cursor ];
- propagatedBuildInputs = [
- kconfig kcoreaddons kdbusaddons kdeclarative kio knotifications
- kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi qtx11extras
+ buildInputs = [
+ kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications
+ kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi qtx11extras xcb-util-cursor
];
- propagatedUserEnvPkgs = [ kipi-plugins ];
+ propagatedUserEnvPkgs = [ kipi-plugins libkipi ];
}
diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix
index 66498b0d280..f7b5ca0b31a 100644
--- a/pkgs/applications/kde/srcs.nix
+++ b/pkgs/applications/kde/srcs.nix
@@ -3,2235 +3,2235 @@
{
akonadi = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/akonadi-17.04.2.tar.xz";
- sha256 = "08b3xyrff3y3s3c39l1fv3i55rdz6fq9mrsi3g80vs4i4x70f46d";
- name = "akonadi-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/akonadi-17.08.1.tar.xz";
+ sha256 = "1nhjhgpigi8bhavh609lxnr76w9c0j7017haiv6g6j6zd5h0pp6w";
+ name = "akonadi-17.08.1.tar.xz";
};
};
akonadi-calendar = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/akonadi-calendar-17.04.2.tar.xz";
- sha256 = "17nx990k3l0mgwssrdg9avvp4yf6ichakx0cq4yg4mif5rc4angd";
- name = "akonadi-calendar-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/akonadi-calendar-17.08.1.tar.xz";
+ sha256 = "15ld1jn1962wc5ynf8cgg9z6bh7hvjcl4nv9fqaa5mwy4mik4a0z";
+ name = "akonadi-calendar-17.08.1.tar.xz";
};
};
akonadi-calendar-tools = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/akonadi-calendar-tools-17.04.2.tar.xz";
- sha256 = "1qbj5fkzia0bjzyv8mybqf2gg917dyjqmiywf4asr0xlqxwydccj";
- name = "akonadi-calendar-tools-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/akonadi-calendar-tools-17.08.1.tar.xz";
+ sha256 = "1y4r3y9gbc1zsip25pz47fxi9fw68fr6p18mljfkcg394sygvlcr";
+ name = "akonadi-calendar-tools-17.08.1.tar.xz";
};
};
akonadiconsole = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/akonadiconsole-17.04.2.tar.xz";
- sha256 = "00wps8p6094bywkc6yrh9rpqp0q49nq68kmnbm7jqd9k07g93mxz";
- name = "akonadiconsole-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/akonadiconsole-17.08.1.tar.xz";
+ sha256 = "0xy8s23941rfh1yiz2c1v10m59jrd8hphzphckxa68zxb6cb7vws";
+ name = "akonadiconsole-17.08.1.tar.xz";
};
};
akonadi-contacts = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/akonadi-contacts-17.04.2.tar.xz";
- sha256 = "0fnmfcfxzjghfh3plliksa7sffjy8m2hif1s8gsdv2bl5v13gxbz";
- name = "akonadi-contacts-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/akonadi-contacts-17.08.1.tar.xz";
+ sha256 = "0hgabjca3fzb8hlzhfi54la7rgh4gaii6i2j623birslzry3mkc9";
+ name = "akonadi-contacts-17.08.1.tar.xz";
};
};
akonadi-import-wizard = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/akonadi-import-wizard-17.04.2.tar.xz";
- sha256 = "0wg1nnrfafmpdb0li7d9i3qfdam4v2ybkbrbwgdwiawdqs9znaaa";
- name = "akonadi-import-wizard-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/akonadi-import-wizard-17.08.1.tar.xz";
+ sha256 = "1f7k592papppfqdhgpcpw03phhdlkp18cbap1ibvzywhg1dn2qmg";
+ name = "akonadi-import-wizard-17.08.1.tar.xz";
};
};
akonadi-mime = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/akonadi-mime-17.04.2.tar.xz";
- sha256 = "1ariwnjgsyccfa3iky3sf8lz08hv44jd6xa4hjfyz4bkp822grld";
- name = "akonadi-mime-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/akonadi-mime-17.08.1.tar.xz";
+ sha256 = "1apl89r1mpj5byngzdibxr4whr0932zr3j2y51pynnmilgkmyg6v";
+ name = "akonadi-mime-17.08.1.tar.xz";
};
};
akonadi-notes = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/akonadi-notes-17.04.2.tar.xz";
- sha256 = "00p7sksfid7lln43f65jna8dr4w47wkxqyls2gzbgnblpd7m2rqg";
- name = "akonadi-notes-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/akonadi-notes-17.08.1.tar.xz";
+ sha256 = "1fgkipxhzj7c6ahdqhjii6ccxgn2qnn55jn64nrb36srmpnzrq7f";
+ name = "akonadi-notes-17.08.1.tar.xz";
};
};
akonadi-search = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/akonadi-search-17.04.2.tar.xz";
- sha256 = "111r1fplrd13xb7s36cm9bk5zkj8ap33d252xarwmzpj51q0l3vh";
- name = "akonadi-search-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/akonadi-search-17.08.1.tar.xz";
+ sha256 = "1m119843brcjcymfcp9n7pfybqnw9ydhsm9ry5im52kci4rwsfhx";
+ name = "akonadi-search-17.08.1.tar.xz";
};
};
akregator = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/akregator-17.04.2.tar.xz";
- sha256 = "0ngpw432pm57p34y4wcvrxlrlmixlgrpqawgn2b73dhvb2m8ypvy";
- name = "akregator-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/akregator-17.08.1.tar.xz";
+ sha256 = "02p1vlxm91pyqhhwg3ggik9c8xw5ayz1w7bqpxmcb81gff75ha77";
+ name = "akregator-17.08.1.tar.xz";
};
};
analitza = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/analitza-17.04.2.tar.xz";
- sha256 = "0qs2mp7nlca9y8lpycwfsmdd33ficz36z2fbmqzqm837w1r5jplp";
- name = "analitza-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/analitza-17.08.1.tar.xz";
+ sha256 = "1kcyhim72g39ywq90hdd9ba6vwgq99xkbj82vbasy0il8xkkfcn4";
+ name = "analitza-17.08.1.tar.xz";
};
};
ark = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/ark-17.04.2.tar.xz";
- sha256 = "0zdyxd7ghwrj48avyqv4q6dpyrxryzrg8v5ljwwsizlb7lp25afx";
- name = "ark-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/ark-17.08.1.tar.xz";
+ sha256 = "019gz57c46lh5wz84r0swhbx7ywgw8s7yc1f589xh4nz18i9xi69";
+ name = "ark-17.08.1.tar.xz";
};
};
artikulate = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/artikulate-17.04.2.tar.xz";
- sha256 = "0rjqpn8aa0y3v2940qgfxl9xdrls1jw6yfvgqdsicrhd9qwpr6i2";
- name = "artikulate-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/artikulate-17.08.1.tar.xz";
+ sha256 = "1dgr9ww0pm6k0rhb3lkvr65jx6pnwsck1v3sfwpyyf8rrwixbvyk";
+ name = "artikulate-17.08.1.tar.xz";
};
};
audiocd-kio = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/audiocd-kio-17.04.2.tar.xz";
- sha256 = "0h6zvlhyi9dxmcxgcnn12pj056r62a6389nd9dnqzcc3m7jp0ypi";
- name = "audiocd-kio-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/audiocd-kio-17.08.1.tar.xz";
+ sha256 = "1k987lxm5wl6prdvbxxby1ly9r2dq7r5dsfbpazm43fxpx0pqyik";
+ name = "audiocd-kio-17.08.1.tar.xz";
};
};
baloo-widgets = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/baloo-widgets-17.04.2.tar.xz";
- sha256 = "1fspq5n53zgnwpvnq0z9g77xhfspd3indcvim8j8ls5qhmn4c8g9";
- name = "baloo-widgets-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/baloo-widgets-17.08.1.tar.xz";
+ sha256 = "19nij0hrcbcq4czxgh3l6gb25lkdi6j6sgmch24a8c7a106h0ips";
+ name = "baloo-widgets-17.08.1.tar.xz";
};
};
blinken = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/blinken-17.04.2.tar.xz";
- sha256 = "12pzbgxhdrzjnzg02hd96pxcqpjnzfrlv2bjpkpzb7ng70wb50ia";
- name = "blinken-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/blinken-17.08.1.tar.xz";
+ sha256 = "1nwdmhsyq1yzlr17mn98np0d3zg3rjyxsmlc7lyv1kszckhmb7qq";
+ name = "blinken-17.08.1.tar.xz";
};
};
blogilo = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/blogilo-17.04.2.tar.xz";
- sha256 = "14pn6l2qvgf7ab05i93lnhm6fjhy41xwnxa5v7an7xc8ismi5ric";
- name = "blogilo-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/blogilo-17.08.1.tar.xz";
+ sha256 = "1c9dq7xwdwxwdch4ygyz7pds8q41xpb5661wa4alnpd06ra0bq0c";
+ name = "blogilo-17.08.1.tar.xz";
};
};
bomber = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/bomber-17.04.2.tar.xz";
- sha256 = "19c5ak9cw3ybcvw21rzjh7k0q7g1j9dv060pvjdfsphfyzkym5m3";
- name = "bomber-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/bomber-17.08.1.tar.xz";
+ sha256 = "1pcva9rgmvvkbbabwiw3aqv0aq0w2s6vxrw0gfxh6plgs42hpb24";
+ name = "bomber-17.08.1.tar.xz";
};
};
bovo = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/bovo-17.04.2.tar.xz";
- sha256 = "0z4ajphzrnag1zqv3d9i6cvrfn5b74sklacxhn09hgjgx6ihps77";
- name = "bovo-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/bovo-17.08.1.tar.xz";
+ sha256 = "0vn4q6qvig9rjq8ynwg53vzas8vxg0b55mvpg801ky6kp3ma3m6i";
+ name = "bovo-17.08.1.tar.xz";
};
};
calendarsupport = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/calendarsupport-17.04.2.tar.xz";
- sha256 = "1n2nb15fn3v6hlp8ya3ah3pdyjjss1632a51k696lg474dhxvlzk";
- name = "calendarsupport-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/calendarsupport-17.08.1.tar.xz";
+ sha256 = "1p1s5sn284j2lwzm09ifp6dj6gzg6p169hh7dv7k5bshi7kzf42v";
+ name = "calendarsupport-17.08.1.tar.xz";
};
};
cantor = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/cantor-17.04.2.tar.xz";
- sha256 = "0811770qn76ri11mgx2pac7vg67mj5qg3v3zhx4ym3f072lfp57i";
- name = "cantor-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/cantor-17.08.1.tar.xz";
+ sha256 = "1m6si2gy6n20z27sby7g7nqaxl067qpkj29l6b3qsyyx03w73n33";
+ name = "cantor-17.08.1.tar.xz";
};
};
cervisia = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/cervisia-17.04.2.tar.xz";
- sha256 = "1gar8rx9vknpc7fnwlg7kvwj90wv9wd8c3dd59fj55d9fpwin3qg";
- name = "cervisia-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/cervisia-17.08.1.tar.xz";
+ sha256 = "13p5gs2cg939mcnq2hvvncj8v7vr7pcklq932xhy4qfwhqbhkxp1";
+ name = "cervisia-17.08.1.tar.xz";
};
};
dolphin = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/dolphin-17.04.2.tar.xz";
- sha256 = "1yd0fawz9n64gsd868qzp424h653f5lf22r5mf116bkgxia59b25";
- name = "dolphin-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/dolphin-17.08.1.tar.xz";
+ sha256 = "04b9vq03m6s5mrv7q4na65kv9hpx7i4v45g6ls7pcyxi6ziszr3q";
+ name = "dolphin-17.08.1.tar.xz";
};
};
dolphin-plugins = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/dolphin-plugins-17.04.2.tar.xz";
- sha256 = "1h8g962pmpwahhrnzzd7x15j7p3bcxg92csfkd0y2mn6pfl9zb5s";
- name = "dolphin-plugins-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/dolphin-plugins-17.08.1.tar.xz";
+ sha256 = "0vrs8yk2vqfbc79xjkj95zndyig2gz2b8aafs61q25b29lzilyq9";
+ name = "dolphin-plugins-17.08.1.tar.xz";
};
};
dragon = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/dragon-17.04.2.tar.xz";
- sha256 = "0yp0bswjq9zymczyscy3y186d7g921jmah6i5wd36j1vgff3i0ry";
- name = "dragon-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/dragon-17.08.1.tar.xz";
+ sha256 = "143x7x07z5af0z7za8r3jiq5id33rmb62ygp84af905lm2gf2yk0";
+ name = "dragon-17.08.1.tar.xz";
};
};
eventviews = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/eventviews-17.04.2.tar.xz";
- sha256 = "0rf87q002ax5r6qh99hmbdrm528grw3ib5zi5pnjai3l403vd6g6";
- name = "eventviews-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/eventviews-17.08.1.tar.xz";
+ sha256 = "1av86sbldkrgsdybxqzgda1pnd4y27ygxsibr76w6y8fnk66zrg7";
+ name = "eventviews-17.08.1.tar.xz";
};
};
ffmpegthumbs = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/ffmpegthumbs-17.04.2.tar.xz";
- sha256 = "02i9x2amkwc40a7fpk939spgwbrcfm1s9swgmp1wzyg7arrf4qz3";
- name = "ffmpegthumbs-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/ffmpegthumbs-17.08.1.tar.xz";
+ sha256 = "1lgi8rs3zbrwlcxbhq9qys8w0yh4f0rbalig0y020igbplkn9ccs";
+ name = "ffmpegthumbs-17.08.1.tar.xz";
};
};
filelight = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/filelight-17.04.2.tar.xz";
- sha256 = "0wpcmk6i8hfalzymj8m1hsg1qi2hil8x51nvxg0c55x1cqg6k9a0";
- name = "filelight-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/filelight-17.08.1.tar.xz";
+ sha256 = "0wi0j55z8h58slbq4hinhfycpjb69m5g4ilk0csjw8syxhmy1jhl";
+ name = "filelight-17.08.1.tar.xz";
};
};
granatier = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/granatier-17.04.2.tar.xz";
- sha256 = "0bxf4cv1351bzz3yafdadih8bdcjjn0119zazmll2jjdnh4qiq0z";
- name = "granatier-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/granatier-17.08.1.tar.xz";
+ sha256 = "0panmz171ba3vfvdgjcwg1nxwv52qsh6qazagz7p5bv0hkf6y94n";
+ name = "granatier-17.08.1.tar.xz";
};
};
grantlee-editor = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/grantlee-editor-17.04.2.tar.xz";
- sha256 = "1sjrsljp0g53gi4vlcmz6r9k657k4wr1l10743sfmg268skvs84b";
- name = "grantlee-editor-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/grantlee-editor-17.08.1.tar.xz";
+ sha256 = "0xpkip7cy6d318mh3l8014zdifhx3njx8vk2cr2f00bjvs879zfj";
+ name = "grantlee-editor-17.08.1.tar.xz";
};
};
grantleetheme = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/grantleetheme-17.04.2.tar.xz";
- sha256 = "102a49ifkvjpz2703fr6dv45ksyg7y1yjc6xm0im95vb66aw3cb5";
- name = "grantleetheme-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/grantleetheme-17.08.1.tar.xz";
+ sha256 = "0l6ycr609wvxad1dwgy56blcnag5pr30gj59d5dcnq0iqcs9v5w9";
+ name = "grantleetheme-17.08.1.tar.xz";
};
};
gwenview = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/gwenview-17.04.2.tar.xz";
- sha256 = "0x9pxw33ahzn0h4klgiw7ifcgkdwv7l1zzfapbh9gr9h3rbrpsra";
- name = "gwenview-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/gwenview-17.08.1.tar.xz";
+ sha256 = "1f5c78007sqy3iq0rx8cskma8rjzinaahy26r054l59gq6b0d3v7";
+ name = "gwenview-17.08.1.tar.xz";
};
};
incidenceeditor = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/incidenceeditor-17.04.2.tar.xz";
- sha256 = "1qhkmw6n402xnv5ggpfp586gii5z6r5gqmgfd0jzxlnygslqd784";
- name = "incidenceeditor-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/incidenceeditor-17.08.1.tar.xz";
+ sha256 = "0axwkhwqgmdnh9qn6j87j44x24vqb5bhch2pscrifdni05j99wzx";
+ name = "incidenceeditor-17.08.1.tar.xz";
};
};
jovie = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/jovie-17.04.2.tar.xz";
- sha256 = "0mcv00hk1h1hl7hg4n2pcbsjw1g21k98fls7424jjh6vgvarbxmg";
- name = "jovie-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/jovie-17.08.1.tar.xz";
+ sha256 = "19zhm6iqq505bwdd6f57rkzc9fmqqmw60071n679khrcgmsyx7ac";
+ name = "jovie-17.08.1.tar.xz";
};
};
juk = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/juk-17.04.2.tar.xz";
- sha256 = "01lsmfd5h1km5w9xz9bwh07qvxlgh2j8nl638bxx6k9vydg53gll";
- name = "juk-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/juk-17.08.1.tar.xz";
+ sha256 = "1r3igqgw2ani4500sndbqnxcbyjg8l0lcd0l0r6wmqs9cgf1w5d5";
+ name = "juk-17.08.1.tar.xz";
};
};
k3b = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/k3b-17.04.2.tar.xz";
- sha256 = "1yv2rgwsvabyj7pj91yir6zj7bc4n9psazg0q658pyqbdkgwrkx8";
- name = "k3b-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/k3b-17.08.1.tar.xz";
+ sha256 = "1pv8fpalqr7fpcy7dypzjp91h82scvzfk5g0mpzjpqlmn99hgfj1";
+ name = "k3b-17.08.1.tar.xz";
};
};
kaccessible = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kaccessible-17.04.2.tar.xz";
- sha256 = "00m2ya93isyhr9cbx7fa79pi1iqnj5nqqnjmh8kqx9abkpvy2yff";
- name = "kaccessible-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kaccessible-17.08.1.tar.xz";
+ sha256 = "13j1c9l8qhll0a8fcny9nibr858w5cjpahccxgkh9v54iy3f243s";
+ name = "kaccessible-17.08.1.tar.xz";
};
};
kaccounts-integration = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kaccounts-integration-17.04.2.tar.xz";
- sha256 = "0wrfyfczm92qz0w6gyvaac8n0763fviglji7ls73y0gy7xm1lfmj";
- name = "kaccounts-integration-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kaccounts-integration-17.08.1.tar.xz";
+ sha256 = "0y09hnjhxy7lnqjhz82z090wv3y5942xh1vhgyi5ac7pkgyzjh7m";
+ name = "kaccounts-integration-17.08.1.tar.xz";
};
};
kaccounts-providers = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kaccounts-providers-17.04.2.tar.xz";
- sha256 = "0y2y231f0xyysxnwdprlffp3m4wxyxabc2d4j8sr9w9gn0qfzdkj";
- name = "kaccounts-providers-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kaccounts-providers-17.08.1.tar.xz";
+ sha256 = "0dyrsvh98b75fxpap3x4vwvqx2dxyvcg4sfkic9sv137kwl8ihcp";
+ name = "kaccounts-providers-17.08.1.tar.xz";
};
};
kaddressbook = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kaddressbook-17.04.2.tar.xz";
- sha256 = "0y44b3wwpgpzim3an8kvrhqnw1wg0m2fcmanm2sj9vvccayy9fl6";
- name = "kaddressbook-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kaddressbook-17.08.1.tar.xz";
+ sha256 = "0qf3wfjgbzjxrvhnwa702yhp54m8f4wk8d67jsgrlpvq3lizrzrf";
+ name = "kaddressbook-17.08.1.tar.xz";
};
};
kajongg = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kajongg-17.04.2.tar.xz";
- sha256 = "08wzxkhfwagh2awcs4wdg56ks628bwysim5whwhrvw3rzc30v2ig";
- name = "kajongg-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kajongg-17.08.1.tar.xz";
+ sha256 = "10bymw4bwqxjppvynwcx600ybr02kyd9m2ya0pi2208kj2s317m5";
+ name = "kajongg-17.08.1.tar.xz";
};
};
kalarm = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kalarm-17.04.2.tar.xz";
- sha256 = "0km7fzhd8iskg4bkn6x62y9pgcvq8zwrjk3w7qvrx5j6dszjw11w";
- name = "kalarm-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kalarm-17.08.1.tar.xz";
+ sha256 = "0nxkln40bwlfdn2fp5a2a55x40zakq5nrir9bi920jpp78ivx2mf";
+ name = "kalarm-17.08.1.tar.xz";
};
};
kalarmcal = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kalarmcal-17.04.2.tar.xz";
- sha256 = "0rca71h85rd88fkx0pkxj40c8fnyiwfcnvmczkd9xb729hvrfblk";
- name = "kalarmcal-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kalarmcal-17.08.1.tar.xz";
+ sha256 = "1dvv1rbh67c2vxcls8jv8chcgbp7q8c2jdjsr2cx2lmiasz0lqlf";
+ name = "kalarmcal-17.08.1.tar.xz";
};
};
kalgebra = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kalgebra-17.04.2.tar.xz";
- sha256 = "12496gk238ipi2zmxx4njwc58mx9q3w463qp9ji23abv3c59g44f";
- name = "kalgebra-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kalgebra-17.08.1.tar.xz";
+ sha256 = "07l3gff8la0cjd3aszm2v0gykfb2ws6k5hix0ck9q62kz1h6zd8d";
+ name = "kalgebra-17.08.1.tar.xz";
};
};
kalzium = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kalzium-17.04.2.tar.xz";
- sha256 = "0gckmnbgym09kq53q0n3jsqfiaz4g7235ylpnwsaids3243jpa06";
- name = "kalzium-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kalzium-17.08.1.tar.xz";
+ sha256 = "15rvpjni1a1fhr52awivzdc6v575510fs5mxxk05wqzsffa67i1f";
+ name = "kalzium-17.08.1.tar.xz";
};
};
kamera = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kamera-17.04.2.tar.xz";
- sha256 = "1ikniri791v63zzsng7yjvdil6vz08cw2iz9f0dwxzldlwws41j6";
- name = "kamera-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kamera-17.08.1.tar.xz";
+ sha256 = "044mn0k18ffxhc9nnbpqhcjlzkj4657nxqwdfl65k689y1l2bff1";
+ name = "kamera-17.08.1.tar.xz";
};
};
kanagram = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kanagram-17.04.2.tar.xz";
- sha256 = "06yqc197yzzzzga45db8i05q2yr4jyjf5bvry0k22nss3wgsy8mk";
- name = "kanagram-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kanagram-17.08.1.tar.xz";
+ sha256 = "07gykmv9r1ikaw4l3zz27rc7a23q2nizszblm1ygv2nlyj6lilgf";
+ name = "kanagram-17.08.1.tar.xz";
};
};
kapman = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kapman-17.04.2.tar.xz";
- sha256 = "15yyp69m096wbmpi52fi2ca6i83w0agjgsy1j6qiy6ki0fj2xyry";
- name = "kapman-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kapman-17.08.1.tar.xz";
+ sha256 = "1r7r13yfgf64jfarqjiirfbhmrg6d04ija5sgl8aiib8rwnbs2lb";
+ name = "kapman-17.08.1.tar.xz";
};
};
kapptemplate = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kapptemplate-17.04.2.tar.xz";
- sha256 = "0v5v6m0z7jgq5lzlpa3qkza3s0amx6xikwcg1lbzivnwfjvyb9nj";
- name = "kapptemplate-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kapptemplate-17.08.1.tar.xz";
+ sha256 = "0dcgsh4ns3749yybzz2jgdbjskxyzlnr2c0f5wzh9ilkz3yp7lq2";
+ name = "kapptemplate-17.08.1.tar.xz";
};
};
kate = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kate-17.04.2.tar.xz";
- sha256 = "1bya5xh57icsbx9jmk5w330xm97bjs3amvlnj0i8rplawjzcai8h";
- name = "kate-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kate-17.08.1.tar.xz";
+ sha256 = "0z71s9g66ivbchrd2ps3j16ickjnky7ws484y04akjjs7sryzd0l";
+ name = "kate-17.08.1.tar.xz";
};
};
katomic = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/katomic-17.04.2.tar.xz";
- sha256 = "06bdvc8nckckd3rin7q7cjajxv0yzsq6m1jwzmyh90mm2sbq5g0j";
- name = "katomic-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/katomic-17.08.1.tar.xz";
+ sha256 = "04k29x2hvcqc22cm763aflpwzb6gqqbnpd6dknd34985fqrrcdp4";
+ name = "katomic-17.08.1.tar.xz";
};
};
kblackbox = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kblackbox-17.04.2.tar.xz";
- sha256 = "1z6ladzhd1mgcqv0y199wv3dafpmy7h6yfgy7hgl26pqgw2qpz9z";
- name = "kblackbox-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kblackbox-17.08.1.tar.xz";
+ sha256 = "1n1rxh86qcaa8dm5qcs43pdxjndzssy4pdyn90anw6bqsw1mn7q0";
+ name = "kblackbox-17.08.1.tar.xz";
};
};
kblocks = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kblocks-17.04.2.tar.xz";
- sha256 = "0a3d4q2kph192zp6lcm2wxh8f55s3wj3wvxvfjk3v5vwjld6a298";
- name = "kblocks-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kblocks-17.08.1.tar.xz";
+ sha256 = "0bx5j1kahyspbmrw2falkw037d1lkj6f1yppwdlh2l4zn7xbgx78";
+ name = "kblocks-17.08.1.tar.xz";
};
};
kblog = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kblog-17.04.2.tar.xz";
- sha256 = "1w97qkp2mwf7wqjwrrq94sah32cdybgxp2rzs5ypwaszka77xcd9";
- name = "kblog-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kblog-17.08.1.tar.xz";
+ sha256 = "0kdwv2ym3xba7n0qslrgdlmanw1zqanv5ycjnl54gf1xlbdwbpv2";
+ name = "kblog-17.08.1.tar.xz";
};
};
kbounce = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kbounce-17.04.2.tar.xz";
- sha256 = "1mgbjgbp2wmghvjgyf1s3gjwnwg4c8h6ni01mazqv8jlf0v14g1j";
- name = "kbounce-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kbounce-17.08.1.tar.xz";
+ sha256 = "0bl1pm8h547gwzx1pbc340711fp5scfa1dql7b1yjjpfg56flccm";
+ name = "kbounce-17.08.1.tar.xz";
};
};
kbreakout = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kbreakout-17.04.2.tar.xz";
- sha256 = "1pydl6p7f8f1jxd6k8d563wwigx52fg850d2x736wzw1nk4vwg8b";
- name = "kbreakout-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kbreakout-17.08.1.tar.xz";
+ sha256 = "021hzg4m6aqvvavdx63ydj2s71shml6x1rrd9lyyw23harh7402h";
+ name = "kbreakout-17.08.1.tar.xz";
};
};
kbruch = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kbruch-17.04.2.tar.xz";
- sha256 = "0kpzqlnx3wzygnna5l1rssclz9fkvl6mzr5jnr730d5c3r7hymby";
- name = "kbruch-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kbruch-17.08.1.tar.xz";
+ sha256 = "110iar2p5wlil4b8j5gw37mizajvhc9j7fww7dmvffq1yn4m5ac2";
+ name = "kbruch-17.08.1.tar.xz";
};
};
kcachegrind = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kcachegrind-17.04.2.tar.xz";
- sha256 = "148wmzq482jarpg0sywdlrjc0bgb2vkg0g2pn7wqj1czijs5l0rv";
- name = "kcachegrind-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kcachegrind-17.08.1.tar.xz";
+ sha256 = "0pgc00y7l98fws7qfc9i92a9mizgkkvap48pi12r9ajj5bhy792b";
+ name = "kcachegrind-17.08.1.tar.xz";
};
};
kcalc = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kcalc-17.04.2.tar.xz";
- sha256 = "03lzvhs4kyj9cvhw6kh1xmhs2r9vaa4a9ibqnkjb6xx1nx4cpm84";
- name = "kcalc-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kcalc-17.08.1.tar.xz";
+ sha256 = "177mr533r71jpa64bvkbl349lkf2yzanrjh22d4rii7lqma63z4k";
+ name = "kcalc-17.08.1.tar.xz";
};
};
kcalcore = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kcalcore-17.04.2.tar.xz";
- sha256 = "05v1w8k70cdvvw5kv4994llbifrq2almir74i44v4i1449x7ziqn";
- name = "kcalcore-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kcalcore-17.08.1.tar.xz";
+ sha256 = "084gj40lssh6lsjn7xpvzlhlfcc6vcdk6ygv47wvf8y0yipppspw";
+ name = "kcalcore-17.08.1.tar.xz";
};
};
kcalutils = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kcalutils-17.04.2.tar.xz";
- sha256 = "1hj3k4lqj019cy8p7j6f20lkc75g8wma1p8vwynzlclnz43bsikp";
- name = "kcalutils-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kcalutils-17.08.1.tar.xz";
+ sha256 = "04nn5lv2x15352p42589zyh1w2fxbijkq9wmbcr51fb4nphx007l";
+ name = "kcalutils-17.08.1.tar.xz";
};
};
kcharselect = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kcharselect-17.04.2.tar.xz";
- sha256 = "1xw5sd93zkkkp3v75p718bwrd9m391pryb12slrk66nsq1lbw1wn";
- name = "kcharselect-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kcharselect-17.08.1.tar.xz";
+ sha256 = "1w6ydp7acf5ha0kag60m1anksj7fy2kk8bghpw14lv8bxzrjwdam";
+ name = "kcharselect-17.08.1.tar.xz";
};
};
kcolorchooser = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kcolorchooser-17.04.2.tar.xz";
- sha256 = "156w22x3hx244l6v1zlndl45bxq25nnagji6zl0jspsa4csbzfrn";
- name = "kcolorchooser-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kcolorchooser-17.08.1.tar.xz";
+ sha256 = "1zmzd919crj25ngcv085pp4w213x4bra54npfw4z11cmc30zz57i";
+ name = "kcolorchooser-17.08.1.tar.xz";
};
};
kcontacts = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kcontacts-17.04.2.tar.xz";
- sha256 = "0nj7kff7yk7pbmq8g65qpj4g489mxfgwh8axbxsz8z31fgsg1i7s";
- name = "kcontacts-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kcontacts-17.08.1.tar.xz";
+ sha256 = "0iqpvsnwbnzczdcvbqlrgmx2czjqgl4ag4b09vhkj1s7gs8cracy";
+ name = "kcontacts-17.08.1.tar.xz";
};
};
kcron = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kcron-17.04.2.tar.xz";
- sha256 = "1k3ya01icz65zyl33p3668p6ivkrlfpp95aydfmnfcd2q365vksx";
- name = "kcron-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kcron-17.08.1.tar.xz";
+ sha256 = "0yzv068jsxyag68fix421z5qfvpxm1i9v1q3pw3ksvq07ai740f3";
+ name = "kcron-17.08.1.tar.xz";
};
};
kdav = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kdav-17.04.2.tar.xz";
- sha256 = "0yhjl9p4rnd6r5jwscxhwgv9d2xkj34mx4hh3rk4mc28bhy3yw9w";
- name = "kdav-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kdav-17.08.1.tar.xz";
+ sha256 = "1m9pcydg2fwz95mym7k7wdavbw4nz18ihhrhfmcda7m61x6y8z9q";
+ name = "kdav-17.08.1.tar.xz";
};
};
kdebugsettings = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kdebugsettings-17.04.2.tar.xz";
- sha256 = "1c05zh66ahnm1ann35bm9q93lg6cylrfsyawki8g5485ivxfs5xh";
- name = "kdebugsettings-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kdebugsettings-17.08.1.tar.xz";
+ sha256 = "0jxy68fs45hwkd3hjl5rknwznsihk0nszmskw3hy3y64p2vvvzyf";
+ name = "kdebugsettings-17.08.1.tar.xz";
};
};
kde-dev-scripts = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kde-dev-scripts-17.04.2.tar.xz";
- sha256 = "1vid5j08x8pkzzhqr78nsn4r9nnhisvsb7bfl9a1pc609y461y31";
- name = "kde-dev-scripts-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kde-dev-scripts-17.08.1.tar.xz";
+ sha256 = "16dzmx80752n3wcg2dcwh4cc0mwxwckfbms134g83gwaix5wkyvd";
+ name = "kde-dev-scripts-17.08.1.tar.xz";
};
};
kde-dev-utils = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kde-dev-utils-17.04.2.tar.xz";
- sha256 = "1xf20zdlrinp9kxdky9a5lvflxikzdzv2yj211nlir8a63iv0bz7";
- name = "kde-dev-utils-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kde-dev-utils-17.08.1.tar.xz";
+ sha256 = "1lq8cya779667yjwinvx9xyfiq79p7m93m4r2zgd7r6fpakxdkch";
+ name = "kde-dev-utils-17.08.1.tar.xz";
};
};
kdeedu-data = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kdeedu-data-17.04.2.tar.xz";
- sha256 = "1bdh14d9ypai97jcxf1sfaw6ccfnf2ckj677fc8gl8g7fid094np";
- name = "kdeedu-data-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kdeedu-data-17.08.1.tar.xz";
+ sha256 = "1fk2r2cib8gzk1ss5z6wxdwswl3f0hvwmxdgg0cs0j11gk1m0m6g";
+ name = "kdeedu-data-17.08.1.tar.xz";
};
};
kdegraphics-mobipocket = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kdegraphics-mobipocket-17.04.2.tar.xz";
- sha256 = "0qyv804a9cvqm0dm77zd79jj27i09jbw2cpgmazg3jn0plb5lkm6";
- name = "kdegraphics-mobipocket-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kdegraphics-mobipocket-17.08.1.tar.xz";
+ sha256 = "0y2yfcf2p864hzyxyxv65mkfl8qk08zh9pr24ycxfdl4g22pal6w";
+ name = "kdegraphics-mobipocket-17.08.1.tar.xz";
};
};
kdegraphics-thumbnailers = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kdegraphics-thumbnailers-17.04.2.tar.xz";
- sha256 = "06vr377nr59n599dsmi250nak78ka1zkfa8ckp93sasp5nlilbnp";
- name = "kdegraphics-thumbnailers-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kdegraphics-thumbnailers-17.08.1.tar.xz";
+ sha256 = "1milas13wb958z2p39rm1353lqz9ibhnpwb8ffw6wy5qdbx4fr4q";
+ name = "kdegraphics-thumbnailers-17.08.1.tar.xz";
};
};
kde-l10n-ar = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ar-17.04.2.tar.xz";
- sha256 = "0w675vdbvms758y9hywjkg72sl37i2q1n8wq7mrqkvbgd7fri198";
- name = "kde-l10n-ar-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-ar-17.08.1.tar.xz";
+ sha256 = "03bj86is2a0srygmabxmwmdmqxwwxm06lh9a6g362dhglh4ypp67";
+ name = "kde-l10n-ar-17.08.1.tar.xz";
};
};
kde-l10n-ast = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ast-17.04.2.tar.xz";
- sha256 = "0v6qsn1x6rgll1hpr482jis0pljmqw0bax31a7vvr16ahp0rlrmk";
- name = "kde-l10n-ast-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-ast-17.08.1.tar.xz";
+ sha256 = "0vsyv4g8ywpvcxh1hkhx1y8plx9k068fqrgvglv9gvsr86w57xn7";
+ name = "kde-l10n-ast-17.08.1.tar.xz";
};
};
kde-l10n-bg = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-bg-17.04.2.tar.xz";
- sha256 = "0hi7dvv25yji3924983k3fjgxynz1avp6l9amj7frn6g0c68lbp4";
- name = "kde-l10n-bg-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-bg-17.08.1.tar.xz";
+ sha256 = "0bz8ydq7i0q29znbia0fcw5y19cw9a5hxh2gh8s7v6pvniazlgfx";
+ name = "kde-l10n-bg-17.08.1.tar.xz";
};
};
kde-l10n-bs = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-bs-17.04.2.tar.xz";
- sha256 = "11sikg952dv75f12rd7sky9rwamr9w4szdqkd9zw9kdgy6q2izn7";
- name = "kde-l10n-bs-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-bs-17.08.1.tar.xz";
+ sha256 = "19jjrwga6b5vn0g8m5mgp9kgn9173km6jmj92fl63w7lhd60pqyy";
+ name = "kde-l10n-bs-17.08.1.tar.xz";
};
};
kde-l10n-ca = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ca-17.04.2.tar.xz";
- sha256 = "0s4j2vqxbpbsira0zyxz13kd59iicam2fhqz6xnlrd769vbfcbbv";
- name = "kde-l10n-ca-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-ca-17.08.1.tar.xz";
+ sha256 = "1ldpsjaczqfczglfk2nib4kqkzi6z16mkyisx1byw3wxix7aqak5";
+ name = "kde-l10n-ca-17.08.1.tar.xz";
};
};
kde-l10n-ca_valencia = {
- version = "ca_valencia-17.04.2";
+ version = "ca_valencia-17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ca@valencia-17.04.2.tar.xz";
- sha256 = "1dib0xvjcpg996smni56vncdq9wb9jcfr4abvqm7x3v50ip95f7f";
- name = "kde-l10n-ca_valencia-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-ca@valencia-17.08.1.tar.xz";
+ sha256 = "1dnvvc6jbwyvagy7ay3w1rdj82bx7zcc97i61drlv2cf1vgkmb4l";
+ name = "kde-l10n-ca_valencia-17.08.1.tar.xz";
};
};
kde-l10n-cs = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-cs-17.04.2.tar.xz";
- sha256 = "05hjzfrzafb9xabsb15lq5hl152brqf68hvl3h0vsmxyw7hqzxrj";
- name = "kde-l10n-cs-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-cs-17.08.1.tar.xz";
+ sha256 = "0f9h5ln31395kgbqa8rj1sdkwjaczw4mvjlif9656xqglzw0dvs1";
+ name = "kde-l10n-cs-17.08.1.tar.xz";
};
};
kde-l10n-da = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-da-17.04.2.tar.xz";
- sha256 = "05g8vh33fxvi6dmj6ryr6i2j3l4fd4cj3dkzch76bgvi00750fah";
- name = "kde-l10n-da-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-da-17.08.1.tar.xz";
+ sha256 = "0rr0gmzfbdwnya9bipbymwqy6250zdi47chawi7j3vc4j11511g2";
+ name = "kde-l10n-da-17.08.1.tar.xz";
};
};
kde-l10n-de = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-de-17.04.2.tar.xz";
- sha256 = "1hiqbscd2py88z45g7blbj74ayqj4mmgy0b8z6hcxn9n0ph4sidb";
- name = "kde-l10n-de-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-de-17.08.1.tar.xz";
+ sha256 = "08ad110q4k21j8mfzigjxxrlic2c6h0cxqiawbfswzc39r0vy0lb";
+ name = "kde-l10n-de-17.08.1.tar.xz";
};
};
kde-l10n-el = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-el-17.04.2.tar.xz";
- sha256 = "066n3r1vi9j8nln4xyhgpjhsl7gwhl6q7gqbdcp6zpwgxhwv6zic";
- name = "kde-l10n-el-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-el-17.08.1.tar.xz";
+ sha256 = "1m2f8rsygmyn05i3j5mnwnr7mm4jahy2yaphxv822g6i79iy3396";
+ name = "kde-l10n-el-17.08.1.tar.xz";
};
};
kde-l10n-en_GB = {
- version = "en_GB-17.04.2";
+ version = "en_GB-17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-en_GB-17.04.2.tar.xz";
- sha256 = "1307v713djkhny8rcg2schcwljn1cp728yllh227m30znprrqn41";
- name = "kde-l10n-en_GB-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-en_GB-17.08.1.tar.xz";
+ sha256 = "14ql8kd60c4svg3ar5n61g544in805xsyfk2bgals0m47fy3axyf";
+ name = "kde-l10n-en_GB-17.08.1.tar.xz";
};
};
kde-l10n-eo = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-eo-17.04.2.tar.xz";
- sha256 = "06i2m3g4s4raa1vzynfw5m89ydkcgjlbd96a4qxx76v888q65lsl";
- name = "kde-l10n-eo-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-eo-17.08.1.tar.xz";
+ sha256 = "05lnk520hg9kxf6f92fn9avx4h29pjk4k8j7rsk4nwngvvygqjb6";
+ name = "kde-l10n-eo-17.08.1.tar.xz";
};
};
kde-l10n-es = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-es-17.04.2.tar.xz";
- sha256 = "1al4figznf5f6lgpz2l57x01n87jlaqxldgp7gi545672lxzyx44";
- name = "kde-l10n-es-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-es-17.08.1.tar.xz";
+ sha256 = "1h2lzs1z5rcyg60f5d9jkxmdxwbhrdgbmib5h1nlz3f7jnrnpj86";
+ name = "kde-l10n-es-17.08.1.tar.xz";
};
};
kde-l10n-et = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-et-17.04.2.tar.xz";
- sha256 = "1dhqk1sj32pij4wc4pgfih3i8g3jf9b223rnraymhbsima200hx4";
- name = "kde-l10n-et-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-et-17.08.1.tar.xz";
+ sha256 = "0ifcsc6ic76gnbni0qm4yfcbhz4b3kww3rqly34hlrpzlwf52x5w";
+ name = "kde-l10n-et-17.08.1.tar.xz";
};
};
kde-l10n-eu = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-eu-17.04.2.tar.xz";
- sha256 = "0kix9qs15488ns71hv67yvp3w03n68lxjll6cjxhyhrfcji9ldwc";
- name = "kde-l10n-eu-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-eu-17.08.1.tar.xz";
+ sha256 = "1nxmy2bdlljjf4dqy1fsfx7iawak7nh4h3x5h72im2s49z4y01rl";
+ name = "kde-l10n-eu-17.08.1.tar.xz";
};
};
kde-l10n-fa = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-fa-17.04.2.tar.xz";
- sha256 = "1867hgiqh51f6nzdmkq6nplnq7hs22lvzpishckhzw8x770sv10b";
- name = "kde-l10n-fa-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-fa-17.08.1.tar.xz";
+ sha256 = "19x6zacpyc7gax1lrqls2cb9ax747ls6pm8046hcgdy2nb8byqmc";
+ name = "kde-l10n-fa-17.08.1.tar.xz";
};
};
kde-l10n-fi = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-fi-17.04.2.tar.xz";
- sha256 = "1p4agangwvdzcx9029wslq5228wkgk4kpxddi2alzhlcxd25fk7b";
- name = "kde-l10n-fi-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-fi-17.08.1.tar.xz";
+ sha256 = "04cdsrjr9hnx1x3w4chjaq82varc24hl65kqiyf13nr3nvgx3xba";
+ name = "kde-l10n-fi-17.08.1.tar.xz";
};
};
kde-l10n-fr = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-fr-17.04.2.tar.xz";
- sha256 = "0lby60rklzcjk62qw2inslvhv4fli57kjn6a76hidcwvwmi3kcyh";
- name = "kde-l10n-fr-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-fr-17.08.1.tar.xz";
+ sha256 = "0dqjr15sg42pp3balfvanl7169nsyqyr67pjw02xzbkskh61jihg";
+ name = "kde-l10n-fr-17.08.1.tar.xz";
};
};
kde-l10n-ga = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ga-17.04.2.tar.xz";
- sha256 = "06xkiizvcsg61ww8gdqjn84ymhwcxr9pkf8p0g5mrplvnxc9v1ys";
- name = "kde-l10n-ga-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-ga-17.08.1.tar.xz";
+ sha256 = "0lbpbkip2fgml3jni4hllixpzaya5q5xcn3m674a7hs3y7gr35gs";
+ name = "kde-l10n-ga-17.08.1.tar.xz";
};
};
kde-l10n-gl = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-gl-17.04.2.tar.xz";
- sha256 = "059xv4a7mgf16h3wj2m4j1f32r8msvk0fdw62dlfypk0xi8lnzch";
- name = "kde-l10n-gl-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-gl-17.08.1.tar.xz";
+ sha256 = "1bbg7ya85phzxw3rcc2k04rc4axridcqdrkh719ivp7p46m47j28";
+ name = "kde-l10n-gl-17.08.1.tar.xz";
};
};
kde-l10n-he = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-he-17.04.2.tar.xz";
- sha256 = "1w3rc832ngw91m1yrd988hxp8y0aaqgvkizkgmjiki0gqk3fkj25";
- name = "kde-l10n-he-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-he-17.08.1.tar.xz";
+ sha256 = "1h4lzv2i37l2w8af5w2dxan9zancqbqbcvhc5lkngnq2mvlqhwax";
+ name = "kde-l10n-he-17.08.1.tar.xz";
};
};
kde-l10n-hi = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-hi-17.04.2.tar.xz";
- sha256 = "1kd4yxq3m5kg3crn6w86aiipslkfa4z79prm3fd6d4a5zpacmqbf";
- name = "kde-l10n-hi-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-hi-17.08.1.tar.xz";
+ sha256 = "0zjbchy072gbslmvi894jqa5vlh4brxkqdk5n3b7nh8003f7kvdl";
+ name = "kde-l10n-hi-17.08.1.tar.xz";
};
};
kde-l10n-hr = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-hr-17.04.2.tar.xz";
- sha256 = "1m3avcrbyz31ir8qwwf9lhl4xr4qg241j99jbv28mgmsiv73ifji";
- name = "kde-l10n-hr-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-hr-17.08.1.tar.xz";
+ sha256 = "1k4zzn0cwqp6syr82nij26pnhhjiq39pd03lj1m7r83ylmywivxv";
+ name = "kde-l10n-hr-17.08.1.tar.xz";
};
};
kde-l10n-hu = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-hu-17.04.2.tar.xz";
- sha256 = "1vh94d0ffjak5gwf4flgc2giq6vswyh57i334sq7n3vbpg6rwh7s";
- name = "kde-l10n-hu-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-hu-17.08.1.tar.xz";
+ sha256 = "1jj20ggv96lsfl1vc7gsv3vxwb3swj2bd1v8hyaycc86bw51qfcs";
+ name = "kde-l10n-hu-17.08.1.tar.xz";
};
};
kde-l10n-ia = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ia-17.04.2.tar.xz";
- sha256 = "0k391rwrrj6bd86nd791pk0ih7g3z1b7vva43dmlishh5xind12p";
- name = "kde-l10n-ia-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-ia-17.08.1.tar.xz";
+ sha256 = "0b0mp1jdbbarqd3ajc0fmjpq01y3yw37dd0ihs0r9l2v6s1ivrx2";
+ name = "kde-l10n-ia-17.08.1.tar.xz";
};
};
kde-l10n-id = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-id-17.04.2.tar.xz";
- sha256 = "13pfybpngzv1lscd3q4x4qh8kxs2k7md9biyibrs1vpyr28jw01c";
- name = "kde-l10n-id-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-id-17.08.1.tar.xz";
+ sha256 = "1hdw5cgwmsp6d36jg9a7gnhiywzavrjs644w5gcw8ab2w5kzi725";
+ name = "kde-l10n-id-17.08.1.tar.xz";
};
};
kde-l10n-is = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-is-17.04.2.tar.xz";
- sha256 = "19cngzf26438amwfc7prz6hrszlqr78j2w9djm7y24gy7r6blfjq";
- name = "kde-l10n-is-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-is-17.08.1.tar.xz";
+ sha256 = "0p9q8p3rffc79p25frgzk3jykwga3cxcc4icx29672bcy5ri6d3a";
+ name = "kde-l10n-is-17.08.1.tar.xz";
};
};
kde-l10n-it = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-it-17.04.2.tar.xz";
- sha256 = "0wfsvrhmmarl277qvgwh4w9nl3rcqslkd4fjsl88m7230xzcjy6k";
- name = "kde-l10n-it-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-it-17.08.1.tar.xz";
+ sha256 = "1af31vfg6q30rgqfcpmjyk32rlz661azi9r205bbv45nagw5aiyz";
+ name = "kde-l10n-it-17.08.1.tar.xz";
};
};
kde-l10n-ja = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ja-17.04.2.tar.xz";
- sha256 = "1b41f8pki75rc2swjaf1hvdvvjqvfz0glawrh4dda872naw65mhy";
- name = "kde-l10n-ja-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-ja-17.08.1.tar.xz";
+ sha256 = "1273rm1m3ap8psf8qrvvdw7yh4bn0d90mgi02dk7vqx30j8vk2sx";
+ name = "kde-l10n-ja-17.08.1.tar.xz";
};
};
kde-l10n-kk = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-kk-17.04.2.tar.xz";
- sha256 = "01jrsjwlv10qdyzlwljf74cdwxprmsfvhi1pdlhv271z2ix661w5";
- name = "kde-l10n-kk-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-kk-17.08.1.tar.xz";
+ sha256 = "15wkhp673bfs23rxw8wa2q3z0gqm1wblaca0azhmy4fyhgwqaciz";
+ name = "kde-l10n-kk-17.08.1.tar.xz";
};
};
kde-l10n-km = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-km-17.04.2.tar.xz";
- sha256 = "1fw62awnkmk7q4ybjqiszj8d0jkmm247lq25l6h8zsmidc9x4xz9";
- name = "kde-l10n-km-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-km-17.08.1.tar.xz";
+ sha256 = "1c6bvy3fifdm1azqzdxbwb71pzlp90wn6k981c1ny2cpcmiwd4ps";
+ name = "kde-l10n-km-17.08.1.tar.xz";
};
};
kde-l10n-ko = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ko-17.04.2.tar.xz";
- sha256 = "1b5pqr5q7kn4vh7p8kngsw82ya7lv1jzbn8ngzrr8qkf6hh6ig2a";
- name = "kde-l10n-ko-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-ko-17.08.1.tar.xz";
+ sha256 = "0wxnjjdlngpva34izxq7syga4gyfj2jyf1npayzq3ii0hzjarmrq";
+ name = "kde-l10n-ko-17.08.1.tar.xz";
};
};
kde-l10n-lt = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-lt-17.04.2.tar.xz";
- sha256 = "06pn3dx7dx26w16lfcwdrzphakvnk709bs5mki9p08pdmamjdr7w";
- name = "kde-l10n-lt-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-lt-17.08.1.tar.xz";
+ sha256 = "02571m0mnhryy3zggy2bzc2k3q2dqc8kwn49332jsvbmsbkznk6a";
+ name = "kde-l10n-lt-17.08.1.tar.xz";
};
};
kde-l10n-lv = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-lv-17.04.2.tar.xz";
- sha256 = "0a2kchx1qkyqzmqa7ajadfpxa5zywyhv55db5qax2xncz1w7v515";
- name = "kde-l10n-lv-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-lv-17.08.1.tar.xz";
+ sha256 = "17xhsgqb56al5zyvhllqfnm118fimnchd037649nnkddfpl95wwi";
+ name = "kde-l10n-lv-17.08.1.tar.xz";
};
};
kde-l10n-mr = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-mr-17.04.2.tar.xz";
- sha256 = "0mjg9v484ayafgdz0z6ahsqsdlyn3iv9sa0xwg2x2fc04r5k5dni";
- name = "kde-l10n-mr-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-mr-17.08.1.tar.xz";
+ sha256 = "0p8ynpc1ryksb97zl50i23rknsr70p124wpxmr6i1i7aq8jagcqc";
+ name = "kde-l10n-mr-17.08.1.tar.xz";
};
};
kde-l10n-nb = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-nb-17.04.2.tar.xz";
- sha256 = "0bxq83qg39ivcr0qvxb0cd0q9mkjwp9j4h86s14wp5yq6jp0vcni";
- name = "kde-l10n-nb-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-nb-17.08.1.tar.xz";
+ sha256 = "1ikh6fpj5lw4bfpmh8ln1v3mvmd9k55jz3v67ncrfyflljvwv6v7";
+ name = "kde-l10n-nb-17.08.1.tar.xz";
};
};
kde-l10n-nds = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-nds-17.04.2.tar.xz";
- sha256 = "0rpdbk83rmj24m3by7igvab5aaskizfqxwfyvcjj0zhxpals0px4";
- name = "kde-l10n-nds-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-nds-17.08.1.tar.xz";
+ sha256 = "0g7da58vazj1ckw336hgp7zlp6ra31xdjp0zx6hmwcxjv9as9scy";
+ name = "kde-l10n-nds-17.08.1.tar.xz";
};
};
kde-l10n-nl = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-nl-17.04.2.tar.xz";
- sha256 = "180dsd92qap14pkqr4xv63zdaqz4s1jyx590d705yvbf3mkc1bwx";
- name = "kde-l10n-nl-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-nl-17.08.1.tar.xz";
+ sha256 = "0d059nb4qifpm4bx0akmxn0x9bx6cs5218yh9prqn9wpzaa96vf5";
+ name = "kde-l10n-nl-17.08.1.tar.xz";
};
};
kde-l10n-nn = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-nn-17.04.2.tar.xz";
- sha256 = "1vbb3jvhhv8pksff8330i2b2qjksb4lksw3pb52ph2h77gb36bh3";
- name = "kde-l10n-nn-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-nn-17.08.1.tar.xz";
+ sha256 = "034570iymirny6di77gxck3j0b1n11v07kj7k80h03smq2gkb6rh";
+ name = "kde-l10n-nn-17.08.1.tar.xz";
};
};
kde-l10n-pa = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-pa-17.04.2.tar.xz";
- sha256 = "0v0a6bcrnrpy2ayj7d4v6lfgaxly3nk3d6dgmy26nydgmyg0xfsa";
- name = "kde-l10n-pa-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-pa-17.08.1.tar.xz";
+ sha256 = "10872cgamrm39xk5kr4qd5ddzpfpgra1rysj7raw9hr5fw0h5jqx";
+ name = "kde-l10n-pa-17.08.1.tar.xz";
};
};
kde-l10n-pl = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-pl-17.04.2.tar.xz";
- sha256 = "0chzlzyxjhh1rv4gl7pbph7fs09p932mkl7az8yihj3zl5cvw82n";
- name = "kde-l10n-pl-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-pl-17.08.1.tar.xz";
+ sha256 = "0bvp9mcny4zbcq1pi2d33s0fkdpblg1qrizi3v3jhzmxx1i7hr3w";
+ name = "kde-l10n-pl-17.08.1.tar.xz";
};
};
kde-l10n-pt = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-pt-17.04.2.tar.xz";
- sha256 = "14yp29l7fb2jlpx2dd12zn64q39yf7p9p79iynjsg3spwfdm5zpi";
- name = "kde-l10n-pt-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-pt-17.08.1.tar.xz";
+ sha256 = "0m61a31iqzwk8wj40rjnx9i662mk3n9q21vh22p7ak9kf9r9kfhv";
+ name = "kde-l10n-pt-17.08.1.tar.xz";
};
};
kde-l10n-pt_BR = {
- version = "pt_BR-17.04.2";
+ version = "pt_BR-17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-pt_BR-17.04.2.tar.xz";
- sha256 = "12g1mbdhw18pga063gczsxvmigdwgncc0qk8vy1rj6h5q3w6kkfm";
- name = "kde-l10n-pt_BR-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-pt_BR-17.08.1.tar.xz";
+ sha256 = "1kh7rrpx5idnkpd8j89gxkm33kjz808mvb0d6i39lsv8nqk8ifq8";
+ name = "kde-l10n-pt_BR-17.08.1.tar.xz";
};
};
kde-l10n-ro = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ro-17.04.2.tar.xz";
- sha256 = "0sqym2mx927pfvdq5lny64scg80xyrz3q1vlg3sk8gyil0n942gv";
- name = "kde-l10n-ro-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-ro-17.08.1.tar.xz";
+ sha256 = "04b9bjz9nprhiki00b4yffd27dk1vjz6ddjw6bh6bxrzmzg2cgbc";
+ name = "kde-l10n-ro-17.08.1.tar.xz";
};
};
kde-l10n-ru = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ru-17.04.2.tar.xz";
- sha256 = "1gcy1ssir2fgg1djv7jbh9jv3y1pxs3yrxaqdd0m4zdkva1knx5p";
- name = "kde-l10n-ru-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-ru-17.08.1.tar.xz";
+ sha256 = "04zx9xf1ca2pl75rbkcr7fa6sy3kmzdgc626wygqg0s4bi3rlsh2";
+ name = "kde-l10n-ru-17.08.1.tar.xz";
};
};
kde-l10n-sk = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-sk-17.04.2.tar.xz";
- sha256 = "0yq5b9z77bijfa3y1dx2d6avpirwzbdsz9zng93r8a3lzyv3syfi";
- name = "kde-l10n-sk-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-sk-17.08.1.tar.xz";
+ sha256 = "0q4ykign8mifwfwv56p3ac7bn3ywc9anj43f8n08c7bma4idxv01";
+ name = "kde-l10n-sk-17.08.1.tar.xz";
};
};
kde-l10n-sl = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-sl-17.04.2.tar.xz";
- sha256 = "1k117r37waxlxhdhlh7s2fii2iyv8himfkxnbm4lcxfbmhqj82cn";
- name = "kde-l10n-sl-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-sl-17.08.1.tar.xz";
+ sha256 = "13mb62fjlpbhyv485rp1f5xgdfqdkq3vm2qq82rbw4jdw140ck08";
+ name = "kde-l10n-sl-17.08.1.tar.xz";
};
};
kde-l10n-sr = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-sr-17.04.2.tar.xz";
- sha256 = "17xpb1q7qamz70qbg2k9i4jfbz1qsv4n0j5hw4ix9bm2dncaaqa9";
- name = "kde-l10n-sr-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-sr-17.08.1.tar.xz";
+ sha256 = "0xc6pgbm3rqn5g824pzfv0cxas6anb3glm11zhk9qhj24ig1zd5c";
+ name = "kde-l10n-sr-17.08.1.tar.xz";
};
};
kde-l10n-sv = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-sv-17.04.2.tar.xz";
- sha256 = "1xlzc96pcwlbja3m0m15ii8n4lxf8h8ganyyh43zgxikcibcny70";
- name = "kde-l10n-sv-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-sv-17.08.1.tar.xz";
+ sha256 = "0p067wi30d7vgxsv345vv0f01qbchnffamv4pjv8sfscbcmih9c6";
+ name = "kde-l10n-sv-17.08.1.tar.xz";
};
};
kde-l10n-tr = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-tr-17.04.2.tar.xz";
- sha256 = "1fmmwv85cgazk655hdaykljjrh4cgghh0wkjf57n8lkkc7503278";
- name = "kde-l10n-tr-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-tr-17.08.1.tar.xz";
+ sha256 = "15x2r21810mndzzqx5cz1z6a6g7czmp2wiw8hw89g6nigq3qvacx";
+ name = "kde-l10n-tr-17.08.1.tar.xz";
};
};
kde-l10n-ug = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ug-17.04.2.tar.xz";
- sha256 = "0l350qq3bfbvs7621lrl9azlx4mw5vdlrndp606v878abxaw16bh";
- name = "kde-l10n-ug-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-ug-17.08.1.tar.xz";
+ sha256 = "1bpd63jv8dlikg3589in5h11ydkpwp5mq69vlam9z68bmbl5sy5w";
+ name = "kde-l10n-ug-17.08.1.tar.xz";
};
};
kde-l10n-uk = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-uk-17.04.2.tar.xz";
- sha256 = "1xnkknd2k8zdiq322nbiim9hg7gvww5zv3x7gqjrrqy7nha75mh4";
- name = "kde-l10n-uk-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-uk-17.08.1.tar.xz";
+ sha256 = "1yaynm508g03gn896q3zrw8y5rn4l7m8a2x2skwyjzfxy8pk4az9";
+ name = "kde-l10n-uk-17.08.1.tar.xz";
};
};
kde-l10n-wa = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-wa-17.04.2.tar.xz";
- sha256 = "1f9sphx3rlc5m1ji0ihxs3p6wb7b53acfjyd5vps3b3cbf3j4aa3";
- name = "kde-l10n-wa-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-wa-17.08.1.tar.xz";
+ sha256 = "0247pwdizs31jhrjx6kfydgkr2ghqnqsdza10a7mggz825mgg2hv";
+ name = "kde-l10n-wa-17.08.1.tar.xz";
};
};
kde-l10n-zh_CN = {
- version = "zh_CN-17.04.2";
+ version = "zh_CN-17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-zh_CN-17.04.2.tar.xz";
- sha256 = "1258f5s3pg6a9mfniwdf44w3y6pnf14m8nmqpfy534z68ypw6ymw";
- name = "kde-l10n-zh_CN-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-zh_CN-17.08.1.tar.xz";
+ sha256 = "0a58ikf8pkxhqr25cy04s5hwhdkp81y3304wa6xcni2k5vlzca9f";
+ name = "kde-l10n-zh_CN-17.08.1.tar.xz";
};
};
kde-l10n-zh_TW = {
- version = "zh_TW-17.04.2";
+ version = "zh_TW-17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-zh_TW-17.04.2.tar.xz";
- sha256 = "0qz66hz1yabdgx3yq7cc6i5w9m01yp8pjrh46blskq6apwfwdhmg";
- name = "kde-l10n-zh_TW-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-zh_TW-17.08.1.tar.xz";
+ sha256 = "02lkg354vq3sqvy4iib51yynjb5yx0hsqh1alik97wajawv4fkrc";
+ name = "kde-l10n-zh_TW-17.08.1.tar.xz";
};
};
kdelibs = {
- version = "4.14.33";
+ version = "4.14.36";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kdelibs-4.14.33.tar.xz";
- sha256 = "0594ak7d93sqk293p3jdi0mad2wwglk7m7x6sgj2jgaxjn3c5amq";
- name = "kdelibs-4.14.33.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kdelibs-4.14.36.tar.xz";
+ sha256 = "08x5frbbgib9agn9ixslpx41wki8ky4l1r60xrl2pmywmwld4ag1";
+ name = "kdelibs-4.14.36.tar.xz";
};
};
kdenetwork-filesharing = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kdenetwork-filesharing-17.04.2.tar.xz";
- sha256 = "1fac78wbh61vsk1ibkvhffgnlpds9a6ax6jyly2n9lrcqifann64";
- name = "kdenetwork-filesharing-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kdenetwork-filesharing-17.08.1.tar.xz";
+ sha256 = "1m79c4ww25gcx4aiwjwp81r18i8s2x6afpp76xi2am6v4sd8rjb3";
+ name = "kdenetwork-filesharing-17.08.1.tar.xz";
};
};
kdenlive = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kdenlive-17.04.2.tar.xz";
- sha256 = "1jzwar4bdjrbf97i9g6njzibv3ywcwha4cjkmj70pql67d5nmki9";
- name = "kdenlive-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kdenlive-17.08.1.tar.xz";
+ sha256 = "0cj618pjkack3wj66nbq4src460la5qryylblswg2nzm0svqawqh";
+ name = "kdenlive-17.08.1.tar.xz";
};
};
kdepim-addons = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kdepim-addons-17.04.2.tar.xz";
- sha256 = "08hcgkjk3mwlg07g5k2b02kc67xyp2kxgh80f0v342kg455lq3fw";
- name = "kdepim-addons-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kdepim-addons-17.08.1.tar.xz";
+ sha256 = "105b8pf9g44b5fz8vy404jiysz7sccvllz0bvhi9ihv7a3g4gihg";
+ name = "kdepim-addons-17.08.1.tar.xz";
};
};
kdepim-apps-libs = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kdepim-apps-libs-17.04.2.tar.xz";
- sha256 = "1ala5hqzhpny0sncm96kpalj7dxkh06p6j0sk3725lpjqhr1ng15";
- name = "kdepim-apps-libs-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kdepim-apps-libs-17.08.1.tar.xz";
+ sha256 = "000gmblsgyzgml6h4v3ccr2n0n7s359rb91higiyrzkxi1cq0bh8";
+ name = "kdepim-apps-libs-17.08.1.tar.xz";
};
};
kdepim-runtime = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kdepim-runtime-17.04.2.tar.xz";
- sha256 = "16crq3yc7djsas9klg1vl9nmk27fqj9770lfpysgz0pglb6j6k92";
- name = "kdepim-runtime-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kdepim-runtime-17.08.1.tar.xz";
+ sha256 = "0q19j5dr0lml9v88ma32vqypi3jzg2dkjzv9adl48k9d2yrywq5n";
+ name = "kdepim-runtime-17.08.1.tar.xz";
};
};
kde-runtime = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kde-runtime-17.04.2.tar.xz";
- sha256 = "1885cyarf6g460mnfl1wij0xg5n4z7w406lmlrk1w4h90ql48j69";
- name = "kde-runtime-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kde-runtime-17.08.1.tar.xz";
+ sha256 = "0gl24dpkxbkjq7kqj2i022w82daihxnyi2ccld0ql9680w73s3zg";
+ name = "kde-runtime-17.08.1.tar.xz";
};
};
kdesdk-kioslaves = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kdesdk-kioslaves-17.04.2.tar.xz";
- sha256 = "10sigid2zwgjfw737gr4wmm2ajx31v1y8y28l7dqd6y4jlkzf34j";
- name = "kdesdk-kioslaves-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kdesdk-kioslaves-17.08.1.tar.xz";
+ sha256 = "10nz2ai5iahva93psw1dd86npwcp5xlx80n12biwqfgwj5d380k8";
+ name = "kdesdk-kioslaves-17.08.1.tar.xz";
};
};
kdesdk-thumbnailers = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kdesdk-thumbnailers-17.04.2.tar.xz";
- sha256 = "1bq36gqqkf2cklj6rh35r88d4vknn22p0x3p6mq9ixca0sw7yc4a";
- name = "kdesdk-thumbnailers-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kdesdk-thumbnailers-17.08.1.tar.xz";
+ sha256 = "11d7vch9fc5w42wlq8bz3wpb68sjslvvqpqs67d155w682z1q4q1";
+ name = "kdesdk-thumbnailers-17.08.1.tar.xz";
};
};
kdf = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kdf-17.04.2.tar.xz";
- sha256 = "00g9jyl4bxmrbxri1q3893gw362v4rzp0gpc94d46v2vi6xqb501";
- name = "kdf-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kdf-17.08.1.tar.xz";
+ sha256 = "09sjv6z5565mvgnicwaykisgrh859m7h8wfggmqs3rgldsi3iy0p";
+ name = "kdf-17.08.1.tar.xz";
};
};
kdialog = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kdialog-17.04.2.tar.xz";
- sha256 = "184fyajhv4isirlv4sp8w2zxr7zkijknhsh6a1qpvr1r48ivw5aw";
- name = "kdialog-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kdialog-17.08.1.tar.xz";
+ sha256 = "1j5ahq4xksl0jrxcisai0mnk6vr126qbabd9hnwq491f419l3zh1";
+ name = "kdialog-17.08.1.tar.xz";
};
};
kdiamond = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kdiamond-17.04.2.tar.xz";
- sha256 = "0krnb2g63zww655xmx1yn1105zkqryid5ip2vkn3cva2l1x8zfwr";
- name = "kdiamond-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kdiamond-17.08.1.tar.xz";
+ sha256 = "07is91glcffrznsg72drmyqmz3lyki62g6ijc14x5i7k8v26nlhi";
+ name = "kdiamond-17.08.1.tar.xz";
};
};
keditbookmarks = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/keditbookmarks-17.04.2.tar.xz";
- sha256 = "12s9v5m681f9sz49h1xdnpriik8q2zswgr051kvvckbdrxj46rqc";
- name = "keditbookmarks-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/keditbookmarks-17.08.1.tar.xz";
+ sha256 = "1k18if8ssjwj8mgp2jgxxwa8hh6x5w402i8fb2nsc7b4khw02y9q";
+ name = "keditbookmarks-17.08.1.tar.xz";
};
};
kfilereplace = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kfilereplace-17.04.2.tar.xz";
- sha256 = "1das2szmhw3lcpl2r3cqcylx3dx3xnvqclnasr3h5ahg4z86aqhn";
- name = "kfilereplace-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kfilereplace-17.08.1.tar.xz";
+ sha256 = "1ra01im1yp5k73m2hyz72d73qhwv3by1zyipn4l1m2m4r62kwjcr";
+ name = "kfilereplace-17.08.1.tar.xz";
};
};
kfind = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kfind-17.04.2.tar.xz";
- sha256 = "0d04p14fzwryf9kjx7ancqi9cfhsmy9xc9ylyi7frbafr6kac5va";
- name = "kfind-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kfind-17.08.1.tar.xz";
+ sha256 = "114l6b081ddxx51ndkqjl9jnvy00nyydn245y1kskfbzk2yry1jb";
+ name = "kfind-17.08.1.tar.xz";
};
};
kfloppy = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kfloppy-17.04.2.tar.xz";
- sha256 = "1f2aah2kskvyxpwkglv38ql955x1870saycym20b058dirinxg42";
- name = "kfloppy-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kfloppy-17.08.1.tar.xz";
+ sha256 = "1afnlbk42g6sm7y7xkqnxr24mz2s95qkaap2s3zqc469gj1vlnxa";
+ name = "kfloppy-17.08.1.tar.xz";
};
};
kfourinline = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kfourinline-17.04.2.tar.xz";
- sha256 = "1423hcikj2fyy26vm5nl5q5pg6xbsjppkvd6qhjwzj9csd9m2ysr";
- name = "kfourinline-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kfourinline-17.08.1.tar.xz";
+ sha256 = "12cy3sarcy361wivlbpx2cxc2yaffr2xfy4dwz3iz6vzx49mhyky";
+ name = "kfourinline-17.08.1.tar.xz";
};
};
kgeography = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kgeography-17.04.2.tar.xz";
- sha256 = "1f7g9i4a2phi5gi5h6phn4w8l1yw2hf862yl6wwsgp4lb3agwcjb";
- name = "kgeography-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kgeography-17.08.1.tar.xz";
+ sha256 = "1mjfacc850pqsgylwfcvp7yv0c4f1qgk0y7pgwrx2nspf8i1wwhc";
+ name = "kgeography-17.08.1.tar.xz";
};
};
kget = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kget-17.04.2.tar.xz";
- sha256 = "0hnizzplcmhvkyl270bbsi587f6adb1n6vpjji1scwnfjz42pjma";
- name = "kget-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kget-17.08.1.tar.xz";
+ sha256 = "182l5hd5hfbpl88p9yzc54n8m0mi2fffp19sjdhhadmyx142inc1";
+ name = "kget-17.08.1.tar.xz";
};
};
kgoldrunner = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kgoldrunner-17.04.2.tar.xz";
- sha256 = "0ihh2qr7dn5ibax0ljh7ahzhr193a5ghmzgaxkfk4649qc34vnx5";
- name = "kgoldrunner-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kgoldrunner-17.08.1.tar.xz";
+ sha256 = "0rzhg7hk07yaghflskiz4wh5d3jdfvhzig3zyyhimwir90lj1gxx";
+ name = "kgoldrunner-17.08.1.tar.xz";
};
};
kgpg = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kgpg-17.04.2.tar.xz";
- sha256 = "0svr1qv9g6dm1m5ilbyws1mhrdjjq31iw0dwza3fri3vsmhhqpmx";
- name = "kgpg-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kgpg-17.08.1.tar.xz";
+ sha256 = "1hcg9zv4f2bj1210fahxap1fnyk7zdj3gfpfpdrww6qga5z4dzcy";
+ name = "kgpg-17.08.1.tar.xz";
};
};
khangman = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/khangman-17.04.2.tar.xz";
- sha256 = "1g06sm5fwdhysj7hjsrdj19hdf0q1kzc5li4h6klp4gim8hzji7w";
- name = "khangman-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/khangman-17.08.1.tar.xz";
+ sha256 = "17xk64lclbw2gcpnfpzi9sqryr8wl8g1v19gqrplvq4zw7qfanr5";
+ name = "khangman-17.08.1.tar.xz";
};
};
khelpcenter = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/khelpcenter-17.04.2.tar.xz";
- sha256 = "0zggqlyfgmpxgvjy83lqah9y927xzj8dy13pih0slnk01z50386c";
- name = "khelpcenter-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/khelpcenter-17.08.1.tar.xz";
+ sha256 = "1js7sk1hdp3k7d4gjk8rzq5rw1al8bh0ap5irw5551kvbagm5dp4";
+ name = "khelpcenter-17.08.1.tar.xz";
};
};
kholidays = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kholidays-17.04.2.tar.xz";
- sha256 = "1cyncg08binky75n93r0l5qlx1zw73dqx3xp4i7xajc7qkmiy1x9";
- name = "kholidays-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kholidays-17.08.1.tar.xz";
+ sha256 = "0gsvidakx0q0wqy2bgwq339hwghdcl882nvzj445hnmy10r2d6jk";
+ name = "kholidays-17.08.1.tar.xz";
};
};
kidentitymanagement = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kidentitymanagement-17.04.2.tar.xz";
- sha256 = "00pxbbnl4l4cq5mlmgf89ndfy4wykbfvhslws4is6wm3qf9v99gm";
- name = "kidentitymanagement-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kidentitymanagement-17.08.1.tar.xz";
+ sha256 = "1ippkav5nvfckp4145gcwa2hdl7zjw8bcaq6af5kcxqmvlcndvwv";
+ name = "kidentitymanagement-17.08.1.tar.xz";
};
};
kig = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kig-17.04.2.tar.xz";
- sha256 = "0w1gl28rqqprijlqsfc8x6qjjc6nylniqvlpm71rgiwyq0zpyl1p";
- name = "kig-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kig-17.08.1.tar.xz";
+ sha256 = "0gzfdpi4qlmwg6hkx1slvnxlynsfgwv18a9law05hg35hs6zxzfk";
+ name = "kig-17.08.1.tar.xz";
};
};
kigo = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kigo-17.04.2.tar.xz";
- sha256 = "01yjdwcfwibw1c7dgk2alyp9mj9vy70fki0zf85gi91cwkrqklsi";
- name = "kigo-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kigo-17.08.1.tar.xz";
+ sha256 = "0c498rzvmfkl0q5hnhddlx38qwyzsz4lh05cy5v4zpq8idvnxzj5";
+ name = "kigo-17.08.1.tar.xz";
};
};
killbots = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/killbots-17.04.2.tar.xz";
- sha256 = "09a6h7q0nwj4lk81mrh1cpi27pjyxpdrk9lr2kgmjxgksavsi1p6";
- name = "killbots-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/killbots-17.08.1.tar.xz";
+ sha256 = "0yay6pr83rh5slklmxvw3jr2bky7k5cgf55a8r6al5b4vsx2802r";
+ name = "killbots-17.08.1.tar.xz";
};
};
kimagemapeditor = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kimagemapeditor-17.04.2.tar.xz";
- sha256 = "00ln9mkmsky4fjn931d6y94f34fp7p11cx2vg1rafxzygr4zv0wz";
- name = "kimagemapeditor-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kimagemapeditor-17.08.1.tar.xz";
+ sha256 = "158vrszvz2acnbzvmjprg1j2knarffvg8awwjcfg3zn2i6arwwsg";
+ name = "kimagemapeditor-17.08.1.tar.xz";
};
};
kimap = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kimap-17.04.2.tar.xz";
- sha256 = "1g0j3n1ybx4vwyil7nic4rva2xn0dc86kbh1awcrk5q61pvkwmlr";
- name = "kimap-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kimap-17.08.1.tar.xz";
+ sha256 = "1vch7y153jg010mcz7qjxjp6f3gfxrczbfh3bvx8q70cqfmx7ssm";
+ name = "kimap-17.08.1.tar.xz";
};
};
kio-extras = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kio-extras-17.04.2.tar.xz";
- sha256 = "1k84yn9q5w0wsa0rfr5rkz9pnsnhpn0xmdxx2r3kriq866iy2wfh";
- name = "kio-extras-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kio-extras-17.08.1.tar.xz";
+ sha256 = "1hk09yavrr1dqvxjsdg9rmn6j8jzczhnfyn71hyfbglshvlhwm8m";
+ name = "kio-extras-17.08.1.tar.xz";
};
};
kiriki = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kiriki-17.04.2.tar.xz";
- sha256 = "116llc5p785h17wlqmy7hhjm3h8cbzsa8wh5hc13g3db58zyy3l4";
- name = "kiriki-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kiriki-17.08.1.tar.xz";
+ sha256 = "0cxmxxwn6ps00kf64z61r3k7iyr5falrbzmf6gz19m535b79drhi";
+ name = "kiriki-17.08.1.tar.xz";
};
};
kiten = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kiten-17.04.2.tar.xz";
- sha256 = "0khyg5m13ax2i7ml7cf23jq5zr090vdqm03b6m1959lhk3warvjw";
- name = "kiten-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kiten-17.08.1.tar.xz";
+ sha256 = "1yp2r5linfkknvn5dx4vf2f6vxg3kzrpiqsrg34q957wvfsc91qm";
+ name = "kiten-17.08.1.tar.xz";
};
};
kjumpingcube = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kjumpingcube-17.04.2.tar.xz";
- sha256 = "073hdjv6aa6lannn2avanjcxzgsz5pdfh5xi3r1hlmcwzwx4ydis";
- name = "kjumpingcube-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kjumpingcube-17.08.1.tar.xz";
+ sha256 = "161px7wad80a3p6hr27dj0990jb7j143q77q7ca308qysmffghnz";
+ name = "kjumpingcube-17.08.1.tar.xz";
};
};
kldap = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kldap-17.04.2.tar.xz";
- sha256 = "1d5fbw11hz071rk814pfqa8gy8plznnr5wx5y16vb75a4sll1iw4";
- name = "kldap-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kldap-17.08.1.tar.xz";
+ sha256 = "11j0ai0y022xxgiw7ac5cgv8vqb3qa1dbh7n9jqz9lg8rhjch2ix";
+ name = "kldap-17.08.1.tar.xz";
};
};
kleopatra = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kleopatra-17.04.2.tar.xz";
- sha256 = "0ph1rmxgq8n3yb61rhphw3b3kv8drdw13a418xwzc1kddpksa8r8";
- name = "kleopatra-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kleopatra-17.08.1.tar.xz";
+ sha256 = "1z32xwlsslhzqzsq8ngdws1ry56myvx8j56b973scbhd29z15www";
+ name = "kleopatra-17.08.1.tar.xz";
};
};
klettres = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/klettres-17.04.2.tar.xz";
- sha256 = "093fb3n6dza44v3dqjragwkirid86frdv2v4yf54smpj8i5ykz21";
- name = "klettres-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/klettres-17.08.1.tar.xz";
+ sha256 = "0s7n83smr4mrrs91bpyr3hk2s1sl3ix73scnllb6spb6gx5hhr13";
+ name = "klettres-17.08.1.tar.xz";
};
};
klickety = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/klickety-17.04.2.tar.xz";
- sha256 = "18xian4xwsj7wm5i6239cnabigzy05w02gwall884xk61mjwgqi7";
- name = "klickety-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/klickety-17.08.1.tar.xz";
+ sha256 = "0zp836x7ssgk7y5fcni7ya9cfdc28ywgvlzc01f7bi7pwh57q50x";
+ name = "klickety-17.08.1.tar.xz";
};
};
klines = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/klines-17.04.2.tar.xz";
- sha256 = "0va4ia1za6mynb0xxyn1z9xag0vs3pscgwkq1jfjyrd1k5inribr";
- name = "klines-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/klines-17.08.1.tar.xz";
+ sha256 = "069igz40zrwbnyvw53d59rksn2n3dxycysb9fakb165qr27kb42h";
+ name = "klines-17.08.1.tar.xz";
};
};
klinkstatus = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/klinkstatus-17.04.2.tar.xz";
- sha256 = "0mx16r98nr8ic5j9aqy32sz946v58cdzvhja4hxy56a2619pn7p8";
- name = "klinkstatus-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/klinkstatus-17.08.1.tar.xz";
+ sha256 = "11fakg10rlf4finznc2i5h1lbh1qq37wvzd93yc8vdwax98pps44";
+ name = "klinkstatus-17.08.1.tar.xz";
};
};
kmag = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kmag-17.04.2.tar.xz";
- sha256 = "1aswvc7zy8sd2jplyjmn05yvz4zjsjxy7arpzr5pb6q0za1fx1f0";
- name = "kmag-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kmag-17.08.1.tar.xz";
+ sha256 = "1y69rsdl9pz11xrbfg8p0ihm1691y3blb5jay0v228prbwsy2gn3";
+ name = "kmag-17.08.1.tar.xz";
};
};
kmahjongg = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kmahjongg-17.04.2.tar.xz";
- sha256 = "116ahf9yaw23bxz0hvfd8bs8276vc2nr3b383vahsgywakvcq71q";
- name = "kmahjongg-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kmahjongg-17.08.1.tar.xz";
+ sha256 = "17f57shs79pbwdaqblb4i9ibs3b4psy38ys69i8k5j04v7mam48s";
+ name = "kmahjongg-17.08.1.tar.xz";
};
};
kmail = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kmail-17.04.2.tar.xz";
- sha256 = "0vqhfnr9jz2yfjbk5cghmdxhdxlhk3x6mw9b33xq2cn9iink0n4l";
- name = "kmail-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kmail-17.08.1.tar.xz";
+ sha256 = "1c3yds59nssnqi0pxb6fjajq6yaj6ki7l83gj59wlmpsyc1nm15d";
+ name = "kmail-17.08.1.tar.xz";
};
};
kmail-account-wizard = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kmail-account-wizard-17.04.2.tar.xz";
- sha256 = "1l7fq7yzhp9ad1ij8fj47j9pq7adl9p2jgwsyg7gkhrfa8s02ygv";
- name = "kmail-account-wizard-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kmail-account-wizard-17.08.1.tar.xz";
+ sha256 = "1vipb6330p67g4qpx2g1ps0fxnqb8w1agfwxnv61k3fccxpr4gkw";
+ name = "kmail-account-wizard-17.08.1.tar.xz";
};
};
kmailtransport = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kmailtransport-17.04.2.tar.xz";
- sha256 = "0yjzvfwyz546486n9d1r8lr0q41ffjlg5c3klg8zc54d8290ghdw";
- name = "kmailtransport-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kmailtransport-17.08.1.tar.xz";
+ sha256 = "1r8xbccijiw5v92qq18rccvsdn87m8mwc6g53k8gxpjx37vxrba8";
+ name = "kmailtransport-17.08.1.tar.xz";
};
};
kmbox = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kmbox-17.04.2.tar.xz";
- sha256 = "0p1pf1a96h5bqhs5lmid0z9nd613x9vlwpraqdym5kyrzndvccys";
- name = "kmbox-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kmbox-17.08.1.tar.xz";
+ sha256 = "0bgjj69by4c11z7j7v7inx4gzcsn6106r28n1ds6lc1k0vv8zw2d";
+ name = "kmbox-17.08.1.tar.xz";
};
};
kmime = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kmime-17.04.2.tar.xz";
- sha256 = "1jz4bj2rgcn4fmjybvrlq5i6fpx1jzqlzk0z5dv0yrqrln20lmw8";
- name = "kmime-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kmime-17.08.1.tar.xz";
+ sha256 = "178bx5pasrrlqwzjz85ba06gs9r40prwk7z4v6ar6fr9q4pa088c";
+ name = "kmime-17.08.1.tar.xz";
};
};
kmines = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kmines-17.04.2.tar.xz";
- sha256 = "0py92mbjqni0zpds8lf5wmirjwf8cw84ybirba73x6w40ysl3ny8";
- name = "kmines-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kmines-17.08.1.tar.xz";
+ sha256 = "1al98mzy8jrp17vq4j7np1bl5j9sd79drh78zd0343mrcqa7js28";
+ name = "kmines-17.08.1.tar.xz";
};
};
kmix = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kmix-17.04.2.tar.xz";
- sha256 = "1dgxz6c2mm5wnmap6pj3pbiajgpm5xx1q2kklhqxc2gkqxrz25a2";
- name = "kmix-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kmix-17.08.1.tar.xz";
+ sha256 = "1w783p49zgsj52cy3mv4zgvh8f55mdij2drzgk3qr510wsyf0cg5";
+ name = "kmix-17.08.1.tar.xz";
};
};
kmousetool = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kmousetool-17.04.2.tar.xz";
- sha256 = "065s73yksb39yawdz2ai221jncphanmxpxirdfnhljbg8d551k30";
- name = "kmousetool-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kmousetool-17.08.1.tar.xz";
+ sha256 = "09rjvnp7f16d6cg3d5p1ah184j7710mziiiz5r0zxq7vdnkvxzlh";
+ name = "kmousetool-17.08.1.tar.xz";
};
};
kmouth = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kmouth-17.04.2.tar.xz";
- sha256 = "1iqa059169w4r94r99w338z5mbkxhcfz6xjycrw2nkvnp5spc4mw";
- name = "kmouth-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kmouth-17.08.1.tar.xz";
+ sha256 = "07s3fqybprw7gprksc271pspnh81yawm5prrz0lif2awvc7wp7pm";
+ name = "kmouth-17.08.1.tar.xz";
};
};
kmplot = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kmplot-17.04.2.tar.xz";
- sha256 = "0rdg9ywmxd0bicb030kpyhcrgbhpvaac339gxwq1q2arrczds38x";
- name = "kmplot-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kmplot-17.08.1.tar.xz";
+ sha256 = "1gxhfkjdsrf8klqhqji6yzv9g4sdjcjhmyvx5j71wmrdc6pdpkpf";
+ name = "kmplot-17.08.1.tar.xz";
};
};
knavalbattle = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/knavalbattle-17.04.2.tar.xz";
- sha256 = "091wvhnj98s1c0as90h6qy0sx47bb95gbczljq2rrnxz6sjw3x52";
- name = "knavalbattle-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/knavalbattle-17.08.1.tar.xz";
+ sha256 = "187n5kn5ri87a98rybsf4g5jcwvyxdnb4601iaaf4jb6rg3yf2pm";
+ name = "knavalbattle-17.08.1.tar.xz";
};
};
knetwalk = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/knetwalk-17.04.2.tar.xz";
- sha256 = "0g0q9m63qc33gfklpqpncvd3qdjpbjb53701ypiby3dlyb1znf3d";
- name = "knetwalk-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/knetwalk-17.08.1.tar.xz";
+ sha256 = "10kjsw94yzz82af3adk9shm67kbg8f8p0xmh60jr97cm1lvz5186";
+ name = "knetwalk-17.08.1.tar.xz";
};
};
knotes = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/knotes-17.04.2.tar.xz";
- sha256 = "1ypl677rhgq8hmy9y5zryfs4zcyzj88ajlwvsxd3lv9ybkc7ymhy";
- name = "knotes-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/knotes-17.08.1.tar.xz";
+ sha256 = "0654fxaiyvhfxjyfaw9hgvv352xkix2ls7wlvyw5b15d9iqa5cl0";
+ name = "knotes-17.08.1.tar.xz";
};
};
kolf = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kolf-17.04.2.tar.xz";
- sha256 = "157gppkzgv3394pcxr3mc9vi0bd8hy9bjmmjcq9g8p5gdpj148ag";
- name = "kolf-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kolf-17.08.1.tar.xz";
+ sha256 = "0cmqpyd157b3n3x18d6wiijyvjaavxp65nagw2r0prjz9dckd1cl";
+ name = "kolf-17.08.1.tar.xz";
};
};
kollision = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kollision-17.04.2.tar.xz";
- sha256 = "065h6lm71h4184jk8lh1gz5bq1kyxnpyf7jg0y50q9g8fm147s5j";
- name = "kollision-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kollision-17.08.1.tar.xz";
+ sha256 = "00chxdib0ym5x94pzgfg3zx2lixf9h5b7sfcbg0chvjlc8imfv2b";
+ name = "kollision-17.08.1.tar.xz";
};
};
kolourpaint = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kolourpaint-17.04.2.tar.xz";
- sha256 = "09kgmkqzcr534vz24w9p27zzd0hwh43cz09pjfdcgcwq5bsnni3s";
- name = "kolourpaint-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kolourpaint-17.08.1.tar.xz";
+ sha256 = "18cf856r66gwdf149zyam53p0sqvm0bf5f0k0n62mkp80z76kbvm";
+ name = "kolourpaint-17.08.1.tar.xz";
};
};
kompare = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kompare-17.04.2.tar.xz";
- sha256 = "0q6mi2l3bvl15qrylngdrngsvzv2dc26550pkjm1db94byx1qfk2";
- name = "kompare-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kompare-17.08.1.tar.xz";
+ sha256 = "1whsbz99cdnivq6m7irvnj0vcq82s34z9mgzd4a50z3i7ms5hmvf";
+ name = "kompare-17.08.1.tar.xz";
};
};
konqueror = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/konqueror-17.04.2.tar.xz";
- sha256 = "0f36frk1wzw75w982clzlfxic7nj8nmslwy2wk855p3arcrg2dcq";
- name = "konqueror-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/konqueror-17.08.1.tar.xz";
+ sha256 = "1plq38ap1gdjq1s02s3km3pg8l2cgx0mkicb5jldz02qxj4z8rgy";
+ name = "konqueror-17.08.1.tar.xz";
};
};
konquest = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/konquest-17.04.2.tar.xz";
- sha256 = "10apw2dj9xxrv4rw200lxb1iiqd2kpikb7njkf1x0h7c6lp7isxc";
- name = "konquest-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/konquest-17.08.1.tar.xz";
+ sha256 = "01ps82zkd95w06im3x7cazwbn2m4xbr80ky16gd71v3sdgg5zpw7";
+ name = "konquest-17.08.1.tar.xz";
};
};
konsole = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/konsole-17.04.2.tar.xz";
- sha256 = "1v37v4shq0k3kv8vqnp9b1ghdirjj3vsjcvalkiagz94w1g61vyl";
- name = "konsole-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/konsole-17.08.1.tar.xz";
+ sha256 = "00rrwk6i0ngg07md84bkfggdmmfknkpxiqbv37pb7xis1rvz9c8p";
+ name = "konsole-17.08.1.tar.xz";
};
};
kontact = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kontact-17.04.2.tar.xz";
- sha256 = "12gd453gdxmwbnqrlnbbqnqxd8chpf57mnjv498nhjv6sfj6mshv";
- name = "kontact-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kontact-17.08.1.tar.xz";
+ sha256 = "1z0mqnb6567xmx7shv7v60yb2cj6wh3ndqdd9nqxp12371mgm6i0";
+ name = "kontact-17.08.1.tar.xz";
};
};
kontactinterface = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kontactinterface-17.04.2.tar.xz";
- sha256 = "1q4fdf4lglq84n0pva7fdqq4fqbwkq9g0qyp5mfq3fhvzbba3as1";
- name = "kontactinterface-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kontactinterface-17.08.1.tar.xz";
+ sha256 = "09mpmdc65lm14s6hg1yq68i1wrawss0hl002bg9apgy2rfdk34k1";
+ name = "kontactinterface-17.08.1.tar.xz";
};
};
kopete = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kopete-17.04.2.tar.xz";
- sha256 = "0bicwm8r4rl4awxkpi4hin95n37yj4ln29gp0z6j97fzc7kpiqlj";
- name = "kopete-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kopete-17.08.1.tar.xz";
+ sha256 = "1inbw80a2mwfc2id12qn0as4l52hz3wfcvzcz3n4p393g0qfz8an";
+ name = "kopete-17.08.1.tar.xz";
};
};
korganizer = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/korganizer-17.04.2.tar.xz";
- sha256 = "0lrxy232v2gn40sd63xspyszkmqn1v6l40zcxpv9r7x62wn4v55r";
- name = "korganizer-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/korganizer-17.08.1.tar.xz";
+ sha256 = "0q35fyqxgwp5jv2qnpcjhfs1rkyp1jjrpmi28kqh93l04njmwvc0";
+ name = "korganizer-17.08.1.tar.xz";
};
};
kpat = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kpat-17.04.2.tar.xz";
- sha256 = "1r8i5aisllg9ykgy75gfnma2y8v6y67fa91z6r0q16bg66l2ij44";
- name = "kpat-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kpat-17.08.1.tar.xz";
+ sha256 = "1bqqm5gb6mc1v8h524qnz2rfcplvz6v87gvc0jg3zcqjf2c4xn4y";
+ name = "kpat-17.08.1.tar.xz";
};
};
kpimtextedit = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kpimtextedit-17.04.2.tar.xz";
- sha256 = "0d739nadn8n2393hq9rm2v8qx8l9jk7n1wgpbdbsddfq2lxz8g39";
- name = "kpimtextedit-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kpimtextedit-17.08.1.tar.xz";
+ sha256 = "16ymcccfn8pw098gr6b2k1xvwinhnx8c3npawy9fiqg138a4bkh9";
+ name = "kpimtextedit-17.08.1.tar.xz";
};
};
kppp = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kppp-17.04.2.tar.xz";
- sha256 = "1nm6kzjdwrl7206gwd47irhkj94vifxqhikc4g8jkvfh60rh87j8";
- name = "kppp-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kppp-17.08.1.tar.xz";
+ sha256 = "0783rn2gzgxscnfbins0drl8j8ka0lxyg3787v9778d5993fafpf";
+ name = "kppp-17.08.1.tar.xz";
};
};
kqtquickcharts = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kqtquickcharts-17.04.2.tar.xz";
- sha256 = "0zjb7p3yxlpz8cyczsr9xwh44l7k1ddg1zwxqah91igdk7mc620x";
- name = "kqtquickcharts-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kqtquickcharts-17.08.1.tar.xz";
+ sha256 = "1zym0lcim41krv1irdfvkfb4simymairqq2cp2kiagrp3ssz28km";
+ name = "kqtquickcharts-17.08.1.tar.xz";
};
};
krdc = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/krdc-17.04.2.tar.xz";
- sha256 = "0y8s28rwxjbpgq6kfhmrq9qr4h19iplfrgab7rb25zl881g9wycg";
- name = "krdc-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/krdc-17.08.1.tar.xz";
+ sha256 = "1lfh7w05b19bzdfmxydb0s55zgbizsh8j8vjblgsn2vihgm2f8lp";
+ name = "krdc-17.08.1.tar.xz";
};
};
kremotecontrol = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kremotecontrol-17.04.2.tar.xz";
- sha256 = "1lw45vnarqw975zz38z9nnmqvk91j2viijl0sf4h2ikx0myqiif7";
- name = "kremotecontrol-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kremotecontrol-17.08.1.tar.xz";
+ sha256 = "1b146xb9dnq97lswb0qnppcgjbw5vwy1y9za2k0kl3bhfvxd4qj2";
+ name = "kremotecontrol-17.08.1.tar.xz";
};
};
kreversi = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kreversi-17.04.2.tar.xz";
- sha256 = "1xhw4i4s7g7k3v4siprg2d1h9g4smqjwhz4qjzz236wmgky7na1b";
- name = "kreversi-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kreversi-17.08.1.tar.xz";
+ sha256 = "17y2iihszjshln2hwxp6nqz30iln79mwmfv8yb2bydchdy05g807";
+ name = "kreversi-17.08.1.tar.xz";
};
};
krfb = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/krfb-17.04.2.tar.xz";
- sha256 = "17lcv2kplawmvakashvrpk50g5ycw5fai4fiz0ijsj05ivqmrb6z";
- name = "krfb-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/krfb-17.08.1.tar.xz";
+ sha256 = "1dwyx0jdg0i64pxd7phm1kq7fyaj7jls8w08sfgq3730s4s59lfj";
+ name = "krfb-17.08.1.tar.xz";
};
};
kross-interpreters = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kross-interpreters-17.04.2.tar.xz";
- sha256 = "0m2adnwhdclhhql0v3g2ay31g7ly67m3782ryq0vp9r8rcd5ga1b";
- name = "kross-interpreters-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kross-interpreters-17.08.1.tar.xz";
+ sha256 = "0hzsn1kjcpy2vbqx9sxhxbz4p67wcmv6agg932iavv2hi7731j14";
+ name = "kross-interpreters-17.08.1.tar.xz";
};
};
kruler = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kruler-17.04.2.tar.xz";
- sha256 = "175c67m1wi9sl6is9f5pbsb3p6siyi9w7219p4ff6wbbjqjxpj2f";
- name = "kruler-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kruler-17.08.1.tar.xz";
+ sha256 = "1qmlhc35vhbzfllz6wrssr62d3s3xdq15s5rkpm3w05a70bilpyq";
+ name = "kruler-17.08.1.tar.xz";
};
};
ksaneplugin = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/ksaneplugin-17.04.2.tar.xz";
- sha256 = "16j4mpl9ick5d43rxnwmvfsb2wr5zgpmr3mlnmn99cvpr27v9mkg";
- name = "ksaneplugin-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/ksaneplugin-17.08.1.tar.xz";
+ sha256 = "08zl04ly9wggcr8y0azz69nvjkr4c8gnajx4w8cwlb1dkn1b5is4";
+ name = "ksaneplugin-17.08.1.tar.xz";
};
};
kscd = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kscd-17.04.2.tar.xz";
- sha256 = "0cgxbhmmw8n7fwin3glzgfx0m1sdx2k4yhkrjislni3raiq4rv9x";
- name = "kscd-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kscd-17.08.1.tar.xz";
+ sha256 = "08mlbhbck68abj17mkaz76fpy4rcn0x4h4smwgxnhy88ddb15wa1";
+ name = "kscd-17.08.1.tar.xz";
};
};
kshisen = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kshisen-17.04.2.tar.xz";
- sha256 = "0644aadh6svdhxb64hzhnvm11w071gax6bj30r0ad3zbqljzhnfv";
- name = "kshisen-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kshisen-17.08.1.tar.xz";
+ sha256 = "0rg465092qkzbshr0pj6z6d38nykdfz2alhzy50qi9i32r8iwy9m";
+ name = "kshisen-17.08.1.tar.xz";
};
};
ksirk = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/ksirk-17.04.2.tar.xz";
- sha256 = "0zh304xwknka6336avzpc5dvv2v6sl474d5q9vqzj8h0ybhdr5pb";
- name = "ksirk-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/ksirk-17.08.1.tar.xz";
+ sha256 = "1v4xqjak0nf4vqsf7p7i37x5c08vbxq18nb63bhwjlb2fgnbg0yh";
+ name = "ksirk-17.08.1.tar.xz";
};
};
ksnakeduel = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/ksnakeduel-17.04.2.tar.xz";
- sha256 = "137am9qi5wfg90b7zf4hk0nsa8pm9f8cj7iraij492d6naif8an5";
- name = "ksnakeduel-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/ksnakeduel-17.08.1.tar.xz";
+ sha256 = "105rjym6vkzi9m0dmzwwb6491lfmb5y1dfqax9y2gi993x0l5ihl";
+ name = "ksnakeduel-17.08.1.tar.xz";
};
};
kspaceduel = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kspaceduel-17.04.2.tar.xz";
- sha256 = "0jkr7xbgrgnwa94fdr1w03xxy75nksr31wb1sr2b3kpwp5ax1380";
- name = "kspaceduel-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kspaceduel-17.08.1.tar.xz";
+ sha256 = "11g362hax9x8b99wvcndd4hz6q918dxcn8js16cflfxn1ry80wb6";
+ name = "kspaceduel-17.08.1.tar.xz";
};
};
ksquares = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/ksquares-17.04.2.tar.xz";
- sha256 = "07fn872d126wv0gcfd58jd72ypajlpkfcd4njzj0v05x6i0njir0";
- name = "ksquares-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/ksquares-17.08.1.tar.xz";
+ sha256 = "1lw9qlfqfsmyry5v6fvhyjh23l8dj71iyp1z3y0xikaybc4rbbi1";
+ name = "ksquares-17.08.1.tar.xz";
};
};
kstars = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kstars-17.04.2.tar.xz";
- sha256 = "1r47l3zifb0carmgn0rv6wddqn483q9jadrwbahqp7b1yy14rkcj";
- name = "kstars-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kstars-17.08.1.tar.xz";
+ sha256 = "1qr8y4m6lqiv3zb7f2ys7c6iw7iryk9ayibdscq113nq0blm59zs";
+ name = "kstars-17.08.1.tar.xz";
};
};
ksudoku = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/ksudoku-17.04.2.tar.xz";
- sha256 = "11cvix24p1lpiss472yflcrwvygn0cxw4b5p9qhra643sx6bw5h5";
- name = "ksudoku-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/ksudoku-17.08.1.tar.xz";
+ sha256 = "0fb9k5hdyq2alp42x17r1cfi5qz5hm9xzcwd3vz3c1kym4xavnjp";
+ name = "ksudoku-17.08.1.tar.xz";
};
};
ksystemlog = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/ksystemlog-17.04.2.tar.xz";
- sha256 = "1sw5f89khflmcbwwd1z399bwlnnl2lqp2qrj7wfdxb7s91j4jk2m";
- name = "ksystemlog-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/ksystemlog-17.08.1.tar.xz";
+ sha256 = "0wiwak8dmdm9kih2zvw2xxg67qs94imp6s24dgfxgylqqpqirlnv";
+ name = "ksystemlog-17.08.1.tar.xz";
};
};
kteatime = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kteatime-17.04.2.tar.xz";
- sha256 = "10yqww3hybjirncjsxpya08c49ca0ac6zn6anjc1mb9nvji203xb";
- name = "kteatime-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kteatime-17.08.1.tar.xz";
+ sha256 = "08ripkkc6b3wi499kgsng4fzk2n7kbp3i6212q47h6bmgxs8a4zp";
+ name = "kteatime-17.08.1.tar.xz";
};
};
ktimer = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/ktimer-17.04.2.tar.xz";
- sha256 = "19b27l308xb70wbx06fxykdwzcan3cjf7naj51fgma4qcm6xjdir";
- name = "ktimer-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/ktimer-17.08.1.tar.xz";
+ sha256 = "116c61k99h5y0yph2x7cz0ff99rsfblgj3db7sczhn3hkbcimakx";
+ name = "ktimer-17.08.1.tar.xz";
};
};
ktnef = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/ktnef-17.04.2.tar.xz";
- sha256 = "0vpq81gyjr14xf94h654v8cmfvndhc9wn8zznp9a7jbpzp4wdfnj";
- name = "ktnef-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/ktnef-17.08.1.tar.xz";
+ sha256 = "07jflp67mf748vf0ph89dbzy2lifm8148kl957qw1z9i1h5sm869";
+ name = "ktnef-17.08.1.tar.xz";
};
};
ktouch = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/ktouch-17.04.2.tar.xz";
- sha256 = "17chk2vzvb8manyfcsnr73pfnvy128fi8g20r1gnidhgw6ix0s1r";
- name = "ktouch-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/ktouch-17.08.1.tar.xz";
+ sha256 = "19m8bp655ir9n2pz6vly9q2x42gdnpfjs47nkfiix28mg4y004qj";
+ name = "ktouch-17.08.1.tar.xz";
};
};
ktp-accounts-kcm = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/ktp-accounts-kcm-17.04.2.tar.xz";
- sha256 = "0kbnhkhw787bbgkpnchxkmwnzr2s4nqwmknzf34h613mlv7wspvg";
- name = "ktp-accounts-kcm-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/ktp-accounts-kcm-17.08.1.tar.xz";
+ sha256 = "1kghza63ywjndcscwlkabfqnsnalf1kprghb47gjj15qn844g019";
+ name = "ktp-accounts-kcm-17.08.1.tar.xz";
};
};
ktp-approver = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/ktp-approver-17.04.2.tar.xz";
- sha256 = "0986j2yy57jzg5z4czmrjw625ihw1393mv8h8kqipw727vvchka9";
- name = "ktp-approver-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/ktp-approver-17.08.1.tar.xz";
+ sha256 = "07vkhhldqkabfga79sl9hdbfdk4fdizj066180dirwbdkllfwnpf";
+ name = "ktp-approver-17.08.1.tar.xz";
};
};
ktp-auth-handler = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/ktp-auth-handler-17.04.2.tar.xz";
- sha256 = "0hlch8d2fj6xnnd39v5q9vri8svn1852am1kbvvyws770kgldj49";
- name = "ktp-auth-handler-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/ktp-auth-handler-17.08.1.tar.xz";
+ sha256 = "1612gi5izaanp9rzwz163q776lszrs03a9rrx13qczdl231smyf6";
+ name = "ktp-auth-handler-17.08.1.tar.xz";
};
};
ktp-call-ui = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/ktp-call-ui-17.04.2.tar.xz";
- sha256 = "070ms5wyifqnc64x3r835vvbvn0l253qkn1li7bkqmsjg50q5sm7";
- name = "ktp-call-ui-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/ktp-call-ui-17.08.1.tar.xz";
+ sha256 = "0881lgmp04g157q3pp1im113imrw9aihxd08hhm6h5cla5z97m46";
+ name = "ktp-call-ui-17.08.1.tar.xz";
};
};
ktp-common-internals = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/ktp-common-internals-17.04.2.tar.xz";
- sha256 = "01xrdn1609ag2kha3wp756fh4kszvcp8biky3cgp52qasmp6k4k2";
- name = "ktp-common-internals-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/ktp-common-internals-17.08.1.tar.xz";
+ sha256 = "1nlcmlkbaj7j6y1i6gnmd7s6ks4qnmcdhwidxql4vgr6bjifr5n2";
+ name = "ktp-common-internals-17.08.1.tar.xz";
};
};
ktp-contact-list = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/ktp-contact-list-17.04.2.tar.xz";
- sha256 = "03iwx1xsd1scgw20s7n8cj7ai6cnlna19dd93s2a7r3z4jhwxkx0";
- name = "ktp-contact-list-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/ktp-contact-list-17.08.1.tar.xz";
+ sha256 = "1xv0qaf05lvzwmgdfr31vynk768sc9gqrl0w1b270ks9jgsb3k9i";
+ name = "ktp-contact-list-17.08.1.tar.xz";
};
};
ktp-contact-runner = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/ktp-contact-runner-17.04.2.tar.xz";
- sha256 = "1fal6g5zrh0s4wcxsqgps3a20xfdjc3pyw4dhdpgnsr6ig1z7rwn";
- name = "ktp-contact-runner-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/ktp-contact-runner-17.08.1.tar.xz";
+ sha256 = "150m1lr7n39n88b0kaz8494ch0ym7i68f8c3hgzaxpy0m62mskkv";
+ name = "ktp-contact-runner-17.08.1.tar.xz";
};
};
ktp-desktop-applets = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/ktp-desktop-applets-17.04.2.tar.xz";
- sha256 = "0306lar375vh2wr9g2iicjawd5rm5zh7vp81jl0hgmzx7kxcjxgz";
- name = "ktp-desktop-applets-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/ktp-desktop-applets-17.08.1.tar.xz";
+ sha256 = "167h8z1xd6q50xbgirfc6sxlnclliidpb5lg7s1baqdvlpg8rarz";
+ name = "ktp-desktop-applets-17.08.1.tar.xz";
};
};
ktp-filetransfer-handler = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/ktp-filetransfer-handler-17.04.2.tar.xz";
- sha256 = "044sr00rlcvxfw59f5m4i33jg4f8i77a8yjf3sdwjrnh03nsbjxz";
- name = "ktp-filetransfer-handler-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/ktp-filetransfer-handler-17.08.1.tar.xz";
+ sha256 = "0hvy0vdznv9js9fjmhgbcmh3gq6jlnynz4mfdbj8bjff635q76az";
+ name = "ktp-filetransfer-handler-17.08.1.tar.xz";
};
};
ktp-kded-module = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/ktp-kded-module-17.04.2.tar.xz";
- sha256 = "19f5kdd3g54791a7ilsaas5ibj3f8gb889n82gh88lq7q9zrs5f3";
- name = "ktp-kded-module-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/ktp-kded-module-17.08.1.tar.xz";
+ sha256 = "0rsb6qgf6kdizpp6iw48gxr1aka1yljcwc0wx03p6s31a9aql47w";
+ name = "ktp-kded-module-17.08.1.tar.xz";
};
};
ktp-send-file = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/ktp-send-file-17.04.2.tar.xz";
- sha256 = "1ydwnmyqwbf5qjhy9w2z2788p7maa591nlc946ar32wg2sc6ik57";
- name = "ktp-send-file-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/ktp-send-file-17.08.1.tar.xz";
+ sha256 = "1ncxr7cwfbqr8pwgkl3mg4zv6klss99pansmwkyh49bbjzjc9j3v";
+ name = "ktp-send-file-17.08.1.tar.xz";
};
};
ktp-text-ui = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/ktp-text-ui-17.04.2.tar.xz";
- sha256 = "1s5dhhc1ihnlz08a2vwalzmk6zm2kb157smn07a9ilq0l64psdqa";
- name = "ktp-text-ui-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/ktp-text-ui-17.08.1.tar.xz";
+ sha256 = "13isirx7in0vj4p3l2m9pnjz73bf48y586qbpn0rbzpwbc7xzbmz";
+ name = "ktp-text-ui-17.08.1.tar.xz";
};
};
ktuberling = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/ktuberling-17.04.2.tar.xz";
- sha256 = "18krcrj9xlajj3q6vspw79snwnliqc00djpq8ra6yg2l56xqbwym";
- name = "ktuberling-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/ktuberling-17.08.1.tar.xz";
+ sha256 = "04fsplvry85m596qkx2i7601l7pc9dag4x45sw4z325fkzvlzsx9";
+ name = "ktuberling-17.08.1.tar.xz";
};
};
kturtle = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kturtle-17.04.2.tar.xz";
- sha256 = "140j7xws7kfw0cf4axf0jgfk9ywvrds79906iwzf1nig8rbxrfy1";
- name = "kturtle-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kturtle-17.08.1.tar.xz";
+ sha256 = "0nrsmhdmc1qdnpwsgrhs2gd91al8b0wrm85nwia2mmyxsfnbd45l";
+ name = "kturtle-17.08.1.tar.xz";
};
};
kubrick = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kubrick-17.04.2.tar.xz";
- sha256 = "0pli70hkmb973j935fnjsaaml4gnck4jmzh3kph78wrhlxwqanqh";
- name = "kubrick-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kubrick-17.08.1.tar.xz";
+ sha256 = "07lxc4i92i08hca2y6gqq3wsyp4mn857vwmy6ja40c2wh8sl6bix";
+ name = "kubrick-17.08.1.tar.xz";
};
};
kwalletmanager = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kwalletmanager-17.04.2.tar.xz";
- sha256 = "1y1h7j6jg0nm5kfw03k5b9m39v5vfyflcfrfcqz4q19c3zx7msrw";
- name = "kwalletmanager-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kwalletmanager-17.08.1.tar.xz";
+ sha256 = "0dq8m160kwbrjmda4hvdgq5izdnr7nnlksb9l3cvbslpc685d8h0";
+ name = "kwalletmanager-17.08.1.tar.xz";
};
};
kwave = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kwave-17.04.2.tar.xz";
- sha256 = "0zk3xq76asz1lq1bvn5xyrly9qwz1bvipwsj03psckzzm0j2wx2j";
- name = "kwave-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kwave-17.08.1.tar.xz";
+ sha256 = "097viq7k2l4hkj0w07hnyfzfmz3apnri2n1g69ir1h37wq59fw89";
+ name = "kwave-17.08.1.tar.xz";
};
};
kwordquiz = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/kwordquiz-17.04.2.tar.xz";
- sha256 = "00x9l00d3aq8jcg4522faj9mp94k0526i41ls3wvmfd7q1i18viz";
- name = "kwordquiz-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/kwordquiz-17.08.1.tar.xz";
+ sha256 = "14l419ghf6xvdp2fnsdskflppzzvvhlbciwn6cicrkzmdr9zkawz";
+ name = "kwordquiz-17.08.1.tar.xz";
};
};
libgravatar = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/libgravatar-17.04.2.tar.xz";
- sha256 = "1w36qj6n40k2yxva1qw9naag6zz05gcnia3sqmfamzxdji4l3nis";
- name = "libgravatar-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/libgravatar-17.08.1.tar.xz";
+ sha256 = "0fn860y88pvq6mdpw1jw8msvkdmknradfp037gj9kvd5ykiicbvh";
+ name = "libgravatar-17.08.1.tar.xz";
};
};
libkcddb = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/libkcddb-17.04.2.tar.xz";
- sha256 = "0cvy01krgvayc3hmsv55rrqjp72d27fz58clzw51p6zf2kvjn4q3";
- name = "libkcddb-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/libkcddb-17.08.1.tar.xz";
+ sha256 = "06i8gm7rysbdlm89nw5pd3jgbvz9vy5schwyfyhk6jbvlm43sx7z";
+ name = "libkcddb-17.08.1.tar.xz";
};
};
libkcompactdisc = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/libkcompactdisc-17.04.2.tar.xz";
- sha256 = "1ywpghj4dy8ly15g55q8mhmx85xlxz3zasblhzsyxqh6rgwhnab6";
- name = "libkcompactdisc-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/libkcompactdisc-17.08.1.tar.xz";
+ sha256 = "1xrpbpg4w275afd4fbnsmjvp737v6z5nsdz5lrfxbqg8x97xb2fm";
+ name = "libkcompactdisc-17.08.1.tar.xz";
};
};
libkdcraw = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/libkdcraw-17.04.2.tar.xz";
- sha256 = "17dd68wlc7528prywps7slv6f9jfzbfhfmdlv20q0lzrjlxb2jxk";
- name = "libkdcraw-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/libkdcraw-17.08.1.tar.xz";
+ sha256 = "0r9prk1pnbm2hj5q93j7axb869lzr8v7msqhylpf3awghfmy32a0";
+ name = "libkdcraw-17.08.1.tar.xz";
};
};
libkdegames = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/libkdegames-17.04.2.tar.xz";
- sha256 = "07vs2077w7g6hvzaa9m7p6w3qc9daly174x7sq5an3wxb78zaj4k";
- name = "libkdegames-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/libkdegames-17.08.1.tar.xz";
+ sha256 = "12w8i91pqshgb2bx4h68yni3sj7ssbcxrcdybnicg18hpcf5fzpa";
+ name = "libkdegames-17.08.1.tar.xz";
};
};
libkdepim = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/libkdepim-17.04.2.tar.xz";
- sha256 = "1s6vvbxjrhvgc147ila9ryy5z1c76dqc9nrxdblkdk36kgj193xs";
- name = "libkdepim-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/libkdepim-17.08.1.tar.xz";
+ sha256 = "17pg8fwpcdkj04fwzyqgykh9a23xkmkz46mknk43b37n0bcjhxq0";
+ name = "libkdepim-17.08.1.tar.xz";
};
};
libkeduvocdocument = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/libkeduvocdocument-17.04.2.tar.xz";
- sha256 = "1lakkz3ffp3qkhp15l8g04f1izgigv96ravj13yqvlafcj0l4wwh";
- name = "libkeduvocdocument-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/libkeduvocdocument-17.08.1.tar.xz";
+ sha256 = "0kv7yirw7q953qv23f0z3m1nmdpax6f6vsrbncpdz2057p51fwf4";
+ name = "libkeduvocdocument-17.08.1.tar.xz";
};
};
libkexiv2 = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/libkexiv2-17.04.2.tar.xz";
- sha256 = "113gfmdvk85mlgq97hi5n4sn0ar55qy4lvrngzp70hr5gyk6jx87";
- name = "libkexiv2-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/libkexiv2-17.08.1.tar.xz";
+ sha256 = "06qwd9lnl95vyzmj7nwgxflx82rvs5wkkwx4vnp408gya8w7cpjc";
+ name = "libkexiv2-17.08.1.tar.xz";
};
};
libkface = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/libkface-17.04.2.tar.xz";
- sha256 = "04cp6fqji8s6zsv09nbdkv9ikff5df5gb2nqbfdhh5hdyl5k9a6y";
- name = "libkface-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/libkface-17.08.1.tar.xz";
+ sha256 = "1w81dsmz9r2vx4aw5rkkg5s08jn4gqckgr1jscdxah6af354y052";
+ name = "libkface-17.08.1.tar.xz";
};
};
libkgapi = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/libkgapi-17.04.2.tar.xz";
- sha256 = "1awcfwf1haa38vnr5273y5xk9b64s7m139aqgyr7r72czm96ql8s";
- name = "libkgapi-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/libkgapi-17.08.1.tar.xz";
+ sha256 = "04nww7rip0qpz9cky28ygd9chfmpp1kycpri4s84cqdicwg691bv";
+ name = "libkgapi-17.08.1.tar.xz";
};
};
libkgeomap = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/libkgeomap-17.04.2.tar.xz";
- sha256 = "0gbri3vfan9n3za0qd5bzbwvmkslbsylg5rw11zlcl9r8c5yz23p";
- name = "libkgeomap-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/libkgeomap-17.08.1.tar.xz";
+ sha256 = "0llh9ixa1wyafcvah48rfrbk4n897i97a6jrk3vnf0yrqhl8nps2";
+ name = "libkgeomap-17.08.1.tar.xz";
};
};
libkipi = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/libkipi-17.04.2.tar.xz";
- sha256 = "0spy876l7mzpb1kgbwxpi8nfyysd1xijg2ilbvbiisxf92krvxny";
- name = "libkipi-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/libkipi-17.08.1.tar.xz";
+ sha256 = "089avdka9rvv5j137k42d6sz6kvqci771wb8433xksnnci8r52xb";
+ name = "libkipi-17.08.1.tar.xz";
};
};
libkleo = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/libkleo-17.04.2.tar.xz";
- sha256 = "05pz45g11sxjcmijdklb4kp2n7ydi33vbdfl43fjl0s7rv7vmzr4";
- name = "libkleo-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/libkleo-17.08.1.tar.xz";
+ sha256 = "0d2rby5yfwpb1gy2j87kzffzn6hls3358886qhiq6pwpx2nq7chj";
+ name = "libkleo-17.08.1.tar.xz";
};
};
libkmahjongg = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/libkmahjongg-17.04.2.tar.xz";
- sha256 = "1dd58zz8zlcrwwn1zkhp2lw8h83fwiajaxf2yibwbk0bza1ydp3r";
- name = "libkmahjongg-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/libkmahjongg-17.08.1.tar.xz";
+ sha256 = "11ciqd54isvjfccw3xc1xrdvjjmvacgvsdsxy3arcbivikmbmdqi";
+ name = "libkmahjongg-17.08.1.tar.xz";
};
};
libkomparediff2 = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/libkomparediff2-17.04.2.tar.xz";
- sha256 = "156s5lyna9wgj1cfqm36snyax9hybsr9xa72n246a94z81r6afsz";
- name = "libkomparediff2-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/libkomparediff2-17.08.1.tar.xz";
+ sha256 = "0vp33mkm52yn2gqy469m4wfmsrbzppl6hw1d842nm1q1csnva0v5";
+ name = "libkomparediff2-17.08.1.tar.xz";
};
};
libksane = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/libksane-17.04.2.tar.xz";
- sha256 = "12h6l6wa8g2qfddl9ylm9q4f8f2w7bgmii1v6yrmfb4nyr4bflda";
- name = "libksane-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/libksane-17.08.1.tar.xz";
+ sha256 = "0k2sjz86yw7lfij0kgn1byps2vd8c9hlrd4lizppflzxi2ajmkd0";
+ name = "libksane-17.08.1.tar.xz";
};
};
libksieve = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/libksieve-17.04.2.tar.xz";
- sha256 = "0kz8nzd3cgipc3s3zif57d681ddb6xmb7kid25j3aypcz0i7gck1";
- name = "libksieve-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/libksieve-17.08.1.tar.xz";
+ sha256 = "01d573a415i2advgad0xzxkg8f6z5fbfmyb0iim79qqhzkbmf6bm";
+ name = "libksieve-17.08.1.tar.xz";
};
};
lokalize = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/lokalize-17.04.2.tar.xz";
- sha256 = "0a85gjj40r5iw6mf190s4r4c4xsh1nfixj15g86acz02dn43zapn";
- name = "lokalize-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/lokalize-17.08.1.tar.xz";
+ sha256 = "0gr1qj0ish0kp842654fli2irbrli77q1449xryik76frlyy16wj";
+ name = "lokalize-17.08.1.tar.xz";
};
};
lskat = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/lskat-17.04.2.tar.xz";
- sha256 = "0blnnyb7q6vxblvi6f1xigln70m1vjfpwav05qhm7msblhh5qp2j";
- name = "lskat-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/lskat-17.08.1.tar.xz";
+ sha256 = "1fhkg2vjy7xpp1rnx4cp9bpvxqc4i3nymyqgph92ankal0nnw2ai";
+ name = "lskat-17.08.1.tar.xz";
};
};
mailcommon = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/mailcommon-17.04.2.tar.xz";
- sha256 = "1f826r9m0xb418sqgx9lb23zf5am6cmgvcrx2d54c2va2vq97xgk";
- name = "mailcommon-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/mailcommon-17.08.1.tar.xz";
+ sha256 = "0qw7hsy36r39l13x492mhfxj3x9inagd7fjsxvfblhgnh1c2ad0r";
+ name = "mailcommon-17.08.1.tar.xz";
};
};
mailimporter = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/mailimporter-17.04.2.tar.xz";
- sha256 = "06q8k3x2nvhbgk1kh542rmqnc5c0hj4yzwl1c1clvjwlw7vpxdwh";
- name = "mailimporter-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/mailimporter-17.08.1.tar.xz";
+ sha256 = "0wwciyc8azx2sln5407gv4kqcx7zfl680szxgbw533iq9kccvl0z";
+ name = "mailimporter-17.08.1.tar.xz";
};
};
marble = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/marble-17.04.2.tar.xz";
- sha256 = "1c6xmpkqilxd9zxz8kz7g47hwsa4hw27qcy96wxcg24hg8b5zr09";
- name = "marble-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/marble-17.08.1.tar.xz";
+ sha256 = "1jlz37m3a0jhnac4y6ix6n3hhxkp808qdnvxpd3my1gvn715wa58";
+ name = "marble-17.08.1.tar.xz";
};
};
mbox-importer = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/mbox-importer-17.04.2.tar.xz";
- sha256 = "1mq3wbj9fcrcny4m9vs4gk0cw7xyxv1sbpby0wl6a63hb6r4nvca";
- name = "mbox-importer-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/mbox-importer-17.08.1.tar.xz";
+ sha256 = "0kjxx0nvxb6dshibaipgdf4i8magmsxnqhfnph831x13mig15bcs";
+ name = "mbox-importer-17.08.1.tar.xz";
};
};
messagelib = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/messagelib-17.04.2.tar.xz";
- sha256 = "1fxajqxigfknl7ll755blz1ypy99idgr3gmi3p37ca3ld10f7ffv";
- name = "messagelib-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/messagelib-17.08.1.tar.xz";
+ sha256 = "0srjcqbqzyk8ca9ssisrils9jwm9p6b62q4b7g9bya602cbrh38b";
+ name = "messagelib-17.08.1.tar.xz";
};
};
minuet = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/minuet-17.04.2.tar.xz";
- sha256 = "0p2ii0wfqswliqf4fk04mx9z6nfhifa11l2w7bid4aj78b29138g";
- name = "minuet-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/minuet-17.08.1.tar.xz";
+ sha256 = "17vvsnvhvpqcyrb5qlchp4na1wk5f4qlkh7w8sj162jsd1lbxr9j";
+ name = "minuet-17.08.1.tar.xz";
};
};
okteta = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/okteta-17.04.2.tar.xz";
- sha256 = "0w1xi3kd083dss69gnq4ghmhfr3w2cz42jbfjsaidzf4qcqlfr40";
- name = "okteta-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/okteta-17.08.1.tar.xz";
+ sha256 = "00wmkzjw7h99b1lmab0llwzlmh1m4xgv3yy506hjwb78z1c6wbq2";
+ name = "okteta-17.08.1.tar.xz";
};
};
okular = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/okular-17.04.2.tar.xz";
- sha256 = "0rqc6h3zb48smrmp835zk4agvlwnmjwmzwv3rh3lgwfw9i3jq2zf";
- name = "okular-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/okular-17.08.1.tar.xz";
+ sha256 = "027isffca4g98qm6yx7m69cp2xjplqhnh7gy00sr1b96hhnlc9c6";
+ name = "okular-17.08.1.tar.xz";
};
};
palapeli = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/palapeli-17.04.2.tar.xz";
- sha256 = "0lcdkpvqmlsj73z88pi8v2hxd57bbbxlvf5yqj3zw33xb4nxw9bd";
- name = "palapeli-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/palapeli-17.08.1.tar.xz";
+ sha256 = "0nnplg88xipmnb24qj2ki5m090g8cbinbb3azkqadwsjfc13xk06";
+ name = "palapeli-17.08.1.tar.xz";
};
};
parley = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/parley-17.04.2.tar.xz";
- sha256 = "02pcyl8lnpxi936k6i7hah7vzlwzsag7lpsc0ly6q6q9rm4iwkqj";
- name = "parley-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/parley-17.08.1.tar.xz";
+ sha256 = "034nc5qgiy50wpnkm3d8w3cf7svj6as23sarz0h5hks4ffw1bxhg";
+ name = "parley-17.08.1.tar.xz";
};
};
picmi = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/picmi-17.04.2.tar.xz";
- sha256 = "0dqqaqfrqxwcp9daxfs8qmbf4kj6gn68v6l7dhj5r9mjvva0r4p5";
- name = "picmi-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/picmi-17.08.1.tar.xz";
+ sha256 = "14kbrbq59kmqz1rd7izrp57i1a6d6nm8i73rwcl80vyla8cnvika";
+ name = "picmi-17.08.1.tar.xz";
};
};
pimcommon = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/pimcommon-17.04.2.tar.xz";
- sha256 = "1yvhf7hd2gm734i7k4smg57xq15wspbiq909crxs0ga82qx09hcg";
- name = "pimcommon-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/pimcommon-17.08.1.tar.xz";
+ sha256 = "14vk8pnwbc4bvha26fxdfbyn0ipxj93qgan8f24kpxc7irjkr8ic";
+ name = "pimcommon-17.08.1.tar.xz";
};
};
pim-data-exporter = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/pim-data-exporter-17.04.2.tar.xz";
- sha256 = "1q5qb4jbfdwp7h8d0drx0fyzmb7ffpcfrmirw22z8xk50r2r4v0i";
- name = "pim-data-exporter-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/pim-data-exporter-17.08.1.tar.xz";
+ sha256 = "0drzj44p66ds4p42wk45755yjcs2dpysw54mzg2qx4cdv8kf1snq";
+ name = "pim-data-exporter-17.08.1.tar.xz";
};
};
pim-sieve-editor = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/pim-sieve-editor-17.04.2.tar.xz";
- sha256 = "17aymflaqwci21h70s3lb8cfmh1qkynaswfkjqipravk58a302ni";
- name = "pim-sieve-editor-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/pim-sieve-editor-17.08.1.tar.xz";
+ sha256 = "1hclbjs596x5niszcccnzkr6x5avg2c982prq8qcrc68cdm1h7pg";
+ name = "pim-sieve-editor-17.08.1.tar.xz";
};
};
poxml = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/poxml-17.04.2.tar.xz";
- sha256 = "1cv7k4xilpx75z07l6mpzwinxn1cdw6h1qglqhs5i35ii4cbbw40";
- name = "poxml-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/poxml-17.08.1.tar.xz";
+ sha256 = "17g62xp5g4icfmbd001rhypn34a9asj8pcgj301q5v9065z44mmn";
+ name = "poxml-17.08.1.tar.xz";
};
};
print-manager = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/print-manager-17.04.2.tar.xz";
- sha256 = "19hs25cgf54c6igm0sp5by4fayaz1w793drwz1szcl5b631sdywj";
- name = "print-manager-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/print-manager-17.08.1.tar.xz";
+ sha256 = "0f354qblzw3vkv4fypwp3fj3i29x6b478z79q5d2n6x9nk8li5in";
+ name = "print-manager-17.08.1.tar.xz";
};
};
rocs = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/rocs-17.04.2.tar.xz";
- sha256 = "0ahrbxs675zvwb81fmlp55hz72xx8zlzwjgq01p03ih8jsq71s4j";
- name = "rocs-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/rocs-17.08.1.tar.xz";
+ sha256 = "18nygfbyiny8zpq2jm6mxs6r4b90c4dwxwzvs0a3vrc131fjc6bc";
+ name = "rocs-17.08.1.tar.xz";
};
};
signon-kwallet-extension = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/signon-kwallet-extension-17.04.2.tar.xz";
- sha256 = "1qcv8b5bmjd2dklbd4msp3cmh61qp6z6ml2ps6gzx4la1vp6qfmv";
- name = "signon-kwallet-extension-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/signon-kwallet-extension-17.08.1.tar.xz";
+ sha256 = "1ax4l1whdxrfnl7bbs805vpp7j2m5zl55fq12vvrkw0x38m78v2h";
+ name = "signon-kwallet-extension-17.08.1.tar.xz";
};
};
spectacle = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/spectacle-17.04.2.tar.xz";
- sha256 = "1hab13wky0i7688jrzqy2m4kc49mz7fxjjk8z1rw2f4dxxaiymhf";
- name = "spectacle-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/spectacle-17.08.1.tar.xz";
+ sha256 = "07x01i629zk0l409kl85yv5gws7cw7mzmp1mlwxrjix153sr4jr9";
+ name = "spectacle-17.08.1.tar.xz";
};
};
step = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/step-17.04.2.tar.xz";
- sha256 = "16mhi1z5x403764k5csnr60zg2nwkjj7b3b39kqv1qb9540dmb2y";
- name = "step-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/step-17.08.1.tar.xz";
+ sha256 = "11p9rdg0m42200g15lq61489zz0zkkhic2j6hyynb1z1lr9c2iga";
+ name = "step-17.08.1.tar.xz";
};
};
svgpart = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/svgpart-17.04.2.tar.xz";
- sha256 = "1cns31z5pr78ilc1mhls31dchddwwzzwvbfddhygy2513067pca4";
- name = "svgpart-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/svgpart-17.08.1.tar.xz";
+ sha256 = "0xr0axiyn49szwwflq50sf9wp8i5xd7qs3krwznrdzlc8jcann9j";
+ name = "svgpart-17.08.1.tar.xz";
};
};
sweeper = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/sweeper-17.04.2.tar.xz";
- sha256 = "0zarr01q1v3yq0ipb213i48q27qivrgcrhvynw7livs5s35mx844";
- name = "sweeper-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/sweeper-17.08.1.tar.xz";
+ sha256 = "04gzc06p1fh7rnb3sbma2k8lav98v3w657k0sgscnv4dvsgbcqh9";
+ name = "sweeper-17.08.1.tar.xz";
};
};
syndication = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/syndication-17.04.2.tar.xz";
- sha256 = "19flj4f552yvvaih3wvw3i2p2nl60f5pgnl1ylimz5ga0c074vqq";
- name = "syndication-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/syndication-17.08.1.tar.xz";
+ sha256 = "0ihkway75n4r3zw18z07g5k2ggby5q1cz4cqi29cws1ay6s09qb9";
+ name = "syndication-17.08.1.tar.xz";
};
};
umbrello = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/umbrello-17.04.2.tar.xz";
- sha256 = "0jhxifv8s9a0pg6g2vlla901fwral8gyzzhy1mxbah907mj912k1";
- name = "umbrello-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/umbrello-17.08.1.tar.xz";
+ sha256 = "0xvxcncsxikmnxv98ar3gzcvxahsnja4jz1l23hiy2ib1lmcgcy7";
+ name = "umbrello-17.08.1.tar.xz";
};
};
zeroconf-ioslave = {
- version = "17.04.2";
+ version = "17.08.1";
src = fetchurl {
- url = "${mirror}/stable/applications/17.04.2/src/zeroconf-ioslave-17.04.2.tar.xz";
- sha256 = "10fm62dik7a0pnram7mdraryrbk1sscsp9i46j6sp243ndd13015";
- name = "zeroconf-ioslave-17.04.2.tar.xz";
+ url = "${mirror}/stable/applications/17.08.1/src/zeroconf-ioslave-17.08.1.tar.xz";
+ sha256 = "1crypk1cdh6cav1f6fx9p60ky1yf6hyyh1n6mih8mqjiibi1brz5";
+ name = "zeroconf-ioslave-17.08.1.tar.xz";
};
};
}
diff --git a/pkgs/applications/kde/syndication.nix b/pkgs/applications/kde/syndication.nix
new file mode 100644
index 00000000000..42782d449d5
--- /dev/null
+++ b/pkgs/applications/kde/syndication.nix
@@ -0,0 +1,16 @@
+{
+ mkDerivation, lib, kdepimTeam,
+ extra-cmake-modules, kdoctools,
+ kio
+}:
+
+mkDerivation {
+ name = "syndication";
+ meta = {
+ license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+ maintainers = kdepimTeam;
+ };
+ nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+ propagatedBuildInputs = [ kio ];
+ outputs = [ "out" "dev" ];
+}
diff --git a/pkgs/applications/misc/abook/default.nix b/pkgs/applications/misc/abook/default.nix
index 2c4bc0f2128..f87bd4c11ec 100644
--- a/pkgs/applications/misc/abook/default.nix
+++ b/pkgs/applications/misc/abook/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, ncurses, readline }:
+{ stdenv, fetchurl, fetchpatch, pkgconfig, ncurses, readline, autoreconfHook }:
stdenv.mkDerivation rec {
- name = "abook-0.6.0pre2";
+ name = "abook-0.6.1";
src = fetchurl {
url = "http://abook.sourceforge.net/devel/${name}.tar.gz";
- sha256 = "11fkyq9bqw7s6jf38yglk8bsx0ar2wik0fq0ds0rdp8985849m2r";
+ sha256 = "1yf0ifyjhq2r003pnpn92mn0924bn9yxjifxxj2ldcsgd7w0vagh";
};
patches = [
@@ -16,11 +16,11 @@ stdenv.mkDerivation rec {
})
];
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkgconfig autoreconfHook ];
buildInputs = [ ncurses readline ];
meta = {
- homepage = "http://abook.sourceforge.net/";
+ homepage = http://abook.sourceforge.net/;
description = "Text-based addressbook program designed to use with mutt mail client";
license = stdenv.lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.edwtjo ];
diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix
index 3dda61d95ae..79333e7d9fa 100644
--- a/pkgs/applications/misc/alacritty/default.nix
+++ b/pkgs/applications/misc/alacritty/default.nix
@@ -16,46 +16,63 @@
with rustPlatform;
-buildRustPackage rec {
- name = "alacritty-unstable-2017-07-08";
-
- src = fetchFromGitHub {
- owner = "jwilm";
- repo = "alacritty";
- rev = "94849c4f2a19bd49337f5cf090f94ac6a940c414";
- sha256 = "0cawrq0787pcfifn5awccq29a1ag85wfbmx1ccz7m33prk3ry9jp";
- };
-
- depsSha256 = "0lb83aan6lgdsdcrd6zdrxhz5bi96cw4ygqqlpm43w42chwzz0xj";
-
- buildInputs = [
- cmake
- makeWrapper
+let
+ rpathLibs = [
+ expat
freetype
fontconfig
- xclip
- pkgconfig
- expat
libX11
libXcursor
libXxf86vm
libXi
];
+in
+
+buildRustPackage rec {
+ name = "alacritty-unstable-2017-09-02";
+
+ src = fetchFromGitHub {
+ owner = "jwilm";
+ repo = "alacritty";
+ rev = "22fa4260fc9210fbb5288090df79c92e7b3788e4";
+ sha256 = "0jjvvm0fm25p1h1rgfqlnhq4bwrjdxpb2pgnmpik9pl7qwy3q7s1";
+ };
+
+ depsSha256 = "19lrj4i6vzmf22r6xg99zcwvzjpiar8pqin1m2nvv78xzxx5yvgb";
+
+ buildInputs = [
+ cmake
+ makeWrapper
+ pkgconfig
+ ] ++ rpathLibs;
+
+ postPatch = ''
+ substituteInPlace copypasta/src/x11.rs \
+ --replace Command::new\(\"xclip\"\) Command::new\(\"${xclip}/bin/xclip\"\)
+ '';
installPhase = ''
+ runHook preInstall
+
mkdir -p $out/bin
for f in $(find target/release -maxdepth 1 -type f); do
cp $f $out/bin
done;
- wrapProgram $out/bin/alacritty --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath buildInputs}"
+ patchelf --set-rpath "${stdenv.lib.makeLibraryPath rpathLibs}" $out/bin/alacritty
+
+ mkdir -p $out/share/applications
+ cp Alacritty.desktop $out/share/applications/alacritty.desktop
+
+ runHook postInstall
'';
+ dontPatchELF = true;
meta = with stdenv.lib; {
description = "GPU-accelerated terminal emulator";
homepage = https://github.com/jwilm/alacritty;
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ mic92 ];
- platforms = platforms.all;
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix
index 854408e6e3e..dd4858cfe2a 100644
--- a/pkgs/applications/misc/albert/default.nix
+++ b/pkgs/applications/misc/albert/default.nix
@@ -1,17 +1,17 @@
-{ mkDerivation, lib, fetchFromGitHub, qtbase, qtsvg, qtx11extras, muparser, cmake }:
+{ mkDerivation, lib, fetchFromGitHub, makeWrapper, qtbase, qtsvg, qtx11extras, muparser, cmake }:
mkDerivation rec {
name = "albert-${version}";
- version = "0.11.3";
+ version = "0.12.0";
src = fetchFromGitHub {
owner = "albertlauncher";
repo = "albert";
rev = "v${version}";
- sha256 = "0ddz6h1334b9kqy1lfi7qa21znm3l0b9h0d4s62llxdasv103jh5";
+ sha256 = "120l7hli2l4qj2s126nawc4dsy4qvwvb0svc42hijry4l8imdhkq";
};
- nativeBuildInputs = [ cmake ];
+ nativeBuildInputs = [ cmake makeWrapper ];
buildInputs = [ qtbase qtsvg qtx11extras muparser ];
@@ -31,6 +31,11 @@ mkDerivation rec {
rm "$out/lib"
'';
+ postInstall = ''
+ wrapProgram $out/bin/albert \
+ --prefix XDG_DATA_DIRS : $out/share
+ '';
+
meta = with lib; {
homepage = https://albertlauncher.github.io/;
description = "Desktop agnostic launcher";
diff --git a/pkgs/applications/misc/antfs-cli/default.nix b/pkgs/applications/misc/antfs-cli/default.nix
index 556c1db3c83..30b8a435f90 100644
--- a/pkgs/applications/misc/antfs-cli/default.nix
+++ b/pkgs/applications/misc/antfs-cli/default.nix
@@ -4,7 +4,7 @@ pythonPackages.buildPythonApplication rec {
name = "antfs-cli-unstable-2017-02-11";
meta = with stdenv.lib; {
- homepage = "https://github.com/Tigge/antfs-cli";
+ homepage = https://github.com/Tigge/antfs-cli;
description = "Extracts FIT files from ANT-FS based sport watches";
license = licenses.mit;
platforms = platforms.linux;
diff --git a/pkgs/applications/misc/apvlv/default.nix b/pkgs/applications/misc/apvlv/default.nix
index a07e0b6db61..350a64ba3e4 100644
--- a/pkgs/applications/misc/apvlv/default.nix
+++ b/pkgs/applications/misc/apvlv/default.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- homepage = "http://naihe2010.github.io/apvlv/";
+ homepage = http://naihe2010.github.io/apvlv/;
description = "PDF viewer with Vim-like behaviour";
longDescription = ''
apvlv is a PDF/DJVU/UMD/TXT Viewer Under Linux/WIN32
diff --git a/pkgs/applications/misc/avrdudess/default.nix b/pkgs/applications/misc/avrdudess/default.nix
index 6cc6cc5d9b9..c803eb37ad6 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/bashSnippets/default.nix b/pkgs/applications/misc/bashSnippets/default.nix
index 542450080fe..acd5ae7dd73 100644
--- a/pkgs/applications/misc/bashSnippets/default.nix
+++ b/pkgs/applications/misc/bashSnippets/default.nix
@@ -1,10 +1,9 @@
{ stdenv, lib, fetchFromGitHub, makeWrapper
-, curl, netcat, mpv, python, bind, iproute, bc, gitMinimal }:
+, curl, netcat, python, bind, iproute, bc, gitMinimal }:
let
- version = "1.12.0";
+ version = "1.17.3";
deps = lib.makeBinPath [
curl
- mpv
python
bind.dnsutils
iproute
@@ -19,7 +18,7 @@ stdenv.mkDerivation {
owner = "alexanderepstein";
repo = "Bash-Snippets";
rev = "v${version}";
- sha256 = "0kx2a8z3jbmmardw9z8fpghbw5mrbz4knb3wdihq35iarcbrddrg";
+ sha256 = "1xdjk8bjh7l6h7gdqrra1dh4wdq89wmd0jsirsvqa3bmcsb2wz1r";
};
buildInputs = [ makeWrapper ];
@@ -32,7 +31,7 @@ stdenv.mkDerivation {
dontBuild = true;
installPhase = ''
- mkdir -p "$out"/bin "$out"/man/man1
+ mkdir -p "$out"/bin "$out"/share/man/man1
./install.sh all
for file in "$out"/bin/*; do
wrapProgram "$file" --prefix PATH : "${deps}"
diff --git a/pkgs/applications/misc/bitcoinarmory/default.nix b/pkgs/applications/misc/bitcoinarmory/default.nix
new file mode 100644
index 00000000000..78ac55088a4
--- /dev/null
+++ b/pkgs/applications/misc/bitcoinarmory/default.nix
@@ -0,0 +1,87 @@
+{ stdenv, fetchFromGitHub, pythonPackages
+, pkgconfig, autoreconfHook, rsync
+, swig, qt4, fcgi
+, bitcoin, procps, utillinux
+}:
+let
+
+ version = "0.96.1";
+ sitePackages = pythonPackages.python.sitePackages;
+ inherit (pythonPackages) mkPythonDerivation pyqt4 psutil twisted;
+
+in mkPythonDerivation {
+
+ name = "bitcoinarmory-${version}";
+
+ src = fetchFromGitHub {
+ owner = "goatpig";
+ repo = "BitcoinArmory";
+ rev = "v${version}";
+ #sha256 = "023c7q1glhrkn4djz3pf28ckd1na52lsagv4iyfgchqvw7qm7yx2";
+ sha256 = "0pjk5qx16n3kvs9py62666qkwp2awkgd87by4karbj7vk6p1l14h"; fetchSubmodules = true;
+ };
+
+ # FIXME bitcoind doesn't die on shutdown. Need some sort of patch to fix that.
+ #patches = [ ./shutdown-fix.patch ];
+
+ buildInputs = [
+ pkgconfig
+ autoreconfHook
+ swig
+ qt4
+ fcgi
+ rsync # used by silly install script (TODO patch upstream)
+ ];
+
+ propagatedBuildInputs = [
+ pyqt4
+ psutil
+ twisted
+ ];
+
+ makeFlags = [ "PREFIX=$(out)" ];
+
+ makeWrapperArgs = [
+ "--prefix PATH : ${bitcoin}/bin" # for `bitcoind`
+ "--prefix PATH : ${procps}/bin" # for `free`
+ "--prefix PATH : ${utillinux}/bin" # for `whereis`
+ "--suffix LD_LIBRARY_PATH : $out/lib" # for python bindings built as .so files
+ "--run cd\\ $out/lib/armory" # so that GUI resources can be loaded
+ ];
+
+ # auditTmpdir runs during fixupPhase, so patchelf before that
+ preFixup = ''
+ newRpath=$(patchelf --print-rpath $out/bin/ArmoryDB | sed -r 's|(.*)(/tmp/nix-build-.*libfcgi/.libs:?)(.*)|\1\3|')
+ patchelf --set-rpath $out/lib:$newRpath $out/bin/ArmoryDB
+ '';
+
+ # fixupPhase of mkPythonDerivation wraps $out/bin/*, so this needs to come after
+ postFixup = ''
+ wrapPythonProgramsIn $out/lib/armory "$out $pythonPath"
+ ln -sf $out/lib/armory/ArmoryQt.py $out/bin/armory
+ '';
+
+ meta = {
+ description = "Bitcoin wallet with cold storage and multi-signature support";
+ longDescription = ''
+ Armory is the most secure and full featured solution available for users
+ and institutions to generate and store Bitcoin private keys. This means
+ users never have to trust the Armory team and can use it with the Glacier
+ Protocol. Satoshi would be proud!
+
+ Users are empowered with multiple encrypted Bitcoin wallets and permanent
+ one-time ‘paper backups’. Armory pioneered cold storage and distributed
+ multi-signature. Bitcoin cold storage is a system for securely storing
+ Bitcoins on a completely air-gapped offline computer.
+
+ Maintainer's note: The original authors at https://bitcoinarmory.com/
+ discontinued development. I elected instead to package GitHub user
+ @goatpig's fork, as it's the most active, at time of this writing.
+ '';
+ homepage = https://github.com/goatpig/BitcoinArmory;
+ license = stdenv.lib.licenses.agpl3Plus;
+ maintainers = with stdenv.lib.maintainers; [ elitak ];
+ platforms = [ "i686-linux" "x86_64-linux" ];
+ };
+
+}
diff --git a/pkgs/applications/misc/bleachbit/default.nix b/pkgs/applications/misc/bleachbit/default.nix
index e67480fb3c7..196db45d905 100644
--- a/pkgs/applications/misc/bleachbit/default.nix
+++ b/pkgs/applications/misc/bleachbit/default.nix
@@ -25,7 +25,7 @@ pythonPackages.buildPythonApplication rec {
propagatedBuildInputs = with pythonPackages; [ pygtk ];
meta = {
- homepage = "http://bleachbit.sourceforge.net";
+ homepage = http://bleachbit.sourceforge.net;
description = "A program to clean your computer";
longDescription = "BleachBit helps you easily clean your computer to free space and maintain privacy.";
license = stdenv.lib.licenses.gpl3;
diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index 335d0031b32..86b2ab6eb1c 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, boost, cmake, ffmpeg, gettext, glew
+{ stdenv, stdenv_gcc5, lib, fetchurl, boost, cmake, ffmpeg, gettext, glew
, ilmbase, libXi, libX11, libXext, libXrender
, libjpeg, libpng, libsamplerate, libsndfile
, libtiff, mesa, openal, opencolorio, openexr, openimageio, openjpeg_1, python
@@ -10,12 +10,12 @@
with lib;
-stdenv.mkDerivation rec {
- name = "blender-2.78c";
+(if cudaSupport then stdenv_gcc5 else stdenv).mkDerivation rec {
+ name = "blender-2.79";
src = fetchurl {
url = "http://download.blender.org/source/${name}.tar.gz";
- sha256 = "0f6k3m9yd5yhn7fq9srgzwh2gachlxm03bdrvn2r7xq00grqzab4";
+ sha256 = "16f84mdzkmwjmqahjj64kbyk4kagdj4mcr8qjazs1952d7kh7pm9";
};
buildInputs =
@@ -65,11 +65,15 @@ stdenv.mkDerivation rec {
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; {
description = "3D Creation/Animation/Publishing System";
- homepage = http://www.blender.org;
+ homepage = https://www.blender.org;
# They comment two licenses: GPLv2 and Blender License, but they
# say: "We've decided to cancel the BL offering for an indefinite period."
license = licenses.gpl2Plus;
diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix
index ea3ca107d24..a0955dceced 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.3.1";
name = "buku-${version}";
src = fetchFromGitHub {
owner = "jarun";
repo = "buku";
rev = "v${version}";
- sha256 = "1a33x3197vi5s8rq5fvhy021jdlsc8ww8zc4kysss6r9mvdlk7ax";
+ sha256 = "1byq8jgv1rb67ygibk0vzgz5ri1il4q4hpg23z5q0ml27fif9hw3";
};
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 8341898fa23..cd9a7172921 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -5,12 +5,12 @@
}:
stdenv.mkDerivation rec {
- version = "3.3.0";
+ version = "3.7.0";
name = "calibre-${version}";
src = fetchurl {
url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz";
- sha256 = "1zq3aihnyxdczdz8b0w02xfw4b0l9i23f6ljpmsmm69jyh4j3m0c";
+ sha256 = "1wb0ixx11q0p5dzcszq1n2lx9bcl5dynr87d7anfiz73mxdq20za";
};
patches = [
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
# Remove unneeded files and libs
rm -rf resources/calibre-portable.* \
- src/{chardet,cherrypy,html5lib,odf,routes}
+ src/odf
'';
dontUseQmakeConfigure = true;
@@ -49,12 +49,11 @@ stdenv.mkDerivation rec {
poppler_utils libpng imagemagick libjpeg
fontconfig podofo qtbase chmlib icu sqlite libusb1 libmtp xdg_utils wrapGAppsHook
] ++ (with python2Packages; [
- html5lib_0_9999999 # needs to be before mechanize ?
- apsw cssselect cssutils dateutil lxml mechanize netifaces pillow
+ apsw cssselect cssutils dateutil html5-parser lxml mechanize netifaces pillow
python pyqt5 sip
regex msgpack
# the following are distributed with calibre, but we use upstream instead
- chardet cherrypy odfpy routes
+ odfpy
]);
installPhase = ''
@@ -91,6 +90,9 @@ stdenv.mkDerivation rec {
substituteAllInPlace $entry
done
+ mkdir -p $out/share
+ cp -a man-pages $out/share/man
+
runHook postInstall
'';
diff --git a/pkgs/applications/misc/cataract/build.nix b/pkgs/applications/misc/cataract/build.nix
index 587a20b2704..05c058f8a83 100644
--- a/pkgs/applications/misc/cataract/build.nix
+++ b/pkgs/applications/misc/cataract/build.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
'';
meta = {
- homepage = "http://cgg.bzatek.net/";
+ homepage = http://cgg.bzatek.net/;
description = "a simple static web photo gallery, designed to be clean and easily usable";
license = stdenv.lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.matthiasbeyer ];
diff --git a/pkgs/applications/misc/cbatticon/default.nix b/pkgs/applications/misc/cbatticon/default.nix
index efe2b2863ac..1aeb45f1e20 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.5";
+ version = "1.6.6";
src = fetchFromGitHub {
owner = "valr";
repo = "cbatticon";
rev = version;
- sha256 = "1j7gbmmygvbrawqn1bbaf47lb600lylslzqbvfwlhifmi7qnm6ca";
+ sha256 = "0gphijkjmg5q349ffhnx12dppg6hajkr90n0x5b6s9cad5b4q0kq";
};
makeFlags = "PREFIX=$(out)";
diff --git a/pkgs/applications/misc/cdrtools/default.nix b/pkgs/applications/misc/cdrtools/default.nix
index be6989b7e33..a46565eb76b 100644
--- a/pkgs/applications/misc/cdrtools/default.nix
+++ b/pkgs/applications/misc/cdrtools/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
makeFlags = [ "INS_BASE=/" "INS_RBASE=/" "DESTDIR=$(out)" ];
meta = with stdenv.lib; {
- homepage = http://sourceforge.net/projects/cdrtools/;
+ homepage = https://sourceforge.net/projects/cdrtools/;
description = "Highly portable CD/DVD/BluRay command line recording software";
license = with licenses; [ gpl2 lgpl2 cddl ];
platforms = platforms.linux;
diff --git a/pkgs/applications/misc/cgminer/default.nix b/pkgs/applications/misc/cgminer/default.nix
index 8f2d7c4f17f..d4884bb1709 100644
--- a/pkgs/applications/misc/cgminer/default.nix
+++ b/pkgs/applications/misc/cgminer/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
monitoring, (over)clocking and fanspeed support for bitcoin and derivative
coins. Do not use on multiple block chains at the same time!
'';
- homepage = "https://github.com/ckolivas/cgminer";
+ homepage = https://github.com/ckolivas/cgminer;
license = licenses.gpl3;
maintainers = [ maintainers.offline ];
platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix
index e1ed03c428d..a46485c5ef7 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];
- homepage = "https://github.com/chrisallenlane/cheat";
+ maintainers = with maintainers; [ mic92 ];
+ license = with licenses; [gpl3 mit];
+ homepage = https://github.com/chrisallenlane/cheat;
};
}
diff --git a/pkgs/applications/misc/cli-visualizer/default.nix b/pkgs/applications/misc/cli-visualizer/default.nix
index cdde212275d..860a1d186f7 100644
--- a/pkgs/applications/misc/cli-visualizer/default.nix
+++ b/pkgs/applications/misc/cli-visualizer/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
'';
meta = {
- homepage = "https://github.com/dpayne/cli-visualizer";
+ homepage = https://github.com/dpayne/cli-visualizer;
description = "CLI based audio visualizer";
license = stdenv.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.matthiasbeyer ];
diff --git a/pkgs/applications/misc/confclerk/default.nix b/pkgs/applications/misc/confclerk/default.nix
index 08f654cdec4..de18a211c45 100644
--- a/pkgs/applications/misc/confclerk/default.nix
+++ b/pkgs/applications/misc/confclerk/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
meta = {
description = "Offline conference schedule viewer";
- homepage = "http://www.toastfreeware.priv.at/confclerk";
+ homepage = http://www.toastfreeware.priv.at/confclerk;
license = stdenv.lib.licenses.gpl2;
maintainers = with stdenv.lib.maintainers; [ ehmry ];
inherit (qt4.meta) platforms;
diff --git a/pkgs/applications/misc/cool-retro-term/default.nix b/pkgs/applications/misc/cool-retro-term/default.nix
index 48e08be5474..985a418e158 100644
--- a/pkgs/applications/misc/cool-retro-term/default.nix
+++ b/pkgs/applications/misc/cool-retro-term/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
feel of the old cathode tube screens. It has been designed to be
eye-candy, customizable, and reasonably lightweight.
'';
- homepage = "https://github.com/Swordifish90/cool-retro-term";
+ homepage = https://github.com/Swordifish90/cool-retro-term;
license = with stdenv.lib.licenses; [ gpl2 gpl3 ];
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ skeidel ];
diff --git a/pkgs/applications/misc/copyq/cmake-modules.patch b/pkgs/applications/misc/copyq/cmake-modules.patch
new file mode 100644
index 00000000000..f21105763de
--- /dev/null
+++ b/pkgs/applications/misc/copyq/cmake-modules.patch
@@ -0,0 +1,12 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index d910299e..69888477 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -99,6 +99,7 @@ endif()
+
+ # Qt modules
+ if (WITH_QT5)
++ find_package(Qt5 REQUIRED COMPONENTS Network Svg Xml Script)
+ qt5_use_modules(copyq Widgets Network Svg Xml Script ${copyq_Qt5_Modules})
+ else()
+ set(QT_USE_QTNETWORK TRUE)
diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix
index 7461f6853f4..4fd30c547b5 100644
--- a/pkgs/applications/misc/copyq/default.nix
+++ b/pkgs/applications/misc/copyq/default.nix
@@ -1,19 +1,27 @@
-{ stdenv, fetchFromGitHub, cmake, qt4, libXfixes, libXtst}:
+{ stdenv, fetchFromGitHub, cmake, qt5, libXfixes, libXtst, git
+, webkitSupport ? true
+}:
stdenv.mkDerivation rec {
name = "CopyQ-${version}";
- version = "2.9.0";
+ version = "3.0.3";
src = fetchFromGitHub {
owner = "hluk";
repo = "CopyQ";
rev = "v${version}";
- sha256 = "1gnqsfh50w3qcnbghkpjr5qs42fgl6643lmg4mg4wam8a852s64f";
+ sha256 = "0wpxqrg4mn8xjsrwsmlhh731s2kr6afnzpqif1way0gi7fqr73jl";
};
+ patches = [
+ ./cmake-modules.patch
+ ];
+
nativeBuildInputs = [ cmake ];
-
- buildInputs = [ qt4 libXfixes libXtst ];
+
+ buildInputs = [
+ git qt5.full libXfixes libXtst
+ ] ++ stdenv.lib.optional webkitSupport qt5.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 6b22f3b27ee..0123e0c38d7 100644
--- a/pkgs/applications/misc/ctodo/default.nix
+++ b/pkgs/applications/misc/ctodo/default.nix
@@ -1,24 +1,22 @@
-{ 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 .
'';
meta = {
- homepage = "http://ctodo.apakoh.dk/";
+ homepage = http://ctodo.apakoh.dk/;
description = "A simple ncurses-based task list manager";
license = stdenv.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.matthiasbeyer ];
diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix
index e33edfb0a44..3fb66907295 100644
--- a/pkgs/applications/misc/cura/default.nix
+++ b/pkgs/applications/misc/cura/default.nix
@@ -2,20 +2,20 @@
mkDerivation rec {
name = "cura-${version}";
- version = "2.4.0";
+ version = "2.6.1";
src = fetchFromGitHub {
owner = "Ultimaker";
repo = "Cura";
rev = version;
- sha256 = "04iglmjg9rzmlfrll6g7bcckkla327938xh8qmbdfrh215aivdlp";
+ sha256 = "03rsw6nafg3y9if2dlnzsj6c9x3x7cv6gs4a1w84jaq4p1f8fcsd";
};
buildInputs = [ qtbase ];
propagatedBuildInputs = with python3.pkgs; [ uranium zeroconf pyserial ];
nativeBuildInputs = [ cmake python3.pkgs.wrapPython ];
- cmakeFlags = [ "-DCMAKE_MODULE_PATH=${python3.pkgs.uranium}/share/cmake-${cmake.majorVersion}/Modules" ];
+ cmakeFlags = [ "-DURANIUM_DIR=${python3.pkgs.uranium.src}" ];
postPatch = ''
sed -i 's,/python''${PYTHON_VERSION_MAJOR}/dist-packages,/python''${PYTHON_VERSION_MAJOR}.''${PYTHON_VERSION_MINOR}/site-packages,g' CMakeLists.txt
@@ -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 08df0cc3e90..ce7109dd6fc 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.4.0";
+ version = "2.6.1";
src = fetchFromGitHub {
owner = "Ultimaker";
repo = "CuraEngine";
rev = version;
- sha256 = "1n587cqm310kzb2zbc31199x7ybgxzjq91hslb1zcb8qg8qqmixm";
+ sha256 = "1vixxxpwrprcrma0v5ckjvcy45pj32rkf5pk4w7rans9k2ig66ic";
};
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 e145bbe22e7..1e024a16e81 100644
--- a/pkgs/applications/misc/deepin-terminal/default.nix
+++ b/pkgs/applications/misc/deepin-terminal/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
Deepin terminal, it sharpens your focus in the world of command line!
It is an advanced terminal emulator with workspace, multiple windows, remote management, quake mode and other features.
'';
- homepage = "https://github.com/linuxdeepin/deepin-terminal/";
+ homepage = https://github.com/linuxdeepin/deepin-terminal/;
license = stdenv.lib.licenses.gpl3;
platforms = stdenv.lib.platforms.linux;
};
diff --git a/pkgs/applications/misc/dfilemanager/default.nix b/pkgs/applications/misc/dfilemanager/default.nix
index 907c9d612b8..53344595f78 100644
--- a/pkgs/applications/misc/dfilemanager/default.nix
+++ b/pkgs/applications/misc/dfilemanager/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
cmakeFlags = "-DQT5BUILD=true";
meta = {
- homepage = "http://dfilemanager.sourceforge.net/";
+ homepage = http://dfilemanager.sourceforge.net/;
description = "File manager written in Qt/C++";
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/applications/misc/direwolf/default.nix b/pkgs/applications/misc/direwolf/default.nix
index d4c8b1ada6c..f1e33ea5357 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 9a13da67745..340e8f16164 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/dockbarx/default.nix b/pkgs/applications/misc/dockbarx/default.nix
index 60bd5134e8a..cfe76701ceb 100644
--- a/pkgs/applications/misc/dockbarx/default.nix
+++ b/pkgs/applications/misc/dockbarx/default.nix
@@ -29,7 +29,7 @@ pythonPackages.buildPythonApplication rec {
++ [ keybinder ];
meta = with stdenv.lib; {
- homepage = http://launchpad.net/dockbar/;
+ homepage = https://launchpad.net/dockbar/;
description = "DockBarX is a lightweight taskbar / panel replacement for Linux which works as a stand-alone dock";
license = licenses.gpl3;
platforms = platforms.linux;
diff --git a/pkgs/applications/misc/doomseeker/default.nix b/pkgs/applications/misc/doomseeker/default.nix
index 61b0357bb9d..1393af67bf8 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 00000000000..1d3c405b703
--- /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/eaglemode/default.nix b/pkgs/applications/misc/eaglemode/default.nix
index 95cae316a71..4b81bfd53f5 100644
--- a/pkgs/applications/misc/eaglemode/default.nix
+++ b/pkgs/applications/misc/eaglemode/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- homepage = "http://eaglemode.sourceforge.net";
+ homepage = http://eaglemode.sourceforge.net;
description = "Zoomable User Interface";
license = licenses.gpl3;
maintainers = with maintainers; [ viric ];
diff --git a/pkgs/applications/misc/electrum-dash/default.nix b/pkgs/applications/misc/electrum-dash/default.nix
index 8752bafbe73..e7a5a1be197 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 25c96322378..bb41f8665e5 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 34f403fda89..0781617eb69 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -2,11 +2,11 @@
python2Packages.buildPythonApplication rec {
name = "electrum-${version}";
- version = "2.8.3";
+ version = "2.9.3";
src = fetchurl {
url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
- sha256 = "04jswalydzwm16iismbq1h2shj17iq9sqm0mz8p98sh3dwkacvn1";
+ sha256 = "0d0fzb653g7b8ka3x90nl21md4g3n1fv11czdxpdq3s9yr6js6f2";
};
propagatedBuildInputs = with python2Packages; [
@@ -14,7 +14,7 @@ python2Packages.buildPythonApplication rec {
ecdsa
jsonrpclib
pbkdf2
- protobuf3_2
+ protobuf
pyaes
pycrypto
pyqt4
diff --git a/pkgs/applications/misc/ephemeralpg/default.nix b/pkgs/applications/misc/ephemeralpg/default.nix
new file mode 100644
index 00000000000..65df422599c
--- /dev/null
+++ b/pkgs/applications/misc/ephemeralpg/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, postgresql, makeWrapper }:
+stdenv.mkDerivation rec {
+ name = "ephemeralpg-${version}";
+ version = "2.2";
+ src = fetchurl {
+ url = "http://ephemeralpg.org/code/${name}.tar.gz";
+ sha256 = "1v48bcmc23zzqbha80p3spxd5l347qnjzs4z44wl80i2s8fdzlyz";
+ };
+ buildInputs = [ makeWrapper ];
+ installPhase = ''
+ mkdir -p $out
+ PREFIX=$out make install
+ wrapProgram $out/bin/pg_tmp --prefix PATH : ${postgresql}/bin
+ '';
+ meta = {
+ description = ''Run tests on an isolated, temporary PostgreSQL database.'';
+ license = stdenv.lib.licenses.isc;
+ homepage = http://ephemeralpg.org/;
+ };
+}
diff --git a/pkgs/applications/misc/et/default.nix b/pkgs/applications/misc/et/default.nix
new file mode 100644
index 00000000000..4a77423bea8
--- /dev/null
+++ b/pkgs/applications/misc/et/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchFromGitHub, pkgconfig, libnotify, gdk_pixbuf }:
+
+stdenv.mkDerivation rec {
+ name = "et-${version}";
+ version = "2017-03-04";
+
+ src = fetchFromGitHub {
+ owner = "geistesk";
+ repo = "et";
+ rev = "151e9b6bc0d2d4f45bda8ced740ee99d0f2012f6";
+ sha256 = "1a1jdnzmal05k506bbvzlwsj2f3kql6l5xc1gdabm79y6vaf4r7s";
+ };
+
+ buildInputs = [ libnotify gdk_pixbuf ];
+ nativeBuildInputs = [ pkgconfig ];
+
+ prePatch = ''
+ substituteInPlace Makefile \
+ --replace ' = gcc' ' ?= gcc'
+ '';
+
+ 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 for GNU/Linux";
+ 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 386601f39bb..6344f40a291 100644
--- a/pkgs/applications/misc/eterm/default.nix
+++ b/pkgs/applications/misc/eterm/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Terminal emulator";
- homepage = "http://www.eterm.org";
+ homepage = http://www.eterm.org;
license = licenses.bsd2;
maintainers = [ maintainers.AndersonTorres ];
platforms = platforms.linux;
diff --git a/pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch b/pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch
new file mode 100644
index 00000000000..68a16b196fa
--- /dev/null
+++ b/pkgs/applications/misc/far2l/add-nix-syntax-highlighting.patch
@@ -0,0 +1,157 @@
+diff --git a/colorer/configs/base/hrc/nix.hrc b/colorer/configs/base/hrc/nix.hrc
+new file mode 100644
+index 0000000..1bd9bb5
+--- /dev/null
++++ b/colorer/configs/base/hrc/nix.hrc
+@@ -0,0 +1,132 @@
++
++
++
++
++
++
++
++ Nix
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
+diff --git a/colorer/configs/base/hrc/proto.hrc b/colorer/configs/base/hrc/proto.hrc
+index 11e493b..2a67263 100644
+--- a/colorer/configs/base/hrc/proto.hrc
++++ b/colorer/configs/base/hrc/proto.hrc
+@@ -156,6 +156,14 @@
+
+ /\.(w?lua)$/i
+
++
++
++ /\.(nix)$/i
++
++
++
++
++
+
+
+ /\.(rb|rbw|ruby|rake)$/i
diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix
index 87709ec102b..1097780723e 100644
--- a/pkgs/applications/misc/far2l/default.nix
+++ b/pkgs/applications/misc/far2l/default.nix
@@ -2,21 +2,23 @@
xdg_utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick }:
stdenv.mkDerivation rec {
- rev = "ab240373f69824c56e9255d452b689cff3b1ecfb";
- build = "2017-05-09-${builtins.substring 0 10 rev}";
+ rev = "de5554dbc0ec69329b75777d4a3b2f01851fc5ed";
+ build = "unstable-2017-07-13.git${builtins.substring 0 7 rev}";
name = "far2l-2.1.${build}";
src = fetchFromGitHub {
owner = "elfmz";
repo = "far2l";
rev = rev;
- sha256 = "1b6w6xhja3xkfzhrdy8a8qpbhxws75khm1zhwz8sc8la9ykd541q";
+ sha256 = "07l8w9p6zxm9qgh9wlci584lgv8gd4aw742jaqh9acgkxy9caih8";
};
nativeBuildInputs = [ cmake pkgconfig m4 makeWrapper imagemagick ];
buildInputs = [ wxGTK30 glib pcre ];
+ patches = [ ./add-nix-syntax-highlighting.patch ];
+
postPatch = ''
echo 'echo ${build}' > far2l/bootstrap/scripts/vbuild.sh
@@ -62,7 +64,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "An orthodox file manager";
- homepage = http://github.com/elfmz/far2l;
+ homepage = https://github.com/elfmz/far2l;
license = licenses.gpl2;
maintainers = [ maintainers.volth ];
platforms = platforms.all;
diff --git a/pkgs/applications/misc/fbreader/default.nix b/pkgs/applications/misc/fbreader/default.nix
index 2b193ef42cd..6cfd1e05279 100644
--- a/pkgs/applications/misc/fbreader/default.nix
+++ b/pkgs/applications/misc/fbreader/default.nix
@@ -16,11 +16,13 @@ stdenv.mkDerivation {
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/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix
index 88475dd761e..5cd8f572ad4 100644
--- a/pkgs/applications/misc/fetchmail/default.nix
+++ b/pkgs/applications/misc/fetchmail/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
configureFlags = "--with-ssl=${openssl.dev}";
meta = {
- homepage = "http://www.fetchmail.info/";
+ homepage = http://www.fetchmail.info/;
description = "A full-featured remote-mail retrieval and forwarding utility";
longDescription = ''
A full-featured, robust, well-documented remote-mail retrieval and
diff --git a/pkgs/applications/misc/finalterm/default.nix b/pkgs/applications/misc/finalterm/default.nix
index 053cdd05991..add46f8871d 100644
--- a/pkgs/applications/misc/finalterm/default.nix
+++ b/pkgs/applications/misc/finalterm/default.nix
@@ -42,12 +42,12 @@ stdenv.mkDerivation {
postFixup = ''
wrapProgram "$out/bin/finalterm" \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
- --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules" \
+ --prefix GIO_EXTRA_MODULES : "${getLib gnome3.dconf}/lib/gio/modules" \
--prefix XDG_DATA_DIRS : "${gnome3.defaultIconTheme}/share:${gnome3.gtk.out}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
'';
meta = {
- homepage = "http://finalterm.org";
+ homepage = http://finalterm.org;
description = "A new breed of terminal emulator";
longDescription = ''
Final Term is a new breed of terminal emulator.
diff --git a/pkgs/applications/misc/flamerobin/default.nix b/pkgs/applications/misc/flamerobin/default.nix
index 23d0d682176..f70042884a8 100644
--- a/pkgs/applications/misc/flamerobin/default.nix
+++ b/pkgs/applications/misc/flamerobin/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Database administration tool for Firebird RDBMS";
- homepage = "https://github.com/mariuz/flamerobin";
+ homepage = https://github.com/mariuz/flamerobin;
license = licenses.bsdOriginal;
maintainers = with maintainers; [ uralbash ];
platforms = platforms.unix;
diff --git a/pkgs/applications/misc/gammu/default.nix b/pkgs/applications/misc/gammu/default.nix
index 950ce210c06..939b38ca29f 100644
--- a/pkgs/applications/misc/gammu/default.nix
+++ b/pkgs/applications/misc/gammu/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
meta = {
- homepage = "http://wammu.eu/gammu/";
+ homepage = https://wammu.eu/gammu/;
description = "Command line utility and library to control mobile phones";
license = licenses.gpl2;
platforms = platforms.linux;
diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix
index 7585ef6710a..cef8640d958 100644
--- a/pkgs/applications/misc/girara/default.nix
+++ b/pkgs/applications/misc/girara/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
];
meta = with stdenv.lib; {
- homepage = http://pwmt.org/projects/girara/;
+ homepage = https://pwmt.org/projects/girara/;
description = "User interface library";
longDescription = ''
girara is a library that implements a GTK+ based VIM-like user interface
diff --git a/pkgs/applications/misc/gkrellm/default.nix b/pkgs/applications/misc/gkrellm/default.nix
index 8654e7f3a26..b9cbf8064a0 100644
--- a/pkgs/applications/misc/gkrellm/default.nix
+++ b/pkgs/applications/misc/gkrellm/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, gettext, pkgconfig, glib, gtk2, libX11, libSM, libICE
+{ fetchurl, stdenv, gettext, pkgconfig, glib, gtk2, libX11, libSM, libICE, which
, IOKit ? null }:
with stdenv.lib;
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0rnpzjr0ys0ypm078y63q4aplcgdr5nshjzhmz330n6dmnxci7lb";
};
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkgconfig which ];
buildInputs = [gettext glib gtk2 libX11 libSM libICE]
++ optionals stdenv.isDarwin [ IOKit ];
@@ -20,23 +20,23 @@ stdenv.mkDerivation rec {
# Makefiles are patched to fix references to `/usr/X11R6' and to add
# `-lX11' to make sure libX11's store path is in the RPATH.
patchPhase = ''
- echo "patching makefiles..."
- for i in Makefile src/Makefile server/Makefile
- do
- sed -i "$i" -e "s|/usr/X11R6|${libX11.dev}|g ; s|-lICE|-lX11 -lICE|g"
- done '';
+ echo "patching makefiles..."
+ for i in Makefile src/Makefile server/Makefile
+ do
+ sed -i "$i" -e "s|/usr/X11R6|${libX11.dev}|g ; s|-lICE|-lX11 -lICE|g"
+ done
+ '';
- installPhase = ''
- make DESTDIR=$out install
- '';
+ makeFlags = [ "STRIP=-s" ];
+ installFlags = [ "DESTDIR=$(out)" ];
- meta = {
+ meta = {
description = "Themeable process stack of system monitors";
- longDescription =
- '' GKrellM is a single process stack of system monitors which supports
- applying themes to match its appearance to your window manager, Gtk,
- or any other theme.
- '';
+ longDescription = ''
+ GKrellM is a single process stack of system monitors which
+ supports applying themes to match its appearance to your window
+ manager, Gtk, or any other theme.
+ '';
homepage = http://gkrellm.srcbox.net;
license = licenses.gpl3Plus;
diff --git a/pkgs/applications/misc/gksu/default.nix b/pkgs/applications/misc/gksu/default.nix
index 0b6ebe06b88..509a54881cc 100644
--- a/pkgs/applications/misc/gksu/default.nix
+++ b/pkgs/applications/misc/gksu/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
programs that need to ask a user's password to run another program
as another user.
'';
- homepage = "http://www.nongnu.org/gksu/";
+ homepage = http://www.nongnu.org/gksu/;
license = stdenv.lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.romildo ];
platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/misc/gmrun/default.nix b/pkgs/applications/misc/gmrun/default.nix
index 6c712db01a5..3be2704896e 100644
--- a/pkgs/applications/misc/gmrun/default.nix
+++ b/pkgs/applications/misc/gmrun/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
Also, supports CTRL-R / CTRL-S / "!" for searching through history.
Running commands in a terminal with CTRL-Enter. URL handlers.
'';
- homepage = "http://sourceforge.net/projects/gmrun/";
+ homepage = https://sourceforge.net/projects/gmrun/;
license = "GPL";
maintainers = [];
platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/applications/misc/gmtp/default.nix b/pkgs/applications/misc/gmtp/default.nix
index a86cf268801..dfe61b57b43 100644
--- a/pkgs/applications/misc/gmtp/default.nix
+++ b/pkgs/applications/misc/gmtp/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
meta = {
description = "A simple MP3 and Media player client for UNIX and UNIX like systems.";
- homepage = "https://gmtp.sourceforge.io";
+ homepage = https://gmtp.sourceforge.io;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.pbogdan ];
license = stdenv.lib.licenses.bsd3;
diff --git a/pkgs/applications/misc/gnome15/default.nix b/pkgs/applications/misc/gnome15/default.nix
index c4f8be88bb5..e2cf8245ce6 100644
--- a/pkgs/applications/misc/gnome15/default.nix
+++ b/pkgs/applications/misc/gnome15/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A set of tools for configuring the Logitech G15 keyboard";
license = licenses.gpl3;
- homepage = "https://gnome15.org/";
+ homepage = https://gnome15.org/;
platforms = platforms.linux;
maintainers = with maintainers; [ abbradar ];
};
diff --git a/pkgs/applications/misc/gnuradio/default.nix b/pkgs/applications/misc/gnuradio/default.nix
index 8218285c5fb..e10cb30d187 100644
--- a/pkgs/applications/misc/gnuradio/default.nix
+++ b/pkgs/applications/misc/gnuradio/default.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
postInstall = ''
printf "backend : Qt4Agg\n" > "$out/share/gnuradio/matplotlibrc"
- for file in "$out"/bin/* "$out"/share/gnuradio/examples/*/*.py; do
+ for file in $(find $out/bin $out/share/gnuradio/examples -type f -executable); do
wrapProgram "$file" \
--prefix PYTHONPATH : $PYTHONPATH:$(toPythonPath "$out") \
--set MATPLOTLIBRC "$out/share/gnuradio"
diff --git a/pkgs/applications/misc/gnuradio/wrapper.nix b/pkgs/applications/misc/gnuradio/wrapper.nix
index cc8dbde273b..db2b453913f 100644
--- a/pkgs/applications/misc/gnuradio/wrapper.nix
+++ b/pkgs/applications/misc/gnuradio/wrapper.nix
@@ -11,10 +11,10 @@ stdenv.mkDerivation {
mkdir -p $out/bin
ln -s "${gnuradio}"/bin/* $out/bin/
- for file in "$out"/bin/*; do
+ for file in $(find $out/bin -type f -executable); do
wrapProgram "$file" \
--prefix PYTHONPATH : ${stdenv.lib.concatStringsSep ":"
- (map (path: "$(toPythonPath ${path})") extraPackages)} \
+ (map (path: "$(toPythonPath ${path})") extraPackages)} \
--prefix GRC_BLOCKS_PATH : ${makeSearchPath "share/gnuradio/grc/blocks" extraPackages}
done
diff --git a/pkgs/applications/misc/gollum/Gemfile.lock b/pkgs/applications/misc/gollum/Gemfile.lock
index 4322b408843..7315c0a8d72 100644
--- a/pkgs/applications/misc/gollum/Gemfile.lock
+++ b/pkgs/applications/misc/gollum/Gemfile.lock
@@ -3,43 +3,43 @@ GEM
specs:
charlock_holmes (0.7.3)
diff-lcs (1.3)
- gemojione (3.2.0)
+ gemojione (3.3.0)
json
- github-markup (1.6.0)
+ github-markup (1.6.1)
gitlab-grit (2.8.1)
charlock_holmes (~> 0.6)
diff-lcs (~> 1.1)
mime-types (>= 1.16, < 3)
posix-spawn (~> 0.3)
- gollum (4.1.1)
+ gollum (4.1.2)
gemojione (~> 3.2)
- gollum-lib (~> 4.0, >= 4.0.1)
+ gollum-lib (>= 4.2.7)
kramdown (~> 1.9.0)
mustache (>= 0.99.5, < 1.0.0)
sinatra (~> 1.4, >= 1.4.4)
useragent (~> 0.16.2)
gollum-grit_adapter (1.0.1)
gitlab-grit (~> 2.7, >= 2.7.1)
- gollum-lib (4.2.5)
+ gollum-lib (4.2.7)
gemojione (~> 3.2)
github-markup (~> 1.6)
gollum-grit_adapter (~> 1.0)
- nokogiri (~> 1.6.4)
- rouge (~> 2.0)
+ nokogiri (>= 1.6.1, < 2.0)
+ rouge (~> 2.1)
sanitize (~> 2.1)
stringex (~> 2.6)
json (2.1.0)
kramdown (1.9.0)
mime-types (2.99.3)
- mini_portile2 (2.1.0)
+ mini_portile2 (2.2.0)
mustache (0.99.8)
- nokogiri (1.6.8.1)
- mini_portile2 (~> 2.1.0)
+ nokogiri (1.8.0)
+ mini_portile2 (~> 2.2.0)
posix-spawn (0.3.13)
rack (1.6.8)
rack-protection (1.5.3)
rack
- rouge (2.0.7)
+ rouge (2.1.1)
sanitize (2.1.0)
nokogiri (>= 1.4.4)
sinatra (1.4.8)
@@ -47,7 +47,7 @@ GEM
rack-protection (~> 1.4)
tilt (>= 1.3, < 3)
stringex (2.7.1)
- tilt (2.0.7)
+ tilt (2.0.8)
useragent (0.16.8)
PLATFORMS
@@ -57,4 +57,4 @@ DEPENDENCIES
gollum
BUNDLED WITH
- 1.15.0
+ 1.15.3
diff --git a/pkgs/applications/misc/gollum/default.nix b/pkgs/applications/misc/gollum/default.nix
index 160b38463b6..4ad32c5fd7f 100644
--- a/pkgs/applications/misc/gollum/default.nix
+++ b/pkgs/applications/misc/gollum/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A simple, Git-powered wiki";
- homepage = "https://github.com/gollum/gollum";
+ homepage = https://github.com/gollum/gollum;
license = licenses.mit;
maintainers = with maintainers; [ jgillich primeos ];
platforms = platforms.unix;
diff --git a/pkgs/applications/misc/gollum/gemset.nix b/pkgs/applications/misc/gollum/gemset.nix
index 2ad724b2bc7..cff774d7daa 100644
--- a/pkgs/applications/misc/gollum/gemset.nix
+++ b/pkgs/applications/misc/gollum/gemset.nix
@@ -16,22 +16,24 @@
version = "1.3";
};
gemojione = {
+ dependencies = ["json"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0svj3hsmwyr306vg75cd7p9i4bwnajrda60n2vhiav2cvhnkawik";
+ sha256 = "0ayk8r147k1s38nj18pwk76npx1p7jhi86silk800nj913pjvrhj";
type = "gem";
};
- version = "3.2.0";
+ version = "3.3.0";
};
github-markup = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1g538d7kcj2iw4d9ll8266d8n526hz2fbx7zlx8z7gxg1gzwiki9";
+ sha256 = "1nyb9ck2c9z5qi86n7r52w0m126qpnvc93yh35cn8bwsnkjqx0iq";
type = "gem";
};
- version = "1.6.0";
+ version = "1.6.1";
};
gitlab-grit = {
+ dependencies = ["charlock_holmes" "diff-lcs" "mime-types" "posix-spawn"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0lf1cr6pzqrbnxiiwym6q74b1a2ihdi91dynajk8hi1p093hl66n";
@@ -40,14 +42,16 @@
version = "2.8.1";
};
gollum = {
+ dependencies = ["gemojione" "gollum-lib" "kramdown" "mustache" "sinatra" "useragent"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0jrafhy8p9pgvya0gj2g6knrpg58g65s7j9bcyfj6fp4n2dz2w7s";
+ sha256 = "051pm2f50daiqcqy87aq4809x4c95iwwml6ca4wgvvmj5zkk6k5a";
type = "gem";
};
- version = "4.1.1";
+ version = "4.1.2";
};
gollum-grit_adapter = {
+ dependencies = ["gitlab-grit"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0fcibm63v1afc0fj5rki0mm51m7nndil4cjcjjvkh3yigfn4nr4b";
@@ -56,12 +60,13 @@
version = "1.0.1";
};
gollum-lib = {
+ dependencies = ["gemojione" "github-markup" "gollum-grit_adapter" "nokogiri" "rouge" "sanitize" "stringex"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0399lfqv3hbpr7v14p9snyimva440d2mb8y7xm2zlgwv7l0n9z0z";
+ sha256 = "1filwvjfj5q2m6w4q274ai36d6f0mrsv2l2khhk4bv1q6pqby2fq";
type = "gem";
};
- version = "4.2.5";
+ version = "4.2.7";
};
json = {
source = {
@@ -90,10 +95,10 @@
mini_portile2 = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1y25adxb1hgg1wb2rn20g3vl07qziq6fz364jc5694611zz863hb";
+ sha256 = "0g5bpgy08q0nc0anisg3yvwc1gc3inl854fcrg48wvg7glqd6dpm";
type = "gem";
};
- version = "2.1.0";
+ version = "2.2.0";
};
mustache = {
source = {
@@ -104,12 +109,13 @@
version = "0.99.8";
};
nokogiri = {
+ dependencies = ["mini_portile2"];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "045xdg0w7nnsr2f2gb7v7bgx53xbc9dxf0jwzmh2pr3jyrzlm0cj";
+ sha256 = "1nffsyx1xjg6v5n9rrbi8y1arrcx2i5f21cp6clgh9iwiqkr7rnn";
type = "gem";
};
- version = "1.6.8.1";
+ version = "1.8.0";
};
posix-spawn = {
source = {
@@ -128,6 +134,7 @@
version = "1.6.8";
};
rack-protection = {
+ dependencies = ["rack"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0cvb21zz7p9wy23wdav63z5qzfn4nialik22yqp6gihkgfqqrh5r";
@@ -138,12 +145,13 @@
rouge = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0sfikq1q8xyqqx690iiz7ybhzx87am4w50w8f2nq36l3asw4x89d";
+ sha256 = "1wn6rq5qjmcwh9ixkljazv6gmg746rgbgs6av5qnk0mxim5qw11p";
type = "gem";
};
- version = "2.0.7";
+ version = "2.1.1";
};
sanitize = {
+ dependencies = ["nokogiri"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0xsv6xqrlz91rd8wifjknadbl3z5h6qphmxy0hjb189qbdghggn3";
@@ -152,6 +160,7 @@
version = "2.1.0";
};
sinatra = {
+ dependencies = ["rack" "rack-protection" "tilt"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0byxzl7rx3ki0xd7aiv1x8mbah7hzd8f81l65nq8857kmgzj1jqq";
@@ -170,10 +179,10 @@
tilt = {
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1is1ayw5049z8pd7slsk870bddyy5g2imp4z78lnvl8qsl8l0s7b";
+ sha256 = "0020mrgdf11q23hm1ddd6fv691l51vi10af00f137ilcdb2ycfra";
type = "gem";
};
- version = "2.0.7";
+ version = "2.0.8";
};
useragent = {
source = {
diff --git a/pkgs/applications/misc/gpg-mdp/default.nix b/pkgs/applications/misc/gpg-mdp/default.nix
index fe58fa92d07..4143f6fde55 100644
--- a/pkgs/applications/misc/gpg-mdp/default.nix
+++ b/pkgs/applications/misc/gpg-mdp/default.nix
@@ -19,11 +19,11 @@ in stdenv.mkDerivation {
--replace "alias echo=/bin/echo" ""
substituteInPlace ./src/config.c \
- --replace "/usr/bin/gpg" "${gnupg}/bin/gpg2" \
+ --replace "/usr/bin/gpg" "${gnupg}/bin/gpg" \
--replace "/usr/bin/vi" "vi"
substituteInPlace ./mdp.1 \
- --replace "/usr/bin/gpg" "${gnupg}/bin/gpg2"
+ --replace "/usr/bin/gpg" "${gnupg}/bin/gpg"
'';
# we add symlinks to the binary and man page with the name 'gpg-mdp', in case
# the completely unrelated program also named 'mdp' is already installed.
diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix
index 90ae1a87654..0911fbace44 100644
--- a/pkgs/applications/misc/gpsbabel/default.nix
+++ b/pkgs/applications/misc/gpsbabel/default.nix
@@ -46,7 +46,9 @@ stdenv.mkDerivation rec {
# The raymarine and gtm tests fail on i686 despite -ffloat-store.
+ lib.optionalString stdenv.isi686 "rm -v testo.d/raymarine.test testo.d/gtm.test;"
# The gtm, kml and tomtom asc tests fail on darwin, see PR #23572.
- + lib.optionalString stdenv.isDarwin "rm -v testo.d/gtm.test testo.d/kml.test testo.d/tomtom_asc.test";
+ + lib.optionalString stdenv.isDarwin "rm -v testo.d/gtm.test testo.d/kml.test testo.d/tomtom_asc.test testo.d/classic-2.test"
+ # The arc-project test fails on aarch64.
+ + lib.optionalString stdenv.isAarch64 "rm -v testo.d/arc-project.test";
meta = with stdenv.lib; {
description = "Convert, upload and download data from GPS and Map programs";
diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/applications/misc/gpsprune/default.nix
index 07fcf31ed26..a51ec8c1b04 100644
--- a/pkgs/applications/misc/gpsprune/default.nix
+++ b/pkgs/applications/misc/gpsprune/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Application for viewing, editing and converting GPS coordinate data";
- homepage = http://activityworkshop.net/software/gpsprune/;
+ homepage = https://activityworkshop.net/software/gpsprune/;
license = licenses.gpl2Plus;
maintainers = [ maintainers.rycee ];
platforms = platforms.all;
diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix
index 16147715705..00735624ad9 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.8";
+ version = "4.14";
src = fetchFromGitHub {
owner = "tumic0";
repo = "GPXSee";
rev = version;
- sha256 = "17s1v6b1j7pi0yj554bd0cg14bl854gssp5gj2pl51rxji6zr0wp";
+ sha256 = "0yv3hcs5b8a88mp24h8r2sn69phwrahdff5pp74lz24270il3jgb";
};
nativeBuildInputs = [ qmake qttools ];
diff --git a/pkgs/applications/misc/gqrx/default.nix b/pkgs/applications/misc/gqrx/default.nix
index 3fda4d8881a..a0672f1810f 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.7";
src = fetchFromGitHub {
owner = "csete";
repo = "gqrx";
rev = "v${version}";
- sha256 = "02pavd1kc0gsnrl18bfa01r2f3j4j05zly4a8zwss9yrsgf8432x";
+ sha256 = "1dslb8l8ggj6vf9257c2bj0z8z1wy9c6sr2zksp5jdgf8m4j71im";
};
- 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; {
@@ -45,7 +41,7 @@ stdenv.mkDerivation rec {
# Some of the code comes from the Cutesdr project, with a BSD license, but
# it's currently unknown which version of the BSD license that is.
license = licenses.gpl3Plus;
- platforms = platforms.linux; # should work on Darwin / OS X too
+ platforms = platforms.linux; # should work on Darwin / macOS too
maintainers = with maintainers; [ bjornfor the-kenny fpletz ];
};
}
diff --git a/pkgs/applications/misc/grip/default.nix b/pkgs/applications/misc/grip/default.nix
index 5db5b25947e..85d95c7b3f9 100644
--- a/pkgs/applications/misc/grip/default.nix
+++ b/pkgs/applications/misc/grip/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
meta = {
description = "GTK+-based audio CD player/ripper";
- homepage = "http://nostatic.org/grip";
+ homepage = http://nostatic.org/grip;
license = stdenv.lib.licenses.gpl2;
maintainers = with stdenv.lib.maintainers; [ marcweber peti ];
diff --git a/pkgs/applications/misc/hackrf/default.nix b/pkgs/applications/misc/hackrf/default.nix
index e92cd4cdacc..1b8257ca5e5 100644
--- a/pkgs/applications/misc/hackrf/default.nix
+++ b/pkgs/applications/misc/hackrf/default.nix
@@ -1,23 +1,25 @@
-{ stdenv, fetchgit, cmake, pkgconfig, libusb }:
+{ stdenv, fetchgit, cmake, pkgconfig, libusb, fftwSinglePrec }:
stdenv.mkDerivation rec {
name = "hackrf-${version}";
- version = "2015.07.2";
+ version = "2017.02.1";
src = fetchgit {
url = "git://github.com/mossmann/hackrf";
rev = "refs/tags/v${version}";
- sha256 = "1mn11yz6hbkmvrbxj5vnp78m5dsny96821a9ffpvbdcwx3s2p23m";
+ sha256 = "16hd61icvzaciv7s9jpgm9c8q6m4mwvj97gxrb20sc65p5gjb7hv";
};
buildInputs = [
- cmake pkgconfig libusb
+ cmake pkgconfig libusb fftwSinglePrec
];
-
+
+ cmakeFlags = [ "-DUDEV_RULES_GROUP=plugdev" "-DUDEV_RULES_PATH=lib/udev/rules.d" ];
+
preConfigure = ''
- cd host
+ cd host
'';
-
+
meta = with stdenv.lib; {
description = "An open source SDR platform";
homepage = http://greatscottgadgets.com/hackrf/;
diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/applications/misc/haxor-news/default.nix
index 481e2107951..dc771fc2d5e 100644
--- a/pkgs/applications/misc/haxor-news/default.nix
+++ b/pkgs/applications/misc/haxor-news/default.nix
@@ -19,7 +19,7 @@ pythonPackages.buildPythonApplication rec {
];
meta = with stdenv.lib; {
- homepage = "https://github.com/donnemartin/haxor-news";
+ homepage = https://github.com/donnemartin/haxor-news;
description = "Browse Hacker News like a haxor";
license = licenses.asl20;
maintainers = with maintainers; [ matthiasbeyer ];
diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/applications/misc/houdini/runtime.nix
index 3a91d27fc48..b3ce98895e6 100644
--- a/pkgs/applications/misc/houdini/runtime.nix
+++ b/pkgs/applications/misc/houdini/runtime.nix
@@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
'';
meta = {
description = "3D animation application software";
- homepage = "https://sidefx.com";
+ homepage = https://sidefx.com;
license = stdenv.lib.licenses.unfree;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.canndrew ];
diff --git a/pkgs/applications/misc/hstr/default.nix b/pkgs/applications/misc/hstr/default.nix
index 78f3c2f391b..ba04bd5c39d 100644
--- a/pkgs/applications/misc/hstr/default.nix
+++ b/pkgs/applications/misc/hstr/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
buildInputs = [ readline ncurses ];
meta = {
- homepage = "https://github.com/dvorka/hstr";
+ homepage = https://github.com/dvorka/hstr;
description = "Shell history suggest box - easily view, navigate, search and use your command history";
license = stdenv.lib.licenses.asl20;
maintainers = [ stdenv.lib.maintainers.matthiasbeyer ];
diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index 27757e4e31a..c69bb5bea3b 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.25.1";
+ version = "0.27.1";
goPackagePath = "github.com/gohugoio/hugo";
@@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "gohugoio";
repo = "hugo";
rev = "v${version}";
- sha256 = "09cyms74y9dw58npvj89bfhwc23phs1wqbzajjgl72rfgh83a1bz";
+ sha256 = "0vxzjwm9dsan314cz0gnj4spssg4w8y6ywsak8n9c6w0l45xf07p";
};
goDeps = ./deps.nix;
diff --git a/pkgs/applications/misc/hugo/deps.nix b/pkgs/applications/misc/hugo/deps.nix
index ff832d4961f..240983b3c71 100644
--- a/pkgs/applications/misc/hugo/deps.nix
+++ b/pkgs/applications/misc/hugo/deps.nix
@@ -4,8 +4,8 @@
fetch = {
type = "git";
url = "https://github.com/BurntSushi/toml";
- rev = "8fb9fdc4f82fd3495b9086c911b86cc3d50cb7ab";
- sha256 = "0igg0cwc0cihsxrii203h1r5y2lmaclc164cjhyv2hpfsvb11zlg";
+ rev = "a368813c5e648fee92e5f6c30e3944ff9d5e8895";
+ sha256 = "1sjxs2lwc8jpln80s4rlzp7nprbcljhy5mz4rf9995gq93wqnym5";
};
}
{
@@ -35,15 +35,6 @@
sha256 = "0adkv2ghi0zd104akksa9wjzj7s849wpa1rij03mycgxp4si9ami";
};
}
- {
- goPackagePath = "github.com/bep/inflect";
- fetch = {
- type = "git";
- url = "https://github.com/bep/inflect";
- rev = "b896c45f5af983b1f416bdf3bb89c4f1f0926f69";
- sha256 = "0drv6in94n7lmap4ajvgqlvdcbpn8alinfdzywzpihvzbx21b3h3";
- };
- }
{
goPackagePath = "github.com/chaseadamsio/goorgeous";
fetch = {
@@ -76,8 +67,8 @@
fetch = {
type = "git";
url = "https://github.com/eknkc/amber";
- rev = "5fa7895500976542b0e28bb266f42ff1c7ce07f5";
- sha256 = "1mviw7ivw5yj1w6f8mfwaxpmbdl8c7n2wrpxnqkbcs8snpi0f6wq";
+ rev = "b8bd8b03e4f747e33f092617225e9fa8076c0448";
+ sha256 = "0qp5y9zhr6hi9ck33p7cnwla7d7p8vi4hj9llhg3bn1a69g21y0a";
};
}
{
@@ -85,8 +76,8 @@
fetch = {
type = "git";
url = "https://github.com/fortytw2/leaktest";
- rev = "7dad53304f9614c1c365755c1176a8e876fee3e8";
- sha256 = "1f2pmzs0dgayg0q672cpzxqa1ls48aha262qxlglihdvami53b2m";
+ rev = "3b724c3d7b8729a35bf4e577f71653aec6e53513";
+ sha256 = "0dmf7dp6b86nbfaq0s1mpjzd8q7jwrxvyxc0r6dhx3qx4dhddwpz";
};
}
{
@@ -103,8 +94,8 @@
fetch = {
type = "git";
url = "https://github.com/gorilla/websocket";
- rev = "a91eba7f97777409bc2c443f5534d41dd20c5720";
- sha256 = "13cg6wwkk2ddqbm0nh9fpx4mq7f6qym12ch4lvs53n028ycdgw87";
+ rev = "a69d9f6de432e2c6b296a947d8a5ee88f68522cf";
+ sha256 = "01y3ni7xzazsdzq2xqyjr69q9m4w1668zkrcbf58yp3q99jvckhi";
};
}
{
@@ -112,8 +103,8 @@
fetch = {
type = "git";
url = "https://github.com/hashicorp/go-immutable-radix";
- rev = "30664b879c9a771d8d50b137ab80ee0748cb2fcc";
- sha256 = "0v9k0l7w2zmczcqmhrmpb9hvc63xm9ppbb8fj87yvl0hvrb92mgb";
+ rev = "8aac2701530899b64bdea735a1de8da899815220";
+ sha256 = "032w4pk4gd5lwwgnvhh52xnrgyp7lgmlxsfs47gnxkgkya1x7lw6";
};
}
{
@@ -143,6 +134,15 @@
sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152";
};
}
+ {
+ goPackagePath = "github.com/jdkato/prose";
+ fetch = {
+ type = "git";
+ url = "https://github.com/jdkato/prose";
+ rev = "c24611cae00c16858e611ef77226dd2f7502759f";
+ sha256 = "0xdrjwbcnwiwbqyrxfknb9bskrsrbnqp0nza44bycwaj23by9bs1";
+ };
+ }
{
goPackagePath = "github.com/kardianos/osext";
fetch = {
@@ -152,15 +152,6 @@
sha256 = "056dkgxrqjj5r18bnc3knlpgdz5p3yvp12y4y978hnsfhwaqvbjz";
};
}
- {
- goPackagePath = "github.com/kr/fs";
- fetch = {
- type = "git";
- url = "https://github.com/kr/fs";
- rev = "2788f0dbd16903de03cb8186e5c7d97b69ad387b";
- sha256 = "1c0fipl4rsh0v5liq1ska1dl83v3llab4k6lm8mvrx9c4dyp71ly";
- };
- }
{
goPackagePath = "github.com/kyokomi/emoji";
fetch = {
@@ -175,8 +166,17 @@
fetch = {
type = "git";
url = "https://github.com/magiconair/properties";
- rev = "51463bfca2576e06c62a8504b5c0f06d61312647";
- sha256 = "0d7hr78y8gg2mrm5z4jjgm2w3awkznz383b7wvyzk3l33jw6i288";
+ rev = "be5ece7dd465ab0765a9682137865547526d1dfb";
+ sha256 = "0spk58x9b0hj29cw6wy6rlvc6s9xk4r0gmlxgsc194pkzqcg1my8";
+ };
+ }
+ {
+ goPackagePath = "github.com/markbates/inflect";
+ fetch = {
+ type = "git";
+ url = "https://github.com/markbates/inflect";
+ rev = "6cacb66d100482ef7cc366289ccb156020e57e76";
+ sha256 = "1cglvw75qagnz6bnaxpkfyq9j4j0vw377a8ywa9i1vskxlssj1b2";
};
}
{
@@ -184,8 +184,8 @@
fetch = {
type = "git";
url = "https://github.com/miekg/mmark";
- rev = "f809cc9d384e2f7f3985a28a899237b892f35719";
- sha256 = "0fyw2dkv9bk1fx10a23n8qvcgsr0pjk7p379k8nafx8sjmz3pdbd";
+ rev = "fd2f6c1403b37925bd7fe13af05853b8ae58ee5f";
+ sha256 = "0q2zrwa2vwk7a0zhmi000zpqrc01zssrj9c5n3573rg68fksg77m";
};
}
{
@@ -220,26 +220,8 @@
fetch = {
type = "git";
url = "https://github.com/pelletier/go-toml";
- rev = "fe7536c3dee2596cdd23ee9976a17c22bdaae286";
- sha256 = "0h5ri6sj755v1vrgcb7wdp6c15vdgq8wydpzgphggz4pl535b0h6";
- };
- }
- {
- goPackagePath = "github.com/pkg/errors";
- fetch = {
- type = "git";
- url = "https://github.com/pkg/errors";
- rev = "c605e284fe17294bda444b34710735b29d1a9d90";
- sha256 = "1izjk4msnc6wn1mclg0ypa6i31zfwb1r3032k8q4jfbd57hp0bz6";
- };
- }
- {
- goPackagePath = "github.com/pkg/sftp";
- fetch = {
- type = "git";
- url = "https://github.com/pkg/sftp";
- rev = "a5f8514e29e90a859e93871b1582e5c81f466f82";
- sha256 = "0fis12k0h4jyyrpm13mhr5vvyqrgmnc06p4dwgzbfk6h6aq3qzcd";
+ rev = "69d355db5304c0f7f809a2edc054553e7142f016";
+ sha256 = "1ay861x1bqcs629rqb3nq4f347y80phmgm8w7w8kjfdlgpy1v9dm";
};
}
{
@@ -247,8 +229,8 @@
fetch = {
type = "git";
url = "https://github.com/russross/blackfriday";
- rev = "067529f716f4c3f5e37c8c95ddd59df1007290ae";
- sha256 = "1l61ib6r6mg587p58li5zhafjkkmrzacachcjg1cvw0k4zza9137";
+ rev = "4048872b16cc0fc2c5fd9eacf0ed2c2fedaa0c8c";
+ sha256 = "17zg26ia43c8axrxp5q2bxh1asiqfhin4ah7h5d8ibil6pv7xbx4";
};
}
{
@@ -283,8 +265,8 @@
fetch = {
type = "git";
url = "https://github.com/spf13/cobra";
- rev = "b4dbd37a01839e0653eec12aa4bbb2a2ce7b2a37";
- sha256 = "1bgdjikafz58403qpdrqhmi3p99gc5gipibmhfw0hj2xzijb01kx";
+ rev = "34594c771f2c18301dc152640ad40ece28795373";
+ sha256 = "0cgyba80gbw4vq2zp1chjz5zil3rapv65y7883f7va2ygcy57s38";
};
}
{
@@ -328,8 +310,8 @@
fetch = {
type = "git";
url = "https://github.com/spf13/viper";
- rev = "c1de95864d73a5465492829d7cb2dd422b19ac96";
- sha256 = "0fvx40qhzzfw5nq4hl3sxqik6qdd8l9jcmzm6f9r9p605n2dakqm";
+ rev = "25b30aa063fc18e48662b86996252eabdcf2f0c7";
+ sha256 = "1a1xxsn39sgiyhz3pd9v5qhi7d5p4z4cml0mcdgm65n3f8vgkdv3";
};
}
{
@@ -337,8 +319,8 @@
fetch = {
type = "git";
url = "https://github.com/stretchr/testify";
- rev = "f6abca593680b2315d2075e0f5e2a9751e3f431a";
- sha256 = "0n2vidr9zyf6k296grnc6d3rk9hd6qw7mwvnfixlxm8g5y46rzl9";
+ rev = "05e8a0eda380579888eb53c394909df027f06991";
+ sha256 = "03l83nrgpbyc2hxxfi928gayj16fsclbr88dja6r9kikq19a6yhv";
};
}
{
@@ -350,15 +332,6 @@
sha256 = "1kbvbc56grrpnl65grygd23gyn3nkkhxdg8awhzkjmd0cvki8w1f";
};
}
- {
- goPackagePath = "golang.org/x/crypto";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/crypto";
- rev = "850760c427c516be930bc91280636328f1a62286";
- sha256 = "0kyf8km2pz259jmfqk5xcd7gnj9l98kjz12zrvq26n1c4043bmkz";
- };
- }
{
goPackagePath = "golang.org/x/image";
fetch = {
@@ -373,8 +346,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
- rev = "ddf80d0970594e2e4cccf5a98861cad3d9eaa4cd";
- sha256 = "1ipggkh5rwqcmb8zwf2i7dbnyz6r205c5glkg2cpw4hykr5w0id8";
+ rev = "f5079bd7f6f74e23c4d65efa0f4ce14cbd6a3c0f";
+ sha256 = "0sck2mq4bwyh5iv51jpbywzwhc47ci1q5yd7pqr68xnsz7b3b55k";
};
}
{
@@ -382,8 +355,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
- rev = "fb4cac33e3196ff7f507ab9b2d2a44b0142f5b5a";
- sha256 = "1y5lx3f7rawfxrqg0s2ndgbjjjaml3rn3f27h9w9c5mw3xk7lrgj";
+ rev = "35ef4487ce0a1ea5d4b616ffe71e34febe723695";
+ sha256 = "1gxxj4vcsds5aiphv39d3x5jgyfscwxylf10hxgsmzs5m7jzr47n";
};
}
{
@@ -391,8 +364,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/text";
- rev = "9e2f80a6ba7ed4ba13e0cd4b1f094bf916875735";
- sha256 = "02nahm6a4s3f1p76qdcgcwczp8662bqpii0r67p9cm9gp8x1lxqh";
+ rev = "836efe42bb4aa16aaa17b9c155d8813d336ed720";
+ sha256 = "11s7bjk0karl1lx8v4n6dvdnsh702x4f2qlmnqac2qdz8hdswmi1";
};
}
{
@@ -400,8 +373,8 @@
fetch = {
type = "git";
url = "https://gopkg.in/yaml.v2";
- rev = "cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b";
- sha256 = "1hj2ag9knxflpjibck0n90jrhsrqz7qvad4qnif7jddyapi9bqzl";
+ rev = "25c4ec802a7d637f88d584ab26798e94ad14c13b";
+ sha256 = "053mknsl3xhjscmd552005xnwbfcg0z2iphvbvj3wi0w3pvmlw44";
};
}
]
diff --git a/pkgs/applications/misc/hyper/default.nix b/pkgs/applications/misc/hyper/default.nix
index 2202dd8c4c4..3c9eeac891d 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.3";
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 = "0f0qxhvwwcpsjnv1rgmdzdl5jwfprnd7fjnd6sb8liq250pij3ld";
};
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 bce5b6cf589..6e4fc206588 100644
--- a/pkgs/applications/misc/ikiwiki/default.nix
+++ b/pkgs/applications/misc/ikiwiki/default.nix
@@ -82,10 +82,10 @@ stdenv.mkDerivation {
meta = {
description = "Wiki compiler, storing pages and history in a RCS";
- homepage = "http://ikiwiki.info/";
+ 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/jbidwatcher/default.nix b/pkgs/applications/misc/jbidwatcher/default.nix
index d26ad94648a..ed8573b8850 100644
--- a/pkgs/applications/misc/jbidwatcher/default.nix
+++ b/pkgs/applications/misc/jbidwatcher/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "jbidwatcher";
- version = "2.5.2";
+ version = "2.5.6";
name = "${pname}-${version}";
src = fetchurl {
url = "http://www.jbidwatcher.com/download/JBidwatcher-${version}.jar";
- sha256 = "07w75ryn8inm5i1829gabr8lifbycz40ynzsyaw22yzqk5if1n9l";
+ sha256 = "1cw59wh72w1zzibs8x64dma3jc4hry64wjksqs52nc3vpnf0fzfr";
};
buildInputs = [ java ];
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
'';
meta = {
- homepage = "http://www.jbidwatcher.com/";
+ homepage = http://www.jbidwatcher.com/;
description = "Monitor and snipe Ebay auctions";
license = "LGPL";
diff --git a/pkgs/applications/misc/jigdo/default.nix b/pkgs/applications/misc/jigdo/default.nix
index 8e5c5d6206c..d8b1253ac27 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 00000000000..17b1749fcf7
--- /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 b53a49d584d..8952b7edba4 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 = "12275";
+ version = "12712";
src = fetchurl {
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
- sha256 = "14y8ga1g3s9234zcgan16sw6va19jlwhfq39z0ayqmzna0fxi88a";
+ sha256 = "0lpz4yzkvjpn5g36nibrkh773jnlkiqj6lghsx69i86h0xfb7gqf";
};
- 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
++ -lopenjp2 -ljbig2dec -ljpeg -lfreetype -lharfbuzz
+ )
+ endif(MUPDF_FOUND)
+@@ -91,9 +96,25 @@ if(DJVU_FOUND)
+ set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${DJVU_LDFLAGS})
+ endif(DJVU_FOUND)
+-# 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)
--void sort(float *x,int n)
-+void willus_sort(float *x,int n)
+ # ---- Describe project
- {
- 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
+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 5cb6e0fe317..4827daa1a90 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/k3b/wrapper.nix b/pkgs/applications/misc/k3b/wrapper.nix
deleted file mode 100644
index 486d3fb7ddf..00000000000
--- a/pkgs/applications/misc/k3b/wrapper.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ lib, symlinkJoin, k3b-original, cdrtools, makeWrapper }:
-
-let
- binPath = lib.makeBinPath [ cdrtools ];
-in symlinkJoin {
- name = "k3b-${k3b-original.version}";
-
- paths = [ k3b-original ];
- buildInputs = [ makeWrapper ];
-
- postBuild = ''
- wrapProgram $out/bin/k3b \
- --prefix PATH ':' ${binPath}
- '';
-}
diff --git a/pkgs/applications/misc/kanboard/default.nix b/pkgs/applications/misc/kanboard/default.nix
index 2a4793bfe09..b37d12c362f 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.44";
+ version = "1.0.46";
src = fetchzip {
url = "https://kanboard.net/${name}.zip";
- sha256 = "1cwk9gcwddwbbw6hz2iqmkmy90rwddy79b9vi6fj9cl03zswypgn";
+ sha256 = "00fzzijibj7x8pz8xwc601fcrzvdwz5fv45f2zzmbygl86khp82a";
};
dontBuild = true;
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Kanban project management software";
- homepage = "https://kanboard.net";
+ homepage = https://kanboard.net;
license = licenses.mit;
maintainers = with maintainers; [ fpletz ];
};
diff --git a/pkgs/applications/misc/keepassx/2.0.nix b/pkgs/applications/misc/keepassx/2.0.nix
index 030b1d326e1..f6814119b5a 100644
--- a/pkgs/applications/misc/keepassx/2.0.nix
+++ b/pkgs/applications/misc/keepassx/2.0.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Qt password manager compatible with its Win32 and Pocket PC versions";
- homepage = http://www.keepassx.org/;
+ homepage = https://www.keepassx.org/;
license = stdenv.lib.licenses.gpl2;
maintainers = with stdenv.lib.maintainers; [ qknight jgeerds ];
platforms = with stdenv.lib.platforms; linux;
diff --git a/pkgs/applications/misc/keepassx/default.nix b/pkgs/applications/misc/keepassx/default.nix
index d0bddbc1610..ed706b138cc 100644
--- a/pkgs/applications/misc/keepassx/default.nix
+++ b/pkgs/applications/misc/keepassx/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Qt password manager compatible with its Win32 and Pocket PC versions";
- homepage = http://www.keepassx.org/;
+ homepage = https://www.keepassx.org/;
license = stdenv.lib.licenses.gpl2;
maintainers = with stdenv.lib.maintainers; [ qknight jgeerds ];
platforms = with stdenv.lib.platforms; linux;
diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix
index 98dbb0cbf91..1334f2317b9 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.7";
- src = fetchurl {
- url = "mirror://pypi/k/khal/khal-${version}.tar.gz";
- sha256 = "0fvv0kjym9q8v20zbpr5m8ig65b8hva4p0c935qsdvgdni68jidr";
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0x1p62ff7ggb172rjr6sbdrjh1gl3ck3bwxsqlsix8i5wycwvnmv";
};
LC_ALL = "en_US.UTF-8";
diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix
index b0590fdc38f..c5b75a0be55 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}";
@@ -67,8 +63,8 @@ stdenv.mkDerivation rec {
};
buildInputs = [
- zip pkgconfig python zlib xapian_ which icu libmicrohttpd
- lzma zimlib_ ctpp2_ aria2 wget bc libuuid makeWrapper pugixml
+ zip pkgconfig 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 00000000000..f3bb825cbf7
--- /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 1b2cf94d173..2695ac1ef7d 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 b537c378a71..b78a226b614 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,12 +16,19 @@ 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";
+ })
+ ];
+
buildInputs = [
pkgconfig
cmake boost
@@ -37,7 +44,7 @@ stdenv.mkDerivation rec {
It allows you to focus on specific skills and exercises, on both theory and aural training.
The different activities can be customized to meet your needs
'';
- homepage = "http://www.lenmus.org/";
+ homepage = http://www.lenmus.org/;
license = licenses.gpl3Plus;
maintainers = with maintainers; [ ramkromberg ];
platforms = with platforms; linux;
diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix
index 0d5ee979087..964617e20f1 100644
--- a/pkgs/applications/misc/lyx/default.nix
+++ b/pkgs/applications/misc/lyx/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "WYSIWYM frontend for LaTeX, DocBook";
- homepage = "http://www.lyx.org";
+ homepage = http://www.lyx.org;
license = licenses.gpl2Plus;
maintainers = [ maintainers.vcunat ];
platforms = platforms.linux;
diff --git a/pkgs/applications/misc/mdp/default.nix b/pkgs/applications/misc/mdp/default.nix
index 5206feb215c..f627a3cda22 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/milu/default.nix b/pkgs/applications/misc/milu/default.nix
index b8ccbe77cf5..9f98376a51b 100644
--- a/pkgs/applications/misc/milu/default.nix
+++ b/pkgs/applications/misc/milu/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Higher Order Mutation Testing Tool for C and C++ programs";
- homepage = http://github.com/yuejia/Milu;
+ homepage = https://github.com/yuejia/Milu;
license = stdenv.lib.licenses.bsd2;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.vrthra ];
diff --git a/pkgs/applications/misc/monero/default.nix b/pkgs/applications/misc/monero/default.nix
index 09f343483df..0c83e206bb3 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/moonlight-embedded/default.nix b/pkgs/applications/misc/moonlight-embedded/default.nix
index 391440f8622..c95f935b855 100644
--- a/pkgs/applications/misc/moonlight-embedded/default.nix
+++ b/pkgs/applications/misc/moonlight-embedded/default.nix
@@ -6,16 +6,16 @@
stdenv.mkDerivation rec {
name = "moonlight-embedded-${version}";
- version = "2.2.3";
+ version = "2.4.2";
# fetchgit used to ensure submodules are available
src = fetchgit {
url = "git://github.com/irtimmer/moonlight-embedded";
rev = "refs/tags/v${version}";
- sha256 = "0m1114dsz44rvq402b4v5ib2cwj2vbasir0l8vi0q5iymwmsvxj4";
+ sha256 = "0khdbwfclvpjgyk5ar1fs4j66zsjikaj422wlvrvqhyzi1v5arpr";
};
- outputs = [ "out" "doc" ];
+ outputs = [ "out" "man" ];
nativeBuildInputs = [ cmake perl ];
buildInputs = [
diff --git a/pkgs/applications/misc/mqtt-bench/default.nix b/pkgs/applications/misc/mqtt-bench/default.nix
new file mode 100644
index 00000000000..eea166d8df7
--- /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 00000000000..d93d3c46814
--- /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/multimon-ng/default.nix b/pkgs/applications/misc/multimon-ng/default.nix
index 8e39c258333..24a8b0c46a6 100644
--- a/pkgs/applications/misc/multimon-ng/default.nix
+++ b/pkgs/applications/misc/multimon-ng/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
AFSK2400 AFSK2400_2 AFSK2400_3 HAPN4800 FSK9600 DTMF ZVEI1 ZVEI2
ZVEI3 DZVEI PZVEI EEA EIA CCIR MORSE CW
'';
- homepage = "https://github.com/EliasOenal/multimon-ng";
+ homepage = https://github.com/EliasOenal/multimon-ng;
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ the-kenny ];
diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix
index a3e5f99eef6..da5f3c3bf12 100644
--- a/pkgs/applications/misc/mupdf/default.nix
+++ b/pkgs/applications/misc/mupdf/default.nix
@@ -29,11 +29,11 @@ stdenv.mkDerivation rec {
makeFlags = [ "prefix=$(out)" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ zlib libX11 libXcursor libXext harfbuzz mesa libXrandr libXinerama freetype libjpeg jbig2dec openjpeg ];
- outputs = [ "bin" "dev" "out" "doc" ];
+ outputs = [ "bin" "dev" "out" "man" "doc" ];
preConfigure = ''
# Don't remove mujs because upstream version is incompatible
- rm -rf thirdparty/{curl,freetype,glfw,harfbuzz,jbig2dec,jpeg,openjpeg,zlib}
+ rm -rf thirdparty/{curl,freetype,glfw,harfbuzz,jbig2dec,libjpeg,openjpeg,zlib}
'';
postInstall = ''
diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix
index b9fcd1a7f15..9ab12367903 100644
--- a/pkgs/applications/misc/mysql-workbench/default.nix
+++ b/pkgs/applications/misc/mysql-workbench/default.nix
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
sha256 = "1bxd828nrawmym6d8awh1vrni8dsbwh1k5am1lrq5ihp5c3kw9ka";
};
- buildInputs = [ cmake pkgconfig glibc gnome_keyring gtk gtk.dev gtkmm pcre swig python sudo
+ buildInputs = [ cmake pkgconfig gnome_keyring gtk gtk.dev gtkmm pcre swig python sudo
paramiko mysql libxml2 libctemplate libmysqlconnectorcpp vsqlite tinyxml gdal libiodbc file
libpthreadstubs libXdmcp libuuid libzip libgnome_keyring libgnome_keyring.dev jre autoconf
automake libtool boost glibmm glibmm.dev libsigcxx pangomm libX11 pexpect pycrypto openssl
diff --git a/pkgs/applications/misc/netsurf/browser/default.nix b/pkgs/applications/misc/netsurf/browser/default.nix
index 2acb15b6a0b..55cd17c2c0b 100644
--- a/pkgs/applications/misc/netsurf/browser/default.nix
+++ b/pkgs/applications/misc/netsurf/browser/default.nix
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- homepage = "http://www.netsurf-browser.org/";
+ homepage = http://www.netsurf-browser.org/;
description = "Free opensource web browser";
license = licenses.gpl2;
maintainers = [ maintainers.vrthra ];
diff --git a/pkgs/applications/misc/netsurf/buildsystem/default.nix b/pkgs/applications/misc/netsurf/buildsystem/default.nix
index f64fbe8528b..74e7c694ea4 100644
--- a/pkgs/applications/misc/netsurf/buildsystem/default.nix
+++ b/pkgs/applications/misc/netsurf/buildsystem/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
];
meta = with stdenv.lib; {
- homepage = "http://www.netsurf-browser.org/";
+ homepage = http://www.netsurf-browser.org/;
description = "Build system for netsurf browser";
license = licenses.gpl2;
maintainers = [ maintainers.vrthra ];
diff --git a/pkgs/applications/misc/netsurf/libcss/default.nix b/pkgs/applications/misc/netsurf/libcss/default.nix
index 9db681bf5c1..536dbbe80d3 100644
--- a/pkgs/applications/misc/netsurf/libcss/default.nix
+++ b/pkgs/applications/misc/netsurf/libcss/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
];
meta = with stdenv.lib; {
- homepage = "http://www.netsurf-browser.org/";
+ homepage = http://www.netsurf-browser.org/;
description = "Cascading Style Sheets library for netsurf browser";
license = licenses.gpl2;
maintainers = [ maintainers.vrthra ];
diff --git a/pkgs/applications/misc/netsurf/libdom/default.nix b/pkgs/applications/misc/netsurf/libdom/default.nix
index 9287ee9a084..71445fd17a0 100644
--- a/pkgs/applications/misc/netsurf/libdom/default.nix
+++ b/pkgs/applications/misc/netsurf/libdom/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
];
meta = with stdenv.lib; {
- homepage = "http://www.netsurf-browser.org/";
+ homepage = http://www.netsurf-browser.org/;
description = "Document Object Model library for netsurf browser";
license = licenses.gpl2;
maintainers = [ maintainers.vrthra ];
diff --git a/pkgs/applications/misc/netsurf/libhubbub/default.nix b/pkgs/applications/misc/netsurf/libhubbub/default.nix
index ef319e95089..3e9210589ea 100644
--- a/pkgs/applications/misc/netsurf/libhubbub/default.nix
+++ b/pkgs/applications/misc/netsurf/libhubbub/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
];
meta = with stdenv.lib; {
- homepage = "http://www.netsurf-browser.org/";
+ homepage = http://www.netsurf-browser.org/;
description = "HTML5 parser library for netsurf browser";
license = licenses.gpl2;
maintainers = [ maintainers.vrthra ];
diff --git a/pkgs/applications/misc/netsurf/libnsbmp/default.nix b/pkgs/applications/misc/netsurf/libnsbmp/default.nix
index 44f644e162b..040f1c55883 100644
--- a/pkgs/applications/misc/netsurf/libnsbmp/default.nix
+++ b/pkgs/applications/misc/netsurf/libnsbmp/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
];
meta = with stdenv.lib; {
- homepage = "http://www.netsurf-browser.org/";
+ homepage = http://www.netsurf-browser.org/;
description = "BMP Decoder for netsurf browser";
license = licenses.gpl2;
maintainers = [ maintainers.vrthra ];
diff --git a/pkgs/applications/misc/netsurf/libnsfb/default.nix b/pkgs/applications/misc/netsurf/libnsfb/default.nix
index 234bb43798e..c627a769bbb 100644
--- a/pkgs/applications/misc/netsurf/libnsfb/default.nix
+++ b/pkgs/applications/misc/netsurf/libnsfb/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
];
meta = with stdenv.lib; {
- homepage = "http://www.netsurf-browser.org/";
+ homepage = http://www.netsurf-browser.org/;
description = "CSS parser and selection library for netsurf browser";
license = licenses.gpl2;
maintainers = [ maintainers.vrthra ];
diff --git a/pkgs/applications/misc/netsurf/libnsgif/default.nix b/pkgs/applications/misc/netsurf/libnsgif/default.nix
index 09ec6c6ecc3..a834d77c8eb 100644
--- a/pkgs/applications/misc/netsurf/libnsgif/default.nix
+++ b/pkgs/applications/misc/netsurf/libnsgif/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
];
meta = with stdenv.lib; {
- homepage = "http://www.netsurf-browser.org/";
+ homepage = http://www.netsurf-browser.org/;
description = "GIF Decoder for netsurf browser";
license = licenses.gpl2;
maintainers = [ maintainers.vrthra ];
diff --git a/pkgs/applications/misc/netsurf/libnsutils/default.nix b/pkgs/applications/misc/netsurf/libnsutils/default.nix
index 9d931d6bea2..a18f91ba264 100644
--- a/pkgs/applications/misc/netsurf/libnsutils/default.nix
+++ b/pkgs/applications/misc/netsurf/libnsutils/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
];
meta = with stdenv.lib; {
- homepage = "http://www.netsurf-browser.org/";
+ homepage = http://www.netsurf-browser.org/;
description = "Generalised utility library for netsurf browser";
license = licenses.gpl2;
maintainers = [ maintainers.vrthra ];
diff --git a/pkgs/applications/misc/netsurf/libparserutils/default.nix b/pkgs/applications/misc/netsurf/libparserutils/default.nix
index 275c2cccaef..ed9433b9f57 100644
--- a/pkgs/applications/misc/netsurf/libparserutils/default.nix
+++ b/pkgs/applications/misc/netsurf/libparserutils/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
];
meta = with stdenv.lib; {
- homepage = "http://www.netsurf-browser.org/";
+ homepage = http://www.netsurf-browser.org/;
description = "Parser building library for netsurf browser";
license = licenses.gpl2;
maintainers = [ maintainers.vrthra ];
diff --git a/pkgs/applications/misc/netsurf/libutf8proc/default.nix b/pkgs/applications/misc/netsurf/libutf8proc/default.nix
index b2057e1889f..63052e080a5 100644
--- a/pkgs/applications/misc/netsurf/libutf8proc/default.nix
+++ b/pkgs/applications/misc/netsurf/libutf8proc/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
];
meta = with stdenv.lib; {
- homepage = "http://www.netsurf-browser.org/";
+ homepage = http://www.netsurf-browser.org/;
description = "UTF8 Processing library for netsurf browser";
license = licenses.gpl2;
maintainers = [ maintainers.vrthra ];
diff --git a/pkgs/applications/misc/netsurf/libwapcaplet/default.nix b/pkgs/applications/misc/netsurf/libwapcaplet/default.nix
index edcc45ca0fa..509cbeb4503 100644
--- a/pkgs/applications/misc/netsurf/libwapcaplet/default.nix
+++ b/pkgs/applications/misc/netsurf/libwapcaplet/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
];
meta = with stdenv.lib; {
- homepage = "http://www.netsurf-browser.org/";
+ homepage = http://www.netsurf-browser.org/;
description = "String internment library for netsurf browser";
license = licenses.gpl2;
maintainers = [ maintainers.vrthra ];
diff --git a/pkgs/applications/misc/netsurf/nsgenbind/default.nix b/pkgs/applications/misc/netsurf/nsgenbind/default.nix
index 0985a182520..971e16848ae 100644
--- a/pkgs/applications/misc/netsurf/nsgenbind/default.nix
+++ b/pkgs/applications/misc/netsurf/nsgenbind/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
];
meta = with stdenv.lib; {
- homepage = "http://www.netsurf-browser.org/";
+ homepage = http://www.netsurf-browser.org/;
description = "Generator for JavaScript bindings for netsurf browser";
license = licenses.gpl2;
maintainers = [ maintainers.vrthra ];
diff --git a/pkgs/applications/misc/nix-tour/default.nix b/pkgs/applications/misc/nix-tour/default.nix
index a6bcff06626..04f10de3d27 100644
--- a/pkgs/applications/misc/nix-tour/default.nix
+++ b/pkgs/applications/misc/nix-tour/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "'the tour of nix' from nixcloud.io/tour as offline version";
- homepage = "https://nixcloud.io/tour";
+ homepage = https://nixcloud.io/tour;
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ qknight ];
diff --git a/pkgs/applications/misc/nnn/default.nix b/pkgs/applications/misc/nnn/default.nix
index 1005006c402..dd27409742f 100644
--- a/pkgs/applications/misc/nnn/default.nix
+++ b/pkgs/applications/misc/nnn/default.nix
@@ -4,13 +4,13 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "nnn-${version}";
- version = "1.2";
+ version = "1.3";
src = fetchFromGitHub {
owner = "jarun";
repo = "nnn";
rev = "v${version}";
- sha256 = "1idrwm02218q7qd2pg2m8ld76bg32wbzl8y1h8ch7gzxihgn4559";
+ sha256 = "0w9i9vwyqgsi64b5mk4rhmr5gvnnb24c98321r0j5hb0ghdcp96s";
};
configFile = optionalString (conf!=null) (builtins.toFile "config.def.h" conf);
diff --git a/pkgs/applications/misc/ocropus/default.nix b/pkgs/applications/misc/ocropus/default.nix
index d84671cfa8c..ad3d72e9ef5 100644
--- a/pkgs/applications/misc/ocropus/default.nix
+++ b/pkgs/applications/misc/ocropus/default.nix
@@ -19,11 +19,11 @@ let
in
pythonPackages.buildPythonApplication rec {
name = "ocropus-${version}";
- version = "20150316";
+ version = "20170811";
src = fetchFromGitHub {
- sha256 = "0m5bm2ah3p29c13vp7hz7rm058qnlm840zd8xv20byijhlz0447g";
- rev = "5ba07bb959d605ec15424dd2b8f3d7245820084e";
+ sha256 = "0qx0d8yj0w66qglkrmfavp5dh1sky72njfaqii7bnrpv5n4j3q39";
+ rev = "ae84a8edaf0b76135f749ba66fc30c272d0726d0";
repo = "ocropy";
owner = "tmbdev";
};
@@ -37,7 +37,8 @@ pythonPackages.buildPythonApplication rec {
${concatStrings (map (x: "cp -R ${x.src} models/`basename ${x.name}`;")
models)}
- substituteInPlace ocrolib/{common,default}.py --replace /usr/local $out
+ substituteInPlace ocrolib/common.py --replace /usr/local $out
+ substituteInPlace ocrolib/default.py --replace /usr/local $out
'';
doCheck = false; # fails
diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix
index 45b704a5f47..7c8eab9f11e 100644
--- a/pkgs/applications/misc/octoprint/default.nix
+++ b/pkgs/applications/misc/octoprint/default.nix
@@ -54,13 +54,13 @@ let
in pythonPackages.buildPythonApplication rec {
name = "OctoPrint-${version}";
- version = "1.3.2";
+ version = "1.3.4";
src = fetchFromGitHub {
owner = "foosel";
repo = "OctoPrint";
rev = version;
- sha256 = "0wyrxi754xa111b88fqvaw2s5ib2a925dlrgym5mn93i027m50wk";
+ sha256 = "1hci8cfmbzcghla1vmrcn6zicm8nj50drm7gp2hkr0drglq5fgr2";
};
# We need old Tornado
@@ -69,7 +69,7 @@ in pythonPackages.buildPythonApplication rec {
semantic-version flask_principal werkzeug flaskbabel tornado
psutil pyserial flask_login netaddr markdown sockjs-tornado
pylru pyyaml sarge feedparser netifaces click websocket_client
- scandir chainmap future
+ scandir chainmap future dateutil
];
buildInputs = with pythonPackages; [ nose mock ddt ];
@@ -90,13 +90,14 @@ in pythonPackages.buildPythonApplication rec {
-e 's,werkzeug>=[^"]*,werkzeug,g' \
-e 's,psutil>=[^"]*,psutil,g' \
-e 's,requests>=[^"]*,requests,g' \
+ -e 's,future>=[^"]*,future,g' \
setup.py
'';
checkPhase = "nosetests";
meta = with stdenv.lib; {
- homepage = "http://octoprint.org/";
+ homepage = http://octoprint.org/;
description = "The snappy web interface for your 3D printer";
license = licenses.agpl3;
maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix
index 8bc4a22bc92..c09e8d2f5e6 100644
--- a/pkgs/applications/misc/octoprint/plugins.nix
+++ b/pkgs/applications/misc/octoprint/plugins.nix
@@ -12,22 +12,17 @@ let
m33-fio = buildPlugin rec {
name = "M33-Fio-${version}";
- version = "1.17";
+ version = "1.20";
src = fetchFromGitHub {
owner = "donovan6000";
repo = "M33-Fio";
rev = "V${version}";
- sha256 = "19r860hqax09a79s9bl181ab7jsgx0pa8fvnr62lbgkwhis7m8mh";
+ sha256 = "1ng7lzlkqsjcr1w7wgzwsqkkvcvpajcj2cwqlffh95916sw8n767";
};
patches = [
./m33-fio-one-library.patch
- # Fix incompatibility with new OctoPrint
- (fetchpatch {
- url = "https://github.com/foosel/M33-Fio/commit/bdf2422dee3fb8e53b33f087f734956c3b209d72.patch";
- sha256 = "0jm415sx6d3m0z4gfhbnxlasg08zf3f3mslaj4amn9wbvsik9s5d";
- })
];
postPatch = ''
@@ -39,7 +34,7 @@ let
'';
meta = with stdenv.lib; {
- homepage = "https://github.com/donovan6000/M33-Fio";
+ homepage = https://github.com/donovan6000/M33-Fio;
description = "OctoPrint plugin for the Micro 3D printer";
platforms = platforms.all;
license = licenses.gpl3;
@@ -59,7 +54,7 @@ let
};
meta = with stdenv.lib; {
- homepage = "https://github.com/MoonshineSG/OctoPrint-TitleStatus";
+ homepage = https://github.com/MoonshineSG/OctoPrint-TitleStatus;
description = "Show printers status in window title";
platforms = platforms.all;
license = licenses.agpl3;
@@ -69,17 +64,17 @@ let
stlviewer = buildPlugin rec {
name = "OctoPrint-STLViewer-${version}";
- version = "0.3.0";
+ version = "0.4.1";
src = fetchFromGitHub {
owner = "jneilliii";
repo = "OctoPrint-STLViewer";
rev = "v${version}";
- sha256 = "1a6sa8pw9ay7x27pfwr3nzb22x3jaw0c9vwyz4mrj76zkiw6svfi";
+ sha256 = "1f64s37g2d79g76v0vjnjrc2jp2gwrsnfgx7w3n0hkf1lz1pjkm0";
};
meta = with stdenv.lib; {
- homepage = "https://github.com/jneilliii/Octoprint-STLViewer";
+ homepage = https://github.com/jneilliii/Octoprint-STLViewer;
description = "A simple stl viewer tab for OctoPrint";
platforms = platforms.all;
license = licenses.agpl3;
diff --git a/pkgs/applications/misc/ola/default.nix b/pkgs/applications/misc/ola/default.nix
new file mode 100644
index 00000000000..9db6042e60f
--- /dev/null
+++ b/pkgs/applications/misc/ola/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, bison, flex, pkgconfig
+, libuuid, cppunit, protobuf3_1, zlib, avahi, libmicrohttpd
+, perl, python3, python3Packages
+}:
+
+stdenv.mkDerivation rec {
+ name = "ola-${version}";
+ version = "0.10.5";
+
+ src = fetchFromGitHub {
+ owner = "OpenLightingProject";
+ repo = "ola";
+ rev = version;
+ sha256 = "1296iiq8fxbvv8sghpj3nambfmixps48dd77af0gpwf7hmjjm8al";
+ };
+
+ nativeBuildInputs = [ autoreconfHook bison flex pkgconfig perl ];
+ buildInputs = [ libuuid cppunit protobuf3_1 zlib avahi libmicrohttpd python3 ];
+ propagatedBuildInputs = [ python3Packages.protobuf3_1 python3Packages.numpy ];
+
+ configureFlags = [ "--enable-python-libs" ];
+
+ meta = with stdenv.lib; {
+ description = "A framework for controlling entertainment lighting equipment.";
+ maintainers = [ maintainers.globin ];
+ licenses = with licenses; [ lgpl21 gpl2Plus ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/applications/misc/openbox-menu/default.nix b/pkgs/applications/misc/openbox-menu/default.nix
index 1985b644884..000af950bf1 100644
--- a/pkgs/applications/misc/openbox-menu/default.nix
+++ b/pkgs/applications/misc/openbox-menu/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
installPhase = "make install prefix=$out";
meta = {
- homepage = "http://fabrice.thiroux.free.fr/openbox-menu_en.html";
+ homepage = http://fabrice.thiroux.free.fr/openbox-menu_en.html;
description = "Dynamic XDG menu generator for Openbox";
longDescription = ''
Openbox-menu is a pipemenu for Openbox window manager. It provides a
diff --git a/pkgs/applications/misc/openbrf/default.nix b/pkgs/applications/misc/openbrf/default.nix
index 5016acfff12..4aebd3bb2a9 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"
'';
@@ -38,7 +39,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
description = "A tool to edit resource files (BRF)";
- homepage = "https://github.com/cfcohen/openbrf";
+ homepage = https://github.com/cfcohen/openbrf;
maintainers = with stdenv.lib.maintainers; [ abbradar ];
license = licenses.free;
platforms = platforms.linux;
diff --git a/pkgs/applications/misc/opencpn/default.nix b/pkgs/applications/misc/opencpn/default.nix
index 696232c9f8d..056649ad3d2 100644
--- a/pkgs/applications/misc/opencpn/default.nix
+++ b/pkgs/applications/misc/opencpn/default.nix
@@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
maintainers = [ stdenv.lib.maintainers.kragniz ];
platforms = stdenv.lib.platforms.all;
license = stdenv.lib.licenses.gpl2;
- homepage = "http://opencpn.org/";
+ homepage = https://opencpn.org/;
};
}
diff --git a/pkgs/applications/misc/pcmanfm/default.nix b/pkgs/applications/misc/pcmanfm/default.nix
index aceeae87d08..148dd427fbc 100644
--- a/pkgs/applications/misc/pcmanfm/default.nix
+++ b/pkgs/applications/misc/pcmanfm/default.nix
@@ -1,5 +1,11 @@
-{ stdenv, fetchurl, glib, gtk2, intltool, libfm, libX11, pango, pkgconfig }:
+{ stdenv, fetchurl, glib, intltool, libfm, libX11, pango, pkgconfig
+, wrapGAppsHook, gnome3, withGtk3 ? true, gtk2, gtk3 }:
+let
+ libfm' = libfm.override { inherit withGtk3; };
+ gtk = if withGtk3 then gtk3 else gtk2;
+ inherit (stdenv.lib) optional;
+in
stdenv.mkDerivation rec {
name = "pcmanfm-1.2.5";
src = fetchurl {
@@ -7,10 +13,13 @@ stdenv.mkDerivation rec {
sha256 = "0rxdh0dfzc84l85c54blq42gczygq8adhr3l9hqzy1dp530cm1hc";
};
- buildInputs = [ glib gtk2 intltool libfm libX11 pango pkgconfig ];
+ buildInputs = [ glib gtk libfm' libX11 pango gnome3.defaultIconTheme ];
+ nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool ];
+
+ configureFlags = optional withGtk3 "--with-gtk=3";
meta = with stdenv.lib; {
- homepage = "http://blog.lxde.org/?cat=28/";
+ homepage = http://blog.lxde.org/?cat=28/;
license = licenses.gpl2Plus;
description = "File manager with GTK+ interface";
maintainers = [ maintainers.ttuegel ];
diff --git a/pkgs/applications/misc/pcmanx-gtk2/default.nix b/pkgs/applications/misc/pcmanx-gtk2/default.nix
index 87c4df3446e..65366607c50 100644
--- a/pkgs/applications/misc/pcmanx-gtk2/default.nix
+++ b/pkgs/applications/misc/pcmanx-gtk2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gtk2, libXft, intltool, automake115x, autoconf, libtool, pkgconfig }:
+{ stdenv, fetchurl, gtk2, libXft, intltool, automake, autoconf, libtool, pkgconfig }:
stdenv.mkDerivation {
name = "pcmanx-gtk2-1.3";
@@ -7,14 +7,14 @@ stdenv.mkDerivation {
sha256 = "2e5c59f6b568036f2ad6ac67ca2a41dfeeafa185451e507f9fb987d4ed9c4302";
};
- buildInputs = [ gtk2 libXft intltool automake115x autoconf libtool pkgconfig ];
+ buildInputs = [ gtk2 libXft intltool automake autoconf libtool pkgconfig ];
preConfigure = ''
./autogen.sh
'';
meta = with stdenv.lib; {
- homepage = "http://pcman.ptt.cc";
+ homepage = http://pcman.ptt.cc;
license = licenses.gpl2;
description = "Telnet BBS browser with GTK+ interface";
maintainers = [ maintainers.mingchuan ];
diff --git a/pkgs/applications/misc/pdfmod/default.nix b/pkgs/applications/misc/pdfmod/default.nix
index 919935a41ee..ba4a57a191c 100644
--- a/pkgs/applications/misc/pdfmod/default.nix
+++ b/pkgs/applications/misc/pdfmod/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
dontStrip = true;
meta = with stdenv.lib; {
- homepage = "https://wiki.gnome.org/Apps/PdfMod";
+ homepage = https://wiki.gnome.org/Apps/PdfMod;
description = "A simple application for modifying PDF documents";
platforms = platforms.all;
maintainers = with maintainers; [ obadz ];
diff --git a/pkgs/applications/misc/pgadmin/default.nix b/pkgs/applications/misc/pgadmin/default.nix
index 968071e454e..15313befb62 100644
--- a/pkgs/applications/misc/pgadmin/default.nix
+++ b/pkgs/applications/misc/pgadmin/default.nix
@@ -22,9 +22,9 @@ stdenv.mkDerivation rec {
"--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/pitz/default.nix b/pkgs/applications/misc/pitz/default.nix
deleted file mode 100644
index dcb36082231..00000000000
--- 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/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix
index 026a1289fb6..e88a4974074 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/postage/default.nix b/pkgs/applications/misc/postage/default.nix
new file mode 100644
index 00000000000..eeb879ee6e4
--- /dev/null
+++ b/pkgs/applications/misc/postage/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, runCommand, postgresql, openssl } :
+
+stdenv.mkDerivation rec {
+ name = "postage-${version}";
+ version = "3.2.18";
+
+ src = fetchFromGitHub {
+ owner = "workflowproducts";
+ repo = "postage";
+ rev = "eV${version}";
+ sha256 = "1kdg8pw2vxwkxw3b6dim4s740s60j3iyrh96524wi3lqkkq98krn";
+ };
+
+ buildInputs = [ postgresql openssl ];
+
+ meta = with stdenv.lib; {
+ description = "A fast replacement for PGAdmin";
+ longDescription = ''
+ At the heart of Postage is a modern, fast, event-based C-binary, built in
+ 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;
+ maintainers = [ maintainers.basvandijk ];
+ };
+}
diff --git a/pkgs/applications/misc/posterazor/default.nix b/pkgs/applications/misc/posterazor/default.nix
index b6d46cf9ed1..0cd0d29e2f3 100644
--- a/pkgs/applications/misc/posterazor/default.nix
+++ b/pkgs/applications/misc/posterazor/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
'';
meta = {
- homepage = "http://posterazor.sourceforge.net/";
+ homepage = http://posterazor.sourceforge.net/;
description = "Cuts a raster image into pieces which can afterwards be printed out and assembled to a poster";
maintainers = [ stdenv.lib.maintainers.madjar ];
platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/applications/misc/qdirstat/default.nix b/pkgs/applications/misc/qdirstat/default.nix
new file mode 100644
index 00000000000..cbbac11424e
--- /dev/null
+++ b/pkgs/applications/misc/qdirstat/default.nix
@@ -0,0 +1,61 @@
+{ stdenv, fetchFromGitHub, qmake
+, coreutils, xdg_utils, bash
+, perl, makeWrapper, perlPackages }:
+
+let
+ version = "1.4";
+in stdenv.mkDerivation rec {
+ name = "qdirstat-${version}";
+
+ src = fetchFromGitHub {
+ owner = "shundhammer";
+ repo = "qdirstat";
+ rev = "${version}";
+ sha256 = "1ppasbr0mq301q6n3rm0bsmprs7vgkcjmmc0gbgqpgw84nmp9fqh";
+ };
+
+ nativeBuildInputs = [ qmake makeWrapper ];
+
+ buildInputs = [ perl ];
+
+ preBuild = ''
+ substituteInPlace scripts/scripts.pro \
+ --replace /bin/true ${coreutils}/bin/true \
+ --replace /usr/bin $out/bin
+ substituteInPlace src/src.pro \
+ --replace /usr/bin $out/bin \
+ --replace /usr/share $out/share
+ for i in doc/doc.pro doc/stats/stats.pro
+ do
+ substituteInPlace $i \
+ --replace /usr/share $out/share
+ done
+
+ for i in src/MainWindow.cpp src/FileSizeStatsWindow.cpp
+ do
+ substituteInPlace $i \
+ --replace /usr/bin/xdg-open ${xdg_utils}/bin/xdg-open
+ done
+ for i in src/Cleanup.cpp src/cleanup-config-page.ui
+ do
+ substituteInPlace $i \
+ --replace /bin/bash ${bash}/bin/bash \
+ --replace /bin/sh ${bash}/bin/sh
+ done
+ substituteInPlace src/StdCleanup.cpp \
+ --replace /bin/bash ${bash}/bin/bash
+ '';
+
+ postInstall = ''
+ wrapProgram $out/bin/qdirstat-cache-writer \
+ --set PERL5LIB "${stdenv.lib.makePerlPath [ perlPackages.URI ]}"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Graphical disk usage analyzer";
+ homepage = src.meta.homepage;
+ license = licenses.gpl2;
+ maintainers = with maintainers; [ gnidorah ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/applications/misc/qlcplus/default.nix b/pkgs/applications/misc/qlcplus/default.nix
new file mode 100644
index 00000000000..60a8cf2c6cd
--- /dev/null
+++ b/pkgs/applications/misc/qlcplus/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, mkDerivation, fetchFromGitHub, qmake, pkgconfig, udev
+, qtmultimedia, qtscript, alsaLib, ola, libftdi1, libusb
+, libsndfile, libmad
+}:
+
+mkDerivation rec {
+ name = "qlcplus-${version}";
+ version = "4.11.0";
+
+ src = fetchFromGitHub {
+ owner = "mcallegari";
+ repo = "qlcplus";
+ rev = "QLC+_${version}";
+ sha256 = "0a45ww341yjx9k54j5s8b5wj83rgbwxkdvgy0v5jbbdf9m78ifrg";
+ };
+
+ nativeBuildInputs = [ qmake pkgconfig ];
+ buildInputs = [
+ udev qtmultimedia qtscript alsaLib ola libftdi1 libusb libsndfile libmad
+ ];
+
+ qmakeFlags = [ "INSTALLROOT=$(out)" ];
+
+ postPatch = ''
+ patchShebangs .
+ sed -i -e '/unix:!macx:INSTALLROOT += \/usr/d' \
+ -e "s@\$\$LIBSDIR/qt4/plugins@''${qtPluginPrefix}@" \
+ -e "s@/etc/udev/rules.d@''${out}/lib/udev@" \
+ variables.pri
+ '';
+
+ meta = with stdenv.lib; {
+ description = "A free and cross-platform software to control DMX or analog lighting systems like moving heads, dimmers, scanners etc.";
+ maintainers = [ maintainers.globin ];
+ license = licenses.asl20;
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/applications/misc/qpdfview/default.nix b/pkgs/applications/misc/qpdfview/default.nix
index 1a3f1399fe7..5cbf9411435 100644
--- a/pkgs/applications/misc/qpdfview/default.nix
+++ b/pkgs/applications/misc/qpdfview/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
license = stdenv.lib.licenses.gpl2;
maintainers = [stdenv.lib.maintainers.raskin];
platforms = stdenv.lib.platforms.linux;
- homepage = "https://launchpad.net/qpdfview";
+ homepage = https://launchpad.net/qpdfview;
updateWalker = true;
};
}
diff --git a/pkgs/applications/misc/qsyncthingtray/default.nix b/pkgs/applications/misc/qsyncthingtray/default.nix
index e8ab85121da..f283c250b5b 100644
--- a/pkgs/applications/misc/qsyncthingtray/default.nix
+++ b/pkgs/applications/misc/qsyncthingtray/default.nix
@@ -49,7 +49,7 @@ mkDerivation rec {
description = "A Traybar Application for Syncthing written in C++";
longDescription = ''
A cross-platform status bar for Syncthing.
- Currently supports OS X, Windows and Linux.
+ Currently supports macOS, Windows and Linux.
Written in C++ with Qt.
'';
license = licenses.lgpl3;
diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix
index f378c352936..f3198085b9a 100644
--- a/pkgs/applications/misc/ranger/default.nix
+++ b/pkgs/applications/misc/ranger/default.nix
@@ -10,7 +10,7 @@ pythonPackages.buildPythonApplication rec {
meta = {
description = "File manager with minimalistic curses interface";
- homepage = "http://ranger.nongnu.org/";
+ homepage = http://ranger.nongnu.org/;
license = stdenv.lib.licenses.gpl3;
platforms = stdenv.lib.platforms.unix;
};
diff --git a/pkgs/applications/misc/redis-desktop-manager/default.nix b/pkgs/applications/misc/redis-desktop-manager/default.nix
index 0ba850a3460..8bbfbaf7cf0 100644
--- a/pkgs/applications/misc/redis-desktop-manager/default.nix
+++ b/pkgs/applications/misc/redis-desktop-manager/default.nix
@@ -72,7 +72,7 @@ EOF
meta = with lib; {
description = "Cross-platform open source Redis DB management tool";
- homepage = "http://redisdesktop.com/";
+ homepage = http://redisdesktop.com/;
license = licenses.lgpl21;
platforms = platforms.linux;
maintainers = with maintainers; [ cstrahan ];
diff --git a/pkgs/applications/misc/redshift-plasma-applet/default.nix b/pkgs/applications/misc/redshift-plasma-applet/default.nix
index 18e49176edc..03b8d709fce 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/robomongo/default.nix b/pkgs/applications/misc/robomongo/default.nix
index 64f4c1aab48..76593eba5fc 100644
--- a/pkgs/applications/misc/robomongo/default.nix
+++ b/pkgs/applications/misc/robomongo/default.nix
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
'';
meta = {
- homepage = "https://robomongo.org/";
+ 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;
diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix
index fbf9a933567..7e16da68f47 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.18.0";
name = "rtv-${version}";
src = fetchFromGitHub {
owner = "michael-lazar";
repo = "rtv";
rev = "v${version}";
- sha256 = "037dhds1prxj7vsq15dr46wk3pfk3ixr0d60m3h796b6nbc1spya";
+ sha256 = "00d2s29sp68hw8ljjmzn5dc5ly2s3c7qf0azwizgd3b40zlfgzcg";
};
+ # Tests try to access network
+ doCheck = false;
+
checkPhase = ''
py.test
'';
diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-autocomplete-all-the-things/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-autocomplete-all-the-things/default.nix
new file mode 100644
index 00000000000..f872e800836
--- /dev/null
+++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-autocomplete-all-the-things/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+ name = "urxvt-autocomplete-all-the-things-${version}";
+ version = "1.6.0";
+
+ src = fetchFromGitHub {
+ owner = "Vifon";
+ repo = "autocomplete-ALL-the-things";
+ rev = version;
+ sha256 = "06xd59c6gd9rglwq4km93n2p078k7v4x300lqrg1f32vvnjvs7sr";
+ };
+
+ installPhase = ''
+ mkdir -p $out/lib/urxvt/perl
+ cp autocomplete-ALL-the-things $out/lib/urxvt/perl
+ '';
+
+ meta = with stdenv.lib; {
+ description = "urxvt plugin allowing user to easily complete arbitrary text";
+ homepage = "https://github.com/Vifon/autocomplete-ALL-the-things";
+ license = licenses.gpl3;
+ maintainers = with maintainers; [ nickhu ];
+ platforms = with platforms; unix;
+ };
+}
+
diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-font-size/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-font-size/default.nix
index f81709b9739..4f4319af6cb 100644
--- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-font-size/default.nix
+++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-font-size/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
description = "Change the urxvt font size on the fly";
- homepage = "https://github.com/majutsushi/urxvt-font-size";
+ homepage = https://github.com/majutsushi/urxvt-font-size;
license = licenses.mit;
maintainers = with maintainers; [ cstrahan ];
platforms = with platforms; unix;
diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perl/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perl/default.nix
index 0c95acd7205..13e005014f1 100644
--- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perl/default.nix
+++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perl/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
description = "Perl extensions for the rxvt-unicode terminal emulator";
- homepage = "https://github.com/effigies/urxvt-perl";
+ homepage = https://github.com/effigies/urxvt-perl;
license = licenses.gpl3;
maintainers = with maintainers; [ cstrahan ];
platforms = with platforms; unix;
diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix
index 82c4f310352..544789e865b 100644
--- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix
+++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Perl extensions for the rxvt-unicode terminal emulator";
- homepage = "https://github.com/muennich/urxvt-perls";
+ homepage = https://github.com/muennich/urxvt-perls;
license = licenses.gpl2;
maintainers = with maintainers; [ abbradar ];
platforms = with platforms; unix;
diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix
index 194bb8397fb..68be8b738de 100644
--- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix
+++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
description = "Tabbed plugin for rxvt-unicode with many enhancements (mina86's fork)";
- homepage = "https://github.com/mina86/urxvt-tabbedex";
+ homepage = https://github.com/mina86/urxvt-tabbedex;
maintainers = with maintainers; [ abbradar ];
platforms = with platforms; unix;
};
diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-theme-switch/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-theme-switch/default.nix
index 8b9ffb2c8c8..f4a41a89e1c 100644
--- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-theme-switch/default.nix
+++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-theme-switch/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "urxvt plugin that allows to switch color themes during runtime";
- homepage = "https://github.com/felixr/urxvt-theme-switch";
+ homepage = https://github.com/felixr/urxvt-theme-switch;
license = "CCBYNC";
maintainers = with maintainers; [ garbas ];
platforms = with platforms; unix;
diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-vtwheel.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-vtwheel.nix
index 000828ddb7f..2f2c2055803 100644
--- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-vtwheel.nix
+++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-vtwheel.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
meta = with stdenv.lib; {
description = "Pass mouse wheel commands to secondary screens (screen, less, nano, etc)";
- homepage = "https://aur.archlinux.org/packages/urxvt-vtwheel";
+ homepage = https://aur.archlinux.org/packages/urxvt-vtwheel;
license = licenses.mit;
maintainers = with maintainers; [ danbst ];
platforms = with platforms; unix;
diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix
index f3939d3b6eb..281f2176833 100644
--- a/pkgs/applications/misc/rxvt_unicode/default.nix
+++ b/pkgs/applications/misc/rxvt_unicode/default.nix
@@ -63,7 +63,7 @@ stdenv.mkDerivation (rec {
meta = with stdenv.lib; {
inherit description;
- homepage = "http://software.schmorp.de/pkg/rxvt-unicode.html";
+ homepage = http://software.schmorp.de/pkg/rxvt-unicode.html;
downloadPage = "http://dist.schmorp.de/rxvt-unicode/Attic/";
maintainers = [ maintainers.mornfall ];
platforms = platforms.unix;
diff --git a/pkgs/applications/misc/sakura/default.nix b/pkgs/applications/misc/sakura/default.nix
index 66e40befe7c..17798bb01e2 100644
--- a/pkgs/applications/misc/sakura/default.nix
+++ b/pkgs/applications/misc/sakura/default.nix
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "sakura-${version}";
- version = "3.3.4";
+ version = "3.4.0";
src = fetchurl {
url = "http://launchpad.net/sakura/trunk/${version}/+download/${name}.tar.bz2";
- sha256 = "1fnkrkzf2ysav1ljgi4y4w8kvbwiwgmg1462xhizlla8jqa749r7";
+ sha256 = "1vj07xnkalb8q6ippf4bmv5cf4266p1j9m80sxb6hncx0h8paj04";
};
nativeBuildInputs = [ cmake perl pkgconfig ];
diff --git a/pkgs/applications/misc/sc-im/default.nix b/pkgs/applications/misc/sc-im/default.nix
index 19fc62d1238..1ed6e4d70c9 100644
--- a/pkgs/applications/misc/sc-im/default.nix
+++ b/pkgs/applications/misc/sc-im/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- homepage = "https://github.com/andmarti1424/sc-im";
+ homepage = https://github.com/andmarti1424/sc-im;
description = "SC-IM - Spreadsheet Calculator Improvised - SC fork";
license = licenses.bsdOriginal;
maintainers = [ maintainers.matthiasbeyer ];
diff --git a/pkgs/applications/misc/sequelpro/default.nix b/pkgs/applications/misc/sequelpro/default.nix
index 4908769bef6..fc63745ebb8 100644
--- a/pkgs/applications/misc/sequelpro/default.nix
+++ b/pkgs/applications/misc/sequelpro/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
'';
meta = {
- description = "MySQL database management for Mac OS X";
+ description = "MySQL database management for macOS";
homepage = http://www.sequelpro.com/;
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.darwin;
diff --git a/pkgs/applications/misc/slade/default.nix b/pkgs/applications/misc/slade/default.nix
index 3bb97463e5d..712b5a7e750 100644
--- a/pkgs/applications/misc/slade/default.nix
+++ b/pkgs/applications/misc/slade/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Doom editor";
- homepage = "http://slade.mancubus.net/";
+ homepage = http://slade.mancubus.net/;
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/applications/misc/slic3r/default.nix b/pkgs/applications/misc/slic3r/default.nix
index 64bcb0e1921..8624cc9dda5 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 00000000000..f382a252f0d
--- /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/st/xst.nix b/pkgs/applications/misc/st/xst.nix
index 5aaf04bbfd8..05e34cc5c30 100644
--- a/pkgs/applications/misc/st/xst.nix
+++ b/pkgs/applications/misc/st/xst.nix
@@ -22,7 +22,7 @@ in stdenv.mkDerivation {
'';
meta = {
- homepage = "https://github.com/neeasade/xst";
+ homepage = https://github.com/neeasade/xst;
description = "Simple terminal fork that can load config from Xresources";
license = licenses.mit;
maintainers = maintainers.vyp;
diff --git a/pkgs/applications/misc/stag/default.nix b/pkgs/applications/misc/stag/default.nix
index 0fe94b07450..ebb50e685da 100644
--- a/pkgs/applications/misc/stag/default.nix
+++ b/pkgs/applications/misc/stag/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
'';
meta = {
- homepage = "https://github.com/seenaburns/stag";
+ homepage = https://github.com/seenaburns/stag;
description = "Terminal streaming bar graph passed through stdin";
license = stdenv.lib.licenses.bsdOriginal;
maintainers = [ stdenv.lib.maintainers.matthiasbeyer ];
diff --git a/pkgs/applications/misc/stog/default.nix b/pkgs/applications/misc/stog/default.nix
index fa160c51fe2..8be792c673c 100644
--- a/pkgs/applications/misc/stog/default.nix
+++ b/pkgs/applications/misc/stog/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "XML documents and web site compiler";
- homepage = "https://zoggy.github.io/stog/";
+ homepage = https://zoggy.github.io/stog/;
license = licenses.lgpl3;
platforms = ocaml.meta.platforms or [];
maintainers = with maintainers; [ regnat ];
diff --git a/pkgs/applications/misc/styx/default.nix b/pkgs/applications/misc/styx/default.nix
index 8e3b0e747ae..2cdf047a10f 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 e0bea3b23b6..00000000000
--- 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/super_user_spark/default.nix b/pkgs/applications/misc/super_user_spark/default.nix
index dd1218282d8..8102375479b 100644
--- a/pkgs/applications/misc/super_user_spark/default.nix
+++ b/pkgs/applications/misc/super_user_spark/default.nix
@@ -27,6 +27,6 @@ mkDerivation {
jailbreak = true;
description = "Configure your dotfile deployment with a DSL";
license = stdenv.lib.licenses.mit;
- homepage = "https://github.com/NorfairKing/super-user-spark";
+ homepage = https://github.com/NorfairKing/super-user-spark;
maintainers = [ stdenv.lib.maintainers.badi ];
}
diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix
index 62e66e4ad38..009eb488d7b 100644
--- a/pkgs/applications/misc/sweethome3d/default.nix
+++ b/pkgs/applications/misc/sweethome3d/default.nix
@@ -61,7 +61,7 @@ let
dontStrip = true;
meta = {
- homepage = "http://www.sweethome3d.com/index.jsp";
+ homepage = http://www.sweethome3d.com/index.jsp;
inherit description;
inherit license;
maintainers = [ stdenv.lib.maintainers.edwtjo ];
diff --git a/pkgs/applications/misc/sweethome3d/editors.nix b/pkgs/applications/misc/sweethome3d/editors.nix
index 7dbf1e8f2a3..37623caa1d4 100644
--- a/pkgs/applications/misc/sweethome3d/editors.nix
+++ b/pkgs/applications/misc/sweethome3d/editors.nix
@@ -50,7 +50,7 @@ let
dontStrip = true;
meta = {
- homepage = "http://www.sweethome3d.com/index.jsp";
+ homepage = http://www.sweethome3d.com/index.jsp;
inherit description;
inherit license;
maintainers = [ stdenv.lib.maintainers.edwtjo ];
diff --git a/pkgs/applications/misc/syncthing-tray/default.nix b/pkgs/applications/misc/syncthing-tray/default.nix
new file mode 100644
index 00000000000..f9d1039a292
--- /dev/null
+++ b/pkgs/applications/misc/syncthing-tray/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, buildGoPackage, pkgconfig, libappindicator-gtk3 }:
+
+buildGoPackage rec {
+ name = "syncthing-tray-${version}";
+ version = "0.7";
+
+ goPackagePath = "github.com/alex2108/syncthing-tray";
+
+ src = fetchFromGitHub {
+ owner = "alex2108";
+ repo = "syncthing-tray";
+ rev = "v${version}";
+ sha256 = "0869kinnsfzb8ydd0sv9fgqsi1sy5rhqg4whfdnrv82xjc71xyw3";
+ };
+
+ goDeps = ./deps.nix;
+
+ buildInputs = [ pkgconfig libappindicator-gtk3 ];
+
+ meta = with stdenv.lib; {
+ description = "Simple application tray for syncthing";
+ homepage = https://github.com/alex2108/syncthing-tray;
+ license = licenses.mit;
+ maintainers = with maintainers; [ nickhu ];
+ platforms = platforms.all;
+ };
+}
diff --git a/pkgs/applications/misc/syncthing-tray/deps.nix b/pkgs/applications/misc/syncthing-tray/deps.nix
new file mode 100644
index 00000000000..1103146ed1b
--- /dev/null
+++ b/pkgs/applications/misc/syncthing-tray/deps.nix
@@ -0,0 +1,93 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+[
+ {
+ goPackagePath = "github.com/alex2108/systray";
+ fetch = {
+ type = "git";
+ url = "https://github.com/alex2108/systray";
+ rev = "40e874866be2dc2c57ab031bcbde27a76b90721a";
+ sha256 = "1bxnb6skb9ss0lwlwswql07ardkhm28nxglvlsxkdlmzv1dcwy1q";
+ };
+ }
+ {
+ goPackagePath = "github.com/getlantern/context";
+ fetch = {
+ type = "git";
+ url = "https://github.com/getlantern/context";
+ rev = "624d99b1798d7c5375ea1d3ca4c5b04d58f7c775";
+ sha256 = "09yf9x6478a5z01hybr98zwa8ax3fx7l6wwsvdkxp3fdg9dqm13b";
+ };
+ }
+ {
+ goPackagePath = "github.com/getlantern/errors";
+ fetch = {
+ type = "git";
+ url = "https://github.com/getlantern/errors";
+ rev = "99fa440517e8f3d1e4cd8d6dbed6b41f4c1ed3d6";
+ sha256 = "08rl32l5ks67hcgjxik62nd5g558mv4101kmz1ak7d3vfgg3m6i3";
+ };
+ }
+ {
+ goPackagePath = "github.com/getlantern/golog";
+ fetch = {
+ type = "git";
+ url = "https://github.com/getlantern/golog";
+ rev = "cca714f7feb5df8e455f409b549d384441ac4578";
+ sha256 = "0gnf30n38zkx356cqc6jdv1kbzy59ddqhqndwrxsm2n2zc3b5p7q";
+ };
+ }
+ {
+ goPackagePath = "github.com/getlantern/hex";
+ fetch = {
+ type = "git";
+ url = "https://github.com/getlantern/hex";
+ rev = "083fba3033ad473db3dd31c9bb368473d37581a7";
+ sha256 = "18q6rypmcqmcwlfzrrdcz08nff0a289saplvd9y3ifnfcqdw3j77";
+ };
+ }
+ {
+ goPackagePath = "github.com/getlantern/hidden";
+ fetch = {
+ type = "git";
+ url = "https://github.com/getlantern/hidden";
+ rev = "d52a649ab33af200943bb599898dbdcfdbc94cb7";
+ sha256 = "0133qmp4sjq8da5di3459vc5g5nqbpqra0f558zd95js3fdmkmsi";
+ };
+ }
+ {
+ goPackagePath = "github.com/getlantern/ops";
+ fetch = {
+ type = "git";
+ url = "https://github.com/getlantern/ops";
+ rev = "b70875f5d689a9438bca72aefd7142a2af889b18";
+ sha256 = "0cfa2bbkykbzbskmgd2an34him72z6f3y88ag1v5ffpb0d6bnar7";
+ };
+ }
+ {
+ goPackagePath = "github.com/getlantern/stack";
+ fetch = {
+ type = "git";
+ url = "https://github.com/getlantern/stack";
+ rev = "02f928aad224fbccd50d66edd776fc9d1e9f2f2b";
+ sha256 = "0ddl5r4iw3c7p4drh4d8phl7d0ssdddsnd3xjm1lzgxylqq6r568";
+ };
+ }
+ {
+ goPackagePath = "github.com/oxtoacart/bpool";
+ fetch = {
+ type = "git";
+ url = "https://github.com/oxtoacart/bpool";
+ rev = "4e1c5567d7c2dd59fa4c7c83d34c2f3528b025d6";
+ sha256 = "01kk6dhkz96yhp3p5v2rjwq8mbrwrdsn6glqw7jp4h7g5za7yi95";
+ };
+ }
+ {
+ goPackagePath = "github.com/toqueteos/webbrowser";
+ fetch = {
+ type = "git";
+ url = "https://github.com/toqueteos/webbrowser";
+ rev = "e2ebfdc6cb1a3fdc4fc4dbd20a0cae0c2e406792";
+ sha256 = "0sgjnxrq0jgipkij8b6xiy4am9bv9zziqxxdhw15rdjc5piyk3a2";
+ };
+ }
+]
diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix
index 9ae6bfae116..3ecc772feaa 100644
--- a/pkgs/applications/misc/synergy/default.nix
+++ b/pkgs/applications/misc/synergy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, xlibsWrapper, libX11, libXi, libXtst, libXrandr
+{ stdenv, fetchFromGitHub, fetchpatch, cmake, xlibsWrapper, libX11, libXi, libXtst, libXrandr
, xinput, curl, openssl, unzip }:
with stdenv.lib;
@@ -14,9 +14,17 @@ stdenv.mkDerivation rec {
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
@@ -52,7 +60,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Share one mouse and keyboard between multiple computers";
- homepage = "http://synergy-project.org/";
+ homepage = http://synergy-project.org/;
license = licenses.gpl2;
maintainers = [ maintainers.aszlig ];
platforms = platforms.all;
diff --git a/pkgs/applications/misc/synergy/openssl-1.1.patch b/pkgs/applications/misc/synergy/openssl-1.1.patch
new file mode 100644
index 00000000000..56dc6112844
--- /dev/null
+++ b/pkgs/applications/misc/synergy/openssl-1.1.patch
@@ -0,0 +1,18 @@
+--- a/src/lib/net/SecureSocket.cpp 2017-07-22 19:33:22.442645291 +0200
++++ b/src/lib/net/SecureSocket.cpp 2017-07-22 19:36:25.632595581 +0200
+@@ -805,9 +805,14 @@
+ showCipherStackDesc(sStack);
+ }
+
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ // m_ssl->m_ssl->session->ciphers is not forward compatable, In future release
+- // of OpenSSL, it's not visible, need to use SSL_get_client_ciphers() instead
++ // of OpenSSL, it's not visible
+ STACK_OF(SSL_CIPHER) * cStack = m_ssl->m_ssl->session->ciphers;
++#else
++ // Use SSL_get_client_ciphers() for newer versions
++ STACK_OF(SSL_CIPHER) * cStack = SSL_get_client_ciphers(m_ssl->m_ssl);
++#endif
+ if (cStack == NULL) {
+ LOG((CLOG_DEBUG1 "remote cipher list not available"));
+ }
diff --git a/pkgs/applications/misc/taskjuggler/2.x/default.nix b/pkgs/applications/misc/taskjuggler/2.x/default.nix
index 2a199843cb3..2b0573f2d2d 100644
--- a/pkgs/applications/misc/taskjuggler/2.x/default.nix
+++ b/pkgs/applications/misc/taskjuggler/2.x/default.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
"kde_locale=\${out}/share/locale";
meta = {
- homepage = "http://www.taskjuggler.org";
+ homepage = http://www.taskjuggler.org;
license = stdenv.lib.licenses.gpl2;
description = "Project management tool";
longDescription = ''
diff --git a/pkgs/applications/misc/tasknc/default.nix b/pkgs/applications/misc/tasknc/default.nix
index ae0b46d056f..1b3ca7dfc03 100644
--- a/pkgs/applications/misc/tasknc/default.nix
+++ b/pkgs/applications/misc/tasknc/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
buildInputs = [ taskwarrior perl ncurses ];
meta = {
- homepage = "https://github.com/mjheagle8/tasknc";
+ homepage = https://github.com/mjheagle8/tasknc;
description = "A ncurses wrapper around taskwarrior";
maintainers = [ stdenv.lib.maintainers.matthiasbeyer ];
platforms = stdenv.lib.platforms.linux; # Cannot test others
diff --git a/pkgs/applications/misc/tasksh/default.nix b/pkgs/applications/misc/tasksh/default.nix
index 333ed411941..11bc7620368 100644
--- a/pkgs/applications/misc/tasksh/default.nix
+++ b/pkgs/applications/misc/tasksh/default.nix
@@ -1,16 +1,17 @@
-{ stdenv, fetchurl, cmake, libuuid, gnutls }:
+{ stdenv, fetchurl, cmake, libuuid, gnutls, readline }:
stdenv.mkDerivation rec {
name = "tasksh-${version}";
- version = "1.1.0";
+ version = "1.2.0";
enableParallelBuilding = true;
src = fetchurl {
url = "http://taskwarrior.org/download/${name}.tar.gz";
- sha256 = "0900nzfgvhcc106pl68d0v0qszvdc34yi59mw70b34b2gmkwdxzf";
+ 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 841e0a494e4..74ef55ee8cc 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/termite/default.nix b/pkgs/applications/misc/termite/default.nix
index 837d736d10d..cf99304473c 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/tilix/default.nix b/pkgs/applications/misc/tilix/default.nix
index df253b3b4ce..2128c260b80 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.1";
+ version = "1.6.4";
src = fetchFromGitHub {
owner = "gnunn1";
repo = "tilix";
rev = "${version}";
- sha256 = "10nw3q6s941dm44bkfryl1xclr1xy1vjr2n8w7g6kfahpcazf8f8";
+ sha256 = "1vqi68jlbbaky1569kd4lr6p02zsiv7v2rfb8j1pzwj7gydblaac";
};
nativeBuildInputs = [
@@ -31,11 +31,12 @@ stdenv.mkDerivation rec {
preFixup = ''
substituteInPlace $out/share/applications/com.gexperts.Tilix.desktop \
--replace "Exec=tilix" "Exec=$out/bin/tilix"
+ sed -i '/^DBusActivatable=/d' $out/share/applications/com.gexperts.Tilix.desktop
'';
meta = with stdenv.lib; {
description = "Tiling terminal emulator following the Gnome Human Interface Guidelines.";
- homepage = "https://gnunn1.github.io/tilix-web";
+ homepage = https://gnunn1.github.io/tilix-web;
licence = licenses.mpl20;
maintainer = with maintainers; [ midchildan ];
platforms = platforms.linux;
diff --git a/pkgs/applications/misc/tint2/default.nix b/pkgs/applications/misc/tint2/default.nix
index 3edc9b73bb5..6a613b6d5b5 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.1";
src = fetchFromGitLab {
owner = "o9000";
repo = "tint2";
rev = version;
- sha256 = "0v7i8araj85cbl45icinvmsz5741cx2ybjgkx72m3xfcb9fqg69l";
+ sha256 = "16mpvknibbqy0vjgkwig7g8i6rivm14ipd7ixvqydgcj7wibn0b7";
};
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
diff --git a/pkgs/applications/misc/tomboy/default.nix b/pkgs/applications/misc/tomboy/default.nix
index 4464ab6a608..357713df384 100644
--- a/pkgs/applications/misc/tomboy/default.nix
+++ b/pkgs/applications/misc/tomboy/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
'';
meta = with stdenv.lib; {
- homepage = "https://wiki.gnome.org/Apps/Tomboy";
+ homepage = https://wiki.gnome.org/Apps/Tomboy;
description = "A simple note-taking application with synchronization";
platforms = platforms.linux;
license = stdenv.lib.licenses.lgpl2;
diff --git a/pkgs/applications/misc/toot/default.nix b/pkgs/applications/misc/toot/default.nix
index 4f66d7167e1..d1b1daa26d6 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 00000000000..34952b9c0f4
--- /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/truecrypt/builder.sh b/pkgs/applications/misc/truecrypt/builder.sh
deleted file mode 100644
index 88820d4cad2..00000000000
--- 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 bc15b084cd9..4787516cedd 100644
--- a/pkgs/applications/misc/truecrypt/default.nix
+++ b/pkgs/applications/misc/truecrypt/default.nix
@@ -1,17 +1,17 @@
/*
-Requirements for Building TrueCrypt for Linux and Mac OS X:
+Requirements for Building TrueCrypt for Linux and macOS:
-----------------------------------------------------------
- GNU Make
- GNU C++ Compiler 4.0 or compatible
-- Apple XCode (Mac OS X only)
+- Apple XCode (macOS only)
- pkg-config
- wxWidgets 2.8 library source code (available at http://www.wxwidgets.org)
- FUSE library (available at http://fuse.sourceforge.net and
http://code.google.com/p/macfuse)
-Instructions for Building TrueCrypt for Linux and Mac OS X:
+Instructions for Building TrueCrypt for Linux and macOS:
-----------------------------------------------------------
1) Change the current directory to the root of the TrueCrypt source code.
@@ -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,13 @@ stdenv.mkDerivation {
sha256 = "5ae6a4f32ca737e02def3bf314c9842fb89be82bf00b6f4022a97d8d565522b8";
};
- buildInputs = [ pkgconfig fuse devicemapper wxGTK nasm ];
- makeFlags = if wxGUI then "" else "NOGUI=1";
+ buildInputs = [ pkgconfig 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 00000000000..6e8c7da69e8
--- /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/twmn/default.nix b/pkgs/applications/misc/twmn/default.nix
index 7ec3d66f31c..297f3d0b599 100644
--- a/pkgs/applications/misc/twmn/default.nix
+++ b/pkgs/applications/misc/twmn/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
meta = {
description = "A notification system for tiling window managers";
- homepage = "https://github.com/sboli/twmn";
+ homepage = https://github.com/sboli/twmn;
platforms = with stdenv.lib.platforms; linux;
maintainers = [ stdenv.lib.maintainers.matejc ];
};
diff --git a/pkgs/applications/misc/urh/default.nix b/pkgs/applications/misc/urh/default.nix
index 9015bb9956b..faf373092d5 100644
--- a/pkgs/applications/misc/urh/default.nix
+++ b/pkgs/applications/misc/urh/default.nix
@@ -2,13 +2,13 @@
python3Packages.buildPythonApplication rec {
name = "urh-${version}";
- version = "1.5.5";
+ version = "1.7.1";
src = fetchFromGitHub {
owner = "jopohl";
repo = "urh";
rev = "v${version}";
- sha256 = "1f7hz2zs2dx3v6hpdyz7wyyq1xf641jhpljyhvmjr4zg5m035isa";
+ sha256 = "00l1zs3qw89z1hlylprzrpf6nf7h22h0nw43h97gv775vaqqgczv";
};
buildInputs = [ hackrf rtl-sdr ];
diff --git a/pkgs/applications/misc/urlview/default.nix b/pkgs/applications/misc/urlview/default.nix
index f0a48cfb8d4..f745bf3ad60 100644
--- a/pkgs/applications/misc/urlview/default.nix
+++ b/pkgs/applications/misc/urlview/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ncurses, automake111x, autoreconfHook }:
+{ stdenv, fetchurl, ncurses, autoreconfHook }:
stdenv.mkDerivation rec {
version = "0.9";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "746ff540ccf601645f500ee7743f443caf987d6380e61e5249fc15f7a455ed42";
};
- buildInputs = [ ncurses automake111x autoreconfHook ];
+ buildInputs = [ ncurses autoreconfHook ];
preAutoreconf = ''
touch NEWS
diff --git a/pkgs/applications/misc/valauncher/default.nix b/pkgs/applications/misc/valauncher/default.nix
index 7d35f1f64a8..00a60ae50a4 100644
--- a/pkgs/applications/misc/valauncher/default.nix
+++ b/pkgs/applications/misc/valauncher/default.nix
@@ -1,17 +1,17 @@
-{ 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 ];
+ buildInputs = [ cmake gtk3 vala pkgconfig gnome3.libgee ];
meta = with stdenv.lib; {
description = "A fast dmenu-like gtk3 application launcher";
diff --git a/pkgs/applications/misc/vanitygen/default.nix b/pkgs/applications/misc/vanitygen/default.nix
deleted file mode 100644
index 6be2dc394cc..00000000000
--- a/pkgs/applications/misc/vanitygen/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ fetchgit, stdenv, openssl, pcre }:
-
-stdenv.mkDerivation rec {
- version = "0.21";
- name = "vanitygen-${version}";
-
- src = fetchgit {
- url = "https://github.com/samr7/vanitygen";
- rev = "refs/tags/${version}";
- sha256 = "1vzfv74hhiyrrpvjca8paydx1ashgbgn5plzrx4swyzxy1xkamah";
- };
-
- buildInputs = [ openssl pcre ];
-
- installPhase = ''
- mkdir -p $out/bin
- cp vanitygen $out/bin
- cp keyconv $out/bin/vanitygen-keyconv
- '';
-
- meta = {
- description = "Bitcoin vanity address generator";
- longDescription= ''
- Vanitygen can search for exact prefixes or regular expression
- matches, so you can generate Bitcoin addresses that starts
- with the needed mnemonic.
-
- Vanitygen can generate regular bitcoin addresses, namecoin
- addresses, and testnet addresses.
-
- When searching for exact prefixes, vanitygen will ensure that
- the prefix is possible, will provide a difficulty estimate,
- and will run about 30% faster.
- '';
- homepage = "https://github.com/samr7/vanitygen";
- license = stdenv.lib.licenses.agpl3;
- platforms = stdenv.lib.platforms.all;
- };
-}
diff --git a/pkgs/applications/misc/vifm/default.nix b/pkgs/applications/misc/vifm/default.nix
index f0f5e8e2288..ffeca99cf9c 100644
--- a/pkgs/applications/misc/vifm/default.nix
+++ b/pkgs/applications/misc/vifm/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
platforms = platforms.linux;
license = licenses.gpl2;
downloadPage = "http://vifm.info/downloads.shtml";
- homepage = "http://vifm.info/";
+ homepage = http://vifm.info/;
inherit version;
updateWalker = true;
};
diff --git a/pkgs/applications/misc/volnoti/default.nix b/pkgs/applications/misc/volnoti/default.nix
index 836deb656a2..27b2a8f7134 100644
--- a/pkgs/applications/misc/volnoti/default.nix
+++ b/pkgs/applications/misc/volnoti/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Lightweight volume notification for Linux";
- homepage = "https://github.com/davidbrazdil/volnoti";
+ homepage = https://github.com/davidbrazdil/volnoti;
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = [ maintainers.gilligan ];
diff --git a/pkgs/applications/misc/weather/default.nix b/pkgs/applications/misc/weather/default.nix
index a184d31233c..90fa0166154 100644
--- a/pkgs/applications/misc/weather/default.nix
+++ b/pkgs/applications/misc/weather/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
'';
meta = {
- homepage = "http://fungi.yuggoth.org/weather";
+ homepage = http://fungi.yuggoth.org/weather;
description = "Quick access to current weather conditions and forecasts";
license = stdenv.lib.licenses.isc;
maintainers = [ stdenv.lib.maintainers.matthiasbeyer ];
diff --git a/pkgs/applications/misc/wikicurses/default.nix b/pkgs/applications/misc/wikicurses/default.nix
index 2b11ccf5837..84f7d4fd291 100644
--- a/pkgs/applications/misc/wikicurses/default.nix
+++ b/pkgs/applications/misc/wikicurses/default.nix
@@ -23,7 +23,7 @@ pythonPackages.buildPythonApplication rec {
meta = {
description = "A simple curses interface for MediaWiki sites such as Wikipedia";
- homepage = "https://github.com/ids1024/wikicurses/";
+ homepage = https://github.com/ids1024/wikicurses/;
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.unix;
};
diff --git a/pkgs/applications/misc/with-shell/default.nix b/pkgs/applications/misc/with-shell/default.nix
index d3b5541ac4d..6a5f7c17b20 100644
--- a/pkgs/applications/misc/with-shell/default.nix
+++ b/pkgs/applications/misc/with-shell/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
cp with $out/bin/with
'';
meta = {
- homepage = "https://github.com/mchav/With";
+ homepage = https://github.com/mchav/With;
description = "Command prefixing for continuous workflow using a single tool";
license = stdenv.lib.licenses.asl20;
platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/applications/misc/wmname/default.nix b/pkgs/applications/misc/wmname/default.nix
index 0861391294b..dfd3c487713 100644
--- a/pkgs/applications/misc/wmname/default.nix
+++ b/pkgs/applications/misc/wmname/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Prints or set the window manager name property of the root window";
- homepage = "http://tools.suckless.org/wmname";
+ homepage = http://tools.suckless.org/wmname;
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.unix;
};
diff --git a/pkgs/applications/misc/wordnet/default.nix b/pkgs/applications/misc/wordnet/default.nix
index f1bc06d395c..b93295850bc 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/worker/default.nix b/pkgs/applications/misc/worker/default.nix
index 00e42fdbba9..0d38f1b93e7 100644
--- a/pkgs/applications/misc/worker/default.nix
+++ b/pkgs/applications/misc/worker/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A two-pane file manager with advanced file manipulation features";
- homepage = "http://www.boomerangsworld.de/cms/worker/index.html";
+ homepage = http://www.boomerangsworld.de/cms/worker/index.html;
license = licenses.gpl2;
maintainers = [ maintainers.ndowens ];
};
diff --git a/pkgs/applications/misc/xastir/default.nix b/pkgs/applications/misc/xastir/default.nix
index 9b27e8fc794..c677f7371fc 100644
--- a/pkgs/applications/misc/xastir/default.nix
+++ b/pkgs/applications/misc/xastir/default.nix
@@ -4,11 +4,9 @@
, perl, proj, rastermagick, shapelib
}:
-let
+stdenv.mkDerivation rec {
+ name = "xastir-${version}";
version = "208";
-in
-stdenv.mkDerivation {
- name = "xastir-"+version;
src = fetchFromGitHub {
owner = "Xastir";
@@ -17,15 +15,16 @@ stdenv.mkDerivation {
sha256 = "1mm22vn3hws7dmg9wpaj4s0zkzb77i3aqa2ay3q6kqjkdhv25brl";
};
- buildInputs =
- [ autoreconfHook
- curl db gdal libgeotiff
- libXpm libXt motif pcre
- perl proj rastermagick shapelib
- ];
+ buildInputs = [
+ autoreconfHook
+ curl db gdal libgeotiff
+ libXpm libXt motif pcre
+ perl proj rastermagick shapelib
+ ];
- configureFlags =
- [ "--with-motif-includes=${motif}/include" ];
+ configureFlags = [ "--with-motif-includes=${motif}/include" ];
+
+ postPatch = "patchShebangs .";
meta = with stdenv.lib; {
description = "Graphical APRS client";
diff --git a/pkgs/applications/misc/xfe/default.nix b/pkgs/applications/misc/xfe/default.nix
index b372cd5b2dd..ad642ecec5e 100644
--- a/pkgs/applications/misc/xfe/default.nix
+++ b/pkgs/applications/misc/xfe/default.nix
@@ -23,7 +23,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 = http://sourceforge.net/projects/xfe/;
license = stdenv.lib.licenses.gpl2;
maintainers = [];
platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/misc/xiphos/default.nix b/pkgs/applications/misc/xiphos/default.nix
index a9f786a2a08..ecd6ab8c2ad 100644
--- a/pkgs/applications/misc/xiphos/default.nix
+++ b/pkgs/applications/misc/xiphos/default.nix
@@ -1,27 +1,29 @@
-{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 ];
+ sword clucene_core biblesync gnome_doc_utils libgsf gconf gtkhtml
+ libglade scrollkeeper webkitgtk dbus_glib enchant isocodes libuuid icu ];
prePatch = ''
patchShebangs .;
@@ -33,7 +35,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 00000000000..01df5d32ab1
--- /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 739f1f0a975..ef031c4b9f4 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,16 +31,8 @@ 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/";
+ homepage = http://www.foolabs.com/xpdf/;
description = "Viewer for Portable Document Format (PDF) files";
platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/applications/misc/xrq/default.nix b/pkgs/applications/misc/xrq/default.nix
index c0c5616db79..fe65004b32a 100644
--- a/pkgs/applications/misc/xrq/default.nix
+++ b/pkgs/applications/misc/xrq/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
make PREFIX=$out install
'';
- outputs = [ "out" "doc" ];
+ outputs = [ "out" "man" ];
buildInputs = [ libX11 ];
diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix
index 22e0466df36..9e64557838e 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/xtermcontrol/default.nix b/pkgs/applications/misc/xtermcontrol/default.nix
new file mode 100644
index 00000000000..eae5240129a
--- /dev/null
+++ b/pkgs/applications/misc/xtermcontrol/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+ version = "3.3";
+ name = "xtermcontrol-${version}";
+
+ src = fetchurl {
+ url = "http://thrysoee.dk/xtermcontrol/xtermcontrol-${version}.tar.gz";
+ sha256 = "1v2c1cnx43apmspga7icssh5ndbhzy5h82y6vm8fda40flq9mxj5";
+ };
+
+ meta = {
+ description = "Enables dynamic control of xterm properties";
+ longDescription = ''
+ Enables dynamic control of xterm properties.
+ It makes it easy to change colors, title, font and geometry of a running xterm, as well as to report the current settings of these properties.
+ Window manipulations de-/iconify, raise/lower, maximize/restore and reset are also supported.
+ To complete the feature set; xtermcontrol lets advanced users issue any xterm control sequence of their choosing.
+ '';
+ homepage = http://thrysoee.dk/xtermcontrol;
+ license = stdenv.lib.licenses.gpl2;
+ platforms = stdenv.lib.platforms.unix;
+ maintainers = [ stdenv.lib.maintainers.derchris ];
+ };
+}
diff --git a/pkgs/applications/misc/xxkb/default.nix b/pkgs/applications/misc/xxkb/default.nix
index c4e7fb23b89..90e2723a906 100644
--- a/pkgs/applications/misc/xxkb/default.nix
+++ b/pkgs/applications/misc/xxkb/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
meta = {
description = "A keyboard layout indicator and switcher";
- homepage = "http://xxkb.sourceforge.net/";
+ homepage = http://xxkb.sourceforge.net/;
license = stdenv.lib.licenses.artistic2;
maintainers = with stdenv.lib.maintainers; [ rasendubi ];
platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix
index 993d81ff96e..75f2dcda6a6 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
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 11177f3ee48..c4fd85ab93e 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -60,7 +60,10 @@ let
in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs));
gnSystemLibraries = [
- "ffmpeg" "flac" "harfbuzz-ng" "libwebp" "libxslt" "yasm" "snappy" # "libpng" "libjpeg"
+ "flac" "harfbuzz-ng" "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
];
opusWithCustomModes = libopus.override {
@@ -73,7 +76,7 @@ let
libpng libcap
xdg_utils yasm minizip libwebp
libusb1 re2 zlib
- ffmpeg harfbuzz libxslt harfbuzz-icu libxml2
+ ffmpeg harfbuzz-icu libxslt libxml2
];
# build paths and release info
@@ -104,23 +107,25 @@ let
nspr nss systemd
utillinux alsaLib
bison gperf kerberos
- glib gtk2 dbus_glib
+ glib gtk2 gtk3 dbus_glib
libXScrnSaver libXcursor libXtst mesa
pciutils protobuf speechd libXdamage
] ++ optional gnomeKeyringSupport libgnome_keyring3
++ optionals gnomeSupport [ gnome.GConf libgcrypt ]
++ optionals cupsSupport [ libgcrypt cups ]
- ++ optional pulseSupport libpulseaudio
- ++ optional (versionAtLeast version "56.0.0.0") gtk3;
+ ++ optional pulseSupport libpulseaudio;
patches = [
./patches/nix_plugin_paths_52.patch
+ ./patches/chromium-gn-bootstrap-r14.patch
+ ./patches/chromium-gcc-r1.patch
+ ./patches/chromium-atk-r1.patch
+ ./patches/chromium-gcc5-r1.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
- ./patches/chromium-59.0.3071.115-system_ffmpeg-1.patch
- ] ++ optional (versionOlder version "57.0") ./patches/glibc-2.24.patch
- ++ optional enableWideVine ./patches/widevine.patch;
+
+ ] ++ optional enableWideVine ./patches/widevine.patch;
postPatch = ''
# We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX
@@ -183,9 +188,14 @@ let
enable_hotwording = enableHotwording;
enable_widevine = enableWideVine;
use_cups = cupsSupport;
- } // {
+
treat_warnings_as_errors = false;
is_clang = false;
+ clang_use_chrome_plugins = false;
+ remove_webcore_debug_symbols = true;
+ use_gtk3 = true;
+ enable_swiftshader = false;
+ fieldtrial_testing_like_official_build = true;
# Google API keys, see:
# http://www.chromium.org/developers/how-tos/api-keys
@@ -221,9 +231,14 @@ 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}"
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 30a16d824d0..7aa02e2c574 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -1,5 +1,5 @@
{ newScope, stdenv, makeWrapper, makeDesktopItem, ed
-, glib, gtk2, gtk3, gnome2, gnome3, gsettings_desktop_schemas
+, glib, gtk3, gnome3, gsettings_desktop_schemas
# package customization
, channel ? "stable"
@@ -67,9 +67,6 @@ let
inherit (stdenv.lib) versionAtLeast;
- gtk = if (versionAtLeast version "59.0.0.0") then gtk3 else gtk2;
- gnome = if (versionAtLeast version "59.0.0.0") then gnome3 else gnome2;
-
in stdenv.mkDerivation {
name = "chromium${suffix}-${version}";
inherit version;
@@ -78,10 +75,10 @@ in stdenv.mkDerivation {
makeWrapper ed
# needed for GSETTINGS_SCHEMAS_PATH
- gsettings_desktop_schemas glib gtk
+ gsettings_desktop_schemas glib gtk3
# needed for XDG_ICON_DIRS
- gnome.defaultIconTheme
+ gnome3.defaultIconTheme
];
outputs = ["out" "sandbox"];
diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-59.0.3071.115-system_ffmpeg-1.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-59.0.3071.115-system_ffmpeg-1.patch
deleted file mode 100644
index 2ffdcc0ad6a..00000000000
--- a/pkgs/applications/networking/browsers/chromium/patches/chromium-59.0.3071.115-system_ffmpeg-1.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Submitted By: DJ Lucas
-Date: 2017-06-25
-Initial Package Version: 57.0.2987.110
-Upstream Status: Not submitted
-Origin: Gentoo: https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/files/chromium-system-ffmpeg-r4.patch
-Description: Allows building with system provided ffmpeg. Rediffed
- for chromium-59.0.3071.109.
-
-diff -Naurp chromium-59.0.3071.109-orig/media/ffmpeg/ffmpeg_common.h chromium-59.0.3071.109/media/ffmpeg/ffmpeg_common.h
---- chromium-59.0.3071.109-orig/media/ffmpeg/ffmpeg_common.h 2017-06-20 17:03:19.000000000 -0500
-+++ chromium-59.0.3071.109/media/ffmpeg/ffmpeg_common.h 2017-06-23 00:21:10.551912699 -0500
-@@ -23,10 +23,6 @@
-
- // Include FFmpeg header files.
- extern "C" {
--// Disable deprecated features which result in spammy compile warnings. This
--// list of defines must mirror those in the 'defines' section of FFmpeg's
--// BUILD.gn file or the headers below will generate different structures!
--#define FF_API_CONVERGENCE_DURATION 0
- // Upstream libavcodec/utils.c still uses the deprecated
- // av_dup_packet(), causing deprecation warnings.
- // The normal fix for such things is to disable the feature as below,
-@@ -40,7 +36,6 @@ extern "C" {
- MSVC_PUSH_DISABLE_WARNING(4244);
- #include
- #include
--#include
- #include
- #include
- #include
-diff -Naurp chromium-59.0.3071.109-orig/media/filters/ffmpeg_demuxer.cc chromium-59.0.3071.109/media/filters/ffmpeg_demuxer.cc
---- chromium-59.0.3071.109-orig/media/filters/ffmpeg_demuxer.cc 2017-06-20 17:03:19.000000000 -0500
-+++ chromium-59.0.3071.109/media/filters/ffmpeg_demuxer.cc 2017-06-23 00:22:56.289311692 -0500
-@@ -1223,29 +1223,6 @@ void FFmpegDemuxer::OnFindStreamInfoDone
- // If no estimate is found, the stream entry will be kInfiniteDuration.
- std::vector start_time_estimates(format_context->nb_streams,
- kInfiniteDuration);
-- const AVFormatInternal* internal = format_context->internal;
-- if (internal && internal->packet_buffer &&
-- format_context->start_time != static_cast(AV_NOPTS_VALUE)) {
-- struct AVPacketList* packet_buffer = internal->packet_buffer;
-- while (packet_buffer != internal->packet_buffer_end) {
-- DCHECK_LT(static_cast(packet_buffer->pkt.stream_index),
-- start_time_estimates.size());
-- const AVStream* stream =
-- format_context->streams[packet_buffer->pkt.stream_index];
-- if (packet_buffer->pkt.pts != static_cast(AV_NOPTS_VALUE)) {
-- const base::TimeDelta packet_pts =
-- ConvertFromTimeBase(stream->time_base, packet_buffer->pkt.pts);
-- // We ignore kNoTimestamp here since -int64_t::min() is possible; see
-- // https://crbug.com/700501. Technically this is a valid value, but in
-- // practice shouldn't occur, so just ignore it when estimating.
-- if (packet_pts != kNoTimestamp && packet_pts != kInfiniteDuration &&
-- packet_pts < start_time_estimates[stream->index]) {
-- start_time_estimates[stream->index] = packet_pts;
-- }
-- }
-- packet_buffer = packet_buffer->next;
-- }
-- }
-
- std::unique_ptr media_tracks(new MediaTracks());
-
diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-atk-r1.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-atk-r1.patch
new file mode 100644
index 00000000000..602be1e3ba7
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/patches/chromium-atk-r1.patch
@@ -0,0 +1,11 @@
+--- a/content/browser/accessibility/browser_accessibility_auralinux.cc.orig 2017-07-27 06:28:01.090257874 +0000
++++ b/content/browser/accessibility/browser_accessibility_auralinux.cc 2017-07-27 06:28:21.174653680 +0000
+@@ -571,7 +571,7 @@
+ // it's best to leave this out rather than break people's builds:
+ #if defined(ATK_CHECK_VERSION)
+ #if ATK_CHECK_VERSION(2, 16, 0)
+- atk_state_set_add_state(atk_state_set, ATK_STATE_READ_ONLY);
++ atk_state_set_add_state(state_set, ATK_STATE_READ_ONLY);
+ #endif
+ #endif
+ break;
\ No newline at end of file
diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc-r1.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc-r1.patch
new file mode 100644
index 00000000000..036d57b601d
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/patches/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/chromium/patches/chromium-gcc5-r1.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-gcc5-r1.patch
new file mode 100644
index 00000000000..8d2886fbfa9
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/patches/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/chromium/patches/chromium-gn-bootstrap-r14.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-gn-bootstrap-r14.patch
new file mode 100644
index 00000000000..62426715366
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/patches/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/chromium/patches/glibc-2.24.patch b/pkgs/applications/networking/browsers/chromium/patches/glibc-2.24.patch
deleted file mode 100644
index 10a04b7ec8d..00000000000
--- a/pkgs/applications/networking/browsers/chromium/patches/glibc-2.24.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- old/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp 2016-08-03 21:02:37.000000000 +0200
-+++ new/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp 2016-08-14 10:59:51.395354850 +0200
-@@ -41,6 +41,11 @@
- #include
- #include
-
-+#if OS(LINUX) && defined(MADV_FREE)
-+// Added in Linux 4.5, but we don't want to depend on 4.5 at runtime
-+#undef MADV_FREE
-+#endif
-+
- #ifndef MADV_FREE
- #define MADV_FREE MADV_DONTNEED
- #endif
diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix
index be9aa16e151..2bc81869530 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.137";
+ version = "27.0.0.130";
src = fetchzip {
url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/"
+ "${version}/flash_player_ppapi_linux.x86_64.tar.gz";
- sha256 = "0zmslmy7i7ywb2frckg5afkmfqb2lm2mahq0qs8msjzcx9jk4pyx";
+ sha256 = "005sxx3ll18c6idy1db2gb47chd9c5mf83qac0vyvljsrlc7430c";
stripRoot = false;
};
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index 708320e92a2..ff349c8a576 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 = "086j8s8wjwk26gfb7hdqn1lsmwgr9mmw93yfi6s4wia9ra0ccwj2";
- sha256bin64 = "0z1dshxzyn5zhr4xg5mvrq70jxsfkwv50achq802322y4jz52f7n";
- version = "60.0.3112.66";
+ sha256 = "09q7s5x22vnmvqyz0f1l6qnaryglmsp0rc63qcg5sfvgv2g17g5x";
+ sha256bin64 = "12z6z8gjxl4mx8j6db8nnlzrj03rh4qwyrvcf4hqcsv7b1armg6j";
+ version = "61.0.3163.79";
};
dev = {
- sha256 = "1hbf7hv4934686dp0dbqy06vbwb2kq4wz5hjfdxrgafrzqac2j7g";
- sha256bin64 = "1gg1a3k80qncr7dpw9gycndv52396cqyq9zfmzf6c4njpn2khjfv";
- version = "61.0.3153.4";
+ sha256 = "168i6dcdl13an3vlr2m83q8fcprgckmclkmzwj70jdkp84qx80fq";
+ sha256bin64 = "116vddp01m2ls337zj6r4h1nvybphvldlk9bs8czypx5skn29vbz";
+ version = "62.0.3202.9";
};
stable = {
- sha256 = "0w1i4q7w5lcajc18jrchrhhm00x0jzm846l5x7a5rcp3baawkjrp";
- sha256bin64 = "1naq20508qjm9hlwlpj686a0lawca58rnr35ws2gh2gsyxrxnmx1";
- version = "59.0.3071.115";
+ sha256 = "09q7s5x22vnmvqyz0f1l6qnaryglmsp0rc63qcg5sfvgv2g17g5x";
+ sha256bin64 = "0a0wd06c0v061lnmb8x20gqgsg9zqafp2kq1fl3cjm0ldg9rwayw";
+ version = "61.0.3163.79";
};
}
diff --git a/pkgs/applications/networking/browsers/dillo/default.nix b/pkgs/applications/networking/browsers/dillo/default.nix
index a54e5e0c370..b056bdedb41 100644
--- a/pkgs/applications/networking/browsers/dillo/default.nix
+++ b/pkgs/applications/networking/browsers/dillo/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
configureFlags = "--enable-ssl";
meta = with stdenv.lib; {
- homepage = http://www.dillo.org/;
+ homepage = https://www.dillo.org/;
description = "A fast graphical web browser with a small footprint";
longDescription = ''
Dillo is a small, fast web browser, tailored for older machines.
diff --git a/pkgs/applications/networking/browsers/dwb/default.nix b/pkgs/applications/networking/browsers/dwb/default.nix
index bd5f757738d..0aacbd2565b 100644
--- a/pkgs/applications/networking/browsers/dwb/default.nix
+++ b/pkgs/applications/networking/browsers/dwb/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
preFixup=''
wrapProgram "$out/bin/dwb" \
- --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules:${dconf}/lib/gio/modules" \
+ --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules:${stdenv.lib.getLib dconf}/lib/gio/modules" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share"
wrapProgram "$out/bin/dwbem" \
--prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules"
diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix
index cc34318edf3..b60454c4a42 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;
+ ++ stdenv.lib.optional enablePython python
+ ++ stdenv.lib.optional enablePerl perl
+ ;
- 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}
- '';
- };
+ 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/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
index 967fd1e1595..79f56413f4c 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 = "56.0b5";
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/56.0b5/linux-x86_64/ach/firefox-56.0b5.tar.bz2";
locale = "ach";
arch = "linux-x86_64";
- sha512 = "7164db8b579c12976ab86770f3c238d8b4b4334a41107f995d03b87c77e7998e1c7d48b36b2305d67f1eddb4d3cbe0b9bfb9c27169abaac00839d90a0e80d38f";
+ sha512 = "01376c4365dc8c5cba1e37708f9a2b2e9408c6a2a06790a433e058dae5d245b35ed1f7e8f573e496442d8657f96db662c540a70c4d6cf8f154ff8cf04b5f06eb";
}
- { 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/56.0b5/linux-x86_64/af/firefox-56.0b5.tar.bz2";
locale = "af";
arch = "linux-x86_64";
- sha512 = "994024e45c16b1dda3680ad4d73fa7a2a84bf43ce3be8df4fa61a695b9041fcdf88ae750c0ab34bf9dd814cbcde10b14832d5b03682e8c83e4dc43a316b6c75f";
+ sha512 = "f502bb10230ee5dba28e7dd84a0d76a9e868c2da99588c00f35492e9c355902cb39d383bf7a8b6440d7e7811e70a7a1945978de0e59a85514eb8c16d939e799c";
}
- { 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/56.0b5/linux-x86_64/an/firefox-56.0b5.tar.bz2";
locale = "an";
arch = "linux-x86_64";
- sha512 = "dc4a8db0c9bd87ef140d8c2fa2e4deb63e664a97353d88f94f99fd10ed358091a6215b62f8a441ef65dfa6774989ede451e55749bdffb0f670904959f5e8bb70";
+ sha512 = "488e58bde0417b70c7da08ae22c40089f759a5f2919f2a3dad595f880607880e3a4a202944c8d03f71f1d420147fa0e3e896ef88753723d8c4ee92e0c32cdb0d";
}
- { 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/56.0b5/linux-x86_64/ar/firefox-56.0b5.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha512 = "94d018fe2116733bd14daf51d9d9f09022a745b3797773422ac79511a8fd1e14e9fea879f7873c1043e0b63d2df4425c806645467764325400f71600a2f1cc1c";
+ sha512 = "96d1f3dba912702eb6d467ff1be67fae112b82a77620a53125aaa861c241bcaeb441c73339e20fbc5c41eb8883a370c2371b4a3d7b0af04555dc07bff5f1cd78";
}
- { 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/56.0b5/linux-x86_64/as/firefox-56.0b5.tar.bz2";
locale = "as";
arch = "linux-x86_64";
- sha512 = "6b5811c9ec50be18a34e0102438e95fea58c8667a0a19c9c4c5f4ac93c8ae8b9cd929252c81de7f19a15b82ed6a01e8fe37fda7aafc63cac223cc09b1d9dbd11";
+ sha512 = "75873538776101e59c5544aa644bf563bd7bc0b3882f43e9d3ada94cdcb39d3ca2d34cd796445fb680f81bdfa1604cf6bc7b79175625b5e56ea12a6790171c2c";
}
- { 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/56.0b5/linux-x86_64/ast/firefox-56.0b5.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha512 = "4deb4aff290277f870d5c3148e375a9bd2071b455ff93f10e28c9afe149a8f11689bef936db8a87c0fd4cda5bdda70aced4580395343916e7510ab7970269fdd";
+ sha512 = "84b975021ff95e4d0490d82ce7666539f7806b8563ab42cf9a8139db06f3558a4680d33840405a497e92ed5f2366af979ae0bc8d188be3c3015131f4459c1a1f";
}
- { 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/56.0b5/linux-x86_64/az/firefox-56.0b5.tar.bz2";
locale = "az";
arch = "linux-x86_64";
- sha512 = "3cf69626fbcd8667c83978e540cf0e8e0123408dd080073e95f543a0c98085320bd95caf77fb814002e45694cefa5542c6d436d258c66abb8435d52ce85f111c";
+ sha512 = "3989e10d2884c827a82f8202cd440b9f5867e6af38cfa952848789cb855963e2ed75a13b029d47ca04a93a0bf94d53e7e1dc253e913edef6e45922a0b05bbce7";
}
- { 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/56.0b5/linux-x86_64/be/firefox-56.0b5.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha512 = "0318b4bbf69fda1586665dbe7626d4ba1c4768acf310b5bcb0d49c1212199704d4f0c0da6dcd99f75dd7871d39a4725497c47ec2f980b1c458b101a4e18531e5";
+ sha512 = "3fa693d5d909a32bf206e81f69a1bae19560a6e4d281d1c023d956e890089e3bd4f006b3b44b9186f7f50bcb6566dd375386aff634171cc9cc27955a4ac64043";
}
- { 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/56.0b5/linux-x86_64/bg/firefox-56.0b5.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha512 = "0de32e72eba0fae0e19c1d1cf8e8f8f99926d66df6831317742a74bd0e90f909cd4a55432f9fde3e25c33e37160f5e92d0ca97b2236089d4059c5789e89823f7";
+ sha512 = "e595c12a4c0e542be9954b3ae633f55d94bd9b402e854dae04c16d9c2c4e28814e31dc48e669ddca2bb76a55191b223f225e01cd6c23010725da0e8c29ce111e";
}
- { 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/56.0b5/linux-x86_64/bn-BD/firefox-56.0b5.tar.bz2";
locale = "bn-BD";
arch = "linux-x86_64";
- sha512 = "333b28b03e6a4612b0e5636e14bc83d6e152237fbcd4129acf25767f3049835bf262040caacba1976d2791ec06fa89e3c70ed1abea414bbf4289729296099993";
+ sha512 = "af7f0023f5abb0ea9446380165c9c955a0bfe824377a3ebdfefcfc5dee079aabf317c832de459da41d330697c69ba3f4519136ea5922fe26827745f2b8567bb7";
}
- { 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/56.0b5/linux-x86_64/bn-IN/firefox-56.0b5.tar.bz2";
locale = "bn-IN";
arch = "linux-x86_64";
- sha512 = "ba989a0555fdc40e9ce9d834eef26b19c30b19616d85b5864d26253572fd79bf02b7a0b9bfd00dddaa192950c7f9d52c20887569b7cad8b03622ac0df55baadb";
+ sha512 = "5911b03099379731bde2c904ed11e5eef69e6d53a1492cb07c4d1ee6f3747fd891ef34a168adea716d867b9ab02ce0faaeff2f60a47ab0863abe0578e5829ea6";
}
- { 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/56.0b5/linux-x86_64/br/firefox-56.0b5.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha512 = "e43ec7e1ba0d977938e5a1bc3f985196211fb6587c44018958f750b35fea78f2dd94a8fbd1b91f70e41c3f3cc0da194bed76306d4b63bca3dfde7a65a6a7532a";
+ sha512 = "2e8c4776671c29b4d885c8ebd87ae107656117d826081230890c6deabd0106b75d53334a718b36a2cec4ef9060bfc9c1a4f1d3543d13fc17218ad594f4d0f0cd";
}
- { 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/56.0b5/linux-x86_64/bs/firefox-56.0b5.tar.bz2";
locale = "bs";
arch = "linux-x86_64";
- sha512 = "7ed042ecf92e7f873f93e0f6a7ab27418e960adcc2417e18fe9ee8b468157af85dfbd8e56df7f0dba97027b3a38aeb6279d81451579cc97a9fec814064b74e58";
+ sha512 = "e1bc29dfad9794ba95f81f611cd9075550024976651812053b1e976fa7c9e6aafb5d375c30d6164afd93255830a5d336a5c2522199701bd26bedcc6cdab7177f";
}
- { 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/56.0b5/linux-x86_64/ca/firefox-56.0b5.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha512 = "0953320dfdebfda3b2f135fb5277ebbdcae1c13f431b4452e0398515d990fd6faa8137dd4f49bf4336b385c70422f340e0bd8a466c07f76146d9ff32655cbe1d";
+ sha512 = "4122426fc6b58472f4c57c03618f7b1039958a5e5e66309472279a59df077ef08eabee1237c59fa5ede0ea18b927b60a9ed8319cbb396c5b204d6b55842b4d51";
}
- { 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/56.0b5/linux-x86_64/cak/firefox-56.0b5.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha512 = "e79e1e6a2784e3e61637624ddd8b628b784090c61daa35d36a3ebbb68db1801ead01b86bb04d7b2bb3037fb53b42197a50de78013afcc2443136b65df6f0b9dc";
+ sha512 = "d1c0dc77a7a06d5fcbe231c5ee3802aae200f578febb77c41c675a5a525675442772e585fc399ff79777ab66516df4ec05c0a22348fbbc29594ca0cfa35b3b7c";
}
- { 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/56.0b5/linux-x86_64/cs/firefox-56.0b5.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha512 = "c48991f37c786982f90ba12d43120dbefdc046d30c9ccbba630224b1f08dbce2b73eb4456e1b588f5ca0518ad19b8148e9dd5cf4a9f47f8d4ca0e90e2988f18d";
+ sha512 = "8934f3b7d2644dab828090e8aa6a2edfe1b21efc95d63b1a7821dd9c4cb9367d1a387d97e2a8c54f4815877533e9e20a4a0bf49446d9429f4519f28fd382e128";
}
- { 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/56.0b5/linux-x86_64/cy/firefox-56.0b5.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha512 = "a01937ba6f1e56b34ed4d16acbfa336338391c8fe4e33e5f06ec2a35c3c6010a35f20f7949ef1f6d50c9d6f6d9db115eb95cac50762d7d6a3b642f78192a6b4c";
+ sha512 = "d072efc296e744273c081b1fa78348c9b48137d0d42ef8aaa26f1607768af3dd62179c693bca567c4fde993f913da856ea36af350fc90df18d8e726f227b44ba";
}
- { 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/56.0b5/linux-x86_64/da/firefox-56.0b5.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha512 = "d7861e3765acac1e8e5a1b302986fcfbdc262a22308ead2239e7acb3617534f1b8bc101c2ca6d5aa1758bc13a6cac5f31fa062dd31ef239113cc815c9d4d22a5";
+ sha512 = "358d83de5408d2cfeef5b8e77054b528ed736a0b2552e93d7cae405d346dcf3a4ebe3470612cdf37170ef9e4ec00c87b23ececbf07bc07f67fbfe013576278dd";
}
- { 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/56.0b5/linux-x86_64/de/firefox-56.0b5.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha512 = "2b6efac1ab738f42fe52a6c8e4bd20fea1e044577a4dd82fea54ef403adf2ea9f7cb64268de68dc55799afd3f5e90f724c98b9f705affc704e1a58118c674dac";
+ sha512 = "02045240e122fb3f8339c8c09f90ced093d8c92d80f65ed03d922ebd10e454bf9b8d25df36eb8548f1249f43cb8f5d91f50993ec3623e5107115dee9de405b89";
}
- { 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/56.0b5/linux-x86_64/dsb/firefox-56.0b5.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha512 = "c5de911eea687279d6d14b8dc745597c6450c733cc332e104de6ebd9a7a64b877474fb0da0bbe59ef4c8424549eff4fc6b57a93379c09df00fda761bc7347e54";
+ sha512 = "eaa5f2e6f2fd7447f79c9bebf8046ab05ab67f5717c15f01af676c3b384750b7929fea818bf064b2949dfc0cf36cd4e12f17c4c11c5f7a563474666b217b4ed9";
}
- { 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/56.0b5/linux-x86_64/el/firefox-56.0b5.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha512 = "b531426207bf42f74f87ba8807441926f9476f0f15caf8a21594d099992c7c91d2cda6d71d318d899863185bdf776f4bf46820fff77b37f8a95c52f570f9247d";
+ sha512 = "93573cdb8088effd34206a9525bec895aed4920c878ec77fe847871c4e01d70ed35cd00aee4311e3409beb04e2f3aa4504c6bdb9b16f05b4540093db2d0924e5";
}
- { 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/56.0b5/linux-x86_64/en-GB/firefox-56.0b5.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha512 = "4c1c99501cf1ff1320d27c7709d9572837a1a1fb7d8dea4578075836e013b5fd79c84afababb45bbb5cf95655b51b0503ac45023746ff6d4831bda93c493e539";
+ sha512 = "765e34242d93d6f53fb59d9400444e8d236b11b5ef9335324e6b0fb57c04036121935e88068fc13dc669e0fcae50d0e84cd4b393b47689d2204aec86d4daf48c";
}
- { 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/56.0b5/linux-x86_64/en-US/firefox-56.0b5.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha512 = "82678293b35fe73c27c5842589de97858a8cb5186d7f1309693f16a516ddd62a59bd96e84358571367b706354625a98bec7fff9f7c598c96f025594baad44aa2";
+ sha512 = "bbcdf507dec439732a4c3c030c876c135d99126c9b35df52b6ad377575b971931eda12b9ec446be768058edc71d7331fbd1635b39baf837fc428887edbc8d5bb";
}
- { 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/56.0b5/linux-x86_64/en-ZA/firefox-56.0b5.tar.bz2";
locale = "en-ZA";
arch = "linux-x86_64";
- sha512 = "ded063ef65018cb0b138298b9e9df9a2aedaadf92d5c77248120cee6504542d18967b01c1bf497e264a9aeac7c119c8bc9885fb202dd0abcb0ba00344ad30397";
+ sha512 = "06d2e4cbf018dbff55d8f91e3ad9754b6a191cf9cf22ba38eb316421f732141e44c3d3b4b475e97e548ac8701652f2e9887be3789d78c9f06bcb9d1fdd4e5156";
}
- { 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/56.0b5/linux-x86_64/eo/firefox-56.0b5.tar.bz2";
locale = "eo";
arch = "linux-x86_64";
- sha512 = "205dc910f37c5501b27ff044f5bbb197fd4bbc3d8a5512ea01b0b4c155cd8b2f19eb6c400cb999a6136f2534ac0ede511ddf827ffd59f97ba00b538852c9a0a7";
+ sha512 = "9612deca064158eb9981a24946ab612b472c48a897aeeb22729677cd86a8209b85e75a3f89a408de4823947ad28fb2b0c66541e27433236aaf337ceef02166cf";
}
- { 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/56.0b5/linux-x86_64/es-AR/firefox-56.0b5.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha512 = "95a026ce800722d1e89237a675a58fee8243e5b4a900d1ce42a4f139dbb43e940478660f78d9c4593b9d09af7c3dc843984b7a362b465d99317aba9bb213b371";
+ sha512 = "a507fc11e9a528afd89c32fdc1bfc1255edace78cb11db1b238cde52ee113f6ffc2506908ad4d1331c3b80655de193b4c5b3890c979953cc01711fb2a7d9cad1";
}
- { 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/56.0b5/linux-x86_64/es-CL/firefox-56.0b5.tar.bz2";
locale = "es-CL";
arch = "linux-x86_64";
- sha512 = "42f0703824210feedd7da2f78a4d0823d1d0f3b23d4edaa07d63a5021847ba55871fec33676915b9f2b411ebd9cdf31de155f2de0a47586428bf0e1a3fe7457e";
+ sha512 = "028aa444658a288ce5fe84825aad85a340ab36383d04012a8dd93fc057cd3d2ad2084c84db87bbcde4778915eb7eed080d4fdf8baac009c0ad6a00d1ecee2f96";
}
- { 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/56.0b5/linux-x86_64/es-ES/firefox-56.0b5.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha512 = "d11dd1264e4692da710d18ef5c18d7f5bc1db36214cfd28a7f567d56a35ac6e56f838a58ef6ebfc2d68b115417cdd19fd49ae2f6a13f1a57bb2eacd122945f1c";
+ sha512 = "9ed4b5a1631110ccec6b31ea3d666fec54e9dbe9746552fc02b0eadd09053020abfb6053c763ce9f3877eaa2e1f318003177e9c3cc12e16120a7ba2881795525";
}
- { 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/56.0b5/linux-x86_64/es-MX/firefox-56.0b5.tar.bz2";
locale = "es-MX";
arch = "linux-x86_64";
- sha512 = "ab33b21aaacb43f4676856e74f4d93e2d449b67095500907669db42f678fe0d7448f2205f42c3f85885cef0a2c262818368808ecc336205411dc27b99e42f272";
+ sha512 = "bb13cb8455d87244a8f5216b765293ba13816ee08a0f73e70d706279d5e322e69b5627ee22aa9ad44ed20ce54730bc2f072d326ec669d509674855f835702a9c";
}
- { 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/56.0b5/linux-x86_64/et/firefox-56.0b5.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha512 = "2a87e6a9bd6c3aa22d278f114d0bd18779c7847cab2e6257c4e601f3749df703f2d0a25f5646ad91802a2cd093bd1734305fb350aa2be269c1fc5fd2d621d4db";
+ sha512 = "e7e099b80ce94392f53dc1ed3a696cad77ea1a1910ef79dd7160366f6f880857c5d3b867ca3635dde72d22d40000b2acd9495fd3804aa479c5e5adf0a3bb44db";
}
- { 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/56.0b5/linux-x86_64/eu/firefox-56.0b5.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha512 = "9017cc8bed387b103f78870b157a50c18f8e36858eca1bcbce8ac5ceb06f6d7b178760f7dc733ce570cdbdc3204d277a98a4b4324a0d3691d1fe3f6b1e9725df";
+ sha512 = "2b6ae7dbec4facca5a00a0c9827ad634b7862ead7c8694bccda7f90cd5183687bf122e29e38515b6457839913b8dd5c6e24a156edd74d3ac4ae9ff6fe8b5688b";
}
- { 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/56.0b5/linux-x86_64/fa/firefox-56.0b5.tar.bz2";
locale = "fa";
arch = "linux-x86_64";
- sha512 = "d70f1a793d67f1b52f740bbcdc4fb01056495fdc5b14672b35a48a500c71ac7cd0cc6272e7f6b4b4fcac65874f32ee64338435f76131c1d74ef82ca7a512eab7";
+ sha512 = "07a376c694df8a306fc169c8e0abb311361dcd3ee252654e8821673a69e6de9b3f25a47094091bfae620db152c471c39f7fd895d81acab877ffc471aaefc2439";
}
- { 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/56.0b5/linux-x86_64/ff/firefox-56.0b5.tar.bz2";
locale = "ff";
arch = "linux-x86_64";
- sha512 = "c16463456725b2f0263b8fee2d0729bd4951a352b1dfdee819bc2af0e138cda73d169eec63a27ed2900a0703648db0c784969a41df874336b1a84170ddaa71a4";
+ sha512 = "745c62ac6f055bc01dfbf8814c54cf823718d472533a3650f3ebb59f4c907109cd15d881ea19d80566cb66121c6ff2ffdd9c551c4eca62ec1cad3976d1b513f0";
}
- { 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/56.0b5/linux-x86_64/fi/firefox-56.0b5.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha512 = "00bf17dab47261470f57b94a18fcd5fcca0344be1b1d6352968e132c7f3fdfc5b5229c80eaca1a9802e75d432e09bb6e0dd3dbd40ee9f0c783ca007da61b52de";
+ sha512 = "f679b7e843a0626ac2e7f6fb9f85cb6628d162692263eba6506e94f8b22b543268b1de64e4cc9ae5977c7fca0725dee337a120647a5dd73edb56ee678b8088cd";
}
- { 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/56.0b5/linux-x86_64/fr/firefox-56.0b5.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha512 = "7599fed77975a7b4667c9d3456a5536e3b7eb1725acd624c504d061330ea84c3a19dd72914a0f7644068972b94a7a058708e3b1e3618e084315b920e8f671f13";
+ sha512 = "a95c3dd2946bcffaf8a34fea1e11df826e1dddd642cf79677465379e43343711a18fa88d1c74247624b7e7f690ecfd62edc38d9971dd5df81d05be490fa3672e";
}
- { 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/56.0b5/linux-x86_64/fy-NL/firefox-56.0b5.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha512 = "c665bb33f04b7d3b9790580b0db992ce223e75fdd3915b16f79125a72bac91cec098b1ae73b1223f5b03597c1e19522b46fe11c5c05a7cfe0c932a21bf94f90c";
+ sha512 = "bc6a82e5de1fd2f9c4b9fc4915604443d9102ffd8caa348a42054a1a251e820ccc69db4dcea5b4aa43e04e5c07e904b10db8b25c60986eecf91cbed89fff4f6b";
}
- { 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/56.0b5/linux-x86_64/ga-IE/firefox-56.0b5.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha512 = "c775e3e6858732104ba3251de42a0e9ba5031ade5f89207b357e93c6f6e4acd07bcc91a5fa558a9884f07438ca0de6bf10065ff7e37d980914da392428bc57e9";
+ sha512 = "271dca766101881c0869a3201f5312790d11befc96c3106f92740b798052434191389f86522b40cecd882d6f85a920556d53ce409ad5f12d1ca68434fc836a0b";
}
- { 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/56.0b5/linux-x86_64/gd/firefox-56.0b5.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha512 = "c8df95449757099a7c8d50c04f42aace7ce25297c78622296feb336352cecb53726f3873210af6cab96d90f65e21daa084b08f6b943e1130c75f68e6de1168a3";
+ sha512 = "afc35f1f071fe307df82582a19b817f1cb395c975f047c04a9b64790d87efe4fcb2486d4523b9144cf63f1b2949f3b67d74a7c8005c658b22eb6d363a407533d";
}
- { 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/56.0b5/linux-x86_64/gl/firefox-56.0b5.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha512 = "4488db080b8bbf7e437a684d1d7cbe219d1d730db055cd9988706cd71deb110b9496a87684ca32d172f3eeb3308ec1ee2ad0ab3b1e206d012c62311db45db911";
+ sha512 = "36a054c5d56752ddb8e5af417d53e4811b23ee5ac00b57d12bdad2152ef4a237579001f44ae41c9959a68fb144862e0185b0607df3c9801ddeba7f9a27edabb8";
}
- { 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/56.0b5/linux-x86_64/gn/firefox-56.0b5.tar.bz2";
locale = "gn";
arch = "linux-x86_64";
- sha512 = "272c43aabe7c63b769df2aea4eac5350c9cf90326ece8ac2f096db421f7785e630cbdcfdb84e41c516e36165f1a67d9b22ee0090d84ca9d58fef275d119c2dad";
+ sha512 = "f29d9f9d793730324399d6edf5d724f1ebd7f25037865af74616ab660bf6f469616fec7a7e2f1c5d8b7427a5b3b610c876100e5f737facc366d7ecc92606baae";
}
- { 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/56.0b5/linux-x86_64/gu-IN/firefox-56.0b5.tar.bz2";
locale = "gu-IN";
arch = "linux-x86_64";
- sha512 = "415b1ff89552f6bb83458a96905c2c6b7b6b25a974b72ab4a4d4a0a1a5b1e431b82e519466393bd6a8e8031954eacbca97529cb0e4513d722563e13eb97a8fbd";
+ sha512 = "b2e0626abe14e87420528b8e1875c22c5a97717f9d6fd781956fd7858a1a08c5014dbdac5dae6378fc2fee92bfd50ac4bacb29aff738ea8288cbbee68cf58ce0";
}
- { 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/56.0b5/linux-x86_64/he/firefox-56.0b5.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha512 = "1110e4c1c6121a00fd76f25bc513f0c877bfdc7751af2b5958f38f2a7892d8a00c9b5eaa6adab34213535480228a4e0b3aef3ec3a3ab4adde74bfa2fc7dbde94";
+ sha512 = "3a29a3f008b226c760d488e5673b6ca8d545a309aa8c19bb56df4208143663e92d29b4dfb0ae6606ac5f83826d1c6ec2118adfdf5ffb55e954193407b2249d7d";
}
- { 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/56.0b5/linux-x86_64/hi-IN/firefox-56.0b5.tar.bz2";
locale = "hi-IN";
arch = "linux-x86_64";
- sha512 = "b1279b0f0a97413799598fbd3c6efca475b8aef7a0b05c401cddf283722ba423ad2524341962360845951798d9083019a5b8b431e658513001c3046b6a3fedff";
+ sha512 = "cf0894c7b4e954ab39b847ff21a88b68152e3eb1577d6ce6b513c73ad8c26fe184227da022b827b35442a069fcdf3182a843bd4266d29ec525436f7bb9761cb9";
}
- { 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/56.0b5/linux-x86_64/hr/firefox-56.0b5.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha512 = "77474e40120fd4ad50a109c6b46fa93c070bfaf899e187bd4bac0ad4a53fc12c7f7d9d2a2003a871e8666dcfc60de4f3ea26b79008f4fe7ee1c5a358307b2eb4";
+ sha512 = "7f512df549b19e82d054298b1b5284956ea9568793aa0a7c676fd5f52792ff943a1f8bbcaff05996236e4ab19cf4e914d6e1178a493e7077ea97877d14ee8d70";
}
- { 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/56.0b5/linux-x86_64/hsb/firefox-56.0b5.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha512 = "b1e440f25ef20da7fd6e3d6a403b7c448e5493bfa410e09c3b9d59b32450883a938967b167a8e84cbfcaee546d36e28c8152a6c048070b543479072bb8df6189";
+ sha512 = "d7626253732cf868d1f414e297cf4598b1a3bcef10c43641030c599b6d04599139f268a993d4d151bdf08ecc0129dbb638f581de58c1e76f28bea30be0eca68d";
}
- { 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/56.0b5/linux-x86_64/hu/firefox-56.0b5.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha512 = "7ce8bedd243fb6d8cfe28eea17aafda028d1b85d96dd60c734f239f258dad8e7c132439614d48494e58088f99903f8a2a8824fc4878366400d9affffed203b84";
+ sha512 = "f74dd31a8987d35ee1e3c96546d6b180830b174bc03bce12ce83bd52e01f7f1ca9242830f785953ab0ec73cf2dcd19be61cd55981bec6c8926bfadc9045bfbe1";
}
- { 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/56.0b5/linux-x86_64/hy-AM/firefox-56.0b5.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha512 = "ab5054bc6cbc515af08763e61351275411edb2507b7013152185c49e3c7bad0263def5ad187cfe5fc4bb0f93e86a1596e131746646b25e452293f24216116543";
+ sha512 = "2b1902d366b7de359b8ea0a5fa75897b76293630710d30e17413a1990bc96a8cbc0032e68d73e1ff298cd366ced5f4c51f0a693c665bd3761db3646cdb536666";
}
- { 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/56.0b5/linux-x86_64/id/firefox-56.0b5.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha512 = "122b20868a4ee4d1bd42efb3bd281f137bda130d4328e830b3b21176777c6b993f562948671fd8e020d039b5e5798b150f1fbcf734f245615a2a3beda8d44e85";
+ sha512 = "424d9aa341405c5a6ea5441e0c471debd7d49c4a4df632d796142db9d4c944b49317758e2211b806bbc93904d4341094fe29aa44d6ef936346cc17263c357e89";
}
- { 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/56.0b5/linux-x86_64/is/firefox-56.0b5.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha512 = "033451b816392acf472f6f62f3367f929e4d4c2b749629138120580b7bb854c5409251c49650d3359e6f48929eeb62bb9a475ff46a8b57cf11c34d6035c67f70";
+ sha512 = "3ad0b286a36467973c4910eb20b09d20ec46d47fb6796078fda35335266f791f7e82d01ae8b7a0fa49361cc79cdf2864240286b6a8a447e6dfa6f49b23f2b1f6";
}
- { 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/56.0b5/linux-x86_64/it/firefox-56.0b5.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha512 = "99bccadd7b8994c20ade9907301ac695ef01542407032588bb17cd3353e4941ed70944c8f9a28aa0fee5b49990d2bfbc5ac37d9c3d4fb88d13c473d50ecaf849";
+ sha512 = "3c47bec4d903795f522d227d085e0d7ffccadb0e219f7a67159e5bcdcf7f7f2e1543b95ee8acd495982a464095521ec9dc22d9f90599d267eee8d2f6b4a543ea";
}
- { 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/56.0b5/linux-x86_64/ja/firefox-56.0b5.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha512 = "ec7193a6eb610bf1ee67791f1f7ed9ab951cc8a53bdcbddffb1078479919d5a70c43235e3b4ec4c20eb89514f283dc8223a4f61835f039f347744d07727058ce";
+ sha512 = "2a1e435e0f74205577c28a6265ac0acaf165b4b891129994f4d42cf78ea66216a04c9f4b7652053281e3717a51135c12324640c5ce285981a1165d9e749a64d6";
}
- { 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/56.0b5/linux-x86_64/ka/firefox-56.0b5.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha512 = "753c48c6dc9de12787705574fe0319ca9e4d5f9db67166d62fe0391fe5b8867d7f5da9d21f829420bee034444762a6ac3166c109a36e0001e6e7752c93304f77";
+ sha512 = "177acdc588044116cd4efb5ff10f178a6af2ebf7b90b80c06b07587e11d89a45a5f0ed4b0a9c7b2b2cd4896f3f4c5003b9dbed33bd7ed01ae6d331e637f2237f";
}
- { 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/56.0b5/linux-x86_64/kab/firefox-56.0b5.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha512 = "a64d1b1f69d18d06810d72ad10aaae40153e696a29efaba4327d44e45d167a4526cc00811cfb764288df8971576c281fee1d8b737597f1de0f0755a4d2e78126";
+ sha512 = "6e13833052dd32ea168d0e939ea7703c6c5a092848cd45ed8e6b1b0c18bcbe92e1a4c37ff7b1cfdc1c1e618f4efb83dffaf58501ce4f851d845b273fde5ac513";
}
- { 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/56.0b5/linux-x86_64/kk/firefox-56.0b5.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha512 = "e95905b00476f33a8e5c39b427e592f844f04d267263dec65f9edee3e2a91790382cfde6731e2eec0193d535267d041d2254c4645a7f8cb6b1e3ecbaa40f37aa";
+ sha512 = "1deb2df839e0708f2b8bedebd47a4643e1a3ef2abcf892b14fc4842688918cfac99b8345944a00fcb36495bbce92fe2f76b3bd6f7616220a4a4758396d031d75";
}
- { 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/56.0b5/linux-x86_64/km/firefox-56.0b5.tar.bz2";
locale = "km";
arch = "linux-x86_64";
- sha512 = "3dd5c83d82e6a47aebecee97c49e94018169a06a9f81ac61bcfa7d6ff337b5c4ca66d10ae552f5642cda20ce545752ffa0f2589163fd1e01bd7e61c24c88e7fb";
+ sha512 = "aed5a7b6e3fb2d4f4260703f83b1092953fb4ee7891ec8dc50250f9b00c4f1ad51d6f9e15ccb8500faf87f723ab891e474b43d4caf4a22620f5660ee8736c9eb";
}
- { 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/56.0b5/linux-x86_64/kn/firefox-56.0b5.tar.bz2";
locale = "kn";
arch = "linux-x86_64";
- sha512 = "cfcc5d048fbfa18aa0030114c445b40ada42064ac56194add35d51340173b3f6dffa1c9faca87fe4ca2f5aee608d7d05903ac8540095236d19aed3f939f88914";
+ sha512 = "d83b0af01fe7f335b3fd3bf89e9162a2c54ce95332de8687e265666b417a3103a508c57f770a4d075d3062cc48f652324fb1c73b1edfb8158b6f5cae597dbb59";
}
- { 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/56.0b5/linux-x86_64/ko/firefox-56.0b5.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha512 = "9e7b63568e745d5299fa0315dac87478bef0a30cdad42b05e33acdf188f8346e23ccac0ca3c544f1284e4cd216d8b5c792ef448d6cac31318ad711ec21ec4b05";
+ sha512 = "74bfe8e9a084348b7f1911c2cbbea89757b72ea8b584fd7bf26c79cc64f3b38ac642558ec3fe059464f252667d2e04dd70cbb34b92ffaa0467f5067636b05311";
}
- { 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/56.0b5/linux-x86_64/lij/firefox-56.0b5.tar.bz2";
locale = "lij";
arch = "linux-x86_64";
- sha512 = "1c8ffd773a5c259d32a6bb6ed6472c041f5337f01f21f6e5e18f774ddb04480cf0772ccc6bac7710e9c22f760d7bd2b234d6d21e1281d9ce2a26483ccd6e928b";
+ sha512 = "31fbd3b75c1c7d64a9b13c52680c6c3b36e604893a768a572d41481b388e9beb7942f435510b7dcc90e7f9ef42d81e05c7c77f28e5cbca63b51beaa54b09de40";
}
- { 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/56.0b5/linux-x86_64/lt/firefox-56.0b5.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha512 = "2f087692eba683bb0e865b5d4abc712edff5cffae647e8bfe382b2c15acfca481bb56c20f6b14742e7f16dedaf27848e8ae4d5078492762185d36c040c7e33ef";
+ sha512 = "ce6ebfb5a34f90ea5a8f742a3ac9a6216909c8843fe255f9906c297693a64e2ebd0318ca697cb02a896a122e29d2a8bd055957022a7cb770bad6687e83e9fa24";
}
- { 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/56.0b5/linux-x86_64/lv/firefox-56.0b5.tar.bz2";
locale = "lv";
arch = "linux-x86_64";
- sha512 = "0f6869d9528ba56a8e03e2dd85d8b76d74a359a17eb84c575a94580f965fa8c3d253933b798e2c426f742fe5d8d0d7709a7280e21e7eb41ce3799ee98cdd3af1";
+ sha512 = "b965eb09bcb9d5e0cbabc1c8ea7fc674aca2b185b2ef83f3c3560fc68fdd2fd428ee6a9d1e72980123816c01b2ab6877add15e706eb2a90b2f9220db3e411a8c";
}
- { 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/56.0b5/linux-x86_64/mai/firefox-56.0b5.tar.bz2";
locale = "mai";
arch = "linux-x86_64";
- sha512 = "31c2449b7127b4b537d407330cb618e1ffc24259f9bb455f95e2b535a4ca17aff8249c77e98e8f36375671390d4225552b18ba21346e3f1062482e8b8d3cc288";
+ sha512 = "3d6daf9e6e2459a246f9bd4d8e66c01f7acb0a4a63f7413c38c7158134c31b5986ee86233482d80cb33a3d8f0d9946c6cb79ec357f80c3ef22dd0ecd173dfacf";
}
- { 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/56.0b5/linux-x86_64/mk/firefox-56.0b5.tar.bz2";
locale = "mk";
arch = "linux-x86_64";
- sha512 = "0722b24e72fb8d0423e37d47035be6c2e90db45d99590961dea6cd5be6dbc7f1851234f20e4d8d741c4a36b82c31675b2e39884d2949f5134954b53ae6db6ac5";
+ sha512 = "f8e0208c360cc9b87ce917f51d2302df31f1cc137a16fbd8678aa664d0ae8626dc08f534dcb4f34e1a56cca1d0a3bcdad01eb506b04b0e2054c1db5acaaa8300";
}
- { 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/56.0b5/linux-x86_64/ml/firefox-56.0b5.tar.bz2";
locale = "ml";
arch = "linux-x86_64";
- sha512 = "4944473b377fabc233f30a6269ebf02aff87ecdd02a75e528b8f0c737dba37ad9eb322f99b1ffae1392a67144b737307bfedf0c6d45e65562f964bcb9dd3fdc0";
+ sha512 = "7c184b7bb8bcd115b4a3d10543a4805291ccc13a3b807d71a862b8d166e324d9f4ff28dbb71f2b36c26731d6d7085dbd45f708f20d6bb20a918c361fc0dec218";
}
- { 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/56.0b5/linux-x86_64/mr/firefox-56.0b5.tar.bz2";
locale = "mr";
arch = "linux-x86_64";
- sha512 = "5b2bf5731f4a988d1bdcdac74abf00b0633b4f9b63c1b999309d5c4eb5390d0e823d170b7cedc278b49d018d74e6eaa83373ad5c2a26151b78e9e831bf38f14c";
+ sha512 = "cf55c41a5ffef1fb41d6c82f5b9492f5cb4cf5aac4e14cd4ae751e81c15acdf30264653b8adee86fc343552c21484c8a1390d3872d30afe113fad94ff68a574a";
}
- { 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/56.0b5/linux-x86_64/ms/firefox-56.0b5.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha512 = "e96483b5e5800a6a33a9e9d065a90476ad76c94b6e75fe006881c209469e2f37173ef6d67b4f2b2cb216c46ad44bd0db9dcfb9d2e5afe864297e26eee93898d8";
+ sha512 = "a54c9904e67547d2c2c7bcd2c1a5df3b54ceaaed65bf6cdc35466d530797136b38e1f79cab4fa544d122ccb8787039cc3fd2cf3a1f166fcab8c27ddfa820a291";
}
- { 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/56.0b5/linux-x86_64/my/firefox-56.0b5.tar.bz2";
locale = "my";
arch = "linux-x86_64";
- sha512 = "4d145815f5cdd37666a60b0db476925b89495b1add8bfba42cd15580a294610f20fa340c449c04fa9cd2714a62e09c61e742037cbe26b5f11671eb72dc8a5008";
+ sha512 = "a267f9ce6aced112b488e90b859ebb2d6e02fc73dd208bad34ab5c1dd7a122e4b97b68813769b85f036ccfe8af7e56ea0782914c210b684f863cf2f268f27050";
}
- { 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/56.0b5/linux-x86_64/nb-NO/firefox-56.0b5.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha512 = "3763bbc87d2ff21b6db0d45b684b91f1080e3dd9fa1b2240edd56c2db1100b66ae04748c67df410cc9c0802e83fcb2a6661fa35fce6e8615a787c280ded8ebd6";
+ sha512 = "99b1b97f5c78cbeb67f7ba66c05d04d37bf808e52f98c25dcf2d0c51a400a26499101e4706a20162a805da2493db2919bfc1714940234e94247c2a17e18f7358";
}
- { 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/56.0b5/linux-x86_64/nl/firefox-56.0b5.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha512 = "eaaccd4746477ff10af5ee15b6e18020e8e1bf36bea7176cd3ca92903d983b97cea4d73a516a976827ad46dc4a03b000935f1d1d353af90ae205df435cdc3004";
+ sha512 = "b19d2699ffd4bd0e5de12a87f8a5461fe28869cbbfe573098e628ed3936baff9ca582c47104133bbab6199472182c9f71af18756ea750e9f2b256b01314884bd";
}
- { 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/56.0b5/linux-x86_64/nn-NO/firefox-56.0b5.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha512 = "7df043f3e917978b9d2c3ec6128275daed830d1402a4bcb98160b2bbdb98012e5db116b7ae6537206de95f65b3c7472326b7739979a12e452bc045e738071ffa";
+ sha512 = "87e3dc181130019499cceb8b3a2f86e0b4ed32defe44eeaeb3df8dc4bae1827eeb90742394c3112cbbddd8960f3aa1a2157dd8903c2eae1cf4c17fa9e3179dc3";
}
- { 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/56.0b5/linux-x86_64/or/firefox-56.0b5.tar.bz2";
locale = "or";
arch = "linux-x86_64";
- sha512 = "04e46a2cc75b662404fd5c107a7df37761c6cde2bbe93f040d2b1b745ca6e3fad978ae868536aeb526e26b4af1f7b961e9327a3a9660e1ae9823c9688a8ab3fc";
+ sha512 = "cd6220bdd6f2ef82b0af214c62ca77b48cfd0f790b9f62316b2a2267aebeee3954935999bd6f1cb2fa4cb64650755ffe208f14b322990704daae742ed126140f";
}
- { 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/56.0b5/linux-x86_64/pa-IN/firefox-56.0b5.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha512 = "a5a7a0ce8df208b595f895428030fab8e19eca9b88ae2484e915766376d249e0455986b3a79fb4314889b35f52abb6aeca7e7b979ee86672b85ec777f8ad9a5e";
+ sha512 = "cc7c72ec73a7618664f759ae9f96d06174d835ff6779f6bb3b199e4a38651de695db0149041f619ca4fc4c9d2284757cf33683c6c107dfc08e25bc39e3a5f6b0";
}
- { 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/56.0b5/linux-x86_64/pl/firefox-56.0b5.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha512 = "427a76174ed62b38ab83fdca0c64eab60c8d8626bf350d15c269056d126a3eb2263ce75f6cdd476ffed3c59b27a77119bc28317640d3407e54a2d17497207a5e";
+ sha512 = "718ec975c1511130799ae59188034dfca681659596755aff6809336be2dd41e0ae744fa2fc245e51f8de86409d5677796efad33c7bdf29873b90dba075c941d0";
}
- { 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/56.0b5/linux-x86_64/pt-BR/firefox-56.0b5.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha512 = "6f93c44b4e3990680eb37af208a1040de5a77008485e7163db861443334cd8fbc86ce387341737699dd0f9197df4ec9aa7668a2b3862c133f0df983d1abab0c7";
+ sha512 = "f6063c710d24d74714b2661e7918566904d3ad4e189ceeec662253f7039f5bc8fe9612ebf618c858c15d64e90e2eafbfaafbec78e441a956c7cb9ad21467a547";
}
- { 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/56.0b5/linux-x86_64/pt-PT/firefox-56.0b5.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha512 = "255a1297cd0c2c8c3f872173276a81a0847f9991d1dd4180555e3299379740a1a65318596c66c8d464dd74bb2b4c6a395fba3f905c98eac3a97a0b0cb4ebf45d";
+ sha512 = "450f191ffd823d3a079f486dccd7cc2480f3aef840c1168b38e187a9073f1c8f3ad093ef5c56951440716d6dc6bcf98b5352d4b863308a14bd5b6b7e6a0f8480";
}
- { 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/56.0b5/linux-x86_64/rm/firefox-56.0b5.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha512 = "69c0e8248a17c54879e3e50b6bbf2054afa8d2f85a7006e6201d6dadf5112ba558d4f8e2839bf65c622dfc55f537aeaaf6fe267e6861317cda6bcf86eb9a3ddc";
+ sha512 = "552cdfa2dcd7db775fe9591246c5c96997f0a86a031a2f6cb2a31a00fe05c78667e46cf288e30a3453d26d8e7fd2480d2f94857720488b6a291bc359553cb668";
}
- { 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/56.0b5/linux-x86_64/ro/firefox-56.0b5.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha512 = "dd696d3f948e3fc5a6330fef299c93d2958daf96eb688826d58f76457931cd69b0a68cd9e1366e52407a2bcc650542c42f592c0b10c682d07faeaae968b0d74c";
+ sha512 = "be2b95672070d82fc92849832a37ba41caff186c1c9203a2cd113f6b949c4d86ad162a607688d3e3f546cc29553e8acd9b3d94c14593cee10365a580af0b7d1c";
}
- { 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/56.0b5/linux-x86_64/ru/firefox-56.0b5.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha512 = "5c788e031ab302a82cc4b7d51f7f2c7d1aeb9a32be241f4001fc8bb64c2331db391b5013480b15ae9426d970eb80fb95d72e3e2819c3ede8d54f9e47c6bfc76b";
+ sha512 = "2825967493d4a3a39aac644484556a09bc9a63e601539115d8c28bf5f2724b22b3a374a5ea30cf8f312e6c075203014df850cce3436da0c5a0dffefe9452f371";
}
- { 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/56.0b5/linux-x86_64/si/firefox-56.0b5.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha512 = "2a87bd1040627364b6830604b9148df4b9c826ff9c8d6a9b8709ffa491503ea25ba32f8e186946021358d66129f0b84be98561be9682369a701bd56ca13d990a";
+ sha512 = "7407388751b8df127156f5ac4519d459df4b929d79f4d82c0d150b8f327698da435460b911a077e25fe5affd05f692d4a18bbb8f71cf3921179c60d107460103";
}
- { 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/56.0b5/linux-x86_64/sk/firefox-56.0b5.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha512 = "defa6ba4b5f00922a45d173fd85982e13a099760ef025c202cd3096366e6fa236ecda704ab97fdc3460f1c66c83e3e8cccfaa313a752f6a038118e2420626039";
+ sha512 = "2b6ca2922e28b061024c1738fc70fb0b31737b938a8fdee3676504a87c73c29751d22f33241a450941200e7fc1920cf66847dc8188d987d47f4990af00622b31";
}
- { 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/56.0b5/linux-x86_64/sl/firefox-56.0b5.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha512 = "adf3e6886f3e500e62f3706ef79e03924e6e9390775b16fe20799d5f7fd6618e5d0c520a8b409b3ee4eb737d8bd2e0f87e1aa8c2b34ee2e0cae1651913215593";
+ sha512 = "ec9d090376d17c8ca283870d62b50961c520e1d841e11137d19f6083ded9ef683cc0d14cca37446be0eb2b5a6c9a9fc79e12c5753316bb7ce0f3cd07b1a0fd00";
}
- { 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/56.0b5/linux-x86_64/son/firefox-56.0b5.tar.bz2";
locale = "son";
arch = "linux-x86_64";
- sha512 = "d6e1e6b2b0fda67a38eb9f7eb8c3bc50f1274fe81118491974372b46fe323419ddb990549c74be040900b372fd52c2cfc193e417714215f8a1b3b07259f2dd79";
+ sha512 = "0f175c5dfeb93d07cd4008967b4f3e492cdf0fe44e3280b1f761a5d9f552a7bc2df12b3e4e5bc8ec388e93ff4d9f8ceff46b46edbb331e7e92e2648804e80e67";
}
- { 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/56.0b5/linux-x86_64/sq/firefox-56.0b5.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha512 = "a787b2df5b1fd9ba57bfe5cc66bc4b774dd4a4b81d11c0d5f0b9c54e1c72590e58d11688ca0ea64d9775a3e4f65524cbfa9740d990197a0b6972034bd4bac9b2";
+ sha512 = "6ec09ee64afc4cf4e6f710d49f8010dc62394e1a912fa6139994a741c6abbb99a570478ecf94801a1ef8316704614fca5e807b0830f77ac5714a7fa3a53d5007";
}
- { 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/56.0b5/linux-x86_64/sr/firefox-56.0b5.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha512 = "3127231295510a1681808d4c65735f2581991ef04fc7af8ee705ccf57b556f3e085a3abf0fe105533c608a27273bc659b8ac8941f2b044a1ec8a9b085b0a2124";
+ sha512 = "0515e265c0ee0a223af68c6406a04c0264e3e806e5a575afe6c6adaed5bc8030b37c70352f84742a85eb70884cf43484cdbabd8de1980034246bdbd2d46d93a4";
}
- { 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/56.0b5/linux-x86_64/sv-SE/firefox-56.0b5.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha512 = "a1bcf79292ddd3efa08d2382a35ca00022e7be2930d832523a4f94db9f25b7ca45054d6d6b6c456f3793038fe4167d8659496f4b0bc812ddc8c58a1e83e279c4";
+ sha512 = "c2982e666bd96ff6bc4af4af2faecd84235a1e314766414f521e0fac9aaf184635a3b40e118fadd3cfbb0bb50fb91834f26a608128125eee5d023dd2fbd6d87f";
}
- { 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/56.0b5/linux-x86_64/ta/firefox-56.0b5.tar.bz2";
locale = "ta";
arch = "linux-x86_64";
- sha512 = "c3ce64381471908f7aa7d4004c8c00d1b05d852c200343ce48cf7d428558d0182c4b13b23190e266269c556165c6f51ed55baa1bad9f55f3c355935c09bc9f3d";
+ sha512 = "603799faab54ec78905c8b5413357a50723090c5c362f3bfd5eb6ae7f62264c5111c4062766848f6f487c0f107a0a17bae87362bfe05e86c448ec455c4c9bf2a";
}
- { 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/56.0b5/linux-x86_64/te/firefox-56.0b5.tar.bz2";
locale = "te";
arch = "linux-x86_64";
- sha512 = "9427ada27b5ad79a556f4e0f7d1fccecec7bafcb44ee19af9257c16e4235bc2078af94acf9e0c0240d11a32a59176040ac54721fa7b934ba12320a67c3207183";
+ sha512 = "be6afcbd8a3ea34ceb53237eeff1b271a92fc46b2138f3c5df9bd33c8be83c7d22a7d3198b91f540cae542aa3eab28a9184fc6b544de906f89fd4732c1a59ba6";
}
- { 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/56.0b5/linux-x86_64/th/firefox-56.0b5.tar.bz2";
locale = "th";
arch = "linux-x86_64";
- sha512 = "83276f41443e931b7e55914fbf32547ab01d58f9d5bce5335cb931b783fd9845f20514b76889f82e357e489b65afa3dd0894544d4004625df08bd2021aeba8e0";
+ sha512 = "3de3994a01bb3238888754ef27a41d37568d7e9e55b42e24071fb8187129008d06b5b41015d612f9caa5777a2e6ea5cecf772fc76e1b0629191126565751d014";
}
- { 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/56.0b5/linux-x86_64/tr/firefox-56.0b5.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha512 = "c93877ccb3a0d4ba9164363b869577a5cd36d85cb05a8d1ff882fac21e333b7ff8c4597647243de753c037525f1ad7fba21dc1acb2ad212802b514af9402896d";
+ sha512 = "34bb2d9358202072ce71b052b4876a2124a4263904a74582fc9973d4c8ee92c00bfdc92a88d663b045bd94945abd8e9d843cd626c16504c2543b0c1bb6a6303e";
}
- { 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/56.0b5/linux-x86_64/uk/firefox-56.0b5.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha512 = "1512592dc0ec9a19e2e92fd39db30b50fb5b26886c1683038885c9d7b18a863182dbe1cef7b8265aaa82e60dcf94c45b84892ae19a25a8a9339382ddab13e327";
+ sha512 = "228f227258a73e9b945c8b6101598fe5a1f963eac7db546bc730dbde6c114630152767e54367939281aa9d97780d1643250140cf94e0f6032efe2a170c88eb40";
}
- { 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/56.0b5/linux-x86_64/ur/firefox-56.0b5.tar.bz2";
locale = "ur";
arch = "linux-x86_64";
- sha512 = "3a90c751054ce848aae996641133e2aa573c4d6329d3dc58465562e45ff450bdbe820828c551de71f0719210458cc71aaa4d0d3745a7feb27731f91befcff3d3";
+ sha512 = "34b3371285df53ed817032cfca1caf0eee92e8b15de741c7c1babeb9bf3671c3bd7ae43d80113d44f6ef5deedbd586ad36721dc6d92b73c6b1a889700e07e99c";
}
- { 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/56.0b5/linux-x86_64/uz/firefox-56.0b5.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha512 = "33d3c67687b235c231e09b6564fa525049e1d99c37c3a5fd6905feee5674c305af313d381eef5af990e878fca36f6af0cddbb399a5a297affa4e3aab5f3c103d";
+ sha512 = "8c82d7db9a48bf70658a1d086c94d0071e2b42677ab4b2eb552f6f42bd57e20a7c8580f065448346d810c0d76704bdd8d318bf0489302f8807f695529df8d4f2";
}
- { 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/56.0b5/linux-x86_64/vi/firefox-56.0b5.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha512 = "8dc83c33bf9e27dd0605c945a746035bf16a189b6d5f0e52a9d65e4f45964d8fadead1b539d9b906ab13cd43a7b2157b4c7040c1d155f4eb7aa67dc987819a3a";
+ sha512 = "64d3173fe6514b17025a85119da84178cd72409763ac4b415d3527afb77eddd2c6b344be9ac74f9c9e066b468bb6c7094c579df6a9379f230b44c21c3bc2c215";
}
- { 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/56.0b5/linux-x86_64/xh/firefox-56.0b5.tar.bz2";
locale = "xh";
arch = "linux-x86_64";
- sha512 = "b0535a8704b8879b86d27cb4867f13269395ffafd54a5acdf49124808f9c606f52cdf9e64a6378fc0cc37a6eb4f955b3613af07076567a6bde71a5e61a521c9a";
+ sha512 = "9a2aaa10778b8da82077b40e3fe5e295c34e7b75dd1d28329f786729059c7dcdd9a74f8e4a3dd123f3e3246c227173df23a3c5e8235fc8e3e05c64c79d03cdc9";
}
- { 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/56.0b5/linux-x86_64/zh-CN/firefox-56.0b5.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha512 = "17c5996c8002cdfd0b07ac796be9b437582cb0c5401fbe0f405dd0f8b4aa3f45aab24bb5a8f364320d62550eba7d228e1c20bc7805e741a86666c225db3046cd";
+ sha512 = "8fff898917a7d05c2d808eb272ea5c0e9a8eacea5d62dc3a40f652a12ec9c48594190c4d5c97ea9720a0da86e3322dfdf3760fc275f1bf23f4c6f328a4d6462d";
}
- { 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/56.0b5/linux-x86_64/zh-TW/firefox-56.0b5.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha512 = "68d9b507ac39d9e175285e5bb4f4f24396687e57622ff31448cf77d73ea8e8817230b65e70c493121b40f4ae91b145be59eda2ab9d572be3d48c14ddacfb28d8";
+ sha512 = "c396e60a474d6869ac1023edc957b1b3d06e6b6a79bebe4512450e237c5f5707ce6d0ecdd5c904b0366c95a3edea331a1a6cace5171a3480fa47c08ee41c1ac7";
}
- { 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/56.0b5/linux-i686/ach/firefox-56.0b5.tar.bz2";
locale = "ach";
arch = "linux-i686";
- sha512 = "e6b59ce7c5c6289d57edbf019e74d2529b2d38f09552110a50d94eb82e7470103791c69c59066405b8e5d1cbf5058730c3bef780cab7b95444eee756b593eabc";
+ sha512 = "90fca234d227c88264494120a5da0433c4efebdf273074acbe073250a5d71a736314859dd9d29e693c8cf5c2056a17b215757fb2e2625c7832673179c2dda632";
}
- { 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/56.0b5/linux-i686/af/firefox-56.0b5.tar.bz2";
locale = "af";
arch = "linux-i686";
- sha512 = "38393317412a3310ce7984e77a5dd12a70edc3da8691ca38b5133355c1c60e2ee61a12ecd5af7ea7b47d20f2718da2bce56c9b6b8b056fd75f9b93d1e196f52f";
+ sha512 = "a45a503a524c7207c120c9981425278f04454da2762ae024ab0c4df37fe355bafa4344a38c2bec49e232bcef100478f3a722c44056516a06fdcc939bb7f76939";
}
- { 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/56.0b5/linux-i686/an/firefox-56.0b5.tar.bz2";
locale = "an";
arch = "linux-i686";
- sha512 = "584ffa243d0d070aa642d3b0e5fa4b7db553f68032d1f0f251034f4c636529f382451930217da9a3fcfa62e7912108f41e280a2f277b5ca9faa2b05ee0a86487";
+ sha512 = "f0195a1aa23b895c08b2afe1569e968534e203442d5a5831cabdef49b9e5f335f46a33f26fb58e585f46907fd059ec28a80b8c5d724a998109b635905a504109";
}
- { 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/56.0b5/linux-i686/ar/firefox-56.0b5.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha512 = "b04ec9e9698e2c70149c772818a8c4ba2e0516e3049b31ea8fe9db3b1f69724094bd2c05685a864f3364978362eb89a51b0e15e7931c61ab3cd4693dfa8d7517";
+ sha512 = "2649fb1096d06dcfce03b4a53acf3bda1bdc89cecd1267df8a67551cd1a8b3ca8d56c6e2a8be9f26d477e68d5e91a8538af2d3e76a7a1a8bff969972bec8ed46";
}
- { 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/56.0b5/linux-i686/as/firefox-56.0b5.tar.bz2";
locale = "as";
arch = "linux-i686";
- sha512 = "2f76402d2333572483ac9441faf070bf55f39bc22a7d995c6e6f06e7f478e54209b1b61fdea9a350f1466b508c35a5640a3db0c4f5f0451de14e535dbc4760e5";
+ sha512 = "204a40f2fb1a55bbb0ca9e6f03764ac3a4e9c24f17a61029f3b6809e54d81ce7d1bf5b87799106956723efb5d9f3cca6db7a32197b7912b079ed786b6325b4c3";
}
- { 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/56.0b5/linux-i686/ast/firefox-56.0b5.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha512 = "1b5c6de905494d0773a7089df87987435b70b5c734de77a6ec44ffb941709d0e8713c54de8293c0f84a77a96fc3b7ca11e9ad892c870236c24a86031e62e35e2";
+ sha512 = "68a1c622459ddc75d667ee3dd969788c76524c1d81e45cfa99f846063f264fec6c9fb2bbd12134af9a2e139e0c272b8031cb432df29838d3c08f93bdc8b4a522";
}
- { 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/56.0b5/linux-i686/az/firefox-56.0b5.tar.bz2";
locale = "az";
arch = "linux-i686";
- sha512 = "d1ed01e6854e3ab1f8e8f339e7d4c3bbe4941ccda88090e09a44eb8828a62e59749218072fa248358c073ab76e84b18d59cbb3cd39550834de9e8c91b81a8477";
+ sha512 = "7fe10e5952b1798241f3269d1b98baaff0608d9aa4dd46977c49383732386256aa0c696b59602c65ad386b0132c70cd5188a791474b20a2fc211eb7364437782";
}
- { 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/56.0b5/linux-i686/be/firefox-56.0b5.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha512 = "807a7bbdfe7e556c4f8071ea8e148cd3cdf2cc32c6c00d91a0563ebbb378599debd0d3e0a5f96f75f4ef0bde552c5050c8e798f6d1bb65a37019aa0b1b61b55b";
+ sha512 = "4fed1eab9d2c1c1290ab6b0117324ce5cf2913a9d7d39082b11aafea6bd69a8a9178ae1474bc971e64fe63a26aedb6f7af5944ce9f5ec311d6e395997a766ab0";
}
- { 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/56.0b5/linux-i686/bg/firefox-56.0b5.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha512 = "fe499058210285f65d81397d182b7e37ede56e60ee21cc7e0680fba8c9dff58a0e8747d6c99e789cc2b7578bba62b5a04b83d1cd1f8e533213ee3ece4957acba";
+ sha512 = "0e9b1e31ff2c0684275a9839f67b3b04ff28f4dbee09e07b5ad8b0b29eb63c5c8c37ed693a65c932268681276504eb84ec9abf97627a4d3c6e9b431bada37e2f";
}
- { 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/56.0b5/linux-i686/bn-BD/firefox-56.0b5.tar.bz2";
locale = "bn-BD";
arch = "linux-i686";
- sha512 = "df14ba0acae51673edcee4e2da4ebcbde1f44e615a56777712b4bf1261c49a1007249b4b547d378906b64e4b97959b53285bd5d0c074fd3e0080537a5ef24c1c";
+ sha512 = "21281a5729c17002152af5ab2e0dc0344ff66b89ba0f1b566fd2a17e71d7515767d3ab1098c746fa8f87be6603dddda2b7d060720b753a07389db82e7f98df22";
}
- { 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/56.0b5/linux-i686/bn-IN/firefox-56.0b5.tar.bz2";
locale = "bn-IN";
arch = "linux-i686";
- sha512 = "5db62ceaf945411c01066e244fd08a95ac72134867619c488f54df05659e6e335af77c6a5341370cbcdfc7c9142a5654aa843b1a392a1531c10062052cf97c5a";
+ sha512 = "5dae77a2ef94e01155a547b2d853bc8c78166a37cecffd367e648e4f04fb87333d716c8f65d521710207f3a46a69a405592a2476b95dbf9bbd799b1ef8837145";
}
- { 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/56.0b5/linux-i686/br/firefox-56.0b5.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha512 = "02d4f4a010cc1ec71d93c1b6236bf891b290bddfca87ce9502f12f530033b26b94a1ea993f591911cb48d52145f2351a34be8b63b67a74498f6a10ee7744cc75";
+ sha512 = "73726276e5920205bc9e5d281dac7995133cf2073b69ba4a5996919a68e19c9fd2b6c57f305a4e3f88feeb890f4f006fd2ccd0ae3c5e89e0cc6ff4f3ba657e70";
}
- { 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/56.0b5/linux-i686/bs/firefox-56.0b5.tar.bz2";
locale = "bs";
arch = "linux-i686";
- sha512 = "458d234394e79ffb87fa3181c6722c63eecf19af4e6c10eaba372f01f4209db60ee01d932fddb335f0f1dfd2781cb3e651e98ab4e69b71974316be78693d05e2";
+ sha512 = "4ce3ce74a8f61de0a2334292ab35ce8189cccf240ae9e3f249f6d736f01803460d2c09504de94f23347886369b1af4d29a3a338ddb2879ef6f2d95b253c40eff";
}
- { 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/56.0b5/linux-i686/ca/firefox-56.0b5.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha512 = "cb0e2dce6a8dc0c211a72bb4e868bc3d04c2baf19478ddb4af6f6adf6c97b7a0ac334017d7faca08d51185e3352140b13c818b2a64f1c74956dca8aaba1edda4";
+ sha512 = "0b57c6754d47109089aa33edcc12f483bbc81d3027d9f09f3e69c47aa17092477d60447e19c0d1ef991927127307d448772fc5e050e73d4b1c75fc91043c18fc";
}
- { 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/56.0b5/linux-i686/cak/firefox-56.0b5.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha512 = "984b28925fdf204b1d0dfb4080f503a520ae38288370ab2e36ac1f32e579b5fcfbce3106896a351472dad078de42656c566bdd56b32088b52fe4bc6ffbada247";
+ sha512 = "5315a9c31ef931c69875415245628cb9b11bfdf6a0900be21ae58a67301e4380b479e4426400081ba9e2735418f0eb2c6d071e830c1ff37b3e5ac2a354b0c46d";
}
- { 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/56.0b5/linux-i686/cs/firefox-56.0b5.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha512 = "18bfdd25f92324a7ca00183f47ec0c43eebf582ba4493a36b6b39b7f178974333df29a2238fec5974baeba271a3f83ff3f274ffc15488c24e89cc2d17766ef64";
+ sha512 = "82e827a0a23b80783bc0bedd7cd2522a5fabb9cbcd63e6d644b4859a34a7ec8f1b6a80df02a389e6ac92c6116f74d642599726cece33c77612dd37de4a106ed9";
}
- { 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/56.0b5/linux-i686/cy/firefox-56.0b5.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha512 = "1aad954d11eb33704782e1ae502d86fe9c428c9cd0d7dfad020e7510348443adcdc7db789fbcffe96691e68880da2dde1ee331d5f51503dc90b839f14aa44ebe";
+ sha512 = "cd5b9e70099f7529561553a12c307f4541de147b7bb7cb45a62c65f8f2eef98b4488458eb3316c6d5102a3f29dc9f9604f7aa9619a179bcc40e28050eb51d0cc";
}
- { 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/56.0b5/linux-i686/da/firefox-56.0b5.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha512 = "0dd9a02adc2aa39fe5ec4ebbd0b6cfa0968b0daf50b558d088f1f0680cb06a8baa526ebf96fe63babdd8dc85561910a5a6645ac11e02e641361491a2c9185738";
+ sha512 = "af9a2f686bc68f54b4fab2030933c49ae8218e1de6e538d6e46f9144e338a3b4684b195ba743cd900bb5a8890e72824491d36a94c0e07ce4cd465b40d931e05c";
}
- { 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/56.0b5/linux-i686/de/firefox-56.0b5.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha512 = "a3f13abc0d8ccc445a495cd87cc690e5875c9c79aebdf6adb04f469483a5870d45fe7a61231bcb3ce07eb64c38ef04ff6e16e75c4852864a3ed1f385d3dfb79d";
+ sha512 = "5c2c13831b8ee7591cae89ad7fa8bae9f34d20d4b473e4ad755a2396a382115f1665ef5bcc0c58faaf01a112dde04a3df391dc77901d0858d90533ac557cd957";
}
- { 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/56.0b5/linux-i686/dsb/firefox-56.0b5.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha512 = "e5bcf46a200adfa34191063503dc5875bcad0cc298f9ccecee7a1346c15b22dad5aeffee2ab7d17b98bd3cd659544422c05ee9f79ff8a0702e592b7d1b8e5b32";
+ sha512 = "75d765e2869ff7ee0487471a5b1c15af22afa9bc8027f13f67de4265277ebc079ff769cae3a051300fc5c682a3d799fe64870e87161dd8e063c9b89cbf6477d2";
}
- { 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/56.0b5/linux-i686/el/firefox-56.0b5.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha512 = "eefcc3ebb84bd75472ee0614d386a5bfe718a77b2fcb7e4296dae1131415e6541f3158b072314e8aaf46851ab718d0bef12339cdfcbf1ce4d1ae19004fc82153";
+ sha512 = "c430ce65539e96de0646307b9618a64f3d0441637798ecc4d0a59f77efee9cc6d269647d22f77e0f50ed01f3bf6f3786d78a4ef95cdb5e92d7765fb142d13d16";
}
- { 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/56.0b5/linux-i686/en-GB/firefox-56.0b5.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha512 = "c03a785ece38365eb69893ff4346f468199ce8753329c781241bf6ed96f595696c0927285db41fb00a15cb548eb74c66696e3962560c5add5b0be7a29936c8a5";
+ sha512 = "f371086cc83b0274133244566720d66120fe086410e768f91bf737870316a9398dc5ebae67b4d5da5dd5df72940d77e93655e94f051cc8b813cc2a40aa7de547";
}
- { 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/56.0b5/linux-i686/en-US/firefox-56.0b5.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha512 = "26d4b175dd8ce02cee25c2f8d6eea4e60ec3ebbf4858a185d38d3593f4397131fbb60208043f4c53affbd075299c69d5916b4ad55b910cbc8cc15952c78d9b2e";
+ sha512 = "59884b1998bcf9a2a9ec0722852b8b29f20d67a32516f00dc28f46ad2c00047e799d8a0a8de3ea5ce28e6e536feaf49ac28c38b5b68e7f304481315ccba71a7a";
}
- { 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/56.0b5/linux-i686/en-ZA/firefox-56.0b5.tar.bz2";
locale = "en-ZA";
arch = "linux-i686";
- sha512 = "f99136eb3831a304ec84044cda5d5fdcdefd1a4814f6372c9edfbffb98d93b551d0cbc8fb45e8386f251eeb0f0a4aebcc12013267a901c2533bcca197ca6b5d7";
+ sha512 = "5119056668a3e539309192dc61ad2bc30d5677c297da4a18d423576bda292218e53b149da825225a016f990fbe5e2538257343dd1fb87a216ea1fa7a37586544";
}
- { 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/56.0b5/linux-i686/eo/firefox-56.0b5.tar.bz2";
locale = "eo";
arch = "linux-i686";
- sha512 = "3ede053c3018b41f113d64f5d5dc14ee1d2bf219e1d7b37ae7ae8b36aab349b1364331d7364850cf40f7913294119c85468a8441f524cfa6f18fbb55c4bb2644";
+ sha512 = "2eaf2e224cf43d5a5920c690c83e4cdddd8f1c2d2813aff1057d99db77a7a68ac818ae311400efd6cea91ac89151c3b532563a9238b26d022be7c260d6fde28f";
}
- { 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/56.0b5/linux-i686/es-AR/firefox-56.0b5.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha512 = "51736e77004f5c9cbe4f303f00ac6c32c9459e55a1cdcab958ece590ae8d575f119ded5bb013600f077fe388e3572d01f31a41f462defc5407d9bcb6da743fde";
+ sha512 = "d74ef9bd620f4d62b79c0cb4c1033b3cc2278375c61f699c3251bbcc0390c657860adfb2c438f5b3eb9ab69413e2767269bdc96000a052b0ed73c0f572ad82a2";
}
- { 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/56.0b5/linux-i686/es-CL/firefox-56.0b5.tar.bz2";
locale = "es-CL";
arch = "linux-i686";
- sha512 = "9ea21d6a5b9d0eab81eafa1a5757aa566b806fd16a925609e46002ad126a633d2373fa8ef27db9388c3f6f4680dc76b946b5ad9f71afa8dc69382323cf1dae22";
+ sha512 = "dab3dfceb1ad8073cbcc02fad1eedd530db1b9092374929c6e5eca55923f30d36f848862fc60aef3b71deebdf5bdf3f7a222951a3b3daffd32a9a60dd6ce5176";
}
- { 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/56.0b5/linux-i686/es-ES/firefox-56.0b5.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha512 = "3d77e61ddb1738c24af8edfd8a2b9905732626ffb51d1c64b2a27c229121ec8df0e7ad61389ffc0c78ed545a6ce8ad9deb424f65c6d6fcad427753f9cee6f1fd";
+ sha512 = "c099fd1756b0e11e05656e08e50c78263f3d75c640322144bee5ced382987461c33327ced61d57cef7119c4b133246b075f443edc0b17ed0fa1e94ac37cfbc70";
}
- { 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/56.0b5/linux-i686/es-MX/firefox-56.0b5.tar.bz2";
locale = "es-MX";
arch = "linux-i686";
- sha512 = "155eae1468c3f4ad4a38e3ab135f79e352da4e96b1f1bd2a20771d9eca6e4ee89a0bf6db92c2a3aa4ea92df8fa41cc63f35d3b78c3f14fa4ccb4521d7fddf102";
+ sha512 = "2c1f85ddfe21f9fd9cff763fa1760fe74e501cbc01fab33d2f06b089550be8f6c9fbd3d3ced7f57efd33073adc9632c1a0bfebbe45acc8edebc69bf3b36a3a80";
}
- { 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/56.0b5/linux-i686/et/firefox-56.0b5.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha512 = "08f8ff1dfc92fbf4d26eef4ed6b05caa6b911fc8a2ef1c655fd6a6216a5469e3086a514deed1b6722e6207a439feac717d3df851caa08f71a9796033b6292a90";
+ sha512 = "fb1e3c9beb39c79c073181f96e84fe7c840146c8e28480618b8d44d1ca7a4930f34e44b415ae02273661a8f4f3918a39760ebb00962a938c9c3f9a7c1179bb5c";
}
- { 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/56.0b5/linux-i686/eu/firefox-56.0b5.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha512 = "407844c56a06d6464446390d35cba2b0ef983084beecd03f4cb9ea93607e0571be882b4ebd35bb25c6f2fc4f65bc64321c1e6f522838c1dd68bab46ea9bee779";
+ sha512 = "f896c5066102e5d5ac16d580e3b70b703c015aea4ced26019824b181cecbd75c8c01d777d36eab6a9cdfd926f722e9351d02b3da8e42e9abe031529b439b1f84";
}
- { 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/56.0b5/linux-i686/fa/firefox-56.0b5.tar.bz2";
locale = "fa";
arch = "linux-i686";
- sha512 = "f5c27b8987623ce46979083aeb2c7cbe0efb9e92c2df6909fefb54e78a25ac3792d78605fcbd50fcf71dca8d09b60c5e92dc4ffce22f3a24130a0e1e5fc13918";
+ sha512 = "a2d88f92dfbe449504b0d68450f56acb6dcb1051d51f54851eb30968bc762e3208ee7a3005f5ed4371c8a81bb3b21fe41bf88a9d9b1736e3d5d34caeda8422fb";
}
- { 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/56.0b5/linux-i686/ff/firefox-56.0b5.tar.bz2";
locale = "ff";
arch = "linux-i686";
- sha512 = "12367b1f896f88a06c3eb906a10a5b288fa6b3d689fb1a452ae93677e37ed89957499937025d50f29ed808b93c359bc9cffced49e013e95a588e2828a4bd3d65";
+ sha512 = "ad7fbe231d45c96ec00d5a3c2ae5d6e47d0ba13745f0415539bd2eef40442364cb8417ff1b86e6400179ef571ee90e10348dded1197d0fdef64bb5f83f143d04";
}
- { 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/56.0b5/linux-i686/fi/firefox-56.0b5.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha512 = "40ccce97079cc5ca9a7db1ab2aba581c4e92d10c83748c654e48d922ca14d28632bec850d138b97c847e9325162bc34a20d4e672aab9b191aed7f5784dbdf814";
+ sha512 = "613c7e26c71e758bde31c294c8a063ab72bc1a9795b4a0206c0629c1d70a0153b03e0a0337f21c91df1f11f9c9228c997300a26978c4af6473c52c45d4eb1740";
}
- { 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/56.0b5/linux-i686/fr/firefox-56.0b5.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha512 = "5639d6800f4e8265bae4b3b49fac10312fceb04be944a51c11b37c33b49c4f418f0c2a6481ff0860652adfd7a0259612be93d784a802769465fb29cf02780c6b";
+ sha512 = "fd065d962171f8438738385cc160396f7ca48e3ac89494bb772d9a778826803ac8d08893b9b1327018121020c190a7cd42e01a540a896019b5f9522a4727515a";
}
- { 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/56.0b5/linux-i686/fy-NL/firefox-56.0b5.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha512 = "f73acd20403e4cf38d365f9b49de1879a750f73ec2842a3ee91da657c5fdb6eaf0695540efdbf3e67cd72234cb9007c2620b3d146a5bee72e30453c9fc6264b7";
+ sha512 = "0742a8ad845fd5269fca4f75716355de149a78768cd20fc2cc44ab3ecb8704a7e9fe75a376ce5b2419946f03b31d1fa702b7d4792f95a728bbec5a9ebb481205";
}
- { 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/56.0b5/linux-i686/ga-IE/firefox-56.0b5.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha512 = "b588a3a9782621b33d9b43e252311e78bee1a49b290bbe055cb01b45eed1ecaa79c8cbe326a4a462a632a4452978a2978d6ac73f7d56d9b4b51aac479bcc5c0c";
+ sha512 = "9c6ad31ac03fcccab8fb7499c3d9243bebb8307ef3881c45eeccdede5180d3ed7b3ce49d12b403286836aa523020e2c400f10f8b6cc392906a41829e15aac4c0";
}
- { 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/56.0b5/linux-i686/gd/firefox-56.0b5.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha512 = "ecc2d97c4713a3646a3c38ea5cc1245ca7a0bc690305bbe0ac3d9b09d903e27265cf87b73f1baf98b50547b321ae4ff984bcb4f9afc788efef9b17962c9ac28b";
+ sha512 = "524e7f7ad6b055f1deb9e6d38632bdb7de2f77fbc67ddf1eb83ca419fcaf056d5a9c697146a252e999f2d4f1595ece70e293dfcb18e9bd6fd6a1d0b1f886deb3";
}
- { 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/56.0b5/linux-i686/gl/firefox-56.0b5.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha512 = "0715dd37ac757f9c70d41bdd0faa26cb6f45745ed17b9e627d51bfc040d9d637f236546cf1eae77c8cabad59f82bf2bf95758e5eb675dd9fb6813eb43214163c";
+ sha512 = "d8d25e18080b72497ea69962afa364f0cfbd8671ed5ef1e52b2fa2cd8f6dd23d71182544651e9a1508b1d50da8f6beac361b9426ea5be1a819bfc858b3d7cb73";
}
- { 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/56.0b5/linux-i686/gn/firefox-56.0b5.tar.bz2";
locale = "gn";
arch = "linux-i686";
- sha512 = "7617f00ec13a6a672b80fda28108e467124d0ee22b5e0dc366e2bc04d5be5eab91c9ec4edc275df7bc7ccf45197629fea909e945c633f58f88c8165ef2628b37";
+ sha512 = "4664536b70c34c35b43ab278874d13c0011890b071d1e3582959315b6edb54b3018135b1fa94ac482860cf6cb15ead63420c1896574348b78265c48f2a016ca6";
}
- { 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/56.0b5/linux-i686/gu-IN/firefox-56.0b5.tar.bz2";
locale = "gu-IN";
arch = "linux-i686";
- sha512 = "15e94de3500b185668ee87880667ebebeccb23bf69c324cd64c9a5f94e6ad1844861c773eb0a7b7479c169de63c8612845902c8c468ff670b37684b1d6059d1e";
+ sha512 = "c6b5374c4bb866314acfd01f1e95713ca50d51fb77a9251e6b228695fb45ae5492d11798369f27bbe1b254b77ce46b67528f1eec72b4b91a68819030f6500c01";
}
- { 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/56.0b5/linux-i686/he/firefox-56.0b5.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha512 = "86a94619d93861ad797bd9457a768f62472f980076d0d526a95e1caff52cbb0136abad76825e191003ec55611429f2b35bab9dcf4a1d62aa226db89261e234f2";
+ sha512 = "b3a652dbf92a1e2b252d40b6c419c508842c779c3d5fa8458402a129eb773762048abe64cd04f41658b566b3a0add948c998ec6ec1ee32fc96f8152785a7b21d";
}
- { 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/56.0b5/linux-i686/hi-IN/firefox-56.0b5.tar.bz2";
locale = "hi-IN";
arch = "linux-i686";
- sha512 = "639469d7c987b366a5be59b45058f8aaa2e5322e0534a4784c19f434d48ba5cc7e6d2da824de48d49e09a56085521e16680e1cc29261c97cf18cd4dcdfc79c27";
+ sha512 = "7e857cbeaf419a3e1685b778c38f5d8f2b437eda2ac0c67576ed50cabf3abc13d8c95045649a3a68cadf053a7af9b64b8bdf84e614f2e52f35fd50b69b234eff";
}
- { 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/56.0b5/linux-i686/hr/firefox-56.0b5.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha512 = "8c4021a8591de29704240d152bfe3283901b405e8b4296196eda3f0b9591b33fe8c08871c3248afa82c3967c7d025896d584478d1ec3b761ec5f97cff498e098";
+ sha512 = "f71b627e820eb44f7b6a61f6d2a0637712a2a516eecde38c2bd13c37f92b34add41b4b274a616697e96340e44144adb0d9812dabd19aea563f90409d605d6ca6";
}
- { 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/56.0b5/linux-i686/hsb/firefox-56.0b5.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha512 = "7316554b2d0d3b1cd559057374b67e9cf805bc827a40652e70d00bbddbc892f68c7e65fff08af2d4742115df124185c3e3ca862901a85ef56ccd658f799ac757";
+ sha512 = "e5f9eaa358e3f87d78daa8eceea39dcff1ba6854252f3327791ce51ed6a51030cc3fd493a11647142edfb94bdfdaef82893d89f7796c0e3bebb674876fcde554";
}
- { 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/56.0b5/linux-i686/hu/firefox-56.0b5.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha512 = "1365f7b1e55eed2fb7d579fb2d9a2efb57d93a4e78051d57980e7b1bf3213b2f577eef6c0f1c53dcb47a7af92ea0b0ba9558e25e84c72e0f32e573c393dc8d4e";
+ sha512 = "9d74b920a7ebab561d2a812c33b3abfe73d4e2343f4f6fc903b65b8d2f6dbc7b63fdca3a567966e9ad4dd2bbf9ab50e88d71b95eb5a667aea5bf913ddf635ad6";
}
- { 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/56.0b5/linux-i686/hy-AM/firefox-56.0b5.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha512 = "14e0a798b4fd9af769a464ff8c2fc87ea69116f7ec66326cb623f4fbdcf4c99f285bb8e65492e9b65cbb86dcf66a52669bd81df37ed00359546072a3709f20f7";
+ sha512 = "0315f4276f80aa0cb4a3e90dd452d1b65a270e830da91f9464f336f9fb9cad35eb446855ee63bfdc08219065580609a29870d1bfca873a88db0f0dc1ea39e362";
}
- { 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/56.0b5/linux-i686/id/firefox-56.0b5.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha512 = "dc15d01a33d3fbd10f26bb9a1758df13f53aeb9f6b0a62abfe8bca1e7a3e233aa0a06981d04085e79e91c629a1cb51510bdb744ff34a6522f374444c9bbb84ca";
+ sha512 = "a447dafebf5892dcc5e316fa1fb325a926bd6d5b3f8d808dfb1136f5fe83eed57bb065844288d7634d8a61f260f87974b67ecc2efb42f5ac8c6cccec5a198908";
}
- { 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/56.0b5/linux-i686/is/firefox-56.0b5.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha512 = "13761e766b5fede7eb123f304bca45bc3a7cf5ffa4661e2a961ece5653c2986a61aee742cca3dc0cdc8bef54b38a66b08e9a45223e42cce9c0a99a857d6bf45b";
+ sha512 = "84e35402b9f5e7cab69276f2780f89c20361fa463afccf985866861d41775bf5e4efd81c8b7d5233d3851910f0c36420ad78e735995d49acbe48201e3162f99f";
}
- { 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/56.0b5/linux-i686/it/firefox-56.0b5.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha512 = "23dc06fc36ef32c148990692ea5bc5266f1ae61aab4a3853034f85f3debee5ea5a5a71d741ffa29136db54d63857edeeca75805f9c7f75c278f06a6c930ac248";
+ sha512 = "53e5969577b9fe93e64f7c4e45825290ccfd4ee7f7a18b53229f8040cb15c45ad558f274a072e92ddbec03af8e405216386e07414886193241e1efbc07b9dc72";
}
- { 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/56.0b5/linux-i686/ja/firefox-56.0b5.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha512 = "f33b38709a7c4701debf19a901e36302b364c911405d96f952c0510fbf95fc4e24869a34e3a336718a0e0f26b5c7fc88fd1a3955c329a352bc1077b73cede937";
+ sha512 = "e0b26b41bc58dcb4f2bfa29fc806fedc3547d4e8b6e97c79750d77c3c822ed8f410bd0f1e99c3d261cd7f187468828c0d1eb86b67d7c67a4ed164647c323dd39";
}
- { 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/56.0b5/linux-i686/ka/firefox-56.0b5.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha512 = "7b684624e52e189ccfd31d6d910b18148f9040eddfe0518710388dbc1160c2ac068f0de39faa42eccfba7823372290f932d3693ad898a0c7ce20f6368e696f1c";
+ sha512 = "d14fef9f3efa294df9919d25a43233d979ccede7107d502354b2ab62949d6df3325b8b920684d0994a3894f88730f3edc5450d90bca9056fefc58739b60afe48";
}
- { 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/56.0b5/linux-i686/kab/firefox-56.0b5.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha512 = "9a9f8ec3cb7b86866dfca4a4f5ac25e13135896144af816ed2242091fa8719535a7d2c225be6650cdbe17a9bdc7bd2bdb962e40abd16428702c2570cd06a798f";
+ sha512 = "24212c3f06b204a348a6f864c9354d93317098093e84f57d6c8017618f2ceb15098136bc0afb70d315254cdce37ed73f7ede1db18ae1d909ce85deead4fae61a";
}
- { 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/56.0b5/linux-i686/kk/firefox-56.0b5.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha512 = "c7aa9195a8bf39d65deeb4233139c6941433a7bef77797532fa346b509cf91c8e2041a24569996f7a5e7d2fb0e4a108bb40337cf1283195b257a5526d89b3bf0";
+ sha512 = "2cb4bfeb2f2d3f0462e776ea82882f3431fc1877f89500aa70933f9a352b2a2fc77a9f2453954459fc6c9a22103476262bf5239e8bd4252ca7bd29a33536390c";
}
- { 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/56.0b5/linux-i686/km/firefox-56.0b5.tar.bz2";
locale = "km";
arch = "linux-i686";
- sha512 = "45a5dbd1ecbfbc69a4ff99327a234e9b26f06b9e280cdb2e0689b4378a84eefc4fe3a511bf8b111db873ccf39f7b99c1d256218accf190975d53ed574d565747";
+ sha512 = "745a5cf7ed4435ebfc1f2bb2dbee3ea76820c1758835c032579ec7e4afdfc9e43e28836a65bb667ffaa9bf1168244ebdc1ea14c14265e2ffb8d1fb7d4321aaa0";
}
- { 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/56.0b5/linux-i686/kn/firefox-56.0b5.tar.bz2";
locale = "kn";
arch = "linux-i686";
- sha512 = "75574a88816ff42e8f20555a55f41bacb9d33d2535843b38d3079d0487bd1190b392e07e7d97f288c51f38c053bbbacc7acb34a835a7ae39814d6ff2ebfb1510";
+ sha512 = "95be01ed5085dc900679c23eda769fe0d83f09fa1269dd006cf2f2a4585b3d4e4175472db9e54d9dde45bdabe517149346a15c3eb42a47a935b2ceea7dd31f82";
}
- { 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/56.0b5/linux-i686/ko/firefox-56.0b5.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha512 = "2bbe4f990e2265e1d210c52987759486e6127a875ee55707bdd8fbceb44943215c28faa5f6c06161db7b7f18c2c2c3864882ffcc1eda286edc59aec7e33aca0d";
+ sha512 = "339f3d3353a7d2f739f3796b53f42f8b1aec930a0bc63a2593f3019b5ff246de2ac99753638924138cb9febd5e0359b77108261337166e3018d974a3f88f2714";
}
- { 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/56.0b5/linux-i686/lij/firefox-56.0b5.tar.bz2";
locale = "lij";
arch = "linux-i686";
- sha512 = "9c3580a05057f7e04f6efbf60b281c50b64970064dac547cf6a84ed305c8dab5d014f96719e70c87e67124f61afa3e1a44ecc3627fd6a3181e3dbfc28ed175c4";
+ sha512 = "80de8bbe41e6d5a7076f3300cd90820d75068c0bf08cd8e7d79a63f2118fc3c5f5ddc4316afb884d767dcf95ba4b710e40e78d5b35880779ecb286350c9e834a";
}
- { 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/56.0b5/linux-i686/lt/firefox-56.0b5.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha512 = "37b30fdf603cd41617db37cc9ba7e546c58a6bb58833b461fdced4caaf128bbc1a36ed774370548b8249da884302bfedf52681af61348313c5599628576e9c57";
+ sha512 = "8bdd86ddd12f39820a639dbeb248c419efb0a7aa11223ee25b98edaa0c1aa514edb29c498932a9d2b5a368811b902e1a875c74704661f4785a38c4ec867bcfc8";
}
- { 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/56.0b5/linux-i686/lv/firefox-56.0b5.tar.bz2";
locale = "lv";
arch = "linux-i686";
- sha512 = "7d075198482100a338105bb80d2d40d97d24460f2a6b15b72b349d249ebb638112e69bcecbf32578375d5621f3a46e6267401629d2fbe1ab6dc5d72dba454086";
+ sha512 = "51692ee445ab31d6443a823017405305af68594242c6a24be59db1ada2f9dfeb479fe595fc0590178b23daef59ce6dd84be3dd1779b4dd9f516a8f59be9d7c7b";
}
- { 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/56.0b5/linux-i686/mai/firefox-56.0b5.tar.bz2";
locale = "mai";
arch = "linux-i686";
- sha512 = "7e052470a133931183439deba29a16097ad50383b63f97d5a1c03b7a3ce0c6485811c1afa2ea78bf9f03def2b0678bb43acefb2c1b944d8c12ee18e44b5d520c";
+ sha512 = "8459e52c6961e5f42f4547e6ea33707584a10a85fcf5b3b83eea4b4f06b2169c7dc39659ea41f3a4f1e554da5af2f9063503d9333d0d5553a521499b1efa24fe";
}
- { 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/56.0b5/linux-i686/mk/firefox-56.0b5.tar.bz2";
locale = "mk";
arch = "linux-i686";
- sha512 = "ef6b8ad5fdeb7300c9676a2232accca1cac1b47896987455ec93ae8b8cf46dc092e224b417f922bc4cc0c41ce941d607c4c3fde6e305e274750af72b8c405389";
+ sha512 = "666e675faf3747877eeb8e188a68a1c9979a5823a7bcc63c56e53697084d4673363e057c3c73c51dc281c107161867d20adf615bcdda14f2c1dc6f3876630d6a";
}
- { 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/56.0b5/linux-i686/ml/firefox-56.0b5.tar.bz2";
locale = "ml";
arch = "linux-i686";
- sha512 = "79dd88442e22ec9b98d432985deafc68b6b5c3dcadf6fa0a04292b019b3245c24b2fd08784d4c4d804c3b913bdf379753df4ba24ec69cdfcf9fdd659c8a18e4b";
+ sha512 = "db10acd345e98dae88e059df5ab0db7cddbf4243d0fa1fe43d4c1581286d1a625fe0d8808d6b23d6740116cbd99c487562b667e32c42c6749750090b3b0a287c";
}
- { 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/56.0b5/linux-i686/mr/firefox-56.0b5.tar.bz2";
locale = "mr";
arch = "linux-i686";
- sha512 = "d474b05fc960f2c12319bbf994027945ed655bb8b6e766e1ba04f9c863e4d5b6d1ab8d632e0051d1191bbaab87e4793e8c1240372b9b0e0f170da03856c5d8d0";
+ sha512 = "1715b23b260872a8aeabda5476fe6ba6499485566525542968f2cd144e10983b38b7713614a846d06dbfea18f49f08ee7b5eeeb90baf908b5886a09f7d874f46";
}
- { 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/56.0b5/linux-i686/ms/firefox-56.0b5.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha512 = "c5372584abf3c3ccf858c50927d26099504efa43feecf487639ab7a73e87da6137e29f31a440d7b6eae43092701e68c02325a39207f95c73fa2db303c3b402d6";
+ sha512 = "548616f8d58c140ce0d0d8c181219c8a62702c1d4a11addc54edceec81cb3e98e6743a5999c03f5076466e9bb0fd00345306ab7e91686c4b1815ac6c99755228";
}
- { 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/56.0b5/linux-i686/my/firefox-56.0b5.tar.bz2";
locale = "my";
arch = "linux-i686";
- sha512 = "e5374a80b05eab9dd8b4a279ac96edc52930ee730a9108f76a022e3908f5d81c3e5db9ffedcad492edee532c2606982a6c76733a971cb5d8f64ce68d04b113ea";
+ sha512 = "e13dc5258eb2f751ae79b3aef7892aa9ed3c56eb44fc7e32aea240b2d73dfe5cc6b2ab07ab49548023a099f378c98b8245800edbe73d320b45d1607350145990";
}
- { 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/56.0b5/linux-i686/nb-NO/firefox-56.0b5.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha512 = "5077c2c497fda39bca53fd140241fd9bd3cde4f4e1ce3e7fbb101fed4a24d61df81d99db40453d4745750e24499382afd83e78cb67e82bbbf91158505472472f";
+ sha512 = "75e02e3aac37c840bd6725207ba53beb7cae3bb7a34bcc4c4114b412774114315d17a98457970b3f8ded7911610811bd12b9614826755f99bf6cb3e9018f2909";
}
- { 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/56.0b5/linux-i686/nl/firefox-56.0b5.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha512 = "9eb8e46b9ea30e2865a009beed1c4c515830b1acddf79c2a0c035e8005dc646f2ec1d011474cfe53c07f3bbc73071765e7a88aaf0ce24378b1501cf5f246b106";
+ sha512 = "480de8826af835dda939f63fc007b01e88ea1cc2145e80e27ac9abb36bf85d5f0f7441a28623fc6b648b28c81ae02133df654a874942a497682c14a03280c4d2";
}
- { 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/56.0b5/linux-i686/nn-NO/firefox-56.0b5.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha512 = "afe2b9c41cdd692b9166ddfecdb78ab94a3bb91d60b91e3e79a203a1f928a92d40eaf7889ceef19427dda1464155f85d0e166e98bd9eace6b071d3b30f954071";
+ sha512 = "be5c63efa39bc574cd5f41bde6b35d3ccffa43069c61b11c75e0f9039c90e47b56bf41f20b041463cc1638639c581c1682605b24fc1621ef6380396e64d57f71";
}
- { 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/56.0b5/linux-i686/or/firefox-56.0b5.tar.bz2";
locale = "or";
arch = "linux-i686";
- sha512 = "5eb2662445fa000b626e5f4a0195a44d8e00c630e09fe386eb7d77fb514b2ea939c07c23f299ae050260c06e6e68abda8e32a2ca8c5155e5f1d5e223add04e48";
+ sha512 = "a448cf44d66e795cf2549b21728ceedca364091224720c1e72524ad55660721fe48b6ab5a3b3824a4de962bcf093a467f2dca34921bf7107495b9592bd87886e";
}
- { 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/56.0b5/linux-i686/pa-IN/firefox-56.0b5.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha512 = "7e6ab9ace1aff3de1209992336567da167a3d6681af81354b05e36012545df1ff06e1a825668de7146e843a56c4e3a110ea530351ed83b129f9989d24bf86a2b";
+ sha512 = "f3b3f12a19ad1ab45709f1294f21bca08b9d39bc3b1a4bb3d7bca304443de3c5718c4b714a95c3d858dc87b1bbddbe34d7479bbb2890cb5f5dfe5adcc639479d";
}
- { 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/56.0b5/linux-i686/pl/firefox-56.0b5.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha512 = "fbddea93b51eb530f26de74d16a1d373ca9b86a8fc89b7f12c8ee4e2f3c3af8be22560ec11ee4afc7d93c305eb8f352931a06b2e7dcc11eb1e9ec755a2afc2a4";
+ sha512 = "03be7e535ce2e13d87c19e95711bea4d76e26517b8e877c4dd5885c7917c0079e8642126ad19365325c224e10a419586f109de5b71767777c0488c0213447c09";
}
- { 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/56.0b5/linux-i686/pt-BR/firefox-56.0b5.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha512 = "6ae90c6b37258ef9e9b93fdad261c7b2522ee3b251c36f03dc6bf964d91da86a05937b0a65c75bb3531b7c10be6d5ada3a88b2240dbcf1c64c5b3f624acedcb7";
+ sha512 = "64be7571a7ec3a89098f309edced9f492cf0c3cd7a1fe0154d7e9cb645548a21f55c1631ae5ef36cb4ef0cc1f9f977ef5beeb8fcaeccae42279c2028339b3825";
}
- { 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/56.0b5/linux-i686/pt-PT/firefox-56.0b5.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha512 = "0f1d035f72a3f0739f843e97e1ab27c3b5b5901e88eb8adb9d8b343f6b5f571133fb8e9f40b3df14e4d7e1144aa7f1af86e7100df5786602185e4ebe425c8f97";
+ sha512 = "0a72d994790d9ff05e799fdac7f74e7033bbab686b0c8ea5a997e01ef1e9c93e59ba760eca254bb177358fc09b7663416972428939189a709599685db543661a";
}
- { 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/56.0b5/linux-i686/rm/firefox-56.0b5.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha512 = "7ec0f5792e812fb2d57d420ecdca006f5242f6c3599b58da01e3ee65df896d1853fb61ae0413ff59834a669690ab40b74244a31be5033ca215bbe784a7a8cb3c";
+ sha512 = "d5e1872e7d05b854c04b67eb920950bd66f62d37c747b656f87cf37506a111df222557d8cb8b7968a4123f6e8e490256f91d13d64a0744991c8f9e1e41329aa3";
}
- { 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/56.0b5/linux-i686/ro/firefox-56.0b5.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha512 = "653e8942d04dc440d998229ad8a10ec8a1098ef85331abd8e1676c05398dd4b514f5fbdfd15c1b20ab0fa83216d7ad0b0e4d20b6555aab9a02f7fdf139d11e35";
+ sha512 = "80f9394ab1d00cc4b933f9460e7ad1ea6092b5caf4dcd72db53536dc46d3f2fbacd83770a1fb5a29713ae11b7f3c0c0fc2b96734169ce45a5addbf03cdf6b2f1";
}
- { 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/56.0b5/linux-i686/ru/firefox-56.0b5.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha512 = "66c45ddea853348cf0084fb64710ce0b077dc6521767a27a83eadfc237becf05e26335d85fd1701ba4790e80a2f5f971986c1a3847cc84efa2aaa8623d0b3556";
+ sha512 = "f116481b96b8bf426f034b6374c8559b7695946fabe898683035be02d20b7ffee6a2feeb3b16a575e107996b017ef8f4e3f23c887ccbd04ad7b8f687e2af760e";
}
- { 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/56.0b5/linux-i686/si/firefox-56.0b5.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha512 = "69bc89b863e9a4ffde9ff478331a88b93a42a2cc5d51114acc995189c63301144093b4cd156864e6094940d64285797f83ef920b3231a427a149c5f6dac37dc9";
+ sha512 = "af93d52c290d07a60120cc0422e44099fdaf0e3c1fd7babc1f4779f77cd8c8848985fd1c7bb558d8eb1252cb4f96d1b65f5ba9e739e91e6008b5f8f2b581f324";
}
- { 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/56.0b5/linux-i686/sk/firefox-56.0b5.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha512 = "6b36b64b3edd9a16ba7051727a8ef326473859a07006159cd2b8a6fff25b0cd9649511dad03e5286e384ed74fca4b80d257cb0e754ee4ecd6eaa7c589478a5b9";
+ sha512 = "88680ad43f541a8ad9780188b92883aaeb805f47b11346f40d236b8a4ff3ca7e719270c01ae9765e336788d93c54ca8f2a80df3e0316022169702db75fbf5ecf";
}
- { 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/56.0b5/linux-i686/sl/firefox-56.0b5.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha512 = "19a6c7c7d7f8cc2a2f03bbb23f28c4691152ffda292399b6e438dbc3afe89dee98be86ea4d7f27d9d4f736e68a6ff21db1cbb746bcbcb9cd6ba9d7e23155cc21";
+ sha512 = "45692963e9c6c9122832ca105a19e4a9d6a4ae0c0fa66c5573e0b02ca74e2b72bfc229619a3ea3899ff591f70775949e53fc36a5a6ffad699f3824d8b5723b75";
}
- { 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/56.0b5/linux-i686/son/firefox-56.0b5.tar.bz2";
locale = "son";
arch = "linux-i686";
- sha512 = "df598c9156ba76218f4f0d87ff301a3220979abb3a4f5af19d0545b6a3ad48719a8267da22a31f646e6d20ad1f6f090579c9587e949be91559aa58455502a156";
+ sha512 = "e1a43d8d56105fc7ae69b23f3cc596363d7e0e22b18614cb512a32ecf3f9369be240cbd2d5775537363e40e3de0f0494054331554f093c40dc85d0f1aacde366";
}
- { 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/56.0b5/linux-i686/sq/firefox-56.0b5.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha512 = "e8d53fa58ce1d34d22c7460c9b9d9111233047148e503e5a628d8d8e1c689b2c4a302048931dab44ee33ba2c4831362d3e74c294e907f1c5eee23d464007343d";
+ sha512 = "a80d2f2dda50f2977346c51d25eec1f52363282e83eb83dd8d6ac36ce41ae5d8d5f3925db70e2942e38e9cc61b30341c47d1fae7e60c68f8bb1ef28f1978d695";
}
- { 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/56.0b5/linux-i686/sr/firefox-56.0b5.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha512 = "5d3e8d3741ee0ab535479ded3035379858ba092a8cebbd5ac8bcc525e88159594f5cef90894bb0fdc5eb9c349c435913b89a030ebf942054110d37e57bcc50cd";
+ sha512 = "e379874f97402001a48954674d84243c8da577533e309fa7f61c832c413519f784fa418d35f00b7af760e55a75f192fd97532ef2b2796130b396782b1c6b9d2c";
}
- { 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/56.0b5/linux-i686/sv-SE/firefox-56.0b5.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha512 = "98da270b0da5091cff599cfdc9a0d241ab8463c1c9e2771f81e8c0dd7ecf567e2cf4ea536b81cfd6b1679e449d7f1d4157b8927f1b1b0a03f3cb7dbfbd267d65";
+ sha512 = "272861b15c0476f10482f4ffba5178a7e4cc5a62e52337eb217ab06386d75998bdca7f31f478541cbcf330823b3c187fb5d247cc311c973b41f7cc56f458814d";
}
- { 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/56.0b5/linux-i686/ta/firefox-56.0b5.tar.bz2";
locale = "ta";
arch = "linux-i686";
- sha512 = "63287a39d325111c7e18b62a9b76cf0e7564709846cad78a946852fce761475edc61e292e31491821215b0cd2f392e8c41b7ecf0ba78ac3440cdd4f7f9b52d21";
+ sha512 = "bf2d304c978fbbf65aafa5ae01fb7da0cda9d2b133e0a78c21923d9f35c9fdf41d5aba17c863aca79ad021875cdfea934d6ed9db8010f66f6552860ea9cb6bf3";
}
- { 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/56.0b5/linux-i686/te/firefox-56.0b5.tar.bz2";
locale = "te";
arch = "linux-i686";
- sha512 = "476840816b36816b967f86c9796f6df4afdb3d7524f4268cd867393eac83ff868645eb14ed5766aec87ba3c226e593099e15d44aa63a01bf422a12a4bb5c77ea";
+ sha512 = "a407d5fcaf5b1cb01d7bdbe3175327d9f985af0ff8b5b27ac93345c1a4266f4cb1753f357603220757202539c5dd7c2c7bc197d18e68585a4118384b729317d3";
}
- { 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/56.0b5/linux-i686/th/firefox-56.0b5.tar.bz2";
locale = "th";
arch = "linux-i686";
- sha512 = "b5dd1a09db20a788261a2f6812a6b35be7164d14cce7c700af51dc1cb187801c2ecc0d0b035386ec4340af25c8cf651f9dd4c679bd61b335866fd2d7a531f7ef";
+ sha512 = "a3ae0aea5eb5b4df9e12c039cb2876fa1bc39c0c6a1d62971a7cef532ddcf6d76dd3c2314efde74b3226cc75213b2e1cb0f80718408f707ef4c986320dbe3c66";
}
- { 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/56.0b5/linux-i686/tr/firefox-56.0b5.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha512 = "08a002ec452956730d02985e74c9c1c615783d19fde6c1ee3da3adaeb1ea021c05c865e72d8dd7c930f9351ee376cd42b20fb90916d276344e7b2d17eda6f458";
+ sha512 = "4dc598410320ef44ad558da2f678791796dbe86c3d4c4891f7c50496984b2afc9f9879488f4f7fc4446ddc237ada5bb9d443b9822ad5dfa9f0c6e46d6afc1ac5";
}
- { 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/56.0b5/linux-i686/uk/firefox-56.0b5.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha512 = "7c75010a3a15f2208774f3e92317dd88c2a821c468a84a5855e4db193c5fa6d639d4b6969d3ef72bbc90c47212854abd0002295f163b06998285d439f50ccde4";
+ sha512 = "989dceca0a7c5a0b091b1ab80d15c140a3b59f950b520a0e2e87436fe4e32a28e9508ba82335e269e5fd562e31a56d7040097e1fe2365330aa257c5ee227aa4a";
}
- { 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/56.0b5/linux-i686/ur/firefox-56.0b5.tar.bz2";
locale = "ur";
arch = "linux-i686";
- sha512 = "2d94f170a3eb66ef776c0c78c53d16716aef47218122bd5a9c7910fc6f821a5ae54192cee0314c48c7d6c5336f442532594c31e4e0821cb427f617590b8b7ae7";
+ sha512 = "cda7780cf5a9bc6a06c1ae9cd6f9f52911f2ac55aa700f87b3a3021d46dcb31f1ada5550009ed801f7754b7a5a19c3ef25f537e6280014c80672543701658b90";
}
- { 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/56.0b5/linux-i686/uz/firefox-56.0b5.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha512 = "21880c1a14e339e7b716f742c2910451662712a3870605db9eac00729b6cf9c2043cc49035c86044af8512239fbf05ea51ef476aebd234a7fa9317cefbd43a29";
+ sha512 = "755d03ebdeede91ac2380d53f4cb130a48331f6e8685eca21f717fc3b8768239a96328086733f768349ed231ad9b2716b58c4912fd8044f644d775489c4030d4";
}
- { 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/56.0b5/linux-i686/vi/firefox-56.0b5.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha512 = "5efca9a9fac37440d41c444497ecb2a5eb56b47881b46c66cf65b3b78353fd8a18d37c93d83400be1207193c7dc3a901402d679c50ebe55ddb93687439d4874e";
+ sha512 = "56946ebb5e9746d9cfd9ec14cf72708fa17237915c5fd9d953d7ebf5ded0f3e2778b8777a1ed9da191741baafa47e27cc12eaa2a1de46013104aafce251110cc";
}
- { 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/56.0b5/linux-i686/xh/firefox-56.0b5.tar.bz2";
locale = "xh";
arch = "linux-i686";
- sha512 = "03927d0b8bf3c261fd00a043d8499e3686c7abc51eedac63f049d100095da2b858a2cea582c8aa2e3f65e1269b7094559709c22fd633a0cda29c6b21f3987eb7";
+ sha512 = "081be12a468f7c8dc79336cbf9e08082d0f79c39baa491a10b9a68cde05de78cea67cb247008d99c241e3c66deb5b92bc3518150138103eb1c75f141f6ed03ed";
}
- { 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/56.0b5/linux-i686/zh-CN/firefox-56.0b5.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha512 = "75a77fff929aa72700b9af9452e2d0fa93f21136cd7651a32970fec24332d3c9a7afd58a823e3dffe1aa63ca49057c62ba5ce579021a783a096733c23c71bbfb";
+ sha512 = "015d744fa850e529d61e4dcd0fc5459fca47e7a4048dd5b3ddab29c2474cef6e76bf5fdb1e91ff1df843e3dd1834373099372bc36270358a77d42d4e39eff8c9";
}
- { 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/56.0b5/linux-i686/zh-TW/firefox-56.0b5.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha512 = "d83bb672b5587b6fc8e2c4028f144821282b1596ca88f1aa889f4a2601d46fac44c7302d30f23179db6540e84e878244c4291dceadb56045f3edbdd41bc42a19";
+ sha512 = "2fe5c828da675b1b1e5b53fe9d292db27ef449eec8f53160fd60893d0bc523a0131209253d9b7c1846e8fcec2145fc760fba29c4e3850f97b2c3cd3a1b13a085";
}
];
}
diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
index a436cd46a11..2da11eac98d 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
@@ -1,955 +1,955 @@
{
- version = "55.0b2";
+ version = "56.0b5";
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/56.0b5/linux-x86_64/ach/firefox-56.0b5.tar.bz2";
locale = "ach";
arch = "linux-x86_64";
- sha512 = "003297708bc29bdfd471ae4af99a39f3c4732a067ad56e7f5a49fe8caff7a88dbff9245a4e8843f504f80c0defd2c2fa62819e6b71c176da6cd0cfe9d1c614d2";
+ sha512 = "42b7889e0358946f0852079433eb84ac49b88eacd5baa1213082fff71a8bb2b060b50b6356c20cb2b59ebeaffc245f04ed086a4fe466886f5865c857f99b9ce4";
}
- { 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/56.0b5/linux-x86_64/af/firefox-56.0b5.tar.bz2";
locale = "af";
arch = "linux-x86_64";
- sha512 = "4f32ca70b0891bf25fe68196f5e78fc9368cef5dd2016f8cb0c0b099fca34b154bbc6b8faee831320fd0bbfd35f81ad379e44c7778d78b1b517175b3d5a42dd4";
+ sha512 = "c784881efa9b4ebb8e5a892a4d9fed02f85f541461e6fc8065d9a6a8db629636e00eaea7d1cb009005de829387a4c5614465e696ecba66af2516cfbff35f6d82";
}
- { 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/56.0b5/linux-x86_64/an/firefox-56.0b5.tar.bz2";
locale = "an";
arch = "linux-x86_64";
- sha512 = "01d1d9df2c24c6e41ab6a29028ef0c38630c7a786cb310eefa93adbd334d8b1e65335225b3fdb9f21bd8740d4d9710085d750144b2670b4a30e326bae0d96d78";
+ sha512 = "8440277fcbf3b927ee5bddeb572d55ef2f23997016f8cd5b21e88d969cd863a3ed7076d9cacdec4939e58ec2bc706099a322336c2fd4b796435165d55f206112";
}
- { 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/56.0b5/linux-x86_64/ar/firefox-56.0b5.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha512 = "731ab03cf719f8181c097a40436c5123c2fac528a4c420b5564d79d094bd506dfe58c8718d7fa1a0d3e3223b67173de1826046fe09c763248bea79b7e1485c4b";
+ sha512 = "4cc24cf7ae84bdb9520ebd6816a46c6311ea92dc50c2fd8fdbb4eb2384bb45357b9dbef641ffd5be1ff4fcbbd23b2fbe53d68136717fdd3031564309cffbc2ff";
}
- { 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/56.0b5/linux-x86_64/as/firefox-56.0b5.tar.bz2";
locale = "as";
arch = "linux-x86_64";
- sha512 = "78f9203b0cae15830ee289b540d56e6664a486f107f99b42020809375ead3193da2e4e1bc7bc25ac20256ac07c55e4c619302615220b0a1ae742ded4f4d6afe7";
+ sha512 = "2d0d1f5fbff86c7e0f53ed4c721e6b2e1bc8169aa5a2c75f4752347614da669b3d097e68e62b0b53373c408818ea01fc9716a7a0b1932f6ba7273d6f31fb99aa";
}
- { 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/56.0b5/linux-x86_64/ast/firefox-56.0b5.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha512 = "401afbb8c2945724b0754d95b0385822d77a9018874c067b83864546c5565735d403ccd1a9f999af0be10b806ec2b64bda5f28306f90e5171406b8a79dfe5975";
+ sha512 = "fc7f099bb283540974eff2dfbec5fb212b3a27aa09be8d04ff847d99fa37183435f296cae389fe4161c436d3005935acbdbe00373c54cc5d18b140f26c3d829b";
}
- { 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/56.0b5/linux-x86_64/az/firefox-56.0b5.tar.bz2";
locale = "az";
arch = "linux-x86_64";
- sha512 = "953b91a7681e033219fe80d63ec41ed50025f1bda91cde9f6124bee46ed89e38c8470257e1791878443adfda94a579c9261c2ada6c8d415a62dc27b38cf6cb66";
+ sha512 = "557ddac93830536ace4fba1ab634e1eee14fa3c09c3dd95a16c169437f8c255d5eee4ee54791d8fa1f97123b9ebbf91a57cb70cb4fdb61b8805c2252f1640329";
}
- { 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/56.0b5/linux-x86_64/be/firefox-56.0b5.tar.bz2";
locale = "be";
arch = "linux-x86_64";
- sha512 = "366f951b05f62a0f158bd1a345fe1540647c3a1d5b91c49c2d104f76974a64030e830dda3afc15828309f88100c4f12d5dfee98827565c96acd62a4e0db24e74";
+ sha512 = "420b8d556a0b6364e48eb04eab3e29a63c63f52942384c0d9ae19532754b51c98bb0b8d19c871c92d8d9127cd289dd0a74c30e7167d86e32d378a7820bcee184";
}
- { 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/56.0b5/linux-x86_64/bg/firefox-56.0b5.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha512 = "51542bf88583b2f2dba75e1abfc892c0595737e74ccc6844cb470513bbad7c337e1ccfaa628f08a8d5ce09b91812ea07758831d5bab54ac961652f905c9b216b";
+ sha512 = "b63385545d6d006e0febe92a835ad4b809a24bcc9c44d356bdfb2338819e6430d0c73922a45fcbd6fc076362794daf7a68a9662aecab6e610a518ac604757910";
}
- { 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/56.0b5/linux-x86_64/bn-BD/firefox-56.0b5.tar.bz2";
locale = "bn-BD";
arch = "linux-x86_64";
- sha512 = "9f41fae202b3a38115b1efccb0358f3b8896d8f44730f4e53896fc48c9048d6a1ca8904217312c6bd9f9ebeee1514a85c1723acae8e293559289aaa6b63661ac";
+ sha512 = "3d4754940f51a21bc3e881bc454349ed9bd6cec84395566d76d1dccd8c8464cb8e485f35d1e920c7ec0ec93304c16d3d323a94a00f3ffffaf5fdbce46da24da4";
}
- { 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/56.0b5/linux-x86_64/bn-IN/firefox-56.0b5.tar.bz2";
locale = "bn-IN";
arch = "linux-x86_64";
- sha512 = "6c617687ee2e1460addc86c383a9967803a6900845a2c98d4ef67f2007d3cbe82e6e8b046e4d990b59b8a001f60eaaaa34a50494cc1c8b9d5bfdf3951494022b";
+ sha512 = "fe16eb336eaadca6c73ef1655011ec8acfa3d4166f21909ffba109fd90190810b66ef3519d172b0f963f41776616ab41b25dceb8f9a6b775c8df5f305f6f1555";
}
- { 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/56.0b5/linux-x86_64/br/firefox-56.0b5.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha512 = "23cc36ad34c20003cd3a4c11eb22e6b35ba1fc43ec81fbbef0ca3c7aee445920d66620d355b60e6439296ff19805d29f7266060c2abc5937b266fe45f5af251c";
+ sha512 = "17b0a958074d4db010410fc2278a8a2a4777fa68c8796b28f70d0b65ffc341de283ea6b89410c5228482cb920ca21031784d4e7a3afc01c8ed0b0412bbca8cfa";
}
- { 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/56.0b5/linux-x86_64/bs/firefox-56.0b5.tar.bz2";
locale = "bs";
arch = "linux-x86_64";
- sha512 = "97b1bac5f6637c07578e689011721e261feef2535feabef4a86856a45c3a48c34da692dcff7aedd4c381159ce016eaec0b6c50acf21f9e045a4679e494c01a3e";
+ sha512 = "536f92ea3b7b390414bbc9178d855fb3783d5659ff165d6846b5233dc9e46fd46323783342f939b8daa2489be4df7f3f33859f629437693dcfd3fdd982192905";
}
- { 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/56.0b5/linux-x86_64/ca/firefox-56.0b5.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha512 = "e188a8de2f0fb240655f88176a138a7816929a5acc708fd66960b8f51798fb240e63932498eb7db64868eab95d2b9c95935eb6475a0752e1525c5c6403a78616";
+ sha512 = "f7b36fcba699aef0438192bbcc13cb6426b69036f1256c07422e78df45220960dd122f9eaf62984041c142f2fc16f858561d9efaa509852696d0c869f097df8c";
}
- { 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/56.0b5/linux-x86_64/cak/firefox-56.0b5.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha512 = "f98825c86e87c3010a48e2e71752b4b61d118e72fc4ef16f2c3eecba54e6af37671ba18c4a7564157b8f65eb552c92c461ca190b80b344103714946dec00da3b";
+ sha512 = "6c4abfb4873d08ff30ed48612e536106522dd39921da4e3303d752f468e64552a77a65631474e2e2342d1f6dc4ed94ba74b2c6c0bd15dc559468195c2ff3e95d";
}
- { 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/56.0b5/linux-x86_64/cs/firefox-56.0b5.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha512 = "b5e007f882126d7c1e40d9750c9016dcf98674177cec15185ee340ac779cfb81efca0d23486bf7bcada25654e7bc15dd2cc78ad948981e668d0a00a5f138f62f";
+ sha512 = "be8c3a83f0d74f7860603ba0665cac831d787eacc427f8bd42ea118409ae9f1866a75ce06a4bf88c732847e9df5cdaef33ccd25d9dcfb5b6795af2bb5f83c971";
}
- { 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/56.0b5/linux-x86_64/cy/firefox-56.0b5.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha512 = "ceb4f5eff71192a8be67ca79feb3a42390501e11c2c2d2c3a9bbda42a6fcb71362665e991a84fae660442269eb4b91ce1cd8c860a6b801eeda2569a1e7800291";
+ sha512 = "a5473c8f20f36d755ec01feaaf62281f199041b1bc938c7477bc4205c488265457fba6d204f7dddcc67f37e1c92ae2bd312a8406a3aea0a34e50ed3dda364a20";
}
- { 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/56.0b5/linux-x86_64/da/firefox-56.0b5.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha512 = "c0cf7ef6fcad94ba4ac44ca8b4d272fb88c0e63a477b4829a675585204e19c88086b8f21f89c52c1954624dfc1f0f9a836d3333ad8c6989fd398afe2eb92234a";
+ sha512 = "0408c697dc971b6eb5225a3038a79c18fad96a75ed87e3f061665d00baf27c05e060835b3b77393bd50247c1a13ffc2314805460bf5d5f881ad0a48ceeb090fc";
}
- { 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/56.0b5/linux-x86_64/de/firefox-56.0b5.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha512 = "fb4423b8f154f0f124ad0a36ae692ad8962564aa9ff7747d412a73ca983e1164bec45d8ae6f983f91f2e657701bb268b96d4ddbe8261d68bd41e07d4f7c9fd5a";
+ sha512 = "1c93a760f4847163841dded76414669bc94aafddcd4b1b366f72db92e10575dbd52612ff5c906449dff510ae108f13cf39e6e836071c1d4b173dd211a98bc874";
}
- { 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/56.0b5/linux-x86_64/dsb/firefox-56.0b5.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha512 = "f17bcbd5885a0caa72380f1dafc65c4e104897abaa03f89703501af9dce33ab9e9dd133ea8fd518809e02f99ef6c10a9c5f516b56e05d700b6324b3a101de18d";
+ sha512 = "622bd1d9399e6be83c1d03a8a99b31ae1561c45a2bd1a62677c0298408125cb54df7e76df7b26ab741590ac7dfde9e0df0c3b8e202e0267ef775705b73fd4299";
}
- { 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/56.0b5/linux-x86_64/el/firefox-56.0b5.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha512 = "cf0304640af1f3b27b992b32e59a215d5cf95e8b0744266a86ac7738988faa8e2fcbe6b22a50990298cd7a6512747a0000e9788e50b1c32684fa616a7159cbcf";
+ sha512 = "c716d48bf2ba9eb8e2ba6d15d96a0378478937594376da77699e4239ca7b410d8088b97eb7a2076f05611348b6376c5fd1219166ab81d84022f958b1febae751";
}
- { 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/56.0b5/linux-x86_64/en-GB/firefox-56.0b5.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha512 = "dde0c233b45cd72b63b39a4a99e0d3c0a2f0a63999fb6ba9bf8bddeb686afe6b03a441215e5f2d5d192a19e49b63dc3cb14555c2aaac4efe196e7d58ee83fb27";
+ sha512 = "b19aa13d69cbbc5d63e4e6f819d6ad888a686a07a6b62b8ee2c745fc8fb4d7340dfbd3fc31b2a7e4f23be1e187a15455e0a5a3a9065b759e574f7c9c756917dc";
}
- { 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/56.0b5/linux-x86_64/en-US/firefox-56.0b5.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha512 = "d5e35480eac87eb0f073e0ca413eec6ba6f54c7b14b0ffbaace7a130e07703215d5f7ed3c6f7356154f6a0388f4ddd695419a4d84e4ea42a85c967202110016c";
+ sha512 = "613dc9d25997f80927b6b7b850fdf9b4287497bff2446a490274faf99a4fabd2b2b6140bce560f8edb5dc1f3da09a9a855547afcbace3ffcf2172befca74a0e6";
}
- { 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/56.0b5/linux-x86_64/en-ZA/firefox-56.0b5.tar.bz2";
locale = "en-ZA";
arch = "linux-x86_64";
- sha512 = "3831f3003fa5376b88fa216dc309a15b2332d4a9ba332d78b0067a38b774f7db40cb86d82daf7e0dbe5785ed72f603feb3542a84fe219bd4798cfeef1c46a268";
+ sha512 = "c0f5506e770d57bd5f5bbe84c89126e835833c059dd064b2b4af3aa31514d0223cd3b3bbc23fd99828c9dd07bbe63eab89415667ba1b269a2db2c90d165f492c";
}
- { 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/56.0b5/linux-x86_64/eo/firefox-56.0b5.tar.bz2";
locale = "eo";
arch = "linux-x86_64";
- sha512 = "5dddcc0fefb98d0364097fc374f033b8063cfe07ed77b0ef0f8f3c58cd907b27c860ee2776952d3900b99f0084494c304aa38eb07f659dd60765d991f86ff69b";
+ sha512 = "ff63cea657e4e78caf74a0382624accc1f4f4870af36a8b425df305e71a84d605bc2fe2c91636130053092518763fb2ad0eb2e2c73ff443b1c05fe0c31f892c5";
}
- { 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/56.0b5/linux-x86_64/es-AR/firefox-56.0b5.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha512 = "4c1f58fb03e85a96ae339447135712ac59a5280643035f2b1ad684858d58147e62dccb9d793829a30160056891538c56df5f8a73b3342b8aaceca8a8c8b7ec40";
+ sha512 = "00c89d9dce0deffb2fa536172e040f4f75f170c8427aa3bffd5c1bc526af45b439c28e1973db1a3ce459e5fdee40a0c817b5580b9cfc68f85259cc27feea6b09";
}
- { 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/56.0b5/linux-x86_64/es-CL/firefox-56.0b5.tar.bz2";
locale = "es-CL";
arch = "linux-x86_64";
- sha512 = "b96414975770592a829fa95c46dbd9c14cf1509bcbd8787442d23b55765dc3abf406cbd3fd100ad3f8ba243103798e1b060a6bbc1deabcdce24d52401b6e065a";
+ sha512 = "6aa8d504e2aaf86dbae7f637921e8e354f63e98f59be261f80256544cc5568c6f8c616fc72948bdc1d30cff62dd36513c838fae9207a8b7eadd7b20e5fa017aa";
}
- { 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/56.0b5/linux-x86_64/es-ES/firefox-56.0b5.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha512 = "bb5d87a32d9c9c10a54273cab014caee57a68d5b1ad3de3ea10ccfd9517118a97d351b789e171514720d684e4d1c5fd89554f3c776f832d69e546d729bffa01b";
+ sha512 = "ac3494d7704c2962cd4c00d5fce1fa9581f0565dd5f6dd90eec1638237956f8204dc68b590ce75e5ce6961d786a7e722d5ad0dccf036bfd51ffac530a8f56519";
}
- { 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/56.0b5/linux-x86_64/es-MX/firefox-56.0b5.tar.bz2";
locale = "es-MX";
arch = "linux-x86_64";
- sha512 = "5136699c8ec08604d1b8040bea67477dc021a50af8eaf7cb30dc9d5462fd1fbf6be2e418ad531056a033c5a661d47e9c8841e3087b8ebca3f9b1eee24d0cc20a";
+ sha512 = "6fdbb08c25feec44b38e6b4beafde422fc04bfc1c54e049a1b863c8fa4954a2b1ebfa5a4d26c507e83b446d2b836d922f4c6cbb71f77cf616c7088470e73bcc8";
}
- { 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/56.0b5/linux-x86_64/et/firefox-56.0b5.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha512 = "77b0dc7274c941efb10f25ef80d2cbc70c3d3243e6ecc07459bba933fbb01382e6d8757c77c0fc26fa42f39be0761cf07d783a1e2cf5064a73910adb420556ba";
+ sha512 = "317b05efdf3e14b907d7240d8102a2a826d2906a52bf83ecbef8f184d813af7b764521b2c884e70e29f50c23074b41d4887dfbab9b6fcbdb54c022cf2d16ccff";
}
- { 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/56.0b5/linux-x86_64/eu/firefox-56.0b5.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha512 = "f842af2f0b7e1894d49da17dcfa910df6976976cc59e58603d119adbc1fd7e4a4316ade167896b57a40e6480acf54f168a5630d3b30a7136360b3e9a6dd10d05";
+ sha512 = "7a81f3320c8adb613f80074a95cc877589eeb8b5ea47408fe526641059ac3c70c8b6a381db2f8b1c575acd2aaa857499277ee6a0b0e294038c4d29800bbd469b";
}
- { 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/56.0b5/linux-x86_64/fa/firefox-56.0b5.tar.bz2";
locale = "fa";
arch = "linux-x86_64";
- sha512 = "37899d6ed1c16785d9b41dd2593f504c5fd9169210b6f4bf79e4f8c3a7f00dbce74e88eca4884fbf08c28191408d886d0762f2d79928bac1820181321a53ebd8";
+ sha512 = "86a5c82dab2766fa00991409fe28f81ec0d2ed0ac67b9854c5a78e55677e58b223edc13a4e122397eecc34b46bd5dac80d3e61d3f35eaf1a49ca544193de3a52";
}
- { 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/56.0b5/linux-x86_64/ff/firefox-56.0b5.tar.bz2";
locale = "ff";
arch = "linux-x86_64";
- sha512 = "3a0a3cb965822ccfe51c662986fe2acea2802a72bdb9506f48c3b58e70e55f7c283ef590946e4c5c6b9aeec026980a43846dbe2fbe41744d4c9cadfabfef79f6";
+ sha512 = "349863d7a8a3b2637296422fa750f72fc14df88c944c06f8ad1e8dbb3215a7d5106a331691712127a5229a48eebb090c750b9fece25da5c34261e9ee64c2eec0";
}
- { 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/56.0b5/linux-x86_64/fi/firefox-56.0b5.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha512 = "a1d3bb077e396caa2df99a1b95a8eebb32d929980273c8f748958b7ffa6f1f7eabbf486afb195cad613d2012f3af0a355152a631066215d717bb7e270c05b72b";
+ sha512 = "83687fd94ef6ce5def8dc427b08e50b1c0a41f97b81c6d7ffb83863aecd3f97f3c3f6301a4d5f5c1ea8833d72e41d67955bd4664502e6cf75b4b327e98fe0552";
}
- { 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/56.0b5/linux-x86_64/fr/firefox-56.0b5.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha512 = "012bb9748fa46c6a61d958bdcbce045ae050b1571ba4cc19a91314468f2144976a804183340f3ec0c249eb548ea323db872529a0a3cae391b840069ab43ef397";
+ sha512 = "2527eb06212a1e1063f91fc59af54ec427ef1d23ca9d1f1f4232be964679ad33bcfbf7acda4e3c3ced32f584761f7f506c2744552877fe3db35a36387d995263";
}
- { 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/56.0b5/linux-x86_64/fy-NL/firefox-56.0b5.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha512 = "f78c749867899de82295aa928a4afd256f5749f1a02b149eb2bb26660b9073e3bc4ba6a7acbb02a050ca54a1961541b2b9458e5827cbf7cc4a31e813234940ef";
+ sha512 = "7a64a19cd37c1059fd338790d8aed3b9d0f9319ff8075567b98f721a2c3f2cac9dd09f5a678bd8f4792580bef2558a858bfc6ce33afb8bbd8c40afc3f85cceb8";
}
- { 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/56.0b5/linux-x86_64/ga-IE/firefox-56.0b5.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha512 = "88652cc3006f731ffa9549cce2ed3d21553753105eacd7260e0274bd63acc4f77b5ee60ee2967cf963c37779e27290f95f61731701666d22d5ca3dcee257cf5f";
+ sha512 = "8b29fe1838e333ac3704994865bf61b11b99b8f91b46fffea30047232b8bee3589f4f27ca392a64abcdb902042ddb4cd0860dba97577a062f21f4cd994d63366";
}
- { 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/56.0b5/linux-x86_64/gd/firefox-56.0b5.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha512 = "a0eb1f4e1ba442deeffee4cf074ced94844e167fe58ecb2985555ae233f22990b11ea5eed9a219f407adfcd8fc18ca6c21f191802cbb12fbf767a0d2742154a1";
+ sha512 = "979009a44710a0206a035bd752b2c61f2178a354a692b327028cd5896a18ae4357955303dbea9326393bd993e9b088fd587d82917fc89c93a45275bdce3f3079";
}
- { 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/56.0b5/linux-x86_64/gl/firefox-56.0b5.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha512 = "51363ace7df993022052162a5eb6b1ad65bf66eb48e1cb713deac1594f3883401f42f0a2f5c1bd7a73eef1d45f34df7a8d1976bc1d115bec134d9c7cd671b1f3";
+ sha512 = "8a6826171d549fc69cd63e6916e9c4abe10c76d0f1c149e6282c48e6f6895726d41714e8c83b4a5128bd9790bb45f186bc4dfee03f06e22d18be859cf31cad66";
}
- { 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/56.0b5/linux-x86_64/gn/firefox-56.0b5.tar.bz2";
locale = "gn";
arch = "linux-x86_64";
- sha512 = "93549b7a3ffdb275a4f4dba8a80f292cae039506990085484a9f6a54665a7588ff04c29ff5746f8c76e9d387272e18312ca58313cc255327b0fbfab53598515b";
+ sha512 = "8009c5297c726346ab7c24bb88ad4a7a4466dd19f01a526e1786887115600b06b37a2b80449ac1ae207f2f4c07b6a2343f349a7c314c7b7d1e934769bde47a9a";
}
- { 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/56.0b5/linux-x86_64/gu-IN/firefox-56.0b5.tar.bz2";
locale = "gu-IN";
arch = "linux-x86_64";
- sha512 = "5da0acb3b9c1588f971cfd3b40041a46cd32102b619984e3e9b16ce9f6b950c37ccd16990cd6b912bdc5af42e9cbbdf6849fd7b3716a85b2217f890b5241233c";
+ sha512 = "329ed99e9553ccf99f5cc0d1f69c1c1aa931ad12720c2d3f340e2e139d35f142d97fe8ca43f1ea80b2d366379d46f8ca0ccc2e774ba9f9f1ee1b67599e794627";
}
- { 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/56.0b5/linux-x86_64/he/firefox-56.0b5.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha512 = "f5e703361f106f63d101df3c591c0f63930df88b72bcaa0a93ca1ab0709c325edb1680d1955eb678103343c97719fa0b38b1ab8f12458538087f4a5f31080060";
+ sha512 = "f2623131ed9451d74ade849c33bb04b38ba3d555e06ee45a5b82ca4f6eefe55a4797e5d53231916bbe3589ac277387a103aa9675a32ca372af53b4778cb44133";
}
- { 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/56.0b5/linux-x86_64/hi-IN/firefox-56.0b5.tar.bz2";
locale = "hi-IN";
arch = "linux-x86_64";
- sha512 = "237e1fb08f8dba0bf72cfa32de252af6cde28820ae0f46d4756fa4a82893752a343d9cabfa4c719a4e39897fd6e41a32349ce2fdce61824a0dcc101cf9254681";
+ sha512 = "33f35fbf42679b48911ab20189d470daae6c31f767fb0359ce674ddd72150013dbeadc9a3a73a116a4d39b725cc54622b3fd19e84e5b388edbe2efb9231e53af";
}
- { 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/56.0b5/linux-x86_64/hr/firefox-56.0b5.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha512 = "908dc023c384b447af89b7dda7c60d2d2cdac3f386d1c4005d78490b4df5b69400b72ac743e9cbd0c700e4989583945cc2da0f2b8c0e1a87917ab1d37c842f4d";
+ sha512 = "4ef717da1b5ada94ab5d41d529605de22270f5d9f037b7bf3f19703cde55b6757fe396c087692faa0fbc500a60a4a6562f8fbb9c36e3deb859601c967c68f112";
}
- { 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/56.0b5/linux-x86_64/hsb/firefox-56.0b5.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha512 = "c4a91ab0f38eb0f565d021e798c30dd07e4d259624a50ba1f51969b46e257396b9faf8a0676675799f476ed9c71fab540d0bede002e4ff6e63d3114a7114c47b";
+ sha512 = "2bdb5e05436c24c0c4b856f2d2feffc32165240b2b7943ea5a7c93f46b1068eb21bdeac2605ab35d40ce596c9aaabd8809523a3cf768615eb6c03d9661ab815d";
}
- { 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/56.0b5/linux-x86_64/hu/firefox-56.0b5.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha512 = "cc8d632d7b9aa675f60780d0d16bc5da2f9853813917d6e89a7e0f47db288092fd2da94bbe28c0959d4589c23422df1d15101ed340059a3e5ebb9c622aaf9c46";
+ sha512 = "81cdebd0af73a7b8983e2de296f12244a6b0a92be865d0fbe089d74af127663cc3003e822bf525316bb14664ccfa3412b7424069d1b7abd17ce1e54cd5f66c7a";
}
- { 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/56.0b5/linux-x86_64/hy-AM/firefox-56.0b5.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha512 = "aa37883c2b1b880f807ab3bf2ce4cdc99e83cd8a80e5856055f33a0eed68eed21a3f8b5d20394ad706b0ae707d2469918bfc70c52e270b2b0303953d560e34b5";
+ sha512 = "f4f0e9009478904018eed8fcb6da30fa5607b5b00ee7521aa290dd13ae52e616e5903ea22e6e40f87340e3740b3d415b53bfd415ad288d601ced9318585667f9";
}
- { 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/56.0b5/linux-x86_64/id/firefox-56.0b5.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha512 = "cad8f320178124b82fa27947908191b02536691e9129fbfe9b782ca0a15a6d7adbfeccd2b6bf2bdbb4aa1d4b3d4949cb55b4188b49078685e4d07ce2a90eac20";
+ sha512 = "75da4e9be3ecce3227a3a914d9e5da90de8d4abcf49a4eb1c119d842a97a6cb789b703d3199ede4ca03502fc9e0a940c1829c85eea6adb7fbb4456d71838c39f";
}
- { 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/56.0b5/linux-x86_64/is/firefox-56.0b5.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha512 = "7f64839be67ff5709d4ee08838a4c15e9e7971032a89390335e27781176c9d1fe555a070968f23a9cf786c3515ef028cb4911b4fb6615c38f94fdc700d35c169";
+ sha512 = "6a3d0d38f257571c865295a6b3542c1bdb8de2344c5402b8f46a85adfeb367444fd1c693611f7b0fe7160a7552086d0d2b0247fa7757d19df1eb8375f2655b06";
}
- { 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/56.0b5/linux-x86_64/it/firefox-56.0b5.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha512 = "bd1f6c79c108f1fa1c01b445acd9f9ecb0a9f088cda0a113b48e1ebeb7503fdf36789881643cef359407e587eaad6d0dbe27298554b5025602f90d11e3c9ae0b";
+ sha512 = "650239200182d14069faf4557ccd02f155af0c954e1aee11909c648067421fc27f8334fb038a60eb9c0fc661edc0bd43e7a87ce345a4580bbfde798c5ed301cd";
}
- { 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/56.0b5/linux-x86_64/ja/firefox-56.0b5.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha512 = "2f9eb69e4f1db37c46a63eb3f71edd461727ab98e5fd2ea6925cab501c2f7aa81b8870bd42af2d4e30410e8d6083cd103baa83f07177ab7370a0d96afeaf424a";
+ sha512 = "da783d020fec47024e27049a163c415ad050e65d0194324bcbd1faf9005b03fe02c2e1349855c8e00301a13a5507ce3bfce58506f375a4276fb912dece622229";
}
- { 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/56.0b5/linux-x86_64/ka/firefox-56.0b5.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha512 = "b6b2728e9b74bf6c1eec3859c1dd8ee7d2ee98ccbc45fc28e2caaf45f1bb71e05b42361a25e3c4e5d71138b5b23b764d9e8e5288874cfc7b96b8b0db33088147";
+ sha512 = "4934648edf61441922dae1703ea70b5c670e798955891961432709ec04feb46280ee8cd924f37ebe4244f069d3d3f9d6dea71d09100fe7e11652e30a9c16508f";
}
- { 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/56.0b5/linux-x86_64/kab/firefox-56.0b5.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha512 = "a4c3dd17640fff69deff932488c7322c687263c28d8bb352af37f7bec8ae442aa821782f011953e07b34c37ebd62f55c1b913a6fe6d634af41a41137c57e89ac";
+ sha512 = "82f28e1309b49921e735f0bc3818664c912877ff6608161f7ce86ee821857e321cbea7db52b8e640fe989d5b52c2b5069506b0af68e6fb89660b79e7c5cda95e";
}
- { 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/56.0b5/linux-x86_64/kk/firefox-56.0b5.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha512 = "ddda306e1944d9ed37f9372ee247a2008c362235eacdc1f85ee2b875b88c968736e111b8db8d9954a3c6b0d31b76822b69968bf54394269f426ab3d4a3b11e50";
+ sha512 = "befd1cda746b5c795584e066883835d16cdbfbac14e5e919140fb0ff2d695f0f793f7f27fcb60f2d98ba9c9df0f2c3323b72decc6aab8b40e64d7fc2a9b01314";
}
- { 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/56.0b5/linux-x86_64/km/firefox-56.0b5.tar.bz2";
locale = "km";
arch = "linux-x86_64";
- sha512 = "651cb45d7efbf85dfd081c0358def68cf1b98f9ac0025a00a112ea43c034d974a8caddc07460ffa2bf4638cf2e9c8730408cc2d5907e74645f3509861f2ee5eb";
+ sha512 = "c302d0da1baeb0c96e134c40b97c1fc095223c45916496074857a39a16f8505c929a6eb2d73cfd679b99298b305c061734426177d5c7f72e616c3cc792179e67";
}
- { 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/56.0b5/linux-x86_64/kn/firefox-56.0b5.tar.bz2";
locale = "kn";
arch = "linux-x86_64";
- sha512 = "ace13edd7b784ae7496e6c6e7959e8c343cca43ef77cf9cb9fc43895720db85989b794228296af05068c6326e8704929bd2d3568b475429a839765c9c9bb18b2";
+ sha512 = "0318de8cfa51d459cf852a073d064fd3a129c081897a35bc2e1e456bf5149b305a80f2a01389f271c844db786c4ce00feea6b011ab3c7fe0f5102b73a65bfb8f";
}
- { 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/56.0b5/linux-x86_64/ko/firefox-56.0b5.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha512 = "4cc11703b836f50e5797638922bd5c3fd79dcce4b200c1eb2036876569d317733dbc38dfaf10eaa3fbd4309a1a131dddb62ce360608f82aa08c78b1a383981df";
+ sha512 = "747fcd8849372aec24c6a0c25a9e8df28d1afd6255f60be64d050204fd72bfed385f11dc3ca6d721bfe05b13d13b0b0b45343c75a7bba5950042d5984ffbb831";
}
- { 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/56.0b5/linux-x86_64/lij/firefox-56.0b5.tar.bz2";
locale = "lij";
arch = "linux-x86_64";
- sha512 = "4f57f8ebb8a2d2d2237b23f703e791daa92f4692c0801fd63a1079c82f658c96b33d4c64be5b05c976f05cce74321d3cc0a3d09350461830fe89361b23a71916";
+ sha512 = "102a20ffef4e3720f0cec2ec9d5803a8f5abbd66c99195729929225acbe292f92f4e505119f1207a5d0d1b0a148b3b484bb22174acfd6d6d79b464ad3c61be70";
}
- { 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/56.0b5/linux-x86_64/lt/firefox-56.0b5.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha512 = "1dc3fedf53e70e5a299ea925484e3c995a670fba7227b56767a4887422aa4da7d536baad2655432fee86b89404fad7cd239b4c814a545e7be27db6a2ed91b725";
+ sha512 = "23e3efe3f8fd80907e685090f82305cac2be37c7f8a38c840b392d3f5eb7ba3a607bbb35c4a6c6191c401c6247d1f8c4ba2b32cc857c848aa8d4d380e41c6808";
}
- { 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/56.0b5/linux-x86_64/lv/firefox-56.0b5.tar.bz2";
locale = "lv";
arch = "linux-x86_64";
- sha512 = "c97cdde91fe876bfb5da846e486d1f34ac9ba9f14d39ecdd53bd397c37fbe44254df3110d0854b3598c3a6e89883c220afc69293e09877fdaa49d7c286be5cdf";
+ sha512 = "9b784af41d5be080cefeeaeb4519bf0f25a9c201853fe078cd91e6074c678cad8ba69c1bf2c1dd018f41dc6c645dd3b7bafebd402a04f2fda93a05a0019b1d94";
}
- { 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/56.0b5/linux-x86_64/mai/firefox-56.0b5.tar.bz2";
locale = "mai";
arch = "linux-x86_64";
- sha512 = "afe506e36a228dbf1c8a3918077bade8a69d51c801cbb274209055e6062c9cbca340e153842d9a24637c62cb6833f99e69fcf3b92b82ec16afa882d566cf44c0";
+ sha512 = "d61f3668ba4c7187b00fdef5a3bc46601c90a148be468ce021a42b3218f9a30bd8f4780e80fedd98d7e1133ea0e899ef02dcf2d715688a6e384aa7db542337bc";
}
- { 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/56.0b5/linux-x86_64/mk/firefox-56.0b5.tar.bz2";
locale = "mk";
arch = "linux-x86_64";
- sha512 = "b9cbec5c7f75d6dd2fc69aea6f182bd8682cc2974425973b5d7f42982fa7f69b384bafae1bdab4fa225f7965f9d2a37c0e127ff12d7ad1991f998b19deaded63";
+ sha512 = "79d34cc870eb41c5d709d52b16b448b7e2d6f35877957e2173cdaa6f66dc889fa489258cf7b0bed1e7e87b187199eba799396e65bdcfcbf1d0ec0b258b2665f5";
}
- { 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/56.0b5/linux-x86_64/ml/firefox-56.0b5.tar.bz2";
locale = "ml";
arch = "linux-x86_64";
- sha512 = "2e7cffa6991ee2ee8018dfbed50163c6c905e1e9394ec880d92f12bde8d180ef6445a8f20c217f620b3ed19efc5505ab2b158a679adc97a904b83d46561ba0e1";
+ sha512 = "9fcf038b2f891d62ed7b26fec3bcdbecbcf530756f38887c4f1a71c58cb2fc82af9320b03cfbdb5762c80eae7620fa0116f32d22fca5186e7a1b2738ad0d71d8";
}
- { 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/56.0b5/linux-x86_64/mr/firefox-56.0b5.tar.bz2";
locale = "mr";
arch = "linux-x86_64";
- sha512 = "9e3ffcb028a9809dc34969587585fec94c31e3f8561c969bec5a1f6d9c436ac02648185a56c4cb95a16b400d6abcb1c01293505c51b8e9149625bdd910523aca";
+ sha512 = "cfa9eef24205cec3d1b4a6ce58f4814d33d9806ae885702d3c0ea96994126ad9d79caa7551780f3581db0de7802f7e4cc666fd9d5bd55dc7da64fe4d5dbadc2a";
}
- { 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/56.0b5/linux-x86_64/ms/firefox-56.0b5.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha512 = "29f08c10050013832f709bb0b42ea1f6a3ed191ba979efaeffba44e5ff27220c7bae9717d68a9478c2a452eaf0ef1e8da390eced1f5f7a37ce1ae5ee6f4bfa6a";
+ sha512 = "0be1321aa5aba417b5ef27c1b6ddbbf10d915cfb3ebc6f70a7473f31284a4f6ecd7ad61ef27156fa8b6008598b0aae3b3b272ae4f0db2ff477083e037616efd3";
}
- { 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/56.0b5/linux-x86_64/my/firefox-56.0b5.tar.bz2";
locale = "my";
arch = "linux-x86_64";
- sha512 = "5f58e403b72cff6963a51a4e32ae55f94680460a658ff5ede90e859aa1de849c89abab33036cc194b9a3eded23b61d53ff9e9f98bb653785a1e60848e32533dc";
+ sha512 = "ea25f3df7053cb85b3cef5b3428c1e023e6631c7fb836421e5afb9794913057feac1083e08385ec595c7fe9ab578aa5c8728dff9f338f4d1aff09697c0985c60";
}
- { 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/56.0b5/linux-x86_64/nb-NO/firefox-56.0b5.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha512 = "2e6c4cbc3a73c4669e7703b9847a52849bdde3a5cf332ff0aa76cf5336f21f62177daf050d655250e552c7beb4a05043cfddc276896feae1e03b5dade016e0c7";
+ sha512 = "6eb487bff2f942fc7c319551eb2558973235cf05cb47e5a8b7273c0cd2d9162ae96345aa3dcd38710d4169f84fbb5ff28aa16277d98a4aa0864c9608f98b8f89";
}
- { 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/56.0b5/linux-x86_64/nl/firefox-56.0b5.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha512 = "bd0afc4ef24c68e1a503ac93ecdb969a29427548d5991f47b86583941d2a1bd8d9af88e3a46b74b52b5957cc80d05a2dde659cae2c33028f87fc48beea637366";
+ sha512 = "20587b5fa98ac42adc9b83c704c5c9eda0bd2b0c40475b71d11f289c14c5df3e7811c4b4661d82baa99436ef143dd8185d2fc30bfdb8eb4c64ff72c5986c3df5";
}
- { 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/56.0b5/linux-x86_64/nn-NO/firefox-56.0b5.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha512 = "c342102835e18d7d14e18e1f7185547d1b2385ce4157554ee65e76766885edc62d1d7e4a911af206d2bf34caa0377b6e256e18c06c41082074a868c5a6367f45";
+ sha512 = "c231055deea74c29c30a79be5e592cc5ce21aacbc3bb53d8d7a35ff5f6ddf7624e6d4f3257c7fc2c99bcd2f22359c38ce10508f31b786bed90c9f68c3e916c6b";
}
- { 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/56.0b5/linux-x86_64/or/firefox-56.0b5.tar.bz2";
locale = "or";
arch = "linux-x86_64";
- sha512 = "154b729897c7fa4e243eb42c7e365f658f3857b0b799a633e446ed1ef7257e6387d755c0534ce2cf81e0008caaa205c18ba512a3b3c4e6f31f6a5789674e16f7";
+ sha512 = "092bcdfcb26c272dfdcea1a8b05745fec1d6d41c6b8ed930f44d7bbd83cb190857ec58e084ab602ee2499ef73743a4a6582e1f53b59151285978a9a1e64f2d35";
}
- { 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/56.0b5/linux-x86_64/pa-IN/firefox-56.0b5.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha512 = "39cb1b7546ba00c9f2a7f5794c7920f6a110ccddc20605b829945cd85dd5172465f03fff0dfd3d22f67769c15f43130d5f034fe48e52659b864bed7cd5e869a5";
+ sha512 = "31d2ba332a534e7d8763a7413bdd24643313712635d050183aee8524612a9f122a5acbf89c674d69dc609897942f3613c9cf8fac7b92e1c22863cb54fbc0aa70";
}
- { 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/56.0b5/linux-x86_64/pl/firefox-56.0b5.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha512 = "a5d30cc38ec170a5d23fc721a91802c09ce913356217c34684887b292c523f9da5b0d2a16e882d324a38cac871f541e08c86446c36f8dd69cf2c6a60d0a2dfd0";
+ sha512 = "4180fc65b77aed5c93d6622da562e9fe7a6bc7af70747795bb37427e822c1e007b1be6fb3d50a12fc3f90e459d2e687403cb3f2df7320d6381795149977f6a1f";
}
- { 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/56.0b5/linux-x86_64/pt-BR/firefox-56.0b5.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha512 = "0ac69c4cd827cb724507202bb88ef00cddebc10e7785a23ed3adfc0fc537e981c45d8141d299f6d6e6c84017cb16361022357750b69c5cf70e643d14e12c99a8";
+ sha512 = "2d2defaee8947f5177603f60e21499aa4f192ac8a6ae53060d51bcc418654cb95cb20fdfebc052fdcfb397109b868a35c6ba8419886a499736e5655784607693";
}
- { 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/56.0b5/linux-x86_64/pt-PT/firefox-56.0b5.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha512 = "34ce2df0f0501610a73b4faff1fee7cc60c0c0d675c60a769b99362c7ea82a5f780804f1fd5d1b010063b0ec5fa67db5d6dcf661b0638274563c0af588c86238";
+ sha512 = "05da355fd644ced4c3aaf54e2f6f1a11f07d2952edf9511c60fb699e4bf5ba195044387d2687b4fa3a5b5413dda3d91acd6ffb28ba6e2b7210ed00ae5bcd2eac";
}
- { 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/56.0b5/linux-x86_64/rm/firefox-56.0b5.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha512 = "8053d904c427dbe66837445b471793c80e23fcabc673f2df5090b9acde7f29ba38f74d786183b8d4a1808c5af0c7ec147a02735a0aab3a8d812c7e8d541e2167";
+ sha512 = "dd2bd357d4652008b5f07d318b32383d8d30c6324482aa7fb52c3e821d4b3ac162ec26e5f521f661416356b87d013ed50da9612eb43b5fc3b95e37cdc25fdfa8";
}
- { 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/56.0b5/linux-x86_64/ro/firefox-56.0b5.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha512 = "6faf8c31b8457e11e627309c851ffac67821966e7d2f363ea54e133f25195fe35eb593de6b8f6698b01940604b4b5ba13b37259de6e24a817fc4cb402cebb52f";
+ sha512 = "ef8cf533b848e7e6bd0859506b964632ab9497bb70755f957c5ab61d64c87ecba173cb871e35b35e090682d34b424ee90514062a429deac68bfaafe561195b51";
}
- { 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/56.0b5/linux-x86_64/ru/firefox-56.0b5.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha512 = "1ef8163cbffdc6887cbc5bc26e999adeecb43d9ce45bc805da9c3d307659100a83038038cac411aaae384cf20c45be081ad1fc1211110a68d023ec1551e52b2b";
+ sha512 = "ee6a95e2a69980170adaf7c60dd23764deeb86f171142985733e967f8ad7e842a58ebddad5e828ab308872f40955a3e53bba1f818b38b075f531289fdbea795c";
}
- { 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/56.0b5/linux-x86_64/si/firefox-56.0b5.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha512 = "556eded9643cd1f482e6b4f83fb52e73d2a182065df441e7244256472dca276903a76e19ede5bdcd02c9facdbd09c7c2d533163e3165c68e54087b592dec4fc5";
+ sha512 = "fa4287dc50567a52441f583eb0e12c4de4064a51b12e80c195f1a583dcbcae51f4b8b45804080c2437999123581f24a490df25cb27aa563e47ae05a135a21748";
}
- { 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/56.0b5/linux-x86_64/sk/firefox-56.0b5.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha512 = "8b1cb4342ed920bba9e3770b6679817475205e9b18f94892cf86af0348a10530616622ace83173ad71b7889917dd0e6fdfce391b5a4c667230bcc63ee14f5050";
+ sha512 = "d4110c9bc7eed9f037145afb5399a88565e0d94430ac56cc8ba8aa3640ceaecef0fb31cae7add7e893b6f223dffee62578f5243cba944cb157328a6d69768b9c";
}
- { 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/56.0b5/linux-x86_64/sl/firefox-56.0b5.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha512 = "69aa0ed87116ab8c1d0b0ef1c086d014b55b7e1441c1c41a10377eab81ae0ff66516dff7be201faec156e541d17262aa1f46d82f4041eda791086906c7795826";
+ sha512 = "bb06ac7d7a6f38e67061a83d6eb76b86a45a37f3c77e805dced9db8c6329c404acefc4e688d8a05c962f911996617a1430b66d2dca0334bd861ba841775b2225";
}
- { 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/56.0b5/linux-x86_64/son/firefox-56.0b5.tar.bz2";
locale = "son";
arch = "linux-x86_64";
- sha512 = "4bd0d7510c9977013a9fdfd3453361380b497dc600b1418856a0652ead5625c67b1aaa554d75fa8c10dc1ff4c3e60fe2218a421c623ace151e8ad078c63fdb74";
+ sha512 = "8fc6940edb2a41e9bc2a0474a3302434a754a185a5c71be3b702112a5683e348dc9045ad95f7c0babdaabbd5737ac8954238b6db81b870fb0987626fc4e4ce6c";
}
- { 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/56.0b5/linux-x86_64/sq/firefox-56.0b5.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha512 = "37c7bbeaff9004b3facad06afdaffb2ce75e1a49147a3801113124f1e6827e96ccd41b38b59f5230e97c1f9060e9db4cbfd399b362bc8d3619e9f4c4786e7f65";
+ sha512 = "2c0da802929f7961b517ce6028fbdbb4191e0387ff175cee08663581539d7dfba71617304f2b7fcc3045f8e30a3427a7a5d749bb641c18a90ec515cbc8dd1437";
}
- { 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/56.0b5/linux-x86_64/sr/firefox-56.0b5.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha512 = "ca2f26e74b20fa6e1d9d43517a26426817bfd40f0d73fc487f7341485bc1ffec6a722cd1c3212fee03f0584fb7807b554465979bf8d8228f1870eca139baf752";
+ sha512 = "92f51e7aef94bab43fd58b16f17cc3a9086ff754d039783e2829adb3dc5df2d9e39256221ba1576299da79c17b735f0f51046edefb4886a022cc23314a831b43";
}
- { 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/56.0b5/linux-x86_64/sv-SE/firefox-56.0b5.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha512 = "9233da6de53b4304e19b27a8188314ee42ebccf49c65b48c3bfc5a06f9ffcd2cabc4843f2995f881eaa2262a9a0d8f1e6b68943d5e1d81c1290dc1d21adf3e14";
+ sha512 = "2e9806909a770d44da18b381d428ce2ca27d0808fe1d39e698c0ce5cf48505ef248f236f8f38ff66fe5d98dadaf516d0c62f3071dc1ddb0955356a9bae3a8af6";
}
- { 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/56.0b5/linux-x86_64/ta/firefox-56.0b5.tar.bz2";
locale = "ta";
arch = "linux-x86_64";
- sha512 = "12ada3e1b3816c257538deacb8138819b4924a900f71397c95286f37e2e941c3705db504ae4f5a964d6af142a39305cb9ab5a63cd2a3060047aa55fb6c288f4f";
+ sha512 = "bea6475ad949b4dd35dcbee67e4d1a8d462cd04eaa8ed637b8dc7b7dd386c7eb51d7e7469282bd3d5ad368cb50adc16a888421a1bb6ebed2d6b8892c96f30c8a";
}
- { 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/56.0b5/linux-x86_64/te/firefox-56.0b5.tar.bz2";
locale = "te";
arch = "linux-x86_64";
- sha512 = "cf2bd733d492edefe19af9ab68f36298e825d66cdfb89995bd20ffc3a405e078af26e6a7f07bdb1b04bd09daa516b9dfced7fe524cbeace8b9aec324b8826ba9";
+ sha512 = "37db9e889edeecc36bdc313941f96abaa96c8a584a58f2b43abcaa8843cd5fd25d4abbb345c567f129f34d67eafb1d5c2cebbf3c4ca9139a8f9377f847a7ebc2";
}
- { 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/56.0b5/linux-x86_64/th/firefox-56.0b5.tar.bz2";
locale = "th";
arch = "linux-x86_64";
- sha512 = "dd6c976d58a61a50bd6f6ab3773c43f778ddb08b2dbef7ca3709219ec4ddf14db479fa8b9a9136d28875bb71c493b085b9e668c5f4d02dc307c0e350be2b81f3";
+ sha512 = "15f011ea725e90c2750ed7949a33109f08f44816d722762c6e3692d2570d2bb4671c861dc20a8b0b091bb0b00c11baee6bf449dba818dd5fffeaacda9fee08b7";
}
- { 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/56.0b5/linux-x86_64/tr/firefox-56.0b5.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha512 = "6bcb6a25b985261506e47bf984302153074811c88f2134987a15651f96d2e373ca6867c3509eddd34690e2731ea0552c575097b3e083e9fed8d9aaf03b95da75";
+ sha512 = "5313c9dbedee7483215285d3909568e988fdf13ce6039d2eefcbf75754a644136a155f442112e7e19df9983d83ce349dfe5eececa4b45971db72fb2fbed80f5d";
}
- { 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/56.0b5/linux-x86_64/uk/firefox-56.0b5.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha512 = "403ab45582319cc2ded9c5f6c39791cc35e040cba808ab416a4d6104accfa75df56f858597c714bb5087f41471e4dac54d0f6ab62ee767de6925ccf0a10097a7";
+ sha512 = "4a127bdd6284fe3b8eea6ce8f5b22cb46f5e1ac066186cbd90afbd8419ed7d0d31b786f210c0a3c0fe2a2b327e2cf6b2f73b45a829b9c5d092eb2e048178da82";
}
- { 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/56.0b5/linux-x86_64/ur/firefox-56.0b5.tar.bz2";
locale = "ur";
arch = "linux-x86_64";
- sha512 = "4dcd348076640ae39ee104cde115e6b207aca400cf9fdfc65d00334271e18ba78fd185136ff54211a162f32f0eec46d696f3c5a02ae969addcce95b839f45260";
+ sha512 = "755842ae826e377e33c767971c43a62ac6953f58ff2d23f0109e13bfaf608757603902d2576665f605192e1094504eb02df0636b5f666ea84eacf956ddee2841";
}
- { 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/56.0b5/linux-x86_64/uz/firefox-56.0b5.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha512 = "f6d38f2de149b4fb2494582e6ee3a562d4c7af71aa957ba30fedc9c1cfea314d11849fc1c8a11d19cc43045d73c1939845f1fb3e334c4d32eeb0c2881b9ca724";
+ sha512 = "34d5f4446ae341433b0aefd7a76d3e9d6125c60d28480eb70ecfba5d7a7060e1dcc085b088eaa7ecd7d0e6814be8ed9fead537c46b404426976ba21d2d9436d0";
}
- { 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/56.0b5/linux-x86_64/vi/firefox-56.0b5.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha512 = "277f09e65c5d07539346282b9f70a662494a2c5640c78ad56089e0c50c651ab0c0fadabfb67148bdcc5de190ea83d1abe70c3aa5fc50ae1cb870937d10d95be4";
+ sha512 = "272544bd42a3d22f3598884c906d1ba31df7e4b4debd55aa02110a05af74a0544e5c7fcff8937c9671b25c1637f8de399fe82eb0798ddbe40618b4a020c9c53e";
}
- { 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/56.0b5/linux-x86_64/xh/firefox-56.0b5.tar.bz2";
locale = "xh";
arch = "linux-x86_64";
- sha512 = "e541a068ccd072724fb19a0bd830a2a95665a20a08ad9e398be02545a0a6ae8488d3f30f8dfa25c1149df2a90eca5f586fbe116740cfe630efbe00f002d3278b";
+ sha512 = "ad0aa5402a6ffd28516d428e6f11a8aa84c68291f6722bd35776b27a8359b70466833f504db181ac5d13f8f3ba9fb87df118b5a82b473ad9a5c752b76cf1ccc7";
}
- { 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/56.0b5/linux-x86_64/zh-CN/firefox-56.0b5.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha512 = "3f9163e25fd67048456bcae71c86c287d5052c45caedbb19d6fc65e421d1dbc66cafd61582137b7e3a6a5535fb19be110f93d11ea1cd6462f5e4a16ac2bac182";
+ sha512 = "348779865bf610de937e073b364e2e384792bda2d5d6932187717f9ab1af547efe6483fc6b09e9bd72bd3bad908507d3bd67c13d196dc7e1857f6f658dfd6361";
}
- { 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/56.0b5/linux-x86_64/zh-TW/firefox-56.0b5.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha512 = "12508fd22dc5ec22cb272ad8c62150ca2d7ed680e91d398e304ea07633b55eba1b44ef7668e3b0510f0ef2bd21c8d83c28ae07d2f519e138b4100c5f8fb35ae1";
+ sha512 = "3c444d575c000b34f8c536a48688f35166bda3b9702841c9f023430089919cb9c368ab0507e4949e3258a50fd3915fe21963e3c39a29644d4313698e9ec8ceb0";
}
- { 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/56.0b5/linux-i686/ach/firefox-56.0b5.tar.bz2";
locale = "ach";
arch = "linux-i686";
- sha512 = "de723b9dca94cc4f35c329e2e31596df20e8d873b54cfc0c4d0cba1ce27b25bbe7af37f50cb360e933b4ae69b1e9d9d2874a84d4357d39d7ec06dbd62fbe9187";
+ sha512 = "f42a579de711981143832279c2dada8aa915ede2f9e601fc4d5c15b2c6497dda9c6d651fc6b9865e7827dc4f4b2da944f245dc97a73db27ec8b7aab74ee17f9a";
}
- { 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/56.0b5/linux-i686/af/firefox-56.0b5.tar.bz2";
locale = "af";
arch = "linux-i686";
- sha512 = "ff3da99e585bcf41f1205e62e2d2a0f7aeaf09a8d06472d6d26c74555ffbb8600fff7266730459cd2596766029ef968f613dd2e793f444ece9967a793754de14";
+ sha512 = "8075a2593835c69f9e2b97b0fd311355cfab0257351684e0c4dd2c3fa8105aa63a946dcf196f4dc3256883fb360c4474560be1846cc06b23058da5d87935e658";
}
- { 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/56.0b5/linux-i686/an/firefox-56.0b5.tar.bz2";
locale = "an";
arch = "linux-i686";
- sha512 = "8c9d07c589a2fd0f6fb6229a3c83ebf26d07e4535b915fbc737e8a54c64985731a7101e6474023e03c048d30c34c57e6d0a47c530a642072167093671a67f144";
+ sha512 = "18247733d65e0cf282b38ac1b52370b9e0053951d726c283adf4b52738dad9633f9a670a65dd1fbf6d84802ed4cfee26adf19c05abcfe1787c3cab3d11ba7794";
}
- { 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/56.0b5/linux-i686/ar/firefox-56.0b5.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha512 = "f8242f8bbfd54bef69d9480c1a3b78811c91332ed26b1ab3db731e9a2b4633b4db1e5dace3f8351210f38f383d9396d6372dde7b1c3c20a99a4631d095c387ea";
+ sha512 = "a15777a29eddc3dcd3d9e7de970faaa10321ad991eb82956887533c9a414b6dc0e6eec6797996b5b1c286c387c5a8b01df28fbb4a5efa485712ed8c9477ccffc";
}
- { 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/56.0b5/linux-i686/as/firefox-56.0b5.tar.bz2";
locale = "as";
arch = "linux-i686";
- sha512 = "830cd3edabf5584fad8e5f77201b0980859b2fe8a2c6ec5c0ec886a5b7fe1c81c3513d93a9e99b6ad350d3d699376ba3a027caea1b8b092137f580379cc34d59";
+ sha512 = "5a2d3cdb707ccd9c663613e177832318517e66de05e825da66935a3756a07cd2aaeae6adb196cd6a305202a3b4990e6dde1b7e4b30144023fcf9e4b77c55f0ff";
}
- { 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/56.0b5/linux-i686/ast/firefox-56.0b5.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha512 = "5ef46e285b2c7015f8c0de1a4cbf59883f1ad0a98ae9bd4fe2a5ebbaf9f27ca5522233517d7a50281cf75375a3cba0036a0d77d493e28fa8230e4af3b888456d";
+ sha512 = "08d9e6cc8a58895569667f42b6684cf342d2bc015a49f7a5ccf09f26384e7194833a3c0380385d8d0d4b1ad104c74f549ff94d03dcaf7f97cd9722e454a3a14f";
}
- { 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/56.0b5/linux-i686/az/firefox-56.0b5.tar.bz2";
locale = "az";
arch = "linux-i686";
- sha512 = "6db4270e17b883c6970988287a365497a5905f12c581ed40e442712cc61f61cb78f82dc67c5d1806f61d31302f6e914df95f3116c96404c09c07945de13e6556";
+ sha512 = "327e8ed170e1d571eae445b1206c83a7c25b4c09437d7d96f88fca5d95946ed0fe1c9c44a3776490e339050f9ac050378e9fd79819409e4432feb2d1e130ec89";
}
- { 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/56.0b5/linux-i686/be/firefox-56.0b5.tar.bz2";
locale = "be";
arch = "linux-i686";
- sha512 = "779561717f27e6090de5d63646ae0ee7de5b029422889a9b8701f30cee2ab1e1c7737f6d61a6f8bfb7106b7f05cccb060a7cb30f8bb593210ed7a04d72137c98";
+ sha512 = "ca96078fe9eb12c9acdbb315addca23aca87a923d51edeace03263ced2eab68a985030360a36af8f4843aa4f2af02609ad39517689a9ef219d29080f12605f34";
}
- { 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/56.0b5/linux-i686/bg/firefox-56.0b5.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha512 = "889172aef9743e4a38cbbca387528e03b3a3c9882b2a2459acb0da697bec2080a51491cc0998955921ebbfad4b272f0f82ae7029313209a887984a768552fcb5";
+ sha512 = "92fd642c41c4b5874e02829c155f6ee7a1f11779b35f43c446bacc36febdfdb415e7d30e6039c4f70df3fd7635a9f187863b249e2a352b60796d1c0bec300d9d";
}
- { 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/56.0b5/linux-i686/bn-BD/firefox-56.0b5.tar.bz2";
locale = "bn-BD";
arch = "linux-i686";
- sha512 = "0b93d432172814b44e5d879f044799c0d6002e8c631766a43e892d76fee156614fb64ec5333ade7bb65451c73d04443d30202d054b8c7dc2d82d3e63b196d472";
+ sha512 = "c3ecd61ffe1177d786491eda2c776bdc136a36e756d083aebbd3add157d27f4c736fe953e2065956a13203acfe95ebfa4eb0a65c8518423b34a74ceac8248d80";
}
- { 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/56.0b5/linux-i686/bn-IN/firefox-56.0b5.tar.bz2";
locale = "bn-IN";
arch = "linux-i686";
- sha512 = "708637cca38914670df1a237fb5b3d30cc6fa93f75c9b13585fc1d80b11b986511139aac1a984e0ce27143e554092be538d91a9e54841ea44fb5feec9128eeee";
+ sha512 = "bb21a47a80862251a8d5120133bbdad67490572d794f1a7d76ffba77f8cdc9029066c176f2b423b8ec49342b390c35d95c29039044165b874cde42a852eca727";
}
- { 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/56.0b5/linux-i686/br/firefox-56.0b5.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha512 = "0343c096b3b9c98ca65a4934aaeff8d08166a2b6c806ed81cf89cd1942cea9bfd2464a42cd54037c5bd78b3c05951f29710894e852ba65f24c5f7bb0cff3f885";
+ sha512 = "fc9342c239310ccc8231b25707e5a7598cd4d77aad3990feed5c48750c677c3fe4354279cc39cf367a872f25c9ba95c805cff9193d13aff801d95b9c5d5f70a2";
}
- { 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/56.0b5/linux-i686/bs/firefox-56.0b5.tar.bz2";
locale = "bs";
arch = "linux-i686";
- sha512 = "00d309e92d80941318ac41a56ad41ffe3fce590ab084974bf2745ed7be2637192829c4cebf230a86d77d2eebf9aebd19495b4674a5d469563ba00b124f526a9e";
+ sha512 = "3f8da7b739effdf144d2b2d104d27501575452fa20a07419910dc8fa8f2b8a92ef421c3d774e8032a2f234ca95c55efd28e8d99347f7afcdc59f5eaa5dc6ff29";
}
- { 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/56.0b5/linux-i686/ca/firefox-56.0b5.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha512 = "ad25a897f3d9a58156f1ad95bb17da94a3fef84603da874cbd12db8b0f51868b95e8157b71cc8c1b88253b043bcfb5f58897f052c20f4ee703afcdcf3279a15b";
+ sha512 = "1c1f8a7886de815c14da3586e9dfee316f05ad9943e9c952ca44b098786a0f721a89e9ee566f2bc08c664636558006cfefe5823053dc4f23065e636056b3b5c9";
}
- { 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/56.0b5/linux-i686/cak/firefox-56.0b5.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha512 = "d10a6222212fac4f69b2cbf5fd82954160dc6495a901f2e790fb5dfdbac5548f017d611df93b5ee74d688b53a0002f8927c2d360a7c2a907e2ce72d3961c06f9";
+ sha512 = "9992fb1ccf287e3858ac6686a43b7515370f8043fa2c2fcc814bb1ba49106f1b83fe8d8abc72df43f3008b8cea56f97254e0360a0cc4808e923515bca53dc3ed";
}
- { 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/56.0b5/linux-i686/cs/firefox-56.0b5.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha512 = "f18dff7152d0b83955ad8221f1b3e46ad0b34c082f0be17296eb459639addd076060b26036548b79aa1da73ac11a53ad82ea2e6069e12babc90570e23ea8681a";
+ sha512 = "e6c99e5533e988c10615286bf3bbb588ac9854ddff12690537cbe64cf209ad5512649690463f61b7d08bcb57ef246191c8c4d697f6de80248fd8eb72e0518c0f";
}
- { 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/56.0b5/linux-i686/cy/firefox-56.0b5.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha512 = "04aeeac12aa2ea1ee0064daba05f33147c376c3f6acec38abd64e794ec78f72783ae865ec17b855c165c80990812ee3e0555ec55e24592806cfb02854379e32d";
+ sha512 = "92cee85be1caee2c9221dae96a5989aeec61451ba3ea6923c7ef713a56b168d871f78bf993685f1e6e56cf13b47aae067070eb9f08d58304722ecc57663b89b6";
}
- { 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/56.0b5/linux-i686/da/firefox-56.0b5.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha512 = "53034182c7115b8f2a24662823571b290f86977e2be663dfd40c02d9a8f2cd5db3d3563873af5cfff89bdb67e7a2e60c14c21e755b070bea0a5942c2821140ec";
+ sha512 = "7491a8d2523dcee7c7b9e2ae7ff43edf179cea94dd078d447cb8346ccc1a2053ba01edb5083a8b616e67fb5c53b88ce8c63ea9efa0ddd309a104750360c27ad9";
}
- { 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/56.0b5/linux-i686/de/firefox-56.0b5.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha512 = "9a1ee91fa95b6ca8e0618dfd84930c2e41cb03a1daf33b03ac8ac9a92e113d43ab41e922537eee477bb5e706c7f018a817dd640460df5cf10288684811eb9585";
+ sha512 = "32bc1d2d6e0702360296accc324836a61cc68611cdaf01abee71d151f02044d467b985e4ea998bed6a8bfd30fe9fff30f55b271a15c9cd3ff94f493b3157a2b6";
}
- { 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/56.0b5/linux-i686/dsb/firefox-56.0b5.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha512 = "935e7ee75c34045393dde791d14be3f4f7c5d57bcef5c4b8a6e291941acdb21550e6b5aa54bb559f3deb64cc6922f4709bec360fd62273b4b693718b69de532b";
+ sha512 = "fa09fd3afcefc4df3854f599d5077652561b7763dd54c0a95db2107b19146c74152f9059fc9e54844c9b31ec26e1392534dadf1ae592aaa170ba3bb8ef8ed0e3";
}
- { 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/56.0b5/linux-i686/el/firefox-56.0b5.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha512 = "371d5b023d63923bb65acfdf3d4d7efb5acfff3b2b6de7ba94e0b475b7e45b268612303373e7b10b420ca2c398e9eaf340dd481390f36c5a0b50beb54ddcfc1e";
+ sha512 = "1d95c37d13df3b04f21780fe9cf95b70115adb4f647a720083ed00e6bfcbdaf26f62e9a265cc524b852a7c44b68fa4d37ac08db070eeec1fc3cfaba1fe83184b";
}
- { 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/56.0b5/linux-i686/en-GB/firefox-56.0b5.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha512 = "c99cfd1283ab71d78ab8311616ea6645cc1d492dfb5091d2bee19299ecaa9455228639f85ea366e7b4ebd28270f06446897b1a99c9c9b54bb2c69b4f4d3fec1d";
+ sha512 = "09b6f11cba4862647d37278ebd7f9f2e8105e0392130b6d30f722f3d06c75f108abc509354a7bcf1da4d4709af76dacbb66a56d5a7d0733a4f2287202a40351b";
}
- { 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/56.0b5/linux-i686/en-US/firefox-56.0b5.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha512 = "7a81c06e4b85e7e839aba4ea4fb41f1da871c3de705a843c013965648b1bedea86f0ab73a616b7b864da10da0c47624819178063f2894508fefd34d7971e3714";
+ sha512 = "0461eb469f6e1ddd9f32f3a970b6afae3e551d72f14397d1f6955defff87d8ecf2bf2cff47a84f7989f23c4943466b09ab47bae1bc2849691fad87ce8f62c318";
}
- { 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/56.0b5/linux-i686/en-ZA/firefox-56.0b5.tar.bz2";
locale = "en-ZA";
arch = "linux-i686";
- sha512 = "4f0b171169b73fa526e25a7c7c9dfa1a0fd557fec07b69e761a948de71172f733bc2a1d2e3d1f44d6deed0f42568279e78541e32352ba1a27fb45274d76768e0";
+ sha512 = "d5864881455d7ca5cc9dcf032e5ab786f6e7e9cf900aae7ba40061dc0df526c29767e792515e35c7bdfcbf71b9163d85a7b80e03b0865d36e5d5dc524c4ebd05";
}
- { 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/56.0b5/linux-i686/eo/firefox-56.0b5.tar.bz2";
locale = "eo";
arch = "linux-i686";
- sha512 = "d992ef007b02ec7c33b8efb7d69f71a9656d410dbb30ddd3c2a7e39ec6f358ea02fa9404af84bde1bf0da524d5a359655847d729f10a877e81b3846c77a74a15";
+ sha512 = "4a16209388b1ff42c355a8b0af3c9340035854deea138ebc206cfbc610ac07e18b7099f18c67d59f45104a754919ad3ce65975f94fb2fd8c1b22389c7af676a1";
}
- { 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/56.0b5/linux-i686/es-AR/firefox-56.0b5.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha512 = "5e4303d24df249bf07a84e6f76bedefb906e8846db787c12422890240faa3c231e9b87afb1fc210ccb1e8b3abc7aafa84f1896d535d7e1c24854d87971be8bb3";
+ sha512 = "df195bf219be42563df30fd59504b1721d77db945adee200e8c8b9af7aceeb3ab2a4f2a3cb5a1707a862441f580a3d6cb02beb0bae5ef8cf677c0b20da2b3e8d";
}
- { 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/56.0b5/linux-i686/es-CL/firefox-56.0b5.tar.bz2";
locale = "es-CL";
arch = "linux-i686";
- sha512 = "0be7306ad2da4072abebea8e93ae7a826e7f4be78855400fadd930e9d7d4f114b7c0e6d830a571da17d3c67d9fd3ba7b0d3fb861ed8f61c7681b3f23dd8bf381";
+ sha512 = "9d5d54c44c019de98838ee5dceec8632d5944ea00d88de42c983e7b01e14b1a3e7fc390a16a60bb4fc00333bf862a58efe8079c9b57b2957c4020e49bcba0bb1";
}
- { 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/56.0b5/linux-i686/es-ES/firefox-56.0b5.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha512 = "df9e70df387da42984bd27e5f032e2194eaac20605c2c50be0b41bfbba2a1b71237380e7ad68ba02da3ab426575f5dcdcaa7a31b3871b9e565239571699d9fcd";
+ sha512 = "3e02e852544d0f78d2e842ec38cce1d9e43440d04fd4b8e43932ae184b43a8e3ffa21a85c76d0d506235f871b695cbbe277d07d4ee3eef2c997843e5a170af89";
}
- { 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/56.0b5/linux-i686/es-MX/firefox-56.0b5.tar.bz2";
locale = "es-MX";
arch = "linux-i686";
- sha512 = "cb021bb04ed655c92120a6dee9f65109ce5951d1496c5acd2aee2ff0e8204e36e3b226cc08a1aa947cebc693e84b41c87de91edddcd47265835c883f6078dbb4";
+ sha512 = "b9d1450d16ca587ba9fbf4000bdfd528ba3932785b63e948211f6f1fbbdcfce7898739ec6aa2d76a3464a1802393f45841167598f5a933b3800940d432a6b12b";
}
- { 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/56.0b5/linux-i686/et/firefox-56.0b5.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha512 = "c3199f20eb4db23791bc7ce076b97bf08bffa447efb15542c34f2e6def2ee64bc6e2bdaf9de094eac35ace1bab6693bfab4f0ea0bccb2754948cc9fb13a99989";
+ sha512 = "68de6b9772aa4caa43f48025e145c70bd685a0f14bfc87de0668d6617f8f38be7871528e30a79ae42d86c998f8a36ee3455b4434bfaf76fd86760a3150eb6ac1";
}
- { 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/56.0b5/linux-i686/eu/firefox-56.0b5.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha512 = "8c168058d15a7b0f7fcb72bf8e25de041a6c8ff8b70744645dc03c57b7380a273d419090779ca755ee114b997e6beabea060542df53adf6b4dbb32527425b15f";
+ sha512 = "a1b1476ceb14e9a8732a5d52e114f3413d012538b4d41e601a6824b2c71346c5e1bef236c3b02a2104859b431fbe1bcf9d2c9ed9d5a616a6b17db8dbf58185d7";
}
- { 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/56.0b5/linux-i686/fa/firefox-56.0b5.tar.bz2";
locale = "fa";
arch = "linux-i686";
- sha512 = "2c263b26f64e565fc4873201e21cc2cae483ae691f628b4252928f3277d919eda1a5b3b0504da04a6da3df8875dbfd86d2aca440c9fd65fdf31992d87842a3b5";
+ sha512 = "b063e2b73a0a8bebd7476b60b0a15fa3a80d6aa5fa51b68aa7bc964d21278ecbdac306ba2be1df06bdb205c396e5cc1253adef47ad395720e1938cbe30208f8c";
}
- { 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/56.0b5/linux-i686/ff/firefox-56.0b5.tar.bz2";
locale = "ff";
arch = "linux-i686";
- sha512 = "089903272e4245ac8cc4b3a2f60809a2b11affeee2ba1befe03031bf05c8cbef239189f2a729d0489cf5593ceb9ea5356a21039b464b25c8f4613bb7ac787e17";
+ sha512 = "8a60c7640e7adda279b33d3c5e8c3981bd197118d38adcee7d9c053902680e329533c256c7361f2c7626f55d3550de193997e7212055338da8959b821c95289f";
}
- { 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/56.0b5/linux-i686/fi/firefox-56.0b5.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha512 = "a9f5bcded43b63766ec18f2a846b3c4c57fdfab15a0a570eaa10b9b09b817abe63eb7e9ed67bd6e1bc31805582b8458ecb3249c125aaae1803ed5036a66460c6";
+ sha512 = "9845de20dab7f981f3762c983244f1c812768a40ef7fbea61f12df2fba80fd6664166d1376559a73edf6783b558d443b95f2840207ef4b6653012f2bfcb50fd5";
}
- { 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/56.0b5/linux-i686/fr/firefox-56.0b5.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha512 = "4689fba26647f5ba64eef2e8b188366747df8c2e957fc903845de131969e25aeb25b8f4528210be0c6d4a6a5db8a21079e1627aa8edcf087a5eafc8f9b0f8f2a";
+ sha512 = "21ed69aa109aa0931b6a3fade415df4347e3a387ddd8efa2dd0789c7bba5f74d1242b59df2641d8b968cb2edad19b24a370fcbf322d382ff60c7f7bfb3565b70";
}
- { 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/56.0b5/linux-i686/fy-NL/firefox-56.0b5.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha512 = "c9ccaf00b75d0032f3fa7c79bad37e672b944dddcf07cb6783b401a4115e283ef11c90684f3a1a589a745e08f2dff9e27456509fb78a6f894e83c24cab141185";
+ sha512 = "2e04e3f247cd3941748c71c63f35a7a328b7920f9ebec417a7b48457ca6b4c900e14139fc921a1e6a9dd5e9d766a35a5241849f20a5e1abd3ee96fdbb28ed48e";
}
- { 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/56.0b5/linux-i686/ga-IE/firefox-56.0b5.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha512 = "a62af4ccedf1b6c443a13efd6c41b6d6f492f31d1d7701946871ffbbf00df000eef59eac69292f6ea8be64d9512d064ea86d7cdf07656b8ab2bc234106468db2";
+ sha512 = "4d129d34f70069fb82f50dfe9987192b2f32186f6b9ec7497abafde3c02c65724ffefdef360cc27c39bcc77117bc373a516703dde68af5b1907713060cceeecf";
}
- { 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/56.0b5/linux-i686/gd/firefox-56.0b5.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha512 = "177f3584b81bd03ceceb0f7083114b38ba826974b115e962d8c6065c001aefda7c65c273c1a833cf7dabd24b69e0c42079ccd6842f882f196de1a2fdb7ce8605";
+ sha512 = "41f29605f42672f0c178b5efcd3f20f647647c84a0b6a0cf814712758b41aed844517452c421592d6d44a7f2b1924eeae71092bce70c1862517cf776fc563739";
}
- { 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/56.0b5/linux-i686/gl/firefox-56.0b5.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha512 = "6dd9fc8420093f8faf0eaafbb1cf4326360d610593fc8642e488a3850d9f94a249e27c89123eb3a25e476100b63fff1a88dc85f3e5714080ebc9078dc9309ca4";
+ sha512 = "4004eb49e097e9e5e135b2d6d13a637a7c8eabcc8b181c068d8fc2b6991129820ceab18a13e4e3054b8486b9a0a3a6fa4a3246d4af21e51052438dc77bdf230b";
}
- { 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/56.0b5/linux-i686/gn/firefox-56.0b5.tar.bz2";
locale = "gn";
arch = "linux-i686";
- sha512 = "3badcdbd0642ac510cf978e978ea7a9fbd1d6a0de7ca541aa2eba16bd2b788b5616fbdaec06a3d29975c6b4fbe8894b6f38e2522a6495b4d8d1564efd4c2c656";
+ sha512 = "b66153345fb4e611a476275fcb43d4742468fc83e1a109b30aebdbf86b8e661d06f29c950a265d4e929f949415f902f80ad5d418f3fd9a0c310d2ba7d7b8dd86";
}
- { 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/56.0b5/linux-i686/gu-IN/firefox-56.0b5.tar.bz2";
locale = "gu-IN";
arch = "linux-i686";
- sha512 = "85b254c78925a8f30798e37afe5e452c50bbdfdac683a16cb0407c8cdeb1a9dfc23be4f7bedd44c8f434d2d1b16b65603448e356e5d82ca41bd698bc275da80b";
+ sha512 = "446760799bc1b453e1f1d1be21076cd7164f96a2d2628e8e6d48304d2c03df939e43ef66b97405196a9879eeb07deb728985d7c4fd0c021558121627d5f94145";
}
- { 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/56.0b5/linux-i686/he/firefox-56.0b5.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha512 = "49c6aad468a893d77f9b158883095fa0429e4acc0a18aff2b284cc90036f11a04de9951a2fc18ba87ecf1d3fa6c55673e9e0e69428bce980638fc270356e11c3";
+ sha512 = "73fa828925f54f3bf1447e81230543909bbe5af400ffad5c1af54ea20aa8f24a7c7c98d75e92e391a9b5f2bba41fec85a54f161528a0aac418e2bba8b63954a7";
}
- { 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/56.0b5/linux-i686/hi-IN/firefox-56.0b5.tar.bz2";
locale = "hi-IN";
arch = "linux-i686";
- sha512 = "6f64ce83bfd5156c6fef02fbd0e7bac47f8a04848ba5da619c9809510b1f1eefba396c3c9f48ad6f9d0ee700e2b19a6edf1f0b104ec05bc798c22b8dd2b4a6e7";
+ sha512 = "bf5f891911d699de47349b6dc8ef1fea3d4e6ff1ea243e50b615035ddee991d94f57bc2eb191bac15e899c63037c976adb051f8c03a10fa0b170041b36f79a57";
}
- { 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/56.0b5/linux-i686/hr/firefox-56.0b5.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha512 = "0c4f520f2da27b1a5a59bfef7fc9648b9794bf0e4e471082f0527471bc824ce999ca668ac6cfe39566eee81cdcc66d5a09a15dc4aaa528345786288fc4ee4531";
+ sha512 = "e840ce4d1fdc373b22f3b8b6b33ed86ed19721d5f8fb52dd550f75d71ee6204d0baaf4856f090a710c622c5279944421f0efbba0bede9350055a4cba95e5bef1";
}
- { 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/56.0b5/linux-i686/hsb/firefox-56.0b5.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha512 = "b7753e082c93d169aa559bbb9314de29cedfb3bed336e9b2bf2f4514269fca3ffef52e5298322c9f5d354aea160bf0e1538cb51f570a2c29d504d398c6fbe262";
+ sha512 = "139d7d9d831cd89b3f9db005b1e93908c5a0d3e7bc77923cd2ea78ae3443c26fb8458c3ddb5055f381f99e9851002c0929f058869aaedea2accb2f616917b1df";
}
- { 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/56.0b5/linux-i686/hu/firefox-56.0b5.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha512 = "84642ded2af2d558cf93960af568cd224ebff05f13f26d4fca84425df14f6ea8ad3ff459df16b0f035f28697723a264d2f3ecf8121022ba9659ed47163faee7f";
+ sha512 = "7e121659835fb0b175f5b19fa3a6049285ff8ad87309572eed8616e3f418591311dce94f724ff6bdac34bc5480f656fbe54b1202d900d7bd73f034fd06f766f0";
}
- { 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/56.0b5/linux-i686/hy-AM/firefox-56.0b5.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha512 = "fbb79684d496b4780bfeedd2d682fda002bd190f5148343d3f3720673d2dc26609fdafe402feb96093de0db960135293dada87218612bec562a6be2760514a77";
+ sha512 = "db9f64ae24566a158bb27525ea5f6623a433f4c59b78601d289d42d8b8d128ad8957cef953ed27f6af93b91cb01752cc010af398869693940030a3ef8534a903";
}
- { 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/56.0b5/linux-i686/id/firefox-56.0b5.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha512 = "405635feea5949d6ef58632809fc69ade5f77f6dd19f0c190059698558c429f28f94fdf08612c0346ffac4e54bbe806dd6c01ebceb9202a4c7911f86ccb1f747";
+ sha512 = "413933af7bcd519529140a6609d0ce179140477bada96bbd5863f4f5159dd322ca0951b5e5401afdd1865e5f1aeb01ce6c535b121a002d8cf00db55c2a2fbdb2";
}
- { 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/56.0b5/linux-i686/is/firefox-56.0b5.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha512 = "5c6e9021355b7e9bf4d13db20d7bbb09dbcb94c4c8213e2aa313b6a451ace1bb394e31ded52d36ac80770b64bbd7b9cee93c7df233338a6ca9e4e5a8f0a8fa80";
+ sha512 = "6ba6a3f75ecff44391690b5f720159e86095eb7c5cae34bec0e9986071a8a4bc31cd03941c46ba40852fa6689f0b241d117f76ffefbef9c85c519bbcfb4246c2";
}
- { 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/56.0b5/linux-i686/it/firefox-56.0b5.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha512 = "2fc8eb314a9328cd91029aa28234acded5ee1318b2708fc167171f4ea8cbe25a87e0130ce3c13300fb15bc5e8d09ce504da9ea5ab46cb5b01498b083d067499a";
+ sha512 = "489893f4dedad8a3ac628454bdd2452aede7f37748d4af32b2ad5a1d1da4703c19c9718811d3ab6eb47becf4be60bb18c3c97476983a70cb135136839504616e";
}
- { 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/56.0b5/linux-i686/ja/firefox-56.0b5.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha512 = "5cd5fe41c714f9efcd7a0d4aef259c01ff4a3a0ac05ebfd6b011fb2984f1399803199f7f91703fb55e3e4cd8d0032bc6469065dade99a4290dc2af1109fce044";
+ sha512 = "d2e45cdccd321f8056e7b092f07cfc5da8150b96ec4d9eacb42c391c2b38ec4ab38f9467c4f5fab7608da606d2d87b94c20b5306cd4aaf881aec353348fc7574";
}
- { 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/56.0b5/linux-i686/ka/firefox-56.0b5.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha512 = "1e84b3d9fd78c884a125a18b003dd03834b6ffc8cffae93644bac3d78e6041cddb831ceda58d5d4d461e3fe900204d3916a917d5e5056e12684a8ec471df9d20";
+ sha512 = "06cdbd6010fe2e0017dbaa9c0bd8b84a6133d607837afc3eb35488bbd0459c0ebee50e4352afa218bde546315cf0aeee3a34b9dfc00b03fbf6f6e3c205735030";
}
- { 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/56.0b5/linux-i686/kab/firefox-56.0b5.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha512 = "a650cdebc1c89f5f65d60f36449650ed36f9ab79b4e5bd084717f88c089312a105388bc6cf6cb6b05aaa05ef4168225ec1378d574f82b0c7ae2fcadd9ba549b6";
+ sha512 = "d2944780c51ae3641ae51d34e082222692352c75b1c85bfad15cf97b3083fea3b8f3f39938d35bd6d452d102321d1b598c30e85fa576eac32bc623e37e36c432";
}
- { 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/56.0b5/linux-i686/kk/firefox-56.0b5.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha512 = "901a7f524fb6cab92a6f686ae2951ac4668b2373f0306572b4214b9dff76762e36372afb6d5eb319eafb0c1595a62a8020078938a650531dedf26e4951f7e519";
+ sha512 = "eae250b6981a4b932dfab0cce9f31fea9ae32ffdee5021346362ad3151421948db9781cf8b98b2c77becb4541047d7d0cdbbda731aa24b7827374078a575ba55";
}
- { 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/56.0b5/linux-i686/km/firefox-56.0b5.tar.bz2";
locale = "km";
arch = "linux-i686";
- sha512 = "a86ad7c74e87ebe0e4885914a07e352349d353507708e79e37be2af57653f4778f0203b1d72580909a725aa696e8e8f491fc817237f553f526400aa47da0f03c";
+ sha512 = "fd5f9e8f999b173decebffa5f449ff0681b5ce7258b56dffd909d86364567b3e53238159648ca12a6c76ab5abf5903a6fd82207e8e5c8ae657aa6a0c650b1f6d";
}
- { 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/56.0b5/linux-i686/kn/firefox-56.0b5.tar.bz2";
locale = "kn";
arch = "linux-i686";
- sha512 = "6f8e697482ac61565c2030164ea08fb92803e91cbd3f562ba70f982b2db7c0d9effea7347acf3a4cdaa7c7cbe393a3455b4a7333957ac2ee707f5b542ecefabf";
+ sha512 = "22f0e3b45877de32edde2f351d9434a9d6676c51bc70233c289386fa752ad5768d2fab202f74f2c62ffcb1fec2e2d318041689352d93f8dd13608e9243191b68";
}
- { 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/56.0b5/linux-i686/ko/firefox-56.0b5.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha512 = "83a7ce342c38ee014142e60590d59e42373a38475a36f4c9e03dfd12890e4649e34a0ab5c3153c93ee9eeab9810c78ddb5332e4bd92c891c462e1df2a2305bfe";
+ sha512 = "631bb19fc65075b18e4c88d60b5a76e39d8a7516a44c2df5375668ca86775e577cd60e5b9e445073a47c9d117d7e96d9e8a5b2422749e0dd3622530abe21aa42";
}
- { 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/56.0b5/linux-i686/lij/firefox-56.0b5.tar.bz2";
locale = "lij";
arch = "linux-i686";
- sha512 = "8a8b686894ac4c211381e31e29d0020f43b11c92edf8158c89838e73713576e21e3d25349d8f3bfa1da3a9b232a1c058f6252af15e0f2181a77cc24fd046ef7e";
+ sha512 = "ae267046c3a6ca584c85f5a8d4da3516957313cc68e554fef796fdab92a2d450effa15efcbca5686f46a4dfd6ad1f61bba529d9cbacff0e65a857052b95ecba1";
}
- { 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/56.0b5/linux-i686/lt/firefox-56.0b5.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha512 = "141f50e9bcb95e456204620f25e670ba3299b3cc06f86afe7bda652dc59745d09e9014737f70caf12c5f6a52c8b5f0777405969b92efe272a579d2eca817e22b";
+ sha512 = "db979def47bdc8b13060aeb2f0741c4e28d5e1bf0480703f26c0d7e5cef48c10e3d75260fdc6699668cfa3374de5ee25b150f3d5e0857ce801aeb187a8e7c4d6";
}
- { 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/56.0b5/linux-i686/lv/firefox-56.0b5.tar.bz2";
locale = "lv";
arch = "linux-i686";
- sha512 = "c51ff24bf9ecf43e49064aede96d9487240e3a14bf5b6e61da1c83de01b5d5e974432e43b93d28fef0c473311f528cd06ea2d2a3fb09cc7a7e8fbbcc07c7e4f7";
+ sha512 = "a703df8a6c1a381a281ebb9bf4008637009da5f66194a4f85afbf2ae980de5a118e0ffdd35aea7e8521026140f2c003afce8ea1c906ab90c1db7aa4025d03be0";
}
- { 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/56.0b5/linux-i686/mai/firefox-56.0b5.tar.bz2";
locale = "mai";
arch = "linux-i686";
- sha512 = "2307008568c8140d7b90ff4dce3d4c6fa6bf5f1776d93fd7979b14ffc384916f15261f611dfd3c0e83e5d1e8980bff9c551ae9978ed16540a399f6cc7ff64c84";
+ sha512 = "ba9015d716e0d15b36cf7e83a28d99310a87cb2242b9e920ba8fa9112567cd0de1dab1cb8fad6ec26f381ea1cddc0b40b4c41d91450c1c76124b3c53869bc27d";
}
- { 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/56.0b5/linux-i686/mk/firefox-56.0b5.tar.bz2";
locale = "mk";
arch = "linux-i686";
- sha512 = "b6746b827a3c45e0f8a7bdf4423f63197ae728fe0bcaf0a6781e44fc42dc6c31cbe1e4ec4f1b97f96f1534550aa6921f453ad9732e62ea8fa0737a36a10e3479";
+ sha512 = "12c4a7dada07fb6a643675d5f504cb76e00489879fe3f2ac2e9647e053fd508b18c56f2aca172aa12988cab6672c75179e7366cb43791a443ef70dc88d0897f7";
}
- { 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/56.0b5/linux-i686/ml/firefox-56.0b5.tar.bz2";
locale = "ml";
arch = "linux-i686";
- sha512 = "7f1a44de725ba6ae31eb21e005fccf6434e7987acd8a480493fe872163ceb5d7052e9fed2475ce65ff487f0824b3a090c917b2a8119b4b9b47a3c6e5f7fc43a1";
+ sha512 = "f6c93dfdc19487c1d61fba8a001680b9556ffed9599d4875e3e13e8df07dd49ce266c545aae9718e2657425815c643b803c170b620fb28c7e2727e92fcae0b91";
}
- { 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/56.0b5/linux-i686/mr/firefox-56.0b5.tar.bz2";
locale = "mr";
arch = "linux-i686";
- sha512 = "e751aebda7834a0532fb0885da223316e19f4c0606a88b5a70956d0a72bf37069370d0478c2809400ac09f76822b34706d776f5ee6237b7b33ad4237ee4f7fd8";
+ sha512 = "eab3ac3f2afbc091a0fc02a6fd6e0bdc2dc232e06019d2b7ad3004aaa069f7afb1d4a89b7b0932e80589eeb262ee3e0b54f75ec09e2d09f58481d08c85bc7b09";
}
- { 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/56.0b5/linux-i686/ms/firefox-56.0b5.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha512 = "ceaf89d467075799f95ebbf7b93bddf4c1961fead16fb86962bc857caf3ace620c42e2d11152b9cb2819f9a8a16625e5e276263ebe9066dba0840696a2a0a052";
+ sha512 = "99c3905d7b081407c6b044aca8c238e00ff2b6a4ef1cd24813746efc862a50fe7f2f3ebc79cf2f436e95cb3214894d991f8c1b003e52b70b2865970daf55c148";
}
- { 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/56.0b5/linux-i686/my/firefox-56.0b5.tar.bz2";
locale = "my";
arch = "linux-i686";
- sha512 = "d7d6ca947e04fc99d28abfa9d9fb07e85f4f71b71b381cda0c8587460c6274a860ae26b60432566ac9af25c752e8d5edbf8cda515cd523521958e2f3bae4cbe4";
+ sha512 = "e391c752eee676f298ff37d086edaece84578e0bafb099f4ed8e0790d64de9ba64f4cf15c4218b70d519507f767572af7fd269b93d1766d2fc76a7fbd8a09848";
}
- { 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/56.0b5/linux-i686/nb-NO/firefox-56.0b5.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha512 = "4d5f7c260011e00a202c841f2ef103aa9fb6b6e329a51175656bf9cc3952664da5c0e90de571f9bb6c0886363e1988b8a81a8fe3ce0daddcd1ae284b68b8be34";
+ sha512 = "99be4ca9b8178d6ed7d7f1c7ed466bc7113087faf7256064ccc0638366c554a7443b5ec83bb85b00689d2d4787f04268dd736eb62261cad69927d68ca6b83061";
}
- { 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/56.0b5/linux-i686/nl/firefox-56.0b5.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha512 = "994ee217f580dd8bf8eb06cea6f9ab509f7a430e8f74946d518465ec26b6b2d7c61e775374a9c1c3101c3a7c663326903226af0b585b01b40cd57151aa909a39";
+ sha512 = "de3eb748339672383aa8ac01cb2494bbfcf08e1f694a5505ea2407374e44cb339f857c2a45f72da3831e0f800ac2b78ad159cf3c795244c0b7ac13c2cad50240";
}
- { 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/56.0b5/linux-i686/nn-NO/firefox-56.0b5.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha512 = "ae39cb50182999233a46c6a5326ead7b5e2f363cfc10505f246d14e70fa52bab5f51804a03a7f20485b9761dbc4dfba3596feefe27e6026dc530646da0cc4b14";
+ sha512 = "bc45d70e14ec14122e45dc62a1b3acadc5a3de2a9ad6bb70d848c2952ced6ef3032a336579504fcf474bc3f12f7b8eeb6c92e529053ff3592a167b999bbe67cf";
}
- { 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/56.0b5/linux-i686/or/firefox-56.0b5.tar.bz2";
locale = "or";
arch = "linux-i686";
- sha512 = "9b8346e09115651b58a2aca7a7ee2f4346155fbe6d77dda6c06f3a3e92ad4956ee5775dfcdd9c193a36a00407132aa2041311ba92e7b59c10cab287f8c8c4716";
+ sha512 = "91d846d406acc1e453a09b5de1fea0760564478a680511afc54e40c5dacaed602f8ab942dd77f25c1d89a507b867126969c36c0098763eaac10f047912cf83f1";
}
- { 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/56.0b5/linux-i686/pa-IN/firefox-56.0b5.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha512 = "64bda267943ca748f6151498d477687bfe06f52110ef10e5bb2a744548878f3cbdbb5dd707bda4607c45e8ea1037981a2ced01143ffa596a3847792db4849371";
+ sha512 = "5c20abd276309d82e772989dbc8c8daa6997bddb67d794cb39c0af364407d57ba9d28054116af38d5b42ec339c16eefdf3266355560460b64957504833c7936a";
}
- { 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/56.0b5/linux-i686/pl/firefox-56.0b5.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha512 = "dd38f64466c58cd4aee750d4489e598c0e934c6eb904ca8eccf1c2c1c092bb87af739a624f5f210e6c4ed25a6ac3dff233f13f1de5abf7a9bc831e02b4630f60";
+ sha512 = "470f2e471aedff4520ecbfda764710181cb6cf044204968f14f68bfc34f07a07a8b6e80d4dfe6f0abb1b4a79a5ec5169e552a3588eef7265df9d3bb91da731a8";
}
- { 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/56.0b5/linux-i686/pt-BR/firefox-56.0b5.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha512 = "b1265e3274779c415db96c6a8c2518b159311d4f7aa638c030d90ec4169db70b6388df9b5c94fe31c4e41417cce2e65a227a6f6e9c47322a365fc6941d50e1e5";
+ sha512 = "3487002948274414166cbf1527be353e9bc2267c672c2d14d731c162684e323543c5b54a43bf1f66353337e3df30fd45dbc90f0dfa8e07d8c4d77883ba1ea909";
}
- { 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/56.0b5/linux-i686/pt-PT/firefox-56.0b5.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha512 = "30e5d4ed87cc28fd51340d407e506b56fcda3cc23fc382d1c471af2c3b990222a5d2fb7b645373c1f067825df56875ec6c2f9bd7b2b259bcf0e466f5070bbb2e";
+ sha512 = "7f1b57fae5a4a8981a2b5fe1ade023e1845af866ebf60f56d88c3cf8c9fdeb42aa1c48f5a3f8f535aa310d7f53ea2afb3787cacb8a211649be9ecfec0d7a1451";
}
- { 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/56.0b5/linux-i686/rm/firefox-56.0b5.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha512 = "c3d31a0e8704bd7dbf6aab569aaba68df60489ee38001905f445849fc9bd1eb4666cfba8bef959a8559dd0dd9c16222429f64b398a55502b4d8dfd7fbc8d614d";
+ sha512 = "a73cfe38beacfc621cd10373a774b4ec517ea336e0249b7abd5500a9838fb3ff7b903f64c82fe3a8cc91f89f2bddcdb2d16fb41617a0be69eed67c47f8f5cca9";
}
- { 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/56.0b5/linux-i686/ro/firefox-56.0b5.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha512 = "d9833be482f828da584c2d30480230e5f79432bf3479f05b5be978d7068e11d76f07f697f85ab8c84b68f49e78593cd1a3fd9067b888f11657e96ca8a2dc3872";
+ sha512 = "f18d20b7ccf069b843dd9acd3bb46c2d41408b319ac32114aaada886d43cb679b4624512637b1202fac9977d1a657deeb7dc662623e69c2e04b558ae0ca0ec39";
}
- { 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/56.0b5/linux-i686/ru/firefox-56.0b5.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha512 = "e1f1778d4e7d019f2a945a8c83338bd3af7b6db0277af921e869c6c94fa22579240570f6d7edbf5f42c28044b6537f724bd33719d4d7cbaedca77ca7e17dfc20";
+ sha512 = "4ac1c79dce2a208c461a6a8bbd447aa4aa40b8dfd3bd1b8bf3dec3fe5610f8bb51d65052ea23f81d0792f6a4d6b49ae0cec1e82199e8b7c94788290073bb7681";
}
- { 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/56.0b5/linux-i686/si/firefox-56.0b5.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha512 = "63580c6e8820bdc3ea48dca090ab3ba2393d02051ce26905fc3097a36dd9e76efbd19b704145a0d3960a86d52462c7c58497591fbe50f6351e7d727871ec77c3";
+ sha512 = "d5c0c9fa140ec72b805f5aae8374cd0f56d21973fea5ab14f68040f38d15ed32d0c7542456eaf40f100006d79acd006cbcde1cecae81efca5097ad25d6d3171a";
}
- { 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/56.0b5/linux-i686/sk/firefox-56.0b5.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha512 = "9df80f36ecb8607613f30254aa8c3af5b6d417575c937dd6f428b5e62989ba9bf9237d7244b0ea598127ccd4bd2aa35db31a54412506022fbe4f2e65eb603d4b";
+ sha512 = "c5cd6793ac43b865c025f64c1cc10e2771be1e0ff6578258aac3cc433545228949c6bf33fc2764cf7272f76026549857124b535ffc64018879a7b7afd534f05e";
}
- { 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/56.0b5/linux-i686/sl/firefox-56.0b5.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha512 = "820cebffee19a05c2c03ab25b5c86ac7468989dd2a1118d3324dd7be5d3827675a791e3ec0b92ec32907fc585666b5b1050c81c5e16f57ffadc11da3b6de013b";
+ sha512 = "5fc23876fa9cea6ea3209bacea4ea3975e7979c0ed0ee023857288ab286a4d6366c7267fea5ca7a4a5d4ee11287af490fb6bfb7e287d0f3ab70bae715e2ae049";
}
- { 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/56.0b5/linux-i686/son/firefox-56.0b5.tar.bz2";
locale = "son";
arch = "linux-i686";
- sha512 = "b70dc6963e44a225254aa8b9487c40abd03ba1e1cb96cc2ab4a8b24908b26f5093bc715ae2dfc727257465ef8cd01bb5b15628a328a9cf5fd6b78b7f35771855";
+ sha512 = "db1c80a5dcfa6aff3b9e8abf2a89946cf13a7ba045124bc37dacd761011ad3757319dac52a084a7b79acc0a1a813ae0d4507045c7cea01c3d06d0c6fb89579bc";
}
- { 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/56.0b5/linux-i686/sq/firefox-56.0b5.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha512 = "ce2d445084c4db468e1a116fa9e4b741ff44ba994ebe5c575295bb6cd69cb72e5305b8a0326f7b43ee620a5e219279696b862ef512f3c4bfc32d3b6b2ab2321b";
+ sha512 = "3b73fd94fbd37d486a4bc2b0c874101dca703cd0561e6b8bc19c4c3297c6fe6aabcec3d4274c361d6eb40f3851f262ac6b87d4efc6d025a236b90bf9c3c41e16";
}
- { 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/56.0b5/linux-i686/sr/firefox-56.0b5.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha512 = "4a5b4f4e8e9aa944d7dff5e1bc40f44141b04672666663c8c4a1b7844faf2289d3323427efec373f5f4fdc7ef5c79494dba416db8ced23b1a5f387b462d609b5";
+ sha512 = "b827604905e7a0883d6e6d12295707c23077f2e7605b10084fcd9bf927a61401169e4b786d88e119f65b173d832cdeffe9163ad1b5522e2cc1b49693f4065f6d";
}
- { 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/56.0b5/linux-i686/sv-SE/firefox-56.0b5.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha512 = "56ca783a26d7c4c022001c72c96f02f79fc78bea625a73e3fb2be7602c96cb3753a718a184b7c1c5d154a755fdb4862a53137e4f8d1795345d6e5855cfe3faf5";
+ sha512 = "7dd79aa34c6645459de8c8a6d54f050d381a048a960da3d44238ec6d5579fe9856052a167e861bb72c4b73946836ef66f4b5cc9a2aa6894f7d59a8545583cd46";
}
- { 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/56.0b5/linux-i686/ta/firefox-56.0b5.tar.bz2";
locale = "ta";
arch = "linux-i686";
- sha512 = "9fe7f93308392fe970aeca2fa72fc7d709c592ebab1bbae768a511c6928c914c4679eadf3832f416dad9e23cadb241de6fba3345739b419d8118523b0c35aec9";
+ sha512 = "8bb836b634363a5ab120cb7fe94de9d8e7a0a66fe0b78443bd3b65fc6c9225b3bceb42539e9cd0bc424115a24938c809a36149a70796a854f4f76f009946f628";
}
- { 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/56.0b5/linux-i686/te/firefox-56.0b5.tar.bz2";
locale = "te";
arch = "linux-i686";
- sha512 = "0d1333de541d617aa61741b03368c82ec8c76374741c086866d1d53832d97b9b0ad115d406914bed8061d348c0ea1bb5ce84a61e57596afd5ae318022b8f50b6";
+ sha512 = "5f9c4eccc27acff2e6bd388c4e8bda7813550de17747f7bac13c3d72d58babbc1f63051053cbffd9a670af0a317a2e81ec3ad77f1a04a969f8333fd87d6f2f29";
}
- { 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/56.0b5/linux-i686/th/firefox-56.0b5.tar.bz2";
locale = "th";
arch = "linux-i686";
- sha512 = "cb607b0394cb81e6db0f52b080866fb26f4776d3f81ba9b040553fcb087817795049b4c12128b9c00bc17d9d0554dc428f680de531f80cadcf24fc3dc1f15a89";
+ sha512 = "b05172f35cd062bc21125ee6230135c30afc3865612088c2bcc7e6e013817452a4dd9e5d269a8b2ebeb144d0c0864a155e40bf59312fa7cff7ee3da7d80ba55a";
}
- { 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/56.0b5/linux-i686/tr/firefox-56.0b5.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha512 = "3549abe03ea546bbdb0c0837829c7c9402a2d791f1fecfd7d8b9f3a3c14f496c26f758096cef959f9f9e5538397526b8d500e4d97062363f6c370cb7b8ea2b95";
+ sha512 = "06e2ae2b1d3c1c06225fb24cf9a7148e80b56a2359c218ac55a04c4a21d0ebcb13c357bb455157ecdeff7b1fe9a0841a73b4facbc4a53e7529793d5f1a3ff70e";
}
- { 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/56.0b5/linux-i686/uk/firefox-56.0b5.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha512 = "f65108c24e28daa73d79d52bb2c58c0d590c6bee90f4a57202954d556ea04cb082ab61f588747bdbdd7d1c752272d83e47708bb5a2c7e346f6bbd5f1bc8e5746";
+ sha512 = "bc8cca21ae9a19a0a345e08a304d4a9964e448b3787ff9d61985082d9e04ada1709924020842f8fa68ef7238ac551f575a5540e1a2254ca7f54f9fc403c25e10";
}
- { 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/56.0b5/linux-i686/ur/firefox-56.0b5.tar.bz2";
locale = "ur";
arch = "linux-i686";
- sha512 = "f138ec6164a608d03d7873af6f4ee8fd51f553912c06841e41214b24890f232bb342c2c33df388a58a958d932ca803ac671f2daf139ceba4f46c8fe5cd038bf0";
+ sha512 = "d4b02d24bd952c67d298ed8fd27e7565d6ab9533d8acd69aa9a1dfe2573471378480523092c01f929f25e81cb43817bc4c0c1dbff88031439b0a358c5bec9eb1";
}
- { 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/56.0b5/linux-i686/uz/firefox-56.0b5.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha512 = "7c427f89f4aa7462a2e3a35755c5dd82cfc5ced2d82fbfbfaf8804d152326d02e88fec8230d4905f89eaf27020f522c4096cdb844d38fbb0ef4c5c54c250745f";
+ sha512 = "6db32dfb929b7939a2f54e198fc6bde10cb0aa2d9b1e39156ea1dba35ec7957fa87e5c7ffe1adbcf9ce0fb2d16eb324a8a6e49a6ff304bc369c52e91d050c714";
}
- { 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/56.0b5/linux-i686/vi/firefox-56.0b5.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha512 = "6bd2810d6683ff537aa47b97dd8e4778604a8aa58e7cd8f5a1aeea7cebdabc8f7111c025131ad6255428711a5a6ae69bd1118b3636f6f4ab3ce4022aef293de0";
+ sha512 = "7cb643e9a6d920b813e7c2e12e17b5b1ee135178e208bf152eba388c9e68389d3e90425a86d45597253c729562bbd2c4b582d86d2ed2aadaf0780a08ed787421";
}
- { 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/56.0b5/linux-i686/xh/firefox-56.0b5.tar.bz2";
locale = "xh";
arch = "linux-i686";
- sha512 = "d23be8509fc11f3726efdcad75847390055e2d4d9fe775e9ea007290e21e9e9583dbe5a2a74dca0866f7d0cc2d3066f9afc4bb1e6665e94cb808b3e9f3250439";
+ sha512 = "254e006f0ce5dad4d1b7681fcf8569b7e7735e9b534f626d517c58f33da483c9de00990d77530fbc3147b2a26c5bf8c0834e7c029ee632890ca98e14328207f9";
}
- { 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/56.0b5/linux-i686/zh-CN/firefox-56.0b5.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha512 = "42361dd8de84b011d860b0fd4a7f7ae59b3cd8297c57275283f61ecf51275e8263a67af9730e82251c1c9f19c5216b0e2d65adde5987c4dfa88f3f95eea8086f";
+ sha512 = "30dd152aab923fbc4398fec06d5558aa1abd0d9c690ad4ded7d1695fa4355e5046c4279c450e856c87e32699354d657279958ce1b7c01d646e89faed1acc142f";
}
- { 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/56.0b5/linux-i686/zh-TW/firefox-56.0b5.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha512 = "44735872e5600fbfe03a5ecafc0f25b8f193572b067a8a18a598ea4972952747023a93c10727887e6f598922691bbf2bd90a76c8a966abc69ae946ab09aa0c81";
+ sha512 = "f2d7bbb0cff7e0d0c77dfa42bdd268c06dfe1b5d3135baf4e095dd9f36e25f8bbfb3f06851eef314816d53e5118da6a719c45071542e54d9e4798b2d13b06580";
}
];
}
diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index 33591b5365a..8a8298ef818 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1,945 +1,955 @@
{
- version = "54.0.1";
+ version = "55.0.3";
sources = [
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ach/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ach/firefox-55.0.3.tar.bz2";
locale = "ach";
arch = "linux-x86_64";
- sha512 = "60057e48d8bda98dc63597aa795899ca1fa856f8a9f9380a8de91d0ca0641dd291a3fb27bd1f69b1effebc5288575c0a0661199e8e8e95ef8d924fad25831678";
+ sha512 = "fdbe702f129c2e8c749fed009609c475282638b5e920defeb65b94cce807f96f8f07d02d916c91b3d50cb9f909b419d2c635b3914f8f059251f33f93b887c797";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/af/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/af/firefox-55.0.3.tar.bz2";
locale = "af";
arch = "linux-x86_64";
- sha512 = "08a2cb7ee7bfdd4a5c205a38e1d966bbf8c67a3a5abf52bdfc73dcb527cf0dbe361bec4996d52e33321180f5c1778e8304f1b377bce04e62fca7457df8ee69b5";
+ sha512 = "b5ace58a9cffa219e3a56eb5e427a482dcce4f2e4ac2a6955c3bea6c40b48940763129499803e86742ca3407d4a80973094d9bfce869bc2a321b443258fa5806";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/an/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/an/firefox-55.0.3.tar.bz2";
locale = "an";
arch = "linux-x86_64";
- sha512 = "200f10de4f714afb10a9c6d1b4ac8488d5bdc18673b8db9aae51b8d0e8b14fc3f5f6211447abd10e13704b07499fc1a273d9ee060329d8337cc413d7ed6d19b3";
+ sha512 = "d737a3425592ecc474399feb2d1f82fd7cdab362ed406f26671ddb3ce88c8736b17627ac279c12551c2b27432f9ba8bb3dc93b6ca30124cd155848a63bccff06";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ar/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ar/firefox-55.0.3.tar.bz2";
locale = "ar";
arch = "linux-x86_64";
- sha512 = "564c72c485c593342c7056bec7dfa7a0cafbfb26eff278e08b0938194b311633b3e3275fd0eeaabc63eace36712efb194ecb700f61957bf0553b79a71977132f";
+ sha512 = "31e834d78399549ef670e78d2ff9befad6d300dc327853d1435d02533379e23ae38cf3dfff1222e314165c8f80e2e4fb9f364a9a3b33fb3d0aaed3259414d321";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/as/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/as/firefox-55.0.3.tar.bz2";
locale = "as";
arch = "linux-x86_64";
- sha512 = "84d14f6152bbc17caaf4ac8d421835032da45dfbb34dd198ea5ec65d972e10a774aeba830eba5256933f3df395b5aef71aede2e334fb35aee8f9f27771d65dce";
+ sha512 = "8393861ad7e2ab0a070ba32f38afb59bfabba4510f0f9a85273b4300fd7b2f45461d8e2c0a485e1d5776533d4b0bb8d06c78efc2a2a0c87af55fe5eede33e6f2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ast/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ast/firefox-55.0.3.tar.bz2";
locale = "ast";
arch = "linux-x86_64";
- sha512 = "f5851e28972b5e87b48e8498a01c685790e4ace5e3d0f4c286953d6fe417495a9fb26ca3bd962d1f798a178115d2bb60367c48057c55b2e601dcf208ad146cb4";
+ sha512 = "e091884962a239f65f7bee05e1bdc516091b89ae7be1dd6517c4ae3b8ad34af0c49c04d365114cceca40a6a8af229256f100e4a1aec09e7e284fd6cbee497e54";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/az/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/az/firefox-55.0.3.tar.bz2";
locale = "az";
arch = "linux-x86_64";
- sha512 = "6ed4bb73da6362ed4598d5c6de8b072e919894778ecdec49b2e8e406d0c68b88c32f0b208a546834cba7ebbbee9a09595a67473e29a5c11bc2390d3a1721aa42";
+ sha512 = "3324d8041257adf120d08537ffb94e90ff1d701bd60b9bc3016570887c0a2ff2d10a406de599be8bf5146b62647f4b95b87e9fb48736c4d0e747be03a35b6d09";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/bg/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/be/firefox-55.0.3.tar.bz2";
+ locale = "be";
+ arch = "linux-x86_64";
+ sha512 = "65861965c8f3c5e37d9b6e919f0ec506340b38a2cfe71905b43802ff3cceaa062ffb49516541253a8c944ea2a6b0c09d6523da6f5b8419857921c08a53b70062";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/bg/firefox-55.0.3.tar.bz2";
locale = "bg";
arch = "linux-x86_64";
- sha512 = "bbcd618c9bf86c7ee49a3ee1a3aa799c72ffb048d694ba0e97ca8c4a9341d1ee109265529aeb23f578aaf66d34ef3a81a7031033421933c0f6d5d0ce136c3d68";
+ sha512 = "948b2469ade253a0c174d996053e4855e477f93f6a35351c3c6db10aba6e9894fa850289aa90bc7d830edc8ddad6ddce78f6bf5047f91701152c4b7dea10accc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/bn-BD/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/bn-BD/firefox-55.0.3.tar.bz2";
locale = "bn-BD";
arch = "linux-x86_64";
- sha512 = "9c3114291cac3b6df9bb92b398ed644f4851baaf99b6db9959e5fa841dd535da39cd3aae343226ae5fd713ab872efb4d4902f4a4f85e836372c67a416134c03c";
+ sha512 = "3cba3214ff62b5fbed875e7af40c04382564caa3ab613f44d25aba56eefca893dace583afbae172153fcbf1adc13cd0545e3c80ee72631862f46e4211589e103";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/bn-IN/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/bn-IN/firefox-55.0.3.tar.bz2";
locale = "bn-IN";
arch = "linux-x86_64";
- sha512 = "5662dc48972153cc67034b148d96e120c802ade4d7ef532fb2964f8ffcbec30878489c81d758e729135488d39123bd404ab53e1ae1389b0c4e22303096c7e3cb";
+ sha512 = "8a9335fce85a4787c091053842a45e2234ba13ac75568209d965f28a8d40ec42f8eef8da62878c0f8f17b6db052f72a00798bf2bbc37c7de9c861efcebd9e41a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/br/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/br/firefox-55.0.3.tar.bz2";
locale = "br";
arch = "linux-x86_64";
- sha512 = "166dca485d947bb42b1b5ac9781d48104d876f952cd8ceb4006f7e0f79773aa2f285413088cc535610e6209538c03bbeb63f91255712466a50a12cddf747f0bd";
+ sha512 = "1b08b96c1030302ac47baafbaec63ce87a5744a284c20a6432208d0e3c7750f15941f89c69fe3f8a7875a7eaf7a9872855c72c4157447799edc2ba6bcf3768e0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/bs/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/bs/firefox-55.0.3.tar.bz2";
locale = "bs";
arch = "linux-x86_64";
- sha512 = "81226d4550310d61d2198298bbc859406ee7f14e98ccab326b83bd51c8c33305771e9353d0609477eb381083f1e0f1a8bc0c0bbd085a738cfe00697877051516";
+ sha512 = "35e3a1c0b098c5ccf68e2b4547cedc513d31ca62897e0a6ceb6283e0af565ee7a1da847459217dca94c3e192e5b643dd0fb1e302ca54d866f7023841722f8aef";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ca/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ca/firefox-55.0.3.tar.bz2";
locale = "ca";
arch = "linux-x86_64";
- sha512 = "833096d35ca517d21b45e78d895bd4f535a55fff7a9990e22c684fba8549d2207317a715e2a42b7ecebf1ab474df262f2c25c9e44863cf167dad70f191ad39c5";
+ sha512 = "372881da1ab01c36e06c9bbc7a67c12adf2af454afb8baee79b506d65e99754340e0650a7c16f01ee6735d2c2bad6ba82ea437f3d6265f17efe2ba26d4b55471";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/cak/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/cak/firefox-55.0.3.tar.bz2";
locale = "cak";
arch = "linux-x86_64";
- sha512 = "5b05bf2b0a256e135e7d687520b901caaedd66593ca3cb458c01f8ddf85149144f75c24f8b0fd4bbe2d9cbeafedbb569f080970601c40895db96e7a14aa3c5d4";
+ sha512 = "447414a13729e3eef3311802c4714a00c707f3567d4d90687420972f57f4ab7079afcc741f7ea0e992f916786919c27a6670424036b50fac3be52bfe8eefbc8a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/cs/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/cs/firefox-55.0.3.tar.bz2";
locale = "cs";
arch = "linux-x86_64";
- sha512 = "63ea3c524c3e91504fe1b0d5cd1b74fbfe9b22cbfb18d9aec73569452a2766b90f29e2793f6bd235d68854d16b8862f46bf3ead132cd693866bd70502e0b8b39";
+ sha512 = "2eb5388d2dfccc213c730cf605b134e51c68496c93dec255c9ede8820de2d40968371e989f125c4ee938622312e782d6d68b28c836e7c8cfbfbfb100ddf59441";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/cy/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/cy/firefox-55.0.3.tar.bz2";
locale = "cy";
arch = "linux-x86_64";
- sha512 = "c804908472ab1a59b6a24e448b9bf37ded669dbf2d0a4fe0993ff2dba666e804b0fb846efe6c7f1923e4472a3735f9f33876dc015826b03790f4c445ab6215e5";
+ sha512 = "f27a12d1e9c9c5712f2da5236a2d81b8958eb8a208cabb8b6e1e75e40579bcefd9ea17a64d5f530248ae8f288ac1628ee350b1b280aedf3dfb8948d5cb800983";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/da/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/da/firefox-55.0.3.tar.bz2";
locale = "da";
arch = "linux-x86_64";
- sha512 = "c289354eb5443b9f5e3027e80974af9aa9a5da045034ee147cf75d52de16a1e35328027fdcde149f2ef1d3a72213e3837668fdab4b610949b36e180aaa1dac56";
+ sha512 = "f8957fea57b1f48ea18eb65bcf5caf3d5f71aa3ad44c697861d9b7c7655cfa99c66a49b034eacb8530d42a66b2a458ce4a4c97890bf8f28cb06d24d000517c57";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/de/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/de/firefox-55.0.3.tar.bz2";
locale = "de";
arch = "linux-x86_64";
- sha512 = "99f214b83822243530a8194edbf50284bb703ba07695c1c5f7bd3cfe87fce64477806cbff852af92ad6eef16c85329c1b04608490fda12bac27300daef23778a";
+ sha512 = "11a2076a5502d2edcf91a0b1e8776f71be3e5970885843096ab2e576dc5910da6b758b9372caba83fb5a6c20fafbc1dfa8d0a238020b32f93a7ffe50ba1ec430";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/dsb/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/dsb/firefox-55.0.3.tar.bz2";
locale = "dsb";
arch = "linux-x86_64";
- sha512 = "96682d6d27e4d2c57930059a6cabe2649d4a52e006eddcfd4f940ed816f448e3d476488ab23de6a1106c66007268aaaea21ce3f621ce7e21aabca1ec00a5f0bd";
+ sha512 = "e788a73b2b77d2cf6aac1557814df1d88ad9e036b1d58218781dc284433f3b8b9e1a34be4c0bceabb99b6238dca2f9dee8f5e97a994e09f5fae175eec7e34b9a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/el/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/el/firefox-55.0.3.tar.bz2";
locale = "el";
arch = "linux-x86_64";
- sha512 = "122c72046a3cc621da62432fbaea9ef690a5e1930e8ca3214333fd05cc397419eeb8e7f46e7998fd12f2fa17fa780d7a0df0cebd50ab81a677a363855f4dd818";
+ sha512 = "03099311390384c652e7dbbcb41d60eae522a1ecaa69b6e17e214fc0e06f81739456a2543adf9808b2b08d6b0c0b84dbea6168c70be4cc1ef71a04e81164792b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/en-GB/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/en-GB/firefox-55.0.3.tar.bz2";
locale = "en-GB";
arch = "linux-x86_64";
- sha512 = "bfcde5aefcfbbf6021f6c3085f27a5c9b88cb11b33a132d0a05c6b6f39a32aae8e140b3e73d2e09d6719d00fbb9c9998a27cd6897bb7e2e5c01f37190522320f";
+ sha512 = "e971fdbb2cbe2e080f75900df9a32506e26eb07859f635c9f9b4738ad20cf7bc939bfe6b8a91455178d124a29d869f5f960ad9bac64ac863d31dae3a2f4ab2b8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/en-US/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/en-US/firefox-55.0.3.tar.bz2";
locale = "en-US";
arch = "linux-x86_64";
- sha512 = "59416ec212626d225db0f12037eb68c98f564252c5f62743ec884af259d705a9310d9758bfd37bfb33c792eebb37d07824a197aff1261aa0496896482f6539cb";
+ sha512 = "99f270542b0d77a0bf2ce7926dcff04a356785af9269854eb12bd50c179e1d5b6db66885900a0f1dbfd1ae50a40298a2be7610b55380886719fbb3890f9e66fa";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/en-ZA/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/en-ZA/firefox-55.0.3.tar.bz2";
locale = "en-ZA";
arch = "linux-x86_64";
- sha512 = "a03e96de441a3f390c96b1bf2484dde6d423fe1f0b9d7e518d8d6d99a6e61d6e44dca2cdd212a74f935c8e94aee00c3bd48b7fba9624ff17cfbcceea70802637";
+ sha512 = "837b11040ac50920f41400bb7764864a42fa84da9da6c606c9475f862cec3bcae8ea1bba3b72424c668d9bc036a00c7c360ad248285ca8d6f6d94aa46c80b868";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/eo/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/eo/firefox-55.0.3.tar.bz2";
locale = "eo";
arch = "linux-x86_64";
- sha512 = "e54744f4d412f2db9f78f518479cd457953f9a29c6ce0fd32aead8c04951337b72c6fb149c0d90ec3dd1e93bb6dbfff57d46c29dd526e1b9c406a3018677a65e";
+ sha512 = "0d7c650fa35e75a6af940bdb4662e03fe4a76f5fc3750ec4f813bc6570fce252256f6fd1e6b26a15c6f19c819a0e0bb2a26325015feb37b4f5318a018a8c09ef";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/es-AR/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/es-AR/firefox-55.0.3.tar.bz2";
locale = "es-AR";
arch = "linux-x86_64";
- sha512 = "d9d3cdd8c38605f0738ff95f5f2cd2188f1058709fc63f21d06c14f6e593150918b793c8f3c291c8d208afb398efbfc7ffc2509f5f47091abcb804fc7b47df5d";
+ sha512 = "442370c45f57cf0a63da9d7b33e377b766d71c80606144d4cdfa956c6d4d5c91314cd3f9b7db007cefc762dd2cf79bbe1999842f1ff74bcd85affb7ed1305158";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/es-CL/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/es-CL/firefox-55.0.3.tar.bz2";
locale = "es-CL";
arch = "linux-x86_64";
- sha512 = "ceaa8bc10238996fdbc0552e4eda3edbfbb5e89b70166393e638cf4267d8077df0179213e1e692cb5798e6fb77f590f151535d2e40b4c278cccee9df8a776057";
+ sha512 = "ce5cc274961638c396ea3350857c79fcf39bfd116a9f3ceda74bef9d5eee2dfab54b12d77cd9e0a01bf98856f0b7eb8ca155fab50f444a4eab785086e8045734";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/es-ES/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/es-ES/firefox-55.0.3.tar.bz2";
locale = "es-ES";
arch = "linux-x86_64";
- sha512 = "a75745381f0ff97fb298923a6c2c83a734ae1ab7b873e22e9d840cd5854ab8af01269214b844d0fbe1cb1ae4cd083c2c4e02779088280e82310535d9359a83de";
+ sha512 = "45aa1e6e9df4bde4fe67296ce735eac1356e20bdfde638944f809338869ce243c16a23bd6c066cc3df54cd1a8b7ed1937eeb56f556803dceb3b1fcdc2ecc273d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/es-MX/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/es-MX/firefox-55.0.3.tar.bz2";
locale = "es-MX";
arch = "linux-x86_64";
- sha512 = "381ae266297cfc6fd0d05785b2a6c945da20d368754521cf358ae4c4e7dda3a473086bf9a2679716f2b15b01413574ed413fd7f610a795a3536baadaabc926d4";
+ sha512 = "17c4ccef75bbe794d398121beaccdc3110d58991d5a0bfca857914c8fca5c866b45d1e4cd07e2be8f4f029a058179d61c774b74f1e9c6fb513e547a79ea901cb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/et/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/et/firefox-55.0.3.tar.bz2";
locale = "et";
arch = "linux-x86_64";
- sha512 = "7c0151ada40b55e96ea2c36a98ef6de954287e2ee808e0387080816fec1329313e0e8ae5b613300c806c17f6b31752443e7f1f4ca6782b96826af23d3173abe7";
+ sha512 = "072b65588b1829309af5b84fe46e15974f8689e07be1bd24fd09cf5ae403d66ff196b1deac32de70d97fd5984d5579aa991a9fcde4df8fdd1884050507dab13f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/eu/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/eu/firefox-55.0.3.tar.bz2";
locale = "eu";
arch = "linux-x86_64";
- sha512 = "a080119cbd5c60499c7e9fcd55275f37d771ac4a352ef48088352b59bf86858b3cf70a5f6ef5b1b0e9e90ad9058e548393e9739cbfadbce1eaa95b39240c0a76";
+ sha512 = "dfde116081eb810215d29a142f6f3c16c0664c01415c6d2f3cd6385097b55a49b112090934700e9c217a286e345be13236df1768f602232db2da0a47edeecf03";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/fa/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/fa/firefox-55.0.3.tar.bz2";
locale = "fa";
arch = "linux-x86_64";
- sha512 = "aa537898df126eb699dd91146e579afceaa9283c15d7b4d436f2078363a7b9b7dd63e0278d197d8efe004ea81fb0401653395f8d7550da884d0af80c32baa981";
+ sha512 = "7b934fcef4d9eda9895f4ea1a0e52e8ff40186bfec73e8c1171d0d96ee6a2b19d7a077e4208c0d6c768f6078a90525772086ca08a179036a2723443761e69259";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ff/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ff/firefox-55.0.3.tar.bz2";
locale = "ff";
arch = "linux-x86_64";
- sha512 = "2998dcbead43b03d7e1b2cb9e6318aef185425de3401f89c875736fb124af2d126d482bdabb81535e5b5a46d68213574515d55410a6c6d9a60fe71afff64efe3";
+ sha512 = "1e6667da86ad91d5bdbd27bdd615f8152a84e01d6304de4da90d48baefd758fc6e124c4253a00a89431b6c860ea574687237fb20b8ff95f52ee55b661447e723";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/fi/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/fi/firefox-55.0.3.tar.bz2";
locale = "fi";
arch = "linux-x86_64";
- sha512 = "9ab8eeceb5f22e138550ef149cbd8c46e0c09bbf32e07ebc0b5abd3e5a460bf5f58608fa8e92401f68e915de7e83bfc592b5e3680f779a5b514fe4c71be56cfb";
+ sha512 = "24d8f011fff7425163a3a1ebc497eef9fbecdba8deec7ced18d1af0dfbc2e0dc31dffe29a7d6179972026aa04f5111ecfb5d1bdb29f466d041e5ba8058ae7f31";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/fr/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/fr/firefox-55.0.3.tar.bz2";
locale = "fr";
arch = "linux-x86_64";
- sha512 = "bddc6e30f0d210009aa5d2d76ea15d9dd429c1b027f1d6104a51a69f364c8d9e985c33816daacaf2712c34c6743ea14197ea28934eb37340ccda21e2c3bfcf4f";
+ sha512 = "651bbba82549e5309373cc8ba3bf00c0cb87f0a8e1f943ef4c55b1d9157879a6c0132a8a296a9df3d10a501a1a13dbbfc18ce97febeab9b2e19fd87c00ce860a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/fy-NL/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/fy-NL/firefox-55.0.3.tar.bz2";
locale = "fy-NL";
arch = "linux-x86_64";
- sha512 = "9fbc84c8aa485f55319138518eba1bd020870193432cafd0ed01e08663298ec29b21a571b808fcb90d73ed052554defb11796d1fb1dec016472ebb79afd78e17";
+ sha512 = "0adfc657c5e29e0af9c33972a93973ade9a4441e32998a1e8ac45ef814791637e26fad074ea2d3669f5d3261bd48afcf1abb30170844db12ad49a1a1b0a28bc6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ga-IE/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ga-IE/firefox-55.0.3.tar.bz2";
locale = "ga-IE";
arch = "linux-x86_64";
- sha512 = "4188f5c0eb666cccccb3e343cd3e4921bb168107e63727d67aa040b002f544724fba25a17d787cf8e1377f5947ba8fc124512e651ef3acf8157c072f5f02a4fa";
+ sha512 = "dca148b6cad926c1b57a2fa1d8e2175cca84f9ad7041a517fcd7436ae557219a19efffd6986ba7e7d1b0ff51f895d6894bc6c4316ec92b2ad79cdf747243bfc7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/gd/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/gd/firefox-55.0.3.tar.bz2";
locale = "gd";
arch = "linux-x86_64";
- sha512 = "2e3407d0d1c22f4b451b1c56a871f94deee43d0d4aed22ad90dd0643dd75b7d512c58a6245b51dde6a19330ee154304e6b577b82f01869d222bf89fb8cd6b9b2";
+ sha512 = "f4f01d4253b0e2ce56aa15839ca619df93fff7b60a771440a7102df1d84d45e37a7981044ad40d03e8dc70317836968bd84cf3ab3985736593880f26d95d7e60";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/gl/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/gl/firefox-55.0.3.tar.bz2";
locale = "gl";
arch = "linux-x86_64";
- sha512 = "5fc10425d2f8bb1d53d2e5f9b9d65f0ffb01609c018a06b850195f01f8feb200e15ac36fb2e03031bc776453220fd2af200ce26a21c9a30eb4b4f54caaa6de34";
+ sha512 = "2fb7a2ced35eb942cca10b4ca4b89fe4c0eb1a8f5aeeb9d62989717b704a922bf2678251e4c5fdb4a3507255f1548c183081d88e1586a727c17ec821240443e9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/gn/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/gn/firefox-55.0.3.tar.bz2";
locale = "gn";
arch = "linux-x86_64";
- sha512 = "92f46e7931cbc8a7d4786800838fa9f4af9baae2d8a4aecef82034a9875b8f16fc813781146dabd7c31ea1e0a3505bf3b2040ed305bee17a3dac9a00eb3560ff";
+ sha512 = "28a720b0e8c3b452ca6824db44f274728d61471a815f858d95498ec8a8662973b0800e34cd8cceb5a0abdad405ee5eebb87f5f8efb5e07ebb8021bee41e73827";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/gu-IN/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/gu-IN/firefox-55.0.3.tar.bz2";
locale = "gu-IN";
arch = "linux-x86_64";
- sha512 = "e1e41c981d4f690c0b239917e06b1405a796e43d5ea419287cd353ee2bb0f8bbe04f0f7c94ea4b3a600e362577dfeefb12f286c311becbaef1ff840b20fd766b";
+ sha512 = "5b1fbbba89814b15c6d8db09a1f335bdf37a300035ecd637909aba756a6986b3ed2107e5f015df2122e594e3a4a84775110f2e1faa9412302758f20915da5b03";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/he/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/he/firefox-55.0.3.tar.bz2";
locale = "he";
arch = "linux-x86_64";
- sha512 = "11545bc832cec83171a00c7500a220fb64815e514cce017fb6e60e549e43472aff8914e19818401aca20730fd8d063a05051fd53ecaffc790b982ac9bd63463e";
+ sha512 = "96dc38740133f31d385f5a2bfdac4af4eb9ec13c9a5fb29b989de34349eea3a682dc50a57b52037228dcea56b19535a31c37b47873b34a6383dc687eb3d61680";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/hi-IN/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/hi-IN/firefox-55.0.3.tar.bz2";
locale = "hi-IN";
arch = "linux-x86_64";
- sha512 = "63507d0994eb52893daedfa3fadcdc9ae1ca27608149d51132fda86616a45aaf4d114936fb6305ce12d75a9aa5ee5779db6def3866a8037c18e055734b0ddda6";
+ sha512 = "62ebb2492546d9d6923a93b506c573e1bbb1cdd563700db4980b0d9afcfe19ec3b31b34b5f0d141e1a5827bf922978860ab13e36338a611a6c1143b225d6c546";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/hr/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/hr/firefox-55.0.3.tar.bz2";
locale = "hr";
arch = "linux-x86_64";
- sha512 = "8274ba4fd8bb881bbb788cd402a3fa49cdbec8d777e003c63dd425ba8693fd8e26a88533dc7c839f0bfbc47d16a72105e4099e67c0473e6b8c6aa29ce75a6b83";
+ sha512 = "1de18ef034b46d2d610268bcc5735e10671a6e7e70c2239d869606cebc0421c0c99032c2deaba2b0ced97c937441731a8097598185a81ebfb609662471081533";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/hsb/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/hsb/firefox-55.0.3.tar.bz2";
locale = "hsb";
arch = "linux-x86_64";
- sha512 = "c956043fdde6ff492a687447c01ab15e874756d6c249c7751d4255f99ad60b21bb898c1472eaea73c91a1467e6a6b239ff60a36333da1fee21bb3dc5d2da1a37";
+ sha512 = "2a500029892890bbcc44937e02c2f8dfee42fcc0cf0397e635b2e564aff66806424f0c0105440e3fef973289ec655a109b480c9c52f9cf820ffdedc7a5314377";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/hu/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/hu/firefox-55.0.3.tar.bz2";
locale = "hu";
arch = "linux-x86_64";
- sha512 = "28efaf842c1afd6ccd7882dd257ee9234015e641091c39c1b954d458a543fd9e0d6ac472d23953948fca69f5a62583b5120093f7186d1cc36a345adb166b4d17";
+ sha512 = "3227cf91840b19e45e4d1eb1454d0d1ebfaae1f91a632c93e994cd576f3d6dbe1acee273e266b12a8d8d18409e8c7da8abb2284a2d85e0f48a3e2619d6ffbeaf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/hy-AM/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/hy-AM/firefox-55.0.3.tar.bz2";
locale = "hy-AM";
arch = "linux-x86_64";
- sha512 = "2aba8bced1431caee4d9d70d515027e3d08a7175b1d28b9f743e63d25983a52a8934e7e3155a5b220d0cbfdd61c76438bde56ed2c29ff2eaa46afcef6db75117";
+ sha512 = "47d744ae1aa81e5caf0ec14bbb19289bac77c969c773a3a98ef6b22577a1b345127333281d9d041c9a835aa2a6313fee26dd5e8d20e452a9ebad049eff96c560";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/id/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/id/firefox-55.0.3.tar.bz2";
locale = "id";
arch = "linux-x86_64";
- sha512 = "e2925f40f632aa14ba25bc40246a9c06b833062bf30d5e9666c87c22db436229f2b36730f6330a77fad58ec05a1589efd8353c2000cae45c7b322b32d1823559";
+ sha512 = "3745ceb9ac5cb1a11d4fde46787a435a44c6197d7cc557fcffd6c68a332105eee9e0aa4042dc010b11e0a4846caa066f96c786a744b45a2b13b832b29deacce7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/is/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/is/firefox-55.0.3.tar.bz2";
locale = "is";
arch = "linux-x86_64";
- sha512 = "0e56ab6054de54804a1f094f81c9180c58116e6786de47306f000e69f656e039aacd447d74f2119836c0f4d4d65e6841f94e527f8524ab7529461ab35b0e55c5";
+ sha512 = "cdcc14717bf8460b2ae2a21dc5ae4d9e3f9486ca29d744149f90e26f09f6fed54b40739f75ad644c57b8a1e4b16dac49f43167ab74e8e29b850d6dd8b22a68fd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/it/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/it/firefox-55.0.3.tar.bz2";
locale = "it";
arch = "linux-x86_64";
- sha512 = "449bdbc26af56503bc1a480baa7a98d4de9f745e85c443d2d0726bed16a676f4ba8bcf738c94aab42d4e79c96f1dc9de7b1117d72a953bafa9bb24f87fcef25c";
+ sha512 = "d93cfd5b5bdf0dcef5a82a39e592cfb3aa6e4b128ad22c38fc5ba3dff8177947c877b55da6d45fdb0e8fedf73aed024630eebc45910dea6760e4cbc0cb47f971";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ja/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ja/firefox-55.0.3.tar.bz2";
locale = "ja";
arch = "linux-x86_64";
- sha512 = "47b417a6683be3329218c0b0894086acf588eb15a979e65f7102540d51e59b744878d2b5802036f5bc4534f8b253e26b6a947fa49a18e6f659122f2f193e18e4";
+ sha512 = "d9508e377e104c869c38d62edd255b2837092571c0748112554efa8fd9eb2f17319e3e7d36fad2538b49eb06a82151e364614416b3bd17c181923f5506cfb445";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ka/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ka/firefox-55.0.3.tar.bz2";
locale = "ka";
arch = "linux-x86_64";
- sha512 = "4796dacf4b8d180e0995b1b743d8d076d68c23031407f8d475107bc79c7773734e80c37d870c38f60de4115873fb872bbcf7e7862526aa5101c3b1a6d8e720f2";
+ sha512 = "6dd2fffd82ccf111b133431edde1c8bdd34769803cce8626987b7665203d64925aef1c2bcbdb2be70897e3f66fd40bdfedf4b6ffc9dfcb2e8f0ee585a1b75cea";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/kab/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/kab/firefox-55.0.3.tar.bz2";
locale = "kab";
arch = "linux-x86_64";
- sha512 = "674b955f5f474c2d76efae044d1ff95069315447d370cad182e09b0a2b5360efaa1eeeb33e59adfc7754619538ec6acac661f61c805e04b94c5092999f68edd9";
+ sha512 = "389d33267f621a82d08e179005dafe88284a2580cd2803a3c223e9d132b471a69ea97647883ca05fed98d96048b0f448f376dcb3994c64c3f25598b601f2226f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/kk/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/kk/firefox-55.0.3.tar.bz2";
locale = "kk";
arch = "linux-x86_64";
- sha512 = "a647e65b76c203a42a8edd47c67b849877f2ea4cee467ee3203554cf02de5787b72cc245e4f83ba0bc8011b26bfc6991326c2593973b746cdb69762e35fcd5da";
+ sha512 = "48b5cc20a559aceff6f58fbc5bc18ef72e60ed5ae4ed86e7d30ba75169a1bb62bee19deed7dcf071ed470719c8f97117fbd2dd0f973edd3cd641500747fc1dae";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/km/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/km/firefox-55.0.3.tar.bz2";
locale = "km";
arch = "linux-x86_64";
- sha512 = "c644399b50b16ecc3b021fcd8325a18f7fe293155187d59ed99768756f9e493c51e54e5b77ab38485f4479b09af396355340ebb2e597cda9d9780532b7a5ebd4";
+ sha512 = "783a67160300aa95ff851e913b5af9208db4d1c96696db9aeb153a6ca0d061b68d2d83fd231b1ff73d11fb6c9689ede2c1632d43e23fb2c923e761cbffd73b64";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/kn/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/kn/firefox-55.0.3.tar.bz2";
locale = "kn";
arch = "linux-x86_64";
- sha512 = "7991b8118e773c1adc0473ed2b08ae50fcac57c9ca3b5bee67779f64c8034bca64500db90efa052547a05866d5f5f6f5156db18d3ee84a54cf8562187bb3fbc0";
+ sha512 = "a4ae433d78844021f0fbe9a36b2baedda3c80cc10fea1bdf865d110c52c23936c51f5670917947aca9c313d7de936012661a96b498f3a88dd73ef6862a1035b3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ko/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ko/firefox-55.0.3.tar.bz2";
locale = "ko";
arch = "linux-x86_64";
- sha512 = "98bc9ef98c94c9e4c7746fcbb8f45c5e24bd01280c2573e2a0019ccbfcadb4689b93c183abd8afdecd97f490342295c278282beb0b2d3fb2bc14d988fc5048a1";
+ sha512 = "a1075cb1d622af46b47110da0e0c846a3a245fd94a89427d1598cec1e30f2b43a5697075358bddece7b44fa4bb5dacb63751a6cb16f00a447b9c3f815a96838f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/lij/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/lij/firefox-55.0.3.tar.bz2";
locale = "lij";
arch = "linux-x86_64";
- sha512 = "f7e82f1ea02935eabf2b9f525f89d14bace88069bc5f3572202c2795cfda4bff25d2edc89c31ae0edce7d16ec127941a64f362f8899bbabadd5a7d871447bd47";
+ sha512 = "ef16c60f7a479876655338a822d0a366340581f90ba6a5927336aa24c7241ae1de7295dac0aa9d94758fcf2f9de696ec5996066db51ab961e108b73717f93019";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/lt/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/lt/firefox-55.0.3.tar.bz2";
locale = "lt";
arch = "linux-x86_64";
- sha512 = "8b19b7e8134772186a14f0880f96f4af407dd6c081f9995d032c66cf1c9776529b5d5a08cd3a0f2a42f63cedb5b2ef94da0414fd194c19d6976f3ac4e22d0470";
+ sha512 = "4eb707f286d699948bcc7df14096f32581a0ba2edbde59b89f1568f6d5a96e412d2aac210d765707b4bd797845cfb70569e57b6587a8fa67b81ce56d23648666";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/lv/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/lv/firefox-55.0.3.tar.bz2";
locale = "lv";
arch = "linux-x86_64";
- sha512 = "3e4f978cb253014cf3a46747c11606a2be484f5e4866ce26a979329a4c5f9256135d40e0596d1a9c23bd6fe51a27019d23599a8535c71a1e0ec3e9a26eee95e8";
+ sha512 = "45fed96d0e82dceb48853aaa08ac9f6b26ef16ee8fad04ef15cb76cc2f1969a3733fd74468088803a735feca5e5416b853f41956d240d4150254a61ac86f83cf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/mai/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/mai/firefox-55.0.3.tar.bz2";
locale = "mai";
arch = "linux-x86_64";
- sha512 = "9a1205743ad46b39e6e05860d6152004fe6c5995d2817416020574b706ce194ff44414c7e5ea5c3c2b39f62fcc6d17b2bd2f85b249aea9803b1a1722b9d91c2f";
+ sha512 = "14739a5b2249386786c14816115a9b1a21bded28083bba11aba28012a9c7f5240d7b4dc3342192689d4d3a096d6a6f516d22f4370e49d465ee07721e937c1380";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/mk/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/mk/firefox-55.0.3.tar.bz2";
locale = "mk";
arch = "linux-x86_64";
- sha512 = "96bae83111abc01ac9a20a1f55a990f3c856fdc5f4302215e861457e737e2ba5de40af76a2024fa6878c129a3864b0c689fbdf5e6c2c67c0a1e06fb594997f96";
+ sha512 = "fa44baf0e211a6efc3498c077911879593bb3dd715dfe3127f3177801f86fc7561f1ceefd5743cf4367bb01082a19df1f003ec879d314d252877bb69e2a12213";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ml/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ml/firefox-55.0.3.tar.bz2";
locale = "ml";
arch = "linux-x86_64";
- sha512 = "b55f6b4eae279811e461a84cbd32c78827090f8950af4327c0fa31056c04b7105757f6cbd70034c6c12887a0e60a326ae6635179c289ee0890446dd8404136a1";
+ sha512 = "91b233c59500256bda1e9236df9e282af2a161b4085e4d3af4807e4d9bbb568bf1c83b1d7314c01e10dd5757fbb9d291ac3df334e40e3f155f996db506996bd0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/mr/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/mr/firefox-55.0.3.tar.bz2";
locale = "mr";
arch = "linux-x86_64";
- sha512 = "3b3f98606d66e68a4d45f5029eae89d7a1e838c6f0bfdef5a551d11b9fc28c64455b28d742705bdce8748844cb869fab21c5b2164bd441a78998bdd1efe9d6fb";
+ sha512 = "eaf62cb8a34af24dffd29daa1a5e2b9bab7f58a4016a6624335f621cb75f187d09c3fba71abe780b58c3e4861b640a1e8273a682d02c2179909249725a44da30";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ms/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ms/firefox-55.0.3.tar.bz2";
locale = "ms";
arch = "linux-x86_64";
- sha512 = "6619ffd4aa274511a7b10c6c3d869045f1b394b286001cad53f3f8f7fbf797a1d0d3e1c099e9cd95edf678c4e2f49251a5eecb94b6c0821d84ba075f04d1574b";
+ sha512 = "f089fa240f58ebc248fed6922eb1c429043504df079027f0f8122288ca7277bfb24644852c73ba1cb8032e5951f6066b4175b59bcd894485e7adcaf7823776bc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/my/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/my/firefox-55.0.3.tar.bz2";
locale = "my";
arch = "linux-x86_64";
- sha512 = "ee500522c7fcbf4b8e9b86162c869c6238978b0b9e68b3588d79f1030f304c5d56a37db0775b9aa5edc40e1571d10245ee805bb8a90fff2dab436742676dd4f9";
+ sha512 = "747ae8c0826f463a9b5f6e68283069ac35501245a3ec4e3df356e4244bf649bc83f3564bf7f7dfd572f7c09fc2b4cd533b7d60a1c2839de9ff9e049945d3238a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/nb-NO/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/nb-NO/firefox-55.0.3.tar.bz2";
locale = "nb-NO";
arch = "linux-x86_64";
- sha512 = "780dcdee5c19295e367d659820e59a9f60fc712c00214f9d8caa64647cf399411cb74460b88ac521a1c23738357770cad1def1c1bf840a3676db5819272ed8c9";
+ sha512 = "063eb5efc2a47e6ac39d71900844df00bd1508873ffda1a1a7910bceb83fcb33f33b6de00470e1ef23ffdcd46dbb7ee2e60d9272e43f74275ac1c3b34c330f68";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/nl/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/nl/firefox-55.0.3.tar.bz2";
locale = "nl";
arch = "linux-x86_64";
- sha512 = "487685f711257e285bf1f8a508d4167e6bdfd081ea30f560a5700b9ca487e110463ae6d8d607cfdff9349d7c1f2dd3c8e57e8fb30b49200e17754a596d2716f3";
+ sha512 = "77441aa1589345be58882ecf3890e2f029b80ba62946109d48a105d421db7259532ac153fc1b5dfb4ff54c788def590dfa98ebb6f5c95383374843e9f8dba1e7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/nn-NO/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/nn-NO/firefox-55.0.3.tar.bz2";
locale = "nn-NO";
arch = "linux-x86_64";
- sha512 = "5db13d9e1db3331943c19be06849dee993726e99e519e1c03f8e3db9e44f9a4d2d8ef7c82e77c814654e66991352c94979754ef4f8b18295fe9c4ef0bf965bbd";
+ sha512 = "0369a0732cd13ed14059041187de9bf10ad018b68449513da224ade76827a21df8b87743137028c788dcbc76c216345a50bc82f097aaa991d068cb37473ab5ee";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/or/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/or/firefox-55.0.3.tar.bz2";
locale = "or";
arch = "linux-x86_64";
- sha512 = "98c90abd9abb1d34816fcd98ba96bb9f4fdec070d9a37b536bca1f7fbd75f95c7b0e58b7a02725e4f8b3a1b545e6da54cb7ff0b716319bb25e4ca64da616fe6b";
+ sha512 = "dd3a1a56f506cd20163d28c8aab98958dedc811f921f4a0c277be59d93379856b04fa7362d3528c5840cb024280919eabf7acec031bcd1a198012457a4061a88";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/pa-IN/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/pa-IN/firefox-55.0.3.tar.bz2";
locale = "pa-IN";
arch = "linux-x86_64";
- sha512 = "01e67b60bf6d2b7a8ab6dbba92678af6102173443ee938ca3f236403169b90d00aa3696af2ae445d0a21f25695e768968bd4f7769c9b63dd5c2ec06b7320459c";
+ sha512 = "04ac45c34a0373e40574662f841879172d6d49fb79c0b39d0394397f26e3291a5ef053b78dac8d1bcac9d55fdb9e3e60dbe315f2416d4b93ecf6a258bbad31d8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/pl/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/pl/firefox-55.0.3.tar.bz2";
locale = "pl";
arch = "linux-x86_64";
- sha512 = "af44cadc8a4032c5ec6e6cb2d502e59f11d43a474806c4f7b98259023ceac8d196633f4a6f6c6f247a042eabcf204ac4310b885d0d47a42e58cf91d81626f3b4";
+ sha512 = "1037efb25bc120e8aa8829362991461f22c0a7422afd45a3bcd29e81c81d009efdb9b8011e09fdf95e2d59a37199a75fa5ac46f042552140bd9ab571c63ac702";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/pt-BR/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/pt-BR/firefox-55.0.3.tar.bz2";
locale = "pt-BR";
arch = "linux-x86_64";
- sha512 = "24d95447c5d4d117b1ccdd415157015b473e01489cc768403edb794eb409fbeba0e35ed74f2d6c5668d9853ada5ea04bb94fc2240d01252f7f51c3982896601f";
+ sha512 = "66372b345b017a46b0bc6a5eb2cd54854e15fb6229b72b418dabc605003542b97170c72ef4d22d05a41e8622c8f43767e32971e09d1d0c3c4f58c008a0028532";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/pt-PT/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/pt-PT/firefox-55.0.3.tar.bz2";
locale = "pt-PT";
arch = "linux-x86_64";
- sha512 = "7d6871788279c9ccb54a62a8eac5a6dcd69481a993a8c76dd3a31bf94e2cd5e8c4abeafee5bc6e0f0724419d7a38d6680720bb9ba8c68c8dbccd2dff46be6fcb";
+ sha512 = "99b5a21180578bcc24e2813e2304a3b70f6d19c199925b0771938366e40710329ac408b59635f741e3082048972a740e84166fad9d567d155bb714aeac35037d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/rm/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/rm/firefox-55.0.3.tar.bz2";
locale = "rm";
arch = "linux-x86_64";
- sha512 = "be2420b9cb9956a7c8145bbb5ec0fa841621cb0672141ddc0c8c0c3135c9372e7e5b82387a2a123c5f838393bf5e22e14edf127325e6767461e758a4aee6fb36";
+ sha512 = "d67cde6cce18638e061256a562774a332192242a506b817b033ba41fe2f0f854bc0c80ce9b956f5ed7f25e51fd257cdb17673b05cb139a7e619cf5f01d90fd96";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ro/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ro/firefox-55.0.3.tar.bz2";
locale = "ro";
arch = "linux-x86_64";
- sha512 = "65dd955dec8460892869e3fcc555e153bc51af059fafaa1cd7a250441f166ad2c5aac2cfbb573f7320badde424c84007d121b88bbcff09ca2f474db84524de53";
+ sha512 = "dc33064cebff3ba13f169fc1f52f4134c672214431db0d6309b111df8c53d59db5ac32ec54e5001d14b837cb8bcea02ed3b48763bde75c29fa8e4ba3a406fe08";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ru/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ru/firefox-55.0.3.tar.bz2";
locale = "ru";
arch = "linux-x86_64";
- sha512 = "ebb48f14805236b8cd36de37e514b0738f7d49b93713d536b1f2deafc1abdb67ebfce74629c131304eb440032563f17260ee319be133f0fdeadbae5bd93cd2ea";
+ sha512 = "24b5259c9a146176075e26b37744759ce3f9b24c7e7973b9394fe2a70ad10410e2c4453ee55a1bb2bef9b766fe829b3a7dc99cddc4686081f413f4cd2537be35";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/si/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/si/firefox-55.0.3.tar.bz2";
locale = "si";
arch = "linux-x86_64";
- sha512 = "5be8bfe9ef8f1096983d087c1e61ec197c2b1cf0388175724480898ab48ea0511127356a041045ddef7afc61d65e568b8c19bc5041a06b575f76338c88d1130c";
+ sha512 = "0d8590d03413e817baba1d5f32ccaa7516d258f7eb742ed619a8615f7b2191e5229674730e90accfaa1711d6730c458e60c2b142840a62e526127257632233ea";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/sk/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/sk/firefox-55.0.3.tar.bz2";
locale = "sk";
arch = "linux-x86_64";
- sha512 = "b70627c2fa4d5b4bb90b919cf1324b3463e28ebf918b000a64ffb0ac64c997a370042d8e7029dd2fa749206645a381126ec5d24a952226c876d788d0af6f9cb3";
+ sha512 = "c2afd8ec0f78f6d8db747500c8dafa3a188a10ba6c1cf713d3997bfc349a02f8dff58663b51ab24d545f74308d4b7db29c2d6a5a92f9efa3520b42e84795696a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/sl/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/sl/firefox-55.0.3.tar.bz2";
locale = "sl";
arch = "linux-x86_64";
- sha512 = "a0ba640ba12ad5b0477942e4eb91c9e9ee1f602d5e51999ced88be2f150311b15e72d70d0de2295916b82ea577d8e07cc33b7ff4a8425a886ea4dc3a6f6634bb";
+ sha512 = "75d545f89dc2da70737910f0288a91a6a745675419aa2ed41e0652072dfce0696b0b01197f0cb7dbffbbcfc4e8350394e94c621d2f8e36c65fa95163e70db50d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/son/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/son/firefox-55.0.3.tar.bz2";
locale = "son";
arch = "linux-x86_64";
- sha512 = "e2dfc2ff732a3ded0465ae50879e4ac6c180040a24391b8e7e879051edd7b67c4022eaf03d5abbb21d0baccec795ca10b811fb14a5ffc823d860255871265873";
+ sha512 = "0baf5dc181eca057107b2d2ea89fdbd5662a0e443f7ad7adc286773da3b0ba922a90583b4961908607f6b6f1f1849c56ca219e661b8ec3ecde2ae4e1dbec0f63";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/sq/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/sq/firefox-55.0.3.tar.bz2";
locale = "sq";
arch = "linux-x86_64";
- sha512 = "3e56f0d47c77c6cfc65f40088cad10bf513369a78b1d2a1ceff7e92e798f136f93333dcec4bf780598b3e8ce47a55cdd47696f20337d27ad2e2908bb6c047052";
+ sha512 = "9d220d7177945732d27c77fede9528043f1ced0e26968c9589aab75c727d808440897b8246b0ecc72c91a375f532c2add002d2bd8d59e3fb0f5f9474f42e144b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/sr/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/sr/firefox-55.0.3.tar.bz2";
locale = "sr";
arch = "linux-x86_64";
- sha512 = "aae94358f83f888c3ff8fab2a55e4239d2f280813534d21f199f89b8fd95cd7a37b2862becfb7e1c14a9b180cf1844df59689fe818df8ae490786a5dd65921f8";
+ sha512 = "8e9ac8e24c3af617ec99e77ac849267712ef095d01b177c78e8e8a0c35ca28b4567b93fc9ce1eb5c5e7cc16f9e1e9ad19df30f483db86d25e01e665c73380838";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/sv-SE/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/sv-SE/firefox-55.0.3.tar.bz2";
locale = "sv-SE";
arch = "linux-x86_64";
- sha512 = "5c672bc0ea10b65eb93077e0f23e52fa081b49e12760e2d9167026d8d208710916b38b56dc24c5a78378e3f7646dffb77b3cef49923028889324ec7da39bd842";
+ sha512 = "4a5895a1304c24c19ab270496f6de03a46059ac7d47edb834f36ec2ab39ab363af59eb742f2b11c325b69616cf4bfe93abe2a6720ebb5654cbf56e6868d07508";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ta/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ta/firefox-55.0.3.tar.bz2";
locale = "ta";
arch = "linux-x86_64";
- sha512 = "6649f6153c6b173d13dfa5f6bf7017102645b54d9c847bdc01d155ac005fa2ee5c997eeec13fe7897b55468912b70105c449e51947af270ceb44fa1ad02fb1f6";
+ sha512 = "00d6ef2853eff0f6e867087e0fbdc16f6243d349b14ada2c540c8d3bebb520b682248165725ca842c77925d71b07e27ec15426cc215fc256caf34f56055351af";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/te/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/te/firefox-55.0.3.tar.bz2";
locale = "te";
arch = "linux-x86_64";
- sha512 = "5c0836df0350d5b282420d96ea2886c2343641c3ecb2daf91a81b67dcdda6145532f2efd480fbc7be412bb8332247a49ef48958157b33c33c444c55ce85c06a6";
+ sha512 = "ca9b12ba9c26bf12c709b8204206cf5766a819cbafee1d71fe4e12897fe76fc9144cb281e11b94f35243af6cb7d8deff2dd3d05444fc92a18a8babc8de9bb72a";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/th/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/th/firefox-55.0.3.tar.bz2";
locale = "th";
arch = "linux-x86_64";
- sha512 = "6c0a888749580afef4946b4037d722d736d654f2748827af42794ae452c6ba4eed6b0889dd20435201e19f629d5104389f42a384b637d6241fc9c0b8f22935d3";
+ sha512 = "d58decde55543eb8ae134335d3dc10f478b8354a723c0f0de2cef89d76c885ad442f989590bf5746a60e9bd46627ea520cc296f6811452d6ac4188da261ac941";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/tr/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/tr/firefox-55.0.3.tar.bz2";
locale = "tr";
arch = "linux-x86_64";
- sha512 = "1301f85151378f74a7de1a33c42373feebca433f1cd6d0aa5daae229271741561bef2bbb214a104195d93664f802fc8b233d5b60913f901583eee68827643537";
+ sha512 = "1852fe5c47454a7b5bffc236f12843f0fc7491311979bb0793cc8150943f6bbc39852b30c597a6167d23b8b3199da77347bcaaf8a7d58f50f65019dc6db5a8b2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/uk/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/uk/firefox-55.0.3.tar.bz2";
locale = "uk";
arch = "linux-x86_64";
- sha512 = "d178ac2bd9b3c7a29b14effb005d046f43e78867e560ae38be3f5f55c39447d100d18958aeb9c4894579fce4a46849d7dd8a5c4951ee1bbcc4ccf4fa269da744";
+ sha512 = "c908a9385c9bb07bbe55e62962f19af59da63753284dbc90fa4418fbb601a787f9ac6448906a45da73929e7fd66ffaa1d1c643e240ff288b21e66494e73b9e9c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/ur/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/ur/firefox-55.0.3.tar.bz2";
locale = "ur";
arch = "linux-x86_64";
- sha512 = "2de7c4b29a6f897fe2df48e070164b2963a8117c1628f233d6ab93b1dc32660d957ba557f78344ab1588acb5144460068d34e4c804475813e9a39f4fed6780dd";
+ sha512 = "e23aed0297c0605881baaed3df11f327db42467d8f0c764763ab0ac08697f1a7d3183ca0dbe8abe97d46503d6f71b9efaf046e5be68ac8e34027e8cc70c1c622";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/uz/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/uz/firefox-55.0.3.tar.bz2";
locale = "uz";
arch = "linux-x86_64";
- sha512 = "a3b720e1c50bfded6d44dab4044fe283b1f718e600879663658d5d99fdc5ca36a996b79149434c71dfb951523525b59757b84dcb383ee7673c3e6e2d719048ac";
+ sha512 = "894e4bfa2919983c8879bdbed542b39da58ccc237e93a981a7dfcdbd0fb91fb338770f89c46cb97d4af3f3b8b9472983ce72c4fccb458d50f70d79b3da6591ab";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/vi/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/vi/firefox-55.0.3.tar.bz2";
locale = "vi";
arch = "linux-x86_64";
- sha512 = "6e53d4418ce4d325e705e32ca215e12c97daecb81ae5a2bd0531ae4043878a9c2fab006652f08e0eaf8ddb2893fdf4aef8b0157f04e6b9be4b63e5e191028f24";
+ sha512 = "5011071e8f1be873e69d7914c99b5fff3a510f74a064525f71c45373ea1444db4a2da46e806f0cc6f20032f96ef63a6147961acc4f6a7d9af161f08732b6b4bd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/xh/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/xh/firefox-55.0.3.tar.bz2";
locale = "xh";
arch = "linux-x86_64";
- sha512 = "fec4dd19fd5e109d1fcbb62538d1a0b9ad7867b111effba8fa4ca09921cc0d3d224e33016a60056e2d556c2cac4127587fcd379f8b023749355eb47ca92dc337";
+ sha512 = "9bb89e5614745a1fee19241d96abb15d7ba51a19b312c3d47d0a931d4e111b1e5796a47b97175af44331f4d7d86158d4c07d825b4f019383e5d93b2460a17ccf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/zh-CN/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/zh-CN/firefox-55.0.3.tar.bz2";
locale = "zh-CN";
arch = "linux-x86_64";
- sha512 = "78c162de2ecd7e698ae59f7d814f333885fdb4d5bbce2890f493008c709a3057524f098a36f437ffce0ffd7856ce5ca527bd2c03265abbf76c106ac8446d4442";
+ sha512 = "2d9a2a0c2d0b21f5c3d58fd14cd7b9fdf3a7b45cb31b124ad17eff538e4dc64e55c035834373d0093615e93fcf61033fd16151b74b411d774541872ee4e1e914";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-x86_64/zh-TW/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-x86_64/zh-TW/firefox-55.0.3.tar.bz2";
locale = "zh-TW";
arch = "linux-x86_64";
- sha512 = "2e6e0084a37129adbafd524f0a8353ff0e26c4a59726be90a7c8bbedcba84d20a72d3c66c21335e302d929c5ed5aae9b67134a840a31c887c45363f957172f1e";
+ sha512 = "2d55a1458104fcbd6b6f24d5ab6df1103ce1390d4bae44fa4552b6172a25a36d2456c5f5466abdf8a1eebbda926f1c354b12183b12bba497ea1b7739f804a167";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ach/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ach/firefox-55.0.3.tar.bz2";
locale = "ach";
arch = "linux-i686";
- sha512 = "2710b4a940c3df0eb4f4a5a00e857b030ea4126bfd1d1154f169865e31597ef0f17c8e328d87bc68afbdc19a0dfd980464c1254df15dc69eed952da2c57f947d";
+ sha512 = "f66fb15ed6671b27f03eeed20c42a93a31ec2589196160ab80d27b2db57f580ad52d3f23b03a3426e90753b8530ec766e35d3428561b837fac2444d0b9972e17";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/af/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/af/firefox-55.0.3.tar.bz2";
locale = "af";
arch = "linux-i686";
- sha512 = "aae3f0465180bb14983d6fcbcf29d2f361e4c9703f37806889c35e60d7645dfd344aaf33a2fbac276ced63d906eb29452303ded125d86878d6c3492077d8868f";
+ sha512 = "41fa15ec74a0b53fccd6f572e4d350ede8eb637d1cdcfd38db1ef56e29672761abfaac76b2eed74b59c3a907238df02e5a193410829ba5b738a4a7d2ed74a0c0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/an/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/an/firefox-55.0.3.tar.bz2";
locale = "an";
arch = "linux-i686";
- sha512 = "7f02c46293d5c6baeb75b80f3d5fdeeba5112ea350c5b04dc5750f5410be39fe4d0b9f03d21e8855922b97e1a6684b90f6eccd06d198c9f9b259b42fc51d9e46";
+ sha512 = "900409612c2ef05008c8c3b27852ab94038677df5fabb2ddf460ab731d57f5a39b9928b5cadb0996ffcce893983128bc04593ca6dbedb528ddd634199d92d311";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ar/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ar/firefox-55.0.3.tar.bz2";
locale = "ar";
arch = "linux-i686";
- sha512 = "7c4fc8f0276029deab6756a6442cc29d75e8a31a0d62d045023c68c4f80878b920a34faee8a3e40f823de67015aca6f32567b6cf57f9a593aa1ce6ed5fbabae4";
+ sha512 = "445af6192be988f8af74f2ef618c09c3ebb8f3bacedb0d622740b9068665b104146a7bb06306219193455cfdb1f508a924711a2480a31b5d1d554361a9ebf576";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/as/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/as/firefox-55.0.3.tar.bz2";
locale = "as";
arch = "linux-i686";
- sha512 = "e6825cbb7d228a1b8354b6030724f9e3407b7e5a33f1fe59e7b19fc71f0c28bab2db649314edff5bfab3c37b154ba9847b77fbe8e0038a7a3565c3136115862e";
+ sha512 = "9230c78a28845292164c311fdd882a2e0be590f09ed680c5fa91cb400570b1da8efce86efb96c1f006d166f61fa463871c9c8d7276a4f49a07bdd89c9a67442f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ast/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ast/firefox-55.0.3.tar.bz2";
locale = "ast";
arch = "linux-i686";
- sha512 = "8a1e64a1afe3b22349b1cad0d51ec299e02c5a9ed330792d4820bd0be4ab33cff6f05d03ce4441e2b2b757f45d23e6760d2bc370fb13d8dd1417cf562e82f331";
+ sha512 = "8b313ba678e7beb14788fccda7ab1ff4dcf8c2adee8eee7a8a1224184219b167f8b84d81ae1c73400781bdd0b6c8a5e3e0e6bbb3e34b26587d5eda71130f2215";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/az/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/az/firefox-55.0.3.tar.bz2";
locale = "az";
arch = "linux-i686";
- sha512 = "cf72d9045c2dd9e9c6da619ccf9fe537ae4823b3623e9873bb8ea12ba1881fdff3b05264908fa5738e0c2ee0d119ebb5799b32c90ae37186284a60cacd75b7b5";
+ sha512 = "8092452d5e2197932a4fe126e891b8985c008fc28d24ae2ebcbc8554a55f1592de2eb0e0ec6b8d33d483aaca29c644b4b5956ea49719e6bd06b88d07ce200169";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/bg/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/be/firefox-55.0.3.tar.bz2";
+ locale = "be";
+ arch = "linux-i686";
+ sha512 = "6020147ec72cad49e2d1ca93f3eb4e7f5c3c435f6f0a85bbe0a39335c3791d52c628ad5b9b97dfaf52ecb61e7ba354e0bb5d00770cb88c79a58db0c002f2aac1";
+ }
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/bg/firefox-55.0.3.tar.bz2";
locale = "bg";
arch = "linux-i686";
- sha512 = "686ca0b866d1e9504f21adec227396ebb6c6957b6d4aa9a3a74249d4ac8c23f1556bd1282f54abd82ffedf89e2852794014c5bf7bc46bd1d0df4dd5352e34725";
+ sha512 = "c34a98c08553a7961f3dd2af92e14f72c6bc9eb6fe0c613339570d9ecef1f015d0860ba5866107115cd1ea71a86b4c8177509c173f108db316b0d1a4feccf0b7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/bn-BD/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/bn-BD/firefox-55.0.3.tar.bz2";
locale = "bn-BD";
arch = "linux-i686";
- sha512 = "f0e7bc6ae6297cf9e83cbdb8366def1885b96ff64a855b312d31346e9fc476f4f80877f9251520c77845fe1f695f39a757dbab2411a42e694de27f1772cba085";
+ sha512 = "d1157740fc765119441aab489252db93698e82e43a8bf2577a1c36be535adc782fb418a439c56c1954d58091514db4c9e33b7a8f281930387a9bbe6066062b52";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/bn-IN/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/bn-IN/firefox-55.0.3.tar.bz2";
locale = "bn-IN";
arch = "linux-i686";
- sha512 = "6caf0d5f71c1135272072439c0e2c84bdcd967cb23c51d980c47d3c6a3748e90e041e89eeaa88a42063dfa0d3369597c8eface6593d91ba1d604882e16b4cd5b";
+ sha512 = "ada0aec0383e3f43bc46d72e0e79e3adc64cdba5d5d6fb76315077403e233e5ebb8622795b4e3d78bd16ca3b5978259218c0873f547828f420aacdfb53753e7d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/br/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/br/firefox-55.0.3.tar.bz2";
locale = "br";
arch = "linux-i686";
- sha512 = "10cc66d62e68346b896c0fa081f8d8c1ebbfbfa364a52bbef5c7f368aa854afb7e968cfc344378707b93b2cf478fd74d4ee97f9b7bd160199533f26df222ea66";
+ sha512 = "714d2433d3716d1d9f08025115a7c4a20be975a7d66684ffd25439f68cea2b5dab2c37689c688b7d6eedddaf756e810556bd53366a28ee11437e1180a563388b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/bs/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/bs/firefox-55.0.3.tar.bz2";
locale = "bs";
arch = "linux-i686";
- sha512 = "6c87de221bbda9639d5751f8e8ea2f4aa5be191dce18f0b4f038f8a2fec989eb4cd3ae3b2ff36ca13c168a8ce92b6ac6a60b46ec6cb022ce6a95e921856973b6";
+ sha512 = "836310bd3eafd70edc760390fe0fa33659ce2c1f0243ffa21d5da95d59462cf9301f50e89f8e413a91c02f5f362ddc34e18498f635ba19667ae8bb5d69bfcd57";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ca/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ca/firefox-55.0.3.tar.bz2";
locale = "ca";
arch = "linux-i686";
- sha512 = "67ca5ea84b6243bc8869b96fb9dcecbc0a8e7018e256101874791444d57b5fd61a69d7ed064df41faf9ef3cc9059777412fa86ed445e9e40a3570d030f776d68";
+ sha512 = "51f2ce893ae1513c067dcdd0525b254a7c1049e952e56b31f86eb3249d741d131f7df529400039bc63b61a673cf1fc55e7dc12043679def7fcb583d748afe4e9";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/cak/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/cak/firefox-55.0.3.tar.bz2";
locale = "cak";
arch = "linux-i686";
- sha512 = "b343dea962cd69bcec30b5a274a118e6ed2740120cd09d8155d0ad32e55730d9bc223a213df447ae50ec6bab67f5be2b910feebb73b4b57b30ecef49a3b0803c";
+ sha512 = "ed948b4f57118d0e0fe7deb5d8e117c1cf8d7df0c6d5c1f1721490586720bea76e81f05ee07553f2ffb42675b2ce5fd8e3dae342fbe9ec7836d489472d1ca673";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/cs/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/cs/firefox-55.0.3.tar.bz2";
locale = "cs";
arch = "linux-i686";
- sha512 = "e4f55216ef51ba1232e15b1b842c3964a49aa31a9bff2cf292bb7cb913891057ab4cb3e351ceb57d3024f2854defd693a75aeb23431a7b7e8fb82c41f500507d";
+ sha512 = "2b16f351f4984310355f9f9b27d656bdaf15b2641ab5c83c08d6e590562284b9d4a89d7f26be605957ad3f4fc81775155255d1f0080ee0558dad96c05e6a5591";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/cy/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/cy/firefox-55.0.3.tar.bz2";
locale = "cy";
arch = "linux-i686";
- sha512 = "4d4340737549368855b21f11a27073c60112cfb7aa0b5e1329b27402ffcdd222eb009bb13e81a8403a72ed67b57d2ba2ff349fe0255d1cf11f32f4f32a73986d";
+ sha512 = "ad4719304c7ee807294853aacf1516e29339be23e5906bfb5725266ebc3105dc1bde876b29573609de0f38b180f75017fdcc40e8602f92d779578a450146f6c4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/da/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/da/firefox-55.0.3.tar.bz2";
locale = "da";
arch = "linux-i686";
- sha512 = "4ab3cd2e39cd13608331c13bf788ebb5a75600cdc3e5bcced2adeaee3d1c70fde0b57e93be9d8ecc72bedcf14560129246baa8b6fe5549de5614dcd14bbd76a7";
+ sha512 = "158c318c5b83dacc3ca737e387d47845a43cfdae5add8230b9b4055f936f212fd9f25d2837ad9b4e177e18beb949ae2afe5853b24331facea3fe410216b8cf78";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/de/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/de/firefox-55.0.3.tar.bz2";
locale = "de";
arch = "linux-i686";
- sha512 = "5b4ec879e8bab2bb4233da0745a4e905736d98816377458333d0d5a9b8a72e6cec8f450e8a4ed49f69d75b3a5b1c223bfe96844cadad2919044c637d78a13f04";
+ sha512 = "f9ff911f2cadc837685b814e906d6e03f019a004f0daff5b5af902467e905269b873f101b63b9e6cc33e357b5be06834878b072b2f8b7e08cf9f16d46122f987";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/dsb/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/dsb/firefox-55.0.3.tar.bz2";
locale = "dsb";
arch = "linux-i686";
- sha512 = "0ff0443ec9dcd3cb11978bf8689d41ef69db93d8b50b6dd53f4d31fcbdab2e459aa93427bce476ec989e907d743fd392add82426c002aa604fbe251ae438e912";
+ sha512 = "d4d92ccb3073d038836c92ece1e7cb94e8c2ad1210c1f70608f99381fb02fc88aa61db5845cb123af11794cb39d14562e9e034be4f1519234bb9f8b2f685eb61";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/el/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/el/firefox-55.0.3.tar.bz2";
locale = "el";
arch = "linux-i686";
- sha512 = "5cc24ec6bd4823e5360b56ce78a97319e15c8f2a47f7138033dbc52e7df001d09577de3d9e8cac6314cb7809da0e7674faf8845e4610d6ea08e47cbc9fde7f03";
+ sha512 = "6eff466dd1b04611fa8af686dc70bb2530e4392d2eabdfbf51f4b679060c7d5f96fd95120e60cc629eea8b23f2452f5342fa5e5dff6067b820d152906ac19882";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/en-GB/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/en-GB/firefox-55.0.3.tar.bz2";
locale = "en-GB";
arch = "linux-i686";
- sha512 = "0b8a1576ce8b112ae35ef388191d2308aa2c7222f575bf354d3d6654c05f073429af8ec9b1a1a77a268b9191d2fb8b758a38609c6432dbe827b739b3ba25ec61";
+ sha512 = "e8193bc433fccb5d02254892f2e4869cbad215ab9022dade1167082d3559545c7d9a8c28b6b6454183e1a0ab707f0535709cf551977c97398459f816ecfb1b05";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/en-US/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/en-US/firefox-55.0.3.tar.bz2";
locale = "en-US";
arch = "linux-i686";
- sha512 = "9b28b30e136b9bd89b4b374a9a6c8e6efef936354b7eaaecfaee2efca6381abec646627c57856f64b96ba5a8f771a411c4164f3a54b783a8e3e197c0a78d1622";
+ sha512 = "880084f39653f405a3a142267e0c6023779cac219932d89705750f1384e08e21d70025152dc010ed19a5a3c6c4059948892d6121135a44de96ba9c6dd185b5a6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/en-ZA/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/en-ZA/firefox-55.0.3.tar.bz2";
locale = "en-ZA";
arch = "linux-i686";
- sha512 = "360a4048ea81b10b5b834f3c2ef21776cfbaf372f3a329ec9da016728e1b83f956476ec98295e70ae3a9fe63a5f4f87b6be8d47627d6f36eff9b2909073fa70a";
+ sha512 = "d42d7a3e9bc2c3d06b7579077a99db5bd609b62e807862e5e03717cc84c2b26e9202f8e785ea16bc16182aaa8ebd8b83ba2b0b73dae133dd6466ed46a75351fd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/eo/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/eo/firefox-55.0.3.tar.bz2";
locale = "eo";
arch = "linux-i686";
- sha512 = "23e95684f5bbf6b209a3077e173c3212b77e89dd64f22fd378ddbb8eaa43682c50f4021e743e25189b2d1cc6754bce6d0c8604d3884ec1b32cd7c51c0dee5f0c";
+ sha512 = "2f1aae311a095e8d48df3106513b94e9b1fb2cb426c0b35782a61bd7cb02215f26039e3090b78401120fbe81a548b5de819c3e49cdc46a41431534735527cf40";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/es-AR/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/es-AR/firefox-55.0.3.tar.bz2";
locale = "es-AR";
arch = "linux-i686";
- sha512 = "88b7085fa2b4b1013a7242ca293197d0d26916f2ffbe1f1a4e8a1d2000e45705301ee83b0de8daa271111f586c3e5fad54c8e241da17f3f8cb9912b50e61538d";
+ sha512 = "71b1c0ca8dd8483f6c40f62215b86b7633c76097aa9c2d94bb901eea5f6e8a9a5bd99255064c700308569d294caeafee7fd711191b9f393f0b607768edbe2488";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/es-CL/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/es-CL/firefox-55.0.3.tar.bz2";
locale = "es-CL";
arch = "linux-i686";
- sha512 = "990214ab2abaee7b607ac0a46fadc7c8be0fa12ecc5c0819f58324175381309742e0972ba54c144ad1dbbe0ceca076621aee0480e9e954f593c841d58f1a174f";
+ sha512 = "065fe812e9a4001b0cb282efa5c667a999429456de1be2679fb656b88be7119d252164036a9c23829722e5f52b29512809ed4ebdd0824f6904c81865a1a96a1b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/es-ES/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/es-ES/firefox-55.0.3.tar.bz2";
locale = "es-ES";
arch = "linux-i686";
- sha512 = "7dce1007e0c52e048d441405a1a6c02863da24b8b8c4b7f3afd61f2c866ee6b19f29c82dd6efe34badf52df9a66c76fd56e788d047c3eac0503e3a74e41240a5";
+ sha512 = "c2c22c22624e55d2463644fd0e3812556b22b7c664ef412613485278b5bb9e0cda8f17e9e57798cbe6b93a3a8acfad9c287abef425e1c064374757abc7465edf";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/es-MX/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/es-MX/firefox-55.0.3.tar.bz2";
locale = "es-MX";
arch = "linux-i686";
- sha512 = "80b3ebb80a3682b6588175fee7243bbed87312463ea4bfa02d52be21b1e889208e8aedded74e9a94968969a2ede82fe63c83f742ed7c5754984f38b3f83a379f";
+ sha512 = "e0c84c217ff11d3ed882d49edd68b8b72589b5a1689dc75d54a895dbe261166bcbc2a14f89f633749b5c9ebc865e39a01bb992904e897d518a45840846710e79";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/et/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/et/firefox-55.0.3.tar.bz2";
locale = "et";
arch = "linux-i686";
- sha512 = "0d31b34100214a588fc2ce5a217fde7a41f484344662e3402b69daca937e73213ae7ecfcd081437f3f4afd4bb8ad2f3810ee9e6cc160c24d81b81e20013176dd";
+ sha512 = "7639e65067d23d20f4ac96e1ec87efcf3fd6ba912dae1fb68e46c4eb23fa31352589bcd6841df66e292c08a332243dc305c1800ee26b4d91d6401b873d517607";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/eu/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/eu/firefox-55.0.3.tar.bz2";
locale = "eu";
arch = "linux-i686";
- sha512 = "b8ee5dc7124e8115af11d58770562d51bf7356992e84c443e4974b096dbe2e47f4f57f90ad238a68d712d9fc7c27c399719a8c4f8a4726fafb9220e448ee69ad";
+ sha512 = "8251eab30eb48b0012d3df66ebfbe75d75d36fc4d2ef71947113f747741f42ae8942db7a40df777973245be3c72949a303fe013341bfa64753d30ff05407d592";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/fa/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/fa/firefox-55.0.3.tar.bz2";
locale = "fa";
arch = "linux-i686";
- sha512 = "5bf7b9f0db610f5e1033f38e65bc86308b26c1dd6f51b0ba01064b9a0e0debc288aa5f34e7346aa68bb8eec6b81d104ee84d475968cb0a3946767f311dd85332";
+ sha512 = "418c2ccaedc94c695dd77bacc399d7dda65cba53251eeea8e203c68a80fcc2fc83f7f6a75bd2d919a5e8f61a148b25da7ef4e4026bf2ab35eec99f39bbc4daf7";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ff/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ff/firefox-55.0.3.tar.bz2";
locale = "ff";
arch = "linux-i686";
- sha512 = "f7d57a36612a82f94aaa5a05ee6764863ecc7c769880aceffe572ddb738cc899cfdfc68aa15cffbbe687d0413d38cd87483e78711f075eaac063d7f5f0b2d29b";
+ sha512 = "eeb0f38f0aa9cca8c7d9530a60416685054394a016778006eee3fad363f05ef8a362425e1a318d18b9f88c409b60fe380dfd86080825929aa9cd2553392a8b79";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/fi/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/fi/firefox-55.0.3.tar.bz2";
locale = "fi";
arch = "linux-i686";
- sha512 = "9f58c3a937ea4d7eaca80c63c2ec822511335f27c254fd086ab2583a55e457dd1da98fc1e2bb8d299010e59c982b54441cf157afe3aefb9778877d25f43f545b";
+ sha512 = "678e4396e41c5674b8bb5a536c498b48312b2fc029ac8a34fe152b93392e6337f41f29c755157a0cbb3af39098eb9a821ca288b1b09d28da417164a46195f5f0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/fr/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/fr/firefox-55.0.3.tar.bz2";
locale = "fr";
arch = "linux-i686";
- sha512 = "8179c3840850a6c353834f052fd8d4529423311385fc39d0d73d6c97082573c5035cf7714a167bb3d9f0c77e64c9fbecac30bf53a03f6c01c338ac538a23e0f4";
+ sha512 = "2f94ad8820602f0687da70da22dd1d09ab7901e3697f55fb094f7e9ef2aee87b02aef529b58b528cbc7a3d3f7245f5fe2886949201fe902463febb1900c9e38d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/fy-NL/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/fy-NL/firefox-55.0.3.tar.bz2";
locale = "fy-NL";
arch = "linux-i686";
- sha512 = "819d140b832ea5820804b0d888f96b82737926a08854c4e93d133636c633a52433e8246a0ce187cfbfa56ab4bf09a4b4c000efea697c0d50f22edb02ef756f87";
+ sha512 = "7641e748104314754fab92b8d08a3f1d45871b10997a7c42b1862bd69db8cb8df41251a8030488d673127b24da40159996f1f9d88869ddf90cd60f9017cdf1c8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ga-IE/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ga-IE/firefox-55.0.3.tar.bz2";
locale = "ga-IE";
arch = "linux-i686";
- sha512 = "c71d04d8ec3e7dc07eb909192c176b456daae54cc105199f675fd8e612c0f6527cda0635c0e1aa6221e2d5ef3f6c8168491b02571054ab0d4b7beab59ef692f4";
+ sha512 = "8eaba21bf5b37552186db581f5f0da833170ccc1eb5c490911b51771a72d1c48678aa680f29ef5f1a3a3cc019ba5e9a58fddfdb9acd08b2356886a84eb5801b6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/gd/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/gd/firefox-55.0.3.tar.bz2";
locale = "gd";
arch = "linux-i686";
- sha512 = "98bc4b44b2075d615e682b7649a0a0cc696013b908aaef11a60bb299881e0ba243e70ec2e6e9205c965d31c68c6a8a66e9826fdb711676aa0cc3c8f4c44935d5";
+ sha512 = "71508a24090f347738fc0511432d4331007e4982a69d2b07e8ef39a6c0917db55b6a0a1c4b5397f7bc96213c6ab67747a4252bba3625b1ec7ad3dbce4b6976a6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/gl/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/gl/firefox-55.0.3.tar.bz2";
locale = "gl";
arch = "linux-i686";
- sha512 = "034b22ffe1a16ee330a8c85c18975d541b27d5ae1e5e3cba3796307c641af14797b329162a6e3f4f642de711a9f0ffe5b2fd274a90a396190ba176c5c26790e5";
+ sha512 = "01f4fe34072d62b95e0197ce2622334dd851c14066bb988b2744a983bb766d60852f8a1144b2d2972ea0a7edc8bd974934e4e120b9e218ea8307744ec42ad268";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/gn/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/gn/firefox-55.0.3.tar.bz2";
locale = "gn";
arch = "linux-i686";
- sha512 = "85ba634e0b991b582ad0795c368d5df28d5e2fe773525792ab071752ac773d0d81dd3991996d6e9db7745707cbea8ccf86784b6a8f117d97e08b5ac88902d5bd";
+ sha512 = "2857bad04c580841f58aa29d02d30c87fa72d5ca2695c124ee73f5cdcef93e5b7cd02daa42f2b93a569be6773b0edb9c9da55289bf49f2e442fc91c1cf97ac47";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/gu-IN/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/gu-IN/firefox-55.0.3.tar.bz2";
locale = "gu-IN";
arch = "linux-i686";
- sha512 = "92561dd2d270c01d9e2a1568fa9fa0e75bed2d5ac2ea49d965fa2aed6f32bfa8639cd57d564d310198796621fc1696444f976e12a26fa96b55aa7b445f81afe1";
+ sha512 = "8ec3538b7d0278caeaae64b19300132c76cefc3345e66a76bf686391ce35cb578be9674d14b6cc54fee2017792e319496777af337401f3b3419af99e86710462";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/he/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/he/firefox-55.0.3.tar.bz2";
locale = "he";
arch = "linux-i686";
- sha512 = "d1f67f3e34bd67f993177ea9cc62ba432eebdd1169ded1b6ef58e9cb07a62a0ce38afecf001680b8ff6a401950ce9c13834345d7481301d59d024572fd2b8ed3";
+ sha512 = "82324d45dda57df70520e878938a646e6692817f4f35d6d0f0518d8f8c7ce6183f968f9863e83304f5f41a5a6e135d77f613dbd6d277a66f6d5db9996381d949";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/hi-IN/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/hi-IN/firefox-55.0.3.tar.bz2";
locale = "hi-IN";
arch = "linux-i686";
- sha512 = "8a10d69c6baebd21b2988a42979ec675e6ca29c96299407bd307a33c0bda11b6626cbb69bd6ab64a55f347be30d5fbbc64078b6e33209c26139efa050050541c";
+ sha512 = "0359d570441db163c8d8346a0cf1e50704125e6f165a6e1d7bbfbcd0ffd89fede9487195de927d9eec5d4f23889dbf4ed69d8a7807ddf93291da79bae14267c0";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/hr/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/hr/firefox-55.0.3.tar.bz2";
locale = "hr";
arch = "linux-i686";
- sha512 = "667411553ac3e00e7040ff2b6f350a6586498a38409380d5c822bd1bdf2989e2e34b9b83ac2ffb00c7d3cbd57d2cae4450cd208ca1fb89480d91df1981d2802f";
+ sha512 = "fd3e94d57decd57ac00450b9b76cdda282bc2b528cea4630d6e835c5a1ff9d56c7be6c67e18e977ff4b3d00cc4e1db3d21b73debb7194bc094e29a49de405010";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/hsb/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/hsb/firefox-55.0.3.tar.bz2";
locale = "hsb";
arch = "linux-i686";
- sha512 = "8becf0d2f7a0c208ac38d390be0114159d208931da07b996e1f05138fa06f07f027c1ea429153823c580217a5d3e855f50570a5c5c2e4f264164d59b0f5cc9bf";
+ sha512 = "0a6896110e471501194086932f155d0a5302fbae75fc0403cf437d13d5e5e3ecdc382ac748688f7918307e45d294e0b29100831fbab5684afb8d78f9031512bc";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/hu/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/hu/firefox-55.0.3.tar.bz2";
locale = "hu";
arch = "linux-i686";
- sha512 = "494144c9c2a3d06d4bc8126e106e74d72b3ec5992dbbd47a4b618a1a30905ef59e550bb4bf8a698c69d4dac09a1bb7c78b5580f77d00f103918d6d58ae74be73";
+ sha512 = "ed27b99b71dbe5f51db4a981e4c93b59c35d7ebb2965b7d12719c70de41512201f37f4540aee2bb723ebdb7b2737df668babef889847d3c136d6083433e75c20";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/hy-AM/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/hy-AM/firefox-55.0.3.tar.bz2";
locale = "hy-AM";
arch = "linux-i686";
- sha512 = "4d8160d109ccd6fdd407673c855b445eb287aaaf09c55e11b277249b54129721c60596139860cd578b297415383ebc83a9f95feec3b5deb229e5f5834df5f94a";
+ sha512 = "568c1e4bc95c26b5b0113c0784a305dd5ecfba56f5cb8318f71e135a676f9b86e38fe31675684785d2cbff7a1db46910c0ef7c60470791f9b6c0334422df83ec";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/id/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/id/firefox-55.0.3.tar.bz2";
locale = "id";
arch = "linux-i686";
- sha512 = "faf8df37c2b7ff621d9dc73fa225ffeb9263a6de05ce540fa4f7482b26df153c75cad46e395cd4c3994598dd42943eae7e552836d3afdb1fab56bd55e73f7207";
+ sha512 = "91e66bda4ef701bfd10e5170ba463fcd1849083651add4cd09103c5eb6532ce5f72bd30a15e0caa811e2e78326fa53429f7d232a27100ed03207f2a2110730bb";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/is/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/is/firefox-55.0.3.tar.bz2";
locale = "is";
arch = "linux-i686";
- sha512 = "a0a5fdfa889d61365c9da182ab7364f3eef51ce7bfe75273a9cc50b948cb5b979629972171dfa3812edeafba76ab71b3780f11265b2026cbb70fb8c2e1bbc7a8";
+ sha512 = "a9fe82f9045ca421c45bb9f2de9fd28b57b22329dc767b402a7393d0275acda591cd193d0285395a36907a9b497427a88d2d4da2c224bcd123dfbd53888b2e3b";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/it/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/it/firefox-55.0.3.tar.bz2";
locale = "it";
arch = "linux-i686";
- sha512 = "59530850ea817f7bcf0ebe8813aa9b653fca3127139e8b97ba7f9fcca16848c272681b59409c0dfd1b10a1e75ae6b1d0bb46bae628fb0c95daeb198189c8a173";
+ sha512 = "2ea32878113a4256eb9e264bfbf67a81803f8c89a63d74e3ba66a143ede3af2082e5fd13f1e761147f5545c29c70f578210b2a4e5dbf2985ce957ce79db2d568";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ja/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ja/firefox-55.0.3.tar.bz2";
locale = "ja";
arch = "linux-i686";
- sha512 = "67501fac457e820f2e731a77095f37817e8a44693d740cfb540d48dda8e1b10d93eb578b7d94c5efb0812688728745cbb508f497c02bc74b50fb514f8da4551b";
+ sha512 = "760b3c4ad18d6af0b1bc993dd9d12d76e30f6c197b1e58d9b4606d271ce502fb609b1208c0ccdea222bc7076f03dc8923e61cad092d23c0289ffb5bdd3d8442d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ka/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ka/firefox-55.0.3.tar.bz2";
locale = "ka";
arch = "linux-i686";
- sha512 = "dd9dc48dd50cce43b48dd1a17aef95c89dbdda8e4b670044c422085ceaebca7410c24b157213acf4592c007ada45e6fdb154e690f6ba626b81ec3f8a099f205d";
+ sha512 = "5a2c4a3249be869c5e70369c38a3795de3cfc2ad9bf30f933f82b4a286d72fb9c936d4df8e1320105a4ba20ebadaaef1659ecbec80eb9e8e21aa8f403d912c41";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/kab/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/kab/firefox-55.0.3.tar.bz2";
locale = "kab";
arch = "linux-i686";
- sha512 = "51dd94346d62fe810208e6bcfb930880ef14fafe2b859af80da4b494563db38b4226ad43b602ac86f426c6a731cb135ac674ef65bdb2039e0aaccde0956c616f";
+ sha512 = "7ef692ed2101c094a08b3593ba2d1738a616803b3649f83f650c0038316fd52b51e8cde53116015a54dcdfbfeb9d1209dea2273705142bf431b29c2f6b7611dd";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/kk/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/kk/firefox-55.0.3.tar.bz2";
locale = "kk";
arch = "linux-i686";
- sha512 = "604b59670103ce78e3ef4db5a209d68981e1168415ca4512a1edf15fb4b2554b9f655985b2a0921cca44a4c51742155822b0b6514e91b1a5fec43be57b36bc44";
+ sha512 = "bd88bc609a6638f9cf825e2ce9b7a615c555532275dea9dc3c6e79376cd2d814b886f5266631166a53ea38542e66011608f52797febd2867d15c18223d5f7788";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/km/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/km/firefox-55.0.3.tar.bz2";
locale = "km";
arch = "linux-i686";
- sha512 = "a81f6b44bbc9669af09b212d1960ca93e70ac085d20c37db52a474b81072a06165312207567ca4351bd110ee7e4125fbfd67981996c08b0a19c7c6669db16cb6";
+ sha512 = "b38ca1ff78eff732ef54d71cc956a31fe87922e76df5cef63ffc13016b01394aae904a17b7c8905d62120420bf715b8c37f73cd5fbe2468003d55b8c28db47c8";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/kn/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/kn/firefox-55.0.3.tar.bz2";
locale = "kn";
arch = "linux-i686";
- sha512 = "7a54f78285290d3a9062d71a5b1de69a3a98ea95a1593b5a0a0c2b69098c55ec054c8575361bd5cfb67b7558b411b8b83861ecd5605906b15a06311f477bb0c6";
+ sha512 = "ae05bfa4914d479de80f0cb6842a570737b21097a60386b700cdd831374e6197cbc5d0b171b2091ce962e082bb7809fa46fcffb4a1281d7c38d5f57675b8e925";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ko/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ko/firefox-55.0.3.tar.bz2";
locale = "ko";
arch = "linux-i686";
- sha512 = "6a97670f62f70422f0d5d02091fa6ccda700705a248831d55c95034a1a63bced1bd0f282e938855a751eedf0f897be71f7257aa5ab3f8f7162ec756511f15830";
+ sha512 = "20993f13768ea3b035b0b9d80db2baaae2d07757761a9d0a8e2a992df2e7ba3b891222c93dc3778f1b51b381ab99adf2671161560904f99a4756d5e4999cfc82";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/lij/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/lij/firefox-55.0.3.tar.bz2";
locale = "lij";
arch = "linux-i686";
- sha512 = "c4b4bd74169731d6909acc76c40ceaaddd853e03eefad27233c05dc869ab66a208f072dfe538f1f8e2323feba021f6b3aef73d81d02ff69d31feab688838424b";
+ sha512 = "0bf873490e9a6dc237d5bf2b8f32676b78eb1d6d9a8cf5f5ca9d1913b4b235e9694010463ba13bd082a90cae23d65f6eb33a15a8dd8e21092a5c966c2805ef54";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/lt/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/lt/firefox-55.0.3.tar.bz2";
locale = "lt";
arch = "linux-i686";
- sha512 = "319bb6442b6dfa25551dfcb5704241de8b248659cfdbcfa0124c6332ff828e793ddc007f3be57d51033e334c3bf504d0a1330b1cc539e8a5a0d2587bf14604cd";
+ sha512 = "0660a016305c84dc4601bc1e324864702233cd08a356673f515d8b9a9b7be443c6e265cc6072f144c49a097ab3d512b033ef0ca657be92117f6b646b6e2102f6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/lv/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/lv/firefox-55.0.3.tar.bz2";
locale = "lv";
arch = "linux-i686";
- sha512 = "cd255f0922a1cd2c13baddb350082b3ef7fa130e28cf5bb1811345bce3a9d4e65aeba188304c8fdc8336b5e35c280d2a298bea39567d5309fa37e35d191ac18c";
+ sha512 = "6fa4d166fd871e1d76d8324cfe50217a468c6da073905504919ab69c6dd14521f585e0e347fc076c985afb5d41f86b3ae691f09492c97400ad5245ddbaaadcf1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/mai/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/mai/firefox-55.0.3.tar.bz2";
locale = "mai";
arch = "linux-i686";
- sha512 = "5f44ecbd0dc239f3ed77871d548a894996192398dd845882a7c6cdaeeeb18dfde369b2e8e6d0b56883b494f537f5e0b115665d1411c1de4295c5cacb07021c54";
+ sha512 = "a18f5580bcf74d2dde0d2c1bed4413add943d0e7ce8529d3fb5ab55b91397352eb70ec8c393cf8f9dd89e3a32f4187b4cc93954800b63d1a10853bcf13202b10";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/mk/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/mk/firefox-55.0.3.tar.bz2";
locale = "mk";
arch = "linux-i686";
- sha512 = "de8a9ea6a75a4d597442e0116c70de5342f7270b2f41e9a889c7f71a44f41753d1fd0d1c029cb86a5958f8a2642ad8bd8943c30f5f3534d38d0428c83697a351";
+ sha512 = "72248c99fd9bc40ce579992438cd94b050c18100b26cbfe575c6199ae3b986d1d8aeb8fcfb63c8b8464b7d4ec35f6b332fc32595e72603eb7d41f0b0dbf3c2b1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ml/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ml/firefox-55.0.3.tar.bz2";
locale = "ml";
arch = "linux-i686";
- sha512 = "86f7a299f66f4d5c074b59f5512571c78fe924792815a0dc2ecb9b2f5e1c0a10d798bbb16c03f912051ab014c102b8e428f98ca29eeff2c30ce72962b50109f5";
+ sha512 = "f9ae435602cfc796d93a2e5aa9ffe1216c1465de3beed4ecc6b04141c392df9d1b6280deb1d69c30330db4c9ac6568b3cc4849e57c8e84f8d3e69c47a473018f";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/mr/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/mr/firefox-55.0.3.tar.bz2";
locale = "mr";
arch = "linux-i686";
- sha512 = "a3e79a8f6b03e63f91c69232467704e91c73e1a4b6085a0b979f15bfb67b63bac7637130783d47755b50179a15f894223b76f572941464963bfd61e073ed1886";
+ sha512 = "0cff95fc291a1874926ec895150cbc99b8219b29f4e66782ab182c29670b2356a5ccb1a765e0eb734666f7ff4a7be7806c62012b38118ce8d2a8f7c47a1e936c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ms/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ms/firefox-55.0.3.tar.bz2";
locale = "ms";
arch = "linux-i686";
- sha512 = "65ca4ef417722cf12b3c7dc7081b374caa3626ddaef5ff2a0b929fd5d1b6716c4e020ac8eab9cdd4dd161d990d0bb3633757c03995426e18e0d23b1e20e0e21b";
+ sha512 = "1add2335e98ad3ea9a2b57ca733087830c50e50872f8add7d8d5f2571f2d858b4f4a866298a8509398237ba62c363eccce9bb358c978cbd7b1ac6cf1dcaffce5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/my/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/my/firefox-55.0.3.tar.bz2";
locale = "my";
arch = "linux-i686";
- sha512 = "200008b97d3a811533d97e96cdbe8b7f1ce30ea5b7cebe3a77f58269d2ee871b8591907f2975377e655fb01bf267e69851ec3b3680de2796183b3ceccec8f471";
+ sha512 = "901404d74cdd090c0a63b2c0e60d0fb7afcdf3fbabda7dff07205613680ea315c2c33ee33001c8e10174f91698cc1cb4f03dfcf96e1104a5bd2d4750666627b3";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/nb-NO/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/nb-NO/firefox-55.0.3.tar.bz2";
locale = "nb-NO";
arch = "linux-i686";
- sha512 = "03d502600bf3edd8890a6d3bb394acd4c2f310d762870784192e3515b9908f14c2db4b7e5762a323b73b4c68c13cdcee9bb952fc503421f41b59f9d2bdd3e617";
+ sha512 = "50821c1cf2ff9b49c34f9e05007678068d73d9558e43083bb305049c47d62abeeb3c0a994d872de6c9dbe86971e4a5d70de716a9051180a0b2bd73df213416b6";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/nl/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/nl/firefox-55.0.3.tar.bz2";
locale = "nl";
arch = "linux-i686";
- sha512 = "4bbdc99d32f2d576db66e2aa5a12d568e17f3d544e5ef613286e2d3620d4f833ed4b7385a9091fbb72e8bbc423e8e383c9b4e616f562a83c2dbfc606056f97ac";
+ sha512 = "a81331ef521173951d7b45e726dcc0d57fa4d1ae1d9c05a835163bd71bd6ec6ee410a355bd2d697b6c59f3a8d9d2a5122182e82ed800b0d8c1830ff759fff71c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/nn-NO/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/nn-NO/firefox-55.0.3.tar.bz2";
locale = "nn-NO";
arch = "linux-i686";
- sha512 = "e0267e22ed0041d8a436bb38b9641481889b716632cdeb50bc1761bceda8d0dc6065937d15be56622cee5d4c73ba3e6f96c7fc00ceeef85ea9d852954ebf2d16";
+ sha512 = "9e8e1337557ab07c07ceb5395d6cdaca647a606650ff00d76244df125e6e041b3580828cc25dc1e300559b05a83121454e77c88e47c0708c30a561b00f18a86c";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/or/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/or/firefox-55.0.3.tar.bz2";
locale = "or";
arch = "linux-i686";
- sha512 = "faef925bcd51fa0851e2583e590bfe6c194c8f64f8d13a3a3f13f2129571ba7d9a403c0caefd933e94e1d312b39d1d051c5e2a1e6bdcf4b7a1962080d3874dae";
+ sha512 = "4dddf3bcc8b46c326a632f96844ec369c5593bbd70a846a4d041a5f14da29b953c3318aef820b46d4e77d25e79290fa77230ef17c0d57bd00802f830ae4a76a1";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/pa-IN/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/pa-IN/firefox-55.0.3.tar.bz2";
locale = "pa-IN";
arch = "linux-i686";
- sha512 = "e95ba361380a8061fdcb4fd336fc5bd906666873f4ea84af6b5d21c05fa1691fa395bd0fe4529778d91e5d500aa162da09660854867ccf4734c737b0b4ccbd55";
+ sha512 = "b22a57fb65257b25f2a7c083fbdfeb9ca0ff83919d5201fb6996a5af33a68a2722ed8174853d81a90d61beb79d811c6b756d1fca6dea6c70175165255dc92bda";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/pl/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/pl/firefox-55.0.3.tar.bz2";
locale = "pl";
arch = "linux-i686";
- sha512 = "780079a117734ed5528b8efea3d0a7914cb8e8e1e81aaef33f877317bc18fafea8ce2433ffb69bccff01fa75e97e40048ed22805bcf781216116a76472f3260d";
+ sha512 = "76d98c31d80b581a910a703098a0f80d9b9dceebb8b8f5f69eb428a59d7b592ff3aea40f152b1c74a9a849c45cfe1334951261b84e84ed454afa3bf9d14afdd2";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/pt-BR/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/pt-BR/firefox-55.0.3.tar.bz2";
locale = "pt-BR";
arch = "linux-i686";
- sha512 = "d0243251d0793d5e3202e45e596eecde6362af25d95b8640fc5d69d3983ac4899249da9a1d5099522fbae9fd5ccb08d024ecab018fac8f0858a4f1bf201e00f0";
+ sha512 = "b22cce3b391df6c945a7d84294b3ca36c90438d1eeeda002f1af4230bb8638733db1313b36f3d907b8ad4b7b117eec58c601abb21400ca2cd228a44fc49a499d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/pt-PT/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/pt-PT/firefox-55.0.3.tar.bz2";
locale = "pt-PT";
arch = "linux-i686";
- sha512 = "337c792cd35fcc6bde89fbba2da9a42846af371b741c79e1226adbdfa801914bc39323b0ba2e600ebe1b12191f746b524421c8ea6e5a03f1875cf4ba24369d9a";
+ sha512 = "7f0f627c170f8db91525a3aebbe1afe47a84745eba53da6fec79c14a95d857f8ca65ed7b52d67d966f371d3c4cf1bc4d734e1c8f427775e234aa80c318aeac52";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/rm/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/rm/firefox-55.0.3.tar.bz2";
locale = "rm";
arch = "linux-i686";
- sha512 = "e316df164058d8f380274958b17a3812a6e31d9da6eb2fd0373e7bf2befc45a668a572ad4f8f8c33a7aafb5d1f8b7331fca00e12d7ef511017b1a002811040e4";
+ sha512 = "3e7941441c09a0dbac44ae352b3817713b34c0a7cf694e465b75cdc53d977b97ae3e388ae580880bc33df134d11fbe941b4d1c63567ee6183f43bde31a2d9793";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ro/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ro/firefox-55.0.3.tar.bz2";
locale = "ro";
arch = "linux-i686";
- sha512 = "04717cd979c8440639b407e919bf2d61814d24ea9969438397fa56fc73b5a8104d8a448c40cb0b3923ece0a61b5d232a8b94eab456f1b89fb4e24bcb0a525b64";
+ sha512 = "67d270f1eed7b761499967d1d3ae6c1c7e067f124689f6214be6ba5687f3eb212e70a6089573ab2a90315593d8749496e48d047cb8642b19c01877ee394ef86d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ru/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ru/firefox-55.0.3.tar.bz2";
locale = "ru";
arch = "linux-i686";
- sha512 = "e0f76ebbe996f9989b00faabc08931873490c4048453ed4f32f0461c6ee977cbcf4b2ff4ff650a39e1a536f7bb214c6821c099a1f212cb4600187c698130bb2d";
+ sha512 = "287e6a3fb2de71b31a0cfd74d3eca00ad8ae1cc68760fa5731c1cc9f58c4bcccecbfefab892b93864ffffca6433498d6daafd7928b9633f8a587de3c0787600e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/si/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/si/firefox-55.0.3.tar.bz2";
locale = "si";
arch = "linux-i686";
- sha512 = "f98a42fa1faee4be0a141d2dcd5e88641e89baae55d70440c1fc7f92cd12bf9f3d7954c23b42b16c02052f79f9451f76074c1a7aa0993ff84bde64ae12267e68";
+ sha512 = "63260a1c9e333d05654ac7d912011228d0f787d2d2a5b084410ee6cef75b41ef3ee08dc305f95baf459d16fa4f206792e3811426500ded4d02eea0d6fbc0d5ce";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/sk/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/sk/firefox-55.0.3.tar.bz2";
locale = "sk";
arch = "linux-i686";
- sha512 = "fad8a8c70e8f354e87b19fa9387c81b685c79b133ab03dad937e84e2c927d814844d281e39c45016a51056bca56cfca357ec10250035dc07b831a4e4c83ff147";
+ sha512 = "339c3df4c1a12e14f6e2156ec0fc64aa62fb5d5e93897fcd412980ffa37edd2f6a55f3da991e0ee4c00aaa30e469f862e288cd8c950ac03bcebbe8b84d12f374";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/sl/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/sl/firefox-55.0.3.tar.bz2";
locale = "sl";
arch = "linux-i686";
- sha512 = "39f8670cbcf942210336477cb153b7b2b39a7692103a76a476a820f2b8b9809da65351e02b4f80da7ccae3e9cd18ecb7fa1af292f507e9920f50261ab67b81d1";
+ sha512 = "793c89b07c0fb8e7929aecb67bd37a1a97156d48f50972ec13583728614703b3d69e50249efb12b592aa6e5643d3f2af2aa57854ea1bb88d080983ded11ef676";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/son/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/son/firefox-55.0.3.tar.bz2";
locale = "son";
arch = "linux-i686";
- sha512 = "7eb79e3638c0820b1db421e13f71805d24e2147ebe78f48497ff574058a3da91f9afb40d050801711550283b692972f4b973ea8579376bea03059d70557c20f9";
+ sha512 = "51d941ebf974bc04f9aa7a02c14c14b4aa5190d3621604964262a92d298d68d36f3aaf84ed235760d1d9d766d29a97490ddd6df8cfc53ab215526741c8de0d31";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/sq/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/sq/firefox-55.0.3.tar.bz2";
locale = "sq";
arch = "linux-i686";
- sha512 = "84c410d7f7dc4524c4e8a7ff3fc186afcf922d8ca843bd81de83c1ce1d22aa2c07fdd57d1594a49aab014b07f1902c929bb9aa8d55b00b323f06ee70907b4a08";
+ sha512 = "44ee948b537e8774fbc37361639a83508fa3e7bb0978e12bce9ecd8c9a02d9bcf6ba28922093e8701deac71fd577eb4d85cd349c85e93fb04f5e5e6a02d6fa48";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/sr/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/sr/firefox-55.0.3.tar.bz2";
locale = "sr";
arch = "linux-i686";
- sha512 = "9f91c5c33e3d0f01ab28601fa41c02a048a3ef3899481c6ff5858a176b72e05f8113c2fa2dfff2527ad3477a7d2bc7df5fbaa1096b1765113da855da710d7abc";
+ sha512 = "77e9dd47c3967435a83e191c335791d03e6e63206f1e303eece5e1a813bf5e0b88aede11eea033972e578974beb4ec6bde260194a01e15f7b9ed7fd915ace77d";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/sv-SE/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/sv-SE/firefox-55.0.3.tar.bz2";
locale = "sv-SE";
arch = "linux-i686";
- sha512 = "35c8fd0980cc641fd7bd4fd084f3d308840279ece55a33243396bbd0a3d9e500a3aab797fda63ff5d551acd82e21e48c152ff218e1a97ab395b009bea124df43";
+ sha512 = "945a718d39d665e4b51a57ee4bb819eca8d4572c2e9098c448bece63b76bfbb652764667908c66ab4f9ace0c82b2d476f51a6fae5ba0f24aab8f94e47f506085";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ta/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ta/firefox-55.0.3.tar.bz2";
locale = "ta";
arch = "linux-i686";
- sha512 = "037257799dd7cd3383a35c334ec99f53be8682ac14020c7f96426a7885d9257519e3d5ab8643045e97df703a4bc63424db9dfa29cd65d6291402a034000fcf21";
+ sha512 = "17c5f121cee7d8b81fae8f1b2dec696e4fe02abeb0fb50124906dbb9d00c4a74a917d812760e671215f7391c408a391ecad2c590103956460dbbe5484595f457";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/te/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/te/firefox-55.0.3.tar.bz2";
locale = "te";
arch = "linux-i686";
- sha512 = "f0216fd72eba20ae094c54a4654356947441564661f6ecf5de399f55f05f7cb60370ac0072b2721d74cb40cf4c938cd3736cbd9b3a93cd641e3ef1a9089b4502";
+ sha512 = "0f14c88d99afa7f299bff4d456d10a08bd4d359bd5ffae74b51eb907274e0ac5da1b762f357b845f7039e2b43fffa1b20c1a7fbd895ac57eb42615516ef0329e";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/th/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/th/firefox-55.0.3.tar.bz2";
locale = "th";
arch = "linux-i686";
- sha512 = "ff62cc5280928c0d9aad58c3b7fc52435f09e08d65e89ab0b7fb7280f3e61289d513f893dca2746e913121753c0f15e5a34c675c4074a0ff159e790d2bfad0f0";
+ sha512 = "2727f304314911aabbd34f46afda1c035fe018cd2efcfd2ab89cd71a265de176b5fef36f176086f93c28e0d456464634dd36f6e048761b24d276aecd0dc7fb97";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/tr/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/tr/firefox-55.0.3.tar.bz2";
locale = "tr";
arch = "linux-i686";
- sha512 = "fc7f8d5120fb3b3c3699f13870fadf265ce7a43a1adadee89457a7df863d6da0f4d64b7f0b633d3526da39d825f30fbec3b9f1ae09bffb4c61681f4105bb5db7";
+ sha512 = "74b31af4b6622d286aa145e41567b09e9d1f0d922dd256647f09c959f09c2637889d11a346ec303c0fc871c8b1a382707756b8d0fc38d7093387b0247d143ff5";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/uk/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/uk/firefox-55.0.3.tar.bz2";
locale = "uk";
arch = "linux-i686";
- sha512 = "f0fb3de841925f81c64877efbc8b151cec744bd0b4997bdb9a086413e7106cf05c1dca49ee797dbd2d80bd1603554e006f47b21217e60d390ae91c6a1badac47";
+ sha512 = "a9373c5d8379a7ab483d4587fdc3df8adee0371d2a40b7886033d0505022b8adb516f7164d67da7b504e170aa5ed105218124274173d29c232e2dab7f7279921";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/ur/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/ur/firefox-55.0.3.tar.bz2";
locale = "ur";
arch = "linux-i686";
- sha512 = "3480fca8ef85b5db62b471c2986f124b92bd17c5682d57276b3f30fe0d3fde02f3d2a6e044f6c5157fc2bd3ab882e235f264aaeb319e09d234492c1aed674b92";
+ sha512 = "78578c99aefea3eb46d70d563868d2eb0bf43cc6a905b908305cf61ffe5b49064bf2845661af48c861e93cf50aa5e9d8dfaa755f11732760c1574cc0c88e5718";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/uz/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/uz/firefox-55.0.3.tar.bz2";
locale = "uz";
arch = "linux-i686";
- sha512 = "2460a419db6406542279daae938882fcc3ac29446b88a6315f3f7626925b906aed2d8a6250dfcc50c7eb87da3d57d231e4fcb5659a0fdc84ac188d4bbaf436aa";
+ sha512 = "0739b4d60e55b1d4e0ef5984050dca5ef484edb73ed590f948d8e4c4c2303cc0fcd177dbcca4ef66bf61821172675a4805aeaaf3349df1dad5a3080544316aa4";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/vi/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/vi/firefox-55.0.3.tar.bz2";
locale = "vi";
arch = "linux-i686";
- sha512 = "0e54d8a00a734b4fee5ef7cc2a831453c732573d53477e53bb202311de5524839ed2290f5ed6d93a20d5b63da765f7a621d8bafaf0150d522c755347ca49ff6f";
+ sha512 = "9e0185b988338a333e7d89a384bd42dcf6f6ca8db4eedd56236357909f9d43ec09685e8099fe25833dcd60c301297760972770bbca7b61aba87622abc2623428";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/xh/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/xh/firefox-55.0.3.tar.bz2";
locale = "xh";
arch = "linux-i686";
- sha512 = "67950de9da98ae7bf867079f831cdcdcb5aca1f9caf951813f394e1e266787d90777e95fb33f46351086b25927ef108ee78f34b8152084410f8727ad7f3579ae";
+ sha512 = "63c1cd434edcb6069959085526cc14845de1fbf4da135a1e705433fae305dacaccfc958b98e0905b5cb2627f50b768db0940aeb728a4ab84e4592b596e50a895";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/zh-CN/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/zh-CN/firefox-55.0.3.tar.bz2";
locale = "zh-CN";
arch = "linux-i686";
- sha512 = "56b6bf4bdb5994f2550a47a0d6a6e5bf4eb5d456fc30e3472adb3efa909aeea17b86e24d799bc5eea11e60046afcb0eac61fe601c6e1c795ebb5a5440fc32738";
+ sha512 = "a8c2473a2e172eb7bb34a66a4ce145218ba1cdbf951d3865561512cecd6cdda2a9741c6b383706f37537eea646fa1b282174ce9634bc69105c7611879c851a69";
}
- { url = "http://archive.mozilla.org/pub/firefox/releases/54.0.1/linux-i686/zh-TW/firefox-54.0.1.tar.bz2";
+ { url = "http://archive.mozilla.org/pub/firefox/releases/55.0.3/linux-i686/zh-TW/firefox-55.0.3.tar.bz2";
locale = "zh-TW";
arch = "linux-i686";
- sha512 = "22fff4e32f6451b4378b45007c0fa7a1170a6897d13dfa1b0f814ac0ec9f48ea4dd5439a14aa7e9b1dabea19d0dbacd22f23dc431c38e023958692c5073147fb";
+ sha512 = "f40193e6390f143cac3cdc0c230fedf2e791792d16e8446becf2038b4916274b47522bf5f239454696a8cbfffbb001556ade3b1bee2bdd239843f3bc3448b03f";
}
];
}
diff --git a/pkgs/applications/networking/browsers/firefox-bin/update.nix b/pkgs/applications/networking/browsers/firefox-bin/update.nix
index 3bcc2ab003c..ac3f7d1380c 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/update.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/update.nix
@@ -22,7 +22,7 @@ in writeScript "update-${name}" ''
pushd ${basePath}
HOME=`mktemp -d`
- cat ${./firefox.key} | gpg2 --import
+ cat ${./firefox.key} | gpg --import
tmpfile=`mktemp`
url=${baseUrl}
@@ -47,7 +47,7 @@ in writeScript "update-${name}" ''
curl --silent -o $HOME/shasums "$url$version/SHA512SUMS"
curl --silent -o $HOME/shasums.asc "$url$version/SHA512SUMS.asc"
- gpgv2 --keyring=$HOME/.gnupg/pubring.kbx $HOME/shasums.asc $HOME/shasums
+ gpgv --keyring=$HOME/.gnupg/pubring.kbx $HOME/shasums.asc $HOME/shasums
# this is a list of sha512 and tarballs for both arches
shasums=`cat $HOME/shasums`
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index 7c9ffc0f478..de19e611851 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
@@ -29,7 +29,6 @@
# Set to `privacySupport` or `false`.
, webrtcSupport ? !privacySupport
-, loopSupport ? !privacySupport || !isTorBrowserLike
, geolocationSupport ? !privacySupport
, googleAPISupport ? geolocationSupport
, crashreporterSupport ? false
@@ -44,11 +43,10 @@
# 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}")];
@@ -147,8 +145,6 @@ stdenv.mkDerivation (rec {
++ flag ffmpegSupport "ffmpeg"
++ 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 +155,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;
diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 11d9324c042..83eb563a8e7 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -1,4 +1,4 @@
-{ lib, callPackage, fetchurl, fetchFromGitHub }:
+{ lib, callPackage, stdenv, overrideCC, gcc5, fetchurl, fetchFromGitHub, fetchpatch }:
let common = opts: callPackage (import ./common.nix opts); in
@@ -6,12 +6,17 @@ rec {
firefox = common rec {
pname = "firefox";
- version = "54.0.1";
+ version = "55.0.3";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
- sha512 = "43607c2c0af995a21dc7f0f68b24b7e5bdb3faa5ee06025901c826bfe4d169256ea1c9eb5fcc604c4d6426ced53e80787c12fc07cda014eca09199ef3df783a2";
+ sha512 = "3cacc87b97871f3a8c5e97c17ef7025079cb5c81f32377d9402cdad45815ac6c4c4762c79187f1e477910161c2377c42d41de62a50b6741d5d7c1cd70e8c6416";
};
+ patches = 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";
homepage = http://www.mozilla.com/en-US/firefox/;
@@ -25,10 +30,10 @@ rec {
firefox-esr = common rec {
pname = "firefox-esr";
- version = "52.2.1esr";
+ version = "52.3.0esr";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
- sha512 = "1d79e6e4625cf7994f6d6bbdf227e483fc407bcdb20e0296ea604969e701f551b5df32f578d4669cf654b65927328c8eb0f717c7a12399bf1b02a6ac7a0cd1d3";
+ sha512 = "36da8f14b50334e36fca06e09f15583101cadd10e510268255587ea9b09b1fea918da034d6f1d439ab8c34612f6cebc409a0b8d812dddb3f997afebe64d09fe9";
};
meta = firefox.meta // {
@@ -40,19 +45,9 @@ 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
@@ -96,8 +91,42 @@ 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";
+ rev = "tor-browser-45.8.0esr-6.5-2";
+ sha256 = "0vbcp1qlxjlph0dqibylsyvb8iah3lnzdxc56hllpvbn51vrp39j";
+ };
+ } // commonAttrs) {
+ stdenv = overrideCC stdenv gcc5;
ffmpegSupport = 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/jumanji/default.nix b/pkgs/applications/networking/browsers/jumanji/default.nix
index b1d77afa8f1..7383e0ec044 100644
--- a/pkgs/applications/networking/browsers/jumanji/default.nix
+++ b/pkgs/applications/networking/browsers/jumanji/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Minimal web browser";
- homepage = http://pwmt.org/projects/jumanji/;
+ homepage = https://pwmt.org/projects/jumanji/;
platforms = platforms.all;
maintainers = [ maintainers.koral ];
};
diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix
index f504c3c2b33..f097d748d48 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/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix
index bbf034a1342..0f6c4ed36d4 100644
--- a/pkgs/applications/networking/browsers/lynx/default.nix
+++ b/pkgs/applications/networking/browsers/lynx/default.nix
@@ -2,29 +2,43 @@
, fetchurl, pkgconfig, ncurses, gzip
, sslSupport ? true, openssl ? null
, buildPlatform, hostPlatform
+, nukeReferences
}:
assert sslSupport -> openssl != null;
stdenv.mkDerivation rec {
name = "lynx-${version}";
- version = "2.8.9dev.11";
+ version = "2.8.9dev.16";
src = fetchurl {
url = "http://invisible-mirror.net/archives/lynx/tarballs/lynx${version}.tar.bz2";
- sha256 = "1cqm1i7d209brkrpzaqqf2x951ra3l67dw8x9yg10vz7rpr9441a";
+ sha256 = "1j0vx871ghkm7fgrafnvd2ml3ywcl8d3gyhq02fhfb851c88lc84";
};
+ enableParallelBuilding = true;
+
+ hardeningEnable = [ "pie" ];
+
configureFlags = [ "--enable-widec" ] ++ stdenv.lib.optional sslSupport "--with-ssl";
nativeBuildInputs = stdenv.lib.optional sslSupport pkgconfig
- ++ stdenv.lib.optional (hostPlatform != buildPlatform) buildPackages.stdenv.cc;
+ ++ stdenv.lib.optional (hostPlatform != buildPlatform) buildPackages.stdenv.cc
+ ++ [ nukeReferences ];
buildInputs = [ ncurses gzip ] ++ stdenv.lib.optional sslSupport openssl.dev;
+ # cfg_defs.h captures lots of references to build-only dependencies, derived
+ # from config.cache.
+ postConfigure = ''
+ make cfg_defs.h
+ nuke-refs cfg_defs.h
+ '';
+
meta = with stdenv.lib; {
- homepage = http://lynx.isc.org/;
description = "A text-mode web browser";
+ homepage = http://lynx.invisible-island.net/;
+ license = licenses.gpl2Plus;
platforms = platforms.unix;
};
}
diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix
index 1d287f4100c..ce9ac961c92 100644
--- a/pkgs/applications/networking/browsers/midori/default.nix
+++ b/pkgs/applications/networking/browsers/midori/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Lightweight WebKitGTK+ web browser";
- homepage = "http://midori-browser.org";
+ homepage = http://midori-browser.org;
license = with licenses; [ lgpl21Plus ];
platforms = with platforms; linux;
maintainers = with maintainers; [ raskin ramkromberg ];
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix
index c33bff60e01..fa98f2a9e78 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix
@@ -24,8 +24,6 @@ stdenv.mkDerivation rec {
sha256 = "1fgjgzss0ghk734xpfidazyknfdn11pmyw77pc3wigl83dvx4nb2";
};
- phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
-
unpackPhase = "${dpkg}/bin/dpkg-deb -x $src .";
installPhase =
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/esteidfirefoxplugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/esteidfirefoxplugin/default.nix
index 039d8bbe406..1a0752c33c6 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/esteidfirefoxplugin/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/esteidfirefoxplugin/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Firefox ID card signing plugin";
- homepage = "http://www.id.ee/";
+ homepage = http://www.id.ee/;
license = licenses.lgpl2;
platforms = platforms.linux;
maintainers = [ maintainers.jagajaga ];
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
index c25390a7c99..559c08ad4f3 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.137";
+ version = "27.0.0.130";
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
- "1kdwprrrxbdgll05x148vhg86ph77ygr99ycfblblj8wjkcz9s0z"
+ "1sj06x4kfwxi9cnc8adjkxk6p81acl39l2idnyqb429l2s84d1d9"
else
- "1ldv0fca43kdda949095r3gk1bc9p8n94z61qijkmrpv91zv5qvl"
+ "0f9vzdn523m408sw76r32zqf7d86l2mhcfsszbfh2bixg8p2cxzz"
else
if arch == "x86_64" then
- "0db6dcqal7p79q26kglnsbiv3ysx9r3c7rkdiynww18gzr40vwls"
+ "0qkdabcnqfpbfsbs8ssms9xk2pqvps6fbasvcyvhnywclra25ggc"
else
- "1fm6p91c63pyr0lra29vcq2dplb2c7a5114nm4r9rrrzjxakqw5w";
+ "0qkwkc6s4ganja4b2jsz4yff0bziirvbzxg0wyf648hqlb3bw5a6";
};
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 d7dd83b58f3..7c0125ea123 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.137";
+ version = "27.0.0.130";
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
- "095457h83zs6cvdyyrh01069kgg8cnhgs1by6s9xpdxgc851n8gp"
+ "0gqm90j8czjnzar3ia65msd18kydjhgq5l9iv1difgm8lqji5ii0"
else
- "1zw3f612cfb8lr331hwqzlpd0gn3r0139bq76pbbbahh2chq99f8";
+ "1agplangzlrp326dhz3xcvi6i325a644ggrh8g0cmgq9nfcpssnb";
};
nativeBuildInputs = [ unzip ];
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix
index 85012f8f709..b3382ef0512 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
meta = {
description = ''A wrapper to run browser plugins out-of-process'';
- homepage = "http://nspluginwrapper.org/";
+ homepage = http://nspluginwrapper.org/;
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.raskin ];
diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix
index bd334356df5..4f179c29996 100644
--- a/pkgs/applications/networking/browsers/palemoon/default.nix
+++ b/pkgs/applications/networking/browsers/palemoon/default.nix
@@ -10,14 +10,14 @@
stdenv.mkDerivation rec {
name = "palemoon-${version}";
- version = "27.2.1";
+ version = "27.4.2";
src = fetchFromGitHub {
name = "palemoon-src";
owner = "MoonchildProductions";
repo = "Pale-Moon";
rev = version + "_Release";
- sha256 = "1yyipxd5lmavf4aca4vrcnp7hb8zkn4sv2zp6n2cm6w4pxlza0g4";
+ sha256 = "155c1a76kkx9p8cnz9d33xx30asjr32x10cccx0gyq1lm1b9ffbl";
};
desktopItem = makeDesktopItem {
diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index 5ec4340dba7..025e4522f06 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -78,7 +78,7 @@ in buildPythonApplication rec {
'';
meta = {
- homepage = "https://github.com/The-Compiler/qutebrowser";
+ homepage = https://github.com/The-Compiler/qutebrowser;
description = "Keyboard-focused browser with a minimal GUI";
license = stdenv.lib.licenses.gpl3Plus;
maintainers = [ stdenv.lib.maintainers.jagajaga ];
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 5bcf47a4905..28cc273c679 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.2";
+ version = "7.0.5";
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 = "0xdw8mvyxz9vaxikzsj4ygzp36m4jfhvhqfiyaiiywpf39rqpkqr";
+ sha256 = "1ixa1pmh3fm82gwzkm7r3gbly1lrihpvk1irmpc8b8zsi2s49ghd";
};
"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 = "0m522i8zih5sj18dyzk9im7gmpmrbf96657v38m3pxn4ci38b83z";
+ sha256 = "1kb0m4xikxcgj03h6l0ch5d53i8hxdacwm7q745a377g44q84nzb";
};
};
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}
''}
@@ -225,12 +255,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}
@@ -291,15 +330,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:-plughw:0,0}" \
+ \
+ 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 +379,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/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix
index 55dfb05cb3e..28a4de16ea0 100644
--- a/pkgs/applications/networking/browsers/vimb/default.nix
+++ b/pkgs/applications/networking/browsers/vimb/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
editor and also easily configurable during runtime. Vimb is mostly
keyboard driven and does not detract you from your daily work.
'';
- homepage = "http://fanglingsu.github.io/vimb/";
+ homepage = http://fanglingsu.github.io/vimb/;
license = stdenv.lib.licenses.gpl3;
maintainers = [ stdenv.lib.maintainers.rickynils ];
platforms = with stdenv.lib.platforms; linux;
diff --git a/pkgs/applications/networking/browsers/vimprobable2/default.nix b/pkgs/applications/networking/browsers/vimprobable2/default.nix
index c98910cb08c..162ad8533bd 100644
--- a/pkgs/applications/networking/browsers/vimprobable2/default.nix
+++ b/pkgs/applications/networking/browsers/vimprobable2/default.nix
@@ -34,7 +34,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 = http://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-gn-bootstrap-r8.patch b/pkgs/applications/networking/browsers/vivaldi/chromium-gn-bootstrap-r8.patch
new file mode 100644
index 00000000000..d9f389aaf58
--- /dev/null
+++ b/pkgs/applications/networking/browsers/vivaldi/chromium-gn-bootstrap-r8.patch
@@ -0,0 +1,13 @@
+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/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index 749fc855788..a1238cb5964 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -6,17 +6,18 @@
, gstreamer, gst-plugins-base, libxml2
, glib, gtk3, pango, gdk_pixbuf, cairo, atk, gnome3
, nss, nspr
-, patchelf
+, patchelf, makeWrapper
+, proprietaryCodecs ? true, vivaldi-ffmpeg-codecs ? null
}:
stdenv.mkDerivation rec {
name = "${product}-${version}";
product = "vivaldi";
- version = "1.10.867.38-1";
+ version = "1.11.917.39-1";
src = fetchurl {
url = "https://downloads.vivaldi.com/stable/${product}-stable_${version}_amd64.deb";
- sha256 = "1h3iygzvw3rb5kmn0pam6gqy9baq6l630yllff1vnvychdg8d9vi";
+ sha256 = "0rsggp4ayj462g217zb9y9grhvbrcxa51a77l8l4qzhd9lg7zvx6";
};
unpackPhase = ''
@@ -24,7 +25,7 @@ stdenv.mkDerivation rec {
tar -xvf data.tar.xz
'';
- nativeBuildInputs = [ patchelf ];
+ nativeBuildInputs = [ patchelf makeWrapper ];
buildInputs = [
stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb
@@ -32,7 +33,7 @@ stdenv.mkDerivation rec {
atk alsaLib dbus_libs cups gtk3 gdk_pixbuf libexif ffmpeg systemd
freetype fontconfig libXrender libuuid expat glib nss nspr
gstreamer libxml2 gst-plugins-base pango cairo gnome3.gconf
- ];
+ ] ++ stdenv.lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs;
libPath = stdenv.lib.makeLibraryPath buildInputs
+ stdenv.lib.optionalString (stdenv.is64bit)
@@ -45,6 +46,10 @@ stdenv.mkDerivation rec {
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "${libPath}" \
opt/vivaldi/vivaldi-bin
+ '' + stdenv.lib.optionalString proprietaryCodecs ''
+ sed -i '/^VIVALDI_FFMPEG_FOUND/ a \
+ checkffmpeg "${vivaldi-ffmpeg-codecs}/lib/libffmpeg.so"' opt/vivaldi/vivaldi
+ '' + ''
echo "Finished patching Vivaldi binaries"
'';
@@ -67,6 +72,8 @@ stdenv.mkDerivation rec {
"$out"/opt/vivaldi/product_logo_''${d}.png \
"$out"/share/icons/hicolor/''${d}x''${d}/apps/vivaldi.png
done
+ wrapProgram "$out/bin/vivaldi" \
+ --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/
'';
meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
new file mode 100644
index 00000000000..b8b6bde50a4
--- /dev/null
+++ b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
@@ -0,0 +1,55 @@
+{ stdenv, fetchurl, fetchpatch
+, dbus_glib, gtk2, gtk3, libexif, libpulseaudio, libXScrnSaver, ninja, nss
+, pciutils, pkgconfig, python2, xdg_utils
+}:
+
+stdenv.mkDerivation rec {
+ name = "${product}-${version}";
+ product = "vivaldi-ffmpeg-codecs";
+ version = "60.0.3112.90";
+
+ src = fetchurl {
+ url = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${version}.tar.xz";
+ sha512 = "2p7pjjsxpglxjmh0asyykagqh33ccrjwj4b2aski4h31wkxv9b9najy8aqk6j1bi06n9wd35vis4hz4fr6kvgckllg1pjqrb3bpwmq5";
+ };
+
+ buildInputs = [ ];
+
+ nativeBuildInputs = [
+ dbus_glib gtk2 gtk3 libexif libpulseaudio libXScrnSaver ninja nss pciutils pkgconfig
+ python2 xdg_utils
+ ];
+
+ patches = [
+ ./chromium-gn-bootstrap-r8.patch
+ ];
+
+ configurePhase = ''
+ runHook preConfigure
+
+ local args="ffmpeg_branding=\"ChromeOS\" proprietary_codecs=true enable_hevc_demuxing=true use_gconf=false use_gio=false use_gnome_keyring=false use_kerberos=false use_cups=false use_sysroot=false use_gold=false linux_use_bundled_binutils=false fatal_linker_warnings=false treat_warnings_as_errors=false is_clang=false is_component_build=true is_debug=false symbol_level=0"
+ python tools/gn/bootstrap/bootstrap.py -v -s --no-clean --gn-gen-args "$args"
+ out/Release/gn gen out/Release -v --args="$args"
+
+ runHook postConfigure
+ '';
+
+ buildPhase = ''
+ ninja -C out/Release -v libffmpeg.so
+ '';
+
+ dontStrip = true;
+
+ installPhase = ''
+ mkdir -p "$out/lib"
+ cp out/Release/libffmpeg.so "$out/lib/libffmpeg.so"
+ '';
+
+ meta = with stdenv.lib; {
+ description = "Additional support for proprietary codecs for Vivaldi";
+ homepage = "https://ffmpeg.org/";
+ license = licenses.lgpl21;
+ maintainers = with maintainers; [ lluchs ];
+ platforms = [ "x86_64-linux" ];
+ };
+}
diff --git a/pkgs/applications/networking/browsers/vivaldi/update.sh b/pkgs/applications/networking/browsers/vivaldi/update.sh
new file mode 100755
index 00000000000..6ef6206c4f4
--- /dev/null
+++ b/pkgs/applications/networking/browsers/vivaldi/update.sh
@@ -0,0 +1,38 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p libarchive curl common-updater-scripts
+
+set -eu -o pipefail
+
+cd "$(dirname "${BASH_SOURCE[0]}")"
+root=../../../../..
+export NIXPKGS_ALLOW_UNFREE=1
+
+version() {
+ (cd "$root" && nix-instantiate --eval --strict -A "$1.version" | tr -d '"')
+}
+
+vivaldi_version_old=$(version vivaldi)
+vivaldi_version=$(curl -sS https://vivaldi.com/download/ | sed -rne 's/.*vivaldi-stable_([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+-[0-9]+)_amd64\.deb.*/\1/p')
+
+if [[ "$vivaldi_version" = "$vivaldi_version_old" ]]; then
+ echo "nothing to do, vivaldi $vivaldi_version is current"
+ exit
+fi
+
+# Download vivaldi and save hash and file path.
+url="https://downloads.vivaldi.com/stable/vivaldi-stable_${vivaldi_version}_amd64.deb"
+mapfile -t prefetch < <(nix-prefetch-url --print-path "$url")
+hash=${prefetch[0]}
+path=${prefetch[1]}
+
+echo "vivaldi: $vivaldi_version_old -> $vivaldi_version"
+(cd "$root" && update-source-version vivaldi "$vivaldi_version" "$hash")
+
+# Check vivaldi-ffmpeg-codecs version.
+chromium_version_old=$(version vivaldi-ffmpeg-codecs)
+chromium_version=$(bsdtar xOf "$path" data.tar.xz | bsdtar xOf - ./opt/vivaldi/vivaldi-bin | strings | grep -A2 -i '^chrome\/' | grep '^[0-9]\+\.[0-9]\+\.[1-9][0-9]\+\.[0-9]\+')
+
+if [[ "$chromium_version" != "$chromium_version_old" ]]; then
+ echo "vivaldi-ffmpeg-codecs: $chromium_version_old -> $chromium_version"
+ (cd "$root" && update-source-version vivaldi-ffmpeg-codecs "$chromium_version")
+fi
diff --git a/pkgs/applications/networking/c14/default.nix b/pkgs/applications/networking/c14/default.nix
index e7aa7bb6728..33a1e8a5c08 100644
--- a/pkgs/applications/networking/c14/default.nix
+++ b/pkgs/applications/networking/c14/default.nix
@@ -18,7 +18,7 @@ buildGoPackage rec {
meta = with stdenv.lib; {
description = "C14 is designed for data archiving & long-term backups.";
- homepage = "https://www.online.net/en/c14";
+ homepage = https://www.online.net/en/c14;
license = licenses.mit;
maintainers = with maintainers; [ apeyroux ];
};
diff --git a/pkgs/applications/networking/cluster/cni/default.nix b/pkgs/applications/networking/cluster/cni/default.nix
index bdff04cb073..a7205f1bc7a 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/default.nix b/pkgs/applications/networking/cluster/docker-machine/default.nix
index b2d70b1f767..95ad83cb3b1 100644
--- a/pkgs/applications/networking/cluster/docker-machine/default.nix
+++ b/pkgs/applications/networking/cluster/docker-machine/default.nix
@@ -3,7 +3,7 @@
buildGoPackage rec {
name = "machine-${version}";
- version = "0.10.0";
+ version = "0.12.2";
goPackagePath = "github.com/docker/machine";
@@ -11,7 +11,7 @@ buildGoPackage rec {
rev = "v${version}";
owner = "docker";
repo = "machine";
- sha256 = "1ik0jbp8zqzmg8w1fnf82gdlwrvw4nl40lmins7h8y0q6psrp6gc";
+ sha256 = "0ikgjb6x6h7f43vjabxnqgrrlq516zsz7vj945hca1w919jpdwhf";
};
postInstall = ''
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 7d6b3749904..00000000000
--- 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 da82dac0019..60531261140 100644
--- a/pkgs/applications/networking/cluster/habitat/default.nix
+++ b/pkgs/applications/networking/cluster/habitat/default.nix
@@ -5,23 +5,30 @@ 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";
+ depsSha256 = "1ahfm5agvabqqqgjsyjb95xxbc7mng1mdyclcakwp1m1qdkxx9py";
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;
diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix
index 55ebb580f52..9af4cf3f0ed 100644
--- a/pkgs/applications/networking/cluster/hadoop/default.nix
+++ b/pkgs/applications/networking/cluster/hadoop/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
'';
meta = {
- homepage = "http://hadoop.apache.org/";
+ homepage = http://hadoop.apache.org/;
description = "Framework for distributed processing of large data sets across clusters of computers";
license = stdenv.lib.licenses.asl20;
diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix
index dc7d2b8b2ea..6767a0bd724 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 "12dp2ggcjaqls4vrms21mvbphj8a8w156wmlqm19dppf6zsnxqxd"
- else "1s3rhxfz663d255xc5ph6ndhb4x82baich8scyrgi84d7dxjx7mj";
+ then "1i22givr52kgr76dd2azcg9avgh70wiw5dcpmmyychms2ynxi42y"
+ else "0phhy3si86ilc6051zfgn8jnniy5lygf1r2gysjpcyfbrc5pw3hj";
pname = "helm";
- version = "2.5.0";
+ version = "2.6.1";
in
stdenv.mkDerivation {
name = "${pname}-${version}";
diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index 69fe6a1730a..e76d3cf5d08 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.1";
src = fetchFromGitHub {
owner = "kubernetes";
repo = "kubernetes";
rev = "v${version}";
- sha256 = "0mkg4vgz9szgq1k5ignkdr5gmg703xlq8zsrr422a1qfqb8zp15w";
+ sha256 = "1frf2nxk45lsbkq73fj72gxgr76icqdrsdqh20f5gpwiqn23n7c3";
};
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 6bceeefc37a..49cac6d5063 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 a7cc5d78938..0506f7c154d 100644
--- a/pkgs/applications/networking/cluster/mesos/default.nix
+++ b/pkgs/applications/networking/cluster/mesos/default.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, makeWrapper, fetchurl, curl, sasl, openssh, autoconf
-, automake115x, libtool, unzip, gnutar, jdk, maven, python, wrapPython
+, automake, libtool, unzip, gnutar, jdk, maven, python, wrapPython
, setuptools, boto, pythonProtobuf, apr, subversion, gzip, systemd
, leveldb, glog, perf, utillinux, libnl, iproute, openssl, libevent
, ethtool, coreutils, which, iptables
@@ -8,7 +8,6 @@
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:
@@ -43,7 +42,7 @@ in stdenv.mkDerivation rec {
];
buildInputs = [
- makeWrapper autoconf automake115x libtool curl sasl jdk maven
+ makeWrapper autoconf automake libtool curl sasl jdk maven
python wrapPython boto setuptools leveldb
subversion apr glog openssl libevent
] ++ lib.optionals stdenv.isLinux [
@@ -73,7 +72,7 @@ in stdenv.mkDerivation rec {
substituteInPlace 3rdparty/stout/Makefile.am \
--replace "-lprotobuf" \
- "${pythonProtobuf.protobuf.lib}/lib/libprotobuf.a"
+ "${pythonProtobuf.protobuf}/lib/libprotobuf.so"
substituteInPlace 3rdparty/stout/include/stout/os/posix/fork.hpp \
--subst-var-by sh ${bash}/bin/bash
@@ -101,7 +100,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.so"
substituteInPlace src/slave/containerizer/mesos/isolators/gpu/volume.cpp \
--subst-var-by cp ${coreutils}/bin/cp \
@@ -126,7 +125,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.so"
'' + lib.optionalString stdenv.isLinux ''
@@ -193,7 +192,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 +246,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/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix
index 5cdb30b3f00..b601bb00c20 100644
--- a/pkgs/applications/networking/cluster/minikube/default.nix
+++ b/pkgs/applications/networking/cluster/minikube/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, fetchurl, go-bindata, kubernetes, libvirt, qemu, docker-machine-kvm, makeWrapper }:
+{ stdenv, buildGoPackage, fetchFromGitHub, fetchurl, go-bindata, kubernetes, libvirt, qemu, docker-machine-kvm,
+ gpgme, makeWrapper }:
let
binPath = [ kubernetes ]
@@ -14,15 +15,15 @@ let
# instead, we download localkube ourselves and shove it into the minikube binary. The versions URL that minikube uses is
# currently https://storage.googleapis.com/minikube/k8s_releases.json
- localkube-version = "1.6.3";
+ localkube-version = "1.7.5";
localkube-binary = fetchurl {
url = "https://storage.googleapis.com/minikube/k8sReleases/v${localkube-version}/localkube-linux-amd64";
- sha256 = "1fmxxjv1bxrfngc4ykfgg76b79dh8pq0k1gsbzhiy3hhrppfqylm";
+ sha256 = "1kn4lwnn961r19hqnkgr13np80zqk2fhp8xkhrvxzq6v6shk7gfz";
};
in buildGoPackage rec {
pname = "minikube";
name = "${pname}-${version}";
- version = "0.20.0";
+ version = "0.22.2";
goPackagePath = "k8s.io/minikube";
@@ -30,12 +31,12 @@ in buildGoPackage rec {
owner = "kubernetes";
repo = "minikube";
rev = "v${version}";
- sha256 = "0bly2phy67x4ckcg46g6r4kqfdpjfs1cb3588a900m8b4xyavvvb";
+ sha256 = "04h0hp0mkps3ilcig6xnmp41rlgaxhhpxakc86lsknvkk9kmrx89";
};
# kubernetes is here only to shut up a loud warning when generating the completions below. minikube checks very eagerly
# that kubectl is on the $PATH, even if it doesn't use it at all to generate the completions
- buildInputs = [ go-bindata makeWrapper kubernetes ];
+ buildInputs = [ go-bindata makeWrapper kubernetes gpgme ];
subPackages = [ "cmd/minikube" ];
preBuild = ''
diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix
index ce33fca4475..e39bc59709e 100644
--- a/pkgs/applications/networking/cluster/nomad/default.nix
+++ b/pkgs/applications/networking/cluster/nomad/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
name = "nomad-${version}";
- version = "0.5.6";
+ version = "0.6.2";
rev = "v${version}";
goPackagePath = "github.com/hashicorp/nomad";
@@ -12,7 +12,7 @@ buildGoPackage rec {
owner = "hashicorp";
repo = "nomad";
inherit rev;
- sha256 = "1ivxsrg8s5fcyhngf8wlrqw6j7s2iggbf9xkr8jnd80cxbcpnksl";
+ sha256 = "12bxqn7yldri5cwyxybd1lwg4c66mxd7g9syf54va5788c0hj8ij";
};
meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix
index 6ade5bab70e..fdc97733c77 100644
--- a/pkgs/applications/networking/cluster/openshift/default.nix
+++ b/pkgs/applications/networking/cluster/openshift/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchFromGitHub, which, buildGoPackage }:
+{ stdenv, fetchFromGitHub, which, buildGoPackage, utillinux, coreutils }:
let
- version = "1.5.0";
+ version = "3.6.0";
ver = stdenv.lib.elemAt (stdenv.lib.splitString "." version);
versionMajor = ver 0;
versionMinor = ver 1;
@@ -14,7 +14,7 @@ in buildGoPackage rec {
owner = "openshift";
repo = "origin";
rev = "v${version}";
- sha256 = "0qvyxcyca3888nkgvyvqcmybm95ncwxb3zvrzbg2gz8kx6g6350v";
+ sha256 = "08bdqvsjl6c7dmllyz8n4akb7gyn91znvbph5cgmmk1bhskycy1r";
};
buildInputs = [ which ];
@@ -22,13 +22,24 @@ in buildGoPackage rec {
goPackagePath = null;
patchPhase = ''
patchShebangs ./hack
+ substituteInPlace pkg/bootstrap/docker/host/host.go \
+ --replace 'nsenter --mount=/rootfs/proc/1/ns/mnt findmnt' \
+ 'nsenter --mount=/rootfs/proc/1/ns/mnt ${utillinux}/bin/findmnt'
+
+ substituteInPlace pkg/bootstrap/docker/host/host.go \
+ --replace 'nsenter --mount=/rootfs/proc/1/ns/mnt mount' \
+ 'nsenter --mount=/rootfs/proc/1/ns/mnt ${utillinux}/bin/mount'
+
+ substituteInPlace pkg/bootstrap/docker/host/host.go \
+ --replace 'nsenter --mount=/rootfs/proc/1/ns/mnt mkdir' \
+ 'nsenter --mount=/rootfs/proc/1/ns/mnt ${utillinux}/bin/mount'
'';
buildPhase = ''
cd go/src/origin-v${version}-src
# Openshift build require this variables to be set
# unless there is a .git folder which is not the case with fetchFromGitHub
- export OS_GIT_VERSION=${version}
+ export OS_GIT_VERSION=v${version}
export OS_GIT_MAJOR=${versionMajor}
export OS_GIT_MINOR=${versionMinor}
make build
@@ -43,7 +54,7 @@ in buildGoPackage rec {
description = "Build, deploy, and manage your applications with Docker and Kubernetes";
license = licenses.asl20;
homepage = http://www.openshift.org;
- maintainers = with maintainers; [offline bachp];
+ maintainers = with maintainers; [offline bachp moretea];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/networking/cluster/pig/default.nix b/pkgs/applications/networking/cluster/pig/default.nix
index c99643beb90..49c57b47028 100644
--- a/pkgs/applications/networking/cluster/pig/default.nix
+++ b/pkgs/applications/networking/cluster/pig/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
- homepage = "http://pig.apache.org/";
+ homepage = http://pig.apache.org/;
description = "High-level language for Apache Hadoop";
license = licenses.asl20;
diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index 92b043cfdbd..cc7a93bdb53 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildGoPackage, fetchpatch, fetchFromGitHub }:
+{ stdenv, lib, buildEnv, buildGoPackage, fetchpatch, fetchFromGitHub, makeWrapper }:
let
goPackagePath = "github.com/hashicorp/terraform";
@@ -37,21 +37,63 @@ let
maintainers = with maintainers; [ jgeerds zimbatm peterhoeg ];
};
} // attrs');
+
+ pluggable = terraform:
+ let
+ withPlugins = plugins:
+ let
+ actualPlugins = plugins terraform.plugins;
+
+ passthru = {
+ withPlugins = newplugins: withPlugins (x: newplugins x ++ actualPlugins);
+
+ # Ouch
+ overrideDerivation = f: (pluggable (terraform.overrideDerivation f)).withPlugins plugins;
+ overrideAttrs = f: (pluggable (terraform.overrideAttrs f)).withPlugins plugins;
+ override = x: (pluggable (terraform.override x)).withPlugins plugins;
+ };
+ in
+ # Don't bother wrapping unless we actually have plugins, since the wrapper will stop automatic downloading
+ # of plugins, which might be counterintuitive if someone just wants a vanilla Terraform.
+ if actualPlugins == []
+ then terraform.overrideAttrs (orig: { passthru = orig.passthru // passthru; })
+ else stdenv.mkDerivation {
+ name = "${terraform.name}-with-plugins";
+ buildInputs = [ makeWrapper ];
+
+ buildCommand = ''
+ mkdir -p $out/bin/
+ makeWrapper "${terraform.bin}/bin/terraform" "$out/bin/terraform" \
+ --set NIX_TERRAFORM_PLUGIN_DIR "${buildEnv { name = "tf-plugin-env"; paths = actualPlugins; }}/bin"
+ '';
+
+ inherit passthru;
+ };
+ in withPlugins (_: []);
+
+ plugins = import ./providers { inherit stdenv lib buildGoPackage fetchFromGitHub; };
in {
terraform_0_8_5 = generic {
version = "0.8.5";
sha256 = "1cxwv3652fpsbm2zk1akw356cd7w7vhny1623ighgbz9ha8gvg09";
};
- terraform_0_8_8 = generic {
+ terraform_0_8 = generic {
version = "0.8.8";
sha256 = "0ibgpcpvz0bmn3cw60nzsabsrxrbmmym1hv7fx6zmjxiwd68w5gb";
};
- terraform_0_9_11 = generic {
+ terraform_0_9 = generic {
version = "0.9.11";
sha256 = "045zcpd4g9c52ynhgh3213p422ahds63mzhmd2iwcmj88g8i1w6x";
# checks are failing again
doCheck = false;
};
+
+ terraform_0_10 = pluggable (generic {
+ version = "0.10.2";
+ sha256 = "1q7za7jcfqv914a3ynfl7hrqbgwcahgm418kivjrac6p1q26w502";
+ patches = [ ./provider-path.patch ];
+ passthru = { inherit plugins; };
+ });
}
diff --git a/pkgs/applications/networking/cluster/terraform/provider-path.patch b/pkgs/applications/networking/cluster/terraform/provider-path.patch
new file mode 100644
index 00000000000..39a69e4a389
--- /dev/null
+++ b/pkgs/applications/networking/cluster/terraform/provider-path.patch
@@ -0,0 +1,16 @@
+diff --git a/command/init.go b/command/init.go
+index 403ca245b..05d98329a 100644
+--- a/command/init.go
++++ b/command/init.go
+@@ -64,6 +64,11 @@ func (c *InitCommand) Run(args []string) int {
+ return 1
+ }
+
++ val, ok := os.LookupEnv("NIX_TERRAFORM_PLUGIN_DIR")
++ if ok {
++ flagPluginPath = append(flagPluginPath, val)
++ }
++
+ if len(flagPluginPath) > 0 {
+ c.pluginPath = flagPluginPath
+ c.getPlugins = false
diff --git a/pkgs/applications/networking/cluster/terraform/providers/data.nix b/pkgs/applications/networking/cluster/terraform/providers/data.nix
new file mode 100644
index 00000000000..0778e221c12
--- /dev/null
+++ b/pkgs/applications/networking/cluster/terraform/providers/data.nix
@@ -0,0 +1,486 @@
+# Generated with ./update-all
+{
+ alicloud =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-alicloud";
+ version = "0.1.0";
+ sha256 = "199zrpmi1hqy80nrvdhh5pn7vlcvpjcsf0hpwgzb1r9vnydpz7cj";
+ };
+ archive =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-archive";
+ version = "0.1.0";
+ sha256 = "1g7bjak1vgxpnmp4b9cb3mq8gqp1a7738fj0sxzflfk8k35p27ri";
+ };
+ arukas =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-arukas";
+ version = "0.1.0";
+ sha256 = "1msfr0rlzjfds02h35p99d1f541a1fzndjcpgijb41yx74h2v5dl";
+ };
+ atlas =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-atlas";
+ version = "0.1.1";
+ sha256 = "0k73vv14vnjl5qm33w54s5zzi0mmk1kn2zs3qkfq71aqi9ml7d14";
+ };
+ aws =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-aws";
+ version = "0.1.4";
+ sha256 = "0hqyvp1bgyfqq2lkjq5m5qxybagnxl9zrqiqfnlrfigdp0y31iz8";
+ };
+ azure =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-azure";
+ version = "0.1.1";
+ sha256 = "11myqq3wnxvpysjycvwg7b14ll8d9vkn06xb3r26kmc42fkl5xv1";
+ };
+ azurerm =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-azurerm";
+ version = "0.1.6";
+ sha256 = "01hjr42gpkpwpz0chnkw8pf0yid0hqpdnfz65q5h2p8h627hg0c6";
+ };
+ bitbucket =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-bitbucket";
+ version = "0.1.0";
+ sha256 = "0c5aiq0p425h7c600wg5h3601l40airwz6cs724lc72fycbb4s43";
+ };
+ chef =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-chef";
+ version = "0.1.0";
+ sha256 = "17fppyhxi0rd5v8khw2psdn2hdv5j79hxhinwkzrq5s4iccqk5dw";
+ };
+ circonus =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-circonus";
+ version = "0.1.0";
+ sha256 = "0v05g91yg2zh4wczp8mi3hmvwb35z0y9044bwy67nm1l624xlj64";
+ };
+ clc =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-clc";
+ version = "0.1.0";
+ sha256 = "0gvsjnwk6xkgxai1gxsjf0hsjxbv8d8jg5hq8yd3hjhc6785fgnf";
+ };
+ cloudflare =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-cloudflare";
+ version = "0.1.0";
+ sha256 = "073j0kqkccj7yrqz6j4vx722vmy6mmvmgidamkjnhhjcwm6g1jbq";
+ };
+ cloudstack =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-cloudstack";
+ version = "0.1.1";
+ sha256 = "09iqxpc5a6938qj1js2y9s4dcgk7hw69xga56ixpbbknms2yrhnb";
+ };
+ cobbler =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-cobbler";
+ version = "0.1.0";
+ sha256 = "1867aqlz1v7scybaia9yakaxw76lh6y2whhajv5pqy1ng58rcgiz";
+ };
+ consul =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-consul";
+ version = "0.1.0";
+ sha256 = "1d179m42iv2dy6wjzldllffwg6qxbg6gnvxrp6nzy75v7qp2aq94";
+ };
+ datadog =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-datadog";
+ version = "0.1.0";
+ sha256 = "1k3p0zxffhabs1xb6aw9189vbmh3ax10q4xi1qgjfjvla22byqmk";
+ };
+ digitalocean =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-digitalocean";
+ version = "0.1.2";
+ sha256 = "0wn2bx9zk0fqvrn7a76rffin7f1b70p66h5bs9073szhr3zph7hg";
+ };
+ dme =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-dme";
+ version = "0.1.0";
+ sha256 = "1ipqw1sbx0i9rhxawsysrqxvf10z8ra2y86xwd4iz0f12x9drblv";
+ };
+ dns =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-dns";
+ version = "0.1.1";
+ sha256 = "0ccp02rbvfvrb808mg053q5y7ghvxsl7p1gzw7pkm934i6j90g9n";
+ };
+ dnsimple =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-dnsimple";
+ version = "0.1.0";
+ sha256 = "0gkd5i69ldm5zn34p3k68aqk798g6g0d60gw7yp316l7mskvrx7h";
+ };
+ docker =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-docker";
+ version = "0.1.0";
+ sha256 = "1nacxkyy12w4rj1bdf5ayqmmm47nwh362pcksr227rkwmsjlmg1m";
+ };
+ dyn =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-dyn";
+ version = "0.1.0";
+ sha256 = "1w727r2gz5hjmbzw9zir0n5nrr818adh4qj50n3vijqwbxciyq2p";
+ };
+ external =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-external";
+ version = "0.1.0";
+ sha256 = "160f0avv6wbh11z54wy0qcq0zrcj4s31kn7a9x6zikv7v4hfnbza";
+ };
+ fastly =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-fastly";
+ version = "0.1.2";
+ sha256 = "1z7nsgqqzvily9rxr79yjv6jfx56896c9lxb8flmzwjz6b6mvnz7";
+ };
+ github =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-github";
+ version = "0.1.1";
+ sha256 = "0f6nk9nb8h8247rz7x1w11amp0qdcmy1alr8jgd2chrjv9f8nif0";
+ };
+ gitlab =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-gitlab";
+ version = "0.1.0";
+ sha256 = "1xjhpaq2agdshrl5jbq9ak2nxdy86iay5bw16zww2qc5ah21sdg2";
+ };
+ google =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-google";
+ version = "0.1.3";
+ sha256 = "1aa1hz0yc4g746m6dl04hc70rcrzx0py8kpdch3kim475bspclnf";
+ };
+ grafana =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-grafana";
+ version = "0.1.0";
+ sha256 = "1m2anc5cyn2p3yh4zn0y6wvzb0s2fz3sfdqm9psvx53266c2c81q";
+ };
+ heroku =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-heroku";
+ version = "0.1.0";
+ sha256 = "1f72lm95bnkhaf2accypdn7xsxcgkqri5fq5mriya4n34c61z3l6";
+ };
+ http =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-http";
+ version = "0.1.0";
+ sha256 = "1iy5fsl1j4wswbajnw0k6lagc2sz52idnswj1vmfc66x87ls0mah";
+ };
+ icinga2 =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-icinga2";
+ version = "0.1.1";
+ sha256 = "0z7lxrspm33j7bkkm2n7ac0jgyaz3y3lql3gd30p10nvpilrg07v";
+ };
+ ignition =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-ignition";
+ version = "0.2.0";
+ sha256 = "07qsyjzbz34nh7qrmw97sg0zrqbchky9r3ywrdz96pmpr1yjmwr7";
+ };
+ influxdb =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-influxdb";
+ version = "0.1.0";
+ sha256 = "0msc6maxsiwmsg8ppdfj1397c66llhaf15nc4hmr2h6dxqkb5wl5";
+ };
+ kubernetes =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-kubernetes";
+ version = "1.0.0";
+ sha256 = "1kh7a83f98v6b4v3zj84ddhrg2hya4nmvrw0mjc26q12g4z2d5g6";
+ };
+ librato =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-librato";
+ version = "0.1.0";
+ sha256 = "0bxadwj5s7bvc4vlymn3w6qckf14hz82r7q98w2nh55sqr52d923";
+ };
+ local =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-local";
+ version = "0.1.0";
+ sha256 = "02m0wg0jasnzrayamjsc2hzi0ibj83v4d0hmw2xbrxk7vmk71lgq";
+ };
+ logentries =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-logentries";
+ version = "0.1.0";
+ sha256 = "11fkb84gqcq59wk5kqn3h428jrc2gkl659zxmkdldad6jdll9ypa";
+ };
+ mailgun =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-mailgun";
+ version = "0.1.0";
+ sha256 = "1hjhjfxqbr43wa248c6hc91lx5b2gdw4vl92l2i6aqp17rbc0wfj";
+ };
+ mysql =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-mysql";
+ version = "0.1.0";
+ sha256 = "0vjr97xf15va9qypjb9318h1nxr0sd6ydcy7ijnqb8538v3581mv";
+ };
+ newrelic =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-newrelic";
+ version = "0.1.1";
+ sha256 = "1fqgxcspkgm3ncsqbvw79h5n09agba7q80nz0mrq09x0pyk8y051";
+ };
+ nomad =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-nomad";
+ version = "0.1.0";
+ sha256 = "03sb31l59hxpp6zmnizxdm21jipz4mrzz9czk6ahhx7c8q0n0na8";
+ };
+ ns1 =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-ns1";
+ version = "0.1.0";
+ sha256 = "1in9ggrvxfb3maxhgiv997hndkpnqpgx1c1365lfizhp7km5ncvj";
+ };
+ null =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-null";
+ version = "0.1.0";
+ sha256 = "069yhsqi4jc14cay1gk7mwwmrg8xv90kj1k5qy3a2ypfbss4fcjp";
+ };
+ oneandone =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-oneandone";
+ version = "0.1.0";
+ sha256 = "18bbpcprjib4d4skjdr76xjxi9091h5b3dls68y6bxkk6sh6av1i";
+ };
+ opc =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-opc";
+ version = "0.1.2";
+ sha256 = "0c4ywav89lln9417zwflrp3qhcs7qf96rgcvm1msmpgglrhzwp2i";
+ };
+ openstack =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-openstack";
+ version = "0.2.1";
+ sha256 = "1zsswsgv7lzhfd0v8llbm18gsfg6xji0r3f9rnvpjqkffj4088ca";
+ };
+ opsgenie =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-opsgenie";
+ version = "0.1.0";
+ sha256 = "0zs0cl6jl4rijcs6vv5k8k5pyf0zs52dlgqcnb1gzslh8sg5pdkm";
+ };
+ ovh =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-ovh";
+ version = "0.1.0";
+ sha256 = "052bnfw146h9nh3cw77clwwxbmw1gvaich2yw39v4b1ca8brm5dr";
+ };
+ packet =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-packet";
+ version = "0.1.0";
+ sha256 = "0dk10d4b10pdlhqgm6fqg0cn0ff78ss1x76inj6gfwrnbn2amhp0";
+ };
+ pagerduty =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-pagerduty";
+ version = "0.1.2";
+ sha256 = "1dqzi53bnk4qcjhlimr13352nzb1nsij7354zapz2sgnz21v89mm";
+ };
+ postgresql =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-postgresql";
+ version = "0.1.0";
+ sha256 = "0gg48b2zn18ynvhnabvyfvw5wif0m1a852798wahv8fbv5d1vh7j";
+ };
+ powerdns =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-powerdns";
+ version = "0.1.0";
+ sha256 = "1k9xjx2smk6478dsrcnqk1k6r2pddpa9n8aghq5d1a5yhfsq5zzz";
+ };
+ profitbricks =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-profitbricks";
+ version = "0.1.2";
+ sha256 = "105l0rijqmp7kmd7wygnhnj02q7y1rz0r8pj2mjzncb5pr48m3qp";
+ };
+ rabbitmq =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-rabbitmq";
+ version = "0.1.0";
+ sha256 = "0vn8456f2al1f6rs1gn157c86qz1fxz8sqphbr9lvdhy1jw1q2vp";
+ };
+ rancher =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-rancher";
+ version = "0.2.0";
+ sha256 = "05aci6cjrs7rv6hqhvcqy1i0nr8azds8flnrc7vba0nyy6v192qg";
+ };
+ random =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-random";
+ version = "0.1.0";
+ sha256 = "1lbv5yiw4qfsqm3gxf37gwadgp7g6ki0n70mj00d8l6v6jd0mdl5";
+ };
+ rundeck =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-rundeck";
+ version = "0.1.0";
+ sha256 = "0rp8cgnp8in52g7zkl2lj42hns0g27m8f7l42lhfnv6n2vv5qxcg";
+ };
+ scaleway =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-scaleway";
+ version = "0.1.1";
+ sha256 = "145wfcr5zjjk8vgx5xjf1hqh6h8jqxkhxbvv9x1w34i5bv809ch6";
+ };
+ softlayer =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-softlayer";
+ version = "0.0.1";
+ sha256 = "1xcg5zm2n1pc3l7ng94k589r7ykv6fxsmr5qn9xmmpdf912rdnfq";
+ };
+ spotinst =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-spotinst";
+ version = "0.1.0";
+ sha256 = "04sxdbx6qjxixrv9shnp8fxkss6pylqmphlm1l4q5c83dwk96pka";
+ };
+ statuscake =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-statuscake";
+ version = "0.1.0";
+ sha256 = "084520cak2krwpks2ipqcjfw3k4rrzn6gqqncz8c4i6g01f1m7yg";
+ };
+ template =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-template";
+ version = "0.1.1";
+ sha256 = "1qrslnkvcj18jzxmsbf72gm54s8dnw5k5z15nffwgy09vv7mzpcn";
+ };
+ terraform =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-terraform";
+ version = "0.1.0";
+ sha256 = "1w465853gwffpydb7idvg7bk8ygadgy08s04fxsqc8i2683jbpiz";
+ };
+ tls =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-tls";
+ version = "0.1.0";
+ sha256 = "1n1k4dcqm8lp7mgj88xj8xc09mn769np4wg3cggnpcs6igbgdgg7";
+ };
+ triton =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-triton";
+ version = "0.1.2";
+ sha256 = "1jyrmc7932w7d8q96lmd0axf32psfic5d7hmwm1a25vzjzfn9nlw";
+ };
+ ultradns =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-ultradns";
+ version = "0.1.0";
+ sha256 = "0bq2y6bxdax7qnmq6vxh8pz9sqy1r3m05dv7q5dbv2xvba1b88hj";
+ };
+ vault =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-vault";
+ version = "0.1.0";
+ sha256 = "1rr4gaqfr6panjjdb5xx9vbq7701zjps0l75zi526kij1pph98p1";
+ };
+ vcd =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-vcd";
+ version = "1.0.0";
+ sha256 = "0sjqdb37lalvizf4imxwn7nmry1c76dw2fpnrfmal34gghddm91p";
+ };
+ vsphere =
+ {
+ owner = "terraform-providers";
+ repo = "terraform-provider-vsphere";
+ version = "0.2.2";
+ sha256 = "0d5d4wip57zmv9kqh4zr9mz8ylffa2qcf1vmx827rwyqdr25xvaz";
+ };
+}
diff --git a/pkgs/applications/networking/cluster/terraform/providers/default.nix b/pkgs/applications/networking/cluster/terraform/providers/default.nix
new file mode 100644
index 00000000000..8d41df24d8c
--- /dev/null
+++ b/pkgs/applications/networking/cluster/terraform/providers/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+let
+ list = import ./data.nix;
+
+ toDrv = data:
+ buildGoPackage rec {
+ inherit (data) owner repo version sha256;
+ name = "${repo}-${version}";
+ goPackagePath = "github.com/${owner}/${repo}";
+ src = fetchFromGitHub {
+ inherit owner repo sha256;
+ rev = "v${version}";
+ };
+ };
+
+ maybeDrv = name: data:
+ # vsphere is currently broken
+ if name == "vsphere" then null
+ else toDrv data;
+in
+ lib.mapAttrs maybeDrv list
diff --git a/pkgs/applications/networking/cluster/terraform/providers/update-all b/pkgs/applications/networking/cluster/terraform/providers/update-all
new file mode 100755
index 00000000000..d857e4f1870
--- /dev/null
+++ b/pkgs/applications/networking/cluster/terraform/providers/update-all
@@ -0,0 +1,100 @@
+#!/usr/bin/env nix-shell
+#! nix-shell -i bash -p bash coreutils curl jq nix
+# vim: ft=sh sw=2 et
+#
+# This scripts scans the github terraform-providers repo for new releases,
+# generates the corresponding nix code and finally generates an index of
+# all the providers.
+set -euo pipefail
+
+GET() {
+ local url=$1
+ echo "fetching $url" >&2
+ curl -#fL -u "$GITHUB_AUTH" "$url"
+}
+
+get_org_repos() {
+ local org=$1
+ local page=1
+ GET "https://api.github.com/orgs/$org/repos?per_page=100" | jq -r '.[].name'
+}
+
+get_repo_tags() {
+ local owner=$1
+ local repo=$2
+ GET "https://api.github.com/repos/$owner/$repo/git/refs/tags?per_page=100" | \
+ jq -r '.[].ref' | \
+ cut -d '/' -f 3- | \
+ sort --version-sort
+}
+
+prefetch_github() {
+ local owner=$1
+ local repo=$2
+ local rev=$3
+ nix-prefetch-url --unpack "https://github.com/$owner/$repo/archive/$rev.tar.gz"
+}
+
+echo_entry() {
+ local owner=$1
+ local repo=$2
+ local version=${3:1}
+ local sha256=$4
+ cat <:` and run this script again.
+HELP
+ exit 1
+fi
+
+org=terraform-providers
+
+repos=$(get_org_repos "$org" | grep terraform-provider- | sort)
+
+
+# Get all the providers with index
+
+cat < data.nix
+# Generated with ./update-all
+{
+HEADER
+
+for repo in $repos; do
+ echo "*** $repo ***"
+ name=$(echo "$repo" | cut -d - -f 3-)
+ last_tag=$(get_repo_tags "$org" "$repo" | tail -1)
+ last_tag_sha256=$(prefetch_github "$org" "$repo" "$last_tag")
+
+ {
+ echo " $name ="
+ echo_entry "$org" "$repo" "$last_tag" "$last_tag_sha256" | indent
+ } >> data.nix
+done
+
+cat <